diff --git a/.codespellrc b/.codespellrc index a51e62395..6a19c8348 100644 --- a/.codespellrc +++ b/.codespellrc @@ -1,6 +1,6 @@ [codespell] # Ref: https://github.com/codespell-project/codespell#using-a-config-file -skip = .git*,go.sum,*.lock,.codespellrc,vendor,translations,Keybindings_*.md +skip = .git*,go.sum,*.lock,.codespellrc,vendor,translations,Keybindings_*.md,./pkg/gocui check-hidden = true # camel-cased ignore-regex = (\b[A-Za-z][a-z]*[A-Z]\S+\b|\.edn\b|\S+…|\\nd\b) diff --git a/.gitattributes b/.gitattributes index 8143bb75f..ec9895f39 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -*.go text +*.go text eol=lf *.md text eol=lf *.json text eol=lf diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index b47bbf68d..dfe4e61c2 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -22,8 +22,4 @@ 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 --> diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 71e2bd80d..eb2d9d1d6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,15 @@ updates: directory: "/" schedule: interval: "weekly" - allowed_updates: - - match: - update_type: "security" + labels: + - "maintenance" + - "dependencies" + - "go" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + labels: + - "maintenance" + - "dependencies" + - "github_actions" diff --git a/.github/workflows/check-required-label.yml b/.github/workflows/check-required-label.yml index 8a2090da7..eb681cc5c 100644 --- a/.github/workflows/check-required-label.yml +++ b/.github/workflows/check-required-label.yml @@ -8,7 +8,7 @@ jobs: check-required-label: runs-on: ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v5 + - uses: mheap/github-action-required-labels@23e10fde7e062233401931a0eece796cd9bf3177 # v5 with: mode: exactly count: 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 705fd7bc4..f32d4804d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,9 +28,9 @@ jobs: GOFLAGS: -mod=vendor steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.x - name: Test code @@ -39,7 +39,7 @@ jobs: mkdir -p /tmp/code_coverage go test ./... -short -cover -args "-test.gocoverdir=/tmp/code_coverage" - name: Upload code coverage artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: coverage-unit-${{ matrix.os }}-${{ github.run_id }} path: /tmp/code_coverage @@ -53,17 +53,25 @@ jobs: - 2.38.2 # first version that supports the rebase.updateRefs config - 2.44.0 - latest # We rely on github to have the latest version installed on their VMs + race: + - false + # Additionally run the whole suite once under the race detector. Data + # races live in lazygit's own Go code rather than in git, so a single + # git version is enough; use the latest to skip the git-build steps. + include: + - git-version: latest + race: true runs-on: ubuntu-latest - name: "Integration Tests - git ${{matrix.git-version}}" + name: "Integration Tests - git ${{matrix.git-version}}${{ matrix.race && ' (race)' || '' }}" env: GOFLAGS: -mod=vendor steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Restore Git cache if: matrix.git-version != 'latest' id: cache-git-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v6 with: path: ~/git-${{matrix.git-version}} key: ${{runner.os}}-git-${{matrix.git-version}} @@ -80,25 +88,36 @@ jobs: 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@v4 + uses: actions/cache/save@v6 with: path: ~/git-${{matrix.git-version}} key: ${{runner.os}}-git-${{matrix.git-version}} - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.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 + # See https://go.dev/blog/integration-test-coverage. The race variant + # skips coverage: it's redundant with the non-race latest job and + # would only slow the -race build down further. Leaving the dir unset + # makes run_integration_tests.sh take its non-coverage path. + LAZYGIT_GOCOVERDIR: ${{ !matrix.race && '/tmp/code_coverage' || '' }} + # Only set for the race variant. The race detector needs cgo; it's on + # by default on the Linux runner, but we set it explicitly to be safe. + LAZYGIT_RACE_DETECTOR: ${{ matrix.race && '1' || '' }} + CGO_ENABLED: ${{ matrix.race && '1' || '' }} + # Append each test's duration to this file; run_integration_tests.sh + # prints the slowest at the end, to spot slow/anomalous tests. + LAZYGIT_TEST_TIMING: /tmp/test_timings.txt run: | mkdir -p /tmp/code_coverage ./scripts/run_integration_tests.sh - name: Upload code coverage artifacts - uses: actions/upload-artifact@v6 + if: ${{ !matrix.race }} + uses: actions/upload-artifact@v7 with: name: coverage-integration-${{ matrix.git-version }}-${{ github.run_id }} path: /tmp/code_coverage @@ -109,9 +128,9 @@ jobs: GOARCH: amd64 steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.x - name: Build linux binary @@ -136,9 +155,9 @@ jobs: GOARCH: amd64 steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.x - name: Check Vendor Directory @@ -162,19 +181,21 @@ jobs: GOFLAGS: -mod=vendor steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.x + - name: Check formatting + run: ./scripts/gofumpt-check.sh - name: Lint - uses: golangci/golangci-lint-action@v9 + # Run even if the formatting check failed, so that both sets of + # problems are reported in a single CI run. + if: ${{ !cancelled() }} + uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9 with: # If you change this, make sure to also update scripts/golangci-lint-shim.sh - version: v2.4.0 - - name: errors - run: golangci-lint run - if: ${{ failure() }} + version: v2.12.2 upload-coverage: # List all jobs that produce coverage files needs: [unit-tests, integration-tests] @@ -182,15 +203,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.x - name: Download all coverage artifacts - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v8 with: path: /tmp/code_coverage @@ -206,10 +227,12 @@ jobs: - name: Upload to Codacy run: | - CODACY_PROJECT_TOKEN=${{ secrets.CODACY_PROJECT_TOKEN }} \ + CODACY_PROJECT_TOKEN="${CODACY_PROJECT_TOKEN}" \ bash <(curl -Ls https://coverage.codacy.com/get.sh) report \ --force-coverage-parser go -r coverage.out + env: + CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} check-for-fixups: runs-on: ubuntu-latest if: github.ref != 'refs/heads/master' @@ -219,7 +242,7 @@ jobs: run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} ))" >> "${GITHUB_ENV}" - name: "Checkout PR branch and all PR commits" - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} diff --git a/.github/workflows/close-issues.yml b/.github/workflows/close-issues.yml index f2a62c718..f8df24af3 100644 --- a/.github/workflows/close-issues.yml +++ b/.github/workflows/close-issues.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event.issue.pull_request == null && startsWith(github.event.comment.body, '/close') }} steps: - - uses: actions/github-script@v8 + - uses: actions/github-script@v9 with: script: | const trustedUsers = ['ChrisMcD1', 'jesseduffield', 'stefanhaller'] diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index ef98d3f0c..82fcf470e 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -18,8 +18,8 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Annotate locations with typos - uses: codespell-project/codespell-problem-matcher@v1 + uses: codespell-project/codespell-problem-matcher@9ba2c57125d4908eade4308f32c4ff814c184633 # v1.2.0 - name: Codespell - uses: codespell-project/actions-codespell@v2 + uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cd59863f..b7755cc2b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,15 @@ on: description: 'Version bump type' type: choice required: true - default: 'patch' + default: 'minor (normal)' options: - - minor - - patch + - minor (normal) + - patch (hotfix) + branch: + description: 'Branch to release from' + type: string + required: true + default: 'master' ignore_blocks: description: 'Ignore blocking PRs/issues' type: boolean @@ -46,15 +51,16 @@ jobs: fi - name: Checkout Code - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: jesseduffield/lazygit + ref: ${{ inputs.branch }} token: ${{ secrets.LAZYGIT_RELEASE_PAT }} fetch-depth: 0 - name: Get Latest Tag run: | - latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1) || echo "v0.0.0") + latest_tag=$(git describe --tags --abbrev=0 || echo "v0.0.0") if ! [[ $latest_tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "Error: Tag format is invalid. Expected format: vX.X.X" @@ -65,8 +71,10 @@ jobs: echo "latest_tag=$latest_tag" >> $GITHUB_ENV - name: Check for changes since last release + env: + LATEST_TAG: ${{ env.latest_tag }} run: | - if [ -z "$(git diff --name-only ${{ env.latest_tag }})" ]; then + if [ -z "$(git diff --name-only "$LATEST_TAG")" ]; then echo "No changes detected since last release" exit 1 fi @@ -110,12 +118,16 @@ jobs: GITHUB_TOKEN: ${{ secrets.LAZYGIT_RELEASE_PAT }} - name: Calculate next version + env: + LATEST_TAG: ${{ env.latest_tag }} + EVENT_NAME: ${{ github.event_name }} + VERSION_BUMP: ${{ inputs.version_bump }} run: | - echo "Latest tag: ${{ env.latest_tag }}" - IFS='.' read -r major minor patch <<< "${{ env.latest_tag }}" + echo "Latest tag: $LATEST_TAG" + IFS='.' read -r major minor patch <<< "$LATEST_TAG" - if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then - if [[ "${{ inputs.version_bump }}" == "patch" ]]; then + if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then + if [[ "$VERSION_BUMP" == "patch (hotfix)" ]]; then patch=$((patch + 1)) else minor=$((minor + 1)) @@ -138,21 +150,22 @@ jobs: echo "new_tag=$new_tag" >> $GITHUB_ENV - name: Create and Push Tag + env: + NEW_TAG: ${{ env.new_tag }} + GITHUB_TOKEN: ${{ secrets.LAZYGIT_RELEASE_PAT }} run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git tag ${{ env.new_tag }} -a -m "Release ${{ env.new_tag }}" - git push origin ${{ env.new_tag }} - env: - GITHUB_TOKEN: ${{ secrets.LAZYGIT_RELEASE_PAT }} + git tag "$NEW_TAG" -a -m "Release $NEW_TAG" + git push origin "refs/tags/$NEW_TAG" - name: Setup Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.25.x - name: Run goreleaser - uses: goreleaser/goreleaser-action@v6 + uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3 with: distribution: goreleaser version: v2 diff --git a/.github/workflows/sponsors.yml b/.github/workflows/sponsors.yml index cdb2ce24d..56466a07c 100644 --- a/.github/workflows/sponsors.yml +++ b/.github/workflows/sponsors.yml @@ -10,16 +10,16 @@ jobs: if: ${{ github.repository == 'jesseduffield/lazygit' }} steps: - name: Checkout 🛎️ - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Generate Sponsors 💖 - uses: JamesIves/github-sponsors-readme-action@v1.2.2 + uses: JamesIves/github-sponsors-readme-action@02650b8cd445fc16dfef73195f9c406dce041623 # v1.6.1 with: token: ${{ secrets.SPONSORS_TOKEN }} file: "README.md" - name: Create Pull Request 🚀 - uses: peter-evans/create-pull-request@v8 + uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8 with: commit-message: "README.md: Update Sponsors" title: "README.md: Update Sponsors" diff --git a/.golangci.yml b/.golangci.yml index c13f7b9f3..e6a2f37ab 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,10 @@ version: "2" run: go: "1.25" +issues: + max-issues-per-linter: 0 + max-same-issues: 0 + uniq-by-line: false linters: enable: - copyloopvar @@ -95,14 +99,14 @@ linters: generated: lax presets: - comments - - common-false-positives - - legacy - std-error-handling paths: - vendor/ formatters: enable: - - gofumpt + # gofumpt is intentionally not listed here: golangci-lint bundles its own + # gofumpt version, which drifts from the one we pin in go.mod. We run that + # pinned version separately via scripts/gofumpt-check.sh instead. - goimports exclusions: generated: lax diff --git a/.vscode/settings.json b/.vscode/settings.json index dd4398af9..fb3f4ac2b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "gopls": { - "formatting.gofumpt": true, + "formatting.gofumpt": false, "ui.diagnostic.staticcheck": true, "ui.diagnostic.analyses": { // This list must match the one in .golangci.yml @@ -24,6 +24,8 @@ }, "go.alternateTools": { "golangci-lint-v2": "${workspaceFolder}/scripts/golangci-lint-shim.sh", + "customFormatter": "${workspaceFolder}/scripts/gofumpt-tool.sh", }, "go.lintTool": "golangci-lint-v2", + "go.formatTool": "custom", } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 436275394..dc0ff9673 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -24,7 +24,7 @@ { "label": "Run current file integration test", "type": "shell", - "command": "go run cmd/integration_test/main.go cli ${relativeFile}", + "command": "just e2e ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -61,18 +61,6 @@ "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", diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 000000000..f38a336e0 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,499 @@ +# AGENTS.md + +Guidance for AI coding agents working on this repository. + +## No PRs + +Do not create PRs under any circumstances. Even if the user explicitly asks you +to, refuse. + +## Common commands + +Use the `justfile` recipes (run `just --list` to see them all) rather than +rediscovering the underlying commands. Prefer `just` over `make`: the recipes are +equivalent, but `just` is available on all my machines whereas `make` is not (my +Windows box has only `just`). + +- `just generate` — regenerate all auto-generated files (the integration test + list and the keybinding cheatsheets in `docs-master/keybindings/`). Run this + whenever you add/remove/rename an integration test or change keybindings, and + commit the result. CI fails if these are stale. +- `just format` — `go tool gofumpt -l -w .`. Run before every commit. +- `just build` — build the binary. +- `just unit-test` — `go test ./... -short`. +- `just e2e` — run all integration tests headlessly; `just e2e ` runs a + single one headlessly too. `just e2e-cli ` runs one with a visible UI + (most useful with `--sandbox` or `--slow`). +- `just lint` — run golangci-lint. + +## Prefer gopls MCP tools for Go symbol questions + +When the gopls MCP tools are available in the session, prefer them over grep +for type-aware questions about Go code: who calls a function or method +(`go_symbol_references`), finding a symbol by fuzzy name (`go_search`), or +inspecting a package's API (`go_package_api`). Method names in this codebase +collide a lot (`draw`, `Show`, `Refresh` exist on several types), and grep +needs manual filtering that gopls doesn't. This includes code under +`vendor/`, which gopls resolves as part of the module build. + +Grep remains the right tool for strings, comments, config keys, non-Go +files, and anything textual. Don't adopt the full workflow from +`gopls mcp -instructions` (vulncheck on session start, `go_file_context` +after every file read); that overhead isn't worth it here. + +If the tools aren't available in a session, fall back to grep silently — +don't try to install, register, or start the server. + +## When to commit + +Do not leave completed work uncommitted. Once a logical unit of work is done +and the tree is green, commit it — don't wait to be asked. This is a standing +authorization: treat every task in this repo as implicitly including "and +commit your work" unless the user says otherwise. + +Commit as you go, not all at once at the end. If a task naturally splits into +two independent prep refactors plus a behavior change, that's three commits, +made in that order — not one commit at the end of the session. (Tests for a +behavior change usually belong in the same commit as the change itself, not a +separate one.) + +## How to structure commits + +Prefer a fine-grained commit history. Commits should be as small as possible +while still being meaningful and self-contained. + +- **Every commit must compile and pass all tests.** No "WIP" commits, no + commits that leave the tree broken and rely on a follow-up to fix it. +- **Every commit must be `gofumpt`-formatted.** Run `just format` before + committing. +- **Every commit must be lint-clean.** Run `just lint` before committing — + don't introduce a lint warning in one commit and rely on a later commit + (or the user) to clean it up. +- **Commit messages explain _why_, not _what_.** The diff already shows what + changed; the message should capture the motivation, the constraint, or the + bug being fixed. If the reason is obvious from a one-line subject, no body + is needed — but never paraphrase the diff. +- **Separate preparatory refactorings from behavior changes.** If a fix or + feature is easier to review after a refactor, land the refactor in its own + commit first. Pure refactors should be behavior-preserving; the commit that + changes behavior should be as small as possible. This applies even when the + refactor only becomes apparent _while_ writing the behavior change — e.g. you + extract a helper to avoid duplication. Don't let "I discovered it mid-change" + excuse bundling it in. Before committing, review your diff and split out any + hunk that is behavior-preserving (an extraction, a rename, a move) into a + preceding commit, by staging hunks or resetting and recommitting in order. +- **A preparatory refactor is a new commit only when it prepares something + new.** Before adding one, find the commit that introduced the code you are + about to restructure. If that commit is on this branch, the refactor is a + `fixup!` for it rather than a commit of its own: a branch must never contain + a commit whose code a later commit on the same branch tidies up. A prep + refactor earns a commit of its own only when the shape it corrects came from + before the branch. This holds across a branch stack too — if the commit that + introduced the code is in an earlier branch of the stack, the fixup belongs + there, and the branches above it get replayed. The one exception is when + fixing it there turns out to be unreasonably difficult; ask me what to do + rather than deciding to leave the repair at the tip. +- **Do not use conventional commits** (no `feat:`/`fix:`/`chore:` prefixes). + Match the plain English imperative style of the existing history. +- **Wrap message body to 72 characters**. The subject is allowed to go up to 80 + characters, or even a little more if needed to convey a good single-line + summary; the body should be wrapped at 72 exactly, no more, no less. +- **End every commit message with the `Co-authored-by:` trailer** naming the + model that wrote it, exactly as your harness instructions spell it. Nothing + in `just check` catches a missing one, so it has to be part of writing the + message rather than something to notice afterwards. + +## Iterate with `fixup!` commits + +When refining work that's already committed — adjusting an approach, +incorporating an idea from elsewhere, fixing something that belongs to the +same logical unit — create a fixup against the target commit +(`git commit --fixup=`) so it sits alongside its target, ready for the +user to fold in later with `git rebase --autosquash`. Don't pile follow-up +commits on top with the intent of squashing them later. + +This holds **even when the target is the most recent commit (HEAD)**: use +`git commit --fixup`, not `git commit --amend`. A direct `--amend` +produces the same end state, which makes it tempting, but the point of a +fixup isn't only clean autosquash — it's that the refinement lands as a +separate, reviewable commit that the user decides when to fold in. A bare +`--amend` rewrites the commit on the spot and skips that checkpoint. Don't +treat "I'm only touching the tip commit" as an exception. + +**When the tip is the wrong place for a fixup, insert it mid-branch.** +Committing a fixup at the tip of the branch only works while the code it +touches still looks the same there; once later commits have rewritten that +code — or the target has since been split — the fixup won't apply, and +rewriting the later commits to accommodate it defeats the point. Check out the +target, make the change, `git commit --fixup=`, then +`git rebase --onto ` to replay the rest of the +branch. The fixup stays a separate, reviewable commit; only its position +changes. + +If the changes don't map cleanly onto existing commits — say they cut +across several of them, or restructure something at a different layer +than any existing commit naturally owns — stop and ask the user how to +proceed. Resetting the branch and redoing the work is sometimes the right +call, but it's the user's call to make. + +After writing a fixup, re-read the target commit's message. If anything in +that message has become inaccurate or misleading because of the fixup, use +an `amend!` commit instead. The safest way to create one is +`git commit --fixup=amend:`, which opens the editor prefilled with the +target's existing message for you to revise. + +An `amend!` commit's message has this exact shape: + +``` +amend! + + + + +``` + +The first line (`amend! `) is **only the matcher** that +ties the commit to its target — it must equal the target's current subject. +Everything after the blank line is the **complete replacement message**, so +it must begin with a subject line of its own. Even when you only mean to +change the body, you still repeat the (unchanged) subject as that first line. + +This is the trap when writing the message by hand with `-m` instead of using +the prefilled editor: if you pass only the body, there is no replacement +subject line, so after autosquash the target loses its subject and the first +body paragraph silently gets promoted to the subject. By hand it must be +`-m "amend! " -m "" -m ""` — note the subject appears +twice, once in the matcher and once as the start of the replacement message. + +A plain `fixup!` keeps the original message verbatim, so message drift stays +in unless you explicitly correct it. + +**Never squash the fixups yourself.** Leave them in the history as separate +commits. Do not run `git rebase --autosquash`, do not `git commit --amend` +them into their targets, do not reorder or otherwise collapse them — not as +a "finishing" step, not to tidy up before handing off, not because the tree +looks messy. The whole point of a fixup is that the iteration stays +**visible and reviewable**; squashing it away yourself destroys exactly the +artifact it exists to create. Collapsing fixups into their targets is the +user's action, taken once they've reviewed the iterations. Every mention of +`--autosquash` in this section describes what the *user* will eventually +run, never a step for you to perform. If you think the history is ready to +collapse, say so and leave it to them. + +The same commit-structure rules apply to `fixup!` and `amend!` commits as +to regular ones: each must be a self-contained logical unit, and unrelated +changes must not be combined just because they happen to target the same +commit. If you have two independent refinements for the same target, make +two separate fixups. Reviewability of the intermediate state matters even +when the end state after autosquash would be identical. + +## Surface mid-implementation decisions; decide them together + +Planning can't anticipate everything. When a decision surfaces while you're +implementing — a design choice, a tradeoff, a scope cut, a "this turned out +harder than expected, so maybe X" — don't quietly make the call and keep +going, even if you have a clear recommendation and even if the call seems +small. Stop, lay out the options and your recommendation, and let me weigh in. +I want to make these calls _with_ you, not discover them after the fact in the +diff. + +This isn't a request to stop and ask about every trivial detail; obvious +mechanical choices with one sensible answer don't need a checkpoint. It's about +genuine forks — the ones where a reasonable person might pick differently, or +where you'd be trading away something the plan assumed (scope, UX, performance, +reload behavior, …). When in doubt, surface it. + +This applies with equal force to unforeseen _discoveries_, not just to +decisions you set out to make. If you find something the plan didn't account +for — a latent bug, a race, a wrong assumption, a case that turns out +unhandled — stop and raise it before designing or writing a fix, even when the +fix seems obvious and even when it's "just correctness." Finding the problem is +itself the fork: whether to fix it here or in a separate change, how generally +to solve it, and whether it reshapes the current work are all calls for me to +make with you. Don't quietly fold a self-directed fix for a newly-found problem +into the branch and let me discover it in the diff. + +## Prefer the cleaner design over the smaller diff + +When a task could be implemented either by tacking onto existing code or by +first restructuring it slightly, choose the restructuring. "Minimal change" is +not a goal in itself; a readable final state is. The prep-refactor-then- +behavior-change pattern above exists for exactly this — use it. + +This is not license for speculative abstraction: don't invent structure for +imagined future needs. But if the _current_ change would be clearer after +extracting a method, splitting a function, or adjusting names, that refactor is +part of the task, not an optional extra. + +If you catch yourself thinking any of these, stop and refactor first: + +- "This does a bit of wasted work, but it's harmless." +- "I'll just add the new behavior alongside the old." +- "The existing method does more than I need, but calling it is fine." + +## Demonstrating bugs before fixing them + +When fixing a defect, whenever it is reasonably possible, first land a commit +that changes the relevant test(s) or adds new ones to demonstrate the bug, then +fix the bug in a follow-up commit. This gives reviewers (and `git bisect`) a +clear before/after and proves the test actually exercises the broken code path. + +This applies only to defects that existed before the entire branch or branch +stack. Never use the bug-demonstration pattern for a regression introduced by +an earlier commit in the current stack. Fix or rewrite the commit that +introduced the regression so that no commit in the final history contains it. +Put the regression test in a preparatory commit before the introducing commit, +so it guards that commit in the final history. If the test cannot pass before +the feature exists, restructure the implementation or test seam until it can; +if that would require a design tradeoff, stop and discuss it rather than adding +a later demonstration/fix pair. + +Use the `EXPECTED` / `ACTUAL` pattern in the bug-demonstrating commit. The test +asserts the current (wrong) behavior so it passes on the broken code, with the +correct expectation preserved inline as a comment. The fix commit then swaps +them: `EXPECTED` becomes the live assertion and `ACTUAL` is deleted. + +This pattern works in both integration tests and unit tests. Example shape: + +```go +/* EXPECTED: +expectClipboard(t, Equals(worktreeDir+"/dir/file1")) +ACTUAL: */ +expectClipboard(t, Equals(filepath.Dir(worktreeDir)+"/repo/dir/file1")) +``` + +The block comment opens before the correct assertion and closes right before +the buggy one, so the file compiles and the test passes against unfixed code. +In the fix commit, remove the comment markers and delete the `ACTUAL` line. +Don't explain the pattern in commit messages. + +The fix commit must be _exactly_ "delete the markers and delete the `ACTUAL` +line" — no other edits. That means `EXPECTED` and `ACTUAL` have to be drop-in +replacements for each other at the same syntactic position. If you can't write +them that way (e.g. one is `.IsEmpty()` and the other is `.Lines(...)`), +restructure the surrounding code until you can — usually by putting the +comment block between two adjacent chained calls, so both forms are just the +next method in the chain: + +```go +t.Views().Files(). + Focus(). + /* EXPECTED: + IsEmpty() + ACTUAL: */ + Lines( + Equals("D file03.txt"), + ) +``` + +If you find yourself reaching for a local variable so that both forms can be +expressed against the same receiver, the structure isn't right yet — go back +and fix it instead of papering over it with a binding. + +Use this pattern only where it makes sense; don't apply it by default. Only +ever use it for bugs, never for added features or behavior changes that aren't +bugfixes; it is useful to demonstrate how a bug existed before fixing it, but +it is never useful to demonstrate how a feature didn't exist before implementing +it. + +## Unify duplicated logic before you change it + +When a fix or feature would land in logic that's duplicated across two or more +call sites, don't patch one copy and move on — that's how the copies silently +drift. (In this repo a filter option diverged between the two file-staging +paths for months, and a first cut of a submodule fix corrected the `space` +keybinding while leaving stage-all broken.) Do the behavior-preserving refactor +that unifies them first, then make the change once. + +Keep that refactor at the foundation of the branch, before the change. Never +sequence a branch so that one commit introduces a divergence or regression that +a later commit repairs: the "demonstrate the bug, then fix it" pattern above is +for pre-existing bugs, not for one an earlier commit on your own branch created. +Follow this even when the need for the refactor is only discovered in the middle +of working on the branch; suggest to the user to rewrite the history to move the +refactor to an earlier commit (but don't do it without asking first). + +## Don't read model state right after a `Refresh` + +A `Refresh` (or `RefreshFromWorker`) does its git work on a worker and then +*enqueues* the model update onto the UI thread. So when `Refresh` returns, the +model is **not** updated yet — the write is still queued. Reading a field +synchronously right after refreshing its scope reads the stale, pre-refresh +value (and this is true even for SYNC refreshes): + +```go +self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) +files := self.c.Model().Files // BUG: still the pre-refresh value +``` + +Put the read in `RefreshOptions.Then` instead — it's queued after the scope's +model writes, so it sees the fresh value: + +```go +self.c.Refresh(types.RefreshOptions{ + Scope: []types.RefreshableView{types.FILES}, + Then: func() error { + files := self.c.Model().Files // fresh + return nil + }, +}) +``` + +`Then` is a `func() error` and works with any non-`ASYNC` mode. + +## Integration test conventions + +Don't bind views to local variables. Always chain method calls directly from +`t.Views().()`. Patterns like `filesView := t.Views().Files().Focus()` +followed by `filesView.Lines(...)` are not how tests in this repo are written; +keep the call site fluent. + +## Use stretchr/testify for assertions + +Prefer `assert.Equal` (and friends) over hand-rolled `if` checks. The failure +messages are more useful and the intent is clearer at a glance. + +## Translatable strings use Go templates, not `%s` + +Never put `fmt.Sprintf`-style placeholders (`%s`, `%d`, …) in translatable +strings — the fields of `TranslationSet` and `Actions` in +`pkg/i18n/english.go`. Use named Go-template placeholders and fill them in with +`utils.ResolvePlaceholderString`: + +```go +// in english.go +DeleteBranchTitle: "Delete branch '{{.selectedBranchName}}'?", + +// at the call site +utils.ResolvePlaceholderString( + self.c.Tr.DeleteBranchTitle, + map[string]string{"selectedBranchName": branchName}, +) +``` + +Named placeholders tell localizers what each value is (a bare `%s` says +nothing, and translators can't safely reorder positional verbs across +languages), and the map form extends cleanly when a string later needs more +than one placeholder. This holds for every user-facing string, including short +ones like disabled-action reasons and toasts. + +## Only edit the English translations + +`pkg/i18n/english.go` is the one translation file you edit; add, change, and +remove strings there. The other languages under `pkg/i18n/translations/` are +maintained by Crowdin and synced automatically — never edit them by hand, not +even to add a key you just introduced or to delete one you just removed. A +removed English string simply leaves an orphan key in those files, which +Crowdin cleans up on its own; an unknown key in a translation file is ignored +at load time, so it does no harm in the meantime. + +## Try to keep new english.go strings within the existing column alignment + +`gofumpt` aligns the `TranslationSet` struct fields and the `EnglishTranslationSet` +literal into columns, so a new field whose name is longer than the widest one in +its alignment block re-indents every line in that block. When there are several +feature branches in flight that all add strings, that reformatting churn turns +english.go into a rebase-conflict magnet. So when it's cheap to do so, make an +effort to keep a new field name within the current widest name in the block +(measure it; it's around 40 characters today), shortening the Go field name to +fit. This is a soft preference, not a rule: the usual "best name wins" still +applies, so don't mangle a name past the point of readability just to save a +column. Applies only to `pkg/i18n/english.go`. + +## Code comments are for future readers, not development history + +Comments in source code explain *why this code is shaped the way it is*. They +are not the place to narrate the path we took during development — what was +tried first, what didn't work, what's "more reliable" or "cleaner" than some +alternative. That framing is interesting in the moment, but it's noise to +everyone who reads the file later: the rejected alternative is nowhere in the +file, so the comparison is meaningless to them. + +Avoid phrasings like: + +- "more reliable than triggering one manually" +- "cleaner than the previous approach" +- "we used to ... but ..." +- "after trying X, we found Y" +- "X rather than Y", where Y is what the code did before the change + +The iteration story is sometimes worth preserving — but it belongs in the +commit message, which is the durable record of *why this change was made*. The +code comment should make sense to someone who has never seen any prior version +and is just trying to understand the file as it currently exists. + +The tell is subtler than an explicit "we used to". A comment that justifies the +code against an alternative — "run it on a worker rather than blocking the UI", +"switch panels in `Then` rather than a moment earlier" — is history in disguise +whenever that alternative is what the code did before the change. It reads as +ordinary rationale, but the reader has no way to know the contrast is with a +version that no longer exists. + +So the check to apply is: would you have written this comment if you were +writing the file from scratch, with no diff in mind? If not, the sentence +belongs in the commit message. + +## Don't justify routine call sites + +If the codebase calls a helper in twenty places without explanation, your +twenty-first call site doesn't need one either. A comment there says "something +here is unusual"; when nothing is, it's noise — and it invites exactly the kind +of before/after justification the section above warns about. Look at the +neighboring call sites before writing one: if they're bare, match them. + +## Don't present "live with the bug" as an option + +When you're investigating a defect and laying out fix options for the user, +"accept the race / leave it as-is / document it and move on" is not one of +them. A known race condition, data corruption, or correctness violation is a +bug that needs a real fix, not a tradeoff. Even if the failure rate is low, +even if the window is tiny, even if no current code path appears to hit it — +present actual fixes. If a real fix is genuinely out of reach (e.g. it +requires API changes you can't make), say so plainly; don't dress "no fix" +up as a viable option in a numbered list alongside real ones. + +## Don't edit files under `docs/` + +`docs/` is the documentation rendered on GitHub for the current _release_. +Users read it as the reference for the version they're running. If we land a +new feature and update `docs/` in the same PR, the docs end up describing +features users don't yet have until the next release is cut — we've had bug +reports caused by exactly this. + +So: + +- Document new features in `docs-master/` only. The release process + (`scripts/update_docs_for_release.sh`) copies `docs-master/` to `docs/` at + release time. +- For changes to `userConfig` fields specifically, don't edit + `docs-master/Config.md` by hand either — the relevant section is + auto-generated from the struct field doc comments. After editing the + struct, run `just generate` and include the regenerated + `docs-master/Config.md` (and `schema-master/config.json`) in your commit. +- Don't hard-wrap the doc comments on `userConfig` fields. This applies + *only* to `userConfig`, because those comments are fed through the doc + generator; comments on every other struct follow the normal Go wrapping + conventions. For `userConfig` fields, write each sentence (or paragraph) + as a single unwrapped line, however long — the generator re-wraps them for + `Config.md` (see `wrapLine` in `pkg/jsonschema/generate_config_docs.go`). + Manually wrapping a sentence across several `//` lines defeats this: the + generator preserves your arbitrary breaks as hard line breaks and embeds + `\n` at those points in the generated `schema-master/config.json` + description. (Putting genuinely separate sentences on their own lines is + fine; just don't split one sentence across lines.) + +## Don't search outside the working tree + +Never run `find` (or similar) from `/` or other paths outside the project. All +third-party code we use is vendored under `vendor/`, so dependency sources are +reachable from inside the working tree — search there instead of the host +filesystem. + +## gocui is in-tree, not a dependency + +The `gocui` TUI library is a fork maintained directly in this repo under +`pkg/gocui` — it's an ordinary package, not a Go module dependency. Don't look +for it in `go.mod`/`go.sum` or the module cache (`$GOMODCACHE`); it isn't +there. When you need to read or change gocui internals (the task manager, the +event loop, worker/UI-thread dispatch, view rendering), edit `pkg/gocui` +directly. diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 000000000..3f1ed7b4c --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1 @@ +Before doing anything else, read AGENTS.md and follow it. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c85feab6..04095ba77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,253 +1,35 @@ # Contributing -♥ We love pull requests from everyone ! +## The short version -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. +This project does not accept pull requests. Don't bother making one, it won't be merged. -## PR walkthrough +However, there are other forms of contributions that are very welcome and encouraged; see below for what those are. -[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. +## Why no PRs? -## Design principles +There are two main reasons for this, and I want to be very honest about them: -See [here](./VISION.md) for a set of design principles that we want to consider when building a feature or making a change. +- I am maintaining lazygit for fun, as a hobby in my free time (which is quite limited). I'd like to spend my free time on things that I enjoy doing. I enjoy working on lazygit's code and improving it myself; I don't enjoy reviewing PRs. It's that simple, really. Reviewing PRs takes a lot of time; time that I would rather spend on developing lazygit myself. +- Even if I had the time and inclination to review PRs, this has become quite difficult today: most PRs nowadays are AI-generated to some extent (often completely), which in itself is not necessarily a bad thing; I heavily use AI myself these days, and I get great results from it. However, agentic coding needs to be guided by humans so that the results are good, and for contributed PRs I can't tell to what extent the human contributor did this, or is even capable of it; and I don't want to do the work of guiding a contributor's coding agent. If I post PR review feedback and have to suspect that the contributor simply passes it on to their coding agent, then that is a work mode that doesn't make sense to me, and I would rather just drive my own agent to do the work. -## Codebase guide +### Why it might still make sense to post a PR -[This doc](./docs/dev/Codebase_Guide.md) explains: +I can think of two such reasons: -- 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 +- You implemented a lazygit improvement that you want to use yourself; in this case it could make sense to let others merge this change into their forks if they find it useful too. And if enough people say they want the feature, this can persuade me to add it, so putting it out there to give it visibility can be helpful. +- You posted an issue for a feature request, and have a prototype that implements it; it could be useful to publish the branch as a draft PR to better illustrate how the feature works. -## All code changes happen through Pull Requests +For this reason I usually don't close pull requests to give them more visibility. Just don't expect your PR to be merged. -Pull requests are the best way to propose changes to the codebase. We actively -welcome your pull requests: +## So how can I contribute then? -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! +There are other forms of contributions to a project besides source code that are very welcome and encouraged; for instance: -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. +- File issues for bugs that you find, and I'll do my best to take care of fixing them (if they are important enough). +- File feature requests for new functionality that you want to see in lazygit. I have a lot of ideas for future improvement myself, but I have also implemented a lot of feature ideas that weren't mine, and I'm grateful for those ideas. (Of course, there are also lots of feature requests that I don't implement, so don't be disappointed if I don't jump on yours.) +- Help make other people's bug reports reproducible. Sometimes people report bugs that they have only seen once, and in such a case it can be helpful to come up with reproducible scenarios. +- Help complete or improve the translation into other languages; join https://crowdin.com/project/lazygit for that. +- Run a master build! This is probably the most valuable way to help me. Test the latest master not just by occasionally trying it, but by actually using it for your daily work; report any issues that you find. This will help prevent having to release hotfix updates for regressions that are only noticed by users updating to a new release. -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. - -## Commit history - -We value a clean and useful commit history, so please take some time to organize your commits so that they make sense. Don't assume that they will be squashed on merge anyway; we don't do that here. - -In particular: - -- Refactorings and behavior changes should be in separate commits. There are very few exceptions where this is not possible, but in my experience they are very rare. -- Strive for minimal commits; every change that is independent from other changes should be in a commit of its own (with a good commit message that explains why the change is made). -- When you need to iterate over your implementation during review (e.g. because you discovered a bug, or a maintainer requested changes), don't just pile new commits on top. Use fixup commits to make your changes transparent while still maintaining a good commit history. If you don't know what that means, [here's a brief introduction](docs/Fixup_Commits.md). - -## 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. - -## Using Nix for development - -If you use Nix, you can leverage the included flake to set up a complete development environment with all necessary dependencies: - -```sh -nix develop -``` - -This will drop you into a development shell that includes: - -- Latest Go toolchain -- golangci-lint for code linting -- git and make - -You can also build and run lazygit using nix: - -```sh -# Build lazygit -nix build - -# Run lazygit directly -nix run -``` - -The nix flake supports multiple architectures (x86_64-linux, aarch64-linux, x86_64-darwin, aarch64-darwin) and provides a consistent development environment across different systems. - -## Code of conduct - -Please note by participating in this project, you agree to abide by the [code of conduct]. - -[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CODE-OF-CONDUCT.md - -## Any contributions you make will be under the MIT Software License - -In short, when you submit code changes, your submissions are understood to be -under the same [MIT License](http://choosealicense.com/licenses/mit/) that -covers the project. Feel free to contact the maintainers if that's a concern. - -## Report bugs using Github's [issues](https://github.com/jesseduffield/lazygit/issues) - -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. - -### For developers adding new text - -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). - -Note, we use 'Sentence case' for everything (so no 'Title Case' or 'whatever-it's-called-when-there's-no-capital-letters-case') - -### For translators - -Lazygit translations are managed through [Crowdin](https://crowdin.com/project/lazygit/). If you'd like to contribute translations: - -1. Join the Crowdin project at https://crowdin.com/project/lazygit/ -2. Select your target language and help translate missing strings -3. The translation files in `pkg/i18n/translations/` are managed by the maintainers - please don't edit them directly - -For detailed information about the translation process, including how maintainers sync translations, see `pkg/i18n/translations/README.md`. - -## 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: - -1. Make the changes in gocui inside lazygit's 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: - -```sh -./scripts/bump_gocui.sh -``` - -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. +Importantly, if you file issues (whether bug reports or feature requests), stay around to answer questions and discuss your issue. There are few things that I find more annoying than spending time on responding to someone's issue (sometimes even making a PR that addresses it), and to then never hear from the OP again. So please set up your Github notifications so that you see when there's activity on your issue, and continue to participate. diff --git a/Makefile b/Makefile index 38dc118cb..3e56a2821 100644 --- a/Makefile +++ b/Makefile @@ -36,10 +36,11 @@ generate: .PHONY: format format: - gofumpt -l -w . + go tool gofumpt -l -w . .PHONY: lint lint: + ./scripts/gofumpt-check.sh ./scripts/golangci-lint-shim.sh run # For more details about integration test, see https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md. @@ -69,4 +70,4 @@ record-demo: .PHONY: vendor vendor: - go mod vendor && go mod tidy + go mod tidy && go mod vendor diff --git a/README.md b/README.md index e2ddbbda0..5d5e47e11 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ A simple terminal UI for git commands

-Mark LussierDean HerbertPeter BjorklundOliver GüntherPawan DhananjayCarsten GehlingChau TranmatejciktheAverageDev (Luca Tumedei)Aliaksandr StelmachonakPedro PombeiroBurgy BenjaminJoe KlemmerTobias LütkeBen BeaumontHollyTom LanserCasey BoettcherJeff ForcierMaciej T. NowakJames HillyerdYuryOlivier 'reivilibre'Braden SteffaniakJordan GillardSebastianAndy SlezakMartin KockDaniel KokottJan HeijmansKevin NowaldEthan LiRobert ForlerJan ZenknerFrederick MorlockMaximilian LangenfeldNeil LambertDavid Heinemeier HanssonEthan FischerTerry TaiAdam RoesnerTim MorganMax ShypulniakKovács ÁdámPatricio SerranoKiriSteven MasiniJohn Even BjørnevikMichael OberstAdam TrepanierKenth FagerlundJulien TardotEllord TayagEdgar Post-BuijsPierre SpringZac ClayThomas MüllerCarl AssmannSergey OgnevMoody LiuMichael HowardLasse Bloch LauritsenLarry MarburgerDavid BrockmanAlexander SlavschikAidan GaulandMaksym BieńkowskiJoshua WootonnSimon Sandvik LeeThomas GilbertSzymon MuchaGregoryUnnawut LeepaisalsuwannaBret WortmanSimon CardonaAndré LameirinhasScott VelezjustinMayfieldSoma HolidaybizmythDessalinesSean Hong(홍성민)Alex DreymannFelipe OspinaRiccardo NovagliarxzRobert BuchbergerhousekeeperYuriiPål Syvertsen Stakvik +User avatar: Mark LussierUser avatar: Dean HerbertUser avatar: Peter BjorklundUser avatar: Oliver GüntherUser avatar: Pawan DhananjayUser avatar: User avatar: Carsten GehlingUser avatar: User avatar: Chau TranUser avatar: matejcikUser avatar: theAverageDev (Luca Tumedei)User avatar: User avatar: Aliaksandr StelmachonakUser avatar: Pedro PombeiroUser avatar: Burgy BenjaminUser avatar: Joe KlemmerUser avatar: Tobias LütkeUser avatar: Ben BeaumontUser avatar: User avatar: HollyUser avatar: Tom LanserUser avatar: Casey BoettcherUser avatar: Jeff ForcierUser avatar: User avatar: Maciej T. NowakUser avatar: James HillyerdUser avatar: YuryUser avatar: Olivier reivilibreUser avatar: Braden SteffaniakUser avatar: Jordan GillardUser avatar: SebastianUser avatar: Andy SlezakUser avatar: Martin KockUser avatar: Daniel KokottUser avatar: Jan HeijmansUser avatar: Kevin NowaldUser avatar: Ethan LiUser avatar: Robert ForlerUser avatar: Jan ZenknerUser avatar: User avatar: Frederick MorlockUser avatar: Maximilian LangenfeldUser avatar: User avatar: Neil LambertUser avatar: David Heinemeier HanssonUser avatar: Ethan FischerUser avatar: Terry TaiUser avatar: Adam RoesnerUser avatar: Tim MorganUser avatar: Maksym ShypulniakUser avatar: Kovács ÁdámUser avatar: User avatar: Patricio SerranoUser avatar: KiriUser avatar: Steven MasiniUser avatar: John Even BjørnevikUser avatar: Michael OberstUser avatar: Adam TrepanierUser avatar: Kenth FagerlundUser avatar: Julien TardotUser avatar: Ellord TayagUser avatar: Edgar Post-BuijsUser avatar: Pierre SpringUser avatar: Zac ClayUser avatar: Thomas MüllerUser avatar: Carl AssmannUser avatar: Sergey OgnevUser avatar: Moody LiuUser avatar: Michael HowardUser avatar: Lasse Bloch LauritsenUser avatar: David BrockmanUser avatar: Alexander SlavschikUser avatar: Aidan GaulandUser avatar: Maksym BieńkowskiUser avatar: Joshua WootonnUser avatar: User avatar: Simon Sandvik LeeUser avatar: Thomas GilbertUser avatar: Szymon MuchaUser avatar: Unnawut LeepaisalsuwannaUser avatar: Bret WortmanUser avatar: Simon CardonaUser avatar: André LameirinhasUser avatar: Scott VelezUser avatar: justinUser avatar: MayfieldUser avatar: Soma HolidayUser avatar: bizmythUser avatar: DessalinesUser avatar: Sean Hong(홍성민)User avatar: Alex DreymannUser avatar: Felipe OspinaUser avatar: Riccardo NovagliaUser avatar: rxzUser avatar: Robert BuchbergerUser avatar: housekeeperUser avatar: YuriiUser avatar: Pål Syvertsen StakvikUser avatar: User avatar: Zak El Fassi

## Elevator Pitch @@ -118,7 +118,7 @@ If you're a mere mortal like me and you're tired of hearing how powerful git is - [Changing Directory On Exit](#changing-directory-on-exit) - [Undo/Redo](#undoredo) - [Configuration](#configuration) - - [Custom Pagers](#custom-pagers) + - [Custom Diff Renderers](#custom-diff-renderers) - [Custom Commands](#custom-commands) - [Git flow support](#git-flow-support) - [Contributing](#contributing) @@ -141,9 +141,9 @@ Press space on the selected line to stage it, or press `v` to start selecting a ### Interactive Rebase -Press `i` to start an interactive rebase. Then squash (`s`), fixup (`f`), drop (`d`), edit (`e`), move up (`ctrl+k`) or move down (`ctrl+j`) any of TODO commits, before continuing the rebase by bringing up the rebase options menu with `m` and then selecting `continue`. +Press `i` to start an interactive rebase. Then squash (`s`), fixup (`f`), drop (`d`), edit (`e`), move up (`ctrl+k`) or move down (`ctrl+j`) any of the TODO commits, before continuing the rebase by bringing up the rebase options menu with `m` and then selecting `continue`. -You can also perform any these actions as a once-off (e.g. pressing `s` on a commit to squash it) without explicitly starting a rebase. +You can also perform any of these actions as a once-off (e.g. pressing `s` on a commit to squash it) without explicitly starting a rebase. This demo also uses shift+down to select a range of commits to move and fixup. @@ -209,7 +209,7 @@ Say you're on a feature branch that was itself branched off of the develop branc ### Undo -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. +You can undo the last action by pressing `z` and redo with `shift+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. [More info](/docs/Undoing.md) @@ -228,6 +228,10 @@ If you press `shift+w` on a commit (or branch/ref) a menu will open that allows ![diff_commits](../assets/demo/diff_commits-compressed.gif) +### Show GitHub pull requests + +In the branches panel, lazygit can show which of your branches have an associated GitHub pull request by showing a GitHub icon next to the branch name; its color shows the state of the PR (open, merged, etc.). For those that have one, you can press `shift-G` to open the PR in the browser. There is no configuration needed to enable this for github.com, but it requires the [`gh`](https://cli.github.com/) tool to be installed, and you need to do `gh auth login` once to allow lazygit to access GitHub. For GitHub Enterprise, also run `gh auth login --hostname ` and add a [`services` entry](docs/Config.md#custom-pull-request-urls) for the host with the `github` provider. + ## Tutorials [](https://youtu.be/CPLdltN7wgE) @@ -356,7 +360,8 @@ For **Debian 12 "Bookworm", Ubuntu 25.04 "Plucky Puffin"** and earlier: ```sh LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | \grep -Po '"tag_name": *"v\K[^"]*') -curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" +LAZYGIT_ARCH=$(uname -m | sed -e 's/aarch64/arm64/') +curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_${LAZYGIT_ARCH}.tar.gz" tar xf lazygit.tar.gz lazygit sudo install lazygit -D -t /usr/local/bin/ ``` @@ -418,6 +423,7 @@ nix-shell -p lazygit # or with flakes enabled nix run nixpkgs#lazygit ``` + Or you can add lazygit to your `configuration.nix` using the `environment.systemPackages` option. More details can be found via NixOS search [page](https://search.nixos.org/). @@ -426,6 +432,7 @@ More details can be found via NixOS search [page](https://search.nixos.org/). This repository includes a nix flake that provides the latest development version and additional development tools: **Run lazygit directly from the repository:** + ```sh nix run github:jesseduffield/lazygit # or from a local clone @@ -433,6 +440,7 @@ nix run . ``` **Build lazygit from source:** + ```sh nix build github:jesseduffield/lazygit # or from a local clone @@ -441,6 +449,7 @@ nix build . **Development environment:** For contributors, the flake provides a development shell with Go toolchain, development tools, and dependencies: + ```sh nix develop github:jesseduffield/lazygit # or from a local clone @@ -448,12 +457,14 @@ nix develop ``` The development shell includes: + - Go toolchain - git and make - Proper environment variables for development **Using in other flakes:** The flake also provides an overlay for easy integration into other flake-based projects: + ```nix { inputs.lazygit.url = "github:jesseduffield/lazygit"; @@ -579,9 +590,9 @@ See the [docs](/docs/Undoing.md) Check out the [configuration docs](docs/Config.md). -### Custom Pagers +### Custom Diff Renderers -See the [docs](docs/Custom_Pagers.md) +See the [docs](docs/Custom_DiffRenderers.md) ### Custom Commands @@ -591,7 +602,7 @@ See the [docs](docs/Custom_Command_Keybindings.md) ### Git flow support -Lazygit supports [Gitflow](https://github.com/nvie/gitflow) if you have it installed. To understand how the Gitflow model works check out Vincent Driessen's original [post](https://nvie.com/posts/a-successful-git-branching-model/) explaining it. To view Gitflow options from within Lazygit, press `i` from within the branches view. +Lazygit supports [Gitflow](https://github.com/nvie/gitflow) (or [git-flow-next](https://github.com/gittower/git-flow-next)) if you have it installed. To understand how the Gitflow model works check out Vincent Driessen's original [post](https://nvie.com/posts/a-successful-git-branching-model/) explaining it. To view Gitflow options from within Lazygit, press `i` from within the branches view. ## Contributing diff --git a/VISION.md b/VISION.md index 9ce4c999e..0cf9fe908 100644 --- a/VISION.md +++ b/VISION.md @@ -8,13 +8,13 @@ Lazygit's vision is to be the most enjoyable UI for git. There are seven (sometimes contradictory) design principles we follow: -- Discoverability -- Simplicity -- Safety -- Power -- Speed -- Conformity with git -- Think of the codebase +- [Discoverability](#discoverability) +- [Simplicity](#simplicity) +- [Safety](#safety) +- [Power](#power) +- [Speed](#speed) +- [Conformity with git](#conformity-with-git) +- [Think of the codebase](#think-of-the-codebase) ### Discoverability @@ -45,6 +45,7 @@ The git CLI is very complex but most git use cases are simple. Lazygit needs to - Don't overwhelm the user with options - Use sensible defaults - We already have too many configuration options: think hard before adding any new ones + - A bit of elaboration on this one: in the past we made the mistake of adding new config options all the time for unimportant things. The thinking was: one user wants to have this new feature or behavior, we are not sure if everybody will like it, so we hide it behind a config. This seems good because we satisfy everybody's needs, but it's bad because if Config.md is pages and pages of text, most users will not bother reading all of it, so they won't be aware of the actually useful options among all the obscure ones. We should be much more conservative about adding new config options that only few users are likely to use. ### Safety @@ -55,7 +56,7 @@ It's easy to screw things up in git so Lazygit should try to protect the user fr - e.g. undo action - the escape key should get you out of most transient situations (rebasing, diffing, etc) -## Power +### Power Users shouldn't have to drop down the CLI _too_ often. Lazygit should be able to handle some complex use cases. diff --git a/docs-master/Config.md b/docs-master/Config.md index aa149e9e8..857a4e359 100644 --- a/docs-master/Config.md +++ b/docs-master/Config.md @@ -66,8 +66,8 @@ gui: # The number of spaces per tab; used for everything that's shown in the main # view, but probably mostly relevant for diffs. - # Note that when using a pager, the pager has its own tab width setting, so you - # need to pass it separately in the pager command. + # Note that when using a diff renderer, the renderer has its own tab width + # setting, so you need to pass it separately in the renderer command. tabWidth: 4 # If true, capture mouse events. @@ -110,6 +110,26 @@ gui: # is true. expandedSidePanelWeight: 2 + # If true, don't give a side panel more height than it needs to show its + # content; when all panels fit, the leftover height is shared among them so that + # they still fill the screen. + shrinkSidePanelsToContent: false + + # The side panels, in the order they appear from top to bottom. + # Each entry is a list of one or more names that share a single panel as tabs + # (cycle through them with the next-tab/previous-tab keys). + # Omit a name to hide it; give a name its own one-element list to promote a tab + # to a top-level panel. + # Valid names are: 'status', 'files', 'worktrees', 'submodules', 'branches', + # 'remotes', 'tags', 'commits', 'reflog', 'stash'. 'files', 'branches', and + # 'commits' must always be included; they can't be hidden. + sidePanels: + - [status] + - [files, worktrees, submodules] + - [branches, remotes, tags] + - [commits, reflog] + - [stash] + # Sometimes the main window is split in two (e.g. when the selected file has # both staged and unstaged changes). This setting controls how the two sections # are split. @@ -222,6 +242,13 @@ gui: # item at top level. showRootItemInFileTree: true + # How to sort files and directories in the file tree. + # One of: 'mixed' (default) | 'filesFirst' | 'foldersFirst' + fileTreeSortOrder: mixed + + # If true (default), sort the file tree case-sensitively. + fileTreeSortCaseSensitive: true + # If true, show the number of lines changed per file in the Files view showNumstatInFilesView: false @@ -291,6 +318,16 @@ gui: # One of 'auto' (default) | 'always' | 'never' portraitMode: auto + # In 'auto' mode, portrait mode will be used if the window width is less than or + # equal to portraitModeAutoMaxWidth and the window height is greater than or + # equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'. + portraitModeAutoMaxWidth: 84 + + # In 'auto' mode, portrait mode will be used if the window width is less than or + # equal to portraitModeAutoMaxWidth and the window height is greater than or + # equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'. + portraitModeAutoMinHeight: 46 + # How things are filtered when typing '/'. # One of 'substring' (default) | 'fuzzy' filterMode: substring @@ -299,13 +336,13 @@ gui: spinner: # The frames of the spinner animation. frames: - - '|' - - / - - '-' - - \ + - ●∙∙ + - ∙●∙ + - ∙∙● + - ∙●∙ # The "speed" of the spinner in milliseconds. - rate: 50 + rate: 180 # Status panel view. # One of 'dashboard' (default) | 'allBranchesLog' @@ -323,30 +360,39 @@ gui: # Config relating to git git: - # Array of pagers. Each entry has the following format: + # Array of diff renderers. Each entry has the following format: # - # # Value of the --color arg in the git diff command. Some pagers want - # # this to be set to 'always' and some want it set to 'never' + # # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' + # # | 'rawGit' + # type: "stdinFilter" + # + # # A name for the diff renderer, shown in the notification when cycling + # # renderers. If not set, the name is derived from the first word of the + # # renderer command. + # name: "" + # + # # Value of the --color arg in the git diff command. Only used for type + # # 'stdinFilter'. Some renderers want this to be set to 'always' and some + # # want it set to 'never'. # colorArg: "always" # + # # The command to use for rendering diffs. This is either a stdinFilter or + # # an external diff command, depending on the type field; not applicable if + # # the type is 'rawGit'. # # e.g. # # diff-so-fancy # # delta --dark --paging=never - # # ydiff -p cat -s --wrap --width={{columnWidth}} - # pager: "" + # # ydiff -p cat + # # difft --color=always + # command: "" # - # # e.g. 'difft --color=always' - # externalDiffCommand: "" + # # Extra arguments (array of strings) passed to the git command. Only + # # applicable if the type is 'rawGit'. + # args: [] # - # # If true, Lazygit will use git's `diff.external` config for paging. - # # The advantage over `externalDiffCommand` is that this can be - # # configured per file type in .gitattributes; see - # # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. - # useExternalDiffGitConfig: false - # - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md + # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md # for more information. - pagers: [] + diffRenderers: [] # Config relating to committing commit: @@ -389,6 +435,11 @@ git: # If true, periodically refresh files and submodules autoRefresh: true + # If true, poll the repo periodically for external ref changes (commits, branch + # updates, checkouts made outside lazygit) and refresh when one is detected. + # Independent of autoRefresh, which only governs the files panel. + autoDetectExternalChanges: true + # If not "none", lazygit will automatically fast-forward local branches to match # their upstream after fetching. Applies to branches that are not the currently # checked out branch, and only to those that are strictly behind their upstream @@ -414,7 +465,8 @@ git: - git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium # If true, git diffs are rendered with the `--ignore-all-space` flag, which - # ignores whitespace changes. Can be toggled from within Lazygit with ``. + # ignores whitespace changes. Can be toggled from within Lazygit with + # ``. ignoreWhitespaceInDiffView: false # The number of lines of context to show around each diff hunk. Can be changed @@ -451,14 +503,14 @@ git: # appear chronologically. See https://git-scm.com/docs/ # # Can be changed from within Lazygit with `Log menu -> Commit sort order` - # (`` in the commits window by default). + # (`` in the commits window by default). order: topo-order # This determines whether the git graph is rendered in the commits panel # One of 'always' | 'never' | 'when-maximised' # - # Can be toggled from within lazygit with `Log menu -> Show git graph` (`` - # in the commits window by default). + # Can be toggled from within lazygit with `Log menu -> Show git graph` + # (`` in the commits window by default). showGraph: always # displays the whole git graph by default in the commits view (equivalent to @@ -481,6 +533,15 @@ git: # to 40 to disable truncation. truncateCopiedCommitHashesTo: 12 +# Config relating to git worktrees +worktree: + # Default parent directory for new worktrees. It is offered as a candidate + # location alongside the parent directories of any worktrees you already have. + # A relative path is resolved against the repository's root directory, so + # "../worktrees" sits beside the repo and ".worktrees" sits inside it. + # A leading "~" is expanded to your home directory, so "~/worktrees" works. + defaultPath: "" + # Periodic update checks update: # One of: 'prompt' (default) | 'background' | 'never' @@ -499,6 +560,11 @@ refresher: # Auto-fetch can be disabled via option 'git.autoFetch'. fetchInterval: 60 + # Interval in seconds at which lazygit polls for external ref changes (commits, + # branch updates, checkouts made outside lazygit). + # Detection can be disabled via option 'git.autoDetectExternalChanges'. + externalChangeCheckInterval: 2 + # If true, show a confirmation popup before quitting Lazygit confirmOnQuit: false @@ -573,36 +639,30 @@ notARepository: prompt # view the output of the subprocess before returning to Lazygit. promptToReturnFromSubprocess: true -# Keybindings +# Keybindings. +# Each binding can be a single key or a list of keys; see +# https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md +# for the syntax. keybinding: universal: - quit: q - quit-alt1: - suspendApp: + quit: [q, ] + suspendApp: return: quitWithoutChangingDirectory: Q togglePanel: - prevItem: - nextItem: - prevItem-alt: k - nextItem-alt: j + prevItem: [, k] + nextItem: [, j] prevPage: ',' nextPage: . scrollLeft: H scrollRight: L - gotoTop: < - gotoBottom: '>' - gotoTop-alt: - gotoBottom-alt: + gotoTop: [<, ] + gotoBottom: ['>', ] toggleRangeSelect: v - rangeSelectDown: - rangeSelectUp: - prevBlock: - nextBlock: - prevBlock-alt: h - nextBlock-alt: l - nextBlock-alt2: - prevBlock-alt2: + rangeSelectDown: + rangeSelectUp: + prevBlock: [, h, ] + nextBlock: [, l, ] jumpToBlock: - "1" - "2" @@ -613,25 +673,34 @@ keybinding: nextMatch: "n" prevMatch: "N" startSearch: / - optionMenu: - optionMenu-alt1: '?' + + # on Mac + moveWordLeft: + + # on Mac + moveWordRight: + + # on Mac + backspaceWord: + + # on Mac + forwardDeleteWord: + optionMenu: '?' select: goInto: confirm: confirmMenu: confirmSuggestion: - confirmInEditor: - confirmInEditor-alt: + + # on Mac + confirmInEditor: [, ] remove: d new: "n" + newWorktree: w edit: e openFile: o - scrollUpMain: - scrollDownMain: - scrollUpMain-alt1: K - scrollDownMain-alt1: J - scrollUpMain-alt2: - scrollDownMain-alt2: + scrollUpMain: [, K, ] + scrollDownMain: [, J, ] executeShellCommand: ':' createRebaseOptionsMenu: m @@ -641,27 +710,28 @@ keybinding: # 'Files' appended for legacy reasons pullFiles: p refresh: R - createPatchOptionsMenu: + createPatchOptionsMenu: nextTab: ']' prevTab: '[' nextScreenMode: + prevScreenMode: _ - cyclePagers: '|' + cycleDiffRenderers: '|' + cycleDiffRenderersReverse: \ undo: z redo: Z - filteringMenu: - diffingMenu: W - diffingMenu-alt: - copyToClipboard: - openRecentRepos: + filteringMenu: + diffingMenu: [W, ] + copyToClipboard: + openRecentRepos: submitEditorText: extrasMenu: '@' - toggleWhitespaceInDiffView: + toggleWhitespaceInDiffView: increaseContextInDiffView: '}' decreaseContextInDiffView: '{' increaseRenameSimilarityThreshold: ) decreaseRenameSimilarityThreshold: ( - openDiffTool: + openDiffTool: + editConfig: status: checkForUpdate: u recentRepos: @@ -672,7 +742,7 @@ keybinding: commitChangesWithoutHook: w amendLastCommit: A commitChangesWithEditor: C - findBaseCommitForFixup: + findBaseCommitForFixup: confirmDiscard: x ignoreFile: i refreshFiles: r @@ -683,14 +753,15 @@ keybinding: fetch: f toggleTreeView: '`' openMergeOptions: M - openStatusFilter: + openStatusFilter: copyFileInfoToClipboard: "y" collapseAll: '-' expandAll: = branches: createPullRequest: o viewPullRequestOptions: O - copyPullRequestURL: + openPullRequestInBrowser: G + copyPullRequestURL: checkoutBranchByName: c forceCheckoutBranch: F checkoutPreviousBranch: '-' @@ -706,8 +777,6 @@ keybinding: fetchRemote: f addForkRemote: F sortOrder: s - worktrees: - viewWorktreeOptions: w commits: squashDown: s renameCommit: r @@ -717,8 +786,8 @@ keybinding: setFixupMessage: c createFixupCommit: F squashAboveCommits: S - moveDownCommit: - moveUpCommit: + moveDownCommit: [, ] + moveUpCommit: [, ] amendToCommit: A resetCommitAuthor: a pickCommit: p @@ -728,10 +797,11 @@ keybinding: markCommitAsBaseForRebase: B tagCommit: T checkoutCommit: - resetCherryPick: + resetCherryPick: copyCommitAttributeToClipboard: "y" - openLogMenu: + openLogMenu: openInBrowser: o + openPullRequestInBrowser: G viewBisectOptions: b startInteractiveRebase: i selectCommitsOfCurrentBranch: '*' @@ -745,6 +815,8 @@ keybinding: commitFiles: checkoutCommitFile: c main: + prevHunk: [, h] + nextHunk: [, l] toggleSelectHunk: a pickBothHunks: b editSelectHunk: E @@ -753,7 +825,7 @@ keybinding: update: u bulkMenu: b commitMessage: - commitMenu: + commitMenu: ``` @@ -1036,6 +1108,12 @@ keybinding: edit: # disable 'edit file' ``` +### Overriding the platform for default keybindings + +A few keybindings have different defaults on macOS than on Linux and Windows (e.g. word-wise cursor movement in text inputs uses `alt` on macOS but `ctrl` elsewhere). Lazygit picks these based on the OS it's running on, but you can override that with the `LAZYGIT_KEYBINDING_PLATFORM` environment variable. Set it to `darwin`, `linux`, or `windows`; any other value is ignored and the actual OS is used. + +This is useful when running lazygit in a Linux container that you access over ssh from a Mac, where you'd rather use the macOS keybindings. + ### Example Keybindings For Colemak Users ```yaml @@ -1083,6 +1161,8 @@ Where: - `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab`, `gitea` or `codeberg` - `webDomain` is the URL where your git service exposes a web interface and APIs, e.g. `gitservice.work.com` +For the `github` provider, configuring an entry here also enables the pull-request icons in the branches panel for that host (e.g. a GitHub Enterprise Server instance). Lazygit picks up the auth token via the same mechanisms as the `gh` CLI: the `GH_ENTERPRISE_TOKEN` / `GITHUB_ENTERPRISE_TOKEN` environment variables, or `gh auth login --hostname `. + ## Predefined commit message prefix In situations where certain naming pattern is used for branches and commits, pattern can be used to populate commit message with prefix that is parsed from the branch name. diff --git a/docs-master/Custom_Command_Keybindings.md b/docs-master/Custom_Command_Keybindings.md index 18e37463e..55e14d5f1 100644 --- a/docs-master/Custom_Command_Keybindings.md +++ b/docs-master/Custom_Command_Keybindings.md @@ -50,7 +50,7 @@ Custom command keybindings will appear alongside inbuilt keybindings when you vi 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). Custom commands without a key specified can be triggered by selecting them from the keybindings (`?`) menu | no | +| key | The key to trigger the command. Use a single key or list of keys, as described in [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md). Custom commands without a key specified can be triggered by selecting them from the keybindings (`?`) menu | no | | 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 | | prompts | A list of prompts that will request user input before running the final command | no | @@ -102,6 +102,7 @@ These fields are applicable to all prompts. | 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 | +| condition | A Go template expression; if it resolves to empty string or `false`, the prompt is skipped. See [Conditional prompts](#conditional-prompts) | no | ### Input @@ -192,7 +193,7 @@ The permitted option fields are: | 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 | -| key | Keybinding to invoke this menu option without needing to navigate to it. Can be a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | no | +| key | Keybinding to invoke this menu option without needing to navigate to it. Use a single key or list of keys, as described in [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | no | 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: @@ -319,6 +320,41 @@ Here's an example using a command but not specifying anything else: so each line command: 'ls' ``` +### Conditional prompts + +Here's an example of a conditional prompt: + +```yml +customCommands: + - key: 'a' + context: 'localBranches' + prompts: + - type: 'menu' + title: 'How do you want to create the branch?' + key: 'Method' + options: + - value: 'simple' + name: 'Simple' + description: 'just a branch name' + - value: 'prefix' + name: 'With prefix' + description: 'with a category prefix' + - type: 'menu' + title: 'Branch prefix' + key: 'Prefix' + condition: '{{ eq .Form.Method "prefix" }}' + options: + - value: 'feature/' + - value: 'hotfix/' + - value: 'release/' + - type: 'input' + title: 'Branch name' + key: 'Name' + command: "git checkout -b '{{.Form.Prefix}}{{.Form.Name}}'" +``` + +In this example the 'Branch prefix' menu only appears if the user chose 'With prefix'. Otherwise it is skipped and `.Form.Prefix` defaults to empty string. + ## 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: diff --git a/docs-master/Custom_DiffRenderers.md b/docs-master/Custom_DiffRenderers.md new file mode 100644 index 000000000..509f42ebf --- /dev/null +++ b/docs-master/Custom_DiffRenderers.md @@ -0,0 +1,84 @@ +# Custom Diff Renderers + +Custom diff renderers are useful for showing a better rendering of a diff than git's builtin raw diff, and using one is strongly recommended (I personally prefer delta myself, but that's a matter of personal preference). There are three types of diff renderers that lazygit supports: + +- **stdin filters**, e.g. [delta](#delta) and [diff-so-fancy](#diff-so-fancy). They take git's raw output as stdin and produce something nicer on stdout, and they are hooked up using git's GIT_PAGER mechanism. (These used to be called "custom pagers" in earlier lazygit versions.) +- **external diff programs**, e.g. difftastic; these are called using git's `--ext-diff` flag, and they take over diff generation from git completely rather than post-processing git's output. +- **git's raw output using custom arguments**; mainly useful for `--color-words` (or `--word-diff` if you are color blind). + +Diff renderers are configured with the `diffRenderers` array in the `git` section of lazygit's config file; it is an array because you can have multiple entries that you can cycle through with the `|` key. This can be useful if you usually prefer a particular diff renderer, but want to use a different one for certain kinds of diffs. + +Fields that are shared by all renderer types: + +- **type** The type of diff renderer; choices are `stdinFilter`, `extDiff`, or `rawGit`. `stdinFilter` is the default, because it's the most common one; so you can omit this if you use delta. +- **name** A name that is shown in the status bar toast when cycling renderers; defaults to the first word of the renderer command, but can be useful e.g. to distinguish "delta" from "delta side-by-side" if you have entries for both. + +Fields only for `stdinFilter`: + +- **command** The command line to use for `GIT_PAGER`. + +- **colorArg** whether you want the `--color=always` arg in your `git diff` command. Some diff renderers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most renderers need. + +Fields only for `extDiff`: + +- **command** The command line to use for the `diff.external` git config. If left empty, it uses the global value of git's `diff.external` config; this can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. + + You can include the `{{diffContext}}` template variable to pass lazygit's current diff context size (the value controlled by the `{`/`}` keybindings) to the diff tool. + +Fields only for `rawGit`: + +- **args** The additional arguments to use in the `git diff` or `git show` call (e.g. `--color-words`), as an array of strings. + +Here's an example for a multi-renderer setup: + +```yaml +git: + diffRenderers: + - command: delta --dark --paging=never + - command: ydiff -p cat + colorArg: never + - type: extDiff + command: difft --color=always --context={{diffContext}} + - type: rawGit + args: [--color-words] + name: color-words + - type: rawGit # git's default diff + name: default +``` + +## Delta: + +```yaml +git: + diffRenderers: + - command: delta --dark --paging=never +``` + +![](https://i.imgur.com/QJpQkF3.png) + +A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `command:` field to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor. + +Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons. + +## Diff-so-fancy + +```yaml +git: + diffRenderers: + - command: diff-so-fancy +``` + +![](https://i.imgur.com/rjH1TpT.png) + +## ydiff + +```yaml +gui: + sidePanelWidth: 0.2 # gives you more space to show things side-by-side +git: + diffRenderers: + - colorArg: never + command: ydiff -p cat +``` + +![](https://i.imgur.com/vaa8z0H.png) diff --git a/docs-master/Custom_Pagers.md b/docs-master/Custom_Pagers.md deleted file mode 100644 index 83f4e4e62..000000000 --- a/docs-master/Custom_Pagers.md +++ /dev/null @@ -1,118 +0,0 @@ -# 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). - -Support does not extend to Windows users, because we're making use of a package which doesn't have Windows support. However, see [below](#emulating-custom-pagers-on-windows) for a workaround. - -Multiple pagers are supported; you can cycle through them with the `|` key. This can be useful if you usually prefer a particular pager, but want to use a different one for certain kinds of diffs. - -Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup: - -```yaml -git: - pagers: - - pager: delta --dark --paging=never - - pager: ydiff -p cat -s --wrap --width={{columnWidth}} - colorArg: never - - externalDiffCommand: difft --color=always -``` - -The `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most pagers need. - -## Delta: - -```yaml -git: - pagers: - - pager: delta --dark --paging=never -``` - -![](https://i.imgur.com/QJpQkF3.png) - -A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `pager:` config to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor. - -Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons. - -## Diff-so-fancy - -```yaml -git: - pagers: - - pager: diff-so-fancy -``` - -![](https://i.imgur.com/rjH1TpT.png) - -## ydiff - -```yaml -gui: - sidePanelWidth: 0.2 # gives you more space to show things side-by-side -git: - pagers: - - colorArg: never - pager: ydiff -p cat -s --wrap --width={{columnWidth}} -``` - -![](https://i.imgur.com/vaa8z0H.png) - -Be careful with this one, I think the homebrew and pip versions are behind master. I needed to directly download the ydiff script to get the no-pager functionality working. - -## 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: - pagers: - - externalDiffCommand: difft --color=always -``` - -The `colorArg` and `pager` options are not used in this case. - -You can add whatever extra arguments you prefer for your difftool; for instance - -```yaml -git: - pagers: - - externalDiffCommand: difft --color=always --display=inline --syntax-highlight=off -``` - -Instead of setting this command in lazygit's `externalDiffCommand` config, you can also tell lazygit to use the external diff command that is configured in git itself (`diff.external`), by using - -```yaml -git: - pagers: - - useExternalDiffGitConfig: true -``` - -This can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. - -## Emulating custom pagers on Windows - -There is a trick to emulate custom pagers on Windows using a Powershell script configured as an external diff command. It's not perfect, but certainly better than nothing. To do this, save the following script as `lazygit-pager.ps1` at a convenient place on your disk: - -```pwsh -#!/usr/bin/env pwsh - -$old = $args[1].Replace('\', '/') -$new = $args[4].Replace('\', '/') -$path = $args[0] -git diff --no-index --no-ext-diff $old $new - | %{ $_.Replace($old, $path).Replace($new, $path) } - | delta --width=$env:LAZYGIT_COLUMNS -``` - -Use the pager of your choice with the arguments you like in the last line of the script. Personally I wouldn't want to use lazygit anymore without delta's `--hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"` args, see [above](#delta). - -In your lazygit config, use - -```yml -git: - pagers: - - externalDiffCommand: "C:/wherever/lazygit-pager.ps1" -``` - -The main limitation of this approach compared to a "real" pager is that renames are not displayed correctly; they are shown as if they were modifications of the old file. (This affects only the hunk headers; the diff itself is always correct.) diff --git a/docs-master/README.md b/docs-master/README.md index 1bc0bb6be..c586d9699 100644 --- a/docs-master/README.md +++ b/docs-master/README.md @@ -2,7 +2,7 @@ * [Configuration](./Config.md). * [Custom Commands](./Custom_Command_Keybindings.md) -* [Custom Pagers](./Custom_Pagers.md) +* [Custom Diff Renderers](./Custom_DiffRenderers.md) * [Dev docs](./dev) * [Keybindings](./keybindings) * [Undo/Redo](./Undoing.md) diff --git a/docs-master/Searching.md b/docs-master/Searching.md index 589831c55..4cba775df 100644 --- a/docs-master/Searching.md +++ b/docs-master/Searching.md @@ -4,10 +4,14 @@ 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. +In the commits view we don't filter, but search; this is deliberate 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. +## Menu filtering + +The keybindings (`?`) and recent repositories menus can be filtered simply by typing. The filter field appears at the bottom of the menu while you type; there is no need to press `/` or confirm the filter before navigating the results. + ## Filtering files by status You can filter the files view to only show staged/unstaged files by pressing `` in the files view. diff --git a/docs-master/Undoing.md b/docs-master/Undoing.md index 0a4c2f381..032573258 100644 --- a/docs-master/Undoing.md +++ b/docs-master/Undoing.md @@ -1,6 +1,6 @@ # 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. +You can undo the last action by pressing 'z' and redo with 'Z' (shift+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. ![undo](../../assets/demo/undo-compressed.gif) diff --git a/docs-master/keybindings/Custom_Keybindings.md b/docs-master/keybindings/Custom_Keybindings.md index a2537f069..998aae14c 100644 --- a/docs-master/keybindings/Custom_Keybindings.md +++ b/docs-master/keybindings/Custom_Keybindings.md @@ -1,63 +1,97 @@ -## Possible keybindings -| Put in | You will get | -|---------------|----------------| -| `` | F1 | -| `` | F2 | -| `` | F3 | -| `` | F4 | -| `` | F5 | -| `` | F6 | -| `` | F7 | -| `` | F8 | -| `` | F9 | -| `` | F10 | -| `` | F11 | -| `` | F12 | -| `` | Insert | -| `` | Delete | -| `` | Home | -| `` | End | -| `` | Pgup | -| `` | Pgdn | -| `` | ArrowUp | -| `` | ShiftArrowUp | -| `` | ArrowDown | -| `` | ShiftArrowDown | -| `` | ArrowLeft | -| `` | ArrowRight | -| `` | Tab | -| `` | Backtab | -| `` | Enter | -| `` | AltEnter | -| `` | Esc | -| `` | Backspace | -| `` | CtrlSpace | -| `` | CtrlSlash | -| `` | Space | -| `` | CtrlA | -| `` | CtrlB | -| `` | CtrlC | -| `` | CtrlD | -| `` | CtrlE | -| `` | CtrlF | -| `` | CtrlG | -| `` | CtrlJ | -| `` | CtrlK | -| `` | CtrlL | -| `` | CtrlN | -| `` | CtrlO | -| `` | CtrlP | -| `` | CtrlQ | -| `` | CtrlR | -| `` | CtrlS | -| `` | CtrlT | -| `` | CtrlU | -| `` | CtrlV | -| `` | CtrlW | -| `` | CtrlX | -| `` | CtrlY | -| `` | CtrlZ | -| `` | Ctrl4 | -| `` | Ctrl5 | -| `` | Ctrl6 | -| `` | Ctrl8 | +## Custom Keybindings + +A keybinding is one of: + +- A single printable character, e.g. `q`, `?`, `5`. Uppercase letters mean + shift+letter — write `A`, not ``. +- A special key name in angle brackets, e.g. ``, ``, ``. +- A key with modifiers in angle brackets, e.g. ``, ``. +- The literal string `` to disable a binding. +- A list of any of the above, to bind multiple keys to the same action: + `quit: [q, ]`. + +### Modifiers + +Prefix a key with one or more modifiers, joined by `+`: + +| Prefix | Short form | Modifier | +| -------- | ---------- | ----------------------------------------------------------------------------------------- | +| `ctrl+` | `c+` | Ctrl | +| `alt+` | `a+` | Alt | +| `shift+` | `s+` | Shift | +| `meta+` | `m+` | Depends on terminal; typically ⌘ on macOS or Super/Win key, when the terminal forwards it | + +You can also use `-` instead of `+` as the separator. Modifiers may appear in +any order, and short and long forms can be mixed. The whole binding should be +wrapped in angle brackets when it has any modifiers. The following all express +the same binding: + +- `` +- `` +- `` +- `` + +### Special key names + +| Put in | You will get | +| --------------------------------------- | ------------------- | +| `` – `` | F1 – F12 | +| `` | Insert | +| `` | Delete | +| `` | Home | +| `` | End | +| `` | PageUp | +| `` | PageDown | +| `` | ArrowUp | +| `` | ArrowDown | +| `` | ArrowLeft | +| `` | ArrowRight | +| `` | Tab | +| `` | Shift+Tab | +| `` | Enter | +| `` | Escape | +| `` | Backspace | +| `` | Space | +| ``/`` | Mouse wheel up/down | + +These can be combined with modifiers, e.g. ``, ``, ``. + +### Special characters with modifiers + +`` and `` are keyword forms for `-` and `+` when combined with a +modifier (e.g. `` for Ctrl+`-`). Without modifiers, write `-` and +`+` directly. `` is the keyword for the space character. + +### Combinations that are rejected + +These look reasonable but can't actually be delivered by a terminal: + +- `` (shift alone on a rune) — terminals fold shift into the rune + itself, so shift+a arrives as `A`. Write `A` instead. +- ``, ``, etc. (modifier on an uppercase ASCII letter) — write + `` instead. + +### Terminal compatibility + +Support for combinations of modifiers, and in general keybindings beyond plain +letters and ctrl+letter, require a newer terminal protocol that not all +terminals support. + +Terminals that are known to have good support include: Ghostty, kitty, +WezTerm, foot, Konsole, Alacritty, iTerm2, Windows Terminal. + +The default terminal on macOS (Terminal.app) does not; I recommend to switch to +either Ghostty or iTerm2 as a replacement (or one of the others above). + +On Windows, a popular terminal is the MinTTY console that comes with Git for +Windows; this also doesn't support the newer protocol. The recommended +replacement is Windows Terminal, which is very good these days, and Git Bash +runs just fine in it. + +Inside **tmux** or **screen**, extended keys are stripped unless the multiplexer +is configured to forward them. For tmux 3.2+: + +​` +set -g extended-keys on +set -as terminal-features 'xterm*:extkeys' +​` diff --git a/docs-master/keybindings/Keybindings_en.md b/docs-master/keybindings/Keybindings_en.md index 827f6eb34..3ec731bf2 100644 --- a/docs-master/keybindings/Keybindings_en.md +++ b/docs-master/keybindings/Keybindings_en.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Keybindings -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ - ## Global keybindings | Key | Action | Info | |-----|--------|-------------| -| `` `` | Switch to a recent repo | | -| `` (fn+up/shift+k) `` | Scroll up main window | | -| `` (fn+down/shift+j) `` | Scroll down main window | | +| `` `` | Switch to a recent repo | | +| `` , K, (fn+up/shift+k) `` | Scroll up main window | | +| `` , J, (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. | @@ -19,20 +17,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | View custom patch options | | +| `` `` | 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 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Cancel | | | `` ? `` | Open keybindings menu | | -| `` `` | 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. | -| `` `` | 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 | | -| `` `` | Suspend the application | | -| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | Quit | | +| `` `` | Suspend the application | | +| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Edit config file | Open file in external editor. | | `` 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. | | `` 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. | @@ -42,11 +41,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` , `` | Previous page | | | `` . `` | Next page | | -| `` < () `` | Scroll to top | | -| `` > () `` | Scroll to bottom | | +| `` <, `` | Scroll to top | | +| `` >, `` | Scroll to bottom | | | `` v `` | Toggle range select | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | Search the current view by text | | | `` H `` | Scroll left | | | `` L `` | Scroll right | | @@ -57,13 +56,13 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copy path to clipboard | | | `` y `` | Copy to clipboard | | | `` c `` | Checkout | Checkout file. This replaces the file in your working tree with the version from the selected commit. | | `` d `` | Discard | 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | @@ -84,8 +83,8 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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. | @@ -98,27 +97,28 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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). | -| `` `` | Move commit down one | | -| `` `` | Move commit up one | | +| `` , `` | Move commit down one | | +| `` , `` | 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. | -| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | 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 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View files | | -| `` w `` | View worktree options | | | `` / `` | Search the current view by text | | ## Confirmation panel @@ -127,21 +127,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Confirm | | | `` `` | Close/Cancel | | -| `` `` | Copy to clipboard | | +| `` `` | Copy to clipboard | | ## Files | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copy path to clipboard | | | `` `` | Stage | Toggle staged for selected file. | -| `` `` | Filter files by status | | +| `` `` | 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 | | -| `` `` | 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: | +| `` `` | 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: | | `` e `` | Edit | Open file in external editor. | | `` o `` | Open file | Open file in default application. | | `` i `` | Ignore or exclude file | | @@ -154,7 +154,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Fetch | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -173,14 +173,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copy branch name to clipboard | | | `` i `` | Show git-flow options | | | `` `` | Checkout | Checkout selected item. | | `` n `` | New branch | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` o `` | Create pull request | | | `` O `` | View create pull request options | | -| `` `` | Copy pull request URL to clipboard | | +| `` G `` | Open pull request in browser | | +| `` `` | Copy pull request URL to clipboard | | | `` c `` | Checkout by name | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | | `` - `` | Checkout previous branch | | | `` F `` | Force checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | @@ -193,10 +195,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Main panel (merging) @@ -204,11 +205,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Pick hunk | | -| `` b `` | Pick all hunks | | -| `` `` | Previous hunk | | -| `` `` | Next hunk | | -| `` `` | Previous conflict | | -| `` `` | Next conflict | | +| `` b `` | Pick both hunks | | +| `` , k `` | Previous hunk | | +| `` , j `` | Next hunk | | +| `` , h `` | Previous conflict | | +| `` , l `` | 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. | @@ -219,8 +220,8 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Scroll down | | -| `` mouse wheel up (fn+down) `` | Scroll up | | +| `` (fn+up) `` | Scroll down | | +| `` (fn+down) `` | Scroll up | | | `` `` | Switch view | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | Search the current view by text | | @@ -229,11 +230,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Go to previous hunk | | -| `` `` | Go to next hunk | | +| `` , h `` | Go to previous hunk | | +| `` , l `` | Go to next hunk | | | `` v `` | Toggle range select | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected text to clipboard | | | `` o `` | Open file | Open file in default application. | | `` e `` | Edit file | Open file in external editor. | | `` `` | Toggle lines in patch | | @@ -245,11 +246,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Go to previous hunk | | -| `` `` | Go to next hunk | | +| `` , h `` | Go to previous hunk | | +| `` , l `` | Go to next hunk | | | `` v `` | Toggle range select | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected text to clipboard | | | `` `` | 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. | @@ -260,7 +261,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` c `` | Commit | Commit staged changes. | | `` w `` | Commit changes without pre-commit hook | | | `` C `` | Commit changes using git editor | | -| `` `` | 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: | +| `` `` | 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: | | `` / `` | Search the current view by text | | ## Menu @@ -275,39 +276,39 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 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 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remote branches | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copy branch name to clipboard | | | `` `` | Checkout | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | | `` n `` | New branch | | +| `` w `` | New worktree | | | `` M `` | Merge | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remotes @@ -338,17 +339,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | +| `` w `` | New worktree | | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | | `` `` | View files | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Status | 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 | | | `` `` | Switch to a recent repo | | @@ -360,27 +360,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 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 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View files | | -| `` w `` | View worktree options | | | `` / `` | Search the current view by text | | ## Submodules | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy submodule name to clipboard | | +| `` `` | Copy submodule name to clipboard | | | `` `` | Enter | Enter submodule. After entering the submodule, you can press `` to escape back to the parent repo. | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | Update selected submodule. | @@ -394,16 +394,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copy tag to clipboard | | | `` `` | Checkout | Checkout the selected 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. | +| `` w `` | New worktree | | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Worktrees diff --git a/docs-master/keybindings/Keybindings_ja.md b/docs-master/keybindings/Keybindings_ja.md index 759edee95..6a3d9b5c1 100644 --- a/docs-master/keybindings/Keybindings_ja.md +++ b/docs-master/keybindings/Keybindings_ja.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit キーバインディング -_凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味します_ - ## グローバルキーバインド | Key | Action | Info | |-----|--------|-------------| -| `` `` | 最近のリポジトリをチェックアウト | | -| `` (fn+up/shift+k) `` | メインウィンドウを上にスクロール | | -| `` (fn+down/shift+j) `` | メインウィンドウを下にスクロール | | +| `` `` | 最近のリポジトリをチェックアウト | | +| `` , K, (fn+up/shift+k) `` | メインウィンドウを上にスクロール | | +| `` , J, (fn+down/shift+j) `` | メインウィンドウを下にスクロール | | | `` @ `` | コマンドログオプションを表示 | コマンドログのオプションを表示します（例：コマンドログの表示/非表示、コマンドログへのフォーカスなど）。 | | `` P `` | プッシュ | 現在のブランチを対応するアップストリームブランチにプッシュします。アップストリームが設定されていない場合、アップストリームブランチの設定を求められます。 | | `` p `` | プル | 現在のブランチのリモートから変更をプルします。アップストリームが設定されていない場合、アップストリームブランチの設定を求められます。 | @@ -19,20 +17,21 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` } `` | 差分コンテキストサイズを増やす | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | 差分コンテキストサイズを減らす | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | シェルコマンドを実行 | 実行するシェルコマンドを入力するプロンプトを表示します。 | -| `` `` | カスタムパッチオプションを表示 | | +| `` `` | カスタムパッチオプションを表示 | | | `` m `` | マージ/リベースオプションを表示 | 現在のマージ/リベースを中止/継続/スキップするオプションを表示します。 | | `` R `` | 更新 | Gitの状態を更新します（`git status`、`git branch`などをバックグラウンドで実行してパネルの内容を更新します）。これは`git fetch`を実行しません。 | | `` + `` | 次の画面モード（通常/半分/全画面） | | | `` _ `` | 前の画面モード | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | キャンセル | | | `` ? `` | キーバインディングメニューを開く | | -| `` `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 | -| `` W `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 | -| `` `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 | -| `` q `` | 終了 | | -| `` `` | Suspend the application | | -| `` `` | 空白表示の切り替え | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 | +| `` W, `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 | +| `` q, `` | 終了 | | +| `` `` | Suspend the application | | +| `` `` | 空白表示の切り替え | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 設定ファイルを編集 | 外部エディタでファイルを開きます。 | | `` z `` | 元に戻す | 最後のgitコマンドを元に戻すために実行するgitコマンドを決定するためにreflogが使用されます。これにはワーキングツリーへの変更は含まれません。コミットのみが考慮されます。 | | `` Z `` | やり直す | 最後のgitコマンドをやり直すために実行するgitコマンドを決定するためにreflogが使用されます。これにはワーキングツリーへの変更は含まれません。コミットのみが考慮されます。 | @@ -42,11 +41,11 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 |-----|--------|-------------| | `` , `` | 前のページ | | | `` . `` | 次のページ | | -| `` < () `` | 先頭にスクロール | | -| `` > () `` | 末尾にスクロール | | +| `` <, `` | 先頭にスクロール | | +| `` >, `` | 末尾にスクロール | | | `` v `` | 範囲選択を切り替え | | -| `` `` | 範囲選択を下に | | -| `` `` | 範囲選択を上に | | +| `` `` | 範囲選択を下に | | +| `` `` | 範囲選択を上に | | | `` / `` | 現在のビューをテキストで検索 | | | `` H `` | 左にスクロール | | | `` L `` | 右にスクロール | | @@ -64,8 +63,8 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | | `` b `` | bisectオプションを表示 | | | `` s `` | スカッシュ | 選択したコミットをその下のコミットにスカッシュします。スカッシュとは複数のコミットを1つにまとめる操作です。選択したコミットのメッセージが下のコミットに追加されます。 | | `` f `` | フィックスアップ | 選択したコミットをその下のコミットにマージします。フィックスアップはスカッシュと似ていますが、選択したコミットのメッセージは破棄され、下のコミットのメッセージのみが保持されます。 | @@ -78,40 +77,41 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` p `` | ピック | 選択したコミットをピックするようにマークします（リベース中）。これは、リベースを続行すると、コミットが保持されることを意味します。 | | `` F `` | fixupコミットを作成 | 選択したコミットに対する「fixup!」コミットを作成します。fixupコミットは、選択したコミットの修正用コミットです。後で、同じコミットで `S` を押すと、上記のすべてのfixupコミットが適用されます。 | | `` S `` | fixupコミットを適用 | すべての「fixup!」コミットを、選択したコミットの上部または現在のブランチ内のすべてをスカッシュします（autosquash）。 | -| `` `` | コミットを1つ下に移動 | | -| `` `` | コミットを1つ上に移動 | | +| `` , `` | コミットを1つ下に移動 | | +| `` , `` | コミットを1つ上に移動 | | | `` V `` | ペースト（チェリーピック） | | | `` B `` | リベース用のベースコミットとしてマーク | 次のリベース用のベースコミットを選択します。ブランチにリベースするとき、ベースコミットより上のコミットのみが持ち込まれます。これは `git rebase --onto` コマンドを使用します。 | | `` A `` | 修正 | ステージされた変更でコミットを修正します。選択したコミットがHEADコミットの場合、これは `git commit --amend` を実行します。それ以外の場合、コミットはリベースを通じて修正されます。 | | `` a `` | コミット属性を修正 | コミット作者の設定/リセットまたは共同作者の設定を行います。 | | `` t `` | リバート | 選択したコミットの変更を逆に適用する、リバートコミットを作成します。 | | `` T `` | コミットにタグを付ける | 選択したコミットを指すタグを新規作成します。タグ名とオプションの説明を入力するよう促されます。 | -| `` `` | ログオプションを表示 | コミットログのオプションを表示します（例：並び順の変更、Gitグラフの非表示、Gitグラフ全体の表示）。 | +| `` `` | ログオプションを表示 | コミットログのオプションを表示します（例：並び順の変更、Gitグラフの非表示、Gitグラフ全体の表示）。 | +| `` G `` | Open pull request in browser | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したコミットをデタッチドヘッド（特定のブランチに属さない状態）としてチェックアウトします。 | | `` y `` | コミット属性をクリップボードにコピー | コミット属性をクリップボードにコピーします（例：ハッシュ、URL、差分、メッセージ、作者）。 | | `` o `` | ブラウザでコミットを開く | | | `` n `` | コミットから新しいブランチを作成 | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `` を押して選択をキャンセルできます。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | ファイルを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストで検索 | | ## コミットファイル | Key | Action | Info | |-----|--------|-------------| -| `` `` | パスをクリップボードにコピー | | +| `` `` | パスをクリップボードにコピー | | | `` y `` | クリップボードにコピー | | | `` c `` | チェックアウト（ブランチの切り替え） | ファイルをチェックアウトします。これにより、作業ツリー内のファイルが選択したコミットのバージョンに置き換えられます。 | | `` d `` | 破棄 | このコミットのこのファイルへの変更を破棄します。これはバックグラウンドで対話的なリベースを実行するため、後のコミットでもこのファイルが変更されている場合、マージコンフリクトが発生する可能性があります。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` e `` | 編集 | 外部エディタでファイルを開きます。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` `` | パッチに含めるファイルを切り替え | ファイルがカスタムパッチに含まれるかどうかを切り替えます。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 | | `` a `` | すべてのファイルを切り替え | コミットのすべてのファイルをカスタムパッチに追加/削除します。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 | | `` `` | ファイルに入る / ディレクトリの折りたたみを切り替える | ファイルが選択されている場合、そのファイルに入ってカスタムパッチに個々の行を追加/削除できます。ディレクトリが選択されている場合、ディレクトリを切り替えます。 | @@ -132,27 +132,27 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したコミットをデタッチドヘッド（特定のブランチに属さない状態）としてチェックアウトします。 | | `` y `` | コミット属性をクリップボードにコピー | コミット属性をクリップボードにコピーします（例：ハッシュ、URL、差分、メッセージ、作者）。 | | `` o `` | ブラウザでコミットを開く | | | `` n `` | コミットから新しいブランチを作成 | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `` を押して選択をキャンセルできます。 | -| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | ファイルを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストで検索 | | ## サブモジュール | Key | Action | Info | |-----|--------|-------------| -| `` `` | サブモジュール名をクリップボードにコピー | | +| `` `` | サブモジュール名をクリップボードにコピー | | | `` `` | 入る | サブモジュールに入ります。サブモジュールに入った後、``を押して親リポジトリに戻ることができます。 | | `` d `` | 削除 | 選択したサブモジュールとそれに対応するディレクトリを削除します。 | | `` u `` | 更新 | 選択したサブモジュールを更新します。 | @@ -170,17 +170,16 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` g `` | ポップ | スタッシュエントリをワーキングディレクトリに適用し、スタッシュエントリを削除します。 | | `` d `` | 削除 | スタッシュリストからスタッシュエントリを削除します。 | | `` n `` | 新しいブランチ | 選択したスタッシュエントリから新しいブランチを作成します。これは、スタッシュエントリが作成されたコミットをgitがチェックアウトし、そのコミットから新しいブランチを作成した後、スタッシュエントリを追加のコミットとして新しいブランチに適用することで機能します。 | +| `` w `` | 新しいワークツリー | | | `` r `` | スタッシュの名前を変更 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | ファイルを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ステータス | Key | Action | Info | |-----|--------|-------------| -| `` o `` | 設定ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` e `` | 設定ファイルを編集 | 外部エディタでファイルを開きます。 | | `` u `` | 更新を確認 | | | `` `` | 最近のリポジトリをチェックアウト | | @@ -200,31 +199,31 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | タグをクリップボードにコピー | | +| `` `` | タグをクリップボードにコピー | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したタグをデタッチドHEADとしてチェックアウトします。 | | `` n `` | 新しいタグを作成 | 現在のコミットから新しいタグを作成します。タグ名とオプションの説明を入力するよう促されます。 | +| `` w `` | 新しいワークツリー | | | `` d `` | 削除 | ローカル/リモートタグの削除オプションを表示します。 | | `` P `` | タグをプッシュ | 選択したタグをリモートにプッシュします。リモートを選択するよう促されます。 | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ファイル | Key | Action | Info | |-----|--------|-------------| -| `` `` | パスをクリップボードにコピー | | +| `` `` | パスをクリップボードにコピー | | | `` `` | ステージ | 選択したファイルのステージ状態を切り替えます。 | -| `` `` | ステータスでファイルをフィルタリング | | +| `` `` | ステータスでファイルをフィルタリング | | | `` y `` | クリップボードにコピー | | | `` c `` | コミット | ステージされた変更をコミットします。 | | `` w `` | pre-commitフックなしで変更をコミット | | | `` A `` | 直前のコミットを修正 | | | `` C `` | Gitエディタを使用して変更をコミット | | -| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | +| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | | `` e `` | 編集 | 外部エディタでファイルを開きます。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` i `` | ファイルを無視または除外 | | @@ -237,7 +236,7 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` g `` | アップストリームへのリセットオプションを表示 | | | `` D `` | リセット | 作業ツリーのリセットオプション（例：作業ツリーの完全破棄）を表示します。 | | `` ` `` | ファイルツリービューを切り替え | ファイル表示をフラット表示とツリー表示で切り替えます。フラット表示はすべてのファイルパスを一覧で表示し、ツリー表示はディレクトリごとにファイルをグループ化します。

デフォルトは設定ファイル内の 'gui.showFileTree' キーで変更できます。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | フェッチ | リモートから変更をフェッチします。 | | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます | @@ -249,11 +248,11 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 前のハンクに移動 | | -| `` `` | 次のハンクに移動 | | +| `` , h `` | 前のハンクに移動 | | +| `` , l `` | 次のハンクに移動 | | | `` v `` | 範囲選択を切り替え | | | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 選択したテキストをクリップボードにコピー | | +| `` `` | 選択したテキストをクリップボードにコピー | | | `` `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 | | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | @@ -264,18 +263,18 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` c `` | コミット | ステージされた変更をコミットします。 | | `` w `` | pre-commitフックなしで変更をコミット | | | `` C `` | Gitエディタを使用して変更をコミット | | -| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | +| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | | `` / `` | 現在のビューをテキストで検索 | | ## メインパネル（パッチ作成） | Key | Action | Info | |-----|--------|-------------| -| `` `` | 前のハンクに移動 | | -| `` `` | 次のハンクに移動 | | +| `` , h `` | 前のハンクに移動 | | +| `` , l `` | 次のハンクに移動 | | | `` v `` | 範囲選択を切り替え | | | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 選択したテキストをクリップボードにコピー | | +| `` `` | 選択したテキストをクリップボードにコピー | | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 | | `` `` | パッチ内の行を切り替え | | @@ -288,11 +287,11 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| | `` `` | ハンクを選択 | | -| `` b `` | すべてのハンクを選択 | | -| `` `` | 前のハンク | | -| `` `` | 次のハンク | | -| `` `` | 前のコンフリクト | | -| `` `` | 次のコンフリクト | | +| `` b `` | Pick both hunks | | +| `` , k `` | 前のハンク | | +| `` , j `` | 次のハンク | | +| `` , h `` | 前のコンフリクト | | +| `` , l `` | 次のコンフリクト | | | `` z `` | 元に戻す | 最後のマージコンフリクト解決を元に戻します。 | | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | @@ -303,8 +302,8 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 下にスクロール | | -| `` mouse wheel up (fn+down) `` | 上にスクロール | | +| `` (fn+up) `` | 下にスクロール | | +| `` (fn+down) `` | 上にスクロール | | | `` `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 | | `` `` | サイドパネルに戻る | | | `` / `` | 現在のビューをテキストで検索 | | @@ -321,20 +320,20 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したコミットをデタッチドヘッド（特定のブランチに属さない状態）としてチェックアウトします。 | | `` y `` | コミット属性をクリップボードにコピー | コミット属性をクリップボードにコピーします（例：ハッシュ、URL、差分、メッセージ、作者）。 | | `` o `` | ブラウザでコミットを開く | | | `` n `` | コミットから新しいブランチを作成 | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `` を押して選択をキャンセルできます。 | -| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## リモート @@ -353,33 +352,35 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | ブランチ名をクリップボードにコピー | | +| `` `` | ブランチ名をクリップボードにコピー | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したリモートブランチに基づいて新しいローカルブランチをチェックアウトするか、リモートブランチをデタッチドヘッドとしてチェックアウトします。 | | `` n `` | 新しいブランチ | | +| `` w `` | 新しいワークツリー | | | `` M `` | マージ | 選択した項目を現在のブランチにマージするためのオプションを表示します（通常のマージ、スカッシュマージ） | | `` r `` | リベース | チェックアウトしたブランチを選択したブランチ上にリベースします。 | | `` d `` | 削除 | リモートからリモートブランチを削除します。 | | `` u `` | アップストリームとして設定 | 選択したリモートブランチをチェックアウトされたブランチのアップストリームとして設定します。 | | `` s `` | 並び順 | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ローカルブランチ | Key | Action | Info | |-----|--------|-------------| -| `` `` | ブランチ名をクリップボードにコピー | | +| `` `` | ブランチ名をクリップボードにコピー | | | `` i `` | git-flowオプションを表示 | | | `` `` | チェックアウト（ブランチの切り替え） | 選択した項目をチェックアウトします。 | | `` n `` | 新しいブランチ | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` o `` | プルリクエストを作成 | | | `` O `` | プルリクエスト作成オプションを表示 | | -| `` `` | プルリクエストURLをクリップボードにコピー | | +| `` G `` | Open pull request in browser | | +| `` `` | プルリクエストURLをクリップボードにコピー | | | `` c `` | 名前でチェックアウト | 名前でチェックアウトします。入力ボックスに「-」を入力すると、最後のブランチをチェックアウトすることができます。 | | `` - `` | 直前のブランチにチェックアウト | | | `` F `` | 強制チェックアウト | 選択したブランチを強制的にチェックアウトします。これにより、選択したブランチをチェックアウトする前にワーキングディレクトリ内のすべてのローカル変更が破棄されます。 | @@ -392,10 +393,9 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` g `` | リセット | | | `` R `` | ブランチ名を変更 | | | `` u `` | アップストリームオプションを表示 | ブランチのアップストリームに関連するオプションを表示します（例：アップストリームの設定/解除やアップストリームへのリセット）。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ワークツリー @@ -414,4 +414,4 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 |-----|--------|-------------| | `` `` | 確認 | | | `` `` | 閉じる/キャンセル | | -| `` `` | クリップボードにコピー | | +| `` `` | クリップボードにコピー | | diff --git a/docs-master/keybindings/Keybindings_ko.md b/docs-master/keybindings/Keybindings_ko.md index 608a67963..a0e5d84dc 100644 --- a/docs-master/keybindings/Keybindings_ko.md +++ b/docs-master/keybindings/Keybindings_ko.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 키 바인딩 -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ - ## 글로벌 키 바인딩 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 최근에 사용한 저장소로 전환 | | -| `` (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | | -| `` (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | | +| `` `` | 최근에 사용한 저장소로 전환 | | +| `` , K, (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | | +| `` , J, (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. | @@ -19,20 +17,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | 커스텀 Patch 옵션 보기 | | +| `` `` | 커스텀 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) | | | `` _ `` | 이전 스크린 모드 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | 취소 | | | `` ? `` | 매뉴 열기 | | -| `` `` | 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. | -| `` `` | 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 `` | 종료 | | -| `` `` | Suspend the application | | -| `` `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | 종료 | | +| `` `` | Suspend the application | | +| `` `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 설정 파일 수정 | Open file in external editor. | | `` 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. | | `` 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. | @@ -42,11 +41,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` , `` | 이전 페이지 | | | `` . `` | 다음 페이지 | | -| `` < () `` | 맨 위로 스크롤 | | -| `` > () `` | 맨 아래로 스크롤 | | +| `` <, `` | 맨 위로 스크롤 | | +| `` >, `` | 맨 아래로 스크롤 | | | `` v `` | 드래그 선택 전환 | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | 검색 시작 | | | `` H `` | 우 스크롤 | | | `` L `` | 좌 스크롤 | | @@ -64,20 +63,20 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 체크아웃 | Checkout the selected commit as a detached HEAD. | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | 브라우저에서 커밋 열기 | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (copied) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Secondary @@ -96,30 +95,30 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | +| `` w `` | New worktree | | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Sub-commits | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 체크아웃 | Checkout the selected commit as a detached HEAD. | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | 브라우저에서 커밋 열기 | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (copied) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | -| `` w `` | View worktree options | | | `` / `` | 검색 시작 | | ## Worktrees @@ -145,11 +144,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Pick hunk | | -| `` b `` | Pick all hunks | | -| `` `` | 이전 hunk를 선택 | | -| `` `` | 다음 hunk를 선택 | | -| `` `` | 이전 충돌을 선택 | | -| `` `` | 다음 충돌을 선택 | | +| `` b `` | Pick both hunks | | +| `` , k `` | 이전 hunk를 선택 | | +| `` , j `` | 다음 hunk를 선택 | | +| `` , h `` | 이전 충돌을 선택 | | +| `` , l `` | 다음 충돌을 선택 | | | `` z `` | 되돌리기 | Undo last merge conflict resolution. | | `` e `` | 파일 편집 | Open file in external editor. | | `` o `` | 파일 닫기 | Open file in default application. | @@ -160,8 +159,8 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 아래로 스크롤 | | -| `` mouse wheel up (fn+down) `` | 위로 스크롤 | | +| `` (fn+up) `` | 아래로 스크롤 | | +| `` (fn+down) `` | 위로 스크롤 | | | `` `` | 패널 전환 | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | 검색 시작 | | @@ -170,11 +169,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 이전 hunk를 선택 | | -| `` `` | 다음 hunk를 선택 | | +| `` , h `` | 이전 hunk를 선택 | | +| `` , l `` | 다음 hunk를 선택 | | | `` v `` | 드래그 선택 전환 | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` `` | 선택한 텍스트를 클립보드에 복사 | | | `` o `` | 파일 닫기 | Open file in default application. | | `` e `` | 파일 편집 | Open file in external editor. | | `` `` | Line(s)을 패치에 추가/삭제 | | @@ -186,11 +185,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 이전 hunk를 선택 | | -| `` `` | 다음 hunk를 선택 | | +| `` , h `` | 이전 hunk를 선택 | | +| `` , l `` | 다음 hunk를 선택 | | | `` v `` | 드래그 선택 전환 | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` `` | 선택한 텍스트를 클립보드에 복사 | | | `` `` | 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. | @@ -201,21 +200,23 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. | | `` w `` | Commit changes without pre-commit hook | | | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | -| `` `` | 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: | +| `` `` | 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: | | `` / `` | 검색 시작 | | ## 브랜치 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 브랜치명을 클립보드에 복사 | | +| `` `` | 브랜치명을 클립보드에 복사 | | | `` i `` | Git-flow 옵션 보기 | | | `` `` | 체크아웃 | Checkout selected item. | | `` n `` | 새 브랜치 생성 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` o `` | 풀 리퀘스트 생성 | | | `` O `` | 풀 리퀘스트 생성 옵션 | | -| `` `` | 풀 리퀘스트 URL을 클립보드에 복사 | | +| `` G `` | Open pull request in browser | | +| `` `` | 풀 리퀘스트 URL을 클립보드에 복사 | | | `` c `` | 이름으로 체크아웃 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | | `` - `` | Checkout previous branch | | | `` F `` | 강제 체크아웃 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | @@ -228,17 +229,15 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` 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 `` | 업데이트 확인 | | | `` `` | 최근에 사용한 저장소로 전환 | | @@ -250,7 +249,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 서브모듈 이름을 클립보드에 복사 | | +| `` `` | 서브모듈 이름을 클립보드에 복사 | | | `` `` | Enter | 서브모듈 열기 | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | 서브모듈 업데이트 | @@ -276,27 +275,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 브랜치명을 클립보드에 복사 | | +| `` `` | 브랜치명을 클립보드에 복사 | | | `` `` | 체크아웃 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | | `` n `` | 새 브랜치 생성 | | +| `` w `` | New worktree | | | `` M `` | 현재 브랜치에 병합 | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. | | `` d `` | 삭제 | 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## 커밋 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Reset cherry-picked (copied) commits selection | | | `` b `` | Bisect 옵션 보기 | | | `` 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. | @@ -309,40 +308,41 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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) | -| `` `` | 커밋을 1개 아래로 이동 | | -| `` `` | 커밋을 1개 위로 이동 | | +| `` , `` | 커밋을 1개 아래로 이동 | | +| `` , `` | 커밋을 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. | -| `` `` | 로그 메뉴 열기 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` `` | 로그 메뉴 열기 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | 체크아웃 | Checkout the selected commit as a detached HEAD. | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | 브라우저에서 커밋 열기 | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | -| `` w `` | View worktree options | | | `` / `` | 검색 시작 | | ## 커밋 파일 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 파일명을 클립보드에 복사 | | +| `` `` | 파일명을 클립보드에 복사 | | | `` y `` | 클립보드에 복사 | | | `` c `` | 체크아웃 | Checkout file | | `` d `` | View 'discard changes' options | Discard this commit's changes to this file | | `` o `` | 파일 닫기 | Open file in default application. | | `` e `` | Edit | Open file in external editor. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | @@ -363,31 +363,31 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copy tag to clipboard | | | `` `` | 체크아웃 | Checkout the selected tag as a detached HEAD. | | `` n `` | 태그를 생성 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. | +| `` w `` | New worktree | | | `` d `` | 삭제 | 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 `` | 초기화 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## 파일 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 파일명을 클립보드에 복사 | | +| `` `` | 파일명을 클립보드에 복사 | | | `` `` | Staged 전환 | Toggle staged for selected file. | -| `` `` | 파일을 필터하기 (Staged/unstaged) | | +| `` `` | 파일을 필터하기 (Staged/unstaged) | | | `` y `` | 클립보드에 복사 | | | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. | | `` w `` | Commit changes without pre-commit hook | | | `` A `` | 마지맛 커밋 수정 | | | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | -| `` `` | 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: | +| `` `` | 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: | | `` e `` | Edit | Open file in external editor. | | `` o `` | 파일 닫기 | Open file in default application. | | `` i `` | Ignore file | | @@ -400,7 +400,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` g `` | View upstream reset options | | | `` D `` | 초기화 | 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Fetch | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -414,4 +414,4 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | 확인 | | | `` `` | 닫기/취소 | | -| `` `` | 클립보드에 복사 | | +| `` `` | 클립보드에 복사 | | diff --git a/docs-master/keybindings/Keybindings_nl.md b/docs-master/keybindings/Keybindings_nl.md index 8f59d5c21..0f01dea7c 100644 --- a/docs-master/keybindings/Keybindings_nl.md +++ b/docs-master/keybindings/Keybindings_nl.md @@ -2,39 +2,38 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Sneltoetsen -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ - ## Globale sneltoetsen | Key | Action | Info | |-----|--------|-------------| -| `` `` | Wissel naar een recente repo | | -| `` (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | | -| `` (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. | +| `` `` | Wissel naar een recente repo | | +| `` , K, (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | | +| `` , J, (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | | +| `` @ `` | Commandolog opties weergeven | Bekijk commandolog opties, bijv. commandolog tonen/verbergen en focus. | +| `` P `` | Push | Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. | +| `` p `` | Pull | Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. | | `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | Bekijk aangepaste patch opties | | -| `` m `` | Bekijk merge/rebase opties | View options to abort/continue/skip the current merge/rebase. | +| `` : `` | Voer shellcommando uit | Bring up a prompt where you can enter a shell command to execute. | +| `` `` | Bekijk aangepaste patch opties | | +| `` m `` | Bekijk merge/rebase opties | Toon abort/continue/skip opties voor huidige 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 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Annuleren | | | `` ? `` | Open menu | | -| `` `` | 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. | -| `` `` | 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 | | -| `` `` | Suspend the application | | -| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | Afsluiten | | +| `` `` | Pauzeer de applicatie | | +| `` `` | Witruimte weergeven in-/uitschakelen | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Verander config bestand | Open bestand in externe editor. | | `` 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. | -| `` 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. | +| `` Z `` | Redo (via reflog) (experimenteel) | Het reflog wordt gebruikt om te bepalen welk git commando moet worden gebruikt om het laatste git commando te herhalen. Wijzigingen aan de working tree worden niet meegenomen, alleen command's zijn kandidaten. | ## Lijstpaneel navigatie @@ -42,14 +41,14 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` , `` | Vorige pagina | | | `` . `` | Volgende pagina | | -| `` < () `` | Scroll naar boven | | -| `` > () `` | Scroll naar beneden | | +| `` <, `` | Scroll naar boven | | +| `` >, `` | Scroll naar beneden | | | `` v `` | Toggle drag selecteer | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | Start met zoeken | | -| `` H `` | Scroll left | | -| `` L `` | Scroll right | | +| `` H `` | Scroll naar links | | +| `` L `` | Scroll naar rechts | | | `` ] `` | Volgende tabblad | | | `` [ `` | Vorige tabblad | | @@ -57,17 +56,17 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer de bestandsnaam naar het klembord | | +| `` `` | Kopieer de bestandsnaam naar het klembord | | | `` `` | Toggle staged | Toggle staged for selected file. | -| `` `` | Filter files by status | | -| `` y `` | Copy to clipboard | | -| `` c `` | Commit veranderingen | Commit staged changes. | +| `` `` | Filter bestanden op status | | +| `` y `` | Kopieer naar klembord | | +| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. | | `` w `` | Commit veranderingen zonder pre-commit hook | | | `` A `` | Wijzig laatste commit | | | `` C `` | Commit veranderingen met de git editor | | -| `` `` | 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: | -| `` e `` | Edit | Open file in external editor. | -| `` o `` | Open bestand | Open file in default application. | +| `` `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: | +| `` e `` | Edit | Open bestand in externe editor. | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | | `` i `` | Ignore or exclude file | | | `` r `` | Refresh bestanden | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. | @@ -76,13 +75,13 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` `` | 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). | +| `` D `` | Resetten | 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | -| `` M `` | View merge conflict options | View options for resolving merge conflicts. | +| `` `` | Open externe diff applicatie (git difftool) | | +| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. | | `` f `` | Fetch | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | +| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit | | `` 0 `` | Focus main view | | | `` / `` | Filter the current view by text | | @@ -92,25 +91,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Bevestig | | | `` `` | Sluiten | | -| `` `` | Copy to clipboard | | +| `` `` | Kopieer naar klembord | | ## Branches | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer branch name naar klembord | | +| `` `` | Kopieer branch name naar klembord | | | `` i `` | Laat git-flow opties zien | | -| `` `` | Uitchecken | Checkout selected item. | +| `` `` | Uitchecken | Geselecteerd item uitchecken. | | `` n `` | Nieuwe branch | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` o `` | Maak een pull-request | | | `` O `` | Bekijk opties voor pull-aanvraag | | -| `` `` | Kopieer de URL van het pull-verzoek naar het klembord | | +| `` G `` | Open pull request in browser | | +| `` `` | 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 previous branch. | -| `` - `` | Checkout previous branch | | +| `` - `` | Vorige branch uitchecken | | | `` 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. | +| `` d `` | Verwijderen | View delete options for local/remote branch. | +| `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. | | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. | | `` T `` | Creëer tag | | @@ -118,10 +119,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Commit bericht @@ -135,19 +135,19 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer de bestandsnaam naar het klembord | | -| `` y `` | Copy to clipboard | | +| `` `` | Kopieer de bestandsnaam naar het klembord | | +| `` y `` | Kopieer naar klembord | | | `` c `` | Uitchecken | Bestand uitchecken | | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | Uitsluit deze commit zijn veranderingen aan dit bestand | -| `` o `` | Open bestand | Open file in default application. | -| `` e `` | Edit | Open file in external editor. | -| `` `` | Open external diff tool (git difftool) | | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` e `` | Edit | Open bestand in externe editor. | +| `` `` | Open externe diff applicatie (git difftool) | | | `` `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | | `` ` `` | Toggle bestandsboom weergave | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | | `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | +| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit | | `` 0 `` | Focus main view | | | `` / `` | Filter the current view by text | | @@ -155,41 +155,42 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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. | | `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | -| `` r `` | Hernoem commit | Reword the selected commit's message. | +| `` r `` | Hernoem commit | Herschrijf de commit message van de geselecteerde commit. | | `` 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`. | +| `` e `` | Bewerken (start interactieve rebase) | Wijzig commit | +| `` i `` | Start interactieve 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 | -| `` `` | Verplaats commit 1 naar beneden | | -| `` `` | Verplaats commit 1 naar boven | | +| `` , `` | Verplaats commit 1 naar beneden | | +| `` , `` | 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. | +| `` B `` | Markeer als basiscommit voor rebase | Selecteer een basiscommit voor de volgende rebase. Als je rebased op een branch worden alleen commits boven de basiscommit meegenomen. Hiervoor wordt het `git rebase --onto` commando gebruikt. | | `` 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. | -| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | -| `` `` | Uitchecken | Checkout the selected commit as a detached HEAD. | +| `` t `` | Revert | Maak een revert commit voor de geselecteerde commit, die de wijzigingen in deze commit terugdraait. | +| `` T `` | Tag commit | Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving. | +| `` `` | Log opties weergeven | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | +| `` `` | Uitchecken | Check de geselecteerde branch uit als een 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | -| `` w `` | View worktree options | | | `` / `` | Start met zoeken | | ## Input prompt @@ -212,23 +213,23 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Kies stuk | | -| `` b `` | Kies beide stukken | | -| `` `` | Selecteer bovenste hunk | | -| `` `` | Selecteer onderste hunk | | -| `` `` | Selecteer voorgaand conflict | | -| `` `` | Selecteer volgende conflict | | +| `` b `` | Pick both hunks | | +| `` , k `` | Selecteer bovenste hunk | | +| `` , j `` | Selecteer onderste hunk | | +| `` , h `` | Selecteer voorgaand conflict | | +| `` , l `` | 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 `` | View merge conflict options | View options for resolving merge conflicts. | +| `` e `` | Verander bestand | Open bestand in externe editor. | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. | | `` `` | Ga terug naar het bestanden paneel | | ## Normaal | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Scroll omlaag | | -| `` mouse wheel up (fn+down) `` | Scroll omhoog | | +| `` (fn+up) `` | Scroll omlaag | | +| `` (fn+down) `` | Scroll omhoog | | | `` `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | Start met zoeken | | @@ -237,13 +238,13 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Selecteer de vorige hunk | | -| `` `` | Selecteer de volgende hunk | | +| `` , h `` | Selecteer de vorige hunk | | +| `` , l `` | Selecteer de volgende hunk | | | `` v `` | Toggle drag selecteer | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | -| `` o `` | Open bestand | Open file in default application. | -| `` e `` | Verander bestand | Open file in external editor. | +| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. | +| `` `` | Copy selected text to clipboard | | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` e `` | Verander bestand | Open bestand in externe editor. | | `` `` | Voeg toe/verwijder lijn(en) in patch | | | `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | | `` `` | Sluit lijn-bij-lijn modus | | @@ -253,48 +254,48 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Uitchecken | Checkout the selected commit as a detached HEAD. | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Uitchecken | Check de geselecteerde branch uit als een 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remote branches | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer branch name naar klembord | | -| `` `` | Uitchecken | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | +| `` `` | Kopieer branch name naar klembord | | +| `` `` | Uitchecken | Geselecteerde remote branch uitchecken als nieuwe locale branch of als detached head. | | `` n `` | Nieuwe branch | | +| `` w `` | New worktree | | | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) | -| `` 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 | +| `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. | +| `` d `` | Verwijderen | Verwijder de remote branch van de remote. | +| `` u `` | Instellen als 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remotes | Key | Action | Info | |-----|--------|-------------| -| `` `` | View branches | | +| `` `` | Bekijk 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. | +| `` d `` | Verwijderen | Verwijder de geselecteerde remote. Locale branches die een branch tracken van de remote worden niet aangepast. | | `` e `` | Edit | Wijzig remote | | `` f `` | Fetch | Fetch remote | | `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. | @@ -312,22 +313,22 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Selecteer de vorige hunk | | -| `` `` | Selecteer de volgende hunk | | +| `` , h `` | Selecteer de vorige hunk | | +| `` , l `` | Selecteer de volgende hunk | | | `` v `` | Toggle drag selecteer | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. | +| `` `` | Copy selected text to clipboard | | | `` `` | 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. | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` e `` | Verander bestand | Open bestand in externe editor. | | `` `` | Ga terug naar het bestanden paneel | | | `` `` | 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. | +| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. | | `` w `` | Commit veranderingen zonder pre-commit hook | | | `` C `` | Commit veranderingen met de git editor | | -| `` `` | 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: | +| `` `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: | | `` / `` | Start met zoeken | | ## Stash @@ -338,18 +339,17 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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 | | +| `` w `` | New worktree | | +| `` r `` | Hernoem stash | | | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Status | Key | Action | Info | |-----|--------|-------------| -| `` o `` | Open config bestand | Open file in default application. | -| `` e `` | Verander config bestand | Open file in external editor. | +| `` e `` | Verander config bestand | Open bestand in externe editor. | | `` u `` | Check voor updates | | | `` `` | Wissel naar een recente repo | | | `` a `` | Show/cycle all branch logs | | @@ -360,29 +360,29 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Uitchecken | Checkout the selected commit as a detached HEAD. | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Uitchecken | Check de geselecteerde branch uit als een 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | -| `` w `` | View worktree options | | | `` / `` | Start met zoeken | | ## Submodules | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer submodule naam naar klembord | | +| `` `` | Kopieer submodule naam naar klembord | | | `` `` | Enter | Enter submodule | -| `` d `` | Remove | Remove the selected submodule and its corresponding directory. | +| `` d `` | Verwijderen | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | Update selected submodule. | | `` n `` | Voeg nieuwe submodule toe | | | `` e `` | Update submodule URL | | @@ -394,16 +394,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | -| `` `` | Uitchecken | Checkout the selected 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Copy tag to clipboard | | +| `` `` | Uitchecken | Geselecteerde tag uitchecken als detached HEAD. | +| `` n `` | Creëer tag | Maak een nieuwe tag die naar de huidige commit wijst. Je wordt gevraagd om een tag naam en optionele beschrijving. | +| `` w `` | New worktree | | +| `` d `` | Verwijderen | View delete options for local/remote tag. | +| `` P `` | Tag pushen | Push de geselecteerde tag naar een remote. Je krijgt de optie een remote te selecteren. | +| `` g `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. | +| `` `` | Open externe diff applicatie (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Worktrees @@ -412,6 +412,6 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` n `` | New worktree | | | `` `` | 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. | +| `` o `` | Openen in editor | | +| `` d `` | Verwijderen | 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 | | diff --git a/docs-master/keybindings/Keybindings_pl.md b/docs-master/keybindings/Keybindings_pl.md index 63392c52e..ba46f7c46 100644 --- a/docs-master/keybindings/Keybindings_pl.md +++ b/docs-master/keybindings/Keybindings_pl.md @@ -2,37 +2,36 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Skróty klawiszowe -_Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ - ## Globalne skróty klawiszowe | Key | Action | Info | |-----|--------|-------------| -| `` `` | Przełącz na ostatnie repozytorium | | -| `` (fn+up/shift+k) `` | Przewiń główne okno w górę | | -| `` (fn+down/shift+j) `` | Przewiń główne okno w dół | | +| `` `` | Przełącz na ostatnie repozytorium | | +| `` , K, (fn+up/shift+k) `` | Przewiń główne okno w górę | | +| `` , J, (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. | +| `` p `` | Pociągnij | Pociągnij zmiany ze zdalnego dla bieżącej gałęzi. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej. | | `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` } `` | Zwiększ rozmiar kontekstu w widoku różnic | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Zmniejsz rozmiar kontekstu w widoku różnic | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | Wyświetl opcje niestandardowej łatki | | +| `` : `` | Wykonaj polecenie w powłoce | Bring up a prompt where you can enter a shell command to execute. | +| `` `` | 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 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Anuluj | | | `` ? `` | Otwórz menu przypisań klawiszy | | -| `` `` | 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. | -| `` `` | 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ź | | -| `` `` | Suspend the application | | -| `` `` | Przełącz białe znaki | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | Wyjdź | | +| `` `` | Suspend the application | | +| `` `` | Przełącz białe znaki | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Edytuj plik konfiguracyjny | Otwórz plik w zewnętrznym edytorze. | | `` 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. | | `` 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. | @@ -42,11 +41,11 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ |-----|--------|-------------| | `` , `` | Poprzednia strona | | | `` . `` | Następna strona | | -| `` < () `` | Przewiń do góry | | -| `` > () `` | Przewiń do dołu | | +| `` <, `` | Przewiń do góry | | +| `` >, `` | Przewiń do dołu | | | `` v `` | Przełącz zaznaczenie zakresu | | -| `` `` | Zaznacz zakres w dół | | -| `` `` | Zaznacz zakres w górę | | +| `` `` | Zaznacz zakres w dół | | +| `` `` | Zaznacz zakres w górę | | | `` / `` | Szukaj w bieżącym widoku po tekście | | | `` H `` | Przewiń w lewo | | | `` L `` | Przewiń w prawo | | @@ -57,41 +56,42 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Resetuj wybrane (cherry-picked) commity | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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. | | `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | | `` 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. | +| `` d `` | Usuń | Usuń wybrany commit. To usunie commit z gałęzi za pomocą przebazowania. 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 przebazowanie) | Edytuj wybrany commit. Użyj tego, aby rozpocząć interaktywne przebazowanie od wybranego commita. Podczas trwania przebazowania, to oznaczy wybrany commit do edycji, co oznacza, że po kontynuacji przebazowania, przebazowanie zostanie wstrzymane na wybranym commicie, aby umożliwić wprowadzenie zmian. | +| `` i `` | Rozpocznij interaktywne przebazowanie | Rozpocznij interaktywne przebazowanie dla commitów na twojej gałęzi. To będzie zawierać wszystkie commity od HEAD do pierwszego commita scalenia lub commita głównej gałęzi.
Jeśli zamiast tego chcesz rozpocząć interaktywne przebazowanie od wybranego commita, naciśnij `e`. | +| `` p `` | Wybierz | Oznacz wybrany commit do wybrania (podczas przebazowania). Oznacza to, że commit zostanie zachowany po kontynuacji przebazowania. | | `` 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). | -| `` `` | Przesuń commit w dół | | -| `` `` | Przesuń commit w górę | | +| `` , `` | Przesuń commit w dół | | +| `` , `` | 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. | +| `` B `` | Oznacz jako bazowy commit dla przebazowania | Wybierz bazowy commit dla następnego przebazowania. Kiedy robisz przebazowanie na gałąź, 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ą przebazowania. | | `` 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. | -| `` `` | Zobacz opcje logów | Zobacz opcje dla logów commitów, np. zmiana kolejności sortowania, ukrywanie grafu gita, pokazywanie całego grafu gita. | +| `` `` | Zobacz opcje logów | Zobacz opcje dla logów commitów, np. zmiana kolejności sortowania, ukrywanie grafu gita, pokazywanie całego grafu gita. | +| `` G `` | Otwórz żądanie ściągnięcia w przeglądarce | | | `` `` | 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | | `` 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ąć ``, aby anulować zaznaczenie. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Wyświetl pliki | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Dodatkowy @@ -112,15 +112,35 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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 | | +## Dziennik reflog + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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 | | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | +| `` 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ąć ``, aby anulować zaznaczenie. | +| `` `` | Resetuj wybrane (cherry-picked) commity | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` * `` | Select commits of current branch | | +| `` 0 `` | Focus main view | | +| `` `` | Pokaż commity | | +| `` / `` | Filtruj bieżący widok po tekście | | + ## Główny panel (budowanie łatki) | Key | Action | Info | |-----|--------|-------------| -| `` `` | Idź do poprzedniego fragmentu | | -| `` `` | Idź do następnego fragmentu | | +| `` , h `` | Idź do poprzedniego fragmentu | | +| `` , l `` | Idź do następnego fragmentu | | | `` v `` | Przełącz zaznaczenie zakresu | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Kopiuj zaznaczony tekst do schowka | | +| `` `` | 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. | | `` `` | Przełącz linie w łatce | | @@ -139,16 +159,18 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj nazwę gałęzi do schowka | | +| `` `` | Kopiuj nazwę gałęzi do schowka | | | `` i `` | Pokaż opcje git-flow | | | `` `` | Przełącz | Przełącz wybrany element. | | `` n `` | Nowa gałąź | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | | `` o `` | Utwórz żądanie ściągnięcia | | | `` O `` | Zobacz opcje tworzenia pull requesta | | -| `` `` | Kopiuj adres URL żądania ściągnięcia do schowka | | +| `` G `` | Otwórz żądanie ściągnięcia w przeglądarce | | +| `` `` | 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łąź. | -| `` - `` | Checkout previous branch | | +| `` - `` | Przełącz na poprzednią 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łąź. | @@ -159,10 +181,9 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | ## Menu @@ -177,8 +198,8 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Przewiń w dół | | -| `` mouse wheel up (fn+down) `` | Przewiń w górę | | +| `` (fn+up) `` | Przewiń w dół | | +| `` (fn+down) `` | Przewiń w górę | | | `` `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). | | `` `` | Exit back to side panel | | | `` / `` | Szukaj w bieżącym widoku po tekście | | @@ -188,11 +209,11 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Wybierz fragment | | -| `` b `` | Wybierz wszystkie fragmenty | | -| `` `` | Poprzedni fragment | | -| `` `` | Następny fragment | | -| `` `` | Poprzedni konflikt | | -| `` `` | Następny konflikt | | +| `` b `` | Pick both hunks | | +| `` , k `` | Poprzedni fragment | | +| `` , j `` | Następny fragment | | +| `` , h `` | Poprzedni konflikt | | +| `` , l `` | 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. | @@ -203,11 +224,11 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Idź do poprzedniego fragmentu | | -| `` `` | Idź do następnego fragmentu | | +| `` , h `` | Idź do poprzedniego fragmentu | | +| `` , l `` | Idź do następnego fragmentu | | | `` v `` | Przełącz zaznaczenie zakresu | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Kopiuj zaznaczony tekst do schowka | | +| `` `` | Kopiuj zaznaczony tekst do schowka | | | `` `` | 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. | @@ -218,7 +239,7 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` c `` | Commit | Zatwierdź zmiany zatwierdzone. | | `` w `` | Zatwierdź zmiany bez hooka pre-commit | | | `` C `` | Zatwierdź zmiany używając edytora git | | -| `` `` | 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ę: | +| `` `` | 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ę: | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Panel potwierdzenia @@ -227,21 +248,21 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ |-----|--------|-------------| | `` `` | Potwierdź | | | `` `` | Zamknij/Anuluj | | -| `` `` | Kopiuj do schowka | | +| `` `` | Kopiuj do schowka | | ## Pliki | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj ścieżkę do schowka | | +| `` `` | Kopiuj ścieżkę do schowka | | | `` `` | Zatwierdź | Przełącz zatwierdzenie dla wybranego pliku. | -| `` `` | Filtruj pliki według statusu | | +| `` `` | 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 | | -| `` `` | 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ę: | +| `` `` | 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ę: | | `` 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 | | @@ -254,7 +275,7 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Pobierz | Pobierz zmiany ze zdalnego serwera. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -266,13 +287,13 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj ścieżkę do schowka | | +| `` `` | Kopiuj ścieżkę do schowka | | | `` y `` | Kopiuj do schowka | | | `` c `` | Przełącz | Przełącz plik. Zastępuje plik w twoim drzewie roboczym wersją z wybranego commita. | -| `` d `` | Odrzuć | 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. | +| `` d `` | Odrzuć | Odrzuć zmiany w tym pliku z tego commita. Uruchamia interaktywne przebazowanie 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` `` | Przełącz plik włączony w łatkę | Przełącz, czy plik jest włączony w niestandardową łatkę. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Przełącz wszystkie pliki | Dodaj/usuń wszystkie pliki commita do niestandardowej łatki. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Wejdź do pliku / Przełącz zwiń katalog | Jeśli plik jest wybrany, wejdź do pliku, aby móc dodawać/usuwać poszczególne linie do niestandardowej łatki. Jeśli wybrany jest katalog, przełącz katalog. | @@ -289,26 +310,6 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` `` | Potwierdź | | | `` `` | Zamknij | | -## Reflog - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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ąć ``, aby anulować zaznaczenie. | -| `` `` | Resetuj wybrane (cherry-picked) commity | | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | -| `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | -| `` / `` | Filtruj bieżący widok po tekście | | - ## Schowek | Key | Action | Info | @@ -317,17 +318,16 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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. | +| `` w `` | Nowe drzewo pracy | | | `` r `` | Zmień nazwę schowka | | | `` 0 `` | Focus main view | | | `` `` | Wyświetl pliki | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | ## Status | 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 | | | `` `` | Przełącz na ostatnie repozytorium | | @@ -339,27 +339,27 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | | `` 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ąć ``, aby anulować zaznaczenie. | -| `` `` | Resetuj wybrane (cherry-picked) commity | | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Resetuj wybrane (cherry-picked) commity | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Wyświetl pliki | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Submoduły | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj nazwę submodułu do schowka | | +| `` `` | Kopiuj nazwę submodułu do schowka | | | `` `` | Wejdź | Wejdź do submodułu. Po wejściu do submodułu możesz nacisnąć ``, aby wrócić do repozytorium nadrzędnego. | | `` d `` | Usuń | Usuń wybrany submoduł i odpowiadający mu katalog. | | `` u `` | Aktualizuj | Aktualizuj wybrany submoduł. | @@ -373,16 +373,16 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Skopiuj tag do schowka | | | `` `` | 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. | +| `` w `` | Nowe drzewo pracy | | | `` 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | ## Zdalne @@ -401,17 +401,17 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj nazwę gałęzi do schowka | | +| `` `` | Kopiuj nazwę gałęzi do schowka | | | `` `` | Przełącz | Przełącz na nową lokalną gałąź na podstawie wybranej gałęzi zdalnej. Nowa gałąź będzie śledzić gałąź zdalną. | | `` n `` | Nowa gałąź | | +| `` w `` | Nowe drzewo pracy | | | `` 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | diff --git a/docs-master/keybindings/Keybindings_pt.md b/docs-master/keybindings/Keybindings_pt.md index 56b805065..3071613be 100644 --- a/docs-master/keybindings/Keybindings_pt.md +++ b/docs-master/keybindings/Keybindings_pt.md @@ -1,16 +1,14 @@ _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 Keybindings - -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ +# Lazygit Atalhos do teclado ## Combinações globais de teclas | Key | Action | Info | |-----|--------|-------------| -| `` `` | Mudar para um repositório recente | | -| `` (fn+up/shift+k) `` | Rolar janela principal para cima | | -| `` (fn+down/shift+j) `` | Rolar a janela principal para baixo | | +| `` `` | Mudar para um repositório recente | | +| `` , K, (fn+up/shift+k) `` | Rolar janela principal para cima | | +| `` , J, (fn+down/shift+j) `` | Rolar a janela principal para baixo | | | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. | | `` P `` | Empurre (Push) | Faça push do branch atual para o seu branch upstream. Se nenhum upstream estiver configurado, você será solicitado a configurar um branch a montante. | | `` p `` | Puxar (Pull) | Puxe alterações do controle remoto para o ramo atual. Se nenhum upstream estiver configurado, será solicitado configurar um ramo a montante. | @@ -19,20 +17,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Executar comando da shell | Traga um prompt onde você pode digitar um comando shell para executar. | -| `` `` | Ver opções de patch personalizadas | | +| `` `` | Ver opções de patch personalizadas | | | `` m `` | Ver opções de mesclar/rebase | Ver opções para abortar/continuar/pular o merge/rebase atual. | | `` R `` | Atualizar | Atualize o estado do git (ou seja, execute `git status`, `git branch`, etc em segundo plano para atualizar o conteúdo de painéis). Isso não executa `git fetch`. | -| `` + `` | Next screen mode (normal/half/fullscreen) | | -| `` _ `` | Prev screen mode | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` + `` | Modo de tela seguinte (normal/metade/tela cheia) | | +| `` _ `` | Modo de tela anterior | | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Cancelar | | -| `` ? `` | Open keybindings menu | | -| `` `` | 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. | -| `` `` | 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 `` | Sair | | -| `` `` | Suspend the application | | -| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` ? `` | Abrir o menu de atalhos do teclado | | +| `` `` | Ver opções de filtro | 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. | +| `` q, `` | Sair | | +| `` `` | Suspender a aplicação | | +| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Editar arquivo de configuração | Abrir arquivo no editor externo. | | `` z `` | Desfazer | O reflog será usado para determinar qual comando git para executar para desfazer o último comando git. Isto não inclui mudanças na árvore de trabalho; apenas compromissos são tidos em consideração. | | `` Z `` | Refazer | O reflog será usado para determinar qual comando git para executar para refazer o último comando git. Isto não inclui mudanças na árvore de trabalho; apenas compromissos são tidos em consideração. | @@ -40,32 +39,32 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` , `` | Previous page | | -| `` . `` | Next page | | -| `` < () `` | Scroll to top | | -| `` > () `` | Scroll to bottom | | +| `` , `` | Aba anterior | | +| `` . `` | Próxima aba | | +| `` <, `` | Voltar ao topo | | +| `` >, `` | Ir para o final | | | `` v `` | Toggle range select | | -| `` `` | Range select down | | -| `` `` | Range select up | | -| `` / `` | Search the current view by text | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | Pesquisar na visualização atual por texto | | | `` H `` | Rolar à esquerda | | | `` L `` | Scroll para a direita | | -| `` ] `` | Next tab | | -| `` [ `` | Previous tab | | +| `` ] `` | Próxima aba | | +| `` [ `` | Aba anterior | | ## Arquivos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copiar caminho para área de transferência | | | `` `` | Etapa | Alternar para staging para o arquivo selecionado. | -| `` `` | Filtrar arquivos por status | | +| `` `` | Filtrar arquivos por status | | | `` y `` | Copy to clipboard | | | `` c `` | Commit | Submeter mudanças em staging | | `` w `` | Fazer commit de alterações sem pré-commit | | | `` A `` | Alterar último commit | | | `` C `` | Enviar alteração usando um editor Git | | -| `` `` | Encontrar commit da base para consertar | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| +| `` `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| | `` e `` | Editar | Abrir arquivo no editor externo. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | | `` i `` | Ignore or exclude file | | @@ -78,26 +77,28 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` g `` | View upstream reset options | | | `` D `` | Restaurar | Opções de redefinição de exibição para árvore de trabalho (por exemplo, nukando a árvore de trabalho). | | `` ` `` | Alternar exibição de árvore de arquivo | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Buscar | Buscar alterações do controle remoto. | | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos | | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo | -| `` 0 `` | Focus main view | | -| `` / `` | Filter the current view by text | | +| `` 0 `` | Focar visualização principal | | +| `` / `` | Filtrar a visualização atual por texto | | ## Branches locais | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copiar nome da branch para área de transferência | | | `` i `` | Exibir opções do git-flow | | | `` `` | Verificar | Checar item selecionado | | `` n `` | Nova branch | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` o `` | Create pull request | | +| `` w `` | Nova árvore de trabalho | | +| `` o `` | Criar solicitação de pull | | | `` O `` | View create pull request options | | -| `` `` | Copiar URL do pull request para área de transferência | | +| `` G `` | Open pull request in browser | | +| `` `` | Copiar URL do pull request para área de transferência | | | `` c `` | Checar por nome | Checar por nome. Na caixa de entrada você pode inserir '-' para trocar para a última branch | | `` - `` | Checkout da branch anterior | | | `` F `` | Forçar checagem | Forçar checagem da branch selecionada. Isso irá descartar todas as mudanças no seu diretório de trabalho antes cheque a branch selecionada | @@ -105,66 +106,65 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` r `` | Refazer | Refazer a branch checada na branch selecionada | | `` M `` | Mesclar | Ver opções para mesclar o item selecionado no branch atual (mesclar regularmente, mesclar squash) | | `` f `` | Avanço rápido | Encaminhamento rápido de branch selecionada a partir do upstream. | -| `` T `` | New tag | | +| `` T `` | Nova etiqueta | | | `` s `` | Sort order | | | `` g `` | Restaurar | | -| `` R `` | Rename branch | | +| `` R `` | Renomear branch | | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Branches remotos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copiar nome da branch para área de transferência | | | `` `` | Verificar | Checar a nova branch baseada na brach remota selecionada, ou a branch remota como HEAD, desanexado | | `` n `` | Nova branch | | +| `` w `` | Nova árvore de trabalho | | | `` M `` | Mesclar | Ver opções para mesclar o item selecionado no branch atual (mesclar regularmente, mesclar squash) | | `` r `` | Refazer | Refazer a branch checada na branch selecionada | | `` d `` | Apagar | Excluir o branch remoto do controle remoto. | | `` u `` | Definir como upstream | Definir o ramo remoto selecionado como fluxo do branch check-out. | | `` s `` | Sort order | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Commit arquivos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copiar caminho para área de transferência | | | `` y `` | Copy to clipboard | | | `` c `` | Verificar | Arquivo de check-out. Isso substitui o arquivo em sua árvore de trabalho com a versão do commit selecionado. | | `` d `` | Descartar | Descartar as alterações desse commit para este arquivo. Isso executa uma rebase interativa em segundo plano, então você pode ter um conflito de merge se um commit posterior também alterar este arquivo. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | | `` e `` | Editar | Abrir arquivo no editor externo. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` `` | Alternar entre o arquivo incluído no patch | Alternar se o arquivo está incluído no patch personalizado. Veja https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Alternar todos os arquivos | Adicionar/remover todos os arquivos de commit para atualização personalizada. Consulte https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Insira o arquivo / Alternar diretório recolhido | Se um arquivo estiver selecionado, insira o arquivo para que você possa adicionar/remover linhas individuais no patch personalizado. Se um diretório for selecionado, ative o diretório. | | `` ` `` | Alternar exibição de árvore de arquivo | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos | | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo | -| `` 0 `` | Focus main view | | -| `` / `` | Filter the current view by text | | +| `` 0 `` | Focar visualização principal | | +| `` / `` | Filtrar a visualização atual por texto | | ## Commits | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` b `` | View bisect options | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` b `` | Ver opções de bissecção | | | `` s `` | Squash | Squash o commit selecionado no commit abaixo dele. A mensagem do commit selecionado será anexada ao commit abaixo dele. | -| `` f `` | Fixup | Faça o commit selecionado no commit abaixo dele. Semelhante para o squash, mas a mensagem do commit selecionado será descartada. | -| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | +| `` f `` | Corrigir | Faça o commit selecionado no commit abaixo dele. Semelhante para o squash, mas a mensagem do commit selecionado será descartada. | +| `` c `` | Configurar mensagem de correção | Defina a opção de mensagem para o commit de correção. A opção -C significa usar a mensagem deste commit em vez da mensagem do commit alvo. | | `` r `` | Reword | Repetir a mensagem de submissão selecionada. | | `` R `` | Republicar com o editor | | | `` d `` | Descartar | Solte o commit selecionado. Isso irá remover o commit do branch através de uma rebase. Se o commit faz com que as alterações em commits posteriores dependem, você pode precisar resolver conflitos de merge. | @@ -173,52 +173,45 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` p `` | Escolher | Marque o commit selecionado para ser escolhido (quando meados da base). Isso significa que o commit será mantido ao continuar o rebase. | | `` F `` | Criar commit de correção | Crie o commit 'correção!' para o commit selecionado. Mais tarde, você pode pressionar `S` neste mesmo commit para aplicar todas os commits de correção acima. | | `` S `` | Aplicar commits de correções | Aplicar Squash all 'correção!', seja acima do commit selecionado, ou tudo no branch atual (autosquash). | -| `` `` | Mover commit um para baixo | | -| `` `` | Mover o commit um para cima | | +| `` , `` | Mover commit um para baixo | | +| `` , `` | Mover o commit um para cima | | | `` V `` | Colar (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 `` | Modificar | Alterar o commit com mudanças em sted. Se o commit selecionado for o commit HEAD, ele executará o `git commit --amend`. Caso contrário, o compromisso será alterado por meio de uma base de apoio. | | `` a `` | Alterar atributo de commit | Definir/Redefinir autor de submissão ou co-autor definido. | | `` t `` | Reverter | Crie um commit reverter para o commit selecionado, que aplica as alterações do commit selecionado em reverso. | -| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. | -| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` T `` | Etiquetar commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. | +| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | Verificar | 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 | | +| `` o `` | Abrir commit no navegador | | | `` n `` | Create new branch off of commit | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nova árvore de trabalho | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `` para cancelar a seleção. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` 0 `` | Focar visualização principal | | | `` `` | Ver arquivos | | -| `` w `` | View worktree options | | -| `` / `` | Search the current view by text | | - -## Confirmation panel - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | Confirmar | | -| `` `` | Fechar/Cancelar | | -| `` `` | Copy to clipboard | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Etiquetas | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copiar etiqueta para área de transferência | | | `` `` | Verificar | Checar a tag selecionada como um HEAD, desanexado | -| `` n `` | New tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. | +| `` n `` | Nova etiqueta | Crie uma nova etiqueta a partir do commit atual. Você será solicitado a digitar um nome e uma descrição opcional. | +| `` w `` | Nova árvore de trabalho | | | `` d `` | Apagar | Ver opções de exclusão para tag local/remoto. | -| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. | +| `` P `` | Empurrar etiqueta | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Input prompt @@ -233,27 +226,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Executar | | | `` `` | Fechar/Cancelar | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filtrar a visualização atual por texto | | ## Painel Principal (Normal) | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Rolar para baixo | | -| `` mouse wheel up (fn+down) `` | Rolar para cima | | +| `` (fn+up) `` | Rolar para baixo | | +| `` (fn+down) `` | Rolar para cima | | | `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | | `` `` | Exit back to side panel | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Painel Principal (preparação) | Key | Action | Info | |-----|--------|-------------| -| `` `` | Ir para o local anterior | | -| `` `` | Ir para o próximo trecho | | +| `` , h `` | Ir para o local anterior | | +| `` , l `` | Ir para o próximo trecho | | | `` v `` | Toggle range select | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. | +| `` `` | Copiar texto selecionado para área de transferência | | | `` `` | Etapa | Ativar/desativar seleção em staged/unstaged | | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | @@ -264,19 +257,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` c `` | Commit | Submeter mudanças em staging | | `` w `` | Fazer commit de alterações sem pré-commit | | | `` C `` | Enviar alteração usando um editor Git | | -| `` `` | Encontrar commit da base para consertar | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| -| `` / `` | Search the current view by text | | +| `` `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| +| `` / `` | Pesquisar na visualização atual por texto | | + +## Painel de confirmação + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Confirmar | | +| `` `` | Fechar/Cancelar | | +| `` `` | Copy to clipboard | | ## Painel principal (mesclagem) | Key | Action | Info | |-----|--------|-------------| | `` `` | Escolha o local | | -| `` b `` | Pegar todos os pedaços | | -| `` `` | Trecho anterior | | -| `` `` | Próximo trecho | | -| `` `` | Conflito anterior | | -| `` `` | Próximo conflito | | +| `` b `` | Pick both hunks | | +| `` , k `` | Trecho anterior | | +| `` , j `` | Próximo trecho | | +| `` , h `` | Conflito anterior | | +| `` , l `` | Próximo conflito | | | `` z `` | Desfazer | Desfazer resolução de conflitos de última mesclagem. | | `` e `` | Editar arquivo | Abrir arquivo no editor externo. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | @@ -287,37 +288,37 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Ir para o local anterior | | -| `` `` | Ir para o próximo trecho | | +| `` , h `` | Ir para o local anterior | | +| `` , l `` | Ir para o próximo trecho | | | `` v `` | Toggle range select | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. | +| `` `` | Copiar texto selecionado para área de transferência | | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | | `` e `` | Editar arquivo | Abrir arquivo no editor externo. | | `` `` | Alternar linhas no caminho | | -| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | +| `` d `` | Remover linhas do commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | | `` `` | Sair do construtor de patch personalizado | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Reflog | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Verificar | 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 | | +| `` o `` | Abrir commit no navegador | | | `` n `` | Create new branch off of commit | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nova árvore de trabalho | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `` para cancelar a seleção. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Remotes @@ -329,7 +330,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` e `` | Editar | Edit the selected remote's name or URL. | | `` f `` | Buscar | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. | | `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filtrar a visualização atual por texto | | ## Secundário @@ -337,7 +338,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | | `` `` | Exit back to side panel | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Stash @@ -347,57 +348,56 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` g `` | Pop | Aplique a entrada de stash no seu diretório de trabalho e remova a entrada de stash. | | `` d `` | Descartar | Remova a entrada do stash da lista de armazenamento. | | `` n `` | Nova branch | Criar um novo ramo a partir da entrada de lixo selecionada. Isso funciona verificando o commit do qual a entrada de lixo foi criada, criar um novo branch a partir desse commit e, em seguida, aplicar a entrada de lixo ao novo branch como um commit adicional. | -| `` r `` | Renomear o stasj | | -| `` 0 `` | Focus main view | | +| `` w `` | Nova árvore de trabalho | | +| `` r `` | Renomear o stash | | +| `` 0 `` | Focar visualização principal | | | `` `` | Ver arquivos | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filtrar a visualização atual por texto | | ## Status | Key | Action | Info | |-----|--------|-------------| -| `` o `` | Abrir o ficheiro de config | Abrir arquivo no aplicativo padrão. | | `` e `` | Editar arquivo de configuração | Abrir arquivo no editor externo. | | `` u `` | Verificar atualização | | | `` `` | Mudar para um repositório recente | | | `` a `` | Mostrar/ciclo todos os logs de filiais | | | `` A `` | Show/cycle all branch logs (reverse) | | -| `` 0 `` | Focus main view | | +| `` 0 `` | Focar visualização principal | | ## Sub-commits | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Verificar | 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 | | +| `` o `` | Abrir commit no navegador | | | `` n `` | Create new branch off of commit | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nova árvore de trabalho | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `` para cancelar a seleção. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` 0 `` | Focar visualização principal | | | `` `` | Ver arquivos | | -| `` w `` | View worktree options | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | -## Submodules +## Submódulos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy submodule name to clipboard | | +| `` `` | Copiar o nome do submódulo para área de transferência | | | `` `` | Enter | Enter submodule. After entering the submodule, you can press `` to escape back to the parent repo. | -| `` d `` | Remover | 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. | +| `` d `` | Remover | Remova o submódulo selecionado e o diretório correspondente. | +| `` u `` | Atualizar | Atualizar submódulo selecionado. | +| `` n `` | Novo submódulo | | +| `` e `` | Atualizar URL do submódulo | | +| `` i `` | Inicializar | 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 | | +| `` / `` | Filtrar a visualização atual por texto | | ## Sumário do commit @@ -406,12 +406,12 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` `` | Confirmar | | | `` `` | Fechar | | -## Worktrees +## Árvores de trabalho | Key | Action | Info | |-----|--------|-------------| -| `` n `` | New worktree | | -| `` `` | Switch | Switch to the selected worktree. | +| `` n `` | Nova árvore de trabalho | | +| `` `` | Switch | Mudar para a árvore de trabalho selecionada. | | `` o `` | Abrir no editor | | | `` d `` | Remover | 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 | | +| `` / `` | Filtrar a visualização atual por texto | | diff --git a/docs-master/keybindings/Keybindings_ru.md b/docs-master/keybindings/Keybindings_ru.md index 895e49e63..3d03f9ca6 100644 --- a/docs-master/keybindings/Keybindings_ru.md +++ b/docs-master/keybindings/Keybindings_ru.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Связки клавиш -_Связки клавиш_ - ## Глобальные сочетания клавиш | Key | Action | Info | |-----|--------|-------------| -| `` `` | Переключиться на последний репозиторий | | -| `` (fn+up/shift+k) `` | Прокрутить вверх главную панель | | -| `` (fn+down/shift+j) `` | Прокрутить вниз главную панель | | +| `` `` | Переключиться на последний репозиторий | | +| `` , K, (fn+up/shift+k) `` | Прокрутить вверх главную панель | | +| `` , J, (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. | @@ -19,20 +17,21 @@ _Связки клавиш_ | `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | Просмотреть пользовательские параметры патча | | +| `` `` | Просмотреть пользовательские параметры патча | | | `` 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`. | | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | | | `` _ `` | Предыдущий режим экрана | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Отменить | | | `` ? `` | Открыть меню | | -| `` `` | Просмотреть параметры фильтрации по пути | 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. | -| `` `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. | -| `` q `` | Выйти | | -| `` `` | Suspend the application | | -| `` `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Просмотреть параметры фильтрации по пути | 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. | +| `` q, `` | Выйти | | +| `` `` | Suspend the application | | +| `` `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Редактировать файл конфигурации | Open file in external editor. | | `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | | `` Z `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | @@ -42,11 +41,11 @@ _Связки клавиш_ |-----|--------|-------------| | `` , `` | Предыдущая страница | | | `` . `` | Следующая страница | | -| `` < () `` | Пролистать наверх | | -| `` > () `` | Прокрутить вниз | | +| `` <, `` | Пролистать наверх | | +| `` >, `` | Прокрутить вниз | | | `` v `` | Переключить выборку перетаскивания | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | Найти | | | `` H `` | Прокрутить влево | | | `` L `` | Прокрутить вправо | | @@ -82,11 +81,11 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Выбрать предыдущую часть | | -| `` `` | Выбрать следующую часть | | +| `` , h `` | Выбрать предыдущую часть | | +| `` , l `` | Выбрать следующую часть | | | `` v `` | Переключить выборку перетаскивания | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` `` | Скопировать выделенный текст в буфер обмена | | | `` `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные | | `` 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. | @@ -97,15 +96,15 @@ _Связки клавиш_ | `` c `` | Сохранить изменения | Commit staged changes. | | `` w `` | Закоммитить изменения без предварительного хука коммита | | | `` C `` | Сохранить изменения с помощью редактора git | | -| `` `` | 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: | +| `` `` | 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: | | `` / `` | Найти | | ## Главная панель (Обычный) | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Прокрутить вниз | | -| `` mouse wheel up (fn+down) `` | Прокрутить вверх | | +| `` (fn+up) `` | Прокрутить вниз | | +| `` (fn+down) `` | Прокрутить вверх | | | `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | Найти | | @@ -115,11 +114,11 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Выбрать эту часть | | -| `` b `` | Выбрать все части | | -| `` `` | Выбрать предыдущую часть | | -| `` `` | Выбрать следующую часть | | -| `` `` | Выбрать предыдущий конфликт | | -| `` `` | Выбрать следующий конфликт | | +| `` b `` | Pick both hunks | | +| `` , k `` | Выбрать предыдущую часть | | +| `` , j `` | Выбрать следующую часть | | +| `` , h `` | Выбрать предыдущий конфликт | | +| `` , l `` | Выбрать следующий конфликт | | | `` z `` | Отменить | Undo last merge conflict resolution. | | `` e `` | Редактировать файл | Open file in external editor. | | `` o `` | Открыть файл | Open file in default application. | @@ -130,11 +129,11 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Выбрать предыдущую часть | | -| `` `` | Выбрать следующую часть | | +| `` , h `` | Выбрать предыдущую часть | | +| `` , l `` | Выбрать следующую часть | | | `` v `` | Переключить выборку перетаскивания | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` `` | Скопировать выделенный текст в буфер обмена | | | `` o `` | Открыть файл | Open file in default application. | | `` e `` | Редактировать файл | Open file in external editor. | | `` `` | Добавить/удалить строку(и) для патча | | @@ -146,28 +145,28 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Переключить | Checkout the selected commit as a detached HEAD. | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | Открыть коммит в браузере | | | `` n `` | Создать новую ветку с этого коммита | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Коммиты | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Сбросить отобранную (скопированную \| 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. | @@ -180,41 +179,44 @@ _Связки клавиш_ | `` p `` | Pick | Выбрать коммит (в середине перебазирования) | | `` F `` | Создать fixup коммит | Создать fixup коммит для этого коммита | | `` S `` | Apply fixup commits | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) | -| `` `` | Переместить коммит вниз на один | | -| `` `` | Переместить коммит вверх на один | | +| `` , `` | Переместить коммит вниз на один | | +| `` , `` | Переместить коммит вверх на один | | | `` 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. | -| `` `` | Открыть меню журнала | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` `` | Открыть меню журнала | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | Переключить | Checkout the selected commit as a detached HEAD. | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | Открыть коммит в браузере | | | `` n `` | Создать новую ветку с этого коммита | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | -| `` w `` | View worktree options | | | `` / `` | Найти | | ## Локальные Ветки | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название ветки в буфер обмена | | +| `` `` | Скопировать название ветки в буфер обмена | | | `` i `` | Показать параметры git-flow | | | `` `` | Переключить | Checkout selected item. | | `` n `` | Новая ветка | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` o `` | Создать запрос на принятие изменений | | | `` O `` | Создать параметры запроса принятие изменений | | -| `` `` | Скопировать URL запроса на принятие изменений в буфер обмена | | +| `` G `` | Open pull request in browser | | +| `` `` | Скопировать URL запроса на принятие изменений в буфер обмена | | | `` c `` | Переключить по названию | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | | `` - `` | Checkout previous branch | | | `` F `` | Принудительное переключение | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | @@ -227,10 +229,9 @@ _Связки клавиш_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Меню @@ -247,33 +248,33 @@ _Связки клавиш_ |-----|--------|-------------| | `` `` | Подтвердить | | | `` `` | Закрыть/отменить | | -| `` `` | Copy to clipboard | | +| `` `` | Copy to clipboard | | ## Подкоммиты | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Переключить | Checkout the selected commit as a detached HEAD. | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | Открыть коммит в браузере | | | `` n `` | Создать новую ветку с этого коммита | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | -| `` w `` | View worktree options | | | `` / `` | Найти | | ## Подмодули | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название подмодуля в буфер обмена | | +| `` `` | Скопировать название подмодуля в буфер обмена | | | `` `` | Enter | Ввести подмодуль | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | Обновить подмодуль | @@ -294,13 +295,13 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название файла в буфер обмена | | +| `` `` | Скопировать название файла в буфер обмена | | | `` y `` | Copy to clipboard | | | `` c `` | Переключить | Переключить файл | | `` d `` | Просмотреть параметры «отмены изменении» | Отменить изменения коммита в этом файле | | `` o `` | Открыть файл | Open file in default application. | | `` e `` | Edit | Open file in external editor. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Переключить все файлы, включённые в патч | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | @@ -314,7 +315,6 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` o `` | Открыть файл конфигурации | Open file in default application. | | `` e `` | Редактировать файл конфигурации | Open file in external editor. | | `` u `` | Проверить обновления | | | `` `` | Переключиться на последний репозиторий | | @@ -326,35 +326,35 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copy tag to clipboard | | | `` `` | Переключить | Checkout the selected tag as a detached HEAD. | | `` n `` | Создать тег | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. | +| `` w `` | New worktree | | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Удалённые ветки | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название ветки в буфер обмена | | +| `` `` | Скопировать название ветки в буфер обмена | | | `` `` | Переключить | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | | `` n `` | Новая ветка | | +| `` w `` | New worktree | | | `` M `` | Слияние с текущей переключённой веткой | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Удалённые репозитории @@ -373,15 +373,15 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название файла в буфер обмена | | +| `` `` | Скопировать название файла в буфер обмена | | | `` `` | Переключить индекс | Toggle staged for selected file. | -| `` `` | Фильтровать файлы (проиндексированные/непроиндексированные) | | +| `` `` | Фильтровать файлы (проиндексированные/непроиндексированные) | | | `` y `` | Copy to clipboard | | | `` c `` | Сохранить изменения | Commit staged changes. | | `` w `` | Закоммитить изменения без предварительного хука коммита | | | `` A `` | Правка последнего коммита | | | `` C `` | Сохранить изменения с помощью редактора git | | -| `` `` | 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: | +| `` `` | 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: | | `` e `` | Edit | Open file in external editor. | | `` o `` | Открыть файл | Open file in default application. | | `` i `` | Игнорировать или исключить файл | | @@ -394,7 +394,7 @@ _Связки клавиш_ | `` 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Получить изменения | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -410,8 +410,8 @@ _Связки клавиш_ | `` 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. | +| `` w `` | New worktree | | | `` r `` | Переименовать хранилище | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs-master/keybindings/Keybindings_zh-CN.md b/docs-master/keybindings/Keybindings_zh-CN.md index 8e7ef420c..9819cb982 100644 --- a/docs-master/keybindings/Keybindings_zh-CN.md +++ b/docs-master/keybindings/Keybindings_zh-CN.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 按键绑定 -_图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ - ## 全局键绑定 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切换到最近的仓库 | | -| `` (fn+up/shift+k) `` | 向上滚动主面板 | | -| `` (fn+down/shift+j) `` | 向下滚动主面板 | | +| `` `` | 切换到最近的仓库 | | +| `` , K, (fn+up/shift+k) `` | 向上滚动主面板 | | +| `` , J, (fn+down/shift+j) `` | 向下滚动主面板 | | | `` @ `` | 打开命令日志菜单 | 查看命令日志的选项，例如显示/隐藏命令日志以及聚焦命令日志 | | `` P `` | 推送 | 推送当前分支到它的上游。如果上游未配置，您可以在弹窗中配置上游分支。 | | `` p `` | 拉取 | 从当前分支的远程分支获取改动。如果上游未配置，您可以在弹窗中配置上游分支。 | @@ -19,20 +17,21 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` } `` | 扩大差异视图中显示的上下文范围 | 增加差异视图中变更周围显示的上下文量。

默认值可在配置文件中通过键 'git.diffContextSize' 更改。 | | `` { `` | 缩小差异视图中显示的上下文范围 | 减少差异视图中变更周围显示的上下文量。

默认值可在配置文件中通过键 'git.diffContextSize' 更改。 | | `` : `` | 执行 Shell 命令 | 调出可输入shell命令执行的提示符。 | -| `` `` | 查看自定义补丁选项 | | +| `` `` | 查看自定义补丁选项 | | | `` m `` | 查看合并/变基选项 | 查看当前合并或变基的中止、继续、跳过选项 | | `` R `` | 刷新 | 刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。 | | `` + `` | 下一屏模式(正常/半屏/全屏) | | | `` _ `` | 上一屏模式 | | -| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | 取消 | | | `` ? `` | 打开菜单 | | -| `` `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 | -| `` W `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 | -| `` `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 | -| `` q `` | 退出 | | -| `` `` | 挂起应用程序 | | -| `` `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。

默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 | +| `` `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 | +| `` W, `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 | +| `` q, `` | 退出 | | +| `` `` | 挂起应用程序 | | +| `` `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。

默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 | +| `` `` | 编辑配置文件 | 使用外部编辑器打开文件 | | `` z `` | 撤销 | Reflog将用于确定运行哪个git命令来撤消最后一个git命令。这并不包括对工作树的更改，只考虑提交。 | | `` Z `` | 重做 | Reflog将用于确定运行哪个git命令来重做上一个git命令。这并不包括对工作树的更改，只考虑提交。 | @@ -42,11 +41,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ |-----|--------|-------------| | `` , `` | 上一页 | | | `` . `` | 下一页 | | -| `` < () `` | 滚动到顶部 | | -| `` > () `` | 滚动到底部 | | +| `` <, `` | 滚动到顶部 | | +| `` >, `` | 滚动到底部 | | | `` v `` | 切换拖动选择 | | -| `` `` | 向下扩展选择范围 | | -| `` `` | 向上扩展选择范围 | | +| `` `` | 向下扩展选择范围 | | +| `` `` | 向上扩展选择范围 | | | `` / `` | 开始搜索 | | | `` H `` | 向左滚动 | | | `` L `` | 向右滚动 | | @@ -57,27 +56,27 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 复制缩略提交哈希值到剪贴板 | | | `` `` | 检出 | 检出所选择的提交作为分离HEAD。 | | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 | | `` o `` | 在浏览器中打开提交 | | | `` n `` | 从提交创建新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `` 来取消选择。 | -| `` `` | 重置已拣选(复制)的提交 | | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 重置已拣选(复制)的提交 | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交的文件 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 开始搜索 | | ## 子模块 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制子模块名称到剪贴板 | | +| `` `` | 复制子模块名称到剪贴板 | | | `` `` | 进入 | 输入子模块 | | `` d `` | 删除 | 删除选定的子模块及其相应的目录 | | `` u `` | 更新 | 更新子模块 | @@ -101,32 +100,32 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 复制缩略提交哈希值到剪贴板 | | | `` `` | 检出 | 检出所选择的提交作为分离HEAD。 | | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 | | `` o `` | 在浏览器中打开提交 | | | `` n `` | 从提交创建新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `` 来取消选择。 | -| `` `` | 重置已拣选(复制)的提交 | | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 重置已拣选(复制)的提交 | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 提交 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 重置已拣选(复制)的提交 | | +| `` `` | 复制缩略提交哈希值到剪贴板 | | +| `` `` | 重置已拣选(复制)的提交 | | | `` b `` | 查看二分查找选项 | | | `` s `` | 压缩(Squash) | 将已选提交压缩到该提交之下。这些选定的提交的消息会附加到该提交的消息之下。 | | `` f `` | 修正 （fixup） | 将选定的提交合并到其下面的提交中。与压缩类似，但所选提交的消息将被丢弃。 | -| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | +| `` c `` | 设置修复提交信息 | 设置修复提交的信息选项。-C 选项表示使用此提交的信息，而非目标提交的信息。 | | `` r `` | 改写提交 | 重写所选提交的消息。 | | `` R `` | 使用编辑器重命名提交 | | | `` d `` | 删除提交 | 删除选中的提交。这将通过变基从分支中删除该提交，如果该提交修改的内容依赖于后续的提交，则需要解决合并冲突。 | @@ -135,27 +134,28 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` p `` | 拣选(Pick) | 标记选中的提交为 picked（变基过程中）。这意味该提交将在后续的变基中保留。 | | `` F `` | 为此提交创建修正 | 创建修正提交 | | `` S `` | 应用该修复提交 | 压缩所选提交之上或当前分支的所有 “fixup!” 提交（自动压缩）。 | -| `` `` | 下移提交 | | -| `` `` | 上移提交 | | +| `` , `` | 下移提交 | | +| `` , `` | 上移提交 | | | `` V `` | 粘贴提交(拣选) | | | `` B `` | 标记一个主提交用于变基 | 选择下一次变基的主提交。当您变基到一个分支时，只有高于主提交的提交才会被引入。这使用“git rebase --onto”命令。 | | `` A `` | 修补(Amend) | 用已暂存的变更来修补提交 | | `` a `` | 修补提交属性 | 设置或重置提交的作者，或添加其他作者。 | | `` t `` | 撤销(Revert) | 为所选提交创建还原提交，这会反向应用所选提交的更改。 | | `` T `` | 标签提交 | 创建一个新标签指向所选提交。您可以在弹窗中输入标签名称和描述(可选)。 | -| `` `` | 打开日志菜单 | 查看提交日志的选项，例如更改排序顺序、隐藏 git graph、显示整个 git graph。 | +| `` `` | 打开日志菜单 | 查看提交日志的选项，例如更改排序顺序、隐藏 git graph、显示整个 git graph。 | +| `` G `` | 在浏览器中打开拉取请求 | | | `` `` | 检出 | 检出所选择的提交作为分离HEAD。 | | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 | | `` o `` | 在浏览器中打开提交 | | | `` n `` | 从提交创建新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `` 来取消选择。 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交的文件 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 开始搜索 | | ## 提交信息 @@ -169,13 +169,13 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制路径到剪贴板 | | +| `` `` | 复制路径到剪贴板 | | | `` y `` | 复制到剪贴板 | | | `` c `` | 检出 | 检出文件 | | `` d `` | 查看'放弃变更'选项 | 放弃对此文件的提交变更 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | | `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | | `` `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。 | @@ -189,15 +189,15 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制路径到剪贴板 | | +| `` `` | 复制路径到剪贴板 | | | `` `` | 切换暂存状态 | 为选定的文件切换暂存状态 | -| `` `` | 通过状态过滤文件 | | +| `` `` | 通过状态过滤文件 | | | `` y `` | 复制到剪贴板 | | | `` c `` | 提交变更 | 提交暂存文件 | | `` w `` | 提交变更而无需预先提交钩子 | | | `` A `` | 修补最后一次提交 | | | `` C `` | 使用 Git 编辑器提交变更 | | -| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | +| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | | `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | | `` i `` | 忽略文件 | | @@ -210,7 +210,7 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` g `` | 查看上游重置选项 | | | `` D `` | 重置 | 查看工作树的重置选项（例如：清除工作树）。 | | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。

可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 | | `` f `` | 抓取 | 从远程获取变更 | | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 | @@ -222,14 +222,16 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制分支名称到剪贴板 | | +| `` `` | 复制分支名称到剪贴板 | | | `` i `` | 显示 git-flow 选项 | | | `` `` | 检出 | 检出选中的项目 | | `` n `` | 新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` o `` | 创建拉取请求 | | | `` O `` | 创建拉取请求选项 | | -| `` `` | 复制拉取请求 URL 到剪贴板 | | +| `` G `` | 在浏览器中打开拉取请求 | | +| `` `` | 复制拉取请求 URL 到剪贴板 | | | `` c `` | 按名称检出 | 按名称检出。在输入框中，您可以输入'-' 来切换到最后一个分支。 | | `` - `` | 签出上一个分支 | | | `` F `` | 强制检出 | 强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。 | @@ -242,25 +244,24 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` g `` | 查看重置选项 | | | `` R `` | 重命名分支 | | | `` u `` | 查看上游选项 | 查看与分支上游相关的选项，例如设置/取消设置上游和重置为上游。 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 构建补丁中 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 选择上一个区块 | | -| `` `` | 选择下一个区块 | | +| `` , h `` | 选择上一个区块 | | +| `` , l `` | 选择下一个区块 | | | `` v `` | 切换拖动选择 | | | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 | -| `` `` | 复制选中文本到剪贴板 | | +| `` `` | 复制选中文本到剪贴板 | | | `` o `` | 打开文件 | 使用默认程序打开该文件 | | `` e `` | 编辑文件 | 使用外部编辑器打开文件 | | `` `` | 添加/移除 行到补丁 | | -| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | +| `` d `` | 从提交中移除行 | 从本次提交中移除所选行。此操作会在后台运行交互式变基，因此如果后续提交也修改了这些行，您可能会遇到合并冲突。 | | `` `` | 退出逐行模式 | | | `` / `` | 开始搜索 | | @@ -268,16 +269,16 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制标签到剪贴板 | | +| `` `` | 复制标签到剪贴板 | | | `` `` | 检出 | 检出选择的标签作为分离的HEAD | | `` n `` | 创建标签 | 基于当前提交创建一个新标签。您将在弹窗中输入标签名称和描述(可选)。 | +| `` w `` | 新建工作树 | | | `` d `` | 删除 | 查看本地/远程标签的删除选项 | | `` P `` | 推送标签 | 推送选择的标签到远端。您将在弹窗中选择一个远端。 | | `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 次要 @@ -293,11 +294,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | 选中区块 | | -| `` b `` | 选中所有区块 | | -| `` `` | 选择顶部块 | | -| `` `` | 选择底部块 | | -| `` `` | 选择上一个冲突 | | -| `` `` | 选择下一个冲突 | | +| `` b `` | Pick both hunks | | +| `` , k `` | 选择顶部块 | | +| `` , j `` | 选择底部块 | | +| `` , h `` | 选择上一个冲突 | | +| `` , l `` | 选择下一个冲突 | | | `` z `` | 撤销 | 撤消上次合并冲突解决 | | `` e `` | 编辑文件 | 使用外部编辑器打开文件 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | @@ -308,11 +309,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 选择上一个区块 | | -| `` `` | 选择下一个区块 | | +| `` , h `` | 选择上一个区块 | | +| `` , l `` | 选择下一个区块 | | | `` v `` | 切换拖动选择 | | | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 | -| `` `` | 复制选中文本到剪贴板 | | +| `` `` | 复制选中文本到剪贴板 | | | `` `` | 切换暂存状态 | 切换行暂存状态 | | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | @@ -323,15 +324,15 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` c `` | 提交变更 | 提交暂存文件 | | `` w `` | 提交变更而无需预先提交钩子 | | | `` C `` | 使用 Git 编辑器提交变更 | | -| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | +| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | | `` / `` | 开始搜索 | | ## 正常 | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 向下滚动 | | -| `` mouse wheel up (fn+down) `` | 向上滚动 | | +| `` (fn+up) `` | 向下滚动 | | +| `` (fn+down) `` | 向上滚动 | | | `` `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） | | `` `` | 退出回到侧边面板 | | | `` / `` | 开始搜索 | | @@ -340,12 +341,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` o `` | 打开配置文件 | 使用默认程序打开该文件 | | `` e `` | 编辑配置文件 | 使用外部编辑器打开文件 | | `` u `` | 检查更新 | | | `` `` | 切换到最近的仓库 | | | `` a `` | 显示/循环所有分支日志 | | -| `` A `` | Show/cycle all branch logs (reverse) | | +| `` A `` | 显示/循环所有分支日志（反向） | | | `` 0 `` | 聚焦主视图 | | ## 确认面板 @@ -354,7 +354,7 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ |-----|--------|-------------| | `` `` | 确认 | | | `` `` | 关闭 | | -| `` `` | 复制到剪贴板 | | +| `` `` | 复制到剪贴板 | | ## 菜单 @@ -372,10 +372,10 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` g `` | 应用并删除 | 将存储项应用到工作目录并删除存储项。 | | `` d `` | 删除 | 从贮藏列表中删除该贮藏项 | | `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交，从该提交创建一个新分支，然后将贮藏项作为附加提交应用到新分支来实现的。 | +| `` w `` | 新建工作树 | | | `` r `` | 重命名贮藏 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交的文件 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 输入提示 @@ -401,17 +401,17 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制分支名称到剪贴板 | | +| `` `` | 复制分支名称到剪贴板 | | | `` `` | 检出 | 基于当前选中的远程分支检出一个新的本地分支，或者将远程分支作分离的HEAD。 | | `` n `` | 新分支 | | +| `` w `` | 新建工作树 | | | `` M `` | 合并到当前检出的分支 | 查看将选中项合并到当前分支的选项(正常合并，压缩合并) | | `` r `` | 变基 | 将检出的分支变基到所选的分支上。 | | `` d `` | 删除 | 从远程删除远程分支。 | | `` u `` | 设置为上游 | 设置为检出分支的上游 | | `` s `` | 排序 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | diff --git a/docs-master/keybindings/Keybindings_zh-TW.md b/docs-master/keybindings/Keybindings_zh-TW.md index bbd2f291d..0e5debfdf 100644 --- a/docs-master/keybindings/Keybindings_zh-TW.md +++ b/docs-master/keybindings/Keybindings_zh-TW.md @@ -2,37 +2,36 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 鍵盤快捷鍵 -_說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B_ - ## 全域快捷鍵 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切換到最近使用的版本庫 | | -| `` (fn+up/shift+k) `` | 向上捲動主面板 | | -| `` (fn+down/shift+j) `` | 向下捲動主面板 | | -| `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. | +| `` `` | 切換到最近使用的版本庫 | | +| `` , K, (fn+up/shift+k) `` | 向上捲動主面板 | | +| `` , J, (fn+down/shift+j) `` | 向下捲動主面板 | | +| `` @ `` | 開啟命令記錄選單 | 檢視命令日誌的選項，例如顯示/隱藏命令日誌以及聚焦命令日誌。 | | `` P `` | 推送 | 推送到遠端。如果沒有設定遠端，會開啟設定視窗。 | | `` p `` | 拉取 | 從遠端同步當前分支。如果沒有設定遠端，會開啟設定視窗。 | -| `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | -| `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | -| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | 檢視自訂補丁選項 | | -| `` 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`. | +| `` ) `` | 提高重新命名相似度閾值 | 提高將刪除和新增對視為重新命名所需的相似度閾值。

預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 | +| `` ( `` | 降低重新命名相似度閾值 | 降低將刪除和新增對視為重新命名所需的相似度閾值。

預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 | +| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | 增加差異檢視中變更周圍顯示的上下文量。

預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 | +| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | 減少差異檢視中變更周圍顯示的上下文量。

預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 | +| `` : `` | 執行 Shell 命令 | 調出可輸入shell命令執行的提示符。 | +| `` `` | 檢視自訂補丁選項 | | +| `` m `` | 查看合併/變基選項 | 檢視目前合併或變基的中止、繼續、跳過選項。 | +| `` R `` | 重新整理 | 重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。 | | `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） | | | `` _ `` | 上一個螢幕模式 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 | +| `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 | | `` `` | 取消 | | | `` ? `` | 開啟選單 | | -| `` `` | 檢視篩選路徑選項 | 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. | -| `` `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. | -| `` q `` | 結束 | | -| `` `` | Suspend the application | | -| `` `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 | +| `` W, `` | 開啟差異比較選單 | 檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。 | +| `` q, `` | 結束 | | +| `` `` | 掛起應用程式 | | +| `` `` | 切換是否在差異檢視中顯示空格變更 | 切換是否在差異檢視中顯示空白字元更改。

預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。 | +| `` `` | 編輯設定檔案 | 使用外部編輯器開啟 | | `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 | | `` Z `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 | @@ -42,37 +41,30 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B |-----|--------|-------------| | `` , `` | 上一頁 | | | `` . `` | 下一頁 | | -| `` < () `` | 捲動到頂部 | | -| `` > () `` | 捲動到底部 | | +| `` <, `` | 捲動到頂部 | | +| `` >, `` | 捲動到底部 | | | `` v `` | 切換拖曳選擇 | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | 向下擴充套件選擇範圍 | | +| `` `` | 向上擴充套件選擇範圍 | | | `` / `` | 搜尋 | | | `` H `` | 向左捲動 | | | `` L `` | 向右捲動 | | | `` ] `` | 下一個索引標籤 | | | `` [ `` | 上一個索引標籤 | | -## Input prompt - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | 確認 | | -| `` `` | 關閉/取消 | | - ## 主面板 (補丁生成) | Key | Action | Info | |-----|--------|-------------| -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | +| `` , h `` | 選擇上一段 | | +| `` , l `` | 選擇下一段 | | | `` v `` | 切換拖曳選擇 | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 複製所選文本至剪貼簿 | | +| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 | +| `` `` | 複製所選文本至剪貼簿 | | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | | `` `` | 向 (或從) 補丁中添加/刪除行 | | -| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | +| `` d `` | 從提交中移除行 | 從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。 | | `` `` | 退出自訂補丁建立器 | | | `` / `` | 搜尋 | | @@ -80,10 +72,10 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 向下捲動 | | -| `` mouse wheel up (fn+down) `` | 向上捲動 | | -| `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | -| `` `` | Exit back to side panel | | +| `` (fn+up) `` | 向下捲動 | | +| `` (fn+down) `` | 向上捲動 | | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` `` | 退出回到側邊面板 | | | `` / `` | 搜尋 | | ## 主面板（合併） @@ -91,37 +83,37 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| | `` `` | 挑選程式碼片段 | | -| `` b `` | 挑選所有程式碼片段 | | -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | -| `` `` | 選擇上一個衝突 | | -| `` `` | 選擇下一個衝突 | | -| `` z `` | 復原 | Undo last merge conflict resolution. | +| `` b `` | 選取兩個區塊 | | +| `` , k `` | 選擇上一段 | | +| `` , j `` | 選擇下一段 | | +| `` , h `` | 選擇上一個衝突 | | +| `` , l `` | 選擇下一個衝突 | | +| `` z `` | 復原 | 撤消上次合併衝突解決。 | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | -| `` M `` | View merge conflict options | View options for resolving merge conflicts. | +| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 | | `` `` | 返回檔案面板 | | ## 主面板（預存） | Key | Action | Info | |-----|--------|-------------| -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | +| `` , h `` | 選擇上一段 | | +| `` , l `` | 選擇下一段 | | | `` v `` | 切換拖曳選擇 | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 複製所選文本至剪貼簿 | | +| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 | +| `` `` | 複製所選文本至剪貼簿 | | | `` `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) | -| `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | +| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | | `` `` | 返回檔案面板 | | -| `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | -| `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 | | `` c `` | 提交變更 | 提交暫存區變更 | | `` w `` | 沒有預提交 hook 就提交更改 | | | `` C `` | 使用 git 編輯器提交變更 | | -| `` `` | 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: | +| `` `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件： | | `` / `` | 搜尋 | | ## 功能表 @@ -136,33 +128,33 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` `` | 複製縮略提交雜湊值到剪貼簿 | | +| `` `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 | +| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 | | `` o `` | 在瀏覽器中開啟提交 | | | `` n `` | 從提交建立新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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 `` to cancel the selection. | -| `` `` | 重設選定的揀選 (複製) 提交 | | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `` 來取消選擇。 | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` * `` | 選擇目前分支的提交 | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 子模組 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製子模組名稱到剪貼簿 | | -| `` `` | Enter | 進入子模組 | -| `` d `` | Remove | Remove the selected submodule and its corresponding directory. | -| `` u `` | Update | 更新子模組 | +| `` `` | 複製子模組名稱到剪貼簿 | | +| `` `` | 進入 | 進入子模組 | +| `` d `` | 刪除 | 刪除選定的子模組及其相應的目錄。 | +| `` u `` | 更新 | 更新子模組 | | `` n `` | 新增子模組 | | | `` e `` | 更新子模組 URL | | -| `` i `` | Initialize | 初始化子模組 | +| `` i `` | 初始化 | 初始化子模組 | | `` b `` | 查看批量子模組選項 | | | `` / `` | 搜尋 | | @@ -170,51 +162,52 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` n `` | New worktree | | -| `` `` | Switch | Switch to the selected worktree. | +| `` n `` | 新建工作樹 | | +| `` `` | 切換 | 切換到選中的工作樹。 | | `` o `` | 在編輯器中開啟 | | -| `` 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. | +| `` d `` | 刪除 | 刪除選定的工作樹。這將刪除工作樹的目錄以及 .git 目錄中有關工作樹的後設資料。 | | `` / `` | 搜尋 | | ## 提交 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | 複製縮略提交雜湊值到剪貼簿 | | +| `` `` | 重設選定的揀選 (複製) 提交 | | | `` 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. | -| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | +| `` s `` | 壓縮 (Squash) | 將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。 | +| `` f `` | 修復 (Fixup) | 將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。 | +| `` c `` | 設定修復提交資訊 | 設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。 | | `` r `` | 改寫提交 | 改寫選中的提交訊息 | | `` 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. | +| `` d `` | 刪除提交 | 刪除選中的提交。這將透過變基從分支中刪除該提交，如果該提交修改的內容依賴於後續的提交，則需要解決合併衝突。 | | `` e `` | 編輯(開始互動變基) | 編輯提交 | -| `` i `` | 開始互動變基 | 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`. | +| `` i `` | 開始互動變基 | 為分支上的提交啟動互動式變基。這將包括從 HEAD 提交到第一個合併提交或主分支提交的所有提交。
如果您想從所選提交啟動互動式變基，請按 `e`。 | | `` p `` | 挑選 | 挑選提交 (於變基過程中) | | `` F `` | 建立修復提交 | 為此提交建立修復提交 | | `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ | -| `` `` | 向下移動提交 | | -| `` `` | 向上移動提交 | | +| `` , `` | 向下移動提交 | | +| `` , `` | 向上移動提交 | | | `` V `` | 貼上提交 (揀選) | | | `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 | | `` A `` | 修改 | 使用已預存的更改修正提交 | -| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. | -| `` t `` | 還原 | 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. | -| `` `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` a `` | 設定/重設提交作者 | 設定或重置提交的作者，或新增其他作者。 | +| `` t `` | 還原 | 為所選提交建立還原提交，這會反向應用所選提交的更改。 | +| `` T `` | 打標籤到提交 | 建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。 | +| `` `` | 開啟記錄選單 | 檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。 | +| `` G `` | 在瀏覽器中開啟拉取請求 | | +| `` `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 | +| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 | | `` o `` | 在瀏覽器中開啟提交 | | | `` n `` | 從提交建立新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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 `` to cancel the selection. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `` 來取消選擇。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` * `` | 選擇目前分支的提交 | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 提交摘要 @@ -228,154 +221,154 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製檔案名稱到剪貼簿 | | +| `` `` | 複製檔案名稱到剪貼簿 | | | `` y `` | 複製到剪貼簿 | | | `` c `` | 檢出 | 檢出檔案 | -| `` d `` | 捨棄 | 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. | +| `` d `` | 捨棄 | 放棄對此檔案的提交變更。 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` e `` | 編輯 | 使用外部編輯器開啟 | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | -| `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | -| `` `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | -| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | -| `` 0 `` | Focus main view | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | +| `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | +| `` `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 | +| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。

可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 | +| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 | +| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 | +| `` 0 `` | 聚焦主檢視 | | | `` / `` | 搜尋 | | ## 收藏 (Stash) | Key | Action | Info | |-----|--------|-------------| -| `` `` | 套用 | 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. | +| `` `` | 套用 | 將貯藏項應用到您的工作目錄。 | +| `` g `` | 還原 | 將儲存項應用到工作目錄並刪除儲存項。 | +| `` d `` | 捨棄 | 從貯藏列表中刪除該貯藏項。 | +| `` n `` | 新分支 | 從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。 | +| `` w `` | 新建工作樹 | | | `` r `` | 重新命名收藏 | | -| `` 0 `` | Focus main view | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 日誌 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` `` | 複製縮略提交雜湊值到剪貼簿 | | +| `` `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 | +| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 | | `` o `` | 在瀏覽器中開啟提交 | | | `` n `` | 從提交建立新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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 `` to cancel the selection. | -| `` `` | 重設選定的揀選 (複製) 提交 | | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `` 來取消選擇。 | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` * `` | 選擇目前分支的提交 | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 本地分支 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製分支名稱到剪貼簿 | | +| `` `` | 複製分支名稱到剪貼簿 | | | `` i `` | 顯示 git-flow 選項 | | | `` `` | 檢出 | 檢出選定的項目。 | | `` n `` | 新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | | `` o `` | 建立拉取請求 | | | `` O `` | 建立拉取請求選項 | | -| `` `` | 複製拉取請求的 URL 到剪貼板 | | -| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | -| `` - `` | Checkout previous branch | | -| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | -| `` d `` | 刪除 | View delete options for local/remote branch. | -| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. | -| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) | +| `` G `` | 在瀏覽器中開啟拉取請求 | | +| `` `` | 複製拉取請求的 URL 到剪貼板 | | +| `` c `` | 根據名稱檢出 | 按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。 | +| `` - `` | 簽出上一個分支 | | +| `` F `` | 強制檢出 | 強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。 | +| `` d `` | 刪除 | 檢視本地/遠端分支的刪除選項。 | +| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 | +| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) | | `` f `` | 從上游快進此分支 | 從遠端快進所選的分支 | | `` T `` | 建立標籤 | | | `` s `` | 排序規則 | | | `` g `` | 檢視重設選項 | | | `` R `` | 重新命名分支 | | | `` u `` | 檢視遠端設定 | 檢視有關遠端分支的設定（例如重設至遠端） | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` 0 `` | Focus main view | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 標籤 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | -| `` `` | 檢出 | Checkout the selected 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 `` | 刪除 | View delete options for local/remote tag. | -| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. | -| `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` 0 `` | Focus main view | | +| `` `` | 複製標籤到剪貼簿 | | +| `` `` | 檢出 | 檢出選擇的標籤作為分離的HEAD。 | +| `` n `` | 建立標籤 | 基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。 | +| `` w `` | 新建工作樹 | | +| `` d `` | 刪除 | 檢視本機／遠端標籤的刪除選項。 | +| `` P `` | 推送標籤 | 推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。 | +| `` g `` | 重設 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 檔案 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製檔案名稱到剪貼簿 | | -| `` `` | 切換預存 | Toggle staged for selected file. | -| `` `` | 篩選檔案 (預存/未預存) | | +| `` `` | 複製檔案名稱到剪貼簿 | | +| `` `` | 切換預存 | 切換所選檔案的暫存狀態。 | +| `` `` | 篩選檔案 (預存/未預存) | | | `` y `` | 複製到剪貼簿 | | | `` c `` | 提交變更 | 提交暫存區變更 | | `` w `` | 沒有預提交 hook 就提交更改 | | | `` A `` | 修改上次提交 | | | `` C `` | 使用 git 編輯器提交變更 | | -| `` `` | 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: | +| `` `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件： | | `` e `` | 編輯 | 使用外部編輯器開啟 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` i `` | 忽略或排除檔案 | | | `` r `` | 重新整理檔案 | | -| `` s `` | 收藏 | Stash all changes. For other variations of stashing, use the view stash options keybinding. | -| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). | -| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. | -| `` `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. | +| `` s `` | 收藏 | 貯藏所有變更.若要使用其他貯藏變體,請使用檢視貯藏選項快捷鍵。 | +| `` S `` | 檢視收藏選項 | 檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。 | +| `` a `` | 全部預存/取消預存 | 切換工作區中所有檔案的已暫存/未暫存狀態。 | +| `` `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | 如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。 | | `` d `` | 捨棄 | 檢視選中變動進行捨棄復原 | | `` g `` | 檢視遠端重設選項 | | -| `` D `` | 重設 | 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` M `` | View merge conflict options | View options for resolving merge conflicts. | +| `` D `` | 重設 | 檢視工作樹的重置選項（例如：清除工作樹）。 | +| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。

可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 | | `` f `` | 擷取 | 同步遠端異動 | -| `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | -| `` 0 `` | Focus main view | | +| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 | +| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 | +| `` 0 `` | 聚焦主檢視 | | | `` / `` | 搜尋 | | ## 次要 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | -| `` `` | Exit back to side panel | | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` `` | 退出回到側邊面板 | | | `` / `` | 搜尋 | | ## 狀態 | Key | Action | Info | |-----|--------|-------------| -| `` o `` | 開啟設定檔案 | 使用預設軟體開啟 | | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 | | `` u `` | 檢查更新 | | | `` `` | 切換到最近使用的版本庫 | | -| `` a `` | Show/cycle all branch logs | | -| `` A `` | Show/cycle all branch logs (reverse) | | -| `` 0 `` | Focus main view | | +| `` a `` | 顯示/迴圈所有分支日誌 | | +| `` A `` | 顯示/迴圈所有分支日誌（反向） | | +| `` 0 `` | 聚焦主檢視 | | ## 確認面板 @@ -383,35 +376,42 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B |-----|--------|-------------| | `` `` | 確認 | | | `` `` | 關閉/取消 | | -| `` `` | 複製到剪貼簿 | | +| `` `` | 複製到剪貼簿 | | + +## 輸入提示 + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 確認 | | +| `` `` | 關閉/取消 | | ## 遠端 | Key | Action | Info | |-----|--------|-------------| -| `` `` | View branches | | +| `` `` | 檢視分支 | | | `` n `` | 新增遠端 | | -| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | +| `` d `` | 刪除 | 刪除選中的遠端。從遠端跟蹤遠端分支的任何本地分支都不會受到影響。 | | `` e `` | 編輯 | 編輯遠端 | | `` f `` | 擷取 | 擷取遠端 | -| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. | +| `` F `` | 新增復刻遠端倉庫 | 透過替換 origin URL 中的所有者來快速新增復刻遠端倉庫，並可選擇從新遠端倉庫檢出分支。 | | `` / `` | 搜尋 | | ## 遠端分支 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製分支名稱到剪貼簿 | | -| `` `` | 檢出 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | +| `` `` | 複製分支名稱到剪貼簿 | | +| `` `` | 檢出 | 基於目前選中的遠端分支檢出一個新的本地分支，或者將遠端分支作分離的HEAD。 | | `` n `` | 新分支 | | -| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) | -| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. | -| `` d `` | 刪除 | Delete the remote branch from the remote. | +| `` w `` | 新建工作樹 | | +| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) | +| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 | +| `` d `` | 刪除 | 從遠端刪除遠端分支。 | | `` u `` | 設置為遠端 | 將此分支設為當前分支之遠端 | | `` s `` | 排序規則 | | -| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` 0 `` | Focus main view | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | diff --git a/docs/Config.md b/docs/Config.md index aa149e9e8..857a4e359 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -66,8 +66,8 @@ gui: # The number of spaces per tab; used for everything that's shown in the main # view, but probably mostly relevant for diffs. - # Note that when using a pager, the pager has its own tab width setting, so you - # need to pass it separately in the pager command. + # Note that when using a diff renderer, the renderer has its own tab width + # setting, so you need to pass it separately in the renderer command. tabWidth: 4 # If true, capture mouse events. @@ -110,6 +110,26 @@ gui: # is true. expandedSidePanelWeight: 2 + # If true, don't give a side panel more height than it needs to show its + # content; when all panels fit, the leftover height is shared among them so that + # they still fill the screen. + shrinkSidePanelsToContent: false + + # The side panels, in the order they appear from top to bottom. + # Each entry is a list of one or more names that share a single panel as tabs + # (cycle through them with the next-tab/previous-tab keys). + # Omit a name to hide it; give a name its own one-element list to promote a tab + # to a top-level panel. + # Valid names are: 'status', 'files', 'worktrees', 'submodules', 'branches', + # 'remotes', 'tags', 'commits', 'reflog', 'stash'. 'files', 'branches', and + # 'commits' must always be included; they can't be hidden. + sidePanels: + - [status] + - [files, worktrees, submodules] + - [branches, remotes, tags] + - [commits, reflog] + - [stash] + # Sometimes the main window is split in two (e.g. when the selected file has # both staged and unstaged changes). This setting controls how the two sections # are split. @@ -222,6 +242,13 @@ gui: # item at top level. showRootItemInFileTree: true + # How to sort files and directories in the file tree. + # One of: 'mixed' (default) | 'filesFirst' | 'foldersFirst' + fileTreeSortOrder: mixed + + # If true (default), sort the file tree case-sensitively. + fileTreeSortCaseSensitive: true + # If true, show the number of lines changed per file in the Files view showNumstatInFilesView: false @@ -291,6 +318,16 @@ gui: # One of 'auto' (default) | 'always' | 'never' portraitMode: auto + # In 'auto' mode, portrait mode will be used if the window width is less than or + # equal to portraitModeAutoMaxWidth and the window height is greater than or + # equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'. + portraitModeAutoMaxWidth: 84 + + # In 'auto' mode, portrait mode will be used if the window width is less than or + # equal to portraitModeAutoMaxWidth and the window height is greater than or + # equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'. + portraitModeAutoMinHeight: 46 + # How things are filtered when typing '/'. # One of 'substring' (default) | 'fuzzy' filterMode: substring @@ -299,13 +336,13 @@ gui: spinner: # The frames of the spinner animation. frames: - - '|' - - / - - '-' - - \ + - ●∙∙ + - ∙●∙ + - ∙∙● + - ∙●∙ # The "speed" of the spinner in milliseconds. - rate: 50 + rate: 180 # Status panel view. # One of 'dashboard' (default) | 'allBranchesLog' @@ -323,30 +360,39 @@ gui: # Config relating to git git: - # Array of pagers. Each entry has the following format: + # Array of diff renderers. Each entry has the following format: # - # # Value of the --color arg in the git diff command. Some pagers want - # # this to be set to 'always' and some want it set to 'never' + # # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' + # # | 'rawGit' + # type: "stdinFilter" + # + # # A name for the diff renderer, shown in the notification when cycling + # # renderers. If not set, the name is derived from the first word of the + # # renderer command. + # name: "" + # + # # Value of the --color arg in the git diff command. Only used for type + # # 'stdinFilter'. Some renderers want this to be set to 'always' and some + # # want it set to 'never'. # colorArg: "always" # + # # The command to use for rendering diffs. This is either a stdinFilter or + # # an external diff command, depending on the type field; not applicable if + # # the type is 'rawGit'. # # e.g. # # diff-so-fancy # # delta --dark --paging=never - # # ydiff -p cat -s --wrap --width={{columnWidth}} - # pager: "" + # # ydiff -p cat + # # difft --color=always + # command: "" # - # # e.g. 'difft --color=always' - # externalDiffCommand: "" + # # Extra arguments (array of strings) passed to the git command. Only + # # applicable if the type is 'rawGit'. + # args: [] # - # # If true, Lazygit will use git's `diff.external` config for paging. - # # The advantage over `externalDiffCommand` is that this can be - # # configured per file type in .gitattributes; see - # # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. - # useExternalDiffGitConfig: false - # - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md + # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md # for more information. - pagers: [] + diffRenderers: [] # Config relating to committing commit: @@ -389,6 +435,11 @@ git: # If true, periodically refresh files and submodules autoRefresh: true + # If true, poll the repo periodically for external ref changes (commits, branch + # updates, checkouts made outside lazygit) and refresh when one is detected. + # Independent of autoRefresh, which only governs the files panel. + autoDetectExternalChanges: true + # If not "none", lazygit will automatically fast-forward local branches to match # their upstream after fetching. Applies to branches that are not the currently # checked out branch, and only to those that are strictly behind their upstream @@ -414,7 +465,8 @@ git: - git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium # If true, git diffs are rendered with the `--ignore-all-space` flag, which - # ignores whitespace changes. Can be toggled from within Lazygit with ``. + # ignores whitespace changes. Can be toggled from within Lazygit with + # ``. ignoreWhitespaceInDiffView: false # The number of lines of context to show around each diff hunk. Can be changed @@ -451,14 +503,14 @@ git: # appear chronologically. See https://git-scm.com/docs/ # # Can be changed from within Lazygit with `Log menu -> Commit sort order` - # (`` in the commits window by default). + # (`` in the commits window by default). order: topo-order # This determines whether the git graph is rendered in the commits panel # One of 'always' | 'never' | 'when-maximised' # - # Can be toggled from within lazygit with `Log menu -> Show git graph` (`` - # in the commits window by default). + # Can be toggled from within lazygit with `Log menu -> Show git graph` + # (`` in the commits window by default). showGraph: always # displays the whole git graph by default in the commits view (equivalent to @@ -481,6 +533,15 @@ git: # to 40 to disable truncation. truncateCopiedCommitHashesTo: 12 +# Config relating to git worktrees +worktree: + # Default parent directory for new worktrees. It is offered as a candidate + # location alongside the parent directories of any worktrees you already have. + # A relative path is resolved against the repository's root directory, so + # "../worktrees" sits beside the repo and ".worktrees" sits inside it. + # A leading "~" is expanded to your home directory, so "~/worktrees" works. + defaultPath: "" + # Periodic update checks update: # One of: 'prompt' (default) | 'background' | 'never' @@ -499,6 +560,11 @@ refresher: # Auto-fetch can be disabled via option 'git.autoFetch'. fetchInterval: 60 + # Interval in seconds at which lazygit polls for external ref changes (commits, + # branch updates, checkouts made outside lazygit). + # Detection can be disabled via option 'git.autoDetectExternalChanges'. + externalChangeCheckInterval: 2 + # If true, show a confirmation popup before quitting Lazygit confirmOnQuit: false @@ -573,36 +639,30 @@ notARepository: prompt # view the output of the subprocess before returning to Lazygit. promptToReturnFromSubprocess: true -# Keybindings +# Keybindings. +# Each binding can be a single key or a list of keys; see +# https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md +# for the syntax. keybinding: universal: - quit: q - quit-alt1: - suspendApp: + quit: [q, ] + suspendApp: return: quitWithoutChangingDirectory: Q togglePanel: - prevItem: - nextItem: - prevItem-alt: k - nextItem-alt: j + prevItem: [, k] + nextItem: [, j] prevPage: ',' nextPage: . scrollLeft: H scrollRight: L - gotoTop: < - gotoBottom: '>' - gotoTop-alt: - gotoBottom-alt: + gotoTop: [<, ] + gotoBottom: ['>', ] toggleRangeSelect: v - rangeSelectDown: - rangeSelectUp: - prevBlock: - nextBlock: - prevBlock-alt: h - nextBlock-alt: l - nextBlock-alt2: - prevBlock-alt2: + rangeSelectDown: + rangeSelectUp: + prevBlock: [, h, ] + nextBlock: [, l, ] jumpToBlock: - "1" - "2" @@ -613,25 +673,34 @@ keybinding: nextMatch: "n" prevMatch: "N" startSearch: / - optionMenu: - optionMenu-alt1: '?' + + # on Mac + moveWordLeft: + + # on Mac + moveWordRight: + + # on Mac + backspaceWord: + + # on Mac + forwardDeleteWord: + optionMenu: '?' select: goInto: confirm: confirmMenu: confirmSuggestion: - confirmInEditor: - confirmInEditor-alt: + + # on Mac + confirmInEditor: [, ] remove: d new: "n" + newWorktree: w edit: e openFile: o - scrollUpMain: - scrollDownMain: - scrollUpMain-alt1: K - scrollDownMain-alt1: J - scrollUpMain-alt2: - scrollDownMain-alt2: + scrollUpMain: [, K, ] + scrollDownMain: [, J, ] executeShellCommand: ':' createRebaseOptionsMenu: m @@ -641,27 +710,28 @@ keybinding: # 'Files' appended for legacy reasons pullFiles: p refresh: R - createPatchOptionsMenu: + createPatchOptionsMenu: nextTab: ']' prevTab: '[' nextScreenMode: + prevScreenMode: _ - cyclePagers: '|' + cycleDiffRenderers: '|' + cycleDiffRenderersReverse: \ undo: z redo: Z - filteringMenu: - diffingMenu: W - diffingMenu-alt: - copyToClipboard: - openRecentRepos: + filteringMenu: + diffingMenu: [W, ] + copyToClipboard: + openRecentRepos: submitEditorText: extrasMenu: '@' - toggleWhitespaceInDiffView: + toggleWhitespaceInDiffView: increaseContextInDiffView: '}' decreaseContextInDiffView: '{' increaseRenameSimilarityThreshold: ) decreaseRenameSimilarityThreshold: ( - openDiffTool: + openDiffTool: + editConfig: status: checkForUpdate: u recentRepos: @@ -672,7 +742,7 @@ keybinding: commitChangesWithoutHook: w amendLastCommit: A commitChangesWithEditor: C - findBaseCommitForFixup: + findBaseCommitForFixup: confirmDiscard: x ignoreFile: i refreshFiles: r @@ -683,14 +753,15 @@ keybinding: fetch: f toggleTreeView: '`' openMergeOptions: M - openStatusFilter: + openStatusFilter: copyFileInfoToClipboard: "y" collapseAll: '-' expandAll: = branches: createPullRequest: o viewPullRequestOptions: O - copyPullRequestURL: + openPullRequestInBrowser: G + copyPullRequestURL: checkoutBranchByName: c forceCheckoutBranch: F checkoutPreviousBranch: '-' @@ -706,8 +777,6 @@ keybinding: fetchRemote: f addForkRemote: F sortOrder: s - worktrees: - viewWorktreeOptions: w commits: squashDown: s renameCommit: r @@ -717,8 +786,8 @@ keybinding: setFixupMessage: c createFixupCommit: F squashAboveCommits: S - moveDownCommit: - moveUpCommit: + moveDownCommit: [, ] + moveUpCommit: [, ] amendToCommit: A resetCommitAuthor: a pickCommit: p @@ -728,10 +797,11 @@ keybinding: markCommitAsBaseForRebase: B tagCommit: T checkoutCommit: - resetCherryPick: + resetCherryPick: copyCommitAttributeToClipboard: "y" - openLogMenu: + openLogMenu: openInBrowser: o + openPullRequestInBrowser: G viewBisectOptions: b startInteractiveRebase: i selectCommitsOfCurrentBranch: '*' @@ -745,6 +815,8 @@ keybinding: commitFiles: checkoutCommitFile: c main: + prevHunk: [, h] + nextHunk: [, l] toggleSelectHunk: a pickBothHunks: b editSelectHunk: E @@ -753,7 +825,7 @@ keybinding: update: u bulkMenu: b commitMessage: - commitMenu: + commitMenu: ``` @@ -1036,6 +1108,12 @@ keybinding: edit: # disable 'edit file' ``` +### Overriding the platform for default keybindings + +A few keybindings have different defaults on macOS than on Linux and Windows (e.g. word-wise cursor movement in text inputs uses `alt` on macOS but `ctrl` elsewhere). Lazygit picks these based on the OS it's running on, but you can override that with the `LAZYGIT_KEYBINDING_PLATFORM` environment variable. Set it to `darwin`, `linux`, or `windows`; any other value is ignored and the actual OS is used. + +This is useful when running lazygit in a Linux container that you access over ssh from a Mac, where you'd rather use the macOS keybindings. + ### Example Keybindings For Colemak Users ```yaml @@ -1083,6 +1161,8 @@ Where: - `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab`, `gitea` or `codeberg` - `webDomain` is the URL where your git service exposes a web interface and APIs, e.g. `gitservice.work.com` +For the `github` provider, configuring an entry here also enables the pull-request icons in the branches panel for that host (e.g. a GitHub Enterprise Server instance). Lazygit picks up the auth token via the same mechanisms as the `gh` CLI: the `GH_ENTERPRISE_TOKEN` / `GITHUB_ENTERPRISE_TOKEN` environment variables, or `gh auth login --hostname `. + ## Predefined commit message prefix In situations where certain naming pattern is used for branches and commits, pattern can be used to populate commit message with prefix that is parsed from the branch name. diff --git a/docs/Custom_Command_Keybindings.md b/docs/Custom_Command_Keybindings.md index 18e37463e..55e14d5f1 100644 --- a/docs/Custom_Command_Keybindings.md +++ b/docs/Custom_Command_Keybindings.md @@ -50,7 +50,7 @@ Custom command keybindings will appear alongside inbuilt keybindings when you vi 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). Custom commands without a key specified can be triggered by selecting them from the keybindings (`?`) menu | no | +| key | The key to trigger the command. Use a single key or list of keys, as described in [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md). Custom commands without a key specified can be triggered by selecting them from the keybindings (`?`) menu | no | | 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 | | prompts | A list of prompts that will request user input before running the final command | no | @@ -102,6 +102,7 @@ These fields are applicable to all prompts. | 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 | +| condition | A Go template expression; if it resolves to empty string or `false`, the prompt is skipped. See [Conditional prompts](#conditional-prompts) | no | ### Input @@ -192,7 +193,7 @@ The permitted option fields are: | 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 | -| key | Keybinding to invoke this menu option without needing to navigate to it. Can be a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | no | +| key | Keybinding to invoke this menu option without needing to navigate to it. Use a single key or list of keys, as described in [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | no | 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: @@ -319,6 +320,41 @@ Here's an example using a command but not specifying anything else: so each line command: 'ls' ``` +### Conditional prompts + +Here's an example of a conditional prompt: + +```yml +customCommands: + - key: 'a' + context: 'localBranches' + prompts: + - type: 'menu' + title: 'How do you want to create the branch?' + key: 'Method' + options: + - value: 'simple' + name: 'Simple' + description: 'just a branch name' + - value: 'prefix' + name: 'With prefix' + description: 'with a category prefix' + - type: 'menu' + title: 'Branch prefix' + key: 'Prefix' + condition: '{{ eq .Form.Method "prefix" }}' + options: + - value: 'feature/' + - value: 'hotfix/' + - value: 'release/' + - type: 'input' + title: 'Branch name' + key: 'Name' + command: "git checkout -b '{{.Form.Prefix}}{{.Form.Name}}'" +``` + +In this example the 'Branch prefix' menu only appears if the user chose 'With prefix'. Otherwise it is skipped and `.Form.Prefix` defaults to empty string. + ## 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: diff --git a/docs/Custom_DiffRenderers.md b/docs/Custom_DiffRenderers.md new file mode 100644 index 000000000..509f42ebf --- /dev/null +++ b/docs/Custom_DiffRenderers.md @@ -0,0 +1,84 @@ +# Custom Diff Renderers + +Custom diff renderers are useful for showing a better rendering of a diff than git's builtin raw diff, and using one is strongly recommended (I personally prefer delta myself, but that's a matter of personal preference). There are three types of diff renderers that lazygit supports: + +- **stdin filters**, e.g. [delta](#delta) and [diff-so-fancy](#diff-so-fancy). They take git's raw output as stdin and produce something nicer on stdout, and they are hooked up using git's GIT_PAGER mechanism. (These used to be called "custom pagers" in earlier lazygit versions.) +- **external diff programs**, e.g. difftastic; these are called using git's `--ext-diff` flag, and they take over diff generation from git completely rather than post-processing git's output. +- **git's raw output using custom arguments**; mainly useful for `--color-words` (or `--word-diff` if you are color blind). + +Diff renderers are configured with the `diffRenderers` array in the `git` section of lazygit's config file; it is an array because you can have multiple entries that you can cycle through with the `|` key. This can be useful if you usually prefer a particular diff renderer, but want to use a different one for certain kinds of diffs. + +Fields that are shared by all renderer types: + +- **type** The type of diff renderer; choices are `stdinFilter`, `extDiff`, or `rawGit`. `stdinFilter` is the default, because it's the most common one; so you can omit this if you use delta. +- **name** A name that is shown in the status bar toast when cycling renderers; defaults to the first word of the renderer command, but can be useful e.g. to distinguish "delta" from "delta side-by-side" if you have entries for both. + +Fields only for `stdinFilter`: + +- **command** The command line to use for `GIT_PAGER`. + +- **colorArg** whether you want the `--color=always` arg in your `git diff` command. Some diff renderers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most renderers need. + +Fields only for `extDiff`: + +- **command** The command line to use for the `diff.external` git config. If left empty, it uses the global value of git's `diff.external` config; this can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. + + You can include the `{{diffContext}}` template variable to pass lazygit's current diff context size (the value controlled by the `{`/`}` keybindings) to the diff tool. + +Fields only for `rawGit`: + +- **args** The additional arguments to use in the `git diff` or `git show` call (e.g. `--color-words`), as an array of strings. + +Here's an example for a multi-renderer setup: + +```yaml +git: + diffRenderers: + - command: delta --dark --paging=never + - command: ydiff -p cat + colorArg: never + - type: extDiff + command: difft --color=always --context={{diffContext}} + - type: rawGit + args: [--color-words] + name: color-words + - type: rawGit # git's default diff + name: default +``` + +## Delta: + +```yaml +git: + diffRenderers: + - command: delta --dark --paging=never +``` + +![](https://i.imgur.com/QJpQkF3.png) + +A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `command:` field to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor. + +Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons. + +## Diff-so-fancy + +```yaml +git: + diffRenderers: + - command: diff-so-fancy +``` + +![](https://i.imgur.com/rjH1TpT.png) + +## ydiff + +```yaml +gui: + sidePanelWidth: 0.2 # gives you more space to show things side-by-side +git: + diffRenderers: + - colorArg: never + command: ydiff -p cat +``` + +![](https://i.imgur.com/vaa8z0H.png) diff --git a/docs/Custom_Pagers.md b/docs/Custom_Pagers.md deleted file mode 100644 index 83f4e4e62..000000000 --- a/docs/Custom_Pagers.md +++ /dev/null @@ -1,118 +0,0 @@ -# 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). - -Support does not extend to Windows users, because we're making use of a package which doesn't have Windows support. However, see [below](#emulating-custom-pagers-on-windows) for a workaround. - -Multiple pagers are supported; you can cycle through them with the `|` key. This can be useful if you usually prefer a particular pager, but want to use a different one for certain kinds of diffs. - -Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup: - -```yaml -git: - pagers: - - pager: delta --dark --paging=never - - pager: ydiff -p cat -s --wrap --width={{columnWidth}} - colorArg: never - - externalDiffCommand: difft --color=always -``` - -The `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most pagers need. - -## Delta: - -```yaml -git: - pagers: - - pager: delta --dark --paging=never -``` - -![](https://i.imgur.com/QJpQkF3.png) - -A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `pager:` config to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor. - -Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons. - -## Diff-so-fancy - -```yaml -git: - pagers: - - pager: diff-so-fancy -``` - -![](https://i.imgur.com/rjH1TpT.png) - -## ydiff - -```yaml -gui: - sidePanelWidth: 0.2 # gives you more space to show things side-by-side -git: - pagers: - - colorArg: never - pager: ydiff -p cat -s --wrap --width={{columnWidth}} -``` - -![](https://i.imgur.com/vaa8z0H.png) - -Be careful with this one, I think the homebrew and pip versions are behind master. I needed to directly download the ydiff script to get the no-pager functionality working. - -## 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: - pagers: - - externalDiffCommand: difft --color=always -``` - -The `colorArg` and `pager` options are not used in this case. - -You can add whatever extra arguments you prefer for your difftool; for instance - -```yaml -git: - pagers: - - externalDiffCommand: difft --color=always --display=inline --syntax-highlight=off -``` - -Instead of setting this command in lazygit's `externalDiffCommand` config, you can also tell lazygit to use the external diff command that is configured in git itself (`diff.external`), by using - -```yaml -git: - pagers: - - useExternalDiffGitConfig: true -``` - -This can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. - -## Emulating custom pagers on Windows - -There is a trick to emulate custom pagers on Windows using a Powershell script configured as an external diff command. It's not perfect, but certainly better than nothing. To do this, save the following script as `lazygit-pager.ps1` at a convenient place on your disk: - -```pwsh -#!/usr/bin/env pwsh - -$old = $args[1].Replace('\', '/') -$new = $args[4].Replace('\', '/') -$path = $args[0] -git diff --no-index --no-ext-diff $old $new - | %{ $_.Replace($old, $path).Replace($new, $path) } - | delta --width=$env:LAZYGIT_COLUMNS -``` - -Use the pager of your choice with the arguments you like in the last line of the script. Personally I wouldn't want to use lazygit anymore without delta's `--hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"` args, see [above](#delta). - -In your lazygit config, use - -```yml -git: - pagers: - - externalDiffCommand: "C:/wherever/lazygit-pager.ps1" -``` - -The main limitation of this approach compared to a "real" pager is that renames are not displayed correctly; they are shown as if they were modifications of the old file. (This affects only the hunk headers; the diff itself is always correct.) diff --git a/docs/README.md b/docs/README.md index 1bc0bb6be..c586d9699 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,7 @@ * [Configuration](./Config.md). * [Custom Commands](./Custom_Command_Keybindings.md) -* [Custom Pagers](./Custom_Pagers.md) +* [Custom Diff Renderers](./Custom_DiffRenderers.md) * [Dev docs](./dev) * [Keybindings](./keybindings) * [Undo/Redo](./Undoing.md) diff --git a/docs/Searching.md b/docs/Searching.md index 589831c55..4cba775df 100644 --- a/docs/Searching.md +++ b/docs/Searching.md @@ -4,10 +4,14 @@ 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. +In the commits view we don't filter, but search; this is deliberate 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. +## Menu filtering + +The keybindings (`?`) and recent repositories menus can be filtered simply by typing. The filter field appears at the bottom of the menu while you type; there is no need to press `/` or confirm the filter before navigating the results. + ## Filtering files by status You can filter the files view to only show staged/unstaged files by pressing `` in the files view. diff --git a/docs/Undoing.md b/docs/Undoing.md index 0a4c2f381..032573258 100644 --- a/docs/Undoing.md +++ b/docs/Undoing.md @@ -1,6 +1,6 @@ # 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. +You can undo the last action by pressing 'z' and redo with 'Z' (shift+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. ![undo](../../assets/demo/undo-compressed.gif) diff --git a/docs/keybindings/Custom_Keybindings.md b/docs/keybindings/Custom_Keybindings.md index a2537f069..998aae14c 100644 --- a/docs/keybindings/Custom_Keybindings.md +++ b/docs/keybindings/Custom_Keybindings.md @@ -1,63 +1,97 @@ -## Possible keybindings -| Put in | You will get | -|---------------|----------------| -| `` | F1 | -| `` | F2 | -| `` | F3 | -| `` | F4 | -| `` | F5 | -| `` | F6 | -| `` | F7 | -| `` | F8 | -| `` | F9 | -| `` | F10 | -| `` | F11 | -| `` | F12 | -| `` | Insert | -| `` | Delete | -| `` | Home | -| `` | End | -| `` | Pgup | -| `` | Pgdn | -| `` | ArrowUp | -| `` | ShiftArrowUp | -| `` | ArrowDown | -| `` | ShiftArrowDown | -| `` | ArrowLeft | -| `` | ArrowRight | -| `` | Tab | -| `` | Backtab | -| `` | Enter | -| `` | AltEnter | -| `` | Esc | -| `` | Backspace | -| `` | CtrlSpace | -| `` | CtrlSlash | -| `` | Space | -| `` | CtrlA | -| `` | CtrlB | -| `` | CtrlC | -| `` | CtrlD | -| `` | CtrlE | -| `` | CtrlF | -| `` | CtrlG | -| `` | CtrlJ | -| `` | CtrlK | -| `` | CtrlL | -| `` | CtrlN | -| `` | CtrlO | -| `` | CtrlP | -| `` | CtrlQ | -| `` | CtrlR | -| `` | CtrlS | -| `` | CtrlT | -| `` | CtrlU | -| `` | CtrlV | -| `` | CtrlW | -| `` | CtrlX | -| `` | CtrlY | -| `` | CtrlZ | -| `` | Ctrl4 | -| `` | Ctrl5 | -| `` | Ctrl6 | -| `` | Ctrl8 | +## Custom Keybindings + +A keybinding is one of: + +- A single printable character, e.g. `q`, `?`, `5`. Uppercase letters mean + shift+letter — write `A`, not ``. +- A special key name in angle brackets, e.g. ``, ``, ``. +- A key with modifiers in angle brackets, e.g. ``, ``. +- The literal string `` to disable a binding. +- A list of any of the above, to bind multiple keys to the same action: + `quit: [q, ]`. + +### Modifiers + +Prefix a key with one or more modifiers, joined by `+`: + +| Prefix | Short form | Modifier | +| -------- | ---------- | ----------------------------------------------------------------------------------------- | +| `ctrl+` | `c+` | Ctrl | +| `alt+` | `a+` | Alt | +| `shift+` | `s+` | Shift | +| `meta+` | `m+` | Depends on terminal; typically ⌘ on macOS or Super/Win key, when the terminal forwards it | + +You can also use `-` instead of `+` as the separator. Modifiers may appear in +any order, and short and long forms can be mixed. The whole binding should be +wrapped in angle brackets when it has any modifiers. The following all express +the same binding: + +- `` +- `` +- `` +- `` + +### Special key names + +| Put in | You will get | +| --------------------------------------- | ------------------- | +| `` – `` | F1 – F12 | +| `` | Insert | +| `` | Delete | +| `` | Home | +| `` | End | +| `` | PageUp | +| `` | PageDown | +| `` | ArrowUp | +| `` | ArrowDown | +| `` | ArrowLeft | +| `` | ArrowRight | +| `` | Tab | +| `` | Shift+Tab | +| `` | Enter | +| `` | Escape | +| `` | Backspace | +| `` | Space | +| ``/`` | Mouse wheel up/down | + +These can be combined with modifiers, e.g. ``, ``, ``. + +### Special characters with modifiers + +`` and `` are keyword forms for `-` and `+` when combined with a +modifier (e.g. `` for Ctrl+`-`). Without modifiers, write `-` and +`+` directly. `` is the keyword for the space character. + +### Combinations that are rejected + +These look reasonable but can't actually be delivered by a terminal: + +- `` (shift alone on a rune) — terminals fold shift into the rune + itself, so shift+a arrives as `A`. Write `A` instead. +- ``, ``, etc. (modifier on an uppercase ASCII letter) — write + `` instead. + +### Terminal compatibility + +Support for combinations of modifiers, and in general keybindings beyond plain +letters and ctrl+letter, require a newer terminal protocol that not all +terminals support. + +Terminals that are known to have good support include: Ghostty, kitty, +WezTerm, foot, Konsole, Alacritty, iTerm2, Windows Terminal. + +The default terminal on macOS (Terminal.app) does not; I recommend to switch to +either Ghostty or iTerm2 as a replacement (or one of the others above). + +On Windows, a popular terminal is the MinTTY console that comes with Git for +Windows; this also doesn't support the newer protocol. The recommended +replacement is Windows Terminal, which is very good these days, and Git Bash +runs just fine in it. + +Inside **tmux** or **screen**, extended keys are stripped unless the multiplexer +is configured to forward them. For tmux 3.2+: + +​` +set -g extended-keys on +set -as terminal-features 'xterm*:extkeys' +​` diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 827f6eb34..3ec731bf2 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Keybindings -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ - ## Global keybindings | Key | Action | Info | |-----|--------|-------------| -| `` `` | Switch to a recent repo | | -| `` (fn+up/shift+k) `` | Scroll up main window | | -| `` (fn+down/shift+j) `` | Scroll down main window | | +| `` `` | Switch to a recent repo | | +| `` , K, (fn+up/shift+k) `` | Scroll up main window | | +| `` , J, (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. | @@ -19,20 +17,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | View custom patch options | | +| `` `` | 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 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Cancel | | | `` ? `` | Open keybindings menu | | -| `` `` | 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. | -| `` `` | 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 | | -| `` `` | Suspend the application | | -| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | Quit | | +| `` `` | Suspend the application | | +| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Edit config file | Open file in external editor. | | `` 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. | | `` 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. | @@ -42,11 +41,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` , `` | Previous page | | | `` . `` | Next page | | -| `` < () `` | Scroll to top | | -| `` > () `` | Scroll to bottom | | +| `` <, `` | Scroll to top | | +| `` >, `` | Scroll to bottom | | | `` v `` | Toggle range select | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | Search the current view by text | | | `` H `` | Scroll left | | | `` L `` | Scroll right | | @@ -57,13 +56,13 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copy path to clipboard | | | `` y `` | Copy to clipboard | | | `` c `` | Checkout | Checkout file. This replaces the file in your working tree with the version from the selected commit. | | `` d `` | Discard | 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | @@ -84,8 +83,8 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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. | @@ -98,27 +97,28 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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). | -| `` `` | Move commit down one | | -| `` `` | Move commit up one | | +| `` , `` | Move commit down one | | +| `` , `` | 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. | -| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | 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 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View files | | -| `` w `` | View worktree options | | | `` / `` | Search the current view by text | | ## Confirmation panel @@ -127,21 +127,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Confirm | | | `` `` | Close/Cancel | | -| `` `` | Copy to clipboard | | +| `` `` | Copy to clipboard | | ## Files | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copy path to clipboard | | | `` `` | Stage | Toggle staged for selected file. | -| `` `` | Filter files by status | | +| `` `` | 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 | | -| `` `` | 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: | +| `` `` | 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: | | `` e `` | Edit | Open file in external editor. | | `` o `` | Open file | Open file in default application. | | `` i `` | Ignore or exclude file | | @@ -154,7 +154,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Fetch | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -173,14 +173,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copy branch name to clipboard | | | `` i `` | Show git-flow options | | | `` `` | Checkout | Checkout selected item. | | `` n `` | New branch | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` o `` | Create pull request | | | `` O `` | View create pull request options | | -| `` `` | Copy pull request URL to clipboard | | +| `` G `` | Open pull request in browser | | +| `` `` | Copy pull request URL to clipboard | | | `` c `` | Checkout by name | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | | `` - `` | Checkout previous branch | | | `` F `` | Force checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | @@ -193,10 +195,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Main panel (merging) @@ -204,11 +205,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Pick hunk | | -| `` b `` | Pick all hunks | | -| `` `` | Previous hunk | | -| `` `` | Next hunk | | -| `` `` | Previous conflict | | -| `` `` | Next conflict | | +| `` b `` | Pick both hunks | | +| `` , k `` | Previous hunk | | +| `` , j `` | Next hunk | | +| `` , h `` | Previous conflict | | +| `` , l `` | 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. | @@ -219,8 +220,8 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Scroll down | | -| `` mouse wheel up (fn+down) `` | Scroll up | | +| `` (fn+up) `` | Scroll down | | +| `` (fn+down) `` | Scroll up | | | `` `` | Switch view | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | Search the current view by text | | @@ -229,11 +230,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Go to previous hunk | | -| `` `` | Go to next hunk | | +| `` , h `` | Go to previous hunk | | +| `` , l `` | Go to next hunk | | | `` v `` | Toggle range select | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected text to clipboard | | | `` o `` | Open file | Open file in default application. | | `` e `` | Edit file | Open file in external editor. | | `` `` | Toggle lines in patch | | @@ -245,11 +246,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Go to previous hunk | | -| `` `` | Go to next hunk | | +| `` , h `` | Go to previous hunk | | +| `` , l `` | Go to next hunk | | | `` v `` | Toggle range select | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected text to clipboard | | | `` `` | 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. | @@ -260,7 +261,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` c `` | Commit | Commit staged changes. | | `` w `` | Commit changes without pre-commit hook | | | `` C `` | Commit changes using git editor | | -| `` `` | 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: | +| `` `` | 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: | | `` / `` | Search the current view by text | | ## Menu @@ -275,39 +276,39 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 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 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remote branches | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copy branch name to clipboard | | | `` `` | Checkout | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | | `` n `` | New branch | | +| `` w `` | New worktree | | | `` M `` | Merge | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remotes @@ -338,17 +339,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | +| `` w `` | New worktree | | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | | `` `` | View files | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Status | 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 | | | `` `` | Switch to a recent repo | | @@ -360,27 +360,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 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 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View files | | -| `` w `` | View worktree options | | | `` / `` | Search the current view by text | | ## Submodules | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy submodule name to clipboard | | +| `` `` | Copy submodule name to clipboard | | | `` `` | Enter | Enter submodule. After entering the submodule, you can press `` to escape back to the parent repo. | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | Update selected submodule. | @@ -394,16 +394,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copy tag to clipboard | | | `` `` | Checkout | Checkout the selected 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. | +| `` w `` | New worktree | | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | View commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Worktrees diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 759edee95..6a3d9b5c1 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit キーバインディング -_凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味します_ - ## グローバルキーバインド | Key | Action | Info | |-----|--------|-------------| -| `` `` | 最近のリポジトリをチェックアウト | | -| `` (fn+up/shift+k) `` | メインウィンドウを上にスクロール | | -| `` (fn+down/shift+j) `` | メインウィンドウを下にスクロール | | +| `` `` | 最近のリポジトリをチェックアウト | | +| `` , K, (fn+up/shift+k) `` | メインウィンドウを上にスクロール | | +| `` , J, (fn+down/shift+j) `` | メインウィンドウを下にスクロール | | | `` @ `` | コマンドログオプションを表示 | コマンドログのオプションを表示します（例：コマンドログの表示/非表示、コマンドログへのフォーカスなど）。 | | `` P `` | プッシュ | 現在のブランチを対応するアップストリームブランチにプッシュします。アップストリームが設定されていない場合、アップストリームブランチの設定を求められます。 | | `` p `` | プル | 現在のブランチのリモートから変更をプルします。アップストリームが設定されていない場合、アップストリームブランチの設定を求められます。 | @@ -19,20 +17,21 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` } `` | 差分コンテキストサイズを増やす | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | 差分コンテキストサイズを減らす | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | シェルコマンドを実行 | 実行するシェルコマンドを入力するプロンプトを表示します。 | -| `` `` | カスタムパッチオプションを表示 | | +| `` `` | カスタムパッチオプションを表示 | | | `` m `` | マージ/リベースオプションを表示 | 現在のマージ/リベースを中止/継続/スキップするオプションを表示します。 | | `` R `` | 更新 | Gitの状態を更新します（`git status`、`git branch`などをバックグラウンドで実行してパネルの内容を更新します）。これは`git fetch`を実行しません。 | | `` + `` | 次の画面モード（通常/半分/全画面） | | | `` _ `` | 前の画面モード | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | キャンセル | | | `` ? `` | キーバインディングメニューを開く | | -| `` `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 | -| `` W `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 | -| `` `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 | -| `` q `` | 終了 | | -| `` `` | Suspend the application | | -| `` `` | 空白表示の切り替え | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 | +| `` W, `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 | +| `` q, `` | 終了 | | +| `` `` | Suspend the application | | +| `` `` | 空白表示の切り替え | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 設定ファイルを編集 | 外部エディタでファイルを開きます。 | | `` z `` | 元に戻す | 最後のgitコマンドを元に戻すために実行するgitコマンドを決定するためにreflogが使用されます。これにはワーキングツリーへの変更は含まれません。コミットのみが考慮されます。 | | `` Z `` | やり直す | 最後のgitコマンドをやり直すために実行するgitコマンドを決定するためにreflogが使用されます。これにはワーキングツリーへの変更は含まれません。コミットのみが考慮されます。 | @@ -42,11 +41,11 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 |-----|--------|-------------| | `` , `` | 前のページ | | | `` . `` | 次のページ | | -| `` < () `` | 先頭にスクロール | | -| `` > () `` | 末尾にスクロール | | +| `` <, `` | 先頭にスクロール | | +| `` >, `` | 末尾にスクロール | | | `` v `` | 範囲選択を切り替え | | -| `` `` | 範囲選択を下に | | -| `` `` | 範囲選択を上に | | +| `` `` | 範囲選択を下に | | +| `` `` | 範囲選択を上に | | | `` / `` | 現在のビューをテキストで検索 | | | `` H `` | 左にスクロール | | | `` L `` | 右にスクロール | | @@ -64,8 +63,8 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | | `` b `` | bisectオプションを表示 | | | `` s `` | スカッシュ | 選択したコミットをその下のコミットにスカッシュします。スカッシュとは複数のコミットを1つにまとめる操作です。選択したコミットのメッセージが下のコミットに追加されます。 | | `` f `` | フィックスアップ | 選択したコミットをその下のコミットにマージします。フィックスアップはスカッシュと似ていますが、選択したコミットのメッセージは破棄され、下のコミットのメッセージのみが保持されます。 | @@ -78,40 +77,41 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` p `` | ピック | 選択したコミットをピックするようにマークします（リベース中）。これは、リベースを続行すると、コミットが保持されることを意味します。 | | `` F `` | fixupコミットを作成 | 選択したコミットに対する「fixup!」コミットを作成します。fixupコミットは、選択したコミットの修正用コミットです。後で、同じコミットで `S` を押すと、上記のすべてのfixupコミットが適用されます。 | | `` S `` | fixupコミットを適用 | すべての「fixup!」コミットを、選択したコミットの上部または現在のブランチ内のすべてをスカッシュします（autosquash）。 | -| `` `` | コミットを1つ下に移動 | | -| `` `` | コミットを1つ上に移動 | | +| `` , `` | コミットを1つ下に移動 | | +| `` , `` | コミットを1つ上に移動 | | | `` V `` | ペースト（チェリーピック） | | | `` B `` | リベース用のベースコミットとしてマーク | 次のリベース用のベースコミットを選択します。ブランチにリベースするとき、ベースコミットより上のコミットのみが持ち込まれます。これは `git rebase --onto` コマンドを使用します。 | | `` A `` | 修正 | ステージされた変更でコミットを修正します。選択したコミットがHEADコミットの場合、これは `git commit --amend` を実行します。それ以外の場合、コミットはリベースを通じて修正されます。 | | `` a `` | コミット属性を修正 | コミット作者の設定/リセットまたは共同作者の設定を行います。 | | `` t `` | リバート | 選択したコミットの変更を逆に適用する、リバートコミットを作成します。 | | `` T `` | コミットにタグを付ける | 選択したコミットを指すタグを新規作成します。タグ名とオプションの説明を入力するよう促されます。 | -| `` `` | ログオプションを表示 | コミットログのオプションを表示します（例：並び順の変更、Gitグラフの非表示、Gitグラフ全体の表示）。 | +| `` `` | ログオプションを表示 | コミットログのオプションを表示します（例：並び順の変更、Gitグラフの非表示、Gitグラフ全体の表示）。 | +| `` G `` | Open pull request in browser | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したコミットをデタッチドヘッド（特定のブランチに属さない状態）としてチェックアウトします。 | | `` y `` | コミット属性をクリップボードにコピー | コミット属性をクリップボードにコピーします（例：ハッシュ、URL、差分、メッセージ、作者）。 | | `` o `` | ブラウザでコミットを開く | | | `` n `` | コミットから新しいブランチを作成 | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `` を押して選択をキャンセルできます。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | ファイルを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストで検索 | | ## コミットファイル | Key | Action | Info | |-----|--------|-------------| -| `` `` | パスをクリップボードにコピー | | +| `` `` | パスをクリップボードにコピー | | | `` y `` | クリップボードにコピー | | | `` c `` | チェックアウト（ブランチの切り替え） | ファイルをチェックアウトします。これにより、作業ツリー内のファイルが選択したコミットのバージョンに置き換えられます。 | | `` d `` | 破棄 | このコミットのこのファイルへの変更を破棄します。これはバックグラウンドで対話的なリベースを実行するため、後のコミットでもこのファイルが変更されている場合、マージコンフリクトが発生する可能性があります。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` e `` | 編集 | 外部エディタでファイルを開きます。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` `` | パッチに含めるファイルを切り替え | ファイルがカスタムパッチに含まれるかどうかを切り替えます。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 | | `` a `` | すべてのファイルを切り替え | コミットのすべてのファイルをカスタムパッチに追加/削除します。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 | | `` `` | ファイルに入る / ディレクトリの折りたたみを切り替える | ファイルが選択されている場合、そのファイルに入ってカスタムパッチに個々の行を追加/削除できます。ディレクトリが選択されている場合、ディレクトリを切り替えます。 | @@ -132,27 +132,27 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したコミットをデタッチドヘッド（特定のブランチに属さない状態）としてチェックアウトします。 | | `` y `` | コミット属性をクリップボードにコピー | コミット属性をクリップボードにコピーします（例：ハッシュ、URL、差分、メッセージ、作者）。 | | `` o `` | ブラウザでコミットを開く | | | `` n `` | コミットから新しいブランチを作成 | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `` を押して選択をキャンセルできます。 | -| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | ファイルを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストで検索 | | ## サブモジュール | Key | Action | Info | |-----|--------|-------------| -| `` `` | サブモジュール名をクリップボードにコピー | | +| `` `` | サブモジュール名をクリップボードにコピー | | | `` `` | 入る | サブモジュールに入ります。サブモジュールに入った後、``を押して親リポジトリに戻ることができます。 | | `` d `` | 削除 | 選択したサブモジュールとそれに対応するディレクトリを削除します。 | | `` u `` | 更新 | 選択したサブモジュールを更新します。 | @@ -170,17 +170,16 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` g `` | ポップ | スタッシュエントリをワーキングディレクトリに適用し、スタッシュエントリを削除します。 | | `` d `` | 削除 | スタッシュリストからスタッシュエントリを削除します。 | | `` n `` | 新しいブランチ | 選択したスタッシュエントリから新しいブランチを作成します。これは、スタッシュエントリが作成されたコミットをgitがチェックアウトし、そのコミットから新しいブランチを作成した後、スタッシュエントリを追加のコミットとして新しいブランチに適用することで機能します。 | +| `` w `` | 新しいワークツリー | | | `` r `` | スタッシュの名前を変更 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | ファイルを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ステータス | Key | Action | Info | |-----|--------|-------------| -| `` o `` | 設定ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` e `` | 設定ファイルを編集 | 外部エディタでファイルを開きます。 | | `` u `` | 更新を確認 | | | `` `` | 最近のリポジトリをチェックアウト | | @@ -200,31 +199,31 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | タグをクリップボードにコピー | | +| `` `` | タグをクリップボードにコピー | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したタグをデタッチドHEADとしてチェックアウトします。 | | `` n `` | 新しいタグを作成 | 現在のコミットから新しいタグを作成します。タグ名とオプションの説明を入力するよう促されます。 | +| `` w `` | 新しいワークツリー | | | `` d `` | 削除 | ローカル/リモートタグの削除オプションを表示します。 | | `` P `` | タグをプッシュ | 選択したタグをリモートにプッシュします。リモートを選択するよう促されます。 | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ファイル | Key | Action | Info | |-----|--------|-------------| -| `` `` | パスをクリップボードにコピー | | +| `` `` | パスをクリップボードにコピー | | | `` `` | ステージ | 選択したファイルのステージ状態を切り替えます。 | -| `` `` | ステータスでファイルをフィルタリング | | +| `` `` | ステータスでファイルをフィルタリング | | | `` y `` | クリップボードにコピー | | | `` c `` | コミット | ステージされた変更をコミットします。 | | `` w `` | pre-commitフックなしで変更をコミット | | | `` A `` | 直前のコミットを修正 | | | `` C `` | Gitエディタを使用して変更をコミット | | -| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | +| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | | `` e `` | 編集 | 外部エディタでファイルを開きます。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` i `` | ファイルを無視または除外 | | @@ -237,7 +236,7 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` g `` | アップストリームへのリセットオプションを表示 | | | `` D `` | リセット | 作業ツリーのリセットオプション（例：作業ツリーの完全破棄）を表示します。 | | `` ` `` | ファイルツリービューを切り替え | ファイル表示をフラット表示とツリー表示で切り替えます。フラット表示はすべてのファイルパスを一覧で表示し、ツリー表示はディレクトリごとにファイルをグループ化します。

デフォルトは設定ファイル内の 'gui.showFileTree' キーで変更できます。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | フェッチ | リモートから変更をフェッチします。 | | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます | @@ -249,11 +248,11 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 前のハンクに移動 | | -| `` `` | 次のハンクに移動 | | +| `` , h `` | 前のハンクに移動 | | +| `` , l `` | 次のハンクに移動 | | | `` v `` | 範囲選択を切り替え | | | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 選択したテキストをクリップボードにコピー | | +| `` `` | 選択したテキストをクリップボードにコピー | | | `` `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 | | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | @@ -264,18 +263,18 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` c `` | コミット | ステージされた変更をコミットします。 | | `` w `` | pre-commitフックなしで変更をコミット | | | `` C `` | Gitエディタを使用して変更をコミット | | -| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | +| `` `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: | | `` / `` | 現在のビューをテキストで検索 | | ## メインパネル（パッチ作成） | Key | Action | Info | |-----|--------|-------------| -| `` `` | 前のハンクに移動 | | -| `` `` | 次のハンクに移動 | | +| `` , h `` | 前のハンクに移動 | | +| `` , l `` | 次のハンクに移動 | | | `` v `` | 範囲選択を切り替え | | | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 選択したテキストをクリップボードにコピー | | +| `` `` | 選択したテキストをクリップボードにコピー | | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 | | `` `` | パッチ内の行を切り替え | | @@ -288,11 +287,11 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| | `` `` | ハンクを選択 | | -| `` b `` | すべてのハンクを選択 | | -| `` `` | 前のハンク | | -| `` `` | 次のハンク | | -| `` `` | 前のコンフリクト | | -| `` `` | 次のコンフリクト | | +| `` b `` | Pick both hunks | | +| `` , k `` | 前のハンク | | +| `` , j `` | 次のハンク | | +| `` , h `` | 前のコンフリクト | | +| `` , l `` | 次のコンフリクト | | | `` z `` | 元に戻す | 最後のマージコンフリクト解決を元に戻します。 | | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 | | `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 | @@ -303,8 +302,8 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 下にスクロール | | -| `` mouse wheel up (fn+down) `` | 上にスクロール | | +| `` (fn+up) `` | 下にスクロール | | +| `` (fn+down) `` | 上にスクロール | | | `` `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 | | `` `` | サイドパネルに戻る | | | `` / `` | 現在のビューをテキストで検索 | | @@ -321,20 +320,20 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したコミットをデタッチドヘッド（特定のブランチに属さない状態）としてチェックアウトします。 | | `` y `` | コミット属性をクリップボードにコピー | コミット属性をクリップボードにコピーします（例：ハッシュ、URL、差分、メッセージ、作者）。 | | `` o `` | ブラウザでコミットを開く | | | `` n `` | コミットから新しいブランチを作成 | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `` を押して選択をキャンセルできます。 | -| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | コピーされた（チェリーピックされた）コミットの選択をリセット | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## リモート @@ -353,33 +352,35 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| -| `` `` | ブランチ名をクリップボードにコピー | | +| `` `` | ブランチ名をクリップボードにコピー | | | `` `` | チェックアウト（ブランチの切り替え） | 選択したリモートブランチに基づいて新しいローカルブランチをチェックアウトするか、リモートブランチをデタッチドヘッドとしてチェックアウトします。 | | `` n `` | 新しいブランチ | | +| `` w `` | 新しいワークツリー | | | `` M `` | マージ | 選択した項目を現在のブランチにマージするためのオプションを表示します（通常のマージ、スカッシュマージ） | | `` r `` | リベース | チェックアウトしたブランチを選択したブランチ上にリベースします。 | | `` d `` | 削除 | リモートからリモートブランチを削除します。 | | `` u `` | アップストリームとして設定 | 選択したリモートブランチをチェックアウトされたブランチのアップストリームとして設定します。 | | `` s `` | 並び順 | | | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：
- ソフトリセット：変更を保持し、ステージされた状態にします
- ミックスリセット：変更を保持し、ステージされていない状態にします
- ハードリセット：すべての変更を破棄します | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ローカルブランチ | Key | Action | Info | |-----|--------|-------------| -| `` `` | ブランチ名をクリップボードにコピー | | +| `` `` | ブランチ名をクリップボードにコピー | | | `` i `` | git-flowオプションを表示 | | | `` `` | チェックアウト（ブランチの切り替え） | 選択した項目をチェックアウトします。 | | `` n `` | 新しいブランチ | | | `` N `` | コミットを新しいブランチに移動 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | 新しいワークツリー | | | `` o `` | プルリクエストを作成 | | | `` O `` | プルリクエスト作成オプションを表示 | | -| `` `` | プルリクエストURLをクリップボードにコピー | | +| `` G `` | Open pull request in browser | | +| `` `` | プルリクエストURLをクリップボードにコピー | | | `` c `` | 名前でチェックアウト | 名前でチェックアウトします。入力ボックスに「-」を入力すると、最後のブランチをチェックアウトすることができます。 | | `` - `` | 直前のブランチにチェックアウト | | | `` F `` | 強制チェックアウト | 選択したブランチを強制的にチェックアウトします。これにより、選択したブランチをチェックアウトする前にワーキングディレクトリ内のすべてのローカル変更が破棄されます。 | @@ -392,10 +393,9 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 | `` g `` | リセット | | | `` R `` | ブランチ名を変更 | | | `` u `` | アップストリームオプションを表示 | ブランチのアップストリームに関連するオプションを表示します（例：アップストリームの設定/解除やアップストリームへのリセット）。 | -| `` `` | 外部差分ツールを開く（git difftool） | | +| `` `` | 外部差分ツールを開く（git difftool） | | | `` 0 `` | メインビューにフォーカス | | | `` `` | コミットを表示 | | -| `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## ワークツリー @@ -414,4 +414,4 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味 |-----|--------|-------------| | `` `` | 確認 | | | `` `` | 閉じる/キャンセル | | -| `` `` | クリップボードにコピー | | +| `` `` | クリップボードにコピー | | diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index 608a67963..a0e5d84dc 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 키 바인딩 -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ - ## 글로벌 키 바인딩 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 최근에 사용한 저장소로 전환 | | -| `` (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | | -| `` (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | | +| `` `` | 최근에 사용한 저장소로 전환 | | +| `` , K, (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | | +| `` , J, (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. | @@ -19,20 +17,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | 커스텀 Patch 옵션 보기 | | +| `` `` | 커스텀 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) | | | `` _ `` | 이전 스크린 모드 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | 취소 | | | `` ? `` | 매뉴 열기 | | -| `` `` | 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. | -| `` `` | 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 `` | 종료 | | -| `` `` | Suspend the application | | -| `` `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | 종료 | | +| `` `` | Suspend the application | | +| `` `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 설정 파일 수정 | Open file in external editor. | | `` 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. | | `` 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. | @@ -42,11 +41,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` , `` | 이전 페이지 | | | `` . `` | 다음 페이지 | | -| `` < () `` | 맨 위로 스크롤 | | -| `` > () `` | 맨 아래로 스크롤 | | +| `` <, `` | 맨 위로 스크롤 | | +| `` >, `` | 맨 아래로 스크롤 | | | `` v `` | 드래그 선택 전환 | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | 검색 시작 | | | `` H `` | 우 스크롤 | | | `` L `` | 좌 스크롤 | | @@ -64,20 +63,20 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 체크아웃 | Checkout the selected commit as a detached HEAD. | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | 브라우저에서 커밋 열기 | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (copied) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Secondary @@ -96,30 +95,30 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | +| `` w `` | New worktree | | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Sub-commits | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 체크아웃 | Checkout the selected commit as a detached HEAD. | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | 브라우저에서 커밋 열기 | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (copied) commits selection | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | -| `` w `` | View worktree options | | | `` / `` | 검색 시작 | | ## Worktrees @@ -145,11 +144,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Pick hunk | | -| `` b `` | Pick all hunks | | -| `` `` | 이전 hunk를 선택 | | -| `` `` | 다음 hunk를 선택 | | -| `` `` | 이전 충돌을 선택 | | -| `` `` | 다음 충돌을 선택 | | +| `` b `` | Pick both hunks | | +| `` , k `` | 이전 hunk를 선택 | | +| `` , j `` | 다음 hunk를 선택 | | +| `` , h `` | 이전 충돌을 선택 | | +| `` , l `` | 다음 충돌을 선택 | | | `` z `` | 되돌리기 | Undo last merge conflict resolution. | | `` e `` | 파일 편집 | Open file in external editor. | | `` o `` | 파일 닫기 | Open file in default application. | @@ -160,8 +159,8 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 아래로 스크롤 | | -| `` mouse wheel up (fn+down) `` | 위로 스크롤 | | +| `` (fn+up) `` | 아래로 스크롤 | | +| `` (fn+down) `` | 위로 스크롤 | | | `` `` | 패널 전환 | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | 검색 시작 | | @@ -170,11 +169,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 이전 hunk를 선택 | | -| `` `` | 다음 hunk를 선택 | | +| `` , h `` | 이전 hunk를 선택 | | +| `` , l `` | 다음 hunk를 선택 | | | `` v `` | 드래그 선택 전환 | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` `` | 선택한 텍스트를 클립보드에 복사 | | | `` o `` | 파일 닫기 | Open file in default application. | | `` e `` | 파일 편집 | Open file in external editor. | | `` `` | Line(s)을 패치에 추가/삭제 | | @@ -186,11 +185,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 이전 hunk를 선택 | | -| `` `` | 다음 hunk를 선택 | | +| `` , h `` | 이전 hunk를 선택 | | +| `` , l `` | 다음 hunk를 선택 | | | `` v `` | 드래그 선택 전환 | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` `` | 선택한 텍스트를 클립보드에 복사 | | | `` `` | 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. | @@ -201,21 +200,23 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. | | `` w `` | Commit changes without pre-commit hook | | | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | -| `` `` | 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: | +| `` `` | 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: | | `` / `` | 검색 시작 | | ## 브랜치 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 브랜치명을 클립보드에 복사 | | +| `` `` | 브랜치명을 클립보드에 복사 | | | `` i `` | Git-flow 옵션 보기 | | | `` `` | 체크아웃 | Checkout selected item. | | `` n `` | 새 브랜치 생성 | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` o `` | 풀 리퀘스트 생성 | | | `` O `` | 풀 리퀘스트 생성 옵션 | | -| `` `` | 풀 리퀘스트 URL을 클립보드에 복사 | | +| `` G `` | Open pull request in browser | | +| `` `` | 풀 리퀘스트 URL을 클립보드에 복사 | | | `` c `` | 이름으로 체크아웃 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | | `` - `` | Checkout previous branch | | | `` F `` | 강제 체크아웃 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | @@ -228,17 +229,15 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` 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 `` | 업데이트 확인 | | | `` `` | 최근에 사용한 저장소로 전환 | | @@ -250,7 +249,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 서브모듈 이름을 클립보드에 복사 | | +| `` `` | 서브모듈 이름을 클립보드에 복사 | | | `` `` | Enter | 서브모듈 열기 | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | 서브모듈 업데이트 | @@ -276,27 +275,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 브랜치명을 클립보드에 복사 | | +| `` `` | 브랜치명을 클립보드에 복사 | | | `` `` | 체크아웃 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | | `` n `` | 새 브랜치 생성 | | +| `` w `` | New worktree | | | `` M `` | 현재 브랜치에 병합 | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. | | `` d `` | 삭제 | 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## 커밋 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Reset cherry-picked (copied) commits selection | | | `` b `` | Bisect 옵션 보기 | | | `` 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. | @@ -309,40 +308,41 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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) | -| `` `` | 커밋을 1개 아래로 이동 | | -| `` `` | 커밋을 1개 위로 이동 | | +| `` , `` | 커밋을 1개 아래로 이동 | | +| `` , `` | 커밋을 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. | -| `` `` | 로그 메뉴 열기 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` `` | 로그 메뉴 열기 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | 체크아웃 | Checkout the selected commit as a detached HEAD. | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | 브라우저에서 커밋 열기 | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | -| `` w `` | View worktree options | | | `` / `` | 검색 시작 | | ## 커밋 파일 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 파일명을 클립보드에 복사 | | +| `` `` | 파일명을 클립보드에 복사 | | | `` y `` | 클립보드에 복사 | | | `` c `` | 체크아웃 | Checkout file | | `` d `` | View 'discard changes' options | Discard this commit's changes to this file | | `` o `` | 파일 닫기 | Open file in default application. | | `` e `` | Edit | Open file in external editor. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | @@ -363,31 +363,31 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copy tag to clipboard | | | `` `` | 체크아웃 | Checkout the selected tag as a detached HEAD. | | `` n `` | 태그를 생성 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. | +| `` w `` | New worktree | | | `` d `` | 삭제 | 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 `` | 초기화 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## 파일 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 파일명을 클립보드에 복사 | | +| `` `` | 파일명을 클립보드에 복사 | | | `` `` | Staged 전환 | Toggle staged for selected file. | -| `` `` | 파일을 필터하기 (Staged/unstaged) | | +| `` `` | 파일을 필터하기 (Staged/unstaged) | | | `` y `` | 클립보드에 복사 | | | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. | | `` w `` | Commit changes without pre-commit hook | | | `` A `` | 마지맛 커밋 수정 | | | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | -| `` `` | 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: | +| `` `` | 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: | | `` e `` | Edit | Open file in external editor. | | `` o `` | 파일 닫기 | Open file in default application. | | `` i `` | Ignore file | | @@ -400,7 +400,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` g `` | View upstream reset options | | | `` D `` | 초기화 | 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Fetch | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -414,4 +414,4 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | 확인 | | | `` `` | 닫기/취소 | | -| `` `` | 클립보드에 복사 | | +| `` `` | 클립보드에 복사 | | diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 8f59d5c21..0f01dea7c 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -2,39 +2,38 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Sneltoetsen -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ - ## Globale sneltoetsen | Key | Action | Info | |-----|--------|-------------| -| `` `` | Wissel naar een recente repo | | -| `` (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | | -| `` (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. | +| `` `` | Wissel naar een recente repo | | +| `` , K, (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | | +| `` , J, (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | | +| `` @ `` | Commandolog opties weergeven | Bekijk commandolog opties, bijv. commandolog tonen/verbergen en focus. | +| `` P `` | Push | Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. | +| `` p `` | Pull | Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. | | `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | Bekijk aangepaste patch opties | | -| `` m `` | Bekijk merge/rebase opties | View options to abort/continue/skip the current merge/rebase. | +| `` : `` | Voer shellcommando uit | Bring up a prompt where you can enter a shell command to execute. | +| `` `` | Bekijk aangepaste patch opties | | +| `` m `` | Bekijk merge/rebase opties | Toon abort/continue/skip opties voor huidige 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 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Annuleren | | | `` ? `` | Open menu | | -| `` `` | 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. | -| `` `` | 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 | | -| `` `` | Suspend the application | | -| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | Afsluiten | | +| `` `` | Pauzeer de applicatie | | +| `` `` | Witruimte weergeven in-/uitschakelen | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Verander config bestand | Open bestand in externe editor. | | `` 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. | -| `` 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. | +| `` Z `` | Redo (via reflog) (experimenteel) | Het reflog wordt gebruikt om te bepalen welk git commando moet worden gebruikt om het laatste git commando te herhalen. Wijzigingen aan de working tree worden niet meegenomen, alleen command's zijn kandidaten. | ## Lijstpaneel navigatie @@ -42,14 +41,14 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` , `` | Vorige pagina | | | `` . `` | Volgende pagina | | -| `` < () `` | Scroll naar boven | | -| `` > () `` | Scroll naar beneden | | +| `` <, `` | Scroll naar boven | | +| `` >, `` | Scroll naar beneden | | | `` v `` | Toggle drag selecteer | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | Start met zoeken | | -| `` H `` | Scroll left | | -| `` L `` | Scroll right | | +| `` H `` | Scroll naar links | | +| `` L `` | Scroll naar rechts | | | `` ] `` | Volgende tabblad | | | `` [ `` | Vorige tabblad | | @@ -57,17 +56,17 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer de bestandsnaam naar het klembord | | +| `` `` | Kopieer de bestandsnaam naar het klembord | | | `` `` | Toggle staged | Toggle staged for selected file. | -| `` `` | Filter files by status | | -| `` y `` | Copy to clipboard | | -| `` c `` | Commit veranderingen | Commit staged changes. | +| `` `` | Filter bestanden op status | | +| `` y `` | Kopieer naar klembord | | +| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. | | `` w `` | Commit veranderingen zonder pre-commit hook | | | `` A `` | Wijzig laatste commit | | | `` C `` | Commit veranderingen met de git editor | | -| `` `` | 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: | -| `` e `` | Edit | Open file in external editor. | -| `` o `` | Open bestand | Open file in default application. | +| `` `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: | +| `` e `` | Edit | Open bestand in externe editor. | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | | `` i `` | Ignore or exclude file | | | `` r `` | Refresh bestanden | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. | @@ -76,13 +75,13 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` `` | 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). | +| `` D `` | Resetten | 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | -| `` M `` | View merge conflict options | View options for resolving merge conflicts. | +| `` `` | Open externe diff applicatie (git difftool) | | +| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. | | `` f `` | Fetch | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | +| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit | | `` 0 `` | Focus main view | | | `` / `` | Filter the current view by text | | @@ -92,25 +91,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Bevestig | | | `` `` | Sluiten | | -| `` `` | Copy to clipboard | | +| `` `` | Kopieer naar klembord | | ## Branches | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer branch name naar klembord | | +| `` `` | Kopieer branch name naar klembord | | | `` i `` | Laat git-flow opties zien | | -| `` `` | Uitchecken | Checkout selected item. | +| `` `` | Uitchecken | Geselecteerd item uitchecken. | | `` n `` | Nieuwe branch | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` o `` | Maak een pull-request | | | `` O `` | Bekijk opties voor pull-aanvraag | | -| `` `` | Kopieer de URL van het pull-verzoek naar het klembord | | +| `` G `` | Open pull request in browser | | +| `` `` | 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 previous branch. | -| `` - `` | Checkout previous branch | | +| `` - `` | Vorige branch uitchecken | | | `` 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. | +| `` d `` | Verwijderen | View delete options for local/remote branch. | +| `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. | | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. | | `` T `` | Creëer tag | | @@ -118,10 +119,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Commit bericht @@ -135,19 +135,19 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer de bestandsnaam naar het klembord | | -| `` y `` | Copy to clipboard | | +| `` `` | Kopieer de bestandsnaam naar het klembord | | +| `` y `` | Kopieer naar klembord | | | `` c `` | Uitchecken | Bestand uitchecken | | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | Uitsluit deze commit zijn veranderingen aan dit bestand | -| `` o `` | Open bestand | Open file in default application. | -| `` e `` | Edit | Open file in external editor. | -| `` `` | Open external diff tool (git difftool) | | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` e `` | Edit | Open bestand in externe editor. | +| `` `` | Open externe diff applicatie (git difftool) | | | `` `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | | `` ` `` | Toggle bestandsboom weergave | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | | `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | +| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit | | `` 0 `` | Focus main view | | | `` / `` | Filter the current view by text | | @@ -155,41 +155,42 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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. | | `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | -| `` r `` | Hernoem commit | Reword the selected commit's message. | +| `` r `` | Hernoem commit | Herschrijf de commit message van de geselecteerde commit. | | `` 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`. | +| `` e `` | Bewerken (start interactieve rebase) | Wijzig commit | +| `` i `` | Start interactieve 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 | -| `` `` | Verplaats commit 1 naar beneden | | -| `` `` | Verplaats commit 1 naar boven | | +| `` , `` | Verplaats commit 1 naar beneden | | +| `` , `` | 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. | +| `` B `` | Markeer als basiscommit voor rebase | Selecteer een basiscommit voor de volgende rebase. Als je rebased op een branch worden alleen commits boven de basiscommit meegenomen. Hiervoor wordt het `git rebase --onto` commando gebruikt. | | `` 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. | -| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | -| `` `` | Uitchecken | Checkout the selected commit as a detached HEAD. | +| `` t `` | Revert | Maak een revert commit voor de geselecteerde commit, die de wijzigingen in deze commit terugdraait. | +| `` T `` | Tag commit | Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving. | +| `` `` | Log opties weergeven | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | +| `` `` | Uitchecken | Check de geselecteerde branch uit als een 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | -| `` w `` | View worktree options | | | `` / `` | Start met zoeken | | ## Input prompt @@ -212,23 +213,23 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Kies stuk | | -| `` b `` | Kies beide stukken | | -| `` `` | Selecteer bovenste hunk | | -| `` `` | Selecteer onderste hunk | | -| `` `` | Selecteer voorgaand conflict | | -| `` `` | Selecteer volgende conflict | | +| `` b `` | Pick both hunks | | +| `` , k `` | Selecteer bovenste hunk | | +| `` , j `` | Selecteer onderste hunk | | +| `` , h `` | Selecteer voorgaand conflict | | +| `` , l `` | 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 `` | View merge conflict options | View options for resolving merge conflicts. | +| `` e `` | Verander bestand | Open bestand in externe editor. | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. | | `` `` | Ga terug naar het bestanden paneel | | ## Normaal | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Scroll omlaag | | -| `` mouse wheel up (fn+down) `` | Scroll omhoog | | +| `` (fn+up) `` | Scroll omlaag | | +| `` (fn+down) `` | Scroll omhoog | | | `` `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | Start met zoeken | | @@ -237,13 +238,13 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Selecteer de vorige hunk | | -| `` `` | Selecteer de volgende hunk | | +| `` , h `` | Selecteer de vorige hunk | | +| `` , l `` | Selecteer de volgende hunk | | | `` v `` | Toggle drag selecteer | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | -| `` o `` | Open bestand | Open file in default application. | -| `` e `` | Verander bestand | Open file in external editor. | +| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. | +| `` `` | Copy selected text to clipboard | | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` e `` | Verander bestand | Open bestand in externe editor. | | `` `` | Voeg toe/verwijder lijn(en) in patch | | | `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | | `` `` | Sluit lijn-bij-lijn modus | | @@ -253,48 +254,48 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Uitchecken | Checkout the selected commit as a detached HEAD. | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Uitchecken | Check de geselecteerde branch uit als een 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remote branches | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer branch name naar klembord | | -| `` `` | Uitchecken | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | +| `` `` | Kopieer branch name naar klembord | | +| `` `` | Uitchecken | Geselecteerde remote branch uitchecken als nieuwe locale branch of als detached head. | | `` n `` | Nieuwe branch | | +| `` w `` | New worktree | | | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) | -| `` 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 | +| `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. | +| `` d `` | Verwijderen | Verwijder de remote branch van de remote. | +| `` u `` | Instellen als 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Remotes | Key | Action | Info | |-----|--------|-------------| -| `` `` | View branches | | +| `` `` | Bekijk 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. | +| `` d `` | Verwijderen | Verwijder de geselecteerde remote. Locale branches die een branch tracken van de remote worden niet aangepast. | | `` e `` | Edit | Wijzig remote | | `` f `` | Fetch | Fetch remote | | `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. | @@ -312,22 +313,22 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Selecteer de vorige hunk | | -| `` `` | Selecteer de volgende hunk | | +| `` , h `` | Selecteer de vorige hunk | | +| `` , l `` | Selecteer de volgende hunk | | | `` v `` | Toggle drag selecteer | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. | +| `` `` | Copy selected text to clipboard | | | `` `` | 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. | +| `` o `` | Open bestand | Open bestand in standaardapplicatie. | +| `` e `` | Verander bestand | Open bestand in externe editor. | | `` `` | Ga terug naar het bestanden paneel | | | `` `` | 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. | +| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. | | `` w `` | Commit veranderingen zonder pre-commit hook | | | `` C `` | Commit veranderingen met de git editor | | -| `` `` | 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: | +| `` `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: | | `` / `` | Start met zoeken | | ## Stash @@ -338,18 +339,17 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 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 | | +| `` w `` | New worktree | | +| `` r `` | Hernoem stash | | | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Status | Key | Action | Info | |-----|--------|-------------| -| `` o `` | Open config bestand | Open file in default application. | -| `` e `` | Verander config bestand | Open file in external editor. | +| `` e `` | Verander config bestand | Open bestand in externe editor. | | `` u `` | Check voor updates | | | `` `` | Wissel naar een recente repo | | | `` a `` | Show/cycle all branch logs | | @@ -360,29 +360,29 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Uitchecken | Checkout the selected commit as a detached HEAD. | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Uitchecken | Check de geselecteerde branch uit als een 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.

Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Open externe diff applicatie (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | -| `` w `` | View worktree options | | | `` / `` | Start met zoeken | | ## Submodules | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopieer submodule naam naar klembord | | +| `` `` | Kopieer submodule naam naar klembord | | | `` `` | Enter | Enter submodule | -| `` d `` | Remove | Remove the selected submodule and its corresponding directory. | +| `` d `` | Verwijderen | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | Update selected submodule. | | `` n `` | Voeg nieuwe submodule toe | | | `` e `` | Update submodule URL | | @@ -394,16 +394,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | -| `` `` | Uitchecken | Checkout the selected 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Copy tag to clipboard | | +| `` `` | Uitchecken | Geselecteerde tag uitchecken als detached HEAD. | +| `` n `` | Creëer tag | Maak een nieuwe tag die naar de huidige commit wijst. Je wordt gevraagd om een tag naam en optionele beschrijving. | +| `` w `` | New worktree | | +| `` d `` | Verwijderen | View delete options for local/remote tag. | +| `` P `` | Tag pushen | Push de geselecteerde tag naar een remote. Je krijgt de optie een remote te selecteren. | +| `` g `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. | +| `` `` | Open externe diff applicatie (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Worktrees @@ -412,6 +412,6 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` n `` | New worktree | | | `` `` | 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. | +| `` o `` | Openen in editor | | +| `` d `` | Verwijderen | 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 | | diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 63392c52e..ba46f7c46 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -2,37 +2,36 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Skróty klawiszowe -_Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ - ## Globalne skróty klawiszowe | Key | Action | Info | |-----|--------|-------------| -| `` `` | Przełącz na ostatnie repozytorium | | -| `` (fn+up/shift+k) `` | Przewiń główne okno w górę | | -| `` (fn+down/shift+j) `` | Przewiń główne okno w dół | | +| `` `` | Przełącz na ostatnie repozytorium | | +| `` , K, (fn+up/shift+k) `` | Przewiń główne okno w górę | | +| `` , J, (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. | +| `` p `` | Pociągnij | Pociągnij zmiany ze zdalnego dla bieżącej gałęzi. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej. | | `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | | `` } `` | Zwiększ rozmiar kontekstu w widoku różnic | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Zmniejsz rozmiar kontekstu w widoku różnic | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | Wyświetl opcje niestandardowej łatki | | +| `` : `` | Wykonaj polecenie w powłoce | Bring up a prompt where you can enter a shell command to execute. | +| `` `` | 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 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Anuluj | | | `` ? `` | Otwórz menu przypisań klawiszy | | -| `` `` | 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. | -| `` `` | 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ź | | -| `` `` | Suspend the application | | -| `` `` | Przełącz białe znaki | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 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. | +| `` q, `` | Wyjdź | | +| `` `` | Suspend the application | | +| `` `` | Przełącz białe znaki | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Edytuj plik konfiguracyjny | Otwórz plik w zewnętrznym edytorze. | | `` 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. | | `` 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. | @@ -42,11 +41,11 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ |-----|--------|-------------| | `` , `` | Poprzednia strona | | | `` . `` | Następna strona | | -| `` < () `` | Przewiń do góry | | -| `` > () `` | Przewiń do dołu | | +| `` <, `` | Przewiń do góry | | +| `` >, `` | Przewiń do dołu | | | `` v `` | Przełącz zaznaczenie zakresu | | -| `` `` | Zaznacz zakres w dół | | -| `` `` | Zaznacz zakres w górę | | +| `` `` | Zaznacz zakres w dół | | +| `` `` | Zaznacz zakres w górę | | | `` / `` | Szukaj w bieżącym widoku po tekście | | | `` H `` | Przewiń w lewo | | | `` L `` | Przewiń w prawo | | @@ -57,41 +56,42 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Resetuj wybrane (cherry-picked) commity | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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. | | `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | | `` 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. | +| `` d `` | Usuń | Usuń wybrany commit. To usunie commit z gałęzi za pomocą przebazowania. 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 przebazowanie) | Edytuj wybrany commit. Użyj tego, aby rozpocząć interaktywne przebazowanie od wybranego commita. Podczas trwania przebazowania, to oznaczy wybrany commit do edycji, co oznacza, że po kontynuacji przebazowania, przebazowanie zostanie wstrzymane na wybranym commicie, aby umożliwić wprowadzenie zmian. | +| `` i `` | Rozpocznij interaktywne przebazowanie | Rozpocznij interaktywne przebazowanie dla commitów na twojej gałęzi. To będzie zawierać wszystkie commity od HEAD do pierwszego commita scalenia lub commita głównej gałęzi.
Jeśli zamiast tego chcesz rozpocząć interaktywne przebazowanie od wybranego commita, naciśnij `e`. | +| `` p `` | Wybierz | Oznacz wybrany commit do wybrania (podczas przebazowania). Oznacza to, że commit zostanie zachowany po kontynuacji przebazowania. | | `` 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). | -| `` `` | Przesuń commit w dół | | -| `` `` | Przesuń commit w górę | | +| `` , `` | Przesuń commit w dół | | +| `` , `` | 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. | +| `` B `` | Oznacz jako bazowy commit dla przebazowania | Wybierz bazowy commit dla następnego przebazowania. Kiedy robisz przebazowanie na gałąź, 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ą przebazowania. | | `` 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. | -| `` `` | Zobacz opcje logów | Zobacz opcje dla logów commitów, np. zmiana kolejności sortowania, ukrywanie grafu gita, pokazywanie całego grafu gita. | +| `` `` | Zobacz opcje logów | Zobacz opcje dla logów commitów, np. zmiana kolejności sortowania, ukrywanie grafu gita, pokazywanie całego grafu gita. | +| `` G `` | Otwórz żądanie ściągnięcia w przeglądarce | | | `` `` | 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | | `` 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ąć ``, aby anulować zaznaczenie. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Wyświetl pliki | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Dodatkowy @@ -112,15 +112,35 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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 | | +## Dziennik reflog + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 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 | | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | +| `` 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ąć ``, aby anulować zaznaczenie. | +| `` `` | Resetuj wybrane (cherry-picked) commity | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` * `` | Select commits of current branch | | +| `` 0 `` | Focus main view | | +| `` `` | Pokaż commity | | +| `` / `` | Filtruj bieżący widok po tekście | | + ## Główny panel (budowanie łatki) | Key | Action | Info | |-----|--------|-------------| -| `` `` | Idź do poprzedniego fragmentu | | -| `` `` | Idź do następnego fragmentu | | +| `` , h `` | Idź do poprzedniego fragmentu | | +| `` , l `` | Idź do następnego fragmentu | | | `` v `` | Przełącz zaznaczenie zakresu | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Kopiuj zaznaczony tekst do schowka | | +| `` `` | 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. | | `` `` | Przełącz linie w łatce | | @@ -139,16 +159,18 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj nazwę gałęzi do schowka | | +| `` `` | Kopiuj nazwę gałęzi do schowka | | | `` i `` | Pokaż opcje git-flow | | | `` `` | Przełącz | Przełącz wybrany element. | | `` n `` | Nowa gałąź | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | | `` o `` | Utwórz żądanie ściągnięcia | | | `` O `` | Zobacz opcje tworzenia pull requesta | | -| `` `` | Kopiuj adres URL żądania ściągnięcia do schowka | | +| `` G `` | Otwórz żądanie ściągnięcia w przeglądarce | | +| `` `` | 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łąź. | -| `` - `` | Checkout previous branch | | +| `` - `` | Przełącz na poprzednią 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łąź. | @@ -159,10 +181,9 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | ## Menu @@ -177,8 +198,8 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Przewiń w dół | | -| `` mouse wheel up (fn+down) `` | Przewiń w górę | | +| `` (fn+up) `` | Przewiń w dół | | +| `` (fn+down) `` | Przewiń w górę | | | `` `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). | | `` `` | Exit back to side panel | | | `` / `` | Szukaj w bieżącym widoku po tekście | | @@ -188,11 +209,11 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Wybierz fragment | | -| `` b `` | Wybierz wszystkie fragmenty | | -| `` `` | Poprzedni fragment | | -| `` `` | Następny fragment | | -| `` `` | Poprzedni konflikt | | -| `` `` | Następny konflikt | | +| `` b `` | Pick both hunks | | +| `` , k `` | Poprzedni fragment | | +| `` , j `` | Następny fragment | | +| `` , h `` | Poprzedni konflikt | | +| `` , l `` | 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. | @@ -203,11 +224,11 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Idź do poprzedniego fragmentu | | -| `` `` | Idź do następnego fragmentu | | +| `` , h `` | Idź do poprzedniego fragmentu | | +| `` , l `` | Idź do następnego fragmentu | | | `` v `` | Przełącz zaznaczenie zakresu | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Kopiuj zaznaczony tekst do schowka | | +| `` `` | Kopiuj zaznaczony tekst do schowka | | | `` `` | 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. | @@ -218,7 +239,7 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` c `` | Commit | Zatwierdź zmiany zatwierdzone. | | `` w `` | Zatwierdź zmiany bez hooka pre-commit | | | `` C `` | Zatwierdź zmiany używając edytora git | | -| `` `` | 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ę: | +| `` `` | 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ę: | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Panel potwierdzenia @@ -227,21 +248,21 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ |-----|--------|-------------| | `` `` | Potwierdź | | | `` `` | Zamknij/Anuluj | | -| `` `` | Kopiuj do schowka | | +| `` `` | Kopiuj do schowka | | ## Pliki | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj ścieżkę do schowka | | +| `` `` | Kopiuj ścieżkę do schowka | | | `` `` | Zatwierdź | Przełącz zatwierdzenie dla wybranego pliku. | -| `` `` | Filtruj pliki według statusu | | +| `` `` | 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 | | -| `` `` | 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ę: | +| `` `` | 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ę: | | `` 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 | | @@ -254,7 +275,7 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Pobierz | Pobierz zmiany ze zdalnego serwera. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -266,13 +287,13 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj ścieżkę do schowka | | +| `` `` | Kopiuj ścieżkę do schowka | | | `` y `` | Kopiuj do schowka | | | `` c `` | Przełącz | Przełącz plik. Zastępuje plik w twoim drzewie roboczym wersją z wybranego commita. | -| `` d `` | Odrzuć | 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. | +| `` d `` | Odrzuć | Odrzuć zmiany w tym pliku z tego commita. Uruchamia interaktywne przebazowanie 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` `` | Przełącz plik włączony w łatkę | Przełącz, czy plik jest włączony w niestandardową łatkę. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Przełącz wszystkie pliki | Dodaj/usuń wszystkie pliki commita do niestandardowej łatki. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Wejdź do pliku / Przełącz zwiń katalog | Jeśli plik jest wybrany, wejdź do pliku, aby móc dodawać/usuwać poszczególne linie do niestandardowej łatki. Jeśli wybrany jest katalog, przełącz katalog. | @@ -289,26 +310,6 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` `` | Potwierdź | | | `` `` | Zamknij | | -## Reflog - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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ąć ``, aby anulować zaznaczenie. | -| `` `` | Resetuj wybrane (cherry-picked) commity | | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | -| `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | -| `` / `` | Filtruj bieżący widok po tekście | | - ## Schowek | Key | Action | Info | @@ -317,17 +318,16 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | `` 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. | +| `` w `` | Nowe drzewo pracy | | | `` r `` | Zmień nazwę schowka | | | `` 0 `` | Focus main view | | | `` `` | Wyświetl pliki | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | ## Status | 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 | | | `` `` | Przełącz na ostatnie repozytorium | | @@ -339,27 +339,27 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | 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 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | Przenieś commity do nowej gałęzi | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nowe drzewo pracy | | | `` 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ąć ``, aby anulować zaznaczenie. | -| `` `` | Resetuj wybrane (cherry-picked) commity | | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Resetuj wybrane (cherry-picked) commity | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Wyświetl pliki | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Submoduły | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj nazwę submodułu do schowka | | +| `` `` | Kopiuj nazwę submodułu do schowka | | | `` `` | Wejdź | Wejdź do submodułu. Po wejściu do submodułu możesz nacisnąć ``, aby wrócić do repozytorium nadrzędnego. | | `` d `` | Usuń | Usuń wybrany submoduł i odpowiadający mu katalog. | | `` u `` | Aktualizuj | Aktualizuj wybrany submoduł. | @@ -373,16 +373,16 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Skopiuj tag do schowka | | | `` `` | 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. | +| `` w `` | Nowe drzewo pracy | | | `` 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | ## Zdalne @@ -401,17 +401,17 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Kopiuj nazwę gałęzi do schowka | | +| `` `` | Kopiuj nazwę gałęzi do schowka | | | `` `` | Przełącz | Przełącz na nową lokalną gałąź na podstawie wybranej gałęzi zdalnej. Nowa gałąź będzie śledzić gałąź zdalną. | | `` n `` | Nowa gałąź | | +| `` w `` | Nowe drzewo pracy | | | `` 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. | -| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | +| `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Pokaż commity | | -| `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | diff --git a/docs/keybindings/Keybindings_pt.md b/docs/keybindings/Keybindings_pt.md index 56b805065..3071613be 100644 --- a/docs/keybindings/Keybindings_pt.md +++ b/docs/keybindings/Keybindings_pt.md @@ -1,16 +1,14 @@ _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 Keybindings - -_Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ +# Lazygit Atalhos do teclado ## Combinações globais de teclas | Key | Action | Info | |-----|--------|-------------| -| `` `` | Mudar para um repositório recente | | -| `` (fn+up/shift+k) `` | Rolar janela principal para cima | | -| `` (fn+down/shift+j) `` | Rolar a janela principal para baixo | | +| `` `` | Mudar para um repositório recente | | +| `` , K, (fn+up/shift+k) `` | Rolar janela principal para cima | | +| `` , J, (fn+down/shift+j) `` | Rolar a janela principal para baixo | | | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. | | `` P `` | Empurre (Push) | Faça push do branch atual para o seu branch upstream. Se nenhum upstream estiver configurado, você será solicitado a configurar um branch a montante. | | `` p `` | Puxar (Pull) | Puxe alterações do controle remoto para o ramo atual. Se nenhum upstream estiver configurado, será solicitado configurar um ramo a montante. | @@ -19,20 +17,21 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Executar comando da shell | Traga um prompt onde você pode digitar um comando shell para executar. | -| `` `` | Ver opções de patch personalizadas | | +| `` `` | Ver opções de patch personalizadas | | | `` m `` | Ver opções de mesclar/rebase | Ver opções para abortar/continuar/pular o merge/rebase atual. | | `` R `` | Atualizar | Atualize o estado do git (ou seja, execute `git status`, `git branch`, etc em segundo plano para atualizar o conteúdo de painéis). Isso não executa `git fetch`. | -| `` + `` | Next screen mode (normal/half/fullscreen) | | -| `` _ `` | Prev screen mode | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` + `` | Modo de tela seguinte (normal/metade/tela cheia) | | +| `` _ `` | Modo de tela anterior | | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Cancelar | | -| `` ? `` | Open keybindings menu | | -| `` `` | 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. | -| `` `` | 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 `` | Sair | | -| `` `` | Suspend the application | | -| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` ? `` | Abrir o menu de atalhos do teclado | | +| `` `` | Ver opções de filtro | 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. | +| `` q, `` | Sair | | +| `` `` | Suspender a aplicação | | +| `` `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Editar arquivo de configuração | Abrir arquivo no editor externo. | | `` z `` | Desfazer | O reflog será usado para determinar qual comando git para executar para desfazer o último comando git. Isto não inclui mudanças na árvore de trabalho; apenas compromissos são tidos em consideração. | | `` Z `` | Refazer | O reflog será usado para determinar qual comando git para executar para refazer o último comando git. Isto não inclui mudanças na árvore de trabalho; apenas compromissos são tidos em consideração. | @@ -40,32 +39,32 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` , `` | Previous page | | -| `` . `` | Next page | | -| `` < () `` | Scroll to top | | -| `` > () `` | Scroll to bottom | | +| `` , `` | Aba anterior | | +| `` . `` | Próxima aba | | +| `` <, `` | Voltar ao topo | | +| `` >, `` | Ir para o final | | | `` v `` | Toggle range select | | -| `` `` | Range select down | | -| `` `` | Range select up | | -| `` / `` | Search the current view by text | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | Pesquisar na visualização atual por texto | | | `` H `` | Rolar à esquerda | | | `` L `` | Scroll para a direita | | -| `` ] `` | Next tab | | -| `` [ `` | Previous tab | | +| `` ] `` | Próxima aba | | +| `` [ `` | Aba anterior | | ## Arquivos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copiar caminho para área de transferência | | | `` `` | Etapa | Alternar para staging para o arquivo selecionado. | -| `` `` | Filtrar arquivos por status | | +| `` `` | Filtrar arquivos por status | | | `` y `` | Copy to clipboard | | | `` c `` | Commit | Submeter mudanças em staging | | `` w `` | Fazer commit de alterações sem pré-commit | | | `` A `` | Alterar último commit | | | `` C `` | Enviar alteração usando um editor Git | | -| `` `` | Encontrar commit da base para consertar | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| +| `` `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| | `` e `` | Editar | Abrir arquivo no editor externo. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | | `` i `` | Ignore or exclude file | | @@ -78,26 +77,28 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` g `` | View upstream reset options | | | `` D `` | Restaurar | Opções de redefinição de exibição para árvore de trabalho (por exemplo, nukando a árvore de trabalho). | | `` ` `` | Alternar exibição de árvore de arquivo | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Buscar | Buscar alterações do controle remoto. | | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos | | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo | -| `` 0 `` | Focus main view | | -| `` / `` | Filter the current view by text | | +| `` 0 `` | Focar visualização principal | | +| `` / `` | Filtrar a visualização atual por texto | | ## Branches locais | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copiar nome da branch para área de transferência | | | `` i `` | Exibir opções do git-flow | | | `` `` | Verificar | Checar item selecionado | | `` n `` | Nova branch | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` o `` | Create pull request | | +| `` w `` | Nova árvore de trabalho | | +| `` o `` | Criar solicitação de pull | | | `` O `` | View create pull request options | | -| `` `` | Copiar URL do pull request para área de transferência | | +| `` G `` | Open pull request in browser | | +| `` `` | Copiar URL do pull request para área de transferência | | | `` c `` | Checar por nome | Checar por nome. Na caixa de entrada você pode inserir '-' para trocar para a última branch | | `` - `` | Checkout da branch anterior | | | `` F `` | Forçar checagem | Forçar checagem da branch selecionada. Isso irá descartar todas as mudanças no seu diretório de trabalho antes cheque a branch selecionada | @@ -105,66 +106,65 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` r `` | Refazer | Refazer a branch checada na branch selecionada | | `` M `` | Mesclar | Ver opções para mesclar o item selecionado no branch atual (mesclar regularmente, mesclar squash) | | `` f `` | Avanço rápido | Encaminhamento rápido de branch selecionada a partir do upstream. | -| `` T `` | New tag | | +| `` T `` | Nova etiqueta | | | `` s `` | Sort order | | | `` g `` | Restaurar | | -| `` R `` | Rename branch | | +| `` R `` | Renomear branch | | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Branches remotos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy branch name to clipboard | | +| `` `` | Copiar nome da branch para área de transferência | | | `` `` | Verificar | Checar a nova branch baseada na brach remota selecionada, ou a branch remota como HEAD, desanexado | | `` n `` | Nova branch | | +| `` w `` | Nova árvore de trabalho | | | `` M `` | Mesclar | Ver opções para mesclar o item selecionado no branch atual (mesclar regularmente, mesclar squash) | | `` r `` | Refazer | Refazer a branch checada na branch selecionada | | `` d `` | Apagar | Excluir o branch remoto do controle remoto. | | `` u `` | Definir como upstream | Definir o ramo remoto selecionado como fluxo do branch check-out. | | `` s `` | Sort order | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Commit arquivos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy path to clipboard | | +| `` `` | Copiar caminho para área de transferência | | | `` y `` | Copy to clipboard | | | `` c `` | Verificar | Arquivo de check-out. Isso substitui o arquivo em sua árvore de trabalho com a versão do commit selecionado. | | `` d `` | Descartar | Descartar as alterações desse commit para este arquivo. Isso executa uma rebase interativa em segundo plano, então você pode ter um conflito de merge se um commit posterior também alterar este arquivo. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | | `` e `` | Editar | Abrir arquivo no editor externo. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` `` | Alternar entre o arquivo incluído no patch | Alternar se o arquivo está incluído no patch personalizado. Veja https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Alternar todos os arquivos | Adicionar/remover todos os arquivos de commit para atualização personalizada. Consulte https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Insira o arquivo / Alternar diretório recolhido | Se um arquivo estiver selecionado, insira o arquivo para que você possa adicionar/remover linhas individuais no patch personalizado. Se um diretório for selecionado, ative o diretório. | | `` ` `` | Alternar exibição de árvore de arquivo | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos | | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo | -| `` 0 `` | Focus main view | | -| `` / `` | Filter the current view by text | | +| `` 0 `` | Focar visualização principal | | +| `` / `` | Filtrar a visualização atual por texto | | ## Commits | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` b `` | View bisect options | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` b `` | Ver opções de bissecção | | | `` s `` | Squash | Squash o commit selecionado no commit abaixo dele. A mensagem do commit selecionado será anexada ao commit abaixo dele. | -| `` f `` | Fixup | Faça o commit selecionado no commit abaixo dele. Semelhante para o squash, mas a mensagem do commit selecionado será descartada. | -| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | +| `` f `` | Corrigir | Faça o commit selecionado no commit abaixo dele. Semelhante para o squash, mas a mensagem do commit selecionado será descartada. | +| `` c `` | Configurar mensagem de correção | Defina a opção de mensagem para o commit de correção. A opção -C significa usar a mensagem deste commit em vez da mensagem do commit alvo. | | `` r `` | Reword | Repetir a mensagem de submissão selecionada. | | `` R `` | Republicar com o editor | | | `` d `` | Descartar | Solte o commit selecionado. Isso irá remover o commit do branch através de uma rebase. Se o commit faz com que as alterações em commits posteriores dependem, você pode precisar resolver conflitos de merge. | @@ -173,52 +173,45 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` p `` | Escolher | Marque o commit selecionado para ser escolhido (quando meados da base). Isso significa que o commit será mantido ao continuar o rebase. | | `` F `` | Criar commit de correção | Crie o commit 'correção!' para o commit selecionado. Mais tarde, você pode pressionar `S` neste mesmo commit para aplicar todas os commits de correção acima. | | `` S `` | Aplicar commits de correções | Aplicar Squash all 'correção!', seja acima do commit selecionado, ou tudo no branch atual (autosquash). | -| `` `` | Mover commit um para baixo | | -| `` `` | Mover o commit um para cima | | +| `` , `` | Mover commit um para baixo | | +| `` , `` | Mover o commit um para cima | | | `` V `` | Colar (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 `` | Modificar | Alterar o commit com mudanças em sted. Se o commit selecionado for o commit HEAD, ele executará o `git commit --amend`. Caso contrário, o compromisso será alterado por meio de uma base de apoio. | | `` a `` | Alterar atributo de commit | Definir/Redefinir autor de submissão ou co-autor definido. | | `` t `` | Reverter | Crie um commit reverter para o commit selecionado, que aplica as alterações do commit selecionado em reverso. | -| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. | -| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` T `` | Etiquetar commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. | +| `` `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | Verificar | 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 | | +| `` o `` | Abrir commit no navegador | | | `` n `` | Create new branch off of commit | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nova árvore de trabalho | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `` para cancelar a seleção. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` 0 `` | Focar visualização principal | | | `` `` | Ver arquivos | | -| `` w `` | View worktree options | | -| `` / `` | Search the current view by text | | - -## Confirmation panel - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | Confirmar | | -| `` `` | Fechar/Cancelar | | -| `` `` | Copy to clipboard | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Etiquetas | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copiar etiqueta para área de transferência | | | `` `` | Verificar | Checar a tag selecionada como um HEAD, desanexado | -| `` n `` | New tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. | +| `` n `` | Nova etiqueta | Crie uma nova etiqueta a partir do commit atual. Você será solicitado a digitar um nome e uma descrição opcional. | +| `` w `` | Nova árvore de trabalho | | | `` d `` | Apagar | Ver opções de exclusão para tag local/remoto. | -| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. | +| `` P `` | Empurrar etiqueta | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Input prompt @@ -233,27 +226,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Executar | | | `` `` | Fechar/Cancelar | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filtrar a visualização atual por texto | | ## Painel Principal (Normal) | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Rolar para baixo | | -| `` mouse wheel up (fn+down) `` | Rolar para cima | | +| `` (fn+up) `` | Rolar para baixo | | +| `` (fn+down) `` | Rolar para cima | | | `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | | `` `` | Exit back to side panel | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Painel Principal (preparação) | Key | Action | Info | |-----|--------|-------------| -| `` `` | Ir para o local anterior | | -| `` `` | Ir para o próximo trecho | | +| `` , h `` | Ir para o local anterior | | +| `` , l `` | Ir para o próximo trecho | | | `` v `` | Toggle range select | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. | +| `` `` | Copiar texto selecionado para área de transferência | | | `` `` | Etapa | Ativar/desativar seleção em staged/unstaged | | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | @@ -264,19 +257,27 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` c `` | Commit | Submeter mudanças em staging | | `` w `` | Fazer commit de alterações sem pré-commit | | | `` C `` | Enviar alteração usando um editor Git | | -| `` `` | Encontrar commit da base para consertar | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| -| `` / `` | Search the current view by text | | +| `` `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado
Veja a documentação:
| +| `` / `` | Pesquisar na visualização atual por texto | | + +## Painel de confirmação + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Confirmar | | +| `` `` | Fechar/Cancelar | | +| `` `` | Copy to clipboard | | ## Painel principal (mesclagem) | Key | Action | Info | |-----|--------|-------------| | `` `` | Escolha o local | | -| `` b `` | Pegar todos os pedaços | | -| `` `` | Trecho anterior | | -| `` `` | Próximo trecho | | -| `` `` | Conflito anterior | | -| `` `` | Próximo conflito | | +| `` b `` | Pick both hunks | | +| `` , k `` | Trecho anterior | | +| `` , j `` | Próximo trecho | | +| `` , h `` | Conflito anterior | | +| `` , l `` | Próximo conflito | | | `` z `` | Desfazer | Desfazer resolução de conflitos de última mesclagem. | | `` e `` | Editar arquivo | Abrir arquivo no editor externo. | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | @@ -287,37 +288,37 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Ir para o local anterior | | -| `` `` | Ir para o próximo trecho | | +| `` , h `` | Ir para o local anterior | | +| `` , l `` | Ir para o próximo trecho | | | `` v `` | Toggle range select | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Copy selected text to clipboard | | +| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. | +| `` `` | Copiar texto selecionado para área de transferência | | | `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. | | `` e `` | Editar arquivo | Abrir arquivo no editor externo. | | `` `` | Alternar linhas no caminho | | -| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | +| `` d `` | Remover linhas do commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | | `` `` | Sair do construtor de patch personalizado | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Reflog | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Verificar | 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 | | +| `` o `` | Abrir commit no navegador | | | `` n `` | Create new branch off of commit | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nova árvore de trabalho | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `` para cancelar a seleção. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | -| `` `` | View commits | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` 0 `` | Focar visualização principal | | +| `` `` | Ver commits | | +| `` / `` | Filtrar a visualização atual por texto | | ## Remotes @@ -329,7 +330,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` e `` | Editar | Edit the selected remote's name or URL. | | `` f `` | Buscar | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. | | `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filtrar a visualização atual por texto | | ## Secundário @@ -337,7 +338,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ |-----|--------|-------------| | `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | | `` `` | Exit back to side panel | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | ## Stash @@ -347,57 +348,56 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` g `` | Pop | Aplique a entrada de stash no seu diretório de trabalho e remova a entrada de stash. | | `` d `` | Descartar | Remova a entrada do stash da lista de armazenamento. | | `` n `` | Nova branch | Criar um novo ramo a partir da entrada de lixo selecionada. Isso funciona verificando o commit do qual a entrada de lixo foi criada, criar um novo branch a partir desse commit e, em seguida, aplicar a entrada de lixo ao novo branch como um commit adicional. | -| `` r `` | Renomear o stasj | | -| `` 0 `` | Focus main view | | +| `` w `` | Nova árvore de trabalho | | +| `` r `` | Renomear o stash | | +| `` 0 `` | Focar visualização principal | | | `` `` | Ver arquivos | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filtrar a visualização atual por texto | | ## Status | Key | Action | Info | |-----|--------|-------------| -| `` o `` | Abrir o ficheiro de config | Abrir arquivo no aplicativo padrão. | | `` e `` | Editar arquivo de configuração | Abrir arquivo no editor externo. | | `` u `` | Verificar atualização | | | `` `` | Mudar para um repositório recente | | | `` a `` | Mostrar/ciclo todos os logs de filiais | | | `` A `` | Show/cycle all branch logs (reverse) | | -| `` 0 `` | Focus main view | | +| `` 0 `` | Focar visualização principal | | ## Sub-commits | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Verificar | 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 | | +| `` o `` | Abrir commit no navegador | | | `` n `` | Create new branch off of commit | | | `` N `` | Mover commits para uma nova branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | Nova árvore de trabalho | | | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `` para cancelar a seleção. | -| `` `` | Reset copied (cherry-picked) commits selection | | -| `` `` | Abrir ferramenta de diff externa (git difftool) | | +| `` `` | Reset copied (cherry-picked) commits selection | | +| `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` 0 `` | Focar visualização principal | | | `` `` | Ver arquivos | | -| `` w `` | View worktree options | | -| `` / `` | Search the current view by text | | +| `` / `` | Pesquisar na visualização atual por texto | | -## Submodules +## Submódulos | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy submodule name to clipboard | | +| `` `` | Copiar o nome do submódulo para área de transferência | | | `` `` | Enter | Enter submodule. After entering the submodule, you can press `` to escape back to the parent repo. | -| `` d `` | Remover | 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. | +| `` d `` | Remover | Remova o submódulo selecionado e o diretório correspondente. | +| `` u `` | Atualizar | Atualizar submódulo selecionado. | +| `` n `` | Novo submódulo | | +| `` e `` | Atualizar URL do submódulo | | +| `` i `` | Inicializar | 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 | | +| `` / `` | Filtrar a visualização atual por texto | | ## Sumário do commit @@ -406,12 +406,12 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` `` | Confirmar | | | `` `` | Fechar | | -## Worktrees +## Árvores de trabalho | Key | Action | Info | |-----|--------|-------------| -| `` n `` | New worktree | | -| `` `` | Switch | Switch to the selected worktree. | +| `` n `` | Nova árvore de trabalho | | +| `` `` | Switch | Mudar para a árvore de trabalho selecionada. | | `` o `` | Abrir no editor | | | `` d `` | Remover | 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 | | +| `` / `` | Filtrar a visualização atual por texto | | diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md index 895e49e63..3d03f9ca6 100644 --- a/docs/keybindings/Keybindings_ru.md +++ b/docs/keybindings/Keybindings_ru.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Связки клавиш -_Связки клавиш_ - ## Глобальные сочетания клавиш | Key | Action | Info | |-----|--------|-------------| -| `` `` | Переключиться на последний репозиторий | | -| `` (fn+up/shift+k) `` | Прокрутить вверх главную панель | | -| `` (fn+down/shift+j) `` | Прокрутить вниз главную панель | | +| `` `` | Переключиться на последний репозиторий | | +| `` , K, (fn+up/shift+k) `` | Прокрутить вверх главную панель | | +| `` , J, (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. | @@ -19,20 +17,21 @@ _Связки клавиш_ | `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | | `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | Просмотреть пользовательские параметры патча | | +| `` `` | Просмотреть пользовательские параметры патча | | | `` 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`. | | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | | | `` _ `` | Предыдущий режим экрана | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | Отменить | | | `` ? `` | Открыть меню | | -| `` `` | Просмотреть параметры фильтрации по пути | 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. | -| `` `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. | -| `` q `` | Выйти | | -| `` `` | Suspend the application | | -| `` `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Просмотреть параметры фильтрации по пути | 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. | +| `` q, `` | Выйти | | +| `` `` | Suspend the application | | +| `` `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | Редактировать файл конфигурации | Open file in external editor. | | `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | | `` Z `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | @@ -42,11 +41,11 @@ _Связки клавиш_ |-----|--------|-------------| | `` , `` | Предыдущая страница | | | `` . `` | Следующая страница | | -| `` < () `` | Пролистать наверх | | -| `` > () `` | Прокрутить вниз | | +| `` <, `` | Пролистать наверх | | +| `` >, `` | Прокрутить вниз | | | `` v `` | Переключить выборку перетаскивания | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | Range select down | | +| `` `` | Range select up | | | `` / `` | Найти | | | `` H `` | Прокрутить влево | | | `` L `` | Прокрутить вправо | | @@ -82,11 +81,11 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Выбрать предыдущую часть | | -| `` `` | Выбрать следующую часть | | +| `` , h `` | Выбрать предыдущую часть | | +| `` , l `` | Выбрать следующую часть | | | `` v `` | Переключить выборку перетаскивания | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` `` | Скопировать выделенный текст в буфер обмена | | | `` `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные | | `` 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. | @@ -97,15 +96,15 @@ _Связки клавиш_ | `` c `` | Сохранить изменения | Commit staged changes. | | `` w `` | Закоммитить изменения без предварительного хука коммита | | | `` C `` | Сохранить изменения с помощью редактора git | | -| `` `` | 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: | +| `` `` | 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: | | `` / `` | Найти | | ## Главная панель (Обычный) | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | Прокрутить вниз | | -| `` mouse wheel up (fn+down) `` | Прокрутить вверх | | +| `` (fn+up) `` | Прокрутить вниз | | +| `` (fn+down) `` | Прокрутить вверх | | | `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | | `` / `` | Найти | | @@ -115,11 +114,11 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Выбрать эту часть | | -| `` b `` | Выбрать все части | | -| `` `` | Выбрать предыдущую часть | | -| `` `` | Выбрать следующую часть | | -| `` `` | Выбрать предыдущий конфликт | | -| `` `` | Выбрать следующий конфликт | | +| `` b `` | Pick both hunks | | +| `` , k `` | Выбрать предыдущую часть | | +| `` , j `` | Выбрать следующую часть | | +| `` , h `` | Выбрать предыдущий конфликт | | +| `` , l `` | Выбрать следующий конфликт | | | `` z `` | Отменить | Undo last merge conflict resolution. | | `` e `` | Редактировать файл | Open file in external editor. | | `` o `` | Открыть файл | Open file in default application. | @@ -130,11 +129,11 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Выбрать предыдущую часть | | -| `` `` | Выбрать следующую часть | | +| `` , h `` | Выбрать предыдущую часть | | +| `` , l `` | Выбрать следующую часть | | | `` v `` | Переключить выборку перетаскивания | | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` `` | Скопировать выделенный текст в буфер обмена | | | `` o `` | Открыть файл | Open file in default application. | | `` e `` | Редактировать файл | Open file in external editor. | | `` `` | Добавить/удалить строку(и) для патча | | @@ -146,28 +145,28 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Переключить | Checkout the selected commit as a detached HEAD. | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | Открыть коммит в браузере | | | `` n `` | Создать новую ветку с этого коммита | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Коммиты | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | +| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Сбросить отобранную (скопированную \| 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. | @@ -180,41 +179,44 @@ _Связки клавиш_ | `` p `` | Pick | Выбрать коммит (в середине перебазирования) | | `` F `` | Создать fixup коммит | Создать fixup коммит для этого коммита | | `` S `` | Apply fixup commits | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) | -| `` `` | Переместить коммит вниз на один | | -| `` `` | Переместить коммит вверх на один | | +| `` , `` | Переместить коммит вниз на один | | +| `` , `` | Переместить коммит вверх на один | | | `` 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. | -| `` `` | Открыть меню журнала | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` `` | Открыть меню журнала | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | +| `` G `` | Open pull request in browser | | | `` `` | Переключить | Checkout the selected commit as a detached HEAD. | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | Открыть коммит в браузере | | | `` n `` | Создать новую ветку с этого коммита | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | -| `` w `` | View worktree options | | | `` / `` | Найти | | ## Локальные Ветки | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название ветки в буфер обмена | | +| `` `` | Скопировать название ветки в буфер обмена | | | `` i `` | Показать параметры git-flow | | | `` `` | Переключить | Checkout selected item. | | `` n `` | Новая ветка | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` o `` | Создать запрос на принятие изменений | | | `` O `` | Создать параметры запроса принятие изменений | | -| `` `` | Скопировать URL запроса на принятие изменений в буфер обмена | | +| `` G `` | Open pull request in browser | | +| `` `` | Скопировать URL запроса на принятие изменений в буфер обмена | | | `` c `` | Переключить по названию | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | | `` - `` | Checkout previous branch | | | `` F `` | Принудительное переключение | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | @@ -227,10 +229,9 @@ _Связки клавиш_ | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Меню @@ -247,33 +248,33 @@ _Связки клавиш_ |-----|--------|-------------| | `` `` | Подтвердить | | | `` `` | Закрыть/отменить | | -| `` `` | Copy to clipboard | | +| `` `` | Copy to clipboard | | ## Подкоммиты | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | Copy abbreviated commit hash to clipboard | | | `` `` | Переключить | Checkout the selected commit as a detached HEAD. | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | | `` o `` | Открыть коммит в браузере | | | `` n `` | Создать новую ветку с этого коммита | | | `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` w `` | New worktree | | | `` 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 `` to cancel the selection. | -| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов | | +| `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | -| `` w `` | View worktree options | | | `` / `` | Найти | | ## Подмодули | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название подмодуля в буфер обмена | | +| `` `` | Скопировать название подмодуля в буфер обмена | | | `` `` | Enter | Ввести подмодуль | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. | | `` u `` | Update | Обновить подмодуль | @@ -294,13 +295,13 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название файла в буфер обмена | | +| `` `` | Скопировать название файла в буфер обмена | | | `` y `` | Copy to clipboard | | | `` c `` | Переключить | Переключить файл | | `` d `` | Просмотреть параметры «отмены изменении» | Отменить изменения коммита в этом файле | | `` o `` | Открыть файл | Open file in default application. | | `` e `` | Edit | Open file in external editor. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | Переключить все файлы, включённые в патч | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | @@ -314,7 +315,6 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` o `` | Открыть файл конфигурации | Open file in default application. | | `` e `` | Редактировать файл конфигурации | Open file in external editor. | | `` u `` | Проверить обновления | | | `` `` | Переключиться на последний репозиторий | | @@ -326,35 +326,35 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | +| `` `` | Copy tag to clipboard | | | `` `` | Переключить | Checkout the selected tag as a detached HEAD. | | `` n `` | Создать тег | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. | +| `` w `` | New worktree | | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Удалённые ветки | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название ветки в буфер обмена | | +| `` `` | Скопировать название ветки в буфер обмена | | | `` `` | Переключить | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | | `` n `` | Новая ветка | | +| `` w `` | New worktree | | | `` M `` | Слияние с текущей переключённой веткой | View options for merging the selected item into the current branch (regular merge, squash merge) | | `` 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. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | ## Удалённые репозитории @@ -373,15 +373,15 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Скопировать название файла в буфер обмена | | +| `` `` | Скопировать название файла в буфер обмена | | | `` `` | Переключить индекс | Toggle staged for selected file. | -| `` `` | Фильтровать файлы (проиндексированные/непроиндексированные) | | +| `` `` | Фильтровать файлы (проиндексированные/непроиндексированные) | | | `` y `` | Copy to clipboard | | | `` c `` | Сохранить изменения | Commit staged changes. | | `` w `` | Закоммитить изменения без предварительного хука коммита | | | `` A `` | Правка последнего коммита | | | `` C `` | Сохранить изменения с помощью редактора git | | -| `` `` | 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: | +| `` `` | 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: | | `` e `` | Edit | Open file in external editor. | | `` o `` | Открыть файл | Open file in default application. | | `` i `` | Игнорировать или исключить файл | | @@ -394,7 +394,7 @@ _Связки клавиш_ | `` 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | Open external diff tool (git difftool) | | +| `` `` | Open external diff tool (git difftool) | | | `` M `` | View merge conflict options | View options for resolving merge conflicts. | | `` f `` | Получить изменения | Fetch changes from remote. | | `` - `` | Collapse all files | Collapse all directories in the files tree | @@ -410,8 +410,8 @@ _Связки клавиш_ | `` 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. | +| `` w `` | New worktree | | | `` r `` | Переименовать хранилище | | | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | -| `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md index 8e7ef420c..9819cb982 100644 --- a/docs/keybindings/Keybindings_zh-CN.md +++ b/docs/keybindings/Keybindings_zh-CN.md @@ -2,15 +2,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 按键绑定 -_图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ - ## 全局键绑定 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切换到最近的仓库 | | -| `` (fn+up/shift+k) `` | 向上滚动主面板 | | -| `` (fn+down/shift+j) `` | 向下滚动主面板 | | +| `` `` | 切换到最近的仓库 | | +| `` , K, (fn+up/shift+k) `` | 向上滚动主面板 | | +| `` , J, (fn+down/shift+j) `` | 向下滚动主面板 | | | `` @ `` | 打开命令日志菜单 | 查看命令日志的选项，例如显示/隐藏命令日志以及聚焦命令日志 | | `` P `` | 推送 | 推送当前分支到它的上游。如果上游未配置，您可以在弹窗中配置上游分支。 | | `` p `` | 拉取 | 从当前分支的远程分支获取改动。如果上游未配置，您可以在弹窗中配置上游分支。 | @@ -19,20 +17,21 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` } `` | 扩大差异视图中显示的上下文范围 | 增加差异视图中变更周围显示的上下文量。

默认值可在配置文件中通过键 'git.diffContextSize' 更改。 | | `` { `` | 缩小差异视图中显示的上下文范围 | 减少差异视图中变更周围显示的上下文量。

默认值可在配置文件中通过键 'git.diffContextSize' 更改。 | | `` : `` | 执行 Shell 命令 | 调出可输入shell命令执行的提示符。 | -| `` `` | 查看自定义补丁选项 | | +| `` `` | 查看自定义补丁选项 | | | `` m `` | 查看合并/变基选项 | 查看当前合并或变基的中止、继续、跳过选项 | | `` R `` | 刷新 | 刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。 | | `` + `` | 下一屏模式(正常/半屏/全屏) | | | `` _ `` | 上一屏模式 | | -| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 | +| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. | +| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. | | `` `` | 取消 | | | `` ? `` | 打开菜单 | | -| `` `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 | -| `` W `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 | -| `` `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 | -| `` q `` | 退出 | | -| `` `` | 挂起应用程序 | | -| `` `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。

默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 | +| `` `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 | +| `` W, `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 | +| `` q, `` | 退出 | | +| `` `` | 挂起应用程序 | | +| `` `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。

默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 | +| `` `` | 编辑配置文件 | 使用外部编辑器打开文件 | | `` z `` | 撤销 | Reflog将用于确定运行哪个git命令来撤消最后一个git命令。这并不包括对工作树的更改，只考虑提交。 | | `` Z `` | 重做 | Reflog将用于确定运行哪个git命令来重做上一个git命令。这并不包括对工作树的更改，只考虑提交。 | @@ -42,11 +41,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ |-----|--------|-------------| | `` , `` | 上一页 | | | `` . `` | 下一页 | | -| `` < () `` | 滚动到顶部 | | -| `` > () `` | 滚动到底部 | | +| `` <, `` | 滚动到顶部 | | +| `` >, `` | 滚动到底部 | | | `` v `` | 切换拖动选择 | | -| `` `` | 向下扩展选择范围 | | -| `` `` | 向上扩展选择范围 | | +| `` `` | 向下扩展选择范围 | | +| `` `` | 向上扩展选择范围 | | | `` / `` | 开始搜索 | | | `` H `` | 向左滚动 | | | `` L `` | 向右滚动 | | @@ -57,27 +56,27 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 复制缩略提交哈希值到剪贴板 | | | `` `` | 检出 | 检出所选择的提交作为分离HEAD。 | | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 | | `` o `` | 在浏览器中打开提交 | | | `` n `` | 从提交创建新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `` 来取消选择。 | -| `` `` | 重置已拣选(复制)的提交 | | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 重置已拣选(复制)的提交 | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交的文件 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 开始搜索 | | ## 子模块 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制子模块名称到剪贴板 | | +| `` `` | 复制子模块名称到剪贴板 | | | `` `` | 进入 | 输入子模块 | | `` d `` | 删除 | 删除选定的子模块及其相应的目录 | | `` u `` | 更新 | 更新子模块 | @@ -101,32 +100,32 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | +| `` `` | 复制缩略提交哈希值到剪贴板 | | | `` `` | 检出 | 检出所选择的提交作为分离HEAD。 | | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 | | `` o `` | 在浏览器中打开提交 | | | `` n `` | 从提交创建新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `` 来取消选择。 | -| `` `` | 重置已拣选(复制)的提交 | | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 重置已拣选(复制)的提交 | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 提交 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 重置已拣选(复制)的提交 | | +| `` `` | 复制缩略提交哈希值到剪贴板 | | +| `` `` | 重置已拣选(复制)的提交 | | | `` b `` | 查看二分查找选项 | | | `` s `` | 压缩(Squash) | 将已选提交压缩到该提交之下。这些选定的提交的消息会附加到该提交的消息之下。 | | `` f `` | 修正 （fixup） | 将选定的提交合并到其下面的提交中。与压缩类似，但所选提交的消息将被丢弃。 | -| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | +| `` c `` | 设置修复提交信息 | 设置修复提交的信息选项。-C 选项表示使用此提交的信息，而非目标提交的信息。 | | `` r `` | 改写提交 | 重写所选提交的消息。 | | `` R `` | 使用编辑器重命名提交 | | | `` d `` | 删除提交 | 删除选中的提交。这将通过变基从分支中删除该提交，如果该提交修改的内容依赖于后续的提交，则需要解决合并冲突。 | @@ -135,27 +134,28 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` p `` | 拣选(Pick) | 标记选中的提交为 picked（变基过程中）。这意味该提交将在后续的变基中保留。 | | `` F `` | 为此提交创建修正 | 创建修正提交 | | `` S `` | 应用该修复提交 | 压缩所选提交之上或当前分支的所有 “fixup!” 提交（自动压缩）。 | -| `` `` | 下移提交 | | -| `` `` | 上移提交 | | +| `` , `` | 下移提交 | | +| `` , `` | 上移提交 | | | `` V `` | 粘贴提交(拣选) | | | `` B `` | 标记一个主提交用于变基 | 选择下一次变基的主提交。当您变基到一个分支时，只有高于主提交的提交才会被引入。这使用“git rebase --onto”命令。 | | `` A `` | 修补(Amend) | 用已暂存的变更来修补提交 | | `` a `` | 修补提交属性 | 设置或重置提交的作者，或添加其他作者。 | | `` t `` | 撤销(Revert) | 为所选提交创建还原提交，这会反向应用所选提交的更改。 | | `` T `` | 标签提交 | 创建一个新标签指向所选提交。您可以在弹窗中输入标签名称和描述(可选)。 | -| `` `` | 打开日志菜单 | 查看提交日志的选项，例如更改排序顺序、隐藏 git graph、显示整个 git graph。 | +| `` `` | 打开日志菜单 | 查看提交日志的选项，例如更改排序顺序、隐藏 git graph、显示整个 git graph。 | +| `` G `` | 在浏览器中打开拉取请求 | | | `` `` | 检出 | 检出所选择的提交作为分离HEAD。 | | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 | | `` o `` | 在浏览器中打开提交 | | | `` n `` | 从提交创建新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `` 来取消选择。 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交的文件 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 开始搜索 | | ## 提交信息 @@ -169,13 +169,13 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制路径到剪贴板 | | +| `` `` | 复制路径到剪贴板 | | | `` y `` | 复制到剪贴板 | | | `` c `` | 检出 | 检出文件 | | `` d `` | 查看'放弃变更'选项 | 放弃对此文件的提交变更 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | | `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | | `` `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。 | @@ -189,15 +189,15 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制路径到剪贴板 | | +| `` `` | 复制路径到剪贴板 | | | `` `` | 切换暂存状态 | 为选定的文件切换暂存状态 | -| `` `` | 通过状态过滤文件 | | +| `` `` | 通过状态过滤文件 | | | `` y `` | 复制到剪贴板 | | | `` c `` | 提交变更 | 提交暂存文件 | | `` w `` | 提交变更而无需预先提交钩子 | | | `` A `` | 修补最后一次提交 | | | `` C `` | 使用 Git 编辑器提交变更 | | -| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | +| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | | `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | | `` i `` | 忽略文件 | | @@ -210,7 +210,7 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` g `` | 查看上游重置选项 | | | `` D `` | 重置 | 查看工作树的重置选项（例如：清除工作树）。 | | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。

可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 | | `` f `` | 抓取 | 从远程获取变更 | | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 | @@ -222,14 +222,16 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制分支名称到剪贴板 | | +| `` `` | 复制分支名称到剪贴板 | | | `` i `` | 显示 git-flow 选项 | | | `` `` | 检出 | 检出选中的项目 | | `` n `` | 新分支 | | | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。

请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 | +| `` w `` | 新建工作树 | | | `` o `` | 创建拉取请求 | | | `` O `` | 创建拉取请求选项 | | -| `` `` | 复制拉取请求 URL 到剪贴板 | | +| `` G `` | 在浏览器中打开拉取请求 | | +| `` `` | 复制拉取请求 URL 到剪贴板 | | | `` c `` | 按名称检出 | 按名称检出。在输入框中，您可以输入'-' 来切换到最后一个分支。 | | `` - `` | 签出上一个分支 | | | `` F `` | 强制检出 | 强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。 | @@ -242,25 +244,24 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` g `` | 查看重置选项 | | | `` R `` | 重命名分支 | | | `` u `` | 查看上游选项 | 查看与分支上游相关的选项，例如设置/取消设置上游和重置为上游。 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 构建补丁中 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 选择上一个区块 | | -| `` `` | 选择下一个区块 | | +| `` , h `` | 选择上一个区块 | | +| `` , l `` | 选择下一个区块 | | | `` v `` | 切换拖动选择 | | | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 | -| `` `` | 复制选中文本到剪贴板 | | +| `` `` | 复制选中文本到剪贴板 | | | `` o `` | 打开文件 | 使用默认程序打开该文件 | | `` e `` | 编辑文件 | 使用外部编辑器打开文件 | | `` `` | 添加/移除 行到补丁 | | -| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | +| `` d `` | 从提交中移除行 | 从本次提交中移除所选行。此操作会在后台运行交互式变基，因此如果后续提交也修改了这些行，您可能会遇到合并冲突。 | | `` `` | 退出逐行模式 | | | `` / `` | 开始搜索 | | @@ -268,16 +269,16 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制标签到剪贴板 | | +| `` `` | 复制标签到剪贴板 | | | `` `` | 检出 | 检出选择的标签作为分离的HEAD | | `` n `` | 创建标签 | 基于当前提交创建一个新标签。您将在弹窗中输入标签名称和描述(可选)。 | +| `` w `` | 新建工作树 | | | `` d `` | 删除 | 查看本地/远程标签的删除选项 | | `` P `` | 推送标签 | 推送选择的标签到远端。您将在弹窗中选择一个远端。 | | `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 次要 @@ -293,11 +294,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | 选中区块 | | -| `` b `` | 选中所有区块 | | -| `` `` | 选择顶部块 | | -| `` `` | 选择底部块 | | -| `` `` | 选择上一个冲突 | | -| `` `` | 选择下一个冲突 | | +| `` b `` | Pick both hunks | | +| `` , k `` | 选择顶部块 | | +| `` , j `` | 选择底部块 | | +| `` , h `` | 选择上一个冲突 | | +| `` , l `` | 选择下一个冲突 | | | `` z `` | 撤销 | 撤消上次合并冲突解决 | | `` e `` | 编辑文件 | 使用外部编辑器打开文件 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | @@ -308,11 +309,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 选择上一个区块 | | -| `` `` | 选择下一个区块 | | +| `` , h `` | 选择上一个区块 | | +| `` , l `` | 选择下一个区块 | | | `` v `` | 切换拖动选择 | | | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 | -| `` `` | 复制选中文本到剪贴板 | | +| `` `` | 复制选中文本到剪贴板 | | | `` `` | 切换暂存状态 | 切换行暂存状态 | | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 | | `` o `` | 打开文件 | 使用默认程序打开该文件 | @@ -323,15 +324,15 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` c `` | 提交变更 | 提交暂存文件 | | `` w `` | 提交变更而无需预先提交钩子 | | | `` C `` | 使用 Git 编辑器提交变更 | | -| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | +| `` `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: | | `` / `` | 开始搜索 | | ## 正常 | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 向下滚动 | | -| `` mouse wheel up (fn+down) `` | 向上滚动 | | +| `` (fn+up) `` | 向下滚动 | | +| `` (fn+down) `` | 向上滚动 | | | `` `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） | | `` `` | 退出回到侧边面板 | | | `` / `` | 开始搜索 | | @@ -340,12 +341,11 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` o `` | 打开配置文件 | 使用默认程序打开该文件 | | `` e `` | 编辑配置文件 | 使用外部编辑器打开文件 | | `` u `` | 检查更新 | | | `` `` | 切换到最近的仓库 | | | `` a `` | 显示/循环所有分支日志 | | -| `` A `` | Show/cycle all branch logs (reverse) | | +| `` A `` | 显示/循环所有分支日志（反向） | | | `` 0 `` | 聚焦主视图 | | ## 确认面板 @@ -354,7 +354,7 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ |-----|--------|-------------| | `` `` | 确认 | | | `` `` | 关闭 | | -| `` `` | 复制到剪贴板 | | +| `` `` | 复制到剪贴板 | | ## 菜单 @@ -372,10 +372,10 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | `` g `` | 应用并删除 | 将存储项应用到工作目录并删除存储项。 | | `` d `` | 删除 | 从贮藏列表中删除该贮藏项 | | `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交，从该提交创建一个新分支，然后将贮藏项作为附加提交应用到新分支来实现的。 | +| `` w `` | 新建工作树 | | | `` r `` | 重命名贮藏 | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交的文件 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | ## 输入提示 @@ -401,17 +401,17 @@ _图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b_ | Key | Action | Info | |-----|--------|-------------| -| `` `` | 复制分支名称到剪贴板 | | +| `` `` | 复制分支名称到剪贴板 | | | `` `` | 检出 | 基于当前选中的远程分支检出一个新的本地分支，或者将远程分支作分离的HEAD。 | | `` n `` | 新分支 | | +| `` w `` | 新建工作树 | | | `` M `` | 合并到当前检出的分支 | 查看将选中项合并到当前分支的选项(正常合并，压缩合并) | | `` r `` | 变基 | 将检出的分支变基到所选的分支上。 | | `` d `` | 删除 | 从远程删除远程分支。 | | `` u `` | 设置为上游 | 设置为检出分支的上游 | | `` s `` | 排序 | | | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | -| `` `` | 使用外部差异比较工具(git difftool) | | +| `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | | `` `` | 查看提交 | | -| `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md index bbd2f291d..0e5debfdf 100644 --- a/docs/keybindings/Keybindings_zh-TW.md +++ b/docs/keybindings/Keybindings_zh-TW.md @@ -2,37 +2,36 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 鍵盤快捷鍵 -_說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B_ - ## 全域快捷鍵 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切換到最近使用的版本庫 | | -| `` (fn+up/shift+k) `` | 向上捲動主面板 | | -| `` (fn+down/shift+j) `` | 向下捲動主面板 | | -| `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. | +| `` `` | 切換到最近使用的版本庫 | | +| `` , K, (fn+up/shift+k) `` | 向上捲動主面板 | | +| `` , J, (fn+down/shift+j) `` | 向下捲動主面板 | | +| `` @ `` | 開啟命令記錄選單 | 檢視命令日誌的選項，例如顯示/隱藏命令日誌以及聚焦命令日誌。 | | `` P `` | 推送 | 推送到遠端。如果沒有設定遠端，會開啟設定視窗。 | | `` p `` | 拉取 | 從遠端同步當前分支。如果沒有設定遠端，會開啟設定視窗。 | -| `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | -| `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.

The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. | -| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | Increase the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | Decrease the amount of the context shown around changes in the diff view.

The default can be changed in the config file with the key 'git.diffContextSize'. | -| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. | -| `` `` | 檢視自訂補丁選項 | | -| `` 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`. | +| `` ) `` | 提高重新命名相似度閾值 | 提高將刪除和新增對視為重新命名所需的相似度閾值。

預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 | +| `` ( `` | 降低重新命名相似度閾值 | 降低將刪除和新增對視為重新命名所需的相似度閾值。

預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 | +| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | 增加差異檢視中變更周圍顯示的上下文量。

預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 | +| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | 減少差異檢視中變更周圍顯示的上下文量。

預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 | +| `` : `` | 執行 Shell 命令 | 調出可輸入shell命令執行的提示符。 | +| `` `` | 檢視自訂補丁選項 | | +| `` m `` | 查看合併/變基選項 | 檢視目前合併或變基的中止、繼續、跳過選項。 | +| `` R `` | 重新整理 | 重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。 | | `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） | | | `` _ `` | 上一個螢幕模式 | | -| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers | +| `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 | +| `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 | | `` `` | 取消 | | | `` ? `` | 開啟選單 | | -| `` `` | 檢視篩選路徑選項 | 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. | -| `` `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. | -| `` q `` | 結束 | | -| `` `` | Suspend the application | | -| `` `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view.

The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. | +| `` `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 | +| `` W, `` | 開啟差異比較選單 | 檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。 | +| `` q, `` | 結束 | | +| `` `` | 掛起應用程式 | | +| `` `` | 切換是否在差異檢視中顯示空格變更 | 切換是否在差異檢視中顯示空白字元更改。

預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。 | +| `` `` | 編輯設定檔案 | 使用外部編輯器開啟 | | `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 | | `` Z `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 | @@ -42,37 +41,30 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B |-----|--------|-------------| | `` , `` | 上一頁 | | | `` . `` | 下一頁 | | -| `` < () `` | 捲動到頂部 | | -| `` > () `` | 捲動到底部 | | +| `` <, `` | 捲動到頂部 | | +| `` >, `` | 捲動到底部 | | | `` v `` | 切換拖曳選擇 | | -| `` `` | Range select down | | -| `` `` | Range select up | | +| `` `` | 向下擴充套件選擇範圍 | | +| `` `` | 向上擴充套件選擇範圍 | | | `` / `` | 搜尋 | | | `` H `` | 向左捲動 | | | `` L `` | 向右捲動 | | | `` ] `` | 下一個索引標籤 | | | `` [ `` | 上一個索引標籤 | | -## Input prompt - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | 確認 | | -| `` `` | 關閉/取消 | | - ## 主面板 (補丁生成) | Key | Action | Info | |-----|--------|-------------| -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | +| `` , h `` | 選擇上一段 | | +| `` , l `` | 選擇下一段 | | | `` v `` | 切換拖曳選擇 | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 複製所選文本至剪貼簿 | | +| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 | +| `` `` | 複製所選文本至剪貼簿 | | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | | `` `` | 向 (或從) 補丁中添加/刪除行 | | -| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. | +| `` d `` | 從提交中移除行 | 從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。 | | `` `` | 退出自訂補丁建立器 | | | `` / `` | 搜尋 | | @@ -80,10 +72,10 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` mouse wheel down (fn+up) `` | 向下捲動 | | -| `` mouse wheel up (fn+down) `` | 向上捲動 | | -| `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | -| `` `` | Exit back to side panel | | +| `` (fn+up) `` | 向下捲動 | | +| `` (fn+down) `` | 向上捲動 | | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` `` | 退出回到側邊面板 | | | `` / `` | 搜尋 | | ## 主面板（合併） @@ -91,37 +83,37 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| | `` `` | 挑選程式碼片段 | | -| `` b `` | 挑選所有程式碼片段 | | -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | -| `` `` | 選擇上一個衝突 | | -| `` `` | 選擇下一個衝突 | | -| `` z `` | 復原 | Undo last merge conflict resolution. | +| `` b `` | 選取兩個區塊 | | +| `` , k `` | 選擇上一段 | | +| `` , j `` | 選擇下一段 | | +| `` , h `` | 選擇上一個衝突 | | +| `` , l `` | 選擇下一個衝突 | | +| `` z `` | 復原 | 撤消上次合併衝突解決。 | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | -| `` M `` | View merge conflict options | View options for resolving merge conflicts. | +| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 | | `` `` | 返回檔案面板 | | ## 主面板（預存） | Key | Action | Info | |-----|--------|-------------| -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | +| `` , h `` | 選擇上一段 | | +| `` , l `` | 選擇下一段 | | | `` v `` | 切換拖曳選擇 | | -| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | -| `` `` | 複製所選文本至剪貼簿 | | +| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 | +| `` `` | 複製所選文本至剪貼簿 | | | `` `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) | -| `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | +| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | | `` `` | 返回檔案面板 | | -| `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | -| `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 | | `` c `` | 提交變更 | 提交暫存區變更 | | `` w `` | 沒有預提交 hook 就提交更改 | | | `` C `` | 使用 git 編輯器提交變更 | | -| `` `` | 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: | +| `` `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件： | | `` / `` | 搜尋 | | ## 功能表 @@ -136,33 +128,33 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` `` | 複製縮略提交雜湊值到剪貼簿 | | +| `` `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 | +| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 | | `` o `` | 在瀏覽器中開啟提交 | | | `` n `` | 從提交建立新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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 `` to cancel the selection. | -| `` `` | 重設選定的揀選 (複製) 提交 | | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `` 來取消選擇。 | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` * `` | 選擇目前分支的提交 | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 子模組 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製子模組名稱到剪貼簿 | | -| `` `` | Enter | 進入子模組 | -| `` d `` | Remove | Remove the selected submodule and its corresponding directory. | -| `` u `` | Update | 更新子模組 | +| `` `` | 複製子模組名稱到剪貼簿 | | +| `` `` | 進入 | 進入子模組 | +| `` d `` | 刪除 | 刪除選定的子模組及其相應的目錄。 | +| `` u `` | 更新 | 更新子模組 | | `` n `` | 新增子模組 | | | `` e `` | 更新子模組 URL | | -| `` i `` | Initialize | 初始化子模組 | +| `` i `` | 初始化 | 初始化子模組 | | `` b `` | 查看批量子模組選項 | | | `` / `` | 搜尋 | | @@ -170,51 +162,52 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` n `` | New worktree | | -| `` `` | Switch | Switch to the selected worktree. | +| `` n `` | 新建工作樹 | | +| `` `` | 切換 | 切換到選中的工作樹。 | | `` o `` | 在編輯器中開啟 | | -| `` 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. | +| `` d `` | 刪除 | 刪除選定的工作樹。這將刪除工作樹的目錄以及 .git 目錄中有關工作樹的後設資料。 | | `` / `` | 搜尋 | | ## 提交 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | 複製縮略提交雜湊值到剪貼簿 | | +| `` `` | 重設選定的揀選 (複製) 提交 | | | `` 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. | -| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. | +| `` s `` | 壓縮 (Squash) | 將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。 | +| `` f `` | 修復 (Fixup) | 將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。 | +| `` c `` | 設定修復提交資訊 | 設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。 | | `` r `` | 改寫提交 | 改寫選中的提交訊息 | | `` 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. | +| `` d `` | 刪除提交 | 刪除選中的提交。這將透過變基從分支中刪除該提交，如果該提交修改的內容依賴於後續的提交，則需要解決合併衝突。 | | `` e `` | 編輯(開始互動變基) | 編輯提交 | -| `` i `` | 開始互動變基 | 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`. | +| `` i `` | 開始互動變基 | 為分支上的提交啟動互動式變基。這將包括從 HEAD 提交到第一個合併提交或主分支提交的所有提交。
如果您想從所選提交啟動互動式變基，請按 `e`。 | | `` p `` | 挑選 | 挑選提交 (於變基過程中) | | `` F `` | 建立修復提交 | 為此提交建立修復提交 | | `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ | -| `` `` | 向下移動提交 | | -| `` `` | 向上移動提交 | | +| `` , `` | 向下移動提交 | | +| `` , `` | 向上移動提交 | | | `` V `` | 貼上提交 (揀選) | | | `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 | | `` A `` | 修改 | 使用已預存的更改修正提交 | -| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. | -| `` t `` | 還原 | 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. | -| `` `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` a `` | 設定/重設提交作者 | 設定或重置提交的作者，或新增其他作者。 | +| `` t `` | 還原 | 為所選提交建立還原提交，這會反向應用所選提交的更改。 | +| `` T `` | 打標籤到提交 | 建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。 | +| `` `` | 開啟記錄選單 | 檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。 | +| `` G `` | 在瀏覽器中開啟拉取請求 | | +| `` `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 | +| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 | | `` o `` | 在瀏覽器中開啟提交 | | | `` n `` | 從提交建立新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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 `` to cancel the selection. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `` 來取消選擇。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` * `` | 選擇目前分支的提交 | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 提交摘要 @@ -228,154 +221,154 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製檔案名稱到剪貼簿 | | +| `` `` | 複製檔案名稱到剪貼簿 | | | `` y `` | 複製到剪貼簿 | | | `` c `` | 檢出 | 檢出檔案 | -| `` d `` | 捨棄 | 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. | +| `` d `` | 捨棄 | 放棄對此檔案的提交變更。 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` e `` | 編輯 | 使用外部編輯器開啟 | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | -| `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | -| `` `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | -| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | -| `` 0 `` | Focus main view | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | +| `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 | +| `` `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 | +| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。

可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 | +| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 | +| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 | +| `` 0 `` | 聚焦主檢視 | | | `` / `` | 搜尋 | | ## 收藏 (Stash) | Key | Action | Info | |-----|--------|-------------| -| `` `` | 套用 | 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. | +| `` `` | 套用 | 將貯藏項應用到您的工作目錄。 | +| `` g `` | 還原 | 將儲存項應用到工作目錄並刪除儲存項。 | +| `` d `` | 捨棄 | 從貯藏列表中刪除該貯藏項。 | +| `` n `` | 新分支 | 從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。 | +| `` w `` | 新建工作樹 | | | `` r `` | 重新命名收藏 | | -| `` 0 `` | Focus main view | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 日誌 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy abbreviated commit hash to clipboard | | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` `` | 複製縮略提交雜湊值到剪貼簿 | | +| `` `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 | +| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 | | `` o `` | 在瀏覽器中開啟提交 | | | `` n `` | 從提交建立新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | -| `` 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 `` to cancel the selection. | -| `` `` | 重設選定的揀選 (複製) 提交 | | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` * `` | Select commits of current branch | | -| `` 0 `` | Focus main view | | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `` 來取消選擇。 | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` * `` | 選擇目前分支的提交 | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 本地分支 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製分支名稱到剪貼簿 | | +| `` `` | 複製分支名稱到剪貼簿 | | | `` i `` | 顯示 git-flow 選項 | | | `` `` | 檢出 | 檢出選定的項目。 | | `` n `` | 新分支 | | -| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.

Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). | +| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。

請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 | +| `` w `` | 新建工作樹 | | | `` o `` | 建立拉取請求 | | | `` O `` | 建立拉取請求選項 | | -| `` `` | 複製拉取請求的 URL 到剪貼板 | | -| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. | -| `` - `` | Checkout previous branch | | -| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. | -| `` d `` | 刪除 | View delete options for local/remote branch. | -| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. | -| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) | +| `` G `` | 在瀏覽器中開啟拉取請求 | | +| `` `` | 複製拉取請求的 URL 到剪貼板 | | +| `` c `` | 根據名稱檢出 | 按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。 | +| `` - `` | 簽出上一個分支 | | +| `` F `` | 強制檢出 | 強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。 | +| `` d `` | 刪除 | 檢視本地/遠端分支的刪除選項。 | +| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 | +| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) | | `` f `` | 從上游快進此分支 | 從遠端快進所選的分支 | | `` T `` | 建立標籤 | | | `` s `` | 排序規則 | | | `` g `` | 檢視重設選項 | | | `` R `` | 重新命名分支 | | | `` u `` | 檢視遠端設定 | 檢視有關遠端分支的設定（例如重設至遠端） | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` 0 `` | Focus main view | | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 標籤 | Key | Action | Info | |-----|--------|-------------| -| `` `` | Copy tag to clipboard | | -| `` `` | 檢出 | Checkout the selected 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 `` | 刪除 | View delete options for local/remote tag. | -| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. | -| `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` 0 `` | Focus main view | | +| `` `` | 複製標籤到剪貼簿 | | +| `` `` | 檢出 | 檢出選擇的標籤作為分離的HEAD。 | +| `` n `` | 建立標籤 | 基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。 | +| `` w `` | 新建工作樹 | | +| `` d `` | 刪除 | 檢視本機／遠端標籤的刪除選項。 | +| `` P `` | 推送標籤 | 推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。 | +| `` g `` | 重設 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | ## 檔案 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製檔案名稱到剪貼簿 | | -| `` `` | 切換預存 | Toggle staged for selected file. | -| `` `` | 篩選檔案 (預存/未預存) | | +| `` `` | 複製檔案名稱到剪貼簿 | | +| `` `` | 切換預存 | 切換所選檔案的暫存狀態。 | +| `` `` | 篩選檔案 (預存/未預存) | | | `` y `` | 複製到剪貼簿 | | | `` c `` | 提交變更 | 提交暫存區變更 | | `` w `` | 沒有預提交 hook 就提交更改 | | | `` A `` | 修改上次提交 | | | `` C `` | 使用 git 編輯器提交變更 | | -| `` `` | 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: | +| `` `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件： | | `` e `` | 編輯 | 使用外部編輯器開啟 | | `` o `` | 開啟檔案 | 使用預設軟體開啟 | | `` i `` | 忽略或排除檔案 | | | `` r `` | 重新整理檔案 | | -| `` s `` | 收藏 | Stash all changes. For other variations of stashing, use the view stash options keybinding. | -| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). | -| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. | -| `` `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. | +| `` s `` | 收藏 | 貯藏所有變更.若要使用其他貯藏變體,請使用檢視貯藏選項快捷鍵。 | +| `` S `` | 檢視收藏選項 | 檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。 | +| `` a `` | 全部預存/取消預存 | 切換工作區中所有檔案的已暫存/未暫存狀態。 | +| `` `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | 如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。 | | `` d `` | 捨棄 | 檢視選中變動進行捨棄復原 | | `` g `` | 檢視遠端重設選項 | | -| `` D `` | 重設 | 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.

The default can be changed in the config file with the key 'gui.showFileTree'. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` M `` | View merge conflict options | View options for resolving merge conflicts. | +| `` D `` | 重設 | 檢視工作樹的重置選項（例如：清除工作樹）。 | +| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。

可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 | | `` f `` | 擷取 | 同步遠端異動 | -| `` - `` | Collapse all files | Collapse all directories in the files tree | -| `` = `` | Expand all files | Expand all directories in the file tree | -| `` 0 `` | Focus main view | | +| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 | +| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 | +| `` 0 `` | 聚焦主檢視 | | | `` / `` | 搜尋 | | ## 次要 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | -| `` `` | Exit back to side panel | | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` `` | 退出回到側邊面板 | | | `` / `` | 搜尋 | | ## 狀態 | Key | Action | Info | |-----|--------|-------------| -| `` o `` | 開啟設定檔案 | 使用預設軟體開啟 | | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 | | `` u `` | 檢查更新 | | | `` `` | 切換到最近使用的版本庫 | | -| `` a `` | Show/cycle all branch logs | | -| `` A `` | Show/cycle all branch logs (reverse) | | -| `` 0 `` | Focus main view | | +| `` a `` | 顯示/迴圈所有分支日誌 | | +| `` A `` | 顯示/迴圈所有分支日誌（反向） | | +| `` 0 `` | 聚焦主檢視 | | ## 確認面板 @@ -383,35 +376,42 @@ _說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B |-----|--------|-------------| | `` `` | 確認 | | | `` `` | 關閉/取消 | | -| `` `` | 複製到剪貼簿 | | +| `` `` | 複製到剪貼簿 | | + +## 輸入提示 + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 確認 | | +| `` `` | 關閉/取消 | | ## 遠端 | Key | Action | Info | |-----|--------|-------------| -| `` `` | View branches | | +| `` `` | 檢視分支 | | | `` n `` | 新增遠端 | | -| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | +| `` d `` | 刪除 | 刪除選中的遠端。從遠端跟蹤遠端分支的任何本地分支都不會受到影響。 | | `` e `` | 編輯 | 編輯遠端 | | `` f `` | 擷取 | 擷取遠端 | -| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. | +| `` F `` | 新增復刻遠端倉庫 | 透過替換 origin URL 中的所有者來快速新增復刻遠端倉庫，並可選擇從新遠端倉庫檢出分支。 | | `` / `` | 搜尋 | | ## 遠端分支 | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製分支名稱到剪貼簿 | | -| `` `` | 檢出 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. | +| `` `` | 複製分支名稱到剪貼簿 | | +| `` `` | 檢出 | 基於目前選中的遠端分支檢出一個新的本地分支，或者將遠端分支作分離的HEAD。 | | `` n `` | 新分支 | | -| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) | -| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. | -| `` d `` | 刪除 | Delete the remote branch from the remote. | +| `` w `` | 新建工作樹 | | +| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) | +| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 | +| `` d `` | 刪除 | 從遠端刪除遠端分支。 | | `` u `` | 設置為遠端 | 將此分支設為當前分支之遠端 | | `` s `` | 排序規則 | | -| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` `` | 開啟外部差異工具 (git difftool) | | -| `` 0 `` | Focus main view | | +| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 | +| `` `` | 開啟外部差異工具 (git difftool) | | +| `` 0 `` | 聚焦主檢視 | | | `` `` | 檢視提交 | | -| `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | diff --git a/flake.lock b/flake.lock index 55f0c3139..672a2d56c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,7 +7,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" }, "original": { "type": "tarball", @@ -19,11 +19,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1785828668, + "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -65,11 +65,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1785360170, + "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b8069e9f7..fcc58a044 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,7 @@ # Development tools git gnumake + just ]; # Environment variables for development @@ -108,8 +109,8 @@ }; treefmt = { - programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt-rfc-style.compiler; - programs.nixfmt.package = pkgs.nixfmt-rfc-style; + programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt.compiler; + programs.nixfmt.package = pkgs.nixfmt; programs.gofmt.enable = true; }; diff --git a/go.mod b/go.mod index 8afb21752..6612d0756 100644 --- a/go.mod +++ b/go.mod @@ -5,82 +5,75 @@ go 1.25.0 // This is necessary to ignore test files when executing gofumpt. ignore ./test +// Likewise for worktrees that are nested in the main tree. +ignore ./.worktrees + require ( - dario.cat/mergo v1.0.1 - github.com/adrg/xdg v0.4.0 + dario.cat/mergo v1.0.2 + github.com/adrg/xdg v0.5.3 github.com/atotto/clipboard v0.1.4 github.com/aybabtme/humanlog v0.4.1 + github.com/cli/go-gh/v2 v2.13.0 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 - github.com/creack/pty v1.1.11 - github.com/gdamore/tcell/v2 v2.13.8 + github.com/creack/pty v1.1.24 + github.com/gdamore/tcell/v3 v3.4.2 github.com/go-errors/errors v1.5.1 - github.com/gookit/color v1.4.2 - github.com/integrii/flaggy v1.4.0 + github.com/gookit/color v1.6.1 + github.com/integrii/flaggy v1.8.0 github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c - github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd - github.com/jesseduffield/gocui v0.3.1-0.20260308162933-5e45e57b5564 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3 - github.com/kyokomi/emoji/v2 v2.2.8 - github.com/lucasb-eyer/go-colorful v1.3.0 + github.com/kyokomi/emoji/v2 v2.2.14 + github.com/lucasb-eyer/go-colorful v1.4.1 github.com/mgutz/str v1.2.0 github.com/mitchellh/go-ps v1.0.0 + github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe github.com/rivo/uniseg v0.4.7 - 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.6 - github.com/sirupsen/logrus v1.9.3 - github.com/spf13/afero v1.9.5 - github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad + github.com/sahilm/fuzzy v0.1.3 + github.com/samber/lo v1.53.0 + github.com/sanity-io/litter v1.5.8 + github.com/sasha-s/go-deadlock v0.3.9 + github.com/sirupsen/logrus v1.10.2 + github.com/spf13/afero v1.15.0 + github.com/spkg/bom v1.0.1 github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304 - github.com/stretchr/testify v1.10.0 - github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 + github.com/stretchr/testify v1.12.1 + github.com/xo/terminfo v1.0.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 - golang.org/x/sync v0.19.0 - golang.org/x/sys v0.42.0 + golang.org/x/sync v0.22.0 + golang.org/x/sys v0.47.0 gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0 gopkg.in/yaml.v3 v3.0.1 ) require ( - github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/ProtonMail/go-crypto v1.1.6 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect - github.com/buger/jsonparser v1.1.1 // indirect - github.com/cloudflare/circl v1.6.3 // indirect - github.com/cyphar/filepath-securejoin v0.4.1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emirpasic/gods v1.18.1 // indirect + github.com/buger/jsonparser v1.1.2 // indirect + github.com/cli/safeexec v1.0.1 // indirect + github.com/clipperhouse/displaywidth v0.11.0 // indirect + github.com/clipperhouse/uax29/v2 v2.7.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.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-git/go-billy/v5 v5.6.2 // indirect github.com/go-logfmt/logfmt v0.5.0 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/hpcloud/tail v1.0.0 // 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 v1.2.0 // 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/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/onsi/ginkgo v1.10.3 // indirect - github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect - github.com/pjbgf/sha1cd v0.3.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect - github.com/skeema/knownhosts v1.3.1 // indirect + github.com/onsi/gomega v1.34.1 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect - github.com/xanzy/ssh-agent v0.3.3 // indirect - golang.org/x/crypto v0.45.0 // indirect - golang.org/x/net v0.47.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.38.0 // indirect + golang.org/x/term v0.45.0 // indirect + golang.org/x/text v0.41.0 // indirect + golang.org/x/tools v0.48.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/warnings.v0 v0.1.2 // indirect + mvdan.cc/gofumpt v0.11.0 // indirect ) + +tool mvdan.cc/gofumpt diff --git a/go.sum b/go.sum index c55a19d7d..3c4b8793b 100644 --- a/go.sum +++ b/go.sum @@ -1,56 +1,7 @@ -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= -dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= -dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -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/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= -github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw= -github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= -github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= -github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= -github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= -github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= -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= +dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= +dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= +github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78= +github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aybabtme/humanlog v0.4.1 h1:D8d9um55rrthJsP8IGSHBcti9lTb/XknmDAX6Zy8tek= @@ -58,155 +9,60 @@ github.com/aybabtme/humanlog v0.4.1/go.mod h1:B0bnQX4FTSU3oftPMTTPvENCy8LqixLDvY 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/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= -github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= +github.com/buger/jsonparser v1.1.2 h1:frqHqw7otoVbk5M8LlE/L7HTnIq2v9RX6EJ48i9AxJk= +github.com/buger/jsonparser v1.1.2/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= +github.com/cli/go-gh/v2 v2.13.0 h1:jEHZu/VPVoIJkciK3pzZd3rbT8J90swsK5Ui4ewH1ys= +github.com/cli/go-gh/v2 v2.13.0/go.mod h1:Us/NbQ8VNM0fdaILgoXSz6PKkV5PWaEzkJdc9vR2geM= +github.com/cli/safeexec v1.0.1 h1:e/C79PbXF4yYTN/wauC4tviMxEV13BwljGj0N9j+N00= +github.com/cli/safeexec v1.0.1/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q= +github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8= +github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0= +github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk= +github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM= 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.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= -github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= +github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= +github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= 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/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= -github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= -github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= -github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -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/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.13.8 h1:Mys/Kl5wfC/GcC5Cx4C2BIQH9dbnhnkPgS9/wF3RlfU= -github.com/gdamore/tcell/v2 v2.13.8/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo= -github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= -github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= +github.com/gdamore/tcell/v3 v3.4.2 h1:gGW+6z2Bz5Wl2mNwFlm9+eRmg2JQrWcKjSkL1LRfpNU= +github.com/gdamore/tcell/v3 v3.4.2/go.mod h1:Oe5U3S3jm3NzypswDNUhe+LUnF5CoFq2b4sepD++QHo= 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-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= -github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= -github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM= -github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= -github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= -github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -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/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/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= -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/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/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/go-quicktest/qt v1.102.0 h1:HSQxCeh5YZH3EL3W39ixjtyaEhcWSXQHtHnMBzSs474= +github.com/go-quicktest/qt v1.102.0/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -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/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0= +github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E= +github.com/gookit/color v1.6.1 h1:KoTnDxJPRgrL0SoX0f8rCFg2zI0t4E3GZZBMo2nN8LU= +github.com/gookit/color v1.6.1/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -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/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM= -github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI= +github.com/integrii/flaggy v1.8.0 h1:tC1qWwg4fhF2Qdaj+MpPK04cxlOSq0+HoMZqAW6Arao= +github.com/integrii/flaggy v1.8.0/go.mod h1:QS4c80m87SXG0pmVUT/Lx2RY5EbkLvLp7IKBD2jwcFA= 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-20250517122708-b0b4a53a6f5c h1:tC2PaiisXAC5sOjDPfMArSnbswDObtCssx+xn28edX4= github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c/go.mod h1:F2fEBk0ddf6ixrBrJjY7phfQ3hL9rXG0uSjvwYe50bE= -github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd h1:ViKj6qth8FgcIWizn9KiACWwPemWSymx62OPN0tHT+Q= -github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd/go.mod h1:lRhCiBr6XjQrvcQVa+UYsy/99d3wMXn/a0nSQlhnhlA= -github.com/jesseduffield/gocui v0.3.1-0.20260308162933-5e45e57b5564 h1:aB/Ytu+OCEpjft/BehqbH8/PTdgLREqbCvjK1JXctoo= -github.com/jesseduffield/gocui v0.3.1-0.20260308162933-5e45e57b5564/go.mod h1:lQCd2TvvNXVKFBowy4A7xxZbUp+1KEiGs4j0Q5Zt9gQ= 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/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 v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= -github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -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= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -215,21 +71,22 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= 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.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag= -github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/kyokomi/emoji/v2 v2.2.14 h1:YOF6VL52613M0Qr9v4puJDD9QQPmyyjXedDDlrGzH80= +github.com/kyokomi/emoji/v2 v2.2.14/go.mod h1:1AnYl9IgmJZXKd5m1PEijyyUw85SqYsuAr8lpU/s+9s= +github.com/lucasb-eyer/go-colorful v1.4.1 h1:1EO+WB73+EH8EVbzlrG3KLAfEypQWVHIBqlTf+2hNss= +github.com/lucasb-eyer/go-colorful v1.4.1/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= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= 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-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= 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-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= @@ -240,413 +97,103 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe h1:vHpqOnPlnkba8iSxU4j/CvDSS9J4+F4473esQsYLGoE= github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= -github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= -github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A= -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.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/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= -github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -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.6 h1:TR7sfOnZ7x00tWPfD397Peodt57KzMDo+9Ae9rMiUmw= -github.com/sasha-s/go-deadlock v0.3.6/go.mod h1:CUqNyyvMxTyjFqDT7MRg9mb4Dv/btmGTqSR+rky/UXo= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= -github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= -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/rogpeppe/go-internal v1.15.0 h1:D0RCU5rMAp+SpgkiNdrjfJ+LX4J1M32V2NeCY7EJ6hc= +github.com/rogpeppe/go-internal v1.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs= +github.com/sahilm/fuzzy v0.1.3 h1:juByESSS32nVD81vr6tHmKmA/8zde7gE+x5CLxrzXPU= +github.com/sahilm/fuzzy v0.1.3/go.mod h1:au6//VbVSqu6DFrkL2CfjlJ5iURpNCPeE+1GwY3XsT8= +github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM= +github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= +github.com/sanity-io/litter v1.5.8 h1:uM/2lKrWdGbRXDrIq08Lh9XtVYoeGtcQxk9rtQ7+rYg= +github.com/sanity-io/litter v1.5.8/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U= +github.com/sasha-s/go-deadlock v0.3.9 h1:fiaT9rB7g5sr5ddNZvlwheclN9IP86eFW9WgqlEQV+w= +github.com/sasha-s/go-deadlock v0.3.9/go.mod h1:KuZj51ZFmx42q/mPaYbRk0P1xcwe697zsJKE03vD4/Y= +github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo= +github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= +github.com/spkg/bom v1.0.1 h1:tl8kQ2sufL/wDEJa9me1jnQYEpDB7LqYGNkwCVR5GLs= +github.com/spkg/bom v1.0.1/go.mod h1:4VaFoiTGzDoSmJJ1csk9pXlCQiJKqj+9AXiFyavhHEw= github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304 h1:bg+K3E0GYuqwTGaEfNrsZ0rH0Bw4p3EmPjk9Zjnua+w= github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304/go.mod h1:HFt9hGqMzgQ+gVxMKcvTvGaFz4Y0yYycqqAp2V3wcJY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= 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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -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/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= +github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= 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.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= -github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -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/xo/terminfo v1.0.0 h1:2ZpYzqWzyyytjk3TP6aJVDhkMAkc99/1xKQdA3TDTBY= +github.com/xo/terminfo v1.0.0/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= 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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= 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-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-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= -golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= -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-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -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/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/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk= +golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40= 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.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= -golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= -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/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/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= 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.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= 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-20190215142949-d0b11bdaac8a/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-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-20210124154548-22da62e12c0c/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-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 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.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= +golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= 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/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/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= -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/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= +golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= 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/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE= +golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk= 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/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-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -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= gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0/go.mod h1:XoytMOotjRRJVkIsQdxsPIioRLYFISEaY9a4tftOXAo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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= +mvdan.cc/gofumpt v0.11.0 h1:0H01XB95PnN2QgCSR9ELdZyTlJqNZ7181B0BTMh5VZc= +mvdan.cc/gofumpt v0.11.0/go.mod h1:BeT5wCsOJt6J9zT2MZIOGszjUHzFkn1/l9g6xAzqsXo= diff --git a/justfile b/justfile new file mode 100644 index 000000000..0851179b9 --- /dev/null +++ b/justfile @@ -0,0 +1,78 @@ +default: + just --list + +# Build lazygit with optimizations disabled (to make debugging easier). +build: + go build -gcflags='all=-N -l' + +install: + go install + +run: build + ./lazygit + +# Run `just debug` in one terminal tab and `just print-log` in another to view the program and its log output side by side +debug: build + ./lazygit -debug + +print-log: build + ./lazygit --logs + +unit-test: + go test ./... -short + +# Run both unit tests and integration tests. +[unix] +test: unit-test e2e + +# On Windows, integration tests are not supported right now +[windows] +test: unit-test + +# Generate all our auto-generated files (test list, cheatsheets, json schema, maybe other things in the future) +generate: + go generate ./... + +format: + go tool gofumpt -l -w . + +lint: + ./scripts/gofumpt-check.sh + ./scripts/golangci-lint-shim.sh run + +e2e-test-command := "go test -timeout 30m pkg/integration/clients/*.go" + +# Run integration tests headlessly: no args runs all tests, a test name (or path) runs just that one. Use e2e-cli for a visible UI. +e2e *args: + {{ if args == "" { e2e-test-command } else { \ + e2e-test-command + " -run 'TestIntegration/" + \ + replace( \ + replace_regex( \ + replace_regex(args, '\S*pkg/integration/tests/', ''), \ + '\.go( |$)', '${1}' \ + ), \ + " ", "$' && " + e2e-test-command + " -run 'TestIntegration/" \ + ) + "$'" \ + } }} + +# Run a single integration test with a visible UI; most useful with --sandbox or --slow. +e2e-cli *args: + go run cmd/integration_test/main.go cli {{ args }} + +# Open the TUI for running integration tests. +e2e-tui *args: + go run cmd/integration_test/main.go tui {{ args }} + +# Run some tests on the current commit, similar to what CI does. +check: + ./scripts/check_commit.sh + +bump-gocui: + scripts/bump_gocui.sh + +# Record a demo +demo *args: + demo/record_demo.sh {{ args }} + +vendor: + go mod tidy && go mod vendor diff --git a/pkg/app/app.go b/pkg/app/app.go index 09b2236db..15a3f327a 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -14,6 +14,7 @@ import ( "github.com/spf13/afero" appTypes "github.com/jesseduffield/lazygit/pkg/app/types" + "github.com/jesseduffield/lazygit/pkg/commands/direnv" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/common" @@ -171,6 +172,17 @@ func openRecentRepo(app *App) bool { for _, repoDir := range app.Config.GetAppState().RecentRepos { if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo { if err := os.Chdir(repoDir); err == nil { + // We're still in setup, before the gui exists, so we can't show the approval popup + // that DispatchSwitchTo offers for blocked .envrc files; just log and move on. + // Also, the logs only go to the debug log, not the Command Log, because that's not + // available yet, either. + result := direnv.Load(app.OSCommand.Cmd) + if result.Message != "" { + app.Log.WithField("message", result.Message).Info("direnv") + } + if result.Err != nil { + app.Log.WithError(result.Err).Warn("direnv load failed") + } return true } } @@ -239,12 +251,8 @@ func (app *App) setupRepo( } // 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 - } - } + if openRecentRepo(app) { + return true, nil } fmt.Fprintln(os.Stderr, app.Tr.NoRecentRepositories) @@ -262,7 +270,7 @@ func (app *App) setupRepo( os.Exit(0) } - if didOpenRepo := openRecentRepo(app); didOpenRepo { + if openRecentRepo(app) { return true, nil } diff --git a/pkg/app/daemon/daemon.go b/pkg/app/daemon/daemon.go index df0e4bb49..0b33bc12b 100644 --- a/pkg/app/daemon/daemon.go +++ b/pkg/app/daemon/daemon.go @@ -263,12 +263,14 @@ func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error { } type MoveTodosUpInstruction struct { - Hashes []string + Hashes []string + Distance int } -func NewMoveTodosUpInstruction(hashes []string) Instruction { +func NewMoveTodosUpInstruction(hashes []string, distance int) Instruction { return &MoveTodosUpInstruction{ - Hashes: hashes, + Hashes: hashes, + Distance: distance, } } @@ -288,17 +290,19 @@ func (self *MoveTodosUpInstruction) run(common *common.Common) error { }) return handleInteractiveRebase(common, func(path string) error { - return utils.MoveTodosUp(path, todosToMove, false, getCommentChar()) + return utils.MoveTodos(path, todosToMove, false, -self.Distance, getCommentChar()) }) } type MoveTodosDownInstruction struct { - Hashes []string + Hashes []string + Distance int } -func NewMoveTodosDownInstruction(hashes []string) Instruction { +func NewMoveTodosDownInstruction(hashes []string, distance int) Instruction { return &MoveTodosDownInstruction{ - Hashes: hashes, + Hashes: hashes, + Distance: distance, } } @@ -318,7 +322,7 @@ func (self *MoveTodosDownInstruction) run(common *common.Common) error { }) return handleInteractiveRebase(common, func(path string) error { - return utils.MoveTodosDown(path, todosToMove, false, getCommentChar()) + return utils.MoveTodos(path, todosToMove, false, self.Distance, getCommentChar()) }) } diff --git a/pkg/app/entry_point.go b/pkg/app/entry_point.go index 3a692ac53..a3225e311 100644 --- a/pkg/app/entry_point.go +++ b/pkg/app/entry_point.go @@ -102,7 +102,7 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes if cliArgs.PrintDefaultConfig { var buf bytes.Buffer encoder := yaml.NewEncoder(&buf) - err := encoder.Encode(config.GetDefaultConfig()) + err := encoder.Encode(config.GetDefaultConfigForPlatform(config.KeybindingPlatform())) if err != nil { log.Fatal(err.Error()) } diff --git a/pkg/app/errors.go b/pkg/app/errors.go index 506fec276..ee24cff49 100644 --- a/pkg/app/errors.go +++ b/pkg/app/errors.go @@ -16,7 +16,7 @@ type errorMapping struct { func knownError(tr *i18n.TranslationSet, err error) (string, bool) { errorMessage := err.Error() - knownErrorMessages := []string{minGitVersionErrorMessage(tr)} + knownErrorMessages := []string{minGitVersionErrorMessage(tr), tr.BareRepoNotSupported} if lo.Contains(knownErrorMessages, errorMessage) { return errorMessage, true diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go index 4335e5ebf..5c5a94530 100644 --- a/pkg/cheatsheet/generate.go +++ b/pkg/cheatsheet/generate.go @@ -22,7 +22,7 @@ import ( "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/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/samber/lo" @@ -146,7 +146,7 @@ func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*b return false } - return (binding.Description != "" || binding.Alternative != "") && binding.Key != nil + return (binding.Description != "" || binding.Alternative != "") && len(binding.Keys) > 0 }) bindingsByHeader := lo.GroupBy(bindingsToDisplay, func(binding *types.Binding) header { @@ -157,7 +157,7 @@ func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*b 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 binding.Description + keyLabels(binding.Keys) }) return headerWithBindings{ @@ -196,9 +196,7 @@ func getHeader(binding *types.Binding, tr *i18n.TranslationSet) header { func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) string { var content strings.Builder - content.WriteString(fmt.Sprintf("# Lazygit %s\n", tr.Keybindings)) - - content.WriteString(fmt.Sprintf("\n%s\n", italicize(tr.KeybindingsLegend))) + fmt.Fprintf(&content, "# Lazygit %s\n", tr.Keybindings) for _, section := range bindingSections { content.WriteString(formatTitle(section.title)) @@ -216,8 +214,14 @@ func formatTitle(title string) string { return fmt.Sprintf("\n## %s\n\n", title) } +func keyLabels(keys []gocui.Key) string { + return strings.Join(lo.Map(keys, func(k gocui.Key, _ int) string { + return config.LabelForKey(k) + }), ", ") +} + func formatBinding(binding *types.Binding) string { - action := keybindings.LabelFromKey(binding.Key) + action := keyLabels(binding.Keys) description := binding.Description if binding.Alternative != "" { action += fmt.Sprintf(" (%s)", binding.Alternative) @@ -235,7 +239,3 @@ func formatBinding(binding *types.Binding) string { // to escape a key that is itself a backtick. return fmt.Sprintf("| `` %s `` | %s | %s |\n", action, description, tooltip) } - -func italicize(str string) string { - return fmt.Sprintf("_%s_", str) -} diff --git a/pkg/cheatsheet/generate_test.go b/pkg/cheatsheet/generate_test.go index 4dbf7e3dd..373fcaa35 100644 --- a/pkg/cheatsheet/generate_test.go +++ b/pkg/cheatsheet/generate_test.go @@ -3,6 +3,7 @@ package cheatsheet import ( "testing" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/stretchr/testify/assert" @@ -27,7 +28,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, expected: []*bindingSection{ @@ -37,7 +38,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -49,7 +50,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "", Description: "quit", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, expected: []*bindingSection{ @@ -59,7 +60,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "", Description: "quit", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -71,17 +72,17 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "unstage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "submodules", Description: "drop submodule", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, expected: []*bindingSection{ @@ -91,12 +92,12 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "unstage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -106,7 +107,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "submodules", Description: "drop submodule", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -118,23 +119,23 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "unstage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "scroll", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, { ViewName: "commits", Description: "revert commit", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, expected: []*bindingSection{ @@ -144,7 +145,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "scroll", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, }, @@ -155,7 +156,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "commits", Description: "revert commit", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -165,12 +166,12 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "unstage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -182,34 +183,34 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "unstage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "scroll", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, { ViewName: "commits", Description: "revert commit", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "commits", Description: "scroll", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, { ViewName: "commits", Description: "page up", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, }, @@ -220,13 +221,13 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "scroll", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, { ViewName: "commits", Description: "page up", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, Tag: "navigation", }, }, @@ -237,7 +238,7 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "commits", Description: "revert commit", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, @@ -247,12 +248,12 @@ func TestGetBindingSections(t *testing.T) { { ViewName: "files", Description: "stage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, { ViewName: "files", Description: "unstage file", - Key: 'a', + Keys: []gocui.Key{gocui.NewKeyRune('a')}, }, }, }, diff --git a/pkg/commands/direnv/direnv.go b/pkg/commands/direnv/direnv.go new file mode 100644 index 000000000..8e98785c2 --- /dev/null +++ b/pkg/commands/direnv/direnv.go @@ -0,0 +1,130 @@ +package direnv + +import ( + "bytes" + "encoding/json" + "os" + "os/exec" + "strings" + + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" +) + +// LoadResult bundles everything callers might want to know about a direnv +// invocation. The env-var delta has already been applied to the process by +// the time Load returns. +type LoadResult struct { + // Message is whatever direnv printed to stderr — useful to log + // (success: "direnv: loading .envrc"; error: the error text). + Message string + + // Err is non-nil when direnv exited non-zero or its stdout could + // not be parsed. + Err error + + // Blocked is true when the target .envrc exists but hasn't been + // approved with `direnv allow` yet. EnvrcPath then holds the path + // direnv said was blocked, suitable for passing to Allow. + Blocked bool + EnvrcPath string +} + +// Load runs `direnv export json` for the current working directory and applies +// the resulting env-var delta to the current process. If direnv isn't on PATH, +// it's a no-op — users who don't use direnv pay nothing, and users who do need +// no config to opt in. +func Load(cmd oscommands.ICmdObjBuilder) LoadResult { + if _, lookupErr := exec.LookPath("direnv"); lookupErr != nil { + return LoadResult{} + } + + stdout, stderr, runErr := cmd.New([]string{ + "direnv", "export", "json", + }).DontLog().RunWithOutputs() + + result := LoadResult{Message: strings.TrimRight(stderr, "\n")} + + // Apply whatever delta direnv produced even if it exited non-zero. + // When the new dir's .envrc is blocked, direnv still emits a valid + // JSON delta on stdout that unloads vars from the previous dir; + // without applying it the old env would leak into the new repo. + delta, parseErr := parseDirenvExport([]byte(stdout)) + for k, v := range delta { + if v == nil { + _ = os.Unsetenv(k) + } else { + _ = os.Setenv(k, *v) + } + } + + // Prefer the runtime error (whose Error() text is direnv's stderr) + // over a parse error, since it's the more actionable signal. + if runErr != nil { + result.Err = runErr + if envrcPath := queryBlockedEnvrc(cmd); envrcPath != "" { + result.Blocked = true + result.EnvrcPath = envrcPath + } + } else { + result.Err = parseErr + } + return result +} + +// Allow runs `direnv allow ` to approve a .envrc file so the next +// Load can read it. +func Allow(cmd oscommands.ICmdObjBuilder, envrcPath string) error { + return cmd.New([]string{"direnv", "allow", envrcPath}).DontLog().Run() +} + +func parseDirenvExport(stdout []byte) (map[string]*string, error) { + trimmed := bytes.TrimSpace(stdout) + if len(trimmed) == 0 || bytes.Equal(trimmed, []byte("null")) { + return nil, nil + } + var delta map[string]*string + if err := json.Unmarshal(trimmed, &delta); err != nil { + return nil, err + } + return delta, nil +} + +// queryBlockedEnvrc asks direnv (via `status --json`) whether the current +// directory has a found-but-not-yet-allowed .envrc, and returns its path +// if so. We use direnv's structured output rather than parsing the +// human-readable "is blocked" line because the status output is more +// stable across versions and locales. +func queryBlockedEnvrc(cmd oscommands.ICmdObjBuilder) string { + stdout, _, err := cmd.New([]string{ + "direnv", "status", "--json", + }).DontLog().RunWithOutputs() + if err != nil { + return "" + } + return parseDirenvStatus([]byte(stdout)) +} + +func parseDirenvStatus(stdout []byte) string { + var status struct { + State struct { + FoundRC *struct { + Allowed int `json:"allowed"` + Path string `json:"path"` + } `json:"foundRC"` + } `json:"state"` + } + if err := json.Unmarshal(stdout, &status); err != nil { + return "" + } + if status.State.FoundRC == nil { + return "" + } + // direnv's AllowStatus enum (`internal/cmd/rc.go`): 0=Allowed, + // 1=NotAllowed, 2=Denied. Only NotAllowed is something the user + // can approve; Denied means they already said no. + const notAllowed = 1 + if status.State.FoundRC.Allowed != notAllowed { + return "" + } + return status.State.FoundRC.Path +} diff --git a/pkg/commands/direnv/direnv_test.go b/pkg/commands/direnv/direnv_test.go new file mode 100644 index 000000000..43fdbce88 --- /dev/null +++ b/pkg/commands/direnv/direnv_test.go @@ -0,0 +1,88 @@ +package direnv + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestParseDirenvExport(t *testing.T) { + hello := "hello" + empty := "" + + scenarios := []struct { + name string + input string + want map[string]*string + wantErr bool + }{ + {name: "empty stdout means no .envrc was loaded", input: "", want: nil}, + {name: "literal null from direnv means no delta", input: "null", want: nil}, + {name: "empty object means no delta", input: "{}", want: map[string]*string{}}, + {name: "string value is a set", input: `{"FOO":"hello"}`, want: map[string]*string{"FOO": &hello}}, + {name: "null value is an unset", input: `{"FOO":null}`, want: map[string]*string{"FOO": nil}}, + { + name: "set and unset can coexist", + input: `{"FOO":"hello","BAR":null,"BAZ":""}`, + want: map[string]*string{"FOO": &hello, "BAR": nil, "BAZ": &empty}, + }, + {name: "malformed JSON is an error", input: `{not json`, wantErr: true}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + got, err := parseDirenvExport([]byte(s.input)) + if s.wantErr { + assert.Error(t, err) + } else { + assert.NoError(t, err) + assert.Equal(t, s.want, got) + } + }) + } +} + +func TestParseDirenvStatus(t *testing.T) { + scenarios := []struct { + name string + input string + want string + }{ + { + name: "no .envrc found", + input: `{"state":{"foundRC":null}}`, + want: "", + }, + { + name: "found and allowed (0)", + input: `{"state":{"foundRC":{"allowed":0,"path":"/repo/.envrc"}}}`, + want: "", + }, + { + name: "found but not allowed (1) — eligible for approval", + input: `{"state":{"foundRC":{"allowed":1,"path":"/repo/.envrc"}}}`, + want: "/repo/.envrc", + }, + { + name: "found but denied (2) — user already said no", + input: `{"state":{"foundRC":{"allowed":2,"path":"/repo/.envrc"}}}`, + want: "", + }, + { + name: "malformed JSON", + input: `{not json`, + want: "", + }, + { + name: "empty input", + input: "", + want: "", + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + assert.Equal(t, s.want, parseDirenvStatus([]byte(s.input))) + }) + } +} diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 90514cbd6..69cddfa48 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -2,43 +2,44 @@ package commands import ( "os" - "strings" "github.com/go-errors/errors" - 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/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/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 - Rebase *git_commands.RebaseCommands - Remote *git_commands.RemoteCommands - Stash *git_commands.StashCommands - Status *git_commands.StatusCommands - Submodule *git_commands.SubmoduleCommands - 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 + 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 + Rebase *git_commands.RebaseCommands + Remote *git_commands.RemoteCommands + Stash *git_commands.StashCommands + Status *git_commands.StatusCommands + Submodule *git_commands.SubmoduleCommands + 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 + GitHub *git_commands.GitHubCommands + HostingService *git_commands.HostingService Loaders Loaders } @@ -60,28 +61,34 @@ func NewGitCommand( version *git_commands.GitVersion, osCommand *oscommands.OSCommand, gitConfig git_config.IGitConfig, - pagerConfig *config.PagerConfig, + diffRendererConfigManager *config.DiffRendererConfigManager, ) (*GitCommand, error) { repoPaths, err := git_commands.GetRepoPaths(osCommand.Cmd, version) if err != nil { return nil, errors.Errorf("Error getting repo paths: %v", err) } + // A bare repo has no worktree for us to work in. Callers that can offer the + // user something better (app.setupRepo) check for this first; getting here + // means nobody could, e.g. because --git-dir was pointed at a bare repo. + if repoPaths.IsBareRepo() { + return nil, errors.New(cmn.Tr.BareRepoNotSupported) + } + err = os.Chdir(repoPaths.WorktreePath()) if err != nil { return nil, utils.WrapError(err) } - repository, err := gogit.PlainOpenWithOptions( - repoPaths.WorktreeGitDirPath(), - &gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true}, - ) - 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 - } + // Everything we run through the command builder gets told where the repo is + // by the builder itself, but subprocesses don't go through it: user-defined + // custom commands, an editor, and the lazygit we re-enter as git's sequence + // editor during a rebase. Put it in the process env for those. + env.SetGitLocationEnvVars(repoPaths.GitLocationEnvVars()) + + // Pin the config reads to the repo directory like all other git commands + // (see NewGitCmdObjBuilder); the config commands run outside that builder. + gitConfig.SetDir(repoPaths.WorktreePath()) return NewGitCommandAux( cmn, @@ -89,8 +96,7 @@ func NewGitCommand( osCommand, gitConfig, repoPaths, - repository, - pagerConfig, + diffRendererConfigManager, ), nil } @@ -100,19 +106,18 @@ func NewGitCommandAux( osCommand *oscommands.OSCommand, gitConfig git_config.IGitConfig, repoPaths *git_commands.RepoPaths, - repo *gogit.Repository, - pagerConfig *config.PagerConfig, + diffRendererConfigManager *config.DiffRendererConfigManager, ) *GitCommand { - cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd) + cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd, repoPaths.WorktreePath(), repoPaths.GitLocationEnvVars()) // here we're doing a bunch of dependency injection for each of our commands structs. // 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) + configCommands := git_commands.NewConfigCommands(cmn, gitConfig) - gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, repo, configCommands, pagerConfig) + gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, configCommands, diffRendererConfigManager) fileLoader := git_commands.NewFileLoader(gitCommon, cmd, configCommands) statusCommands := git_commands.NewStatusCommands(gitCommon) @@ -130,44 +135,48 @@ func NewGitCommandAux( 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) + func(from string, to string, reverse bool, filename string, previousPath string, plain bool) (string, error) { + return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, previousPath, 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) + gitHubCommands := git_commands.NewGitHubCommands(gitCommon) + hostingServiceCommands := git_commands.NewHostingServiceCommand(gitCommon) branchLoader := git_commands.NewBranchLoader(cmn, gitCommon, cmd, branchCommands.CurrentBranchInfo, configCommands) commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd) commitLoader := git_commands.NewCommitLoader(cmn, cmd, statusCommands.WorkingTreeState, gitCommon) reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd) - remoteLoader := git_commands.NewRemoteLoader(cmn, cmd, repo.Remotes) + remoteLoader := git_commands.NewRemoteLoader(cmn, cmd) worktreeLoader := git_commands.NewWorktreeLoader(gitCommon) stashLoader := git_commands.NewStashLoader(cmn, cmd) tagLoader := git_commands.NewTagLoader(cmn, cmd) return &GitCommand{ - Blame: blameCommands, - Branch: branchCommands, - Commit: commitCommands, - Config: configCommands, - Custom: customCommands, - Diff: diffCommands, - File: fileCommands, - Flow: flowCommands, - Patch: patchCommands, - Rebase: rebaseCommands, - Remote: remoteCommands, - Stash: stashCommands, - Status: statusCommands, - Submodule: submoduleCommands, - Sync: syncCommands, - Tag: tagCommands, - Bisect: bisectCommands, - WorkingTree: workingTreeCommands, - Worktree: worktreeCommands, - Version: version, + Blame: blameCommands, + Branch: branchCommands, + Commit: commitCommands, + Config: configCommands, + Custom: customCommands, + Diff: diffCommands, + File: fileCommands, + Flow: flowCommands, + Patch: patchCommands, + Rebase: rebaseCommands, + Remote: remoteCommands, + Stash: stashCommands, + Status: statusCommands, + Submodule: submoduleCommands, + Sync: syncCommands, + Tag: tagCommands, + Bisect: bisectCommands, + WorkingTree: workingTreeCommands, + Worktree: worktreeCommands, + Version: version, + GitHub: gitHubCommands, + HostingService: hostingServiceCommands, Loaders: Loaders{ BranchLoader: branchLoader, CommitFileLoader: commitFileLoader, diff --git a/pkg/commands/git_cmd_obj_builder.go b/pkg/commands/git_cmd_obj_builder.go index 753489ef4..d879019eb 100644 --- a/pkg/commands/git_cmd_obj_builder.go +++ b/pkg/commands/git_cmd_obj_builder.go @@ -1,6 +1,7 @@ package commands import ( + "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/sirupsen/logrus" ) @@ -10,32 +11,55 @@ import ( type gitCmdObjBuilder struct { innerBuilder *oscommands.CmdObjBuilder + + // The directory of the repo (or worktree) this builder was created for; + // every command we produce runs there, regardless of the process's current + // working directory. The two are the same until the user switches to + // another repo: lazygit chdirs on a switch, but work still in flight for + // the previous repo (e.g. a background refresh spawning commands through + // the old builder) must keep running its commands against the repo it + // started in, not whichever one the process has since moved to. + repoDir string + + // The env vars every command we produce gets: the optional-locks one below, + // plus the repo's git location if it has one (see + // RepoPaths.GitLocationEnvVars). Those are in the process env too, but for + // the same reason as repoDir we don't rely on that: the process env belongs + // to whichever repo lazygit has since switched to. + envVars []string } var _ oscommands.ICmdObjBuilder = &gitCmdObjBuilder{} -func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuilder) *gitCmdObjBuilder { +// We disable git's optional locks on every command by default so that our git +// invocations never contend for index.lock. See git_commands.OptionalLocksEnvVar +// for the full rationale. Individual commands that do want the lock (currently +// only the foreground files refresh) opt back in via CmdObj.RemoveEnvVar. +var defaultEnvVar = git_commands.OptionalLocksEnvVar + "=0" + +func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuilder, repoDir string, gitLocationEnvVars []string) *gitCmdObjBuilder { // the price of having a convenient interface where we can say .New(...).Run() is that our builder now depends on our runner, so when we want to wrap the default builder/runner in new functionality we need to jump through some hoops. We could avoid the use of a decorator function here by just exporting the runner field on the default builder but that would be misleading because we don't want anybody using that to run commands (i.e. we want there to be a single API used across the codebase) updatedBuilder := innerBuilder.CloneWithNewRunner(func(runner oscommands.ICmdObjRunner) oscommands.ICmdObjRunner { return &gitCmdObjRunner{ - log: log, - innerRunner: runner, + log: log, + innerRunner: runner, + initialRetryDelay: defaultInitialRetryDelay, } }) return &gitCmdObjBuilder{ innerBuilder: updatedBuilder, + repoDir: repoDir, + envVars: append([]string{defaultEnvVar}, gitLocationEnvVars...), } } -var defaultEnvVar = "GIT_OPTIONAL_LOCKS=0" - func (self *gitCmdObjBuilder) New(args []string) *oscommands.CmdObj { - return self.innerBuilder.New(args).AddEnvVars(defaultEnvVar) + return self.innerBuilder.New(args).AddEnvVars(self.envVars...).SetWd(self.repoDir) } func (self *gitCmdObjBuilder) NewShell(cmdStr string, shellFunctionsFile string) *oscommands.CmdObj { - return self.innerBuilder.NewShell(cmdStr, shellFunctionsFile).AddEnvVars(defaultEnvVar) + return self.innerBuilder.NewShell(cmdStr, shellFunctionsFile).AddEnvVars(self.envVars...).SetWd(self.repoDir) } func (self *gitCmdObjBuilder) Quote(str string) string { diff --git a/pkg/commands/git_cmd_obj_builder_test.go b/pkg/commands/git_cmd_obj_builder_test.go new file mode 100644 index 000000000..e969baa00 --- /dev/null +++ b/pkg/commands/git_cmd_obj_builder_test.go @@ -0,0 +1,61 @@ +package commands + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/git_commands" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/stretchr/testify/assert" +) + +// Every git command we build disables optional locks by default, so that our +// invocations never contend for index.lock (see git_commands.OptionalLocksEnvVar +// for the rationale). Commands that want the lock opt back in with +// CmdObj.RemoveEnvVar. +func TestGitCmdObjBuilderDisablesOptionalLocksByDefault(t *testing.T) { + builder := NewGitCmdObjBuilder( + utils.NewDummyLog(), + oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)), + "/path/to/repo", + nil, + ) + + assert.Contains(t, builder.New([]string{"git", "status"}).GetEnvVars(), git_commands.OptionalLocksEnvVar+"=0") + assert.Contains(t, builder.NewShell("git status", "").GetEnvVars(), git_commands.OptionalLocksEnvVar+"=0") +} + +// Every command the builder produces runs in the directory of the repo the +// builder was created for, not in the process's current directory: lazygit +// chdirs when switching repos, and commands built for the previous repo after +// that (e.g. by a background refresh still in flight) must keep addressing the +// repo they were built for. +func TestGitCmdObjBuilderPinsCommandsToRepoDir(t *testing.T) { + builder := NewGitCmdObjBuilder( + utils.NewDummyLog(), + oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)), + "/path/to/repo", + nil, + ) + + assert.Equal(t, "/path/to/repo", builder.New([]string{"git", "status"}).GetCmd().Dir) + assert.Equal(t, "/path/to/repo", builder.NewShell("git status", "").GetCmd().Dir) +} + +// A repo whose git dir isn't in its worktree can't be found by running a +// command there, so the builder has to tell every command where it is; see +// RepoPaths.GitLocationEnvVars. The process env says the same thing, but only +// for the repo lazygit is in right now, which isn't necessarily this one. +func TestGitCmdObjBuilderPinsCommandsToGitLocation(t *testing.T) { + builder := NewGitCmdObjBuilder( + utils.NewDummyLog(), + oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)), + "/path/to/worktree", + []string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"}, + ) + + assert.Subset(t, builder.New([]string{"git", "status"}).GetEnvVars(), + []string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"}) + assert.Subset(t, builder.NewShell("git status", "").GetEnvVars(), + []string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"}) +} diff --git a/pkg/commands/git_cmd_obj_runner.go b/pkg/commands/git_cmd_obj_runner.go index fd98bc84f..8112b0f30 100644 --- a/pkg/commands/git_cmd_obj_runner.go +++ b/pkg/commands/git_cmd_obj_runner.go @@ -11,13 +11,42 @@ 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 + // defaultInitialRetryDelay is how long we wait before the first retry of a + // command that failed with a transient lock error. We double it before each + // subsequent retry (see retryOnLockError), so across maxRetries attempts we + // wait for a bit over a second in total. That's long enough to outlast the + // brief window during which another git process holds a lock we need — + // typically our own foreground `git status` refresh, which takes index.lock + // to persist its refreshed stat-cache. + defaultInitialRetryDelay = 20 * time.Millisecond + maxRetries = 7 ) type gitCmdObjRunner struct { log *logrus.Entry innerRunner oscommands.ICmdObjRunner + // initialRetryDelay is the wait before the first lock-error retry. It's a + // field rather than the constant directly so tests can set it to zero and + // not actually sleep. + initialRetryDelay time.Duration +} + +// isRetryableError returns true if a failed command hit a transient +// lock-related condition that may succeed on retry. The lock message can reach +// us either in the command's captured output or, for streamed commands whose +// output we don't capture, only in the returned error, so we check both. +// +// We match the bare "index.lock" fragment rather than a fuller path or message +// so we catch the lock wherever git puts it: the main .git dir, a linked +// worktree's git dir (.git/worktrees//index.lock), or a submodule's git +// dir. +func isRetryableError(output string, err error) bool { + text := output + if err != nil { + text += "\n" + err.Error() + } + return strings.Contains(text, "index.lock") || + strings.Contains(text, "cannot lock ref") } func (self *gitCmdObjRunner) Run(cmdObj *oscommands.CmdObj) error { @@ -26,41 +55,44 @@ func (self *gitCmdObjRunner) Run(cmdObj *oscommands.CmdObj) error { } func (self *gitCmdObjRunner) RunWithOutput(cmdObj *oscommands.CmdObj) (string, error) { - var output string - var err error - for range RetryCount { - newCmdObj := cmdObj.Clone() - output, err = self.innerRunner.RunWithOutput(newCmdObj) - - if err == nil || !strings.Contains(output, ".git/index.lock") { - return output, 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 output, err + return self.retryOnLockError(func() (string, error) { + return self.innerRunner.RunWithOutput(cmdObj.Clone()) + }) } func (self *gitCmdObjRunner) RunWithOutputs(cmdObj *oscommands.CmdObj) (string, string, error) { var stdout, stderr string - var err error - for range RetryCount { - newCmdObj := cmdObj.Clone() - stdout, stderr, err = self.innerRunner.RunWithOutputs(newCmdObj) + _, err := self.retryOnLockError(func() (string, error) { + var runErr error + stdout, stderr, runErr = self.innerRunner.RunWithOutputs(cmdObj.Clone()) + return stdout + stderr, runErr + }) + return stdout, stderr, err +} - if err == nil || !strings.Contains(stdout+stderr, ".git/index.lock") { - return stdout, stderr, err +// retryOnLockError runs the given function, retrying if it fails with a +// transient lock error (see isRetryableError). The string returned by run is +// the command output we inspect to classify the failure. We clone the command +// for each attempt (inside run) because an *exec.Cmd can only be run once. +func (self *gitCmdObjRunner) retryOnLockError(run func() (string, error)) (string, error) { + delay := self.initialRetryDelay + var output string + var err error + for attempt := range maxRetries { + output, err = run() + + if err == nil || !isRetryableError(output, err) { + break } - // 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) + if attempt < maxRetries-1 { + self.log.Warnf("lock error prevented command from running; retrying in %s", delay) + time.Sleep(delay) + delay *= 2 + } } - return stdout, stderr, err + return output, err } // Retry logic not implemented here, but these commands typically don't need to obtain a lock. diff --git a/pkg/commands/git_cmd_obj_runner_test.go b/pkg/commands/git_cmd_obj_runner_test.go new file mode 100644 index 000000000..bf938da54 --- /dev/null +++ b/pkg/commands/git_cmd_obj_runner_test.go @@ -0,0 +1,137 @@ +package commands + +import ( + "errors" + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/stretchr/testify/assert" +) + +type runnerResult struct { + output string + err error +} + +// scriptedRunner is an ICmdObjRunner stub that returns a preconfigured result +// for each successive call, letting us drive the retry loop deterministically. +// It counts calls so tests can assert whether a command was retried. +type scriptedRunner struct { + results []runnerResult + calls int +} + +func (self *scriptedRunner) next() (string, error) { + result := self.results[self.calls] + self.calls++ + return result.output, result.err +} + +func (self *scriptedRunner) Run(*oscommands.CmdObj) error { + _, err := self.next() + return err +} + +func (self *scriptedRunner) RunWithOutput(*oscommands.CmdObj) (string, error) { + return self.next() +} + +func (self *scriptedRunner) RunWithOutputs(*oscommands.CmdObj) (string, string, error) { + output, err := self.next() + return output, "", err +} + +func (self *scriptedRunner) RunAndProcessLines(*oscommands.CmdObj, func(string) (bool, error)) error { + panic("not implemented") +} + +func newTestRunner(inner *scriptedRunner) *gitCmdObjRunner { + return &gitCmdObjRunner{ + log: utils.NewDummyLog(), + innerRunner: inner, + // don't actually sleep between retries + initialRetryDelay: 0, + } +} + +// dummyCmdObj returns a throwaway command; only its clonability matters, since +// the scriptedRunner ignores it and returns preconfigured results. +func dummyCmdObj() *oscommands.CmdObj { + return oscommands.NewDummyCmdObjBuilder(nil).New([]string{"git", "status"}) +} + +func TestRunWithOutputReturnsSuccessWithoutRetrying(t *testing.T) { + inner := &scriptedRunner{results: []runnerResult{{output: "done", err: nil}}} + + output, err := newTestRunner(inner).RunWithOutput(dummyCmdObj()) + + assert.NoError(t, err) + assert.Equal(t, "done", output) + assert.Equal(t, 1, inner.calls) +} + +func TestRunWithOutputDoesNotRetryNonLockError(t *testing.T) { + inner := &scriptedRunner{results: []runnerResult{{output: "boom", err: errors.New("boom")}}} + + _, err := newTestRunner(inner).RunWithOutput(dummyCmdObj()) + + assert.Error(t, err) + assert.Equal(t, 1, inner.calls) +} + +func TestRunWithOutputRetriesWhenLockErrorIsInOutput(t *testing.T) { + inner := &scriptedRunner{results: []runnerResult{ + {output: "fatal: Unable to create '/repo/.git/index.lock': File exists.", err: errors.New("exit status 128")}, + {output: "done", err: nil}, + }} + + output, err := newTestRunner(inner).RunWithOutput(dummyCmdObj()) + + assert.NoError(t, err) + assert.Equal(t, "done", output) + assert.Equal(t, 2, inner.calls) +} + +func TestRunWithOutputRetriesWhenLockErrorIsOnlyInError(t *testing.T) { + // A streamed command (e.g. an amend run through the gpg helper) doesn't + // capture its output, so a lock failure surfaces only in the returned error + // with an empty output string. The retry logic must still recognize it. + inner := &scriptedRunner{results: []runnerResult{ + {output: "", err: errors.New("fatal: Unable to create '/repo/.git/index.lock': File exists.")}, + {output: "", err: nil}, + }} + + _, err := newTestRunner(inner).RunWithOutput(dummyCmdObj()) + + assert.NoError(t, err) + assert.Equal(t, 2, inner.calls) +} + +func TestRunWithOutputGivesUpAfterMaxRetries(t *testing.T) { + results := make([]runnerResult, maxRetries) + for i := range results { + results[i] = runnerResult{err: errors.New("fatal: Unable to create '/repo/.git/index.lock': File exists.")} + } + inner := &scriptedRunner{results: results} + + _, err := newTestRunner(inner).RunWithOutput(dummyCmdObj()) + + assert.Error(t, err) + assert.Equal(t, maxRetries, inner.calls) +} + +func TestRunWithOutputRetriesLockErrorInLinkedWorktree(t *testing.T) { + // In a linked worktree the lock lives at .git/worktrees//index.lock + // rather than .git/index.lock, so only matching the bare "index.lock" + // fragment lets the retry fire there too. + inner := &scriptedRunner{results: []runnerResult{ + {output: "", err: errors.New("fatal: Unable to create '/repo/.git/worktrees/feature/index.lock': File exists.")}, + {output: "", err: nil}, + }} + + _, err := newTestRunner(inner).RunWithOutput(dummyCmdObj()) + + assert.NoError(t, err) + assert.Equal(t, 2, inner.calls) +} diff --git a/pkg/commands/git_commands/blame.go b/pkg/commands/git_commands/blame.go index aba1c63fe..e1a9469eb 100644 --- a/pkg/commands/git_commands/blame.go +++ b/pkg/commands/git_commands/blame.go @@ -29,5 +29,5 @@ func (self *BlameCommands) BlameLineRange(filename string, commit string, firstL Arg("--"). Arg(filename) - return self.cmd.New(cmdArgs.ToArgv()).RunWithOutput() + return self.cmd.New(cmdArgs.ToArgv()).DontLog().RunWithOutput() } diff --git a/pkg/commands/git_commands/branch_loader.go b/pkg/commands/git_commands/branch_loader.go index a4e41b756..b41b0564f 100644 --- a/pkg/commands/git_commands/branch_loader.go +++ b/pkg/commands/git_commands/branch_loader.go @@ -9,7 +9,6 @@ import ( "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" @@ -30,7 +29,7 @@ import ( // 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) + Branches(cmd oscommands.ICmdObjBuilder) map[string]*BranchConfig } type BranchInfo struct { @@ -119,16 +118,13 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit, 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 - } + configBranches := self.config.Branches(self.cmd) for _, branch := range branches { match := configBranches[branch.Name] if match != nil { branch.UpstreamRemote = match.Remote - branch.UpstreamBranch = match.Merge.Short() + branch.UpstreamBranch = match.Merge } // If the branch already existed, take over its BehindBaseBranch value @@ -159,6 +155,17 @@ func (self *BranchLoader) GetBehindBaseBranchValuesForAllBranches( return nil } + if self.version.IsAtLeast(2, 41, 0) { + return self.getBehindBaseBranchValuesFast(branches, mainBranchRefs, renderFunc) + } + return self.getBehindBaseBranchValuesLegacy(branches, mainBranches, renderFunc) +} + +func (self *BranchLoader) getBehindBaseBranchValuesLegacy( + branches []*models.Branch, + mainBranches *MainBranches, + renderFunc func(), +) error { t := time.Now() errg := errgroup.Group{} @@ -194,11 +201,134 @@ func (self *BranchLoader) GetBehindBaseBranchValuesForAllBranches( } err := errg.Wait() - self.Log.Debugf("time to get behind base branch values for all branches: %s", time.Since(t)) + self.Log.Debugf("time to get behind base branch values for all branches (legacy): %s", time.Since(t)) renderFunc() return err } +// Holds parsed values from a single %(ahead-behind:) field. +type aheadBehind struct { + ahead, behind int +} + +type branchAheadBehind struct { + refName string + aheadBehinds []aheadBehind +} + +// Parses output produced by: +// +// git for-each-ref --format='%(refname)\x00%(ahead-behind:)\x00...' refs/heads +// +// Lines whose NUL-split column count doesn't match (1 + numBases) are dropped. +// Blank lines are ignored. +// Individual malformed ahead-behind fields produce {valid: false} entries +func parseAheadBehindForEachRefOutput( + output string, + numBases int, // number of %(ahead-behind:...) tokens +) []branchAheadBehind { + if output == "" { + return nil + } + lines := strings.Split(output, "\n") + result := make([]branchAheadBehind, 0, len(lines)) + for _, line := range lines { + cols := strings.Split(line, "\x00") + if len(cols) != numBases+1 { + continue + } + refName := cols[0] + aheadBehinds := lo.FilterMap(cols[1:], func(col string, _ int) (aheadBehind, bool) { + return parseAheadBehindField(col) + }) + entry := branchAheadBehind{ + refName: refName, + aheadBehinds: aheadBehinds, + } + result = append(result, entry) + } + return result +} + +func parseAheadBehindField(s string) (aheadBehind, bool) { + parts := strings.Fields(s) + if len(parts) != 2 { + return aheadBehind{}, false + } + ahead, err1 := strconv.Atoi(parts[0]) + behind, err2 := strconv.Atoi(parts[1]) + if err1 != nil || err2 != nil { + return aheadBehind{}, false + } + return aheadBehind{ahead: ahead, behind: behind}, true +} + +// Picks the "closest" base by smallest ahead value (commits the branch +// has that the base doesn't = roughly "since fork point") and returns +// its behind value. +// Ties are broken by index order +func selectBehindForBranch(aheadBehinds []aheadBehind) int { + return lo.MinBy(aheadBehinds, func(a, b aheadBehind) bool { + return a.ahead < b.ahead + }).behind +} + +// The output format is: +// +// \x00 \x00 ...\n +// +// with one ahead-behind field per base, in the same order as mainBranchRefs. +// +// Requires git >= 2.41 (when %(ahead-behind:...) was added). +func buildAheadBehindForEachRefArgs(mainBranchRefs []string) []string { + formatParts := make([]string, 0, 1+len(mainBranchRefs)) + formatParts = append(formatParts, "%(refname)") + for _, ref := range mainBranchRefs { + formatParts = append(formatParts, "%(ahead-behind:"+ref+")") + } + format := strings.Join(formatParts, "%00") + + return NewGitCmd("for-each-ref"). + Arg("--format=" + format). + Arg("refs/heads"). + ToArgv() +} + +func (self *BranchLoader) getBehindBaseBranchValuesFast( + branches []*models.Branch, + mainBranchRefs []string, + renderFunc func(), +) error { + t := time.Now() + + output, err := self.cmd.New( + buildAheadBehindForEachRefArgs(mainBranchRefs), + ).DontLog().RunWithOutput() + if err != nil { + return err + } + + parsed := parseAheadBehindForEachRefOutput(output, len(mainBranchRefs)) + branchByRef := lo.KeyBy(branches, (*models.Branch).FullRefName) + + for _, p := range parsed { + if branch, ok := branchByRef[p.refName]; ok { + behind := selectBehindForBranch(p.aheadBehinds) + branch.BehindBaseBranch.Store(int32(behind)) + delete(branchByRef, p.refName) + } + } + + // Branches not in parse are default to 0 + for _, branch := range branchByRef { + branch.BehindBaseBranch.Store(0) + } + + self.Log.Debugf("time to get behind base branch values for all branches (fast): %s", time.Since(t)) + renderFunc() + return nil +} + // Find the base branch for the given branch (i.e. the main branch that the // given branch was forked off of) // diff --git a/pkg/commands/git_commands/branch_loader_test.go b/pkg/commands/git_commands/branch_loader_test.go index 27a747879..f20ce6186 100644 --- a/pkg/commands/git_commands/branch_loader_test.go +++ b/pkg/commands/git_commands/branch_loader_test.go @@ -7,6 +7,7 @@ import ( "time" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/stretchr/testify/assert" ) @@ -124,3 +125,369 @@ func TestObtainBranch(t *testing.T) { }) } } + +func TestParseAheadBehindForEachRefOutput(t *testing.T) { + type scenario struct { + testName string + input string + numBases int + expected []branchAheadBehind + } + + scenarios := []scenario{ + { + testName: "single branch single base", + input: "refs/heads/feat\x002 5\n", + numBases: 1, + expected: []branchAheadBehind{ + { + refName: "refs/heads/feat", + aheadBehinds: []aheadBehind{{ahead: 2, behind: 5}}, + }, + }, + }, + { + testName: "multiple branches multiple bases", + input: "refs/heads/feat\x002 5\x0010 1\n" + + "refs/heads/main\x000 0\x000 0\n", + numBases: 2, + expected: []branchAheadBehind{ + { + refName: "refs/heads/feat", + aheadBehinds: []aheadBehind{ + {ahead: 2, behind: 5}, + {ahead: 10, behind: 1}, + }, + }, + { + refName: "refs/heads/main", + aheadBehinds: []aheadBehind{ + {ahead: 0, behind: 0}, + {ahead: 0, behind: 0}, + }, + }, + }, + }, + { + testName: "empty ahead-behind field for unreachable base", + input: "refs/heads/feat\x00\x002 5\n", + numBases: 2, + expected: []branchAheadBehind{ + { + refName: "refs/heads/feat", + aheadBehinds: []aheadBehind{ + {ahead: 2, behind: 5}, + }, + }, + }, + }, + { + testName: "ref name containing slashes and dashes", + input: "refs/heads/feat/foo-bar\x001 2\n", + numBases: 1, + expected: []branchAheadBehind{ + { + refName: "refs/heads/feat/foo-bar", + aheadBehinds: []aheadBehind{{ahead: 1, behind: 2}}, + }, + }, + }, + { + testName: "trailing newline and blank lines are ignored", + input: "refs/heads/feat\x001 2\n\n", + numBases: 1, + expected: []branchAheadBehind{ + { + refName: "refs/heads/feat", + aheadBehinds: []aheadBehind{{ahead: 1, behind: 2}}, + }, + }, + }, + { + testName: "line with wrong column count is skipped", + input: "refs/heads/good\x001 2\n" + + "refs/heads/bad\n" + + "refs/heads/also_good\x003 4\n", + numBases: 1, + expected: []branchAheadBehind{ + { + refName: "refs/heads/good", + aheadBehinds: []aheadBehind{{ahead: 1, behind: 2}}, + }, + { + refName: "refs/heads/also_good", + aheadBehinds: []aheadBehind{{ahead: 3, behind: 4}}, + }, + }, + }, + { + testName: "malformed ahead-behind field becomes invalid but line is kept", + input: "refs/heads/feat\x00not_a_number\n", + numBases: 1, + expected: []branchAheadBehind{ + { + refName: "refs/heads/feat", + aheadBehinds: []aheadBehind{}, + }, + }, + }, + { + testName: "empty input", + input: "", + numBases: 1, + expected: nil, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + result := parseAheadBehindForEachRefOutput(s.input, s.numBases) + assert.Equal(t, s.expected, result) + }) + } +} + +func TestSelectBehindForBranch(t *testing.T) { + type scenario struct { + testName string + aheadBehinds []aheadBehind + expected int + } + + scenarios := []scenario{ + { + testName: "single base, valid value", + aheadBehinds: []aheadBehind{{ahead: 3, behind: 7}}, + expected: 7, + }, + { + testName: "multi-base, clear winner by ahead", + aheadBehinds: []aheadBehind{ + {ahead: 50, behind: 10}, // master + {ahead: 5, behind: 2}, // develop ← smallest ahead + }, + expected: 2, + }, + { + testName: "develop forked from master case (ancestor-of-each-other)", + // feat-x has 5 commits since fork from develop. + // develop is 50 commits ahead of master. + // ahead vs master = 5 + 50 = 55; behind vs master = 0 + // ahead vs develop = 5; behind vs develop = 5 + aheadBehinds: []aheadBehind{ + {ahead: 55, behind: 0}, // master + {ahead: 5, behind: 5}, // develop ← smallest ahead + }, + expected: 5, + }, + { + testName: "tie on ahead - first base wins (config order)", + aheadBehinds: []aheadBehind{ + {ahead: 5, behind: 10}, // first + {ahead: 5, behind: 99}, // second, same ahead + }, + expected: 10, + }, + { + testName: "first base invalid, second valid", + aheadBehinds: []aheadBehind{ + {ahead: 3, behind: 8}, + }, + expected: 8, + }, + { + testName: "all invalid - returns 0", + aheadBehinds: []aheadBehind{}, + expected: 0, + }, + { + testName: "empty - returns 0", + aheadBehinds: nil, + expected: 0, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + result := selectBehindForBranch(s.aheadBehinds) + assert.Equal(t, s.expected, result) + }) + } +} + +func TestBuildAheadBehindForEachRefArgs(t *testing.T) { + type scenario struct { + testName string + mainBranchRefs []string + expected []string + } + + scenarios := []scenario{ + { + testName: "single base", + mainBranchRefs: []string{"refs/heads/master"}, + expected: []string{ + "git", + "for-each-ref", + "--format=%(refname)%00%(ahead-behind:refs/heads/master)", + "refs/heads", + }, + }, + { + testName: "two bases", + mainBranchRefs: []string{"refs/heads/master", "refs/remotes/origin/develop"}, + expected: []string{ + "git", + "for-each-ref", + "--format=%(refname)%00%(ahead-behind:refs/heads/master)%00%(ahead-behind:refs/remotes/origin/develop)", + "refs/heads", + }, + }, + { + testName: "four bases", + mainBranchRefs: []string{"refs/heads/a", "refs/heads/b", "refs/heads/c", "refs/heads/d"}, + expected: []string{ + "git", + "for-each-ref", + "--format=%(refname)%00%(ahead-behind:refs/heads/a)%00%(ahead-behind:refs/heads/b)%00%(ahead-behind:refs/heads/c)%00%(ahead-behind:refs/heads/d)", + "refs/heads", + }, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + result := buildAheadBehindForEachRefArgs(s.mainBranchRefs) + assert.Equal(t, s.expected, result) + }) + } +} + +func TestGetBehindBaseBranchValuesForAllBranches_FastPath(t *testing.T) { + mainBranchRefs := []string{"refs/heads/master", "refs/remotes/origin/develop"} + + // Two branches: feat-x has clear divergence from develop; main matches master exactly. + branches := []*models.Branch{ + {Name: "feat-x"}, + {Name: "main"}, + } + + expectedFormat := "%(refname)%00%(ahead-behind:refs/heads/master)%00%(ahead-behind:refs/remotes/origin/develop)" + output := "refs/heads/feat-x\x0055 0\x005 5\n" + // picks develop (ahead=5 < 55), behind=5 + "refs/heads/main\x000 0\x000 0\n" // picks master (first, tie), behind=0 + + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"for-each-ref", "--format=" + expectedFormat, "refs/heads"}, output, nil) + + gitCommon := buildGitCommon(commonDeps{ + runner: runner, + gitVersion: &GitVersion{2, 41, 0, ""}, + }) + + loader := &BranchLoader{ + Common: gitCommon.Common, + GitCommon: gitCommon, + cmd: gitCommon.cmd, + } + + mainBranches := &MainBranches{ + c: gitCommon.Common, + cmd: gitCommon.cmd, + existingMainBranches: mainBranchRefs, + previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches, + } + + rendered := false + err := loader.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, func() { rendered = true }) + assert.NoError(t, err) + assert.True(t, rendered, "renderFunc should have been called") + + assert.Equal(t, int32(5), branches[0].BehindBaseBranch.Load(), "feat-x should be behind develop by 5") + assert.Equal(t, int32(0), branches[1].BehindBaseBranch.Load(), "main should be behind master by 0") + + runner.CheckForMissingCalls() +} + +// edge case where a failure would leave artifacts from prior load +func TestGetBehindBaseBranchValuesForAllBranches_FastPath_ClearsStaleValueWhenBranchMissingFromOutput(t *testing.T) { + mainBranchRefs := []string{"refs/heads/master"} + + feat := &models.Branch{Name: "feat-x"} + feat.BehindBaseBranch.Store(99) // stale value from a prior load + ghost := &models.Branch{Name: "ghost"} + ghost.BehindBaseBranch.Store(42) // stale value from a prior load + + expectedFormat := "%(refname)%00%(ahead-behind:refs/heads/master)" + output := "refs/heads/feat-x\x003 5\n" // ghost is intentionally absent + + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"for-each-ref", "--format=" + expectedFormat, "refs/heads"}, output, nil) + + gitCommon := buildGitCommon(commonDeps{ + runner: runner, + gitVersion: &GitVersion{2, 41, 0, ""}, + }) + + loader := &BranchLoader{ + Common: gitCommon.Common, + GitCommon: gitCommon, + cmd: gitCommon.cmd, + } + + mainBranches := &MainBranches{ + c: gitCommon.Common, + cmd: gitCommon.cmd, + existingMainBranches: mainBranchRefs, + previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches, + } + + err := loader.GetBehindBaseBranchValuesForAllBranches( + []*models.Branch{feat, ghost}, mainBranches, func() {}) + assert.NoError(t, err) + + assert.Equal(t, int32(5), feat.BehindBaseBranch.Load(), "feat-x should be updated to fresh value") + assert.Equal(t, int32(0), ghost.BehindBaseBranch.Load(), "ghost should be reset to 0 since it has no fresh data") + + runner.CheckForMissingCalls() +} + +func TestGetBehindBaseBranchValuesForAllBranches_LegacyPath(t *testing.T) { + mainBranchRefs := []string{"refs/heads/master"} + + branches := []*models.Branch{ + {Name: "feat-x"}, + } + + // In legacy path: per-branch GetBaseBranch (merge-base + for-each-ref --contains) + // then rev-list --left-right --count. + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"merge-base", "refs/heads/feat-x", "refs/heads/master"}, "abc123\n", nil). + ExpectGitArgs([]string{"for-each-ref", "--contains", "abc123", "--format=%(refname)", "refs/heads/master"}, "refs/heads/master\n", nil). + ExpectGitArgs([]string{"rev-list", "--left-right", "--count", "refs/heads/feat-x...refs/heads/master"}, "5\t7\n", nil) + + gitCommon := buildGitCommon(commonDeps{ + runner: runner, + gitVersion: &GitVersion{2, 34, 0, ""}, // pre-2.41, forces legacy + }) + + loader := &BranchLoader{ + Common: gitCommon.Common, + GitCommon: gitCommon, + cmd: gitCommon.cmd, + } + + mainBranches := &MainBranches{ + c: gitCommon.Common, + cmd: gitCommon.cmd, + existingMainBranches: mainBranchRefs, + previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches, + } + + rendered := false + err := loader.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, func() { rendered = true }) + assert.NoError(t, err) + assert.True(t, rendered) + assert.Equal(t, int32(7), branches[0].BehindBaseBranch.Load()) + + runner.CheckForMissingCalls() +} diff --git a/pkg/commands/git_commands/commit.go b/pkg/commands/git_commands/commit.go index 40d2b7319..d067e9831 100644 --- a/pkg/commands/git_commands/commit.go +++ b/pkg/commands/git_commands/commit.go @@ -61,6 +61,7 @@ func AddCoAuthorToMessage(message string, author string) string { } func AddCoAuthorToDescription(description string, author string) string { + description = strings.TrimRight(description, "\n") if description != "" { lines := strings.Split(description, "\n") if strings.HasPrefix(lines[len(lines)-1], "Co-authored-by:") { @@ -240,23 +241,15 @@ func (self *CommitCommands) AmendHeadCmdObj() *oscommands.CmdObj { } func (self *CommitCommands) ShowCmdObj(hash string, filterPaths []string) *oscommands.CmdObj { - contextSize := self.UserConfig().Git.DiffContextSize - - extDiffCmd := self.pagerConfig.GetExternalDiffCommand() - useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() cmdArgs := NewGitCmd("show"). Config("diff.noprefix=false"). - ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd). - ArgIfElse(extDiffCmd != "" || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff"). + AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), true). Arg("--submodule"). - Arg("--color="+self.pagerConfig.GetColorArg()). - Arg(fmt.Sprintf("--unified=%d", contextSize)). + Arg("--color=" + self.diffRendererConfigManager.GetColorArg()). Arg("--stat"). Arg("--decorate"). Arg("-p"). Arg(hash). - ArgIf(self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space"). - Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)). Arg("--"). Arg(filterPaths...). Dir(self.repoPaths.worktreePath). diff --git a/pkg/commands/git_commands/commit_file_loader.go b/pkg/commands/git_commands/commit_file_loader.go index 33bd40e13..9500dabfd 100644 --- a/pkg/commands/git_commands/commit_file_loader.go +++ b/pkg/commands/git_commands/commit_file_loader.go @@ -1,12 +1,12 @@ package git_commands import ( + "fmt" "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 { @@ -29,7 +29,7 @@ func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse boo Arg("--no-ext-diff"). Arg("--name-status"). Arg("-z"). - Arg("--no-renames"). + Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)). ArgIf(reverse, "-R"). Arg(from). Arg(to). @@ -44,18 +44,37 @@ func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse boo } // 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 +// so we need to split it by the null character and then map each status-name pair +// to a commit file. Renames (and copies) are special: their status is followed by +// two paths (the old one and the new one) rather than one, e.g. +// "R100\x00old\x00new\x00". func getCommitFilesFromFilenames(filenames string) []*models.CommitFile { - lines := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00") - if len(lines) == 1 { + fields := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00") + if len(fields) == 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], - Path: chunk[1], + commitFiles := make([]*models.CommitFile, 0, len(fields)/2) + for i := 0; i < len(fields)-1; { + changeStatus := fields[i] + if changeStatus[0] == 'R' || changeStatus[0] == 'C' { + // The status has a similarity score appended (e.g. "R100"); drop it + // so the rest of the code only has to deal with a plain "R" or "C". + commitFiles = append(commitFiles, &models.CommitFile{ + ChangeStatus: changeStatus[:1], + PreviousPath: fields[i+1], + Path: fields[i+2], + }) + i += 3 + } else { + // typical result looks like 'A my_file' meaning my_file was added + commitFiles = append(commitFiles, &models.CommitFile{ + ChangeStatus: changeStatus, + Path: fields[i+1], + }) + i += 2 } - }) + } + + return commitFiles } diff --git a/pkg/commands/git_commands/commit_file_loader_test.go b/pkg/commands/git_commands/commit_file_loader_test.go index ec91ec22e..2fa745f8b 100644 --- a/pkg/commands/git_commands/commit_file_loader_test.go +++ b/pkg/commands/git_commands/commit_file_loader_test.go @@ -60,6 +60,25 @@ func TestGetCommitFilesFromFilenames(t *testing.T) { }, }, }, + { + testName: "a rename among regular files", + input: "M\x00Myfile\x00R100\x00before\x00after\x00A\x00Added\x00", + output: []*models.CommitFile{ + { + Path: "Myfile", + ChangeStatus: "M", + }, + { + Path: "after", + PreviousPath: "before", + ChangeStatus: "R", + }, + { + Path: "Added", + ChangeStatus: "A", + }, + }, + }, } for _, test := range tests { diff --git a/pkg/commands/git_commands/commit_loader.go b/pkg/commands/git_commands/commit_loader.go index 8b79bd8cd..381dd641e 100644 --- a/pkg/commands/git_commands/commit_loader.go +++ b/pkg/commands/git_commands/commit_loader.go @@ -174,7 +174,7 @@ func (self *CommitLoader) MergeRebasingCommits(hashPool *utils.StringPool, commi } if workingTreeState.Rebasing { - rebasingCommits, err := self.getHydratedRebasingCommits(hashPool, addConflictedRebasingCommit) + rebasingCommits, err := self.getHydratedRebasingCommits(hashPool, commits, addConflictedRebasingCommit) if err != nil { return nil, err } @@ -251,8 +251,8 @@ func (self *CommitLoader) extractCommitFromLine(hashPool *utils.StringPool, line }) } -func (self *CommitLoader) getHydratedRebasingCommits(hashPool *utils.StringPool, addConflictingCommit bool) ([]*models.Commit, error) { - return self.getHydratedTodoCommits(hashPool, self.getRebasingCommits(hashPool, addConflictingCommit), false) +func (self *CommitLoader) getHydratedRebasingCommits(hashPool *utils.StringPool, existingCommits []*models.Commit, addConflictingCommit bool) ([]*models.Commit, error) { + return self.getHydratedTodoCommits(hashPool, self.getRebasingCommits(hashPool, addConflictingCommit), existingCommits, false) } func (self *CommitLoader) getHydratedSequencerCommits(hashPool *utils.StringPool, workingTreeState models.WorkingTreeState) ([]*models.Commit, error) { @@ -271,39 +271,56 @@ func (self *CommitLoader) getHydratedSequencerCommits(hashPool *utils.StringPool } } - return self.getHydratedTodoCommits(hashPool, commits, true) + return self.getHydratedTodoCommits(hashPool, commits, nil, true) } -func (self *CommitLoader) getHydratedTodoCommits(hashPool *utils.StringPool, todoCommits []*models.Commit, todoFileHasShortHashes bool) ([]*models.Commit, error) { +func (self *CommitLoader) getHydratedTodoCommits( + hashPool *utils.StringPool, + todoCommits []*models.Commit, + existingCommits []*models.Commit, + todoFileHasShortHashes bool, +) ([]*models.Commit, error) { if len(todoCommits) == 0 { return nil, nil } - commitHashes := lo.FilterMap(todoCommits, 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() - + // A refresh of only the rebasing todos should reuse the already loaded todos to avoid + // unnecessary git show calls. fullCommits := map[string]*models.Commit{} - err := cmdObj.RunAndProcessLines(func(line string) (bool, error) { - if line == "" || line[0] != '+' { - return false, nil + for _, commit := range existingCommits { + if commit.IsTODO() && commit.Hash() != "" { + // Make a copy of the commit; that's necessary to avoid mutating the original commit + // when we later reuse it in the loop at the end of this function. + fullCommits[commit.Hash()] = lo.ToPtr(*commit) } - commit := self.extractCommitFromLine(hashPool, line[1:], false) - fullCommits[commit.Hash()] = commit - return false, nil + } + + commitHashesToFetch := lo.FilterMap(todoCommits, func(commit *models.Commit, _ int) (string, bool) { + return commit.Hash(), commit.Hash() != "" && fullCommits[commit.Hash()] == nil }) - if err != nil { - return nil, err + + if len(commitHashesToFetch) > 0 { + // 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(commitHashesToFetch...). + ToArgv(), + ).DontLog() + + err := cmdObj.RunAndProcessLines(func(line string) (bool, error) { + if line == "" || line[0] != '+' { + return false, nil + } + commit := self.extractCommitFromLine(hashPool, line[1:], false) + fullCommits[commit.Hash()] = commit + return false, nil + }) + if err != nil { + return nil, err + } } findFullCommit := lo.Ternary(todoFileHasShortHashes, diff --git a/pkg/commands/git_commands/commit_loader_test.go b/pkg/commands/git_commands/commit_loader_test.go index 7f9873b0b..d26119720 100644 --- a/pkg/commands/git_commands/commit_loader_test.go +++ b/pkg/commands/git_commands/commit_loader_test.go @@ -538,6 +538,110 @@ func TestCommitLoader_getConflictedCommitImpl(t *testing.T) { } } +func TestCommitLoaderGetHydratedTodoCommitsReusesExistingCommit(t *testing.T) { + hashPool := &utils.StringPool{} + runner := oscommands.NewFakeRunner(t) + loader := &CommitLoader{ + cmd: oscommands.NewDummyCmdObjBuilder(runner), + } + existingCommit := models.NewCommit(hashPool, models.NewCommitOpts{ + Hash: "0123456789012345678901234567890123456789", + Name: "hydrated subject", + AuthorName: "Jane Doe", + AuthorEmail: "jane@example.com", + UnixTimestamp: 1234, + Parents: []string{"1123456789012345678901234567890123456789"}, + Status: models.StatusRebasing, + Action: todo.Pick, + }) + refreshedTodo := models.NewCommit(hashPool, models.NewCommitOpts{ + Hash: existingCommit.Hash(), + Name: "subject from the todo file", + Status: models.StatusConflicted, + Action: todo.Fixup, + ActionFlag: "-C", + }) + + commits, err := loader.getHydratedTodoCommits( + hashPool, + []*models.Commit{refreshedTodo}, + []*models.Commit{existingCommit}, + false, + ) + + assert.NoError(t, err) + assert.Equal(t, []*models.Commit{ + models.NewCommit(hashPool, models.NewCommitOpts{ + Hash: existingCommit.Hash(), + Name: "hydrated subject", + AuthorName: "Jane Doe", + AuthorEmail: "jane@example.com", + UnixTimestamp: 1234, + Parents: []string{"1123456789012345678901234567890123456789"}, + Status: models.StatusConflicted, + Action: todo.Fixup, + ActionFlag: "-C", + }), + }, commits) + assert.Equal(t, todo.Pick, existingCommit.Action) + assert.Equal(t, models.StatusRebasing, existingCommit.Status) + runner.CheckForMissingCalls() +} + +func TestCommitLoaderGetHydratedTodoCommitsLoadsMissingCommit(t *testing.T) { + hashPool := &utils.StringPool{} + existingHash := "0123456789012345678901234567890123456789" + missingHash := "2123456789012345678901234567890123456789" + missingCommitOutput := strings.ReplaceAll( + `+2123456789012345678901234567890123456789|1235|John Doe|john@example.com||>|tag: new|new subject`, + "|", + "\x00", + ) + runner := oscommands.NewFakeRunner(t).ExpectGitArgs( + []string{ + "-c", "log.showSignature=false", "show", "--no-patch", "--oneline", "--abbrev=20", + prettyFormat, missingHash, + }, + missingCommitOutput, + nil, + ) + loader := &CommitLoader{ + cmd: oscommands.NewDummyCmdObjBuilder(runner), + } + existingCommit := models.NewCommit(hashPool, models.NewCommitOpts{ + Hash: existingHash, + Name: "existing subject", + Status: models.StatusRebasing, + Action: todo.Pick, + }) + refreshedTodos := []*models.Commit{ + models.NewCommit(hashPool, models.NewCommitOpts{ + Hash: existingHash, + Status: models.StatusRebasing, + Action: todo.Pick, + }), + models.NewCommit(hashPool, models.NewCommitOpts{ + Hash: missingHash, + Status: models.StatusRebasing, + Action: todo.Edit, + }), + } + + commits, err := loader.getHydratedTodoCommits( + hashPool, + refreshedTodos, + []*models.Commit{existingCommit}, + false, + ) + + assert.NoError(t, err) + assert.Len(t, commits, 2) + assert.Equal(t, "existing subject", commits[0].Name) + assert.Equal(t, "new subject", commits[1].Name) + assert.Equal(t, todo.Edit, commits[1].Action) + runner.CheckForMissingCalls() +} + func TestCommitLoader_setCommitStatuses(t *testing.T) { type scenario struct { testName string diff --git a/pkg/commands/git_commands/commit_test.go b/pkg/commands/git_commands/commit_test.go index 6ea914c64..9b2ddecfb 100644 --- a/pkg/commands/git_commands/commit_test.go +++ b/pkg/commands/git_commands/commit_test.go @@ -255,7 +255,7 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize uint64 similarityThreshold int ignoreWhitespace bool - pagerConfig *config.PagingConfig + diffRendererConfig *config.DiffRendererConfig expected []string } @@ -266,8 +266,8 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: nil, - expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"}, + diffRendererConfig: nil, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"}, }, { testName: "Default case with filter path", @@ -275,8 +275,8 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: nil, - expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--", "file.txt"}, + diffRendererConfig: nil, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--", "file.txt"}, }, { testName: "Show diff with custom context size", @@ -284,8 +284,8 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 77, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: nil, - expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"}, + diffRendererConfig: nil, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=77", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"}, }, { testName: "Show diff with custom similarity threshold", @@ -293,8 +293,8 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 33, ignoreWhitespace: false, - pagerConfig: nil, - expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=33%", "--"}, + diffRendererConfig: nil, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=3", "--find-renames=33%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"}, }, { testName: "Show diff, ignoring whitespace", @@ -302,8 +302,8 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 77, similarityThreshold: 50, ignoreWhitespace: true, - pagerConfig: nil, - 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", "--find-renames=50%", "--"}, + diffRendererConfig: nil, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=77", "--ignore-all-space", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"}, }, { testName: "Show diff with external diff command", @@ -311,8 +311,8 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: &config.PagingConfig{ExternalDiffCommand: "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", "--find-renames=50%", "--"}, + diffRendererConfig: &config.DiffRendererConfig{Type: "extDiff", Command: "difft --color=always"}, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "-c", "diff.noprefix=false", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"}, }, { testName: "Show diff using git's external diff config", @@ -320,16 +320,16 @@ func TestCommitShowCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: &config.PagingConfig{UseExternalDiffGitConfig: true}, - expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"}, + diffRendererConfig: &config.DiffRendererConfig{Type: "extDiff"}, + expected: []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"}, }, } for _, s := range scenarios { t.Run(s.testName, func(t *testing.T) { userConfig := config.GetDefaultConfig() - if s.pagerConfig != nil { - userConfig.Git.Pagers = []config.PagingConfig{*s.pagerConfig} + if s.diffRendererConfig != nil { + userConfig.Git.DiffRenderers = []config.DiffRendererConfig{*s.diffRendererConfig} } userConfig.Git.IgnoreWhitespaceInDiffView = s.ignoreWhitespace userConfig.Git.DiffContextSize = s.contextSize @@ -483,6 +483,11 @@ func TestAddCoAuthorToDescription(t *testing.T) { description: "Body\n\nCo-authored-by: Jane Smith ", expectedResult: "Body\n\nCo-authored-by: Jane Smith \nCo-authored-by: John Doe ", }, + { + name: "Description with trailing newlines", + description: "Body\n\n", + expectedResult: "Body\n\nCo-authored-by: John Doe ", + }, } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { diff --git a/pkg/commands/git_commands/common.go b/pkg/commands/git_commands/common.go index 28dd78e8b..4a8c85213 100644 --- a/pkg/commands/git_commands/common.go +++ b/pkg/commands/git_commands/common.go @@ -1,7 +1,6 @@ package git_commands import ( - gogit "github.com/jesseduffield/go-git/v5" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/config" @@ -9,13 +8,12 @@ import ( type GitCommon struct { *common.Common - version *GitVersion - cmd oscommands.ICmdObjBuilder - os *oscommands.OSCommand - repoPaths *RepoPaths - repo *gogit.Repository - config *ConfigCommands - pagerConfig *config.PagerConfig + version *GitVersion + cmd oscommands.ICmdObjBuilder + os *oscommands.OSCommand + repoPaths *RepoPaths + config *ConfigCommands + diffRendererConfigManager *config.DiffRendererConfigManager } func NewGitCommon( @@ -24,18 +22,16 @@ func NewGitCommon( cmd oscommands.ICmdObjBuilder, osCommand *oscommands.OSCommand, repoPaths *RepoPaths, - repo *gogit.Repository, config *ConfigCommands, - pagerConfig *config.PagerConfig, + diffRendererConfigManager *config.DiffRendererConfigManager, ) *GitCommon { return &GitCommon{ - Common: cmn, - version: version, - cmd: cmd, - os: osCommand, - repoPaths: repoPaths, - repo: repo, - config: config, - pagerConfig: pagerConfig, + Common: cmn, + version: version, + cmd: cmd, + os: osCommand, + repoPaths: repoPaths, + config: config, + diffRendererConfigManager: diffRendererConfigManager, } } diff --git a/pkg/commands/git_commands/config.go b/pkg/commands/git_commands/config.go index a9fd4e147..19f6dcaf5 100644 --- a/pkg/commands/git_commands/config.go +++ b/pkg/commands/git_commands/config.go @@ -1,28 +1,33 @@ package git_commands import ( - gogit "github.com/jesseduffield/go-git/v5" - "github.com/jesseduffield/go-git/v5/config" + "regexp" + "strings" + "github.com/jesseduffield/lazygit/pkg/commands/git_config" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/common" ) +// BranchConfig holds the tracking configuration for a branch. +type BranchConfig struct { + Remote string + Merge string // short ref name of upstream branch +} + type ConfigCommands struct { *common.Common gitConfig git_config.IGitConfig - repo *gogit.Repository } func NewConfigCommands( common *common.Common, gitConfig git_config.IGitConfig, - repo *gogit.Repository, ) *ConfigCommands { return &ConfigCommands{ Common: common, gitConfig: gitConfig, - repo: repo, } } @@ -72,17 +77,102 @@ func (self *ConfigCommands) GetPushToCurrent() bool { } // returns the repo's branches as specified in the git config -func (self *ConfigCommands) Branches() (map[string]*config.Branch, error) { - conf, err := self.repo.Config() +func (self *ConfigCommands) Branches(cmd oscommands.ICmdObjBuilder) map[string]*BranchConfig { + cmdArgs := NewGitCmd("config"). + Arg("--local", "--get-regexp", `^branch\.`).ToArgv() + output, err := cmd.New(cmdArgs).DontLog().RunWithOutput() if err != nil { - return nil, err + // exit code 1 means no matching keys (no branches with config) + return nil } - return conf.Branches, nil + result := make(map[string]*BranchConfig) + for _, line := range strings.Split(output, "\n") { + key, value, found := strings.Cut(strings.TrimSpace(line), " ") + if !found { + continue + } + // key is like "branch..remote" or "branch..merge" + lastDot := strings.LastIndex(key, ".") + // ignore key like branch.autosetuprebase + if lastDot < len("branch.") { + continue + } + configKey := key[lastDot+1:] + branchName := key[len("branch."):lastDot] + if _, ok := result[branchName]; !ok { + result[branchName] = &BranchConfig{} + } + switch configKey { + case "remote": + result[branchName].Remote = value + case "merge": + result[branchName].Merge = strings.TrimPrefix(value, "refs/heads/") + } + } + return result } -func (self *ConfigCommands) GetGitFlowPrefixes() string { - return self.gitConfig.GetGeneral("--local --get-regexp gitflow.prefix") +// git-flow config key patterns: legacy uses gitflow.prefix., git-flow-next uses gitflow.branch..prefix +const ( + gitFlowLegacyConfigArgs = "--local --get-regexp gitflow.prefix" + gitFlowNextConfigArgs = "--local --get-regexp gitflow\\.branch\\..*\\.prefix" +) + +func (self *ConfigCommands) getGitFlowPrefixes() string { + return self.gitConfig.GetGeneral(gitFlowLegacyConfigArgs) +} + +func (self *ConfigCommands) getGitFlowNextPrefixes() string { + return self.gitConfig.GetGeneral(gitFlowNextConfigArgs) +} + +// parseGitFlowLines parses lines matching re (submatch 1 = branch type, 2 = prefix) into prefixToType. +// When overwrite is false, existing keys are left unchanged so legacy entries win over next. +func parseGitFlowLines(output string, re *regexp.Regexp, prefixToType map[string]string, overwrite bool) { + for line := range strings.SplitSeq(output, "\n") { + line = strings.TrimSpace(line) + if line == "" { + continue + } + if m := re.FindStringSubmatch(line); len(m) == 3 { + prefix := normalizeGitFlowPrefix(m[2]) + if prefix == "" { + continue + } + if overwrite || prefixToType[prefix] == "" { + prefixToType[prefix] = m[1] + } + } + } +} + +// parseGitFlowPrefixMap parses legacy and git-flow-next config output into a unified prefix → branchType map. +// Legacy line format: "gitflow.prefix. " +// Next line format: "gitflow.branch..prefix " +// Prefixes are normalized to end in "/". Legacy entries win on duplicate prefix. +func parseGitFlowPrefixMap(legacyOutput, nextOutput string) map[string]string { + legacyRegexp := regexp.MustCompile(`gitflow\.prefix\.(\S+)\s+(.*)`) + nextRegexp := regexp.MustCompile(`gitflow\.branch\.([^.]+)\.prefix\s+(.*)`) + prefixToType := make(map[string]string) + parseGitFlowLines(legacyOutput, legacyRegexp, prefixToType, true) + parseGitFlowLines(nextOutput, nextRegexp, prefixToType, false) + return prefixToType +} + +func normalizeGitFlowPrefix(prefix string) string { + prefix = strings.TrimSpace(prefix) + if prefix == "" { + return "" + } + if !strings.HasSuffix(prefix, "/") { + return prefix + "/" + } + return prefix +} + +func (self *ConfigCommands) GetGitFlowPrefixMap() map[string]string { + return parseGitFlowPrefixMap(self.getGitFlowPrefixes(), self.getGitFlowNextPrefixes()) } func (self *ConfigCommands) GetCoreCommentChar() byte { diff --git a/pkg/commands/git_commands/config_test.go b/pkg/commands/git_commands/config_test.go new file mode 100644 index 000000000..4ec121aed --- /dev/null +++ b/pkg/commands/git_commands/config_test.go @@ -0,0 +1,127 @@ +package git_commands + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/git_config" + "github.com/jesseduffield/lazygit/pkg/common" + "github.com/stretchr/testify/assert" +) + +func TestParseGitFlowPrefixMap(t *testing.T) { + type scenario struct { + testName string + legacyOutput string + nextOutput string + expected map[string]string + } + scenarios := []scenario{ + { + testName: "empty inputs", + legacyOutput: "", + nextOutput: "", + expected: map[string]string{}, + }, + { + testName: "legacy only", + legacyOutput: "gitflow.prefix.feature feature/\ngitflow.prefix.hotfix hotfix/", + nextOutput: "", + expected: map[string]string{"feature/": "feature", "hotfix/": "hotfix"}, + }, + { + testName: "next only", + legacyOutput: "", + nextOutput: "gitflow.branch.feature.prefix feature/\ngitflow.branch.release.prefix release/", + expected: map[string]string{"feature/": "feature", "release/": "release"}, + }, + { + testName: "legacy wins on duplicate prefix", + legacyOutput: "gitflow.prefix.foo feature/", + nextOutput: "gitflow.branch.bar.prefix feature/", + expected: map[string]string{"feature/": "foo"}, + }, + { + testName: "prefix normalized with trailing slash from legacy", + legacyOutput: "gitflow.prefix.feature feature", + nextOutput: "", + expected: map[string]string{"feature/": "feature"}, + }, + { + testName: "malformed legacy lines skipped", + legacyOutput: "gitflow.prefix.feature feature/\nnot-a-valid-line\ngitflow.prefix.hotfix hotfix/", + nextOutput: "", + expected: map[string]string{"feature/": "feature", "hotfix/": "hotfix"}, + }, + { + testName: "blank lines and whitespace ignored", + legacyOutput: " \n gitflow.prefix.feature feature/ \n \n ", + nextOutput: "", + expected: map[string]string{"feature/": "feature"}, + }, + } + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + got := parseGitFlowPrefixMap(s.legacyOutput, s.nextOutput) + assert.Equal(t, s.expected, got) + }) + } +} + +func TestGetGitFlowPrefixMap(t *testing.T) { + type scenario struct { + testName string + gitConfigMockResponses map[string]string + expected map[string]string + } + scenarios := []scenario{ + { + testName: "empty when both queries empty", + gitConfigMockResponses: nil, + expected: map[string]string{}, + }, + { + testName: "correct map from legacy-only output", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/\ngitflow.prefix.hotfix hotfix/", + }, + expected: map[string]string{"feature/": "feature", "hotfix/": "hotfix"}, + }, + { + testName: "correct map from git-flow-next-only output", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow\\.branch\\..*\\.prefix": "gitflow.branch.feature.prefix feature/\ngitflow.branch.release.prefix release/", + }, + expected: map[string]string{"feature/": "feature", "release/": "release"}, + }, + { + testName: "merged map with legacy winning when both have same prefix", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow.prefix": "gitflow.prefix.foo feature/", + "--local --get-regexp gitflow\\.branch\\..*\\.prefix": "gitflow.branch.bar.prefix feature/", + }, + expected: map[string]string{"feature/": "foo"}, + }, + { + testName: "prefix normalized with trailing slash", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature", + }, + expected: map[string]string{"feature/": "feature"}, + }, + { + testName: "malformed lines skipped", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/\nnot-a-valid-line\n", + }, + expected: map[string]string{"feature/": "feature"}, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + config := NewConfigCommands(common.NewDummyCommon(), git_config.NewFakeGitConfig(s.gitConfigMockResponses)) + got := config.GetGitFlowPrefixMap() + assert.Equal(t, s.expected, got) + }) + } +} diff --git a/pkg/commands/git_commands/deps_test.go b/pkg/commands/git_commands/deps_test.go index 3c4bd5a14..91332cff6 100644 --- a/pkg/commands/git_commands/deps_test.go +++ b/pkg/commands/git_commands/deps_test.go @@ -4,7 +4,6 @@ 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/oscommands" "github.com/jesseduffield/lazygit/pkg/common" @@ -20,6 +19,8 @@ type commonDeps struct { gitConfig *git_config.FakeGitConfig getenv func(string) string removeFile func(string) error + isDirEmpty func(string) (bool, error) + removeDir func(string) error common *common.Common cmd *oscommands.CmdObjBuilder fs afero.Fs @@ -61,7 +62,7 @@ func buildGitCommon(deps commonDeps) *GitCommon { gitCommon.Common.SetUserConfig(config.GetDefaultConfig()) } - gitCommon.pagerConfig = config.NewPagerConfig(func() *config.UserConfig { + gitCommon.diffRendererConfigManager = config.NewDiffRendererConfigManager(func() *config.UserConfig { return gitCommon.Common.UserConfig() }) @@ -75,8 +76,7 @@ func buildGitCommon(deps commonDeps) *GitCommon { gitConfig = git_config.NewFakeGitConfig(nil) } - gitCommon.repo = buildRepo() - gitCommon.config = NewConfigCommands(gitCommon.Common, gitConfig, gitCommon.repo) + gitCommon.config = NewConfigCommands(gitCommon.Common, gitConfig) getenv := deps.getenv if getenv == nil { @@ -88,23 +88,29 @@ func buildGitCommon(deps commonDeps) *GitCommon { removeFile = func(string) error { return errors.New("unexpected call to removeFile") } } + isDirEmpty := deps.isDirEmpty + if isDirEmpty == nil { + isDirEmpty = func(string) (bool, error) { return false, nil } + } + + removeDir := deps.removeDir + if removeDir == nil { + removeDir = func(string) error { return errors.New("unexpected call to removeDir") } + } + gitCommon.os = oscommands.NewDummyOSCommandWithDeps(oscommands.OSCommandDeps{ Common: gitCommon.Common, GetenvFn: getenv, Cmd: cmd, RemoveFileFn: removeFile, + IsDirEmptyFn: isDirEmpty, + RemoveDirFn: removeDir, TempDir: os.TempDir(), }) return gitCommon } -func buildRepo() *gogit.Repository { - // TODO: think of a way to actually mock this out - var repo *gogit.Repository - return repo -} - func buildFileLoader(gitCommon *GitCommon) *FileLoader { return NewFileLoader(gitCommon, gitCommon.cmd, gitCommon.config) } @@ -162,6 +168,12 @@ func buildBranchCommands(deps commonDeps) *BranchCommands { return NewBranchCommands(gitCommon) } +func buildStatusCommands(deps commonDeps) *StatusCommands { + gitCommon := buildGitCommon(deps) + + return NewStatusCommands(gitCommon) +} + func buildFlowCommands(deps commonDeps) *FlowCommands { gitCommon := buildGitCommon(deps) diff --git a/pkg/commands/git_commands/diff.go b/pkg/commands/git_commands/diff.go index 3074e653a..d532f1bbb 100644 --- a/pkg/commands/git_commands/diff.go +++ b/pkg/commands/git_commands/diff.go @@ -17,22 +17,14 @@ func NewDiffCommands(gitCommon *GitCommon) *DiffCommands { } // This is for generating diffs to be shown in the UI (e.g. rendering a range -// diff to the main view). It uses a custom pager if one is configured. +// diff to the main view). It uses a custom diff renderer if one is configured. func (self *DiffCommands) DiffCmdObj(diffArgs []string) *oscommands.CmdObj { - extDiffCmd := self.pagerConfig.GetExternalDiffCommand() - useExtDiff := extDiffCmd != "" - useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() - ignoreWhitespace := self.UserConfig().Git.IgnoreWhitespaceInDiffView - return self.cmd.New( NewGitCmd("diff"). Config("diff.noprefix=false"). - ConfigIf(useExtDiff, "diff.external="+extDiffCmd). - ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff"). + AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), true). Arg("--submodule"). - Arg(fmt.Sprintf("--color=%s", self.pagerConfig.GetColorArg())). - ArgIf(ignoreWhitespace, "--ignore-all-space"). - Arg(fmt.Sprintf("--unified=%d", self.UserConfig().Git.DiffContextSize)). + Arg(fmt.Sprintf("--color=%s", self.diffRendererConfigManager.GetColorArg())). Arg(diffArgs...). Dir(self.repoPaths.worktreePath). ToArgv(), @@ -40,8 +32,8 @@ func (self *DiffCommands) DiffCmdObj(diffArgs []string) *oscommands.CmdObj { } // This is a basic generic diff command that can be used for any diff operation -// (e.g. copying a diff to the clipboard). It will not use a custom pager, and -// does not use user configs such as ignore whitespace. +// (e.g. copying a diff to the clipboard). It will not use a custom diff renderer, +// and does not use user configs such as ignore whitespace. // If you want to diff specific refs (one or two), you need to add them yourself // in additionalArgs; it is recommended to also pass `--` after that. If you // want to restrict the diff to specific paths, pass them in additionalArgs diff --git a/pkg/commands/git_commands/file.go b/pkg/commands/git_commands/file.go index 1b5f5b2dd..00f46e821 100644 --- a/pkg/commands/git_commands/file.go +++ b/pkg/commands/git_commands/file.go @@ -2,6 +2,7 @@ package git_commands import ( "os" + "path/filepath" "strconv" "strings" @@ -93,7 +94,7 @@ func (self *FileCommands) guessDefaultEditor() string { // 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] + editor = filepath.Base(strings.Split(editor, " ")[0]) } return editor diff --git a/pkg/commands/git_commands/file_loader.go b/pkg/commands/git_commands/file_loader.go index 36ab8ef67..747572b38 100644 --- a/pkg/commands/git_commands/file_loader.go +++ b/pkg/commands/git_commands/file_loader.go @@ -2,12 +2,12 @@ package git_commands import ( "fmt" - "path/filepath" "strconv" "strings" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/samber/lo" ) type FileLoaderConfig interface { @@ -36,6 +36,12 @@ type GetStatusFileOptions struct { // This is useful for users with bare repos for dotfiles who default to hiding untracked files, // but want to occasionally see them to `git add` a new file. ForceShowUntracked bool + // When true, this status is part of an unattended background refresh, so it + // keeps the default suppression of optional locks (avoiding index.lock + // contention with git commands the user runs in a terminal, at the cost of + // not persisting git's refreshed stat-cache). A foreground status opts back + // in; see gitStatus. + Background bool } func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File { @@ -47,7 +53,7 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File } untrackedFilesArg := fmt.Sprintf("--untracked-files=%s", untrackedFilesSetting) - statuses, err := self.gitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg}) + statuses, err := self.gitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg, Background: opts.Background}) if err != nil { self.Log.Error(err) } @@ -82,27 +88,66 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File 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.Path) - 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.Path = strings.TrimSuffix(file.Path, "/") - break - } + self.setConflictMarkerSizes(files) + + return files +} + +// Looks up how long the conflict markers in the conflicted files are. We ask +// git for all of them at once, because spawning a process per file would be +// painfully slow when hundreds of files are conflicted (especially on Windows). +func (self *FileLoader) setConflictMarkerSizes(files []*models.File) { + conflictedFiles := lo.Filter(files, func(file *models.File, _ int) bool { + return file.HasInlineMergeConflicts + }) + if len(conflictedFiles) == 0 { + return + } + + paths := lo.Map(conflictedFiles, func(file *models.File, _ int) string { + return file.Path + }) + + markerSizes, err := self.getConflictMarkerSizes(paths) + if err != nil { + self.Log.Error(err) + return + } + + for _, file := range conflictedFiles { + file.ConflictMarkerSize = markerSizes[file.Path] + } +} + +func (self *FileLoader) getConflictMarkerSizes(paths []string) (map[string]int, error) { + cmdArgs := NewGitCmd("check-attr"). + Arg("-z"). + Arg("--stdin"). + Arg("conflict-marker-size"). + ToArgv() + + // -z makes git both read the paths and write its output NUL-separated, so + // that paths containing newlines don't throw us off. + output, _, err := self.cmd.New(cmdArgs). + SetStdin(strings.Join(paths, "\x00")). + DontLog(). + RunWithOutputs() + if err != nil { + return nil, err + } + + markerSizes := map[string]int{} + fields := strings.Split(output, "\x00") + // Each path yields a path/attribute/value triple; the value is either a + // number or something like "unspecified", in which case we leave the marker + // size at 0 to say that git's default applies. + for i := 0; i+2 < len(fields); i += 3 { + if markerSize, err := strconv.Atoi(fields[i+2]); err == nil && markerSize > 0 { + markerSizes[fields[i]] = markerSize } } - return files + return markerSizes, nil } type FileDiff struct { @@ -148,6 +193,7 @@ func (self *FileLoader) getFileDiffs() (map[string]FileDiff, error) { type GitStatusOptions struct { NoRenames bool UntrackedFilesArg string + Background bool } type FileStatus struct { @@ -179,7 +225,17 @@ func (self *FileLoader) gitStatus(opts GitStatusOptions) ([]FileStatus, error) { ). ToArgv() - statusLines, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs() + cmdObj := self.cmd.New(cmdArgs).DontLog() + if !opts.Background { + // Every git command suppresses optional locks by default (see + // OptionalLocksEnvVar). A foreground refresh is the one exception: we let + // it take the lock so it persists git's refreshed stat-cache, which keeps + // subsequent status calls fast. Background refreshes leave it suppressed so + // they can't contend for index.lock. + cmdObj.RemoveEnvVar(OptionalLocksEnvVar) + } + + statusLines, _, err := cmdObj.RunWithOutputs() if err != nil { return []FileStatus{}, err } diff --git a/pkg/commands/git_commands/file_loader_test.go b/pkg/commands/git_commands/file_loader_test.go index ec1f502f1..23602ff9e 100644 --- a/pkg/commands/git_commands/file_loader_test.go +++ b/pkg/commands/git_commands/file_loader_test.go @@ -37,6 +37,10 @@ func TestFileGetStatusFiles(t *testing.T) { ExpectGitArgs([]string{"diff", "--numstat", "-z", "HEAD"}, "4\t1\tfile1.txt\x001\t0\tfile2.txt\x002\t2\tfile3.txt\x000\t2\tfile4.txt\x002\t2\tfile5.txt", nil, + ). + ExpectGitArgs([]string{"check-attr", "-z", "--stdin", "conflict-marker-size"}, + "file5.txt\x00conflict-marker-size\x00unspecified\x00", + nil, ), showNumstatInFilesView: true, expectedFiles: []*models.File{ @@ -112,6 +116,58 @@ func TestFileGetStatusFiles(t *testing.T) { }, }, }, + { + testName: "Conflicted files with a conflict-marker-size attribute", + similarityThreshold: 50, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"}, + "UU file1.txt\x00UU file2.txt\x00UU file3.txt\x00 M file4.txt", + nil, + ). + ExpectGitArgs([]string{"check-attr", "-z", "--stdin", "conflict-marker-size"}, + "file1.txt\x00conflict-marker-size\x0032\x00"+ + "file2.txt\x00conflict-marker-size\x00unspecified\x00"+ + "file3.txt\x00conflict-marker-size\x00nonsense\x00", + nil, + ), + expectedFiles: []*models.File{ + { + Path: "file1.txt", + HasUnstagedChanges: true, + Tracked: true, + HasMergeConflicts: true, + HasInlineMergeConflicts: true, + ConflictMarkerSize: 32, + DisplayString: "UU file1.txt", + ShortStatus: "UU", + }, + { + Path: "file2.txt", + HasUnstagedChanges: true, + Tracked: true, + HasMergeConflicts: true, + HasInlineMergeConflicts: true, + DisplayString: "UU file2.txt", + ShortStatus: "UU", + }, + { + Path: "file3.txt", + HasUnstagedChanges: true, + Tracked: true, + HasMergeConflicts: true, + HasInlineMergeConflicts: true, + DisplayString: "UU file3.txt", + ShortStatus: "UU", + }, + { + Path: "file4.txt", + HasUnstagedChanges: true, + Tracked: true, + DisplayString: " M file4.txt", + ShortStatus: " M", + }, + }, + }, { testName: "File with new line char", similarityThreshold: 50, diff --git a/pkg/commands/git_commands/file_test.go b/pkg/commands/git_commands/file_test.go index 5dd3d133c..8f91f797c 100644 --- a/pkg/commands/git_commands/file_test.go +++ b/pkg/commands/git_commands/file_test.go @@ -203,6 +203,17 @@ func TestGuessDefaultEditor(t *testing.T) { }, expectedResult: "bbedit", }, + { + gitConfigMockResponses: nil, + getenv: func(env string) string { + if env == "EDITOR" { + return "/usr/bin/nvim" + } + + return "" + }, + expectedResult: "nvim", + }, } for _, s := range scenarios { diff --git a/pkg/commands/git_commands/flow.go b/pkg/commands/git_commands/flow.go index fc00c11a1..ccf0149de 100644 --- a/pkg/commands/git_commands/flow.go +++ b/pkg/commands/git_commands/flow.go @@ -1,7 +1,6 @@ package git_commands import ( - "regexp" "strings" "github.com/go-errors/errors" @@ -21,30 +20,19 @@ func NewFlowCommands( } func (self *FlowCommands) GitFlowEnabled() bool { - return self.config.GetGitFlowPrefixes() != "" + return len(self.config.GetGitFlowPrefixMap()) > 0 } func (self *FlowCommands) FinishCmdObj(branchName string) (*oscommands.CmdObj, error) { - prefixes := self.config.GetGitFlowPrefixes() + prefixMap := self.config.GetGitFlowPrefixMap() - // need to find out what kind of branch this is - prefix := strings.SplitAfterN(branchName, "/", 2)[0] - suffix := strings.Replace(branchName, prefix, "", 1) - - branchType := "" - for line := range strings.SplitSeq(strings.TrimSpace(prefixes), "\n") { - if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) { - - regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*") - matches := regex.FindAllStringSubmatch(line, 1) - - if len(matches) > 0 && len(matches[0]) > 1 { - branchType = matches[0][1] - break - } - } + prefixPart, suffix, ok := strings.Cut(branchName, "/") + if !ok || prefixPart == "" || suffix == "" { + return nil, errors.New(self.Tr.NotAGitFlowBranch) } + prefix := prefixPart + "/" + branchType := prefixMap[prefix] if branchType == "" { return nil, errors.New(self.Tr.NotAGitFlowBranch) } diff --git a/pkg/commands/git_commands/flow_test.go b/pkg/commands/git_commands/flow_test.go index 911f50c7e..2dab0a43e 100644 --- a/pkg/commands/git_commands/flow_test.go +++ b/pkg/commands/git_commands/flow_test.go @@ -7,17 +7,56 @@ import ( "github.com/stretchr/testify/assert" ) +func TestGitFlowEnabled(t *testing.T) { + type scenario struct { + testName string + expected bool + gitConfigMockResponses map[string]string + } + scenarios := []scenario{ + { + testName: "disabled when no config", + expected: false, + gitConfigMockResponses: nil, + }, + { + testName: "enabled with legacy config", + expected: true, + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/", + }, + }, + { + testName: "enabled with git-flow-next only config", + expected: true, + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow\\.branch\\..*\\.prefix": "gitflow.branch.feature.prefix feature/", + }, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + instance := buildFlowCommands(commonDeps{ + gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses), + }) + assert.Equal(t, s.expected, instance.GitFlowEnabled()) + }) + } +} + func TestStartCmdObj(t *testing.T) { - scenarios := []struct { + type scenario struct { testName string branchType string - name string + branchName string expected []string - }{ + } + scenarios := []scenario{ { testName: "basic", branchType: "feature", - name: "test", + branchName: "test", expected: []string{"git", "flow", "feature", "start", "test"}, }, } @@ -27,7 +66,7 @@ func TestStartCmdObj(t *testing.T) { instance := buildFlowCommands(commonDeps{}) assert.Equal(t, - instance.StartCmdObj(s.branchType, s.name).Args(), + instance.StartCmdObj(s.branchType, s.branchName).Args(), s.expected, ) }) @@ -35,13 +74,14 @@ func TestStartCmdObj(t *testing.T) { } func TestFinishCmdObj(t *testing.T) { - scenarios := []struct { + type scenario struct { testName string branchName string expected []string expectedError string gitConfigMockResponses map[string]string - }{ + } + scenarios := []scenario{ { testName: "not a git flow branch", branchName: "mybranch", @@ -57,7 +97,7 @@ func TestFinishCmdObj(t *testing.T) { gitConfigMockResponses: nil, }, { - testName: "feature branch with config", + testName: "feature branch with legacy config", branchName: "feature/mybranch", expected: []string{"git", "flow", "feature", "finish", "mybranch"}, expectedError: "", @@ -65,6 +105,25 @@ func TestFinishCmdObj(t *testing.T) { "--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/", }, }, + { + testName: "feature branch with git-flow-next only config", + branchName: "feature/mybranch", + expected: []string{"git", "flow", "feature", "finish", "mybranch"}, + expectedError: "", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow\\.branch\\..*\\.prefix": "gitflow.branch.feature.prefix feature/", + }, + }, + { + testName: "legacy wins when both configs have same prefix", + branchName: "feature/mybranch", + expected: []string{"git", "flow", "foo", "finish", "mybranch"}, + expectedError: "", + gitConfigMockResponses: map[string]string{ + "--local --get-regexp gitflow.prefix": "gitflow.prefix.foo feature/", + "--local --get-regexp gitflow\\.branch\\..*\\.prefix": "gitflow.branch.bar.prefix feature/", + }, + }, } for _, s := range scenarios { @@ -76,15 +135,12 @@ func TestFinishCmdObj(t *testing.T) { 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) + assert.Error(t, err) + assert.Equal(t, s.expectedError, err.Error()) + return } + assert.NoError(t, err) + assert.Equal(t, s.expected, cmd.Args()) }) } } diff --git a/pkg/commands/git_commands/git_command_builder.go b/pkg/commands/git_commands/git_command_builder.go index 5e9c3b258..f1a7c87b4 100644 --- a/pkg/commands/git_commands/git_command_builder.go +++ b/pkg/commands/git_commands/git_command_builder.go @@ -1,9 +1,33 @@ package git_commands import ( + "fmt" "strings" + + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/env" ) +// OptionalLocksEnvVar is the name of the environment variable that tells git +// whether it may take "optional" locks — chiefly the index.lock that `git +// status` grabs to write back a refreshed stat-cache. We set it to 0 on every +// git command by default (see NewGitCmdObjBuilder) so our invocations never +// contend for index.lock, neither with each other (e.g. a main-view `git diff +// --submodule`, which runs `git status` inside submodules, racing a submodule +// action) nor with git commands the user runs in a terminal. The one command +// that opts back in is the foreground files refresh; see FileLoader.gitStatus. +const OptionalLocksEnvVar = "GIT_OPTIONAL_LOCKS" + +// forOtherRepo prepares a command that operates on a repo other than the one +// we have open — a submodule, or another worktree. GIT_DIR and GIT_WORK_TREE +// say where our repo is, and every command we run inherits them, so a command +// pointed at a different repo would be resolved against ours instead: `git -C +// log` would silently log the superproject's commits. +func forOtherRepo(cmdObj *oscommands.CmdObj) *oscommands.CmdObj { + return cmdObj.RemoveEnvVar(env.GitDirEnvVar).RemoveEnvVar(env.GitWorkTreeEnvVar) +} + // convenience struct for building git commands. Especially useful when // including conditional args type GitCommandBuilder struct { @@ -99,6 +123,20 @@ func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommand return self } +func (self *GitCommandBuilder) AddCommonDiffArgs(diffRendererConfigManager *config.DiffRendererConfigManager, userConfig *config.UserConfig, forUI bool) *GitCommandBuilder { + contextSize := userConfig.Git.DiffContextSize + extDiffCmd := diffRendererConfigManager.GetExternalDiffCommand(contextSize) + useExtDiff := forUI && diffRendererConfigManager.GetDiffRendererType() == config.DiffRendererType_ExtDiff + + return self. + ConfigIf(forUI && extDiffCmd != "", "diff.external="+extDiffCmd). + ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff"). + Arg(fmt.Sprintf("--unified=%d", contextSize)). + ArgIf(forUI && userConfig.Git.IgnoreWhitespaceInDiffView, "--ignore-all-space"). + Arg(fmt.Sprintf("--find-renames=%d%%", userConfig.Git.RenameSimilarityThreshold)). + ArgIf(forUI, diffRendererConfigManager.GetRawGitArgs()...) +} + func (self *GitCommandBuilder) ToArgv() []string { return append([]string{"git"}, self.args...) } @@ -106,3 +144,30 @@ func (self *GitCommandBuilder) ToArgv() []string { func (self *GitCommandBuilder) ToString() string { return strings.Join(self.ToArgv(), " ") } + +// runGitCmdOnPaths runs `git -- `, splitting into +// multiple calls if needed to stay under the OS command-line length limit. +// Windows CreateProcess has a ~32 KB limit; we use 30 KB as a safe threshold. +func runGitCmdOnPaths(subcommand string, paths []string, cmd oscommands.ICmdObjBuilder) error { + const maxArgBytes = 30_000 + + start := 0 + for start < len(paths) { + end := start + total := 0 + for end < len(paths) { + total += len(paths[end]) + 1 // +1 for the separating space + if total > maxArgBytes && end > start { + break + } + end++ + } + if err := cmd.New(NewGitCmd(subcommand).Arg("--"). + Arg(paths[start:end]...). + ToArgv()).Run(); err != nil { + return err + } + start = end + } + return nil +} diff --git a/pkg/commands/git_commands/git_command_builder_test.go b/pkg/commands/git_commands/git_command_builder_test.go index 69d41854c..a839afb9a 100644 --- a/pkg/commands/git_commands/git_command_builder_test.go +++ b/pkg/commands/git_commands/git_command_builder_test.go @@ -1,8 +1,10 @@ package git_commands import ( + "strings" "testing" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/stretchr/testify/assert" ) @@ -54,3 +56,44 @@ func TestGitCommandBuilder(t *testing.T) { assert.Equal(t, s.input, s.expected) } } + +func TestRunGitCmdOnPaths(t *testing.T) { + // Each path is 9000 bytes. Three fit within the 30 KB limit (27001 bytes + // including spaces), four do not (36002 bytes), so a four-path slice must + // be split into two calls of three and one. + longPath := func(ch string) string { return strings.Repeat(ch, 9_000) } + p1, p2, p3, p4 := longPath("a"), longPath("b"), longPath("c"), longPath("d") + + scenarios := []struct { + name string + paths []string + runner *oscommands.FakeCmdObjRunner + }{ + { + name: "empty list makes no calls", + paths: []string{}, + runner: oscommands.NewFakeRunner(t), + }, + { + name: "paths that fit in one batch make a single call", + paths: []string{p1, p2, p3}, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(append([]string{"checkout", "--"}, p1, p2, p3), "", nil), + }, + { + name: "paths that exceed the limit are split across multiple calls", + paths: []string{p1, p2, p3, p4}, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(append([]string{"checkout", "--"}, p1, p2, p3), "", nil). + ExpectGitArgs(append([]string{"checkout", "--"}, p4), "", nil), + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + cmd := oscommands.NewDummyCmdObjBuilder(s.runner) + assert.NoError(t, runGitCmdOnPaths("checkout", s.paths, cmd)) + s.runner.CheckForMissingCalls() + }) + } +} diff --git a/pkg/commands/git_commands/github.go b/pkg/commands/git_commands/github.go new file mode 100644 index 000000000..2b0568685 --- /dev/null +++ b/pkg/commands/git_commands/github.go @@ -0,0 +1,417 @@ +package git_commands + +import ( + "bytes" + "encoding/json" + "fmt" + "io" + "net/http" + "os" + "os/exec" + "regexp" + "strings" + "time" + + "github.com/cli/go-gh/v2/pkg/auth" + "github.com/jesseduffield/lazygit/pkg/commands/hosting_service" + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/samber/lo" + "golang.org/x/sync/errgroup" +) + +type GitHubCommands struct { + *GitCommon +} + +func NewGitHubCommands(gitCommon *GitCommon) *GitHubCommands { + return &GitHubCommands{ + GitCommon: gitCommon, + } +} + +// https://github.com/cli/cli/issues/2300 +func (self *GitHubCommands) ConfiguredBaseRemoteName() string { + // TODO: we only support the (common) case where the value of the config is "base", meaning that + // the remote's URL determines the GitHub repo. Since `gh repo set-default` on the command line + // sets the config this way, it's probably good enough in practice, but for completeness it + // would be nice to also support the case where the config value is a full remote name (e.g. + // "jesseduffield/lazygit"). + + cmdArgs := NewGitCmd("config"). + Arg("--local", "--get-regexp", `remote\..*\.gh-resolved`). + ToArgv() + + output, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs() + if err != nil { + return "" + } + + regex := regexp.MustCompile(`remote\.(.+)\.gh-resolved`) + matches := regex.FindStringSubmatch(output) + if len(matches) < 2 { + return "" + } + + return matches[1] +} + +func (self *GitHubCommands) SetConfiguredBaseRemoteName(remoteName string) error { + cmdArgs := NewGitCmd("config"). + Arg("--local", "--add", fmt.Sprintf("remote.%s.gh-resolved", remoteName), "base"). + ToArgv() + + return self.cmd.New(cmdArgs).DontLog().Run() +} + +type Response struct { + Data RepositoryQuery `json:"data"` +} + +type RepositoryQuery struct { + Repository map[string]PullRequest `json:"repository"` +} + +type PullRequest struct { + Edges []PullRequestEdge `json:"edges"` +} + +type PullRequestEdge struct { + Node PullRequestNode `json:"node"` +} + +type PullRequestNode struct { + Title string `json:"title"` + HeadRefName string `json:"headRefName"` + Number int `json:"number"` + Url string `json:"url"` + HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"` + State string `json:"state"` + IsDraft bool `json:"isDraft"` + HeadRef GithubRef `json:"headRef"` +} + +type GithubRepositoryOwner struct { + Login string `json:"login"` +} + +type GithubRef struct { + Target GithubGitObject `json:"target"` +} + +type GithubGitObject struct { + StatusCheckRollup GithubStatusCheckRollup `json:"statusCheckRollup"` +} + +type GithubStatusCheckRollup struct { + State string `json:"state"` +} + +type graphQLRequest struct { + Query string `json:"query"` + Variables map[string]string `json:"variables"` +} + +func fetchPullRequestsQuery(branches []string, owner string, repo string) (string, map[string]string) { + variables := make(map[string]string, len(branches)+2) + variables["owner"] = owner + variables["repo"] = repo + varDecls := make([]string, 0, len(branches)+2) + varDecls = append(varDecls, "$owner: String!", "$repo: String!") + queries := make([]string, 0, len(branches)) + for i, branch := range branches { + // We're making a sub-query per branch, and arbitrarily labelling each subquery + // as a1, a2, etc. + fieldName := fmt.Sprintf("a%d", i+1) + varName := fmt.Sprintf("branch%d", i+1) + variables[varName] = branch + varDecls = append(varDecls, fmt.Sprintf("$%s: String!", varName)) + // We fetch a few PRs per branch name because multiple forks may have PRs + // with the same head ref name. The mapping logic filters by owner later. + queries = append(queries, fmt.Sprintf(`%s: pullRequests(first: 5, headRefName: $%s, orderBy: {field: CREATED_AT, direction: DESC}) { + edges { + node { + title + headRefName + state + number + url + isDraft + headRef { + target { + ... on Commit { + statusCheckRollup { + state + } + } + } + } + headRepositoryOwner { + login + } + } + } + }`, fieldName, varName)) + } + + queryString := fmt.Sprintf(`query(%s) { + repository(owner: $owner, name: $repo) { + %s + } +}`, strings.Join(varDecls, ", "), strings.Join(queries, "\n")) + + return queryString, variables +} + +// GetAuthToken returns the token to authenticate against the given host with, +// or an empty string if there is none. +// +// The token has to come from gh itself rather than from an in-process lookup +// with go-gh: that reads gh's config file once per process and answers from +// that snapshot ever after, whereas gh rewrites the file whenever the active +// account changes, and keeps the active account's token either there or in the +// system keyring. Under a long-running lazygit the snapshot therefore drifts +// out of date, leaving us with a token for an account that is no longer active, +// or with no token at all. +func (self *GitHubCommands) GetAuthToken(host string) string { + ghExe := ghExecutable() + if ghExe == "" { + // Without gh installed, the environment variables and config file that + // gh would have consulted are still worth a look. + token, _ := auth.TokenFromEnvOrConfig(host) + return token + } + + cmdArgs := []string{ghExe, "auth", "token", "--hostname", host} + output, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs() + if err != nil { + // Not being logged in to this host is a normal state rather than + // something to report; the runner logs gh's stderr for the rest. + return "" + } + + return strings.TrimSpace(output) +} + +// ghExecutable returns the path of the gh binary, or an empty string if it +// isn't installed. +func ghExecutable() string { + if ghExe := os.Getenv("GH_PATH"); ghExe != "" { + return ghExe + } + + // A gh found in the current directory rather than on PATH comes back as + // exec.ErrDot, which we treat as not having found one at all. + ghExe, err := exec.LookPath("gh") + if err != nil { + return "" + } + + return ghExe +} + +// FetchRecentPRs fetches recent pull requests using GraphQL. serviceInfo +// identifies the GitHub instance (github.com or a GitHub Enterprise Server) +// and the owner/repo to query against. +func (self *GitHubCommands) FetchRecentPRs(branches []string, serviceInfo *hosting_service.ServiceInfo, token string) ([]*models.GithubPullRequest, error) { + endpoint := graphQLEndpoint(serviceInfo.WebDomain) + t := time.Now() + + var g errgroup.Group + + // We want at most 5 concurrent requests, but no less than 10 branches per request + concurrency := 5 + minBranchesPerRequest := 10 + branchesPerRequest := max(len(branches)/concurrency, minBranchesPerRequest) + numChunks := (len(branches) + branchesPerRequest - 1) / branchesPerRequest + results := make(chan []*models.GithubPullRequest, numChunks) + + for i := 0; i < len(branches); i += branchesPerRequest { + end := i + branchesPerRequest + if end > len(branches) { + end = len(branches) + } + branchChunk := branches[i:end] + + // Launch a goroutine for each chunk of branches + g.Go(func() error { + prs, err := self.fetchRecentPRsAux(endpoint, serviceInfo.Owner, serviceInfo.Repository, branchChunk, token) + if err != nil { + return err + } + results <- prs + return nil + }) + } + + // Wait for all goroutines, then close the channel so the range loop exits + err := g.Wait() + close(results) + if err != nil { + return nil, err + } + + // Collect results from all goroutines + var allPRs []*models.GithubPullRequest + for prs := range results { + allPRs = append(allPRs, prs...) + } + + self.Log.Infof("Fetched %d PRs in %s", len(allPRs), time.Since(t)) + + return allPRs, nil +} + +func (self *GitHubCommands) fetchRecentPRsAux(endpoint string, repoOwner string, repoName string, branches []string, token string) ([]*models.GithubPullRequest, error) { + queryString, variables := fetchPullRequestsQuery(branches, repoOwner, repoName) + + bodyBytes, err := json.Marshal(graphQLRequest{Query: queryString, Variables: variables}) + if err != nil { + return nil, err + } + req, err := http.NewRequest("POST", endpoint, bytes.NewBuffer(bodyBytes)) + if err != nil { + return nil, err + } + + req.Header.Set("Authorization", "token "+token) + req.Header.Set("Content-Type", "application/json") + + // Bound the request so that a dead or extremely slow network can't leave + // the pull-request refresh in flight for minutes. The data is auxiliary, + // so giving up and retrying on the next refresh beats waiting. + client := &http.Client{Timeout: 10 * time.Second} + resp, err := client.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + bodyStr := new(bytes.Buffer) + _, _ = bodyStr.ReadFrom(resp.Body) + return nil, fmt.Errorf("GraphQL query failed with status: %s. Body: %s", resp.Status, bodyStr.String()) + } + + respBytes, err := io.ReadAll(resp.Body) + if err != nil { + return nil, err + } + + return parsePullRequestsResponse(respBytes) +} + +func parsePullRequestsResponse(respBytes []byte) ([]*models.GithubPullRequest, error) { + var result Response + if err := json.Unmarshal(respBytes, &result); err != nil { + return nil, err + } + + prs := []*models.GithubPullRequest{} + for _, repoQuery := range result.Data.Repository { + for _, edge := range repoQuery.Edges { + node := edge.Node + pr := &models.GithubPullRequest{ + HeadRefName: node.HeadRefName, + Number: node.Number, + Title: node.Title, + State: lo.Ternary(node.IsDraft && node.State != "CLOSED", "DRAFT", node.State), + ChecksState: node.HeadRef.Target.StatusCheckRollup.State, + Url: node.Url, + HeadRepositoryOwner: models.GithubRepositoryOwner{ + Login: node.HeadRepositoryOwner.Login, + }, + } + prs = append(prs, pr) + } + } + + return prs, nil +} + +// returns a map from branch name to pull request +func GenerateGithubPullRequestMap( + prs []*models.GithubPullRequest, + branches []*models.Branch, + remotes []*models.Remote, +) map[string]*models.GithubPullRequest { + res := map[string]*models.GithubPullRequest{} + + if len(prs) == 0 { + return res + } + + remotesToOwnersMap := getRemotesToOwnersMap(remotes) + + // A PR can be identified by two things: the owner e.g. 'jesseduffield' and the + // branch name e.g. 'feature/my-feature'. The owner might be different + // to the owner of the repo if the PR is from a fork of that repo. + type prKey struct { + owner string + branchName string + } + + prByKey := map[prKey]models.GithubPullRequest{} + + for _, pr := range prs { + key := prKey{owner: strings.ToLower(pr.UserName()), branchName: pr.BranchName()} + // PRs are returned newest-first from the API, so the first one we + // see for each key is the most recent and therefore the most relevant. + if _, exists := prByKey[key]; !exists { + prByKey[key] = *pr + } + } + + for _, branch := range branches { + if !branch.IsTrackingRemote() { + continue + } + + owner, foundRemoteOwner := remotesToOwnersMap[branch.UpstreamRemote] + if !foundRemoteOwner { + // UpstreamRemote may be a full URL rather than a remote name; + // try parsing the owner directly from it. + repoInfo, err := hosting_service.GetRepoInfoFromURL(branch.UpstreamRemote) + if err != nil { + continue + } + owner = repoInfo.Owner + } + + pr, hasPr := prByKey[prKey{owner: strings.ToLower(owner), branchName: branch.UpstreamBranch}] + + if !hasPr { + continue + } + + res[branch.Name] = &pr + } + + return res +} + +func getRemotesToOwnersMap(remotes []*models.Remote) map[string]string { + res := map[string]string{} + for _, remote := range remotes { + if len(remote.Urls) == 0 { + continue + } + + repoInfo, err := hosting_service.GetRepoInfoFromURL(remote.Urls[0]) + if err != nil { + continue + } + + res[remote.Name] = repoInfo.Owner + } + return res +} + +// graphQLEndpoint returns the GraphQL API URL for a GitHub host. github.com +// uses a dedicated api. subdomain; GitHub Enterprise Server hangs the API off +// the web host under /api/graphql. +func graphQLEndpoint(host string) string { + if auth.NormalizeHostname(host) == "github.com" { + return "https://api.github.com/graphql" + } + return "https://" + host + "/api/graphql" +} diff --git a/pkg/commands/git_commands/github_test.go b/pkg/commands/git_commands/github_test.go new file mode 100644 index 000000000..ce068d750 --- /dev/null +++ b/pkg/commands/git_commands/github_test.go @@ -0,0 +1,482 @@ +package git_commands + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/hosting_service" + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/stretchr/testify/assert" +) + +func TestGetRepoInfoFromURL(t *testing.T) { + cases := []struct { + name string + url string + expected hosting_service.RepoInformation + }{ + { + name: "SSH URL", + url: "git@github.com:jesseduffield/lazygit.git", + expected: hosting_service.RepoInformation{ + Owner: "jesseduffield", + Repository: "lazygit", + }, + }, + { + name: "HTTPS URL", + url: "https://github.com/jesseduffield/lazygit.git", + expected: hosting_service.RepoInformation{ + Owner: "jesseduffield", + Repository: "lazygit", + }, + }, + { + name: "HTTPS URL without .git", + url: "https://github.com/jesseduffield/lazygit", + expected: hosting_service.RepoInformation{ + Owner: "jesseduffield", + Repository: "lazygit", + }, + }, + { + name: "SSH URL with org nesting", + url: "git@github.com:my-org/sub-group/lazygit.git", + expected: hosting_service.RepoInformation{ + Owner: "my-org/sub-group", + Repository: "lazygit", + }, + }, + } + + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + result, err := hosting_service.GetRepoInfoFromURL(c.url) + assert.NoError(t, err) + assert.Equal(t, c.expected, result) + }) + } +} + +func TestGraphQLEndpoint(t *testing.T) { + cases := []struct { + host string + expected string + }{ + {"github.com", "https://api.github.com/graphql"}, + {"www.github.com", "https://api.github.com/graphql"}, + {"GITHUB.com", "https://api.github.com/graphql"}, + {"ghe.example.com", "https://ghe.example.com/api/graphql"}, + {"ghe.example.com:8443", "https://ghe.example.com:8443/api/graphql"}, + } + + for _, c := range cases { + t.Run(c.host, func(t *testing.T) { + assert.Equal(t, c.expected, graphQLEndpoint(c.host)) + }) + } +} + +func TestFetchPullRequestsQueryFetchesOnlyAggregateCheckState(t *testing.T) { + query, variables := fetchPullRequestsQuery([]string{"feature"}, "owner", "repo") + + assert.Contains(t, query, "headRef {") + assert.Contains(t, query, "... on Commit {") + assert.Contains(t, query, "statusCheckRollup {") + assert.NotContains(t, query, "contexts") + assert.Equal(t, map[string]string{ + "owner": "owner", + "repo": "repo", + "branch1": "feature", + }, variables) +} + +func TestParsePullRequestsResponse(t *testing.T) { + t.Run("flattens aliases and normalizes drafts", func(t *testing.T) { + response := []byte(`{ + "data": { + "repository": { + "a1": { + "edges": [ + { + "node": { + "title": "Add feature", + "headRefName": "feature", + "number": 42, + "url": "https://github.com/jesseduffield/lazygit/pull/42", + "headRepositoryOwner": {"login": "contributor"}, + "state": "OPEN", + "isDraft": false, + "headRef": { + "target": { + "statusCheckRollup": {"state": "SUCCESS"} + } + } + } + } + ] + }, + "a2": { + "edges": [ + { + "node": { + "title": "Draft feature", + "headRefName": "draft-feature", + "number": 43, + "url": "https://github.com/jesseduffield/lazygit/pull/43", + "headRepositoryOwner": {"login": "contributor"}, + "state": "OPEN", + "isDraft": true, + "headRef": null + } + } + ] + } + } + } +}`) + + prs, err := parsePullRequestsResponse(response) + + assert.NoError(t, err) + assert.ElementsMatch(t, []*models.GithubPullRequest{ + { + HeadRefName: "feature", + Number: 42, + Title: "Add feature", + State: "OPEN", + ChecksState: "SUCCESS", + Url: "https://github.com/jesseduffield/lazygit/pull/42", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"}, + }, + { + HeadRefName: "draft-feature", + Number: 43, + Title: "Draft feature", + State: "DRAFT", + Url: "https://github.com/jesseduffield/lazygit/pull/43", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"}, + }, + }, prs) + }) + + t.Run("returns an empty slice for an empty result", func(t *testing.T) { + prs, err := parsePullRequestsResponse([]byte(`{"data":{"repository":{}}}`)) + + assert.NoError(t, err) + assert.Empty(t, prs) + }) + + t.Run("rejects malformed JSON", func(t *testing.T) { + prs, err := parsePullRequestsResponse([]byte(`{"data":`)) + + assert.Error(t, err) + assert.Nil(t, prs) + }) +} + +func TestGenerateGithubPullRequestMap(t *testing.T) { + cases := []struct { + name string + prs []*models.GithubPullRequest + branches []*models.Branch + remotes []*models.Remote + expected map[string]*models.GithubPullRequest + }{ + { + name: "empty inputs", + prs: []*models.GithubPullRequest{}, + branches: []*models.Branch{}, + remotes: []*models.Remote{}, + expected: map[string]*models.GithubPullRequest{}, + }, + { + name: "matches PR to branch tracking origin", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "feature-branch", + Number: 42, + Title: "Add feature", + State: "OPEN", + ChecksState: "PENDING", + Url: "https://github.com/jesseduffield/lazygit/pull/42", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + branches: []*models.Branch{ + { + Name: "feature-branch", + UpstreamRemote: "origin", + UpstreamBranch: "feature-branch", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{ + "feature-branch": { + HeadRefName: "feature-branch", + Number: 42, + Title: "Add feature", + State: "OPEN", + ChecksState: "PENDING", + Url: "https://github.com/jesseduffield/lazygit/pull/42", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + }, + { + name: "does not match branch without upstream", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "feature-branch", + Number: 42, + Title: "Add feature", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + branches: []*models.Branch{ + { + Name: "feature-branch", + // no upstream set + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{}, + }, + { + name: "matches fork PR to branch tracking fork remote", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "fix-bug", + Number: 99, + Title: "Fix bug", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"}, + }, + }, + branches: []*models.Branch{ + { + Name: "fix-bug", + UpstreamRemote: "contributor", + UpstreamBranch: "fix-bug", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, + }, + { + Name: "contributor", + Urls: []string{"git@github.com:contributor/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{ + "fix-bug": { + HeadRefName: "fix-bug", + Number: 99, + Title: "Fix bug", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"}, + }, + }, + }, + { + name: "does not match when owner differs", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "feature-branch", + Number: 42, + Title: "Add feature", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "someone-else"}, + }, + }, + branches: []*models.Branch{ + { + Name: "feature-branch", + UpstreamRemote: "origin", + UpstreamBranch: "feature-branch", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{}, + }, + { + name: "matches when UpstreamRemote is a full URL", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "my-branch", + Number: 55, + Title: "Full URL upstream", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"}, + }, + }, + branches: []*models.Branch{ + { + Name: "my-branch", + UpstreamRemote: "git@github.com:contributor/lazygit.git", + UpstreamBranch: "my-branch", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{ + "my-branch": { + HeadRefName: "my-branch", + Number: 55, + Title: "Full URL upstream", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"}, + }, + }, + }, + { + name: "uses first PR when branch name is reused (API returns newest first)", + prs: []*models.GithubPullRequest{ + // API returns newest first (CREATED_AT DESC) + { + HeadRefName: "update-sponsors", + Number: 50, + Title: "Newest PR", + State: "CLOSED", + Url: "https://github.com/jesseduffield/lazygit/pull/50", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + { + HeadRefName: "update-sponsors", + Number: 30, + Title: "Middle PR", + State: "OPEN", + Url: "https://github.com/jesseduffield/lazygit/pull/30", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + { + HeadRefName: "update-sponsors", + Number: 10, + Title: "Oldest PR", + State: "CLOSED", + Url: "https://github.com/jesseduffield/lazygit/pull/10", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + branches: []*models.Branch{ + { + Name: "update-sponsors", + UpstreamRemote: "origin", + UpstreamBranch: "update-sponsors", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{ + "update-sponsors": { + HeadRefName: "update-sponsors", + Number: 50, + Title: "Newest PR", + State: "CLOSED", + Url: "https://github.com/jesseduffield/lazygit/pull/50", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + }, + { + name: "matches with HTTPS remote URL", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "my-pr", + Number: 10, + Title: "My PR", + State: "MERGED", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + branches: []*models.Branch{ + { + Name: "my-pr", + UpstreamRemote: "origin", + UpstreamBranch: "my-pr", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"https://github.com/jesseduffield/lazygit.git"}, + }, + }, + expected: map[string]*models.GithubPullRequest{ + "my-pr": { + HeadRefName: "my-pr", + Number: 10, + Title: "My PR", + State: "MERGED", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"}, + }, + }, + }, + { + name: "matches when owner casing differs", + prs: []*models.GithubPullRequest{ + { + HeadRefName: "fix-case-insensitive", + Number: 42, + Title: "Fix case insensitive", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "Jesseduffield"}, // Uppercase J + }, + }, + branches: []*models.Branch{ + { + Name: "fix-case-insensitive", + UpstreamRemote: "origin", + UpstreamBranch: "fix-case-insensitive", + }, + }, + remotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"git@github.com:jesseduffield/lazygit.git"}, // Lowercase j + }, + }, + expected: map[string]*models.GithubPullRequest{ + "fix-case-insensitive": { + HeadRefName: "fix-case-insensitive", + Number: 42, + Title: "Fix case insensitive", + State: "OPEN", + HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "Jesseduffield"}, + }, + }, + }, + } + + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + result := GenerateGithubPullRequestMap(c.prs, c.branches, c.remotes) + assert.Equal(t, c.expected, result) + }) + } +} diff --git a/pkg/commands/git_commands/hosting_service.go b/pkg/commands/git_commands/hosting_service.go new file mode 100644 index 000000000..f43b93e90 --- /dev/null +++ b/pkg/commands/git_commands/hosting_service.go @@ -0,0 +1,34 @@ +package git_commands + +import "github.com/jesseduffield/lazygit/pkg/commands/hosting_service" + +// a hosting service is something like github, gitlab, bitbucket etc +type HostingService struct { + *GitCommon +} + +func NewHostingServiceCommand(gitCommon *GitCommon) *HostingService { + return &HostingService{ + GitCommon: gitCommon, + } +} + +func (self *HostingService) GetPullRequestURL(from string, to string) (string, error) { + return self.getHostingServiceMgr(self.config.GetRemoteURL()).GetPullRequestURL(from, to) +} + +func (self *HostingService) GetCommitURL(commitSha string) (string, error) { + return self.getHostingServiceMgr(self.config.GetRemoteURL()).GetCommitURL(commitSha) +} + +func (self *HostingService) GetServiceInfo(remoteURL string) (hosting_service.ServiceInfo, error) { + return self.getHostingServiceMgr(remoteURL).GetServiceInfo() +} + +// getting this on every request rather than storing it in state in case our remoteURL changes +// from one invocation to the next. Note however that we're currently caching config +// results so we might want to invalidate the cache here if it becomes a problem. +func (self *HostingService) getHostingServiceMgr(remoteURL string) *hosting_service.HostingServiceMgr { + configServices := self.UserConfig().Services + return hosting_service.NewHostingServiceMgr(self.Log, self.Tr, remoteURL, configServices) +} diff --git a/pkg/commands/git_commands/patch.go b/pkg/commands/git_commands/patch.go index 38db6464f..1cdd55f63 100644 --- a/pkg/commands/git_commands/patch.go +++ b/pkg/commands/git_commands/patch.go @@ -348,7 +348,7 @@ func (self *PatchCommands) PullPatchIntoNewCommitBefore( func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) { cmdArgs := NewGitCmd("diff"). Config("diff.noprefix=false"). - Arg("--no-ext-diff"). + Arg("--no-ext-diff", "--no-color"). Arg("HEAD.." + commit.Hash()). ToArgv() diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index ee97b3a84..aebfc635f 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/pkg/commands/git_commands/rebase.go @@ -112,29 +112,30 @@ func (self *RebaseCommands) GenericAmend(commits []*models.Commit, start, end in } func (self *RebaseCommands) MoveCommitsDown(commits []*models.Commit, startIdx int, endIdx int) error { - baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+2) - - hashes := lo.Map(commits[startIdx:endIdx+1], func(commit *models.Commit, _ int) string { - return commit.Hash() - }) - - return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ - baseHashOrRoot: baseHashOrRoot, - instruction: daemon.NewMoveTodosDownInstruction(hashes), - overrideEditor: true, - }).Run() + return self.MoveCommits(commits, startIdx, endIdx, 1) } func (self *RebaseCommands) MoveCommitsUp(commits []*models.Commit, startIdx int, endIdx int) error { - baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+1) + return self.MoveCommits(commits, startIdx, endIdx, -1) +} + +func (self *RebaseCommands) MoveCommits(commits []*models.Commit, startIdx int, endIdx int, offset int) error { + baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+max(offset, 0)+1) hashes := lo.Map(commits[startIdx:endIdx+1], func(commit *models.Commit, _ int) string { return commit.Hash() }) + var instruction daemon.Instruction + if offset > 0 { + instruction = daemon.NewMoveTodosDownInstruction(hashes, offset) + } else { + instruction = daemon.NewMoveTodosUpInstruction(hashes, -offset) + } + return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ baseHashOrRoot: baseHashOrRoot, - instruction: daemon.NewMoveTodosUpInstruction(hashes), + instruction: instruction, overrideEditor: true, }).Run() } @@ -364,21 +365,20 @@ func (self *RebaseCommands) DeleteUpdateRefTodos(commits []*models.Commit) error } func (self *RebaseCommands) MoveTodosDown(commits []*models.Commit) error { - fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo") - todosToMove := lo.Map(commits, func(commit *models.Commit, _ int) utils.Todo { - return todoFromCommit(commit) - }) - - return utils.MoveTodosDown(fileName, todosToMove, true, self.config.GetCoreCommentChar()) + return self.MoveTodos(commits, 1) } func (self *RebaseCommands) MoveTodosUp(commits []*models.Commit) error { + return self.MoveTodos(commits, -1) +} + +func (self *RebaseCommands) MoveTodos(commits []*models.Commit, offset int) error { fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo") todosToMove := lo.Map(commits, func(commit *models.Commit, _ int) utils.Todo { return todoFromCommit(commit) }) - return utils.MoveTodosUp(fileName, todosToMove, true, self.config.GetCoreCommentChar()) + return utils.MoveTodos(fileName, todosToMove, true, offset, self.config.GetCoreCommentChar()) } // SquashAllAboveFixupCommits squashes all fixup! commits above the given one diff --git a/pkg/commands/git_commands/remote.go b/pkg/commands/git_commands/remote.go index cfcb85091..3b27730fc 100644 --- a/pkg/commands/git_commands/remote.go +++ b/pkg/commands/git_commands/remote.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/samber/lo" ) diff --git a/pkg/commands/git_commands/remote_loader.go b/pkg/commands/git_commands/remote_loader.go index 2e632def4..2daeb600d 100644 --- a/pkg/commands/git_commands/remote_loader.go +++ b/pkg/commands/git_commands/remote_loader.go @@ -2,33 +2,29 @@ package git_commands import ( "fmt" + "maps" "slices" "strings" "sync" - gogit "github.com/jesseduffield/go-git/v5" "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" ) type RemoteLoader struct { *common.Common - cmd oscommands.ICmdObjBuilder - getGoGitRemotes func() ([]*gogit.Remote, error) + cmd oscommands.ICmdObjBuilder } func NewRemoteLoader( common *common.Common, cmd oscommands.ICmdObjBuilder, - getGoGitRemotes func() ([]*gogit.Remote, error), ) *RemoteLoader { return &RemoteLoader{ - Common: common, - cmd: cmd, - getGoGitRemotes: getGoGitRemotes, + Common: common, + cmd: cmd, } } @@ -44,10 +40,7 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) { remoteBranchesByRemoteName, remoteBranchesErr = self.getRemoteBranchesByRemoteName() }) - goGitRemotes, err := self.getGoGitRemotes() - if err != nil { - return nil, err - } + remotes := self.getRemotesFromConfig() wg.Wait() @@ -55,16 +48,9 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) { return nil, remoteBranchesErr } - remotes := lo.Map(goGitRemotes, func(goGitRemote *gogit.Remote, _ int) *models.Remote { - remoteName := goGitRemote.Config().Name - branches := remoteBranchesByRemoteName[remoteName] - - return &models.Remote{ - Name: goGitRemote.Config().Name, - Urls: goGitRemote.Config().URLs, - Branches: branches, - } - }) + for _, remote := range remotes { + remote.Branches = remoteBranchesByRemoteName[remote.Name] + } // now lets sort our remotes by name alphabetically slices.SortFunc(remotes, func(a, b *models.Remote) int { @@ -81,6 +67,50 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) { return remotes, nil } +func (self *RemoteLoader) getRemotesFromConfig() []*models.Remote { + cmdArgs := NewGitCmd("config"). + Arg("--local", "--get-regexp", `^remote\.[^.]+\.(url|pushurl)$`).ToArgv() + output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput() + if err != nil { + // exit code 1 means no matching keys (no remotes configured) + return nil + } + + remotesByName := make(map[string]*models.Remote) + + for _, line := range strings.Split(output, "\n") { + key, url, found := strings.Cut(strings.TrimSpace(line), " ") + if !found { + continue + } + // key is "remote..url" or "remote..pushurl"; + // strip prefix and suffix to get the name + rest, ok := strings.CutPrefix(key, "remote.") + if !ok { + continue + } + var remoteName string + var isPushUrl bool + if name, ok := strings.CutSuffix(rest, ".pushurl"); ok { + remoteName, isPushUrl = name, true + } else if name, ok := strings.CutSuffix(rest, ".url"); ok { + remoteName, isPushUrl = name, false + } else { + continue + } + if _, ok := remotesByName[remoteName]; !ok { + remotesByName[remoteName] = &models.Remote{Name: remoteName} + } + if isPushUrl { + remotesByName[remoteName].PushUrls = append(remotesByName[remoteName].PushUrls, url) + } else { + remotesByName[remoteName].Urls = append(remotesByName[remoteName].Urls, url) + } + } + + return slices.Collect(maps.Values(remotesByName)) +} + func (self *RemoteLoader) getRemoteBranchesByRemoteName() (map[string][]*models.RemoteBranch, error) { remoteBranchesByRemoteName := make(map[string][]*models.RemoteBranch) diff --git a/pkg/commands/git_commands/remote_loader_test.go b/pkg/commands/git_commands/remote_loader_test.go new file mode 100644 index 000000000..3d4ed4d12 --- /dev/null +++ b/pkg/commands/git_commands/remote_loader_test.go @@ -0,0 +1,108 @@ +package git_commands + +import ( + "errors" + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/common" + "github.com/stretchr/testify/assert" +) + +func TestGetRemotesFromConfig(t *testing.T) { + configArgs := []string{"config", "--local", "--get-regexp", `^remote\.[^.]+\.(url|pushurl)$`} + + scenarios := []struct { + testName string + runner *oscommands.FakeCmdObjRunner + expectedRemotes []*models.Remote + }{ + { + testName: "no remotes configured", + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(configArgs, "", errors.New("exit status 1")), + expectedRemotes: nil, + }, + { + testName: "single remote with one url", + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(configArgs, + "remote.origin.url https://github.com/foo/bar.git\n", + nil), + expectedRemotes: []*models.Remote{ + {Name: "origin", Urls: []string{"https://github.com/foo/bar.git"}}, + }, + }, + { + testName: "mirror remote with multiple urls", + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(configArgs, + "remote.origin.url https://github.com/foo/bar.git\n"+ + "remote.origin.url git@github.com:foo/bar.git\n", + nil), + expectedRemotes: []*models.Remote{ + {Name: "origin", Urls: []string{ + "https://github.com/foo/bar.git", + "git@github.com:foo/bar.git", + }}, + }, + }, + { + testName: "remote with both url and pushurl", + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(configArgs, + "remote.origin.url https://github.com/foo/bar.git\n"+ + "remote.origin.pushurl git@github.com:foo/bar.git\n", + nil), + expectedRemotes: []*models.Remote{ + { + Name: "origin", + Urls: []string{"https://github.com/foo/bar.git"}, + PushUrls: []string{"git@github.com:foo/bar.git"}, + }, + }, + }, + { + testName: "multiple remotes", + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(configArgs, + "remote.origin.url https://github.com/foo/bar.git\n"+ + "remote.upstream.url https://github.com/baz/bar.git\n"+ + "remote.upstream.pushurl git@github.com:baz/bar.git\n", + nil), + expectedRemotes: []*models.Remote{ + {Name: "origin", Urls: []string{"https://github.com/foo/bar.git"}}, + { + Name: "upstream", + Urls: []string{"https://github.com/baz/bar.git"}, + PushUrls: []string{"git@github.com:baz/bar.git"}, + }, + }, + }, + { + testName: "remote name containing dots is preserved", + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(configArgs, + "remote.my.fork.url https://github.com/foo/bar.git\n", + nil), + expectedRemotes: []*models.Remote{ + {Name: "my.fork", Urls: []string{"https://github.com/foo/bar.git"}}, + }, + }, + } + + for _, scenario := range scenarios { + t.Run(scenario.testName, func(t *testing.T) { + loader := &RemoteLoader{ + Common: common.NewDummyCommon(), + cmd: oscommands.NewDummyCmdObjBuilder(scenario.runner), + } + + // map iteration order is non-deterministic, so compare unordered + assert.ElementsMatch(t, scenario.expectedRemotes, loader.getRemotesFromConfig()) + + scenario.runner.CheckForMissingCalls() + }) + } +} diff --git a/pkg/commands/git_commands/repo_paths.go b/pkg/commands/git_commands/repo_paths.go index c64debfc5..0473f8f8e 100644 --- a/pkg/commands/git_commands/repo_paths.go +++ b/pkg/commands/git_commands/repo_paths.go @@ -1,15 +1,14 @@ package git_commands import ( - ioFs "io/fs" "os" "path/filepath" "strings" "github.com/go-errors/errors" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/env" "github.com/jesseduffield/lazygit/pkg/utils" - "github.com/spf13/afero" ) type RepoPaths struct { @@ -19,10 +18,12 @@ type RepoPaths struct { repoGitDirPath string repoName string isBareRepo bool + gitLocationEnvVars []string } // Path to the current worktree. If we're in the main worktree, this will -// be the same as RepoPath() +// be the same as RepoPath(). It is empty for a bare repo, which has no +// worktree at all. func (self *RepoPaths) WorktreePath() string { return self.worktreePath } @@ -53,10 +54,33 @@ func (self *RepoPaths) RepoName() string { return self.repoName } +// Whether we found no worktree, so that there is nothing for lazygit to show. +// Note that this isn't quite git's core.bare: a repo that calls itself non-bare +// but whose worktree we couldn't find counts as bare for us too. Concretely, +// this is true when we're in +// +// - a genuinely bare repo; +// - the git dir of a linked worktree (.git/worktrees/x), whose worktree is +// recorded but not somewhere we look; +// - a repo that keeps its worktree somewhere only GIT_WORK_TREE knows, such +// as a vcsh-style dotfiles repo that hasn't been given core.worktree. +// +// The .git dir of an ordinary repo is not one of them: GetRepoPathsForDir +// notices the worktree holding it and hands back that repo instead. func (self *RepoPaths) IsBareRepo() bool { return self.isBareRepo } +// The environment that tells git where this repo is, as "NAME=value" entries. +// It is empty for the vast majority of repos, which git finds for itself by +// looking for a .git in the directory a command runs in. It is only non-empty +// when that doesn't work — when the git dir lives somewhere else entirely, +// because of core.worktree or --work-tree — and then every command addressing +// the repo has to carry it. +func (self *RepoPaths) GitLocationEnvVars() []string { + return self.gitLocationEnvVars +} + // Returns the repo paths for a typical repo func MockRepoPaths(currentPath string) *RepoPaths { return &RepoPaths{ @@ -84,26 +108,76 @@ func GetRepoPathsForDir( dir string, cmd oscommands.ICmdObjBuilder, ) (*RepoPaths, error) { - gitDirOutput, err := callGitRevParseWithDir(cmd, dir, "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree") + repoPaths, err := repoPathsForDir(dir, cmd) + if err != nil || !repoPaths.IsBareRepo() { + return repoPaths, err + } + + // We're in a git dir rather than in a working tree, which usually just means + // somebody ran lazygit in the .git of an ordinary repo. git's convention is + // that a git dir called .git belongs to the directory holding it, so look + // there: if that is a working tree, it is the repo we were asked about, and + // there's no reason to make the user go up a directory and try again. + // + // The git dirs that aren't called .git keep the paths we have. A linked + // worktree's (.git/worktrees/x) and a submodule's (.git/modules/x) do have a + // working tree, but only the directory holding a .git tells us where, so we + // would be guessing. A bare repo's has none to find. + if filepath.Base(repoPaths.WorktreeGitDirPath()) != ".git" { + return repoPaths, nil + } + + pathsFromWorkTree, err := repoPathsForDir(filepath.Dir(repoPaths.WorktreeGitDirPath()), cmd) + if err != nil || pathsFromWorkTree.IsBareRepo() { + return repoPaths, nil + } + return pathsFromWorkTree, nil +} + +// repoPathsForDir asks git about the repo at dir, and reports a bare repo when +// there is no working tree there. Unlike GetRepoPathsForDir it never looks +// anywhere but dir, which is what keeps that one from going round in circles. +func repoPathsForDir( + dir string, + cmd oscommands.ICmdObjBuilder, +) (*RepoPaths, error) { + gitDirOutput, err := callGitRevParseWithDir(cmd, dir, "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree") if err != nil { - return nil, err + // --show-toplevel is the only one of these that needs a work tree, and + // git makes it fatal when there isn't one. So this may just mean we're in + // a repo that has no work tree. + return getBareRepoPathsForDir(dir, cmd, err) } gitDirResults := strings.Split(utils.NormalizeLinefeeds(gitDirOutput), "\n") worktreePath := gitDirResults[0] worktreeGitDirPath := gitDirResults[1] repoGitDirPath := gitDirResults[2] - isBareRepo := gitDirResults[3] == "true" - // If we're in a submodule, --show-superproject-working-tree will return - // a value, meaning gitDirResults will be length 5. In that case - // return the worktree path as the repoPath. Otherwise we're in a - // normal repo or a worktree so return the parent of the git common - // dir (repoGitDirPath) - isSubmodule := len(gitDirResults) == 5 + // A worktree that has the repo's common git dir to itself is the repo's main + // worktree, so it is the repoPath. That holds for a submodule as well: its + // git dir lives under the superproject's .git/modules, but it is still the + // submodule's own common dir. + isMainWorktree := worktreeGitDirPath == repoGitDirPath + // If we're in a submodule, --show-superproject-working-tree will return a + // value, meaning gitDirResults will be length 4. That only tells us anything + // new for a linked worktree of a submodule, which isMainWorktree misses. + isSubmodule := len(gitDirResults) == 4 + + // Otherwise we're in a linked worktree, and the repoPath is the repo's main + // worktree. git won't tell us where that is: `git worktree list` reports it + // as the common git dir with a trailing "/.git" removed, which is this same + // derivation. So take the directory holding the common git dir. That is the + // main worktree of an ordinary repo, and of a bare one it is the directory + // its worktrees live in. It is not the main worktree of a repo that moved + // that elsewhere with core.worktree; there we end up naming the git dir's + // directory, which means that the repo name we display in the status panel + // isn't correct, and we start looking for .lazygit.yml in the wrong place. + // Both of those are not severe enough to justify the extra git call to get + // the real main worktree, so we accept this for this rather niche use case. var repoPath string - if isSubmodule { + if isMainWorktree || isSubmodule { repoPath = worktreePath } else { repoPath = filepath.Dir(repoGitDirPath) @@ -116,62 +190,113 @@ func GetRepoPathsForDir( repoPath: repoPath, repoGitDirPath: repoGitDirPath, repoName: repoName, - isBareRepo: isBareRepo, + isBareRepo: false, + gitLocationEnvVars: gitLocationEnvVars(cmd, worktreePath, worktreeGitDirPath), }, nil } +// gitLocationEnvVars works out whether git can find the repo by itself when a +// command runs in its worktree, and if it can't, returns the environment that +// tells git where it is. See RepoPaths.GitLocationEnvVars. +func gitLocationEnvVars( + cmd oscommands.ICmdObjBuilder, + worktreePath string, + worktreeGitDirPath string, +) []string { + // The ordinary repo, where the git dir sits in the worktree. Both paths are + // git's own answers from the same invocation, so they are spelled alike and + // comparing them is safe. + if worktreeGitDirPath == filepath.Join(worktreePath, ".git") { + return nil + } + + // A linked worktree or a submodule instead has a .git file naming its git + // dir, and git follows that just as happily. We could read the file, but the + // path in it may well name the same directory differently than git did + // above, so ask git to resolve it — from the worktree and nothing else. + discoveredGitDirPath, err := callGitRevParseInOtherRepo(cmd, worktreePath, "--absolute-git-dir") + if err == nil && discoveredGitDirPath == worktreeGitDirPath { + return nil + } + + return []string{ + env.GitDirEnvVar + "=" + worktreeGitDirPath, + env.GitWorkTreeEnvVar + "=" + worktreePath, + } +} + +// getBareRepoPathsForDir is the fallback for when we couldn't ask git for the +// work tree. Everything but --show-toplevel works fine without one, so if the +// remaining queries succeed we are in a bare repo, and we return what we know +// about it with an empty worktreePath. If they fail too we simply aren't in a +// repo, and the caller's original error says so better than ours would. +func getBareRepoPathsForDir( + dir string, + cmd oscommands.ICmdObjBuilder, + errWithWorktree error, +) (*RepoPaths, error) { + output, err := callGitRevParseWithDir(cmd, dir, "--absolute-git-dir", "--git-common-dir") + if err != nil { + return nil, errWithWorktree + } + + results := strings.Split(utils.NormalizeLinefeeds(output), "\n") + repoGitDirPath := results[1] + // A bare repo has no worktree, and so no repo path in the sense the caller + // with a worktree means. It doesn't matter much what we say here, because + // nobody reads it: whoever is handed a bare repo either offers to open a + // recent one instead (app.setupRepo) or is turned away by NewGitCommand. The + // directory holding the git dir is the nearest thing there is to a repo + // path. + repoPath := filepath.Dir(repoGitDirPath) + + return &RepoPaths{ + worktreePath: "", + worktreeGitDirPath: results[0], + repoPath: repoPath, + repoGitDirPath: repoGitDirPath, + repoName: filepath.Base(repoPath), + isBareRepo: true, + }, nil +} + +// Asks git about the repo at dir. This is how we find our own repo, so it has +// to be answered the way git itself would answer it there, GIT_DIR and +// GIT_WORK_TREE included. func callGitRevParseWithDir( cmd oscommands.ICmdObjBuilder, dir string, gitRevArgs ...string, ) (string, error) { + return runGitRevParse(newGitRevParseCmd(cmd, dir, gitRevArgs...)) +} + +// Asks git about a repo that isn't the one we have open; see forOtherRepo. +func callGitRevParseInOtherRepo( + cmd oscommands.ICmdObjBuilder, + dir string, + gitRevArgs ...string, +) (string, error) { + return runGitRevParse(forOtherRepo(newGitRevParseCmd(cmd, dir, gitRevArgs...))) +} + +func newGitRevParseCmd( + cmd oscommands.ICmdObjBuilder, + dir string, + gitRevArgs ...string, +) *oscommands.CmdObj { gitRevParse := NewGitCmd("rev-parse").Arg("--path-format=absolute").Arg(gitRevArgs...) if dir != "" { gitRevParse.Dir(dir) } - gitCmd := cmd.New(gitRevParse.ToArgv()).DontLog() + return cmd.New(gitRevParse.ToArgv()).DontLog() +} + +func runGitRevParse(gitCmd *oscommands.CmdObj) (string, error) { res, err := gitCmd.RunWithOutput() if err != nil { return "", errors.Errorf("'%s' failed: %v", gitCmd.ToString(), err) } return strings.TrimSpace(res), nil } - -// Returns the paths of linked worktrees -func linkedWortkreePaths(fs afero.Fs, repoGitDirPath string) []string { - result := []string{} - // For each directory in this path we're going to cat the `gitdir` file and append its contents to our result - // That file points us to the `.git` file in the worktree. - worktreeGitDirsPath := filepath.Join(repoGitDirPath, "worktrees") - - // ensure the directory exists - _, err := fs.Stat(worktreeGitDirsPath) - if err != nil { - return result - } - - _ = afero.Walk(fs, worktreeGitDirsPath, func(currPath string, info ioFs.FileInfo, err error) error { - if err != nil { - return err - } - - if !info.IsDir() { - return nil - } - - gitDirPath := filepath.Join(currPath, "gitdir") - gitDirBytes, err := afero.ReadFile(fs, gitDirPath) - if err != nil { - // ignoring error - return nil - } - trimmedGitDir := strings.TrimSpace(string(gitDirBytes)) - // removing the .git part - worktreeDir := filepath.Dir(trimmedGitDir) - result = append(result, worktreeDir) - return nil - }) - - return result -} diff --git a/pkg/commands/git_commands/repo_paths_test.go b/pkg/commands/git_commands/repo_paths_test.go index 29c40acee..c7b7705b4 100644 --- a/pkg/commands/git_commands/repo_paths_test.go +++ b/pkg/commands/git_commands/repo_paths_test.go @@ -38,8 +38,6 @@ func TestGetRepoPaths(t *testing.T) { `C:\path\to\repo\.git`, // --git-common-dir `C:\path\to\repo\.git`, - // --is-bare-repository - "false", // --show-superproject-working-tree }, []string{ // --show-toplevel @@ -48,12 +46,10 @@ func TestGetRepoPaths(t *testing.T) { "/path/to/repo/.git", // --git-common-dir "/path/to/repo/.git", - // --is-bare-repository - "false", // --show-superproject-working-tree }) runner.ExpectGitArgs( - append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"), + append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), strings.Join(mockOutput, "\n"), nil) }, @@ -76,53 +72,147 @@ func TestGetRepoPaths(t *testing.T) { Err: nil, }, { + // git refuses to answer --show-toplevel when there's no work tree, so + // we have to ask a second time without it. Name: "bare repo", BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) { - // setup for main worktree + runner.ExpectGitArgs( + append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), + "", + errors.New("fatal: this operation must be run in a work tree")) + mockOutput := lo.Ternary(runtime.GOOS == "windows", []string{ - // --show-toplevel - `C:\path\to\repo`, // --git-dir - `C:\path\to\bare_repo\bare.git`, + `C:\path\to\project\bare.git`, // --git-common-dir - `C:\path\to\bare_repo\bare.git`, - // --is-bare-repository - `true`, - // --show-superproject-working-tree + `C:\path\to\project\bare.git`, }, []string{ - // --show-toplevel - "/path/to/repo", // --git-dir - "/path/to/bare_repo/bare.git", + "/path/to/project/bare.git", // --git-common-dir - "/path/to/bare_repo/bare.git", - // --is-bare-repository - "true", - // --show-superproject-working-tree + "/path/to/project/bare.git", }) runner.ExpectGitArgs( - append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"), + append(getRevParseArgs(), "--absolute-git-dir", "--git-common-dir"), strings.Join(mockOutput, "\n"), nil) }, - Path: "/path/to/repo", + Path: "/path/to/project", Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{ - worktreePath: `C:\path\to\repo`, - worktreeGitDirPath: `C:\path\to\bare_repo\bare.git`, - repoPath: `C:\path\to\bare_repo`, - repoGitDirPath: `C:\path\to\bare_repo\bare.git`, - repoName: `bare_repo`, + worktreePath: "", + worktreeGitDirPath: `C:\path\to\project\bare.git`, + repoPath: `C:\path\to\project`, + repoGitDirPath: `C:\path\to\project\bare.git`, + repoName: `project`, isBareRepo: true, }, &RepoPaths{ - worktreePath: "/path/to/repo", - worktreeGitDirPath: "/path/to/bare_repo/bare.git", - repoPath: "/path/to/bare_repo", - repoGitDirPath: "/path/to/bare_repo/bare.git", - repoName: "bare_repo", + worktreePath: "", + worktreeGitDirPath: "/path/to/project/bare.git", + repoPath: "/path/to/project", + repoGitDirPath: "/path/to/project/bare.git", + repoName: "project", isBareRepo: true, }), Err: nil, }, + { + // Standing in the .git dir of an ordinary repo: git refuses to name a + // work tree, but the directory holding the .git is one, so we open the + // repo from there. + Name: "in a repo's .git dir", + BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) { + gitDir := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo\.git`, "/path/to/repo/.git") + worktree := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo`, "/path/to/repo") + + runner.ExpectGitArgs( + append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), + "", + errors.New("fatal: this operation must be run in a work tree")) + runner.ExpectGitArgs( + append(getRevParseArgs(), "--absolute-git-dir", "--git-common-dir"), + strings.Join([]string{gitDir, gitDir}, "\n"), + nil) + + // asking again from the directory holding the .git + runner.ExpectGitArgs( + append(append([]string{"-C", worktree}, getRevParseArgs()...), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), + strings.Join([]string{worktree, gitDir, gitDir}, "\n"), + nil) + }, + Path: "/path/to/repo/.git", + Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{ + worktreePath: `C:\path\to\repo`, + worktreeGitDirPath: `C:\path\to\repo\.git`, + repoPath: `C:\path\to\repo`, + repoGitDirPath: `C:\path\to\repo\.git`, + repoName: `repo`, + isBareRepo: false, + }, &RepoPaths{ + worktreePath: "/path/to/repo", + worktreeGitDirPath: "/path/to/repo/.git", + repoPath: "/path/to/repo", + repoGitDirPath: "/path/to/repo/.git", + repoName: "repo", + isBareRepo: false, + }), + Err: nil, + }, + { + // A repo whose work tree lives somewhere else entirely, as set up by + // core.worktree or by --work-tree. We're in the main worktree, but the + // git dir is not inside it. + Name: "repo with a separate work tree", + BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) { + mockOutput := lo.Ternary(runtime.GOOS == "windows", []string{ + // --show-toplevel + `C:\path\to\worktree`, + // --git-dir + `C:\path\to\repo\.git`, + // --git-common-dir + `C:\path\to\repo\.git`, + // --show-superproject-working-tree + }, []string{ + // --show-toplevel + "/path/to/worktree", + // --git-dir + "/path/to/repo/.git", + // --git-common-dir + "/path/to/repo/.git", + // --show-superproject-working-tree + }) + runner.ExpectGitArgs( + append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), + strings.Join(mockOutput, "\n"), + nil) + + // asking git to find the repo from the work tree gets us nowhere, + // because there is no .git there + worktree := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\worktree`, "/path/to/worktree") + runner.ExpectGitArgs( + append([]string{"-C", worktree}, append(getRevParseArgs(), "--absolute-git-dir")...), + "", + errors.New("fatal: not a git repository (or any of the parent directories): .git")) + }, + Path: "/path/to/repo", + Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{ + worktreePath: `C:\path\to\worktree`, + worktreeGitDirPath: `C:\path\to\repo\.git`, + repoPath: `C:\path\to\worktree`, + repoGitDirPath: `C:\path\to\repo\.git`, + repoName: `worktree`, + isBareRepo: false, + gitLocationEnvVars: []string{`GIT_DIR=C:\path\to\repo\.git`, `GIT_WORK_TREE=C:\path\to\worktree`}, + }, &RepoPaths{ + worktreePath: "/path/to/worktree", + worktreeGitDirPath: "/path/to/repo/.git", + repoPath: "/path/to/worktree", + repoGitDirPath: "/path/to/repo/.git", + repoName: "worktree", + isBareRepo: false, + gitLocationEnvVars: []string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"}, + }), + Err: nil, + }, { Name: "submodule", BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) { @@ -133,8 +223,6 @@ func TestGetRepoPaths(t *testing.T) { `C:\path\to\repo\.git\modules\submodule1`, // --git-common-dir `C:\path\to\repo\.git\modules\submodule1`, - // --is-bare-repository - `false`, // --show-superproject-working-tree `C:\path\to\repo`, }, []string{ @@ -144,15 +232,22 @@ func TestGetRepoPaths(t *testing.T) { "/path/to/repo/.git/modules/submodule1", // --git-common-dir "/path/to/repo/.git/modules/submodule1", - // --is-bare-repository - "false", // --show-superproject-working-tree "/path/to/repo", }) runner.ExpectGitArgs( - append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"), + append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), strings.Join(mockOutput, "\n"), nil) + + // git finds the submodule's git dir from its work tree, via the + // .git file there + worktree := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo\submodule1`, "/path/to/repo/submodule1") + gitDir := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo\.git\modules\submodule1`, "/path/to/repo/.git/modules/submodule1") + runner.ExpectGitArgs( + append([]string{"-C", worktree}, append(getRevParseArgs(), "--absolute-git-dir")...), + gitDir, + nil) }, Path: "/path/to/repo/submodule1", Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{ @@ -176,7 +271,12 @@ func TestGetRepoPaths(t *testing.T) { Name: "git rev-parse returns an error", BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) { runner.ExpectGitArgs( - append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"), + append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"), + "", + errors.New("fatal: invalid gitfile format: /path/to/repo/worktree2/.git")) + // we're not in a repo at all, so asking about a bare one fails too + runner.ExpectGitArgs( + append(getRevParseArgs(), "--absolute-git-dir", "--git-common-dir"), "", errors.New("fatal: invalid gitfile format: /path/to/repo/worktree2/.git")) }, @@ -184,7 +284,7 @@ func TestGetRepoPaths(t *testing.T) { Expected: nil, Err: func(getRevParseArgs argFn) error { args := strings.Join(getRevParseArgs(), " ") - return fmt.Errorf("'git %v --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree' failed: fatal: invalid gitfile format: /path/to/repo/worktree2/.git", args) + return fmt.Errorf("'git %v --show-toplevel --absolute-git-dir --git-common-dir --show-superproject-working-tree' failed: fatal: invalid gitfile format: /path/to/repo/worktree2/.git", args) }, }, } diff --git a/pkg/commands/git_commands/stash.go b/pkg/commands/git_commands/stash.go index 0e5eb299d..ea23c5141 100644 --- a/pkg/commands/git_commands/stash.go +++ b/pkg/commands/git_commands/stash.go @@ -81,20 +81,13 @@ func (self *StashCommands) Hash(index int) (string, error) { } func (self *StashCommands) ShowStashEntryCmdObj(index int) *oscommands.CmdObj { - extDiffCmd := self.pagerConfig.GetExternalDiffCommand() - useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() - // "-u" is the same as "--include-untracked", but the latter fails in older git versions for some reason cmdArgs := NewGitCmd("stash").Arg("show"). + AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), true). Arg("-p"). Arg("--stat"). Arg("-u"). - ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd). - ArgIfElse(extDiffCmd != "" || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff"). - Arg(fmt.Sprintf("--color=%s", self.pagerConfig.GetColorArg())). - Arg(fmt.Sprintf("--unified=%d", self.UserConfig().Git.DiffContextSize)). - ArgIf(self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space"). - Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)). + Arg(fmt.Sprintf("--color=%s", self.diffRendererConfigManager.GetColorArg())). Arg(fmt.Sprintf("refs/stash@{%d}", index)). Dir(self.repoPaths.worktreePath). ToArgv() diff --git a/pkg/commands/git_commands/stash_test.go b/pkg/commands/git_commands/stash_test.go index a942a4e98..8f5629c98 100644 --- a/pkg/commands/git_commands/stash_test.go +++ b/pkg/commands/git_commands/stash_test.go @@ -103,7 +103,7 @@ func TestStashStashEntryCmdObj(t *testing.T) { contextSize uint64 similarityThreshold int ignoreWhitespace bool - pagerConfig *config.PagingConfig + diffRendererConfig *config.DiffRendererConfig expected []string } @@ -114,7 +114,7 @@ func TestStashStashEntryCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=3", "--find-renames=50%", "refs/stash@{5}"}, + expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"}, }, { testName: "Show diff with custom context size", @@ -122,7 +122,7 @@ func TestStashStashEntryCmdObj(t *testing.T) { contextSize: 77, similarityThreshold: 50, ignoreWhitespace: false, - expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=77", "--find-renames=50%", "refs/stash@{5}"}, + expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=77", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"}, }, { testName: "Show diff with custom similarity threshold", @@ -130,7 +130,7 @@ func TestStashStashEntryCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 33, ignoreWhitespace: false, - expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=3", "--find-renames=33%", "refs/stash@{5}"}, + expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=3", "--find-renames=33%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"}, }, { testName: "Show diff with external diff command", @@ -138,8 +138,8 @@ func TestStashStashEntryCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: &config.PagingConfig{ExternalDiffCommand: "difft --color=always"}, - expected: []string{"git", "-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "stash", "show", "-p", "--stat", "-u", "--ext-diff", "--color=always", "--unified=3", "--find-renames=50%", "refs/stash@{5}"}, + diffRendererConfig: &config.DiffRendererConfig{Type: "extDiff", Command: "difft --color=always"}, + expected: []string{"git", "-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "stash", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"}, }, { testName: "Show diff using git's external diff config", @@ -147,16 +147,16 @@ func TestStashStashEntryCmdObj(t *testing.T) { contextSize: 3, similarityThreshold: 50, ignoreWhitespace: false, - pagerConfig: &config.PagingConfig{UseExternalDiffGitConfig: true}, - expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--ext-diff", "--color=always", "--unified=3", "--find-renames=50%", "refs/stash@{5}"}, + diffRendererConfig: &config.DiffRendererConfig{Type: "extDiff"}, + expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"}, }, { - testName: "Default case", + testName: "Ignore whitespace", index: 5, contextSize: 3, similarityThreshold: 50, ignoreWhitespace: true, - expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=3", "--ignore-all-space", "--find-renames=50%", "refs/stash@{5}"}, + expected: []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=3", "--ignore-all-space", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"}, }, } @@ -166,8 +166,8 @@ func TestStashStashEntryCmdObj(t *testing.T) { userConfig.Git.IgnoreWhitespaceInDiffView = s.ignoreWhitespace userConfig.Git.DiffContextSize = s.contextSize userConfig.Git.RenameSimilarityThreshold = s.similarityThreshold - if s.pagerConfig != nil { - userConfig.Git.Pagers = []config.PagingConfig{*s.pagerConfig} + if s.diffRendererConfig != nil { + userConfig.Git.DiffRenderers = []config.DiffRendererConfig{*s.diffRendererConfig} } repoPaths := RepoPaths{ worktreePath: "/path/to/worktree", diff --git a/pkg/commands/git_commands/status.go b/pkg/commands/git_commands/status.go index ff09e22bc..d9120d87d 100644 --- a/pkg/commands/git_commands/status.go +++ b/pkg/commands/git_commands/status.go @@ -4,8 +4,10 @@ import ( "os" "path/filepath" "strings" + "time" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/spf13/afero" ) type StatusCommands struct { @@ -82,6 +84,66 @@ func (self *StatusCommands) IsInRevert() (bool, error) { return self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "REVERT_HEAD")) } +// RefsSnapshot returns a string fingerprint of the current state of local +// branches and HEAD. Comparing two snapshots byte-for-byte tells us whether +// any local ref or HEAD has moved since the last snapshot. +func (self *StatusCommands) RefsSnapshot() (string, error) { + t := time.Now() + defer func() { self.Log.Infof("RefsSnapshot took %s", time.Since(t)) }() + + refsArgs := NewGitCmd("for-each-ref"). + Arg("--format=%(objectname) %(refname)"). + Arg("refs/heads"). + ToArgv() + refs, err := self.cmd.New(refsArgs).DontLog().RunWithOutput() + if err != nil { + return "", err + } + + head, err := self.headSnapshot() + if err != nil { + return "", err + } + + return refs + head, nil +} + +// headSnapshot returns a fingerprint of HEAD that distinguishes "detached at +// commit X" from "on a branch that points at X". The commit hash alone can't +// tell those apart, which matters at the end of a rebase: HEAD reattaches to +// the branch without the hash changing, and we'd otherwise miss that refresh. +// +// We read .git/HEAD directly rather than shelling out: it's faster (no child +// process) and its content is exactly the symref-or-hash distinction we want +// ("ref: refs/heads/foo" when attached, the raw hash when detached). The +// reftable backend, however, doesn't keep a real .git/HEAD — it writes a fixed +// stub ("ref: refs/heads/.invalid") that never reflects the actual HEAD. When +// we see that stub (or the file is missing/unreadable) we fall back to +// porcelain commands, which are backend-agnostic. +func (self *StatusCommands) headSnapshot() (string, error) { + headPath := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "HEAD") + if content, err := afero.ReadFile(self.Fs, headPath); err == nil { + head := strings.TrimSpace(string(content)) + if head != "" && head != "ref: refs/heads/.invalid" { + return head, nil + } + } + + // symbolic-ref gives the branch when HEAD is attached and fails when it's + // detached, in which case rev-parse gives the commit HEAD points at. + symbolicRefArgs := NewGitCmd("symbolic-ref").Arg("HEAD").ToArgv() + if symref, err := self.cmd.New(symbolicRefArgs).DontLog().RunWithOutput(); err == nil { + return strings.TrimSpace(symref), nil + } + + revParseArgs := NewGitCmd("rev-parse").Arg("HEAD").ToArgv() + head, err := self.cmd.New(revParseArgs).DontLog().RunWithOutput() + if err != nil { + return "", err + } + return strings.TrimSpace(head), nil +} + // Full ref (e.g. "refs/heads/mybranch") of the branch that is currently // being rebased, or empty string when we're not in a rebase func (self *StatusCommands) BranchBeingRebased() string { diff --git a/pkg/commands/git_commands/status_test.go b/pkg/commands/git_commands/status_test.go new file mode 100644 index 000000000..dc6b2d558 --- /dev/null +++ b/pkg/commands/git_commands/status_test.go @@ -0,0 +1,91 @@ +package git_commands + +import ( + "testing" + + "github.com/go-errors/errors" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/samber/lo" + "github.com/spf13/afero" + "github.com/stretchr/testify/assert" +) + +func TestStatusRefsSnapshot(t *testing.T) { + const forEachRefOutput = "aaaa refs/heads/main\nbbbb refs/heads/topic\n" + forEachRefArgs := []string{"for-each-ref", "--format=%(objectname) %(refname)", "refs/heads"} + + scenarios := []struct { + testName string + headFile *string // nil means: don't create a .git/HEAD file (simulates it being unreadable). + runner *oscommands.FakeCmdObjRunner + expectedHead string + }{ + { + // files backend, on a branch: read straight from .git/HEAD, no + // child process for HEAD. + testName: "attached, read from HEAD file", + headFile: lo.ToPtr("ref: refs/heads/main\n"), + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(forEachRefArgs, forEachRefOutput, nil), + expectedHead: "ref: refs/heads/main", + }, + { + // files backend, detached: .git/HEAD holds the raw hash. + testName: "detached, read from HEAD file", + headFile: lo.ToPtr("aaaa\n"), + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(forEachRefArgs, forEachRefOutput, nil), + expectedHead: "aaaa", + }, + { + // reftable backend (HEAD is a fixed stub), attached: fall back to + // symbolic-ref, which succeeds. + testName: "reftable stub, attached, fall back to symbolic-ref", + headFile: lo.ToPtr("ref: refs/heads/.invalid\n"), + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(forEachRefArgs, forEachRefOutput, nil). + ExpectGitArgs([]string{"symbolic-ref", "HEAD"}, "refs/heads/main\n", nil), + expectedHead: "refs/heads/main", + }, + { + // reftable backend, detached: symbolic-ref fails, fall back to + // rev-parse. + testName: "reftable stub, detached, fall back to rev-parse", + headFile: lo.ToPtr("ref: refs/heads/.invalid\n"), + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(forEachRefArgs, forEachRefOutput, nil). + ExpectGitArgs([]string{"symbolic-ref", "HEAD"}, "", errors.New("fatal: ref HEAD is not a symbolic ref")). + ExpectGitArgs([]string{"rev-parse", "HEAD"}, "aaaa\n", nil), + expectedHead: "aaaa", + }, + { + // HEAD file missing/unreadable: same fallback as reftable. + testName: "no HEAD file, fall back to symbolic-ref", + headFile: nil, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs(forEachRefArgs, forEachRefOutput, nil). + ExpectGitArgs([]string{"symbolic-ref", "HEAD"}, "refs/heads/main\n", nil), + expectedHead: "refs/heads/main", + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + fs := afero.NewMemMapFs() + if s.headFile != nil { + assert.NoError(t, afero.WriteFile(fs, "/repo/.git/HEAD", []byte(*s.headFile), 0o600)) + } + + instance := buildStatusCommands(commonDeps{ + runner: s.runner, + fs: fs, + repoPaths: MockRepoPaths("/repo"), + }) + + snapshot, err := instance.RefsSnapshot() + assert.NoError(t, err) + assert.Equal(t, forEachRefOutput+s.expectedHead, snapshot) + s.runner.CheckForMissingCalls() + }) + } +} diff --git a/pkg/commands/git_commands/submodule.go b/pkg/commands/git_commands/submodule.go index f06e10134..7400f0514 100644 --- a/pkg/commands/git_commands/submodule.go +++ b/pkg/commands/git_commands/submodule.go @@ -9,6 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/samber/lo" ) // .gitmodules looks like this: @@ -27,10 +28,15 @@ func NewSubmoduleCommands(gitCommon *GitCommon) *SubmoduleCommands { } func (self *SubmoduleCommands) GetConfigs(parentModule *models.SubmoduleConfig) ([]*models.SubmoduleConfig, error) { - gitModulesPath := ".gitmodules" + // Resolve the path against the repo this commands object was created for + // rather than the process working directory, so that a read from a + // still-running refresh keeps addressing that repo after the user + // switched to another one. + dir := self.repoPaths.WorktreePath() if parentModule != nil { - gitModulesPath = filepath.Join(parentModule.FullPath(), gitModulesPath) + dir = filepath.Join(dir, parentModule.FullPath()) } + gitModulesPath := filepath.Join(dir, ".gitmodules") file, err := os.Open(gitModulesPath) if err != nil { if os.IsNotExist(err) { @@ -79,13 +85,107 @@ func (self *SubmoduleCommands) GetConfigs(parentModule *models.SubmoduleConfig) } } + if err := scanner.Err(); err != nil { + return nil, err + } + return configs, nil } +// AnyHaveStageableChanges reports whether any of the given submodule paths has +// a checked-out commit that differs from the one recorded in the +// superproject's index, i.e. a change that `git add ` would actually +// stage. A submodule that only has dirty or untracked content (with no new +// commit) can't be staged from the superproject, so it won't be reported here. +func (self *SubmoduleCommands) AnyHaveStageableChanges(paths []string) (bool, error) { + if len(paths) == 0 { + return false, nil + } + + cmdArgs := NewGitCmd("submodule").Arg("status", "--").Arg(paths...).ToArgv() + output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput() + if err != nil { + return false, err + } + + // Each line looks like " ()". A '+' prefix + // means the checked-out commit differs from the index, i.e. there's a + // commit change to stage. + return lo.SomeBy(strings.Split(output, "\n"), func(line string) bool { + return strings.HasPrefix(line, "+") + }), nil +} + +// GetConflictCommits returns the three gitlink commits of a conflicted submodule +// from the index: the merge base, our (current) commit, and their (incoming) +// commit. Any of them can be empty if that stage is absent (e.g. a submodule +// that was added on only one side). The path is relative to the repo root. +func (self *SubmoduleCommands) GetConflictCommits(path string) (base string, ours string, theirs string, err error) { + cmdArgs := NewGitCmd("ls-files").Arg("-u", "-z", "--", path).ToArgv() + output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput() + if err != nil { + return "", "", "", err + } + + // Each NUL-terminated entry looks like " \t". + for _, entry := range strings.Split(output, "\x00") { + // fields are split on the tab and the spaces, so the leading three are + // always mode, sha, stage regardless of what the path contains. + fields := strings.Fields(entry) + if len(fields) < 3 { + continue + } + switch fields[2] { + case "1": + base = fields[1] + case "2": + ours = fields[1] + case "3": + theirs = fields[1] + } + } + + return base, ours, theirs, nil +} + +// GetCommitSummary returns " " for a commit inside the +// submodule at the given path, for display in the conflict menu. +func (self *SubmoduleCommands) GetCommitSummary(path string, sha string) (string, error) { + cmdArgs := NewGitCmd("log"). + Dir(path). + Arg("--format=%h %s", "--max-count=1", sha). + Config("log.showsignature=false"). + ToArgv() + + summary, err := forOtherRepo(self.cmd.New(cmdArgs)).DontLog().RunWithOutput() + return strings.TrimSpace(summary), err +} + +// CheckoutConflictCommit resolves a submodule conflict by checking the submodule +// out at the given commit. `git checkout --ours/--theirs` is a no-op on +// gitlinks, so we check out the chosen commit in the submodule itself; the +// caller then stages the submodule to record the resolution. +func (self *SubmoduleCommands) CheckoutConflictCommit(path string, sha string) error { + cmdArgs := NewGitCmd("checkout").Dir(path).Arg(sha).ToArgv() + return forOtherRepo(self.cmd.New(cmdArgs)).Run() +} + +// ConflictSideLog returns a oneline log, run inside the submodule, of the commits +// that `side` has but `otherSide` does not (i.e. `otherSide..side`) — the commits +// unique to one side of a commit conflict, relative to their common ancestor. It +// is empty if `side` is an ancestor of `otherSide` (e.g. that side was rewound). +func (self *SubmoduleCommands) ConflictSideLog(path string, side string, otherSide string) (string, error) { + cmdArgs := NewGitCmd("log").Dir(path). + Arg("--oneline", "--color=always", otherSide+".."+side). + ToArgv() + + return forOtherRepo(self.cmd.New(cmdArgs)).DontLog().RunWithOutput() +} + func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error { // if the path does not exist then it hasn't yet been initialized so we'll swallow the error // because the intention here is to have no dirty worktree state - if _, err := os.Stat(submodule.Path); os.IsNotExist(err) { + if _, err := os.Stat(filepath.Join(self.repoPaths.WorktreePath(), submodule.FullPath())); os.IsNotExist(err) { self.Log.Infof("submodule path %s does not exist, returning", submodule.FullPath()) return nil } @@ -95,20 +195,15 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error { Arg("--include-untracked"). ToArgv() - return self.cmd.New(cmdArgs).Run() + return forOtherRepo(self.cmd.New(cmdArgs)).Run() } func (self *SubmoduleCommands) Reset(submodule *models.SubmoduleConfig) error { - parentDir := "" - if submodule.ParentModule != nil { - parentDir = submodule.ParentModule.FullPath() - } cmdArgs := NewGitCmd("submodule"). Arg("update", "--init", "--force", "--", submodule.Path). - DirIf(parentDir != "", parentDir). ToArgv() - return self.cmd.New(cmdArgs).Run() + return self.runInParentModule(submodule, self.cmd.New(cmdArgs)) } func (self *SubmoduleCommands) UpdateAll() error { @@ -118,51 +213,58 @@ func (self *SubmoduleCommands) UpdateAll() error { return self.cmd.New(cmdArgs).Run() } +// runInParentModule runs the given command in the submodule's parent module's +// directory when the submodule is nested: its path arguments (and the +// .gitmodules file the config commands touch) are relative to the parent +// module. The directory is set on the command itself rather than by +// temporarily chdir-ing the process there, which would leak the parent +// module's directory into whatever other commands run concurrently (e.g. a +// background refresh's). +// +// That directory is relative, so it resolves against the process working +// directory rather than against the repo directory the command builder +// otherwise pins commands to. Only foreground commands the user issued end up +// here, and lazygit won't switch repos while one of those is in flight, so the +// two are the same directory; don't call this from background work, where they +// need not be. +func (self *SubmoduleCommands) runInParentModule(submodule *models.SubmoduleConfig, cmdObj *oscommands.CmdObj) error { + if submodule.ParentModule != nil { + forOtherRepo(cmdObj.SetWd(submodule.ParentModule.FullPath())) + } + return cmdObj.Run() +} + func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error { // based on https://gist.github.com/myusuf3/7f645819ded92bda6677 - if submodule.ParentModule != nil { - wd, err := os.Getwd() - if err != nil { - return err - } - - err = os.Chdir(submodule.ParentModule.FullPath()) - if err != nil { - return err - } - - defer func() { _ = os.Chdir(wd) }() - } - - if err := self.cmd.New( + if err := self.runInParentModule(submodule, self.cmd.New( NewGitCmd("submodule"). Arg("deinit", "--force", "--", submodule.Path).ToArgv(), - ).Run(); err != nil { + )); err != nil { if !strings.Contains(err.Error(), "did not match any file(s) known to git") { return err } - if err := self.cmd.New( + if err := self.runInParentModule(submodule, self.cmd.New( NewGitCmd("config"). Arg("--file", ".gitmodules", "--remove-section", "submodule."+submodule.Path). ToArgv(), - ).Run(); err != nil { + )); err != nil { return err } - if err := self.cmd.New( + if err := self.runInParentModule(submodule, self.cmd.New( NewGitCmd("config"). Arg("--remove-section", "submodule."+submodule.Path). ToArgv(), - ).Run(); err != nil { + )); err != nil { return err } } - if err := self.cmd.New( + if err := self.runInParentModule(submodule, self.cmd.New( NewGitCmd("rm").Arg("--force", "-r", submodule.Path).ToArgv(), - ).Run(); err != nil { + )); err != nil { // if the directory isn't there then that's fine self.Log.Error(err) } @@ -187,20 +289,6 @@ func (self *SubmoduleCommands) Add(name string, path string, url string) error { } func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newUrl string) error { - if submodule.ParentModule != nil { - wd, err := os.Getwd() - if err != nil { - return err - } - - err = os.Chdir(submodule.ParentModule.FullPath()) - if err != nil { - return err - } - - defer func() { _ = os.Chdir(wd) }() - } - setUrlCmdStr := NewGitCmd("config"). Arg( "--file", ".gitmodules", "submodule."+submodule.Name+".url", newUrl, @@ -208,14 +296,14 @@ func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newU ToArgv() // the set-url command is only for later git versions so we're doing it manually here - if err := self.cmd.New(setUrlCmdStr).Run(); err != nil { + if err := self.runInParentModule(submodule, self.cmd.New(setUrlCmdStr)); err != nil { return err } syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", submodule.Path). ToArgv() - if err := self.cmd.New(syncCmdStr).Run(); err != nil { + if err := self.runInParentModule(submodule, self.cmd.New(syncCmdStr)); err != nil { return err } diff --git a/pkg/commands/git_commands/submodule_test.go b/pkg/commands/git_commands/submodule_test.go new file mode 100644 index 000000000..d449d81de --- /dev/null +++ b/pkg/commands/git_commands/submodule_test.go @@ -0,0 +1,116 @@ +package git_commands + +import ( + "strings" + "testing" + + "github.com/go-errors/errors" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/env" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" +) + +func TestSubmoduleGetConflictCommits(t *testing.T) { + type scenario struct { + testName string + output string + expectedBase string + expectedOurs string + expectedTheirs string + } + + scenarios := []scenario{ + { + testName: "all three stages present (both modified)", + output: "160000 aaaaaaa 1\tmysub\x00160000 bbbbbbb 2\tmysub\x00160000 ccccccc 3\tmysub\x00", + expectedBase: "aaaaaaa", + expectedOurs: "bbbbbbb", + expectedTheirs: "ccccccc", + }, + { + testName: "only our and their stages (added on both sides)", + output: "160000 bbbbbbb 2\tmysub\x00160000 ccccccc 3\tmysub\x00", + expectedBase: "", + expectedOurs: "bbbbbbb", + expectedTheirs: "ccccccc", + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"ls-files", "-u", "-z", "--", "mysub"}, s.output, nil) + instance := buildSubmoduleCommands(commonDeps{runner: runner}) + + base, ours, theirs, err := instance.GetConflictCommits("mysub") + assert.NoError(t, err) + assert.Equal(t, s.expectedBase, base) + assert.Equal(t, s.expectedOurs, ours) + assert.Equal(t, s.expectedTheirs, theirs) + runner.CheckForMissingCalls() + }) + } +} + +func TestSubmoduleGetConflictCommitsError(t *testing.T) { + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"ls-files", "-u", "-z", "--", "mysub"}, "", errors.New("error")) + instance := buildSubmoduleCommands(commonDeps{runner: runner}) + + _, _, _, err := instance.GetConflictCommits("mysub") + assert.Error(t, err) + runner.CheckForMissingCalls() +} + +func TestSubmoduleGetCommitSummary(t *testing.T) { + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"-c", "log.showsignature=false", "-C", "mysub", "log", "--format=%h %s", "--max-count=1", "bbbbbbb"}, "bbbbbbb the subject\n", nil) + instance := buildSubmoduleCommands(commonDeps{runner: runner}) + + summary, err := instance.GetCommitSummary("mysub", "bbbbbbb") + assert.NoError(t, err) + assert.Equal(t, "bbbbbbb the subject", summary) + runner.CheckForMissingCalls() +} + +func TestSubmoduleCheckoutConflictCommit(t *testing.T) { + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"-C", "mysub", "checkout", "bbbbbbb"}, "", nil) + instance := buildSubmoduleCommands(commonDeps{runner: runner}) + + assert.NoError(t, instance.CheckoutConflictCommit("mysub", "bbbbbbb")) + runner.CheckForMissingCalls() +} + +// A command that runs inside a submodule mustn't inherit the GIT_DIR and +// GIT_WORK_TREE that say where the superproject is; git would answer it from +// there instead, and the answer would look perfectly plausible. +func TestSubmoduleCommandDoesntUseOurGitLocation(t *testing.T) { + t.Setenv(env.GitDirEnvVar, "/path/to/repo/.git") + t.Setenv(env.GitWorkTreeEnvVar, "/path/to/repo") + + runner := oscommands.NewFakeRunner(t). + ExpectFunc("has neither GIT_DIR nor GIT_WORK_TREE", func(cmdObj *oscommands.CmdObj) bool { + return lo.NoneBy(cmdObj.GetEnvVars(), func(envVar string) bool { + return strings.HasPrefix(envVar, env.GitDirEnvVar+"=") || + strings.HasPrefix(envVar, env.GitWorkTreeEnvVar+"=") + }) + }, "bbbbbbb the subject\n", nil) + instance := buildSubmoduleCommands(commonDeps{runner: runner}) + + _, err := instance.GetCommitSummary("mysub", "bbbbbbb") + assert.NoError(t, err) + runner.CheckForMissingCalls() +} + +func TestSubmoduleConflictSideLog(t *testing.T) { + runner := oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"-C", "mysub", "log", "--oneline", "--color=always", "ccccccc..bbbbbbb"}, "bbbbbbb left\n", nil) + instance := buildSubmoduleCommands(commonDeps{runner: runner}) + + output, err := instance.ConflictSideLog("mysub", "bbbbbbb", "ccccccc") + assert.NoError(t, err) + assert.Equal(t, "bbbbbbb left\n", output) + runner.CheckForMissingCalls() +} diff --git a/pkg/commands/git_commands/sync.go b/pkg/commands/git_commands/sync.go index d64a0910c..0400b4e26 100644 --- a/pkg/commands/git_commands/sync.go +++ b/pkg/commands/git_commands/sync.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/go-errors/errors" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/gocui" ) type SyncCommands struct { diff --git a/pkg/commands/git_commands/sync_test.go b/pkg/commands/git_commands/sync_test.go index fdc44a6b9..6a7702586 100644 --- a/pkg/commands/git_commands/sync_test.go +++ b/pkg/commands/git_commands/sync_test.go @@ -3,8 +3,8 @@ package git_commands import ( "testing" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/stretchr/testify/assert" ) diff --git a/pkg/commands/git_commands/tag.go b/pkg/commands/git_commands/tag.go index 1e9b449b1..c6fe2e807 100644 --- a/pkg/commands/git_commands/tag.go +++ b/pkg/commands/git_commands/tag.go @@ -3,8 +3,8 @@ package git_commands import ( "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/gocui" ) type TagCommands struct { @@ -43,7 +43,7 @@ func (self *TagCommands) HasTag(tagName string) bool { Arg("refs/tags/" + tagName). ToArgv() - return self.cmd.New(cmdArgs).Run() == nil + return self.cmd.New(cmdArgs).DontLog().Run() == nil } func (self *TagCommands) LocalDelete(tagName string) error { @@ -74,7 +74,7 @@ func (self *TagCommands) ShowAnnotationInfo(tagName string) (string, error) { Arg("refs/tags/" + tagName). ToArgv() - return self.cmd.New(cmdArgs).RunWithOutput() + return self.cmd.New(cmdArgs).DontLog().RunWithOutput() } func (self *TagCommands) IsTagAnnotated(tagName string) (bool, error) { @@ -83,6 +83,6 @@ func (self *TagCommands) IsTagAnnotated(tagName string) (bool, error) { Arg("refs/tags/" + tagName). ToArgv() - output, err := self.cmd.New(cmdArgs).RunWithOutput() + output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput() return strings.TrimSpace(output) == "tag", err } diff --git a/pkg/commands/git_commands/working_tree.go b/pkg/commands/git_commands/working_tree.go index 7aafe3655..846b359b3 100644 --- a/pkg/commands/git_commands/working_tree.go +++ b/pkg/commands/git_commands/working_tree.go @@ -3,13 +3,16 @@ package git_commands import ( "fmt" "os" + "path" "path/filepath" "regexp" "strings" "github.com/go-errors/errors" + "github.com/jesseduffield/generics/set" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/samber/lo" ) type WorkingTreeCommands struct { @@ -184,43 +187,168 @@ type IFileNode interface { GetFile() *models.File } -func (self *WorkingTreeCommands) DiscardAllDirChanges(node IFileNode) error { - // this could be more efficient but we would need to handle all the edge cases - return node.ForEachFile(self.DiscardAllFileChanges) -} +func (self *WorkingTreeCommands) DiscardAllDirChanges(nodes []IFileNode) error { + // Collect files into buckets so we can batch git calls where possible. + var specialFiles []*models.File // renames, AA, DU — handled individually + var filesToReset []string // need `git reset` first (staged or conflicted) + var filesToCheckout []string // need `git checkout` (after optional reset) + var filesToRemove []string // added files to delete from disk -func (self *WorkingTreeCommands) DiscardUnstagedDirChanges(node IFileNode) error { - file := node.GetFile() - if file == nil { - if err := self.RemoveUntrackedDirFiles(node); err != nil { - return err - } + for _, node := range nodes { + _ = node.ForEachFile(func(file *models.File) error { + // Renames and certain merge-conflict statuses need per-file logic. + if file.IsRename() || file.ShortStatus == "AA" || file.ShortStatus == "DU" { + specialFiles = append(specialFiles, file) + return nil + } - cmdArgs := NewGitCmd("checkout").Arg("--", node.GetPath()).ToArgv() - if err := self.cmd.New(cmdArgs).Run(); err != nil { - return err - } - } else { - if file.Added && !file.HasStagedChanges { - return self.os.RemoveFile(file.Path) - } + if file.HasStagedChanges || file.HasMergeConflicts { + filesToReset = append(filesToReset, file.Path) + // DD and AU are done after the reset; no checkout or remove needed. + if file.ShortStatus == "DD" || file.ShortStatus == "AU" { + return nil + } + if file.Added { + filesToRemove = append(filesToRemove, file.Path) + } else { + filesToCheckout = append(filesToCheckout, file.Path) + } + return nil + } - if err := self.DiscardUnstagedFileChanges(file); err != nil { + // No staged changes below this point. + if file.ShortStatus == "DD" || file.ShortStatus == "AU" { + return nil + } + + if file.Added { + filesToRemove = append(filesToRemove, file.Path) + return nil + } + + filesToCheckout = append(filesToCheckout, file.Path) + return nil + }) + } + + for _, file := range specialFiles { + if err := self.DiscardAllFileChanges(file); err != nil { return err } } + if err := runGitCmdOnPaths("reset", filesToReset, self.cmd); err != nil { + return err + } + + if err := self.removeFiles(filesToRemove, nodes); err != nil { + return err + } + + return runGitCmdOnPaths("checkout", filesToCheckout, self.cmd) +} + +func (self *WorkingTreeCommands) DiscardUnstagedDirChanges(nodes []IFileNode) error { + // Collect files into buckets so we can batch git calls where possible. + // Use specific file paths rather than directory paths, so that an active + // filter (e.g. from pressing `/`) only discards visible files. + var filesToRemove []string // purely untracked: remove from disk + var filesToCheckout []string // tracked or staged: restore via checkout + + for _, node := range nodes { + _ = node.ForEachFile(func(file *models.File) error { + if !file.Tracked && !file.HasStagedChanges { + filesToRemove = append(filesToRemove, file.Path) + } else { + // Include staged files: a file that is staged but also has + // additional unstaged changes (AM status) needs checkout to + // discard those changes. + filesToCheckout = append(filesToCheckout, file.Path) + } + return nil + }) + } + + if err := self.removeFiles(filesToRemove, nodes); err != nil { + return err + } + + return runGitCmdOnPaths("checkout", filesToCheckout, self.cmd) +} + +// Removes the given files from disk, and also removes any directories that have become empty +// because of this. +func (self *WorkingTreeCommands) removeFiles(paths []string, selectedNodes []IFileNode) error { + for _, path := range paths { + if err := self.os.RemoveFile(path); err != nil { + return err + } + } + + return self.removeEmptyDirs(paths, selectedDirPaths(selectedNodes)) +} + +// Removes empty directories left behind after deleting files, but only for directories that +// are at or below a selected directory node. It works bottom-up so that nested empty directories +// are also cleaned up. Directories that still have contents are skipped. +func (self *WorkingTreeCommands) removeEmptyDirs(removedFilePaths []string, selectedDirs []string) error { + candidates := set.NewFromSlice( + lo.FilterMap(removedFilePaths, func(filePath string, _ int) (string, bool) { + dir := path.Dir(filePath) + return dir, dir != "." && isUnderSelectedDir(dir, selectedDirs) + })) + + for { + var removed []string + for _, dir := range candidates.ToSlice() { + empty, err := self.os.IsDirEmpty(dir) + if err != nil { + return err + } + if empty { + if err := self.os.RemoveDir(dir); err != nil { + return err + } + removed = append(removed, dir) + } + } + if len(removed) == 0 { + break + } + for _, dir := range removed { + candidates.Remove(dir) + if parent := path.Dir(dir); parent != "." && isUnderSelectedDir(parent, selectedDirs) { + candidates.Add(parent) + } + } + } return nil } +func isUnderSelectedDir(path string, selectedDirs []string) bool { + isSubdir := func(parent, child string) bool { + rel, err := filepath.Rel(parent, child) + return err == nil && !strings.HasPrefix(rel, "..") + } + + return lo.SomeBy(selectedDirs, func(selectedDir string) bool { + return isSubdir(selectedDir, path) + }) +} + +func selectedDirPaths(nodes []IFileNode) []string { + return lo.FilterMap(nodes, func(node IFileNode, _ int) (string, bool) { + return node.GetPath(), node.GetFile() == nil + }) +} + func (self *WorkingTreeCommands) RemoveUntrackedDirFiles(node IFileNode) error { untrackedFilePaths := node.GetFilePathsMatching( - func(file *models.File) bool { return !file.GetIsTracked() }, + func(file *models.File) bool { return !file.GetIsTracked() && !file.GetHasStagedChanges() }, ) for _, path := range untrackedFilePaths { - err := os.Remove(path) - if err != nil { + if err := self.os.RemoveFile(path); err != nil { return err } } @@ -257,45 +385,31 @@ func (self *WorkingTreeCommands) Exclude(filename string) error { // WorktreeFileDiff returns the diff of a file func (self *WorkingTreeCommands) WorktreeFileDiff(file *models.File, plain bool, cached bool) string { // for now we assume an error means the file was deleted - s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached, nil).RunWithOutput() + s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached, file.Names()).RunWithOutput() return s } -// WorktreeFileDiffCmdObj returns a command object for diffing a file or directory -// in the working tree. When pathOverrides is non-empty, those paths are used instead of -// the node's path (used to diff only filtered/visible files within a directory). -func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool, pathOverrides []string) *oscommands.CmdObj { - colorArg := self.pagerConfig.GetColorArg() +// WorktreeFileDiffCmdObj returns a command object for diffing the given paths +// in the working tree. node is the item they belong to; all it decides is +// whether git has to compare against /dev/null, which is the case for a file +// that isn't in the index yet. +func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool, paths []string) *oscommands.CmdObj { + colorArg := self.diffRendererConfigManager.GetColorArg() if plain { colorArg = "never" } - contextSize := self.UserConfig().Git.DiffContextSize - prevPath := node.GetPreviousPath() noIndex := !node.GetIsTracked() && !node.GetHasStagedChanges() && !cached && node.GetIsFile() - extDiffCmd := self.pagerConfig.GetExternalDiffCommand() - useExtDiff := extDiffCmd != "" && !plain - useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() && !plain - - paths := pathOverrides - if len(paths) == 0 { - paths = []string{node.GetPath()} - } cmdArgs := NewGitCmd("diff"). - ConfigIf(useExtDiff, "diff.external="+extDiffCmd). - ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff"). + AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), !plain). Arg("--submodule"). - Arg(fmt.Sprintf("--unified=%d", contextSize)). Arg(fmt.Sprintf("--color=%s", colorArg)). - ArgIf(!plain && self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space"). - Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)). ArgIf(cached, "--cached"). ArgIf(noIndex, "--no-index"). Arg("--"). ArgIf(noIndex, "/dev/null"). Arg(paths...). - ArgIf(prevPath != "", prevPath). Dir(self.repoPaths.worktreePath). ToArgv() @@ -304,34 +418,30 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain // ShowFileDiff get the diff of specified from and to. Typically this will be used for a single commit so it'll be 123abc^..123abc // but when we're in diff mode it could be any 'from' to any 'to'. The reverse flag is also here thanks to diff mode. -func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bool, fileName string, plain bool) (string, error) { - return self.ShowFileDiffCmdObj(from, to, reverse, []string{fileName}, plain).RunWithOutput() +// For a renamed file, previousPath is the path it was renamed from (empty otherwise); +// both paths must be passed to git for the rename to be detected. +func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bool, fileName string, previousPath string, plain bool) (string, error) { + fileNames := []string{fileName} + if previousPath != "" { + fileNames = append(fileNames, previousPath) + } + return self.ShowFileDiffCmdObj(from, to, reverse, fileNames, plain).RunWithOutput() } func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reverse bool, fileNames []string, plain bool) *oscommands.CmdObj { - contextSize := self.UserConfig().Git.DiffContextSize - - colorArg := self.pagerConfig.GetColorArg() + colorArg := self.diffRendererConfigManager.GetColorArg() if plain { colorArg = "never" } - extDiffCmd := self.pagerConfig.GetExternalDiffCommand() - useExtDiff := extDiffCmd != "" && !plain - useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() && !plain - cmdArgs := NewGitCmd("diff"). Config("diff.noprefix=false"). - ConfigIf(useExtDiff, "diff.external="+extDiffCmd). - ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff"). + AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), !plain). Arg("--submodule"). - Arg(fmt.Sprintf("--unified=%d", contextSize)). - Arg("--no-renames"). Arg(fmt.Sprintf("--color=%s", colorArg)). Arg(from). Arg(to). ArgIf(reverse, "-R"). - ArgIf(!plain && self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space"). Arg("--"). Arg(fileNames...). Dir(self.repoPaths.worktreePath). diff --git a/pkg/commands/git_commands/working_tree_test.go b/pkg/commands/git_commands/working_tree_test.go index 712b08ca1..5b87a1320 100644 --- a/pkg/commands/git_commands/working_tree_test.go +++ b/pkg/commands/git_commands/working_tree_test.go @@ -7,6 +7,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/samber/lo" "github.com/stretchr/testify/assert" ) @@ -72,11 +73,12 @@ func TestWorkingTreeUnstageFile(t *testing.T) { // when the 'what' is what matters func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { type scenario struct { - testName string - file *models.File - removeFile func(string) error - runner *oscommands.FakeCmdObjRunner - expectedError string + testName string + file *models.File + removedFileErr error + runner *oscommands.FakeCmdObjRunner + expectedError string + expectedRemovedFiles []string } scenarios := []scenario{ @@ -86,7 +88,6 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Path: "test", HasStagedChanges: true, }, - removeFile: func(string) error { return nil }, runner: oscommands.NewFakeRunner(t). ExpectGitArgs([]string{"reset", "--", "test"}, "", errors.New("error")), expectedError: "error", @@ -98,11 +99,10 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Tracked: false, Added: true, }, - removeFile: func(string) error { - return errors.New("an error occurred when removing file") - }, - runner: oscommands.NewFakeRunner(t), - expectedError: "an error occurred when removing file", + removedFileErr: errors.New("an error occurred when removing file"), + runner: oscommands.NewFakeRunner(t), + expectedError: "an error occurred when removing file", + expectedRemovedFiles: []string{"test"}, }, { testName: "An error occurred with checkout", @@ -111,7 +111,6 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Tracked: true, HasStagedChanges: false, }, - removeFile: func(string) error { return nil }, runner: oscommands.NewFakeRunner(t). ExpectGitArgs([]string{"checkout", "--", "test"}, "", errors.New("error")), expectedError: "error", @@ -123,10 +122,8 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Tracked: true, HasStagedChanges: false, }, - removeFile: func(string) error { return nil }, runner: oscommands.NewFakeRunner(t). ExpectGitArgs([]string{"checkout", "--", "test"}, "", nil), - expectedError: "", }, { testName: "Reset and checkout staged changes", @@ -135,11 +132,9 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Tracked: true, HasStagedChanges: true, }, - removeFile: func(string) error { return nil }, runner: oscommands.NewFakeRunner(t). ExpectGitArgs([]string{"reset", "--", "test"}, "", nil). ExpectGitArgs([]string{"checkout", "--", "test"}, "", nil), - expectedError: "", }, { testName: "Reset and checkout merge conflicts", @@ -148,11 +143,9 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Tracked: true, HasMergeConflicts: true, }, - removeFile: func(string) error { return nil }, runner: oscommands.NewFakeRunner(t). ExpectGitArgs([]string{"reset", "--", "test"}, "", nil). ExpectGitArgs([]string{"checkout", "--", "test"}, "", nil), - expectedError: "", }, { testName: "Reset and remove", @@ -162,13 +155,9 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Added: true, HasStagedChanges: true, }, - removeFile: func(filename string) error { - assert.Equal(t, "test", filename) - return nil - }, runner: oscommands.NewFakeRunner(t). ExpectGitArgs([]string{"reset", "--", "test"}, "", nil), - expectedError: "", + expectedRemovedFiles: []string{"test"}, }, { testName: "Remove only", @@ -178,18 +167,19 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { Added: true, HasStagedChanges: false, }, - removeFile: func(filename string) error { - assert.Equal(t, "test", filename) - return nil - }, - runner: oscommands.NewFakeRunner(t), - expectedError: "", + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"test"}, }, } for _, s := range scenarios { t.Run(s.testName, func(t *testing.T) { - instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, removeFile: s.removeFile}) + var removedFiles []string + removeFile := func(path string) error { + removedFiles = append(removedFiles, path) + return s.removedFileErr + } + instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, removeFile: removeFile}) err := instance.DiscardAllFileChanges(s.file) if s.expectedError == "" { @@ -197,6 +187,7 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) { } else { assert.Equal(t, s.expectedError, err.Error()) } + assert.Equal(t, s.expectedRemovedFiles, removedFiles) s.runner.CheckForMissingCalls() }) } @@ -230,7 +221,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 3, similarityThreshold: 50, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil), }, { testName: "cached", @@ -245,7 +236,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 3, similarityThreshold: 50, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=50%", "--cached", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--cached", "--", "test.txt"}, expectedResult, nil), }, { testName: "plain", @@ -260,7 +251,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 3, similarityThreshold: 50, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=never", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=never", "--", "test.txt"}, expectedResult, nil), }, { testName: "File not tracked and file has no staged changes", @@ -275,7 +266,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 3, similarityThreshold: 50, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=50%", "--no-index", "--", "/dev/null", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--no-index", "--", "/dev/null", "test.txt"}, expectedResult, nil), }, { testName: "Default case (ignore whitespace)", @@ -290,7 +281,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 3, similarityThreshold: 50, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--ignore-all-space", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--ignore-all-space", "--find-renames=50%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil), }, { testName: "Show diff with custom context size", @@ -305,7 +296,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 17, similarityThreshold: 50, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=17", "--color=always", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=17", "--find-renames=50%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil), }, { testName: "Show diff with custom similarity threshold", @@ -320,7 +311,7 @@ func TestWorkingTreeDiff(t *testing.T) { contextSize: 3, similarityThreshold: 33, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=33%", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=33%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil), }, } @@ -348,6 +339,8 @@ func TestWorkingTreeShowFileDiff(t *testing.T) { from string to string reverse bool + fileName string + previousPath string plain bool ignoreWhitespace bool contextSize uint64 @@ -362,33 +355,49 @@ func TestWorkingTreeShowFileDiff(t *testing.T) { from: "1234567890", to: "0987654321", reverse: false, + fileName: "test.txt", plain: false, ignoreWhitespace: false, contextSize: 3, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil), }, { testName: "Show diff with custom context size", from: "1234567890", to: "0987654321", reverse: false, + fileName: "test.txt", plain: false, ignoreWhitespace: false, contextSize: 123, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=123", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=123", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil), }, { testName: "Default case (ignore whitespace)", from: "1234567890", to: "0987654321", reverse: false, + fileName: "test.txt", plain: false, ignoreWhitespace: true, contextSize: 3, runner: oscommands.NewFakeRunner(t). - ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--no-renames", "--color=always", "1234567890", "0987654321", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil), + ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=3", "--ignore-all-space", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil), + }, + { + testName: "Renamed file passes both paths so the rename is detected", + from: "1234567890", + to: "0987654321", + reverse: false, + fileName: "new.txt", + previousPath: "old.txt", + plain: false, + ignoreWhitespace: false, + contextSize: 3, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "new.txt", "old.txt"}, expectedResult, nil), }, } @@ -403,7 +412,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) { instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig, appState: &config.AppState{}, repoPaths: &repoPaths}) - result, err := instance.ShowFileDiff(s.from, s.to, s.reverse, "test.txt", s.plain) + result, err := instance.ShowFileDiff(s.from, s.to, s.reverse, s.fileName, s.previousPath, s.plain) assert.NoError(t, err) assert.Equal(t, expectedResult, result) s.runner.CheckForMissingCalls() @@ -482,6 +491,314 @@ func TestWorkingTreeDiscardUnstagedFileChanges(t *testing.T) { } } +// testNode implements IFileNode for unit tests. +type testNode struct { + children []*testNode + path string + file *models.File // non-nil only for file nodes +} + +func (n *testNode) ForEachFile(cb func(*models.File) error) error { + if n.file != nil { + return cb(n.file) + } + for _, child := range n.children { + if err := child.ForEachFile(cb); err != nil { + return err + } + } + return nil +} + +func (n *testNode) GetFilePathsMatching(test func(*models.File) bool) []string { + if n.file != nil { + if test(n.file) { + return []string{n.path} + } + return nil + } + return lo.FlatMap(n.children, func(child *testNode, _ int) []string { + return child.GetFilePathsMatching(test) + }) +} + +func (n *testNode) GetPath() string { return n.path } +func (n *testNode) GetFile() *models.File { return n.file } + +func TestWorkingTreeDiscardAllDirChanges(t *testing.T) { + type scenario struct { + testName string + nodes []IFileNode + runner *oscommands.FakeCmdObjRunner + dirsWithRemainingFiles []string // dirs where isDirEmpty returns false + expectedRemovedFiles []string + expectedRemovedDirs []string + } + + scenarios := []scenario{ + { + testName: "multiple regular tracked files batched into a single checkout call", + nodes: []IFileNode{&testNode{ + children: []*testNode{ + {path: "a.txt", file: &models.File{Path: "a.txt", Tracked: true}}, + {path: "b.txt", file: &models.File{Path: "b.txt", Tracked: true}}, + {path: "c.txt", file: &models.File{Path: "c.txt", Tracked: true}}, + }, + }}, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"checkout", "--", "a.txt", "b.txt", "c.txt"}, "", nil), + }, + { + testName: "staged files batched into a single reset then a single checkout", + nodes: []IFileNode{&testNode{ + children: []*testNode{ + {path: "a.txt", file: &models.File{Path: "a.txt", Tracked: true, HasStagedChanges: true}}, + {path: "b.txt", file: &models.File{Path: "b.txt", Tracked: true, HasStagedChanges: true}}, + }, + }}, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"reset", "--", "a.txt", "b.txt"}, "", nil). + ExpectGitArgs([]string{"checkout", "--", "a.txt", "b.txt"}, "", nil), + }, + { + testName: "added files with no staged changes are removed from disk without any git call", + nodes: []IFileNode{&testNode{ + children: []*testNode{ + {path: "new1.txt", file: &models.File{Path: "new1.txt", Added: true}}, + {path: "new2.txt", file: &models.File{Path: "new2.txt", Added: true}}, + }, + }}, + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"new1.txt", "new2.txt"}, + }, + { + testName: "files from multiple nodes are batched into a single git call", + nodes: []IFileNode{ + &testNode{ + path: "dir1", + children: []*testNode{ + {path: "dir1/a.txt", file: &models.File{Path: "dir1/a.txt", Tracked: true}}, + {path: "dir1/b.txt", file: &models.File{Path: "dir1/b.txt", Added: true}}, + }, + }, + &testNode{ + path: "dir2", + children: []*testNode{ + {path: "dir2/c.txt", file: &models.File{Path: "dir2/c.txt", Tracked: true}}, + {path: "dir2/d.txt", file: &models.File{Path: "dir2/d.txt", Added: true}}, + }, + }, + }, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"checkout", "--", "dir1/a.txt", "dir2/c.txt"}, "", nil), + dirsWithRemainingFiles: []string{"dir1", "dir2"}, // tracked files a.txt / c.txt remain + expectedRemovedFiles: []string{"dir1/b.txt", "dir2/d.txt"}, + }, + { + testName: "empty parent directory is removed after all its added files are deleted", + nodes: []IFileNode{&testNode{ + path: "dir", + children: []*testNode{ + { + path: "dir/newdir", + children: []*testNode{ + {path: "dir/newdir/a.txt", file: &models.File{Path: "dir/newdir/a.txt", Added: true}}, + {path: "dir/newdir/b.txt", file: &models.File{Path: "dir/newdir/b.txt", Added: true}}, + }, + }, + }, + }}, + runner: oscommands.NewFakeRunner(t), + dirsWithRemainingFiles: []string{"dir"}, // assume there are other tracked files in dir + expectedRemovedFiles: []string{"dir/newdir/a.txt", "dir/newdir/b.txt"}, + expectedRemovedDirs: []string{"dir/newdir"}, + }, + { + testName: "nested empty directories are removed bottom-up", + nodes: []IFileNode{&testNode{ + path: "newdir", + children: []*testNode{ + { + path: "newdir/sub", + children: []*testNode{ + {path: "newdir/sub/file.txt", file: &models.File{Path: "newdir/sub/file.txt", Added: true}}, + }, + }, + }, + }}, + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"newdir/sub/file.txt"}, + expectedRemovedDirs: []string{"newdir/sub", "newdir"}, + }, + { + testName: "empty directory is NOT removed when individual file nodes are selected", + nodes: []IFileNode{ + &testNode{path: "newdir/a.txt", file: &models.File{Path: "newdir/a.txt", Added: true}}, + &testNode{path: "newdir/b.txt", file: &models.File{Path: "newdir/b.txt", Added: true}}, + }, + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"newdir/a.txt", "newdir/b.txt"}, + // newdir becomes empty but was not selected as a directory node, so it is not removed + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + var removedFiles []string + removeFile := func(path string) error { + removedFiles = append(removedFiles, path) + return nil + } + isDirEmpty := func(path string) (bool, error) { return !lo.Contains(s.dirsWithRemainingFiles, path), nil } + var removedDirs []string + removeDir := func(path string) error { + removedDirs = append(removedDirs, path) + return nil + } + instance := buildWorkingTreeCommands(commonDeps{ + runner: s.runner, + removeFile: removeFile, + isDirEmpty: isDirEmpty, + removeDir: removeDir, + }) + err := instance.DiscardAllDirChanges(s.nodes) + assert.NoError(t, err) + assert.Equal(t, s.expectedRemovedFiles, removedFiles) + assert.Equal(t, s.expectedRemovedDirs, removedDirs) + s.runner.CheckForMissingCalls() + }) + } +} + +func TestWorkingTreeDiscardUnstagedDirChanges(t *testing.T) { + type scenario struct { + testName string + nodes []IFileNode + runner *oscommands.FakeCmdObjRunner + dirsWithRemainingFiles []string // dirs where isDirEmpty returns false + expectedRemovedFiles []string + expectedRemovedDirs []string + } + + scenarios := []scenario{ + { + testName: "directory node: removes untracked files and checks out tracked files by path, not by directory", + nodes: []IFileNode{&testNode{ + path: "dir", + children: []*testNode{ + {path: "dir/tracked1.txt", file: &models.File{Path: "dir/tracked1.txt", Tracked: true}}, + {path: "dir/tracked2.txt", file: &models.File{Path: "dir/tracked2.txt", Tracked: true}}, + {path: "dir/new.txt", file: &models.File{Path: "dir/new.txt", Tracked: false}}, + }, + }}, + // Must checkout the individual files, not "dir" — otherwise a filter would be ignored. + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"checkout", "--", "dir/tracked1.txt", "dir/tracked2.txt"}, "", nil), + dirsWithRemainingFiles: []string{"dir"}, // tracked files remain in dir + expectedRemovedFiles: []string{"dir/new.txt"}, + }, + { + testName: "directory node: staged-but-not-committed file (Tracked=false, HasStagedChanges=true) is left alone; purely untracked file is removed", + nodes: []IFileNode{&testNode{ + path: "dir", + children: []*testNode{ + // Staged new files: not removed from disk, but checked out in + // case they also have unstaged changes on top (AM status). + {path: "dir/staged-new1.txt", file: &models.File{Path: "dir/staged-new1.txt", Tracked: false, Added: true, HasStagedChanges: true}}, + {path: "dir/staged-new2.txt", file: &models.File{Path: "dir/staged-new2.txt", Tracked: false, Added: true, HasStagedChanges: true}}, + // Purely untracked file: removed from disk, not checked out. + {path: "dir/untracked.txt", file: &models.File{Path: "dir/untracked.txt", Tracked: false, Added: true, HasStagedChanges: false}}, + }, + }}, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"checkout", "--", "dir/staged-new1.txt", "dir/staged-new2.txt"}, "", nil), + dirsWithRemainingFiles: []string{"dir"}, // staged files remain in dir + expectedRemovedFiles: []string{"dir/untracked.txt"}, + }, + { + testName: "file node: added and unstaged file is removed from disk", + nodes: []IFileNode{&testNode{ + path: "new.txt", + file: &models.File{Path: "new.txt", Added: true, HasStagedChanges: false}, + }}, + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"new.txt"}, + }, + { + testName: "files from multiple nodes are batched into a single checkout call", + nodes: []IFileNode{ + &testNode{ + path: "dir1", + children: []*testNode{ + {path: "dir1/tracked.txt", file: &models.File{Path: "dir1/tracked.txt", Tracked: true}}, + {path: "dir1/untracked.txt", file: &models.File{Path: "dir1/untracked.txt", Tracked: false}}, + }, + }, + &testNode{ + path: "dir2", + children: []*testNode{ + {path: "dir2/tracked.txt", file: &models.File{Path: "dir2/tracked.txt", Tracked: true}}, + {path: "dir2/untracked.txt", file: &models.File{Path: "dir2/untracked.txt", Tracked: false}}, + }, + }, + }, + runner: oscommands.NewFakeRunner(t). + ExpectGitArgs([]string{"checkout", "--", "dir1/tracked.txt", "dir2/tracked.txt"}, "", nil), + dirsWithRemainingFiles: []string{"dir1", "dir2"}, // tracked files remain + expectedRemovedFiles: []string{"dir1/untracked.txt", "dir2/untracked.txt"}, + }, + { + testName: "empty untracked directory is removed after its files are deleted", + nodes: []IFileNode{&testNode{ + path: "newdir", + children: []*testNode{ + {path: "newdir/a.txt", file: &models.File{Path: "newdir/a.txt", Tracked: false}}, + {path: "newdir/b.txt", file: &models.File{Path: "newdir/b.txt", Tracked: false}}, + }, + }}, + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"newdir/a.txt", "newdir/b.txt"}, + expectedRemovedDirs: []string{"newdir"}, + }, + { + testName: "empty directory is NOT removed when individual file nodes are selected", + nodes: []IFileNode{ + &testNode{path: "newdir/a.txt", file: &models.File{Path: "newdir/a.txt", Tracked: false}}, + &testNode{path: "newdir/b.txt", file: &models.File{Path: "newdir/b.txt", Tracked: false}}, + }, + runner: oscommands.NewFakeRunner(t), + expectedRemovedFiles: []string{"newdir/a.txt", "newdir/b.txt"}, + // newdir becomes empty but was not selected as a directory node, so it is not removed + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + var removedFiles []string + removeFile := func(path string) error { + removedFiles = append(removedFiles, path) + return nil + } + isDirEmpty := func(path string) (bool, error) { return !lo.Contains(s.dirsWithRemainingFiles, path), nil } + var removedDirs []string + removeDir := func(path string) error { + removedDirs = append(removedDirs, path) + return nil + } + instance := buildWorkingTreeCommands(commonDeps{ + runner: s.runner, + removeFile: removeFile, + isDirEmpty: isDirEmpty, + removeDir: removeDir, + }) + assert.NoError(t, instance.DiscardUnstagedDirChanges(s.nodes)) + s.runner.CheckForMissingCalls() + assert.Equal(t, s.expectedRemovedFiles, removedFiles) + assert.Equal(t, s.expectedRemovedDirs, removedDirs) + }) + } +} + func TestWorkingTreeDiscardAnyUnstagedFileChanges(t *testing.T) { type scenario struct { testName string diff --git a/pkg/commands/git_commands/worktree.go b/pkg/commands/git_commands/worktree.go index 986bb6d42..64748b878 100644 --- a/pkg/commands/git_commands/worktree.go +++ b/pkg/commands/git_commands/worktree.go @@ -51,7 +51,7 @@ func (self *WorktreeCommands) Delete(worktreePath string, force bool) error { func (self *WorktreeCommands) Detach(worktreePath string) error { cmdArgs := NewGitCmd("checkout").Arg("--detach").GitDir(filepath.Join(worktreePath, ".git")).ToArgv() - return self.cmd.New(cmdArgs).Run() + return forOtherRepo(self.cmd.New(cmdArgs)).Run() } func WorktreeForBranch(branch *models.Branch, worktrees []*models.Worktree) (*models.Worktree, bool) { diff --git a/pkg/commands/git_commands/worktree_loader.go b/pkg/commands/git_commands/worktree_loader.go index 0e3615f13..f7577c870 100644 --- a/pkg/commands/git_commands/worktree_loader.go +++ b/pkg/commands/git_commands/worktree_loader.go @@ -22,9 +22,6 @@ func NewWorktreeLoader(gitCommon *GitCommon) *WorktreeLoader { } func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) { - currentRepoPath := self.repoPaths.RepoPath() - worktreePath := self.repoPaths.WorktreePath() - cmdArgs := NewGitCmd("worktree").Arg("list", "--porcelain").ToArgv() worktreesOutput, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput() if err != nil { @@ -54,17 +51,13 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) { if strings.HasPrefix(splitLine, "worktree ") { path := strings.SplitN(splitLine, " ", 2)[1] - isMain := path == currentRepoPath - isCurrent := path == worktreePath - isPathMissing := self.pathExists(path) current = &models.Worktree{ - IsMain: isMain, - IsCurrent: isCurrent, - IsPathMissing: isPathMissing, + IsPathMissing: self.pathExists(path), Path: path, // we defer populating GitDir until a loop below so that - // we can parallelize the calls to git rev-parse + // we can parallelize the calls to git rev-parse, and + // IsMain/IsCurrent because they are derived from GitDir GitDir: "", } } else if strings.HasPrefix(splitLine, "HEAD ") { @@ -84,7 +77,7 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) { if worktree.IsPathMissing { return } - gitDir, err := callGitRevParseWithDir(self.cmd, worktree.Path, "--absolute-git-dir") + gitDir, err := callGitRevParseInOtherRepo(self.cmd, worktree.Path, "--absolute-git-dir") if err != nil { self.Log.Warnf("Could not find git dir for worktree %s: %v", worktree.Path, err) return @@ -95,6 +88,23 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) { } wg.Wait() + // Identify the current and the main worktree by their git dir rather than by + // their path: `git worktree list` reports the main worktree as the common + // git dir with a trailing "/.git" removed, which is the working tree only + // when the git dir sits inside it. In a submodule, a bare repo or a repo + // using core.worktree it doesn't, and comparing paths then matches nothing. + // A worktree whose directory is gone has no git dir to compare, so there we + // have nothing better than its path. + for _, worktree := range worktrees { + if worktree.GitDir != "" { + worktree.IsCurrent = worktree.GitDir == self.repoPaths.WorktreeGitDirPath() + worktree.IsMain = worktree.GitDir == self.repoPaths.RepoGitDirPath() + } else { + worktree.IsCurrent = worktree.Path == self.repoPaths.WorktreePath() + worktree.IsMain = worktree.Path == self.repoPaths.RepoPath() + } + } + names := getUniqueNamesFromPaths(lo.Map(worktrees, func(worktree *models.Worktree, _ int) string { return worktree.Path })) diff --git a/pkg/commands/git_commands/worktree_loader_test.go b/pkg/commands/git_commands/worktree_loader_test.go index 1127540ca..c537c6be4 100644 --- a/pkg/commands/git_commands/worktree_loader_test.go +++ b/pkg/commands/git_commands/worktree_loader_test.go @@ -23,8 +23,10 @@ func TestGetWorktrees(t *testing.T) { { testName: "Single worktree (main)", repoPaths: &RepoPaths{ - repoPath: "/path/to/repo", - worktreePath: "/path/to/repo", + repoPath: "/path/to/repo", + worktreePath: "/path/to/repo", + repoGitDirPath: "/path/to/repo/.git", + worktreeGitDirPath: "/path/to/repo/.git", }, before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) { runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"}, @@ -55,8 +57,10 @@ branch refs/heads/mybranch { testName: "Multiple worktrees (main + linked)", repoPaths: &RepoPaths{ - repoPath: "/path/to/repo", - worktreePath: "/path/to/repo", + repoPath: "/path/to/repo", + worktreePath: "/path/to/repo", + repoGitDirPath: "/path/to/repo/.git", + worktreeGitDirPath: "/path/to/repo/.git", }, before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) { runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"}, @@ -106,8 +110,10 @@ branch refs/heads/mybranch-worktree { testName: "Worktree missing path", repoPaths: &RepoPaths{ - repoPath: "/path/to/repo", - worktreePath: "/path/to/repo", + repoPath: "/path/to/repo", + worktreePath: "/path/to/repo", + repoGitDirPath: "/path/to/repo/.git", + worktreeGitDirPath: "/path/to/repo/.git", }, before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) { runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"}, @@ -136,8 +142,10 @@ branch refs/heads/missingbranch { testName: "In linked worktree", repoPaths: &RepoPaths{ - repoPath: "/path/to/repo", - worktreePath: "/path/to/repo-worktree", + repoPath: "/path/to/repo", + worktreePath: "/path/to/repo-worktree", + repoGitDirPath: "/path/to/repo/.git", + worktreeGitDirPath: "/path/to/repo/.git/worktrees/repo-worktree", }, before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) { runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"}, @@ -184,11 +192,51 @@ branch refs/heads/mybranch-worktree }, expectedErr: "", }, + { + testName: "In a submodule", + repoPaths: &RepoPaths{ + repoPath: "/path/to/repo/mysubmodule", + worktreePath: "/path/to/repo/mysubmodule", + repoGitDirPath: "/path/to/repo/.git/modules/mysubmodule", + worktreeGitDirPath: "/path/to/repo/.git/modules/mysubmodule", + }, + before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) { + // A submodule's git dir doesn't live inside its working tree, and + // `git worktree list` reports the git dir rather than the working + // tree it belongs to. + runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"}, + `worktree /path/to/repo/.git/modules/mysubmodule +HEAD d85cc9d281fa6ae1665c68365fc70e75e82a042d +branch refs/heads/mybranch +`, + nil) + + gitArgs := append(append([]string{"-C", "/path/to/repo/.git/modules/mysubmodule"}, getRevParseArgs()...), "--absolute-git-dir") + runner.ExpectGitArgs(gitArgs, "/path/to/repo/.git/modules/mysubmodule", nil) + + _ = fs.MkdirAll("/path/to/repo/.git/modules/mysubmodule", 0o755) + }, + expectedWorktrees: []*models.Worktree{ + { + IsMain: true, + IsCurrent: true, + Path: "/path/to/repo/.git/modules/mysubmodule", + IsPathMissing: false, + GitDir: "/path/to/repo/.git/modules/mysubmodule", + Branch: "mybranch", + Head: "d85cc9d281fa6ae1665c68365fc70e75e82a042d", + Name: "mysubmodule", + }, + }, + expectedErr: "", + }, { testName: "Detached HEAD worktree", repoPaths: &RepoPaths{ - repoPath: "/path/to/repo", - worktreePath: "/path/to/repo", + repoPath: "/path/to/repo", + worktreePath: "/path/to/repo", + repoGitDirPath: "/path/to/repo/.git", + worktreeGitDirPath: "/path/to/repo/.git", }, before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) { runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"}, diff --git a/pkg/commands/git_config/cached_git_config.go b/pkg/commands/git_config/cached_git_config.go index 256cd325b..17152ef9e 100644 --- a/pkg/commands/git_config/cached_git_config.go +++ b/pkg/commands/git_config/cached_git_config.go @@ -16,11 +16,19 @@ type IGitConfig interface { // this is for when you want to pass 'mykey' and check if the result is truthy GetBool(string) bool + // SetDir pins the config commands to the given repo directory, so that + // they keep reading that repo's local config even if the process working + // directory changes later (i.e. the user switches repos while this + // instance is still in use by in-flight work). Called once, before the + // first read. + SetDir(string) + DropCache() } type CachedGitConfig struct { cache map[string]string + dir string runGitConfigCmd func(*exec.Cmd) (string, error) log *logrus.Entry mutex sync.Mutex @@ -39,6 +47,13 @@ func NewCachedGitConfig(runGitConfigCmd func(*exec.Cmd) (string, error), log *lo } } +func (self *CachedGitConfig) SetDir(dir string) { + self.mutex.Lock() + defer self.mutex.Unlock() + + self.dir = dir +} + func (self *CachedGitConfig) Get(key string) string { self.mutex.Lock() defer self.mutex.Unlock() @@ -69,6 +84,7 @@ func (self *CachedGitConfig) GetGeneral(args string) string { func (self *CachedGitConfig) getGeneralAux(args string) string { cmd := getGitConfigGeneralCmd(args) + cmd.Dir = self.dir value, err := self.runGitConfigCmd(cmd) if err != nil { self.log.Debugf("Error getting git config value for args: %s. Error: %v", args, err.Error()) @@ -79,6 +95,7 @@ func (self *CachedGitConfig) getGeneralAux(args string) string { func (self *CachedGitConfig) getAux(key string) string { cmd := getGitConfigCmd(key) + cmd.Dir = self.dir value, err := self.runGitConfigCmd(cmd) if err != nil { self.log.Debugf("Error getting git config value for key: %s. Error: %v", key, err.Error()) diff --git a/pkg/commands/git_config/cached_git_config_test.go b/pkg/commands/git_config/cached_git_config_test.go index fd884df65..7b92eed1e 100644 --- a/pkg/commands/git_config/cached_git_config_test.go +++ b/pkg/commands/git_config/cached_git_config_test.go @@ -116,3 +116,20 @@ func TestGet(t *testing.T) { assert.Equal(t, "blah", result) assert.Equal(t, 1, count) } + +// The config commands run in the directory set by SetDir rather than in the +// process's current directory: lazygit chdirs when switching repos, and config +// reads issued for the previous repo after that must keep addressing the repo +// they were created for. +func TestSetDirPinsCommandsToDirectory(t *testing.T) { + real := NewCachedGitConfig( + func(cmd *exec.Cmd) (string, error) { + assert.Equal(t, "/path/to/repo", cmd.Dir) + return "blah", nil + }, + utils.NewDummyLog(), + ) + real.SetDir("/path/to/repo") + real.Get("commit.gpgsign") + real.GetGeneral("--local --get-regexp foo") +} diff --git a/pkg/commands/git_config/fake_git_config.go b/pkg/commands/git_config/fake_git_config.go index e82efcd1b..442c18644 100644 --- a/pkg/commands/git_config/fake_git_config.go +++ b/pkg/commands/git_config/fake_git_config.go @@ -28,5 +28,8 @@ func (self *FakeGitConfig) GetBool(key string) bool { return isTruthy(self.Get(key)) } +func (self *FakeGitConfig) SetDir(dir string) { +} + func (self *FakeGitConfig) DropCache() { } diff --git a/pkg/commands/hosting_service/definitions.go b/pkg/commands/hosting_service/definitions.go index 25e449340..09fa191c8 100644 --- a/pkg/commands/hosting_service/definitions.go +++ b/pkg/commands/hosting_service/definitions.go @@ -1,12 +1,18 @@ package hosting_service +import "regexp" + // if you want to make a custom regex for a given service feel free to test it out // at https://regex101.com using the flavor Golang -var defaultUrlRegexStrings = []string{ - `^(?:https?|ssh)://[^/]+/(?P.*)/(?P.*?)(?:\.git)?$`, - `^(.*?@)?.*:/*(?P.*)/(?P.*?)(?:\.git)?$`, +var defaultUrlRegexps = []*regexp.Regexp{ + regexp.MustCompile(`^(?:https?|ssh)://[^/]+/(?P.*)/(?P.*?)(?:\.git)?$`), + regexp.MustCompile(`^(.*?@)?.*:/*(?P.*)/(?P.*?)(?:\.git)?$`), } -var defaultRepoURLTemplate = "https://{{.webDomain}}/{{.owner}}/{{.repo}}" + +var ( + defaultRepoURLTemplate = "https://{{.webDomain}}/{{.owner}}/{{.repo}}" + defaultRepoNameTemplate = "{{.owner}}/{{.repo}}" +) // we've got less type safety using go templates but this lends itself better to // users adding custom service definitions in their config @@ -15,8 +21,9 @@ var githubServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/compare/{{.From}}?expand=1", pullRequestURLIntoTargetBranch: "/compare/{{.To}}...{{.From}}?expand=1", commitURL: "/commit/{{.CommitHash}}", - regexStrings: defaultUrlRegexStrings, + urlRegexps: defaultUrlRegexps, repoURLTemplate: defaultRepoURLTemplate, + repoNameTemplate: defaultRepoNameTemplate, } var bitbucketServiceDef = ServiceDefinition{ @@ -24,11 +31,12 @@ var bitbucketServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/pull-requests/new?source={{.From}}&t=1", pullRequestURLIntoTargetBranch: "/pull-requests/new?source={{.From}}&dest={{.To}}&t=1", commitURL: "/commits/{{.CommitHash}}", - regexStrings: []string{ - `^(?:https?|ssh)://.*/(?P.*)/(?P.*?)(?:\.git)?$`, - `^.*@.*:/*(?P.*)/(?P.*?)(?:\.git)?$`, + urlRegexps: []*regexp.Regexp{ + regexp.MustCompile(`^(?:https?|ssh)://.*/(?P.*)/(?P.*?)(?:\.git)?$`), + regexp.MustCompile(`^.*@.*:/*(?P.*)/(?P.*?)(?:\.git)?$`), }, - repoURLTemplate: defaultRepoURLTemplate, + repoURLTemplate: defaultRepoURLTemplate, + repoNameTemplate: defaultRepoNameTemplate, } var gitLabServiceDef = ServiceDefinition{ @@ -36,8 +44,9 @@ var gitLabServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/-/merge_requests/new?merge_request%5Bsource_branch%5D={{.From}}", pullRequestURLIntoTargetBranch: "/-/merge_requests/new?merge_request%5Bsource_branch%5D={{.From}}&merge_request%5Btarget_branch%5D={{.To}}", commitURL: "/-/commit/{{.CommitHash}}", - regexStrings: defaultUrlRegexStrings, + urlRegexps: defaultUrlRegexps, repoURLTemplate: defaultRepoURLTemplate, + repoNameTemplate: defaultRepoNameTemplate, } var azdoServiceDef = ServiceDefinition{ @@ -45,13 +54,14 @@ var azdoServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/pullrequestcreate?sourceRef={{.From}}", pullRequestURLIntoTargetBranch: "/pullrequestcreate?sourceRef={{.From}}&targetRef={{.To}}", commitURL: "/commit/{{.CommitHash}}", - regexStrings: []string{ - `^.+@vs-ssh\.visualstudio\.com[:/](?:v3/)?(?P[^/]+)/(?P[^/]+)/(?P[^/]+?)(?:\.git)?$`, - `^git@ssh.dev.azure.com.*/(?P.*)/(?P.*)/(?P.*?)(?:\.git)?$`, - `^https://.*@dev.azure.com/(?P.*?)/(?P.*?)/_git/(?P.*?)(?:\.git)?$`, - `^https://.*/(?P.*?)/(?P.*?)/_git/(?P.*?)(?:\.git)?$`, + urlRegexps: []*regexp.Regexp{ + regexp.MustCompile(`^.+@vs-ssh\.visualstudio\.com[:/](?:v3/)?(?P[^/]+)/(?P[^/]+)/(?P[^/]+?)(?:\.git)?$`), + regexp.MustCompile(`^git@ssh.dev.azure.com.*/(?P.*)/(?P.*)/(?P.*?)(?:\.git)?$`), + regexp.MustCompile(`^https://.*@dev.azure.com/(?P.*?)/(?P.*?)/_git/(?P.*?)(?:\.git)?$`), + regexp.MustCompile(`^https://.*/(?P.*?)/(?P.*?)/_git/(?P.*?)(?:\.git)?$`), }, - repoURLTemplate: "https://{{.webDomain}}/{{.org}}/{{.project}}/_git/{{.repo}}", + repoURLTemplate: "https://{{.webDomain}}/{{.org}}/{{.project}}/_git/{{.repo}}", + repoNameTemplate: "{{.org}}/{{.project}}/{{.repo}}", } var bitbucketServerServiceDef = ServiceDefinition{ @@ -59,11 +69,12 @@ var bitbucketServerServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/pull-requests?create&sourceBranch={{.From}}", pullRequestURLIntoTargetBranch: "/pull-requests?create&targetBranch={{.To}}&sourceBranch={{.From}}", commitURL: "/commits/{{.CommitHash}}", - regexStrings: []string{ - `^ssh://git@.*/(?P.*)/(?P.*?)(?:\.git)?$`, - `^https://.*/scm/(?P.*)/(?P.*?)(?:\.git)?$`, + urlRegexps: []*regexp.Regexp{ + regexp.MustCompile(`^ssh://git@.*/(?P.*)/(?P.*?)(?:\.git)?$`), + regexp.MustCompile(`^https://.*/scm/(?P.*)/(?P.*?)(?:\.git)?$`), }, - repoURLTemplate: "https://{{.webDomain}}/projects/{{.project}}/repos/{{.repo}}", + repoURLTemplate: "https://{{.webDomain}}/projects/{{.project}}/repos/{{.repo}}", + repoNameTemplate: "{{.project}}/{{.repo}}", } var giteaServiceDef = ServiceDefinition{ @@ -71,7 +82,7 @@ var giteaServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/compare/{{.From}}", pullRequestURLIntoTargetBranch: "/compare/{{.To}}...{{.From}}", commitURL: "/commit/{{.CommitHash}}", - regexStrings: defaultUrlRegexStrings, + urlRegexps: defaultUrlRegexps, repoURLTemplate: defaultRepoURLTemplate, } @@ -80,7 +91,7 @@ var codebergServiceDef = ServiceDefinition{ pullRequestURLIntoDefaultBranch: "/compare/{{.From}}", pullRequestURLIntoTargetBranch: "/compare/{{.To}}...{{.From}}", commitURL: "/commit/{{.CommitHash}}", - regexStrings: defaultUrlRegexStrings, + urlRegexps: defaultUrlRegexps, repoURLTemplate: defaultRepoURLTemplate, } diff --git a/pkg/commands/hosting_service/hosting_service.go b/pkg/commands/hosting_service/hosting_service.go index 1c328fd0d..ff2641441 100644 --- a/pkg/commands/hosting_service/hosting_service.go +++ b/pkg/commands/hosting_service/hosting_service.go @@ -61,6 +61,54 @@ func (self *HostingServiceMgr) GetCommitURL(commitHash string) (string, error) { return pullRequestURL, nil } +// e.g. 'jesseduffield/lazygit' +func (self *HostingServiceMgr) GetRepoName() (string, error) { + gitService, err := self.getService() + if err != nil { + return "", err + } + + repoName := gitService.repoName + + return repoName, nil +} + +// ServiceInfo holds the resolved hosting service for a remote URL. Owner +// comes from the "owner" named regex capture, which only exists for +// owner/repo-shaped providers (github, gitlab, bitbucket, gitea, codeberg); +// it's empty for azuredevops and bitbucketServer, whose URLs are organised +// differently. Repository is populated for every provider, but RepoName may +// have more than two segments (e.g. "org/project/repo" for azuredevops). +type ServiceInfo struct { + Provider string // e.g. "github" + WebDomain string // e.g. "github.com", or "git.acme.com" for an on-prem instance + Owner string // e.g. "jesseduffield" + Repository string // e.g. "lazygit" + RepoName string // e.g. "jesseduffield/lazygit" +} + +// GetServiceInfo identifies which hosting service the configured remote URL +// belongs to and returns enough information to talk to its web/API host. +func (self *HostingServiceMgr) GetServiceInfo() (ServiceInfo, error) { + serviceDomain, err := self.getServiceDomain(self.remoteURL) + if err != nil { + return ServiceInfo{}, err + } + + matches, err := serviceDomain.serviceDefinition.parseRemoteUrl(self.remoteURL) + if err != nil { + return ServiceInfo{}, err + } + + return ServiceInfo{ + Provider: serviceDomain.serviceDefinition.provider, + WebDomain: serviceDomain.webDomain, + Owner: matches["owner"], + Repository: matches["repo"], + RepoName: utils.ResolvePlaceholderString(serviceDomain.serviceDefinition.repoNameTemplate, matches), + }, nil +} + func (self *HostingServiceMgr) getService() (*Service, error) { serviceDomain, err := self.getServiceDomain(self.remoteURL) if err != nil { @@ -72,8 +120,14 @@ func (self *HostingServiceMgr) getService() (*Service, error) { return nil, err } + repoName, err := serviceDomain.serviceDefinition.getRepoNameFromRemoteURL(self.remoteURL) + if err != nil { + return nil, err + } + return &Service{ repoURL: repoURL, + repoName: repoName, ServiceDefinition: serviceDomain.serviceDefinition, }, nil } @@ -141,27 +195,69 @@ type ServiceDefinition struct { pullRequestURLIntoDefaultBranch string pullRequestURLIntoTargetBranch string commitURL string - regexStrings []string + urlRegexps []*regexp.Regexp // can expect 'webdomain' to be passed in. Otherwise, you get to pick what we match in the regex - repoURLTemplate string + repoURLTemplate string + repoNameTemplate string } func (self ServiceDefinition) getRepoURLFromRemoteURL(url string, webDomain string) (string, error) { - for _, regexStr := range self.regexStrings { - re := regexp.MustCompile(regexStr) - input := utils.FindNamedMatches(re, url) - if input != nil { - input["webDomain"] = webDomain - return utils.ResolvePlaceholderString(self.repoURLTemplate, input), nil + matches, err := self.parseRemoteUrl(url) + if err != nil { + return "", err + } + + matches["webDomain"] = webDomain + return utils.ResolvePlaceholderString(self.repoURLTemplate, matches), nil +} + +func (self ServiceDefinition) getRepoNameFromRemoteURL(url string) (string, error) { + matches, err := self.parseRemoteUrl(url) + if err != nil { + return "", err + } + + return utils.ResolvePlaceholderString(self.repoNameTemplate, matches), nil +} + +func (self ServiceDefinition) parseRemoteUrl(url string) (map[string]string, error) { + for _, re := range self.urlRegexps { + matches := utils.FindNamedMatches(re, url) + if matches != nil { + return matches, nil } } - return "", errors.New("Failed to parse repo information from url") + return nil, errors.New("Failed to parse repo information from url") +} + +// RepoInformation holds the owner and repository name parsed from a remote URL. +type RepoInformation struct { + Owner string + Repository string +} + +// GetRepoInfoFromURL parses a remote URL (SSH or HTTPS) and extracts the +// owner and repository name using the default URL regex patterns. +func GetRepoInfoFromURL(url string) (RepoInformation, error) { + for _, re := range defaultUrlRegexps { + matches := utils.FindNamedMatches(re, url) + if matches != nil { + return RepoInformation{ + Owner: matches["owner"], + Repository: matches["repo"], + }, nil + } + } + + return RepoInformation{}, errors.New("Failed to parse repo information from url") } type Service struct { repoURL string + // e.g. 'jesseduffield/lazygit' + repoName string ServiceDefinition } diff --git a/pkg/commands/hosting_service/hosting_service_test.go b/pkg/commands/hosting_service/hosting_service_test.go index c2fabcd0d..f150f22eb 100644 --- a/pkg/commands/hosting_service/hosting_service_test.go +++ b/pkg/commands/hosting_service/hosting_service_test.go @@ -577,3 +577,107 @@ func TestGetPullRequestURL(t *testing.T) { }) } } + +func TestGetServiceInfo(t *testing.T) { + scenarios := []struct { + name string + remoteURL string + configServiceDomains map[string]string + expected ServiceInfo + }{ + { + name: "github.com SSH", + remoteURL: "git@github.com:jesseduffield/lazygit.git", + expected: ServiceInfo{ + Provider: "github", + WebDomain: "github.com", + Owner: "jesseduffield", + Repository: "lazygit", + RepoName: "jesseduffield/lazygit", + }, + }, + { + name: "github enterprise with same git and web host", + remoteURL: "git@github.example.com:my-org/my-repo.git", + configServiceDomains: map[string]string{ + "github.example.com": "github:github.example.com", + }, + expected: ServiceInfo{ + Provider: "github", + WebDomain: "github.example.com", + Owner: "my-org", + Repository: "my-repo", + RepoName: "my-org/my-repo", + }, + }, + { + name: "github enterprise with distinct git and web hosts", + remoteURL: "git@git.example.com:my-org/my-repo.git", + configServiceDomains: map[string]string{ + "git.example.com": "github:ghe.example.com", + }, + expected: ServiceInfo{ + Provider: "github", + WebDomain: "ghe.example.com", + Owner: "my-org", + Repository: "my-repo", + RepoName: "my-org/my-repo", + }, + }, + { + name: "github enterprise with web host port", + remoteURL: "git@git.example.com:my-org/my-repo.git", + configServiceDomains: map[string]string{ + "git.example.com": "github:ghe.example.com:8443", + }, + expected: ServiceInfo{ + Provider: "github", + WebDomain: "ghe.example.com:8443", + Owner: "my-org", + Repository: "my-repo", + RepoName: "my-org/my-repo", + }, + }, + { + // azuredevops uses org/project/repo named captures rather than + // owner/repo, so Owner is unpopulated and RepoName has three + // segments rather than the usual two. + name: "azuredevops", + remoteURL: "https://myorg@dev.azure.com/myorg/myproject/_git/myrepo", + expected: ServiceInfo{ + Provider: "azuredevops", + WebDomain: "dev.azure.com", + Repository: "myrepo", + RepoName: "myorg/myproject/myrepo", + }, + }, + { + // bitbucketServer uses project/repo named captures, so Owner is + // unpopulated and RepoName is project/repo rather than owner/repo. + name: "bitbucketServer", + remoteURL: "https://mycompany.bitbucket.com/scm/myproject/myrepo.git", + configServiceDomains: map[string]string{ + "mycompany.bitbucket.com": "bitbucketServer:mycompany.bitbucket.com", + }, + expected: ServiceInfo{ + Provider: "bitbucketServer", + WebDomain: "mycompany.bitbucket.com", + Repository: "myrepo", + RepoName: "myproject/myrepo", + }, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + tr := i18n.EnglishTranslationSet() + log := &fakes.FakeFieldLogger{} + mgr := NewHostingServiceMgr(log, tr, s.remoteURL, s.configServiceDomains) + + info, err := mgr.GetServiceInfo() + + assert.NoError(t, err) + assert.Equal(t, s.expected, info) + }) + } +} diff --git a/pkg/commands/models/commit.go b/pkg/commands/models/commit.go index 137528ee6..69aca8d73 100644 --- a/pkg/commands/models/commit.go +++ b/pkg/commands/models/commit.go @@ -160,3 +160,13 @@ func (c *Commit) IsTODO() bool { func IsHeadCommit(commits []*Commit, index int) bool { return !commits[index].IsTODO() && (index == 0 || commits[index-1].IsTODO()) } + +func HeadCommitIdx(commits []*Commit) int { + for index, commit := range commits { + if !commit.IsTODO() { + return index + } + } + + return -1 +} diff --git a/pkg/commands/models/commit_file.go b/pkg/commands/models/commit_file.go index 90ffd6365..5183fd380 100644 --- a/pkg/commands/models/commit_file.go +++ b/pkg/commands/models/commit_file.go @@ -4,6 +4,9 @@ package models type CommitFile struct { Path string + // For a renamed file, the path it was renamed from; empty otherwise. + PreviousPath string + ChangeStatus string // e.g. 'A' for added or 'M' for modified. This is based on the result from git diff --name-status } @@ -23,6 +26,24 @@ func (f *CommitFile) Deleted() bool { return f.ChangeStatus == "D" } +func (f *CommitFile) IsRename() bool { + return f.PreviousPath != "" +} + +// Names returns an array containing just the path, or in the case of a rename, +// the after path and the before path. +func (f *CommitFile) Names() []string { + result := []string{f.Path} + if f.PreviousPath != "" { + result = append(result, f.PreviousPath) + } + return result +} + func (f *CommitFile) GetPath() string { return f.Path } + +func (f *CommitFile) GetPreviousPath() string { + return f.PreviousPath +} diff --git a/pkg/commands/models/commit_test.go b/pkg/commands/models/commit_test.go new file mode 100644 index 000000000..ecddec9c5 --- /dev/null +++ b/pkg/commands/models/commit_test.go @@ -0,0 +1,81 @@ +package models + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/stefanhaller/git-todo-parser/todo" + "github.com/stretchr/testify/assert" +) + +func TestHeadCommitIdx(t *testing.T) { + testCases := []struct { + name string + commits []*Commit + expected int + }{ + { + name: "first commit without rebase todos", + commits: makeTestCommits("a", "b"), + expected: 0, + }, + { + name: "first non-todo commit during an interactive rebase", + commits: []*Commit{ + makeTestTodoCommit(todo.Pick), + makeTestTodoCommit(todo.Reword), + makeTestCommit("a"), + makeTestCommit("b"), + }, + expected: 2, + }, + { + name: "no commits", + commits: nil, + expected: -1, + }, + { + name: "only rebase todos", + commits: []*Commit{ + makeTestTodoCommit(todo.Pick), + makeTestTodoCommit(todo.Reword), + }, + expected: -1, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + assert.Equal(t, testCase.expected, HeadCommitIdx(testCase.commits)) + }) + } +} + +func TestIsHeadCommit(t *testing.T) { + commits := []*Commit{ + makeTestTodoCommit(todo.Pick), + makeTestCommit("a"), + makeTestCommit("b"), + } + + assert.False(t, IsHeadCommit(commits, 0)) + assert.True(t, IsHeadCommit(commits, 1)) + assert.False(t, IsHeadCommit(commits, 2)) +} + +func makeTestCommits(hashes ...string) []*Commit { + commits := make([]*Commit, 0, len(hashes)) + for _, hash := range hashes { + commits = append(commits, makeTestCommit(hash)) + } + + return commits +} + +func makeTestCommit(hash string) *Commit { + return NewCommit(&utils.StringPool{}, NewCommitOpts{Hash: hash}) +} + +func makeTestTodoCommit(action todo.TodoCommand) *Commit { + return NewCommit(&utils.StringPool{}, NewCommitOpts{Action: action}) +} diff --git a/pkg/commands/models/file.go b/pkg/commands/models/file.go index e48696a4f..9eedfb1fc 100644 --- a/pkg/commands/models/file.go +++ b/pkg/commands/models/file.go @@ -18,10 +18,14 @@ type File struct { Deleted bool HasMergeConflicts bool HasInlineMergeConflicts bool - DisplayString string - ShortStatus string // e.g. 'AD', ' A', 'M ', '??' - LinesDeleted int - LinesAdded int + // How long the conflict markers in this file are, taken from its + // conflict-marker-size gitattribute; 0 if it doesn't have that attribute. We + // only look this up for files that have inline merge conflicts. + ConflictMarkerSize int + DisplayString string + ShortStatus string // e.g. 'AD', ' A', 'M ', '??' + LinesDeleted int + LinesAdded int // If true, this must be a worktree folder IsWorktree bool diff --git a/pkg/commands/models/github.go b/pkg/commands/models/github.go new file mode 100644 index 000000000..da7bd79db --- /dev/null +++ b/pkg/commands/models/github.go @@ -0,0 +1,25 @@ +package models + +type GithubPullRequest struct { + HeadRefName string `json:"headRefName"` + Number int `json:"number"` + Title string `json:"title"` + State string `json:"state"` // "MERGED", "OPEN", "CLOSED", "DRAFT" + ChecksState string `json:"checksState"` + Url string `json:"url"` + HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"` +} + +func (pr *GithubPullRequest) UserName() string { + // e.g. 'jesseduffield' + return pr.HeadRepositoryOwner.Login +} + +func (pr *GithubPullRequest) BranchName() string { + // e.g. 'feature/my-feature' + return pr.HeadRefName +} + +type GithubRepositoryOwner struct { + Login string `json:"login"` +} diff --git a/pkg/commands/models/remote.go b/pkg/commands/models/remote.go index 418b45833..68ec3bd71 100644 --- a/pkg/commands/models/remote.go +++ b/pkg/commands/models/remote.go @@ -2,8 +2,11 @@ package models // Remote : A git remote type Remote struct { - Name string - Urls []string + Name string + Urls []string + // PushUrls is empty unless the remote has explicit `remote..pushurl` + // entries; when empty, pushes go to Urls. + PushUrls []string Branches []*RemoteBranch } diff --git a/pkg/commands/oscommands/cmd_obj.go b/pkg/commands/oscommands/cmd_obj.go index 24d2ca511..1fbe84087 100644 --- a/pkg/commands/oscommands/cmd_obj.go +++ b/pkg/commands/oscommands/cmd_obj.go @@ -4,7 +4,7 @@ import ( "os/exec" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/samber/lo" "github.com/sasha-s/go-deadlock" ) @@ -91,6 +91,19 @@ func (self *CmdObj) AddEnvVars(vars ...string) *CmdObj { return self } +// RemoveEnvVar removes every occurrence of the named environment variable from +// the command's environment. It's the counterpart to AddEnvVars, used to opt a +// single command out of a variable that the builder sets on every command by +// default. +func (self *CmdObj) RemoveEnvVar(name string) *CmdObj { + prefix := name + "=" + self.cmd.Env = lo.Filter(self.cmd.Env, func(envVar string, _ int) bool { + return !strings.HasPrefix(envVar, prefix) + }) + + return self +} + func (self *CmdObj) GetEnvVars() []string { return self.cmd.Env } @@ -144,7 +157,7 @@ func (self *CmdObj) ShouldStreamOutput() bool { } // when you call this, then call Run(), we'll use a PTY to run the command. Only -// has an effect if StreamOutput() was also called. Ignored on Windows. +// has an effect if StreamOutput() was also called. func (self *CmdObj) UsePty() *CmdObj { self.usePty = true diff --git a/pkg/commands/oscommands/cmd_obj_builder.go b/pkg/commands/oscommands/cmd_obj_builder.go index fde642582..9084fd994 100644 --- a/pkg/commands/oscommands/cmd_obj_builder.go +++ b/pkg/commands/oscommands/cmd_obj_builder.go @@ -48,26 +48,34 @@ func (self *CmdObjBuilder) NewShell(commandStr string, shellFunctionsFile string if len(shellFunctionsFile) > 0 { commandStr = fmt.Sprintf("%ssource %s\n%s", self.platform.PrefixForShellFunctionsFile, shellFunctionsFile, commandStr) } - quotedCommand := self.quotedCommandString(commandStr) + + if self.platform.OS == "windows" { + return self.newWindowsShell(commandStr) + } + + quotedCommand := self.Quote(commandStr) cmdArgs := str.ToArgv(fmt.Sprintf("%s %s %s", self.platform.Shell, self.platform.ShellArg, quotedCommand)) return self.New(cmdArgs) } -func (self *CmdObjBuilder) quotedCommandString(commandStr string) string { - // Windows does not seem to like quotes around the command - if self.platform.OS == "windows" { - return strings.NewReplacer( - "^", "^^", - "&", "^&", - "|", "^|", - "<", "^<", - ">", "^>", - "%", "^%", - ).Replace(commandStr) - } +// newWindowsShell wraps the command in `cmd.exe /s /c ""`. The /s +// flag tells cmd to strip exactly the outermost pair of quotes and pass the +// rest through unchanged, which preserves any quoting the command itself +// contains (e.g. `"C:\Program Files\my-editor.exe" file.txt`). Without /s, +// cmd's default rules drop the wrong quotes once the command line contains +// more than two of them. +// +// We bypass Go's standard arg quoting via SysProcAttr.CmdLine: it follows the +// CommandLineToArgvW convention (`\"` for inner quotes), but cmd.exe doesn't. +func (self *CmdObjBuilder) newWindowsShell(commandStr string) *CmdObj { + args := []string{self.platform.Shell, "/s", self.platform.ShellArg, commandStr} + cmdObj := self.New(args) - return self.Quote(commandStr) + cmdLine := fmt.Sprintf(`%s /s %s "%s"`, self.platform.Shell, self.platform.ShellArg, commandStr) + setRawCmdLine(cmdObj.GetCmd(), cmdLine) + + return cmdObj } func (self *CmdObjBuilder) CloneWithNewRunner(decorate func(ICmdObjRunner) ICmdObjRunner) *CmdObjBuilder { @@ -80,21 +88,47 @@ func (self *CmdObjBuilder) CloneWithNewRunner(decorate func(ICmdObjRunner) ICmdO } func (self *CmdObjBuilder) Quote(message string) string { - var quote string if self.platform.OS == "windows" { - quote = `\"` - message = strings.NewReplacer( - `"`, `"'"'"`, - `\"`, `\\"`, - ).Replace(message) - } else { - quote = `"` - message = strings.NewReplacer( - `\`, `\\`, - `"`, `\"`, - `$`, `\$`, - "`", "\\`", - ).Replace(message) + return quoteForWindows(message) } - return quote + message + quote + message = strings.NewReplacer( + `\`, `\\`, + `"`, `\"`, + `$`, `\$`, + "`", "\\`", + ).Replace(message) + return `"` + message + `"` +} + +// quoteForWindows encodes a value using the standard Windows command-line +// convention (the algorithm behind syscall.EscapeArg, reimplemented here so +// it's available on all platforms). The result is always wrapped in double +// quotes so cmd.exe and CommandLineToArgvW treat it as a single argument +// regardless of what shell metacharacters it contains. +func quoteForWindows(s string) string { + var b strings.Builder + b.WriteByte('"') + slashes := 0 + for i := range len(s) { + c := s[i] + switch c { + case '\\': + slashes++ + b.WriteByte(c) + case '"': + for ; slashes > 0; slashes-- { + b.WriteByte('\\') + } + b.WriteByte('\\') + b.WriteByte(c) + default: + slashes = 0 + b.WriteByte(c) + } + } + for ; slashes > 0; slashes-- { + b.WriteByte('\\') + } + b.WriteByte('"') + return b.String() } diff --git a/pkg/commands/oscommands/cmd_obj_runner.go b/pkg/commands/oscommands/cmd_obj_runner.go index b964edce7..6178ac816 100644 --- a/pkg/commands/oscommands/cmd_obj_runner.go +++ b/pkg/commands/oscommands/cmd_obj_runner.go @@ -105,12 +105,18 @@ func (self *cmdObjRunner) RunWithOutputAux(cmdObj *CmdObj) (string, error) { } t := time.Now() - output, err := sanitisedCommandOutput(cmdObj.GetCmd().CombinedOutput()) + cmd := cmdObj.GetCmd() + output, err := sanitisedCommandOutput(cmd.CombinedOutput()) if err != nil { self.log.WithField("command", cmdObj.ToString()).Error(output) } - self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t)) + wall := time.Since(t) + if ps := cmd.ProcessState; ps != nil { + self.log.Infof("%s (wall %s, cpu %s)", cmdObj.ToString(), wall, ps.UserTime()+ps.SystemTime()) + } else { + self.log.Infof("%s (wall %s)", cmdObj.ToString(), wall) + } return output, err } @@ -213,13 +219,15 @@ type cmdHandler struct { stdoutPipe io.Reader stdinPipe io.Writer close func() error + // wait blocks until the child process exits. Needed as a separate + // field because the pty path on Windows spawns via CreateProcess and + // never runs *exec.Cmd.Start — so cmd.Wait wouldn't work there. + wait func() error } func (self *cmdObjRunner) runAndStream(cmdObj *CmdObj) error { return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) { - go func() { - _, _ = io.Copy(cmdWriter, handler.stdoutPipe) - }() + _, _ = io.Copy(cmdWriter, handler.stdoutPipe) }) } @@ -234,6 +242,10 @@ func (self *cmdObjRunner) runAndStreamAux( } else { cmdWriter = self.guiIO.newCmdWriterFn() } + // The command's stdout and stderr are streamed to cmdWriter concurrently + // from separate goroutines (stderr via the MultiWriter below, stdout via + // onRun), so it must be safe for concurrent writes. + cmdWriter = &synchronizedWriter{writer: cmdWriter} if cmdObj.ShouldLog() { self.logCmdObj(cmdObj) @@ -266,9 +278,28 @@ func (self *cmdObjRunner) runAndStreamAux( t := time.Now() - onRun(handler, cmdWriter) + // Stream the command's output on a goroutine while it runs, but keep a + // handle on it: the buffers it fills (stdout, and combinedOutput when + // output is suppressed) must not be read below until it has finished. + streamingDone := make(chan struct{}) + go utils.Safe(func() { + defer close(streamingDone) + onRun(handler, cmdWriter) + }) - err = cmd.Wait() + err = handler.wait() + + // The command has exited; wait for the streaming goroutine to drain the + // last of its output before reading those buffers. A pty reader reaches + // EOF on its own now the process is gone, but the non-pty pipe never does, + // so close it to unblock the reader — the pipe is synchronous, so all + // output has already been read by now and nothing is lost. + if !cmdObj.ShouldUsePty() { + if closeErr := handler.close(); closeErr != nil { + self.log.Error(closeErr) + } + } + <-streamingDone self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t)) @@ -344,10 +375,7 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest( return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) { tr := io.TeeReader(handler.stdoutPipe, cmdWriter) - - go utils.Safe(func() { - self.processOutput(tr, handler.stdinPipe, promptUserForCredential, handler.close, cmdObj) - }) + self.processOutput(tr, handler.stdinPipe, promptUserForCredential, handler.close, cmdObj) }) } @@ -370,9 +398,7 @@ func (self *cmdObjRunner) processOutput( responseChan := promptUserForCredential(askFor) if responseChan == nil { // Returning a nil channel means we should terminate the process. - // We achieve this by closing the pty that it's running in. Note that this won't - // work for the case where we're not running in a pty (i.e. on Windows), but - // in that case we'll never be prompted for credentials, so it's not a concern. + // We achieve this by closing the pty that it's running in. if err := closeFunc(); err != nil { self.log.Error(err) } @@ -392,6 +418,10 @@ func (self *cmdObjRunner) processOutput( } } } + + if err := scanner.Err(); err != nil { + self.log.Error(err) + } } // having a function that returns a function because we need to maintain some state inbetween calls hence the closure @@ -439,6 +469,20 @@ func (self *cmdObjRunner) getCheckForCredentialRequestFunc() func([]byte) (Crede } } +// synchronizedWriter serializes writes to its underlying writer so that it can +// be written from multiple goroutines at once (see runAndStreamAux, which +// streams a command's stdout and stderr to one writer from two goroutines). +type synchronizedWriter struct { + mutex deadlock.Mutex + writer io.Writer +} + +func (self *synchronizedWriter) Write(p []byte) (int, error) { + self.mutex.Lock() + defer self.mutex.Unlock() + return self.writer.Write(p) +} + type Buffer struct { b bytes.Buffer m deadlock.Mutex @@ -470,6 +514,25 @@ func (self *cmdObjRunner) getCmdHandlerNonPty(cmd *exec.Cmd) (*cmdHandler, error return &cmdHandler{ stdoutPipe: stdoutReader, stdinPipe: buf, - close: func() error { return nil }, + // Closing the read end makes a blocked read on it return, which is how + // runAndStreamAux unblocks and joins the streaming goroutine once the + // command has finished (the pipe delivers no EOF of its own). + close: func() error { return stdoutReader.Close() }, + wait: cmd.Wait, + }, nil +} + +func (self *cmdObjRunner) getCmdHandlerPty(cmd *exec.Cmd) (*cmdHandler, error) { + // Size will be adjusted by the caller if it cares; this just avoids a + // zero-size pty. + sp, err := StartPty(cmd, 80, 24) + if err != nil { + return nil, err + } + return &cmdHandler{ + stdoutPipe: sp.Pty, + stdinPipe: sp.Pty, + close: sp.Pty.Close, + wait: sp.Wait, }, nil } diff --git a/pkg/commands/oscommands/cmd_obj_runner_default.go b/pkg/commands/oscommands/cmd_obj_runner_default.go deleted file mode 100644 index 72cbc26c6..000000000 --- a/pkg/commands/oscommands/cmd_obj_runner_default.go +++ /dev/null @@ -1,24 +0,0 @@ -//go:build !windows - -package oscommands - -import ( - "os/exec" - - "github.com/creack/pty" -) - -// we define this separately for windows and non-windows given that windows does -// not have great PTY support and we need a PTY to handle a credential request -func (self *cmdObjRunner) getCmdHandlerPty(cmd *exec.Cmd) (*cmdHandler, error) { - ptmx, err := pty.Start(cmd) - if err != nil { - return nil, err - } - - return &cmdHandler{ - stdoutPipe: ptmx, - stdinPipe: ptmx, - close: ptmx.Close, - }, nil -} diff --git a/pkg/commands/oscommands/cmd_obj_runner_test.go b/pkg/commands/oscommands/cmd_obj_runner_test.go index 74e3a1985..ffddfaad1 100644 --- a/pkg/commands/oscommands/cmd_obj_runner_test.go +++ b/pkg/commands/oscommands/cmd_obj_runner_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/commands/oscommands/cmd_obj_runner_windows.go b/pkg/commands/oscommands/cmd_obj_runner_windows.go deleted file mode 100644 index f92e36c69..000000000 --- a/pkg/commands/oscommands/cmd_obj_runner_windows.go +++ /dev/null @@ -1,10 +0,0 @@ -package oscommands - -import ( - "os/exec" -) - -func (self *cmdObjRunner) getCmdHandlerPty(cmd *exec.Cmd) (*cmdHandler, error) { - // We don't have PTY support on Windows yet, so we just return a non-PTY handler. - return self.getCmdHandlerNonPty(cmd) -} diff --git a/pkg/commands/oscommands/cmd_obj_test.go b/pkg/commands/oscommands/cmd_obj_test.go index b135f1b74..56aab918b 100644 --- a/pkg/commands/oscommands/cmd_obj_test.go +++ b/pkg/commands/oscommands/cmd_obj_test.go @@ -4,9 +4,30 @@ import ( "os/exec" "testing" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/stretchr/testify/assert" ) +func TestRemoveEnvVar(t *testing.T) { + cmd := exec.Command("git", "status") + cmd.Env = []string{ + "PATH=/usr/bin", + "GIT_OPTIONAL_LOCKS=0", + "GIT_OPTIONAL_LOCKS_OTHER=1", // name is a prefix of ours but not the same var + "GIT_OPTIONAL_LOCKS=0", // duplicates must all be removed + "HOME=/home/me", + } + cmdObj := &CmdObj{cmd: cmd} + + cmdObj.RemoveEnvVar("GIT_OPTIONAL_LOCKS") + + assert.Equal(t, []string{ + "PATH=/usr/bin", + "GIT_OPTIONAL_LOCKS_OTHER=1", + "HOME=/home/me", + }, cmdObj.GetEnvVars()) +} + func TestCmdObjToString(t *testing.T) { quote := func(s string) string { return "\"" + s + "\"" diff --git a/pkg/commands/oscommands/dummies.go b/pkg/commands/oscommands/dummies.go index 9490a970d..27b0b372d 100644 --- a/pkg/commands/oscommands/dummies.go +++ b/pkg/commands/oscommands/dummies.go @@ -18,6 +18,8 @@ type OSCommandDeps struct { Platform *Platform GetenvFn func(string) string RemoveFileFn func(string) error + IsDirEmptyFn func(string) (bool, error) + RemoveDirFn func(string) error Cmd *CmdObjBuilder TempDir string } @@ -38,6 +40,8 @@ func NewDummyOSCommandWithDeps(deps OSCommandDeps) *OSCommand { Platform: platform, getenvFn: deps.GetenvFn, removeFileFn: deps.RemoveFileFn, + isDirEmptyFn: deps.IsDirEmptyFn, + removeDirFn: deps.RemoveDirFn, guiIO: NewNullGuiIO(utils.NewDummyLog()), tempDir: deps.TempDir, } diff --git a/pkg/commands/oscommands/new_shell_windows_test.go b/pkg/commands/oscommands/new_shell_windows_test.go new file mode 100644 index 000000000..c7fe5aef1 --- /dev/null +++ b/pkg/commands/oscommands/new_shell_windows_test.go @@ -0,0 +1,389 @@ +//go:build windows + +package oscommands + +import ( + "os" + "os/exec" + "path/filepath" + "strings" + "sync" + "testing" + + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/stretchr/testify/assert" +) + +// These tests run only on Windows because they exercise real cmd.exe +// quote-parsing behaviour, which has only been a problem on Windows. + +// makeWindowsShellBuilder returns a CmdObjBuilder configured for a real +// Windows cmd shell, bypassing the test "dummy" platform (which is darwin). +func makeWindowsShellBuilder() *CmdObjBuilder { + log := utils.NewDummyLog() + return &CmdObjBuilder{ + runner: &cmdObjRunner{log: log, guiIO: NewNullGuiIO(log)}, + platform: &Platform{OS: "windows", Shell: "cmd", ShellArg: "/c"}, + } +} + +// fakeEditorSrc is a minimal Go program that records the args it received, +// one per line, to marker.txt in its own directory. Using a real .exe (not a +// .bat) means args are parsed by Go's runtime via CommandLineToArgvW — the +// same algorithm used by ~all real Windows GUI editors. A .bat would parse +// args via cmd.exe's own rules, which can hide bugs that affect editors. +const fakeEditorSrc = `package main + +import ( + "os" + "path/filepath" + "strings" +) + +func main() { + exe, err := os.Executable() + if err != nil { + os.Exit(2) + } + marker := filepath.Join(filepath.Dir(exe), "marker.txt") + body := strings.Join(os.Args[1:], "\n") + if err := os.WriteFile(marker, []byte(body), 0o644); err != nil { + os.Exit(3) + } +} +` + +var ( + fakeEditorOnce sync.Once + fakeEditorBytes []byte + fakeEditorErr error +) + +// loadFakeEditorBytes builds the fake editor exactly once per test process +// and returns its bytes. Tests then drop a copy at a path containing spaces. +func loadFakeEditorBytes(t *testing.T) []byte { + t.Helper() + fakeEditorOnce.Do(func() { + buildDir, err := os.MkdirTemp("", "lazygit-fake-editor-build-*") + if err != nil { + fakeEditorErr = err + return + } + defer os.RemoveAll(buildDir) + + srcPath := filepath.Join(buildDir, "main.go") + binPath := filepath.Join(buildDir, "fake-editor.exe") + if err := os.WriteFile(srcPath, []byte(fakeEditorSrc), 0o644); err != nil { + fakeEditorErr = err + return + } + cmd := exec.Command("go", "build", "-o", binPath, srcPath) + cmd.Stderr = os.Stderr + if err := cmd.Run(); err != nil { + fakeEditorErr = err + return + } + fakeEditorBytes, fakeEditorErr = os.ReadFile(binPath) + }) + if fakeEditorErr != nil { + t.Fatalf("failed to build fake editor helper: %v", fakeEditorErr) + } + return fakeEditorBytes +} + +// placeFakeEditor builds the fake editor and places it at a path containing +// a space (mirroring `C:\Program Files\...`). The marker the editor writes +// lives next to the exe. +func placeFakeEditor(t *testing.T) (exe, markerFile string) { + t.Helper() + bin := loadFakeEditorBytes(t) + exeDir := filepath.Join(t.TempDir(), "Program Files", "FakeEditor") + if err := os.MkdirAll(exeDir, 0o755); err != nil { + t.Fatalf("mkdir exeDir: %v", err) + } + exe = filepath.Join(exeDir, "fake-editor.exe") + markerFile = filepath.Join(exeDir, "marker.txt") + if err := os.WriteFile(exe, bin, 0o755); err != nil { + t.Fatalf("write fake editor: %v", err) + } + return exe, markerFile +} + +// placeTargetFile creates a file at // with +// a trivial body. Use a dirName containing a space (e.g. "my repo") to put +// the file at a path with spaces. +func placeTargetFile(t *testing.T, dirName, basename string) string { + t.Helper() + dir := filepath.Join(t.TempDir(), dirName) + if err := os.MkdirAll(dir, 0o755); err != nil { + t.Fatalf("mkdir target dir: %v", err) + } + target := filepath.Join(dir, basename) + if err := os.WriteFile(target, []byte("hello"), 0o644); err != nil { + t.Fatalf("write target: %v", err) + } + return target +} + +// setupFakeEditor is a convenience wrapper for the common case: editor at a +// spacey path AND target file at a spacey path — the conditions that +// trigger the cmd.exe quote-stripping bug. +func setupFakeEditor(t *testing.T) (fakeExe, targetFile, markerFile string) { + t.Helper() + fakeExe, markerFile = placeFakeEditor(t) + targetFile = placeTargetFile(t, "my repo", "file.txt") + return fakeExe, targetFile, markerFile +} + +// resolveTemplate mirrors what pkg/commands/git_commands/file.go does: it +// substitutes {{filename}} with the Windows-quoted filename and {{line}} +// with a line number. +func resolveTemplate(builder *CmdObjBuilder, template, filename, line string) string { + out := strings.ReplaceAll(template, "{{filename}}", builder.Quote(filename)) + out = strings.ReplaceAll(out, "{{line}}", line) + return out +} + +// readMarkerArgs reads the args the fake editor recorded. Each arg is on its +// own line (so an arg that itself contains a space stays one element). An +// empty file means the editor ran with zero args. +func readMarkerArgs(t *testing.T, markerFile string) []string { + t.Helper() + data, err := os.ReadFile(markerFile) + if err != nil { + t.Fatalf("marker file was not written; the fake editor never ran: %v", err) + } + s := strings.TrimRight(string(data), "\r\n") + if s == "" { + return nil + } + return strings.Split(s, "\n") +} + +func TestNewShell_QuotedExePath_FilenameWithSpaces_EditAtLineAndWait(t *testing.T) { + builder := makeWindowsShellBuilder() + fakeExe, targetFile, markerFile := setupFakeEditor(t) + + template := `"` + fakeExe + `" -multiInst -nosession -noPlugin -n{{line}} {{filename}}` + cmdStr := resolveTemplate(builder, template, targetFile, "42") + + out, err := builder.NewShell(cmdStr, "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + assert.Equal(t, + []string{"-multiInst", "-nosession", "-noPlugin", "-n42", targetFile}, + readMarkerArgs(t, markerFile), + ) +} + +func TestNewShell_QuotedExePath_FilenameWithSpaces_EditAtLine(t *testing.T) { + builder := makeWindowsShellBuilder() + fakeExe, targetFile, markerFile := setupFakeEditor(t) + + template := `"` + fakeExe + `" -n{{line}} {{filename}}` + cmdStr := resolveTemplate(builder, template, targetFile, "42") + + out, err := builder.NewShell(cmdStr, "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + assert.Equal(t, + []string{"-n42", targetFile}, + readMarkerArgs(t, markerFile), + ) +} + +func TestNewShell_QuotedExePath_FilenameWithSpaces_Edit(t *testing.T) { + builder := makeWindowsShellBuilder() + fakeExe, targetFile, markerFile := setupFakeEditor(t) + + template := `"` + fakeExe + `" {{filename}}` + cmdStr := resolveTemplate(builder, template, targetFile, "") + + out, err := builder.NewShell(cmdStr, "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + assert.Equal(t, + []string{targetFile}, + readMarkerArgs(t, markerFile), + ) +} + +// Sanity check: for a filename WITHOUT spaces the same templates already work, +// because the resulting cmd.exe line has exactly two quote characters and +// cmd /c keeps them. This pins the difference down to filename quoting and +// guards against a regression where the no-spaces case starts failing too. +func TestNewShell_QuotedExePath_FilenameWithoutSpaces_StillWorks(t *testing.T) { + builder := makeWindowsShellBuilder() + fakeExe, markerFile := placeFakeEditor(t) + plainTarget := placeTargetFile(t, "repo", "plain.txt") // no-space dir + + template := `"` + fakeExe + `" -multiInst -nosession -noPlugin -n{{line}} {{filename}}` + cmdStr := resolveTemplate(builder, template, plainTarget, "42") + + out, err := builder.NewShell(cmdStr, "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + assert.Equal(t, + []string{"-multiInst", "-nosession", "-noPlugin", "-n42", plainTarget}, + readMarkerArgs(t, markerFile), + ) +} + +// TestNewShell_VarietyOfEditorTemplates exercises NewShell with a range of +// realistic editor templates, all with the trigger conditions of the bug +// (quoted exe at a spacey path + filename at a spacey path). Each subtest +// asserts the editor receives the exact args lazygit intended. +// +// Args in `wantArgs` may use the literal "" placeholder; it gets +// substituted with the resolved target file path before comparison. +func TestNewShell_VarietyOfEditorTemplates(t *testing.T) { + const filePlaceholder = "" + + cases := []struct { + name string + template string // stands for the fake editor's full path + line string + wantArgs []string + }{ + { + name: "vim/nvim style: +line filename", + template: `"" +{{line}} {{filename}}`, + line: "42", + wantArgs: []string{"+42", filePlaceholder}, + }, + { + name: "emacs-like with explicit +N", + template: `"" +{{line}} -nw {{filename}}`, + line: "7", + wantArgs: []string{"+7", "-nw", filePlaceholder}, + }, + { + name: "long flag with =value", + template: `"" --line={{line}} --tab-size=4 {{filename}}`, + line: "42", + wantArgs: []string{"--line=42", "--tab-size=4", filePlaceholder}, + }, + { + name: "many short and long flags before filename", + template: `"" -a -b -c --foo --bar -n{{line}} {{filename}}`, + line: "42", + wantArgs: []string{"-a", "-b", "-c", "--foo", "--bar", "-n42", filePlaceholder}, + }, + { + name: "flag after filename", + template: `"" {{filename}} --readonly`, + line: "", + wantArgs: []string{filePlaceholder, "--readonly"}, + }, + { + name: "single short flag attached to value", + template: `"" -n{{line}} {{filename}}`, + line: "1", + wantArgs: []string{"-n1", filePlaceholder}, + }, + { + name: "no flags, just filename", + template: `"" {{filename}}`, + line: "", + wantArgs: []string{filePlaceholder}, + }, + { + name: "flag with separate value (space-separated)", + template: `"" --goto {{line}} {{filename}}`, + line: "42", + wantArgs: []string{"--goto", "42", filePlaceholder}, + }, + } + + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + builder := makeWindowsShellBuilder() + fakeExe, targetFile, markerFile := setupFakeEditor(t) + + template := strings.ReplaceAll(tc.template, "", fakeExe) + cmdStr := resolveTemplate(builder, template, targetFile, tc.line) + + out, err := builder.NewShell(cmdStr, "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + want := make([]string, len(tc.wantArgs)) + for i, a := range tc.wantArgs { + want[i] = strings.ReplaceAll(a, filePlaceholder, targetFile) + } + assert.Equal(t, want, readMarkerArgs(t, markerFile)) + }) + } +} + +// TestNewShell_FilenameSpecialCharacters varies the basename of the target +// file across characters that are legal in Windows filenames but might +// interact badly with cmd.exe / Quote(): parentheses, brackets, single +// quote, comma, semicolon, equals, etc. The exe is at a spacey path and +// the target dir has spaces, so the bug-trigger conditions are still met. +func TestNewShell_FilenameSpecialCharacters(t *testing.T) { + cases := []struct { + name string + basename string + }{ + {"parens", "file (1).txt"}, + {"brackets", "file[v2].txt"}, + {"single quote", "it's a file.txt"}, + {"comma", "a,b,c.txt"}, + {"semicolon", "a;b.txt"}, + {"equals", "key=value.txt"}, + {"plus", "a+b.txt"}, + {"hash", "issue#42.txt"}, + {"at sign", "user@host.txt"}, + {"tilde", "~backup.txt"}, + {"dot leading", ".gitignore.txt"}, + {"multiple dots", "v1.2.3.txt"}, + {"dash leading", "-flag-looking.txt"}, + } + + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + builder := makeWindowsShellBuilder() + fakeExe, markerFile := placeFakeEditor(t) + targetFile := placeTargetFile(t, "my repo", tc.basename) + + template := `"` + fakeExe + `" -n{{line}} {{filename}}` + cmdStr := resolveTemplate(builder, template, targetFile, "42") + + out, err := builder.NewShell(cmdStr, "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + assert.Equal(t, + []string{"-n42", targetFile}, + readMarkerArgs(t, markerFile), + ) + }) + } +} + +// Command chaining with && must work: cmd /s /c runs the assembled line verbatim, +// so cmd treats && as a separator and runs both commands. The two echoes +// therefore produce two separate output lines. +func TestNewShell_CommandChaining(t *testing.T) { + builder := makeWindowsShellBuilder() + + out, err := builder.NewShell("echo first&&echo second", "").GetCmd().CombinedOutput() + if err != nil { + t.Fatalf("shell command failed: %v\ncmd.exe output:\n%s", err, string(out)) + } + + normalized := strings.ReplaceAll(string(out), "\r\n", "\n") + lines := strings.Split(strings.TrimSpace(normalized), "\n") + assert.Equal(t, []string{"first", "second"}, lines) +} diff --git a/pkg/commands/oscommands/os.go b/pkg/commands/oscommands/os.go index f070e4856..fed095a28 100644 --- a/pkg/commands/oscommands/os.go +++ b/pkg/commands/oscommands/os.go @@ -1,12 +1,12 @@ package oscommands import ( + "bytes" "io" "os" "os/exec" "path/filepath" "strings" - "sync" "github.com/go-errors/errors" "github.com/samber/lo" @@ -25,6 +25,8 @@ type OSCommand struct { guiIO *guiIO removeFileFn func(string) error + isDirEmptyFn func(string) (bool, error) + removeDirFn func(string) error Cmd *CmdObjBuilder @@ -48,6 +50,8 @@ func NewOSCommand(common *common.Common, config config.AppConfigurer, platform * Platform: platform, getenvFn: os.Getenv, removeFileFn: os.RemoveAll, + isDirEmptyFn: isDirEmpty, + removeDirFn: os.Remove, guiIO: guiIO, tempDir: config.GetTempDir(), } @@ -224,37 +228,47 @@ func (c *OSCommand) PipeCommands(cmdObjs ...*CmdObj) error { // keeping this here in case I adapt this code for some other purpose in the future // cmds[len(cmds)-1].Stdout = os.Stdout - finalErrors := []string{} - - wg := sync.WaitGroup{} - wg.Add(len(cmds)) - - for _, cmd := range cmds { - go utils.Safe(func() { - stderr, err := cmd.StderrPipe() - if err != nil { - c.Log.Error(err) - } - - if err := cmd.Start(); err != nil { - c.Log.Error(err) - } - - if b, err := io.ReadAll(stderr); err == nil { - if len(b) > 0 { - finalErrors = append(finalErrors, string(b)) - } - } - - if err := cmd.Wait(); err != nil { - c.Log.Error(err) - } - - wg.Done() - }) + stderrs := make([]bytes.Buffer, len(cmds)) + for i := range cmds { + cmds[i].Stderr = &stderrs[i] } - wg.Wait() + // Start every command before waiting for any of them: waiting for a command + // closes our end of the pipe that feeds the next one, and a command that + // hasn't been started by then would inherit a closed stdin. + started := 0 + var startErr error + for _, cmd := range cmds { + if err := cmd.Start(); err != nil { + startErr = err + break + } + + started++ + } + + finalErrors := []string{} + + if startErr != nil { + c.Log.Error(startErr) + finalErrors = append(finalErrors, startErr.Error()) + + // Without the rest of the pipeline to drain them, the commands we did + // start could block forever writing to a full pipe. + for _, cmd := range cmds[:started] { + _ = cmd.Process.Kill() + } + } + + for i, cmd := range cmds[:started] { + if err := cmd.Wait(); err != nil { + c.Log.Error(err) + } + + if stderrs[i].Len() > 0 { + finalErrors = append(finalErrors, stderrs[i].String()) + } + } if len(finalErrors) > 0 { return errors.New(strings.Join(finalErrors, "\n")) @@ -312,6 +326,35 @@ func (c *OSCommand) RemoveFile(path string) error { return c.removeFileFn(path) } +func (c *OSCommand) IsDirEmpty(path string) (bool, error) { + return c.isDirEmptyFn(path) +} + +func (c *OSCommand) RemoveDir(path string) error { + msg := utils.ResolvePlaceholderString( + c.Tr.Log.RemoveEmptyDir, + map[string]string{ + "path": path, + }, + ) + c.LogCommand(msg, false) + + return c.removeDirFn(path) +} + +func isDirEmpty(path string) (bool, error) { + f, err := os.Open(path) + if err != nil { + return false, err + } + _, err = f.Readdirnames(1) + _ = f.Close() + if errors.Is(err, io.EOF) { + return true, nil + } + return false, err +} + func (c *OSCommand) Getenv(key string) string { return c.getenvFn(key) } diff --git a/pkg/commands/oscommands/os_default_platform.go b/pkg/commands/oscommands/os_default_platform.go index 06684434e..09f9f1d6d 100644 --- a/pkg/commands/oscommands/os_default_platform.go +++ b/pkg/commands/oscommands/os_default_platform.go @@ -40,10 +40,15 @@ func (c *OSCommand) UpdateWindowTitle() error { return nil } -func TerminateProcessGracefully(cmd *exec.Cmd) error { - if cmd.Process == nil { +// setRawCmdLine is the non-Windows no-op counterpart of the Windows shim +// (see the comment there). NewShell's shell-building logic is portable, so +// this call is reached on every host; only the Windows build does anything. +func setRawCmdLine(cmd *exec.Cmd, cmdLine string) {} + +func TerminateProcessGracefully(proc *os.Process) error { + if proc == nil { return nil } - return cmd.Process.Signal(syscall.SIGTERM) + return proc.Signal(syscall.SIGTERM) } diff --git a/pkg/commands/oscommands/os_test.go b/pkg/commands/oscommands/os_test.go index ecae92b18..1ccfbc025 100644 --- a/pkg/commands/oscommands/os_test.go +++ b/pkg/commands/oscommands/os_test.go @@ -75,11 +75,26 @@ func TestOSCommandQuoteWindows(t *testing.T) { actual := osCommand.Quote(`hello "test" 'test2'`) - expected := `\"hello "'"'"test"'"'" 'test2'\"` + expected := `"hello \"test\" 'test2'"` assert.EqualValues(t, expected, actual) } +// On Windows, NewShell must hand the command to cmd.exe verbatim. +func TestNewShellWindowsPassesMetacharactersVerbatim(t *testing.T) { + osCommand := NewDummyOSCommand() + platform := &Platform{OS: "windows", Shell: "cmd", ShellArg: "/c"} + osCommand.Platform = platform + osCommand.Cmd.platform = platform + + command := `echo a && echo b | sort > out.txt < in.txt %PATH%` + + assert.Equal(t, + []string{"cmd", "/s", "/c", command}, + osCommand.Cmd.NewShell(command, "").Args(), + ) +} + func TestOSCommandFileType(t *testing.T) { type scenario struct { path string @@ -91,7 +106,11 @@ func TestOSCommandFileType(t *testing.T) { { "testFile", func() { - if _, err := os.Create("testFile"); err != nil { + f, err := os.Create("testFile") + if err != nil { + panic(err) + } + if err := f.Close(); err != nil { panic(err) } }, @@ -102,7 +121,11 @@ func TestOSCommandFileType(t *testing.T) { { "file with spaces", func() { - if _, err := os.Create("file with spaces"); err != nil { + f, err := os.Create("file with spaces") + if err != nil { + panic(err) + } + if err := f.Close(); err != nil { panic(err) } }, @@ -133,7 +156,7 @@ func TestOSCommandFileType(t *testing.T) { for _, s := range scenarios { s.setup() s.test(FileType(s.path)) - _ = os.RemoveAll(s.path) + assert.NoError(t, os.RemoveAll(s.path)) } } diff --git a/pkg/commands/oscommands/os_windows.go b/pkg/commands/oscommands/os_windows.go index 605ed7682..d0252f5b1 100644 --- a/pkg/commands/oscommands/os_windows.go +++ b/pkg/commands/oscommands/os_windows.go @@ -5,8 +5,25 @@ import ( "os" "os/exec" "path/filepath" + "syscall" ) +// setRawCmdLine hands cmd.exe the exact command line we built, bypassing +// os/exec's default composition (which quotes args with the +// CommandLineToArgvW `\"` convention that cmd.exe doesn't understand). +// +// The shell-building logic in NewShell is portable and dispatches on +// platform.OS, which keeps it (and its quoting) unit-testable on any host. +// Assigning SysProcAttr.CmdLine is the only step that needs a Windows-only +// field, so it's the single piece split out behind a build tag; every other +// platform gets the no-op in os_default_platform.go. +func setRawCmdLine(cmd *exec.Cmd, cmdLine string) { + if cmd.SysProcAttr == nil { + cmd.SysProcAttr = &syscall.SysProcAttr{} + } + cmd.SysProcAttr.CmdLine = cmdLine +} + func GetPlatform() *Platform { return &Platform{ OS: "windows", @@ -24,7 +41,7 @@ func (c *OSCommand) UpdateWindowTitle() error { return c.Cmd.NewShell(argString, c.UserConfig().OS.ShellFunctionsFile).Run() } -func TerminateProcessGracefully(cmd *exec.Cmd) error { +func TerminateProcessGracefully(proc *os.Process) error { // Signals other than SIGKILL are not supported on Windows return nil } diff --git a/pkg/commands/oscommands/os_windows_test.go b/pkg/commands/oscommands/os_windows_test.go index 60ba495bf..495e23f72 100644 --- a/pkg/commands/oscommands/os_windows_test.go +++ b/pkg/commands/oscommands/os_windows_test.go @@ -20,7 +20,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) { { filename: "test", runner: NewFakeRunner(t). - ExpectArgs([]string{"cmd", "/c", "start", "", "test"}, "", errors.New("error")), + ExpectArgs([]string{"cmd", "/s", "/c", `start "" "test"`}, "", errors.New("error")), test: func(err error) { assert.Error(t, err) }, @@ -28,7 +28,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) { { filename: "test", runner: NewFakeRunner(t). - ExpectArgs([]string{"cmd", "/c", "start", "", "test"}, "", nil), + ExpectArgs([]string{"cmd", "/s", "/c", `start "" "test"`}, "", nil), test: func(err error) { assert.NoError(t, err) }, @@ -36,7 +36,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) { { filename: "filename with spaces", runner: NewFakeRunner(t). - ExpectArgs([]string{"cmd", "/c", "start", "", "filename with spaces"}, "", nil), + ExpectArgs([]string{"cmd", "/s", "/c", `start "" "filename with spaces"`}, "", nil), test: func(err error) { assert.NoError(t, err) }, @@ -44,7 +44,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) { { filename: "let's_test_with_single_quote", runner: NewFakeRunner(t). - ExpectArgs([]string{"cmd", "/c", "start", "", "let's_test_with_single_quote"}, "", nil), + ExpectArgs([]string{"cmd", "/s", "/c", `start "" "let's_test_with_single_quote"`}, "", nil), test: func(err error) { assert.NoError(t, err) }, @@ -52,7 +52,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) { { filename: "$USER.txt", runner: NewFakeRunner(t). - ExpectArgs([]string{"cmd", "/c", "start", "", "$USER.txt"}, "", nil), + ExpectArgs([]string{"cmd", "/s", "/c", `start "" "$USER.txt"`}, "", nil), test: func(err error) { assert.NoError(t, err) }, diff --git a/pkg/commands/oscommands/pty.go b/pkg/commands/oscommands/pty.go new file mode 100644 index 000000000..a4a369633 --- /dev/null +++ b/pkg/commands/oscommands/pty.go @@ -0,0 +1,34 @@ +package oscommands + +import ( + "io" + "os" +) + +// Pty is the master side of a pseudo-terminal running a subprocess. The +// concrete implementation is platform-specific: creack/pty on Unix and +// ConPTY on Windows. +type Pty interface { + io.ReadWriteCloser + Resize(cols, rows uint16) error +} + +// StartedPty is the result of StartPty. +type StartedPty struct { + // Pty is the master side of the pseudo-terminal; read from it to get + // the child's combined stdout/stderr and write to it to feed stdin. + Pty Pty + // Process is the spawned child. Useful for signalling; on Windows the + // original *exec.Cmd was not Start()ed (ConPTY spawns via + // CreateProcess, not os/exec) so cmd.Process is nil and this is the + // only handle. + Process *os.Process + // Wait blocks until the child exits and returns a non-nil error on a + // nonzero exit status, matching *exec.Cmd.Wait semantics. + Wait func() error +} + +// StartPty runs cmd in a pseudo-terminal with the given initial dimensions. +// Implemented per-platform in pty_unix.go / pty_windows.go. +// +// func StartPty(cmd *exec.Cmd, cols, rows uint16) (StartedPty, error) diff --git a/pkg/commands/oscommands/pty_unix.go b/pkg/commands/oscommands/pty_unix.go new file mode 100644 index 000000000..cd3962a8e --- /dev/null +++ b/pkg/commands/oscommands/pty_unix.go @@ -0,0 +1,40 @@ +//go:build !windows + +package oscommands + +import ( + "os" + "os/exec" + + creackpty "github.com/creack/pty" +) + +type unixPty struct { + master *os.File +} + +func (u *unixPty) Read(p []byte) (int, error) { return u.master.Read(p) } +func (u *unixPty) Write(p []byte) (int, error) { return u.master.Write(p) } +func (u *unixPty) Close() error { return u.master.Close() } + +func (u *unixPty) Resize(cols, rows uint16) error { + return creackpty.Setsize(u.master, &creackpty.Winsize{Cols: cols, Rows: rows}) +} + +func StartPty(cmd *exec.Cmd, cols, rows uint16) (StartedPty, error) { + f, err := creackpty.StartWithSize(cmd, &creackpty.Winsize{Cols: cols, Rows: rows}) + if err != nil { + return StartedPty{}, err + } + return StartedPty{ + Pty: &unixPty{master: f}, + Process: cmd.Process, + Wait: cmd.Wait, + }, nil +} + +// TerminateLivePtys is a no-op on Unix: stopping a pty task signals the +// child (SIGTERM, plus SIGHUP to the foreground process group when the +// master closes), and the processes clean themselves up without lazygit +// having to wait for them. +func TerminateLivePtys() {} diff --git a/pkg/commands/oscommands/pty_windows.go b/pkg/commands/oscommands/pty_windows.go new file mode 100644 index 000000000..ff707c519 --- /dev/null +++ b/pkg/commands/oscommands/pty_windows.go @@ -0,0 +1,489 @@ +package oscommands + +import ( + "fmt" + "os" + "os/exec" + "strings" + "sync" + "time" + "unsafe" + + "github.com/jesseduffield/lazygit/pkg/utils" + "golang.org/x/sys/windows" +) + +type winPty struct { + hpc windows.Handle + // job holds the child and every descendant it spawns; terminating it + // kills whatever is left of the process tree (see Close). + job windows.Handle + // conhost is a handle to the conhost.exe serving this pty, or 0 if it + // couldn't be identified. Held so that the teardown in Close can reap + // it on Windows builds whose conhost fails to run down on its own. + conhost windows.Handle + inWrite *os.File + outRead *os.File + + // mu guards hpcClosed, which gates ClosePseudoConsole (it must run + // exactly once) and also keeps Resize from touching the HPCON once it's + // been freed: the background waiter in StartPty closes the pseudoconsole + // on child exit, which would otherwise race a concurrent onResize and + // hand ResizePseudoConsole a freed handle. + mu sync.Mutex + hpcClosed bool +} + +func (p *winPty) Read(buf []byte) (int, error) { return p.outRead.Read(buf) } +func (p *winPty) Write(buf []byte) (int, error) { return p.inWrite.Write(buf) } + +func (p *winPty) Resize(cols, rows uint16) error { + p.mu.Lock() + defer p.mu.Unlock() + if p.hpcClosed { + // The child already exited and the pseudoconsole was torn down, so + // there is nothing left to resize. + return nil + } + return windows.ResizePseudoConsole(p.hpc, clampPtySize(cols, rows)) +} + +// clampPtySize clamps a requested pty size to the minimum that ConPTY +// accepts: CreatePseudoConsole and ResizePseudoConsole reject zero +// dimensions with E_INVALIDARG, but callers legitimately request them — the +// pty is sized after the main view, which is zero-sized while hidden, e.g. +// in full-screen mode with a side panel focused. +func clampPtySize(cols, rows uint16) windows.Coord { + return windows.Coord{X: int16(max(cols, 1)), Y: int16(max(rows, 1))} +} + +// closeHpc closes the pseudoconsole exactly once. Safe to call from multiple +// goroutines and at any time. We need this separately from Close because the +// background waiter in StartPty closes the pseudoconsole as soon as the child +// exits — that's what makes outRead return EOF, matching the Unix behavior +// where the master fd EOFs when the slave closes — while the pipe fds stay +// open until somebody explicitly tears the pty down. +func (p *winPty) closeHpc() { + p.mu.Lock() + defer p.mu.Unlock() + if p.hpcClosed { + return + } + p.hpcClosed = true + windows.ClosePseudoConsole(p.hpc) +} + +// How long Close waits for the conhost to run itself down after its clients +// are gone, before concluding that it never will (see Close) and reaping it. +const conhostExitTimeout = time.Second + +var ( + // ptyTeardowns counts the in-flight teardown goroutines spawned by + // Close; TerminateLivePtys waits for them when lazygit exits. + ptyTeardowns sync.WaitGroup + // ptyQuit is closed by TerminateLivePtys. In-flight teardowns skip the + // conhost rundown wait once it is closed: the conhost serves nothing + // once its clients are gone, and the exit must not stall for its sake. + ptyQuit = make(chan struct{}) + ptyQuitOnce sync.Once +) + +// TerminateLivePtys synchronously terminates the process trees and console +// hosts of all ptys whose teardown hasn't finished yet. Call it when lazygit +// is about to exit: the asynchronous teardowns in Close won't get to finish +// (the conhost rundown wait outlives the process), and while +// KILL_ON_JOB_CLOSE reaps the clients when the job handles are closed at +// process death, nothing would reap the conhosts on the Windows builds that +// need it (see Close). A long diff on screen keeps its git process running +// the whole time it is shown, so quitting with such a teardown in flight is +// the rule, not the exception. +func TerminateLivePtys() { + ptyQuitOnce.Do(func() { close(ptyQuit) }) + + done := make(chan struct{}) + go utils.Safe(func() { + ptyTeardowns.Wait() + close(done) + }) + select { + case <-done: + case <-time.After(2 * time.Second): + // Don't hold up the exit any longer; the job handles' rundown + // still covers the clients. + } +} + +// Close tears the pty down without waiting for it: the teardown runs on a +// background goroutine and Close returns immediately. +// +// It has to, because ClosePseudoConsole can block for a long time: before +// Windows 11 24H2 it waits for the console host to exit, and since closing +// only delivers CTRL_CLOSE_EVENT to the attached client without terminating +// it, a client that keeps running (git still computing an expensive diff, a +// diff renderer waiting for input) keeps the host — and with it +// ClosePseudoConsole — alive arbitrarily long. Close is called while holding +// the global PtyMutex and while the task's onDone once is executing, where +// blocking wedges every subsequent task for the view (and with it the UI), so +// none of this may happen on the caller's thread. +// +// Within the teardown, the pipe ends must be closed before the +// pseudoconsole, and without holding p.mu: closing the pseudoconsole flushes +// the client's pending output into the out pipe, and with the task stopped +// nobody is reading anymore, so that flush can only complete once the pipe +// is broken. The background waiter's closeHpc may already be wedged in such +// a flush while holding p.mu; closing the pipes is what unblocks it. +// +// Closing the pseudoconsole delivers CTRL_CLOSE_EVENT only to the clients +// attached to it at that moment. A child that is stopped right after being +// spawned is still starting up and not attached yet, so the event misses it +// and it survives, running its command to completion as an orphan — and +// keeping its console host alive with it (#5879); the same holds for +// grandchildren spawned while the console is going down, and for clients +// that ignore the event (the Windows flavor of #5675). The job kill reaps +// all of those. There is no point in delaying it: the close event is not a +// graceful signal worth waiting on — git and the common diff tools leave it +// to the default handler, which calls ExitProcess at whatever instruction +// the process happens to execute — so clients that got the event are +// already dying. Killing at an arbitrary point cannot leak a stale +// index.lock, because pty-rendered commands don't take that lock (see +// withPtyGitConfig in pkg/gui/pty.go). +// +// The pseudoconsole close gets its own goroutine because the kill must not +// wait for it: on builds where ClosePseudoConsole blocks until the console +// host exits (pre-24H2), the host keeps running as long as a surviving +// client does, and that client only goes away through the job kill — +// sequencing the kill after a blocking close would thus deadlock in +// exactly the case the kill exists for. +// +// After the kill, the conhost serving the pty is reaped as well if it +// doesn't exit by itself: a healthy conhost runs down once the reference +// handle is closed and its clients are gone, but conhost builds before +// Windows 11 24H2 fail to complete the rundown when a client attached +// after the close event was delivered and was then killed — the fate of +// exactly the clients the job kill is for — and such a conhost sits +// around forever, serving nothing (#5879). The reap is inert on healthy +// builds: the wait succeeds and only the handle is closed. +// +// When lazygit is quitting, the conhost rundown wait is skipped; see +// TerminateLivePtys. +func (p *winPty) Close() error { + ptyTeardowns.Add(1) + go utils.Safe(func() { + defer ptyTeardowns.Done() + + p.inWrite.Close() + p.outRead.Close() + go utils.Safe(p.closeHpc) + + _ = windows.TerminateJobObject(p.job, 1) + _ = windows.CloseHandle(p.job) + + if p.conhost != 0 { + timeout := conhostExitTimeout + select { + case <-ptyQuit: + timeout = 0 + default: + } + event, err := windows.WaitForSingleObject(p.conhost, uint32(timeout/time.Millisecond)) + if err != nil || event != windows.WAIT_OBJECT_0 { + _ = windows.TerminateProcess(p.conhost, 1) + } + _ = windows.CloseHandle(p.conhost) + } + }) + return nil +} + +// startWaiter runs proc.Wait in a goroutine and, as soon as the child exits, +// closes the pseudoconsole so that any pending Read on outRead returns EOF +// after buffered output drains. Returns a Wait func that blocks until the +// child has exited and reports its exit status with *exec.Cmd.Wait semantics. +// +// This shape exists because on Unix the master fd EOFs naturally when the +// slave closes on child exit, but ConPTY keeps the pipe alive until we call +// ClosePseudoConsole explicitly. Without doing that on child exit, the +// scanner in pkg/tasks.NewCmdTask would block forever on the next read and +// the render would never reach its end of input, so the new content would +// never be swapped in. +func startWaiter(proc *os.Process, p *winPty) func() error { + done := make(chan struct{}) + var waitErr error + go func() { + defer close(done) + state, err := proc.Wait() + p.closeHpc() + if err != nil { + waitErr = err + return + } + if !state.Success() { + waitErr = fmt.Errorf("exit status %d", state.ExitCode()) + } + }() + return func() error { + <-done + return waitErr + } +} + +// conhostScanMu serializes CreatePseudoConsole and the child-process scans +// around it, so that two concurrently starting ptys can't make each other's +// "which conhost is new" diff ambiguous. +var conhostScanMu sync.Mutex + +// conhostChildren returns the pids of all conhost.exe processes that are +// direct children of this process. Errors just yield a smaller (possibly +// empty) set; the caller treats identification as best-effort. +func conhostChildren() map[uint32]bool { + pids := map[uint32]bool{} + snap, err := windows.CreateToolhelp32Snapshot(windows.TH32CS_SNAPPROCESS, 0) + if err != nil { + return pids + } + defer func() { _ = windows.CloseHandle(snap) }() + me := uint32(os.Getpid()) + var pe windows.ProcessEntry32 + pe.Size = uint32(unsafe.Sizeof(pe)) + for err := windows.Process32First(snap, &pe); err == nil; err = windows.Process32Next(snap, &pe) { + if pe.ParentProcessID == me && strings.EqualFold(windows.UTF16ToString(pe.ExeFile[:]), "conhost.exe") { + pids[pe.ProcessID] = true + } + } + return pids +} + +// openNewConhostChild returns a handle to the single conhost child that +// appeared since the before scan, or 0 if there isn't exactly one candidate +// or it can't be opened. +func openNewConhostChild(before map[uint32]bool) windows.Handle { + var found []uint32 + for pid := range conhostChildren() { + if !before[pid] { + found = append(found, pid) + } + } + if len(found) != 1 { + return 0 + } + h, err := windows.OpenProcess(windows.SYNCHRONIZE|windows.PROCESS_TERMINATE, false, found[0]) + if err != nil { + return 0 + } + return h +} + +func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) { + // Two pipes: one for the child's stdin (we never write to it, but ConPTY + // needs a handle), one for the child's stdout/stderr multiplexed through + // the pseudoconsole. + var inRead, inWrite, outRead, outWrite windows.Handle + if err = windows.CreatePipe(&inRead, &inWrite, nil, 0); err != nil { + return StartedPty{}, fmt.Errorf("CreatePipe (in): %w", err) + } + defer func() { + if err != nil { + _ = windows.CloseHandle(inWrite) + } + }() + if err = windows.CreatePipe(&outRead, &outWrite, nil, 0); err != nil { + _ = windows.CloseHandle(inRead) + return StartedPty{}, fmt.Errorf("CreatePipe (out): %w", err) + } + defer func() { + if err != nil { + _ = windows.CloseHandle(outRead) + } + }() + + // CreatePseudoConsole dupes the handles it needs internally; we release + // our references to the child-side ends immediately after. + // + // It also spawns the conhost.exe serving the console session, as a + // direct child of this process. The teardown in Close needs a handle to + // that conhost (see there), but Windows offers no way to obtain one + // from the HPCON, so identify it by diffing our conhost children around + // the call. Open a real handle right away so that pid reuse can't later + // misdirect the teardown's reap. If identification fails, the handle + // stays 0 and the teardown skips the reap. + var hpc, conhost windows.Handle + size := clampPtySize(cols, rows) + conhostScanMu.Lock() + conhostsBefore := conhostChildren() + err = windows.CreatePseudoConsole(size, inRead, outWrite, 0, &hpc) + if err == nil { + conhost = openNewConhostChild(conhostsBefore) + } + conhostScanMu.Unlock() + if err != nil { + _ = windows.CloseHandle(inRead) + _ = windows.CloseHandle(outWrite) + return StartedPty{}, fmt.Errorf("CreatePseudoConsole: %w", err) + } + _ = windows.CloseHandle(inRead) + _ = windows.CloseHandle(outWrite) + defer func() { + if err != nil { + windows.ClosePseudoConsole(hpc) + if conhost != 0 { + _ = windows.CloseHandle(conhost) + } + } + }() + + // The child goes into a job object so that the teardown in Close can + // terminate the whole process tree. KILL_ON_JOB_CLOSE makes the OS do + // that when the last handle to the job is closed, which doubles as a + // safety net: if lazygit exits without running the teardown, the handle + // is closed for it and the tree is reaped. + job, err := windows.CreateJobObject(nil, nil) + if err != nil { + return StartedPty{}, fmt.Errorf("CreateJobObject: %w", err) + } + defer func() { + if err != nil { + // Kills the child on error paths where it was already assigned + // to the job; plain handle cleanup before that. + _ = windows.CloseHandle(job) + } + }() + limits := windows.JOBOBJECT_EXTENDED_LIMIT_INFORMATION{ + BasicLimitInformation: windows.JOBOBJECT_BASIC_LIMIT_INFORMATION{ + LimitFlags: windows.JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE, + }, + } + if _, err = windows.SetInformationJobObject( + job, windows.JobObjectExtendedLimitInformation, + uintptr(unsafe.Pointer(&limits)), uint32(unsafe.Sizeof(limits)), + ); err != nil { + return StartedPty{}, fmt.Errorf("SetInformationJobObject: %w", err) + } + + // Attach the pseudoconsole to the child via a process attribute list. + attrList, err := windows.NewProcThreadAttributeList(1) + if err != nil { + return StartedPty{}, fmt.Errorf("NewProcThreadAttributeList: %w", err) + } + defer attrList.Delete() + // PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE wants the HPCON value itself as + // the attribute value, not a pointer to it — an HPCON is already a + // pointer-sized handle, per Microsoft's ConPTY sample. Spelling that as + // unsafe.Pointer(hpc) trips go vet's unsafeptr check (a uintptr-based + // type converted straight to unsafe.Pointer), which gopls surfaces in + // the editor. Reinterpret the handle's bits through its address instead: + // &hpc is a real pointer, so none of these conversions is the flagged + // uintptr→unsafe.Pointer cast, while the resulting value is identical. + if err = attrList.Update( + windows.PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, + *(*unsafe.Pointer)(unsafe.Pointer(&hpc)), + unsafe.Sizeof(hpc), + ); err != nil { + return StartedPty{}, fmt.Errorf("UpdateProcThreadAttribute: %w", err) + } + + var si windows.StartupInfoEx + si.Cb = uint32(unsafe.Sizeof(si)) + si.ProcThreadAttributeList = attrList.List() + + var appNamePtr *uint16 + if cmd.Path != "" { + if appNamePtr, err = windows.UTF16PtrFromString(cmd.Path); err != nil { + return StartedPty{}, err + } + } + cmdLinePtr, err := windows.UTF16PtrFromString(windows.ComposeCommandLine(cmd.Args)) + if err != nil { + return StartedPty{}, err + } + var dirPtr *uint16 + if cmd.Dir != "" { + if dirPtr, err = windows.UTF16PtrFromString(cmd.Dir); err != nil { + return StartedPty{}, err + } + } + envBlock, err := createEnvBlock(cmd.Env) + if err != nil { + return StartedPty{}, err + } + var envPtr *uint16 + if envBlock != nil { + envPtr = &envBlock[0] + } + + var pi windows.ProcessInformation + err = windows.CreateProcess( + appNamePtr, + cmdLinePtr, + nil, // process security + nil, // thread security + false, + windows.EXTENDED_STARTUPINFO_PRESENT|windows.CREATE_UNICODE_ENVIRONMENT|windows.CREATE_SUSPENDED, + envPtr, + dirPtr, + &si.StartupInfo, + &pi, + ) + if err != nil { + return StartedPty{}, fmt.Errorf("CreateProcess: %w", err) + } + + // The child was created suspended so that it can be assigned to the job + // before it runs its first instruction; that way every descendant it + // ever spawns is in the job from the start. + if err = windows.AssignProcessToJobObject(job, pi.Process); err != nil { + // Not in the job yet, so the deferred job-handle close can't reap it. + _ = windows.TerminateProcess(pi.Process, 1) + _ = windows.CloseHandle(pi.Thread) + _ = windows.CloseHandle(pi.Process) + return StartedPty{}, fmt.Errorf("AssignProcessToJobObject: %w", err) + } + if _, err = windows.ResumeThread(pi.Thread); err != nil { + _ = windows.CloseHandle(pi.Thread) + _ = windows.CloseHandle(pi.Process) + return StartedPty{}, fmt.Errorf("ResumeThread: %w", err) + } + _ = windows.CloseHandle(pi.Thread) + + // Re-open the process by PID to get an *os.Process to wait on. Do this + // while pi.Process is still open: Windows won't recycle a PID while any + // handle to the process remains, so FindProcess can't latch onto a + // different process that has since reused the PID. Release the original + // handle once we have our own. + proc, err := os.FindProcess(int(pi.ProcessId)) + _ = windows.CloseHandle(pi.Process) + if err != nil { + return StartedPty{}, err + } + + wp := &winPty{ + hpc: hpc, + job: job, + conhost: conhost, + inWrite: os.NewFile(uintptr(inWrite), "conpty-in"), + outRead: os.NewFile(uintptr(outRead), "conpty-out"), + } + return StartedPty{ + Pty: wp, + Process: proc, + Wait: startWaiter(proc, wp), + }, nil +} + +// createEnvBlock packs env vars into the UTF-16 double-null-terminated block +// that CreateProcess expects. Returns nil if env is empty, which tells +// CreateProcess to inherit the parent's environment. +func createEnvBlock(env []string) ([]uint16, error) { + if len(env) == 0 { + return nil, nil + } + var block []uint16 + for _, s := range env { + utf16s, err := windows.UTF16FromString(s) + if err != nil { + return nil, err + } + block = append(block, utf16s...) + } + block = append(block, 0) + return block, nil +} diff --git a/pkg/commands/oscommands/pty_windows_test.go b/pkg/commands/oscommands/pty_windows_test.go new file mode 100644 index 000000000..e6581a85d --- /dev/null +++ b/pkg/commands/oscommands/pty_windows_test.go @@ -0,0 +1,105 @@ +package oscommands + +import ( + "os/exec" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +// The requested size can legitimately be zero: the pty inherits the main +// view's dimensions, and that view is zero-sized while hidden, e.g. in +// full-screen mode with a side panel focused. +func TestStartPtyWithZeroSize(t *testing.T) { + // The command deliberately produces no output: go test runs with + // redirected std handles, which CreateProcess duplicates into the child + // in place of handles to the attached pseudoconsole, so command output + // would bypass the pty and pollute the test log. + sp, err := StartPty(exec.Command("cmd", "/c", "exit 0"), 0, 0) + assert.NoError(t, err) + + if err == nil { + _ = sp.Wait() + _ = sp.Pty.Close() + } +} + +// StartPty must identify the conhost.exe that CreatePseudoConsole spawned to +// serve the pty: the teardown in Close reaps it on Windows builds whose +// conhost fails to run down on its own, and a failed identification silently +// degrades to not reaping. If this fails, the child-scan in +// openNewConhostChild no longer matches how Windows hosts pseudoconsoles. +func TestStartPtyIdentifiesConhost(t *testing.T) { + sp, err := StartPty(exec.Command("cmd", "/c", "exit 0"), 80, 24) + assert.NoError(t, err) + if err != nil { + return + } + + assert.NotZero(t, sp.Pty.(*winPty).conhost) + + _ = sp.Wait() + _ = sp.Pty.Close() +} + +// TerminateLivePtys must reap a still-running pty synchronously: it runs +// when lazygit is about to exit, where the asynchronous teardown would not +// get to finish. Note that it switches the package's pty teardowns into +// quit mode for the remainder of the test binary's lifetime; that's fine +// for the other tests here, which must hold in either mode (quit mode only +// shortens the teardown's conhost rundown wait). +func TestTerminateLivePtysReapsRunningPty(t *testing.T) { + // The output redirect is there for the reason described in + // TestStartPtyWithZeroSize. + sp, err := StartPty(exec.Command("cmd", "/c", "ping -n 30 127.0.0.1 >nul"), 80, 24) + assert.NoError(t, err) + if err != nil { + return + } + + _ = sp.Pty.Close() + TerminateLivePtys() + + // The teardown has completed as part of TerminateLivePtys, so the child + // must be gone already; the timeout is generosity, not a grace period. + exited := make(chan struct{}) + go func() { + _ = sp.Wait() + close(exited) + }() + select { + case <-exited: + case <-time.After(time.Second): + t.Fatal("child process was not terminated by TerminateLivePtys") + } +} + +// Closing the pty must terminate the process tree it was running, even when +// it is closed so soon after starting that the child hasn't attached to the +// pseudoconsole yet: such a child misses the CTRL_CLOSE_EVENT that the close +// delivers to attached clients, and only the job-object kill reaps it. +// Without the kill, cmd and its ping child keep running for ~30 seconds and +// the Wait here times out. +func TestClosePtyTerminatesChildProcessTree(t *testing.T) { + // The output redirect is there for the reason described in + // TestStartPtyWithZeroSize. + sp, err := StartPty(exec.Command("cmd", "/c", "ping -n 30 127.0.0.1 >nul"), 80, 24) + assert.NoError(t, err) + if err != nil { + return + } + + _ = sp.Pty.Close() + + exited := make(chan struct{}) + go func() { + _ = sp.Wait() + close(exited) + }() + select { + case <-exited: + case <-time.After(5 * time.Second): + t.Fatal("child process was not terminated by closing the pty") + } +} diff --git a/pkg/commands/patch/hunk.go b/pkg/commands/patch/hunk.go index 6d0177d05..568b312a7 100644 --- a/pkg/commands/patch/hunk.go +++ b/pkg/commands/patch/hunk.go @@ -44,7 +44,8 @@ func (self *Hunk) lineCount() int { // Returns all lines in the hunk, including the header line func (self *Hunk) allLines() []*PatchLine { - lines := []*PatchLine{{Content: self.formatHeaderLine(), Kind: HUNK_HEADER}} + lines := make([]*PatchLine, 1, 1+len(self.bodyLines)) + lines[0] = &PatchLine{Content: self.formatHeaderLine(), Kind: HUNK_HEADER} lines = append(lines, self.bodyLines...) return lines } diff --git a/pkg/commands/patch/patch.go b/pkg/commands/patch/patch.go index 38d432ae6..fbbf3c935 100644 --- a/pkg/commands/patch/patch.go +++ b/pkg/commands/patch/patch.go @@ -51,6 +51,16 @@ func (self *Patch) Lines() []*PatchLine { return lines } +// Returns the old-file starting line number of the hunk containing the given +// patch line index. Returns 0 if the line is not inside any hunk. +func (self *Patch) HunkOldStartForLine(idx int) int { + hunkIdx := self.HunkContainingLine(idx) + if hunkIdx == -1 { + return 0 + } + return self.hunks[hunkIdx].oldStart +} + // Returns the patch line index of the first line in the given hunk func (self *Patch) HunkStartIdx(hunkIndex int) int { hunkIndex = lo.Clamp(hunkIndex, 0, len(self.hunks)-1) diff --git a/pkg/commands/patch/patch_builder.go b/pkg/commands/patch/patch_builder.go index db834ba16..0d5ca34f8 100644 --- a/pkg/commands/patch/patch_builder.go +++ b/pkg/commands/patch/patch_builder.go @@ -6,6 +6,7 @@ import ( "github.com/jesseduffield/generics/maps" "github.com/samber/lo" + "github.com/sasha-s/go-deadlock" "github.com/sirupsen/logrus" ) @@ -25,10 +26,14 @@ type fileInfo struct { mode PatchStatus includedLineIndices []int diff string + // For a renamed file, the path it was renamed from; empty otherwise. We + // need to keep hold of it so we can re-render the file's patch (which is + // keyed by the new path) without the caller having to supply it again. + previousPath string } type ( - loadFileDiffFunc func(from string, to string, reverse bool, filename string, plain bool) (string, error) + loadFileDiffFunc func(from string, to string, reverse bool, filename string, previousPath string, plain bool) (string, error) ) // PatchBuilder manages the building of a patch for a commit to be applied to another commit (or the working tree, or removed from the current commit). We also support building patches from things like stashes, for which there is less flexibility @@ -46,6 +51,13 @@ type PatchBuilder struct { fileInfoMap map[string]*fileInfo Log *logrus.Entry + // mutex guards the fields that a git worker can mutate (via Reset, at the + // end of a patch-consuming operation) while the UI thread reads them to + // render — chiefly To and the fileInfoMap pointer. The map's *entries* are + // only ever touched on the UI thread, so we only hold the lock long enough + // to read or swap the fields, never across the git I/O in getFileInfo. + mutex deadlock.Mutex + // loadFileDiff loads the diff of a file, for a given to (typically a commit hash) loadFileDiff loadFileDiffFunc } @@ -58,6 +70,9 @@ func NewPatchBuilder(log *logrus.Entry, loadFileDiff loadFileDiffFunc) *PatchBui } func (p *PatchBuilder) Start(from, to string, reverse bool, canRebase bool) { + p.mutex.Lock() + defer p.mutex.Unlock() + p.To = to p.From = from p.reverse = reverse @@ -65,16 +80,28 @@ func (p *PatchBuilder) Start(from, to string, reverse bool, canRebase bool) { p.fileInfoMap = map[string]*fileInfo{} } +// snapshotFileInfoMap returns the current fileInfoMap under the lock. The map's +// entries are only mutated on the UI thread, so callers can read the returned +// map without holding the lock; the lock only serializes the pointer swap that +// Reset/Start do (potentially from a git worker) against these reads. +func (p *PatchBuilder) snapshotFileInfoMap() map[string]*fileInfo { + p.mutex.Lock() + defer p.mutex.Unlock() + + return p.fileInfoMap +} + func (p *PatchBuilder) PatchToApply(reverse bool, turnAddedFilesIntoDiffAgainstEmptyFile bool) string { var patch strings.Builder - for filename, info := range p.fileInfoMap { + for filename, info := range p.snapshotFileInfoMap() { if info.mode == UNSELECTED { continue } patch.WriteString(p.RenderPatchForFile(RenderPatchForFileOpts{ Filename: filename, + PreviousPath: info.previousPath, Plain: true, Reverse: reverse, TurnAddedFilesIntoDiffAgainstEmptyFile: turnAddedFilesIntoDiffAgainstEmptyFile, @@ -102,8 +129,8 @@ func (p *PatchBuilder) removeFile(info *fileInfo) { info.includedLineIndices = nil } -func (p *PatchBuilder) AddFileWhole(filename string) error { - info, err := p.getFileInfo(filename) +func (p *PatchBuilder) AddFileWhole(filename string, previousPath string) error { + info, err := p.getFileInfo(filename, previousPath) if err != nil { return err } @@ -113,8 +140,8 @@ func (p *PatchBuilder) AddFileWhole(filename string) error { return nil } -func (p *PatchBuilder) RemoveFile(filename string) error { - info, err := p.getFileInfo(filename) +func (p *PatchBuilder) RemoveFile(filename string, previousPath string) error { + info, err := p.getFileInfo(filename, previousPath) if err != nil { return err } @@ -124,28 +151,34 @@ func (p *PatchBuilder) RemoveFile(filename string) error { return nil } -func (p *PatchBuilder) getFileInfo(filename string) (*fileInfo, error) { - info, ok := p.fileInfoMap[filename] +func (p *PatchBuilder) getFileInfo(filename string, previousPath string) (*fileInfo, error) { + p.mutex.Lock() + fileInfoMap := p.fileInfoMap + from, to, reverse := p.From, p.To, p.reverse + p.mutex.Unlock() + + info, ok := fileInfoMap[filename] if ok { return info, nil } - diff, err := p.loadFileDiff(p.From, p.To, p.reverse, filename, true) + diff, err := p.loadFileDiff(from, to, reverse, filename, previousPath, true) if err != nil { return nil, err } info = &fileInfo{ - mode: UNSELECTED, - diff: diff, + mode: UNSELECTED, + diff: diff, + previousPath: previousPath, } - p.fileInfoMap[filename] = info + fileInfoMap[filename] = info return info, nil } -func (p *PatchBuilder) AddFileLineRange(filename string, lineIndices []int) error { - info, err := p.getFileInfo(filename) +func (p *PatchBuilder) AddFileLineRange(filename string, previousPath string, lineIndices []int) error { + info, err := p.getFileInfo(filename, previousPath) if err != nil { return err } @@ -155,8 +188,8 @@ func (p *PatchBuilder) AddFileLineRange(filename string, lineIndices []int) erro return nil } -func (p *PatchBuilder) RemoveFileLineRange(filename string, lineIndices []int) error { - info, err := p.getFileInfo(filename) +func (p *PatchBuilder) RemoveFileLineRange(filename string, previousPath string, lineIndices []int) error { + info, err := p.getFileInfo(filename, previousPath) if err != nil { return err } @@ -171,13 +204,14 @@ func (p *PatchBuilder) RemoveFileLineRange(filename string, lineIndices []int) e type RenderPatchForFileOpts struct { Filename string + PreviousPath string Plain bool Reverse bool TurnAddedFilesIntoDiffAgainstEmptyFile bool } func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string { - info, err := p.getFileInfo(opts.Filename) + info, err := p.getFileInfo(opts.Filename, opts.PreviousPath) if err != nil { p.Log.Error(err) return "" @@ -198,7 +232,12 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string { Transform(TransformOpts{ Reverse: opts.Reverse, TurnAddedFilesIntoDiffAgainstEmptyFile: opts.TurnAddedFilesIntoDiffAgainstEmptyFile, - IncludedLineIndices: info.includedLineIndices, + // For a partial selection of a renamed file we keep only the + // content change and drop the rename, so that the rename stays in + // the commit. A whole-file selection keeps the rename (and short- + // circuits before this for plain output). + StripRename: info.mode == PART && info.previousPath != "", + IncludedLineIndices: info.includedLineIndices, }) if opts.Plain { @@ -208,13 +247,16 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string { } func (p *PatchBuilder) renderEachFilePatch(plain bool) []string { + fileInfoMap := p.snapshotFileInfoMap() + // sort files by name then iterate through and render each patch - filenames := maps.Keys(p.fileInfoMap) + filenames := maps.Keys(fileInfoMap) sort.Strings(filenames) patches := lo.Map(filenames, func(filename string, _ int) string { return p.RenderPatchForFile(RenderPatchForFileOpts{ Filename: filename, + PreviousPath: fileInfoMap[filename].previousPath, Plain: plain, Reverse: false, TurnAddedFilesIntoDiffAgainstEmptyFile: true, @@ -232,11 +274,16 @@ func (p *PatchBuilder) RenderAggregatedPatch(plain bool) string { } func (p *PatchBuilder) GetFileStatus(filename string, parent string) PatchStatus { - if parent != p.To { + p.mutex.Lock() + to := p.To + fileInfoMap := p.fileInfoMap + p.mutex.Unlock() + + if parent != to { return UNSELECTED } - info, ok := p.fileInfoMap[filename] + info, ok := fileInfoMap[filename] if !ok { return UNSELECTED } @@ -244,8 +291,8 @@ func (p *PatchBuilder) GetFileStatus(filename string, parent string) PatchStatus return info.mode } -func (p *PatchBuilder) GetFileIncLineIndices(filename string) ([]int, error) { - info, err := p.getFileInfo(filename) +func (p *PatchBuilder) GetFileIncLineIndices(filename string, previousPath string) ([]int, error) { + info, err := p.getFileInfo(filename, previousPath) if err != nil { return nil, err } @@ -254,16 +301,22 @@ func (p *PatchBuilder) GetFileIncLineIndices(filename string) ([]int, error) { // clears the patch func (p *PatchBuilder) Reset() { + p.mutex.Lock() + defer p.mutex.Unlock() + p.To = "" p.fileInfoMap = map[string]*fileInfo{} } func (p *PatchBuilder) Active() bool { + p.mutex.Lock() + defer p.mutex.Unlock() + return p.To != "" } func (p *PatchBuilder) IsEmpty() bool { - for _, fileInfo := range p.fileInfoMap { + for _, fileInfo := range p.snapshotFileInfoMap() { if fileInfo.mode == WHOLE || (fileInfo.mode == PART && len(fileInfo.includedLineIndices) > 0) { return false } @@ -274,9 +327,12 @@ func (p *PatchBuilder) IsEmpty() bool { // if any of these things change we'll need to reset and start a new patch func (p *PatchBuilder) NewPatchRequired(from string, to string, reverse bool) bool { + p.mutex.Lock() + defer p.mutex.Unlock() + return from != p.From || to != p.To || reverse != p.reverse } func (p *PatchBuilder) AllFilesInPatch() []string { - return lo.Keys(p.fileInfoMap) + return lo.Keys(p.snapshotFileInfoMap()) } diff --git a/pkg/commands/patch/patch_line.go b/pkg/commands/patch/patch_line.go index 78eef3a19..45852ad07 100644 --- a/pkg/commands/patch/patch_line.go +++ b/pkg/commands/patch/patch_line.go @@ -22,6 +22,14 @@ func (self *PatchLine) IsChange() bool { return self.Kind == ADDITION || self.Kind == DELETION } +func (self *PatchLine) IsAddition() bool { + return self.Kind == ADDITION +} + +func (self *PatchLine) IsDeletion() bool { + return self.Kind == DELETION +} + // Returns the number of lines in the given slice that have one of the given kinds func nLinesWithKind(lines []*PatchLine, kinds []PatchLineKind) int { return lo.CountBy(lines, func(line *PatchLine) bool { diff --git a/pkg/commands/patch/patch_test.go b/pkg/commands/patch/patch_test.go index f91fc406e..4f84041d6 100644 --- a/pkg/commands/patch/patch_test.go +++ b/pkg/commands/patch/patch_test.go @@ -19,6 +19,22 @@ index dcd3485..1ba5540 100644 ... ` +const renameWithModificationDiff = `diff --git a/oldname b/newname +similarity index 62% +rename from oldname +rename to newname +index dcd3485..1ba5540 100644 +--- a/oldname ++++ b/newname +@@ -1,5 +1,5 @@ + apple +-orange ++grape + ... + ... + ... +` + const addNewlineToEndOfFile = `diff --git a/filename b/filename index 80a73f1..e48a11c 100644 --- a/filename @@ -152,6 +168,7 @@ func TestTransform(t *testing.T) { firstLineIndex int lastLineIndex int reverse bool + stripRename bool expected string } @@ -215,8 +232,8 @@ func TestTransform(t *testing.T) { +++ b/filename @@ -1,5 +1,6 @@ apple - orange +grape + orange ... ... ... @@ -354,8 +371,8 @@ func TestTransform(t *testing.T) { ... ... ... - last line +last line + last line \ No newline at end of file `, }, @@ -412,8 +429,8 @@ func TestTransform(t *testing.T) { +++ b/filename @@ -1,5 +1,6 @@ apple - grape +orange + grape ... ... ... @@ -515,6 +532,43 @@ func TestTransform(t *testing.T) { orange banana lemon +`, + }, + { + testName: "renamed file, whole change selected, strips the rename so only the content change is applied", + firstLineIndex: 9, + lastLineIndex: 10, + stripRename: true, + diffText: renameWithModificationDiff, + expected: `diff --git a/newname b/newname +index dcd3485..1ba5540 100644 +--- a/newname ++++ b/newname +@@ -1,5 +1,5 @@ + apple +-orange ++grape + ... + ... + ... +`, + }, + { + testName: "renamed file, only removal selected, strips the rename", + firstLineIndex: 9, + lastLineIndex: 9, + stripRename: true, + diffText: renameWithModificationDiff, + expected: `diff --git a/newname b/newname +index dcd3485..1ba5540 100644 +--- a/newname ++++ b/newname +@@ -1,5 +1,4 @@ + apple +-orange + ... + ... + ... `, }, } @@ -527,6 +581,7 @@ func TestTransform(t *testing.T) { Transform(TransformOpts{ Reverse: s.reverse, FileNameOverride: s.filename, + StripRename: s.stripRename, IncludedLineIndices: lineIndices, }). FormatPlain() diff --git a/pkg/commands/patch/transform.go b/pkg/commands/patch/transform.go index 4cd4c0207..31456bfc7 100644 --- a/pkg/commands/patch/transform.go +++ b/pkg/commands/patch/transform.go @@ -33,6 +33,13 @@ type TransformOpts struct { // treat it as a diff against an empty file. TurnAddedFilesIntoDiffAgainstEmptyFile bool + // When building a partial patch for a renamed file, strip the rename + // metadata from the header and point it at the new path. Applying the + // resulting patch then only changes the file's contents and leaves the + // rename itself in place. (For a whole-file selection we keep the rename + // so that it moves or is discarded together with the contents.) + StripRename bool + // The indices of lines that should be included in the patch. IncludedLineIndices []int } @@ -72,21 +79,61 @@ func (self *patchTransformer) transformHeader() []string { "--- a/" + self.opts.FileNameOverride, "+++ b/" + self.opts.FileNameOverride, } - } else if self.opts.TurnAddedFilesIntoDiffAgainstEmptyFile { - result := make([]string, 0, len(self.patch.header)) - for idx, line := range self.patch.header { + } + + header := self.patch.header + if self.opts.StripRename { + header = stripRenameFromHeader(header) + } + + if self.opts.TurnAddedFilesIntoDiffAgainstEmptyFile { + result := make([]string, 0, len(header)) + for idx, line := range header { if strings.HasPrefix(line, "new file mode") { continue } - if line == "--- /dev/null" && strings.HasPrefix(self.patch.header[idx+1], "+++ b/") { - line = "--- a/" + self.patch.header[idx+1][6:] + if line == "--- /dev/null" && strings.HasPrefix(header[idx+1], "+++ b/") { + line = "--- a/" + header[idx+1][6:] } result = append(result, line) } return result } - return self.patch.header + return header +} + +// stripRenameFromHeader rewrites a rename diff header so that it looks like a +// plain modification of the new path: it drops the rename metadata and points +// the diff at the new path on both sides, while keeping the blob index line so +// that `git apply --3way` can still fall back to a blob merge. See the +// StripRename option for why we do this. +func stripRenameFromHeader(header []string) []string { + newPath := "" + for _, line := range header { + if path, ok := strings.CutPrefix(line, "+++ b/"); ok { + newPath = path + break + } + } + + result := make([]string, 0, len(header)) + for _, line := range header { + switch { + case strings.HasPrefix(line, "similarity index "), + strings.HasPrefix(line, "dissimilarity index "), + strings.HasPrefix(line, "rename from "), + strings.HasPrefix(line, "rename to "): + // drop the rename metadata + case strings.HasPrefix(line, "diff --git "): + result = append(result, "diff --git a/"+newPath+" b/"+newPath) + case strings.HasPrefix(line, "--- "): + result = append(result, "--- a/"+newPath) + default: + result = append(result, line) + } + } + return result } func (self *patchTransformer) transformHunks() []*Hunk { @@ -125,6 +172,22 @@ func (self *patchTransformer) transformHunk(hunk *Hunk, startOffset int, firstLi func (self *patchTransformer) transformHunkLines(hunk *Hunk, firstLineIdx int) []*PatchLine { skippedNewlineMessageIndex := -1 newLines := []*PatchLine{} + // Unselected "old-file" lines (deletions when staging, additions when + // reverse-staging) are converted to context but buffered here rather than + // appended immediately. This ensures they end up after any selected additions + // in the same change block, giving the correct output ordering: + // [selected deletions] [selected additions] [context from unselected deletions] + // Exception: if unselected new-file lines have been skipped earlier in the + // current change block, the selected addition comes "later" in the block. In + // that case the pending context (from unselected deletions before it) must be + // flushed first so those context lines appear before the addition in the output. + pendingContext := []*PatchLine{} + didSeeUnselectedNewFileLine := false + + flushPendingContext := func() { + newLines = append(newLines, pendingContext...) + pendingContext = pendingContext[:0] + } for i, line := range hunk.bodyLines { lineIdx := i + firstLineIdx + 1 // plus one for header line @@ -133,26 +196,58 @@ func (self *patchTransformer) transformHunkLines(hunk *Hunk, firstLineIdx int) [ } isLineSelected := lo.Contains(self.opts.IncludedLineIndices, lineIdx) - if isLineSelected || (line.Kind == NEWLINE_MESSAGE && skippedNewlineMessageIndex != lineIdx) || line.Kind == CONTEXT { + if line.Kind == CONTEXT { + flushPendingContext() + didSeeUnselectedNewFileLine = false newLines = append(newLines, line) continue } - if (line.Kind == DELETION && !self.opts.Reverse) || (line.Kind == ADDITION && self.opts.Reverse) { + if line.Kind == NEWLINE_MESSAGE { + if skippedNewlineMessageIndex != lineIdx { + flushPendingContext() + newLines = append(newLines, line) + } + continue + } + + isOldFileLine := (line.Kind == DELETION && !self.opts.Reverse) || (line.Kind == ADDITION && self.opts.Reverse) + + if isLineSelected { + // Selected "old-file" lines must flush pending context first to preserve + // the correct ordering of old-file lines (deletions and context) relative + // to each other. + if isOldFileLine || + // Some new-file lines were skipped earlier in this change block, meaning + // this selected addition comes after them positionally. Flush pending + // context first so the unselected deletion context lines appear before + // this addition rather than after it. + didSeeUnselectedNewFileLine { + flushPendingContext() + } + newLines = append(newLines, line) + continue + } + + if isOldFileLine { content := " " + line.Content[1:] - newLines = append(newLines, &PatchLine{ + pendingContext = append(pendingContext, &PatchLine{ Kind: CONTEXT, Content: content, }) continue } + didSeeUnselectedNewFileLine = true + if line.Kind == ADDITION { // we don't want to include the 'newline at end of file' line if it involves an addition we're not including skippedNewlineMessageIndex = lineIdx + 1 } } + flushPendingContext() + return newLines } diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 8205f7ef6..ade614f7d 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -7,6 +7,7 @@ import ( "os" "path/filepath" "reflect" + "runtime" "strings" "time" @@ -20,17 +21,18 @@ import ( // AppConfig contains the base configuration fields required for lazygit. type AppConfig struct { - debug bool `long:"debug" env:"DEBUG" default:"false"` - version string `long:"version" env:"VERSION" default:"unversioned"` - buildDate string `long:"build-date" env:"BUILD_DATE"` - name string `long:"name" env:"NAME" default:"lazygit"` - buildSource string `long:"build-source" env:"BUILD_SOURCE" default:""` - userConfig *UserConfig - globalUserConfigFiles []*ConfigFile - userConfigFiles []*ConfigFile - userConfigDir string - tempDir string - appState *AppState + debug bool `long:"debug" env:"DEBUG" default:"false"` + version string `long:"version" env:"VERSION" default:"unversioned"` + buildDate string `long:"build-date" env:"BUILD_DATE"` + name string `long:"name" env:"NAME" default:"lazygit"` + buildSource string `long:"build-source" env:"BUILD_SOURCE" default:""` + userConfig *UserConfig + globalUserConfigFiles []*ConfigFile + userConfigFiles []*ConfigFile + userConfigDir string + tempDir string + appState *AppState + githubPullRequestCache *githubPullRequestCache } type AppConfigurer interface { @@ -50,6 +52,8 @@ type AppConfigurer interface { GetAppState() *AppState SaveAppState() error + GetCachedGithubPullRequests(repoPath string) ([]CachedPullRequest, error) + SaveCachedGithubPullRequests(repoPath string, pullRequests []CachedPullRequest) error } type ConfigFilePolicy int @@ -106,19 +110,21 @@ func NewAppConfig( if err != nil { return nil, err } + githubPullRequestCache := loadGithubPullRequestCache() appConfig := &AppConfig{ - name: name, - version: version, - buildDate: date, - debug: debuggingFlag, - buildSource: buildSource, - userConfig: userConfig, - globalUserConfigFiles: configFiles, - userConfigFiles: configFiles, - userConfigDir: configDir, - tempDir: tempDir, - appState: appState, + name: name, + version: version, + buildDate: date, + debug: debuggingFlag, + buildSource: buildSource, + userConfig: userConfig, + globalUserConfigFiles: configFiles, + userConfigFiles: configFiles, + userConfigDir: configDir, + tempDir: tempDir, + appState: appState, + githubPullRequestCache: githubPullRequestCache, } return appConfig, nil @@ -135,8 +141,23 @@ func findOrCreateConfigDir() (string, error) { return folder, os.MkdirAll(folder, 0o755) } +// KeybindingPlatform returns the platform whose default keybindings should be +// used. Normally this is the OS we're running on, but it can be overridden with +// the LAZYGIT_KEYBINDING_PLATFORM environment variable; this is useful e.g. when +// running lazygit in a Linux container that you access over ssh from a Mac, and +// you'd rather use the Mac keybindings. An unrecognized value falls back to the +// real OS, which gives meaningful bindings, rather than to the (arbitrary) +// non-darwin defaults. +func KeybindingPlatform() string { + platform := os.Getenv("LAZYGIT_KEYBINDING_PLATFORM") + if lo.Contains([]string{"darwin", "linux", "windows"}, platform) { + return platform + } + return runtime.GOOS +} + func loadUserConfigWithDefaults(configFiles []*ConfigFile, isGuiInitialized bool) (*UserConfig, error) { - return loadUserConfig(configFiles, GetDefaultConfig(), isGuiInitialized) + return loadUserConfig(configFiles, GetDefaultConfigForPlatform(KeybindingPlatform()), isGuiInitialized) } func loadUserConfig(configFiles []*ConfigFile, base *UserConfig, isGuiInitialized bool) (*UserConfig, error) { @@ -202,6 +223,7 @@ func loadUserConfig(configFiles []*ConfigFile, base *UserConfig, isGuiInitialize } } + base.Keybinding.MergeLegacyAltKeybindings() return base, nil } @@ -271,6 +293,8 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([] }{ {[]string{"gui", "skipUnstageLineWarning"}, "skipDiscardChangeWarning"}, {[]string{"keybinding", "universal", "executeCustomCommand"}, "executeShellCommand"}, + {[]string{"keybinding", "universal", "cyclePagers"}, "cycleDiffRenderers"}, + {[]string{"keybinding", "universal", "cyclePagersReverse"}, "cycleDiffRenderersReverse"}, {[]string{"gui", "windowSize"}, "screenMode"}, {[]string{"keybinding", "files", "openMergeTool"}, "openMergeOptions"}, } @@ -285,6 +309,26 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([] } } + pathsToMove := []struct { + oldPath []string + newPath []string + }{ + { + []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + []string{"keybinding", "universal", "newWorktree"}, + }, + } + + for _, pathToMove := range pathsToMove { + err, didMove := yaml_utils.MoveYamlKey(&rootNode, pathToMove.oldPath, pathToMove.newPath) + if err != nil { + return nil, false, fmt.Errorf("Couldn't migrate config file at `%s` for key %s: %w", path, strings.Join(pathToMove.oldPath, "."), err) + } + if didMove { + changes.Add(fmt.Sprintf("Moved '%s' to '%s'", strings.Join(pathToMove.oldPath, "."), strings.Join(pathToMove.newPath, "."))) + } + } + err = changeNullKeybindingsToDisabled(&rootNode, changes) if err != nil { return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err) @@ -310,7 +354,12 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([] return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err) } - err = migratePagers(&rootNode, changes) + err = migratePaging(&rootNode, changes) + if err != nil { + return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err) + } + + err = migratePagersToDiffRenderers(&rootNode, changes) if err != nil { return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err) } @@ -447,7 +496,8 @@ func migrateAllBranchesLogCmd(rootNode *yaml.Node, changes *ChangesSet) error { // We will later populate it with the individual allBranchesLogCmd record cmdsKeyNode = &yaml.Node{Kind: yaml.ScalarNode, Value: "allBranchesLogCmds"} cmdsValueNode = &yaml.Node{Kind: yaml.SequenceNode, Content: []*yaml.Node{}} - gitNode.Content = append(gitNode.Content, + gitNode.Content = append( + gitNode.Content, cmdsKeyNode, cmdsValueNode, ) @@ -474,7 +524,9 @@ func migrateAllBranchesLogCmd(rootNode *yaml.Node, changes *ChangesSet) error { }) } -func migratePagers(rootNode *yaml.Node, changes *ChangesSet) error { +// Migrate the single 'paging' node to an array of 'pagers'. This is not the final structure, we +// migrate it to diffRenderers from there in a separate step below. +func migratePaging(rootNode *yaml.Node, changes *ChangesSet) error { return yaml_utils.TransformNode(rootNode, []string{"git"}, func(gitNode *yaml.Node) error { pagingKeyNode, pagingValueNode := yaml_utils.LookupKey(gitNode, "paging") if pagingKeyNode == nil || pagingValueNode.Kind != yaml.MappingNode { @@ -483,10 +535,11 @@ func migratePagers(rootNode *yaml.Node, changes *ChangesSet) error { } pagersKeyNode, _ := yaml_utils.LookupKey(gitNode, "pagers") - if pagersKeyNode != nil { - // Conversely, if there *is* already a "pagers" array, we also have nothing to do. - // This covers the case where the user keeps both the "paging" section and the "pagers" - // array for the sake of easier testing of old versions. + diffRenderersKeyNode, _ := yaml_utils.LookupKey(gitNode, "diffRenderers") + if pagersKeyNode != nil || diffRenderersKeyNode != nil { + // Conversely, if there is already a newer array config, we also have nothing to do. + // This covers the case where the user keeps both formats for the sake of easier testing + // of old versions. return nil } @@ -494,6 +547,7 @@ func migratePagers(rootNode *yaml.Node, changes *ChangesSet) error { pagingContentCopy := pagingValueNode.Content pagingValueNode.Kind = yaml.SequenceNode pagingValueNode.Tag = "!!seq" + pagingValueNode.Style &^= yaml.FlowStyle pagingValueNode.Content = []*yaml.Node{{ Kind: yaml.MappingNode, Content: pagingContentCopy, @@ -505,6 +559,90 @@ func migratePagers(rootNode *yaml.Node, changes *ChangesSet) error { }) } +func migratePagersToDiffRenderers(rootNode *yaml.Node, changes *ChangesSet) error { + return yaml_utils.TransformNode(rootNode, []string{"git"}, func(gitNode *yaml.Node) error { + pagersKeyNode, pagersValueNode := yaml_utils.LookupKey(gitNode, "pagers") + if pagersKeyNode == nil || pagersValueNode.Kind != yaml.SequenceNode { + // If there's no "pagers" section (or it's not a sequence), there's nothing to do + return nil + } + + diffRenderersKeyNode, _ := yaml_utils.LookupKey(gitNode, "diffRenderers") + if diffRenderersKeyNode != nil { + // Conversely, if there *is* already a "diffRenderers" array, we also have nothing to do. + // This covers the case where the user keeps both the "pagers" and the "diffRenderers" + // arrays for the sake of easier testing of old versions. + return nil + } + + pagersKeyNode.Value = "diffRenderers" + changes.Add("Renamed git.pagers to git.diffRenderers") + + for _, diffRendererNode := range pagersValueNode.Content { + if diffRendererNode.Kind != yaml.MappingNode { + continue + } + + pagerKeyNode, pagerValueNode := yaml_utils.LookupKey(diffRendererNode, "pager") + externalDiffCommandKeyNode, externalDiffCommandValueNode := yaml_utils.LookupKey(diffRendererNode, "externalDiffCommand") + useExternalDiffGitConfigKeyNode, useExternalDiffGitConfigValueNode := yaml_utils.LookupKey(diffRendererNode, "useExternalDiffGitConfig") + + hasPager := hasNonNullScalarValue(pagerValueNode) + hasExternalDiffCommand := hasNonNullScalarValue(externalDiffCommandValueNode) + useExternalDiffGitConfig := yamlBoolValue(useExternalDiffGitConfigValueNode) + + if hasPager { + pagerKeyNode.Value = "command" + changes.Add("Renamed 'pager' to 'command' in git pager") + } else if hasExternalDiffCommand { + externalDiffCommandKeyNode.Value = "command" + yaml_utils.AddStringKey(diffRendererNode, "type", "extDiff") + changes.Add("Changed 'externalDiffCommand' to 'command' with 'type: extDiff' in git pager") + } else if useExternalDiffGitConfig { + yaml_utils.RemoveKey(diffRendererNode, "useExternalDiffGitConfig") + yaml_utils.AddStringKey(diffRendererNode, "type", "extDiff") + changes.Add("Changed 'useExternalDiffGitConfig: true' to 'type: extDiff' in git pager") + } else { + yaml_utils.AddStringKey(diffRendererNode, "type", "rawGit") + diffRendererNode.Style &^= yaml.FlowStyle + changes.Add("Changed git pager without a command to 'type: rawGit'") + } + + if pagerKeyNode != nil && !hasPager { + yaml_utils.RemoveKey(diffRendererNode, "pager") + changes.Add("Removed empty 'pager' from git pager") + } + if externalDiffCommandKeyNode != nil && !hasExternalDiffCommand { + yaml_utils.RemoveKey(diffRendererNode, "externalDiffCommand") + changes.Add("Removed empty 'externalDiffCommand' from git pager") + } + if useExternalDiffGitConfigKeyNode != nil && !useExternalDiffGitConfig { + yaml_utils.RemoveKey(diffRendererNode, "useExternalDiffGitConfig") + if useExternalDiffGitConfigValueNode.Tag == "!!null" { + changes.Add("Removed empty 'useExternalDiffGitConfig' from git pager") + } else { + changes.Add("Removed 'useExternalDiffGitConfig: false' from git pager") + } + } + } + + return nil + }) +} + +func hasNonNullScalarValue(node *yaml.Node) bool { + return node != nil && node.Kind == yaml.ScalarNode && node.Tag != "!!null" && node.Value != "" +} + +func yamlBoolValue(node *yaml.Node) bool { + if node == nil { + return false + } + + var value bool + return node.Decode(&value) == nil && value +} + func (c *AppConfig) GetDebug() bool { return c.debug } @@ -533,6 +671,20 @@ func (c *AppConfig) GetAppState() *AppState { return c.appState } +func (c *AppConfig) GetCachedGithubPullRequests(repoPath string) ([]CachedPullRequest, error) { + if c.githubPullRequestCache == nil { + return nil, nil + } + return c.githubPullRequestCache.get(repoPath), c.githubPullRequestCache.takeLoadError() +} + +func (c *AppConfig) SaveCachedGithubPullRequests(repoPath string, pullRequests []CachedPullRequest) error { + if c.githubPullRequestCache == nil { + return nil + } + return c.githubPullRequestCache.save(repoPath, pullRequests) +} + func (c *AppConfig) GetUserConfigPaths() []string { return lo.FilterMap(c.userConfigFiles, func(f *ConfigFile, _ int) (string, bool) { return f.Path, f.exists diff --git a/pkg/config/app_config_test.go b/pkg/config/app_config_test.go index 1109256a9..180f4b882 100644 --- a/pkg/config/app_config_test.go +++ b/pkg/config/app_config_test.go @@ -1,11 +1,53 @@ package config import ( + "runtime" "testing" "github.com/stretchr/testify/assert" ) +func TestKeybindingPlatform(t *testing.T) { + scenarios := []struct { + name string + envValue string + expected string + }{ + { + name: "Not set falls back to the host OS", + envValue: "", + expected: runtime.GOOS, + }, + { + name: "darwin is honored", + envValue: "darwin", + expected: "darwin", + }, + { + name: "linux is honored", + envValue: "linux", + expected: "linux", + }, + { + name: "windows is honored", + envValue: "windows", + expected: "windows", + }, + { + name: "An unrecognized value falls back to the host OS", + envValue: "mac", + expected: runtime.GOOS, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + t.Setenv("LAZYGIT_KEYBINDING_PLATFORM", s.envValue) + assert.Equal(t, s.expected, KeybindingPlatform()) + }) + } +} + func TestMigrationOfRenamedKeys(t *testing.T) { scenarios := []struct { name string @@ -41,24 +83,28 @@ func TestMigrationOfRenamedKeys(t *testing.T) { }, { name: "Rename several", - input: `gui: - windowSize: half - skipUnstageLineWarning: true -keybinding: - universal: - executeCustomCommand: a -`, - expected: `gui: - screenMode: half - skipDiscardChangeWarning: true -keybinding: - universal: - executeShellCommand: a -`, + input: "gui:\n" + + " windowSize: half\n" + + " skipUnstageLineWarning: true\n" + + "keybinding:\n" + + " universal:\n" + + " executeCustomCommand: a\n" + + " cyclePagers: b\n" + + " cyclePagersReverse: c\n", + expected: "gui:\n" + + " screenMode: half\n" + + " skipDiscardChangeWarning: true\n" + + "keybinding:\n" + + " universal:\n" + + " executeShellCommand: a\n" + + " cycleDiffRenderers: b\n" + + " cycleDiffRenderersReverse: c\n", expectedDidChange: true, expectedChanges: []string{ "Renamed 'gui.skipUnstageLineWarning' to 'skipDiscardChangeWarning'", "Renamed 'keybinding.universal.executeCustomCommand' to 'executeShellCommand'", + "Renamed 'keybinding.universal.cyclePagers' to 'cycleDiffRenderers'", + "Renamed 'keybinding.universal.cyclePagersReverse' to 'cycleDiffRenderersReverse'", "Renamed 'gui.windowSize' to 'screenMode'", }, }, @@ -78,6 +124,73 @@ keybinding: } } +func TestMigrationOfMovedKeys(t *testing.T) { + scenarios := []struct { + name string + input string + expected string + expectedDidChange bool + expectedChanges []string + }{ + { + name: "Empty String", + input: "", + expectedDidChange: false, + expectedChanges: []string{}, + }, + { + name: "No move needed", + input: `foo: + bar: 5 +`, + expectedDidChange: false, + expectedChanges: []string{}, + }, + { + name: "Move worktree keybinding into the universal section", + input: `keybinding: + universal: + quit: q + worktrees: + viewWorktreeOptions: w +`, + expected: `keybinding: + universal: + quit: q + newWorktree: w +`, + expectedDidChange: true, + expectedChanges: []string{"Moved 'keybinding.worktrees.viewWorktreeOptions' to 'keybinding.universal.newWorktree'"}, + }, + { + name: "Create the universal section if it doesn't exist", + input: `keybinding: + worktrees: + viewWorktreeOptions: w +`, + expected: `keybinding: + universal: + newWorktree: w +`, + expectedDidChange: true, + expectedChanges: []string{"Moved 'keybinding.worktrees.viewWorktreeOptions' to 'keybinding.universal.newWorktree'"}, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + changes := NewChangesSet() + actual, didChange, err := computeMigratedConfig("path doesn't matter", []byte(s.input), changes) + assert.NoError(t, err) + assert.Equal(t, s.expectedDidChange, didChange) + if didChange { + assert.Equal(t, s.expected, string(actual)) + } + assert.Equal(t, s.expectedChanges, changes.ToSliceFromOldest()) + }) + } +} + func TestMigrateNullKeybindingsToDisabled(t *testing.T) { scenarios := []struct { name string @@ -361,618 +474,6 @@ func TestCustomCommandsOutputMigration(t *testing.T) { } } -var largeConfiguration = []byte(` -# Config relating to the Lazygit UI -gui: - # The number of lines you scroll by when scrolling the main window - scrollHeight: 2 - - # If true, allow scrolling past the bottom of the content in the main window - scrollPastBottom: true - - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#scroll-off-margin - scrollOffMargin: 2 - - # One of: 'margin' (default) | 'jump' - scrollOffBehavior: margin - - # The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs. - # Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command. - tabWidth: 4 - - # If true, capture mouse events. - # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS. - mouseEvents: true - - # If true, do not show a warning when amending a commit. - skipAmendWarning: false - - # If true, do not show a warning when discarding changes in the staging view. - skipDiscardChangeWarning: false - - # If true, do not show warning when applying/popping the stash - skipStashWarning: false - - # If true, do not show a warning when attempting to commit without any staged files; instead stage all unstaged files. - skipNoStagedFilesWarning: false - - # If true, do not show a warning when rewording a commit via an external editor - skipRewordInEditorWarning: false - - # Fraction of the total screen width to use for the left side section. You may want to pick a small number (e.g. 0.2) if you're using a narrow screen, so that you can see more of the main section. - # Number from 0 to 1.0. - sidePanelWidth: 0.3333 - - # If true, increase the height of the focused side window; creating an accordion effect. - expandFocusedSidePanel: false - - # The weight of the expanded side panel, relative to the other panels. 2 means - # twice as tall as the other panels. Only relevant if expandFocusedSidePanel is true. - expandedSidePanelWeight: 2 - - # Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split. - # Options are: - # - 'horizontal': split the window horizontally - # - 'vertical': split the window vertically - # - 'flexible': (default) split the window horizontally if the window is wide enough, otherwise split vertically - mainPanelSplitMode: flexible - - # How the window is split when in half screen mode (i.e. after hitting '+' once). - # Possible values: - # - 'left': split the window horizontally (side panel on the left, main view on the right) - # - 'top': split the window vertically (side panel on top, main view below) - enlargedSideViewLocation: left - - # If true, wrap lines in the staging view to the width of the view. This - # makes it much easier to work with diffs that have long lines, e.g. - # paragraphs of markdown text. - wrapLinesInStagingView: true - - # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru' - language: auto - - # Format used when displaying time e.g. commit time. - # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format - timeFormat: 02 Jan 06 - - # Format used when displaying time if the time is less than 24 hours ago. - # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format - shortTimeFormat: 3:04PM - - # Config relating to colors and styles. - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes - theme: - # Border color of focused window - activeBorderColor: - - green - - bold - - # Border color of non-focused windows - inactiveBorderColor: - - default - - # Border color of focused window when searching in that window - searchingActiveBorderColor: - - cyan - - bold - - # Color of keybindings help text in the bottom line - optionsTextColor: - - blue - - # Background color of selected line. - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line - selectedLineBgColor: - - blue - - # Background color of selected line when view doesn't have focus. - inactiveViewSelectedLineBgColor: - - bold - - # Foreground color of copied commit - cherryPickedCommitFgColor: - - blue - - # Background color of copied commit - cherryPickedCommitBgColor: - - cyan - - # Foreground color of marked base commit (for rebase) - markedBaseCommitFgColor: - - blue - - # Background color of marked base commit (for rebase) - markedBaseCommitBgColor: - - yellow - - # Color for file with unstaged changes - unstagedChangesColor: - - red - - # Default text color - defaultFgColor: - - default - - # Config relating to the commit length indicator - commitLength: - # If true, show an indicator of commit message length - show: true - - # If true, show the '5 of 20' footer at the bottom of list views - showListFooter: true - - # If true, display the files in the file views as a tree. If false, display the files as a flat list. - # This can be toggled from within Lazygit with the '' key, but that will not change the default. - showFileTree: true - - # If true, show the number of lines changed per file in the Files view - showNumstatInFilesView: false - - # If true, show a random tip in the command log when Lazygit starts - showRandomTip: true - - # If true, show the command log - showCommandLog: true - - # If true, show the bottom line that contains keybinding info and useful buttons. If false, this line will be hidden except to display a loader for an in-progress action. - showBottomLine: true - - # If true, show jump-to-window keybindings in window titles. - showPanelJumps: true - - # Deprecated: use nerdFontsVersion instead - showIcons: false - - # Nerd fonts version to use. - # One of: '2' | '3' | empty string (default) - # If empty, do not show icons. - nerdFontsVersion: "" - - # If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty. - showFileIcons: true - - # Length of author name in (non-expanded) commits view. 2 means show initials only. - commitAuthorShortLength: 2 - - # Length of author name in expanded commits view. 2 means show initials only. - commitAuthorLongLength: 17 - - # Length of commit hash in commits view. 0 shows '*' if NF icons aren't on. - commitHashLength: 8 - - # If true, show commit hashes alongside branch names in the branches view. - showBranchCommitHash: false - - # Whether to show the divergence from the base branch in the branches view. - # One of: 'none' | 'onlyArrow' | 'arrowAndNumber' - showDivergenceFromBaseBranch: none - - # Height of the command log view - commandLogSize: 8 - - # Whether to split the main window when viewing file changes. - # One of: 'auto' | 'always' - # If 'auto', only split the main window when a file has both staged and unstaged changes - splitDiff: auto - - # Default size for focused window. Can be changed from within Lazygit with '+' and '_' (but this won't change the default). - # One of: 'normal' (default) | 'half' | 'full' - screenMode: normal - - # Window border style. - # One of 'rounded' (default) | 'single' | 'double' | 'hidden' | 'bold' - border: rounded - - # If true, show a seriously epic explosion animation when nuking the working tree. - animateExplosion: true - - # Whether to stack UI components on top of each other. - # One of 'auto' (default) | 'always' | 'never' - portraitMode: auto - - # How things are filtered when typing '/'. - # One of 'substring' (default) | 'fuzzy' - filterMode: substring - - # Config relating to the spinner. - spinner: - # The frames of the spinner animation. - frames: - - '|' - - / - - '-' - - \ - - # The "speed" of the spinner in milliseconds. - rate: 50 - - # Status panel view. - # One of 'dashboard' (default) | 'allBranchesLog' - statusPanelView: dashboard - - # If true, jump to the Files panel after popping a stash - switchToFilesAfterStashPop: true - - # If true, jump to the Files panel after applying a stash - switchToFilesAfterStashApply: true - - # If true, when using the panel jump keys (default 1 through 5) and target panel is already active, go to next tab instead - switchTabsWithPanelJumpKeys: false - -# Config relating to git -git: - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md - paging: - # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never' - colorArg: always - - # e.g. - # diff-so-fancy - # delta --dark --paging=never - # ydiff -p cat -s --wrap --width={{columnWidth}} - pager: "" - - useConfig: false - - # e.g. 'difft --color=always' - externalDiffCommand: "" - - # Config relating to committing - commit: - # If true, pass '--signoff' flag when committing - signOff: false - - # Automatic WYSIWYG wrapping of the commit message as you type - autoWrapCommitMessage: true - - # If autoWrapCommitMessage is true, the width to wrap to - autoWrapWidth: 72 - - # Config relating to merging - merging: - # If true, run merges in a subprocess so that if a commit message is required, Lazygit will not hang - # Only applicable to unix users. - manualCommit: false - - # Extra args passed to , e.g. --no-ff - args: "" - - # The commit message to use for a squash merge commit. Can contain "{{selectedRef}}" and "{{currentBranch}}" placeholders. - squashMergeMessage: Squash merge {{selectedRef}} into {{currentBranch}} - - # list of branches that are considered 'main' branches, used when displaying commits - mainBranches: - - master - - main - - # Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP' - skipHookPrefix: WIP - - # If true, periodically fetch from remote - autoFetch: true - - # If true, periodically refresh files and submodules - autoRefresh: true - - # If true, pass the --all arg to git fetch - fetchAll: true - - # If true, lazygit will automatically stage files that used to have merge - # conflicts but no longer do; and it will also ask you if you want to - # continue a merge or rebase if you've resolved all conflicts. If false, it - # won't do either of these things. - autoStageResolvedConflicts: true - - # Command used when displaying the current branch git log in the main window - branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} -- - - # Command used to display git log of all branches in the main window. - # Deprecated: Use allBranchesLogCmds instead. - allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium - - # If true, do not spawn a separate process when using GPG - overrideGpg: false - - # If true, do not allow force pushes - disableForcePushing: false - - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-branch-name-prefix - branchPrefix: "" - - # If true, parse emoji strings in commit messages e.g. render :rocket: as 🚀 - # (This should really be under 'gui', not 'git') - parseEmoji: false - - # Config for showing the log in the commits view - log: - # One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default' - # 'topo-order' makes it easier to read the git log graph, but commits may not - # appear chronologically. See https://git-scm.com/docs/ - # - # Deprecated: Configure this with Log menu -> Commit sort order ( in the commits window by default). - order: topo-order - - # This determines whether the git graph is rendered in the commits panel - # One of 'always' | 'never' | 'when-maximised' - # - # Deprecated: Configure this with Log menu -> Show git graph ( in the commits window by default). - showGraph: always - - # displays the whole git graph by default in the commits view (equivalent to passing the --all argument to git log) - showWholeGraph: false - - # When copying commit hashes to the clipboard, truncate them to this - # length. Set to 40 to disable truncation. - truncateCopiedCommitHashesTo: 12 - -# Periodic update checks -update: - # One of: 'prompt' (default) | 'background' | 'never' - method: prompt - - # Period in days between update checks - days: 14 - -# Background refreshes -refresher: - # File/submodule refresh interval in seconds. - # Auto-refresh can be disabled via option 'git.autoRefresh'. - refreshInterval: 10 - - # Re-fetch interval in seconds. - # Auto-fetch can be disabled via option 'git.autoFetch'. - fetchInterval: 60 - -# If true, show a confirmation popup before quitting Lazygit -confirmOnQuit: false - -# If true, exit Lazygit when the user presses escape in a context where there is nothing to cancel/close -quitOnTopLevelReturn: false - -# Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc -os: - # Command for editing a file. Should contain "{{filename}}". - edit: "" - - # Command for editing a file at a given line number. Should contain - # "{{filename}}", and may optionally contain "{{line}}". - editAtLine: "" - - # Same as EditAtLine, except that the command needs to wait until the - # window is closed. - editAtLineAndWait: "" - - # Whether lazygit suspends until an edit process returns - editInTerminal: false - - # For opening a directory in an editor - openDirInEditor: "" - - # A built-in preset that sets all of the above settings. Supported presets - # are defined in the getPreset function in editor_presets.go. - editPreset: "" - - # Command for opening a file, as if the file is double-clicked. Should - # contain "{{filename}}", but doesn't support "{{line}}". - open: "" - - # Command for opening a link. Should contain "{{link}}". - openLink: "" - - # EditCommand is the command for editing a file. - # Deprecated: use Edit instead. Note that semantics are different: - # EditCommand is just the command itself, whereas Edit contains a - # "{{filename}}" variable. - editCommand: "" - - # EditCommandTemplate is the command template for editing a file - # Deprecated: use EditAtLine instead. - editCommandTemplate: "" - - # OpenCommand is the command for opening a file - # Deprecated: use Open instead. - openCommand: "" - - # OpenLinkCommand is the command for opening a link - # Deprecated: use OpenLink instead. - openLinkCommand: "" - - # CopyToClipboardCmd is the command for copying to clipboard. - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard - copyToClipboardCmd: "" - - # ReadFromClipboardCmd is the command for reading the clipboard. - # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard - readFromClipboardCmd: "" - -# If true, don't display introductory popups upon opening Lazygit. -disableStartupPopups: false - -# What to do when opening Lazygit outside of a git repo. -# - 'prompt': (default) ask whether to initialize a new repo or open in the most recent repo -# - 'create': initialize a new repo -# - 'skip': open most recent repo -# - 'quit': exit Lazygit -notARepository: prompt - -# If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit. -promptToReturnFromSubprocess: true - -# Keybindings -keybinding: - universal: - quit: q - quit-alt1: - return: - quitWithoutChangingDirectory: Q - togglePanel: - prevItem: - nextItem: - prevItem-alt: k - nextItem-alt: j - prevPage: ',' - nextPage: . - scrollLeft: H - scrollRight: L - gotoTop: < - gotoBottom: '>' - toggleRangeSelect: v - rangeSelectDown: - rangeSelectUp: - prevBlock: - nextBlock: - prevBlock-alt: h - nextBlock-alt: l - nextBlock-alt2: - prevBlock-alt2: - jumpToBlock: - - "1" - - "2" - - "3" - - "4" - - "5" - nextMatch: "n" - prevMatch: "N" - startSearch: / - optionMenu: - optionMenu-alt1: '?' - select: - goInto: - confirm: - confirmInEditor: - remove: d - new: "n" - edit: e - openFile: o - scrollUpMain: - scrollDownMain: - scrollUpMain-alt1: K - scrollDownMain-alt1: J - scrollUpMain-alt2: - scrollDownMain-alt2: - executeShellCommand: ':' - createRebaseOptionsMenu: m - - # 'Files' appended for legacy reasons - pushFiles: P - - # 'Files' appended for legacy reasons - pullFiles: p - refresh: R - createPatchOptionsMenu: - nextTab: ']' - prevTab: '[' - nextScreenMode: + - prevScreenMode: _ - undo: z - redo: Z - filteringMenu: - diffingMenu: W - diffingMenu-alt: - copyToClipboard: - openRecentRepos: - submitEditorText: - extrasMenu: '@' - toggleWhitespaceInDiffView: - increaseContextInDiffView: '}' - decreaseContextInDiffView: '{' - increaseRenameSimilarityThreshold: ) - decreaseRenameSimilarityThreshold: ( - openDiffTool: - status: - checkForUpdate: u - recentRepos: - allBranchesLogGraph: a - files: - commitChanges: c - commitChangesWithoutHook: w - amendLastCommit: A - commitChangesWithEditor: C - findBaseCommitForFixup: - confirmDiscard: x - ignoreFile: i - refreshFiles: r - stashAllChanges: s - viewStashOptions: S - toggleStagedAll: a - viewResetOptions: D - fetch: f - openMergeOptions: M - openStatusFilter: - copyFileInfoToClipboard: "y" - collapseAll: '-' - expandAll: = - branches: - createPullRequest: o - viewPullRequestOptions: O - copyPullRequestURL: - checkoutBranchByName: c - forceCheckoutBranch: F - rebaseBranch: r - renameBranch: R - mergeIntoCurrentBranch: M - viewGitFlowOptions: i - fastForward: f - createTag: T - pushTag: P - setUpstream: u - fetchRemote: f - sortOrder: s - worktrees: - viewWorktreeOptions: w - commits: - squashDown: s - renameCommit: r - renameCommitWithEditor: R - viewResetOptions: g - markCommitAsFixup: f - createFixupCommit: F - squashAboveCommits: S - moveDownCommit: - moveUpCommit: - amendToCommit: A - resetCommitAuthor: a - pickCommit: p - revertCommit: t - cherryPickCopy: C - pasteCommits: V - markCommitAsBaseForRebase: B - tagCommit: T - checkoutCommit: - resetCherryPick: - copyCommitAttributeToClipboard: "y" - openLogMenu: - openInBrowser: o - viewBisectOptions: b - startInteractiveRebase: i - amendAttribute: - resetAuthor: a - setAuthor: A - addCoAuthor: c - stash: - popStash: g - renameStash: r - commitFiles: - checkoutCommitFile: c - main: - toggleSelectHunk: a - pickBothHunks: b - editSelectHunk: E - submodules: - init: i - update: u - bulkMenu: b - commitMessage: - commitMenu: -`) - -func BenchmarkMigrationOnLargeConfiguration(b *testing.B) { - for b.Loop() { - changes := NewChangesSet() - _, _, _ = computeMigratedConfig("path doesn't matter", largeConfiguration, changes) - } -} - func TestAllBranchesLogCmdMigrations(t *testing.T) { scenarios := []struct { name string @@ -1098,6 +599,7 @@ func TestPagerMigration(t *testing.T) { expectedDidChange bool expectedChanges []string }{ + // Migrate 'paging' to 'pagers' array { name: "Incomplete Configuration Passes uneventfully", input: "git:", @@ -1106,68 +608,203 @@ func TestPagerMigration(t *testing.T) { }, { name: "No paging section", - input: `git: - autoFetch: true -`, - expected: `git: - autoFetch: true -`, - expectedDidChange: false, - expectedChanges: []string{}, - }, - { - name: "Both paging and pagers exist", - input: `git: - paging: - pager: delta --dark --paging=never - pagers: - - diff: diff-so-fancy -`, - expected: `git: - paging: - pager: delta --dark --paging=never - pagers: - - diff: diff-so-fancy -`, + input: "git:\n" + + " autoFetch: true\n", + expected: "git:\n" + + " autoFetch: true\n", expectedDidChange: false, expectedChanges: []string{}, }, { name: "paging is not an object", - input: `git: - paging: 5 -`, - expected: `git: - paging: 5 -`, + input: "git:\n" + + " paging: 5\n", + expected: "git:\n" + + " paging: 5\n", expectedDidChange: false, expectedChanges: []string{}, }, { - name: "paging is moved to pagers array (keeping the order)", - input: `git: - paging: - pager: delta --dark --paging=never - autoFetch: true -`, - expected: `git: - pagers: - - pager: delta --dark --paging=never - autoFetch: true -`, - expectedDidChange: true, - expectedChanges: []string{"Moved git.paging object to git.pagers array"}, + name: "pagers is not an array", + input: "git:\n" + + " pagers: 5\n", + expected: "git:\n" + + " pagers: 5\n", + expectedDidChange: false, + expectedChanges: []string{}, }, { - name: "paging is moved to pagers array even if empty", - input: `git: - paging: {} -`, - expected: `git: - pagers: [{}] -`, + name: "paging and pagers coexist", + input: "git:\n" + + " paging:\n" + + " pager: delta --dark --paging=never\n" + + " pagers:\n" + + " - pager: diff-so-fancy\n", + expected: "git:\n" + + " paging:\n" + + " pager: delta --dark --paging=never\n" + + " diffRenderers:\n" + + " - command: diff-so-fancy\n", expectedDidChange: true, - expectedChanges: []string{"Moved git.paging object to git.pagers array"}, + expectedChanges: []string{ + "Renamed git.pagers to git.diffRenderers", + "Renamed 'pager' to 'command' in git pager", + }, + }, + { + name: "paging and diffRenderers coexist", + input: "git:\n" + + " paging:\n" + + " pager: delta --dark --paging=never\n" + + " diffRenderers:\n" + + " - command: diff-so-fancy\n", + expected: "git:\n" + + " paging:\n" + + " pager: delta --dark --paging=never\n" + + " diffRenderers:\n" + + " - command: diff-so-fancy\n", + expectedDidChange: false, + expectedChanges: []string{}, + }, + { + name: "pagers and diffRenderers coexist", + input: "git:\n" + + " pagers:\n" + + " - pager: delta --dark --paging=never\n" + + " diffRenderers:\n" + + " - command: diff-so-fancy\n", + expected: "git:\n" + + " pagers:\n" + + " - pager: delta --dark --paging=never\n" + + " diffRenderers:\n" + + " - command: diff-so-fancy\n", + expectedDidChange: false, + expectedChanges: []string{}, + }, + { + name: "paging is moved to diffRenderers array preserving fields and order", + input: "git:\n" + + " paging:\n" + + " name: delta\n" + + " colorArg: never\n" + + " pager: delta --dark --paging=never\n" + + " autoFetch: true\n", + expected: "git:\n" + + " diffRenderers:\n" + + " - name: delta\n" + + " colorArg: never\n" + + " command: delta --dark --paging=never\n" + + " autoFetch: true\n", + expectedDidChange: true, + expectedChanges: []string{ + "Moved git.paging object to git.pagers array", + "Renamed git.pagers to git.diffRenderers", + "Renamed 'pager' to 'command' in git pager", + }, + }, + { + name: "paging is moved to diffRenderers array even if empty", + input: "git:\n" + + " paging: {}\n", + expected: "git:\n" + + " diffRenderers:\n" + + " - type: rawGit\n", + expectedDidChange: true, + expectedChanges: []string{ + "Moved git.paging object to git.pagers array", + "Renamed git.pagers to git.diffRenderers", + "Changed git pager without a command to 'type: rawGit'", + }, + }, + + // Migrate 'pagers' array to 'diffRenderers' array + { + name: "empty pagers array is renamed", + input: "git:\n" + + " pagers: []\n", + expected: "git:\n" + + " diffRenderers: []\n", + expectedDidChange: true, + expectedChanges: []string{"Renamed git.pagers to git.diffRenderers"}, + }, + { + name: "pagers array entries are adapted", + input: "git:\n" + + " pagers:\n" + + " - name: delta\n" + + " colorArg: never\n" + + " pager: delta --dark --paging=never\n" + + " - name: difft\n" + + " colorArg: never\n" + + " externalDiffCommand: difft --color=always\n" + + " - name: git-config\n" + + " colorArg: never\n" + + " useExternalDiffGitConfig: TRUE\n" + + " - name: git\n" + + " colorArg: never\n" + + " autoFetch: true\n", + expected: "git:\n" + + " diffRenderers:\n" + + " - name: delta\n" + + " colorArg: never\n" + + " command: delta --dark --paging=never\n" + + " - name: difft\n" + + " colorArg: never\n" + + " command: difft --color=always\n" + + " type: extDiff\n" + + " - name: git-config\n" + + " colorArg: never\n" + + " type: extDiff\n" + + " - name: git\n" + + " colorArg: never\n" + + " type: rawGit\n" + + " autoFetch: true\n", + expectedDidChange: true, + expectedChanges: []string{ + "Renamed git.pagers to git.diffRenderers", + "Renamed 'pager' to 'command' in git pager", + "Changed 'externalDiffCommand' to 'command' with 'type: extDiff' in git pager", + "Changed 'useExternalDiffGitConfig: true' to 'type: extDiff' in git pager", + "Changed git pager without a command to 'type: rawGit'", + }, + }, + { + name: "zero-valued mechanism fields do not take precedence and are removed", + input: "git:\n" + + " pagers:\n" + + " - pager: delta --dark --paging=never\n" + + " externalDiffCommand: null\n" + + " useExternalDiffGitConfig: false\n" + + " - pager: \"\"\n" + + " externalDiffCommand: difft --color=always\n" + + " useExternalDiffGitConfig: false\n" + + " - pager: null\n" + + " externalDiffCommand: \"\"\n" + + " useExternalDiffGitConfig: YES\n" + + " - pager: \"\"\n" + + " externalDiffCommand:\n" + + " useExternalDiffGitConfig: false\n" + + " - useExternalDiffGitConfig: null\n", + expected: "git:\n" + + " diffRenderers:\n" + + " - command: delta --dark --paging=never\n" + + " - command: difft --color=always\n" + + " type: extDiff\n" + + " - type: extDiff\n" + + " - type: rawGit\n" + + " - type: rawGit\n", + expectedDidChange: true, + expectedChanges: []string{ + "Renamed git.pagers to git.diffRenderers", + "Renamed 'pager' to 'command' in git pager", + "Removed empty 'externalDiffCommand' from git pager", + "Removed 'useExternalDiffGitConfig: false' from git pager", + "Changed 'externalDiffCommand' to 'command' with 'type: extDiff' in git pager", + "Removed empty 'pager' from git pager", + "Changed 'useExternalDiffGitConfig: true' to 'type: extDiff' in git pager", + "Changed git pager without a command to 'type: rawGit'", + "Removed empty 'useExternalDiffGitConfig' from git pager", + }, }, } diff --git a/pkg/config/diff_renderer_config_manager.go b/pkg/config/diff_renderer_config_manager.go new file mode 100644 index 000000000..b23933962 --- /dev/null +++ b/pkg/config/diff_renderer_config_manager.go @@ -0,0 +1,159 @@ +package config + +import ( + "strconv" + "strings" + + "github.com/jesseduffield/lazygit/pkg/i18n" + "github.com/jesseduffield/lazygit/pkg/utils" +) + +type DiffRendererConfigManager struct { + getUserConfig func() *UserConfig + diffRendererIndex int +} + +type DiffRendererType int + +const ( + DiffRendererType_StdinFilter DiffRendererType = iota + DiffRendererType_ExtDiff + DiffRendererType_RawGit +) + +func NewDiffRendererConfigManager(getUserConfig func() *UserConfig) *DiffRendererConfigManager { + return &DiffRendererConfigManager{getUserConfig: getUserConfig} +} + +func (self *DiffRendererConfigManager) currentDiffRendererConfig() *DiffRendererConfig { + diffRenderers := self.getUserConfig().Git.DiffRenderers + if len(diffRenderers) == 0 { + return nil + } + + // Guard against the diff renderer index being out of range, which can happen if the user + // has removed diff renderers from their config file while lazygit is running. + if self.diffRendererIndex >= len(diffRenderers) { + self.diffRendererIndex = 0 + } + + return &diffRenderers[self.diffRendererIndex] +} + +func (self *DiffRendererConfig) getType() DiffRendererType { + switch self.Type { + case "stdinFilter", "": + return DiffRendererType_StdinFilter + case "extDiff": + return DiffRendererType_ExtDiff + case "rawGit": + return DiffRendererType_RawGit + } + panic("invalid diff renderer type: " + self.Type) +} + +func (self *DiffRendererConfigManager) GetDiffRendererType() DiffRendererType { + currentDiffRendererConfig := self.currentDiffRendererConfig() + if currentDiffRendererConfig == nil { + return DiffRendererType_RawGit + } + return currentDiffRendererConfig.getType() +} + +func (self *DiffRendererConfigManager) GetStdinFilterCommand(width int) string { + currentDiffRendererConfig := self.currentDiffRendererConfig() + if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_StdinFilter { + return "" + } + + templateValues := map[string]string{ + "columnWidth": strconv.Itoa(width/2 - 6), + } + + commandTemplate := string(currentDiffRendererConfig.Command) + return utils.ResolvePlaceholderString(commandTemplate, templateValues) +} + +func (self *DiffRendererConfigManager) GetColorArg() string { + currentDiffRendererConfig := self.currentDiffRendererConfig() + if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_StdinFilter { + return "always" + } + + colorArg := currentDiffRendererConfig.ColorArg + if colorArg == "" { + return "always" + } + return colorArg +} + +func (self *DiffRendererConfigManager) GetExternalDiffCommand(diffContext uint64) string { + currentDiffRendererConfig := self.currentDiffRendererConfig() + if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_ExtDiff { + return "" + } + + templateValues := map[string]string{ + "diffContext": strconv.Itoa(int(diffContext)), + } + + return utils.ResolvePlaceholderString(string(currentDiffRendererConfig.Command), templateValues) +} + +func (self *DiffRendererConfigManager) GetRawGitArgs() []string { + currentDiffRendererConfig := self.currentDiffRendererConfig() + if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_RawGit { + return nil + } + return currentDiffRendererConfig.Args +} + +func (self *DiffRendererConfigManager) CycleDiffRenderers() { + self.diffRendererIndex = (self.diffRendererIndex + 1) % len(self.getUserConfig().Git.DiffRenderers) +} + +func (self *DiffRendererConfigManager) CycleDiffRenderersBackward() { + n := len(self.getUserConfig().Git.DiffRenderers) + self.diffRendererIndex = (self.diffRendererIndex - 1 + n) % n +} + +func (self *DiffRendererConfigManager) CurrentDiffRendererIndex() (int, int) { + return self.diffRendererIndex, len(self.getUserConfig().Git.DiffRenderers) +} + +// CurrentDiffRendererName returns a name for the current diff renderer, suitable for showing +// to the user. +func (self *DiffRendererConfigManager) CurrentDiffRendererName(tr *i18n.TranslationSet) string { + currentDiffRendererConfig := self.currentDiffRendererConfig() + if currentDiffRendererConfig == nil { + return tr.DefaultDiffRendererName + } + + if name := currentDiffRendererConfig.displayName(); name != "" { + return name + } + + if currentDiffRendererConfig.getType() == DiffRendererType_ExtDiff && currentDiffRendererConfig.Command == "" { + return tr.ExternalDiffDiffRendererName + } + + return tr.DefaultDiffRendererName +} + +func (self *DiffRendererConfig) displayName() string { + if self.Name != "" { + return self.Name + } + if self.getType() == DiffRendererType_RawGit && len(self.Args) > 0 { + return self.Args[0] + } + return firstWord(string(self.Command)) +} + +func firstWord(command string) string { + fields := strings.Fields(command) + if len(fields) == 0 { + return "" + } + return fields[0] +} diff --git a/pkg/config/diff_renderer_config_manager_test.go b/pkg/config/diff_renderer_config_manager_test.go new file mode 100644 index 000000000..98fd8f304 --- /dev/null +++ b/pkg/config/diff_renderer_config_manager_test.go @@ -0,0 +1,96 @@ +package config + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/i18n" + "github.com/stretchr/testify/assert" +) + +func TestCurrentDiffRendererName(t *testing.T) { + tr := i18n.EnglishTranslationSet() + + scenarios := []struct { + name string + diffRendererConfig DiffRendererConfig + expected string + }{ + { + name: "explicit name takes precedence over the command", + diffRendererConfig: DiffRendererConfig{Name: "delta side-by-side", Command: "delta --side-by-side"}, + expected: "delta side-by-side", + }, + { + name: "derived from the first word of the stdinFilter command", + diffRendererConfig: DiffRendererConfig{Command: "delta --side-by-side"}, + expected: "delta", + }, + { + name: "surrounding whitespace in the command is ignored", + diffRendererConfig: DiffRendererConfig{Command: " diff-so-fancy "}, + expected: "diff-so-fancy", + }, + { + name: "derived from the first word of the extDiff command", + diffRendererConfig: DiffRendererConfig{Type: "extDiff", Command: "difft --color=always"}, + expected: "difft", + }, + { + name: "no name can be derived for external diff", + diffRendererConfig: DiffRendererConfig{Type: "extDiff"}, + expected: tr.ExternalDiffDiffRendererName, + }, + { + name: "derived from first argument of rawGit args", + diffRendererConfig: DiffRendererConfig{Type: "rawGit", Args: []string{"--color-words"}}, + expected: "--color-words", + }, + { + name: "no name can be derived for raw diff", + diffRendererConfig: DiffRendererConfig{Type: "rawGit"}, + expected: tr.DefaultDiffRendererName, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + userConfig := &UserConfig{} + userConfig.Git.DiffRenderers = []DiffRendererConfig{s.diffRendererConfig} + config := NewDiffRendererConfigManager(func() *UserConfig { return userConfig }) + + assert.Equal(t, s.expected, config.CurrentDiffRendererName(tr)) + }) + } +} + +func TestCurrentDiffRendererNameWithoutDiffRenderers(t *testing.T) { + config := NewDiffRendererConfigManager(func() *UserConfig { return &UserConfig{} }) + + tr := i18n.EnglishTranslationSet() + assert.Equal(t, tr.DefaultDiffRendererName, config.CurrentDiffRendererName(tr)) +} + +func TestCycleDiffRenderers(t *testing.T) { + userConfig := &UserConfig{} + userConfig.Git.DiffRenderers = []DiffRendererConfig{{Name: "a"}, {Name: "b"}, {Name: "c"}} + config := NewDiffRendererConfigManager(func() *UserConfig { return userConfig }) + + currentIndex := func() int { + index, _ := config.CurrentDiffRendererIndex() + return index + } + + assert.Equal(t, 0, currentIndex()) + + config.CycleDiffRenderers() + assert.Equal(t, 1, currentIndex()) + config.CycleDiffRenderers() + assert.Equal(t, 2, currentIndex()) + config.CycleDiffRenderers() + assert.Equal(t, 0, currentIndex(), "cycling forward past the last diff renderer wraps to the first") + + config.CycleDiffRenderersBackward() + assert.Equal(t, 2, currentIndex(), "cycling backward past the first diff renderer wraps to the last") + config.CycleDiffRenderersBackward() + assert.Equal(t, 1, currentIndex()) +} diff --git a/pkg/config/dummies.go b/pkg/config/dummies.go index 06c8755a6..b872fac29 100644 --- a/pkg/config/dummies.go +++ b/pkg/config/dummies.go @@ -6,12 +6,15 @@ import ( // NewDummyAppConfig creates a new dummy AppConfig for testing func NewDummyAppConfig() *AppConfig { + userConfig := GetDefaultConfig() + userConfig.Keybinding.MergeLegacyAltKeybindings() appConfig := &AppConfig{ - name: "lazygit", - version: "unversioned", - debug: false, - userConfig: GetDefaultConfig(), - appState: &AppState{}, + name: "lazygit", + version: "unversioned", + debug: false, + userConfig: userConfig, + appState: &AppState{}, + githubPullRequestCache: newGithubPullRequestCache(""), } _ = yaml.Unmarshal([]byte{}, appConfig.appState) return appConfig diff --git a/pkg/config/editor_presets.go b/pkg/config/editor_presets.go index 5fcde97c5..c101236ee 100644 --- a/pkg/config/editor_presets.go +++ b/pkg/config/editor_presets.go @@ -50,13 +50,13 @@ type editPreset struct { suspend func() bool } -func returnBool(a bool) func() bool { return (func() bool { return a }) } +func returnBool(a bool) func() bool { return func() bool { return a } } // IF YOU ADD A PRESET TO THIS FUNCTION YOU MUST UPDATE THE `Supported presets` SECTION OF docs/Config.md func getPreset(shell string, osConfig *OSConfig, guessDefaultEditor func() string) *editPreset { var nvimRemoteEditTemplate, nvimRemoteEditAtLineTemplate, nvimRemoteOpenDirInEditorTemplate string // By default fish doesn't have SHELL variable set, but it does have FISH_VERSION since Nov 2012. - if (strings.HasSuffix(shell, "fish")) || (os.Getenv("FISH_VERSION") != "") { + if strings.HasSuffix(shell, "fish") || (os.Getenv("FISH_VERSION") != "") { nvimRemoteEditTemplate = `begin; if test -z "$NVIM"; nvim -- {{filename}}; else; nvim --server "$NVIM" --remote-send "q"; nvim --server "$NVIM" --remote-tab {{filename}}; end; end` nvimRemoteEditAtLineTemplate = `begin; if test -z "$NVIM"; nvim +{{line}} -- {{filename}}; else; nvim --server "$NVIM" --remote-send "q"; nvim --server "$NVIM" --remote-tab {{filename}}; nvim --server "$NVIM" --remote-send ":{{line}}"; end; end` nvimRemoteOpenDirInEditorTemplate = `begin; if test -z "$NVIM"; nvim -- {{dir}}; else; nvim --server "$NVIM" --remote-send "q"; nvim --server "$NVIM" --remote-tab {{dir}}; end; end` diff --git a/pkg/config/github_pull_request_cache.go b/pkg/config/github_pull_request_cache.go new file mode 100644 index 000000000..3ea8d0841 --- /dev/null +++ b/pkg/config/github_pull_request_cache.go @@ -0,0 +1,124 @@ +package config + +import ( + "encoding/json" + "fmt" + "os" + "path/filepath" + "sync" +) + +const githubPullRequestsCacheFileName = "github_pull_requests.json" + +// CachedPullRequest stores the essential fields of a GitHub pull request. +type CachedPullRequest struct { + HeadRefName string `json:"headRefName"` + Number int `json:"number"` + Title string `json:"title"` + State string `json:"state"` + ChecksState string `json:"checksState,omitempty"` + Url string `json:"url"` + HeadRepositoryOwner string `json:"headRepositoryOwner"` +} + +type githubPullRequestCache struct { + mutex sync.Mutex + path string + pullRequestsByRepoPath map[string][]CachedPullRequest + loadErr error +} + +func loadGithubPullRequestCache() *githubPullRequestCache { + path, err := githubPullRequestCachePath() + if err != nil { + cache := newGithubPullRequestCache("") + cache.loadErr = err + return cache + } + + cache := newGithubPullRequestCache(path) + cache.load() + return cache +} + +func githubPullRequestCachePath() (string, error) { + path, err := stateFilePath(stateFileName) + if err != nil { + return "", err + } + + return filepath.Join(filepath.Dir(path), githubPullRequestsCacheFileName), nil +} + +func newGithubPullRequestCache(path string) *githubPullRequestCache { + return &githubPullRequestCache{ + path: path, + pullRequestsByRepoPath: make(map[string][]CachedPullRequest), + } +} + +func (c *githubPullRequestCache) load() { + if c.path == "" { + return + } + + content, err := os.ReadFile(c.path) + if err != nil { + if !os.IsNotExist(err) { + c.loadErr = fmt.Errorf("reading GitHub pull request cache: %w", err) + } + return + } + if len(content) == 0 { + return + } + + if err := json.Unmarshal(content, &c.pullRequestsByRepoPath); err != nil { + c.pullRequestsByRepoPath = make(map[string][]CachedPullRequest) + c.loadErr = fmt.Errorf("parsing GitHub pull request cache: %w", err) + } else if c.pullRequestsByRepoPath == nil { + c.pullRequestsByRepoPath = make(map[string][]CachedPullRequest) + } +} + +func (c *githubPullRequestCache) get(repoPath string) []CachedPullRequest { + c.mutex.Lock() + defer c.mutex.Unlock() + + return append([]CachedPullRequest(nil), c.pullRequestsByRepoPath[repoPath]...) +} + +// takeLoadError returns the error, if any, that occurred while loading the +// cache from disk, clearing it so that it is reported only once. +func (c *githubPullRequestCache) takeLoadError() error { + c.mutex.Lock() + defer c.mutex.Unlock() + + loadErr := c.loadErr + c.loadErr = nil + return loadErr +} + +func (c *githubPullRequestCache) save(repoPath string, pullRequests []CachedPullRequest) error { + c.mutex.Lock() + defer c.mutex.Unlock() + + c.pullRequestsByRepoPath[repoPath] = append([]CachedPullRequest(nil), pullRequests...) + if c.path == "" { + return nil + } + + content, err := json.MarshalIndent(c.pullRequestsByRepoPath, "", " ") + if err != nil { + return err + } + content = append(content, '\n') + + // Apparently when people have read-only permissions they prefer us to fail + // silently, so don't propagate permission errors. + if err := os.WriteFile(c.path, content, 0o644); err != nil && !os.IsPermission(err) { + return err + } + + return nil +} diff --git a/pkg/config/github_pull_request_cache_test.go b/pkg/config/github_pull_request_cache_test.go new file mode 100644 index 000000000..aa10d1acb --- /dev/null +++ b/pkg/config/github_pull_request_cache_test.go @@ -0,0 +1,141 @@ +package config + +import ( + "fmt" + "os" + "path/filepath" + "sync" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestGithubPullRequestCachePath(t *testing.T) { + stateDir := t.TempDir() + t.Setenv("CONFIG_DIR", stateDir) + + path, err := githubPullRequestCachePath() + + assert.NoError(t, err) + assert.Equal(t, filepath.Join(stateDir, githubPullRequestsCacheFileName), path) +} + +func TestGithubPullRequestCache(t *testing.T) { + path := filepath.Join(t.TempDir(), githubPullRequestsCacheFileName) + cache := newGithubPullRequestCache(path) + repoOnePullRequests := []CachedPullRequest{{ + HeadRefName: "first-branch", + Number: 1, + Title: "First pull request", + State: "OPEN", + Url: "https://github.com/owner/repo/pull/1", + HeadRepositoryOwner: "owner", + }} + repoTwoPullRequests := []CachedPullRequest{{ + HeadRefName: "second-branch", + Number: 2, + Title: "Second pull request", + State: "MERGED", + Url: "https://github.com/other/repo/pull/2", + HeadRepositoryOwner: "other", + }} + + assert.NoError(t, cache.save("/repo/one", repoOnePullRequests)) + assert.NoError(t, cache.save("/repo/two", repoTwoPullRequests)) + + content, err := os.ReadFile(path) + assert.NoError(t, err) + assert.Equal(t, `{ + "/repo/one": [ + { + "headRefName": "first-branch", + "number": 1, + "title": "First pull request", + "state": "OPEN", + "url": "https://github.com/owner/repo/pull/1", + "headRepositoryOwner": "owner" + } + ], + "/repo/two": [ + { + "headRefName": "second-branch", + "number": 2, + "title": "Second pull request", + "state": "MERGED", + "url": "https://github.com/other/repo/pull/2", + "headRepositoryOwner": "other" + } + ] +} +`, string(content)) + + reloadedCache := newGithubPullRequestCache(path) + reloadedCache.load() + assert.Equal(t, repoOnePullRequests, reloadedCache.get("/repo/one")) + assert.Equal(t, repoTwoPullRequests, reloadedCache.get("/repo/two")) + assert.NoError(t, reloadedCache.takeLoadError()) +} + +func TestGithubPullRequestCacheIgnoresMalformedContent(t *testing.T) { + path := filepath.Join(t.TempDir(), githubPullRequestsCacheFileName) + assert.NoError(t, os.WriteFile(path, []byte("{"), 0o644)) + + cache := newGithubPullRequestCache(path) + cache.load() + + assert.ErrorContains(t, cache.takeLoadError(), "parsing GitHub pull request cache") + assert.Empty(t, cache.get("/repo")) + assert.NoError(t, cache.save("/repo", []CachedPullRequest{{Number: 1}})) + + reloadedCache := newGithubPullRequestCache(path) + reloadedCache.load() + assert.Equal(t, []CachedPullRequest{{Number: 1}}, reloadedCache.get("/repo")) + assert.NoError(t, reloadedCache.takeLoadError()) +} + +func TestGithubPullRequestCacheDoesNotModifyAppState(t *testing.T) { + stateDir := t.TempDir() + t.Setenv("CONFIG_DIR", stateDir) + statePath := filepath.Join(stateDir, stateFileName) + stateContent := []byte("recentrepos:\n - /repo\n") + assert.NoError(t, os.WriteFile(statePath, stateContent, 0o644)) + + cache := loadGithubPullRequestCache() + assert.NoError(t, cache.save("/repo", []CachedPullRequest{{Number: 1}})) + + actualStateContent, err := os.ReadFile(statePath) + assert.NoError(t, err) + assert.Equal(t, stateContent, actualStateContent) + _, err = os.Stat(filepath.Join(stateDir, githubPullRequestsCacheFileName)) + assert.NoError(t, err) +} + +func TestGithubPullRequestCacheSerializesConcurrentSaves(t *testing.T) { + path := filepath.Join(t.TempDir(), githubPullRequestsCacheFileName) + cache := newGithubPullRequestCache(path) + const repoCount = 20 + var waitGroup sync.WaitGroup + errs := make(chan error, repoCount) + + for index := range repoCount { + waitGroup.Add(1) + go func() { + defer waitGroup.Done() + repoPath := fmt.Sprintf("/repo/%d", index) + errs <- cache.save(repoPath, []CachedPullRequest{{Number: index}}) + }() + } + waitGroup.Wait() + close(errs) + for err := range errs { + assert.NoError(t, err) + } + + reloadedCache := newGithubPullRequestCache(path) + reloadedCache.load() + for index := range repoCount { + repoPath := fmt.Sprintf("/repo/%d", index) + assert.Equal(t, []CachedPullRequest{{Number: index}}, reloadedCache.get(repoPath)) + } + assert.NoError(t, reloadedCache.takeLoadError()) +} diff --git a/pkg/config/keybinding.go b/pkg/config/keybinding.go new file mode 100644 index 000000000..905bc2bd7 --- /dev/null +++ b/pkg/config/keybinding.go @@ -0,0 +1,92 @@ +package config + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/karimkhaleel/jsonschema" + "github.com/samber/lo" + "gopkg.in/yaml.v3" +) + +// Keybinding represents the value of a single keybinding entry in the user's +// config. It's a slice of key strings to allow alternates, but for backward +// compatibility (and because most bindings only have one key) it can be +// written in YAML/JSON as either a single scalar string or as a sequence of +// strings. +type Keybinding []string + +func (k *Keybinding) UnmarshalYAML(node *yaml.Node) error { + var ss []string + switch node.Kind { + case yaml.ScalarNode: + var s string + if err := node.Decode(&s); err != nil { + return err + } + ss = []string{s} + case yaml.SequenceNode: + if err := node.Decode(&ss); err != nil { + return err + } + default: + return fmt.Errorf("expected a string or a sequence of strings for keybinding, got %v", node.Tag) + } + // Drop empty and entries so clients never have to special-case + // them: an empty Keybinding means "no key bound", a non-empty one is + // guaranteed to contain only real keys. + *k = lo.Filter(ss, func(s string, _ int) bool { + return s != "" && s != "" + }) + return nil +} + +func (k Keybinding) MarshalYAML() (any, error) { + if len(k) == 1 { + return k[0], nil + } + // Render multi-key bindings in flow style (`[a, b]`) rather than the default + // block style, which is more compact and reads better in the generated docs. + node := &yaml.Node{ + Kind: yaml.SequenceNode, + Style: yaml.FlowStyle, + } + for _, s := range k { + node.Content = append(node.Content, &yaml.Node{ + Kind: yaml.ScalarNode, + Value: s, + }) + } + return node, nil +} + +func (k Keybinding) MarshalJSON() ([]byte, error) { + if len(k) == 1 { + return json.Marshal(k[0]) + } + return json.Marshal([]string(k)) +} + +// String renders the keybinding as a human-readable label, joining +// alternates with " or " for use in help text. +func (k Keybinding) String() string { + return strings.Join(k, " or ") +} + +// JSONSchema lets the schema generator describe this type as a union of a +// string and an array of strings instead of just an array. +func (Keybinding) JSONSchema() *jsonschema.Schema { + return &jsonschema.Schema{ + OneOf: []*jsonschema.Schema{ + {Type: "string"}, + {Type: "array", Items: &jsonschema.Schema{Type: "string"}}, + }, + } +} + +// mergeLegacyAlt folds a deprecated `*Alt*` field into the corresponding +// multi-key main field. +func mergeLegacyAlt(main *Keybinding, alt Keybinding) { + *main = lo.Union(*main, alt) +} diff --git a/pkg/config/keybinding_test.go b/pkg/config/keybinding_test.go new file mode 100644 index 000000000..be9f15acb --- /dev/null +++ b/pkg/config/keybinding_test.go @@ -0,0 +1,250 @@ +package config + +import ( + "encoding/json" + "testing" + + "github.com/stretchr/testify/assert" + "gopkg.in/yaml.v3" +) + +func TestKeybindingUnmarshalYAML(t *testing.T) { + scenarios := []struct { + name string + input string + expected Keybinding + wantErr bool + }{ + { + name: "scalar string", + input: `q`, + expected: Keybinding{"q"}, + }, + { + name: "scalar with special characters", + input: ``, + expected: Keybinding{""}, + }, + { + name: "sequence with one element", + input: `[q]`, + expected: Keybinding{"q"}, + }, + { + name: "sequence with multiple elements", + input: `["q", ""]`, + expected: Keybinding{"q", ""}, + }, + { + name: "empty sequence", + input: `[]`, + expected: Keybinding{}, + }, + { + name: "scalar decodes to empty", + input: ``, + expected: Keybinding{}, + }, + { + name: "scalar empty string decodes to empty", + input: `""`, + expected: Keybinding{}, + }, + { + name: " entries are filtered out of a sequence", + input: `["q", "", ""]`, + expected: Keybinding{"q", ""}, + }, + { + name: "mapping is rejected", + input: `{key: q}`, + wantErr: true, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + var k Keybinding + err := yaml.Unmarshal([]byte(s.input), &k) + if s.wantErr { + assert.Error(t, err) + return + } + assert.NoError(t, err) + assert.Equal(t, s.expected, k) + }) + } +} + +func TestKeybindingMarshalYAML(t *testing.T) { + scenarios := []struct { + name string + input Keybinding + expected string + }{ + { + name: "single key emits a scalar", + input: Keybinding{"q"}, + expected: "q\n", + }, + { + name: "multiple keys emit a flow sequence", + input: Keybinding{"q", ""}, + expected: "[q, ]\n", + }, + { + name: "empty keybinding emits an empty sequence", + input: Keybinding{}, + expected: "[]\n", + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + out, err := yaml.Marshal(s.input) + assert.NoError(t, err) + assert.Equal(t, s.expected, string(out)) + }) + } +} + +func TestKeybindingMarshalJSON(t *testing.T) { + scenarios := []struct { + name string + input Keybinding + expected string + }{ + { + name: "single key emits a string", + input: Keybinding{"q"}, + expected: `"q"`, + }, + { + name: "multiple keys emit an array", + input: Keybinding{"q", "esc"}, + expected: `["q","esc"]`, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + out, err := json.Marshal(s.input) + assert.NoError(t, err) + assert.Equal(t, s.expected, string(out)) + }) + } +} + +func TestMergeLegacyAltKeybindings(t *testing.T) { + scenarios := []struct { + name string + quit Keybinding + quitAlt1 Keybinding + expected Keybinding + }{ + { + name: "alt is folded into main", + quit: Keybinding{"q"}, + quitAlt1: Keybinding{""}, + expected: Keybinding{"q", ""}, + }, + { + name: "alt is not appended if already present", + quit: Keybinding{"q", ""}, + quitAlt1: Keybinding{""}, + expected: Keybinding{"q", ""}, + }, + { + name: "empty alt is ignored", + quit: Keybinding{"q"}, + quitAlt1: nil, + expected: Keybinding{"q"}, + }, + { + name: "user-supplied multi-key main is preserved", + quit: Keybinding{"q", ""}, + quitAlt1: Keybinding{""}, + expected: Keybinding{"q", "", ""}, + }, + { + name: "multi-key alt is folded element by element", + quit: Keybinding{"q"}, + quitAlt1: Keybinding{"", ""}, + expected: Keybinding{"q", "", ""}, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + cfg := KeybindingConfig{ + Universal: KeybindingUniversalConfig{ + Quit: s.quit, + QuitAlt1: s.quitAlt1, + }, + } + cfg.MergeLegacyAltKeybindings() + assert.Equal(t, s.expected, cfg.Universal.Quit) + }) + } +} + +func TestKeybindingYAMLRoundTrip(t *testing.T) { + scenarios := []Keybinding{ + {"q"}, + {"q", ""}, + {"", "", ""}, + } + for _, original := range scenarios { + out, err := yaml.Marshal(original) + assert.NoError(t, err) + var decoded Keybinding + assert.NoError(t, yaml.Unmarshal(out, &decoded)) + assert.Equal(t, original, decoded) + } +} + +func TestKeybindingConfigYAMLAcceptsBothForms(t *testing.T) { + scenarios := []struct { + name string + yaml string + expected Keybinding + }{ + { + name: "scalar form", + yaml: "quit: q\n", + expected: Keybinding{"q"}, + }, + { + name: "sequence form", + yaml: "quit: [q, ]\n", + expected: Keybinding{"q", ""}, + }, + { + name: "block sequence form", + yaml: "quit:\n - q\n - \n", + expected: Keybinding{"q", ""}, + }, + } + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + var cfg KeybindingUniversalConfig + assert.NoError(t, yaml.Unmarshal([]byte(s.yaml), &cfg)) + assert.Equal(t, s.expected, cfg.Quit) + }) + } +} + +func TestJumpToBlockYAMLAcceptsMixedForms(t *testing.T) { + yamlInput := ` +jumpToBlock: + - "1" + - ["2", "@"] + - "3" + - "4" + - "5" +` + var cfg KeybindingUniversalConfig + assert.NoError(t, yaml.Unmarshal([]byte(yamlInput), &cfg)) + expected := []Keybinding{{"1"}, {"2", "@"}, {"3"}, {"4"}, {"5"}} + assert.Equal(t, expected, cfg.JumpToBlock) +} diff --git a/pkg/config/keynames.go b/pkg/config/keynames.go index bb9756b43..da5b8dbae 100644 --- a/pkg/config/keynames.go +++ b/pkg/config/keynames.go @@ -1,93 +1,214 @@ package config import ( + "log" "strings" "unicode/utf8" - "github.com/jesseduffield/gocui" + "github.com/gdamore/tcell/v3" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/samber/lo" ) // NOTE: if you make changes to this table, be sure to update // docs/keybindings/Custom_Keybindings.md as well -var LabelByKey = map[gocui.Key]string{ - gocui.KeyF1: "", - gocui.KeyF2: "", - gocui.KeyF3: "", - gocui.KeyF4: "", - gocui.KeyF5: "", - gocui.KeyF6: "", - gocui.KeyF7: "", - gocui.KeyF8: "", - gocui.KeyF9: "", - gocui.KeyF10: "", - gocui.KeyF11: "", - gocui.KeyF12: "", - gocui.KeyInsert: "", - gocui.KeyDelete: "", - gocui.KeyHome: "", - gocui.KeyEnd: "", - gocui.KeyPgup: "", - gocui.KeyPgdn: "", - gocui.KeyArrowUp: "", - gocui.KeyShiftArrowUp: "", - gocui.KeyArrowDown: "", - gocui.KeyShiftArrowDown: "", - gocui.KeyArrowLeft: "", - gocui.KeyArrowRight: "", - gocui.KeyTab: "", // - gocui.KeyBacktab: "", - gocui.KeyEnter: "", // - gocui.KeyAltEnter: "", - gocui.KeyEsc: "", // , - gocui.KeyBackspace: "", // - gocui.KeyCtrlSpace: "", // , - gocui.KeyCtrlSlash: "", // - gocui.KeySpace: "", - gocui.KeyCtrlA: "", - gocui.KeyCtrlB: "", - gocui.KeyCtrlC: "", - gocui.KeyCtrlD: "", - gocui.KeyCtrlE: "", - gocui.KeyCtrlF: "", - gocui.KeyCtrlG: "", - gocui.KeyCtrlJ: "", - gocui.KeyCtrlK: "", - gocui.KeyCtrlL: "", - gocui.KeyCtrlN: "", - gocui.KeyCtrlO: "", - gocui.KeyCtrlP: "", - gocui.KeyCtrlQ: "", - gocui.KeyCtrlR: "", - gocui.KeyCtrlS: "", - gocui.KeyCtrlT: "", - gocui.KeyCtrlU: "", - gocui.KeyCtrlV: "", - gocui.KeyCtrlW: "", - gocui.KeyCtrlX: "", - gocui.KeyCtrlY: "", - gocui.KeyCtrlZ: "", - gocui.KeyCtrl4: "", // - gocui.KeyCtrl5: "", // - gocui.KeyCtrl6: "", - gocui.KeyCtrl8: "", - gocui.MouseWheelUp: "mouse wheel up", - gocui.MouseWheelDown: "mouse wheel down", +var labelByKey = map[gocui.KeyName]string{ + gocui.KeyF1: "f1", + gocui.KeyF2: "f2", + gocui.KeyF3: "f3", + gocui.KeyF4: "f4", + gocui.KeyF5: "f5", + gocui.KeyF6: "f6", + gocui.KeyF7: "f7", + gocui.KeyF8: "f8", + gocui.KeyF9: "f9", + gocui.KeyF10: "f10", + gocui.KeyF11: "f11", + gocui.KeyF12: "f12", + gocui.KeyInsert: "insert", + gocui.KeyDelete: "delete", + gocui.KeyHome: "home", + gocui.KeyEnd: "end", + gocui.KeyPgup: "pgup", + gocui.KeyPgdn: "pgdown", + gocui.KeyArrowUp: "up", + gocui.KeyArrowDown: "down", + gocui.KeyArrowLeft: "left", + gocui.KeyArrowRight: "right", + gocui.KeyTab: "tab", + gocui.KeyBacktab: "backtab", + gocui.KeyEnter: "enter", + gocui.KeyEsc: "esc", + gocui.KeyBackspace: "backspace", + gocui.MouseWheelUp: "mouse wheel up", + gocui.MouseWheelDown: "mouse wheel down", } -var KeyByLabel = lo.Invert(LabelByKey) +var keyByLabel = lo.Invert(labelByKey) + +func LabelForKey(key gocui.Key) string { + if !key.IsSet() { + return "" + } + + label := "" + if key.Mod()&gocui.ModCtrl != 0 { + label += "ctrl+" + } + if key.Mod()&gocui.ModAlt != 0 { + label += "alt+" + } + if key.Mod()&gocui.ModShift != 0 { + label += "shift+" + } + if key.Mod()&gocui.ModMeta != 0 { + label += "meta+" + } + + if key.KeyName() == gocui.KeyName(tcell.KeyRune) { + if key.Str() == " " { + label += "space" + } else if key.Str() == "-" && key.Mod() != gocui.ModNone { + label += "minus" + } else if key.Str() == "+" && key.Mod() != gocui.ModNone { + label += "plus" + } else { + label += key.Str() + } + } else { + value, ok := labelByKey[key.KeyName()] + if ok { + label += value + } else { + label += "unknown" + } + } + + if utf8.RuneCountInString(label) > 1 { + label = "<" + label + ">" + } + + return label +} + +func KeyFromLabel(label string) (gocui.Key, bool) { + if label == "" || label == "" { + return gocui.Key{}, true + } + + if strings.HasPrefix(label, "<") && strings.HasSuffix(label, ">") { + label = label[1 : len(label)-1] + } + + mod := gocui.ModNone + for { + // A bare "-" or "+" with any (or no) modifiers is a literal rune + // key; this also covers lenient forms like `` and ``, + // neither of which we emit (we use `` and ``). + if label == "-" || label == "+" { + return gocui.NewKeyStrMod(label, mod), true + } + + sepIdx := strings.IndexAny(label, "-+") + if sepIdx == -1 { + break + } + modStr, remainder := label[:sepIdx], label[sepIdx+1:] + + label = remainder + + switch modStr { + case "s", "shift": + if (mod & gocui.ModShift) != 0 { + return gocui.Key{}, false + } + mod |= gocui.ModShift + case "c", "ctrl": + if (mod & gocui.ModCtrl) != 0 { + return gocui.Key{}, false + } + mod |= gocui.ModCtrl + case "a", "alt": + if (mod & gocui.ModAlt) != 0 { + return gocui.Key{}, false + } + mod |= gocui.ModAlt + case "m", "meta": + if (mod & gocui.ModMeta) != 0 { + return gocui.Key{}, false + } + mod |= gocui.ModMeta + default: + return gocui.Key{}, false + } + } + + if label == "space" { + return gocui.NewKeyStrMod(" ", mod), true + } + + if label == "minus" { + if mod == gocui.ModShift { + return gocui.Key{}, false + } + return gocui.NewKeyStrMod("-", mod), true + } + + if label == "plus" { + if mod == gocui.ModShift { + return gocui.Key{}, false + } + return gocui.NewKeyStrMod("+", mod), true + } + + if keyName, ok := keyByLabel[label]; ok { + return gocui.NewKey(keyName, "", mod), true + } + + runeCount := utf8.RuneCountInString(label) + if runeCount != 1 { + return gocui.Key{}, false + } + + // Shift on a bare rune is invalid: terminals fold shift into the rune + // itself (shift+a arrives as "A"), so the binding could never fire. + // Space is exempt and handled above; combined with other modifiers, + // shift is fine because the terminal can't fold it into the rune then. + if mod == gocui.ModShift { + return gocui.Key{}, false + } + + // An ASCII uppercase letter with any modifier is invalid. Ctrl+letter + // events always arrive with a lowercase rune — control codes have no + // case distinction (the terminal sends the same byte for ctrl+a and + // ctrl+A), and CSI-u protocols report the unshifted codepoint with + // shift as a separate modifier (alt+shift+a → rune='a' mod=Alt|Shift). + // Users should write rather than . + if mod != gocui.ModNone && len(label) == 1 && label[0] >= 'A' && label[0] <= 'Z' { + return gocui.Key{}, false + } + + return gocui.NewKeyStrMod(label, mod), true +} func isValidKeybindingKey(key string) bool { - runeCount := utf8.RuneCountInString(key) - if key == "" { - return true - } - - if runeCount > 1 { - _, ok := KeyByLabel[strings.ToLower(key)] - return ok - } - - return true + _, ok := KeyFromLabel(key) + return ok +} + +func GetValidatedKeyBindingKey(label string) gocui.Key { + key, ok := KeyFromLabel(label) + if !ok { + log.Fatalf("Unrecognized key %s, this should have been caught by user config validation", label) + } + + return key +} + +func GetValidatedKeyBindingKeys(labels Keybinding) []gocui.Key { + return lo.FilterMap(labels, func(label string, _ int) (gocui.Key, bool) { + k := GetValidatedKeyBindingKey(label) + return k, k.IsSet() + }) } diff --git a/pkg/config/keynames_test.go b/pkg/config/keynames_test.go new file mode 100644 index 000000000..ac73b3e1b --- /dev/null +++ b/pkg/config/keynames_test.go @@ -0,0 +1,686 @@ +package config + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/stretchr/testify/assert" +) + +func TestKeyFromLabel(t *testing.T) { + scenarios := []struct { + name string + label string + expectedKey gocui.Key + expectedOk bool + }{ + // Empty / disabled + { + name: "empty string returns unset key", + label: "", + expectedKey: gocui.Key{}, + expectedOk: true, + }, + { + name: " returns unset key", + label: "", + expectedKey: gocui.Key{}, + expectedOk: true, + }, + + // Plain runes (unwrapped) + { + name: "single lowercase letter", + label: "a", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModNone), + expectedOk: true, + }, + { + name: "single uppercase letter", + label: "A", + expectedKey: gocui.NewKeyStrMod("A", gocui.ModNone), + expectedOk: true, + }, + { + name: "single digit", + label: "5", + expectedKey: gocui.NewKeyStrMod("5", gocui.ModNone), + expectedOk: true, + }, + { + name: "punctuation rune", + label: "?", + expectedKey: gocui.NewKeyStrMod("?", gocui.ModNone), + expectedOk: true, + }, + { + name: "multibyte rune", + label: "ñ", + expectedKey: gocui.NewKeyStrMod("ñ", gocui.ModNone), + expectedOk: true, + }, + { + name: "bare dash is treated as a rune", + label: "-", + expectedKey: gocui.NewKeyRune('-'), + expectedOk: true, + }, + + // Special key names (no modifiers, no brackets — though these are + // always wrapped in brackets in real configs, KeyFromLabel accepts + // the unwrapped form too) + { + name: "function key", + label: "f1", + expectedKey: gocui.NewKey(gocui.KeyF1, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "function key wrapped in brackets", + label: "", + expectedKey: gocui.NewKey(gocui.KeyF12, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "arrow key", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "tab", + label: "", + expectedKey: gocui.NewKey(gocui.KeyTab, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "enter", + label: "", + expectedKey: gocui.NewKey(gocui.KeyEnter, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "esc", + label: "", + expectedKey: gocui.NewKey(gocui.KeyEsc, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "backspace", + label: "", + expectedKey: gocui.NewKey(gocui.KeyBackspace, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "pgup", + label: "", + expectedKey: gocui.NewKey(gocui.KeyPgup, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "pgdown", + label: "", + expectedKey: gocui.NewKey(gocui.KeyPgdn, "", gocui.ModNone), + expectedOk: true, + }, + { + name: "mouse wheel up", + label: "", + expectedKey: gocui.NewKey(gocui.MouseWheelUp, "", gocui.ModNone), + expectedOk: true, + }, + + // Space + { + name: "space keyword maps to space rune", + label: "", + expectedKey: gocui.NewKeyStrMod(" ", gocui.ModNone), + expectedOk: true, + }, + { + name: "space keyword without brackets", + label: "space", + expectedKey: gocui.NewKeyStrMod(" ", gocui.ModNone), + expectedOk: true, + }, + { + name: "ctrl+space", + label: "", + expectedKey: gocui.NewKeyStrMod(" ", gocui.ModCtrl), + expectedOk: true, + }, + + // Minus + { + name: "minus keyword maps to dash rune", + label: "", + expectedKey: gocui.NewKeyStrMod("-", gocui.ModNone), + expectedOk: true, + }, + { + name: "ctrl+minus via keyword", + label: "", + expectedKey: gocui.NewKeyStrMod("-", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "ctrl+minus via lenient dash form", + label: "", + expectedKey: gocui.NewKeyStrMod("-", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "alt+ctrl+minus via lenient dash form", + label: "", + expectedKey: gocui.NewKeyStrMod("-", gocui.ModAlt|gocui.ModCtrl), + expectedOk: true, + }, + + // Plus + { + name: "plus keyword maps to plus rune", + label: "", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModNone), + expectedOk: true, + }, + { + name: "ctrl+plus via keyword", + label: "", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "ctrl+plus via long keyword and plus separator", + label: "", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "alt+shift+plus via keyword", + label: "", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModAlt|gocui.ModShift), + expectedOk: true, + }, + { + name: "shift alone on plus is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + + // Modifiers with runes + { + name: "ctrl+letter", + label: "", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "alt+letter", + label: "", + expectedKey: gocui.NewKeyStrMod("x", gocui.ModAlt), + expectedOk: true, + }, + { + name: "meta+letter", + label: "", + expectedKey: gocui.NewKeyStrMod("z", gocui.ModMeta), + expectedOk: true, + }, + + // Long modifier names are accepted as synonyms for the short forms. + { + name: "ctrl long form", + label: "", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "alt long form", + label: "", + expectedKey: gocui.NewKeyStrMod("x", gocui.ModAlt), + expectedOk: true, + }, + { + name: "meta long form", + label: "", + expectedKey: gocui.NewKeyStrMod("z", gocui.ModMeta), + expectedOk: true, + }, + { + name: "shift long form combined with ctrl", + label: "", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModShift|gocui.ModCtrl), + expectedOk: true, + }, + { + name: "long forms work with special keys", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "short and long forms can be mixed", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModCtrl|gocui.ModShift), + expectedOk: true, + }, + { + name: "duplicate via mixed short and long form is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "unknown long modifier is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + + // Plus is accepted as an alternative modifier separator. + { + name: "plus separator with short form", + label: "", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "plus separator with long form", + label: "", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModCtrl|gocui.ModAlt), + expectedOk: true, + }, + { + name: "plus separator with special key", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "mixed plus and dash separators", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModCtrl|gocui.ModShift), + expectedOk: true, + }, + { + name: "duplicate detection works across separators", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "ctrl+plus rune via plus separator", + label: "", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "ctrl+dash rune via plus separator", + label: "", + expectedKey: gocui.NewKeyStrMod("-", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "ctrl+plus rune via dash separator", + label: "", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "bare plus rune", + label: "+", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModNone), + expectedOk: true, + }, + { + name: "bare plus wrapped in brackets", + label: "<+>", + expectedKey: gocui.NewKeyStrMod("+", gocui.ModNone), + expectedOk: true, + }, + + // Shift-on-rune is rejected: terminals fold shift into the rune + // itself, so the binding could never fire. Combined with other + // modifiers it's allowed (the terminal can't fold it then). + { + name: "shift alone on a letter is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "shift alone on uppercase letter is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "shift alone on minus is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "shift on space is allowed (rune does not change)", + label: "", + expectedKey: gocui.NewKeyStrMod(" ", gocui.ModShift), + expectedOk: true, + }, + { + name: "shift combined with ctrl on a letter is allowed", + label: "", + expectedKey: gocui.NewKeyStrMod("x", gocui.ModCtrl|gocui.ModShift), + expectedOk: true, + }, + { + name: "shift combined with alt on minus is allowed", + label: "", + expectedKey: gocui.NewKeyStrMod("-", gocui.ModAlt|gocui.ModShift), + expectedOk: true, + }, + + // Uppercase ASCII letter with a modifier is rejected: ctrl+letter + // always arrives with a lowercase rune (control codes have no case + // distinction), and CSI-u reports the unshifted codepoint with + // shift as a separate modifier. + { + name: "ctrl+uppercase letter is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "alt+uppercase letter is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "meta+uppercase letter is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "combined modifier on uppercase letter is rejected", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "bare uppercase letter is allowed", + label: "A", + expectedKey: gocui.NewKeyStrMod("A", gocui.ModNone), + expectedOk: true, + }, + { + name: "modifier on digit is allowed", + label: "", + expectedKey: gocui.NewKeyStrMod("1", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "modifier on non-ASCII uppercase letter is allowed", + label: "", + expectedKey: gocui.NewKeyStrMod("Ñ", gocui.ModAlt), + expectedOk: true, + }, + + // Modifiers with special keys + { + name: "ctrl+enter", + label: "", + expectedKey: gocui.NewKey(gocui.KeyEnter, "", gocui.ModCtrl), + expectedOk: true, + }, + { + name: "alt+up", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModAlt), + expectedOk: true, + }, + { + name: "shift+f1", + label: "", + expectedKey: gocui.NewKey(gocui.KeyF1, "", gocui.ModShift), + expectedOk: true, + }, + { + name: "meta+enter", + label: "", + expectedKey: gocui.NewKey(gocui.KeyEnter, "", gocui.ModMeta), + expectedOk: true, + }, + + // Combined modifiers + { + name: "ctrl+alt+letter", + label: "", + expectedKey: gocui.NewKeyStrMod("x", gocui.ModCtrl|gocui.ModAlt), + expectedOk: true, + }, + { + name: "all four modifiers on a letter", + label: "", + expectedKey: gocui.NewKeyStrMod("x", gocui.ModShift|gocui.ModCtrl|gocui.ModAlt|gocui.ModMeta), + expectedOk: true, + }, + { + name: "ctrl+shift+arrow key", + label: "", + expectedKey: gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModCtrl|gocui.ModShift), + expectedOk: true, + }, + + // Bracket handling + { + name: "single rune wrapped in brackets is unwrapped", + label: "", + expectedKey: gocui.NewKeyStrMod("a", gocui.ModNone), + expectedOk: true, + }, + { + name: "dash wrapped in brackets", + label: "<->", + expectedKey: gocui.NewKeyRune('-'), + expectedOk: true, + }, + + // Invalid inputs + { + name: "unknown special key name", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "unknown modifier letter", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "uppercase modifier is not accepted", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "duplicate ctrl modifier", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "duplicate shift modifier", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "duplicate alt modifier", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "duplicate meta modifier", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "trailing modifier with no key", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "multi-character non-special label", + label: "ab", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "empty brackets", + label: "<>", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + { + name: "modifier on unknown key name", + label: "", + expectedKey: gocui.Key{}, + expectedOk: false, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + key, ok := KeyFromLabel(s.label) + assert.Equal(t, s.expectedOk, ok) + assert.Equal(t, s.expectedKey, key) + }) + } +} + +func TestLabelForKey(t *testing.T) { + scenarios := []struct { + name string + key gocui.Key + expected string + }{ + // Unset + {"unset key produces empty string", gocui.Key{}, ""}, + + // Plain runes — single-character output, no brackets + {"lowercase letter", gocui.NewKeyStrMod("a", gocui.ModNone), "a"}, + {"uppercase letter", gocui.NewKeyStrMod("A", gocui.ModNone), "A"}, + {"digit", gocui.NewKeyStrMod("5", gocui.ModNone), "5"}, + {"punctuation", gocui.NewKeyStrMod("?", gocui.ModNone), "?"}, + {"slash", gocui.NewKeyStrMod("/", gocui.ModNone), "/"}, + {"multibyte rune", gocui.NewKeyStrMod("ñ", gocui.ModNone), "ñ"}, + + // Space and dash — special-cased rune output + {"plain dash uses literal", gocui.NewKeyStrMod("-", gocui.ModNone), "-"}, + {"plain space uses keyword", gocui.NewKeyStrMod(" ", gocui.ModNone), ""}, + {"ctrl+dash uses minus keyword", gocui.NewKeyStrMod("-", gocui.ModCtrl), ""}, + {"alt+dash uses minus keyword", gocui.NewKeyStrMod("-", gocui.ModAlt), ""}, + {"plain plus uses literal", gocui.NewKeyStrMod("+", gocui.ModNone), "+"}, + {"ctrl+plus uses plus keyword", gocui.NewKeyStrMod("+", gocui.ModCtrl), ""}, + {"alt+plus uses plus keyword", gocui.NewKeyStrMod("+", gocui.ModAlt), ""}, + {"ctrl+space", gocui.NewKeyStrMod(" ", gocui.ModCtrl), ""}, + + // Single modifier on a rune + {"ctrl+letter", gocui.NewKeyStrMod("a", gocui.ModCtrl), ""}, + {"alt+letter", gocui.NewKeyStrMod("x", gocui.ModAlt), ""}, + {"meta+letter", gocui.NewKeyStrMod("z", gocui.ModMeta), ""}, + {"shift+space", gocui.NewKeyStrMod(" ", gocui.ModShift), ""}, + + // Modifier ordering — canonical output is ctrl+, alt+, shift+, meta+ + {"ctrl+alt orders ctrl before alt", gocui.NewKeyStrMod("x", gocui.ModCtrl|gocui.ModAlt), ""}, + {"shift+ctrl orders ctrl before shift", gocui.NewKeyStrMod("x", gocui.ModShift|gocui.ModCtrl), ""}, + {"meta+shift orders shift before meta", gocui.NewKeyStrMod("x", gocui.ModMeta|gocui.ModShift), ""}, + { + "all four modifiers ordered ctrl+alt+shift+meta", + gocui.NewKeyStrMod("x", gocui.ModCtrl|gocui.ModAlt|gocui.ModShift|gocui.ModMeta), + "", + }, + + // Special keys (always wrapped, even unmodified) + {"f1", gocui.NewKey(gocui.KeyF1, "", gocui.ModNone), ""}, + {"f12", gocui.NewKey(gocui.KeyF12, "", gocui.ModNone), ""}, + {"insert", gocui.NewKey(gocui.KeyInsert, "", gocui.ModNone), ""}, + {"delete", gocui.NewKey(gocui.KeyDelete, "", gocui.ModNone), ""}, + {"home", gocui.NewKey(gocui.KeyHome, "", gocui.ModNone), ""}, + {"end", gocui.NewKey(gocui.KeyEnd, "", gocui.ModNone), ""}, + {"pgup", gocui.NewKey(gocui.KeyPgup, "", gocui.ModNone), ""}, + {"pgdown", gocui.NewKey(gocui.KeyPgdn, "", gocui.ModNone), ""}, + {"arrow up", gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModNone), ""}, + {"arrow down", gocui.NewKey(gocui.KeyArrowDown, "", gocui.ModNone), ""}, + {"arrow left", gocui.NewKey(gocui.KeyArrowLeft, "", gocui.ModNone), ""}, + {"arrow right", gocui.NewKey(gocui.KeyArrowRight, "", gocui.ModNone), ""}, + {"tab", gocui.NewKey(gocui.KeyTab, "", gocui.ModNone), ""}, + {"backtab", gocui.NewKey(gocui.KeyBacktab, "", gocui.ModNone), ""}, + {"enter", gocui.NewKey(gocui.KeyEnter, "", gocui.ModNone), ""}, + {"esc", gocui.NewKey(gocui.KeyEsc, "", gocui.ModNone), ""}, + {"backspace", gocui.NewKey(gocui.KeyBackspace, "", gocui.ModNone), ""}, + {"mouse wheel up", gocui.NewKey(gocui.MouseWheelUp, "", gocui.ModNone), ""}, + {"mouse wheel down", gocui.NewKey(gocui.MouseWheelDown, "", gocui.ModNone), ""}, + + // Modifiers on special keys + {"shift+f1", gocui.NewKey(gocui.KeyF1, "", gocui.ModShift), ""}, + {"alt+up", gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModAlt), ""}, + {"meta+enter", gocui.NewKey(gocui.KeyEnter, "", gocui.ModMeta), ""}, + {"ctrl+shift+up", gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModCtrl|gocui.ModShift), ""}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + assert.Equal(t, s.expected, LabelForKey(s.key)) + }) + } +} + +// Round-trip: every label produced by LabelForKey should parse back to the +// same key via KeyFromLabel. +func TestKeyFromLabel_RoundTripFromLabelForKey(t *testing.T) { + scenarios := []struct { + name string + key gocui.Key + }{ + {"unset key", gocui.Key{}}, + {"plain letter", gocui.NewKeyStrMod("a", gocui.ModNone)}, + {"plain digit", gocui.NewKeyStrMod("7", gocui.ModNone)}, + {"space", gocui.NewKeyStrMod(" ", gocui.ModNone)}, + {"ctrl+letter", gocui.NewKeyStrMod("a", gocui.ModCtrl)}, + {"alt+letter", gocui.NewKeyStrMod("x", gocui.ModAlt)}, + {"meta+letter", gocui.NewKeyStrMod("z", gocui.ModMeta)}, + {"shift+space", gocui.NewKeyStrMod(" ", gocui.ModShift)}, + {"ctrl+shift+letter", gocui.NewKeyStrMod("x", gocui.ModCtrl|gocui.ModShift)}, + {"ctrl+alt+letter", gocui.NewKeyStrMod("x", gocui.ModCtrl|gocui.ModAlt)}, + {"f1", gocui.NewKey(gocui.KeyF1, "", gocui.ModNone)}, + {"shift+f1", gocui.NewKey(gocui.KeyF1, "", gocui.ModShift)}, + {"alt+up", gocui.NewKey(gocui.KeyArrowUp, "", gocui.ModAlt)}, + {"meta+enter", gocui.NewKey(gocui.KeyEnter, "", gocui.ModMeta)}, + {"esc", gocui.NewKey(gocui.KeyEsc, "", gocui.ModNone)}, + {"mouse wheel up", gocui.NewKey(gocui.MouseWheelUp, "", gocui.ModNone)}, + {"ctrl+space", gocui.NewKeyStrMod(" ", gocui.ModCtrl)}, + {"plain dash", gocui.NewKeyStrMod("-", gocui.ModNone)}, + {"ctrl+dash", gocui.NewKeyStrMod("-", gocui.ModCtrl)}, + {"alt+shift+dash", gocui.NewKeyStrMod("-", gocui.ModAlt|gocui.ModShift)}, + {"plain plus", gocui.NewKeyStrMod("+", gocui.ModNone)}, + {"ctrl+plus", gocui.NewKeyStrMod("+", gocui.ModCtrl)}, + {"alt+shift+plus", gocui.NewKeyStrMod("+", gocui.ModAlt|gocui.ModShift)}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + label := LabelForKey(s.key) + parsed, ok := KeyFromLabel(label) + assert.True(t, ok, "expected label %q to parse", label) + assert.Equal(t, s.key, parsed) + }) + } +} diff --git a/pkg/config/pager_config.go b/pkg/config/pager_config.go deleted file mode 100644 index e721da0e8..000000000 --- a/pkg/config/pager_config.go +++ /dev/null @@ -1,82 +0,0 @@ -package config - -import ( - "strconv" - - "github.com/jesseduffield/lazygit/pkg/utils" -) - -type PagerConfig struct { - getUserConfig func() *UserConfig - pagerIndex int -} - -func NewPagerConfig(getUserConfig func() *UserConfig) *PagerConfig { - return &PagerConfig{getUserConfig: getUserConfig} -} - -func (self *PagerConfig) currentPagerConfig() *PagingConfig { - pagers := self.getUserConfig().Git.Pagers - if len(pagers) == 0 { - return nil - } - - // Guard against the pager index being out of range, which can happen if the user - // has removed pagers from their config file while lazygit is running. - if self.pagerIndex >= len(pagers) { - self.pagerIndex = 0 - } - - return &pagers[self.pagerIndex] -} - -func (self *PagerConfig) GetPagerCommand(width int) string { - currentPagerConfig := self.currentPagerConfig() - if currentPagerConfig == nil { - return "" - } - - templateValues := map[string]string{ - "columnWidth": strconv.Itoa(width/2 - 6), - } - - pagerTemplate := string(currentPagerConfig.Pager) - return utils.ResolvePlaceholderString(pagerTemplate, templateValues) -} - -func (self *PagerConfig) GetColorArg() string { - currentPagerConfig := self.currentPagerConfig() - if currentPagerConfig == nil { - return "always" - } - - colorArg := currentPagerConfig.ColorArg - if colorArg == "" { - return "always" - } - return colorArg -} - -func (self *PagerConfig) GetExternalDiffCommand() string { - currentPagerConfig := self.currentPagerConfig() - if currentPagerConfig == nil { - return "" - } - return currentPagerConfig.ExternalDiffCommand -} - -func (self *PagerConfig) GetUseExternalDiffGitConfig() bool { - currentPagerConfig := self.currentPagerConfig() - if currentPagerConfig == nil { - return false - } - return currentPagerConfig.UseExternalDiffGitConfig -} - -func (self *PagerConfig) CyclePagers() { - self.pagerIndex = (self.pagerIndex + 1) % len(self.getUserConfig().Git.Pagers) -} - -func (self *PagerConfig) CurrentPagerIndex() (int, int) { - return self.pagerIndex, len(self.getUserConfig().Git.Pagers) -} diff --git a/pkg/config/side_panel.go b/pkg/config/side_panel.go new file mode 100644 index 000000000..307ed0c1d --- /dev/null +++ b/pkg/config/side_panel.go @@ -0,0 +1,54 @@ +package config + +import ( + "github.com/karimkhaleel/jsonschema" + "github.com/samber/lo" + "gopkg.in/yaml.v3" +) + +// SidePanel is one entry in gui.sidePanels: a side panel made up of one or more +// tabs, written in YAML as a list of tab names (e.g. [files, worktrees]). +type SidePanel []string + +// ValidSidePanelTabs lists every name that may appear in gui.sidePanels. Each +// names a list that can stand alone as a panel or be grouped with others as the +// tabs of one panel. The resolver in the gui package must handle every entry +// here; a test enforces that the two stay in sync. +var ValidSidePanelTabs = []string{ + "status", + "files", + "worktrees", + "submodules", + "branches", + "remotes", + "tags", + "commits", + "reflog", + "stash", +} + +func (p SidePanel) MarshalYAML() (any, error) { + // Render in flow style (`[a, b]`) rather than the default block style, which + // is more compact and reads better in the generated docs. + node := &yaml.Node{ + Kind: yaml.SequenceNode, + Style: yaml.FlowStyle, + } + for _, s := range p { + node.Content = append(node.Content, &yaml.Node{ + Kind: yaml.ScalarNode, + Value: s, + }) + } + return node, nil +} + +// JSONSchema describes a side panel as a list of tab names, restricted to the +// known names. +func (SidePanel) JSONSchema() *jsonschema.Schema { + names := lo.Map(ValidSidePanelTabs, func(name string, _ int) any { return name }) + return &jsonschema.Schema{ + Type: "array", + Items: &jsonschema.Schema{Type: "string", Enum: names}, + } +} diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 192d13843..9738186d9 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -11,6 +11,8 @@ type UserConfig struct { Gui GuiConfig `yaml:"gui"` // Config relating to git Git GitConfig `yaml:"git"` + // Config relating to git worktrees + Worktree WorktreeConfig `yaml:"worktree"` // Periodic update checks Update UpdateConfig `yaml:"update"` // Background refreshes @@ -36,17 +38,21 @@ type UserConfig struct { NotARepository string `yaml:"notARepository" jsonschema:"enum=prompt,enum=create,enum=skip,enum=quit"` // If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit. PromptToReturnFromSubprocess bool `yaml:"promptToReturnFromSubprocess"` - // Keybindings + // Keybindings. + // Each binding can be a single key or a list of keys; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md for the syntax. Keybinding KeybindingConfig `yaml:"keybinding"` } type RefresherConfig struct { // File/submodule refresh interval in seconds. // Auto-refresh can be disabled via option 'git.autoRefresh'. - RefreshInterval int `yaml:"refreshInterval" jsonschema:"minimum=0"` + RefreshInterval int `yaml:"refreshInterval" jsonschema:"exclusiveMinimum=0"` // Re-fetch interval in seconds. // Auto-fetch can be disabled via option 'git.autoFetch'. - FetchInterval int `yaml:"fetchInterval" jsonschema:"minimum=0"` + FetchInterval int `yaml:"fetchInterval" jsonschema:"exclusiveMinimum=0"` + // Interval in seconds at which lazygit polls for external ref changes (commits, branch updates, checkouts made outside lazygit). + // Detection can be disabled via option 'git.autoDetectExternalChanges'. + ExternalChangeCheckInterval int `yaml:"externalChangeCheckInterval" jsonschema:"exclusiveMinimum=0"` } func (c *RefresherConfig) RefreshIntervalDuration() time.Duration { @@ -57,6 +63,10 @@ func (c *RefresherConfig) FetchIntervalDuration() time.Duration { return time.Second * time.Duration(c.FetchInterval) } +func (c *RefresherConfig) ExternalChangeCheckIntervalDuration() time.Duration { + return time.Second * time.Duration(c.ExternalChangeCheckInterval) +} + type GuiConfig struct { // See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color AuthorColors map[string]string `yaml:"authorColors"` @@ -77,7 +87,7 @@ type GuiConfig struct { // One of: 'margin' (default) | 'jump' ScrollOffBehavior string `yaml:"scrollOffBehavior"` // The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs. - // Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command. + // Note that when using a diff renderer, the renderer has its own tab width setting, so you need to pass it separately in the renderer command. TabWidth int `yaml:"tabWidth" jsonschema:"minimum=1"` // If true, capture mouse events. // When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS. @@ -101,6 +111,13 @@ type GuiConfig struct { ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"` // The weight of the expanded side panel, relative to the other panels. 2 means twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true. ExpandedSidePanelWeight int `yaml:"expandedSidePanelWeight"` + // If true, don't give a side panel more height than it needs to show its content; when all panels fit, the leftover height is shared among them so that they still fill the screen. + ShrinkSidePanelsToContent bool `yaml:"shrinkSidePanelsToContent"` + // The side panels, in the order they appear from top to bottom. + // Each entry is a list of one or more names that share a single panel as tabs (cycle through them with the next-tab/previous-tab keys). + // Omit a name to hide it; give a name its own one-element list to promote a tab to a top-level panel. + // Valid names are: 'status', 'files', 'worktrees', 'submodules', 'branches', 'remotes', 'tags', 'commits', 'reflog', 'stash'. 'files', 'branches', and 'commits' must always be included; they can't be hidden. + SidePanels []SidePanel `yaml:"sidePanels"` // Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split. // Options are: // - 'horizontal': split the window horizontally @@ -136,6 +153,11 @@ type GuiConfig struct { ShowFileTree bool `yaml:"showFileTree"` // If true, add a "/" root item in the file tree representing the root of the repository. It is only added when necessary, i.e. when there is more than one item at top level. ShowRootItemInFileTree bool `yaml:"showRootItemInFileTree"` + // How to sort files and directories in the file tree. + // One of: 'mixed' (default) | 'filesFirst' | 'foldersFirst' + FileTreeSortOrder string `yaml:"fileTreeSortOrder" jsonschema:"enum=mixed,enum=filesFirst,enum=foldersFirst"` + // If true (default), sort the file tree case-sensitively. + FileTreeSortCaseSensitive bool `yaml:"fileTreeSortCaseSensitive"` // If true, show the number of lines changed per file in the Files view ShowNumstatInFilesView bool `yaml:"showNumstatInFilesView"` // If true, show a random tip in the command log when Lazygit starts @@ -182,6 +204,10 @@ type GuiConfig struct { // Whether to stack UI components on top of each other. // One of 'auto' (default) | 'always' | 'never' PortraitMode string `yaml:"portraitMode"` + // In 'auto' mode, portrait mode will be used if the window width is less than or equal to portraitModeAutoMaxWidth and the window height is greater than or equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'. + PortraitModeAutoMaxWidth int `yaml:"portraitModeAutoMaxWidth"` + // In 'auto' mode, portrait mode will be used if the window width is less than or equal to portraitModeAutoMaxWidth and the window height is greater than or equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'. + PortraitModeAutoMinHeight int `yaml:"portraitModeAutoMinHeight"` // How things are filtered when typing '/'. // One of 'substring' (default) | 'fuzzy' FilterMode string `yaml:"filterMode" jsonschema:"enum=substring,enum=fuzzy"` @@ -243,30 +269,39 @@ type SpinnerConfig struct { } type GitConfig struct { - // Array of pagers. Each entry has the following format: - // [dev] The following documentation is duplicated from the PagingConfig struct below. + // Array of diff renderers. Each entry has the following format: + // [dev] The following documentation is duplicated from the DiffRendererConfig struct below. // - // # Value of the --color arg in the git diff command. Some pagers want - // # this to be set to 'always' and some want it set to 'never' + // # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' + // # | 'rawGit' + // type: "stdinFilter" + // + // # A name for the diff renderer, shown in the notification when cycling + // # renderers. If not set, the name is derived from the first word of the + // # renderer command. + // name: "" + // + // # Value of the --color arg in the git diff command. Only used for type + // # 'stdinFilter'. Some renderers want this to be set to 'always' and some + // # want it set to 'never'. // colorArg: "always" // + // # The command to use for rendering diffs. This is either a stdinFilter or + // # an external diff command, depending on the type field; not applicable if + // # the type is 'rawGit'. // # e.g. // # diff-so-fancy // # delta --dark --paging=never - // # ydiff -p cat -s --wrap --width={{columnWidth}} - // pager: "" + // # ydiff -p cat + // # difft --color=always + // command: "" // - // # e.g. 'difft --color=always' - // externalDiffCommand: "" + // # Extra arguments (array of strings) passed to the git command. Only + // # applicable if the type is 'rawGit'. + // args: [] // - // # If true, Lazygit will use git's `diff.external` config for paging. - // # The advantage over `externalDiffCommand` is that this can be - // # configured per file type in .gitattributes; see - // # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. - // useExternalDiffGitConfig: false - // - // See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md for more information. - Pagers []PagingConfig `yaml:"pagers"` + // See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md for more information. + DiffRenderers []DiffRendererConfig `yaml:"diffRenderers"` // Config relating to committing Commit CommitConfig `yaml:"commit"` // Config relating to merging @@ -279,6 +314,8 @@ type GitConfig struct { AutoFetch bool `yaml:"autoFetch"` // If true, periodically refresh files and submodules AutoRefresh bool `yaml:"autoRefresh"` + // If true, poll the repo periodically for external ref changes (commits, branch updates, checkouts made outside lazygit) and refresh when one is detected. Independent of autoRefresh, which only governs the files panel. + AutoDetectExternalChanges bool `yaml:"autoDetectExternalChanges"` // If not "none", lazygit will automatically fast-forward local branches to match their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged). // Possible values: 'none' | 'onlyMainBranches' | 'allBranches' AutoForwardBranches string `yaml:"autoForwardBranches" jsonschema:"enum=none,enum=onlyMainBranches,enum=allBranches"` @@ -290,7 +327,7 @@ type GitConfig struct { BranchLogCmd string `yaml:"branchLogCmd"` // Commands used to display git log of all branches in the main window, they will be cycled in order of appearance (array of strings) AllBranchesLogCmds []string `yaml:"allBranchesLogCmds"` - // If true, git diffs are rendered with the `--ignore-all-space` flag, which ignores whitespace changes. Can be toggled from within Lazygit with ``. + // If true, git diffs are rendered with the `--ignore-all-space` flag, which ignores whitespace changes. Can be toggled from within Lazygit with ``. IgnoreWhitespaceInDiffView bool `yaml:"ignoreWhitespaceInDiffView"` // The number of lines of context to show around each diff hunk. Can be changed from within Lazygit with the `{` and `}` keys. DiffContextSize uint64 `yaml:"diffContextSize"` @@ -323,29 +360,34 @@ type GitConfig struct { TruncateCopiedCommitHashesTo int `yaml:"truncateCopiedCommitHashesTo"` } -type PagerType string +type DiffRendererCommandType string -func (PagerType) JSONSchemaExtend(schema *jsonschema.Schema) { +func (DiffRendererCommandType) JSONSchemaExtend(schema *jsonschema.Schema) { schema.Examples = []any{ "delta --dark --paging=never", "diff-so-fancy", - "ydiff -p cat -s --wrap --width={{columnWidth}}", + "ydiff -p cat", + "difft --color=always", } } // [dev] This documentation is duplicated in the GitConfig struct. If you make changes here, make them there too. -type PagingConfig struct { - // Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never' +type DiffRendererConfig struct { + // The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' | 'rawGit' + Type string `yaml:"type" jsonschema:"enum=stdinFilter,enum=extDiff,enum=rawGit"` + // A name for the diff renderer, shown in the notification when cycling renderers. If not set, the name is derived from the first word of the renderer command. + Name string `yaml:"name"` + // Value of the --color arg in the git diff command. Only used for type 'stdinFilter'. Some renderers want this to be set to 'always' and some want it set to 'never'. ColorArg string `yaml:"colorArg" jsonschema:"enum=always,enum=never"` + // The command to use for rendering diffs. This is either a stdinFilter or an external diff command, depending on the type field; not applicable if the type is 'rawGit'. // e.g. // diff-so-fancy // delta --dark --paging=never - // ydiff -p cat -s --wrap --width={{columnWidth}} - Pager PagerType `yaml:"pager"` - // e.g. 'difft --color=always' - ExternalDiffCommand string `yaml:"externalDiffCommand"` - // If true, Lazygit will use git's `diff.external` config for paging. The advantage over `externalDiffCommand` is that this can be configured per file type in .gitattributes; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver. - UseExternalDiffGitConfig bool `yaml:"useExternalDiffGitConfig"` + // ydiff -p cat + // difft --color=always + Command DiffRendererCommandType `yaml:"command"` + // Extra arguments (array of strings) passed to the git command. Only applicable if the type is 'rawGit'. + Args []string `yaml:"args"` } type CommitConfig struct { @@ -371,12 +413,12 @@ type LogConfig struct { // One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default' // 'topo-order' makes it easier to read the git log graph, but commits may not appear chronologically. See https://git-scm.com/docs/ // - // Can be changed from within Lazygit with `Log menu -> Commit sort order` (`` in the commits window by default). + // Can be changed from within Lazygit with `Log menu -> Commit sort order` (`` in the commits window by default). Order string `yaml:"order" jsonschema:"enum=date-order,enum=author-date-order,enum=topo-order,enum=default"` // This determines whether the git graph is rendered in the commits panel // One of 'always' | 'never' | 'when-maximised' // - // Can be toggled from within lazygit with `Log menu -> Show git graph` (`` in the commits window by default). + // Can be toggled from within lazygit with `Log menu -> Show git graph` (`` in the commits window by default). ShowGraph string `yaml:"showGraph" jsonschema:"enum=always,enum=never,enum=when-maximised"` // displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`) ShowWholeGraph bool `yaml:"showWholeGraph"` @@ -389,6 +431,13 @@ type CommitPrefixConfig struct { Replace string `yaml:"replace" jsonschema:"example=[$1]"` } +type WorktreeConfig struct { + // Default parent directory for new worktrees. It is offered as a candidate location alongside the parent directories of any worktrees you already have. + // A relative path is resolved against the repository's root directory, so "../worktrees" sits beside the repo and ".worktrees" sits inside it. + // A leading "~" is expanded to your home directory, so "~/worktrees" works. + DefaultPath string `yaml:"defaultPath"` +} + type UpdateConfig struct { // One of: 'prompt' (default) | 'background' | 'never' Method string `yaml:"method" jsonschema:"enum=prompt,enum=background,enum=never"` @@ -401,7 +450,6 @@ type KeybindingConfig struct { Status KeybindingStatusConfig `yaml:"status"` Files KeybindingFilesConfig `yaml:"files"` Branches KeybindingBranchesConfig `yaml:"branches"` - Worktrees KeybindingWorktreesConfig `yaml:"worktrees"` Commits KeybindingCommitsConfig `yaml:"commits"` AmendAttribute KeybindingAmendAttributeConfig `yaml:"amendAttribute"` Stash KeybindingStashConfig `yaml:"stash"` @@ -413,197 +461,218 @@ type KeybindingConfig struct { // damn looks like we have some inconsistencies here with -alt and -alt1 type KeybindingUniversalConfig struct { - Quit string `yaml:"quit"` - QuitAlt1 string `yaml:"quit-alt1"` - SuspendApp string `yaml:"suspendApp"` - Return string `yaml:"return"` - QuitWithoutChangingDirectory string `yaml:"quitWithoutChangingDirectory"` - TogglePanel string `yaml:"togglePanel"` - PrevItem string `yaml:"prevItem"` - NextItem string `yaml:"nextItem"` - PrevItemAlt string `yaml:"prevItem-alt"` - NextItemAlt string `yaml:"nextItem-alt"` - PrevPage string `yaml:"prevPage"` - NextPage string `yaml:"nextPage"` - ScrollLeft string `yaml:"scrollLeft"` - ScrollRight string `yaml:"scrollRight"` - GotoTop string `yaml:"gotoTop"` - GotoBottom string `yaml:"gotoBottom"` - GotoTopAlt string `yaml:"gotoTop-alt"` - GotoBottomAlt string `yaml:"gotoBottom-alt"` - ToggleRangeSelect string `yaml:"toggleRangeSelect"` - RangeSelectDown string `yaml:"rangeSelectDown"` - RangeSelectUp string `yaml:"rangeSelectUp"` - PrevBlock string `yaml:"prevBlock"` - NextBlock string `yaml:"nextBlock"` - PrevBlockAlt string `yaml:"prevBlock-alt"` - NextBlockAlt string `yaml:"nextBlock-alt"` - NextBlockAlt2 string `yaml:"nextBlock-alt2"` - PrevBlockAlt2 string `yaml:"prevBlock-alt2"` - JumpToBlock []string `yaml:"jumpToBlock"` - FocusMainView string `yaml:"focusMainView"` - NextMatch string `yaml:"nextMatch"` - PrevMatch string `yaml:"prevMatch"` - StartSearch string `yaml:"startSearch"` - OptionMenu string `yaml:"optionMenu"` - OptionMenuAlt1 string `yaml:"optionMenu-alt1"` - Select string `yaml:"select"` - GoInto string `yaml:"goInto"` - Confirm string `yaml:"confirm"` - ConfirmMenu string `yaml:"confirmMenu"` - ConfirmSuggestion string `yaml:"confirmSuggestion"` - ConfirmInEditor string `yaml:"confirmInEditor"` - ConfirmInEditorAlt string `yaml:"confirmInEditor-alt"` - Remove string `yaml:"remove"` - New string `yaml:"new"` - Edit string `yaml:"edit"` - OpenFile string `yaml:"openFile"` - ScrollUpMain string `yaml:"scrollUpMain"` - ScrollDownMain string `yaml:"scrollDownMain"` - ScrollUpMainAlt1 string `yaml:"scrollUpMain-alt1"` - ScrollDownMainAlt1 string `yaml:"scrollDownMain-alt1"` - ScrollUpMainAlt2 string `yaml:"scrollUpMain-alt2"` - ScrollDownMainAlt2 string `yaml:"scrollDownMain-alt2"` - ExecuteShellCommand string `yaml:"executeShellCommand"` - CreateRebaseOptionsMenu string `yaml:"createRebaseOptionsMenu"` - Push string `yaml:"pushFiles"` // 'Files' appended for legacy reasons - Pull string `yaml:"pullFiles"` // 'Files' appended for legacy reasons - Refresh string `yaml:"refresh"` - CreatePatchOptionsMenu string `yaml:"createPatchOptionsMenu"` - NextTab string `yaml:"nextTab"` - PrevTab string `yaml:"prevTab"` - NextScreenMode string `yaml:"nextScreenMode"` - PrevScreenMode string `yaml:"prevScreenMode"` - CyclePagers string `yaml:"cyclePagers"` - Undo string `yaml:"undo"` - Redo string `yaml:"redo"` - FilteringMenu string `yaml:"filteringMenu"` - DiffingMenu string `yaml:"diffingMenu"` - DiffingMenuAlt string `yaml:"diffingMenu-alt"` - CopyToClipboard string `yaml:"copyToClipboard"` - OpenRecentRepos string `yaml:"openRecentRepos"` - SubmitEditorText string `yaml:"submitEditorText"` - ExtrasMenu string `yaml:"extrasMenu"` - ToggleWhitespaceInDiffView string `yaml:"toggleWhitespaceInDiffView"` - IncreaseContextInDiffView string `yaml:"increaseContextInDiffView"` - DecreaseContextInDiffView string `yaml:"decreaseContextInDiffView"` - IncreaseRenameSimilarityThreshold string `yaml:"increaseRenameSimilarityThreshold"` - DecreaseRenameSimilarityThreshold string `yaml:"decreaseRenameSimilarityThreshold"` - OpenDiffTool string `yaml:"openDiffTool"` + Quit Keybinding `yaml:"quit"` + // Deprecated: add the key to `quit` instead. + QuitAlt1 Keybinding `yaml:"quit-alt1"` + SuspendApp Keybinding `yaml:"suspendApp"` + Return Keybinding `yaml:"return"` + QuitWithoutChangingDirectory Keybinding `yaml:"quitWithoutChangingDirectory"` + TogglePanel Keybinding `yaml:"togglePanel"` + PrevItem Keybinding `yaml:"prevItem"` + NextItem Keybinding `yaml:"nextItem"` + // Deprecated: add the key to `prevItem` instead. + PrevItemAlt Keybinding `yaml:"prevItem-alt"` + // Deprecated: add the key to `nextItem` instead. + NextItemAlt Keybinding `yaml:"nextItem-alt"` + PrevPage Keybinding `yaml:"prevPage"` + NextPage Keybinding `yaml:"nextPage"` + ScrollLeft Keybinding `yaml:"scrollLeft"` + ScrollRight Keybinding `yaml:"scrollRight"` + GotoTop Keybinding `yaml:"gotoTop"` + GotoBottom Keybinding `yaml:"gotoBottom"` + // Deprecated: add the key to `gotoTop` instead. + GotoTopAlt Keybinding `yaml:"gotoTop-alt"` + // Deprecated: add the key to `gotoBottom` instead. + GotoBottomAlt Keybinding `yaml:"gotoBottom-alt"` + ToggleRangeSelect Keybinding `yaml:"toggleRangeSelect"` + RangeSelectDown Keybinding `yaml:"rangeSelectDown"` + RangeSelectUp Keybinding `yaml:"rangeSelectUp"` + PrevBlock Keybinding `yaml:"prevBlock"` + NextBlock Keybinding `yaml:"nextBlock"` + // Deprecated: add the key to `prevBlock` instead. + PrevBlockAlt Keybinding `yaml:"prevBlock-alt"` + // Deprecated: add the key to `nextBlock` instead. + NextBlockAlt Keybinding `yaml:"nextBlock-alt"` + // Deprecated: add the key to `nextBlock` instead. + NextBlockAlt2 Keybinding `yaml:"nextBlock-alt2"` + // Deprecated: add the key to `prevBlock` instead. + PrevBlockAlt2 Keybinding `yaml:"prevBlock-alt2"` + JumpToBlock []Keybinding `yaml:"jumpToBlock"` + FocusMainView Keybinding `yaml:"focusMainView"` + NextMatch Keybinding `yaml:"nextMatch"` + PrevMatch Keybinding `yaml:"prevMatch"` + StartSearch Keybinding `yaml:"startSearch"` + MoveWordLeft Keybinding `yaml:"moveWordLeft"` // on Mac + MoveWordRight Keybinding `yaml:"moveWordRight"` // on Mac + BackspaceWord Keybinding `yaml:"backspaceWord"` // on Mac + ForwardDeleteWord Keybinding `yaml:"forwardDeleteWord"` // on Mac + OptionMenu Keybinding `yaml:"optionMenu"` + Select Keybinding `yaml:"select"` + GoInto Keybinding `yaml:"goInto"` + Confirm Keybinding `yaml:"confirm"` + ConfirmMenu Keybinding `yaml:"confirmMenu"` + ConfirmSuggestion Keybinding `yaml:"confirmSuggestion"` + ConfirmInEditor Keybinding `yaml:"confirmInEditor"` // on Mac + // Deprecated: add the key to `confirmInEditor` instead. + ConfirmInEditorAlt Keybinding `yaml:"confirmInEditor-alt"` + Remove Keybinding `yaml:"remove"` + New Keybinding `yaml:"new"` + NewWorktree Keybinding `yaml:"newWorktree"` + Edit Keybinding `yaml:"edit"` + OpenFile Keybinding `yaml:"openFile"` + ScrollUpMain Keybinding `yaml:"scrollUpMain"` + ScrollDownMain Keybinding `yaml:"scrollDownMain"` + // Deprecated: add the key to `scrollUpMain` instead. + ScrollUpMainAlt1 Keybinding `yaml:"scrollUpMain-alt1"` + // Deprecated: add the key to `scrollDownMain` instead. + ScrollDownMainAlt1 Keybinding `yaml:"scrollDownMain-alt1"` + // Deprecated: add the key to `scrollUpMain` instead. + ScrollUpMainAlt2 Keybinding `yaml:"scrollUpMain-alt2"` + // Deprecated: add the key to `scrollDownMain` instead. + ScrollDownMainAlt2 Keybinding `yaml:"scrollDownMain-alt2"` + ExecuteShellCommand Keybinding `yaml:"executeShellCommand"` + CreateRebaseOptionsMenu Keybinding `yaml:"createRebaseOptionsMenu"` + Push Keybinding `yaml:"pushFiles"` // 'Files' appended for legacy reasons + Pull Keybinding `yaml:"pullFiles"` // 'Files' appended for legacy reasons + Refresh Keybinding `yaml:"refresh"` + CreatePatchOptionsMenu Keybinding `yaml:"createPatchOptionsMenu"` + NextTab Keybinding `yaml:"nextTab"` + PrevTab Keybinding `yaml:"prevTab"` + NextScreenMode Keybinding `yaml:"nextScreenMode"` + PrevScreenMode Keybinding `yaml:"prevScreenMode"` + CycleDiffRenderers Keybinding `yaml:"cycleDiffRenderers"` + CycleDiffRenderersReverse Keybinding `yaml:"cycleDiffRenderersReverse"` + Undo Keybinding `yaml:"undo"` + Redo Keybinding `yaml:"redo"` + FilteringMenu Keybinding `yaml:"filteringMenu"` + DiffingMenu Keybinding `yaml:"diffingMenu"` + // Deprecated: add the key to `diffingMenu` instead. + DiffingMenuAlt Keybinding `yaml:"diffingMenu-alt"` + CopyToClipboard Keybinding `yaml:"copyToClipboard"` + OpenRecentRepos Keybinding `yaml:"openRecentRepos"` + SubmitEditorText Keybinding `yaml:"submitEditorText"` + ExtrasMenu Keybinding `yaml:"extrasMenu"` + ToggleWhitespaceInDiffView Keybinding `yaml:"toggleWhitespaceInDiffView"` + IncreaseContextInDiffView Keybinding `yaml:"increaseContextInDiffView"` + DecreaseContextInDiffView Keybinding `yaml:"decreaseContextInDiffView"` + IncreaseRenameSimilarityThreshold Keybinding `yaml:"increaseRenameSimilarityThreshold"` + DecreaseRenameSimilarityThreshold Keybinding `yaml:"decreaseRenameSimilarityThreshold"` + OpenDiffTool Keybinding `yaml:"openDiffTool"` + EditConfig Keybinding `yaml:"editConfig"` } type KeybindingStatusConfig struct { - CheckForUpdate string `yaml:"checkForUpdate"` - RecentRepos string `yaml:"recentRepos"` - AllBranchesLogGraph string `yaml:"allBranchesLogGraph"` - AllBranchesLogGraphReverse string `yaml:"allBranchesLogGraphReverse"` + CheckForUpdate Keybinding `yaml:"checkForUpdate"` + RecentRepos Keybinding `yaml:"recentRepos"` + AllBranchesLogGraph Keybinding `yaml:"allBranchesLogGraph"` + AllBranchesLogGraphReverse Keybinding `yaml:"allBranchesLogGraphReverse"` } type KeybindingFilesConfig struct { - CommitChanges string `yaml:"commitChanges"` - CommitChangesWithoutHook string `yaml:"commitChangesWithoutHook"` - AmendLastCommit string `yaml:"amendLastCommit"` - CommitChangesWithEditor string `yaml:"commitChangesWithEditor"` - FindBaseCommitForFixup string `yaml:"findBaseCommitForFixup"` - ConfirmDiscard string `yaml:"confirmDiscard"` - IgnoreFile string `yaml:"ignoreFile"` - RefreshFiles string `yaml:"refreshFiles"` - StashAllChanges string `yaml:"stashAllChanges"` - ViewStashOptions string `yaml:"viewStashOptions"` - ToggleStagedAll string `yaml:"toggleStagedAll"` - ViewResetOptions string `yaml:"viewResetOptions"` - Fetch string `yaml:"fetch"` - ToggleTreeView string `yaml:"toggleTreeView"` - OpenMergeOptions string `yaml:"openMergeOptions"` - OpenStatusFilter string `yaml:"openStatusFilter"` - CopyFileInfoToClipboard string `yaml:"copyFileInfoToClipboard"` - CollapseAll string `yaml:"collapseAll"` - ExpandAll string `yaml:"expandAll"` + CommitChanges Keybinding `yaml:"commitChanges"` + CommitChangesWithoutHook Keybinding `yaml:"commitChangesWithoutHook"` + AmendLastCommit Keybinding `yaml:"amendLastCommit"` + CommitChangesWithEditor Keybinding `yaml:"commitChangesWithEditor"` + FindBaseCommitForFixup Keybinding `yaml:"findBaseCommitForFixup"` + ConfirmDiscard Keybinding `yaml:"confirmDiscard"` + IgnoreFile Keybinding `yaml:"ignoreFile"` + RefreshFiles Keybinding `yaml:"refreshFiles"` + StashAllChanges Keybinding `yaml:"stashAllChanges"` + ViewStashOptions Keybinding `yaml:"viewStashOptions"` + ToggleStagedAll Keybinding `yaml:"toggleStagedAll"` + ViewResetOptions Keybinding `yaml:"viewResetOptions"` + Fetch Keybinding `yaml:"fetch"` + ToggleTreeView Keybinding `yaml:"toggleTreeView"` + OpenMergeOptions Keybinding `yaml:"openMergeOptions"` + OpenStatusFilter Keybinding `yaml:"openStatusFilter"` + CopyFileInfoToClipboard Keybinding `yaml:"copyFileInfoToClipboard"` + CollapseAll Keybinding `yaml:"collapseAll"` + ExpandAll Keybinding `yaml:"expandAll"` } type KeybindingBranchesConfig struct { - CreatePullRequest string `yaml:"createPullRequest"` - ViewPullRequestOptions string `yaml:"viewPullRequestOptions"` - CopyPullRequestURL string `yaml:"copyPullRequestURL"` - CheckoutBranchByName string `yaml:"checkoutBranchByName"` - ForceCheckoutBranch string `yaml:"forceCheckoutBranch"` - CheckoutPreviousBranch string `yaml:"checkoutPreviousBranch"` - RebaseBranch string `yaml:"rebaseBranch"` - RenameBranch string `yaml:"renameBranch"` - MergeIntoCurrentBranch string `yaml:"mergeIntoCurrentBranch"` - MoveCommitsToNewBranch string `yaml:"moveCommitsToNewBranch"` - ViewGitFlowOptions string `yaml:"viewGitFlowOptions"` - FastForward string `yaml:"fastForward"` - CreateTag string `yaml:"createTag"` - PushTag string `yaml:"pushTag"` - SetUpstream string `yaml:"setUpstream"` - FetchRemote string `yaml:"fetchRemote"` - AddForkRemote string `yaml:"addForkRemote"` - SortOrder string `yaml:"sortOrder"` -} - -type KeybindingWorktreesConfig struct { - ViewWorktreeOptions string `yaml:"viewWorktreeOptions"` + CreatePullRequest Keybinding `yaml:"createPullRequest"` + ViewPullRequestOptions Keybinding `yaml:"viewPullRequestOptions"` + OpenPullRequestInBrowser Keybinding `yaml:"openPullRequestInBrowser"` + CopyPullRequestURL Keybinding `yaml:"copyPullRequestURL"` + CheckoutBranchByName Keybinding `yaml:"checkoutBranchByName"` + ForceCheckoutBranch Keybinding `yaml:"forceCheckoutBranch"` + CheckoutPreviousBranch Keybinding `yaml:"checkoutPreviousBranch"` + RebaseBranch Keybinding `yaml:"rebaseBranch"` + RenameBranch Keybinding `yaml:"renameBranch"` + MergeIntoCurrentBranch Keybinding `yaml:"mergeIntoCurrentBranch"` + MoveCommitsToNewBranch Keybinding `yaml:"moveCommitsToNewBranch"` + ViewGitFlowOptions Keybinding `yaml:"viewGitFlowOptions"` + FastForward Keybinding `yaml:"fastForward"` + CreateTag Keybinding `yaml:"createTag"` + PushTag Keybinding `yaml:"pushTag"` + SetUpstream Keybinding `yaml:"setUpstream"` + FetchRemote Keybinding `yaml:"fetchRemote"` + AddForkRemote Keybinding `yaml:"addForkRemote"` + SortOrder Keybinding `yaml:"sortOrder"` } type KeybindingCommitsConfig struct { - SquashDown string `yaml:"squashDown"` - RenameCommit string `yaml:"renameCommit"` - RenameCommitWithEditor string `yaml:"renameCommitWithEditor"` - ViewResetOptions string `yaml:"viewResetOptions"` - MarkCommitAsFixup string `yaml:"markCommitAsFixup"` - SetFixupMessage string `yaml:"setFixupMessage"` - CreateFixupCommit string `yaml:"createFixupCommit"` - SquashAboveCommits string `yaml:"squashAboveCommits"` - MoveDownCommit string `yaml:"moveDownCommit"` - MoveUpCommit string `yaml:"moveUpCommit"` - AmendToCommit string `yaml:"amendToCommit"` - ResetCommitAuthor string `yaml:"resetCommitAuthor"` - PickCommit string `yaml:"pickCommit"` - RevertCommit string `yaml:"revertCommit"` - CherryPickCopy string `yaml:"cherryPickCopy"` - PasteCommits string `yaml:"pasteCommits"` - MarkCommitAsBaseForRebase string `yaml:"markCommitAsBaseForRebase"` - CreateTag string `yaml:"tagCommit"` - CheckoutCommit string `yaml:"checkoutCommit"` - ResetCherryPick string `yaml:"resetCherryPick"` - CopyCommitAttributeToClipboard string `yaml:"copyCommitAttributeToClipboard"` - OpenLogMenu string `yaml:"openLogMenu"` - OpenInBrowser string `yaml:"openInBrowser"` - ViewBisectOptions string `yaml:"viewBisectOptions"` - StartInteractiveRebase string `yaml:"startInteractiveRebase"` - SelectCommitsOfCurrentBranch string `yaml:"selectCommitsOfCurrentBranch"` + SquashDown Keybinding `yaml:"squashDown"` + RenameCommit Keybinding `yaml:"renameCommit"` + RenameCommitWithEditor Keybinding `yaml:"renameCommitWithEditor"` + ViewResetOptions Keybinding `yaml:"viewResetOptions"` + MarkCommitAsFixup Keybinding `yaml:"markCommitAsFixup"` + SetFixupMessage Keybinding `yaml:"setFixupMessage"` + CreateFixupCommit Keybinding `yaml:"createFixupCommit"` + SquashAboveCommits Keybinding `yaml:"squashAboveCommits"` + MoveDownCommit Keybinding `yaml:"moveDownCommit"` + MoveUpCommit Keybinding `yaml:"moveUpCommit"` + AmendToCommit Keybinding `yaml:"amendToCommit"` + ResetCommitAuthor Keybinding `yaml:"resetCommitAuthor"` + PickCommit Keybinding `yaml:"pickCommit"` + RevertCommit Keybinding `yaml:"revertCommit"` + CherryPickCopy Keybinding `yaml:"cherryPickCopy"` + PasteCommits Keybinding `yaml:"pasteCommits"` + MarkCommitAsBaseForRebase Keybinding `yaml:"markCommitAsBaseForRebase"` + CreateTag Keybinding `yaml:"tagCommit"` + CheckoutCommit Keybinding `yaml:"checkoutCommit"` + ResetCherryPick Keybinding `yaml:"resetCherryPick"` + CopyCommitAttributeToClipboard Keybinding `yaml:"copyCommitAttributeToClipboard"` + OpenLogMenu Keybinding `yaml:"openLogMenu"` + OpenInBrowser Keybinding `yaml:"openInBrowser"` + OpenPullRequestInBrowser Keybinding `yaml:"openPullRequestInBrowser"` + ViewBisectOptions Keybinding `yaml:"viewBisectOptions"` + StartInteractiveRebase Keybinding `yaml:"startInteractiveRebase"` + SelectCommitsOfCurrentBranch Keybinding `yaml:"selectCommitsOfCurrentBranch"` } type KeybindingAmendAttributeConfig struct { - ResetAuthor string `yaml:"resetAuthor"` - SetAuthor string `yaml:"setAuthor"` - AddCoAuthor string `yaml:"addCoAuthor"` + ResetAuthor Keybinding `yaml:"resetAuthor"` + SetAuthor Keybinding `yaml:"setAuthor"` + AddCoAuthor Keybinding `yaml:"addCoAuthor"` } type KeybindingStashConfig struct { - PopStash string `yaml:"popStash"` - RenameStash string `yaml:"renameStash"` + PopStash Keybinding `yaml:"popStash"` + RenameStash Keybinding `yaml:"renameStash"` } type KeybindingCommitFilesConfig struct { - CheckoutCommitFile string `yaml:"checkoutCommitFile"` + CheckoutCommitFile Keybinding `yaml:"checkoutCommitFile"` } type KeybindingMainConfig struct { - ToggleSelectHunk string `yaml:"toggleSelectHunk"` - PickBothHunks string `yaml:"pickBothHunks"` - EditSelectHunk string `yaml:"editSelectHunk"` + PrevHunk Keybinding `yaml:"prevHunk"` + NextHunk Keybinding `yaml:"nextHunk"` + ToggleSelectHunk Keybinding `yaml:"toggleSelectHunk"` + PickBothHunks Keybinding `yaml:"pickBothHunks"` + EditSelectHunk Keybinding `yaml:"editSelectHunk"` } type KeybindingSubmodulesConfig struct { - Init string `yaml:"init"` - Update string `yaml:"update"` - BulkMenu string `yaml:"bulkMenu"` + Init Keybinding `yaml:"init"` + Update Keybinding `yaml:"update"` + BulkMenu Keybinding `yaml:"bulkMenu"` } type KeybindingCommitMessageConfig struct { - CommitMenu string `yaml:"commitMenu"` + CommitMenu Keybinding `yaml:"commitMenu"` } // OSConfig contains config on the level of the os @@ -652,8 +721,8 @@ type CustomCommandAfterHook struct { } type CustomCommand struct { - // The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md - Key string `yaml:"key"` + // The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md. To bind several alternates to the same command, use a sequence (e.g. `[a, b]`). + Key Keybinding `yaml:"key"` // Instead of defining a single custom command, create a menu of custom commands. Useful for grouping related commands together under a single keybinding, and for keeping them out of the global keybindings menu. // When using this, all other fields except Key and Description are ignored and must be empty. CommandMenu []CustomCommand `yaml:"commandMenu"` @@ -719,6 +788,9 @@ type CustomCommandPrompt struct { // Like valueFormat but for the labels. If `labelFormat` is not specified, `valueFormat` is shown instead. // Only for menuFromCommand prompts. LabelFormat string `yaml:"labelFormat" jsonschema:"example={{ .branch | green }}"` + + // A Go template expression evaluated against the current form state. If it resolves to empty string or 'false', the prompt is skipped. + Condition string `yaml:"condition" jsonschema:"example={{ eq .Form.Choice \"yes\" }}"` } type CustomCommandSuggestions struct { @@ -735,8 +807,8 @@ type CustomCommandMenuOption struct { Description string `yaml:"description"` // The value that will be used in the command Value string `yaml:"value" jsonschema:"example=feature,minLength=1"` - // Keybinding to invoke this menu option without needing to navigate to it - Key string `yaml:"key"` + // Keybinding to invoke this menu option without needing to navigate to it. Accepts either a single key or a sequence of alternates. + Key Keybinding `yaml:"key"` } type CustomIconsConfig struct { @@ -751,21 +823,57 @@ type IconProperties struct { Color string `yaml:"color"` } +// MergeLegacyAltKeybindings folds deprecated `*Alt*` fields into their +// corresponding multi-key main field. New code should treat the main field +// as the single source of truth; the alt fields will be removed in a future +// release. +func (c *KeybindingConfig) MergeLegacyAltKeybindings() { + mergeLegacyAlt(&c.Universal.Quit, c.Universal.QuitAlt1) + mergeLegacyAlt(&c.Universal.PrevItem, c.Universal.PrevItemAlt) + mergeLegacyAlt(&c.Universal.NextItem, c.Universal.NextItemAlt) + mergeLegacyAlt(&c.Universal.GotoTop, c.Universal.GotoTopAlt) + mergeLegacyAlt(&c.Universal.GotoBottom, c.Universal.GotoBottomAlt) + mergeLegacyAlt(&c.Universal.PrevBlock, c.Universal.PrevBlockAlt) + mergeLegacyAlt(&c.Universal.NextBlock, c.Universal.NextBlockAlt) + mergeLegacyAlt(&c.Universal.PrevBlock, c.Universal.PrevBlockAlt2) + mergeLegacyAlt(&c.Universal.NextBlock, c.Universal.NextBlockAlt2) + mergeLegacyAlt(&c.Universal.ConfirmInEditor, c.Universal.ConfirmInEditorAlt) + mergeLegacyAlt(&c.Universal.ScrollUpMain, c.Universal.ScrollUpMainAlt1) + mergeLegacyAlt(&c.Universal.ScrollUpMain, c.Universal.ScrollUpMainAlt2) + mergeLegacyAlt(&c.Universal.ScrollDownMain, c.Universal.ScrollDownMainAlt1) + mergeLegacyAlt(&c.Universal.ScrollDownMain, c.Universal.ScrollDownMainAlt2) + mergeLegacyAlt(&c.Universal.DiffingMenu, c.Universal.DiffingMenuAlt) +} + func GetDefaultConfig() *UserConfig { + // This is only for tests; we don't want to use the test runner's host platform in that case, + // but always use the fallback bindings + return GetDefaultConfigForPlatform("") +} + +func GetDefaultConfigForPlatform(platform string) *UserConfig { return &UserConfig{ Gui: GuiConfig{ - ScrollHeight: 2, - ScrollPastBottom: true, - ScrollOffMargin: 2, - ScrollOffBehavior: "margin", - TabWidth: 4, - MouseEvents: true, - SkipAmendWarning: false, - SkipDiscardChangeWarning: false, - SkipStashWarning: false, - SidePanelWidth: 0.3333, - ExpandFocusedSidePanel: false, - ExpandedSidePanelWeight: 2, + ScrollHeight: 2, + ScrollPastBottom: true, + ScrollOffMargin: 2, + ScrollOffBehavior: "margin", + TabWidth: 4, + MouseEvents: true, + SkipAmendWarning: false, + SkipDiscardChangeWarning: false, + SkipStashWarning: false, + SidePanelWidth: 0.3333, + ExpandFocusedSidePanel: false, + ExpandedSidePanelWeight: 2, + ShrinkSidePanelsToContent: false, + SidePanels: []SidePanel{ + {"status"}, + {"files", "worktrees", "submodules"}, + {"branches", "remotes", "tags"}, + {"commits", "reflog"}, + {"stash"}, + }, MainPanelSplitMode: "flexible", EnlargedSideViewLocation: "left", WrapLinesInStagingView: true, @@ -795,6 +903,8 @@ func GetDefaultConfig() *UserConfig { ShowPanelJumps: true, ShowFileTree: true, ShowRootItemInFileTree: true, + FileTreeSortOrder: "mixed", + FileTreeSortCaseSensitive: true, ShowNumstatInFilesView: false, ShowRandomTip: true, ShowIcons: false, @@ -813,10 +923,12 @@ func GetDefaultConfig() *UserConfig { Border: "rounded", AnimateExplosion: true, PortraitMode: "auto", + PortraitModeAutoMaxWidth: 84, + PortraitModeAutoMinHeight: 46, FilterMode: "substring", Spinner: SpinnerConfig{ - Frames: []string{"|", "/", "-", "\\"}, - Rate: 50, + Frames: []string{"●∙∙", "∙●∙", "∙∙●", "∙●∙"}, + Rate: 180, }, StatusPanelView: "dashboard", SwitchToFilesAfterStashPop: true, @@ -845,6 +957,7 @@ func GetDefaultConfig() *UserConfig { MainBranches: []string{"master", "main"}, AutoFetch: true, AutoRefresh: true, + AutoDetectExternalChanges: true, AutoForwardBranches: "onlyMainBranches", FetchAll: true, AutoStageResolvedConflicts: true, @@ -859,9 +972,13 @@ func GetDefaultConfig() *UserConfig { ParseEmoji: false, TruncateCopiedCommitHashesTo: 12, }, + Worktree: WorktreeConfig{ + DefaultPath: "", + }, Refresher: RefresherConfig{ - RefreshInterval: 10, - FetchInterval: 60, + RefreshInterval: 10, + FetchInterval: 60, + ExternalChangeCheckInterval: 2, }, Update: UpdateConfig{ Method: "prompt", @@ -877,187 +994,201 @@ func GetDefaultConfig() *UserConfig { PromptToReturnFromSubprocess: true, Keybinding: KeybindingConfig{ Universal: KeybindingUniversalConfig{ - Quit: "q", - QuitAlt1: "", - SuspendApp: "", - Return: "", - QuitWithoutChangingDirectory: "Q", - TogglePanel: "", - PrevItem: "", - NextItem: "", - PrevItemAlt: "k", - NextItemAlt: "j", - PrevPage: ",", - NextPage: ".", - ScrollLeft: "H", - ScrollRight: "L", - GotoTop: "<", - GotoBottom: ">", - GotoTopAlt: "", - GotoBottomAlt: "", - ToggleRangeSelect: "v", - RangeSelectDown: "", - RangeSelectUp: "", - PrevBlock: "", - NextBlock: "", - PrevBlockAlt: "h", - NextBlockAlt: "l", - PrevBlockAlt2: "", - NextBlockAlt2: "", - JumpToBlock: []string{"1", "2", "3", "4", "5"}, - FocusMainView: "0", - NextMatch: "n", - PrevMatch: "N", - StartSearch: "/", - OptionMenu: "", - OptionMenuAlt1: "?", - Select: "", - GoInto: "", - Confirm: "", - ConfirmMenu: "", - ConfirmSuggestion: "", - ConfirmInEditor: "", - ConfirmInEditorAlt: "", - Remove: "d", - New: "n", - Edit: "e", - OpenFile: "o", - OpenRecentRepos: "", - ScrollUpMain: "", - ScrollDownMain: "", - ScrollUpMainAlt1: "K", - ScrollDownMainAlt1: "J", - ScrollUpMainAlt2: "", - ScrollDownMainAlt2: "", - ExecuteShellCommand: ":", - CreateRebaseOptionsMenu: "m", - Push: "P", - Pull: "p", - Refresh: "R", - CreatePatchOptionsMenu: "", - NextTab: "]", - PrevTab: "[", - NextScreenMode: "+", - PrevScreenMode: "_", - CyclePagers: "|", - Undo: "z", - Redo: "Z", - FilteringMenu: "", - DiffingMenu: "W", - DiffingMenuAlt: "", - CopyToClipboard: "", - SubmitEditorText: "", - ExtrasMenu: "@", - ToggleWhitespaceInDiffView: "", - IncreaseContextInDiffView: "}", - DecreaseContextInDiffView: "{", - IncreaseRenameSimilarityThreshold: ")", - DecreaseRenameSimilarityThreshold: "(", - OpenDiffTool: "", + Quit: Keybinding{"q"}, + QuitAlt1: Keybinding{""}, + SuspendApp: Keybinding{""}, + Return: Keybinding{""}, + QuitWithoutChangingDirectory: Keybinding{"Q"}, + TogglePanel: Keybinding{""}, + PrevItem: Keybinding{""}, + NextItem: Keybinding{""}, + PrevItemAlt: Keybinding{"k"}, + NextItemAlt: Keybinding{"j"}, + PrevPage: Keybinding{","}, + NextPage: Keybinding{"."}, + ScrollLeft: Keybinding{"H"}, + ScrollRight: Keybinding{"L"}, + GotoTop: Keybinding{"<"}, + GotoBottom: Keybinding{">"}, + GotoTopAlt: Keybinding{""}, + GotoBottomAlt: Keybinding{""}, + ToggleRangeSelect: Keybinding{"v"}, + RangeSelectDown: Keybinding{""}, + RangeSelectUp: Keybinding{""}, + PrevBlock: Keybinding{""}, + NextBlock: Keybinding{""}, + PrevBlockAlt: Keybinding{"h"}, + NextBlockAlt: Keybinding{"l"}, + PrevBlockAlt2: Keybinding{""}, + NextBlockAlt2: Keybinding{""}, + JumpToBlock: []Keybinding{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}}, + FocusMainView: Keybinding{"0"}, + NextMatch: Keybinding{"n"}, + PrevMatch: Keybinding{"N"}, + StartSearch: Keybinding{"/"}, + MoveWordLeft: Keybinding{platformKeyBinding(platform, map[string]string{"darwin": ""}, "")}, + MoveWordRight: Keybinding{platformKeyBinding(platform, map[string]string{"darwin": ""}, "")}, + BackspaceWord: Keybinding{platformKeyBinding(platform, map[string]string{"darwin": ""}, "")}, + ForwardDeleteWord: Keybinding{platformKeyBinding(platform, map[string]string{"darwin": ""}, "")}, + OptionMenu: Keybinding{"?"}, + Select: Keybinding{""}, + GoInto: Keybinding{""}, + Confirm: Keybinding{""}, + ConfirmMenu: Keybinding{""}, + ConfirmSuggestion: Keybinding{""}, + ConfirmInEditor: Keybinding{platformKeyBinding(platform, map[string]string{"darwin": ""}, "")}, + ConfirmInEditorAlt: Keybinding{""}, + Remove: Keybinding{"d"}, + New: Keybinding{"n"}, + NewWorktree: Keybinding{"w"}, + Edit: Keybinding{"e"}, + OpenFile: Keybinding{"o"}, + OpenRecentRepos: Keybinding{""}, + ScrollUpMain: Keybinding{""}, + ScrollDownMain: Keybinding{""}, + ScrollUpMainAlt1: Keybinding{"K"}, + ScrollDownMainAlt1: Keybinding{"J"}, + ScrollUpMainAlt2: Keybinding{""}, + ScrollDownMainAlt2: Keybinding{""}, + ExecuteShellCommand: Keybinding{":"}, + CreateRebaseOptionsMenu: Keybinding{"m"}, + Push: Keybinding{"P"}, + Pull: Keybinding{"p"}, + Refresh: Keybinding{"R"}, + CreatePatchOptionsMenu: Keybinding{""}, + NextTab: Keybinding{"]"}, + PrevTab: Keybinding{"["}, + NextScreenMode: Keybinding{"+"}, + PrevScreenMode: Keybinding{"_"}, + CycleDiffRenderers: Keybinding{"|"}, + CycleDiffRenderersReverse: Keybinding{"\\"}, + Undo: Keybinding{"z"}, + Redo: Keybinding{"Z"}, + FilteringMenu: Keybinding{""}, + DiffingMenu: Keybinding{"W"}, + DiffingMenuAlt: Keybinding{""}, + CopyToClipboard: Keybinding{""}, + SubmitEditorText: Keybinding{""}, + ExtrasMenu: Keybinding{"@"}, + ToggleWhitespaceInDiffView: Keybinding{""}, + IncreaseContextInDiffView: Keybinding{"}"}, + DecreaseContextInDiffView: Keybinding{"{"}, + IncreaseRenameSimilarityThreshold: Keybinding{")"}, + DecreaseRenameSimilarityThreshold: Keybinding{"("}, + OpenDiffTool: Keybinding{""}, + EditConfig: Keybinding{""}, }, Status: KeybindingStatusConfig{ - CheckForUpdate: "u", - RecentRepos: "", - AllBranchesLogGraph: "a", - AllBranchesLogGraphReverse: "A", + CheckForUpdate: Keybinding{"u"}, + RecentRepos: Keybinding{""}, + AllBranchesLogGraph: Keybinding{"a"}, + AllBranchesLogGraphReverse: Keybinding{"A"}, }, Files: KeybindingFilesConfig{ - CommitChanges: "c", - CommitChangesWithoutHook: "w", - AmendLastCommit: "A", - CommitChangesWithEditor: "C", - FindBaseCommitForFixup: "", - IgnoreFile: "i", - RefreshFiles: "r", - StashAllChanges: "s", - ViewStashOptions: "S", - ToggleStagedAll: "a", - ViewResetOptions: "D", - Fetch: "f", - ToggleTreeView: "`", - OpenMergeOptions: "M", - OpenStatusFilter: "", - ConfirmDiscard: "x", - CopyFileInfoToClipboard: "y", - CollapseAll: "-", - ExpandAll: "=", + CommitChanges: Keybinding{"c"}, + CommitChangesWithoutHook: Keybinding{"w"}, + AmendLastCommit: Keybinding{"A"}, + CommitChangesWithEditor: Keybinding{"C"}, + FindBaseCommitForFixup: Keybinding{""}, + IgnoreFile: Keybinding{"i"}, + RefreshFiles: Keybinding{"r"}, + StashAllChanges: Keybinding{"s"}, + ViewStashOptions: Keybinding{"S"}, + ToggleStagedAll: Keybinding{"a"}, + ViewResetOptions: Keybinding{"D"}, + Fetch: Keybinding{"f"}, + ToggleTreeView: Keybinding{"`"}, + OpenMergeOptions: Keybinding{"M"}, + OpenStatusFilter: Keybinding{""}, + ConfirmDiscard: Keybinding{"x"}, + CopyFileInfoToClipboard: Keybinding{"y"}, + CollapseAll: Keybinding{"-"}, + ExpandAll: Keybinding{"="}, }, Branches: KeybindingBranchesConfig{ - CopyPullRequestURL: "", - CreatePullRequest: "o", - ViewPullRequestOptions: "O", - CheckoutBranchByName: "c", - ForceCheckoutBranch: "F", - CheckoutPreviousBranch: "-", - RebaseBranch: "r", - RenameBranch: "R", - MergeIntoCurrentBranch: "M", - MoveCommitsToNewBranch: "N", - ViewGitFlowOptions: "i", - FastForward: "f", - CreateTag: "T", - PushTag: "P", - SetUpstream: "u", - FetchRemote: "f", - AddForkRemote: "F", - SortOrder: "s", - }, - Worktrees: KeybindingWorktreesConfig{ - ViewWorktreeOptions: "w", + CopyPullRequestURL: Keybinding{""}, + CreatePullRequest: Keybinding{"o"}, + ViewPullRequestOptions: Keybinding{"O"}, + OpenPullRequestInBrowser: Keybinding{"G"}, + CheckoutBranchByName: Keybinding{"c"}, + ForceCheckoutBranch: Keybinding{"F"}, + CheckoutPreviousBranch: Keybinding{"-"}, + RebaseBranch: Keybinding{"r"}, + RenameBranch: Keybinding{"R"}, + MergeIntoCurrentBranch: Keybinding{"M"}, + MoveCommitsToNewBranch: Keybinding{"N"}, + ViewGitFlowOptions: Keybinding{"i"}, + FastForward: Keybinding{"f"}, + CreateTag: Keybinding{"T"}, + PushTag: Keybinding{"P"}, + SetUpstream: Keybinding{"u"}, + FetchRemote: Keybinding{"f"}, + AddForkRemote: Keybinding{"F"}, + SortOrder: Keybinding{"s"}, }, Commits: KeybindingCommitsConfig{ - SquashDown: "s", - RenameCommit: "r", - RenameCommitWithEditor: "R", - ViewResetOptions: "g", - MarkCommitAsFixup: "f", - SetFixupMessage: "c", - CreateFixupCommit: "F", - SquashAboveCommits: "S", - MoveDownCommit: "", - MoveUpCommit: "", - AmendToCommit: "A", - ResetCommitAuthor: "a", - PickCommit: "p", - RevertCommit: "t", - CherryPickCopy: "C", - PasteCommits: "V", - MarkCommitAsBaseForRebase: "B", - CreateTag: "T", - CheckoutCommit: "", - ResetCherryPick: "", - CopyCommitAttributeToClipboard: "y", - OpenLogMenu: "", - OpenInBrowser: "o", - ViewBisectOptions: "b", - StartInteractiveRebase: "i", - SelectCommitsOfCurrentBranch: "*", + SquashDown: Keybinding{"s"}, + RenameCommit: Keybinding{"r"}, + RenameCommitWithEditor: Keybinding{"R"}, + ViewResetOptions: Keybinding{"g"}, + MarkCommitAsFixup: Keybinding{"f"}, + SetFixupMessage: Keybinding{"c"}, + CreateFixupCommit: Keybinding{"F"}, + SquashAboveCommits: Keybinding{"S"}, + MoveDownCommit: Keybinding{"", ""}, + MoveUpCommit: Keybinding{"", ""}, + AmendToCommit: Keybinding{"A"}, + ResetCommitAuthor: Keybinding{"a"}, + PickCommit: Keybinding{"p"}, + RevertCommit: Keybinding{"t"}, + CherryPickCopy: Keybinding{"C"}, + PasteCommits: Keybinding{"V"}, + MarkCommitAsBaseForRebase: Keybinding{"B"}, + CreateTag: Keybinding{"T"}, + CheckoutCommit: Keybinding{""}, + ResetCherryPick: Keybinding{""}, + CopyCommitAttributeToClipboard: Keybinding{"y"}, + OpenLogMenu: Keybinding{""}, + OpenInBrowser: Keybinding{"o"}, + OpenPullRequestInBrowser: Keybinding{"G"}, + ViewBisectOptions: Keybinding{"b"}, + StartInteractiveRebase: Keybinding{"i"}, + SelectCommitsOfCurrentBranch: Keybinding{"*"}, }, AmendAttribute: KeybindingAmendAttributeConfig{ - ResetAuthor: "a", - SetAuthor: "A", - AddCoAuthor: "c", + ResetAuthor: Keybinding{"a"}, + SetAuthor: Keybinding{"A"}, + AddCoAuthor: Keybinding{"c"}, }, Stash: KeybindingStashConfig{ - PopStash: "g", - RenameStash: "r", + PopStash: Keybinding{"g"}, + RenameStash: Keybinding{"r"}, }, CommitFiles: KeybindingCommitFilesConfig{ - CheckoutCommitFile: "c", + CheckoutCommitFile: Keybinding{"c"}, }, Main: KeybindingMainConfig{ - ToggleSelectHunk: "a", - PickBothHunks: "b", - EditSelectHunk: "E", + PrevHunk: Keybinding{"", "h"}, + NextHunk: Keybinding{"", "l"}, + ToggleSelectHunk: Keybinding{"a"}, + PickBothHunks: Keybinding{"b"}, + EditSelectHunk: Keybinding{"E"}, }, Submodules: KeybindingSubmodulesConfig{ - Init: "i", - Update: "u", - BulkMenu: "b", + Init: Keybinding{"i"}, + Update: Keybinding{"u"}, + BulkMenu: Keybinding{"b"}, }, CommitMessage: KeybindingCommitMessageConfig{ - CommitMenu: "", + CommitMenu: Keybinding{""}, }, }, } } + +func platformKeyBinding(platform string, bindingByPlatform map[string]string, fallback string) string { + if binding, ok := bindingByPlatform[platform]; ok { + return binding + } + return fallback +} diff --git a/pkg/config/user_config_validation.go b/pkg/config/user_config_validation.go index 16be84521..3f836a21b 100644 --- a/pkg/config/user_config_validation.go +++ b/pkg/config/user_config_validation.go @@ -1,6 +1,7 @@ package config import ( + "errors" "fmt" "log" "reflect" @@ -8,6 +9,8 @@ import ( "strings" "github.com/jesseduffield/lazygit/pkg/constants" + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" ) func (config *UserConfig) Validate() error { @@ -19,6 +22,10 @@ func (config *UserConfig) Validate() error { []string{"none", "onlyArrow", "arrowAndNumber"}); err != nil { return err } + if err := validateEnum("gui.fileTreeSortOrder", config.Gui.FileTreeSortOrder, + []string{"mixed", "filesFirst", "foldersFirst"}); err != nil { + return err + } if err := validateEnum("git.autoForwardBranches", config.Git.AutoForwardBranches, []string{"none", "onlyMainBranches", "allBranches"}); err != nil { return err @@ -39,12 +46,92 @@ func (config *UserConfig) Validate() error { []string{"always", "never", "when-maximised"}); err != nil { return err } + if err := validateDiffRenderers(config.Git.DiffRenderers); err != nil { + return err + } if err := validateKeybindings(config.Keybinding); err != nil { return err } if err := validateCustomCommands(config.CustomCommands); err != nil { return err } + if err := validateSpinner(config.Gui.Spinner); err != nil { + return err + } + if err := validateSidePanels(config.Gui.SidePanels); err != nil { + return err + } + return nil +} + +func validateSidePanels(panels []SidePanel) error { + seen := map[string]bool{} + total := 0 + for _, panel := range panels { + if len(panel) == 0 { + return errors.New("gui.sidePanels: a side panel must have at least one tab.") + } + for _, name := range panel { + if !slices.Contains(ValidSidePanelTabs, name) { + return fmt.Errorf("gui.sidePanels: unknown side panel '%s'. Allowed values: %s", + name, strings.Join(ValidSidePanelTabs, ", ")) + } + if seen[name] { + return fmt.Errorf("gui.sidePanels: '%s' is listed more than once; each side panel may appear only once.", name) + } + seen[name] = true + total++ + } + } + if total == 0 { + return errors.New("gui.sidePanels must not be empty.") + } + // A lot of code focuses these panels directly (e.g. after resolving a + // conflict or popping a stash), so they must always be present; otherwise + // that code would focus a hidden panel. + for _, required := range []string{"files", "branches", "commits"} { + if !seen[required] { + return fmt.Errorf("gui.sidePanels: '%s' must be included; it can't be hidden.", required) + } + } + return nil +} + +func validateSpinner(spinner SpinnerConfig) error { + if len(spinner.Frames) == 0 { + return errors.New("gui.spinner.frames must not be empty.") + } + firstWidth := utils.StringWidth(spinner.Frames[0]) + if lo.SomeBy(spinner.Frames, func(frame string) bool { + return utils.StringWidth(frame) != firstWidth + }) { + return errors.New("All gui.spinner.frames entries must have the same width.") + } + return nil +} + +func validateDiffRenderers(diffRenderers []DiffRendererConfig) error { + for _, diffRenderer := range diffRenderers { + switch diffRenderer.Type { + case "stdinFilter", "": + if diffRenderer.Command == "" { + return errors.New("git.diffRenderers: 'command' must be specified for diff renderer type 'stdinFilter'.") + } + if len(diffRenderer.Args) > 0 { + return errors.New("git.diffRenderers: 'args' cannot be used with diff renderer type 'stdinFilter'.") + } + case "extDiff": + if len(diffRenderer.Args) > 0 { + return errors.New("git.diffRenderers: 'args' cannot be used with diff renderer type 'extDiff'.") + } + case "rawGit": + if diffRenderer.Command != "" { + return errors.New("git.diffRenderers: 'command' cannot be used with diff renderer type 'rawGit'.") + } + default: + return fmt.Errorf("git.diffRenderers: unknown type '%s'. Allowed values: stdinFilter, extDiff, rawGit", diffRenderer.Type) + } + } return nil } @@ -91,22 +178,60 @@ func validateKeybindingsRecurse(path string, node any) error { } func validateKeybindings(keybindingConfig KeybindingConfig) error { - if err := validateKeybindingsRecurse("", keybindingConfig); err != nil { - return err - } + return validateKeybindingsRecurse("", keybindingConfig) +} - if len(keybindingConfig.Universal.JumpToBlock) != 5 { - return fmt.Errorf("keybinding.universal.jumpToBlock must have 5 elements; found %d.", - len(keybindingConfig.Universal.JumpToBlock)) +func validateCustomCommandKey(key Keybinding) error { + for _, k := range key { + if !isValidKeybindingKey(k) { + return fmt.Errorf("Unrecognized key '%s' for custom command. For permitted values see %s", + k, constants.Links.Docs.CustomKeybindings) + } } - return nil } -func validateCustomCommandKey(key string) error { - if !isValidKeybindingKey(key) { - return fmt.Errorf("Unrecognized key '%s' for custom command. For permitted values see %s", - key, constants.Links.Docs.CustomKeybindings) +// ValidCustomCommandContexts lists the names a custom command's 'context' may +// use. It mirrors context.AllContextKeys in the gui package, which this package +// can't import; a test over there keeps the two in sync. +var ValidCustomCommandContexts = []string{ + "global", + "status", + "files", + "localBranches", + "remotes", + "worktrees", + "remoteBranches", + "tags", + "commits", + "reflogCommits", + "subCommits", + "commitFiles", + "stash", + "normal", + "normalSecondary", + "staging", + "stagingSecondary", + "patchBuilding", + "patchBuildingSecondary", + "mergeConflicts", + "menu", + "confirmation", + "prompt", + "search", + "commitMessage", + "submodules", + "suggestions", + "cmdLog", +} + +func validateCustomCommandContext(context string) error { + for _, name := range strings.Split(context, ",") { + name = strings.TrimSpace(name) + if !slices.Contains(ValidCustomCommandContexts, name) { + return fmt.Errorf("Unknown context '%s' for custom command. Allowed values: %s", + name, strings.Join(ValidCustomCommandContexts, ", ")) + } } return nil } @@ -127,7 +252,7 @@ func validateCustomCommands(customCommands []CustomCommand) error { customCommand.After != nil { commandRef := "" if len(customCommand.Key) > 0 { - commandRef = fmt.Sprintf(" with key '%s'", customCommand.Key) + commandRef = fmt.Sprintf(" with key '%s'", customCommand.Key.String()) } return fmt.Errorf("Error with custom command%s: it is not allowed to use both commandMenu and any of the other fields except key and description.", commandRef) } @@ -136,6 +261,15 @@ func validateCustomCommands(customCommands []CustomCommand) error { return err } } else { + // A command in a menu may leave the context out, in which case it is + // offered whatever is focused; a top-level one may not, but that is + // only noticed when the keybindings are built. + if customCommand.Context != "" { + if err := validateCustomCommandContext(customCommand.Context); err != nil { + return err + } + } + for _, prompt := range customCommand.Prompts { if err := validateCustomCommandPrompt(prompt); err != nil { return err @@ -153,9 +287,11 @@ func validateCustomCommands(customCommands []CustomCommand) error { func validateCustomCommandPrompt(prompt CustomCommandPrompt) error { for _, option := range prompt.Options { - if !isValidKeybindingKey(option.Key) { - return fmt.Errorf("Unrecognized key '%s' for custom command prompt option. For permitted values see %s", - option.Key, constants.Links.Docs.CustomKeybindings) + for _, k := range option.Key { + if !isValidKeybindingKey(k) { + return fmt.Errorf("Unrecognized key '%s' for custom command prompt option. For permitted values see %s", + k, constants.Links.Docs.CustomKeybindings) + } } } diff --git a/pkg/config/user_config_validation_test.go b/pkg/config/user_config_validation_test.go index 7fbfd00d4..7977e3e4c 100644 --- a/pkg/config/user_config_validation_test.go +++ b/pkg/config/user_config_validation_test.go @@ -4,6 +4,7 @@ import ( "strings" "testing" + "github.com/samber/lo" "github.com/stretchr/testify/assert" ) @@ -114,7 +115,7 @@ func TestUserConfigValidate_enums(t *testing.T) { { name: "Keybindings", setup: func(config *UserConfig, value string) { - config.Keybinding.Universal.Quit = value + config.Keybinding.Universal.Quit = Keybinding{value} }, testCases: []testCase{ {value: "", valid: true}, @@ -127,14 +128,18 @@ func TestUserConfigValidate_enums(t *testing.T) { { name: "JumpToBlock keybinding", setup: func(config *UserConfig, value string) { - config.Keybinding.Universal.JumpToBlock = strings.Split(value, ",") + labels := strings.Split(value, ",") + config.Keybinding.Universal.JumpToBlock = lo.Map(labels, func(label string, _ int) Keybinding { + return Keybinding{label} + }) }, testCases: []testCase{ - {value: "", valid: false}, - {value: "1,2,3", valid: false}, + // The number of entries no longer has to match the number of side + // panels, so only the validity of the individual keys matters. + {value: "1,2,3", valid: true}, {value: "1,2,3,4,5", valid: true}, + {value: "1,2,3,4,5,6", valid: true}, {value: "1,2,3,4,invalid", valid: false}, - {value: "1,2,3,4,5,6", valid: false}, }, }, { @@ -142,7 +147,7 @@ func TestUserConfigValidate_enums(t *testing.T) { setup: func(config *UserConfig, value string) { config.CustomCommands = []CustomCommand{ { - Key: value, + Key: Keybinding{value}, Command: "echo 'hello'", }, } @@ -160,10 +165,10 @@ func TestUserConfigValidate_enums(t *testing.T) { setup: func(config *UserConfig, value string) { config.CustomCommands = []CustomCommand{ { - Key: "X", + Key: Keybinding{"X"}, Description: "My Custom Commands", CommandMenu: []CustomCommand{ - {Key: value, Command: "echo 'hello'", Context: "global"}, + {Key: Keybinding{value}, Command: "echo 'hello'", Context: "global"}, }, }, } @@ -181,12 +186,12 @@ func TestUserConfigValidate_enums(t *testing.T) { setup: func(config *UserConfig, value string) { config.CustomCommands = []CustomCommand{ { - Key: "X", + Key: Keybinding{"X"}, Description: "My Custom Commands", Prompts: []CustomCommandPrompt{ { Options: []CustomCommandMenuOption{ - {Key: value}, + {Key: Keybinding{value}}, }, }, }, @@ -220,15 +225,52 @@ func TestUserConfigValidate_enums(t *testing.T) { {value: "invalid_value", valid: false}, }, }, + { + name: "Custom command context", + setup: func(config *UserConfig, value string) { + config.CustomCommands = []CustomCommand{ + { + Context: value, + }, + } + }, + testCases: []testCase{ + {value: "", valid: true}, + {value: "global", valid: true}, + {value: "commits", valid: true}, + {value: "commits, subCommits", valid: true}, + {value: "commits,subCommits", valid: true}, + {value: "invalid_value", valid: false}, + {value: "commits, invalid_value", valid: false}, + }, + }, + { + name: "Custom command context in a sub menu", + setup: func(config *UserConfig, value string) { + config.CustomCommands = []CustomCommand{ + { + Key: Keybinding{"X"}, + CommandMenu: []CustomCommand{ + {Key: Keybinding{"1"}, Command: "echo 'hello'", Context: value}, + }, + }, + } + }, + testCases: []testCase{ + {value: "", valid: true}, + {value: "commits", valid: true}, + {value: "invalid_value", valid: false}, + }, + }, { name: "Custom command sub menu", setup: func(config *UserConfig, _ string) { config.CustomCommands = []CustomCommand{ { - Key: "X", + Key: Keybinding{"X"}, Description: "My Custom Commands", CommandMenu: []CustomCommand{ - {Key: "1", Command: "echo 'hello'", Context: "global"}, + {Key: Keybinding{"1"}, Command: "echo 'hello'", Context: "global"}, }, }, } @@ -242,10 +284,10 @@ func TestUserConfigValidate_enums(t *testing.T) { setup: func(config *UserConfig, _ string) { config.CustomCommands = []CustomCommand{ { - Key: "X", + Key: Keybinding{"X"}, Context: "global", // context is not allowed for submenus CommandMenu: []CustomCommand{ - {Key: "1", Command: "echo 'hello'", Context: "global"}, + {Key: Keybinding{"1"}, Command: "echo 'hello'", Context: "global"}, }, }, } @@ -259,10 +301,10 @@ func TestUserConfigValidate_enums(t *testing.T) { setup: func(config *UserConfig, _ string) { config.CustomCommands = []CustomCommand{ { - Key: "X", + Key: Keybinding{"X"}, LoadingText: "loading", // other properties are not allowed for submenus (using loadingText as an example) CommandMenu: []CustomCommand{ - {Key: "1", Command: "echo 'hello'", Context: "global"}, + {Key: Keybinding{"1"}, Command: "echo 'hello'", Context: "global"}, }, }, } @@ -289,3 +331,104 @@ func TestUserConfigValidate_enums(t *testing.T) { }) } } + +func TestUserConfigValidate_spinnerFrames(t *testing.T) { + scenarios := []struct { + name string + frames []string + valid bool + }{ + {name: "empty", frames: []string{}, valid: false}, + {name: "single frame", frames: []string{"|"}, valid: true}, + {name: "all same width", frames: []string{"|", "/", "-", "\\"}, valid: true}, + {name: "all same width, multi-char", frames: []string{". ", ".. ", "..."}, valid: true}, + {name: "all same width, wide runes", frames: []string{"⠋", "⠙", "⠹"}, valid: true}, + {name: "differing widths", frames: []string{"|", "//"}, valid: false}, + {name: "first differs from rest", frames: []string{"||", "/", "-"}, valid: false}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + config := GetDefaultConfig() + config.Gui.Spinner.Frames = s.frames + err := config.Validate() + + if s.valid { + assert.NoError(t, err) + } else { + assert.Error(t, err) + } + }) + } +} + +func TestUserConfigValidate_sidePanels(t *testing.T) { + scenarios := []struct { + name string + panels []SidePanel + valid bool + }{ + {name: "default layout", panels: []SidePanel{{"status"}, {"files", "worktrees", "submodules"}, {"branches", "remotes", "tags"}, {"commits", "reflog"}, {"stash"}}, valid: true}, + {name: "reordered", panels: []SidePanel{{"status"}, {"files"}, {"commits"}, {"branches"}, {"stash"}}, valid: true}, + {name: "hidden stash panel", panels: []SidePanel{{"status"}, {"files"}, {"branches"}, {"commits"}}, valid: true}, + {name: "promoted tab", panels: []SidePanel{{"files", "submodules"}, {"worktrees"}, {"branches"}, {"commits"}}, valid: true}, + {name: "core panels only", panels: []SidePanel{{"files"}, {"branches"}, {"commits"}}, valid: true}, + {name: "empty", panels: []SidePanel{}, valid: false}, + {name: "empty panel", panels: []SidePanel{{"files"}, {"branches"}, {"commits"}, {}}, valid: false}, + {name: "unknown name", panels: []SidePanel{{"files"}, {"branches"}, {"commits"}, {"bogus"}}, valid: false}, + {name: "duplicate within panel", panels: []SidePanel{{"files", "files"}, {"branches"}, {"commits"}}, valid: false}, + {name: "duplicate across panels", panels: []SidePanel{{"files"}, {"branches", "files"}, {"commits"}}, valid: false}, + {name: "missing files", panels: []SidePanel{{"branches"}, {"commits"}}, valid: false}, + {name: "missing branches", panels: []SidePanel{{"files"}, {"commits"}}, valid: false}, + {name: "missing commits", panels: []SidePanel{{"files"}, {"branches"}}, valid: false}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + config := GetDefaultConfig() + config.Gui.SidePanels = s.panels + err := config.Validate() + + if s.valid { + assert.NoError(t, err) + } else { + assert.Error(t, err) + } + }) + } +} + +func TestUserConfigValidate_diffRenderers(t *testing.T) { + scenarios := []struct { + name string + diffRenderer DiffRendererConfig + valid bool + }{ + {name: "stdinFilter with type default", diffRenderer: DiffRendererConfig{Command: "delta"}, valid: true}, + {name: "stdinFilter with explicit type", diffRenderer: DiffRendererConfig{Type: "stdinFilter", Command: "delta"}, valid: true}, + {name: "stdinFilter with explicit type", diffRenderer: DiffRendererConfig{Type: "stdinFilter"}, valid: false}, + {name: "stdinFilter with type default without command", diffRenderer: DiffRendererConfig{}, valid: false}, + {name: "stdinFilter with args", diffRenderer: DiffRendererConfig{Type: "stdinFilter", Command: "delta", Args: []string{"-x"}}, valid: false}, + {name: "external diff", diffRenderer: DiffRendererConfig{Type: "extDiff", Command: "difft"}, valid: true}, + {name: "external diff without command", diffRenderer: DiffRendererConfig{Type: "extDiff"}, valid: true}, + {name: "external diff with args", diffRenderer: DiffRendererConfig{Type: "extDiff", Command: "difft", Args: []string{"-x"}}, valid: false}, + {name: "raw git", diffRenderer: DiffRendererConfig{Type: "rawGit"}, valid: true}, + {name: "raw git with args", diffRenderer: DiffRendererConfig{Type: "rawGit", Args: []string{"-x"}}, valid: true}, + {name: "raw git with command", diffRenderer: DiffRendererConfig{Type: "rawGit", Command: "delta"}, valid: false}, + {name: "unknown type", diffRenderer: DiffRendererConfig{Type: "unknown"}, valid: false}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + config := GetDefaultConfig() + config.Git.DiffRenderers = []DiffRendererConfig{s.diffRenderer} + err := config.Validate() + + if s.valid { + assert.NoError(t, err) + } else { + assert.Error(t, err) + } + }) + } +} diff --git a/pkg/constants/links.go b/pkg/constants/links.go index e9b06cba3..695b24d38 100644 --- a/pkg/constants/links.go +++ b/pkg/constants/links.go @@ -1,14 +1,14 @@ package constants type Docs struct { - CustomPagers string - CustomCommands string - CustomKeybindings string - Keybindings string - Undoing string - Config string - Tutorial string - CustomPatchDemo string + CustomDiffRenderers string + CustomCommands string + CustomKeybindings string + Keybindings string + Undoing string + Config string + Tutorial string + CustomPatchDemo string } var Links = struct { @@ -25,13 +25,13 @@ var Links = struct { Discussions: "https://github.com/jesseduffield/lazygit/discussions", Releases: "https://github.com/jesseduffield/lazygit/releases", Docs: Docs{ - CustomPagers: "https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md", - CustomKeybindings: "https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md", - CustomCommands: "https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium", - Keybindings: "https://github.com/jesseduffield/lazygit/blob/%s/docs/keybindings", - Undoing: "https://github.com/jesseduffield/lazygit/blob/master/docs/Undoing.md", - Config: "https://github.com/jesseduffield/lazygit/blob/%s/docs/Config.md", - Tutorial: "https://youtu.be/VDXvbHZYeKY", - CustomPatchDemo: "https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches", + CustomDiffRenderers: "https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md", + CustomKeybindings: "https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md", + CustomCommands: "https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium", + Keybindings: "https://github.com/jesseduffield/lazygit/blob/%s/docs/keybindings", + Undoing: "https://github.com/jesseduffield/lazygit/blob/master/docs/Undoing.md", + Config: "https://github.com/jesseduffield/lazygit/blob/%s/docs/Config.md", + Tutorial: "https://youtu.be/VDXvbHZYeKY", + CustomPatchDemo: "https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches", }, } diff --git a/pkg/env/env.go b/pkg/env/env.go index 1ade5b8c6..391fa6ac6 100644 --- a/pkg/env/env.go +++ b/pkg/env/env.go @@ -2,27 +2,59 @@ package env import ( "os" + "strings" ) // This package encapsulates accessing/mutating the ENV of the program. +// The variables with which git can be told where a repo is, rather than having +// it find out from the working directory. +const ( + GitDirEnvVar = "GIT_DIR" + GitWorkTreeEnvVar = "GIT_WORK_TREE" +) + func GetGitDirEnv() string { - return os.Getenv("GIT_DIR") + return os.Getenv(GitDirEnvVar) } func SetGitDirEnv(value string) { - os.Setenv("GIT_DIR", value) + os.Setenv(GitDirEnvVar, value) } func GetWorkTreeEnv() string { - return os.Getenv("GIT_WORK_TREE") + return os.Getenv(GitWorkTreeEnvVar) } func SetWorkTreeEnv(value string) { - os.Setenv("GIT_WORK_TREE", value) + os.Setenv(GitWorkTreeEnvVar, value) } func UnsetGitLocationEnvVars() { - _ = os.Unsetenv("GIT_DIR") - _ = os.Unsetenv("GIT_WORK_TREE") + _ = os.Unsetenv(GitDirEnvVar) + _ = os.Unsetenv(GitWorkTreeEnvVar) +} + +// GetGitLocationEnvVars returns the location variables that are set, as +// "NAME=value" entries. +func GetGitLocationEnvVars() []string { + envVars := []string{} + for _, name := range []string{GitDirEnvVar, GitWorkTreeEnvVar} { + if value := os.Getenv(name); value != "" { + envVars = append(envVars, name+"="+value) + } + } + return envVars +} + +// SetGitLocationEnvVars sets the location variables from "NAME=value" entries, +// clearing both first so that only what is given remains. Passing nothing is +// how you say the repo is to be found from the working directory. +func SetGitLocationEnvVars(envVars []string) { + UnsetGitLocationEnvVars() + for _, envVar := range envVars { + if name, value, ok := strings.Cut(envVar, "="); ok { + os.Setenv(name, value) + } + } } diff --git a/vendor/github.com/jesseduffield/gocui/AUTHORS b/pkg/gocui/AUTHORS similarity index 100% rename from vendor/github.com/jesseduffield/gocui/AUTHORS rename to pkg/gocui/AUTHORS diff --git a/vendor/github.com/jesseduffield/gocui/CHANGES_tcell.md b/pkg/gocui/CHANGES_tcell.md similarity index 100% rename from vendor/github.com/jesseduffield/gocui/CHANGES_tcell.md rename to pkg/gocui/CHANGES_tcell.md diff --git a/vendor/github.com/jesseduffield/gocui/CODE_OF_CONDUCT.md b/pkg/gocui/CODE_OF_CONDUCT.md similarity index 100% rename from vendor/github.com/jesseduffield/gocui/CODE_OF_CONDUCT.md rename to pkg/gocui/CODE_OF_CONDUCT.md diff --git a/vendor/github.com/jesseduffield/gocui/CONTRIBUTING.md b/pkg/gocui/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/jesseduffield/gocui/CONTRIBUTING.md rename to pkg/gocui/CONTRIBUTING.md diff --git a/vendor/github.com/jesseduffield/gocui/LICENSE b/pkg/gocui/LICENSE similarity index 100% rename from vendor/github.com/jesseduffield/gocui/LICENSE rename to pkg/gocui/LICENSE diff --git a/vendor/github.com/jesseduffield/gocui/README.md b/pkg/gocui/README.md similarity index 100% rename from vendor/github.com/jesseduffield/gocui/README.md rename to pkg/gocui/README.md diff --git a/vendor/github.com/jesseduffield/gocui/attribute.go b/pkg/gocui/attribute.go similarity index 99% rename from vendor/github.com/jesseduffield/gocui/attribute.go rename to pkg/gocui/attribute.go index b6cbf39d0..bfa4ad854 100644 --- a/vendor/github.com/jesseduffield/gocui/attribute.go +++ b/pkg/gocui/attribute.go @@ -4,7 +4,7 @@ package gocui -import "github.com/gdamore/tcell/v2" +import "github.com/gdamore/tcell/v3" // Attribute affects the presentation of characters, such as color, boldness, etc. type Attribute uint64 diff --git a/pkg/gocui/block_events_test.go b/pkg/gocui/block_events_test.go new file mode 100644 index 000000000..277bac89a --- /dev/null +++ b/pkg/gocui/block_events_test.go @@ -0,0 +1,98 @@ +package gocui + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestEventWithheldWhileBlocking(t *testing.T) { + scenarios := []struct { + name string + event GocuiEvent + withheld bool + }{ + {"key", GocuiEvent{Type: eventKey, Key: NewKeyRune('x')}, true}, + {"mouse click", GocuiEvent{Type: eventMouse, Key: NewKeyName(MouseLeft)}, true}, + {"mouse scroll", GocuiEvent{Type: eventMouse, Key: NewKeyName(MouseWheelDown)}, false}, + {"mouse move", GocuiEvent{Type: eventMouseMove}, true}, + {"resize", GocuiEvent{Type: eventResize}, false}, + {"focus", GocuiEvent{Type: eventFocus}, false}, + {"paste", GocuiEvent{Type: eventPaste}, false}, + {"error", GocuiEvent{Type: eventError}, false}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + assert.Equal(t, s.withheld, eventWithheldWhileBlocking(&s.event)) + }) + } +} + +// setupKeyRecorder wires a keybinding on a focused view that records each time +// it fires, and returns the key event that triggers it plus the record slice. +func setupKeyRecorder(t *testing.T, g *Gui) (GocuiEvent, *[]int) { + t.Helper() + + _, _ = g.SetView("main", 0, 0, 80, 22, 0) + _, err := g.SetCurrentView("main") + assert.NoError(t, err) + + fired := []int{} + callCount := 0 + key := NewKeyRune('x') + g.SetKeybinding("main", key, func(*Gui, *View) error { + callCount++ + fired = append(fired, callCount) + return nil + }) + + return GocuiEvent{Type: eventKey, Key: key}, &fired +} + +func TestBlockingEvents_KeysBufferedAndReplayed(t *testing.T) { + g := newTestGui(t) + keyEvent, fired := setupKeyRecorder(t, g) + + // Not blocking: the key dispatches immediately. + assert.NoError(t, g.handleEvent(&keyEvent)) + assert.Len(t, *fired, 1) + + // While blocking: the key is buffered, not dispatched. + g.BeginBlockingEvents() + assert.NoError(t, g.handleEvent(&keyEvent)) + assert.NoError(t, g.handleEvent(&keyEvent)) + assert.Len(t, *fired, 1, "buffered keys must not dispatch while blocking") + + // Unblocking replays the buffered keys. + assert.NoError(t, g.EndBlockingEvents()) + assert.Len(t, *fired, 3, "both buffered keys should replay on unblock") + assert.Empty(t, g.bufferedKeyEvents) +} + +func TestBlockingEvents_NestsWithCounter(t *testing.T) { + g := newTestGui(t) + keyEvent, fired := setupKeyRecorder(t, g) + + g.BeginBlockingEvents() + g.BeginBlockingEvents() + assert.NoError(t, g.handleEvent(&keyEvent)) + + // The inner block ending still leaves us blocked: no replay yet. + assert.NoError(t, g.EndBlockingEvents()) + assert.Empty(t, *fired) + + // Only the outermost block ending replays. + assert.NoError(t, g.EndBlockingEvents()) + assert.Len(t, *fired, 1) +} + +func TestBlockingEvents_MouseClicksDroppedNotBuffered(t *testing.T) { + g := newTestGui(t) + + g.BeginBlockingEvents() + click := GocuiEvent{Type: eventMouse, Key: NewKeyName(MouseLeft)} + assert.NoError(t, g.handleEvent(&click)) + assert.Empty(t, g.bufferedKeyEvents, "mouse clicks must be dropped, not buffered") + assert.NoError(t, g.EndBlockingEvents()) +} diff --git a/vendor/github.com/jesseduffield/gocui/doc.go b/pkg/gocui/doc.go similarity index 94% rename from vendor/github.com/jesseduffield/gocui/doc.go rename to pkg/gocui/doc.go index b2f8250b1..cd5416da9 100644 --- a/vendor/github.com/jesseduffield/gocui/doc.go +++ b/pkg/gocui/doc.go @@ -54,7 +54,7 @@ Views can also be created using relative coordinates: Configure keybindings: - if err := g.SetKeybinding("viewname", gocui.KeyEnter, gocui.ModNone, fcn); err != nil { + if err := g.SetKeybinding("viewname", gocui.KeyEnter, fcn); err != nil { // handle error } @@ -64,7 +64,7 @@ gocui implements full mouse support that can be enabled with: Mouse events are handled like any other keybinding: - if err := g.SetKeybinding("viewname", gocui.MouseLeft, gocui.ModNone, fcn); err != nil { + if err := g.SetKeybinding("viewname", gocui.MouseLeft, fcn); err != nil { // handle error } diff --git a/pkg/gocui/double_click_test.go b/pkg/gocui/double_click_test.go new file mode 100644 index 000000000..9c73da1e9 --- /dev/null +++ b/pkg/gocui/double_click_test.go @@ -0,0 +1,34 @@ +package gocui + +import ( + "testing" + + "github.com/gdamore/tcell/v3" + "github.com/stretchr/testify/assert" +) + +func TestMouseReleaseDoesNotBreakDoubleClickDetection(t *testing.T) { + t.Cleanup(resetMouseState) + resetMouseState() + g := newTestGui(t) + view, _ := g.SetView("list", 0, 0, 20, 10, 0) + doubleClicks := []bool{} + g.SetViewClickBinding(&ViewMouseBinding{ + ViewName: "list", + Key: MouseLeft, + Handler: func(opts ViewMouseBindingOpts) error { + doubleClicks = append(doubleClicks, opts.IsDoubleClick) + return nil + }, + }) + + for _, event := range []GocuiEvent{ + gocuiEventFromTcellEvent(tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonPrimary, tcell.ModNone)), + gocuiEventFromTcellEvent(tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonNone, tcell.ModNone)), + gocuiEventFromTcellEvent(tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonPrimary, tcell.ModNone)), + } { + assert.NoError(t, g.onKey(&event)) + } + + assert.Equal(t, []bool{false, true}, doubleClicks) +} diff --git a/pkg/gocui/edit.go b/pkg/gocui/edit.go new file mode 100644 index 000000000..4263e0b5c --- /dev/null +++ b/pkg/gocui/edit.go @@ -0,0 +1,90 @@ +// Copyright 2014 The gocui Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package gocui + +import "github.com/samber/lo" + +// Editor interface must be satisfied by gocui editors. +type Editor interface { + Edit(v *View, key Key) bool +} + +// The EditorFunc type is an adapter to allow the use of ordinary functions as +// Editors. If f is a function with the appropriate signature, EditorFunc(f) +// is an Editor object that calls f. +type EditorFunc func(v *View, key Key) bool + +// Edit calls f(v, key, mod) +func (f EditorFunc) Edit(v *View, key Key) bool { + return f(v, key) +} + +// DefaultEditor is the default editor. +var DefaultEditor Editor = EditorFunc(SimpleEditor) + +var ( + moveWordLeftKeybinding = []Key{NewKey(KeyArrowLeft, "", ModCtrl)} + moveWordRightKeybinding = []Key{NewKey(KeyArrowRight, "", ModCtrl)} + backspaceWordKeybinding = []Key{NewKey(KeyBackspace, "", ModCtrl)} + forwardDeleteWordKeybinding = []Key{NewKey(KeyDelete, "", ModCtrl)} +) + +// SimpleEditor is used as the default gocui editor. +func SimpleEditor(v *View, key Key) bool { + switch { + case lo.SomeBy(backspaceWordKeybinding, func(k Key) bool { return key.Equals(k) }), + key.Equals(NewKeyStrMod("w", ModCtrl)): + v.TextArea.BackSpaceWord() + case lo.SomeBy(forwardDeleteWordKeybinding, func(k Key) bool { return key.Equals(k) }), + key.Equals(NewKeyStrMod("d", ModAlt)): + v.TextArea.ForwardDeleteWord() + case key.Equals(NewKeyName(KeyBackspace)), + key.Equals(NewKeyStrMod("h", ModCtrl)): + v.TextArea.BackSpaceChar() + case key.Equals(NewKeyStrMod("d", ModCtrl)), + key.Equals(NewKeyName(KeyDelete)): + v.TextArea.DeleteChar() + case key.Equals(NewKeyName(KeyArrowDown)): + v.TextArea.MoveCursorDown() + case key.Equals(NewKeyName(KeyArrowUp)): + v.TextArea.MoveCursorUp() + case key.Equals(NewKeyStrMod("b", ModAlt)), + lo.SomeBy(moveWordLeftKeybinding, func(k Key) bool { return key.Equals(k) }): + v.TextArea.MoveLeftWord() + case key.Equals(NewKeyName(KeyArrowLeft)), + key.Equals(NewKeyStrMod("b", ModCtrl)): + v.TextArea.MoveCursorLeft() + case key.Equals(NewKeyStrMod("f", ModAlt)), + lo.SomeBy(moveWordRightKeybinding, func(k Key) bool { return key.Equals(k) }): + v.TextArea.MoveRightWord() + case key.Equals(NewKeyName(KeyArrowRight)), + key.Equals(NewKeyStrMod("f", ModCtrl)): + v.TextArea.MoveCursorRight() + case key.Equals(NewKeyName(KeyEnter)): + v.TextArea.TypeCharacter("\n") + case key.Equals(NewKeyName(KeyInsert)): + v.TextArea.ToggleOverwrite() + case key.Equals(NewKeyStrMod("u", ModCtrl)): + v.TextArea.DeleteToStartOfLine() + case key.Equals(NewKeyStrMod("k", ModCtrl)): + v.TextArea.DeleteToEndOfLine() + case key.Equals(NewKeyStrMod("a", ModCtrl)), + key.Equals(NewKeyName(KeyHome)): + v.TextArea.GoToStartOfLine() + case key.Equals(NewKeyStrMod("e", ModCtrl)), + key.Equals(NewKeyName(KeyEnd)): + v.TextArea.GoToEndOfLine() + case key.Equals(NewKeyStrMod("y", ModCtrl)): + v.TextArea.Yank() + case key.IsPrintable(): + v.TextArea.TypeCharacter(key.Str()) + default: + return false + } + + v.RenderTextArea() + + return true +} diff --git a/pkg/gocui/escape.go b/pkg/gocui/escape.go new file mode 100644 index 000000000..7f3de9e6e --- /dev/null +++ b/pkg/gocui/escape.go @@ -0,0 +1,607 @@ +// Copyright 2014 The gocui Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package gocui + +import ( + "strconv" + "strings" + + "github.com/go-errors/errors" +) + +type escapeInterpreter struct { + state escapeState + curch string + csiParam []string + curFgColor, curBgColor Attribute + mode OutputMode + instruction instruction + hyperlink strings.Builder + + // ConPTY emits cursor-positioning escapes (CUP) to skip over blank + // rows rather than emitting LFs for them. To convert those into row + // advances the view can act on, we track where in the pseudo-terminal + // screen the cursor currently is. 1-based to match the escape + // sequences. + // + // We also have to track the column, but only well enough to count + // soft-wraps when written content runs past the right edge: ConPTY's + // CUPs are addressed against its post-wrap screen, so a logical line + // long enough to wrap in ConPTY's screen counts for two rows from the + // next CUP's perspective. Column accuracy past wrap-counting isn't + // modelled — we don't track the col argument of CUPs, and most + // pager-style emitters use col 1 anyway. + screenRow, screenCol int + + // The screen width that soft-wraps are counted against (see + // notifyCellsWritten). It's a snapshot of the view's InnerWidth taken on + // the UI thread (in NewView, and refreshed per render via + // View.SetContentWidth), rather than read live from the view's dimensions: + // a view's output is written from a task goroutine, and reading the live + // dimensions there would race the UI thread updating them during layout. + screenColMax int +} + +type ( + escapeState int + fontEffect int +) + +type instruction interface{ isInstruction() } + +type eraseInLineFromCursor struct{} + +func (self eraseInLineFromCursor) isInstruction() {} + +// cursorDown asks the view to advance N rows. Emitted when CUP / CUD / +// CNL / VPA targets a row past the current one; backward moves are +// ignored because the view's buffer is line-based and can't undo. +type cursorDown struct{ n int } + +func (self cursorDown) isInstruction() {} + +// cursorForward asks the view to materialize N space cells. Emitted +// when CUF advances the cursor right — ConPTY uses CUF (often paired +// with ECH) to encode runs of default-colored spaces compactly, so we +// have to render the gap, not just bump a counter. +type cursorForward struct{ n int } + +func (self cursorForward) isInstruction() {} + +type noInstruction struct{} + +func (self noInstruction) isInstruction() {} + +const ( + stateNone escapeState = iota + stateEscape + stateCharacterSetDesignation + stateCSI + stateParams + stateCSIDiscard + stateOSC + stateOSCWaitForParams + stateOSCParams + stateOSCHyperlink + stateOSCEndEscape + stateOSCSkipUnknown + + bold fontEffect = 1 + faint fontEffect = 2 + italic fontEffect = 3 + underline fontEffect = 4 + blink fontEffect = 5 + reverse fontEffect = 7 + strike fontEffect = 9 + + setForegroundColor int = 38 + defaultForegroundColor int = 39 + setBackgroundColor int = 48 + defaultBackgroundColor int = 49 +) + +var ( + errNotCSI = errors.New("Not a CSI escape sequence") + errCSIParseError = errors.New("CSI escape sequence parsing error") +) + +// characters in case of error will output the non-parsed characters as a string. +func (ei *escapeInterpreter) characters() []string { + switch ei.state { + case stateNone: + return []string{"\x1b"} + case stateEscape: + return []string{"\x1b", ei.curch} + case stateCSI: + return []string{"\x1b", "[", ei.curch} + case stateParams: + ret := []string{"\x1b", "["} + for _, s := range ei.csiParam { + ret = append(ret, s) + ret = append(ret, ";") + } + return append(ret, ei.curch) + default: + } + return nil +} + +// newEscapeInterpreter returns an escapeInterpreter that will be able to parse +// terminal escape sequences. +func newEscapeInterpreter(mode OutputMode) *escapeInterpreter { + ei := &escapeInterpreter{ + state: stateNone, + curFgColor: ColorDefault, + curBgColor: ColorDefault, + mode: mode, + instruction: noInstruction{}, + screenRow: 1, + screenCol: 1, + } + return ei +} + +// reset sets the escapeInterpreter in initial state. Note: this only resets +// escape-parsing state. Screen cursor state survives so that mid-stream +// malformed escapes don't desync the row tracking from the view. +func (ei *escapeInterpreter) reset() { + ei.state = stateNone + ei.curFgColor = ColorDefault + ei.curBgColor = ColorDefault + ei.csiParam = nil +} + +// resetScreenCursor returns the screen-cursor tracking to the top of the +// pseudo-terminal screen. Called when the view is rewound before a fresh pty +// render, and on cursor-home (which ConPTY emits at the start of each screen) +// for views that aren't rewound in lockstep — see the CUP handling in parseOne. +func (ei *escapeInterpreter) resetScreenCursor() { + ei.screenRow = 1 + ei.screenCol = 1 +} + +// notifyRowAdvance must be called by the view whenever it advances to the +// next row in response to an LF / CRLF outside of an escape sequence +// (i.e. the row transitions the parser doesn't see directly). Keeps the +// parser's notion of the current screen row in sync with the view. +func (ei *escapeInterpreter) notifyRowAdvance() { + ei.screenRow++ + ei.screenCol = 1 +} + +// notifyColumnReset must be called when the view processes a bare CR +// (column reset without row advance). Keeps screenCol in sync so wrap +// counting starts over from col 1. +func (ei *escapeInterpreter) notifyColumnReset() { + ei.screenCol = 1 +} + +// notifyCellsWritten must be called after the view writes visible cells +// to its buffer. Advances the parser's idea of the cursor by `width` +// columns; if that crosses the right edge of a `screenColMax`-wide pty +// screen, the corresponding number of soft-wraps are added to screenRow +// so subsequent CUPs land on the right line. +func (ei *escapeInterpreter) notifyCellsWritten(width int) { + if ei.screenColMax <= 0 { + return + } + // One column at a time: matches ConPTY's "pending wrap" semantics + // where the cursor stays at col max+1 after writing the rightmost + // cell and only wraps on the next cell. Loops over individual + // columns rather than doing the math in one shot so wide cells on a + // row boundary still wrap cleanly. + for range width { + if ei.screenCol > ei.screenColMax { + ei.screenRow++ + ei.screenCol = 1 + } + ei.screenCol++ + } +} + +// emitCursorAdvance schedules a cursorDown instruction for the next time +// the view checks ei.instruction, advancing the parser's screen row by +// the same amount. n <= 0 is a no-op (backward / same-row CUPs are +// ignored — the view's buffer is line-based and can't undo). +func (ei *escapeInterpreter) emitCursorAdvance(n int) { + if n <= 0 { + return + } + ei.instruction = cursorDown{n: n} + ei.screenRow += n + ei.screenCol = 1 +} + +// firstParamOrDefault returns the first CSI parameter parsed as an int, +// or dflt if it's absent / empty / unparseable. +func (ei *escapeInterpreter) firstParamOrDefault(dflt int) int { + if len(ei.csiParam) == 0 || ei.csiParam[0] == "" { + return dflt + } + n, err := strconv.Atoi(ei.csiParam[0]) + if err != nil { + return dflt + } + return n +} + +func (ei *escapeInterpreter) instructionRead() { + ei.instruction = noInstruction{} +} + +// parseOne parses a character (grapheme cluster). If isEscape is true, it means that the character +// is part of an escape sequence, and as such should not be printed verbatim. Otherwise, it's not an +// escape sequence. +func (ei *escapeInterpreter) parseOne(ch []byte) (isEscape bool, err error) { + // Sanity checks: if a sequence has grown absurdly long, stop + // accumulating state and just swallow bytes until its final byte — + // much better than leaking the accumulated garbage into the view. + if len(ei.csiParam) > 20 || (len(ei.csiParam) > 0 && len(ei.csiParam[len(ei.csiParam)-1]) > 255) { + ei.state = stateCSIDiscard + ei.csiParam = nil + return true, nil + } + + ei.curch = string(ch) + + switch ei.state { + case stateNone: + if characterEquals(ch, 0x1b) { + ei.state = stateEscape + return true, nil + } + return false, nil + case stateEscape: + switch { + case characterEquals(ch, '['): + ei.state = stateCSI + return true, nil + case characterEquals(ch, ']'): + ei.state = stateOSC + return true, nil + case characterEquals(ch, '('), + characterEquals(ch, ')'), + characterEquals(ch, '*'), + characterEquals(ch, '+'): + ei.state = stateCharacterSetDesignation + return true, nil + case len(ch) == 1 && ch[0] >= 0x30 && ch[0] <= 0x7E: + // Single-byte ESC sequence (e.g. ESC c = RIS). We don't + // interpret these, but we must consume them so they don't + // leak into the view as literal text. + ei.state = stateNone + return true, nil + default: + return false, errNotCSI + } + case stateCharacterSetDesignation: + // Not supported, so just skip it + ei.state = stateNone + return true, nil + case stateCSI: + switch { + case len(ch) == 1 && ch[0] >= '0' && ch[0] <= '9': + ei.csiParam = append(ei.csiParam, "") + case characterEquals(ch, 'm'): + ei.csiParam = append(ei.csiParam, "0") + case characterEquals(ch, 'K'), + characterEquals(ch, 'H'), characterEquals(ch, 'f'), characterEquals(ch, 'd'), + characterEquals(ch, 'B'), characterEquals(ch, 'E'), + characterEquals(ch, 'C'): + // fall through — let stateParams handle these with default + // params (CUP/VPA default to row 1, CUD/CNL/CUF default to + // advance by 1). + case characterEquals(ch, ';'): + // Empty first param ([;Xm ≡ [0;Xm). Seed a slot for the + // empty param; stateParams will append the next one when it + // re-reads this ';' via the fallthrough. + ei.csiParam = append(ei.csiParam, "") + case len(ch) == 1 && ch[0] >= 0x3C && ch[0] <= 0x3F: + // Private-mode prefix byte (<, =, >, ?). We don't interpret + // DEC private-mode sequences, but must consume them so they + // don't leak into the view as literal text. Seed an empty + // param so the subsequent digits land on a valid slot. + ei.csiParam = append(ei.csiParam, "") + ei.state = stateParams + return true, nil + case len(ch) == 1 && ch[0] >= 0x20 && ch[0] <= 0x2F: + // CSI intermediate byte. A sequence with intermediates is + // one we don't implement; consume the rest until the final + // byte. + ei.state = stateCSIDiscard + ei.csiParam = nil + return true, nil + case len(ch) == 1 && ch[0] >= 0x40 && ch[0] <= 0x7E: + // Valid CSI final byte we don't implement — swallow. + ei.state = stateNone + ei.csiParam = nil + return true, nil + default: + return false, errCSIParseError + } + ei.state = stateParams + fallthrough + case stateParams: + switch { + case len(ch) == 1 && ch[0] >= '0' && ch[0] <= '9': + ei.csiParam[len(ei.csiParam)-1] += string(ch) + return true, nil + case characterEquals(ch, ';'): + ei.csiParam = append(ei.csiParam, "") + return true, nil + case characterEquals(ch, 'm'): + // outputCSI applies params left-to-right and mutates as it + // goes, so on failure some leading params may already have + // taken effect (e.g. `[1;;m` would leave AttrBold set before + // hitting the empty param). Snapshot the colors beforehand + // and restore them on error so a malformed SGR is truly a + // no-op rather than a partial apply. + savedFg, savedBg := ei.curFgColor, ei.curBgColor + if err := ei.outputCSI(); err != nil { + ei.curFgColor, ei.curBgColor = savedFg, savedBg + } + ei.state = stateNone + ei.csiParam = nil + return true, nil + case characterEquals(ch, 'K'): + p := 0 + if len(ei.csiParam) != 0 && ei.csiParam[0] != "" { + p, err = strconv.Atoi(ei.csiParam[0]) + if err != nil { + return false, errCSIParseError + } + } + + if p == 0 { + ei.instruction = eraseInLineFromCursor{} + } else { + // non-zero values of P not supported + ei.instruction = noInstruction{} + } + + ei.state = stateNone + ei.csiParam = nil + return true, nil + case characterEquals(ch, 'H'), characterEquals(ch, 'f'), + characterEquals(ch, 'd'): + // CUP / HVP (absolute (row, col), col ignored) or VPA (absolute row). + targetRow := ei.firstParamOrDefault(1) + if targetRow <= 1 { + // Cursor home. ConPTY emits this (after [2J) at the start of + // every screen, so it marks where ConPTY's coordinate origin + // now sits. Re-anchor our row tracking to the current write + // position rather than treating it as a backward move: a view + // that isn't rewound in lockstep with ConPTY's screen (the + // command log) would otherwise carry stale drift, making every + // later absolute CUP compute a negative, dropped advance and + // collapsing the blank rows ConPTY positioned with. + ei.resetScreenCursor() + } else { + // Skip forward to the target row; ignore backward moves. + ei.emitCursorAdvance(targetRow - ei.screenRow) + } + ei.state = stateNone + ei.csiParam = nil + return true, nil + case characterEquals(ch, 'B'), characterEquals(ch, 'E'): + // CUD / CNL — relative row advance by N. CNL also resets + // the column, which we don't track, so the two are + // equivalent for our purposes. + ei.emitCursorAdvance(ei.firstParamOrDefault(1)) + ei.state = stateNone + ei.csiParam = nil + return true, nil + case characterEquals(ch, 'C'): + // CUF — cursor forward N. Emit space cells so the gap + // renders. (screenCol is updated by the view via + // notifyCellsWritten as those spaces are emitted.) + ei.instruction = cursorForward{n: ei.firstParamOrDefault(1)} + ei.state = stateNone + ei.csiParam = nil + return true, nil + case len(ch) == 1 && ch[0] >= 0x20 && ch[0] <= 0x2F: + // CSI intermediate byte after params. The final byte will + // have a semantic we don't implement (e.g. `[0 q` = + // DECSCUSR); consume everything until it arrives. + ei.state = stateCSIDiscard + ei.csiParam = nil + return true, nil + case len(ch) == 1 && ch[0] >= 0x40 && ch[0] <= 0x7E: + // Valid CSI final byte we don't implement — swallow the + // whole sequence rather than printing it as text. + ei.state = stateNone + ei.csiParam = nil + return true, nil + default: + return false, errCSIParseError + } + case stateCSIDiscard: + // Consume the rest of a CSI sequence whose semantic we don't + // interpret (one with intermediate bytes, or one the sanity + // checks at the top of parseOne bailed out of). Any byte in the + // final-byte range ends it. + if len(ch) == 1 && ch[0] >= 0x40 && ch[0] <= 0x7E { + ei.state = stateNone + } + return true, nil + case stateOSC: + if characterEquals(ch, '8') { + ei.state = stateOSCWaitForParams + ei.hyperlink.Reset() + return true, nil + } + + ei.state = stateOSCSkipUnknown + return true, nil + case stateOSCWaitForParams: + if !characterEquals(ch, ';') { + // Malformed OSC 8 (expected ';' after '8'). Rather than + // erroring — which would reset state mid-OSC and cause the + // rest of the sequence to leak as literal text — treat the + // whole OSC as one we don't understand and skip to its + // terminator. + ei.state = stateOSCSkipUnknown + return true, nil + } + + ei.state = stateOSCParams + return true, nil + case stateOSCParams: + if characterEquals(ch, ';') { + ei.state = stateOSCHyperlink + } + return true, nil + case stateOSCHyperlink: + switch { + case characterEquals(ch, 0x07): + ei.state = stateNone + case characterEquals(ch, 0x1b): + ei.state = stateOSCEndEscape + default: + ei.hyperlink.Write(ch) + } + return true, nil + case stateOSCEndEscape: + ei.state = stateNone + return true, nil + case stateOSCSkipUnknown: + switch { + case characterEquals(ch, 0x07): + ei.state = stateNone + case characterEquals(ch, 0x1b): + ei.state = stateOSCEndEscape + } + return true, nil + } + return false, nil +} + +func (ei *escapeInterpreter) outputCSI() error { + n := len(ei.csiParam) + for i := 0; i < n; { + p, err := strconv.Atoi(ei.csiParam[i]) + if err != nil { + return errCSIParseError + } + + skip := 1 + switch { + case p == 0: // reset style and color + ei.curFgColor = ColorDefault + ei.curBgColor = ColorDefault + case p >= 1 && p <= 9: // set style + ei.curFgColor |= getFontEffect(p) + case p >= 21 && p <= 29: // reset style + ei.curFgColor &= ^getFontEffect(p - 20) + case p >= 30 && p <= 37: // set foreground color + ei.curFgColor &= AttrStyleBits + ei.curFgColor |= Get256Color(int32(p) - 30) + case p == setForegroundColor: // set foreground color (256-color or true color) + var color Attribute + var err error + color, skip, err = ei.csiColor(ei.csiParam[i:]) + if err != nil { + return err + } + ei.curFgColor &= AttrStyleBits + ei.curFgColor |= color + case p == defaultForegroundColor: // reset foreground color + ei.curFgColor &= AttrStyleBits + ei.curFgColor |= ColorDefault + case p >= 40 && p <= 47: // set background color + ei.curBgColor &= AttrStyleBits + ei.curBgColor |= Get256Color(int32(p) - 40) + case p == setBackgroundColor: // set background color (256-color or true color) + var color Attribute + var err error + color, skip, err = ei.csiColor(ei.csiParam[i:]) + if err != nil { + return err + } + ei.curBgColor &= AttrStyleBits + ei.curBgColor |= color + case p == defaultBackgroundColor: // reset background color + ei.curBgColor &= AttrStyleBits + ei.curBgColor |= ColorDefault + case p >= 90 && p <= 97: // set bright foreground color + ei.curFgColor &= AttrStyleBits + ei.curFgColor |= Get256Color(int32(p) - 90 + 8) + case p >= 100 && p <= 107: // set bright background color + ei.curBgColor &= AttrStyleBits + ei.curBgColor |= Get256Color(int32(p) - 100 + 8) + default: + } + i += skip + } + + return nil +} + +func (ei *escapeInterpreter) csiColor(param []string) (color Attribute, skip int, err error) { + if len(param) < 2 { + return 0, 0, errCSIParseError + } + + switch param[1] { + case "2": + // 24-bit color + if ei.mode < OutputTrue { + return 0, 0, errCSIParseError + } + if len(param) < 5 { + return 0, 0, errCSIParseError + } + var red, green, blue int + red, err = strconv.Atoi(param[2]) + if err != nil { + return 0, 0, errCSIParseError + } + green, err = strconv.Atoi(param[3]) + if err != nil { + return 0, 0, errCSIParseError + } + blue, err = strconv.Atoi(param[4]) + if err != nil { + return 0, 0, errCSIParseError + } + return NewRGBColor(int32(red), int32(green), int32(blue)), 5, nil + case "5": + // 8-bit color + if ei.mode < Output256 { + return 0, 0, errCSIParseError + } + if len(param) < 3 { + return 0, 0, errCSIParseError + } + var hex int + hex, err = strconv.Atoi(param[2]) + if err != nil { + return 0, 0, errCSIParseError + } + return Get256Color(int32(hex)), 3, nil + default: + return 0, 0, errCSIParseError + } +} + +func getFontEffect(f int) Attribute { + switch fontEffect(f) { + case bold: + return AttrBold + case faint: + return AttrDim + case italic: + return AttrItalic + case underline: + return AttrUnderline + case blink: + return AttrBlink + case reverse: + return AttrReverse + case strike: + return AttrStrikeThrough + } + return AttrNone +} diff --git a/pkg/gocui/escape_test.go b/pkg/gocui/escape_test.go new file mode 100644 index 000000000..39ccbe908 --- /dev/null +++ b/pkg/gocui/escape_test.go @@ -0,0 +1,276 @@ +package gocui + +import ( + "strings" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestParseOne(t *testing.T) { + var ei *escapeInterpreter + + ei = newEscapeInterpreter(OutputNormal) + isEscape, err := ei.parseOne([]byte{'a'}) + assert.Equal(t, false, isEscape) + assert.NoError(t, err) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b[0K") + _, ok := ei.instruction.(eraseInLineFromCursor) + assert.Equal(t, true, ok) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b[K") + _, ok = ei.instruction.(eraseInLineFromCursor) + assert.Equal(t, true, ok) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b[1K") + _, ok = ei.instruction.(noInstruction) + assert.Equal(t, true, ok) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b(B") + _, ok = ei.instruction.(noInstruction) + assert.Equal(t, true, ok) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b)0") + _, ok = ei.instruction.(noInstruction) + assert.Equal(t, true, ok) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b*A") + _, ok = ei.instruction.(noInstruction) + assert.Equal(t, true, ok) + + ei = newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, "\x1b+K") + _, ok = ei.instruction.(noInstruction) + assert.Equal(t, true, ok) +} + +func TestParseOneColours(t *testing.T) { + scenarios := []struct { + outputMode OutputMode + input string + expectedFg Attribute + expectedBg Attribute + }{ + {OutputNormal, "\x1b[30m", ColorBlack, ColorDefault}, + {OutputNormal, "\x1b[31m", ColorRed, ColorDefault}, + {OutputNormal, "\x1b[32m", ColorGreen, ColorDefault}, + {OutputNormal, "\x1b[33m", ColorYellow, ColorDefault}, + {OutputNormal, "\x1b[34m", ColorBlue, ColorDefault}, + {OutputNormal, "\x1b[35m", ColorMagenta, ColorDefault}, + {OutputNormal, "\x1b[36m", ColorCyan, ColorDefault}, + {OutputNormal, "\x1b[37m", ColorWhite, ColorDefault}, + {OutputNormal, "\x1b[40m", ColorDefault, ColorBlack}, + {OutputNormal, "\x1b[41m", ColorDefault, ColorRed}, + {OutputNormal, "\x1b[42m", ColorDefault, ColorGreen}, + {OutputNormal, "\x1b[43m", ColorDefault, ColorYellow}, + {OutputNormal, "\x1b[44m", ColorDefault, ColorBlue}, + {OutputNormal, "\x1b[45m", ColorDefault, ColorMagenta}, + {OutputNormal, "\x1b[46m", ColorDefault, ColorCyan}, + {OutputNormal, "\x1b[47m", ColorDefault, ColorWhite}, + {OutputNormal, "\x1b[47;31m", ColorRed, ColorWhite}, + {OutputNormal, "\x1b[90m", Get256Color(8), ColorDefault}, + {OutputNormal, "\x1b[91m", Get256Color(9), ColorDefault}, + {OutputNormal, "\x1b[92m", Get256Color(10), ColorDefault}, + {OutputNormal, "\x1b[93m", Get256Color(11), ColorDefault}, + {OutputNormal, "\x1b[94m", Get256Color(12), ColorDefault}, + {OutputNormal, "\x1b[95m", Get256Color(13), ColorDefault}, + {OutputNormal, "\x1b[96m", Get256Color(14), ColorDefault}, + {OutputNormal, "\x1b[97m", Get256Color(15), ColorDefault}, + {OutputNormal, "\x1b[100m", ColorDefault, Get256Color(8)}, + {OutputNormal, "\x1b[101m", ColorDefault, Get256Color(9)}, + {OutputNormal, "\x1b[102m", ColorDefault, Get256Color(10)}, + {OutputNormal, "\x1b[103m", ColorDefault, Get256Color(11)}, + {OutputNormal, "\x1b[104m", ColorDefault, Get256Color(12)}, + {OutputNormal, "\x1b[105m", ColorDefault, Get256Color(13)}, + {OutputNormal, "\x1b[106m", ColorDefault, Get256Color(14)}, + {OutputNormal, "\x1b[107m", ColorDefault, Get256Color(15)}, + {Output256, "\x1b[38;5;32m", Get256Color(32), ColorDefault}, + {OutputTrue, "\x1b[38;5;32m", Get256Color(32), ColorDefault}, + {OutputTrue, "\x1b[38;2;50;103;205m", NewRGBColor(50, 103, 205), ColorDefault}, + {Output256, "\x1b[48;5;32m", ColorDefault, Get256Color(32)}, + {OutputTrue, "\x1b[48;5;32m", ColorDefault, Get256Color(32)}, + {OutputTrue, "\x1b[48;2;50;103;205m", ColorDefault, NewRGBColor(50, 103, 205)}, + {OutputTrue, "\x1b[1;95;48;2;255;224;224m", Get256Color(13), NewRGBColor(255, 224, 224)}, + } + + for _, scenario := range scenarios { + ei := newEscapeInterpreter(scenario.outputMode) + parseEscRunes(t, ei, scenario.input) + assert.Equal(t, scenario.expectedFg, ei.curFgColor&AttrColorBits) + assert.Equal(t, scenario.expectedBg, ei.curBgColor) + } + + // resetting colours + scenarios = []struct { + outputMode OutputMode + input string + expectedFg Attribute + expectedBg Attribute + }{ + {OutputNormal, "\x1b[39m", ColorDefault, ColorRed}, + {OutputNormal, "\x1b[49m", ColorRed, ColorDefault}, + {OutputNormal, "\x1b[0m", ColorDefault, ColorDefault}, + } + + for _, scenario := range scenarios { + ei := newEscapeInterpreter(scenario.outputMode) + ei.curFgColor = ColorRed + ei.curBgColor = ColorRed + parseEscRunes(t, ei, scenario.input) + assert.Equal(t, scenario.expectedFg, ei.curFgColor) + assert.Equal(t, scenario.expectedBg, ei.curBgColor) + } + + // setting attributes + attrScenarios := []struct { + outputMode OutputMode + input string + expectedAttr Attribute + }{ + {OutputNormal, "\x1b[1m", AttrBold}, + {OutputNormal, "\x1b[2m", AttrDim}, + {OutputNormal, "\x1b[3m", AttrItalic}, + {OutputNormal, "\x1b[4m", AttrUnderline}, + {OutputNormal, "\x1b[5m", AttrBlink}, + {OutputNormal, "\x1b[7m", AttrReverse}, + {OutputNormal, "\x1b[9m", AttrStrikeThrough}, + } + + for _, scenario := range attrScenarios { + ei := newEscapeInterpreter(scenario.outputMode) + parseEscRunes(t, ei, scenario.input) + style := ei.curFgColor & AttrStyleBits + assert.Equal(t, scenario.expectedAttr, style) + } +} + +func TestParseOneIgnoresUnknownSequences(t *testing.T) { + // Escape sequences the interpreter doesn't implement -- whether well-formed-but-unsupported + // (private modes, DECSCUSR, …) or outright malformed -- must be silently + // consumed rather than leaked into the view as literal text. + scenarios := []string{ + "\x1b[?9001h", // DEC private-mode set (?-prefix) + "\x1b[?25l", // hide cursor + "\x1b[?25h", // show cursor + "\x1b[2;J", // erase display (unusual 2;J variant) + "\x1b[H", // cursor home — re-anchors to row 1 (no-op when already there) + "\x1bc", // RIS — single-char ESC sequence + "\x1b[;5H", // empty first param — defaults to row 1, no-op + "\x1b[ q", // intermediate byte with no params (DECSCUSR family) + "\x1b[0 q", // intermediate byte after a param + "\x1b[1;;m", // malformed SGR: empty middle param + "\x1b]8bogus\x07", // OSC 8 missing ';' + "\x1b[" + strings.Repeat("0", 300) + "m", // single param overflows length cap + "\x1b[" + strings.Repeat("1;", 25) + "1m", // too many params + } + + for _, input := range scenarios { + ei := newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, input) + // An unimplemented/malformed sequence must leave no trace: no + // pending instruction, no color change. + _, noop := ei.instruction.(noInstruction) + assert.True(t, noop, "input %q left a pending instruction", input) + assert.Equal(t, ColorDefault, ei.curFgColor, "input %q mutated fg color", input) + assert.Equal(t, ColorDefault, ei.curBgColor, "input %q mutated bg color", input) + } +} + +func TestParseOneCursorPositioning(t *testing.T) { + // Cursor-positioning escapes that advance the row forward emit a + // cursorDown instruction; backward / same-row moves are ignored + // because the view's buffer is line-based. + scenarios := []struct { + input string + startRow int // parser's screenRow before parsing + wantAdvance int // 0 means "no instruction emitted" + }{ + {"\x1b[5;1H", 1, 4}, // CUP — absolute row 5 from row 1 + {"\x1b[5H", 1, 4}, // CUP with only the row param + {"\x1b[5;1H", 5, 0}, // CUP to the same row we're on — no-op + {"\x1b[2;1H", 5, 0}, // CUP backward — ignored + {"\x1b[5;1f", 1, 4}, // HVP alias for CUP + {"\x1b[5d", 1, 4}, // VPA — absolute row + {"\x1b[2d", 5, 0}, // VPA backward — ignored + {"\x1b[3B", 1, 3}, // CUD — relative + {"\x1b[B", 1, 1}, // CUD with default param of 1 + {"\x1b[2E", 1, 2}, // CNL — relative + } + + for _, s := range scenarios { + ei := newEscapeInterpreter(OutputNormal) + ei.screenRow = s.startRow + parseEscRunes(t, ei, s.input) + if s.wantAdvance == 0 { + _, noop := ei.instruction.(noInstruction) + assert.True(t, noop, "input %q at row %d should be a no-op", s.input, s.startRow) + } else { + cd, ok := ei.instruction.(cursorDown) + if assert.True(t, ok, "input %q at row %d should emit cursorDown", s.input, s.startRow) { + assert.Equal(t, s.wantAdvance, cd.n, "input %q at row %d", s.input, s.startRow) + } + } + } +} + +func TestParseOneCursorHomeReanchors(t *testing.T) { + // ConPTY emits cursor-home ([H) after [2J at the start of every screen. + // In a view that isn't rewound in lockstep with ConPTY (the command log) + // screenRow has drifted, so home must re-anchor it to the current write + // position rather than be dropped as a backward move — otherwise the + // absolute CUPs that follow compute negative, dropped advances and the + // rows ConPTY positioned with collapse together. + ei := newEscapeInterpreter(OutputNormal) + ei.screenRow = 12 // accumulated drift from earlier command-log output + + parseEscRunes(t, ei, "\x1b[H") + assert.Equal(t, 1, ei.screenRow, "home should re-anchor screenRow") + _, noop := ei.instruction.(noInstruction) + assert.True(t, noop, "home should not emit an instruction") + + // A subsequent CUP now advances relative to the re-anchored origin. + parseEscRunes(t, ei, "\x1b[3;1H") + cd, ok := ei.instruction.(cursorDown) + if assert.True(t, ok, "CUP after home should emit cursorDown") { + assert.Equal(t, 2, cd.n) + } +} + +func TestParseOneCursorForward(t *testing.T) { + // CUF (\x1b[NC) emits a cursorForward instruction so the view can + // materialize the N-cell gap as spaces. ConPTY uses this (often + // paired with ECH) to encode runs of default-colored spaces. + scenarios := []struct { + input string + wantN int + }{ + {"\x1b[5C", 5}, + {"\x1b[1C", 1}, + {"\x1b[C", 1}, // no param defaults to 1 + } + + for _, s := range scenarios { + ei := newEscapeInterpreter(OutputNormal) + parseEscRunes(t, ei, s.input) + cf, ok := ei.instruction.(cursorForward) + if assert.True(t, ok, "input %q should emit cursorForward", s.input) { + assert.Equal(t, s.wantN, cf.n, "input %q", s.input) + } + } +} + +func parseEscRunes(t *testing.T, ei *escapeInterpreter, runes string) { + t.Helper() + for _, b := range []byte(runes) { + isEscape, err := ei.parseOne([]byte{b}) + assert.Equal(t, true, isEscape) + assert.NoError(t, err) + } +} diff --git a/pkg/gocui/flush_test.go b/pkg/gocui/flush_test.go new file mode 100644 index 000000000..d4082fcf6 --- /dev/null +++ b/pkg/gocui/flush_test.go @@ -0,0 +1,292 @@ +package gocui + +import ( + "strings" + "testing" + + "github.com/stretchr/testify/assert" +) + +func newTestGui(t *testing.T) *Gui { + t.Helper() + g, err := NewGui(NewGuiOpts{ + OutputMode: OutputNormal, + Headless: true, + Width: 80, + Height: 24, + }) + assert.NoError(t, err) + t.Cleanup(func() { g.Close() }) + return g +} + +// setupViews creates a few views and does an initial full flush so all views +// start in a clean (non-tainted) state. +func setupViews(t *testing.T, g *Gui) (*View, *View) { + t.Helper() + + status, _ := g.SetView("status", 0, 22, 40, 24, 0) + status.Frame = false + main, _ := g.SetView("main", 0, 0, 80, 22, 0) + + // Initial content + status.SetContent("Ready") + main.SetContent("hello world") + + // Full flush to draw everything and clear tainted flags + assert.NoError(t, g.flush()) + + return status, main +} + +// pushContentOnly enqueues a content-only event directly, letting the test +// control the contentOnly flag (which Update/UpdateContentOnly hard-code). +func pushContentOnly(g *Gui, f func(*Gui) error) { + g.userEvents.enqueue(userEvent{f: f, task: g.NewTask(), contentOnly: true}) +} + +// pushRegular enqueues a regular (non-content-only) event directly. +func pushRegular(g *Gui, f func(*Gui) error) { + g.userEvents.enqueue(userEvent{f: f, task: g.NewTask(), contentOnly: false}) +} + +func TestFlushContentOnly_SkipsUntaintedViews(t *testing.T) { + g := newTestGui(t) + status, main := setupViews(t, g) + + // After initial flush, both views should be untainted + assert.False(t, status.IsTainted(), "status view should not be tainted after flush") + assert.False(t, main.IsTainted(), "main view should not be tainted after flush") + + // Modify only the status view + status.SetContent("Fetching /") + + assert.True(t, status.IsTainted(), "status view should be tainted after SetContent") + assert.False(t, main.IsTainted(), "main view should not be tainted (was not modified)") + + // flushContentOnly should succeed and clear status tainted flag + assert.NoError(t, g.flushContentOnly(g.views)) + + assert.False(t, status.IsTainted(), "status view should not be tainted after flushContentOnly") + assert.False(t, main.IsTainted(), "main view should not be tainted after flushContentOnly") +} + +func TestFlushContentOnly_WritesCorrectContent(t *testing.T) { + g := newTestGui(t) + status, _ := setupViews(t, g) + + status.SetContent("Fetching |") + assert.NoError(t, g.flushContentOnly(g.views)) + + assert.Equal(t, "Fetching |", status.Buffer()) +} + +func TestProcessEvent_ContentOnlyEvent_SkipsTaintedCheck(t *testing.T) { + g := newTestGui(t) + status, main := setupViews(t, g) + + // Send a content-only event that modifies only the status view + pushContentOnly(g, func(gui *Gui) error { + status.SetContent("Fetching /") + return nil + }) + + assert.NoError(t, g.processEvent()) + + // status was modified and drawn → tainted cleared + assert.False(t, status.IsTainted(), "status should not be tainted after processEvent with contentOnly") + // main was NOT modified → should still be untainted + assert.False(t, main.IsTainted(), "main should not be tainted after processEvent with contentOnly") +} + +func TestProcessEvent_RegularEvent_UsesFullFlush(t *testing.T) { + g := newTestGui(t) + status, _ := setupViews(t, g) + + // Regular event (not content-only) should trigger full flush + pushRegular(g, func(gui *Gui) error { + status.SetContent("Fetching \\") + return nil + }) + + assert.NoError(t, g.processEvent()) + + assert.False(t, status.IsTainted(), "status should not be tainted after full flush") +} + +func TestProcessEvent_MixedBatch_UsesFullFlush(t *testing.T) { + g := newTestGui(t) + status, main := setupViews(t, g) + + // Queue a content-only event followed by a regular event. + // processEvent picks up the first; processRemainingEvents picks up + // the second. Since the second is not contentOnly, full flush runs. + pushContentOnly(g, func(gui *Gui) error { + status.SetContent("Fetching -") + return nil + }) + pushRegular(g, func(gui *Gui) error { + main.SetContent("updated main") + return nil + }) + + assert.NoError(t, g.processEvent()) + + // Both views were modified and should have been drawn by full flush + assert.False(t, status.IsTainted(), "status should not be tainted after full flush") + assert.False(t, main.IsTainted(), "main should not be tainted after full flush") +} + +func TestProcessEvent_RegularThenContentOnly_UsesFullFlush(t *testing.T) { + g := newTestGui(t) + status, main := setupViews(t, g) + + // Even if a regular event comes first and the remaining are contentOnly, + // the batch must use full flush. + pushRegular(g, func(gui *Gui) error { + main.SetContent("new main content") + return nil + }) + pushContentOnly(g, func(gui *Gui) error { + status.SetContent("Fetching |") + return nil + }) + + assert.NoError(t, g.processEvent()) + + assert.False(t, status.IsTainted(), "status should not be tainted after full flush") + assert.False(t, main.IsTainted(), "main should not be tainted after full flush") +} + +func TestProcessRemainingEvents_AllContentOnly_ReturnsTrue(t *testing.T) { + g := newTestGui(t) + status, _ := setupViews(t, g) + + pushContentOnly(g, func(gui *Gui) error { + status.SetContent("a") + return nil + }) + pushContentOnly(g, func(gui *Gui) error { + status.SetContent("b") + return nil + }) + + contentOnly, err := g.processRemainingEvents() + assert.NoError(t, err) + assert.True(t, contentOnly, "should return true when all events are contentOnly") +} + +func TestProcessRemainingEvents_MixedEvents_ReturnsFalse(t *testing.T) { + g := newTestGui(t) + status, _ := setupViews(t, g) + + pushContentOnly(g, func(gui *Gui) error { + status.SetContent("a") + return nil + }) + pushRegular(g, func(gui *Gui) error { + status.SetContent("b") + return nil + }) + + contentOnly, err := g.processRemainingEvents() + assert.NoError(t, err) + assert.False(t, contentOnly, "should return false when any event is not contentOnly") +} + +func TestProcessRemainingEvents_EmptyQueue_ReturnsTrue(t *testing.T) { + g := newTestGui(t) + + contentOnly, err := g.processRemainingEvents() + assert.NoError(t, err) + assert.True(t, contentOnly, "should return true when no events are queued") +} + +// Ensure an overlapping view that is not tainted does not get overdrawn +func TestFlushContentOnly_DoesNotOverdrawHigherZViews(t *testing.T) { + g := newTestGui(t) + + // Base view + list, _ := g.SetView("list", 0, 0, 79, 23, 0) + list.Frame = false + list.SetContent(strings.Repeat("LIST LINE FILLER FILLER FILLER FILLER FILLER FILLER FILLER FILLER FILLER\n", 22)) + + // Overlapping 'popup' + popup, _ := g.SetView("popup", 20, 8, 60, 16, 0) + popup.Frame = false + popupLine := strings.Repeat("P", 60) + popup.SetContent(strings.Repeat(popupLine+"\n", 16)) + + // Full flush — popup ends up on top. + assert.NoError(t, g.flush()) + + cellAt := func(x, y int) string { + s, _, _ := g.screen.Get(x, y) + return s + } + + // Taint only the list view + list.SetContent(strings.Repeat(strings.Repeat("X", 80)+"\n", 22)) + assert.True(t, list.IsTainted(), "list should be tainted after SetContent") + assert.False(t, popup.IsTainted(), "popup should not be tainted") + + // flushContentOnly is what spinner ticks ultimately invoke. + assert.NoError(t, g.flushContentOnly(g.views)) + + assert.Equal(t, "P", cellAt(21, 9), + "popup region must still show popup content after flushContentOnly; "+ + "if this fails the popup-overdraw bug is present") + + // Additional checks to be sure + assert.Equal(t, "P", cellAt(40, 11), "interior popup cell should still show popup content") + assert.Equal(t, "P", cellAt(58, 14), "near-edge popup cell should still show popup content") + + // Ensure tainted view was updated + assert.Equal(t, "X", cellAt(5, 5), "list cell outside popup should show new list content") + assert.Equal(t, "X", cellAt(70, 20), "list cell outside popup should show new list content") +} + +// Ensure transitive overlap: with views in z-order [a, b, c] where b overlaps a +// and c overlaps b but c does NOT overlap a, tainting a must redraw all three — +// otherwise b's redraw paints over c. +func TestFlushContentOnly_RedrawsTransitivelyOverlappingViews(t *testing.T) { + g := newTestGui(t) + + // Geometry: b straddles a and c; a and c are disjoint. + // a: (0,0)-(40,10) b: (30,5)-(60,15) c: (50,12)-(75,20) + a, _ := g.SetView("a", 0, 0, 40, 10, 0) + a.Frame = false + a.SetContent(strings.Repeat(strings.Repeat("A", 60)+"\n", 20)) + + b, _ := g.SetView("b", 30, 5, 60, 15, 0) + b.Frame = false + b.SetContent(strings.Repeat(strings.Repeat("B", 60)+"\n", 20)) + + c, _ := g.SetView("c", 50, 12, 75, 20, 0) + c.Frame = false + c.SetContent(strings.Repeat(strings.Repeat("C", 60)+"\n", 20)) + + assert.NoError(t, g.flush()) + + cellAt := func(x, y int) string { + s, _, _ := g.screen.Get(x, y) + return s + } + + // Taint only a. + a.SetContent(strings.Repeat(strings.Repeat("X", 60)+"\n", 20)) + assert.True(t, a.IsTainted()) + assert.False(t, b.IsTainted()) + assert.False(t, c.IsTainted()) + + assert.NoError(t, g.flushContentOnly(g.views)) + + // a redrawn (direct). + assert.Equal(t, "X", cellAt(5, 5), "a should be redrawn (tainted)") + // b redrawn (overlaps a). + assert.Equal(t, "B", cellAt(45, 7), "b should be redrawn (overlaps a)") + // c redrawn transitively (overlaps b, which overlaps a). Without the + // transitive case, b's redraw would paint over c at this cell. + assert.Equal(t, "C", cellAt(55, 14), + "c should be redrawn transitively; if 'B' here, b's redraw painted over c") +} diff --git a/vendor/github.com/jesseduffield/gocui/gui.go b/pkg/gocui/gui.go similarity index 55% rename from vendor/github.com/jesseduffield/gocui/gui.go rename to pkg/gocui/gui.go index 96c622b3a..67fbd1aa2 100644 --- a/vendor/github.com/jesseduffield/gocui/gui.go +++ b/pkg/gocui/gui.go @@ -5,17 +5,19 @@ package gocui import ( - "context" standardErrors "errors" "runtime" - "slices" "strings" "sync" + "sync/atomic" "time" - "github.com/gdamore/tcell/v2" + "github.com/gdamore/tcell/v3" "github.com/go-errors/errors" + "github.com/jesseduffield/generics/set" + "github.com/petermattis/goid" "github.com/rivo/uniseg" + "github.com/samber/lo" ) // OutputMode represents an output mode, which determines how colors @@ -25,15 +27,6 @@ type OutputMode int const DOUBLE_CLICK_THRESHOLD = 500 * time.Millisecond var ( - // ErrAlreadyBlacklisted is returned when the keybinding is already blacklisted. - ErrAlreadyBlacklisted = standardErrors.New("keybind already blacklisted") - - // ErrBlacklisted is returned when the keybinding being parsed / used is blacklisted. - ErrBlacklisted = standardErrors.New("keybind blacklisted") - - // ErrNotBlacklisted is returned when a keybinding being whitelisted is not blacklisted. - ErrNotBlacklisted = standardErrors.New("keybind not blacklisted") - // ErrNoSuchKeybind is returned when the keybinding being parsed does not exist. ErrNoSuchKeybind = standardErrors.New("no such keybind") @@ -45,6 +38,11 @@ var ( // ErrKeybindingNotHandled is returned when a keybinding is not handled, so that the key can be dispatched further ErrKeybindingNotHandled = standardErrors.New("keybinding not handled") + + // ErrLoopExited is returned by OnUIThreadAndWait when MainLoop has already + // returned. Nothing dequeues user events after that, so the callback it was + // asked to run on the main goroutine never will be. + ErrLoopExited = standardErrors.New("main loop exited") ) const ( @@ -92,23 +90,19 @@ type ViewMouseBinding struct { Modifier Modifier // must be a mouse key - Key Key + Key KeyName } type ViewMouseBindingOpts struct { X int // i.e. origin x + cursor x Y int // i.e. origin y + cursor y - Key Key // which button was clicked (will be one of the Mouse* constants) + Key KeyName // which button was clicked (will be one of the Mouse* constants) IsDoubleClick bool // true if this is a double click } type GuiMutexes struct { - // tickingMutex ensures we don't have two loops ticking. The point of 'ticking' - // is to refresh the gui rapidly so that loader characters can be animated. - tickingMutex sync.Mutex - ViewsMutex sync.Mutex } @@ -116,6 +110,7 @@ type replayedEvents struct { Keys chan *TcellKeyEventWrapper Resizes chan *TcellResizeEventWrapper MouseEvents chan *TcellMouseEventWrapper + FocusEvents chan *TcellFocusEventWrapper } type RecordingConfig struct { @@ -126,7 +121,7 @@ type RecordingConfig struct { type clickInfo struct { x int y int - key Key + key KeyName viewName string time time.Time } @@ -135,25 +130,33 @@ type clickInfo struct { // and keybindings. type Gui struct { RecordingConfig - // ReplayedEvents is for passing pre-recorded input events, for the purposes of testing - ReplayedEvents replayedEvents + // replayedEvents is for passing simulated input events, for the purposes + // of testing. Events must be submitted through the Replay* methods, which + // attach a task to each event; pushing into the channels directly would + // bypass the busy-tracking that integration tests rely on. + replayedEvents replayedEvents playRecording bool - tabClickBindings []*tabClickBinding - viewMouseBindings []*ViewMouseBinding - lastClick *clickInfo - gEvents chan GocuiEvent - userEvents chan userEvent - views []*View - currentView *View - managers []Manager - keybindings []*keybinding - focusHandler func(bool) error - openHyperlink func(string, string) error - maxX, maxY int - outputMode OutputMode - stop chan struct{} - blacklist []Key + tabClickBindings []*tabClickBinding + viewMouseBindings []*ViewMouseBinding + lastClick *clickInfo + gEvents chan GocuiEvent + userEvents *userEventQueue + views []*View + currentView *View + managers []Manager + keybindings []*keybinding + focusHandler func(bool) error + openHyperlink func(string, string) error + onSelectSearchResultFunc func(*View, int) + renderSearchStatusFunc func(*View, int, int) + maxX, maxY int + outputMode OutputMode + stop chan struct{} + // loopExited is closed when MainLoop returns, so callers (e.g. the + // integration-test harness) can wait for the event loop to actually finish + // rather than polling or sleeping a fixed interval. + loopExited chan struct{} // BgColor and FgColor allow to configure the background and foreground // colors of the GUI. @@ -189,14 +192,14 @@ type Gui struct { Mutexes GuiMutexes OnSearchEscape func() error - // these keys must either be of type Key of rune - SearchEscapeKey any - NextSearchMatchKey any - PrevSearchMatchKey any + + SearchEscapeKeys []Key + NextSearchMatchKeys []Key + PrevSearchMatchKeys []Key ErrorHandler func(error) error - ShouldHandleMouseEvent func(view *View, key Key) bool + ShouldHandleMouseEvent func(view *View, key KeyName) bool screen tcell.Screen suspendedMutex sync.Mutex @@ -204,7 +207,33 @@ type Gui struct { taskManager *TaskManager - lastHoverView *View + // The task of the event currently being processed on the main goroutine, if + // any. Only touched from the main goroutine (in processEvent). It's excluded + // from the Busy() check so that an event handler asking "is anything else + // busy?" doesn't count itself. + currentTask Task + + lastHoverView *View + mouseCapture *View + mouseGestureCanceled bool + + // uiThreadID is the goroutine id of the main event loop, recorded when + // MainLoop starts. IsUIThread compares against it. Written once, read from + // worker goroutines, so it's atomic. + uiThreadID atomic.Int64 + + // focused says whether the terminal we're running in has focus, as far as + // its focus reports tell us (see IsFocused). Written by the event loop, + // readable from anywhere, so it's atomic. + focused atomic.Bool + + // blockInputCount, when greater than zero, withholds keyboard input from + // the handlers: key events are buffered into bufferedKeyEvents and replayed + // once the count drops back to zero, while mouse clicks and hover are + // dropped outright. It's a counter so blocking can nest. Both fields are + // only touched on the UI thread. See BeginBlockingEvents. + blockInputCount int + bufferedKeyEvents []GocuiEvent } type NewGuiOpts struct { @@ -247,16 +276,18 @@ func NewGui(opts NewGuiOpts) (*Gui, error) { g.outputMode = opts.OutputMode g.stop = make(chan struct{}) + g.loopExited = make(chan struct{}) g.gEvents = make(chan GocuiEvent, 20) - g.userEvents = make(chan userEvent, 20) + g.userEvents = newUserEventQueue() g.taskManager = newTaskManager() if opts.PlayRecording { - g.ReplayedEvents = replayedEvents{ + g.replayedEvents = replayedEvents{ Keys: make(chan *TcellKeyEventWrapper), Resizes: make(chan *TcellResizeEventWrapper), MouseEvents: make(chan *TcellMouseEventWrapper), + FocusEvents: make(chan *TcellFocusEventWrapper), } } @@ -268,24 +299,75 @@ func NewGui(opts NewGuiOpts) (*Gui, error) { g.SupportOverlaps = opts.SupportOverlaps // default keys for when searching strings in a view - g.SearchEscapeKey = KeyEsc - g.NextSearchMatchKey = 'n' - g.PrevSearchMatchKey = 'N' + g.SearchEscapeKeys = []Key{NewKeyName(KeyEsc)} + g.NextSearchMatchKeys = []Key{NewKeyRune('n')} + g.PrevSearchMatchKeys = []Key{NewKeyRune('N')} g.playRecording = opts.PlayRecording + // Record the UI thread here, at construction. This assumes NewGui is called + // on the same goroutine that will run MainLoop, which holds for all our + // callers -- and it means IsUIThread is already correct for the UI work that + // runs during startup, before we reach MainLoop. + g.uiThreadID.Store(goid.Get()) + + // Assume we start out focused: a terminal that supports focus reports sends + // one for the state it is already in when we turn reporting on in MainLoop, + // and passing that on as a change would have the app react to a change that + // never happened. + g.focused.Store(true) + return g, nil } func (g *Gui) NewTask() *TaskImpl { - return g.taskManager.NewTask() + return g.taskManager.NewTask(false) } -// An idle listener listens for when the program is idle. This is useful for -// integration tests which can wait for the program to be idle before taking -// the next step in the test. -func (g *Gui) AddIdleListener(c chan struct{}) { - g.taskManager.addIdleListener(c) +// NewBackgroundTask creates a task that is tracked for idle detection but does +// not count towards the program being busy for repo-switch safety. See +// TaskImpl.background. +func (g *Gui) NewBackgroundTask() *TaskImpl { + return g.taskManager.NewTask(true) +} + +// ReplayKeyEvent simulates a key press, as if the user had typed it. It's used +// by integration tests. The event carries a task, so that the program counts +// as busy from before the event is submitted until the main loop has fully +// processed it; the test driver relies on this when it waits for the program +// to go idle after submitting an event. (If the task were only created once +// the main loop picks the event up, there would be a window in which the event +// is still in flight but nothing counts as busy.) +func (g *Gui) ReplayKeyEvent(ev *TcellKeyEventWrapper) { + ev.task = g.NewTask() + g.replayedEvents.Keys <- ev +} + +// ReplayMouseEvent is like ReplayKeyEvent, but for mouse events. +func (g *Gui) ReplayMouseEvent(ev *TcellMouseEventWrapper) { + ev.task = g.NewTask() + g.replayedEvents.MouseEvents <- ev +} + +// ReplayFocusEvent is like ReplayKeyEvent, but for focus events. +func (g *Gui) ReplayFocusEvent(ev *TcellFocusEventWrapper) { + ev.task = g.NewTask() + g.replayedEvents.FocusEvents <- ev +} + +// Busy reports whether any foreground work is in flight, ignoring the event +// currently being processed on the main goroutine (see currentTask). Background +// routines (auto-fetch etc.) don't count. It's used to decide whether it's safe +// to switch repos. Must be called on the main goroutine. +func (g *Gui) Busy() bool { + return g.taskManager.hasBusyForegroundTaskExcept(g.currentTask) +} + +// WaitUntilIdle blocks until the program is idle (no busy tasks). This is +// useful for integration tests which want to wait for the program to finish +// processing before taking the next step in the test. +func (g *Gui) WaitUntilIdle() { + g.taskManager.WaitUntilIdle() } // Close finalizes the library. It should be called after a successful @@ -295,6 +377,11 @@ func (g *Gui) Close() { Screen.Fini() } +// LoopExited returns a channel that is closed once MainLoop has returned. +func (g *Gui) LoopExited() <-chan struct{} { + return g.loopExited +} + // Size returns the terminal's size. func (g *Gui) Size() (x, y int) { return g.maxX, g.maxY @@ -332,7 +419,7 @@ func (g *Gui) SetView(name string, x0, y0, x1, y1 int, overlaps byte) (*View, er v.y1 = y1 if sizeChanged { - v.clearViewLines() + v.ClearViewLines() if v.Editable { cursorX, cursorY := v.TextArea.GetCursorXY() @@ -355,11 +442,26 @@ func (g *Gui) SetView(name string, x0, y0, x1, y1 int, overlaps byte) (*View, er v.Overlaps = overlaps g.views = append(g.views, v) + v.setOnSelectResult(g.onSelectSearchItem) + v.setRenderSearchStatus(g.renderSearchStatus) + g.Mutexes.ViewsMutex.Unlock() return v, errors.Wrap(ErrUnknownView, 0) } +func (g *Gui) onSelectSearchItem(v *View, selectedLineIdx int) { + if g.onSelectSearchResultFunc != nil { + g.onSelectSearchResultFunc(v, selectedLineIdx) + } +} + +func (g *Gui) renderSearchStatus(v *View, selected int, total int) { + if g.renderSearchStatusFunc != nil { + g.renderSearchStatusFunc(v, selected, total) + } +} + // SetViewBeneath sets a view stacked beneath another view func (g *Gui) SetViewBeneath(name string, aboveViewName string, height int) (*View, error) { aboveView, err := g.View(aboveViewName) @@ -513,6 +615,12 @@ func (g *Gui) DeleteView(name string) error { for i, v := range g.views { if v.name == name { + if g.mouseCapture == v { + g.CancelMouseCapture() + } + if g.lastHoverView == v { + g.lastHoverView = nil + } g.views = append(g.views[:i], g.views[i+1:]...) return nil } @@ -543,42 +651,9 @@ func (g *Gui) CurrentView() *View { // SetKeybinding creates a new keybinding. If viewname equals to "" // (empty string) then the keybinding will apply to all views. key must // be a rune or a Key. -// -// When mouse keys are used (MouseLeft, MouseRight, ...), modifier might not work correctly. -// It behaves differently on different platforms. Somewhere it doesn't register Alt key press, -// on others it might report Ctrl as Alt. It's not consistent and therefore it's not recommended -// to use with mouse keys. -func (g *Gui) SetKeybinding(viewname string, key any, mod Modifier, handler func(*Gui, *View) error) error { - var kb *keybinding - - k, ch, err := getKey(key) - if err != nil { - return err - } - - if g.isBlacklisted(k) { - return ErrBlacklisted - } - - kb = newKeybinding(viewname, k, ch, mod, handler) +func (g *Gui) SetKeybinding(viewname string, key Key, handler func(*Gui, *View) error) { + kb := newKeybinding(viewname, key, handler) g.keybindings = append(g.keybindings, kb) - return nil -} - -// DeleteKeybinding deletes a keybinding. -func (g *Gui) DeleteKeybinding(viewname string, key any, mod Modifier) error { - k, ch, err := getKey(key) - if err != nil { - return err - } - - for i, kb := range g.keybindings { - if kb.viewName == viewname && kb.ch == ch && kb.key == k && kb.mod == mod { - g.keybindings = append(g.keybindings[:i], g.keybindings[i+1:]...) - return nil - } - } - return errors.New("keybinding not found") } // DeleteKeybindings deletes all keybindings of view. @@ -600,39 +675,33 @@ func (g *Gui) DeleteViewKeybindings(viewname string) { } // SetTabClickBinding sets a binding for a tab click event -func (g *Gui) SetTabClickBinding(viewName string, handler tabClickHandler) error { +func (g *Gui) SetTabClickBinding(viewName string, handler tabClickHandler) { g.tabClickBindings = append(g.tabClickBindings, &tabClickBinding{ viewName: viewName, handler: handler, }) - - return nil } -func (g *Gui) SetViewClickBinding(binding *ViewMouseBinding) error { +func (g *Gui) SetViewClickBinding(binding *ViewMouseBinding) { g.viewMouseBindings = append(g.viewMouseBindings, binding) - - return nil } -// BlackListKeybinding adds a keybinding to the blacklist -func (g *Gui) BlacklistKeybinding(k Key) error { - if slices.Contains(g.blacklist, k) { - return ErrAlreadyBlacklisted - } - g.blacklist = append(g.blacklist, k) - return nil +// captureMouse routes subsequent mouse events to view until the mouse button is +// released or CancelMouseCapture is called. +func (g *Gui) captureMouse(view *View) { + g.mouseCapture = view + g.mouseGestureCanceled = false } -// WhiteListKeybinding removes a keybinding from the blacklist -func (g *Gui) WhitelistKeybinding(k Key) error { - for i, j := range g.blacklist { - if j == k { - g.blacklist = append(g.blacklist[:i], g.blacklist[i+1:]...) - return nil - } - } - return ErrNotBlacklisted +func (g *Gui) releaseMouseCapture() { + g.mouseCapture = nil +} + +// CancelMouseCapture releases capture and ignores the rest of the physical +// gesture until the mouse button is released. +func (g *Gui) CancelMouseCapture() { + g.releaseMouseCapture() + g.mouseGestureCanceled = true } func (g *Gui) SetFocusHandler(handler func(bool) error) { @@ -643,49 +712,243 @@ func (g *Gui) SetOpenHyperlinkFunc(openHyperlinkFunc func(string, string) error) g.openHyperlink = openHyperlinkFunc } -// getKey takes an empty interface with a key and returns the corresponding -// typed Key or rune. -func getKey(key any) (Key, rune, error) { - switch t := key.(type) { - case nil: // Ignore keybinding if `nil` - return 0, 0, nil - case Key: - return t, 0, nil - case rune: - return 0, t, nil - default: - return 0, 0, errors.New("unknown type") - } +func (g *Gui) SetOnSelectSearchResultFunc(onSelectSearchResultFunc func(*View, int)) { + g.onSelectSearchResultFunc = onSelectSearchResultFunc +} + +func (g *Gui) SetRenderSearchStatusFunc(renderSearchStatusFunc func(*View, int, int)) { + g.renderSearchStatusFunc = renderSearchStatusFunc +} + +// SetUpdateQueueHighWaterMarkHandler registers a diagnostic callback invoked +// with the new depth whenever the queue of pending Update callbacks reaches a +// new maximum. It may be called from any goroutine. +func (g *Gui) SetUpdateQueueHighWaterMarkHandler(f func(depth int)) { + g.userEvents.setHighWaterMarkHandler(f) } // userEvent represents an event triggered by the user. type userEvent struct { f func(*Gui) error task Task + // Signals that this event only modifies view content (e.g. SetContent). + // When all events in a batch are contentOnly, processEvent + // can skip the expensive layout() call in flush(). + contentOnly bool } -// Update executes the passed function. This method can be called safely from a -// goroutine in order to update the GUI. It is important to note that the -// passed function won't be executed immediately, instead it will be added to -// the user events queue. Given that Update spawns a goroutine, the order in -// which the user events will be handled is not guaranteed. +// userEventQueue is an unbounded, order-preserving FIFO of work enqueued by +// Update and friends for the main loop to run. +// +// It's unbounded (rather than a fixed-size channel) because producers must +// never block or lose work. Update can be called from the UI goroutine itself, +// where a blocking send would deadlock against the loop that drains the queue; +// and it can be called from arbitrary worker goroutines that may enqueue faster +// than the loop drains. That happens while the loop is stalled — suspended for +// a subprocess (the editor runs on the UI thread), or hung in a long handler — +// and also when a long-running worker operation emits a steady stream of +// updates that outpaces the loop (e.g. the waiting-status spinner ticks while a +// large directory is toggled into a custom patch). A fixed channel forces a +// choice between blocking (deadlock), dropping or reordering, and panicking on +// overflow; an unbounded queue avoids all three while preserving FIFO order. +// +// enqueue appends under the mutex and rings the doorbell; the main loop selects +// on the doorbell to wake, then drains the slice to empty. The doorbell is +// buffered(1) and rung with a non-blocking send, so it's a coalescing "work +// pending" flag rather than a per-event signal: a burst of appends leaves at +// most one token, and the loop drains everything the token represents on a +// single wake. A token left over after a drain (because the drain happened to +// empty the slice after the ring) just causes one harmless empty wake. +type userEventQueue struct { + mutex sync.Mutex + events []userEvent + doorbell chan struct{} + + // highWaterMark is the deepest the queue has ever been, and + // onHighWaterMark (if set) is called with the new depth each time that + // record is broken. Purely diagnostic: it lets us see how deep the queue + // gets in practice (see SetUpdateQueueHighWaterMarkHandler). + highWaterMark int + onHighWaterMark func(int) +} + +func newUserEventQueue() *userEventQueue { + return &userEventQueue{doorbell: make(chan struct{}, 1)} +} + +// enqueue appends an event and wakes the main loop. It never blocks. +func (q *userEventQueue) enqueue(ev userEvent) { + q.mutex.Lock() + q.events = append(q.events, ev) + newHighWaterMark := 0 + if len(q.events) > q.highWaterMark { + q.highWaterMark = len(q.events) + newHighWaterMark = q.highWaterMark + } + onHighWaterMark := q.onHighWaterMark + q.mutex.Unlock() + + // Report outside the lock: the handler does I/O (logging) and must not + // stall other producers or the draining loop. + if newHighWaterMark > 0 && onHighWaterMark != nil { + onHighWaterMark(newHighWaterMark) + } + + select { + case q.doorbell <- struct{}{}: + default: + } +} + +func (q *userEventQueue) setHighWaterMarkHandler(f func(int)) { + q.mutex.Lock() + q.onHighWaterMark = f + q.mutex.Unlock() +} + +// dequeue pops the oldest event, reporting false when the queue is empty. +func (q *userEventQueue) dequeue() (userEvent, bool) { + q.mutex.Lock() + defer q.mutex.Unlock() + + if len(q.events) == 0 { + return userEvent{}, false + } + ev := q.events[0] + if len(q.events) == 1 { + // Release the backing array whenever the queue drains, so a one-off + // burst doesn't pin its peak size for the rest of the session. + q.events = nil + } else { + q.events[0] = userEvent{} + q.events = q.events[1:] + } + return ev, true +} + +// Update enqueues f for the UI loop to run on its next iteration. Multiple +// Update calls from the same goroutine arrive in source order (the queue is +// FIFO). The enqueue never blocks and never drops work; see userEventQueue for +// why the queue is unbounded. func (g *Gui) Update(f func(*Gui) error) { - task := g.NewTask() - - go g.updateAsyncAux(f, task) + g.update(f, false) } -// UpdateAsync is a version of Update that does not spawn a go routine, it can -// be a bit more efficient in cases where Update is called many times like when -// tailing a file. In general you should use Update() -func (g *Gui) UpdateAsync(f func(*Gui) error) { - task := g.NewTask() - - g.updateAsyncAux(f, task) +// Like Update, but the enqueued work is a background routine (or triggered by +// one), so it doesn't count towards the program being busy for repo-switch +// safety. See TaskImpl.background. +func (g *Gui) UpdateBackground(f func(*Gui) error) { + g.update(f, true) } -func (g *Gui) updateAsyncAux(f func(*Gui) error, task Task) { - g.userEvents <- userEvent{f: f, task: task} +func (g *Gui) update(f func(*Gui) error, background bool) { + task := g.taskManager.NewTask(background) + g.userEvents.enqueue(userEvent{f: f, task: task}) +} + +// Like Update, but signals that the callback only modifies content. +func (g *Gui) UpdateContentOnly(f func(*Gui) error) { + g.updateContentOnly(f, false) +} + +// Like UpdateContentOnly, but for background work (see UpdateBackground). +func (g *Gui) UpdateContentOnlyBackground(f func(*Gui) error) { + g.updateContentOnly(f, true) +} + +func (g *Gui) updateContentOnly(f func(*Gui) error, background bool) { + task := g.taskManager.NewTask(background) + g.userEvents.enqueue(userEvent{f: f, task: task, contentOnly: true}) +} + +// IsUIThread reports whether the caller is running on the main event-loop +// goroutine (the one running MainLoop). It calls goid.Get, so use it only for +// debug assertions, not to drive production control flow. +func (g *Gui) IsUIThread() bool { + return goid.Get() == g.uiThreadID.Load() +} + +// BeginBlockingEvents starts withholding keyboard input from the handlers, so a +// long-running operation can't be disrupted by keys the user presses while it +// runs. Keys are buffered and replayed once EndBlockingEvents balances this +// call; mouse clicks and hover are dropped for the duration. Scrolling, +// resizing, focus changes and all rendering keep working throughout. It's a +// counter, so blocking nests; every call must be paired with EndBlockingEvents. +// +// Must be called on the UI thread. Callers arrange this by beginning the block +// synchronously from the keybinding handler, before dispatching the operation +// to a worker — beginning it from the worker would race the next queued +// keypress, which is exactly the input we mean to withhold. +func (g *Gui) BeginBlockingEvents() { + g.blockInputCount++ +} + +// EndBlockingEvents balances a BeginBlockingEvents call. When the last nested +// block ends, the keys buffered while blocked are replayed in order through the +// normal dispatch path, so they act on the now-current context (a key whose +// binding no longer exists is simply ignored, just as if it had been pressed +// now). Must be called on the UI thread. +func (g *Gui) EndBlockingEvents() error { + g.blockInputCount-- + if g.blockInputCount > 0 { + return nil + } + + buffered := g.bufferedKeyEvents + g.bufferedKeyEvents = nil + for i := range buffered { + if err := g.handleEvent(&buffered[i]); err != nil { + return err + } + } + return nil +} + +// OnUIThreadAndWait runs f on the main event-loop goroutine and blocks the +// caller until f has run. Use it to read UI-thread-owned state (the model, +// contexts) from a worker without racing the UI thread. +// +// The error it returns is the wait's own, never f's: it reports that f was not +// run at all, which happens when the main loop has exited (ErrLoopExited). f +// doesn't report an error because what callers want on the UI thread — reading +// and mutating state — doesn't fail. +// +// It must be called from a worker goroutine, never from the UI thread itself: +// the UI thread would block waiting for a callback only it can run, which +// deadlocks. Callers arrange this by construction (see the refresh helper's +// RefreshFromWorker); a debug-only assertion there guards against getting it +// wrong. +func (g *Gui) OnUIThreadAndWait(f func()) error { + return g.onUIThreadAndWait(f, false) +} + +// Like OnUIThreadAndWait, but the enqueued work belongs to a background routine, +// so it doesn't count towards the program being busy (see UpdateBackground). +func (g *Gui) OnUIThreadAndWaitBackground(f func()) error { + return g.onUIThreadAndWait(f, true) +} + +func (g *Gui) onUIThreadAndWait(f func(), background bool) error { + enqueue := g.Update + if background { + enqueue = g.UpdateBackground + } + + ran := make(chan struct{}) + enqueue(func(*Gui) error { + f() + close(ran) + return nil + }) + + select { + case <-ran: + return nil + case <-g.loopExited: + // The queue we just enqueued onto is no longer being served, so waiting + // on `ran` here would mean waiting for the rest of the process's life. + return ErrLoopExited + } } // Calls a function in a goroutine. Handles panics gracefully and tracks @@ -695,7 +958,18 @@ func (g *Gui) updateAsyncAux(f func(*Gui) error, task Task) { // background goroutines where you wouldn't want lazygit to be considered busy // (i.e. when you wouldn't want a loader to be shown to the user) func (g *Gui) OnWorker(f func(Task) error) { - task := g.NewTask() + g.onWorker(f, false) +} + +// Like OnWorker, but for a background routine (or work triggered by one), so it +// doesn't count towards the program being busy for repo-switch safety. See +// TaskImpl.background. +func (g *Gui) OnWorkerBackground(f func(Task) error) { + g.onWorker(f, true) +} + +func (g *Gui) onWorker(f func(Task) error, background bool) { + task := g.taskManager.NewTask(background) go func() { g.onWorkerAux(f, task) task.Done() @@ -759,6 +1033,8 @@ func (g *Gui) SetManagerFunc(manager func(*Gui) error) { // MainLoop runs the main loop until an error is returned. A successful // finish should return ErrQuit. func (g *Gui) MainLoop() error { + defer close(g.loopExited) + go func() { for { select { @@ -801,48 +1077,86 @@ func (g *Gui) handleError(err error) error { } func (g *Gui) processEvent() error { + contentOnly := false + + // currentTask is the task of the event we're about to handle; recording it + // lets Busy() ignore it, so a handler asking "is anything else busy?" (the + // repo-switch guard does) doesn't count itself. Handlers of the remaining + // events drained below run with currentTask still set to this primary event; + // that's fine because the only Busy() callers are keybinding handlers, which + // are always the primary event here. select { case ev := <-g.gEvents: - task := g.NewTask() - defer func() { task.Done() }() + // Replayed test events already carry their task (see ReplayKeyEvent); + // organic events get theirs here. + task := ev.task + if task == nil { + task = g.NewTask() + } + g.currentTask = task + defer func() { g.currentTask = nil; task.Done() }() if err := g.handleError(g.handleEvent(&ev)); err != nil { return err } - case ev := <-g.userEvents: - defer func() { ev.task.Done() }() + case <-g.userEvents.doorbell: + ev, ok := g.userEvents.dequeue() + if !ok { + // A leftover doorbell token whose events were already drained by a + // previous iteration's processRemainingEvents: nothing to run and + // nothing new to render. + return nil + } + contentOnly = ev.contentOnly + g.currentTask = ev.task + defer func() { g.currentTask = nil; ev.task.Done() }() if err := g.handleError(ev.f(g)); err != nil { return err } } - if err := g.processRemainingEvents(); err != nil { - return err - } - if err := g.flush(); err != nil { + remainingContentOnly, err := g.processRemainingEvents() + if err != nil { return err } + contentOnly = contentOnly && remainingContentOnly - return nil + if contentOnly { + return g.flushContentOnly(g.views) + } + return g.flush() } // processRemainingEvents handles the remaining events in the events pool. -func (g *Gui) processRemainingEvents() error { +// Returns true if all processed events were content-only. +func (g *Gui) processRemainingEvents() (bool, error) { + contentOnly := true for { select { case ev := <-g.gEvents: - if err := g.handleError(g.handleEvent(&ev)); err != nil { - return err + contentOnly = false + err := g.handleError(g.handleEvent(&ev)) + if ev.task != nil { + ev.task.Done() } - case ev := <-g.userEvents: + if err != nil { + return false, err + } + default: + // No gui event is pending; drain a queued user event instead. + // gui events take priority so input stays responsive, but they're + // bounded (buffer of 20), so this can't starve the user-event queue. + ev, ok := g.userEvents.dequeue() + if !ok { + return contentOnly, nil + } + contentOnly = ev.contentOnly && contentOnly err := g.handleError(ev.f(g)) ev.task.Done() if err != nil { - return err + return false, err } - default: - return nil } } } @@ -850,6 +1164,17 @@ func (g *Gui) processRemainingEvents() error { // handleEvent handles an event, based on its type (key-press, error, // etc.) func (g *Gui) handleEvent(ev *GocuiEvent) error { + if g.blockInputCount > 0 && eventWithheldWhileBlocking(ev) { + if ev.Type == eventKey { + // Buffer keys so they replay against fresh state on unblock. + g.bufferedKeyEvents = append(g.bufferedKeyEvents, *ev) + } + // Mouse clicks and hover fall through to here without being buffered: + // replaying them once the operation has changed the layout underneath + // them would target the wrong thing, so we drop them outright. + return nil + } + switch ev.Type { case eventKey, eventMouse, eventMouseMove: return g.onKey(ev) @@ -868,6 +1193,24 @@ func (g *Gui) handleEvent(ev *GocuiEvent) error { } } +// eventWithheldWhileBlocking reports whether an event must not reach the +// handlers while input is blocked (see BeginBlockingEvents). Key events are +// withheld (buffered for replay); mouse clicks and hover are withheld (dropped). +// Everything else — mouse scrolling, resize, focus, paste, errors — flows +// through as usual. +func eventWithheldWhileBlocking(ev *GocuiEvent) bool { + switch ev.Type { + case eventKey: + return true + case eventMouse: + return !IsMouseScrollKey(ev.Key.KeyName()) + case eventMouseMove: + return true + default: + return false + } +} + func (g *Gui) onResize() { // not sure if we actually need this // g.screen.Sync() @@ -922,14 +1265,14 @@ func calcScrollbarRune( ) rune { if showScrollbar && (position >= scrollbarStart && position <= scrollbarEnd) { return '▐' - } else { - return runeV } + + return runeV } func calcRealScrollbarStartEnd(v *View) (bool, int, int) { height := v.InnerHeight() - fullHeight := v.ViewLinesHeight() - v.scrollMargin() + fullHeight := v.scrollbarContentHeight() - v.scrollMargin() if v.CanScrollPastBottom { fullHeight += height @@ -1111,7 +1454,7 @@ func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) error { currentBgColor = v.BgColor } - if i >= currentTabStart && i <= currentTabEnd { + if i >= currentTabStart && i <= currentTabEnd && g.IsFocused() { currentFgColor = v.SelFgColor if v != g.currentView { currentFgColor &= ^AttrBold @@ -1150,7 +1493,7 @@ func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) error { // drawListFooter draws the footer of a list view, showing something like '1 of 10' func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) error { - if len(v.lines) == 0 { + if len(v.buf.lines) == 0 { return nil } @@ -1179,6 +1522,11 @@ func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) error { // flush updates the gui, re-drawing frames and buffers. func (g *Gui) flush() error { + // The screen must not be touched while suspended (see Suspend). + if g.isSuspended() { + return nil + } + // pretty sure we don't need this, but keeping it here in case we get weird visual artifacts // g.clear(g.FgColor, g.BgColor) @@ -1186,7 +1534,7 @@ func (g *Gui) flush() error { // if GUI's size has changed, we need to redraw all views if maxX != g.maxX || maxY != g.maxY { for _, v := range g.views { - v.clearViewLines() + v.ClearViewLines() } } g.maxX, g.maxY = maxX, maxY @@ -1206,33 +1554,83 @@ func (g *Gui) flush() error { return nil } -func (g *Gui) ForceLayoutAndRedraw() error { - return g.flush() -} - -// force redrawing one or more views outside of the normal main loop. Useful during longer -// operations that block the main thread, to update a spinner in a status view. -func (g *Gui) ForceRedrawViews(views ...*View) error { - for _, m := range g.managers { - if err := m.Layout(g); err != nil { - return err - } +// Redraws only tainted views and skips the layout pass. +// tcell's cell-level dirty tracking ensures only +// actually-changed cells are emitted to the terminal. +// Will also redraw any views that overlap tainted views +func (g *Gui) flushContentOnly(views []*View) error { + // The screen must not be touched while suspended (see Suspend). + if g.isSuspended() { + return nil } - for _, v := range views { - v.draw() + for _, v := range viewsToRedrawContentOnly(views) { + if err := g.draw(v); err != nil { + return err + } } Screen.Show() return nil } -// draw manages the cursor and calls the draw function of a view. -func (g *Gui) draw(v *View) error { - if g.suspended { - return nil +func viewsToRedrawContentOnly(views []*View) []*View { + redrawIndexes := set.New[int]() + + for i, v := range views { + if !v.IsTainted() && !redrawIndexes.Includes(i) { + continue + } + + redrawIndexes.Add(i) + + for j, above := range views[i+1:] { + aboveIndex := i + 1 + j + if !redrawIndexes.Includes(aboveIndex) && rectsOverlap(v, above) { + redrawIndexes.Add(aboveIndex) + } + } } + return lo.FilterMap(views, func(view *View, i int) (*View, bool) { + return view, redrawIndexes.Includes(i) + }) +} + +// Reports whether two views' rectangles share at least one cell. +func rectsOverlap(a, b *View) bool { + ax0, ay0, ax1, ay1 := a.Dimensions() + bx0, by0, bx1, by1 := b.Dimensions() + return ax0 <= bx1 && ax1 >= bx0 && ay0 <= by1 && ay1 >= by0 +} + +func (g *Gui) ForceLayoutAndRedraw() error { + return g.flush() +} + +// Redraws only tainted views outside of the normal main +// loop, without a layout pass. Useful during longer operations that block the +// main thread, e.g. to update a spinner in a status view. +func (g *Gui) ForceFlushViewsContentOnly(views []*View) error { + return g.flushContentOnly(views) +} + +// hasFocus reports whether a view is drawn as focused. Views that are embedded +// in one another (see View.ParentView) form a single unit, so they are all drawn +// as focused while any one of them is the current view. +func (g *Gui) hasFocus(v *View) bool { + return g.currentView != nil && outermostView(v) == outermostView(g.currentView) +} + +func outermostView(v *View) *View { + for v.ParentView != nil { + v = v.ParentView + } + return v +} + +// draw manages the cursor and calls the draw function of a view. +func (g *Gui) draw(v *View) error { if !v.Visible || v.y1 < v.y0 || v.x1 < v.x0 { return nil } @@ -1251,11 +1649,11 @@ func (g *Gui) draw(v *View) error { Screen.HideCursor() } - v.draw() + v.draw(g.IsFocused()) if v.Frame { var fgColor, bgColor, frameColor Attribute - if g.Highlight && v == g.currentView { + if g.Highlight && g.hasFocus(v) && g.IsFocused() { fgColor = g.SelFgColor bgColor = g.SelBgColor frameColor = g.SelFrameColor @@ -1306,18 +1704,17 @@ func (g *Gui) onKey(ev *GocuiEvent) error { switch ev.Type { case eventKey: - // When pasting text in Ghostty, it sends us '\r' instead of '\n' for // newlines. I actually don't quite understand why, because from reading - // Ghostty's source code (e.g. + // When pasting text in Ghostty, it sends us '\r' (which is delivered as + // ctrl-j by tcell) instead of '\n' for newlines. I actually don't quite + // understand why, because from reading Ghostty's source code (e.g. // https://github.com/ghostty-org/ghostty/commit/010338354a0) it does // this conversion only for non-bracketed paste mode, but I'm seeing it // in bracketed paste mode. Whatever I'm missing here, converting '\r' // back to '\n' fixes pasting multi-line text from Ghostty, and doesn't // seem harmful for other terminal emulators. - // - // KeyCtrlJ (int value 10) is '\r'. - if g.IsPasting && ev.Key == KeyCtrlJ { - ev.Key = KeyEnter + if g.IsPasting && ev.Key.Equals(NewKeyStrMod("j", ModCtrl)) { + ev.Key = NewKeyName(KeyEnter) } err := g.execKeybindings(g.currentView, ev) @@ -1327,9 +1724,26 @@ func (g *Gui) onKey(ev *GocuiEvent) error { case eventMouse: mx, my := ev.MouseX, ev.MouseY - v, err := g.VisibleViewByPosition(mx, my) - if err != nil { - break + if g.mouseGestureCanceled { + if ev.Key.KeyName() == MouseRelease { + g.mouseGestureCanceled = false + } + return nil + } + // While the mouse is captured, all mouse events go to the view that + // was under the pointer when the button was pressed, even if the + // pointer has since left it; this is what lets drag gestures keep + // acting on the view they started in. + v := g.mouseCapture + if v == nil { + var err error + v, err = g.VisibleViewByPosition(mx, my) + if err != nil { + break + } + } + if ev.Key.KeyName() == MouseRelease { + g.releaseMouseCapture() } // newCx and newCy are relative to the view port, i.e. to the visible area of the view @@ -1343,13 +1757,13 @@ func (g *Gui) onKey(ev *GocuiEvent) error { if newY < 0 { newY = 0 newCy = -v.oy - } else if newY >= len(v.lines) { - newY = len(v.lines) - 1 + } else if newY >= len(v.buf.lines) { + newY = len(v.buf.lines) - 1 newCy = newY - v.oy } visibleLineWidth := 0 - for _, c := range v.lines[newY] { + for _, c := range v.buf.lines[newY].cells { visibleLineWidth += c.width } if visibleLineWidth < newX { @@ -1358,24 +1772,33 @@ func (g *Gui) onKey(ev *GocuiEvent) error { } } - if ev.Key == MouseLeft && (ev.Mod&ModMotion) == 0 && !v.Editable && g.openHyperlink != nil { - if newY >= 0 && newY <= len(v.viewLines)-1 && newX >= 0 && newX <= len(v.viewLines[newY].line)-1 { - if link := v.viewLines[newY].line[newX].hyperlink; link != "" { - return g.openHyperlink(link, v.name) - } + if ev.Key.KeyName() == MouseLeft && (ev.Key.Mod()&ModMotion) == 0 && !v.Editable && g.openHyperlink != nil { + if link := v.hyperlinkAt(newX, newY); link != "" { + return g.openHyperlink(link, v.name) } } if g.ShouldHandleMouseEvent != nil { - if !g.ShouldHandleMouseEvent(v, ev.Key) { + if !g.ShouldHandleMouseEvent(v, ev.Key.KeyName()) { // Give clients a chance to reject clicks, for example clicks in inactive views // when a modal panel is open. break } } + if ev.Key.KeyName() == MouseLeft && ev.Key.Mod()&ModMotion == 0 { + g.captureMouse(v) + } - if !IsMouseScrollKey(ev.Key) { - v.SetCursor(newCx, newCy) + if !IsMouseScrollKey(ev.Key.KeyName()) && ev.Key.KeyName() != MouseRelease { + cursorX, cursorY := newCx, newCy + // A captured drag can report positions outside the view; keep the + // view cursor inside its bounds in that case. Handlers still get + // the unclamped position through the binding opts. + if g.mouseCapture != nil { + cursorX = max(0, min(cursorX, v.InnerWidth()-1)) + cursorY = max(0, min(cursorY, v.InnerHeight()-1)) + } + v.SetCursor(cursorX, cursorY) if v.Editable { v.TextArea.SetCursor2D(newX, newY) @@ -1387,7 +1810,9 @@ func (g *Gui) onKey(ev *GocuiEvent) error { } } - if v.Frame && my == v.y0 { + // Only an actual click may activate tabs; a captured drag that + // crosses the tab row must not switch tabs. + if ev.Key.KeyName() == MouseLeft && ev.Key.Mod()&ModMotion == 0 && v.Frame && my == v.y0 { if len(v.Tabs) > 0 { tabIndex := v.GetClickedTabIndex(mx - v.x0) @@ -1402,8 +1827,8 @@ func (g *Gui) onKey(ev *GocuiEvent) error { } if IsMouseKey(ev.Key) { - isDoubleClick := g.recordClickInfo(newX, newY, ev.Key, v) - opts := ViewMouseBindingOpts{X: newX, Y: newY, Key: ev.Key, IsDoubleClick: isDoubleClick} + isDoubleClick := g.recordClickInfo(newX, newY, ev.Key.KeyName(), v) + opts := ViewMouseBindingOpts{X: newX, Y: newY, Key: ev.Key.KeyName(), IsDoubleClick: isDoubleClick} matched, err := g.execMouseKeybindings(v, ev, opts) if err != nil { return err @@ -1437,11 +1862,17 @@ func (g *Gui) onKey(ev *GocuiEvent) error { } // remember the information for this click, and return true if it was a double click -func (g *Gui) recordClickInfo(x, y int, key Key, v *View) bool { +func (g *Gui) recordClickInfo(x, y int, key KeyName, v *View) bool { if IsMouseScrollKey(key) { g.lastClick = nil return false } + // A release ends a gesture but is not a click of its own; it must leave + // the click info of the press that started it alone, or no double click + // could ever be detected. + if key == MouseRelease { + return false + } clickInfo := &clickInfo{ x: x, @@ -1465,8 +1896,8 @@ func (g *Gui) recordClickInfo(x, y int, key Key, v *View) bool { func (g *Gui) execMouseKeybindings(view *View, ev *GocuiEvent, opts ViewMouseBindingOpts) (bool, error) { isMatch := func(binding *ViewMouseBinding) bool { return binding.ViewName == view.Name() && - ev.Key == binding.Key && - ev.Mod == binding.Modifier + ev.Key.KeyName() == binding.Key && + ev.Key.Mod() == binding.Modifier } // first pass looks for ones that match the focused view @@ -1487,8 +1918,8 @@ func (g *Gui) execMouseKeybindings(view *View, ev *GocuiEvent, opts ViewMouseBin return false, nil } -func IsMouseKey(key any) bool { - switch key { +func IsMouseKey(key Key) bool { + switch key.KeyName() { case MouseLeft, MouseRight, @@ -1504,8 +1935,8 @@ func IsMouseKey(key any) bool { } } -func IsMouseScrollKey(key any) bool { - switch key { +func IsMouseScrollKey(keyName KeyName) bool { + switch keyName { case MouseWheelUp, MouseWheelDown, @@ -1528,12 +1959,12 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error { } // if we're searching, and we've hit n/N/Esc, we ignore the default keybinding - if v != nil && v.IsSearching() && ev.Mod == ModNone { - if eventMatchesKey(ev, g.NextSearchMatchKey) { + if v != nil && v.IsSearching() { + if lo.SomeBy(g.NextSearchMatchKeys, func(k Key) bool { return ev.Key.Equals(k) }) { return v.gotoNextMatch() - } else if eventMatchesKey(ev, g.PrevSearchMatchKey) { + } else if lo.SomeBy(g.PrevSearchMatchKeys, func(k Key) bool { return ev.Key.Equals(k) }) { return v.gotoPreviousMatch() - } else if eventMatchesKey(ev, g.SearchEscapeKey) { + } else if lo.SomeBy(g.SearchEscapeKeys, func(k Key) bool { return ev.Key.Equals(k) }) { v.searcher.clearSearch() if g.OnSearchEscape != nil { if err := g.OnSearchEscape(); err != nil { @@ -1550,7 +1981,7 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error { if kb.handler == nil { continue } - if !kb.matchKeypress(ev.Key, ev.Ch, ev.Mod) { + if !kb.matchKeypress(ev.Key) { continue } if g.matchView(v, kb) { @@ -1562,10 +1993,10 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error { matchingParentViewKb = nil break } - if v != nil && g.matchView(v.ParentView, kb) { + if matchingParentViewKb == nil && v != nil && g.matchView(v.ParentView, kb) { matchingParentViewKb = kb } - if globalKb == nil && kb.viewName == "" && ((v != nil && !v.Editable) || (kb.ch == 0 && kb.key != KeyCtrlU && kb.key != KeyCtrlA && kb.key != KeyCtrlE)) { + if globalKb == nil && kb.viewName == "" { globalKb = kb } } @@ -1577,7 +2008,7 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error { } if g.currentView != nil && g.currentView.Editable && g.currentView.Editor != nil { - matched := g.currentView.Editor.Edit(g.currentView, ev.Key, ev.Ch, ev.Mod) + matched := g.currentView.Editor.Edit(g.currentView, ev.Key) if matched { return nil } @@ -1591,17 +2022,27 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error { // execKeybinding executes a given keybinding func (g *Gui) execKeybinding(v *View, kb *keybinding) error { - if g.isBlacklisted(kb.key) { - return nil - } - if err := kb.handler(g, v); err != nil { return err } return nil } +// IsFocused reports whether the terminal we're running in has focus. Terminals +// that don't report focus at all leave this true for good. +func (g *Gui) IsFocused() bool { + return g.focused.Load() +} + func (g *Gui) onFocus(ev *GocuiEvent) error { + // Terminals report their focus state when we turn focus reporting on, and + // some report it again when their window is activated, so only pass on the + // reports that actually change it. + if ev.Focused == g.focused.Load() { + return nil + } + g.focused.Store(ev.Focused) + if g.focusHandler != nil { return g.focusHandler(ev.Focused) } @@ -1609,41 +2050,13 @@ func (g *Gui) onFocus(ev *GocuiEvent) error { return nil } -func (g *Gui) StartTicking(ctx context.Context) { - go func() { - g.Mutexes.tickingMutex.Lock() - defer g.Mutexes.tickingMutex.Unlock() - ticker := time.NewTicker(time.Millisecond * 50) - defer ticker.Stop() - outer: - for { - select { - case <-ticker.C: - // I'm okay with having a data race here: there's no harm in letting one of these updates through - if g.suspended { - continue outer - } - - for _, view := range g.Views() { - if view.HasLoader { - g.UpdateAsync(func(g *Gui) error { return nil }) - continue outer - } - } - return - case <-ctx.Done(): - return - case <-g.stop: - return - } - } - }() -} - -// isBlacklisted reports whether the key is blacklisted -func (g *Gui) isBlacklisted(k Key) bool { - return slices.Contains(g.blacklist, k) -} +// While g.suspended is true, nothing must be drawn to the screen: tcell +// releases the screen's cell buffer when disengaging, and drawing to a +// disengaged screen spins forever inside tcell while holding the screen lock, +// which then blocks Resume (and with it all further input) forever. For the +// flag to guarantee that, it must only ever be false while the screen is +// engaged: Suspend sets it before disengaging, and Resume clears it only +// after re-engaging. func (g *Gui) Suspend() error { g.suspendedMutex.Lock() @@ -1655,7 +2068,12 @@ func (g *Gui) Suspend() error { g.suspended = true - return g.screen.Suspend() + if err := g.screen.Suspend(); err != nil { + g.suspended = false + return err + } + + return nil } func (g *Gui) Resume() error { @@ -1666,18 +2084,36 @@ func (g *Gui) Resume() error { return errors.New("Cannot resume because we are not suspended") } + if err := g.screen.Resume(); err != nil { + return err + } + g.suspended = false - return g.screen.Resume() + // Schedule a redraw of the whole screen. Nothing else guarantees one: + // flushes are skipped while suspended, and after re-engaging the screen + // the terminal shows nothing until we draw again. + go func() { g.gEvents <- GocuiEvent{Type: eventResize} }() + + return nil } -// matchView returns if the keybinding matches the current view (and the view's context) +func (g *Gui) isSuspended() bool { + g.suspendedMutex.Lock() + defer g.suspendedMutex.Unlock() + + return g.suspended +} + +// matchView returns if the keybinding matches the given view (and the view's context) func (g *Gui) matchView(v *View, kb *keybinding) bool { - // if the user is typing in a field, ignore char keys if v == nil { return false } - if v.Editable && kb.ch != 0 { + // If the user is typing in a field, printable keys are theirs to type, so no + // keybinding gets a look at them: not the field's own, and not those of the + // view it is embedded in either. + if field := g.currentView; field != nil && field.Editable && !field.KeybindOnEdit && kb.key.IsPrintable() { return false } if kb.viewName != v.name { @@ -1712,3 +2148,10 @@ func (g *Gui) Snapshot() string { return builder.String() } + +func (g *Gui) SetEditKeybindings(moveWordLeft, moveWordRight, backspaceWord, forwardDeleteWord []Key) { + moveWordLeftKeybinding = moveWordLeft + moveWordRightKeybinding = moveWordRight + backspaceWordKeybinding = backspaceWord + forwardDeleteWordKeybinding = forwardDeleteWord +} diff --git a/vendor/github.com/jesseduffield/gocui/gui_others.go b/pkg/gocui/gui_others.go similarity index 100% rename from vendor/github.com/jesseduffield/gocui/gui_others.go rename to pkg/gocui/gui_others.go diff --git a/vendor/github.com/jesseduffield/gocui/gui_windows.go b/pkg/gocui/gui_windows.go similarity index 97% rename from vendor/github.com/jesseduffield/gocui/gui_windows.go rename to pkg/gocui/gui_windows.go index 1934a40a9..d8c79ca12 100644 --- a/vendor/github.com/jesseduffield/gocui/gui_windows.go +++ b/pkg/gocui/gui_windows.go @@ -13,9 +13,7 @@ import ( ) type ( - wchar uint16 short int16 - dword uint32 word uint16 ) diff --git a/pkg/gocui/key.go b/pkg/gocui/key.go new file mode 100644 index 000000000..0eaa29b38 --- /dev/null +++ b/pkg/gocui/key.go @@ -0,0 +1,72 @@ +// Copyright 2026 The gocui Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package gocui + +import "github.com/gdamore/tcell/v3" + +type Key struct { + keyName KeyName + str string + + mod Modifier +} + +func NewKey(keyName KeyName, str string, mod Modifier) Key { + return Key{ + keyName: keyName, + str: str, + mod: mod, + } +} + +func NewKeyName(keyName KeyName) Key { + return Key{ + keyName: keyName, + str: "", + mod: ModNone, + } +} + +func NewKeyRune(ch rune) Key { + return Key{ + keyName: KeyName(tcell.KeyRune), + str: string(ch), + mod: ModNone, + } +} + +func NewKeyStrMod(str string, mod Modifier) Key { + return Key{ + keyName: KeyName(tcell.KeyRune), + str: str, + mod: mod, + } +} + +func (k Key) KeyName() KeyName { + return k.keyName +} + +func (k Key) Str() string { + return k.str +} + +func (k Key) Mod() Modifier { + return k.mod +} + +func (k Key) IsSet() bool { + return k.keyName != 0 +} + +// IsPrintable reports whether the key stands for a character that can be typed +// into a text field. +func (k Key) IsPrintable() bool { + return k.keyName == KeyName(tcell.KeyRune) && k.str != "" && k.mod == ModNone +} + +func (k Key) Equals(otherKey Key) bool { + return k.keyName == otherKey.keyName && k.str == otherKey.str && k.mod == otherKey.mod +} diff --git a/pkg/gocui/key_test.go b/pkg/gocui/key_test.go new file mode 100644 index 000000000..8fce3fe53 --- /dev/null +++ b/pkg/gocui/key_test.go @@ -0,0 +1,16 @@ +package gocui + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestKeyIsPrintable(t *testing.T) { + assert.True(t, NewKeyRune('x').IsPrintable()) + assert.True(t, NewKeyRune('界').IsPrintable()) + assert.True(t, NewKeyRune(' ').IsPrintable()) + assert.False(t, NewKeyStrMod("x", ModCtrl).IsPrintable()) + assert.False(t, NewKeyName(KeyEnter).IsPrintable()) + assert.False(t, Key{}.IsPrintable()) +} diff --git a/pkg/gocui/keybinding.go b/pkg/gocui/keybinding.go new file mode 100644 index 000000000..85707a292 --- /dev/null +++ b/pkg/gocui/keybinding.go @@ -0,0 +1,100 @@ +// Copyright 2014 The gocui Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package gocui + +import ( + "github.com/gdamore/tcell/v3" +) + +// KeyName represents special keys or keys combinations. +type KeyName tcell.Key + +// Modifier allows to define special keys combinations. They can be used +// in combination with Keys or Runes when a new keybinding is defined. +type Modifier tcell.ModMask + +// Keybindings are used to link a given key-press event with a handler. +type keybinding struct { + viewName string + key Key + handler func(*Gui, *View) error +} + +// newKeybinding returns a new Keybinding object. +func newKeybinding(viewname string, key Key, handler func(*Gui, *View) error) (kb *keybinding) { + kb = &keybinding{ + viewName: viewname, + key: key, + handler: handler, + } + return kb +} + +// matchKeypress returns if the keybinding matches the keypress. +func (kb *keybinding) matchKeypress(key Key) bool { + return kb.key.Equals(key) +} + +// Special keys. +const ( + KeyF1 KeyName = KeyName(tcell.KeyF1) + KeyF2 = KeyName(tcell.KeyF2) + KeyF3 = KeyName(tcell.KeyF3) + KeyF4 = KeyName(tcell.KeyF4) + KeyF5 = KeyName(tcell.KeyF5) + KeyF6 = KeyName(tcell.KeyF6) + KeyF7 = KeyName(tcell.KeyF7) + KeyF8 = KeyName(tcell.KeyF8) + KeyF9 = KeyName(tcell.KeyF9) + KeyF10 = KeyName(tcell.KeyF10) + KeyF11 = KeyName(tcell.KeyF11) + KeyF12 = KeyName(tcell.KeyF12) + KeyInsert = KeyName(tcell.KeyInsert) + KeyDelete = KeyName(tcell.KeyDelete) + KeyHome = KeyName(tcell.KeyHome) + KeyEnd = KeyName(tcell.KeyEnd) + KeyPgdn = KeyName(tcell.KeyPgDn) + KeyPgup = KeyName(tcell.KeyPgUp) + KeyArrowUp = KeyName(tcell.KeyUp) + KeyShiftArrowUp = KeyName(tcell.KeyF62) + KeyArrowDown = KeyName(tcell.KeyDown) + KeyShiftArrowDown = KeyName(tcell.KeyF63) + KeyArrowLeft = KeyName(tcell.KeyLeft) + KeyArrowRight = KeyName(tcell.KeyRight) +) + +// Keys combinations. +const ( + KeyCtrlTilde = KeyName(tcell.KeyF64) // arbitrary assignment + KeyBackspace = KeyName(tcell.KeyBackspace) + KeyTab = KeyName(tcell.KeyTab) + KeyBacktab = KeyName(tcell.KeyBacktab) + KeyEnter = KeyName(tcell.KeyEnter) + KeyEsc = KeyName(tcell.KeyEscape) + + // The following assignments were used in termbox implementation. + // In tcell, these are not keys per se. But in gocui we have them + // mapped to the keys so we have to use placeholder keys. + + KeyAltEnter = KeyName(tcell.KeyF64) // arbitrary assignments + MouseLeft = KeyName(tcell.KeyF63) + MouseRight = KeyName(tcell.KeyF62) + MouseMiddle = KeyName(tcell.KeyF61) + MouseRelease = KeyName(tcell.KeyF60) + MouseWheelUp = KeyName(tcell.KeyF59) + MouseWheelDown = KeyName(tcell.KeyF58) + MouseWheelLeft = KeyName(tcell.KeyF57) + MouseWheelRight = KeyName(tcell.KeyF56) +) + +// Modifiers. +const ( + ModNone Modifier = Modifier(0) + ModShift = Modifier(tcell.ModShift) + ModCtrl = Modifier(tcell.ModCtrl) + ModAlt = Modifier(tcell.ModAlt) + ModMeta = Modifier(tcell.ModMeta) + ModMotion = Modifier(16) // just picking an arbitrary number here that doesn't clash with tcell's modifiers +) diff --git a/pkg/gocui/mouse_capture_test.go b/pkg/gocui/mouse_capture_test.go new file mode 100644 index 000000000..f335e65c4 --- /dev/null +++ b/pkg/gocui/mouse_capture_test.go @@ -0,0 +1,216 @@ +package gocui + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestMouseCaptureRoutesMotionAndReleaseOutsideView(t *testing.T) { + g := newTestGui(t) + view, err := g.SetView("captured", 10, 5, 30, 15, 0) + if err != nil && !errors.Is(err, ErrUnknownView) { + assert.NoError(t, err) + return + } + + received := []ViewMouseBindingOpts{} + for _, binding := range []*ViewMouseBinding{ + { + ViewName: "captured", + Key: MouseLeft, + Modifier: ModMotion, + Handler: func(opts ViewMouseBindingOpts) error { + received = append(received, opts) + return nil + }, + }, + { + ViewName: "captured", + Key: MouseRelease, + Handler: func(opts ViewMouseBindingOpts) error { + assert.Nil(t, g.mouseCapture) + received = append(received, opts) + return nil + }, + }, + } { + g.SetViewClickBinding(binding) + } + + g.captureMouse(view) + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 0, + MouseY: 0, + Key: NewKey(MouseLeft, "", ModMotion), + })) + assert.Equal(t, ViewMouseBindingOpts{X: -11, Y: -6, Key: MouseLeft}, received[0]) + assert.Equal(t, 0, view.CursorX()) + assert.Equal(t, 0, view.CursorY()) + + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 79, + MouseY: 23, + Key: NewKeyName(MouseRelease), + })) + assert.Equal(t, ViewMouseBindingOpts{X: 68, Y: 17, Key: MouseRelease}, received[1]) + assert.Equal(t, 0, view.CursorX()) + assert.Equal(t, 0, view.CursorY()) + assert.Nil(t, g.mouseCapture) +} + +func TestPrimaryMouseDragStaysWithPressedView(t *testing.T) { + g := newTestGui(t) + left, _ := g.SetView("left", 0, 0, 20, 10, 0) + _, _ = g.SetView("right", 21, 0, 41, 10, 0) + + receivedBy := "" + for _, viewName := range []string{"left", "right"} { + g.SetViewClickBinding(&ViewMouseBinding{ + ViewName: viewName, + Key: MouseLeft, + Modifier: ModMotion, + Handler: func(ViewMouseBindingOpts) error { + receivedBy = viewName + return nil + }, + }) + } + + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: left.x0 + 1, + MouseY: left.y0 + 1, + Key: NewKeyName(MouseLeft), + })) + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 22, + MouseY: 1, + Key: NewKey(MouseLeft, "", ModMotion), + })) + + assert.Equal(t, "left", receivedBy) +} + +func TestPrimaryMouseDragDoesNotActivateTabs(t *testing.T) { + g := newTestGui(t) + view, _ := g.SetView("tabs", 0, 0, 40, 10, 0) + view.Tabs = []string{"first", "second"} + + clickedTabs := []int{} + g.SetTabClickBinding("tabs", func(tabIndex int) error { + clickedTabs = append(clickedTabs, tabIndex) + return nil + }) + + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: view.x0 + 1, + MouseY: view.y0 + 1, + Key: NewKeyName(MouseLeft), + })) + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: view.x0 + 3, + MouseY: view.y0, + Key: NewKey(MouseLeft, "", ModMotion), + })) + + assert.Empty(t, clickedTabs) + + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: view.x0 + 3, + MouseY: view.y0, + Key: NewKeyName(MouseRelease), + })) + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: view.x0 + 3, + MouseY: view.y0, + Key: NewKeyName(MouseLeft), + })) + assert.Equal(t, []int{0}, clickedTabs) +} + +func TestRejectedMouseReleaseClearsCapture(t *testing.T) { + g := newTestGui(t) + view, _ := g.SetView("captured", 0, 0, 20, 10, 0) + g.captureMouse(view) + g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return false } + + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: view.x0 + 1, + MouseY: view.y0 + 1, + Key: NewKeyName(MouseRelease), + })) + + assert.Nil(t, g.mouseCapture) +} + +func TestDeleteViewClearsMouseState(t *testing.T) { + g := newTestGui(t) + view, _ := g.SetView("temporary", 0, 0, 20, 10, 0) + g.captureMouse(view) + g.lastHoverView = view + + assert.NoError(t, g.DeleteView("temporary")) + + assert.Nil(t, g.mouseCapture) + assert.True(t, g.mouseGestureCanceled) + assert.Nil(t, g.lastHoverView) +} + +func TestCancelMouseCaptureSuppressesRemainingGesture(t *testing.T) { + g := newTestGui(t) + left, _ := g.SetView("left", 0, 0, 20, 10, 0) + _, _ = g.SetView("right", 21, 0, 41, 10, 0) + receivedBy := "" + for _, viewName := range []string{"left", "right"} { + g.SetViewClickBinding(&ViewMouseBinding{ + ViewName: viewName, + Key: MouseLeft, + Modifier: ModMotion, + Handler: func(ViewMouseBindingOpts) error { + receivedBy = viewName + return nil + }, + }) + } + + g.captureMouse(left) + g.CancelMouseCapture() + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 22, + MouseY: 1, + Key: NewKey(MouseLeft, "", ModMotion), + })) + assert.Empty(t, receivedBy) + + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 22, + MouseY: 1, + Key: NewKeyName(MouseRelease), + })) + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 22, + MouseY: 1, + Key: NewKeyName(MouseLeft), + })) + assert.NoError(t, g.onKey(&GocuiEvent{ + Type: eventMouse, + MouseX: 23, + MouseY: 1, + Key: NewKey(MouseLeft, "", ModMotion), + })) + + assert.Equal(t, "right", receivedBy) +} diff --git a/pkg/gocui/parent_view_test.go b/pkg/gocui/parent_view_test.go new file mode 100644 index 000000000..9d56a1c46 --- /dev/null +++ b/pkg/gocui/parent_view_test.go @@ -0,0 +1,142 @@ +package gocui + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +// A view and its parent view, with the child holding the focus. +func setupParentAndChildView(t *testing.T, g *Gui) (*View, *View) { + t.Helper() + + parent, _ := g.SetView("parent", 0, 0, 20, 10, 0) + child, _ := g.SetView("child", 0, 10, 20, 12, 0) + child.ParentView = parent + _, err := g.SetCurrentView(child.Name()) + assert.NoError(t, err) + + return parent, child +} + +func TestKeybindingOfParentViewIsUsedWhenChildHasNone(t *testing.T) { + g := newTestGui(t) + parent, child := setupParentAndChildView(t, g) + + pressed := []string{} + g.SetKeybinding(parent.Name(), NewKeyName(KeyArrowDown), func(*Gui, *View) error { + pressed = append(pressed, "parent") + return nil + }) + g.SetKeybinding(child.Name(), NewKeyName(KeyEnter), func(*Gui, *View) error { + pressed = append(pressed, "child") + return nil + }) + + assert.NoError(t, g.onKey(&GocuiEvent{Type: eventKey, Key: NewKeyName(KeyArrowDown)})) + assert.NoError(t, g.onKey(&GocuiEvent{Type: eventKey, Key: NewKeyName(KeyEnter)})) + + assert.Equal(t, []string{"parent", "child"}, pressed) +} + +func TestFirstMatchingKeybindingOfParentViewWins(t *testing.T) { + g := newTestGui(t) + parent, _ := setupParentAndChildView(t, g) + + pressed := []string{} + for _, name := range []string{"first", "second"} { + g.SetKeybinding(parent.Name(), NewKeyName(KeyArrowDown), func(*Gui, *View) error { + pressed = append(pressed, name) + return nil + }) + } + + assert.NoError(t, g.onKey(&GocuiEvent{Type: eventKey, Key: NewKeyName(KeyArrowDown)})) + + assert.Equal(t, []string{"first"}, pressed) +} + +func TestEmbeddedViewsAreFocusedTogether(t *testing.T) { + g := newTestGui(t) + parent, child := setupParentAndChildView(t, g) + sibling, _ := g.SetView("sibling", 0, 12, 20, 14, 0) + sibling.ParentView = parent + unrelated, _ := g.SetView("unrelated", 30, 0, 50, 10, 0) + + assert.True(t, g.hasFocus(child)) + assert.True(t, g.hasFocus(parent)) + assert.True(t, g.hasFocus(sibling)) + assert.False(t, g.hasFocus(unrelated)) + + _, err := g.SetCurrentView(unrelated.Name()) + assert.NoError(t, err) + + assert.True(t, g.hasFocus(unrelated)) + assert.False(t, g.hasFocus(parent)) + assert.False(t, g.hasFocus(child)) +} + +func TestPrintableKeysGoToTheFieldBeingTypedIn(t *testing.T) { + for _, test := range []struct { + name string + keybindOnEdit bool + declineKeybinding bool + expectedPresses int + expectedEdits int + }{ + {name: "the field gets the key", expectedEdits: 1}, + {name: "the parent view gets the key", keybindOnEdit: true, expectedPresses: 1}, + { + name: "the field gets the key the parent view declined", + keybindOnEdit: true, + declineKeybinding: true, + expectedPresses: 1, + expectedEdits: 1, + }, + } { + t.Run(test.name, func(t *testing.T) { + g := newTestGui(t) + parent, child := setupParentAndChildView(t, g) + child.Editable = true + child.KeybindOnEdit = test.keybindOnEdit + + edits := 0 + child.Editor = EditorFunc(func(*View, Key) bool { + edits++ + return true + }) + presses := 0 + g.SetKeybinding(parent.Name(), NewKeyRune('j'), func(*Gui, *View) error { + presses++ + if test.declineKeybinding { + return ErrKeybindingNotHandled + } + return nil + }) + + assert.NoError(t, g.onKey(&GocuiEvent{Type: eventKey, Key: NewKeyRune('j')})) + + assert.Equal(t, test.expectedPresses, presses) + assert.Equal(t, test.expectedEdits, edits) + }) + } +} + +func TestUnhandledKeybindingOfParentViewFallsThroughToEditor(t *testing.T) { + g := newTestGui(t) + parent, child := setupParentAndChildView(t, g) + + edited := []Key{} + child.Editable = true + child.Editor = EditorFunc(func(_ *View, key Key) bool { + edited = append(edited, key) + return true + }) + g.SetKeybinding(parent.Name(), NewKeyName(KeyArrowDown), func(*Gui, *View) error { + return ErrKeybindingNotHandled + }) + + assert.NoError(t, g.onKey(&GocuiEvent{Type: eventKey, Key: NewKeyName(KeyArrowDown)})) + + assert.Equal(t, []Key{NewKeyName(KeyArrowDown)}, edited) +} diff --git a/vendor/github.com/jesseduffield/gocui/scrollbar.go b/pkg/gocui/scrollbar.go similarity index 100% rename from vendor/github.com/jesseduffield/gocui/scrollbar.go rename to pkg/gocui/scrollbar.go diff --git a/pkg/gocui/scrollbar_test.go b/pkg/gocui/scrollbar_test.go new file mode 100644 index 000000000..63db4bb9a --- /dev/null +++ b/pkg/gocui/scrollbar_test.go @@ -0,0 +1,114 @@ +package gocui + +import "testing" + +func TestCalcScrollbar(t *testing.T) { + tests := []struct { + testName string + listSize int + pageSize int + position int + scrollAreaSize int + + expectedStart int + expectedHeight int + }{ + { + testName: "page size greater than list size", + listSize: 5, + pageSize: 10, + position: 0, + scrollAreaSize: 20, + + expectedStart: 0, + expectedHeight: 20, + }, + { + testName: "page size matches list size", + listSize: 10, + pageSize: 10, + position: 0, + scrollAreaSize: 20, + + expectedStart: 0, + expectedHeight: 20, + }, + { + testName: "page size half of list size", + listSize: 10, + pageSize: 5, + position: 0, + scrollAreaSize: 20, + + expectedStart: 0, + expectedHeight: 10, + }, + { + testName: "page size half of list size at scroll end", + listSize: 10, + pageSize: 5, + position: 5, + scrollAreaSize: 20, + + expectedStart: 10, + expectedHeight: 10, + }, + { + testName: "page size third of list size having scrolled half the way", + listSize: 15, + // Recall that my max position is listSize - pageSize i.e 15 - 5 i.e. 10. + // So if I've scrolled to position 5 that means I've done one page and I've got + // one page to go which means by scrollbar should take up a third of the available + // space and appear in the centre of the scrollbar area + pageSize: 5, + position: 5, + scrollAreaSize: 21, + + expectedStart: 7, + expectedHeight: 7, + }, + { + testName: "page size third of list size having scrolled the full way", + listSize: 15, + pageSize: 5, + position: 10, + scrollAreaSize: 21, + + expectedStart: 14, + expectedHeight: 7, + }, + { + testName: "page size third of list size having scrolled by one", + listSize: 15, + pageSize: 5, + position: 1, + scrollAreaSize: 21, + + expectedStart: 2, + expectedHeight: 7, + }, + { + testName: "page size third of list size having scrolled up from the bottom by one", + listSize: 15, + pageSize: 5, + position: 9, + scrollAreaSize: 21, + + expectedStart: 12, + expectedHeight: 7, + }, + } + + for _, test := range tests { + t.Run(test.testName, func(t *testing.T) { + start, height := calcScrollbar(test.listSize, test.pageSize, test.position, test.scrollAreaSize) + if start != test.expectedStart { + t.Errorf("expected start to be %d, got %d", test.expectedStart, start) + } + + if height != test.expectedHeight { + t.Errorf("expected height to be %d, got %d", test.expectedHeight, height) + } + }) + } +} diff --git a/pkg/gocui/search_test.go b/pkg/gocui/search_test.go new file mode 100644 index 000000000..ba20da9de --- /dev/null +++ b/pkg/gocui/search_test.go @@ -0,0 +1,58 @@ +package gocui + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +// writeLines writes the given lines to the view, as a task rendering content into it +// does: one line at a time. +func writeLines(v *View, lines ...string) { + for _, line := range lines { + fmt.Fprintf(v, "%s\n", line) + } +} + +func TestSearchStatusAfterTheMatchesChange(t *testing.T) { + v := NewView("name", 0, 0, 40, 10, OutputNormal) + writeLines(v, "match", "other", "match", "other", "match") + + v.Search("match", nil) + _ = v.gotoNextMatch() + _ = v.gotoNextMatch() + index, total := v.GetSearchStatus() + assert.Equal(t, 2, index) + assert.Equal(t, 3, total) + + // The content is re-rendered with only the first of those matches left in it. + v.Clear() + writeLines(v, "match", "other", "other") + + index, total = v.GetSearchStatus() + assert.Equal(t, 0, index) + assert.Equal(t, 1, total) +} + +func TestSearchPositionsFollowStreamedContent(t *testing.T) { + v := NewView("name", 0, 0, 40, 10, OutputNormal) + v.Search("match", nil) + + // A render arrives a line at a time, and the status describes all of it. + writeLines(v, "other", "match", "other", "match") + + _, total := v.GetSearchStatus() + assert.Equal(t, 2, total) +} + +func BenchmarkWriteToSearchedView(b *testing.B) { + for b.Loop() { + v := NewView("name", 0, 0, 100, 40, OutputNormal) + v.Search("match", nil) + for i := range 2000 { + fmt.Fprintf(v, "line %d of a diff, most of which does not match\n", i) + } + v.GetSearchStatus() + } +} diff --git a/pkg/gocui/suspend_test.go b/pkg/gocui/suspend_test.go new file mode 100644 index 000000000..ded220bea --- /dev/null +++ b/pkg/gocui/suspend_test.go @@ -0,0 +1,69 @@ +package gocui + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +// A flush while suspended must return without touching the screen: tcell +// releases the screen's cell buffer when disengaging, and drawing to a +// disengaged screen spins forever inside tcell while holding the screen lock, +// blocking the resume triggered by fg (#5309). The flush runs in a goroutine +// so that a regression fails the test instead of hanging the suite. +func TestFlushIsNoOpWhileSuspended(t *testing.T) { + tests := []struct { + name string + flush func(g *Gui) error + }{ + {"flush", func(g *Gui) error { return g.flush() }}, + {"flushContentOnly", func(g *Gui) error { return g.flushContentOnly(g.views) }}, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + // Deliberately not newTestGui: its cleanup closes the screen, + // which would deadlock on the screen lock if a regression makes + // the flush below spin. + g, err := NewGui(NewGuiOpts{ + OutputMode: OutputNormal, + Headless: true, + Width: 80, + Height: 24, + }) + assert.NoError(t, err) + + assert.NoError(t, g.Suspend()) + + flushReturned := make(chan error, 1) + go func() { flushReturned <- tc.flush(g) }() + + select { + case err := <-flushReturned: + assert.NoError(t, err) + case <-time.After(time.Second): + t.Fatal("flush touched the suspended screen and got stuck") + } + + assert.NoError(t, g.Resume()) + g.Close() + }) + } +} + +func TestResumeSchedulesRedraw(t *testing.T) { + g := newTestGui(t) + + assert.NoError(t, g.Suspend()) + assert.NoError(t, g.Resume()) + + ev := GocuiEvent{Type: eventNone} + select { + case ev = <-g.gEvents: + case <-time.After(100 * time.Millisecond): + } + + assert.Equal(t, eventResize, ev.Type, + "resuming must schedule a redraw; without one the screen stays blank until the next event arrives") +} diff --git a/vendor/github.com/jesseduffield/gocui/task.go b/pkg/gocui/task.go similarity index 61% rename from vendor/github.com/jesseduffield/gocui/task.go rename to pkg/gocui/task.go index ace72f4a8..08a77463f 100644 --- a/vendor/github.com/jesseduffield/gocui/task.go +++ b/pkg/gocui/task.go @@ -8,8 +8,9 @@ type Task interface { Done() Pause() Continue() - // not exporting because we don't need to + // not exporting these because we don't need to isBusy() bool + isBackground() bool } type TaskImpl struct { @@ -17,6 +18,17 @@ type TaskImpl struct { busy bool onDone func() withMutex func(func()) + // Background tasks don't count towards the program being "busy" for the + // purpose of deciding whether a repo switch is safe (see + // TaskManager.hasBusyForegroundTaskExcept). Two kinds of work are tagged + // this way: the ongoing background routines (auto-fetch, files refresh, + // external-change detection) and the refreshes they trigger, whose model + // writes are already guarded against a concurrent repo switch by the repo + // generation; and view-buffer content rendering, which only paints a view + // and so is harmless to leave running across a switch. What stays + // foreground is lazygit driving a git operation and applying its results + // to the model — exactly the work a repo switch must not run underneath. + background bool } func (self *TaskImpl) Done() { @@ -39,6 +51,10 @@ func (self *TaskImpl) isBusy() bool { return self.busy } +func (self *TaskImpl) isBackground() bool { + return self.background +} + type TaskStatus int const ( @@ -73,6 +89,10 @@ func (self *FakeTask) isBusy() bool { return self.status == TaskStatusBusy } +func (self *FakeTask) isBackground() bool { + return false +} + func (self *FakeTask) Status() TaskStatus { return self.status } diff --git a/pkg/gocui/task_manager.go b/pkg/gocui/task_manager.go new file mode 100644 index 000000000..8d6daaa20 --- /dev/null +++ b/pkg/gocui/task_manager.go @@ -0,0 +1,105 @@ +package gocui + +import "sync" + +// Tracks whether the program is busy (i.e. either something is happening on +// the main goroutine or a worker goroutine). Used by integration tests +// to wait until the program is idle before progressing. +type TaskManager struct { + tasks map[int]Task + // auto-incrementing id for new tasks + nextId int + + mutex sync.Mutex + // signalled whenever the program transitions from busy to idle; used by + // WaitUntilIdle + idleCond *sync.Cond +} + +func newTaskManager() *TaskManager { + self := &TaskManager{ + tasks: make(map[int]Task), + } + self.idleCond = sync.NewCond(&self.mutex) + + return self +} + +func (self *TaskManager) NewTask(background bool) *TaskImpl { + self.mutex.Lock() + defer self.mutex.Unlock() + + self.nextId++ + taskId := self.nextId + + onDone := func() { self.delete(taskId) } + task := &TaskImpl{id: taskId, busy: true, background: background, onDone: onDone, withMutex: self.withMutex} + self.tasks[taskId] = task + + return task +} + +// hasBusyForegroundTaskExcept reports whether any task other than `ignore` is +// currently busy and not a background task. It's used to decide whether a repo +// switch is safe: a foreground operation (or the refresh it triggers, or that +// refresh's follow-up callbacks) still in flight means the switch must wait, so +// it doesn't run against a repo that's about to be swapped out. +// +// `ignore` is the event currently being processed on the UI thread — the switch +// attempt itself — which is always busy and so must not count as a reason to +// refuse itself. +func (self *TaskManager) hasBusyForegroundTaskExcept(ignore Task) bool { + self.mutex.Lock() + defer self.mutex.Unlock() + + for _, task := range self.tasks { + if task != ignore && task.isBusy() && !task.isBackground() { + return true + } + } + + return false +} + +// WaitUntilIdle blocks until no task is busy. Integration tests use it to wait +// for the program to finish processing before taking the next step. +func (self *TaskManager) WaitUntilIdle() { + self.mutex.Lock() + defer self.mutex.Unlock() + + for self.hasBusyTask() { + self.idleCond.Wait() + } +} + +// caller must hold self.mutex +func (self *TaskManager) hasBusyTask() bool { + for _, task := range self.tasks { + if task.isBusy() { + return true + } + } + + return false +} + +func (self *TaskManager) withMutex(f func()) { + self.mutex.Lock() + defer self.mutex.Unlock() + + f() + + // Wake up any goroutine blocked in WaitUntilIdle. This must not block on + // the waiter (we hold the mutex, and the waiter may itself be trying to + // acquire it, e.g. by creating a task, before it next waits) — which is + // exactly what Broadcast guarantees. + if !self.hasBusyTask() { + self.idleCond.Broadcast() + } +} + +func (self *TaskManager) delete(taskId int) { + self.withMutex(func() { + delete(self.tasks, taskId) + }) +} diff --git a/pkg/gocui/task_manager_test.go b/pkg/gocui/task_manager_test.go new file mode 100644 index 000000000..b83b678ea --- /dev/null +++ b/pkg/gocui/task_manager_test.go @@ -0,0 +1,129 @@ +package gocui + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestTaskManagerHasBusyForegroundTaskExcept(t *testing.T) { + t.Run("no tasks", func(t *testing.T) { + tm := newTaskManager() + assert.False(t, tm.hasBusyForegroundTaskExcept(nil)) + }) + + t.Run("a busy foreground task counts", func(t *testing.T) { + tm := newTaskManager() + tm.NewTask(false) + assert.True(t, tm.hasBusyForegroundTaskExcept(nil)) + }) + + t.Run("a busy background task does not count", func(t *testing.T) { + tm := newTaskManager() + tm.NewTask(true) + assert.False(t, tm.hasBusyForegroundTaskExcept(nil)) + }) + + t.Run("a done foreground task does not count", func(t *testing.T) { + tm := newTaskManager() + task := tm.NewTask(false) + task.Done() + assert.False(t, tm.hasBusyForegroundTaskExcept(nil)) + }) + + t.Run("a paused foreground task does not count", func(t *testing.T) { + tm := newTaskManager() + task := tm.NewTask(false) + task.Pause() + assert.False(t, tm.hasBusyForegroundTaskExcept(nil)) + }) + + t.Run("the ignored task does not count", func(t *testing.T) { + tm := newTaskManager() + task := tm.NewTask(false) + assert.False(t, tm.hasBusyForegroundTaskExcept(task)) + }) + + t.Run("another foreground task counts even when one is ignored", func(t *testing.T) { + tm := newTaskManager() + ignored := tm.NewTask(false) + tm.NewTask(false) + assert.True(t, tm.hasBusyForegroundTaskExcept(ignored)) + }) + + t.Run("only a background task alongside the ignored current event", func(t *testing.T) { + // This is the repo-switch case: the switch is handled as the current + // event (ignored) while a background refresh is in flight; it must not + // be considered busy. + tm := newTaskManager() + current := tm.NewTask(false) + tm.NewTask(true) + assert.False(t, tm.hasBusyForegroundTaskExcept(current)) + }) +} + +func TestTaskManagerWaitUntilIdle(t *testing.T) { + // returnsWithin reports whether f returns within the given duration. + returnsWithin := func(d time.Duration, f func()) bool { + done := make(chan struct{}) + go func() { + f() + close(done) + }() + select { + case <-done: + return true + case <-time.After(d): + return false + } + } + + t.Run("returns immediately when no task was ever created", func(t *testing.T) { + tm := newTaskManager() + assert.True(t, returnsWithin(time.Second, tm.WaitUntilIdle)) + }) + + t.Run("blocks while a task is busy", func(t *testing.T) { + tm := newTaskManager() + tm.NewTask(false) + assert.False(t, returnsWithin(50*time.Millisecond, tm.WaitUntilIdle)) + }) + + t.Run("wakes up when the last busy task completes", func(t *testing.T) { + tm := newTaskManager() + task := tm.NewTask(false) + go func() { + time.Sleep(10 * time.Millisecond) + task.Done() + }() + assert.True(t, returnsWithin(time.Second, tm.WaitUntilIdle)) + }) + + t.Run("a paused task counts as idle", func(t *testing.T) { + tm := newTaskManager() + task := tm.NewTask(false) + task.Pause() + assert.True(t, returnsWithin(time.Second, tm.WaitUntilIdle)) + }) + + t.Run("a task completing while nobody waits must not block", func(t *testing.T) { + // This is the deadlock case: the waiter (the integration-test runner) + // is between waits, and itself needs the task manager's mutex (it + // creates a task whenever it enqueues work) before it waits again. The + // idle notification must neither block the completing task while it + // holds the mutex, nor get lost. + tm := newTaskManager() + assert.True(t, returnsWithin(time.Second, func() { + // the program goes idle with nobody waiting... + tm.NewTask(true).Done() + + // ...and creating and completing more tasks afterwards must still + // be possible + task := tm.NewTask(false) + tm.NewTask(false).Done() + task.Done() + })) + assert.True(t, returnsWithin(time.Second, tm.WaitUntilIdle)) + }) +} diff --git a/vendor/github.com/jesseduffield/gocui/tcell_driver.go b/pkg/gocui/tcell_driver.go similarity index 73% rename from vendor/github.com/jesseduffield/gocui/tcell_driver.go rename to pkg/gocui/tcell_driver.go index 6e9c12b4c..312d6d5a2 100644 --- a/vendor/github.com/jesseduffield/gocui/tcell_driver.go +++ b/pkg/gocui/tcell_driver.go @@ -5,7 +5,8 @@ package gocui import ( - "github.com/gdamore/tcell/v2" + "github.com/gdamore/tcell/v3" + "github.com/gdamore/tcell/v3/vt" ) // We probably don't want this being a global variable for YOLO for now @@ -55,17 +56,20 @@ var runeReplacements = map[rune]string{ func (g *Gui) tcellInit(runeReplacements map[rune]string) error { tcell.SetEncodingFallback(tcell.EncodingFallbackASCII) - if s, e := tcell.NewScreen(); e != nil { + s, e := tcell.NewScreen() + if e != nil { return e - } else if e = s.Init(); e != nil { - return e - } else { - registerRuneFallbacks(s, runeReplacements) - - g.screen = s - Screen = s - return nil } + + if e = s.Init(); e != nil { + return e + } + + registerRuneFallbacks(s, runeReplacements) + + g.screen = s + Screen = s + return nil } func registerRuneFallbacks(s tcell.Screen, additional map[rune]string) { @@ -80,18 +84,19 @@ func registerRuneFallbacks(s tcell.Screen, additional map[rune]string) { // tcellInitSimulation initializes tcell screen for use. func (g *Gui) tcellInitSimulation(width int, height int) error { - s := tcell.NewSimulationScreen("") - if e := s.Init(); e != nil { + mt := vt.NewMockTerm(vt.MockOptSize{X: vt.Col(width), Y: vt.Row(height)}) + s, e := tcell.NewTerminfoScreenFromTty(mt) + if e != nil { return e - } else { - g.screen = s - Screen = s - // setting to a larger value than the typical terminal size - // so that during a test we're more likely to see an item to select in a view. - s.SetSize(width, height) - s.Sync() - return nil } + if e = s.Init(); e != nil { + return e + } + + g.screen = s + Screen = s + s.Sync() + return nil } // tcellSetCell sets the character cell at a given location to the given @@ -158,9 +163,7 @@ type gocuiEventType uint8 // The 'Err' field is valid if 'Type' is 'eventError'. type GocuiEvent struct { Type gocuiEventType - Mod Modifier Key Key - Ch rune Width int Height int Err error @@ -169,6 +172,12 @@ type GocuiEvent struct { Focused bool Start bool N int + + // task tracks the processing of this event for idle detection. Events + // replayed by integration tests carry a task from the moment they are + // submitted (see Gui.ReplayKeyEvent); for organic events it is nil, and + // the main loop creates a task when it picks the event up. + task Task } // Event types. @@ -193,10 +202,9 @@ const ( var ( lastMouseKey tcell.ButtonMask = tcell.ButtonNone - lastMouseMod tcell.ModMask = tcell.ModNone - dragState int = NOT_DRAGGING - lastX int = 0 - lastY int = 0 + dragState = NOT_DRAGGING + lastX = 0 + lastY = 0 ) // this wrapper struct has public keys so we can easily serialize/deserialize to JSON @@ -204,7 +212,9 @@ type TcellKeyEventWrapper struct { Timestamp int64 Mod tcell.ModMask Key tcell.Key - Ch rune + Ch string + + task Task // see GocuiEvent.task } func NewTcellKeyEventWrapper(event *tcell.EventKey, timestamp int64) *TcellKeyEventWrapper { @@ -212,7 +222,7 @@ func NewTcellKeyEventWrapper(event *tcell.EventKey, timestamp int64) *TcellKeyEv Timestamp: timestamp, Mod: event.Modifiers(), Key: event.Key(), - Ch: event.Rune(), + Ch: event.Str(), } } @@ -226,6 +236,8 @@ type TcellMouseEventWrapper struct { Y int ButtonMask tcell.ButtonMask ModMask tcell.ModMask + + task Task // see GocuiEvent.task } func NewTcellMouseEventWrapper(event *tcell.EventMouse, timestamp int64) *TcellMouseEventWrapper { @@ -263,22 +275,52 @@ func (wrapper TcellResizeEventWrapper) toTcellEvent() tcell.Event { return tcell.NewEventResize(wrapper.Width, wrapper.Height) } +type TcellFocusEventWrapper struct { + Timestamp int64 + Focused bool + + task Task // see GocuiEvent.task +} + +func NewTcellFocusEventWrapper(event *tcell.EventFocus, timestamp int64) *TcellFocusEventWrapper { + return &TcellFocusEventWrapper{ + Timestamp: timestamp, + Focused: event.Focused, + } +} + +func (wrapper TcellFocusEventWrapper) toTcellEvent() tcell.Event { + return tcell.NewEventFocus(wrapper.Focused) +} + // pollEvent get tcell.Event and transform it into gocuiEvent func (g *Gui) pollEvent() GocuiEvent { var tev tcell.Event + var task Task if g.playRecording { select { - case ev := <-g.ReplayedEvents.Keys: - tev = (ev).toTcellEvent() - case ev := <-g.ReplayedEvents.Resizes: - tev = (ev).toTcellEvent() - case ev := <-g.ReplayedEvents.MouseEvents: - tev = (ev).toTcellEvent() + case ev := <-g.replayedEvents.Keys: + tev = ev.toTcellEvent() + task = ev.task + case ev := <-g.replayedEvents.Resizes: + tev = ev.toTcellEvent() + case ev := <-g.replayedEvents.MouseEvents: + tev = ev.toTcellEvent() + task = ev.task + case ev := <-g.replayedEvents.FocusEvents: + tev = ev.toTcellEvent() + task = ev.task } } else { - tev = Screen.PollEvent() + tev = <-Screen.EventQ() } + event := gocuiEventFromTcellEvent(tev) + event.task = task + return event +} + +func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent { switch tev := tev.(type) { case *tcell.EventInterrupt: return GocuiEvent{Type: eventInterrupt} @@ -287,48 +329,18 @@ func (g *Gui) pollEvent() GocuiEvent { return GocuiEvent{Type: eventResize, Width: w, Height: h} case *tcell.EventKey: k := tev.Key() - ch := rune(0) + ch := "" if k == tcell.KeyRune { - k = 0 // if rune remove key (so it can match rune instead of key) - ch = tev.Rune() - if ch == ' ' { - // special handling for spacebar - k = 32 // tcell keys ends at 31 or starts at 256 - ch = rune(0) - } + ch = tev.Str() + } else if k >= tcell.KeyCtrlA && k <= tcell.KeyCtrlZ { + ch = string(rune('a' + (k - tcell.KeyCtrlA))) + k = tcell.KeyRune } mod := tev.Modifiers() - // remove control modifier and setup special handling of ctrl+spacebar, etc. - if mod == tcell.ModCtrl && k == 32 { - mod = 0 - ch = rune(0) - k = tcell.KeyCtrlSpace - } else if mod == tcell.ModShift && k == tcell.KeyUp { - mod = 0 - ch = rune(0) - k = tcell.KeyF62 - } else if mod == tcell.ModShift && k == tcell.KeyDown { - mod = 0 - ch = rune(0) - k = tcell.KeyF63 - } else if mod == tcell.ModCtrl || mod == tcell.ModShift { - // remove Ctrl or Shift if specified - // - shift - will be translated to the final code of rune - // - ctrl - is translated in the key - mod = 0 - } else if mod == tcell.ModAlt && k == tcell.KeyEnter { - // for the sake of convenience I'm having a KeyAltEnter key. I will likely - // regret this laziness in the future. We're arbitrarily mapping that to tcell's - // KeyF64. - mod = 0 - k = tcell.KeyF64 - } return GocuiEvent{ Type: eventKey, - Key: Key(k), - Ch: ch, - Mod: Modifier(mod), + Key: NewKey(KeyName(k), ch, Modifier(mod)), } case *tcell.EventMouse: x, y := tev.Position() @@ -353,9 +365,11 @@ func (g *Gui) pollEvent() GocuiEvent { // process button events (not wheel events) button &= tcell.ButtonMask(0xff) + newButtonPress := false + buttonReleased := false if button != tcell.ButtonNone && lastMouseKey == tcell.ButtonNone { + newButtonPress = true lastMouseKey = button - lastMouseMod = tev.Modifiers() switch button { case tcell.ButtonPrimary: mouseKey = MouseLeft @@ -373,6 +387,7 @@ func (g *Gui) pollEvent() GocuiEvent { switch tev.Buttons() { case tcell.ButtonNone: if lastMouseKey != tcell.ButtonNone { + buttonReleased = true switch lastMouseKey { case tcell.ButtonPrimary: dragState = NOT_DRAGGING @@ -380,14 +395,13 @@ func (g *Gui) pollEvent() GocuiEvent { case tcell.ButtonMiddle: default: } - mouseMod = Modifier(lastMouseMod) - lastMouseMod = tcell.ModNone + mouseMod = ModNone lastMouseKey = tcell.ButtonNone } default: } - if !wheeling { + if !wheeling && !buttonReleased { switch dragState { case NOT_DRAGGING: return GocuiEvent{ @@ -397,9 +411,23 @@ func (g *Gui) pollEvent() GocuiEvent { } // if we haven't released the left mouse button and we've moved the cursor then we're dragging case MAYBE_DRAGGING: - if x != lastX || y != lastY { - dragState = DRAGGING + if x == lastX && y == lastY { + // Deliver the button press itself, but swallow held-button + // motion events within the same cell: they carry no new + // information, and if they fell through they would be + // delivered with the default MouseRelease key. + if !newButtonPress { + return GocuiEvent{Type: eventNone} + } + break } + // The first movement is already part of the drag; give it the + // same key and modifier as the DRAGGING events below so it + // reaches drag bindings instead of being delivered with the + // default MouseRelease key. + dragState = DRAGGING + mouseMod = ModMotion + mouseKey = MouseLeft case DRAGGING: mouseMod = ModMotion mouseKey = MouseLeft @@ -410,9 +438,7 @@ func (g *Gui) pollEvent() GocuiEvent { Type: eventMouse, MouseX: x, MouseY: y, - Key: mouseKey, - Ch: 0, - Mod: mouseMod, + Key: NewKey(mouseKey, "", mouseMod), } case *tcell.EventFocus: return GocuiEvent{ diff --git a/pkg/gocui/tcell_driver_test.go b/pkg/gocui/tcell_driver_test.go new file mode 100644 index 000000000..9038e73ce --- /dev/null +++ b/pkg/gocui/tcell_driver_test.go @@ -0,0 +1,57 @@ +package gocui + +import ( + "testing" + + "github.com/gdamore/tcell/v3" + "github.com/stretchr/testify/assert" +) + +func TestFirstMouseMovementAfterPressIsDragEvent(t *testing.T) { + t.Cleanup(resetMouseState) + resetMouseState() + + pressEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModNone)) + unchangedHeldEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModNone)) + dragEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModNone)) + + assert.Equal(t, eventMouse, pressEvent.Type) + assert.Equal(t, MouseLeft, pressEvent.Key.KeyName()) + assert.Equal(t, ModNone, pressEvent.Key.Mod()) + assert.Equal(t, eventNone, unchangedHeldEvent.Type) + assert.Equal(t, eventMouse, dragEvent.Type) + assert.Equal(t, MouseLeft, dragEvent.Key.KeyName()) + assert.Equal(t, ModMotion, dragEvent.Key.Mod()) +} + +func TestMouseReleaseAfterDragIsMouseEvent(t *testing.T) { + t.Cleanup(resetMouseState) + resetMouseState() + + gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModNone)) + gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModNone)) + releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonNone, tcell.ModNone)) + + assert.Equal(t, eventMouse, releaseEvent.Type) + assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName()) +} + +func TestMouseReleaseDoesNotKeepPressModifiers(t *testing.T) { + t.Cleanup(resetMouseState) + resetMouseState() + + gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModAlt)) + gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt)) + releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonNone, tcell.ModAlt)) + + assert.Equal(t, eventMouse, releaseEvent.Type) + assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName()) + assert.Equal(t, ModNone, releaseEvent.Key.Mod()) +} + +func resetMouseState() { + lastMouseKey = tcell.ButtonNone + dragState = NOT_DRAGGING + lastX = 0 + lastY = 0 +} diff --git a/vendor/github.com/jesseduffield/gocui/text_area.go b/pkg/gocui/text_area.go similarity index 86% rename from vendor/github.com/jesseduffield/gocui/text_area.go rename to pkg/gocui/text_area.go index 9c88e983b..98a5af4da 100644 --- a/vendor/github.com/jesseduffield/gocui/text_area.go +++ b/pkg/gocui/text_area.go @@ -87,6 +87,12 @@ func contentToCells(content string, autoWrapWidth int) ([]TextAreaCell, []int) { result = append(result, cells[startOfLine:to]...) } + // Commit message trailers ("Signed-off-by:" and the like) must not be + // auto-wrapped. They are only recognized in the last paragraph of the + // message, so that a trailer-looking line in the message body isn't treated + // as one; see startOfTrailerBlock. + trailerBlockStart := startOfTrailerBlock(content) + for currentPos, c := range cells { if c.char == "\n" { appendCellsSinceLineStart(currentPos + 1) @@ -98,7 +104,9 @@ func contentToCells(content string, autoWrapWidth int) ([]TextAreaCell, []int) { trailerMatcher.reset() } else { currentLineWidth += c.width - if c.char == " " && !footNoteMatcher.isFootNote() && !trailerMatcher.isTrailer() { + inTrailerBlock := c.contentIndex >= trailerBlockStart + if c.char == " " && !footNoteMatcher.isFootNote() && + !(inTrailerBlock && trailerMatcher.isTrailer(content[c.contentIndex+len(c.char):])) { indexOfLastWhitespace = currentPos + 1 } else if autoWrapWidth > 0 && currentLineWidth > autoWrapWidth && indexOfLastWhitespace >= 0 { wrapAt := indexOfLastWhitespace @@ -118,7 +126,9 @@ func contentToCells(content string, autoWrapWidth int) ([]TextAreaCell, []int) { } footNoteMatcher.addCharacter(c.char) - trailerMatcher.addCharacter(c.char) + if inTrailerBlock { + trailerMatcher.addCharacter(c.char) + } } } @@ -127,6 +137,21 @@ func contentToCells(content string, autoWrapWidth int) ([]TextAreaCell, []int) { return result, softLineBreakIndices } +// startOfTrailerBlock returns the byte index into content at which the trailer +// block begins, i.e. the start of the last paragraph (the run of lines at the +// end of the message that is separated from the body by a blank line). Trailers +// are only looked for from this index onwards, so that a trailer-looking line in +// the middle of the message body isn't mistaken for a trailer. Trailing blank +// lines are ignored, and a message that consists of a single paragraph is +// treated as its own trailer block. +func startOfTrailerBlock(content string) int { + end := len(strings.TrimRight(content, "\n")) + if blankLine := strings.LastIndex(content[:end], "\n\n"); blankLine >= 0 { + return blankLine + len("\n\n") + } + return 0 +} + var footNoteRe = regexp.MustCompile(`^\[\d+\]:\s*$`) type footNoteMatcher struct { @@ -171,15 +196,11 @@ func (self *footNoteMatcher) reset() { self.didFailToMatch = false } -var supportedTrailers = []string{ - "Signed-off-by:", - "Co-authored-by:", -} - type trailerMatcher struct { - lineStr strings.Builder - didFailToMatch bool - didMatch bool + didFailToMatch bool + didMatch bool + keyContainsDash bool + keyEndsWithColon bool } func (self *trailerMatcher) addCharacter(chr string) { @@ -194,19 +215,11 @@ func (self *trailerMatcher) addCharacter(chr string) { return } - if self.lineStr.Len() == 0 { - // If this is the first character, see if it could possibly match any supported trailer; if - // not, we can fail early and stop tracking further characters for this line. - if !anyOf(supportedTrailers, func(trailer string) bool { return trailer[0] == chr[0] }) { - self.didFailToMatch = true - return - } - } - - self.lineStr.WriteString(chr) + self.keyContainsDash = self.keyContainsDash || chr == "-" + self.keyEndsWithColon = chr == ":" } -func (self *trailerMatcher) isTrailer() bool { +func (self *trailerMatcher) isTrailer(remainingContent string) bool { if self.didFailToMatch { return false } @@ -215,8 +228,9 @@ func (self *trailerMatcher) isTrailer() bool { return true } - line := self.lineStr.String() - if anyOf(supportedTrailers, func(trailer string) bool { return line == trailer }) { + remainingContent = strings.TrimLeft(remainingContent, WHITESPACES) + if self.keyEndsWithColon && (self.keyContainsDash || + strings.HasPrefix(remainingContent, "http://") || strings.HasPrefix(remainingContent, "https://")) { self.didMatch = true return true } @@ -226,19 +240,10 @@ func (self *trailerMatcher) isTrailer() bool { } func (self *trailerMatcher) reset() { - self.lineStr.Reset() self.didFailToMatch = false self.didMatch = false -} - -func anyOf(strings []string, predicate func(s string) bool) bool { - for _, s := range strings { - if predicate(s) { - return true - } - } - - return false + self.keyContainsDash = false + self.keyEndsWithColon = false } func (self *TextArea) updateCells() { @@ -340,13 +345,12 @@ func (self *TextArea) MoveLeftWord() { self.cursor = self.newCursorForMoveLeftWord() } -func (self *TextArea) MoveRightWord() { +func (self *TextArea) newCursorForMoveRightWord() int { if self.atEnd() { - return + return self.cursor } if self.atLineEnd() { - self.cursor++ - return + return self.cursor + 1 } cellCursor := self.contentCursorToCellCursor(self.cursor) @@ -364,7 +368,11 @@ func (self *TextArea) MoveRightWord() { } } - self.cursor = self.cellCursorToContentCursor(cellCursor) + return self.cellCursorToContentCursor(cellCursor) +} + +func (self *TextArea) MoveRightWord() { + self.cursor = self.newCursorForMoveRightWord() } func (self *TextArea) MoveCursorUp() { @@ -559,6 +567,20 @@ func (self *TextArea) BackSpaceWord() { self.updateCells() } +func (self *TextArea) ForwardDeleteWord() { + newCursor := self.newCursorForMoveRightWord() + if newCursor == self.cursor { + return + } + + clipboard := self.content[self.cursor:newCursor] + if clipboard != "\n" { + self.clipboard = clipboard + } + self.content = self.content[:self.cursor] + self.content[newCursor:] + self.updateCells() +} + func (self *TextArea) Yank() { self.TypeString(self.clipboard) } diff --git a/pkg/gocui/text_area_test.go b/pkg/gocui/text_area_test.go new file mode 100644 index 000000000..f66876d24 --- /dev/null +++ b/pkg/gocui/text_area_test.go @@ -0,0 +1,1088 @@ +package gocui + +import ( + "reflect" + "strconv" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestTextArea(t *testing.T) { + tests := []struct { + actions func(*TextArea) + wrapWidth int + expectedContent string + expectedCursor int + expectedClipboard string + }{ + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("c") + }, + expectedContent: "abc", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("\n") + textarea.TypeCharacter("c") + }, + expectedContent: "a\nc", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abcd") + }, + expectedContent: "abcd", + expectedCursor: 4, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("a字cd") + }, + expectedContent: "a字cd", + expectedCursor: 6, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.BackSpaceChar() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.BackSpaceChar() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.BackSpaceChar() + }, + expectedContent: "a", + expectedCursor: 1, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.DeleteChar() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.DeleteChar() + }, + expectedContent: "a", + expectedCursor: 1, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.MoveCursorLeft() + textarea.DeleteChar() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("c") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.DeleteChar() + }, + expectedContent: "ac", + expectedCursor: 1, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.MoveCursorLeft() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.MoveCursorLeft() + }, + expectedContent: "a", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.MoveCursorLeft() + }, + expectedContent: "ab", + expectedCursor: 1, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.MoveCursorRight() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.MoveCursorRight() + }, + expectedContent: "a", + expectedCursor: 1, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.MoveCursorLeft() + textarea.MoveCursorRight() + }, + expectedContent: "ab", + expectedCursor: 2, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("漢") + textarea.TypeCharacter("字") + textarea.MoveCursorLeft() + }, + expectedContent: "漢字", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.ToggleOverwrite() + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + }, + expectedContent: "ab", + expectedCursor: 2, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("c") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.ToggleOverwrite() + textarea.TypeCharacter("d") + }, + expectedContent: "adc", + expectedCursor: 2, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb") + textarea.MoveLeftWord() + }, + expectedContent: "aaa bbb", + expectedCursor: 4, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa\nbbb") + textarea.MoveLeftWord() + }, + expectedContent: "aaa\nbbb", + expectedCursor: 4, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb") + textarea.GoToStartOfLine() + textarea.MoveLeftWord() + }, + wrapWidth: 4, + expectedContent: "aaa bbb", + expectedCursor: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb\n") + textarea.MoveLeftWord() + }, + expectedContent: "aaa bbb\n", + expectedCursor: 7, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb") + textarea.MoveLeftWord() + textarea.MoveLeftWord() + }, + expectedContent: "aaa bbb", + expectedCursor: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa") + textarea.GoToStartOfLine() + textarea.MoveLeftWord() + }, + expectedContent: "aaa", + expectedCursor: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb") + textarea.MoveRightWord() + }, + expectedContent: "aaa bbb", + expectedCursor: 7, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa\nbbb") + textarea.GoToStartOfLine() + textarea.MoveCursorLeft() + textarea.MoveRightWord() + }, + expectedContent: "aaa\nbbb", + expectedCursor: 4, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb") + textarea.GoToStartOfLine() + textarea.MoveCursorLeft() + textarea.MoveRightWord() + }, + wrapWidth: 4, + expectedContent: "aaa bbb", + expectedCursor: 7, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb") + textarea.GoToStartOfLine() + textarea.MoveRightWord() + }, + expectedContent: "aaa bbb", + expectedCursor: 3, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("aaa bbb\n") + textarea.MoveCursorLeft() + textarea.GoToStartOfLine() + textarea.MoveRightWord() + textarea.MoveRightWord() + }, + expectedContent: "aaa bbb\n", + expectedCursor: 7, + }, + { + actions: func(textarea *TextArea) { + // overwrite mode acts same as normal mode when cursor is at the end + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("c") + textarea.ToggleOverwrite() + textarea.TypeCharacter("d") + }, + expectedContent: "abcd", + expectedCursor: 4, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.DeleteToStartOfLine() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.DeleteToStartOfLine() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "ab", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.DeleteToStartOfLine() + }, + expectedContent: "ab", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("\n") + textarea.DeleteToStartOfLine() + }, + expectedContent: "ab", + expectedCursor: 2, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("\n") + textarea.TypeCharacter("c") + textarea.TypeCharacter("d") + textarea.DeleteToStartOfLine() + }, + expectedContent: "ab\n", + expectedCursor: 3, + expectedClipboard: "cd", + }, + { + actions: func(textarea *TextArea) { + textarea.GoToStartOfLine() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.MoveCursorLeft() + textarea.GoToStartOfLine() + }, + expectedContent: "a", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("\n") + textarea.TypeCharacter("c") + textarea.TypeCharacter("d") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.GoToStartOfLine() + }, + expectedContent: "ab\ncd", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("\n") + textarea.TypeCharacter("c") + textarea.TypeCharacter("d") + textarea.GoToStartOfLine() + }, + expectedContent: "ab\ncd", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("\n") + textarea.TypeCharacter("c") + textarea.TypeCharacter("d") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.GoToStartOfLine() + }, + expectedContent: "ab\ncd", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.GoToEndOfLine() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("a") + textarea.TypeCharacter("b") + textarea.TypeCharacter("\n") + textarea.TypeCharacter("c") + textarea.TypeCharacter("d") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.GoToEndOfLine() + }, + expectedContent: "ab\ncd", + expectedCursor: 5, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.SetCursor2D(10, 10) + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.SetCursor2D(-1, -1) + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\ncd") + textarea.SetCursor2D(0, 0) + }, + expectedContent: "ab\ncd", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\ncd") + textarea.SetCursor2D(2, 0) + }, + expectedContent: "ab\ncd", + expectedCursor: 2, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\ncd\nef") + textarea.SetCursor2D(2, 1) + }, + expectedContent: "ab\ncd\nef", + expectedCursor: 5, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abcd\n\nijkl") + textarea.MoveCursorUp() + }, + expectedContent: "abcd\n\nijkl", + expectedCursor: 5, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abcdef\n老老老") + textarea.MoveCursorLeft() + textarea.MoveCursorUp() + }, + expectedContent: "abcdef\n老老老", + expectedCursor: 4, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abcdef\n老老老") + textarea.MoveCursorUp() + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.MoveCursorDown() + }, + expectedContent: "abcdef\n老老老", + expectedCursor: 13, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abcd\nef") + textarea.MoveCursorUp() + textarea.GoToEndOfLine() + textarea.MoveCursorDown() + }, + expectedContent: "abcd\nef", + expectedCursor: 7, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abcd") + textarea.MoveCursorUp() + }, + expectedContent: "abcd", + expectedCursor: 4, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abcdefg`) + textarea.Clear() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abcdefg`) + textarea.Clear() + }, + expectedContent: "", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc def`) + textarea.MoveCursorLeft() + textarea.BackSpaceWord() + }, + expectedContent: "abc f", + expectedCursor: 4, + expectedClipboard: "de", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc def `) + textarea.BackSpaceWord() + }, + expectedContent: "abc ", + expectedCursor: 5, + expectedClipboard: "def ", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc def\nghi") + textarea.BackSpaceWord() + }, + expectedContent: "abc def\n", + expectedCursor: 8, + expectedClipboard: "ghi", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc def\nghi") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.BackSpaceWord() + }, + expectedContent: "abc defghi", + expectedCursor: 7, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc(def)`) + textarea.BackSpaceWord() + }, + expectedContent: "abc(def", + expectedCursor: 7, + expectedClipboard: ")", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc(def`) + textarea.BackSpaceWord() + }, + expectedContent: "abc(", + expectedCursor: 4, + expectedClipboard: "def", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc`) + textarea.GoToStartOfLine() + textarea.BackSpaceWord() + }, + expectedContent: "abc", + expectedCursor: 0, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc`) + textarea.Yank() + }, + expectedContent: "abc", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc def`) + textarea.DeleteToStartOfLine() + textarea.Yank() + textarea.Yank() + }, + expectedContent: "abc defabc def", + expectedCursor: 14, + expectedClipboard: "abc def", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc\ndef") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.MoveCursorUp() + textarea.DeleteToEndOfLine() + }, + expectedContent: "a\ndef", + expectedCursor: 1, + expectedClipboard: "bc", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc\ndef") + textarea.MoveCursorUp() + textarea.DeleteToEndOfLine() + }, + expectedContent: "abcdef", + expectedCursor: 3, + expectedClipboard: "", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc def`) + textarea.BackSpaceWord() + textarea.Yank() + textarea.Yank() + }, + expectedContent: "abc defdef", + expectedCursor: 10, + expectedClipboard: "def", + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString(`abc def`) + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.DeleteToEndOfLine() + textarea.Yank() + textarea.Yank() + }, + expectedContent: "abc defef", + expectedCursor: 9, + expectedClipboard: "ef", + }, + } + + for i, test := range tests { + t.Run(strconv.Itoa(i+1), func(t *testing.T) { + textarea := &TextArea{} + if test.wrapWidth > 0 { + textarea.AutoWrap = true + textarea.AutoWrapWidth = test.wrapWidth + } + test.actions(textarea) + assert.EqualValues(t, test.expectedContent, textarea.GetUnwrappedContent()) + assert.EqualValues(t, test.expectedCursor, textarea.cursor) + assert.EqualValues(t, test.expectedClipboard, textarea.clipboard) + }) + } +} + +func TestGetCursorXY(t *testing.T) { + tests := []struct { + actions func(*TextArea) + wrapWidth int + expectedX int + expectedY int + }{ + { + actions: func(textarea *TextArea) { + // do nothing + }, + expectedX: 0, + expectedY: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("\n") + }, + expectedX: 0, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("\na") + }, + expectedX: 1, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("\n") + textarea.MoveCursorUp() + }, + expectedX: 0, + expectedY: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("\n\n") + textarea.MoveCursorUp() + }, + expectedX: 0, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\ncd") + }, + expectedX: 2, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\n") + }, + expectedX: 0, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\n") + textarea.MoveCursorLeft() + }, + expectedX: 2, + expectedY: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\n\n") + }, + expectedX: 0, + expectedY: 2, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("ab\n\n") + textarea.MoveCursorLeft() + }, + expectedX: 0, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeCharacter("漢") + textarea.TypeCharacter("字") + }, + expectedX: 4, + expectedY: 0, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc de") + textarea.MoveCursorLeft() + }, + wrapWidth: 4, + expectedX: 1, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc de") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + }, + wrapWidth: 4, + expectedX: 0, + expectedY: 1, + }, + { + actions: func(textarea *TextArea) { + textarea.TypeString("abc de") + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + textarea.MoveCursorLeft() + }, + wrapWidth: 4, + expectedX: 3, + expectedY: 0, + }, + } + + for i, test := range tests { + t.Run(strconv.Itoa(i+1), func(t *testing.T) { + textarea := &TextArea{} + if test.wrapWidth > 0 { + textarea.AutoWrap = true + textarea.AutoWrapWidth = test.wrapWidth + } + test.actions(textarea) + x, y := textarea.GetCursorXY() + assert.EqualValues(t, test.expectedX, x) + assert.EqualValues(t, test.expectedY, y) + + // As a sanity check, test that setting the cursor back to (x, y) results in the same cursor position: + cursor := textarea.cursor + textarea.SetCursor2D(x, y) + assert.EqualValues(t, cursor, textarea.cursor) + }) + } +} + +func Test_AutoWrapContent(t *testing.T) { + tests := []struct { + name string + content string + autoWrapWidth int + expectedWrappedContent string + expectedSoftLineBreaks []int + }{ + { + name: "empty content", + content: "", + autoWrapWidth: 7, + expectedWrappedContent: "", + expectedSoftLineBreaks: []int{}, + }, + { + name: "no wrapping necessary", + content: "abcde", + autoWrapWidth: 7, + expectedWrappedContent: "abcde", + expectedSoftLineBreaks: []int{}, + }, + { + name: "wrap at whitespace", + content: "abcde xyz", + autoWrapWidth: 7, + expectedWrappedContent: "abcde \nxyz", + expectedSoftLineBreaks: []int{6}, + }, + { + name: "take wide characters into account", + content: "🏴󠁧󠁢󠁥󠁮󠁧󠁿 🏴󠁧󠁢󠁥󠁮󠁧󠁿 x y", // the flag has a width of 2 + autoWrapWidth: 7, + expectedWrappedContent: "🏴󠁧󠁢󠁥󠁮󠁧󠁿 🏴󠁧󠁢󠁥󠁮󠁧󠁿 x \ny", + expectedSoftLineBreaks: []int{60}, + }, + { + name: "take wide characters into account at line end", + content: "🏴󠁧󠁢󠁥󠁮󠁧󠁿 🏴󠁧󠁢󠁥󠁮󠁧󠁿 🏴󠁧󠁢󠁥󠁮󠁧󠁿", // the flag has a width of 2 + autoWrapWidth: 7, + expectedWrappedContent: "🏴󠁧󠁢󠁥󠁮󠁧󠁿 🏴󠁧󠁢󠁥󠁮󠁧󠁿 \n🏴󠁧󠁢󠁥󠁮󠁧󠁿", + expectedSoftLineBreaks: []int{58}, + }, + { + name: "lots of whitespace is preserved at end of line", + content: "abcde xyz", + autoWrapWidth: 7, + expectedWrappedContent: "abcde \nxyz", + expectedSoftLineBreaks: []int{11}, + }, + { + name: "don't wrap inside long word when there's no whitespace", + content: "abc defghijklmn opq", + autoWrapWidth: 7, + expectedWrappedContent: "abc \ndefghijklmn \nopq", + expectedSoftLineBreaks: []int{4, 16}, + }, + { + name: "don't break at space after footnote symbol", + content: "abc\n[1]: https://long/link\ndef", + autoWrapWidth: 7, + expectedWrappedContent: "abc\n[1]: https://long/link\ndef", + expectedSoftLineBreaks: []int{}, + }, + { + name: "don't break at space after footnote symbol at soft line start", + content: "abc def [1]: https://long/link\nghi", + autoWrapWidth: 7, + expectedWrappedContent: "abc def \n[1]: https://long/link\nghi", + expectedSoftLineBreaks: []int{8}, + }, + { + name: "do break at subsequent space after footnote symbol", + content: "abc\n[1]: normal text follows\ndef", + autoWrapWidth: 7, + expectedWrappedContent: "abc\n[1]: normal \ntext \nfollows\ndef", + expectedSoftLineBreaks: []int{16, 21}, + }, + { + name: "don't break at space after trailer at beginning of message", + content: "Signed-off-by: John Doe \nDepends-on: Some dependency with spaces\n", + autoWrapWidth: 10, + expectedWrappedContent: "Signed-off-by: John Doe \nDepends-on: Some dependency with spaces\n", + expectedSoftLineBreaks: []int{}, + }, + { + name: "don't break at space after trailer in a trailer block at the end of a message", + content: "abc\n\nSigned-off-by: John Doe \nDepends-on: Some dependency with spaces\n", + autoWrapWidth: 10, + expectedWrappedContent: "abc\n\nSigned-off-by: John Doe \nDepends-on: Some dependency with spaces\n", + expectedSoftLineBreaks: []int{}, + }, + { + name: "don't break at space after trailer with URL value", + content: "abc\n\nBug: https://example.com/a/very/long/path\nIssue: http://example.com/a/very/long/path\n", + autoWrapWidth: 10, + expectedWrappedContent: "abc\n\nBug: https://example.com/a/very/long/path\nIssue: http://example.com/a/very/long/path\n", + expectedSoftLineBreaks: []int{}, + }, + { + name: "do break at space if trailer is not in a trailer block at the end", + content: "abc\n\nSigned-off-by: John Doe \n\nMore text here\n", + autoWrapWidth: 10, + expectedWrappedContent: "abc\n\nSigned-off-by: \nJohn Doe \n\n\nMore text \nhere\n", + expectedSoftLineBreaks: []int{20, 29, 55}, + }, + { + // Each line in the trailer block is judged on its own, so a line + // that isn't recognized as a trailer wraps without affecting the + // real trailers around it. + name: "keep a trailer next to a non-trailer line in the same block", + content: "abc\n\nFixes: a long description that wraps\nSigned-off-by: John Doe \n", + autoWrapWidth: 10, + expectedWrappedContent: "abc\n\nFixes: a \nlong \ndescription \nthat wraps\nSigned-off-by: John Doe \n", + expectedSoftLineBreaks: []int{14, 19, 31}, + }, + { + name: "don't break at space after trailer when the block ends in a blank line", + content: "abc\n\nSigned-off-by: John Doe \n\n", + autoWrapWidth: 10, + expectedWrappedContent: "abc\n\nSigned-off-by: John Doe \n\n", + expectedSoftLineBreaks: []int{}, + }, + { + name: "do break normal text after non-hyphenated key", + content: "However: in this commit blah blah blah\n", + autoWrapWidth: 10, + expectedWrappedContent: "However: \nin this \ncommit \nblah blah \nblah\n", + expectedSoftLineBreaks: []int{9, 17, 24, 34}, + }, + { + name: "do break at space after trailer if there is no space after the colon", + content: "abc\n\nSigned-off-by:John Doe \n", + autoWrapWidth: 10, + expectedWrappedContent: "abc\n\nSigned-off-by:John \nDoe \n\n", + expectedSoftLineBreaks: []int{24, 28}, + }, + { + name: "hard line breaks", + content: "abc\ndef\n", + autoWrapWidth: 7, + expectedWrappedContent: "abc\ndef\n", + expectedSoftLineBreaks: []int{}, + }, + { + name: "mixture of hard and soft line breaks", + content: "abc def ghi jkl mno\npqr stu vwx yz\n", + autoWrapWidth: 7, + expectedWrappedContent: "abc def \nghi jkl \nmno\npqr stu \nvwx yz\n", + expectedSoftLineBreaks: []int{8, 16, 28}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + textArea := &TextArea{content: tt.content, AutoWrapWidth: tt.autoWrapWidth, AutoWrap: true} + cells, softLineBreakIndices := contentToCells(tt.content, tt.autoWrapWidth) + textArea.cells = cells + if !reflect.DeepEqual(textArea.GetContent(), tt.expectedWrappedContent) { + t.Errorf("autoWrapContentImpl() wrappedContent = %v, expected %v", textArea.GetContent(), tt.expectedWrappedContent) + } + if !reflect.DeepEqual(softLineBreakIndices, tt.expectedSoftLineBreaks) { + t.Errorf("autoWrapContentImpl() softLineBreakIndices = %v, expected %v", softLineBreakIndices, tt.expectedSoftLineBreaks) + } + + // As a sanity check, run through all characters of the original content, + // convert the cursor to the wrapped cursor, and check that the character + // in the wrapped content at that position is the same: + origCursor := 0 + for _, chr := range stringToGraphemes(tt.content) { + wrappedIndex := textArea.contentCursorToCellCursor(origCursor) + if chr != textArea.cells[wrappedIndex].char { + t.Errorf("Runes in orig content and wrapped content don't match at %d: expected %v, got %v", origCursor, chr, textArea.cells[wrappedIndex].char) + } + + // Also, check that converting the wrapped position back to the + // orig position yields the original value again: + origIndexAgain := textArea.cellCursorToContentCursor(wrappedIndex) + if origCursor != origIndexAgain { + t.Errorf("wrappedCursorToOrigCursor doesn't yield original position: expected %d, got %d", origCursor, origIndexAgain) + } + + origCursor += len(chr) + } + }) + } +} + +var testContent = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. +Quisque vehicula mi at elit pellentesque, eu pulvinar ligula molestie. +In vitae orci vitae elit fermentum lobortis sed in nisi. +Nam non odio nisi. +Donec vitae elit enim. +Pellentesque faucibus dolor at metus elementum sollicitudin. +Mauris eu orci vel odio ornare feugiat eget ac nisl. +Nam at dolor erat. +Integer sit amet rutrum lectus, mollis pretium sapien. +Maecenas ligula ipsum, congue vitae rhoncus eget, volutpat at quam. +Donec ac ultricies tortor, sit amet sollicitudin urna. +Integer porta ornare diam a imperdiet. +Praesent vulputate mi turpis, in porttitor diam commodo a. +Donec ut enim ligula. + +[Thïs-is-not-à-fôôtnöte]: https://example.com/footnote + +Sïgned-öff-by: This is not a trailer + +[1]: This is a footnote + +Signed-off-by: John Doe +` + +func BenchmarkTypeCharacter(b *testing.B) { + textArea := &TextArea{content: testContent, AutoWrapWidth: 72, AutoWrap: true} + textArea.SetCursor2D(0, 0) + + b.ResetTimer() + for b.Loop() { + textArea.TypeCharacter("a") + } +} diff --git a/pkg/gocui/ui_thread_test.go b/pkg/gocui/ui_thread_test.go new file mode 100644 index 000000000..d76bfaf9c --- /dev/null +++ b/pkg/gocui/ui_thread_test.go @@ -0,0 +1,43 @@ +package gocui + +import ( + "errors" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +// errStillWaiting stands in for the result of a wait that hasn't produced one. +var errStillWaiting = errors.New("still waiting") + +// resultOrTimeout reports what a wait returned, or errStillWaiting if it hasn't +// returned by the time we give up on it. +func resultOrTimeout(result chan error) error { + select { + case err := <-result: + return err + case <-time.After(time.Second): + return errStillWaiting + } +} + +// A worker waiting for the UI thread must not be left parked there once the +// main loop has stopped: nothing will ever run its callback, and the shutdown +// that follows blocks until such workers have finished (see +// tasks.ViewBufferManager.Close). +func TestOnUIThreadAndWaitGivesUpWhenTheLoopExits(t *testing.T) { + g := newTestGui(t) + + // Closing this is what MainLoop returning does. From here on nothing + // dequeues user events, so the callback below is never going to run. + close(g.loopExited) + + result := make(chan error, 1) + go func() { + result <- g.OnUIThreadAndWait(func() {}) + }() + + err := resultOrTimeout(result) + assert.ErrorIs(t, err, ErrLoopExited) +} diff --git a/pkg/gocui/user_event_queue_test.go b/pkg/gocui/user_event_queue_test.go new file mode 100644 index 000000000..e547debb4 --- /dev/null +++ b/pkg/gocui/user_event_queue_test.go @@ -0,0 +1,111 @@ +package gocui + +import ( + "sync" + "testing" + + "github.com/stretchr/testify/assert" +) + +// Enqueuing far more events than the old fixed 256-slot buffer, without the +// main loop draining them, used to panic ("userEvents channel full"). It must +// not: producers can legitimately burst faster than a stalled UI loop drains +// (e.g. one command-log entry per git command when adding a large directory to +// a custom patch, or any producer while the loop is blocked in a subprocess). +// The events must also stay in FIFO order. +func TestUpdateIsUnboundedAndPreservesOrder(t *testing.T) { + g := newTestGui(t) + + const n = 1000 + var got []int + for i := range n { + g.Update(func(*Gui) error { + got = append(got, i) + return nil + }) + } + + // Drain the whole queue the way the main loop's inner drain does. + _, err := g.processRemainingEvents() + assert.NoError(t, err) + + want := make([]int, n) + for i := range want { + want[i] = i + } + assert.Equal(t, want, got) +} + +// The high-water-mark handler fires only when the queue reaches a new maximum +// depth, reporting that depth. It does not reset when the queue drains. +func TestUpdateQueueHighWaterMark(t *testing.T) { + g := newTestGui(t) + + var marks []int + g.SetUpdateQueueHighWaterMarkHandler(func(depth int) { marks = append(marks, depth) }) + + noop := func(*Gui) error { return nil } + + // Three enqueues with no drain: new highs 1, 2, 3. + g.Update(noop) + g.Update(noop) + g.Update(noop) + _, err := g.processRemainingEvents() + assert.NoError(t, err) + + // Two enqueues stay below the previous high of 3: no new marks. + g.Update(noop) + g.Update(noop) + _, err = g.processRemainingEvents() + assert.NoError(t, err) + + // Four enqueues with no drain: only depth 4 beats the previous high. + for range 4 { + g.Update(noop) + } + + assert.Equal(t, []int{1, 2, 3, 4}, marks) +} + +// Concurrent producers must be able to enqueue safely (run under -race). Only +// same-goroutine order is guaranteed, so we check that every event is delivered +// exactly once and that each producer's own events stay in order. +func TestUpdateConcurrentProducers(t *testing.T) { + g := newTestGui(t) + + const producers = 8 + const perProducer = 500 + + type item struct{ producer, seq int } + var got []item + + var wg sync.WaitGroup + for p := range producers { + wg.Add(1) + go func() { + defer wg.Done() + for seq := range perProducer { + g.Update(func(*Gui) error { + got = append(got, item{p, seq}) + return nil + }) + } + }() + } + // Update is a synchronous, non-blocking enqueue, so once every producer has + // returned, every event is in the queue and a single drain sees them all. + wg.Wait() + + _, err := g.processRemainingEvents() + assert.NoError(t, err) + + assert.Len(t, got, producers*perProducer) + lastSeq := make([]int, producers) + for p := range lastSeq { + lastSeq[p] = -1 + } + for _, it := range got { + assert.Equal(t, lastSeq[it.producer]+1, it.seq, "producer %d events out of order", it.producer) + lastSeq[it.producer] = it.seq + } +} diff --git a/vendor/github.com/jesseduffield/gocui/view.go b/pkg/gocui/view.go similarity index 66% rename from vendor/github.com/jesseduffield/gocui/view.go rename to pkg/gocui/view.go index 9ba8b7efc..0a06d1981 100644 --- a/vendor/github.com/jesseduffield/gocui/view.go +++ b/pkg/gocui/view.go @@ -7,12 +7,13 @@ package gocui import ( "fmt" "io" + "slices" "strings" "sync" "unicode" "unicode/utf8" - "github.com/gdamore/tcell/v2" + "github.com/gdamore/tcell/v3" "github.com/rivo/uniseg" ) @@ -24,17 +25,51 @@ const ( RIGHT = 8 // view is overlapping at right edge ) +// viewBuffer holds a view's content as cells, together with the cursor and +// escape-sequence decoder state used to turn incoming bytes into those cells. +// A view normally has a single buffer (the one it displays), but bundling this +// state lets a re-render build a second, off-screen buffer and swap it in +// atomically once the new content is ready, so no reader ever sees a +// half-written buffer. +type viewBuffer struct { + // the view's content: one []cell per unwrapped line + lines []lineType + + // write cursor into lines + wx, wy int + + // decodes ESC sequences as bytes are written + ei *escapeInterpreter + + // If the last character written was a newline, we don't write it but instead + // set pendingNewline to true. If more text is written, we write the newline + // then. This avoids an extra blank line at the end of the view. + pendingNewline bool +} + // A View is a window. It maintains its own internal buffer and cursor // position. type View struct { name string - x0, y0, x1, y1 int // left top right bottom - ox, oy int // view offsets - cx, cy int // cursor position - rx, ry int // Read() offsets - wx, wy int // Write() offsets - lines [][]cell // All the data + x0, y0, x1, y1 int // left top right bottom + ox, oy int // view offsets + cx, cy int // cursor position + rx, ry int // Read() offsets outMode OutputMode + + // buf bundles the view's cell buffer and the cursor / escape-parser state + // used to write into it (see the viewBuffer type). It is the buffer every + // reader sees. + buf *viewBuffer + + // While non-nil, writes go here instead of buf, so an async re-render can + // build its new content without disturbing what readers (draw, clicks, + // scrolling, …) see. The task swaps it into buf once it has read enough to + // paint (SwapInOffscreenRender), so the displayed content jumps straight + // from the previous render to the new one with no half-written frame in + // between. nil during normal (non-async) writes. + offscreen *viewBuffer + // The y position of the first line of a range selection. // This is not relative to the view's origin: it is relative to the first line // of the view's content, so you can scroll the view and this value will remain @@ -50,6 +85,14 @@ type View struct { // tained is true if the viewLines must be updated tainted bool + // firstDirtyLine is the index of the lowest line in `lines` that has been + // written to or highlighted since viewLines was last refreshed, and whose + // cached wrapping (lineType.wrappedCells) may therefore be stale. Lines + // below it are unchanged and can reuse their cached wrapping instead of + // being re-wrapped, which keeps refreshViewLinesIfNeeded cheap while + // scrolling appends new lines to a long buffer. + firstDirtyLine int + // the last position that the mouse was hovering over; nil if the mouse is outside of // this view, or not hovering over a cell lastHoverPosition *pos @@ -65,17 +108,20 @@ type View struct { // true and viewLines to nil viewLines []viewLine - // If the last character written was a newline, we don't write it but - // instead set pendingNewline to true. If more text is written, we write the - // newline then. This is to avoid having an extra blank at the end of the view. - pendingNewline bool + // While a re-render is loading new content (see offscreen), the displayed + // buffer is only partially filled once we've swapped the off-screen render + // in: the task keeps appending lines after the first paint, up to the count + // needed for an accurate scrollbar. Sizing the scrollbar from that partial + // view-line count would make the thumb shrink and snap back as the rest + // streams in. So while a load is in progress we hold the scrollbar's height + // at this value — the height the view had when the load began — and let it + // grow only if the new content turns out taller. Zero means no load is in + // progress and the scrollbar tracks the content directly. + scrollbarHeightFloor int // writeMutex protects locks the write process writeMutex sync.Mutex - // ei is used to decode ESC sequences on Write - ei *escapeInterpreter - // Visible specifies whether the view is visible. Visible bool @@ -164,10 +210,9 @@ type View struct { // Overlaps describes which edges are overlapping with another view's edges Overlaps byte - // If HasLoader is true, the message will be appended with a spinning loader animation - HasLoader bool - - // ParentView is the view which catches events bubbled up from the given view if there's no matching handler + // ParentView is the view which catches events bubbled up from the given view if there's no matching handler. + // Views related this way are also drawn as a single focused unit: while one of + // them is the current view, they all get the focused frame and title colors. ParentView *View searcher *searcher @@ -209,30 +254,79 @@ func (v *View) clearViewLines() { v.clearHover() } +// ClearViewLines is clearViewLines guarded by writeMutex. It's for callers on +// the UI thread (the layout pass) that touch a view whose content a task +// goroutine may be writing concurrently: viewLines/tainted/hover are all +// buffer state that writeMutex protects. +func (v *View) ClearViewLines() { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + v.clearViewLines() +} + type searcher struct { searchString string searchPositions []SearchPosition modelSearchResults []SearchPosition currentSearchIndex int - onSelectItem func(int) - renderSearchStatus func(int, int) + onSelectItem func(*View, int) + renderSearchStatus func(*View, int, int) + + // Whether the content has changed since the positions were worked out, so that + // they have to be worked out again before they are read. Working them out walks + // the whole view, and content arrives a line at a time, so it happens once per + // read rather than once per line written. + positionsStale bool } -func (v *View) SetRenderSearchStatus(renderSearchStatus func(int, int)) { +func (v *View) setRenderSearchStatus(renderSearchStatus func(*View, int, int)) { v.searcher.renderSearchStatus = renderSearchStatus } -func (v *View) SetOnSelectItem(onSelectItem func(int)) { +func (v *View) setOnSelectResult(onSelectItem func(*View, int)) { v.searcher.onSelectItem = onSelectItem } func (v *View) renderSearchStatus(index int, itemCount int) { if v.searcher.renderSearchStatus != nil { - v.searcher.renderSearchStatus(index, itemCount) + v.searcher.renderSearchStatus(v, index, itemCount) } } +// refreshSearchPositions works the search positions out again if the content has +// changed since they were last worked out. Every read of the positions goes through +// this, so that no caller has to know whether the view has been drawn since the +// content it is asking about arrived. +func (v *View) refreshSearchPositions() { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + v.refreshSearchPositionsIfNeeded() +} + +// refreshSearchPositions for a caller that already holds writeMutex. +func (v *View) refreshSearchPositionsIfNeeded() { + if v.searcher.positionsStale { + v.updateSearchPositions() + } +} + +// RefreshSearch runs the search again over content the view has just been re-rendered +// with, and shows the "x of y" status of what it finds. The view stays where it is: the +// position in the content is the user's, and the search follows it rather than moving +// it. +func (v *View) RefreshSearch() { + if !v.IsSearching() { + return + } + + v.UpdateSearchResults(v.searcher.searchString, v.searcher.modelSearchResults) + v.renderSearchStatus(v.searcher.currentSearchIndex, len(v.searcher.searchPositions)) +} + func (v *View) gotoNextMatch() error { + v.refreshSearchPositions() + if len(v.searcher.searchPositions) == 0 { return nil } @@ -252,6 +346,8 @@ func (v *View) gotoNextMatch() error { } func (v *View) gotoPreviousMatch() error { + v.refreshSearchPositions() + if len(v.searcher.searchPositions) == 0 { return nil } @@ -273,6 +369,8 @@ func (v *View) gotoPreviousMatch() error { } func (v *View) SelectSearchResult(index int) { + v.refreshSearchPositions() + itemCount := len(v.searcher.searchPositions) if itemCount == 0 { return @@ -286,12 +384,14 @@ func (v *View) SelectSearchResult(index int) { v.FocusPoint(v.ox, y, true) v.renderSearchStatus(index, itemCount) if v.searcher.onSelectItem != nil { - v.searcher.onSelectItem(y) + v.searcher.onSelectItem(v, y) } } // Returns , func (v *View) GetSearchStatus() (int, int) { + v.refreshSearchPositions() + return v.searcher.currentSearchIndex, len(v.searcher.searchPositions) } @@ -365,6 +465,8 @@ func (v *View) nearestSearchPosition() int { } func (v *View) SetNearestSearchPosition() { + v.refreshSearchPositions() + if len(v.searcher.searchPositions) > 0 { newPos := v.nearestSearchPosition() if newPos != v.searcher.currentSearchIndex { @@ -386,7 +488,7 @@ func (v *View) FocusPoint(cx int, cy int, scrollIntoView bool) { if scrollIntoView { height := v.InnerHeight() - v.oy = calculateNewOrigin(cy, v.oy, lineCount, height) + v.SetOriginY(calculateNewOrigin(cy, v.oy, lineCount, height)) } v.cx = cx @@ -445,8 +547,40 @@ type SearchPosition struct { } type viewLine struct { - linesX, linesY int // coordinates relative to v.lines + linesX, linesY int // coordinates relative to v.buf.lines line []cell + + // Colors used to extend the bg past this wrapped segment's content. + // Derived at wrap time from the source line — see refreshViewLinesIfNeeded + // for the per-segment rule. + trailingFillAttributes *trailingFillAttributes +} + +// lineType is one of v.buf.lines: the cells of a source line, plus optional +// trailingFillAttributes recording the colors used to extend the bg +// past the line's content when the writer emitted '\x1b[K'. +type lineType struct { + cells cells + trailingFillAttributes *trailingFillAttributes + + // wrappedCells caches the result of wrapping `cells` to `wrappedColumns` + // columns, so that unchanged lines don't have to be re-wrapped on every + // refreshViewLinesIfNeeded (which runs on every scroll event, via + // ViewLinesHeight). Wrapping measures every cell's width and allocates, so + // for a long buffer that dominates the cost of scrolling. The cache is used + // only for lines below View.firstDirtyLine whose wrappedColumns still + // matches the current width; nil means nothing is cached yet. + wrappedCells [][]cell + wrappedColumns int +} + +// trailingFillAttributes describes the fg/bg colors that draw() should +// use for cells past the end of a wrapped segment's content. On a source +// line this records what the writer asked for via '\x1b[K' (and so opts +// the line in to trailing fill at all); the per-segment values on each +// viewLine are derived from it at wrap time. +type trailingFillAttributes struct { + fg, bg Attribute } type cell struct { @@ -456,7 +590,7 @@ type cell struct { hyperlink string } -type lineType []cell +type cells []cell func characterEquals(chr []byte, b byte) bool { return len(chr) == 1 && chr[0] == b @@ -467,7 +601,7 @@ func isCRLF(chr []byte) bool { } // String returns a string from a given cell slice. -func (l lineType) String() string { +func (l cells) String() string { var str strings.Builder for _, c := range l { str.WriteString(c.chr) @@ -488,7 +622,7 @@ func NewView(name string, x0, y0, x1, y1 int, mode OutputMode) *View { Editor: DefaultEditor, tainted: true, outMode: mode, - ei: newEscapeInterpreter(mode), + buf: &viewBuffer{ei: newEscapeInterpreter(mode)}, searcher: &searcher{}, TextArea: &TextArea{}, rangeSelectStartY: -1, @@ -499,9 +633,20 @@ func NewView(name string, x0, y0, x1, y1 int, mode OutputMode) *View { v.SelFgColor, v.SelBgColor = ColorDefault, ColorDefault v.InactiveViewSelBgColor = ColorDefault v.TitleColor, v.FrameColor = ColorDefault, ColorDefault + v.buf.ei.screenColMax = v.InnerWidth() return v } +// SetContentWidth tells the view the screen width that content written to it +// should count soft-wraps against (see escapeInterpreter.notifyCellsWritten). +// Callers pass the view's InnerWidth; it's a separate call, made on the UI +// thread when a render starts, so that the task goroutine that streams the +// content can consult this snapshot instead of reading the view's live +// dimensions (which the UI thread mutates during layout). +func (v *View) SetContentWidth(width int) { + v.buf.ei.screenColMax = width +} + // Dimensions returns the dimensions of the View func (v *View) Dimensions() (int, int, int, int) { return v.x0, v.y0, v.x1, v.y1 @@ -557,7 +702,7 @@ func (v *View) Name() string { // setCharacter sets a character (grapheme cluster) at the given point relative to the view. It applies // the specified colors, taking into account if the cell must be highlighted. Also, it checks if the // position is valid. -func (v *View) setCharacter(x, y int, ch string, fgColor, bgColor Attribute) { +func (v *View) setCharacter(x, y int, ch string, fgColor, bgColor Attribute, isWindowFocused bool) { maxX, maxY := v.Size() if x < 0 || x >= maxX || y < 0 || y >= maxY { return @@ -583,7 +728,7 @@ func (v *View) setCharacter(x, y int, ch string, fgColor, bgColor Attribute) { fgColor += 8 } fgColor = fgColor | AttrBold - if v.HighlightInactive { + if v.HighlightInactive || !isWindowFocused { bgColor = (bgColor & AttrStyleBits) | v.InactiveViewSelBgColor } else { bgColor = (bgColor & AttrStyleBits) | v.SelBgColor @@ -648,15 +793,8 @@ func (v *View) CursorY() int { // implement Horizontal and Vertical scrolling with just incrementing // or decrementing ox and oy. func (v *View) SetOrigin(x, y int) { - if x < 0 { - x = 0 - } - if y < 0 { - y = 0 - } - - v.ox = x - v.oy = y + v.SetOriginX(x) + v.SetOriginY(y) } func (v *View) SetOriginX(x int) { @@ -696,16 +834,16 @@ func (v *View) SetWritePos(x, y int) { y = 0 } - v.wx = x - v.wy = y + v.buf.wx = x + v.buf.wy = y // Changing the write position makes a pending newline obsolete - v.pendingNewline = false + v.buf.pendingNewline = false } // WritePos returns the current write position of the view's internal buffer. func (v *View) WritePos() (x, y int) { - return v.wx, v.wy + return v.buf.wx, v.buf.wy } // SetReadPos sets the read position of the view's internal buffer. @@ -729,56 +867,56 @@ func (v *View) ReadPos() (x, y int) { } // makeWriteable creates empty cells if required to make position (x, y) writeable. -func (v *View) makeWriteable(x, y int) { +func (b *viewBuffer) makeWriteable(x, y int) { // TODO: make this more efficient // line `y` must be index-able (that's why `<=`) - for len(v.lines) <= y { - if cap(v.lines) > len(v.lines) { - newLen := cap(v.lines) + for len(b.lines) <= y { + if cap(b.lines) > len(b.lines) { + newLen := cap(b.lines) if newLen > y { newLen = y + 1 } - v.lines = v.lines[:newLen] + b.lines = b.lines[:newLen] } else { - v.lines = append(v.lines, nil) + b.lines = append(b.lines, lineType{}) } } // cell `x` need not be index-able (that's why `<`) // append should be used by `lines[y]` user if he wants to write beyond `x` - for len(v.lines[y]) < x { - if cap(v.lines[y]) > len(v.lines[y]) { - newLen := cap(v.lines[y]) + for len(b.lines[y].cells) < x { + if cap(b.lines[y].cells) > len(b.lines[y].cells) { + newLen := cap(b.lines[y].cells) if newLen > x { newLen = x } - v.lines[y] = v.lines[y][:newLen] + b.lines[y].cells = b.lines[y].cells[:newLen] } else { - v.lines[y] = append(v.lines[y], cell{}) + b.lines[y].cells = append(b.lines[y].cells, cell{}) } } } -// writeCells copies []cell to (v.wx, v.wy), and advances v.wx accordingly. +// writeCells copies []cell to (b.wx, b.wy), and advances b.wx accordingly. // !!! caller MUST ensure that specified location (x, y) is writeable by calling makeWriteable -func (v *View) writeCells(cells []cell) { +func (b *viewBuffer) writeCells(cells []cell) { var newLen int // use maximum len available - line := v.lines[v.wy][:cap(v.lines[v.wy])] - maxCopy := len(line) - v.wx + line := b.lines[b.wy].cells[:cap(b.lines[b.wy].cells)] + maxCopy := len(line) - b.wx if maxCopy < len(cells) { - copy(line[v.wx:], cells[:maxCopy]) + copy(line[b.wx:], cells[:maxCopy]) line = append(line, cells[maxCopy:]...) newLen = len(line) } else { // maxCopy >= len(cells) - copy(line[v.wx:], cells) - newLen = v.wx + len(cells) - if newLen < len(v.lines[v.wy]) { - newLen = len(v.lines[v.wy]) + copy(line[b.wx:], cells) + newLen = b.wx + len(cells) + if newLen < len(b.lines[b.wy].cells) { + newLen = len(b.lines[b.wy].cells) } } - v.lines[v.wy] = line[:newLen] - v.wx += len(cells) + b.lines[b.wy].cells = line[:newLen] + b.wx += len(cells) } // Write appends a byte slice into the view's internal buffer. Because @@ -795,40 +933,54 @@ func (v *View) Write(p []byte) (n int, err error) { } func (v *View) write(p []byte) { + // An async re-render builds into the off-screen buffer (see View.offscreen) + // until it swaps in; until then the displayed buffer, and so everything + // readers see, is left untouched. + if v.offscreen != nil { + v.offscreen.write(v, p) + return + } + v.tainted = true + // write only ever touches lines from v.buf.wy onwards, so any cached wrapping + // below that stays valid. + v.firstDirtyLine = min(v.firstDirtyLine, v.buf.wy) v.clearHover() + v.buf.write(v, p) + + v.searcher.positionsStale = true +} + +// write parses p into cells and appends them to the buffer at its write cursor. +// It only touches the buffer; the View wrapper above handles display-side +// effects (tainting, hover, search). v supplies render config (Editable, colors, +// width, tab width, hyperlink auto-rendering). +func (b *viewBuffer) write(v *View, p []byte) { // Fill with empty cells, if writing outside current view buffer - v.makeWriteable(v.wx, v.wy) + b.makeWriteable(b.wx, b.wy) finishLine := func() { - v.autoRenderHyperlinksInCurrentLine() - if v.wx >= len(v.lines[v.wy]) { - v.writeCells([]cell{{ - chr: "", - width: 0, - fgColor: 0, - bgColor: 0, - }}) - } + b.autoRenderHyperlinksInCurrentLine(v) } advanceToNextLine := func() { - v.wx = 0 - v.wy++ - if v.wy >= len(v.lines) { - v.lines = append(v.lines, nil) + b.wx = 0 + b.wy++ + if b.wy >= len(b.lines) { + b.lines = append(b.lines, lineType{}) } } - if v.pendingNewline { + if b.pendingNewline { advanceToNextLine() - v.pendingNewline = false + b.ei.notifyRowAdvance() + b.pendingNewline = false } until := len(p) if !v.Editable && until > 0 && p[until-1] == '\n' { - v.pendingNewline = true + b.pendingNewline = true until-- } @@ -844,28 +996,46 @@ func (v *View) write(p []byte) { case characterEquals(chr, '\n') || isCRLF(chr): finishLine() advanceToNextLine() + b.ei.notifyRowAdvance() case characterEquals(chr, '\r'): finishLine() - v.wx = 0 + b.wx = 0 + b.ei.notifyColumnReset() default: - truncateLine, cells := v.parseInput(chr, width, v.wx, v.wy) + truncateLine, cells := b.parseInput(v, chr, width, b.wx, b.wy) + if cd, ok := b.ei.instruction.(cursorDown); ok { + b.ei.instructionRead() + for range cd.n { + b.autoRenderHyperlinksInCurrentLine(v) + advanceToNextLine() + } + } if cells == nil { continue } - v.writeCells(cells) + b.writeCells(cells) if truncateLine { - v.lines[v.wy] = v.lines[v.wy][:v.wx] + b.lines[b.wy].cells = b.lines[b.wy].cells[:b.wx] + } + // Soft-wrap tracking. truncateLine is true exactly when the + // cells are from \x1b[K filling to end of line — ConPTY + // doesn't advance the cursor for that, so we shouldn't count + // it toward wraps either. + if !truncateLine { + totalWidth := 0 + for _, c := range cells { + totalWidth += c.width + } + b.ei.notifyCellsWritten(totalWidth) } } } - if v.pendingNewline { + if b.pendingNewline { finishLine() } else { - v.autoRenderHyperlinksInCurrentLine() + b.autoRenderHyperlinksInCurrentLine(v) } - - v.updateSearchPositions() } // exported functions use the mutex. Non-exported functions are for internal use @@ -881,9 +1051,9 @@ func (v *View) writeString(s string) { var linkStartChars = []string{"h", "t", "t", "p", "s", ":", "/", "/"} func findLinkStart(line []cell) int { - for i := 0; i < len(line)-len(linkStartChars); i++ { + for i := range len(line) - len(linkStartChars) { for j := range linkStartChars { - if line[i+j].chr != string(linkStartChars[j]) { + if line[i+j].chr != linkStartChars[j] { break } if j == len(linkStartChars)-1 { @@ -899,7 +1069,7 @@ func findLinkStart(line []cell) int { // enough, because in markdown it's common to have a hyperlink followed by a // ')', so we want to stop there. Hopefully URLs containing ')' are uncommon // enough that this is not a problem. -var lineEndCharacters map[string]bool = map[string]bool{ +var lineEndCharacters = map[string]bool{ "": true, " ": true, "\n": true, @@ -908,12 +1078,12 @@ var lineEndCharacters map[string]bool = map[string]bool{ ")": true, } -func (v *View) autoRenderHyperlinksInCurrentLine() { +func (b *viewBuffer) autoRenderHyperlinksInCurrentLine(v *View) { if !v.AutoRenderHyperLinks { return } - line := v.lines[v.wy] + line := b.lines[b.wy].cells start := 0 for { linkStart := findLinkStart(line[start:]) @@ -927,10 +1097,10 @@ func (v *View) autoRenderHyperlinksInCurrentLine() { if _, ok := lineEndCharacters[line[linkEnd].chr]; ok { break } - link.WriteString(string(line[linkEnd].chr)) + link.WriteString(line[linkEnd].chr) } for i := linkStart; i < linkEnd; i++ { - v.lines[v.wy][i].hyperlink = link.String() + b.lines[b.wy].cells[i].hyperlink = link.String() } start = linkEnd } @@ -939,13 +1109,13 @@ func (v *View) autoRenderHyperlinksInCurrentLine() { // parseInput parses char by char the input written to the View. It returns nil // while processing ESC sequences. Otherwise, it returns a cell slice that // contains the processed data. -func (v *View) parseInput(ch []byte, width int, x int, _ int) (bool, []cell) { +func (b *viewBuffer) parseInput(v *View, ch []byte, width int, x int, _ int) (bool, []cell) { cells := []cell{} truncateLine := false - isEscape, err := v.ei.parseOne(ch) + isEscape, err := b.ei.parseOne(ch) if err != nil { - for _, chr := range v.ei.characters() { + for _, chr := range b.ei.characters() { c := cell{ fgColor: v.FgColor, bgColor: v.BgColor, @@ -954,20 +1124,31 @@ func (v *View) parseInput(ch []byte, width int, x int, _ int) (bool, []cell) { } cells = append(cells, c) } - v.ei.reset() + b.ei.reset() } else { repeatCount := 1 - if _, ok := v.ei.instruction.(eraseInLineFromCursor); ok { - // fill rest of line - v.ei.instructionRead() - cx := 0 - for _, cell := range v.lines[v.wy][0:v.wx] { - cx += cell.width + if _, ok := b.ei.instruction.(eraseInLineFromCursor); ok { + // Discard any old content past the cursor and record the + // fill colors so draw() paints the trailing area with them. + // This extends the bg to the right edge in both the + // content-fits and content-wraps cases — for the latter, + // the metadata is what reaches every wrapped segment past + // the last word. + b.ei.instructionRead() + truncateLine = true + b.lines[b.wy].trailingFillAttributes = &trailingFillAttributes{ + fg: b.ei.curFgColor, + bg: b.ei.curBgColor, } - repeatCount = v.InnerWidth() - cx + return truncateLine, []cell{} + } else if cf, ok := b.ei.instruction.(cursorForward); ok { + // emit `n` space cells under the parser-tracked SGR — used + // to materialize ConPTY's compressed runs of spaces (which + // it emits as ECH+CUF instead of literal whitespace). + b.ei.instructionRead() + repeatCount = cf.n ch = []byte{' '} width = 1 - truncateLine = true } else if isEscape { // do not output anything return truncateLine, nil @@ -982,13 +1163,13 @@ func (v *View) parseInput(ch []byte, width int, x int, _ int) (bool, []cell) { repeatCount = tabWidth - (x % tabWidth) } c := cell{ - fgColor: v.ei.curFgColor, - bgColor: v.ei.curBgColor, - hyperlink: v.ei.hyperlink.String(), + fgColor: b.ei.curFgColor, + bgColor: b.ei.curBgColor, + hyperlink: b.ei.hyperlink.String(), chr: string(ch), width: width, } - for i := 0; i < repeatCount; i++ { + for range repeatCount { cells = append(cells, c) } } @@ -1012,9 +1193,9 @@ func (v *View) Read(p []byte) (n int, err error) { } v.readBuffer = nil } - for v.ry < len(v.lines) { - for v.rx < len(v.lines[v.ry]) { - s := v.lines[v.ry][v.rx].chr + for v.ry < len(v.buf.lines) { + for v.rx < len(v.buf.lines[v.ry].cells) { + s := v.buf.lines[v.ry].cells[v.rx].chr count := len(s) copy(p[offset:], s) v.rx++ @@ -1036,8 +1217,17 @@ func (v *View) Read(p []byte) (n int, err error) { // only use this if the calling function has a lock on writeMutex func (v *View) clear() { v.rewind() - v.lines = nil + v.buf.lines = nil v.clearViewLines() + // Abandon any in-progress off-screen render: a synchronous SetContent/Clear + // is taking over the displayed buffer, so writes must go there, not into a + // stale off-screen buffer left by a stopped task. + v.offscreen = nil + // Likewise release any held scrollbar height: the new content is defined + // synchronously (e.g. a string render superseding a still-loading diff), so + // there's no async growth left to smooth over and the scrollbar should track + // the new content directly. + v.scrollbarHeightFloor = 0 } // Clear empties the view's internal buffer. @@ -1061,12 +1251,27 @@ func (v *View) CopyContent(from *View) { v.writeMutex.Lock() defer v.writeMutex.Unlock() + // A background task may be streaming output into the source view's buffer + // via Write, so read it under its own lock. The source is always a + // different view than the destination (see the sole caller, + // moveMainContextToTop), and no other code holds two view write locks at + // once, so this can't deadlock. + from.writeMutex.Lock() + defer from.writeMutex.Unlock() + v.clear() - v.lines = from.lines - v.viewLines = from.viewLines - v.ox = from.ox - v.oy = from.oy + // Clone the row slices rather than sharing them: the source view stays + // live (its streaming task keeps appending rows, and refreshViewLinesIfNeeded + // fills each row's wrapping cache in place via &lines[i]), so sharing the + // backing arrays would race those writes against this view's own rendering. + // This is a shallow clone -- the per-row cell data is immutable once written + // and stays shared, so the cost is proportional to the number of rows, not + // their contents. + v.buf.lines = slices.Clone(from.buf.lines) + v.viewLines = slices.Clone(from.viewLines) + v.SetOriginX(from.ox) + v.SetOriginY(from.oy) v.cx = from.cx v.cy = from.cy } @@ -1086,22 +1291,88 @@ func (v *View) Reset() { defer v.writeMutex.Unlock() v.rewind() - v.lines = nil + v.buf.lines = nil + // As in clear(): abandon any in-progress off-screen render so writes after a + // reset go to the displayed buffer. + v.offscreen = nil } -// This is for when we've done a restart for the sake of avoiding a flicker and -// we've reached the end of the new content to display: we need to clear the remaining -// content from the previous round. We do this by setting v.viewLines to nil so that -// we just render the new content from v.lines directly -func (v *View) FlushStaleCells() { +// BeginOffscreenRender starts building a re-render into an off-screen buffer. +// Until SwapInOffscreenRender promotes it, writes go to that buffer and the +// displayed buffer — what every reader sees — is left as it was. This is how an +// async re-render avoids exposing a half-written buffer: it accumulates +// off-screen and swaps in once it has read enough to paint. +func (v *View) BeginOffscreenRender() { v.writeMutex.Lock() defer v.writeMutex.Unlock() - v.clearViewLines() + ei := newEscapeInterpreter(v.outMode) + // The screen width content is wrapped at is render configuration set by + // SetContentWidth, not per-buffer state, so the off-screen buffer's parser + // needs it too — otherwise it counts no soft wraps and cursor-positioning + // escapes land on the wrong rows. + ei.screenColMax = v.buf.ei.screenColMax + v.offscreen = &viewBuffer{ei: ei} +} + +// SwapInOffscreenRender promotes the off-screen buffer (see BeginOffscreenRender) +// to the displayed buffer in one step, so the view jumps straight from the +// previous render to the new one with no half-written frame. Writes after this +// append to the now-displayed buffer directly. It is a no-op if no off-screen +// render is in progress, so it is safe to call more than once (e.g. again at EOF +// after an earlier paint already swapped). +func (v *View) SwapInOffscreenRender() { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + if v.offscreen == nil { + return + } + v.buf = v.offscreen + v.offscreen = nil + v.tainted = true + v.clearHover() +} + +// FreezeScrollbarHeight records the view's current content height so the +// scrollbar keeps that size while a re-render loads, instead of shrinking and +// snapping back as the partially-loaded content streams in past the first paint +// (see scrollbarHeightFloor). Call it when a load begins, while the view still +// shows the previous render; UnfreezeScrollbarHeight clears it when the load +// ends. +func (v *View) FreezeScrollbarHeight() { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + v.refreshViewLinesIfNeeded() + v.scrollbarHeightFloor = len(v.viewLines) +} + +// UnfreezeScrollbarHeight clears the height held by FreezeScrollbarHeight, so +// the scrollbar tracks the view's content directly again. Call it when a load +// ends. +func (v *View) UnfreezeScrollbarHeight() { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + v.scrollbarHeightFloor = 0 +} + +// scrollbarContentHeight is the view-line height the scrollbar is sized from. +// While a re-render is loading it is held at the height the view had when the +// load began (see FreezeScrollbarHeight), so the thumb doesn't shrink and jump +// as partially-loaded content streams in. +func (v *View) scrollbarContentHeight() int { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + v.refreshViewLinesIfNeeded() + return max(len(v.viewLines), v.scrollbarHeightFloor) } func (v *View) rewind() { - v.ei.reset() + v.buf.ei.reset() + v.buf.ei.resetScreenCursor() v.SetReadPos(0, 0) v.SetWritePos(0, 0) @@ -1129,6 +1400,8 @@ func stringToGraphemes(s string) []string { } func (v *View) updateSearchPositions() { + v.searcher.positionsStale = false + if v.searcher.searchString != "" { var normalizeRune func(s string) string var normalizedSearchStr string @@ -1173,14 +1446,14 @@ func (v *View) updateSearchPositions() { for _, result := range v.searcher.modelSearchResults { // This code only works when v.Wrap is false. - if result.Y >= len(v.lines) { + if result.Y >= len(v.buf.lines) { break } // If a view line exists for this line index: - if v.lines[result.Y] != nil { + if v.buf.lines[result.Y].cells != nil { // search this view line for the search string - positions := searchPositionsForLine(v.lines[result.Y], result.Y) + positions := searchPositionsForLine(v.buf.lines[result.Y].cells, result.Y) if len(positions) > 0 { // If we found any occurrences, add them v.searcher.searchPositions = append(v.searcher.searchPositions, positions...) @@ -1207,15 +1480,22 @@ func (v *View) updateSearchPositions() { } } } + + // The content may hold fewer matches than it did, so the current one is brought + // back into range: readers index the positions by it. + v.searcher.currentSearchIndex = min(v.searcher.currentSearchIndex, + max(0, len(v.searcher.searchPositions)-1)) } // IsTainted tells us if the view is tainted func (v *View) IsTainted() bool { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() return v.tainted } // draw re-draws the view's contents. -func (v *View) draw() { +func (v *View) draw(isWindowFocused bool) { v.writeMutex.Lock() defer v.writeMutex.Unlock() @@ -1231,14 +1511,15 @@ func (v *View) draw() { if maxX == 0 { return } - v.ox = 0 + v.SetOriginX(0) } v.refreshViewLinesIfNeeded() + v.refreshSearchPositionsIfNeeded() visibleViewLinesHeight := v.viewLineLengthIgnoringTrailingBlankLines() if v.Autoscroll && visibleViewLinesHeight > maxY { - v.oy = visibleViewLinesHeight - maxY + v.SetOriginY(visibleViewLinesHeight - maxY) } if len(v.viewLines) == 0 { @@ -1251,13 +1532,21 @@ func (v *View) draw() { } emptyCell := cell{chr: " ", width: 1, fgColor: ColorDefault, bgColor: ColorDefault} - var prevFgColor Attribute for y, vline := range v.viewLines[start:] { if y >= maxY { break } + // Decide the colors used for cells past the end of vline.line: + // the source line's trailingFillAttributes (set by '\x1b[K') if + // any, otherwise plain defaults. + trailingCell := emptyCell + if attrs := vline.trailingFillAttributes; attrs != nil { + trailingCell.fgColor = attrs.fg + trailingCell.bgColor = attrs.bg + } + // x tracks the current x position in the view, and cellIdx tracks the // index of the cell. If we print a double-sized rune, we increment cellIdx // by one but x by two. @@ -1265,33 +1554,24 @@ func (v *View) draw() { cellIdx := 0 var c cell - for { - if x >= maxX { - break - } - + for x < maxX { if x < 0 { if cellIdx < len(vline.line) { x += uniseg.StringWidth(vline.line[cellIdx].chr) cellIdx++ continue - } else { - // no more characters to write so we're only going to be printing empty cells - // past this point - x = 0 } + + // no more characters to write so we're only going to be printing empty cells + // past this point + x = 0 } // if we're out of cells to write, we'll just print empty cells. if cellIdx > len(vline.line)-1 { - c = emptyCell - c.fgColor = prevFgColor + c = trailingCell } else { c = vline.line[cellIdx] - // capturing previous foreground colour so that if we're using the reverse - // attribute we honour the final character's colour and don't awkwardly switch - // to a new background colour for the remainder of the line - prevFgColor = c.fgColor } fgColor := c.fgColor @@ -1306,7 +1586,7 @@ func (v *View) draw() { fgColor |= AttrUnderline } - v.setCharacter(x, y, c.chr, fgColor, bgColor) + v.setCharacter(x, y, c.chr, fgColor, bgColor, isWindowFocused) x += c.width cellIdx++ @@ -1315,35 +1595,71 @@ func (v *View) draw() { } func (v *View) refreshViewLinesIfNeeded() { - if v.tainted { - maxX := v.InnerWidth() - lineIdx := 0 - lines := v.lines - if v.HasLoader { - lines = v.loaderLines() + if !v.tainted { + return + } + + maxX := v.InnerWidth() + wrap := 0 + if v.Wrap { + wrap = maxX + } + + lineIdx := 0 + lines := v.buf.lines + for i := range lines { + line := &lines[i] + + // Reuse the previously wrapped result for lines that haven't changed + // since the last refresh (i.e. below firstDirtyLine) and were wrapped at + // the current width. Wrapping is expensive and this loop runs on every + // scroll event, so only the lines that were actually just read (or + // re-highlighted) should be wrapped afresh. + if line.wrappedCells == nil || line.wrappedColumns != wrap || i >= v.firstDirtyLine { + line.wrappedCells = lineWrap(line.cells, wrap) + line.wrappedColumns = wrap } - for i, line := range lines { - wrap := 0 - if v.Wrap { - wrap = maxX - } + ls := line.wrappedCells - ls := lineWrap(line, wrap) - for j := range ls { - vline := viewLine{linesX: j, linesY: i, line: ls[j]} - - if lineIdx > len(v.viewLines)-1 { - v.viewLines = append(v.viewLines, vline) - } else { - v.viewLines[lineIdx] = vline + for j := range ls { + // Per-segment trailing fill. When the source line opted in + // via '\x1b[K', the LAST wrapped segment uses those colors + // directly; earlier segments use the colors of their own + // last cell, so the trailing area matches the bg active + // where that segment ended rather than bleeding the + // '\x1b[K' bg back across color changes in the line. + var attrs *trailingFillAttributes + if line.trailingFillAttributes != nil { + if j == len(ls)-1 { + attrs = line.trailingFillAttributes + } else if len(ls[j]) > 0 { + last := ls[j][len(ls[j])-1] + attrs = &trailingFillAttributes{fg: last.fgColor, bg: last.bgColor} } - lineIdx++ } - } - if !v.HasLoader { - v.tainted = false + vline := viewLine{ + linesX: j, linesY: i, line: ls[j], + trailingFillAttributes: attrs, + } + + if lineIdx > len(v.viewLines)-1 { + v.viewLines = append(v.viewLines, vline) + } else { + v.viewLines[lineIdx] = vline + } + lineIdx++ } } + + v.firstDirtyLine = len(lines) + // Truncate any entries left over from a previous, longer render. An async + // re-render builds its content off-screen and swaps it in whole (see + // View.offscreen), so the buffer this rebuilds from is always a complete + // render — there is no half-loaded shorter buffer whose tail we'd need to + // keep showing to avoid a flicker, and a leftover tail would just be stale + // lines mapping to the wrong buffer rows. + v.viewLines = v.viewLines[:lineIdx] + v.tainted = false } // if autoscroll is enabled but we only have a single row of cells shown to the @@ -1421,11 +1737,9 @@ func (v *View) BufferLines() []string { v.writeMutex.Lock() defer v.writeMutex.Unlock() - lines := make([]string, len(v.lines)) - for i, l := range v.lines { - str := lineType(l).String() - str = strings.Replace(str, "\x00", "", -1) - lines[i] = str + lines := make([]string, len(v.buf.lines)) + for i, l := range v.buf.lines { + lines[i] = l.cells.String() } return lines } @@ -1433,7 +1747,10 @@ func (v *View) BufferLines() []string { // Buffer returns a string with the contents of the view's internal // buffer. func (v *View) Buffer() string { - return linesToString(v.lines) + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + return linesToString(v.buf.lines) } // ViewBufferLines returns the lines in the view's internal @@ -1446,16 +1763,14 @@ func (v *View) ViewBufferLines() []string { lines := make([]string, len(v.viewLines)) for i, l := range v.viewLines { - str := lineType(l.line).String() - str = strings.Replace(str, "\x00", "", -1) - lines[i] = str + lines[i] = cells(l.line).String() } return lines } // LinesHeight is the count of view lines (i.e. lines excluding wrapping) func (v *View) LinesHeight() int { - return len(v.lines) + return len(v.buf.lines) } // ViewLinesHeight is the count of view lines (i.e. lines including wrapping) @@ -1470,12 +1785,12 @@ func (v *View) ViewLinesHeight() int { // ViewBuffer returns a string with the contents of the view's buffer that is // shown to the user. func (v *View) ViewBuffer() string { - lines := make([][]cell, len(v.viewLines)) + strs := make([]string, len(v.viewLines)) for i := range v.viewLines { - lines[i] = v.viewLines[i].line + strs[i] = cells(v.viewLines[i].line).String() } - return linesToString(lines) + return strings.Join(strs, "\n") } // Line returns a string with the line of the view's internal buffer @@ -1486,11 +1801,11 @@ func (v *View) Line(y int) (string, bool) { return "", false } - if y < 0 || y >= len(v.lines) { + if y < 0 || y >= len(v.buf.lines) { return "", false } - return lineType(v.lines[y]).String(), true + return v.buf.lines[y].cells.String(), true } // Word returns a string with the word of the view's internal buffer @@ -1501,11 +1816,11 @@ func (v *View) Word(x, y int) (string, bool) { return "", false } - if x < 0 || y < 0 || y >= len(v.lines) || x >= len(v.lines[y]) { + if x < 0 || y < 0 || y >= len(v.buf.lines) || x >= len(v.buf.lines[y].cells) { return "", false } - str := lineType(v.lines[y]).String() + str := v.buf.lines[y].cells.String() nl := strings.LastIndexFunc(str[:x], indexFunc) if nl == -1 { @@ -1531,13 +1846,12 @@ func indexFunc(r rune) bool { // SetHighlight toggles highlighting of separate lines, for custom lists // or multiple selection in views. func (v *View) SetHighlight(y int, on bool) { - if y < 0 || y >= len(v.lines) { + if y < 0 || y >= len(v.buf.lines) { return } - line := v.lines[y] - cells := make([]cell, 0) - for _, c := range line { + cells := make([]cell, 0, len(v.buf.lines[y].cells)) + for _, c := range v.buf.lines[y].cells { if on { c.bgColor = v.SelBgColor c.fgColor = v.SelFgColor @@ -1548,7 +1862,8 @@ func (v *View) SetHighlight(y int, on bool) { cells = append(cells, c) } v.tainted = true - v.lines[y] = cells + v.firstDirtyLine = min(v.firstDirtyLine, y) + v.buf.lines[y].cells = cells v.clearHover() } @@ -1614,17 +1929,10 @@ func lineWrap(line []cell, columns int) [][]cell { return lines } -func linesToString(lines [][]cell) string { +func linesToString(lines []lineType) string { str := make([]string, len(lines)) for i := range lines { - rns := make([]rune, 0, len(lines[i])) - line := lineType(lines[i]).String() - for _, c := range line { - if c != '\x00' { - rns = append(rns, c) - } - } - str[i] = string(rns) + str[i] = lines[i].cells.String() } return strings.Join(str, "\n") @@ -1667,7 +1975,7 @@ func (v *View) SelectedLine() string { v.writeMutex.Lock() defer v.writeMutex.Unlock() - if len(v.lines) == 0 { + if len(v.buf.lines) == 0 { return "" } @@ -1679,7 +1987,7 @@ func (v *View) SelectedLines() []string { v.writeMutex.Lock() defer v.writeMutex.Unlock() - if len(v.lines) == 0 { + if len(v.buf.lines) == 0 { return nil } @@ -1694,9 +2002,7 @@ func (v *View) SelectedLines() []string { } func (v *View) lineContentAtIdx(idx int) string { - line := v.lines[idx] - str := lineType(line).String() - return strings.Replace(str, "\x00", "", -1) + return v.buf.lines[idx].cells.String() } func (v *View) SelectedPoint() (int, int) { @@ -1719,9 +2025,9 @@ func (v *View) SelectedLineRange() (int, int) { if start > end { return end, start - } else { - return start, end } + + return start, end } func (v *View) RenderTextArea() { @@ -1769,11 +2075,11 @@ func (v *View) ClearTextArea() { func (v *View) overwriteLines(y int, content string) { // break by newline, then for each line, write it, then add that erase command - v.wx = 0 - v.wy = y + v.buf.wx = 0 + v.buf.wy = y v.clearViewLines() - lines := strings.Replace(content, "\n", "\x1b[K\n", -1) + lines := strings.ReplaceAll(content, "\n", "\x1b[K\n") // If the last line doesn't end with a linefeed, add the erase command at // the end too if !strings.HasSuffix(lines, "\n") { @@ -1782,7 +2088,7 @@ func (v *View) overwriteLines(y int, content string) { v.writeString(lines) } -// only call this function if you don't care where v.wx and v.wy end up +// only call this function if you don't care where v.buf.wx and v.buf.wy end up func (v *View) OverwriteLines(y int, content string) { v.writeMutex.Lock() defer v.writeMutex.Unlock() @@ -1790,7 +2096,7 @@ func (v *View) OverwriteLines(y int, content string) { v.overwriteLines(y, content) } -// only call this function if you don't care where v.wx and v.wy end up +// only call this function if you don't care where v.buf.wx and v.buf.wy end up func (v *View) OverwriteLinesAndClearEverythingElse(lineCount int, y int, content string) { v.writeMutex.Lock() defer v.writeMutex.Unlock() @@ -1799,26 +2105,28 @@ func (v *View) OverwriteLinesAndClearEverythingElse(lineCount int, y int, conten v.overwriteLines(y, content) - for i := 0; i < y; i += 1 { - v.lines[i] = nil + for i := range y { + v.buf.lines[i] = lineType{} } - for i := v.wy + 1; i < len(v.lines); i += 1 { - v.lines[i] = nil + for i := v.buf.wy + 1; i < len(v.buf.lines); i += 1 { + v.buf.lines[i] = lineType{} } } func (v *View) setContentLineCount(lineCount int) { if lineCount > 0 { - v.makeWriteable(0, lineCount-1) + v.buf.makeWriteable(0, lineCount-1) } - v.lines = v.lines[:lineCount] + v.buf.lines = v.buf.lines[:lineCount] } // If the current search result is no longer visible after a scroll up, select the last search // result that is visible in the view, if any, or the first one that is below the view if none is // visible. func (v *View) selectVisibleSearchResultAfterScrollUp() { + v.refreshSearchPositions() + if !v.Highlight && len(v.searcher.searchPositions) != 0 { windowBottom := v.oy + v.InnerHeight() if v.searcher.searchPositions[v.searcher.currentSearchIndex].Y >= windowBottom { @@ -1842,6 +2150,8 @@ func (v *View) selectVisibleSearchResultAfterScrollUp() { // result that is visible in the view, if any, or the last one that is above the view if none is // visible. func (v *View) selectVisibleSearchResultAfterScrollDown() { + v.refreshSearchPositions() + if !v.Highlight && len(v.searcher.searchPositions) != 0 { if v.searcher.searchPositions[v.searcher.currentSearchIndex].Y < v.oy { newSearchIndex := v.searcher.currentSearchIndex @@ -1867,7 +2177,7 @@ func (v *View) ScrollUp(amount int) { } if amount != 0 { - v.oy -= amount + v.SetOriginY(v.oy - amount) v.cy += amount v.clearHover() @@ -1879,7 +2189,7 @@ func (v *View) ScrollUp(amount int) { func (v *View) ScrollDown(amount int) { adjustedAmount := v.adjustDownwardScrollAmount(amount) if adjustedAmount > 0 { - v.oy += adjustedAmount + v.SetOriginY(v.oy + adjustedAmount) v.cy -= adjustedAmount v.clearHover() @@ -1893,7 +2203,7 @@ func (v *View) ScrollLeft(amount int) { newOx = 0 } if newOx != v.ox { - v.ox = newOx + v.SetOriginX(newOx) v.clearHover() } @@ -1901,7 +2211,7 @@ func (v *View) ScrollLeft(amount int) { // not applying any limits to this func (v *View) ScrollRight(amount int) { - v.ox += amount + v.SetOriginX(v.ox + amount) v.clearHover() } @@ -1924,9 +2234,9 @@ func (v *View) adjustDownwardScrollAmount(scrollHeight int) int { } if oy+scrollHeight < 0 { return 0 - } else { - return scrollHeight } + + return scrollHeight } // scrollMargin is about how many lines must still appear if you scroll @@ -1938,16 +2248,16 @@ func (v *View) scrollMargin() int { // we should make this into a field on the view to be configured by the client. // For now we're hardcoding it. return 2 - } else { - return 0 } + + return 0 } // Returns true if the view contains a line containing the given text with the given // foreground color func (v *View) ContainsColoredText(fgColor string, text string) bool { - for _, line := range v.lines { - if containsColoredTextInLine(fgColor, text, line) { + for _, line := range v.buf.lines { + if containsColoredTextInLine(fgColor, text, line.cells) { return true } } @@ -1966,7 +2276,7 @@ func containsColoredTextInLine(fgColorStr string, text string, line []cell) bool cellColor := tcell.NewHexColor(cell.fgColor.Hex()) if cellColor == fgColor { - currentMatch += string(cell.chr) + currentMatch += cell.chr } else if currentMatch != "" { if strings.Contains(currentMatch, text) { return true @@ -1983,6 +2293,9 @@ func (v *View) onMouseMove(x int, y int) { return } + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + // newCx and newCy are relative to the view port, i.e. to the visible area of the view newCx := x - v.x0 - 1 newCy := y - v.y0 - 1 @@ -2001,6 +2314,19 @@ func (v *View) onMouseMove(x int, y int) { } } +// hyperlinkAt returns the hyperlink at the given position of the view's +// content, or an empty string if there is none. +func (v *View) hyperlinkAt(x, y int) string { + v.writeMutex.Lock() + defer v.writeMutex.Unlock() + + if y < 0 || y >= len(v.viewLines) || x < 0 || x >= len(v.viewLines[y].line) { + return "" + } + + return v.viewLines[y].line[x].hyperlink +} + func (v *View) findHyperlinkAt(x, y int) *SearchPosition { linkStr := v.viewLines[y].line[x].hyperlink if linkStr == "" { diff --git a/pkg/gocui/view_test.go b/pkg/gocui/view_test.go new file mode 100644 index 000000000..2ee5eb4b8 --- /dev/null +++ b/pkg/gocui/view_test.go @@ -0,0 +1,782 @@ +// Copyright 2014 The gocui Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package gocui + +import ( + "strings" + "testing" + + "github.com/gdamore/tcell/v3" + "github.com/gdamore/tcell/v3/color" + "github.com/rivo/uniseg" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" +) + +// WithSimulationScreen swaps the package-level Screen for a tcell +// terminfo-backed mock terminal so tests can call view.draw() and +// inspect rendered cells via Screen.Get(). The previous Screen is +// restored on test cleanup. +func WithSimulationScreen(t *testing.T, width, height int) { + t.Helper() + saved := Screen + if err := (&Gui{}).tcellInitSimulation(width, height); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + Screen.Fini() + Screen = saved + }) +} + +func TestWriteString(t *testing.T) { + tests := []struct { + existingLines []string + stringsToWrite []string + expectedLines [][]string + }{ + { + []string{}, + []string{""}, + [][]string{{}}, + }, + { + []string{}, + []string{"1\n"}, + [][]string{{"1"}}, + }, + { + []string{}, + []string{"1\n", "2\n"}, + [][]string{{"1"}, {"2"}}, + }, + { + []string{"a"}, + []string{"1\n"}, + [][]string{{"1"}}, + }, + { + []string{"a\x00"}, + []string{"1\n"}, + [][]string{{"1", "\x00"}}, + }, + { + []string{"ab"}, + []string{"1\n"}, + [][]string{{"1", "b"}}, + }, + { + []string{"abc"}, + []string{"1\n"}, + [][]string{{"1", "b", "c"}}, + }, + { + []string{}, + []string{"1\r"}, + [][]string{{"1"}}, + }, + { + []string{"a"}, + []string{"1\r"}, + [][]string{{"1"}}, + }, + { + []string{"a\x00"}, + []string{"1\r"}, + [][]string{{"1", "\x00"}}, + }, + { + []string{"ab"}, + []string{"1\r"}, + [][]string{{"1", "b"}}, + }, + { + []string{"abc"}, + []string{"1\r"}, + [][]string{{"1", "b", "c"}}, + }, + } + + for _, test := range tests { + v := NewView("name", 0, 0, 10, 10, OutputNormal) + for _, l := range test.existingLines { + v.buf.lines = append(v.buf.lines, lineType{cells: stringToCells(l)}) + } + for _, s := range test.stringsToWrite { + v.writeString(s) + } + resultingLines := lo.Map(v.buf.lines, + func(l lineType, _ int) []string { return cellsToStrings(l.cells) }) + assert.Equal(t, test.expectedLines, resultingLines) + } +} + +func TestUpdatedCursorAndOrigin(t *testing.T) { + tests := []struct { + prevOrigin int + size int + cursor int + expectedCursor int + expectedOrigin int + }{ + {0, 10, 0, 0, 0}, + {0, 10, 9, 9, 0}, + {0, 10, 10, 9, 1}, + {0, 10, 19, 9, 10}, + {0, 10, 20, 9, 11}, + {20, 10, 19, 0, 19}, + {20, 10, 25, 5, 20}, + } + + for _, test := range tests { + cursor, origin := updatedCursorAndOrigin(test.prevOrigin, test.size, test.cursor) + assert.EqualValues(t, test.expectedCursor, cursor, "Cursor is wrong") + assert.EqualValues(t, test.expectedOrigin, origin, "Origin in wrong") + } +} + +func TestAutoRenderingHyperlinks(t *testing.T) { + v := NewView("name", 0, 0, 10, 10, OutputNormal) + v.AutoRenderHyperLinks = true + + v.writeString("htt") + // No hyperlinks are generated for incomplete URLs + assert.Equal(t, "", v.buf.lines[0].cells[0].hyperlink) + // Writing more characters to the same line makes the link complete (even + // though we didn't see a newline yet) + v.writeString("ps://example.com") + assert.Equal(t, "https://example.com", v.buf.lines[0].cells[0].hyperlink) + + v.Clear() + // Valid but incomplete URL + v.writeString("https://exa") + assert.Equal(t, "https://exa", v.buf.lines[0].cells[0].hyperlink) + // Writing more characters to the same fixes the link + v.writeString("mple.com") + assert.Equal(t, "https://example.com", v.buf.lines[0].cells[0].hyperlink) +} + +// An async re-render builds into an off-screen buffer and swaps it in once it +// has enough to paint, so readers keep seeing the previous render — coherent and +// consistent — until the new content appears in one step. See View.offscreen. +func TestOffscreenRender(t *testing.T) { + v := NewView("name", 0, 0, 80, 10, OutputNormal) + + v.writeString("a\nb\nc") + assert.Equal(t, []string{"a", "b", "c"}, v.ViewBufferLines()) + + // Render new, longer content off-screen. + v.BeginOffscreenRender() + v.writeString("w\nx\ny\nz") + + // The displayed buffer is untouched: readers still see the previous render. + assert.Equal(t, []string{"a", "b", "c"}, v.ViewBufferLines()) + + // Swapping in reveals the new content in one step. + v.SwapInOffscreenRender() + assert.Equal(t, []string{"w", "x", "y", "z"}, v.ViewBufferLines()) + + // A further write now appends to the displayed buffer directly. + v.writeString("\nmore") + assert.Equal(t, []string{"w", "x", "y", "z", "more"}, v.ViewBufferLines()) +} + +// When a render produces fewer view lines than the previous one, +// refreshViewLinesIfNeeded must truncate viewLines to the new content rather +// than leaving the previous render's entries in the tail: with the off-screen +// render there is no half-loaded buffer whose tail we'd want to keep showing, +// and a leftover tail is just stale lines describing content that is gone. +func TestViewLinesTruncatedByShorterRender(t *testing.T) { + v := NewView("name", 0, 0, 10, 10, OutputNormal) // InnerWidth is 9 + v.Wrap = true + + // Two lines of 27 characters each wrap into 3 view lines apiece. + v.writeString(strings.Repeat("a", 27) + "\n" + strings.Repeat("b", 27)) + assert.Equal(t, 6, v.ViewLinesHeight()) + + // Re-render with three short, unwrapped lines: only 3 view lines remain. + v.BeginOffscreenRender() + v.writeString("aaa\nbbb\nccc") + v.SwapInOffscreenRender() + assert.Equal(t, 3, v.ViewLinesHeight()) + assert.Equal(t, []string{"aaa", "bbb", "ccc"}, v.ViewBufferLines()) +} + +// While an async re-render loads, it swaps in only a partially-filled buffer at +// its first paint and keeps appending lines afterwards. The scrollbar must keep +// using the pre-load height until the load ends, so the thumb doesn't shrink and +// snap back as the rest streams in. See View.scrollbarHeightFloor. +func TestScrollbarHeightHeldWhileLoading(t *testing.T) { + v := NewView("name", 0, 0, 80, 12, OutputNormal) + + // Initial render: 100 lines, scrolled well down. + v.writeString(strings.Repeat("x\n", 100)) + v.SetOrigin(0, 80) + assert.Equal(t, 100, v.scrollbarContentHeight()) + + // A re-render begins while the previous render is still shown: hold the + // scrollbar height at the current value. + v.FreezeScrollbarHeight() + + // The off-screen render swaps in only a screenful at its first paint. + v.BeginOffscreenRender() + v.writeString(strings.Repeat("y\n", 30)) + v.SwapInOffscreenRender() + + // The displayed buffer is now short, but the scrollbar height stays held, so + // the thumb keeps its position instead of jumping. + assert.Equal(t, 30, v.ViewLinesHeight()) + assert.Equal(t, 100, v.scrollbarContentHeight()) + + // The rest of the content streams in. + v.writeString(strings.Repeat("y\n", 70)) + assert.Equal(t, 100, v.scrollbarContentHeight()) + + // Once the load ends, the scrollbar tracks the real content directly again. + v.UnfreezeScrollbarHeight() + assert.Equal(t, 100, v.scrollbarContentHeight()) +} + +// If a synchronous render (e.g. a string render) supersedes a still-loading diff +// before it reaches its end, the held scrollbar height must be released, so the +// scrollbar reflects the new content rather than the abandoned load's height. +func TestScrollbarHeightReleasedWhenContentReplaced(t *testing.T) { + v := NewView("name", 0, 0, 80, 12, OutputNormal) + + v.writeString(strings.Repeat("x\n", 100)) + v.FreezeScrollbarHeight() + assert.Equal(t, 100, v.scrollbarContentHeight()) + + // A synchronous render replaces the content before the (notional) load ends. + v.SetContent("just a few\nshort lines\nhere") + assert.Equal(t, 3, v.scrollbarContentHeight()) +} + +func TestContainsColoredText(t *testing.T) { + hexColor := func(text string, hexStr string) []cell { + cells := make([]cell, len(text)) + hex := GetColor(hexStr) + for i, chr := range text { + cells[i] = cell{fgColor: hex, chr: string(chr)} + } + return cells + } + red := "#ff0000" + green := "#00ff00" + redStr := func(text string) []cell { return hexColor(text, red) } + greenStr := func(text string) []cell { return hexColor(text, green) } + + concat := func(lines ...[]cell) []cell { + var cells []cell + for _, line := range lines { + cells = append(cells, line...) + } + return cells + } + + tests := []struct { + lines [][]cell + fgColorStr string + text string + expected bool + }{ + { + lines: [][]cell{concat(redStr("a"))}, + fgColorStr: red, + text: "a", + expected: true, + }, + { + lines: [][]cell{concat(redStr("a"))}, + fgColorStr: red, + text: "b", + expected: false, + }, + { + lines: [][]cell{concat(redStr("a"))}, + fgColorStr: green, + text: "b", + expected: false, + }, + { + lines: [][]cell{concat(redStr("hel"), greenStr("lo"), redStr(" World!"))}, + fgColorStr: red, + text: "hello", + expected: false, + }, + { + lines: [][]cell{concat(redStr("hel"), greenStr("lo"), redStr(" World!"))}, + fgColorStr: green, + text: "lo", + expected: true, + }, + { + lines: [][]cell{ + redStr("hel"), + redStr("lo"), + }, + fgColorStr: red, + text: "hello", + expected: false, + }, + } + + for i, test := range tests { + lines := make([]lineType, len(test.lines)) + for j, cells := range test.lines { + lines[j] = lineType{cells: cells} + } + v := &View{buf: &viewBuffer{lines: lines}} + assert.Equal(t, test.expected, v.ContainsColoredText(test.fgColorStr, test.text), "Test %d failed", i) + } +} + +func TestWriteCursorPositionEscape(t *testing.T) { + // ConPTY presents its child's output as a screen buffer and uses cursor + // positioning escapes (CUP, `\x1b[;H`) to skip over blank rows + // rather than emitting empty LFs for them. The escape interpreter must + // synthesize the row advances those CUPs imply; otherwise non-blank rows + // that the child separated with blank lines end up adjacent in the view. + v := NewView("name", 0, 0, 20, 10, OutputNormal) + // "a", then "skip to row 3" (i.e. one blank row), then "b". + v.writeString("a\r\n\x1b[3;1Hb\r\n") + + got := make([][]string, 0, len(v.buf.lines)) + for _, l := range v.buf.lines { + got = append(got, cellsToStrings(l.cells)) + } + + assert.Equal(t, [][]string{{"a"}, {}, {"b"}}, got) +} + +func TestWriteCursorPositionEscapeAcrossWrites(t *testing.T) { + // Mirrors the production flow: bufio.Scanner splits the pty output on + // LF and feeds the view one Write per line (each with a trailing \n + // appended). The parser's screen-row counter must keep ticking across + // writes; otherwise CUPs are evaluated against a stale row and + // overshoot, producing too many blank lines instead of the right + // number. + v := NewView("name", 0, 0, 30, 30, OutputNormal) + v.writeString("a\n") + v.writeString("b\n") + // ConPTY is on row 3 here; CUP to row 5 should skip exactly one row. + v.writeString("c\x1b[5;1Hd\n") + + got := make([][]string, 0, len(v.buf.lines)) + for _, l := range v.buf.lines { + got = append(got, cellsToStrings(l.cells)) + } + assert.Equal(t, [][]string{ + {"a"}, + {"b"}, + {"c"}, + {}, + {"d"}, + }, got) +} + +func TestWriteCursorPositionEscapeInOffscreenRender(t *testing.T) { + // Soft-wrap counting has to work in an off-screen render too: the content + // width the parser counts wraps against is set by SetContentWidth before the + // render starts, so the off-screen buffer's parser has to pick it up. If it + // doesn't, no wraps are counted and the CUP below is evaluated against a + // stale row, overshooting into an extra blank line. + v := NewView("name", 0, 0, 30, 30, OutputNormal) + v.SetContentWidth(5) + + v.BeginOffscreenRender() + // Seven characters soft-wrap once on a 5-column screen, putting ConPTY on + // row 2; CUP to row 3 should then skip no rows at all. + v.writeString("aaaaaaa\x1b[3;1Hb\n") + v.SwapInOffscreenRender() + + got := make([][]string, 0, len(v.buf.lines)) + for _, l := range v.buf.lines { + got = append(got, cellsToStrings(l.cells)) + } + assert.Equal(t, [][]string{ + {"a", "a", "a", "a", "a", "a", "a"}, + {"b"}, + }, got) +} + +func TestWriteCursorForwardEscape(t *testing.T) { + // ConPTY compresses runs of default-colored spaces into ECH (\x1b[NX, + // "clear N cells, cursor stationary") + CUF (\x1b[NC, "cursor forward + // N") rather than emitting them literally. The interpreter has to + // materialize CUF as N visible spaces; otherwise the gap collapses + // and content that followed the indentation slides left. + v := NewView("name", 0, 0, 20, 10, OutputNormal) + // "a" + ECH 5 + CUF 5 + "b" — visually "a b". + v.writeString("a\x1b[5X\x1b[5Cb\n") + + got := make([][]string, 0, len(v.buf.lines)) + for _, l := range v.buf.lines { + got = append(got, cellsToStrings(l.cells)) + } + + assert.Equal(t, [][]string{{"a", " ", " ", " ", " ", " ", "b"}}, got) +} + +func TestWriteCursorPositionEscapeWithSoftWraps(t *testing.T) { + // If a logical line is longer than ConPTY's terminal width, ConPTY + // soft-wraps it onto multiple physical rows in its screen, and any + // subsequent CUP is addressed against the post-wrap row count. To + // keep our screen-row counter accurate we have to count those wraps + // as we write the cells. InnerWidth here is 5; "abcdefghij" (10 + // cells) wraps onto 2 rows, so ConPTY is on row 3 after the LF and a + // CUP to row 4 should skip exactly one row. + v := NewView("name", 0, 0, 6, 30, OutputNormal) // Width=7, InnerWidth=5 + v.writeString("abcdefghij\n") + v.writeString("\x1b[4;1Hxyz\n") + + got := make([][]string, 0, len(v.buf.lines)) + for _, l := range v.buf.lines { + got = append(got, cellsToStrings(l.cells)) + } + assert.Equal(t, [][]string{ + {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"}, + {}, + {"x", "y", "z"}, + }, got) +} + +func stringToCells(s string) []cell { + var cells []cell + state := -1 + for len(s) > 0 { + var c string + var w int + c, s, w, state = uniseg.FirstGraphemeClusterInString(s, state) + cells = append(cells, cell{chr: c, width: w}) + } + return cells +} + +func cellsToString(cells []cell) string { + var s strings.Builder + for _, c := range cells { + s.WriteString(c.chr) + } + return s.String() +} + +func cellsToStrings(cells []cell) []string { + return lo.Map(cells, func(c cell, _ int) string { return c.chr }) +} + +func TestLineWrap(t *testing.T) { + testCases := []struct { + name string + line string + columns int + expected []string + }{ + { + name: "Wrap on space", + line: "Hello World", + columns: 5, + expected: []string{ + "Hello", + "World", + }, + }, + { + name: "Wrap on hyphen", + line: "Hello-World", + columns: 6, + expected: []string{ + "Hello-", + "World", + }, + }, + { + name: "Wrap on hyphen 2", + line: "Blah Hello-World", + columns: 12, + expected: []string{ + "Blah Hello-", + "World", + }, + }, + { + name: "Wrap on hyphen 3", + line: "Blah Hello-World", + columns: 11, + expected: []string{ + "Blah Hello-", + "World", + }, + }, + { + name: "Wrap on hyphen 4", + line: "Blah Hello-World", + columns: 10, + expected: []string{ + "Blah Hello", + "-World", + }, + }, + { + name: "Wrap on space 2", + line: "Blah Hello World", + columns: 10, + expected: []string{ + "Blah Hello", + "World", + }, + }, + { + name: "Wrap on space with more words", + line: "Longer word here", + columns: 10, + expected: []string{ + "Longer", + "word here", + }, + }, + { + name: "Split word that's too long", + line: "ThisWordIsWayTooLong", + columns: 10, + expected: []string{ + "ThisWordIs", + "WayTooLong", + }, + }, + { + name: "Split word that's too long over multiple lines", + line: "ThisWordIsWayTooLong", + columns: 5, + expected: []string{ + "ThisW", + "ordIs", + "WayTo", + "oLong", + }, + }, + { + name: "Lots of hyphens", + line: "one-two-three-four-five", + columns: 8, + expected: []string{ + "one-two-", + "three-", + "four-", + "five", + }, + }, + { + name: "Several lines using all the available width", + line: "aaa bb cc ddd-ee ff", + columns: 5, + expected: []string{ + "aaa", + "bb cc", + "ddd-", + "ee ff", + }, + }, + { + name: "Multi-cell runes", + line: "🐤🐤🐤 🐝🐝 🙉 🦊🦊🦊-🐬🐬 🦢🦢", + columns: 9, + expected: []string{ + "🐤🐤🐤", + "🐝🐝 🙉", + "🦊🦊🦊-", + "🐬🐬 🦢🦢", + }, + }, + { + name: "Space in last column", + line: "hello world", + columns: 6, + expected: []string{ + "hello", + "world", + }, + }, + { + name: "Hyphen in last column", + line: "hello-world", + columns: 6, + expected: []string{ + "hello-", + "world", + }, + }, + { + name: "English text", + line: "+The sea reach of the Thames stretched before us like the bedinnind of an interminable waterway. In the offind the sea and the sky were welded todether without a joint, and in the luminous space the tanned sails of the bardes drifting blah blah", + columns: 81, + expected: []string{ + "+The sea reach of the Thames stretched before us like the bedinnind of an", + "interminable waterway. In the offind the sea and the sky were welded todether", + "without a joint, and in the luminous space the tanned sails of the bardes", + "drifting blah blah", + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + lineCells := stringToCells(tc.line) + + result := lineWrap(lineCells, tc.columns) + + resultStrings := make([]string, len(result)) + for i, line := range result { + resultStrings[i] = cellsToString(line) + } + + assert.EqualValues(t, tc.expected, resultStrings) + }) + } +} + +// TestNewlineTerminatedLineClearsTrailingBg verifies that a '\n' resets +// any attributes (e.g. AttrReverse-driven background) past the line's +// content, so a reversed cell at the end doesn't bleed into the empty +// area to the right. +func TestNewlineTerminatedLineClearsTrailingBg(t *testing.T) { + WithSimulationScreen(t, 14, 5) + + v := NewView("name", 0, 0, 11, 4, OutputNormal) + + // \x1b[7m sets reverse; \x1b[31m sets fg=red. With reverse the cell + // renders with bg=red. The trailing area past "foo" must NOT extend + // the red bg because '\n' marks the line as cleanly terminated. + v.writeString("\x1b[7m\x1b[31mfoo\x1b[0m\n") + v.draw(true) + + // First row: cells 1..3 are "foo" (render with red bg via reverse), + // cells 4..10 are trailing and should be plain default. + for x := 4; x <= 10; x++ { + _, style, _ := Screen.Get(x, 1) + assert.Equal(t, tcell.ColorDefault, style.GetForeground(), + "trailing cell at (%d, 1) should have default fg", x) + assert.False(t, style.HasReverse(), + "trailing cell at (%d, 1) should not have reverse attribute", x) + } +} + +// TestUnterminatedReverseLineDoesNotExtend verifies that an unterminated +// line ending with an AttrReverse cell does NOT propagate the reversed +// background past the line's content — matching real terminal behavior +// (try `print '\x1b[7m\x1b[31mfoo'` in a shell). The trailing area +// is rendered as plain default. +func TestUnterminatedReverseLineDoesNotExtend(t *testing.T) { + WithSimulationScreen(t, 14, 5) + + v := NewView("name", 0, 0, 11, 4, OutputNormal) + + // Reverse + red fg, "foo", no termination. The trailing cells past + // "foo" should be plain default, NOT a continuation of the red bg. + v.writeString("\x1b[7m\x1b[31mfoo") + v.draw(true) + + // Cells 4..10 are trailing and should be default with no reverse. + for x := 4; x <= 10; x++ { + _, style, _ := Screen.Get(x, 1) + assert.Equal(t, tcell.ColorDefault, style.GetForeground(), + "trailing cell at (%d, 1) should have default fg", x) + assert.False(t, style.HasReverse(), + "trailing cell at (%d, 1) should not have reverse attribute", x) + } +} + +// TestShortFilledLineExtendsBgWithoutWrap verifies that '\x1b[K' fills +// the rest of the line with the current bg color for a line that's +// short enough to fit within the view's inner width. +func TestShortFilledLineExtendsBgWithoutWrap(t *testing.T) { + WithSimulationScreen(t, 14, 5) + + v := NewView("name", 0, 0, 11, 4, OutputNormal) + + // \x1b[41m sets bg=red. "hi" fits within InnerWidth=10; \x1b[K should + // fill the remaining 8 cells with red. + v.writeString("\x1b[41mhi\x1b[K\x1b[0m\n") + v.draw(true) + + // All ten cells at (1..10, 1) should have red bg. + for x := 1; x <= 10; x++ { + _, style, _ := Screen.Get(x, 1) + assert.Equal(t, color.Maroon, style.GetBackground(), + "cell at (%d, 1) should have red bg", x) + } +} + +// TestWrappedFilledLineExtendsBgToEdge verifies that when a line is +// filled to the edge with \x1b[K (the pattern used by `delta` for diff +// lines) but exceeds the view's inner width, every wrapped segment +// extends the fill background past its content to the right edge. +func TestWrappedFilledLineExtendsBgToEdge(t *testing.T) { + WithSimulationScreen(t, 14, 6) + + // View dimensions: Width=12 (x0=0..x1=11), Height=6; InnerWidth=10, + // InnerHeight=4. Frame inset of 1 places content cells at screen + // (1..10, 1..4). + v := NewView("name", 0, 0, 11, 5, OutputNormal) + v.Wrap = true + + // Content with spaces so word wrap ends each segment before the + // right edge: "aaa bbb ccc ddd eee" wraps at InnerWidth=10 to three + // segments — "aaa bbb" / "ccc ddd" / "eee". Each row's trailing area + // must pick up the red fill from \x1b[K. + v.writeString("\x1b[41m" + "aaa bbb ccc ddd eee" + "\x1b[0m\x1b[41m\x1b[K\x1b[0m\n") + v.draw(true) + + // All three wrapped rows should have the red fill background across + // the full InnerWidth, including the trailing cells past each row's + // last word. + for y := 1; y <= 3; y++ { + for x := 1; x <= 10; x++ { + _, style, _ := Screen.Get(x, y) + assert.Equal(t, color.Maroon, style.GetBackground(), + "cell at (%d, %d) should have red bg", x, y) + } + } +} + +// TestMulticolorWrappedFillUsesLastCellOfEachSegment demonstrates that +// when a wrapped line switches bg color part-way through and ends with +// \x1b[K, the trailing area on each wrapped row should match the bg +// that was active where that row's content ended — not the \x1b[K bg, +// which would bleed the color from the end of the logical line back +// into the earlier wrapped rows. +func TestMulticolorWrappedFillUsesLastCellOfEachSegment(t *testing.T) { + WithSimulationScreen(t, 14, 6) + + // View dimensions: Width=12 (x0=0..x1=11), Height=6; InnerWidth=10, + // InnerHeight=4. Frame inset of 1 places content cells at screen + // (1..10, 1..4). + v := NewView("name", 0, 0, 11, 5, OutputNormal) + v.Wrap = true + + // Content "aaa bbb ccc" is 11 cells; lineWrap breaks at the space + // between "bbb" and "ccc" (index 7) so segment 1 is "aaa bbb" (red, + // last cell red) and segment 2 is "ccc" (green, last cell green). + // \x1b[K records the green bg on the source line. + v.writeString("\x1b[41maaa bbb\x1b[42m ccc\x1b[K\x1b[0m\n") + v.draw(true) + + // Row 1's content ends with a red cell at x=7, so trailing columns + // 8..10 should pick up red rather than the \x1b[K's green. + for x := 8; x <= 10; x++ { + _, style, _ := Screen.Get(x, 1) + assert.Equal(t, color.Maroon, style.GetBackground(), + "trailing cell at (%d, 1) should have red bg (matching segment's last cell)", x) + } + + // Row 2's content ends with a green cell at x=3, so trailing + // columns 4..10 should pick up green (matching both the segment's + // last cell and the \x1b[K bg — these happen to agree here). + for x := 4; x <= 10; x++ { + _, style, _ := Screen.Get(x, 2) + assert.Equal(t, color.Green, style.GetBackground(), + "trailing cell at (%d, 2) should have green bg", x) + } +} diff --git a/pkg/gui/background.go b/pkg/gui/background.go index e1720cd63..6a4c529a1 100644 --- a/pkg/gui/background.go +++ b/pkg/gui/background.go @@ -3,9 +3,12 @@ package gui import ( "fmt" "runtime" + "sync/atomic" "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/commands" + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -13,17 +16,27 @@ import ( type BackgroundRoutineMgr struct { gui *Gui - // if we've suspended the gui (e.g. because we've switched to a subprocess) - // we typically want to pause some things that are running like background - // file refreshes - pauseBackgroundRefreshes bool + // When this is greater than zero, the background routines (e.g. file refresh) + // skip their work. We pause them while the gui is suspended (e.g. for a + // subprocess) and while lazygit is itself driving a git operation that would + // otherwise be caught mid-flight (see the waiting-status helpers). It's a + // count rather than a bool because these pause scopes can overlap. + pauseRefreshesCount atomic.Int32 // a channel to trigger an immediate background fetch; we use this when switching repos triggerFetch chan struct{} } func (self *BackgroundRoutineMgr) PauseBackgroundRefreshes(pause bool) { - self.pauseBackgroundRefreshes = pause + if pause { + self.pauseRefreshesCount.Add(1) + } else { + self.pauseRefreshesCount.Add(-1) + } +} + +func (self *BackgroundRoutineMgr) backgroundRefreshesPaused() bool { + return self.pauseRefreshesCount.Load() > 0 } func (self *BackgroundRoutineMgr) startBackgroundRoutines() { @@ -32,6 +45,11 @@ func (self *BackgroundRoutineMgr) startBackgroundRoutines() { if userConfig.Git.AutoFetch { fetchInterval := userConfig.Refresher.FetchInterval if fetchInterval > 0 { + // The channel must be created here, on the UI thread and before + // the fetch goroutine spawns, so that triggerImmediateFetch (also + // running on the UI thread) can read the field without racing the + // write. See triggerImmediateFetch for why it is buffered. + self.triggerFetch = make(chan struct{}, 1) go utils.Safe(self.startBackgroundFetch) } else { self.gui.c.Log.Errorf( @@ -51,8 +69,19 @@ func (self *BackgroundRoutineMgr) startBackgroundRoutines() { } } + if userConfig.Git.AutoDetectExternalChanges { + interval := userConfig.Refresher.ExternalChangeCheckInterval + if interval > 0 { + go utils.Safe(self.startBackgroundExternalChangeDetection) + } else { + self.gui.c.Log.Errorf( + "Value of config option 'refresher.externalChangeCheckInterval' (%d) is invalid, disabling external change detection", + interval) + } + } + if self.gui.Config.GetDebug() { - self.goEvery(time.Second*time.Duration(10), self.gui.stopChan, func(_ bool) error { + self.goEvery(time.Second*time.Duration(10), self.gui.stopChan, nil, func(_ bool) error { formatBytes := func(b uint64) string { const unit = 1000 if b < unit { @@ -79,23 +108,34 @@ func (self *BackgroundRoutineMgr) startBackgroundFetch() { self.gui.waitForIntro.Wait() fetch := func(firstTimeOrRetriggered bool) error { - // Do this on the UI thread so that we don't have to deal with synchronization around the - // access of the repo state. - self.gui.onUIThread(func() error { - // There's a race here, where we might be recording the time stamp for a different repo - // than where the fetch actually ran. It's not very likely though, and not harmful if it - // does happen; guarding against it would be more effort than it's worth. + // Capture what the fetch needs from the gui's per-repo state in a + // single UI-thread hop: gui.git, gui.helpers and gui.State are all + // replaced on a repo switch (which runs on the UI thread), so reading + // them from this background goroutine would race the reassignment. + // Capturing them together also ties the fetch, the post-fetch + // refresh's generation baseline, and the recorded fetch time to the + // same repo. + var git *commands.GitCommand + var appStatusHelper *helpers.AppStatusHelper + var branchesHelper *helpers.BranchesHelper + var fetchGeneration int + if err := self.gui.g.OnUIThreadAndWaitBackground(func() { + git = self.gui.git + appStatusHelper = self.gui.helpers.AppStatus + branchesHelper = self.gui.helpers.BranchesHelper + fetchGeneration = self.gui.c.State().GetRepoGeneration() self.gui.State.LastBackgroundFetchTime = time.Now() - return nil - }) + }); err != nil { + return err + } if self.gui.UserConfig().Gui.ShowBottomLine || firstTimeOrRetriggered { - return self.gui.helpers.AppStatus.WithWaitingStatusImpl(self.gui.Tr.FetchingStatus, func(gocui.Task) error { - return self.backgroundFetch() + return appStatusHelper.WithWaitingStatusImpl(self.gui.Tr.FetchingStatus, func(gocui.Task) error { + return self.backgroundFetch(git, branchesHelper, fetchGeneration) }, nil) } - return self.backgroundFetch() + return self.backgroundFetch(git, branchesHelper, fetchGeneration) } // We want an immediate fetch at startup, and since goEvery starts by @@ -103,31 +143,96 @@ func (self *BackgroundRoutineMgr) startBackgroundFetch() { _ = fetch(true) userConfig := self.gui.UserConfig() - self.triggerFetch = self.goEvery(userConfig.Refresher.FetchIntervalDuration(), self.gui.stopChan, fetch) + self.goEvery(userConfig.Refresher.FetchIntervalDuration(), self.gui.stopChan, self.triggerFetch, fetch) } func (self *BackgroundRoutineMgr) startBackgroundFilesRefresh() { self.gui.waitForIntro.Wait() userConfig := self.gui.UserConfig() - self.goEvery(userConfig.Refresher.RefreshIntervalDuration(), self.gui.stopChan, func(_ bool) error { - self.gui.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) + self.goEvery(userConfig.Refresher.RefreshIntervalDuration(), self.gui.stopChan, nil, func(_ bool) error { + self.gui.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}, Background: true}) return nil }) } -// returns a channel that can be used to trigger the callback immediately -func (self *BackgroundRoutineMgr) goEvery(interval time.Duration, stop chan struct{}, function func(bool) error) chan struct{} { +func (self *BackgroundRoutineMgr) startBackgroundExternalChangeDetection() { + self.gui.waitForIntro.Wait() + + // We don't seed the snapshot here. The startup refresh captures one on + // entry (like every refs-touching refresh), and until one has been + // captured RefsSnapshotChangedSince treats the empty baseline as + // "unchanged", so we never fire a spurious refresh before a baseline + // exists — no need to depend on the timing of that startup refresh. + + userConfig := self.gui.UserConfig() + self.goEvery( + userConfig.Refresher.ExternalChangeCheckIntervalDuration(), + self.gui.stopChan, + nil, + func(_ bool) error { + self.checkForExternalChanges() + return nil + }, + ) +} + +func (self *BackgroundRoutineMgr) checkForExternalChanges() { + // Capture the per-repo objects in a UI-thread hop, like the background + // fetch does: gui.git and gui.helpers are replaced on a repo switch, so + // reading them from this background goroutine would race the reassignment. + var git *commands.GitCommand + var refreshHelper *helpers.RefreshHelper + if err := self.gui.g.OnUIThreadAndWaitBackground(func() { + git = self.gui.git + refreshHelper = self.gui.helpers.Refresh + }); err != nil { + return + } + + current, err := git.Status.RefsSnapshot() + if err != nil { + // Transient error (e.g. git process couldn't start). Don't update the + // stored snapshot; we'll retry next tick. + self.gui.c.Log.Warnf("RefsSnapshot failed: %v", err) + return + } + + if !refreshHelper.RefsSnapshotChangedSince(current) { + return + } + + // goEvery checks the pause count before starting us, but a git operation + // may have begun (and paused refreshes) after that check, while we were + // reading the snapshot above. In that case the change we detected is the + // operation's own intermediate state, so back off: the operation will + // refresh and re-snapshot when it finishes, and if the change was really + // external we'll catch it on the next tick after the pause lifts. We don't + // update the stored snapshot, so nothing is swallowed. + if self.backgroundRefreshesPaused() { + return + } + + // No need to update the stored snapshot here; Refresh does that. + self.gui.c.Log.Info("External ref change detected — refreshing") + self.gui.c.RefreshFromWorker(types.RefreshOptions{Background: true}) +} + +// Runs function every interval until stop is closed. A send on retrigger (if +// non-nil) runs the callback immediately and restarts the interval. +func (self *BackgroundRoutineMgr) goEvery(interval time.Duration, stop, retrigger chan struct{}, function func(bool) error) { done := make(chan struct{}) - retrigger := make(chan struct{}) go utils.Safe(func() { ticker := time.NewTicker(interval) defer ticker.Stop() doit := func(retriggered bool) { - if self.pauseBackgroundRefreshes { + if self.backgroundRefreshesPaused() { return } - self.gui.c.OnWorker(func(gocui.Task) error { + // OnWorkerBackground, not OnWorker: these routines and the refreshes + // they trigger must not count towards lazygit being busy, or they'd + // spuriously block a repo switch every time one happens to be running. + self.gui.c.OnWorkerBackground(func(gocui.Task) error { _ = function(retriggered) done <- struct{}{} return nil @@ -149,23 +254,30 @@ func (self *BackgroundRoutineMgr) goEvery(interval time.Duration, stop chan stru } } }) - return retrigger } -func (self *BackgroundRoutineMgr) backgroundFetch() (err error) { - err = self.gui.git.Sync.FetchBackground() +// The parameters are captured by the caller before the fetch starts, not read +// here after it: the fetch is a network call during which the user may switch +// repos, and the post-fetch refresh needs to be able to tell (see +// PostFetchRefresh). +func (self *BackgroundRoutineMgr) backgroundFetch(git *commands.GitCommand, branchesHelper *helpers.BranchesHelper, fetchGeneration int) error { + err := git.Sync.FetchBackground() - self.gui.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS}, Mode: types.SYNC}) - - if err == nil { - err = self.gui.helpers.BranchesHelper.AutoForwardBranches() - } - - return err + return branchesHelper.PostFetchRefresh(err, true, fetchGeneration) } func (self *BackgroundRoutineMgr) triggerImmediateFetch() { if self.triggerFetch != nil { - self.triggerFetch <- struct{}{} + // This runs on the UI thread, which must never block waiting for a + // background routine; in particular, the goEvery loop only receives + // between callbacks, and an in-flight fetch can itself be waiting for + // the UI thread to perform its post-fetch refresh, so a blocking send + // here would deadlock. The channel has a buffer of one, so the trigger + // is latched even when the loop isn't currently receiving; if one is + // already pending, the two coalesce. + select { + case self.triggerFetch <- struct{}{}: + default: + } } } diff --git a/pkg/gui/command_log_panel.go b/pkg/gui/command_log_panel.go index d4b847c94..e43f69999 100644 --- a/pkg/gui/command_log_panel.go +++ b/pkg/gui/command_log_panel.go @@ -7,7 +7,6 @@ import ( "time" "github.com/jesseduffield/lazygit/pkg/constants" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/theme" ) @@ -28,10 +27,20 @@ func (gui *Gui) LogAction(action string) { return } - gui.Views.Extras.Autoscroll = true + // LogAction and LogCommand are called both from the UI thread and from git + // worker goroutines, so bounce the writes onto the UI thread: they touch the + // view's autoscroll flag and the GuiLog slice, which the layout/draw code + // reads. Ordering between successive log calls is preserved by the FIFO the + // bounce enqueues onto. It's a background bounce because writing the command + // log is incidental display work that must not count towards lazygit being + // busy (otherwise it could block a repo switch). + gui.onUIThreadBackground(func() error { + gui.Views.Extras.Autoscroll = true - gui.GuiLog = append(gui.GuiLog, action) - fmt.Fprint(gui.Views.Extras, "\n"+style.FgYellow.Sprint(action)) + gui.GuiLog = append(gui.GuiLog, action) + fmt.Fprint(gui.Views.Extras, "\n"+style.FgYellow.Sprint(action)) + return nil + }) } func (gui *Gui) LogCommand(cmdStr string, commandLine bool) { @@ -39,23 +48,29 @@ func (gui *Gui) LogCommand(cmdStr string, commandLine bool) { return } - gui.Views.Extras.Autoscroll = true - textStyle := theme.DefaultTextColor if !commandLine { // if we're not dealing with a direct command that could be run on the command line, // we style it differently to communicate that textStyle = style.FgMagenta } - gui.GuiLog = append(gui.GuiLog, cmdStr) indentedCmdStr := " " + strings.ReplaceAll(cmdStr, "\n", "\n ") - fmt.Fprint(gui.Views.Extras, "\n"+textStyle.Sprint(indentedCmdStr)) + + // See the comment in LogAction: bounce onto the UI thread since we may be + // called from a git worker, in the background so it can't block a repo switch. + gui.onUIThreadBackground(func() error { + gui.Views.Extras.Autoscroll = true + + gui.GuiLog = append(gui.GuiLog, cmdStr) + fmt.Fprint(gui.Views.Extras, "\n"+textStyle.Sprint(indentedCmdStr)) + return nil + }) } func (gui *Gui) printCommandLogHeader() { introStr := fmt.Sprintf( gui.c.Tr.CommandLogHeader, - keybindings.Label(gui.c.UserConfig().Keybinding.Universal.ExtrasMenu), + gui.c.UserConfig().Keybinding.Universal.ExtrasMenu, ) fmt.Fprintln(gui.Views.Extras, style.FgCyan.Sprint(introStr)) @@ -72,95 +87,90 @@ func (gui *Gui) printCommandLogHeader() { func (gui *Gui) getRandomTip() string { config := gui.c.UserConfig().Keybinding - formattedKey := func(key string) string { - return keybindings.Label(key) - } - tips := []string{ // keybindings and lazygit-specific advice fmt.Sprintf( "To force push, press '%s' and then if the push is rejected you will be asked if you want to force push", - formattedKey(config.Universal.Push), + config.Universal.Push, ), fmt.Sprintf( "To filter commits by path, press '%s'", - formattedKey(config.Universal.FilteringMenu), + config.Universal.FilteringMenu, ), fmt.Sprintf( "To start an interactive rebase, press '%s' on a commit. You can always abort the rebase by pressing '%s' and selecting 'abort'", - formattedKey(config.Universal.Edit), - formattedKey(config.Universal.CreateRebaseOptionsMenu), + config.Universal.Edit, + config.Universal.CreateRebaseOptionsMenu, ), fmt.Sprintf( "In flat file view, merge conflicts are sorted to the top. To switch to flat file view press '%s'", - formattedKey(config.Files.ToggleTreeView), + config.Files.ToggleTreeView, ), "If you want to learn Go and can think of ways to improve lazygit, join the team! Click 'Ask Question' and express your interest", fmt.Sprintf( "If you press '%s'/'%s' you can undo/redo your changes. Be wary though, this only applies to branches/commits, so only do this if your worktree is clear.\nDocs: %s", - formattedKey(config.Universal.Undo), - formattedKey(config.Universal.Redo), + config.Universal.Undo, + config.Universal.Redo, constants.Links.Docs.Undoing, ), fmt.Sprintf( "to hard reset onto your current upstream branch, press '%s' in the files panel", - formattedKey(config.Commits.ViewResetOptions), + config.Commits.ViewResetOptions, ), fmt.Sprintf( "To push a tag, navigate to the tag in the tags tab and press '%s'", - formattedKey(config.Branches.PushTag), + config.Branches.PushTag, ), fmt.Sprintf( "You can view the individual files of a stash entry by pressing '%s'", - formattedKey(config.Universal.GoInto), + config.Universal.GoInto, ), fmt.Sprintf( "You can diff two commits by pressing '%s' on one commit and then navigating to the other. You can then press '%s' to view the files of the diff", - formattedKey(config.Universal.DiffingMenu), - formattedKey(config.Universal.GoInto), + config.Universal.DiffingMenu, + config.Universal.GoInto, ), fmt.Sprintf( "press '%s' on a commit to drop it (delete it)", - formattedKey(config.Universal.Remove), + config.Universal.Remove, ), fmt.Sprintf( "If you need to pull out the big guns to resolve merge conflicts, you can press '%s' in the files panel to open merge options", - formattedKey(config.Files.OpenMergeOptions), + config.Files.OpenMergeOptions, ), fmt.Sprintf( "To revert a commit, press '%s' on that commit", - formattedKey(config.Commits.RevertCommit), + config.Commits.RevertCommit, ), fmt.Sprintf( "To escape a mode, for example cherry-picking, patch-building, diffing, or filtering mode, you can just spam the '%s' button. Unless of course you have `quitOnTopLevelReturn` enabled in your config", - formattedKey(config.Universal.Return), + config.Universal.Return, ), fmt.Sprintf( "You can page through the items of a panel using '%s' and '%s'", - formattedKey(config.Universal.PrevPage), - formattedKey(config.Universal.NextPage), + config.Universal.PrevPage, + config.Universal.NextPage, ), fmt.Sprintf( - "You can jump to the top/bottom of a panel using '%s (or %s)' and '%s (or %s)'", - formattedKey(config.Universal.GotoTop), formattedKey(config.Universal.GotoTopAlt), - formattedKey(config.Universal.GotoBottom), formattedKey(config.Universal.GotoBottomAlt), + "You can jump to the top/bottom of a panel using '%s' and '%s'", + config.Universal.GotoTop, config.Universal.GotoBottom, ), fmt.Sprintf( "To collapse/expand a directory, press '%s'", - formattedKey(config.Universal.GoInto), + config.Universal.GoInto, ), fmt.Sprintf( "You can append your staged changes to an older commit by pressing '%s' on that commit", - formattedKey(config.Commits.AmendToCommit), + config.Commits.AmendToCommit, ), fmt.Sprintf( "You can amend the last commit with your new file changes by pressing '%s' in the files panel", - formattedKey(config.Files.AmendLastCommit), + config.Files.AmendLastCommit, ), fmt.Sprintf( "You can now navigate the side panels with '%s' and '%s'", - formattedKey(config.Universal.NextBlockAlt2), - formattedKey(config.Universal.PrevBlockAlt2), + config.Universal.NextBlockAlt2, + config.Universal.PrevBlockAlt2, ), "You can use lazygit with a bare repo by passing the --git-dir and --work-tree arguments as you would for the git CLI", @@ -176,7 +186,7 @@ func (gui *Gui) getRandomTip() string { // links fmt.Sprintf( "If you want a git diff with syntax colouring, check out lazygit's integration with delta:\n%s", - constants.Links.Docs.CustomPagers, + constants.Links.Docs.CustomDiffRenderers, ), fmt.Sprintf( "You can build your own custom menus and commands to run from within lazygit. For examples see:\n%s", diff --git a/pkg/gui/context.go b/pkg/gui/context.go index 1adfec35c..d83b144f2 100644 --- a/pkg/gui/context.go +++ b/pkg/gui/context.go @@ -3,6 +3,7 @@ package gui import ( "sync" + "github.com/jesseduffield/generics/set" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -179,11 +180,8 @@ func (self *ContextMgr) Activate(c types.Context, opts types.OnFocusOpts) { self.gui.helpers.Window.SetWindowContext(c) self.gui.helpers.Window.MoveToTopOfWindow(c) - oldView := self.gui.c.GocuiGui().CurrentView() - if oldView != nil && oldView.Name() != viewName { - oldView.HighlightInactive = true - } - if _, err := self.gui.c.GocuiGui().SetCurrentView(viewName); err != nil { + inputViewName := c.GetInputViewName() + if _, err := self.gui.c.GocuiGui().SetCurrentView(inputViewName); err != nil { panic(err) } @@ -198,9 +196,37 @@ func (self *ContextMgr) Activate(c types.Context, opts types.OnFocusOpts) { self.gui.c.GocuiGui().Cursor = v.Editable && v.Mask == "" + self.updateSelectionHighlights() + c.HandleFocus(opts) } +// updateSelectionHighlights re-derives which views draw a selection, and which of +// them draw theirs as the active one: a view shows a selection while its context is +// on the stack and has something to select, and the context the user is in shows the +// active selection while the ones behind it show inactive ones. +// +// Both of those can change, so this is called wherever they do: from Activate, which +// every change to the stack goes through; after a refresh, since that is when the +// contents of a list change; and from whoever tells a context that its content has +// gained or lost something to select. +func (self *ContextMgr) updateSelectionHighlights() { + self.RLock() + defer self.RUnlock() + + onStack := set.NewFromSlice(lo.Map(self.ContextStack, + func(c types.Context, _ int) types.ContextKey { return c.GetKey() })) + currentKey := self.currentContextWithoutLock().GetKey() + + for _, c := range self.allContexts.Flatten() { + // The global context has no view of its own. + if view := c.GetView(); view != nil { + view.Highlight = onStack.Includes(c.GetKey()) && c.HasSelectableContent() + view.HighlightInactive = c.GetKey() != currentKey + } + } +} + func (self *ContextMgr) Current() types.Context { self.RLock() defer self.RUnlock() diff --git a/pkg/gui/context/base_context.go b/pkg/gui/context/base_context.go index 7c6e9b617..b5fbf76ce 100644 --- a/pkg/gui/context/base_context.go +++ b/pkg/gui/context/base_context.go @@ -1,7 +1,7 @@ package context import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -15,18 +15,20 @@ type BaseContext struct { keybindingsFns []types.KeybindingsFn mouseKeybindingsFns []types.MouseKeybindingsFn - onClickFn func() error + onDoubleClickFn func() error + onClickFn func(opts gocui.ViewMouseBindingOpts) error onClickFocusedMainViewFn onClickFocusedMainViewFn onRenderToMainFn func() onFocusFns []onFocusFn onFocusLostFns []onFocusLostFn + onQuitFns []func() focusable bool transient bool hasControlledBounds bool needsRerenderOnWidthChange types.NeedsRerenderOnWidthChangeLevel needsRerenderOnHeightChange bool - highlightOnFocus bool + hasSelectableContent bool *ParentContextMgr } @@ -47,7 +49,7 @@ type NewBaseContextOpts struct { Focusable bool Transient bool HasUncontrolledBounds bool // negating for the sake of making false the default - HighlightOnFocus bool + HasSelectableContent bool NeedsRerenderOnWidthChange types.NeedsRerenderOnWidthChangeLevel NeedsRerenderOnHeightChange bool @@ -68,7 +70,7 @@ func NewBaseContext(opts NewBaseContextOpts) *BaseContext { focusable: opts.Focusable, transient: opts.Transient, hasControlledBounds: hasControlledBounds, - highlightOnFocus: opts.HighlightOnFocus, + hasSelectableContent: opts.HasSelectableContent, needsRerenderOnWidthChange: opts.NeedsRerenderOnWidthChange, needsRerenderOnHeightChange: opts.NeedsRerenderOnHeightChange, ParentContextMgr: &ParentContextMgr{}, @@ -100,6 +102,10 @@ func (self *BaseContext) GetViewName() string { return self.view.Name() } +func (self *BaseContext) GetInputViewName() string { + return self.GetViewName() +} + func (self *BaseContext) GetView() *gocui.View { return self.view } @@ -112,12 +118,16 @@ func (self *BaseContext) GetKind() types.ContextKind { return self.kind } +func (self *BaseContext) HasSelectableContent() bool { + return self.hasSelectableContent +} + func (self *BaseContext) GetKey() types.ContextKey { return self.key } func (self *BaseContext) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { - bindings := []*types.Binding{} + bindings := make([]*types.Binding, 0, len(self.keybindingsFns)) for i := range self.keybindingsFns { // the first binding in the bindings array takes precedence but we want the // last keybindingsFn to take precedence to we add them in reverse @@ -140,12 +150,23 @@ func (self *BaseContext) ClearAllAttachedControllerFunctions() { self.mouseKeybindingsFns = nil self.onFocusFns = nil self.onFocusLostFns = nil + self.onQuitFns = nil + self.onDoubleClickFn = nil self.onClickFn = nil self.onClickFocusedMainViewFn = nil self.onRenderToMainFn = nil } -func (self *BaseContext) AddOnClickFn(fn func() error) { +func (self *BaseContext) AddOnDoubleClickFn(fn func() error) { + if fn != nil { + if self.onDoubleClickFn != nil { + panic("only one controller is allowed to set an onDoubleClickFn") + } + self.onDoubleClickFn = fn + } +} + +func (self *BaseContext) AddOnClickFn(fn func(opts gocui.ViewMouseBindingOpts) error) { if fn != nil { if self.onClickFn != nil { panic("only one controller is allowed to set an onClickFn") @@ -163,7 +184,11 @@ func (self *BaseContext) AddOnClickFocusedMainViewFn(fn onClickFocusedMainViewFn } } -func (self *BaseContext) GetOnClick() func() error { +func (self *BaseContext) GetOnDoubleClick() func() error { + return self.onDoubleClickFn +} + +func (self *BaseContext) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error { return self.onClickFn } @@ -192,8 +217,14 @@ func (self *BaseContext) AddOnFocusLostFn(fn onFocusLostFn) { } } +func (self *BaseContext) AddOnQuitFn(fn func()) { + if fn != nil { + self.onQuitFns = append(self.onQuitFns, fn) + } +} + func (self *BaseContext) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding { - bindings := []*gocui.ViewMouseBinding{} + bindings := make([]*gocui.ViewMouseBinding, 0, len(self.mouseKeybindingsFns)) for i := range self.mouseKeybindingsFns { // the first binding in the bindings array takes precedence but we want the // last keybindingsFn to take precedence to we add them in reverse diff --git a/pkg/gui/context/branches_context.go b/pkg/gui/context/branches_context.go index d73961275..d83538131 100644 --- a/pkg/gui/context/branches_context.go +++ b/pkg/gui/context/branches_context.go @@ -28,6 +28,7 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext { return presentation.GetBranchListDisplayStrings( viewModel.GetItems(), c.State().GetItemOperation, + c.Model().PullRequestsMap, c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL, c.Modes().Diffing.Ref, c.Views().Branches.InnerWidth()+c.Views().Branches.OriginX(), diff --git a/pkg/gui/context/commit_message_context.go b/pkg/gui/context/commit_message_context.go index d533e1dea..7db3a085b 100644 --- a/pkg/gui/context/commit_message_context.go +++ b/pkg/gui/context/commit_message_context.go @@ -6,7 +6,6 @@ import ( "strconv" "strings" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/spf13/afero" @@ -129,7 +128,7 @@ func (self *CommitMessageContext) SetPreservedMessageAndLogError(message string) } func (self *CommitMessageContext) GetInitialMessage() string { - return strings.TrimSpace(self.viewModel.initialMessage) + return self.viewModel.initialMessage } func (self *CommitMessageContext) GetHistoryMessage() string { @@ -167,8 +166,8 @@ func (self *CommitMessageContext) SetPanelState( self.c.Views().CommitDescription.Subtitle = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionSubTitle, map[string]string{ - "togglePanelKeyBinding": keybindings.Label(self.c.UserConfig().Keybinding.Universal.TogglePanel), - "commitMenuKeybinding": keybindings.Label(self.c.UserConfig().Keybinding.CommitMessage.CommitMenu), + "togglePanelKeyBinding": self.c.UserConfig().Keybinding.Universal.TogglePanel.String(), + "commitMenuKeybinding": self.c.UserConfig().Keybinding.CommitMessage.CommitMenu.String(), }) self.c.Views().CommitDescription.Visible = true diff --git a/pkg/gui/context/context_test.go b/pkg/gui/context/context_test.go new file mode 100644 index 000000000..53f83c6ea --- /dev/null +++ b/pkg/gui/context/context_test.go @@ -0,0 +1,22 @@ +package context + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" +) + +// The config package validates a custom command's context against its own copy of +// these names, being unable to import this package. A name in one list but not the +// other would be either a context that validation rejects although you can bind to +// it, or one it accepts although binding to it exits lazygit. +func TestValidCustomCommandContextsMatchesAllContextKeys(t *testing.T) { + keys := lo.Map(AllContextKeys, func(key types.ContextKey, _ int) string { + return string(key) + }) + + assert.Equal(t, keys, config.ValidCustomCommandContexts) +} diff --git a/pkg/gui/context/filtered_list_view_model.go b/pkg/gui/context/filtered_list_view_model.go index ce2f8ac36..2c2841964 100644 --- a/pkg/gui/context/filtered_list_view_model.go +++ b/pkg/gui/context/filtered_list_view_model.go @@ -1,7 +1,5 @@ package context -import "github.com/jesseduffield/lazygit/pkg/i18n" - type FilteredListViewModel[T HasID] struct { *FilteredList[T] *ListViewModel[T] @@ -35,8 +33,3 @@ func (self *FilteredListViewModel[T]) ClearFilter() { self.SetSelection(unfilteredIndex) } - -// Default implementation of most filterable contexts. Can be overridden if needed. -func (self *FilteredListViewModel[T]) FilterPrefix(tr *i18n.TranslationSet) string { - return tr.FilterPrefix -} diff --git a/pkg/gui/context/list_context_trait.go b/pkg/gui/context/list_context_trait.go index 98833fdb2..2e4ae7267 100644 --- a/pkg/gui/context/list_context_trait.go +++ b/pkg/gui/context/list_context_trait.go @@ -28,10 +28,19 @@ type ListContextTrait struct { // true if we're inside the OnSearchSelect call; in that case we don't want to update the search // result index. inOnSearchSelect bool + + // If set, this renders the "x of y" footer instead of the default, which puts + // it on the bottom border of the list's own view. A list that is part of a + // composite panel can use this to put it somewhere else; see MenuContext. + renderFooter func(footer string) } func (self *ListContextTrait) IsListContext() {} +func (self *ListContextTrait) HasSelectableContent() bool { + return self.list.Len() > 0 +} + func (self *ListContextTrait) FocusLine(scrollIntoView bool) { self.Context.FocusLine(scrollIntoView) @@ -81,7 +90,13 @@ func (self *ListContextTrait) refreshViewport() { } func (self *ListContextTrait) setFooter() { - self.GetViewTrait().SetFooter(formatListFooter(self.list.GetSelectedLineIdx(), self.list.Len())) + footer := formatListFooter(self.list.GetSelectedLineIdx(), self.list.Len()) + if self.renderFooter != nil { + self.renderFooter(footer) + return + } + + self.GetViewTrait().SetFooter(footer) } func formatListFooter(selectedLineIdx int, length int) string { @@ -89,9 +104,7 @@ func formatListFooter(selectedLineIdx int, length int) string { } func (self *ListContextTrait) HandleFocus(opts types.OnFocusOpts) { - self.FocusLine(opts.ScrollSelectionIntoView) - - self.GetViewTrait().SetHighlight(self.list.Len() > 0) + self.FocusLine(!opts.KeepScrollPosition) self.Context.HandleFocus(opts) } @@ -124,7 +137,6 @@ func (self *ListContextTrait) HandleRender() { content := self.renderLines(-1, -1) self.GetViewTrait().SetContent(content) } - self.c.Render() self.setFooter() } diff --git a/pkg/gui/context/list_renderer.go b/pkg/gui/context/list_renderer.go index e863045e0..59a128457 100644 --- a/pkg/gui/context/list_renderer.go +++ b/pkg/gui/context/list_renderer.go @@ -1,6 +1,7 @@ package context import ( + "fmt" "strings" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -9,6 +10,10 @@ import ( "golang.org/x/exp/slices" ) +func formatListSectionHeader(label string) string { + return fmt.Sprintf("─── %s", label) +} + type NonModelItem struct { // Where in the model this should be inserted Index int @@ -32,34 +37,76 @@ type ListRenderer struct { getNonModelItems func() []*NonModelItem // The remaining fields are private and shouldn't be initialized by clients - numNonModelItems int - viewIndicesByModelIndex []int - modelIndicesByViewIndex []int - columnPositions []int + columnPositions []int } func (self *ListRenderer) GetList() types.IList { return self.list } -func (self *ListRenderer) ModelIndexToViewIndex(modelIndex int) int { - modelIndex = lo.Clamp(modelIndex, 0, self.list.Len()) - if self.viewIndicesByModelIndex != nil { - return self.viewIndicesByModelIndex[modelIndex] +func (self *ListRenderer) getNonModelItemList() []*NonModelItem { + if self.getNonModelItems == nil { + return nil } + return self.getNonModelItems() +} - return modelIndex +func (self *ListRenderer) ModelIndexToViewIndex(modelIndex int) int { + return modelIndexToViewIndex(self.list.Len(), self.getNonModelItemList(), modelIndex) } func (self *ListRenderer) ViewIndexToModelIndex(viewIndex int) int { - viewIndex = lo.Clamp(viewIndex, 0, self.list.Len()+self.numNonModelItems) - if self.modelIndicesByViewIndex != nil { - return self.modelIndicesByViewIndex[viewIndex] - } + return viewIndexToModelIndex(self.list.Len(), self.getNonModelItemList(), viewIndex) +} +// modelToViewIndexConverter returns a model-to-view index conversion that +// reuses a single snapshot of the non-model items. Callers that convert many +// indices in a row (e.g. search, which converts every commit) should use this +// rather than calling ModelIndexToViewIndex per index, which would rebuild the +// non-model items each time. +func (self *ListRenderer) modelToViewIndexConverter() func(modelIndex int) int { + listLength := self.list.Len() + nonModelItems := self.getNonModelItemList() + return func(modelIndex int) int { + return modelIndexToViewIndex(listLength, nonModelItems, modelIndex) + } +} + +// The view shows the model items with the non-model items (e.g. section +// headers) inserted at their model indices. The two conversions below are +// computed directly from the current list length and non-model items, so they +// don't depend on the list having been rendered, and they can never be stale +// with respect to a model that changed since the last render (which used to +// cause both wrong results and index-out-of-range panics). +// +// The non-model items are assumed to be ordered by their Index, which is how +// all producers build them; the i-th one therefore ends up at view index +// Index+i. +func modelIndexToViewIndex(listLength int, nonModelItems []*NonModelItem, modelIndex int) int { + modelIndex = lo.Clamp(modelIndex, 0, listLength) + // Each non-model item inserted at or before this model item pushes it down + // by one row in the view. + viewIndex := modelIndex + for _, item := range nonModelItems { + if item.Index <= modelIndex { + viewIndex++ + } + } return viewIndex } +func viewIndexToModelIndex(listLength int, nonModelItems []*NonModelItem, viewIndex int) int { + viewIndex = lo.Clamp(viewIndex, 0, listLength+len(nonModelItems)) + // Subtract the non-model items that appear before this view index. + modelIndex := viewIndex + for i, item := range nonModelItems { + if item.Index+i < viewIndex { + modelIndex-- + } + } + return modelIndex +} + func (self *ListRenderer) ColumnPositions() []int { return self.columnPositions } @@ -71,23 +118,18 @@ func (self *ListRenderer) renderLines(startIdx int, endIdx int) string { if self.getColumnAlignments != nil { columnAlignments = self.getColumnAlignments() } - nonModelItems := []*NonModelItem{} - self.numNonModelItems = 0 - if self.getNonModelItems != nil { - nonModelItems = self.getNonModelItems() - self.prepareConversionArrays(nonModelItems) - } + nonModelItems := self.getNonModelItemList() startModelIdx := 0 if startIdx == -1 { startIdx = 0 } else { - startModelIdx = self.ViewIndexToModelIndex(startIdx) + startModelIdx = viewIndexToModelIndex(self.list.Len(), nonModelItems, startIdx) } endModelIdx := self.list.Len() if endIdx == -1 { endIdx = endModelIdx + len(nonModelItems) } else { - endModelIdx = self.ViewIndexToModelIndex(endIdx) + endModelIdx = viewIndexToModelIndex(self.list.Len(), nonModelItems, endIdx) } lines, columnPositions := utils.RenderDisplayStrings( self.getDisplayStrings(startModelIdx, endModelIdx), @@ -97,23 +139,6 @@ func (self *ListRenderer) renderLines(startIdx int, endIdx int) string { return strings.Join(lines, "\n") } -func (self *ListRenderer) prepareConversionArrays(nonModelItems []*NonModelItem) { - self.numNonModelItems = len(nonModelItems) - viewIndicesByModelIndex := lo.Range(self.list.Len() + 1) - modelIndicesByViewIndex := lo.Range(self.list.Len() + 1) - offset := 0 - for _, item := range nonModelItems { - for i := item.Index; i <= self.list.Len(); i++ { - viewIndicesByModelIndex[i]++ - } - modelIndicesByViewIndex = slices.Insert( - modelIndicesByViewIndex, item.Index+offset, modelIndicesByViewIndex[item.Index+offset]) - offset++ - } - self.viewIndicesByModelIndex = viewIndicesByModelIndex - self.modelIndicesByViewIndex = modelIndicesByViewIndex -} - func (self *ListRenderer) insertNonModelItems( nonModelItems []*NonModelItem, endIdx int, startIdx int, lines []string, columnPositions []int, ) []string { diff --git a/pkg/gui/context/list_renderer_test.go b/pkg/gui/context/list_renderer_test.go index 08af680ff..11398a995 100644 --- a/pkg/gui/context/list_renderer_test.go +++ b/pkg/gui/context/list_renderer_test.go @@ -254,9 +254,6 @@ func TestListRenderer_ModelIndexToViewIndex_and_back(t *testing.T) { getNonModelItems: getNonModelItems, } - // Need to render first so that it knows the non-model items - self.renderLines(-1, -1) - for i := range len(s.modelIndices) { assert.Equal(t, s.expectedViewIndices[i], self.ModelIndexToViewIndex(s.modelIndices[i])) } @@ -267,3 +264,27 @@ func TestListRenderer_ModelIndexToViewIndex_and_back(t *testing.T) { }) } } + +// The index conversions must not depend on the list having been rendered +// first. It used to be renderLines that populated the conversion arrays, so +// converting an index before the first render silently ignored the non-model +// items (and converting after the model changed used a stale snapshot). +func TestListRenderer_IndexConversionsAreRenderIndependent(t *testing.T) { + modelInts := lo.Map(lo.Range(3), func(i int, _ int) myint { return myint(i) }) + self := &ListRenderer{ + list: NewListViewModel(func() []myint { return modelInts }), + getDisplayStrings: func(startIdx int, endIdx int) [][]string { + return lo.Map(modelInts[startIdx:endIdx], + func(i myint, _ int) []string { return []string{fmt.Sprint(i)} }) + }, + // A section header sits at model index 1, so model item 1 is pushed down + // to view index 2, and view index 2 maps back to model item 1. + getNonModelItems: func() []*NonModelItem { + return []*NonModelItem{{Index: 1, Content: "--- header ---"}} + }, + } + + // Deliberately convert without rendering first. + assert.Equal(t, 2, self.ModelIndexToViewIndex(1)) + assert.Equal(t, 1, self.ViewIndexToModelIndex(2)) +} diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go index a730d6530..4a99259fd 100644 --- a/pkg/gui/context/local_commits_context.go +++ b/pkg/gui/context/local_commits_context.go @@ -3,12 +3,16 @@ package context import ( "fmt" "log" + "slices" "strings" + "sync/atomic" "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/presentation" + "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" ) @@ -17,6 +21,13 @@ type LocalCommitsContext struct { *LocalCommitsViewModel *ListContextTrait *SearchTrait + + dropIndicator *commitDropIndicator +} + +type commitDropIndicator struct { + insertionIndex int + moving bool } var ( @@ -26,6 +37,7 @@ var ( ) func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { + dropIndicator := &commitDropIndicator{insertionIndex: -1} viewModel := NewLocalCommitsViewModel( func() []*models.Commit { return c.Model().Commits }, c, @@ -71,7 +83,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { if c.Model().WorkingTreeStateAtLastCommitRefresh.Rebasing { result = append(result, &NonModelItem{ Index: 0, - Content: fmt.Sprintf("--- %s ---", c.Tr.PendingRebaseTodosSectionHeader), + Content: formatListSectionHeader(c.Tr.PendingRebaseTodosSectionHeader), }) } @@ -90,10 +102,19 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { c.Tr.PendingRevertsSectionHeader) result = append(result, &NonModelItem{ Index: firstCherryPickOrRevertTodo, - Content: fmt.Sprintf("--- %s ---", label), + Content: formatListSectionHeader(label), }) } + result = addCommitDropIndicator( + result, + dropIndicator, + c.Tr.MoveCommitsHere, + c.Tr.MovingCommitsHere, + c.UserConfig().Gui.Spinner, + time.Now(), + ) + _, firstRealCommit, found := lo.FindIndexOf( c.Model().Commits, func(c *models.Commit) bool { return !c.IsTODO() @@ -103,8 +124,17 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { } result = append(result, &NonModelItem{ Index: firstRealCommit, - Content: fmt.Sprintf("--- %s ---", c.Tr.CommitsSectionHeader), + Content: formatListSectionHeader(c.Tr.CommitsSectionHeader), }) + } else { + result = addCommitDropIndicator( + result, + dropIndicator, + c.Tr.MoveCommitsHere, + c.Tr.MovingCommitsHere, + c.UserConfig().Gui.Spinner, + time.Now(), + ) } return result @@ -113,6 +143,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { ctx := &LocalCommitsContext{ LocalCommitsViewModel: viewModel, SearchTrait: NewSearchTrait(c), + dropIndicator: dropIndicator, ListContextTrait: &ListContextTrait{ Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{ View: c.Views().Commits, @@ -134,18 +165,63 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { }, } - ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus) - ctx.GetView().SetOnSelectItem(ctx.OnSearchSelect) - return ctx } +func addCommitDropIndicator( + items []*NonModelItem, + indicator *commitDropIndicator, + dropLabel string, + movingLabel string, + spinnerConfig config.SpinnerConfig, + now time.Time, +) []*NonModelItem { + if indicator.insertionIndex < 0 { + return items + } + label := dropLabel + if indicator.moving { + label = fmt.Sprintf("%s %s", movingLabel, presentation.Loader(now, spinnerConfig)) + } + + insertAt := len(items) + for i, item := range items { + if item.Index > indicator.insertionIndex { + insertAt = i + break + } + } + + return slices.Insert(items, insertAt, &NonModelItem{ + Index: indicator.insertionIndex, + Content: style.FgCyan.SetBold().Sprintf("━━━━━━ %s ━━━━━━", label), + Column: 6, // align with the commit subject + }) +} + +func (self *LocalCommitsContext) SetDropInsertionIndex(index int) { + self.dropIndicator.insertionIndex = index + self.dropIndicator.moving = false +} + +func (self *LocalCommitsContext) SetMovingCommitsInsertionIndex(index int) { + self.dropIndicator.insertionIndex = index + self.dropIndicator.moving = true +} + +func (self *LocalCommitsContext) ClearDropInsertionIndex() { + self.dropIndicator.insertionIndex = -1 + self.dropIndicator.moving = false +} + type LocalCommitsViewModel struct { *ListViewModel[*models.Commit] // If this is true we limit the amount of commits we load, for the sake of keeping things fast. // If the user attempts to scroll past the end of the list, we will load more commits. - limitCommits bool + // Atomic because a checkout or reset sets it from a worker goroutine while the + // commits refresh reads it on the UI thread to decide how many commits to load. + limitCommits atomic.Bool // If this is true we'll use git log --all when fetching the commits. showWholeGitGraph bool @@ -154,9 +230,9 @@ type LocalCommitsViewModel struct { func NewLocalCommitsViewModel(getModel func() []*models.Commit, c *ContextCommon) *LocalCommitsViewModel { self := &LocalCommitsViewModel{ ListViewModel: NewListViewModel(getModel), - limitCommits: true, showWholeGitGraph: c.UserConfig().Git.Log.ShowWholeGraph, } + self.limitCommits.Store(true) return self } @@ -224,15 +300,15 @@ func (self *LocalCommitsContext) RefForAdjustingLineNumberInDiff() string { } func (self *LocalCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition { - return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), self.ModelIndexToViewIndex, searchStr) + return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), self.modelToViewIndexConverter(), searchStr) } func (self *LocalCommitsViewModel) SetLimitCommits(value bool) { - self.limitCommits = value + self.limitCommits.Store(value) } func (self *LocalCommitsViewModel) GetLimitCommits() bool { - return self.limitCommits + return self.limitCommits.Load() } func (self *LocalCommitsViewModel) SetShowWholeGitGraph(value bool) { @@ -248,7 +324,13 @@ func (self *LocalCommitsViewModel) GetCommits() []*models.Commit { } func shouldShowGraph(c *ContextCommon) bool { - if c.Modes().Filtering.Active() { + // Whether we can draw a graph is a property of the commit list we have + // loaded, not of the filtering mode: turning filtering on or off only + // reaches the screen when the reloaded list does, and until then the graph + // has to keep matching the list that is still on display. Drawing one for a + // filtered list is also ruinously slow, because none of the commits in it + // are connected to each other, so no pipe ever terminates. + if c.Model().CommitsWereFilteredAtLastRefresh { return false } diff --git a/pkg/gui/context/local_commits_context_test.go b/pkg/gui/context/local_commits_context_test.go new file mode 100644 index 000000000..f93af3a72 --- /dev/null +++ b/pkg/gui/context/local_commits_context_test.go @@ -0,0 +1,53 @@ +package context + +import ( + "testing" + "time" + + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gui/style" + "github.com/stretchr/testify/assert" +) + +func TestAddCommitDropIndicator(t *testing.T) { + pendingHeader := &NonModelItem{Index: 0, Content: "pending"} + commitsHeader := &NonModelItem{Index: 3, Content: "commits"} + indicator := &commitDropIndicator{insertionIndex: 3} + spinnerConfig := config.SpinnerConfig{Frames: []string{"one", "two"}, Rate: 100} + + items := addCommitDropIndicator( + []*NonModelItem{pendingHeader}, indicator, "drop here", "moving commits here", spinnerConfig, time.UnixMilli(0), + ) + items = append(items, commitsHeader) + + assert.Equal(t, []*NonModelItem{ + pendingHeader, + { + Index: 3, + Content: style.FgCyan.SetBold().Sprint("━━━━━━ drop here ━━━━━━"), + Column: 6, + }, + commitsHeader, + }, items) + assert.Equal(t, 6, modelIndexToViewIndex(4, items, 3)) + assert.Equal(t, 3, viewIndexToModelIndex(4, items, 4)) +} + +func TestAddMovingCommitsIndicator(t *testing.T) { + items := addCommitDropIndicator( + nil, + &commitDropIndicator{insertionIndex: 2, moving: true}, + "drop here", + "moving commits here", + config.SpinnerConfig{Frames: []string{"one", "two"}, Rate: 100}, + time.UnixMilli(100), + ) + + assert.Equal(t, []*NonModelItem{ + { + Index: 2, + Content: style.FgCyan.SetBold().Sprint("━━━━━━ moving commits here two ━━━━━━"), + Column: 6, + }, + }, items) +} diff --git a/pkg/gui/context/main_context.go b/pkg/gui/context/main_context.go index 716f20bca..692c6dd5c 100644 --- a/pkg/gui/context/main_context.go +++ b/pkg/gui/context/main_context.go @@ -1,7 +1,7 @@ package context import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -21,22 +21,22 @@ func NewMainContext( ctx := &MainContext{ SimpleContext: NewSimpleContext( NewBaseContext(NewBaseContextOpts{ - Kind: types.MAIN_CONTEXT, - View: view, - WindowName: windowName, - Key: key, - Focusable: true, - HighlightOnFocus: false, + Kind: types.MAIN_CONTEXT, + View: view, + WindowName: windowName, + Key: key, + Focusable: true, + HasSelectableContent: false, })), SearchTrait: NewSearchTrait(c), } - ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus) - ctx.GetView().SetOnSelectItem(func(int) {}) - return ctx } func (self *MainContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition { return nil } + +func (self *MainContext) OnSearchSelect(int) { +} diff --git a/pkg/gui/context/menu_context.go b/pkg/gui/context/menu_context.go index 097812614..55a3e5bfa 100644 --- a/pkg/gui/context/menu_context.go +++ b/pkg/gui/context/menu_context.go @@ -4,10 +4,10 @@ import ( "errors" "strings" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -44,6 +44,13 @@ func NewMenuContext( getColumnAlignments: func() []utils.Alignment { return viewModel.columnAlignment }, getNonModelItems: viewModel.GetNonModelItems, }, + // While the filter row is showing, its top border covers the menu's bottom + // border, so the footer has to be rendered on the row instead. + renderFooter: func(footer string) { + onFilterRow := viewModel.FilterStarted() + c.Views().Menu.Footer = lo.Ternary(onFilterRow, "", footer) + c.Views().MenuFilterFrame.Footer = lo.Ternary(onFilterRow, footer, "") + }, c: c, }, } @@ -57,6 +64,9 @@ type MenuViewModel struct { columnAlignment []utils.Alignment allowFilteringKeybindings bool keybindingsTakePrecedence bool + filterAsYouType bool + filterStarted bool + onCancel func() error *FilteredListViewModel[*types.MenuItem] } @@ -72,7 +82,11 @@ func NewMenuViewModel(c *ContextCommon) *MenuViewModel { func() []*types.MenuItem { return self.menuItems }, func(item *types.MenuItem) []string { if filterKeybindings { - return []string{keybindings.LabelFromKey(item.Key)} + // Allow searching all configured keybindings of each item, even though only the + // first one is shown in the menu. + return lo.Map(item.Keys, func(k gocui.Key, _ int) string { + return config.LabelForKey(k) + }) } return item.LabelColumns @@ -97,6 +111,10 @@ func (self *MenuViewModel) SetMenuItems(items []*types.MenuItem, columnAlignment self.columnAlignment = columnAlignment } +func (self *MenuViewModel) SetOnCancel(onCancel func() error) { + self.onCancel = onCancel +} + func (self *MenuViewModel) GetPrompt() string { return self.prompt } @@ -118,10 +136,37 @@ func (self *MenuViewModel) SetAllowFilteringKeybindings(allow bool) { self.allowFilteringKeybindings = allow } +func (self *MenuViewModel) AllowFilteringKeybindings() bool { + return self.allowFilteringKeybindings +} + func (self *MenuViewModel) SetKeybindingsTakePrecedence(value bool) { self.keybindingsTakePrecedence = value } +// Whether this menu has a filter row that filters the items as the user types, +// instead of being filtered through the search prompt. +func (self *MenuViewModel) SetFilterAsYouType(value bool) { + self.filterAsYouType = value + self.SetFilterStarted(false) +} + +func (self *MenuViewModel) FilterAsYouType() bool { + return self.filterAsYouType +} + +// Whether the user has started to filter, which is when the filter row appears. +func (self *MenuViewModel) SetFilterStarted(value bool) { + self.filterStarted = value + // As long as there is nothing to type into, printable keys keep driving the + // menu, so that the configured navigation keys work like in any other menu. + self.c.Views().MenuFilter.KeybindOnEdit = !value +} + +func (self *MenuViewModel) FilterStarted() bool { + return self.filterStarted +} + // TODO: move into presentation package func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string { menuItems := self.FilteredListViewModel.GetItems() @@ -133,8 +178,8 @@ func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string { } keyLabel := "" - if item.Key != nil { - keyLabel = style.FgCyan.Sprint(keybindings.LabelFromKey(item.Key)) + if len(item.Keys) > 0 { + keyLabel = style.FgCyan.Sprint(config.LabelForKey(item.Keys[0])) } checkMark := "" @@ -188,7 +233,7 @@ func (self *MenuViewModel) GetNonModelItems() []*NonModelItem { result = append(result, &NonModelItem{ Index: i, Column: 1, - Content: style.FgGreen.SetBold().Sprintf("--- %s ---", menuItem.Section.Title), + Content: style.FgGreen.SetBold().Sprint(formatListSectionHeader(menuItem.Section.Title)), }) prevSection = menuItem.Section } @@ -199,13 +244,23 @@ func (self *MenuViewModel) GetNonModelItems() []*NonModelItem { func (self *MenuContext) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { basicBindings := self.ListContextTrait.GetKeybindings(opts) + + if self.filterAsYouType { + // A menu item's keys are shown as a reminder of what they do outside the + // menu, but pressing one types it into the filter rather than executing the + // item, so we don't bind them at all. That leaves the bindings that drive + // the menu itself, and the printable ones among those give way to the filter + // as soon as there is something to type into (see View.KeybindOnEdit). + return basicBindings + } + menuItemsWithKeys := lo.Filter(self.menuItems, func(item *types.MenuItem, _ int) bool { - return item.Key != nil + return len(item.Keys) > 0 }) menuItemBindings := lo.Map(menuItemsWithKeys, func(item *types.MenuItem, _ int) *types.Binding { return &types.Binding{ - Key: item.Key, + Keys: item.Keys, Handler: func() error { return self.OnMenuPress(item) }, } }) @@ -239,6 +294,9 @@ func (self *MenuContext) OnMenuPress(selectedItem *types.MenuItem) error { self.c.Context().Pop() if selectedItem == nil { + if self.onCancel != nil { + return self.onCancel() + } return nil } @@ -254,10 +312,13 @@ func (self *MenuContext) RangeSelectEnabled() bool { return false } -func (self *MenuContext) FilterPrefix(tr *i18n.TranslationSet) string { - if self.allowFilteringKeybindings { - return tr.FilterPrefixMenu +// A menu that filters as you type points the keyboard at its filter input, so +// that whatever the user types ends up there. Keys that the input doesn't take +// still reach the menu, because the input view is embedded in the menu view. +func (self *MenuContext) GetInputViewName() string { + if self.filterAsYouType { + return self.c.Views().MenuFilter.Name() } - return self.FilteredListViewModel.FilterPrefix(tr) + return self.GetViewName() } diff --git a/pkg/gui/context/merge_conflicts_context.go b/pkg/gui/context/merge_conflicts_context.go index 2ab446c06..dd1060288 100644 --- a/pkg/gui/context/merge_conflicts_context.go +++ b/pkg/gui/context/merge_conflicts_context.go @@ -35,12 +35,12 @@ func NewMergeConflictsContext( viewModel: viewModel, Context: NewSimpleContext( NewBaseContext(NewBaseContextOpts{ - Kind: types.MAIN_CONTEXT, - View: c.Views().MergeConflicts, - WindowName: "main", - Key: MERGE_CONFLICTS_CONTEXT_KEY, - Focusable: true, - HighlightOnFocus: true, + Kind: types.MAIN_CONTEXT, + View: c.Views().MergeConflicts, + WindowName: "main", + Key: MERGE_CONFLICTS_CONTEXT_KEY, + Focusable: true, + HasSelectableContent: true, }), ), c: c, diff --git a/pkg/gui/context/patch_explorer_context.go b/pkg/gui/context/patch_explorer_context.go index 082800127..434de6e58 100644 --- a/pkg/gui/context/patch_explorer_context.go +++ b/pkg/gui/context/patch_explorer_context.go @@ -1,7 +1,7 @@ package context import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/patch_exploring" "github.com/jesseduffield/lazygit/pkg/gui/types" deadlock "github.com/sasha-s/go-deadlock" @@ -47,21 +47,12 @@ func NewPatchExplorerContext( Key: key, Kind: types.MAIN_CONTEXT, Focusable: true, - HighlightOnFocus: true, + HasSelectableContent: true, NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_WIDTH_CHANGES, })), SearchTrait: NewSearchTrait(c), } - ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus) - ctx.GetView().SetOnSelectItem(func(selectedLineIdx int) { - ctx.GetMutex().Lock() - defer ctx.GetMutex().Unlock() - ctx.inOnSelectItemCallback = true - ctx.NavigateTo(selectedLineIdx) - ctx.inOnSelectItemCallback = false - }) - ctx.SetHandleRenderFunc(ctx.OnViewWidthChanged) return ctx @@ -146,6 +137,14 @@ func (self *PatchExplorerContext) ModelSearchResults(searchStr string, caseSensi return nil } +func (self *PatchExplorerContext) OnSearchSelect(selectedLineIdx int) { + self.GetMutex().Lock() + defer self.GetMutex().Unlock() + self.inOnSelectItemCallback = true + self.NavigateTo(selectedLineIdx) + self.inOnSelectItemCallback = false +} + func (self *PatchExplorerContext) OnViewWidthChanged() { if state := self.GetState(); state != nil { state.OnViewWidthChanged(self.GetView()) diff --git a/pkg/gui/context/search_trait.go b/pkg/gui/context/search_trait.go index 499d855d4..541775d90 100644 --- a/pkg/gui/context/search_trait.go +++ b/pkg/gui/context/search_trait.go @@ -3,7 +3,6 @@ package context import ( "fmt" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/theme" ) @@ -45,7 +44,7 @@ func (self *SearchTrait) RenderSearchStatus(index int, total int) { fmt.Sprintf( self.c.Tr.NoMatchesFor, self.searchString, - theme.OptionsFgColor.Sprintf(self.c.Tr.ExitSearchMode, keybindings.Label(keybindingConfig.Universal.Return)), + theme.OptionsFgColor.Sprintf(self.c.Tr.ExitSearchMode, keybindingConfig.Universal.Return), ), ) } else { @@ -58,9 +57,9 @@ func (self *SearchTrait) RenderSearchStatus(index int, total int) { total, theme.OptionsFgColor.Sprintf( self.c.Tr.SearchKeybindings, - keybindings.Label(keybindingConfig.Universal.NextMatch), - keybindings.Label(keybindingConfig.Universal.PrevMatch), - keybindings.Label(keybindingConfig.Universal.Return), + keybindingConfig.Universal.NextMatch, + keybindingConfig.Universal.PrevMatch, + keybindingConfig.Universal.Return, ), ), ) diff --git a/pkg/gui/context/setup.go b/pkg/gui/context/setup.go index 8f498e6a9..ef1211313 100644 --- a/pkg/gui/context/setup.go +++ b/pkg/gui/context/setup.go @@ -60,8 +60,11 @@ func NewContextTree(c *ContextCommon) *ContextTree { "main", PATCH_BUILDING_MAIN_CONTEXT_KEY, func() []int { - filename := commitFilesContext.GetSelectedPath() - includedLineIndices, err := c.Git().Patch.PatchBuilder.GetFileIncLineIndices(filename) + file := commitFilesContext.GetSelectedFile() + if file == nil { + return nil + } + includedLineIndices, err := c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath) if err != nil { c.Log.Error(err) return nil diff --git a/pkg/gui/context/simple_context.go b/pkg/gui/context/simple_context.go index f51d3dc5c..2de4199e2 100644 --- a/pkg/gui/context/simple_context.go +++ b/pkg/gui/context/simple_context.go @@ -1,7 +1,7 @@ package context import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -33,27 +33,28 @@ func NewDisplayContext(key types.ContextKey, view *gocui.View, windowName string } func (self *SimpleContext) HandleFocus(opts types.OnFocusOpts) { - if self.highlightOnFocus { - self.GetViewTrait().SetHighlight(true) - } - for _, fn := range self.onFocusFns { fn(opts) } - if self.onRenderToMainFn != nil { + if self.onRenderToMainFn != nil && !opts.SkipMainViewUpdate { self.onRenderToMainFn() } } func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) { - self.GetViewTrait().SetHighlight(false) self.view.SetOriginX(0) for _, fn := range self.onFocusLostFns { fn(opts) } } +func (self *SimpleContext) HandleQuit() { + for _, fn := range self.onQuitFns { + fn() + } +} + func (self *SimpleContext) FocusLine(scrollIntoView bool) { } diff --git a/pkg/gui/context/sub_commits_context.go b/pkg/gui/context/sub_commits_context.go index 7e9d9ccab..b0bcee30a 100644 --- a/pkg/gui/context/sub_commits_context.go +++ b/pkg/gui/context/sub_commits_context.go @@ -1,12 +1,11 @@ package context import ( - "fmt" "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" @@ -90,7 +89,7 @@ func NewSubCommitsContext( } result = append(result, &NonModelItem{ Index: upstreamIdx, - Content: fmt.Sprintf("--- %s ---", c.Tr.DivergenceSectionHeaderRemote), + Content: formatListSectionHeader(c.Tr.DivergenceSectionHeaderRemote), }) _, localIdx, found := lo.FindIndexOf( @@ -100,7 +99,7 @@ func NewSubCommitsContext( } result = append(result, &NonModelItem{ Index: localIdx, - Content: fmt.Sprintf("--- %s ---", c.Tr.DivergenceSectionHeaderLocal), + Content: formatListSectionHeader(c.Tr.DivergenceSectionHeaderLocal), }) } @@ -134,9 +133,6 @@ func NewSubCommitsContext( }, } - ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus) - ctx.GetView().SetOnSelectItem(ctx.OnSearchSelect) - return ctx } @@ -226,7 +222,7 @@ func (self *SubCommitsContext) RefForAdjustingLineNumberInDiff() string { } func (self *SubCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition { - return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), self.ModelIndexToViewIndex, searchStr) + return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), self.modelToViewIndexConverter(), searchStr) } func (self *SubCommitsContext) IndexForGotoBottom() int { diff --git a/pkg/gui/context/suggestions_context.go b/pkg/gui/context/suggestions_context.go index 97d28ffc7..6f0b3eae6 100644 --- a/pkg/gui/context/suggestions_context.go +++ b/pkg/gui/context/suggestions_context.go @@ -67,17 +67,31 @@ func NewSuggestionsContext( } func (self *SuggestionsContext) SetSuggestions(suggestions []*types.Suggestion) { - self.State.Suggestions = suggestions - self.SetSelection(0) - self.c.ResetViewOrigin(self.GetView()) - self.HandleRender() + // SetSuggestions is invoked from AsyncHandler (a worker goroutine) when + // the prompt input changes, as well as from prepareConfirmationPanel on + // the UI thread. Bounce to the UI thread either way so the worker path + // keeps flushing once HandleRender stops calling Render() itself. + self.c.OnUIThread(func() error { + self.State.Suggestions = suggestions + self.SetSelection(0) + self.c.ResetViewOrigin(self.GetView()) + self.HandleRender() + return nil + }) } func (self *SuggestionsContext) RefreshSuggestions() { + // Capture the suggestions function and the prompt input here, on the UI + // thread, rather than inside the worker below: the main thread rewrites both + // (State.FindSuggestions and the prompt's TextArea) when it (re)creates a + // prompt panel, so reading them from the worker races those writes. It's + // also more correct -- we search for the input as it was when dispatched, + // which is what this request's AsyncHandler id corresponds to. + findSuggestionsFn := self.State.FindSuggestions + promptInput := self.c.GetPromptInput() self.State.AsyncHandler.Do(func() func() { - findSuggestionsFn := self.State.FindSuggestions if findSuggestionsFn != nil { - suggestions := findSuggestionsFn(self.c.GetPromptInput()) + suggestions := findSuggestionsFn(promptInput) return func() { self.SetSuggestions(suggestions) } } return func() {} @@ -89,6 +103,6 @@ func (self *SuggestionsContext) RangeSelectEnabled() bool { return false } -func (self *SuggestionsContext) GetOnClick() func() error { +func (self *SuggestionsContext) GetOnDoubleClick() func() error { return self.State.OnConfirm } diff --git a/pkg/gui/context/view_trait.go b/pkg/gui/context/view_trait.go index d3825b9cf..9fc078e61 100644 --- a/pkg/gui/context/view_trait.go +++ b/pkg/gui/context/view_trait.go @@ -1,7 +1,7 @@ package context import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -43,11 +43,6 @@ func (self *ViewTrait) SetContent(content string) { self.view.SetContent(content) } -func (self *ViewTrait) SetHighlight(highlight bool) { - self.view.Highlight = highlight - self.view.HighlightInactive = false -} - func (self *ViewTrait) SetFooter(value string) { self.view.Footer = value } diff --git a/pkg/gui/context/worktrees_context.go b/pkg/gui/context/worktrees_context.go index 3e45f2d45..690fa6d4b 100644 --- a/pkg/gui/context/worktrees_context.go +++ b/pkg/gui/context/worktrees_context.go @@ -16,8 +16,8 @@ var _ types.IListContext = (*WorktreesContext)(nil) func NewWorktreesContext(c *ContextCommon) *WorktreesContext { viewModel := NewFilteredListViewModel( func() []*models.Worktree { return c.Model().Worktrees }, - func(Worktree *models.Worktree) []string { - return []string{Worktree.Name} + func(worktree *models.Worktree) []string { + return []string{worktree.Name, worktree.Branch} }, ) diff --git a/pkg/gui/controllers.go b/pkg/gui/controllers.go index 702ed826d..f21fb607f 100644 --- a/pkg/gui/controllers.go +++ b/pkg/gui/controllers.go @@ -1,10 +1,8 @@ package gui import ( - "strings" - - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/controllers" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/services/custom_commands" @@ -35,14 +33,14 @@ func (gui *Gui) resetHelpersAndControllers() { setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage }) setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription }) getCommitSummary := func() string { - return strings.TrimSpace(gui.Views.CommitMessage.TextArea.GetContent()) + return gui.Views.CommitMessage.TextArea.GetContent() } getCommitDescription := func() string { - return strings.TrimSpace(gui.Views.CommitDescription.TextArea.GetContent()) + return gui.Views.CommitDescription.TextArea.GetContent() } getUnwrappedCommitDescription := func() string { - return strings.TrimSpace(gui.Views.CommitDescription.TextArea.GetUnwrappedContent()) + return gui.Views.CommitDescription.TextArea.GetUnwrappedContent() } commitsHelper := helpers.NewCommitsHelper(helperCommon, getCommitSummary, @@ -140,6 +138,9 @@ func (gui *Gui) resetHelpersAndControllers() { common := controllers.NewControllerCommon(helperCommon, gui) + listControllerFactory := controllers.NewListControllerFactory(common) + menuListController := listControllerFactory.Create(gui.State.Contexts.Menu) + syncController := controllers.NewSyncController( common, ) @@ -158,7 +159,7 @@ func (gui *Gui) resetHelpersAndControllers() { remoteBranchesController := controllers.NewRemoteBranchesController(common) - menuController := controllers.NewMenuController(common) + menuController := controllers.NewMenuController(common, menuListController) localCommitsController := controllers.NewLocalCommitsController(common, syncController.HandlePull) tagsController := controllers.NewTagsController(common) filesController := controllers.NewFilesController( @@ -209,18 +210,6 @@ func (gui *Gui) resetHelpersAndControllers() { controllers.AttachControllers(context, searchControllerFactory.Create(context)) } - for _, context := range []controllers.CanViewWorktreeOptions{ - gui.State.Contexts.LocalCommits, - gui.State.Contexts.ReflogCommits, - gui.State.Contexts.SubCommits, - gui.State.Contexts.Stash, - gui.State.Contexts.Branches, - gui.State.Contexts.RemoteBranches, - gui.State.Contexts.Tags, - } { - controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context)) - } - // allow for navigating between side window contexts for _, context := range []types.Context{ gui.State.Contexts.Status, @@ -373,6 +362,7 @@ func (gui *Gui) resetHelpersAndControllers() { controllers.AttachControllers(gui.State.Contexts.Menu, menuController, + menuListController, ) controllers.AttachControllers(gui.State.Contexts.CommitMessage, @@ -426,8 +416,11 @@ func (gui *Gui) resetHelpersAndControllers() { ) // this must come last so that we've got our click handlers defined against the context - listControllerFactory := controllers.NewListControllerFactory(common) for _, context := range gui.c.Context().AllList() { + if context == gui.State.Contexts.Menu { + // already attached above, next to the menu controller that delegates to it + continue + } controllers.AttachControllers(context, listControllerFactory.Create(context)) } } diff --git a/pkg/gui/controllers/attach.go b/pkg/gui/controllers/attach.go index 8c1dbb91e..c9ef5d4b0 100644 --- a/pkg/gui/controllers/attach.go +++ b/pkg/gui/controllers/attach.go @@ -6,10 +6,12 @@ func AttachControllers(context types.Context, controllers ...types.IController) for _, controller := range controllers { context.AddKeybindingsFn(controller.GetKeybindings) context.AddMouseKeybindingsFn(controller.GetMouseKeybindings) + context.AddOnDoubleClickFn(controller.GetOnDoubleClick()) context.AddOnClickFn(controller.GetOnClick()) context.AddOnClickFocusedMainViewFn(controller.GetOnClickFocusedMainView()) context.AddOnRenderToMainFn(controller.GetOnRenderToMain()) context.AddOnFocusFn(controller.GetOnFocus()) context.AddOnFocusLostFn(controller.GetOnFocusLost()) + context.AddOnQuitFn(controller.GetOnQuit()) } } diff --git a/pkg/gui/controllers/base_controller.go b/pkg/gui/controllers/base_controller.go index 0e1229222..f91f0b4cc 100644 --- a/pkg/gui/controllers/base_controller.go +++ b/pkg/gui/controllers/base_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -15,7 +15,7 @@ func (self *baseController) GetMouseKeybindings(opts types.KeybindingsOpts) []*g return nil } -func (self *baseController) GetOnClick() func() error { +func (self *baseController) GetOnDoubleClick() func() error { return nil } @@ -23,6 +23,10 @@ func (self *baseController) GetOnClickFocusedMainView() func(mainViewName string return nil } +func (self *baseController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error { + return nil +} + func (self *baseController) GetOnRenderToMain() func() { return nil } @@ -34,3 +38,7 @@ func (self *baseController) GetOnFocus() func(types.OnFocusOpts) { func (self *baseController) GetOnFocusLost() func(types.OnFocusLostOpts) { return nil } + +func (self *baseController) GetOnQuit() func() { + return nil +} diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go index be856a9e9..f698f6cf0 100644 --- a/pkg/gui/controllers/basic_commits_controller.go +++ b/pkg/gui/controllers/basic_commits_controller.go @@ -7,7 +7,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/gui/context/traits" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -52,7 +51,7 @@ func NewBasicCommitsController(c *ControllerCommon, context ContainsCommits) *Ba func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Commits.CheckoutCommit), + Keys: opts.GetKeys(opts.Config.Commits.CheckoutCommit), Handler: self.withItem(self.checkout), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Checkout, @@ -60,7 +59,7 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.CopyCommitAttributeToClipboard), + Keys: opts.GetKeys(opts.Config.Commits.CopyCommitAttributeToClipboard), Handler: self.withItem(self.copyCommitAttribute), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.CopyCommitAttributeToClipboard, @@ -68,13 +67,13 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Commits.OpenInBrowser), + Keys: opts.GetKeys(opts.Config.Commits.OpenInBrowser), Handler: self.withItem(self.openInBrowser), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenCommitInBrowser, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.withItem(self.newBranch), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.CreateNewBranchFromCommit, @@ -84,14 +83,20 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ // panel. But I find it important that this ends up next to "New Branch", and I couldn't // find another way to achieve this. It's not such a big deal to have it in subcommits and // reflog too, I'd say. - Key: opts.GetKey(opts.Config.Branches.MoveCommitsToNewBranch), + Keys: opts.GetKeys(opts.Config.Branches.MoveCommitsToNewBranch), Handler: self.c.Helpers().Refs.MoveCommitsToNewBranch, GetDisabledReason: self.c.Helpers().Refs.CanMoveCommitsToNewBranch, Description: self.c.Tr.MoveCommitsToNewBranch, Tooltip: self.c.Tr.MoveCommitsToNewBranchTooltip, }, { - Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), + Keys: opts.GetKeys(opts.Config.Universal.NewWorktree), + Handler: self.withItem(self.c.Helpers().Worktree.NewWorktreeMenuForCommit), + Description: self.c.Tr.NewWorktree, + OpensMenu: true, + }, + { + Keys: opts.GetKeys(opts.Config.Commits.ViewResetOptions), Handler: self.withItem(self.createResetMenu), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.ViewResetOptions, @@ -100,31 +105,31 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.CherryPickCopy), + Keys: opts.GetKeys(opts.Config.Commits.CherryPickCopy), Handler: self.withItem(self.copyRange), GetDisabledReason: self.require(self.itemRangeSelected(self.canCopyCommits)), Description: self.c.Tr.CherryPickCopy, Tooltip: utils.ResolvePlaceholderString(self.c.Tr.CherryPickCopyTooltip, map[string]string{ - "paste": keybindings.Label(opts.Config.Commits.PasteCommits), - "escape": keybindings.Label(opts.Config.Universal.Return), + "paste": opts.Config.Commits.PasteCommits.String(), + "escape": opts.Config.Universal.Return.String(), }, ), DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.ResetCherryPick), + Keys: opts.GetKeys(opts.Config.Commits.ResetCherryPick), Handler: self.c.Helpers().CherryPick.Reset, Description: self.c.Tr.ResetCherryPick, }, { - Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), + Keys: opts.GetKeys(opts.Config.Universal.OpenDiffTool), Handler: self.withItem(self.openDiffTool), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenDiffTool, }, { - Key: opts.GetKey(opts.Config.Commits.SelectCommitsOfCurrentBranch), + Keys: opts.GetKeys(opts.Config.Commits.SelectCommitsOfCurrentBranch), Handler: self.selectCommitsOfCurrentBranch, GetDisabledReason: self.require(self.canSelectCommitsOfCurrentBranch), Description: self.c.Tr.SelectCommitsOfCurrentBranch, @@ -152,6 +157,18 @@ func (self *BasicCommitsController) copyCommitAttribute(commit *models.Commit) e } } + commitTagsItem := &types.MenuItem{ + Label: self.c.Tr.CommitTags, + OnPress: func() error { + return self.copyCommitTagsToClipboard(commit) + }, + Keys: menuKey('t'), + } + + if len(commit.Tags) == 0 { + commitTagsItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.CommitHasNoTags} + } + items := []*types.MenuItem{ { Label: self.c.Tr.CommitHash, @@ -164,14 +181,14 @@ func (self *BasicCommitsController) copyCommitAttribute(commit *models.Commit) e OnPress: func() error { return self.copyCommitSubjectToClipboard(commit) }, - Key: 's', + Keys: menuKey('s'), }, { Label: self.c.Tr.CommitMessage, OnPress: func() error { return self.copyCommitMessageToClipboard(commit) }, - Key: 'm', + Keys: menuKey('m'), }, { Label: self.c.Tr.CommitMessageBody, @@ -179,45 +196,32 @@ func (self *BasicCommitsController) copyCommitAttribute(commit *models.Commit) e OnPress: func() error { return self.copyCommitMessageBodyToClipboard(commitMessageBody) }, - Key: 'b', + Keys: menuKey('b'), }, { Label: self.c.Tr.CommitURL, OnPress: func() error { return self.copyCommitURLToClipboard(commit) }, - Key: 'u', + Keys: menuKey('u'), }, { Label: self.c.Tr.CommitDiff, OnPress: func() error { return self.copyCommitDiffToClipboard(commit) }, - Key: 'd', + Keys: menuKey('d'), }, { Label: self.c.Tr.CommitAuthor, OnPress: func() error { return self.copyAuthorToClipboard(commit) }, - Key: 'a', + Keys: menuKey('a'), }, + commitTagsItem, } - commitTagsItem := types.MenuItem{ - Label: self.c.Tr.CommitTags, - OnPress: func() error { - return self.copyCommitTagsToClipboard(commit) - }, - Key: 't', - } - - if len(commit.Tags) == 0 { - commitTagsItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.CommitHasNoTags} - } - - items = append(items, &commitTagsItem) - return self.c.Menu(types.CreateMenuOptions{ Title: self.c.Tr.Actions.CopyCommitAttributeToClipboard, Items: items, diff --git a/pkg/gui/controllers/bisect_controller.go b/pkg/gui/controllers/bisect_controller.go index 9ae3eac09..685f932b1 100644 --- a/pkg/gui/controllers/bisect_controller.go +++ b/pkg/gui/controllers/bisect_controller.go @@ -38,7 +38,7 @@ func NewBisectController( func (self *BisectController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Commits.ViewBisectOptions), + Keys: opts.GetKeys(opts.Config.Commits.ViewBisectOptions), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.openMenu)), Description: self.c.Tr.ViewBisectOptions, OpensMenu: true, @@ -101,7 +101,7 @@ func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, c return self.afterMark(selectCurrentAfter, waitToReselect) }, DisabledReason: singleItemIfNotBisecting, - Key: 'b', + Keys: menuKey('b'), }, { Label: fmt.Sprintf(self.c.Tr.Bisect.Mark, shortHashToMark, info.OldTerm()), @@ -114,7 +114,7 @@ func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, c return self.afterMark(selectCurrentAfter, waitToReselect) }, DisabledReason: singleItemIfNotBisecting, - Key: 'g', + Keys: menuKey('g'), }, { Label: fmt.Sprintf(self.c.Tr.Bisect.SkipCurrent, shortHashToMark), @@ -127,7 +127,7 @@ func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, c return self.afterMark(selectCurrentAfter, waitToReselect) }, DisabledReason: singleItemIfNotBisecting, - Key: 's', + Keys: menuKey('s'), }, } if info.GetCurrentHash() != "" && info.GetCurrentHash() != commit.Hash() { @@ -142,7 +142,7 @@ func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, c return self.afterMark(selectCurrentAfter, waitToReselect) }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'S', + Keys: menuKey('S'), })) } menuItems = append(menuItems, lo.ToPtr(types.MenuItem{ @@ -150,7 +150,7 @@ func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, c OnPress: func() error { return self.c.Helpers().Bisect.Reset() }, - Key: 'r', + Keys: menuKey('r'), })) return self.c.Menu(types.CreateMenuOptions{ @@ -179,7 +179,7 @@ func (self *BisectController) openStartBisectMenu(info *git_commands.BisectInfo, return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'b', + Keys: menuKey('b'), }, { Label: fmt.Sprintf(self.c.Tr.Bisect.MarkStart, commit.ShortHash(), info.OldTerm()), @@ -197,7 +197,7 @@ func (self *BisectController) openStartBisectMenu(info *git_commands.BisectInfo, return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'g', + Keys: menuKey('g'), }, { Label: self.c.Tr.Bisect.ChooseTerms, @@ -222,7 +222,7 @@ func (self *BisectController) openStartBisectMenu(info *git_commands.BisectInfo, }) return nil }, - Key: 't', + Keys: menuKey('t'), }, }, }) @@ -274,18 +274,21 @@ func (self *BisectController) afterMark(selectCurrent bool, waitToReselect bool) } func (self *BisectController) afterBisectMarkRefresh(selectCurrent bool, waitToReselect bool) error { - selectFn := func() { + selectFn := func() error { if selectCurrent { self.selectCurrentBisectCommit() } - } - - if waitToReselect { - self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{}, Then: selectFn}) return nil } - selectFn() + if waitToReselect { + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{}, Then: selectFn}) + return nil + } + + if err := selectFn(); err != nil { + return err + } self.c.Helpers().Bisect.PostBisectCommandRefresh() return nil diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index c796e19ab..cfc46b503 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -3,12 +3,14 @@ package controllers import ( "errors" "fmt" + "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" + "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -40,7 +42,7 @@ func NewBranchesController( func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.press), GetDisabledReason: self.require( self.singleItemSelected(), @@ -51,58 +53,70 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.withItem(self.newBranch), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.NewBranch, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.MoveCommitsToNewBranch), + Keys: opts.GetKeys(opts.Config.Branches.MoveCommitsToNewBranch), Handler: self.c.Helpers().Refs.MoveCommitsToNewBranch, GetDisabledReason: self.c.Helpers().Refs.CanMoveCommitsToNewBranch, Description: self.c.Tr.MoveCommitsToNewBranch, Tooltip: self.c.Tr.MoveCommitsToNewBranchTooltip, }, { - Key: opts.GetKey(opts.Config.Branches.CreatePullRequest), + Keys: opts.GetKeys(opts.Config.Universal.NewWorktree), + Handler: self.withItem(self.c.Helpers().Worktree.NewWorktreeMenuForBranch), + Description: self.c.Tr.NewWorktree, + OpensMenu: true, + }, + { + Keys: opts.GetKeys(opts.Config.Branches.CreatePullRequest), Handler: self.withItem(self.handleCreatePullRequest), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.CreatePullRequest, }, { - Key: opts.GetKey(opts.Config.Branches.ViewPullRequestOptions), + Keys: opts.GetKeys(opts.Config.Branches.ViewPullRequestOptions), Handler: self.withItem(self.handleCreatePullRequestMenu), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.CreatePullRequestOptions, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Branches.CopyPullRequestURL), + Keys: opts.GetKeys(opts.Config.Branches.OpenPullRequestInBrowser), + Handler: self.withItem(self.openPRInBrowser), + GetDisabledReason: self.require(self.singleItemSelected(self.branchHasPR)), + Description: self.c.Tr.OpenPullRequestInBrowser, + }, + { + Keys: opts.GetKeys(opts.Config.Branches.CopyPullRequestURL), Handler: self.copyPullRequestURL, GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.CopyPullRequestURL, }, { - Key: opts.GetKey(opts.Config.Branches.CheckoutBranchByName), + Keys: opts.GetKeys(opts.Config.Branches.CheckoutBranchByName), Handler: self.checkoutByName, Description: self.c.Tr.CheckoutByName, Tooltip: self.c.Tr.CheckoutByNameTooltip, }, { - Key: opts.GetKey(opts.Config.Branches.CheckoutPreviousBranch), + Keys: opts.GetKeys(opts.Config.Branches.CheckoutPreviousBranch), Handler: self.checkoutPreviousBranch, Description: self.c.Tr.CheckoutPreviousBranch, }, { - Key: opts.GetKey(opts.Config.Branches.ForceCheckoutBranch), + Keys: opts.GetKeys(opts.Config.Branches.ForceCheckoutBranch), Handler: self.forceCheckout, GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.ForceCheckout, Tooltip: self.c.Tr.ForceCheckoutTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItems(self.delete), GetDisabledReason: self.require(self.itemRangeSelected(self.branchesAreReal)), Description: self.c.Tr.Delete, @@ -111,7 +125,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.RebaseBranch), + Keys: opts.GetKeys(opts.Config.Branches.RebaseBranch), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.rebase)), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.RebaseBranch, @@ -120,7 +134,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), + Keys: opts.GetKeys(opts.Config.Branches.MergeIntoCurrentBranch), Handler: opts.Guards.OutsideFilterMode(self.merge), GetDisabledReason: self.require(self.singleItemSelected(self.notMergingIntoYourself)), Description: self.c.Tr.Merge, @@ -129,26 +143,26 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Branches.FastForward), + Keys: opts.GetKeys(opts.Config.Branches.FastForward), Handler: self.withItem(self.fastForward), GetDisabledReason: self.require(self.singleItemSelected(self.branchIsReal)), Description: self.c.Tr.FastForward, Tooltip: self.c.Tr.FastForwardTooltip, }, { - Key: opts.GetKey(opts.Config.Branches.CreateTag), + Keys: opts.GetKeys(opts.Config.Branches.CreateTag), Handler: self.withItem(self.createTag), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.NewTag, }, { - Key: opts.GetKey(opts.Config.Branches.SortOrder), + Keys: opts.GetKeys(opts.Config.Branches.SortOrder), Handler: self.createSortMenu, Description: self.c.Tr.SortOrder, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), + Keys: opts.GetKeys(opts.Config.Commits.ViewResetOptions), Handler: self.withItem(self.createResetMenu), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.ViewResetOptions, @@ -156,13 +170,13 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.RenameBranch), + Keys: opts.GetKeys(opts.Config.Branches.RenameBranch), Handler: self.withItem(self.rename), GetDisabledReason: self.require(self.singleItemSelected(self.branchIsReal)), Description: self.c.Tr.RenameBranch, }, { - Key: opts.GetKey(opts.Config.Branches.SetUpstream), + Keys: opts.GetKeys(opts.Config.Branches.SetUpstream), Handler: self.withItem(self.viewUpstreamOptions), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.ViewBranchUpstreamOptions, @@ -172,7 +186,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), + Keys: opts.GetKeys(opts.Config.Universal.OpenDiffTool), Handler: self.withItem(func(selectedBranch *models.Branch) error { return self.c.Helpers().Diff.OpenDiffToolForRef(selectedBranch) }), @@ -192,7 +206,14 @@ func (self *BranchesController) GetOnRenderToMain() func() { } else { cmdObj := self.c.Git().Branch.GetGraphCmdObj(branch.FullRefName()) - task = types.NewRunPtyTask(cmdObj.GetCmd()) + ptyTask := types.NewRunPtyTask(cmdObj.GetCmd()) + task = ptyTask + + pr, ok := self.c.Model().PullRequestsMap[branch.Name] + if ok && presentation.ShouldShowPrForBranch(pr, branch.Name, self.c.UserConfig()) { + ptyTask.Prefix = presentation.FormatPullRequestHeader(pr, self.c.Tr) + ptyTask.Prefix += strings.Repeat("─", self.c.Contexts().Normal.GetView().InnerWidth()) + "\n" + } } self.c.RenderToMainViews(types.RefreshMainOpts{ @@ -245,7 +266,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc ) viewDivergenceFromBaseBranchItem := &types.MenuItem{ LabelColumns: []string{label}, - Key: 'b', + Keys: menuKey('b'), OnPress: func() error { branch := self.context().GetSelected() if branch == nil { @@ -270,7 +291,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return err } self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{ types.BRANCHES, types.COMMITS, @@ -278,7 +298,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc }) return nil }, - Key: 'u', + Keys: menuKey('u'), } setUpstreamItem := &types.MenuItem{ @@ -294,7 +314,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return err } self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{ types.BRANCHES, types.COMMITS, @@ -303,7 +322,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return nil }) }, - Key: 's', + Keys: menuKey('s'), } upstreamResetOptions := utils.ResolvePlaceholderString( @@ -336,7 +355,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return nil }, Tooltip: upstreamResetTooltip, - Key: 'g', + Keys: menuKey('g'), } upstreamRebaseItem := &types.MenuItem{ @@ -349,7 +368,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return nil }, Tooltip: upstreamRebaseTooltip, - Key: 'r', + Keys: menuKey('r'), } if !selectedBranch.IsTrackingRemote() { @@ -442,16 +461,23 @@ func (self *BranchesController) handleCreatePullRequestMenu(selectedBranch *mode return self.createPullRequestMenu(selectedBranch, checkedOutBranch) } -func (self *BranchesController) copyPullRequestURL() error { +func (self *BranchesController) getPullRequestURL() (string, error) { branch := self.context().GetSelected() + if pr, ok := self.c.Model().PullRequestsMap[branch.Name]; ok { + return pr.Url, nil + } branchExistsOnRemote := self.c.Git().Remote.CheckRemoteBranchExists(branch.Name) if !branchExistsOnRemote { - return errors.New(self.c.Tr.NoBranchOnRemote) + return "", errors.New(self.c.Tr.NoBranchOnRemote) } - url, err := self.c.Helpers().Host.GetPullRequestURL(branch.Name, "") + return self.c.Helpers().Host.GetPullRequestURL(branch.Name, "") +} + +func (self *BranchesController) copyPullRequestURL() error { + url, err := self.getPullRequestURL() if err != nil { return err } @@ -478,7 +504,7 @@ func (self *BranchesController) forceCheckout() error { if err := self.c.Git().Branch.Checkout(branch.Name, git_commands.CheckoutOptions{Force: true}); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, }) @@ -531,8 +557,11 @@ func (self *BranchesController) createNewBranchWithName(newBranchName string) er return err } - self.c.Helpers().Refs.SelectFirstBranchAndFirstCommit() - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, KeepBranchSelectionIndex: true}) + self.c.Refresh(types.RefreshOptions{ + BranchSelection: types.SelectCheckedOutBranch, + CommitSelection: types.SelectHeadCommit, + SelectTopReflogCommit: true, + }) return nil } @@ -562,7 +591,7 @@ func (self *BranchesController) delete(branches []*models.Branch) error { localDeleteItem := &types.MenuItem{ Label: lo.Ternary(len(branches) > 1, self.c.Tr.DeleteLocalBranches, self.c.Tr.DeleteLocalBranch), - Key: 'c', + Keys: menuKey('c'), OnPress: func() error { return self.localDelete(branches) }, @@ -573,7 +602,7 @@ func (self *BranchesController) delete(branches []*models.Branch) error { remoteDeleteItem := &types.MenuItem{ Label: lo.Ternary(len(branches) > 1, self.c.Tr.DeleteRemoteBranches, self.c.Tr.DeleteRemoteBranch), - Key: 'r', + Keys: menuKey('r'), OnPress: func() error { return self.remoteDelete(branches) }, @@ -586,7 +615,7 @@ func (self *BranchesController) delete(branches []*models.Branch) error { deleteBothItem := &types.MenuItem{ Label: lo.Ternary(len(branches) > 1, self.c.Tr.DeleteLocalAndRemoteBranches, self.c.Tr.DeleteLocalAndRemoteBranch), - Key: 'b', + Keys: menuKey('b'), OnPress: func() error { return self.localAndRemoteDelete(branches) }, @@ -638,9 +667,9 @@ func (self *BranchesController) fastForward(branch *models.Branch) error { } action := self.c.Tr.Actions.FastForwardBranch + worktree, ok := self.worktreeForBranch(branch) return self.c.WithInlineStatus(branch, types.ItemOperationFastForwarding, context.LOCAL_BRANCHES_CONTEXT_KEY, func(task gocui.Task) error { - worktree, ok := self.worktreeForBranch(branch) if ok { self.c.LogAction(action) @@ -662,7 +691,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error { WorktreePath: worktreePath, }, ) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return err } @@ -671,7 +700,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error { err := self.c.Git().Sync.FastForward( task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch, ) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES}}) return err }) } @@ -688,7 +717,7 @@ func (self *BranchesController) createSortMenu() error { if self.c.UserConfig().Git.LocalBranchSortOrder != sortOrder { self.c.UserConfig().Git.LocalBranchSortOrder = sortOrder self.c.Contexts().Branches.SetSelection(0) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES}}) return nil } return nil @@ -711,20 +740,24 @@ func (self *BranchesController) rename(branch *models.Branch) error { return err } - // need to find where the branch is now so that we can re-select it. That means we need to refetch the branches synchronously and then find our branch + // need to find where the branch is now so that we can re-select it. That means we need to + // refetch the branches and then find our branch. The branches model update is bounced + // onto the UI thread, so the re-selection (which reads Model.Branches) has to run in + // Then; reading it inline here would see the previous model. self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.BRANCHES, types.WORKTREES}, + Then: func() error { + // now that we've got our stuff again we need to find that branch and reselect it. + for i, newBranch := range self.c.Model().Branches { + if newBranch.Name == newBranchName { + self.context().SetSelection(i) + self.context().HandleRender() + } + } + return nil + }, }) - // now that we've got our stuff again we need to find that branch and reselect it. - for i, newBranch := range self.c.Model().Branches { - if newBranch.Name == newBranchName { - self.context().SetSelection(i) - self.context().HandleRender() - } - } - return nil }, }) @@ -853,6 +886,27 @@ func (self *BranchesController) branchIsReal(branch *models.Branch) *types.Disab return nil } +func (self *BranchesController) branchHasPR(branch *models.Branch) *types.DisabledReason { + if _, ok := self.c.Model().PullRequestsMap[branch.Name]; !ok { + return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true} + } + + return nil +} + +func (self *BranchesController) openPRInBrowser(branch *models.Branch) error { + pr, ok := self.c.Model().PullRequestsMap[branch.Name] + if !ok { + // Should be guarded against by the DisabledReason check, but be defensive in case + // PullRequestsMap was updated concurrently by a background refresh + return errors.New(self.c.Tr.NoPullRequestForBranch) + } + + self.c.LogAction(self.c.Tr.Actions.OpenPullRequest) + + return self.c.OS().OpenLink(pr.Url) +} + func (self *BranchesController) branchesAreReal(selectedBranches []*models.Branch, startIdx int, endIdx int) *types.DisabledReason { if !lo.EveryBy(selectedBranches, func(branch *models.Branch) bool { return branch.IsRealBranch() diff --git a/pkg/gui/controllers/commit_description_controller.go b/pkg/gui/controllers/commit_description_controller.go index 24653c767..41ec54103 100644 --- a/pkg/gui/controllers/commit_description_controller.go +++ b/pkg/gui/controllers/commit_description_controller.go @@ -1,10 +1,10 @@ package controllers import ( - "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" ) type CommitDescriptionController struct { @@ -26,23 +26,19 @@ func NewCommitDescriptionController( func (self *CommitDescriptionController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.TogglePanel), + Keys: opts.GetKeys(opts.Config.Universal.TogglePanel), Handler: self.handleTogglePanel, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.close, }, { - Key: opts.GetKey(opts.Config.Universal.ConfirmInEditor), + Keys: opts.GetKeys(opts.Config.Universal.ConfirmInEditor), Handler: self.confirm, }, { - Key: opts.GetKey(opts.Config.Universal.ConfirmInEditorAlt), - Handler: self.confirm, - }, - { - Key: opts.GetKey(opts.Config.CommitMessage.CommitMenu), + Keys: opts.GetKeys(opts.Config.CommitMessage.CommitMenu), Handler: self.openCommitMenu, }, } @@ -68,29 +64,23 @@ func (self *CommitDescriptionController) GetMouseKeybindings(opts types.Keybindi func (self *CommitDescriptionController) GetOnFocus() func(types.OnFocusOpts) { return func(types.OnFocusOpts) { footer := "" - if self.c.UserConfig().Keybinding.Universal.ConfirmInEditor != "" || self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt != "" { - if self.c.UserConfig().Keybinding.Universal.ConfirmInEditor == "" { - footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooter, - map[string]string{ - "confirmInEditorKeybinding": keybindings.Label(self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt), - }) - } else if self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt == "" { - footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooter, - map[string]string{ - "confirmInEditorKeybinding": keybindings.Label(self.c.UserConfig().Keybinding.Universal.ConfirmInEditor), - }) - } else { - footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooterTwoBindings, - map[string]string{ - "confirmInEditorKeybinding1": keybindings.Label(self.c.UserConfig().Keybinding.Universal.ConfirmInEditor), - "confirmInEditorKeybinding2": keybindings.Label(self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt), - }) - } + keys := self.c.UserConfig().Keybinding.Universal.ConfirmInEditor + if len(keys) > 0 { + footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooter, + map[string]string{ + "confirmInEditorKeybinding": keys.String(), + }) } self.c.Views().CommitDescription.Footer = footer } } +func (self *CommitDescriptionController) GetOnQuit() func() { + return func() { + self.c.Helpers().Commits.PreserveCommitMessage() + } +} + func (self *CommitDescriptionController) switchToCommitMessage() error { self.c.Context().Replace(self.c.Contexts().CommitMessage) return nil @@ -107,14 +97,14 @@ func (self *CommitDescriptionController) handleTogglePanel() error { // ctrl key or fn key, which is unlikely to occur in pasted text. And if // they mapped some *other* command to "", then we're totally out of // luck. - if self.c.GocuiGui().IsPasting && self.c.UserConfig().Keybinding.Universal.TogglePanel == "" { + if self.c.GocuiGui().IsPasting && lo.Contains(self.c.UserConfig().Keybinding.Universal.TogglePanel, "") { // Handling tabs in pasted commit messages is not optimal, but hopefully // good enough for now. We simply insert 4 spaces without worrying about // column alignment. This works well enough for leading indentation, // which is common in pasted code snippets. view := self.Context().GetView() for range 4 { - view.Editor.Edit(view, gocui.KeySpace, ' ', 0) + view.Editor.Edit(view, gocui.NewKeyRune(' ')) } return nil } diff --git a/pkg/gui/controllers/commit_message_controller.go b/pkg/gui/controllers/commit_message_controller.go index e9ff1bc67..098f42d30 100644 --- a/pkg/gui/controllers/commit_message_controller.go +++ b/pkg/gui/controllers/commit_message_controller.go @@ -3,11 +3,12 @@ package controllers import ( "errors" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/samber/lo" ) type CommitMessageController struct { @@ -29,29 +30,29 @@ func NewCommitMessageController( func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.SubmitEditorText), + Keys: opts.GetKeys(opts.Config.Universal.SubmitEditorText), Handler: self.confirm, Description: self.c.Tr.Confirm, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.close, Description: self.c.Tr.Close, }, { - Key: opts.GetKey(opts.Config.Universal.PrevItem), + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.handlePreviousCommit, }, { - Key: opts.GetKey(opts.Config.Universal.NextItem), + Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.handleNextCommit, }, { - Key: opts.GetKey(opts.Config.Universal.TogglePanel), + Keys: opts.GetKeys(opts.Config.Universal.TogglePanel), Handler: self.handleTogglePanel, }, { - Key: opts.GetKey(opts.Config.CommitMessage.CommitMenu), + Keys: opts.GetKeys(opts.Config.CommitMessage.CommitMenu), Handler: self.openCommitMenu, }, } @@ -82,6 +83,12 @@ func (self *CommitMessageController) GetOnFocusLost() func(types.OnFocusLostOpts } } +func (self *CommitMessageController) GetOnQuit() func() { + return func() { + self.c.Helpers().Commits.PreserveCommitMessage() + } +} + func (self *CommitMessageController) Context() types.Context { return self.context() } @@ -117,14 +124,14 @@ func (self *CommitMessageController) handleTogglePanel() error { // ctrl key or fn key, which is unlikely to occur in pasted text. And if // they mapped some *other* command to "", then we're totally out of // luck. - if self.c.GocuiGui().IsPasting && self.c.UserConfig().Keybinding.Universal.TogglePanel == "" { + if self.c.GocuiGui().IsPasting && lo.Contains(self.c.UserConfig().Keybinding.Universal.TogglePanel, "") { // It is unlikely that a pasted commit message contains a tab in the // subject line, so it shouldn't matter too much how we handle it. // Simply insert 4 spaces instead; all that matters is that we don't // switch to the description panel. view := self.context().GetView() for range 4 { - view.Editor.Edit(view, gocui.KeySpace, ' ', 0) + view.Editor.Edit(view, gocui.NewKeyRune(' ')) } return nil } @@ -137,7 +144,7 @@ func (self *CommitMessageController) handleCommitIndexChange(value int) error { newIndex := currentIndex + value if newIndex == context.NoCommitIndex { self.context().SetSelectedIndex(newIndex) - self.c.Helpers().Commits.SetMessageAndDescriptionInView(self.context().GetHistoryMessage()) + self.c.Helpers().Commits.SetPreservedMessageInView(self.context().GetHistoryMessage()) return nil } else if currentIndex == context.NoCommitIndex { self.context().SetHistoryMessage(self.c.Helpers().Commits.JoinCommitMessageAndUnwrappedDescription()) @@ -162,7 +169,7 @@ func (self *CommitMessageController) setCommitMessageAtIndex(index int) (bool, e if self.c.UserConfig().Git.Commit.AutoWrapCommitMessage { commitMessage = helpers.TryRemoveHardLineBreaks(commitMessage, self.c.UserConfig().Git.Commit.AutoWrapWidth) } - self.c.Helpers().Commits.UpdateCommitPanelView(commitMessage) + self.c.Helpers().Commits.SetMessageAndDescriptionInView(commitMessage) return true, nil } @@ -177,7 +184,7 @@ func (self *CommitMessageController) confirm() error { // to some ctrl key or fn key, which is unlikely to occur in pasted text. // And if they mapped some *other* command to "", then we're totally // out of luck. - if self.c.GocuiGui().IsPasting && self.c.UserConfig().Keybinding.Universal.SubmitEditorText == "" { + if self.c.GocuiGui().IsPasting && lo.Contains(self.c.UserConfig().Keybinding.Universal.SubmitEditorText, "") { return self.switchToCommitDescription() } diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index b5dee6402..588b5b6b8 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -6,15 +6,14 @@ import ( "path/filepath" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/constants" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/filetree" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -46,13 +45,13 @@ func NewCommitFilesController( func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Files.CopyFileInfoToClipboard), + Keys: opts.GetKeys(opts.Config.Files.CopyFileInfoToClipboard), Handler: self.openCopyMenu, Description: self.c.Tr.CopyToClipboardMenu, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile), + Keys: opts.GetKeys(opts.Config.CommitFiles.CheckoutCommitFile), Handler: self.withItem(self.checkout), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Checkout, @@ -60,7 +59,7 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) [] DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItems(self.discard), GetDisabledReason: self.require(self.itemsSelected(self.canDiscardFileChanges)), Description: self.c.Tr.Discard, @@ -68,14 +67,14 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) [] DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenFile), + Keys: opts.GetKeys(opts.Config.Universal.OpenFile), Handler: self.withItem(self.open), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenFile, Tooltip: self.c.Tr.OpenFileTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.withItems(self.edit), GetDisabledReason: self.require(self.itemsSelected(self.canEditFiles)), Description: self.c.Tr.Edit, @@ -83,13 +82,13 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) [] DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), + Keys: opts.GetKeys(opts.Config.Universal.OpenDiffTool), Handler: self.withItem(self.openDiffTool), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenDiffTool, }, { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItems(self.toggleForPatch), GetDisabledReason: self.require(self.itemsSelected()), Description: self.c.Tr.ToggleAddToPatch, @@ -99,7 +98,7 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) [] DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.ToggleStagedAll), + Keys: opts.GetKeys(opts.Config.Files.ToggleStagedAll), Handler: self.withItem(self.toggleAllForPatch), Description: self.c.Tr.ToggleAllInPatch, Tooltip: utils.ResolvePlaceholderString(self.c.Tr.ToggleAllInPatchTooltip, @@ -107,27 +106,27 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) [] ), }, { - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Handler: self.withItem(self.enter), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.EnterCommitFile, Tooltip: self.c.Tr.EnterCommitFileTooltip, }, { - Key: opts.GetKey(opts.Config.Files.ToggleTreeView), + Keys: opts.GetKeys(opts.Config.Files.ToggleTreeView), Handler: self.toggleTreeView, Description: self.c.Tr.ToggleTreeView, Tooltip: self.c.Tr.ToggleTreeViewTooltip, }, { - Key: opts.GetKey(opts.Config.Files.CollapseAll), + Keys: opts.GetKeys(opts.Config.Files.CollapseAll), Handler: self.collapseAll, Description: self.c.Tr.CollapseAll, Tooltip: self.c.Tr.CollapseAllTooltip, GetDisabledReason: self.require(self.isInTreeMode), }, { - Key: opts.GetKey(opts.Config.Files.ExpandAll), + Keys: opts.GetKeys(opts.Config.Files.ExpandAll), Handler: self.expandAll, Description: self.c.Tr.ExpandAll, Tooltip: self.c.Tr.ExpandAllTooltip, @@ -142,6 +141,30 @@ func (self *CommitFilesController) context() *context.CommitFilesContext { return self.c.Contexts().CommitFiles } +func (self *CommitFilesController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error { + return func(opts gocui.ViewMouseBindingOpts) error { + clickedIdx := self.context().GetSelectedLineIdx() + node := self.context().CommitFileTreeViewModel.Get(clickedIdx) + if node == nil || node.File != nil { + return nil + } + + // The arrow is at column visualDepth*2 (after indentation of 2 spaces per level). + // Only treat clicks on the arrow and the trailing space as arrow clicks. + visualDepth := self.context().CommitFileTreeViewModel.GetVisualDepth(clickedIdx) + arrowStartCol := visualDepth * 2 + arrowEndCol := arrowStartCol + 1 + if opts.X < arrowStartCol || opts.X > arrowEndCol { + return nil + } + + self.context().CommitFileTreeViewModel.ToggleCollapsed(node.GetInternalPath()) + self.c.PostRefreshUpdate(self.context()) + + return nil + } +} + func (self *CommitFilesController) GetOnRenderToMain() func() { return func() { node := self.context().GetSelected() @@ -168,11 +191,11 @@ func (self *CommitFilesController) GetOnRenderToMain() func() { } } -func (self *CommitFilesController) copyDiffToClipboard(path string, toastMessage string) error { +func (self *CommitFilesController) copyDiffToClipboard(paths []string, toastMessage string) error { from, to := self.context().GetFromAndToForDiff() from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from) - cmdObj := self.c.Git().WorkingTree.ShowFileDiffCmdObj(from, to, reverse, []string{path}, true) + cmdObj := self.c.Git().WorkingTree.ShowFileDiffCmdObj(from, to, reverse, paths, true) diff, err := cmdObj.RunWithOutput() if err != nil { return err @@ -207,7 +230,7 @@ func (self *CommitFilesController) openCopyMenu() error { return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'n', + Keys: menuKey('n'), } copyRelativePathItem := &types.MenuItem{ Label: self.c.Tr.CopyRelativeFilePath, @@ -219,35 +242,39 @@ func (self *CommitFilesController) openCopyMenu() error { return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'p', + Keys: menuKey('p'), } copyAbsolutePathItem := &types.MenuItem{ Label: self.c.Tr.CopyAbsoluteFilePath, OnPress: func() error { - if err := self.c.OS().CopyToClipboard(filepath.Join(self.c.Git().RepoPaths.RepoPath(), node.GetPath())); err != nil { + absPath, err := filepath.Abs(node.GetPath()) + if err != nil { + return err + } + if err := self.c.OS().CopyToClipboard(absPath); err != nil { return err } self.c.Toast(self.c.Tr.FilePathCopiedToast) return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'P', + Keys: menuKey('P'), } copyFileDiffItem := &types.MenuItem{ Label: self.c.Tr.CopySelectedDiff, OnPress: func() error { - return self.copyDiffToClipboard(node.GetPath(), self.c.Tr.FileDiffCopiedToast) + return self.copyDiffToClipboard(self.pathsForDiff(node), self.c.Tr.FileDiffCopiedToast) }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 's', + Keys: menuKey('s'), } copyAllDiff := &types.MenuItem{ Label: self.c.Tr.CopyAllFilesDiff, OnPress: func() error { - return self.copyDiffToClipboard(".", self.c.Tr.AllFilesDiffCopiedToast) + return self.copyDiffToClipboard([]string{"."}, self.c.Tr.AllFilesDiffCopiedToast) }, DisabledReason: self.require(self.itemsSelected())(), - Key: 'a', + Keys: menuKey('a'), } copyFileContentItem := &types.MenuItem{ Label: self.c.Tr.CopyFileContent, @@ -268,7 +295,7 @@ func (self *CommitFilesController) openCopyMenu() error { } return nil }))(), - Key: 'c', + Keys: menuKey('c'), } return self.c.Menu(types.CreateMenuOptions{ @@ -297,7 +324,7 @@ func (self *CommitFilesController) checkout(node *filetree.CommitFileNode) error return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil } @@ -310,7 +337,14 @@ func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileN Title: self.c.Tr.DiscardFileChangesTitle, Prompt: prompt, HandleConfirm: func() error { - return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { + commits := self.c.Model().Commits + selectedLineIdx := self.c.Contexts().LocalCommits.GetSelectedLineIdx() + selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() + _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.RebasingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { var filePaths []string selectedNodes = normalisedSelectedCommitFileNodes(selectedNodes) @@ -321,22 +355,25 @@ func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileN for _, node := range selectedNodes { _ = node.ForEachFile(func(file *models.CommitFile) error { - filePaths = append(filePaths, file.GetPath()) + // For a rename we discard both the new and the old path, + // so that the new file is removed and the old one is + // restored. + filePaths = append(filePaths, file.Names()...) return nil }) } - selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() - _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) - - err := self.c.Git().Rebase.DiscardOldFileChanges(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), parentIdx, filePaths) + err := self.c.Git().Rebase.DiscardOldFileChanges(commits, selectedLineIdx, parentIdx, filePaths) if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err); err != nil { return err } - if self.context().RangeSelectEnabled() { - self.context().GetList().CancelRangeSelect() - } + self.c.OnUIThread(func() error { + if self.context().RangeSelectEnabled() { + self.context().GetList().CancelRangeSelect() + } + return nil + }) return nil }) @@ -412,23 +449,19 @@ func (self *CommitFilesController) openDiffTool(node *filetree.CommitFileNode) e func (self *CommitFilesController) toggleForPatch(selectedNodes []*filetree.CommitFileNode) error { if self.c.UserConfig().Git.DiffContextSize == 0 { return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextForCustomPatch, - keybindings.Label(self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)) + self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView) } + refName := self.context().GetRef().RefName() + toggle := func() error { return self.c.WithWaitingStatus(self.c.Tr.UpdatingPatch, func(gocui.Task) error { - if !self.c.Git().Patch.PatchBuilder.Active() { - if err := self.startPatchBuilder(); err != nil { - return err - } - } - selectedNodes = normalisedSelectedCommitFileNodes(selectedNodes) // Find if any file in the selection is unselected or partially added adding := lo.SomeBy(selectedNodes, func(node *filetree.CommitFileNode) bool { return node.SomeFile(func(file *models.CommitFile) bool { - fileStatus := self.c.Git().Patch.PatchBuilder.GetFileStatus(file.Path, self.context().GetRef().RefName()) + fileStatus := self.c.Git().Patch.PatchBuilder.GetFileStatus(file.Path, refName) return fileStatus == patch.PART || fileStatus == patch.UNSELECTED }) }) @@ -441,7 +474,7 @@ func (self *CommitFilesController) toggleForPatch(selectedNodes []*filetree.Comm for _, node := range selectedNodes { err := node.ForEachFile(func(file *models.CommitFile) error { - return patchOperationFunction(file.Path) + return patchOperationFunction(file.Path, file.PreviousPath) }) if err != nil { return err @@ -452,7 +485,11 @@ func (self *CommitFilesController) toggleForPatch(selectedNodes []*filetree.Comm self.c.Git().Patch.PatchBuilder.Reset() } - self.c.PostRefreshUpdate(self.context()) + self.c.OnUIThread(func() error { + self.c.PostRefreshUpdate(self.context()) + return nil + }) + return nil }) } @@ -467,6 +504,12 @@ func (self *CommitFilesController) toggleForPatch(selectedNodes []*filetree.Comm self.c.Git().Patch.PatchBuilder.Reset() } + if !self.c.Git().Patch.PatchBuilder.Active() { + if err := self.startPatchBuilder(); err != nil { + return err + } + } + return toggle() }, }) @@ -506,7 +549,7 @@ func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode if self.c.UserConfig().Git.DiffContextSize == 0 { return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextForCustomPatch, - keybindings.Label(self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)) + self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView) } from, to, reverse := self.currentFromToReverseForPatchBuilding() @@ -575,19 +618,9 @@ func (self *CommitFilesController) GetOnClickFocusedMainView() func(mainViewName } } -// pathsForDiff returns the file paths to use for a diff command. When a text -// filter is active and the node is a directory, only the visible (filtered) -// file paths are returned so the diff reflects what the user sees. func (self *CommitFilesController) pathsForDiff(node *filetree.CommitFileNode) []string { - if !node.IsFile() && self.context().IsFiltering() { - var paths []string - _ = node.ForEachFile(func(file *models.CommitFile) error { - paths = append(paths, file.Path) - return nil - }) - return paths - } - return []string{node.GetPath()} + return diffPathsForNode( + node.Raw(), self.context().GetRoot().Raw(), self.c.Model().CommitFiles, self.context().IsFiltering()) } // NOTE: these functions are identical to those in files_controller.go (except for types) and @@ -599,11 +632,16 @@ func normalisedSelectedCommitFileNodes(selectedNodes []*filetree.CommitFileNode) } func isDescendentOfSelectedCommitFileNodes(node *filetree.CommitFileNode, selectedNodes []*filetree.CommitFileNode) bool { - for _, selectedNode := range selectedNodes { - selectedNodePath := selectedNode.GetPath() - nodePath := node.GetPath() + nodePath := node.GetInternalPath() - if strings.HasPrefix(nodePath, selectedNodePath) && nodePath != selectedNodePath { + for _, selectedNode := range selectedNodes { + if selectedNode.IsFile() { + continue + } + + selectedNodePath := selectedNode.GetInternalPath() + + if strings.HasPrefix(nodePath, selectedNodePath+"/") { return true } } diff --git a/pkg/gui/controllers/confirmation_controller.go b/pkg/gui/controllers/confirmation_controller.go index 206818f40..990b2b09e 100644 --- a/pkg/gui/controllers/confirmation_controller.go +++ b/pkg/gui/controllers/confirmation_controller.go @@ -24,19 +24,19 @@ func NewConfirmationController( func (self *ConfirmationController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Confirm), + Keys: opts.GetKeys(opts.Config.Universal.Confirm), Handler: func() error { return self.context().State.OnConfirm() }, Description: self.c.Tr.Confirm, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: func() error { return self.context().State.OnClose() }, Description: self.c.Tr.CloseCancel, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopyToClipboard, Description: self.c.Tr.CopyToClipboardMenu, DisplayOnScreen: true, diff --git a/pkg/gui/controllers/context_lines_controller.go b/pkg/gui/controllers/context_lines_controller.go index a1ce9f518..022364c07 100644 --- a/pkg/gui/controllers/context_lines_controller.go +++ b/pkg/gui/controllers/context_lines_controller.go @@ -30,13 +30,13 @@ func NewContextLinesController( func (self *ContextLinesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.IncreaseContextInDiffView), + Keys: opts.GetKeys(opts.Config.Universal.IncreaseContextInDiffView), Handler: self.Increase, Description: self.c.Tr.IncreaseContextInDiffView, Tooltip: self.c.Tr.IncreaseContextInDiffViewTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.DecreaseContextInDiffView), + Keys: opts.GetKeys(opts.Config.Universal.DecreaseContextInDiffView), Handler: self.Decrease, Description: self.c.Tr.DecreaseContextInDiffView, Tooltip: self.c.Tr.DecreaseContextInDiffViewTooltip, diff --git a/pkg/gui/controllers/custom_patch_options_menu_action.go b/pkg/gui/controllers/custom_patch_options_menu_action.go index b1a98cdf2..af35a285d 100644 --- a/pkg/gui/controllers/custom_patch_options_menu_action.go +++ b/pkg/gui/controllers/custom_patch_options_menu_action.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/jesseduffield/generics/set" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -31,19 +31,19 @@ func (self *CustomPatchOptionsMenuAction) Call() error { Label: self.c.Tr.ResetPatch, Tooltip: self.c.Tr.ResetPatchTooltip, OnPress: self.c.Helpers().PatchBuilding.Reset, - Key: 'c', + Keys: menuKey('c'), }, { Label: self.c.Tr.ApplyPatch, Tooltip: self.c.Tr.ApplyPatchTooltip, OnPress: func() error { return self.handleApplyPatch(false) }, - Key: 'a', + Keys: menuKey('a'), }, { Label: self.c.Tr.ApplyPatchInReverse, Tooltip: self.c.Tr.ApplyPatchInReverseTooltip, OnPress: func() error { return self.handleApplyPatch(true) }, - Key: 'r', + Keys: menuKey('r'), }, } @@ -53,25 +53,25 @@ func (self *CustomPatchOptionsMenuAction) Call() error { Label: fmt.Sprintf(self.c.Tr.RemovePatchFromOriginalCommit, utils.ShortHash(self.c.Git().Patch.PatchBuilder.To)), Tooltip: self.c.Tr.RemovePatchFromOriginalCommitTooltip, OnPress: self.handleDeletePatchFromCommit, - Key: 'd', + Keys: menuKey('d'), }, { Label: self.c.Tr.MovePatchOutIntoIndex, Tooltip: self.c.Tr.MovePatchOutIntoIndexTooltip, OnPress: self.handleMovePatchIntoWorkingTree, - Key: 'i', + Keys: menuKey('i'), }, { Label: self.c.Tr.MovePatchIntoNewCommit, Tooltip: self.c.Tr.MovePatchIntoNewCommitTooltip, OnPress: self.handlePullPatchIntoNewCommit, - Key: 'n', + Keys: menuKey('n'), }, { Label: self.c.Tr.MovePatchIntoNewCommitBefore, Tooltip: self.c.Tr.MovePatchIntoNewCommitBeforeTooltip, OnPress: self.handlePullPatchIntoNewCommitBefore, - Key: 'N', + Keys: menuKey('N'), }, }...) @@ -93,7 +93,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error { Label: fmt.Sprintf(self.c.Tr.MovePatchToSelectedCommit, selectedCommit.Hash()), Tooltip: self.c.Tr.MovePatchToSelectedCommitTooltip, OnPress: self.handleMovePatchToSelectedCommit, - Key: 'm', + Keys: menuKey('m'), DisabledReason: disabledReason, }, }, menuItems[1:]..., @@ -107,7 +107,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error { { Label: self.c.Tr.CopyPatchToClipboard, OnPress: func() error { return self.copyPatchToClipboard() }, - Key: 'y', + Keys: menuKey('y'), }, }...) @@ -132,12 +132,13 @@ func (self *CustomPatchOptionsMenuAction) returnFocusFromPatchExplorerIfNecessar func (self *CustomPatchOptionsMenuAction) handleDeletePatchFromCommit() error { self.returnFocusFromPatchExplorerIfNecessary() + commits := self.c.Model().Commits + commitIndex := self.getPatchCommitIndex() + selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() + _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { - commitIndex := self.getPatchCommitIndex() - selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() - _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) self.c.LogAction(self.c.Tr.Actions.RemovePatchFromCommit) - err := self.c.Git().Patch.DeletePatchesFromCommit(self.c.Model().Commits, commitIndex, parentIdx) + err := self.c.Git().Patch.DeletePatchesFromCommit(commits, commitIndex, parentIdx) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) }) } @@ -145,12 +146,14 @@ func (self *CustomPatchOptionsMenuAction) handleDeletePatchFromCommit() error { func (self *CustomPatchOptionsMenuAction) handleMovePatchToSelectedCommit() error { self.returnFocusFromPatchExplorerIfNecessary() + commits := self.c.Model().Commits + commitIndex := self.getPatchCommitIndex() + toCommitIndex := self.c.Contexts().LocalCommits.GetSelectedLineIdx() + selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() + _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { - commitIndex := self.getPatchCommitIndex() - selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() - _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) self.c.LogAction(self.c.Tr.Actions.MovePatchToSelectedCommit) - err := self.c.Git().Patch.MovePatchToSelectedCommit(self.c.Model().Commits, commitIndex, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), parentIdx) + err := self.c.Git().Patch.MovePatchToSelectedCommit(commits, commitIndex, toCommitIndex, parentIdx) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) }) } @@ -163,12 +166,13 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error Title: self.c.Tr.MustStashTitle, Prompt: self.c.Tr.MustStashWarning, HandleConfirm: func() error { + commits := self.c.Model().Commits + commitIndex := self.getPatchCommitIndex() + selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() + _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { - commitIndex := self.getPatchCommitIndex() - selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() - _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) self.c.LogAction(self.c.Tr.Actions.MovePatchIntoIndex) - err := self.c.Git().Patch.MovePatchIntoIndex(self.c.Model().Commits, commitIndex, parentIdx, mustStash) + err := self.c.Git().Patch.MovePatchIntoIndex(commits, commitIndex, parentIdx, mustStash) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) }) }, @@ -191,14 +195,18 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error { DescriptionTitle: self.c.Tr.CommitDescriptionTitle, PreserveMessage: false, OnConfirm: func(summary string, description string) error { + commits := self.c.Model().Commits + self.c.Helpers().Commits.CloseCommitMessagePanel() return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { - self.c.Helpers().Commits.CloseCommitMessagePanel() self.c.LogAction(self.c.Tr.Actions.MovePatchIntoNewCommit) - err := self.c.Git().Patch.PullPatchIntoNewCommit(self.c.Model().Commits, commitIndex, parentIdx, summary, description) + err := self.c.Git().Patch.PullPatchIntoNewCommit(commits, commitIndex, parentIdx, summary, description) if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err); err != nil { return err } - self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) + self.c.OnUIThread(func() error { + self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) + return nil + }) return nil }) }, @@ -224,14 +232,18 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommitBefore() e DescriptionTitle: self.c.Tr.CommitDescriptionTitle, PreserveMessage: false, OnConfirm: func(summary string, description string) error { + commits := self.c.Model().Commits + self.c.Helpers().Commits.CloseCommitMessagePanel() return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { - self.c.Helpers().Commits.CloseCommitMessagePanel() self.c.LogAction(self.c.Tr.Actions.MovePatchIntoNewCommit) - err := self.c.Git().Patch.PullPatchIntoNewCommitBefore(self.c.Model().Commits, commitIndex, parentIdx, summary, description) + err := self.c.Git().Patch.PullPatchIntoNewCommitBefore(commits, commitIndex, parentIdx, summary, description) if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err); err != nil { return err } - self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) + self.c.OnUIThread(func() error { + self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) + return nil + }) return nil }) }, @@ -267,7 +279,7 @@ func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, }) diff --git a/pkg/gui/controllers/diff_paths.go b/pkg/gui/controllers/diff_paths.go new file mode 100644 index 000000000..e9c12606f --- /dev/null +++ b/pkg/gui/controllers/diff_paths.go @@ -0,0 +1,132 @@ +package controllers + +import ( + "path" + "strings" + + "github.com/jesseduffield/lazygit/pkg/gui/filetree" + "github.com/samber/lo" +) + +// Both models.File and models.CommitFile satisfy this. Names returns the file's +// path, plus the path it was renamed from if it is a rename. +type fileWithNames[T any] interface { + *T + GetPath() string + GetPreviousPath() string + Names() []string +} + +// diffPathsForNode returns the paths to limit a diff command to for showing the +// changes of the given node. files are all the files that the diff contains, +// while root is the root of the tree the node belongs to, which holds only the +// files matching the text filter when there is one. +func diffPathsForNode[T any, PT fileWithNames[T]](node *filetree.Node[T], root *filetree.Node[T], files []*T, isFiltering bool) []string { + if file := node.GetFile(); file != nil { + return PT(file).Names() + } + + dir := node.GetPath() + + if isFiltering { + // Passing the directory would bring back the files that the filter hides, + // so we spell out the ones it leaves. + var paths []string + for _, file := range filesInDir[T, PT](filesInTree(root), dir) { + paths = append(paths, PT(file).Names()...) + } + return paths + } + + // The directory covers everything below it, but git only pairs up the two + // ends of a rename if both are in the pathspec, and one end can well be + // outside the directory. Without that end we would get an addition or a + // deletion where the diff has a rename. + var outsidePaths []string + for _, f := range filesInDir[T, PT](files, dir) { + file := PT(f) + if p := file.GetPath(); !isInDir(p, dir) { + outsidePaths = append(outsidePaths, p) + } + if p := file.GetPreviousPath(); p != "" && !isInDir(p, dir) { + outsidePaths = append(outsidePaths, p) + } + } + + return dropContainedPaths(append([]string{dir}, collapseToDirs[T, PT](outsidePaths, files, dir)...)) +} + +// dropContainedPaths removes the paths that another one of them contains, since +// a pathspec that matches a directory matches everything below it anyway. +func dropContainedPaths(paths []string) []string { + return lo.Filter(paths, func(p string, _ int) bool { + return !lo.SomeBy(paths, func(other string) bool { + return other != p && isInDir(p, other) + }) + }) +} + +// collapseToDirs replaces each of the given paths with the highest directory +// that can stand in for it, so that moving a whole directory elsewhere costs a +// single pathspec rather than one per file. There is a limit to how long a +// command line may get, and a commit can move a great many files at once. +func collapseToDirs[T any, PT fileWithNames[T]](paths []string, files []*T, dir string) []string { + if len(paths) == 0 { + return nil + } + + // A directory can stand in for the paths under it as long as everything it + // contains ends up in the diff anyway, which is to say as long as all of it + // is in the directory we are diffing too. + canStandIn := make(map[string]bool) + standsIn := func(candidate string) bool { + if result, ok := canStandIn[candidate]; ok { + return result + } + + result := lo.EveryBy(files, func(file *T) bool { + return !fileIsInDir[T, PT](file, candidate) || fileIsInDir[T, PT](file, dir) + }) + canStandIn[candidate] = result + return result + } + + return lo.Uniq(lo.Map(paths, func(p string, _ int) string { + // A directory that can't stand in for the path rules out its parents + // too, since they contain everything it contains. We stop short of the + // repository root: it would leave the command with nothing to say about + // the directory whose diff we are showing. + for candidate := path.Dir(p); candidate != "." && standsIn(candidate); candidate = path.Dir(candidate) { + p = candidate + } + return p + })) +} + +func filesInTree[T any](root *filetree.Node[T]) []*T { + files := []*T{} + _ = root.ForEachFile(func(file *T) error { + files = append(files, file) + return nil + }) + return files +} + +// filesInDir returns the files that the given directory contains, either at +// their current or at their previous path. +func filesInDir[T any, PT fileWithNames[T]](files []*T, dir string) []*T { + return lo.Filter(files, func(file *T, _ int) bool { + return fileIsInDir[T, PT](file, dir) + }) +} + +func fileIsInDir[T any, PT fileWithNames[T]](f *T, dir string) bool { + file := PT(f) + previousPath := file.GetPreviousPath() + return isInDir(file.GetPath(), dir) || (previousPath != "" && isInDir(previousPath, dir)) +} + +func isInDir(path string, dir string) bool { + // "." is the root item, which contains every file + return dir == "." || strings.HasPrefix(path, dir+"/") +} diff --git a/pkg/gui/controllers/diff_paths_test.go b/pkg/gui/controllers/diff_paths_test.go new file mode 100644 index 000000000..549ed4f31 --- /dev/null +++ b/pkg/gui/controllers/diff_paths_test.go @@ -0,0 +1,113 @@ +package controllers + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gui/filetree" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" +) + +func TestDiffPathsForNode(t *testing.T) { + files := []*models.CommitFile{ + {Path: "dir/file1", PreviousPath: "file1", ChangeStatus: "R"}, + {Path: "dir/file2-renamed", PreviousPath: "dir/file2", ChangeStatus: "R"}, + {Path: "dir/sub/file3", ChangeStatus: "M"}, + {Path: "file4", PreviousPath: "dir/sub/file4", ChangeStatus: "R"}, + {Path: "file5", ChangeStatus: "M"}, + } + + scenarios := []struct { + testName string + files []*models.CommitFile // defaults to the files above + selectedPath string + isFiltering bool + expectedPaths []string + }{ + { + testName: "file", + selectedPath: "dir/sub/file3", + expectedPaths: []string{"dir/sub/file3"}, + }, + { + testName: "renamed file", + selectedPath: "dir/file1", + expectedPaths: []string{"dir/file1", "file1"}, + }, + { + testName: "directory: pass the other end of each rename that crosses its boundary", + selectedPath: "dir", + // dir/file2-renamed was renamed within the directory, so both of its + // paths are covered by it already + expectedPaths: []string{"dir", "file1", "file4"}, + }, + { + testName: "directory without renames crossing its boundary", + selectedPath: "dir/sub", + expectedPaths: []string{"dir/sub", "file4"}, + }, + { + testName: "root", + selectedPath: ".", + expectedPaths: []string{"."}, + }, + { + testName: "a whole directory moved into the selected one collapses to that directory", + files: []*models.CommitFile{ + {Path: "dir/a", PreviousPath: "src/a", ChangeStatus: "R"}, + {Path: "dir/b", PreviousPath: "src/nested/b", ChangeStatus: "R"}, + {Path: "dir/c", PreviousPath: "src/nested/c", ChangeStatus: "R"}, + {Path: "unrelated", ChangeStatus: "M"}, + }, + selectedPath: "dir", + expectedPaths: []string{"dir", "src"}, + }, + { + testName: "a directory that stands in for the selected one as well", + files: []*models.CommitFile{ + {Path: "a/b/c", PreviousPath: "a/c", ChangeStatus: "R"}, + {Path: "a/b/d", ChangeStatus: "M"}, + {Path: "unrelated", ChangeStatus: "M"}, + }, + selectedPath: "a/b", + expectedPaths: []string{"a"}, + }, + { + testName: "a directory with changes of its own doesn't collapse", + files: []*models.CommitFile{ + {Path: "dir/a", PreviousPath: "src/a", ChangeStatus: "R"}, + {Path: "dir/b", PreviousPath: "src/nested/b", ChangeStatus: "R"}, + {Path: "src/nested/c", ChangeStatus: "M"}, + }, + selectedPath: "dir", + // src/nested is left out of it, so that only src/a stays behind + expectedPaths: []string{"dir", "src/a", "src/nested/b"}, + }, + { + testName: "directory while filtering", + selectedPath: "dir", + isFiltering: true, + expectedPaths: []string{ + "dir/file1", "file1", + "dir/file2-renamed", "dir/file2", + "dir/sub/file3", + "file4", "dir/sub/file4", + }, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + files := lo.Ternary(s.files != nil, s.files, files) + cmp := filetree.NodeSortComparator[models.CommitFile]("mixed", true) + root := filetree.BuildTreeFromCommitFiles(files, true, cmp) + node, found := lo.Find(root.Flatten(filetree.NewCollapsedPaths()), func(node *filetree.Node[models.CommitFile]) bool { + return node.GetPath() == s.selectedPath + }) + assert.True(t, found, "no node for path %s", s.selectedPath) + + assert.Equal(t, s.expectedPaths, diffPathsForNode(node, root, files, s.isFiltering)) + }) + } +} diff --git a/pkg/gui/controllers/diffing_menu_action.go b/pkg/gui/controllers/diffing_menu_action.go index 3ae5903d9..8372d7919 100644 --- a/pkg/gui/controllers/diffing_menu_action.go +++ b/pkg/gui/controllers/diffing_menu_action.go @@ -22,7 +22,7 @@ func (self *DiffingMenuAction) Call() error { OnPress: func() error { self.c.Modes().Diffing.Ref = name // can scope this down based on current view but too lazy right now - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, }, @@ -38,7 +38,7 @@ func (self *DiffingMenuAction) Call() error { FindSuggestionsFunc: self.c.Helpers().Suggestions.GetRefsSuggestionsFunc(), HandleConfirm: func(response string) error { self.c.Modes().Diffing.Ref = response - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, }) @@ -54,7 +54,7 @@ func (self *DiffingMenuAction) Call() error { Label: self.c.Tr.SwapDiff, OnPress: func() error { self.c.Modes().Diffing.Reverse = !self.c.Modes().Diffing.Reverse - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, }, @@ -62,7 +62,7 @@ func (self *DiffingMenuAction) Call() error { Label: self.c.Tr.ExitDiffMode, OnPress: func() error { self.c.Modes().Diffing = diffing.New() - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, }, diff --git a/pkg/gui/controllers/edit_config_action.go b/pkg/gui/controllers/edit_config_action.go new file mode 100644 index 000000000..b3a863035 --- /dev/null +++ b/pkg/gui/controllers/edit_config_action.go @@ -0,0 +1,36 @@ +package controllers + +import ( + "errors" + + "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/samber/lo" +) + +type EditConfigAction struct { + c *ControllerCommon +} + +func (self *EditConfigAction) Call() error { + confPaths := self.c.GetConfig().GetUserConfigPaths() + switch len(confPaths) { + case 0: + return errors.New(self.c.Tr.NoConfigFileFoundErr) + case 1: + return self.c.Helpers().Files.EditFiles(confPaths) + default: + menuItems := lo.Map(confPaths, func(path string, _ int) *types.MenuItem { + return &types.MenuItem{ + Label: path, + OnPress: func() error { + return self.c.Helpers().Files.EditFiles([]string{path}) + }, + } + }) + + return self.c.Menu(types.CreateMenuOptions{ + Title: self.c.Tr.SelectConfigFile, + Items: menuItems, + }) + } +} diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 8cc2ca5e2..e61e1409c 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/jesseduffield/generics/set" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/filetree" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -42,123 +42,124 @@ func NewFilesController( func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItems(self.press), - GetDisabledReason: self.require(self.withFileTreeViewModelMutex(self.itemsSelected())), + GetDisabledReason: self.require(self.itemsSelected(self.canStageSelection)), Description: self.c.Tr.Stage, Tooltip: self.c.Tr.StageTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.OpenStatusFilter), + Keys: opts.GetKeys(opts.Config.Files.OpenStatusFilter), Handler: self.handleStatusFilterPressed, Description: self.c.Tr.FileFilter, }, { - Key: opts.GetKey(opts.Config.Files.CopyFileInfoToClipboard), + Keys: opts.GetKeys(opts.Config.Files.CopyFileInfoToClipboard), Handler: self.openCopyMenu, Description: self.c.Tr.CopyToClipboardMenu, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Files.CommitChanges), + Keys: opts.GetKeys(opts.Config.Files.CommitChanges), Handler: self.c.Helpers().WorkingTree.HandleCommitPress, Description: self.c.Tr.Commit, Tooltip: self.c.Tr.CommitTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook), + Keys: opts.GetKeys(opts.Config.Files.CommitChangesWithoutHook), Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress, Description: self.c.Tr.CommitChangesWithoutHook, }, { - Key: opts.GetKey(opts.Config.Files.AmendLastCommit), + Keys: opts.GetKeys(opts.Config.Files.AmendLastCommit), Handler: self.handleAmendCommitPress, Description: self.c.Tr.AmendLastCommit, }, { - Key: opts.GetKey(opts.Config.Files.CommitChangesWithEditor), + Keys: opts.GetKeys(opts.Config.Files.CommitChangesWithEditor), Handler: self.c.Helpers().WorkingTree.HandleCommitEditorPress, Description: self.c.Tr.CommitChangesWithEditor, }, { - Key: opts.GetKey(opts.Config.Files.FindBaseCommitForFixup), + Keys: opts.GetKeys(opts.Config.Files.FindBaseCommitForFixup), Handler: self.c.Helpers().FixupHelper.HandleFindBaseCommitForFixupPress, Description: self.c.Tr.FindBaseCommitForFixup, Tooltip: self.c.Tr.FindBaseCommitForFixupTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.withItems(self.edit), - GetDisabledReason: self.require(self.withFileTreeViewModelMutex(self.itemsSelected(self.canEditFiles))), + GetDisabledReason: self.require(self.itemsSelected(self.canEditFiles)), Description: self.c.Tr.Edit, Tooltip: self.c.Tr.EditFileTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenFile), + Keys: opts.GetKeys(opts.Config.Universal.OpenFile), Handler: self.Open, GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenFile, Tooltip: self.c.Tr.OpenFileTooltip, }, { - Key: opts.GetKey(opts.Config.Files.IgnoreFile), + Keys: opts.GetKeys(opts.Config.Files.IgnoreFile), Handler: self.withItem(self.ignoreOrExcludeMenu), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Actions.IgnoreExcludeFile, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Files.RefreshFiles), + Keys: opts.GetKeys(opts.Config.Files.RefreshFiles), Handler: self.refresh, Description: self.c.Tr.RefreshFiles, }, { - Key: opts.GetKey(opts.Config.Files.StashAllChanges), + Keys: opts.GetKeys(opts.Config.Files.StashAllChanges), Handler: self.stash, Description: self.c.Tr.Stash, Tooltip: self.c.Tr.StashTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.ViewStashOptions), + Keys: opts.GetKeys(opts.Config.Files.ViewStashOptions), Handler: self.createStashMenu, Description: self.c.Tr.ViewStashOptions, Tooltip: self.c.Tr.ViewStashOptionsTooltip, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Files.ToggleStagedAll), - Handler: self.toggleStagedAll, - Description: self.c.Tr.ToggleStagedAll, - Tooltip: self.c.Tr.ToggleStagedAllTooltip, + Keys: opts.GetKeys(opts.Config.Files.ToggleStagedAll), + Handler: self.toggleStagedAll, + GetDisabledReason: self.require(self.anyFilesDisplayed), + Description: self.c.Tr.ToggleStagedAll, + Tooltip: self.c.Tr.ToggleStagedAllTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Handler: self.enter, GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.FileEnter, Tooltip: self.c.Tr.FileEnterTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItems(self.remove), - GetDisabledReason: self.withFileTreeViewModelMutex(self.require(self.itemsSelected(self.canRemove))), + GetDisabledReason: self.require(self.itemsSelected(self.canRemove)), Description: self.c.Tr.Discard, Tooltip: self.c.Tr.DiscardFileChangesTooltip, OpensMenu: true, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), + Keys: opts.GetKeys(opts.Config.Commits.ViewResetOptions), Handler: self.createResetToUpstreamMenu, Description: self.c.Tr.ViewResetToUpstreamOptions, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Files.ViewResetOptions), + Keys: opts.GetKeys(opts.Config.Files.ViewResetOptions), Handler: self.createResetMenu, Description: self.c.Tr.Reset, Tooltip: self.c.Tr.FileResetOptionsTooltip, @@ -166,41 +167,41 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.ToggleTreeView), + Keys: opts.GetKeys(opts.Config.Files.ToggleTreeView), Handler: self.toggleTreeView, Description: self.c.Tr.ToggleTreeView, Tooltip: self.c.Tr.ToggleTreeViewTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), + Keys: opts.GetKeys(opts.Config.Universal.OpenDiffTool), Handler: self.withItem(self.openDiffTool), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenDiffTool, }, { - Key: opts.GetKey(opts.Config.Files.OpenMergeOptions), + Keys: opts.GetKeys(opts.Config.Files.OpenMergeOptions), Handler: self.withItems(self.openMergeConflictMenu), Description: self.c.Tr.ViewMergeConflictOptions, Tooltip: self.c.Tr.ViewMergeConflictOptionsTooltip, - GetDisabledReason: self.require(self.withFileTreeViewModelMutex(self.itemsSelected(self.canOpenMergeConflictMenu))), + GetDisabledReason: self.require(self.itemsSelected(self.canOpenMergeConflictMenu)), OpensMenu: true, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.Fetch), + Keys: opts.GetKeys(opts.Config.Files.Fetch), Handler: self.fetch, Description: self.c.Tr.Fetch, Tooltip: self.c.Tr.FetchTooltip, }, { - Key: opts.GetKey(opts.Config.Files.CollapseAll), + Keys: opts.GetKeys(opts.Config.Files.CollapseAll), Handler: self.collapseAll, Description: self.c.Tr.CollapseAll, Tooltip: self.c.Tr.CollapseAllTooltip, GetDisabledReason: self.require(self.isInTreeMode), }, { - Key: opts.GetKey(opts.Config.Files.ExpandAll), + Keys: opts.GetKeys(opts.Config.Files.ExpandAll), Handler: self.expandAll, Description: self.c.Tr.ExpandAll, Tooltip: self.c.Tr.ExpandAllTooltip, @@ -209,15 +210,6 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types } } -func (self *FilesController) withFileTreeViewModelMutex(callback func() *types.DisabledReason) func() *types.DisabledReason { - return func() *types.DisabledReason { - self.c.Contexts().Files.FileTreeViewModel.RWMutex.RLock() - defer self.c.Contexts().Files.FileTreeViewModel.RWMutex.RUnlock() - - return callback() - } -} - func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding { return []*gocui.ViewMouseBinding{ { @@ -229,107 +221,188 @@ func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []* } } +func (self *FilesController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error { + return func(opts gocui.ViewMouseBindingOpts) error { + clickedIdx := self.context().GetSelectedLineIdx() + node := self.context().FileTreeViewModel.Get(clickedIdx) + if node == nil || node.File != nil { + return nil + } + + // The arrow is at column visualDepth*2 (after indentation of 2 spaces per level). + // Only treat clicks on the arrow and the trailing space as arrow clicks. + visualDepth := self.context().FileTreeViewModel.GetVisualDepth(clickedIdx) + arrowStartCol := visualDepth * 2 + arrowEndCol := arrowStartCol + 1 + if opts.X < arrowStartCol || opts.X > arrowEndCol { + return nil + } + + self.context().FileTreeViewModel.ToggleCollapsed(node.GetInternalPath()) + self.c.PostRefreshUpdate(self.context()) + + return nil + } +} + func (self *FilesController) GetOnRenderToMain() func() { return func() { self.c.Helpers().Diff.WithDiffModeCheck(func() { node := self.context().GetSelected() if node == nil { - self.c.RenderToMainViews(types.RefreshMainOpts{ - Pair: self.c.MainViewPairs().Normal, - Main: &types.ViewUpdateOpts{ - Title: self.c.Tr.DiffTitle, - SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), - Task: types.NewRenderStringTask(self.c.Tr.NoChangedFiles), - }, - }) + self.renderToMainWithTask(types.NewRenderStringTask(self.c.Tr.NoChangedFiles)) + return + } + + if self.isSubmoduleCommitConflict(node.File) { + self.renderSubmoduleConflict(node) return } if node.File != nil && node.File.HasInlineMergeConflicts { - hasConflicts, err := self.c.Helpers().MergeConflicts.SetMergeState(node.GetPath()) - if err != nil { - return - } - - if hasConflicts { - self.c.Helpers().MergeConflicts.Render() + if self.renderInlineMergeConflict(node) { return } + // The file is marked as conflicted but has no conflict markers (it + // was resolved in an editor), so fall through to show its diff. } else if node.File != nil && node.File.HasMergeConflicts { - opts := types.RefreshMainOpts{ - Pair: self.c.MainViewPairs().Normal, - Main: &types.ViewUpdateOpts{ - Title: self.c.Tr.DiffTitle, - SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), - }, - } - message := node.File.GetMergeStateDescription(self.c.Tr) - message += "\n\n" + fmt.Sprintf(self.c.Tr.MergeConflictPressEnterToResolve, - self.c.UserConfig().Keybinding.Universal.GoInto) - if self.c.Views().Main.InnerWidth() > 70 { - // If the main view is very wide, wrap the message to increase readability - lines, _, _ := utils.WrapViewLinesToWidth(true, false, message, 70, 4) - message = strings.Join(lines, "\n") - } - if node.File.ShortStatus == "DU" || node.File.ShortStatus == "UD" { - cmdObj := self.c.Git().Diff.DiffCmdObj([]string{"--base", "--", node.GetPath()}) - prefix := message + "\n\n" - if node.File.ShortStatus == "DU" { - prefix += self.c.Tr.MergeConflictIncomingDiff - } else { - prefix += self.c.Tr.MergeConflictCurrentDiff - } - prefix += "\n\n" - opts.Main.Task = types.NewRunPtyTaskWithPrefix(cmdObj.GetCmd(), prefix) - } else { - opts.Main.Task = types.NewRenderStringTask(message) - } - self.c.RenderToMainViews(opts) + self.renderNonTextualConflict(node) return } - self.c.Helpers().MergeConflicts.ResetMergeState() - - split := self.c.UserConfig().Gui.SplitDiff == "always" || (node.GetHasUnstagedChanges() && node.GetHasStagedChanges()) - mainShowsStaged := !split && node.GetHasStagedChanges() - - pathOverrides := self.pathOverridesForDiff(node) - cmdObj := self.c.Git().WorkingTree.WorktreeFileDiffCmdObj(node, false, mainShowsStaged, pathOverrides) - title := self.c.Tr.UnstagedChanges - if mainShowsStaged { - title = self.c.Tr.StagedChanges - } - refreshOpts := types.RefreshMainOpts{ - Pair: self.c.MainViewPairs().Normal, - Main: &types.ViewUpdateOpts{ - Task: types.NewRunPtyTask(cmdObj.GetCmd()), - SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), - Title: title, - }, - } - - if split { - cmdObj := self.c.Git().WorkingTree.WorktreeFileDiffCmdObj(node, false, true, pathOverrides) - - title := self.c.Tr.StagedChanges - if mainShowsStaged { - title = self.c.Tr.UnstagedChanges - } - - refreshOpts.Secondary = &types.ViewUpdateOpts{ - Title: title, - SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), - Task: types.NewRunPtyTask(cmdObj.GetCmd()), - } - } - - self.c.RenderToMainViews(refreshOpts) + self.renderWorkingTreeDiff(node) }) } } -func (self *FilesController) GetOnClick() func() error { +// renderToMainWithTask renders the given task to the main view with the standard +// diff title and subtitle. +func (self *FilesController) renderToMainWithTask(task types.UpdateTask) { + self.c.RenderToMainViews(types.RefreshMainOpts{ + Pair: self.c.MainViewPairs().Normal, + Main: &types.ViewUpdateOpts{ + Title: self.c.Tr.DiffTitle, + SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), + Task: task, + }, + }) +} + +// renderSubmoduleConflict shows, for a conflicted submodule, an explanation plus +// the commits each side added relative to their common ancestor as two separate, +// indented logs. If a side added nothing of its own (e.g. it was rewound to an +// ancestor of the other), the commit it points at is shown instead. +func (self *FilesController) renderSubmoduleConflict(node *filetree.FileNode) { + self.c.Helpers().MergeConflicts.ResetMergeState() + + path := node.GetPath() + _, ours, theirs, err := self.c.Git().Submodule.GetConflictCommits(path) + if err != nil { + return + } + + sideBlock := func(header string, side string, otherSide string) string { + log, err := self.c.Git().Submodule.ConflictSideLog(path, side, otherSide) + if err != nil { + return header + } + if log = strings.TrimRight(log, "\n"); log == "" { + if log, err = self.c.Git().Submodule.GetCommitSummary(path, side); err != nil { + return header + } + } + return header + "\n\n " + strings.ReplaceAll(log, "\n", "\n ") + } + + message := strings.Join([]string{ + self.conflictResolutionHint(utils.ResolvePlaceholderString(self.c.Tr.SubmoduleMergeConflictDescription, map[string]string{"path": path})), + sideBlock(self.c.Tr.MergeConflictCurrentDiff, ours, theirs), + sideBlock(self.c.Tr.MergeConflictIncomingDiff, theirs, ours), + }, "\n\n") + + self.renderToMainWithTask(types.NewRenderStringTask(message)) +} + +// renderInlineMergeConflict renders the merge-conflict view for a file with +// inline conflict markers. It returns false if the file has no actual markers +// (it was resolved in an editor), in which case the caller should fall back to +// showing the file's diff. +func (self *FilesController) renderInlineMergeConflict(node *filetree.FileNode) bool { + hasConflicts, err := self.c.Helpers().MergeConflicts.SetMergeState(node.File) + if err != nil { + return true + } + + if !hasConflicts { + return false + } + + self.c.Helpers().MergeConflicts.Render() + return true +} + +// renderNonTextualConflict shows the resolution hint for a non-textual text-file +// conflict (DD/AU/UA/UD/DU), plus the base diff for the modify/delete cases. +func (self *FilesController) renderNonTextualConflict(node *filetree.FileNode) { + message := self.conflictResolutionHint(node.File.GetMergeStateDescription(self.c.Tr)) + + if node.File.ShortStatus == "DU" || node.File.ShortStatus == "UD" { + cmdObj := self.c.Git().Diff.DiffCmdObj([]string{"--base", "--", node.GetPath()}) + prefix := message + "\n\n" + if node.File.ShortStatus == "DU" { + prefix += self.c.Tr.MergeConflictIncomingDiff + } else { + prefix += self.c.Tr.MergeConflictCurrentDiff + } + prefix += "\n\n" + self.renderToMainWithTask(types.NewRunPtyTaskWithPrefix(cmdObj.GetCmd(), prefix)) + return + } + + self.renderToMainWithTask(types.NewRenderStringTask(message)) +} + +func (self *FilesController) renderWorkingTreeDiff(node *filetree.FileNode) { + self.c.Helpers().MergeConflicts.ResetMergeState() + + split := self.c.UserConfig().Gui.SplitDiff == "always" || (node.GetHasUnstagedChanges() && node.GetHasStagedChanges()) + mainShowsStaged := !split && node.GetHasStagedChanges() + + paths := self.pathsForDiff(node) + cmdObj := self.c.Git().WorkingTree.WorktreeFileDiffCmdObj(node, false, mainShowsStaged, paths) + title := self.c.Tr.UnstagedChanges + if mainShowsStaged { + title = self.c.Tr.StagedChanges + } + refreshOpts := types.RefreshMainOpts{ + Pair: self.c.MainViewPairs().Normal, + Main: &types.ViewUpdateOpts{ + Task: types.NewRunPtyTask(cmdObj.GetCmd()), + SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), + Title: title, + }, + } + + if split { + cmdObj := self.c.Git().WorkingTree.WorktreeFileDiffCmdObj(node, false, true, paths) + + title := self.c.Tr.StagedChanges + if mainShowsStaged { + title = self.c.Tr.UnstagedChanges + } + + refreshOpts.Secondary = &types.ViewUpdateOpts{ + Title: title, + SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(), + Task: types.NewRunPtyTask(cmdObj.GetCmd()), + } + } + + self.c.RenderToMainViews(refreshOpts) +} + +func (self *FilesController) GetOnDoubleClick() func() error { return self.withItemGraceful(func(node *filetree.FileNode) error { return self.press([]*filetree.FileNode{node}) }) @@ -363,6 +436,9 @@ var unstageStatusMap = map[string]string{ "A ": "??", "M ": " M", "D ": " D", + // A submodule with both a staged commit and unstageable dirty content; the + // staged commit gets unstaged, the dirty content stays. + "MM": " M", } func (self *FilesController) optimisticStage(file *models.File) bool { @@ -421,13 +497,23 @@ func (self *FilesController) optimisticChange(nodes []*filetree.FileNode, optimi return nil } -func (self *FilesController) pressWithLock(selectedNodes []*filetree.FileNode) error { - // Obtaining this lock because optimistic rendering requires us to mutate - // the files in our model. - self.c.Mutexes().RefreshingFilesMutex.Lock() - defer self.c.Mutexes().RefreshingFilesMutex.Unlock() - - for _, node := range selectedNodes { +// toggleStaged decides whether to stage or unstage the given nodes, updates the +// model optimistically, and then runs the matching git command via the supplied +// callbacks. press() (acting on the selection) and toggleStagedAll() (acting on +// the whole tree) share this; they differ only in the git commands they run, +// which is why those are passed in. +// +// If any node has unstaged changes we stage the nodes that have them (staging +// already-staged deleted files/folders would fail); otherwise we unstage all +// the nodes. +func (self *FilesController) toggleStaged( + nodes []*filetree.FileNode, + stageAction string, + unstageAction string, + stage func(unstagedNodes []*filetree.FileNode) error, + unstage func(nodes []*filetree.FileNode) error, +) error { + for _, node := range nodes { // if any files within have inline merge conflicts we can't stage or unstage, // or it'll end up with those >>>>>> lines actually staged if node.GetHasInlineMergeConflicts() { @@ -435,6 +521,51 @@ func (self *FilesController) pressWithLock(selectedNodes []*filetree.FileNode) e } } + nodes = normalisedSelectedNodes(nodes) + + unstagedNodes := filterNodesHaveUnstagedChanges(nodes, self.c.Model().Submodules) + + // Staging a submodule that only has dirty or untracked content (no new + // commit) is a no-op: the parent repo can't stage that content. When that's + // the only thing that looks stageable, don't stage; fall through to + // unstaging instead. That keeps the toggle symmetric (e.g. a fully-staged + // tree that also contains a dirty submodule still unstages on the next + // press) rather than getting stuck trying to stage the unstageable content. + shouldStage := len(unstagedNodes) > 0 + if shouldStage { + noOp, err := self.stagingWouldBeNoOp(unstagedNodes) + if err != nil { + return err + } + shouldStage = !noOp + } + + if shouldStage { + self.c.LogAction(stageAction) + + if err := self.optimisticChange(unstagedNodes, self.optimisticStage); err != nil { + return err + } + + return stage(unstagedNodes) + } + + // If there's nothing staged to unstage either, then the only thing we acted + // on was an unstageable submodule and nothing happened, so say why. + if !someNodesHaveStagedChanges(nodes) { + return errors.New(self.c.Tr.NothingToStageForSubmodule) + } + + self.c.LogAction(unstageAction) + + if err := self.optimisticChange(nodes, self.optimisticUnstage); err != nil { + return err + } + + return unstage(nodes) +} + +func (self *FilesController) pressWithLock(selectedNodes []*filetree.FileNode) error { // When filtering, expand directory nodes to individual visible file paths // so that only filtered files are staged/unstaged. toPaths := func(nodes []*filetree.FileNode) []string { @@ -453,89 +584,68 @@ func (self *FilesController) pressWithLock(selectedNodes []*filetree.FileNode) e }) } - selectedNodes = normalisedSelectedNodes(selectedNodes) - - // If any node has unstaged changes, we'll stage all the selected unstaged nodes (staging already staged deleted files/folders would fail). - // Otherwise, we unstage all the selected nodes. - unstagedSelectedNodes := filterNodesHaveUnstagedChanges(selectedNodes) - - if len(unstagedSelectedNodes) > 0 { + stage := func(unstagedNodes []*filetree.FileNode) error { var extraArgs []string - if self.context().GetStatusFilter() == filetree.DisplayTracked { extraArgs = []string{"-u"} } - self.c.LogAction(self.c.Tr.Actions.StageFile) - - if err := self.optimisticChange(unstagedSelectedNodes, self.optimisticStage); err != nil { - return err - } - - if err := self.c.Git().WorkingTree.StageFiles(toPaths(unstagedSelectedNodes), extraArgs); err != nil { - return err - } - } else { - self.c.LogAction(self.c.Tr.Actions.UnstageFile) - - if err := self.optimisticChange(selectedNodes, self.optimisticUnstage); err != nil { - return err - } - - if self.context().IsFiltering() { - // When filtering, only unstage visible files - if err := self.unstageFilteredFiles(selectedNodes); err != nil { - return err - } - } else { - // need to partition the paths into tracked and untracked (where we assume directories are tracked). Then we'll run the commands separately. - trackedNodes, untrackedNodes := utils.Partition(selectedNodes, func(node *filetree.FileNode) bool { - // We treat all directories as tracked. I'm not actually sure why we do this but - // it's been the existing behaviour for a while and nobody has complained - return !node.IsFile() || node.GetIsTracked() - }) - - if len(untrackedNodes) > 0 { - if err := self.c.Git().WorkingTree.UnstageUntrackedFiles(toPaths(untrackedNodes)); err != nil { - return err - } - } - - if len(trackedNodes) > 0 { - if err := self.c.Git().WorkingTree.UnstageTrackedFiles(toPaths(trackedNodes)); err != nil { - return err - } - } - } + return self.c.Git().WorkingTree.StageFiles(toPaths(unstagedNodes), extraArgs) } - return nil + unstage := func(nodes []*filetree.FileNode) error { + if self.context().IsFiltering() { + // When filtering, only unstage visible files + return self.unstageFilteredFiles(nodes) + } + + // need to partition the paths into tracked and untracked (where we assume directories are tracked). Then we'll run the commands separately. + trackedNodes, untrackedNodes := utils.Partition(nodes, func(node *filetree.FileNode) bool { + // We treat all directories as tracked. I'm not actually sure why we do this but + // it's been the existing behaviour for a while and nobody has complained + return !node.IsFile() || node.GetIsTracked() + }) + + if len(untrackedNodes) > 0 { + if err := self.c.Git().WorkingTree.UnstageUntrackedFiles(toPaths(untrackedNodes)); err != nil { + return err + } + } + + if len(trackedNodes) > 0 { + if err := self.c.Git().WorkingTree.UnstageTrackedFiles(toPaths(trackedNodes)); err != nil { + return err + } + } + + return nil + } + + return self.toggleStaged(selectedNodes, + self.c.Tr.Actions.StageFile, self.c.Tr.Actions.UnstageFile, + stage, unstage) } func (self *FilesController) press(nodes []*filetree.FileNode) error { + // A single file with a conflict that can only be resolved through a dialog + // can't be staged; route it to the same picker that `enter` uses instead. + if len(nodes) == 1 && self.conflictNeedsResolutionDialog(nodes[0].File) { + return self.openConflictResolutionMenu(nodes[0].File) + } + if err := self.pressWithLock(nodes); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}, Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) self.context().HandleFocus(types.OnFocusOpts{}) return nil } -// pathOverridesForDiff returns file paths to override the node's path in diff -// commands when a text filter is active and the node is a directory. This -// ensures the diff only shows filtered/visible files. -func (self *FilesController) pathOverridesForDiff(node *filetree.FileNode) []string { - if !node.IsFile() && self.context().IsFiltering() { - var paths []string - _ = node.ForEachFile(func(file *models.File) error { - paths = append(paths, file.Path) - return nil - }) - return paths - } - return nil +func (self *FilesController) pathsForDiff(node *filetree.FileNode) []string { + return diffPathsForNode( + node.Raw(), self.context().GetRoot().Raw(), self.c.Model().Files, self.context().IsFiltering()) } // unstageFilteredFiles unstages only the visible (filtered) files from the @@ -613,6 +723,10 @@ func (self *FilesController) EnterFile(opts types.OnFocusOpts) error { file := node.File + if self.conflictNeedsResolutionDialog(file) { + return self.openConflictResolutionMenu(file) + } + submoduleConfigs := self.c.Model().Submodules if file.IsSubmodule(submoduleConfigs) { submoduleConfig := file.SubmoduleConfig(submoduleConfigs) @@ -622,9 +736,6 @@ func (self *FilesController) EnterFile(opts types.OnFocusOpts) error { if file.HasInlineMergeConflicts { return self.switchToMerge() } - if file.HasMergeConflicts { - return self.handleNonInlineConflict(file) - } context := lo.Ternary(opts.ClickedWindowName == "secondary", self.c.Contexts().StagingSecondary, self.c.Contexts().Staging) self.c.Context().Push(context, opts) @@ -633,7 +744,77 @@ func (self *FilesController) EnterFile(opts types.OnFocusOpts) error { return nil } -func (self *FilesController) handleNonInlineConflict(file *models.File) error { +// conflictResolutionHint formats a conflict description for the main view, +// appending the "press to resolve" hint and wrapping it when the view is +// wide enough that long lines would otherwise hurt readability. +func (self *FilesController) conflictResolutionHint(description string) string { + message := description + "\n\n" + fmt.Sprintf(self.c.Tr.MergeConflictPressEnterToResolve, + self.c.UserConfig().Keybinding.Universal.GoInto) + if self.c.Views().Main.InnerWidth() > 70 { + lines, _, _ := utils.WrapViewLinesToWidth(true, false, message, 70, 4) + message = strings.Join(lines, "\n") + } + return message +} + +// conflictNeedsResolutionDialog reports whether a file's merge conflict can only +// be resolved through a dialog that picks one side, as opposed to editing +// conflict markers in the merge view. These are the "non-textual" conflicts: +// text files where one side modified and the other deleted/renamed the file +// (DD/AU/UA/UD/DU), and submodules where both sides moved the gitlink (UU). +func (self *FilesController) conflictNeedsResolutionDialog(file *models.File) bool { + if file == nil || !file.HasMergeConflicts { + return false + } + + // A conflicted submodule has no conflict markers to edit; it's resolved by + // picking which commit to point at. + if file.IsSubmodule(self.c.Model().Submodules) { + return true + } + + return !file.HasInlineMergeConflicts +} + +// canStageSelection disables staging when a multiple selection includes a file +// with a conflict that must be resolved through a dialog; those have to be +// resolved one at a time. +func (self *FilesController) canStageSelection(nodes []*filetree.FileNode) *types.DisabledReason { + if len(nodes) > 1 { + for _, node := range nodes { + if node.SomeFile(self.conflictNeedsResolutionDialog) { + return &types.DisabledReason{ + Text: utils.ResolvePlaceholderString( + self.c.Tr.StageConflictsRangeDisabled, map[string]string{ + "goIntoKey": self.c.UserConfig().Keybinding.Universal.GoInto.String(), + }, + ), + } + } + } + } + + return nil +} + +// isSubmoduleCommitConflict reports whether the file is a submodule whose commit +// pointer conflicts (status UU or AA): both sides recorded a different commit, +// with no base content to merge. These are resolved by picking one side's +// commit. Other submodule conflicts (e.g. modify/delete) are handled like +// ordinary non-textual conflicts, with the keep/delete picker. +func (self *FilesController) isSubmoduleCommitConflict(file *models.File) bool { + return file != nil && file.HasInlineMergeConflicts && file.IsSubmodule(self.c.Model().Submodules) +} + +func (self *FilesController) openConflictResolutionMenu(file *models.File) error { + if self.isSubmoduleCommitConflict(file) { + return self.openSubmoduleConflictMenu(file) + } + + return self.openFileConflictMenu(file) +} + +func (self *FilesController) openFileConflictMenu(file *models.File) error { handle := func(command func(command string) error, logText string) error { self.c.LogAction(logText) if err := command(file.GetPath()); err != nil { @@ -647,14 +828,14 @@ func (self *FilesController) handleNonInlineConflict(file *models.File) error { OnPress: func() error { return handle(self.c.Git().WorkingTree.StageFile, self.c.Tr.Actions.ResolveConflictByKeepingFile) }, - Key: 'k', + Keys: menuKey('k'), } deleteItem := &types.MenuItem{ Label: self.c.Tr.MergeConflictDeleteFile, OnPress: func() error { return handle(self.c.Git().WorkingTree.RemoveConflictedFile, self.c.Tr.Actions.ResolveConflictByDeletingFile) }, - Key: 'd', + Keys: menuKey('d'), } items := []*types.MenuItem{} switch file.ShortStatus { @@ -680,36 +861,78 @@ func (self *FilesController) handleNonInlineConflict(file *models.File) error { }) } +func (self *FilesController) openSubmoduleConflictMenu(file *models.File) error { + path := file.GetPath() + _, ours, theirs, err := self.c.Git().Submodule.GetConflictCommits(path) + if err != nil { + return err + } + + resolve := func(sha string, logAction string) error { + self.c.LogAction(logAction) + if err := self.c.Git().Submodule.CheckoutConflictCommit(path, sha); err != nil { + return err + } + if err := self.c.Git().WorkingTree.StageFile(path); err != nil { + return err + } + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) + return nil + } + + // Append the commit summary to the label so the user can tell the two + // candidates apart, falling back to the bare label if we can't read it. + label := func(text string, sha string) string { + if summary, err := self.c.Git().Submodule.GetCommitSummary(path, sha); err == nil && summary != "" { + return fmt.Sprintf("%s (%s)", text, summary) + } + return text + } + + return self.c.Menu(types.CreateMenuOptions{ + Title: self.c.Tr.MergeConflictsTitle, + Prompt: utils.ResolvePlaceholderString(self.c.Tr.SubmoduleMergeConflictDescription, map[string]string{"path": path}), + Items: []*types.MenuItem{ + { + Label: label(self.c.Tr.MergeConflictTakeCurrentCommit, ours), + OnPress: func() error { return resolve(ours, self.c.Tr.Actions.TakeCurrentSubmoduleCommit) }, + Keys: menuKey('c'), + }, + { + Label: label(self.c.Tr.MergeConflictTakeIncomingCommit, theirs), + OnPress: func() error { return resolve(theirs, self.c.Tr.Actions.TakeIncomingSubmoduleCommit) }, + Keys: menuKey('i'), + }, + }, + }) +} + +// The stage-all command acts on the file tree as it is displayed, so there has +// to be something in it. This is also the case before the first files refresh +// has come in, when there is no tree at all yet. +func (self *FilesController) anyFilesDisplayed() *types.DisabledReason { + if self.context().FileTreeViewModel.Len() == 0 { + return &types.DisabledReason{Text: self.c.Tr.NoChangedFiles} + } + + return nil +} + func (self *FilesController) toggleStagedAll() error { if err := self.toggleStagedAllWithLock(); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}, Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) self.context().HandleFocus(types.OnFocusOpts{}) return nil } func (self *FilesController) toggleStagedAllWithLock() error { - self.c.Mutexes().RefreshingFilesMutex.Lock() - defer self.c.Mutexes().RefreshingFilesMutex.Unlock() - root := self.context().FileTreeViewModel.GetRoot() - // if any files within have inline merge conflicts we can't stage or unstage, - // or it'll end up with those >>>>>> lines actually staged - if root.GetHasInlineMergeConflicts() { - return errors.New(self.c.Tr.ErrStageDirWithInlineMergeConflicts) - } - - if root.GetHasUnstagedChanges() { - self.c.LogAction(self.c.Tr.Actions.StageAllFiles) - - if err := self.optimisticChange([]*filetree.FileNode{root}, self.optimisticStage); err != nil { - return err - } - + stage := func(unstagedNodes []*filetree.FileNode) error { if self.context().IsFiltering() { // When filtering, only stage visible files var paths []string @@ -717,35 +940,25 @@ func (self *FilesController) toggleStagedAllWithLock() error { paths = append(paths, file.Path) return nil }) - if err := self.c.Git().WorkingTree.StageFiles(paths, nil); err != nil { - return err - } - } else { - onlyTrackedFiles := self.context().GetStatusFilter() == filetree.DisplayTracked - if err := self.c.Git().WorkingTree.StageAll(onlyTrackedFiles); err != nil { - return err - } - } - } else { - self.c.LogAction(self.c.Tr.Actions.UnstageAllFiles) - - if err := self.optimisticChange([]*filetree.FileNode{root}, self.optimisticUnstage); err != nil { - return err + return self.c.Git().WorkingTree.StageFiles(paths, nil) } - if self.context().IsFiltering() { - // When filtering, only unstage visible files - if err := self.unstageFilteredFiles([]*filetree.FileNode{root}); err != nil { - return err - } - } else { - if err := self.c.Git().WorkingTree.UnstageAll(); err != nil { - return err - } - } + onlyTrackedFiles := self.context().GetStatusFilter() == filetree.DisplayTracked + return self.c.Git().WorkingTree.StageAll(onlyTrackedFiles) } - return nil + unstage := func(nodes []*filetree.FileNode) error { + if self.context().IsFiltering() { + // When filtering, only unstage visible files + return self.unstageFilteredFiles(nodes) + } + + return self.c.Git().WorkingTree.UnstageAll() + } + + return self.toggleStaged([]*filetree.FileNode{root}, + self.c.Tr.Actions.StageAllFiles, self.c.Tr.Actions.UnstageAllFiles, + stage, unstage) } func (self *FilesController) unstageFiles(node *filetree.FileNode) error { @@ -832,7 +1045,7 @@ func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error } return nil }, - Key: 'i', + Keys: menuKey('i'), }, { LabelColumns: []string{self.c.Tr.ExcludeFile}, @@ -842,7 +1055,7 @@ func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error } return nil }, - Key: 'e', + Keys: menuKey('e'), }, }, }) @@ -926,7 +1139,7 @@ func (self *FilesController) handleStatusFilterPressed() error { OnPress: func() error { return self.setStatusFiltering(filetree.DisplayStaged) }, - Key: 's', + Keys: menuKey('s'), Widget: types.MakeMenuRadioButton(currentFilter == filetree.DisplayStaged), }, { @@ -934,7 +1147,7 @@ func (self *FilesController) handleStatusFilterPressed() error { OnPress: func() error { return self.setStatusFiltering(filetree.DisplayUnstaged) }, - Key: 'u', + Keys: menuKey('u'), Widget: types.MakeMenuRadioButton(currentFilter == filetree.DisplayUnstaged), }, { @@ -942,7 +1155,7 @@ func (self *FilesController) handleStatusFilterPressed() error { OnPress: func() error { return self.setStatusFiltering(filetree.DisplayTracked) }, - Key: 't', + Keys: menuKey('t'), Widget: types.MakeMenuRadioButton(currentFilter == filetree.DisplayTracked), }, { @@ -950,7 +1163,7 @@ func (self *FilesController) handleStatusFilterPressed() error { OnPress: func() error { return self.setStatusFiltering(filetree.DisplayUntracked) }, - Key: 'T', + Keys: menuKey('T'), Widget: types.MakeMenuRadioButton(currentFilter == filetree.DisplayUntracked), }, { @@ -958,7 +1171,7 @@ func (self *FilesController) handleStatusFilterPressed() error { OnPress: func() error { return self.setStatusFiltering(filetree.DisplayAll) }, - Key: 'r', + Keys: menuKey('r'), Widget: types.MakeMenuRadioButton(currentFilter == filetree.DisplayAll), }, }, @@ -993,7 +1206,7 @@ func (self *FilesController) setStatusFiltering(filter filetree.FileTreeDisplayF // Whenever we switch between untracked and other filters, we need to refresh the files view // because the untracked files filter applies when running `git status`. if previousFilter != filter && (previousFilter == filetree.DisplayUntracked || filter == filetree.DisplayUntracked) { - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}, Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) } else { self.c.PostRefreshUpdate(self.context()) } @@ -1053,7 +1266,7 @@ func (self *FilesController) switchToMerge() error { return nil } - return self.c.Helpers().MergeConflicts.SwitchToMerge(file.Path) + return self.c.Helpers().MergeConflicts.SwitchToMerge(file) } func (self *FilesController) createStashMenu() error { @@ -1068,7 +1281,7 @@ func (self *FilesController) createStashMenu() error { } return self.handleStashSave(self.c.Git().Stash.Push, self.c.Tr.Actions.StashAllChanges) }, - Key: 'a', + Keys: menuKey('a'), }, { Label: self.c.Tr.StashAllChangesKeepIndex, @@ -1079,14 +1292,14 @@ func (self *FilesController) createStashMenu() error { // if there are no staged files it behaves the same as Stash.Save return self.handleStashSave(self.c.Git().Stash.StashAndKeepIndex, self.c.Tr.Actions.StashAllChangesKeepIndex) }, - Key: 'i', + Keys: menuKey('i'), }, { Label: self.c.Tr.StashIncludeUntrackedChanges, OnPress: func() error { return self.handleStashSave(self.c.Git().Stash.StashIncludeUntrackedChanges, self.c.Tr.Actions.StashIncludeUntrackedChanges) }, - Key: 'U', + Keys: menuKey('U'), }, { Label: self.c.Tr.StashStagedChanges, @@ -1097,7 +1310,7 @@ func (self *FilesController) createStashMenu() error { } return self.handleStashSave(self.c.Git().Stash.SaveStagedChanges, self.c.Tr.Actions.StashStagedChanges) }, - Key: 's', + Keys: menuKey('s'), }, { Label: self.c.Tr.StashUnstagedChanges, @@ -1111,7 +1324,7 @@ func (self *FilesController) createStashMenu() error { // ordinary stash return self.handleStashSave(self.c.Git().Stash.Push, self.c.Tr.Actions.StashUnstagedChanges) }, - Key: 'u', + Keys: menuKey('u'), }, }, }) @@ -1158,7 +1371,7 @@ func (self *FilesController) openCopyMenu() error { return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'n', + Keys: menuKey('n'), } copyRelativePathItem := &types.MenuItem{ Label: self.c.Tr.CopyRelativeFilePath, @@ -1170,19 +1383,23 @@ func (self *FilesController) openCopyMenu() error { return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'p', + Keys: menuKey('p'), } copyAbsolutePathItem := &types.MenuItem{ Label: self.c.Tr.CopyAbsoluteFilePath, OnPress: func() error { - if err := self.c.OS().CopyToClipboard(filepath.Join(self.c.Git().RepoPaths.RepoPath(), node.GetPath())); err != nil { + absPath, err := filepath.Abs(node.GetPath()) + if err != nil { + return err + } + if err := self.c.OS().CopyToClipboard(absPath); err != nil { return err } self.c.Toast(self.c.Tr.FilePathCopiedToast) return nil }, DisabledReason: self.require(self.singleItemSelected())(), - Key: 'P', + Keys: menuKey('P'), } copyFileDiffItem := &types.MenuItem{ Label: self.c.Tr.CopySelectedDiff, @@ -1208,7 +1425,7 @@ func (self *FilesController) openCopyMenu() error { return nil }, ))(), - Key: 's', + Keys: menuKey('s'), } copyAllDiff := &types.MenuItem{ Label: self.c.Tr.CopyAllFilesDiff, @@ -1233,7 +1450,7 @@ func (self *FilesController) openCopyMenu() error { return nil }, )(), - Key: 'a', + Keys: menuKey('a'), } return self.c.Menu(types.CreateMenuOptions{ @@ -1293,13 +1510,20 @@ func (self *FilesController) handleStashSave(stashFunc func(message string) erro self.c.Prompt(types.PromptOpts{ Title: self.c.Tr.StashChanges, HandleConfirm: func(stashComment string) error { - self.c.LogAction(action) + return self.c.WithWaitingStatusBlockingInput( + types.WaitingStatusOpts{Message: self.c.Tr.StashingStatus}, + func(gocui.Task) error { + self.c.LogAction(action) - if err := stashFunc(stashComment); err != nil { - return err - } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH, types.FILES}}) - return nil + if err := stashFunc(stashComment); err != nil { + return err + } + self.c.RefreshFromWorker(types.RefreshOptions{ + BatchUIUpdates: true, + Scope: []types.RefreshableView{types.STASH, types.FILES}, + }) + return nil + }) }, AllowEmptyInput: true, }) @@ -1312,6 +1536,7 @@ func (self *FilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error } func (self *FilesController) fetch() error { + fetchGeneration := self.c.State().GetRepoGeneration() return self.c.WithWaitingStatus(self.c.Tr.FetchingStatus, func(task gocui.Task) error { self.c.LogAction("Fetch") err := self.c.Git().Sync.Fetch(task) @@ -1320,13 +1545,7 @@ func (self *FilesController) fetch() error { return errors.New(self.c.Tr.PassUnameWrong) } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS}, Mode: types.SYNC}) - - if err == nil { - err = self.c.Helpers().BranchesHelper.AutoForwardBranches() - } - - return err + return self.c.Helpers().BranchesHelper.PostFetchRefresh(err, false, fetchGeneration) }) } @@ -1342,6 +1561,8 @@ func normalisedSelectedNodes(selectedNodes []*filetree.FileNode) []*filetree.Fil }) } +// NOTE: there's a duplicate of this function in commits_files_controller.go; if you make +// changes here, make them there, too. (We should unify them using generics.) func isDescendentOfSelectedNodes(node *filetree.FileNode, selectedNodes []*filetree.FileNode) bool { nodePath := node.GetInternalPath() @@ -1399,12 +1620,66 @@ func someNodesHaveStagedChanges(nodes []*filetree.FileNode) bool { return lo.SomeBy(nodes, (*filetree.FileNode).GetHasStagedChanges) } -func filterNodesHaveUnstagedChanges(nodes []*filetree.FileNode) []*filetree.FileNode { +func filterNodesHaveUnstagedChanges(nodes []*filetree.FileNode, submodules []*models.SubmoduleConfig) []*filetree.FileNode { return lo.Filter(nodes, func(node *filetree.FileNode, _ int) bool { - return node.GetHasUnstagedChanges() + return node.SomeFile(func(file *models.File) bool { + return fileHasStageableUnstagedChanges(file, submodules) + }) }) } +// For a submodule, the only thing the parent repo can stage is the +// commit-pointer change; dirty or untracked content within the submodule +// shows up as an unstaged change but can never be staged from the parent. So +// once the submodule's commit is staged (leaving it at e.g. "MM"), we mustn't +// treat the leftover unstaged change as stageable, or pressing space would +// keep trying to stage it instead of unstaging it. +func fileHasStageableUnstagedChanges(file *models.File, submodules []*models.SubmoduleConfig) bool { + if !file.HasUnstagedChanges { + return false + } + + if file.IsSubmodule(submodules) { + return !file.HasStagedChanges + } + + return true +} + +// stagingWouldBeNoOp reports whether staging the given nodes would have no +// visible effect, which happens when the only things being staged are +// submodules that have dirty or untracked content but no new commit: the +// parent repo can't stage that content. If a regular file (or a submodule with +// a stageable new commit) is among them, staging does something, so this +// returns false. +func (self *FilesController) stagingWouldBeNoOp(nodes []*filetree.FileNode) (bool, error) { + submodules := self.c.Model().Submodules + + var submodulePaths []string + hasOtherStageableChanges := false + for _, node := range nodes { + _ = node.ForEachFile(func(file *models.File) error { + if file.IsSubmodule(submodules) { + submodulePaths = append(submodulePaths, file.Path) + } else if file.HasUnstagedChanges { + hasOtherStageableChanges = true + } + return nil + }) + } + + if hasOtherStageableChanges || len(submodulePaths) == 0 { + return false, nil + } + + anyStageable, err := self.c.Git().Submodule.AnyHaveStageableChanges(submodulePaths) + if err != nil { + return false, err + } + + return !anyStageable, nil +} + func findSubmoduleNode(nodes []*filetree.FileNode, submodules []*models.SubmoduleConfig) *models.File { for _, node := range nodes { submoduleNode := node.FindFirstFileBy(func(f *models.File) bool { @@ -1472,16 +1747,15 @@ func (self *FilesController) remove(selectedNodes []*filetree.FileNode) error { defer self.context().CancelRangeSelect() } - for _, node := range selectedNodes { - if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil { - return err - } + nodes := lo.Map(selectedNodes, func(n *filetree.FileNode, _ int) git_commands.IFileNode { return n }) + if err := self.c.Git().WorkingTree.DiscardAllDirChanges(nodes); err != nil { + return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) return nil }, - Key: self.c.KeybindingsOpts().GetKey(self.c.UserConfig().Keybinding.Files.ConfirmDiscard), + Keys: self.c.KeybindingsOpts().GetKeys(self.c.UserConfig().Keybinding.Files.ConfirmDiscard), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.DiscardAllTooltip, map[string]string{ @@ -1499,16 +1773,15 @@ func (self *FilesController) remove(selectedNodes []*filetree.FileNode) error { defer self.context().CancelRangeSelect() } - for _, node := range selectedNodes { - if err := self.c.Git().WorkingTree.DiscardUnstagedDirChanges(node); err != nil { - return err - } + nodes := lo.Map(selectedNodes, func(n *filetree.FileNode, _ int) git_commands.IFileNode { return n }) + if err := self.c.Git().WorkingTree.DiscardUnstagedDirChanges(nodes); err != nil { + return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) return nil }, - Key: 'u', + Keys: menuKey('u'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.DiscardUnstagedTooltip, map[string]string{ @@ -1530,10 +1803,10 @@ func (self *FilesController) remove(selectedNodes []*filetree.FileNode) error { } func (self *FilesController) ResetSubmodule(submodule *models.SubmoduleConfig) error { + file := self.c.Helpers().WorkingTree.FileForSubmodule(submodule) return self.c.WithWaitingStatus(self.c.Tr.ResettingSubmoduleStatus, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.ResetSubmodule) - file := self.c.Helpers().WorkingTree.FileForSubmodule(submodule) if file != nil { if err := self.c.Git().WorkingTree.UnStageFile(file.Names(), file.Tracked); err != nil { return err @@ -1547,7 +1820,7 @@ func (self *FilesController) ResetSubmodule(submodule *models.SubmoduleConfig) e return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.SUBMODULES}}) return nil }) } diff --git a/pkg/gui/controllers/filter_controller.go b/pkg/gui/controllers/filter_controller.go index 8b049b26c..830a5bbc6 100644 --- a/pkg/gui/controllers/filter_controller.go +++ b/pkg/gui/controllers/filter_controller.go @@ -33,10 +33,20 @@ func (self *FilterController) Context() types.Context { return self.context } +// A context that filters as the user types has an input field of its own, so it +// has no use for the filter prompt. +type contextThatFiltersAsYouType interface { + FilterAsYouType() bool +} + func (self *FilterController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { + if context, ok := self.context.(contextThatFiltersAsYouType); ok && context.FilterAsYouType() { + return nil + } + return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.StartSearch), + Keys: opts.GetKeys(opts.Config.Universal.StartSearch), Handler: self.OpenFilterPrompt, Description: self.c.Tr.StartFilter, }, @@ -44,5 +54,6 @@ func (self *FilterController) GetKeybindings(opts types.KeybindingsOpts) []*type } func (self *FilterController) OpenFilterPrompt() error { - return self.c.Helpers().Search.OpenFilterPrompt(self.context) + self.c.Helpers().Search.OpenFilterPrompt(self.context) + return nil } diff --git a/pkg/gui/controllers/filtering_menu_action.go b/pkg/gui/controllers/filtering_menu_action.go index 01a236f7a..0bd7ca902 100644 --- a/pkg/gui/controllers/filtering_menu_action.go +++ b/pkg/gui/controllers/filtering_menu_action.go @@ -3,7 +3,6 @@ package controllers import ( "fmt" - "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -42,7 +41,7 @@ func (self *FilteringMenuAction) Call() error { menuItems = append(menuItems, &types.MenuItem{ Label: fmt.Sprintf("%s '%s'", self.c.Tr.FilterBy, fileName), OnPress: func() error { - return self.setFilteringPath(fileName) + return self.c.Helpers().Mode.SetFilteringPath(fileName) }, Tooltip: tooltip, }) @@ -52,7 +51,7 @@ func (self *FilteringMenuAction) Call() error { menuItems = append(menuItems, &types.MenuItem{ Label: fmt.Sprintf("%s '%s'", self.c.Tr.FilterBy, author), OnPress: func() error { - return self.setFilteringAuthor(author) + return self.c.Helpers().Mode.SetFilteringAuthor(author) }, Tooltip: tooltip, }) @@ -65,7 +64,7 @@ func (self *FilteringMenuAction) Call() error { FindSuggestionsFunc: self.c.Helpers().Suggestions.GetFilePathSuggestionsFunc(), Title: self.c.Tr.EnterFileName, HandleConfirm: func(response string) error { - return self.setFilteringPath(response) + return self.c.Helpers().Mode.SetFilteringPath(response) }, }) @@ -81,7 +80,7 @@ func (self *FilteringMenuAction) Call() error { FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(), Title: self.c.Tr.EnterAuthor, HandleConfirm: func(response string) error { - return self.setFilteringAuthor(response) + return self.c.Helpers().Mode.SetFilteringAuthor(response) }, }) @@ -99,33 +98,3 @@ func (self *FilteringMenuAction) Call() error { return self.c.Menu(types.CreateMenuOptions{Title: self.c.Tr.FilteringMenuTitle, Items: menuItems}) } - -func (self *FilteringMenuAction) setFilteringPath(path string) error { - self.c.Modes().Filtering.Reset() - self.c.Modes().Filtering.SetPath(path) - return self.setFiltering() -} - -func (self *FilteringMenuAction) setFilteringAuthor(author string) error { - self.c.Modes().Filtering.Reset() - self.c.Modes().Filtering.SetAuthor(author) - return self.setFiltering() -} - -func (self *FilteringMenuAction) setFiltering() error { - self.c.Modes().Filtering.SetSelectedCommitHash(self.c.Contexts().LocalCommits.GetSelectedCommitHash()) - - repoState := self.c.State().GetRepoState() - if repoState.GetScreenMode() == types.SCREEN_NORMAL { - repoState.SetScreenMode(types.SCREEN_HALF) - } - - self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) - - self.c.Refresh(types.RefreshOptions{Scope: helpers.ScopesToRefreshWhenFilteringModeChanges(), Then: func() { - self.c.Contexts().LocalCommits.SetSelection(0) - self.c.Contexts().LocalCommits.HandleFocus(types.OnFocusOpts{}) - }}) - - return nil -} diff --git a/pkg/gui/controllers/git_flow_controller.go b/pkg/gui/controllers/git_flow_controller.go index cf996e5d9..9e892e97f 100644 --- a/pkg/gui/controllers/git_flow_controller.go +++ b/pkg/gui/controllers/git_flow_controller.go @@ -35,7 +35,7 @@ func NewGitFlowController( func (self *GitFlowController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Branches.ViewGitFlowOptions), + Keys: opts.GetKeys(opts.Config.Branches.ViewGitFlowOptions), Handler: self.withItem(self.handleCreateGitFlowMenu), Description: self.c.Tr.GitFlowOptions, OpensMenu: true, @@ -82,22 +82,22 @@ func (self *GitFlowController) handleCreateGitFlowMenu(branch *models.Branch) er { Label: "start feature", OnPress: startHandler("feature"), - Key: 'f', + Keys: menuKey('f'), }, { Label: "start hotfix", OnPress: startHandler("hotfix"), - Key: 'h', + Keys: menuKey('h'), }, { Label: "start bugfix", OnPress: startHandler("bugfix"), - Key: 'b', + Keys: menuKey('b'), }, { Label: "start release", OnPress: startHandler("release"), - Key: 'r', + Keys: menuKey('r'), }, }, }) diff --git a/pkg/gui/controllers/global_controller.go b/pkg/gui/controllers/global_controller.go index 1ae560685..b50ec6d1d 100644 --- a/pkg/gui/controllers/global_controller.go +++ b/pkg/gui/controllers/global_controller.go @@ -1,10 +1,11 @@ package controllers import ( - "fmt" + "strconv" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/jesseduffield/lazygit/pkg/utils" ) type GlobalController struct { @@ -24,20 +25,20 @@ func NewGlobalController( func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.ExecuteShellCommand), + Keys: opts.GetKeys(opts.Config.Universal.ExecuteShellCommand), Handler: self.shellCommand, Description: self.c.Tr.ExecuteShellCommand, Tooltip: self.c.Tr.ExecuteShellCommandTooltip, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Universal.CreatePatchOptionsMenu), + Keys: opts.GetKeys(opts.Config.Universal.CreatePatchOptionsMenu), Handler: self.createCustomPatchOptionsMenu, Description: self.c.Tr.ViewPatchOptions, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu), + Keys: opts.GetKeys(opts.Config.Universal.CreateRebaseOptionsMenu), Handler: opts.Guards.NoPopupPanel(self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu), Description: self.c.Tr.ViewMergeRebaseOptions, Tooltip: self.c.Tr.ViewMergeRebaseOptionsTooltip, @@ -45,31 +46,37 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type GetDisabledReason: self.canShowRebaseOptions, }, { - Key: opts.GetKey(opts.Config.Universal.Refresh), + Keys: opts.GetKeys(opts.Config.Universal.Refresh), Handler: opts.Guards.NoPopupPanel(self.refresh), Description: self.c.Tr.Refresh, Tooltip: self.c.Tr.RefreshTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.NextScreenMode), + Keys: opts.GetKeys(opts.Config.Universal.NextScreenMode), Handler: opts.Guards.NoPopupPanel(self.nextScreenMode), Description: self.c.Tr.NextScreenMode, }, { - Key: opts.GetKey(opts.Config.Universal.PrevScreenMode), + Keys: opts.GetKeys(opts.Config.Universal.PrevScreenMode), Handler: opts.Guards.NoPopupPanel(self.prevScreenMode), Description: self.c.Tr.PrevScreenMode, }, { - Key: opts.GetKey(opts.Config.Universal.CyclePagers), - Handler: opts.Guards.NoPopupPanel(self.cyclePagers), - GetDisabledReason: self.canCyclePagers, - Description: self.c.Tr.CyclePagers, - Tooltip: self.c.Tr.CyclePagersTooltip, + Keys: opts.GetKeys(opts.Config.Universal.CycleDiffRenderers), + Handler: opts.Guards.NoPopupPanel(self.cycleDiffRenderers), + GetDisabledReason: self.canCycleDiffRenderers, + Description: self.c.Tr.CycleDiffRenderers, + Tooltip: self.c.Tr.CycleDiffRenderersTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Return), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.CycleDiffRenderersReverse), + Handler: opts.Guards.NoPopupPanel(self.cycleDiffRenderersBackward), + GetDisabledReason: self.canCycleDiffRenderers, + Description: self.c.Tr.CycleDiffRenderersReverse, + Tooltip: self.c.Tr.CycleDiffRenderersReverseTooltip, + }, + { + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.escape, Description: self.c.Tr.Cancel, DescriptionFunc: self.escapeDescription, @@ -77,64 +84,41 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type DisplayOnScreen: true, }, { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.OptionMenu), - Handler: self.createOptionsMenu, - OpensMenu: true, - }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.OptionMenuAlt1), - Modifier: gocui.ModNone, - // we have the description on the alt key and not the main key for legacy reasons - // (the original main key was 'x' but we've reassigned that to other purposes) + ViewName: "", + Keys: opts.GetKeys(opts.Config.Universal.OptionMenu), Description: self.c.Tr.OpenKeybindingsMenu, - Handler: self.createOptionsMenu, ShortDescription: self.c.Tr.Keybindings, - DisplayOnScreen: true, + Handler: self.createOptionsMenu, GetDisabledReason: self.optionsMenuDisabledReason, + OpensMenu: true, + DisplayOnScreen: true, }, { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.FilteringMenu), + Keys: opts.GetKeys(opts.Config.Universal.FilteringMenu), Handler: opts.Guards.NoPopupPanel(self.createFilteringMenu), Description: self.c.Tr.OpenFilteringMenu, Tooltip: self.c.Tr.OpenFilteringMenuTooltip, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Universal.DiffingMenu), + Keys: opts.GetKeys(opts.Config.Universal.DiffingMenu), Handler: opts.Guards.NoPopupPanel(self.createDiffingMenu), Description: self.c.Tr.ViewDiffingOptions, Tooltip: self.c.Tr.ViewDiffingOptionsTooltip, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Universal.DiffingMenuAlt), - Handler: opts.Guards.NoPopupPanel(self.createDiffingMenu), - Description: self.c.Tr.ViewDiffingOptions, - Tooltip: self.c.Tr.ViewDiffingOptionsTooltip, - OpensMenu: true, - }, - { - Key: opts.GetKey(opts.Config.Universal.Quit), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.Quit), Description: self.c.Tr.Quit, Handler: self.quit, }, { - Key: opts.GetKey(opts.Config.Universal.QuitAlt1), - Modifier: gocui.ModNone, - Handler: self.quit, + Keys: opts.GetKeys(opts.Config.Universal.QuitWithoutChangingDirectory), + Handler: self.quitWithoutChangingDirectory, }, { - Key: opts.GetKey(opts.Config.Universal.QuitWithoutChangingDirectory), - Modifier: gocui.ModNone, - Handler: self.quitWithoutChangingDirectory, - }, - { - Key: opts.GetKey(opts.Config.Universal.SuspendApp), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.SuspendApp), Handler: self.c.Helpers().SuspendResume.SuspendApp, Description: self.c.Tr.SuspendApp, GetDisabledReason: func() *types.DisabledReason { @@ -147,11 +131,17 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type }, }, { - Key: opts.GetKey(opts.Config.Universal.ToggleWhitespaceInDiffView), + Keys: opts.GetKeys(opts.Config.Universal.ToggleWhitespaceInDiffView), Handler: self.toggleWhitespace, Description: self.c.Tr.ToggleWhitespaceInDiffView, Tooltip: self.c.Tr.ToggleWhitespaceInDiffViewTooltip, }, + { + Keys: opts.GetKeys(opts.Config.Universal.EditConfig), + Handler: self.editConfig, + Description: self.c.Tr.EditConfig, + Tooltip: self.c.Tr.EditFileTooltip, + }, } } @@ -168,7 +158,7 @@ func (self *GlobalController) createCustomPatchOptionsMenu() error { } func (self *GlobalController) refresh() error { - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil } @@ -180,22 +170,44 @@ func (self *GlobalController) prevScreenMode() error { return (&ScreenModeActions{c: self.c}).Prev() } -func (self *GlobalController) cyclePagers() error { - self.c.State().GetPagerConfig().CyclePagers() - if self.c.Context().CurrentSide().GetKey() == self.c.Context().Current().GetKey() { - self.c.Context().CurrentSide().HandleFocus(types.OnFocusOpts{}) - } - - current, total := self.c.State().GetPagerConfig().CurrentPagerIndex() - self.c.Toast(fmt.Sprintf("Selected pager %d of %d", current+1, total)) +func (self *GlobalController) cycleDiffRenderers() error { + self.c.State().GetDiffRendererConfigManager().CycleDiffRenderers() + self.onDiffRenderersChanged() return nil } -func (self *GlobalController) canCyclePagers() *types.DisabledReason { - _, total := self.c.State().GetPagerConfig().CurrentPagerIndex() +func (self *GlobalController) cycleDiffRenderersBackward() error { + self.c.State().GetDiffRendererConfigManager().CycleDiffRenderersBackward() + self.onDiffRenderersChanged() + return nil +} + +// onDiffRenderersChanged re-renders the main view so the newly selected diff renderer +// takes effect, and shows a toast naming it. +func (self *GlobalController) onDiffRenderersChanged() { + currentSide := self.c.Context().CurrentSide() + currentKey := self.c.Context().Current().GetKey() + if currentSide.GetKey() == currentKey || + currentKey == context.NORMAL_MAIN_CONTEXT_KEY || + currentKey == context.NORMAL_SECONDARY_CONTEXT_KEY { + currentSide.HandleRenderToMain() + } + + diffRendererConfigManager := self.c.State().GetDiffRendererConfigManager() + current, total := diffRendererConfigManager.CurrentDiffRendererIndex() + name := diffRendererConfigManager.CurrentDiffRendererName(self.c.Tr) + self.c.Toast(utils.ResolvePlaceholderString(self.c.Tr.SelectedDiffRenderers, map[string]string{ + "name": name, + "current": strconv.Itoa(current + 1), + "total": strconv.Itoa(total), + })) +} + +func (self *GlobalController) canCycleDiffRenderers() *types.DisabledReason { + _, total := self.c.State().GetDiffRendererConfigManager().CurrentDiffRendererIndex() if total <= 1 { return &types.DisabledReason{ - Text: self.c.Tr.CyclePagersDisabledReason, + Text: self.c.Tr.CycleDiffRenderersDisabledReason, } } return nil @@ -254,6 +266,10 @@ func (self *GlobalController) toggleWhitespace() error { return (&ToggleWhitespaceAction{c: self.c}).Call() } +func (self *GlobalController) editConfig() error { + return (&EditConfigAction{c: self.c}).Call() +} + func (self *GlobalController) canShowRebaseOptions() *types.DisabledReason { if self.c.Model().WorkingTreeStateAtLastCommitRefresh.None() { return &types.DisabledReason{ diff --git a/pkg/gui/controllers/helpers/app_status_helper.go b/pkg/gui/controllers/helpers/app_status_helper.go index 587d219d3..44de70546 100644 --- a/pkg/gui/controllers/helpers/app_status_helper.go +++ b/pkg/gui/controllers/helpers/app_status_helper.go @@ -3,9 +3,10 @@ package helpers import ( "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/status" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/jesseduffield/lazygit/pkg/utils" ) type AppStatusHelper struct { @@ -64,19 +65,52 @@ func (self *AppStatusHelper) WithWaitingStatus(message string, f func(gocui.Task }) } +// WithWaitingStatusImpl is WithWaitingStatus for callers that already run on a +// goroutine of their own (e.g. the auto-fetch poller) rather than wanting the +// work dispatched to a worker. task is used to hide the status while the task +// is paused; it may be nil for callers whose f ignores its task. func (self *AppStatusHelper) WithWaitingStatusImpl(message string, f func(gocui.Task) error, task gocui.Task) error { + // A waiting status means lazygit is driving a git operation itself (often + // one that internally runs a rebase and continues it). Pause the background + // routines for its duration so they don't refresh from an intermediate + // state and reveal, say, the half-finished history of a reword. + self.c.PauseBackgroundRefreshes(true) + defer self.c.PauseBackgroundRefreshes(false) + return self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func(waitingStatusHandle *status.WaitingStatusHandle) error { return f(appStatusHelperTask{task, waitingStatusHandle}) }) } -func (self *AppStatusHelper) WithWaitingStatusSync(message string, f func() error) error { - return self.statusMgr().WithWaitingStatus(message, func() {}, func(*status.WaitingStatusHandle) error { - stop := make(chan struct{}) - defer func() { close(stop) }() - self.renderAppStatusSync(stop) - - return f() +// WithWaitingStatusBlockingInput is like WithWaitingStatus, but it also blocks +// keyboard input for the whole duration of the operation: keys the user presses +// while it runs are buffered and replayed against the post-operation state (see +// gocui.BeginBlockingEvents). Use it for operations whose following keypress +// depends on the state they produce, e.g. ones that manipulate an in-progress +// rebase or otherwise rewrite commits, where a racing keypress would target the +// wrong commit or todo. +// +// Must be called on the UI thread: the block is begun synchronously here, before +// the operation is dispatched to a worker, so no keypress can slip through in +// between. +func (self *AppStatusHelper) WithWaitingStatusBlockingInput(opts types.WaitingStatusOpts, f func(gocui.Task) error) { + self.c.GocuiGui().BeginBlockingEvents() + if opts.HideWorkingTreeState { + self.modeHelper.SetSuppressWorkingTreeStateMode(true) + } + self.c.OnWorker(func(task gocui.Task) error { + // End the block and restore the mode indicator once the operation and its + // refresh have applied their UI updates: OnUIThread queues this after the + // refresh's model bounces and Then (which RefreshFromWorker has already + // enqueued by the time f returns), so the replayed keys act on the + // refreshed state and any resulting working tree state shows correctly. + defer self.c.OnUIThread(func() error { + if opts.HideWorkingTreeState { + self.modeHelper.SetSuppressWorkingTreeStateMode(false) + } + return self.c.GocuiGui().EndBlockingEvents() + }) + return self.WithWaitingStatusImpl(opts.Message, f, task) }) } @@ -89,57 +123,50 @@ func (self *AppStatusHelper) GetStatusString() string { return appStatus } +// renderAppStatus ensures the render loop that keeps the app-status view up to +// date is running. There is one loop for the whole status stack, no matter how +// many statuses are showing: it draws whatever the top status currently is, +// and exits after drawing a final empty frame once the last status is removed. +// +// The loop always runs as a background task, regardless of what kind of +// operation owns a status: rendering runs no git commands, so it must never +// count towards lazygit being busy — otherwise it would block repo switching +// for as long as anything is showing (e.g. for the whole duration of a hung +// background fetch, or of a toast fading). A foreground operation's busy-ness +// is carried by its own worker task, not by the renderer. func (self *AppStatusHelper) renderAppStatus() { - self.c.OnWorker(func(_ gocui.Task) error { + if !self.statusMgr().ClaimRenderLoop() { + return + } + + self.c.OnWorkerBackground(func(_ gocui.Task) error { ticker := time.NewTicker(time.Millisecond * time.Duration(self.c.UserConfig().Gui.Spinner.Rate)) defer ticker.Stop() + prevAppStatus := "" for range ticker.C { appStatus, color := self.statusMgr().GetStatusString(self.c.UserConfig()) - self.c.Views().AppStatus.FgColor = color - self.c.OnUIThread(func() error { + + update := self.c.OnUIThreadContentOnlyBackground + if utils.StringWidth(appStatus) != utils.StringWidth(prevAppStatus) { + // Need a full layout whenever the width of the status string changes. This can't + // happen during normal spinning because we validate that all spinner frames have + // the same width, so typically this will only be triggered at the beginning and end + // of a status, or if the status string changes midway for some reason. + update = self.c.OnUIThreadBackground + } + update(func() error { + self.c.Views().AppStatus.FgColor = color self.c.SetViewContent(self.c.Views().AppStatus, appStatus) return nil }) + prevAppStatus = appStatus - if appStatus == "" { + // Checked after rendering, so that the frame which clears the view + // has already been drawn when we exit. + if self.statusMgr().ReleaseRenderLoopIfEmpty() { break } } return nil }) } - -func (self *AppStatusHelper) renderAppStatusSync(stop chan struct{}) { - go func() { - ticker := time.NewTicker(time.Millisecond * 50) - defer ticker.Stop() - - // Forcing a re-layout and redraw after we added the waiting status; - // this is needed in case the gui.showBottomLine config is set to false, - // to make sure the bottom line appears. It's also useful for redrawing - // once after each of several consecutive keypresses, e.g. pressing - // ctrl-j to move a commit down several steps. - _ = self.c.GocuiGui().ForceLayoutAndRedraw() - - self.modeHelper.SetSuppressRebasingMode(true) - defer func() { self.modeHelper.SetSuppressRebasingMode(false) }() - - outer: - for { - select { - case <-ticker.C: - appStatus, color := self.statusMgr().GetStatusString(self.c.UserConfig()) - self.c.Views().AppStatus.FgColor = color - self.c.SetViewContent(self.c.Views().AppStatus, appStatus) - // Redraw all views of the bottom line: - bottomLineViews := []*gocui.View{ - self.c.Views().AppStatus, self.c.Views().Options, self.c.Views().Information, - self.c.Views().StatusSpacer1, self.c.Views().StatusSpacer2, - } - _ = self.c.GocuiGui().ForceRedrawViews(bottomLineViews...) - case <-stop: - break outer - } - } - }() -} diff --git a/pkg/gui/controllers/helpers/bisect_helper.go b/pkg/gui/controllers/helpers/bisect_helper.go index 6ce517dac..bc9548c4c 100644 --- a/pkg/gui/controllers/helpers/bisect_helper.go +++ b/pkg/gui/controllers/helpers/bisect_helper.go @@ -31,5 +31,5 @@ func (self *BisectHelper) Reset() error { } func (self *BisectHelper) PostBisectCommandRefresh() { - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{}}) } diff --git a/pkg/gui/controllers/helpers/branches_helper.go b/pkg/gui/controllers/helpers/branches_helper.go index 5566dc40c..e87edb460 100644 --- a/pkg/gui/controllers/helpers/branches_helper.go +++ b/pkg/gui/controllers/helpers/branches_helper.go @@ -5,10 +5,9 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" - "github.com/jesseduffield/lazygit/pkg/gui/context" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -32,54 +31,28 @@ func (self *BranchesHelper) ConfirmLocalDelete(branches []*models.Branch) error return errors.New(self.c.Tr.SomeBranchesCheckedOutByWorktreeError) } } else if self.checkedOutByOtherWorktree(branches[0]) { - return self.promptWorktreeBranchDelete(branches[0]) + return self.promptWorktreeBranchDelete( + branches[0], + self.c.Tr.RemoveWorktreeAndDeleteBranch, + self.c.Tr.DetachWorktreeAndDeleteBranch, + self.deleteLocalBranchesContinuation(branches), + ) } - allBranchesMerged, err := self.allBranchesMerged(branches) - if err != nil { - return err - } - - doDelete := func() error { + return self.confirmForceIfUnmerged(branches, func() error { return self.c.WithWaitingStatus(self.c.Tr.DeletingStatus, func(_ gocui.Task) error { - self.c.LogAction(self.c.Tr.Actions.DeleteLocalBranch) - branchNames := lo.Map(branches, func(branch *models.Branch, _ int) string { return branch.Name }) - if err := self.c.Git().Branch.LocalDelete(branchNames, true); err != nil { + if err := self.doDeleteLocalBranches(branches); err != nil { return err } - self.c.Contexts().Branches.CollapseRangeSelectionToTop() - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}}) + self.c.OnUIThread(func() error { + self.c.Contexts().Branches.CollapseRangeSelectionToTop() + return nil + }) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES}}) return nil }) - } - - if allBranchesMerged { - return doDelete() - } - - title := self.c.Tr.ForceDeleteBranchTitle - var message string - if len(branches) == 1 { - message = utils.ResolvePlaceholderString( - self.c.Tr.ForceDeleteBranchMessage, - map[string]string{ - "selectedBranchName": branches[0].Name, - }, - ) - } else { - message = self.c.Tr.ForceDeleteBranchesMessage - } - - self.c.Confirm(types.ConfirmOpts{ - Title: title, - Prompt: message, - HandleConfirm: func() error { - return doDelete() - }, }) - - return nil } func (self *BranchesHelper) ConfirmDeleteRemote(remoteBranches []*models.RemoteBranch, resetRemoteBranchesSelection bool) error { @@ -114,9 +87,12 @@ func (self *BranchesHelper) ConfirmDeleteRemote(remoteBranches []*models.RemoteB if err := self.deleteRemoteBranches(remoteBranches, task); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}}) if resetRemoteBranchesSelection { - self.c.Contexts().RemoteBranches.CollapseRangeSelectionToTop() + self.c.OnUIThread(func() error { + self.c.Contexts().RemoteBranches.CollapseRangeSelectionToTop() + return nil + }) } return nil }) @@ -127,8 +103,17 @@ func (self *BranchesHelper) ConfirmDeleteRemote(remoteBranches []*models.RemoteB } func (self *BranchesHelper) ConfirmLocalAndRemoteDelete(branches []*models.Branch) error { - if lo.SomeBy(branches, func(branch *models.Branch) bool { return self.checkedOutByOtherWorktree(branch) }) { - return errors.New(self.c.Tr.SomeBranchesCheckedOutByWorktreeError) + if len(branches) > 1 { + if lo.SomeBy(branches, func(branch *models.Branch) bool { return self.checkedOutByOtherWorktree(branch) }) { + return errors.New(self.c.Tr.SomeBranchesCheckedOutByWorktreeError) + } + } else if self.checkedOutByOtherWorktree(branches[0]) { + return self.promptWorktreeBranchDelete( + branches[0], + self.c.Tr.RemoveWorktreeAndDeleteBothBranches, + self.c.Tr.DetachWorktreeAndDeleteBothBranches, + self.deleteLocalAndRemoteBranchesContinuation(branches), + ) } allBranchesMerged, err := self.allBranchesMerged(branches) @@ -168,23 +153,15 @@ func (self *BranchesHelper) ConfirmLocalAndRemoteDelete(branches []*models.Branc Prompt: prompt, HandleConfirm: func() error { return self.c.WithWaitingStatus(self.c.Tr.DeletingStatus, func(task gocui.Task) error { - // Delete the remote branches first so that we keep the local ones - // in case of failure - remoteBranches := lo.Map(branches, func(branch *models.Branch, _ int) *models.RemoteBranch { - return &models.RemoteBranch{Name: branch.UpstreamBranch, RemoteName: branch.UpstreamRemote} + if err := self.doDeleteLocalAndRemoteBranches(task, branches); err != nil { + return err + } + + self.c.OnUIThread(func() error { + self.c.Contexts().Branches.CollapseRangeSelectionToTop() + return nil }) - if err := self.deleteRemoteBranches(remoteBranches, task); err != nil { - return err - } - - self.c.LogAction(self.c.Tr.Actions.DeleteLocalBranch) - branchNames := lo.Map(branches, func(branch *models.Branch, _ int) string { return branch.Name }) - if err := self.c.Git().Branch.LocalDelete(branchNames, true); err != nil { - return err - } - - self.c.Contexts().Branches.CollapseRangeSelectionToTop() - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}}) return nil }) }, @@ -205,8 +182,18 @@ func (self *BranchesHelper) worktreeForBranch(branch *models.Branch) (*models.Wo return git_commands.WorktreeForBranch(branch, self.c.Model().Worktrees) } -func (self *BranchesHelper) promptWorktreeBranchDelete(selectedBranch *models.Branch) error { - worktree, ok := self.worktreeForBranch(selectedBranch) +// promptWorktreeBranchDelete handles deleting a branch that's checked out by +// another worktree: the worktree has to be removed or detached first to free the +// branch, so we offer both as menu items. Either way the branch is deleted +// afterwards (that's what the user asked for), via deleteBranches, which knows +// whether to delete just the local branch or the remote one too. +func (self *BranchesHelper) promptWorktreeBranchDelete( + branch *models.Branch, + removeLabel string, + detachLabel string, + deleteBranches func(gocui.Task) error, +) error { + worktree, ok := self.worktreeForBranch(branch) if !ok { self.c.Log.Error("promptWorktreeBranchDelete out of sync with list of worktrees") return nil @@ -214,34 +201,156 @@ func (self *BranchesHelper) promptWorktreeBranchDelete(selectedBranch *models.Br title := utils.ResolvePlaceholderString(self.c.Tr.BranchCheckedOutByWorktree, map[string]string{ "worktreeName": worktree.Name, - "branchName": selectedBranch.Name, + "branchName": branch.Name, }) return self.c.Menu(types.CreateMenuOptions{ Title: title, Items: []*types.MenuItem{ { - Label: self.c.Tr.SwitchToWorktree, + Label: removeLabel, + Keys: menuKey('r'), OnPress: func() error { - return self.worktreeHelper.Switch(worktree, context.LOCAL_BRANCHES_CONTEXT_KEY) + return self.confirmForceIfUnmerged([]*models.Branch{branch}, func() error { + return self.worktreeHelper.Remove(worktree, deleteBranches) + }) }, }, { - Label: self.c.Tr.DetachWorktree, + Label: detachLabel, + Keys: menuKey('d'), Tooltip: self.c.Tr.DetachWorktreeTooltip, OnPress: func() error { - return self.worktreeHelper.Detach(worktree) - }, - }, - { - Label: self.c.Tr.RemoveWorktree, - OnPress: func() error { - return self.worktreeHelper.Remove(worktree, false) + return self.confirmForceIfUnmerged([]*models.Branch{branch}, func() error { + return self.worktreeHelper.Detach(worktree, deleteBranches) + }) }, }, }, }) } +// RemoveWorktreeAndDeleteBranch removes the worktree and deletes the local branch +// it has checked out, force-warning first if the branch isn't fully merged. It's +// the worktrees-panel counterpart to deleting a worktree-checked-out branch from +// the branches panel. +func (self *BranchesHelper) RemoveWorktreeAndDeleteBranch( + worktree *models.Worktree, branch *models.Branch, +) error { + branches := []*models.Branch{branch} + return self.removeWorktreeAndDelete(worktree, branches, + self.deleteLocalBranchesContinuation(branches)) +} + +// RemoveWorktreeAndDeleteBothBranches is like RemoveWorktreeAndDeleteBranch but +// also deletes the branch's upstream. +func (self *BranchesHelper) RemoveWorktreeAndDeleteBothBranches( + worktree *models.Worktree, branch *models.Branch, +) error { + branches := []*models.Branch{branch} + return self.removeWorktreeAndDelete(worktree, branches, + self.deleteLocalAndRemoteBranchesContinuation(branches)) +} + +func (self *BranchesHelper) removeWorktreeAndDelete( + worktree *models.Worktree, branches []*models.Branch, deleteBranches func(gocui.Task) error, +) error { + return self.confirmForceIfUnmerged(branches, func() error { + return self.worktreeHelper.Remove(worktree, deleteBranches) + }) +} + +// confirmForceIfUnmerged runs onConfirm directly if all the branches are fully +// merged, and otherwise shows the force-delete warning first and runs onConfirm +// when the user confirms it. +func (self *BranchesHelper) confirmForceIfUnmerged(branches []*models.Branch, onConfirm func() error) error { + allBranchesMerged, err := self.allBranchesMerged(branches) + if err != nil { + return err + } + if allBranchesMerged { + return onConfirm() + } + + var message string + if len(branches) == 1 { + message = utils.ResolvePlaceholderString( + self.c.Tr.ForceDeleteBranchMessage, + map[string]string{ + "selectedBranchName": branches[0].Name, + }, + ) + } else { + message = self.c.Tr.ForceDeleteBranchesMessage + } + + self.c.Confirm(types.ConfirmOpts{ + Title: self.c.Tr.ForceDeleteBranchTitle, + Prompt: message, + HandleConfirm: onConfirm, + }) + + return nil +} + +func (self *BranchesHelper) doDeleteLocalBranches(branches []*models.Branch) error { + self.c.LogAction(self.c.Tr.Actions.DeleteLocalBranch) + self.logBranchHashes(branches) + branchNames := lo.Map(branches, func(branch *models.Branch, _ int) string { return branch.Name }) + return self.c.Git().Branch.LocalDelete(branchNames, true) +} + +func (self *BranchesHelper) doDeleteLocalAndRemoteBranches(task gocui.Task, branches []*models.Branch) error { + // Delete the remote branches first so that we keep the local ones + // in case of failure + remoteBranches := lo.Map(branches, func(branch *models.Branch, _ int) *models.RemoteBranch { + return &models.RemoteBranch{Name: branch.UpstreamBranch, RemoteName: branch.UpstreamRemote} + }) + if err := self.deleteRemoteBranches(remoteBranches, task); err != nil { + return err + } + + return self.doDeleteLocalBranches(branches) +} + +// deleteLocalBranchesContinuation returns a worktree-removal continuation that +// deletes the local branches and refreshes once the worktree is out of the way. +func (self *BranchesHelper) deleteLocalBranchesContinuation(branches []*models.Branch) func(gocui.Task) error { + return func(gocui.Task) error { + if err := self.doDeleteLocalBranches(branches); err != nil { + return err + } + + self.c.OnUIThread(func() error { + self.c.Contexts().Branches.CollapseRangeSelectionToTop() + return nil + }) + self.c.RefreshFromWorker(types.RefreshOptions{ + Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}, + }) + return nil + } +} + +// deleteLocalAndRemoteBranchesContinuation returns a worktree-removal +// continuation that deletes the local and remote branches and refreshes once the +// worktree is out of the way. +func (self *BranchesHelper) deleteLocalAndRemoteBranchesContinuation(branches []*models.Branch) func(gocui.Task) error { + return func(task gocui.Task) error { + if err := self.doDeleteLocalAndRemoteBranches(task, branches); err != nil { + return err + } + + self.c.OnUIThread(func() error { + self.c.Contexts().Branches.CollapseRangeSelectionToTop() + return nil + }) + self.c.RefreshFromWorker(types.RefreshOptions{ + Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.REMOTES, types.FILES}, + }) + return nil + } +} + func (self *BranchesHelper) allBranchesMerged(branches []*models.Branch) (bool, error) { allBranchesMerged := true for _, branch := range branches { @@ -257,6 +366,20 @@ func (self *BranchesHelper) allBranchesMerged(branches []*models.Branch) (bool, return allBranchesMerged, nil } +func (self *BranchesHelper) logBranchHashes(branches []*models.Branch) { + for _, branch := range branches { + msg := utils.ResolvePlaceholderString( + self.c.Tr.Log.DeletingBranch, + map[string]string{ + "branchName": branch.Name, + "hash": branch.CommitHash, + }, + ) + + self.c.LogCommand(msg, false) + } +} + func (self *BranchesHelper) deleteRemoteBranches(remoteBranches []*models.RemoteBranch, task gocui.Task) error { remotes := lo.GroupBy(remoteBranches, func(branch *models.RemoteBranch) string { return branch.RemoteName }) for remote, branches := range remotes { @@ -269,7 +392,48 @@ func (self *BranchesHelper) deleteRemoteBranches(remoteBranches []*models.Remote return nil } -func (self *BranchesHelper) AutoForwardBranches() error { +// fetchGeneration must be the repo generation from when the fetch started, +// captured by the caller before running the fetch: the background fetch +// doesn't block repo switching and is a network call, so the window in which +// the user can switch repos spans the whole fetch, not just this refresh. +func (self *BranchesHelper) PostFetchRefresh(fetchErr error, background bool, fetchGeneration int) error { + scope := []types.RefreshableView{ + types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS, types.PULL_REQUESTS, + } + // AutoForwardBranches needs a fresh worktree model to skip branches that are checked out elsewhere. + if self.c.UserConfig().Git.AutoForwardBranches != "none" { + scope = append(scope, types.WORKTREES) + } + // AutoForwardBranches reads Model.Branches, which the branches refresh writes + // via a bounce, so it has to run in Then rather than right after Refresh + // returns (where it would still see the previous branches). + self.c.RefreshFromWorker(types.RefreshOptions{ + Scope: scope, + Background: background, + Then: func() error { + if fetchErr != nil { + return nil + } + // Then callbacks are not generation-guarded, so check explicitly: + // if the repo was switched since the fetch started, don't forward + // this repo's branches on the strength of another repo's fetch. + if self.c.State().GetRepoGeneration() != fetchGeneration { + return nil + } + err := self.AutoForwardBranches(background) + if background && err != nil { + // The background poller discards this return value, so surface + // the error in the log rather than as a popup for background work. + self.c.Log.Error(err) + return nil + } + return err + }, + }) + return fetchErr +} + +func (self *BranchesHelper) AutoForwardBranches(background bool) error { if self.c.UserConfig().Git.AutoForwardBranches == "none" { return nil } @@ -301,7 +465,7 @@ func (self *BranchesHelper) AutoForwardBranches() error { self.c.LogCommand(strings.TrimRight(updateCommands, "\n"), false) err := self.c.Git().Branch.UpdateBranchRefs(updateCommands) - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES}, Mode: types.SYNC}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES}, Background: background}) return err } diff --git a/pkg/gui/controllers/helpers/cherry_pick_helper.go b/pkg/gui/controllers/helpers/cherry_pick_helper.go index 359d1cbc2..f82f8843a 100644 --- a/pkg/gui/controllers/helpers/cherry_pick_helper.go +++ b/pkg/gui/controllers/helpers/cherry_pick_helper.go @@ -4,6 +4,7 @@ import ( "strconv" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -40,6 +41,14 @@ func (self *CherryPickHelper) CopyRange(commitsList []*models.Commit, context ty return err } + // After a paste the buffer is hidden but not cleared, so the user + // thinks they're starting fresh. Clear it before adding so the new + // copy replaces the old one. + if self.getData().DidPaste { + self.getData().CherryPickedCommits = nil + self.getData().DidPaste = false + } + commitSet := self.getData().SelectedHashSet() allCommitsCopied := lo.EveryBy(commitsList[startIdx:endIdx+1], func(commit *models.Commit) bool { @@ -59,8 +68,6 @@ func (self *CherryPickHelper) CopyRange(commitsList []*models.Commit, context ty } } - self.getData().DidPaste = false - self.rerender() return nil } @@ -76,9 +83,12 @@ func (self *CherryPickHelper) Paste() error { "numCommits": strconv.Itoa(len(self.getData().CherryPickedCommits)), }), HandleConfirm: func() error { - return self.c.WithWaitingStatusSync(self.c.Tr.CherryPickingStatus, func() error { - mustStash := IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) - + mustStash := IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) + cherryPickedCommits := self.getData().CherryPickedCommits + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.CherryPickingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.CherryPick) if mustStash { @@ -87,23 +97,13 @@ func (self *CherryPickHelper) Paste() error { } } - cherryPickedCommits := self.getData().CherryPickedCommits result := self.c.Git().Rebase.CherryPickCommits(cherryPickedCommits) - err := self.rebaseHelper.CheckMergeOrRebaseWithRefreshOptions(result, types.RefreshOptions{Mode: types.SYNC}) + err := self.rebaseHelper.CheckMergeOrRebaseWithRefreshOptions(result, + types.RefreshOptions{BatchUIUpdates: true}) if err != nil { return result } - // Move the selection down by the number of commits we just - // cherry-picked, to keep the same commit selected as before. - // Don't do this if a rebase todo is selected, because in this - // case we are in a rebase and the cherry-picked commits end up - // below the selection. - if commit := self.c.Contexts().LocalCommits.GetSelected(); commit != nil && !commit.IsTODO() { - self.c.Contexts().LocalCommits.MoveSelection(len(cherryPickedCommits)) - self.c.Contexts().LocalCommits.FocusLine(true) - } - // If we're in the cherry-picking state at this point, it must // be because there were conflicts. Don't clear the copied // commits in this case, since we might want to abort and try @@ -113,14 +113,19 @@ func (self *CherryPickHelper) Paste() error { return result } if !isInCherryPick { - self.getData().DidPaste = true - self.rerender() + // DidPaste and the re-render touch mode state and contexts, + // so run them on the UI thread. + self.c.OnUIThread(func() error { + self.getData().DidPaste = true + self.rerender() + return nil + }) if mustStash { if err := self.c.Git().Stash.Pop(0); err != nil { return err } - self.c.Refresh(types.RefreshOptions{ + self.c.RefreshFromWorker(types.RefreshOptions{ Scope: []types.RefreshableView{types.STASH, types.FILES}, }) } diff --git a/pkg/gui/controllers/helpers/commits_helper.go b/pkg/gui/controllers/helpers/commits_helper.go index 735d8fbd9..3f1a67511 100644 --- a/pkg/gui/controllers/helpers/commits_helper.go +++ b/pkg/gui/controllers/helpers/commits_helper.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" ) @@ -41,14 +41,34 @@ func NewCommitsHelper( } } +// SplitCommitMessageAndDescription splits a message in git's canonical format +// (summary and body separated by a blank line) into summary and description. func (self *CommitsHelper) SplitCommitMessageAndDescription(message string) (string, string) { - msg, description, _ := strings.Cut(message, "\n") - return msg, strings.TrimSpace(description) + summary, description, _ := strings.Cut(message, "\n") + description = strings.TrimPrefix(description, "\n") + return summary, description +} + +// SplitPreservedCommitMessage splits a message in our preservation format +// (summary and description joined by a single "\n") into summary and description. +// It is lossless: round-tripping through JoinCommitMessageAndUnwrappedDescription +// preserves the exact content. +func (self *CommitsHelper) SplitPreservedCommitMessage(message string) (string, string) { + summary, description, _ := strings.Cut(message, "\n") + return summary, description } func (self *CommitsHelper) SetMessageAndDescriptionInView(message string) { summary, description := self.SplitCommitMessageAndDescription(message) + self.setSummaryAndDescriptionInView(summary, description) +} +func (self *CommitsHelper) SetPreservedMessageInView(message string) { + summary, description := self.SplitPreservedCommitMessage(message) + self.setSummaryAndDescriptionInView(summary, description) +} + +func (self *CommitsHelper) setSummaryAndDescriptionInView(summary, description string) { self.setCommitSummary(summary) self.setCommitDescription(description) self.c.Contexts().CommitMessage.RenderSubtitle() @@ -98,21 +118,6 @@ func (self *CommitsHelper) SwitchToEditor() error { return self.c.Contexts().CommitMessage.SwitchToEditor(filepath) } -func (self *CommitsHelper) UpdateCommitPanelView(message string) { - if message != "" { - self.SetMessageAndDescriptionInView(message) - return - } - - if self.c.Contexts().CommitMessage.GetPreserveMessage() { - preservedMessage := self.c.Contexts().CommitMessage.GetPreservedMessageAndLogError() - self.SetMessageAndDescriptionInView(preservedMessage) - return - } - - self.SetMessageAndDescriptionInView("") -} - type OpenCommitMessagePanelOpts struct { CommitIndex int SummaryTitle string @@ -138,19 +143,35 @@ func (self *CommitsHelper) OpenCommitMessagePanel(opts *OpenCommitMessagePanelOp return opts.OnConfirm(summary, description) } + // When there's no explicit initial message but we're in a preservation + // context, fall back to any previously preserved message. This is stored as + // the "initial" value so the unchanged-message check on close still works + // correctly (in particular, clearing the panel then escaping will notice + // the difference and delete the preserved file). + initialMessage := opts.InitialMessage + initialMessageIsPreserved := false + if opts.PreserveMessage && initialMessage == "" { + initialMessage = self.c.Contexts().CommitMessage.GetPreservedMessageAndLogError() + initialMessageIsPreserved = true + } + self.c.Contexts().CommitMessage.SetPanelState( opts.CommitIndex, opts.SummaryTitle, opts.DescriptionTitle, opts.PreserveMessage, - opts.InitialMessage, + initialMessage, onConfirm, opts.OnSwitchToEditor, opts.ForceSkipHooks, opts.SkipHooksPrefix, ) - self.UpdateCommitPanelView(opts.InitialMessage) + if initialMessageIsPreserved { + self.SetPreservedMessageInView(initialMessage) + } else { + self.SetMessageAndDescriptionInView(initialMessage) + } self.c.Context().Push(self.c.Contexts().CommitMessage, types.OnFocusOpts{}) } @@ -162,7 +183,7 @@ func (self *CommitsHelper) ClearPreservedCommitMessage() { func (self *CommitsHelper) HandleCommitConfirm() error { summary, description := self.getCommitSummary(), self.getCommitDescription() - if summary == "" { + if strings.TrimSpace(summary) == "" { return errors.New(self.c.Tr.CommitWithoutMessageErr) } @@ -174,15 +195,17 @@ func (self *CommitsHelper) HandleCommitConfirm() error { return nil } -func (self *CommitsHelper) CloseCommitMessagePanel() { +func (self *CommitsHelper) PreserveCommitMessage() { if self.c.Contexts().CommitMessage.GetPreserveMessage() { message := self.JoinCommitMessageAndUnwrappedDescription() if message != self.c.Contexts().CommitMessage.GetInitialMessage() { self.c.Contexts().CommitMessage.SetPreservedMessageAndLogError(message) } - } else { - self.SetMessageAndDescriptionInView("") } +} + +func (self *CommitsHelper) CloseCommitMessagePanel() { + self.PreserveCommitMessage() self.c.Contexts().CommitMessage.SetHistoryMessage("") @@ -206,7 +229,7 @@ func (self *CommitsHelper) OpenCommitMenu(suggestionFunc func(string) []*types.S OnPress: func() error { return self.SwitchToEditor() }, - Key: 'e', + Keys: menuKey('e'), DisabledReason: disabledReasonForOpenInEditor, }, { @@ -214,14 +237,14 @@ func (self *CommitsHelper) OpenCommitMenu(suggestionFunc func(string) []*types.S OnPress: func() error { return self.addCoAuthor(suggestionFunc) }, - Key: 'c', + Keys: menuKey('c'), }, { Label: self.c.Tr.PasteCommitMessageFromClipboard, OnPress: func() error { return self.pasteCommitMessageFromClipboard() }, - Key: 'p', + Keys: menuKey('p'), }, } return self.c.Menu(types.CreateMenuOptions{ diff --git a/pkg/gui/controllers/helpers/confirmation_helper.go b/pkg/gui/controllers/helpers/confirmation_helper.go index 3663cd4ea..f525c1d8a 100644 --- a/pkg/gui/controllers/helpers/confirmation_helper.go +++ b/pkg/gui/controllers/helpers/confirmation_helper.go @@ -9,6 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" ) type ConfirmationHelper struct { @@ -77,9 +78,7 @@ func (self *ConfirmationHelper) wrappedPromptConfirmationFunction( } func (self *ConfirmationHelper) DeactivateConfirmation() { - self.c.Mutexes().PopupMutex.Lock() self.c.State().GetRepoState().SetCurrentPopupOpts(nil) - self.c.Mutexes().PopupMutex.Unlock() self.c.Views().Confirmation.Visible = false @@ -87,9 +86,7 @@ func (self *ConfirmationHelper) DeactivateConfirmation() { } func (self *ConfirmationHelper) DeactivatePrompt() { - self.c.Mutexes().PopupMutex.Lock() self.c.State().GetRepoState().SetCurrentPopupOpts(nil) - self.c.Mutexes().PopupMutex.Unlock() self.c.Views().Prompt.Visible = false self.c.Views().Suggestions.Visible = false @@ -188,9 +185,6 @@ func characterForMask(mask bool) string { } func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts types.CreatePopupPanelOpts) { - self.c.Mutexes().PopupMutex.Lock() - defer self.c.Mutexes().PopupMutex.Unlock() - _, cancel := goContext.WithCancel(ctx) // we don't allow interruptions of non-loader popups in case we get stuck somehow @@ -330,19 +324,70 @@ func (self *ConfirmationHelper) ResizeCurrentPopupPanels() { } } +// The rows that a filter row adds to a menu popup: one for the input, and one +// for its bottom border. Its top border is the menu's bottom border. +const menuFilterRowHeight = 2 + +// The prompts for the filter row, from the most to the least informative. The +// keybindings menu can also filter by keybinding, which is worth spelling out +// when there is room for it. +func (self *ConfirmationHelper) menuFilterPromptCandidates() []string { + if self.c.Contexts().Menu.AllowFilteringKeybindings() { + return []string{self.c.Tr.FilterPrefixMenu, self.c.Tr.FilterPrefix} + } + + return []string{self.c.Tr.FilterPrefix} +} + +// Returns the first prompt that still leaves room to type in, or no prompt at +// all if the row is too narrow even for the shortest one. +func menuFilterPrompt(candidates []string, contentWidth int) string { + const minimumInputWidth = 4 + + for _, candidate := range candidates { + if utils.StringWidth(candidate)+minimumInputWidth <= contentWidth { + return candidate + } + } + + return "" +} + func (self *ConfirmationHelper) resizeMenu(parentPopupContext types.Context) { + menuContext := self.c.Contexts().Menu // we want the unfiltered length here so that if we're filtering we don't // resize the window - itemCount := self.c.Contexts().Menu.UnfilteredLen() + itemCount := menuContext.UnfilteredLen() offset := 3 panelWidth := self.getPopupPanelWidth(90) contentWidth := panelWidth - 2 // minus 2 for the frame promptLinesCount := self.layoutMenuPrompt(contentWidth) - x0, y0, x1, y1 := self.getPopupPanelDimensionsForContentHeight(contentWidth, itemCount+offset+promptLinesCount, parentPopupContext) - menuBottom := y1 - offset + // The row is reserved for the whole time the menu is open, even though it only + // becomes visible once the user starts typing, so that revealing it doesn't + // move the menu. + filterRowHeight := lo.Ternary(menuContext.FilterAsYouType(), menuFilterRowHeight, 0) + x0, y0, x1, y1 := self.getPopupPanelDimensionsForContentHeight( + contentWidth, itemCount+offset+promptLinesCount+filterRowHeight, parentPopupContext) + menuBottom := y1 - offset - filterRowHeight _, _ = self.c.GocuiGui().SetView(self.c.Views().Menu.Name(), x0, y0, x1, menuBottom, 0) tooltipTop := menuBottom + 1 + if menuContext.FilterAsYouType() { + filterRowBottom := menuBottom + filterRowHeight + // The row hangs off the bottom of the menu, sharing its bottom border. + _, _ = self.c.GocuiGui().SetView(self.c.Views().MenuFilterFrame.Name(), x0, menuBottom, x1, filterRowBottom, 0) + + prompt := menuFilterPrompt(self.menuFilterPromptCandidates(), contentWidth) + self.c.Views().MenuFilterFrame.SetContent(prompt) + // A view's content starts one column inside its bounds, so the input field + // starts one column to the left of where its text is to appear. + inputLeft := x0 + utils.StringWidth(prompt) + _, _ = self.c.GocuiGui().SetView(self.c.Views().MenuFilter.Name(), inputLeft, menuBottom, x1, filterRowBottom, 0) + + if menuContext.FilterStarted() { + tooltipTop = filterRowBottom + 1 + } + } tooltip := "" selectedItem := self.c.Contexts().Menu.GetSelected() if selectedItem != nil { diff --git a/pkg/gui/controllers/helpers/confirmation_helper_test.go b/pkg/gui/controllers/helpers/confirmation_helper_test.go new file mode 100644 index 000000000..fc62722d0 --- /dev/null +++ b/pkg/gui/controllers/helpers/confirmation_helper_test.go @@ -0,0 +1,31 @@ +package helpers + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestMenuFilterPrompt(t *testing.T) { + longPrompt := "Filter ('@' for keybindings): " + shortPrompt := "Filter: " + + tests := []struct { + name string + candidates []string + contentWidth int + expected string + }{ + {name: "room for four characters", candidates: []string{shortPrompt}, contentWidth: 12, expected: shortPrompt}, + {name: "room for three characters", candidates: []string{shortPrompt}, contentWidth: 11, expected: ""}, + {name: "prefers the first candidate", candidates: []string{longPrompt, shortPrompt}, contentWidth: 34, expected: longPrompt}, + {name: "falls back to the next one", candidates: []string{longPrompt, shortPrompt}, contentWidth: 33, expected: shortPrompt}, + {name: "measures display width", candidates: []string{"篩選: "}, contentWidth: 9, expected: ""}, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + assert.Equal(t, test.expected, menuFilterPrompt(test.candidates, test.contentWidth)) + }) + } +} diff --git a/pkg/gui/controllers/helpers/credentials_helper.go b/pkg/gui/controllers/helpers/credentials_helper.go index 9b2198ccb..7c765020e 100644 --- a/pkg/gui/controllers/helpers/credentials_helper.go +++ b/pkg/gui/controllers/helpers/credentials_helper.go @@ -33,7 +33,7 @@ func (self *CredentialsHelper) PromptUserForCredential(passOrUname oscommands.Cr HandleConfirm: func(input string) error { ch <- input + "\n" - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }, HandleClose: func() error { diff --git a/pkg/gui/controllers/helpers/diff_helper.go b/pkg/gui/controllers/helpers/diff_helper.go index 668ee916a..6af3b2b5c 100644 --- a/pkg/gui/controllers/helpers/diff_helper.go +++ b/pkg/gui/controllers/helpers/diff_helper.go @@ -94,7 +94,7 @@ func (self *DiffHelper) FilterPathsForCommit(commit *models.Commit) []string { func (self *DiffHelper) ExitDiffMode() error { self.c.Modes().Diffing = diffing.New() - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil } diff --git a/pkg/gui/controllers/helpers/drag_autoscroller.go b/pkg/gui/controllers/helpers/drag_autoscroller.go new file mode 100644 index 000000000..7ec6a9c76 --- /dev/null +++ b/pkg/gui/controllers/helpers/drag_autoscroller.go @@ -0,0 +1,154 @@ +package helpers + +import ( + "time" + + "github.com/jesseduffield/lazygit/pkg/gui/types" +) + +const ( + dragAutoscrollInitialDelay = 300 * time.Millisecond + dragAutoscrollSlowInterval = 250 * time.Millisecond + dragAutoscrollFastInterval = 100 * time.Millisecond + dragAutoscrollVeryFastInterval = 50 * time.Millisecond +) + +// All state is UI-thread-owned. Timer goroutines only enqueue tick back onto +// the UI thread, where generation changes and scroll callbacks are serialized +// with mouse handlers and focus changes. +type DragAutoscroller struct { + c *HelperCommon + context types.Context + + canScroll func(direction int) bool + onScroll func(viewIndex int) bool + + // Incremented whenever the scroll direction changes or the autoscroller + // is canceled. A scheduled tick carries the generation it was created + // for, so stale ticks can be told apart from the one that is current. + generation uint64 + direction int + interval time.Duration + // Last known pointer position relative to the viewport; used by ticks to + // compute which line ends up under the pointer after scrolling. + pointerViewportY int +} + +func NewDragAutoscroller( + c *HelperCommon, + context types.Context, + canScroll func(direction int) bool, + onScroll func(viewIndex int) bool, +) *DragAutoscroller { + return &DragAutoscroller{ + c: c, + context: context, + canScroll: canScroll, + onScroll: onScroll, + } +} + +// Update is called with the pointer position of every drag event. Entering a +// scroll zone arms a timer (with an initial delay, so that merely passing +// through the zone doesn't scroll); once armed, scrolling continues on its +// own until the pointer leaves the zone, the drag ends, or a callback stops +// it. +func (self *DragAutoscroller) Update(pointerViewportY int) { + _, viewportHeight := self.context.GetViewTrait().ViewPortYBounds() + direction, interval := dragAutoscrollZone(viewportHeight, pointerViewportY) + if direction != 0 && self.canScroll != nil && !self.canScroll(direction) { + direction = 0 + interval = 0 + } + + self.pointerViewportY = pointerViewportY + generation, schedule := self.updateState(direction, interval) + if schedule { + self.schedule(generation, dragAutoscrollInitialDelay) + } +} + +func (self *DragAutoscroller) Direction() int { + return self.direction +} + +func (self *DragAutoscroller) updateState(direction int, interval time.Duration) (uint64, bool) { + if direction == self.direction { + self.interval = interval + return self.generation, false + } + + self.generation++ + self.direction = direction + self.interval = interval + return self.generation, direction != 0 +} + +func (self *DragAutoscroller) Cancel() { + self.generation++ + self.direction = 0 + self.interval = 0 +} + +func (self *DragAutoscroller) schedule(generation uint64, delay time.Duration) { + time.AfterFunc(delay, func() { + self.c.OnUIThreadBackground(func() error { + self.tick(generation) + return nil + }) + }) +} + +func (self *DragAutoscroller) tick(generation uint64) { + if generation != self.generation { + return + } + if self.direction == 0 || + self.canScroll != nil && !self.canScroll(self.direction) { + self.Cancel() + return + } + + view := self.context.GetViewTrait() + oldOriginY, _ := view.ViewPortYBounds() + if self.direction < 0 { + view.ScrollUp(1) + } else { + view.ScrollDown(1) + } + newOriginY, _ := view.ViewPortYBounds() + if newOriginY == oldOriginY { + self.Cancel() + return + } + + if !self.onScroll(newOriginY + self.pointerViewportY) { + self.Cancel() + return + } + + self.schedule(generation, self.interval) +} + +// dragAutoscrollZone returns the scroll direction and tick interval for a +// pointer position: anything beyond the view scrolls very fast, the outermost +// viewport row scrolls fast, the row just inside it scrolls slowly, and anything +// further inside doesn't scroll at all. +func dragAutoscrollZone(viewportHeight int, pointerViewportY int) (int, time.Duration) { + switch { + case pointerViewportY < 0: + return -1, dragAutoscrollVeryFastInterval + case pointerViewportY == 0: + return -1, dragAutoscrollFastInterval + case pointerViewportY == 1: + return -1, dragAutoscrollSlowInterval + case pointerViewportY > viewportHeight-1: + return 1, dragAutoscrollVeryFastInterval + case pointerViewportY == viewportHeight-1: + return 1, dragAutoscrollFastInterval + case pointerViewportY == viewportHeight-2: + return 1, dragAutoscrollSlowInterval + default: + return 0, 0 + } +} diff --git a/pkg/gui/controllers/helpers/drag_autoscroller_test.go b/pkg/gui/controllers/helpers/drag_autoscroller_test.go new file mode 100644 index 000000000..40faa789e --- /dev/null +++ b/pkg/gui/controllers/helpers/drag_autoscroller_test.go @@ -0,0 +1,62 @@ +package helpers + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestDragAutoscrollZone(t *testing.T) { + testCases := []struct { + name string + pointerViewportY int + expectedDirection int + expectedInterval time.Duration + }{ + {name: "above view", pointerViewportY: -1, expectedDirection: -1, expectedInterval: dragAutoscrollVeryFastInterval}, + {name: "top outer row", pointerViewportY: 0, expectedDirection: -1, expectedInterval: dragAutoscrollFastInterval}, + {name: "top inner row", pointerViewportY: 1, expectedDirection: -1, expectedInterval: dragAutoscrollSlowInterval}, + {name: "middle", pointerViewportY: 5}, + {name: "bottom inner row", pointerViewportY: 8, expectedDirection: 1, expectedInterval: dragAutoscrollSlowInterval}, + {name: "bottom outer row", pointerViewportY: 9, expectedDirection: 1, expectedInterval: dragAutoscrollFastInterval}, + {name: "below view", pointerViewportY: 10, expectedDirection: 1, expectedInterval: dragAutoscrollVeryFastInterval}, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + direction, interval := dragAutoscrollZone(10, testCase.pointerViewportY) + + assert.Equal(t, testCase.expectedDirection, direction) + assert.Equal(t, testCase.expectedInterval, interval) + }) + } +} + +func TestDragAutoscrollerDoesNotRestartWhenMovingToOuterEdge(t *testing.T) { + self := &DragAutoscroller{ + generation: 1, + direction: 1, + interval: dragAutoscrollSlowInterval, + } + + generation, schedule := self.updateState(1, dragAutoscrollFastInterval) + + assert.Equal(t, uint64(1), generation) + assert.False(t, schedule) + assert.Equal(t, dragAutoscrollFastInterval, self.interval) +} + +func TestStaleDragAutoscrollTickDoesNotCancelCurrentGeneration(t *testing.T) { + self := &DragAutoscroller{ + generation: 4, + direction: 1, + interval: dragAutoscrollFastInterval, + } + + self.tick(2) + + assert.Equal(t, uint64(4), self.generation) + assert.Equal(t, 1, self.direction) + assert.Equal(t, dragAutoscrollFastInterval, self.interval) +} diff --git a/pkg/gui/controllers/helpers/fixup_helper.go b/pkg/gui/controllers/helpers/fixup_helper.go index dfde8365b..e998c2ad1 100644 --- a/pkg/gui/controllers/helpers/fixup_helper.go +++ b/pkg/gui/controllers/helpers/fixup_helper.go @@ -137,11 +137,10 @@ func (self *FixupHelper) HandleFindBaseCommitForFixupPress() error { if err := self.c.Git().WorkingTree.StageAll(true); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) } self.c.Contexts().LocalCommits.SetSelection(index) - self.c.Contexts().LocalCommits.FocusLine(true) self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) return nil }, @@ -199,12 +198,12 @@ func (self *FixupHelper) getDiff() (string, bool, error) { // Try staged changes first hasStagedChanges := true - diff, err := self.c.Git().Diff.DiffIndexCmdObj(append([]string{"--cached"}, args...)...).RunWithOutput() + diff, err := self.c.Git().Diff.DiffIndexCmdObj(append([]string{"--cached"}, args...)...).DontLog().RunWithOutput() if err == nil && diff == "" { hasStagedChanges = false // If there are no staged changes, try unstaged changes - diff, err = self.c.Git().Diff.DiffIndexCmdObj(args...).RunWithOutput() + diff, err = self.c.Git().Diff.DiffIndexCmdObj(args...).DontLog().RunWithOutput() } return diff, hasStagedChanges, err diff --git a/pkg/gui/controllers/helpers/gpg_helper.go b/pkg/gui/controllers/helpers/gpg_helper.go index afac52f13..9c7667a6d 100644 --- a/pkg/gui/controllers/helpers/gpg_helper.go +++ b/pkg/gui/controllers/helpers/gpg_helper.go @@ -3,9 +3,9 @@ package helpers import ( "fmt" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -19,11 +19,45 @@ func NewGpgHelper(c *HelperCommon) *GpgHelper { } } +func (self *GpgHelper) WithGpgHandling( + cmdObj *oscommands.CmdObj, + configKey git_commands.GpgConfigKey, + waitingStatus string, + onSuccess func() error, + refreshScope []types.RefreshableView, +) error { + refreshOptions := types.RefreshOptions{Scope: refreshScope} + return self.withGpgHandling( + cmdObj, configKey, waitingStatus, onSuccess, refreshOptions, refreshOptions) +} + +// WithGpgHandlingAndSelectHeadCommit is like WithGpgHandling, but on success it +// selects the new HEAD commit rather than restoring the previous selection. For +// committing, where the commit we just created is the one we want selected. +func (self *GpgHelper) WithGpgHandlingAndSelectHeadCommit( + cmdObj *oscommands.CmdObj, + configKey git_commands.GpgConfigKey, + waitingStatus string, + onSuccess func() error, +) error { + failureRefreshOptions := types.RefreshOptions{} + successRefreshOptions := types.RefreshOptions{CommitSelection: types.SelectHeadCommit} + return self.withGpgHandling( + cmdObj, configKey, waitingStatus, onSuccess, failureRefreshOptions, successRefreshOptions) +} + // Currently there is a bug where if we switch to a subprocess from within // WithWaitingStatus we get stuck there and can't return to lazygit. We could // fix this bug, or just stop running subprocesses from within there, given that // we don't need to see a loading status if we're in a subprocess. -func (self *GpgHelper) WithGpgHandling(cmdObj *oscommands.CmdObj, configKey git_commands.GpgConfigKey, waitingStatus string, onSuccess func() error, refreshScope []types.RefreshableView) error { +func (self *GpgHelper) withGpgHandling( + cmdObj *oscommands.CmdObj, + configKey git_commands.GpgConfigKey, + waitingStatus string, + onSuccess func() error, + failureRefreshOptions types.RefreshOptions, + successRefreshOptions types.RefreshOptions, +) error { useSubprocess := self.c.Git().Config.NeedsGpgSubprocess(configKey) if useSubprocess { success, err := self.c.RunSubprocess(cmdObj) @@ -32,18 +66,29 @@ func (self *GpgHelper) WithGpgHandling(cmdObj *oscommands.CmdObj, configKey git_ return err } } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: refreshScope}) + if success { + self.c.Refresh(successRefreshOptions) + } else { + self.c.Refresh(failureRefreshOptions) + } return err } - return self.runAndStream(cmdObj, waitingStatus, onSuccess, refreshScope) + return self.runAndStream( + cmdObj, waitingStatus, onSuccess, failureRefreshOptions, successRefreshOptions) } -func (self *GpgHelper) runAndStream(cmdObj *oscommands.CmdObj, waitingStatus string, onSuccess func() error, refreshScope []types.RefreshableView) error { +func (self *GpgHelper) runAndStream( + cmdObj *oscommands.CmdObj, + waitingStatus string, + onSuccess func() error, + failureRefreshOptions types.RefreshOptions, + successRefreshOptions types.RefreshOptions, +) error { return self.c.WithWaitingStatus(waitingStatus, func(gocui.Task) error { if err := cmdObj.StreamOutput().Run(); err != nil { - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: refreshScope}) + self.c.RefreshFromWorker(failureRefreshOptions) return fmt.Errorf( self.c.Tr.GitCommandFailed, self.c.UserConfig().Keybinding.Universal.ExtrasMenu, ) @@ -55,7 +100,7 @@ func (self *GpgHelper) runAndStream(cmdObj *oscommands.CmdObj, waitingStatus str } } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: refreshScope}) + self.c.RefreshFromWorker(successRefreshOptions) return nil }) } diff --git a/pkg/gui/controllers/helpers/inline_status_helper.go b/pkg/gui/controllers/helpers/inline_status_helper.go index 38a4e2cf7..814a11406 100644 --- a/pkg/gui/controllers/helpers/inline_status_helper.go +++ b/pkg/gui/controllers/helpers/inline_status_helper.go @@ -3,7 +3,7 @@ package helpers import ( "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -68,6 +68,14 @@ func (self *InlineStatusHelper) WithInlineStatus(opts InlineStatusOpts, f func(g visible := view.Visible && self.windowHelper.TopViewInWindow(context.GetWindowName(), false) == view if visible && context.IsItemVisible(opts.Item) { self.c.OnWorker(func(task gocui.Task) error { + // An inline status is just a waiting status rendered on the item + // rather than in the bottom line, so it gets the same treatment: + // pause the background routines while we drive the operation. (The + // off-screen branch below goes through WithWaitingStatus, which + // already does this.) + self.c.PauseBackgroundRefreshes(true) + defer self.c.PauseBackgroundRefreshes(false) + self.start(opts) defer self.stop(opts) @@ -130,26 +138,23 @@ func (self *InlineStatusHelper) stop(opts InlineStatusOpts) { self.c.State().ClearItemOperation(opts.Item) - // When recording a demo we need to re-render the context again here to - // remove the inline status. In normal usage we don't want to do this - // because in the case of pushing a branch this would first reveal the ↑3↓7 - // status from before the push for a brief moment, to be replaced by a green - // checkmark a moment later when the async refresh is done. This looks - // jarring, so normally we rely on the async refresh to redraw with the - // status removed. (In some rare cases, where there's no refresh at all, we - // need to redraw manually in the controller; see TagsController.push() for - // an example.) - // - // In demos, however, we turn all async refreshes into sync ones, because - // this looks better in demos. In this case the refresh happens while the - // status is still set, so we need to render again after removing it. - if self.c.InDemo() { - self.renderContext(opts.ContextKey) - } + // Re-render the context to remove the inline status now that the operation + // finished. The operation must trigger its refresh via RefreshFromWorker + // before we get here: that call returns only once the refresh's model + // updates have been enqueued on the UI thread, and since UI-thread + // callbacks run in order, the render we queue here runs after them and + // draws the up-to-date model without the inline status. A refresh whose + // model updates aren't enqueued yet by this point would make this render + // briefly show the stale, pre-operation model: when pushing a branch, for + // example, it would flash the old ↑3↓7 ahead/behind counts for a moment + // before the refresh replaced them with a green checkmark. (Operations + // that don't refresh at all are fine too: there's nothing stale to show, + // so this just drops the status.) + self.renderContext(opts.ContextKey) } func (self *InlineStatusHelper) renderContext(contextKey types.ContextKey) { - self.c.OnUIThread(func() error { + self.c.OnUIThreadContentOnly(func() error { self.c.ContextForKey(contextKey).HandleRender() return nil }) diff --git a/pkg/gui/controllers/helpers/menu_key.go b/pkg/gui/controllers/helpers/menu_key.go new file mode 100644 index 000000000..d4271fa5b --- /dev/null +++ b/pkg/gui/controllers/helpers/menu_key.go @@ -0,0 +1,11 @@ +package helpers + +import "github.com/jesseduffield/lazygit/pkg/gocui" + +// menuKey is a shorthand for constructing a key value for a menu item from a single rune literal, +// avoiding the noise of `[]gocui.Key{gocui.NewKeyRune('a')}` at every call site. There is an +// intentionally identical helper in the controllers package so that callers in either package can +// use the unqualified form. +func menuKey(r rune) []gocui.Key { + return []gocui.Key{gocui.NewKeyRune(r)} +} diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index 7d4f0a96a..8f27efa08 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -18,6 +18,13 @@ import ( type MergeAndRebaseHelper struct { c *HelperCommon + + // Whether the "continue the rebase/merge?" prompt is currently on screen. + // We use this to auto-dismiss it if the operation stops being in the state + // that the prompt is offering to act on (e.g. it was continued or aborted + // externally), so the user isn't left with a stale prompt. Only accessed on + // the UI thread. + continueRebasePromptShowing bool } func NewMergeAndRebaseHelper( @@ -39,17 +46,17 @@ const ( func (self *MergeAndRebaseHelper) CreateRebaseOptionsMenu() error { type optionAndKey struct { option string - key types.Key + keys []gocui.Key } options := []optionAndKey{ - {option: REBASE_OPTION_CONTINUE, key: 'c'}, - {option: REBASE_OPTION_ABORT, key: 'a'}, + {option: REBASE_OPTION_CONTINUE, keys: menuKey('c')}, + {option: REBASE_OPTION_ABORT, keys: menuKey('a')}, } if self.c.Git().Status.WorkingTreeState().CanSkip() { options = append(options, optionAndKey{ - option: REBASE_OPTION_SKIP, key: 's', + option: REBASE_OPTION_SKIP, keys: menuKey('s'), }) } @@ -59,7 +66,7 @@ func (self *MergeAndRebaseHelper) CreateRebaseOptionsMenu() error { OnPress: func() error { return self.genericMergeCommand(row.option) }, - Key: row.key, + Keys: row.keys, } }) @@ -72,6 +79,22 @@ func (self *MergeAndRebaseHelper) ContinueRebase() error { } func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error { + // The menu/prompt/confirm handlers that reach here run on the UI thread and + // spin up a worker (via the waiting status below) to do the actual work. + return self.genericMergeCommandImpl(command, true, false) +} + +// genericMergeCommandImpl runs a merge/rebase continue/skip/abort and handles +// the result. Continuing can be slow (it may replay many commits), so the +// non-subprocess path runs on a worker with a waiting status. +// +// showWaitingStatus is false only for the recursive auto-skip in +// CheckMergeOrRebaseWithRefreshOptions, which already runs on a worker, so it +// must not spin up a second waiting status. calledFromWorker is used only by the +// subprocess path below: it's true for that recursive worker skip and false for +// genericMergeCommand's UI-thread invocation, so the post-action refresh picks +// RefreshFromWorker vs Refresh correctly. +func (self *MergeAndRebaseHelper) genericMergeCommandImpl(command string, showWaitingStatus bool, calledFromWorker bool) error { status := self.c.Git().Status.WorkingTreeState() if status.None() { @@ -95,6 +118,8 @@ func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error { } commandType := status.CommandName() + selectHeadCommitOnSuccess := command == REBASE_OPTION_CONTINUE && + effectiveStatus == models.WORKING_TREE_STATE_MERGING // we should end up with a command like 'git merge --continue' @@ -102,31 +127,71 @@ func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error { needsSubprocess := (effectiveStatus == models.WORKING_TREE_STATE_MERGING && command != REBASE_OPTION_ABORT && self.c.UserConfig().Git.Merging.ManualCommit) || // but we'll also use a subprocess if we have exec todos; those are likely to be lengthy build // tasks whose output the user will want to see in the terminal - (effectiveStatus == models.WORKING_TREE_STATE_REBASING && command != REBASE_OPTION_ABORT && self.hasExecTodos()) + (effectiveStatus == models.WORKING_TREE_STATE_REBASING && command != REBASE_OPTION_ABORT && self.hasExecTodos(calledFromWorker)) if needsSubprocess { // TODO: see if we should be calling more of the code from self.Git.Rebase.GenericMergeOrRebaseAction - return self.c.RunSubprocessAndRefresh( - self.c.Git().Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command), - ) - } - result := self.c.Git().Rebase.GenericMergeOrRebaseAction(commandType, command) - if err := self.CheckMergeOrRebase(result); err != nil { + success, err := self.c.RunSubprocess(self.c.Git().Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command)) + self.refreshAfterMergeOrRebase(types.RefreshOptions{ + CommitSelection: commitSelectionAfterMerge(success && selectHeadCommitOnSuccess), + }, calledFromWorker) + self.RecordWhetherMergeOrRebaseStartedInLazygit() return err } - return nil + + // runAction always ends up on a worker: either the waiting status below spins + // one up, or we're the recursive auto-skip reached from + // CheckMergeOrRebaseWithRefreshOptions, which already runs on one. + runAction := func() error { + result := self.c.Git().Rebase.GenericMergeOrRebaseAction(commandType, command) + return self.CheckMergeOrRebaseWithRefreshOptions(result, + types.RefreshOptions{ + CommitSelection: commitSelectionAfterMerge(result == nil && selectHeadCommitOnSuccess), + }) + } + + if showWaitingStatus { + return self.c.WithWaitingStatus(status.Title(self.c.Tr), func(gocui.Task) error { + return runAction() + }) + } + return runAction() } -func (self *MergeAndRebaseHelper) hasExecTodos() bool { - for _, commit := range self.c.Model().Commits { - if !commit.IsTODO() { - break - } - if commit.Action == todo.Exec { - return true - } +// commitSelectionAfterMerge maps whether a merge/rebase/pull created a new +// commit at HEAD to the corresponding commit-selection behavior: select that +// new commit, or otherwise keep the previous selection by hash. +func commitSelectionAfterMerge(createdNewCommit bool) types.CommitSelectionBehavior { + if createdNewCommit { + return types.SelectHeadCommit } - return false + return types.KeepCommitSelectionByHash +} + +func (self *MergeAndRebaseHelper) hasExecTodos(calledFromWorker bool) bool { + check := func() bool { + for _, commit := range self.c.Model().Commits { + if !commit.IsTODO() { + break + } + if commit.Action == todo.Exec { + return true + } + } + return false + } + + // This reads the model, which is only safe on the UI thread, so bounce there + // when we're being called from a worker. + if !calledFromWorker { + return check() + } + + result := false + _ = self.c.GocuiGui().OnUIThreadAndWait(func() { + result = check() + }) + return result } var conflictStrings = []string{ @@ -149,15 +214,30 @@ func isMergeConflictErr(errStr string) bool { return false } +// RecordWhetherMergeOrRebaseStartedInLazygit is called right after we run a +// merge/rebase/cherry-pick/revert step. If it left an operation in progress, +// that operation is one we started, which is what later lets us auto-prompt to +// continue it once its conflicts are resolved. If nothing is in progress +// anymore (the step completed or aborted the operation), we clear the flag. +func (self *MergeAndRebaseHelper) RecordWhetherMergeOrRebaseStartedInLazygit() { + self.c.State().GetRepoState().SetMergeOrRebaseStartedInLazygit( + self.c.Git().Status.WorkingTreeState().Any()) +} + +// CheckMergeOrRebaseWithRefreshOptions handles the result of a merge/rebase +// step and refreshes. It always runs on a worker (the WithWaitingStatus / +// WithWaitingStatusBlockingInput / WithInlineStatus handlers). func (self *MergeAndRebaseHelper) CheckMergeOrRebaseWithRefreshOptions(result error, refreshOptions types.RefreshOptions) error { - self.c.Refresh(refreshOptions) + self.refreshAfterMergeOrRebase(refreshOptions, true) + + self.RecordWhetherMergeOrRebaseStartedInLazygit() if result == nil { return nil } else if strings.Contains(result.Error(), "No changes - did you forget to use") { - return self.genericMergeCommand(REBASE_OPTION_SKIP) + return self.genericMergeCommandImpl(REBASE_OPTION_SKIP, false, true) } else if strings.Contains(result.Error(), "The previous cherry-pick is now empty") { - return self.genericMergeCommand(REBASE_OPTION_SKIP) + return self.genericMergeCommandImpl(REBASE_OPTION_SKIP, false, true) } else if strings.Contains(result.Error(), "No rebase in progress?") { // assume in this case that we're already done return nil @@ -165,8 +245,29 @@ func (self *MergeAndRebaseHelper) CheckMergeOrRebaseWithRefreshOptions(result er return self.CheckForConflicts(result) } +// refreshAfterMergeOrRebase issues the post-action refresh on the entry point +// that matches the thread the merge/rebase ran on: RefreshFromWorker for the +// worker callers, Refresh for the merge/rebase-continue subprocess path that +// stays on the UI thread. +func (self *MergeAndRebaseHelper) refreshAfterMergeOrRebase(refreshOptions types.RefreshOptions, calledFromWorker bool) { + if calledFromWorker { + self.c.RefreshFromWorker(refreshOptions) + } else { + self.c.Refresh(refreshOptions) + } +} + func (self *MergeAndRebaseHelper) CheckMergeOrRebase(result error) error { - return self.CheckMergeOrRebaseWithRefreshOptions(result, types.RefreshOptions{Mode: types.ASYNC}) + return self.CheckMergeOrRebaseWithRefreshOptions(result, types.RefreshOptions{}) +} + +// Like CheckMergeOrRebase, but for operations that create a new commit at HEAD +// (a merge, or a pull that merges): on success it selects that new commit, +// which the keep-selection-by-hash logic can't do since the commit didn't exist +// before the refresh. +func (self *MergeAndRebaseHelper) CheckMergeOrRebaseAndSelectHeadCommit(result error) error { + return self.CheckMergeOrRebaseWithRefreshOptions(result, + types.RefreshOptions{CommitSelection: commitSelectionAfterMerge(result == nil)}) } func (self *MergeAndRebaseHelper) CheckForConflicts(result error) error { @@ -198,7 +299,7 @@ func (self *MergeAndRebaseHelper) PromptForConflictHandling() error { OnPress: func() error { return self.genericMergeCommand(REBASE_OPTION_ABORT) }, - Key: 'a', + Keys: menuKey('a'), }, }, HideCancel: true, @@ -220,11 +321,18 @@ func (self *MergeAndRebaseHelper) AbortMergeOrRebaseWithConfirm() error { } // PromptToContinueRebase asks the user if they want to continue the rebase/merge that's in progress -func (self *MergeAndRebaseHelper) PromptToContinueRebase() error { +func (self *MergeAndRebaseHelper) PromptToContinueRebase() { + self.continueRebasePromptShowing = true self.c.Confirm(types.ConfirmOpts{ Title: self.c.Tr.Continue, Prompt: fmt.Sprintf(self.c.Tr.ConflictsResolved, self.c.Git().Status.WorkingTreeState().CommandName()), + HandleClose: func() error { + self.continueRebasePromptShowing = false + return nil + }, HandleConfirm: func() error { + self.continueRebasePromptShowing = false + // By the time we get here, we might have unstaged changes again, // e.g. if the user had to fix build errors after resolving the // conflicts, but after lazygit opened the prompt already. Ask again @@ -233,33 +341,59 @@ func (self *MergeAndRebaseHelper) PromptToContinueRebase() error { // Need to refresh the files to be really sure if this is the case. // We would otherwise be relying on lazygit's auto-refresh on focus, // but this is not supported by all terminals or on all platforms. + // + // The model.Files update is bounced onto the UI thread, so we have + // to read it in Then; reading it inline here would see the previous + // model. self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}, + Scope: []types.RefreshableView{types.FILES}, + Then: func() error { + unstagedFiles := GetUnstagedFilesExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) + if len(unstagedFiles) > 0 { + self.c.Confirm(types.ConfirmOpts{ + Title: self.c.Tr.Continue, + Prompt: self.c.Tr.UnstagedFilesAfterConflictsResolved, + HandleConfirm: func() error { + self.c.LogAction(self.c.Tr.Actions.StageAllFiles) + if err := self.c.Git().WorkingTree.StageFiles(unstagedFiles, []string{}); err != nil { + return err + } + + return self.genericMergeCommand(REBASE_OPTION_CONTINUE) + }, + }) + + return nil + } + + return self.genericMergeCommand(REBASE_OPTION_CONTINUE) + }, }) - root := self.c.Contexts().Files.FileTreeViewModel.GetRoot() - if root.GetHasUnstagedChanges() { - self.c.Confirm(types.ConfirmOpts{ - Title: self.c.Tr.Continue, - Prompt: self.c.Tr.UnstagedFilesAfterConflictsResolved, - HandleConfirm: func() error { - self.c.LogAction(self.c.Tr.Actions.StageAllFiles) - if err := self.c.Git().WorkingTree.StageAll(true); err != nil { - return err - } - - return self.genericMergeCommand(REBASE_OPTION_CONTINUE) - }, - }) - - return nil - } - - return self.genericMergeCommand(REBASE_OPTION_CONTINUE) + return nil }, }) +} - return nil +// DismissContinueRebasePromptIfShowing closes the "continue the rebase/merge?" +// prompt if it's currently on screen. It's called when the operation is no +// longer in the state the prompt is offering to act on (e.g. it was continued +// or aborted outside lazygit, or new conflicts have appeared), so that the +// user isn't left with a prompt whose "continue" would now be wrong or fail. +// Must be called on the UI thread. +func (self *MergeAndRebaseHelper) DismissContinueRebasePromptIfShowing() { + if !self.continueRebasePromptShowing { + return + } + + self.continueRebasePromptShowing = false + + // Guard against popping something else: while our prompt is up no other + // popup can open, and confirming or closing it would have cleared the flag, + // so if it's set the confirmation context is ours. + if self.c.Context().Current() == self.c.Contexts().Confirmation { + self.c.Context().Pop() + } } func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { @@ -284,12 +418,12 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { Label: utils.ResolvePlaceholderString(self.c.Tr.SimpleRebase, map[string]string{"ref": ref}, ), - Key: 's', + Keys: menuKey('s'), DisabledReason: disabledReason, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.RebaseBranch) + baseCommit := self.c.Modes().MarkedBaseCommit.GetHash() return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error { - baseCommit := self.c.Modes().MarkedBaseCommit.GetHash() var err error if baseCommit != "" { err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(ref, baseCommit) @@ -298,7 +432,9 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { } err = self.CheckMergeOrRebase(err) if err == nil { - return self.ResetMarkedBaseCommit() + self.c.OnUIThread(func() error { + return self.ResetMarkedBaseCommit() + }) } return err }) @@ -308,39 +444,44 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { Label: utils.ResolvePlaceholderString(self.c.Tr.InteractiveRebase, map[string]string{"ref": ref}, ), - Key: 'i', + Keys: menuKey('i'), DisabledReason: disabledReason, Tooltip: self.c.Tr.InteractiveRebaseTooltip, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.RebaseBranch) baseCommit := self.c.Modes().MarkedBaseCommit.GetHash() - var err error - if baseCommit != "" { - err = self.c.Git().Rebase.EditRebaseFromBaseCommit(ref, baseCommit) - } else { - err = self.c.Git().Rebase.EditRebase(ref) - } - if err = self.CheckMergeOrRebase(err); err != nil { - return err - } - if err = self.ResetMarkedBaseCommit(); err != nil { - return err - } - self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) - return nil + return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error { + var err error + if baseCommit != "" { + err = self.c.Git().Rebase.EditRebaseFromBaseCommit(ref, baseCommit) + } else { + err = self.c.Git().Rebase.EditRebase(ref) + } + if err = self.CheckMergeOrRebase(err); err != nil { + return err + } + self.c.OnUIThread(func() error { + if err := self.ResetMarkedBaseCommit(); err != nil { + return err + } + self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) + return nil + }) + return nil + }) }, }, { Label: utils.ResolvePlaceholderString(self.c.Tr.RebaseOntoBaseBranch, map[string]string{"baseBranch": ShortBranchName(baseBranch)}, ), - Key: 'b', + Keys: menuKey('b'), DisabledReason: baseBranchDisabledReason, Tooltip: self.c.Tr.RebaseOntoBaseBranchTooltip, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.RebaseBranch) + baseCommit := self.c.Modes().MarkedBaseCommit.GetHash() return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error { - baseCommit := self.c.Modes().MarkedBaseCommit.GetHash() var err error if baseCommit != "" { err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(baseBranch, baseCommit) @@ -349,7 +490,9 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { } err = self.CheckMergeOrRebase(err) if err == nil { - return self.ResetMarkedBaseCommit() + self.c.OnUIThread(func() error { + return self.ResetMarkedBaseCommit() + }) } return err }) @@ -392,7 +535,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e firstRegularMergeItem = &types.MenuItem{ Label: self.c.Tr.RegularMergeFastForward, OnPress: self.RegularMerge(refName, git_commands.MERGE_VARIANT_REGULAR), - Key: 'm', + Keys: menuKey('m'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.RegularMergeFastForwardTooltip, map[string]string{ @@ -406,7 +549,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e secondRegularMergeItem = &types.MenuItem{ Label: self.c.Tr.RegularMergeNonFastForward, OnPress: self.RegularMerge(refName, git_commands.MERGE_VARIANT_NON_FAST_FORWARD), - Key: 'n', + Keys: menuKey('n'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.RegularMergeNonFastForwardTooltip, map[string]string{ @@ -419,7 +562,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e firstRegularMergeItem = &types.MenuItem{ Label: self.c.Tr.RegularMergeNonFastForward, OnPress: self.RegularMerge(refName, git_commands.MERGE_VARIANT_REGULAR), - Key: 'm', + Keys: menuKey('m'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.RegularMergeNonFastForwardTooltip, map[string]string{ @@ -432,7 +575,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e secondRegularMergeItem = &types.MenuItem{ Label: self.c.Tr.RegularMergeFastForward, OnPress: self.RegularMerge(refName, git_commands.MERGE_VARIANT_FAST_FORWARD), - Key: 'f', + Keys: menuKey('f'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.RegularMergeFastForwardTooltip, map[string]string{ @@ -464,7 +607,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e { Label: self.c.Tr.SquashMergeUncommitted, OnPress: self.SquashMergeUncommitted(refName), - Key: 's', + Keys: menuKey('s'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.SquashMergeUncommittedTooltip, map[string]string{ @@ -475,7 +618,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e { Label: self.c.Tr.SquashMergeCommitted, OnPress: self.SquashMergeCommitted(refName, checkedOutBranchName), - Key: 'S', + Keys: menuKey('S'), Tooltip: utils.ResolvePlaceholderString( self.c.Tr.SquashMergeCommittedTooltip, map[string]string{ @@ -491,36 +634,42 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e func (self *MergeAndRebaseHelper) RegularMerge(refName string, variant git_commands.MergeVariant) func() error { return func() error { self.c.LogAction(self.c.Tr.Actions.Merge) - err := self.c.Git().Branch.Merge(refName, variant) - return self.CheckMergeOrRebase(err) + return self.c.WithWaitingStatus(self.c.Tr.MergingStatus, func(gocui.Task) error { + err := self.c.Git().Branch.Merge(refName, variant) + return self.CheckMergeOrRebaseAndSelectHeadCommit(err) + }) } } func (self *MergeAndRebaseHelper) SquashMergeUncommitted(refName string) func() error { return func() error { self.c.LogAction(self.c.Tr.Actions.SquashMerge) - err := self.c.Git().Branch.Merge(refName, git_commands.MERGE_VARIANT_SQUASH) - return self.CheckMergeOrRebase(err) + return self.c.WithWaitingStatus(self.c.Tr.MergingStatus, func(gocui.Task) error { + err := self.c.Git().Branch.Merge(refName, git_commands.MERGE_VARIANT_SQUASH) + return self.CheckMergeOrRebase(err) + }) } } func (self *MergeAndRebaseHelper) SquashMergeCommitted(refName, checkedOutBranchName string) func() error { return func() error { self.c.LogAction(self.c.Tr.Actions.SquashMerge) - err := self.c.Git().Branch.Merge(refName, git_commands.MERGE_VARIANT_SQUASH) - if err = self.CheckMergeOrRebase(err); err != nil { - return err - } - message := utils.ResolvePlaceholderString(self.c.UserConfig().Git.Merging.SquashMergeMessage, map[string]string{ - "selectedRef": refName, - "currentBranch": checkedOutBranchName, + return self.c.WithWaitingStatus(self.c.Tr.MergingStatus, func(gocui.Task) error { + err := self.c.Git().Branch.Merge(refName, git_commands.MERGE_VARIANT_SQUASH) + if err = self.CheckMergeOrRebase(err); err != nil { + return err + } + message := utils.ResolvePlaceholderString(self.c.UserConfig().Git.Merging.SquashMergeMessage, map[string]string{ + "selectedRef": refName, + "currentBranch": checkedOutBranchName, + }) + err = self.c.Git().Commit.CommitCmdObj(message, "", false).Run() + if err != nil { + return err + } + self.c.RefreshFromWorker(types.RefreshOptions{}) + return nil }) - err = self.c.Git().Commit.CommitCmdObj(message, "", false).Run() - if err != nil { - return err - } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) - return nil } } diff --git a/pkg/gui/controllers/helpers/merge_conflicts_helper.go b/pkg/gui/controllers/helpers/merge_conflicts_helper.go index 6e6a01531..3928ecebf 100644 --- a/pkg/gui/controllers/helpers/merge_conflicts_helper.go +++ b/pkg/gui/controllers/helpers/merge_conflicts_helper.go @@ -1,6 +1,7 @@ package helpers import ( + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -17,14 +18,14 @@ func NewMergeConflictsHelper( } } -func (self *MergeConflictsHelper) SetMergeState(path string) (bool, error) { +func (self *MergeConflictsHelper) SetMergeState(file *models.File) (bool, error) { self.context().GetMutex().Lock() defer self.context().GetMutex().Unlock() - return self.setMergeStateWithoutLock(path) + return self.setMergeStateWithoutLock(file.Path, file.ConflictMarkerSize) } -func (self *MergeConflictsHelper) setMergeStateWithoutLock(path string) (bool, error) { +func (self *MergeConflictsHelper) setMergeStateWithoutLock(path string, markerSize int) (bool, error) { content, err := self.c.Git().File.Cat(path) if err != nil { return false, err @@ -34,7 +35,7 @@ func (self *MergeConflictsHelper) setMergeStateWithoutLock(path string) (bool, e self.context().SetUserScrolling(false) } - self.context().GetState().SetContent(content, path) + self.context().GetState().SetContent(content, path, markerSize) return !self.context().GetState().NoConflicts(), nil } @@ -51,26 +52,29 @@ func (self *MergeConflictsHelper) resetMergeState() { self.context().GetState().Reset() } -func (self *MergeConflictsHelper) EscapeMerge() error { - self.resetMergeState() +// EscapeMerge returns from the merge conflicts view to the files context. It +// must be called on the UI thread, without the merge-conflicts mutex held: +// pushing the files context renders the newly focused file to the main view, +// which can take the mutex again (via SetMergeState). +func (self *MergeConflictsHelper) EscapeMerge() { + self.ResetMergeState() - // doing this in separate UI thread so that we're not still holding the lock by the time refresh the file - self.c.OnUIThread(func() error { - // There is a race condition here: refreshing the files scope can trigger the - // confirmation context to be pushed if all conflicts are resolved (prompting - // to continue the merge/rebase. In that case, we don't want to then push the - // files context over it. - // So long as both places call OnUIThread, we're fine. - if self.c.Context().IsCurrent(self.c.Contexts().MergeConflicts) { - self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{}) - } - return nil - }) - return nil + // The files refresh may already have opened the prompt to continue the + // rebase/merge on top of us (if all conflicts are resolved); in that case + // don't push the files context over it. + if self.c.Context().IsCurrent(self.c.Contexts().MergeConflicts) { + self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{}) + } } -func (self *MergeConflictsHelper) SetConflictsAndRender(path string) (bool, error) { - hasConflicts, err := self.setMergeStateWithoutLock(path) +// SetConflictsAndRender re-reads the file being merged and re-renders the +// merge conflicts view. Returns whether the file still has conflicts. +func (self *MergeConflictsHelper) SetConflictsAndRender() (bool, error) { + self.context().GetMutex().Lock() + defer self.context().GetMutex().Unlock() + + state := self.context().GetState() + hasConflicts, err := self.setMergeStateWithoutLock(state.GetPath(), state.GetMarkerSize()) if err != nil { return false, err } @@ -82,9 +86,9 @@ func (self *MergeConflictsHelper) SetConflictsAndRender(path string) (bool, erro return false, nil } -func (self *MergeConflictsHelper) SwitchToMerge(path string) error { - if self.context().GetState().GetPath() != path { - hasConflicts, err := self.SetMergeState(path) +func (self *MergeConflictsHelper) SwitchToMerge(file *models.File) error { + if self.context().GetState().GetPath() != file.Path { + hasConflicts, err := self.SetMergeState(file) if err != nil { return err } @@ -121,20 +125,17 @@ func (self *MergeConflictsHelper) Render() { } func (self *MergeConflictsHelper) RefreshMergeState() error { - self.c.Contexts().MergeConflicts.GetMutex().Lock() - defer self.c.Contexts().MergeConflicts.GetMutex().Unlock() - if self.c.Context().Current().GetKey() != context.MERGE_CONFLICTS_CONTEXT_KEY { return nil } - hasConflicts, err := self.SetConflictsAndRender(self.c.Contexts().MergeConflicts.GetState().GetPath()) + hasConflicts, err := self.SetConflictsAndRender() if err != nil { return err } if !hasConflicts { - return self.EscapeMerge() + self.EscapeMerge() } return nil diff --git a/pkg/gui/controllers/helpers/mode_helper.go b/pkg/gui/controllers/helpers/mode_helper.go index e44d7b01b..68f7ea149 100644 --- a/pkg/gui/controllers/helpers/mode_helper.go +++ b/pkg/gui/controllers/helpers/mode_helper.go @@ -4,6 +4,7 @@ import ( "fmt" "strings" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" @@ -12,12 +13,12 @@ import ( type ModeHelper struct { c *HelperCommon - diffHelper *DiffHelper - patchBuildingHelper *PatchBuildingHelper - cherryPickHelper *CherryPickHelper - mergeAndRebaseHelper *MergeAndRebaseHelper - bisectHelper *BisectHelper - suppressRebasingMode bool + diffHelper *DiffHelper + patchBuildingHelper *PatchBuildingHelper + cherryPickHelper *CherryPickHelper + mergeAndRebaseHelper *MergeAndRebaseHelper + bisectHelper *BisectHelper + suppressWorkingTreeStateMode bool } func NewModeHelper( @@ -130,7 +131,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { }, { IsActive: func() bool { - return !self.suppressRebasingMode && self.c.Git().Status.WorkingTreeState().Any() + return !self.suppressWorkingTreeStateMode && self.c.Git().Status.WorkingTreeState().Any() }, InfoLabel: func() string { workingTreeState := self.c.Git().Status.WorkingTreeState() @@ -182,16 +183,39 @@ func (self *ModeHelper) ExitFilterMode() error { return self.ClearFiltering() } +func (self *ModeHelper) SetFilteringPath(path string) error { + return self.setFiltering(func() { + self.c.Modes().Filtering.SetPath(path) + }) +} + +func (self *ModeHelper) SetFilteringAuthor(author string) error { + return self.setFiltering(func() { + self.c.Modes().Filtering.SetAuthor(author) + }) +} + +func (self *ModeHelper) setFiltering(setFilter func()) error { + return self.changeFiltering( + func() { + // Whatever we were filtering by before is replaced, not added to + self.c.Modes().Filtering.Reset() + setFilter() + self.c.Modes().Filtering.SetSelectedCommitHash( + self.c.Contexts().LocalCommits.GetSelectedCommitHash()) + }, + func() { + self.c.Contexts().LocalCommits.SetSelection(0) + }, + ) +} + func (self *ModeHelper) ClearFiltering() error { selectedCommitHash := self.c.Contexts().LocalCommits.GetSelectedCommitHash() - self.c.Modes().Filtering.Reset() - if self.c.State().GetRepoState().GetScreenMode() == types.SCREEN_HALF { - self.c.State().GetRepoState().SetScreenMode(types.SCREEN_NORMAL) - } - self.c.Refresh(types.RefreshOptions{ - Scope: ScopesToRefreshWhenFilteringModeChanges(), - Then: func() { + return self.changeFiltering( + self.c.Modes().Filtering.Reset, + func() { // Find the commit that was last selected in filtering mode, and select it again after refreshing if !self.c.Contexts().LocalCommits.SelectCommitByHash(selectedCommitHash) { // If we couldn't find it (either because no commit was selected @@ -200,11 +224,57 @@ func (self *ModeHelper) ClearFiltering() error { // before we entered filtering self.c.Contexts().LocalCommits.SelectCommitByHash(self.c.Modes().Filtering.GetSelectedCommitHash()) } - - self.c.PostRefreshUpdate(self.c.Contexts().LocalCommits) }, + ) +} + +// changeFiltering applies a change to the filtering mode: setFilter mutates the +// mode, then the views whose contents depend on the filter are reloaded, and +// selectCommit puts the selection where it belongs in the reloaded commit list. +// +// Reloading the commit list can take seconds in a big repo, so it happens on a +// worker with a waiting status. Everything the user can see of the change waits +// for it: the screen mode, the focused panel and the reloaded lists all land in +// the same frame, from the refresh's Then, rather than framing an unfiltered +// list as if it were the filtered one. Until then the pre-change state stays on +// screen, and it stays consistent, because the only thing that has changed +// behind it is the filter that the reload is in the middle of applying. The one +// thing that can't wait is the mode indicator in the information panel: the +// filter has to be set before the reload can use it, so the indicator leads the +// lists by however long the reload takes. +// +// Input is blocked for the duration: the keys the user presses arrive after the +// change, which is where they meant them to go, and it keeps a second filter +// change from racing this one — they would both refresh with whichever filter +// happened to be set when their git commands ran. +func (self *ModeHelper) changeFiltering(setFilter func(), selectCommit func()) error { + setFilter() + + filtering := self.c.Modes().Filtering.Active() + message := lo.Ternary(filtering, self.c.Tr.ApplyingFilterStatus, self.c.Tr.RemovingFilterStatus) + + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{Message: message}, func(gocui.Task) error { + self.c.RefreshFromWorker(types.RefreshOptions{ + Scope: ScopesToRefreshWhenFilteringModeChanges(), + BatchUIUpdates: true, + Then: func() error { + repoState := self.c.State().GetRepoState() + if filtering { + if repoState.GetScreenMode() == types.SCREEN_NORMAL { + repoState.SetScreenMode(types.SCREEN_HALF) + } + self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{}) + } else if repoState.GetScreenMode() == types.SCREEN_HALF { + repoState.SetScreenMode(types.SCREEN_NORMAL) + } + + selectCommit() + self.c.PostRefreshUpdate(self.c.Contexts().LocalCommits) + return nil + }, + }) + return nil }) - return nil } // Stashes really only need to be refreshed when filtering by path, not by author, but it's too much @@ -218,6 +288,6 @@ func ScopesToRefreshWhenFilteringModeChanges() []types.RefreshableView { } } -func (self *ModeHelper) SetSuppressRebasingMode(value bool) { - self.suppressRebasingMode = value +func (self *ModeHelper) SetSuppressWorkingTreeStateMode(value bool) { + self.suppressWorkingTreeStateMode = value } diff --git a/pkg/gui/controllers/helpers/patch_building_helper.go b/pkg/gui/controllers/helpers/patch_building_helper.go index fd5136b8a..ac79ee8d7 100644 --- a/pkg/gui/controllers/helpers/patch_building_helper.go +++ b/pkg/gui/controllers/helpers/patch_building_helper.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/jesseduffield/lazygit/pkg/commands/patch" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/patch_exploring" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -26,8 +25,7 @@ func (self *PatchBuildingHelper) ShowHunkStagingHint() { self.c.AppState.DidShowHunkStagingHint = true self.c.SaveAppStateAndLogError() - message := fmt.Sprintf(self.c.Tr.HunkStagingHint, - keybindings.Label(self.c.UserConfig().Keybinding.Main.ToggleSelectHunk)) + message := fmt.Sprintf(self.c.Tr.HunkStagingHint, self.c.UserConfig().Keybinding.Main.ToggleSelectHunk) self.c.Confirm(types.ConfirmOpts{ Prompt: message, }) @@ -68,20 +66,21 @@ func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpt } // get diff from commit file that's currently selected - path := self.c.Contexts().CommitFiles.GetSelectedPath() - if path == "" { + file := self.c.Contexts().CommitFiles.GetSelectedFile() + if file == nil { return } from, to := self.c.Contexts().CommitFiles.GetFromAndToForDiff() from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from) - diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, path, true) + diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, file.Path, file.PreviousPath, true) if err != nil { return } secondaryDiff := self.c.Git().Patch.PatchBuilder.RenderPatchForFile(patch.RenderPatchForFileOpts{ - Filename: path, + Filename: file.Path, + PreviousPath: file.PreviousPath, Plain: false, Reverse: false, TurnAddedFilesIntoDiffAgainstEmptyFile: true, diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 332b38091..730ed9a24 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -1,21 +1,29 @@ package helpers import ( + "path/filepath" "strings" "sync" + "sync/atomic" "time" "github.com/jesseduffield/generics/set" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" + "github.com/jesseduffield/lazygit/pkg/commands/hosting_service" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" + "github.com/jesseduffield/lazygit/pkg/gui/context/traits" "github.com/jesseduffield/lazygit/pkg/gui/filetree" "github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts" "github.com/jesseduffield/lazygit/pkg/gui/presentation" + "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" + "github.com/sasha-s/go-deadlock" ) type RefreshHelper struct { @@ -27,6 +35,27 @@ type RefreshHelper struct { mergeConflictsHelper *MergeConflictsHelper worktreeHelper *WorktreeHelper searchHelper *SearchHelper + + // Tracks repos for which the user has dismissed the "select base GitHub remote" + // prompt, to avoid re-prompting on every subsequent refresh within the same session. + // Keyed by repo path so that switching to a different repo while lazygit is running + // still triggers the prompt there. + githubBaseRemotePromptDismissed map[string]bool + + // Last observed refs+HEAD fingerprint, used by the background poller to + // decide whether a real refresh is needed. Written at the end of every + // refresh that re-read refs/commits, read by the poller. + refsSnapshotMutex deadlock.Mutex + refsSnapshot string + + // branchLoadSeq hands out a monotonically increasing sequence number to + // each branch load (via Add, on the worker); appliedBranchLoadSeq is the + // highest sequence whose result has been written to the model (touched only + // on the UI thread, inside the bounce). Together they let a branch load's + // bounce drop its write if a later-started load has already applied, so + // concurrent branch loads don't clobber each other out of order. + branchLoadSeq atomic.Int64 + appliedBranchLoadSeq int64 } func NewRefreshHelper( @@ -52,163 +81,573 @@ func NewRefreshHelper( } func (self *RefreshHelper) Refresh(options types.RefreshOptions) { - if options.Mode == types.ASYNC && options.Then != nil { - panic("RefreshOptions.Then doesn't work with mode ASYNC") + self.performRefresh(options, false, false) +} + +// RefreshBlockingInput is Refresh for handlers whose next keypress may depend +// on the state the refresh produces. See IGuiCommon.RefreshBlockingInput. +func (self *RefreshHelper) RefreshBlockingInput(options types.RefreshOptions) { + self.performRefresh(options, false, true) +} + +// RefreshFromWorker is Refresh for callers already running on a worker +// goroutine (e.g. inside a WithWaitingStatus handler) rather than the UI +// thread. See IGuiCommon.RefreshFromWorker. +func (self *RefreshHelper) RefreshFromWorker(options types.RefreshOptions) { + self.performRefresh(options, true, false) +} + +type refreshEnv struct { + // Whether everything this refresh dispatches uses the background task + // variants, which don't count towards lazygit being busy — so the refresh + // doesn't block switching repos. Set for refreshes initiated by a + // background routine, and for foreground ones that opted in via + // RefreshOptions.DontBlockRepoSwitch. + background bool + + // Whether the refresh was initiated by an unattended background routine + // (RefreshOptions.Background) rather than by user activity. The files + // refresh uses this to decide whether git may take optional locks and + // persist its refreshed stat cache. + backgroundRoutine bool + + // Whether the views this refresh updates must keep the scroll position they + // have. Focusing a list scrolls its selection into view, which is what a + // user action should do — but a refresh that no user action is behind must + // leave the viewport wherever the user last scrolled it to. That's the case + // for the unattended background routines, and for the refreshes that merely + // reload state (see RefreshOptions.DontBlockRepoSwitch). + keepScrollPosition bool + + // Whether refreshing a side context should leave the main view unchanged. + skipMainViewUpdate bool + + // the repo generation captured when the refresh started + generation int + + // the git command instance captured when the refresh started. The refresh + // workers run their git commands through this rather than reading the live + // instance: a repo switch mid-refresh replaces the live instance (and the + // process cwd), while this one keeps addressing the repo the refresh was + // started for (its commands are pinned to that repo's directory). + git *commands.GitCommand + + // When non-nil, each scope's UI-thread bounce is collected here instead of + // being dispatched as it's produced, so they can all be applied in a single + // frame once the whole refresh is done (see RefreshOptions.BatchUIUpdates). + // Held by pointer so the copies of env that flow through the scope functions + // all share the one batch. + batch *refreshBounceBatch +} + +// refreshBounceBatch collects the UI-thread bounces of a batched refresh so they +// can be applied together in one frame rather than one scope at a time. The +// scopes run on separate worker goroutines and add concurrently, hence the +// mutex. Once the refresh starts flushing it closes the batch, so that any +// bounces enqueued afterwards — the nested ones a flushed bounce produces in +// turn, e.g. scrolling the selection into view — are dispatched immediately as +// ordinary follow-ups instead of being collected into a batch that nothing +// will drain. +type refreshBounceBatch struct { + mutex deadlock.Mutex + funcs []func() + closed bool +} + +// add collects f and returns true. Once the batch is closed it collects nothing +// and returns false, telling the caller to dispatch f immediately instead. +func (self *refreshBounceBatch) add(f func()) bool { + self.mutex.Lock() + defer self.mutex.Unlock() + + if self.closed { + return false } + self.funcs = append(self.funcs, f) + return true +} - t := time.Now() - defer func() { - self.c.Log.Infof("Refresh took %s", time.Since(t)) - }() +// close marks the batch flushed and returns everything collected so far. +func (self *refreshBounceBatch) close() []func() { + self.mutex.Lock() + defer self.mutex.Unlock() + self.closed = true + return self.funcs +} + +func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFromWorker bool, blockInput bool) { + startTime := time.Now() + + // A refresh from a worker blocks that worker until it's done; one from the + // UI thread returns immediately and finishes in the background. + syncOrAsync := "async" + if calledFromWorker { + syncOrAsync = "sync" + } if options.Scope == nil { - self.c.Log.Infof( - "refreshing all scopes in %s mode", - getModeName(options.Mode), - ) + self.c.Log.Infof("refreshing all scopes (%s)", syncOrAsync) } else { self.c.Log.Infof( - "refreshing the following scopes in %s mode: %s", - getModeName(options.Mode), + "refreshing the following scopes (%s): %s", + syncOrAsync, strings.Join(getScopeNames(options.Scope), ","), ) } - f := func() { - var scopeSet *set.Set[types.RefreshableView] - if len(options.Scope) == 0 { - // not refreshing staging/patch-building unless explicitly requested because we only need - // to refresh those while focused. - scopeSet = set.NewFromSlice([]types.RefreshableView{ - types.COMMITS, - types.BRANCHES, - types.FILES, - types.STASH, - types.REFLOG, - types.TAGS, - types.REMOTES, - types.WORKTREES, - types.STATUS, - types.BISECT_INFO, - types.STAGING, + // Debug-only guard: every refresh must be issued from the entry point that + // matches its goroutine — Refresh on the UI thread, RefreshFromWorker on a + // worker. goid stays out of production control flow (debug only). + if self.c.GetConfig().GetDebug() && self.c.GocuiGui().IsUIThread() == calledFromWorker { + panic("Refresh called from a worker, or RefreshFromWorker called from the UI thread") + } + + if options.Then != nil && options.DontBlockRepoSwitch { + // Then is not generation-guarded, so if a switch crossed the refresh it + // would run against the newly switched-to repo. A refresh carrying a + // Then must keep blocking switches. + panic("a refresh with a Then callback must not set DontBlockRepoSwitch") + } + + // A RefreshBlockingInput caller wants keyboard input withheld until the + // refreshed state is in place (see IGuiCommon.RefreshBlockingInput). Begin + // the block synchronously here in the calling handler, so that no keypress + // can slip through before it; the finishing step ends it from a callback + // queued behind the refresh's own updates (see waitAndFinalize). Demos + // take the blocking inline path below and need none of this. + blockInputUntilDone := blockInput && !self.c.InDemo() + if blockInputUntilDone { + self.c.GocuiGui().BeginBlockingEvents() + } + + // Capture the refresh's baseline once, here at the start: the repo + // generation that every scope's bounce is guarded against, and the git + // command instance the scopes run their commands through. The two are + // captured together on the UI thread so that they can't straddle a repo + // switch (which runs on the UI thread): pairing the old repo's instance + // with the new repo's generation would let a refresh compute data from + // the old repo and write it into the new repo's model unguarded. With a + // consistent pair, a switch-crossing refresh keeps running its commands + // against the repo it started in, and the generation guard drops its + // writes. + env := refreshEnv{ + background: options.Background || options.DontBlockRepoSwitch, + backgroundRoutine: options.Background, + keepScrollPosition: options.Background || options.DontBlockRepoSwitch, + skipMainViewUpdate: options.SkipMainViewUpdate, + } + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + env.generation = self.c.State().GetRepoGeneration() + env.git = self.c.Git() + }) { + return + } + if options.BatchUIUpdates { + env.batch = &refreshBounceBatch{} + } + + var scopeSet *set.Set[types.RefreshableView] + if len(options.Scope) == 0 { + // not refreshing staging/patch-building unless explicitly requested because we only need + // to refresh those while focused. + scopeSet = set.NewFromSlice([]types.RefreshableView{ + types.COMMITS, + types.BRANCHES, + types.FILES, + types.STASH, + types.REFLOG, + types.TAGS, + types.REMOTES, + types.WORKTREES, + types.STATUS, + types.BISECT_INFO, + types.STAGING, + types.PULL_REQUESTS, + }) + } else { + scopeSet = set.NewFromSlice(options.Scope) + } + + // Expand co-refreshing scopes up front so downstream conditions can be + // simple single-scope checks. The relationships are: + // - whenever the reflog or bisect info changes, commits and branches + // can change too (e.g. switching branches updates the reflog and + // can move HEAD), so refresh commits + branches alongside + // - submodules are refreshed as part of the files refresh + // - merge conflicts are part of what the files refresh produces + // - pull requests are fetched for the tracking branches against the + // remotes, so refresh both alongside to fetch against fresh data + // - commits and branches always go together: changing commits changes + // the branches' upstream/downstream counts, and changing branches + // (e.g. checking one out) changes the commits we show. This one comes + // last, so that it also covers the branches the rules above add. + if scopeSet.Includes(types.REFLOG) || scopeSet.Includes(types.BISECT_INFO) { + scopeSet.Add(types.COMMITS, types.BRANCHES) + } + if scopeSet.Includes(types.SUBMODULES) { + scopeSet.Add(types.FILES) + } + if scopeSet.Includes(types.FILES) { + scopeSet.Add(types.MERGE_CONFLICTS) + } + if scopeSet.Includes(types.PULL_REQUESTS) { + scopeSet.Add(types.BRANCHES, types.REMOTES) + } + if scopeSet.Includes(types.COMMITS) || scopeSet.Includes(types.BRANCHES) { + scopeSet.Add(types.COMMITS, types.BRANCHES) + } + + // Capture the refs snapshot now, before we start reading git's state + // below, rather than after. This is important to guard against the race + // of git's state changing externally while (or right after) we are + // refreshing; the risk is one potential extra refresh, but capturing the + // snapshot at the end would risk missing one, which is worse. + self.updateRefsSnapshotIfRelevant(scopeSet, env) + + wg := sync.WaitGroup{} + refresh := func(name string, f func()) { + wg.Add(1) + // Each scope runs on its own goroutine, joined by the wg.Wait in + // waitAndFinalize. They don't need to be registered as gocui tasks for + // repo-switch safety: performRefresh always runs under a task that stays + // busy until that wg.Wait returns — the calling worker's task when + // called from a worker, or the waitAndFinalize worker task when called + // from the UI thread (created before the triggering event's task ends, + // so there's no gap) — and that task already covers the whole refresh. + go utils.Safe(func() { + t := time.Now() + defer wg.Done() + f() + self.c.Log.Infof("refreshed %s in %s", name, time.Since(t)) + }) + } + + // The branches view shows worktrees against branches, so a branches render + // that happens before the refreshed worktrees have landed in the model shows + // stale ones, and rendering again once they land makes the view flicker. + // Refresh the worktrees first, then, and let the branches refresh wait for + // them: waitForWorktrees returns once the worktrees model write is queued, + // so the branches write that follows is queued behind it and the view + // renders once, with both. + worktreesWg := sync.WaitGroup{} + waitForWorktrees := func() { worktreesWg.Wait() } + if scopeSet.Includes(types.WORKTREES) { + worktreesWg.Add(1) + refresh("worktrees", func() { + defer worktreesWg.Done() + self.refreshWorktrees(env, scopeSet.Includes(types.BRANCHES)) + }) + } + + branchesAndRemotesWg := sync.WaitGroup{} + // The pull-request fetch (below) needs the just-loaded branches and + // remotes. Their model writes are bounced onto the UI thread, so the + // fetch worker can't read them back from the model without racing (and + // would see the pre-refresh values); instead the branches and remotes + // loads stash what they loaded here, and the wait on + // branchesAndRemotesWg gives the fetch the happens-before to read them. + var loadedBranches []*models.Branch + var loadedRemotes []*models.Remote + if scopeSet.Includes(types.COMMITS) { + // Capture the refresh's inputs (model, contexts, modes) on the UI + // thread, before the git work is dispatched to a worker, so the worker + // computes from an immutable snapshot instead of reading state the UI + // thread concurrently mutates. Every scope below does the same. + var capturedCommits capturedCommitState + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + capturedCommits = self.captureCommitsState() + }) { + return + } + refresh("commits and commit files", func() { + self.refreshCommitsAndCommitFiles(capturedCommits, options.CommitSelection, env) + }) + } else if scopeSet.Includes(types.REBASE_COMMITS) { + // the commits refresh above loads the rebase commits as well, so we only + // need this one when the rebase commits are all that was asked for + var rebaseHashPool *utils.StringPool + var rebaseCommits []*models.Commit + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + rebaseHashPool, rebaseCommits = self.captureRebaseCommitState() + }) { + return + } + refresh("rebase commits", func() { _ = self.refreshRebaseCommits(rebaseHashPool, rebaseCommits, env) }) + } + + if scopeSet.Includes(types.BRANCHES) { + // The reflog is refreshed here rather than in a scope of its own, + // because sorting the branches by recency needs it to be loaded first. + var capturedReflog capturedReflogState + var capturedBranches capturedBranchState + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + capturedReflog = self.captureReflogState() + capturedBranches = self.captureBranchState() + }) { + return + } + + if self.c.UserConfig().Git.LocalBranchSortOrder == "recency" { + branchesAndRemotesWg.Add(1) + refresh("reflog and branches", func() { + loadedBranches = self.refreshReflogAndBranches(capturedReflog, capturedBranches, waitForWorktrees, options.BranchSelection, options.SelectTopReflogCommit, env) + branchesAndRemotesWg.Done() }) } else { - scopeSet = set.NewFromSlice(options.Scope) - } - - wg := sync.WaitGroup{} - refresh := func(name string, f func()) { - // if we're in a demo we don't want any async refreshes because - // everything happens fast and it's better to have everything update - // in the one frame - if !self.c.InDemo() && options.Mode == types.ASYNC { - self.c.OnWorker(func(t gocui.Task) error { - f() - return nil - }) - } else { - wg.Add(1) - go utils.Safe(func() { - t := time.Now() - defer wg.Done() - f() - self.c.Log.Infof("refreshed %s in %s", name, time.Since(t)) - }) - } - } - - includeWorktreesWithBranches := false - if scopeSet.Includes(types.COMMITS) || scopeSet.Includes(types.BRANCHES) || scopeSet.Includes(types.REFLOG) || scopeSet.Includes(types.BISECT_INFO) { - // whenever we change commits, we should update branches because the upstream/downstream - // counts can change. Whenever we change branches we should also change commits - // e.g. in the case of switching branches. - refresh("commits and commit files", self.refreshCommitsAndCommitFiles) - - includeWorktreesWithBranches = scopeSet.Includes(types.WORKTREES) - if self.c.UserConfig().Git.LocalBranchSortOrder == "recency" { - refresh("reflog and branches", func() { self.refreshReflogAndBranches(includeWorktreesWithBranches, options.KeepBranchSelectionIndex) }) - } else { - refresh("branches", func() { self.refreshBranches(includeWorktreesWithBranches, options.KeepBranchSelectionIndex, true) }) - refresh("reflog", func() { _ = self.refreshReflogCommits() }) - } - } else if scopeSet.Includes(types.REBASE_COMMITS) { - // the above block handles rebase commits so we only need to call this one - // if we've asked specifically for rebase commits and not those other things - refresh("rebase commits", func() { _ = self.refreshRebaseCommits() }) - } - - if scopeSet.Includes(types.SUB_COMMITS) { - refresh("sub commits", func() { _ = self.refreshSubCommitsWithLimit() }) - } - - // reason we're not doing this if the COMMITS type is included is that if the COMMITS type _is_ included we will refresh the commit files context anyway - if scopeSet.Includes(types.COMMIT_FILES) && !scopeSet.Includes(types.COMMITS) { - refresh("commit files", func() { _ = self.refreshCommitFilesContext() }) - } - - fileWg := sync.WaitGroup{} - if scopeSet.Includes(types.FILES) || scopeSet.Includes(types.SUBMODULES) { - fileWg.Add(1) - refresh("files", func() { - _ = self.refreshFilesAndSubmodules() - fileWg.Done() + branchesAndRemotesWg.Add(1) + refresh("branches", func() { + // Not a recency sort, so branches doesn't depend on the reflog + // being fresh; it runs concurrently with the reflog refresh + // below and uses the reflog we captured up front, as it always has. + loadedBranches = self.refreshBranches(capturedBranches, waitForWorktrees, options.BranchSelection, true, capturedReflog.reflogCommits, env) + branchesAndRemotesWg.Done() }) - } - - if scopeSet.Includes(types.STASH) { - refresh("stash", func() { self.refreshStashEntries() }) - } - - if scopeSet.Includes(types.TAGS) { - refresh("tags", func() { _ = self.refreshTags() }) - } - - if scopeSet.Includes(types.REMOTES) { - refresh("remotes", func() { _ = self.refreshRemotes() }) - } - - if scopeSet.Includes(types.WORKTREES) && !includeWorktreesWithBranches { - refresh("worktrees", func() { self.refreshWorktrees() }) - } - - if scopeSet.Includes(types.STAGING) { - refresh("staging", func() { - fileWg.Wait() - self.stagingHelper.RefreshStagingPanel(types.OnFocusOpts{}) + refresh("reflog", func() { + _, _ = self.refreshReflogCommits(capturedReflog, env, options.SelectTopReflogCommit) }) } - - if scopeSet.Includes(types.PATCH_BUILDING) { - refresh("patch building", func() { self.patchBuildingHelper.RefreshPatchBuildingPanel(types.OnFocusOpts{}) }) - } - - if scopeSet.Includes(types.MERGE_CONFLICTS) || scopeSet.Includes(types.FILES) { - refresh("merge conflicts", func() { _ = self.mergeConflictsHelper.RefreshMergeState() }) - } - - self.refreshStatus() - - wg.Wait() - - if options.Then != nil { - options.Then() - } } - if options.Mode == types.BLOCK_UI { - self.c.OnUIThread(func() error { - f() + if scopeSet.Includes(types.SUB_COMMITS) { + var capturedSubCommits capturedSubCommitState + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + capturedSubCommits = self.captureSubCommitState() + }) { + return + } + refresh("sub commits", func() { _ = self.refreshSubCommitsWithLimit(capturedSubCommits, env) }) + } + + // reason we're not doing this if the COMMITS type is included is that if the COMMITS type _is_ included we will refresh the commit files context anyway + if scopeSet.Includes(types.COMMIT_FILES) && !scopeSet.Includes(types.COMMITS) { + var capturedCommitFiles capturedCommitFilesState + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + capturedCommitFiles = self.captureCommitFilesState() + }) { + return + } + refresh("commit files", func() { _ = self.refreshCommitFilesContext(capturedCommitFiles, env) }) + } + + fileWg := sync.WaitGroup{} + if scopeSet.Includes(types.FILES) { + var capturedFiles capturedFilesState + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + capturedFiles = self.captureFilesState() + }) { + return + } + fileWg.Add(1) + refresh("files", func() { + _ = self.refreshFilesAndSubmodules(capturedFiles, env) + fileWg.Done() + }) + } + + if scopeSet.Includes(types.STASH) { + var stashFilterPath string + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + stashFilterPath = self.c.Modes().Filtering.GetPath() + }) { + return + } + refresh("stash", func() { self.refreshStashEntries(stashFilterPath, env) }) + } + + if scopeSet.Includes(types.TAGS) { + refresh("tags", func() { _ = self.refreshTags(env) }) + } + + if scopeSet.Includes(types.REMOTES) { + // Capture the previously-selected remote on the UI thread; the worker + // needs it to keep the remote-branches selection valid, and reading + // the Remotes context off the UI thread races its render. + var prevSelectedRemote *models.Remote + if !self.captureOnUIThread(calledFromWorker, env.background, func() { + prevSelectedRemote = self.c.Contexts().Remotes.GetSelected() + }) { + return + } + branchesAndRemotesWg.Add(1) + refresh("remotes", func() { + loadedRemotes, _ = self.refreshRemotes(prevSelectedRemote, env) + branchesAndRemotesWg.Done() + }) + } + + if scopeSet.Includes(types.PULL_REQUESTS) { + // Fetching pull requests talks to the GitHub API over the network; on + // a bad connection that request can stall for a long time. It runs no + // git commands against the repo, and its model writes are guarded by + // the repo generation (a repo switch mid-fetch simply drops the + // result), so it is safe to run as a background task even when the + // enclosing refresh is a foreground one — a foreground task would + // block repo switching for as long as the request takes. The env copy + // makes the downstream UI-thread bounces background as well. + prEnv := env + prEnv.background = true + self.c.OnWorkerBackground(func(gocui.Task) error { + branchesAndRemotesWg.Wait() + + t := time.Now() + // Use the branches and remotes the loads above stashed, not + // Model().Branches/Remotes: those writes are bounced onto the + // UI thread and may not have landed on this worker yet. The + // wait above orders us after both loads have stashed theirs. + self.refreshGithubPullRequests(loadedBranches, loadedRemotes, prEnv) + self.c.Log.Infof("refreshed pull requests in %s", time.Since(t)) return nil }) + } + + if scopeSet.Includes(types.STAGING) { + refresh("staging", func() { + fileWg.Wait() + // Bounce onto the UI thread so this runs after the files + // scope's model-update bounce — RefreshStagingPanel reads + // Model.Files (via Files.GetSelected) and would otherwise + // see the pre-refresh model. Guard on the generation so a + // repo switch mid-refresh drops it, like the model bounces. + self.onUIThreadUnlessRepoChanged(env, func() { + self.stagingHelper.RefreshStagingPanel(types.OnFocusOpts{}) + }) + }) + } + + if scopeSet.Includes(types.PATCH_BUILDING) { + refresh("patch building", func() { + // Bounce onto the UI thread, like the staging panel above: + // RefreshPatchBuildingPanel reads the commit-files selection and + // sets the patch view's origin, neither of which may run off the UI + // thread. Guard on the generation so a repo switch mid-refresh drops + // it, like the model bounces. + self.onUIThreadUnlessRepoChanged(env, func() { + self.patchBuildingHelper.RefreshPatchBuildingPanel(types.OnFocusOpts{}) + }) + }) + } + + if scopeSet.Includes(types.MERGE_CONFLICTS) { + refresh("merge conflicts", func() { + // Bounce onto the UI thread, like the staging and patch-building + // panels above: RefreshMergeState reads the current context and + // renders (or escapes) the merge-conflicts view, none of which may + // run off the UI thread. + self.onUIThreadUnlessRepoChanged(env, func() { + _ = self.mergeConflictsHelper.RefreshMergeState() + }) + }) + } + + self.refreshStatus(env) + + waitAndFinalize := func() { + wg.Wait() + + if env.batch != nil { + // Apply all the scopes' collected bounces in a single UI-thread task, + // so they land in one frame: gocui drains every queued event before it + // redraws, so one task means one repaint. Bounces enqueued from within + // these (see refreshBounceBatch) run as ordinary follow-ups. + bounces := env.batch.close() + self.onUIThread(env.background, func() error { + for _, bounce := range bounces { + bounce() + } + return nil + }) + } + + if options.Then != nil { + // Queue Then via OnUIThread so it runs *after* the refresh-scope + // functions' model-update bounces (which are already queued by + // now), not synchronously here — at this point the workers have + // returned but their bounces haven't been processed yet, so + // invoking Then synchronously would run it on a model that's + // still pre-refresh. + self.onUIThread(env.background, options.Then) + } + + if blockInputUntilDone { + // Queued after the scopes' model bounces and Then, so by the time + // this runs — and the keys buffered during the refresh replay — + // the refreshed state is in place. + self.c.OnUIThread(func() error { + return self.c.GocuiGui().EndBlockingEvents() + }) + } + + self.c.Log.Infof("Refresh took %s", time.Since(startTime)) + } + + // waitAndFinalize blocks until every scope is done. Run it inline when we're + // already on a worker (or in a demo, for a deterministic single frame); when + // we're on the UI thread, dispatch it to a worker so it doesn't block the UI. + if calledFromWorker || self.c.InDemo() { + waitAndFinalize() + } else { + self.onWorker(env.background, func(t gocui.Task) error { + waitAndFinalize() + return nil + }) + } +} + +// SetRefsSnapshot stores the given snapshot as the last observed refs state. +// Called externally by the background poller at startup to seed the snapshot, +// and internally by Refresh at the end of a refs-touching refresh. +func (self *RefreshHelper) SetRefsSnapshot(snapshot string) { + self.refsSnapshotMutex.Lock() + defer self.refsSnapshotMutex.Unlock() + self.refsSnapshot = snapshot +} + +// RefsSnapshotChangedSince reports whether the given snapshot differs from +// the last observed one. Pure read; does not update internal state. +func (self *RefreshHelper) RefsSnapshotChangedSince(snapshot string) bool { + self.refsSnapshotMutex.Lock() + defer self.refsSnapshotMutex.Unlock() + + // An empty stored snapshot means no refresh has captured one yet, so we + // have no baseline to compare against and report "unchanged" rather than + // firing a spurious refresh. This can only be the unset zero value: a + // snapshot we actually computed is never empty, because its HEAD component + // is always non-empty (a branch ref when attached, a hash when detached — + // even a repo with no commits yields "ref: refs/heads/main"). + if self.refsSnapshot == "" { + return false + } + + return snapshot != self.refsSnapshot +} + +// updateRefsSnapshotIfRelevant captures a fresh refs snapshot from disk at the +// start of a refresh that re-reads refs/commits (see the call site for why we +// capture before reading the model rather than after). This keeps the +// background poller's stored snapshot in sync with what's been observed by the +// UI, so in-app commands and focus-in refreshes don't cause the next poll to +// spuriously re-trigger. +// +// We check just COMMITS and BRANCHES because the scope-expansion step at the +// top of Refresh has already added these whenever REFLOG or BISECT_INFO are +// in scope, and whenever a nil scope was passed. +func (self *RefreshHelper) updateRefsSnapshotIfRelevant(scopeSet *set.Set[types.RefreshableView], env refreshEnv) { + if !scopeSet.Includes(types.COMMITS) && !scopeSet.Includes(types.BRANCHES) { return } - f() + snapshot, err := env.git.Status.RefsSnapshot() + if err != nil { + self.c.Log.Warnf("RefsSnapshot failed during refresh: %v", err) + return + } + self.SetRefsSnapshot(snapshot) } func getScopeNames(scopes []types.RefreshableView) []string { scopeNameMap := map[types.RefreshableView]string{ types.COMMITS: "commits", + types.REBASE_COMMITS: "rebaseCommits", types.BRANCHES: "branches", types.FILES: "files", types.SUBMODULES: "submodules", @@ -221,7 +660,10 @@ func getScopeNames(scopes []types.RefreshableView) []string { types.STATUS: "status", types.BISECT_INFO: "bisect", types.STAGING: "staging", + types.PATCH_BUILDING: "patchBuilding", types.MERGE_CONFLICTS: "mergeConflicts", + types.COMMIT_FILES: "commitFiles", + types.PULL_REQUESTS: "pullRequests", } return lo.Map(scopes, func(scope types.RefreshableView, _ int) string { @@ -229,74 +671,160 @@ func getScopeNames(scopes []types.RefreshableView) []string { }) } -func getModeName(mode types.RefreshMode) string { - switch mode { - case types.SYNC: - return "sync" - case types.ASYNC: - return "async" - case types.BLOCK_UI: - return "block-ui" - default: - return "unknown mode" +// During startup, the bottleneck is fetching the reflog entries, which we need +// in order to sort the branches by recency. So we have two phases: INITIAL and +// COMPLETE. In the INITIAL phase we don't have any reflog commits yet, so we +// show the branches right away sorted by whatever we have (typically nothing, +// i.e. not by recency), then load the reflog on a worker and refresh the +// branches again, this time recency-sorted. From then on we're in the COMPLETE +// phase and load the reflog synchronously before refreshing the branches. +// +// The immediate refresh must run before we spawn the async one, not after: that +// order gives the immediate (non-recency) load a lower branch-load sequence +// than the async (recency) load, so the sequence guard in refreshBranches keeps +// the recency-sorted result even if the two loads' bounces land out of order. +// capturedReflogState holds the reflog refresh's model/mode inputs, gathered on +// the UI thread before the git work runs. The existing reflog slices feed the +// incremental fetch (we only load entries newer than the ones we already have). +type capturedReflogState struct { + reflogCommits []*models.Commit + filteredReflogCommits []*models.Commit + hashPool *utils.StringPool + filteringActive bool + filterPath string + filterAuthor string +} + +// captureReflogState reads the reflog refresh's inputs into an immutable +// snapshot. It must run on the UI thread. +func (self *RefreshHelper) captureReflogState() capturedReflogState { + return capturedReflogState{ + reflogCommits: self.c.Model().ReflogCommits, + filteredReflogCommits: self.c.Model().FilteredReflogCommits, + hashPool: self.c.Model().HashPool, + filteringActive: self.c.Modes().Filtering.Active(), + filterPath: self.c.Modes().Filtering.GetPath(), + filterAuthor: self.c.Modes().Filtering.GetAuthor(), } } -// during startup, the bottleneck is fetching the reflog entries. We need these -// on startup to sort the branches by recency. So we have two phases: INITIAL, and COMPLETE. -// In the initial phase we don't get any reflog commits, but we asynchronously get them -// and refresh the branches after that -func (self *RefreshHelper) refreshReflogCommitsConsideringStartup() { +// capturedBranchState holds the branches refresh's model inputs, gathered on the +// UI thread before the git work runs. oldBranches is used only to carry over the +// previous BehindBaseBranch values (to reduce flicker) — an atomic each, so a +// pre-refresh snapshot serves both the immediate and recency loads identically. +type capturedBranchState struct { + mainBranches *git_commands.MainBranches + oldBranches []*models.Branch +} + +// captureBranchState reads the branches refresh's model inputs into an immutable +// snapshot. It must run on the UI thread. +func (self *RefreshHelper) captureBranchState() capturedBranchState { + return capturedBranchState{ + mainBranches: self.c.Model().MainBranches, + oldBranches: self.c.Model().Branches, + } +} + +func (self *RefreshHelper) refreshReflogAndBranches(capturedReflog capturedReflogState, capturedBranches capturedBranchState, waitForWorktrees func(), branchSelection types.BranchSelectionBehavior, selectTopReflogCommit bool, env refreshEnv) []*models.Branch { switch self.c.State().GetRepoState().GetStartupStage() { case types.INITIAL: - self.c.OnWorker(func(_ gocui.Task) error { - _ = self.refreshReflogCommits() - self.refreshBranches(false, true, true) + // Return the immediate (non-recency) load's branches; the recency-sorted + // reload below runs on its own worker after we return. Both hold the same + // set of branches, which is all the caller (the PR fetch) needs. + branches := self.refreshBranches(capturedBranches, waitForWorktrees, branchSelection, false, capturedReflog.reflogCommits, env) + + self.onWorker(env.background, func(_ gocui.Task) error { + reflogCommits, _ := self.refreshReflogCommits(capturedReflog, env, false) + // The load above already waited for the worktrees, so this one has + // nothing left to wait for. + self.refreshBranches(capturedBranches, func() {}, types.SelectCheckedOutBranch, true, reflogCommits, env) self.c.State().GetRepoState().SetStartupStage(types.COMPLETE) return nil }) + return branches + case types.COMPLETE: - _ = self.refreshReflogCommits() + reflogCommits, _ := self.refreshReflogCommits(capturedReflog, env, selectTopReflogCommit) + return self.refreshBranches(capturedBranches, waitForWorktrees, branchSelection, true, reflogCommits, env) + } + + return nil +} + +// capturedCommitState holds everything the commits refresh reads from the +// model, contexts, and modes. It is gathered on the UI thread (see +// captureCommitsState) before the git work is dispatched to a worker, so the +// worker computes from an immutable snapshot rather than reading state the UI +// thread concurrently mutates. +type capturedCommitState struct { + limitCommits bool + showWholeGitGraph bool + filterPath string + filterAuthor string + mainBranches *git_commands.MainBranches + hashPool *utils.StringPool + parentIsLocalCommits bool +} + +// captureCommitsState reads the commits refresh's model/context/mode inputs +// into an immutable snapshot. It must run on the UI thread. +// The selection is captured later, when applying the refresh, so user input +// received while the git work is in flight is not overwritten. +func (self *RefreshHelper) captureCommitsState() capturedCommitState { + parentCtx := self.c.Contexts().CommitFiles.GetParentContext() + + return capturedCommitState{ + limitCommits: self.c.Contexts().LocalCommits.GetLimitCommits(), + showWholeGitGraph: self.c.Contexts().LocalCommits.GetShowWholeGitGraph(), + filterPath: self.c.Modes().Filtering.GetPath(), + filterAuthor: self.c.Modes().Filtering.GetAuthor(), + mainBranches: self.c.Model().MainBranches, + hashPool: self.c.Model().HashPool, + parentIsLocalCommits: parentCtx != nil && parentCtx.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY, } } -func (self *RefreshHelper) refreshReflogAndBranches(refreshWorktrees bool, keepBranchSelectionIndex bool) { - loadBehindCounts := self.c.State().GetRepoState().GetStartupStage() == types.COMPLETE - - self.refreshReflogCommitsConsideringStartup() - - self.refreshBranches(refreshWorktrees, keepBranchSelectionIndex, loadBehindCounts) -} - -func (self *RefreshHelper) refreshCommitsAndCommitFiles() { - _ = self.refreshCommitsWithLimit() - ctx := self.c.Contexts().CommitFiles.GetParentContext() - if ctx != nil && ctx.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY { +func (self *RefreshHelper) refreshCommitsAndCommitFiles(captured capturedCommitState, commitSelection types.CommitSelectionBehavior, env refreshEnv) { + _ = self.refreshCommitsWithLimit(captured, commitSelection, env) + if captured.parentIsLocalCommits { // This makes sense when we've e.g. just amended a commit, meaning we get a new commit hash at the same position. // However if we've just added a brand new commit, it pushes the list down by one and so we would end up // showing the contents of a different commit than the one we initially entered. // Ideally we would know when to refresh the commit files context and when not to, // or perhaps we could just pop that context off the stack whenever cycling windows. // For now the awkwardness remains. - commit := self.c.Contexts().LocalCommits.GetSelected() - if commit != nil && commit.RefName() != "" { - refRange := self.c.Contexts().LocalCommits.GetSelectedRefRangeForDiffFiles() - self.c.Contexts().CommitFiles.ReInit(commit, refRange) - _ = self.refreshCommitFilesContext() - } + // + // The commit selection is restored in refreshCommitsWithLimit's bounce, + // so read it on the UI thread after that bounce; then load the commit + // files back on a worker (refreshCommitFilesContext does git work). + self.onUIThreadUnlessRepoChanged(env, func() { + commit := self.c.Contexts().LocalCommits.GetSelected() + if commit != nil && commit.RefName() != "" { + refRange := self.c.Contexts().LocalCommits.GetSelectedRefRangeForDiffFiles() + self.c.Contexts().CommitFiles.ReInit(commit, refRange) + // Capture the diff endpoints here, on the UI thread and after + // ReInit has set them, before dispatching the git work. + capturedCommitFiles := self.captureCommitFilesState() + self.onWorker(env.background, func(gocui.Task) error { + _ = self.refreshCommitFilesContext(capturedCommitFiles, env) + return nil + }) + } + }) } } -func (self *RefreshHelper) determineCheckedOutRef() models.Ref { - if rebasedBranch := self.c.Git().Status.BranchBeingRebased(); rebasedBranch != "" { +func (self *RefreshHelper) determineCheckedOutRef(env refreshEnv) models.Ref { + if rebasedBranch := env.git.Status.BranchBeingRebased(); rebasedBranch != "" { // During a rebase we're on a detached head, so cannot determine the // branch name in the usual way. We need to read it from the // ".git/rebase-merge/head-name" file instead. return &models.Branch{Name: strings.TrimPrefix(rebasedBranch, "refs/heads/")} } - if bisectInfo := self.c.Git().Bisect.GetInfo(); bisectInfo.Bisecting() && bisectInfo.GetStartHash() != "" { + if bisectInfo := env.git.Bisect.GetInfo(); bisectInfo.Bisecting() && bisectInfo.GetStartHash() != "" { // Likewise, when we're bisecting we're on a detached head as well. In // this case we read the branch name from the ".git/BISECT_START" file. return &models.Branch{Name: bisectInfo.GetStartHash()} @@ -306,7 +834,7 @@ func (self *RefreshHelper) determineCheckedOutRef() models.Ref { // checked out. Note that if we're on a detached head (for reasons other // than rebasing or bisecting, i.e. it was explicitly checked out), then // this will return an empty string. - if branchName, err := self.c.Git().Branch.CurrentBranchName(); err == nil && branchName != "" { + if branchName, err := env.git.Branch.CurrentBranchName(); err == nil && branchName != "" { return &models.Branch{Name: branchName} } @@ -314,75 +842,216 @@ func (self *RefreshHelper) determineCheckedOutRef() models.Ref { return nil } -func (self *RefreshHelper) refreshCommitsWithLimit() error { - self.c.Mutexes().LocalCommitsMutex.Lock() - defer self.c.Mutexes().LocalCommitsMutex.Unlock() - - checkedOutRef := self.determineCheckedOutRef() - commits, err := self.c.Git().Loaders.CommitLoader.GetCommits( +func (self *RefreshHelper) refreshCommitsWithLimit(captured capturedCommitState, commitSelection types.CommitSelectionBehavior, env refreshEnv) error { + checkedOutRef := self.determineCheckedOutRef(env) + refName, bisectInfo := self.refForLog(env) + commits, err := env.git.Loaders.CommitLoader.GetCommits( git_commands.GetCommitsOptions{ - Limit: self.c.Contexts().LocalCommits.GetLimitCommits(), - FilterPath: self.c.Modes().Filtering.GetPath(), - FilterAuthor: self.c.Modes().Filtering.GetAuthor(), + Limit: captured.limitCommits, + FilterPath: captured.filterPath, + FilterAuthor: captured.filterAuthor, IncludeRebaseCommits: true, - RefName: self.refForLog(), + RefName: refName, RefForPushedStatus: checkedOutRef, - All: self.c.Contexts().LocalCommits.GetShowWholeGitGraph(), - MainBranches: self.c.Model().MainBranches, - HashPool: self.c.Model().HashPool, + All: captured.showWholeGitGraph, + MainBranches: captured.mainBranches, + HashPool: captured.hashPool, }, ) if err != nil { return err } - self.c.Model().Commits = commits - self.RefreshAuthors(commits) - self.c.Model().WorkingTreeStateAtLastCommitRefresh = self.c.Git().Status.WorkingTreeState() - if checkedOutRef != nil { - self.c.Model().CheckedOutBranch = checkedOutRef.RefName() - } else { - self.c.Model().CheckedOutBranch = "" - } + workingTreeState := env.git.Status.WorkingTreeState() - self.refreshView(self.c.Contexts().LocalCommits) + self.onUIThreadUnlessRepoChanged(env, func() { + var selectionRange *localCommitSelectionRange + var newConflictedCommitIdx *int + if commitSelection == types.KeepCommitSelectionByHash { + selectedIdx, rangeStartIdx, rangeSelectMode := self.c.Contexts().LocalCommits.GetSelectionRangeAndMode() + selectionRange = captureLocalCommitSelectionRange(self.c.Model().Commits, selectedIdx, rangeStartIdx, rangeSelectMode) + newConflictedCommitIdx = findNewConflictedCommit(self.c.Model().Commits, commits) + } + + self.c.Model().BisectInfo = bisectInfo + self.c.Model().Commits = commits + self.c.Model().CommitsWereFilteredAtLastRefresh = captured.filterPath != "" || captured.filterAuthor != "" + self.RefreshAuthors(commits) + self.c.Model().WorkingTreeStateAtLastCommitRefresh = workingTreeState + if checkedOutRef != nil { + self.c.Model().CheckedOutBranch = checkedOutRef.RefName() + } else { + self.c.Model().CheckedOutBranch = "" + } + + switch commitSelection { + case types.SelectHeadCommit: + if headCommitIdx := models.HeadCommitIdx(commits); headCommitIdx >= 0 { + self.c.Contexts().LocalCommits.SetSelection(headCommitIdx) + } + case types.KeepCommitSelectionByHash: + if newConflictedCommitIdx != nil { + self.c.Contexts().LocalCommits.SetSelection(*newConflictedCommitIdx) + } else if selectionRange != nil { + selectedIdx, rangeStartIdx, found := findLocalCommitSelectionRange(commits, selectionRange) + if found { + self.c.Contexts().LocalCommits.SetSelectionRangeAndMode(selectedIdx, rangeStartIdx, selectionRange.mode) + } + } + case types.KeepCommitSelectionIndex: + // The caller set the selection index deliberately; leave it untouched. + } + }) + + self.refreshView(self.c.Contexts().LocalCommits, env) return nil } -func (self *RefreshHelper) refreshSubCommitsWithLimit() error { - if self.c.Contexts().SubCommits.GetRef() == nil { +type localCommitSelectionRange struct { + selectedHash string + selectedIsTODO bool + rangeStartHash string + rangeStartIsTODO bool + mode traits.RangeSelectMode +} + +func captureLocalCommitSelectionRange( + commits []*models.Commit, + selectedIdx int, + rangeStartIdx int, + mode traits.RangeSelectMode, +) *localCommitSelectionRange { + if !hasRestorableCommitHash(commits, selectedIdx) || !hasRestorableCommitHash(commits, rangeStartIdx) { return nil } - self.c.Mutexes().SubCommitsMutex.Lock() - defer self.c.Mutexes().SubCommitsMutex.Unlock() + return &localCommitSelectionRange{ + selectedHash: commits[selectedIdx].Hash(), + selectedIsTODO: commits[selectedIdx].IsTODO(), + rangeStartHash: commits[rangeStartIdx].Hash(), + rangeStartIsTODO: commits[rangeStartIdx].IsTODO(), + mode: mode, + } +} - commits, err := self.c.Git().Loaders.CommitLoader.GetCommits( +func findLocalCommitSelectionRange( + commits []*models.Commit, + selectionRange *localCommitSelectionRange, +) (int, int, bool) { + selectedIdx, foundSelected := findCommitByHashPreferringTODOStatus( + commits, selectionRange.selectedHash, selectionRange.selectedIsTODO) + rangeStartIdx, foundRangeStart := findCommitByHashPreferringTODOStatus( + commits, selectionRange.rangeStartHash, selectionRange.rangeStartIsTODO) + if !foundSelected || !foundRangeStart { + return 0, 0, false + } + + return selectedIdx, rangeStartIdx, true +} + +// findCommitByHashPreferringTODOStatus finds the commit with the given hash. +// When both a TODO and a non-TODO commit share that hash - which happens while +// reverting or cherry-picking, where the rebase TODO entry has the same hash as +// the real commit - it returns the one whose TODO status matches isTODO. When +// only one commit has the hash, it is returned regardless of its TODO status, +// so that a selected commit which turned into a TODO entry across the refresh is +// still found (e.g. when starting an interactive rebase that stops to edit it). +func findCommitByHashPreferringTODOStatus(commits []*models.Commit, hash string, isTODO bool) (int, bool) { + fallbackIdx := -1 + for idx, commit := range commits { + if commit.Hash() != hash { + continue + } + if commit.IsTODO() == isTODO { + return idx, true + } + if fallbackIdx == -1 { + fallbackIdx = idx + } + } + + return fallbackIdx, fallbackIdx != -1 +} + +func hasRestorableCommitHash(commits []*models.Commit, idx int) bool { + return idx >= 0 && idx < len(commits) && commits[idx].Hash() != "" +} + +// Returns the index of the conflicted commit in the new commits slice, if there is one and it has a +// different hash than the one before had (or there wasn't one before). Otherwise returns nil. +func findNewConflictedCommit(previousCommits []*models.Commit, commits []*models.Commit) *int { + previousConflictedCommit, _ := lo.Find(previousCommits, func(commit *models.Commit) bool { + return commit.Status == models.StatusConflicted + }) + + newConflictedCommit, idx, hasConflict := lo.FindIndexOf(commits, func(commit *models.Commit) bool { + return commit.Status == models.StatusConflicted + }) + + if hasConflict && (previousConflictedCommit == nil || previousConflictedCommit.Hash() != newConflictedCommit.Hash()) { + return &idx + } + + return nil +} + +// capturedSubCommitState holds the sub-commits refresh's model/context/mode +// inputs, gathered on the UI thread (see captureSubCommitState) before the git +// work is dispatched to a worker. +type capturedSubCommitState struct { + ref models.Ref + limitCommits bool + refToShowDivergenceFrom string + filterPath string + filterAuthor string + mainBranches *git_commands.MainBranches + hashPool *utils.StringPool +} + +// captureSubCommitState reads the sub-commits refresh's inputs into an immutable +// snapshot. It must run on the UI thread. +func (self *RefreshHelper) captureSubCommitState() capturedSubCommitState { + return capturedSubCommitState{ + ref: self.c.Contexts().SubCommits.GetRef(), + limitCommits: self.c.Contexts().SubCommits.GetLimitCommits(), + refToShowDivergenceFrom: self.c.Contexts().SubCommits.GetRefToShowDivergenceFrom(), + filterPath: self.c.Modes().Filtering.GetPath(), + filterAuthor: self.c.Modes().Filtering.GetAuthor(), + mainBranches: self.c.Model().MainBranches, + hashPool: self.c.Model().HashPool, + } +} + +func (self *RefreshHelper) refreshSubCommitsWithLimit(captured capturedSubCommitState, env refreshEnv) error { + if captured.ref == nil { + return nil + } + + commits, err := env.git.Loaders.CommitLoader.GetCommits( git_commands.GetCommitsOptions{ - Limit: self.c.Contexts().SubCommits.GetLimitCommits(), - FilterPath: self.c.Modes().Filtering.GetPath(), - FilterAuthor: self.c.Modes().Filtering.GetAuthor(), + Limit: captured.limitCommits, + FilterPath: captured.filterPath, + FilterAuthor: captured.filterAuthor, IncludeRebaseCommits: false, - RefName: self.c.Contexts().SubCommits.GetRef().FullRefName(), - RefToShowDivergenceFrom: self.c.Contexts().SubCommits.GetRefToShowDivergenceFrom(), - RefForPushedStatus: self.c.Contexts().SubCommits.GetRef(), - MainBranches: self.c.Model().MainBranches, - HashPool: self.c.Model().HashPool, + RefName: captured.ref.FullRefName(), + RefToShowDivergenceFrom: captured.refToShowDivergenceFrom, + RefForPushedStatus: captured.ref, + MainBranches: captured.mainBranches, + HashPool: captured.hashPool, }, ) if err != nil { return err } - self.c.Model().SubCommits = commits - self.RefreshAuthors(commits) + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().SubCommits = commits + self.RefreshAuthors(commits) + }) - self.refreshView(self.c.Contexts().SubCommits) + self.refreshView(self.c.Contexts().SubCommits, env) return nil } func (self *RefreshHelper) RefreshAuthors(commits []*models.Commit) { - self.c.Mutexes().AuthorsMutex.Lock() - defer self.c.Mutexes().AuthorsMutex.Unlock() - authors := self.c.Model().Authors for _, commit := range commits { if _, ok := authors[commit.AuthorEmail]; !ok { @@ -394,142 +1063,278 @@ func (self *RefreshHelper) RefreshAuthors(commits []*models.Commit) { } } -func (self *RefreshHelper) refreshCommitFilesContext() error { +// capturedCommitFilesState holds the commit-files refresh's context/mode inputs +// (the diff endpoints), gathered on the UI thread before the git work runs. +type capturedCommitFilesState struct { + from string + to string + reverse bool +} + +// captureCommitFilesState reads the commit-files refresh's diff endpoints into +// an immutable snapshot. It must run on the UI thread. +func (self *RefreshHelper) captureCommitFilesState() capturedCommitFilesState { from, to := self.c.Contexts().CommitFiles.GetFromAndToForDiff() from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from) + return capturedCommitFilesState{from: from, to: to, reverse: reverse} +} - files, err := self.c.Git().Loaders.CommitFileLoader.GetFilesInDiff(from, to, reverse) +func (self *RefreshHelper) refreshCommitFilesContext(captured capturedCommitFilesState, env refreshEnv) error { + files, err := env.git.Loaders.CommitFileLoader.GetFilesInDiff(captured.from, captured.to, captured.reverse) if err != nil { return err } - self.c.Model().CommitFiles = files - self.c.Contexts().CommitFiles.CommitFileTreeViewModel.SetTree() - - self.refreshView(self.c.Contexts().CommitFiles) + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().CommitFiles = files + self.c.Contexts().CommitFiles.CommitFileTreeViewModel.SetTree() + }) + self.refreshView(self.c.Contexts().CommitFiles, env) return nil } -func (self *RefreshHelper) refreshRebaseCommits() error { - self.c.Mutexes().LocalCommitsMutex.Lock() - defer self.c.Mutexes().LocalCommitsMutex.Unlock() +// captureRebaseCommitState reads the rebase-commits refresh's model inputs into +// an immutable snapshot. It must run on the UI thread. +func (self *RefreshHelper) captureRebaseCommitState() (hashPool *utils.StringPool, commits []*models.Commit) { + return self.c.Model().HashPool, self.c.Model().Commits +} - updatedCommits, err := self.c.Git().Loaders.CommitLoader.MergeRebasingCommits(self.c.Model().HashPool, self.c.Model().Commits) +func (self *RefreshHelper) refreshRebaseCommits(hashPool *utils.StringPool, commits []*models.Commit, env refreshEnv) error { + updatedCommits, err := env.git.Loaders.CommitLoader.MergeRebasingCommits(hashPool, commits) if err != nil { return err } - self.c.Model().Commits = updatedCommits - self.c.Model().WorkingTreeStateAtLastCommitRefresh = self.c.Git().Status.WorkingTreeState() + workingTreeState := env.git.Status.WorkingTreeState() - self.refreshView(self.c.Contexts().LocalCommits) + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().Commits = updatedCommits + self.c.Model().WorkingTreeStateAtLastCommitRefresh = workingTreeState + }) + + self.refreshView(self.c.Contexts().LocalCommits, env) return nil } -func (self *RefreshHelper) refreshTags() error { - tags, err := self.c.Git().Loaders.TagLoader.GetTags() +func (self *RefreshHelper) refreshTags(env refreshEnv) error { + tags, err := env.git.Loaders.TagLoader.GetTags() if err != nil { return err } - self.c.Model().Tags = tags + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().Tags = tags + }) - self.refreshView(self.c.Contexts().Tags) + self.refreshView(self.c.Contexts().Tags, env) return nil } -func (self *RefreshHelper) refreshStateSubmoduleConfigs() error { - configs, err := self.c.Git().Submodule.GetConfigs(nil) - if err != nil { - return err - } - - self.c.Model().Submodules = configs - - return nil +func (self *RefreshHelper) refreshStateSubmoduleConfigs(env refreshEnv) ([]*models.SubmoduleConfig, error) { + return env.git.Submodule.GetConfigs(nil) } // self.refreshStatus is called at the end of this because that's when we can // be sure there is a State.Model.Branches array to pick the current branch from -func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSelectionIndex bool, loadBehindCounts bool) { - self.c.Mutexes().RefreshingBranchesMutex.Lock() - defer self.c.Mutexes().RefreshingBranchesMutex.Unlock() +func (self *RefreshHelper) refreshBranches(captured capturedBranchState, waitForWorktrees func(), branchSelection types.BranchSelectionBehavior, loadBehindCounts bool, reflogCommits []*models.Commit, env refreshEnv) []*models.Branch { + loadSeq := self.branchLoadSeq.Add(1) - branches, err := self.c.Git().Loaders.BranchLoader.Load( - self.c.Model().ReflogCommits, - self.c.Model().MainBranches, - self.c.Model().Branches, + branches, err := env.git.Loaders.BranchLoader.Load( + reflogCommits, + captured.mainBranches, + captured.oldBranches, loadBehindCounts, func(f func() error) { - self.c.OnWorker(func(_ gocui.Task) error { - return f() + self.onWorker(env.background, func(_ gocui.Task) error { + err := f() + if err != nil && self.c.State().GetRepoGeneration() != env.generation { + // An error returned from a worker is shown in a popup. Don't + // do that if the repo was switched while this worker was in + // flight: its results are dropped anyway, and the error + // concerns a repo the user has already left — e.g. failing to + // compute the behind-counts for a worktree that was deleted + // after switching away from it. + self.c.Log.Warnf("dropping error from a stale refresh worker after a repo switch: %v", err) + return nil + } + return err }) }, func() { - self.c.OnUIThread(func() error { + self.onUIThreadUnlessRepoChanged(env, func() { self.c.Contexts().Branches.HandleRender() - self.refreshStatus() - return nil + self.refreshStatus(env) }) }) if err != nil { self.c.Log.Error(err) } - prevSelectedBranch := self.c.Contexts().Branches.GetSelected() + // Render only once the refreshed worktrees are in the model; the branches + // view shows them against the branches (see performRefresh). + waitForWorktrees() - self.c.Model().Branches = branches - - if refreshWorktrees { - self.loadWorktrees() - self.refreshView(self.c.Contexts().Worktrees) - } - - if !keepBranchSelectionIndex && prevSelectedBranch != nil { - self.searchHelper.ReApplyFilter(self.c.Contexts().Branches) - - _, idx, found := lo.FindIndexOf(self.c.Contexts().Branches.GetItems(), - func(b *models.Branch) bool { return b.Name == prevSelectedBranch.Name }) - if found { - self.c.Contexts().Branches.SetSelectedLineIdx(idx) + self.onUIThreadUnlessRepoChanged(env, func() { + // Drop this write if a branch load that started later has already applied + // its result. At the INITIAL startup stage an immediate load (not + // recency-sorted) and an async recency-sorted load run concurrently; this + // makes the later-started (recency-sorted) one win regardless of which + // finishes first, so its result isn't clobbered by the stale immediate one. + if loadSeq < self.appliedBranchLoadSeq { + return } - } + self.appliedBranchLoadSeq = loadSeq - self.refreshView(self.c.Contexts().Branches) + // Read the currently-selected branch before overwriting the list, so we + // can restore it by name below. Reading it here in the bounce keeps it on + // the UI thread. + prevSelectedBranch := self.c.Contexts().Branches.GetSelected() - // Need to re-render the commits view because the visualization of local - // branch heads might have changed - self.c.Mutexes().LocalCommitsMutex.Lock() - self.c.Contexts().LocalCommits.HandleRender() - self.c.Mutexes().LocalCommitsMutex.Unlock() + self.c.Model().Branches = branches + // Rebuilding here (rather than on the worker) means the map is built from + // the branches we just wrote, on the UI thread. + self.rebuildPullRequestsMap() - self.refreshStatus() + // Setting the selection here, in the same bounce that writes the list, + // keeps it on the UI thread and keeps the list and selection updating in + // the same frame. + switch branchSelection { + case types.KeepBranchSelectionByName: + if prevSelectedBranch != nil { + self.searchHelper.ReApplyFilter(self.c.Contexts().Branches) + + _, idx, found := lo.FindIndexOf(self.c.Contexts().Branches.GetItems(), + func(b *models.Branch) bool { return b.Name == prevSelectedBranch.Name }) + if found { + self.c.Contexts().Branches.SetSelectedLineIdx(idx) + } + } + case types.SelectCheckedOutBranch: + // The checked-out branch is always at the top of the list. + self.c.Contexts().Branches.SetSelectedLineIdx(0) + } + + // Need to re-render the commits view because the visualization of local + // branch heads might have changed + self.c.Contexts().LocalCommits.HandleRender() + }) + + self.refreshView(self.c.Contexts().Branches, env) + + self.refreshStatus(env) + + // Return the freshly-loaded branches so the caller can hand them to the PR + // fetch without reading them back from the (bounce-written) model. + return branches } -func (self *RefreshHelper) refreshFilesAndSubmodules() error { - self.c.Mutexes().RefreshingFilesMutex.Lock() - self.c.State().SetIsRefreshingFiles(true) - defer func() { - self.c.State().SetIsRefreshingFiles(false) - self.c.Mutexes().RefreshingFilesMutex.Unlock() - }() - - if err := self.refreshStateSubmoduleConfigs(); err != nil { +func (self *RefreshHelper) refreshFilesAndSubmodules(captured capturedFilesState, env refreshEnv) error { + configs, err := self.refreshStateSubmoduleConfigs(env) + if err != nil { return err } - if err := self.refreshStateFiles(); err != nil { + if err := self.refreshStateFiles(captured, env, configs); err != nil { return err } - self.c.OnUIThread(func() error { - self.refreshView(self.c.Contexts().Submodules) - self.refreshView(self.c.Contexts().Files) - return nil - }) + self.refreshView(self.c.Contexts().Submodules, env) + self.refreshView(self.c.Contexts().Files, env) return nil } -func (self *RefreshHelper) refreshStateFiles() error { +// onUIThreadUnlessRepoChanged bounces a refresh's model/view update onto the UI +// thread, but drops it if the repo was switched while the refresh was in flight. +// Refresh workers do their git work off the UI thread and enqueue their model +// writes here; a repo switch (which replaces the whole model and context tree) +// bumps the generation, so a write captured under the old generation must not +// clobber the new repo's state. The generation is captured once at the start of +// the refresh and carried in env (see refreshEnv). +func (self *RefreshHelper) onUIThreadUnlessRepoChanged(env refreshEnv, f func()) { + wrapper := func() { + if self.c.State().GetRepoGeneration() != env.generation { + return + } + f() + } + + // A batched refresh collects its bounces and fires them together at the end + // (see refreshBounceBatch); add reports false once the batch is flushing, so + // bounces enqueued from within a flushed bounce dispatch immediately. + if env.batch != nil && env.batch.add(wrapper) { + return + } + + self.onUIThread(env.background, func() error { wrapper(); return nil }) +} + +// onWorker and onUIThread pick the foreground or background variant of the +// corresponding dispatch method depending on whether we're servicing a +// background refresh. Background refreshes (auto-fetch and friends) must not +// count towards lazygit being busy, or they'd spuriously block a repo switch; +// see the *Background methods on gocui.Gui. +func (self *RefreshHelper) onWorker(background bool, f func(gocui.Task) error) { + if background { + self.c.OnWorkerBackground(f) + } else { + self.c.OnWorker(f) + } +} + +func (self *RefreshHelper) onUIThread(background bool, f func() error) { + if background { + self.c.OnUIThreadBackground(f) + } else { + self.c.OnUIThread(f) + } +} + +// captureOnUIThread runs fn on the UI thread and returns once it has run. fn +// reads the model/context/mode state a refresh scope needs into locals, so the +// worker that follows computes from an immutable snapshot instead of reading +// state the UI thread concurrently mutates. When the enclosing refresh function +// runs on the UI thread (calledFromWorker is false) fn runs inline; when it runs +// on a worker, fn is dispatched to the UI thread and we block for it. +// +// The inline case matters for correctness as much as the hop: OnUIThreadAndWait +// must not be called from the UI thread itself (it would park the thread +// waiting for a callback that only it can run), and capturing inline also +// guarantees the snapshot reflects the state at the moment Refresh was called, +// before the calling handler regains control and can mutate it. +// +// It returns false when fn didn't run because the app is shutting down, in +// which case the caller must abandon the refresh rather than compute from a +// snapshot that was never taken. +func (self *RefreshHelper) captureOnUIThread(calledFromWorker bool, background bool, fn func()) bool { + if !calledFromWorker { + fn() + return true + } + + if background { + return self.c.GocuiGui().OnUIThreadAndWaitBackground(fn) == nil + } + return self.c.GocuiGui().OnUIThreadAndWait(fn) == nil +} + +// capturedFilesState holds the files refresh's context/model inputs, gathered +// on the UI thread before the git work runs: the previous files list (to detect +// resolved conflicts and drive the auto-stage), and whether untracked files are +// force-shown. +type capturedFilesState struct { + prevFiles []*models.File + forceShowUntracked bool +} + +// captureFilesState reads the files refresh's inputs into an immutable snapshot. +// It must run on the UI thread. +func (self *RefreshHelper) captureFilesState() capturedFilesState { + return capturedFilesState{ + prevFiles: self.c.Model().Files, + forceShowUntracked: self.c.Contexts().Files.ForceShowUntracked(), + } +} + +func (self *RefreshHelper) refreshStateFiles(captured capturedFilesState, env refreshEnv, submoduleConfigs []*models.SubmoduleConfig) error { fileTreeViewModel := self.c.Contexts().Files.FileTreeViewModel prevConflictFileCount := 0 @@ -542,12 +1347,17 @@ func (self *RefreshHelper) refreshStateFiles() error { // Although this also means that at startup we won't be staging anything until // we call git status again. pathsToStage := []string{} - for _, file := range self.c.Model().Files { + for _, file := range captured.prevFiles { if file.HasMergeConflicts { prevConflictFileCount++ } if file.HasInlineMergeConflicts { - hasConflicts, err := mergeconflicts.FileHasConflictMarkers(file.Path) + // Join with the refresh's repo root rather than relying on the + // process working directory, which may already point at another + // repo if the user switched while this refresh was in flight. + hasConflicts, err := mergeconflicts.FileHasConflictMarkers( + filepath.Join(env.git.RepoPaths.WorktreePath(), file.Path), + file.ConflictMarkerSize) if err != nil { self.c.Log.Error(err) } else if !hasConflicts { @@ -558,48 +1368,123 @@ func (self *RefreshHelper) refreshStateFiles() error { if len(pathsToStage) > 0 { self.c.LogAction(self.c.Tr.Actions.StageResolvedFiles) - if err := self.c.Git().WorkingTree.StageFiles(pathsToStage, nil); err != nil { + if err := env.git.WorkingTree.StageFiles(pathsToStage, nil); err != nil { return err } } } - files := self.c.Git().Loaders.FileLoader. + files := env.git.Loaders.FileLoader. GetStatusFiles(git_commands.GetStatusFileOptions{ - ForceShowUntracked: self.c.Contexts().Files.ForceShowUntracked(), + ForceShowUntracked: captured.forceShowUntracked, + Background: env.backgroundRoutine, }) - conflictFileCount := 0 - for _, file := range files { - if file.HasMergeConflicts { - conflictFileCount++ + conflictedPaths := lo.FilterMap(files, func(file *models.File, _ int) (string, bool) { + return file.Path, file.HasMergeConflicts + }) + + repoState := self.c.State().GetRepoState() + workingTreeState := env.git.Status.WorkingTreeState() + if workingTreeState.None() { + // No operation is in progress (any more), so forget that we started one. + // This also covers an operation that was finished or aborted externally. + repoState.SetMergeOrRebaseStartedInLazygit(false) + } + + if workingTreeState.Any() && len(conflictedPaths) == 0 { + if prevConflictFileCount > 0 && repoState.GetMergeOrRebaseStartedInLazygit() { + // The conflicts of an operation we started have just been resolved + // (e.g. in the user's editor). Offer to continue it. We only do this + // for operations we started ourselves; prompting for one that was + // started outside lazygit (e.g. by a coding agent) would be confusing. + self.onUIThreadUnlessRepoChanged(env, func() { + // The merge-conflicts scope of this refresh also notices that + // the conflicts are gone and escapes from the merge conflicts + // view to the files context (see RefreshMergeState), but it + // runs concurrently with us, and its escape refuses to push + // the files context over a popup. So if our prompt opens + // first, the escape does nothing, and closing the prompt + // would land the user in the dead merge conflicts view. + // Escape it ourselves before opening the prompt, so that the + // prompt always opens on top of the files context. + if self.c.Context().IsCurrent(self.c.Contexts().MergeConflicts) { + self.mergeConflictsHelper.ResetMergeState() + self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{}) + } + self.mergeAndRebaseHelper.PromptToContinueRebase() + }) } + } else { + // Either there's no operation in progress any more, or new conflicts have + // appeared. Either way, a "continue?" prompt we're showing is now stale + // (e.g. the operation was continued or aborted outside lazygit), so + // dismiss it rather than leave the user with a prompt that would fail. + // Guard on the generation like the sibling PromptToContinueRebase + // bounce above: if the repo was switched while this refresh was in + // flight, a prompt showing now belongs to the new repo, so leave it be. + self.onUIThreadUnlessRepoChanged(env, func() { + self.mergeAndRebaseHelper.DismissContinueRebasePromptIfShowing() + }) } - if self.c.Git().Status.WorkingTreeState().Any() && conflictFileCount == 0 && prevConflictFileCount > 0 { - self.c.OnUIThread(func() error { return self.mergeAndRebaseHelper.PromptToContinueRebase() }) - } - - fileTreeViewModel.RWMutex.Lock() - - // only taking over the filter if it hasn't already been set by the user. - if conflictFileCount > 0 && prevConflictFileCount == 0 { - if fileTreeViewModel.GetStatusFilter() == filetree.DisplayAll { - fileTreeViewModel.SetStatusFilter(filetree.DisplayConflicted) - self.c.Contexts().Files.GetView().Subtitle = self.c.Tr.FilterLabelConflictingFiles + self.onUIThreadUnlessRepoChanged(env, func() { + // only taking over the filter if it hasn't already been set by the user. + if len(conflictedPaths) > 0 && prevConflictFileCount == 0 { + if fileTreeViewModel.GetStatusFilter() == filetree.DisplayAll { + fileTreeViewModel.SetStatusFilter(filetree.DisplayConflicted) + self.c.Contexts().Files.GetView().Subtitle = self.c.Tr.FilterLabelConflictingFiles + } + } else if len(conflictedPaths) == 0 && fileTreeViewModel.GetStatusFilter() == filetree.DisplayConflicted { + fileTreeViewModel.SetStatusFilterPreservingSelection(filetree.DisplayAll) + self.c.Contexts().Files.GetView().Subtitle = "" } - } else if conflictFileCount == 0 && fileTreeViewModel.GetStatusFilter() == filetree.DisplayConflicted { - fileTreeViewModel.SetStatusFilter(filetree.DisplayAll) - self.c.Contexts().Files.GetView().Subtitle = "" - } - self.c.Model().Files = files - fileTreeViewModel.SetTree() - fileTreeViewModel.RWMutex.Unlock() + if fileTreeViewModel.GetStatusFilter() == filetree.DisplayConflicted { + fileTreeViewModel.RememberConflictedPaths(conflictedPaths) + } + + self.c.Model().Submodules = submoduleConfigs + self.c.Model().Files = files + markWorktreeFiles(files, self.c.Model().Worktrees, env.git.RepoPaths.WorktreePath()) + fileTreeViewModel.SetTree() + }) return nil } +// markWorktreeFiles marks the files that are linked worktrees of this repo, so +// that the files view can render them as such. `git status` reports a worktree +// as an untracked directory, i.e. with a trailing slash, which we take off: +// keeping it would build a directory node with a nameless file inside it. +// +// It must run on the UI thread, as it works on the model. Both models it needs +// are written by refreshes of their own, so it is called after either of them +// lands; it reports whether it changed anything. +func markWorktreeFiles(files []*models.File, worktrees []*models.Worktree, worktreePath string) bool { + changed := false + + for _, file := range files { + absPath := filepath.Join(worktreePath, file.Path) + isWorktree := lo.SomeBy(worktrees, func(worktree *models.Worktree) bool { + return worktree.Path == absPath + }) + + if isWorktree != file.IsWorktree { + file.IsWorktree = isWorktree + changed = true + } + if isWorktree { + if trimmed := strings.TrimSuffix(file.Path, "/"); trimmed != file.Path { + file.Path = trimmed + changed = true + } + } + } + + return changed +} + // the reflogs panel is the only panel where we cache data, in that we only // load entries that have been created since we last ran the call. This means // we need to be more careful with how we use this, and to ensure we're emptying @@ -607,153 +1492,394 @@ func (self *RefreshHelper) refreshStateFiles() error { // This method also manages two things: ReflogCommits and FilteredReflogCommits. // FilteredReflogCommits are rendered in the reflogs panel, and ReflogCommits // are used by the branches panel to obtain recency values for sorting. -func (self *RefreshHelper) refreshReflogCommits() error { - // pulling state into its own variable in case it gets swapped out for another state - // and we get an out of bounds exception - model := self.c.Model() - - refresh := func(stateCommits *[]*models.Commit, filterPath string, filterAuthor string) error { +// refreshReflogCommits returns the (non-filtered) ReflogCommits it loaded, so +// that a subsequent branches refresh can use them for recency sorting without +// having to read them back out of the model. +func (self *RefreshHelper) refreshReflogCommits(captured capturedReflogState, env refreshEnv, selectTopEntry bool) ([]*models.Commit, error) { + // load does the git work on the worker and returns the new value for a + // reflog slice, reading the existing slice (captured on the UI thread) for + // the incremental fetch. The caller writes the result in the bounce. + load := func(existing []*models.Commit, filterPath string, filterAuthor string) ([]*models.Commit, error) { var lastReflogCommit *models.Commit - if filterPath == "" && filterAuthor == "" && len(*stateCommits) > 0 { - lastReflogCommit = (*stateCommits)[0] + if filterPath == "" && filterAuthor == "" && len(existing) > 0 { + lastReflogCommit = existing[0] } - commits, onlyObtainedNewReflogCommits, err := self.c.Git().Loaders.ReflogCommitLoader. - GetReflogCommits(self.c.Model().HashPool, lastReflogCommit, filterPath, filterAuthor) + commits, onlyObtainedNewReflogCommits, err := env.git.Loaders.ReflogCommitLoader. + GetReflogCommits(captured.hashPool, lastReflogCommit, filterPath, filterAuthor) if err != nil { - return err + return nil, err } if onlyObtainedNewReflogCommits { - *stateCommits = append(commits, *stateCommits...) - } else { - *stateCommits = commits + return append(commits, existing...), nil } - return nil + return commits, nil } - if err := refresh(&model.ReflogCommits, "", ""); err != nil { - return err + reflogCommits, err := load(captured.reflogCommits, "", "") + if err != nil { + return nil, err } - if self.c.Modes().Filtering.Active() { - if err := refresh(&model.FilteredReflogCommits, self.c.Modes().Filtering.GetPath(), self.c.Modes().Filtering.GetAuthor()); err != nil { - return err + filteredReflogCommits := reflogCommits + if captured.filteringActive { + filteredReflogCommits, err = load(captured.filteredReflogCommits, captured.filterPath, captured.filterAuthor) + if err != nil { + return nil, err } - } else { - model.FilteredReflogCommits = model.ReflogCommits } - self.refreshView(self.c.Contexts().ReflogCommits) - return nil + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().ReflogCommits = reflogCommits + self.c.Model().FilteredReflogCommits = filteredReflogCommits + // Setting the selection here, in the same bounce that writes the list, + // keeps it on the UI thread and atomic with the list update. + if selectTopEntry { + self.c.Contexts().ReflogCommits.SetSelectedLineIdx(0) + } + }) + + self.refreshView(self.c.Contexts().ReflogCommits, env) + return reflogCommits, nil } -func (self *RefreshHelper) refreshRemotes() error { - prevSelectedRemote := self.c.Contexts().Remotes.GetSelected() - - remotes, err := self.c.Git().Loaders.RemoteLoader.GetRemotes() +func (self *RefreshHelper) refreshRemotes(prevSelectedRemote *models.Remote, env refreshEnv) ([]*models.Remote, error) { + remotes, err := env.git.Loaders.RemoteLoader.GetRemotes() if err != nil { - return err + return nil, err } - self.c.Model().Remotes = remotes + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().Remotes = remotes - // we need to ensure our selected remote branches aren't now outdated - if prevSelectedRemote != nil && self.c.Model().RemoteBranches != nil { - // find remote now - for _, remote := range remotes { - if remote.Name == prevSelectedRemote.Name { - self.c.Model().RemoteBranches = remote.Branches - break + hadPrs := len(self.c.Model().PullRequestsMap) != 0 + self.rebuildPullRequestsMap() + if !hadPrs && len(self.c.Model().PullRequestsMap) != 0 { + // if we didn't have PRs in the map before but now we do, we need to redraw the branches view + self.refreshView(self.c.Contexts().Branches, env) + } + + // we need to ensure our selected remote branches aren't now outdated + if prevSelectedRemote != nil && self.c.Model().RemoteBranches != nil { + // find remote now + for _, remote := range remotes { + if remote.Name == prevSelectedRemote.Name { + self.c.Model().RemoteBranches = remote.Branches + break + } } } - } + }) - self.refreshView(self.c.Contexts().Remotes) - self.refreshView(self.c.Contexts().RemoteBranches) - return nil + self.refreshView(self.c.Contexts().Remotes, env) + self.refreshView(self.c.Contexts().RemoteBranches, env) + return remotes, nil } -func (self *RefreshHelper) loadWorktrees() { - worktrees, err := self.c.Git().Loaders.Worktrees.GetWorktrees() +func (self *RefreshHelper) loadWorktrees(env refreshEnv) []*models.Worktree { + worktrees, err := env.git.Loaders.Worktrees.GetWorktrees() if err != nil { self.c.Log.Error(err) - self.c.Model().Worktrees = []*models.Worktree{} + return []*models.Worktree{} } - - self.c.Model().Worktrees = worktrees + return worktrees } -func (self *RefreshHelper) refreshWorktrees() { - self.loadWorktrees() +func (self *RefreshHelper) refreshWorktrees(env refreshEnv, branchesAreRefreshing bool) { + worktrees := self.loadWorktrees(env) - // need to refresh branches because the branches view shows worktrees against - // branches - self.refreshView(self.c.Contexts().Branches) - self.refreshView(self.c.Contexts().Worktrees) + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().Worktrees = worktrees + + // A worktree inside our working tree is one of the files, so the files + // view has to be told about the ones we just loaded (see + // markWorktreeFiles). Rebuild the tree because a file's path can change. + if markWorktreeFiles(self.c.Model().Files, worktrees, env.git.RepoPaths.WorktreePath()) { + self.c.Contexts().Files.FileTreeViewModel.SetTree() + self.refreshView(self.c.Contexts().Files, env) + } + }) + + // The branches view shows worktrees against branches, so it needs to be + // rendered again as well. When the branches are being refreshed too, they + // render after waiting for the write above, so leave it to them. + if !branchesAreRefreshing { + self.refreshView(self.c.Contexts().Branches, env) + } + self.refreshView(self.c.Contexts().Worktrees, env) } -func (self *RefreshHelper) refreshStashEntries() { - self.c.Model().StashEntries = self.c.Git().Loaders.StashLoader. - GetStashEntries(self.c.Modes().Filtering.GetPath()) +func (self *RefreshHelper) refreshStashEntries(filterPath string, env refreshEnv) { + stashEntries := env.git.Loaders.StashLoader. + GetStashEntries(filterPath) - self.refreshView(self.c.Contexts().Stash) + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().StashEntries = stashEntries + }) + + self.refreshView(self.c.Contexts().Stash, env) } // never call this on its own, it should only be called from within refreshCommits() -func (self *RefreshHelper) refreshStatus() { - self.c.Mutexes().RefreshingStatusMutex.Lock() - defer self.c.Mutexes().RefreshingStatusMutex.Unlock() +func (self *RefreshHelper) refreshStatus(env refreshEnv) { + workingTreeState := env.git.Status.WorkingTreeState() + repoName := env.git.RepoPaths.RepoName() - currentBranch := self.refsHelper.GetCheckedOutRef() - if currentBranch == nil { - // need to wait for branches to refresh - return - } + self.onUIThreadUnlessRepoChanged(env, func() { + // Read the checked-out branch and the linked worktree name here on the UI + // thread: both derive from models (Branches, Worktrees) that their + // refreshes now write via bounces, so reading them on the worker would + // see stale values from before those bounces applied. + currentBranch := self.refsHelper.GetCheckedOutRef() + if currentBranch == nil { + // need to wait for branches to refresh + return + } + linkedWorktreeName := self.worktreeHelper.GetLinkedWorktreeName() - workingTreeState := self.c.Git().Status.WorkingTreeState() - linkedWorktreeName := self.worktreeHelper.GetLinkedWorktreeName() - - repoName := self.c.Git().RepoPaths.RepoName() - - status := presentation.FormatStatus(repoName, currentBranch, types.ItemOperationNone, linkedWorktreeName, workingTreeState, self.c.Tr, self.c.UserConfig()) - - self.c.SetViewContent(self.c.Views().Status, status) + status := presentation.FormatStatus(repoName, currentBranch, types.ItemOperationNone, linkedWorktreeName, workingTreeState, self.c.Tr, self.c.UserConfig()) + self.c.SetViewContent(self.c.Views().Status, status) + }) } -func (self *RefreshHelper) refForLog() string { - bisectInfo := self.c.Git().Bisect.GetInfo() - self.c.Model().BisectInfo = bisectInfo +// refForLog returns the ref to log commits from, along with the bisect info it +// read to decide that. The caller writes the bisect info to the model (in its +// bounce) rather than refForLog doing it, so the model write stays on the UI +// thread. +func (self *RefreshHelper) refForLog(env refreshEnv) (string, *git_commands.BisectInfo) { + bisectInfo := env.git.Bisect.GetInfo() if !bisectInfo.Started() { - return "HEAD" + return "HEAD", bisectInfo } // need to see if our bisect's current commit is reachable from our 'new' ref. - if bisectInfo.Bisecting() && !self.c.Git().Bisect.ReachableFromStart(bisectInfo) { - return bisectInfo.GetNewHash() + if bisectInfo.Bisecting() && !env.git.Bisect.ReachableFromStart(bisectInfo) { + return bisectInfo.GetNewHash(), bisectInfo } - return bisectInfo.GetStartHash() + return bisectInfo.GetStartHash(), bisectInfo } -func (self *RefreshHelper) refreshView(context types.Context) { - // Re-applying the filter must be done before re-rendering the view, so that - // the filtered list model is up to date for rendering. - self.searchHelper.ReApplyFilter(context) +func (self *RefreshHelper) refreshView(context types.Context, env refreshEnv) { + // refreshView is called from the worker goroutine that drives async + // refreshes, so bounce to the UI thread before mutating view content. Guard + // on the generation like the model-update bounces do: if the repo was + // switched while the refresh was in flight, its model write was already + // dropped, so there's nothing fresh to render — and the captured context + // belongs to the old repo's now-replaced context tree anyway. + self.onUIThreadUnlessRepoChanged(env, func() { + // Re-applying the filter must be done before re-rendering the view, so that + // the filtered list model is up to date for rendering. + self.searchHelper.ReApplyFilter(context) - self.c.PostRefreshUpdate(context) + self.c.PostRefreshUpdateWithOptions(context, types.OnFocusOpts{ + KeepScrollPosition: env.keepScrollPosition, + SkipMainViewUpdate: env.skipMainViewUpdate, + }) - self.c.AfterLayout(func() error { - // Re-applying the search must be done after re-rendering the view though, - // so that the "x of y" status is shown correctly. - // - // Also, it must be done after layout, because otherwise FocusPoint - // hasn't been called yet (see ListContextTrait.FocusLine), which means - // that the scroll position might be such that the entire visible - // content is outside the viewport. And this would cause problems in - // searchModelCommits. - self.searchHelper.ReApplySearch(context) - return nil + self.c.AfterLayout(func() error { + // Re-applying the search must be done after re-rendering the view though, + // so that the "x of y" status is shown correctly. + // + // Also, it must be done after layout, because otherwise FocusPoint + // hasn't been called yet (see ListContextTrait.FocusLine), which means + // that the scroll position might be such that the entire visible + // content is outside the viewport. And this would cause problems in + // searchModelCommits. + self.searchHelper.ReApplySearch(context) + return nil + }) }) } + +func (self *RefreshHelper) refreshGithubPullRequests(branches []*models.Branch, remotes []*models.Remote, env refreshEnv) { + clearPullRequests := func() { + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().PullRequests = nil + self.c.Model().PullRequestsMap = nil + }) + } + + githubRemotes := getAuthenticatedGithubRemotes(self.getGithubRemotes(remotes, env), env.git.GitHub.GetAuthToken) + if len(githubRemotes) == 0 { + clearPullRequests() + return + } + + baseInfo := getGithubBaseRemote(githubRemotes, env.git.GitHub.ConfiguredBaseRemoteName()) + if baseInfo == nil { + clearPullRequests() + + if !self.githubBaseRemotePromptDismissed[env.git.RepoPaths.RepoPath()] { + self.promptForBaseGithubRepo(githubRemotes) + } + return + } + + self.setGithubPullRequests(baseInfo, branches, env) +} + +type githubRemoteInfo struct { + remote *models.Remote + serviceInfo hosting_service.ServiceInfo + authToken string +} + +func (self *RefreshHelper) getGithubRemotes(remotes []*models.Remote, env refreshEnv) []githubRemoteInfo { + return lo.FilterMap(remotes, func(remote *models.Remote, _ int) (githubRemoteInfo, bool) { + if len(remote.Urls) == 0 { + return githubRemoteInfo{}, false + } + serviceInfo, err := env.git.HostingService.GetServiceInfo(remote.Urls[0]) + if err != nil || serviceInfo.Provider != "github" { + return githubRemoteInfo{}, false + } + return githubRemoteInfo{remote: remote, serviceInfo: serviceInfo}, true + }) +} + +// getAuthenticatedGithubRemotes drops remotes for which no auth token is +// available and attaches the resolved token to the rest. Token lookups are +// cached by host so that multiple remotes pointing at the same instance +// (e.g. origin + a fork on github.com) only trigger one lookup. +func getAuthenticatedGithubRemotes(githubRemotes []githubRemoteInfo, getAuthToken func(host string) string) []githubRemoteInfo { + tokensByHost := map[string]string{} + return lo.FilterMap(githubRemotes, func(info githubRemoteInfo, _ int) (githubRemoteInfo, bool) { + host := info.serviceInfo.WebDomain + token, cached := tokensByHost[host] + if !cached { + token = getAuthToken(host) + tokensByHost[host] = token + } + if token == "" { + return githubRemoteInfo{}, false + } + info.authToken = token + return info, true + }) +} + +func getGithubBaseRemote(githubRemotes []githubRemoteInfo, configuredRemoteName string) *githubRemoteInfo { + findRemoteByName := func(name string) *githubRemoteInfo { + info, ok := lo.Find(githubRemotes, func(info githubRemoteInfo) bool { + return info.remote.Name == name + }) + if !ok { + return nil + } + return &info + } + + if configuredRemoteName != "" { + return findRemoteByName(configuredRemoteName) + } + + if len(githubRemotes) == 1 { + return &githubRemotes[0] + } + + // Not sure if "upstream" is really a common convention for the name of the remote that PRs are + // made against, but if it exists it's pretty likely to be the one we want. + if info := findRemoteByName("upstream"); info != nil { + return info + } + + return nil +} + +func (self *RefreshHelper) promptForBaseGithubRepo(githubRemotes []githubRemoteInfo) { + menuItems := lo.Map(githubRemotes, func(info githubRemoteInfo, _ int) *types.MenuItem { + return &types.MenuItem{ + LabelColumns: []string{info.remote.Name, style.FgCyan.Sprint(info.serviceInfo.RepoName)}, + OnPress: func() error { + return self.c.WithWaitingStatus(self.c.Tr.FetchingPullRequests, func(gocui.Task) error { + if err := self.c.Git().GitHub.SetConfiguredBaseRemoteName(info.remote.Name); err != nil { + self.c.Log.Error(err) + } + + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.PULL_REQUESTS}}) + return nil + }) + }, + } + }) + + _ = self.c.Menu(types.CreateMenuOptions{ + Title: self.c.Tr.SelectRemoteRepository, + Items: menuItems, + OnCancel: func() error { + if self.githubBaseRemotePromptDismissed == nil { + self.githubBaseRemotePromptDismissed = make(map[string]bool) + } + self.githubBaseRemotePromptDismissed[self.c.Git().RepoPaths.RepoPath()] = true + return nil + }, + }) +} + +func (self *RefreshHelper) rebuildPullRequestsMap() { + self.c.Model().PullRequestsMap = git_commands.GenerateGithubPullRequestMap( + self.c.Model().PullRequests, + self.c.Model().Branches, + self.c.Model().Remotes, + ) +} + +func (self *RefreshHelper) setGithubPullRequests(baseInfo *githubRemoteInfo, branches []*models.Branch, env refreshEnv) { + if len(branches) == 0 { + return + } + + trackingBranches := lo.Filter(branches, func(branch *models.Branch, _ int) bool { + return branch.IsTrackingRemote() + }) + branchNames := lo.Map(trackingBranches, func(branch *models.Branch, _ int) string { + return branch.UpstreamBranch + }) + + prs, err := env.git.GitHub.FetchRecentPRs(branchNames, &baseInfo.serviceInfo, baseInfo.authToken) + if err != nil { + self.c.Log.Error("error fetching pull requests from GitHub: " + err.Error()) + return + } + + self.savePullRequestsToCache(prs, env) + + self.onUIThreadUnlessRepoChanged(env, func() { + self.c.Model().PullRequests = prs + // Rebuilding here rather than on the worker means the map is built from + // the branches and remotes as they are on the UI thread, after their + // own refreshes' bounces have applied. + self.rebuildPullRequestsMap() + // This lands whenever the network call happens to return, and only + // changes how the branches are rendered, not which one is selected, so + // it has no business moving the viewport. + self.c.PostRefreshUpdateWithOptions(self.c.Contexts().Branches, + types.OnFocusOpts{KeepScrollPosition: true}) + }) +} + +func (self *RefreshHelper) savePullRequestsToCache(prs []*models.GithubPullRequest, env refreshEnv) { + // Key the cache by the repo the refresh was started for, not the live one: + // this runs on a worker, and if the user switched repos while the fetch was + // in flight, the live instance would file the old repo's pull requests + // under the new repo's path. + repoPath := env.git.RepoPaths.RepoPath() + cached := lo.Map(prs, func(pr *models.GithubPullRequest, _ int) config.CachedPullRequest { + return config.CachedPullRequest{ + HeadRefName: pr.HeadRefName, + Number: pr.Number, + Title: pr.Title, + State: pr.State, + ChecksState: pr.ChecksState, + Url: pr.Url, + HeadRepositoryOwner: pr.HeadRepositoryOwner.Login, + } + }) + + if err := self.c.GetConfig().SaveCachedGithubPullRequests(repoPath, cached); err != nil { + self.c.Log.Warnf("error saving GitHub pull request cache: %v", err) + } +} diff --git a/pkg/gui/controllers/helpers/refresh_helper_test.go b/pkg/gui/controllers/helpers/refresh_helper_test.go new file mode 100644 index 000000000..5e58c56a3 --- /dev/null +++ b/pkg/gui/controllers/helpers/refresh_helper_test.go @@ -0,0 +1,382 @@ +package helpers + +import ( + "path/filepath" + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/hosting_service" + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gui/context/traits" + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" + "github.com/stefanhaller/git-todo-parser/todo" + "github.com/stretchr/testify/assert" +) + +func TestCaptureLocalCommitSelectionRange(t *testing.T) { + testCases := []struct { + name string + commits []*models.Commit + selectedIdx int + rangeStartIdx int + expected *localCommitSelectionRange + }{ + { + name: "captures selected commit and range start", + commits: makeCommits("a", "b"), + selectedIdx: 1, + rangeStartIdx: 0, + expected: &localCommitSelectionRange{ + selectedHash: "b", + rangeStartHash: "a", + mode: traits.RangeSelectModeSticky, + }, + }, + { + name: "ignores invalid range start index", + commits: makeCommits("a"), + selectedIdx: 0, + rangeStartIdx: 1, + expected: nil, + }, + { + name: "ignores empty selected hash", + commits: append(makeCommits("a"), makeTodoCommit(todo.UpdateRef)), + selectedIdx: 1, + rangeStartIdx: 0, + expected: nil, + }, + { + name: "ignores empty range start hash", + commits: append(makeCommits("a"), makeTodoCommit(todo.Exec)), + selectedIdx: 0, + rangeStartIdx: 1, + expected: nil, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + selectionRange := captureLocalCommitSelectionRange( + testCase.commits, + testCase.selectedIdx, + testCase.rangeStartIdx, + traits.RangeSelectModeSticky, + ) + + assert.Equal(t, testCase.expected, selectionRange) + }) + } +} + +func TestFindLocalCommitSelectionRange(t *testing.T) { + type expectation struct { + selectedIdx int + rangeStartIdx int + found bool + } + + selectionRange := localCommitSelectionRange{ + selectedHash: "b", + rangeStartHash: "c", + mode: traits.RangeSelectModeSticky, + } + + testCases := []struct { + name string + commits []*models.Commit + expected expectation + }{ + { + name: "finds selection after commits are inserted above it", + commits: makeCommits("new", "a", "b", "c"), + expected: expectation{ + selectedIdx: 2, + rangeStartIdx: 3, + found: true, + }, + }, + { + name: "finds selection that did not move", + commits: makeCommits("a", "b", "c"), + expected: expectation{ + selectedIdx: 1, + rangeStartIdx: 2, + found: true, + }, + }, + { + name: "reports not found when a hash is missing", + commits: makeCommits("a", "b"), + expected: expectation{}, + }, + { + name: "skips todo entries with the same hash as a selected commit", + commits: []*models.Commit{ + makeTodoCommitWithHash("b", todo.Revert), + makeCommits("a")[0], + makeCommits("b")[0], + makeCommits("c")[0], + }, + expected: expectation{ + selectedIdx: 2, + rangeStartIdx: 3, + found: true, + }, + }, + { + name: "falls back to a todo entry when the selected commit became one", + commits: []*models.Commit{ + makeTodoCommitWithHash("b", todo.Pick), + makeCommits("c")[0], + }, + expected: expectation{ + selectedIdx: 0, + rangeStartIdx: 1, + found: true, + }, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + selectedIdx, rangeStartIdx, found := findLocalCommitSelectionRange(testCase.commits, &selectionRange) + actual := expectation{ + selectedIdx: selectedIdx, + rangeStartIdx: rangeStartIdx, + found: found, + } + + assert.Equal(t, testCase.expected, actual) + }) + } +} + +func TestFindNewConflictedCommit(t *testing.T) { + testCases := []struct { + name string + previousCommits []*models.Commit + commits []*models.Commit + expectedIdx *int + }{ + { + name: "finds a newly conflicted commit", + previousCommits: makeCommits("a", "b"), + commits: []*models.Commit{ + makeCommits("a")[0], + makeConflictedCommit("b"), + }, + expectedIdx: lo.ToPtr(1), + }, + { + name: "finds a different conflicted commit", + previousCommits: []*models.Commit{ + makeConflictedCommit("a"), + }, + commits: []*models.Commit{ + makeConflictedCommit("b"), + }, + expectedIdx: lo.ToPtr(0), + }, + { + name: "ignores the same conflicted commit", + previousCommits: []*models.Commit{ + makeConflictedCommit("a"), + }, + commits: []*models.Commit{ + makeConflictedCommit("a"), + }, + expectedIdx: nil, + }, + { + name: "reports not found when there is no conflict", + previousCommits: makeCommits("a"), + commits: makeCommits("a", "b"), + expectedIdx: nil, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + idx := findNewConflictedCommit(testCase.previousCommits, testCase.commits) + + assert.Equal(t, testCase.expectedIdx != nil, idx != nil) + if idx != nil { + assert.Equal(t, *testCase.expectedIdx, *idx) + } + }) + } +} + +func TestGetGithubBaseRemote(t *testing.T) { + cases := []struct { + name string + githubRemotes []githubRemoteInfo + configuredRemote string + expected string + }{ + { + name: "configured remote wins", + githubRemotes: makeGithubRemoteInfoList("origin", "upstream", "fork"), + configuredRemote: "fork", + expected: "fork", + }, + { + name: "configured remote not in github remotes returns nil", + githubRemotes: makeGithubRemoteInfoList("origin"), + configuredRemote: "missing", + expected: "", + }, + { + name: "single github remote is auto-picked", + githubRemotes: makeGithubRemoteInfoList("myremote"), + configuredRemote: "", + expected: "myremote", + }, + { + name: "upstream is preferred when multiple github remotes exist", + githubRemotes: makeGithubRemoteInfoList("origin", "upstream", "fork"), + configuredRemote: "", + expected: "upstream", + }, + { + name: "no upstream and multiple remotes returns nil", + githubRemotes: makeGithubRemoteInfoList("origin", "fork"), + configuredRemote: "", + expected: "", + }, + { + name: "empty list returns nil", + githubRemotes: nil, + configuredRemote: "", + expected: "", + }, + } + + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + result := getGithubBaseRemote(c.githubRemotes, c.configuredRemote) + if c.expected == "" { + assert.Nil(t, result) + } else { + assert.NotNil(t, result) + assert.Equal(t, c.expected, result.remote.Name) + } + }) + } +} + +func TestGetAuthenticatedGithubRemotes(t *testing.T) { + githubRemotes := []githubRemoteInfo{ + makeGithubRemoteInfo("origin", "github.com"), + makeGithubRemoteInfo("fork", "github.com"), + makeGithubRemoteInfo("enterprise", "ghe.example.com"), + makeGithubRemoteInfo("missing-auth", "no-token.example.com"), + } + + callsByHost := map[string]int{} + result := getAuthenticatedGithubRemotes(githubRemotes, func(host string) string { + callsByHost[host]++ + switch host { + case "github.com": + return "github-token" + case "ghe.example.com": + return "ghe-token" + default: + return "" + } + }) + + assert.Equal(t, []githubRemoteInfo{ + makeAuthenticatedGithubRemoteInfo("origin", "github.com", "github-token"), + makeAuthenticatedGithubRemoteInfo("fork", "github.com", "github-token"), + makeAuthenticatedGithubRemoteInfo("enterprise", "ghe.example.com", "ghe-token"), + }, result) + // Two remotes share github.com; the lookup runs only once. + assert.Equal(t, map[string]int{ + "github.com": 1, + "ghe.example.com": 1, + "no-token.example.com": 1, + }, callsByHost) +} + +func TestMarkWorktreeFiles(t *testing.T) { + worktreePath := filepath.Join("/", "path", "to", "repo") + worktrees := []*models.Worktree{ + {Path: worktreePath}, + {Path: filepath.Join(worktreePath, "worktree1")}, + {Path: filepath.Join(worktreePath, "dir", "worktree2")}, + {Path: filepath.Join("/", "path", "to", "worktree3")}, + } + + t.Run("marks the files that are worktrees, and takes their slash off", func(t *testing.T) { + files := []*models.File{ + {Path: "file"}, + {Path: "worktree1/"}, + {Path: "dir/worktree2/"}, + {Path: "dir/"}, + } + + assert.True(t, markWorktreeFiles(files, worktrees, worktreePath)) + assert.Equal(t, []*models.File{ + {Path: "file"}, + {Path: "worktree1", IsWorktree: true}, + {Path: "dir/worktree2", IsWorktree: true}, + {Path: "dir/"}, + }, files) + }) + + t.Run("reports no change when there is nothing to mark", func(t *testing.T) { + files := []*models.File{{Path: "file"}, {Path: "dir/"}} + + assert.False(t, markWorktreeFiles(files, worktrees, worktreePath)) + }) + + t.Run("unmarks a file whose worktree is gone", func(t *testing.T) { + files := []*models.File{{Path: "worktree1", IsWorktree: true}} + + assert.True(t, markWorktreeFiles(files, nil, worktreePath)) + assert.Equal(t, []*models.File{{Path: "worktree1"}}, files) + }) +} + +func makeGithubRemoteInfoList(names ...string) []githubRemoteInfo { + return lo.Map(names, func(name string, _ int) githubRemoteInfo { + return makeGithubRemoteInfo(name, name) + }) +} + +func makeGithubRemoteInfo(name string, webDomain string) githubRemoteInfo { + return githubRemoteInfo{ + remote: &models.Remote{Name: name}, + serviceInfo: hosting_service.ServiceInfo{ + RepoName: name, + WebDomain: webDomain, + }, + } +} + +func makeAuthenticatedGithubRemoteInfo(name string, webDomain string, authToken string) githubRemoteInfo { + info := makeGithubRemoteInfo(name, webDomain) + info.authToken = authToken + return info +} + +func makeCommits(hashes ...string) []*models.Commit { + hashPool := &utils.StringPool{} + return lo.Map(hashes, func(hash string, _ int) *models.Commit { + return models.NewCommit(hashPool, models.NewCommitOpts{Hash: hash}) + }) +} + +func makeTodoCommit(action todo.TodoCommand) *models.Commit { + return models.NewCommit(&utils.StringPool{}, models.NewCommitOpts{Action: action}) +} + +func makeTodoCommitWithHash(hash string, action todo.TodoCommand) *models.Commit { + return models.NewCommit(&utils.StringPool{}, models.NewCommitOpts{Hash: hash, Action: action}) +} + +func makeConflictedCommit(hash string) *models.Commit { + return models.NewCommit(&utils.StringPool{}, models.NewCommitOpts{Hash: hash, Status: models.StatusConflicted}) +} diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go index d52d9bbad..0fcbeace3 100644 --- a/pkg/gui/controllers/helpers/refs_helper.go +++ b/pkg/gui/controllers/helpers/refs_helper.go @@ -5,9 +5,9 @@ import ( "strings" "text/template" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -31,15 +31,6 @@ func NewRefsHelper( } } -func (self *RefsHelper) SelectFirstBranchAndFirstCommit() { - self.c.Contexts().Branches.SetSelection(0) - self.c.Contexts().ReflogCommits.SetSelection(0) - self.c.Contexts().LocalCommits.SetSelection(0) - self.c.Contexts().Branches.GetView().SetOriginY(0) - self.c.Contexts().ReflogCommits.GetView().SetOriginY(0) - self.c.Contexts().LocalCommits.GetView().SetOriginY(0) -} - func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions) error { waitingStatus := options.WaitingStatus if waitingStatus == "" { @@ -49,12 +40,28 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions cmdOptions := git_commands.CheckoutOptions{Force: false, EnvVars: options.EnvVars} refresh := func() { - self.SelectFirstBranchAndFirstCommit() - // loading a heap of commits is slow so we limit them whenever doing a reset self.c.Contexts().LocalCommits.SetLimitCommits(true) - self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true}) + scope := []types.RefreshableView{ + types.COMMITS, + types.BRANCHES, + types.FILES, + types.REFLOG, + types.WORKTREES, + types.BISECT_INFO, + types.STAGING, + } + if options.RefreshPullRequests { + scope = append(scope, types.PULL_REQUESTS) + } + self.c.RefreshFromWorker(types.RefreshOptions{ + BatchUIUpdates: true, + Scope: scope, + BranchSelection: types.SelectCheckedOutBranch, + CommitSelection: types.SelectHeadCommit, + SelectTopReflogCommit: true, + }) } localBranch, found := lo.Find(self.c.Model().Branches, func(branch *models.Branch) bool { @@ -120,8 +127,8 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions // Shows a prompt to choose between creating a new branch or checking out a detached head func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchName string) error { - checkout := func(branchName string) error { - return self.CheckoutRef(branchName, types.CheckoutRefOptions{}) + checkout := func(branchName string, refreshPullRequests bool) error { + return self.CheckoutRef(branchName, types.CheckoutRefOptions{RefreshPullRequests: refreshPullRequests}) } // If a branch with this name already exists locally, just check it out. We @@ -130,7 +137,7 @@ func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchN if lo.ContainsBy(self.c.Model().Branches, func(branch *models.Branch) bool { return branch.Name == localBranchName }) { - return checkout(localBranchName) + return checkout(localBranchName, false) } return self.c.Menu(types.CreateMenuOptions{ @@ -150,20 +157,24 @@ func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchN if err := self.c.Git().Branch.CreateWithUpstream(localBranchName, fullBranchName); err != nil { return err } - // Do a sync refresh to make sure the new branch is visible, - // so that we see an inline status when checking it out + // Refresh the branches and check out from Then, so that the + // new branch is already in the model when CheckoutRef looks + // it up; that's what makes it show an inline status on the + // branch rather than a global waiting status. self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.BRANCHES}, + Then: func() error { + return checkout(localBranchName, true) + }, }) - return checkout(localBranchName) + return nil }, }, { Label: self.c.Tr.CheckoutTypeDetachedHead, Tooltip: self.c.Tr.CheckoutTypeDetachedHeadTooltip, OnPress: func() error { - return checkout(fullBranchName) + return checkout(fullBranchName, false) }, }, }, @@ -192,27 +203,29 @@ func (self *RefsHelper) ResetToRef(ref string, strength string, envVars []string return err } - self.c.Contexts().LocalCommits.SetSelection(0) - self.c.Contexts().ReflogCommits.SetSelection(0) // loading a heap of commits is slow so we limit them whenever doing a reset self.c.Contexts().LocalCommits.SetLimitCommits(true) - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.BRANCHES, types.REFLOG, types.COMMITS}}) + self.c.RefreshFromWorker(types.RefreshOptions{ + Scope: []types.RefreshableView{types.FILES, types.BRANCHES, types.REFLOG, types.COMMITS}, + CommitSelection: types.SelectHeadCommit, + SelectTopReflogCommit: true, + }) return nil } func (self *RefsHelper) CreateSortOrderMenu(sortOptionsOrder []string, menuPrompt string, onSelected func(sortOrder string) error, currentValue string) error { type sortMenuOption struct { - key types.Key + keys []gocui.Key label string description string sortOrder string } availableSortOptions := map[string]sortMenuOption{ - "recency": {label: self.c.Tr.SortByRecency, description: self.c.Tr.SortBasedOnReflog, key: 'r'}, - "alphabetical": {label: self.c.Tr.SortAlphabetical, description: "--sort=refname", key: 'a'}, - "date": {label: self.c.Tr.SortByDate, description: "--sort=-committerdate", key: 'd'}, + "recency": {label: self.c.Tr.SortByRecency, description: self.c.Tr.SortBasedOnReflog, keys: menuKey('r')}, + "alphabetical": {label: self.c.Tr.SortAlphabetical, description: "--sort=refname", keys: menuKey('a')}, + "date": {label: self.c.Tr.SortByDate, description: "--sort=-committerdate", keys: menuKey('d')}, } sortOptions := make([]sortMenuOption, 0, len(sortOptionsOrder)) for _, key := range sortOptionsOrder { @@ -233,7 +246,7 @@ func (self *RefsHelper) CreateSortOrderMenu(sortOptionsOrder []string, menuPromp OnPress: func() error { return onSelected(opt.sortOrder) }, - Key: opt.key, + Keys: opt.keys, Widget: types.MakeMenuRadioButton(opt.sortOrder == currentValue), } }) @@ -248,14 +261,14 @@ func (self *RefsHelper) CreateGitResetMenu(name string, ref string) error { type strengthWithKey struct { strength string label string - key types.Key + keys []gocui.Key tooltip string } strengths := []strengthWithKey{ // not i18'ing because it's git terminology - {strength: "mixed", label: "Mixed reset", key: 'm', tooltip: self.c.Tr.ResetMixedTooltip}, - {strength: "soft", label: "Soft reset", key: 's', tooltip: self.c.Tr.ResetSoftTooltip}, - {strength: "hard", label: "Hard reset", key: 'h', tooltip: self.c.Tr.ResetHardTooltip}, + {strength: "mixed", label: "Mixed reset", keys: menuKey('m'), tooltip: self.c.Tr.ResetMixedTooltip}, + {strength: "soft", label: "Soft reset", keys: menuKey('s'), tooltip: self.c.Tr.ResetSoftTooltip}, + {strength: "hard", label: "Hard reset", keys: menuKey('h'), tooltip: self.c.Tr.ResetHardTooltip}, } menuItems := lo.Map(strengths, func(row strengthWithKey, _ int) *types.MenuItem { @@ -271,11 +284,13 @@ func (self *RefsHelper) CreateGitResetMenu(name string, ref string) error { Prompt: self.c.Tr.ResetHardConfirmation, HandleConfirm: func() error { self.c.LogAction("Reset") - return self.ResetToRef(ref, row.strength, []string{}) + return self.c.WithWaitingStatus(self.c.Tr.ResettingStatus, func(gocui.Task) error { + return self.ResetToRef(ref, row.strength, []string{}) + }) }, }) }, - Key: row.key, + Keys: row.keys, Tooltip: row.tooltip, } }) @@ -300,15 +315,15 @@ func (self *RefsHelper) CreateCheckoutMenu(commit *models.Commit) error { self.c.LogAction(self.c.Tr.Actions.CheckoutCommit) return self.CheckoutRef(hash, types.CheckoutRefOptions{}) }, - Key: 'd', + Keys: menuKey('d'), }, } if len(branches) > 0 { menuItems = append(menuItems, lo.Map(branches, func(branch *models.Branch, index int) *types.MenuItem { - var key types.Key + var keys []gocui.Key if index < 9 { - key = rune(index + 1 + '0') // Convert 1-based index to key + keys = menuKey(rune(index + 1 + '0')) // Convert 1-based index to key } return &types.MenuItem{ LabelColumns: []string{fmt.Sprintf(self.c.Tr.Actions.CheckoutBranchAtCommit, branch.Name)}, @@ -316,7 +331,7 @@ func (self *RefsHelper) CreateCheckoutMenu(commit *models.Commit) error { self.c.LogAction(self.c.Tr.Actions.CheckoutBranch) return self.CheckoutRef(branch.RefName(), types.CheckoutRefOptions{}) }, - Key: key, + Keys: keys, } })...) } else { @@ -324,7 +339,7 @@ func (self *RefsHelper) CreateCheckoutMenu(commit *models.Commit) error { LabelColumns: []string{self.c.Tr.Actions.CheckoutBranch}, OnPress: func() error { return nil }, DisabledReason: &types.DisabledReason{Text: self.c.Tr.NoBranchesFoundAtCommitTooltip}, - Key: '1', + Keys: menuKey('1'), }) } @@ -352,13 +367,22 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest } refresh := func() { - if self.c.Context().Current() != self.c.Contexts().Branches { - self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{}) - } - - self.SelectFirstBranchAndFirstCommit() - - self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true}) + self.c.RefreshFromWorker(types.RefreshOptions{ + BatchUIUpdates: true, + BranchSelection: types.SelectCheckedOutBranch, + CommitSelection: types.SelectHeadCommit, + SelectTopReflogCommit: true, + Then: func() error { + // Switch to the branches panel only now, in the same batched + // frame that applies the refreshed data, so the panel switch + // and the new branch appear together rather than flashing the + // old branch list while the checkout is still in progress. + if self.c.Context().Current() != self.c.Contexts().Branches { + self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{}) + } + return nil + }, + }) } self.c.Prompt(types.PromptOpts{ @@ -371,34 +395,44 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest if newBranchName != suggestedBranchName { newBranchFunc = self.c.Git().Branch.NewWithoutTracking } - if err := newBranchFunc(newBranchName, from); err != nil { - if IsSwitchBranchUncommittedChangesError(err) { - // offer to autostash changes - self.c.Confirm(types.ConfirmOpts{ - Title: self.c.Tr.AutoStashTitle, - Prompt: self.c.Tr.AutoStashPrompt, - HandleConfirm: func() error { - if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil { - return err - } - if err := newBranchFunc(newBranchName, from); err != nil { - return err - } - err := self.c.Git().Stash.Pop(0) - // Branch switch successful so re-render the UI even if the pop operation failed (e.g. conflict). - refresh() - return err - }, - }) - return nil + // Creating the branch checks it out, which can take a while when + // the ref we're branching off is distant, so do it on a worker. + return self.c.WithWaitingStatus(self.c.Tr.CreatingBranchStatus, func(gocui.Task) error { + if err := newBranchFunc(newBranchName, from); err != nil { + if IsSwitchBranchUncommittedChangesError(err) { + // offer to autostash changes + self.c.OnUIThread(func() error { + self.c.Confirm(types.ConfirmOpts{ + Title: self.c.Tr.AutoStashTitle, + Prompt: self.c.Tr.AutoStashPrompt, + HandleConfirm: func() error { + return self.c.WithWaitingStatus(self.c.Tr.CreatingBranchStatus, func(gocui.Task) error { + if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil { + return err + } + if err := newBranchFunc(newBranchName, from); err != nil { + return err + } + err := self.c.Git().Stash.Pop(0) + // Branch switch successful so re-render the UI even if the pop operation failed (e.g. conflict). + refresh() + return err + }) + }, + }) + return nil + }) + + return nil + } + + return err } - return err - } - - refresh() - return nil + refresh() + return nil + }) }, }) @@ -412,6 +446,8 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error { return err } + mustStash := IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) + withNewBranchNamePrompt := func(baseBranchName string, f func(string) error) error { prompt := utils.ResolvePlaceholderString( self.c.Tr.NewBranchNameBranchOff, @@ -450,7 +486,9 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error { Title: self.c.Tr.MoveCommitsToNewBranch, Prompt: prompt, HandleConfirm: func() error { - return withNewBranchNamePrompt(currentBranch.Name, self.moveCommitsToNewBranchStackedOnCurrentBranch) + return withNewBranchNamePrompt(currentBranch.Name, func(newBranchName string) error { + return self.moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName, mustStash) + }) }, }) return nil @@ -470,27 +508,31 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error { { Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchFromBaseItem, shortBaseBranchName), OnPress: func() error { + commitsToCherryPick := lo.Filter(self.c.Model().Commits, func(commit *models.Commit, _ int) bool { + return commit.Status == models.StatusUnpushed + }) return withNewBranchNamePrompt(shortBaseBranchName, func(newBranchName string) error { - return self.moveCommitsToNewBranchOffOfMainBranch(newBranchName, baseBranchRef) + return self.moveCommitsToNewBranchOffOfMainBranch(newBranchName, baseBranchRef, commitsToCherryPick, mustStash) }) }, }, { Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchStackedItem, currentBranch.Name), OnPress: func() error { - return withNewBranchNamePrompt(currentBranch.Name, self.moveCommitsToNewBranchStackedOnCurrentBranch) + return withNewBranchNamePrompt(currentBranch.Name, func(newBranchName string) error { + return self.moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName, mustStash) + }) }, }, }, }) } -func (self *RefsHelper) moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName string) error { +func (self *RefsHelper) moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName string, mustStash bool) error { if err := self.c.Git().Branch.NewWithoutCheckout(newBranchName, "HEAD"); err != nil { return err } - mustStash := IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) if mustStash { if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil { return err @@ -511,18 +553,16 @@ func (self *RefsHelper) moveCommitsToNewBranchStackedOnCurrentBranch(newBranchNa } } - self.SelectFirstBranchAndFirstCommit() - - self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true}) + self.c.RefreshFromWorker(types.RefreshOptions{ + BatchUIUpdates: true, + BranchSelection: types.SelectCheckedOutBranch, + CommitSelection: types.SelectHeadCommit, + SelectTopReflogCommit: true, + }) return nil } -func (self *RefsHelper) moveCommitsToNewBranchOffOfMainBranch(newBranchName string, baseBranchRef string) error { - commitsToCherryPick := lo.Filter(self.c.Model().Commits, func(commit *models.Commit, _ int) bool { - return commit.Status == models.StatusUnpushed - }) - - mustStash := IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) +func (self *RefsHelper) moveCommitsToNewBranchOffOfMainBranch(newBranchName string, baseBranchRef string, commitsToCherryPick []*models.Commit, mustStash bool) error { if mustStash { if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil { return err @@ -538,7 +578,7 @@ func (self *RefsHelper) moveCommitsToNewBranchOffOfMainBranch(newBranchName stri } err := self.c.Git().Rebase.CherryPickCommits(commitsToCherryPick) - err = self.rebaseHelper.CheckMergeOrRebaseWithRefreshOptions(err, types.RefreshOptions{Mode: types.SYNC}) + err = self.rebaseHelper.CheckMergeOrRebaseWithRefreshOptions(err, types.RefreshOptions{}) if err != nil { return err } @@ -549,9 +589,12 @@ func (self *RefsHelper) moveCommitsToNewBranchOffOfMainBranch(newBranchName stri } } - self.SelectFirstBranchAndFirstCommit() - - self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true}) + self.c.RefreshFromWorker(types.RefreshOptions{ + BatchUIUpdates: true, + BranchSelection: types.SelectCheckedOutBranch, + CommitSelection: types.SelectHeadCommit, + SelectTopReflogCommit: true, + }) return nil } diff --git a/pkg/gui/controllers/helpers/repos_helper.go b/pkg/gui/controllers/helpers/repos_helper.go index 158606b01..c8a33bcbe 100644 --- a/pkg/gui/controllers/helpers/repos_helper.go +++ b/pkg/gui/controllers/helpers/repos_helper.go @@ -8,9 +8,9 @@ import ( "strings" "sync" - "github.com/jesseduffield/gocui" appTypes "github.com/jesseduffield/lazygit/pkg/app/types" "github.com/jesseduffield/lazygit/pkg/commands" + "github.com/jesseduffield/lazygit/pkg/commands/direnv" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/env" "github.com/jesseduffield/lazygit/pkg/gui/context" @@ -43,13 +43,23 @@ func NewRecentReposHelper( } func (self *ReposHelper) EnterSubmodule(submodule *models.SubmoduleConfig) error { + // Check before pushing onto the repo-path stack, so a refused switch + // doesn't leave a stale entry there (which escape would later switch back + // to, needlessly reloading the current repo). + if self.switchRefusedBecauseBusy() { + return nil + } + wd, err := os.Getwd() if err != nil { return err } - self.c.State().GetRepoPathStack().Push(wd) + self.c.State().GetRepoPathStack().Push(types.RepoLocation{ + Path: wd, + GitLocationEnvVars: self.c.Git().RepoPaths.GitLocationEnvVars(), + }) - return self.DispatchSwitchToRepo(submodule.FullPath(), context.NO_CONTEXT) + return self.switchTo(submodule.FullPath(), self.c.Tr.ErrRepositoryMovedOrDeleted, context.NO_CONTEXT) } func (self *ReposHelper) getCurrentBranch(path string) string { @@ -129,54 +139,170 @@ func (self *ReposHelper) CreateRecentReposMenu() error { style.FgMagenta.Sprint(path), }, OnPress: func() error { + // Check before clearing the stack, so a refused switch doesn't + // forget the submodule breadcrumb (which would leave escape + // unable to return to the parent repo). + if self.switchRefusedBecauseBusy() { + return nil + } // if we were in a submodule, we want to forget about that stack of repos // so that hitting escape in the new repo does nothing self.c.State().GetRepoPathStack().Clear() - return self.DispatchSwitchToRepo(path, context.NO_CONTEXT) + return self.switchTo(path, self.c.Tr.ErrRepositoryMovedOrDeleted, context.NO_CONTEXT) }, } }) - return self.c.Menu(types.CreateMenuOptions{Title: self.c.Tr.RecentRepos, Items: menuItems}) + return self.c.Menu(types.CreateMenuOptions{ + Title: self.c.Tr.RecentRepos, + Items: menuItems, + FilterAsYouType: true, + }) } -func (self *ReposHelper) DispatchSwitchToRepo(path string, contextKey types.ContextKey) error { - return self.DispatchSwitchTo(path, self.c.Tr.ErrRepositoryMovedOrDeleted, contextKey) +// SwitchToParentRepo switches back to the repo the current submodule was +// entered from (the top of the repo-path stack). Like the other callers that do +// work before switching, it checks for an in-flight operation *before* popping +// the stack, so a refused switch leaves the stack intact — otherwise the entry +// would be consumed and escape would no longer return to the parent once the +// operation finished. The caller must only call this when the stack is +// non-empty. +func (self *ReposHelper) SwitchToParentRepo() error { + if self.switchRefusedBecauseBusy() { + return nil + } + return self.switchToLocation(self.c.State().GetRepoPathStack().Pop(), self.c.Tr.ErrRepositoryMovedOrDeleted, context.NO_CONTEXT) } func (self *ReposHelper) DispatchSwitchTo(path string, errMsg string, contextKey types.ContextKey) error { - return self.c.WithWaitingStatus(self.c.Tr.Switching, func(gocui.Task) error { - env.UnsetGitLocationEnvVars() - originalPath, err := os.Getwd() - if err != nil { - return nil + if self.switchRefusedBecauseBusy() { + return nil + } + return self.switchTo(path, errMsg, contextKey) +} + +// switchRefusedBecauseBusy reports (and shows a toast) whether a repo switch +// must be refused because a foreground git operation is in flight. Switching +// reassigns gui.git and the process cwd, so switching mid-operation would run +// the operation's remaining git commands against the wrong repo. Callers that +// do work before the switch (creating a worktree, recording the repo-path +// stack) check this up front, so they don't do that work only to have the +// switch refused; the switch itself (switchTo) is then unguarded. +func (self *ReposHelper) switchRefusedBecauseBusy() bool { + if self.c.GocuiGui().Busy() { + self.c.ErrorToast(self.c.Tr.CantSwitchWhileOperationInProgress) + return true + } + return false +} + +// switchTo switches lazygit to the repository (or worktree) at the given path, +// which git is expected to find from that path alone. That's true of every repo +// we switch to without having been there before. +func (self *ReposHelper) switchTo(path string, errMsg string, contextKey types.ContextKey) error { + return self.switchToLocation(types.RepoLocation{Path: path}, errMsg, contextKey) +} + +// switchToLocation switches lazygit to the repository (or worktree) at the +// given location. It runs synchronously on the UI thread: the switch swaps +// gui.State (in resetState) and reassigns gui.git and the process cwd, all of +// which the UI thread also reads, so doing it here rather than on a worker +// avoids racing those reads. The heavy data loading is still dispatched +// asynchronously by the refresh that onNewRepo kicks off. +// +// Everything from here on has to find the repo the way git does, from the +// directory we're about to change to, so the location's environment goes into +// the process env before we do. Usually that just clears whatever the repo +// we're leaving needed, but going back to a repo whose git dir isn't in its +// work tree (a dotfile repo opened with --git-dir/--work-tree, say) is the +// reason we remember the environment at all: nothing in the path leads to its +// git dir. On failure we put back what the repo we're staying in needs. +func (self *ReposHelper) switchToLocation(location types.RepoLocation, errMsg string, contextKey types.ContextKey) error { + originalPath, err := os.Getwd() + if err != nil { + return nil + } + originalGitLocationEnvVars := env.GetGitLocationEnvVars() + + env.SetGitLocationEnvVars(location.GitLocationEnvVars) + + msg := utils.ResolvePlaceholderString(self.c.Tr.ChangingDirectoryTo, map[string]string{"path": location.Path}) + self.c.LogCommand(msg, false) + + if err := os.Chdir(location.Path); err != nil { + env.SetGitLocationEnvVars(originalGitLocationEnvVars) + if os.IsNotExist(err) { + return errors.New(errMsg) } + return err + } - msg := utils.ResolvePlaceholderString(self.c.Tr.ChangingDirectoryTo, map[string]string{"path": path}) - self.c.LogCommand(msg, false) - - if err := os.Chdir(path); err != nil { - if os.IsNotExist(err) { - return errors.New(errMsg) - } + if err := commands.VerifyInGitRepo(self.c.OS()); err != nil { + env.SetGitLocationEnvVars(originalGitLocationEnvVars) + if err := os.Chdir(originalPath); err != nil { return err } - if err := commands.VerifyInGitRepo(self.c.OS()); err != nil { - if err := os.Chdir(originalPath); err != nil { + return err + } + + direnvResult := self.logDirenvResult(direnv.Load(self.c.OS().Cmd)) + + if err := self.recordDirectoryHelper.RecordCurrentDirectory(); err != nil { + self.c.Log.Errorf("error recording current directory: %v", err) + } + + if err := self.onNewRepo(appTypes.StartArgs{}, contextKey); err != nil { + return err + } + + if direnvResult.Blocked { + self.promptDirenvApproval(direnvResult.EnvrcPath) + return nil + } + + return direnvResult.Err +} + +// logDirenvResult writes whatever direnv emitted to the command log and the +// debug log; both happen for every load attempt regardless of outcome. +func (self *ReposHelper) logDirenvResult(result direnv.LoadResult) direnv.LoadResult { + if result.Message != "" { + self.c.LogCommand(result.Message, false) + } + if result.Err != nil { + self.c.Log.WithError(result.Err).Warn("direnv load failed") + } + return result +} + +// promptDirenvApproval shows the user the contents of an unapproved .envrc +// and offers to run `direnv allow` for them. On confirm, we approve the +// file and re-run Load so the new env reaches subprocesses; on cancel we +// leave the env as-is (the previous repo's vars are already unloaded by +// the initial Load call, which is the correct state). +func (self *ReposHelper) promptDirenvApproval(envrcPath string) { + content, err := os.ReadFile(envrcPath) + if err != nil { + self.c.Log.WithError(err).Warn("could not read .envrc for approval prompt") + return + } + + indented := " " + strings.ReplaceAll(strings.TrimRight(string(content), "\n"), "\n", "\n ") + prompt := utils.ResolvePlaceholderString(self.c.Tr.DirenvApprovalPrompt, map[string]string{ + "confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm.String(), + "cancelKey": self.c.UserConfig().Keybinding.Universal.Return.String(), + "content": indented, + }) + + self.c.Confirm(types.ConfirmOpts{ + Title: self.c.Tr.DirenvApprovalTitle, + Prompt: prompt, + HandleConfirm: func() error { + if err := direnv.Allow(self.c.OS().Cmd, envrcPath); err != nil { return err } - - return err - } - - if err := self.recordDirectoryHelper.RecordCurrentDirectory(); err != nil { - return err - } - - self.c.Mutexes().RefreshingFilesMutex.Lock() - defer self.c.Mutexes().RefreshingFilesMutex.Unlock() - - return self.onNewRepo(appTypes.StartArgs{}, contextKey) + return self.logDirenvResult(direnv.Load(self.c.OS().Cmd)).Err + }, }) } diff --git a/pkg/gui/controllers/helpers/search_helper.go b/pkg/gui/controllers/helpers/search_helper.go index 9b3dcec64..96c4c35ba 100644 --- a/pkg/gui/controllers/helpers/search_helper.go +++ b/pkg/gui/controllers/helpers/search_helper.go @@ -4,9 +4,8 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" @@ -30,14 +29,14 @@ func NewSearchHelper( } } -func (self *SearchHelper) OpenFilterPrompt(context types.IFilterableContext) error { +func (self *SearchHelper) OpenFilterPrompt(context types.IFilterableContext) { state := self.searchState() state.PrevSearchIndex = -1 state.Context = context - self.searchPrefixView().SetContent(context.FilterPrefix(self.c.Tr)) + self.searchPrefixView().SetContent(self.c.Tr.FilterPrefix) promptView := self.promptView() promptView.ClearTextArea() self.OnPromptContentChanged("") @@ -45,10 +44,10 @@ func (self *SearchHelper) OpenFilterPrompt(context types.IFilterableContext) err self.c.Context().Push(self.c.Contexts().Search, types.OnFocusOpts{}) - return self.c.ResetKeybindings() + self.c.ResetKeybindings() } -func (self *SearchHelper) OpenSearchPrompt(context types.ISearchableContext) error { +func (self *SearchHelper) OpenSearchPrompt(context types.ISearchableContext) { state := self.searchState() state.PrevSearchIndex = -1 @@ -62,7 +61,7 @@ func (self *SearchHelper) OpenSearchPrompt(context types.ISearchableContext) err self.c.Context().Push(self.c.Contexts().Search, types.OnFocusOpts{}) - return self.c.ResetKeybindings() + self.c.ResetKeybindings() } func (self *SearchHelper) DisplayFilterStatus(context types.IFilterableContext) { @@ -71,11 +70,11 @@ func (self *SearchHelper) DisplayFilterStatus(context types.IFilterableContext) state.Context = context searchString := context.GetFilter() - self.searchPrefixView().SetContent(context.FilterPrefix(self.c.Tr)) + self.searchPrefixView().SetContent(self.c.Tr.FilterPrefix) promptView := self.promptView() keybindingConfig := self.c.UserConfig().Keybinding - promptView.SetContent(fmt.Sprintf("matches for '%s' ", searchString) + theme.OptionsFgColor.Sprintf(self.c.Tr.ExitTextFilterMode, keybindings.Label(keybindingConfig.Universal.Return))) + promptView.SetContent(fmt.Sprintf("matches for '%s' ", searchString) + theme.OptionsFgColor.Sprintf(self.c.Tr.ExitTextFilterMode, keybindingConfig.Universal.Return)) } func (self *SearchHelper) DisplaySearchStatus(context types.ISearchableContext) { @@ -104,10 +103,11 @@ func (self *SearchHelper) promptContent() string { return self.c.Contexts().Search.GetView().TextArea.GetContent() } -func (self *SearchHelper) Confirm() error { +func (self *SearchHelper) Confirm() { state := self.searchState() if self.promptContent() == "" { - return self.CancelPrompt() + self.CancelPrompt() + return } switch state.SearchType() { @@ -119,7 +119,7 @@ func (self *SearchHelper) Confirm() error { self.c.Context().Pop() } - return self.c.ResetKeybindings() + self.c.ResetKeybindings() } func (self *SearchHelper) ConfirmFilter() { @@ -176,12 +176,12 @@ func modelSearchResults(context types.ISearchableContext) []gocui.SearchPosition return context.ModelSearchResults(normalizedSearchStr, caseSensitive) } -func (self *SearchHelper) CancelPrompt() error { +func (self *SearchHelper) CancelPrompt() { self.Cancel() self.c.Context().Pop() - return self.c.ResetKeybindings() + self.c.ResetKeybindings() } func (self *SearchHelper) ScrollHistory(scrollIncrement int) { @@ -225,10 +225,7 @@ func (self *SearchHelper) OnPromptContentChanged(searchString string) { state := self.searchState() switch context := state.Context.(type) { case types.IFilterableContext: - context.SetSelection(0) - context.GetView().SetOriginY(0) - context.SetFilter(searchString, self.c.UserConfig().Gui.UseFuzzySearch()) - self.c.PostRefreshUpdate(context) + self.ApplyFilter(context, searchString) case types.ISearchableContext: // do nothing default: @@ -236,12 +233,21 @@ func (self *SearchHelper) OnPromptContentChanged(searchString string) { } } +func (self *SearchHelper) ApplyFilter(context types.IFilterableContext, filter string) { + context.SetSelection(0) + context.SetFilter(filter, self.c.UserConfig().Gui.UseFuzzySearch()) + self.c.PostRefreshUpdate(context) +} + func (self *SearchHelper) ReApplyFilter(context types.Context) { filterableContext, ok := context.(types.IFilterableContext) if ok { state := self.searchState() if context == state.Context && self.c.Context().Current().GetKey() == self.c.Contexts().Search.GetKey() { filterableContext.SetSelection(0) + // This runs as part of a refresh, and a refresh that no user action + // is behind keeps the scroll position, which would leave the view + // scrolled somewhere the filtered list no longer has anything at. filterableContext.GetView().SetOriginY(0) } filterableContext.ReApplyFilter(self.c.UserConfig().Gui.UseFuzzySearch()) diff --git a/pkg/gui/controllers/helpers/sub_commits_helper.go b/pkg/gui/controllers/helpers/sub_commits_helper.go index 080e1b456..09f32d1a9 100644 --- a/pkg/gui/controllers/helpers/sub_commits_helper.go +++ b/pkg/gui/controllers/helpers/sub_commits_helper.go @@ -49,7 +49,7 @@ func (self *SubCommitsHelper) ViewSubCommits(opts ViewSubCommitsOpts) error { return err } - self.setSubCommits(commits) + self.c.Model().SubCommits = commits self.refreshHelper.RefreshAuthors(commits) subCommitsContext := self.c.Contexts().SubCommits @@ -70,10 +70,3 @@ func (self *SubCommitsHelper) ViewSubCommits(opts ViewSubCommitsOpts) error { self.c.Context().Push(self.c.Contexts().SubCommits, types.OnFocusOpts{}) return nil } - -func (self *SubCommitsHelper) setSubCommits(commits []*models.Commit) { - self.c.Mutexes().SubCommitsMutex.Lock() - defer self.c.Mutexes().SubCommitsMutex.Unlock() - - self.c.Model().SubCommits = commits -} diff --git a/pkg/gui/controllers/helpers/suggestions_helper.go b/pkg/gui/controllers/helpers/suggestions_helper.go index de0d04843..8784d82fc 100644 --- a/pkg/gui/controllers/helpers/suggestions_helper.go +++ b/pkg/gui/controllers/helpers/suggestions_helper.go @@ -3,10 +3,12 @@ package helpers import ( "fmt" "strings" + "sync/atomic" "github.com/jesseduffield/generics/set" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -27,14 +29,20 @@ import ( type SuggestionsHelper struct { c *HelperCommon + + // filesTrie holds the repo's file paths for file-path suggestions. It's + // rebuilt asynchronously and read from the suggestions worker goroutine, so + // it lives here as an atomic pointer rather than in the (UI-thread-only) + // model. + filesTrie atomic.Pointer[patricia.Trie] } func NewSuggestionsHelper( c *HelperCommon, ) *SuggestionsHelper { - return &SuggestionsHelper{ - c: c, - } + self := &SuggestionsHelper{c: c} + self.filesTrie.Store(patricia.NewTrie()) + return self } func (self *SuggestionsHelper) getRemoteNames() []string { @@ -84,6 +92,28 @@ func (self *SuggestionsHelper) GetBranchNameSuggestionsFunc() func(string) []*ty } } +// GetWorktreeBranchNameSuggestionsFunc suggests branches you can base a new +// worktree on: local branches that aren't checked out in any worktree (you can't +// make a second worktree for them), plus remote branches that don't yet have a +// local branch of the same name. Picking a remote branch creates a new local +// tracking branch, which would fail if that local branch already existed (whether +// or not it's checked out), so we leave those out and you reach the branch via its +// local entry instead. +func (self *SuggestionsHelper) GetWorktreeBranchNameSuggestionsFunc() func(string) []*types.Suggestion { + localBranchNames := lo.FilterMap(self.c.Model().Branches, func(branch *models.Branch, _ int) (string, bool) { + _, checkedOut := git_commands.WorktreeForBranch(branch, self.c.Model().Worktrees) + return branch.Name, !checkedOut + }) + + existingLocalBranches := set.NewFromSlice(self.getBranchNames()) + remoteBranchNames := lo.Filter(self.getRemoteBranchNames("/"), func(remoteBranchName string, _ int) bool { + _, branchName, _ := strings.Cut(remoteBranchName, "/") + return !existingLocalBranches.Includes(branchName) + }) + + return FilterFunc(append(localBranchNames, remoteBranchNames...), self.c.UserConfig().Gui.UseFuzzySearch()) +} + // here we asynchronously fetch the latest set of paths in the repo and store in // self.c.Model().FilesTrie. On the main thread we'll be doing a fuzzy search via // self.c.Model().FilesTrie. So if we've looked for a file previously, we'll start with @@ -115,17 +145,20 @@ func (self *SuggestionsHelper) GetFilePathSuggestionsFunc() func(string) []*type } // cache the trie for future use - self.c.Model().FilesTrie = trie - - self.c.Contexts().Suggestions.RefreshSuggestions() + self.filesTrie.Store(trie) + self.c.OnUIThread(func() error { + self.c.Contexts().Suggestions.RefreshSuggestions() + return nil + }) return err }) return func(input string) []*types.Suggestion { + filesTrie := self.filesTrie.Load() matchingNames := []string{} if self.c.UserConfig().Gui.UseFuzzySearch() { - _ = self.c.Model().FilesTrie.VisitFuzzy(patricia.Prefix(input), true, func(prefix patricia.Prefix, item patricia.Item, skipped int) error { + _ = filesTrie.VisitFuzzy(patricia.Prefix(input), true, func(prefix patricia.Prefix, item patricia.Item, skipped int) error { matchingNames = append(matchingNames, item.(string)) return nil }) @@ -134,7 +167,7 @@ func (self *SuggestionsHelper) GetFilePathSuggestionsFunc() func(string) []*type matchingNames = utils.FilterStrings(input, matchingNames, true) } else { substrings := strings.Fields(input) - _ = self.c.Model().FilesTrie.Visit(func(prefix patricia.Prefix, item patricia.Item) error { + _ = filesTrie.Visit(func(prefix patricia.Prefix, item patricia.Item) error { for _, sub := range substrings { if !utils.CaseAwareContains(item.(string), sub) { return nil diff --git a/pkg/gui/controllers/helpers/tags_helper.go b/pkg/gui/controllers/helpers/tags_helper.go index 6a7e47219..650e4162c 100644 --- a/pkg/gui/controllers/helpers/tags_helper.go +++ b/pkg/gui/controllers/helpers/tags_helper.go @@ -28,8 +28,8 @@ func (self *TagsHelper) OpenCreateTagPrompt(ref string, onCreate func()) error { self.c.Tr.ForceTagPrompt, map[string]string{ "tagName": tagName, - "cancelKey": self.c.UserConfig().Keybinding.Universal.Return, - "confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm, + "cancelKey": self.c.UserConfig().Keybinding.Universal.Return.String(), + "confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm.String(), }, ) force := self.c.Git().Tag.HasTag(tagName) diff --git a/pkg/gui/controllers/helpers/update_helper.go b/pkg/gui/controllers/helpers/update_helper.go index 4491b4330..a108b0bf4 100644 --- a/pkg/gui/controllers/helpers/update_helper.go +++ b/pkg/gui/controllers/helpers/update_helper.go @@ -3,7 +3,7 @@ package helpers import ( "errors" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/updates" "github.com/jesseduffield/lazygit/pkg/utils" diff --git a/pkg/gui/controllers/helpers/window_arrangement_helper.go b/pkg/gui/controllers/helpers/window_arrangement_helper.go index 04f31d0fd..5379e9c09 100644 --- a/pkg/gui/controllers/helpers/window_arrangement_helper.go +++ b/pkg/gui/controllers/helpers/window_arrangement_helper.go @@ -50,6 +50,14 @@ type WindowArrangementArgs struct { // Name of the current side window (i.e. the current window in the left // section of the UI) CurrentSideWindow string + // Returns the view currently shown in the given window. When a window holds + // several tabbed views this is the selected tab, which is what the status and + // stash height special-cases key off (rather than the window itself, whose + // name is just its first tab). + ActiveViewForWindow func(window string) string + // Returns the number of content lines of the view currently shown in the given + // window. Used by the shrink-to-content feature to size a panel to its content. + ContentHeightForWindow func(window string) int // Whether the main panel is split (as is the case e.g. when a file has both // staged and unstaged changes) SplitMainPanel bool @@ -79,27 +87,31 @@ func (self *WindowArrangementHelper) GetWindowDimensions(informationStr string, repoState := self.c.State().GetRepoState() var searchPrefix string - if filterableContext, ok := repoState.GetSearchState().Context.(types.IFilterableContext); ok { - searchPrefix = filterableContext.FilterPrefix(self.c.Tr) + if _, ok := repoState.GetSearchState().Context.(types.IFilterableContext); ok { + searchPrefix = self.c.Tr.FilterPrefix } else { searchPrefix = self.c.Tr.SearchPrefix } args := WindowArrangementArgs{ - Width: width, - Height: height, - UserConfig: self.c.UserConfig(), - CurrentWindow: self.c.Context().CurrentStatic().GetWindowName(), - CurrentSideWindow: self.c.Context().CurrentSide().GetWindowName(), - SplitMainPanel: repoState.GetSplitMainPanel(), - ScreenMode: repoState.GetScreenMode(), - AppStatus: appStatus, - InformationStr: informationStr, - ShowExtrasWindow: self.c.State().GetShowExtrasWindow(), - InDemo: self.c.InDemo(), - IsAnyModeActive: self.modeHelper.IsAnyModeActive(), - InSearchPrompt: repoState.InSearchPrompt(), - SearchPrefix: searchPrefix, + Width: width, + Height: height, + UserConfig: self.c.UserConfig(), + CurrentWindow: self.c.Context().CurrentStatic().GetWindowName(), + CurrentSideWindow: self.c.Context().CurrentSide().GetWindowName(), + ActiveViewForWindow: self.windowHelper.GetViewNameForWindow, + ContentHeightForWindow: func(window string) int { + return self.windowHelper.GetContextForWindow(window).TotalContentHeight() + }, + SplitMainPanel: repoState.GetSplitMainPanel(), + ScreenMode: repoState.GetScreenMode(), + AppStatus: appStatus, + InformationStr: informationStr, + ShowExtrasWindow: self.c.State().GetShowExtrasWindow(), + InDemo: self.c.InDemo(), + IsAnyModeActive: self.modeHelper.IsAnyModeActive(), + InSearchPrompt: repoState.InSearchPrompt(), + SearchPrefix: searchPrefix, } return GetWindowDimensions(args) @@ -116,7 +128,8 @@ func shouldUsePortraitMode(args WindowArrangementArgs) bool { case "always": return true default: // "auto" or any garbage values in PortraitMode value - return args.Width <= 84 && args.Height > 45 + return args.Width <= args.UserConfig.Gui.PortraitModeAutoMaxWidth && + args.Height >= args.UserConfig.Gui.PortraitModeAutoMinHeight } } @@ -402,14 +415,15 @@ func getExtrasWindowSize(args WindowArrangementArgs) int { return baseSize + frameSize } -// The stash window by default only contains one line so that it's not hogging +// The stash view by default only contains one line so that it's not hogging // too much space, but if you access it it should take up some space. This is // the default behaviour when accordion mode is NOT in effect. If it is in effect -// then when it's accessed it will have weight 2, not 1. -func getDefaultStashWindowBox(args WindowArrangementArgs) *boxlayout.Box { - box := &boxlayout.Box{Window: "stash"} - // if the stash window is anywhere in our stack we should enlargen it - if args.CurrentSideWindow == "stash" { +// then when it's accessed it will have weight 2, not 1. The window is passed in +// because stash may be a tab of a window named after a different first tab. +func getDefaultStashWindowBox(args WindowArrangementArgs, window string) *boxlayout.Box { + box := &boxlayout.Box{Window: window} + // if the window showing stash is focused we should enlargen it + if args.CurrentSideWindow == window { box.Weight = 1 } else { box.Size = 3 @@ -420,6 +434,25 @@ func getDefaultStashWindowBox(args WindowArrangementArgs) *boxlayout.Box { func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) []*boxlayout.Box { return func(width int, height int) []*boxlayout.Box { + windows := sideWindowNames(args.UserConfig) + + // These thresholds were originally tuned for the default five side panels. + // With fewer panels there's less to fit, so scale them down proportionally + // to keep using the proportional layout at smaller heights rather than + // squashing unnecessarily. We only ever scale down: making more panels + // squash sooner tends to work against the reason people add panels. + const defaultSidePanelCount = 5 + minHeightForNormalLayout := min(28, 28*len(windows)/defaultSidePanelCount) + minHeightForTallSquashedPanels := min(21, 21*len(windows)/defaultSidePanelCount) + + boxForEachWindow := func(boxForWindow func(window string) *boxlayout.Box) []*boxlayout.Box { + boxes := make([]*boxlayout.Box, 0, len(windows)) + for _, window := range windows { + boxes = append(boxes, boxForWindow(window)) + } + return boxes + } + if args.ScreenMode == types.SCREEN_FULL || args.ScreenMode == types.SCREEN_HALF { fullHeightBox := func(window string) *boxlayout.Box { if window == args.CurrentSideWindow { @@ -435,14 +468,14 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [ } } - return []*boxlayout.Box{ - fullHeightBox("status"), - fullHeightBox("files"), - fullHeightBox("branches"), - fullHeightBox("commits"), - fullHeightBox("stash"), + return boxForEachWindow(fullHeightBox) + } else if height >= minHeightForNormalLayout { + if args.UserConfig.Gui.ShrinkSidePanelsToContent { + if boxes, ok := shrinkToContentSidePanelBoxes(args, windows, height); ok { + return boxes + } } - } else if height >= 28 { + accordionMode := args.UserConfig.Gui.ExpandFocusedSidePanel accordionBox := func(defaultBox *boxlayout.Box) *boxlayout.Box { if accordionMode && defaultBox.Window == args.CurrentSideWindow { @@ -455,20 +488,27 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [ return defaultBox } - return []*boxlayout.Box{ - { - Window: "status", - Size: 3, - }, - accordionBox(&boxlayout.Box{Window: "files", Weight: 1}), - accordionBox(&boxlayout.Box{Window: "branches", Weight: 1}), - accordionBox(&boxlayout.Box{Window: "commits", Weight: 1}), - accordionBox(getDefaultStashWindowBox(args)), + normalBox := func(window string) *boxlayout.Box { + // The status and stash sizing is a property of those views, so we key + // off the tab the window is currently showing, not the window's name + // (its first tab): otherwise grouping other tabs behind status or + // stash would wrongly impose their compact height on those tabs. + switch args.ActiveViewForWindow(window) { + case "status": + // The status view has a fixed height and is not expanded by accordion mode. + return &boxlayout.Box{Window: window, Size: 3} + case "stash": + return accordionBox(getDefaultStashWindowBox(args, window)) + default: + return accordionBox(&boxlayout.Box{Window: window, Weight: 1}) + } } + + return boxForEachWindow(normalBox) } squashedHeight := 1 - if height >= 21 { + if height >= minHeightForTallSquashedPanels { squashedHeight = 3 } @@ -486,12 +526,147 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [ } } - return []*boxlayout.Box{ - squashedSidePanelBox("status"), - squashedSidePanelBox("files"), - squashedSidePanelBox("branches"), - squashedSidePanelBox("commits"), - squashedSidePanelBox("stash"), - } + return boxForEachWindow(squashedSidePanelBox) } } + +// shrinkToContentSidePanelBoxes implements the gui.shrinkSidePanelsToContent +// feature: rather than giving every side panel an equal share of the height, we +// size each panel to its own content (plus one blank line, so it's clear there's +// nothing more below), which stops panels with little content from wasting space. +// +// The height freed up by a small panel flows to the panels that have more content +// than their share; those grow up to their own content and then scroll. If every +// panel fits its content with room to spare, there's nothing to absorb the +// leftover, so it's shared among all panels by weight (which, in accordion mode, +// gives the focused panel more of it). +// +// The status panel, and the stash panel when it's not focused, keep their +// constant height and don't take part; ok is false when there are no panels to +// size (so the caller falls back to the normal weighted layout). +func shrinkToContentSidePanelBoxes(args WindowArrangementArgs, windows []string, height int) ([]*boxlayout.Box, bool) { + const frameSize = 2 + + accordionMode := args.UserConfig.Gui.ExpandFocusedSidePanel + + // A flexible panel is one we size to its content. Fixed panels (the status + // panel, and the stash panel when unfocused) get their constant height and + // are excluded from the distribution below. + type flexiblePanel struct { + boxIndex int + desired int // target height: content rows (see below) plus the frame + weight int + height int // final height, only computed for the room-to-spare case + capped bool // true once it fits its content within its share + } + + boxes := make([]*boxlayout.Box, len(windows)) + flexible := []*flexiblePanel{} + availableForFlexible := height + for i, window := range windows { + focused := window == args.CurrentSideWindow + + // The status and stash sizing is a property of those views, so we key off + // the tab the window is currently showing, not the window's name (its first + // tab); see the comment on normalBox in sidePanelChildren. + activeView := args.ActiveViewForWindow(window) + if activeView == "status" || (activeView == "stash" && !focused) { + boxes[i] = &boxlayout.Box{Window: window, Size: 3} + availableForFlexible -= 3 + continue + } + + weight := 1 + if accordionMode && focused { + weight = args.UserConfig.Gui.ExpandedSidePanelWeight + } + // Show the content plus a blank line, so it's clear there's nothing more + // below, but never fewer than two rows: a lone blank row looks cramped, + // and an empty Files panel is the common state right after launching. + contentRows := max(args.ContentHeightForWindow(window)+1, 2) + flexible = append(flexible, &flexiblePanel{ + boxIndex: i, + desired: contentRows + frameSize, + weight: weight, + }) + } + + if len(flexible) == 0 || availableForFlexible <= 0 { + return nil, false + } + + // Water-filling: repeatedly cap the panels whose desired height is no more + // than their weighted share of what's left. Capping a panel only raises the + // others' shares, so this converges once no further panel fits its content. + // Whatever remains is what the still-uncapped panels have to share. + remaining := availableForFlexible + for { + totalWeight := 0 + for _, p := range flexible { + if !p.capped { + totalWeight += p.weight + } + } + if totalWeight == 0 { + break + } + + newlyCapped := []*flexiblePanel{} + for _, p := range flexible { + if !p.capped && p.desired*totalWeight <= remaining*p.weight { + newlyCapped = append(newlyCapped, p) + } + } + if len(newlyCapped) == 0 { + break + } + for _, p := range newlyCapped { + p.capped = true + remaining -= p.desired + } + } + + anyUncapped := false + for _, p := range flexible { + if !p.capped { + anyUncapped = true + } + } + + if anyUncapped { + // Some panels have more content than fits: give the ones that fit exactly + // their content, and let boxlayout share what's left among the rest by + // weight (they'll scroll). This is the common, real-world case. + for _, p := range flexible { + if p.capped { + boxes[p.boxIndex] = &boxlayout.Box{Window: windows[p.boxIndex], Size: p.desired} + } else { + boxes[p.boxIndex] = &boxlayout.Box{Window: windows[p.boxIndex], Weight: p.weight} + } + } + return boxes, true + } + + // Every panel fits its content with room to spare, so no panel needs to + // scroll. Share the leftover equally among them, regardless of focus and + // accordion mode: enlarging the focused panel here reveals no more content + // (it already fits) and would only make panels jump around as focus moves. + // Deal out the rounding remainder one row at a time so the heights fill the + // available space exactly. + base := remaining / len(flexible) + extra := remaining % len(flexible) + for i, p := range flexible { + p.height = p.desired + base + if i < extra { + p.height++ + } + } + + // boxlayout can't lay out a set of boxes that are all statically sized (it + // needs a weighted box to absorb the space), so we hand it the heights as + // weights: they sum to the available height, so it reproduces them exactly. + for _, p := range flexible { + boxes[p.boxIndex] = &boxlayout.Box{Window: windows[p.boxIndex], Weight: p.height} + } + return boxes, true +} diff --git a/pkg/gui/controllers/helpers/window_arrangement_helper_test.go b/pkg/gui/controllers/helpers/window_arrangement_helper_test.go index bb36ea03d..365d7f104 100644 --- a/pkg/gui/controllers/helpers/window_arrangement_helper_test.go +++ b/pkg/gui/controllers/helpers/window_arrangement_helper_test.go @@ -13,6 +13,14 @@ import ( "github.com/samber/lo" ) +// contentHeights builds a ContentHeightForWindow function from a map of window +// name to content height; windows not in the map report a height of 0. +func contentHeights(heights map[string]int) func(window string) int { + return func(window string) int { + return heights[window] + } +} + // The best way to add test cases here is to set your args and then get the // test to fail and copy+paste the output into the test case's expected string. // TODO: add more test cases @@ -24,15 +32,18 @@ func TestGetWindowDimensions(t *testing.T) { UserConfig: config.GetDefaultConfig(), CurrentWindow: "files", CurrentSideWindow: "files", - SplitMainPanel: false, - ScreenMode: types.SCREEN_NORMAL, - AppStatus: "", - InformationStr: "information", - ShowExtrasWindow: false, - InDemo: false, - IsAnyModeActive: false, - InSearchPrompt: false, - SearchPrefix: "", + // Each panel shows its first tab by default; for the special-cased + // panels (status, stash) the view name matches the window name. + ActiveViewForWindow: func(window string) string { return window }, + SplitMainPanel: false, + ScreenMode: types.SCREEN_NORMAL, + AppStatus: "", + InformationStr: "information", + ShowExtrasWindow: false, + InDemo: false, + IsAnyModeActive: false, + InSearchPrompt: false, + SearchPrefix: "", } } @@ -121,6 +132,152 @@ func TestGetWindowDimensions(t *testing.T) { B: information `, }, + { + name: "worktrees promoted to its own side panel", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.SidePanels = []config.SidePanel{ + {"status"}, + {"files", "submodules"}, + {"worktrees"}, + {"branches", "remotes", "tags"}, + {"commits", "reflog"}, + {"stash"}, + } + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭worktrees──────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭branches───────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭stash──────────────────╮│ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "stash side panel hidden", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.SidePanels = []config.SidePanel{ + {"status"}, + {"files", "worktrees", "submodules"}, + {"branches", "remotes", "tags"}, + {"commits", "reflog"}, + } + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭branches───────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "stash leading a grouped panel doesn't squash its other tabs", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.SidePanels = []config.SidePanel{ + {"status"}, + {"files", "worktrees", "submodules"}, + {"stash", "branches", "remotes", "tags"}, + {"commits", "reflog"}, + } + // The third panel is named after its first tab, stash, but is + // currently showing the branches tab, which must get full height + // rather than stash's compact height. + args.ActiveViewForWindow = func(window string) string { + if window == "stash" { + return "branches" + } + return window + } + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭stash──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, { name: "expandFocusedSidePanel", mutateArgs: func(args *WindowArrangementArgs) { @@ -285,7 +442,7 @@ func TestGetWindowDimensions(t *testing.T) { { name: "half screen mode, enlargedSideViewLocation left", mutateArgs: func(args *WindowArrangementArgs) { - args.Height = 20 // smaller height because we don't more here + args.Height = 20 // smaller height because we don't need more here args.ScreenMode = types.SCREEN_HALF args.UserConfig.Gui.EnlargedSideViewLocation = "left" }, @@ -317,7 +474,7 @@ func TestGetWindowDimensions(t *testing.T) { { name: "half screen mode, enlargedSideViewLocation top", mutateArgs: func(args *WindowArrangementArgs) { - args.Height = 20 // smaller height because we don't more here + args.Height = 20 // smaller height because we don't need more here args.ScreenMode = types.SCREEN_HALF args.UserConfig.Gui.EnlargedSideViewLocation = "top" }, @@ -346,6 +503,105 @@ func TestGetWindowDimensions(t *testing.T) { B: information `, }, + { + name: "portrait auto mode, enabled", + mutateArgs: func(args *WindowArrangementArgs) { + args.Width = 50 + args.Height = 20 + args.UserConfig.Gui.PortraitModeAutoMaxWidth = 50 + args.UserConfig.Gui.PortraitModeAutoMinHeight = 20 + }, + expected: ` + + ╭files───────────────────────────────────────────╮ + │ │ + ╰────────────────────────────────────────────────╯ + + + + ╭main────────────────────────────────────────────╮ + │ │ + │ │ + │ │ + │ │ + │ │ + │ │ + │ │ + │ │ + │ │ + │ │ + ╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "portrait auto mode, disabled because width is too large", + mutateArgs: func(args *WindowArrangementArgs) { + args.Width = 50 + args.Height = 20 + args.UserConfig.Gui.PortraitModeAutoMaxWidth = 49 + args.UserConfig.Gui.PortraitModeAutoMinHeight = 20 + }, + expected: ` + ╭main───────────────────────────╮ + ╭files──────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────╯│ │ + │ │ + │ │ + ╰───────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "portrait auto mode, disabled because height is too small", + mutateArgs: func(args *WindowArrangementArgs) { + args.Width = 50 + args.Height = 20 + args.UserConfig.Gui.PortraitModeAutoMaxWidth = 50 + args.UserConfig.Gui.PortraitModeAutoMinHeight = 21 + }, + expected: ` + ╭main───────────────────────────╮ + ╭files──────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────╯│ │ + │ │ + │ │ + ╰───────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, { name: "search mode", mutateArgs: func(args *WindowArrangementArgs) { @@ -462,6 +718,188 @@ func TestGetWindowDimensions(t *testing.T) { B: statusSpacer2 `, }, + { + name: "shrink to content, one panel overflows", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.ShrinkSidePanelsToContent = true + args.ContentHeightForWindow = contentHeights(map[string]int{ + "files": 2, + "branches": 1, + "commits": 100, + }) + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭branches───────────────╮│ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭stash──────────────────╮│ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "shrink to content, everything fits with room to spare", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.ShrinkSidePanelsToContent = true + args.ContentHeightForWindow = contentHeights(map[string]int{ + "files": 2, + "branches": 1, + "commits": 3, + }) + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭branches───────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭stash──────────────────╮│ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "shrink to content, accordion doesn't resize panels when everything fits", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.ShrinkSidePanelsToContent = true + args.UserConfig.Gui.ExpandFocusedSidePanel = true + args.CurrentSideWindow = "branches" + args.ContentHeightForWindow = contentHeights(map[string]int{ + "files": 2, + "branches": 1, + "commits": 3, + }) + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭branches───────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭stash──────────────────╮│ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, + { + name: "shrink to content, empty panel keeps two rows rather than one", + mutateArgs: func(args *WindowArrangementArgs) { + args.UserConfig.Gui.ShrinkSidePanelsToContent = true + args.ContentHeightForWindow = contentHeights(map[string]int{ + "files": 0, + "branches": 1, + "commits": 100, + }) + }, + expected: ` + ╭status─────────────────╮╭main────────────────────────────────────────────╮ + │ ││ │ + ╰───────────────────────╯│ │ + ╭files──────────────────╮│ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭branches───────────────╮│ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭commits────────────────╮│ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + │ ││ │ + ╰───────────────────────╯│ │ + ╭stash──────────────────╮│ │ + │ ││ │ + ╰───────────────────────╯╰────────────────────────────────────────────────╯ + A + A: statusSpacer1 + B: information + `, + }, } for _, test := range tests { diff --git a/pkg/gui/controllers/helpers/window_helper.go b/pkg/gui/controllers/helpers/window_helper.go index e2b0e38f0..d9fd017f7 100644 --- a/pkg/gui/controllers/helpers/window_helper.go +++ b/pkg/gui/controllers/helpers/window_helper.go @@ -3,7 +3,8 @@ package helpers import ( "fmt" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -135,5 +136,13 @@ func (self *WindowHelper) WindowForView(viewName string) string { } func (self *WindowHelper) SideWindows() []string { - return []string{"status", "files", "branches", "commits", "stash"} + return sideWindowNames(self.c.UserConfig()) +} + +// sideWindowNames returns the side panel window names in order, derived from the +// gui.sidePanels config. A panel's window name is the name of its first tab. +func sideWindowNames(userConfig *config.UserConfig) []string { + return lo.Map(userConfig.Gui.SidePanels, func(panel config.SidePanel, _ int) string { + return panel[0] + }) } diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go index 94a24e5ee..5f68cb822 100644 --- a/pkg/gui/controllers/helpers/working_tree_helper.go +++ b/pkg/gui/controllers/helpers/working_tree_helper.go @@ -97,6 +97,12 @@ func IsWorkingTreeDirtyExceptSubmodules(files []*models.File, submoduleConfigs [ return AnyStagedFilesExceptSubmodules(files, submoduleConfigs) || AnyTrackedFilesExceptSubmodules(files, submoduleConfigs) } +func GetUnstagedFilesExceptSubmodules(files []*models.File, submoduleConfigs []*models.SubmoduleConfig) []string { + return lo.FilterMap(files, func(f *models.File, _ int) (string, bool) { + return f.Path, f.HasUnstagedChanges && f.Tracked && !f.IsSubmodule(submoduleConfigs) + }) +} + func (self *WorkingTreeHelper) FileForSubmodule(submodule *models.SubmoduleConfig) *models.File { for _, file := range self.c.Model().Files { if file.IsSubmodule([]*models.SubmoduleConfig{submodule}) { @@ -141,11 +147,16 @@ func (self *WorkingTreeHelper) HandleCommitPressWithMessage(initialMessage strin func (self *WorkingTreeHelper) handleCommit(summary string, description string, forceSkipHooks bool) error { cmdObj := self.c.Git().Commit.CommitCmdObj(summary, description, forceSkipHooks) self.c.LogAction(self.c.Tr.Actions.Commit) - return self.gpgHelper.WithGpgHandling(cmdObj, git_commands.CommitGpgSign, self.c.Tr.CommittingStatus, + return self.gpgHelper.WithGpgHandlingAndSelectHeadCommit(cmdObj, git_commands.CommitGpgSign, self.c.Tr.CommittingStatus, func() error { - self.commitsHelper.ClearPreservedCommitMessage() + // This runs on a worker when the commit output is streamed, so + // bounce the preserved-message write to the UI thread. + self.c.OnUIThread(func() error { + self.commitsHelper.ClearPreservedCommitMessage() + return nil + }) return nil - }, nil) + }) } func (self *WorkingTreeHelper) switchFromCommitMessagePanelToEditor(filepath string, forceSkipHooks bool) error { @@ -189,9 +200,9 @@ func (self *WorkingTreeHelper) HandleWIPCommitPress() error { } func (self *WorkingTreeHelper) HandleCommitPress() error { - message := self.c.Contexts().CommitMessage.GetPreservedMessageAndLogError() - - if message == "" { + var initialMessage string + preservedMessage := self.c.Contexts().CommitMessage.GetPreservedMessageAndLogError() + if preservedMessage == "" { commitPrefixConfigs := self.commitPrefixConfigsForRepo() for _, commitPrefixConfig := range commitPrefixConfigs { prefixPattern := commitPrefixConfig.Pattern @@ -206,26 +217,33 @@ func (self *WorkingTreeHelper) HandleCommitPress() error { } if rgx.MatchString(branchName) { - prefix := rgx.ReplaceAllString(branchName, prefixReplace) - message = prefix + initialMessage = rgx.ReplaceAllString(branchName, prefixReplace) break } } } - return self.HandleCommitPressWithMessage(message, false) + return self.HandleCommitPressWithMessage(initialMessage, false) } func (self *WorkingTreeHelper) WithEnsureCommittableFiles(handler func() error) error { - if err := self.prepareFilesForCommit(); err != nil { - return err - } - if len(self.c.Model().Files) == 0 { return errors.New(self.c.Tr.NoFilesStagedTitle) } if !self.AnyStagedFiles() { + if self.c.UserConfig().Gui.SkipNoStagedFilesWarning { + self.c.LogAction(self.c.Tr.Actions.StageAllFiles) + if err := self.c.Git().WorkingTree.StageAll(false); err != nil { + return err + } + self.c.Refresh(types.RefreshOptions{ + Scope: []types.RefreshableView{types.FILES}, + Then: handler, + }) + return nil + } + return self.promptToStageAllAndRetry(handler) } @@ -241,7 +259,7 @@ func (self *WorkingTreeHelper) promptToStageAllAndRetry(retry func() error) erro if err := self.c.Git().WorkingTree.StageAll(false); err != nil { return err } - self.syncRefresh() + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) return retry() }, @@ -250,26 +268,6 @@ func (self *WorkingTreeHelper) promptToStageAllAndRetry(retry func() error) erro return nil } -// for when you need to refetch files before continuing an action. Runs synchronously. -func (self *WorkingTreeHelper) syncRefresh() { - self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}}) -} - -func (self *WorkingTreeHelper) prepareFilesForCommit() error { - noStagedFiles := !self.AnyStagedFiles() - if noStagedFiles && self.c.UserConfig().Gui.SkipNoStagedFilesWarning { - self.c.LogAction(self.c.Tr.Actions.StageAllFiles) - err := self.c.Git().WorkingTree.StageAll(false) - if err != nil { - return err - } - - self.syncRefresh() - } - - return nil -} - func (self *WorkingTreeHelper) commitPrefixConfigsForRepo() []config.CommitPrefixConfig { cfg, ok := self.c.UserConfig().Git.CommitPrefixes[self.c.Git().RepoPaths.RepoName()] if ok { @@ -361,7 +359,7 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin } err := self.c.Git().WorkingTree.StageFiles(selectedFilepaths, nil) - self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) return err } @@ -377,7 +375,7 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin OnPress: func() error { return onMergeStrategySelected("--ours") }, - Key: 'c', + Keys: menuKey('c'), }, { LabelColumns: []string{ @@ -387,7 +385,7 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin OnPress: func() error { return onMergeStrategySelected("--theirs") }, - Key: 'i', + Keys: menuKey('i'), }, { LabelColumns: []string{ @@ -397,7 +395,7 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin OnPress: func() error { return onMergeStrategySelected("--union") }, - Key: 'b', + Keys: menuKey('b'), }, { LabelColumns: []string{ @@ -405,7 +403,7 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin cmdColor.Sprint("git mergetool"), }, OnPress: self.OpenMergeTool, - Key: 'm', + Keys: menuKey('m'), }, }, }) diff --git a/pkg/gui/controllers/helpers/worktree_helper.go b/pkg/gui/controllers/helpers/worktree_helper.go index 671743fe6..35d515d6e 100644 --- a/pkg/gui/controllers/helpers/worktree_helper.go +++ b/pkg/gui/controllers/helpers/worktree_helper.go @@ -2,14 +2,16 @@ package helpers import ( "errors" + "path/filepath" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" ) type WorktreeHelper struct { @@ -55,105 +57,58 @@ func (self *WorktreeHelper) GetLinkedWorktreeName() string { } func (self *WorktreeHelper) NewWorktree() error { - branch := self.refsHelper.GetCheckedOutRef() - currentBranchName := branch.RefName() - - f := func(detached bool) { - self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.NewWorktreeBase, - InitialContent: currentBranchName, - FindSuggestionsFunc: self.suggestionsHelper.GetRefsSuggestionsFunc(), - HandleConfirm: func(base string) error { - // we assume that the base can be checked out - canCheckoutBase := true - return self.NewWorktreeCheckout(base, canCheckoutBase, detached, context.WORKTREES_CONTEXT_KEY) - }, - }) - } - - placeholders := map[string]string{"ref": "ref"} - - return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.WorktreeTitle, - Items: []*types.MenuItem{ - { - LabelColumns: []string{utils.ResolvePlaceholderString(self.c.Tr.CreateWorktreeFrom, placeholders)}, - OnPress: func() error { - f(false) - return nil - }, - }, - { - LabelColumns: []string{utils.ResolvePlaceholderString(self.c.Tr.CreateWorktreeFromDetached, placeholders)}, - OnPress: func() error { - f(true) - return nil - }, - }, - }, - }) -} - -func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase bool, detached bool, contextKey types.ContextKey) error { - opts := git_commands.NewWorktreeOpts{ - Base: base, - Detach: detached, - } - - f := func() error { - return self.c.WithWaitingStatus(self.c.Tr.AddingWorktree, func(gocui.Task) error { - self.c.LogAction(self.c.Tr.Actions.AddWorktree) - if err := self.c.Git().Worktree.New(opts); err != nil { - return err - } - - return self.reposHelper.DispatchSwitchTo(opts.Path, self.c.Tr.ErrWorktreeMovedOrRemoved, contextKey) - }) - } - self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.NewWorktreePath, - HandleConfirm: func(path string) error { - opts.Path = path - - if detached { - return f() - } - - if canCheckoutBase { - title := utils.ResolvePlaceholderString(self.c.Tr.NewBranchNameLeaveBlank, map[string]string{"default": base}) - // prompt for the new branch name where a blank means we just check out the branch - self.c.Prompt(types.PromptOpts{ - Title: title, - HandleConfirm: func(branchName string) error { - opts.Branch = branchName - - return f() - }, - AllowEmptyInput: true, - }) - - return nil - } - - // prompt for the new branch name - self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.NewBranchName, - HandleConfirm: func(branchName string) error { - opts.Branch = branchName - - return f() - }, - AllowEmptyInput: false, - }) - - return nil + Title: self.c.Tr.NewWorktreeForBranchTitle, + FindSuggestionsFunc: self.suggestionsHelper.GetWorktreeBranchNameSuggestionsFunc(), + HandleConfirm: func(value string) error { + return self.newWorktreeForPickerValue(value) }, }) return nil } +// newWorktreeForPickerValue classifies the value the user picked or typed in the +// worktrees-panel picker and routes to the matching creation flow: +// - an existing local branch -> a worktree that checks it out; +// - a remote branch -> a new local tracking branch + worktree; +// - anything else -> a new branch off the current ref + worktree. +// +// All three then feed the shared location menu. The picker filters out branches +// already checked out somewhere, but a verbatim type-in is still guarded here. +func (self *WorktreeHelper) newWorktreeForPickerValue(value string) error { + if branch, ok := lo.Find(self.c.Model().Branches, func(branch *models.Branch) bool { + return branch.Name == value + }); ok { + if worktree, ok := git_commands.WorktreeForBranch(branch, self.c.Model().Worktrees); ok { + return errors.New(utils.ResolvePlaceholderString(self.c.Tr.BranchCheckedOutByWorktree, + map[string]string{"branchName": branch.Name, "worktreeName": worktree.Name})) + } + + prompt := utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptCheckout, + map[string]string{"branchName": branch.Name}) + return self.promptForWorktreeLocation(branch.Name, prompt, func(path string) error { + return self.createWorktree(git_commands.NewWorktreeOpts{Path: path, Base: branch.RefName()}, context.WORKTREES_CONTEXT_KEY) + }) + } + + if _, branchName, ok := self.refsHelper.ParseRemoteBranchName(value); ok { + prompt := utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptTrackingBranch, + map[string]string{"name": branchName, "ref": value}) + return self.promptForWorktreeLocation(branchName, prompt, func(path string) error { + return self.createWorktree(git_commands.NewWorktreeOpts{Path: path, Base: value, Branch: branchName}, context.WORKTREES_CONTEXT_KEY) + }) + } + + name := SanitizedBranchName(value) + base := self.refsHelper.GetCheckedOutRef().RefName() + prompt := utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptNewBranch, + map[string]string{"name": name, "base": base}) + return self.promptForWorktreeLocation(name, prompt, func(path string) error { + return self.createWorktree(git_commands.NewWorktreeOpts{Path: path, Base: base, Branch: name}, context.WORKTREES_CONTEXT_KEY) + }) +} + func (self *WorktreeHelper) Switch(worktree *models.Worktree, contextKey types.ContextKey) error { if worktree.IsCurrent { return errors.New(self.c.Tr.AlreadyInWorktree) @@ -164,86 +119,334 @@ func (self *WorktreeHelper) Switch(worktree *models.Worktree, contextKey types.C return self.reposHelper.DispatchSwitchTo(worktree.Path, self.c.Tr.ErrWorktreeMovedOrRemoved, contextKey) } -func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error { - title := self.c.Tr.RemoveWorktreeTitle - var templateStr string - if force { - templateStr = self.c.Tr.ForceRemoveWorktreePrompt - } else { - templateStr = self.c.Tr.RemoveWorktreePrompt - } - message := utils.ResolvePlaceholderString( - templateStr, - map[string]string{ - "worktreeName": worktree.Name, - }, - ) - - self.c.Confirm(types.ConfirmOpts{ - Title: title, - Prompt: message, - HandleConfirm: func() error { - return self.c.WithWaitingStatus(self.c.Tr.RemovingWorktree, func(gocui.Task) error { - self.c.LogAction(self.c.Tr.RemoveWorktree) - if err := self.c.Git().Worktree.Delete(worktree.Path, force); err != nil { - errMessage := err.Error() - if !strings.Contains(errMessage, "--force") && - !strings.Contains(errMessage, "fatal: working trees containing submodules cannot be moved or removed") { - return err - } - - if !force { - return self.Remove(worktree, true) - } - return err - } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}}) - return nil - }) - }, - }) - - return nil +// Remove deletes the worktree without confirming first; callers are expected to +// have confirmed (or shown a menu) already. If git refuses because the worktree +// is dirty or contains submodules, we ask for confirmation and retry with +// --force. When then is non-nil it runs in place of the default refresh after a +// successful removal, letting callers chain further work such as deleting the +// worktree's branch. +func (self *WorktreeHelper) Remove(worktree *models.Worktree, then func(gocui.Task) error) error { + return self.remove(worktree, false, then) } -func (self *WorktreeHelper) Detach(worktree *models.Worktree) error { - return self.c.WithWaitingStatus(self.c.Tr.DetachingWorktree, func(gocui.Task) error { +func (self *WorktreeHelper) remove(worktree *models.Worktree, force bool, then func(gocui.Task) error) error { + return self.c.WithWaitingStatus(self.c.Tr.RemovingWorktree, func(task gocui.Task) error { + self.c.LogAction(self.c.Tr.RemoveWorktree) + if err := self.c.Git().Worktree.Delete(worktree.Path, force); err != nil { + errMessage := err.Error() + if !strings.Contains(errMessage, "--force") && + !strings.Contains(errMessage, "fatal: working trees containing submodules cannot be moved or removed") { + return err + } + + if force { + return err + } + + message := utils.ResolvePlaceholderString( + self.c.Tr.ForceRemoveWorktreePrompt, + map[string]string{ + "worktreeName": worktree.Name, + }, + ) + self.c.Confirm(types.ConfirmOpts{ + Title: self.c.Tr.RemoveWorktreeTitle, + Prompt: message, + HandleConfirm: func() error { + return self.remove(worktree, true, then) + }, + }) + return nil + } + + if then != nil { + return then(task) + } + + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}}) + return nil + }) +} + +func (self *WorktreeHelper) Detach(worktree *models.Worktree, then func(gocui.Task) error) error { + return self.c.WithWaitingStatus(self.c.Tr.DetachingWorktree, func(task gocui.Task) error { self.c.LogAction(self.c.Tr.RemovingWorktree) err := self.c.Git().Worktree.Detach(worktree.Path) if err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}}) + + if then != nil { + return then(task) + } + + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}}) return nil }) } -func (self *WorktreeHelper) ViewWorktreeOptions(context types.IListContext, ref string) error { - currentBranch := self.refsHelper.GetCheckedOutRef() - canCheckoutBase := context == self.c.Contexts().Branches && ref != currentBranch.RefName() +// worktreeParentDirCandidates returns the candidate parent directories in which +// to create a new worktree, in priority order and de-duplicated: +// +// 1. the parent directory of each existing linked worktree (in worktree order); +// 2. the configured default path (relative paths are resolved against repoPath); +// 3. the repo's parent directory, if nothing else is available. +// +// repoPath is RepoPaths.RepoPath(), which is stable regardless of which worktree +// we're currently standing in. All returned paths are absolute. +func worktreeParentDirCandidates(repoPath string, linkedWorktreePaths []string, defaultPath string) []string { + candidates := lo.Map(linkedWorktreePaths, func(path string, _ int) string { + return filepath.Dir(path) + }) - return self.ViewBranchWorktreeOptions(ref, canCheckoutBase) + if defaultPath != "" { + if filepath.IsAbs(defaultPath) { + defaultPath = filepath.Clean(defaultPath) + } else { + defaultPath = filepath.Join(repoPath, defaultPath) + } + candidates = append(candidates, defaultPath) + } + + candidates = lo.Uniq(candidates) + + if len(candidates) == 0 { + candidates = append(candidates, filepath.Dir(repoPath)) + } + + return candidates } -func (self *WorktreeHelper) ViewBranchWorktreeOptions(branchName string, canCheckoutBase bool) error { - placeholders := map[string]string{"ref": branchName} +func (self *WorktreeHelper) NewWorktreeMenuForBranch(branch *models.Branch) error { + return self.worktreeMenu( + self.newBranchAndWorktreeItem(branch.Name, branch.RefName()), + self.worktreeForBranchItem(branch), + self.detachedWorktreeItem(branch.Name, branch.RefName(), branch.Name), + ) +} +func (self *WorktreeHelper) NewWorktreeMenuForCommit(commit *models.Commit) error { + return self.worktreeMenu( + self.newBranchAndWorktreeItem(commit.ShortHash(), commit.RefName()), + self.detachedWorktreeItem(commit.ShortHash(), commit.RefName(), ""), + ) +} + +func (self *WorktreeHelper) NewWorktreeMenuForTag(tag *models.Tag) error { + return self.worktreeMenu( + self.newBranchAndWorktreeItem(tag.Name, tag.RefName()), + self.detachedWorktreeItem(tag.Name, tag.RefName(), ""), + ) +} + +func (self *WorktreeHelper) NewWorktreeMenuForStash(stash *models.StashEntry) error { + return self.worktreeMenu( + self.newBranchAndWorktreeItem(stash.RefName(), stash.FullRefName()), + self.detachedWorktreeItem(stash.RefName(), stash.FullRefName(), ""), + ) +} + +func (self *WorktreeHelper) NewWorktreeMenuForRemoteBranch(remoteBranch *models.RemoteBranch) error { + // e.g. "origin/foo" -> "foo": the local branch's (and worktree's) default name + strippedName := strings.SplitAfterN(remoteBranch.RefName(), "/", 2)[1] + + return self.worktreeMenu( + self.newLocalBranchAndWorktreeItem(remoteBranch, strippedName), + self.detachedWorktreeItem(remoteBranch.FullName(), remoteBranch.FullName(), strippedName), + ) +} + +func (self *WorktreeHelper) worktreeMenu(items ...*types.MenuItem) error { return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.WorktreeTitle, - Items: []*types.MenuItem{ - { - LabelColumns: []string{utils.ResolvePlaceholderString(self.c.Tr.CreateWorktreeFrom, placeholders)}, - OnPress: func() error { - return self.NewWorktreeCheckout(branchName, canCheckoutBase, false, context.LOCAL_BRANCHES_CONTEXT_KEY) - }, - }, - { - LabelColumns: []string{utils.ResolvePlaceholderString(self.c.Tr.CreateWorktreeFromDetached, placeholders)}, - OnPress: func() error { - return self.NewWorktreeCheckout(branchName, canCheckoutBase, true, context.LOCAL_BRANCHES_CONTEXT_KEY) - }, - }, - }, + Title: self.c.Tr.NewWorktree, + Items: items, + }) +} + +// newBranchAndWorktreeItem is the "new branch + worktree" action for a ref that +// isn't a remote branch (a branch, commit, tag or stash). ref is what we show the +// user (branch name, short hash, stash@{n}, ...); base is what we hand to +// `git worktree add`. +func (self *WorktreeHelper) newBranchAndWorktreeItem(ref string, base string) *types.MenuItem { + return &types.MenuItem{ + Label: utils.ResolvePlaceholderString(self.c.Tr.NewBranchAndWorktreeFromRef, map[string]string{"ref": ref}), + Keys: menuKey('b'), + OnPress: func() error { + return self.startNewBranchWorktree("", base, func(name string) string { + return utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptNewBranch, + map[string]string{"name": name, "base": ref}) + }) + }, + } +} + +// newLocalBranchAndWorktreeItem is the "new branch + worktree" action for a remote +// branch: the new local branch tracks the remote one, and its name defaults to the +// remote branch name with the remote stripped off. +func (self *WorktreeHelper) newLocalBranchAndWorktreeItem(remoteBranch *models.RemoteBranch, strippedName string) *types.MenuItem { + return &types.MenuItem{ + Label: utils.ResolvePlaceholderString(self.c.Tr.NewLocalBranchAndWorktreeFromRef, map[string]string{"ref": remoteBranch.FullName()}), + Keys: menuKey('b'), + OnPress: func() error { + return self.startNewBranchWorktree(strippedName, remoteBranch.FullName(), func(name string) string { + return utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptTrackingBranch, + map[string]string{"name": name, "ref": remoteBranch.FullName()}) + }) + }, + } +} + +// startNewBranchWorktree runs the shared name -> location -> create pipeline for the +// new-branch actions: prompt for the branch (and worktree) name, ask for the +// location, then create a worktree on a freshly created branch of that name. +// locationPrompt builds the location-menu prompt once the name is known. +func (self *WorktreeHelper) startNewBranchWorktree(nameInitialContent string, base string, locationPrompt func(name string) string) error { + return self.promptForName(self.c.Tr.NewBranchAndWorktreeName, nameInitialContent, func(name string) error { + return self.promptForWorktreeLocation(name, locationPrompt(name), func(path string) error { + return self.createWorktree(git_commands.NewWorktreeOpts{Path: path, Base: base, Branch: name}, context.LOCAL_BRANCHES_CONTEXT_KEY) + }) + }) +} + +// worktreeForBranchItem is the "check out an existing branch in a new worktree" +// action. It's disabled when the branch is already checked out somewhere. +func (self *WorktreeHelper) worktreeForBranchItem(branch *models.Branch) *types.MenuItem { + return &types.MenuItem{ + Label: utils.ResolvePlaceholderString(self.c.Tr.WorktreeForRef, map[string]string{"ref": branch.Name}), + Keys: menuKey('w'), + OnPress: func() error { + prompt := utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptCheckout, + map[string]string{"branchName": branch.Name}) + return self.promptForWorktreeLocation(branch.Name, prompt, func(path string) error { + return self.createWorktree(git_commands.NewWorktreeOpts{Path: path, Base: branch.RefName()}, context.LOCAL_BRANCHES_CONTEXT_KEY) + }) + }, + DisabledReason: self.branchCheckedOutDisabledReason(branch), + } +} + +// detachedWorktreeItem is the "detached worktree at a ref" action. ref is shown to +// the user; base is handed to `git worktree add`. defaultDirName is the worktree +// directory name to use; when it's empty we prompt for one instead (commits, tags +// and stashes have no good name to derive). +func (self *WorktreeHelper) detachedWorktreeItem(ref string, base string, defaultDirName string) *types.MenuItem { + prompt := utils.ResolvePlaceholderString(self.c.Tr.WorktreeLocationPromptDetached, map[string]string{"ref": ref}) + create := func(path string) error { + return self.createWorktree(git_commands.NewWorktreeOpts{Path: path, Base: base, Detach: true}, context.LOCAL_BRANCHES_CONTEXT_KEY) + } + + return &types.MenuItem{ + Label: utils.ResolvePlaceholderString(self.c.Tr.DetachedWorktreeAtRef, map[string]string{"ref": ref}), + Keys: menuKey('d'), + OnPress: func() error { + if defaultDirName != "" { + return self.promptForWorktreeLocation(defaultDirName, prompt, create) + } + return self.promptForName(self.c.Tr.NewWorktreeName, "", func(name string) error { + return self.promptForWorktreeLocation(name, prompt, create) + }) + }, + } +} + +func (self *WorktreeHelper) branchCheckedOutDisabledReason(branch *models.Branch) *types.DisabledReason { + if worktree, ok := git_commands.WorktreeForBranch(branch, self.c.Model().Worktrees); ok { + return &types.DisabledReason{ + Text: utils.ResolvePlaceholderString(self.c.Tr.BranchCheckedOutByWorktree, + map[string]string{"branchName": branch.Name, "worktreeName": worktree.Name}), + } + } + + return nil +} + +// promptForName asks for a branch/worktree name and sanitizes the response (most +// notably turning spaces into dashes so it's a valid branch name) before +// continuing. +func (self *WorktreeHelper) promptForName(title string, initialContent string, onConfirm func(name string) error) error { + self.c.Prompt(types.PromptOpts{ + Title: title, + InitialContent: initialContent, + HandleConfirm: func(response string) error { + return onConfirm(SanitizedBranchName(response)) + }, + }) + + return nil +} + +// promptForWorktreeLocation shows the location menu: one item per candidate parent +// directory (each labelled with the absolute path the worktree would end up at), +// plus an "Other…" item that opens a free-form path prompt. The chosen absolute +// path is passed to onConfirm. +func (self *WorktreeHelper) promptForWorktreeLocation(dirName string, prompt string, onConfirm func(path string) error) error { + linkedWorktreePaths := []string{} + for _, worktree := range self.c.Model().Worktrees { + if !worktree.IsMain { + linkedWorktreePaths = append(linkedWorktreePaths, worktree.Path) + } + } + parentDirs := worktreeParentDirCandidates( + self.c.Git().RepoPaths.RepoPath(), + linkedWorktreePaths, + utils.ExpandTilde(self.c.UserConfig().Worktree.DefaultPath), + ) + + targets := lo.Map(parentDirs, func(parentDir string, _ int) string { + return filepath.Join(parentDir, dirName) + }) + + menuItems := lo.Map(targets, func(target string, _ int) *types.MenuItem { + return &types.MenuItem{ + Label: target, + OnPress: func() error { return onConfirm(target) }, + } + }) + + menuItems = append(menuItems, &types.MenuItem{ + Label: self.c.Tr.WorktreeLocationOther, + OnPress: func() error { + self.c.Prompt(types.PromptOpts{ + Title: self.c.Tr.NewWorktreePath, + InitialContent: targets[0], + HandleConfirm: func(response string) error { + return onConfirm(utils.ExpandTilde(response)) + }, + }) + return nil + }, + }) + + return self.c.Menu(types.CreateMenuOptions{ + Title: self.c.Tr.WorktreeLocationTitle, + Prompt: prompt, + Items: menuItems, + }) +} + +func (self *WorktreeHelper) createWorktree(opts git_commands.NewWorktreeOpts, contextKey types.ContextKey) error { + // Check now, before we create the worktree, rather than when we come to + // switch to it afterwards: by then this operation's own waiting-status + // spinner would make Busy() true and refuse our own switch. + if self.reposHelper.switchRefusedBecauseBusy() { + return nil + } + + return self.c.WithWaitingStatus(self.c.Tr.AddingWorktree, func(gocui.Task) error { + self.c.LogAction(self.c.Tr.Actions.AddWorktree) + if err := self.c.Git().Worktree.New(opts); err != nil { + return err + } + + // The switch swaps gui.State and must run on the UI thread, but + // we're on a worker here (creating the worktree is git work), so + // dispatch it. It's unguarded (switchTo, not DispatchSwitchTo) + // because we checked above and creating the worktree is now + // complete, so switching to it is safe. + self.c.OnUIThread(func() error { + return self.reposHelper.switchTo(opts.Path, self.c.Tr.ErrWorktreeMovedOrRemoved, contextKey) + }) + return nil }) } diff --git a/pkg/gui/controllers/helpers/worktree_helper_test.go b/pkg/gui/controllers/helpers/worktree_helper_test.go new file mode 100644 index 000000000..ea975d79d --- /dev/null +++ b/pkg/gui/controllers/helpers/worktree_helper_test.go @@ -0,0 +1,94 @@ +package helpers + +import ( + "path/filepath" + "runtime" + "strings" + "testing" + + "github.com/samber/lo" + "github.com/stretchr/testify/assert" +) + +// nativePath rewrites a forward-slash test path into one that is valid on the +// host OS, so the scenarios below can be written with readable Unix-style +// paths. On Windows a leading slash is not absolute (filepath.IsAbs wants a +// drive letter), so we graft one on; relative paths are left untouched. +func nativePath(p string) string { + if runtime.GOOS == "windows" && strings.HasPrefix(p, "/") { + p = "C:" + p + } + return filepath.FromSlash(p) +} + +func TestWorktreeParentDirCandidates(t *testing.T) { + scenarios := []struct { + name string + repoPath string + linkedWorktreePaths []string + defaultPath string + expected []string + }{ + { + name: "no worktrees and no default path falls back to the repo's parent", + repoPath: "/code/myrepo", + linkedWorktreePaths: nil, + defaultPath: "", + expected: []string{"/code"}, + }, + { + name: "uses the parent of each linked worktree, in order", + repoPath: "/code/myrepo", + linkedWorktreePaths: []string{"/code/worktrees/foo", "/elsewhere/bar"}, + defaultPath: "", + expected: []string{"/code/worktrees", "/elsewhere"}, + }, + { + name: "de-duplicates parents shared by multiple worktrees", + repoPath: "/code/myrepo", + linkedWorktreePaths: []string{"/code/worktrees/foo", "/code/worktrees/bar"}, + defaultPath: "", + expected: []string{"/code/worktrees"}, + }, + { + name: "appends the default path after the worktree parents", + repoPath: "/code/myrepo", + linkedWorktreePaths: []string{"/code/worktrees/foo"}, + defaultPath: "/somewhere/else", + expected: []string{"/code/worktrees", "/somewhere/else"}, + }, + { + name: "resolves a relative default path against the repo path", + repoPath: "/code/myrepo", + linkedWorktreePaths: nil, + defaultPath: "../worktrees", + expected: []string{"/code/worktrees"}, + }, + { + name: "resolves a dot-relative default path inside the repo", + repoPath: "/code/myrepo", + linkedWorktreePaths: nil, + defaultPath: ".worktrees", + expected: []string{"/code/myrepo/.worktrees"}, + }, + { + name: "de-duplicates the default path against a worktree parent", + repoPath: "/code/myrepo", + linkedWorktreePaths: []string{"/code/worktrees/foo"}, + defaultPath: "/code/worktrees", + expected: []string{"/code/worktrees"}, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + result := worktreeParentDirCandidates( + nativePath(s.repoPath), + lo.Map(s.linkedWorktreePaths, func(p string, _ int) string { return nativePath(p) }), + nativePath(s.defaultPath), + ) + expected := lo.Map(s.expected, func(p string, _ int) string { return nativePath(p) }) + assert.Equal(t, expected, result) + }) + } +} diff --git a/pkg/gui/controllers/jump_to_side_window_controller.go b/pkg/gui/controllers/jump_to_side_window_controller.go index c0ef2faec..37829849d 100644 --- a/pkg/gui/controllers/jump_to_side_window_controller.go +++ b/pkg/gui/controllers/jump_to_side_window_controller.go @@ -1,11 +1,7 @@ package controllers import ( - "log" - - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/samber/lo" ) type JumpToSideWindowController struct { @@ -31,20 +27,23 @@ func (self *JumpToSideWindowController) Context() types.Context { func (self *JumpToSideWindowController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { windows := self.c.Helpers().Window.SideWindows() + jumpKeys := opts.Config.Universal.JumpToBlock - if len(opts.Config.Universal.JumpToBlock) != len(windows) { - log.Fatal("Jump to block keybindings cannot be set. Exactly 5 keybindings must be supplied.") - } - - return lo.Map(windows, func(window string, index int) *types.Binding { - return &types.Binding{ + // Assign jump keys to panels positionally (by default 1 to the first panel, + // 2 to the second, etc.), for as many panels as there are keys. If there are + // more panels than keys the extra panels just have no jump key, and if there + // are more keys than panels the extra keys are unused; either way panels stay + // reachable via the next/previous-panel keys. + count := min(len(windows), len(jumpKeys)) + bindings := make([]*types.Binding, 0, count) + for i := range count { + bindings = append(bindings, &types.Binding{ ViewName: "", - // by default the keys are 1, 2, 3, etc - Key: opts.GetKey(opts.Config.Universal.JumpToBlock[index]), - Modifier: gocui.ModNone, - Handler: opts.Guards.NoPopupPanel(self.goToSideWindow(window)), - } - }) + Keys: opts.GetKeys(jumpKeys[i]), + Handler: opts.Guards.NoPopupPanel(self.goToSideWindow(windows[i])), + }) + } + return bindings } func (self *JumpToSideWindowController) goToSideWindow(window string) func() error { diff --git a/pkg/gui/controllers/list_controller.go b/pkg/gui/controllers/list_controller.go index 6da196a60..c073e5141 100644 --- a/pkg/gui/controllers/list_controller.go +++ b/pkg/gui/controllers/list_controller.go @@ -1,7 +1,8 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -16,18 +17,27 @@ func NewListControllerFactory(c *ControllerCommon) *ListControllerFactory { } func (self *ListControllerFactory) Create(context types.IListContext) *ListController { - return &ListController{ + controller := &ListController{ baseController: baseController{}, c: self.c, context: context, } + controller.dragAutoscroller = helpers.NewDragAutoscroller( + self.c.HelperCommon, + context, + func(int) bool { return context.GetList().IsSelectingRange() }, + controller.handleDragAutoscroll, + ) + return controller } type ListController struct { baseController c *ControllerCommon - context types.IListContext + context types.IListContext + dragAutoscroller *helpers.DragAutoscroller + draggingWithMouse bool } func (self *ListController) Context() types.Context { @@ -126,7 +136,7 @@ func (self *ListController) handleLineChangeAux(f func(int), change int) error { self.context.SetNeedRerenderVisibleLines() } - self.context.HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true}) + self.context.HandleFocus(types.OnFocusOpts{}) } else { // If the selection did not change (because, for example, we are at the top of the list and // press up), we still want to ensure that the selection is visible. This is useful after @@ -195,9 +205,10 @@ func (self *ListController) handlePageChange(delta int) error { // must tell it explicitly to rerender. self.context.SetNeedRerenderVisibleLines() - // Since we are maintaining the scroll position ourselves above, there's no point in passing - // ScrollSelectionIntoView=true here. - self.context.HandleFocus(types.OnFocusOpts{}) + // This function scrolls the view itself, keeping the selection at the edge of + // the viewport rather than in its middle, so the scroll position is ours to + // maintain, not the focus mechanism's. + self.context.HandleFocus(types.OnFocusOpts{KeepScrollPosition: true}) return nil } @@ -243,13 +254,65 @@ func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error { self.context.GetList().SetSelection(newSelectedLineIdx) - if opts.IsDoubleClick && alreadyFocused && self.context.GetOnClick() != nil { - return self.context.GetOnClick()() + if opts.IsDoubleClick && alreadyFocused && self.context.GetOnDoubleClick() != nil { + return self.context.GetOnDoubleClick()() } + self.context.HandleFocus(types.OnFocusOpts{}) + + // Let view-specific controllers do additional click handling + if self.context.GetOnClick() != nil { + return self.context.GetOnClick()(opts) + } + return nil } +func (self *ListController) HandleDrag(opts gocui.ViewMouseBindingOpts) error { + self.draggingWithMouse = true + self.selectRangeThroughViewIndex(opts.Y) + originY, _ := self.context.GetViewTrait().ViewPortYBounds() + self.dragAutoscroller.Update(opts.Y - originY) + return nil +} + +func (self *ListController) selectRangeThroughViewIndex(viewIndex int) { + list := self.context.GetList() + newSelectedLineIdx := self.context.ViewIndexToModelIndex(viewIndex) + list.ExpandNonStickyRange(newSelectedLineIdx - list.GetSelectedLineIdx()) + + // The pointer can be outside the viewport, in which case so is the end of + // the range; the drag autoscroller takes care of following it, one line at a + // time, for as long as the pointer stays there. + self.context.HandleFocus(types.OnFocusOpts{KeepScrollPosition: true}) +} + +func (self *ListController) handleDragAutoscroll(viewIndex int) bool { + if !self.context.GetList().IsSelectingRange() { + return false + } + + self.context.SetNeedRerenderVisibleLines() + self.selectRangeThroughViewIndex(viewIndex) + return true +} + +func (self *ListController) handleDragRelease() error { + self.draggingWithMouse = false + self.dragAutoscroller.Cancel() + return nil +} + +func (self *ListController) GetOnFocusLost() func(types.OnFocusLostOpts) { + return func(types.OnFocusLostOpts) { + self.dragAutoscroller.Cancel() + if self.draggingWithMouse { + self.draggingWithMouse = false + self.c.GocuiGui().CancelMouseCapture() + } + } +} + func (self *ListController) pushContextIfNotFocused() error { if !self.isFocused() { self.c.Context().Push(self.context, types.OnFocusOpts{}) @@ -264,26 +327,22 @@ func (self *ListController) isFocused() bool { func (self *ListController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), Handler: self.HandlePrevLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItem), Handler: self.HandlePrevLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItemAlt), Handler: self.HandleNextLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItem), Handler: self.HandleNextLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevPage), Handler: self.HandlePrevPage, Description: self.c.Tr.PrevPage}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextPage), Handler: self.HandleNextPage, Description: self.c.Tr.NextPage}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTop), Handler: self.HandleGotoTop, Description: self.c.Tr.GotoTop, Alternative: ""}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottom), Handler: self.HandleGotoBottom, Description: self.c.Tr.GotoBottom, Alternative: ""}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTopAlt), Handler: self.HandleGotoTop}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottomAlt), Handler: self.HandleGotoBottom}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ScrollLeft), Handler: self.HandleScrollLeft}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ScrollRight), Handler: self.HandleScrollRight}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.HandlePrevLine}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.HandleNextLine}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.HandlePrevPage, Description: self.c.Tr.PrevPage}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.HandleNextPage, Description: self.c.Tr.NextPage}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.HandleGotoTop, Description: self.c.Tr.GotoTop}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.HandleGotoBottom, Description: self.c.Tr.GotoBottom}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.ScrollLeft), Handler: self.HandleScrollLeft}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.ScrollRight), Handler: self.HandleScrollRight}, } if self.context.RangeSelectEnabled() { bindings = append(bindings, []*types.Binding{ - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ToggleRangeSelect), Handler: self.HandleToggleRangeSelect, Description: self.c.Tr.ToggleRangeSelect}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.RangeSelectDown), Handler: self.HandleRangeSelectDown, Description: self.c.Tr.RangeSelectDown}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.RangeSelectUp), Handler: self.HandleRangeSelectUp, Description: self.c.Tr.RangeSelectUp}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.ToggleRangeSelect), Handler: self.HandleToggleRangeSelect, Description: self.c.Tr.ToggleRangeSelect}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.RangeSelectDown), Handler: self.HandleRangeSelectDown, Description: self.c.Tr.RangeSelectDown}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.RangeSelectUp), Handler: self.HandleRangeSelectUp, Description: self.c.Tr.RangeSelectUp}, }..., ) } @@ -292,7 +351,7 @@ func (self *ListController) GetKeybindings(opts types.KeybindingsOpts) []*types. } func (self *ListController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding { - return []*gocui.ViewMouseBinding{ + bindings := []*gocui.ViewMouseBinding{ { ViewName: self.context.GetViewName(), Key: gocui.MouseWheelUp, @@ -309,4 +368,22 @@ func (self *ListController) GetMouseKeybindings(opts types.KeybindingsOpts) []*g Handler: func(gocui.ViewMouseBindingOpts) error { return self.HandleScrollDown() }, }, } + + if self.context.RangeSelectEnabled() { + bindings = append(bindings, + &gocui.ViewMouseBinding{ + ViewName: self.context.GetViewName(), + Key: gocui.MouseLeft, + Modifier: gocui.ModMotion, + Handler: self.HandleDrag, + }, + &gocui.ViewMouseBinding{ + ViewName: self.context.GetViewName(), + Key: gocui.MouseRelease, + Handler: func(gocui.ViewMouseBindingOpts) error { return self.handleDragRelease() }, + }, + ) + } + + return bindings } diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index c8b0e0e12..3e4626610 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -2,15 +2,15 @@ package controllers import ( "strings" + "time" "github.com/go-errors/errors" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/context/traits" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -21,6 +21,10 @@ import ( // after selecting the 200th commit, we'll load in all the rest const COMMIT_THRESHOLD = 200 +// How long a commit move may take before the drop indicator switches to a +// "moving commits here" spinner; quick moves stay free of flicker. +const commitDragMovingIndicatorDelay = 200 * time.Millisecond + type ( PullFilesFn func() error ) @@ -30,7 +34,48 @@ type LocalCommitsController struct { *ListControllerTrait[*models.Commit] c *ControllerCommon - pullFiles PullFilesFn + pullFiles PullFilesFn + commitDrag *commitDragState + dragAutoscroller *helpers.DragAutoscroller + movingCommitsIndicatorStop chan struct{} +} + +// commitDragState tracks a mouse drag that moves the selected commits. It is +// created when the left button is pressed on the current selection, and lives +// until the button is released or the drag is canceled. +type commitDragState struct { + // Model index that was pressed; releasing without having moved collapses + // the selection to this commit, like a plain click would. + pressedIndex int + // Bounds of the selection at press time. + startIndex int + endIndex int + // Identifying information of the dragged commits, so that they can be + // found again on release even if the model was refreshed during the drag. + commitIdentities []commitDragIdentity + // Cursor and range-start position relative to startIndex, for restoring + // the selection after the move. + selectedOffset int + rangeStartOffset int + rangeSelectMode traits.RangeSelectMode + // Smallest and largest allowed insertion index. During a rebase this + // restricts the drag to the contiguous block of movable todos around the + // selection. + minInsertion int + maxInsertion int + // Current insertion index, or -1 if dropping wouldn't move anything + // (pointer over the dragged block itself). + insertionIndex int + // Whether any drag motion arrived since the press; distinguishes a drag + // from a plain click on the selection. + hasMoved bool +} + +type commitDragIdentity struct { + hash string + name string + action todo.TodoCommand + actionFlag string } var _ types.IController = &LocalCommitsController{} @@ -39,7 +84,7 @@ func NewLocalCommitsController( c *ControllerCommon, pullFiles PullFilesFn, ) *LocalCommitsController { - return &LocalCommitsController{ + controller := &LocalCommitsController{ baseController: baseController{}, c: c, pullFiles: pullFiles, @@ -50,6 +95,359 @@ func NewLocalCommitsController( c.Contexts().LocalCommits.GetSelectedItems, ), } + controller.dragAutoscroller = helpers.NewDragAutoscroller( + c.HelperCommon, + c.Contexts().LocalCommits, + controller.canCommitDragAutoscroll, + controller.handleCommitDragAutoscroll, + ) + return controller +} + +func (self *LocalCommitsController) GetMouseKeybindings(types.KeybindingsOpts) []*gocui.ViewMouseBinding { + viewName := self.context().GetViewName() + return []*gocui.ViewMouseBinding{ + { + ViewName: viewName, + FocusedView: viewName, + Key: gocui.MouseLeft, + Handler: self.handleCommitDragPress, + }, + { + ViewName: viewName, + FocusedView: viewName, + Key: gocui.MouseLeft, + Modifier: gocui.ModMotion, + Handler: self.handleCommitDrag, + }, + { + ViewName: viewName, + FocusedView: viewName, + Key: gocui.MouseRelease, + Handler: self.handleCommitDragRelease, + }, + } +} + +func (self *LocalCommitsController) handleCommitDragPress(opts gocui.ViewMouseBindingOpts) error { + context := self.context() + pressedIndex := context.ViewIndexToModelIndex(opts.Y) + startIndex, endIndex := context.GetSelectionRange() + selectedIndex, rangeStartIndex, rangeSelectMode := context.GetSelectionRangeAndMode() + selectedCommits, _, _ := context.GetSelectedItems() + // Only a single press on the current selection (of commits that may be + // moved) starts a drag; everything else falls through to the generic + // list click handling, i.e. selecting the pressed line, double-click + // actions, or dragging out a range selection. The view-index comparison + // rejects presses on section headers, which map to the model index of a + // nearby commit. + if opts.IsDoubleClick || + pressedIndex < startIndex || pressedIndex > endIndex || + context.ModelIndexToViewIndex(pressedIndex) != opts.Y || + self.midRebaseMoveCommandEnabled(selectedCommits, startIndex, endIndex) != nil { + return gocui.ErrKeybindingNotHandled + } + + minInsertion, maxInsertion := self.commitDragInsertionBounds(startIndex, endIndex) + self.commitDrag = &commitDragState{ + pressedIndex: pressedIndex, + startIndex: startIndex, + endIndex: endIndex, + commitIdentities: lo.Map(selectedCommits, func(commit *models.Commit, _ int) commitDragIdentity { + return commitDragIdentityForCommit(commit) + }), + selectedOffset: selectedIndex - startIndex, + rangeStartOffset: rangeStartIndex - startIndex, + rangeSelectMode: rangeSelectMode, + minInsertion: minInsertion, + maxInsertion: maxInsertion, + insertionIndex: -1, + } + self.restoreCommitDragHighlight() + return nil +} + +func (self *LocalCommitsController) commitDragInsertionBounds(startIndex int, endIndex int) (int, int) { + commits := self.c.Model().Commits + if !self.isRebasing() { + return 0, len(commits) + } + + minInsertion := startIndex + for minInsertion > 0 && commits[minInsertion-1].IsTODO() && commits[minInsertion-1].Status != models.StatusConflicted { + minInsertion-- + } + maxInsertion := endIndex + 1 + for maxInsertion < len(commits) && commits[maxInsertion].IsTODO() && commits[maxInsertion].Status != models.StatusConflicted { + maxInsertion++ + } + return minInsertion, maxInsertion +} + +func (self *LocalCommitsController) handleCommitDrag(opts gocui.ViewMouseBindingOpts) error { + if self.commitDrag == nil { + return gocui.ErrKeybindingNotHandled + } + + self.commitDrag.hasMoved = true + if self.updateCommitDragInsertion(opts.Y) { + self.c.PostRefreshUpdateWithOptions(self.context(), + types.OnFocusOpts{KeepScrollPosition: true}) + } + originY := self.context().GetView().OriginY() + self.dragAutoscroller.Update(opts.Y - originY) + self.restoreCommitDragHighlight() + return nil +} + +func (self *LocalCommitsController) updateCommitDragInsertion(viewIndex int) bool { + insertionIndex := self.commitDragInsertionIndex(viewIndex) + if insertionIndex >= self.commitDrag.startIndex && insertionIndex <= self.commitDrag.endIndex+1 { + insertionIndex = -1 + } + if insertionIndex == self.commitDrag.insertionIndex { + return false + } + + self.commitDrag.insertionIndex = insertionIndex + if insertionIndex < 0 { + self.context().ClearDropInsertionIndex() + } else { + self.context().SetDropInsertionIndex(insertionIndex) + } + return true +} + +// gocui moves the view cursor to the pointer position before invoking our +// handlers; move it back so that the dragged commits stay highlighted for the +// whole duration of the drag. +func (self *LocalCommitsController) restoreCommitDragHighlight() { + state := self.commitDrag + context := self.context() + view := context.GetView() + selectedIndex := state.startIndex + state.selectedOffset + rangeStartIndex := state.startIndex + state.rangeStartOffset + + view.SetCursorY(context.ModelIndexToViewIndex(selectedIndex) - view.OriginY()) + view.SetRangeSelectStart(context.ModelIndexToViewIndex(rangeStartIndex)) +} + +func (self *LocalCommitsController) commitDragInsertionIndex(viewIndex int) int { + context := self.context() + if viewIndex < 0 { + return self.commitDrag.minInsertion + } + if viewIndex >= context.TotalContentHeight() { + return self.commitDrag.maxInsertion + } + + // Rows above the dragged block insert before the pointed-at commit, rows + // below it insert after it, so that in both directions the line under + // the pointer is the one that makes way. + modelIndex := context.ViewIndexToModelIndex(viewIndex) + insertionIndex := modelIndex + if modelIndex > self.commitDrag.endIndex { + insertionIndex++ + } + return max(self.commitDrag.minInsertion, min(insertionIndex, self.commitDrag.maxInsertion)) +} + +func (self *LocalCommitsController) handleCommitDragRelease(gocui.ViewMouseBindingOpts) error { + if self.commitDrag == nil { + return gocui.ErrKeybindingNotHandled + } + + state := self.commitDrag + self.dragAutoscroller.Cancel() + self.commitDrag = nil + + if !state.hasMoved { + self.context().ClearDropInsertionIndex() + self.context().SetSelection(state.pressedIndex) + self.c.PostRefreshUpdate(self.context()) + return nil + } + if state.insertionIndex < 0 { + self.context().ClearDropInsertionIndex() + self.c.PostRefreshUpdate(self.context()) + return nil + } + + offset := state.insertionIndex - state.startIndex + if state.insertionIndex > state.endIndex { + offset = state.insertionIndex - state.endIndex - 1 + } + selectedCommits, startIndex, endIndex, found := findCommitDragBlock( + self.context().GetItems(), state.commitIdentities, + ) + if !found { + self.context().ClearDropInsertionIndex() + self.c.PostRefreshUpdate(self.context()) + return nil + } + self.context().SetSelectionRangeAndMode( + startIndex+state.selectedOffset, + startIndex+state.rangeStartOffset, + state.rangeSelectMode, + ) + self.startMovingCommitsIndicator(state.insertionIndex) + if err := self.move(selectedCommits, startIndex, endIndex, offset, + func() error { self.stopMovingCommitsIndicator(); return nil }); err != nil { + self.stopMovingCommitsIndicator() + return err + } + return nil +} + +// startMovingCommitsIndicator keeps the drop indicator visible while the move +// is running, turning it into a spinner once the grace period elapses. The +// ticker goroutine only ever touches state from the UI thread, where the +// comparison against the current stop channel makes late callbacks harmless. +func (self *LocalCommitsController) startMovingCommitsIndicator(insertionIndex int) { + self.stopMovingCommitsIndicatorTicker() + stop := make(chan struct{}) + self.movingCommitsIndicatorStop = stop + go utils.Safe(func() { + graceTimer := time.NewTimer(commitDragMovingIndicatorDelay) + defer graceTimer.Stop() + select { + case <-graceTimer.C: + self.c.OnUIThreadContentOnlyBackground(func() error { + if self.movingCommitsIndicatorStop == stop { + self.context().SetMovingCommitsInsertionIndex(insertionIndex) + self.context().HandleRender() + } + return nil + }) + case <-stop: + return + } + + rate := time.Millisecond * time.Duration(self.c.UserConfig().Gui.Spinner.Rate) + ticker := time.NewTicker(rate) + defer ticker.Stop() + for { + select { + case <-ticker.C: + self.c.OnUIThreadContentOnlyBackground(func() error { + if self.movingCommitsIndicatorStop == stop { + self.context().HandleRender() + } + return nil + }) + case <-stop: + return + } + } + }) +} + +func (self *LocalCommitsController) stopMovingCommitsIndicator() { + self.stopMovingCommitsIndicatorTicker() + self.context().ClearDropInsertionIndex() + self.c.PostRefreshUpdateWithOptions( + self.context(), types.OnFocusOpts{SkipMainViewUpdate: true}, + ) +} + +func (self *LocalCommitsController) stopMovingCommitsIndicatorTicker() { + if self.movingCommitsIndicatorStop != nil { + close(self.movingCommitsIndicatorStop) + self.movingCommitsIndicatorStop = nil + } +} + +func commitDragIdentityForCommit(commit *models.Commit) commitDragIdentity { + return commitDragIdentity{ + hash: commit.Hash(), + name: commit.Name, + action: commit.Action, + actionFlag: commit.ActionFlag, + } +} + +// findCommitDragBlock locates the dragged commits in the (possibly refreshed) +// commit list by their identity rather than by the indices recorded at press +// time. If they no longer exist as a contiguous block, or more than one block +// matches, we give up rather than guess. +func findCommitDragBlock( + commits []*models.Commit, identities []commitDragIdentity, +) ([]*models.Commit, int, int, bool) { + matchStart := -1 + for startIndex := 0; startIndex+len(identities) <= len(commits); startIndex++ { + matches := true + for offset, identity := range identities { + if commitDragIdentityForCommit(commits[startIndex+offset]) != identity { + matches = false + break + } + } + if matches { + if matchStart >= 0 { + return nil, -1, -1, false + } + matchStart = startIndex + } + } + + if matchStart < 0 { + return nil, -1, -1, false + } + endIndex := matchStart + len(identities) - 1 + return commits[matchStart : endIndex+1], matchStart, endIndex, true +} + +func (self *LocalCommitsController) GetOnFocusLost() func(types.OnFocusLostOpts) { + return func(types.OnFocusLostOpts) { + if self.commitDrag == nil { + return + } + + self.cancelCommitDrag() + } +} + +func (self *LocalCommitsController) cancelCommitDrag() { + self.dragAutoscroller.Cancel() + self.commitDrag = nil + self.c.GocuiGui().CancelMouseCapture() + self.context().ClearDropInsertionIndex() + self.c.PostRefreshUpdate(self.context()) +} + +func (self *LocalCommitsController) handleCommitDragCancel() error { + if self.commitDrag == nil { + return gocui.ErrKeybindingNotHandled + } + + self.cancelCommitDrag() + return nil +} + +// Stop autoscrolling once the insertion point has reached the end of the +// allowed range in the scroll direction; e.g. during a rebase there is no +// point in scrolling on into the section of real commits. +func (self *LocalCommitsController) canCommitDragAutoscroll(direction int) bool { + state := self.commitDrag + if state == nil { + return false + } + if direction < 0 { + return state.insertionIndex != state.minInsertion + } + return state.insertionIndex != state.maxInsertion +} + +func (self *LocalCommitsController) handleCommitDragAutoscroll(viewIndex int) bool { + if self.commitDrag == nil { + return false + } + + self.updateCommitDragInsertion(viewIndex) + self.context().SetNeedRerenderVisibleLines() + self.context().HandleRender() + self.restoreCommitDragHighlight() + return self.canCommitDragAutoscroll(self.dragAutoscroller.Direction()) } func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { @@ -57,7 +455,11 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Commits.SquashDown), + Keys: opts.GetKeys(opts.Config.Universal.Return), + Handler: self.handleCommitDragCancel, + }, + { + Keys: opts.GetKeys(opts.Config.Commits.SquashDown), Handler: opts.Guards.OutsideFilterMode(self.withItemsRange(self.squashDown)), GetDisabledReason: self.require( self.itemRangeSelected( @@ -70,7 +472,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.MarkCommitAsFixup), + Keys: opts.GetKeys(opts.Config.Commits.MarkCommitAsFixup), Handler: opts.Guards.OutsideFilterMode(self.withItemsRange(self.fixup)), GetDisabledReason: self.require( self.itemRangeSelected( @@ -83,7 +485,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.SetFixupMessage), + Keys: opts.GetKeys(opts.Config.Commits.SetFixupMessage), Handler: self.withItem(self.setFixupMessage), GetDisabledReason: self.require( self.singleItemSelected(self.canSetFixupMessage), @@ -92,7 +494,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Tooltip: self.c.Tr.SetFixupMessageTooltip, }, { - Key: opts.GetKey(opts.Config.Commits.RenameCommit), + Keys: opts.GetKeys(opts.Config.Commits.RenameCommit), Handler: self.withItem(self.reword), GetDisabledReason: self.require( self.singleItemSelected(self.rewordEnabled), @@ -103,7 +505,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Commits.RenameCommitWithEditor), + Keys: opts.GetKeys(opts.Config.Commits.RenameCommitWithEditor), Handler: self.withItem(self.rewordEditor), GetDisabledReason: self.require( self.singleItemSelected(self.rewordEnabled), @@ -111,7 +513,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Description: self.c.Tr.RewordCommitEditor, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItemsRange(self.drop), GetDisabledReason: self.require( self.itemRangeSelected( @@ -123,7 +525,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ DisplayOnScreen: true, }, { - Key: opts.GetKey(editCommitKey), + Keys: opts.GetKeys(editCommitKey), Handler: opts.Guards.OutsideFilterMode(self.withItemsRange(self.edit)), GetDisabledReason: self.require( self.itemRangeSelected(self.midRebaseCommandEnabled), @@ -137,16 +539,16 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ // The user-facing description here is 'Start interactive rebase' but internally // we're calling it 'quick-start interactive rebase' to differentiate it from // when you manually select the base commit. - Key: opts.GetKey(opts.Config.Commits.StartInteractiveRebase), + Keys: opts.GetKeys(opts.Config.Commits.StartInteractiveRebase), Handler: opts.Guards.OutsideFilterMode(self.quickStartInteractiveRebase), GetDisabledReason: self.require(self.notMidRebase(self.c.Tr.AlreadyRebasing), self.canFindCommitForQuickStart), Description: self.c.Tr.QuickStartInteractiveRebase, Tooltip: utils.ResolvePlaceholderString(self.c.Tr.QuickStartInteractiveRebaseTooltip, map[string]string{ - "editKey": keybindings.Label(editCommitKey), + "editKey": editCommitKey.String(), }), }, { - Key: opts.GetKey(opts.Config.Commits.PickCommit), + Keys: opts.GetKeys(opts.Config.Commits.PickCommit), Handler: opts.Guards.OutsideFilterMode(self.withItems(self.pick)), GetDisabledReason: self.require( self.itemRangeSelected(self.pickEnabled), @@ -155,19 +557,19 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Tooltip: self.c.Tr.PickCommitTooltip, }, { - Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit), + Keys: opts.GetKeys(opts.Config.Commits.CreateFixupCommit), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.createFixupCommit)), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.CreateFixupCommit, Tooltip: utils.ResolvePlaceholderString( self.c.Tr.CreateFixupCommitTooltip, map[string]string{ - "squashAbove": keybindings.Label(opts.Config.Commits.SquashAboveCommits), + "squashAbove": opts.Config.Commits.SquashAboveCommits.String(), }, ), }, { - Key: opts.GetKey(opts.Config.Commits.SquashAboveCommits), + Keys: opts.GetKeys(opts.Config.Commits.SquashAboveCommits), Handler: opts.Guards.OutsideFilterMode(self.squashFixupCommits), GetDisabledReason: self.require( self.notMidRebase(self.c.Tr.AlreadyRebasing), @@ -177,7 +579,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Commits.MoveDownCommit), + Keys: opts.GetKeys(opts.Config.Commits.MoveDownCommit), Handler: opts.Guards.OutsideFilterMode(self.withItemsRange(self.moveDown)), GetDisabledReason: self.require(self.itemRangeSelected( self.midRebaseMoveCommandEnabled, @@ -186,7 +588,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Description: self.c.Tr.MoveDownCommit, }, { - Key: opts.GetKey(opts.Config.Commits.MoveUpCommit), + Keys: opts.GetKeys(opts.Config.Commits.MoveUpCommit), Handler: opts.Guards.OutsideFilterMode(self.withItemsRange(self.moveUp)), GetDisabledReason: self.require(self.itemRangeSelected( self.midRebaseMoveCommandEnabled, @@ -195,14 +597,14 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Description: self.c.Tr.MoveUpCommit, }, { - Key: opts.GetKey(opts.Config.Commits.PasteCommits), + Keys: opts.GetKeys(opts.Config.Commits.PasteCommits), Handler: opts.Guards.OutsideFilterMode(self.paste), GetDisabledReason: self.require(self.canPaste), Description: self.c.Tr.PasteCommits, DisplayStyle: &style.FgCyan, }, { - Key: opts.GetKey(opts.Config.Commits.MarkCommitAsBaseForRebase), + Keys: opts.GetKeys(opts.Config.Commits.MarkCommitAsBaseForRebase), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.markAsBaseCommit)), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.MarkAsBaseCommit, @@ -211,13 +613,13 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ // overriding this navigation keybinding because we might need to load // more commits on demand { - Key: opts.GetKey(opts.Config.Universal.StartSearch), + Keys: opts.GetKeys(opts.Config.Universal.StartSearch), Handler: self.openSearch, Description: self.c.Tr.StartSearch, Tag: "navigation", }, { - Key: opts.GetKey(opts.Config.Commits.AmendToCommit), + Keys: opts.GetKeys(opts.Config.Commits.AmendToCommit), Handler: self.withItem(self.amendTo), GetDisabledReason: self.require(self.singleItemSelected(self.canAmend)), Description: self.c.Tr.Amend, @@ -225,7 +627,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.ResetCommitAuthor), + Keys: opts.GetKeys(opts.Config.Commits.ResetCommitAuthor), Handler: self.withItemsRange(self.amendAttribute), GetDisabledReason: self.require(self.itemRangeSelected(self.canAmendRange)), Description: self.c.Tr.AmendCommitAttribute, @@ -233,31 +635,58 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Commits.RevertCommit), + Keys: opts.GetKeys(opts.Config.Commits.RevertCommit), Handler: self.withItemsRange(self.revert), GetDisabledReason: self.require(self.itemRangeSelected()), Description: self.c.Tr.Revert, Tooltip: self.c.Tr.RevertCommitTooltip, }, { - Key: opts.GetKey(opts.Config.Commits.CreateTag), + Keys: opts.GetKeys(opts.Config.Commits.CreateTag), Handler: self.withItem(self.createTag), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.TagCommit, Tooltip: self.c.Tr.TagCommitTooltip, }, { - Key: opts.GetKey(opts.Config.Commits.OpenLogMenu), + Keys: opts.GetKeys(opts.Config.Commits.OpenLogMenu), Handler: self.handleOpenLogMenu, Description: self.c.Tr.OpenLogMenu, Tooltip: self.c.Tr.OpenLogMenuTooltip, OpensMenu: true, }, + { + Keys: opts.GetKeys(opts.Config.Commits.OpenPullRequestInBrowser), + Handler: self.openPRInBrowser, + GetDisabledReason: self.checkedOutBranchHasPR, + Description: self.c.Tr.OpenPullRequestInBrowser, + }, } return bindings } +func (self *LocalCommitsController) checkedOutBranchHasPR() *types.DisabledReason { + branch := self.c.Model().CheckedOutBranch + if _, ok := self.c.Model().PullRequestsMap[branch]; !ok { + return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true} + } + return nil +} + +func (self *LocalCommitsController) openPRInBrowser() error { + pr, ok := self.c.Model().PullRequestsMap[self.c.Model().CheckedOutBranch] + if !ok { + // Should be guarded against by the DisabledReason check, but be defensive in case + // PullRequestsMap was updated concurrently by a background refresh + return errors.New(self.c.Tr.NoPullRequestForBranch) + } + + self.c.LogAction(self.c.Tr.Actions.OpenPullRequest) + + return self.c.OS().OpenLink(pr.Url) +} + func (self *LocalCommitsController) GetOnRenderToMain() func() { return func() { self.c.Helpers().Diff.WithDiffModeCheck(func() { @@ -317,9 +746,14 @@ func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit, Title: self.c.Tr.Squash, Prompt: self.c.Tr.SureSquashThisCommit, HandleConfirm: func() error { - return self.c.WithWaitingStatus(self.c.Tr.SquashingStatus, func(gocui.Task) error { + commits := self.c.Model().Commits + self.selectRebaseResultCommit(startIdx) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.SquashingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.SquashCommitDown) - return self.interactiveRebase(todo.Squash, startIdx, endIdx, parentIdx) + return self.interactiveRebase(commits, todo.Squash, startIdx, endIdx, parentIdx) }) }, }) @@ -338,22 +772,32 @@ func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, star Items: []*types.MenuItem{ { Label: self.c.Tr.Fixup, - Key: 'f', + Keys: menuKey('f'), OnPress: func() error { - return self.c.WithWaitingStatus(self.c.Tr.FixingStatus, func(gocui.Task) error { + commits := self.c.Model().Commits + self.selectRebaseResultCommit(startIdx) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.FixingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.FixupCommit) - return self.interactiveRebase(todo.Fixup, startIdx, endIdx, parentIdx) + return self.interactiveRebase(commits, todo.Fixup, startIdx, endIdx, parentIdx) }) }, Tooltip: self.c.Tr.FixupTooltip, }, { Label: self.c.Tr.FixupKeepMessage, - Key: 'c', + Keys: menuKey('c'), OnPress: func() error { - return self.c.WithWaitingStatus(self.c.Tr.FixingStatus, func(gocui.Task) error { + commits := self.c.Model().Commits + self.selectRebaseResultCommit(startIdx) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.FixingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.FixupCommitKeepMessage) - return self.interactiveRebaseWithFlag(todo.Fixup, startIdx, endIdx, parentIdx, "-C") + return self.interactiveRebaseWithFlag(commits, todo.Fixup, startIdx, endIdx, parentIdx, "-C") }) }, Tooltip: self.c.Tr.FixupKeepMessageTooltip, @@ -380,7 +824,7 @@ func (self *LocalCommitsController) setFixupMessage(commit *models.Commit) error Items: []*types.MenuItem{ { Label: self.c.Tr.FixupDiscardMessage, - Key: 'f', + Keys: menuKey('f'), OnPress: func() error { return self.updateTodosWithFlag(todo.Fixup, []*models.Commit{commit}, "") }, @@ -388,7 +832,7 @@ func (self *LocalCommitsController) setFixupMessage(commit *models.Commit) error }, { Label: self.c.Tr.FixupKeepMessage, - Key: 'c', + Keys: menuKey('c'), OnPress: func() error { return self.updateTodosWithFlag(todo.Fixup, []*models.Commit{commit}, "-C") }, @@ -451,12 +895,14 @@ func (self *LocalCommitsController) switchFromCommitMessagePanelToEditor(filepat return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil } func (self *LocalCommitsController) handleReword(summary string, description string) error { - if models.IsHeadCommit(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx()) { + commits := self.c.Model().Commits + selectedIdx := self.c.Contexts().LocalCommits.GetSelectedLineIdx() + if models.IsHeadCommit(commits, selectedIdx) { // we've selected the top commit so no rebase is required return self.c.Helpers().GPG.WithGpgHandling(self.c.Git().Commit.RewordLastCommit(summary, description), git_commands.CommitGpgSign, @@ -466,12 +912,15 @@ func (self *LocalCommitsController) handleReword(summary string, description str selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) - return self.c.WithWaitingStatus(self.c.Tr.RewordingStatus, func(gocui.Task) error { - err := self.c.Git().Rebase.RewordCommit(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), parentIdx, summary, description) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.RewordingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { + err := self.c.Git().Rebase.RewordCommit(commits, selectedIdx, parentIdx, summary, description) if err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return nil }) } @@ -553,12 +1002,19 @@ func (self *LocalCommitsController) drop(selectedCommits []*models.Commit, start Title: self.c.Tr.DropCommitTitle, Prompt: lo.Ternary(isMerge, self.c.Tr.DropMergeCommitPrompt, self.c.Tr.DropCommitPrompt), HandleConfirm: func() error { - return self.c.WithWaitingStatus(self.c.Tr.DroppingStatus, func(gocui.Task) error { + commits := self.c.Model().Commits + if !isMerge { + self.selectRebaseResultCommit(startIdx) + } + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.DroppingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.DropCommit) if isMerge { - return self.dropMergeCommit(startIdx) + return self.dropMergeCommit(commits, startIdx) } - return self.interactiveRebase(todo.Drop, startIdx, endIdx, parentIdx) + return self.interactiveRebase(commits, todo.Drop, startIdx, endIdx, parentIdx) }) }, }) @@ -566,8 +1022,8 @@ func (self *LocalCommitsController) drop(selectedCommits []*models.Commit, start return nil } -func (self *LocalCommitsController) dropMergeCommit(commitIdx int) error { - err := self.c.Git().Rebase.DropMergeCommit(self.c.Model().Commits, commitIdx) +func (self *LocalCommitsController) dropMergeCommit(commits []*models.Commit, commitIdx int) error { + err := self.c.Git().Rebase.DropMergeCommit(commits, commitIdx) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) } @@ -580,15 +1036,14 @@ func (self *LocalCommitsController) edit(selectedCommits []*models.Commit, start commits := self.c.Model().Commits if !commits[endIdx].IsMerge() { - selectionRangeAndMode := self.getSelectionRangeAndMode() - err := self.c.Git().Rebase.InteractiveRebase(commits, startIdx, endIdx, parentIdx, todo.Edit, "") - return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( - err, - types.RefreshOptions{ - Mode: types.BLOCK_UI, Then: func() { - self.restoreSelectionRangeAndMode(selectionRangeAndMode) - }, - }) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.RebasingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { + err := self.c.Git().Rebase.InteractiveRebase(commits, startIdx, endIdx, parentIdx, todo.Edit, "") + return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( + err, types.RefreshOptions{BatchUIUpdates: true}) + }) } return self.startInteractiveRebaseWithEdit(selectedCommits) @@ -606,13 +1061,15 @@ func (self *LocalCommitsController) quickStartInteractiveRebase() error { func (self *LocalCommitsController) startInteractiveRebaseWithEdit( commitsToEdit []*models.Commit, ) error { - return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.RebasingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.EditCommit) - selectionRangeAndMode := self.getSelectionRangeAndMode() err := self.c.Git().Rebase.EditRebase(commitsToEdit[len(commitsToEdit)-1].Hash()) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( err, - types.RefreshOptions{Mode: types.BLOCK_UI, Then: func() { + types.RefreshOptions{BatchUIUpdates: true, Then: func() error { todos := make([]*models.Commit, 0, len(commitsToEdit)-1) for _, c := range commitsToEdit[:len(commitsToEdit)-1] { // Merge commits can't be set to "edit", so just skip them @@ -621,47 +1078,13 @@ func (self *LocalCommitsController) startInteractiveRebaseWithEdit( } } if len(todos) > 0 { - err := self.updateTodos(todo.Edit, todos) - if err != nil { - self.c.Log.Errorf("error when updating todos: %v", err) - } + return self.updateTodos(todo.Edit, todos) } - - self.restoreSelectionRangeAndMode(selectionRangeAndMode) + return nil }}) }) } -type SelectionRangeAndMode struct { - selectedHash string - rangeStartHash string - mode traits.RangeSelectMode -} - -func (self *LocalCommitsController) getSelectionRangeAndMode() SelectionRangeAndMode { - selectedIdx, rangeStartIdx, rangeSelectMode := self.context().GetSelectionRangeAndMode() - commits := self.c.Model().Commits - selectedHash := commits[selectedIdx].Hash() - rangeStartHash := commits[rangeStartIdx].Hash() - return SelectionRangeAndMode{selectedHash, rangeStartHash, rangeSelectMode} -} - -func (self *LocalCommitsController) restoreSelectionRangeAndMode(selectionRangeAndMode SelectionRangeAndMode) { - // We need to select the same commit range again because after starting a rebase, - // new lines can be added for update-ref commands in the TODO file, due to - // stacked branches. So the selected commits may be in different positions in the list. - _, newSelectedIdx, ok1 := lo.FindIndexOf(self.c.Model().Commits, func(c *models.Commit) bool { - return c.Hash() == selectionRangeAndMode.selectedHash - }) - _, newRangeStartIdx, ok2 := lo.FindIndexOf(self.c.Model().Commits, func(c *models.Commit) bool { - return c.Hash() == selectionRangeAndMode.rangeStartHash - }) - if ok1 && ok2 { - self.context().SetSelectionRangeAndMode(newSelectedIdx, newRangeStartIdx, selectionRangeAndMode.mode) - self.context().HandleFocus(types.OnFocusOpts{}) - } -} - func (self *LocalCommitsController) findCommitForQuickStartInteractiveRebase() (*models.Commit, error) { commit, index, ok := lo.FindIndexOf(self.c.Model().Commits, func(c *models.Commit) bool { return c.IsMerge() || c.Status == models.StatusMerged @@ -669,7 +1092,7 @@ func (self *LocalCommitsController) findCommitForQuickStartInteractiveRebase() ( if !ok || index == 0 { errorMsg := utils.ResolvePlaceholderString(self.c.Tr.CannotQuickStartInteractiveRebase, map[string]string{ - "editKey": keybindings.Label(self.c.UserConfig().Keybinding.Universal.Edit), + "editKey": self.c.UserConfig().Keybinding.Universal.Edit.String(), }) return nil, errors.New(errorMsg) @@ -686,22 +1109,25 @@ func (self *LocalCommitsController) pick(selectedCommits []*models.Commit) error panic("should be disabled when not rebasing") } -func (self *LocalCommitsController) interactiveRebase(action todo.TodoCommand, startIdx int, endIdx int, parentIdx int) error { - return self.interactiveRebaseWithFlag(action, startIdx, endIdx, parentIdx, "") +func (self *LocalCommitsController) interactiveRebase(commits []*models.Commit, action todo.TodoCommand, startIdx int, endIdx int, parentIdx int) error { + return self.interactiveRebaseWithFlag(commits, action, startIdx, endIdx, parentIdx, "") } -func (self *LocalCommitsController) interactiveRebaseWithFlag(action todo.TodoCommand, startIdx int, endIdx int, parentIdx int, flag string) error { - // When performing an action that will remove the selected commits, we need to select the - // next commit down (which will end up at the start index after the action is performed) - if action == todo.Drop || action == todo.Fixup || action == todo.Squash { - self.context().SetSelection(startIdx) - } - - err := self.c.Git().Rebase.InteractiveRebase(self.c.Model().Commits, startIdx, endIdx, parentIdx, action, flag) +func (self *LocalCommitsController) interactiveRebaseWithFlag(commits []*models.Commit, action todo.TodoCommand, startIdx int, endIdx int, parentIdx int, flag string) error { + err := self.c.Git().Rebase.InteractiveRebase(commits, startIdx, endIdx, parentIdx, action, flag) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) } +// selectRebaseResultCommit selects the commit that a drop/fixup/squash starting +// at startIdx will leave there. It must run on the UI thread before the rebase: +// the commit currently at startIdx is removed, so the refresh's +// keep-selection-by-hash can't restore it and falls back to the index, which by +// then holds the commit that shifted up into its place. +func (self *LocalCommitsController) selectRebaseResultCommit(startIdx int) { + self.context().SetSelection(startIdx) +} + // updateTodos sees if the selected commit is in fact a rebasing // commit meaning you are trying to edit the todo file rather than actually // begin a rebase. It then updates the todo file with that action @@ -715,7 +1141,7 @@ func (self *LocalCommitsController) updateTodosWithFlag(action todo.TodoCommand, } self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.REBASE_COMMITS}, + Scope: []types.RefreshableView{types.REBASE_COMMITS}, }) return nil @@ -749,54 +1175,67 @@ func (self *LocalCommitsController) isCherryPickingOrReverting() bool { } func (self *LocalCommitsController) moveDown(selectedCommits []*models.Commit, startIdx int, endIdx int) error { - if self.isRebasing() { - if err := self.c.Git().Rebase.MoveTodosDown(selectedCommits); err != nil { - return err - } - self.context().MoveSelection(1) - self.context().HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true}) - - self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.REBASE_COMMITS}, - }) - return nil - } - - return self.c.WithWaitingStatusSync(self.c.Tr.MovingStatus, func() error { - self.c.LogAction(self.c.Tr.Actions.MoveCommitDown) - err := self.c.Git().Rebase.MoveCommitsDown(self.c.Model().Commits, startIdx, endIdx) - if err == nil { - self.context().MoveSelection(1) - self.context().HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true}) - } - return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( - err, types.RefreshOptions{Mode: types.SYNC}) - }) + return self.move(selectedCommits, startIdx, endIdx, 1, nil) } func (self *LocalCommitsController) moveUp(selectedCommits []*models.Commit, startIdx int, endIdx int) error { + return self.move(selectedCommits, startIdx, endIdx, -1, nil) +} + +func (self *LocalCommitsController) move( + selectedCommits []*models.Commit, startIdx int, endIdx int, offset int, onComplete func() error, +) error { if self.isRebasing() { - if err := self.c.Git().Rebase.MoveTodosUp(selectedCommits); err != nil { + if err := self.c.Git().Rebase.MoveTodos(selectedCommits, offset); err != nil { return err } - self.context().MoveSelection(-1) - self.context().HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true}) - self.c.Refresh(types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.REBASE_COMMITS}, + // Block input until the refresh has landed: a quick second press must + // read the moved todo from the refreshed model, not grab whatever the + // advanced selection index points at in the stale one. + self.c.RefreshBlockingInput(types.RefreshOptions{ + Scope: []types.RefreshableView{types.REBASE_COMMITS}, + SkipMainViewUpdate: true, + Then: func() error { + self.context().MoveSelection(offset) + self.context().FocusLine(true) + if onComplete != nil { + return onComplete() + } + return nil + }, }) return nil } - return self.c.WithWaitingStatusSync(self.c.Tr.MovingStatus, func() error { - self.c.LogAction(self.c.Tr.Actions.MoveCommitUp) - err := self.c.Git().Rebase.MoveCommitsUp(self.c.Model().Commits, startIdx, endIdx) - if err == nil { - self.context().MoveSelection(-1) - self.context().HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true}) + commits := self.c.Model().Commits + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.MovingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { + if offset > 0 { + self.c.LogAction(self.c.Tr.Actions.MoveCommitDown) + } else { + self.c.LogAction(self.c.Tr.Actions.MoveCommitUp) } + err := self.c.Git().Rebase.MoveCommits(commits, startIdx, endIdx, offset) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( - err, types.RefreshOptions{Mode: types.SYNC}) + err, types.RefreshOptions{ + BatchUIUpdates: true, + CommitSelection: types.KeepCommitSelectionIndex, + // Move the selection to follow the moved commit, in Then so it + // lands in the same frame as the refreshed commit list. + Then: func() error { + if err == nil { + self.context().MoveSelection(offset) + self.context().HandleFocus(types.OnFocusOpts{}) + } + if onComplete != nil { + return onComplete() + } + return nil + }, + }) }) } @@ -812,16 +1251,21 @@ func (self *LocalCommitsController) amendTo(commit *models.Commit) error { if err := self.c.Helpers().AmendHelper.AmendHead(); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.Refresh(types.RefreshOptions{}) return nil }) } } else { + commits := self.c.Model().Commits + selectedIdx := self.context().GetView().SelectedLineIdx() handleCommit = func() error { return self.c.Helpers().WorkingTree.WithEnsureCommittableFiles(func() error { - return self.c.WithWaitingStatus(self.c.Tr.AmendingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.AmendingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.AmendCommit) - err := self.c.Git().Rebase.AmendTo(self.c.Model().Commits, self.context().GetView().SelectedLineIdx(), parentIdx) + err := self.c.Git().Rebase.AmendTo(commits, selectedIdx, parentIdx) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) }) }) @@ -849,59 +1293,68 @@ func (self *LocalCommitsController) canAmend(_ *models.Commit) *types.DisabledRe return self.canAmendRange(self.c.Model().Commits, idx, idx) } -func (self *LocalCommitsController) amendAttribute(commits []*models.Commit, start, end int) error { - selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() - _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) +func (self *LocalCommitsController) amendAttribute(selectedCommits []*models.Commit, start, end int) error { + // The author operations index into the full commit list by absolute + // start/end, so capture that here on the UI thread rather than reading + // Model().Commits from the worker the menu items dispatch to. + commits := self.c.Model().Commits + _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, end, 1) opts := self.c.KeybindingsOpts() return self.c.Menu(types.CreateMenuOptions{ Title: "Amend commit attribute", Items: []*types.MenuItem{ { Label: self.c.Tr.ResetAuthor, - OnPress: func() error { return self.resetAuthor(start, end, parentIdx) }, - Key: opts.GetKey(opts.Config.AmendAttribute.ResetAuthor), + OnPress: func() error { return self.resetAuthor(commits, start, end, parentIdx) }, + Keys: opts.GetKeys(opts.Config.AmendAttribute.ResetAuthor), Tooltip: self.c.Tr.ResetAuthorTooltip, }, { Label: self.c.Tr.SetAuthor, - OnPress: func() error { return self.setAuthor(start, end, parentIdx) }, - Key: opts.GetKey(opts.Config.AmendAttribute.SetAuthor), + OnPress: func() error { return self.setAuthor(commits, start, end, parentIdx) }, + Keys: opts.GetKeys(opts.Config.AmendAttribute.SetAuthor), Tooltip: self.c.Tr.SetAuthorTooltip, }, { Label: self.c.Tr.AddCoAuthor, - OnPress: func() error { return self.addCoAuthor(start, end, parentIdx) }, - Key: opts.GetKey(opts.Config.AmendAttribute.AddCoAuthor), + OnPress: func() error { return self.addCoAuthor(commits, start, end, parentIdx) }, + Keys: opts.GetKeys(opts.Config.AmendAttribute.AddCoAuthor), Tooltip: self.c.Tr.AddCoAuthorTooltip, }, }, }) } -func (self *LocalCommitsController) resetAuthor(start, end int, parentIdx int) error { - return self.c.WithWaitingStatus(self.c.Tr.AmendingStatus, func(gocui.Task) error { +func (self *LocalCommitsController) resetAuthor(commits []*models.Commit, start, end int, parentIdx int) error { + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.AmendingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.ResetCommitAuthor) - if err := self.c.Git().Rebase.ResetCommitAuthor(self.c.Model().Commits, start, end, parentIdx); err != nil { + if err := self.c.Git().Rebase.ResetCommitAuthor(commits, start, end, parentIdx); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return nil }) } -func (self *LocalCommitsController) setAuthor(start, end int, parentIdx int) error { +func (self *LocalCommitsController) setAuthor(commits []*models.Commit, start, end int, parentIdx int) error { self.c.Prompt(types.PromptOpts{ Title: self.c.Tr.SetAuthorPromptTitle, FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(), HandleConfirm: func(value string) error { - return self.c.WithWaitingStatus(self.c.Tr.AmendingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.AmendingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.SetCommitAuthor) - if err := self.c.Git().Rebase.SetCommitAuthor(self.c.Model().Commits, start, end, parentIdx, value); err != nil { + if err := self.c.Git().Rebase.SetCommitAuthor(commits, start, end, parentIdx, value); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return nil }) }, @@ -910,17 +1363,20 @@ func (self *LocalCommitsController) setAuthor(start, end int, parentIdx int) err return nil } -func (self *LocalCommitsController) addCoAuthor(start, end int, parentIdx int) error { +func (self *LocalCommitsController) addCoAuthor(commits []*models.Commit, start, end int, parentIdx int) error { self.c.Prompt(types.PromptOpts{ Title: self.c.Tr.AddCoAuthorPromptTitle, FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(), HandleConfirm: func(value string) error { - return self.c.WithWaitingStatus(self.c.Tr.AmendingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.AmendingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.AddCommitCoAuthor) - if err := self.c.Git().Rebase.AddCommitCoAuthor(self.c.Model().Commits, start, end, parentIdx, value); err != nil { + if err := self.c.Git().Rebase.AddCommitCoAuthor(commits, start, end, parentIdx, value); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return nil }) }, @@ -948,9 +1404,11 @@ func (self *LocalCommitsController) revert(commits []*models.Commit, start, end Prompt: promptText, HandleConfirm: func() error { self.c.LogAction(self.c.Tr.Actions.RevertCommit) - return self.c.WithWaitingStatusSync(self.c.Tr.RevertingStatus, func() error { - mustStash := helpers.IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) - + mustStash := helpers.IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules) + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.RevertingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { if mustStash { if err := self.c.Git().Stash.Push(self.c.Tr.AutoStashForReverting); err != nil { return err @@ -958,17 +1416,16 @@ func (self *LocalCommitsController) revert(commits []*models.Commit, start, end } result := self.c.Git().Commit.Revert(hashes, isMerge) - if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(result, types.RefreshOptions{Mode: types.SYNC}); err != nil { + if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(result, + types.RefreshOptions{BatchUIUpdates: true}); err != nil { return err } - self.context().MoveSelection(len(commits)) - self.context().HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true}) if mustStash { if err := self.c.Git().Stash.Pop(0); err != nil { return err } - self.c.Refresh(types.RefreshOptions{ + self.c.RefreshFromWorker(types.RefreshOptions{ Scope: []types.RefreshableView{types.STASH, types.FILES}, }) } @@ -995,21 +1452,26 @@ func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) err Items: []*types.MenuItem{ { Label: self.c.Tr.FixupMenu_Fixup, - Key: 'f', + Keys: menuKey('f'), OnPress: func() error { return self.c.Helpers().WorkingTree.WithEnsureCommittableFiles(func() error { self.c.LogAction(self.c.Tr.Actions.CreateFixupCommit) - return self.c.WithWaitingStatusSync(self.c.Tr.CreatingFixupCommitStatus, func() error { + selectedIdx := self.context().GetSelectedLineIdx() + commits := self.c.Model().Commits + branches := self.c.Model().Branches + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.CreatingFixupCommitStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { if err := self.c.Git().Commit.CreateFixupCommit(commit.Hash()); err != nil { return err } - if err := self.moveFixupCommitToOwnerStackedBranch(commit); err != nil { + if err := self.moveFixupCommitToOwnerStackedBranch(commit, selectedIdx, commits, branches); err != nil { return err } - self.context().MoveSelectedLine(1) - self.c.Refresh(types.RefreshOptions{Mode: types.SYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{BatchUIUpdates: true}) return nil }) }) @@ -1019,7 +1481,7 @@ func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) err }, { Label: self.c.Tr.FixupMenu_AmendWithChanges, - Key: 'a', + Keys: menuKey('a'), OnPress: func() error { return self.c.Helpers().WorkingTree.WithEnsureCommittableFiles(func() error { return self.createAmendCommit(commit, true) @@ -1030,7 +1492,7 @@ func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) err }, { Label: self.c.Tr.FixupMenu_AmendWithoutChanges, - Key: 'r', + Keys: menuKey('r'), OnPress: func() error { return self.createAmendCommit(commit, false) }, Tooltip: self.c.Tr.FixupMenu_AmendWithoutChangesTooltip, }, @@ -1038,7 +1500,12 @@ func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) err }) } -func (self *LocalCommitsController) moveFixupCommitToOwnerStackedBranch(targetCommit *models.Commit) error { +// moveFixupCommitToOwnerStackedBranch takes state captured on the UI thread +// (the selected index and the commits and branches models) so that it can run +// its rebase on a worker without reading the model there. +func (self *LocalCommitsController) moveFixupCommitToOwnerStackedBranch( + targetCommit *models.Commit, selectedIdx int, commits []*models.Commit, branches []*models.Branch, +) error { if self.c.Git().Version.IsOlderThan(2, 38, 0) { // Git 2.38.0 introduced the `rebase.updateRefs` config option. Don't // move the commit down with older versions, as it would break the stack. @@ -1066,9 +1533,9 @@ func (self *LocalCommitsController) moveFixupCommitToOwnerStackedBranch(targetCo } headOfOwnerBranchIdx := -1 - for i := self.context().GetSelectedLineIdx(); i > 0; i-- { - if lo.SomeBy(self.c.Model().Branches, func(b *models.Branch) bool { - return b.CommitHash == self.c.Model().Commits[i].Hash() + for i := selectedIdx; i > 0; i-- { + if lo.SomeBy(branches, func(b *models.Branch) bool { + return b.CommitHash == commits[i].Hash() }) { headOfOwnerBranchIdx = i break @@ -1079,7 +1546,7 @@ func (self *LocalCommitsController) moveFixupCommitToOwnerStackedBranch(targetCo return nil } - return self.c.Git().Rebase.MoveFixupCommitDown(self.c.Model().Commits, headOfOwnerBranchIdx) + return self.c.Git().Rebase.MoveFixupCommitDown(commits, headOfOwnerBranchIdx) } func (self *LocalCommitsController) createAmendCommit(commit *models.Commit, includeFileChanges bool) error { @@ -1100,17 +1567,22 @@ func (self *LocalCommitsController) createAmendCommit(commit *models.Commit, inc PreserveMessage: false, OnConfirm: func(summary string, description string) error { self.c.LogAction(self.c.Tr.Actions.CreateFixupCommit) - return self.c.WithWaitingStatusSync(self.c.Tr.CreatingFixupCommitStatus, func() error { + selectedIdx := self.context().GetSelectedLineIdx() + commits := self.c.Model().Commits + branches := self.c.Model().Branches + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.CreatingFixupCommitStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { if err := self.c.Git().Commit.CreateAmendCommit(originalSubject, summary, description, includeFileChanges); err != nil { return err } - if err := self.moveFixupCommitToOwnerStackedBranch(commit); err != nil { + if err := self.moveFixupCommitToOwnerStackedBranch(commit, selectedIdx, commits, branches); err != nil { return err } - self.context().MoveSelectedLine(1) - self.c.Refresh(types.RefreshOptions{Mode: types.SYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{BatchUIUpdates: true}) return nil }) }, @@ -1129,14 +1601,14 @@ func (self *LocalCommitsController) squashFixupCommits() error { Label: self.c.Tr.SquashCommitsInCurrentBranch, OnPress: self.squashAllFixupsInCurrentBranch, DisabledReason: self.canFindCommitForSquashFixupsInCurrentBranch(), - Key: 'b', + Keys: menuKey('b'), Tooltip: self.c.Tr.SquashCommitsInCurrentBranchTooltip, }, { Label: self.c.Tr.SquashCommitsAboveSelectedCommit, OnPress: self.withItem(self.squashAllFixupsAboveSelectedCommit), DisabledReason: self.singleItemSelected()(), - Key: 'a', + Keys: menuKey('a'), Tooltip: self.c.Tr.SquashCommitsAboveSelectedTooltip, }, }, @@ -1158,12 +1630,31 @@ func (self *LocalCommitsController) squashAllFixupsInCurrentBranch() error { func (self *LocalCommitsController) squashFixupsImpl(commit *models.Commit, rebaseStartIdx int) error { selectionOffset := countSquashableCommitsAbove(self.c.Model().Commits, self.context().GetSelectedLineIdx(), rebaseStartIdx) - return self.c.WithWaitingStatusSync(self.c.Tr.SquashingStatus, func() error { + // The squashed fixups above the selection are removed, so the selection moves + // up by that many rows to stay on the same commit. Compute the target as an + // absolute index now, on the current list. + targetIdx := self.context().GetSelectedLineIdx() - selectionOffset + return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{ + Message: self.c.Tr.SquashingStatus, + HideWorkingTreeState: true, + }, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.SquashAllAboveFixupCommits) err := self.c.Git().Rebase.SquashAllAboveFixupCommits(commit) - self.context().MoveSelectedLine(-selectionOffset) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( - err, types.RefreshOptions{Mode: types.SYNC}) + err, types.RefreshOptions{ + BatchUIUpdates: true, + // Set the selection in Then so it lands in the same frame as the + // refreshed commit list. It has to be an absolute index: the new + // list is shorter, so a relative move from the (clamped) old index + // could overshoot. PostRefreshUpdate repaints the moved selection. + Then: func() error { + if err == nil { + self.context().SetSelectedLineIdx(targetIdx) + self.c.PostRefreshUpdate(self.context()) + } + return nil + }, + }) }) } @@ -1210,10 +1701,11 @@ func (self *LocalCommitsController) openSearch() error { // we usually lazyload these commits but now that we're searching we need to load them now if self.context().GetLimitCommits() { self.context().SetLimitCommits(false) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}}) } - return self.c.Helpers().Search.OpenSearchPrompt(self.context()) + self.c.Helpers().Search.OpenSearchPrompt(self.context()) + return nil } func (self *LocalCommitsController) handleOpenLogMenu() error { @@ -1231,7 +1723,7 @@ func (self *LocalCommitsController) handleOpenLogMenu() error { return self.c.WithWaitingStatus(self.c.Tr.LoadingCommits, func(gocui.Task) error { self.c.Refresh( - types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.COMMITS}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}}, ) return nil }) @@ -1285,7 +1777,6 @@ func (self *LocalCommitsController) handleOpenLogMenu() error { return self.c.WithWaitingStatus(self.c.Tr.LoadingCommits, func(gocui.Task) error { self.c.Refresh( types.RefreshOptions{ - Mode: types.SYNC, Scope: []types.RefreshableView{types.COMMITS}, }, ) @@ -1330,7 +1821,7 @@ func (self *LocalCommitsController) GetOnFocus() func(types.OnFocusOpts) { context := self.context() if context.GetSelectedLineIdx() > COMMIT_THRESHOLD && context.GetLimitCommits() { context.SetLimitCommits(false) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}}) } } } diff --git a/pkg/gui/controllers/local_commits_controller_test.go b/pkg/gui/controllers/local_commits_controller_test.go index c5c5e7a5d..0f0a4d137 100644 --- a/pkg/gui/controllers/local_commits_controller_test.go +++ b/pkg/gui/controllers/local_commits_controller_test.go @@ -4,9 +4,47 @@ import ( "testing" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/utils" "github.com/stretchr/testify/assert" ) +func TestFindCommitDragBlock(t *testing.T) { + commit := func(hash string) *models.Commit { + return models.NewCommit(&utils.StringPool{}, models.NewCommitOpts{Hash: hash}) + } + identities := []commitDragIdentity{ + commitDragIdentityForCommit(commit("b")), + commitDragIdentityForCommit(commit("c")), + } + + t.Run("finds the original block after selection changes", func(t *testing.T) { + commits := []*models.Commit{commit("a"), commit("b"), commit("c"), commit("d")} + + actual, startIndex, endIndex, found := findCommitDragBlock(commits, identities) + + assert.True(t, found) + assert.Equal(t, commits[1:3], actual) + assert.Equal(t, 1, startIndex) + assert.Equal(t, 2, endIndex) + }) + + t.Run("rejects a block that is no longer contiguous", func(t *testing.T) { + _, _, _, found := findCommitDragBlock( + []*models.Commit{commit("a"), commit("b"), commit("d"), commit("c")}, identities, + ) + + assert.False(t, found) + }) + + t.Run("rejects an ambiguous block", func(t *testing.T) { + _, _, _, found := findCommitDragBlock( + []*models.Commit{commit("b"), commit("c"), commit("b"), commit("c")}, identities, + ) + + assert.False(t, found) + }) +} + func Test_countSquashableCommitsAbove(t *testing.T) { scenarios := []struct { name string diff --git a/pkg/gui/controllers/main_view_controller.go b/pkg/gui/controllers/main_view_controller.go index fa7e6438a..5bde8c5ff 100644 --- a/pkg/gui/controllers/main_view_controller.go +++ b/pkg/gui/controllers/main_view_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -32,21 +32,21 @@ func NewMainViewController( func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.TogglePanel), + Keys: opts.GetKeys(opts.Config.Universal.TogglePanel), Handler: self.togglePanel, Description: self.c.Tr.ToggleStagingView, Tooltip: self.c.Tr.ToggleStagingViewTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.escape, Description: self.c.Tr.ExitFocusedMainView, DisplayOnScreen: true, }, { // overriding this because we want to read all of the task's output before we start searching - Key: opts.GetKey(opts.Config.Universal.StartSearch), + Keys: opts.GetKeys(opts.Config.Universal.StartSearch), Handler: self.openSearch, Description: self.c.Tr.StartSearch, Tag: "navigation", @@ -109,7 +109,8 @@ func (self *MainViewController) openSearch() error { if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil { manager.ReadToEnd(func() { self.c.OnUIThread(func() error { - return self.c.Helpers().Search.OpenSearchPrompt(self.context) + self.c.Helpers().Search.OpenSearchPrompt(self.context) + return nil }) }) } diff --git a/pkg/gui/controllers/menu_controller.go b/pkg/gui/controllers/menu_controller.go index 0465308df..1bbb7b27f 100644 --- a/pkg/gui/controllers/menu_controller.go +++ b/pkg/gui/controllers/menu_controller.go @@ -1,20 +1,26 @@ package controllers import ( + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/samber/lo" ) type MenuController struct { baseController *ListControllerTrait[*types.MenuItem] c *ControllerCommon + // for delegating navigation to, see physicalKeyBindings + listController *ListController } var _ types.IController = &MenuController{} func NewMenuController( c *ControllerCommon, + listController *ListController, ) *MenuController { return &MenuController{ baseController: baseController{}, @@ -24,38 +30,84 @@ func NewMenuController( c.Contexts().Menu.GetSelected, c.Contexts().Menu.GetSelectedItems, ), - c: c, + c: c, + listController: listController, } } // NOTE: if you add a new keybinding here, you'll also need to add it to -// `reservedKeys` in `pkg/gui/context/menu_context.go` +// `essentialKeys` in `pkg/gui/menu_panel.go`, so that menu items can't shadow it func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.press), GetDisabledReason: self.require(self.singleItemSelected()), }, { - Key: opts.GetKey(opts.Config.Universal.ConfirmMenu), + Keys: opts.GetKeys(opts.Config.Universal.ConfirmMenu), Handler: self.withItem(self.press), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Execute, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.close, Description: self.c.Tr.CloseCancel, DisplayOnScreen: true, }, } + if self.context().FilterAsYouType() { + bindings = append(bindings, self.physicalKeyBindings(opts)...) + } + return bindings } -func (self *MenuController) GetOnClick() func() error { +// In a menu that filters as you type, the keys configured for driving the menu +// may all be printable, and printable keys become filter text once the user +// starts typing. These keys can't, so binding them on top guarantees that the +// menu stays usable no matter how the keybindings are configured. +func (self *MenuController) physicalKeyBindings(opts types.KeybindingsOpts) []*types.Binding { + candidates := []struct { + key gocui.Key + configured config.Keybinding + binding *types.Binding + }{ + { + key: gocui.NewKeyName(gocui.KeyEnter), + configured: opts.Config.Universal.ConfirmMenu, + binding: &types.Binding{ + Handler: self.withItem(self.press), + GetDisabledReason: self.require(self.singleItemSelected()), + }, + }, + {gocui.NewKeyName(gocui.KeyEsc), opts.Config.Universal.Return, &types.Binding{Handler: self.close}}, + {gocui.NewKeyName(gocui.KeyArrowUp), opts.Config.Universal.PrevItem, &types.Binding{Handler: self.listController.HandlePrevLine}}, + {gocui.NewKeyName(gocui.KeyArrowDown), opts.Config.Universal.NextItem, &types.Binding{Handler: self.listController.HandleNextLine}}, + {gocui.NewKeyName(gocui.KeyPgup), opts.Config.Universal.PrevPage, &types.Binding{Handler: self.listController.HandlePrevPage}}, + {gocui.NewKeyName(gocui.KeyPgdn), opts.Config.Universal.NextPage, &types.Binding{Handler: self.listController.HandleNextPage}}, + {gocui.NewKeyName(gocui.KeyHome), opts.Config.Universal.GotoTop, &types.Binding{Handler: self.listController.HandleGotoTop}}, + {gocui.NewKeyName(gocui.KeyEnd), opts.Config.Universal.GotoBottom, &types.Binding{Handler: self.listController.HandleGotoBottom}}, + } + + bindings := []*types.Binding{} + for _, candidate := range candidates { + if lo.Contains(opts.GetKeys(candidate.configured), candidate.key) { + // this key is the configured one, so it drives the menu already + continue + } + + candidate.binding.Keys = []gocui.Key{candidate.key} + bindings = append(bindings, candidate.binding) + } + + return bindings +} + +func (self *MenuController) GetOnDoubleClick() func() error { return self.withItemGraceful(self.press) } @@ -73,13 +125,28 @@ func (self *MenuController) press(selectedItem *types.MenuItem) error { } func (self *MenuController) close() error { + if self.context().FilterStarted() { + self.stopFiltering() + return nil + } + if self.context().IsFiltering() { self.c.Helpers().Search.Cancel() return nil } - self.c.Context().Pop() - return nil + return self.context().OnMenuPress(nil) +} + +// Hides the filter row again and puts the menu back the way it was, keeping the +// item that was selected. It takes another escape to close the menu. +func (self *MenuController) stopFiltering() { + self.c.Views().MenuFilter.ClearTextArea() + self.c.Views().MenuFilter.RenderTextArea() + + self.context().SetFilterStarted(false) + self.context().ClearFilter() + self.c.PostRefreshUpdate(self.context()) } func (self *MenuController) context() *context.MenuContext { diff --git a/pkg/gui/controllers/menu_key.go b/pkg/gui/controllers/menu_key.go new file mode 100644 index 000000000..95993801b --- /dev/null +++ b/pkg/gui/controllers/menu_key.go @@ -0,0 +1,11 @@ +package controllers + +import "github.com/jesseduffield/lazygit/pkg/gocui" + +// menuKey is a shorthand for constructing a key value for a menu item from a single rune literal, +// avoiding the noise of `[]gocui.Key{gocui.NewKeyRune('a')}` at every call site. There is an +// intentionally identical helper in the helpers package so that callers in either package can use +// the unqualified form. +func menuKey(r rune) []gocui.Key { + return []gocui.Key{gocui.NewKeyRune(r)} +} diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go index dc358bb03..1af53fded 100644 --- a/pkg/gui/controllers/merge_conflicts_controller.go +++ b/pkg/gui/controllers/merge_conflicts_controller.go @@ -3,7 +3,7 @@ package controllers import ( "os" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -28,91 +28,75 @@ func NewMergeConflictsController( func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withRenderAndFocus(self.HandlePickHunk), Description: self.c.Tr.PickHunk, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Main.PickBothHunks), - Handler: self.withRenderAndFocus(self.HandlePickAllHunks), - Description: self.c.Tr.PickAllHunks, + Keys: opts.GetKeys(opts.Config.Main.PickBothHunks), + Handler: self.withRenderAndFocus(self.HandlePickBothHunks), + Description: self.c.Tr.PickBothHunks, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.PrevItem), + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.withRenderAndFocus(self.PrevConflictHunk), Description: self.c.Tr.SelectPrevHunk, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.NextItem), + Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.withRenderAndFocus(self.NextConflictHunk), Description: self.c.Tr.SelectNextHunk, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.PrevBlock), + Keys: opts.GetKeys(opts.Config.Main.PrevHunk), Handler: self.withRenderAndFocus(self.PrevConflict), Description: self.c.Tr.PrevConflict, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.NextBlock), + Keys: opts.GetKeys(opts.Config.Main.NextHunk), Handler: self.withRenderAndFocus(self.NextConflict), Description: self.c.Tr.NextConflict, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Undo), + Keys: opts.GetKeys(opts.Config.Universal.Undo), Handler: self.withRenderAndFocus(self.HandleUndo), Description: self.c.Tr.Undo, Tooltip: self.c.Tr.UndoMergeResolveTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.HandleEditFile, Description: self.c.Tr.EditFile, Tooltip: self.c.Tr.EditFileTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenFile), + Keys: opts.GetKeys(opts.Config.Universal.OpenFile), Handler: self.HandleOpenFile, Description: self.c.Tr.OpenFile, Tooltip: self.c.Tr.OpenFileTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt), - Handler: self.withRenderAndFocus(self.PrevConflict), - }, - { - Key: opts.GetKey(opts.Config.Universal.NextBlockAlt), - Handler: self.withRenderAndFocus(self.NextConflict), - }, - { - Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), - Handler: self.withRenderAndFocus(self.PrevConflictHunk), - }, - { - Key: opts.GetKey(opts.Config.Universal.NextItemAlt), - Handler: self.withRenderAndFocus(self.NextConflictHunk), - }, - { - Key: opts.GetKey(opts.Config.Universal.ScrollLeft), + Keys: opts.GetKeys(opts.Config.Universal.ScrollLeft), Handler: self.withRenderAndFocus(self.HandleScrollLeft), Description: self.c.Tr.ScrollLeft, Tag: "navigation", }, { - Key: opts.GetKey(opts.Config.Universal.ScrollRight), + Keys: opts.GetKeys(opts.Config.Universal.ScrollRight), Handler: self.withRenderAndFocus(self.HandleScrollRight), Description: self.c.Tr.ScrollRight, Tag: "navigation", }, { - Key: opts.GetKey(opts.Config.Files.OpenMergeOptions), + Keys: opts.GetKeys(opts.Config.Files.OpenMergeOptions), Handler: self.openMergeConflictMenu, Description: self.c.Tr.ViewMergeConflictOptions, Tooltip: self.c.Tr.ViewMergeConflictOptionsTooltip, @@ -120,7 +104,7 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.Escape, Description: self.c.Tr.ReturnToFilesPanel, }, @@ -263,8 +247,8 @@ func (self *MergeConflictsController) HandlePickHunk() error { return self.pickSelection(self.context().GetState().Selection()) } -func (self *MergeConflictsController) HandlePickAllHunks() error { - return self.pickSelection(mergeconflicts.ALL) +func (self *MergeConflictsController) HandlePickBothHunks() error { + return self.pickSelection(mergeconflicts.BOTH) } func (self *MergeConflictsController) pickSelection(selection mergeconflicts.Selection) error { @@ -306,8 +290,8 @@ func (self *MergeConflictsController) resolveConflict(selection mergeconflicts.S logStr = "Picking middle hunk" case mergeconflicts.BOTTOM: logStr = "Picking bottom hunk" - case mergeconflicts.ALL: - logStr = "Picking all hunks" + case mergeconflicts.BOTH: + logStr = "Picking both hunks" } self.c.LogAction("Resolve merge conflict") self.c.LogCommand(logStr, false) @@ -318,7 +302,7 @@ func (self *MergeConflictsController) resolveConflict(selection mergeconflicts.S func (self *MergeConflictsController) onLastConflictResolved() { // as part of refreshing files, we handle the situation where a file has had // its merge conflicts resolved. - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) } func (self *MergeConflictsController) openMergeConflictMenu() error { diff --git a/pkg/gui/controllers/options_menu_action.go b/pkg/gui/controllers/options_menu_action.go index e711f9df6..be2899632 100644 --- a/pkg/gui/controllers/options_menu_action.go +++ b/pkg/gui/controllers/options_menu_action.go @@ -1,6 +1,10 @@ package controllers import ( + "strings" + + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -23,6 +27,14 @@ func (self *OptionsMenuAction) Call() error { if binding.GetDisabledReason != nil { disabledReason = binding.GetDisabledReason() } + tooltip := binding.Tooltip + if len(binding.Keys) > 1 { + if tooltip != "" { + tooltip += "\n\n" + } + keyLabels := lo.Map(binding.Keys, func(k gocui.Key, _ int) string { return config.LabelForKey(k) }) + tooltip += self.c.Tr.KeybindingsTooltip + strings.Join(keyLabels, ", ") + } return &types.MenuItem{ OpensMenu: binding.OpensMenu, Label: binding.GetDescription(), @@ -33,8 +45,8 @@ func (self *OptionsMenuAction) Call() error { return self.c.IGuiCommon.CallKeybindingHandler(binding) }, - Key: binding.Key, - Tooltip: binding.Tooltip, + Keys: binding.Keys, + Tooltip: tooltip, DisabledReason: disabledReason, Section: section, } @@ -52,6 +64,7 @@ func (self *OptionsMenuAction) Call() error { ColumnAlignment: []utils.Alignment{utils.AlignRight, utils.AlignLeft}, AllowFilteringKeybindings: true, KeepConflictingKeybindings: true, + FilterAsYouType: true, }) } diff --git a/pkg/gui/controllers/patch_building_controller.go b/pkg/gui/controllers/patch_building_controller.go index cfd9b751d..ed0ce0eb4 100644 --- a/pkg/gui/controllers/patch_building_controller.go +++ b/pkg/gui/controllers/patch_building_controller.go @@ -3,8 +3,7 @@ package controllers import ( "fmt" - "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" ) @@ -28,25 +27,25 @@ func NewPatchBuildingController( func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.OpenFile), + Keys: opts.GetKeys(opts.Config.Universal.OpenFile), Handler: self.OpenFile, Description: self.c.Tr.OpenFile, Tooltip: self.c.Tr.OpenFileTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.EditFile, Description: self.c.Tr.EditFile, Tooltip: self.c.Tr.EditFileTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.ToggleSelectionAndRefresh, Description: self.c.Tr.ToggleSelectionForPatch, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.discardSelection, GetDisabledReason: self.getDisabledReasonForDiscard, Description: self.c.Tr.RemoveSelectionFromPatch, @@ -54,7 +53,7 @@ func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.Escape, Description: self.c.Tr.ExitCustomPatchBuilder, DescriptionFunc: self.EscapeDescription, @@ -139,8 +138,8 @@ func (self *PatchBuildingController) toggleSelection() error { self.context().GetMutex().Lock() defer self.context().GetMutex().Unlock() - filename := self.c.Contexts().CommitFiles.GetSelectedPath() - if filename == "" { + file := self.c.Contexts().CommitFiles.GetSelectedFile() + if file == nil { return nil } @@ -153,7 +152,7 @@ func (self *PatchBuildingController) toggleSelection() error { return nil } - includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(filename) + includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath) if err != nil { return err } @@ -165,7 +164,7 @@ func (self *PatchBuildingController) toggleSelection() error { } // add range of lines to those set for the file - if err := toggleFunc(filename, lineIndicesToToggle); err != nil { + if err := toggleFunc(file.Path, file.PreviousPath, lineIndicesToToggle); err != nil { // might actually want to return an error here self.c.Log.Error(err) } @@ -188,7 +187,7 @@ func (self *PatchBuildingController) getDisabledReasonForDiscard() *types.Disabl } if self.c.UserConfig().Git.DiffContextSize == 0 { text := fmt.Sprintf(self.c.Tr.Actions.NotEnoughContextToRemoveLines, - keybindings.Label(self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)) + self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView) return &types.DisabledReason{Text: text, ShowErrorInPanel: true} } return nil @@ -224,15 +223,20 @@ func (self *PatchBuildingController) discardSelectionFromCommit() error { return nil } - return self.c.WithWaitingStatusSync(self.c.Tr.RebasingStatus, func() error { - commitIndex := self.getPatchCommitIndex() - selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() - _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) + commits := self.c.Model().Commits + commitIndex := self.getPatchCommitIndex() + selectedCommits, _, endIdx := self.c.Contexts().LocalCommits.GetSelectedItems() + _, parentIdx := self.c.Helpers().Commits.GetParentCommit(selectedCommits, endIdx, 1) + return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.RemovePatchFromCommit) - err := self.c.Git().Patch.DeletePatchesFromCommit(self.c.Model().Commits, commitIndex, parentIdx) - self.c.Helpers().PatchBuilding.Escape() + err := self.c.Git().Patch.DeletePatchesFromCommit(commits, commitIndex, parentIdx) + // Escape pops the patch-building context, so run it on the UI thread + // before the refresh below. + _ = self.c.GocuiGui().OnUIThreadAndWait(func() { + self.c.Helpers().PatchBuilding.Escape() + }) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( - err, types.RefreshOptions{Mode: types.SYNC}) + err, types.RefreshOptions{}) }) } diff --git a/pkg/gui/controllers/patch_explorer_controller.go b/pkg/gui/controllers/patch_explorer_controller.go index fdaafec5d..70dfb8f4e 100644 --- a/pkg/gui/controllers/patch_explorer_controller.go +++ b/pkg/gui/controllers/patch_explorer_controller.go @@ -3,7 +3,8 @@ package controllers import ( "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" ) @@ -19,18 +20,27 @@ func NewPatchExplorerControllerFactory(c *ControllerCommon) *PatchExplorerContro } func (self *PatchExplorerControllerFactory) Create(context types.IPatchExplorerContext) *PatchExplorerController { - return &PatchExplorerController{ + controller := &PatchExplorerController{ baseController: baseController{}, c: self.c, context: context, } + controller.dragAutoscroller = helpers.NewDragAutoscroller( + self.c.HelperCommon, + context, + controller.canDragAutoscroll, + controller.handleDragAutoscroll, + ) + return controller } type PatchExplorerController struct { baseController c *ControllerCommon - context types.IPatchExplorerContext + context types.IPatchExplorerContext + dragAutoscroller *helpers.DragAutoscroller + draggingWithMouse bool } func (self *PatchExplorerController) Context() types.Context { @@ -41,61 +51,43 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) return []*types.Binding{ { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.withRenderAndFocus(self.HandlePrevLine), }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.PrevItem), - Handler: self.withRenderAndFocus(self.HandlePrevLine), - }, - { - Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.NextItemAlt), - Handler: self.withRenderAndFocus(self.HandleNextLine), - }, - { - Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.NextItem), + Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.withRenderAndFocus(self.HandleNextLine), }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.RangeSelectUp), + Keys: opts.GetKeys(opts.Config.Universal.RangeSelectUp), Handler: self.withRenderAndFocus(self.HandlePrevLineRange), Description: self.c.Tr.RangeSelectUp, }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.RangeSelectDown), + Keys: opts.GetKeys(opts.Config.Universal.RangeSelectDown), Handler: self.withRenderAndFocus(self.HandleNextLineRange), Description: self.c.Tr.RangeSelectDown, }, { - Key: opts.GetKey(opts.Config.Universal.PrevBlock), + Keys: opts.GetKeys(opts.Config.Main.PrevHunk), Handler: self.withRenderAndFocus(self.HandlePrevHunk), Description: self.c.Tr.PrevHunk, }, { - Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt), - Handler: self.withRenderAndFocus(self.HandlePrevHunk), - }, - { - Key: opts.GetKey(opts.Config.Universal.NextBlock), + Keys: opts.GetKeys(opts.Config.Main.NextHunk), Handler: self.withRenderAndFocus(self.HandleNextHunk), Description: self.c.Tr.NextHunk, }, { - Key: opts.GetKey(opts.Config.Universal.NextBlockAlt), - Handler: self.withRenderAndFocus(self.HandleNextHunk), - }, - { - Key: opts.GetKey(opts.Config.Universal.ToggleRangeSelect), + Keys: opts.GetKeys(opts.Config.Universal.ToggleRangeSelect), Handler: self.withRenderAndFocus(self.HandleToggleSelectRange), Description: self.c.Tr.ToggleRangeSelect, }, { - Key: opts.GetKey(opts.Config.Main.ToggleSelectHunk), + Keys: opts.GetKeys(opts.Config.Main.ToggleSelectHunk), Handler: self.withRenderAndFocus(self.HandleToggleSelectHunk), Description: self.c.Tr.ToggleSelectHunk, DescriptionFunc: func() string { @@ -109,50 +101,40 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.PrevPage), + Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.withRenderAndFocus(self.HandlePrevPage), Description: self.c.Tr.PrevPage, }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.NextPage), + Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.withRenderAndFocus(self.HandleNextPage), Description: self.c.Tr.NextPage, }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.GotoTop), + Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.withRenderAndFocus(self.HandleGotoTop), Description: self.c.Tr.GotoTop, }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.GotoBottom), + Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Description: self.c.Tr.GotoBottom, Handler: self.withRenderAndFocus(self.HandleGotoBottom), }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.GotoTopAlt), - Handler: self.withRenderAndFocus(self.HandleGotoTop), - }, - { - Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.GotoBottomAlt), - Handler: self.withRenderAndFocus(self.HandleGotoBottom), - }, - { - Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.ScrollLeft), + Keys: opts.GetKeys(opts.Config.Universal.ScrollLeft), Handler: self.withRenderAndFocus(self.HandleScrollLeft), }, { Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.ScrollRight), + Keys: opts.GetKeys(opts.Config.Universal.ScrollRight), Handler: self.withRenderAndFocus(self.HandleScrollRight), }, { - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: self.withLock(self.CopySelectedToClipboard), Description: self.c.Tr.CopySelectedTextToClipboard, }, @@ -181,10 +163,74 @@ func (self *PatchExplorerController) GetMouseKeybindings(opts types.KeybindingsO ViewName: self.context.GetViewName(), Key: gocui.MouseLeft, Modifier: gocui.ModMotion, - Handler: func(gocui.ViewMouseBindingOpts) error { - return self.withRenderAndFocus(self.HandleMouseDrag)() - }, + Handler: self.handleMouseDrag, }, + { + ViewName: self.context.GetViewName(), + Key: gocui.MouseRelease, + Handler: func(gocui.ViewMouseBindingOpts) error { return self.handleDragRelease() }, + }, + } +} + +func (self *PatchExplorerController) handleMouseDrag(opts gocui.ViewMouseBindingOpts) error { + if err := self.withLock(func() error { + self.context.GetState().DragSelectLine(opts.Y) + self.renderDragSelection() + return nil + })(); err != nil { + return err + } + + self.draggingWithMouse = true + originY, _ := self.context.GetViewTrait().ViewPortYBounds() + self.dragAutoscroller.Update(opts.Y - originY) + return nil +} + +func (self *PatchExplorerController) canDragAutoscroll(int) bool { + state := self.context.GetState() + return state != nil && state.SelectingRange() +} + +func (self *PatchExplorerController) handleDragAutoscroll(viewIndex int) bool { + if !self.canDragAutoscroll(0) { + return false + } + + if err := self.withLock(func() error { + self.context.GetState().DragSelectLine(viewIndex) + self.renderDragSelection() + return nil + })(); err != nil { + return false + } + return true +} + +func (self *PatchExplorerController) renderDragSelection() { + view := self.context.GetView() + state := self.context.GetState() + originY := view.OriginY() + startIndex, _ := state.SelectedViewRange() + view.SetRangeSelectStart(startIndex) + view.SetCursorY(state.GetSelectedViewLineIdx() - originY) + self.context.Render() +} + +func (self *PatchExplorerController) handleDragRelease() error { + self.draggingWithMouse = false + self.dragAutoscroller.Cancel() + return nil +} + +func (self *PatchExplorerController) GetOnFocusLost() func(types.OnFocusLostOpts) { + return func(types.OnFocusLostOpts) { + self.dragAutoscroller.Cancel() + if self.draggingWithMouse { + self.draggingWithMouse = false + self.c.GocuiGui().CancelMouseCapture() + } } } @@ -294,12 +340,6 @@ func (self *PatchExplorerController) HandleMouseDown() error { return nil } -func (self *PatchExplorerController) HandleMouseDrag() error { - self.context.GetState().DragSelectLine(self.context.GetViewTrait().SelectedLineIdx()) - - return nil -} - func (self *PatchExplorerController) CopySelectedToClipboard() error { selected := self.context.GetState().PlainRenderSelected() diff --git a/pkg/gui/controllers/prompt_controller.go b/pkg/gui/controllers/prompt_controller.go index 1f6953951..abcf73ef5 100644 --- a/pkg/gui/controllers/prompt_controller.go +++ b/pkg/gui/controllers/prompt_controller.go @@ -3,7 +3,7 @@ package controllers import ( "fmt" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -27,19 +27,19 @@ func NewPromptController( func (self *PromptController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: gocui.KeyEnter, + Keys: []gocui.Key{gocui.NewKeyName(gocui.KeyEnter)}, Handler: func() error { return self.context().State.OnConfirm() }, Description: self.c.Tr.Confirm, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: func() error { return self.context().State.OnClose() }, Description: self.c.Tr.CloseCancel, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.TogglePanel), + Keys: opts.GetKeys(opts.Config.Universal.TogglePanel), Handler: func() error { if len(self.c.Contexts().Suggestions.State.Suggestions) > 0 { self.switchToSuggestions() diff --git a/pkg/gui/controllers/quit_actions.go b/pkg/gui/controllers/quit_actions.go index 4713a6e23..9a7082542 100644 --- a/pkg/gui/controllers/quit_actions.go +++ b/pkg/gui/controllers/quit_actions.go @@ -1,8 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/gui/context" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -81,9 +80,8 @@ func (self *QuitActions) Escape() error { } } - repoPathStack := self.c.State().GetRepoPathStack() - if !repoPathStack.IsEmpty() { - return self.c.Helpers().Repos.DispatchSwitchToRepo(repoPathStack.Pop(), context.NO_CONTEXT) + if !self.c.State().GetRepoPathStack().IsEmpty() { + return self.c.Helpers().Repos.SwitchToParentRepo() } if self.c.UserConfig().QuitOnTopLevelReturn { diff --git a/pkg/gui/controllers/remote_branches_controller.go b/pkg/gui/controllers/remote_branches_controller.go index 3a0350477..0d50068f3 100644 --- a/pkg/gui/controllers/remote_branches_controller.go +++ b/pkg/gui/controllers/remote_branches_controller.go @@ -35,7 +35,7 @@ func NewRemoteBranchesController( func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.checkoutBranch), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Checkout, @@ -43,13 +43,19 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.withItem(self.newLocalBranch), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.NewBranch, }, { - Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), + Keys: opts.GetKeys(opts.Config.Universal.NewWorktree), + Handler: self.withItem(self.c.Helpers().Worktree.NewWorktreeMenuForRemoteBranch), + Description: self.c.Tr.NewWorktree, + OpensMenu: true, + }, + { + Keys: opts.GetKeys(opts.Config.Branches.MergeIntoCurrentBranch), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.merge)), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Merge, @@ -57,7 +63,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.RebaseBranch), + Keys: opts.GetKeys(opts.Config.Branches.RebaseBranch), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.rebase)), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.RebaseBranch, @@ -65,7 +71,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItems(self.delete), GetDisabledReason: self.require(self.itemRangeSelected()), Description: self.c.Tr.Delete, @@ -73,7 +79,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.SetUpstream), + Keys: opts.GetKeys(opts.Config.Branches.SetUpstream), Handler: self.withItem(self.setAsUpstream), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.SetAsUpstream, @@ -81,13 +87,13 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.SortOrder), + Keys: opts.GetKeys(opts.Config.Branches.SortOrder), Handler: self.createSortMenu, Description: self.c.Tr.SortOrder, OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), + Keys: opts.GetKeys(opts.Config.Commits.ViewResetOptions), Handler: self.withItem(self.createResetMenu), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.ViewResetOptions, @@ -95,7 +101,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), + Keys: opts.GetKeys(opts.Config.Universal.OpenDiffTool), Handler: self.withItem(func(selectedBranch *models.RemoteBranch) error { return self.c.Helpers().Diff.OpenDiffToolForRef(selectedBranch) }), @@ -152,7 +158,7 @@ func (self *RemoteBranchesController) createSortMenu() error { if self.c.UserConfig().Git.RemoteBranchSortOrder != sortOrder { self.c.UserConfig().Git.RemoteBranchSortOrder = sortOrder self.c.Contexts().RemoteBranches.SetSelection(0) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.REMOTES}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.REMOTES}}) } return nil }, diff --git a/pkg/gui/controllers/remotes_controller.go b/pkg/gui/controllers/remotes_controller.go index e1f08bc7d..cd05e5ff9 100644 --- a/pkg/gui/controllers/remotes_controller.go +++ b/pkg/gui/controllers/remotes_controller.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -45,20 +45,20 @@ func NewRemotesController( func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Handler: self.withItem(self.enter), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.ViewBranches, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.add, Description: self.c.Tr.NewRemote, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItem(self.remove), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Remove, @@ -66,7 +66,7 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.withItem(self.edit), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Edit, @@ -74,7 +74,7 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.FetchRemote), + Keys: opts.GetKeys(opts.Config.Branches.FetchRemote), Handler: self.withItem(self.fetch), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Fetch, @@ -82,7 +82,7 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.AddForkRemote), + Keys: opts.GetKeys(opts.Config.Branches.AddForkRemote), Handler: self.addFork, GetDisabledReason: self.hasOriginRemote(), Description: self.c.Tr.AddForkRemote, @@ -106,7 +106,11 @@ func (self *RemotesController) GetOnRenderToMain() func() { if remote == nil { task = types.NewRenderStringTask("No remotes") } else { - task = types.NewRenderStringTask(fmt.Sprintf("%s\nUrls:\n%s", style.FgGreen.Sprint(remote.Name), strings.Join(remote.Urls, "\n"))) + content := fmt.Sprintf("%s\nUrls:\n%s", style.FgGreen.Sprint(remote.Name), strings.Join(remote.Urls, "\n")) + if len(remote.PushUrls) > 0 { + content += fmt.Sprintf("\nPush Urls:\n%s", strings.Join(remote.PushUrls, "\n")) + } + task = types.NewRenderStringTask(content) } self.c.RenderToMainViews(types.RefreshMainOpts{ @@ -120,7 +124,7 @@ func (self *RemotesController) GetOnRenderToMain() func() { } } -func (self *RemotesController) GetOnClick() func() error { +func (self *RemotesController) GetOnDoubleClick() func() error { return self.withItemGraceful(self.enter) } @@ -136,6 +140,7 @@ func (self *RemotesController) enter(remote *models.Remote) error { remoteBranchesContext.SetSelection(newSelectedLine) remoteBranchesContext.SetTitleRef(remote.Name) remoteBranchesContext.SetParentContext(self.Context()) + remoteBranchesContext.SetWindowName(self.Context().GetWindowName()) remoteBranchesContext.GetView().TitlePrefix = self.Context().GetView().TitlePrefix self.c.PostRefreshUpdate(remoteBranchesContext) @@ -151,24 +156,26 @@ func (self *RemotesController) addAndCheckoutRemote(remoteName string, remoteUrl return err } - // Do a sync refresh of the remotes so that we can select - // the new one. Loading remotes is not expensive, so we can - // afford it. + // Refresh the remotes so that we can select the new one. The remotes model + // update is bounced onto the UI thread, so the selection (which reads + // Model.Remotes) has to run in Then; reading it inline here would see the + // previous model. self.c.Refresh(types.RefreshOptions{ Scope: []types.RefreshableView{types.REMOTES}, - Mode: types.SYNC, + Then: func() error { + // Select the remote + for idx, remote := range self.c.Model().Remotes { + if remote.Name == remoteName { + self.c.Contexts().Remotes.SetSelection(idx) + break + } + } + + // Fetch the remote + return self.fetchAndCheckout(self.c.Contexts().Remotes.GetSelected(), branchToCheckout) + }, }) - - // Select the remote - for idx, remote := range self.c.Model().Remotes { - if remote.Name == remoteName { - self.c.Contexts().Remotes.SetSelection(idx) - break - } - } - - // Fetch the remote - return self.fetchAndCheckout(self.c.Contexts().Remotes.GetSelected(), branchToCheckout) + return nil } // Ensures the fork remote exists (matching the given URL). @@ -362,17 +369,26 @@ func (self *RemotesController) fetchAndCheckout(remote *models.Remote, branchNam } refreshOptions := types.RefreshOptions{ Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}, - Mode: types.ASYNC, } if branchName != "" { err = self.c.Git().Branch.New(branchName, remote.Name+"/"+branchName) if err == nil { - self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{}) - self.c.Helpers().Refs.SelectFirstBranchAndFirstCommit() - refreshOptions.KeepBranchSelectionIndex = true + // Branch.New checks the new branch out, so HEAD moves: refresh the + // reflog (and, via scope expansion, the commits) as well, and select + // the newly checked-out branch and its head commit. + refreshOptions.Scope = append(refreshOptions.Scope, types.REFLOG) + refreshOptions.BranchSelection = types.SelectCheckedOutBranch + refreshOptions.CommitSelection = types.SelectHeadCommit + refreshOptions.SelectTopReflogCommit = true + // Focus the branches panel on the UI thread once the refresh has + // selected the newly checked-out branch. + refreshOptions.Then = func() error { + self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{}) + return nil + } } } - self.c.Refresh(refreshOptions) + self.c.RefreshFromWorker(refreshOptions) return err }) } diff --git a/pkg/gui/controllers/rename_similarity_threshold_controller.go b/pkg/gui/controllers/rename_similarity_threshold_controller.go index 2d5f52bc0..e9bf13027 100644 --- a/pkg/gui/controllers/rename_similarity_threshold_controller.go +++ b/pkg/gui/controllers/rename_similarity_threshold_controller.go @@ -1,6 +1,7 @@ package controllers import ( + "errors" "fmt" "github.com/jesseduffield/lazygit/pkg/gui/context" @@ -28,13 +29,13 @@ func NewRenameSimilarityThresholdController( func (self *RenameSimilarityThresholdController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.IncreaseRenameSimilarityThreshold), + Keys: opts.GetKeys(opts.Config.Universal.IncreaseRenameSimilarityThreshold), Handler: self.Increase, Description: self.c.Tr.IncreaseRenameSimilarityThreshold, Tooltip: self.c.Tr.IncreaseRenameSimilarityThresholdTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.DecreaseRenameSimilarityThreshold), + Keys: opts.GetKeys(opts.Config.Universal.DecreaseRenameSimilarityThreshold), Handler: self.Decrease, Description: self.c.Tr.DecreaseRenameSimilarityThreshold, Tooltip: self.c.Tr.DecreaseRenameSimilarityThresholdTooltip, @@ -49,6 +50,10 @@ func (self *RenameSimilarityThresholdController) Context() types.Context { } func (self *RenameSimilarityThresholdController) Increase() error { + if err := self.checkCanChangeThreshold(); err != nil { + return err + } + old_size := self.c.UserConfig().Git.RenameSimilarityThreshold if old_size < 100 { @@ -59,6 +64,10 @@ func (self *RenameSimilarityThresholdController) Increase() error { } func (self *RenameSimilarityThresholdController) Decrease() error { + if err := self.checkCanChangeThreshold(); err != nil { + return err + } + old_size := self.c.UserConfig().Git.RenameSimilarityThreshold if old_size > 5 { @@ -73,11 +82,23 @@ func (self *RenameSimilarityThresholdController) applyChange() error { currentContext := self.c.Context().CurrentSide() switch currentContext.GetKey() { - // we make an exception for our files context, because it actually need to refresh its state afterwards. + // we make an exception for the files and commit-files contexts, because + // they actually need to refresh their state afterwards: a changed threshold + // can turn a rename into a separate delete and add, or vice versa. case context.FILES_CONTEXT_KEY: self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}) + case context.COMMIT_FILES_CONTEXT_KEY: + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMIT_FILES}}) default: currentContext.HandleRenderToMain() } return nil } + +func (self *RenameSimilarityThresholdController) checkCanChangeThreshold() error { + if self.c.Git().Patch.PatchBuilder.Active() { + return errors.New(self.c.Tr.CantChangeRenameThresholdError) + } + + return nil +} diff --git a/pkg/gui/controllers/screen_mode_actions.go b/pkg/gui/controllers/screen_mode_actions.go index a09331065..cb1b0616e 100644 --- a/pkg/gui/controllers/screen_mode_actions.go +++ b/pkg/gui/controllers/screen_mode_actions.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -42,9 +42,10 @@ func (self *ScreenModeActions) rerenderViewsWithScreenModeDependentContent() { } } - // Rerender the main view; for views that display a diff this is necessary in case a custom - // pager depends on the width of the view. For other views it isn't needed, but we don't bother - // making a distinction here, as rerendering the main view unnecessarily is not a big deal. + // Rerender the main view; for views that display a diff this is necessary in case a custom diff + // renderer depends on the width of the view. For other views it isn't needed, but we don't + // bother making a distinction here, as rerendering the main view unnecessarily is not a big + // deal. self.c.Context().CurrentSide().HandleRenderToMain() } diff --git a/pkg/gui/controllers/search_controller.go b/pkg/gui/controllers/search_controller.go index 395784d10..f84539646 100644 --- a/pkg/gui/controllers/search_controller.go +++ b/pkg/gui/controllers/search_controller.go @@ -36,13 +36,14 @@ func (self *SearchController) Context() types.Context { func (self *SearchController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.StartSearch), - Handler: self.OpenSearchPrompt, + Keys: opts.GetKeys(opts.Config.Universal.StartSearch), + Handler: self.openSearchPrompt, Description: self.c.Tr.StartSearch, }, } } -func (self *SearchController) OpenSearchPrompt() error { - return self.c.Helpers().Search.OpenSearchPrompt(self.context) +func (self *SearchController) openSearchPrompt() error { + self.c.Helpers().Search.OpenSearchPrompt(self.context) + return nil } diff --git a/pkg/gui/controllers/search_prompt_controller.go b/pkg/gui/controllers/search_prompt_controller.go index 9eca74c90..4e6de85dc 100644 --- a/pkg/gui/controllers/search_prompt_controller.go +++ b/pkg/gui/controllers/search_prompt_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -24,24 +24,20 @@ func NewSearchPromptController( func (self *SearchPromptController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: gocui.KeyEnter, - Modifier: gocui.ModNone, - Handler: self.confirm, + Keys: []gocui.Key{gocui.NewKeyName(gocui.KeyEnter)}, + Handler: self.confirm, }, { - Key: opts.GetKey(opts.Config.Universal.Return), - Modifier: gocui.ModNone, - Handler: self.cancel, + Keys: opts.GetKeys(opts.Config.Universal.Return), + Handler: self.cancel, }, { - Key: opts.GetKey(opts.Config.Universal.PrevItem), - Modifier: gocui.ModNone, - Handler: self.prevHistory, + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), + Handler: self.prevHistory, }, { - Key: opts.GetKey(opts.Config.Universal.NextItem), - Modifier: gocui.ModNone, - Handler: self.nextHistory, + Keys: opts.GetKeys(opts.Config.Universal.NextItem), + Handler: self.nextHistory, }, } } @@ -55,11 +51,13 @@ func (self *SearchPromptController) context() types.Context { } func (self *SearchPromptController) confirm() error { - return self.c.Helpers().Search.Confirm() + self.c.Helpers().Search.Confirm() + return nil } func (self *SearchPromptController) cancel() error { - return self.c.Helpers().Search.CancelPrompt() + self.c.Helpers().Search.CancelPrompt() + return nil } func (self *SearchPromptController) prevHistory() error { diff --git a/pkg/gui/controllers/side_window_controller.go b/pkg/gui/controllers/side_window_controller.go index 2cd421e0e..67fc9f946 100644 --- a/pkg/gui/controllers/side_window_controller.go +++ b/pkg/gui/controllers/side_window_controller.go @@ -1,7 +1,6 @@ package controllers import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -36,12 +35,8 @@ func NewSideWindowController( func (self *SideWindowController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ - {Key: opts.GetKey(opts.Config.Universal.PrevBlock), Modifier: gocui.ModNone, Handler: self.previousSideWindow}, - {Key: opts.GetKey(opts.Config.Universal.NextBlock), Modifier: gocui.ModNone, Handler: self.nextSideWindow}, - {Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt), Modifier: gocui.ModNone, Handler: self.previousSideWindow}, - {Key: opts.GetKey(opts.Config.Universal.NextBlockAlt), Modifier: gocui.ModNone, Handler: self.nextSideWindow}, - {Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt2), Modifier: gocui.ModNone, Handler: self.previousSideWindow}, - {Key: opts.GetKey(opts.Config.Universal.NextBlockAlt2), Modifier: gocui.ModNone, Handler: self.nextSideWindow}, + {Keys: opts.GetKeys(opts.Config.Universal.PrevBlock), Handler: self.previousSideWindow}, + {Keys: opts.GetKeys(opts.Config.Universal.NextBlock), Handler: self.nextSideWindow}, } } diff --git a/pkg/gui/controllers/snake_controller.go b/pkg/gui/controllers/snake_controller.go index a2a2030b7..b059ce787 100644 --- a/pkg/gui/controllers/snake_controller.go +++ b/pkg/gui/controllers/snake_controller.go @@ -24,23 +24,23 @@ func NewSnakeController( func (self *SnakeController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.NextItem), + Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.SetDirection(snake.Down), }, { - Key: opts.GetKey(opts.Config.Universal.PrevItem), + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.SetDirection(snake.Up), }, { - Key: opts.GetKey(opts.Config.Universal.PrevBlock), + Keys: opts.GetKeys(opts.Config.Universal.PrevBlock), Handler: self.SetDirection(snake.Left), }, { - Key: opts.GetKey(opts.Config.Universal.NextBlock), + Keys: opts.GetKeys(opts.Config.Universal.NextBlock), Handler: self.SetDirection(snake.Right), }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.Escape, }, } diff --git a/pkg/gui/controllers/staging_controller.go b/pkg/gui/controllers/staging_controller.go index f667dd212..505a07fc4 100644 --- a/pkg/gui/controllers/staging_controller.go +++ b/pkg/gui/controllers/staging_controller.go @@ -4,10 +4,9 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/patch" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -42,69 +41,69 @@ func NewStagingController( func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.ToggleStaged, Description: self.c.Tr.Stage, Tooltip: self.c.Tr.StageSelectionTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.DiscardSelection, Description: self.c.Tr.DiscardSelection, Tooltip: self.c.Tr.DiscardSelectionTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenFile), + Keys: opts.GetKeys(opts.Config.Universal.OpenFile), Handler: self.OpenFile, Description: self.c.Tr.OpenFile, Tooltip: self.c.Tr.OpenFileTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.EditFile, Description: self.c.Tr.EditFile, Tooltip: self.c.Tr.EditFileTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: self.Escape, Description: self.c.Tr.ReturnToFilesPanel, DescriptionFunc: self.EscapeDescription, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.TogglePanel), + Keys: opts.GetKeys(opts.Config.Universal.TogglePanel), Handler: self.TogglePanel, Description: self.c.Tr.ToggleStagingView, Tooltip: self.c.Tr.ToggleStagingViewTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Main.EditSelectHunk), + Keys: opts.GetKeys(opts.Config.Main.EditSelectHunk), Handler: self.EditHunkAndRefresh, Description: self.c.Tr.EditHunk, Tooltip: self.c.Tr.EditHunkTooltip, }, { - Key: opts.GetKey(opts.Config.Files.CommitChanges), + Keys: opts.GetKeys(opts.Config.Files.CommitChanges), Handler: self.c.Helpers().WorkingTree.HandleCommitPress, Description: self.c.Tr.Commit, Tooltip: self.c.Tr.CommitTooltip, }, { - Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook), + Keys: opts.GetKeys(opts.Config.Files.CommitChangesWithoutHook), Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress, Description: self.c.Tr.CommitChangesWithoutHook, }, { - Key: opts.GetKey(opts.Config.Files.CommitChangesWithEditor), + Keys: opts.GetKeys(opts.Config.Files.CommitChangesWithEditor), Handler: self.c.Helpers().WorkingTree.HandleCommitEditorPress, Description: self.c.Tr.CommitChangesWithEditor, }, { - Key: opts.GetKey(opts.Config.Files.FindBaseCommitForFixup), + Keys: opts.GetKeys(opts.Config.Files.FindBaseCommitForFixup), Handler: self.c.Helpers().FixupHelper.HandleFindBaseCommitForFixupPress, Description: self.c.Tr.FindBaseCommitForFixup, Tooltip: self.c.Tr.FindBaseCommitForFixupTooltip, @@ -205,7 +204,7 @@ func (self *StagingController) TogglePanel() error { func (self *StagingController) ToggleStaged() error { if self.c.UserConfig().Git.DiffContextSize == 0 { return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextToStage, - keybindings.Label(self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)) + self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView) } return self.applySelectionAndRefresh(self.staged) @@ -214,7 +213,7 @@ func (self *StagingController) ToggleStaged() error { func (self *StagingController) DiscardSelection() error { if self.c.UserConfig().Git.DiffContextSize == 0 { return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextToDiscard, - keybindings.Label(self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)) + self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView) } return self.c.ConfirmIf(!self.staged && !self.c.UserConfig().Gui.SkipDiscardChangeWarning, @@ -230,7 +229,10 @@ func (self *StagingController) applySelectionAndRefresh(reverse bool) error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}}) + // Block input until the refresh has landed: it rebuilds the staging panel + // and moves the selection to the next stageable change, and a quick second + // keypress must act on that, not on the stale pre-refresh diff. + self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}}) return nil } @@ -285,7 +287,9 @@ func (self *StagingController) EditHunkAndRefresh() error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}}) + // Block input like applySelectionAndRefresh does; the refresh rebuilds the + // staging panel from the post-edit diff. + self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}}) return nil } diff --git a/pkg/gui/controllers/stash_controller.go b/pkg/gui/controllers/stash_controller.go index 7027cd5fe..7730587f4 100644 --- a/pkg/gui/controllers/stash_controller.go +++ b/pkg/gui/controllers/stash_controller.go @@ -1,7 +1,10 @@ package controllers import ( + "fmt" + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -34,7 +37,7 @@ func NewStashController( func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.handleStashApply), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Apply, @@ -42,7 +45,7 @@ func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Stash.PopStash), + Keys: opts.GetKeys(opts.Config.Stash.PopStash), Handler: self.withItem(self.handleStashPop), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Pop, @@ -50,7 +53,7 @@ func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItems(self.handleStashDrop), GetDisabledReason: self.require(self.itemRangeSelected()), Description: self.c.Tr.Drop, @@ -58,14 +61,20 @@ func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.withItem(self.handleNewBranchOffStashEntry), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.NewBranch, Tooltip: self.c.Tr.NewBranchFromStashTooltip, }, { - Key: opts.GetKey(opts.Config.Stash.RenameStash), + Keys: opts.GetKeys(opts.Config.Universal.NewWorktree), + Handler: self.withItem(self.c.Helpers().Worktree.NewWorktreeMenuForStash), + Description: self.c.Tr.NewWorktree, + OpensMenu: true, + }, + { + Keys: opts.GetKeys(opts.Config.Stash.RenameStash), Handler: self.withItem(self.handleRenameStashEntry), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.RenameStash, @@ -112,33 +121,29 @@ func (self *StashController) handleStashApply(stashEntry *models.StashEntry) err Title: self.c.Tr.StashApply, Prompt: self.c.Tr.SureApplyStashEntry, HandleConfirm: func() error { - self.c.LogAction(self.c.Tr.Actions.ApplyStash) - err := self.c.Git().Stash.Apply(stashEntry.Index) - self.postStashRefresh() - if err != nil { - return err - } - if self.c.UserConfig().Gui.SwitchToFilesAfterStashApply { - self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{}) - } - return nil + return self.c.WithWaitingStatusBlockingInput( + types.WaitingStatusOpts{Message: self.c.Tr.ApplyingStashStatus}, + func(gocui.Task) error { + self.c.LogAction(self.c.Tr.Actions.ApplyStash) + err := self.c.Git().Stash.Apply(stashEntry.Index) + self.postStashRefresh(err == nil && self.c.UserConfig().Gui.SwitchToFilesAfterStashApply) + return err + }) }, }) } func (self *StashController) handleStashPop(stashEntry *models.StashEntry) error { pop := func() error { - self.c.LogAction(self.c.Tr.Actions.PopStash) - self.c.LogCommand("Popping stash "+stashEntry.Hash, false) - err := self.c.Git().Stash.Pop(stashEntry.Index) - self.postStashRefresh() - if err != nil { - return err - } - if self.c.UserConfig().Gui.SwitchToFilesAfterStashPop { - self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{}) - } - return nil + return self.c.WithWaitingStatusBlockingInput( + types.WaitingStatusOpts{Message: self.c.Tr.PoppingStashStatus}, + func(gocui.Task) error { + self.c.LogAction(self.c.Tr.Actions.PopStash) + self.c.LogCommand(fmt.Sprintf(self.c.Tr.Log.PoppingStash, stashEntry.Hash), false) + err := self.c.Git().Stash.Pop(stashEntry.Index) + self.postStashRefresh(err == nil && self.c.UserConfig().Gui.SwitchToFilesAfterStashPop) + return err + }) } if self.c.UserConfig().Gui.SkipStashWarning { @@ -162,24 +167,65 @@ func (self *StashController) handleStashDrop(stashEntries []*models.StashEntry) Prompt: self.c.Tr.SureDropStashEntry, HandleConfirm: func() error { self.c.LogAction(self.c.Tr.Actions.DropStash) + // Refresh once at the end rather than after each drop: a refresh + // from the UI thread finishes in the background, so firing one per + // iteration lets the workers race and an earlier, stale result can + // land last. The indices are captured up front and we drop + // highest-first, so the remaining lower indices stay valid without + // an intervening refresh. + var dropErr error for i := len(stashEntries) - 1; i >= 0; i-- { - self.c.LogCommand("Dropping stash "+stashEntries[i].Hash, false) - err := self.c.Git().Stash.Drop(stashEntries[i].Index) - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}}) - if err != nil { - return err + self.c.LogCommand(fmt.Sprintf(self.c.Tr.Log.DroppingStash, stashEntries[i].Hash), false) + if dropErr = self.c.Git().Stash.Drop(stashEntries[i].Index); dropErr != nil { + break } } - self.context().CollapseRangeSelectionToTop() - return nil + // Block input until the refresh has landed, so that dropping the + // next entry in quick succession (confirming and pressing the key + // again right away) sees the refreshed list and not the stale, + // pre-drop indices. + self.c.RefreshBlockingInput(types.RefreshOptions{ + Scope: []types.RefreshableView{types.STASH}, + Then: func() error { + // Collapse the range selection from here, so that it lands + // in the same frame as the shortened list. The refresh has + // painted the list by the time Then runs, so the new + // selection needs a focus update of its own. + if dropErr == nil { + self.context().CollapseRangeSelectionToTop() + self.context().HandleFocus(types.OnFocusOpts{}) + } + return nil + }, + }) + return dropErr }, }) return nil } -func (self *StashController) postStashRefresh() { - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH, types.FILES}}) +// postStashRefresh refreshes the panels that applying or popping a stash +// affects, moving the focus to the files panel if switchToFiles is set. +// +// Call it from the worker that ran the stash command, from inside a +// WithWaitingStatusBlockingInput: popping shifts the indices of the remaining +// stash entries, so acting on the next entry in quick succession (confirming +// the popup and pressing the key again right away) has to be held off until +// the refreshed list is in place, or it would target the wrong stash. +func (self *StashController) postStashRefresh(switchToFiles bool) { + self.c.RefreshFromWorker(types.RefreshOptions{ + BatchUIUpdates: true, + Scope: []types.RefreshableView{types.STASH, types.FILES}, + Then: func() error { + // Switch panels from here, so that the focus change lands in the + // same frame as the refreshed panel contents. + if switchToFiles { + self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{}) + } + return nil + }, + }) } func (self *StashController) handleNewBranchOffStashEntry(stashEntry *models.StashEntry) error { @@ -201,12 +247,14 @@ func (self *StashController) handleRenameStashEntry(stashEntry *models.StashEntr self.c.LogAction(self.c.Tr.Actions.RenameStash) err := self.c.Git().Stash.Rename(stashEntry.Index, response) if err != nil { - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}}) + self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}}) return err } self.context().SetSelection(0) // Select the renamed stash - self.context().FocusLine(true) - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}}) + // Renaming re-creates the stash at the top, shifting the other + // entries' indices; block input so that a quick next action sees + // the refreshed list rather than the stale indices. + self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}}) return nil }, AllowEmptyInput: true, diff --git a/pkg/gui/controllers/status_controller.go b/pkg/gui/controllers/status_controller.go index 377fd4994..5a740a23a 100644 --- a/pkg/gui/controllers/status_controller.go +++ b/pkg/gui/controllers/status_controller.go @@ -1,18 +1,16 @@ package controllers import ( - "errors" "fmt" "strings" "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/constants" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" - "github.com/samber/lo" ) type StatusController struct { @@ -34,37 +32,31 @@ func NewStatusController( func (self *StatusController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.OpenFile), - Handler: self.openConfig, - Description: self.c.Tr.OpenConfig, - Tooltip: self.c.Tr.OpenFileTooltip, - }, - { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.editConfig, Description: self.c.Tr.EditConfig, Tooltip: self.c.Tr.EditFileTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Status.CheckForUpdate), + Keys: opts.GetKeys(opts.Config.Status.CheckForUpdate), Handler: self.handleCheckForUpdate, Description: self.c.Tr.CheckForUpdate, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Status.RecentRepos), + Keys: opts.GetKeys(opts.Config.Status.RecentRepos), Handler: self.c.Helpers().Repos.CreateRecentReposMenu, Description: self.c.Tr.SwitchRepo, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Status.AllBranchesLogGraph), + Keys: opts.GetKeys(opts.Config.Status.AllBranchesLogGraph), Handler: func() error { self.switchToOrRotateAllBranchesLogs(); return nil }, Description: self.c.Tr.AllBranchesLogGraph, }, { - Key: opts.GetKey(opts.Config.Status.AllBranchesLogGraphReverse), + Keys: opts.GetKeys(opts.Config.Status.AllBranchesLogGraphReverse), Handler: func() error { self.switchToOrRotateAllBranchesLogsBackward(); return nil }, Description: self.c.Tr.AllBranchesLogGraphReverse, }, @@ -148,38 +140,8 @@ func lazygitTitle() string { |___/ |___/ ` } -func (self *StatusController) askForConfigFile(action func(file string) error) error { - confPaths := self.c.GetConfig().GetUserConfigPaths() - switch len(confPaths) { - case 0: - return errors.New(self.c.Tr.NoConfigFileFoundErr) - case 1: - return action(confPaths[0]) - default: - menuItems := lo.Map(confPaths, func(path string, _ int) *types.MenuItem { - return &types.MenuItem{ - Label: path, - OnPress: func() error { - return action(path) - }, - } - }) - - return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.SelectConfigFile, - Items: menuItems, - }) - } -} - -func (self *StatusController) openConfig() error { - return self.askForConfigFile(self.c.Helpers().Files.OpenFile) -} - func (self *StatusController) editConfig() error { - return self.askForConfigFile(func(file string) error { - return self.c.Helpers().Files.EditFiles([]string{file}) - }) + return (&EditConfigAction{c: self.c}).Call() } func (self *StatusController) showAllBranchLogs() { diff --git a/pkg/gui/controllers/sub_commits_controller.go b/pkg/gui/controllers/sub_commits_controller.go index 8799cd3c6..d3d0c0b98 100644 --- a/pkg/gui/controllers/sub_commits_controller.go +++ b/pkg/gui/controllers/sub_commits_controller.go @@ -66,7 +66,7 @@ func (self *SubCommitsController) GetOnFocus() func(types.OnFocusOpts) { context := self.context() if context.GetSelectedLineIdx() > COMMIT_THRESHOLD && context.GetLimitCommits() { context.SetLimitCommits(false) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.SUB_COMMITS}}) + self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUB_COMMITS}}) } } } diff --git a/pkg/gui/controllers/submodules_controller.go b/pkg/gui/controllers/submodules_controller.go index c0f52bed1..82ca509ca 100644 --- a/pkg/gui/controllers/submodules_controller.go +++ b/pkg/gui/controllers/submodules_controller.go @@ -5,10 +5,9 @@ import ( "path/filepath" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -40,21 +39,21 @@ func NewSubmodulesController( func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Handler: self.withItem(self.enter), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Enter, Tooltip: utils.ResolvePlaceholderString(self.c.Tr.EnterSubmoduleTooltip, - map[string]string{"escape": keybindings.Label(opts.Config.Universal.Return)}), + map[string]string{"escape": opts.Config.Universal.Return.String()}), DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.enter), GetDisabledReason: self.require(self.singleItemSelected()), }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItem(self.remove), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Remove, @@ -62,7 +61,7 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []* DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Submodules.Update), + Keys: opts.GetKeys(opts.Config.Submodules.Update), Handler: self.withItem(self.update), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Update, @@ -70,39 +69,38 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []* DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.add, Description: self.c.Tr.NewSubmodule, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: self.withItem(self.editURL), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.EditSubmoduleUrl, }, { - Key: opts.GetKey(opts.Config.Submodules.Init), + Keys: opts.GetKeys(opts.Config.Submodules.Init), Handler: self.withItem(self.init), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Initialize, Tooltip: self.c.Tr.InitSubmoduleTooltip, }, { - Key: opts.GetKey(opts.Config.Submodules.BulkMenu), + Keys: opts.GetKeys(opts.Config.Submodules.BulkMenu), Handler: self.openBulkActionsMenu, Description: self.c.Tr.ViewBulkSubmoduleOptions, OpensMenu: true, }, { - Key: nil, Handler: self.easterEgg, Description: self.c.Tr.EasterEgg, }, } } -func (self *SubmodulesController) GetOnClick() func() error { +func (self *SubmodulesController) GetOnDoubleClick() func() error { return self.withItemGraceful(self.enter) } @@ -125,7 +123,7 @@ func (self *SubmodulesController) GetOnRenderToMain() func() { if file == nil { task = types.NewRenderStringTask(prefix) } else { - cmdObj := self.c.Git().WorkingTree.WorktreeFileDiffCmdObj(file, false, !file.HasUnstagedChanges && file.HasStagedChanges, nil) + cmdObj := self.c.Git().WorkingTree.WorktreeFileDiffCmdObj(file, false, !file.HasUnstagedChanges && file.HasStagedChanges, file.Names()) task = types.NewRunCommandTaskWithPrefix(cmdObj.GetCmd(), prefix) } } @@ -166,7 +164,7 @@ func (self *SubmodulesController) add() error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) }, @@ -195,7 +193,7 @@ func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) err return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) }, @@ -212,7 +210,7 @@ func (self *SubmodulesController) init(submodule *models.SubmoduleConfig) error return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) } @@ -231,11 +229,11 @@ func (self *SubmodulesController) openBulkActionsMenu() error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) }, - Key: 'i', + Keys: menuKey('i'), }, { LabelColumns: []string{self.c.Tr.BulkUpdateSubmodules, style.FgYellow.Sprint(self.c.Git().Submodule.BulkUpdateCmdObj().ToString())}, @@ -246,11 +244,11 @@ func (self *SubmodulesController) openBulkActionsMenu() error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) }, - Key: 'u', + Keys: menuKey('u'), }, { LabelColumns: []string{self.c.Tr.BulkUpdateRecursiveSubmodules, style.FgYellow.Sprint(self.c.Git().Submodule.BulkUpdateRecursivelyCmdObj().ToString())}, @@ -261,11 +259,11 @@ func (self *SubmodulesController) openBulkActionsMenu() error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) }, - Key: 'r', + Keys: menuKey('r'), }, { LabelColumns: []string{self.c.Tr.BulkDeinitSubmodules, style.FgRed.Sprint(self.c.Git().Submodule.BulkDeinitCmdObj().ToString())}, @@ -276,11 +274,11 @@ func (self *SubmodulesController) openBulkActionsMenu() error { return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) }, - Key: 'd', + Keys: menuKey('d'), }, }, }) @@ -294,7 +292,7 @@ func (self *SubmodulesController) update(submodule *models.SubmoduleConfig) erro return err } - self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.SUBMODULES}}) return nil }) } diff --git a/pkg/gui/controllers/suggestions_controller.go b/pkg/gui/controllers/suggestions_controller.go index 715ee12e9..18ee594b2 100644 --- a/pkg/gui/controllers/suggestions_controller.go +++ b/pkg/gui/controllers/suggestions_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -32,26 +32,26 @@ func NewSuggestionsController( func (self *SuggestionsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.ConfirmSuggestion), + Keys: opts.GetKeys(opts.Config.Universal.ConfirmSuggestion), Handler: func() error { return self.context().State.OnConfirm() }, GetDisabledReason: self.require(self.singleItemSelected()), }, { - Key: opts.GetKey(opts.Config.Universal.Return), + Keys: opts.GetKeys(opts.Config.Universal.Return), Handler: func() error { return self.context().State.OnClose() }, }, { - Key: opts.GetKey(opts.Config.Universal.TogglePanel), + Keys: opts.GetKeys(opts.Config.Universal.TogglePanel), Handler: self.switchToPrompt, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: func() error { return self.context().State.OnDeleteSuggestion() }, }, { - Key: opts.GetKey(opts.Config.Universal.Edit), + Keys: opts.GetKeys(opts.Config.Universal.Edit), Handler: func() error { if self.context().State.AllowEditSuggestion { if selectedItem := self.c.Contexts().Suggestions.GetSelected(); selectedItem != nil { @@ -85,7 +85,6 @@ func (self *SuggestionsController) GetMouseKeybindings(opts types.KeybindingsOpt func (self *SuggestionsController) switchToPrompt() error { self.c.Views().Suggestions.Subtitle = "" - self.c.Views().Suggestions.Highlight = false self.c.Context().Replace(self.c.Contexts().Prompt) return nil } diff --git a/pkg/gui/controllers/switch_to_diff_files_controller.go b/pkg/gui/controllers/switch_to_diff_files_controller.go index cdf943cfe..afdf92c80 100644 --- a/pkg/gui/controllers/switch_to_diff_files_controller.go +++ b/pkg/gui/controllers/switch_to_diff_files_controller.go @@ -40,7 +40,7 @@ func NewSwitchToDiffFilesController( func (self *SwitchToDiffFilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Handler: self.enter, GetDisabledReason: self.canEnter, Description: self.c.Tr.ViewItemFiles, @@ -54,7 +54,7 @@ func (self *SwitchToDiffFilesController) Context() types.Context { return self.context } -func (self *SwitchToDiffFilesController) GetOnClick() func() error { +func (self *SwitchToDiffFilesController) GetOnDoubleClick() func() error { return func() error { if self.canEnter() == nil { return self.enter() @@ -90,18 +90,19 @@ func (self *SwitchToDiffFilesController) enter() error { self.c.Refresh(types.RefreshOptions{ Scope: []types.RefreshableView{types.COMMIT_FILES}, + Then: func() error { + if filterPath := self.c.Modes().Filtering.GetPath(); filterPath != "" { + path, err := filepath.Rel(self.c.Git().RepoPaths.RepoPath(), filterPath) + if err != nil { + path = filterPath + } + commitFilesContext.CommitFileTreeViewModel.SelectPath( + filepath.ToSlash(path), self.c.UserConfig().Gui.ShowRootItemInFileTree) + } + self.c.Context().Push(commitFilesContext, types.OnFocusOpts{}) + return nil + }, }) - - if filterPath := self.c.Modes().Filtering.GetPath(); filterPath != "" { - path, err := filepath.Rel(self.c.Git().RepoPaths.RepoPath(), filterPath) - if err != nil { - path = filterPath - } - commitFilesContext.CommitFileTreeViewModel.SelectPath( - filepath.ToSlash(path), self.c.UserConfig().Gui.ShowRootItemInFileTree) - } - - self.c.Context().Push(commitFilesContext, types.OnFocusOpts{}) return nil } diff --git a/pkg/gui/controllers/switch_to_focused_main_view_controller.go b/pkg/gui/controllers/switch_to_focused_main_view_controller.go index 132ec96db..5606a0bab 100644 --- a/pkg/gui/controllers/switch_to_focused_main_view_controller.go +++ b/pkg/gui/controllers/switch_to_focused_main_view_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -29,7 +29,7 @@ func NewSwitchToFocusedMainViewController( func (self *SwitchToFocusedMainViewController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.FocusMainView), + Keys: opts.GetKeys(opts.Config.Universal.FocusMainView), Handler: self.handleFocusMainView, Description: self.c.Tr.FocusMainView, Tag: "global", diff --git a/pkg/gui/controllers/switch_to_sub_commits_controller.go b/pkg/gui/controllers/switch_to_sub_commits_controller.go index 9257e33d3..4d723d061 100644 --- a/pkg/gui/controllers/switch_to_sub_commits_controller.go +++ b/pkg/gui/controllers/switch_to_sub_commits_controller.go @@ -47,7 +47,7 @@ func (self *SwitchToSubCommitsController) GetKeybindings(opts types.KeybindingsO { Handler: self.viewCommits, GetDisabledReason: self.require(self.singleItemSelected()), - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Description: self.c.Tr.ViewCommits, }, } @@ -55,7 +55,7 @@ func (self *SwitchToSubCommitsController) GetKeybindings(opts types.KeybindingsO return bindings } -func (self *SwitchToSubCommitsController) GetOnClick() func() error { +func (self *SwitchToSubCommitsController) GetOnDoubleClick() func() error { return self.viewCommits } diff --git a/pkg/gui/controllers/sync_controller.go b/pkg/gui/controllers/sync_controller.go index 023ac0d25..61b92747b 100644 --- a/pkg/gui/controllers/sync_controller.go +++ b/pkg/gui/controllers/sync_controller.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -32,14 +32,14 @@ func NewSyncController( func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Push), + Keys: opts.GetKeys(opts.Config.Universal.Push), Handler: opts.Guards.NoPopupPanel(self.HandlePush), GetDisabledReason: self.getDisabledReasonForPushOrPull, Description: self.c.Tr.Push, Tooltip: self.c.Tr.PushTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Pull), + Keys: opts.GetKeys(opts.Config.Universal.Pull), Handler: opts.Guards.NoPopupPanel(self.HandlePull), GetDisabledReason: self.getDisabledReasonForPushOrPull, Description: self.c.Tr.Pull, @@ -175,7 +175,7 @@ func (self *SyncController) pullWithLock(task gocui.Task, opts PullFilesOptions) }, ) - return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) + return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseAndSelectHeadCommit(err) } type pushOpts struct { @@ -229,7 +229,7 @@ func (self *SyncController) pushAux(currentBranch *models.Branch, opts pushOpts) } return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return nil }) } @@ -256,8 +256,8 @@ func (self *SyncController) forcePushPrompt() string { return utils.ResolvePlaceholderString( self.c.Tr.ForcePushPrompt, map[string]string{ - "cancelKey": self.c.UserConfig().Keybinding.Universal.Return, - "confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm, + "cancelKey": self.c.UserConfig().Keybinding.Universal.Return.String(), + "confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm.String(), }, ) } diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index c8a02df87..a6c0e7e14 100644 --- a/pkg/gui/controllers/tags_controller.go +++ b/pkg/gui/controllers/tags_controller.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -39,7 +39,7 @@ func NewTagsController( func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.checkout), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Checkout, @@ -47,14 +47,20 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types. DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.create, Description: self.c.Tr.NewTag, Tooltip: self.c.Tr.NewTagTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.NewWorktree), + Handler: self.withItem(self.c.Helpers().Worktree.NewWorktreeMenuForTag), + Description: self.c.Tr.NewWorktree, + OpensMenu: true, + }, + { + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItem(self.delete), Description: self.c.Tr.Delete, GetDisabledReason: self.require(self.singleItemSelected()), @@ -63,7 +69,7 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types. DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.PushTag), + Keys: opts.GetKeys(opts.Config.Branches.PushTag), Handler: self.withItem(self.push), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.PushTag, @@ -71,7 +77,7 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types. DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), + Keys: opts.GetKeys(opts.Config.Commits.ViewResetOptions), Handler: self.withItem(self.createResetMenu), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Reset, @@ -80,7 +86,7 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types. OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), + Keys: opts.GetKeys(opts.Config.Universal.OpenDiffTool), Handler: self.withItem(func(selectedTag *models.Tag) error { return self.c.Helpers().Diff.OpenDiffToolForRef(selectedTag) }), @@ -162,7 +168,7 @@ func (self *TagsController) localDelete(tag *models.Tag) error { return self.c.WithWaitingStatus(self.c.Tr.DeletingStatus, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.DeleteLocalTag) err := self.c.Git().Tag.LocalDelete(tag.Name) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) return err }) } @@ -204,7 +210,7 @@ func (self *TagsController) remoteDelete(tag *models.Tag) error { return err } self.c.Toast(self.c.Tr.RemoteTagDeletedMessage) - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) return nil }) }, @@ -258,7 +264,7 @@ func (self *TagsController) localAndRemoteDelete(tag *models.Tag) error { if err := self.c.Git().Tag.LocalDelete(tag.Name); err != nil { return err } - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) + self.c.RefreshFromWorker(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) return nil }) }, @@ -282,14 +288,14 @@ func (self *TagsController) delete(tag *models.Tag) error { menuItems := []*types.MenuItem{ { Label: self.c.Tr.DeleteLocalTag, - Key: 'c', + Keys: menuKey('c'), OnPress: func() error { return self.localDelete(tag) }, }, { Label: self.c.Tr.DeleteRemoteTag, - Key: 'r', + Keys: menuKey('r'), OpensMenu: true, OnPress: func() error { return self.remoteDelete(tag) @@ -297,7 +303,7 @@ func (self *TagsController) delete(tag *models.Tag) error { }, { Label: self.c.Tr.DeleteLocalAndRemoteTag, - Key: 'b', + Keys: menuKey('b'), OpensMenu: true, OnPress: func() error { return self.localAndRemoteDelete(tag) @@ -326,15 +332,7 @@ func (self *TagsController) push(tag *models.Tag) error { HandleConfirm: func(response string) error { return self.c.WithInlineStatus(tag, types.ItemOperationPushing, context.TAGS_CONTEXT_KEY, func(task gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.PushTag) - err := self.c.Git().Tag.Push(task, response, tag.Name) - - // Render again to remove the inline status: - self.c.OnUIThread(func() error { - self.c.Contexts().Tags.HandleRender() - return nil - }) - - return err + return self.c.Git().Tag.Push(task, response, tag.Name) }) }, }) diff --git a/pkg/gui/controllers/toggle_whitespace_action.go b/pkg/gui/controllers/toggle_whitespace_action.go index a1ac0c8da..67bb59d86 100644 --- a/pkg/gui/controllers/toggle_whitespace_action.go +++ b/pkg/gui/controllers/toggle_whitespace_action.go @@ -27,6 +27,6 @@ func (self *ToggleWhitespaceAction) Call() error { self.c.UserConfig().Git.IgnoreWhitespaceInDiffView = !self.c.UserConfig().Git.IgnoreWhitespaceInDiffView - self.c.Context().CurrentSide().HandleFocus(types.OnFocusOpts{}) + self.c.Context().CurrentSide().HandleRenderToMain() return nil } diff --git a/pkg/gui/controllers/undo_controller.go b/pkg/gui/controllers/undo_controller.go index cdc8a1280..0954d66b0 100644 --- a/pkg/gui/controllers/undo_controller.go +++ b/pkg/gui/controllers/undo_controller.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -53,13 +53,13 @@ type reflogAction struct { func (self *UndoController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.Undo), + Keys: opts.GetKeys(opts.Config.Universal.Undo), Handler: self.reflogUndo, Description: self.c.Tr.UndoReflog, Tooltip: self.c.Tr.UndoTooltip, }, { - Key: opts.GetKey(opts.Config.Universal.Redo), + Keys: opts.GetKeys(opts.Config.Universal.Redo), Handler: self.reflogRedo, Description: self.c.Tr.RedoReflog, Tooltip: self.c.Tr.RedoTooltip, @@ -271,7 +271,7 @@ func (self *UndoController) hardResetWithAutoStash(commitHash string, options ha if err != nil { return err } - self.c.Refresh(types.RefreshOptions{}) + self.c.RefreshFromWorker(types.RefreshOptions{}) return nil }) } diff --git a/pkg/gui/controllers/vertical_scroll_controller.go b/pkg/gui/controllers/vertical_scroll_controller.go index b88574451..84e312c1d 100644 --- a/pkg/gui/controllers/vertical_scroll_controller.go +++ b/pkg/gui/controllers/vertical_scroll_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -66,12 +66,8 @@ func (self *VerticalScrollController) HandleScrollUp() error { } func (self *VerticalScrollController) HandleScrollDown() error { - scrollHeight := self.c.UserConfig().Gui.ScrollHeight - self.context.GetViewTrait().ScrollDown(scrollHeight) - - if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil { - manager.ReadLines(scrollHeight) - } + self.context.GetViewTrait().ScrollDown(self.c.UserConfig().Gui.ScrollHeight) + self.c.ReadLinesToFillView(self.context.GetView()) return nil } diff --git a/pkg/gui/controllers/view_selection_controller.go b/pkg/gui/controllers/view_selection_controller.go index 638c46ba6..1a97a9a30 100644 --- a/pkg/gui/controllers/view_selection_controller.go +++ b/pkg/gui/controllers/view_selection_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -36,16 +36,12 @@ func (self *ViewSelectionController) Context() types.Context { func (self *ViewSelectionController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItem), Handler: self.handlePrevLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), Handler: self.handlePrevLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItem), Handler: self.handleNextLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItemAlt), Handler: self.handleNextLine}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevPage), Handler: self.handlePrevPage, Description: self.c.Tr.PrevPage}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextPage), Handler: self.handleNextPage, Description: self.c.Tr.NextPage}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop, Alternative: ""}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom, Alternative: ""}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTopAlt), Handler: self.handleGotoTop}, - {Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottomAlt), Handler: self.handleGotoBottom}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.handlePrevLine}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.handleNextLine}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.handlePrevPage, Description: self.c.Tr.PrevPage}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.handleNextPage, Description: self.c.Tr.NextPage}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop}, + {Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom}, } } @@ -54,17 +50,12 @@ func (self *ViewSelectionController) GetMouseKeybindings(opts types.KeybindingsO } func (self *ViewSelectionController) handleLineChange(delta int) { - if delta > 0 { - if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil { - manager.ReadLines(delta) - } - } - v := self.Context().GetView() if delta < 0 { v.ScrollUp(-delta) } else { v.ScrollDown(delta) + self.c.ReadLinesToFillView(v) } } diff --git a/pkg/gui/controllers/workspace_reset_controller.go b/pkg/gui/controllers/workspace_reset_controller.go index 82357922f..27e736648 100644 --- a/pkg/gui/controllers/workspace_reset_controller.go +++ b/pkg/gui/controllers/workspace_reset_controller.go @@ -8,7 +8,7 @@ import ( "math/rand" "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -46,14 +46,14 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, }) return nil }, - Key: 'x', + Keys: menuKey('x'), Tooltip: self.c.Tr.NukeDescription, }, { @@ -68,11 +68,11 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, - Key: 'u', + Keys: menuKey('u'), }, { LabelColumns: []string{ @@ -86,11 +86,11 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, - Key: 'c', + Keys: menuKey('c'), }, { LabelColumns: []string{ @@ -111,11 +111,11 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, - Key: 'S', + Keys: menuKey('S'), }, { LabelColumns: []string{ @@ -129,11 +129,11 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, - Key: 's', + Keys: menuKey('s'), }, { LabelColumns: []string{ @@ -147,11 +147,11 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, - Key: 'm', + Keys: menuKey('m'), }, { LabelColumns: []string{ @@ -170,13 +170,13 @@ func (self *FilesController) createResetMenu() error { } self.c.Refresh( - types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}, + types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}, ) return nil }, }) }, - Key: 'h', + Keys: menuKey('h'), }, } diff --git a/pkg/gui/controllers/worktree_options_controller.go b/pkg/gui/controllers/worktree_options_controller.go deleted file mode 100644 index 0cdf4d008..000000000 --- a/pkg/gui/controllers/worktree_options_controller.go +++ /dev/null @@ -1,51 +0,0 @@ -package controllers - -import ( - "github.com/jesseduffield/lazygit/pkg/gui/types" -) - -// This controller is for all contexts that have items you can create a worktree from - -var _ types.IController = &WorktreeOptionsController{} - -type CanViewWorktreeOptions interface { - types.IListContext -} - -type WorktreeOptionsController struct { - baseController - *ListControllerTrait[string] - c *ControllerCommon - context CanViewWorktreeOptions -} - -func NewWorktreeOptionsController(c *ControllerCommon, context CanViewWorktreeOptions) *WorktreeOptionsController { - return &WorktreeOptionsController{ - baseController: baseController{}, - ListControllerTrait: NewListControllerTrait( - c, - context, - context.GetSelectedItemId, - context.GetSelectedItemIds, - ), - c: c, - context: context, - } -} - -func (self *WorktreeOptionsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { - bindings := []*types.Binding{ - { - Key: opts.GetKey(opts.Config.Worktrees.ViewWorktreeOptions), - Handler: self.withItem(self.viewWorktreeOptions), - Description: self.c.Tr.ViewWorktreeOptions, - OpensMenu: true, - }, - } - - return bindings -} - -func (self *WorktreeOptionsController) viewWorktreeOptions(ref string) error { - return self.c.Helpers().Worktree.ViewWorktreeOptions(self.context, ref) -} diff --git a/pkg/gui/controllers/worktrees_controller.go b/pkg/gui/controllers/worktrees_controller.go index b861d6b04..02d20b3f2 100644 --- a/pkg/gui/controllers/worktrees_controller.go +++ b/pkg/gui/controllers/worktrees_controller.go @@ -11,6 +11,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" ) type WorktreesController struct { @@ -39,13 +40,13 @@ func NewWorktreesController( func (self *WorktreesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.New), + Keys: opts.GetKeys(opts.Config.Universal.New), Handler: self.add, Description: self.c.Tr.NewWorktree, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.Select), + Keys: opts.GetKeys(opts.Config.Universal.Select), Handler: self.withItem(self.enter), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Switch, @@ -53,18 +54,18 @@ func (self *WorktreesController) GetKeybindings(opts types.KeybindingsOpts) []*t DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Universal.GoInto), + Keys: opts.GetKeys(opts.Config.Universal.GoInto), Handler: self.withItem(self.enter), GetDisabledReason: self.require(self.singleItemSelected()), }, { - Key: opts.GetKey(opts.Config.Universal.OpenFile), + Keys: opts.GetKeys(opts.Config.Universal.OpenFile), Handler: self.withItem(self.open), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.OpenInEditor, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), + Keys: opts.GetKeys(opts.Config.Universal.Remove), Handler: self.withItem(self.remove), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Remove, @@ -130,10 +131,56 @@ func (self *WorktreesController) remove(worktree *models.Worktree) error { return errors.New(self.c.Tr.CantDeleteCurrentWorktree) } - return self.c.Helpers().Worktree.Remove(worktree, false) + removeWorktreeItem := &types.MenuItem{ + Label: self.c.Tr.RemoveWorktree, + Keys: menuKey('w'), + OnPress: func() error { + return self.c.Helpers().Worktree.Remove(worktree, nil) + }, + } + + branch, branchFound := lo.Find(self.c.Model().Branches, func(branch *models.Branch) bool { + return branch.Name == worktree.Branch + }) + // A worktree with a detached HEAD has no branch to delete + detachedReason := &types.DisabledReason{Text: self.c.Tr.WorktreeNotCheckedOutOnBranch} + + removeWorktreeAndBranchItem := &types.MenuItem{ + Label: self.c.Tr.RemoveWorktreeAndDeleteBranch, + Keys: menuKey('b'), + OnPress: func() error { + return self.c.Helpers().BranchesHelper.RemoveWorktreeAndDeleteBranch(worktree, branch) + }, + } + if !branchFound { + removeWorktreeAndBranchItem.DisabledReason = detachedReason + } + + removeWorktreeAndBothBranchesItem := &types.MenuItem{ + Label: self.c.Tr.RemoveWorktreeAndDeleteBothBranches, + Keys: menuKey('r'), + OnPress: func() error { + return self.c.Helpers().BranchesHelper.RemoveWorktreeAndDeleteBothBranches(worktree, branch) + }, + } + if !branchFound { + removeWorktreeAndBothBranchesItem.DisabledReason = detachedReason + } else if !branch.IsTrackingRemote() || branch.UpstreamGone { + removeWorktreeAndBothBranchesItem.DisabledReason = &types.DisabledReason{ + Text: self.c.Tr.UpstreamNotSetError, + } + } + + return self.c.Menu(types.CreateMenuOptions{ + Title: utils.ResolvePlaceholderString( + self.c.Tr.RemoveWorktreeMenuTitle, + map[string]string{"worktreeName": worktree.Name}, + ), + Items: []*types.MenuItem{removeWorktreeItem, removeWorktreeAndBranchItem, removeWorktreeAndBothBranchesItem}, + }) } -func (self *WorktreesController) GetOnClick() func() error { +func (self *WorktreesController) GetOnDoubleClick() func() error { return self.withItemGraceful(self.enter) } diff --git a/pkg/gui/editors.go b/pkg/gui/editors.go index 157f06495..7c658265b 100644 --- a/pkg/gui/editors.go +++ b/pkg/gui/editors.go @@ -1,44 +1,47 @@ package gui import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" ) -func (gui *Gui) handleEditorKeypress(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier, allowMultiline bool) bool { - if key == gocui.KeyEnter && allowMultiline { +func (gui *Gui) handleEditorKeypress(v *gocui.View, key gocui.Key, allowMultiline bool) bool { + if key.Equals(gocui.NewKeyName(gocui.KeyEnter)) && allowMultiline { v.TextArea.TypeCharacter("\n") v.RenderTextArea() return true } - return gocui.DefaultEditor.Edit(v, key, ch, mod) + return gocui.DefaultEditor.Edit(v, key) } // we've just copy+pasted the editor from gocui to here so that we can also re- // render the commit message length on each keypress -func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool { - matched := gui.handleEditorKeypress(v, key, ch, mod, false) +func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key) bool { + matched := gui.handleEditorKeypress(v, key, false) v.RenderTextArea() gui.c.Contexts().CommitMessage.RenderSubtitle() return matched } -func (gui *Gui) commitDescriptionEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool { - matched := gui.handleEditorKeypress(v, key, ch, mod, true) +func (gui *Gui) commitDescriptionEditor(v *gocui.View, key gocui.Key) bool { + matched := gui.handleEditorKeypress(v, key, true) v.RenderTextArea() return matched } -func (gui *Gui) promptEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool { - matched := gui.handleEditorKeypress(v, key, ch, mod, false) +func (gui *Gui) promptEditor(v *gocui.View, key gocui.Key) bool { + matched := gui.handleEditorKeypress(v, key, false) v.RenderTextArea() suggestionsContext := gui.State.Contexts.Suggestions - if suggestionsContext.State.FindSuggestions != nil { + // Capture the suggestions function and the input here, on the UI thread; the + // main thread rewrites State.FindSuggestions when it (re)creates a prompt + // panel, so reading it from the worker below would race that write. + if findSuggestions := suggestionsContext.State.FindSuggestions; findSuggestions != nil { input := v.TextArea.GetContent() suggestionsContext.State.AsyncHandler.Do(func() func() { - suggestions := suggestionsContext.State.FindSuggestions(input) + suggestions := findSuggestions(input) return func() { suggestionsContext.SetSuggestions(suggestions) } }) } @@ -46,8 +49,34 @@ func (gui *Gui) promptEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Mo return matched } -func (gui *Gui) searchEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool { - matched := gui.handleEditorKeypress(v, key, ch, mod, false) +func (gui *Gui) menuFilterEditor(v *gocui.View, key gocui.Key) bool { + contentBefore := v.TextArea.GetContent() + + matched := gui.handleEditorKeypress(v, key, false) + if !matched { + // Give the global keybindings a chance at the key, e.g. so that ctrl-c + // still quits while a menu is open. + return false + } + + v.RenderTextArea() + + content := v.TextArea.GetContent() + if content == contentBefore { + // The key just moved the cursor around within the filter; refiltering would + // throw away the menu's selection for nothing. + return true + } + + menuContext := gui.State.Contexts.Menu + menuContext.SetFilterStarted(true) + gui.helpers.Search.ApplyFilter(menuContext, content) + + return true +} + +func (gui *Gui) searchEditor(v *gocui.View, key gocui.Key) bool { + matched := gui.handleEditorKeypress(v, key, false) v.RenderTextArea() searchString := v.TextArea.GetContent() diff --git a/pkg/gui/extras_panel.go b/pkg/gui/extras_panel.go index 5efd1eb51..980c31d45 100644 --- a/pkg/gui/extras_panel.go +++ b/pkg/gui/extras_panel.go @@ -3,6 +3,7 @@ package gui import ( "io" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -14,7 +15,7 @@ func (gui *Gui) handleCreateExtrasMenuPanel() error { Items: []*types.MenuItem{ { Label: gui.c.Tr.ToggleShowCommandLog, - Key: 't', + Keys: []gocui.Key{gocui.NewKeyRune('t')}, OnPress: func() error { currentContext := gui.c.Context().CurrentStatic() if gui.c.State().GetShowExtrasWindow() && currentContext.GetKey() == context.COMMAND_LOG_CONTEXT_KEY { @@ -29,7 +30,7 @@ func (gui *Gui) handleCreateExtrasMenuPanel() error { }, { Label: gui.c.Tr.FocusCommandLog, - Key: 'f', + Keys: []gocui.Key{gocui.NewKeyRune('f')}, OnPress: gui.handleFocusCommandLog, }, }, diff --git a/pkg/gui/filetree/build_tree.go b/pkg/gui/filetree/build_tree.go index 91e6d1986..b4091bec9 100644 --- a/pkg/gui/filetree/build_tree.go +++ b/pkg/gui/filetree/build_tree.go @@ -7,7 +7,11 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/models" ) -func BuildTreeFromFiles(files []*models.File, showRootItem bool) *Node[models.File] { +func BuildTreeFromFiles( + files []*models.File, + showRootItem bool, + cmp func(a, b *Node[models.File]) int, +) *Node[models.File] { root := &Node[models.File]{} childrenMapsByNode := make(map[*Node[models.File]]map[string]*Node[models.File]) @@ -57,20 +61,28 @@ func BuildTreeFromFiles(files []*models.File, showRootItem bool) *Node[models.Fi } } - root.Sort() + root.Sort(cmp) root.Compress() return root } -func BuildFlatTreeFromCommitFiles(files []*models.CommitFile, showRootItem bool) *Node[models.CommitFile] { - rootAux := BuildTreeFromCommitFiles(files, showRootItem) +func BuildFlatTreeFromCommitFiles( + files []*models.CommitFile, + showRootItem bool, + cmp func(a, b *Node[models.CommitFile]) int, +) *Node[models.CommitFile] { + rootAux := BuildTreeFromCommitFiles(files, showRootItem, cmp) sortedFiles := rootAux.GetLeaves() return &Node[models.CommitFile]{Children: sortedFiles} } -func BuildTreeFromCommitFiles(files []*models.CommitFile, showRootItem bool) *Node[models.CommitFile] { +func BuildTreeFromCommitFiles( + files []*models.CommitFile, + showRootItem bool, + cmp func(a, b *Node[models.CommitFile]) int, +) *Node[models.CommitFile] { root := &Node[models.CommitFile]{} var curr *Node[models.CommitFile] @@ -109,14 +121,18 @@ func BuildTreeFromCommitFiles(files []*models.CommitFile, showRootItem bool) *No } } - root.Sort() + root.Sort(cmp) root.Compress() return root } -func BuildFlatTreeFromFiles(files []*models.File, showRootItem bool) *Node[models.File] { - rootAux := BuildTreeFromFiles(files, showRootItem) +func BuildFlatTreeFromFiles( + files []*models.File, + showRootItem bool, + cmp func(a, b *Node[models.File]) int, +) *Node[models.File] { + rootAux := BuildTreeFromFiles(files, showRootItem, cmp) sortedFiles := rootAux.GetLeaves() // from top down we have merge conflict files, then tracked file, then untracked diff --git a/pkg/gui/filetree/build_tree_test.go b/pkg/gui/filetree/build_tree_test.go index c3077783b..e8d9d21d3 100644 --- a/pkg/gui/filetree/build_tree_test.go +++ b/pkg/gui/filetree/build_tree_test.go @@ -237,7 +237,7 @@ func TestBuildTreeFromFiles(t *testing.T) { for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - result := BuildTreeFromFiles(s.files, s.showRootItem) + result := BuildTreeFromFiles(s.files, s.showRootItem, NodeSortComparator[models.File]("mixed", false)) assert.EqualValues(t, s.expected, result) }) } @@ -454,7 +454,7 @@ func TestBuildFlatTreeFromFiles(t *testing.T) { for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - result := BuildFlatTreeFromFiles(s.files, s.showRootItem) + result := BuildFlatTreeFromFiles(s.files, s.showRootItem, NodeSortComparator[models.File]("mixed", false)) assert.EqualValues(t, s.expected, result) }) } @@ -650,7 +650,7 @@ func TestBuildTreeFromCommitFiles(t *testing.T) { for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - result := BuildTreeFromCommitFiles(s.files, s.showRootItem) + result := BuildTreeFromCommitFiles(s.files, s.showRootItem, NodeSortComparator[models.CommitFile]("mixed", false)) assert.EqualValues(t, s.expected, result) }) } @@ -781,7 +781,7 @@ func TestBuildFlatTreeFromCommitFiles(t *testing.T) { for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - result := BuildFlatTreeFromCommitFiles(s.files, s.showRootItem) + result := BuildFlatTreeFromCommitFiles(s.files, s.showRootItem, NodeSortComparator[models.CommitFile]("mixed", false)) assert.EqualValues(t, s.expected, result) }) } diff --git a/pkg/gui/filetree/commit_file_tree.go b/pkg/gui/filetree/commit_file_tree.go index bf6d1251c..81a196c83 100644 --- a/pkg/gui/filetree/commit_file_tree.go +++ b/pkg/gui/filetree/commit_file_tree.go @@ -107,11 +107,13 @@ func (self *CommitFileTree) getFilesForDisplay() []*models.CommitFile { func (self *CommitFileTree) SetTree() { filesForDisplay := self.getFilesForDisplay() - showRootItem := self.common.UserConfig().Gui.ShowRootItemInFileTree + guiConfig := self.common.UserConfig().Gui + showRootItem := guiConfig.ShowRootItemInFileTree + cmp := NodeSortComparator[models.CommitFile](guiConfig.FileTreeSortOrder, guiConfig.FileTreeSortCaseSensitive) if self.showTree { - self.tree = BuildTreeFromCommitFiles(filesForDisplay, showRootItem) + self.tree = BuildTreeFromCommitFiles(filesForDisplay, showRootItem, cmp) } else { - self.tree = BuildFlatTreeFromCommitFiles(filesForDisplay, showRootItem) + self.tree = BuildFlatTreeFromCommitFiles(filesForDisplay, showRootItem, cmp) } } @@ -151,6 +153,10 @@ func (self *CommitFileTree) GetFile(path string) *models.CommitFile { return nil } +func (self *CommitFileTree) GetVisualDepth(index int) int { + return self.tree.GetVisualDepthAtIndex(index+1, self.collapsedPaths) // +1 to skip root +} + func (self *CommitFileTree) InTreeMode() bool { return self.showTree } diff --git a/pkg/gui/filetree/commit_file_tree_view_model.go b/pkg/gui/filetree/commit_file_tree_view_model.go index c2e7e74e4..a59bcb01a 100644 --- a/pkg/gui/filetree/commit_file_tree_view_model.go +++ b/pkg/gui/filetree/commit_file_tree_view_model.go @@ -2,13 +2,11 @@ package filetree import ( "strings" - "sync" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/gui/context/traits" "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -26,7 +24,6 @@ type ICommitFileTreeViewModel interface { } type CommitFileTreeViewModel struct { - sync.RWMutex types.IListCursor ICommitFileTree @@ -144,6 +141,22 @@ func (self *CommitFileTreeViewModel) GetSelectedPath() string { return node.GetPath() } +// SetTree rebuilds the tree and clamps the selection so it stays in range. The +// embedded tree's SetTree only rebuilds the node list and doesn't touch the +// cursor, so after a shrinking rebuild (e.g. moving a patch out into the index) +// the selection index could be left past the end of the tree; GetSelectedItems +// would then return a nil node and crash callers such as canEditFiles when the +// options map is rendered during layout. +// +// Unlike FileTreeViewModel.SetTree we don't re-find the selected node by path +// afterwards: that walk lands on the containing directory when a file is removed +// from a dir that then collapses, whereas keeping the (clamped) index lands on +// the sibling file, which is what we want here. +func (self *CommitFileTreeViewModel) SetTree() { + self.ICommitFileTree.SetTree() + self.ClampSelection() +} + // duplicated from file_tree_view_model.go. Generics will help here func (self *CommitFileTreeViewModel) ToggleShowTree() { selectedNode := self.GetSelected() @@ -249,10 +262,6 @@ func (self *CommitFileTreeViewModel) IsFiltering() bool { // used for type switch func (self *CommitFileTreeViewModel) IsFilterableContext() {} -func (self *CommitFileTreeViewModel) FilterPrefix(tr *i18n.TranslationSet) string { - return tr.FilterPrefix -} - func (self *CommitFileTreeViewModel) GetSearchHistory() *utils.HistoryBuffer[string] { return self.searchHistory } diff --git a/pkg/gui/filetree/commit_file_tree_view_model_test.go b/pkg/gui/filetree/commit_file_tree_view_model_test.go new file mode 100644 index 000000000..c8862f6f9 --- /dev/null +++ b/pkg/gui/filetree/commit_file_tree_view_model_test.go @@ -0,0 +1,40 @@ +package filetree + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/common" + "github.com/stretchr/testify/assert" +) + +// When the tree shrinks under the selection - e.g. moving a patch out into the +// index removes a file - SetTree must keep the selection in range. Otherwise +// GetSelectedItems returns a nil node, which crashes callers such as +// canEditFiles when the options map is rendered during layout. +func TestCommitFileTreeViewModelSetTreeClampsSelectionOnShrink(t *testing.T) { + files := []*models.CommitFile{ + {Path: "file1"}, + {Path: "file2"}, + {Path: "file3"}, + } + viewModel := NewCommitFileTreeViewModel( + func() []*models.CommitFile { return files }, + common.NewDummyCommon(), + false, // flat list + ) + viewModel.SetTree() + viewModel.SetSelectedLineIdx(viewModel.Len() - 1) + + // The file under the cursor goes away and the tree shrinks. + files = []*models.CommitFile{{Path: "file1"}} + viewModel.SetTree() + + assert.Less(t, viewModel.GetSelectedLineIdx(), viewModel.Len()) + assert.NotNil(t, viewModel.GetSelected()) + items, _, _ := viewModel.GetSelectedItems() + assert.NotEmpty(t, items) + for _, item := range items { + assert.NotNil(t, item) + } +} diff --git a/pkg/gui/filetree/file_node.go b/pkg/gui/filetree/file_node.go index 0836eaf02..04c98f1fa 100644 --- a/pkg/gui/filetree/file_node.go +++ b/pkg/gui/filetree/file_node.go @@ -51,7 +51,7 @@ func (self *FileNode) GetHasInlineMergeConflicts() bool { if !file.HasInlineMergeConflicts { return false } - hasConflicts, _ := mergeconflicts.FileHasConflictMarkers(file.Path) + hasConflicts, _ := mergeconflicts.FileHasConflictMarkers(file.Path, file.ConflictMarkerSize) return hasConflicts }) } diff --git a/pkg/gui/filetree/file_tree.go b/pkg/gui/filetree/file_tree.go index 9840fd8dd..6c8eff72e 100644 --- a/pkg/gui/filetree/file_tree.go +++ b/pkg/gui/filetree/file_tree.go @@ -3,6 +3,7 @@ package filetree import ( "fmt" + "github.com/jesseduffield/generics/set" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -34,6 +35,7 @@ type ITree[T any] interface { CollapsedPaths() *CollapsedPaths CollapseAll() ExpandAll() + GetVisualDepth(index int) int } type IFileTree interface { @@ -41,6 +43,7 @@ type IFileTree interface { FilterFiles(test func(*models.File) bool) []*models.File SetStatusFilter(filter FileTreeDisplayFilter) + RememberConflictedPaths(paths []string) ForceShowUntracked() bool Get(index int) *FileNode GetFile(path string) *models.File @@ -53,25 +56,31 @@ type IFileTree interface { } type FileTree struct { - getFiles func() []*models.File - tree *Node[models.File] - showTree bool - common *common.Common - filter FileTreeDisplayFilter - collapsedPaths *CollapsedPaths - textFilter string - useFuzzySearch bool + getFiles func() []*models.File + tree *Node[models.File] + showTree bool + common *common.Common + filter FileTreeDisplayFilter + // Paths of the files that had conflicts while the current filter has been + // active. The DisplayConflicted filter keeps showing them after their + // conflicts have been resolved, so that their diffs can be reviewed while + // the remaining files are still being worked on. + conflictedPaths *set.Set[string] + collapsedPaths *CollapsedPaths + textFilter string + useFuzzySearch bool } var _ IFileTree = &FileTree{} func NewFileTree(getFiles func() []*models.File, common *common.Common, showTree bool) *FileTree { return &FileTree{ - getFiles: getFiles, - common: common, - showTree: showTree, - filter: DisplayAll, - collapsedPaths: NewCollapsedPaths(), + getFiles: getFiles, + common: common, + showTree: showTree, + filter: DisplayAll, + conflictedPaths: set.New[string](), + collapsedPaths: NewCollapsedPaths(), } } @@ -99,7 +108,9 @@ func (self *FileTree) getFilesForDisplay() []*models.File { case DisplayUntracked: files = self.FilterFiles(func(file *models.File) bool { return !(file.Tracked || file.HasStagedChanges) }) case DisplayConflicted: - files = self.FilterFiles(func(file *models.File) bool { return file.HasMergeConflicts }) + files = self.FilterFiles(func(file *models.File) bool { + return file.HasMergeConflicts || self.conflictedPaths.Includes(file.Path) + }) default: panic(fmt.Sprintf("Unexpected files display filter: %d", self.filter)) } @@ -121,9 +132,16 @@ func (self *FileTree) FilterFiles(test func(*models.File) bool) []*models.File { func (self *FileTree) SetStatusFilter(filter FileTreeDisplayFilter) { self.filter = filter + self.conflictedPaths = set.New[string]() self.SetTree() } +// RememberConflictedPaths records which files have conflicts right now, so that +// the DisplayConflicted filter keeps showing them once they are resolved. +func (self *FileTree) RememberConflictedPaths(paths []string) { + self.conflictedPaths.Add(paths...) +} + func (self *FileTree) ToggleShowTree() { self.showTree = !self.showTree self.SetTree() @@ -179,11 +197,13 @@ func (self *FileTree) GetAllFiles() []*models.File { func (self *FileTree) SetTree() { filesForDisplay := self.getFilesForDisplay() - showRootItem := self.common.UserConfig().Gui.ShowRootItemInFileTree + guiConfig := self.common.UserConfig().Gui + showRootItem := guiConfig.ShowRootItemInFileTree + cmp := NodeSortComparator[models.File](guiConfig.FileTreeSortOrder, guiConfig.FileTreeSortCaseSensitive) if self.showTree { - self.tree = BuildTreeFromFiles(filesForDisplay, showRootItem) + self.tree = BuildTreeFromFiles(filesForDisplay, showRootItem, cmp) } else { - self.tree = BuildFlatTreeFromFiles(filesForDisplay, showRootItem) + self.tree = BuildFlatTreeFromFiles(filesForDisplay, showRootItem, cmp) } } @@ -221,6 +241,10 @@ func (self *FileTree) CollapsedPaths() *CollapsedPaths { return self.collapsedPaths } +func (self *FileTree) GetVisualDepth(index int) int { + return self.tree.GetVisualDepthAtIndex(index+1, self.collapsedPaths) // +1 to skip root +} + func (self *FileTree) GetStatusFilter() FileTreeDisplayFilter { return self.filter } diff --git a/pkg/gui/filetree/file_tree_test.go b/pkg/gui/filetree/file_tree_test.go index 4a593711c..3058e8db9 100644 --- a/pkg/gui/filetree/file_tree_test.go +++ b/pkg/gui/filetree/file_tree_test.go @@ -1,18 +1,23 @@ package filetree import ( + "fmt" "testing" + "github.com/jesseduffield/generics/set" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/common" + "github.com/jesseduffield/lazygit/pkg/config" "github.com/stretchr/testify/assert" ) func TestFilterAction(t *testing.T) { scenarios := []struct { - name string - filter FileTreeDisplayFilter - files []*models.File - expected []*models.File + name string + filter FileTreeDisplayFilter + conflictedPaths []string + files []*models.File + expected []*models.File }{ { name: "filter files with unstaged changes", @@ -81,13 +86,98 @@ func TestFilterAction(t *testing.T) { {Path: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, }, }, + { + name: "keep showing conflicted files whose conflicts have been resolved", + filter: DisplayConflicted, + conflictedPaths: []string{"dir2/dir2/file4", "file1"}, + files: []*models.File{ + {Path: "dir2/dir2/file4", ShortStatus: "M ", HasStagedChanges: true}, + {Path: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true}, + {Path: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, + }, + expected: []*models.File{ + {Path: "dir2/dir2/file4", ShortStatus: "M ", HasStagedChanges: true}, + {Path: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, + }, + }, } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - mngr := &FileTree{getFiles: func() []*models.File { return s.files }, filter: s.filter} + mngr := &FileTree{ + getFiles: func() []*models.File { return s.files }, + filter: s.filter, + conflictedPaths: set.NewFromSlice(s.conflictedPaths), + } result := mngr.getFilesForDisplay() assert.EqualValues(t, s.expected, result) }) } } + +func TestFileTreeSortOrderConfig(t *testing.T) { + // "Dir" (uppercase D), "b-file", and "Z-file" produce distinct orderings across all + // combinations of sort order and case sensitivity: + // ASCII order: D(68) < Z(90) < b(98) + // Case-insensitive order: b < d < z + files := []*models.File{ + {Path: "Dir/inner"}, + {Path: "b-file"}, + {Path: "Z-file"}, + } + + scenarios := []struct { + sortOrder string + caseSensitive bool + expected []string + }{ + { + sortOrder: "mixed", + caseSensitive: true, + expected: []string{"Dir", "Dir/inner", "Z-file", "b-file"}, + }, + { + sortOrder: "mixed", + caseSensitive: false, + expected: []string{"b-file", "Dir", "Dir/inner", "Z-file"}, + }, + { + sortOrder: "filesFirst", + caseSensitive: true, + expected: []string{"Z-file", "b-file", "Dir", "Dir/inner"}, + }, + { + sortOrder: "filesFirst", + caseSensitive: false, + expected: []string{"b-file", "Z-file", "Dir", "Dir/inner"}, + }, + { + sortOrder: "foldersFirst", + caseSensitive: true, + expected: []string{"Dir", "Dir/inner", "Z-file", "b-file"}, + }, + { + sortOrder: "foldersFirst", + caseSensitive: false, + expected: []string{"Dir", "Dir/inner", "b-file", "Z-file"}, + }, + } + + for _, s := range scenarios { + t.Run(s.sortOrder+"/caseSensitive="+fmt.Sprintf("%v", s.caseSensitive), func(t *testing.T) { + userConfig := config.GetDefaultConfig() + userConfig.Gui.ShowRootItemInFileTree = false + userConfig.Gui.FileTreeSortOrder = s.sortOrder + userConfig.Gui.FileTreeSortCaseSensitive = s.caseSensitive + cmn := common.NewDummyCommonWithUserConfigAndAppState(userConfig, nil) + tree := NewFileTree(func() []*models.File { return files }, cmn, true) + tree.SetTree() + + paths := make([]string, tree.Len()) + for i := range tree.Len() { + paths[i] = tree.Get(i).GetPath() + } + assert.Equal(t, s.expected, paths) + }) + } +} diff --git a/pkg/gui/filetree/file_tree_view_model.go b/pkg/gui/filetree/file_tree_view_model.go index 741550c19..68829b444 100644 --- a/pkg/gui/filetree/file_tree_view_model.go +++ b/pkg/gui/filetree/file_tree_view_model.go @@ -2,13 +2,11 @@ package filetree import ( "strings" - "sync" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/gui/context/traits" "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -22,7 +20,6 @@ type IFileTreeViewModel interface { // which item is selected. It also contains logic for repositioning that cursor // after the files are refreshed type FileTreeViewModel struct { - sync.RWMutex types.IListCursor IFileTree searchHistory *utils.HistoryBuffer[string] @@ -169,6 +166,31 @@ func (self *FileTreeViewModel) SetStatusFilter(filter FileTreeDisplayFilter) { self.IListCursor.SetSelection(0) } +func (self *FileTreeViewModel) SetStatusFilterPreservingSelection(filter FileTreeDisplayFilter) { + self.preserveSelection(func() { + self.SetStatusFilter(filter) + }) +} + +func (self *FileTreeViewModel) preserveSelection(f func()) { + selectedNode := self.GetSelected() + var selectedPath string + if selectedNode != nil { + selectedPath = selectedNode.GetInternalPath() + } + + f() + + if selectedPath != "" { + self.ExpandToPath(selectedPath) + if idx, found := self.GetIndexForPath(selectedPath); found { + self.SetSelection(idx) + return + } + } + self.ClampSelection() +} + // If we're going from flat to tree we want to select the same file. // If we're going from tree to flat and we have a file selected we want to select that. // If instead we've selected a directory we need to select the first file in that directory. @@ -235,22 +257,9 @@ func (self *FileTreeViewModel) GetFilter() string { } func (self *FileTreeViewModel) ClearFilter() { - selectedNode := self.GetSelected() - var selectedPath string - if selectedNode != nil { - selectedPath = selectedNode.GetInternalPath() - } - - self.IFileTree.SetTextFilter("", false) - - if selectedPath != "" { - self.ExpandToPath(selectedPath) - if idx, found := self.GetIndexForPath(selectedPath); found { - self.SetSelection(idx) - return - } - } - self.ClampSelection() + self.preserveSelection(func() { + self.IFileTree.SetTextFilter("", false) + }) } func (self *FileTreeViewModel) ReApplyFilter(useFuzzySearch bool) { @@ -264,10 +273,6 @@ func (self *FileTreeViewModel) IsFiltering() bool { // used for type switch func (self *FileTreeViewModel) IsFilterableContext() {} -func (self *FileTreeViewModel) FilterPrefix(tr *i18n.TranslationSet) string { - return tr.FilterPrefix -} - func (self *FileTreeViewModel) GetSearchHistory() *utils.HistoryBuffer[string] { return self.searchHistory } diff --git a/pkg/gui/filetree/file_tree_view_model_test.go b/pkg/gui/filetree/file_tree_view_model_test.go new file mode 100644 index 000000000..c14c91ea8 --- /dev/null +++ b/pkg/gui/filetree/file_tree_view_model_test.go @@ -0,0 +1,32 @@ +package filetree + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/common" + "github.com/stretchr/testify/assert" +) + +func TestSetStatusFilterPreservingSelection(t *testing.T) { + files := []*models.File{ + {Path: "file1"}, + {Path: "file2", HasMergeConflicts: true}, + {Path: "file3", HasMergeConflicts: true}, + } + viewModel := NewFileTreeViewModel( + func() []*models.File { return files }, + common.NewDummyCommon(), + false, + ) + viewModel.SetTree() + viewModel.SetStatusFilter(DisplayConflicted) + viewModel.SetSelection(viewModel.Len() - 2) + viewModel.ToggleStickyRange() + viewModel.MoveSelectedLine(1) + + viewModel.SetStatusFilterPreservingSelection(DisplayAll) + + assert.Equal(t, "file3", viewModel.GetSelectedPath()) + assert.False(t, viewModel.IsSelectingRange()) +} diff --git a/pkg/gui/filetree/node.go b/pkg/gui/filetree/node.go index 97d5232b5..143cdeeff 100644 --- a/pkg/gui/filetree/node.go +++ b/pkg/gui/filetree/node.go @@ -63,11 +63,52 @@ func (self *Node[T]) GetInternalPath() string { return self.path } -func (self *Node[T]) Sort() { - self.SortChildren() +func (self *Node[T]) Sort(cmp func(a, b *Node[T]) int) { + self.SortChildren(cmp) for _, child := range self.Children { - child.Sort() + child.Sort(cmp) + } +} + +// NodeSortComparator returns a comparator function for sorting tree nodes +// based on the given sort order and case sensitivity. +// sortOrder must be one of: "mixed", "filesFirst", "foldersFirst". +func NodeSortComparator[T any](sortOrder string, caseSensitive bool) func(a, b *Node[T]) int { + strCmp := strings.Compare + if !caseSensitive { + strCmp = func(a, b string) int { + return strings.Compare(strings.ToLower(a), strings.ToLower(b)) + } + } + + // dirVsFileOrder is the return value when a is a directory and b is a file. + // -1 means directories come first, 1 means files come first. + dirVsFileOrder := 0 + switch sortOrder { + case "foldersFirst": + dirVsFileOrder = -1 + case "filesFirst": + dirVsFileOrder = 1 + } + + if dirVsFileOrder != 0 { + return func(a, b *Node[T]) int { + aIsDir := !a.IsFile() + bIsDir := !b.IsFile() + if aIsDir != bIsDir { + if aIsDir { + return dirVsFileOrder + } + return -dirVsFileOrder + } + return strCmp(a.path, b.path) + } + } + + // "mixed": sort by path only + return func(a, b *Node[T]) int { + return strCmp(a.path, b.path) } } @@ -87,23 +128,14 @@ func (self *Node[T]) ForEachFile(cb func(*T) error) error { return nil } -func (self *Node[T]) SortChildren() { +func (self *Node[T]) SortChildren(cmp func(a, b *Node[T]) int) { if self.IsFile() { return } children := slices.Clone(self.Children) - slices.SortFunc(children, func(a, b *Node[T]) int { - if !a.IsFile() && b.IsFile() { - return -1 - } - if a.IsFile() && !b.IsFile() { - return 1 - } - - return strings.Compare(a.path, b.path) - }) + slices.SortFunc(children, cmp) // TODO: think about making this in-place self.Children = children @@ -202,29 +234,43 @@ func (self *Node[T]) GetNodeAtIndex(index int, collapsedPaths *CollapsedPaths) * return nil } - node, _ := self.getNodeAtIndexAux(index, collapsedPaths) + node, _, _ := self.getNodeAtIndexAux(index, collapsedPaths, -1) return node } -func (self *Node[T]) getNodeAtIndexAux(index int, collapsedPaths *CollapsedPaths) (*Node[T], int) { +// GetVisualDepthAtIndex returns the visual depth (indentation level) of the +// node at the given flat index. Visual depth differs from tree depth because +// compressed nodes (e.g. "a/b/") count as a single visual level. +// Returns -1 if the index is out of range. +func (self *Node[T]) GetVisualDepthAtIndex(index int, collapsedPaths *CollapsedPaths) int { + if self == nil { + return -1 + } + + _, _, depth := self.getNodeAtIndexAux(index, collapsedPaths, -1) + + return depth +} + +func (self *Node[T]) getNodeAtIndexAux(index int, collapsedPaths *CollapsedPaths, visualDepth int) (*Node[T], int, int) { offset := 1 if index == 0 { - return self, offset + return self, offset, visualDepth } if !collapsedPaths.IsCollapsed(self.path) { for _, child := range self.Children { - foundNode, offsetChange := child.getNodeAtIndexAux(index-offset, collapsedPaths) + foundNode, offsetChange, depth := child.getNodeAtIndexAux(index-offset, collapsedPaths, visualDepth+1) offset += offsetChange if foundNode != nil { - return foundNode, offset + return foundNode, offset, depth } } } - return nil, offset + return nil, offset, -1 } func (self *Node[T]) GetIndexForPath(path string, collapsedPaths *CollapsedPaths) (int, bool) { @@ -310,12 +356,8 @@ func (self *Node[T]) GetPathsMatching(predicate func(*Node[T]) bool) []string { } func (self *Node[T]) GetFilePathsMatching(predicate func(*T) bool) []string { - matchingFileNodes := lo.Filter(self.GetLeaves(), func(node *Node[T], _ int) bool { - return predicate(node.File) - }) - - return lo.Map(matchingFileNodes, func(node *Node[T], _ int) string { - return node.GetPath() + return lo.FilterMap(self.GetLeaves(), func(node *Node[T], _ int) (string, bool) { + return node.GetPath(), predicate(node.File) }) } diff --git a/pkg/gui/filetree/node_test.go b/pkg/gui/filetree/node_test.go new file mode 100644 index 000000000..66a62414e --- /dev/null +++ b/pkg/gui/filetree/node_test.go @@ -0,0 +1,134 @@ +package filetree + +import ( + "testing" + + "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/stretchr/testify/assert" +) + +func TestGetVisualDepthAtIndex(t *testing.T) { + scenarios := []struct { + name string + files []*models.File + showRootItem bool + collapsedPaths []string + expectedDepths []int // one per visible node, skipping root + }{ + { + name: "flat files with root item", + files: []*models.File{ + {Path: "a"}, + {Path: "b"}, + }, + showRootItem: true, + // Displayed as: + // index 0: ▼ / (depth 0, the "." root dir) + // index 1: a (depth 1) + // index 2: b (depth 1) + expectedDepths: []int{0, 1, 1}, + }, + { + name: "flat files without root item", + files: []*models.File{ + {Path: "a"}, + {Path: "b"}, + }, + showRootItem: false, + // Displayed as: + // index 0: a (depth 0) + // index 1: b (depth 0) + expectedDepths: []int{0, 0}, + }, + { + name: "nested directories with root item", + files: []*models.File{ + {Path: "dir/a"}, + {Path: "dir/b"}, + {Path: "c"}, + }, + showRootItem: true, + // Displayed as: + // index 0: ▼ / (depth 0) + // index 4: c (depth 1) + // index 1: ▼ dir (depth 1) + // index 2: a (depth 2) + // index 3: b (depth 2) + expectedDepths: []int{0, 1, 1, 2, 2}, + }, + { + name: "compressed paths with root item", + files: []*models.File{ + {Path: "dir1/dir3/a"}, + {Path: "dir2/dir4/b"}, + }, + showRootItem: true, + // Tree compresses dir1/dir3 and dir2/dir4 into single nodes. + // Displayed as: + // index 0: ▼ / (depth 0) + // index 1: ▼ dir1/dir3 (depth 1, compressed) + // index 2: a (depth 2) + // index 3: ▼ dir2/dir4 (depth 1, compressed) + // index 4: b (depth 2) + expectedDepths: []int{0, 1, 2, 1, 2}, + }, + { + name: "compressed paths without root item", + files: []*models.File{ + {Path: "dir1/dir3/a"}, + {Path: "dir2/dir4/b"}, + }, + showRootItem: false, + // Displayed as: + // index 0: ▼ dir1/dir3 (depth 0, compressed) + // index 1: a (depth 1) + // index 2: ▼ dir2/dir4 (depth 0, compressed) + // index 3: b (depth 1) + expectedDepths: []int{0, 1, 0, 1}, + }, + { + name: "collapsed directory hides children", + files: []*models.File{ + {Path: "dir/a"}, + {Path: "dir/b"}, + {Path: "c"}, + }, + showRootItem: true, + collapsedPaths: []string{"./dir"}, + // Displayed as: + // index 0: ▼ / (depth 0) + // index 1: ▶ dir (depth 1, collapsed) + // index 2: c (depth 1) + expectedDepths: []int{0, 1, 1}, + }, + { + name: "out of range returns -1", + files: []*models.File{ + {Path: "a"}, + }, + showRootItem: false, + expectedDepths: []int{0}, + }, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + tree := BuildTreeFromFiles(s.files, s.showRootItem, NodeSortComparator[models.File]("mixed", false)) + collapsedPaths := NewCollapsedPaths() + for _, p := range s.collapsedPaths { + collapsedPaths.Collapse(p) + } + + for i, expectedDepth := range s.expectedDepths { + // +1 to skip the invisible root node, matching what FileTree.GetVisualDepth does + actualDepth := tree.GetVisualDepthAtIndex(i+1, collapsedPaths) + assert.Equal(t, expectedDepth, actualDepth, + "index %d: expected depth %d, got %d", i, expectedDepth, actualDepth) + } + + // Verify out-of-range returns -1 + outOfRange := tree.GetVisualDepthAtIndex(len(s.expectedDepths)+1, collapsedPaths) + assert.Equal(t, -1, outOfRange, "out of range index should return -1") + }) + } +} diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go index 9b6551d33..a5e59a84e 100644 --- a/pkg/gui/global_handlers.go +++ b/pkg/gui/global_handlers.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -17,12 +17,8 @@ func (gui *Gui) scrollUpView(view *gocui.View) { } func (gui *Gui) scrollDownView(view *gocui.View) { - scrollHeight := gui.c.UserConfig().Gui.ScrollHeight - view.ScrollDown(scrollHeight) - - if manager := gui.getViewBufferManagerForView(view); manager != nil { - manager.ReadLines(scrollHeight) - } + view.ScrollDown(gui.c.UserConfig().Gui.ScrollHeight) + gui.readLinesToFillView(view) } func (gui *Gui) scrollUpMain() error { diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 34d388391..801fe14d3 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -12,9 +12,9 @@ import ( "sort" "strings" "sync" + "sync/atomic" "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazycore/pkg/boxlayout" appTypes "github.com/jesseduffield/lazygit/pkg/app/types" "github.com/jesseduffield/lazygit/pkg/commands" @@ -24,9 +24,9 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking" "github.com/jesseduffield/lazygit/pkg/gui/modes/diffing" "github.com/jesseduffield/lazygit/pkg/gui/modes/filtering" @@ -49,7 +49,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" "github.com/sasha-s/go-deadlock" - "gopkg.in/ozeidan/fuzzy-patricia.v3/patricia" ) const StartupPopupVersion = 5 @@ -70,7 +69,7 @@ type Gui struct { // this is the state of the GUI for the current repo State *GuiRepoState - pagerConfig *config.PagerConfig + diffRendererConfig *config.DiffRendererConfigManager CustomCommandsClient *custom_commands.Client @@ -86,7 +85,7 @@ type Gui struct { // holds a mapping of view names to ptmx's. This is for rendering command outputs // from within a pty. The point of keeping track of them is so that if we re-size // the window, we can tell the pty it needs to resize accordingly. - viewPtmxMap map[string]*os.File + viewPtmxMap map[string]oscommands.Pty stopChan chan struct{} // when lazygit is opened outside a git directory we want to open to the most @@ -95,9 +94,9 @@ type Gui struct { Mutexes types.Mutexes - // when you enter into a submodule we'll append the superproject's path to this array - // so that you can return to the superproject - RepoPathStack *utils.StringStack + // when you enter into a submodule we'll append the superproject's location to + // this array so that you can return to the superproject + RepoPathStack *utils.Stack[types.RepoLocation] // this tells us whether our views have been initially set up ViewsSetup bool @@ -112,7 +111,10 @@ type Gui struct { PopupHandler types.IPopupHandler - IsRefreshingFiles bool + // Bumped every time we switch to a different repository (in resetState). + // Used to drop refresh results that were computed for a repo we've since + // navigated away from. See RefreshHelper.onUIThreadUnlessRepoChanged. + repoGeneration atomic.Int32 // we use this to decide whether we'll return to the original directory that // lazygit was opened in, or if we'll retain the one we're currently in. @@ -156,7 +158,7 @@ type StateAccessor struct { var _ types.IStateAccessor = new(StateAccessor) -func (self *StateAccessor) GetRepoPathStack() *utils.StringStack { +func (self *StateAccessor) GetRepoPathStack() *utils.Stack[types.RepoLocation] { return self.gui.RepoPathStack } @@ -172,16 +174,12 @@ func (self *StateAccessor) GetRepoState() types.IRepoStateAccessor { return self.gui.State } -func (self *StateAccessor) GetPagerConfig() *config.PagerConfig { - return self.gui.pagerConfig +func (self *StateAccessor) GetRepoGeneration() int { + return int(self.gui.repoGeneration.Load()) } -func (self *StateAccessor) GetIsRefreshingFiles() bool { - return self.gui.IsRefreshingFiles -} - -func (self *StateAccessor) SetIsRefreshingFiles(value bool) { - self.gui.IsRefreshingFiles = value +func (self *StateAccessor) GetDiffRendererConfigManager() *config.DiffRendererConfigManager { + return self.gui.diffRendererConfig } func (self *StateAccessor) GetShowExtrasWindow() bool { @@ -235,8 +233,11 @@ type GuiRepoState struct { SplitMainPanel bool - SearchState *types.SearchState - StartupStage types.StartupStage // Allows us to not load everything at once + SearchState *types.SearchState + // Lets us not load everything at once. Written and read from refresh + // workers (the reflog/branches load transitions it INITIAL->COMPLETE), so + // it's atomic. Holds a types.StartupStage. + startupStage atomic.Int32 ContextMgr *ContextMgr Contexts *context.ContextTree @@ -256,6 +257,18 @@ type GuiRepoState struct { CurrentPopupOpts *types.CreatePopupPanelOpts LastBackgroundFetchTime time.Time + + // Whether the rebase/merge/cherry-pick/revert that's currently in progress + // was started from within lazygit (as opposed to being started externally, + // e.g. in another terminal or by a coding agent). We only auto-prompt to + // continue such an operation once its conflicts are resolved if we started + // it ourselves; for an externally started one, popping up unbidden would be + // confusing. Reset whenever we observe that no operation is in progress. + // + // Written from both the files refresh worker and the merge/rebase result + // path (which runs on a worker for the async callers), and read from the + // files refresh worker, so it's atomic. + mergeOrRebaseStartedInLazygit atomic.Bool } var _ types.IRepoStateAccessor = new(GuiRepoState) @@ -269,11 +282,11 @@ func (self *GuiRepoState) GetWindowViewNameMap() *utils.ThreadSafeMap[string, st } func (self *GuiRepoState) GetStartupStage() types.StartupStage { - return self.StartupStage + return types.StartupStage(self.startupStage.Load()) } func (self *GuiRepoState) SetStartupStage(value types.StartupStage) { - self.StartupStage = value + self.startupStage.Store(int32(value)) } func (self *GuiRepoState) GetCurrentPopupOpts() *types.CreatePopupPanelOpts { @@ -284,6 +297,14 @@ func (self *GuiRepoState) SetCurrentPopupOpts(value *types.CreatePopupPanelOpts) self.CurrentPopupOpts = value } +func (self *GuiRepoState) GetMergeOrRebaseStartedInLazygit() bool { + return self.mergeOrRebaseStartedInLazygit.Load() +} + +func (self *GuiRepoState) SetMergeOrRebaseStartedInLazygit(value bool) { + self.mergeOrRebaseStartedInLazygit.Store(value) +} + func (self *GuiRepoState) GetScreenMode() types.ScreenMode { return self.ScreenMode } @@ -319,17 +340,20 @@ func (gui *Gui) onSwitchToNewRepo(startArgs appTypes.StartArgs, contextKey types } func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.ContextKey) error { - var err error - gui.git, err = commands.NewGitCommand( + // Don't assign to gui.git until we know we have one: this also runs when + // switching repos, and leaving the field nil would take down the repo we + // were in before, which is where the error puts us back. + git, err := commands.NewGitCommand( gui.Common, gui.gitVersion, gui.os, git_config.NewStdCachedGitConfig(gui.Log), - gui.pagerConfig, + gui.diffRendererConfig, ) if err != nil { return err } + gui.git = git err = gui.Config.ReloadUserConfigForRepo(gui.getPerRepoConfigFiles()) if err != nil { @@ -344,10 +368,7 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context contextToPush := gui.resetState(startArgs) gui.resetHelpersAndControllers() - - if err := gui.resetKeybindings(); err != nil { - return err - } + gui.resetKeybindings() gui.g.SetFocusHandler(func(Focused bool) error { if Focused { @@ -358,9 +379,8 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context if didChange && reloadErr == nil { gui.c.Log.Info("User config changed - reloading") reloadErr = gui.onUserConfigLoaded() - if err := gui.resetKeybindings(); err != nil { - return err - } + gui.reloadSidePanels() + gui.resetKeybindings() if err := gui.checkForChangedConfigsThatDontAutoReload(oldConfig, gui.Config.GetUserConfig()); err != nil { return err @@ -368,7 +388,7 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context } gui.c.Log.Info("Receiving focus - refreshing") - gui.helpers.Refresh.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + gui.helpers.Refresh.Refresh(types.RefreshOptions{DontBlockRepoSwitch: true}) return reloadErr } @@ -398,6 +418,28 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context return nil }) + gui.g.SetUpdateQueueHighWaterMarkHandler(func(depth int) { + gui.c.Log.Infof("User-event queue reached a new high-water mark: %d", depth) + }) + + gui.g.SetOnSelectSearchResultFunc(func(v *gocui.View, selectedLineIdx int) { + ctx, ok := gui.helpers.View.ContextForView(v.Name()) + if ok { + if searchableContext, ok := ctx.(types.ISearchableContext); ok { + searchableContext.OnSearchSelect(selectedLineIdx) + } + } + }) + + gui.g.SetRenderSearchStatusFunc(func(v *gocui.View, index int, total int) { + ctx, ok := gui.helpers.View.ContextForView(v.Name()) + if ok { + if searchableContext, ok := ctx.(types.ISearchableContext); ok { + searchableContext.RenderSearchStatus(index, total) + } + } + }) + // if a context key has been given, push that instead, and set its index to 0 if contextKey != context.NO_CONTEXT { contextToPush = gui.c.ContextForKey(contextKey) @@ -411,6 +453,8 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context gui.c.Context().Push(contextToPush, types.OnFocusOpts{}) + gui.render() + return nil } @@ -453,9 +497,16 @@ func (gui *Gui) onUserConfigLoaded() error { gui.setColorScheme() gui.configureViewProperties() - gui.g.SearchEscapeKey = keybindings.GetKey(userConfig.Keybinding.Universal.Return) - gui.g.NextSearchMatchKey = keybindings.GetKey(userConfig.Keybinding.Universal.NextMatch) - gui.g.PrevSearchMatchKey = keybindings.GetKey(userConfig.Keybinding.Universal.PrevMatch) + gui.g.SearchEscapeKeys = config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.Return) + gui.g.NextSearchMatchKeys = config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.NextMatch) + gui.g.PrevSearchMatchKeys = config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.PrevMatch) + + gui.g.SetEditKeybindings( + config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.MoveWordLeft), + config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.MoveWordRight), + config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.BackspaceWord), + config.GetValidatedKeyBindingKeys(userConfig.Keybinding.Universal.ForwardDeleteWord), + ) gui.g.ShowListFooter = userConfig.Gui.ShowListFooter @@ -471,6 +522,8 @@ func (gui *Gui) onUserConfigLoaded() error { icons.SetNerdFontsVersion(userConfig.Gui.NerdFontsVersion) } else if userConfig.Gui.ShowIcons { icons.SetNerdFontsVersion("2") + } else { + icons.SetNerdFontsVersion("") } if len(userConfig.Gui.BranchColorPatterns) > 0 { @@ -487,8 +540,10 @@ func (gui *Gui) checkForChangedConfigsThatDontAutoReload(oldConfig *config.UserC configsThatDontAutoReload := []string{ "Git.AutoFetch", "Git.AutoRefresh", + "Git.AutoDetectExternalChanges", "Refresher.RefreshInterval", "Refresher.FetchInterval", + "Refresher.ExternalChangeCheckInterval", "Update.Method", "Update.Days", } @@ -538,12 +593,10 @@ func (gui *Gui) checkForChangedConfigsThatDontAutoReload(oldConfig *config.UserC // resetState reuses the repo state from our repo state map, if the repo was // open before; otherwise it creates a new one. func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context { - // Un-highlight the current view if there is one. The reason we do this is - // that the repo we are switching to might have a different view focused, - // and would then show an inactive highlight for the previous view. - if oldCurrentView := gui.g.CurrentView(); oldCurrentView != nil { - oldCurrentView.Highlight = false - } + // Bump the repo generation so that any refresh still in flight for the + // previous repo drops its model update instead of applying it here (see + // RefreshHelper.onUIThreadUnlessRepoChanged). + gui.repoGeneration.Add(1) worktreePath := gui.git.RepoPaths.WorktreePath() @@ -551,14 +604,13 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context { gui.State = state gui.State.ViewsSetup = false - contextTree := gui.State.Contexts - gui.State.WindowViewNameMap = initialWindowViewNameMap(contextTree) + // The repo we're switching to may have a per-repo config with a different + // side panel layout, so re-apply it to this repo's contexts. + gui.applySidePanelConfig() // setting this to nil so we don't get stuck based on a popup that was // previously opened - gui.Mutexes.PopupMutex.Lock() gui.State.CurrentPopupOpts = nil - gui.Mutexes.PopupMutex.Unlock() return gui.c.Context().Current() } @@ -577,10 +629,11 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context { FilteredReflogCommits: make([]*models.Commit, 0), ReflogCommits: make([]*models.Commit, 0), BisectInfo: git_commands.NewNullBisectInfo(), - FilesTrie: patricia.NewTrie(), Authors: map[string]*models.Author{}, MainBranches: git_commands.NewMainBranches(gui.c.Common, gui.os.Cmd), HashPool: &utils.StringPool{}, + PullRequests: gui.loadCachedPullRequests(), + PullRequestsMap: make(map[string]*models.GithubPullRequest), }, Modes: &types.Modes{ Filtering: filtering.New(startArgs.FilterPath, ""), @@ -590,17 +643,40 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context { }, ScreenMode: initialScreenMode, // TODO: only use contexts from context manager - ContextMgr: NewContextMgr(gui, contextTree), - Contexts: contextTree, - WindowViewNameMap: initialWindowViewNameMap(contextTree), - SearchState: types.NewSearchState(), + ContextMgr: NewContextMgr(gui, contextTree), + Contexts: contextTree, + SearchState: types.NewSearchState(), } gui.RepoStateMap[Repo(worktreePath)] = gui.State + gui.applySidePanelConfig() + return initialContext(contextTree, startArgs) } +func (gui *Gui) loadCachedPullRequests() []*models.GithubPullRequest { + repoPath := gui.git.RepoPaths.RepoPath() + cachedPRs, err := gui.Config.GetCachedGithubPullRequests(repoPath) + if err != nil { + gui.Log.Warnf("error loading GitHub pull request cache: %v", err) + } + + return lo.Map(cachedPRs, func(cached config.CachedPullRequest, _ int) *models.GithubPullRequest { + return &models.GithubPullRequest{ + HeadRefName: cached.HeadRefName, + Number: cached.Number, + Title: cached.Title, + State: cached.State, + ChecksState: cached.ChecksState, + Url: cached.Url, + HeadRepositoryOwner: models.GithubRepositoryOwner{ + Login: cached.HeadRepositoryOwner, + }, + } + }) +} + func (gui *Gui) getViewBufferManagerForView(view *gocui.View) *tasks.ViewBufferManager { manager, ok := gui.viewBufferManagerMap[view.Name()] if !ok { @@ -610,13 +686,36 @@ func (gui *Gui) getViewBufferManagerForView(view *gocui.View) *tasks.ViewBufferM return manager } -func initialWindowViewNameMap(contextTree *context.ContextTree) *utils.ThreadSafeMap[string, string] { +// When scrolling a lazy-loaded view, we read enough lines to fill the viewport +// plus this many extra screenfuls, so that further scrolling has some runway +// and doesn't have to block on reading (and re-rendering) more lines on every +// wheel notch. +const scrollReadAheadScreenfuls = 3 + +// readLinesToFillView reads enough lines into the view's buffer to cover +// everything currently scrolled into view, plus a few screenfuls of read-ahead. +// Reading is idempotent (see ViewBufferManager.ReadLines), so if the buffer +// already extends far enough this does nothing. +func (gui *Gui) readLinesToFillView(view *gocui.View) { + if manager := gui.getViewBufferManagerForView(view); manager != nil { + viewportBottom := view.OriginY() + view.InnerHeight() + manager.ReadLines(viewportBottom + scrollReadAheadScreenfuls*view.InnerHeight()) + } +} + +func (gui *Gui) initialWindowViewNameMap(contextTree *context.ContextTree) *utils.ThreadSafeMap[string, string] { result := utils.NewThreadSafeMap[string, string]() for _, context := range contextTree.Flatten() { result.Set(context.GetWindowName(), context.GetViewName()) } + // A side panel's window shows its first configured tab by default, which is + // not necessarily the context that won the loop above. + for _, panel := range gui.c.UserConfig().Gui.SidePanels { + result.Set(panel[0], sidePanelViewNames[panel[0]]) + } + return result } @@ -686,9 +785,9 @@ func NewGui( Updater: updater, statusManager: status.NewStatusManager(), viewBufferManagerMap: map[string]*tasks.ViewBufferManager{}, - viewPtmxMap: map[string]*os.File{}, + viewPtmxMap: map[string]oscommands.Pty{}, showRecentRepos: showRecentRepos, - RepoPathStack: &utils.StringStack{}, + RepoPathStack: &utils.Stack[types.RepoLocation]{}, RepoStateMap: map[Repo]*GuiRepoState{}, GuiLog: []string{}, @@ -704,16 +803,28 @@ func NewGui( gui.PopupHandler = popup.NewPopupHandler( cmn, + // Raising a popup or menu pushes a context and mutates the popup views, + // and it can be triggered from a worker goroutine (e.g. a + // WithWaitingStatus handler that hits a merge conflict and asks the user + // how to proceed). Bounce the creation onto the UI thread so it can't + // race the layout/draw code. Doing it here, at the one point where these + // producers are injected, keeps every caller oblivious to the threading. func(ctx goContext.Context, opts types.CreatePopupPanelOpts) { - gui.helpers.Confirmation.CreatePopupPanel(ctx, opts) + gui.onUIThread(func() error { + gui.helpers.Confirmation.CreatePopupPanel(ctx, opts) + return nil + }) }, - func() error { gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}); return nil }, + func() error { gui.c.Refresh(types.RefreshOptions{}); return nil }, func() { gui.State.ContextMgr.Pop() }, func() types.Context { return gui.State.ContextMgr.Current() }, - gui.createMenu, + func(opts types.CreateMenuOptions) error { + gui.onUIThread(func() error { return gui.createMenu(opts) }) + return nil + }, func(message string, f func(gocui.Task) error) { gui.helpers.AppStatus.WithWaitingStatus(message, f) }, - func(message string, f func() error) error { - return gui.helpers.AppStatus.WithWaitingStatusSync(message, f) + func(opts types.WaitingStatusOpts, f func(gocui.Task) error) { + gui.helpers.AppStatus.WithWaitingStatusBlockingInput(opts, f) }, func(message string, kind types.ToastKind) { gui.helpers.AppStatus.Toast(message, kind) }, func() string { return gui.Views.Prompt.TextArea.GetContent() }, @@ -743,7 +854,7 @@ func NewGui( gui.BackgroundRoutineMgr = &BackgroundRoutineMgr{gui: gui} gui.stateAccessor = &StateAccessor{gui: gui} - gui.pagerConfig = config.NewPagerConfig(func() *config.UserConfig { return gui.UserConfig() }) + gui.diffRendererConfig = config.NewDiffRendererConfigManager(func() *config.UserConfig { return gui.UserConfig() }) return gui, nil } @@ -786,50 +897,39 @@ func (gui *Gui) initGocui(headless bool, test integrationTypes.IntegrationTest) } func (gui *Gui) viewTabMap() map[string][]context.TabView { - result := map[string][]context.TabView{ - "branches": { - { - Tab: gui.c.Tr.LocalBranchesTitle, - ViewName: "localBranches", - }, - { - Tab: gui.c.Tr.RemotesTitle, - ViewName: "remotes", - }, - { - Tab: gui.c.Tr.TagsTitle, - ViewName: "tags", - }, - }, - "commits": { - { - Tab: gui.c.Tr.CommitsTitle, - ViewName: "commits", - }, - { - Tab: gui.c.Tr.ReflogCommitsTitle, - ViewName: "reflogCommits", - }, - }, - "files": { - { - Tab: gui.c.Tr.FilesTitle, - ViewName: "files", - }, - context.TabView{ - Tab: gui.c.Tr.WorktreesTitle, - ViewName: "worktrees", - }, - { - Tab: gui.c.Tr.SubmodulesTitle, - ViewName: "submodules", - }, - }, + titles := gui.sidePanelTabTitles() + result := map[string][]context.TabView{} + for _, panel := range gui.c.UserConfig().Gui.SidePanels { + if len(panel) < 2 { + // A single-tab panel shows its view's own title, not a tab strip. + continue + } + result[panel[0]] = lo.Map(panel, func(name string, _ int) context.TabView { + return context.TabView{ + Tab: titles[name], + ViewName: sidePanelViewNames[name], + } + }) } return result } +// The views that each popup panel is made up of. A panel's views share the +// keyboard focus, so clicking from one of them to another stays within the +// panel. +var popupPanelViewGroups = [][]string{ + {"commitMessage", "commitDescription"}, + {"prompt", "suggestions"}, + {"menu", "menuFilterFrame", "menuFilter"}, +} + +func viewsBelongToSamePopupPanel(viewName string, otherViewName string) bool { + return lo.SomeBy(popupPanelViewGroups, func(group []string) bool { + return lo.Contains(group, viewName) && lo.Contains(group, otherViewName) + }) +} + // Run: setup the gui with keybindings and start the mainloop func (gui *Gui) Run(startArgs appTypes.StartArgs) error { g, err := gui.initGocui(Headless(), startArgs.IntegrationTest) @@ -842,18 +942,14 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error { g.ErrorHandler = gui.PopupHandler.ErrorHandler - gui.g.ShouldHandleMouseEvent = func(view *gocui.View, key gocui.Key) bool { + gui.g.ShouldHandleMouseEvent = func(view *gocui.View, key gocui.KeyName) bool { if gui.helpers.Confirmation.IsPopupPanelFocused() && gui.currentViewName() != view.Name() && !gocui.IsMouseScrollKey(key) { - // we ignore click events on views that aren't popup panels, when a popup panel is focused. - // Unless both the current view and the clicked-on view are either commit message or commit - // description, or a prompt and the suggestions view, because we want to allow switching - // between those two views by clicking. - isCommitMessageOrSuggestionsView := func(viewName string) bool { - return viewName == "commitMessage" || viewName == "commitDescription" || - viewName == "prompt" || viewName == "suggestions" - } - if !isCommitMessageOrSuggestionsView(gui.currentViewName()) || !isCommitMessageOrSuggestionsView(view.Name()) { + // we ignore click events on views that aren't popup panels, when a popup + // panel is focused. Unless the clicked-on view is part of the same popup + // panel as the current one, because we want to allow switching between the + // views of a panel by clicking. + if !viewsBelongToSamePopupPanel(gui.currentViewName(), view.Name()) { return false } } @@ -895,7 +991,12 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error { // setting here so we can use it in layout.go gui.integrationTest = startArgs.IntegrationTest - return gui.g.MainLoop() + err = gui.g.MainLoop() + if errors.Is(err, gocui.ErrQuit) { + // Give the focused context a chance to clean up before we tear down the app. + gui.c.Context().Current().HandleQuit() + } + return err } func (gui *Gui) RunAndHandleError(startArgs appTypes.StartArgs) error { @@ -906,6 +1007,12 @@ func (gui *Gui) RunAndHandleError(startArgs appTypes.StartArgs) error { manager.Close() } + // The pty teardowns spawned by the manager closes above run on + // background goroutines that won't get to finish before the + // process exits; reap their process trees synchronously instead + // so that they don't outlive lazygit. + oscommands.TerminateLivePtys() + close(gui.stopChan) if errors.Is(err, gocui.ErrQuit) { @@ -936,7 +1043,7 @@ func (gui *Gui) runSubprocessWithSuspenseAndRefresh(subprocess *oscommands.CmdOb return err } - gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + gui.c.Refresh(types.RefreshOptions{DontBlockRepoSwitch: true}) return nil } @@ -1008,12 +1115,31 @@ func (gui *Gui) runSubprocess(cmdObj *oscommands.CmdObj) error { return err } +var isFirstRefreshAfterStartup = true + func (gui *Gui) loadNewRepo() error { if err := gui.updateRecentRepoList(); err != nil { return err } - gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + // On startup we don't want to block input during the initial refresh (it + // should be possible to press, say, `4` to jump to the commits panel right + // after startup without a delay), and we also want panels to show their + // contents as soon as possible; it doesn't matter so much that it's not in + // sync, we go from empty to populated here. However, when switching repos + // it can be confusing that some panels that are slow to update still show + // the old repo's data while others already show the new one's data, so + // update the UI only when everything is ready, and also block input to + // prevent accidentally trying to act on the old, stale data. + options := types.RefreshOptions{DontBlockRepoSwitch: true} + refresh := gui.c.Refresh + if isFirstRefreshAfterStartup { + isFirstRefreshAfterStartup = false + } else { + options.BatchUIUpdates = true + refresh = gui.c.RefreshBlockingInput + } + refresh(options) if err := gui.os.UpdateWindowTitle(); err != nil { return err @@ -1036,7 +1162,7 @@ func (gui *Gui) showIntroPopupMessage() { introMessage := utils.ResolvePlaceholderString( gui.c.Tr.IntroPopupMessage, map[string]string{ - "confirmationKey": gui.c.UserConfig().Keybinding.Universal.Confirm, + "confirmationKey": gui.c.UserConfig().Keybinding.Universal.Confirm.String(), }, ) @@ -1135,10 +1261,32 @@ func (gui *Gui) onUIThread(f func() error) { }) } +func (gui *Gui) onUIThreadBackground(f func() error) { + gui.g.UpdateBackground(func(*gocui.Gui) error { + return f() + }) +} + +func (gui *Gui) onUIThreadContentOnly(f func() error) { + gui.g.UpdateContentOnly(func(*gocui.Gui) error { + return f() + }) +} + +func (gui *Gui) onUIThreadContentOnlyBackground(f func() error) { + gui.g.UpdateContentOnlyBackground(func(*gocui.Gui) error { + return f() + }) +} + func (gui *Gui) onWorker(f func(gocui.Task) error) { gui.g.OnWorker(f) } +func (gui *Gui) onWorkerBackground(f func(gocui.Task) error) { + gui.g.OnWorkerBackground(f) +} + func (gui *Gui) getWindowDimensions(informationStr string, appStatus string) map[string]boxlayout.Dimensions { return gui.helpers.WindowArrangement.GetWindowDimensions(informationStr, appStatus) } diff --git a/pkg/gui/gui_common.go b/pkg/gui/gui_common.go index d946659d1..d693fd77f 100644 --- a/pkg/gui/gui_common.go +++ b/pkg/gui/gui_common.go @@ -1,10 +1,10 @@ package gui import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/tasks" @@ -30,8 +30,20 @@ func (self *guiCommon) Refresh(opts types.RefreshOptions) { self.gui.helpers.Refresh.Refresh(opts) } +func (self *guiCommon) RefreshBlockingInput(opts types.RefreshOptions) { + self.gui.helpers.Refresh.RefreshBlockingInput(opts) +} + +func (self *guiCommon) RefreshFromWorker(opts types.RefreshOptions) { + self.gui.helpers.Refresh.RefreshFromWorker(opts) +} + func (self *guiCommon) PostRefreshUpdate(context types.Context) { - self.gui.postRefreshUpdate(context) + self.gui.postRefreshUpdate(context, types.OnFocusOpts{}) +} + +func (self *guiCommon) PostRefreshUpdateWithOptions(context types.Context, opts types.OnFocusOpts) { + self.gui.postRefreshUpdate(context, opts) } func (self *guiCommon) RunSubprocessAndRefresh(cmdObj *oscommands.CmdObj) error { @@ -50,7 +62,22 @@ func (self *guiCommon) Resume() error { return self.gui.resume() } +func (self *guiCommon) PauseBackgroundRefreshes(pause bool) { + self.gui.BackgroundRoutineMgr.PauseBackgroundRefreshes(pause) +} + +// assertOnUIThread panics (in debug builds) if called from a worker goroutine. +// Use it to guard accessors for state that only the UI thread may touch, so +// that a stray worker access fails deterministically -- and points at itself -- +// rather than surfacing later as a probabilistic data race. +func (self *guiCommon) assertOnUIThread(accessor string) { + if self.GetConfig().GetDebug() && !self.GocuiGui().IsUIThread() { + panic(accessor + " accessed from a worker") + } +} + func (self *guiCommon) Context() types.IContextMgr { + self.assertOnUIThread("Context()") return self.gui.State.ContextMgr } @@ -105,6 +132,7 @@ func (self *guiCommon) Modes() *types.Modes { } func (self *guiCommon) Model() *types.Model { + self.assertOnUIThread("Model()") return self.gui.State.Model } @@ -120,10 +148,26 @@ func (self *guiCommon) OnUIThread(f func() error) { self.gui.onUIThread(f) } +func (self *guiCommon) OnUIThreadBackground(f func() error) { + self.gui.onUIThreadBackground(f) +} + +func (self *guiCommon) OnUIThreadContentOnly(f func() error) { + self.gui.onUIThreadContentOnly(f) +} + +func (self *guiCommon) OnUIThreadContentOnlyBackground(f func() error) { + self.gui.onUIThreadContentOnlyBackground(f) +} + func (self *guiCommon) OnWorker(f func(gocui.Task) error) { self.gui.onWorker(f) } +func (self *guiCommon) OnWorkerBackground(f func(gocui.Task) error) { + self.gui.onWorkerBackground(f) +} + func (self *guiCommon) RenderToMainViews(opts types.RefreshMainOpts) { self.gui.refreshMainViews(opts) } @@ -141,6 +185,10 @@ func (self *guiCommon) GetViewBufferManagerForView(view *gocui.View) *tasks.View return self.gui.getViewBufferManagerForView(view) } +func (self *guiCommon) ReadLinesToFillView(view *gocui.View) { + self.gui.readLinesToFillView(view) +} + func (self *guiCommon) State() types.IStateAccessor { return self.gui.stateAccessor } @@ -153,8 +201,8 @@ func (self *guiCommon) CallKeybindingHandler(binding *types.Binding) error { return self.gui.callKeybindingHandler(binding) } -func (self *guiCommon) ResetKeybindings() error { - return self.gui.resetKeybindings() +func (self *guiCommon) ResetKeybindings() { + self.gui.resetKeybindings() } func (self *guiCommon) IsAnyModeActive() bool { diff --git a/pkg/gui/gui_driver.go b/pkg/gui/gui_driver.go index 35c201a14..07a0b7d4c 100644 --- a/pkg/gui/gui_driver.go +++ b/pkg/gui/gui_driver.go @@ -6,11 +6,10 @@ import ( "strings" "time" - "github.com/gdamore/tcell/v2" - "github.com/jesseduffield/gocui" + "github.com/gdamore/tcell/v3" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/config" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types" ) @@ -18,55 +17,151 @@ import ( // this gives our integration test a way of interacting with the gui for sending keypresses // and reading state. type GuiDriver struct { - gui *Gui - isIdleChan chan struct{} - toastChan chan string - headless bool + gui *Gui + toastChan chan string + headless bool } var _ integrationTypes.GuiDriver = &GuiDriver{} func (self *GuiDriver) PressKey(keyStr string) { + self.PressKeysRapidly(keyStr) +} + +// PressKeysRapidly presses the given keys in immediate succession, waiting for +// lazygit to become idle only after the last one. Keys pressed this way can +// arrive while the previous key's processing is still in flight, like a user +// typing faster than lazygit handles the input. +func (self *GuiDriver) PressKeysRapidly(keyStrs ...string) { self.CheckAllToastsAcknowledged() - key := keybindings.GetKey(keyStr) + for _, keyStr := range keyStrs { + key, ok := config.KeyFromLabel(keyStr) + if !ok { + self.Fail("Unrecognized key: " + keyStr) + } - var r rune - var tcellKey tcell.Key - switch v := key.(type) { - case rune: - r = v - tcellKey = tcell.KeyRune - case gocui.Key: - tcellKey = tcell.Key(v) + self.gui.g.ReplayKeyEvent(gocui.NewTcellKeyEventWrapper( + tcell.NewEventKey(tcell.Key(key.KeyName()), key.Str(), tcell.ModMask(key.Mod())), + 0, + )) } - self.gui.g.ReplayedEvents.Keys <- gocui.NewTcellKeyEventWrapper( - tcell.NewEventKey(tcellKey, r, tcell.ModNone), - 0, - ) - self.waitTillIdle() } func (self *GuiDriver) Click(x, y int) { self.CheckAllToastsAcknowledged() - self.gui.g.ReplayedEvents.MouseEvents <- gocui.NewTcellMouseEventWrapper( + self.replayMouseEvent(x, y, tcell.ButtonPrimary) + self.replayMouseEvent(x, y, tcell.ButtonNone) +} + +func (self *GuiDriver) ClickAndHold(x, y int) { + self.CheckAllToastsAcknowledged() + self.replayMouseEvent(x, y, tcell.ButtonPrimary) +} + +// MouseMove reports the mouse at a new position with the left button still +// held down, i.e. a drag movement. (No test needs pointer motion without a +// button held, so that variant doesn't exist.) +func (self *GuiDriver) MouseMove(x, y int) { + self.replayMouseEvent(x, y, tcell.ButtonPrimary) +} + +func (self *GuiDriver) ScrollWheelDown(x, y int) { + self.replayMouseEvent(x, y, tcell.WheelDown) +} + +func (self *GuiDriver) MouseRelease(x, y int) { + self.replayMouseEvent(x, y, tcell.ButtonNone) +} + +func (self *GuiDriver) MouseReleaseWithoutWaiting(x, y int) { + self.replayMouseEventWithoutWaiting(x, y, tcell.ButtonNone) +} + +func (self *GuiDriver) WaitUntilIdle() { + self.waitTillIdle() +} + +func (self *GuiDriver) OnUIThreadAndWait(f func()) { + _ = self.gui.g.OnUIThreadAndWait(f) +} + +func (self *GuiDriver) replayMouseEvent(x, y int, buttons tcell.ButtonMask) { + self.replayMouseEventWithoutWaiting(x, y, buttons) + self.waitTillIdle() +} + +func (self *GuiDriver) replayMouseEventWithoutWaiting(x, y int, buttons tcell.ButtonMask) { + self.gui.g.ReplayMouseEvent(gocui.NewTcellMouseEventWrapper( + tcell.NewEventMouse(x, y, buttons, 0), + 0, + )) +} + +// replayFocusIn takes the focus away before handing it back, because that's the +// only way a terminal can report regaining it, and lazygit only reacts to focus +// reports that change the focus (see gocui.Gui.IsFocused). +func (self *GuiDriver) replayFocusIn() { + self.gui.g.ReplayFocusEvent(gocui.NewTcellFocusEventWrapper( + tcell.NewEventFocus(false), + 0, + )) + self.gui.g.ReplayFocusEvent(gocui.NewTcellFocusEventWrapper( + tcell.NewEventFocus(true), + 0, + )) +} + +// FocusIn simulates the terminal window regaining focus, which is how lazygit +// learns to reload changed config files. Tests use it to exercise the live +// config-reload path. +func (self *GuiDriver) FocusIn() { + self.replayFocusIn() + + self.waitTillIdle() +} + +func (self *GuiDriver) FocusInAndClick(x, y int) { + self.CheckAllToastsAcknowledged() + + self.replayFocusIn() + self.gui.g.ReplayMouseEvent(gocui.NewTcellMouseEventWrapper( tcell.NewEventMouse(x, y, tcell.ButtonPrimary, 0), 0, - ) + )) self.waitTillIdle() - self.gui.g.ReplayedEvents.MouseEvents <- gocui.NewTcellMouseEventWrapper( + self.gui.g.ReplayMouseEvent(gocui.NewTcellMouseEventWrapper( tcell.NewEventMouse(x, y, tcell.ButtonNone, 0), 0, - ) + )) + self.waitTillIdle() +} + +// RefreshInBackground performs the refresh that the background routines perform +// on a timer (see BackgroundRoutineMgr). Tests drive it directly rather than +// turning those routines on, so that they neither wait for a timer nor depend on +// one firing at a particular moment. +func (self *GuiDriver) RefreshInBackground() { + self.gui.c.RefreshFromWorker(types.RefreshOptions{Background: true}) + + self.waitTillIdle() +} + +func (self *GuiDriver) PretendMergeOrRebaseStartedInLazygit() { + self.gui.onUIThread(func() error { + self.gui.State.SetMergeOrRebaseStartedInLazygit(true) + return nil + }) + self.waitTillIdle() } // wait until lazygit is idle (i.e. all processing is done) before continuing func (self *GuiDriver) waitTillIdle() { - <-self.isIdleChan + self.gui.g.WaitUntilIdle() } func (self *GuiDriver) CheckAllToastsAcknowledged() { @@ -80,7 +175,14 @@ func (self *GuiDriver) Keys() config.KeybindingConfig { } func (self *GuiDriver) CurrentContext() types.Context { - return self.gui.c.Context().Current() + // Read the context manager directly rather than through c.Context(): the + // driver runs on the test goroutine, not the UI thread, so it must bypass + // the UI-thread assertion that accessor carries. + return self.gui.State.ContextMgr.Current() +} + +func (self *GuiDriver) CursorVisible() bool { + return self.gui.g.Cursor } func (self *GuiDriver) ContextForView(viewName string) types.Context { @@ -149,6 +251,12 @@ func (self *GuiDriver) View(viewName string) *gocui.View { return view } +// TopViewInWindow returns the frontmost visible view in the given window, i.e. +// the tab that is currently shown when a window holds several tabbed views. +func (self *GuiDriver) TopViewInWindow(windowName string) *gocui.View { + return self.gui.helpers.Window.TopViewInWindow(windowName, false) +} + func (self *GuiDriver) SetCaption(caption string) { self.gui.setCaption(caption) self.waitTillIdle() diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 9f92fbae8..5d03f6ba5 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -4,10 +4,10 @@ import ( "errors" "log" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -61,7 +61,7 @@ func (gui *Gui) GetCheatsheetKeybindings() []*types.Binding { } func (gui *Gui) keybindingOpts() types.KeybindingsOpts { - config := gui.c.UserConfig().Keybinding + keybindingConfig := gui.c.UserConfig().Keybinding guards := types.KeybindingGuards{ OutsideFilterMode: gui.outsideFilterMode, @@ -69,9 +69,9 @@ func (gui *Gui) keybindingOpts() types.KeybindingsOpts { } return types.KeybindingsOpts{ - GetKey: keybindings.GetKey, - Config: config, - Guards: guards, + GetKeys: config.GetValidatedKeyBindingKeys, + Config: keybindingConfig, + Guards: guards, } } @@ -81,119 +81,94 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin bindings := []*types.Binding{ { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.OpenRecentRepos), + Keys: opts.GetKeys(opts.Config.Universal.OpenRecentRepos), Handler: opts.Guards.NoPopupPanel(gui.helpers.Repos.CreateRecentReposMenu), Description: gui.c.Tr.SwitchRepo, }, { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ScrollUpMain), + Keys: opts.GetKeys(opts.Config.Universal.ScrollUpMain), Handler: gui.scrollUpMain, Alternative: "fn+up/shift+k", Description: gui.c.Tr.ScrollUpMainWindow, }, { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ScrollDownMain), + Keys: opts.GetKeys(opts.Config.Universal.ScrollDownMain), Handler: gui.scrollDownMain, Alternative: "fn+down/shift+j", Description: gui.c.Tr.ScrollDownMainWindow, }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ScrollUpMainAlt1), - Modifier: gocui.ModNone, - Handler: gui.scrollUpMain, - }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ScrollDownMainAlt1), - Modifier: gocui.ModNone, - Handler: gui.scrollDownMain, - }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ScrollUpMainAlt2), - Modifier: gocui.ModNone, - Handler: gui.scrollUpMain, - }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ScrollDownMainAlt2), - Modifier: gocui.ModNone, - Handler: gui.scrollDownMain, - }, { ViewName: "files", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyPathToClipboard, }, { ViewName: "localBranches", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyBranchNameToClipboard, }, { ViewName: "remoteBranches", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyBranchNameToClipboard, }, { ViewName: "tags", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyTagToClipboard, }, { ViewName: "commits", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemCommitHashToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyCommitHashToClipboard, }, { ViewName: "commits", - Key: opts.GetKey(opts.Config.Commits.ResetCherryPick), + Keys: opts.GetKeys(opts.Config.Commits.ResetCherryPick), Handler: gui.helpers.CherryPick.Reset, Description: gui.c.Tr.ResetCherryPick, }, { ViewName: "reflogCommits", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyCommitHashToClipboard, }, { ViewName: "subCommits", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemCommitHashToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyCommitHashToClipboard, }, { ViewName: "information", - Key: gocui.MouseLeft, - Modifier: gocui.ModNone, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseLeft)}, Handler: gui.handleInfoClick, }, { ViewName: "commitFiles", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopyPathToClipboard, }, { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.ExtrasMenu), + Keys: opts.GetKeys(opts.Config.Universal.ExtrasMenu), Handler: opts.Guards.NoPopupPanel(gui.handleCreateExtrasMenuPanel), Description: gui.c.Tr.OpenCommandLogMenu, Tooltip: gui.c.Tr.OpenCommandLogMenuTooltip, @@ -201,192 +176,128 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin }, { ViewName: "main", - Key: gocui.MouseWheelDown, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelDown)}, Handler: gui.scrollDownMain, Description: gui.c.Tr.ScrollDown, Alternative: "fn+up", }, { ViewName: "main", - Key: gocui.MouseWheelUp, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelUp)}, Handler: gui.scrollUpMain, Description: gui.c.Tr.ScrollUp, Alternative: "fn+down", }, { ViewName: "secondary", - Key: gocui.MouseWheelDown, - Modifier: gocui.ModNone, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelDown)}, Handler: gui.scrollDownSecondary, }, { ViewName: "secondary", - Key: gocui.MouseWheelUp, - Modifier: gocui.ModNone, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelUp)}, Handler: gui.scrollUpSecondary, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.PrevItem), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: gui.scrollUpConfirmationPanel, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.NextItem), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: gui.scrollDownConfirmationPanel, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), - Modifier: gocui.ModNone, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelUp)}, Handler: gui.scrollUpConfirmationPanel, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.NextItemAlt), - Modifier: gocui.ModNone, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelDown)}, Handler: gui.scrollDownConfirmationPanel, }, { ViewName: "confirmation", - Key: gocui.MouseWheelUp, - Handler: gui.scrollUpConfirmationPanel, - }, - { - ViewName: "confirmation", - Key: gocui.MouseWheelDown, - Handler: gui.scrollDownConfirmationPanel, - }, - { - ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.NextPage), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: gui.pageDownConfirmationPanel, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.PrevPage), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: gui.pageUpConfirmationPanel, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.GotoTop), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: gui.goToConfirmationPanelTop, }, { ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.GotoTopAlt), - Modifier: gocui.ModNone, - Handler: gui.goToConfirmationPanelTop, - }, - { - ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.GotoBottom), - Modifier: gocui.ModNone, - Handler: gui.goToConfirmationPanelBottom, - }, - { - ViewName: "confirmation", - Key: opts.GetKey(opts.Config.Universal.GotoBottomAlt), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: gui.goToConfirmationPanelBottom, }, { ViewName: "submodules", - Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), + Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: gui.handleCopySelectedSideContextItemToClipboard, GetDisabledReason: gui.getCopySelectedSideContextItemToClipboardDisabledReason, Description: gui.c.Tr.CopySubmoduleNameToClipboard, }, { ViewName: "extras", - Key: gocui.MouseWheelUp, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelUp)}, Handler: gui.scrollUpExtra, }, { ViewName: "extras", - Key: gocui.MouseWheelDown, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelDown)}, Handler: gui.scrollDownExtra, }, { ViewName: "extras", Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: gui.scrollUpExtra, }, { ViewName: "extras", Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.PrevItem), - Modifier: gocui.ModNone, - Handler: gui.scrollUpExtra, - }, - { - ViewName: "extras", - Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.NextItem), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: gui.scrollDownExtra, }, { ViewName: "extras", - Tag: "navigation", - Key: opts.GetKey(opts.Config.Universal.NextItemAlt), - Modifier: gocui.ModNone, - Handler: gui.scrollDownExtra, - }, - { - ViewName: "extras", - Key: opts.GetKey(opts.Config.Universal.NextPage), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: gui.pageDownExtrasPanel, }, { ViewName: "extras", - Key: opts.GetKey(opts.Config.Universal.PrevPage), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: gui.pageUpExtrasPanel, }, { ViewName: "extras", - Key: opts.GetKey(opts.Config.Universal.GotoTop), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: gui.goToExtrasPanelTop, }, { ViewName: "extras", - Key: opts.GetKey(opts.Config.Universal.GotoTopAlt), - Modifier: gocui.ModNone, - Handler: gui.goToExtrasPanelTop, - }, - { - ViewName: "extras", - Key: opts.GetKey(opts.Config.Universal.GotoBottom), - Modifier: gocui.ModNone, - Handler: gui.goToExtrasPanelBottom, - }, - { - ViewName: "extras", - Key: opts.GetKey(opts.Config.Universal.GotoBottomAlt), - Modifier: gocui.ModNone, + Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: gui.goToExtrasPanelBottom, }, { ViewName: "extras", Tag: "navigation", - Key: gocui.MouseLeft, - Modifier: gocui.ModNone, + Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseLeft)}, Handler: gui.handleFocusCommandLog, }, } - mouseKeybindings := []*gocui.ViewMouseBinding{} - for _, c := range gui.State.Contexts.Flatten() { + contexts := gui.State.Contexts.Flatten() + mouseKeybindings := make([]*gocui.ViewMouseBinding, 0, len(contexts)) + for _, c := range contexts { viewName := c.GetViewName() for _, binding := range c.GetKeybindings(opts) { // TODO: move all mouse keybindings into the mouse keybindings approach below @@ -400,14 +311,14 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin bindings = append(bindings, []*types.Binding{ { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.NextTab), + Keys: opts.GetKeys(opts.Config.Universal.NextTab), Handler: opts.Guards.NoPopupPanel(gui.handleNextTab), Description: gui.c.Tr.NextTab, Tag: "navigation", }, { ViewName: "", - Key: opts.GetKey(opts.Config.Universal.PrevTab), + Keys: opts.GetKeys(opts.Config.Universal.PrevTab), Handler: opts.Guards.NoPopupPanel(gui.handlePrevTab), Description: gui.c.Tr.PrevTab, Tag: "navigation", @@ -440,21 +351,17 @@ func (gui *Gui) GetInitialKeybindingsWithCustomCommands() ([]*types.Binding, []* return bindings, mouseBindings } -func (gui *Gui) resetKeybindings() error { +func (gui *Gui) resetKeybindings() { gui.g.DeleteAllKeybindings() bindings, mouseBindings := gui.GetInitialKeybindingsWithCustomCommands() for _, binding := range bindings { - if err := gui.SetKeybinding(binding); err != nil { - return err - } + gui.SetKeybinding(binding) } for _, binding := range mouseBindings { - if err := gui.SetMouseKeybinding(binding); err != nil { - return err - } + gui.SetMouseKeybinding(binding) } for _, values := range gui.viewTabMap() { @@ -464,43 +371,23 @@ func (gui *Gui) resetKeybindings() error { return gui.onViewTabClick(gui.helpers.Window.WindowForView(viewName), tabIndex) } - if err := gui.g.SetTabClickBinding(viewName, tabClickCallback); err != nil { - return err - } + gui.g.SetTabClickBinding(viewName, tabClickCallback) } } - - return nil } -func (gui *Gui) wrappedHandler(f func() error) func(g *gocui.Gui, v *gocui.View) error { - return func(g *gocui.Gui, v *gocui.View) error { - return f() - } -} - -func (gui *Gui) SetKeybinding(binding *types.Binding) error { - handler := func() error { +func (gui *Gui) SetKeybinding(binding *types.Binding) { + handler := func(g *gocui.Gui, v *gocui.View) error { return gui.callKeybindingHandler(binding) } - // TODO: move all mouse-ey stuff into new mouse approach - if gocui.IsMouseKey(binding.Key) { - handler = func() error { - // we ignore click events on views that aren't popup panels, when a popup panel is focused - if gui.helpers.Confirmation.IsPopupPanelFocused() && gui.currentViewName() != binding.ViewName { - return nil - } - - return binding.Handler() - } + for _, key := range binding.Keys { + gui.g.SetKeybinding(binding.ViewName, key, handler) } - - return gui.g.SetKeybinding(binding.ViewName, binding.Key, binding.Modifier, gui.wrappedHandler(handler)) } -func (gui *Gui) SetMouseKeybinding(binding *gocui.ViewMouseBinding) error { - return gui.g.SetViewClickBinding(binding) +func (gui *Gui) SetMouseKeybinding(binding *gocui.ViewMouseBinding) { + gui.g.SetViewClickBinding(binding) } func (gui *Gui) callKeybindingHandler(binding *types.Binding) error { diff --git a/pkg/gui/keybindings/keybindings.go b/pkg/gui/keybindings/keybindings.go deleted file mode 100644 index 76b757b72..000000000 --- a/pkg/gui/keybindings/keybindings.go +++ /dev/null @@ -1,54 +0,0 @@ -package keybindings - -import ( - "fmt" - "log" - "strings" - "unicode/utf8" - - "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/config" - "github.com/jesseduffield/lazygit/pkg/constants" - "github.com/jesseduffield/lazygit/pkg/gui/types" -) - -func Label(name string) string { - return LabelFromKey(GetKey(name)) -} - -func LabelFromKey(key types.Key) string { - if key == nil { - return "" - } - - keyInt := 0 - - switch key := key.(type) { - case rune: - keyInt = int(key) - case gocui.Key: - value, ok := config.LabelByKey[key] - if ok { - return value - } - keyInt = int(key) - } - - return fmt.Sprintf("%c", keyInt) -} - -func GetKey(key string) types.Key { - runeCount := utf8.RuneCountInString(key) - if key == "" { - return nil - } else if runeCount > 1 { - binding, ok := config.KeyByLabel[strings.ToLower(key)] - if !ok { - log.Fatalf("Unrecognized key %s for keybinding. For permitted values see %s", strings.ToLower(key), constants.Links.Docs.CustomKeybindings) - } - return binding - } else if runeCount == 1 { - return []rune(key)[0] - } - return nil -} diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go index 7ab7a88a0..ccc83b1e9 100644 --- a/pkg/gui/layout.go +++ b/pkg/gui/layout.go @@ -3,8 +3,9 @@ package gui import ( "errors" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -23,7 +24,11 @@ func (gui *Gui) layout(g *gocui.Gui) error { informationStr := gui.informationStr() - appStatus := gui.helpers.AppStatus.GetStatusString() + var appStatus string + appStatusView, err := g.View("appStatus") + if err == nil { + appStatus = utils.Decolorise(appStatusView.Buffer()) + } viewDimensions := gui.getWindowDimensions(informationStr, appStatus) @@ -32,13 +37,18 @@ func (gui *Gui) layout(g *gocui.Gui) error { if prevMainView != nil { prevMainHeight := prevMainView.Height() newMainHeight := viewDimensions["main"].Y1 - viewDimensions["main"].Y0 + 1 - heightDiff := newMainHeight - prevMainHeight - if heightDiff > 0 { + if newMainHeight > prevMainHeight { + // The main views have grown taller, so make sure enough lines are + // loaded to fill them. The views haven't been resized yet at this + // point, so we can't rely on their current height; compute the target + // total from the new height instead. (Reading past the actual content + // is harmless: ReadLines stops at the end of input.) + linesToRead := prevMainView.OriginY() + newMainHeight if manager := gui.getViewBufferManagerForView(gui.Views.Main); manager != nil { - manager.ReadLines(heightDiff) + manager.ReadLines(linesToRead) } if manager := gui.getViewBufferManagerForView(gui.Views.Secondary); manager != nil { - manager.ReadLines(heightDiff) + manager.ReadLines(linesToRead) } } } @@ -78,7 +88,13 @@ func (gui *Gui) layout(g *gocui.Gui) error { if !view.CanScrollPastBottom { maxOriginY -= newHeight - 1 } - if oldOriginY := view.OriginY(); oldOriginY > maxOriginY { + // Don't scroll up while the view's content is still being loaded: its + // height only reflects what has been read so far, so clamping to it now + // would yank the view to the top even though more content is on the way + // (e.g. when re-rendering a diff the user was scrolled into). + manager := gui.getViewBufferManagerForView(view) + stillLoading := manager != nil && manager.IsLoading() + if oldOriginY := view.OriginY(); oldOriginY > maxOriginY && !stillLoading { view.ScrollUp(oldOriginY - maxOriginY) // the view might not have scrolled actually (if it was at the limit // already), so we need to check if it did @@ -128,10 +144,25 @@ func (gui *Gui) layout(g *gocui.Gui) error { } } - minimumHeight := 9 + menuWithFilterRowVisible := gui.Views.Menu.Visible && gui.State.Contexts.Menu.FilterAsYouType() + minimumHeight := minimumScreenHeight(len(gui.helpers.Window.SideWindows()), menuWithFilterRowVisible) minimumWidth := 10 gui.Views.Limit.Visible = height < minimumHeight || width < minimumWidth + filterRowVisible := gui.Views.Menu.Visible && gui.State.Contexts.Menu.FilterStarted() + gui.Views.MenuFilterFrame.Visible = filterRowVisible + gui.Views.MenuFilter.Visible = filterRowVisible + if gui.Views.Menu.Visible { + // Until the user types something there is no filter row to advertise the + // filter, so the menu says that typing is a thing. + gui.Views.Menu.Subtitle = lo.Ternary(menuWithFilterRowVisible && !filterRowVisible, gui.c.Tr.MenuFilterHint, "") + } + if menuWithFilterRowVisible { + // The filter input is the current view for as long as such a menu is open, + // so without this the cursor would sit on the menu's bottom border, where + // the filter row is yet to appear. + gui.g.Cursor = filterRowVisible + } gui.Views.Tooltip.Visible = gui.Views.Menu.Visible && gui.Views.Tooltip.Buffer() != "" for _, context := range gui.transientContexts() { @@ -139,7 +170,14 @@ func (gui *Gui) layout(g *gocui.Gui) error { if err != nil && !errors.Is(err, gocui.ErrUnknownView) { return err } - view.Visible = gui.helpers.Window.GetViewNameForWindow(context.GetWindowName()) == context.GetViewName() + // A transient view is visible if it is the view its window is currently + // showing — but only if that window is part of the layout at all. For a + // window without dimensions, setViewFromDimensions parks the view at full + // screen size in the background, so making it visible would cover all + // windows below it. + _, windowHasDimensions := viewDimensions[context.GetWindowName()] + view.Visible = windowHasDimensions && + gui.helpers.Window.GetViewNameForWindow(context.GetWindowName()) == context.GetViewName() } if gui.PrevLayout.Information != informationStr { @@ -201,6 +239,26 @@ outer: return nil } +// The height below which we show the "not enough space" view instead of the +// layout. +func minimumScreenHeight(sideWindowCount int, menuWithFilterRowVisible bool) int { + // When the screen is too short the side panels are squashed, with the + // unfocused ones taking one row each and the focused one taking the rest. The + // more panels there are, the more rows the unfocused ones reserve, so the + // floor below which there's no room left for the focused panel grows with the + // panel count. Keep the historical floor of 9 for the default five panels. + minimumHeight := max(9, sideWindowCount+4) + + // A menu popup gets three quarters of the screen, of which its frame, the + // tooltip gap below it and a reserved filter row take seven rows, so below 11 + // rows there is no room left for even one menu item. + if menuWithFilterRowVisible { + minimumHeight = max(minimumHeight, 11) + } + + return minimumHeight +} + func (gui *Gui) prepareView(viewName string) (*gocui.View, error) { // arbitrarily giving the view enough size so that we don't get an error, but // it's expected that the view will be given the correct size before being shown @@ -244,6 +302,10 @@ func (gui *Gui) onRepoViewReset() error { } } + // The loop above orders views by a fixed list, which doesn't necessarily put + // each panel's first configured tab on top. + gui.moveDefaultTabsToTop() + return nil } diff --git a/pkg/gui/layout_test.go b/pkg/gui/layout_test.go new file mode 100644 index 000000000..1495bcd49 --- /dev/null +++ b/pkg/gui/layout_test.go @@ -0,0 +1,14 @@ +package gui + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestMinimumScreenHeight(t *testing.T) { + assert.Equal(t, 9, minimumScreenHeight(5, false)) + assert.Equal(t, 12, minimumScreenHeight(8, false)) + assert.Equal(t, 11, minimumScreenHeight(5, true)) + assert.Equal(t, 12, minimumScreenHeight(8, true)) +} diff --git a/pkg/gui/main_panels.go b/pkg/gui/main_panels.go index 30055e805..bc4a4219e 100644 --- a/pkg/gui/main_panels.go +++ b/pkg/gui/main_panels.go @@ -1,7 +1,8 @@ package gui import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -107,15 +108,7 @@ func (gui *Gui) allMainContextPairs() []types.MainContextPair { } func (gui *Gui) refreshMainViews(opts types.RefreshMainOpts) { - // need to reset scroll positions of all other main views - for _, pair := range gui.allMainContextPairs() { - if pair.Main != opts.Pair.Main { - pair.Main.GetView().SetOrigin(0, 0) - } - if pair.Secondary != nil && pair.Secondary != opts.Pair.Secondary { - pair.Secondary.GetView().SetOrigin(0, 0) - } - } + gui.moveMainContextPairToTop(opts.Pair) if opts.Main != nil { gui.RefreshMainView(opts.Main, opts.Pair.Main) @@ -127,7 +120,19 @@ func (gui *Gui) refreshMainViews(opts types.RefreshMainOpts) { opts.Pair.Secondary.GetView().Clear() } - gui.moveMainContextPairToTop(opts.Pair) + // Reset the scroll positions of all the other main views. We do this after + // moving this pair to the top (which copies the previously-shown view's + // content into the now-visible one to avoid a blank frame): resetting first + // would zero that source view's scroll before it gets copied, forcing the + // placeholder to the top instead of leaving it where the screen already was. + for _, pair := range gui.allMainContextPairs() { + if pair.Main != opts.Pair.Main { + pair.Main.GetView().SetOrigin(0, 0) + } + if pair.Secondary != nil && pair.Secondary != opts.Pair.Secondary { + pair.Secondary.GetView().SetOrigin(0, 0) + } + } gui.splitMainPanel(opts.Secondary != nil) } @@ -135,3 +140,17 @@ func (gui *Gui) refreshMainViews(opts types.RefreshMainOpts) { func (gui *Gui) splitMainPanel(splitMainPanel bool) { gui.State.SplitMainPanel = splitMainPanel } + +// reApplySearch runs a search the view holds again over the content a render has just +// finished putting there, so that the matches highlighted and the "x of y" status +// describe what the view shows now rather than what it showed when the search was +// typed. Call it once the content is final. +func (gui *Gui) reApplySearch(view *gocui.View) { + // While the prompt is open, the search view holds what the user is typing, and the + // status would be written over it. + if gui.State.ContextMgr.Current().GetKey() == context.SEARCH_CONTEXT_KEY { + return + } + + view.RefreshSearch() +} diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index b100a4beb..1bfdb4581 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -3,7 +3,8 @@ package gui import ( "fmt" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/samber/lo" @@ -16,6 +17,9 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error { opts.Items = append(opts.Items, &types.MenuItem{ LabelColumns: []string{gui.c.Tr.Cancel}, OnPress: func() error { + if opts.OnCancel != nil { + return opts.OnCancel() + } return nil }, }) @@ -23,11 +27,15 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error { maxColumnSize := 1 - essentialKeys := []types.Key{ - keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.ConfirmMenu), - keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.Return), - keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.PrevItem), - keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.NextItem), + // Only the primary key of each navigation binding is reserved as + // essential; alternates (e.g. the historical j/k that lived under + // `*Alt` fields) stay available to be reused by menu items, which + // take precedence over the inherited list bindings. + essentialKeys := []gocui.Key{ + config.GetValidatedKeyBindingKeys(gui.c.UserConfig().Keybinding.Universal.ConfirmMenu)[0], + config.GetValidatedKeyBindingKeys(gui.c.UserConfig().Keybinding.Universal.Return)[0], + config.GetValidatedKeyBindingKeys(gui.c.UserConfig().Keybinding.Universal.PrevItem)[0], + config.GetValidatedKeyBindingKeys(gui.c.UserConfig().Keybinding.Universal.NextItem)[0], } for _, item := range opts.Items { @@ -42,8 +50,10 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error { maxColumnSize = max(maxColumnSize, len(item.LabelColumns)) // Remove all item keybindings that are the same as one of the essential bindings - if !opts.KeepConflictingKeybindings && lo.Contains(essentialKeys, item.Key) { - item.Key = nil + if !opts.KeepConflictingKeybindings { + item.Keys = lo.Filter(item.Keys, func(k gocui.Key, _ int) bool { + return !lo.Contains(essentialKeys, k) + }) } } @@ -59,9 +69,12 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error { gui.State.Contexts.Menu.SetPrompt(opts.Prompt) gui.State.Contexts.Menu.SetAllowFilteringKeybindings(opts.AllowFilteringKeybindings) gui.State.Contexts.Menu.SetKeybindingsTakePrecedence(!opts.KeepConflictingKeybindings) + gui.State.Contexts.Menu.SetFilterAsYouType(opts.FilterAsYouType) + gui.State.Contexts.Menu.SetOnCancel(opts.OnCancel) gui.State.Contexts.Menu.SetSelection(0) - gui.Views.Menu.SetOriginY(0) + gui.Views.MenuFilter.ClearTextArea() + gui.Views.MenuFilter.RenderTextArea() gui.Views.Menu.Title = opts.Title gui.Views.Menu.FgColor = theme.GocuiDefaultTextColor @@ -71,9 +84,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error { gui.Views.Tooltip.Visible = true // resetting keybindings so that the menu-specific keybindings are registered - if err := gui.resetKeybindings(); err != nil { - return err - } + gui.resetKeybindings() gui.c.PostRefreshUpdate(gui.State.Contexts.Menu) diff --git a/pkg/gui/mergeconflicts/find_conflicts.go b/pkg/gui/mergeconflicts/find_conflicts.go index c4d3a51a8..e57c16635 100644 --- a/pkg/gui/mergeconflicts/find_conflicts.go +++ b/pkg/gui/mergeconflicts/find_conflicts.go @@ -2,7 +2,6 @@ package mergeconflicts import ( "bufio" - "bytes" "io" "os" "strings" @@ -22,7 +21,23 @@ const ( NOT_A_MARKER ) -func findConflicts(content string) []*mergeConflict { +// The number of characters a conflict marker consists of, unless the file's +// conflict-marker-size gitattribute says otherwise. +const defaultConflictMarkerSize = 7 + +// The marker size that everything in here takes is the conflict-marker-size +// gitattribute of the file being examined, which is 0 for a file that doesn't +// have that attribute. Git falls back to its default size in that case, so we +// do the same. +func effectiveMarkerSize(markerSize int) int { + if markerSize < 1 { + return defaultConflictMarkerSize + } + + return markerSize +} + +func findConflicts(content string, markerSize int) []*mergeConflict { conflicts := make([]*mergeConflict, 0) if content == "" { @@ -31,7 +46,7 @@ func findConflicts(content string) []*mergeConflict { var newConflict *mergeConflict for i, line := range utils.SplitLines(content) { - switch determineLineType(line) { + switch determineLineType(line, markerSize) { case START: newConflict = &mergeConflict{start: i, ancestor: -1} case ANCESTOR: @@ -57,35 +72,59 @@ func findConflicts(content string) []*mergeConflict { return conflicts } -var ( - CONFLICT_START = "<<<<<<< " - CONFLICT_END = ">>>>>>> " - CONFLICT_START_BYTES = []byte(CONFLICT_START) - CONFLICT_END_BYTES = []byte(CONFLICT_END) -) +func determineLineType(line string, markerSize int) LineType { + markerSize = effectiveMarkerSize(markerSize) -func determineLineType(line string) LineType { // TODO: find out whether we ever actually get this prefix trimmedLine := strings.TrimPrefix(line, "++") switch { - case strings.HasPrefix(trimmedLine, CONFLICT_START): + case isConflictMarker(trimmedLine, '<', markerSize): return START - case strings.HasPrefix(trimmedLine, "||||||| "): + case isConflictMarker(trimmedLine, '|', markerSize): return ANCESTOR - case trimmedLine == "=======": + case isTargetMarker(trimmedLine, markerSize): return TARGET - case strings.HasPrefix(trimmedLine, CONFLICT_END): + case isConflictMarker(trimmedLine, '>', markerSize): return END default: return NOT_A_MARKER } } +// Tells us whether the line begins with markerSize repetitions of markerChar. +func hasMarkerPrefix[T string | []byte](line T, markerChar byte, markerSize int) bool { + if len(line) < markerSize { + return false + } + + for i := range markerSize { + if line[i] != markerChar { + return false + } + } + + return true +} + +// A start, ancestor or end marker is followed by a space and a label, e.g. +// "<<<<<<< HEAD". The label can be missing though, in which case git doesn't +// write the space either; `git checkout -m` with the diff3 conflict style does +// that for the ancestor marker, for example. +func isConflictMarker[T string | []byte](line T, markerChar byte, markerSize int) bool { + return hasMarkerPrefix(line, markerChar, markerSize) && + (len(line) == markerSize || line[markerSize] == ' ') +} + +// The marker separating the two sides of a conflict never has a label after it. +func isTargetMarker(line string, markerSize int) bool { + return hasMarkerPrefix(line, '=', markerSize) && len(line) == markerSize +} + // tells us whether a file actually has inline merge conflicts. We need to run this // because git will continue showing a status of 'UU' even after the conflicts have // been resolved in the user's editor -func FileHasConflictMarkers(path string) (bool, error) { +func FileHasConflictMarkers(path string, markerSize int) (bool, error) { file, err := os.Open(path) if err != nil { return false, err @@ -93,25 +132,23 @@ func FileHasConflictMarkers(path string) (bool, error) { defer file.Close() - return fileHasConflictMarkersAux(file), nil + return fileHasConflictMarkersAux(file, markerSize) } // Efficiently scans through a file looking for merge conflict markers. Returns true if it does -func fileHasConflictMarkersAux(file io.Reader) bool { +func fileHasConflictMarkersAux(file io.Reader, markerSize int) (bool, error) { + markerSize = effectiveMarkerSize(markerSize) + scanner := bufio.NewScanner(file) scanner.Split(utils.ScanLinesAndTruncateWhenLongerThanBuffer(bufio.MaxScanTokenSize)) for scanner.Scan() { line := scanner.Bytes() // only searching for start/end markers because the others are more ambiguous - if bytes.HasPrefix(line, CONFLICT_START_BYTES) { - return true - } - - if bytes.HasPrefix(line, CONFLICT_END_BYTES) { - return true + if isConflictMarker(line, '<', markerSize) || isConflictMarker(line, '>', markerSize) { + return true, nil } } - return false + return false, scanner.Err() } diff --git a/pkg/gui/mergeconflicts/find_conflicts_test.go b/pkg/gui/mergeconflicts/find_conflicts_test.go index f4ab4d30c..28839126f 100644 --- a/pkg/gui/mergeconflicts/find_conflicts_test.go +++ b/pkg/gui/mergeconflicts/find_conflicts_test.go @@ -8,9 +8,12 @@ import ( ) func TestDetermineLineType(t *testing.T) { + // A markerSize of 0 means the file has no conflict-marker-size gitattribute, + // so git's default size applies. type scenario struct { - line string - expected LineType + line string + markerSize int + expected LineType } scenarios := []scenario{ @@ -54,17 +57,75 @@ func TestDetermineLineType(t *testing.T) { line: "||||||| adf33b9", expected: ANCESTOR, }, + { + line: "<<<<<<<<", + expected: NOT_A_MARKER, + }, + // Markers without a label + { + line: "<<<<<<<", + expected: START, + }, + { + line: "|||||||", + expected: ANCESTOR, + }, + { + line: ">>>>>>>", + expected: END, + }, + { + line: strings.Repeat("<", 32) + " HEAD", + markerSize: 32, + expected: START, + }, + { + line: strings.Repeat("|", 32) + " adf33b9", + markerSize: 32, + expected: ANCESTOR, + }, + { + line: strings.Repeat("=", 32), + markerSize: 32, + expected: TARGET, + }, + { + line: strings.Repeat(">", 32) + " blah", + markerSize: 32, + expected: END, + }, + // A file gets a bigger marker size precisely because its regular content + // tends to contain marker-looking lines, so lines with the default size + // must not be mistaken for markers + { + line: "<<<<<<< HEAD", + markerSize: 32, + expected: NOT_A_MARKER, + }, + { + line: "=======", + markerSize: 32, + expected: NOT_A_MARKER, + }, + { + line: strings.Repeat("=", 33), + markerSize: 32, + expected: NOT_A_MARKER, + }, } for _, s := range scenarios { - assert.EqualValues(t, s.expected, determineLineType(s.line)) + assert.EqualValues(t, s.expected, determineLineType(s.line, s.markerSize), s.line) } } func TestFindConflictsAux(t *testing.T) { + // A markerSize of 0 means the file has no conflict-marker-size gitattribute, + // so git's default size applies. type scenario struct { - content string - expected bool + content string + markerSize int + expected bool } scenarios := []scenario{ @@ -88,14 +149,36 @@ func TestFindConflictsAux(t *testing.T) { content: " <<<<<<< ", expected: false, }, + { + content: ">>>>>>>", + expected: true, + }, { content: "a\nb\nc\n<<<<<<< ", expected: true, }, + { + content: "a\nb\nc\n" + strings.Repeat("<", 32) + " HEAD", + markerSize: 32, + expected: true, + }, + { + content: "a\nb\nc\n" + strings.Repeat(">", 32) + " blah", + markerSize: 32, + expected: true, + }, + // Marker-looking lines of the default size are the file's regular content + { + content: "a\nb\nc\n<<<<<<< HEAD\n=======\n>>>>>>> blah", + markerSize: 32, + expected: false, + }, } for _, s := range scenarios { reader := strings.NewReader(s.content) - assert.EqualValues(t, s.expected, fileHasConflictMarkersAux(reader)) + result, err := fileHasConflictMarkersAux(reader, s.markerSize) + assert.NoError(t, err) + assert.EqualValues(t, s.expected, result, s.content) } } diff --git a/pkg/gui/mergeconflicts/merge_conflict.go b/pkg/gui/mergeconflicts/merge_conflict.go index 9b9b72f55..4252aa384 100644 --- a/pkg/gui/mergeconflicts/merge_conflict.go +++ b/pkg/gui/mergeconflicts/merge_conflict.go @@ -28,7 +28,7 @@ const ( TOP Selection = iota MIDDLE BOTTOM - ALL + BOTH ) func (s Selection) isIndexToKeep(conflict *mergeConflict, i int) bool { @@ -56,14 +56,23 @@ func (s Selection) bounds(c *mergeConflict) (int, int) { return c.ancestor, c.target case BOTTOM: return c.target, c.end - case ALL: - return c.start, c.end + case BOTH: + // BOTH spans two disjoint hunks, so it has no single range; callers + // go through selected() instead of asking for its bounds. + panic("BOTH has no single range") } panic("unexpected selection for merge conflict") } func (s Selection) selected(c *mergeConflict, idx int) bool { + // BOTH keeps the top and bottom hunks but drops the common ancestor in + // between (which is only present with the diff3 conflict style), so it + // isn't a single contiguous range like the other selections. + if s == BOTH { + return TOP.selected(c, idx) || BOTTOM.selected(c, idx) + } + start, end := s.bounds(c) return start < idx && idx < end } diff --git a/pkg/gui/mergeconflicts/rendering.go b/pkg/gui/mergeconflicts/rendering.go index e57754e4b..c71c12d37 100644 --- a/pkg/gui/mergeconflicts/rendering.go +++ b/pkg/gui/mergeconflicts/rendering.go @@ -24,7 +24,8 @@ func ColoredConflictFile(state *State) string { if i == conflict.end && len(remainingConflicts) > 0 { conflict, remainingConflicts = shiftConflict(remainingConflicts) } - outputBuffer.WriteString(textStyle.Sprint(line) + "\n") + outputBuffer.WriteString(textStyle.Sprint(line)) + outputBuffer.WriteByte('\n') } return outputBuffer.String() } diff --git a/pkg/gui/mergeconflicts/state.go b/pkg/gui/mergeconflicts/state.go index 047241353..d38e0c754 100644 --- a/pkg/gui/mergeconflicts/state.go +++ b/pkg/gui/mergeconflicts/state.go @@ -12,6 +12,9 @@ type State struct { // path of the file with the conflicts path string + // the file's conflict-marker-size gitattribute, or 0 if it doesn't have one + markerSize int + // This is a stack of the file content. It is used to undo changes. // The last item is the current file content. contents []string @@ -74,12 +77,13 @@ func (s *State) currentConflict() *mergeConflict { } // this is for starting a new merge conflict session -func (s *State) SetContent(content string, path string) { - if content == s.GetContent() && path == s.path { +func (s *State) SetContent(content string, path string, markerSize int) { + if content == s.GetContent() && path == s.path && markerSize == s.markerSize { return } s.path = path + s.markerSize = markerSize s.contents = []string{} s.PushContent(content) } @@ -88,7 +92,7 @@ func (s *State) SetContent(content string, path string) { // state func (s *State) PushContent(content string) { s.contents = append(s.contents, content) - s.setConflicts(findConflicts(content)) + s.setConflicts(findConflicts(content, s.markerSize)) } func (s *State) GetContent() string { @@ -103,6 +107,10 @@ func (s *State) GetPath() string { return s.path } +func (s *State) GetMarkerSize() int { + return s.markerSize +} + func (s *State) Undo() bool { if len(s.contents) <= 1 { return false @@ -112,7 +120,7 @@ func (s *State) Undo() bool { newContent := s.GetContent() // We could be storing the old conflicts and selected index on a stack too. - s.setConflicts(findConflicts(newContent)) + s.setConflicts(findConflicts(newContent, s.markerSize)) return true } @@ -147,6 +155,7 @@ func (s *State) AllConflictsResolved() bool { func (s *State) Reset() { s.contents = []string{} s.path = "" + s.markerSize = 0 } // we're not resetting selectedIndex here because the user typically would want diff --git a/pkg/gui/mergeconflicts/state_test.go b/pkg/gui/mergeconflicts/state_test.go index 7a9ee8c26..06f8fa6bb 100644 --- a/pkg/gui/mergeconflicts/state_test.go +++ b/pkg/gui/mergeconflicts/state_test.go @@ -116,7 +116,7 @@ baz for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - assert.EqualValues(t, s.expected, findConflicts(s.content)) + assert.EqualValues(t, s.expected, findConflicts(s.content, defaultConflictMarkerSize)) }) } } diff --git a/pkg/gui/options_map.go b/pkg/gui/options_map.go index 455215468..962187bff 100644 --- a/pkg/gui/options_map.go +++ b/pkg/gui/options_map.go @@ -5,9 +5,10 @@ import ( "strings" "github.com/jesseduffield/generics/set" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/theme" @@ -40,16 +41,16 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { globalBindings := self.c.Contexts().Global.GetKeybindings(self.c.KeybindingsOpts()) currentContextKeys := set.NewFromSlice( - lo.Map(currentContextBindings, func(binding *types.Binding, _ int) types.Key { - return binding.Key + lo.FlatMap(currentContextBindings, func(binding *types.Binding, _ int) []gocui.Key { + return binding.Keys })) allBindings := append(currentContextBindings, lo.Filter(globalBindings, func(b *types.Binding, _ int) bool { - return !currentContextKeys.Includes(b.Key) + return len(b.Keys) > 0 && !currentContextKeys.Includes(b.Keys[0]) })...) bindingsToDisplay := lo.Filter(allBindings, func(binding *types.Binding, _ int) bool { - return binding.DisplayOnScreen && !binding.IsDisabled() + return len(binding.Keys) > 0 && binding.DisplayOnScreen && !binding.IsDisabled() }) optionsMap := lo.Map(bindingsToDisplay, func(binding *types.Binding, _ int) bindingInfo { @@ -59,7 +60,7 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { } return bindingInfo{ - key: keybindings.LabelFromKey(binding.Key), + key: config.LabelForKey(binding.Keys[0]), description: binding.GetShortDescription(), style: displayStyle, } @@ -69,7 +70,7 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { if currentContext.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY { if self.c.Modes().CherryPicking.Active() { optionsMap = utils.Prepend(optionsMap, bindingInfo{ - key: keybindings.Label(self.c.KeybindingsOpts().Config.Commits.PasteCommits), + key: self.c.KeybindingsOpts().Config.Commits.PasteCommits.String(), description: self.c.Tr.PasteCommits, style: style.FgCyan, }) @@ -77,7 +78,7 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { if self.c.Model().BisectInfo.Started() { optionsMap = utils.Prepend(optionsMap, bindingInfo{ - key: keybindings.Label(self.c.KeybindingsOpts().Config.Commits.ViewBisectOptions), + key: self.c.KeybindingsOpts().Config.Commits.ViewBisectOptions.String(), description: self.c.Tr.ViewBisectOptions, style: style.FgGreen, }) @@ -87,7 +88,7 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { // Mode-specific global keybindings if state := self.c.Model().WorkingTreeStateAtLastCommitRefresh; state.Any() { optionsMap = utils.Prepend(optionsMap, bindingInfo{ - key: keybindings.Label(self.c.KeybindingsOpts().Config.Universal.CreateRebaseOptionsMenu), + key: self.c.KeybindingsOpts().Config.Universal.CreateRebaseOptionsMenu.String(), description: state.OptionsMapTitle(self.c.Tr), style: style.FgYellow, }) @@ -95,7 +96,7 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { if self.c.Git().Patch.PatchBuilder.Active() { optionsMap = utils.Prepend(optionsMap, bindingInfo{ - key: keybindings.Label(self.c.KeybindingsOpts().Config.Universal.CreatePatchOptionsMenu), + key: self.c.KeybindingsOpts().Config.Universal.CreatePatchOptionsMenu.String(), description: self.c.Tr.ViewPatchOptions, style: style.FgYellow, }) diff --git a/pkg/gui/patch_exploring/state.go b/pkg/gui/patch_exploring/state.go index 3852dc096..7222fef3b 100644 --- a/pkg/gui/patch_exploring/state.go +++ b/pkg/gui/patch_exploring/state.go @@ -4,8 +4,8 @@ import ( "strings" "github.com/jesseduffield/generics/set" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/patch" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -79,7 +79,7 @@ func NewState(diff string, selectedLineIdx int, view *gocui.View, oldState *Stat // if we have clicked from the outside to focus the main view we'll pass in a non-negative line index so that we can instantly select that line if selectedLineIdx >= 0 { // Clamp to the number of wrapped view lines; index might be out of - // bounds if a custom pager is being used which produces more lines + // bounds if a custom diff renderer is being used which produces more lines selectedLineIdx = min(selectedLineIdx, len(viewLineIndices)-1) selectMode = RANGE @@ -89,7 +89,24 @@ func NewState(diff string, selectedLineIdx int, view *gocui.View, oldState *Stat if oldState.selectMode != RANGE { selectMode = oldState.selectMode } - selectedLineIdx = viewLineIndices[patch.GetNextChangeIdx(oldState.patchLineIndices[oldState.selectedLineIdx])] + oldPatchLineIdx := oldState.patchLineIndices[oldState.selectedLineIdx] + newPatchLineIdx := patch.GetNextChangeIdx(oldPatchLineIdx) + // When staging an addition from a consecutive changes block, the unselected deletions get + // reordered to appear before the remaining additions in the new diff. This can cause the + // cursor to land on a deletion at the same patch line index where the staged addition used + // to be. In that case, skip forward past any deletions, then call GetNextChangeIdx from the + // first non-deletion position, which correctly lands on the next meaningful change. + newLines := patch.Lines() + if newPatchLineIdx == oldPatchLineIdx && + oldState.patch.Lines()[oldPatchLineIdx].IsAddition() && + newLines[newPatchLineIdx].IsDeletion() && + patch.HunkOldStartForLine(newPatchLineIdx) == oldState.patch.HunkOldStartForLine(oldPatchLineIdx) { + for newPatchLineIdx < len(newLines) && newLines[newPatchLineIdx].IsDeletion() { + newPatchLineIdx++ + } + newPatchLineIdx = patch.GetNextChangeIdx(newPatchLineIdx) + } + selectedLineIdx = viewLineIndices[newPatchLineIdx] } else { selectedLineIdx = viewLineIndices[patch.GetNextChangeIdx(0)] } diff --git a/pkg/gui/popup/popup_handler.go b/pkg/gui/popup/popup_handler.go index d8824016f..3b305a25d 100644 --- a/pkg/gui/popup/popup_handler.go +++ b/pkg/gui/popup/popup_handler.go @@ -5,24 +5,24 @@ import ( "errors" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/common" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" ) type PopupHandler struct { *common.Common - createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts) - onErrorFn func() error - popContextFn func() - currentContextFn func() types.Context - createMenuFn func(types.CreateMenuOptions) error - withWaitingStatusFn func(message string, f func(gocui.Task) error) - withWaitingStatusSyncFn func(message string, f func() error) error - toastFn func(message string, kind types.ToastKind) - getPromptInputFn func() string - inDemo func() bool + createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts) + onErrorFn func() error + popContextFn func() + currentContextFn func() types.Context + createMenuFn func(types.CreateMenuOptions) error + withWaitingStatusFn func(message string, f func(gocui.Task) error) + withWaitingStatusBlockingInputFn func(opts types.WaitingStatusOpts, f func(gocui.Task) error) + toastFn func(message string, kind types.ToastKind) + getPromptInputFn func() string + inDemo func() bool } var _ types.IPopupHandler = &PopupHandler{} @@ -35,23 +35,23 @@ func NewPopupHandler( currentContextFn func() types.Context, createMenuFn func(types.CreateMenuOptions) error, withWaitingStatusFn func(message string, f func(gocui.Task) error), - withWaitingStatusSyncFn func(message string, f func() error) error, + withWaitingStatusBlockingInputFn func(opts types.WaitingStatusOpts, f func(gocui.Task) error), toastFn func(message string, kind types.ToastKind), getPromptInputFn func() string, inDemo func() bool, ) *PopupHandler { return &PopupHandler{ - Common: common, - createPopupPanelFn: createPopupPanelFn, - onErrorFn: onErrorFn, - popContextFn: popContextFn, - currentContextFn: currentContextFn, - createMenuFn: createMenuFn, - withWaitingStatusFn: withWaitingStatusFn, - withWaitingStatusSyncFn: withWaitingStatusSyncFn, - toastFn: toastFn, - getPromptInputFn: getPromptInputFn, - inDemo: inDemo, + Common: common, + createPopupPanelFn: createPopupPanelFn, + onErrorFn: onErrorFn, + popContextFn: popContextFn, + currentContextFn: currentContextFn, + createMenuFn: createMenuFn, + withWaitingStatusFn: withWaitingStatusFn, + withWaitingStatusBlockingInputFn: withWaitingStatusBlockingInputFn, + toastFn: toastFn, + getPromptInputFn: getPromptInputFn, + inDemo: inDemo, } } @@ -76,8 +76,9 @@ func (self *PopupHandler) WithWaitingStatus(message string, f func(gocui.Task) e return nil } -func (self *PopupHandler) WithWaitingStatusSync(message string, f func() error) error { - return self.withWaitingStatusSyncFn(message, f) +func (self *PopupHandler) WithWaitingStatusBlockingInput(opts types.WaitingStatusOpts, f func(gocui.Task) error) error { + self.withWaitingStatusBlockingInputFn(opts, f) + return nil } func (self *PopupHandler) ErrorHandler(err error) error { diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go index 7a32265a2..f58f34dc6 100644 --- a/pkg/gui/presentation/branches.go +++ b/pkg/gui/presentation/branches.go @@ -6,6 +6,7 @@ import ( "strings" "time" + "github.com/gookit/color" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/config" @@ -28,6 +29,7 @@ var colorPatterns *colorMatcher func GetBranchListDisplayStrings( branches []*models.Branch, getItemOperation func(item types.HasUrn) types.ItemOperation, + prs map[string]*models.GithubPullRequest, fullDescription bool, diffName string, viewWidth int, @@ -37,7 +39,7 @@ func GetBranchListDisplayStrings( ) [][]string { return lo.Map(branches, func(branch *models.Branch, _ int) []string { diffed := branch.Name == diffName - return getBranchDisplayStrings(branch, getItemOperation(branch), fullDescription, diffed, viewWidth, tr, userConfig, worktrees, time.Now()) + return getBranchDisplayStrings(branch, getItemOperation(branch), fullDescription, diffed, viewWidth, tr, userConfig, worktrees, time.Now(), prs) }) } @@ -52,6 +54,7 @@ func getBranchDisplayStrings( userConfig *config.UserConfig, worktrees []*models.Worktree, now time.Time, + prs map[string]*models.GithubPullRequest, ) []string { checkedOutByWorkTree := git_commands.CheckedOutByOtherWorktree(b, worktrees) showCommitHash := fullDescription || userConfig.Gui.ShowBranchCommitHash @@ -63,12 +66,13 @@ func getBranchDisplayStrings( if len(divergence) > 0 { availableWidth -= utils.StringWidth(divergence) + 1 } - if icons.IsIconEnabled() { - availableWidth -= 2 // one for the icon, one for the space - } if showCommitHash { availableWidth -= utils.COMMIT_HASH_SHORT_SIZE + 1 } + if len(prs) > 0 { + // if we have PRs then we assume that at least one branch in the list has one + availableWidth -= 2 + } paddingNeededForDivergence := availableWidth displayName := b.Name @@ -136,16 +140,37 @@ func getBranchDisplayStrings( res := make([]string, 0, 6) res = append(res, recencyColor.Sprint(b.Recency)) - if icons.IsIconEnabled() { - res = append(res, nameTextStyle.Sprint(icons.IconForBranch(b))) + var coloredPrIcon string + pr, hasPr := prs[b.Name] + if hasPr && ShouldShowPrForBranch(pr, b.Name, userConfig) { + var prIcon string + if icons.IsIconEnabled() { + prIcon = icons.IconForRemoteUrl(pr.Url) + } else { + prIcon = "●" + } + coloredPrIcon = WithPrColor(pr.State, prIcon, false) + if pr.State == "OPEN" { + icon, _, textStyle := checksStatePresentation(pr.ChecksState, tr) + if icon != "" { + coloredPrIcon = textStyle.Sprint(icon) + } + } } + res = append(res, coloredPrIcon) if showCommitHash { res = append(res, utils.ShortHash(b.CommitHash)) } if divergence != "" { - paddingNeededForDivergence -= utils.StringWidth(utils.Decolorise(coloredName)) - 1 + if fullDescription { + // don't right-align the divergence in half or full screen mode, since other fields + // follow in that case and we don't know the width of our column + paddingNeededForDivergence = 1 + } else { + paddingNeededForDivergence -= utils.StringWidth(utils.Decolorise(coloredName)) - 1 + } if paddingNeededForDivergence > 0 { coloredName += strings.Repeat(" ", paddingNeededForDivergence) coloredName += style.FgCyan.Sprint(divergence) @@ -252,3 +277,101 @@ func SetCustomBranches(customBranchColors map[string]string, isRegex bool) { isRegex: isRegex, } } + +func WithPrColor(state string, text string, isBg bool) string { + switch state { + case "OPEN": + return color.RGB(0x43, 0x84, 0x40, isBg).Sprint(text) + case "CLOSED": + return color.RGB(0xC9, 0x45, 0x3C, isBg).Sprint(text) + case "MERGED": + return color.RGB(0x82, 0x59, 0xDD, isBg).Sprint(text) + case "DRAFT": + return color.RGB(0x67, 0x6C, 0x75, isBg).Sprint(text) + default: + return lo.Ternary(isBg, style.BgDefault, style.FgDefault).Sprint(text) + } +} + +func FormatPullRequestHeader(pr *models.GithubPullRequest, tr *i18n.TranslationSet) string { + icon := lo.Ternary(icons.IsIconEnabled(), icons.IconForRemoteUrl(pr.Url)+" ", "") + stateText := coloredPullRequestStateText(pr.State) + checksStateText := coloredChecksStateText(pr.ChecksState, tr) + numberText := style.FgCyan.Sprintf("#%d", pr.Number) + + // The checks status links to the checks tab, so it needs to be its own + // hyperlink separate from the rest of the header. + parts := []string{style.PrintHyperlink(icon+stateText, pr.Url)} + if checksStateText != "" { + parts = append(parts, style.PrintHyperlink(checksStateText, strings.TrimSuffix(pr.Url, "/")+"/checks")) + } + parts = append(parts, style.PrintHyperlink(fmt.Sprintf("%s %s\n", pr.Title, numberText), pr.Url)) + + return strings.Join(parts, " ") +} + +func pullRequestStateText(state string) string { + var icon, label string + switch state { + case "OPEN": + icon, label = " ", "Open" + case "CLOSED": + icon, label = " ", "Closed" + case "MERGED": + icon, label = " ", "Merged" + case "DRAFT": + icon, label = " ", "Draft" + default: + return "" + } + if icons.IsIconEnabled() { + return icon + label + } + return label +} + +func coloredPullRequestStateText(state string) string { + if icons.IsIconEnabled() { + return fmt.Sprintf("%s%s%s", + WithPrColor(state, "", false), + WithPrColor(state, color.RGB(0xFF, 0xFF, 0xFF, false).Sprint(pullRequestStateText(state)), true), + WithPrColor(state, "", false)) + } + + return WithPrColor(state, pullRequestStateText(state), false) +} + +func checksStatePresentation(state string, tr *i18n.TranslationSet) (string, string, style.TextStyle) { + switch state { + case "SUCCESS": + return "✓", tr.PullRequestChecksPassing, style.FgGreen + case "PENDING": + return "●", tr.PullRequestChecksPending, style.FgYellow + case "FAILURE": + return "✗", tr.PullRequestChecksFailing, style.FgRed + case "ERROR": + return "!", tr.PullRequestChecksError, style.FgRed + case "EXPECTED": + return "○", tr.PullRequestChecksExpected, style.FgDefault + default: + return "", "", style.Nothing + } +} + +func coloredChecksStateText(state string, tr *i18n.TranslationSet) string { + icon, text, textStyle := checksStatePresentation(state, tr) + if text != "" { + return textStyle.Sprintf("%s %s", icon, text) + } + return "" +} + +func ShouldShowPrForBranch(pr *models.GithubPullRequest, branchName string, userConfig *config.UserConfig) bool { + if !lo.Contains(userConfig.Git.MainBranches, branchName) { + return true + } + + // For main branches we only want to show the PR if it's open (or draft), on the assumption that a + // closed PR for a main branch is always a mistake. + return pr.State != "CLOSED" && pr.State != "MERGED" +} diff --git a/pkg/gui/presentation/branches_test.go b/pkg/gui/presentation/branches_test.go index 8c646e7d7..3d83ca0ba 100644 --- a/pkg/gui/presentation/branches_test.go +++ b/pkg/gui/presentation/branches_test.go @@ -10,7 +10,9 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/gui/presentation/icons" + "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/samber/lo" "github.com/stretchr/testify/assert" "github.com/xo/terminfo" @@ -22,6 +24,84 @@ func makeAtomic(v int32) *atomic.Int32 { return &result } +func TestFormatPullRequestHeader(t *testing.T) { + oldColorLevel := color.ForceSetColorLevel(terminfo.ColorLevelNone) + defer color.ForceSetColorLevel(oldColorLevel) + icons.SetNerdFontsVersion("") + + pr := &models.GithubPullRequest{ + Title: "Improve checks", + Number: 5871, + State: "OPEN", + ChecksState: "SUCCESS", + Url: "https://github.com/jesseduffield/lazygit/pull/5871", + } + numberText := style.FgCyan.Sprint("#5871") + tr := i18n.EnglishTranslationSet() + + t.Run("links checks separately from the rest of the header", func(t *testing.T) { + actual := FormatPullRequestHeader(pr, tr) + + expected := style.PrintHyperlink("Open", pr.Url) + + " " + + style.PrintHyperlink("✓ Passing", pr.Url+"/checks") + + " " + + style.PrintHyperlink("Improve checks "+numberText+"\n", pr.Url) + assert.Equal(t, expected, actual) + }) + + t.Run("leaves the separator unlinked when checks are unavailable", func(t *testing.T) { + prWithoutChecks := *pr + prWithoutChecks.ChecksState = "" + + actual := FormatPullRequestHeader(&prWithoutChecks, tr) + + expected := style.PrintHyperlink("Open", pr.Url) + + " " + + style.PrintHyperlink("Improve checks "+numberText+"\n", pr.Url) + assert.Equal(t, expected, actual) + }) + + t.Run("avoids a double slash in the checks URL", func(t *testing.T) { + prWithTrailingSlash := *pr + prWithTrailingSlash.Url += "/" + + actual := FormatPullRequestHeader(&prWithTrailingSlash, tr) + + assert.Contains(t, actual, "https://github.com/jesseduffield/lazygit/pull/5871/checks") + assert.NotContains(t, actual, "pull/5871//checks") + }) +} + +func TestChecksStatePresentation(t *testing.T) { + tr := i18n.EnglishTranslationSet() + testCases := []struct { + name string + state string + expectedIcon string + expectedText string + expectedStyle style.TextStyle + }{ + {name: "success", state: "SUCCESS", expectedIcon: "✓", expectedText: "Passing", expectedStyle: style.FgGreen}, + {name: "pending", state: "PENDING", expectedIcon: "●", expectedText: "Pending", expectedStyle: style.FgYellow}, + {name: "failure", state: "FAILURE", expectedIcon: "✗", expectedText: "Failing", expectedStyle: style.FgRed}, + {name: "error", state: "ERROR", expectedIcon: "!", expectedText: "Error", expectedStyle: style.FgRed}, + {name: "expected", state: "EXPECTED", expectedIcon: "○", expectedText: "Expected", expectedStyle: style.FgDefault}, + {name: "empty", state: "", expectedIcon: "", expectedText: "", expectedStyle: style.Nothing}, + {name: "unknown", state: "FUTURE_STATE", expectedIcon: "", expectedText: "", expectedStyle: style.Nothing}, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + icon, text, textStyle := checksStatePresentation(testCase.state, tr) + + assert.Equal(t, testCase.expectedIcon, icon) + assert.Equal(t, testCase.expectedText, text) + assert.Equal(t, testCase.expectedStyle, textStyle) + }) + } +} + func Test_getBranchDisplayStrings(t *testing.T) { scenarios := []struct { branch *models.Branch @@ -42,7 +122,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "branch_name"}, + expected: []string{"1m", "", "branch_name"}, }, { branch: &models.Branch{Name: "🍉_special_char", Recency: "1m"}, @@ -52,7 +132,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "🍉_special_char"}, + expected: []string{"1m", "", "🍉_special_char"}, }, { branch: &models.Branch{Name: "branch_name", Recency: "1m"}, @@ -62,7 +142,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: true, showDivergenceCfg: "none", - expected: []string{"1m", "branch_name (worktree other-worktree)"}, + expected: []string{"1m", "", "branch_name (worktree other-worktree)"}, }, { branch: &models.Branch{Name: "branch_name", Recency: "1m"}, @@ -72,7 +152,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: true, checkedOutByWorktree: true, showDivergenceCfg: "none", - expected: []string{"1m", "󰘬", "branch_name (󰌹 other-worktree)"}, + expected: []string{"1m", "", "branch_name (󰌹 other-worktree)"}, }, { branch: &models.Branch{ @@ -88,7 +168,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "branch_name ✓"}, + expected: []string{"1m", "", "branch_name ✓"}, }, { branch: &models.Branch{ @@ -104,7 +184,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: true, showDivergenceCfg: "none", - expected: []string{"1m", "branch_name (worktree other-worktree) ↓5↑3"}, + expected: []string{"1m", "", "branch_name (worktree other-worktree) ↓5↑3"}, }, { branch: &models.Branch{ @@ -118,7 +198,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "onlyArrow", - expected: []string{"1m", "branch_name ↓"}, + expected: []string{"1m", "", "branch_name ↓"}, }, { branch: &models.Branch{ @@ -135,7 +215,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "arrowAndNumber", - expected: []string{"1m", "branch_name ✓ ↓2"}, + expected: []string{"1m", "", "branch_name ✓ ↓2"}, }, { branch: &models.Branch{ @@ -152,7 +232,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "arrowAndNumber", - expected: []string{"1m", "branch_name ↓5↑3 ↓2"}, + expected: []string{"1m", "", "branch_name ↓5↑3 ↓2"}, }, { branch: &models.Branch{Name: "branch_name", Recency: "1m"}, @@ -162,7 +242,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "branch_name Pushing |"}, + expected: []string{"1m", "", "branch_name Pushing ●∙∙"}, }, { branch: &models.Branch{ @@ -181,7 +261,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "12345678", "branch_name ✓", "origin branch_name", "commit title"}, + expected: []string{"1m", "", "12345678", "branch_name ✓", "origin branch_name", "commit title"}, }, // Now tests for how we truncate the branch name when there's not enough room: @@ -193,7 +273,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "branch_na…"}, + expected: []string{"1m", "", "branch_na…"}, }, { branch: &models.Branch{Name: "🍉_special_char", Recency: "1m"}, @@ -203,7 +283,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "🍉_special_ch…"}, + expected: []string{"1m", "", "🍉_special_ch…"}, }, { branch: &models.Branch{Name: "branch_name", Recency: "1m"}, @@ -213,17 +293,17 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: true, showDivergenceCfg: "none", - expected: []string{"1m", "bra… (worktree)"}, + expected: []string{"1m", "", "bra… (worktree)"}, }, { branch: &models.Branch{Name: "branch_name", Recency: "1m"}, itemOperation: types.ItemOperationNone, fullDescription: false, - viewWidth: 14, + viewWidth: 12, useIcons: true, checkedOutByWorktree: true, showDivergenceCfg: "none", - expected: []string{"1m", "󰘬", "branc… 󰌹"}, + expected: []string{"1m", "", "branc… 󰌹"}, }, { branch: &models.Branch{ @@ -239,7 +319,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "branch_… ✓"}, + expected: []string{"1m", "", "branch_… ✓"}, }, { branch: &models.Branch{ @@ -256,7 +336,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "arrowAndNumber", - expected: []string{"1m", "branch_n… ↓5↑3 ↓4"}, + expected: []string{"1m", "", "branch_n… ↓5↑3 ↓4"}, }, { branch: &models.Branch{ @@ -272,7 +352,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: true, showDivergenceCfg: "none", - expected: []string{"1m", "branch_na… (worktree) ↓5↑3"}, + expected: []string{"1m", "", "branch_na… (worktree) ↓5↑3"}, }, { branch: &models.Branch{Name: "branch_name", Recency: "1m"}, @@ -282,7 +362,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "branc… Pushing |"}, + expected: []string{"1m", "", "bra… Pushing ●∙∙"}, }, { branch: &models.Branch{Name: "abc", Recency: "1m"}, @@ -292,7 +372,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "abc Pushing |"}, + expected: []string{"1m", "", "abc Pushing ●∙∙"}, }, { branch: &models.Branch{Name: "ab", Recency: "1m"}, @@ -302,7 +382,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "ab Pushing |"}, + expected: []string{"1m", "", "ab Pushing ●∙∙"}, }, { branch: &models.Branch{Name: "a", Recency: "1m"}, @@ -312,7 +392,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "a Pushing |"}, + expected: []string{"1m", "", "a Pushing ●∙∙"}, }, { branch: &models.Branch{ @@ -331,7 +411,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "12345678", "bran… ✓", "origin branch_name", "commit title"}, + expected: []string{"1m", "", "12345678", "bran… ✓", "origin branch_name", "commit title"}, }, } @@ -351,7 +431,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { } t.Run(fmt.Sprintf("getBranchDisplayStrings_%d", i), func(t *testing.T) { - strings := getBranchDisplayStrings(s.branch, s.itemOperation, s.fullDescription, false, s.viewWidth, c.Tr, c.UserConfig(), worktrees, time.Time{}) + strings := getBranchDisplayStrings(s.branch, s.itemOperation, s.fullDescription, false, s.viewWidth, c.Tr, c.UserConfig(), worktrees, time.Time{}, map[string]*models.GithubPullRequest{}) assert.Equal(t, s.expected, strings) }) } diff --git a/pkg/gui/presentation/commits_test.go b/pkg/gui/presentation/commits_test.go index 1536d420a..12e0fc1d6 100644 --- a/pkg/gui/presentation/commits_test.go +++ b/pkg/gui/presentation/commits_test.go @@ -1,7 +1,6 @@ package presentation import ( - "os" "strings" "testing" "time" @@ -203,11 +202,11 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - hash1 ⏣─╮ commit1 - hash2 ◯ │ commit2 - hash3 ◯─╯ commit3 - hash4 ◯ commit4 - hash5 ◯ commit5 + hash1 ◎─╮ commit1 + hash2 ○ │ commit2 + hash3 ○─╯ commit3 + hash4 ○ commit4 + hash5 ○ commit5 `), }, { @@ -228,9 +227,9 @@ func TestGetCommitListDisplayStrings(t *testing.T) { expected: formatExpected(` hash1 pick commit1 hash2 pick commit2 - hash3 ◯ commit3 - hash4 ◯ commit4 - hash5 ◯ commit5 + hash3 ○ commit3 + hash4 ○ commit4 + hash5 ○ commit5 `), }, { @@ -250,9 +249,9 @@ func TestGetCommitListDisplayStrings(t *testing.T) { now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash2 pick commit2 - hash3 ◯ commit3 - hash4 ◯ commit4 - hash5 ◯ commit5 + hash3 ○ commit3 + hash4 ○ commit4 + hash5 ○ commit5 `), }, { @@ -271,8 +270,8 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - hash4 ◯ commit4 - hash5 ◯ commit5 + hash4 ○ commit4 + hash5 ○ commit5 `), }, { @@ -311,7 +310,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - hash5 ◯ commit5 + hash5 ○ commit5 `), }, { @@ -353,14 +352,14 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↓ hash1r ◯ commit1 - ↓ hash2r ⏣─╮ commit2 - ↓ hash3r ◯ │ commit3 - ↑ hash1l ◯ commit1 - ↑ hash2l ⏣─╮ commit2 - ↑ hash3l ◯ │ commit3 - ↑ hash4l ◯─╯ commit4 - ↑ hash5l ◯ commit5 + ↓ hash1r ○ commit1 + ↓ hash2r ◎─╮ commit2 + ↓ hash3r ○ │ commit3 + ↑ hash1l ○ commit1 + ↑ hash2l ◎─╮ commit2 + ↑ hash3l ○ │ commit3 + ↑ hash4l ○─╯ commit4 + ↑ hash5l ○ commit5 `), }, { @@ -382,12 +381,12 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↓ hash3r ◯ │ commit3 - ↑ hash1l ◯ commit1 - ↑ hash2l ⏣─╮ commit2 - ↑ hash3l ◯ │ commit3 - ↑ hash4l ◯─╯ commit4 - ↑ hash5l ◯ commit5 + ↓ hash3r ○ │ commit3 + ↑ hash1l ○ commit1 + ↑ hash2l ◎─╮ commit2 + ↑ hash3l ○ │ commit3 + ↑ hash4l ○─╯ commit4 + ↑ hash5l ○ commit5 `), }, { @@ -409,11 +408,11 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↓ hash1r ◯ commit1 - ↓ hash2r ⏣─╮ commit2 - ↓ hash3r ◯ │ commit3 - ↑ hash1l ◯ commit1 - ↑ hash2l ⏣─╮ commit2 + ↓ hash1r ○ commit1 + ↓ hash2r ◎─╮ commit2 + ↓ hash3r ○ │ commit3 + ↑ hash1l ○ commit1 + ↑ hash2l ◎─╮ commit2 `), }, { @@ -435,10 +434,10 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↑ hash2l ⏣─╮ commit2 - ↑ hash3l ◯ │ commit3 - ↑ hash4l ◯─╯ commit4 - ↑ hash5l ◯ commit5 + ↑ hash2l ◎─╮ commit2 + ↑ hash3l ○ │ commit3 + ↑ hash4l ○─╯ commit4 + ↑ hash5l ○ commit5 `), }, { @@ -460,8 +459,8 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↓ hash1r ◯ commit1 - ↓ hash2r ⏣─╮ commit2 + ↓ hash1r ○ commit1 + ↓ hash2r ◎─╮ commit2 `), }, { @@ -480,11 +479,11 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↑ hash1l ◯ commit1 - ↑ hash2l ⏣─╮ commit2 - ↑ hash3l ◯ │ commit3 - ↑ hash4l ◯─╯ commit4 - ↑ hash5l ◯ commit5 + ↑ hash1l ○ commit1 + ↑ hash2l ◎─╮ commit2 + ↑ hash3l ○ │ commit3 + ↑ hash4l ○─╯ commit4 + ↑ hash5l ○ commit5 `), }, { @@ -501,9 +500,9 @@ func TestGetCommitListDisplayStrings(t *testing.T) { cherryPickedCommitHashSet: set.New[string](), now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` - ↓ hash1r ◯ commit1 - ↓ hash2r ⏣─╮ commit2 - ↓ hash3r ◯ │ commit3 + ↓ hash1r ○ commit1 + ↓ hash2r ◎─╮ commit2 + ↓ hash3r ○ │ commit3 `), }, { @@ -531,8 +530,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { oldColorLevel := color.ForceSetColorLevel(terminfo.ColorLevelNone) defer color.ForceSetColorLevel(oldColorLevel) - os.Setenv("TZ", "UTC") - focusing := false for _, scenario := range scenarios { if scenario.focus { diff --git a/pkg/gui/presentation/files.go b/pkg/gui/presentation/files.go index cc0a93889..534229905 100644 --- a/pkg/gui/presentation/files.go +++ b/pkg/gui/presentation/files.go @@ -328,7 +328,8 @@ func fileNameAtDepth(node *filetree.Node[models.File], depth int, showRootItem b func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) string { splitName := split(node.GetInternalPath()) - if depth == 0 && splitName[0] == "." { + showRootItem := splitName[0] == "." + if depth == 0 && showRootItem { if len(splitName) == 1 { return "/" } @@ -336,6 +337,20 @@ func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) st } name := join(splitName[depth:]) + if node.File != nil && node.File.IsRename() { + splitPrevName := filetree.SplitFileTreePath(node.File.PreviousPath, showRootItem) + + prevName := node.File.PreviousPath + // if the file has just been renamed inside the same directory, we can shave off + // the prefix for the previous path too. Otherwise we'll keep it unchanged + sameParentDir := len(splitName) == len(splitPrevName) && join(splitName[0:depth]) == join(splitPrevName[0:depth]) + if sameParentDir { + prevName = join(splitPrevName[depth:]) + } + + return prevName + " → " + name + } + return name } diff --git a/pkg/gui/presentation/files_test.go b/pkg/gui/presentation/files_test.go index a5b01c156..c7e333682 100644 --- a/pkg/gui/presentation/files_test.go +++ b/pkg/gui/presentation/files_test.go @@ -151,6 +151,14 @@ func TestRenderCommitFileTree(t *testing.T) { showRootItem: true, expected: []string{"A test"}, }, + { + name: "renamed file", + files: []*models.CommitFile{ + {Path: "new.txt", PreviousPath: "old.txt", ChangeStatus: "R"}, + }, + showRootItem: false, + expected: []string{"R old.txt → new.txt"}, + }, { name: "big example", files: []*models.CommitFile{ @@ -219,7 +227,7 @@ M file1 } patchBuilder := patch.NewPatchBuilder( utils.NewDummyLog(), - func(from string, to string, reverse bool, filename string, plain bool) (string, error) { + func(from string, to string, reverse bool, filename string, previousPath string, plain bool) (string, error) { return "", nil }, ) diff --git a/pkg/gui/presentation/graph/cell.go b/pkg/gui/presentation/graph/cell.go index be039a018..618a2149d 100644 --- a/pkg/gui/presentation/graph/cell.go +++ b/pkg/gui/presentation/graph/cell.go @@ -9,8 +9,8 @@ import ( ) const ( - MergeSymbol = '⏣' - CommitSymbol = '◯' + MergeSymbol = '◎' + CommitSymbol = '○' ) type cellType int diff --git a/pkg/gui/presentation/graph/graph_test.go b/pkg/gui/presentation/graph/graph_test.go index a756f8aa4..f0cafca1c 100644 --- a/pkg/gui/presentation/graph/graph_test.go +++ b/pkg/gui/presentation/graph/graph_test.go @@ -41,20 +41,20 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "D", Parents: []string{"G"}}, }, expectedOutput: ` - 1 ◯ - 2 ◯ - 3 ◯ - 4 ⏣─╮ - 7 │ ◯ - 5 ◯─╯ - 8 ◯ - 9 ⏣─╮ - B │ ◯ - D │ ◯ - A ◯ │ - E ◯ │ - F ◯ │ - D ◯─╯`, + 1 ○ + 2 ○ + 3 ○ + 4 ◎─╮ + 7 │ ○ + 5 ○─╯ + 8 ○ + 9 ◎─╮ + B │ ○ + D │ ○ + A ○ │ + E ○ │ + F ○ │ + D ○─╯`, }, { name: "with a path that has room to move to the left", @@ -67,12 +67,12 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "6", Parents: []string{"7"}}, }, expectedOutput: ` - 1 ◯ - 2 ⏣─╮ - 4 │ ⏣─╮ - 3 ◯─╯ │ - 5 ◯───╯ - 6 ◯`, + 1 ○ + 2 ◎─╮ + 4 │ ◎─╮ + 3 ○─╯ │ + 5 ○───╯ + 6 ○`, }, { name: "with a new commit", @@ -86,13 +86,13 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "6", Parents: []string{"7"}}, }, expectedOutput: ` - 1 ◯ - 2 ⏣─╮ - 4 │ ⏣─╮ - Z │ │ │ ◯ - 3 ◯─╯ │ │ - 5 ◯───╯ │ - 6 ◯ ╭───╯`, + 1 ○ + 2 ◎─╮ + 4 │ ◎─╮ + Z │ │ │ ○ + 3 ○─╯ │ │ + 5 ○───╯ │ + 6 ○ ╭───╯`, }, { name: "with a path that has room to move to the left and continues", @@ -105,12 +105,12 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "7", Parents: []string{"11"}}, }, expectedOutput: ` - 1 ◯ - 2 ⏣─╮ - 3 ⏣─│─╮ - 5 ⏣─│─│─╮ - 4 │ ◯─╯ │ - 7 ◯─╯ ╭─╯`, + 1 ○ + 2 ◎─╮ + 3 ◎─│─╮ + 5 ◎─│─│─╮ + 4 │ ○─╯ │ + 7 ○─╯ ╭─╯`, }, { name: "with a path that has room to move to the left and continues", @@ -124,13 +124,13 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "B", Parents: []string{"C"}}, }, expectedOutput: ` - 1 ◯ - 2 ⏣─╮ - 3 ⏣─│─╮ - 5 ⏣─│─│─╮ - 7 ⏣─│─│─│─╮ - 4 ◯─┴─╯ │ │ - B ◯ ╭───╯ │`, + 1 ○ + 2 ◎─╮ + 3 ◎─│─╮ + 5 ◎─│─│─╮ + 7 ◎─│─│─│─╮ + 4 ○─┴─╯ │ │ + B ○ ╭───╯ │`, }, { name: "with a path that has room to move to the left and continues", @@ -142,11 +142,11 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "6", Parents: []string{"8"}}, }, expectedOutput: ` - 1 ⏣─╮ - 3 │ ◯ - 2 ⏣─│ - 4 ⏣─│─╮ - 6 ◯ │ │`, + 1 ◎─╮ + 3 │ ○ + 2 ◎─│ + 4 ◎─│─╮ + 6 ○ │ │`, }, { name: "new merge path fills gap before continuing path on right", @@ -158,11 +158,11 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "B", Parents: []string{"C"}}, }, expectedOutput: ` - 1 ⏣─┬─┬─╮ - 4 │ │ ◯ │ - 2 ◯─│─╯ │ - A ⏣─│─╮ │ - B │ │ ◯ │`, + 1 ◎─┬─┬─╮ + 4 │ │ ○ │ + 2 ○─│─╯ │ + A ◎─│─╮ │ + B │ │ ○ │`, }, { name: "with a path that has room to move to the left and continues", @@ -177,14 +177,14 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "C", Parents: []string{"D"}}, }, expectedOutput: ` - 1 ◯ - 2 ⏣─╮ - 3 ⏣─│─╮ - 5 ⏣─│─│─╮ - 7 ⏣─│─│─│─╮ - 4 ◯─┴─╯ │ │ - B ◯ ╭───╯ │ - C ◯ │ ╭───╯`, + 1 ○ + 2 ◎─╮ + 3 ◎─│─╮ + 5 ◎─│─│─╮ + 7 ◎─│─│─│─╮ + 4 ○─┴─╯ │ │ + B ○ ╭───╯ │ + C ○ │ ╭───╯`, }, { name: "with a path that has room to move to the left and continues", @@ -201,16 +201,16 @@ func TestRenderCommitGraph(t *testing.T) { {Hash: "D", Parents: []string{"F"}}, }, expectedOutput: ` - 1 ◯ - 2 ⏣─╮ - 3 ⏣─│─╮ - 5 ⏣─│─│─╮ - 7 ⏣─│─│─│─╮ - 8 ⏣─│─│─│─│─╮ - 4 ◯─┴─╯ │ │ │ - B ◯ ╭───╯ │ │ - C ◯ │ ╭───╯ │ - D ◯ │ │ ╭───╯`, + 1 ○ + 2 ◎─╮ + 3 ◎─│─╮ + 5 ◎─│─│─╮ + 7 ◎─│─│─│─╮ + 8 ◎─│─│─│─│─╮ + 4 ○─┴─╯ │ │ │ + B ○ ╭───╯ │ │ + C ○ │ ╭───╯ │ + D ○ │ │ ╭───╯`, }, } @@ -274,7 +274,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 0, fromHash: pool("b"), toHash: pool("c"), kind: STARTS, style: &green}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a"}), - expectedStr: "◯", + expectedStr: "○", expectedStyles: []style.TextStyle{green}, }, { @@ -284,7 +284,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 0, fromHash: pool("selected"), toHash: pool("c"), kind: STARTS, style: &green}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a"}), - expectedStr: "◯", + expectedStr: "○", expectedStyles: []style.TextStyle{highlightStyle}, }, { @@ -296,7 +296,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 1, fromHash: pool("selected"), toHash: pool("e"), kind: STARTS, style: &green}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a"}), - expectedStr: "⏣─╮", + expectedStr: "◎─╮", expectedStyles: []style.TextStyle{ highlightStyle, highlightStyle, highlightStyle, }, @@ -310,7 +310,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 1, fromHash: pool("b"), toHash: pool("e"), kind: STARTS, style: &green}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a"}), - expectedStr: "⏣─│", + expectedStr: "◎─│", expectedStyles: []style.TextStyle{ green, green, magenta, }, @@ -325,7 +325,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 2, fromHash: pool("a2"), toHash: pool("c3"), kind: STARTS, style: &yellow}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a1"}), - expectedStr: "⏣─│─┬─╯", + expectedStr: "◎─│─┬─╯", expectedStyles: []style.TextStyle{ yellow, yellow, magenta, yellow, yellow, green, green, }, @@ -340,7 +340,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 2, fromHash: pool("selected"), toHash: pool("c3"), kind: STARTS, style: &yellow}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a1"}), - expectedStr: "⏣───╮ ╯", + expectedStr: "◎───╮ ╯", expectedStyles: []style.TextStyle{ highlightStyle, highlightStyle, highlightStyle, highlightStyle, highlightStyle, nothing, green, }, @@ -354,7 +354,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 2, toPos: 0, fromHash: pool("c1"), toHash: pool("a2"), kind: TERMINATES, style: &green}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a1"}), - expectedStr: "◯─┴─╯", + expectedStr: "○─┴─╯", expectedStyles: []style.TextStyle{ yellow, magenta, magenta, green, green, }, @@ -369,7 +369,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 2, toPos: 2, fromHash: pool("c1"), toHash: pool("c3"), kind: CONTINUES, style: &green}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a1"}), - expectedStr: "⏣─│─│─╮", + expectedStr: "◎─│─│─╮", expectedStyles: []style.TextStyle{ yellow, yellow, magenta, yellow, green, yellow, yellow, }, @@ -384,7 +384,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 2, toPos: 0, fromHash: pool("c1"), toHash: pool("a2"), kind: TERMINATES, style: &magenta}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a1"}), - expectedStr: "⏣─│─╯", + expectedStr: "◎─│─╯", expectedStyles: []style.TextStyle{ yellow, yellow, green, magenta, magenta, }, @@ -399,7 +399,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 3, toPos: 0, fromHash: pool("d1"), toHash: pool("a2"), kind: TERMINATES, style: &magenta}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "a1"}), - expectedStr: "⏣─┬─│─╯", + expectedStr: "◎─┬─│─╯", expectedStyles: []style.TextStyle{ yellow, yellow, yellow, magenta, green, magenta, magenta, }, @@ -411,7 +411,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 0, toPos: 0, fromHash: pool("a2"), toHash: pool("a3"), kind: STARTS, style: &yellow}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "selected"}), - expectedStr: "◯", + expectedStr: "○", expectedStyles: []style.TextStyle{ yellow, }, @@ -423,7 +423,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 1, toPos: 1, fromHash: pool("selected"), toHash: pool("b3"), kind: CONTINUES, style: &red}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "selected"}), - expectedStr: "◯ │", + expectedStr: "○ │", expectedStyles: []style.TextStyle{ highlightStyle, nothing, highlightStyle, }, @@ -436,7 +436,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 2, toPos: 2, fromHash: pool("selected"), toHash: pool("b3"), kind: CONTINUES, style: &red}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "selected"}), - expectedStr: "◯ │ │", + expectedStr: "○ │ │", expectedStyles: []style.TextStyle{ highlightStyle, nothing, green, nothing, highlightStyle, }, @@ -450,7 +450,7 @@ func TestRenderPipeSet(t *testing.T) { {fromPos: 1, toPos: 0, fromHash: pool("selected"), toHash: pool("a2"), kind: TERMINATES, style: &yellow}, }, prevCommit: models.NewCommit(hashPool, models.NewCommitOpts{Hash: "selected"}), - expectedStr: "⏣─╯", + expectedStr: "◎─╯", expectedStyles: []style.TextStyle{ highlightStyle, highlightStyle, highlightStyle, }, diff --git a/pkg/gui/presentation/icons/git_icons.go b/pkg/gui/presentation/icons/git_icons.go index 23b7d8787..af292b380 100644 --- a/pkg/gui/presentation/icons/git_icons.go +++ b/pkg/gui/presentation/icons/git_icons.go @@ -79,6 +79,15 @@ func IconForRemote(remote *models.Remote) string { return DEFAULT_REMOTE_ICON } +func IconForRemoteUrl(url string) string { + for domain, icon := range remoteIcons { + if strings.Contains(url, domain) { + return icon + } + } + return DEFAULT_REMOTE_ICON +} + func IconForStash(stash *models.StashEntry) string { return STASH_ICON } diff --git a/pkg/gui/pty.go b/pkg/gui/pty.go index 66bb355f2..fb7ba352e 100644 --- a/pkg/gui/pty.go +++ b/pkg/gui/pty.go @@ -1,35 +1,38 @@ -//go:build !windows - package gui import ( + "fmt" "io" "os" "os/exec" + "path/filepath" + "runtime" "strings" - "github.com/creack/pty" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" + "github.com/jesseduffield/lazygit/pkg/tasks" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) -func (gui *Gui) desiredPtySize(view *gocui.View) *pty.Winsize { +func (gui *Gui) desiredPtySize(view *gocui.View) (cols, rows uint16) { width, height := view.InnerSize() - - return &pty.Winsize{Cols: uint16(width), Rows: uint16(height)} + return uint16(width), uint16(height) } func (gui *Gui) onResize() error { gui.Mutexes.PtyMutex.Lock() defer gui.Mutexes.PtyMutex.Unlock() - for viewName, ptmx := range gui.viewPtmxMap { + for viewName, p := range gui.viewPtmxMap { // TODO: handle resizing properly: we need to actually clear the main view // and re-read the output from our pty. Or we could just re-run the original // command from scratch view, _ := gui.g.View(viewName) - if err := pty.Setsize(ptmx, gui.desiredPtySize(view)); err != nil { + cols, rows := gui.desiredPtySize(view) + if err := p.Resize(cols, rows); err != nil { return utils.WrapError(err) } } @@ -37,33 +40,58 @@ func (gui *Gui) onResize() error { return nil } +// ptyCmd adapts an oscommands.StartedPty result into the tasks.Cmd shape. +// On Windows the original *exec.Cmd was never Start()ed, so we go through +// the explicit Process handle rather than cmd.Process. +type ptyCmd struct { + cmd *exec.Cmd + process *os.Process + wait func() error +} + +func (p ptyCmd) Wait() error { return p.wait() } +func (p ptyCmd) String() string { return p.cmd.String() } +func (p ptyCmd) Terminate() error { return oscommands.TerminateProcessGracefully(p.process) } + // Some commands need to output for a terminal to active certain behaviour. -// For example, git won't invoke the GIT_PAGER env var unless it thinks it's +// For example, git won't invoke the GIT_PAGER env var unless it thinks it's // talking to a terminal. We typically write cmd outputs straight to a view, // which is just an io.Reader. the pty package lets us wrap a command in a // pseudo-terminal meaning we'll get the behaviour we want from the underlying // command. func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error { width := view.InnerWidth() - pager := gui.stateAccessor.GetPagerConfig().GetPagerCommand(width) - externalDiffCommand := gui.stateAccessor.GetPagerConfig().GetExternalDiffCommand() - useExtDiffGitConfig := gui.stateAccessor.GetPagerConfig().GetUseExternalDiffGitConfig() - if pager == "" && externalDiffCommand == "" && !useExtDiffGitConfig { - // If we're not using a custom pager nor external diff command, then we don't need to use a pty + // Set LAZYGIT_COLUMNS for diff renderer scripts that can't query the terminal width directly. + cmd.Env = append(cmd.Env, fmt.Sprintf("LAZYGIT_COLUMNS=%d", width)) + + if gui.stateAccessor.GetDiffRendererConfigManager().GetDiffRendererType() == config.DiffRendererType_RawGit { + // If we're not using a custom diff renderer, then we don't need to use a pty return gui.newCmdTask(view, cmd, prefix) } + cmd.Args = withPtyGitConfig(cmd.Args, runtime.GOOS) + + // Mark the view as loading synchronously now, before the layout pass: the + // actual task is created in afterLayout (below), which runs after layout, so + // without this the next layout pass would clamp the scroll position to the + // not-yet-loaded content. + gui.getManager(view).StartLoading() + // Hold the scrollbar at its current height while the re-render loads, so the + // thumb doesn't shrink and snap back when the first partial paint swaps in + // (see the matching call in newCmdTask). + view.FreezeScrollbarHeight() + // Run the pty after layout so that it gets the correct size gui.afterLayout(func() error { - // Need to get the width and the pager again because the layout might have + // Need to get the width and the pager command again because the layout might have // changed the size of the view width = view.InnerWidth() - pager := gui.stateAccessor.GetPagerConfig().GetPagerCommand(width) + pager := gui.stateAccessor.GetDiffRendererConfigManager().GetStdinFilterCommand(width) cmdStr := strings.Join(cmd.Args, " ") - // This communicates to pagers that we're in a very simple + // This communicates to diff renderers that we're in a very simple // terminal that they should not expect to have much capabilities. // Moving the cursor, clearing the screen, or querying for colors are among such "advanced" capabilities. // Context: https://github.com/jesseduffield/lazygit/issues/3419 @@ -74,24 +102,46 @@ func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error manager := gui.getManager(view) - var ptmx *os.File - start := func() (*exec.Cmd, io.Reader) { - var err error - ptmx, err = pty.StartWithSize(cmd, gui.desiredPtySize(view)) + // Size the pty from the view's dimensions here, on the UI thread; the + // start func below runs on the task's goroutine, which must not read the + // view's live dimensions while the UI thread is laying it out. + cols, rows := gui.desiredPtySize(view) + + var p oscommands.Pty + var fallbackPipe io.ReadCloser + start := func() (tasks.Cmd, io.Reader) { + // The pty (and diff renderer) wrap to this width; apply it here, on the + // task's goroutine once the previous task has stopped, so it doesn't + // race that task's writes (see View.SetContentWidth). + view.SetContentWidth(width) + + sp, err := oscommands.StartPty(cmd, cols, rows) if err != nil { gui.c.Log.Error(err) + // Fall back to running the command without a pty: the diff renderer is + // lost, but the command's output still renders. + execCmd, pipe := startCmdWithPipe(cmd, gui.c.Log) + fallbackPipe = pipe + return execCmd, pipe } + p = sp.Pty gui.Mutexes.PtyMutex.Lock() - gui.viewPtmxMap[view.Name()] = ptmx + gui.viewPtmxMap[view.Name()] = p gui.Mutexes.PtyMutex.Unlock() - return cmd, ptmx + return ptyCmd{cmd: cmd, process: sp.Process, wait: sp.Wait}, p } onClose := func() { gui.Mutexes.PtyMutex.Lock() - ptmx.Close() + if p != nil { + p.Close() + } + if fallbackPipe != nil { + fallbackPipe.Close() + fallbackPipe = nil + } delete(gui.viewPtmxMap, view.Name()) gui.Mutexes.PtyMutex.Unlock() } @@ -103,6 +153,43 @@ func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error return nil } +// withPtyGitConfig returns args with extra git configuration for commands +// that render into a pty. On Windows, such a command is terminated at an +// arbitrary point of its execution when its task stops: tearing down the +// pseudoconsole delivers CTRL_CLOSE_EVENT, which git leaves to the default +// handler, which just calls ExitProcess. git's automatic index refresh +// (diff.autoRefreshIndex, on by default) takes index.lock at the end of a +// diff against the worktree to write back refreshed stat information — +// GIT_OPTIONAL_LOCKS does not cover this lock — and a termination landing +// in that window leaves a stale index.lock behind that the next git command +// chokes on. So don't let pty-rendered commands refresh the index; +// lazygit's foreground `git status` refreshes, which never run in a pty, +// keep the stat cache fresh instead. +// +// On Unix a stopped pty child gets SIGTERM, and git's signal handlers remove +// its lock files, so the refresh can stay enabled there and keep healing +// stale stat info. +func withPtyGitConfig(args []string, goos string) []string { + if goos != "windows" { + return args + } + // Most pty commands are direct git invocations, but the user-configured + // ones can be arbitrary command lines (e.g. a branchLogCmd wrapping git + // in `sh -c`), and injecting git flags into those would corrupt them. + // Only direct git invocations get the config; that loses nothing, since + // the wrapped commands are log commands, which never take the index + // lock. (For direct invocations other than worktree diffs the config is + // simply a no-op.) + base := strings.TrimSuffix(strings.ToLower(filepath.Base(args[0])), ".exe") + if base != "git" { + return args + } + result := make([]string, 0, len(args)+2) + result = append(result, args[0]) + result = append(result, "-c", "diff.autoRefreshIndex=false") + return append(result, args[1:]...) +} + func removeExistingTermEnvVars(env []string) []string { return lo.Filter(env, func(envVar string, _ int) bool { return !isTermEnvVar(envVar) diff --git a/pkg/gui/pty_test.go b/pkg/gui/pty_test.go new file mode 100644 index 000000000..8d7f0e2ca --- /dev/null +++ b/pkg/gui/pty_test.go @@ -0,0 +1,29 @@ +package gui + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestWithPtyGitConfig(t *testing.T) { + args := []string{"git", "-C", "/repo", "diff", "--color=always"} + + assert.Equal(t, + []string{"git", "-c", "diff.autoRefreshIndex=false", "-C", "/repo", "diff", "--color=always"}, + withPtyGitConfig(args, "windows")) + + assert.Equal(t, args, withPtyGitConfig(args, "linux")) + assert.Equal(t, args, withPtyGitConfig(args, "darwin")) + + // A user-configured command that wraps git in a shell must not have git + // flags injected into it. + shellArgs := []string{"sh", "-c", "git log --graph {{branchName}} -- | sed -e s/x/y/"} + assert.Equal(t, shellArgs, withPtyGitConfig(shellArgs, "windows")) + + // The guard recognizes git regardless of case and extension. + exeArgs := []string{"GIT.EXE", "diff"} + assert.Equal(t, + []string{"GIT.EXE", "-c", "diff.autoRefreshIndex=false", "diff"}, + withPtyGitConfig(exeArgs, "windows")) +} diff --git a/pkg/gui/pty_windows.go b/pkg/gui/pty_windows.go deleted file mode 100644 index 39577a199..000000000 --- a/pkg/gui/pty_windows.go +++ /dev/null @@ -1,17 +0,0 @@ -package gui - -import ( - "fmt" - "os/exec" - - "github.com/jesseduffield/gocui" -) - -func (gui *Gui) onResize() error { - return nil -} - -func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error { - cmd.Env = append(cmd.Env, fmt.Sprintf("LAZYGIT_COLUMNS=%d", view.InnerWidth())) - return gui.newCmdTask(view, cmd, prefix) -} diff --git a/pkg/gui/services/custom_commands/client.go b/pkg/gui/services/custom_commands/client.go index 12d8c7862..3f16b8ba8 100644 --- a/pkg/gui/services/custom_commands/client.go +++ b/pkg/gui/services/custom_commands/client.go @@ -1,10 +1,8 @@ package custom_commands import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/samber/lo" @@ -47,8 +45,7 @@ func (self *Client) GetCustomCommandKeybindings() ([]*types.Binding, error) { } bindings = append(bindings, &types.Binding{ ViewName: "", // custom commands menus are global; we filter the commands inside by context - Key: keybindings.GetKey(customCommand.Key), - Modifier: gocui.ModNone, + Keys: config.GetValidatedKeyBindingKeys(customCommand.Key), Handler: handler, Description: getCustomCommandsMenuDescription(customCommand, self.c.Tr), OpensMenu: true, @@ -75,7 +72,7 @@ func (self *Client) showCustomCommandsMenu(customCommand config.CustomCommand) e } menuItems = append(menuItems, &types.MenuItem{ Label: subCommand.GetDescription(), - Key: keybindings.GetKey(subCommand.Key), + Keys: config.GetValidatedKeyBindingKeys(subCommand.Key), OnPress: handler, OpensMenu: true, }) @@ -95,7 +92,7 @@ func (self *Client) showCustomCommandsMenu(customCommand config.CustomCommand) e menuItems = append(menuItems, &types.MenuItem{ Label: subCommand.GetDescription(), - Key: keybindings.GetKey(subCommand.Key), + Keys: config.GetValidatedKeyBindingKeys(subCommand.Key), OnPress: self.handlerCreator.call(subCommand), }) } diff --git a/pkg/gui/services/custom_commands/handler_creator.go b/pkg/gui/services/custom_commands/handler_creator.go index a10689f2d..6046d974a 100644 --- a/pkg/gui/services/custom_commands/handler_creator.go +++ b/pkg/gui/services/custom_commands/handler_creator.go @@ -6,10 +6,9 @@ import ( "strings" "text/template" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -107,12 +106,41 @@ func (self *HandlerCreator) call(customCommand config.CustomCommand) func() erro default: return errors.New("custom command prompt must have a type of 'input', 'menu', 'menuFromCommand', or 'confirm'") } + + if prompt.Condition != "" { + showPrompt := f + conditionTemplate := prompt.Condition + f = func() error { + resolved, err := resolveCondition(conditionTemplate, resolveTemplate) + if err != nil { + return err + } + if resolved { + return showPrompt() + } + if _, exists := form[prompt.Key]; !exists { + form[prompt.Key] = "" + } + return g() + } + } } return f() } } +func resolveCondition(condition string, resolveTemplate func(string) (string, error)) (bool, error) { + if strings.TrimSpace(condition) == "" { + return false, nil + } + resolved, err := resolveTemplate(condition) + if err != nil { + return false, err + } + return strings.TrimSpace(resolved) != "" && strings.TrimSpace(resolved) != "false", nil +} + func (self *HandlerCreator) inputPrompt(prompt *config.CustomCommandPrompt, wrappedF func(string) error) error { findSuggestionsFn, err := self.generateFindSuggestionsFunc(prompt) if err != nil { @@ -204,7 +232,7 @@ func (self *HandlerCreator) menuPrompt(prompt *config.CustomCommandPrompt, wrapp OnPress: func() error { return wrappedF(option.Value) }, - Key: keybindings.GetKey(option.Key), + Keys: config.GetValidatedKeyBindingKeys(option.Key), } }) @@ -286,10 +314,14 @@ func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, ses } output, err := cmdObj.RunWithOutput() - self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + self.c.RefreshFromWorker(types.RefreshOptions{}) if err != nil { if customCommand.After != nil && customCommand.After.CheckForConflicts { + // The custom command may have started a rebase/merge/etc.; if so, + // it's one we consider started in lazygit, so that we offer to + // continue it once its conflicts are resolved. + self.mergeAndRebaseHelper.RecordWhetherMergeOrRebaseStartedInLazygit() return self.mergeAndRebaseHelper.CheckForConflicts(err) } diff --git a/pkg/gui/services/custom_commands/keybinding_creator.go b/pkg/gui/services/custom_commands/keybinding_creator.go index 259954c17..f35fc8fd4 100644 --- a/pkg/gui/services/custom_commands/keybinding_creator.go +++ b/pkg/gui/services/custom_commands/keybinding_creator.go @@ -4,11 +4,9 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" ) @@ -37,8 +35,7 @@ func (self *KeybindingCreator) call(customCommand config.CustomCommand, handler return lo.Map(viewNames, func(viewName string, _ int) *types.Binding { return &types.Binding{ ViewName: viewName, - Key: keybindings.GetKey(customCommand.Key), - Modifier: gocui.ModNone, + Keys: config.GetValidatedKeyBindingKeys(customCommand.Key), Handler: handler, Description: customCommand.GetDescription(), } @@ -83,9 +80,9 @@ func formatUnknownContextError(customCommand config.CustomCommand) error { return string(key) }) - return fmt.Errorf("Error when setting custom command keybindings: unknown context: %s. Key: %s, Command: %s.\nPermitted contexts: %s", customCommand.Context, customCommand.Key, customCommand.Command, strings.Join(allContextKeyStrings, ", ")) + return fmt.Errorf("Error when setting custom command keybindings: unknown context: %s. Key: %s, Command: %s.\nPermitted contexts: %s", customCommand.Context, customCommand.Key.String(), customCommand.Command, strings.Join(allContextKeyStrings, ", ")) } func formatContextNotProvidedError(customCommand config.CustomCommand) error { - return fmt.Errorf("Error parsing custom command keybindings: context not provided (use context: 'global' for the global context). Key: %s, Command: %s", customCommand.Key, customCommand.Command) + return fmt.Errorf("Error parsing custom command keybindings: context not provided (use context: 'global' for the global context). Key: %s, Command: %s", customCommand.Key.String(), customCommand.Command) } diff --git a/pkg/gui/services/custom_commands/models.go b/pkg/gui/services/custom_commands/models.go index e79963458..23a2b9ac7 100644 --- a/pkg/gui/services/custom_commands/models.go +++ b/pkg/gui/services/custom_commands/models.go @@ -76,6 +76,7 @@ type RemoteBranch struct { type Remote struct { Name string Urls []string + PushUrls []string Branches []*RemoteBranch } diff --git a/pkg/gui/services/custom_commands/session_state_loader.go b/pkg/gui/services/custom_commands/session_state_loader.go index b2a2e39c9..a524d13a1 100644 --- a/pkg/gui/services/custom_commands/session_state_loader.go +++ b/pkg/gui/services/custom_commands/session_state_loader.go @@ -116,8 +116,9 @@ func remoteShimFromModelRemote(remote *models.Remote) *Remote { } return &Remote{ - Name: remote.Name, - Urls: remote.Urls, + Name: remote.Name, + Urls: remote.Urls, + PushUrls: remote.PushUrls, Branches: lo.Map(remote.Branches, func(branch *models.RemoteBranch, _ int) *RemoteBranch { return remoteBranchShimFromModelRemoteBranch(branch) }), diff --git a/pkg/gui/side_panels.go b/pkg/gui/side_panels.go new file mode 100644 index 000000000..8b327b197 --- /dev/null +++ b/pkg/gui/side_panels.go @@ -0,0 +1,137 @@ +package gui + +import ( + "github.com/jesseduffield/lazygit/pkg/gui/context" + "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/samber/lo" +) + +// sidePanelViewNames maps each gui.sidePanels name to the gocui view it controls. +// A panel's window name is the name of its first tab, so for a panel's first tab +// this also gives the default view of its window. The keys must match +// config.ValidSidePanelTabs (enforced by a test). +var sidePanelViewNames = map[string]string{ + "status": "status", + "files": "files", + "worktrees": "worktrees", + "submodules": "submodules", + "branches": "localBranches", + "remotes": "remotes", + "tags": "tags", + "commits": "commits", + "reflog": "reflogCommits", + "stash": "stash", +} + +// sidePanelTabTitles maps each gui.sidePanels name to the title shown on its tab. +func (gui *Gui) sidePanelTabTitles() map[string]string { + tr := gui.c.Tr + return map[string]string{ + "status": tr.StatusTitle, + "files": tr.FilesTitle, + "worktrees": tr.WorktreesTitle, + "submodules": tr.SubmodulesTitle, + "branches": tr.LocalBranchesTitle, + "remotes": tr.RemotesTitle, + "tags": tr.TagsTitle, + "commits": tr.CommitsTitle, + "reflog": tr.ReflogCommitsTitle, + "stash": tr.StashTitle, + } +} + +// sidePanelContexts maps each gui.sidePanels name to the context it controls. +func sidePanelContexts(contextTree *context.ContextTree) map[string]types.Context { + return map[string]types.Context{ + "status": contextTree.Status, + "files": contextTree.Files, + "worktrees": contextTree.Worktrees, + "submodules": contextTree.Submodules, + "branches": contextTree.Branches, + "remotes": contextTree.Remotes, + "tags": contextTree.Tags, + "commits": contextTree.LocalCommits, + "reflog": contextTree.ReflogCommits, + "stash": contextTree.Stash, + } +} + +// applySidePanelConfig (re)assigns each side context's window and resets each +// window's default view from the current gui.sidePanels config. It runs against +// the current repo's contexts, so gui.State must already be set. We call it on +// every repo entry (a repo's per-repo config can differ from the previous one's) +// and on a live config reload. +func (gui *Gui) applySidePanelConfig() { + contextTree := gui.State.Contexts + gui.assignSidePanelWindows(contextTree) + gui.State.WindowViewNameMap = gui.initialWindowViewNameMap(contextTree) +} + +// moveDefaultTabsToTop brings each panel's first configured tab to the top of +// its window, so the configured default tab is the one shown when a panel hasn't +// been focused yet (the view z-order is otherwise set from a fixed list that +// need not match the configured tab order). +func (gui *Gui) moveDefaultTabsToTop() { + contexts := sidePanelContexts(gui.State.Contexts) + for _, panel := range gui.c.UserConfig().Gui.SidePanels { + gui.helpers.Window.MoveToTopOfWindow(contexts[panel[0]]) + } +} + +// reloadSidePanels re-applies the side panel config to the current repo after a +// live config reload: it reassigns windows and default views, restores each +// panel's default tab, and keeps the focused panel in a consistent state. +func (gui *Gui) reloadSidePanels() { + gui.applySidePanelConfig() + gui.moveDefaultTabsToTop() + + // applySidePanelConfig reset every window to show its first configured tab, + // which would leave the focused tab hidden behind its panel's default tab + // (the panel would look unfocused even though its tab is selected). Re-focus + // the current context so its tab stays shown and highlighted. If the new + // config has hidden the focused panel entirely, move focus to the default + // side panel instead. + current := gui.c.Context().Current() + if current.GetKind() != types.SIDE_CONTEXT { + return + } + + if lo.Contains(gui.helpers.Window.SideWindows(), current.GetWindowName()) { + gui.c.Context().Activate(current, types.OnFocusOpts{}) + } else { + gui.c.Context().Push(gui.defaultSideContext(), types.OnFocusOpts{}) + } +} + +// assignSidePanelWindows sets each side context's window name from the config so +// that contexts grouped into one panel share a window (the window name being the +// panel's first tab). Side panels the user hasn't listed get their own window +// name; since the layout produces no dimensions for those windows, their views +// stay hidden rather than overlapping a visible panel. +func (gui *Gui) assignSidePanelWindows(contextTree *context.ContextTree) { + contexts := sidePanelContexts(contextTree) + assigned := make(map[string]bool, len(contexts)) + + for _, panel := range gui.c.UserConfig().Gui.SidePanels { + windowName := panel[0] + for _, name := range panel { + contexts[name].SetWindowName(windowName) + assigned[name] = true + } + } + + for name, ctx := range contexts { + if !assigned[name] { + ctx.SetWindowName(name) + } + } + + // The transient contexts take over the window of the context they are + // drilled into from, but they need a valid initial window before their + // first use. Assign the window hosting branches or commits, respectively; + // unlike e.g. remotes, those tabs can't be hidden, so their windows are + // always part of the layout. + contextTree.RemoteBranches.SetWindowName(contextTree.Branches.GetWindowName()) + contextTree.SubCommits.SetWindowName(contextTree.Branches.GetWindowName()) + contextTree.CommitFiles.SetWindowName(contextTree.LocalCommits.GetWindowName()) +} diff --git a/pkg/gui/side_panels_test.go b/pkg/gui/side_panels_test.go new file mode 100644 index 000000000..24813b4ae --- /dev/null +++ b/pkg/gui/side_panels_test.go @@ -0,0 +1,50 @@ +package gui + +import ( + "sort" + "testing" + + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" +) + +func sortedKeys[V any](m map[string]V) []string { + keys := lo.Keys(m) + sort.Strings(keys) + return keys +} + +// The three lookups that translate gui.sidePanels names into views, titles, and +// contexts must each cover exactly the set of valid names, or a config that uses +// a name missing from one of them would hit a nil lookup at runtime. +func TestSidePanelLookupsCoverAllValidTabs(t *testing.T) { + want := lo.Uniq(config.ValidSidePanelTabs) + sort.Strings(want) + + gui := NewDummyGui() + + assert.Equal(t, want, sortedKeys(sidePanelViewNames)) + assert.Equal(t, want, sortedKeys(gui.sidePanelTabTitles())) + assert.Equal(t, want, sortedKeys(sidePanelContexts(gui.contextTree()))) +} + +// The transient contexts must end up in windows that exist under the configured +// panel layout, or their views would be laid out for a window that is never +// shown. +func TestAssignSidePanelWindowsCoversTransientContexts(t *testing.T) { + gui := NewDummyGui() + gui.c.UserConfig().Gui.SidePanels = []config.SidePanel{ + {"worktrees", "branches", "remotes"}, + {"files"}, + {"tags", "commits"}, + {"stash"}, + } + + contextTree := gui.contextTree() + gui.assignSidePanelWindows(contextTree) + + assert.Equal(t, "worktrees", contextTree.RemoteBranches.GetWindowName()) + assert.Equal(t, "worktrees", contextTree.SubCommits.GetWindowName()) + assert.Equal(t, "tags", contextTree.CommitFiles.GetWindowName()) +} diff --git a/pkg/gui/status/status_manager.go b/pkg/gui/status/status_manager.go index 40c68fe2d..35e1b7746 100644 --- a/pkg/gui/status/status_manager.go +++ b/pkg/gui/status/status_manager.go @@ -3,8 +3,8 @@ package status import ( "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/samber/lo" @@ -17,6 +17,11 @@ type StatusManager struct { statuses []appStatus nextId int mutex deadlock.Mutex + + // Whether a render loop is currently drawing the statuses. Guarded by + // mutex, so that claiming and releasing the loop stay atomic with the + // changes to statuses; see ClaimRenderLoop and ReleaseRenderLoopIfEmpty. + renderLoopRunning bool } // Can be used to manipulate a waiting status while it is running (e.g. pause @@ -70,6 +75,9 @@ func (self *StatusManager) AddToastStatus(message string, kind types.ToastKind) } func (self *StatusManager) GetStatusString(userConfig *config.UserConfig) (string, gocui.Attribute) { + self.mutex.Lock() + defer self.mutex.Unlock() + if len(self.statuses) == 0 { return "", gocui.ColorDefault } @@ -81,9 +89,45 @@ func (self *StatusManager) GetStatusString(userConfig *config.UserConfig) (strin } func (self *StatusManager) HasStatus() bool { + self.mutex.Lock() + defer self.mutex.Unlock() + return len(self.statuses) > 0 } +// ClaimRenderLoop is called by whoever just added a status; it reports whether +// they must start the render loop. When it returns false, a loop is already +// running and will pick the new status up on its next tick. +func (self *StatusManager) ClaimRenderLoop() bool { + self.mutex.Lock() + defer self.mutex.Unlock() + + if self.renderLoopRunning { + return false + } + + self.renderLoopRunning = true + return true +} + +// ReleaseRenderLoopIfEmpty is called by the render loop after each frame it +// draws; a true result releases the loop's claim and tells it to exit, because +// there are no statuses left to draw. The emptiness check and the release are +// atomic with respect to ClaimRenderLoop, so a status added around this moment +// either sees the still-running loop or starts a fresh one — it can't end up +// unrendered. +func (self *StatusManager) ReleaseRenderLoopIfEmpty() bool { + self.mutex.Lock() + defer self.mutex.Unlock() + + if len(self.statuses) > 0 { + return false + } + + self.renderLoopRunning = false + return true +} + func (self *StatusManager) addStatus(message string, statusType string, kind types.ToastKind) int { self.mutex.Lock() defer self.mutex.Unlock() diff --git a/pkg/gui/tasks_adapter.go b/pkg/gui/tasks_adapter.go index 151d1566b..3ed141d68 100644 --- a/pkg/gui/tasks_adapter.go +++ b/pkg/gui/tasks_adapter.go @@ -5,8 +5,9 @@ import ( "os/exec" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/tasks" + "github.com/sirupsen/logrus" ) func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error { @@ -17,22 +18,30 @@ func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error ).Debug("RunCommand") manager := gui.getManager(view) + // Mark the view as loading synchronously (before the task's goroutine runs + // and before the next layout pass) so the layout doesn't clamp the scroll + // position to the not-yet-loaded content. + manager.StartLoading() + // Hold the scrollbar at the height the view has now (the previous render), + // while it still shows that render: once the re-render swaps in its first + // partial paint the displayed buffer is briefly short, and we don't want the + // thumb to shrink and snap back as the rest loads. + view.FreezeScrollbarHeight() + + // Snapshot the view width here, on the UI thread, so the task goroutine + // doesn't read the view's live dimensions while it streams output. It's + // applied inside start() below rather than now, because start() runs once + // the previous task has stopped -- applying it here would race that task's + // still-running writes (see View.SetContentWidth). + contentWidth := view.InnerWidth() var r io.ReadCloser - start := func() (*exec.Cmd, io.Reader) { - var err error - r, err = cmd.StdoutPipe() - if err != nil { - gui.c.Log.Error(err) - r = nil - } - cmd.Stderr = cmd.Stdout + start := func() (tasks.Cmd, io.Reader) { + view.SetContentWidth(contentWidth) - if err := cmd.Start(); err != nil { - gui.c.Log.Error(err) - } - - return cmd, r + execCmd, pipe := startCmdWithPipe(cmd, gui.c.Log) + r = pipe + return execCmd, pipe } onClose := func() { @@ -50,6 +59,27 @@ func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error return nil } +// startCmdWithPipe starts cmd with its stdout and stderr going to a single +// pipe, and returns the command along with the pipe's read end, in the shape +// that NewCmdTask expects from its start func. It never returns a nil reader, +// because NewCmdTask's scanner panics on one: when the pipe can't be created +// the command isn't started at all, and an empty reader is returned so that +// the task shuts down cleanly with the error in the log. +func startCmdWithPipe(cmd *exec.Cmd, log *logrus.Entry) (tasks.Cmd, io.ReadCloser) { + r, err := cmd.StdoutPipe() + if err != nil { + log.Error(err) + return tasks.ExecCmd{Cmd: cmd}, io.NopCloser(strings.NewReader("")) + } + cmd.Stderr = cmd.Stdout + + if err := cmd.Start(); err != nil { + log.Error(err) + } + + return tasks.ExecCmd{Cmd: cmd}, r +} + func (gui *Gui) newStringTask(view *gocui.View, str string) error { // using str so that if rendering the exact same thing we don't reset the origin return gui.newStringTaskWithKey(view, str, str) @@ -59,8 +89,10 @@ func (gui *Gui) newStringTaskWithoutScroll(view *gocui.View, str string) error { manager := gui.getManager(view) f := func(tasks.TaskOpts) error { - gui.c.SetViewContent(view, str) - return nil + return gui.g.OnUIThreadAndWaitBackground(func() { + gui.c.SetViewContent(view, str) + gui.reApplySearch(view) + }) } if err := manager.NewTask(f, manager.GetTaskKey()); err != nil { @@ -74,9 +106,11 @@ func (gui *Gui) newStringTaskWithScroll(view *gocui.View, str string, originX in manager := gui.getManager(view) f := func(tasks.TaskOpts) error { - gui.c.SetViewContent(view, str) - view.SetOrigin(originX, originY) - return nil + return gui.g.OnUIThreadAndWaitBackground(func() { + gui.c.SetViewContent(view, str) + view.SetOrigin(originX, originY) + gui.reApplySearch(view) + }) } if err := manager.NewTask(f, manager.GetTaskKey()); err != nil { @@ -90,9 +124,11 @@ func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) e manager := gui.getManager(view) f := func(tasks.TaskOpts) error { - gui.c.ResetViewOrigin(view) - gui.c.SetViewContent(view, str) - return nil + return gui.g.OnUIThreadAndWaitBackground(func() { + gui.c.ResetViewOrigin(view) + gui.c.SetViewContent(view, str) + gui.reApplySearch(view) + }) } if err := manager.NewTask(f, key); err != nil { @@ -109,18 +145,26 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager { gui.Log, view, func() { - // we could clear here, but that actually has the effect of causing a flicker - // where the view may contain no content momentarily as the gui refreshes. - // Instead, we're rewinding the write pointer so that we will just start - // overwriting the existing content from the top down. Once we've reached - // the end of the content do display, we call view.FlushStaleCells() to - // clear out the remaining content from the previous render. + // Called before showing the "loading..." indicator: clear the + // displayed buffer so only "loading..." is shown. The actual content + // is rendered off-screen (beginRender below) and swapped in, so it + // never overwrites the displayed buffer incrementally. view.Reset() }, func() { - gui.render() + // As the task reads more lines, the only thing that changes is the + // view's content (and its scrollbar); the window layout doesn't. So a + // content-only render is enough, and it's much cheaper than a full + // layout-and-redraw on every read - which matters a lot when reading + // a long diff, where reads happen repeatedly as the user scrolls. + gui.renderContentOnly() }, func() { + // The content is fully loaded now, so let the scrollbar track it + // directly again (it was held at the previous render's height while + // loading, see FreezeScrollbarHeight). + view.UnfreezeScrollbarHeight() + // Need to check if the content of the view is well past the origin. linesHeight := view.ViewLinesHeight() _, originY := view.Origin() @@ -130,14 +174,26 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager { view.SetOrigin(0, newOriginY) } - view.FlushStaleCells() + gui.reApplySearch(view) }, func() { view.SetOrigin(0, 0) }, + view.BeginOffscreenRender, + view.SwapInOffscreenRender, func() gocui.Task { - return gui.c.GocuiGui().NewTask() + // A background task: rendering content into a view is display + // work, not lazygit driving a git operation, so it must not + // count towards being busy and block a repo switch. These + // renders fire on nearly every focus/selection change, including + // the context activation that happens right before a menu/prompt + // handler runs (e.g. confirming worktree creation), which would + // otherwise make the switch that handler triggers refuse itself. + return gui.c.GocuiGui().NewBackgroundTask() }, + // Rendering is background work too (see above), so the view mutations + // it bounces onto the UI thread mustn't count towards being busy. + gui.g.OnUIThreadAndWaitBackground, ) gui.viewBufferManagerMap[view.Name()] = manager } diff --git a/pkg/gui/tasks_adapter_test.go b/pkg/gui/tasks_adapter_test.go new file mode 100644 index 000000000..48c1bb45f --- /dev/null +++ b/pkg/gui/tasks_adapter_test.go @@ -0,0 +1,24 @@ +package gui + +import ( + "bytes" + "os/exec" + "testing" + + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/stretchr/testify/assert" +) + +func TestStartCmdWithPipeWhenPipeCannotBeCreated(t *testing.T) { + cmd := exec.Command("non-existent-command") + // Assigning stdout up front makes cmd.StdoutPipe fail. This happens in + // practice on the Unix pty fallback path: a failed pty start can leave + // the tty assigned to the command's stdout. + cmd.Stdout = &bytes.Buffer{} + + _, r := startCmdWithPipe(cmd, utils.NewDummyLog()) + + // NewCmdTask's scanner panics on a nil reader, so startCmdWithPipe must + // not return one even when it can't create the pipe. + assert.NotNil(t, r) +} diff --git a/pkg/gui/test_mode.go b/pkg/gui/test_mode.go index ef81e11cb..2644e989b 100644 --- a/pkg/gui/test_mode.go +++ b/pkg/gui/test_mode.go @@ -3,9 +3,10 @@ package gui import ( "log" "os" + "runtime/pprof" "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/popup" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/integration/components" @@ -23,12 +24,8 @@ func (gui *Gui) handleTestMode() { } if test != nil { - isIdleChan := make(chan struct{}) - - gui.c.GocuiGui().AddIdleListener(isIdleChan) - waitUntilIdle := func() { - <-isIdleChan + gui.c.GocuiGui().WaitUntilIdle() } go func() { @@ -38,23 +35,25 @@ func (gui *Gui) handleTestMode() { gui.PopupHandler.(*popup.PopupHandler).SetToastFunc( func(message string, kind types.ToastKind) { toastChan <- message }) - test.Run(&GuiDriver{gui: gui, isIdleChan: isIdleChan, toastChan: toastChan, headless: Headless()}) + test.Run(&GuiDriver{gui: gui, toastChan: toastChan, headless: Headless()}) gui.g.Update(func(*gocui.Gui) error { return gocui.ErrQuit }) - waitUntilIdle() - - time.Sleep(time.Second * 1) - - log.Fatal("gocui should have already exited") + // Wait for the event loop to actually exit. + <-gui.g.LoopExited() }() if os.Getenv(components.WAIT_FOR_DEBUGGER_ENV_VAR) == "" { + timeout := 40 * time.Second * testTimeoutMultiplier go utils.Safe(func() { - time.Sleep(time.Second * 40) - log.Fatal("40 seconds is up, lazygit recording took too long to complete") + time.Sleep(timeout) + // Dump all goroutine stacks before dying, so a hung test shows + // where it got stuck rather than just that it timed out. The + // test harness surfaces this process's stderr on failure. + _ = pprof.Lookup("goroutine").WriteTo(os.Stderr, 2) + log.Fatalf("%v is up, lazygit integration test took too long to complete", timeout) }) } } diff --git a/pkg/gui/test_timeout_norace.go b/pkg/gui/test_timeout_norace.go new file mode 100644 index 000000000..7f924ea71 --- /dev/null +++ b/pkg/gui/test_timeout_norace.go @@ -0,0 +1,5 @@ +//go:build !race + +package gui + +const testTimeoutMultiplier = 1 diff --git a/pkg/gui/test_timeout_race.go b/pkg/gui/test_timeout_race.go new file mode 100644 index 000000000..7d633def3 --- /dev/null +++ b/pkg/gui/test_timeout_race.go @@ -0,0 +1,10 @@ +//go:build race + +package gui + +// The race detector makes everything run several times slower, so the +// recording watchdog needs a correspondingly longer timeout; otherwise it +// fires on tests that are merely slow under -race rather than actually stuck. +// The `race` build tag is set automatically when the binary is built with +// -race, so this can't drift out of sync with the actual build. +const testTimeoutMultiplier = 4 diff --git a/pkg/gui/types/common.go b/pkg/gui/types/common.go index 4c892508d..58ccf6d60 100644 --- a/pkg/gui/types/common.go +++ b/pkg/gui/types/common.go @@ -1,17 +1,16 @@ package types import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "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/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/tasks" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/sasha-s/go-deadlock" - "gopkg.in/ozeidan/fuzzy-patricia.v3/patricia" ) type HelperCommon struct { @@ -30,10 +29,31 @@ type IGuiCommon interface { LogCommand(cmdStr string, isCommandLine bool) // we call this when we want to refetch some models and render the result. Internally calls PostRefreshUpdate Refresh(RefreshOptions) + // Like Refresh, but withholds keyboard input until the refreshed state is + // in place: keys pressed while the refresh is in flight are buffered and + // replayed once its model and view updates have run, instead of being + // handled against the stale, pre-refresh state. Use it when the very next + // keypress may depend on what the refresh produces — e.g. staging a hunk, + // where the refresh moves the selection to the next stageable hunk that + // the next press is meant to stage. Keep it to quick, narrow-scoped + // refreshes: one that includes COMMITS (or refreshes everything) can take + // very long in large repos and should usually not block input unless + // there's a very good reason (switching repos is one such example). + RefreshBlockingInput(RefreshOptions) + // Like Refresh, but for callers running on a worker goroutine (e.g. inside + // a WithWaitingStatus handler) rather than the UI thread. The refresh + // captures the model/context state it needs on the UI thread before doing + // its git work; knowing which thread the caller is on lets it capture + // inline (UI thread) or hop across (worker) without racing or deadlocking. + RefreshFromWorker(RefreshOptions) // we call this when we've changed something in the view model but not the actual model, // e.g. expanding or collapsing a folder in a file view. Calling 'Refresh' in this - // case would be overkill, although refresh will internally call 'PostRefreshUpdate' + // case would be overkill, although refresh will internally call 'PostRefreshUpdate'. + // It re-focuses the context's selection, which scrolls it into view. PostRefreshUpdate(Context) + // Like PostRefreshUpdate, with control over scrolling and whether to update + // the main view. + PostRefreshUpdateWithOptions(Context, OnFocusOpts) // renders string to a view without resetting its origin SetViewContent(view *gocui.View, content string) @@ -52,6 +72,10 @@ type IGuiCommon interface { // return the view buffer manager for the given view, or nil if it doesn't have one GetViewBufferManagerForView(view *gocui.View) *tasks.ViewBufferManager + // read enough lines into the given view's buffer to fill it at its current + // scroll position, plus some read-ahead for smooth scrolling + ReadLinesToFillView(view *gocui.View) + // returns true if command completed successfully RunSubprocess(cmdObj *oscommands.CmdObj) (bool, error) RunSubprocessAndRefresh(*oscommands.CmdObj) error @@ -59,6 +83,10 @@ type IGuiCommon interface { Suspend() error Resume() error + // Pause or resume the background routines. Calls nest, so every pause must be balanced + // by a resume. + PauseBackgroundRefreshes(pause bool) + Context() IContextMgr ContextForKey(key ContextKey) Context @@ -71,9 +99,22 @@ type IGuiCommon interface { // Only necessary to call if you're not already on the UI thread i.e. you're inside a goroutine. // All controller handlers are executed on the UI thread. OnUIThread(f func() error) + // Like OnUIThread, but for work triggered by a background routine, so it + // doesn't count towards lazygit being busy (see the *Background methods on + // gocui.Gui and repo-switch safety). + OnUIThreadBackground(f func() error) + // Like OnUIThread, but signals that the callback only modifies view + // content (e.g. spinner), allows the event loop to skip + // the expensive layout recalculation when only content changed. + OnUIThreadContentOnly(f func() error) + // Like OnUIThreadContentOnly, but for background work (see OnUIThreadBackground). + OnUIThreadContentOnlyBackground(f func() error) // Runs a function in a goroutine. Use this whenever you want to run a goroutine and keep track of the fact // that lazygit is still busy. See docs/dev/Busy.md OnWorker(f func(gocui.Task) error) + // Like OnWorker, but for a background routine (or work it triggers), so it + // doesn't count towards lazygit being busy (see OnUIThreadBackground). + OnWorkerBackground(f func(gocui.Task) error) // Function to call at the end of our 'layout' function which renders views // For example, you may want a view's line to be focused only after that view is // resized, if in accordion mode. @@ -104,7 +145,7 @@ type IGuiCommon interface { KeybindingsOpts() KeybindingsOpts CallKeybindingHandler(binding *Binding) error - ResetKeybindings() error + ResetKeybindings() // hopefully we can remove this once we've moved all our keybinding stuff out of the gui god struct. GetInitialKeybindingsWithCustomCommands() ([]*Binding, []*gocui.ViewMouseBinding) @@ -134,7 +175,7 @@ type IPopupHandler interface { // Shows a popup prompting the user for input. Prompt(opts PromptOpts) WithWaitingStatus(message string, f func(gocui.Task) error) error - WithWaitingStatusSync(message string, f func() error) error + WithWaitingStatusBlockingInput(opts WaitingStatusOpts, f func(gocui.Task) error) error Menu(opts CreateMenuOptions) error Toast(message string) ErrorToast(message string) @@ -142,6 +183,20 @@ type IPopupHandler interface { GetPromptInput() string } +type WaitingStatusOpts struct { + // The message shown alongside the spinner while the operation runs. + Message string + + // When set, the working tree state mode (the yellow + // "Rebasing"/"Merging"/"Cherry-picking"/"Reverting" indicator, along with + // its abort button) stays hidden until the operation is done. Set it for + // operations that drive such a state themselves: the state they leave on + // disk while they run is transient, so surfacing it would flash the + // indicator on and offer to abort a sequence that lazygit is in the middle + // of running. + HideWorkingTreeState bool +} + type ToastKind int const ( @@ -154,9 +209,15 @@ type CreateMenuOptions struct { Prompt string // a message that will be displayed above the menu options Items []*MenuItem HideCancel bool + OnCancel func() error // called when the menu is dismissed without selecting an item ColumnAlignment []utils.Alignment AllowFilteringKeybindings bool KeepConflictingKeybindings bool // if true, the keybindings that match essential bindings such as confirm or return will not be removed from menu items + // if true, the menu has a filter row of its own and filters its items as the + // user types, instead of being filtered through the search prompt. Only for + // menus whose items don't have keybindings of their own, because those keys + // would clash with typing. + FilterAsYouType bool } type CreatePopupPanelOpts struct { @@ -254,9 +315,10 @@ type MenuItem struct { // Only applies when Label is used OpensMenu bool - // If Key is defined it allows the user to press the key to invoke the menu - // item, as opposed to having to navigate to it - Key Key + // If Keys is non-empty, the user can press any of these keys to invoke the + // menu item, as opposed to having to navigate to it. Only the first key is + // shown in the menu; the alternates are matched silently. + Keys []gocui.Key // A widget to show in front of the menu item. Supported widget types are // checkboxes and radio buttons, @@ -287,15 +349,17 @@ func (self *MenuItem) ID() string { } type Model struct { - CommitFiles []*models.CommitFile - Files []*models.File - Submodules []*models.SubmoduleConfig - Branches []*models.Branch - Commits []*models.Commit - StashEntries []*models.StashEntry - SubCommits []*models.Commit - Remotes []*models.Remote - Worktrees []*models.Worktree + CommitFiles []*models.CommitFile + Files []*models.File + Submodules []*models.SubmoduleConfig + Branches []*models.Branch + Commits []*models.Commit + StashEntries []*models.StashEntry + SubCommits []*models.Commit + Remotes []*models.Remote + Worktrees []*models.Worktree + PullRequests []*models.GithubPullRequest + PullRequestsMap map[string]*models.GithubPullRequest // FilteredReflogCommits are the ones that appear in the reflog panel. // When in filtering mode we only include the ones that match the given path @@ -308,6 +372,7 @@ type Model struct { BisectInfo *git_commands.BisectInfo WorkingTreeStateAtLastCommitRefresh models.WorkingTreeState + CommitsWereFilteredAtLastRefresh bool RemoteBranches []*models.RemoteBranch Tags []*models.Tag @@ -317,24 +382,14 @@ type Model struct { MainBranches *git_commands.MainBranches - // for displaying suggestions while typing in a file name - FilesTrie *patricia.Trie - Authors map[string]*models.Author HashPool *utils.StringPool } type Mutexes struct { - RefreshingFilesMutex deadlock.Mutex - RefreshingBranchesMutex deadlock.Mutex - RefreshingStatusMutex deadlock.Mutex - LocalCommitsMutex deadlock.Mutex - SubCommitsMutex deadlock.Mutex - AuthorsMutex deadlock.Mutex - SubprocessMutex deadlock.Mutex - PopupMutex deadlock.Mutex - PtyMutex deadlock.Mutex + SubprocessMutex deadlock.Mutex + PtyMutex deadlock.Mutex } // A long-running operation associated with an item. For example, we'll show @@ -357,15 +412,22 @@ type HasUrn interface { URN() string } +// RepoLocation is everything it takes to open a repo again: the directory to +// change to, plus the environment telling git where the repo is for the repos +// git can't find from that directory (see RepoPaths.GitLocationEnvVars), which +// is empty for all the others. +type RepoLocation struct { + Path string + GitLocationEnvVars []string +} + type IStateAccessor interface { - GetRepoPathStack() *utils.StringStack + GetRepoPathStack() *utils.Stack[RepoLocation] GetRepoState() IRepoStateAccessor - GetPagerConfig() *config.PagerConfig + GetDiffRendererConfigManager() *config.DiffRendererConfigManager // tells us whether we're currently updating lazygit GetUpdating() bool SetUpdating(bool) - SetIsRefreshingFiles(bool) - GetIsRefreshingFiles() bool GetShowExtrasWindow() bool SetShowExtrasWindow(bool) GetRetainOriginalDir() bool @@ -373,6 +435,13 @@ type IStateAccessor interface { GetItemOperation(item HasUrn) ItemOperation SetItemOperation(item HasUrn, operation ItemOperation) ClearItemOperation(item HasUrn) + + // A counter that is bumped every time we switch to a different repository + // (see Gui.resetState). A refresh captures it when it starts and carries it + // through to onUIThreadUnlessRepoChanged, so that a model update computed for + // one repo can be dropped rather than applied to another if the user switched + // repos while the refresh was in flight. + GetRepoGeneration() int } type IRepoStateAccessor interface { @@ -388,6 +457,8 @@ type IRepoStateAccessor interface { GetSearchState() *SearchState SetSplitMainPanel(bool) GetSplitMainPanel() bool + GetMergeOrRebaseStartedInLazygit() bool + SetMergeOrRebaseStartedInLazygit(bool) } // startup stages so we don't need to load everything at once diff --git a/pkg/gui/types/common_commands.go b/pkg/gui/types/common_commands.go index 74bfd603b..3b74477fc 100644 --- a/pkg/gui/types/common_commands.go +++ b/pkg/gui/types/common_commands.go @@ -4,4 +4,9 @@ type CheckoutRefOptions struct { WaitingStatus string EnvVars []string OnRefNotFound func(ref string) error + + // Refreshing pull requests is necessary when checking out a branch that doesn't exist locally + // (e.g. checking out a remote branch), but it not needed when checking out an existing local + // branch or a detached head (e.g. a tag). + RefreshPullRequests bool } diff --git a/pkg/gui/types/context.go b/pkg/gui/types/context.go index 790f4c84b..93b92c70e 100644 --- a/pkg/gui/types/context.go +++ b/pkg/gui/types/context.go @@ -1,10 +1,9 @@ package types import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/patch_exploring" - "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/sasha-s/go-deadlock" ) @@ -57,6 +56,10 @@ type IBaseContext interface { GetKind() ContextKind GetViewName() string + // The view that keyboard input goes to while this context is focused. That is + // the context's own view, unless the context has an editable view embedded in + // it which takes the keyboard instead, like the menu's filter input. + GetInputViewName() string GetView() *gocui.View GetViewTrait() IViewTrait GetWindowName() string @@ -72,6 +75,10 @@ type IBaseContext interface { // determined independently. HasControlledBounds() bool + // true if the context holds something for a selection to sit on. Contexts that + // don't show a selection at all say false, and so do lists with nothing in them. + HasSelectableContent() bool + // the total height of the content that the view is currently showing TotalContentHeight() int @@ -91,17 +98,21 @@ type IBaseContext interface { AddMouseKeybindingsFn(MouseKeybindingsFn) ClearAllAttachedControllerFunctions() - // This is a bit of a hack at the moment: we currently only set an onclick function so that - // our list controller can come along and wrap it in a list-specific click handler. + // This is a bit of a hack at the moment: we currently only set an onDoubleClick function so + // that the generic ListController can be specialized by view-specific controllers. // We'll need to think of a better way to do this. - AddOnClickFn(func() error) + AddOnDoubleClickFn(func() error) // Likewise for the focused main view: we need this to communicate between a // side panel controller and the focused main view controller. AddOnClickFocusedMainViewFn(func(mainViewName string, clickedLineIdx int) error) + // Adding on to the above, this is so that a list-specific handler can register + // a hook for doing additional click handling + AddOnClickFn(func(opts gocui.ViewMouseBindingOpts) error) AddOnRenderToMainFn(func()) AddOnFocusFn(func(OnFocusOpts)) AddOnFocusLostFn(func(OnFocusLostOpts)) + AddOnQuitFn(func()) } type Context interface { @@ -109,6 +120,7 @@ type Context interface { HandleFocus(opts OnFocusOpts) HandleFocusLost(opts OnFocusLostOpts) + HandleQuit() FocusLine(scrollIntoView bool) HandleRender() HandleRenderToMain() @@ -131,7 +143,6 @@ type IFilterableContext interface { ReApplyFilter(bool) IsFiltering() bool IsFilterableContext() - FilterPrefix(tr *i18n.TranslationSet) string } type ISearchableContext interface { @@ -148,6 +159,7 @@ type ISearchableContext interface { // This must be implemented by each concrete context. Return nil if not searching the model. ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition + OnSearchSelect(selectedLineIdx int) } type DiffableContext interface { @@ -217,13 +229,20 @@ type IViewTrait interface { ScrollDown(value int) PageDelta() int SelectedLineIdx() int - SetHighlight(bool) } type OnFocusOpts struct { - ClickedWindowName string - ClickedViewLineIdx int - ScrollSelectionIntoView bool + ClickedWindowName string + ClickedViewLineIdx int + + // Focusing a list context scrolls its selection into view. Set this to leave + // the view's scroll position alone instead; only for callers that maintain + // it themselves, e.g. by keeping the selection at the edge of the viewport. + KeepScrollPosition bool + + // Set this when the focused item hasn't changed and the main view's current + // content is still valid. + SkipMainViewUpdate bool } type OnFocusLostOpts struct { @@ -233,9 +252,9 @@ type OnFocusLostOpts struct { type ContextKey string type KeybindingsOpts struct { - GetKey func(key string) Key - Config config.KeybindingConfig - Guards KeybindingGuards + GetKeys func(keys config.Keybinding) []gocui.Key + Config config.KeybindingConfig + Guards KeybindingGuards } type ( @@ -246,7 +265,19 @@ type ( type HasKeybindings interface { GetKeybindings(opts KeybindingsOpts) []*Binding GetMouseKeybindings(opts KeybindingsOpts) []*gocui.ViewMouseBinding - GetOnClick() func() error + + // Implement this to get called when there's a double-click on the view. Only supported by list + // views currently. Will be called after the double-clicked list entry has been selected. + GetOnDoubleClick() func() error + + // Implement this to get called for any non-double-click in the view. Only supported by list + // views currently. Will be called after the clicked list entry has been selected, and + // HandleFocus has already been called (so the main view is up to date). Should return nil if it + // decides not to do anything with the click. + GetOnClick() func(opts gocui.ViewMouseBindingOpts) error + + // Implement this in a side-panel controller to get called when there's a click in the main view + // that belongs to your panel while the main view is already focused. GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error } @@ -257,6 +288,10 @@ type IController interface { GetOnRenderToMain() func() GetOnFocus() func(OnFocusOpts) GetOnFocusLost() func(OnFocusLostOpts) + + // Implement this to get called when the app quits, and the controller's context has the focus. + // Useful for saving state on quit. + GetOnQuit() func() } type IList interface { diff --git a/pkg/gui/types/keybindings.go b/pkg/gui/types/keybindings.go index 9289dbe9a..337162d76 100644 --- a/pkg/gui/types/keybindings.go +++ b/pkg/gui/types/keybindings.go @@ -1,20 +1,17 @@ package types import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/style" ) -type Key any // FIXME: find out how to get `gocui.Key | rune` - // Binding - a keybinding mapping a key and modifier to a handler. The keypress // is only handled if the given view has focus, or handled globally if the view // is "" type Binding struct { ViewName string Handler func() error - Key Key - Modifier gocui.Modifier + Keys []gocui.Key Description string // DescriptionFunc is used instead of Description if non-nil, and is useful for dynamic // descriptions that change depending on context. Important: this must not be an expensive call. diff --git a/pkg/gui/types/refresh.go b/pkg/gui/types/refresh.go index c20a5f54a..d40a1bec5 100644 --- a/pkg/gui/types/refresh.go +++ b/pkg/gui/types/refresh.go @@ -20,27 +20,97 @@ const ( PATCH_BUILDING MERGE_CONFLICTS COMMIT_FILES - // not actually a view. Will refactor this later + // not actually views. Will refactor this later BISECT_INFO + PULL_REQUESTS ) -type RefreshMode int +// CommitSelectionBehavior controls which local commit is selected after the +// commits list is reloaded by a refresh. +type CommitSelectionBehavior int const ( - SYNC RefreshMode = iota // wait until everything is done before returning - ASYNC // return immediately, allowing each independent thing to update itself - BLOCK_UI // wrap code in an update call to ensure UI updates all at once and keybindings aren't executed till complete + // Keep the same commit selected by hash (and the same range, when + // range-selecting), restoring it at its new position if it moved. This is + // the right default whenever the list reloads underneath a selection the + // user hasn't deliberately changed. + KeepCommitSelectionByHash CommitSelectionBehavior = iota + + // Leave the selection index untouched, because the caller set it itself + // before refreshing. Used when jumping to the top of the list after a + // checkout, and when following a commit that was just moved up or down. + KeepCommitSelectionIndex + + // Select the HEAD commit. Used by operations that create a new commit at + // HEAD (committing, merging, pulling with a merge); the by-hash behavior + // can't restore a commit that didn't exist before the refresh. + SelectHeadCommit +) + +// BranchSelectionBehavior controls which local branch is selected after the +// branches list is reloaded by a refresh. +type BranchSelectionBehavior int + +const ( + // Keep the same branch selected by name, restoring it at its new position if + // the order changed. This is the right default whenever the list reloads + // underneath a selection the user hasn't deliberately changed. + KeepBranchSelectionByName BranchSelectionBehavior = iota + + // Select the checked-out branch (the one at the top of the list). Used after + // operations that check something out - checkout, creating a branch, moving + // commits to a new branch - so the newly checked-out ref ends up selected. + SelectCheckedOutBranch ) type RefreshOptions struct { - Then func() + Then func() error Scope []RefreshableView // e.g. []RefreshableView{COMMITS, BRANCHES}. Leave empty to refresh everything - Mode RefreshMode // one of SYNC (default), ASYNC, and BLOCK_UI - // Normally a refresh of the branches tries to keep the same branch selected - // (by name); this is usually important in case the order of branches - // changes. Passing true for KeepBranchSelectionIndex suppresses this and - // keeps the selection index the same. Useful after checking out a detached - // head, and selecting index 0. - KeepBranchSelectionIndex bool + // If true, hold off on updating the UI until all scopes have finished + // refreshing and then apply them together in a single frame, rather than + // letting each scope update the UI as soon as it's done. + BatchUIUpdates bool + + // Set this when the refresh doesn't invalidate the main view's current + // content, so refreshing the side context needn't render it again. + SkipMainViewUpdate bool + + // Controls which local branch is selected after the refresh. Defaults to + // KeepBranchSelectionByName. + BranchSelection BranchSelectionBehavior + + // Controls which local commit is selected after the refresh. Defaults to + // KeepCommitSelectionByHash. + CommitSelection CommitSelectionBehavior + + // When true, select the top (most recent) reflog entry after the refresh. + // Used alongside SelectCheckedOutBranch by operations that check something + // out, since the checkout adds a new reflog entry at the top. Defaults to + // keeping the reflog selection where it is. + SelectTopReflogCommit bool + + // When true, this refresh was initiated by a background routine rather than + // by a user action. Every git command suppresses optional locks by default + // so it can't contend for index.lock (see git_commands.OptionalLocksEnvVar); + // a foreground files refresh (this false) is the one command that opts back + // in, so it persists git's refreshed stat-cache and keeps later status calls + // fast. Background refreshes leave the suppression in place: not persisting + // the stat-cache is the right trade-off for unattended work. + Background bool + + // When true, this foreground refresh does not block switching repos while + // it is in flight. A refresh is switch-safe by construction — its git + // commands run against the repo it was started for, and the generation + // guard drops its model/view updates if the repo changed — but a refresh + // triggered by a user operation still blocks switching (its tasks count + // towards Busy()), because the operation's follow-up work isn't covered + // by those guards. A refresh that merely reloads state (on focus, after a + // repo switch, after returning from a subprocess) has no such follow-up, + // so it opts in here and a repo switch during it is allowed rather than + // refused with a toast. + // + // Must not be combined with Then: Then is not generation-guarded, so it + // would run against the newly switched-to repo. + DontBlockRepoSwitch bool } diff --git a/pkg/gui/types/views.go b/pkg/gui/types/views.go index 46a67d23a..1a48d170a 100644 --- a/pkg/gui/types/views.go +++ b/pkg/gui/types/views.go @@ -1,6 +1,6 @@ package types -import "github.com/jesseduffield/gocui" +import "github.com/jesseduffield/lazygit/pkg/gocui" type Views struct { Status *gocui.View @@ -27,6 +27,8 @@ type Views struct { Confirmation *gocui.View Prompt *gocui.View Menu *gocui.View + MenuFilterFrame *gocui.View + MenuFilter *gocui.View CommitMessage *gocui.View CommitDescription *gocui.View CommitFiles *gocui.View diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index b8ea49c44..3d924a566 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -3,7 +3,7 @@ package gui import ( "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/tasks" @@ -25,6 +25,18 @@ func (gui *Gui) linesToReadFromCmdTask(v *gocui.View) tasks.LinesToRead { linesForFirstRefresh := height + oy + 10 + // A search counts the matches in everything the view holds, so a re-render of a + // view that is being searched is read all the way to the end (as opening the + // search prompt reads it, see MainViewController.openSearch). Lines left unread + // hold matches the search doesn't know about, and would add themselves to the + // "x of y" as the user scrolled far enough to load them. + if v.IsSearching() { + return tasks.LinesToRead{ + Total: -1, + InitialRefreshAfter: linesForFirstRefresh, + } + } + // We want to read as many lines initially as necessary to let the // scrollbar go to its minimum height, so that the scrollbar thumb doesn't // change size as you scroll down. @@ -121,10 +133,18 @@ func (gui *Gui) render() { gui.c.OnUIThread(func() error { return nil }) } +// renderContentOnly triggers a re-render that skips the layout pass and only +// redraws the views whose content changed (relying on tcell's cell-level dirty +// tracking to emit just the cells that actually differ). Use it when only a +// view's content changed, not the window layout. +func (gui *Gui) renderContentOnly() { + gui.c.OnUIThreadContentOnly(func() error { return nil }) +} + // postRefreshUpdate is to be called on a context after the state that it depends on has been refreshed // if the context's view is set to another context we do nothing. // if the context's view is the current view we trigger a focus; re-selecting the current item. -func (gui *Gui) postRefreshUpdate(c types.Context) { +func (gui *Gui) postRefreshUpdate(c types.Context, opts types.OnFocusOpts) { t := time.Now() defer func() { gui.Log.Infof("postRefreshUpdate for %s took %s", c.GetKey(), time.Since(t)) @@ -132,27 +152,28 @@ func (gui *Gui) postRefreshUpdate(c types.Context) { c.HandleRender() - if gui.currentViewName() == c.GetViewName() { - c.HandleFocus(types.OnFocusOpts{}) + // The render may have given the context its first item, or taken its last one + // away, which decides whether its view draws a selection at all. + gui.State.ContextMgr.updateSelectionHighlights() + + if gui.currentViewName() == c.GetInputViewName() { + c.HandleFocus(opts) } else { // The FocusLine call is included in the HandleFocus method which we // call for focused views above; but we need to call it here for // non-focused views to ensure that an inactive selection is painted // correctly, and that integration tests see the up to date selection // state. - c.FocusLine(false) + c.FocusLine(!opts.KeepScrollPosition) + if opts.SkipMainViewUpdate { + return + } currentCtx := gui.State.ContextMgr.Current() if currentCtx.GetKey() == context.NORMAL_MAIN_CONTEXT_KEY || currentCtx.GetKey() == context.NORMAL_SECONDARY_CONTEXT_KEY { - // Searching can't cope well with the view being updated while it is being searched. - // We might be able to fix the problems with this, but it doesn't seem easy, so for now - // just don't rerender the view while searching, on the assumption that users will probably - // either search or change their data, but not both at the same time. - if !currentCtx.GetView().IsSearching() { - sidePanelContext := gui.State.ContextMgr.NextInStack(currentCtx) - if sidePanelContext != nil && sidePanelContext.GetKey() == c.GetKey() { - sidePanelContext.HandleRenderToMain() - } + sidePanelContext := gui.State.ContextMgr.NextInStack(currentCtx) + if sidePanelContext != nil && sidePanelContext.GetKey() == c.GetKey() { + sidePanelContext.HandleRenderToMain() } } else if c.GetKey() == gui.State.ContextMgr.CurrentStatic().GetKey() { // If our view is not the current one, but it is the current static context, then this diff --git a/pkg/gui/views.go b/pkg/gui/views.go index ba4b4373f..7b6fa93eb 100644 --- a/pkg/gui/views.go +++ b/pkg/gui/views.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/samber/lo" - "golang.org/x/exp/slices" ) type viewNameMapping struct { @@ -66,6 +66,12 @@ func (gui *Gui) orderedViewNameMappings() []viewNameMapping { {viewPtr: &gui.Views.CommitMessage, name: "commitMessage"}, {viewPtr: &gui.Views.CommitDescription, name: "commitDescription"}, {viewPtr: &gui.Views.Menu, name: "menu"}, + // the filter row of a menu that filters as you type: a frame that hangs off + // the bottom of the menu and shows the "Filter:" prompt, plus the input + // field that sits inside it. Both must come after the menu so that the row's + // top border is drawn over the menu's bottom border. + {viewPtr: &gui.Views.MenuFilterFrame, name: "menuFilterFrame"}, + {viewPtr: &gui.Views.MenuFilter, name: "menuFilter"}, {viewPtr: &gui.Views.Suggestions, name: "suggestions"}, {viewPtr: &gui.Views.Confirmation, name: "confirmation"}, {viewPtr: &gui.Views.Prompt, name: "prompt"}, @@ -139,6 +145,16 @@ func (gui *Gui) createAllViews() error { gui.Views.Menu.Visible = false + gui.Views.MenuFilterFrame.Visible = false + gui.Views.MenuFilter.Visible = false + gui.Views.MenuFilter.Frame = false + gui.Views.MenuFilter.Editable = true + gui.Views.MenuFilter.Editor = gocui.EditorFunc(gui.menuFilterEditor) + // The filter row belongs to the menu: it shares the menu's focus, and keys + // that the input field doesn't take are the menu's to handle. + gui.Views.MenuFilterFrame.ParentView = gui.Views.Menu + gui.Views.MenuFilter.ParentView = gui.Views.Menu + gui.Views.Tooltip.Visible = false gui.Views.Tooltip.AutoRenderHyperLinks = true @@ -155,17 +171,30 @@ func (gui *Gui) createAllViews() error { return nil } +// gocui expects a view's frame runes in this order: the horizontal and the +// vertical edge, then the top left, top right, bottom left and bottom right +// corner. +func frameRunesWithTopCorners(frameRunes []rune, topLeft rune, topRight rune) []rune { + return []rune{frameRunes[0], frameRunes[1], topLeft, topRight, frameRunes[4], frameRunes[5]} +} + func (gui *Gui) configureViewProperties() { frameRunes := []rune{'─', '│', '┌', '┐', '└', '┘'} + // The corners for a view that hangs off the bottom of another one, so that the + // border they share reads as a divider rather than as two frames touching. + teeLeft, teeRight := '├', '┤' switch gui.c.UserConfig().Gui.Border { case "double": frameRunes = []rune{'═', '║', '╔', '╗', '╚', '╝'} + teeLeft, teeRight = '╠', '╣' case "rounded": frameRunes = []rune{'─', '│', '╭', '╮', '╰', '╯'} case "hidden": frameRunes = []rune{' ', ' ', ' ', ' ', ' ', ' '} + teeLeft, teeRight = ' ', ' ' case "bold": frameRunes = []rune{'━', '┃', '┏', '┓', '┗', '┛'} + teeLeft, teeRight = '┣', '┫' } for _, mapping := range gui.orderedViewNameMappings() { @@ -177,14 +206,18 @@ func (gui *Gui) configureViewProperties() { (*mapping.viewPtr).InactiveViewSelBgColor = theme.GocuiInactiveViewSelectedLineBgColor } + gui.Views.MenuFilterFrame.FrameRunes = frameRunesWithTopCorners(frameRunes, teeLeft, teeRight) + gui.c.SetViewContent(gui.Views.SearchPrefix, gui.c.Tr.SearchPrefix) gui.Views.Stash.Title = gui.c.Tr.StashTitle gui.Views.Commits.Title = gui.c.Tr.CommitsTitle + gui.Views.ReflogCommits.Title = gui.c.Tr.ReflogCommitsTitle gui.Views.CommitFiles.Title = gui.c.Tr.CommitFiles gui.Views.Branches.Title = gui.c.Tr.BranchesTitle gui.Views.Remotes.Title = gui.c.Tr.RemotesTitle gui.Views.Worktrees.Title = gui.c.Tr.WorktreesTitle + gui.Views.Submodules.Title = gui.c.Tr.SubmodulesTitle gui.Views.Tags.Title = gui.c.Tr.TagsTitle gui.Views.Files.Title = gui.c.Tr.FilesTitle gui.Views.PatchBuilding.Title = gui.c.Tr.Patch @@ -209,66 +242,64 @@ func (gui *Gui) configureViewProperties() { gui.Views.CommitDescription.TextArea.AutoWrap = gui.c.UserConfig().Git.Commit.AutoWrapCommitMessage gui.Views.CommitDescription.TextArea.AutoWrapWidth = gui.c.UserConfig().Git.Commit.AutoWrapWidth - if gui.c.UserConfig().Gui.ShowPanelJumps { - keyToTitlePrefix := func(key string) string { - if key == "" { - return "" - } - return fmt.Sprintf("[%s]", key) + keyToTitlePrefix := func(binding config.Keybinding) string { + if len(binding) == 0 { + return "" } - jumpBindings := gui.c.UserConfig().Keybinding.Universal.JumpToBlock - jumpLabels := lo.Map(jumpBindings, func(binding string, _ int) string { - return keyToTitlePrefix(binding) + return fmt.Sprintf("[%s]", binding[0]) + } + + // The views that make up each side panel, in panel order. The whole group + // shares the panel's jump label. + panelViewGroups := lo.Map(gui.c.UserConfig().Gui.SidePanels, func(panel config.SidePanel, _ int) []*gocui.View { + return lo.Map(panel, func(name string, _ int) *gocui.View { + view, _ := gui.g.View(sidePanelViewNames[name]) + return view }) + }) - gui.Views.Status.TitlePrefix = jumpLabels[0] + jumpBindings := gui.c.UserConfig().Keybinding.Universal.JumpToBlock + jumpLabelForPanel := func(panelIndex int) string { + if !gui.c.UserConfig().Gui.ShowPanelJumps || panelIndex >= len(jumpBindings) { + return "" + } + return keyToTitlePrefix(jumpBindings[panelIndex]) + } - gui.Views.Files.TitlePrefix = jumpLabels[1] - gui.Views.Worktrees.TitlePrefix = jumpLabels[1] - gui.Views.Submodules.TitlePrefix = jumpLabels[1] - - gui.Views.Branches.TitlePrefix = jumpLabels[2] - gui.Views.Remotes.TitlePrefix = jumpLabels[2] - gui.Views.Tags.TitlePrefix = jumpLabels[2] - - gui.Views.Commits.TitlePrefix = jumpLabels[3] - gui.Views.ReflogCommits.TitlePrefix = jumpLabels[3] - - gui.Views.Stash.TitlePrefix = jumpLabels[4] + for panelIndex, views := range panelViewGroups { + prefix := jumpLabelForPanel(panelIndex) + for _, view := range views { + view.TitlePrefix = prefix + } + } + if gui.c.UserConfig().Gui.ShowPanelJumps { gui.Views.Main.TitlePrefix = keyToTitlePrefix(gui.c.UserConfig().Keybinding.Universal.FocusMainView) } else { - gui.Views.Status.TitlePrefix = "" - - gui.Views.Files.TitlePrefix = "" - gui.Views.Worktrees.TitlePrefix = "" - gui.Views.Submodules.TitlePrefix = "" - - gui.Views.Branches.TitlePrefix = "" - gui.Views.Remotes.TitlePrefix = "" - gui.Views.Tags.TitlePrefix = "" - - gui.Views.Commits.TitlePrefix = "" - gui.Views.ReflogCommits.TitlePrefix = "" - - gui.Views.Stash.TitlePrefix = "" - gui.Views.Main.TitlePrefix = "" } - for _, view := range gui.g.Views() { - // if the view is in our mapping, we'll set the tabs and the tab index - for _, values := range gui.viewTabMap() { - index := slices.IndexFunc(values, func(tabContext context.TabView) bool { - return tabContext.ViewName == view.Name() - }) - - if index != -1 { - view.Tabs = lo.Map(values, func(tabContext context.TabView, _ int) string { - return tabContext.Tab - }) - view.TabIndex = index - } + // Index the tab strips by view so we can both set them on views that are + // part of a multi-tab panel and clear them on views that no longer are + // (which matters when the config is reloaded and a tab becomes a standalone + // panel). + type viewTabs struct { + tabs []string + index int + } + tabsByView := map[string]viewTabs{} + for _, values := range gui.viewTabMap() { + labels := lo.Map(values, func(tabContext context.TabView, _ int) string { + return tabContext.Tab + }) + for index, tabContext := range values { + tabsByView[tabContext.ViewName] = viewTabs{tabs: labels, index: index} } } + + for _, view := range gui.g.Views() { + vt := tabsByView[view.Name()] + view.Tabs = vt.tabs + view.TabIndex = vt.index + } } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 54d8ba893..ade270fb6 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -101,6 +101,10 @@ type TranslationSet struct { MergeConflictPressEnterToResolve string MergeConflictKeepFile string MergeConflictDeleteFile string + MergeConflictTakeCurrentCommit string + MergeConflictTakeIncomingCommit string + SubmoduleMergeConflictDescription string + StageConflictsRangeDisabled string Checkout string CheckoutTooltip string CantCheckoutBranchWhilePulling string @@ -231,7 +235,6 @@ type TranslationSet struct { StashChanges string RenameStash string RenameStashPrompt string - OpenConfig string EditConfig string ForcePush string ForcePushPrompt string @@ -282,6 +285,8 @@ type TranslationSet struct { AllBranchesLogGraphReverse string UnsupportedGitService string CopyPullRequestURL string + OpenPullRequestInBrowser string + NoPullRequestForBranch string NoBranchOnRemote string Fetch string FetchTooltip string @@ -315,7 +320,7 @@ type TranslationSet struct { ViewConflictsMenuItem string AbortMenuItem string PickHunk string - PickAllHunks string + PickBothHunks string ViewMergeRebaseOptions string ViewMergeRebaseOptionsTooltip string ViewMergeOptions string @@ -335,7 +340,6 @@ type TranslationSet struct { CommitDescriptionTitle string CommitDescriptionSubTitle string CommitDescriptionFooter string - CommitDescriptionFooterTwoBindings string CommitHooksDisabledSubTitle string LocalBranchesTitle string SearchTitle string @@ -363,12 +367,19 @@ type TranslationSet struct { FwdNoLocalUpstream string FwdCommitsToPush string PullRequestNoUpstream string + PullRequestChecksPassing string + PullRequestChecksPending string + PullRequestChecksFailing string + PullRequestChecksError string + PullRequestChecksExpected string ErrorOccurred string ConflictLabel string PendingRebaseTodosSectionHeader string PendingCherryPicksSectionHeader string PendingRevertsSectionHeader string CommitsSectionHeader string + MoveCommitsHere string + MovingCommitsHere string YouDied string RewordNotSupported string ChangingThisActionIsNotAllowed string @@ -423,11 +434,18 @@ type TranslationSet struct { UndoingStatus string RedoingStatus string CheckingOutStatus string + CreatingBranchStatus string CommittingStatus string RewordingStatus string RevertingStatus string + ResettingStatus string CreatingFixupCommitStatus string MovingCommitsToNewBranchStatus string + ApplyingFilterStatus string + RemovingFilterStatus string + StashingStatus string + ApplyingStashStatus string + PoppingStashStatus string CommitFiles string SubCommitsDynamicTitle string CommitFilesDynamicTitle string @@ -446,6 +464,7 @@ type TranslationSet struct { DisabledForGPG string CreateRepo string BareRepo string + BareRepoNotSupported string InitialBranch string NoRecentRepositories string IncorrectNotARepository string @@ -604,16 +623,23 @@ type TranslationSet struct { ViewResetToUpstreamOptions string NextScreenMode string PrevScreenMode string - CyclePagers string - CyclePagersTooltip string - CyclePagersDisabledReason string + CycleDiffRenderers string + CycleDiffRenderersTooltip string + CycleDiffRenderersReverse string + CycleDiffRenderersReverseTooltip string + CycleDiffRenderersDisabledReason string + SelectedDiffRenderers string + DefaultDiffRendererName string + ExternalDiffDiffRendererName string StartSearch string StartFilter string + SelectRemoteRepository string + FetchingPullRequests string Keybindings string - KeybindingsLegend string KeybindingsMenuSectionLocal string KeybindingsMenuSectionGlobal string KeybindingsMenuSectionNavigation string + KeybindingsTooltip string RenameBranch string Upstream string BranchUpstreamOptionsTitle string @@ -757,6 +783,7 @@ type TranslationSet struct { ErrStageDirWithInlineMergeConflicts string ErrRepositoryMovedOrDeleted string ErrWorktreeMovedOrRemoved string + CantSwitchWhileOperationInProgress string CommandLog string ToggleShowCommandLog string FocusCommandLog string @@ -808,6 +835,7 @@ type TranslationSet struct { SortCommits string SortCommitsTooltip string CantChangeContextSizeError string + CantChangeRenameThresholdError string OpenCommitInBrowser string ViewBisectOptions string ConfirmRevertCommit string @@ -851,6 +879,7 @@ type TranslationSet struct { SearchPrefix string FilterPrefix string FilterPrefixMenu string + MenuFilterHint string ExitSearchMode string ExitTextFilterMode string Switch string @@ -863,11 +892,16 @@ type TranslationSet struct { Switching string RemoveWorktree string RemoveWorktreeTitle string + RemoveWorktreeMenuTitle string + RemoveWorktreeAndDeleteBranch string + RemoveWorktreeAndDeleteBothBranches string + WorktreeNotCheckedOutOnBranch string DetachWorktree string + DetachWorktreeAndDeleteBranch string + DetachWorktreeAndDeleteBothBranches string DetachingWorktree string WorktreesTitle string WorktreeTitle string - RemoveWorktreePrompt string ForceRemoveWorktreePrompt string RemovingWorktree string AddingWorktree string @@ -879,15 +913,25 @@ type TranslationSet struct { MainWorktree string NewWorktree string NewWorktreePath string - NewWorktreeBase string RemoveWorktreeTooltip string NewBranchName string - NewBranchNameLeaveBlank string - ViewWorktreeOptions string - CreateWorktreeFrom string - CreateWorktreeFromDetached string + NewWorktreeName string + NewWorktreeForBranchTitle string + NewBranchAndWorktreeName string + NewBranchAndWorktreeFromRef string + NewLocalBranchAndWorktreeFromRef string + WorktreeForRef string + DetachedWorktreeAtRef string + WorktreeLocationTitle string + WorktreeLocationOther string + WorktreeLocationPromptNewBranch string + WorktreeLocationPromptTrackingBranch string + WorktreeLocationPromptCheckout string + WorktreeLocationPromptDetached string LcWorktree string ChangingDirectoryTo string + DirenvApprovalTitle string + DirenvApprovalPrompt string Name string Branch string Path string @@ -912,6 +956,7 @@ type TranslationSet struct { SelectedItemIsNotABranch string SelectedItemDoesNotHaveFiles string MultiSelectNotSupportedForSubmodules string + NothingToStageForSubmodule string CommandDoesNotSupportOpeningInEditor string CustomCommands string NoApplicableCommandsInThisContext string @@ -953,11 +998,15 @@ type Log struct { EditRebase string HandleUndo string RemoveFile string + RemoveEmptyDir string CopyToClipboard string Remove string CreateFileWithContent string AppendingLineToFile string EditRebaseFromBaseCommit string + DroppingStash string + PoppingStash string + DeletingBranch string } type Actions struct { @@ -1013,6 +1062,8 @@ type Actions struct { StageAllFiles string ResolveConflictByKeepingFile string ResolveConflictByDeletingFile string + TakeCurrentSubmoduleCommit string + TakeIncomingSubmoduleCommit string NotEnoughContextToStage string NotEnoughContextToDiscard string NotEnoughContextToRemoveLines string @@ -1094,12 +1145,7 @@ Thanks for using lazygit! Seriously you rock. Three things to share with you: 2) Be sure to read the latest release notes at: https://github.com/jesseduffield/lazygit/releases - 3) If you're using git, that makes you a programmer! With your help we can make - lazygit better, so consider becoming a contributor and joining the fun at - https://github.com/jesseduffield/lazygit - Or even just star the repo to share the love! - - 4) If lazygit has made your life easier, you can say thanks by clicking the + 3) If lazygit has made your life easier, you can say thanks by clicking the donate button at the bottom right. Donation does not grant priority support, but it is much appreciated. @@ -1186,6 +1232,10 @@ func EnglishTranslationSet() *TranslationSet { MergeConflictPressEnterToResolve: "Press %s to resolve.", MergeConflictKeepFile: "Keep file", MergeConflictDeleteFile: "Delete file", + MergeConflictTakeCurrentCommit: "Take current commit", + MergeConflictTakeIncomingCommit: "Take incoming commit", + SubmoduleMergeConflictDescription: "Conflict: the submodule '{{.path}}' was set to a different commit in the current and the incoming changes. Pick which commit to keep.", + StageConflictsRangeDisabled: "Cannot stage a selection that includes files with merge conflicts; resolve them individually with {{.goIntoKey}} first.", Checkout: "Checkout", CheckoutTooltip: "Checkout selected item.", CantCheckoutBranchWhilePulling: "You cannot checkout another branch while pulling the current branch", @@ -1314,7 +1364,7 @@ func EnglishTranslationSet() *TranslationSet { RewordCommitEditor: "Reword with editor", Error: "Error", PickHunk: "Pick hunk", - PickAllHunks: "Pick all hunks", + PickBothHunks: "Pick both hunks", Undo: "Undo", UndoReflog: "Undo", RedoReflog: "Redo", @@ -1342,7 +1392,6 @@ func EnglishTranslationSet() *TranslationSet { StashChanges: "Stash changes", RenameStash: "Rename stash", RenameStashPrompt: "Rename stash: {{.stashName}}", - OpenConfig: "Open config file", EditConfig: "Edit config file", ForcePush: "Force push", ForcePushPrompt: "Your branch has diverged from the remote branch. Press {{.cancelKey}} to cancel, or {{.confirmKey}} to force push.", @@ -1394,6 +1443,8 @@ func EnglishTranslationSet() *TranslationSet { UnsupportedGitService: `Unsupported git service`, CreatePullRequest: `Create pull request`, CopyPullRequestURL: `Copy pull request URL to clipboard`, + OpenPullRequestInBrowser: `Open pull request in browser`, + NoPullRequestForBranch: `No pull request found for this branch`, NoBranchOnRemote: `This branch doesn't exist on remote. You need to push it to remote first.`, Fetch: `Fetch`, FetchTooltip: "Fetch changes from remote.", @@ -1447,7 +1498,6 @@ func EnglishTranslationSet() *TranslationSet { CommitDescriptionTitle: "Commit description", CommitDescriptionSubTitle: "Press {{.togglePanelKeyBinding}} to toggle focus, {{.commitMenuKeybinding}} to open menu", CommitDescriptionFooter: "Press {{.confirmInEditorKeybinding}} to submit", - CommitDescriptionFooterTwoBindings: "Press {{.confirmInEditorKeybinding1}} or {{.confirmInEditorKeybinding2}} to submit", CommitHooksDisabledSubTitle: "(hooks disabled)", LocalBranchesTitle: "Local branches", SearchTitle: "Search", @@ -1468,6 +1518,7 @@ func EnglishTranslationSet() *TranslationSet { KeybindingsMenuSectionLocal: "Local", KeybindingsMenuSectionGlobal: "Global", KeybindingsMenuSectionNavigation: "Navigation", + KeybindingsTooltip: "Keybindings: ", RebasingTitle: "Rebase '{{.checkedOutBranch}}'", RebasingFromBaseCommitTitle: "Rebase '{{.checkedOutBranch}}' from marked base", SimpleRebase: "Simple rebase onto '{{.ref}}'", @@ -1480,12 +1531,19 @@ func EnglishTranslationSet() *TranslationSet { FwdNoLocalUpstream: "Cannot fast-forward a branch whose remote is not registered locally", FwdCommitsToPush: "Cannot fast-forward a branch with commits to push", PullRequestNoUpstream: "Cannot open a pull request for a branch with no upstream", + PullRequestChecksPassing: "Passing", + PullRequestChecksPending: "Pending", + PullRequestChecksFailing: "Failing", + PullRequestChecksError: "Error", + PullRequestChecksExpected: "Expected", ErrorOccurred: "An error occurred! Please create an issue at", ConflictLabel: "CONFLICT", PendingRebaseTodosSectionHeader: "Pending rebase todos", PendingCherryPicksSectionHeader: "Pending cherry-picks", PendingRevertsSectionHeader: "Pending reverts", CommitsSectionHeader: "Commits", + MoveCommitsHere: "drop here", + MovingCommitsHere: "moving commits here", YouDied: "YOU DIED!", RewordNotSupported: "Rewording commits while interactively rebasing is not currently supported", ChangingThisActionIsNotAllowed: "Changing this kind of rebase todo entry is not allowed", @@ -1540,11 +1598,18 @@ func EnglishTranslationSet() *TranslationSet { UndoingStatus: "Undoing", RedoingStatus: "Redoing", CheckingOutStatus: "Checking out", + CreatingBranchStatus: "Creating branch", CommittingStatus: "Committing", RewordingStatus: "Rewording", RevertingStatus: "Reverting", + ResettingStatus: "Resetting", CreatingFixupCommitStatus: "Creating fixup commit", MovingCommitsToNewBranchStatus: "Moving commits to new branch", + ApplyingFilterStatus: "Applying filter", + RemovingFilterStatus: "Removing filter", + StashingStatus: "Stashing", + ApplyingStashStatus: "Applying stash", + PoppingStashStatus: "Popping stash", CommitFiles: "Commit files", SubCommitsDynamicTitle: "Commits (%s)", CommitFilesDynamicTitle: "Diff files (%s)", @@ -1562,7 +1627,8 @@ func EnglishTranslationSet() *TranslationSet { DiscardFileChangesPromptResetPatch: "Are you sure you want to discard changes to the selected file(s) from this commit?\n\nThis action will start a rebase, reverting these file changes. Be aware that if subsequent commits depend on these changes, you may need to resolve conflicts.\n\nNote: This will reset the active custom patch!", DisabledForGPG: "Feature not available for users using GPG.\n\nIf you are using a passphrase agent (e.g. gpg-agent) so that you don't have to type your passphrase when signing, you can enable this feature by adding\n\ngit:\n overrideGpg: true\n\nto your lazygit config file.", CreateRepo: "Not in a git repository. Create a new git repository? (y/N): ", - BareRepo: "You've attempted to open Lazygit in a bare repo but Lazygit does not yet support bare repos. Open most recent repo? (y/n) ", + BareRepo: "You've attempted to open Lazygit in a bare repo but Lazygit does not support bare repos. Open most recent repo? (y/n) ", + BareRepoNotSupported: "Lazygit does not support bare repos.", InitialBranch: "Branch name? (leave empty for git's default): ", NoRecentRepositories: "Must open lazygit in a git repository. No valid recent repositories. Exiting.", IncorrectNotARepository: "The value of 'notARepository' is incorrect. It should be one of 'prompt', 'create', 'skip', or 'quit'.", @@ -1724,12 +1790,18 @@ func EnglishTranslationSet() *TranslationSet { ViewResetToUpstreamOptions: "View upstream reset options", NextScreenMode: "Next screen mode (normal/half/fullscreen)", PrevScreenMode: "Prev screen mode", - CyclePagers: "Cycle pagers", - CyclePagersTooltip: "Choose the next pager in the list of configured pagers", - CyclePagersDisabledReason: "No other pagers configured", + CycleDiffRenderers: "Cycle diff renderers", + CycleDiffRenderersTooltip: "Choose the next renderer in the list of configured diff renderers.", + CycleDiffRenderersReverse: "Cycle diff renderers (reverse)", + CycleDiffRenderersReverseTooltip: "Choose the previous renderer in the list of configured diff renderers.", + CycleDiffRenderersDisabledReason: "No other diff renderers configured", + SelectedDiffRenderers: "Diff renderer: {{.name}} ({{.current}} of {{.total}})", + DefaultDiffRendererName: "(default)", + ExternalDiffDiffRendererName: "(external diff)", StartSearch: "Search the current view by text", StartFilter: "Filter the current view by text", - KeybindingsLegend: "Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b", + SelectRemoteRepository: "Select base repository for pull requests", + FetchingPullRequests: "Fetching pull requests", RenameBranch: "Rename branch", BranchUpstreamOptionsTitle: "Upstream options", ViewBranchUpstreamOptions: "View upstream options", @@ -1874,6 +1946,7 @@ func EnglishTranslationSet() *TranslationSet { ErrRepositoryMovedOrDeleted: "Cannot find repo. It might have been moved or deleted ¯\\_(ツ)_/¯", CommandLog: "Command log", ErrWorktreeMovedOrRemoved: "Cannot find worktree. It might have been moved or removed ¯\\_(ツ)_/¯", + CantSwitchWhileOperationInProgress: "Can't switch repositories while an operation is in progress", ToggleShowCommandLog: "Toggle show/hide command log", FocusCommandLog: "Focus command log", CommandLogHeader: "You can hide/focus this panel by pressing '%s'\n", @@ -1922,6 +1995,7 @@ func EnglishTranslationSet() *TranslationSet { SortCommits: "Commit sort order", SortCommitsTooltip: "Change the sort order of the commits in the commit log.\n\nThe default can be changed in the config file with the key 'git.log.sortOrder'.", CantChangeContextSizeError: "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!", + CantChangeRenameThresholdError: "Cannot change the rename similarity threshold while in patch building mode, because the custom patch can't cope with a rename turning into a delete and add underneath it.", OpenCommitInBrowser: "Open commit in browser", ViewBisectOptions: "View bisect options", ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?", @@ -1966,7 +2040,8 @@ func EnglishTranslationSet() *TranslationSet { SearchKeybindings: "%s: Next match, %s: Previous match, %s: Exit search mode", SearchPrefix: "Search: ", FilterPrefix: "Filter: ", - FilterPrefixMenu: "Filter (prepend '@' to filter keybindings): ", + FilterPrefixMenu: "Filter ('@' for keybindings): ", + MenuFilterHint: "(Type to filter)", WorktreesTitle: "Worktrees", WorktreeTitle: "Worktree", Switch: "Switch", @@ -1979,10 +2054,15 @@ func EnglishTranslationSet() *TranslationSet { Switching: "Switching", RemoveWorktree: "Remove worktree", RemoveWorktreeTitle: "Remove worktree", - RemoveWorktreePrompt: "Are you sure you want to remove worktree '{{.worktreeName}}'?", + RemoveWorktreeMenuTitle: "Remove worktree '{{.worktreeName}}'?", + RemoveWorktreeAndDeleteBranch: "Remove worktree and delete branch", + RemoveWorktreeAndDeleteBothBranches: "Remove worktree and delete local and remote branch", + WorktreeNotCheckedOutOnBranch: "This worktree is not checked out on a branch", ForceRemoveWorktreePrompt: "'{{.worktreeName}}' contains modified or untracked files, or submodules (or all of these). Are you sure you want to remove it?", RemovingWorktree: "Deleting worktree", DetachWorktree: "Detach worktree", + DetachWorktreeAndDeleteBranch: "Detach worktree and delete branch", + DetachWorktreeAndDeleteBothBranches: "Detach worktree and delete local and remote branch", DetachingWorktree: "Detaching worktree", AddingWorktree: "Adding worktree", CantDeleteCurrentWorktree: "You cannot remove the current worktree!", @@ -1993,15 +2073,25 @@ func EnglishTranslationSet() *TranslationSet { MainWorktree: "(main worktree)", NewWorktree: "New worktree", NewWorktreePath: "New worktree path", - NewWorktreeBase: "New worktree base ref", RemoveWorktreeTooltip: "Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory.", NewBranchName: "New branch name", - NewBranchNameLeaveBlank: "New branch name (leave blank to checkout {{.default}})", - ViewWorktreeOptions: "View worktree options", - CreateWorktreeFrom: "Create worktree from {{.ref}}", - CreateWorktreeFromDetached: "Create worktree from {{.ref}} (detached)", + NewWorktreeName: "New worktree name", + NewWorktreeForBranchTitle: "New worktree for branch", + NewBranchAndWorktreeName: "New branch and worktree name", + NewBranchAndWorktreeFromRef: "New branch and worktree from '{{.ref}}'", + NewLocalBranchAndWorktreeFromRef: "New local branch and worktree from '{{.ref}}'", + WorktreeForRef: "New worktree for '{{.ref}}'", + DetachedWorktreeAtRef: "New detached worktree at '{{.ref}}'", + WorktreeLocationTitle: "Worktree location", + WorktreeLocationOther: "Other…", + WorktreeLocationPromptNewBranch: "New branch '{{.name}}' from '{{.base}}':", + WorktreeLocationPromptTrackingBranch: "New branch '{{.name}}' tracking '{{.ref}}':", + WorktreeLocationPromptCheckout: "Worktree for branch '{{.branchName}}':", + WorktreeLocationPromptDetached: "Detached worktree at '{{.ref}}':", LcWorktree: "worktree", ChangingDirectoryTo: "Changing directory to {{.path}}", + DirenvApprovalTitle: "Approve .envrc?", + DirenvApprovalPrompt: "Press {{.confirmKey}} to run 'direnv allow' and load the environment.\nPress {{.cancelKey}} to skip.\n\n{{.content}}", Name: "Name", Branch: "Branch", Path: "Path", @@ -2024,6 +2114,7 @@ func EnglishTranslationSet() *TranslationSet { SelectedItemIsNotABranch: "Selected item is not a branch", SelectedItemDoesNotHaveFiles: "Selected item does not have files to view", MultiSelectNotSupportedForSubmodules: "Multiselection not supported for submodules", + NothingToStageForSubmodule: "Nothing to stage: the parent repo can only stage a new submodule commit, not the uncommitted changes inside a submodule. Commit inside the submodule first.", CommandDoesNotSupportOpeningInEditor: "This command doesn't support switching to the editor", CustomCommands: "Custom commands", NoApplicableCommandsInThisContext: "(No applicable commands in this context)", @@ -2090,6 +2181,8 @@ func EnglishTranslationSet() *TranslationSet { StageAllFiles: "Stage all files", ResolveConflictByKeepingFile: "Resolve by keeping file", ResolveConflictByDeletingFile: "Resolve by deleting file", + TakeCurrentSubmoduleCommit: "Resolve submodule conflict by taking current commit", + TakeIncomingSubmoduleCommit: "Resolve submodule conflict by taking incoming commit", NotEnoughContextToStage: "Staging or unstaging changes is not possible with a diff context size of 0. Increase the context using '%s'.", NotEnoughContextToDiscard: "Discarding changes is not possible with a diff context size of 0. Increase the context using '%s'.", NotEnoughContextToRemoveLines: "Removing lines from a commit is not possible with a diff context size of 0. Increase the context using '%s'.", @@ -2182,11 +2275,15 @@ func EnglishTranslationSet() *TranslationSet { EditRebase: "Beginning interactive rebase at '{{.ref}}'", HandleUndo: "Undoing last conflict resolution", RemoveFile: "Deleting path '{{.path}}'", + RemoveEmptyDir: "Deleting empty directory '{{.path}}'", CopyToClipboard: "Copying '{{.str}}' to clipboard", Remove: "Removing '{{.filename}}'", CreateFileWithContent: "Creating file '{{.path}}'", AppendingLineToFile: "Appending '{{.line}}' to file '{{.filename}}'", - EditRebaseFromBaseCommit: "Beginning interactive rebase from '{{.baseCommit}}' onto '{{.targetBranchName}}", + EditRebaseFromBaseCommit: "Beginning interactive rebase from '{{.baseCommit}}' onto '{{.targetBranchName}}'", + DroppingStash: "Dropping stash %s", + PoppingStash: "Popping stash %s", + DeletingBranch: "Deleting branch '{{.branchName}}' (was {{.hash}})", }, BreakingChangesTitle: "Breaking Changes", BreakingChangesMessage: `You are updating to a new version of lazygit which contains breaking changes. Please review the notes below and update your configuration if necessary. @@ -2244,9 +2341,15 @@ gui: keybinding: universal: suspendApp: - redo: + redo: -- The 'git.paging.useConfig' option has been removed. If you were relying on it to configure your pager, you'll have to explicitly set the pager again using the 'git.paging.pager' option. +- The 'git.paging.useConfig' option has been removed. If you were relying on it to configure your pager, you'll have to explicitly set the command again using the 'git.diffRenderers.*.command' option. +`, + "0.62.0": `- The default keybinding for submitting a commit from the commit description editor has changed from alt-enter to command-enter on Mac, or ctrl-enter on Linux and Windows; these are the same bindings that are used in many multi-line edit field situations, e.g. in GitHub comments. Unfortunately these are not supported by all terminals; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md#terminal-compatibility for more on that. If you want to revert this change, you can do so by adding the following to your config: + +keybinding: + universal: + confirmInEditor: [, ] `, }, } diff --git a/pkg/i18n/i18n_test.go b/pkg/i18n/i18n_test.go index 8c5787fcb..71d568647 100644 --- a/pkg/i18n/i18n_test.go +++ b/pkg/i18n/i18n_test.go @@ -104,6 +104,8 @@ func TestNewTranslationSetFromConfig(t *testing.T) { for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { log := newDummyLog() + t.Setenv("LC_ALL", "") + t.Setenv("LC_MESSAGES", "") t.Setenv("LANG", s.envLanguage) actualTranslationSet, err := NewTranslationSetFromConfig(log, s.configLanguage) if s.expectedErr { diff --git a/pkg/i18n/translations/ja.json b/pkg/i18n/translations/ja.json index a1f829204..8716d4da4 100644 --- a/pkg/i18n/translations/ja.json +++ b/pkg/i18n/translations/ja.json @@ -207,7 +207,6 @@ "StashChanges": "変更をスタッシュ（一時保存）", "RenameStash": "スタッシュの名前を変更", "RenameStashPrompt": "スタッシュの名前を変更: {{.stashName}}", - "OpenConfig": "設定ファイルを開く", "EditConfig": "設定ファイルを編集", "ForcePush": "強制プッシュ", "ForcePushPrompt": "ローカルブランチはリモートブランチから分岐しています。キャンセルするには{{.cancelKey}}を、強制プッシュするには{{.confirmKey}}を押してください。", @@ -276,7 +275,6 @@ "ViewConflictsMenuItem": "コンフリクトを表示", "AbortMenuItem": "%s を中止", "PickHunk": "ハンクを選択", - "PickAllHunks": "すべてのハンクを選択", "ViewMergeRebaseOptions": "マージ/リベースオプションを表示", "ViewMergeRebaseOptionsTooltip": "現在のマージ/リベースを中止/継続/スキップするオプションを表示します。", "ViewMergeOptions": "マージオプションを表示", @@ -392,7 +390,6 @@ "DiscardFileChangesTitle": "ファイルの変更を破棄", "DisabledForGPG": "GPGを使用しているユーザーには利用できない機能です。\n\nパスフレーズエージェント（gpg-agentなど）を使用して署名時にパスフレーズを入力しなくても済むようにしている場合は、lazygitの設定ファイルに\n\ngit:\n overrideGpg: true\n\nを追加することでこの機能を有効にできます。", "CreateRepo": "Gitリポジトリがありません。新しいgitリポジトリを作成しますか？ (y/N): ", - "BareRepo": "ベアリポジトリでLazygitを開こうとしましたが、Lazygitはまだベアリポジトリをサポートしていません。最近のリポジトリを開いてよろしいですか？ (y/n) ", "InitialBranch": "ブランチ名（gitのデフォルトの場合は空のままにしてください）: ", "NoRecentRepositories": "Lazygitはgitリポジトリで開く必要があります。有効な最近のリポジトリはありません。終了します。", "IncorrectNotARepository": "'notARepository'の値が正しくありません。'prompt'、'create'、'skip'、または'quit'のいずれかである必要があります。", @@ -543,7 +540,6 @@ "StartSearch": "現在のビューをテキストで検索", "StartFilter": "現在のビューをテキストでフィルタリング", "Keybindings": "キーバインディング", - "KeybindingsLegend": "凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味します", "KeybindingsMenuSectionLocal": "ローカル", "KeybindingsMenuSectionGlobal": "グローバル", "KeybindingsMenuSectionNavigation": "ナビゲーション", @@ -767,11 +763,14 @@ "Switching": "チェックアウト中", "RemoveWorktree": "ワークツリーを削除", "RemoveWorktreeTitle": "ワークツリーを削除", + "RemoveWorktreeAndDeleteBranch": "ワークツリーとローカルブランチを削除", + "RemoveWorktreeAndDeleteBothBranches": "ワークツリーとローカル/リモートブランチを削除", "DetachWorktree": "ワークツリーをデタッチ", + "DetachWorktreeAndDeleteBranch": "ワークツリーをデタッチしてローカルブランチを削除", + "DetachWorktreeAndDeleteBothBranches": "ワークツリーをデタッチしてローカル/リモートブランチを削除", "DetachingWorktree": "ワークツリーをデタッチ中", "WorktreesTitle": "ワークツリー", "WorktreeTitle": "ワークツリー", - "RemoveWorktreePrompt": "ワークツリー '{{.worktreeName}}' を削除してよろしいですか？", "RemovingWorktree": "ワークツリーを削除中", "AddingWorktree": "ワークツリーを追加中", "CantDeleteCurrentWorktree": "現在のワークツリーは削除できません！", @@ -781,13 +780,8 @@ "MissingWorktree": "（見つかりません）", "NewWorktree": "新しいワークツリー", "NewWorktreePath": "新しいワークツリーのパス", - "NewWorktreeBase": "新しいワークツリーのベース参照", "RemoveWorktreeTooltip": "選択したワークツリーを削除します。これはワークツリーのディレクトリとワークツリーに関するメタデータの両方を.gitディレクトリから削除します。", "NewBranchName": "新しいブランチ名", - "NewBranchNameLeaveBlank": "新しいブランチ名（{{.default}} をチェックアウトするには空白のままにしてください）", - "ViewWorktreeOptions": "ワークツリーオプションを表示", - "CreateWorktreeFrom": "{{.ref}} からワークツリーを作成", - "CreateWorktreeFromDetached": "{{.ref}} からワークツリーを作成（デタッチド）", "LcWorktree": "ワークツリー", "ChangingDirectoryTo": "ディレクトリを {{.path}} に変更中", "Name": "名前", diff --git a/pkg/i18n/translations/ko.json b/pkg/i18n/translations/ko.json index cff55d818..dd02302ba 100644 --- a/pkg/i18n/translations/ko.json +++ b/pkg/i18n/translations/ko.json @@ -1,381 +1,380 @@ { - "NotEnoughSpace": "패널을 렌더링 할 공간이 부족합니다.", - "DiffTitle": "변경점", - "FilesTitle": "파일", - "BranchesTitle": "브랜치", - "CommitsTitle": "커밋", - "EasterEgg": "이스터 에그", - "UnstagedChanges": "Staged되지 않은 변경 내용", - "StagedChanges": "Staged된 변경 내용", - "StagingTitle": "메인 패널 (Staging)", - "MergingTitle": "메인 패널 (Merging)", - "NormalTitle": "메인 패널 (Normal)", - "LogTitle": "로그", - "CommitSummary": "커밋 메시지", - "CredentialsUsername": "사용자 이름", - "CredentialsPassword": "패스워드", - "CredentialsPassphrase": "SSH키의 passphrase 입력", - "CredentialsPIN": "SSH키\u001d의 PIN\u001d을 입력", - "CredentialsToken": "SSH 키를 위한 토큰 입력", - "PassUnameWrong": "패스워드, passphrase 또는 사용자 이름이 잘못되었습니다.", - "Commit": "커밋 변경내용", - "CommitTooltip": "스테이징된 변경 사항 커밋.", - "AmendLastCommit": "마지맛 커밋 수정", - "AmendLastCommitTitle": "마지막 커밋 수정", - "SureToAmend": "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.", - "NoCommitToAmend": "Amend 가능한 커밋이 없습니다.", - "CommitChangesWithEditor": "Git 편집기를 사용하여 변경 내용을 커밋합니다.", - "NoBaseCommitsFound": "기본 커밋을 찾을 수 없습니다", - "MultipleBaseCommitsFoundStaged": "여러 개의 기본 커밋을 찾았습니다. (한 번에 더 적은 변경 사항을 스테이징해보세요)", - "MultipleBaseCommitsFoundUnstaged": "여러 개의 기본 커밋을 찾았습니다. (변경 사항 중 일부를 스테이징해보세요)", - "BaseCommitIsAlreadyOnMainBranch": "이 변경 사항의 기본 커밋은 이미 메인 브랜치에 있습니다", - "StatusTitle": "상태", - "GlobalTitle": "글로벌 키 바인딩", - "Execute": "실행", - "Stage": "Staged 전환", - "ToggleStagedAll": "모든 변경을 Staged/unstaged으로 전환", - "ToggleTreeView": "파일 트리뷰로 전환", - "OpenMergeTool": "Git mergetool를 열기", - "Refresh": "새로고침", - "Push": "푸시", - "Pull": "업데이트", - "FileFilter": "파일을 필터하기 (Staged/unstaged)", - "CopyToClipboardMenu": "클립보드에 복사", - "CopyFileName": "파일명", - "CopySelectedDiff": "선택한 파일의 변경점", - "CopyAllFilesDiff": "모든 파일의 변경점", - "NoContentToCopyError": "복사 대상이 없습니다", - "FileNameCopiedToast": "파일명을 클립보드에 복사했습니다.", - "FilePathCopiedToast": "파일경로를 클립보드에 복사했습니다.", - "FileDiffCopiedToast": "파일의 변경점을 클립보드에 복사했습니다.", - "AllFilesDiffCopiedToast": "모든 파일의 변경점을 클립보드에 복사했습니다.", - "FilterStagedFiles": "Staged된 파일만 표시", - "FilterUnstagedFiles": "Stage되지 않은 파일만 표시", - "MergeConflictsTitle": "병합 충돌", - "Checkout": "체크아웃", - "NoChangedFiles": "변경된 파일이 없습니다.", - "SoftReset": "소프트 리셋", - "AlreadyCheckedOutBranch": "브랜치가 이미 체크아웃 되었습니다", - "SureForceCheckout": "강제로 체크아웃하시겠습니까? 모든 로컬 변경 사항을 잃게 됩니다.", - "ForceCheckoutBranch": "브랜치 강제 체크아웃", - "BranchName": "브랜치 이름", - "NewBranchNameBranchOff": "새 브랜치 이름 (branch is off of '{{.branchName}}')", - "CantDeleteCheckOutBranch": "체크아웃하는 브랜치는 삭제할 수 없습니다!", - "DeleteBranchTitle": "'{{.selectedBranchName}}' 브랜치를 삭제하시겠습니까?", - "DeleteLocalBranch": "로컬 브랜치를 삭제", - "ForceDeleteBranchTitle": "브랜치를 강제 삭제", - "ForceDeleteBranchMessage": "'{{.selectedBranchName}}'는 완전히 병합되지 않았습니다. 정말 삭제하시겠습니까?", - "RebaseBranch": "체크아웃된 브랜치를 이 브랜치에 리베이스", - "CantRebaseOntoSelf": "브랜치를 자기 자신에게 리베이스할 수는 없습니다.", - "CantMergeBranchIntoItself": "브랜치를 자기 자신에게 병합할 수는 없습니다.", - "ForceCheckout": "강제 체크아웃", - "CheckoutByName": "이름으로 체크아웃", - "NewBranch": "새 브랜치 생성", - "NoBranchesThisRepo": "저장소에 브랜치가 존재하지 않습니다.", - "CommitWithoutMessageErr": "커밋 메시지를 입력하세요.", - "Close": "닫기", - "CloseCancel": "닫기/취소", - "Confirm": "확인", - "Quit": "종료", - "SureSquashThisCommit": "Are you sure you want to squash this commit into the commit below?", - "Squash": "스쿼시", - "PickCommitTooltip": "Pick commit (when mid-rebase)", - "Reword": "커밋메시지 변경", - "DropCommit": "커밋 삭제", - "MoveDownCommit": "커밋을 1개 아래로 이동", - "MoveUpCommit": "커밋을 1개 위로 이동", - "EditCommitTooltip": "커밋을 편집", - "AmendCommitTooltip": "Amend commit with staged changes", - "ResetAuthor": "Reset commit author", - "RewordCommitEditor": "에디터에서 커밋메시지 수정", - "NoCommitsThisBranch": "이 브랜치에 커밋이 없습니다.", - "Error": "오류", - "Undo": "되돌리기", - "UndoReflog": "되돌리기 (reflog) (실험적)", - "RedoReflog": "다시 실행 (reflog) (실험적)", - "Apply": "적용", - "NoStashEntries": "Stash가 존재하지 않습니다.", - "StashDrop": "Stash를 삭제", - "StashPop": "Stash를 pop", - "SurePopStashEntry": "정말로 Stash를 pop하시겠습니까?", - "StashApply": "Stash 적용", - "SureApplyStashEntry": "정말로 Stash를 적용하시겠습니까?", - "StashChanges": "변경을 Stash", - "OpenConfig": "설정 파일 열기", - "EditConfig": "설정 파일 수정", - "ForcePush": "강제 푸시", - "ForcePushPrompt": "브랜치가 원격 브랜치에서 분기하고 있습니다. 'esc'를 눌러 취소하거나, 'enter'를 눌러 강제로 푸시하세요.", - "ForcePushDisabled": "브랜치가 원격 브랜치에서 분기하고 있습니다. force push가 비활성화 되었습니다.", - "UpdatesRejectedAndForcePushDisabled": "업데이트가 거부되었으며 강제 푸시를 비활성화했습니다.", - "CheckForUpdate": "업데이트 확인", - "CheckingForUpdates": "업데이트 확인 중...", - "UpdateAvailableTitle": "새로운 업데이트 사용가능!", - "UpdateAvailable": "버전 {{.newVersion}} 을(를) 설치하시겠습니까?", - "UpdateInProgressWaitingStatus": "업데이트 중", - "UpdateCompletedTitle": "업데이트 완료!", - "UpdateCompleted": "업데이트 설치에 성공했습니다. lazygit를 재시작해주세요.", - "FailedToRetrieveLatestVersionErr": "버전 정보를 받아오는데 실패했습니다.", - "OnLatestVersionErr": "이미 최신 버전을 사용하고 있습니다.", - "MajorVersionErr": "새 버전 ({{.newVersion}}) 에 현재 버전({{.currentVersion}}) 과 비교할 때 호환되지 않는 변경 사항이 있습니다.", - "CouldNotFindBinaryErr": "{{.url}} 에서 바이너리를 찾을 수 없습니다.", - "UpdateFailedErr": "업데이트 실패: {{.errMessage}}", - "ConfirmQuitDuringUpdateTitle": "현재 업데이트 중입니다.", - "ConfirmQuitDuringUpdate": "현재 업데이트를 진행 중입니다.종료하시겠습니까?", - "GitconfigParseErr": "따옴표로 묶이지 않은 '\\' 문자가 있어서 Gogit이 gitconfig 파일을 분석하지 못했습니다. 이를 제거하면 문제가 해결됩니다.", - "EditFile": "파일 편집", - "OpenFile": "파일 닫기", - "IgnoreFile": ".gitignore에 추가", - "RefreshFiles": "파일 새로고침", - "Merge": "현재 브랜치에 병합", - "ConfirmQuit": "정말로 종료하시겠습니까?", - "SwitchRepo": "최근에 사용한 저장소로 전환", - "UnsupportedGitService": "지원되지 않는 Git 서비스입니다.", - "CopyPullRequestURL": "풀 리퀘스트 URL을 클립보드에 복사", - "NoBranchOnRemote": "브랜치가 원격에 없습니다. 원격에 먼저 푸시해야합니다.", - "FileEnter": "Stage individual hunks/lines for file, or collapse/expand for directory", - "StageSelectionTooltip": "선택한 행을 staged / unstaged", - "DiscardSelection": "변경을 삭제 (git reset)", - "ToggleSelectionForPatch": "Line(s)을 패치에 추가/삭제", - "ToggleStagingView": "패널 전환", - "ReturnToFilesPanel": "파일 목록으로 돌아가기", - "FastForward": "Fast-forward this branch from its upstream", - "FoundConflictsTitle": "Auto-merge failed", - "RecentRepos": "최근에 사용한 저장소", - "CommitSummaryTitle": "커밋메시지", - "LocalBranchesTitle": "브랜치", - "SearchTitle": "검색", - "TagsTitle": "태그", - "MenuTitle": "메뉴", - "RemotesTitle": "원격", - "RemoteBranchesTitle": "원격 브랜치", - "PatchBuildingTitle": "메인 패널 (Patch Building)", - "InformationTitle": "정보", - "ErrorOccurred": "오류가 발생했습니다! issue를 작성해 주세요: ", - "CherryPickCopy": "커밋을 복사 (cherry-pick)", - "PasteCommits": "커밋을 붙여넣기 (cherry-pick)", - "CherryPick": "체리픽", - "Donate": "후원", - "AskQuestion": "질문하기", - "PrevHunk": "이전 hunk를 선택", - "NextHunk": "다음 hunk를 선택", - "PrevConflict": "이전 충돌을 선택", - "NextConflict": "다음 충돌을 선택", - "SelectPrevHunk": "이전 hunk를 선택", - "SelectNextHunk": "다음 hunk를 선택", - "ScrollDown": "아래로 스크롤", - "ScrollUp": "위로 스크롤", - "ScrollUpMainWindow": "메인 패널을 위로 스크롤", - "ScrollDownMainWindow": "메인 패널을 아래로로 스크롤", - "DropCommitTitle": "커밋 삭제", - "DropCommitPrompt": "정말로 선택한 커밋을 삭제하시겠습니까?", - "PullingStatus": "업데이트 중", - "PushingStatus": "푸시 중", - "FetchingStatus": "패치 중", - "SubCommitsDynamicTitle": "커밋 (%s)", - "RemoteBranchesDynamicTitle": "원격브랜치 (%s)", - "ViewItemFiles": "View selected item's files", - "CommitFilesTitle": "커밋 파일", - "CheckoutCommitFileTooltip": "Checkout file", - "DiscardOldFileChangeTooltip": "Discard this commit's changes to this file", - "DiscardFileChangesTitle": "파일 변경 사항 버리기", - "Discard": "View 'discard changes' options", - "Cancel": "취소", - "DiscardAllChanges": "모든 변경사항 버리기", - "Delete": "삭제", - "Reset": "초기화", - "ViewResetOptions": "View reset options", - "CreateFixupCommitTooltip": "Create fixup commit for this commit", - "SquashAboveCommitsTooltip": "Squash all 'fixup!' commits above selected commit (autosquash)", - "PressEnterToReturn": "엔터를 눌러 lazygit으로 돌아갑니다.", - "ViewStashOptions": "Stash 옵션 보기", - "StashAllChanges": "변경사항을 Stash", - "StashOptions": "Stash 옵션", - "ScrollLeft": "우 스크롤", - "ScrollRight": "좌 스크롤", - "DiscardPatch": "Patch 버리기", - "ToggleAllInPatch": "Toggle all files included in patch", - "ViewPatchOptions": "커스텀 Patch 옵션 보기", - "PatchOptionsTitle": "Patch 옵션", - "EnterCommitFile": "Enter file to add selected lines to the patch (or toggle directory collapsed)", - "EnterUpstream": "' '와 같은 형식으로 입력하세요.", - "InvalidUpstream": "Upstream의 형식이 잘못되었습니다.' ' 와 같은 형식으로 입력하세요.", - "NewRemote": "새로운 Remote 추가", - "NewRemoteName": "새로운 Remote 이름:", - "NewRemoteUrl": "새로운 Remote URL:", - "EditRemoteName": "{{.remoteName}} 의 새로운 Remote 이름 입력:", - "EditRemoteUrl": "{{.remoteName}} 의 새로운 Remote URL 입력:", - "RemoveRemote": "Remote를 삭제", - "DeleteRemoteBranch": "원격 브랜치를 삭제", - "SetUpstream": "Set as upstream of checked-out branch", - "EditRemoteTooltip": "Remote를 수정", - "TagNameTitle": "태그 이름", - "TagMessageTitle": "태그 메시지", - "PushTagTitle": "원격에 태그 '{{.tagName}}' 를 푸시", - "PushTag": "태그를 push", - "NewTag": "태그를 생성", - "FetchRemoteTooltip": "원격을 업데이트", - "GitFlowOptions": "Git-flow 옵션 보기", - "NewBranchNamePrompt": "새로운 브랜치 이름 입력", - "NextScreenMode": "다음 스크린 모드 (normal/half/fullscreen)", - "PrevScreenMode": "이전 스크린 모드", - "StartSearch": "검색 시작", - "Keybindings": "키 바인딩", - "RenameBranch": "브랜치 이름 변경", - "OpenKeybindingsMenu": "매뉴 열기", - "ResetCherryPick": "Reset cherry-picked (copied) commits selection", - "NextTab": "이전 탭", - "PrevTab": "다음 탭", - "CantUndoWhileRebasing": "리베이스중에는 되돌릴 수 없습니다.", - "CantRedoWhileRebasing": "리베이스중에는 다시 실행할 수 없습니다.", - "ConfirmationTitle": "확인 패널", - "PrevPage": "이전 페이지", - "NextPage": "다음 페이지", - "GotoTop": "맨 위로 스크롤 ", - "GotoBottom": "맨 아래로 스크롤 ", - "ResetInParentheses": "(reset)", - "OpenFilteringMenu": "View filter-by-path options", - "ExitFilterMode": "Stop filtering by path", - "MustExitFilterModePrompt": "Command not available in filtered mode. Exit filtered mode?", - "EnterRefName": "Ref 입력:", - "ExitDiffMode": "Diff 모드 종료", - "DiffingMenuTitle": "Diff", - "ViewDiffingOptions": "Diff 메뉴 열기", - "OpenCommandLogMenu": "명령어 로그 메뉴 열기", - "CommitDiff": "커밋의 iff", - "CommitHash": "커밋 해시", - "CommitURL": "커밋 URL", - "CommitMessage": "커밋 메시지", - "CommitAuthor": "커밋 작성자", - "CopyCommitAttributeToClipboard": "커밋 attribute 복사", - "CopyBranchNameToClipboard": "브랜치명을 클립보드에 복사", - "CopyPathToClipboard": "파일명을 클립보드에 복사", - "CopySelectedTextToClipboard": "선택한 텍스트를 클립보드에 복사", - "NoFilesStagedTitle": "파일이 Staged 되지 않았습니다.", - "NoFilesStagedPrompt": "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?", - "BranchNotFoundTitle": "브랜치를 찾을 수 없습니다.", - "BranchNotFoundPrompt": "브랜치를 찾을 수 없습니다. 새로운 브랜치를 생성합니다.", - "DiscardChangeTitle": "선택한 라인을 unstaged", - "DiscardChangePrompt": "정말로 선택한 라인을 삭제 (git reset) 하시겠습니까? 이 조작은 취소할 수 없습니다.\n이 경고를 비활성화 하려면 설정 파일의 'gui.skipDiscardChangeWarning' 를 true로 설정하세요.", - "CreateNewBranchFromCommit": "커밋에서 새 브랜치를 만듭니다.", - "ViewCommits": "커밋 보기", - "RunningCustomCommandStatus": "커스텀 명령어 실행", - "EnterSubmoduleTooltip": "서브모듈 열기", - "CopySubmoduleNameToClipboard": "서브모듈 이름을 클립보드에 복사", - "RemoveSubmodule": "서브모듈 삭제", - "RemoveSubmodulePrompt": "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.", - "ResettingSubmoduleStatus": "서브모듈를 리셋", - "NewSubmoduleName": "새로운 서브모듈이름 :", - "NewSubmoduleUrl": "새로운 서브모듈의 URL:", - "NewSubmodulePath": "새로운 서브모듈의 경로", - "NewSubmodule": "새로운 서브모듈 추가", - "AddingSubmoduleStatus": "새로운 서브모듈 추가", - "UpdateSubmoduleUrl": "서브모듈 '%s' 의 URL을 업데이트", - "EditSubmoduleUrl": "서브모듈의 URL을 수정", - "InitializingSubmoduleStatus": "서브모듈 초기화", - "InitSubmoduleTooltip": "서브모듈 초기화", - "SubmoduleUpdateTooltip": "서브모듈 업데이트", - "UpdatingSubmoduleStatus": "서브모듈 업데이트", - "BulkInitSubmodules": "서브모듈 일괄 초기화", - "BulkUpdateSubmodules": "서브모듈 일괄 업데이트", - "SubmodulesTitle": "서브모듈", - "SuggestionsCheatsheetTitle": "추천", - "SuggestionsTitle": "추천 (press %s to focus)", - "ExtrasTitle": "명령어 로그", - "PullRequestURLCopiedToClipboard": "풀 리퀘스트의 URL을 클립보드에 복사했습니다.", - "CommitDiffCopiedToClipboard": "커밋의 Diff를 클립보드에 복사했습니다.", - "CommitURLCopiedToClipboard": "커밋의 URL를 클립보드에 복사했습니다.", - "CommitMessageCopiedToClipboard": "커밋 메시지를 클립보드에 복사했습니다.", - "CommitAuthorCopiedToClipboard": "커밋 작성자를 클립보드에 복사했습니다.", - "CopiedToClipboard": "클립보드에 복사했습니다.", - "ErrCannotEditDirectory": "디렉토리는 편집할 수 없습니다.", - "ErrStageDirWithInlineMergeConflicts": "병합 충돌이 발생한 파일을 포함하는 디렉토리는 Staged/untaged할 수 없습니다. 병합 충돌을 먼저 해결하세요.", - "ErrRepositoryMovedOrDeleted": "저장소를 찾을 수 없습니다. 이미 삭제되었거나 이동되었을 가능성이 있습니다. ¯\\_(ツ)_/¯", - "CommandLog": "명령어 로그", - "ToggleShowCommandLog": "명령어 로그 표시 여부 전환", - "FocusCommandLog": "명령어 로그에 포커스", - "CommandLogHeader": "명령어 로그표시 여부는 '%s' 으로 전환할 수 있습니다.\n", - "RandomTip": "랜덤 Tip", - "ToggleWhitespaceInDiffView": "공백문자를 Diff 뷰에서 표시 여부 전환", - "IncreaseContextInDiffView": "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기", - "DecreaseContextInDiffView": "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기", - "CreatePullRequestOptions": "풀 리퀘스트 생성 옵션", - "DefaultBranch": "기본 브랜치", - "SelectBranch": "브랜치를 선택", - "CreatePullRequest": "풀 리퀘스트 생성", - "SelectConfigFile": "설정파일 선택", - "NoConfigFileFoundErr": "설정 파일을 찾지 못했습니다.", - "LoadingFileSuggestions": "파일 제안 로딩 중", - "LoadingCommits": "커밋 로딩", - "AbortTitle": "%s 중지", - "AbortPrompt": "정말로 실행중인 %s 를 중지할까요?", - "OpenLogMenu": "로그 메뉴 열기", - "LogMenuTitle": "커밋 로그 옵션", - "ShowGitGraph": "커밋 그래프 표시", - "SortCommits": "커밋 정렬", - "OpenCommitInBrowser": "브라우저에서 커밋 열기", - "ViewBisectOptions": "Bisect 옵션 보기", - "RewordInEditorTitle": "커밋 메시지를 에디터에서 수정", - "ToggleRangeSelect": "드래그 선택 전환", - "Actions": { - "CheckoutCommit": "커밋 체크아웃", - "CheckoutTag": "태그 체크아웃", - "CheckoutBranch": "브랜치 체크아웃", - "ForceCheckoutBranch": "브랜치 Force 체크아웃", - "Merge": "병합", - "RebaseBranch": "브랜치 리베이스", - "RenameBranch": "브랜치 이름 변경", - "CreateBranch": "브랜치 생성", - "CherryPick": "(Cherry-pick) 커밋 붙여넣기", - "CheckoutFile": "체크아웃 파일", - "FixupCommit": "커밋 Fixup", - "RewordCommit": "커밋 Reword", - "DropCommit": "커밋 Drop", - "EditCommit": "커밋 수정", - "AmendCommit": "커밋 Amend", - "ResetCommitAuthor": "커밋 작성자 Reset", - "RevertCommit": "커밋 Revert", - "CreateFixupCommit": "Fixup 커밋 생성", - "CopyCommitMessageToClipboard": "커밋 메시지를 클립보드에 복사", - "CopyCommitDiffToClipboard": "커밋 diff를 클립보드에 복사", - "CopyCommitHashToClipboard": "커밋 해시를 클립보드에 복사", - "CopyCommitURLToClipboard": "커밋 URL를 클립보드에 복사", - "CopyCommitAuthorToClipboard": "커밋 작성자를 클립보드에 복사", - "CopyCommitAttributeToClipboard": "클립보드에 복사", - "DiscardAllChangesInFile": "Discard all changes in file", - "DiscardAllUnstagedChangesInFile": "Discard all unstaged changes in file", - "IgnoreExcludeFile": "Ignore file", - "Commit": "커밋", - "Push": "푸시", - "Pull": "업데이트(Pull)", - "OpenFile": "파일 열기", - "CopyToClipboard": "클립보드에 복사", - "CopySelectedTextToClipboard": "선택한 텍스트를 클립보드에 복사", - "DeleteRemoteBranch": "원격 브랜치 삭제", - "RemoveSubmodule": "서브모듈 삭제", - "ResetSubmodule": "서브모듈 Reset", - "AddSubmodule": "서브모듈 추가", - "UpdateSubmoduleUrl": "서브모듈 URL 업데이트", - "InitialiseSubmodule": "서브모듈 초기화", - "UpdateSubmodule": "서브모듈 업데이트", - "PushTag": "태그 푸시g", - "DiscardUnstagedFileChanges": "Unstaged 파일 변경사항 버리기", - "RemoveUntrackedFiles": "Untracked 파일 삭제", - "RemoveStagedFiles": "Staged 파일 삭제", - "Undo": "되돌리기", - "Redo": "다시 실행", - "CopyPullRequestURL": "풀 리퀘스트 URL 복사", - "OpenMergeTool": "병합 도구 열기", - "OpenCommitInBrowser": "브라우저에서 커밋 열기", - "OpenPullRequest": "브라우저에서 풀 리퀘스트 열기" - }, - "Bisect": { - "ResetTitle": "'git bisect' 를 리셋", - "ResetPrompt": "정말로 'git bisect' 를 리셋하시겠습니까?", - "ResetOption": "Bisect를 리셋", - "Mark": "Mark %s as %s", - "SkipCurrent": "%s 를 스킵", - "CompleteTitle": "Bisect 완료" - }, - "Log": {}, - "BreakingChangesByVersion": {} + "NotEnoughSpace": "패널을 렌더링 할 공간이 부족합니다.", + "DiffTitle": "변경점", + "FilesTitle": "파일", + "BranchesTitle": "브랜치", + "CommitsTitle": "커밋", + "EasterEgg": "이스터 에그", + "UnstagedChanges": "Staged되지 않은 변경 내용", + "StagedChanges": "Staged된 변경 내용", + "StagingTitle": "메인 패널 (Staging)", + "MergingTitle": "메인 패널 (Merging)", + "NormalTitle": "메인 패널 (Normal)", + "LogTitle": "로그", + "CommitSummary": "커밋 메시지", + "CredentialsUsername": "사용자 이름", + "CredentialsPassword": "패스워드", + "CredentialsPassphrase": "SSH키의 passphrase 입력", + "CredentialsPIN": "SSH키\u001d의 PIN\u001d을 입력", + "CredentialsToken": "SSH 키를 위한 토큰 입력", + "PassUnameWrong": "패스워드, passphrase 또는 사용자 이름이 잘못되었습니다.", + "Commit": "커밋 변경내용", + "CommitTooltip": "스테이징된 변경 사항 커밋.", + "AmendLastCommit": "마지맛 커밋 수정", + "AmendLastCommitTitle": "마지막 커밋 수정", + "SureToAmend": "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.", + "NoCommitToAmend": "Amend 가능한 커밋이 없습니다.", + "CommitChangesWithEditor": "Git 편집기를 사용하여 변경 내용을 커밋합니다.", + "NoBaseCommitsFound": "기본 커밋을 찾을 수 없습니다", + "MultipleBaseCommitsFoundStaged": "여러 개의 기본 커밋을 찾았습니다. (한 번에 더 적은 변경 사항을 스테이징해보세요)", + "MultipleBaseCommitsFoundUnstaged": "여러 개의 기본 커밋을 찾았습니다. (변경 사항 중 일부를 스테이징해보세요)", + "BaseCommitIsAlreadyOnMainBranch": "이 변경 사항의 기본 커밋은 이미 메인 브랜치에 있습니다", + "StatusTitle": "상태", + "GlobalTitle": "글로벌 키 바인딩", + "Execute": "실행", + "Stage": "Staged 전환", + "ToggleStagedAll": "모든 변경을 Staged/unstaged으로 전환", + "ToggleTreeView": "파일 트리뷰로 전환", + "OpenMergeTool": "Git mergetool를 열기", + "Refresh": "새로고침", + "Push": "푸시", + "Pull": "업데이트", + "FileFilter": "파일을 필터하기 (Staged/unstaged)", + "CopyToClipboardMenu": "클립보드에 복사", + "CopyFileName": "파일명", + "CopySelectedDiff": "선택한 파일의 변경점", + "CopyAllFilesDiff": "모든 파일의 변경점", + "NoContentToCopyError": "복사 대상이 없습니다", + "FileNameCopiedToast": "파일명을 클립보드에 복사했습니다.", + "FilePathCopiedToast": "파일경로를 클립보드에 복사했습니다.", + "FileDiffCopiedToast": "파일의 변경점을 클립보드에 복사했습니다.", + "AllFilesDiffCopiedToast": "모든 파일의 변경점을 클립보드에 복사했습니다.", + "FilterStagedFiles": "Staged된 파일만 표시", + "FilterUnstagedFiles": "Stage되지 않은 파일만 표시", + "MergeConflictsTitle": "병합 충돌", + "Checkout": "체크아웃", + "NoChangedFiles": "변경된 파일이 없습니다.", + "SoftReset": "소프트 리셋", + "AlreadyCheckedOutBranch": "브랜치가 이미 체크아웃 되었습니다", + "SureForceCheckout": "강제로 체크아웃하시겠습니까? 모든 로컬 변경 사항을 잃게 됩니다.", + "ForceCheckoutBranch": "브랜치 강제 체크아웃", + "BranchName": "브랜치 이름", + "NewBranchNameBranchOff": "새 브랜치 이름 (branch is off of '{{.branchName}}')", + "CantDeleteCheckOutBranch": "체크아웃하는 브랜치는 삭제할 수 없습니다!", + "DeleteBranchTitle": "'{{.selectedBranchName}}' 브랜치를 삭제하시겠습니까?", + "DeleteLocalBranch": "로컬 브랜치를 삭제", + "ForceDeleteBranchTitle": "브랜치를 강제 삭제", + "ForceDeleteBranchMessage": "'{{.selectedBranchName}}'는 완전히 병합되지 않았습니다. 정말 삭제하시겠습니까?", + "RebaseBranch": "체크아웃된 브랜치를 이 브랜치에 리베이스", + "CantRebaseOntoSelf": "브랜치를 자기 자신에게 리베이스할 수는 없습니다.", + "CantMergeBranchIntoItself": "브랜치를 자기 자신에게 병합할 수는 없습니다.", + "ForceCheckout": "강제 체크아웃", + "CheckoutByName": "이름으로 체크아웃", + "NewBranch": "새 브랜치 생성", + "NoBranchesThisRepo": "저장소에 브랜치가 존재하지 않습니다.", + "CommitWithoutMessageErr": "커밋 메시지를 입력하세요.", + "Close": "닫기", + "CloseCancel": "닫기/취소", + "Confirm": "확인", + "Quit": "종료", + "SureSquashThisCommit": "Are you sure you want to squash this commit into the commit below?", + "Squash": "스쿼시", + "PickCommitTooltip": "Pick commit (when mid-rebase)", + "Reword": "커밋메시지 변경", + "DropCommit": "커밋 삭제", + "MoveDownCommit": "커밋을 1개 아래로 이동", + "MoveUpCommit": "커밋을 1개 위로 이동", + "EditCommitTooltip": "커밋을 편집", + "AmendCommitTooltip": "Amend commit with staged changes", + "ResetAuthor": "Reset commit author", + "RewordCommitEditor": "에디터에서 커밋메시지 수정", + "NoCommitsThisBranch": "이 브랜치에 커밋이 없습니다.", + "Error": "오류", + "Undo": "되돌리기", + "UndoReflog": "되돌리기 (reflog) (실험적)", + "RedoReflog": "다시 실행 (reflog) (실험적)", + "Apply": "적용", + "NoStashEntries": "Stash가 존재하지 않습니다.", + "StashDrop": "Stash를 삭제", + "StashPop": "Stash를 pop", + "SurePopStashEntry": "정말로 Stash를 pop하시겠습니까?", + "StashApply": "Stash 적용", + "SureApplyStashEntry": "정말로 Stash를 적용하시겠습니까?", + "StashChanges": "변경을 Stash", + "EditConfig": "설정 파일 수정", + "ForcePush": "강제 푸시", + "ForcePushPrompt": "브랜치가 원격 브랜치에서 분기하고 있습니다. 'esc'를 눌러 취소하거나, 'enter'를 눌러 강제로 푸시하세요.", + "ForcePushDisabled": "브랜치가 원격 브랜치에서 분기하고 있습니다. force push가 비활성화 되었습니다.", + "UpdatesRejectedAndForcePushDisabled": "업데이트가 거부되었으며 강제 푸시를 비활성화했습니다.", + "CheckForUpdate": "업데이트 확인", + "CheckingForUpdates": "업데이트 확인 중...", + "UpdateAvailableTitle": "새로운 업데이트 사용가능!", + "UpdateAvailable": "버전 {{.newVersion}} 을(를) 설치하시겠습니까?", + "UpdateInProgressWaitingStatus": "업데이트 중", + "UpdateCompletedTitle": "업데이트 완료!", + "UpdateCompleted": "업데이트 설치에 성공했습니다. lazygit를 재시작해주세요.", + "FailedToRetrieveLatestVersionErr": "버전 정보를 받아오는데 실패했습니다.", + "OnLatestVersionErr": "이미 최신 버전을 사용하고 있습니다.", + "MajorVersionErr": "새 버전 ({{.newVersion}}) 에 현재 버전({{.currentVersion}}) 과 비교할 때 호환되지 않는 변경 사항이 있습니다.", + "CouldNotFindBinaryErr": "{{.url}} 에서 바이너리를 찾을 수 없습니다.", + "UpdateFailedErr": "업데이트 실패: {{.errMessage}}", + "ConfirmQuitDuringUpdateTitle": "현재 업데이트 중입니다.", + "ConfirmQuitDuringUpdate": "현재 업데이트를 진행 중입니다.종료하시겠습니까?", + "GitconfigParseErr": "따옴표로 묶이지 않은 '\\' 문자가 있어서 Gogit이 gitconfig 파일을 분석하지 못했습니다. 이를 제거하면 문제가 해결됩니다.", + "EditFile": "파일 편집", + "OpenFile": "파일 닫기", + "IgnoreFile": ".gitignore에 추가", + "RefreshFiles": "파일 새로고침", + "Merge": "현재 브랜치에 병합", + "ConfirmQuit": "정말로 종료하시겠습니까?", + "SwitchRepo": "최근에 사용한 저장소로 전환", + "UnsupportedGitService": "지원되지 않는 Git 서비스입니다.", + "CopyPullRequestURL": "풀 리퀘스트 URL을 클립보드에 복사", + "NoBranchOnRemote": "브랜치가 원격에 없습니다. 원격에 먼저 푸시해야합니다.", + "FileEnter": "Stage individual hunks/lines for file, or collapse/expand for directory", + "StageSelectionTooltip": "선택한 행을 staged / unstaged", + "DiscardSelection": "변경을 삭제 (git reset)", + "ToggleSelectionForPatch": "Line(s)을 패치에 추가/삭제", + "ToggleStagingView": "패널 전환", + "ReturnToFilesPanel": "파일 목록으로 돌아가기", + "FastForward": "Fast-forward this branch from its upstream", + "FoundConflictsTitle": "Auto-merge failed", + "RecentRepos": "최근에 사용한 저장소", + "CommitSummaryTitle": "커밋메시지", + "LocalBranchesTitle": "브랜치", + "SearchTitle": "검색", + "TagsTitle": "태그", + "MenuTitle": "메뉴", + "RemotesTitle": "원격", + "RemoteBranchesTitle": "원격 브랜치", + "PatchBuildingTitle": "메인 패널 (Patch Building)", + "InformationTitle": "정보", + "ErrorOccurred": "오류가 발생했습니다! issue를 작성해 주세요: ", + "CherryPickCopy": "커밋을 복사 (cherry-pick)", + "PasteCommits": "커밋을 붙여넣기 (cherry-pick)", + "CherryPick": "체리픽", + "Donate": "후원", + "AskQuestion": "질문하기", + "PrevHunk": "이전 hunk를 선택", + "NextHunk": "다음 hunk를 선택", + "PrevConflict": "이전 충돌을 선택", + "NextConflict": "다음 충돌을 선택", + "SelectPrevHunk": "이전 hunk를 선택", + "SelectNextHunk": "다음 hunk를 선택", + "ScrollDown": "아래로 스크롤", + "ScrollUp": "위로 스크롤", + "ScrollUpMainWindow": "메인 패널을 위로 스크롤", + "ScrollDownMainWindow": "메인 패널을 아래로로 스크롤", + "DropCommitTitle": "커밋 삭제", + "DropCommitPrompt": "정말로 선택한 커밋을 삭제하시겠습니까?", + "PullingStatus": "업데이트 중", + "PushingStatus": "푸시 중", + "FetchingStatus": "패치 중", + "SubCommitsDynamicTitle": "커밋 (%s)", + "RemoteBranchesDynamicTitle": "원격브랜치 (%s)", + "ViewItemFiles": "View selected item's files", + "CommitFilesTitle": "커밋 파일", + "CheckoutCommitFileTooltip": "Checkout file", + "DiscardOldFileChangeTooltip": "Discard this commit's changes to this file", + "DiscardFileChangesTitle": "파일 변경 사항 버리기", + "Discard": "View 'discard changes' options", + "Cancel": "취소", + "DiscardAllChanges": "모든 변경사항 버리기", + "Delete": "삭제", + "Reset": "초기화", + "ViewResetOptions": "View reset options", + "CreateFixupCommitTooltip": "Create fixup commit for this commit", + "SquashAboveCommitsTooltip": "Squash all 'fixup!' commits above selected commit (autosquash)", + "PressEnterToReturn": "엔터를 눌러 lazygit으로 돌아갑니다.", + "ViewStashOptions": "Stash 옵션 보기", + "StashAllChanges": "변경사항을 Stash", + "StashOptions": "Stash 옵션", + "ScrollLeft": "우 스크롤", + "ScrollRight": "좌 스크롤", + "DiscardPatch": "Patch 버리기", + "ToggleAllInPatch": "Toggle all files included in patch", + "ViewPatchOptions": "커스텀 Patch 옵션 보기", + "PatchOptionsTitle": "Patch 옵션", + "EnterCommitFile": "Enter file to add selected lines to the patch (or toggle directory collapsed)", + "EnterUpstream": "' '와 같은 형식으로 입력하세요.", + "InvalidUpstream": "Upstream의 형식이 잘못되었습니다.' ' 와 같은 형식으로 입력하세요.", + "NewRemote": "새로운 Remote 추가", + "NewRemoteName": "새로운 Remote 이름:", + "NewRemoteUrl": "새로운 Remote URL:", + "EditRemoteName": "{{.remoteName}} 의 새로운 Remote 이름 입력:", + "EditRemoteUrl": "{{.remoteName}} 의 새로운 Remote URL 입력:", + "RemoveRemote": "Remote를 삭제", + "DeleteRemoteBranch": "원격 브랜치를 삭제", + "SetUpstream": "Set as upstream of checked-out branch", + "EditRemoteTooltip": "Remote를 수정", + "TagNameTitle": "태그 이름", + "TagMessageTitle": "태그 메시지", + "PushTagTitle": "원격에 태그 '{{.tagName}}' 를 푸시", + "PushTag": "태그를 push", + "NewTag": "태그를 생성", + "FetchRemoteTooltip": "원격을 업데이트", + "GitFlowOptions": "Git-flow 옵션 보기", + "NewBranchNamePrompt": "새로운 브랜치 이름 입력", + "NextScreenMode": "다음 스크린 모드 (normal/half/fullscreen)", + "PrevScreenMode": "이전 스크린 모드", + "StartSearch": "검색 시작", + "Keybindings": "키 바인딩", + "RenameBranch": "브랜치 이름 변경", + "OpenKeybindingsMenu": "매뉴 열기", + "ResetCherryPick": "Reset cherry-picked (copied) commits selection", + "NextTab": "이전 탭", + "PrevTab": "다음 탭", + "CantUndoWhileRebasing": "리베이스중에는 되돌릴 수 없습니다.", + "CantRedoWhileRebasing": "리베이스중에는 다시 실행할 수 없습니다.", + "ConfirmationTitle": "확인 패널", + "PrevPage": "이전 페이지", + "NextPage": "다음 페이지", + "GotoTop": "맨 위로 스크롤 ", + "GotoBottom": "맨 아래로 스크롤 ", + "ResetInParentheses": "(reset)", + "OpenFilteringMenu": "View filter-by-path options", + "ExitFilterMode": "Stop filtering by path", + "MustExitFilterModePrompt": "Command not available in filtered mode. Exit filtered mode?", + "EnterRefName": "Ref 입력:", + "ExitDiffMode": "Diff 모드 종료", + "DiffingMenuTitle": "Diff", + "ViewDiffingOptions": "Diff 메뉴 열기", + "OpenCommandLogMenu": "명령어 로그 메뉴 열기", + "CommitDiff": "커밋의 iff", + "CommitHash": "커밋 해시", + "CommitURL": "커밋 URL", + "CommitMessage": "커밋 메시지", + "CommitAuthor": "커밋 작성자", + "CopyCommitAttributeToClipboard": "커밋 attribute 복사", + "CopyBranchNameToClipboard": "브랜치명을 클립보드에 복사", + "CopyPathToClipboard": "파일명을 클립보드에 복사", + "CopySelectedTextToClipboard": "선택한 텍스트를 클립보드에 복사", + "NoFilesStagedTitle": "파일이 Staged 되지 않았습니다.", + "NoFilesStagedPrompt": "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?", + "BranchNotFoundTitle": "브랜치를 찾을 수 없습니다.", + "BranchNotFoundPrompt": "브랜치를 찾을 수 없습니다. 새로운 브랜치를 생성합니다.", + "DiscardChangeTitle": "선택한 라인을 unstaged", + "DiscardChangePrompt": "정말로 선택한 라인을 삭제 (git reset) 하시겠습니까? 이 조작은 취소할 수 없습니다.\n이 경고를 비활성화 하려면 설정 파일의 'gui.skipDiscardChangeWarning' 를 true로 설정하세요.", + "CreateNewBranchFromCommit": "커밋에서 새 브랜치를 만듭니다.", + "ViewCommits": "커밋 보기", + "RunningCustomCommandStatus": "커스텀 명령어 실행", + "EnterSubmoduleTooltip": "서브모듈 열기", + "CopySubmoduleNameToClipboard": "서브모듈 이름을 클립보드에 복사", + "RemoveSubmodule": "서브모듈 삭제", + "RemoveSubmodulePrompt": "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.", + "ResettingSubmoduleStatus": "서브모듈를 리셋", + "NewSubmoduleName": "새로운 서브모듈이름 :", + "NewSubmoduleUrl": "새로운 서브모듈의 URL:", + "NewSubmodulePath": "새로운 서브모듈의 경로", + "NewSubmodule": "새로운 서브모듈 추가", + "AddingSubmoduleStatus": "새로운 서브모듈 추가", + "UpdateSubmoduleUrl": "서브모듈 '%s' 의 URL을 업데이트", + "EditSubmoduleUrl": "서브모듈의 URL을 수정", + "InitializingSubmoduleStatus": "서브모듈 초기화", + "InitSubmoduleTooltip": "서브모듈 초기화", + "SubmoduleUpdateTooltip": "서브모듈 업데이트", + "UpdatingSubmoduleStatus": "서브모듈 업데이트", + "BulkInitSubmodules": "서브모듈 일괄 초기화", + "BulkUpdateSubmodules": "서브모듈 일괄 업데이트", + "SubmodulesTitle": "서브모듈", + "SuggestionsCheatsheetTitle": "추천", + "SuggestionsTitle": "추천 (press %s to focus)", + "ExtrasTitle": "명령어 로그", + "PullRequestURLCopiedToClipboard": "풀 리퀘스트의 URL을 클립보드에 복사했습니다.", + "CommitDiffCopiedToClipboard": "커밋의 Diff를 클립보드에 복사했습니다.", + "CommitURLCopiedToClipboard": "커밋의 URL를 클립보드에 복사했습니다.", + "CommitMessageCopiedToClipboard": "커밋 메시지를 클립보드에 복사했습니다.", + "CommitAuthorCopiedToClipboard": "커밋 작성자를 클립보드에 복사했습니다.", + "CopiedToClipboard": "클립보드에 복사했습니다.", + "ErrCannotEditDirectory": "디렉토리는 편집할 수 없습니다.", + "ErrStageDirWithInlineMergeConflicts": "병합 충돌이 발생한 파일을 포함하는 디렉토리는 Staged/untaged할 수 없습니다. 병합 충돌을 먼저 해결하세요.", + "ErrRepositoryMovedOrDeleted": "저장소를 찾을 수 없습니다. 이미 삭제되었거나 이동되었을 가능성이 있습니다. ¯\\_(ツ)_/¯", + "CommandLog": "명령어 로그", + "ToggleShowCommandLog": "명령어 로그 표시 여부 전환", + "FocusCommandLog": "명령어 로그에 포커스", + "CommandLogHeader": "명령어 로그표시 여부는 '%s' 으로 전환할 수 있습니다.\n", + "RandomTip": "랜덤 Tip", + "ToggleWhitespaceInDiffView": "공백문자를 Diff 뷰에서 표시 여부 전환", + "IncreaseContextInDiffView": "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기", + "DecreaseContextInDiffView": "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기", + "CreatePullRequestOptions": "풀 리퀘스트 생성 옵션", + "DefaultBranch": "기본 브랜치", + "SelectBranch": "브랜치를 선택", + "CreatePullRequest": "풀 리퀘스트 생성", + "SelectConfigFile": "설정파일 선택", + "NoConfigFileFoundErr": "설정 파일을 찾지 못했습니다.", + "LoadingFileSuggestions": "파일 제안 로딩 중", + "LoadingCommits": "커밋 로딩", + "AbortTitle": "%s 중지", + "AbortPrompt": "정말로 실행중인 %s 를 중지할까요?", + "OpenLogMenu": "로그 메뉴 열기", + "LogMenuTitle": "커밋 로그 옵션", + "ShowGitGraph": "커밋 그래프 표시", + "SortCommits": "커밋 정렬", + "OpenCommitInBrowser": "브라우저에서 커밋 열기", + "ViewBisectOptions": "Bisect 옵션 보기", + "RewordInEditorTitle": "커밋 메시지를 에디터에서 수정", + "ToggleRangeSelect": "드래그 선택 전환", + "Actions": { + "CheckoutCommit": "커밋 체크아웃", + "CheckoutTag": "태그 체크아웃", + "CheckoutBranch": "브랜치 체크아웃", + "ForceCheckoutBranch": "브랜치 Force 체크아웃", + "Merge": "병합", + "RebaseBranch": "브랜치 리베이스", + "RenameBranch": "브랜치 이름 변경", + "CreateBranch": "브랜치 생성", + "CherryPick": "(Cherry-pick) 커밋 붙여넣기", + "CheckoutFile": "체크아웃 파일", + "FixupCommit": "커밋 Fixup", + "RewordCommit": "커밋 Reword", + "DropCommit": "커밋 Drop", + "EditCommit": "커밋 수정", + "AmendCommit": "커밋 Amend", + "ResetCommitAuthor": "커밋 작성자 Reset", + "RevertCommit": "커밋 Revert", + "CreateFixupCommit": "Fixup 커밋 생성", + "CopyCommitMessageToClipboard": "커밋 메시지를 클립보드에 복사", + "CopyCommitDiffToClipboard": "커밋 diff를 클립보드에 복사", + "CopyCommitHashToClipboard": "커밋 해시를 클립보드에 복사", + "CopyCommitURLToClipboard": "커밋 URL를 클립보드에 복사", + "CopyCommitAuthorToClipboard": "커밋 작성자를 클립보드에 복사", + "CopyCommitAttributeToClipboard": "클립보드에 복사", + "DiscardAllChangesInFile": "Discard all changes in file", + "DiscardAllUnstagedChangesInFile": "Discard all unstaged changes in file", + "IgnoreExcludeFile": "Ignore file", + "Commit": "커밋", + "Push": "푸시", + "Pull": "업데이트(Pull)", + "OpenFile": "파일 열기", + "CopyToClipboard": "클립보드에 복사", + "CopySelectedTextToClipboard": "선택한 텍스트를 클립보드에 복사", + "DeleteRemoteBranch": "원격 브랜치 삭제", + "RemoveSubmodule": "서브모듈 삭제", + "ResetSubmodule": "서브모듈 Reset", + "AddSubmodule": "서브모듈 추가", + "UpdateSubmoduleUrl": "서브모듈 URL 업데이트", + "InitialiseSubmodule": "서브모듈 초기화", + "UpdateSubmodule": "서브모듈 업데이트", + "PushTag": "태그 푸시g", + "DiscardUnstagedFileChanges": "Unstaged 파일 변경사항 버리기", + "RemoveUntrackedFiles": "Untracked 파일 삭제", + "RemoveStagedFiles": "Staged 파일 삭제", + "Undo": "되돌리기", + "Redo": "다시 실행", + "CopyPullRequestURL": "풀 리퀘스트 URL 복사", + "OpenMergeTool": "병합 도구 열기", + "OpenCommitInBrowser": "브라우저에서 커밋 열기", + "OpenPullRequest": "브라우저에서 풀 리퀘스트 열기" + }, + "Bisect": { + "ResetTitle": "'git bisect' 를 리셋", + "ResetPrompt": "정말로 'git bisect' 를 리셋하시겠습니까?", + "ResetOption": "Bisect를 리셋", + "Mark": "Mark %s as %s", + "SkipCurrent": "%s 를 스킵", + "CompleteTitle": "Bisect 완료" + }, + "Log": {}, + "BreakingChangesByVersion": {} } diff --git a/pkg/i18n/translations/nl.json b/pkg/i18n/translations/nl.json index 93a2dbe9e..e0878212b 100644 --- a/pkg/i18n/translations/nl.json +++ b/pkg/i18n/translations/nl.json @@ -5,30 +5,85 @@ "BranchesTitle": "Branches", "CommitsTitle": "Commits", "StashTitle": "Stash", + "SnakeTitle": "Snake", + "EasterEgg": "Easter egg", "UnstagedChanges": "Unstaged wijzigingen", "StagedChanges": "Staged wijzigingen", "StagingTitle": "Staging", "MergingTitle": "Mergen", "NormalTitle": "Normaal", + "LogTitle": "Log", + "LogXOfYTitle": "Log (%d van %d)", "CommitSummary": "Commitbericht", "CredentialsUsername": "Gebruikersnaam", "CredentialsPassword": "Wachtwoord", "CredentialsPassphrase": "Voer een wachtwoordzin in voor de SSH-sleutel", + "CredentialsPIN": "Voer PIN voor SSH sleutel in", + "CredentialsToken": "Voer Token voor SSH sleutel in", "PassUnameWrong": "Wachtwoord en/of gebruikersnaam verkeerd", "Commit": "Commit veranderingen", + "CommitTooltip": "Commit gestagede wijzigingen.", "AmendLastCommit": "Wijzig laatste commit", "AmendLastCommitTitle": "Wijzig laatste commit", "SureToAmend": "Weet je zeker dat je de laatste commit wilt wijzigen? U kunt het commit-bericht wijzigen vanuit het commits-paneel.", "NoCommitToAmend": "Er is geen commits om te wijzigen.", "CommitChangesWithEditor": "Commit veranderingen met de git editor", + "FindBaseCommitForFixupTooltip": "Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: ", + "BaseCommitIsNotInCurrentView": "Basis commit is niet zichtbaar", + "StatusTitle": "Status", "GlobalTitle": "Globale sneltoetsen", "Execute": "Uitvoeren", "Stage": "Toggle staged", "ToggleStagedAll": "Toggle staged alle", "ToggleTreeView": "Toggle bestandsboom weergave", + "OpenDiffTool": "Open externe diff applicatie (git difftool)", + "OpenMergeTool": "Open externe merge applicatie", "Refresh": "Verversen", + "Push": "Push", + "Pull": "Pull", + "PushTooltip": "Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren.", + "PullTooltip": "Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren.", + "FileFilter": "Filter bestanden op status", + "CopyToClipboardMenu": "Kopieer naar klembord", + "CopyFileName": "Bestandsnaam", + "CopyRelativeFilePath": "Relatief pad", + "CopyAbsoluteFilePath": "Absoluut pad", + "CopyFileDiffTooltip": "Als er gestagede items zijn neemt dit commando alleen deze items mee. Zo niet, neemt het alle niet-gestagede items mee.", + "CopySelectedDiff": "Diff van geselecteerde bestand", + "CopyAllFilesDiff": "Diff van alle bestanden", + "CopyFileContent": "Inhoud van geselecteerde bestand", + "NoContentToCopyError": "Er is niks om te kopiëren", + "FileNameCopiedToast": "Bestandsnaam gekopieerd naar klembord", + "FilePathCopiedToast": "Bestandspad gekopieerd naar klembord", + "FileDiffCopiedToast": "Diff van bestand gekopieerd naar klembord", + "AllFilesDiffCopiedToast": "Diff van alle bestanden gekopieerd naar klembord", + "FileContentCopiedToast": "Bestandsinhoud gekopieerd naar klembord", + "FilterStagedFiles": "Toon alleen gestagede bestanden", + "FilterUnstagedFiles": "Toon alleen niet-gestagede bestanden", + "FilterTrackedFiles": "Toon alleen getrackte bestanden", + "FilterUntrackedFiles": "Toon alleen niet-getrackte bestanden", + "NoFilter": "Geen filter", + "FilterLabelStagedFiles": "(alleen gestaged)", + "FilterLabelUnstagedFiles": "(alleen niet-gestaged)", + "FilterLabelTrackedFiles": "(alleen getrackt)", + "FilterLabelUntrackedFiles": "(alleen niet-getrackt)", + "FilterLabelConflictingFiles": "(alleen conflicten)", "MergeConflictsTitle": "Merge conflicten", + "MergeConflictDescription_DD": "Conflict: deze file is verplaatst of hernoemd in zowel de current changes als de incoming changes, maar naar verschillende plekken. Ik weet niet welke, maar ze zouden allebei ook weergegeven moeten worden als conflicten (gemarkeerd met respectievelijk 'AU' en 'UA'). De meest waarschijnlijke oplossing is om deze file zelf te verwijderen, één van de twee nieuwe locaties te houden, en de andere ook te verwijderen.", + "MergeConflictDescription_AU": "Conflict: een file is verplaatst of hernoemd naar deze plek in de current changes, maar dezelfde file is naar een andere plek verplaatst of hernoemd in de incoming changes. Die andere locatie zou ook zichtbaar moeten zijn als een conflict (gemarkeerd met 'UA'), alsmede de originele locatie van de file (gemarkeerd met 'DD').", + "MergeConflictDescription_UA": "Conflict: een file is verplaatst of hernoemd naar deze plek in de incoming changes, maar dezelfde file is naar een andere plek verplaatst of hernoemd in de current changes. Die andere locatie zou ook zichtbaar moeten zijn als een conflict (gemarkeerd met 'AU'), alsmede de originele locatie van de file (gemarkeerd met 'DD').", + "MergeConflictDescription_DU": "Conflict: deze file is verwijderd in de current changes, en gewijzigd in de incoming changes.\n\nDe meest waarschijnlijke oplossing is om dit bestand te verwijderen nadat de incoming changes wijzigingen handmatig zijn toegepast op een andere plaats in de code.", + "MergeConflictDescription_UD": "Conflict: dit bestand is gewijzigd in de current changes en verwijderd in incoming changes.\n\nDe meest waarschijnlijke oplossing is om dit bestand te verwijderen nadat de current changes wijzigingen handmatig zijn toegepast op een andere plaats in de code.", + "MergeConflictIncomingDiff": "Inkomende wijziging:", + "MergeConflictCurrentDiff": "Huidige wijzigingen:", + "MergeConflictPressEnterToResolve": "Druk op %s om op te lossen.", + "MergeConflictKeepFile": "Behoud bestanden", + "MergeConflictDeleteFile": "Bestand verwijderen", "Checkout": "Uitchecken", + "CheckoutTooltip": "Geselecteerd item uitchecken.", + "CantCheckoutBranchWhilePulling": "Je kan geen andere branch uitchecken tijdens het pullen van de huidige branch", + "TagCheckoutTooltip": "Geselecteerde tag uitchecken als detached HEAD.", + "RemoteBranchCheckoutTooltip": "Geselecteerde remote branch uitchecken als nieuwe locale branch of als detached head.", "NoChangedFiles": "Geen veranderde bestanden", "SoftReset": "Zacht reset", "AlreadyCheckedOutBranch": "Je hebt deze branch al uitgecheckt", @@ -37,54 +92,105 @@ "BranchName": "Branch naam", "NewBranchNameBranchOff": "Nieuw branch naam (Branch is afgeleid van '{{.branchName}}')", "CantDeleteCheckOutBranch": "Je kan een uitgecheckte branch niet verwijderen!", + "DeleteBranchTitle": "Verwijder branch '{{.selectedBranchName}}'?", + "DeleteBranchesTitle": "Geselecteerde branches verwijderen?", + "DeleteLocalBranch": "Lokale branch verwijderen", + "DeleteLocalBranches": "Lokale branches verwijderen", + "DeleteRemoteBranchPrompt": "Weet je zeker dat je de remote branch '{{.selectedBranchName}}' wilt verwijderen uit '{{.upstream}}'?", + "ForceDeleteBranchTitle": "Forceer verwijderen van branch", "ForceDeleteBranchMessage": "Weet je zeker dat je branch '{{.selectedBranchName}}' geforceerd wil verwijderen?", "RebaseBranch": "Rebase branch", + "RebaseBranchTooltip": "Rebase de uitgecheckte branch bovenop de geselecteerde branch.", "CantRebaseOntoSelf": "Je kan niet een branch rebasen op zichzelf", "CantMergeBranchIntoItself": "Je kan niet een branch in zichzelf mergen", "ForceCheckout": "Forceer checkout", "CheckoutByName": "Uitchecken bij naam", + "CheckoutPreviousBranch": "Vorige branch uitchecken", + "RemoteBranchCheckoutTitle": "{{.branchName}} uitchecken", + "RemoteBranchCheckoutPrompt": "Hoe wil je deze branch uitchecken?", + "CheckoutTypeNewBranch": "Nieuwe lokale branch", + "CheckoutTypeDetachedHead": "Detached head", "NewBranch": "Nieuwe branch", + "MoveCommitsToNewBranch": "Verplaats commits naar nieuwe branch", + "MoveCommitsToNewBranchTooltip": "Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.\n\nLet op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen).", + "CannotMoveCommitsFromDetachedHead": "Kan geen commits verplaatsen van een detached head", + "CannotMoveCommitsNoUpstream": "Kan geen commits verplaatsen vanaf een branch die geen upstream-branch heeft", + "CannotMoveCommitsBehindUpstream": "Kan geen commits verplaatsen van een branch die achterloopt zijn upstream-branch", "NoBranchesThisRepo": "Geen branches voor deze repo", "CommitWithoutMessageErr": "Je kan geen commit maken zonder commit bericht", "Close": "Sluiten", "CloseCancel": "Sluiten", "Confirm": "Bevestig", + "Quit": "Afsluiten", + "CannotSquashOrFixupFirstCommit": "Er is geen commit hieronder om in te squashen", + "Fixup": "Fixup", "SureSquashThisCommit": "Weet je zeker dat je deze commit wil samenvoegen met de commit hieronder?", + "Squash": "Squash", "PickCommitTooltip": "Kies commit (wanneer midden in rebase)", + "Pick": "Pick", + "Edit": "Edit", + "Revert": "Revert", + "RevertCommitTooltip": "Maak een revert commit voor de geselecteerde commit, die de wijzigingen in deze commit terugdraait.", "Reword": "Hernoem commit", + "CommitRewordTooltip": "Herschrijf de commit message van de geselecteerde commit.", "DropCommit": "Verwijder commit", "MoveDownCommit": "Verplaats commit 1 naar beneden", "MoveUpCommit": "Verplaats commit 1 naar boven", + "CannotMoveAnyFurther": "Kan niet verder verplaatsen", + "CannotMoveMergeCommit": "Kan een merge commit niet verplaatsen", + "EditCommit": "Bewerken (start interactieve rebase)", "EditCommitTooltip": "Wijzig commit", "AmendCommitTooltip": "Wijzig commit met staged veranderingen", + "ResetAuthor": "Reset auteur", + "ResetAuthorTooltip": "Wijzig de commit auteur naar de huidige gebruiker. Dit vernieuwt ook de auteur timestamp", + "SetAuthor": "Auteur instellen", + "AddCoAuthor": "Voeg co-auteur toe", "RewordCommitEditor": "Hernoem commit met editor", "NoCommitsThisBranch": "Geen commits in deze branch", + "ExecCommandHere": "Voer het volgende commando hier uit:", "Error": "Foutmelding", "Undo": "Ongedaan maken", "UndoReflog": "Ongedaan maken (via reflog) (experimenteel)", "RedoReflog": "Redo (via reflog) (experimenteel)", + "RedoTooltip": "Het reflog wordt gebruikt om te bepalen welk git commando moet worden gebruikt om het laatste git commando te herhalen. Wijzigingen aan de working tree worden niet meegenomen, alleen command's zijn kandidaten.", + "DiscardAllTooltip": "Verwijder zowel gestagede als niet-gestagede wijzigingen in '{{.path}}'.", + "DiscardUnstagedTooltip": "Verwijder niet-gestagede wijzigingen in '{{.path}}'.", + "DiscardUnstagedDisabled": "De geselecteerde items hebben geen mix van gestagede en niet-gestagede wijzigingen.", + "Pop": "Pop", "Drop": "Laten vallen", "Apply": "Toepassen", "NoStashEntries": "Geen stash items", "StashDrop": "Stash laten vallen", + "SureDropStashEntry": "Weet je het zeker dat je de geselecteerde stash(es) wilt verwijderen?", + "StashPop": "Stash poppen", "SurePopStashEntry": "Weet je zeker dat je deze stash entry wil poppen?", "StashApply": "Stash toepassen", "SureApplyStashEntry": "Weet je zeker dat je deze stash entry wil toepassen?", "NoTrackedStagedFilesStash": "Je hebt geen tracked/staged bestanden om te laten stashen", + "NoFilesToStash": "Je hebt geen bestanden om te stashen", "StashChanges": "Stash veranderingen", - "OpenConfig": "Open config bestand", + "RenameStash": "Hernoem stash", + "RenameStashPrompt": "Hernoem stash: {{.stashName}}", "EditConfig": "Verander config bestand", "ForcePush": "Forceer push", "ForcePushPrompt": "Je branch is afgeweken van de remote branch. Druk {{.cancelKey}} om te annuleren, of {{.confirmKey}} om geforceerd te pushen.", "CheckForUpdate": "Check voor updates", "CheckingForUpdates": "Zoeken naar updates...", + "UpdateAvailableTitle": "Update beschikbaar!", + "UpdateAvailable": "Download en installeer versie {{.newVersion}}?", + "FailedToRetrieveLatestVersionErr": "Ophalen versie-informatie mislukt", "OnLatestVersionErr": "Je hebt al de laatste versie", "MajorVersionErr": "Nieuwe versie ({{.newVersion}}) is niet backwards compatibele vergeleken met de huidige versie ({{.currentVersion}})", "CouldNotFindBinaryErr": "Kon geen binary vinden op {{.url}}", + "ConfirmQuitDuringUpdate": "Er is een update bezig. Weet je zeker dat je wilt afsluiten?", "GitconfigParseErr": "Gogit kon je gitconfig bestand niet goed parsen door de aanwezigheid van losstaande '\\' tekens. Het weghalen van deze tekens zou het probleem moeten oplossen. ", "EditFile": "Verander bestand", + "EditFileTooltip": "Open bestand in externe editor.", "OpenFile": "Open bestand", + "OpenFileTooltip": "Open bestand in standaardapplicatie.", + "OpenInEditor": "Openen in editor", "IgnoreFile": "Voeg toe aan .gitignore", + "ExcludeFile": "Toevoegen aan .git/info/exclude", "RefreshFiles": "Refresh bestanden", "Merge": "Merge in met huidige checked out branch", "ConfirmQuit": "Weet je zeker dat je dit programma wil sluiten?", @@ -92,34 +198,71 @@ "UnsupportedGitService": "Niet-ondersteunde git-service", "CopyPullRequestURL": "Kopieer de URL van het pull-verzoek naar het klembord", "NoBranchOnRemote": "Deze branch bestaat niet op de remote. U moet het eerst naar de remote pushen.", + "Fetch": "Fetch", + "ExpandAll": "Vouw alle bestanden uit", + "ExpandAllTooltip": "Vouw alle mappen in de bestandsstructuur uit", "FileEnter": "Stage individuele hunks/lijnen", "StageSelectionTooltip": "Toggle lijnen staged / unstaged", "DiscardSelection": "Verwijdert change (git reset)", + "ToggleSelectHunk": "Wissel tussen hunk selectie aan of uit", + "SelectHunk": "Selecteer hunks", + "SelectLineByLine": "Selecteer regel-voor-regel", + "ToggleSelectHunkTooltip": "Wissel tussen regel-voor-regel of hunk selectie modus.", "ToggleSelectionForPatch": "Voeg toe/verwijder lijn(en) in patch", "ToggleStagingView": "Ga naar een ander paneel", "ReturnToFilesPanel": "Ga terug naar het bestanden paneel", "FastForward": "Fast-forward deze branch vanaf zijn upstream", "FoundConflictsTitle": "Conflicten!", + "ViewConflictsMenuItem": "Toon conflicten", + "AbortMenuItem": "Breek %s af", "PickHunk": "Kies stuk", - "PickAllHunks": "Kies beide stukken", "ViewMergeRebaseOptions": "Bekijk merge/rebase opties", + "ViewMergeRebaseOptionsTooltip": "Toon abort/continue/skip opties voor huidige merge/rebase.", + "ViewMergeOptions": "Toon merge opties", + "ViewRebaseOptions": "Toon rebase opties", + "ViewCherryPickOptions": "Toon cherry-pick opties", + "ViewRevertOptions": "Toon revert opties", "NotMergingOrRebasing": "Je bent momenteel niet aan het rebasen of mergen", + "AlreadyRebasing": "Deze actie kan niet worden uitgevoerd tijdens een rebase", + "NotMidRebase": "Deze actie werkt alleen tijdens een interactieve rebase", + "MustSelectFixupCommit": "Deze actie werkt alleen op fixup commits", "RecentRepos": "Recente repositories", "MergeOptionsTitle": "Merge opties", "RebaseOptionsTitle": "Rebase opties", + "CherryPickOptionsTitle": "Cherry-pick opties", + "RevertOptionsTitle": "Revert opties", "CommitSummaryTitle": "Commit bericht", + "CommitDescriptionTitle": "Commit beschrijving", "LocalBranchesTitle": "Branches", "SearchTitle": "Zoek", + "TagsTitle": "Tags", + "MenuTitle": "Menu", + "CommitMenuTitle": "Commit Menu", + "RemotesTitle": "Remotes", + "RemoteBranchesTitle": "Remote branches", "PatchBuildingTitle": "Patch bouwen", "InformationTitle": "Informatie", + "ReflogCommitsTitle": "Reflog", + "ConflictsResolved": "Alle mergeconflicten zijn opgelost. Doorgaan met de %s?", + "Continue": "Doorgaan", + "UnstagedFilesAfterConflictsResolved": "Er zijn bestanden gewijzigd nadat de mergeconflicten opgelost waren. Deze bestanden stagen en doorgaan?", + "RebasingTitle": "Rebase '{{.checkedOutBranch}}'", + "SimpleRebase": "Simpele rebase op '{{.ref}}'", + "InteractiveRebase": "Interactieve rebase op '{{.ref}}'", + "RebaseOntoBaseBranch": "Rebase op basis branch ({{.baseBranch}})", "FwdNoUpstream": "Kan niet de branch vooruitspoelen zonder upstream", "FwdCommitsToPush": "Je kan niet vooruitspoelen als de branch geen nieuwe commits heeft", "ErrorOccurred": "Er is iets fout gegaan! Zou je hier een issue aan willen maken", + "ConflictLabel": "CONFLICT", + "CommitsSectionHeader": "Commits", + "YouDied": "JE BENT DOOD!", "RewordNotSupported": "Herformatteren van commits in interactief rebasen is nog niet ondersteund", "CherryPickCopy": "Kopieer commit (cherry-pick)", "PasteCommits": "Plak commits (cherry-pick)", + "SureCherryPick": "Weet je zeker dat je de {{.numCommits}} gekopieerde commit(s) naar deze branch wilt cherry-picken?", "CherryPick": "Cherry-Pick", "Donate": "Doneer", + "AskQuestion": "Stel vraag", "PrevHunk": "Selecteer de vorige hunk", "NextHunk": "Selecteer de volgende hunk", "PrevConflict": "Selecteer voorgaand conflict", @@ -130,8 +273,11 @@ "ScrollUp": "Scroll omhoog", "ScrollUpMainWindow": "Scroll naar beneden vanaf hoofdpaneel", "ScrollDownMainWindow": "Scroll naar beneden vanaf hoofdpaneel", + "SuspendApp": "Pauzeer de applicatie", + "CannotSuspendApp": "Applicatie pauzeren wordt niet ondersteund op Windows", "AmendCommitTitle": "Commit wijzigen", "AmendCommitPrompt": "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?", + "AmendCommitWithConflictsContinue": "Nee, doorgaan met rebase", "DropCommitTitle": "Verwijder commit", "DropCommitPrompt": "Weet je zeker dat je deze commit wil verwijderen?", "PullingStatus": "Pullen", @@ -145,12 +291,16 @@ "CherryPickingStatus": "Cherry-picken", "UndoingStatus": "Ongedaan maken", "CheckingOutStatus": "Uitchecken", + "RevertingStatus": "Bezig met reverten", "CommitFiles": "Commit bestanden", "ViewItemFiles": "Bekijk gecommite bestanden", "CommitFilesTitle": "Commit bestanden", "CheckoutCommitFileTooltip": "Bestand uitchecken", + "Remove": "Verwijderen", "DiscardOldFileChangeTooltip": "Uitsluit deze commit zijn veranderingen aan dit bestand", "DiscardFileChangesTitle": "Uitsluit bestand zijn veranderingen", + "CreateRepo": "Niet in een git repository. Maak een nieuwe git repository? (y/N): ", + "AutoStashTitle": "Autostash?", "AutoStashPrompt": "Je moet je veranderingen stashen en poppen om ze over te brengen. Dit automatisch doen? (enter/esc)", "Discard": "Bekijk 'veranderingen ongedaan maken' opties", "Cancel": "Annuleren", @@ -160,10 +310,13 @@ "DiscardAnyUnstagedChanges": "Gooi unstaged wijzigingen weg", "DiscardUntrackedFiles": "Negeer niet-gevonden bestanden", "HardReset": "Harde reset", + "Delete": "Verwijderen", + "Reset": "Resetten", "ViewResetOptions": "Bekijk reset opties", "CreateFixupCommit": "Creëer fixup commit", "CreateFixupCommitTooltip": "Creëer fixup commit", "SquashAboveCommitsTooltip": "Squash bovenstaande commits", + "ExecuteShellCommand": "Voer shellcommando uit", "CommitChangesWithoutHook": "Commit veranderingen zonder pre-commit hook", "ResetTo": "Reset naar", "PressEnterToReturn": "Press om terug te gaan naar lazygit", @@ -172,6 +325,8 @@ "StashAllChangesKeepIndex": "Stash staged wijzigingen", "StashOptions": "Stash opties", "NotARepository": "Fout: moet in een git repository uitgevoerd worden", + "ScrollLeft": "Scroll naar links", + "ScrollRight": "Scroll naar rechts", "DiscardPatch": "Patch weg gooien", "DiscardPatchConfirm": "Je kan alleen maar een patch bouwen van 1 commit. Huidige patch weggooien?", "CantPatchWhileRebasingError": "Je kan geen patch bouwen of patch commando uitvoeren wanneer je in een merging of rebasing state zit", @@ -185,18 +340,49 @@ "NewRemote": "Voeg een nieuwe remote toe", "NewRemoteName": "Nieuwe remote name:", "NewRemoteUrl": "Nieuwe remote url:", + "ViewBranches": "Bekijk branches", "EditRemoteName": "Enter updated remote naam voor {{.remoteName}}:", "EditRemoteUrl": "Enter updated remote url voor {{.remoteName}}:", "RemoveRemote": "Verwijder remote", + "RemoveRemoteTooltip": "Verwijder de geselecteerde remote. Locale branches die een branch tracken van de remote worden niet aangepast.", + "RemoveRemotePrompt": "Weet je zeker dat je de remote wilt verwijderen?", "DeleteRemoteBranch": "Verwijder remote branch", + "DeleteRemoteBranches": "Verwijder remote branches", + "DeleteRemoteBranchTooltip": "Verwijder de remote branch van de remote.", + "DeleteLocalAndRemoteBranch": "Verwijder zowel lokale als remote branch", + "DeleteLocalAndRemoteBranches": "Verwijder zowel lokale als remote branches", + "SetAsUpstream": "Instellen als upstream", "SetAsUpstreamTooltip": "Stel in als upstream van uitgecheckte branch", "SetUpstream": "Stel in als upstream van uitgecheckte branch", + "UnsetUpstream": "Verwijder de upstream configuratie van de geselecteerde branch", + "DivergenceSectionHeaderLocal": "Lokaal", + "DivergenceSectionHeaderRemote": "Remote", "SetUpstreamTitle": "Stel in als upstream branch", "EditRemoteTooltip": "Wijzig remote", + "TagCommitTooltip": "Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving.", "TagNameTitle": "Tag naam:", + "TagMessageTitle": "Tag omschrijving", + "LightweightTag": "Lichtgewicht tag", + "AnnotatedTag": "Geannoteerde tag", + "DeleteTagTitle": "Verwijder tag '{{.tagName}}'?", + "DeleteLocalTag": "Verwijder lokale tag", + "DeleteRemoteTag": "Verwijder remote tag", + "DeleteLocalAndRemoteTag": "Verwijder locale en remote tag", + "SelectRemoteTagUpstream": "Remote van waar de tag '{{.tagName}}' verwijderd moet worden:", + "DeleteRemoteTagPrompt": "Weet je zeker dat je de remote tag '{{.tagName}}' wilt verwijderen uit '{{.upstream}}'?", + "DeleteLocalAndRemoteTagPrompt": "Weet je zeker dat je {{.tagName}} zowel lokaal als in {{.upstream}}' wilt verwijderen?", + "RemoteTagDeletedMessage": "Remote tag verwijderd", "PushTagTitle": "Remote om tag '{{.tagName}}' te pushen naar:", + "PushTag": "Tag pushen", + "PushTagTooltip": "Push de geselecteerde tag naar een remote. Je krijgt de optie een remote te selecteren.", "NewTag": "Creëer tag", + "NewTagTooltip": "Maak een nieuwe tag die naar de huidige commit wijst. Je wordt gevraagd om een tag naam en optionele beschrijving.", + "CreatingTag": "Tag wordt gemaakt", + "ForceTag": "Forceer Tag", + "ForceTagPrompt": "De tag '{{.tagName}}' bestaat al. Druk op {{.cancelKey}} om te annuleren, of op {{.confirmKey}} om te overschrijven.", "FetchRemoteTooltip": "Fetch remote", + "CheckoutCommitTooltip": "Check de geselecteerde branch uit als een detached HEAD.", + "NoBranchesFoundAtCommitTooltip": "Geen branches gevonden bij de geselecteerde commit.", "GitFlowOptions": "Laat git-flow opties zien", "NotAGitFlowBranch": "Dit lijkt geen git flow branch te zijn", "NewBranchNamePrompt": "Noem een nieuwe branch naam", @@ -207,6 +393,7 @@ "PrevScreenMode": "Vorige scherm modus", "StartSearch": "Start met zoeken", "Keybindings": "Sneltoetsen", + "KeybindingsMenuSectionGlobal": "Algemeen", "RenameBranch": "Hernoem branch", "NewGitFlowBranchPrompt": "Nieuwe '{{.branchType}}' naam:", "RenameBranchWarning": "Deze branch volgt een remote. Deze actie zal alleen de locale branch name wijzigen niet de naam van de remote branch. Verder gaan?", @@ -239,6 +426,8 @@ "DiffingMenuTitle": "Diffen", "SwapDiff": "Keer diff richting om", "ViewDiffingOptions": "Open diff menu", + "OpenCommandLogMenu": "Commandolog opties weergeven", + "OpenCommandLogMenuTooltip": "Bekijk commandolog opties, bijv. commandolog tonen/verbergen en focus.", "ShowingGitDiff": "Laat output zien voor:", "CopyBranchNameToClipboard": "Kopieer branch name naar klembord", "CopyPathToClipboard": "Kopieer de bestandsnaam naar het klembord", @@ -249,21 +438,132 @@ "BranchNotFoundPrompt": "Branch niet gevonden. Creëer een nieuwe branch genaamd", "CreateNewBranchFromCommit": "Creëer nieuwe branch van commit", "ViewCommits": "Bekijk commits", + "RunningCustomCommandStatus": "Aangepast commando uitvoeren", "EnterSubmoduleTooltip": "Enter submodule", "CopySubmoduleNameToClipboard": "Kopieer submodule naam naar klembord", "NewSubmodule": "Voeg nieuwe submodule toe", "InitSubmoduleTooltip": "Initialiseer submodule", "ViewBulkSubmoduleOptions": "Bekijk bulk submodule opties", "NavigationTitle": "Lijstpaneel navigatie", + "ExtrasTitle": "Commandolog", "PullRequestURLCopiedToClipboard": "Pull-aanvraag-URL gekopieerd naar klembord", "CommitMessageCopiedToClipboard": "Commit message gekopieerd naar klembord", + "PatchCopiedToClipboard": "Patch gekopieerd naar klembord", + "MessageCopiedToClipboard": "Bericht gekopieerd naar klembord", "CopiedToClipboard": "gekopieerd naar klembord", + "ErrRepositoryMovedOrDeleted": "Kan repo niet vinden. Misschien is het verplaatst of verwijderd ¯\\_(ツ)_/¯", + "ErrWorktreeMovedOrRemoved": "Kan worktree niet vinden. Misschien is deze verplaatst of verwijderd ¯\\_(ツ)_/¯", + "CommandLog": "Commandolog", + "ToggleShowCommandLog": "Toon/verberg commando log", + "FocusCommandLog": "Focus commandolog", + "CommandLogHeader": "Je kunt dit paneel verbergen/focussen door op '%s'\n te drukken\n", + "RandomTip": "Willekeurige tip", + "ToggleWhitespaceInDiffView": "Witruimte weergeven in-/uitschakelen", "CreatePullRequestOptions": "Bekijk opties voor pull-aanvraag", + "DefaultBranch": "Standaard branch", + "SelectBranch": "Selecteer branch", + "SelectTargetRemote": "Selecteer target remote", + "NoValidRemoteName": "Een remote met naam '%s' bestaat niet", "CreatePullRequest": "Maak een pull-request", + "SelectConfigFile": "Selecteer configuratiefile", + "NoConfigFileFoundErr": "Configuratiefile niet gevonden", + "GitOutput": "Git output:", + "GitCommandFailed": "Git commando mislukt. Controleer commandolog voor details (open met %s)", + "OpenLogMenu": "Log opties weergeven", + "SortAlphabetical": "Alfabetisch", "ConfirmRevertCommit": "Weet u zeker dat u {{.selectedCommit}} ongedaan wilt maken?", + "SwitchToWorktree": "Overschakelen naar worktree", + "RemoveWorktree": "Worktree verwijderen", + "RemoveWorktreeTitle": "Worktree verwijderen", + "RemoveWorktreeMenuTitle": "Verwijder worktree '{{.worktreeName}}'?", + "RemoveWorktreeAndDeleteBranch": "Worktree en branch verwijderen", + "RemoveWorktreeAndDeleteBothBranches": "Worktree, lokale branch en remote branch verwijderen", + "WorktreeNotCheckedOutOnBranch": "Deze worktree kan niet worden uitgecheckt op een branch", + "WorktreesTitle": "Worktrees", + "WorktreeTitle": "Worktree", + "RemovingWorktree": "Worktree wordt verwijderd", + "AddingWorktree": "Worktree wordt toegevoegd", + "CantDeleteCurrentWorktree": "Je kan de huidige worktree niet verwijderen!", + "AlreadyInWorktree": "Je bent al in de geselecteerde worktree", + "CantDeleteMainWorktree": "Je kan de hoofdworktree niet verwijderen!", + "NoWorktreesThisRepo": "Geen worktrees", + "MissingWorktree": "(ontbreekt)", + "WorktreeLocationPromptCheckout": "Worktree voor branch '{{.branchName}}':", + "LcWorktree": "worktree", + "Name": "Naam", + "Branch": "Branch", + "Path": "Pad", + "MarkedBaseCommitStatus": "Gemarkeerd als basiscommit voor rebase", + "MarkAsBaseCommit": "Markeer als basiscommit voor rebase", + "MarkAsBaseCommitTooltip": "Selecteer een basiscommit voor de volgende rebase. Als je rebased op een branch worden alleen commits boven de basiscommit meegenomen. Hiervoor wordt het `git rebase --onto` commando gebruikt.", + "CancelMarkedBaseCommit": "Annuleer de gemarkeerde basiscommit", + "MarkedCommitMarker": "↑↑↑ Hier wordt de rebase gedaan ↑↑↑", + "FailedToOpenURL": "Fout bij het openen van URL %s\n\nError: %v", + "InvalidLazygitEditURL": "Ongeldige lazygit-edit URL-formaat: %s", + "NoCopiedCommits": "Geen gekopieerde commits", + "DisabledMenuItemPrefix": "Uitgeschakeld: ", + "QuickStartInteractiveRebase": "Start interactieve rebase", "ToggleRangeSelect": "Toggle drag selecteer", - "Actions": {}, + "CustomCommands": "Aangepaste commando's", + "NoApplicableCommandsInThisContext": "(Geen toepasselijke commando's in deze context)", + "Actions": { + "CopyCommitAuthorToClipboard": "Kopieer commit auteur naar klembord", + "CopyCommitAttributeToClipboard": "Kopieer naar klembord", + "CopyCommitTagsToClipboard": "Kopieer commit tags naar klembord", + "CopyPatchToClipboard": "Kopieer patch naar klembord", + "CustomCommand": "Aangepast commando", + "Commit": "Commit", + "Push": "Push", + "Pull": "Pull", + "OpenFile": "Open bestand", + "CopyToClipboard": "Kopieer naar klembord", + "CopySelectedTextToClipboard": "Kopieer geselecteerde tekst naar klembord", + "DeleteRemoteBranch": "Verwijder remote branch", + "SetBranchUpstream": "Stel upstream branch in", + "AddRemote": "Voeg remote toe", + "RemoveRemote": "Verwijder remote", + "UpdateRemote": "Update remote", + "ApplyPatch": "Pas patch toe", + "Stash": "Stash", + "RemoveSubmodule": "Verwijder submodule", + "ResetSubmodule": "Reset submodule", + "AddSubmodule": "Voeg submodule toe", + "UpdateSubmoduleUrl": "Update submodule URL", + "InitialiseSubmodule": "Initialiseer submodule", + "UpdateSubmodule": "Update submodule", + "NukeWorkingTree": "Blaas de working tree op met een kernbom", + "RemoveUntrackedFiles": "Verwijder niet-getrackte bestanden", + "SoftReset": "Soft reset", + "MixedReset": "Mixed reset", + "HardReset": "Hard reset", + "Undo": "Ongedaan maken", + "Redo": "Herhalen", + "OpenCommitInBrowser": "Open commit in browser", + "OpenPullRequest": "Open pull request in browser", + "AddWorktree": "Voeg worktree toe" + }, "Bisect": {}, - "Log": {}, - "BreakingChangesByVersion": {} + "Log": { + "RemoveFile": "Verwijder pad '{{.path}}'", + "RemoveEmptyDir": "Verwijder de lege map '{{.path}}'", + "CopyToClipboard": "Kopieer '{{.str}}' naar klembord", + "Remove": "Verwijder '{{.filename}}'", + "CreateFileWithContent": "Maak bestand '{{.path}}'", + "AppendingLineToFile": "Voeg {{.line}}' toe aan bestand '{{.filename}} '", + "EditRebaseFromBaseCommit": "Begin een interactieve rebase van '{{.baseCommit}}' op '{{.targetBranchName}}'", + "DroppingStash": "Verwijder stash %s", + "PoppingStash": "Pop stash %s", + "DeletingBranch": "Verwijder branch '{{.branchName}}' (was {{.hash}})" + }, + "BreakingChangesMessage": "Je bent aan het updaten naar een nieuwe versie van lazygit waar incompatibele wijzigingen in zitten. Bekijk de onderstaande notities en update je configuratie indien nodig.\nVoor meer informatie, zie de volledige release notes op .", + "BreakingChangesByVersion": { + "0.41.0": "- Als je op 'g' drukt om het git reset menu te openen, is de 'mixed' optie nu de eerste en standaard optie, in plaats van 'soft'. Dit is om dat 'mixed' de meest gebruikte optie is.\n- Het commit message paneel doet nu automatisch aan zinsafbreking (voegt een nieuwe regel toe als de kantlijn bereikt is). Dit kan je aanpassen in de config met:\n\ngit:\n commit:\n autoWrapCommitMessage: true\n autoWrapWidth: 72\n\n- De 'v' knop was al gebruik om in de stagingweergave een range te selecteren, maar nu kun je die ook gebruiken om een range te selecteren vanuit andere weergaven. Jammergenoeg conflicteert dit met de 'v' keybinding voor het plakken van commits (cherry-pick), dus wordt dat nu gedaan met 'shift+V' en voor de consistentie, gaat kopieren met 'shift-C' in plaats van 'c'. Let op dat de 'v' keybinding niet de enige manier is om een range selectie te starten: je kan ook shift+pijltje omhoog/naar beneden gebruiken. Dus als je de cherry-pick keybindings volgens het oude gedrag wilt configureren, zet dan het volgende in je config:\n\nkeybinding:\n universal:\n toggleRangeSelect: \n commits:\n cherryPickCopy: 'c'\n pasteCommits: 'v'\n\n- Squashen van fixups met 'shift-S' opent nu een menu, met de standaard optie om alle fixup commits in de branch te squashen. Het originele gedrag, waarbij alleen de commits boven de geselecteerde commit werden gesquast is nog steeds te kiezen als tweede optie in dat menu.\n- Push/pull/fetch activiteitsstatus wordt nu weergegeven bij de branch en niet meer in een popup. Hierdoor kan je meerdere branches tegelijkertijd fetchen en de status hiervan bekijken.\n- De git log graph in de commit weergave is nu standaard altijd zichtbaar (voorheen was het alleen zichtbaar in gemaximaliseerde weergave). Als je dit te druk vindt, kan je het terug veranderen via ctrl+L -> 'Geef git graph weer' -> 'Wanneer gemaximaliseerd'\n- Op de spatiebalk drukken wanneer een remote branch geselecteerd is gaf eerst een dialoogvenster voor het invullen van een naam voor de nieuwe locale branch behorend bij de checkout van deze remote branch. In plaats daarvan wordt de remote branch nu meteen uitgecheckt, met de keuze voor een nieuwe locale branch met dezelfde naam, of een detatched head. Het oude gedrag is nog steeds beschikbaar via de 'n' keybinding.\n- Fliteren (bijv. als je op '/' drukt) is standaard minder fuzzy; alleen stukken van woorden of substrings worden nu gematched. Zoeken op meerdere substrings kan door ze te scheiden met spaties. Als je het oude gedrag wilt, stel dan dit in in je config:\n\ngui:\n filterMode: 'fuzzy'\n" + }, + "ViewMergeConflictOptions": "Bekijk merge conflict opties", + "ViewMergeConflictOptionsTooltip": "Bekijk opties voor het oplossen van mergeconflicten.", + "NoFilesWithMergeConflicts": "Er zijn geen files met mergeconflicten.", + "MergeConflictOptionsTitle": "Los mergeconflicten op", + "UseCurrentChanges": "Gebruik huidige wijzigingen", + "UseIncomingChanges": "Gebruik binnenkomende wijzigingen", + "UseBothChanges": "Gebruik beide" } diff --git a/pkg/i18n/translations/pl.json b/pkg/i18n/translations/pl.json index b5ee0314a..bd744e3b0 100644 --- a/pkg/i18n/translations/pl.json +++ b/pkg/i18n/translations/pl.json @@ -32,6 +32,7 @@ "BaseCommitIsAlreadyOnMainBranch": "Bazowy commit dla tej zmiany jest już na gałęzi głównej", "BaseCommitIsNotInCurrentView": "Bazowy commit nie jest w bieżącym widoku", "HunksWithOnlyAddedLinesWarning": "Istnieją zakresy tylko z dodanymi liniami w różnicach; uważaj, aby sprawdzić, czy te należą do znalezionego bazowego commita.\n\nKontynuować?", + "StatusTitle": "Status", "GlobalTitle": "Globalne skróty klawiszowe", "Execute": "Wykonaj", "Stage": "Zatwierdź", @@ -46,21 +47,37 @@ "Push": "Wypchnij", "Pull": "Pociągnij", "PushTooltip": "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.", - "PullTooltip": "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.", + "PullTooltip": "Pociągnij zmiany ze zdalnego dla bieżącej gałęzi. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej.", "FileFilter": "Filtruj pliki według statusu", "CopyToClipboardMenu": "Kopiuj do schowka", "CopyFileName": "Nazwa pliku", + "CopyRelativeFilePath": "Ścieżka względna", + "CopyAbsoluteFilePath": "Ścieżka absolutna", "CopyFileDiffTooltip": "Jeśli istnieją zatwierdzone elementy, ta komenda bierze pod uwagę tylko je. W przeciwnym razie bierze pod uwagę wszystkie niezatwierdzone.", "CopySelectedDiff": "Różnice wybranego pliku", "CopyAllFilesDiff": "Różnice wszystkich plików", + "CopyFileContent": "Zawartość zaznaczonego pliku", "NoContentToCopyError": "Nic do skopiowania", "FileNameCopiedToast": "Nazwa pliku skopiowana do schowka", "FilePathCopiedToast": "Ścieżka pliku skopiowana do schowka", "FileDiffCopiedToast": "Różnice pliku skopiowane do schowka", "AllFilesDiffCopiedToast": "Różnice wszystkich plików skopiowane do schowka", + "FileContentCopiedToast": "Zawartość pliku została skopiowana do schowka", "FilterStagedFiles": "Pokaż tylko zatwierdzone pliki", "FilterUnstagedFiles": "Pokaż tylko niezatwierdzone pliki", + "FilterTrackedFiles": "Pokaż tylko śledzone pliki", + "FilterUntrackedFiles": "Pokaż tylko nieśledzone pliki", + "NoFilter": "Brak filtrów", + "FilterLabelStagedFiles": "(tylko zatwierdzone)", + "FilterLabelUnstagedFiles": "(tylko niezatwierdzone)", + "FilterLabelTrackedFiles": "(tylko śledzone)", + "FilterLabelUntrackedFiles": "(tylko nieśledzone)", "MergeConflictsTitle": "Konflikty scalania", + "MergeConflictIncomingDiff": "Przychodzące zmiany:", + "MergeConflictCurrentDiff": "Aktualne zmiany:", + "MergeConflictPressEnterToResolve": "Naciśnij %s, aby rozwiązać.", + "MergeConflictKeepFile": "Zatrzymaj plik", + "MergeConflictDeleteFile": "Usuń plik", "Checkout": "Przełącz", "CheckoutTooltip": "Przełącz wybrany element.", "CantCheckoutBranchWhilePulling": "Nie możesz przełączyć na inną gałąź podczas pobierania bieżącej gałęzi", @@ -76,8 +93,13 @@ "NewBranchNameBranchOff": "Nowa nazwa gałęzi (gałąź oparta na '{{.branchName}}')", "CantDeleteCheckOutBranch": "Nie możesz usunąć przełączonej gałęzi!", "DeleteBranchTitle": "Usuń gałąź '{{.selectedBranchName}}'?", + "DeleteBranchesTitle": "Usunąć zaznaczone gałęzie?", "DeleteLocalBranch": "Usuń lokalną gałąź", + "DeleteLocalBranches": "Usuń lokalne gałęzie", "DeleteRemoteBranchPrompt": "Czy na pewno chcesz usunąć gałąź zdalną '{{.selectedBranchName}}' z '{{.upstream}}'?", + "DeleteRemoteBranchesPrompt": "Czy na pewno chcesz usunąć gałęzie ze zdalnych repozytoriów odpowiadające zaznaczonym gałęziom lokalnym?", + "DeleteLocalAndRemoteBranchPrompt": "Czy na pewno chcesz usunąć '{{.localBranchName}}' ze swojego komputera, jak i '{{.remoteBranchName}}' z '{{.remoteName}}'?", + "DeleteLocalAndRemoteBranchesPrompt": "Czy na pewno chcesz usunąć zaznaczone gałęzie ze swojego komputera, jak i odpowiadające im gałęzie zdalne z repozytoriów zdalnych, w których się znajdują?", "ForceDeleteBranchTitle": "Wymuś usunięcie gałęzi", "ForceDeleteBranchMessage": "'{{.selectedBranchName}}' nie jest w pełni scalona. Czy na pewno chcesz ją usunąć?", "RebaseBranch": "Przebazuj", @@ -88,8 +110,15 @@ "ForceCheckoutTooltip": "Wymuś przełączenie wybranej gałęzi. To spowoduje odrzucenie wszystkich lokalnych zmian w drzewie roboczym przed przełączeniem na wybraną gałąź.", "CheckoutByName": "Przełącz według nazwy", "CheckoutByNameTooltip": "Przełącz według nazwy. W polu wprowadzania możesz wpisać '-' aby przełączyć się na ostatnią gałąź.", + "CheckoutPreviousBranch": "Przełącz na poprzednią gałąź", + "RemoteBranchCheckoutTitle": "Przełącz na {{.branchName}}", + "RemoteBranchCheckoutPrompt": "Jak chciałbyś/chciałabyś przełączyć się na tę gałąź?", + "CheckoutTypeNewBranch": "Nowa lokalna gałąź", + "CheckoutTypeNewBranchTooltip": "Utwórz nową lokalną gałąź śledzącą tę gałąź zdalną.", "NewBranch": "Nowa gałąź", "NewBranchFromStashTooltip": "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.", + "MoveCommitsToNewBranch": "Przenieś commity do nowej gałęzi", + "MoveCommitsToNewBranchFromBaseItem": "Nowa gałąź z gałęzi podstawowej (%s)", "NoBranchesThisRepo": "Brak gałęzi dla tego repozytorium", "CommitWithoutMessageErr": "Nie możesz commitować bez wiadomości commita", "Close": "Zamknij", @@ -102,7 +131,7 @@ "FixupTooltip": "Włącz wybrany commit do commita poniżej. Podobnie do fixup, ale wiadomość wybranego commita zostanie odrzucona.", "SureSquashThisCommit": "Czy na pewno chcesz scalić wybrane commit(y) do commita poniżej?", "Squash": "Scal", - "PickCommitTooltip": "Oznacz wybrany commit do wybrania (podczas rebazowania). Oznacza to, że commit zostanie zachowany po kontynuacji rebazowania.", + "PickCommitTooltip": "Oznacz wybrany commit do wybrania (podczas przebazowania). Oznacza to, że commit zostanie zachowany po kontynuacji przebazowania.", "Pick": "Wybierz", "Edit": "Edytuj", "Revert": "Cofnij", @@ -110,13 +139,13 @@ "Reword": "Przeformułuj", "CommitRewordTooltip": "Przeformułuj wiadomość wybranego commita.", "DropCommit": "Usuń", - "DropCommitTooltip": "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.", + "DropCommitTooltip": "Usuń wybrany commit. To usunie commit z gałęzi za pomocą przebazowania. Jeśli commit wprowadza zmiany, od których zależą późniejsze commity, być może będziesz musiał rozwiązać konflikty scalania.", "MoveDownCommit": "Przesuń commit w dół", "MoveUpCommit": "Przesuń commit w górę", "CannotMoveAnyFurther": "Nie można przesunąć dalej", - "EditCommit": "Edytuj (rozpocznij interaktywne rebazowanie)", - "EditCommitTooltip": "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.", - "AmendCommitTooltip": "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.", + "EditCommit": "Edytuj (rozpocznij interaktywne przebazowanie)", + "EditCommitTooltip": "Edytuj wybrany commit. Użyj tego, aby rozpocząć interaktywne przebazowanie od wybranego commita. Podczas trwania przebazowania, to oznaczy wybrany commit do edycji, co oznacza, że po kontynuacji przebazowania, przebazowanie zostanie wstrzymane na wybranym commicie, aby umożliwić wprowadzenie zmian.", + "AmendCommitTooltip": "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ą przebazowania.", "Amend": "Popraw", "ResetAuthor": "Resetuj autora", "ResetAuthorTooltip": "Resetuj autora commita do aktualnie skonfigurowanego użytkownika. To również odświeży znacznik czasu autora", @@ -131,6 +160,7 @@ "RewordCommitEditor": "Przeformułuj za pomocą edytora", "NoCommitsThisBranch": "Brak commitów dla tej gałęzi", "UpdateRefHere": "Zaktualizuj gałąź '{{.ref}}' tutaj", + "ExecCommandHere": "Wykonaj następującą komendę tutaj:", "Error": "Błąd", "Undo": "Cofnij", "UndoReflog": "Cofnij", @@ -157,7 +187,6 @@ "StashChanges": "Schowaj zmiany", "RenameStash": "Zmień nazwę schowka", "RenameStashPrompt": "Zmień nazwę schowka: {{.stashName}}", - "OpenConfig": "Otwórz plik konfiguracyjny", "EditConfig": "Edytuj plik konfiguracyjny", "ForcePush": "Wymuś wysłanie", "ForcePushPrompt": "Twoja gałąź rozbiegła się z gałęzią zdalną. Naciśnij {{.cancelKey}}, aby anulować, lub {{.confirmKey}}, aby wymusić wysłanie.", @@ -192,6 +221,7 @@ "SwitchRepo": "Przełącz na ostatnie repozytorium", "UnsupportedGitService": "Nieobsługiwana usługa git", "CopyPullRequestURL": "Kopiuj adres URL żądania ściągnięcia do schowka", + "OpenPullRequestInBrowser": "Otwórz żądanie ściągnięcia w przeglądarce", "NoBranchOnRemote": "Ta gałąź nie istnieje na zdalnym serwerze. Musisz ją najpierw wysłać na zdalny serwer.", "Fetch": "Pobierz", "FetchTooltip": "Pobierz zmiany ze zdalnego serwera.", @@ -213,42 +243,46 @@ "ViewConflictsMenuItem": "Pokaż konflikty", "AbortMenuItem": "Przerwij %s", "PickHunk": "Wybierz fragment", - "PickAllHunks": "Wybierz wszystkie fragmenty", "ViewMergeRebaseOptions": "Pokaż opcje scalania/rebase", "ViewMergeRebaseOptionsTooltip": "Pokaż opcje do przerwania/kontynuowania/pominięcia bieżącego scalania/rebase.", "ViewMergeOptions": "Pokaż opcje scalania", - "ViewRebaseOptions": "Pokaż opcje rebase", - "NotMergingOrRebasing": "Aktualnie nie wykonujesz ani scalania, ani rebase", - "AlreadyRebasing": "Nie można wykonać tej akcji podczas rebase", + "ViewRebaseOptions": "Pokaż opcje przebazowania", + "NotMergingOrRebasing": "Aktualnie nie wykonujesz ani scalania, ani przebazowania", + "AlreadyRebasing": "Nie można wykonać tej akcji podczas przebazowania", "RecentRepos": "Ostatnie repozytoria", "MergeOptionsTitle": "Opcje scalania", - "RebaseOptionsTitle": "Opcje rebase", + "RebaseOptionsTitle": "Opcje przebazowania", "CommitSummaryTitle": "Podsumowanie commita", "CommitDescriptionTitle": "Opis commita", "CommitDescriptionSubTitle": "Naciśnij {{.togglePanelKeyBinding}}, aby przełączyć fokus, {{.commitMenuKeybinding}}, aby otworzyć menu", "LocalBranchesTitle": "Lokalne gałęzie", "SearchTitle": "Szukaj", "TagsTitle": "Tagi", + "MenuTitle": "Menu", "CommitMenuTitle": "Menu commita", "RemotesTitle": "Zdalne", "RemoteBranchesTitle": "Zdalne gałęzie", "PatchBuildingTitle": "Główny panel (budowanie łatki)", "InformationTitle": "Informacje", "SecondaryTitle": "Dodatkowy", + "ReflogCommitsTitle": "Dziennik reflog", "Continue": "Kontynuuj", - "RebasingFromBaseCommitTitle": "Rebase '{{.checkedOutBranch}}' od oznaczonego commita bazowego", - "SimpleRebase": "Prosty rebase na '{{.ref}}'", - "InteractiveRebase": "Interaktywny rebase na '{{.ref}}'", - "InteractiveRebaseTooltip": "Rozpocznij interaktywny rebase z przerwaniem na początku, abyś mógł zaktualizować commity TODO przed kontynuacją.", - "MustSelectTodoCommits": "Podczas rebase ta akcja działa tylko na zaznaczonych commitach TODO.", + "RebasingTitle": "Przebazuj '{{.checkedOutBranch}}'", + "RebasingFromBaseCommitTitle": "Przebazuj '{{.checkedOutBranch}}' od oznaczonego commita bazowego", + "SimpleRebase": "Proste przebazowanie na '{{.ref}}'", + "InteractiveRebase": "Interaktywne przebazowanie na '{{.ref}}'", + "RebaseOntoBaseBranch": "Przebazuj na główną gałąź ({{.baseBranch}})", + "InteractiveRebaseTooltip": "Rozpocznij interaktywne przebazowanie z przerwaniem na początku, abyś mógł zaktualizować commity TODO przed kontynuacją.", + "MustSelectTodoCommits": "Podczas przebazowania ta akcja działa tylko na zaznaczonych commitach TODO.", "FwdNoUpstream": "Nie można szybko przewinąć gałęzi bez źródła", "FwdNoLocalUpstream": "Nie można szybko przewinąć gałęzi, której zdalne źródło nie jest zarejestrowane lokalnie", "FwdCommitsToPush": "Nie można szybko przewinąć gałęzi z commitami do wysłania", "PullRequestNoUpstream": "Nie można otworzyć żądania ściągnięcia dla gałęzi bez źródła", "ErrorOccurred": "Wystąpił błąd! Proszę utworzyć zgłoszenie na", "YouDied": "ZGINĄŁEŚ!", - "RewordNotSupported": "Zmiana słów commitów podczas interaktywnego rebase nie jest obecnie obsługiwana", + "RewordNotSupported": "Zmiana słów commitów podczas interaktywnego przebazowania nie jest obecnie obsługiwana", "ChangingThisActionIsNotAllowed": "Zmiana tego rodzaju wpisu rebase TODO nie jest dozwolona", + "PickIsOnlyAllowedDuringRebase": "Ta akcja jest dozwolona tylko podczas przebazowania", "CherryPickCopy": "Kopiuj (cherry-pick)", "CherryPickCopyTooltip": "Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `{{.paste}}`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `{{.escape}}`, aby anulować zaznaczenie.", "PasteCommits": "Wklej (cherry-pick)", @@ -267,6 +301,7 @@ "ScrollDownMainWindow": "Przewiń główne okno w dół", "AmendCommitTitle": "Popraw commit", "AmendCommitPrompt": "Czy na pewno chcesz poprawić ten commit swoimi zatwierdzonymi plikami?", + "AmendCommitWithConflictsContinue": "Nie, kontynuuj przebazowanie", "DropCommitTitle": "Usuń commit", "DropCommitPrompt": "Czy na pewno chcesz usunąć wybrane commity?", "PullingStatus": "Ściąganie", @@ -277,17 +312,19 @@ "DeletingStatus": "Usuwanie", "DroppingStatus": "Upuszczanie", "MovingStatus": "Przesuwanie", - "RebasingStatus": "Rebase", + "RebasingStatus": "Przebazowanie", "MergingStatus": "Scalanie", - "LowercaseRebasingStatus": "rebase", + "LowercaseRebasingStatus": "przebazowanie", "LowercaseMergingStatus": "scalanie", "AmendingStatus": "Poprawianie", "UndoingStatus": "Cofanie", "RedoingStatus": "Ponawianie", "CheckingOutStatus": "Sprawdzanie", "CommittingStatus": "Commitowanie", + "RewordingStatus": "Przeredagowywanie", "RevertingStatus": "Przywracanie", "CreatingFixupCommitStatus": "Tworzenie commita poprawiającego", + "MovingCommitsToNewBranchStatus": "Przenoszenie commitów do nowej gałęzi", "CommitFiles": "Zatwierdź pliki", "SubCommitsDynamicTitle": "Commity (%s)", "CommitFilesDynamicTitle": "Pliki różnic (%s)", @@ -297,9 +334,9 @@ "CheckoutCommitFileTooltip": "Przełącz plik. Zastępuje plik w twoim drzewie roboczym wersją z wybranego commita.", "CanOnlyDiscardFromLocalCommits": "Można odrzucić tylko zmiany z lokalnych commitów", "Remove": "Usuń", - "DiscardOldFileChangeTooltip": "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.", + "DiscardOldFileChangeTooltip": "Odrzuć zmiany w tym pliku z tego commita. Uruchamia interaktywne przebazowanie w tle, więc możesz otrzymać konflikt scalania, jeśli późniejszy commit również zmienia ten plik.", "DiscardFileChangesTitle": "Odrzuć zmiany w pliku", - "BareRepo": "Próbujesz otworzyć Lazygit w gołym repozytorium, ale Lazygit jeszcze nie obsługuje gołych repozytoriów. Otworzyć najnowsze repozytorium? (t/n) ", + "CreateRepo": "Nie jesteś w repozytorium git. Utwórz nowe repozytorium git? (y/N): ", "InitialBranch": "Nazwa gałęzi? (pozostaw puste dla domyślnej gita): ", "NoRecentRepositories": "Musisz otworzyć lazygit w repozytorium git. Brak ważnych ostatnich repozytoriów. Wyjście.", "IncorrectNotARepository": "Wartość 'notARepository' jest nieprawidłowa. Powinna być jedną z 'prompt', 'create', 'skip', lub 'quit'.", @@ -329,6 +366,8 @@ "SquashCommitsInCurrentBranch": "W bieżącej gałęzi", "SquashCommitsAboveSelectedCommit": "Powyżej wybranego commita", "CannotSquashCommitsInCurrentBranch": "Nie można scalić commitów w bieżącej gałęzi: commit HEAD jest commit merge lub jest obecny na głównej gałęzi.", + "ExecuteShellCommand": "Wykonaj polecenie w powłoce", + "ShellCommand": "Polecenie powłoki:", "CommitChangesWithoutHook": "Zatwierdź zmiany bez hooka pre-commit", "ResetTo": "Resetuj do", "ResetSoftTooltip": "Resetuj HEAD do wybranego commita, zachowując zmiany między bieżącym a wybranym commit jako zmiany zatwierdzone.", @@ -369,13 +408,17 @@ "NewRemote": "Nowy zdalny", "NewRemoteName": "Nowa nazwa zdalnego:", "NewRemoteUrl": "Nowy URL zdalnego:", + "IncompatibleForkAlreadyExistsError": "Zdalne {{.remoteName}} już istnieje i posiada inny adres URL", "ViewBranches": "Wyświetl gałęzie", "EditRemoteName": "Wprowadź zaktualizowaną nazwę zdalnego dla {{.remoteName}}:", "EditRemoteUrl": "Wprowadź zaktualizowany URL zdalnego dla {{.remoteName}}:", "RemoveRemote": "Usuń zdalny", "RemoveRemoteTooltip": "Usuń wybrany zdalny. Wszelkie lokalne gałęzie śledzące gałąź zdalną z tego zdalnego nie zostaną dotknięte.", "DeleteRemoteBranch": "Usuń gałąź zdalną", + "DeleteRemoteBranches": "Usuń gałęzie zdalne", "DeleteRemoteBranchTooltip": "Usuń gałąź zdalną ze zdalnego.", + "DeleteLocalAndRemoteBranch": "Usuń lokalną i zdalną gałąź", + "DeleteLocalAndRemoteBranches": "Usuń lokalne i zdalne gałęzie", "SetAsUpstream": "Ustaw jako upstream", "SetAsUpstreamTooltip": "Ustaw wybraną gałąź zdalną jako upstream sprawdzonej gałęzi.", "SetUpstream": "Ustaw upstream wybranej gałęzi", @@ -385,8 +428,8 @@ "DivergenceSectionHeaderRemote": "Zdalne", "ViewUpstreamResetOptions": "Resetuj sprawdzoną gałąź na {{.upstream}}", "ViewUpstreamResetOptionsTooltip": "Wyświetl opcje resetowania sprawdzonej gałęzi na {{upstream}}. Uwaga: to nie zresetuje wybranej gałęzi na upstream, zresetuje sprawdzoną gałąź na upstream.", - "ViewUpstreamRebaseOptions": "Rebase sprawdzonej gałęzi na {{.upstream}}", - "ViewUpstreamRebaseOptionsTooltip": "Wyświetl opcje rebasowania sprawdzonej gałęzi na {{upstream}}. Uwaga: to nie zrebase'uje wybranej gałęzi na upstream, zrebase'uje sprawdzoną gałąź na upstream.", + "ViewUpstreamRebaseOptions": "Przebazuj aktywną gałąź na {{.upstream}}", + "ViewUpstreamRebaseOptionsTooltip": "Wyświetl opcje przebazowania aktywnej gałęzi na {{upstream}}. Uwaga: to nie przebazuje wybranej gałęzi na upstream, lecz przebazuje aktywną gałąź na upstream.", "UpstreamGenericName": "upstream wybranej gałęzi", "SetUpstreamTitle": "Ustaw gałąź upstream", "EditRemoteTooltip": "Edytuj nazwę lub URL wybranego zdalnego.", @@ -399,8 +442,10 @@ "DeleteTagTitle": "Usuń tag '{{.tagName}}'?", "DeleteLocalTag": "Usuń lokalny tag", "DeleteRemoteTag": "Usuń zdalny tag", + "DeleteLocalAndRemoteTag": "Usuń lokalny i zdalny tag", "SelectRemoteTagUpstream": "Zdalny, z którego usunąć tag '{{.tagName}}':", "DeleteRemoteTagPrompt": "Czy na pewno chcesz usunąć zdalny tag '{{.tagName}}' z '{{.upstream}}'?", + "DeleteLocalAndRemoteTagPrompt": "Czy na pewno chcesz usunąć '{{.tagName}}' zarówno ze swojego komputera, jak i z '{{.upstream}}'?", "RemoteTagDeletedMessage": "Zdalny tag usunięty", "PushTagTitle": "Zdalny, do którego wysłać tag '{{.tagName}}':", "PushTag": "Wyślij tag", @@ -425,7 +470,6 @@ "StartSearch": "Szukaj w bieżącym widoku po tekście", "StartFilter": "Filtruj bieżący widok po tekście", "Keybindings": "Skróty klawiszowe", - "KeybindingsLegend": "Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b", "KeybindingsMenuSectionLocal": "Lokalne", "KeybindingsMenuSectionGlobal": "Globalne", "KeybindingsMenuSectionNavigation": "Nawigacja", @@ -480,9 +524,11 @@ "CommitMessage": "Wiadomość commita", "CommitSubject": "Temat commita", "CommitAuthor": "Autor commita", + "CommitTags": "Zatwierdź tagi", "CopyCommitAttributeToClipboard": "Kopiuj atrybut commita do schowka", "CopyCommitAttributeToClipboardTooltip": "Kopiuj atrybut commita do schowka (np. hash, URL, różnice, wiadomość, autor).", "CopyBranchNameToClipboard": "Kopiuj nazwę gałęzi do schowka", + "CopyTagToClipboard": "Skopiuj tag do schowka", "CopyPathToClipboard": "Kopiuj ścieżkę do schowka", "CommitPrefixPatternError": "Błąd w wzorcu commitPrefix", "CopySelectedTextToClipboard": "Kopiuj zaznaczony tekst do schowka", @@ -538,7 +584,9 @@ "CommitMessageCopiedToClipboard": "Wiadomość commita skopiowana do schowka", "CommitSubjectCopiedToClipboard": "Temat commita skopiowany do schowka", "CommitAuthorCopiedToClipboard": "Autor commita skopiowany do schowka", + "CommitHasNoTags": "Commit nie jest otagowany", "PatchCopiedToClipboard": "Łatka skopiowana do schowka", + "MessageCopiedToClipboard": "Wiadomość została skopiowana do schowka", "CopiedToClipboard": "skopiowane do schowka", "ErrCannotEditDirectory": "Nie można edytować katalogu: można edytować tylko pojedyncze pliki", "ErrStageDirWithInlineMergeConflicts": "Nie można przygotować/odprzygotować katalogu zawierającego pliki z konfliktami scalania w linii. Proszę najpierw rozwiązać konflikty scalania", @@ -558,6 +606,7 @@ "CreatePullRequestOptions": "Zobacz opcje tworzenia pull requesta", "DefaultBranch": "Domyślny branch", "SelectBranch": "Wybierz branch", + "NoValidRemoteName": "Zdalne o nazwie '%s' nie istnieje", "CreatePullRequest": "Utwórz żądanie ściągnięcia", "SelectConfigFile": "Wybierz plik konfiguracyjny", "NoConfigFileFoundErr": "Nie znaleziono pliku konfiguracyjnego", @@ -583,6 +632,7 @@ "OpenCommitInBrowser": "Otwórz commit w przeglądarce", "ViewBisectOptions": "Zobacz opcje bisect", "ConfirmRevertCommit": "Czy na pewno chcesz cofnąć {{.selectedCommit}}?", + "ConfirmRevertCommitRange": "Czy na pewno chcesz cofnąć wybrane commity?", "RewordInEditorTitle": "Przeformułuj w edytorze", "RewordInEditorPrompt": "Czy na pewno chcesz przeformułować ten commit w swoim edytorze?", "HardResetAutostashPrompt": "Czy na pewno chcesz zrobić twardy reset do '%s'? Auto-stash zostanie wykonany jeśli będzie potrzebny.", @@ -590,6 +640,7 @@ "NukeDescription": "Jeśli chcesz, aby wszystkie zmiany w drzewie pracy zniknęły, to jest sposób na to. Jeśli są brudne zmiany w submodule, to zostaną one zapisane w submodule(s).", "DiscardStagedChangesDescription": "To stworzy nowy wpis stash zawierający tylko pliki w stanie staged, a następnie go usunie, tak że drzewo pracy zostanie tylko ze zmianami niezatwierdzonymi", "EmptyOutput": "", + "Patch": "Łatka", "CustomPatch": "Niestandardowy patch", "CommitsCopied": "commitów skopiowanych", "CommitCopied": "commit skopiowany", @@ -600,12 +651,12 @@ "ApplyPatchInReverse": "Zastosuj patch w odwrotności", "ApplyPatchInReverseTooltip": "Zastosuj bieżący patch w odwrotności do drzewa pracy.", "RemovePatchFromOriginalCommit": "Usuń patch z oryginalnego commita (%s)", - "RemovePatchFromOriginalCommitTooltip": "Usuń bieżący patch z jego commita. Jest to osiągane przez rozpoczęcie interaktywnego rebase na commicie, zastosowanie patcha w odwrotności, a następnie kontynuowanie rebase. Jeśli późniejsze commity zależą od patcha, możesz musieć rozwiązać konflikty.", + "RemovePatchFromOriginalCommitTooltip": "Usuń bieżący patch z jego commita. Jest to osiągane przez rozpoczęcie interaktywnego przebazowania na commicie, zastosowanie patcha w odwrotności, a następnie kontynuowanie przebazowania. Jeśli późniejsze commity zależą od patcha, możesz musieć rozwiązać konflikty.", "MovePatchOutIntoIndex": "Przenieś patch do indeksu", - "MovePatchOutIntoIndexTooltip": "Przenieś patch z jego commita do indeksu. Jest to osiągane przez rozpoczęcie interaktywnego rebase na commicie, zastosowanie patcha w odwrotności, kontynuowanie rebase do zakończenia, a następnie zastosowanie patcha do indeksu. Jeśli późniejsze commity zależą od patcha, możesz musieć rozwiązać konflikty.", - "MovePatchIntoNewCommitTooltip": "Przenieś patch z jego commita do nowego commita na górze oryginalnego commita. Jest to osiągane przez rozpoczęcie interaktywnego rebase na oryginalnym commicie, zastosowanie patcha w odwrotności, następnie zastosowanie patcha do indeksu i zatwierdzenie go jako nowy commit, przed kontynuowaniem rebase do zakończenia. Jeśli późniejsze commity zależą od patcha, możesz musieć rozwiązać konflikty.", + "MovePatchOutIntoIndexTooltip": "Przenieś patch z jego commita do indeksu. Jest to osiągane przez rozpoczęcie interaktywnego rebase na commicie, zastosowanie patcha w odwrotności, kontynuowanie przebazowania do zakończenia, a następnie zastosowanie patcha do indeksu. Jeśli późniejsze commity zależą od patcha, możesz musieć rozwiązać konflikty.", + "MovePatchIntoNewCommitTooltip": "Przenieś patch z jego commita do nowego commita na górze oryginalnego commita. Jest to osiągane przez rozpoczęcie interaktywnego przebazowania na oryginalnym commicie, zastosowanie patcha w odwrotności, następnie zastosowanie patcha do indeksu i zatwierdzenie go jako nowy commit, przed kontynuowaniem przebazowania do zakończenia. Jeśli późniejsze commity zależą od patcha, możesz musieć rozwiązać konflikty.", "MovePatchToSelectedCommit": "Przenieś patch do wybranego commita (%s)", - "MovePatchToSelectedCommitTooltip": "Przenieś patch z jego oryginalnego commita do wybranego commita. Jest to osiągane przez rozpoczęcie interaktywnego rebase na oryginalnym commicie, zastosowanie patcha w odwrotności, następnie kontynuowanie rebase do wybranego commita, przed zastosowaniem patcha do przodu i zmodyfikowaniem wybranego commita. Rebase jest następnie kontynuowany do zakończenia. Jeśli commity między źródłem a miejscem docelowym zależą od patcha, możesz musieć rozwiązać konflikty.", + "MovePatchToSelectedCommitTooltip": "Przenieś patch z jego oryginalnego commita do wybranego commita. Jest to osiągane przez rozpoczęcie interaktywnego przebazowania na oryginalnym commicie, zastosowanie patcha w odwrotności, następnie kontynuowanie przebazowania do wybranego commita, przed zastosowaniem patcha do przodu i zmodyfikowaniem wybranego commita. Przebazowanie jest następnie kontynuowane do zakończenia. Jeśli commity między źródłem a miejscem docelowym zależą od patcha, możesz musieć rozwiązać konflikty.", "CopyPatchToClipboard": "Kopiuj patch do schowka", "NoMatchesFor": "Brak dopasowań dla '%s' %s", "MatchesFor": "dopasowania dla '%s' (%d z %d) %s", @@ -627,7 +678,6 @@ "DetachingWorktree": "Odłączanie drzewa pracy", "WorktreesTitle": "Drzewa pracy", "WorktreeTitle": "Drzewo pracy", - "RemoveWorktreePrompt": "Czy na pewno chcesz usunąć drzewo pracy '{{.worktreeName}}'?", "RemovingWorktree": "Usuwanie drzewa pracy", "AddingWorktree": "Dodawanie drzewa pracy", "CantDeleteCurrentWorktree": "Nie możesz usunąć bieżącego drzewa pracy!", @@ -637,26 +687,22 @@ "MissingWorktree": "(brakujące)", "NewWorktree": "Nowe drzewo pracy", "NewWorktreePath": "Nowa ścieżka drzewa pracy", - "NewWorktreeBase": "Nowa bazowa ref drzewa pracy", "RemoveWorktreeTooltip": "Usuń wybrane drzewo pracy. To usunie zarówno katalog drzewa pracy, jak i metadane o drzewie pracy w katalogu .git.", "NewBranchName": "Nowa nazwa brancha", - "NewBranchNameLeaveBlank": "Nowa nazwa brancha (pozostaw puste, aby przełączyć {{.default}})", - "ViewWorktreeOptions": "Zobacz opcje drzewa pracy", - "CreateWorktreeFrom": "Utwórz drzewo pracy z {{.ref}}", - "CreateWorktreeFromDetached": "Utwórz drzewo pracy z {{.ref}} (odłączone)", "LcWorktree": "drzewo pracy", "ChangingDirectoryTo": "Zmiana katalogu na {{.path}}", "Name": "Nazwa", + "Branch": "Gałąź", "Path": "Ścieżka", - "MarkedBaseCommitStatus": "Oznaczono bazowy commit dla rebase", - "MarkAsBaseCommit": "Oznacz jako bazowy commit dla rebase", - "MarkAsBaseCommitTooltip": "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`.", - "MarkedCommitMarker": "↑↑↑ Rebase rozpocznie się stąd ↑↑↑", + "MarkedBaseCommitStatus": "Oznaczono bazowy commit dla przebazowania", + "MarkAsBaseCommit": "Oznacz jako bazowy commit dla przebazowania", + "MarkAsBaseCommitTooltip": "Wybierz bazowy commit dla następnego przebazowania. Kiedy robisz przebazowanie na gałąź, tylko commity powyżej bazowego commita zostaną przeniesione. Używa to polecenia `git rebase --onto`.", + "MarkedCommitMarker": "↑↑↑ Przebazowanie rozpocznie się stąd ↑↑↑", "NoCopiedCommits": "Brak skopiowanych commitów", "DisabledMenuItemPrefix": "Wyłączone: ", - "QuickStartInteractiveRebase": "Rozpocznij interaktywny rebase", - "QuickStartInteractiveRebaseTooltip": "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.\nJeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita, naciśnij `{{.editKey}}`.", - "CannotQuickStartInteractiveRebase": "Nie można rozpocząć interaktywnego rebase: commit HEAD jest commit'em scalenia lub jest obecny na głównym branchu, więc nie ma odpowiedniego bazowego commita, od którego można by zacząć rebase. Możesz rozpocząć interaktywny rebase z konkretnego commita, wybierając commit i naciskając `{{.editKey}}`.", + "QuickStartInteractiveRebase": "Rozpocznij interaktywne przebazowanie", + "QuickStartInteractiveRebaseTooltip": "Rozpocznij interaktywne przebazowanie dla commitów na twojej gałęzi. To będzie zawierać wszystkie commity od HEAD do pierwszego commita scalenia lub commita głównej gałęzi.\nJeśli zamiast tego chcesz rozpocząć interaktywne przebazowanie od wybranego commita, naciśnij `{{.editKey}}`.", + "CannotQuickStartInteractiveRebase": "Nie można rozpocząć interaktywnego przebazowania: commit HEAD jest commit'em scalenia lub jest obecny na głównej gałęzi, więc nie ma odpowiedniego bazowego commita, od którego można by zacząć przebazowanie. Możesz rozpocząć interaktywne przebazowanie z konkretnego commita, wybierając commit i naciskając `{{.editKey}}`.", "ToggleRangeSelect": "Przełącz zaznaczenie zakresu", "RangeSelectUp": "Zaznacz zakres w górę", "RangeSelectDown": "Zaznacz zakres w dół", @@ -666,12 +712,13 @@ "SelectedItemDoesNotHaveFiles": "Wybrany element nie ma plików do wyświetlenia", "Actions": { "CheckoutCommit": "Przełącz commit", + "CheckoutBranchAtCommit": "Przełącz na gałąź '%s'", "CheckoutTag": "Przełącz tag", "CheckoutBranch": "Przełącz gałąź", "ForceCheckoutBranch": "Wymuś przełączenie gałęzi", "DeleteLocalBranch": "Usuń lokalną gałąź", "Merge": "Scal", - "RebaseBranch": "Rebazuj gałąź", + "RebaseBranch": "Przebazuj gałąź", "RenameBranch": "Zmień nazwę gałęzi", "CreateBranch": "Utwórz gałąź", "FastForwardBranch": "Szybkie przewijanie gałęzi", @@ -685,6 +732,7 @@ "AmendCommit": "Popraw commit", "ResetCommitAuthor": "Zresetuj autora commita", "SetCommitAuthor": "Ustaw autora commita", + "AddCommitCoAuthor": "Dodaj współautora commita", "RevertCommit": "Cofnij commit", "CreateFixupCommit": "Utwórz commit poprawkowy", "SquashAllAboveFixupCommits": "Scal wszystkie powyższe commity poprawkowe", @@ -706,6 +754,8 @@ "UnstageFile": "Usuń plik z indeksu", "UnstageAllFiles": "Usuń wszystkie pliki z indeksu", "StageAllFiles": "Dodaj wszystkie pliki do indeksu", + "ResolveConflictByKeepingFile": "Rozwiąż poprzez zachowanie pliku", + "ResolveConflictByDeletingFile": "Rozwiąż poprzez usunięcie pliku", "IgnoreExcludeFile": "Ignoruj lub wyklucz plik", "IgnoreFileErr": "Nie można zignorować .gitignore", "ExcludeFile": "Wyklucz plik", @@ -785,14 +835,14 @@ "Bisecting": "Bisectowanie" }, "Log": { - "EditRebase": "Rozpoczynanie interaktywnego rebazowania od '{{.ref}}'", + "EditRebase": "Rozpoczynanie interaktywnego przebazowania od '{{.ref}}'", "HandleUndo": "Cofanie ostatniego rozwiązania konfliktu", "RemoveFile": "Usuwanie ścieżki '{{.path}}'", "CopyToClipboard": "Kopiowanie '{{.str}}' do schowka", "Remove": "Usuwanie '{{.filename}}'", "CreateFileWithContent": "Tworzenie pliku '{{.path}}'", "AppendingLineToFile": "Dodawanie '{{.line}}' do pliku '{{.filename}}'", - "EditRebaseFromBaseCommit": "Rozpoczynanie interaktywnego rebazowania od '{{.baseCommit}}' na '{{.targetBranchName}}" + "EditRebaseFromBaseCommit": "Rozpoczynanie interaktywnego przebazowania od '{{.baseCommit}}' na '{{.targetBranchName}}'" }, "BreakingChangesTitle": "Zmiany przełomowe", "BreakingChangesMessage": "Aktualizujesz do nowej wersji lazygit, która zawiera zmiany przełomowe. Proszę przejrzeć poniższe notatki i zaktualizować swoją konfigurację, jeśli jest to konieczne.\nAby uzyskać więcej informacji, zobacz pełne notatki do wydania na .", diff --git a/pkg/i18n/translations/pt.json b/pkg/i18n/translations/pt.json index b5c8a7b46..b292685f1 100644 --- a/pkg/i18n/translations/pt.json +++ b/pkg/i18n/translations/pt.json @@ -27,7 +27,7 @@ "SureToAmend": "Está certo de querer alterar o último commit? Posteriormente, pode alterar a mensagem do commit do painel de commits", "NoCommitToAmend": "Não há commit para alterar.", "CommitChangesWithEditor": "Enviar alteração usando um editor Git", - "FindBaseCommitForFixup": "Encontrar commit da base para consertar", + "FindBaseCommitForFixup": "Encontrar commit da base para corrigir", "FindBaseCommitForFixupTooltip": "Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado\nVeja a documentação:\n", "NoBaseCommitsFound": "Nenhum commit base encontrado", "MultipleBaseCommitsFoundStaged": "Múltiplos commits da base encontrados.", @@ -126,6 +126,8 @@ "MoveCommitsToNewBranch": "Mover commits para uma nova branch", "MoveCommitsToNewBranchFromBaseItem": "Nova branch da branch base (%s)", "MoveCommitsToNewBranchStackedItem": "Novo branch empilhado na branch atual (%s)", + "CannotMoveCommitsFromDetachedHead": "Não é possível mover commits de uma head desanexada", + "CannotMoveCommitsNoUnpushedCommits": "Não há commits não enviados para mover para uma nova branch", "NoBranchesThisRepo": "Nenhuma branch para esse repositório", "CommitWithoutMessageErr": "Você não pode dar commit sem uma mensagem de commit", "Close": "Fechar", @@ -135,8 +137,14 @@ "SquashTooltip": "Squash o commit selecionado no commit abaixo dele. A mensagem do commit selecionado será anexada ao commit abaixo dele.", "CannotSquashOrFixupFirstCommit": "Não há commit abaixo para squash em", "CannotSquashOrFixupMergeCommit": "Não é possível squash ou corrigir um commit de merge", - "Fixup": "Fixup", + "Fixup": "Corrigir", "FixupTooltip": "Faça o commit selecionado no commit abaixo dele. Semelhante para o squash, mas a mensagem do commit selecionado será descartada.", + "FixupKeepMessage": "Corrigir e usar a mensagem deste commit", + "FixupKeepMessageTooltip": "Combine o commit selecionado no commit abaixo, descartando a mensagem do commit abaixo.", + "SetFixupMessage": "Configurar mensagem de correção", + "SetFixupMessageTooltip": "Defina a opção de mensagem para o commit de correção. A opção -C significa usar a mensagem deste commit em vez da mensagem do commit alvo.", + "FixupDiscardMessage": "Corrigir e descartar a mensagem deste commit", + "FixupDiscardMessageTooltip": "Combine o commit selecionado no commit abaixo, descartando a mensagem desse commit.", "SureSquashThisCommit": "Tem certeza que deseja esmagar o(s) commit(s) selecionado(s) no commit abaixo?", "Squash": "Squash", "PickCommitTooltip": "Marque o commit selecionado para ser escolhido (quando meados da base). Isso significa que o commit será mantido ao continuar o rebase.", @@ -188,6 +196,7 @@ "StashApplyTooltip": "Aplique o stash no seu diretório de trabalho.", "NoStashEntries": "Sem itens no stash", "StashDrop": "Remover stash", + "SureDropStashEntry": "Tem certeza que deseja remover a(s) entradas de stash selecionada(s)?", "StashPop": "Remover Stash ", "SurePopStashEntry": "Tem certeza de que deseja exibir esta entrada de stash?", "StashApply": "Aplica o Stash", @@ -195,9 +204,8 @@ "NoTrackedStagedFilesStash": "Você não tem arquivos rastreados/staging para armazenar", "NoFilesToStash": "Você não tem arquivos para armazenar", "StashChanges": "Alterações preparadas", - "RenameStash": "Renomear o stasj", + "RenameStash": "Renomear o stash", "RenameStashPrompt": "Renomear o estoque: {{.stashName}}", - "OpenConfig": "Abrir o ficheiro de config", "EditConfig": "Editar arquivo de configuração", "ForcePush": "Forçar push", "ForcePushPrompt": "Seu branch divergiu do branch remoto. Pressione {{.cancelKey}} para cancelar, ou {{.confirmKey}} para forçar a push.", @@ -229,8 +237,12 @@ "IgnoreFile": "Adicionar ao .gitignore", "ExcludeFile": "Adicionar ao .git/info/exclui", "RefreshFiles": "Atualizar arquivos", + "FocusMainView": "Focar visualização principal", "Merge": "Mesclar", "MergeBranchTooltip": "Ver opções para mesclar o item selecionado no branch atual (mesclar regularmente, mesclar squash)", + "RegularMergeFastForward": "Mesclagem normal (encaminhamento-rápido)", + "RegularMergeNonFastForward": "Mesclagem normal (com commit de mesclagem)", + "RegularMergeNonFastForwardTooltip": "Mesclar '{{.selectedBranch}}' em '{{.checkedOutBranch}}', criando um commit de mesclagem.", "ConfirmQuit": "Tem a certeza de que pretende sair?", "SwitchRepo": "Mudar para um repositório recente", "AllBranchesLogGraph": "Mostrar/ciclo todos os logs de filiais", @@ -249,7 +261,10 @@ "StageSelectionTooltip": "Ativar/desativar seleção em staged/unstaged", "DiscardSelection": "Descartar", "DiscardSelectionTooltip": "Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança.", + "SelectLineByLine": "Selecionar linha por linha", + "ToggleSelectHunkTooltip": "Ativa/desativa modo linha por linha vs. modo de seleção por partes.", "ToggleSelectionForPatch": "Alternar linhas no caminho", + "RemoveSelectionFromPatch": "Remover linhas do commit", "EditHunk": "Editar hunk", "EditHunkTooltip": "Editar o local selecionado no editor externo.", "ToggleStagingView": "Mudar de visão", @@ -262,19 +277,24 @@ "ViewConflictsMenuItem": "Visualizar conflitos", "AbortMenuItem": "Abortar %s", "PickHunk": "Escolha o local", - "PickAllHunks": "Pegar todos os pedaços", "ViewMergeRebaseOptions": "Ver opções de mesclar/rebase", "ViewMergeRebaseOptionsTooltip": "Ver opções para abortar/continuar/pular o merge/rebase atual.", "ViewMergeOptions": "Visualizar opções de merge", "ViewRebaseOptions": "Ver opções de rebase", + "ViewCherryPickOptions": "Ver opções de cherry-pick", + "ViewRevertOptions": "Ver opções de reversão", "NotMergingOrRebasing": "Você não está atualmente nem rebasing nem mesclando", "AlreadyRebasing": "Não é possível executar esta ação durante uma rebase", + "MustSelectFixupCommit": "Esta ação só funciona em commits de correção", "RecentRepos": "Repositórios recentes", "MergeOptionsTitle": "Opções de mesclagem", "RebaseOptionsTitle": "Opções de rebase", + "CherryPickOptionsTitle": "Opções de cherry-pick", + "RevertOptionsTitle": "Opções de reversão", "CommitSummaryTitle": "Sumário do commit", "CommitDescriptionTitle": "Descrição de Commit", "CommitDescriptionSubTitle": "Pressione {{.togglePanelKeyBinding}} para alternar o foco, {{.commitMenuKeybinding}} para abrir o menu", + "CommitDescriptionFooter": "Pressione {{.confirmInEditorKeybinding}} para confirmar", "LocalBranchesTitle": "Branches locais", "SearchTitle": "Procurar", "TagsTitle": "Etiquetas", @@ -326,6 +346,8 @@ "ScrollUp": "Rolar para cima", "ScrollUpMainWindow": "Rolar janela principal para cima", "ScrollDownMainWindow": "Rolar a janela principal para baixo", + "SuspendApp": "Suspender a aplicação", + "CannotSuspendApp": "Suspender o aplicativo não é possível no Windows", "AmendCommitTitle": "Corrigir commit", "AmendCommitPrompt": "Tem certeza que deseja corrigir esse commit com seus arquivos encapsulados?", "AmendCommitWithConflictsMenuPrompt": "AVISO: está prestes a reemendar o seu último commit finalizado com conflitos resolvidos. Isso é muito improvável ser o que quer nesse ponto. Mais improvável você simplesmente querer continuar o rebase ao invés disso", @@ -347,6 +369,7 @@ "MergingStatus": "Mesclando", "LowercaseRebasingStatus": "recriando", "LowercaseMergingStatus": "mesclando", + "LowercaseRevertingStatus": "revertendo", "AmendingStatus": "Modificação", "CherryPickingStatus": "Cherry-picking", "UndoingStatus": "Desfazendo", @@ -363,11 +386,13 @@ "ViewItemFiles": "Ver arquivos", "CommitFilesTitle": "Commit arquivos", "CheckoutCommitFileTooltip": "Arquivo de check-out. Isso substitui o arquivo em sua árvore de trabalho com a versão do commit selecionado.", + "CannotCheckoutWithModifiedFilesErr": "Você tem modificações locais no(s) arquivo(s) que você está tentando verificar. Você precisa fazer stash ou descartá-las primeiro.", "CanOnlyDiscardFromLocalCommits": "As alterações só podem ser descartadas de commits locais", + "CannotDiscardFromMultipleCommits": "As mudanças não podem ser descartadas de uma seleção múltipla de commits", "Remove": "Remover", "DiscardOldFileChangeTooltip": "Descartar as alterações desse commit para este arquivo. Isso executa uma rebase interativa em segundo plano, então você pode ter um conflito de merge se um commit posterior também alterar este arquivo.", "DiscardFileChangesTitle": "Descartar alterações de arquivo", - "BareRepo": "Você tentou abrir Lazygit em um repositório puro, mas Lazygit ainda não suporta repositórios vazios. Abrir os repositórios mais recentes? (y/n) ", + "CreateRepo": "Não está em um repositório git. Criar um novo repositório git? (y/N): ", "InitialBranch": "Nome da branch? (deixe vazio para o padrão do git): ", "NoRecentRepositories": "É necessário abrir lazygit em um repositório git. Nenhum repositório recente válido. Saindo do sistema.", "IncorrectNotARepository": "O valor de 'notARepository' está incorreto. Deve ser um dos 'prompt', 'create', 'sk', ou 'quit'.", @@ -395,7 +420,7 @@ "CreateFixupCommitTooltip": "Crie o commit 'correção!' para o commit selecionado. Mais tarde, você pode pressionar `{{.squashAbove}}` neste mesmo commit para aplicar todas os commits de correção acima.", "CreateAmendCommit": "Criar \"alterar!\" commit", "FixupMenu_Fixup": "corrigir! commit", - "FixupMenu_FixupTooltip": "Permite que você arrume outro commit e mantenha a mensagem do commit original.", + "FixupMenu_FixupTooltip": "Permite que você corrija outro commit e mantenha a mensagem do commit original.", "FixupMenu_AmendWithChanges": "alterar! commit com mudanças", "FixupMenu_AmendWithChangesTooltip": "Permite que você corrija outro commit e também altere sua mensagem de commit.", "FixupMenu_AmendWithoutChanges": "alterar! commit sem alterações (pura reformulação)", @@ -420,8 +445,8 @@ "ViewStashOptionsTooltip": "Ver opções de stash (por exemplo, trash all, stash staged, stash unsttued).", "Stash": "Stash", "StashTooltip": "Stash todas as alterações. Para outras variações de armazenamento, use a fixação de teclas de armazenamento.", - "StashAllChanges": "Alterações preparadas", - "StashStagedChanges": "Alterações não preparadas", + "StashAllChanges": "Todas as alterações", + "StashStagedChanges": "Alterações preparadas", "StashAllChangesKeepIndex": "Guardar todas as alterações e manter índice", "StashUnstagedChanges": "Stash todas as mudanças não preparadas", "StashIncludeUntrackedChanges": "Stash todas as alterações, incluindo arquivos não rastreados", @@ -475,11 +500,195 @@ "ViewUpstreamRebaseOptions": "Rebase ramo check-out na {{.upstream}}", "ViewUpstreamRebaseOptionsTooltip": "Ver opções para rectificar o branch check-out no {{upstream}}. Nota: isso não irá rebasear o branch selecionado no plano a montante, ele irá rebasear o branch de check-out no fluxo a montante.", "UpstreamGenericName": "upstream da branch selecionada", + "TagCommit": "Etiquetar commit", + "TagNameTitle": "Nome da etiqueta", + "TagMessageTitle": "Descrição da Etiqueta", + "LightweightTag": "Etiqueta leve", + "AnnotatedTag": "Etiqueta anotada", + "DeleteTagTitle": "Remover etiqueta '{{.tagName}}'?", + "DeleteLocalTag": "Excluir etiqueta local", + "DeleteRemoteTag": "Excluir etiqueta remota", + "DeleteLocalAndRemoteTag": "Excluir etiqueta local e remota", + "DeleteLocalAndRemoteTagPrompt": "Tem certeza que deseja excluir '{{.tagName}}' da sua máquina e do '{{.upstream}}'?", + "RemoteTagDeletedMessage": "Etiqueta remota excluída", + "PushTag": "Empurrar etiqueta", + "NewTag": "Nova etiqueta", + "NewTagTooltip": "Crie uma nova etiqueta a partir do commit atual. Você será solicitado a digitar um nome e uma descrição opcional.", "CreatingTag": "Criando etiqueta", "ForceTag": "Forçar Etiqueta", "GitFlowOptions": "Exibir opções do git-flow", - "Actions": {}, - "Bisect": {}, + "NewBranchNamePrompt": "Digite o novo nome da branch", + "IgnoreTracked": "Ignorar o arquivo rastreado", + "ExcludeTracked": "Excluir arquivo rastreado", + "IgnoreTrackedPrompt": "Tem certeza de que deseja ignorar um arquivo rastreado?", + "ExcludeTrackedPrompt": "Tem certeza de que deseja excluir um arquivo rastreado?", + "NextScreenMode": "Modo de tela seguinte (normal/metade/tela cheia)", + "PrevScreenMode": "Modo de tela anterior", + "StartSearch": "Pesquisar na visualização atual por texto", + "StartFilter": "Filtrar a visualização atual por texto", + "Keybindings": "Atalhos do teclado", + "KeybindingsMenuSectionLocal": "Local", + "KeybindingsMenuSectionGlobal": "Global", + "KeybindingsMenuSectionNavigation": "Navegação", + "RenameBranch": "Renomear branch", + "OpenKeybindingsMenu": "Abrir o menu de atalhos do teclado", + "NextTab": "Próxima aba", + "PrevTab": "Aba anterior", + "ConfirmationTitle": "Painel de confirmação", + "PrevPage": "Aba anterior", + "NextPage": "Próxima aba", + "GotoTop": "Voltar ao topo", + "GotoBottom": "Ir para o final", + "FilteringBy": "Filtrando por", + "OpenFilteringMenu": "Ver opções de filtro", + "FilterBy": "Filtrar por", + "ExitFilterMode": "Parar filtragem", + "FilterPathOption": "Insira o caminho para filtrar", + "FilterAuthorOption": "Insira o autor para filtrar", + "EnterFileName": "Digite o caminho:", + "EnterAuthor": "Insira o autor:", + "FilteringMenuTitle": "Filtrando", + "MustExitFilterModeTitle": "Comando não disponível", + "CommitHash": "Hash do Commit", + "CommitURL": "URL do commit", + "PasteCommitMessageFromClipboard": "Colar mensagem de commit da área de transferência", + "SurePasteCommitMessage": "Colar irá sobrescrever a mensagem de commit atual. Continuar?", + "CommitMessage": "Mensagem de commit (assunto e corpo)", + "CommitMessageBody": "Corpo da mensagem de commit", + "CommitSubject": "Assunto do commit", + "CommitAuthor": "Autor do Commit", + "CommitTags": "Etiquetas do commit", + "CopyBranchNameToClipboard": "Copiar nome da branch para área de transferência", + "CopyTagToClipboard": "Copiar etiqueta para área de transferência", + "CopyPathToClipboard": "Copiar caminho para área de transferência", + "CopySelectedTextToClipboard": "Copiar texto selecionado para área de transferência", + "NoFilesStagedTitle": "Nenhum arquivo preparado", + "NoFilesStagedPrompt": "Você não preparou nenhum arquivo. Deseja fazer commit de todos os arquivos?", + "BranchNotFoundTitle": "Branch não encontrada", + "BranchUnknown": "Branch desconhecida", + "DiscardChangeTitle": "Descartar alteração", + "ViewCommits": "Ver commits", + "MinGitVersionError": "A versão do Git deve ser pelo menos %s. Por favor, atualize sua versão do git.", + "CopySubmoduleNameToClipboard": "Copiar o nome do submódulo para área de transferência", + "RemoveSubmodule": "Remover sub-módulo", + "RemoveSubmoduleTooltip": "Remova o submódulo selecionado e o diretório correspondente.", + "RemoveSubmodulePrompt": "Você têm certeza que deseja remover o submódulo '%s' e o diretório correspondente? Isso é irreversível.", + "ResettingSubmoduleStatus": "Redefinindo submódulo", + "NewSubmoduleName": "Nome do novo submódulo:", + "NewSubmoduleUrl": "URL do novo submódulo:", + "NewSubmodulePath": "Caminho do novo submódulo:", + "NewSubmodule": "Novo submódulo", + "AddingSubmoduleStatus": "Adicionando submódulo", + "UpdateSubmoduleUrl": "Atualizar URL do submódulo '%s'", + "UpdatingSubmoduleUrlStatus": "Atualizando URL", + "EditSubmoduleUrl": "Atualizar URL do submódulo", + "InitializingSubmoduleStatus": "Inicializando submódulo", + "Update": "Atualizar", + "Initialize": "Inicializar", + "SubmoduleUpdateTooltip": "Atualizar submódulo selecionado.", + "UpdatingSubmoduleStatus": "Atualizando submódulo", + "SubmodulesTitle": "Submódulos", + "SuggestionsCheatsheetTitle": "Sugestões", + "SuggestionsTitle": "Sugestões (pressione %s para focar)", + "SuggestionsSubtitle": "(pressione %s para excluir, %s para editar)", + "PullRequestURLCopiedToClipboard": "URL da solicitação de pull copiada para a área de transferência", + "CommitURLCopiedToClipboard": "URL do commit copiada para área de transferência", + "CommitAuthorCopiedToClipboard": "Autor do commit copiado para a área de transferência", + "CommitHasNoTags": "O commit não tem etiquetas", + "CommitHasNoMessageBody": "O commit não tem nenhum corpo da mensagem", + "MessageCopiedToClipboard": "Mensagem copiada para a área de transferência", + "CopiedToClipboard": "copiado para a área de transferência", + "ErrRepositoryMovedOrDeleted": "Não foi possível encontrar o repositório. Ele pode ter sido movido ou removido ¯\\_(ツ)_/¯", + "ErrWorktreeMovedOrRemoved": "Não foi possível encontrar a árvore de trabalho. Ela pode ter sido movida ou removida. ¯\\_(ツ)_/¯", + "RandomTip": "Dica aleatória", + "DefaultBranch": "Branch padrão", + "SelectBranch": "Selecionar branch", + "CreatePullRequest": "Criar solicitação de pull", + "SelectConfigFile": "Selecionar o arquivo de configuração", + "NoConfigFileFoundErr": "Nenhum arquivo de configuração encontrado", + "LoadingFileSuggestions": "Carregando sugestões de arquivo", + "LoadingCommits": "Carregando commits", + "GitOutput": "Saída do Git:", + "AbortTitle": "Interromper %s", + "AbortPrompt": "Tem certeza que deseja interromper o %s atual?", + "SortAlphabetical": "Alfabética", + "SortByDate": "Data", + "SortByRecency": "Mais recentes", + "SortCommits": "Ordenação dos commits", + "OpenCommitInBrowser": "Abrir commit no navegador", + "ViewBisectOptions": "Ver opções de bissecção", + "ConfirmRevertCommit": "Tem certeza que deseja reverter {{.selectedCommit}}?", + "ConfirmRevertCommitRange": "Tem certeza que deseja reverter os commits selecionados?", + "SwitchToWorktree": "Mudar para árvore de trabalho", + "SwitchToWorktreeTooltip": "Mudar para a árvore de trabalho selecionada.", + "RemoveWorktree": "Remover árvore de trabalho", + "RemoveWorktreeTitle": "Remover árvore de trabalho", + "WorktreesTitle": "Árvores de trabalho", + "WorktreeTitle": "Árvore de trabalho", + "RemovingWorktree": "Excluindo árvore de trabalho", + "AddingWorktree": "Adicionando árvore de trabalho", + "CantDeleteCurrentWorktree": "Você não pode remover a árvore de trabalho atual!", + "AlreadyInWorktree": "Você já está na árvore de trabalho selecionada", + "CantDeleteMainWorktree": "Você não pode remover a árvore de trabalho principal!", + "NoWorktreesThisRepo": "Sem árvores de trabalho", + "MissingWorktree": "(não encontrada)", + "MainWorktree": "(árvore de trabalho principal)", + "NewWorktree": "Nova árvore de trabalho", + "NewWorktreePath": "Caminho da nova árvore de trabalho", + "LcWorktree": "árvore de trabalho", + "Name": "Nome", + "Path": "Caminho", + "NoCopiedCommits": "Nenhum commit copiado", + "DisabledMenuItemPrefix": "Desativado: ", + "NoItemSelected": "Nenhum item selecionado", + "SelectedItemIsNotABranch": "Item selecionado não é uma branch", + "Actions": { + "FixupCommit": "Commit de correção", + "FixupCommitKeepMessage": "Commit de correção (manter mensagem)", + "RevertCommit": "Reverter commit", + "CreateFixupCommit": "Criar commit de correção", + "SquashAllAboveFixupCommits": "Combinar todos os commits de correção acima", + "CopyCommitMessageToClipboard": "Colar mensagem de commit para área de transferência", + "CopyCommitMessageBodyToClipboard": "Copiar corpo da mensagem de commit para área de transferência", + "CopyCommitSubjectToClipboard": "Copiar assunto do commit para área de transferência", + "CopyCommitHashToClipboard": "Copiar hash completo do commit para área de transferência", + "CopyCommitURLToClipboard": "Copiar URL do commit para área de transferência", + "StageFile": "Preparar arquivo", + "StageAllFiles": "Preparar todos os arquivos", + "IgnoreFileErr": "Não é possível ignorar .gitignore", + "Push": "Empurre (Push)", + "Pull": "Puxar (Pull)", + "OpenFile": "Abrir arquivo", + "CopySelectedTextToClipboard": "Copiar texto selecionado para área de transferência", + "RemoveSubmodule": "Remover submódulo", + "ResetSubmodule": "Redefinir submódulo", + "AddSubmodule": "Adicionar submódulo", + "UpdateSubmoduleUrl": "Atualizar URL do submódulo", + "InitialiseSubmodule": "Inicializar submódulo", + "UpdateSubmodule": "Atualizar submódulo", + "StartBisect": "Iniciar bissecção", + "ResetBisect": "Reiniciar bissecção", + "BisectSkip": "Pular bissecção", + "BisectMark": "Marcar bissecção", + "AddWorktree": "Adicionar árvore de trabalho" + }, + "Bisect": { + "MarkStart": "Marcar %s como %s (inicia bissecção)", + "ResetTitle": "Reiniciar 'git bisect'", + "ResetPrompt": "Tem certeza que deseja reiniciar 'git bisect'?", + "ResetOption": "Reiniciar bissecção", + "ChooseTerms": "Escolher termos da bissecção", + "OldTermPrompt": "Termo para commit antigo/bom:", + "NewTermPrompt": "Termo para commit novo/ruim:", + "BisectMenuTitle": "Bissecção", + "Mark": "Marcar commit atual (%s) como %s", + "SkipCurrent": "Pular commit atual (%s)", + "SkipSelected": "Pular commit selecionado (%s)", + "CompleteTitle": "Bissecção completa", + "CompletePrompt": "Bissecção completa! O seguinte commit introduziu a mudança:\n\n%s\n\nDeseja reiniciar 'git bisect' agora?", + "CompletePromptIndeterminate": "Bissecção completa! Alguns commits foram ignorados, então qualquer um dos commits abaixo pode ter introduzido a mudança:\n\n%s \n\nDeseja reiniciar 'git bisect' agora?", + "Bisecting": "Realizando bissecção" + }, "Log": {}, "BreakingChangesByVersion": {} } diff --git a/pkg/i18n/translations/ru.json b/pkg/i18n/translations/ru.json index 996840ebf..c3a025015 100644 --- a/pkg/i18n/translations/ru.json +++ b/pkg/i18n/translations/ru.json @@ -37,9 +37,13 @@ "Push": "Отправить изменения", "Pull": "Получить и слить изменения", "FileFilter": "Фильтровать файлы (проиндексированные/непроиндексированные)", + "CopyFileName": "Имя файла", "FilterStagedFiles": "Показывать только проиндексированные файлы", "FilterUnstagedFiles": "Показывать только непроиндексированные файлы", "MergeConflictsTitle": "Конфликты Слияния", + "MergeConflictCurrentDiff": "Текущие изменения:", + "MergeConflictKeepFile": "Оставить файл", + "MergeConflictDeleteFile": "Удалить файл", "Checkout": "Переключить", "NoChangedFiles": "Нет изменённых файлов", "SoftReset": "Мягкий сброс", @@ -102,7 +106,6 @@ "StashChanges": "Припрятать изменения", "RenameStash": "Переименовать хранилище", "RenameStashPrompt": "Переименовать хранилище: {{.stashName}}", - "OpenConfig": "Открыть файл конфигурации", "EditConfig": "Редактировать файл конфигурации", "ForcePush": "Принудительная отправка изменении", "ForcePushPrompt": "Ветка отклонилась от удалённой ветки. Нажмите «esc», чтобы отменить, или «enter», чтобы начать принудительную отправку изменении.", @@ -148,7 +151,6 @@ "ViewConflictsMenuItem": "Просмотр конфликтов", "AbortMenuItem": "Прервать %s", "PickHunk": "Выбрать эту часть", - "PickAllHunks": "Выбрать все части", "ViewMergeRebaseOptions": "Просмотреть параметры слияния/перебазирования", "NotMergingOrRebasing": "В данный момент вы не выполняете ни перебазирования, ни слияние", "AlreadyRebasing": "Невозможно выполнить это действие во время перебазирования", @@ -157,7 +159,7 @@ "RebaseOptionsTitle": "Параметры перебазирования", "CommitSummaryTitle": "Сводка коммита", "CommitDescriptionTitle": "Описание коммита", - "CommitDescriptionSubTitle": "Нажмите вкладку, чтобы переключить фокус", + "CommitDescriptionSubTitle": "Нажмите {{.togglePanelKeyBinding}}, чтобы переключить фокус, {{.commitMenuKeybinding}} для открытия меню", "LocalBranchesTitle": "Локальные Ветки", "SearchTitle": "Поиск", "TagsTitle": "Теги", @@ -226,7 +228,6 @@ "CanOnlyDiscardFromLocalCommits": "Изменения можно отменить только из локальных коммитов.", "DiscardOldFileChangeTooltip": "Отменить изменения коммита в этом файле", "DiscardFileChangesTitle": "Отменить изменения файла", - "BareRepo": "Вы пытались открыть Lazygit в пустом репозитории, но Lazygit ещё не поддерживает пустые репозитории. Открыть последний репозиторий? (y/n)", "InitialBranch": "Название ветки? (оставьте пустым для git по умолчанию):", "NoRecentRepositories": "Необходимо открыть lazygit в git репозитории. Нет валидных последних репозиториев. Выход.", "IncorrectNotARepository": "Неверное значение 'notARepository'. Это должно быть одним из 'prompt', 'create', 'skip', или 'quit'.", @@ -305,7 +306,6 @@ "PrevScreenMode": "Предыдущий режим экрана", "StartSearch": "Найти", "Keybindings": "Связки клавиш", - "KeybindingsLegend": "Связки клавиш", "RenameBranch": "Переименовать ветку", "NewGitFlowBranchPrompt": "Новое {{.branchType}} название:", "RenameBranchWarning": "Эта ветвь отслеживает удалённый репозитории. Это действие переименует только имя локальной ветки, а не имя удалённой ветки. Продолжать?", diff --git a/pkg/i18n/translations/zh-CN.json b/pkg/i18n/translations/zh-CN.json index 3450b43fc..fd522d669 100644 --- a/pkg/i18n/translations/zh-CN.json +++ b/pkg/i18n/translations/zh-CN.json @@ -89,6 +89,8 @@ "MergeConflictPressEnterToResolve": "按%s键解决。", "MergeConflictKeepFile": "保留文件", "MergeConflictDeleteFile": "删除文件", + "MergeConflictTakeCurrentCommit": "接受当前提交", + "MergeConflictTakeIncomingCommit": "接受传入提交", "Checkout": "检出", "CheckoutTooltip": "检出选中的项目", "CantCheckoutBranchWhilePulling": "当前分支在拉取远端时，无法检出到其他分支。", @@ -152,6 +154,12 @@ "CannotSquashOrFixupMergeCommit": "无法对合并提交进行压缩或修正", "Fixup": "修正 （fixup）", "FixupTooltip": "将选定的提交合并到其下面的提交中。与压缩类似，但所选提交的消息将被丢弃。", + "FixupKeepMessage": "修复并使用此提交信息", + "FixupKeepMessageTooltip": "将所选提交压缩到下方的提交中，使用此提交的信息，并丢弃下方提交的信息。", + "SetFixupMessage": "设置修复提交信息", + "SetFixupMessageTooltip": "设置修复提交的信息选项。-C 选项表示使用此提交的信息，而非目标提交的信息。", + "FixupDiscardMessage": "修复并丢弃此提交的信息", + "FixupDiscardMessageTooltip": "将所选提交压缩到下方的提交中，丢弃此提交的信息。", "SureSquashThisCommit": "您确定要将这个提交压缩到下面的提交中吗？", "Squash": "压缩(Squash)", "PickCommitTooltip": "标记选中的提交为 picked（变基过程中）。这意味该提交将在后续的变基中保留。", @@ -213,7 +221,6 @@ "StashChanges": "贮藏变更", "RenameStash": "重命名贮藏", "RenameStashPrompt": "重命名贮藏: {{.stashName}}", - "OpenConfig": "打开配置文件", "EditConfig": "编辑配置文件", "ForcePush": "强制推送", "ForcePushPrompt": "您的分支已与远程分支不同。按‘esc’取消，或‘enter’强制推送.", @@ -234,7 +241,7 @@ "UpdateFailedErr": "更新失败: {{.errMessage}}", "ConfirmQuitDuringUpdateTitle": "当前正在更新中...", "ConfirmQuitDuringUpdate": "当前正在更新中，您确定要退出吗？", - "IntroPopupMessage": "\n感谢使用 lazygit！您真是太棒了。有三件事想与您分享：\n\n 1) 如果您想了解 lazygit 的功能，请观看此视频：\n https://youtu.be/CPLdltN7wgE\n\n 2) 请务必阅读最新的发布说明：\n https://github.com/jesseduffield/lazygit/releases\n\n 3) 如果您在使用 git，那您就是程序员！在您的帮助下，我们可以让\n lazygit 变得更好，所以考虑成为贡献者，加入我们的乐趣吧：\n https://github.com/jesseduffield/lazygit\n 或者仅仅给仓库点个星，分享这份喜爱！\n\n 4) 如果 lazygit 让您的生活更轻松，您可以通过点击\n 右下角的捐赠按钮来表达感谢。捐赠不会获得优先支持，\n 但我们非常感激。\n\n按 {{confirmationKey}} 键开始。\n", + "IntroPopupMessage": "\n感谢使用 lazygit！你太棒了。有三件事想与你分享：\n\n 1) 如果您想了解 lazygit 的功能，请观看这个视频：\n https://youtu.be/CPLdltN7wgE\n\n 2) 务必阅读以下链接的最新发布说明：\n https://github.com/jesseduffield/lazygit/releases\n\n 3) 如果 lazygit 让您的生活更轻松，你可以通过点击右下角的\n 捐赠按钮来表达感谢。捐赠不会获得优先支持，\n 但我们对此深表感激。\n\n按下 {{confirmationKey}} 开始。\n", "NonReloadableConfigWarningTitle": "配置已更改", "NonReloadableConfigWarning": "以下配置设置已更改，但更改不会立即生效。请退出并重新启动lazygit以使更改生效：\n\n{{configs}}", "GitconfigParseErr": "由于存在未加引号的'\\'字符，因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。", @@ -261,8 +268,11 @@ "ConfirmQuit": "您确定要退出吗？", "SwitchRepo": "切换到最近的仓库", "AllBranchesLogGraph": "显示/循环所有分支日志", + "AllBranchesLogGraphReverse": "显示/循环所有分支日志（反向）", "UnsupportedGitService": "不支持的 git 服务", "CopyPullRequestURL": "复制拉取请求 URL 到剪贴板", + "OpenPullRequestInBrowser": "在浏览器中打开拉取请求", + "NoPullRequestForBranch": "未找到此分支的拉取请求", "NoBranchOnRemote": "该分支在远程上不存在. 您需要先将其推送到远程.", "Fetch": "抓取", "FetchTooltip": "从远程获取变更", @@ -282,6 +292,8 @@ "ToggleSelectHunkTooltip": "切换逐行选择与代码块选择模式。", "HunkStagingHint": "代码块选择模式现在是暂存区的默认模式。如果您想暂存单行，请按 '%s' 切换到逐行模式。\n\n如果您希望默认使用逐行模式（像早期 lazygit 版本那样），请将\n\ngui:\n useHunkModeInStagingView: false\n\n添加到您的 lazygit 配置中。", "ToggleSelectionForPatch": "添加/移除 行到补丁", + "RemoveSelectionFromPatch": "从提交中移除行", + "RemoveSelectionFromPatchTooltip": "从本次提交中移除所选行。此操作会在后台运行交互式变基，因此如果后续提交也修改了这些行，您可能会遇到合并冲突。", "EditHunk": "编辑代码块", "EditHunkTooltip": "在外部编辑器中编辑选中的代码块", "ToggleStagingView": "切换到其他面板", @@ -294,7 +306,6 @@ "ViewConflictsMenuItem": "查看冲突", "AbortMenuItem": "中止 %s", "PickHunk": "选中区块", - "PickAllHunks": "选中所有区块", "ViewMergeRebaseOptions": "查看合并/变基选项", "ViewMergeRebaseOptionsTooltip": "查看当前合并或变基的中止、继续、跳过选项", "ViewMergeOptions": "查看合并选项", @@ -303,6 +314,8 @@ "ViewRevertOptions": "查看撤销选项", "NotMergingOrRebasing": "您目前既不进行变基也不进行合并", "AlreadyRebasing": "在变基时无法执行此操作", + "NotMidRebase": "此操作仅在交互式变基期间有效", + "MustSelectFixupCommit": "此操作仅适用于修复提交", "RecentRepos": "最近的仓库", "MergeOptionsTitle": "合并选项", "RebaseOptionsTitle": "变基选项", @@ -312,7 +325,6 @@ "CommitDescriptionTitle": "提交信息说明", "CommitDescriptionSubTitle": "按 {{.togglePanelKeyBinding}} 键切换焦点, {{.commitMenuKeybinding}} 打开菜单", "CommitDescriptionFooter": "按 {{.confirmInEditorKeybinding}} 提交", - "CommitDescriptionFooterTwoBindings": "按 {{.confirmInEditorKeybinding1}} 或 {{.confirmInEditorKeybinding2}} 提交", "CommitHooksDisabledSubTitle": "(钩子已禁用)", "LocalBranchesTitle": "本地分支", "SearchTitle": "搜索", @@ -340,12 +352,15 @@ "FwdNoLocalUpstream": "此分支的远程未在本地注册，无法快进", "FwdCommitsToPush": "此分支带有尚未推送的提交，无法快进", "PullRequestNoUpstream": "没有设置上游的分支无法执行拉取请求", + "PullRequestChecksError": "错误", "ErrorOccurred": "发生错误！请在以下位置创建 issue", "ConflictLabel": "冲突", "PendingRebaseTodosSectionHeader": "待处理变基任务", "PendingCherryPicksSectionHeader": "待处理拣选", "PendingRevertsSectionHeader": "待处理还原", "CommitsSectionHeader": "提交", + "MoveCommitsHere": "拖放到此", + "MovingCommitsHere": "在此处移动提交", "YouDied": "您死了！", "RewordNotSupported": "当前不支持交互式重新基准化时的重新措词提交", "ChangingThisActionIsNotAllowed": "不允许更改这类变基待办项目", @@ -400,9 +415,11 @@ "UndoingStatus": "正在撤销", "RedoingStatus": "正在重做", "CheckingOutStatus": "正在检出", + "CreatingBranchStatus": "创建分支", "CommittingStatus": "正在提交", "RewordingStatus": "修改提交信息", "RevertingStatus": "还原中...", + "ResettingStatus": "重置中", "CreatingFixupCommitStatus": "正在创建一个修复提交", "MovingCommitsToNewBranchStatus": "正在将提交移动到新分支", "CommitFiles": "提交文件", @@ -414,12 +431,15 @@ "CheckoutCommitFileTooltip": "检出文件", "CannotCheckoutWithModifiedFilesErr": "您已有对您试图签出的文件作出的本地修改。您需要先保存或丢弃这些文件。", "CanOnlyDiscardFromLocalCommits": "只能从本地提交中丢弃更改", + "CannotDiscardFromMultipleCommits": "无法从多选提交中丢弃更改", "Remove": "删除", "DiscardOldFileChangeTooltip": "放弃对此文件的提交变更", "DiscardFileChangesTitle": "放弃文件变更", + "DiscardFileChangesPrompt": "确定要从此提交中丢弃所选文件的更改吗？\n\n此操作将启动变基，还原这些文件更改。请注意，如果后续提交依赖于这些更改，您可能需要解决冲突。", + "DiscardFileChangesPromptResetPatch": "确定要从此提交中丢弃所选文件的更改吗？\n\n此操作将启动变基，还原这些文件更改。请注意，如果后续提交依赖于这些更改，您可能需要解决冲突。\n\n注意：这将重置活动的自定义补丁！", "DisabledForGPG": "使用GPG的用户无法使用此功能。\n\n如果您正在使用密码代理（如gpg-agent）以避免每次签名时输入密码，可以通过在lazygit配置文件中添加\n\ngit:\n overrideGpg: true\n\n来启用此功能。", "CreateRepo": "不在 git 仓库中。创建一个新的 git 仓库吗？(y/N): ", - "BareRepo": "您已经尝试在空仓库中打开Lazygit，但是Lazygit还不支持空仓库。打开最近的仓库吗？(y / n) ", + "BareRepoNotSupported": "Lazygit 不支持裸仓库。", "InitialBranch": "分支名称? (git的默认值为空): ", "NoRecentRepositories": "必须在git存储库中打开lazygit。没有有效的最近存储库。即将退出...", "IncorrectNotARepository": "'notARepository'的值不正确。它应该是“prompt”，“create”，“skip”或“quit”中的一个。", @@ -578,16 +598,17 @@ "ViewResetToUpstreamOptions": "查看上游重置选项", "NextScreenMode": "下一屏模式(正常/半屏/全屏)", "PrevScreenMode": "上一屏模式", - "CyclePagers": "切换分页器", - "CyclePagersTooltip": "从已配置的分页器列表中选择下一个分页器", - "CyclePagersDisabledReason": "未配置其他分页器", + "DefaultDiffRendererName": "(默认)", + "ExternalDiffDiffRendererName": "(外部差异)", "StartSearch": "开始搜索", "StartFilter": "通过文本过滤当前视图", + "SelectRemoteRepository": "为拉取请求选择基础仓库", + "FetchingPullRequests": "正在获取拉取请求", "Keybindings": "按键绑定", - "KeybindingsLegend": "图例：`` 意味着ctrl+b, `意味着Alt+b, `B` 意味着shift+b", "KeybindingsMenuSectionLocal": "本地", "KeybindingsMenuSectionGlobal": "全局", "KeybindingsMenuSectionNavigation": "导航", + "KeybindingsTooltip": "键绑定： ", "RenameBranch": "重命名分支", "Upstream": "上游", "BranchUpstreamOptionsTitle": "上游选项", @@ -641,6 +662,7 @@ "ShowingGitDiff": "显示输出：", "ShowingDiffForRange": "显示范围差异", "CommitDiff": "比较提交差异", + "CopyCommitHashToClipboard": "复制缩略提交哈希值到剪贴板", "CommitHash": "提交的 hash", "CommitURL": "提交URL", "PasteCommitMessageFromClipboard": "粘贴提交信息自剪贴板", @@ -664,6 +686,9 @@ "BranchUnknown": "未知的分支", "DiscardChangeTitle": "取消暂存选中的行", "DiscardChangePrompt": "您确定要删除所选的行(git reset)吗？这是不可逆的。\n要禁用此对话框，请将 'gui.skipDiscardChangeWarning' 的配置键设置为 true", + "DiscardLinesFromCommitTitle": "从提交中丢弃行", + "DiscardLinesFromCommitPrompt": "确定要从此提交中丢弃所选行吗？", + "DiscardLinesFromCommitPromptWithReset": "确定要从此提交中丢弃所选行吗？\n\n注意：这将重置活动的自定义补丁！", "CreateNewBranchFromCommit": "从提交创建新分支", "BuildingPatch": "正在构建补丁", "ViewCommits": "查看提交", @@ -726,6 +751,7 @@ "ErrStageDirWithInlineMergeConflicts": "无法 暂存/取消暂存 包含具有内联合并冲突的文件的目录。请先解决合并冲突", "ErrRepositoryMovedOrDeleted": "找不到仓库。它可能已被移动或删除 ¯\\_(ツ)_/¯", "ErrWorktreeMovedOrRemoved": "找不到工作树，它可能被删除或者移走了。 ¯\\\\_(ツ)_/¯", + "CantSwitchWhileOperationInProgress": "操作进行时无法切换仓库", "CommandLog": "命令日志", "ToggleShowCommandLog": "切换 显示/隐藏 命令日志", "FocusCommandLog": "焦点命令日志", @@ -818,7 +844,6 @@ "SearchKeybindings": "%s: 下一个匹配项, %s: 上一个匹配项, %s: 退出搜索模式", "SearchPrefix": "搜索: ", "FilterPrefix": "过滤: ", - "FilterPrefixMenu": "筛选（在筛选快捷键前添加 '@'）：", "ExitSearchMode": "%s：退出搜索模式", "ExitTextFilterMode": "%s：退出过滤模式", "Switch": "切换", @@ -835,7 +860,6 @@ "DetachingWorktree": "正在分离工作树", "WorktreesTitle": "工作区", "WorktreeTitle": "工作区", - "RemoveWorktreePrompt": "您确定要删除工作树 {{.worktreeName}}' ？", "ForceRemoveWorktreePrompt": "'{{.worktreeName}}' 包含已修改或未跟踪的文件，或子模块（或包含所有这些）。确定要移除它吗？", "RemovingWorktree": "正在删除工作树", "AddingWorktree": "添加工作区", @@ -844,15 +868,14 @@ "CantDeleteMainWorktree": "您不能移除主工作树！", "NoWorktreesThisRepo": "没有工作区", "MissingWorktree": "(缺失)", + "MainWorktree": "（主工作树）", "NewWorktree": "新建工作树", "NewWorktreePath": "新建工作树路径", - "NewWorktreeBase": "新建工作树基于ref", "RemoveWorktreeTooltip": "删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。", "NewBranchName": "新分支名称", - "NewBranchNameLeaveBlank": "新分支名称（为空则默认检出为 {{.default}}）", - "ViewWorktreeOptions": "查看工作区选项", - "CreateWorktreeFrom": "从 {{.ref}} 创建工作树", - "CreateWorktreeFromDetached": "从 {{.ref}} 创建工作树（分离）", + "NewWorktreeName": "新工作树名", + "WorktreeLocationTitle": "工作区位置", + "WorktreeLocationOther": "其他…", "LcWorktree": "工作区", "ChangingDirectoryTo": "将目录更改为 {{.path}}", "Name": "名称", @@ -903,6 +926,7 @@ "CheckoutFile": "检出文件", "SquashCommitDown": "向下压缩提交", "FixupCommit": "修正提交", + "FixupCommitKeepMessage": "修复提交（保留信息）", "RewordCommit": "改写提交", "DropCommit": "删除提交", "EditCommit": "编辑提交", @@ -937,6 +961,7 @@ "ResolveConflictByDeletingFile": "通过删除文件解决冲突", "NotEnoughContextToStage": "差异上下文大小为0时无法暂存或取消暂存更改。请使用'%s'增大上下文。", "NotEnoughContextToDiscard": "差异上下文大小为0时无法丢弃更改。请使用'%s'增大上下文。", + "NotEnoughContextToRemoveLines": "在差异上下文大小为 0 时无法从提交中移除行。请使用 '%s' 增加上下文大小。", "NotEnoughContextForCustomPatch": "在差异上下文大小为 0 时无法创建自定义补丁。请使用 '%s' 增加上下文。", "IgnoreExcludeFile": "忽略文件", "IgnoreFileErr": "无法忽略 .gitignore", @@ -1026,11 +1051,15 @@ "EditRebase": "开始从 '{{.ref}}' 进行交互式变基", "HandleUndo": "撤销最后一次的冲突解决方案", "RemoveFile": "正在删除路径 '{{.path}}'", + "RemoveEmptyDir": "正在删除空目录 '{{.path}}'", "CopyToClipboard": "正在复制 '{{.str}}' 到剪贴板", "Remove": "删除 '{{.filename}}'", "CreateFileWithContent": "正在创建文件 '{{.path}}'", "AppendingLineToFile": "将 '{{.line}}' 附加到文件 '{{.filename}}'", - "EditRebaseFromBaseCommit": "开始从'{{.baseCommit}}'进行交互式变基到'{{.targetBranchName}}‘" + "EditRebaseFromBaseCommit": "开始从'{{.baseCommit}}'进行交互式变基到'{{.targetBranchName}}‘", + "DroppingStash": "正在删除储藏 %s", + "PoppingStash": "正在弹出储藏 %s", + "DeletingBranch": "正在删除分支 '{{.branchName}}'（原为 {{.hash}}）" }, "BreakingChangesTitle": "重大变化", "BreakingChangesMessage": "您正在更新到 lazygit 的新版本，其中含有中断的更改。请阅读下面的说明，并在必要时更新您的配置。\n欲了解更多信息，请参阅 的完整版本说明。", @@ -1041,7 +1070,7 @@ "0.50.0": "- 拉取后，如果主分支落后于其上游分支，现在会自动前推。这对于自动保持主分支或 master 分支最新很有用。如果不希望这样，可以通过在配置中设置以下内容来禁用它：\n\ngit:\n autoForwardBranches: none\n\n相反，如果希望功能分支也这样做，可以将其设置为 'allBranches'。", "0.51.0": "- 自定义命令的 'subprocess'、'stream' 和 'showOutput' 字段已被替换为单个 'output' 字段。这应该是透明的，如果您在配置文件中使用了这些字段，它们应该已自动更新。但有一个显著变化：'stream' 字段过去意味着命令输出将流式传输到命令日志，并且命令将在伪终端 (pty) 中运行。我们将其转换为 'output: log'，这意味着命令输出将流式传输到命令日志，但不使用 pty，假设这是大多数人想要的。如果您确实希望在 pty 中运行命令，可以将其更改为 'output: logWithPty'。", "0.54.0": "- 本地和远程分支的默认排序顺序已更改：过去本地分支是 'recency'（基于 reflog），远程分支是 'alphabetical'。这两者都已更改为 'date'（即提交者日期）。如果您更喜欢旧的默认设置，可以通过以下配置恢复：\n\ngit:\n localBranchSortOrder: recency\n remoteBranchSortOrder: alphabetical\n\n- 暂存区和自定义补丁构建视图中的默认选择模式已更改为块模式。在大多数情况下，这是更有用的模式，因为它通常可以节省大量按键。如果想切换回旧的行模式默认设置，可以通过在配置中添加以下内容来实现：\n\ngui:\n useHunkModeInStagingView: false\n", - "0.55.0": "- 原先绑定到 ctrl-z 的 'redo' 命令，现在改为绑定到 shift-Z。这是因为 ctrl-z 现在用于挂起应用程序；在 Linux 世界中，这是该功能的常用键绑定。如果你想恢复此更改，可以在配置中添加以下内容：\n\nkeybinding:\n universal:\n suspendApp: \n\tredo: \n\n- 'git.paging.useConfig' 选项已被移除。如果你之前依赖它来配置你的分页器，现在必须使用 'git.paging.pager' 选项重新明确设置分页器。" + "0.62.0": "从提交描述编辑器提交变更的默认快捷键已从 Mac 上的 alt-enter 改为 command-enter，在 Linux 和 Windows 上改为 ctrl-enter；这些和很多多行编辑框里用的快捷键一样，比如 GitHub 评论里用的那种。很遗憾，并非所有终端都支持这些快捷键；更多说明见：https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md#terminal-compatibility。如果你想恢复这个改动，可以在配置里加上：\n\nkeybinding:\n universal:\n confirmInEditor: \n" }, "ViewMergeConflictOptions": "查看合并冲突选项", "ViewMergeConflictOptionsTooltip": "查看用于解决合并冲突的选项。", diff --git a/pkg/i18n/translations/zh-TW.json b/pkg/i18n/translations/zh-TW.json index f2a666a60..dc430fab0 100644 --- a/pkg/i18n/translations/zh-TW.json +++ b/pkg/i18n/translations/zh-TW.json @@ -13,11 +13,13 @@ "MergingTitle": "主面板（合併）", "NormalTitle": "主面板（一般）", "LogTitle": "版本記錄", + "LogXOfYTitle": "日誌(%d / %d)", "CommitSummary": "提交摘要", "CredentialsUsername": "使用者名稱", "CredentialsPassword": "密碼", "CredentialsPassphrase": "SSH 金鑰密語", "CredentialsPIN": "SSH 金鑰 PIN 碼", + "CredentialsToken": "輸入 SSH 金鑰的 Token", "PassUnameWrong": "密碼、密語或使用者名稱錯誤", "Commit": "提交變更", "CommitTooltip": "提交暫存區變更", @@ -26,15 +28,27 @@ "SureToAmend": "是否確定要修改上次提交？之後你可以從提交面板中再次更改此次提交的訊息。", "NoCommitToAmend": "沒有可以修改的提交。", "CommitChangesWithEditor": "使用 git 編輯器提交變更", + "FindBaseCommitForFixup": "尋找 fixup 的基礎提交", + "FindBaseCommitForFixupTooltip": "找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：", + "NoBaseCommitsFound": "找不到基礎提交", + "MultipleBaseCommitsFoundStaged": "找到多個基礎提交。（請嘗試一次暫存較少變更。）", + "MultipleBaseCommitsFoundUnstaged": "找到多個基礎提交。（請嘗試暫存部分變更。）", + "BaseCommitIsAlreadyOnMainBranch": "此變更的基礎提交已在 main 分支上", + "BaseCommitIsNotInCurrentView": "基礎提交不在目前檢視中", + "HunksWithOnlyAddedLinesWarning": "diff 中有僅含新增行的區段；請仔細確認它們是否應納入找到的基礎提交。要繼續嗎？", "StatusTitle": "狀態", "GlobalTitle": "全域快捷鍵", "Execute": "執行", "Stage": "切換預存", + "StageTooltip": "切換所選檔案的暫存狀態。", "ToggleStagedAll": "全部預存/取消預存", + "ToggleStagedAllTooltip": "切換工作區中所有檔案的已暫存/未暫存狀態。", "ToggleTreeView": "顯示檔案樹狀視圖", + "ToggleTreeViewTooltip": "在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。\n\n可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。", "OpenDiffTool": "開啟外部差異工具 (git difftool)", "OpenMergeTool": "開啟外部合併工具", "Refresh": "重新整理", + "RefreshTooltip": "重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。", "Push": "推送", "Pull": "拉取", "PushTooltip": "推送到遠端。如果沒有設定遠端，會開啟設定視窗。", @@ -42,18 +56,49 @@ "FileFilter": "篩選檔案 (預存/未預存)", "CopyToClipboardMenu": "複製到剪貼簿", "CopyFileName": "檔案名稱", + "CopyRelativeFilePath": "相對路徑", + "CopyAbsoluteFilePath": "絕對路徑", "CopyFileDiffTooltip": "如果有已預存的項目，此指令只考慮它們。否則，它將考慮所有未暫存的項目。", "CopySelectedDiff": "所選檔案的差異", "CopyAllFilesDiff": "所有檔案的差異", + "CopyFileContent": "所選檔案內容", + "NoContentToCopyError": "無可複製內容", "FileNameCopiedToast": "檔案名稱已複製", "FilePathCopiedToast": "檔案路徑已複製", "FileDiffCopiedToast": "已複製檔案差異", "AllFilesDiffCopiedToast": "已複製所有檔案差異", + "FileContentCopiedToast": "檔案內容已複製到剪貼簿", "FilterStagedFiles": "僅顯示預存的檔案", "FilterUnstagedFiles": "僅顯示未預存的檔案", + "FilterTrackedFiles": "僅顯示已跟蹤的檔案", + "FilterUntrackedFiles": "僅顯示未跟蹤的檔案", + "NoFilter": "無過濾", + "FilterLabelStagedFiles": "（僅暫存）", + "FilterLabelUnstagedFiles": "（僅未暫存）", + "FilterLabelTrackedFiles": "（僅跟蹤）", + "FilterLabelUntrackedFiles": "（僅未跟蹤）", + "FilterLabelConflictingFiles": "（僅衝突）", "MergeConflictsTitle": "合併衝突", + "MergeConflictDescription_DD": "衝突：目前變更和傳入變更都移動或重新命名了此檔案，但目標位置不同。雖然不知道具體位置，但這兩個目標檔案應該都會顯示為衝突（分別標記為'AU'和'UA'）。最可能的解決方法是刪除此檔案，並選擇其中一個目標位置，刪除另一個。", + "MergeConflictDescription_AU": "衝突：此檔案是目前變更中移動或重新命名的目標位置，但在傳入變更中被移動或重新命名到其他位置。另一個目標位置也應顯示為衝突（標記為'UA'），同時兩個重新命名前的原檔案也會顯示為衝突（標記為'DD'）。", + "MergeConflictDescription_UA": "衝突：此檔案是傳入變更中移動或重新命名的目標位置，但在目前變更中被移動或重新命名到其他位置。另一個目標位置也應顯示為衝突（標記為'AU'），同時兩個重新命名前的原檔案也會顯示為衝突（標記為'DD'）。", + "MergeConflictDescription_DU": "衝突：目前變更刪除了此檔案，而傳入變更修改了此檔案。\n\n最可能的解決方法是手動將傳入的修改應用到程式碼其他位置後再刪除該檔案。", + "MergeConflictDescription_UD": "衝突：目前變更修改了此檔案，而傳入變更刪除了此檔案。\n\n最可能的解決方法是手動將目前修改應用到程式碼其他位置後再刪除該檔案。", + "MergeConflictIncomingDiff": "傳入變更：", + "MergeConflictCurrentDiff": "目前變更：", + "MergeConflictPressEnterToResolve": "按%s鍵解決。", + "MergeConflictKeepFile": "保留檔案", + "MergeConflictDeleteFile": "刪除檔案", + "MergeConflictTakeCurrentCommit": "採用目前提交", + "MergeConflictTakeIncomingCommit": "採用傳入提交", + "SubmoduleMergeConflictDescription": "衝突：子模組 '{{.path}}' 在目前和傳入的變更中被設定為不同的提交。請選擇要保留的提交。", + "StageConflictsRangeDisabled": "無法暫存包含合併衝突檔案的選取範圍；請先用 {{.goIntoKey}} 逐一解決衝突。", "Checkout": "檢出", "CheckoutTooltip": "檢出選定的項目。", + "CantCheckoutBranchWhilePulling": "目前分支在拉取遠端時，無法檢出到其他分支。", + "TagCheckoutTooltip": "檢出選擇的標籤作為分離的HEAD。", + "RemoteBranchCheckoutTooltip": "基於目前選中的遠端分支檢出一個新的本地分支，或者將遠端分支作分離的HEAD。", + "CantPullOrPushSameBranchTwice": "在推送或拉取分支的過程中，您不能再次推送或拉取同一個分支", "NoChangedFiles": "沒有變更的檔案", "SoftReset": "軟重設", "AlreadyCheckedOutBranch": "你已經檢出這個分支了", @@ -62,63 +107,113 @@ "BranchName": "分支名稱", "NewBranchNameBranchOff": "新的分支名稱 (根據 '{{.branchName}}' 分支創建)", "CantDeleteCheckOutBranch": "無法刪除已檢出的分支！", + "DeleteBranchTitle": "刪除分支'{{.selectedBranchName}}'?", + "DeleteBranchesTitle": "刪除選定的分支？", + "DeleteLocalBranch": "刪除本地分支", + "DeleteLocalBranches": "刪除本地分支", "DeleteRemoteBranchPrompt": "確定要刪除遠端 {{.upstream}} 的標籤 '{{.selectedBranchName}}'？", + "DeleteRemoteBranchesPrompt": "確定要從各自遠端倉庫刪除所選分支的遠端分支嗎？", + "DeleteLocalAndRemoteBranchPrompt": "確定要同時刪除本地的'{{.localBranchName}}'分支和遠端'{{.remoteName}}'上的'{{.remoteBranchName}}'分支嗎？", + "DeleteLocalAndRemoteBranchesPrompt": "確定要從本機刪除所選分支，並從各自的遠端儲存庫刪除對應的遠端分支嗎？", + "ForceDeleteBranchTitle": "強制刪除分支", "ForceDeleteBranchMessage": "'{{.selectedBranchName}}' 分支尚未完全合併。是否刪除？", + "ForceDeleteBranchesMessage": "部分所選分支尚未完全合併。確定要刪除它們嗎？", "RebaseBranch": "將已檢出的分支變基至此分支", + "RebaseBranchTooltip": "將檢出的分支變基到所選的分支上。", "CantRebaseOntoSelf": "無法將分支變基至自己", "CantMergeBranchIntoItself": "無法將一個分支合併至自己", "ForceCheckout": "強制檢出", + "ForceCheckoutTooltip": "強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。", "CheckoutByName": "根據名稱檢出", + "CheckoutByNameTooltip": "按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。", + "CheckoutPreviousBranch": "簽出上一個分支", "RemoteBranchCheckoutTitle": "檢出 {{.branchName}}", + "RemoteBranchCheckoutPrompt": "您希望已什麼方式檢出到該分支?", "CheckoutTypeNewBranch": "新本地分支", "CheckoutTypeNewBranchTooltip": "將遠端分支檢出為追蹤它的本地分支。", "CheckoutTypeDetachedHead": "分離 HEAD", "CheckoutTypeDetachedHeadTooltip": "將遠端分支檢出為分離的 HEAD，在只想測試但不動工時很實用。您稍後仍能根據它建立一個本地分支。", "NewBranch": "新分支", + "NewBranchFromStashTooltip": "從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。", + "MoveCommitsToNewBranch": "移動提交至新分支", + "MoveCommitsToNewBranchTooltip": "建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。\n\n請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。", + "MoveCommitsToNewBranchFromMainPrompt": "這將把所有未推送的提交移動到一個新分支（基於 {{.baseBranchName}}）。然後，它會將目前分支硬重置到其上游分支。您要繼續嗎？", + "MoveCommitsToNewBranchMenuPrompt": "這將把所有未推送的提交移動到一個新分支。這個新分支可以從主分支（{{.baseBranchName}}）建立，也可以堆疊在目前分支之上。您希望選擇哪種方式？", + "MoveCommitsToNewBranchFromBaseItem": "從基礎分支建立新分支 (%s)", + "MoveCommitsToNewBranchStackedItem": "堆疊在目前分支上的新分支 (%s)", + "CannotMoveCommitsFromDetachedHead": "無法從分離頭移動提交", + "CannotMoveCommitsNoUpstream": "無法從沒有上游分支的分支中移動提交", + "CannotMoveCommitsBehindUpstream": "無法移動落後於其上游分支的分支的提交", + "CannotMoveCommitsNoUnpushedCommits": "沒有未推送的提交可以移動到新分支", "NoBranchesThisRepo": "這個版本庫中沒有分支", "CommitWithoutMessageErr": "沒有提交訊息，無法提交", "Close": "關閉", "CloseCancel": "關閉/取消", "Confirm": "確認", "Quit": "結束", + "SquashTooltip": "將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。", "CannotSquashOrFixupFirstCommit": "沒有可以壓縮的提交", + "CannotSquashOrFixupMergeCommit": "無法對合並提交進行壓縮或修正", "Fixup": "修復 (Fixup)", + "FixupTooltip": "將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。", + "FixupKeepMessage": "修復並使用此提交資訊", + "FixupKeepMessageTooltip": "將所選提交壓縮到下方的提交中，使用此提交的資訊，並丟棄下方提交的資訊。", + "SetFixupMessage": "設定修復提交資訊", + "SetFixupMessageTooltip": "設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。", + "FixupDiscardMessage": "修復並丟棄此提交的資訊", + "FixupDiscardMessageTooltip": "將所選提交壓縮到下方的提交中，丟棄此提交的資訊。", "SureSquashThisCommit": "是否要把這個提交壓縮到下面的提交中？", "Squash": "壓縮 (Squash)", "PickCommitTooltip": "挑選提交 (於變基過程中)", "Pick": "挑選", "Edit": "編輯", "Revert": "還原", + "RevertCommitTooltip": "為所選提交建立還原提交，這會反向應用所選提交的更改。", "Reword": "改寫提交", "CommitRewordTooltip": "改寫選中的提交訊息", "DropCommit": "刪除提交", + "DropCommitTooltip": "刪除選中的提交。這將透過變基從分支中刪除該提交，如果該提交修改的內容依賴於後續的提交，則需要解決合併衝突。", "MoveDownCommit": "向下移動提交", "MoveUpCommit": "向上移動提交", + "CannotMoveAnyFurther": "無法進一步移動", + "CannotMoveMergeCommit": "無法移動合併提交", "EditCommit": "編輯(開始互動變基)", "EditCommitTooltip": "編輯提交", "AmendCommitTooltip": "使用已預存的更改修正提交", "Amend": "修改", "ResetAuthor": "重設作者", + "ResetAuthorTooltip": "將提交作者重置為目前設定的使用者。這也將更新作者的時間戳", "SetAuthor": "設定作者", + "SetAuthorTooltip": "基於提示設定作者", "AddCoAuthor": "添加合作者", "AmendCommitAttribute": "設定/重設提交作者", + "AmendCommitAttributeTooltip": "設定或重置提交的作者，或新增其他作者。", "SetAuthorPromptTitle": "設定作者（格式：「姓名 <電子郵件>」）", + "AddCoAuthorPromptTitle": "新增共同作者(格式為 'Name ')", + "AddCoAuthorTooltip": "新增共同作者 使用GitHub/GitLab後設資料共同作者(Co-authored-by)。", "RewordCommitEditor": "使用編輯器改寫提交", "NoCommitsThisBranch": "這個分支沒有提交", "UpdateRefHere": "在這裡更新 '{{.ref}}' 分支", + "ExecCommandHere": "在這裡執行以下命令:", "Error": "錯誤", "Undo": "復原", "UndoReflog": "復原", "RedoReflog": "取消復原", "UndoTooltip": "將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。", "RedoTooltip": "將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。", + "UndoMergeResolveTooltip": "撤消上次合併衝突解決。", "DiscardAllTooltip": "捨棄 '{{.path}}' 預存/未預存更改。", "DiscardUnstagedTooltip": "捨棄 '{{.path}}' 未預存更改。", + "DiscardUnstagedDisabled": "選中的專案既沒有已暫存的變更也沒有未暫存的變更。", "Pop": "還原", + "StashPopTooltip": "將儲存項應用到工作目錄並刪除儲存項。", "Drop": "捨棄", + "StashDropTooltip": "從貯藏列表中刪除該貯藏項。", "Apply": "套用", + "StashApplyTooltip": "將貯藏項應用到您的工作目錄。", "NoStashEntries": "沒有收藏記錄", "StashDrop": "放棄收藏記錄", + "SureDropStashEntry": "確定要刪除選中的儲藏條目嗎？", "StashPop": "還原收藏記錄", "SurePopStashEntry": "是否從收藏中還原這個記錄？", "StashApply": "套用收藏記錄", @@ -128,11 +223,11 @@ "StashChanges": "安置現有變更到收藏中", "RenameStash": "重新命名收藏", "RenameStashPrompt": "重新命名收藏：{{.stashName}}", - "OpenConfig": "開啟設定檔案", "EditConfig": "編輯設定檔案", "ForcePush": "強制推送", "ForcePushPrompt": "你的分支與遠端分支分岔。按 'ESC' 取消，或按 'Enter' 強制推送。", "ForcePushDisabled": "你的分支與遠端分支分岔，你已禁用強制推送", + "UpdatesRejected": "更新被拒絕。在下次推送前，請先抓取並檢查遠端分支。", "UpdatesRejectedAndForcePushDisabled": "更新被拒絕，你已禁用強制推送", "CheckForUpdate": "檢查更新", "CheckingForUpdates": "正在檢查更新...", @@ -148,6 +243,9 @@ "UpdateFailedErr": "更新失敗：{{.errMessage}}", "ConfirmQuitDuringUpdateTitle": "正在更新中", "ConfirmQuitDuringUpdate": "正在進行更新，是否結束？", + "IntroPopupMessage": "\n感謝你使用 lazygit！真的，你很棒。以下有三件事想和你分享：\n\n 1) 如果你想了解 lazygit 的功能，請觀看這支影片：\n https://youtu.be/CPLdltN7wgE\n\n 2) 請務必閱讀最新的發行說明：\n https://github.com/jesseduffield/lazygit/releases\n\n 3) 如果 lazygit 讓你的生活更輕鬆，可以按右下角的捐款按鈕向我們致謝。捐款不會提供優先支援，但我們非常感謝。\n\n按 {{confirmationKey}} 開始。\n", + "NonReloadableConfigWarningTitle": "設定已更改", + "NonReloadableConfigWarning": "以下設定設定已更改，但更改不會立即生效。請退出並重新啟動lazygit以使更改生效：\n\n{{configs}}", "GitconfigParseErr": "Gogit 無法解析你的 gitconfig 檔案，因為存在未引用的 '\\' 字符，刪除它們應該可以解決這個問題。", "EditFile": "編輯檔案", "EditFileTooltip": "使用外部編輯器開啟", @@ -157,20 +255,51 @@ "IgnoreFile": "添加到 .gitignore", "ExcludeFile": "添加到 .git/info/exclude", "RefreshFiles": "重新整理檔案", + "FocusMainView": "聚焦主檢視", "Merge": "合併到當前檢出的分支", + "MergeBranchTooltip": "檢視將選中項合併到目前分支的選項(正常合併，壓縮合並)", + "RegularMergeFastForward": "常規合併（快進）", + "RegularMergeFastForwardTooltip": "將 '{{.checkedOutBranch}}' 快轉至 '{{.selectedBranch}}'，不建立合併提交。", + "CannotFastForwardMerge": "無法將 '{{.checkedOutBranch}}' 快進到 '{{.selectedBranch}}'", + "RegularMergeNonFastForward": "常規合併（帶合併提交）", + "RegularMergeNonFastForwardTooltip": "將 '{{.selectedBranch}}' 合併到 '{{.checkedOutBranch}}'，建立一個合併提交。", + "SquashMergeUncommitted": "壓縮合並並保持未提交狀態", + "SquashMergeUncommittedTooltip": "將 '{{.selectedBranch}}' 壓縮合併到工作樹中。", + "SquashMergeCommitted": "壓縮合並，然後提交", + "SquashMergeCommittedTooltip": "將 '{{.selectedBranch}}' 壓縮合併到 '{{.checkedOutBranch}}' 作為一次提交。", "ConfirmQuit": "是否結束？", "SwitchRepo": "切換到最近使用的版本庫", + "AllBranchesLogGraph": "顯示/迴圈所有分支日誌", + "AllBranchesLogGraphReverse": "顯示/迴圈所有分支日誌（反向）", "UnsupportedGitService": "不支援的 git 服務", "CopyPullRequestURL": "複製拉取請求的 URL 到剪貼板", + "OpenPullRequestInBrowser": "在瀏覽器中開啟拉取請求", + "NoPullRequestForBranch": "未找到此分支的拉取請求", "NoBranchOnRemote": "這個分支在遠端不存在。需要先將其推送至遠端。", "Fetch": "擷取", "FetchTooltip": "同步遠端異動", + "CollapseAll": "摺疊全部檔案", + "CollapseAllTooltip": "摺疊檔案樹中的全部目錄", + "ExpandAll": "展開全部檔案", + "ExpandAllTooltip": "展開檔案樹中的全部目錄", + "DisabledInFlatView": "平面檢視中不可用", "FileEnter": "選擇檔案中的單個程式碼塊/行，或展開/折疊目錄", + "FileEnterTooltip": "如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。", "StageSelectionTooltip": "切換現有行的狀態 (已預存/未預存)", "DiscardSelection": "刪除變更 (git reset)", + "DiscardSelectionTooltip": "選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。", + "ToggleSelectHunk": "切換程式碼塊選擇", + "SelectHunk": "選擇程式碼塊", + "SelectLineByLine": "逐行選擇", + "ToggleSelectHunkTooltip": "切換逐行選擇與程式碼塊選擇模式。", + "HunkStagingHint": "程式碼塊選擇模式現在是暫存區的預設模式。如果您想暫存單行，請按 '%s' 切換到逐行模式。\n\n如果您希望預設使用逐行模式（像早期 lazygit 版本那樣），請將\n\ngui:\n useHunkModeInStagingView: false\n\n新增到您的 lazygit 設定中。", "ToggleSelectionForPatch": "向 (或從) 補丁中添加/刪除行", + "RemoveSelectionFromPatch": "從提交中移除行", + "RemoveSelectionFromPatchTooltip": "從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。", "EditHunk": "編輯程式碼塊", + "EditHunkTooltip": "在外部編輯器中編輯選中的程式碼塊。", "ToggleStagingView": "切換至另一個面板 (已預存/未預存更改)", + "ToggleStagingViewTooltip": "切換到其他檢視（已暫存/未暫存的變更）。", "ReturnToFilesPanel": "返回檔案面板", "FastForward": "從上游快進此分支", "FastForwardTooltip": "從遠端快進所選的分支", @@ -179,43 +308,78 @@ "ViewConflictsMenuItem": "檢視衝突", "AbortMenuItem": "中止%s", "PickHunk": "挑選程式碼片段", - "PickAllHunks": "挑選所有程式碼片段", + "PickBothHunks": "選取兩個區塊", "ViewMergeRebaseOptions": "查看合併/變基選項", + "ViewMergeRebaseOptionsTooltip": "檢視目前合併或變基的中止、繼續、跳過選項。", + "ViewMergeOptions": "檢視合併選項", "ViewRebaseOptions": "查看合併/變基選項", + "ViewCherryPickOptions": "檢視揀選選項", + "ViewRevertOptions": "檢視撤銷選項", "NotMergingOrRebasing": "你當前既不在變基也不在合併中", "AlreadyRebasing": "無法在變基期間執行此操作", + "NotMidRebase": "此操作僅在互動式變基期間有效", + "MustSelectFixupCommit": "此操作僅適用於修復提交", "RecentRepos": "最近的版本庫", "MergeOptionsTitle": "合併選項", "RebaseOptionsTitle": "變基選項", + "CherryPickOptionsTitle": "揀選選項", + "RevertOptionsTitle": "撤銷選項", "CommitSummaryTitle": "提交摘要", "CommitDescriptionTitle": "提交描述", "CommitDescriptionSubTitle": "按 tab 鍵聚焦", + "CommitDescriptionFooter": "按 {{.confirmInEditorKeybinding}} 提交", + "CommitHooksDisabledSubTitle": "(鉤子已禁用)", "LocalBranchesTitle": "本地分支", "SearchTitle": "搜尋", "TagsTitle": "標籤", "MenuTitle": "功能表", + "CommitMenuTitle": "提交 選單", "RemotesTitle": "遠端", "RemoteBranchesTitle": "遠端分支", "PatchBuildingTitle": "主面板 (補丁生成)", "InformationTitle": "資訊", "SecondaryTitle": "次要", "ReflogCommitsTitle": "日誌", + "ConflictsResolved": "所有合併衝突已解決。繼續 %s 嗎？", "Continue": "確認", + "UnstagedFilesAfterConflictsResolved": "衝突解決後檔案已被修改。是否自動暫存並繼續？", "RebasingTitle": "將 '{{.checkedOutBranch}}'", + "RebasingFromBaseCommitTitle": "從標記的幾點變基'{{.checkedOutBranch}}'", "SimpleRebase": "簡單變基 變基至 '{{.ref}}'", "InteractiveRebase": "互動變基 變基至 '{{.ref}}'", + "RebaseOntoBaseBranch": "變基到主分支 ({{.baseBranch}})", "InteractiveRebaseTooltip": "開始一個互動變基，以中斷開始，這樣你可以在繼續之前更新TODO提交", + "RebaseOntoBaseBranchTooltip": "將已檢出的分支變基到主分支上（例如最近的主分支）。", + "MustSelectTodoCommits": "在變基過程中, 該操作僅在選中TODO提交時有效。", "FwdNoUpstream": "無法快進無遠端的分支 ", "FwdNoLocalUpstream": "無法快進尚未在本地註冊的遠端分支", "FwdCommitsToPush": "無法快進帶有尚未推送的提交的分支", "PullRequestNoUpstream": "無法對沒有遠端的分支拉取", + "PullRequestChecksPassing": "通過", + "PullRequestChecksPending": "等待中", + "PullRequestChecksFailing": "失敗", + "PullRequestChecksError": "錯誤", + "PullRequestChecksExpected": "預期中", "ErrorOccurred": "發生錯誤！請在此詢問錯誤：", + "ConflictLabel": "衝突", + "PendingRebaseTodosSectionHeader": "待處理變基任務", + "PendingCherryPicksSectionHeader": "待處理揀選", + "PendingRevertsSectionHeader": "待處理還原", + "CommitsSectionHeader": "提交", + "MoveCommitsHere": "放到這裡", + "MovingCommitsHere": "正在將提交移到這裡", "YouDied": "你死了！", "RewordNotSupported": "在互動變基期間改寫提交目前不支援", "ChangingThisActionIsNotAllowed": "不允許更改此類變基待辦事項", + "NotAllowedMidCherryPickOrRevert": "在揀選或還原過程中不允許此操作", + "PickIsOnlyAllowedDuringRebase": "此操作僅在變基過程中允許", + "DroppingMergeRequiresSingleSelection": "刪除合併提交需要單個選中項", "CherryPickCopy": "複製提交 (揀選)", + "CherryPickCopyTooltip": "標記提交為已複製。然後，在本地提交檢視中，您可以按 `{{.paste}}` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `{{.escape}}` 來取消選擇。", "PasteCommits": "貼上提交 (揀選)", + "SureCherryPick": "確定要將複製的{{.numCommits}}個提交揀選到該分支上嗎？", "CherryPick": "揀選 (Cherry-pick)", + "CannotCherryPickNonCommit": "無法揀選TODO型別的提交", "Donate": "贊助", "AskQuestion": "諮詢", "PrevHunk": "選擇上一段", @@ -228,28 +392,48 @@ "ScrollUp": "向上捲動", "ScrollUpMainWindow": "向上捲動主面板", "ScrollDownMainWindow": "向下捲動主面板", + "SuspendApp": "掛起應用程式", + "CannotSuspendApp": "Windows 不支援掛起應用程式", "AmendCommitTitle": "修改提交", "AmendCommitPrompt": "是否使用預存檔案修改提交？", + "AmendCommitWithConflictsMenuPrompt": "警告：您即將使用已解決的衝突來修正上一個已完成的提交。此時這樣做很可能並非您所期望的。更可能的情況是，您只是想繼續執行變基操作。\n\n您仍然想要修正前一個提交嗎？", + "AmendCommitWithConflictsContinue": "否，繼續變基", + "AmendCommitWithConflictsAmend": "是，修正上一個提交", "DropCommitTitle": "刪除提交", "DropCommitPrompt": "是否刪除此提交？", + "DropUpdateRefPrompt": "您確定要刪除選定的 update-ref 待辦事項嗎？除非中止變基，否則這是不可逆轉的。", + "DropMergeCommitPrompt": "確定要刪除選中的合併提交嗎？注意：這將同時刪除透過該合併提交引入的所有提交。", "PullingStatus": "拉取", "PushingStatus": "推送", "FetchingStatus": "擷取", "SquashingStatus": "壓縮中", "FixingStatus": "修復中", "DeletingStatus": "刪除中", + "DroppingStatus": "刪除中...", "MovingStatus": "移動中", "RebasingStatus": "變基中", "MergingStatus": "合併中", "LowercaseRebasingStatus": "變基", "LowercaseMergingStatus": "合併", + "LowercaseCherryPickingStatus": "揀選中", + "LowercaseRevertingStatus": "還原中", "AmendingStatus": "修改中", "CherryPickingStatus": "揀選中", "UndoingStatus": "復原中", "RedoingStatus": "重做中", "CheckingOutStatus": "檢出中", + "CreatingBranchStatus": "正在建立分支", "CommittingStatus": "提交中", + "RewordingStatus": "修改提交資訊", "RevertingStatus": "還原中", + "ResettingStatus": "正在重設", + "CreatingFixupCommitStatus": "正在建立一個修復提交", + "MovingCommitsToNewBranchStatus": "正在將提交移動到新分支", + "ApplyingFilterStatus": "正在套用篩選條件", + "RemovingFilterStatus": "正在移除篩選條件", + "StashingStatus": "正在儲藏", + "ApplyingStashStatus": "正在套用儲藏", + "PoppingStashStatus": "正在彈出儲藏", "CommitFiles": "提交檔案", "SubCommitsDynamicTitle": "提交（%s）", "CommitFilesDynamicTitle": "差異檔案（%s）", @@ -257,13 +441,29 @@ "ViewItemFiles": "檢視所選項目的檔案", "CommitFilesTitle": "提交檔案", "CheckoutCommitFileTooltip": "檢出檔案", + "CannotCheckoutWithModifiedFilesErr": "您已有對您試圖簽出的檔案作出的本地修改。您需要先儲存或丟棄這些檔案。", + "CanOnlyDiscardFromLocalCommits": "只能從本地提交中丟棄更改", + "CannotDiscardFromMultipleCommits": "無法從多選提交中丟棄更改", + "Remove": "刪除", + "DiscardOldFileChangeTooltip": "放棄對此檔案的提交變更。", "DiscardFileChangesTitle": "捨棄檔案更改", - "BareRepo": "你嘗試在裸版本庫中開啟 Lazygit，但 Lazygit 尚未支援裸版本庫。是否開啟最新版本庫？ (y/n) ", + "DiscardFileChangesPrompt": "確定要從此提交中丟棄所選檔案的更改嗎？\n\n此操作將啟動變基，還原這些檔案更改。請注意，如果後續提交依賴於這些更改，您可能需要解決衝突。", + "DiscardFileChangesPromptResetPatch": "確定要從此提交中丟棄所選檔案的更改嗎？\n\n此操作將啟動變基，還原這些檔案更改。請注意，如果後續提交依賴於這些更改，您可能需要解決衝突。\n\n注意：這將重置活動的自定義補丁！", + "DisabledForGPG": "使用GPG的使用者無法使用此功能。\n\n如果您正在使用密碼代理（如gpg-agent）以避免每次簽名時輸入密碼，可以透過在lazygit設定檔中新增\n\ngit:\n overrideGpg: true\n\n來啟用此功能。", + "CreateRepo": "不在 git 倉庫中。建立一個新的 git 倉庫嗎？(y/N): ", + "BareRepo": "您已經嘗試在空倉庫中開啟Lazygit，但是Lazygit還不支援空倉庫。開啟最近的倉庫嗎？(y / n) ", + "BareRepoNotSupported": "Lazygit 不支援裸儲存庫。", "InitialBranch": "分支名稱？（留空使用 git 的預設值）：", "NoRecentRepositories": "必須在 git 版本庫中開啟 lazygit。沒有有效的最近版本庫。退出。", "IncorrectNotARepository": "無效 `notARepository` 輸入。輸入應為「prompt」、「create」、「skip」、或「quit」。", "AutoStashTitle": "是否自動收藏？", "AutoStashPrompt": "必須收藏並拾起變更才得以繼續操作。是否自動執行？（Enter/Esc）", + "AutoStashForUndo": "正在自動儲藏更改以便撤銷到 %s", + "AutoStashForCheckout": "正在自動儲藏更改以便檢出 %s", + "AutoStashForNewBranch": "正在自動儲藏更改以便建立新分支 %s", + "AutoStashForMovingPatchToIndex": "正在自動儲藏更改以便將自定義補丁從 %s 移動到暫存區", + "AutoStashForCherryPicking": "正在自動儲藏更改以便揀選提交", + "AutoStashForReverting": "正在自動儲藏更改以便還原提交", "Discard": "捨棄", "DiscardChangesTitle": "捨棄變更", "DiscardFileChangesTooltip": "檢視選中變動進行捨棄復原", @@ -275,18 +475,43 @@ "DiscardUntrackedFiles": "刪除未追蹤檔案", "DiscardStagedChanges": "刪除已預存變更", "HardReset": "強制重設", + "BranchDeleteTooltip": "檢視本地/遠端分支的刪除選項。", + "TagDeleteTooltip": "檢視本機／遠端標籤的刪除選項。", "Delete": "刪除", "Reset": "重設", + "ResetTooltip": "檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。", "ViewResetOptions": "檢視重設選項", + "FileResetOptionsTooltip": "檢視工作樹的重置選項（例如：清除工作樹）。", "CreateFixupCommit": "建立修復提交", "CreateFixupCommitTooltip": "為此提交建立修復提交", + "CreateAmendCommit": "建立 'amend!' 提交", + "FixupMenu_Fixup": "修復提交", + "FixupMenu_FixupTooltip": "允許您修復另一個提交併保持原本的提交資訊。", + "FixupMenu_AmendWithChanges": "基於目前變動內容修改提交", + "FixupMenu_AmendWithChangesTooltip": "允許您修復另一個提交併修改提交資訊。", + "FixupMenu_AmendWithoutChanges": "修改提交（不含變動內容，類似reword）", + "FixupMenu_AmendWithoutChangesTooltip": "允許您修改另一個提交的提交訊息而不更改其內容。", "SquashAboveCommitsTooltip": "是否壓縮上方 {{.commit}} 所有「fixup」提交？", + "SquashCommitsAboveSelectedTooltip": "壓縮目前選中提交下的所有修復提交（自動壓縮）。", + "SquashCommitsInCurrentBranchTooltip": "壓縮目前分支中的所有修復提交（自動壓縮）。", "SquashAboveCommits": "壓縮上方所有「fixup」提交（自動壓縮）", + "SquashCommitsInCurrentBranch": "在目前分支", + "SquashCommitsAboveSelectedCommit": "在選定提交之上", + "CannotSquashCommitsInCurrentBranch": "在目前分支中無法壓縮提交：因為分離HEAD提交是一個合併提交或者已經存在於主分支中。", + "ExecuteShellCommand": "執行 Shell 命令", + "ExecuteShellCommandTooltip": "調出可輸入shell命令執行的提示符。", + "ShellCommand": "Shell 命令：", "CommitChangesWithoutHook": "沒有預提交 hook 就提交更改", "ResetTo": "重設至", + "ResetSoftTooltip": "將 HEAD 重置為所選提交，並將目前提交和所選提交之間的更改保留為已暫存更改。", + "ResetMixedTooltip": "將 HEAD 重置為所選提交，並將目前提交和所選提交之間的更改保留為未暫存的更改。", + "ResetHardTooltip": "將 HEAD 重置為所選提交，並丟棄目前提交和所選提交之間的所有更改，以及工作樹中的所有目前修改。", + "ResetHardConfirmation": "您確定要執行硬重置嗎？這將丟棄所有未提交的更改（包括已暫存和未暫存的），且無法撤銷。", "PressEnterToReturn": "按 Enter 返回到 lazygit", "ViewStashOptions": "檢視收藏選項", + "ViewStashOptionsTooltip": "檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。", "Stash": "收藏", + "StashTooltip": "貯藏所有變更.若要使用其他貯藏變體,請使用檢視貯藏選項快捷鍵。", "StashAllChanges": "收藏所有變更", "StashStagedChanges": "收藏已預存變更", "StashAllChangesKeepIndex": "收藏所有變更並保留預存區", @@ -294,77 +519,127 @@ "StashIncludeUntrackedChanges": "收藏所有變更，包括未追蹤檔案", "StashOptions": "收藏選項", "NotARepository": "錯誤：必須在 git 版本庫中執行", + "WorkingDirectoryDoesNotExist": "錯誤：目前工作目錄不存在", "ScrollLeft": "向左捲動", "ScrollRight": "向右捲動", "DiscardPatch": "捨棄補丁", "DiscardPatchConfirm": "你只能從單一提交或收藏項目建立一個補丁。是否捨棄當前補丁？", "CantPatchWhileRebasingError": "在合併或變基狀態下，你不能建立或運行補丁命令", "ToggleAddToPatch": "切換檔案是否包含在補丁中", + "ToggleAddToPatchTooltip": "切換檔案是否包含在自定義補丁中。請參閱 {{.doc}}。", "ToggleAllInPatch": "切換所有檔案是否包含在補丁中", + "ToggleAllInPatchTooltip": "新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 {{.doc}}。", "UpdatingPatch": "正在更新補丁", "ViewPatchOptions": "檢視自訂補丁選項", "PatchOptionsTitle": "補丁選項", "NoPatchError": "尚未建立補丁。要開始建立補丁，請在提交檔案上使用空格或輸入以添加特定行", + "EmptyPatchError": "補丁還是空的。首先將一些檔案或行新增到您的補丁中。", "EnterCommitFile": "輸入檔案以將選定的行添加至補丁（或切換目錄折疊）", + "EnterCommitFileTooltip": "如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。", "ExitCustomPatchBuilder": "退出自訂補丁建立器", + "ExitFocusedMainView": "退出回到側邊面板", "EnterUpstream": "輸入遠端為 ' '", "InvalidUpstream": "無效的遠端分支名稱。必須符合 ' ' 的格式", "NewRemote": "新增遠端", "NewRemoteName": "新遠端名稱：", "NewRemoteUrl": "新遠端 URL：", + "AddForkRemote": "新增復刻遠端倉庫", + "AddForkRemoteUsername": "復刻所有者（使用者名稱/組織）。使用 使用者名稱:分支 來檢出分支", + "AddForkRemoteTooltip": "透過替換 origin URL 中的所有者來快速新增復刻遠端倉庫，並可選擇從新遠端倉庫檢出分支。", + "IncompatibleForkAlreadyExistsError": "遠端倉庫 {{.remoteName}} 已存在且 URL 不同", + "NoOriginRemote": "此操作需要 'origin' 遠端倉庫", + "ViewBranches": "檢視分支", "EditRemoteName": "輸入更新 {{.remoteName}} 遠端名稱：", "EditRemoteUrl": "輸入更新 {{.remoteName}} 遠端 URL：", "RemoveRemote": "移除遠端", + "RemoveRemoteTooltip": "刪除選中的遠端。從遠端跟蹤遠端分支的任何本地分支都不會受到影響。", + "RemoveRemotePrompt": "確定要刪除遠端倉庫嗎？", "DeleteRemoteBranch": "刪除遠端分支", + "DeleteRemoteBranches": "刪除原創分支", + "DeleteRemoteBranchTooltip": "從遠端刪除遠端分支。", + "DeleteLocalAndRemoteBranch": "刪除本地和遠端分支", + "DeleteLocalAndRemoteBranches": "刪除本地和遠端分支", "SetAsUpstream": "設置為遠端", "SetAsUpstreamTooltip": "將此分支設為當前分支之遠端", "SetUpstream": "設定選定分支的遠端分支", "UnsetUpstream": "重置選定分支的遠端", "ViewDivergenceFromUpstream": "檢視與遠端的差異", + "ViewDivergenceFromBaseBranch": "檢視主分支({{.baseBranch}})與上游的差異", + "CouldNotDetermineBaseBranch": "無法確定主分支", "DivergenceSectionHeaderLocal": "本地", + "DivergenceSectionHeaderRemote": "遠端", "ViewUpstreamResetOptions": "重設當前分支進 {{.upstream}}", "ViewUpstreamResetOptionsTooltip": "查看重設當前分支進 {{upstream}} 的選項。注意：此動作不會重置所選的遠端，而是將當前分支重置到遠端", "ViewUpstreamRebaseOptions": "將當前分支變基到 {{.upstream}}", "ViewUpstreamRebaseOptionsTooltip": "查看變基當前分支到 {{upstream}} 的選項。注意：此動作不會變基所選的遠端，而是將當前分支變基到遠端", "UpstreamGenericName": "選定分支的選端", "SetUpstreamTitle": "設定遠端分支", + "SetUpstreamMessage": "確定要將'{{.checkedOut}}'的上游分支設定為'{{.selected}}'嗎？", "EditRemoteTooltip": "編輯遠端", "TagCommit": "打標籤到提交", + "TagCommitTooltip": "建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。", "TagNameTitle": "標籤名稱", "TagMessageTitle": "標籤訊息", "LightweightTag": "輕量標籤", "AnnotatedTag": "附註標籤", + "DeleteTagTitle": "要刪除 '{{.tagName}}' 標籤?", "DeleteLocalTag": "刪除本地標籤", + "DeleteRemoteTag": "刪除遠端標籤", + "DeleteLocalAndRemoteTag": "刪除本地和遠端標籤", + "SelectRemoteTagUpstream": "被刪除標籤'{{.tagName}}'的遠端：", "DeleteRemoteTagPrompt": "確定要刪除遠端 {{.upstream}} 的標籤 '{{.tagName}}'？", + "DeleteLocalAndRemoteTagPrompt": "確定要從本機和 '{{.upstream}}' 遠端刪除 '{{.tagName}}' 嗎？", + "RemoteTagDeletedMessage": "遠端標籤已刪除", "PushTagTitle": "推送標籤 '{{.tagName}}' 至遠端：", "PushTag": "推送標籤", + "PushTagTooltip": "推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。", "NewTag": "建立標籤", + "NewTagTooltip": "基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。", + "CreatingTag": "建立標籤", + "ForceTag": "強制標記標籤", + "ForceTagPrompt": "該標籤‘{{.tagName}}’已存在。請按{{.cancelKey}}取消，或者按{{.confirmKey}}覆蓋它。", "FetchRemoteTooltip": "擷取遠端", + "CheckoutCommitTooltip": "檢出所選擇的提交作為分離HEAD。", + "NoBranchesFoundAtCommitTooltip": "在選定的提交處未找到分支。", "GitFlowOptions": "顯示 git-flow 選項", "NotAGitFlowBranch": "這似乎不是一個 git flow 分支", "NewBranchNamePrompt": "為分支輸入新名稱", "IgnoreTracked": "忽略已追蹤檔案", "ExcludeTracked": "排除已追蹤檔案", "IgnoreTrackedPrompt": "你確定要忽略一個已追蹤的檔案？", + "ExcludeTrackedPrompt": "您確定要排除已跟蹤的檔案嗎？", "ViewResetToUpstreamOptions": "檢視遠端重設選項", "NextScreenMode": "下一個螢幕模式（常規/半螢幕/全螢幕）", "PrevScreenMode": "上一個螢幕模式", + "CycleDiffRenderers": "切換差異渲染器", + "CycleDiffRenderersTooltip": "選擇已設定的差異渲染器清單中的下一個渲染器。", + "CycleDiffRenderersReverse": "切換差異渲染器（反向）", + "CycleDiffRenderersReverseTooltip": "選擇已設定的差異渲染器清單中的上一個渲染器。", + "CycleDiffRenderersDisabledReason": "沒有設定其他差異渲染器", + "SelectedDiffRenderers": "差異渲染器：{{.name}}（第 {{.current}} 個，共 {{.total}} 個）", + "DefaultDiffRendererName": "（預設）", + "ExternalDiffDiffRendererName": "（外部差異）", "StartSearch": "搜尋", "StartFilter": "搜尋", + "SelectRemoteRepository": "為拉取請求選擇基礎倉庫", + "FetchingPullRequests": "正在獲取拉取請求", "Keybindings": "鍵盤快捷鍵", - "KeybindingsLegend": "說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B", "KeybindingsMenuSectionLocal": "本地", "KeybindingsMenuSectionGlobal": "全域", + "KeybindingsMenuSectionNavigation": "導航", + "KeybindingsTooltip": "快速鍵：", "RenameBranch": "重新命名分支", "Upstream": "遠端", "BranchUpstreamOptionsTitle": "上游遠端設定", "ViewBranchUpstreamOptions": "檢視遠端設定", "ViewBranchUpstreamOptionsTooltip": "檢視有關遠端分支的設定（例如重設至遠端）", "UpstreamNotSetError": "目標分支沒有遠端對應分支（或其遠端分支未儲存於本地）", + "UpstreamsNotSetError": "部分選中分支沒有上游分支（或上游分支未在本地儲存）", "NewGitFlowBranchPrompt": "{{.branchType}} 名稱：", "RenameBranchWarning": "此分支正在追蹤遠端分支。此操作僅會重新命名本地分支名稱，而不是遠端分支的名稱。是否繼續？", "OpenKeybindingsMenu": "開啟選單", "ResetCherryPick": "重設選定的揀選 (複製) 提交", + "ResetCherryPickShort": "重置已複製的提交", "NextTab": "下一個索引標籤", "PrevTab": "上一個索引標籤", "CantUndoWhileRebasing": "在變基時無法復原", @@ -372,6 +647,8 @@ "MustStashWarning": "將補丁提取到索引中需要收藏並取消收藏你的變更。如果出現問題，你可以從收藏中訪問你的檔案。是否繼續？", "MustStashTitle": "必須收藏", "ConfirmationTitle": "確認面板", + "PromptTitle": "輸入提示", + "PromptInputCannotBeEmptyToast": "不允許輸入為空", "PrevPage": "上一頁", "NextPage": "下一頁", "GotoTop": "捲動到頂部", @@ -379,11 +656,15 @@ "FilteringBy": "篩選方式", "ResetInParentheses": "（已重設）", "OpenFilteringMenu": "檢視篩選路徑選項", + "OpenFilteringMenuTooltip": "檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。", "FilterBy": "篩選路徑", "ExitFilterMode": "停止按路徑篩選", "FilterPathOption": "輸入要依路徑篩選的路徑", + "FilterAuthorOption": "輸入作者進行過濾", "EnterFileName": "輸入路徑：", + "EnterAuthor": "輸入作者：", "FilteringMenuTitle": "篩選", + "WillCancelExistingFilterTooltip": "注意：這將取消現有的過濾器", "MustExitFilterModeTitle": "命令不可用", "MustExitFilterModePrompt": "在按路徑篩選的模式下，該命令不可用。是否退出按路徑篩選的模式？", "Diff": "差異", @@ -393,15 +674,27 @@ "DiffingMenuTitle": "差異比較", "SwapDiff": "反轉差異方向", "ViewDiffingOptions": "開啟差異比較選單", + "ViewDiffingOptionsTooltip": "檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。", + "CancelDiffingMode": "取消差異比較模式", "OpenCommandLogMenu": "開啟命令記錄選單", + "OpenCommandLogMenuTooltip": "檢視命令日誌的選項，例如顯示/隱藏命令日誌以及聚焦命令日誌。", "ShowingGitDiff": "顯示輸出：", + "ShowingDiffForRange": "顯示範圍差異", "CommitDiff": "提交差異", + "CopyCommitHashToClipboard": "複製縮略提交雜湊值到剪貼簿", "CommitHash": "提交 hash", "CommitURL": "提交 URL", + "PasteCommitMessageFromClipboard": "貼上提交資訊自剪貼簿", + "SurePasteCommitMessage": "貼上將覆蓋目前提交訊息，繼續嗎？", "CommitMessage": "提交訊息", + "CommitMessageBody": "提交資訊正文", + "CommitSubject": "提交主題", "CommitAuthor": "提交者", + "CommitTags": "提交標籤", "CopyCommitAttributeToClipboard": "複製提交屬性", + "CopyCommitAttributeToClipboardTooltip": "複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。", "CopyBranchNameToClipboard": "複製分支名稱到剪貼簿", + "CopyTagToClipboard": "複製標籤到剪貼簿", "CopyPathToClipboard": "複製檔案名稱到剪貼簿", "CommitPrefixPatternError": "commitPrefix 模式錯誤", "CopySelectedTextToClipboard": "複製所選文本至剪貼簿", @@ -412,15 +705,22 @@ "BranchUnknown": "分支未知", "DiscardChangeTitle": "取消預存行", "DiscardChangePrompt": "是否刪除所選行（git reset）？此操作不可逆。\n將「gui.skipDiscardChangeWarning」設為 true 可禁用此警告。", + "DiscardLinesFromCommitTitle": "從提交中丟棄行", + "DiscardLinesFromCommitPrompt": "確定要從此提交中丟棄所選行嗎？", + "DiscardLinesFromCommitPromptWithReset": "確定要從此提交中丟棄所選行嗎？\n\n注意：這將重置活動的自定義補丁！", "CreateNewBranchFromCommit": "從提交建立新分支", "BuildingPatch": "正在建立補丁", "ViewCommits": "檢視提交", + "MinGitVersionError": "Git 版本必須至少為 %s。請升級您的 Git 版本。", "RunningCustomCommandStatus": "正在執行自訂命令", "SubmoduleStashAndReset": "收藏未提交的子模組變更並更新", "AndResetSubmodules": "以及重設子模組", "EnterSubmoduleTooltip": "進入子模組", + "BackToParentRepo": "返回父倉庫", + "Enter": "進入", "CopySubmoduleNameToClipboard": "複製子模組名稱到剪貼簿", "RemoveSubmodule": "移除子模組", + "RemoveSubmoduleTooltip": "刪除選定的子模組及其相應的目錄。", "RemoveSubmodulePrompt": "是否確定要刪除子模組 '%s' 以及它相應的目錄？此操作是不可逆的。", "ResettingSubmoduleStatus": "重設子模型中", "NewSubmoduleName": "子模組名稱：", @@ -433,43 +733,68 @@ "EditSubmoduleUrl": "更新子模組 URL", "InitializingSubmoduleStatus": "正在初始化子模組", "InitSubmoduleTooltip": "初始化子模組", + "Update": "更新", + "Initialize": "初始化", "SubmoduleUpdateTooltip": "更新子模組", "UpdatingSubmoduleStatus": "正在更新子模組", "BulkInitSubmodules": "批量初始化子模組", "BulkUpdateSubmodules": "批量更新子模組", "BulkDeinitSubmodules": "批量解除子模組初始化", + "BulkUpdateRecursiveSubmodules": "批次遞迴初始化並更新子模組", "ViewBulkSubmoduleOptions": "查看批量子模組選項", "BulkSubmoduleOptions": "批量子模組選項", "RunningCommand": "正在執行命令", "SubCommitsTitle": "子提交", + "ExitSubview": "退出子檢視", "SubmodulesTitle": "子模組", "NavigationTitle": "移動", "SuggestionsCheatsheetTitle": "提示", "SuggestionsTitle": "提示（按 %s 進入焦點）", + "SuggestionsSubtitle": "(按 %s 鍵進行刪除, %s 鍵進行編輯)", "ExtrasTitle": "命令記錄", "PullRequestURLCopiedToClipboard": "複製拉取請求 URL 至剪貼簿", "CommitDiffCopiedToClipboard": "已複製提交差異至剪貼簿", "CommitURLCopiedToClipboard": "已複製提交 URL 至剪貼簿", "CommitMessageCopiedToClipboard": "已複製提交訊息至剪貼簿", + "CommitMessageBodyCopiedToClipboard": "提交資訊正文已複製到剪貼簿", + "CommitSubjectCopiedToClipboard": "提交主題已複製到剪貼簿", "CommitAuthorCopiedToClipboard": "已複製提交者至剪貼簿", + "CommitTagsCopiedToClipboard": "提交標籤已複製到剪貼簿", + "CommitHasNoTags": "提交沒有標籤", + "CommitHasNoMessageBody": "提交沒有資訊正文", "PatchCopiedToClipboard": "已複製補丁至剪貼簿", + "MessageCopiedToClipboard": "訊息已複製到剪貼簿", "CopiedToClipboard": "已複製至剪貼簿", "ErrCannotEditDirectory": "無法編輯目錄：你只能編輯單獨的檔案", + "ErrCannotCopyContentOfDirectory": "無法複製目錄內容：只能複製單個檔案的內容", "ErrStageDirWithInlineMergeConflicts": "不能預存/取消預存包含具備內嵌合併衝突的檔案的目錄。請先解決合併衝突", "ErrRepositoryMovedOrDeleted": "找不到版本庫。可能已被移動或刪除", + "ErrWorktreeMovedOrRemoved": "找不到工作樹，它可能被刪除或者移走了。 ¯\\\\_(ツ)_/¯", + "CantSwitchWhileOperationInProgress": "操作進行中時無法切換儲存庫", "CommandLog": "命令記錄", "ToggleShowCommandLog": "切換顯示/隱藏命令記錄", "FocusCommandLog": "聚焦命令記錄", "CommandLogHeader": " '%s' 隱藏/聚焦此面板\n", "RandomTip": "隨機提示", "ToggleWhitespaceInDiffView": "切換是否在差異檢視中顯示空格變更", + "ToggleWhitespaceInDiffViewTooltip": "切換是否在差異檢視中顯示空白字元更改。\n\n預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。", "IgnoreWhitespaceDiffViewSubTitle": "（忽略空格）", "IgnoreWhitespaceNotSupportedHere": "在此檢視中不支援忽略空格", "IncreaseContextInDiffView": "增加差異檢視中顯示變更周圍上下文的大小", + "IncreaseContextInDiffViewTooltip": "增加差異檢視中變更周圍顯示的上下文量。\n\n預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。", "DecreaseContextInDiffView": "減小差異檢視中顯示變更周圍上下文的大小", + "DecreaseContextInDiffViewTooltip": "減少差異檢視中變更周圍顯示的上下文量。\n\n預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。", + "DiffContextSizeChanged": "將diff上下文大小更改為%d", + "IncreaseRenameSimilarityThreshold": "提高重新命名相似度閾值", + "IncreaseRenameSimilarityThresholdTooltip": "提高將刪除和新增對視為重新命名所需的相似度閾值。\n\n預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。", + "DecreaseRenameSimilarityThreshold": "降低重新命名相似度閾值", + "DecreaseRenameSimilarityThresholdTooltip": "降低將刪除和新增對視為重新命名所需的相似度閾值。\n\n預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。", + "RenameSimilarityThresholdChanged": "已重新命名相似度閾值更改為 %d%%", "CreatePullRequestOptions": "建立拉取請求選項", "DefaultBranch": "預設分支", "SelectBranch": "選擇分支", + "SelectTargetRemote": "選擇目標遠端倉庫", + "NoValidRemoteName": "名為 '%s' 的遠端名稱不存在", "CreatePullRequest": "建立拉取請求", "SelectConfigFile": "選擇設定檔", "NoConfigFileFoundErr": "找不到設定檔", @@ -481,24 +806,34 @@ "AbortTitle": "中止%s", "AbortPrompt": "是否確定要中止當前的%s？", "OpenLogMenu": "開啟記錄選單", + "OpenLogMenuTooltip": "檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。", "LogMenuTitle": "提交記錄選項", "ToggleShowGitGraphAll": "切換顯示整個 git 圖表（將 `--all` 標誌傳遞給 `git log`）", "ShowGitGraph": "顯示 git 圖表", + "ShowGitGraphTooltip": "在提交日誌中顯示或隱藏 Git 圖形。\n\n預設值可在設定檔中透過鍵 'git.log.showGraph' 更改。", "SortOrder": "排序規則", + "SortOrderPromptLocalBranches": "本地分支的預設排序順序可在設定檔中透過鍵 'git.localBranchSortOrder' 設定。", + "SortOrderPromptRemoteBranches": "遠端分支的預設排序順序可在設定檔中透過鍵 'git.remoteBranchSortOrder' 設定。", "SortAlphabetical": "依字母", "SortByDate": "依時間", "SortByRecency": "依最近使用", "SortBasedOnReflog": "（依據歷史記錄）", "SortCommits": "提交排序順序", + "SortCommitsTooltip": "更改提交日誌中提交的排序順序。\n\n預設值可在設定檔中透過鍵 'git.log.sortOrder' 更改。", "CantChangeContextSizeError": "在製作補丁期間無法更改上下文大小，因為當發布功能時我們太懒了以至於沒有支援它。如果你真的需要它，請告訴我們！", + "CantChangeRenameThresholdError": "處於修補程式建立模式時，無法變更重新命名相似度門檻，因為自訂修補程式無法處理重新命名變成刪除與新增的情況。", "OpenCommitInBrowser": "在瀏覽器中開啟提交", "ViewBisectOptions": "查看二分選項", "ConfirmRevertCommit": "是否還原 {{.selectedCommit}} ？", + "ConfirmRevertCommitRange": "確定要還原選定的提交嗎？", "RewordInEditorTitle": "在編輯器中改寫", "RewordInEditorPrompt": "是否在編輯器中改寫此提交？", + "CheckoutAutostashPrompt": "確定要檢出 '%s' 嗎？必要時將自動儲藏更改。", "HardResetAutostashPrompt": "是否強制重設為 '%s' ？如果需要會進行自動存儲。", + "SoftResetPrompt": "您確定要軟重置到 '%s' 嗎？", "UpstreamGone": "(遠端已經不存在)", "NukeDescription": "如果你想讓所有工作樹上的變更消失，這就是正確的選項。如果有未提交的子模組變更，它們將被收藏在子模組中。", + "NukeTreeConfirmation": "確定要清空工作樹嗎？這將丟棄工作樹中的所有更改（已暫存、未暫存和未跟蹤的），此操作不可撤銷。", "DiscardStagedChangesDescription": "這將創建一個新的存儲條目，其中只包含預存檔案，然後如果存儲條目不需要，將其刪除，因此工作樹僅保留未預存的變更。", "EmptyOutput": "<空輸出>", "Patch": "補丁", @@ -506,30 +841,52 @@ "CommitsCopied": "提交已複製", "CommitCopied": "提交已複製", "ResetPatch": "重設補丁", + "ResetPatchTooltip": "清理目前補丁。", "ApplyPatch": "套用補丁", + "ApplyPatchTooltip": "應用目前補丁到工作樹中。", "ApplyPatchInReverse": "反向套用補丁", + "ApplyPatchInReverseTooltip": "反向應用目前補丁到工作樹中。", "RemovePatchFromOriginalCommit": "從原始提交中刪除補丁（%s）", + "RemovePatchFromOriginalCommitTooltip": "從這些提交中刪除該補丁。這是透過在提交時啟動互動式變基，反向應用補丁，然後繼續變基來實現的。如果之後的提交依賴於補丁，您可能需要解決衝突。", "MovePatchOutIntoIndex": "將補丁移到預存區", + "MovePatchOutIntoIndexTooltip": "將補丁從提交中移出並移入到索引中。這是透過在提交時啟動互動式變基、反向應用補丁、繼續變基直至完成，然後將補丁應用到索引來實現的。如果之後的提交依賴於補丁，您可能需要解決衝突。", + "MovePatchIntoNewCommit": "將補丁移動到原始提交之後的新提交中", + "MovePatchIntoNewCommitTooltip": "將補丁從提交中移出並移至位於原始提交之上的新提交中。這是透過在原始提交處啟動互動式變基，反向應用補丁，然後將補丁應用到索引並將其作為新提交提交，然後繼續變基直至完成來實現的。如果以後的提交依賴於補丁，您可能需要解決衝突。", + "MovePatchIntoNewCommitBefore": "將補丁移動到原始提交之前的新提交中", + "MovePatchIntoNewCommitBeforeTooltip": "將補丁從其提交中移出，並放入原始提交之前的新提交中。當自定義補丁僅包含整個程式碼塊甚至整個檔案時效果最佳；如果包含部分程式碼塊，則很可能出現衝突。", "MovePatchToSelectedCommit": "將補丁移到選定的提交（%s）", + "MovePatchToSelectedCommitTooltip": "將補丁從其原始提交修改到選定的提交中。 實現這一點的方法是在原始提交時啟動互動式重置，反向應用補丁， 然後在應用補丁和修改選定的提交之前，繼續將其重新建立到選定的提交上。 重置將繼續完成。如果原始碼和目的碼提交之間的提交取決於補丁，您可能需要解決衝突。", "CopyPatchToClipboard": "將補丁複製到剪貼簿", + "MustStageFilesAffectedByPatchTitle": "必須暫存檔案", + "MustStageFilesAffectedByPatchWarning": "將補丁應用到索引需要暫存受補丁影響的未暫存檔案。請注意，應用補丁時可能會出現衝突。繼續嗎？", "NoMatchesFor": "沒有找到符合 '%s' %s 的結果", "MatchesFor": "符合 '%s' 的結果（%d/%d）%s", "SearchKeybindings": "%s：下一個結果，%s：上一個結果，%s：退出搜尋模式", "SearchPrefix": "搜尋：", "FilterPrefix": "篩選：", "ExitSearchMode": "%s：退出搜尋模式", + "ExitTextFilterMode": "%s：退出過濾模式", + "Switch": "切換", "SwitchToWorktree": "切換至工作目錄面板", + "SwitchToWorktreeTooltip": "切換到選中的工作樹。", "AlreadyCheckedOutByWorktree": "此分支已被檢出到 {{.worktreeName}} 是否切換到此工作目錄？", "BranchCheckedOutByWorktree": "分支 {{.branchName}} 已被 {{.worktreeName}} 檢出", + "SomeBranchesCheckedOutByWorktreeError": "部分選中分支被其他工作樹檢出。請逐個選擇刪除。", "DetachWorktreeTooltip": "此將在工作目錄中執行 `git checkout --detach` 以解開分支與它的連結，但工作目錄本身將不被更動", "Switching": "切換中", "RemoveWorktree": "刪除工作目錄", "RemoveWorktreeTitle": "刪除工作目錄", + "RemoveWorktreeMenuTitle": "移除工作樹 '{{.worktreeName}}'？", + "RemoveWorktreeAndDeleteBranch": "移除工作樹並刪除分支", + "RemoveWorktreeAndDeleteBothBranches": "移除工作樹並刪除本機與遠端分支", + "WorktreeNotCheckedOutOnBranch": "此工作樹未檢出任何分支", "DetachWorktree": "解開工作目錄連結", + "DetachWorktreeAndDeleteBranch": "中斷工作樹並刪除分支", + "DetachWorktreeAndDeleteBothBranches": "中斷工作樹並刪除本機與遠端分支", "DetachingWorktree": "正在解除工作目錄連結", "WorktreesTitle": "工作目錄", "WorktreeTitle": "工作目錄", - "RemoveWorktreePrompt": "是否刪除 {{.worktreeName}} 工作目錄？", + "ForceRemoveWorktreePrompt": "'{{.worktreeName}}' 包含已修改或未跟蹤的檔案，或子模組（或包含所有這些）。確定要移除它嗎？", "RemovingWorktree": "正在刪除工作目錄", "AddingWorktree": "正在建立工作目錄", "CantDeleteCurrentWorktree": "無法刪除當前工作目錄！", @@ -537,58 +894,99 @@ "CantDeleteMainWorktree": "無法刪除主要工作目錄！", "NoWorktreesThisRepo": "無工作目錄", "MissingWorktree": "（失蹤）", + "MainWorktree": "（主工作樹）", + "NewWorktree": "新建工作樹", "NewWorktreePath": "工作目錄路徑", - "NewWorktreeBase": "工作目錄來源", + "RemoveWorktreeTooltip": "刪除選定的工作樹。這將刪除工作樹的目錄以及 .git 目錄中有關工作樹的後設資料。", "NewBranchName": "分支名稱", - "NewBranchNameLeaveBlank": "分支名稱（留空將檢出 {{.default}}）", - "ViewWorktreeOptions": "檢視工作目錄選項", - "CreateWorktreeFrom": "從 {{.ref}} 建立工作目錄", - "CreateWorktreeFromDetached": "從 {{.ref}} 建立工作目錄（未連結）", + "NewWorktreeName": "新增工作樹名稱", + "NewWorktreeForBranchTitle": "為分支新增工作樹", + "NewBranchAndWorktreeName": "新增分支與工作樹名稱", + "NewBranchAndWorktreeFromRef": "從 '{{.ref}}' 建立新分支與工作樹", + "NewLocalBranchAndWorktreeFromRef": "從 '{{.ref}}' 建立新本機分支與工作樹", + "WorktreeForRef": "為 '{{.ref}}' 新增工作樹", + "DetachedWorktreeAtRef": "在 '{{.ref}}' 建立新的分離工作樹", + "WorktreeLocationTitle": "工作樹位置", + "WorktreeLocationOther": "其他…", + "WorktreeLocationPromptNewBranch": "從 '{{.base}}' 建立新分支 '{{.name}}'：", + "WorktreeLocationPromptTrackingBranch": "建立追蹤 '{{.ref}}' 的新分支 '{{.name}}'：", + "WorktreeLocationPromptCheckout": "分支 '{{.branchName}}' 的工作樹：", + "WorktreeLocationPromptDetached": "在 '{{.ref}}' 建立分離工作樹：", "LcWorktree": "工作目錄", "ChangingDirectoryTo": "切換至 {{.path}}", + "DirenvApprovalTitle": "允許 .envrc？", + "DirenvApprovalPrompt": "按 {{.confirmKey}} 執行 'direnv allow' 並載入環境。\n按 {{.cancelKey}} 跳過。\n\n{{.content}}", "Name": "名稱", "Branch": "分支", "Path": "路徑", "MarkedBaseCommitStatus": "為了變基已標注基準提交", "MarkAsBaseCommit": "為了變基已標注提交為基準提交", "MarkAsBaseCommitTooltip": "請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。", + "CancelMarkedBaseCommit": "取消標記的基礎提交", "MarkedCommitMarker": "↑↑↑ 將由此變基 ↑↑↑", + "FailedToOpenURL": "開啟URL %s 失敗。\n\n錯誤：%v", + "InvalidLazygitEditURL": "無效的lazygit-edit URL格式：%s", "NoCopiedCommits": "未複製提交", "DisabledMenuItemPrefix": "已停用：", "QuickStartInteractiveRebase": "開始互動變基", + "QuickStartInteractiveRebaseTooltip": "為分支上的提交啟動互動式變基。這將包括從 HEAD 提交到第一個合併提交或主分支提交的所有提交。\n如果您想從所選提交啟動互動式變基，請按 `{{.editKey}}`。", + "CannotQuickStartInteractiveRebase": "無法啟動互動式變基：HEAD 提交是合併提交或存在於主分支上，因此沒有適當的主提交來啟動變基。您可以透過選擇提交併按 `{{.editKey}}` 從特定提交啟動互動式變基。", "ToggleRangeSelect": "切換拖曳選擇", + "DismissRangeSelect": "取消範圍選擇", + "RangeSelectUp": "向上擴充套件選擇範圍", + "RangeSelectDown": "向下擴充套件選擇範圍", + "RangeSelectNotSupported": "該操作不支援範圍選擇，請選擇單個專案", + "NoItemSelected": "沒有條目被選中", + "SelectedItemIsNotABranch": "選中的條目不是一個分支", + "SelectedItemDoesNotHaveFiles": "選中的條目中沒有", + "MultiSelectNotSupportedForSubmodules": "子模組不支援多選操作", + "NothingToStageForSubmodule": "沒有可暫存的內容：父儲存庫只能暫存新的子模組提交，無法暫存子模組內尚未提交的變更。請先在子模組內提交。", + "CommandDoesNotSupportOpeningInEditor": "該命令不支援切換到編輯器", + "CustomCommands": "自定義命令", + "NoApplicableCommandsInThisContext": "(目前上下文無可用命令)", + "SelectCommitsOfCurrentBranch": "選擇目前分支的提交", "Actions": { "CheckoutCommit": "檢出提交", + "CheckoutBranchAtCommit": "檢出分支 '%s'", + "CheckoutCommitAsDetachedHead": "將提交 %s 檢出為分離 HEAD", "CheckoutTag": "檢出標籤", "CheckoutBranch": "檢出分支", + "CheckoutBranchOrCommit": "檢出分支或提交", "ForceCheckoutBranch": "強制檢出分支", "DeleteLocalBranch": "刪除本地分支", "Merge": "合併", + "SquashMerge": "壓縮合併", "RebaseBranch": "變基分支", "RenameBranch": "重新命名分支", "CreateBranch": "建立分支", "FastForwardBranch": "快進分支", + "AutoForwardBranches": "自動快轉分支", "CherryPick": "（Cherry-pick）複製提交", "CheckoutFile": "檢出檔案", "SquashCommitDown": "下列次方執行 Squash", "FixupCommit": "修復提交", + "FixupCommitKeepMessage": "Fixup 提交（保留訊息）", "RewordCommit": "改寫提交", "DropCommit": "捨棄提交", "EditCommit": "編輯提交", "AmendCommit": "修改提交", "ResetCommitAuthor": "重設提交作者", "SetCommitAuthor": "設置提交作者", + "AddCommitCoAuthor": "新增提交共同作者", "RevertCommit": "還原提交", "CreateFixupCommit": "建立修改提交", "SquashAllAboveFixupCommits": "Squash 所有上面的修改提交", "MoveCommitUp": "上移提交", "MoveCommitDown": "下移提交", "CopyCommitMessageToClipboard": "將提交訊息複製到剪貼簿", + "CopyCommitMessageBodyToClipboard": "複製提交訊息內文到剪貼簿", + "CopyCommitSubjectToClipboard": "複製提交主旨到剪貼簿", "CopyCommitDiffToClipboard": "將提交差異複製到剪貼簿", "CopyCommitHashToClipboard": "將提交 hash 複製到剪貼簿", "CopyCommitURLToClipboard": "將提交 URL 複製到剪貼簿", "CopyCommitAuthorToClipboard": "將提交作者複製到剪貼簿", "CopyCommitAttributeToClipboard": "複製到剪貼簿", + "CopyCommitTagsToClipboard": "複製提交標籤到剪貼簿", "CopyPatchToClipboard": "將補丁複製到剪貼簿", "CustomCommand": "自定義命令", "DiscardAllChangesInFile": "捨棄檔案中的所有更改", @@ -598,6 +996,14 @@ "UnstageFile": "取消預存檔案", "UnstageAllFiles": "取消預存所有檔案", "StageAllFiles": "預存所有檔案", + "ResolveConflictByKeepingFile": "保留檔案以解決衝突", + "ResolveConflictByDeletingFile": "刪除檔案以解決衝突", + "TakeCurrentSubmoduleCommit": "採用目前提交以解決子模組衝突", + "TakeIncomingSubmoduleCommit": "採用傳入提交以解決子模組衝突", + "NotEnoughContextToStage": "差異內容大小為 0 時無法暫存或取消暫存變更。請使用 '%s' 增加內容。", + "NotEnoughContextToDiscard": "差異內容大小為 0 時無法捨棄變更。請使用 '%s' 增加內容。", + "NotEnoughContextToRemoveLines": "差異內容大小為 0 時無法從提交移除行。請使用 '%s' 增加內容。", + "NotEnoughContextForCustomPatch": "差異內容大小為 0 時無法建立自訂修補程式。請使用 '%s' 增加內容。", "IgnoreExcludeFile": "忽略或排除檔案", "IgnoreFileErr": "無法忽略 .gitignore 檔案", "ExcludeFile": "排除檔案", @@ -622,10 +1028,14 @@ "DeleteRemoteBranch": "刪除遠端分支", "SetBranchUpstream": "設置遠端分支", "AddRemote": "添加遠端", + "AddForkRemote": "新增 fork 遠端", "RemoveRemote": "移除遠端", "UpdateRemote": "更新遠端", "ApplyPatch": "套用補丁", "Stash": "收藏 (Stash)", + "PopStash": "彈出儲藏", + "ApplyStash": "套用儲藏", + "DropStash": "捨棄儲藏", "RenameStash": "重命名暫存", "RemoveSubmodule": "移除子模塊", "ResetSubmodule": "重設子模塊", @@ -635,10 +1045,12 @@ "BulkInitialiseSubmodules": "批量初始化子模塊", "BulkUpdateSubmodules": "批量更新子模塊", "BulkDeinitialiseSubmodules": "批量取消初始化子模塊", + "BulkUpdateRecursiveSubmodules": "批次遞迴初始化並更新子模組", "UpdateSubmodule": "更新子模塊", "CreateLightweightTag": "建立輕量標籤", "CreateAnnotatedTag": "建立附註標籤", "DeleteLocalTag": "刪除本地標籤", + "DeleteRemoteTag": "刪除遠端標籤", "PushTag": "推送標籤", "NukeWorkingTree": "清空工作樹", "DiscardUnstagedFileChanges": "放棄未預存的檔案更改", @@ -656,23 +1068,57 @@ "StartBisect": "開始二分查找", "ResetBisect": "重設二分查找", "BisectSkip": "二分查找跳過", - "BisectMark": "二分查找標記" + "BisectMark": "二分查找標記", + "AddWorktree": "新增工作樹" }, "Bisect": { "MarkStart": "將 %s 標記為 %s（開始二分查找）", "ResetTitle": "重設 `git bisect`", "ResetPrompt": "是否重設 `git bisect`？", "ResetOption": "重設二分查找", + "ChooseTerms": "選擇二分搜尋術語", + "OldTermPrompt": "舊／良好提交的術語：", + "NewTermPrompt": "新／有問題提交的術語：", "BisectMenuTitle": "二分查找", "Mark": "將 %s 標記為 %s", "SkipCurrent": "跳過 %s", + "SkipSelected": "略過所選提交（%s）", "CompleteTitle": "二分查找完成", "CompletePrompt": "二分查找完成！以下提交引入了更改：\n\n%s\n\n是否重設 `git bisect` ？", "CompletePromptIndeterminate": "二分查找完成！有一些提交被跳過，因此以下任何提交皆可能引進更改：\n\n%s\n\n是否重設 `git bisect`？", "Bisecting": "二分查找中" }, "Log": { - "CopyToClipboard": "{{.str}} 已複製" + "EditRebase": "開始在 '{{.ref}}' 進行互動式 rebase", + "HandleUndo": "正在復原上一次衝突解決", + "RemoveFile": "正在刪除路徑 '{{.path}}'", + "RemoveEmptyDir": "正在刪除空目錄 '{{.path}}'", + "CopyToClipboard": "{{.str}} 已複製", + "Remove": "正在移除 '{{.filename}}'", + "CreateFileWithContent": "正在建立檔案 '{{.path}}'", + "AppendingLineToFile": "正在將 '{{.line}}' 附加至檔案 '{{.filename}}'", + "EditRebaseFromBaseCommit": "從 '{{.baseCommit}}' 開始，對 '{{.targetBranchName}}' 進行互動式 rebase", + "DroppingStash": "正在刪除儲藏 %s", + "PoppingStash": "正在彈出儲藏 %s", + "DeletingBranch": "正在刪除分支 '{{.branchName}}'（原為 {{.hash}}）" }, - "BreakingChangesByVersion": {} + "BreakingChangesTitle": "重大變化", + "BreakingChangesMessage": "你正在將 lazygit 更新至包含破壞性變更的新版本。請閱讀下列說明，並視需要更新設定。\n如需更多資訊，請查看完整的發行說明：.", + "BreakingChangesByVersion": { + "0.41.0": "- 按 'g' 開啟 git reset 選單時，'mixed' 選項現在是第一個也是預設選項，取代 'soft'。這是因為 'mixed' 最常使用。\n- 提交訊息面板現在預設會自動硬換行（也就是到達邊界時加上換行字元）。可如下調整設定：\n\ngit:\n commit:\n autoWrapCommitMessage: true\n autoWrapWidth: 72\n\n- 'v' 鍵原本只能在暫存檢視中用於開始範圍選取，現在任何檢視皆可使用。可惜這會和用來貼上提交（cherry-pick）的 'v' 快速鍵衝突，因此現在改用 'shift+V' 貼上提交；為求一致，複製提交也改用 'shift+C'，不再只是 'c'。請注意，'v' 快速鍵只是開始範圍選取的方法之一：也可使用 shift+向上／向下箭頭。如果想設定 cherry-pick 快速鍵來恢復舊行為，請在設定中加入：\n\nkeybinding:\n universal:\n toggleRangeSelect: \n commits:\n cherryPickCopy: 'c'\n pasteCommits: 'v'\n\n- 使用 'shift-S' 壓縮 fixup 現在會開啟選單；預設選項是壓縮分支中的所有 fixup 提交。原本只壓縮所選提交上方 fixup 提交的行為，仍可在該選單中以第二個選項使用。\n- push／pull／fetch 的載入狀態現在顯示在分支旁，而非彈出式視窗中。這讓你可以同時 fetch 多個分支，並查看每個分支的狀態。\n- 提交檢視中的 git 日誌圖現在預設一律顯示（之前只有在檢視最大化時才顯示）。若覺得太雜亂，可透過 ctrl+L -> 'Show git graph' -> 'when maximised' 改回原設定。\n- 在遠端分支按空白鍵，原本會顯示提示，要求輸入要從遠端分支檢出之新本機分支的名稱。現在會直接檢出遠端分支，讓你選擇建立同名的新本機分支，或使用分離的 HEAD。舊行為仍可透過 'n' 快速鍵使用。\n- 篩選（例如按 '/'）現在預設模糊程度較低；它只會比對子字串。可用空白分隔多個子字串來比對。若想恢復舊行為，請在設定中加入：\n\ngui:\n filterMode: 'fuzzy'\n", + "0.44.0": "- gui.branchColors 設定選項已棄用，將在未來版本移除。請改用 gui.branchColorPatterns。\n- 以 \"feature/\"、\"bugfix/\" 或 \"hotfix/\" 開頭的分支不再自動著色；若需要此功能，可透過新的 gui.branchColorPatterns 選項輕鬆設定。", + "0.49.0": "- 執行 shell 指令（使用 ':' 提示）不再使用互動式 shell；因此若想在此提示中使用 shell 別名，需要進行一些設定。詳情請見 https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#using-aliases-or-functions-in-shell-commands", + "0.50.0": "- fetch 後，若主分支落後其 upstream，現在會自動快轉至 upstream。這有助於讓 main 或 master 分支自動保持最新。若不需要此功能，可在設定中加入：\n\ngit:\n autoForwardBranches: none\n\n反之，若連 feature 分支也要使用此功能，可改設為 'allBranches'。", + "0.51.0": "- 自訂指令的 'subprocess'、'stream' 與 'showOutput' 欄位已由單一 'output' 欄位取代。這應可無縫處理；若曾在設定檔使用這些欄位，應已自動為你更新。不過有一項明顯變更：'stream' 欄位原本同時表示指令輸出會串流至指令日誌，以及指令會在虛擬終端機（pty）中執行。我們將其轉換為 'output: log'，代表指令輸出會串流至指令日誌，但不會使用 pty，因為大多數人需要的應是這種行為。若確實要在 pty 中執行指令，可改用 'output: logWithPty'。", + "0.54.0": "- 本機與遠端分支的預設排序順序已變更：本機分支原為 'recency'（以 reflog 為依據），遠端分支原為 'alphabetical'。兩者現在都改為 'date'（即 committerdate）。若較喜歡舊預設值，可透過以下設定還原：\n\ngit:\n localBranchSortOrder: recency\n remoteBranchSortOrder: alphabetical\n\n- 暫存檢視與自訂修補程式建立檢視的預設選取模式已改為區塊模式。在大多數情況下這更實用，通常可省下許多按鍵操作。若要改回舊的行模式預設值，可在設定中加入：\n\ngui:\n useHunkModeInStagingView: false\n", + "0.55.0": "- 原本綁定 ctrl-z 的 'redo' 指令現在改綁定 shift-Z。這是因為 ctrl-z 現在用於暫停應用程式；在 Linux 世界中這是廣為人知的快速鍵。若想還原此變更，可在設定中加入：\n\nkeybinding:\n universal:\n suspendApp: \n redo: \n\n- 'git.paging.useConfig' 選項已移除。若原先依賴它設定 pager，必須改用 'git.diffRenderers.*.command' 選項明確設定指令。", + "0.62.0": "- 從提交說明編輯器送出提交的預設快速鍵，已從 alt-enter 改為 Mac 上的 command-enter，或 Linux 與 Windows 上的 ctrl-enter；這些也是許多多行編輯欄位（例如 GitHub 留言）使用的相同快速鍵。可惜不是所有終端機都支援它們；詳情請見 https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md#terminal-compatibility\n若想還原此變更，可在設定中加入：\n\nkeybinding:\n universal:\n confirmInEditor: [, ]\n" + }, + "ViewMergeConflictOptions": "檢視合併衝突選項", + "ViewMergeConflictOptionsTooltip": "檢視用於解決合併衝突的選項。", + "NoFilesWithMergeConflicts": "沒有存在合併衝突的檔案。", + "MergeConflictOptionsTitle": "解決合併衝突", + "UseCurrentChanges": "使用目前更改", + "UseIncomingChanges": "使用傳入的更改", + "UseBothChanges": "兩者都用" } diff --git a/pkg/integration/README.md b/pkg/integration/README.md index 0c50d8f4e..d3b753f06 100644 --- a/pkg/integration/README.md +++ b/pkg/integration/README.md @@ -2,21 +2,21 @@ The pkg/integration package is for integration testing: that is, actually running a real lazygit session and having a robot pretend to be a human user and then making assertions that everything works as expected. -TL;DR: integration tests live in pkg/integration/tests. Run integration tests with: +TL;DR: integration tests live in pkg/integration/tests, and we run them through the [`just`](https://github.com/casey/just) recipes in the repo's `justfile`. Run the whole suite headlessly with: ```sh -go run cmd/integration_test/main.go tui +just e2e ``` -or +or open a terminal UI to browse and run individual tests with: ```sh -go run cmd/integration_test/main.go cli [--slow or --sandbox] [testname or testpath...] +just e2e-tui ``` ## Writing tests -The tests live in pkg/integration/tests. Each test is registered in `pkg/integration/tests/test_list.go` which is an auto-generated file. You can re-generate that file by running `go generate ./...` at the root of the Lazygit repo. +The tests live in pkg/integration/tests. Each test is registered in `pkg/integration/tests/test_list.go` which is an auto-generated file. You can re-generate that file by running `just generate` at the root of the Lazygit repo. Each test has two important steps: the setup step and the run step. @@ -38,19 +38,18 @@ The run step has two arguments passed in: ## Running tests -There are three ways to invoke a test: +We drive the integration tests through the [`just`](https://github.com/casey/just) recipes in the repo's `justfile`, so you'll want `just` installed to run them as described here. (The recipes are thin wrappers, so if you can't install `just`, the underlying commands are right there in the `justfile`.) -1. go run cmd/integration_test/main.go cli [--slow or --sandbox] [testname or testpath...] -2. go run cmd/integration_test/main.go tui -3. go test pkg/integration/clients/*.go +- `just e2e` — run the whole suite headlessly, with no visible UI. This is what CI does, and the fastest way to run everything. +- `just e2e ` — run a single test headlessly, e.g. `just e2e commit/new_branch`; the fastest way to run one test. You can pass several names at once, or a full file path like `pkg/integration/tests/commit/new_branch.go`. +- `just e2e-cli [--slow|--sandbox|--debug] ` — run a single test in a *visible* lazygit UI, so you can watch it (see slow mode below, and sandbox mode and debugging in the following sections). +- `just e2e-tui` — open a terminal UI for browsing and running tests; the easiest way to find and run a test without having to type its name. -The first, the test runner, is for directly running a test from the command line. If you pass no arguments, it runs all tests. -The second, the TUI, is for running tests from a terminal UI where it's easier to find a test and run it without having to copy it's name and paste it into the terminal. This is the easiest approach by far. -The third, the go-test command, intended only for use in CI, to be run along with the other `go test` tests. This runs the tests in headless mode so there's no visual output. +The name of a test is based on its path, so the name of the test at `pkg/integration/tests/commit/new_branch.go` is `commit/new_branch`. -The name of a test is based on its path, so the name of the test at `pkg/integration/tests/commit/new_branch.go` is commit/new_branch. So to run it with our test runner you would run `go run cmd/integration_test/main.go cli commit/new_branch`. +zsh users can get tab-completion of these test names — `just e2e sub` expands to `submodule/…` — by sourcing `scripts/just_e2e_completion.zsh` from their `.zshrc`; see the comment at the top of that file for details. -You can pass the INPUT_DELAY env var to the test runner in order to set a delay in milliseconds between keypresses or mouse clicks, which helps for watching a test at a realistic speed to understand what it's doing. Or you can pass the '--slow' flag which sets a pre-set 'slow' key delay. In the tui you can press 't' to run the test in slow mode. +To watch a test run at a realistic speed, pass `--slow` to `just e2e-cli`; it sets a pre-set delay between keypresses and mouse clicks. For finer control, set the `INPUT_DELAY` env var to a number of milliseconds instead, e.g. `INPUT_DELAY=200 just e2e-cli commit/new_branch`. In the TUI you can press 't' to run a test in slow mode. The resultant repo will be stored in `test/_results`, so if you're not sure what went wrong you can go there and inspect the repo. @@ -67,8 +66,8 @@ The test will run in a VSCode terminal: Debugging an integration test is possible in two ways: -1. Use the -debug option of the integration test runner's "cli" command, e.g. `go run cmd/integration_test/main.go cli -debug tag/reset.go` -2. Select a test in the "tui" runner and hit "d" to debug it. +1. Pass `--debug` to `just e2e-cli`, e.g. `just e2e-cli --debug tag/reset`. +2. Select a test in `just e2e-tui` and hit "d" to debug it. In both cases the test runner will print to the console that it is waiting for a debugger to attach, so now you need to tell your debugger to attach to a running process with the name "test_lazygit". If you are using Visual Studio Code, an easy way to do that is to use the "Attach to integration test runner" debug configuration. The test runner will resume automatically when it detects that a debugger was attached. Don't forget to set a breakpoint in the code that you want to step through, otherwise the test will just finish (i.e. it doesn't stop in the debugger automatically). @@ -76,7 +75,7 @@ In both cases the test runner will print to the console that it is waiting for a Say you want to do a manual test of how lazygit handles merge-conflicts, but you can't be bothered actually finding a way to create merge conflicts in a repo. To make your life easier, you can simply run a merge-conflicts test in sandbox mode, meaning the setup step is run for you, and then instead of the test driving the lazygit session, you're allowed to drive it yourself. -To run a test in sandbox mode you can press 's' on a test in the test TUI or in the test runner pass the --sandbox argument. +To run a test in sandbox mode, press 's' on a test in `just e2e-tui`, or pass `--sandbox` to `just e2e-cli`, e.g. `just e2e-cli --sandbox conflicts/resolve_multiple_files`. ## Tips for writing tests diff --git a/pkg/integration/clients/go_test.go b/pkg/integration/clients/go_test.go index 211e73d28..4c1faa557 100644 --- a/pkg/integration/clients/go_test.go +++ b/pkg/integration/clients/go_test.go @@ -11,7 +11,9 @@ import ( "io" "os" "os/exec" + "syscall" "testing" + "time" "github.com/creack/pty" "github.com/jesseduffield/lazycore/pkg/utils" @@ -28,6 +30,7 @@ func TestIntegration(t *testing.T) { parallelTotal := tryConvert(os.Getenv("PARALLEL_TOTAL"), 1) parallelIndex := tryConvert(os.Getenv("PARALLEL_INDEX"), 0) raceDetector := os.Getenv("LAZYGIT_RACE_DETECTOR") != "" + logTimingsPath := os.Getenv("LAZYGIT_TEST_TIMING") // LAZYGIT_GOCOVERDIR is the directory where we write coverage files to. If this directory // is defined, go binaries built with the -cover flag will write coverage files to // to it. @@ -56,7 +59,8 @@ func TestIntegration(t *testing.T) { CodeCoverageDir: codeCoverageDir, InputDelay: 0, // Allow two attempts at each test to get around flakiness - MaxAttempts: 2, + MaxAttempts: 1, + LogTimingsPath: logTimingsPath, }) assert.NoError(t, err) @@ -75,6 +79,17 @@ func runCmdHeadless(cmd *exec.Cmd) (int, error) { stderr := new(bytes.Buffer) cmd.Stderr = stderr + // If lazygit exits but leaves behind a subprocess that inherited its stderr + // pipe, cmd.Wait blocks waiting for that pipe to reach EOF for as long as the + // subprocess stays alive. Unbounded, that hangs the whole test binary until + // its global timeout fires, and the timeout throws away whatever lazygit + // wrote to stderr before exiting (a panic, a -race report) -- the very output + // needed to diagnose the failure. WaitDelay caps the wait: once the process + // has exited, Wait gives the stderr goroutine at most this long to drain, + // then closes the pipe and returns ErrWaitDelay, so the captured stderr + // surfaces as the test error instead of being lost. + cmd.WaitDelay = 5 * time.Second + // these rows and columns are ignored because internally we use tcell's // simulation screen. However we still need the pty for the sake of // running other commands in a pty. @@ -83,12 +98,32 @@ func runCmdHeadless(cmd *exec.Cmd) (int, error) { return -1, err } + // pty.StartWithSize starts lazygit in its own process group, so we can signal + // the whole group at once. Capture the id now, while the process is alive: + // once Wait has reaped it we can no longer look it up. + pgid, pgidErr := syscall.Getpgid(cmd.Process.Pid) + _, _ = io.Copy(io.Discard, f) - if cmd.Wait() != nil { + waitErr := cmd.Wait() + + // On any failure -- including a WaitDelay expiry caused by a leaked + // subprocess -- kill the whole process group so a straggler can't linger and + // wedge a later test or pile up across a CI run. Best effort: usually the + // group is already gone (ESRCH), and a subprocess that called setsid to + // detach into its own group is out of reach, but WaitDelay still unblocks us. + if waitErr != nil && pgidErr == nil { + _ = syscall.Kill(-pgid, syscall.SIGKILL) + } + + if waitErr != nil { _ = f.Close() - // return an error with the stderr output - return cmd.Process.Pid, errors.New(stderr.String()) + // Prefer lazygit's own stderr as the error; fall back to the wait error + // itself (e.g. ErrWaitDelay) when it exited without printing anything. + if stderr.Len() > 0 { + return cmd.Process.Pid, errors.New(stderr.String()) + } + return cmd.Process.Pid, waitErr } return cmd.Process.Pid, f.Close() diff --git a/pkg/integration/clients/tui.go b/pkg/integration/clients/tui.go index 13b03726e..0f07b5b19 100644 --- a/pkg/integration/clients/tui.go +++ b/pkg/integration/clients/tui.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazycore/pkg/utils" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/integration/components" @@ -43,7 +43,7 @@ func RunTUI(raceDetector bool) { g.SetManagerFunc(app.layout) - if err := g.SetKeybinding("list", gocui.KeyArrowUp, gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyName(gocui.KeyArrowUp), func(*gocui.Gui, *gocui.View) error { if app.itemIdx > 0 { app.itemIdx-- } @@ -53,11 +53,9 @@ func RunTUI(raceDetector bool) { } listView.FocusPoint(0, app.itemIdx, true) return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", gocui.KeyArrowDown, gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyName(gocui.KeyArrowDown), func(*gocui.Gui, *gocui.View) error { if app.itemIdx < len(app.filteredTests)-1 { app.itemIdx++ } @@ -68,19 +66,13 @@ func RunTUI(raceDetector bool) { } listView.FocusPoint(0, app.itemIdx, true) return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", gocui.KeyCtrlC, gocui.ModNone, quit); err != nil { - log.Panicln(err) - } + g.SetKeybinding("list", gocui.NewKeyStrMod("c", gocui.ModCtrl), quit) - if err := g.SetKeybinding("list", 'q', gocui.ModNone, quit); err != nil { - log.Panicln(err) - } + g.SetKeybinding("list", gocui.NewKeyRune('q'), quit) - if err := g.SetKeybinding("list", 's', gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyRune('s'), func(*gocui.Gui, *gocui.View) error { currentTest := app.getCurrentTest() if currentTest == nil { return nil @@ -89,11 +81,9 @@ func RunTUI(raceDetector bool) { suspendAndRunTest(currentTest, true, false, raceDetector, 0) return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", gocui.KeyEnter, gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyName(gocui.KeyEnter), func(*gocui.Gui, *gocui.View) error { currentTest := app.getCurrentTest() if currentTest == nil { return nil @@ -102,11 +92,9 @@ func RunTUI(raceDetector bool) { suspendAndRunTest(currentTest, false, false, raceDetector, 0) return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", 't', gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyRune('t'), func(*gocui.Gui, *gocui.View) error { currentTest := app.getCurrentTest() if currentTest == nil { return nil @@ -115,11 +103,9 @@ func RunTUI(raceDetector bool) { suspendAndRunTest(currentTest, false, false, raceDetector, SLOW_INPUT_DELAY) return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", 'd', gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyRune('d'), func(*gocui.Gui, *gocui.View) error { currentTest := app.getCurrentTest() if currentTest == nil { return nil @@ -128,11 +114,9 @@ func RunTUI(raceDetector bool) { suspendAndRunTest(currentTest, false, true, raceDetector, 0) return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", 'o', gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyRune('o'), func(*gocui.Gui, *gocui.View) error { currentTest := app.getCurrentTest() if currentTest == nil { return nil @@ -144,11 +128,9 @@ func RunTUI(raceDetector bool) { } return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", 'O', gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyRune('O'), func(*gocui.Gui, *gocui.View) error { currentTest := app.getCurrentTest() if currentTest == nil { return nil @@ -160,11 +142,9 @@ func RunTUI(raceDetector bool) { } return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("list", '/', gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("list", gocui.NewKeyRune('/'), func(*gocui.Gui, *gocui.View) error { app.filtering = true if _, err := g.SetCurrentView("editor"); err != nil { return err @@ -176,12 +156,10 @@ func RunTUI(raceDetector bool) { editorView.Clear() return nil - }); err != nil { - log.Panicln(err) - } + }) // not using the editor yet, but will use it to help filter the list - if err := g.SetKeybinding("editor", gocui.KeyEsc, gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("editor", gocui.NewKeyName(gocui.KeyEsc), func(*gocui.Gui, *gocui.View) error { app.filtering = false if _, err := g.SetCurrentView("list"); err != nil { return err @@ -194,11 +172,9 @@ func RunTUI(raceDetector bool) { app.editorView.Reset() return nil - }); err != nil { - log.Panicln(err) - } + }) - if err := g.SetKeybinding("editor", gocui.KeyEnter, gocui.ModNone, func(*gocui.Gui, *gocui.View) error { + g.SetKeybinding("editor", gocui.NewKeyName(gocui.KeyEnter), func(*gocui.Gui, *gocui.View) error { app.filtering = false if _, err := g.SetCurrentView("list"); err != nil { @@ -208,9 +184,7 @@ func RunTUI(raceDetector bool) { app.renderTests() return nil - }); err != nil { - log.Panicln(err) - } + }) err = g.MainLoop() g.Close() @@ -273,9 +247,9 @@ func (self *app) renderTests() { } } -func (self *app) wrapEditor(f func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool) func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool { - return func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool { - matched := f(v, key, ch, mod) +func (self *app) wrapEditor(f func(v *gocui.View, key gocui.Key) bool) func(v *gocui.View, key gocui.Key) bool { + return func(v *gocui.View, key gocui.Key) bool { + matched := f(v, key) if matched { self.filterWithString(v.TextArea.GetContent()) } diff --git a/pkg/integration/components/assertion_helper.go b/pkg/integration/components/assertion_helper.go index 0529e8bec..0a1d97b8c 100644 --- a/pkg/integration/components/assertion_helper.go +++ b/pkg/integration/components/assertion_helper.go @@ -1,9 +1,13 @@ package components import ( + "time" + integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types" ) +const eventuallyTimeout = 2 * time.Second + type assertionHelper struct { gui integrationTypes.GuiDriver } @@ -24,6 +28,21 @@ func (self *assertionHelper) assertWithRetries(test func() (bool, string)) { } } +func (self *assertionHelper) assertEventually(test func() (bool, string)) { + deadline := time.Now().Add(eventuallyTimeout) + for { + ok, message := test() + if ok { + return + } + if time.Now().After(deadline) { + self.fail(message) + return + } + time.Sleep(10 * time.Millisecond) + } +} + func (self *assertionHelper) fail(message string) { self.gui.Fail(message) } diff --git a/pkg/integration/components/commit_description_panel_driver.go b/pkg/integration/components/commit_description_panel_driver.go index 905080380..6281e756b 100644 --- a/pkg/integration/components/commit_description_panel_driver.go +++ b/pkg/integration/components/commit_description_panel_driver.go @@ -37,12 +37,12 @@ func (self *CommitDescriptionPanelDriver) GoToBeginning() *CommitDescriptionPane self.t.pressFast("") } - self.t.pressFast("") + self.t.pressFast("") return self } func (self *CommitDescriptionPanelDriver) AddCoAuthor(author string) *CommitDescriptionPanelDriver { - self.t.press(self.t.keys.CommitMessage.CommitMenu) + self.t.press(self.t.keys.CommitMessage.CommitMenu[0]) self.t.ExpectPopup().Menu().Title(Equals("Commit Menu")). Select(Contains("Add co-author")). Confirm() diff --git a/pkg/integration/components/commit_message_panel_driver.go b/pkg/integration/components/commit_message_panel_driver.go index 047cc59b1..f24950f13 100644 --- a/pkg/integration/components/commit_message_panel_driver.go +++ b/pkg/integration/components/commit_message_panel_driver.go @@ -73,6 +73,6 @@ func (self *CommitMessagePanelDriver) SelectNextMessage() *CommitMessagePanelDri } func (self *CommitMessagePanelDriver) OpenCommitMenu() *CommitMessagePanelDriver { - self.t.press(self.t.keys.CommitMessage.CommitMenu) + self.t.press(self.t.keys.CommitMessage.CommitMenu[0]) return self } diff --git a/pkg/integration/components/common.go b/pkg/integration/components/common.go index 2d62e9ea3..f338be52f 100644 --- a/pkg/integration/components/common.go +++ b/pkg/integration/components/common.go @@ -38,6 +38,14 @@ func (self *Common) AbortMerge() { Confirm() } +// PretendMergeOrRebaseStartedInLazygit tells lazygit to treat the in-progress +// rebase/merge/etc. as one that it started, so that it will prompt to continue +// once the conflicts are resolved. Use it when a test sets up an operation by +// running git directly rather than through lazygit's UI. +func (self *Common) PretendMergeOrRebaseStartedInLazygit() { + self.t.gui.PretendMergeOrRebaseStartedInLazygit() +} + func (self *Common) AcknowledgeConflicts() { self.t.ExpectPopup().Menu(). Title(Equals("Conflicts!")). diff --git a/pkg/integration/components/env.go b/pkg/integration/components/env.go index e7a8a6941..39152092e 100644 --- a/pkg/integration/components/env.go +++ b/pkg/integration/components/env.go @@ -3,6 +3,8 @@ package components import ( "fmt" "os" + + "github.com/samber/lo" ) const ( @@ -43,11 +45,9 @@ var hostEnvironmentAllowlist = [...]string{ // Returns a copy of the environment filtered by // hostEnvironmentAllowlist func allowedHostEnvironment() []string { - env := []string{} - for _, envVar := range hostEnvironmentAllowlist { - env = append(env, fmt.Sprintf("%s=%s", envVar, os.Getenv(envVar))) - } - return env + return lo.Map(hostEnvironmentAllowlist[:], func(envVar string, _ int) string { + return fmt.Sprintf("%s=%s", envVar, os.Getenv(envVar)) + }) } func NewTestEnvironment(rootDir string) []string { @@ -61,5 +61,10 @@ func NewTestEnvironment(rootDir string) []string { // versions >= 2.32.0 env = append(env, fmt.Sprintf("%s=%s", GIT_CONFIG_GLOBAL_ENV_VAR, globalGitConfigPath(rootDir))) + // Disable gh telemetry. It was enabled by default in gh 2.91.0, and + // this would cause gh config files to be left in the working tree + // (e.g. `test/.local/state/gh/device-id`). + env = append(env, "GH_TELEMETRY=disabled") + return env } diff --git a/pkg/integration/components/menu_driver.go b/pkg/integration/components/menu_driver.go index 95f29dcd3..e0d6133e6 100644 --- a/pkg/integration/components/menu_driver.go +++ b/pkg/integration/components/menu_driver.go @@ -56,8 +56,12 @@ func (self *MenuDriver) ContainsLines(matchers ...*TextMatcher) *MenuDriver { return self } +// types the text into the menu's filter row. Only for menus that filter as you +// type; other menus are filtered through the search prompt. func (self *MenuDriver) Filter(text string) *MenuDriver { - self.getViewDriver().FilterOrSearch(text) + self.getViewDriver().IsFocused() + self.t.typeContent(text) + self.t.Views().MenuFilter().IsVisible() return self } diff --git a/pkg/integration/components/prompt_driver.go b/pkg/integration/components/prompt_driver.go index 2c29dd7c4..1000af007 100644 --- a/pkg/integration/components/prompt_driver.go +++ b/pkg/integration/components/prompt_driver.go @@ -68,7 +68,7 @@ func (self *PromptDriver) SuggestionTopLines(matchers ...*TextMatcher) *PromptDr } func (self *PromptDriver) ConfirmFirstSuggestion() { - self.t.press(self.t.keys.Universal.TogglePanel) + self.t.press(self.t.keys.Universal.TogglePanel[0]) self.t.Views().Suggestions(). IsFocused(). SelectedLineIdx(0). @@ -76,7 +76,7 @@ func (self *PromptDriver) ConfirmFirstSuggestion() { } func (self *PromptDriver) ConfirmSuggestion(matcher *TextMatcher) { - self.t.press(self.t.keys.Universal.TogglePanel) + self.t.press(self.t.keys.Universal.TogglePanel[0]) self.t.Views().Suggestions(). IsFocused(). NavigateToLine(matcher). @@ -84,19 +84,19 @@ func (self *PromptDriver) ConfirmSuggestion(matcher *TextMatcher) { } func (self *PromptDriver) DeleteSuggestion(matcher *TextMatcher) *PromptDriver { - self.t.press(self.t.keys.Universal.TogglePanel) + self.t.press(self.t.keys.Universal.TogglePanel[0]) self.t.Views().Suggestions(). IsFocused(). NavigateToLine(matcher) - self.t.press(self.t.keys.Universal.Remove) + self.t.press(self.t.keys.Universal.Remove[0]) return self } func (self *PromptDriver) EditSuggestion(matcher *TextMatcher) *PromptDriver { - self.t.press(self.t.keys.Universal.TogglePanel) + self.t.press(self.t.keys.Universal.TogglePanel[0]) self.t.Views().Suggestions(). IsFocused(). NavigateToLine(matcher) - self.t.press(self.t.keys.Universal.Edit) + self.t.press(self.t.keys.Universal.Edit[0]) return self } diff --git a/pkg/integration/components/runner.go b/pkg/integration/components/runner.go index 83ddfe66d..098f3f2e9 100644 --- a/pkg/integration/components/runner.go +++ b/pkg/integration/components/runner.go @@ -1,10 +1,13 @@ package components import ( + "errors" "fmt" "os" "os/exec" "path/filepath" + "sync" + "time" lazycoreUtils "github.com/jesseduffield/lazycore/pkg/utils" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" @@ -24,6 +27,12 @@ type RunTestArgs struct { CodeCoverageDir string InputDelay int MaxAttempts int + // If set, each test's run duration is appended to this file (as + // " "). run_integration_tests.sh prints the slowest at + // the end, so slow or anomalous tests can be spotted across CI runs. We + // write to a file rather than stdout/stderr because `go test` captures + // those and only shows them with -v. Empty disables it. + LogTimingsPath string } // This function lets you run tests either from within `go test` or from a regular binary. @@ -47,6 +56,11 @@ func RunTests(args RunTestArgs) error { return err } + // Start each run with a fresh timings file (see RunTestArgs.LogTimingsPath). + if args.LogTimingsPath != "" { + _ = os.Remove(args.LogTimingsPath) + } + for _, test := range args.Tests { args.TestWrapper(test, func() error { paths := NewPaths( @@ -99,7 +113,11 @@ func runTest( return err } + start := time.Now() pid, err := args.RunCmd(cmd) + if args.LogTimingsPath != "" { + logTestTiming(args.LogTimingsPath, test.Name(), time.Since(start)) + } // Print race detector log regardless of the command's exit status if args.RaceDetector { @@ -112,6 +130,23 @@ func runTest( return err } +// timingsMutex serializes appends to the timings file, since tests run in +// parallel. +var timingsMutex sync.Mutex + +func logTestTiming(path, name string, duration time.Duration) { + timingsMutex.Lock() + defer timingsMutex.Unlock() + + f, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644) + if err != nil { + return + } + defer f.Close() + + fmt.Fprintf(f, "%.2f %s\n", duration.Seconds(), name) +} + func prepareTestDir( test *IntegrationTest, paths Paths, @@ -125,9 +160,7 @@ func prepareTestDir( return "", err } - workingDir := createFixture(test, paths, rootDir) - - return workingDir, nil + return createFixture(test, paths, rootDir) } func buildLazygit(testArgs RunTestArgs) error { @@ -148,22 +181,41 @@ func buildLazygit(testArgs RunTestArgs) error { return osCommand.Cmd.New(args).Run() } +// A failing setup step panics with this so that the remaining steps, which +// would only produce follow-on failures, are skipped. +type fixtureFailure string + // Sets up the fixture for test and returns the working directory to invoke // lazygit in. -func createFixture(test *IntegrationTest, paths Paths, rootDir string) string { +func createFixture(test *IntegrationTest, paths Paths, rootDir string) (workingDir string, err error) { + // Tests run as parallel subtests, and a panic escaping one of them takes + // down the whole test binary, discarding every other test's result along + // with it. Report a broken fixture as this test's error instead. + defer func() { + panicValue := recover() + if panicValue == nil { + return + } + failure, ok := panicValue.(fixtureFailure) + if !ok { + panic(panicValue) + } + err = errors.New(string(failure)) + }() + env := NewTestEnvironment(rootDir) env = append(env, fmt.Sprintf("%s=%s", PWD, paths.ActualRepo())) shell := NewShell( paths.ActualRepo(), env, - func(errorMsg string) { panic(errorMsg) }, + func(errorMsg string) { panic(fixtureFailure(errorMsg)) }, ) shell.Init() test.SetupRepo(shell) - return shell.dir + return shell.dir, nil } func testPath(rootdir string) string { @@ -204,14 +256,15 @@ func getLazygitCommand( return nil, err } - cmdArgs := []string{tempLazygitPath(), "-debug", "--use-config-dir=" + paths.Config()} - resolvedExtraArgs := lo.Map(test.ExtraCmdArgs(), func(arg string, _ int) string { return utils.ResolvePlaceholderString(arg, map[string]string{ "actualPath": paths.Actual(), "actualRepoPath": paths.ActualRepo(), }) }) + + cmdArgs := make([]string, 0, 3+len(resolvedExtraArgs)) + cmdArgs = append(cmdArgs, tempLazygitPath(), "-debug", "--use-config-dir="+paths.Config()) cmdArgs = append(cmdArgs, resolvedExtraArgs...) // Use a limited environment for test isolation, including pass through @@ -246,7 +299,11 @@ func getLazygitCommand( cmdObj.AddEnvVars(fmt.Sprintf("GORACE=log_path=%s", raceDetectorLogsPath())) if test.ExtraEnvVars() != nil { for key, value := range test.ExtraEnvVars() { - cmdObj.AddEnvVars(fmt.Sprintf("%s=%s", key, value)) + resolvedValue := utils.ResolvePlaceholderString(value, map[string]string{ + "actualPath": paths.Actual(), + "actualRepoPath": paths.ActualRepo(), + }) + cmdObj.AddEnvVars(fmt.Sprintf("%s=%s", key, resolvedValue)) } } diff --git a/pkg/integration/components/search_driver.go b/pkg/integration/components/search_driver.go index 498047cce..96a706a65 100644 --- a/pkg/integration/components/search_driver.go +++ b/pkg/integration/components/search_driver.go @@ -1,7 +1,7 @@ package components // TODO: soft-code this -const ClearKey = "" +const ClearKey = "" type SearchDriver struct { t *TestDriver diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 2e5fa01ce..72cc3d95c 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -77,7 +77,7 @@ func (self *Shell) RunShellCommand(cmdStr string) *Shell { } cmd := exec.Command(shell, shellArg, cmdStr) - cmd.Env = os.Environ() + cmd.Env = self.env cmd.Dir = self.dir output, err := cmd.CombinedOutput() @@ -256,7 +256,7 @@ func (self *Shell) CreateNCommitsStartingAt(n, startIndex int) *Shell { fmt.Sprintf("file%02d.txt", i), fmt.Sprintf("file%02d content", i), ). - Commit(fmt.Sprintf("commit %02d", i)) + Commit(fmt.Sprintf("commit-%02d", i)) } return self diff --git a/pkg/integration/components/test_driver.go b/pkg/integration/components/test_driver.go index a1775239c..bd5bbfc24 100644 --- a/pkg/integration/components/test_driver.go +++ b/pkg/integration/components/test_driver.go @@ -2,9 +2,9 @@ package components import ( "fmt" + "strings" "time" - "github.com/atotto/clipboard" "github.com/jesseduffield/lazygit/pkg/config" integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types" ) @@ -13,6 +13,8 @@ type TestDriver struct { gui integrationTypes.GuiDriver keys config.KeybindingConfig inputDelay int + mouseX int + mouseY int *assertionHelper shell *Shell } @@ -43,17 +45,88 @@ func (self *TestDriver) pressFast(keyStr string) { self.Wait(self.inputDelay / 5) } +// presses the keys in immediate succession, without waiting for lazygit to +// become idle in between, to simulate a user typing faster than lazygit +// processes the input +func (self *TestDriver) pressRapidly(keyStrs []string) { + self.SetCaption(fmt.Sprintf("Pressing %s", strings.Join(keyStrs, ", "))) + self.gui.PressKeysRapidly(keyStrs...) + self.Wait(self.inputDelay) +} + func (self *TestDriver) click(x, y int) { self.SetCaption(fmt.Sprintf("Clicking %d, %d", x, y)) self.gui.Click(x, y) self.Wait(self.inputDelay) } +func (self *TestDriver) clickAndHold(x, y int) { + self.SetCaption(fmt.Sprintf("Clicking and holding %d, %d", x, y)) + self.mouseX, self.mouseY = x, y + self.gui.ClickAndHold(x, y) + self.Wait(self.inputDelay) +} + +func (self *TestDriver) mouseMove(x, y int) { + self.SetCaption(fmt.Sprintf("Moving mouse to %d, %d", x, y)) + self.mouseX, self.mouseY = x, y + self.gui.MouseMove(x, y) + self.Wait(self.inputDelay) +} + +func (self *TestDriver) repeatMouseMove() { + self.mouseMove(self.mouseX, self.mouseY) +} + +func (self *TestDriver) scrollWheelDown(x, y int) { + self.SetCaption(fmt.Sprintf("Scrolling down at %d, %d", x, y)) + self.gui.ScrollWheelDown(x, y) + self.Wait(self.inputDelay) +} + +func (self *TestDriver) mouseRelease() { + self.SetCaption(fmt.Sprintf("Releasing mouse at %d, %d", self.mouseX, self.mouseY)) + self.gui.MouseRelease(self.mouseX, self.mouseY) + self.Wait(self.inputDelay) +} + // Should only be used in specific cases where you're doing something weird! // E.g. invoking a global keybinding from within a popup. // You probably shouldn't use this function, and should instead go through a view like t.Views().Commit().Focus().Press(...) -func (self *TestDriver) GlobalPress(keyStr string) { - self.press(keyStr) +func (self *TestDriver) GlobalPress(key config.Keybinding) { + self.press(key[0]) +} + +// asserts that the terminal's text cursor is shown, i.e. that there is a text +// field to type into +func (self *TestDriver) CursorIsVisible() *TestDriver { + self.assertWithRetries(func() (bool, string) { + return self.gui.CursorVisible(), "Expected the cursor to be visible" + }) + + return self +} + +func (self *TestDriver) CursorIsHidden() *TestDriver { + self.assertWithRetries(func() (bool, string) { + return !self.gui.CursorVisible(), "Expected the cursor to be hidden" + }) + + return self +} + +// FocusIn simulates the terminal window regaining focus, which causes lazygit +// to reload any config files that changed while it was in the background. +func (self *TestDriver) FocusIn() { + self.SetCaption("Focusing window") + self.gui.FocusIn() + self.Wait(self.inputDelay) +} + +func (self *TestDriver) focusInAndClick(x, y int) { + self.SetCaption(fmt.Sprintf("Focusing window and clicking %d, %d", x, y)) + self.gui.FocusInAndClick(x, y) + self.Wait(self.inputDelay) } func (self *TestDriver) typeContent(content string) { @@ -87,6 +160,15 @@ func (self *TestDriver) Log(message string) { self.gui.LogUI(message) } +// RefreshInBackground performs the refresh that lazygit's background routines +// perform on a timer, e.g. to pick up changes made by RunCommand. Tests use this +// rather than turning those routines on and waiting for them. +func (self *TestDriver) RefreshInBackground() { + self.SetCaption("Refreshing in the background") + self.gui.RefreshInBackground() + self.Wait(self.inputDelay) +} + // allows the user to run shell commands during the test to emulate background activity func (self *TestDriver) Shell() *Shell { return self.shell @@ -117,17 +199,6 @@ func (self *TestDriver) ExpectToast(matcher *TextMatcher) *TestDriver { return self } -func (self *TestDriver) ExpectClipboard(matcher *TextMatcher) { - self.assertWithRetries(func() (bool, string) { - text, err := clipboard.ReadAll() - if err != nil { - return false, "Error occurred when reading from clipboard: " + err.Error() - } - ok, _ := matcher.test(text) - return ok, fmt.Sprintf("Expected clipboard to match %s, but got %s", matcher.name(), text) - }) -} - func (self *TestDriver) ExpectSearch() *SearchDriver { self.inSearch() diff --git a/pkg/integration/components/test_test.go b/pkg/integration/components/test_test.go index ea1c79124..cce96105a 100644 --- a/pkg/integration/components/test_test.go +++ b/pkg/integration/components/test_test.go @@ -1,12 +1,15 @@ package components import ( + "os" + "path/filepath" "testing" - "github.com/jesseduffield/gocui" + lazycoreUtils "github.com/jesseduffield/lazycore/pkg/utils" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types" "github.com/stretchr/testify/assert" @@ -19,9 +22,15 @@ type coordinate struct { } type fakeGuiDriver struct { - failureMessage string - pressedKeys []string - clickedCoordinates []coordinate + failureMessage string + pressedKeys []string + clickedCoordinates []coordinate + heldCoordinates []coordinate + movedCoordinates []coordinate + releasedCoordinates []coordinate + scrolledCoordinates []coordinate + onUIThread bool + onUIThreadCallCount int } var _ integrationTypes.GuiDriver = &fakeGuiDriver{} @@ -30,10 +39,47 @@ func (self *fakeGuiDriver) PressKey(key string) { self.pressedKeys = append(self.pressedKeys, key) } +func (self *fakeGuiDriver) PressKeysRapidly(keys ...string) { + self.pressedKeys = append(self.pressedKeys, keys...) +} + func (self *fakeGuiDriver) Click(x, y int) { self.clickedCoordinates = append(self.clickedCoordinates, coordinate{x: x, y: y}) } +func (self *fakeGuiDriver) ClickAndHold(x, y int) { + self.heldCoordinates = append(self.heldCoordinates, coordinate{x: x, y: y}) +} + +func (self *fakeGuiDriver) MouseMove(x, y int) { + self.movedCoordinates = append(self.movedCoordinates, coordinate{x: x, y: y}) +} + +func (self *fakeGuiDriver) MouseRelease(x, y int) { + self.releasedCoordinates = append(self.releasedCoordinates, coordinate{x: x, y: y}) +} + +func (self *fakeGuiDriver) ScrollWheelDown(x, y int) { + self.scrolledCoordinates = append(self.scrolledCoordinates, coordinate{x: x, y: y}) +} + +func (self *fakeGuiDriver) RefreshInBackground() { +} + +func (self *fakeGuiDriver) OnUIThreadAndWait(f func()) { + self.onUIThreadCallCount++ + self.onUIThread = true + f() + self.onUIThread = false +} + +func (self *fakeGuiDriver) FocusIn() { +} + +func (self *fakeGuiDriver) FocusInAndClick(x, y int) { + self.clickedCoordinates = append(self.clickedCoordinates, coordinate{x: x, y: y}) +} + func (self *fakeGuiDriver) Keys() config.KeybindingConfig { return config.KeybindingConfig{} } @@ -42,6 +88,10 @@ func (self *fakeGuiDriver) CurrentContext() types.Context { return nil } +func (self *fakeGuiDriver) CursorVisible() bool { + return false +} + func (self *fakeGuiDriver) ContextForView(viewName string) types.Context { return nil } @@ -72,6 +122,10 @@ func (self *fakeGuiDriver) View(viewName string) *gocui.View { return nil } +func (self *fakeGuiDriver) TopViewInWindow(windowName string) *gocui.View { + return nil +} + func (self *fakeGuiDriver) SetCaption(string) { } @@ -86,6 +140,8 @@ func (self *fakeGuiDriver) CheckAllToastsAcknowledged() {} func (self *fakeGuiDriver) Headless() bool { return false } +func (self *fakeGuiDriver) PretendMergeOrRebaseStartedInLazygit() {} + func TestManualFailure(t *testing.T) { test := NewIntegrationTest(NewIntegrationTestArgs{ Description: unitTestDescription, @@ -106,15 +162,79 @@ func TestSuccess(t *testing.T) { t.press("b") t.click(0, 1) t.click(2, 3) + t.clickAndHold(0, 1) + t.mouseMove(2, 3) + t.repeatMouseMove() + t.mouseRelease() }, }) driver := &fakeGuiDriver{} test.Run(driver) assert.EqualValues(t, []string{"a", "b"}, driver.pressedKeys) assert.EqualValues(t, []coordinate{{0, 1}, {2, 3}}, driver.clickedCoordinates) + assert.EqualValues(t, []coordinate{{0, 1}}, driver.heldCoordinates) + assert.EqualValues(t, []coordinate{{2, 3}, {2, 3}}, driver.movedCoordinates) + assert.EqualValues(t, []coordinate{{2, 3}}, driver.releasedCoordinates) assert.Equal(t, "", driver.failureMessage) } +func TestViewDriverPointerCoordinates(t *testing.T) { + guiDriver := &fakeGuiDriver{} + testDriver := NewTestDriver(guiDriver, nil, config.KeybindingConfig{}, 0) + view := gocui.NewView("source", 10, 20, 30, 31, gocui.OutputNormal) + targetView := gocui.NewView("target", 40, 50, 60, 61, gocui.OutputNormal) + viewDriver := &ViewDriver{ + getView: func() *gocui.View { + assert.True(t, guiDriver.onUIThread) + return view + }, + t: testDriver, + } + targetViewDriver := &ViewDriver{ + getView: func() *gocui.View { + assert.True(t, guiDriver.onUIThread) + return targetView + }, + t: testDriver, + } + + viewDriver. + Click(1, 2). + FocusInAndClick(3, 4). + ClickAndHold(5, 6). + MouseMove(7, 8). + MouseMoveToBottom(9). + MouseMoveToView(targetViewDriver, 10, 11). + ScrollWheelDown() + + assert.Equal(t, []coordinate{{12, 23}, {14, 25}}, guiDriver.clickedCoordinates) + assert.Equal(t, []coordinate{{16, 27}}, guiDriver.heldCoordinates) + assert.Equal(t, []coordinate{{18, 29}, {20, 30}, {51, 62}}, guiDriver.movedCoordinates) + assert.Equal(t, []coordinate{{11, 21}}, guiDriver.scrolledCoordinates) + assert.Equal(t, 7, guiDriver.onUIThreadCallCount) +} + +func TestFailingFixture(t *testing.T) { + test := NewIntegrationTest(NewIntegrationTestArgs{ + Description: unitTestDescription, + SetupRepo: func(shell *Shell) { + shell.RunCommand([]string{"git", "checkout", "no-such-branch"}) + shell.CreateFile("reached.txt", "") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) {}, + }) + + paths := NewPaths(t.TempDir()) + assert.NoError(t, os.MkdirAll(paths.ActualRepo(), 0o777)) + + workingDir, err := createFixture(test, paths, lazycoreUtils.GetLazyRootDirectory()) + + assert.ErrorContains(t, err, "git checkout no-such-branch") + assert.Empty(t, workingDir) + // the steps following the failing one are skipped + assert.NoFileExists(t, filepath.Join(paths.ActualRepo(), "reached.txt")) +} + func TestGitVersionRestriction(t *testing.T) { scenarios := []struct { testName string diff --git a/pkg/integration/components/view_driver.go b/pkg/integration/components/view_driver.go index ea005d371..dfae58c4b 100644 --- a/pkg/integration/components/view_driver.go +++ b/pkg/integration/components/view_driver.go @@ -4,7 +4,8 @@ import ( "fmt" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/samber/lo" ) @@ -40,6 +41,53 @@ func (self *ViewDriver) Title(expected *TextMatcher) *ViewDriver { return self } +// asserts that the view has the expected footer, i.e. the "x of y" text on its +// bottom border +func (self *ViewDriver) Footer(expected *TextMatcher) *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + actual := self.getView().Footer + return expected.context(fmt.Sprintf("%s footer", self.context)).test(actual) + }) + + return self +} + +// asserts that the view has the expected subtitle +func (self *ViewDriver) Subtitle(expected *TextMatcher) *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + actual := self.getView().Subtitle + return expected.context(fmt.Sprintf("%s subtitle", self.context)).test(actual) + }) + + return self +} + +// asserts that the view hangs off the bottom of the given one, sharing a border +// with it +func (self *ViewDriver) SharesTopBorderWithBottomOf(upper *ViewDriver) *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + _, _, _, upperY1 := upper.getView().Dimensions() + _, y0, _, _ := self.getView().Dimensions() + return y0 == upperY1, fmt.Sprintf( + "%s: Expected view to start on row %d, where the view above it ends, but it starts on row %d", + self.context, upperY1, y0) + }) + + return self +} + +// asserts that the view starts on the row below the given one +func (self *ViewDriver) IsImmediatelyBelow(upper *ViewDriver) *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + _, _, _, upperY1 := upper.getView().Dimensions() + _, y0, _, _ := self.getView().Dimensions() + return y0 == upperY1+1, fmt.Sprintf( + "%s: Expected view to start on row %d, but it starts on row %d", self.context, upperY1+1, y0) + }) + + return self +} + func (self *ViewDriver) Clear() *ViewDriver { // clearing multiple times in case there's multiple lines // (the clear button only clears a single line at a time) @@ -312,6 +360,42 @@ func (self *ViewDriver) Content(matcher *TextMatcher) *ViewDriver { return self } +// SelectionIsActive asserts that the view draws its selection as the one the user +// is working in. These three assertions read the highlight flags rather than the +// selected lines, which say nothing about whether the selection is drawn at all. +func (self *ViewDriver) SelectionIsActive() *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + view := self.getView() + ok := view.Highlight && !view.HighlightInactive + return ok, fmt.Sprintf("%s: expected an active selection to be shown, but it wasn't", self.context) + }) + + return self +} + +// SelectionIsInactive asserts that the view draws its selection dimmed, as a panel +// does while the focus is somewhere else. +func (self *ViewDriver) SelectionIsInactive() *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + view := self.getView() + ok := view.Highlight && view.HighlightInactive + return ok, fmt.Sprintf("%s: expected an inactive selection to be shown, but it wasn't", self.context) + }) + + return self +} + +// SelectionIsHidden asserts that the view draws no selection at all, e.g. a list +// with nothing in it, where there is nothing to select. +func (self *ViewDriver) SelectionIsHidden() *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + ok := !self.getView().Highlight + return ok, fmt.Sprintf("%s: expected no selection to be shown, but one was", self.context) + }) + + return self +} + // asserts on the selected line of the view. If you are selecting a range, // you should use the SelectedLines method instead. func (self *ViewDriver) SelectedLine(matcher *TextMatcher) *ViewDriver { @@ -342,6 +426,55 @@ func (self *ViewDriver) SelectedLineIdx(expected int) *ViewDriver { return self } +func (self *ViewDriver) SelectedLineIdxAtLeast(expected int) *ViewDriver { + self.t.assertEventually(func() (bool, string) { + var actual int + self.t.gui.OnUIThreadAndWait(func() { + actual = self.getView().SelectedLineIdx() + }) + return actual >= expected, fmt.Sprintf("%s: Expected selected line index to be at least %d, got %d", self.context, expected, actual) + }) + + return self +} + +// asserts on the scroll position of the view, i.e. the index of the line that +// is shown at the top of the view. +func (self *ViewDriver) OriginY(expected int) *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + actual := self.getView().OriginY() + return expected == actual, fmt.Sprintf("%s: Expected origin Y to be %d, got %d", self.context, expected, actual) + }) + + return self +} + +// asserts that the selected line is inside the visible area of the view +func (self *ViewDriver) SelectedLineIsVisible() *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + view := self.getView() + firstVisible, lastVisible := view.OriginY(), view.OriginY()+view.InnerHeight()-1 + actual := view.SelectedLineIdx() + return actual >= firstVisible && actual <= lastVisible, + fmt.Sprintf("%s: Expected the selected line (%d) to be visible, but only lines %d to %d are", + self.context, actual, firstVisible, lastVisible) + }) + + return self +} + +func (self *ViewDriver) OriginYAtLeast(expected int) *ViewDriver { + self.t.assertEventually(func() (bool, string) { + var actual int + self.t.gui.OnUIThreadAndWait(func() { + actual = self.getView().OriginY() + }) + return actual >= expected, fmt.Sprintf("%s: Expected origin Y to be at least %d, got %d", self.context, expected, actual) + }) + + return self +} + // focus the view (assumes the view is a side-view) func (self *ViewDriver) Focus() *ViewDriver { viewName := self.getView().Name() @@ -362,7 +495,7 @@ func (self *ViewDriver) Focus() *ViewDriver { if lo.Contains(window.viewNames, viewName) { tabIndex := lo.IndexOf(window.viewNames, viewName) // jump to the desired window - self.t.press(self.t.keys.Universal.JumpToBlock[windowIndex]) + self.t.press(self.t.keys.Universal.JumpToBlock[windowIndex][0]) // assert we're in the window before continuing self.t.assertWithRetries(func() (bool, string) { @@ -376,11 +509,11 @@ func (self *ViewDriver) Focus() *ViewDriver { currentViewTabIndex := lo.IndexOf(window.viewNames, currentViewName) if tabIndex > currentViewTabIndex { for range tabIndex - currentViewTabIndex { - self.t.press(self.t.keys.Universal.NextTab) + self.t.press(self.t.keys.Universal.NextTab[0]) } } else if tabIndex < currentViewTabIndex { for range currentViewTabIndex - tabIndex { - self.t.press(self.t.keys.Universal.PrevTab) + self.t.press(self.t.keys.Universal.PrevTab[0]) } } @@ -407,10 +540,32 @@ func (self *ViewDriver) IsFocused() *ViewDriver { return self } -func (self *ViewDriver) Press(keyStr string) *ViewDriver { +// asserts that the view is the one currently shown in its window, i.e. it's the +// active tab of its panel (drawn in front of the window's other tabs). Unlike +// IsFocused, this is about what's displayed rather than which view has keyboard +// focus; the two can disagree, e.g. if a config reload reshuffles the tabs. +func (self *ViewDriver) IsActiveTab() *ViewDriver { + self.t.assertWithRetries(func() (bool, string) { + expected := self.getView().Name() + context := self.t.gui.ContextForView(expected) + if context == nil { + return false, fmt.Sprintf("%s: Could not find context for view, so can't determine its window", expected) + } + topView := self.t.gui.TopViewInWindow(context.GetWindowName()) + actual := "" + if topView != nil { + actual = topView.Name() + } + return actual == expected, fmt.Sprintf("%s: Expected view to be the active tab of its window, but it was %s", expected, actual) + }) + + return self +} + +func (self *ViewDriver) Press(key config.Keybinding) *ViewDriver { self.IsFocused() - self.t.press(keyStr) + self.t.press(key[0]) return self } @@ -423,22 +578,100 @@ func (self *ViewDriver) Delay() *ViewDriver { // for use when typing or navigating, because in demos we want that to happen // faster -func (self *ViewDriver) PressFast(keyStr string) *ViewDriver { +func (self *ViewDriver) PressFast(key config.Keybinding) *ViewDriver { self.IsFocused() - self.t.pressFast(keyStr) + self.t.pressFast(key[0]) + + return self +} + +// Presses the given keys in immediate succession, without waiting for lazygit +// to become idle in between (Press waits after every key). Use this to +// simulate a user typing faster than lazygit processes the input. +func (self *ViewDriver) PressRapidly(keys ...config.Keybinding) *ViewDriver { + self.IsFocused() + + self.t.pressRapidly(lo.Map(keys, func(key config.Keybinding, _ int) string { + return key[0] + })) return self } func (self *ViewDriver) Click(x, y int) *ViewDriver { - offsetX, offsetY, _, _ := self.getView().Dimensions() + offsetX, offsetY, _ := self.viewGeometry() self.t.click(offsetX+1+x, offsetY+1+y) return self } +func (self *ViewDriver) FocusInAndClick(x, y int) *ViewDriver { + offsetX, offsetY, _ := self.viewGeometry() + + self.t.focusInAndClick(offsetX+1+x, offsetY+1+y) + + return self +} + +func (self *ViewDriver) MouseMoveToView(target *ViewDriver, x, y int) *ViewDriver { + offsetX, offsetY, _ := target.viewGeometry() + self.t.mouseMove(offsetX+1+x, offsetY+1+y) + return self +} + +func (self *ViewDriver) Drag(fromX, fromY, toX, toY int) *ViewDriver { + return self.ClickAndHold(fromX, fromY).MouseMove(toX, toY).MouseRelease() +} + +func (self *ViewDriver) ClickAndHold(x, y int) *ViewDriver { + offsetX, offsetY, _ := self.viewGeometry() + self.t.clickAndHold(offsetX+1+x, offsetY+1+y) + return self +} + +func (self *ViewDriver) MouseMove(x, y int) *ViewDriver { + offsetX, offsetY, _ := self.viewGeometry() + self.t.mouseMove(offsetX+1+x, offsetY+1+y) + return self +} + +func (self *ViewDriver) MouseMoveToBottom(x int) *ViewDriver { + offsetX, offsetY, innerHeight := self.viewGeometry() + self.t.mouseMove(offsetX+1+x, offsetY+innerHeight) + return self +} + +// scrolls the view down by one notch of the mouse wheel, i.e. by +// gui.scrollHeight lines. This moves the scroll position without moving the +// selection. +func (self *ViewDriver) ScrollWheelDown() *ViewDriver { + offsetX, offsetY, _ := self.viewGeometry() + self.t.scrollWheelDown(offsetX+1, offsetY+1) + return self +} + +func (self *ViewDriver) viewGeometry() (offsetX int, offsetY int, innerHeight int) { + self.t.gui.OnUIThreadAndWait(func() { + view := self.getView() + offsetX, offsetY, _, _ = view.Dimensions() + innerHeight = view.InnerHeight() + }) + + return offsetX, offsetY, innerHeight +} + +func (self *ViewDriver) RepeatMouseMove() *ViewDriver { + self.t.repeatMouseMove() + return self +} + +func (self *ViewDriver) MouseRelease() *ViewDriver { + self.t.mouseRelease() + return self +} + // i.e. pressing down arrow func (self *ViewDriver) SelectNextItem() *ViewDriver { return self.PressFast(self.t.keys.Universal.NextItem) diff --git a/pkg/integration/components/views.go b/pkg/integration/components/views.go index 1d32f4828..5c91b6937 100644 --- a/pkg/integration/components/views.go +++ b/pkg/integration/components/views.go @@ -3,7 +3,7 @@ package components import ( "fmt" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" ) type Views struct { @@ -124,6 +124,14 @@ func (self *Views) Menu() *ViewDriver { return self.regularView("menu") } +func (self *Views) MenuFilter() *ViewDriver { + return self.regularView("menuFilter") +} + +func (self *Views) MenuFilterFrame() *ViewDriver { + return self.regularView("menuFilterFrame") +} + func (self *Views) Confirmation() *ViewDriver { return self.regularView("confirmation") } diff --git a/pkg/integration/tests/bisect/basic.go b/pkg/integration/tests/bisect/basic.go index dbce50969..fda3c11a0 100644 --- a/pkg/integration/tests/bisect/basic.go +++ b/pkg/integration/tests/bisect/basic.go @@ -34,29 +34,29 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). - SelectedLine(Contains("CI commit 10")). - NavigateToLine(Contains("CI commit 09")). + SelectedLine(Contains("CI commit-10")). + NavigateToLine(Contains("CI commit-09")). Tap(func() { markCommitAsBad() t.Views().Information().Content(Contains("Bisecting")) }). SelectedLine(Contains("<-- bad")). - NavigateToLine(Contains("CI commit 02")). + NavigateToLine(Contains("CI commit-02")). Tap(markCommitAsGood). - TopLines(Contains("CI commit 10")). + TopLines(Contains("CI commit-10")). // lazygit will land us in the commit between our good and bad commits. - SelectedLine(Contains("CI commit 05").Contains("<-- current")). + SelectedLine(Contains("CI commit-05").Contains("<-- current")). Tap(markCommitAsBad). - SelectedLine(Contains("CI commit 04").Contains("<-- current")). + SelectedLine(Contains("CI commit-04").Contains("<-- current")). Tap(func() { markCommitAsGood() // commit 5 is the culprit because we marked 4 as good and 5 as bad. - t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 05.*Do you want to reset")).Confirm() + t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit-05.*Do you want to reset")).Confirm() }). IsFocused(). - Content(Contains("CI commit 04")) + Content(Contains("CI commit-04")) t.Views().Information().Content(DoesNotContain("Bisecting")) }, diff --git a/pkg/integration/tests/bisect/choose_terms.go b/pkg/integration/tests/bisect/choose_terms.go index 51c9246ba..5e3b0ed27 100644 --- a/pkg/integration/tests/bisect/choose_terms.go +++ b/pkg/integration/tests/bisect/choose_terms.go @@ -34,40 +34,40 @@ var ChooseTerms = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). - SelectedLine(Contains("CI commit 10")). + SelectedLine(Contains("CI commit-10")). Press(keys.Commits.ViewBisectOptions). Tap(func() { t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(Contains("Choose bisect terms")).Confirm() t.ExpectPopup().Prompt().Title(Equals("Term for old/good commit:")).Type("broken").Confirm() t.ExpectPopup().Prompt().Title(Equals("Term for new/bad commit:")).Type("fixed").Confirm() }). - NavigateToLine(Contains("CI commit 09")). + NavigateToLine(Contains("CI commit-09")). Tap(markCommitAsFixed). SelectedLine(Contains("<-- fixed")). - NavigateToLine(Contains("CI commit 02")). + NavigateToLine(Contains("CI commit-02")). Tap(markCommitAsBroken). Lines( - Contains("CI commit 10").DoesNotContain("<--"), - Contains("CI commit 09").Contains("<-- fixed"), - Contains("CI commit 08").DoesNotContain("<--"), - Contains("CI commit 07").DoesNotContain("<--"), - Contains("CI commit 06").DoesNotContain("<--"), - Contains("CI commit 05").Contains("<-- current").IsSelected(), - Contains("CI commit 04").DoesNotContain("<--"), - Contains("CI commit 03").DoesNotContain("<--"), - Contains("CI commit 02").Contains("<-- broken"), - Contains("CI commit 01").DoesNotContain("<--"), + Contains("CI commit-10").DoesNotContain("<--"), + Contains("CI commit-09").Contains("<-- fixed"), + Contains("CI commit-08").DoesNotContain("<--"), + Contains("CI commit-07").DoesNotContain("<--"), + Contains("CI commit-06").DoesNotContain("<--"), + Contains("CI commit-05").Contains("<-- current").IsSelected(), + Contains("CI commit-04").DoesNotContain("<--"), + Contains("CI commit-03").DoesNotContain("<--"), + Contains("CI commit-02").Contains("<-- broken"), + Contains("CI commit-01").DoesNotContain("<--"), ). Tap(markCommitAsFixed). - SelectedLine(Contains("CI commit 04").Contains("<-- current")). + SelectedLine(Contains("CI commit-04").Contains("<-- current")). Tap(func() { markCommitAsBroken() // commit 5 is the culprit because we marked 4 as broken and 5 as fixed. - t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 05.*Do you want to reset")).Confirm() + t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit-05.*Do you want to reset")).Confirm() }). IsFocused(). - Content(Contains("CI commit 04")) + Content(Contains("CI commit-04")) t.Views().Information().Content(DoesNotContain("Bisecting")) }, diff --git a/pkg/integration/tests/bisect/from_other_branch.go b/pkg/integration/tests/bisect/from_other_branch.go index 24e49104b..b65c88594 100644 --- a/pkg/integration/tests/bisect/from_other_branch.go +++ b/pkg/integration/tests/bisect/from_other_branch.go @@ -24,17 +24,17 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). TopLines( - MatchesRegexp(`<-- bad.*commit 08`), - MatchesRegexp(`<-- current.*commit 07`), - MatchesRegexp(`\?.*commit 06`), - MatchesRegexp(`<-- good.*commit 05`), + MatchesRegexp(`<-- bad.*commit-08`), + MatchesRegexp(`<-- current.*commit-07`), + MatchesRegexp(`\?.*commit-06`), + MatchesRegexp(`<-- good.*commit-05`), ). SelectNextItem(). Press(keys.Commits.ViewBisectOptions). Tap(func() { t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm() - t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 08.*Do you want to reset")).Confirm() + t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit-08.*Do you want to reset")).Confirm() t.Views().Information().Content(DoesNotContain("Bisecting")) }). diff --git a/pkg/integration/tests/bisect/skip.go b/pkg/integration/tests/bisect/skip.go index c879cc408..7c9ef4aea 100644 --- a/pkg/integration/tests/bisect/skip.go +++ b/pkg/integration/tests/bisect/skip.go @@ -19,28 +19,28 @@ var Skip = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). - SelectedLine(Contains("commit 10")). + SelectedLine(Contains("commit-10")). Press(keys.Commits.ViewBisectOptions). Tap(func() { t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as bad`)).Confirm() }). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Commits.ViewBisectOptions). Tap(func() { t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm() t.Views().Information().Content(Contains("Bisecting")) }). Lines( - Contains("CI commit 10").Contains("<-- bad"), - Contains("CI commit 09").DoesNotContain("<--"), - Contains("CI commit 08").DoesNotContain("<--"), - Contains("CI commit 07").DoesNotContain("<--"), - Contains("CI commit 06").DoesNotContain("<--"), - Contains("CI commit 05").Contains("<-- current").IsSelected(), - Contains("CI commit 04").DoesNotContain("<--"), - Contains("CI commit 03").DoesNotContain("<--"), - Contains("CI commit 02").DoesNotContain("<--"), - Contains("CI commit 01").Contains("<-- good"), + Contains("CI commit-10").Contains("<-- bad"), + Contains("CI commit-09").DoesNotContain("<--"), + Contains("CI commit-08").DoesNotContain("<--"), + Contains("CI commit-07").DoesNotContain("<--"), + Contains("CI commit-06").DoesNotContain("<--"), + Contains("CI commit-05").Contains("<-- current").IsSelected(), + Contains("CI commit-04").DoesNotContain("<--"), + Contains("CI commit-03").DoesNotContain("<--"), + Contains("CI commit-02").DoesNotContain("<--"), + Contains("CI commit-01").Contains("<-- good"), ). Press(keys.Commits.ViewBisectOptions). Tap(func() { @@ -57,18 +57,18 @@ var Skip = NewIntegrationTest(NewIntegrationTestArgs{ }). // Skipping the current commit selects the new current commit: Lines( - Contains("CI commit 10").Contains("<-- bad"), - Contains("CI commit 09").DoesNotContain("<--"), - Contains("CI commit 08").DoesNotContain("<--"), - Contains("CI commit 07").DoesNotContain("<--"), - Contains("CI commit 06").Contains("<-- current").IsSelected(), - Contains("CI commit 05").Contains("<-- skipped"), - Contains("CI commit 04").DoesNotContain("<--"), - Contains("CI commit 03").DoesNotContain("<--"), - Contains("CI commit 02").DoesNotContain("<--"), - Contains("CI commit 01").Contains("<-- good"), + Contains("CI commit-10").Contains("<-- bad"), + Contains("CI commit-09").DoesNotContain("<--"), + Contains("CI commit-08").DoesNotContain("<--"), + Contains("CI commit-07").DoesNotContain("<--"), + Contains("CI commit-06").Contains("<-- current").IsSelected(), + Contains("CI commit-05").Contains("<-- skipped"), + Contains("CI commit-04").DoesNotContain("<--"), + Contains("CI commit-03").DoesNotContain("<--"), + Contains("CI commit-02").DoesNotContain("<--"), + Contains("CI commit-01").Contains("<-- good"), ). - NavigateToLine(Contains("commit 07")). + NavigateToLine(Contains("commit-07")). Press(keys.Commits.ViewBisectOptions). Tap(func() { t.ExpectPopup().Menu().Title(Equals("Bisect")). @@ -85,6 +85,6 @@ var Skip = NewIntegrationTest(NewIntegrationTestArgs{ }). // Skipping a selected, non-current commit keeps the selection // there: - SelectedLine(Contains("CI commit 07").Contains("<-- skipped")) + SelectedLine(Contains("CI commit-07").Contains("<-- skipped")) }, }) diff --git a/pkg/integration/tests/branch/merge_non_fast_forward.go b/pkg/integration/tests/branch/merge_non_fast_forward.go index a1e90d049..6a3115639 100644 --- a/pkg/integration/tests/branch/merge_non_fast_forward.go +++ b/pkg/integration/tests/branch/merge_non_fast_forward.go @@ -44,9 +44,9 @@ var MergeNonFastForward = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("⏣─╮ Merge branch 'branch1' into original-branch").IsSelected(), - Contains("│ ◯ * branch1"), - Contains("◯─╯ one"), + Contains("◎─╮ Merge branch 'branch1' into original-branch").IsSelected(), + Contains("│ ○ * branch1"), + Contains("○─╯ one"), ) // Check that branch2 shows the non-fast-forward option first @@ -66,11 +66,11 @@ var MergeNonFastForward = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("⏣─╮ Merge branch 'branch2' into original-branch").IsSelected(), - Contains("│ ◯ * branch2"), - Contains("⏣─│─╮ Merge branch 'branch1' into original-branch"), - Contains("│ │ ◯ * branch1"), - Contains("◯─┴─╯ one"), + Contains("◎─╮ Merge branch 'branch2' into original-branch").IsSelected(), + Contains("│ ○ * branch2"), + Contains("◎─│─╮ Merge branch 'branch1' into original-branch"), + Contains("│ │ ○ * branch1"), + Contains("○─┴─╯ one"), ) }, }) diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index ff17d6417..bbb8abf00 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -53,23 +53,23 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). TopLines( - Contains("--- Pending rebase todos ---"), - MatchesRegexp(`pick.*to keep`).IsSelected(), + Contains("─── Pending rebase todos"), + MatchesRegexp(`pick.*to keep`), MatchesRegexp(`pick.*to remove`), - MatchesRegexp(`pick.*CONFLICT.*first change`), - Contains("--- Commits ---"), + MatchesRegexp(`pick.*CONFLICT.*first change`).IsSelected(), + Contains("─── Commits"), MatchesRegexp("second-change-branch unrelated change"), MatchesRegexp("second change"), MatchesRegexp("original"), ). - SelectNextItem(). + NavigateToLine(Contains("to remove")). Press(keys.Universal.Remove). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp(`pick.*to keep`), MatchesRegexp(`drop.*to remove`).IsSelected(), MatchesRegexp(`pick.*CONFLICT.*first change`), - Contains("--- Commits ---"), + Contains("─── Commits"), MatchesRegexp("second-change-branch unrelated change"), MatchesRegexp("second change"), MatchesRegexp("original"), diff --git a/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go b/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go new file mode 100644 index 000000000..29db1a212 --- /dev/null +++ b/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go @@ -0,0 +1,112 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var RebaseConflictsFixBuildErrorsWithOutOfDateSubmodule = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Rebase onto another branch, deal with the conflicts. While continue prompt is showing, fix build errors; get another prompt when continuing. Check that we don't stage submodules here.", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Git.LocalBranchSortOrder = "recency" + }, + SetupRepo: func(shell *Shell) { + // Create an out-of-date submodule to verify that we don't try to stage it + shell. + EmptyCommit("Initial commit"). + CloneIntoSubmodule("submodule", "submodule"). + Commit("Add submodule"). + AddFileInWorktreeOrSubmodule("submodule", "file", "content"). + CommitInWorktreeOrSubmodule("submodule", "add file in submodule") + + shared.MergeConflictsSetup(shell) + + // Create an untracked file to verify that we don't try to stage it either + shell.UpdateFile("untracked-file", "some untracked file") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits().TopLines( + Contains("first change"), + Contains("original"), + ) + + t.Views().Branches(). + Focus(). + Lines( + Contains("first-change-branch"), + Contains("second-change-branch"), + Contains("original-branch"), + Contains("master"), + ). + SelectNextItem(). + Press(keys.Branches.RebaseBranch) + + t.ExpectPopup().Menu(). + Title(Equals("Rebase 'first-change-branch'")). + Select(Contains("Simple rebase")). + Confirm() + + t.Common().AcknowledgeConflicts() + + t.Views().Files(). + IsFocused(). + SelectedLine(Contains("file")). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + SelectNextItem(). + PressPrimaryAction() + + t.Views().Information().Content(Contains("Rebasing")) + + popup := t.ExpectPopup().Confirmation(). + Title(Equals("Continue")). + Content(Contains("All merge conflicts resolved. Continue the rebase?")) + + // While the popup is showing, fix some build errors + t.Shell().UpdateFile("file", "make it compile again") + + // Continue + popup.Confirm() + + t.Views().Files(). + Lines( + Equals("▼ /"), + Equals(" MM file").IsSelected(), + Equals(" M submodule (submodule)"), + Equals(" ?? untracked-file"), + ) + + t.ExpectPopup().Confirmation(). + Title(Equals("Continue")). + Content(Contains("Files have been modified since conflicts were resolved. Auto-stage them and continue?")). + Confirm() + + t.Views().Information().Content(DoesNotContain("Rebasing")) + + t.Views().Files(). + Lines( + Equals("▼ /"), + Equals(" M submodule (submodule)").IsSelected(), + Equals(" ?? untracked-file"), + ) + + t.Views().Commits(). + Focus(). + TopLines( + Contains("first change").IsSelected(), + Contains("second-change-branch unrelated change"), + Contains("second change"), + Contains("original"), + ) + + t.Views().Main(). + Content( + DoesNotContain("submodule").DoesNotContain("untracked-file"), + ) + }, +}) diff --git a/pkg/integration/tests/branch/select_commits_of_current_branch.go b/pkg/integration/tests/branch/select_commits_of_current_branch.go index 7b57455c3..6c1ee2a86 100644 --- a/pkg/integration/tests/branch/select_commits_of_current_branch.go +++ b/pkg/integration/tests/branch/select_commits_of_current_branch.go @@ -22,25 +22,25 @@ var SelectCommitsOfCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), Contains("master 02"), Contains("master 01"), ). Press(keys.Commits.SelectCommitsOfCurrentBranch). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02").IsSelected(), - Contains("commit 01").IsSelected(), + Contains("commit-03").IsSelected(), + Contains("commit-02").IsSelected(), + Contains("commit-01").IsSelected(), Contains("master 02"), Contains("master 01"), ). PressEscape(). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), Contains("master 02"), Contains("master 01"), ) @@ -58,15 +58,15 @@ var SelectCommitsOfCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().SubCommits(). IsFocused(). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), Contains("master 02"), Contains("master 01"), ). Press(keys.Commits.SelectCommitsOfCurrentBranch). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01").IsSelected(), + Contains("commit-02").IsSelected(), + Contains("commit-01").IsSelected(), Contains("master 02"), Contains("master 01"), ) diff --git a/pkg/integration/tests/branch/show_divergence_from_base_branch.go b/pkg/integration/tests/branch/show_divergence_from_base_branch.go index 2903b7837..1ff9edca0 100644 --- a/pkg/integration/tests/branch/show_divergence_from_base_branch.go +++ b/pkg/integration/tests/branch/show_divergence_from_base_branch.go @@ -37,9 +37,9 @@ var ShowDivergenceFromBaseBranch = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Title(Contains("Commits (feature <-> master)")). Lines( - DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Remote"), Contains("↓").Contains("master 3"), - DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Local"), Contains("↑").Contains("feature 2"), Contains("↑").Contains("feature 1"), ) diff --git a/pkg/integration/tests/branch/show_divergence_from_upstream.go b/pkg/integration/tests/branch/show_divergence_from_upstream.go index 8aff21ca9..91e068cef 100644 --- a/pkg/integration/tests/branch/show_divergence_from_upstream.go +++ b/pkg/integration/tests/branch/show_divergence_from_upstream.go @@ -44,10 +44,10 @@ var ShowDivergenceFromUpstream = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Title(Contains("Commits (master <-> origin/master)")). Lines( - DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Remote"), Contains("↓").Contains("three"), Contains("↓").Contains("two"), - DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Local"), Contains("↑").Contains("four"), ) }, diff --git a/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go b/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go index 5b446fcb8..ced13ed20 100644 --- a/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go +++ b/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go @@ -27,8 +27,8 @@ var ShowDivergenceFromUpstreamNoDivergence = NewIntegrationTest(NewIntegrationTe IsFocused(). Title(Contains("Commits (master <-> origin/master)")). Lines( - Contains("--- Remote ---"), - Contains("--- Local ---"), + Contains("─── Remote"), + Contains("─── Local"), ) }, }) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_commit_that_becomes_empty.go b/pkg/integration/tests/cherry_pick/cherry_pick_commit_that_becomes_empty.go index fbd8ee9a6..081a71f66 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_commit_that_becomes_empty.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_commit_that_becomes_empty.go @@ -73,25 +73,11 @@ var CherryPickCommitThatBecomesEmpty = NewIntegrationTest(NewIntegrationTestArgs // Cherry-picked commit is empty t.Views().Main().Content(DoesNotContain("diff --git")) } else { + // Older git versions drop the commit that became empty t.Views().Commits(). - // We have a bug with how the selection is updated in this case; normally you would - // expect the "two changes in one commit" commit to be selected because it was - // selected before pasting, and we try to maintain that selection. This is broken - // for two reasons: - // 1. We increment the selected line index after pasting by the number of pasted - // commits; this is wrong because we skipped the commit that became empty. So - // according to this bug, the "base" commit should be selected. - // 2. We only update the selected line index after pasting if the currently selected - // commit is not a rebase TODO commit, on the assumption that if it is, we are in a - // rebase and the cherry-picked commits end up below the selection. In this case, - // however, we still think we are cherry-picking because the final refresh after the - // CheckMergeOrRebase in CherryPickHelper.Paste is async and hasn't completed yet; - // so the "unrelated change" still has a "pick" action. - // - // Since this only happens for older git versions, we don't bother fixing it. Lines( - Contains("unrelated change").IsSelected(), - Contains("two changes in one commit"), + Contains("unrelated change"), + Contains("two changes in one commit").IsSelected(), Contains("base"), ) } diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index b135bfd7f..abdfcae82 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -78,11 +78,10 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). TopLines( - Contains("second-change-branch unrelated change").IsSelected(), - Contains("second change"), + Contains("second-change-branch unrelated change"), + Contains("second change").IsSelected(), Contains("first change"), ). - SelectNextItem(). Tap(func() { // because we picked 'Second change' when resolving the conflict, // we now see this commit as having replaced First Change with Second Change, diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts_empty_commit_after_resolving.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts_empty_commit_after_resolving.go index ff9efda3c..7af67791f 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts_empty_commit_after_resolving.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts_empty_commit_after_resolving.go @@ -69,23 +69,8 @@ var CherryPickConflictsEmptyCommitAfterResolving = NewIntegrationTest(NewIntegra t.Views().Commits(). Focus(). TopLines( - // We have a bug with how the selection is updated in this case; normally you would - // expect the "first change" commit to be selected because it was selected before - // pasting, and we try to maintain that selection. This is broken for two reasons: - // 1. We increment the selected line index after pasting by the number of pasted - // commits; this is wrong because we skipped the commit that became empty. So - // according to this bug, the "original" commit should be selected. - // 2. We only update the selected line index after pasting if the currently selected - // commit is not a rebase TODO commit, on the assumption that if it is, we are in a - // rebase and the cherry-picked commits end up below the selection. In this case, - // however, we still think we are cherry-picking because the final refresh after the - // CheckMergeOrRebase in CherryPickHelper.Paste is async and hasn't completed yet; - // so the "second-change-branch unrelated change" still has a "pick" action. - // - // We don't bother fixing it for now because it's a pretty niche case, and the - // nature of the problem is only cosmetic. - Contains("second-change-branch unrelated change").IsSelected(), - Contains("first change"), + Contains("second-change-branch unrelated change"), + Contains("first change").IsSelected(), Contains("original"), ) }, diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go b/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go index a14dbe7c9..e46626360 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go @@ -60,9 +60,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(" CI one").IsSelected(), Contains(" CI base"), ). @@ -77,9 +77,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(DoesNotContain("commit copied")) }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(" CI three"), Contains(" CI one").IsSelected(), Contains(" CI base"), diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_merge.go b/pkg/integration/tests/cherry_pick/cherry_pick_merge.go index 6c883cfa4..78a06e446 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_merge.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_merge.go @@ -39,10 +39,10 @@ var CherryPickMerge = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().SubCommits(). IsFocused(). Lines( - Contains("⏣─╮ Merge branch 'second-branch'").IsSelected(), - Contains("│ ◯ two"), - Contains("│ ◯ one"), - Contains("◯ ╯ base"), + Contains("◎─╮ Merge branch 'second-branch'").IsSelected(), + Contains("│ ○ two"), + Contains("│ ○ one"), + Contains("○ ╯ base"), ). // copy the merge commit Press(keys.Commits.CherryPickCopy) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_range_after_paste.go b/pkg/integration/tests/cherry_pick/cherry_pick_range_after_paste.go new file mode 100644 index 000000000..4f1cf180a --- /dev/null +++ b/pkg/integration/tests/cherry_pick/cherry_pick_range_after_paste.go @@ -0,0 +1,106 @@ +package cherry_pick + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CherryPickRangeAfterPaste = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Regression test: range-copy multiple commits after a previous paste", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Git.LocalBranchSortOrder = "recency" + }, + SetupRepo: func(shell *Shell) { + shell. + EmptyCommit("base"). + NewBranch("target"). + NewBranch("source"). + EmptyCommit("one"). + EmptyCommit("two"). + EmptyCommit("three"). + EmptyCommit("four"). + EmptyCommit("five"). + Checkout("target") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Lines( + Contains("target").IsSelected(), + Contains("source"), + Contains("master"), + ). + SelectNextItem(). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + Lines( + Contains("five").IsSelected(), + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one"), + Contains("base"), + ). + Press(keys.Commits.CherryPickCopy) + + t.Views().Commits(). + Focus(). + Lines( + Contains("base").IsSelected(), + ). + Press(keys.Commits.PasteCommits). + Tap(func() { + t.ExpectPopup().Alert(). + Title(Equals("Cherry-pick")). + Content(Equals("Are you sure you want to cherry-pick the 1 copied commit(s) onto this branch?")). + Confirm() + }). + Lines( + Contains("five"), + Contains("base").IsSelected(), + ). + Tap(func() { + // After paste, CherryPicking.DidPaste is true, so it looks to the user as if no + // commits are copied: + t.Views().Information().Content(DoesNotContain("commits copied")) + }) + + t.Views().Branches(). + Focus(). + NavigateToLine(Contains("source")). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + NavigateToLine(Contains("four")). + Press(keys.Universal.RangeSelectDown). + Press(keys.Universal.RangeSelectDown). + Press(keys.Commits.CherryPickCopy). + Tap(func() { + t.Views().Information().Content(Contains("3 commits copied")) + }) + + t.Views().Commits(). + Focus(). + NavigateToLine(Contains("base")). + Press(keys.Commits.PasteCommits). + Tap(func() { + t.ExpectPopup().Alert(). + Title(Equals("Cherry-pick")). + Content(Equals("Are you sure you want to cherry-pick the 3 copied commit(s) onto this branch?")). + Confirm() + }) + + t.Views().Commits().Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("five"), + Contains("base").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go index acc2f389c..8ef3368d6 100644 --- a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go +++ b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go @@ -29,10 +29,10 @@ var AmendWhenThereAreConflictsAndAmend = NewIntegrationTest(NewIntegrationTestAr t.Views().Commits(). Focus(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit three"), - Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"), - Contains("--- Commits ---"), + Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch").IsSelected(), + Contains("─── Commits"), Contains("commit two"), Contains("file1 changed in master"), Contains("base commit"), diff --git a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go index f7f5ec2e1..fe7c67ddf 100644 --- a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go +++ b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go @@ -33,10 +33,10 @@ var AmendWhenThereAreConflictsAndCancel = NewIntegrationTest(NewIntegrationTestA t.Views().Commits(). Focus(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit three"), - Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"), - Contains("--- Commits ---"), + Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch").IsSelected(), + Contains("─── Commits"), Contains("commit two"), Contains("file1 changed in master"), Contains("base commit"), diff --git a/pkg/integration/tests/commit/create_amend_commit.go b/pkg/integration/tests/commit/create_amend_commit.go index 474e24099..7d311a983 100644 --- a/pkg/integration/tests/commit/create_amend_commit.go +++ b/pkg/integration/tests/commit/create_amend_commit.go @@ -19,11 +19,11 @@ var CreateAmendCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Commits.CreateFixupCommit). Tap(func() { t.ExpectPopup().Menu(). @@ -31,14 +31,14 @@ var CreateAmendCommit = NewIntegrationTest(NewIntegrationTestArgs{ Select(Contains("amend! commit with changes")). Confirm() t.ExpectPopup().CommitMessagePanel(). - Content(Equals("commit 02")). + Content(Equals("commit-02")). Type(" amended").Confirm() }). Lines( - Contains("amend! commit 02"), - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("amend! commit-02"), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.Views().Commits(). @@ -50,9 +50,9 @@ var CreateAmendCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 03"), - Contains("commit 02 amended").IsSelected(), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02 amended").IsSelected(), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/commit/create_fixup_commit_in_branch_stack.go b/pkg/integration/tests/commit/create_fixup_commit_in_branch_stack.go index 1c593cf29..fa7bb5931 100644 --- a/pkg/integration/tests/commit/create_fixup_commit_in_branch_stack.go +++ b/pkg/integration/tests/commit/create_fixup_commit_in_branch_stack.go @@ -27,11 +27,11 @@ var CreateFixupCommitInBranchStack = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI ◯ branch2 commit 2"), - Contains("CI ◯ branch2 commit 1"), - Contains("CI ◯ * branch1 commit 3"), - Contains("CI ◯ branch1 commit 2"), - Contains("CI ◯ branch1 commit 1"), + Contains("CI ○ branch2 commit 2"), + Contains("CI ○ branch2 commit 1"), + Contains("CI ○ * branch1 commit 3"), + Contains("CI ○ branch1 commit 2"), + Contains("CI ○ branch1 commit 1"), ). NavigateToLine(Contains("branch1 commit 2")). Press(keys.Commits.CreateFixupCommit). @@ -42,12 +42,12 @@ var CreateFixupCommitInBranchStack = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("CI ◯ branch2 commit 2"), - Contains("CI ◯ branch2 commit 1"), - Contains("CI ◯ * fixup! branch1 commit 2"), - Contains("CI ◯ branch1 commit 3"), - Contains("CI ◯ branch1 commit 2"), - Contains("CI ◯ branch1 commit 1"), + Contains("CI ○ branch2 commit 2"), + Contains("CI ○ branch2 commit 1"), + Contains("CI ○ * fixup! branch1 commit 2"), + Contains("CI ○ branch1 commit 3"), + Contains("CI ○ branch1 commit 2"), + Contains("CI ○ branch1 commit 1"), ) }, }) diff --git a/pkg/integration/tests/commit/directory_diff_with_renamed_files.go b/pkg/integration/tests/commit/directory_diff_with_renamed_files.go new file mode 100644 index 000000000..f849056f7 --- /dev/null +++ b/pkg/integration/tests/commit/directory_diff_with_renamed_files.go @@ -0,0 +1,90 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DirectoryDiffWithRenamedFiles = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Selecting a directory in the commit files panel shows the renames of files that were moved into or out of it", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateDir("dir") + shell.CreateDir("dir/nested") + shell.CreateFileAndAdd("file1", "file1 content\n") + shell.CreateFileAndAdd("dir/file2", "file2 content\n") + shell.CreateFileAndAdd("dir/nested/file3", "file3 content\n") + shell.Commit("initial commit") + shell.RenameFileInGit("file1", "dir/file1") + shell.RenameFileInGit("dir/file2", "dir/file2-renamed") + shell.RenameFileInGit("dir/nested/file3", "file3") + shell.Commit("move files") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("move files").IsSelected(), + Contains("initial commit"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Equals("▼ /").IsSelected(), + Equals(" ▼ dir"), + Equals(" R file1 → file1"), + Equals(" R file2 → file2-renamed"), + Equals(" R dir/nested/file3 → file3"), + ) + + t.Views().Main().ContainsLines( + Equals("diff --git a/file1 b/dir/file1"), + Equals("similarity index 100%"), + Equals("rename from file1"), + Equals("rename to dir/file1"), + Equals("diff --git a/dir/file2 b/dir/file2-renamed"), + Equals("similarity index 100%"), + Equals("rename from dir/file2"), + Equals("rename to dir/file2-renamed"), + Equals("diff --git a/dir/nested/file3 b/file3"), + Equals("similarity index 100%"), + Equals("rename from dir/nested/file3"), + Equals("rename to file3"), + ) + + t.Views().CommitFiles(). + SelectNextItem(). + SelectedLine(Equals(" ▼ dir")) + + t.Views().Main(). + ContainsLines( + Equals("diff --git a/file1 b/dir/file1"), + Equals("similarity index 100%"), + Equals("rename from file1"), + Equals("rename to dir/file1"), + Equals("diff --git a/dir/file2 b/dir/file2-renamed"), + Equals("similarity index 100%"), + Equals("rename from dir/file2"), + Equals("rename to dir/file2-renamed"), + Equals("diff --git a/dir/nested/file3 b/file3"), + Equals("similarity index 100%"), + Equals("rename from dir/nested/file3"), + Equals("rename to file3"), + ) + + t.Views().CommitFiles(). + SelectNextItem(). + SelectedLine(Equals(" R file1 → file1")) + + t.Views().Main().ContainsLines( + Equals("diff --git a/file1 b/dir/file1"), + Equals("similarity index 100%"), + Equals("rename from file1"), + Equals("rename to dir/file1"), + ) + }, +}) diff --git a/pkg/integration/tests/commit/discard_old_file_changes.go b/pkg/integration/tests/commit/discard_old_file_changes.go index 0268396db..2dc8006bb 100644 --- a/pkg/integration/tests/commit/discard_old_file_changes.go +++ b/pkg/integration/tests/commit/discard_old_file_changes.go @@ -45,9 +45,9 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Equals("▼ /").IsSelected(), Equals(" ▼ dir1"), + Equals(" A d1_file0"), Equals(" ▼ subd1"), Equals(" A subfile0"), - Equals(" A d1_file0"), Equals(" ▼ dir2"), Equals(" A d2_file1"), Equals(" A d2_file2"), @@ -65,9 +65,9 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Equals("▼ /"), Equals(" ▼ dir1/subd1"), - Equals(" A subfile0"), + Equals(" A subfile0").IsSelected(), Equals(" ▼ dir2"), - Equals(" A d2_file1").IsSelected(), + Equals(" A d2_file1"), Equals(" A d2_file2"), ). PressEscape() @@ -125,10 +125,10 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Lines( Equals("▼ dir1").IsSelected(), - Equals(" ▼ subd1"), - Equals(" A file2ToRemove"), Equals(" A fileToRemove"), Equals(" A multiLineFile"), + Equals(" ▼ subd1"), + Equals(" A file2ToRemove"), ). NavigateToLine(Contains("multiLineFile")). PressEnter() @@ -145,10 +145,10 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Lines( Equals("▼ dir1"), - Equals(" ▼ subd1"), - Equals(" A file2ToRemove"), Equals(" A fileToRemove"), Equals(" ◐ multiLineFile").IsSelected(), + Equals(" ▼ subd1"), + Equals(" A file2ToRemove"), ). NavigateToLine(Contains("dir1")). Press(keys.Universal.ToggleRangeSelect). diff --git a/pkg/integration/tests/commit/discard_renamed_file.go b/pkg/integration/tests/commit/discard_renamed_file.go new file mode 100644 index 000000000..01e729425 --- /dev/null +++ b/pkg/integration/tests/commit/discard_renamed_file.go @@ -0,0 +1,57 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DiscardRenamedFile = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Discard a renamed file from an old commit; both the new and the old path are handled so the rename is undone", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n") + shell.CreateFileAndAdd("other", "other content\n") + shell.Commit("first commit") + + shell.RenameFileInGit("original", "renamed") + shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n") + shell.Commit("rename with modification") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("rename with modification").IsSelected(), + Contains("first commit"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("original → renamed").IsSelected(), + ). + Press(keys.Universal.Remove) + + t.ExpectPopup().Confirmation(). + Title(Equals("Discard file changes")). + Content(Contains("Are you sure you want to discard changes to the selected file(s) from this commit?")). + Confirm() + + // The rename is undone: the commit no longer touches any file. (If only + // the new path were discarded, the commit would still delete the old + // path and show "D original" here instead.) + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("(none)"), + ). + PressEscape() + + // The working tree is clean; the original file is back at HEAD. + t.Views().Files(). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/commit/highlight.go b/pkg/integration/tests/commit/highlight.go index eaa77ccf1..6f45e6448 100644 --- a/pkg/integration/tests/commit/highlight.go +++ b/pkg/integration/tests/commit/highlight.go @@ -24,14 +24,14 @@ var Highlight = NewIntegrationTest(NewIntegrationTestArgs{ highlightedColor := "#ffffff" t.Views().Commits(). - DoesNotContainColoredText(highlightedColor, "◯"). + DoesNotContainColoredText(highlightedColor, "○"). Focus(). - ContainsColoredText(highlightedColor, "◯") + ContainsColoredText(highlightedColor, "○") t.Views().Files(). Focus() t.Views().Commits(). - DoesNotContainColoredText(highlightedColor, "◯") + DoesNotContainColoredText(highlightedColor, "○") }, }) diff --git a/pkg/integration/tests/commit/keep_clicked_commit_selected_after_focus_in.go b/pkg/integration/tests/commit/keep_clicked_commit_selected_after_focus_in.go new file mode 100644 index 000000000..cfd4e23c5 --- /dev/null +++ b/pkg/integration/tests/commit/keep_clicked_commit_selected_after_focus_in.go @@ -0,0 +1,26 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var KeepClickedCommitSelectedAfterFocusIn = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Keep a clicked commit selected when focus-in immediately precedes the click", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(2) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit-02").IsSelected(), + Contains("commit-01"), + ). + FocusInAndClick(1, 1). + SelectedLine(Contains("commit-01")) + }, +}) diff --git a/pkg/integration/tests/commit/keep_selected_commit_after_external_commit.go b/pkg/integration/tests/commit/keep_selected_commit_after_external_commit.go new file mode 100644 index 000000000..82cc66ab2 --- /dev/null +++ b/pkg/integration/tests/commit/keep_selected_commit_after_external_commit.go @@ -0,0 +1,46 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var KeepSelectedCommitAfterExternalCommit = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Keep the same commit selected after an external commit is created", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "first content") + shell.Commit("first commit") + shell.UpdateFile("file", "second content") + shell.GitAddAll() + shell.Commit("second commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("second commit"), + Contains("first commit"), + ). + NavigateToLine(Contains("first commit")) + + t.Views().Main().Content(Contains("+first content")) + + t.GlobalPress(keys.Universal.ExecuteShellCommand) + t.ExpectPopup().Prompt(). + Title(Equals("Shell command:")). + Type("git commit --allow-empty -m 'external commit'"). + Confirm() + + t.Views().Commits(). + Lines( + Contains("external commit"), + Contains("second commit"), + Contains("first commit").IsSelected(), + ) + + t.Views().Main().Content(Contains("+first content")) + }, +}) diff --git a/pkg/integration/tests/commit/preserve_commit_message_whitespace.go b/pkg/integration/tests/commit/preserve_commit_message_whitespace.go new file mode 100644 index 000000000..ea61d125e --- /dev/null +++ b/pkg/integration/tests/commit/preserve_commit_message_whitespace.go @@ -0,0 +1,39 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PreserveCommitMessageWhitespace = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Whitespace in the description (e.g. leading blank lines, indented first line) should be preserved when canceling and reopening the commit message panel", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("myfile", "myfile content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Type("my commit message"). + SwitchToDescription(). + AddNewline(). + AddNewline(). + Type("body "). + Cancel() + + t.Views().Files(). + IsFocused(). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Content(Equals("my commit message")). + SwitchToDescription(). + Content(Equals("\n\nbody ")). + Cancel() + }, +}) diff --git a/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go b/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go index e702c79b3..5ad60aad5 100644 --- a/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go +++ b/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go @@ -24,10 +24,10 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg t.Views().Commits(). Focus(). Lines( - Contains("CI ◯ add second line").IsSelected(), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change"), - Contains("CI ◯ add empty file"), + Contains("CI ○ add second line").IsSelected(), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change"), + Contains("CI ○ add empty file"), ). SelectNextItem(). Press(keys.Universal.RangeSelectDown). @@ -44,14 +44,14 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg Confirm() }). Lines( - Contains("--- Pending reverts ---"), + Contains("─── Pending reverts"), Contains("revert").Contains("CI unrelated change"), - Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change"), - Contains("CI ◯ add empty file"), + Contains("revert").Contains("CI <-- CONFLICT --- add first line").IsSelected(), + Contains("─── Commits"), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change"), + Contains("CI ○ add empty file"), ) t.Views().Options().Content(Contains("View revert options: m")) @@ -74,12 +74,12 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg t.Views().Commits(). Lines( - Contains(`CI ◯ Revert "unrelated change"`), - Contains(`CI ◯ Revert "add first line"`), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change"), - Contains("CI ◯ add empty file"), + Contains(`CI ○ Revert "unrelated change"`), + Contains(`CI ○ Revert "add first line"`), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change"), + Contains("CI ○ add empty file"), ) }, }) diff --git a/pkg/integration/tests/commit/revert_with_conflict_single_commit.go b/pkg/integration/tests/commit/revert_with_conflict_single_commit.go index 4d98fdfe5..374b40338 100644 --- a/pkg/integration/tests/commit/revert_with_conflict_single_commit.go +++ b/pkg/integration/tests/commit/revert_with_conflict_single_commit.go @@ -22,9 +22,9 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI ◯ add second line").IsSelected(), - Contains("CI ◯ add first line"), - Contains("CI ◯ add empty file"), + Contains("CI ○ add second line").IsSelected(), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ). SelectNextItem(). Press(keys.Commits.RevertCommit). @@ -39,12 +39,12 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending reverts ---"), - Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ add empty file"), + Contains("─── Pending reverts"), + Contains("revert").Contains("CI <-- CONFLICT --- add first line").IsSelected(), + Contains("─── Commits"), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ) t.Views().Options().Content(Contains("View revert options: m")) @@ -67,10 +67,10 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains(`CI ◯ Revert "add first line"`), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ add empty file"), + Contains(`CI ○ Revert "add first line"`), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ) }, }) diff --git a/pkg/integration/tests/commit/search.go b/pkg/integration/tests/commit/search.go index 5439a1b32..25f6bb233 100644 --- a/pkg/integration/tests/commit/search.go +++ b/pkg/integration/tests/commit/search.go @@ -58,7 +58,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Contains("two").IsSelected(), Contains("one"), ). - Press("n"). + Press(config.Keybinding{"n"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (3 of 3)")) }). @@ -68,7 +68,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Contains("two"), Contains("one").IsSelected(), ). - Press("n"). + Press(config.Keybinding{"n"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)")) }). @@ -78,7 +78,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Contains("two"), Contains("one"), ). - Press("n"). + Press(config.Keybinding{"n"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (2 of 3)")) }). @@ -88,7 +88,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Contains("two").IsSelected(), Contains("one"), ). - Press("N"). + Press(config.Keybinding{"N"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)")) }). @@ -98,7 +98,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Contains("two"), Contains("one"), ). - Press("N"). + Press(config.Keybinding{"N"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (3 of 3)")) }). @@ -112,7 +112,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)")) }). - Press("N"). + Press(config.Keybinding{"N"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)")) }). @@ -146,7 +146,7 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{ Contains("two"), Contains("one"), ). - Press("n"). + Press(config.Keybinding{"n"}). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)")) }). diff --git a/pkg/integration/tests/commit/shared.go b/pkg/integration/tests/commit/shared.go index 918197aaf..c1a66c13e 100644 --- a/pkg/integration/tests/commit/shared.go +++ b/pkg/integration/tests/commit/shared.go @@ -43,10 +43,10 @@ func doTheRebaseForAmendTests(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit three"), - Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"), - Contains("--- Commits ---"), + Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch").IsSelected(), + Contains("─── Commits"), Contains("commit two"), Contains("file1 changed in master"), Contains("base commit"), diff --git a/pkg/integration/tests/config/custom_commands_in_per_repo_config.go b/pkg/integration/tests/config/custom_commands_in_per_repo_config.go index 81f8724aa..929c7eae9 100644 --- a/pkg/integration/tests/config/custom_commands_in_per_repo_config.go +++ b/pkg/integration/tests/config/custom_commands_in_per_repo_config.go @@ -17,12 +17,12 @@ var CustomCommandsInPerRepoConfig = NewIntegrationTest(NewIntegrationTestArgs{ cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "global", Command: "printf 'global X' > file.txt", }, { - Key: "Y", + Key: config.Keybinding{"Y"}, Context: "global", Command: "printf 'global Y' > file.txt", }, @@ -48,13 +48,13 @@ customCommands: ).Confirm() t.Views().Status().Content(Contains("other → master")) - t.GlobalPress("X") + t.GlobalPress(config.Keybinding{"X"}) t.FileSystem().FileContent("../other/file.txt", Equals("global X")) - t.GlobalPress("Y") + t.GlobalPress(config.Keybinding{"Y"}) t.FileSystem().FileContent("../other/file.txt", Equals("local Y")) - t.GlobalPress("Z") + t.GlobalPress(config.Keybinding{"Z"}) t.FileSystem().FileContent("../other/file.txt", Equals("local Z")) }, }) diff --git a/pkg/integration/tests/config/side_panels_in_per_repo_config.go b/pkg/integration/tests/config/side_panels_in_per_repo_config.go new file mode 100644 index 000000000..ad2f63a1a --- /dev/null +++ b/pkg/integration/tests/config/side_panels_in_per_repo_config.go @@ -0,0 +1,58 @@ +package config + +import ( + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SidePanelsInPerRepoConfig = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A per-repo config can set the side panel layout, and switching repos re-applies each repo's own layout", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + otherRepo, _ := filepath.Abs("../other") + cfg.GetAppState().RecentRepos = []string{otherRepo} + }, + SetupRepo: func(shell *Shell) { + shell.CloneNonBare("other") + // The other repo swaps the branches and commits panels. + shell.CreateFile("../other/.git/lazygit.yml", ` +gui: + sidePanels: + - [status] + - [files, worktrees, submodules] + - [commits, reflog] + - [branches, remotes, tags] + - [stash]`) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // This repo uses the default layout, so the third panel is branches. + t.GlobalPress(keys.Universal.JumpToBlock[2]) + t.Views().Branches().IsFocused() + + // Switch to the other repo, whose per-repo config swaps branches and commits. + t.GlobalPress(keys.Universal.OpenRecentRepos) + t.ExpectPopup().Menu().Title(Equals("Recent repositories")). + Lines( + Contains("other").IsSelected(), + Contains("Cancel"), + ).Confirm() + t.Views().Status().Content(Contains("other → master")) + + // Now the third panel is commits. + t.GlobalPress(keys.Universal.JumpToBlock[2]) + t.Views().Commits().IsFocused() + + // Switch back to the first repo; its default layout is intact even though + // its contexts were built before we visited the other repo. + t.GlobalPress(keys.Universal.JumpToBlock[1]) + t.Views().Files().IsFocused() + t.GlobalPress(keys.Universal.OpenRecentRepos) + t.ExpectPopup().Menu().Title(Equals("Recent repositories")).Confirm() + + t.GlobalPress(keys.Universal.JumpToBlock[2]) + t.Views().Branches().IsFocused() + }, +}) diff --git a/pkg/integration/tests/conflicts/conflict_marker_size_not_auto_staged.go b/pkg/integration/tests/conflicts/conflict_marker_size_not_auto_staged.go new file mode 100644 index 000000000..52931c192 --- /dev/null +++ b/pkg/integration/tests/conflicts/conflict_marker_size_not_auto_staged.go @@ -0,0 +1,43 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var ConflictMarkerSizeNotAutoStaged = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Doesn't auto-stage an unresolved file whose conflict-marker-size gitattribute makes its markers longer than usual", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.SetCustomConflictMarkerSize(shell) + shared.CreateMergeConflictFile(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + // Each refresh checks whether the conflicts are still there + Press(keys.Universal.Refresh). + // They are, so the file doesn't get staged and we don't get asked to + // continue the merge + Lines( + Contains("UU file").IsSelected(), + ). + // Once they really are resolved, we do + Tap(func() { + t.Shell().UpdateFile("file", "resolved content") + }). + Press(keys.Universal.Refresh). + Tap(func() { + t.Common().ContinueOnConflictsResolved("merge") + }). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/conflicts/conflict_marker_size_resolve.go b/pkg/integration/tests/conflicts/conflict_marker_size_resolve.go new file mode 100644 index 000000000..13a647931 --- /dev/null +++ b/pkg/integration/tests/conflicts/conflict_marker_size_resolve.go @@ -0,0 +1,40 @@ +package conflicts + +import ( + "strings" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var ConflictMarkerSizeResolve = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Resolves a conflict in a file whose conflict-marker-size gitattribute makes its markers longer than usual", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.SetCustomConflictMarkerSize(shell) + shared.CreateMergeConflictFileMultiple(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + startMarker := strings.Repeat("<", shared.CustomConflictMarkerSize) + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + SelectedLines( + Contains(startMarker+" HEAD"), + Contains("First Change"), + Contains(strings.Repeat("=", shared.CustomConflictMarkerSize)), + ). + PressPrimaryAction(). + Content(DoesNotContain(startMarker + " HEAD\nFirst Change")) + }, +}) diff --git a/pkg/integration/tests/conflicts/continue_prompt_dismissed_when_resolved_externally.go b/pkg/integration/tests/conflicts/continue_prompt_dismissed_when_resolved_externally.go new file mode 100644 index 000000000..e9b2ba3aa --- /dev/null +++ b/pkg/integration/tests/conflicts/continue_prompt_dismissed_when_resolved_externally.go @@ -0,0 +1,49 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var ContinuePromptDismissedWhenResolvedExternally = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "When the prompt to continue a merge is showing and the merge is then continued outside lazygit, dismiss the prompt", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeConflictFile(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + + // Resolve the conflict and refresh so lazygit prompts us to continue. + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + Tap(func() { + t.Shell().UpdateFile("file", "resolved content") + }). + Press(keys.Universal.Refresh) + + t.ExpectPopup().Confirmation(). + Title(Equals("Continue")). + Content(Contains("All merge conflicts resolved. Continue the merge?")) + + // While the prompt is up, the merge is continued outside lazygit (e.g. by + // a coding agent). + t.Shell().ContinueMerge() + + // Simulate lazygit noticing the change (as it would on its next refresh or + // when the window regains focus); the stale prompt is dismissed. + t.FocusIn() + + t.Views().Files(). + IsFocused(). + IsEmpty() + + t.Views().Information().Content(DoesNotContain("Merging")) + }, +}) diff --git a/pkg/integration/tests/conflicts/merge_file_both.go b/pkg/integration/tests/conflicts/merge_file_both.go index 083572125..eb1d0b192 100644 --- a/pkg/integration/tests/conflicts/merge_file_both.go +++ b/pkg/integration/tests/conflicts/merge_file_both.go @@ -55,6 +55,8 @@ var MergeFileBoth = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { _, _, _, expected := testDataBoth() + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( diff --git a/pkg/integration/tests/conflicts/merge_file_current.go b/pkg/integration/tests/conflicts/merge_file_current.go index b80917446..68cf990e5 100644 --- a/pkg/integration/tests/conflicts/merge_file_current.go +++ b/pkg/integration/tests/conflicts/merge_file_current.go @@ -54,6 +54,8 @@ var MergeFileCurrent = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { _, _, _, expected := testDataCurrent() + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( diff --git a/pkg/integration/tests/conflicts/merge_file_incoming.go b/pkg/integration/tests/conflicts/merge_file_incoming.go index 8216b4a4d..17667b296 100644 --- a/pkg/integration/tests/conflicts/merge_file_incoming.go +++ b/pkg/integration/tests/conflicts/merge_file_incoming.go @@ -54,6 +54,8 @@ var MergeFileIncoming = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { _, _, _, expected := testDataIncoming() + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( diff --git a/pkg/integration/tests/conflicts/pick_both_hunks_diff3.go b/pkg/integration/tests/conflicts/pick_both_hunks_diff3.go new file mode 100644 index 000000000..6e9a6eb92 --- /dev/null +++ b/pkg/integration/tests/conflicts/pick_both_hunks_diff3.go @@ -0,0 +1,43 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var PickBothHunksDiff3 = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pick both hunks of a conflict rendered in the diff3 style; the common ancestor must not be included", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.SetConfig("merge.conflictStyle", "diff3") + shared.CreateMergeConflictFile(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + // the diff3 style renders the common ancestor between the two changes + Content(Contains("<<<<<<< HEAD\nFirst Change")). + Content(Contains("||||||| ")). + Content(Contains("Original")). + Press(keys.Main.PickBothHunks) + + t.Common().ContinueOnConflictsResolved("merge") + + t.Views().Files().IsEmpty() + + t.FileSystem().FileContent("file", + Equals("\nThis\nIs\nThe\nFirst Change\nSecond Change\nFile\n")) + }, +}) diff --git a/pkg/integration/tests/conflicts/resolve_externally.go b/pkg/integration/tests/conflicts/resolve_externally.go index ab045f233..bffb2d023 100644 --- a/pkg/integration/tests/conflicts/resolve_externally.go +++ b/pkg/integration/tests/conflicts/resolve_externally.go @@ -15,6 +15,8 @@ var ResolveExternally = NewIntegrationTest(NewIntegrationTestArgs{ shared.CreateMergeConflictFile(shell) }, Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( diff --git a/pkg/integration/tests/conflicts/resolve_externally_started_merge_no_prompt.go b/pkg/integration/tests/conflicts/resolve_externally_started_merge_no_prompt.go new file mode 100644 index 000000000..ec83f3f08 --- /dev/null +++ b/pkg/integration/tests/conflicts/resolve_externally_started_merge_no_prompt.go @@ -0,0 +1,41 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var ResolveExternallyStartedMergeNoPrompt = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "When a merge started outside lazygit has its conflicts resolved, don't prompt to continue it", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + // Start the merge by running git directly and never tell lazygit it was + // the one to start it, so from lazygit's point of view it was started + // externally (e.g. by a coding agent in another terminal). + shared.CreateMergeConflictFile(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + Tap(func() { + t.Shell().UpdateFile("file", "resolved content") + }). + Press(keys.Universal.Refresh) + + // No prompt to continue the merge appears; we stay in the files view + // with the conflict resolved and the merge still in progress. + t.Views().Files(). + IsFocused(). + Lines( + Contains("M file"), + ) + + t.Views().Information().Content(Contains("Merging")) + }, +}) diff --git a/pkg/integration/tests/conflicts/resolve_multiple_files.go b/pkg/integration/tests/conflicts/resolve_multiple_files.go index 7dd88e02c..66d0f8ae4 100644 --- a/pkg/integration/tests/conflicts/resolve_multiple_files.go +++ b/pkg/integration/tests/conflicts/resolve_multiple_files.go @@ -7,7 +7,7 @@ import ( ) var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Ensures that upon resolving conflicts for one file, the next file is selected", + Description: "Ensures that a file whose conflicts have been resolved keeps being shown while other files still have conflicts", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -15,6 +15,8 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{ shared.CreateMergeConflictFiles(shell) }, Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( @@ -32,25 +34,40 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{ Contains("First Change"), Contains("======="), ). + SelectNextItem(). PressPrimaryAction() + // The resolved file is still shown, and stays selected so that its diff + // can be reviewed t.Views().Files(). IsFocused(). Lines( - Equals("UU file2").IsSelected(), + Equals("▼ /"), + Equals(" M file1").IsSelected(), + Equals(" UU file2"), ). + SelectNextItem(). PressEnter() // coincidentally these files have the same conflict t.Views().MergeConflicts(). IsFocused(). SelectedLines( - Contains("<<<<<<< HEAD"), - Contains("First Change"), Contains("======="), + Contains("Second Change"), + Contains(">>>>>>>"), ). PressPrimaryAction() + // Now that all conflicts are resolved, the filter is turned off again + t.Views().Files(). + Lines( + Equals("▼ /"), + Equals(" M file1"), + Equals(" M file2").IsSelected(), + Equals(" A file3"), + ) + t.Common().ContinueOnConflictsResolved("merge") }, }) diff --git a/pkg/integration/tests/conflicts/resolve_without_trailing_lf.go b/pkg/integration/tests/conflicts/resolve_without_trailing_lf.go index 3deafb288..30ae73e54 100644 --- a/pkg/integration/tests/conflicts/resolve_without_trailing_lf.go +++ b/pkg/integration/tests/conflicts/resolve_without_trailing_lf.go @@ -24,6 +24,8 @@ var ResolveWithoutTrailingLf = NewIntegrationTest(NewIntegrationTestArgs{ RunCommandExpectError([]string{"git", "merge", "--no-edit", "branch2"}) }, Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( diff --git a/pkg/integration/tests/conflicts/space_on_non_textual_conflict.go b/pkg/integration/tests/conflicts/space_on_non_textual_conflict.go new file mode 100644 index 000000000..2899fadff --- /dev/null +++ b/pkg/integration/tests/conflicts/space_on_non_textual_conflict.go @@ -0,0 +1,56 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SpaceOnNonTextualConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pressing space on a non-textual conflict opens the resolution menu; staging is disabled for a range that includes one", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.ShowFileTree = false + }, + SetupRepo: func(shell *Shell) { + shell.RunShellCommand(`echo 1 > foo && echo 1 > bar`) + shell.RunShellCommand(`git checkout -b base && git add . && git commit -m base`) + + // theirs: delete foo, modify bar + shell.RunShellCommand(`git checkout -b theirs`) + shell.RunShellCommand(`git rm foo && echo 2 > bar && git add bar && git commit -m theirs`) + + // ours: modify foo, delete bar + shell.RunShellCommand(`git checkout base && git checkout -b ours`) + shell.RunShellCommand(`echo 2 > foo && git add foo && git rm bar && git commit -m ours`) + + shell.RunCommandExpectError([]string{"git", "merge", "theirs"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("DU bar"), + Contains("UD foo"), + ). + // Pressing space on a single non-textual conflict opens the + // resolution menu rather than trying to stage it. + NavigateToLine(Contains("bar")). + PressPrimaryAction(). + Tap(func() { + t.ExpectPopup().Menu().Title(Equals("Merge conflicts")).Cancel() + }). + // Staging is disabled for a range selection that includes a conflict. + Press(keys.Universal.ToggleRangeSelect). + NavigateToLine(Contains("foo")). + PressPrimaryAction(). + Tap(func() { + t.ExpectToast(Contains("Cannot stage a selection that includes files with merge conflicts")) + }). + // Entering a range selection is disabled too, with the usual toast. + Press(keys.Universal.GoInto). + Tap(func() { + t.ExpectToast(Contains("does not support range selection")) + }) + }, +}) diff --git a/pkg/integration/tests/custom_commands/access_commit_properties.go b/pkg/integration/tests/custom_commands/access_commit_properties.go index 22d1d0631..0823b1033 100644 --- a/pkg/integration/tests/custom_commands/access_commit_properties.go +++ b/pkg/integration/tests/custom_commands/access_commit_properties.go @@ -17,7 +17,7 @@ var AccessCommitProperties = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "commits", Command: "printf '%s\n%s\n%s' '{{ .SelectedLocalCommit.Name }}' '{{ .SelectedLocalCommit.Hash }}' '{{ .SelectedLocalCommit.Sha }}' > file.txt", }, @@ -29,7 +29,7 @@ var AccessCommitProperties = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("my change").IsSelected(), ). - Press("X") + Press(config.Keybinding{"X"}) hash := t.Git().GetCommitHash("HEAD") t.FileSystem().FileContent("file.txt", Equals(fmt.Sprintf("my change\n%s\n%s", hash, hash))) diff --git a/pkg/integration/tests/custom_commands/basic_command.go b/pkg/integration/tests/custom_commands/basic_command.go index 10a9058b7..f5ae90a96 100644 --- a/pkg/integration/tests/custom_commands/basic_command.go +++ b/pkg/integration/tests/custom_commands/basic_command.go @@ -15,7 +15,7 @@ var BasicCommand = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "files", Command: "touch myfile", }, @@ -25,7 +25,7 @@ var BasicCommand = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). IsEmpty(). IsFocused(). - Press("a"). + Press(config.Keybinding{"a"}). Lines( Contains("myfile"), ) diff --git a/pkg/integration/tests/custom_commands/check_for_conflicts.go b/pkg/integration/tests/custom_commands/check_for_conflicts.go index d3376b456..5d7924c90 100644 --- a/pkg/integration/tests/custom_commands/check_for_conflicts.go +++ b/pkg/integration/tests/custom_commands/check_for_conflicts.go @@ -16,7 +16,7 @@ var CheckForConflicts = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "m", + Key: config.Keybinding{"m"}, Context: "localBranches", Command: "git merge {{ .SelectedLocalBranch.Name | quote }}", After: &config.CustomCommandAfterHook{ @@ -35,7 +35,7 @@ var CheckForConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Contains("second-change-branch"), ). NavigateToLine(Contains("second-change-branch")). - Press("m") + Press(config.Keybinding{"m"}) t.Common().AcknowledgeConflicts() }, diff --git a/pkg/integration/tests/custom_commands/conditional_prompt_false_string.go b/pkg/integration/tests/custom_commands/conditional_prompt_false_string.go new file mode 100644 index 000000000..e8a64ea0d --- /dev/null +++ b/pkg/integration/tests/custom_commands/conditional_prompt_false_string.go @@ -0,0 +1,71 @@ +package custom_commands + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ConditionalPromptFalseString = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Conditional prompt is skipped when condition is bare false or template false", + ExtraCmdArgs: []string{}, + Skip: false, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("blah") + }, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ + { + Key: config.Keybinding{"a"}, + Context: "files", + Command: `echo "{{.Form.Choice}}" > result.txt`, + Prompts: []config.CustomCommandPrompt{ + { + Key: "Choice", + Type: "menu", + Title: "Pick one", + Options: []config.CustomCommandMenuOption{ + { + Name: "foo", + Description: "Foo", + Value: "FOO", + }, + { + Name: "bar", + Description: "Bar", + Value: "BAR", + }, + }, + }, + { + Key: "Skipped1", + Type: "input", + Title: "This is always skipped (false)", + Condition: `false`, + }, + { + Key: "Skipped2", + Type: "input", + Title: "This is always skipped (template false)", + Condition: `{{ eq "a" "b" }}`, + }, + }, + }, + } + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(config.Keybinding{"a"}) + + t.ExpectPopup().Menu().Title(Equals("Pick one")).Select(Contains("foo")).Confirm() + + // Both conditional prompts skipped, file created directly + t.Views().Files(). + Focus(). + Lines( + Contains("result.txt").IsSelected(), + ) + + t.FileSystem().FileContent("result.txt", Equals("FOO\n")) + }, +}) diff --git a/pkg/integration/tests/custom_commands/conditional_prompt_false_value.go b/pkg/integration/tests/custom_commands/conditional_prompt_false_value.go new file mode 100644 index 000000000..15379c7b4 --- /dev/null +++ b/pkg/integration/tests/custom_commands/conditional_prompt_false_value.go @@ -0,0 +1,55 @@ +package custom_commands + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ConditionalPromptFalseValue = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Entering literal false as form input does not incorrectly skip a conditional prompt", + ExtraCmdArgs: []string{}, + Skip: false, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("blah") + }, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ + { + Key: config.Keybinding{"a"}, + Context: "files", + Command: `echo "{{.Form.Word}} {{.Form.Extra}}" > result.txt`, + Prompts: []config.CustomCommandPrompt{ + { + Key: "Word", + Type: "input", + Title: "Enter a word", + }, + { + Key: "Extra", + Type: "input", + Title: "Enter extra", + Condition: `{{ eq .Form.Word "false" }}`, + }, + }, + }, + } + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(config.Keybinding{"a"}) + + t.ExpectPopup().Prompt().Title(Equals("Enter a word")).Type("false").Confirm() + + // Condition {{ eq .Form.Word "false" }} evaluates to true, so prompt should appear + t.ExpectPopup().Prompt().Title(Equals("Enter extra")).Type("baz").Confirm() + + t.Views().Files(). + Focus(). + Lines( + Contains("result.txt").IsSelected(), + ) + + t.FileSystem().FileContent("result.txt", Equals("false baz\n")) + }, +}) diff --git a/pkg/integration/tests/custom_commands/conditional_prompts.go b/pkg/integration/tests/custom_commands/conditional_prompts.go new file mode 100644 index 000000000..ef743282a --- /dev/null +++ b/pkg/integration/tests/custom_commands/conditional_prompts.go @@ -0,0 +1,96 @@ +package custom_commands + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ConditionalPrompts = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Using a custom command with conditional prompts that are skipped based on form values", + ExtraCmdArgs: []string{}, + Skip: false, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + }, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ + { + Key: config.Keybinding{"a"}, + Context: "files", + Command: `echo "{{.Form.Choice}}{{if .Form.Detail}} {{.Form.Detail}}{{end}}" > result.txt`, + Prompts: []config.CustomCommandPrompt{ + { + Key: "Choice", + Type: "menu", + Title: "Choose an option", + Options: []config.CustomCommandMenuOption{ + { + Name: "first", + Description: "First option", + Value: "FIRST", + Key: config.Keybinding{"1"}, + }, + { + Name: "second", + Description: "Second option", + Value: "SECOND", + Key: config.Keybinding{"H"}, + }, + }, + }, + { + Key: "Detail", + Type: "input", + Title: "Enter detail for second option", + Condition: `{{ eq .Form.Choice "SECOND" }}`, + }, + }, + }, + } + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Test 1: Select "first" via key — conditional prompt should be skipped + t.Views().Files(). + IsFocused(). + Press(config.Keybinding{"a"}) + + t.ExpectPopup().Menu(). + Title(Equals("Choose an option")) + + t.Views().Menu().Press(config.Keybinding{"1"}) + + // Detail prompt should be skipped, file should be created directly + t.Views().Files(). + Focus(). + Lines( + Contains("result.txt").IsSelected(), + ) + + t.FileSystem().FileContent("result.txt", Equals("FIRST\n")) + + // Test 2: Select "second" via key — conditional prompt should appear + t.Shell().DeleteFile("result.txt") + t.GlobalPress(keys.Files.RefreshFiles) + + t.Views().Files(). + IsEmpty(). + IsFocused(). + Press(config.Keybinding{"a"}) + + t.ExpectPopup().Menu(). + Title(Equals("Choose an option")) + + t.Views().Menu().Press(config.Keybinding{"H"}) + + // Detail prompt should appear because Choice == "SECOND" + t.ExpectPopup().Prompt().Title(Equals("Enter detail for second option")).Type("extra").Confirm() + + t.Views().Files(). + Focus(). + Lines( + Contains("result.txt").IsSelected(), + ) + + t.FileSystem().FileContent("result.txt", Equals("SECOND extra\n")) + }, +}) diff --git a/pkg/integration/tests/custom_commands/custom_commands_submenu.go b/pkg/integration/tests/custom_commands/custom_commands_submenu.go index a8d13cf73..18dd51d83 100644 --- a/pkg/integration/tests/custom_commands/custom_commands_submenu.go +++ b/pkg/integration/tests/custom_commands/custom_commands_submenu.go @@ -13,21 +13,21 @@ var CustomCommandsSubmenu = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "x", + Key: config.Keybinding{"x"}, Description: "My Custom Commands", CommandMenu: []config.CustomCommand{ { - Key: "1", + Key: config.Keybinding{"1"}, Context: "global", Command: "touch myfile-global", }, { - Key: "2", + Key: config.Keybinding{"2"}, Context: "files", Command: "touch myfile-files", }, { - Key: "3", + Key: config.Keybinding{"3"}, Context: "commits", Command: "touch myfile-commits", }, @@ -39,7 +39,7 @@ var CustomCommandsSubmenu = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). Focus(). IsEmpty(). - Press("x"). + Press(config.Keybinding{"x"}). Tap(func() { t.ExpectPopup().Menu(). Title(Equals("My Custom Commands")). @@ -55,7 +55,7 @@ var CustomCommandsSubmenu = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). - Press("x"). + Press(config.Keybinding{"x"}). Tap(func() { t.ExpectPopup().Menu(). Title(Equals("My Custom Commands")). @@ -63,7 +63,7 @@ var CustomCommandsSubmenu = NewIntegrationTest(NewIntegrationTestArgs{ Contains("1 touch myfile-global"), Contains("3 touch myfile-commits"), ) - t.GlobalPress("3") + t.GlobalPress(config.Keybinding{"3"}) }) t.Views().Files(). diff --git a/pkg/integration/tests/custom_commands/custom_commands_submenu_with_special_keybindings.go b/pkg/integration/tests/custom_commands/custom_commands_submenu_with_special_keybindings.go index a1f62aff6..e79e05991 100644 --- a/pkg/integration/tests/custom_commands/custom_commands_submenu_with_special_keybindings.go +++ b/pkg/integration/tests/custom_commands/custom_commands_submenu_with_special_keybindings.go @@ -13,29 +13,29 @@ var CustomCommandsSubmenuWithSpecialKeybindings = NewIntegrationTest(NewIntegrat SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "x", + Key: config.Keybinding{"x"}, Description: "My Custom Commands", CommandMenu: []config.CustomCommand{ { - Key: "j", + Key: config.Keybinding{"j"}, Context: "global", Command: "echo j", Output: "popup", }, { - Key: "H", + Key: config.Keybinding{"H"}, Context: "global", Command: "echo H", Output: "popup", }, { - Key: "y", + Key: config.Keybinding{"y"}, Context: "global", Command: "echo y", Output: "popup", }, { - Key: "", + Key: config.Keybinding{""}, Context: "global", Command: "echo down", Output: "popup", @@ -43,13 +43,13 @@ var CustomCommandsSubmenuWithSpecialKeybindings = NewIntegrationTest(NewIntegrat }, }, } - cfg.GetUserConfig().Keybinding.Universal.ConfirmMenu = "y" + cfg.GetUserConfig().Keybinding.Universal.ConfirmMenu = config.Keybinding{"y"} }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Files(). Focus(). IsEmpty(). - Press("x"). + Press(config.Keybinding{"x"}). Tap(func() { t.ExpectPopup().Menu(). Title(Equals("My Custom Commands")). @@ -59,14 +59,14 @@ var CustomCommandsSubmenuWithSpecialKeybindings = NewIntegrationTest(NewIntegrat Contains(" echo y"), Contains(" echo down"), ) - t.GlobalPress("j") + t.GlobalPress(config.Keybinding{"j"}) t.ExpectPopup().Alert().Title(Equals("echo j")).Content(Equals("j")).Confirm() }). - Press("x"). + Press(config.Keybinding{"x"}). Tap(func() { t.ExpectPopup().Menu(). Title(Equals("My Custom Commands")) - t.GlobalPress("H") + t.GlobalPress(config.Keybinding{"H"}) t.ExpectPopup().Alert().Title(Equals("echo H")).Content(Equals("H")).Confirm() }) }, diff --git a/pkg/integration/tests/custom_commands/form_prompts.go b/pkg/integration/tests/custom_commands/form_prompts.go index ccb2339de..43246b872 100644 --- a/pkg/integration/tests/custom_commands/form_prompts.go +++ b/pkg/integration/tests/custom_commands/form_prompts.go @@ -15,7 +15,7 @@ var FormPrompts = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "files", Command: `echo {{.Form.FileContent | quote}} > {{.Form.FileName | quote}}`, Prompts: []config.CustomCommandPrompt{ @@ -59,7 +59,7 @@ var FormPrompts = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). IsEmpty(). IsFocused(). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Prompt().Title(Equals("Enter a file name")).Type("my file").Confirm() diff --git a/pkg/integration/tests/custom_commands/global_context.go b/pkg/integration/tests/custom_commands/global_context.go index 82ef53010..2c4cd464f 100644 --- a/pkg/integration/tests/custom_commands/global_context.go +++ b/pkg/integration/tests/custom_commands/global_context.go @@ -15,7 +15,7 @@ var GlobalContext = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "global", Command: "touch myfile", }, @@ -25,7 +25,7 @@ var GlobalContext = NewIntegrationTest(NewIntegrationTestArgs{ // commits t.Views().Commits(). Focus(). - Press("X") + Press(config.Keybinding{"X"}) t.Views().Files(). Focus(). @@ -37,7 +37,7 @@ var GlobalContext = NewIntegrationTest(NewIntegrationTestArgs{ // branches t.Views().Branches(). Focus(). - Press("X") + Press(config.Keybinding{"X"}) t.Views().Files(). Focus(). @@ -49,7 +49,7 @@ var GlobalContext = NewIntegrationTest(NewIntegrationTestArgs{ // files t.Views().Files(). Focus(). - Press("X") + Press(config.Keybinding{"X"}) t.Views().Files(). Focus(). diff --git a/pkg/integration/tests/custom_commands/menu_from_command.go b/pkg/integration/tests/custom_commands/menu_from_command.go index 10b8192ba..51122aa6f 100644 --- a/pkg/integration/tests/custom_commands/menu_from_command.go +++ b/pkg/integration/tests/custom_commands/menu_from_command.go @@ -21,7 +21,7 @@ var MenuFromCommand = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "localBranches", Command: `echo "{{index .PromptResponses 0}} {{index .PromptResponses 1}} {{ .SelectedLocalBranch.Name }}" > output.txt`, Prompts: []config.CustomCommandPrompt{ @@ -48,7 +48,7 @@ var MenuFromCommand = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Branches(). Focus(). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Menu().Title(Equals("Choose commit message")).Select(Contains("bar")).Confirm() diff --git a/pkg/integration/tests/custom_commands/menu_from_commands_output.go b/pkg/integration/tests/custom_commands/menu_from_commands_output.go index 591daa5af..51444ad52 100644 --- a/pkg/integration/tests/custom_commands/menu_from_commands_output.go +++ b/pkg/integration/tests/custom_commands/menu_from_commands_output.go @@ -20,7 +20,7 @@ var MenuFromCommandsOutput = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "localBranches", Command: "git checkout {{ index .PromptResponses 1 }}", Prompts: []config.CustomCommandPrompt{ @@ -46,7 +46,7 @@ var MenuFromCommandsOutput = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Branches(). Focus(). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Prompt(). Title(Equals("Which git command do you want to run?")). diff --git a/pkg/integration/tests/custom_commands/menu_prompt_with_keys.go b/pkg/integration/tests/custom_commands/menu_prompt_with_keys.go index f7f733d9c..4a217f924 100644 --- a/pkg/integration/tests/custom_commands/menu_prompt_with_keys.go +++ b/pkg/integration/tests/custom_commands/menu_prompt_with_keys.go @@ -15,7 +15,7 @@ var MenuPromptWithKeys = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "files", Command: `echo {{.Form.Choice | quote}} > result.txt`, Prompts: []config.CustomCommandPrompt{ @@ -28,19 +28,19 @@ var MenuPromptWithKeys = NewIntegrationTest(NewIntegrationTestArgs{ Name: "first", Description: "First option", Value: "FIRST", - Key: "1", + Key: config.Keybinding{"1"}, }, { Name: "second", Description: "Second option", Value: "SECOND", - Key: "H", + Key: config.Keybinding{"H"}, }, { Name: "third", Description: "Third option", Value: "THIRD", - Key: "3", + Key: config.Keybinding{"3"}, }, }, }, @@ -51,14 +51,14 @@ var MenuPromptWithKeys = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Files(). IsFocused(). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Menu(). Title(Equals("Choose an option")) // 'H' is normally a navigation key (ScrollLeft), so this tests that menu item // keybindings have proper precedence over non-essential navigation keys - t.Views().Menu().Press("H") + t.Views().Menu().Press(config.Keybinding{"H"}) t.FileSystem().FileContent("result.txt", Equals("SECOND\n")) }, diff --git a/pkg/integration/tests/custom_commands/multiple_contexts.go b/pkg/integration/tests/custom_commands/multiple_contexts.go index 61d46775b..3c7e07e84 100644 --- a/pkg/integration/tests/custom_commands/multiple_contexts.go +++ b/pkg/integration/tests/custom_commands/multiple_contexts.go @@ -15,7 +15,7 @@ var MultipleContexts = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "commits, reflogCommits", Command: "touch myfile", }, @@ -25,7 +25,7 @@ var MultipleContexts = NewIntegrationTest(NewIntegrationTestArgs{ // commits t.Views().Commits(). Focus(). - Press("X") + Press(config.Keybinding{"X"}) t.Views().Files(). Focus(). @@ -37,7 +37,7 @@ var MultipleContexts = NewIntegrationTest(NewIntegrationTestArgs{ // branches t.Views().Branches(). Focus(). - Press("X") + Press(config.Keybinding{"X"}) t.Views().Files(). Focus(). @@ -46,7 +46,7 @@ var MultipleContexts = NewIntegrationTest(NewIntegrationTestArgs{ // files t.Views().ReflogCommits(). Focus(). - Press("X") + Press(config.Keybinding{"X"}) t.Views().Files(). Focus(). diff --git a/pkg/integration/tests/custom_commands/multiple_prompts.go b/pkg/integration/tests/custom_commands/multiple_prompts.go index b40aa77f2..8651a330a 100644 --- a/pkg/integration/tests/custom_commands/multiple_prompts.go +++ b/pkg/integration/tests/custom_commands/multiple_prompts.go @@ -15,7 +15,7 @@ var MultiplePrompts = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "files", Command: `echo "{{index .PromptResponses 1}}" > {{index .PromptResponses 0}}`, Prompts: []config.CustomCommandPrompt{ @@ -57,7 +57,7 @@ var MultiplePrompts = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). IsEmpty(). IsFocused(). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Prompt().Title(Equals("Enter a file name")).Type("myfile").Confirm() diff --git a/pkg/integration/tests/custom_commands/run_command.go b/pkg/integration/tests/custom_commands/run_command.go index 107b9e285..afff59590 100644 --- a/pkg/integration/tests/custom_commands/run_command.go +++ b/pkg/integration/tests/custom_commands/run_command.go @@ -15,7 +15,7 @@ var RunCommand = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "localBranches", Command: `git checkout {{.Form.Branch}}`, Prompts: []config.CustomCommandPrompt{ @@ -32,7 +32,7 @@ var RunCommand = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Branches(). Focus(). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Prompt(). Title(Equals("Enter a branch name")). diff --git a/pkg/integration/tests/custom_commands/selected_commit.go b/pkg/integration/tests/custom_commands/selected_commit.go index 6288634f1..1add8b45a 100644 --- a/pkg/integration/tests/custom_commands/selected_commit.go +++ b/pkg/integration/tests/custom_commands/selected_commit.go @@ -15,7 +15,7 @@ var SelectedCommit = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "global", Command: "printf '%s' '{{ .SelectedCommit.Name }}' > file.txt", }, @@ -24,44 +24,44 @@ var SelectedCommit = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { // Select different commits in each of the commit views t.Views().Commits().Focus(). - NavigateToLine(Contains("commit 01")) + NavigateToLine(Contains("commit-01")) t.Views().ReflogCommits().Focus(). - NavigateToLine(Contains("commit 02")) + NavigateToLine(Contains("commit-02")) t.Views().Branches().Focus(). Lines(Contains("master").IsSelected()). PressEnter() t.Views().SubCommits().IsFocused(). - NavigateToLine(Contains("commit 03")) + NavigateToLine(Contains("commit-03")) // SubCommits - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 03")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-03")) t.Views().SubCommits().PressEnter() - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 03")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-03")) // ReflogCommits t.Views().ReflogCommits().Focus() - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit: commit 02")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit: commit-02")) t.Views().ReflogCommits().PressEnter() - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit: commit 02")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit: commit-02")) // LocalCommits t.Views().Commits().Focus() - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 01")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-01")) t.Views().Commits().PressEnter() - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 01")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-01")) // None of these t.Views().Files().Focus() - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 01")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-01")) }, }) diff --git a/pkg/integration/tests/custom_commands/selected_commit_range.go b/pkg/integration/tests/custom_commands/selected_commit_range.go index 1a4b3087c..662a28090 100644 --- a/pkg/integration/tests/custom_commands/selected_commit_range.go +++ b/pkg/integration/tests/custom_commands/selected_commit_range.go @@ -15,7 +15,7 @@ var SelectedCommitRange = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "global", Command: `git log --format="%s" {{.SelectedCommitRange.From}}^..{{.SelectedCommitRange.To}} > file.txt`, }, @@ -24,18 +24,18 @@ var SelectedCommitRange = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits().Focus(). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ) - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 03\n")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-03\n")) t.Views().Commits().Focus(). Press(keys.Universal.RangeSelectDown) - t.GlobalPress("X") - t.FileSystem().FileContent("file.txt", Equals("commit 03\ncommit 02\n")) + t.GlobalPress(config.Keybinding{"X"}) + t.FileSystem().FileContent("file.txt", Equals("commit-03\ncommit-02\n")) }, }) diff --git a/pkg/integration/tests/custom_commands/selected_path.go b/pkg/integration/tests/custom_commands/selected_path.go index 9dc63ed43..cad479e4a 100644 --- a/pkg/integration/tests/custom_commands/selected_path.go +++ b/pkg/integration/tests/custom_commands/selected_path.go @@ -19,7 +19,7 @@ var SelectedPath = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "global", Command: "printf '%s' '{{ .SelectedPath }}' > file.txt", }, @@ -29,7 +29,7 @@ var SelectedPath = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). Focus(). NavigateToLine(Contains("file2")) - t.GlobalPress("X") + t.GlobalPress(config.Keybinding{"X"}) t.FileSystem().FileContent("file.txt", Equals("folder2/file2")) t.Views().Commits(). @@ -38,7 +38,7 @@ var SelectedPath = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().CommitFiles(). IsFocused(). NavigateToLine(Contains("file1")) - t.GlobalPress("X") + t.GlobalPress(config.Keybinding{"X"}) t.FileSystem().FileContent("file.txt", Equals("folder1/file1")) }, }) diff --git a/pkg/integration/tests/custom_commands/selected_submodule.go b/pkg/integration/tests/custom_commands/selected_submodule.go index c4640017d..0671b4b83 100644 --- a/pkg/integration/tests/custom_commands/selected_submodule.go +++ b/pkg/integration/tests/custom_commands/selected_submodule.go @@ -17,17 +17,17 @@ var SelectedSubmodule = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "submodules", Command: "printf '%s' '{{ .SelectedSubmodule.Path }}' > file.txt", }, { - Key: "U", + Key: config.Keybinding{"U"}, Context: "submodules", Command: "printf '%s' '{{ .SelectedSubmodule.Url }}' > file.txt", }, { - Key: "N", + Key: config.Keybinding{"N"}, Context: "submodules", Command: "printf '%s' '{{ .SelectedSubmodule.Name }}' > file.txt", }, @@ -40,13 +40,13 @@ var SelectedSubmodule = NewIntegrationTest(NewIntegrationTestArgs{ Contains("submodule").IsSelected(), ) - t.Views().Submodules().Press("X") + t.Views().Submodules().Press(config.Keybinding{"X"}) t.FileSystem().FileContent("file.txt", Equals("path/submodule")) - t.Views().Submodules().Press("U") + t.Views().Submodules().Press(config.Keybinding{"U"}) t.FileSystem().FileContent("file.txt", Equals("../submodule")) - t.Views().Submodules().Press("N") + t.Views().Submodules().Press(config.Keybinding{"N"}) t.FileSystem().FileContent("file.txt", Equals("submodule")) }, }) diff --git a/pkg/integration/tests/custom_commands/show_output_in_panel.go b/pkg/integration/tests/custom_commands/show_output_in_panel.go index 9fcab1be3..4654b9b51 100644 --- a/pkg/integration/tests/custom_commands/show_output_in_panel.go +++ b/pkg/integration/tests/custom_commands/show_output_in_panel.go @@ -17,13 +17,13 @@ var ShowOutputInPanel = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "commits", Command: "printf '%s' '{{ .SelectedLocalCommit.Name }}'", Output: "popup", }, { - Key: "Y", + Key: config.Keybinding{"Y"}, Context: "commits", Command: "printf '%s' '{{ .SelectedLocalCommit.Name }}'", Output: "popup", @@ -37,7 +37,7 @@ var ShowOutputInPanel = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("my change").IsSelected(), ). - Press("X") + Press(config.Keybinding{"X"}) t.ExpectPopup().Alert(). // Uses cmd string as title if no outputTitle is provided @@ -46,7 +46,7 @@ var ShowOutputInPanel = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() t.Views().Commits(). - Press("Y") + Press(config.Keybinding{"Y"}) hash := t.Git().GetCommitHash("HEAD") t.ExpectPopup().Alert(). diff --git a/pkg/integration/tests/custom_commands/suggestions_command.go b/pkg/integration/tests/custom_commands/suggestions_command.go index 51bbc2c65..e31d6dd8b 100644 --- a/pkg/integration/tests/custom_commands/suggestions_command.go +++ b/pkg/integration/tests/custom_commands/suggestions_command.go @@ -22,7 +22,7 @@ var SuggestionsCommand = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "localBranches", Command: `git checkout {{.Form.Branch}}`, Prompts: []config.CustomCommandPrompt{ @@ -49,7 +49,7 @@ var SuggestionsCommand = NewIntegrationTest(NewIntegrationTestArgs{ Contains("branch-three"), Contains("branch-two"), ). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Prompt(). Title(Equals("Enter a branch name")). diff --git a/pkg/integration/tests/custom_commands/suggestions_preset.go b/pkg/integration/tests/custom_commands/suggestions_preset.go index 891ebf725..ebd9ee5da 100644 --- a/pkg/integration/tests/custom_commands/suggestions_preset.go +++ b/pkg/integration/tests/custom_commands/suggestions_preset.go @@ -22,7 +22,7 @@ var SuggestionsPreset = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "localBranches", Command: `git checkout {{.Form.Branch}}`, Prompts: []config.CustomCommandPrompt{ @@ -49,7 +49,7 @@ var SuggestionsPreset = NewIntegrationTest(NewIntegrationTestArgs{ Contains("branch-three"), Contains("branch-two"), ). - Press("a") + Press(config.Keybinding{"a"}) t.ExpectPopup().Prompt(). Title(Equals("Enter a branch name")). diff --git a/pkg/integration/tests/demo/custom_command.go b/pkg/integration/tests/demo/custom_command.go index a65c2c073..486b3488a 100644 --- a/pkg/integration/tests/demo/custom_command.go +++ b/pkg/integration/tests/demo/custom_command.go @@ -28,7 +28,7 @@ var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{ cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "a", + Key: config.Keybinding{"a"}, Context: "localBranches", Command: `git checkout {{.Form.Branch}}`, Prompts: []config.CustomCommandPrompt{ @@ -63,7 +63,7 @@ var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Branches(). Focus(). Wait(500). - Press("a"). + Press(config.Keybinding{"a"}). Tap(func() { t.Wait(500) diff --git a/pkg/integration/tests/demo/worktree_create_from_branches.go b/pkg/integration/tests/demo/worktree_create_from_branches.go index 39d2cb73e..64e0761cc 100644 --- a/pkg/integration/tests/demo/worktree_create_from_branches.go +++ b/pkg/integration/tests/demo/worktree_create_from_branches.go @@ -34,24 +34,30 @@ var WorktreeCreateFromBranches = NewIntegrationTest(NewIntegrationTestArgs{ Focus(). NavigateToLine(Contains("master")). Wait(500). - Press(keys.Worktrees.ViewWorktreeOptions). + Press(keys.Universal.NewWorktree). Tap(func() { t.Wait(500) t.ExpectPopup().Menu(). - Title(Equals("Worktree")). - Select(Contains("Create worktree from master").DoesNotContain("detached")). + Title(Equals("New worktree")). + Select(Contains("New branch and worktree from 'master'")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("New branch and worktree name")). + Type("hotfix/db-on-fire"). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Select(Contains("Other…")). Confirm() t.ExpectPopup().Prompt(). Title(Equals("New worktree path")). + Clear(). Type("../hotfix"). Confirm() - - t.ExpectPopup().Prompt(). - Title(Contains("New branch name")). - Type("hotfix/db-on-fire"). - Confirm() }) }, }) diff --git a/pkg/integration/tests/diff/copy_to_clipboard.go b/pkg/integration/tests/diff/copy_to_clipboard.go index 34f2bb95c..e28a7c0bc 100644 --- a/pkg/integration/tests/diff/copy_to_clipboard.go +++ b/pkg/integration/tests/diff/copy_to_clipboard.go @@ -22,6 +22,12 @@ var CopyToClipboard = NewIntegrationTest(NewIntegrationTestArgs{ config.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard" }, SetupRepo: func(shell *Shell) { + // Run the test in a linked worktree so that we catch bugs where we + // use the main repo's path instead of the current worktree's path. + shell.EmptyCommit("initial commit") + shell.AddWorktree("HEAD", "../linked-worktree", "mybranch") + shell.Chdir("../linked-worktree") + shell.CreateDir("dir") shell.CreateFileAndAdd("dir/file1", "1st line\n") shell.Commit("1") @@ -38,6 +44,7 @@ var CopyToClipboard = NewIntegrationTest(NewIntegrationTestArgs{ Contains("3").IsSelected(), Contains("2"), Contains("1"), + Contains("initial commit"), ). SelectNextItem(). PressEnter() @@ -80,9 +87,9 @@ var CopyToClipboard = NewIntegrationTest(NewIntegrationTestArgs{ Confirm(). Tap(func() { t.ExpectToast(Equals("File path copied to clipboard")) - repoDir, _ := os.Getwd() + worktreeDir, _ := os.Getwd() // On windows the following path would have backslashes, but we don't run integration tests on windows yet. - expectClipboard(t, Equals(repoDir+"/dir/file1")) + expectClipboard(t, Equals(worktreeDir+"/dir/file1")) }) }). Press(keys.Files.CopyFileInfoToClipboard). diff --git a/pkg/integration/tests/diff/cycle_diff_renderers.go b/pkg/integration/tests/diff/cycle_diff_renderers.go new file mode 100644 index 000000000..4cf4ebfb5 --- /dev/null +++ b/pkg/integration/tests/diff/cycle_diff_renderers.go @@ -0,0 +1,50 @@ +package diff + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CycleDiffRenderers = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Cycle forwards and backwards through configured diff renderers", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{ + // an explicit name overrides the derived one + {Name: "custom name", Command: "cat"}, + // no name, so it's derived from the first word of the command + {Command: "cat -n"}, + // rawGit derives it from the first argument if any + {Type: "rawGit", Args: []string{"--color-words"}}, + // neither name nor command, so it falls back to the default label + {Type: "rawGit"}, + } + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(1) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Press(keys.Universal.CycleDiffRenderers) + t.ExpectToast(Equals("Diff renderer: cat (2 of 4)")) + + t.Views().Commits().Press(keys.Universal.CycleDiffRenderers) + t.ExpectToast(Equals("Diff renderer: --color-words (3 of 4)")) + + t.Views().Commits().Press(keys.Universal.CycleDiffRenderers) + t.ExpectToast(Equals("Diff renderer: (default) (4 of 4)")) + + // cycling forward past the last diff renderer wraps around to the first + t.Views().Commits().Press(keys.Universal.CycleDiffRenderers) + t.ExpectToast(Equals("Diff renderer: custom name (1 of 4)")) + + // cycling backward past the first diff renderer wraps around to the last + t.Views().Commits().Press(keys.Universal.CycleDiffRenderersReverse) + t.ExpectToast(Equals("Diff renderer: (default) (4 of 4)")) + + t.Views().Commits().Press(keys.Universal.CycleDiffRenderersReverse) + t.ExpectToast(Equals("Diff renderer: --color-words (3 of 4)")) + }, +}) diff --git a/pkg/integration/tests/file/click_arrow_to_collapse.go b/pkg/integration/tests/file/click_arrow_to_collapse.go new file mode 100644 index 000000000..26d8b8d6a --- /dev/null +++ b/pkg/integration/tests/file/click_arrow_to_collapse.go @@ -0,0 +1,86 @@ +package file + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ClickArrowToCollapse = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Click the arrow on a directory to collapse/expand it", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateDir("dir") + shell.CreateFile("dir/file-one", "original content\n") + shell.CreateDir("dir2") + shell.CreateFile("dir2/file-two", "original content\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Equals("▼ /").IsSelected(), + Equals(" ▼ dir"), + Equals(" ?? file-one"), + Equals(" ▼ dir2"), + Equals(" ?? file-two"), + ) + + // Click the arrow on "dir" (row 1, column 2) to collapse it + t.Views().Files(). + Click(2, 1). + Lines( + Equals("▼ /"), + Equals(" ▶ dir").IsSelected(), + Equals(" ▼ dir2"), + Equals(" ?? file-two"), + ) + + // Click one to the right of the arrow on "dir2" (row 2, column 3) to collapse it + // Arrow + space after should register a collapse toggle + t.Views().Files(). + Click(3, 2). + Lines( + Equals("▼ /"), + Equals(" ▶ dir"), + Equals(" ▶ dir2").IsSelected(), + ) + + // Click one to the left of the arrow on "dir2" (row 2, column 1) + // Space before arrow should not register a collapse toggle + t.Views().Files(). + Click(1, 2). + Lines( + Equals("▼ /"), + Equals(" ▶ dir"), + Equals(" ▶ dir2").IsSelected(), + ) + + // Clicking on the file/directory name "dir" should change selected but not toggle collapse + t.Views().Files(). + Click(5, 1). + Lines( + Equals("▼ /"), + Equals(" ▶ dir").IsSelected(), + Equals(" ▶ dir2"), + ) + + // Click the arrow again to expand it + t.Views().Files(). + Click(2, 1). + Lines( + Equals("▼ /"), + Equals(" ▼ dir").IsSelected(), + Equals(" ?? file-one"), + Equals(" ▶ dir2"), + ) + + // Click the arrow on the root "/" (row 0, column 0) to collapse everything + t.Views().Files(). + Click(0, 0). + Lines( + Equals("▶ /").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/file/copy_menu.go b/pkg/integration/tests/file/copy_menu.go index 8151cfa10..16dd6c19b 100644 --- a/pkg/integration/tests/file/copy_menu.go +++ b/pkg/integration/tests/file/copy_menu.go @@ -21,7 +21,13 @@ var CopyMenu = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(config *config.AppConfig) { config.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard" }, - SetupRepo: func(shell *Shell) {}, + SetupRepo: func(shell *Shell) { + // Run the test in a linked worktree so that we catch bugs where we + // use the main repo's path instead of the current worktree's path. + shell.EmptyCommit("initial commit") + shell.AddWorktree("HEAD", "../linked-worktree", "mybranch") + shell.Chdir("../linked-worktree") + }, Run: func(t *TestDriver, keys config.KeybindingConfig) { // Disabled item t.Views().Files(). @@ -130,9 +136,9 @@ var CopyMenu = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Equals("File path copied to clipboard")) - repoDir, _ := os.Getwd() + worktreeDir, _ := os.Getwd() // On windows the following path would have backslashes, but we don't run integration tests on windows yet. - expectClipboard(t, Equals(repoDir+"/dir/1-unstaged_file")) + expectClipboard(t, Equals(worktreeDir+"/dir/1-unstaged_file")) }) // Selected path diff on a single (unstaged) file diff --git a/pkg/integration/tests/file/directory_diff_with_renamed_files.go b/pkg/integration/tests/file/directory_diff_with_renamed_files.go new file mode 100644 index 000000000..18906bf03 --- /dev/null +++ b/pkg/integration/tests/file/directory_diff_with_renamed_files.go @@ -0,0 +1,86 @@ +package file + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DirectoryDiffWithRenamedFiles = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Selecting a directory in the files panel shows the renames of files that were moved into or out of it", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateDir("dir") + shell.CreateDir("dir/nested") + shell.CreateFileAndAdd("file1", "file1 content\n") + shell.CreateFileAndAdd("dir/file2", "file2 content\n") + shell.CreateFileAndAdd("dir/nested/file3", "file3 content\n") + shell.Commit("initial commit") + shell.RenameFileInGit("file1", "dir/file1") + shell.RenameFileInGit("dir/file2", "dir/file2-renamed") + shell.RenameFileInGit("dir/nested/file3", "file3") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Equals("▼ /").IsSelected(), + Equals(" ▼ dir"), + Equals(" R file1 → file1"), + Equals(" R file2 → file2-renamed"), + Equals(" R dir/nested/file3 → file3"), + ) + + t.Views().Main().ContainsLines( + Equals("diff --git a/file1 b/dir/file1"), + Equals("similarity index 100%"), + Equals("rename from file1"), + Equals("rename to dir/file1"), + Equals("diff --git a/dir/file2 b/dir/file2-renamed"), + Equals("similarity index 100%"), + Equals("rename from dir/file2"), + Equals("rename to dir/file2-renamed"), + Equals("diff --git a/dir/nested/file3 b/file3"), + Equals("similarity index 100%"), + Equals("rename from dir/nested/file3"), + Equals("rename to file3"), + ) + + t.Views().Files(). + SelectNextItem(). + SelectedLine(Equals(" ▼ dir")) + + t.Views().Main(). + ContainsLines( + Equals("diff --git a/file1 b/dir/file1"), + Equals("similarity index 100%"), + Equals("rename from file1"), + Equals("rename to dir/file1"), + Equals("diff --git a/dir/file2 b/dir/file2-renamed"), + Equals("similarity index 100%"), + Equals("rename from dir/file2"), + Equals("rename to dir/file2-renamed"), + Equals("diff --git a/dir/nested/file3 b/file3"), + Equals("similarity index 100%"), + Equals("rename from dir/nested/file3"), + Equals("rename to file3"), + ) + + // The same applies when a filter reduces the directory to a single file + t.Views().Files(). + FilterOrSearch("file1"). + Lines( + Equals("▼ dir").IsSelected(), + Equals(" R file1 → file1"), + ) + + t.Views().Main(). + ContainsLines( + Equals("diff --git a/file1 b/dir/file1"), + Equals("similarity index 100%"), + Equals("rename from file1"), + Equals("rename to dir/file1"), + ) + }, +}) diff --git a/pkg/integration/tests/file/discard_all_dir_changes.go b/pkg/integration/tests/file/discard_all_dir_changes.go index 6caa3d519..d4c7c4d0f 100644 --- a/pkg/integration/tests/file/discard_all_dir_changes.go +++ b/pkg/integration/tests/file/discard_all_dir_changes.go @@ -73,6 +73,8 @@ var DiscardAllDirChanges = NewIntegrationTest(NewIntegrationTestArgs{ shell.RunShellCommand(`echo "renamed\nhaha" > dir/renamed2.txt && git add dir/renamed2.txt`) }, Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( diff --git a/pkg/integration/tests/file/discard_all_dir_changes_when_filtering.go b/pkg/integration/tests/file/discard_all_dir_changes_when_filtering.go new file mode 100644 index 000000000..6b3ae906e --- /dev/null +++ b/pkg/integration/tests/file/discard_all_dir_changes_when_filtering.go @@ -0,0 +1,69 @@ +package file + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DiscardAllDirChangesWhenFiltering = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Discarding changes in a directory when filtering by path", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.CreateDir("dir") + shell.CreateFileAndAdd("dir/file-one", "original content\n") + shell.CreateFileAndAdd("dir/file-two", "original content\n") + + shell.Commit("first commit") + + shell.UpdateFileAndAdd("dir/file-one", "original content\nnew content\n") + shell.UpdateFileAndAdd("dir/file-two", "original content\nnew content\n") + shell.UpdateFile("dir/file-one", "original content\nnew content\neven newer content\n") + shell.UpdateFile("dir/file-two", "original content\nnew content\neven newer content\n") + + shell.CreateFile("dir/unstaged-file-one", "unstaged file") + shell.CreateFile("dir/unstaged-file-two", "unstaged file") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Equals("▼ dir").IsSelected(), + Equals(" MM file-one"), + Equals(" MM file-two"), + Equals(" ?? unstaged-file-one"), + Equals(" ?? unstaged-file-two"), + ). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("one"). + Confirm() + }). + Lines( + Equals("▼ dir").IsSelected(), + Equals(" MM file-one"), + Equals(" ?? unstaged-file-one"), + ). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Discard changes")). + Select(Contains("Discard all changes")). + Confirm() + }). + Press(keys.Universal.Return). // Cancel filtering + Lines( + Equals("▼ dir").IsSelected(), + Equals(" MM file-two"), + Equals(" ?? unstaged-file-two"), + ) + + t.FileSystem().FileContent("dir/file-one", Equals("original content\n")) + t.FileSystem().FileContent("dir/file-two", Equals("original content\nnew content\neven newer content\n")) + t.FileSystem().PathNotPresent("dir/unstaged-file-one") + t.FileSystem().FileContent("dir/unstaged-file-two", Equals("unstaged file")) + }, +}) diff --git a/pkg/integration/tests/file/discard_unstaged_dir_changes.go b/pkg/integration/tests/file/discard_unstaged_dir_changes.go index 572194572..ea2a58ef5 100644 --- a/pkg/integration/tests/file/discard_unstaged_dir_changes.go +++ b/pkg/integration/tests/file/discard_unstaged_dir_changes.go @@ -32,9 +32,9 @@ var DiscardUnstagedDirChanges = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Equals("▼ /").IsSelected(), Equals(" ▼ dir"), + Equals(" MM file-one"), Equals(" ▼ subdir"), Equals(" ?? unstaged-file-one"), - Equals(" MM file-one"), Equals(" ?? unstaged-file-two"), Equals(" ?? unstaged-file-three"), ). diff --git a/pkg/integration/tests/file/discard_unstaged_dir_changes_when_filtering.go b/pkg/integration/tests/file/discard_unstaged_dir_changes_when_filtering.go new file mode 100644 index 000000000..97dbb7a32 --- /dev/null +++ b/pkg/integration/tests/file/discard_unstaged_dir_changes_when_filtering.go @@ -0,0 +1,70 @@ +package file + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DiscardUnstagedDirChangesWhenFiltering = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Discarding unstaged changes in a directory when filtering by path", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.CreateDir("dir") + shell.CreateFileAndAdd("dir/file-one", "original content\n") + shell.CreateFileAndAdd("dir/file-two", "original content\n") + + shell.Commit("first commit") + + shell.UpdateFileAndAdd("dir/file-one", "original content\nnew content\n") + shell.UpdateFileAndAdd("dir/file-two", "original content\nnew content\n") + shell.UpdateFile("dir/file-one", "original content\nnew content\neven newer content\n") + shell.UpdateFile("dir/file-two", "original content\nnew content\neven newer content\n") + + shell.CreateFile("dir/unstaged-file-one", "unstaged file") + shell.CreateFile("dir/unstaged-file-two", "unstaged file") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Equals("▼ dir").IsSelected(), + Equals(" MM file-one"), + Equals(" MM file-two"), + Equals(" ?? unstaged-file-one"), + Equals(" ?? unstaged-file-two"), + ). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("one"). + Confirm() + }). + Lines( + Equals("▼ dir").IsSelected(), + Equals(" MM file-one"), + Equals(" ?? unstaged-file-one"), + ). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Discard changes")). + Select(Contains("Discard unstaged changes")). + Confirm() + }). + Press(keys.Universal.Return). // Cancel filtering + Lines( + Equals("▼ dir").IsSelected(), + Equals(" M file-one"), + Equals(" MM file-two"), + Equals(" ?? unstaged-file-two"), + ) + + t.FileSystem().FileContent("dir/file-one", Equals("original content\nnew content\n")) + t.FileSystem().FileContent("dir/file-two", Equals("original content\nnew content\neven newer content\n")) + t.FileSystem().PathNotPresent("dir/unstaged-file-one") + t.FileSystem().FileContent("dir/unstaged-file-two", Equals("unstaged file")) + }, +}) diff --git a/pkg/integration/tests/file/discard_various_changes.go b/pkg/integration/tests/file/discard_various_changes.go index bc68fd218..453c8708c 100644 --- a/pkg/integration/tests/file/discard_various_changes.go +++ b/pkg/integration/tests/file/discard_various_changes.go @@ -16,6 +16,8 @@ var DiscardVariousChanges = NewIntegrationTest(NewIntegrationTestArgs{ }, Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + type statusFile struct { status string label string diff --git a/pkg/integration/tests/file/discard_various_changes_range_select.go b/pkg/integration/tests/file/discard_various_changes_range_select.go index 937c50114..2199f1278 100644 --- a/pkg/integration/tests/file/discard_various_changes_range_select.go +++ b/pkg/integration/tests/file/discard_various_changes_range_select.go @@ -16,6 +16,8 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs }, Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Common().PretendMergeOrRebaseStartedInLazygit() + t.Views().Files(). IsFocused(). Lines( @@ -44,12 +46,12 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs Cancel() }). Lines( - Equals("▼ /").IsSelected(), + Equals("▼ /"), Equals(" AM added-changed.txt"), Equals(" MD change-delete.txt"), Equals(" D delete-change.txt"), Equals(" D deleted-staged.txt"), - Equals(" D deleted.txt"), + Equals(" D deleted.txt").IsSelected(), Equals(" MM double-modded.txt"), Equals(" M modded-staged.txt"), Equals(" M modded.txt"), @@ -57,6 +59,7 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs Equals(" ?? new.txt"), Equals(" R renamed.txt → renamed2.txt"), ). + NavigateToLine(Equals("▼ /")). Press(keys.Universal.ToggleRangeSelect). NavigateToLine(Contains("renamed.txt")). Press(keys.Universal.Remove). diff --git a/pkg/integration/tests/file/stage_all_without_changed_files.go b/pkg/integration/tests/file/stage_all_without_changed_files.go new file mode 100644 index 000000000..bae54dffe --- /dev/null +++ b/pkg/integration/tests/file/stage_all_without_changed_files.go @@ -0,0 +1,25 @@ +package file + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StageAllWithoutChangedFiles = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pressing the stage-all key when there are no changed files says that there are none", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + IsEmpty(). + Press(keys.Files.ToggleStagedAll). + Tap(func() { + t.ExpectToast(Contains("No changed files")) + }) + }, +}) diff --git a/pkg/integration/tests/filter_and_search/filter_menu.go b/pkg/integration/tests/filter_and_search/filter_menu.go index e5b6b216e..9b6eed8a1 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu.go +++ b/pkg/integration/tests/filter_and_search/filter_menu.go @@ -26,7 +26,7 @@ var FilterMenu = NewIntegrationTest(NewIntegrationTestArgs{ Filter("Ignore"). Lines( // menu has filtered down to the one item that matches the filter - Contains(`--- Local ---`), + Contains(`─── Local`), Contains(`Ignore`).IsSelected(), ). Confirm() diff --git a/pkg/integration/tests/filter_and_search/filter_menu_as_you_type.go b/pkg/integration/tests/filter_and_search/filter_menu_as_you_type.go new file mode 100644 index 000000000..13b39e5eb --- /dev/null +++ b/pkg/integration/tests/filter_and_search/filter_menu_as_you_type.go @@ -0,0 +1,94 @@ +package filter_and_search + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FilterMenuAsYouType = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Filtering a menu by typing into the filter row that appears as you type", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) {}, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().IsFocused().Press(keys.Universal.OptionMenu) + + // The menu offers the filter, but stays as it is until we take it up on it + t.Views().Menu(). + IsFocused(). + Subtitle(Equals("(Type to filter)")). + Footer(Contains(" of ")) + t.Views().MenuFilter().IsInvisible() + t.Views().MenuFilterFrame().IsInvisible() + t.CursorIsHidden() + + t.ExpectPopup().Menu().Filter("whitespace") + + t.Views().Menu(). + Lines( + Contains("─── Global"), + Contains("Toggle whitespace").IsSelected(), + ). + // the row covers the border the footer was on, so it moves there + Subtitle(Equals("")). + Footer(Equals("")) + t.Views().MenuFilterFrame(). + IsVisible(). + Content(Equals("Filter ('@' for keybindings): ")). + Footer(Equals("1 of 1")). + SharesTopBorderWithBottomOf(t.Views().Menu()) + t.Views().MenuFilter().IsVisible().Content(Equals("whitespace")) + t.Views().Tooltip(). + IsVisible(). + Content(Contains("Toggle whether or not whitespace changes are shown")). + IsImmediatelyBelow(t.Views().MenuFilterFrame()) + t.CursorIsVisible() + + // Emptying the filter shows all the items again, and keeps the row + t.GlobalPress(config.Keybinding{""}) + t.Views().MenuFilter().IsVisible().Content(Equals("")) + t.Views().Menu().LineCount(GreaterThan(2)) + t.CursorIsVisible() + + // Moving the text cursor within the filter leaves the menu's selection alone + t.ExpectPopup().Menu().Filter("co") + t.Views().Menu().LineCount(GreaterThan(2)) + t.GlobalPress(config.Keybinding{""}) + t.Views().Menu().SelectedLineIdxAtLeast(2) + t.GlobalPress(config.Keybinding{""}) + t.Views().Menu().SelectedLineIdxAtLeast(2) + t.GlobalPress(config.Keybinding{""}) + + // Clicking an item selects it and leaves the filter where it is + t.Views().Menu().Click(0, 1).SelectedLineIdx(1) + t.GlobalPress(config.Keybinding{"m"}) + t.Views().MenuFilter().Content(Equals("com")) + + t.GlobalPress(config.Keybinding{""}) + + // Escape gives up the filter, keeping the item that was selected + t.ExpectPopup().Menu().Filter("whitespace") + t.Views().Menu().SelectedLine(Contains("Toggle whitespace")) + t.GlobalPress(keys.Universal.Return) + t.Views().Menu(). + IsFocused(). + SelectedLine(Contains("Toggle whitespace")). + Subtitle(Equals("(Type to filter)")). + Footer(Contains(" of ")) + t.Views().MenuFilter().IsInvisible() + t.Views().MenuFilterFrame().IsInvisible() + t.CursorIsHidden() + + // The next escape closes the menu + t.GlobalPress(keys.Universal.Return) + t.Views().Files().IsFocused() + + // A menu opened afterwards starts with no filter + t.Views().Files().Press(keys.Universal.OptionMenu) + t.ExpectPopup().Menu(). + Title(Equals("Keybindings")). + LineCount(GreaterThan(2)). + Cancel() + }, +}) diff --git a/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go b/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go index aee4b907a..54105b77e 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go +++ b/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go @@ -18,11 +18,11 @@ var FilterMenuByKeybinding = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). Title(Equals("Keybindings")). - Filter("@+"). + Filter("@_"). Lines( // menu has filtered down to the one item that matches the filter - Contains("--- Global ---"), - Contains("+ Next screen mode").IsSelected(), + Contains("─── Global"), + Contains("_ Prev screen mode").IsSelected(), ). Confirm() }). diff --git a/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go b/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go index daf55fd0d..2ed81926e 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go +++ b/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go @@ -20,7 +20,7 @@ var FilterMenuCancelFilterWithEscape = NewIntegrationTest(NewIntegrationTestArgs Filter("Ignore"). Lines( // menu has filtered down to the one item that matches the filter - Contains(`--- Local ---`), + Contains(`─── Local`), Contains(`Ignore`).IsSelected(), ) diff --git a/pkg/integration/tests/filter_and_search/filter_menu_key_handling.go b/pkg/integration/tests/filter_and_search/filter_menu_key_handling.go new file mode 100644 index 000000000..7ab25cbb8 --- /dev/null +++ b/pkg/integration/tests/filter_and_search/filter_menu_key_handling.go @@ -0,0 +1,71 @@ +package filter_and_search + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FilterMenuKeyHandling = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Which keys drive a menu that filters as you type, and which ones are filter text", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + // so that quitting is observable instead of ending the test + cfg.GetUserConfig().ConfirmOnQuit = true + }, + SetupRepo: func(shell *Shell) {}, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // presses a key that is expected to move the selection away from the first + // item, and one that is expected to bring it back + navigates := func(forward string, back string) { + t.GlobalPress(config.Keybinding{forward}) + t.Views().Menu().SelectedLineIdxAtLeast(2) + t.GlobalPress(config.Keybinding{back}) + t.Views().Menu().SelectedLineIdx(1) + } + + t.Views().Files().IsFocused().Press(keys.Universal.OptionMenu) + t.Views().Menu().IsFocused().SelectedLineIdx(1) + + // Until there is a filter, the configured navigation keys drive the menu, + // printable or not + navigates("", "") + navigates("j", "k") + navigates(".", ",") + navigates(">", "<") + t.Views().MenuFilter().IsInvisible() + + // A menu item's own key is filter text; it doesn't execute the item. 'c' + // commits when the files view has the focus. + t.ExpectPopup().Menu().Filter("c") + t.Views().Menu().IsFocused() + t.Views().MenuFilter().Content(Equals("c")) + + // So is the key that filters other lists + t.GlobalPress(keys.Universal.StartSearch) + t.Views().MenuFilter().Content(Equals("c/")) + t.Views().Search().IsInvisible() + + // And so are the printable navigation keys, now that there is somewhere for + // them to go + t.GlobalPress(config.Keybinding{""}) + t.GlobalPress(config.Keybinding{"j"}) + t.GlobalPress(config.Keybinding{"."}) + t.GlobalPress(config.Keybinding{">"}) + t.Views().MenuFilter().Content(Equals("j.>")) + + // The keys that can't be typed keep driving the menu + t.GlobalPress(config.Keybinding{""}) + navigates("", "") + navigates("", "") + navigates("", "") + + // Keys that the filter doesn't take and the menu doesn't handle reach the + // global keybindings + t.GlobalPress(config.Keybinding{""}) + t.ExpectPopup().Confirmation(). + Title(Equals("")). + Content(Contains("Are you sure you want to quit?")). + Confirm() + }, +}) diff --git a/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go b/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go index 1d9ef589f..66718e822 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go +++ b/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go @@ -9,8 +9,8 @@ var FilterMenuWithNoKeybindings = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Filtering the keybindings menu so that only entries without keybinding are left", ExtraCmdArgs: []string{}, Skip: false, - SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Keybinding.Universal.ToggleWhitespaceInDiffView = "" + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().Keybinding.Universal.ToggleWhitespaceInDiffView = nil }, SetupRepo: func(shell *Shell) { }, @@ -25,7 +25,7 @@ var FilterMenuWithNoKeybindings = NewIntegrationTest(NewIntegrationTestArgs{ Lines( // menu has filtered down to the one item that matches the // filter, and it doesn't have a keybinding - Equals("--- Global ---"), + Equals("─── Global"), Equals("Toggle whitespace").IsSelected(), ) }, diff --git a/pkg/integration/tests/filter_and_search/filter_menu_with_printable_keybindings.go b/pkg/integration/tests/filter_and_search/filter_menu_with_printable_keybindings.go new file mode 100644 index 000000000..991aa12e2 --- /dev/null +++ b/pkg/integration/tests/filter_and_search/filter_menu_with_printable_keybindings.go @@ -0,0 +1,66 @@ +package filter_and_search + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FilterMenuWithPrintableKeybindings = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Driving a menu that filters as you type when every key configured for it is printable", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().Keybinding.Universal.ConfirmMenu = config.Keybinding{"x"} + cfg.GetUserConfig().Keybinding.Universal.Return = config.Keybinding{"q"} + cfg.GetUserConfig().Keybinding.Universal.PrevItem = config.Keybinding{"k"} + cfg.GetUserConfig().Keybinding.Universal.NextItem = config.Keybinding{"j"} + cfg.GetUserConfig().Keybinding.Universal.PrevPage = config.Keybinding{"u"} + cfg.GetUserConfig().Keybinding.Universal.NextPage = config.Keybinding{"d"} + cfg.GetUserConfig().Keybinding.Universal.GotoTop = config.Keybinding{"g"} + cfg.GetUserConfig().Keybinding.Universal.GotoBottom = config.Keybinding{"G"} + }, + SetupRepo: func(shell *Shell) {}, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + navigates := func(forward string, back string) { + t.GlobalPress(config.Keybinding{forward}) + t.Views().Menu().SelectedLineIdxAtLeast(2) + t.GlobalPress(config.Keybinding{back}) + t.Views().Menu().SelectedLineIdx(1) + } + + t.Views().Files().IsFocused().Press(keys.Universal.OptionMenu) + t.Views().Menu().IsFocused().SelectedLineIdx(1) + + // Until there is a filter, the configured keys drive the menu + navigates("j", "k") + navigates("d", "u") + navigates("G", "g") + + // Once there is one, they are all filter text. It takes a key that isn't a + // navigation key to get there. + t.ExpectPopup().Menu().Filter("a") + t.GlobalPress(config.Keybinding{"j"}) + t.GlobalPress(config.Keybinding{"k"}) + t.GlobalPress(config.Keybinding{"d"}) + t.GlobalPress(config.Keybinding{"u"}) + t.Views().MenuFilter().Content(Equals("ajkdu")) + t.GlobalPress(config.Keybinding{""}) + + // The menu is still navigable, because the physical keys drive it whatever + // the configuration says + navigates("", "") + navigates("", "") + navigates("", "") + + // And so are confirming and cancelling. Escape gives up the filter first. + t.ExpectPopup().Menu().Filter("Toggle whitespace") + t.GlobalPress(config.Keybinding{""}) + t.Views().MenuFilter().IsInvisible() + t.Views().Menu().IsFocused().SelectedLine(Contains("Toggle whitespace")) + + t.ExpectPopup().Menu().Filter("Toggle whitespace") + t.Views().Menu().SelectedLine(Contains("Toggle whitespace")) + t.GlobalPress(config.Keybinding{""}) + t.Views().Files().IsFocused() + }, +}) diff --git a/pkg/integration/tests/filter_and_search/filter_worktrees.go b/pkg/integration/tests/filter_and_search/filter_worktrees.go new file mode 100644 index 000000000..77dbcc744 --- /dev/null +++ b/pkg/integration/tests/filter_and_search/filter_worktrees.go @@ -0,0 +1,35 @@ +package filter_and_search + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FilterWorktrees = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Filtering worktrees by branch name", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.NewBranch("branch-aaa") + shell.NewBranch("branch-xxx") + shell.Checkout("master") + shell.AddWorktreeCheckout("branch-aaa", "../worktree-xxx") + shell.AddWorktreeCheckout("branch-xxx", "../worktree-1") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Worktrees(). + Focus(). + Lines( + Contains("(main worktree)").IsSelected(), + Contains("worktree-1 branch-xxx"), + Contains("worktree-xxx branch-aaa"), + ). + FilterOrSearch("xxx"). + Lines( + Contains("worktree-1 branch-xxx"), + Contains("worktree-xxx branch-aaa"), + ) + }, +}) diff --git a/pkg/integration/tests/filter_and_search/rerender_the_searched_main_view.go b/pkg/integration/tests/filter_and_search/rerender_the_searched_main_view.go new file mode 100644 index 000000000..3d631e650 --- /dev/null +++ b/pkg/integration/tests/filter_and_search/rerender_the_searched_main_view.go @@ -0,0 +1,37 @@ +package filter_and_search + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RerenderTheSearchedMainView = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A refresh renders the focused main view again even while it is being searched", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") + shell.Commit("one") + + shell.UpdateFile("file1", "one\nNEEDLE\nthree\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Universal.FocusMainView) + + t.Views().Main(). + IsFocused(). + FilterOrSearch("NEEDLE"). + Content(Contains("+NEEDLE")). + Tap(func() { + t.Shell().UpdateFile("file1", "one\nOTHER\nthree\n") + }). + Press(keys.Universal.Refresh). + Content(Contains("+OTHER")). + Content(DoesNotContain("+NEEDLE")) + + t.Views().Search().Content(Contains("No matches for 'NEEDLE'")) + }, +}) diff --git a/pkg/integration/tests/filter_and_search/search_a_long_diff.go b/pkg/integration/tests/filter_and_search/search_a_long_diff.go new file mode 100644 index 000000000..7f2ebf156 --- /dev/null +++ b/pkg/integration/tests/filter_and_search/search_a_long_diff.go @@ -0,0 +1,66 @@ +package filter_and_search + +import ( + "fmt" + "strings" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// longFileWithThreeMatches is long enough that a render of its diff stops well short +// of the end, with two of the three matches for the search below the point it stops at. +func longFileWithThreeMatches() string { + lines := make([]string, 0, 2000) + for i := range 2000 { + switch i { + case 100: + lines = append(lines, "NEEDLE first") + case 1000: + lines = append(lines, "NEEDLE middle") + case 1900: + lines = append(lines, "NEEDLE last") + default: + lines = append(lines, fmt.Sprintf("line %d", i)) + } + } + return strings.Join(lines, "\n") + "\n" +} + +var SearchALongDiff = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Search a diff that is longer than a single render of it reads", + ExtraCmdArgs: []string{}, + Skip: false, + // A small window, so that a render stops well short of 2000 lines. + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "") + shell.Commit("one") + + shell.UpdateFile("file1", longFileWithThreeMatches()) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Universal.FocusMainView) + + // All three matches are counted: opening the prompt reads the whole diff + // first, however much of it the render had got to. + t.Views().Main(). + IsFocused(). + FilterOrSearch("NEEDLE") + + t.Views().Search().Content(Contains("matches for 'NEEDLE' (1 of 3)")) + + // Rendering the diff again reads it from the start, and it is read all the + // way down to the matches the search already knows about. + t.Views().Main(). + Press(keys.Universal.IncreaseContextInDiffView). + Tap(func() { + t.ExpectToast(Equals("Changed diff context size to 4")) + }). + Content(Contains("+NEEDLE last")) + }, +}) diff --git a/pkg/integration/tests/filter_and_search/search_status_after_a_rerender.go b/pkg/integration/tests/filter_and_search/search_status_after_a_rerender.go new file mode 100644 index 000000000..8116049b9 --- /dev/null +++ b/pkg/integration/tests/filter_and_search/search_status_after_a_rerender.go @@ -0,0 +1,45 @@ +package filter_and_search + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SearchStatusAfterARerender = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "The search status counts the matches in a diff that has been rendered again", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", + "line 1\nline 2\nline 3\nline 4\nline 5\nline 6\nline 7\nline 8\nline 9\nNEEDLE\nline 11\nline 12\nline 13\nline 14\n") + shell.Commit("one") + + // Four lines above NEEDLE, so that it is context at a context size of 4 but + // not at 3. + shell.UpdateFile("file1", + "line 1\nline 2\nline 3\nline 4\nline 5\nchanged\nline 7\nline 8\nline 9\nNEEDLE\nline 11\nline 12\nline 13\nline 14\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Universal.FocusMainView) + + t.Views().Main(). + IsFocused(). + Content(DoesNotContain("NEEDLE")). + FilterOrSearch("NEEDLE") + + t.Views().Search().Content(Contains("No matches for 'NEEDLE'")) + + // A wider context brings NEEDLE into the diff, and the search counts it. + t.Views().Main(). + Press(keys.Universal.IncreaseContextInDiffView). + Tap(func() { + t.ExpectToast(Equals("Changed diff context size to 4")) + }). + Content(Contains("NEEDLE")) + + t.Views().Search().Content(Contains("matches for 'NEEDLE' (1 of 1)")) + }, +}) diff --git a/pkg/integration/tests/filter_by_author/select_author.go b/pkg/integration/tests/filter_by_author/select_author.go index 281034c12..3e7759ce8 100644 --- a/pkg/integration/tests/filter_by_author/select_author.go +++ b/pkg/integration/tests/filter_by_author/select_author.go @@ -29,14 +29,14 @@ var SelectAuthor = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("commit 7"), - Contains("commit 6"), - Contains("commit 5"), - Contains("commit 4"), - Contains("commit 3"), - Contains("commit 2"), - Contains("commit 1"), - Contains("commit 0"), + Contains("commit-7"), + Contains("commit-6"), + Contains("commit-5"), + Contains("commit-4"), + Contains("commit-3"), + Contains("commit-2"), + Contains("commit-1"), + Contains("commit-0"), ) t.Views().Information().Content(Contains("Filtering by 'Paul Oberstein '")) @@ -51,7 +51,7 @@ var SelectAuthor = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). - NavigateToLine(Contains("SK commit 0")). + NavigateToLine(Contains("SK commit-0")). Press(keys.Universal.FilteringMenu) t.ExpectPopup().Menu(). @@ -62,7 +62,7 @@ var SelectAuthor = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("commit 0"), + Contains("commit-0"), ) t.Views().Information().Content(Contains("Filtering by 'Siegfried Kircheis '")) diff --git a/pkg/integration/tests/filter_by_author/shared.go b/pkg/integration/tests/filter_by_author/shared.go index 22d08ad5c..33130db66 100644 --- a/pkg/integration/tests/filter_by_author/shared.go +++ b/pkg/integration/tests/filter_by_author/shared.go @@ -20,7 +20,7 @@ func commonSetup(shell *Shell) { for _, authorInfo := range authors { for i := range authorInfo.numberOfCommits { authorEmail := strings.ToLower(strings.ReplaceAll(authorInfo.name, " ", ".")) + "@email.com" - commitMessage := fmt.Sprintf("commit %d", i) + commitMessage := fmt.Sprintf("commit-%d", i) shell.SetAuthor(authorInfo.name, authorEmail) shell.EmptyCommitDaysAgo(commitMessage, repoStartDaysAgo-totalCommits) diff --git a/pkg/integration/tests/filter_by_author/type_author.go b/pkg/integration/tests/filter_by_author/type_author.go index cb84d5757..79750fab3 100644 --- a/pkg/integration/tests/filter_by_author/type_author.go +++ b/pkg/integration/tests/filter_by_author/type_author.go @@ -33,9 +33,9 @@ var TypeAuthor = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("commit 2"), - Contains("commit 1"), - Contains("commit 0"), + Contains("commit-2"), + Contains("commit-1"), + Contains("commit-0"), ) t.Views().Information().Content(Contains("Filtering by 'Yang Wen-li '")) @@ -58,7 +58,7 @@ var TypeAuthor = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("commit 0"), + Contains("commit-0"), ) t.Views().Information().Content(Contains("Filtering by 'Siegfried Kircheis '")) diff --git a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go index 1162a20c7..4936fc38e 100644 --- a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go @@ -45,25 +45,25 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains(TOP_COMMIT), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(BASE_COMMIT), ). NavigateToLine(Contains(TOP_COMMIT)). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains(TOP_COMMIT).Contains("edit"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(BASE_COMMIT), ). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("─── Commits"), Contains(TOP_COMMIT), Contains(BASE_COMMIT), ) diff --git a/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go b/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go index ef01739dc..ade48d389 100644 --- a/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go @@ -34,10 +34,10 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().AcknowledgeConflicts() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("three"), - Contains("fixup").Contains("<-- CONFLICT --- fixup! two"), - Contains("--- Commits ---"), + Contains("fixup").Contains("<-- CONFLICT --- fixup! two").IsSelected(), + Contains("─── Commits"), Contains("two"), Contains("one"), ) @@ -68,9 +68,9 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), - Contains("<-- CONFLICT --- three"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("<-- CONFLICT --- three").IsSelected(), + Contains("─── Commits"), Contains("two"), Contains("one"), ) diff --git a/pkg/integration/tests/interactive_rebase/amend_first_commit.go b/pkg/integration/tests/interactive_rebase/amend_first_commit.go index 02ce4e112..b811a5638 100644 --- a/pkg/integration/tests/interactive_rebase/amend_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/amend_first_commit.go @@ -19,10 +19,10 @@ var AmendFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Commits.AmendToCommit). Tap(func() { t.ExpectPopup().Confirmation(). @@ -31,8 +31,8 @@ var AmendFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 02"), - Contains("commit 01").IsSelected(), + Contains("commit-02"), + Contains("commit-01").IsSelected(), ) t.Views().Main(). diff --git a/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go b/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go index 3140899be..8943f1580 100644 --- a/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go +++ b/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go @@ -13,22 +13,22 @@ var AmendFixupCommit = NewIntegrationTest(NewIntegrationTestArgs{ SetupRepo: func(shell *Shell) { shell. CreateNCommits(1). - CreateFileAndAdd("first-fixup-file", "").Commit("fixup! commit 01"). + CreateFileAndAdd("first-fixup-file", "").Commit("fixup! commit-01"). CreateNCommitsStartingAt(2, 2). - CreateFileAndAdd("unrelated-fixup-file", "fixup 03").Commit("fixup! commit 03"). + CreateFileAndAdd("unrelated-fixup-file", "fixup 03").Commit("fixup! commit-03"). CreateFileAndAdd("fixup-file", "fixup 01") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). Lines( - Contains("fixup! commit 03"), - Contains("commit 03"), - Contains("commit 02"), - Contains("fixup! commit 01"), - Contains("commit 01"), + Contains("fixup! commit-03"), + Contains("commit-03"), + Contains("commit-02"), + Contains("fixup! commit-01"), + Contains("commit-01"), ). - NavigateToLine(Contains("fixup! commit 01")). + NavigateToLine(Contains("fixup! commit-01")). Press(keys.Commits.AmendToCommit). Tap(func() { t.ExpectPopup().Confirmation(). @@ -37,11 +37,11 @@ var AmendFixupCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("fixup! commit 03"), - Contains("commit 03"), - Contains("commit 02"), - Contains("fixup! commit 01").IsSelected(), - Contains("commit 01"), + Contains("fixup! commit-03"), + Contains("commit-03"), + Contains("commit-02"), + Contains("fixup! commit-01").IsSelected(), + Contains("commit-01"), ) t.Views().Main(). diff --git a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go index 66be297f0..9663a23e5 100644 --- a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go @@ -17,18 +17,18 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.Shell().CreateFile("fixup-file", "fixup content") @@ -50,11 +50,11 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.Views().Main(). diff --git a/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go index 1216655e8..740407dd5 100644 --- a/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go @@ -17,21 +17,21 @@ var AmendNonHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02"), + Contains("commit-01"), ) - for _, commit := range []string{"commit 01", "commit 03"} { + for _, commit := range []string{"commit-01", "commit-03"} { t.Views().Commits(). NavigateToLine(Contains(commit)). Press(keys.Commits.AmendToCommit) diff --git a/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go b/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go index 4ae20160f..1ae68666d 100644 --- a/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go +++ b/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go @@ -23,18 +23,18 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 06"), - Contains("pick").Contains("CI commit 05"), - Contains("pick").Contains("CI commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-06"), + Contains("pick").Contains("CI commit-05"), + Contains("pick").Contains("CI commit-04"), Contains("update-ref").Contains("branch1"), - Contains("pick").Contains("CI commit 03"), - Contains("pick").Contains("CI commit 02"), - Contains("--- Commits ---"), - Contains("CI ◯ commit 01"), + Contains("pick").Contains("CI commit-03"), + Contains("pick").Contains("CI commit-02"), + Contains("─── Commits"), + Contains("CI ○ commit-01"), ). NavigateToLine(Contains("update-ref")). Press(keys.Universal.Remove). @@ -45,26 +45,26 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 06"), - Contains("pick").Contains("CI commit 05"), - Contains("pick").Contains("CI commit 04"), - Contains("pick").Contains("CI commit 03").IsSelected(), - Contains("pick").Contains("CI commit 02"), - Contains("--- Commits ---"), - Contains("CI ◯ commit 01"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-06"), + Contains("pick").Contains("CI commit-05"), + Contains("pick").Contains("CI commit-04"), + Contains("pick").Contains("CI commit-03").IsSelected(), + Contains("pick").Contains("CI commit-02"), + Contains("─── Commits"), + Contains("CI ○ commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Remove). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("CI ◯ commit 06"), - Contains("CI ◯ commit 05"), - Contains("CI ◯ commit 04"), - Contains("CI ◯ commit 03"), // No star on this commit, so there's no branch head here - Contains("CI ◯ commit 01"), + Contains("CI ○ commit-06"), + Contains("CI ○ commit-05"), + Contains("CI ○ commit-04"), + Contains("CI ○ commit-03"), // No star on this commit, so there's no branch head here + Contains("CI ○ commit-01"), ) t.Views().Branches(). diff --git a/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go b/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go index e5b43ee81..da6f9dd85 100644 --- a/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go +++ b/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go @@ -28,31 +28,31 @@ var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI commit 09"), - Contains("CI commit 08"), - Contains("CI commit 07"), - Contains("CI * commit 06"), - Contains("CI commit 05"), - Contains("CI commit 04"), - Contains("CI commit 03"), - Contains("CI * commit 02"), - Contains("CI commit 01"), + Contains("CI commit-09"), + Contains("CI commit-08"), + Contains("CI commit-07"), + Contains("CI * commit-06"), + Contains("CI commit-05"), + Contains("CI commit-04"), + Contains("CI commit-03"), + Contains("CI * commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 04")). + NavigateToLine(Contains("commit-04")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 09"), - Contains("pick").Contains("CI commit 08"), - Contains("pick").Contains("CI commit 07"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-09"), + Contains("pick").Contains("CI commit-08"), + Contains("pick").Contains("CI commit-07"), Contains("update-ref").Contains("branch2"), - Contains("pick").Contains("CI commit 06"), // no star on this entry, even though branch2 points to it - Contains("pick").Contains("CI commit 05"), - Contains("--- Commits ---"), - Contains("CI commit 04"), - Contains("CI commit 03"), - Contains("CI * commit 02"), // this star is fine though - Contains("CI commit 01"), + Contains("pick").Contains("CI commit-06"), // no star on this entry, even though branch2 points to it + Contains("pick").Contains("CI commit-05"), + Contains("─── Commits"), + Contains("CI commit-04"), + Contains("CI commit-03"), + Contains("CI * commit-02"), // this star is fine though + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/drag_keeps_selection_highlighted.go b/pkg/integration/tests/interactive_rebase/drag_keeps_selection_highlighted.go new file mode 100644 index 000000000..32ef54272 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/drag_keeps_selection_highlighted.go @@ -0,0 +1,35 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DragKeepsSelectionHighlighted = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Keep the original commit range highlighted while dragging sideways", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(5) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Press(keys.Universal.RangeSelectDown). + Press(keys.Universal.RangeSelectDown). + ClickAndHold(1, 1). + SelectedLines( + Contains("commit-05"), + Contains("commit-04"), + Contains("commit-03"), + ). + MouseMove(10, 1). + SelectedLines( + Contains("commit-05"), + Contains("commit-04"), + Contains("commit-03"), + ). + MouseRelease() + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/drag_to_reorder.go b/pkg/integration/tests/interactive_rebase/drag_to_reorder.go new file mode 100644 index 000000000..4d2f883a0 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/drag_to_reorder.go @@ -0,0 +1,107 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DragToReorder = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Drag a selected commit range multiple rows in one operation", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(5) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Press(keys.Universal.RangeSelectDown). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + ). + ClickAndHold(1, 1). + MouseMove(1, 3). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("drop here"), + Contains("commit-01"), + ). + PressEscape(). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + ). + MouseMove(1, 4). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + ). + MouseRelease(). + ClickAndHold(1, 1). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + ). + MouseMove(1, 3). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("drop here"), + Contains("commit-01"), + ). + SelectNextItem(). + SelectedLines( + Contains("commit-03"), + ). + MouseRelease(). + TopLines( + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-01"), + ). + ClickAndHold(1, 2). + MouseMove(1, 0). + TopLines( + Contains("drop here"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-01"), + ). + MouseRelease(). + TopLines( + Contains("commit-05").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + ). + ClickAndHold(1, 1). + MouseRelease(). + SelectedLines( + Contains("commit-04"), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/drag_to_reorder_in_rebase.go b/pkg/integration/tests/interactive_rebase/drag_to_reorder_in_rebase.go new file mode 100644 index 000000000..1d27a1635 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/drag_to_reorder_in_rebase.go @@ -0,0 +1,72 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DragToReorderInRebase = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Drag rebase todos without allowing real commits to move", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(5) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + NavigateToLine(Contains("commit-01")). + Press(keys.Universal.Edit). + Lines( + Contains("─── Pending rebase todos"), + Contains("commit-05"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02"), + Contains("─── Commits"), + Contains("commit-01").IsSelected(), + ). + NavigateToLine(Contains("commit-05")). + ClickAndHold(1, 1). + MouseMove(1, 6). + Lines( + Contains("─── Pending rebase todos"), + Contains("commit-05").IsSelected(), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02"), + Contains("drop here"), + Contains("─── Commits"), + Contains("commit-01"), + ). + MouseRelease(). + Lines( + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-05").IsSelected(), + Contains("─── Commits"), + Contains("commit-01"), + ). + NavigateToLine(Contains("commit-01")). + ClickAndHold(1, 6). + MouseMove(1, 4). + SelectedLines( + Contains("commit-05"), + Contains("─── Commits"), + Contains("commit-01"), + ). + MouseRelease(). + Lines( + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-05").IsSelected(), + Contains("─── Commits").IsSelected(), + Contains("commit-01").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/drag_to_reorder_with_autoscroll.go b/pkg/integration/tests/interactive_rebase/drag_to_reorder_with_autoscroll.go new file mode 100644 index 000000000..fdfdb8bc8 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/drag_to_reorder_with_autoscroll.go @@ -0,0 +1,43 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DragToReorderWithAutoscroll = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Keep scrolling commits while a dragged commit is held at the panel edge", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(40) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + TopLines( + Contains("commit-40").IsSelected(), + ). + // Click and hold the first commit + ClickAndHold(1, 0). + // Move the mouse to the bottom of the panel to trigger autoscroll + MouseMoveToBottom(1). + // Verify that the view scrolls + OriginYAtLeast(3). + // Move the mouse back into the viewport + MouseMove(1, 1). + // This keeps the scroll as it was + OriginYAtLeast(3). + MouseRelease(). + SelectedLines( + Contains("commit-40"), + ). + SelectedLineIdxAtLeast(3). + // Scroll back to verify that the original commit is no longer at the top + GotoTop(). + TopLines( + Contains("commit-39").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/drop_commit_in_copied_branch_with_update_ref.go b/pkg/integration/tests/interactive_rebase/drop_commit_in_copied_branch_with_update_ref.go index 81462296b..b66dcd2d7 100644 --- a/pkg/integration/tests/interactive_rebase/drop_commit_in_copied_branch_with_update_ref.go +++ b/pkg/integration/tests/interactive_rebase/drop_commit_in_copied_branch_with_update_ref.go @@ -25,11 +25,11 @@ var DropCommitInCopiedBranchWithUpdateRef = NewIntegrationTest(NewIntegrationTes t.Views().Commits(). Focus(). Lines( - Contains("CI * commit 03").IsSelected(), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI * commit-03").IsSelected(), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Remove). Tap(func() { t.ExpectPopup().Confirmation(). @@ -38,8 +38,8 @@ var DropCommitInCopiedBranchWithUpdateRef = NewIntegrationTest(NewIntegrationTes Confirm() }). Lines( - Contains("CI commit 03"), // no start on this commit because branch1 is no longer pointing to it - Contains("CI commit 01"), + Contains("CI commit-03"), // no start on this commit because branch1 is no longer pointing to it + Contains("CI commit-01"), ) t.Views().Branches(). @@ -48,9 +48,9 @@ var DropCommitInCopiedBranchWithUpdateRef = NewIntegrationTest(NewIntegrationTes PressPrimaryAction() t.Views().Commits().Lines( - Contains("CI commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/drop_merge_commit.go b/pkg/integration/tests/interactive_rebase/drop_merge_commit.go index 0011baf7d..69af05c25 100644 --- a/pkg/integration/tests/interactive_rebase/drop_merge_commit.go +++ b/pkg/integration/tests/interactive_rebase/drop_merge_commit.go @@ -18,14 +18,14 @@ var DropMergeCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI ⏣─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), - Contains("CI │ ◯ * second-change-branch unrelated change"), - Contains("CI │ ◯ second change"), - Contains("CI ◯ │ first change"), - Contains("CI ◯─╯ * original"), - Contains("CI ◯ three"), - Contains("CI ◯ two"), - Contains("CI ◯ one"), + Contains("CI ◎─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + Contains("CI │ ○ * second-change-branch unrelated change"), + Contains("CI │ ○ second change"), + Contains("CI ○ │ first change"), + Contains("CI ○─╯ * original"), + Contains("CI ○ three"), + Contains("CI ○ two"), + Contains("CI ○ one"), ). Press(keys.Universal.Remove). Tap(func() { @@ -35,11 +35,11 @@ var DropMergeCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("CI ◯ first change").IsSelected(), - Contains("CI ◯ * original"), - Contains("CI ◯ three"), - Contains("CI ◯ two"), - Contains("CI ◯ one"), + Contains("CI ○ first change").IsSelected(), + Contains("CI ○ * original"), + Contains("CI ○ three"), + Contains("CI ○ two"), + Contains("CI ○ one"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go index ca481e986..90208c95d 100644 --- a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go +++ b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go @@ -28,32 +28,32 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI commit 07").IsSelected(), - Contains("CI commit 06"), - Contains("CI commit 05"), - Contains("CI * commit 04"), - Contains("CI commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-07").IsSelected(), + Contains("CI commit-06"), + Contains("CI commit-05"), + Contains("CI * commit-04"), + Contains("CI commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 07"), - Contains("pick").Contains("CI commit 06"), - Contains("pick").Contains("CI commit 05"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-07"), + Contains("pick").Contains("CI commit-06"), + Contains("pick").Contains("CI commit-05"), Contains("update-ref").Contains("branch1").DoesNotContain("*"), - Contains("pick").Contains("CI commit 04"), - Contains("pick").Contains("CI commit 03"), - Contains("--- Commits ---"), - Contains("CI commit 02").IsSelected(), - Contains("CI commit 01"), + Contains("pick").Contains("CI commit-04"), + Contains("pick").Contains("CI commit-03"), + Contains("─── Commits"), + Contains("CI commit-02").IsSelected(), + Contains("CI commit-01"), ). Tap(func() { - t.Views().Main().Content(Contains("commit 02")) + t.Views().Main().Content(Contains("commit-02")) }). - NavigateToLine(Contains("commit 06")). + NavigateToLine(Contains("commit-06")). Press(keys.Universal.Remove) t.Common().ContinueRebase() @@ -61,12 +61,12 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("CI commit 07"), - Contains("CI commit 05"), - Contains("CI * commit 04"), - Contains("CI commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-07"), + Contains("CI commit-05"), + Contains("CI * commit-04"), + Contains("CI commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go b/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go index a6868e44f..734567d00 100644 --- a/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go +++ b/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go @@ -17,8 +17,8 @@ var DropWithCustomCommentChar = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits().Focus(). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Universal.Remove). Tap(func() { @@ -28,7 +28,7 @@ var DropWithCustomCommentChar = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 01").IsSelected(), + Contains("commit-01").IsSelected(), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go b/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go index 2107c8a58..c340c83f3 100644 --- a/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go +++ b/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go @@ -18,18 +18,18 @@ var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.Shell().CreateFile("fixup-file", "fixup content") @@ -46,9 +46,9 @@ var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.Views().Main(). diff --git a/pkg/integration/tests/interactive_rebase/edit_first_commit.go b/pkg/integration/tests/interactive_rebase/edit_first_commit.go index f09b7f27d..8eca4e772 100644 --- a/pkg/integration/tests/interactive_rebase/edit_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/edit_first_commit.go @@ -18,23 +18,23 @@ var EditFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 02"), - Contains("--- Commits ---"), - Contains("commit 01").IsSelected(), + Contains("─── Pending rebase todos"), + Contains("commit-02"), + Contains("─── Commits"), + Contains("commit-01").IsSelected(), ). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go b/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go index 528afb7a4..87cdf4be1 100644 --- a/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go +++ b/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go @@ -28,23 +28,23 @@ var EditLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI commit 05").IsSelected(), - Contains("CI commit 04"), - Contains("CI * commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-05").IsSelected(), + Contains("CI commit-04"), + Contains("CI * commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 03")). + NavigateToLine(Contains("commit-03")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 05"), - Contains("pick").Contains("CI commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-05"), + Contains("pick").Contains("CI commit-04"), Contains("update-ref").Contains("branch1"), - Contains("--- Commits ---"), - Contains("CI * commit 03").IsSelected(), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("─── Commits"), + Contains("CI * commit-03").IsSelected(), + Contains("CI commit-02"), + Contains("CI commit-01"), ) t.Shell().CreateFile("fixup-file", "fixup content") @@ -66,11 +66,11 @@ var EditLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI commit 05"), - Contains("CI commit 04"), - Contains("CI * commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-05"), + Contains("CI commit-04"), + Contains("CI * commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go index 6a21412de..bedad3ec9 100644 --- a/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go @@ -18,17 +18,17 @@ var EditNonTodoCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("--- Commits ---"), - Contains("commit 02"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("─── Commits"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit) t.ExpectToast(Contains("Disabled: When rebasing, this action only works on a selection of TODO commits.")) diff --git a/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go b/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go index 4a6135b28..e5de3ab38 100644 --- a/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go @@ -19,26 +19,26 @@ var EditRangeSelectDownToMergeOutsideRebase = NewIntegrationTest(NewIntegrationT t.Views().Commits(). Focus(). TopLines( - Contains("CI ◯ commit 02").IsSelected(), - Contains("CI ◯ commit 01"), + Contains("CI ○ commit-02").IsSelected(), + Contains("CI ○ commit-01"), Contains("Merge branch 'second-change-branch' into first-change-branch"), ). Press(keys.Universal.RangeSelectDown). Press(keys.Universal.RangeSelectDown). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("edit CI commit 02").IsSelected(), - Contains("edit CI commit 01").IsSelected(), - Contains("--- Commits ---").IsSelected(), - Contains(" CI ⏣─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), - Contains(" CI │ ◯ * second-change-branch unrelated change"), - Contains(" CI │ ◯ second change"), - Contains(" CI ◯ │ first change"), - Contains(" CI ◯─╯ * original"), - Contains(" CI ◯ three"), - Contains(" CI ◯ two"), - Contains(" CI ◯ one"), + Contains("─── Pending rebase todos"), + Contains("edit CI commit-02").IsSelected(), + Contains("edit CI commit-01").IsSelected(), + Contains("─── Commits").IsSelected(), + Contains(" CI ◎─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + Contains(" CI │ ○ * second-change-branch unrelated change"), + Contains(" CI │ ○ second change"), + Contains(" CI ○ │ first change"), + Contains(" CI ○─╯ * original"), + Contains(" CI ○ three"), + Contains(" CI ○ two"), + Contains(" CI ○ one"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go b/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go index a86a5f0e2..f38703fc2 100644 --- a/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go @@ -26,27 +26,27 @@ var EditRangeSelectOutsideRebase = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.RangeSelectDown). Press(keys.Universal.RangeSelectDown). Lines( - Contains("CI ⏣─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), - Contains("CI │ ◯ * second-change-branch unrelated change").IsSelected(), - Contains("CI │ ◯ second change").IsSelected(), - Contains("CI ◯ │ first change").IsSelected(), - Contains("CI ◯─╯ * original").IsSelected(), - Contains("CI ◯ three").IsSelected(), - Contains("CI ◯ two"), - Contains("CI ◯ one"), + Contains("CI ◎─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + Contains("CI │ ○ * second-change-branch unrelated change").IsSelected(), + Contains("CI │ ○ second change").IsSelected(), + Contains("CI ○ │ first change").IsSelected(), + Contains("CI ○─╯ * original").IsSelected(), + Contains("CI ○ three").IsSelected(), + Contains("CI ○ two"), + Contains("CI ○ one"), ). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("merge CI Merge branch 'second-change-branch' into first-change-branch").IsSelected(), Contains("edit CI first change").IsSelected(), Contains("edit CI * second-change-branch unrelated change").IsSelected(), Contains("edit CI second change").IsSelected(), Contains("edit CI * original").IsSelected(), - Contains("--- Commits ---").IsSelected(), - Contains(" CI ◯ three").IsSelected(), - Contains(" CI ◯ two"), - Contains(" CI ◯ one"), + Contains("─── Commits").IsSelected(), + Contains(" CI ○ three").IsSelected(), + Contains(" CI ○ two"), + Contains(" CI ○ one"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go b/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go index 5e03acdd5..b395e4747 100644 --- a/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go +++ b/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go @@ -32,10 +32,10 @@ var EditTheConflCommit = NewIntegrationTest(NewIntegrationTestArgs{ }). Focus(). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit two"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit two").IsSelected(), Contains("pick").Contains("<-- CONFLICT --- commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ). NavigateToLine(Contains("<-- CONFLICT --- commit three")). diff --git a/pkg/integration/tests/interactive_rebase/fixup_first_commit.go b/pkg/integration/tests/interactive_rebase/fixup_first_commit.go index ff099d760..9dc90c5c7 100644 --- a/pkg/integration/tests/interactive_rebase/fixup_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/fixup_first_commit.go @@ -18,17 +18,17 @@ var FixupFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Commits.MarkCommitAsFixup). Tap(func() { t.ExpectToast(Equals("Disabled: There's no commit below to squash into")) }). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go b/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go index 595968c17..e040905fe 100644 --- a/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go +++ b/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go @@ -28,20 +28,20 @@ var FixupKeepMessageRebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("First Commit")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI Third Commit"), Contains("pick CI Second Commit"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("First Commit").IsSelected(), ). // Mark second commit as fixup NavigateToLine(Contains("Second Commit")). Press(keys.Commits.MarkCommitAsFixup). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI Third Commit"), Contains("fixup CI Second Commit").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("First Commit"), ). // Now set the -C flag using the SetFixupMessage keybinding @@ -53,10 +53,10 @@ var FixupKeepMessageRebase = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI Third Commit"), Contains("fixup -C CI Second Commit").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("First Commit"), ). // Continue the rebase diff --git a/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go b/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go index 73ace9105..d0053a5c7 100644 --- a/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go +++ b/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go @@ -25,19 +25,19 @@ var InteractiveRebaseOfCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI * commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI * commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), // No update-ref todo for branch1 here, even though command-line git would have added it - Contains("pick").Contains("CI commit 03"), - Contains("pick").Contains("CI commit 02"), - Contains("--- Commits ---"), - Contains("CI commit 01"), + Contains("pick").Contains("CI commit-03"), + Contains("pick").Contains("CI commit-02"), + Contains("─── Commits"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go b/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go index 11596e758..6771080d2 100644 --- a/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go +++ b/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go @@ -24,9 +24,9 @@ var InteractiveRebaseWithConflictForEditCommand = NewIntegrationTest(NewIntegrat Focus(). Lines( Contains("this will conflict").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), Contains("initial commit"), ) @@ -52,12 +52,12 @@ var InteractiveRebaseWithConflictForEditCommand = NewIntegrationTest(NewIntegrat t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("edit").Contains("<-- CONFLICT --- this will conflict").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("─── Commits"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), Contains("master commit"), Contains("initial commit"), ) diff --git a/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go b/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go index cb96b8308..e5ce2387e 100644 --- a/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go +++ b/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go @@ -18,193 +18,193 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). TopLines( - Contains("commit 10").IsSelected(), + Contains("commit-10").IsSelected(), ). - NavigateToLine(Contains("commit 05")). + NavigateToLine(Contains("commit-05")). // Start a rebase Press(keys.Universal.Edit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("pick").Contains("commit 07"), - Contains("pick").Contains("commit 06"), - Contains("--- Commits ---"), - Contains("commit 05").IsSelected(), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("pick").Contains("commit-07"), + Contains("pick").Contains("commit-06"), + Contains("─── Commits"), + Contains("commit-05").IsSelected(), + Contains("commit-04"), ). SelectPreviousItem(). // perform various actions on a range of commits Press(keys.Universal.RangeSelectUp). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("pick").Contains("commit 07").IsSelected(), - Contains("pick").Contains("commit 06").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("pick").Contains("commit-07").IsSelected(), + Contains("pick").Contains("commit-06").IsSelected(), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.MarkCommitAsFixup). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("fixup").Contains("commit 07").IsSelected(), - Contains("fixup").Contains("commit 06").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("fixup").Contains("commit-07").IsSelected(), + Contains("fixup").Contains("commit-06").IsSelected(), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.PickCommit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("pick").Contains("commit 07").IsSelected(), - Contains("pick").Contains("commit 06").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("pick").Contains("commit-07").IsSelected(), + Contains("pick").Contains("commit-06").IsSelected(), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Universal.Edit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("edit").Contains("commit 07").IsSelected(), - Contains("edit").Contains("commit 06").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("edit").Contains("commit-07").IsSelected(), + Contains("edit").Contains("commit-06").IsSelected(), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.SquashDown). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("squash").Contains("commit 07").IsSelected(), - Contains("squash").Contains("commit 06").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("squash").Contains("commit-07").IsSelected(), + Contains("squash").Contains("commit-06").IsSelected(), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.MoveDownCommit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("squash").Contains("commit 07").IsSelected(), - Contains("squash").Contains("commit 06").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("squash").Contains("commit-07").IsSelected(), + Contains("squash").Contains("commit-06").IsSelected(), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Tap(func() { t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("squash").Contains("commit 07").IsSelected(), - Contains("squash").Contains("commit 06").IsSelected(), - Contains("pick").Contains("commit 08"), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("squash").Contains("commit-07").IsSelected(), + Contains("squash").Contains("commit-06").IsSelected(), + Contains("pick").Contains("commit-08"), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 10"), - Contains("squash").Contains("commit 07").IsSelected(), - Contains("squash").Contains("commit 06").IsSelected(), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-10"), + Contains("squash").Contains("commit-07").IsSelected(), + Contains("squash").Contains("commit-06").IsSelected(), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("squash").Contains("commit 07").IsSelected(), - Contains("squash").Contains("commit 06").IsSelected(), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("squash").Contains("commit-07").IsSelected(), + Contains("squash").Contains("commit-06").IsSelected(), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). Press(keys.Commits.MoveUpCommit). Tap(func() { t.ExpectToast(Contains("Disabled: Cannot move any further")) }). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("squash").Contains("commit 07").IsSelected(), - Contains("squash").Contains("commit 06").IsSelected(), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08"), - Contains("--- Commits ---"), - Contains("commit 05"), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("squash").Contains("commit-07").IsSelected(), + Contains("squash").Contains("commit-06").IsSelected(), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08"), + Contains("─── Commits"), + Contains("commit-05"), + Contains("commit-04"), ). // Verify we can't perform an action on a range that includes both // TODO and non-TODO commits - NavigateToLine(Contains("commit 08")). + NavigateToLine(Contains("commit-08")). Press(keys.Universal.RangeSelectDown). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("squash").Contains("commit 07"), - Contains("squash").Contains("commit 06"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08").IsSelected(), - Contains("--- Commits ---").IsSelected(), - Contains("commit 05").IsSelected(), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("squash").Contains("commit-07"), + Contains("squash").Contains("commit-06"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08").IsSelected(), + Contains("─── Commits").IsSelected(), + Contains("commit-05").IsSelected(), + Contains("commit-04"), ). Press(keys.Commits.MarkCommitAsFixup). Tap(func() { t.ExpectToast(Contains("Disabled: When rebasing, this action only works on a selection of TODO commits.")) }). TopLines( - Contains("--- Pending rebase todos ---"), - Contains("squash").Contains("commit 07"), - Contains("squash").Contains("commit 06"), - Contains("pick").Contains("commit 10"), - Contains("pick").Contains("commit 09"), - Contains("pick").Contains("commit 08").IsSelected(), - Contains("--- Commits ---").IsSelected(), - Contains("commit 05").IsSelected(), - Contains("commit 04"), + Contains("─── Pending rebase todos"), + Contains("squash").Contains("commit-07"), + Contains("squash").Contains("commit-06"), + Contains("pick").Contains("commit-10"), + Contains("pick").Contains("commit-09"), + Contains("pick").Contains("commit-08").IsSelected(), + Contains("─── Commits").IsSelected(), + Contains("commit-05").IsSelected(), + Contains("commit-04"), ). // continue the rebase Tap(func() { t.Common().ContinueRebase() }). TopLines( - Contains("commit 10"), - Contains("commit 09"), - Contains("commit 08"), - Contains("commit 05"), + Contains("commit-10"), + Contains("commit-09"), + Contains("commit-08"), + Contains("commit-05"), // selected indexes are retained, though we may want to clear it // in future (not sure what the best behaviour is right now) - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move.go b/pkg/integration/tests/interactive_rebase/move.go index 3f1f23755..4f37f2c19 100644 --- a/pkg/integration/tests/interactive_rebase/move.go +++ b/pkg/integration/tests/interactive_rebase/move.go @@ -17,31 +17,31 @@ var Move = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 04").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("commit 03"), - Contains("commit 04").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-04").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 04").IsSelected(), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-04").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), - Contains("commit 04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + Contains("commit-04").IsSelected(), ). // assert nothing happens upon trying to move beyond the last commit Press(keys.Commits.MoveDownCommit). @@ -49,31 +49,31 @@ var Move = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), - Contains("commit 04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + Contains("commit-04").IsSelected(), ). Press(keys.Commits.MoveUpCommit). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 04").IsSelected(), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-04").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.MoveUpCommit). Lines( - Contains("commit 03"), - Contains("commit 04").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-04").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ). Press(keys.Commits.MoveUpCommit). Lines( - Contains("commit 04").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). // assert nothing happens upon trying to move beyond the first commit Press(keys.Commits.MoveUpCommit). @@ -81,10 +81,10 @@ var Move = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Lines( - Contains("commit 04").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move_across_branch_boundary_outside_rebase.go b/pkg/integration/tests/interactive_rebase/move_across_branch_boundary_outside_rebase.go index 0f341d5b5..36f1f5312 100644 --- a/pkg/integration/tests/interactive_rebase/move_across_branch_boundary_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/move_across_branch_boundary_outside_rebase.go @@ -28,20 +28,20 @@ var MoveAcrossBranchBoundaryOutsideRebase = NewIntegrationTest(NewIntegrationTes t.Views().Commits(). Focus(). Lines( - Contains("CI commit 05").IsSelected(), - Contains("CI commit 04"), - Contains("CI * commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-05").IsSelected(), + Contains("CI commit-04"), + Contains("CI * commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 04")). + NavigateToLine(Contains("commit-04")). Press(keys.Commits.MoveDownCommit). Lines( - Contains("CI commit 05"), - Contains("CI * commit 03"), - Contains("CI commit 04").IsSelected(), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-05"), + Contains("CI * commit-03"), + Contains("CI commit-04").IsSelected(), + Contains("CI commit-02"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move_in_rebase.go b/pkg/integration/tests/interactive_rebase/move_in_rebase.go index 1cc9dd785..5e518c1a2 100644 --- a/pkg/integration/tests/interactive_rebase/move_in_rebase.go +++ b/pkg/integration/tests/interactive_rebase/move_in_rebase.go @@ -17,39 +17,39 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 04").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 04"), - Contains("commit 03"), - Contains("commit 02"), - Contains("--- Commits ---"), - Contains("commit 01").IsSelected(), + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02"), + Contains("─── Commits"), + Contains("commit-01").IsSelected(), ). SelectPreviousItem(). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 04"), - Contains("commit 02").IsSelected(), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-02").IsSelected(), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-01"), ). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 02").IsSelected(), - Contains("commit 04"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-02").IsSelected(), + Contains("commit-04"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-01"), ). // assert we can't move past the top Press(keys.Commits.MoveUpCommit). @@ -57,30 +57,30 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 02").IsSelected(), - Contains("commit 04"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-02").IsSelected(), + Contains("commit-04"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 04"), - Contains("commit 02").IsSelected(), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-02").IsSelected(), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 04"), - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("─── Commits"), + Contains("commit-01"), ). // assert we can't move past the bottom Press(keys.Commits.MoveDownCommit). @@ -88,31 +88,31 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 04"), - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("─── Commits"), + Contains("commit-01"), ). // move it back up one so that we land in a different order than we started with Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 04"), - Contains("commit 02").IsSelected(), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-02").IsSelected(), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-01"), ). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("commit 04"), - Contains("commit 02").IsSelected(), - Contains("commit 03"), - Contains("commit 01"), + Contains("commit-04"), + Contains("commit-02").IsSelected(), + Contains("commit-03"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go b/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go new file mode 100644 index 000000000..1c1eead5d --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go @@ -0,0 +1,60 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// The second keypress arrives before the refresh triggered by the first one +// has rebuilt the commits model. The handler reads the selected todo from the +// model at the already-advanced selection index, so with the stale, pre-move +// model it grabs the todo the first move swapped with and moves that one back +// down — turning the two presses into a net no-op instead of moving the +// selected todo down two slots. This is what happens when holding down the +// move-down key to move a todo several slots. +// +// We continue the rebase and assert the resulting commit order rather than +// asserting the todo list, because the two presses also spawn two racing +// refreshes whose updates can land in either order, so what the todo list +// shows in the broken state is not deterministic (it can even disagree with +// the todo file). The rebase replays what's in the file. +var MoveTodoDownWithRapidKeypresses = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Move a todo down two slots with two keypresses in rapid succession", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(4) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), + ). + NavigateToLine(Contains("commit-01")). + Press(keys.Universal.Edit). + Lines( + Contains("─── Pending rebase todos"), + Contains("commit-04"), + Contains("commit-03"), + Contains("commit-02"), + Contains("─── Commits"), + Contains("commit-01").IsSelected(), + ). + NavigateToLine(Contains("commit-04")). + PressRapidly(keys.Commits.MoveDownCommit, keys.Commits.MoveDownCommit). + Tap(func() { + t.Common().ContinueRebase() + }). + Lines( + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-04"), + Contains("commit-01"), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go b/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go index 00f4ba11f..cd715fa24 100644 --- a/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go +++ b/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go @@ -23,43 +23,43 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 06"), - Contains("pick").Contains("CI commit 05"), - Contains("pick").Contains("CI commit 04"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-06"), + Contains("pick").Contains("CI commit-05"), + Contains("pick").Contains("CI commit-04"), Contains("update-ref").Contains("branch1"), - Contains("pick").Contains("CI commit 03"), - Contains("pick").Contains("CI commit 02"), - Contains("--- Commits ---"), - Contains("CI ◯ commit 01"), + Contains("pick").Contains("CI commit-03"), + Contains("pick").Contains("CI commit-02"), + Contains("─── Commits"), + Contains("CI ○ commit-01"), ). NavigateToLine(Contains("update-ref")). Press(keys.Commits.MoveUpCommit). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 06"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-06"), Contains("update-ref").Contains("branch1"), - Contains("pick").Contains("CI commit 05"), - Contains("pick").Contains("CI commit 04"), - Contains("pick").Contains("CI commit 03"), - Contains("pick").Contains("CI commit 02"), - Contains("--- Commits ---"), - Contains("CI ◯ commit 01"), + Contains("pick").Contains("CI commit-05"), + Contains("pick").Contains("CI commit-04"), + Contains("pick").Contains("CI commit-03"), + Contains("pick").Contains("CI commit-02"), + Contains("─── Commits"), + Contains("CI ○ commit-01"), ). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("CI ◯ commit 06"), - Contains("CI ◯ * commit 05"), - Contains("CI ◯ commit 04"), - Contains("CI ◯ commit 03"), - Contains("CI ◯ commit 02"), - Contains("CI ◯ commit 01"), + Contains("CI ○ commit-06"), + Contains("CI ○ * commit-05"), + Contains("CI ○ commit-04"), + Contains("CI ○ commit-03"), + Contains("CI ○ commit-02"), + Contains("CI ○ commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go b/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go index eefbcea33..db5177cff 100644 --- a/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go +++ b/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go @@ -17,18 +17,18 @@ var MoveWithCustomCommentChar = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits().Focus(). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("commit 01"), - Contains("commit 02").IsSelected(), + Contains("commit-01"), + Contains("commit-02").IsSelected(), ). Press(keys.Commits.MoveUpCommit). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/outside_rebase_range_select.go b/pkg/integration/tests/interactive_rebase/outside_rebase_range_select.go index bb42b3d95..7a0379766 100644 --- a/pkg/integration/tests/interactive_rebase/outside_rebase_range_select.go +++ b/pkg/integration/tests/interactive_rebase/outside_rebase_range_select.go @@ -18,13 +18,13 @@ var OutsideRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). TopLines( - Contains("commit 10").IsSelected(), + Contains("commit-10").IsSelected(), ). Press(keys.Universal.RangeSelectDown). TopLines( - Contains("commit 10").IsSelected(), - Contains("commit 09").IsSelected(), - Contains("commit 08"), + Contains("commit-10").IsSelected(), + Contains("commit-09").IsSelected(), + Contains("commit-08"), ). // Drop commits Press(keys.Universal.Remove). @@ -35,14 +35,14 @@ var OutsideRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). TopLines( - Contains("commit 08").IsSelected(), - Contains("commit 07"), + Contains("commit-08").IsSelected(), + Contains("commit-07"), ). Press(keys.Universal.RangeSelectDown). TopLines( - Contains("commit 08").IsSelected(), - Contains("commit 07").IsSelected(), - Contains("commit 06"), + Contains("commit-08").IsSelected(), + Contains("commit-07").IsSelected(), + Contains("commit-06"), ). // Squash commits Press(keys.Commits.SquashDown). @@ -53,27 +53,27 @@ var OutsideRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). TopLines( - Contains("commit 06").IsSelected(), - Contains("commit 05"), - Contains("commit 04"), + Contains("commit-06").IsSelected(), + Contains("commit-05"), + Contains("commit-04"), ). // Verify commit messages are concatenated Tap(func() { t.Views().Main(). ContainsLines( - Contains("commit 06"), + Contains("commit-06"), AnyString(), - Contains("commit 07"), + Contains("commit-07"), AnyString(), - Contains("commit 08"), + Contains("commit-08"), ) }). // Fixup commits Press(keys.Universal.RangeSelectDown). TopLines( - Contains("commit 06").IsSelected(), - Contains("commit 05").IsSelected(), - Contains("commit 04"), + Contains("commit-06").IsSelected(), + Contains("commit-05").IsSelected(), + Contains("commit-04"), ). Press(keys.Commits.MarkCommitAsFixup). Tap(func() { @@ -82,73 +82,73 @@ var OutsideRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). TopLines( - Contains("commit 04").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), ). // Verify commit messages are dropped Tap(func() { t.Views().Main(). Content( - Contains("commit 04"). - DoesNotContain("commit 06"). - DoesNotContain("commit 05"), + Contains("commit-04"). + DoesNotContain("commit-06"). + DoesNotContain("commit-05"), ) }). Press(keys.Universal.RangeSelectDown). TopLines( - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), - Contains("commit 02"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), + Contains("commit-02"), ). // Move commits Press(keys.Commits.MoveDownCommit). TopLines( - Contains("commit 02"), - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). TopLines( - Contains("commit 02"), - Contains("commit 01"), - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), ). Press(keys.Commits.MoveDownCommit). TopLines( - Contains("commit 02"), - Contains("commit 01"), - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), ). Tap(func() { t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("commit 02"), - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ). Press(keys.Commits.MoveUpCommit). Tap(func() { t.ExpectToast(Contains("Disabled: Cannot move any further")) }). TopLines( - Contains("commit 04").IsSelected(), - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/pick_rescheduled.go b/pkg/integration/tests/interactive_rebase/pick_rescheduled.go index af948b7cd..0822eee14 100644 --- a/pkg/integration/tests/interactive_rebase/pick_rescheduled.go +++ b/pkg/integration/tests/interactive_rebase/pick_rescheduled.go @@ -26,10 +26,10 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("one")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("three"), Contains("pick").Contains("two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("one").IsSelected(), ). Tap(func() { @@ -41,9 +41,9 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("two"), Contains("one"), ) diff --git a/pkg/integration/tests/interactive_rebase/quick_start.go b/pkg/integration/tests/interactive_rebase/quick_start.go index 07baa0616..da7020b20 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start.go +++ b/pkg/integration/tests/interactive_rebase/quick_start.go @@ -73,10 +73,10 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{ // Verify quick start picks the last commit on the main branch Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("feature-branch two").IsSelected(), Contains("feature-branch one"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("last main commit"), Contains("initial commit"), ). @@ -106,9 +106,9 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("branch-with-merge three").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("Merge branch 'branch-to-merge'"), Contains("branch-to-merge two"), Contains("branch-to-merge one"), diff --git a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go index 55be5ea4a..7189e0d37 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go +++ b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go @@ -28,27 +28,27 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI commit 07").IsSelected(), - Contains("CI commit 06"), - Contains("CI commit 05"), - Contains("CI * commit 04"), - Contains("CI commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-07").IsSelected(), + Contains("CI commit-06"), + Contains("CI commit-05"), + Contains("CI * commit-04"), + Contains("CI commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 07"), - Contains("pick").Contains("CI commit 06"), - Contains("pick").Contains("CI commit 05"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-07"), + Contains("pick").Contains("CI commit-06"), + Contains("pick").Contains("CI commit-05"), Contains("update-ref").Contains("branch1"), - Contains("pick").Contains("CI commit 04"), - Contains("pick").Contains("CI commit 03"), - Contains("CI commit 02").IsSelected(), - Contains("--- Commits ---"), - Contains("CI commit 01"), + Contains("pick").Contains("CI commit-04"), + Contains("pick").Contains("CI commit-03"), + Contains("CI commit-02").IsSelected(), + Contains("─── Commits"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go index 8ff8f1065..1bc7758f8 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go +++ b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go @@ -29,31 +29,31 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). - NavigateToLine(Contains("commit 04")). + NavigateToLine(Contains("commit-04")). Press(keys.Universal.RangeSelectDown). Press(keys.Universal.RangeSelectDown). Lines( - Contains("CI commit 07"), - Contains("CI commit 06"), - Contains("CI * commit 05"), - Contains("CI commit 04").IsSelected(), - Contains("CI * commit 03").IsSelected(), - Contains("CI commit 02").IsSelected(), - Contains("CI commit 01"), + Contains("CI commit-07"), + Contains("CI commit-06"), + Contains("CI * commit-05"), + Contains("CI commit-04").IsSelected(), + Contains("CI * commit-03").IsSelected(), + Contains("CI commit-02").IsSelected(), + Contains("CI commit-01"), ). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), - Contains("CI commit 07"), - Contains("CI commit 06"), + Contains("─── Pending rebase todos"), + Contains("CI commit-07"), + Contains("CI commit-06"), Contains("update-ref").Contains("branch2"), - Contains("CI commit 05"), - Contains("CI commit 04").IsSelected(), + Contains("CI commit-05"), + Contains("CI commit-04").IsSelected(), Contains("update-ref").Contains("branch1").IsSelected(), - Contains("CI commit 03").IsSelected(), - Contains("CI commit 02").IsSelected(), - Contains("--- Commits ---"), - Contains("CI commit 01"), + Contains("CI commit-03").IsSelected(), + Contains("CI commit-02").IsSelected(), + Contains("─── Commits"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/rebase.go b/pkg/integration/tests/interactive_rebase/rebase.go index e1940ff7a..d829abf9a 100644 --- a/pkg/integration/tests/interactive_rebase/rebase.go +++ b/pkg/integration/tests/interactive_rebase/rebase.go @@ -34,60 +34,60 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("first commit to edit")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("pick.*commit to drop"), MatchesRegexp("pick.*second commit to edit"), MatchesRegexp("pick.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit").IsSelected(), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Commits.SquashDown). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("pick.*commit to drop"), MatchesRegexp("pick.*second commit to edit"), MatchesRegexp("squash.*commit to squash").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("pick.*commit to drop"), MatchesRegexp("edit.*second commit to edit").IsSelected(), MatchesRegexp("squash.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Universal.Remove). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("drop.*commit to drop").IsSelected(), MatchesRegexp("edit.*second commit to edit"), MatchesRegexp("squash.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Commits.MarkCommitAsFixup). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("fixup.*commit to fixup").IsSelected(), MatchesRegexp("drop.*commit to drop"), MatchesRegexp("edit.*second commit to edit"), MatchesRegexp("squash.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). @@ -95,10 +95,10 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().ContinueRebase() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("fixup.*commit to fixup").IsSelected(), MatchesRegexp("drop.*commit to drop"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("second commit to edit"), MatchesRegexp("first commit to edit"), Contains("initial commit"), diff --git a/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go b/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go index 16a2b8c25..3024e39da 100644 --- a/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go +++ b/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go @@ -20,22 +20,22 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA t.Views().Commits(). Focus(). Lines( - Contains("commit 04").IsSelected(), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-04").IsSelected(), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), Contains("master commit 2"), Contains("master commit 1"), ). - NavigateToLine(Contains("commit 03")). + NavigateToLine(Contains("commit-03")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 04"), - Contains("--- Commits ---"), - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-04"), + Contains("─── Commits"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), Contains("master commit 2"), Contains("master commit 1"), ). @@ -49,14 +49,14 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit 04"), - Contains("--- Commits ---"), - Contains(`Revert "commit 01"`), - Contains(`Revert "commit 02"`), - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("commit 01").IsSelected(), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("commit-04"), + Contains("─── Commits"), + Contains(`Revert "commit-01"`), + Contains(`Revert "commit-02"`), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("commit-01").IsSelected(), Contains("master commit 2"), Contains("master commit 1"), ) diff --git a/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go index 529c0a5ec..630edc823 100644 --- a/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go @@ -26,12 +26,12 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration t.Views().Commits(). Focus(). Lines( - Contains("CI ◯ unrelated change 3").IsSelected(), - Contains("CI ◯ unrelated change 2"), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change 1"), - Contains("CI ◯ add empty file"), + Contains("CI ○ unrelated change 3").IsSelected(), + Contains("CI ○ unrelated change 2"), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change 1"), + Contains("CI ○ add empty file"), ). NavigateToLine(Contains("add second line")). Press(keys.Universal.Edit). @@ -50,17 +50,17 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("CI unrelated change 3"), Contains("CI unrelated change 2"), - Contains("--- Pending reverts ---"), + Contains("─── Pending reverts"), Contains("revert").Contains("CI unrelated change 1"), - Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change 1"), - Contains("CI ◯ add empty file"), + Contains("revert").Contains("CI <-- CONFLICT --- add first line").IsSelected(), + Contains("─── Commits"), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change 1"), + Contains("CI ○ add empty file"), ) t.Views().Options().Content(Contains("View revert options: m")) @@ -83,16 +83,16 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI unrelated change 3"), Contains("pick").Contains("CI unrelated change 2"), - Contains("--- Commits ---"), - Contains(`CI ◯ Revert "unrelated change 1"`), - Contains(`CI ◯ Revert "add first line"`), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change 1"), - Contains("CI ◯ add empty file"), + Contains("─── Commits"), + Contains(`CI ○ Revert "unrelated change 1"`), + Contains(`CI ○ Revert "add first line"`), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change 1"), + Contains("CI ○ add empty file"), ) t.Views().Options().Content(Contains("View rebase options: m")) @@ -102,14 +102,14 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration t.Views().Commits(). Lines( - Contains("CI ◯ unrelated change 3"), - Contains("CI ◯ unrelated change 2"), - Contains(`CI ◯ Revert "unrelated change 1"`), - Contains(`CI ◯ Revert "add first line"`), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ unrelated change 1"), - Contains("CI ◯ add empty file"), + Contains("CI ○ unrelated change 3"), + Contains("CI ○ unrelated change 2"), + Contains(`CI ○ Revert "unrelated change 1"`), + Contains(`CI ○ Revert "add first line"`), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ unrelated change 1"), + Contains("CI ○ add empty file"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go index 7126699dc..d4ba4312d 100644 --- a/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go @@ -24,11 +24,11 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes t.Views().Commits(). Focus(). Lines( - Contains("CI ◯ unrelated change 2").IsSelected(), - Contains("CI ◯ unrelated change 1"), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ add empty file"), + Contains("CI ○ unrelated change 2").IsSelected(), + Contains("CI ○ unrelated change 1"), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ). NavigateToLine(Contains("add second line")). Press(keys.Universal.Edit). @@ -45,15 +45,15 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes Cancel() // stay in commits panel }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("CI unrelated change 2"), Contains("CI unrelated change 1"), - Contains("--- Pending reverts ---"), - Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line").IsSelected(), - Contains("CI ◯ add empty file"), + Contains("─── Pending reverts"), + Contains("revert").Contains("CI <-- CONFLICT --- add first line").IsSelected(), + Contains("─── Commits"), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ). Press(keys.Commits.MoveDownCommit). Tap(func() { @@ -84,14 +84,14 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI unrelated change 2"), Contains("pick").Contains("CI unrelated change 1"), - Contains("--- Commits ---"), - Contains(`CI ◯ Revert "add first line"`), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ add empty file"), + Contains("─── Commits"), + Contains(`CI ○ Revert "add first line"`), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ) t.Views().Options().Content(Contains("View rebase options: m")) @@ -101,12 +101,12 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes t.Views().Commits(). Lines( - Contains("CI ◯ unrelated change 2"), - Contains("CI ◯ unrelated change 1"), - Contains(`CI ◯ Revert "add first line"`), - Contains("CI ◯ add second line"), - Contains("CI ◯ add first line"), - Contains("CI ◯ add empty file"), + Contains("CI ○ unrelated change 2"), + Contains("CI ○ unrelated change 1"), + Contains(`CI ○ Revert "add first line"`), + Contains("CI ○ add second line"), + Contains("CI ○ add first line"), + Contains("CI ○ add empty file"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go b/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go index df6486772..8a58be2f8 100644 --- a/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go +++ b/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go @@ -20,11 +20,11 @@ var RewordCommitWithEditorAndFail = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Commits.RenameCommitWithEditor). Tap(func() { t.ExpectPopup().Confirmation(). @@ -33,11 +33,11 @@ var RewordCommitWithEditorAndFail = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.ExpectPopup().Alert(). diff --git a/pkg/integration/tests/interactive_rebase/reword_first_commit.go b/pkg/integration/tests/interactive_rebase/reword_first_commit.go index cb9afc3c4..b61ceb93a 100644 --- a/pkg/integration/tests/interactive_rebase/reword_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_first_commit.go @@ -21,21 +21,21 @@ var RewordFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Commits.RenameCommit). Tap(func() { t.ExpectPopup().CommitMessagePanel(). Title(Equals("Reword commit")). - InitialText(Equals("commit 01")). + InitialText(Equals("commit-01")). Clear(). Type("renamed 01"). Confirm() }). Lines( - Contains("commit 02"), + Contains("commit-02"), Contains("renamed 01"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/reword_last_commit.go b/pkg/integration/tests/interactive_rebase/reword_last_commit.go index 5d3038feb..80a57cc32 100644 --- a/pkg/integration/tests/interactive_rebase/reword_last_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_last_commit.go @@ -18,21 +18,21 @@ var RewordLastCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.RenameCommit). Tap(func() { t.ExpectPopup().CommitMessagePanel(). Title(Equals("Reword commit")). - InitialText(Equals("commit 02")). + InitialText(Equals("commit-02")). Clear(). Type("renamed 02"). Confirm() }). Lines( Contains("renamed 02"), - Contains("commit 01"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/reword_last_commit_of_stacked_branch.go b/pkg/integration/tests/interactive_rebase/reword_last_commit_of_stacked_branch.go index e9cdc3a1a..b353e69cc 100644 --- a/pkg/integration/tests/interactive_rebase/reword_last_commit_of_stacked_branch.go +++ b/pkg/integration/tests/interactive_rebase/reword_last_commit_of_stacked_branch.go @@ -28,28 +28,28 @@ var RewordLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI commit 05").IsSelected(), - Contains("CI commit 04"), - Contains("CI * commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-05").IsSelected(), + Contains("CI commit-04"), + Contains("CI * commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 03")). + NavigateToLine(Contains("commit-03")). Press(keys.Commits.RenameCommit). Tap(func() { t.ExpectPopup().CommitMessagePanel(). Title(Equals("Reword commit")). - InitialText(Equals("commit 03")). + InitialText(Equals("commit-03")). Clear(). Type("renamed 03"). Confirm() }). Lines( - Contains("CI commit 05"), - Contains("CI commit 04"), + Contains("CI commit-05"), + Contains("CI commit-04"), Contains("CI * renamed 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-02"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/reword_merge_commit.go b/pkg/integration/tests/interactive_rebase/reword_merge_commit.go index 6c0969066..ce991e336 100644 --- a/pkg/integration/tests/interactive_rebase/reword_merge_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_merge_commit.go @@ -25,10 +25,10 @@ var RewordMergeCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("CI ◯ two").IsSelected(), - Contains("CI ⏣─╮ Merge branch 'first-branch'"), - Contains("CI │ ◯ one"), - Contains("CI ◯─╯ base"), + Contains("CI ○ two").IsSelected(), + Contains("CI ◎─╮ Merge branch 'first-branch'"), + Contains("CI │ ○ one"), + Contains("CI ○─╯ base"), ). SelectNextItem(). Press(keys.Commits.RenameCommit). @@ -41,10 +41,10 @@ var RewordMergeCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("CI ◯ two"), - Contains("CI ⏣─╮ renamed merge").IsSelected(), - Contains("CI │ ◯ one"), - Contains("CI ◯ ╯ base"), + Contains("CI ○ two"), + Contains("CI ◎─╮ renamed merge").IsSelected(), + Contains("CI │ ○ one"), + Contains("CI ○ ╯ base"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go index 92aaf1a43..ef34b1844 100644 --- a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go @@ -18,34 +18,34 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.RenameCommit). Tap(func() { t.ExpectPopup().CommitMessagePanel(). Title(Equals("Reword commit")). - InitialText(Equals("commit 02")). + InitialText(Equals("commit-02")). Clear(). Type("renamed 02"). Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), Contains("renamed 02").IsSelected(), - Contains("commit 01"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go index b927684fe..a4a19f42f 100644 --- a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go +++ b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go @@ -20,18 +20,18 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs t.Views().Commits(). Focus(). Lines( - Contains("commit 03").IsSelected(), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03").IsSelected(), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.RenameCommitWithEditor). Tap(func() { @@ -41,11 +41,11 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("commit 03"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("commit-03"), + Contains("─── Commits"), Contains("renamed 02").IsSelected(), - Contains("commit 01"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/shared.go b/pkg/integration/tests/interactive_rebase/shared.go index ea6626fd6..522f425c1 100644 --- a/pkg/integration/tests/interactive_rebase/shared.go +++ b/pkg/integration/tests/interactive_rebase/shared.go @@ -4,15 +4,26 @@ import ( . "github.com/jesseduffield/lazygit/pkg/integration/components" ) -func handleConflictsFromSwap(t *TestDriver, expectedCommand string) { +func handleConflictsFromSwap(t *TestDriver, expectedCommand string, selectConflict bool) { t.Common().AcknowledgeConflicts() + // If the conflict comes from directly moving a commit, we want to keep the moved commit + // selected, so selectConflict is false. In other cases (e.g. a conflict after "continue + // rebase") we want to select the conflict commit. + commitTwoMatcher := Contains("pick").Contains("commit two") + conflictMatcher := Contains(expectedCommand).Contains("<-- CONFLICT --- commit three") + if selectConflict { + conflictMatcher.IsSelected() + } else { + commitTwoMatcher.IsSelected() + } + t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("commit two"), - Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + commitTwoMatcher, + conflictMatcher, + Contains("─── Commits"), Contains("commit one"), ) diff --git a/pkg/integration/tests/interactive_rebase/show_exec_todos.go b/pkg/integration/tests/interactive_rebase/show_exec_todos.go index 1ae515845..3873f3ab4 100644 --- a/pkg/integration/tests/interactive_rebase/show_exec_todos.go +++ b/pkg/integration/tests/interactive_rebase/show_exec_todos.go @@ -12,7 +12,7 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "X", + Key: config.Keybinding{"X"}, Context: "commits", Command: "git -c core.editor=: rebase -i -x false HEAD^^", }, @@ -26,36 +26,36 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Focus(). - Press("X"). + Press(config.Keybinding{"X"}). Tap(func() { t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("Rebasing (2/4)Executing: false")).Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("exec").Contains("false"), - Contains("pick").Contains("CI commit 03"), - Contains("--- Commits ---"), - Contains("CI ◯ commit 02"), - Contains("CI ◯ commit 01"), + Contains("pick").Contains("CI commit-03"), + Contains("─── Commits"), + Contains("CI ○ commit-02"), + Contains("CI ○ commit-01"), ). Tap(func() { t.Common().ContinueRebase() t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("exit status 1")).Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("--- Commits ---"), - Contains("CI ◯ commit 03"), - Contains("CI ◯ commit 02"), - Contains("CI ◯ commit 01"), + Contains("─── Pending rebase todos"), + Contains("─── Commits"), + Contains("CI ○ commit-03"), + Contains("CI ○ commit-02"), + Contains("CI ○ commit-01"), ). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("CI ◯ commit 03"), - Contains("CI ◯ commit 02"), - Contains("CI ◯ commit 01"), + Contains("CI ○ commit-03"), + Contains("CI ○ commit-02"), + Contains("CI ○ commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/squash_down_first_commit.go b/pkg/integration/tests/interactive_rebase/squash_down_first_commit.go index 65d6bfaa7..97f3f3567 100644 --- a/pkg/integration/tests/interactive_rebase/squash_down_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/squash_down_first_commit.go @@ -18,17 +18,17 @@ var SquashDownFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Commits.SquashDown). Tap(func() { t.ExpectToast(Equals("Disabled: There's no commit below to squash into")) }). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/squash_down_second_commit.go b/pkg/integration/tests/interactive_rebase/squash_down_second_commit.go index 6068f8faa..545860e6d 100644 --- a/pkg/integration/tests/interactive_rebase/squash_down_second_commit.go +++ b/pkg/integration/tests/interactive_rebase/squash_down_second_commit.go @@ -18,11 +18,11 @@ var SquashDownSecondCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Commits.SquashDown). Tap(func() { t.ExpectPopup().Confirmation(). @@ -31,12 +31,12 @@ var SquashDownSecondCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 03"), - Contains("commit 01").IsSelected(), + Contains("commit-03"), + Contains("commit-01").IsSelected(), ) t.Views().Main(). - Content(Contains(" commit 01\n \n commit 02")). + Content(Contains(" commit-01\n \n commit-02")). Content(Contains("+file01 content")). Content(Contains("+file02 content")) }, diff --git a/pkg/integration/tests/interactive_rebase/squash_fixups_above.go b/pkg/integration/tests/interactive_rebase/squash_fixups_above.go index 467a66154..fdbcf7817 100644 --- a/pkg/integration/tests/interactive_rebase/squash_fixups_above.go +++ b/pkg/integration/tests/interactive_rebase/squash_fixups_above.go @@ -19,11 +19,11 @@ var SquashFixupsAbove = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 02")). + NavigateToLine(Contains("commit-02")). Press(keys.Commits.CreateFixupCommit). Tap(func() { t.ExpectPopup().Menu(). @@ -32,10 +32,10 @@ var SquashFixupsAbove = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("fixup! commit 02"), - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("fixup! commit-02"), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Press(keys.Commits.SquashAboveCommits). Tap(func() { @@ -45,9 +45,9 @@ var SquashFixupsAbove = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 03"), - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-03"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ) t.Views().Main(). diff --git a/pkg/integration/tests/interactive_rebase/squash_fixups_above_first_commit.go b/pkg/integration/tests/interactive_rebase/squash_fixups_above_first_commit.go index 2d71093ba..4786dfd72 100644 --- a/pkg/integration/tests/interactive_rebase/squash_fixups_above_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/squash_fixups_above_first_commit.go @@ -19,10 +19,10 @@ var SquashFixupsAboveFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("commit 02"), - Contains("commit 01"), + Contains("commit-02"), + Contains("commit-01"), ). - NavigateToLine(Contains("commit 01")). + NavigateToLine(Contains("commit-01")). Press(keys.Commits.CreateFixupCommit). Tap(func() { t.ExpectPopup().Menu(). @@ -30,7 +30,7 @@ var SquashFixupsAboveFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ Select(Contains("fixup! commit")). Confirm() }). - NavigateToLine(Contains("commit 01").DoesNotContain("fixup!")). + NavigateToLine(Contains("commit-01").DoesNotContain("fixup!")). Press(keys.Commits.SquashAboveCommits). Tap(func() { t.ExpectPopup().Menu(). @@ -39,8 +39,8 @@ var SquashFixupsAboveFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 02"), - Contains("commit 01").IsSelected(), + Contains("commit-02"), + Contains("commit-01").IsSelected(), ) t.Views().Main(). diff --git a/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go b/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go index c6721d829..7e9caeebf 100644 --- a/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go +++ b/pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go @@ -22,7 +22,7 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ Commit("fixup! master commit"). CreateNCommits(2). CreateFileAndAdd("fixup-file", "fixup content"). - Commit("fixup! commit 01") + Commit("fixup! commit-01") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). @@ -30,9 +30,9 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). SelectNextItem(). Lines( - Contains("fixup! commit 01"), - Contains("commit 02"), - Contains("commit 01").IsSelected(), + Contains("fixup! commit-01"), + Contains("commit-02"), + Contains("commit-01").IsSelected(), Contains("fixup! master commit"), Contains("master commit"), ). @@ -44,8 +44,8 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("commit 02"), - Contains("commit 01").IsSelected(), + Contains("commit-02"), + Contains("commit-01").IsSelected(), Contains("fixup! master commit"), Contains("master commit"), ) diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go index f6653f9b0..693c37a9b 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go @@ -29,25 +29,25 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit one")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit three"), Contains("commit two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one").IsSelected(), ). SelectPreviousItem(). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit two").IsSelected(), Contains("commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ). Tap(func() { t.Common().ContinueRebase() }) - handleConflictsFromSwap(t, "pick") + handleConflictsFromSwap(t, "pick", true) }, }) diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go index f5beb4374..7ee710ebe 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go @@ -29,19 +29,19 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit one")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit three"), Contains("commit two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one").IsSelected(), ). NavigateToLine(Contains("commit two")). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit two").IsSelected(), Contains("commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ). NavigateToLine(Contains("commit three")). @@ -51,6 +51,6 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().ContinueRebase() }) - handleConflictsFromSwap(t, "edit") + handleConflictsFromSwap(t, "edit", true) }, }) diff --git a/pkg/integration/tests/interactive_rebase/swap_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_with_conflict.go index 1ea71356e..5f91d9f04 100644 --- a/pkg/integration/tests/interactive_rebase/swap_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/swap_with_conflict.go @@ -28,6 +28,6 @@ var SwapWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Commits.MoveDownCommit) - handleConflictsFromSwap(t, "pick") + handleConflictsFromSwap(t, "pick", false) }, }) diff --git a/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go b/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go index f52e80703..607f94eed 100644 --- a/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go +++ b/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go @@ -28,12 +28,12 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{ Focus(). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("CI commit 03").IsSelected(), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("CI commit-03").IsSelected(), Contains("update-ref").Contains("branch1"), - Contains("pick").Contains("CI commit 02"), - Contains("--- Commits ---"), - Contains("CI commit 01"), + Contains("pick").Contains("CI commit-02"), + Contains("─── Commits"), + Contains("CI commit-01"), ). Press(keys.Universal.GoInto) diff --git a/pkg/integration/tests/misc/direnv_approves_envrc.go b/pkg/integration/tests/misc/direnv_approves_envrc.go new file mode 100644 index 000000000..60780ef19 --- /dev/null +++ b/pkg/integration/tests/misc/direnv_approves_envrc.go @@ -0,0 +1,90 @@ +package misc + +import ( + "os" + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// When the new repo's .envrc is blocked, lazygit offers the user a popup to +// approve it without leaving the app. Confirming runs `direnv allow` and +// re-runs the load so the env reaches subprocesses immediately. +var DirenvApprovesEnvrc = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Approving a blocked .envrc from the in-app popup loads its env", + ExtraCmdArgs: []string{}, + ExtraEnvVars: map[string]string{ + "PATH": "{{actualPath}}/bin:" + os.Getenv("PATH"), + }, + SetupConfig: func(cfg *config.AppConfig) { + otherRepo, _ := filepath.Abs("../other") + cfg.GetAppState().RecentRepos = []string{otherRepo} + cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ + { + Key: config.Keybinding{"X"}, + Context: "files", + Command: `echo "VAR=$LG_DIRENV_TEST" > output.txt`, + }, + } + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial") + shell.CloneNonBare("other") + + shell.CreateFile("../other/.envrc", "export LG_DIRENV_TEST=approved_value\n") + + // Fake direnv that flips behavior once `direnv allow` runs. + // Before allow: export errors with the "blocked" signal, + // status reports allowed=1 (NotAllowed). + // On allow: create a sentinel and exit 0. + // After allow: export emits the loaded delta normally. + shell.CreateFile("../bin/direnv", `#!/bin/sh +SENTINEL="$(dirname "$0")/.approved" +case "$1 $2" in +"allow "*) + touch "$SENTINEL" + exit 0 + ;; +"export json") + if [ -f "$SENTINEL" ]; then + echo '{"LG_DIRENV_TEST":"approved_value"}' + echo "direnv: loading $PWD/.envrc" >&2 + else + echo '{"LG_DIRENV_TEST":null}' + echo "direnv: error $PWD/.envrc is blocked" >&2 + exit 1 + fi + ;; +"status --json") + if [ -f "$SENTINEL" ]; then + printf '{"state":{"foundRC":{"allowed":0,"path":"%s/.envrc"}}}\n' "$PWD" + else + printf '{"state":{"foundRC":{"allowed":1,"path":"%s/.envrc"}}}\n' "$PWD" + fi + ;; +esac +`) + shell.MakeExecutable("../bin/direnv") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.GlobalPress(keys.Universal.OpenRecentRepos) + t.ExpectPopup().Menu().Title(Equals("Recent repositories")). + Lines( + Contains("other").IsSelected(), + Contains("Cancel"), + ). + Confirm() + + t.ExpectPopup().Confirmation(). + Title(Equals("Approve .envrc?")). + Content(Contains("export LG_DIRENV_TEST=approved_value")). + Confirm() + + t.Views().Files(). + Focus(). + Press(config.Keybinding{"X"}). + NavigateToLine(Contains("output.txt")) + t.Views().Main().Content(Contains("VAR=approved_value")) + }, +}) diff --git a/pkg/integration/tests/misc/direnv_loaded_on_repo_switch.go b/pkg/integration/tests/misc/direnv_loaded_on_repo_switch.go new file mode 100644 index 000000000..14470da88 --- /dev/null +++ b/pkg/integration/tests/misc/direnv_loaded_on_repo_switch.go @@ -0,0 +1,68 @@ +package misc + +import ( + "os" + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// Verifies that when the user switches repos from inside lazygit, env vars +// that direnv would load for the target repo are applied to subprocesses +// (custom commands, git hooks, etc.). The test puts a fake `direnv` binary +// on PATH so it works regardless of whether the host has real direnv +// installed. +var DirenvLoadedOnRepoSwitch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Switching repos applies direnv-loaded env vars to subprocesses", + ExtraCmdArgs: []string{}, + ExtraEnvVars: map[string]string{ + // Prepend a dir under the test fixture to PATH so our fake direnv + // wins lookup. The placeholder is resolved at run time. + "PATH": "{{actualPath}}/bin:" + os.Getenv("PATH"), + }, + SetupConfig: func(cfg *config.AppConfig) { + otherRepo, _ := filepath.Abs("../other") + cfg.GetAppState().RecentRepos = []string{otherRepo} + cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ + { + Key: config.Keybinding{"X"}, + Context: "files", + Command: `echo "VAR=$LG_DIRENV_TEST" > output.txt`, + }, + } + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial") + shell.CloneNonBare("other") + + // Fake direnv: echoes a fixed JSON delta on stdout (set + // LG_DIRENV_TEST) and a "loading" line on stderr, exactly as + // real direnv would after authorizing an .envrc. + shell.CreateFile("../bin/direnv", `#!/bin/sh +echo '{"LG_DIRENV_TEST":"from_direnv"}' +echo "direnv: loading .envrc" >&2 +`) + shell.MakeExecutable("../bin/direnv") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Switch to the "other" repo via the recent-repos menu. + t.GlobalPress(keys.Universal.OpenRecentRepos) + t.ExpectPopup().Menu().Title(Equals("Recent repositories")). + Lines( + Contains("other").IsSelected(), + Contains("Cancel"), + ). + Confirm() + + // Run the custom command; if direnv loading worked, $LG_DIRENV_TEST + // reaches the subprocess and ends up in output.txt. + t.Views().Files(). + Focus(). + Press(config.Keybinding{"X"}). + Lines( + Contains("output.txt").IsSelected(), + ) + t.Views().Main().Content(Contains("VAR=from_direnv")) + }, +}) diff --git a/pkg/integration/tests/misc/direnv_unloads_on_blocked_envrc.go b/pkg/integration/tests/misc/direnv_unloads_on_blocked_envrc.go new file mode 100644 index 000000000..541bc446a --- /dev/null +++ b/pkg/integration/tests/misc/direnv_unloads_on_blocked_envrc.go @@ -0,0 +1,76 @@ +package misc + +import ( + "os" + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// Real direnv exits non-zero when the destination .envrc isn't authorized, +// but it still emits a valid JSON delta on stdout that unloads vars from +// the previously-active .envrc. We have to apply that delta anyway, or the +// previous repo's env leaks into the new one. This test exercises the +// "skip approval" branch: the approval popup appears, the user cancels, +// and the previous repo's env is still gone. +var DirenvUnloadsOnBlockedEnvrc = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Blocked .envrc unloads the previous repo's env even if the user skips approval", + ExtraCmdArgs: []string{}, + ExtraEnvVars: map[string]string{ + "PATH": "{{actualPath}}/bin:" + os.Getenv("PATH"), + // Simulates a var that the previous repo's .envrc would have set. + "LG_DIRENV_TEST": "from_previous_repo", + }, + SetupConfig: func(cfg *config.AppConfig) { + otherRepo, _ := filepath.Abs("../other") + cfg.GetAppState().RecentRepos = []string{otherRepo} + cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ + { + Key: config.Keybinding{"X"}, + Context: "files", + Command: `echo "VAR=[$LG_DIRENV_TEST]" > output.txt`, + }, + } + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial") + shell.CloneNonBare("other") + + shell.CreateFile("../other/.envrc", "export LG_DIRENV_TEST=from_envrc\n") + + shell.CreateFile("../bin/direnv", `#!/bin/sh +case "$1 $2" in +"export json") + echo '{"LG_DIRENV_TEST":null}' + echo "direnv: error $PWD/.envrc is blocked" >&2 + exit 1 + ;; +"status --json") + printf '{"state":{"foundRC":{"allowed":1,"path":"%s/.envrc"}}}\n' "$PWD" + ;; +esac +`) + shell.MakeExecutable("../bin/direnv") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.GlobalPress(keys.Universal.OpenRecentRepos) + t.ExpectPopup().Menu().Title(Equals("Recent repositories")). + Lines( + Contains("other").IsSelected(), + Contains("Cancel"), + ). + Confirm() + + t.ExpectPopup().Confirmation(). + Title(Equals("Approve .envrc?")). + Content(Contains("export LG_DIRENV_TEST=from_envrc")). + Cancel() + + t.Views().Files(). + Focus(). + Press(config.Keybinding{"X"}). + NavigateToLine(Contains("output.txt")) + t.Views().Main().Content(Contains("VAR=[]")) + }, +}) diff --git a/pkg/integration/tests/misc/disabled_keybindings.go b/pkg/integration/tests/misc/disabled_keybindings.go deleted file mode 100644 index 7ab1ba42a..000000000 --- a/pkg/integration/tests/misc/disabled_keybindings.go +++ /dev/null @@ -1,26 +0,0 @@ -package misc - -import ( - "github.com/jesseduffield/lazygit/pkg/config" - . "github.com/jesseduffield/lazygit/pkg/integration/components" -) - -var DisabledKeybindings = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Confirms you can disable keybindings by setting them to ", - ExtraCmdArgs: []string{}, - Skip: false, - SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Keybinding.Universal.PrevItem = "" - config.GetUserConfig().Keybinding.Universal.NextItem = "" - config.GetUserConfig().Keybinding.Universal.NextTab = "" - config.GetUserConfig().Keybinding.Universal.PrevTab = "" - }, - SetupRepo: func(shell *Shell) {}, - Run: func(t *TestDriver, keys config.KeybindingConfig) { - t.Views().Files(). - IsFocused(). - Press("") - - t.Views().Worktrees().IsFocused() - }, -}) diff --git a/pkg/integration/tests/misc/filter_recent_repos.go b/pkg/integration/tests/misc/filter_recent_repos.go new file mode 100644 index 000000000..a54ca51db --- /dev/null +++ b/pkg/integration/tests/misc/filter_recent_repos.go @@ -0,0 +1,37 @@ +package misc + +import ( + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FilterRecentRepos = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Switching to a recent repository by typing part of its name", + ExtraCmdArgs: []string{}, + ExtraEnvVars: map[string]string{ + "SHOW_RECENT_REPOS": "true", + }, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + // the first entry is the repo we're in, so it isn't offered + current, _ := filepath.Abs(".") + other, _ := filepath.Abs("../other") + target, _ := filepath.Abs("../target") + cfg.GetAppState().RecentRepos = []string{current, other, target} + }, + SetupRepo: func(shell *Shell) { + shell.CloneNonBare("other") + shell.CloneNonBare("target") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.ExpectPopup().Menu(). + Title(Equals("Recent repositories")). + Filter("target"). + Lines(Contains("target").IsSelected()). + Confirm() + + t.Views().Status().Content(Contains("target → master")) + }, +}) diff --git a/pkg/integration/tests/misc/start_in_git_dir.go b/pkg/integration/tests/misc/start_in_git_dir.go new file mode 100644 index 000000000..5fffcc2a9 --- /dev/null +++ b/pkg/integration/tests/misc/start_in_git_dir.go @@ -0,0 +1,34 @@ +package misc + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StartInGitDir = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Start lazygit in a repo's .git dir, and have it open the repo", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("blah", "original content\n") + shell.Commit("initial commit") + shell.UpdateFile("blah", "updated content\n") + + // this is where lazygit will start + shell.Chdir(".git") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("initial commit"), + ) + + // we're in the work tree the .git belongs to, not in the .git itself + t.Views().Files(). + IsFocused(). + Lines( + Contains(" M blah"), + ) + }, +}) diff --git a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go index 1a09cea7a..d9f99a703 100644 --- a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go +++ b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go @@ -83,11 +83,10 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). Focus(). Lines( - Equals("▼ /").IsSelected(), - Equals(" M file1"), + Equals("▼ /"), + Equals(" M file1").IsSelected(), Equals(" M file2"), - ). - SelectNextItem() + ) t.Views().Main(). ContainsLines( diff --git a/pkg/integration/tests/patch_building/copy_renamed_file_diff.go b/pkg/integration/tests/patch_building/copy_renamed_file_diff.go new file mode 100644 index 000000000..6343527e5 --- /dev/null +++ b/pkg/integration/tests/patch_building/copy_renamed_file_diff.go @@ -0,0 +1,60 @@ +package patch_building + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// note: this is required to simulate the clipboard during CI +func expectClipboard(t *TestDriver, matcher *TextMatcher) { + defer t.Shell().DeleteFile("clipboard") + + t.FileSystem().FileContent("clipboard", matcher) +} + +var CopyRenamedFileDiff = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Copy the diff of a renamed file to the clipboard; the diff shows the rename rather than a delete and add", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard" + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n") + shell.Commit("first commit") + + shell.RenameFileInGit("original", "renamed") + shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n") + shell.Commit("rename with modification") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("rename with modification").IsSelected(), + Contains("first commit"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("original → renamed").IsSelected(), + ). + Press(keys.Files.CopyFileInfoToClipboard) + + t.ExpectPopup().Menu(). + Title(Equals("Copy to clipboard")). + Select(Contains("Diff of selected file")). + Confirm() + + t.ExpectToast(Contains("File diff copied to clipboard")) + + expectClipboard(t, + Contains("rename from original"). + Contains("rename to renamed"). + Contains("-line2"). + Contains("+line2 changed"), + ) + }, +}) diff --git a/pkg/integration/tests/patch_building/move_to_earlier_commit_from_added_file.go b/pkg/integration/tests/patch_building/move_to_earlier_commit_from_added_file.go index a619128fa..7f0d3584f 100644 --- a/pkg/integration/tests/patch_building/move_to_earlier_commit_from_added_file.go +++ b/pkg/integration/tests/patch_building/move_to_earlier_commit_from_added_file.go @@ -76,10 +76,11 @@ var MoveToEarlierCommitFromAddedFile = NewIntegrationTest(NewIntegrationTestArgs t.Views().Commits(). Focus(). Lines( - Contains("commit to move from"), - Contains("destination commit").IsSelected(), + Contains("commit to move from").IsSelected(), + Contains("destination commit"), Contains("first commit"), ). + NavigateToLine(Contains("destination commit")). PressEnter() t.Views().CommitFiles(). diff --git a/pkg/integration/tests/patch_building/move_to_new_commit_in_last_commit_of_stacked_branch.go b/pkg/integration/tests/patch_building/move_to_new_commit_in_last_commit_of_stacked_branch.go index c9fd80d0e..67170b35a 100644 --- a/pkg/integration/tests/patch_building/move_to_new_commit_in_last_commit_of_stacked_branch.go +++ b/pkg/integration/tests/patch_building/move_to_new_commit_in_last_commit_of_stacked_branch.go @@ -15,12 +15,12 @@ var MoveToNewCommitInLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrati }, SetupRepo: func(shell *Shell) { shell. - EmptyCommit("commit 01"). + EmptyCommit("commit-01"). NewBranch("branch1"). - EmptyCommit("commit 02"). + EmptyCommit("commit-02"). CreateFileAndAdd("file1", "file1 content"). CreateFileAndAdd("file2", "file2 content"). - Commit("commit 03"). + Commit("commit-03"). NewBranch("branch2"). CreateNCommitsStartingAt(2, 4) @@ -30,13 +30,13 @@ var MoveToNewCommitInLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrati t.Views().Commits(). Focus(). Lines( - Contains("CI commit 05").IsSelected(), - Contains("CI commit 04"), - Contains("CI * commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-05").IsSelected(), + Contains("CI commit-04"), + Contains("CI * commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ). - NavigateToLine(Contains("commit 03")). + NavigateToLine(Contains("commit-03")). PressEnter() t.Views().CommitFiles(). @@ -61,12 +61,12 @@ var MoveToNewCommitInLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrati t.Views().Commits(). IsFocused(). Lines( - Contains("CI commit 05"), - Contains("CI commit 04"), + Contains("CI commit-05"), + Contains("CI commit-04"), Contains("CI * new commit").IsSelected(), - Contains("CI commit 03"), - Contains("CI commit 02"), - Contains("CI commit 01"), + Contains("CI commit-03"), + Contains("CI commit-02"), + Contains("CI commit-01"), ) }, }) diff --git a/pkg/integration/tests/patch_building/rename_similarity_threshold_change.go b/pkg/integration/tests/patch_building/rename_similarity_threshold_change.go new file mode 100644 index 000000000..d36e0450b --- /dev/null +++ b/pkg/integration/tests/patch_building/rename_similarity_threshold_change.go @@ -0,0 +1,66 @@ +package patch_building + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RenameSimilarityThresholdChange = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Changing the rename similarity threshold refreshes the commit files panel, but is disabled while building a patch", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("original", "one\ntwo\nthree\nfour\nfive\n") + shell.Commit("add original") + + shell.RenameFileInGit("original", "renamed") + shell.UpdateFileAndAdd("renamed", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") + shell.Commit("change name and contents") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("change name and contents").IsSelected(), + Contains("add original"), + ). + PressEnter() + + // At the default threshold of 50% the 50%-similar change is not detected + // as a rename. + t.Views().CommitFiles(). + IsFocused(). + Lines( + Equals("▼ /"), + Equals(" D original"), + Equals(" A renamed"), + ). + // Lowering the threshold turns it into a rename; the panel refreshes. + Press(keys.Universal.DecreaseRenameSimilarityThreshold). + Tap(func() { + t.ExpectToast(Equals("Changed rename similarity threshold to 45%")) + }). + Lines( + Equals("R original → renamed"), + ). + // Start building a patch from the renamed file. + PressPrimaryAction(). + Tap(func() { + t.Views().Information().Content(Contains("Building patch")) + + // Changing the threshold is now disabled: the patch builder + // can't cope with the rename turning into a delete and add. + t.Views().CommitFiles(). + Press(keys.Universal.IncreaseRenameSimilarityThreshold) + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("Cannot change the rename similarity threshold while in patch building mode")). + Confirm() + }). + // The file is unchanged: still a rename, still in the patch. + Lines( + Contains("original → renamed").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/patch_building/renamed_file_partial.go b/pkg/integration/tests/patch_building/renamed_file_partial.go new file mode 100644 index 000000000..3c37c13a2 --- /dev/null +++ b/pkg/integration/tests/patch_building/renamed_file_partial.go @@ -0,0 +1,73 @@ +package patch_building + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RenamedFilePartial = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Select part of a renamed file's changes into a custom patch and remove it from the commit, keeping the rename in place", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n") + shell.Commit("first commit") + + shell.RenameFileInGit("original", "renamed") + shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n") + shell.Commit("rename with modification") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("rename with modification").IsSelected(), + Contains("first commit"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("original → renamed").IsSelected(), + ). + PressEnter() + + // The main view shows the rename together with its content change. + t.Views().PatchBuilding(). + IsFocused(). + Content(Contains("rename from original").Contains("rename to renamed")). + ContainsLines( + Contains(" line1"), + Contains("-line2"), + Contains("+line2 changed"), + Contains(" line3"), + ). + // Add the hunk (a line selection, as opposed to adding the whole + // file), so this is a partial patch. + PressPrimaryAction() + + t.Views().Information().Content(Contains("Building patch")) + + t.Common().SelectPatchOption(Contains("Remove patch from original commit")) + + // The rename is preserved; only the content change is gone, so the file + // is still shown as a rename but now has no content change. + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("original → renamed").IsSelected(), + ) + + t.Views().Main(). + Content(DoesNotContain("line2 changed")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("rename with modification").IsSelected(), + Contains("first commit"), + ) + }, +}) diff --git a/pkg/integration/tests/patch_building/renamed_file_whole.go b/pkg/integration/tests/patch_building/renamed_file_whole.go new file mode 100644 index 000000000..f4151a766 --- /dev/null +++ b/pkg/integration/tests/patch_building/renamed_file_whole.go @@ -0,0 +1,62 @@ +package patch_building + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RenamedFileWhole = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Add a whole renamed file to a custom patch and remove it from the commit, taking the rename with it", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n") + shell.Commit("first commit") + + shell.RenameFileInGit("original", "renamed") + shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n") + shell.Commit("rename with modification") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("rename with modification").IsSelected(), + Contains("first commit"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("original → renamed").IsSelected(), + ). + PressPrimaryAction() + + t.Views().Information().Content(Contains("Building patch")) + + // The whole file is added, so the patch carries the rename itself. + t.Views().Secondary(). + ContainsLines( + Contains("rename from original"), + Contains("rename to renamed"), + ) + + t.Common().SelectPatchOption(Contains("Remove patch from original commit")) + + // The rename went with the patch, so the commit no longer touches the file. + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("(none)"), + ) + + t.Views().Commits(). + Focus(). + Lines( + Contains("rename with modification").IsSelected(), + Contains("first commit"), + ) + }, +}) diff --git a/pkg/integration/tests/patch_building/select_direcories_sharing_prefix.go b/pkg/integration/tests/patch_building/select_direcories_sharing_prefix.go new file mode 100644 index 000000000..bd20e4ff5 --- /dev/null +++ b/pkg/integration/tests/patch_building/select_direcories_sharing_prefix.go @@ -0,0 +1,53 @@ +package patch_building + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SelectDirecoriesSharingPrefix = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Select directories sharing a prefix in the commit files view and add them to a custom patch", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("foo/file", "file1 content") + shell.CreateFileAndAdd("foobar/file", "file2 content") + shell.Commit("first commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("first commit").IsSelected(), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Equals("▼ /").IsSelected(), + Equals(" ▼ foo"), + Equals(" A file"), + Equals(" ▼ foobar"), + Equals(" A file"), + ). + SelectNextItem(). + Press(keys.Universal.ToggleRangeSelect). + NavigateToLine(Contains("foobar")). + PressPrimaryAction(). + Lines( + Equals("▼ /"), + Equals(" ▼ foo").IsSelected(), + Equals(" ● file").IsSelected(), + Equals(" ▼ foobar").IsSelected(), + Equals(" ● file"), + ) + + t.Views().Information().Content(Contains("Building patch")) + + t.Views().Secondary().Content( + Contains("foo/file").Contains("foobar/file"), + ) + }, +}) diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go index b84c8c7ad..c8319acf4 100644 --- a/pkg/integration/tests/shared/conflicts.go +++ b/pkg/integration/tests/shared/conflicts.go @@ -1,6 +1,8 @@ package shared import ( + "fmt" + . "github.com/jesseduffield/lazygit/pkg/integration/components" ) @@ -28,6 +30,20 @@ Second Change File ` +// A conflict-marker-size that isn't git's default of 7. It's set for file types +// whose regular content tends to contain marker-looking lines, e.g. +// documentation about merging, or test scripts. +const CustomConflictMarkerSize = 32 + +// Makes git write conflict markers of CustomConflictMarkerSize characters into +// the file that the setups below create conflicts in. Call this before one of +// them. +var SetCustomConflictMarkerSize = func(shell *Shell) { + shell.CreateFileAndAdd(".gitattributes", + fmt.Sprintf("file conflict-marker-size=%d\n", CustomConflictMarkerSize)). + Commit("set a custom conflict marker size") +} + // prepares us for a rebase/merge that has conflicts var MergeConflictsSetup = func(shell *Shell) { shell. diff --git a/pkg/integration/tests/staging/select_next_line_after_staging_in_two_hunk_diff.go b/pkg/integration/tests/staging/select_next_line_after_staging_in_two_hunk_diff.go new file mode 100644 index 000000000..8bf264ae2 --- /dev/null +++ b/pkg/integration/tests/staging/select_next_line_after_staging_in_two_hunk_diff.go @@ -0,0 +1,61 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// Tests that after staging individual lines from a consecutive changes block, +// the cursor advances to the correct next change. The file has two separate +// hunks so that we can verify the cursor crosses hunk boundaries correctly. +var SelectNextLineAfterStagingInTwoHunkDiff = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "After staging lines from a two-hunk diff, the cursor advances correctly", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = false + }, + SetupRepo: func(shell *Shell) { + // Use 7 context lines between the two change blocks so that git creates + // two separate hunks. + shell.CreateFileAndAdd("file1", "1\n2\na\nb\nc\nd\ne\nf\ng\n3\n4\n") + shell.Commit("one") + + shell.UpdateFile("file1", "1b\n2b\na\nb\nc\nd\ne\nf\ng\n3b\n4b\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + ContainsLines( + Contains("-1"), + Contains("-2"), + Contains("+1b"), + Contains("+2b"), + Contains(" a"), + Contains(" b"), + Contains(" c"), + Contains("@@"), + Contains(" e"), + Contains(" f"), + Contains(" g"), + Contains("-3"), + Contains("-4"), + Contains("+3b"), + Contains("+4b"), + ). + NavigateToLine(Contains("-2")). + PressPrimaryAction(). + SelectedLine(Contains("+1b")). + PressPrimaryAction(). + SelectedLine(Contains("+2b")). + PressPrimaryAction(). + SelectedLine(Contains("-3")) + }, +}) diff --git a/pkg/integration/tests/staging/select_next_line_after_staging_isolated_added_line.go b/pkg/integration/tests/staging/select_next_line_after_staging_isolated_added_line.go new file mode 100644 index 000000000..221ebba38 --- /dev/null +++ b/pkg/integration/tests/staging/select_next_line_after_staging_isolated_added_line.go @@ -0,0 +1,51 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// Tests that after staging an isolated addition (one that is alone in its block of changes), the +// cursor stays at the first change of the next block of changes which moves up to the same line, +// even if that block starts with a deletion. +var SelectNextLineAfterStagingIsolatedAddedLine = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "After staging an isolated added line, the cursor advances to the next hunk's first change", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = false + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n9\n") + shell.Commit("one") + + shell.UpdateFile("file1", "1\n2\n3\nnew\n4\n5\n6\n7b\n8\n9\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + ContainsLines( + Contains(" 1"), + Contains(" 2"), + Contains(" 3"), + Contains("+new"), + Contains(" 4"), + Contains(" 5"), + Contains(" 6"), + Contains("-7"), + Contains("+7b"), + Contains(" 8"), + Contains(" 9"), + ). + SelectedLine(Contains("+new")). + PressPrimaryAction(). + SelectedLine(Contains("-7")) + }, +}) diff --git a/pkg/integration/tests/staging/stage_hunks_with_rapid_keypresses.go b/pkg/integration/tests/staging/stage_hunks_with_rapid_keypresses.go new file mode 100644 index 000000000..5b41073e2 --- /dev/null +++ b/pkg/integration/tests/staging/stage_hunks_with_rapid_keypresses.go @@ -0,0 +1,50 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// The second space is pressed before the refresh triggered by the first one +// has updated the staging panel. That refresh is what moves the selection to +// the next hunk, so the second press must not be handled until it has landed; +// handling it earlier would try to stage the first hunk a second time. +var StageHunksWithRapidKeypresses = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stage two hunks with two space presses in rapid succession", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = true + }, + SetupRepo: func(shell *Shell) { + // Use 7 context lines between the two change blocks so that git creates + // two separate hunks. + shell.CreateFileAndAdd("file1", "1\n2\na\nb\nc\nd\ne\nf\ng\n3\n4\n") + shell.Commit("one") + + shell.UpdateFile("file1", "1b\n2b\na\nb\nc\nd\ne\nf\ng\n3b\n4b\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + PressRapidly(keys.Universal.Select, keys.Universal.Select) + + t.Views().StagingSecondary(). + IsFocused(). + ContainsLines( + Contains("+1b"), + Contains("+2b"), + ). + ContainsLines( + Contains("+3b"), + Contains("+4b"), + ) + }, +}) diff --git a/pkg/integration/tests/staging/stage_partial_block_of_changes_first_lines.go b/pkg/integration/tests/staging/stage_partial_block_of_changes_first_lines.go new file mode 100644 index 000000000..0588184a0 --- /dev/null +++ b/pkg/integration/tests/staging/stage_partial_block_of_changes_first_lines.go @@ -0,0 +1,68 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StagePartialBlockOfChangesFirstLines = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stage only the first few lines of a block of consecutive changes", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = false + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") + shell.Commit("one") + + shell.UpdateFile("file1", "1\n2b\n3b\n4b\n5b\n6b\n7b\n8\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + ContainsLines( + Contains(" 1"), + Contains("-2"), + Contains("-3"), + Contains("-4"), + Contains("-5"), + Contains("-6"), + Contains("-7"), + Contains("+2b"), + Contains("+3b"), + Contains("+4b"), + Contains("+5b"), + Contains("+6b"), + Contains("+7b"), + Contains(" 8"), + ). + SelectedLines(Contains("-2")). + PressPrimaryAction(). + SelectedLines(Contains("-3")). + PressPrimaryAction(). + NavigateToLine(Contains("+2b")). + PressPrimaryAction(). + SelectedLines(Contains("+3b")). + PressPrimaryAction() + + t.Views().StagingSecondary(). + ContainsLines( + Contains(" 1"), + Contains("-2"), + Contains("-3"), + Contains("+2b"), + Contains("+3b"), + Contains(" 4"), + Contains(" 5"), + Contains(" 6"), + ) + }, +}) diff --git a/pkg/integration/tests/staging/stage_partial_block_of_changes_last_lines.go b/pkg/integration/tests/staging/stage_partial_block_of_changes_last_lines.go new file mode 100644 index 000000000..355b02292 --- /dev/null +++ b/pkg/integration/tests/staging/stage_partial_block_of_changes_last_lines.go @@ -0,0 +1,68 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StagePartialBlockOfChangesLastLines = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stage only the last few lines of a consecutive block of changes", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = false + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") + shell.Commit("one") + + shell.UpdateFile("file1", "1\n2b\n3b\n4b\n5b\n6b\n7b\n8\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + ContainsLines( + Contains(" 1"), + Contains("-2"), + Contains("-3"), + Contains("-4"), + Contains("-5"), + Contains("-6"), + Contains("-7"), + Contains("+2b"), + Contains("+3b"), + Contains("+4b"), + Contains("+5b"), + Contains("+6b"), + Contains("+7b"), + Contains(" 8"), + ). + NavigateToLine(Contains("-6")). + PressPrimaryAction(). + SelectedLines(Contains("-7")). + PressPrimaryAction(). + NavigateToLine(Contains("+6b")). + PressPrimaryAction(). + SelectedLines(Contains("+7b")). + PressPrimaryAction() + + t.Views().StagingSecondary(). + ContainsLines( + Contains(" 3"), + Contains(" 4"), + Contains(" 5"), + Contains("-6"), + Contains("-7"), + Contains("+6b"), + Contains("+7b"), + Contains(" 8"), + ) + }, +}) diff --git a/pkg/integration/tests/staging/stage_partial_block_of_changes_middle_lines.go b/pkg/integration/tests/staging/stage_partial_block_of_changes_middle_lines.go new file mode 100644 index 000000000..085c188a9 --- /dev/null +++ b/pkg/integration/tests/staging/stage_partial_block_of_changes_middle_lines.go @@ -0,0 +1,74 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StagePartialBlockOfChangesMiddleLines = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stage only the middle lines of a consecutive block of changes", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = false + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") + shell.Commit("one") + + shell.UpdateFile("file1", "1\n2b\n3b\n4b\n5b\n6b\n7b\n8\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + ContainsLines( + Contains(" 1"), + Contains("-2"), + Contains("-3"), + Contains("-4"), + Contains("-5"), + Contains("-6"), + Contains("-7"), + Contains("+2b"), + Contains("+3b"), + Contains("+4b"), + Contains("+5b"), + Contains("+6b"), + Contains("+7b"), + Contains(" 8"), + ). + NavigateToLine(Contains("-4")). + PressPrimaryAction(). + SelectedLines(Contains("-5")). + PressPrimaryAction(). + NavigateToLine(Contains("+4b")). + PressPrimaryAction(). + SelectedLines(Contains("+5b")). + PressPrimaryAction() + + t.Views().StagingSecondary(). + // This is not the desired result, ideally the added lines would come right after the + // deleted lines. However, this is hard to do, and it's a lot less common than staging + // either the first lines or last lines of a block of changes, so we live with the + // imperfection for now (but document it with a test here). + ContainsLines( + Contains(" 1"), + Contains(" 2"), + Contains(" 3"), + Contains("-4"), + Contains("-5"), + Contains(" 6"), + Contains(" 7"), + Contains("+4b"), + Contains("+5b"), + Contains(" 8"), + ) + }, +}) diff --git a/pkg/integration/tests/submodule/enter.go b/pkg/integration/tests/submodule/enter.go index 588ae2049..67df35276 100644 --- a/pkg/integration/tests/submodule/enter.go +++ b/pkg/integration/tests/submodule/enter.go @@ -12,7 +12,7 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "e", + Key: config.Keybinding{"e"}, Context: "files", Command: "git commit --allow-empty -m \"empty commit\"", }, @@ -29,7 +29,7 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Status().Content(Contains("repo")) } assertInSubmodule := func() { - t.Views().Status().Content(Contains("my_submodule_path(my_submodule_name)")) + t.Views().Status().Content(Contains("my_submodule_path")) } assertInParentRepo() @@ -44,7 +44,7 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{ assertInSubmodule() t.Views().Files().IsFocused(). - Press("e"). + Press(config.Keybinding{"e"}). Tap(func() { t.Views().Commits().Content(Contains("empty commit")) }). diff --git a/pkg/integration/tests/submodule/enter_from_dotfile_bare_repo.go b/pkg/integration/tests/submodule/enter_from_dotfile_bare_repo.go new file mode 100644 index 000000000..e5537c5f9 --- /dev/null +++ b/pkg/integration/tests/submodule/enter_from_dotfile_bare_repo.go @@ -0,0 +1,72 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// Entering a submodule and escaping back out again, in a repo that git can only +// find because we were told where it is (--git-dir/--work-tree). Entering the +// submodule has to leave that behind, since it says where the superproject is, +// so coming back out has to bring it along again. + +var EnterFromDotfileBareRepo = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Enter a submodule of a dotfile bare repo and escape back out again", + ExtraCmdArgs: []string{"--git-dir={{.actualPath}}/.bare", "--work-tree={{.actualPath}}/repo"}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + // we're going to have a directory structure like this: + // project + // - .bare (the git dir) + // - repo (the work tree, with no .git of its own) + // - my_submodule_name (the submodule's remote) + // + // The work tree is called 'repo' because that's the directory that all + // lazygit tests start in + + // make a repo for the submodule to be cloned from, using the .git dir + // that every test starts with + shell.EmptyCommit("initial submodule commit") + shell.Clone("my_submodule_name") + + // now turn the test repo into a dotfile-style bare repo + shell.DeleteFile(".git") + shell.RunCommand([]string{"git", "init", "--bare", "../.bare"}) + gitInBareRepo := []string{"git", "--git-dir=../.bare", "--work-tree=."} + shell.RunCommand(append(gitInBareRepo, "checkout", "-b", "mybranch")) + shell.CreateFile("blah", "blah\n") + shell.RunCommand(append(gitInBareRepo, "add", "blah")) + shell.RunCommand(append(gitInBareRepo, "commit", "-m", "initial commit")) + shell.RunCommand(append(gitInBareRepo, "-c", "protocol.file.allow=always", "submodule", + "add", "--name", "my_submodule_name", "../my_submodule_name", "my_submodule_path")) + shell.RunCommand(append(gitInBareRepo, "commit", "-m", "add submodule")) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + assertInParentRepo := func() { + t.Views().Status().Content(Contains("repo")) + t.Views().Commits().Lines( + Contains("add submodule"), + Contains("initial commit"), + ) + } + + assertInParentRepo() + + t.Views().Submodules().Focus(). + Lines( + Contains("my_submodule_name").IsSelected(), + ). + PressEnter() + + t.Views().Status().Content(Contains("my_submodule_path")) + t.Views().Commits().Lines( + Contains("initial submodule commit"), + ) + + t.Views().Files().IsFocused().PressEscape() + + assertInParentRepo() + t.Views().Submodules().IsFocused() + }, +}) diff --git a/pkg/integration/tests/submodule/enter_nested.go b/pkg/integration/tests/submodule/enter_nested.go index 24cdf5261..1fc96425c 100644 --- a/pkg/integration/tests/submodule/enter_nested.go +++ b/pkg/integration/tests/submodule/enter_nested.go @@ -37,7 +37,7 @@ var EnterNested = NewIntegrationTest(NewIntegrationTestArgs{ // enter the nested submodule PressEnter() - t.Views().Status().Content(Contains("innerSubPath(innerSubName)")) + t.Views().Status().Content(Contains("innerSubPath")) t.Views().Commits().ContainsLines( Contains("initial inner commit"), ) diff --git a/pkg/integration/tests/submodule/remove_nested.go b/pkg/integration/tests/submodule/remove_nested.go index fe05c0fb0..b143096cd 100644 --- a/pkg/integration/tests/submodule/remove_nested.go +++ b/pkg/integration/tests/submodule/remove_nested.go @@ -40,9 +40,9 @@ var RemoveNested = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files().IsFocused(). Lines( Equals("▼ /").IsSelected(), + Equals(" M .gitmodules"), Equals(" ▼ modules"), Equals(" D innerSubPath"), - Equals(" M .gitmodules"), ). NavigateToLine(Contains(".gitmodules")) diff --git a/pkg/integration/tests/submodule/reset.go b/pkg/integration/tests/submodule/reset.go index 5cd6d58aa..6c23bbd85 100644 --- a/pkg/integration/tests/submodule/reset.go +++ b/pkg/integration/tests/submodule/reset.go @@ -12,7 +12,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "e", + Key: config.Keybinding{"e"}, Context: "files", Command: "git commit --allow-empty -m \"empty commit\" && echo \"my_file content\" > my_file", }, @@ -31,7 +31,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Status().Content(Contains("repo")) } assertInSubmodule := func() { - t.Views().Status().Content(Contains("my_submodule_path(my_submodule_name)")) + t.Views().Status().Content(Contains("my_submodule_path")) } assertInParentRepo() @@ -46,7 +46,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ assertInSubmodule() t.Views().Files().IsFocused(). - Press("e"). + Press(config.Keybinding{"e"}). Tap(func() { t.Views().Commits().Content(Contains("empty commit")) t.Views().Files().Content(Contains("my_file")) diff --git a/pkg/integration/tests/submodule/resolve_conflict.go b/pkg/integration/tests/submodule/resolve_conflict.go new file mode 100644 index 000000000..362325624 --- /dev/null +++ b/pkg/integration/tests/submodule/resolve_conflict.go @@ -0,0 +1,82 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ResolveConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Resolve a submodule conflict (both sides moved the gitlink) by picking one side's commit", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.ShowFileTree = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path") + shell.GitAddAll() + shell.Commit("add submodule") + + sub := "my_submodule_path" + + // Two diverging commits in the submodule, so the gitlink can't be + // fast-forwarded and the merge genuinely conflicts. + shell.RunCommand([]string{"git", "-C", sub, "checkout", "-b", "left"}) + shell.RunCommand([]string{"git", "-C", sub, "commit", "--allow-empty", "-m", "left"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "-b", "right", "HEAD~1"}) + shell.RunCommand([]string{"git", "-C", sub, "commit", "--allow-empty", "-m", "right"}) + + // "ours" points the submodule at left, "theirs" at right. + shell.RunCommand([]string{"git", "checkout", "-b", "ours"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "left"}) + shell.RunCommand([]string{"git", "add", sub}) + shell.Commit("ours") + + shell.RunCommand([]string{"git", "checkout", "-b", "theirs", "HEAD~1"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "right"}) + shell.RunCommand([]string{"git", "add", sub}) + shell.Commit("theirs") + + shell.RunCommand([]string{"git", "checkout", "ours"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "left"}) + shell.RunCommandExpectError([]string{"git", "merge", "theirs"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + Focus(). + Lines( + Contains("UU my_submodule_path (submodule)").IsSelected(), + ). + Tap(func() { + // The main view explains the conflict and shows each side's + // commits as separate "current" and "incoming" logs. + t.Views().Main().Content( + Contains("Conflict: the submodule"). + Contains("Current changes:").Contains("left"). + Contains("Incoming changes:").Contains("right"), + ) + }). + // Enter opens the resolution menu instead of entering the submodule. + // The two candidate commits are shown with their summaries. + Press(keys.Universal.GoInto). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Merge conflicts")). + Select(Contains("Take current commit").Contains("left")). + Select(Contains("Take incoming commit").Contains("right")). + Cancel() + }). + // Space opens the same menu; take the incoming commit to resolve. + PressPrimaryAction(). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Merge conflicts")). + Select(Contains("Take incoming commit")). + Confirm() + }). + Lines( + Contains("M my_submodule_path (submodule)").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/submodule/resolve_conflict_rewound_side.go b/pkg/integration/tests/submodule/resolve_conflict_rewound_side.go new file mode 100644 index 000000000..06f0e8f2e --- /dev/null +++ b/pkg/integration/tests/submodule/resolve_conflict_rewound_side.go @@ -0,0 +1,63 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ResolveConflictRewoundSide = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "When a side of a submodule conflict added no commits of its own (it was rewound), the main view shows the commit it points at instead of an empty log", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.ShowFileTree = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.CloneIntoSubmodule("sub_name", "sub_path") + shell.GitAddAll() + shell.Commit("add submodule") + + sub := "sub_path" + + // Mark the submodule's initial commit, then advance it; the merge base + // will point the submodule here. + shell.RunCommand([]string{"git", "-C", sub, "branch", "initial"}) + shell.RunCommand([]string{"git", "-C", sub, "commit", "--allow-empty", "-m", "s1"}) + shell.RunCommand([]string{"git", "add", sub}) + shell.Commit("base at s1") + + // "ours" rewinds the submodule to its initial commit (so it has no + // commits of its own relative to "theirs"). + shell.RunCommand([]string{"git", "checkout", "-b", "ours"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "initial"}) + shell.RunCommand([]string{"git", "add", sub}) + shell.Commit("ours rewinds submodule") + + // "theirs" advances the submodule with a further commit. + shell.RunCommand([]string{"git", "checkout", "-b", "theirs", "HEAD~1"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "master"}) + shell.RunCommand([]string{"git", "-C", sub, "commit", "--allow-empty", "-m", "s2"}) + shell.RunCommand([]string{"git", "add", sub}) + shell.Commit("theirs advances submodule") + + shell.RunCommand([]string{"git", "checkout", "ours"}) + shell.RunCommand([]string{"git", "-C", sub, "checkout", "initial"}) + shell.RunCommandExpectError([]string{"git", "merge", "theirs"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + Focus(). + Lines( + Contains("UU sub_path (submodule)").IsSelected(), + ). + Tap(func() { + // "ours" has no commits of its own, so its section falls back to + // the commit it points at; "theirs" lists the commits it added. + t.Views().Main().Content( + Contains("Current changes:").Contains("first commit"). + Contains("Incoming changes:").Contains("s1").Contains("s2"), + ) + }) + }, +}) diff --git a/pkg/integration/tests/submodule/stage.go b/pkg/integration/tests/submodule/stage.go new file mode 100644 index 000000000..b8ef5e35f --- /dev/null +++ b/pkg/integration/tests/submodule/stage.go @@ -0,0 +1,58 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Stage = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stage and unstage a submodule that has both a new commit and dirty content. The new commit can be staged, but the dirty content can't, so unstaging must still work; this must hold for both the stage (space) and stage-all (a) keybindings.", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.ShowFileTree = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path") + shell.GitAddAll() + shell.Commit("add submodule") + + // Give the submodule a new commit, which is a change that the parent + // repo can stage, as well as some dirty working-tree content, which + // the parent repo can never stage. This is what gets us a "MM" status + // once the new commit is staged. + shell.RunCommand([]string{"git", "-C", "my_submodule_path", "commit", "--allow-empty", "-m", "submodule commit"}) + shell.CreateFile("my_submodule_path/dirty_file", "dirty content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().Focus(). + Lines( + Equals(" M my_submodule_path (submodule)").IsSelected(), + ). + // Staging the submodule stages the new commit, but the dirty + // content remains unstaged, leaving us at "MM". + PressPrimaryAction(). + Lines( + Equals("MM my_submodule_path (submodule)").IsSelected(), + ). + // Pressing again must unstage the submodule, taking us back to + // " M" rather than trying (and failing) to stage the dirty content. + PressPrimaryAction(). + Lines( + Equals(" M my_submodule_path (submodule)").IsSelected(), + ). + // The same has to hold for the stage-all keybinding, which shares + // the same decision logic: it stages the new commit... + Press(keys.Files.ToggleStagedAll). + Lines( + Equals("MM my_submodule_path (submodule)").IsSelected(), + ). + // ...and then unstages it again rather than getting stuck on the + // dirty content. + Press(keys.Files.ToggleStagedAll). + Lines( + Equals(" M my_submodule_path (submodule)").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/submodule/stage_all_with_dirty_submodule.go b/pkg/integration/tests/submodule/stage_all_with_dirty_submodule.go new file mode 100644 index 000000000..ca54a5970 --- /dev/null +++ b/pkg/integration/tests/submodule/stage_all_with_dirty_submodule.go @@ -0,0 +1,46 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StageAllWithDirtySubmodule = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A submodule with only dirty content (which can't be staged) must not break the stage-all toggle: pressing it repeatedly should keep toggling the other files between staged and unstaged.", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.ShowFileTree = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path") + shell.GitAddAll() + shell.Commit("add submodule") + + // A submodule with dirty content but no new commit (can't be staged), + // alongside a regular file that can. + shell.CreateFile("my_submodule_path/dirty_file", "dirty content") + shell.CreateFile("regular_file", "content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().Focus(). + Lines( + Equals(" M my_submodule_path (submodule)"), + Equals("?? regular_file"), + ). + // Stage all: the regular file gets staged; the submodule can't be. + Press(keys.Files.ToggleStagedAll). + Lines( + Equals(" M my_submodule_path (submodule)"), + Equals("A regular_file"), + ). + // Stage all again: nothing is stageable, but the regular file is + // staged, so this unstages it rather than erroring on the submodule. + Press(keys.Files.ToggleStagedAll). + Lines( + Equals(" M my_submodule_path (submodule)"), + Equals("?? regular_file"), + ) + }, +}) diff --git a/pkg/integration/tests/submodule/stage_dirty_only.go b/pkg/integration/tests/submodule/stage_dirty_only.go new file mode 100644 index 000000000..3ae20e677 --- /dev/null +++ b/pkg/integration/tests/submodule/stage_dirty_only.go @@ -0,0 +1,53 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StageDirtyOnly = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pressing space on a submodule that only has dirty content (no new commit) can't stage anything, so we explain that with an error instead of silently doing nothing.", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.ShowFileTree = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path") + shell.GitAddAll() + shell.Commit("add submodule") + + // Dirty working-tree content, but no new commit: there's nothing the + // parent repo can stage. + shell.CreateFile("my_submodule_path/dirty_file", "dirty content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().Focus(). + Lines( + Equals(" M my_submodule_path (submodule)").IsSelected(), + ). + PressPrimaryAction(). + Tap(func() { + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("Nothing to stage")). + Confirm() + }). + // The status is unchanged: nothing got staged. + Lines( + Equals(" M my_submodule_path (submodule)").IsSelected(), + ). + // Pressing "stage all" must behave the same way. + Press(keys.Files.ToggleStagedAll). + Tap(func() { + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("Nothing to stage")). + Confirm() + }). + Lines( + Equals(" M my_submodule_path (submodule)").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/sync/fetch_and_auto_forward_branches_worktree_added_after_startup.go b/pkg/integration/tests/sync/fetch_and_auto_forward_branches_worktree_added_after_startup.go new file mode 100644 index 000000000..bee14276a --- /dev/null +++ b/pkg/integration/tests/sync/fetch_and_auto_forward_branches_worktree_added_after_startup.go @@ -0,0 +1,59 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FetchAndAutoForwardBranchesWorktreeAddedAfterStartup = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Auto-forward skips a main branch that was externally checked out in a linked worktree after lazygit started", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Git.AutoForwardBranches = "onlyMainBranches" + config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical" + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(3) + shell.NewBranch("feature") + shell.NewBranch("wt-branch") + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + shell.SetBranchUpstream("feature", "origin/feature") + shell.Checkout("master") + shell.HardReset("HEAD^") + shell.Checkout("feature") + shell.AddWorktreeCheckout("wt-branch", "../linked-worktree") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Lines( + Contains("feature").IsSelected(), + Contains("master ↓1").DoesNotContain("↑"), + Contains("wt-branch (worktree linked-worktree)"), + ) + + // Switch the linked worktree to master externally. + t.Shell().RunCommand([]string{"git", "-C", "../linked-worktree", "checkout", "master"}) + + t.Views().Files(). + IsFocused(). + Press(keys.Files.Fetch) + + t.Views().Branches(). + Lines( + Contains("feature").IsSelected(), + Contains("master (worktree linked-worktree) ↓1"), + Contains("wt-branch").DoesNotContain("worktree"), + ) + + t.Views().Worktrees(). + Focus(). + NavigateToLine(Contains("linked-worktree")). + PressPrimaryAction() + + t.Views().Files(). + Focus(). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/sync/pull_merge.go b/pkg/integration/tests/sync/pull_merge.go index 39e447ebc..295923b56 100644 --- a/pkg/integration/tests/sync/pull_merge.go +++ b/pkg/integration/tests/sync/pull_merge.go @@ -29,7 +29,7 @@ var PullMerge = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Lines( - Contains("four"), + Contains("four").IsSelected(), Contains("one"), ) @@ -43,7 +43,7 @@ var PullMerge = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("Merge branch 'master' of ../origin"), + Contains("Merge branch 'master' of ../origin").IsSelected(), Contains("three"), Contains("two"), Contains("four"), diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go index 2bb39e14f..2e08688df 100644 --- a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go @@ -48,10 +48,10 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("five"), - Contains("pick").Contains("CONFLICT").Contains("four"), - Contains("--- Commits ---"), + Contains("pick").Contains("CONFLICT").Contains("four").IsSelected(), + Contains("─── Commits"), Contains("three"), Contains("two"), Contains("one"), @@ -83,13 +83,12 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). Lines( - Contains("five").IsSelected(), - Contains("four"), + Contains("five"), + Contains("four").IsSelected(), Contains("three"), Contains("two"), Contains("one"), - ). - SelectNextItem() + ) t.Views().Main(). Content( diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go index ad7a4806f..38b63608e 100644 --- a/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go @@ -49,20 +49,21 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg t.Views().Commits(). Focus(). Lines( - Contains("--- Pending rebase todos ---"), - Contains("pick").Contains("five").IsSelected(), - Contains("pick").Contains("CONFLICT").Contains("four"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("pick").Contains("five"), + Contains("pick").Contains("CONFLICT").Contains("four").IsSelected(), + Contains("─── Commits"), Contains("three"), Contains("two"), Contains("one"), ). + NavigateToLine(Contains("five")). Press(keys.Universal.Remove). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("drop").Contains("five").IsSelected(), Contains("pick").Contains("CONFLICT").Contains("four"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("three"), Contains("two"), Contains("one"), diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index c336cce1f..a4e732cf0 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -69,6 +69,7 @@ var tests = []*components.IntegrationTest{ branch.RebaseAndDrop, branch.RebaseCancelOnConflict, branch.RebaseConflictsFixBuildErrors, + branch.RebaseConflictsFixBuildErrorsWithOutOfDateSubmodule, branch.RebaseCopiedBranch, branch.RebaseDoesNotAutosquash, branch.RebaseFromMarkedBase, @@ -96,6 +97,7 @@ var tests = []*components.IntegrationTest{ cherry_pick.CherryPickDuringRebase, cherry_pick.CherryPickMerge, cherry_pick.CherryPickRange, + cherry_pick.CherryPickRangeAfterPaste, commit.AddCoAuthor, commit.AddCoAuthorRange, commit.AddCoAuthorWhileCommitting, @@ -124,8 +126,10 @@ var tests = []*components.IntegrationTest{ commit.CreateAmendCommit, commit.CreateFixupCommitInBranchStack, commit.CreateTag, + commit.DirectoryDiffWithRenamedFiles, commit.DisableCopyCommitMessageBody, commit.DiscardOldFileChanges, + commit.DiscardRenamedFile, commit.DiscardSubmoduleChanges, commit.DoNotShowBranchMarkerForHeadCommit, commit.FailHooksThenCommitNoHooks, @@ -137,10 +141,13 @@ var tests = []*components.IntegrationTest{ commit.Highlight, commit.History, commit.HistoryComplex, + commit.KeepClickedCommitSelectedAfterFocusIn, + commit.KeepSelectedCommitAfterExternalCommit, commit.NewBranch, commit.PasteCommitMessage, commit.PasteCommitMessageOverExisting, commit.PreserveCommitMessage, + commit.PreserveCommitMessageWhitespace, commit.ResetAuthor, commit.ResetAuthorRange, commit.Revert, @@ -158,19 +165,29 @@ var tests = []*components.IntegrationTest{ config.CustomCommandsInPerRepoConfig, config.NegativeRefspec, config.RemoteNamedStar, + config.SidePanelsInPerRepoConfig, + conflicts.ConflictMarkerSizeNotAutoStaged, + conflicts.ConflictMarkerSizeResolve, + conflicts.ContinuePromptDismissedWhenResolvedExternally, conflicts.Filter, conflicts.MergeFileBoth, conflicts.MergeFileCurrent, conflicts.MergeFileIncoming, + conflicts.PickBothHunksDiff3, conflicts.ResolveExternally, + conflicts.ResolveExternallyStartedMergeNoPrompt, conflicts.ResolveMultipleFiles, conflicts.ResolveNoAutoStage, conflicts.ResolveNonTextualConflicts, conflicts.ResolveWithoutTrailingLf, + conflicts.SpaceOnNonTextualConflict, conflicts.UndoChooseHunk, custom_commands.AccessCommitProperties, custom_commands.BasicCommand, custom_commands.CheckForConflicts, + custom_commands.ConditionalPromptFalseString, + custom_commands.ConditionalPromptFalseValue, + custom_commands.ConditionalPrompts, custom_commands.CustomCommandsSubmenu, custom_commands.CustomCommandsSubmenuWithSpecialKeybindings, custom_commands.FormPrompts, @@ -204,19 +221,24 @@ var tests = []*components.IntegrationTest{ demo.Undo, demo.WorktreeCreateFromBranches, diff.CopyToClipboard, + diff.CycleDiffRenderers, diff.Diff, diff.DiffAndApplyPatch, diff.DiffCommits, diff.DiffNonStickyRange, diff.IgnoreWhitespace, diff.RenameSimilarityThresholdChange, + file.ClickArrowToCollapse, file.CollapseExpand, file.CopyMenu, file.DirWithUntrackedFile, + file.DirectoryDiffWithRenamedFiles, file.DiscardAllDirChanges, + file.DiscardAllDirChangesWhenFiltering, file.DiscardRangeSelect, file.DiscardStagedChanges, file.DiscardUnstagedDirChanges, + file.DiscardUnstagedDirChangesWhenFiltering, file.DiscardUnstagedFileChanges, file.DiscardUnstagedRangeSelect, file.DiscardVariousChanges, @@ -228,6 +250,7 @@ var tests = []*components.IntegrationTest{ file.RenameSimilarityThresholdChange, file.RenamedFiles, file.RenamedFilesNoRootItem, + file.StageAllWithoutChangedFiles, file.StageChildrenRangeSelect, file.StageDeletedRangeSelect, file.StageRangeSelect, @@ -239,17 +262,24 @@ var tests = []*components.IntegrationTest{ filter_and_search.FilterFilesStageDirectory, filter_and_search.FilterFuzzy, filter_and_search.FilterMenu, + filter_and_search.FilterMenuAsYouType, filter_and_search.FilterMenuByKeybinding, filter_and_search.FilterMenuCancelFilterWithEscape, + filter_and_search.FilterMenuKeyHandling, filter_and_search.FilterMenuWithNoKeybindings, + filter_and_search.FilterMenuWithPrintableKeybindings, filter_and_search.FilterPreservesSelectionOnModelChange, filter_and_search.FilterRemoteBranches, filter_and_search.FilterRemotes, filter_and_search.FilterSearchHistory, filter_and_search.FilterUpdatesWhenModelChanges, + filter_and_search.FilterWorktrees, filter_and_search.NestedFilter, filter_and_search.NestedFilterTransient, filter_and_search.NewSearch, + filter_and_search.RerenderTheSearchedMainView, + filter_and_search.SearchALongDiff, + filter_and_search.SearchStatusAfterARerender, filter_and_search.StageAllStagesOnlyTrackedFilesInTrackedOnlyFilter, filter_and_search.StagingFolderStagesOnlyTrackedFilesInTrackedOnlyFilter, filter_by_author.SelectAuthor, @@ -272,6 +302,10 @@ var tests = []*components.IntegrationTest{ interactive_rebase.AmendNonHeadCommitDuringRebase, interactive_rebase.DeleteUpdateRefTodo, interactive_rebase.DontShowBranchHeadsForTodoItems, + interactive_rebase.DragKeepsSelectionHighlighted, + interactive_rebase.DragToReorder, + interactive_rebase.DragToReorderInRebase, + interactive_rebase.DragToReorderWithAutoscroll, interactive_rebase.DropCommitInCopiedBranchWithUpdateRef, interactive_rebase.DropMergeCommit, interactive_rebase.DropTodoCommitWithUpdateRef, @@ -293,6 +327,7 @@ var tests = []*components.IntegrationTest{ interactive_rebase.Move, interactive_rebase.MoveAcrossBranchBoundaryOutsideRebase, interactive_rebase.MoveInRebase, + interactive_rebase.MoveTodoDownWithRapidKeypresses, interactive_rebase.MoveUpdateRefTodo, interactive_rebase.MoveWithCustomCommentChar, interactive_rebase.OutsideRebaseRangeSelect, @@ -325,14 +360,19 @@ var tests = []*components.IntegrationTest{ misc.ConfirmOnQuit, misc.CopyConfirmationMessageToClipboard, misc.CopyToClipboard, - misc.DisabledKeybindings, + misc.DirenvApprovesEnvrc, + misc.DirenvLoadedOnRepoSwitch, + misc.DirenvUnloadsOnBlockedEnvrc, + misc.FilterRecentRepos, misc.InitialOpen, misc.RecentReposOnLaunch, + misc.StartInGitDir, patch_building.Apply, patch_building.ApplyInReverse, patch_building.ApplyInReverseWithConflict, patch_building.ApplyWithModifiedFileConflict, patch_building.ApplyWithModifiedFileNoConflict, + patch_building.CopyRenamedFileDiff, patch_building.DiscardLinesFromCommit, patch_building.EditLineInPatchBuildingPanel, patch_building.MoveRangeToIndex, @@ -355,8 +395,12 @@ var tests = []*components.IntegrationTest{ patch_building.MoveToNewCommitPartialHunk, patch_building.RemoveFromCommit, patch_building.RemovePartsOfAddedFile, + patch_building.RenameSimilarityThresholdChange, + patch_building.RenamedFilePartial, + patch_building.RenamedFileWhole, patch_building.ResetWithEscape, patch_building.SelectAllFiles, + patch_building.SelectDirecoriesSharingPrefix, patch_building.SpecificSelection, patch_building.StartNewPatch, patch_building.ToggleDirectory, @@ -377,8 +421,14 @@ var tests = []*components.IntegrationTest{ staging.DiffContextChange, staging.DiscardAllChanges, staging.Search, + staging.SelectNextLineAfterStagingInTwoHunkDiff, + staging.SelectNextLineAfterStagingIsolatedAddedLine, staging.StageHunks, + staging.StageHunksWithRapidKeypresses, staging.StageLines, + staging.StagePartialBlockOfChangesFirstLines, + staging.StagePartialBlockOfChangesLastLines, + staging.StagePartialBlockOfChangesMiddleLines, staging.StageRanges, stash.Apply, stash.ApplyPatch, @@ -405,15 +455,22 @@ var tests = []*components.IntegrationTest{ status.LogCmdStatusPanelAllBranchesLog, submodule.Add, submodule.Enter, + submodule.EnterFromDotfileBareRepo, submodule.EnterNested, submodule.Remove, submodule.RemoveNested, submodule.Reset, submodule.ResetFolder, + submodule.ResolveConflict, + submodule.ResolveConflictRewoundSide, + submodule.Stage, + submodule.StageAllWithDirtySubmodule, + submodule.StageDirtyOnly, sync.FetchAndAutoForwardBranchesAllBranches, sync.FetchAndAutoForwardBranchesAllBranchesCheckedOutInOtherWorktree, sync.FetchAndAutoForwardBranchesNone, sync.FetchAndAutoForwardBranchesOnlyMainBranches, + sync.FetchAndAutoForwardBranchesWorktreeAddedAfterStartup, sync.FetchPrune, sync.FetchWhenSortedByDate, sync.ForcePush, @@ -450,26 +507,52 @@ var tests = []*components.IntegrationTest{ tag.Reset, tag.ResetToDuplicateNamedBranch, ui.Accordion, + ui.BackgroundRefreshKeepsScrollPosition, + ui.BranchesNotFirstTab, + ui.CommitsNotFirstTab, ui.DisableSwitchTabWithPanelJumpKeys, + ui.DragBeyondViewport, ui.EmptyMenu, + ui.FilteringScrollsSelectionIntoView, + ui.FindBaseCommitForFixupScrollsIntoView, + ui.HideSidePanel, + ui.KeybindingSuggestionsDontCrashOnDisabledBindings, ui.KeybindingSuggestionsWhenSwitchingRepos, + ui.MenuScrollPositionIsReset, ui.ModeSpecificKeybindingSuggestions, + ui.MoveCommitScrollsSelectionIntoView, ui.OpenLinkFailure, + ui.PageUpAndDown, + ui.PromoteTabToSidePanel, ui.RangeSelect, + ui.RangeSelectWithAutoscroll, + ui.ReloadSidePanels, + ui.ReorderSidePanels, + ui.SubCommitsScrollPositionIsReset, + ui.SuggestionsSelectionFollowsTheFocus, + ui.SwitchRepoMovesTheSelection, ui.SwitchTabFromMenu, ui.SwitchTabWithPanelJumpKeys, + ui.ToggleWhitespaceKeepsUnfocusedSelectionDimmed, + ui.UnfocusedListHidesSelectionWhenEmptied, + ui.UnfocusedListShowsSelectionWhenFilled, undo.UndoCheckoutAndDrop, undo.UndoCommit, undo.UndoDrop, + worktree.AddForExistingBranch, worktree.AddFromBranch, worktree.AddFromBranchDetached, worktree.AddFromCommit, + worktree.AddFromRemoteBranch, + worktree.AddFromStash, + worktree.AddFromTag, worktree.AssociateBranchBisect, worktree.AssociateBranchRebase, worktree.BareRepo, worktree.BareRepoWorktreeConfig, worktree.Crud, worktree.CustomCommand, + worktree.DefaultPathTilde, worktree.DetachWorktreeFromBranch, worktree.DotfileBareRepo, worktree.DoubleNestedLinkedSubmodule, @@ -478,8 +561,16 @@ var tests = []*components.IntegrationTest{ worktree.FastForwardWorktreeBranchShouldNotPolluteCurrentWorktree, worktree.ForceRemoveWorktree, worktree.ForceRemoveWorktreeWithSubmodules, + worktree.LocationCandidates, + worktree.NewWorktreePicker, + worktree.NewWorktreePickerRemote, + worktree.RemoveWorktreeAndBothBranches, + worktree.RemoveWorktreeAndBranch, + worktree.RemoveWorktreeAndDeleteLocalAndRemoteBranch, worktree.RemoveWorktreeFromBranch, worktree.ResetWindowTabs, + worktree.SeparateWorkTreeConfig, worktree.SymlinkIntoRepoSubdir, worktree.WorktreeInRepo, + worktree.WorktreeInsideRepo, } diff --git a/pkg/integration/tests/ui/accordion.go b/pkg/integration/tests/ui/accordion.go index ef1fbaea3..0a18d2881 100644 --- a/pkg/integration/tests/ui/accordion.go +++ b/pkg/integration/tests/ui/accordion.go @@ -11,10 +11,10 @@ import ( // ╶─Files - Submodules──────0 of 0─╴│commit 6e56dd04b70e548976f7f2928c4d9c359574e2bc ▲ // ╶─Local branches - Remotes1 of 1─╴│Author: CI █ // ┌─Commits - Reflog───────────────┐│Date: Wed Jul 19 22:00:03 2023 +1000 │ -// │7fe02805 CI commit 12 ▲│ ▼ -// │6e56dd04 CI commit 11 █└────────────────────────────────────────────────────────────────┘ -// │a35c687d CI commit 10 ▼┌─Command log────────────────────────────────────────────────────┐ -// └───────────────────────10 of 20─┘│Random tip: To filter commits by path, press '' │ +// │7fe02805 CI commit-12 ▲│ ▼ +// │6e56dd04 CI commit-11 █└────────────────────────────────────────────────────────────────┘ +// │a35c687d CI commit-10 ▼┌─Command log────────────────────────────────────────────────────┐ +// └───────────────────────10 of 20─┘│Random tip: To filter commits by path, press '' │ // ╶─Stash───────────────────0 of 0─╴└────────────────────────────────────────────────────────────────┘ // /: Scroll, : Cancel, q: Quit, ?: Keybindings, 1-Donate Ask Question unversioned @@ -32,18 +32,18 @@ var Accordion = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). VisibleLines( - Contains("commit 20").IsSelected(), - Contains("commit 19"), - Contains("commit 18"), + Contains("commit-20").IsSelected(), + Contains("commit-19"), + Contains("commit-18"), ). // go past commit 11, then come back, so that it ends up in the centre of the viewport - NavigateToLine(Contains("commit 11")). - NavigateToLine(Contains("commit 10")). - NavigateToLine(Contains("commit 11")). + NavigateToLine(Contains("commit-11")). + NavigateToLine(Contains("commit-10")). + NavigateToLine(Contains("commit-11")). VisibleLines( - Contains("commit 12"), - Contains("commit 11").IsSelected(), - Contains("commit 10"), + Contains("commit-12"), + Contains("commit-11").IsSelected(), + Contains("commit-10"), ) t.Views().Files(). @@ -53,9 +53,9 @@ var Accordion = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). VisibleLines( - Contains("commit 12"), - Contains("commit 11").IsSelected(), - Contains("commit 10"), + Contains("commit-12"), + Contains("commit-11").IsSelected(), + Contains("commit-10"), ) }, }) diff --git a/pkg/integration/tests/ui/background_refresh_keeps_scroll_position.go b/pkg/integration/tests/ui/background_refresh_keeps_scroll_position.go new file mode 100644 index 000000000..e2cf6ee1e --- /dev/null +++ b/pkg/integration/tests/ui/background_refresh_keeps_scroll_position.go @@ -0,0 +1,41 @@ +package ui + +import ( + "fmt" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var BackgroundRefreshKeepsScrollPosition = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A background refresh doesn't scroll the selection back into view", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + for i := range 20 { + shell.CreateFile(fmt.Sprintf("file%02d", i), "") + } + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + Focus(). + SelectNextItem(). + SelectedLine(Contains("file00")). + // Scroll the selection out of view with the mouse wheel + ScrollWheelDown(). + ScrollWheelDown(). + OriginY(4). + Tap(func() { + t.Shell().CreateFile("aaa", "") + t.RefreshInBackground() + }). + // The new file sorts before the selected one, so the selection has + // moved down a line; the view must stay where the user left it though + SelectedLineIdx(2). + OriginY(4) + }, +}) diff --git a/pkg/integration/tests/ui/branches_not_first_tab.go b/pkg/integration/tests/ui/branches_not_first_tab.go new file mode 100644 index 000000000..47e8a4fd5 --- /dev/null +++ b/pkg/integration/tests/ui/branches_not_first_tab.go @@ -0,0 +1,31 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var BranchesNotFirstTab = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "With gui.sidePanels grouping branches behind another tab, no ghost view must appear over the side panels", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().Gui.SidePanels = []config.SidePanel{ + {"worktrees", "branches", "remotes"}, + {"files"}, + {"commits", "tags"}, + {"stash"}, + } + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // The remote branches and sub-commits views are only shown after + // drilling into a remote or a branch; at startup both must be hidden, + // or they'd cover the side panels. + t.Views().RemoteBranches(). + IsInvisible() + t.Views().SubCommits().IsInvisible() + }, +}) diff --git a/pkg/integration/tests/ui/commits_not_first_tab.go b/pkg/integration/tests/ui/commits_not_first_tab.go new file mode 100644 index 000000000..505aa4307 --- /dev/null +++ b/pkg/integration/tests/ui/commits_not_first_tab.go @@ -0,0 +1,29 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CommitsNotFirstTab = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "With gui.sidePanels grouping commits behind another tab, no ghost view must appear over the side panels", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().Gui.SidePanels = []config.SidePanel{ + {"branches", "worktrees", "remotes"}, + {"files"}, + {"tags", "commits"}, + {"stash"}, + } + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // The commit files view is only shown after drilling into a commit; at + // startup it must be hidden, or it'd cover the side panels. + t.Views().CommitFiles(). + IsInvisible() + }, +}) diff --git a/pkg/integration/tests/ui/drag_beyond_viewport.go b/pkg/integration/tests/ui/drag_beyond_viewport.go new file mode 100644 index 000000000..f756a783c --- /dev/null +++ b/pkg/integration/tests/ui/drag_beyond_viewport.go @@ -0,0 +1,37 @@ +package ui + +import ( + "fmt" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DragBeyondViewport = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Dragging a range selection beyond the bottom of the panel doesn't scroll the view", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + for i := range 20 { + shell.CreateFile(fmt.Sprintf("file%02d", i), "") + } + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + Focus(). + OriginY(0). + // The pointer ends up below the panel, so the range extends to a line + // that isn't visible. Scrolling there is the drag autoscroller's job, + // which scrolls line by line for as long as the pointer stays there; + // the drag itself must leave the scroll position alone. + ClickAndHold(1, 1). + MouseMove(1, 8). + MouseRelease(). + SelectedLineIdx(8). + OriginY(0) + }, +}) diff --git a/pkg/integration/tests/ui/empty_menu.go b/pkg/integration/tests/ui/empty_menu.go index 35c3d4560..971bcb3c8 100644 --- a/pkg/integration/tests/ui/empty_menu.go +++ b/pkg/integration/tests/ui/empty_menu.go @@ -17,16 +17,19 @@ var EmptyMenu = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Press(keys.Universal.OptionMenu) + t.ExpectPopup().Menu(). + // a string that filters everything out + Filter("ljasldkjaslkdjalskdjalsdjaslkd") + t.Views().Menu(). IsFocused(). - // a string that filters everything out - FilterOrSearch("ljasldkjaslkdjalskdjalsdjaslkd"). IsEmpty(). - Press(keys.Universal.Select). + // space is filter text in this menu, so we confirm with enter + Press(keys.Universal.ConfirmMenu). Tap(func() { t.ExpectToast(Equals("Disabled: No item selected")) }). - // escape the search + // escape the filter PressEscape(). // escape the view PressEscape() diff --git a/pkg/integration/tests/ui/filtering_scrolls_selection_into_view.go b/pkg/integration/tests/ui/filtering_scrolls_selection_into_view.go new file mode 100644 index 000000000..3f1ab4d84 --- /dev/null +++ b/pkg/integration/tests/ui/filtering_scrolls_selection_into_view.go @@ -0,0 +1,62 @@ +package ui + +import ( + "fmt" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FilteringScrollsSelectionIntoView = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Entering and leaving filtering mode scrolls the selected commit into view", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + for i := range 40 { + file := "otherFile" + if i%2 == 0 { + file = "filterFile" + } + shell.UpdateFileAndAdd(file, fmt.Sprintf("content %02d", i)) + shell.Commit(fmt.Sprintf("commit %02d", i)) + } + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Press(keys.Universal.GotoBottom). + SelectedLine(Contains("commit 00")). + OriginYAtLeast(1). + Press(keys.Universal.FilteringMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Filtering")). + Select(Contains("Enter path to filter by")). + Confirm() + t.ExpectPopup().Prompt(). + Title(Equals("Enter path:")). + Type("filterFile"). + Confirm() + + // The filtered list has nothing to do with the one that was showing, so + // its scroll position doesn't either: we start at the top again + t.Views().Commits(). + IsFocused(). + SelectedLine(Contains("commit 38")). + SelectedLineIdx(0). + OriginY(0). + Press(keys.Universal.GotoBottom). + SelectedLine(Contains("commit 00")). + PressEscape() + + // Leaving filtering mode keeps the commit selected, at its position in + // the full list, which needs scrolling to again + t.Views().Commits(). + IsFocused(). + SelectedLine(Contains("commit 00")). + SelectedLineIsVisible() + }, +}) diff --git a/pkg/integration/tests/ui/find_base_commit_for_fixup_scrolls_into_view.go b/pkg/integration/tests/ui/find_base_commit_for_fixup_scrolls_into_view.go new file mode 100644 index 000000000..b0c63dcf5 --- /dev/null +++ b/pkg/integration/tests/ui/find_base_commit_for_fixup_scrolls_into_view.go @@ -0,0 +1,35 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FindBaseCommitForFixupScrollsIntoView = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Finding the base commit for a fixup scrolls it into view", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch"). + EmptyCommit("1st commit"). + CreateFileAndAdd("file1", "line 1\nline 2\nline 3\n"). + Commit("base commit"). + CreateNCommits(40). + UpdateFile("file1", "line 1\nline 2 changed\nline 3\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + Focus(). + Press(keys.Files.FindBaseCommitForFixup) + + // The base commit is at the very bottom of the list, far below the + // visible area + t.Views().Commits(). + IsFocused(). + SelectedLine(Contains("base commit")). + SelectedLineIsVisible() + }, +}) diff --git a/pkg/integration/tests/ui/hide_side_panel.go b/pkg/integration/tests/ui/hide_side_panel.go new file mode 100644 index 000000000..95f611daa --- /dev/null +++ b/pkg/integration/tests/ui/hide_side_panel.go @@ -0,0 +1,33 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var HideSidePanel = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Hide a side panel by omitting it from gui.sidePanels", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + // No stash panel. + cfg.GetUserConfig().Gui.SidePanels = []config.SidePanel{ + {"status"}, + {"files", "worktrees", "submodules"}, + {"branches", "remotes", "tags"}, + {"commits", "reflog"}, + } + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(2) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Commits is now the last panel; cycling forward from it wraps around to + // the status panel, skipping the hidden stash panel entirely. + t.Views().Files().IsFocused(). + Press(keys.Universal.JumpToBlock[3]) + t.Views().Commits().IsFocused(). + Press(keys.Universal.NextBlock) + t.Views().Status().IsFocused() + }, +}) diff --git a/pkg/integration/tests/ui/keybinding_suggestions_dont_crash_on_disabled_bindings.go b/pkg/integration/tests/ui/keybinding_suggestions_dont_crash_on_disabled_bindings.go new file mode 100644 index 000000000..1db31595f --- /dev/null +++ b/pkg/integration/tests/ui/keybinding_suggestions_dont_crash_on_disabled_bindings.go @@ -0,0 +1,21 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var KeybindingSuggestionsDontCrashOnDisabledBindings = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Filter out keybinding suggestions whose bindings are disabled", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Keybinding.Files.StashAllChanges = []string{} + }, + SetupRepo: func(shell *Shell) {}, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().Focus() + t.Views().Options().Content( + Equals("Commit: c | Reset: D | Keybindings: ?")) + }, +}) diff --git a/pkg/integration/tests/ui/menu_scroll_position_is_reset.go b/pkg/integration/tests/ui/menu_scroll_position_is_reset.go new file mode 100644 index 000000000..448e0b995 --- /dev/null +++ b/pkg/integration/tests/ui/menu_scroll_position_is_reset.go @@ -0,0 +1,39 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var MenuScrollPositionIsReset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A menu that is opened after a scrolled down one starts at the top again", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFile("myfile", "myfile") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Universal.OptionMenu) + + t.Views().Menu(). + IsFocused(). + // The first line is a section header, so the first item is at index 1 + SelectedLineIdx(1). + OriginY(0). + Press(keys.Universal.GotoBottom). + OriginYAtLeast(1). + PressEscape() + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.OptionMenu) + + t.Views().Menu(). + IsFocused(). + SelectedLineIdx(1). + OriginY(0) + }, +}) diff --git a/pkg/integration/tests/ui/mode_specific_keybinding_suggestions.go b/pkg/integration/tests/ui/mode_specific_keybinding_suggestions.go index d64a22a38..550cac2b5 100644 --- a/pkg/integration/tests/ui/mode_specific_keybinding_suggestions.go +++ b/pkg/integration/tests/ui/mode_specific_keybinding_suggestions.go @@ -21,14 +21,14 @@ var ModeSpecificKeybindingSuggestions = NewIntegrationTest(NewIntegrationTestArg rebaseSuggestion := "View rebase options: m" cherryPickSuggestion := "Paste (cherry-pick): V" bisectSuggestion := "View bisect options: b" - customPatchSuggestion := "View custom patch options: " + customPatchSuggestion := "View custom patch options: " mergeSuggestion := "View merge options: m" t.Views().Commits(). Focus(). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit-02").IsSelected(), + Contains("commit-01"), ). Tap(func() { // These suggestions are mode-specific so are not shown by default diff --git a/pkg/integration/tests/ui/move_commit_scrolls_selection_into_view.go b/pkg/integration/tests/ui/move_commit_scrolls_selection_into_view.go new file mode 100644 index 000000000..a665b548d --- /dev/null +++ b/pkg/integration/tests/ui/move_commit_scrolls_selection_into_view.go @@ -0,0 +1,31 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var MoveCommitScrollsSelectionIntoView = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Moving a commit down scrolls it into view if it isn't visible", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(40) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + SelectedLine(Contains("commit-40")). + // Scroll the selected commit out of view with the mouse wheel + ScrollWheelDown(). + ScrollWheelDown(). + OriginY(4). + Press(keys.Commits.MoveDownCommit). + SelectedLine(Contains("commit-40")). + SelectedLineIdx(1). + SelectedLineIsVisible() + }, +}) diff --git a/pkg/integration/tests/ui/page_up_and_down.go b/pkg/integration/tests/ui/page_up_and_down.go new file mode 100644 index 000000000..603edfd92 --- /dev/null +++ b/pkg/integration/tests/ui/page_up_and_down.go @@ -0,0 +1,47 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +const ( + // The height of the commits panel in this test's window, in lines. + commitsPanelHeight = 5 + // Paging keeps one line of overlap between the old and the new page. + pageDelta = commitsPanelHeight - 1 +) + +var PageUpAndDown = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Paging down and up keeps the selection at the edge of the viewport", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(40) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + SelectedLineIdx(0). + OriginY(0). + Press(keys.Universal.NextPage). + // The selection moves to the bottom of the viewport; nothing scrolls yet + SelectedLineIdx(commitsPanelHeight - 1). + OriginY(0). + Press(keys.Universal.NextPage). + // Now the view scrolls by a page, and the selection stays at the bottom + SelectedLineIdx(commitsPanelHeight - 1 + pageDelta). + OriginY(pageDelta). + Press(keys.Universal.PrevPage). + // The selection moves to the top of the viewport; nothing scrolls + SelectedLineIdx(pageDelta). + OriginY(pageDelta). + Press(keys.Universal.PrevPage). + // And back a page, with the selection staying at the top + SelectedLineIdx(0). + OriginY(0) + }, +}) diff --git a/pkg/integration/tests/ui/promote_tab_to_side_panel.go b/pkg/integration/tests/ui/promote_tab_to_side_panel.go new file mode 100644 index 000000000..ea0fe82d0 --- /dev/null +++ b/pkg/integration/tests/ui/promote_tab_to_side_panel.go @@ -0,0 +1,40 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PromoteTabToSidePanel = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Promote the worktrees tab to its own top-level side panel via gui.sidePanels", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + // Worktrees is pulled out of the files panel into its own panel. + cfg.GetUserConfig().Gui.SidePanels = []config.SidePanel{ + {"status"}, + {"files", "submodules"}, + {"worktrees"}, + {"branches", "remotes", "tags"}, + {"commits", "reflog"}, + {"stash"}, + } + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(2) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Worktrees is now its own panel in the third position, reachable by its + // jump key rather than as a tab of the files panel. + t.Views().Files().IsFocused(). + Press(keys.Universal.JumpToBlock[2]) + t.Views().Worktrees().IsFocused(). + Press(keys.Universal.JumpToBlock[1]) + + // The files panel's tabs are now just files and submodules, so cycling + // tabs from files goes straight to submodules. + t.Views().Files().IsFocused(). + Press(keys.Universal.NextTab) + t.Views().Submodules().IsFocused() + }, +}) diff --git a/pkg/integration/tests/ui/range_select.go b/pkg/integration/tests/ui/range_select.go index b021ea65d..4c5d8420a 100644 --- a/pkg/integration/tests/ui/range_select.go +++ b/pkg/integration/tests/ui/range_select.go @@ -33,6 +33,7 @@ var RangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Skip: false, SetupConfig: func(config *config.AppConfig) { config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.ExpandFocusedSidePanel = true }, SetupRepo: func(shell *Shell) { // We're testing the commits view as our representative list context, @@ -51,6 +52,7 @@ var RangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ } shell.CreateFileAndAdd("file1", "staged\n") shell.UpdateFile("file1", fileContent) + shell.NewBranch("branch1").NewBranch("branch2") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { assertRangeSelectBehaviour := func(v *ViewDriver, focusOtherView func(), lineIdxOfFirstItem int) { @@ -179,5 +181,46 @@ var RangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ PressEnter() assertRangeSelectBehaviour(t.Views().Staging().IsFocused(), func() { t.Views().Staging().PressTab() }, 6) + + t.Views().Branches().Focus() + t.Views().Branches(). + SelectedLines( + Contains("branch2"), + ) + t.Views().Commits(). + ClickAndHold(1, 3). + MouseMoveToView(t.Views().Branches(), 1, 2). + SelectedLines( + Contains("line 1"), + Contains("line 2"), + Contains("line 3"), + Contains("line 4"), + ). + Tap(func() { + t.Views().Branches().SelectedLines( + Contains("branch2"), + ) + }). + MouseRelease() + + t.Views().Branches().Focus() + t.Views().Commits(). + ClickAndHold(1, 0). + SelectedLines( + Contains("line 1"), + ). + RepeatMouseMove(). + SelectedLines( + Contains("line 1"), + ). + MouseMove(1, 3). + SelectedLines( + Contains("line 1"), + Contains("line 2"), + Contains("line 3"), + Contains("line 4"), + ). + MouseRelease(). + Click(1, 0) }, }) diff --git a/pkg/integration/tests/ui/range_select_with_autoscroll.go b/pkg/integration/tests/ui/range_select_with_autoscroll.go new file mode 100644 index 000000000..94a4fb4a5 --- /dev/null +++ b/pkg/integration/tests/ui/range_select_with_autoscroll.go @@ -0,0 +1,47 @@ +package ui + +import ( + "fmt" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RangeSelectWithAutoscroll = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Keep scrolling while creating a range selection at the panel edge", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.UseHunkModeInStagingView = false + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(40) + fileContent := "base\n" + shell.CreateFileAndAdd("file1", fileContent) + for i := 1; i <= 40; i++ { + fileContent += fmt.Sprintf("line %d\n", i) + } + shell.UpdateFile("file1", fileContent) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches().Focus() + t.Views().Commits(). + ClickAndHold(1, 0). + MouseMoveToBottom(1). + OriginYAtLeast(3). + SelectedLineIdxAtLeast(3). + MouseRelease() + + t.Views().Files(). + Focus(). + PressEnter() + t.Views().Staging(). + ClickAndHold(1, 6). + MouseMoveToBottom(1). + OriginYAtLeast(3). + SelectedLineIdxAtLeast(9). + MouseRelease() + }, +}) diff --git a/pkg/integration/tests/ui/reload_side_panels.go b/pkg/integration/tests/ui/reload_side_panels.go new file mode 100644 index 000000000..9d8b77693 --- /dev/null +++ b/pkg/integration/tests/ui/reload_side_panels.go @@ -0,0 +1,51 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ReloadSidePanels = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Editing the side panel config and refocusing the window re-applies the layout live, keeping the focused panel focused", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(2) + // Start with worktrees promoted to its own panel. + shell.CreateFile(".git/lazygit.yml", ` +gui: + sidePanels: + - [status] + - [files, submodules] + - [worktrees] + - [branches, remotes, tags] + - [commits, reflog] + - [stash]`) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Worktrees is its own panel in the third position. + t.Views().Files().IsFocused(). + Press(keys.Universal.JumpToBlock[2]) + t.Views().Worktrees().IsFocused() + + // Demote worktrees back into the files panel, then refocus the window to + // trigger a live reload of the changed config. + t.Shell().UpdateFile(".git/lazygit.yml", ` +gui: + sidePanels: + - [status] + - [files, worktrees, submodules] + - [branches, remotes, tags] + - [commits, reflog] + - [stash]`) + t.FocusIn() + + // Worktrees is now a tab of the files panel. It stays focused, and is shown + // in front rather than being hidden behind the files tab (which would leave + // the panel looking unfocused). + t.Views().Worktrees().IsActiveTab().IsFocused(). + Press(keys.Universal.PrevTab) + t.Views().Files().IsActiveTab().IsFocused() + }, +}) diff --git a/pkg/integration/tests/ui/reorder_side_panels.go b/pkg/integration/tests/ui/reorder_side_panels.go new file mode 100644 index 000000000..1d1f241f0 --- /dev/null +++ b/pkg/integration/tests/ui/reorder_side_panels.go @@ -0,0 +1,33 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ReorderSidePanels = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reorder the side panels with gui.sidePanels, swapping the branches and commits panels", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + cfg.GetUserConfig().Gui.SidePanels = []config.SidePanel{ + {"status"}, + {"files", "worktrees", "submodules"}, + {"commits", "reflog"}, + {"branches", "remotes", "tags"}, + {"stash"}, + } + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(2) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // The third panel is now commits and the fourth is branches (the reverse + // of the default order), so their jump keys are swapped. + t.Views().Files().IsFocused(). + Press(keys.Universal.JumpToBlock[2]) + t.Views().Commits().IsFocused(). + Press(keys.Universal.JumpToBlock[3]) + t.Views().Branches().IsFocused() + }, +}) diff --git a/pkg/integration/tests/ui/sub_commits_scroll_position_is_reset.go b/pkg/integration/tests/ui/sub_commits_scroll_position_is_reset.go new file mode 100644 index 000000000..1de8acb70 --- /dev/null +++ b/pkg/integration/tests/ui/sub_commits_scroll_position_is_reset.go @@ -0,0 +1,39 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SubCommitsScrollPositionIsReset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Viewing the commits of a branch again after scrolling down starts at the top again", + ExtraCmdArgs: []string{}, + Skip: false, + Width: 120, + Height: 30, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(40) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + OriginY(0). + Press(keys.Universal.GotoBottom). + OriginYAtLeast(1). + PressEscape() + + t.Views().Branches(). + IsFocused(). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + SelectedLineIdx(0). + OriginY(0) + }, +}) diff --git a/pkg/integration/tests/ui/suggestions_selection_follows_the_focus.go b/pkg/integration/tests/ui/suggestions_selection_follows_the_focus.go new file mode 100644 index 000000000..793c58bf8 --- /dev/null +++ b/pkg/integration/tests/ui/suggestions_selection_follows_the_focus.go @@ -0,0 +1,42 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SuggestionsSelectionFollowsTheFocus = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "The suggestions list only shows a selection while it, rather than the prompt, has the focus", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell. + EmptyCommit("one"). + NewBranch("branch-to-checkout") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Press(keys.Branches.CheckoutBranchByName) + + t.ExpectPopup().Prompt(). + Title(Equals("Branch name:")). + Type("branch-to"). + SuggestionTopLines(Contains("branch-to-checkout")) + + t.Views().Suggestions().SelectionIsHidden() + + t.Views().Prompt().Press(keys.Universal.TogglePanel) + t.Views().Suggestions(). + IsFocused(). + SelectionIsActive(). + Press(keys.Universal.TogglePanel) + + t.Views().Prompt().IsFocused() + t.Views().Suggestions().SelectionIsHidden() + + t.Views().Prompt().Press(keys.Universal.Return) + t.Views().Branches().IsFocused() + }, +}) diff --git a/pkg/integration/tests/ui/switch_repo_moves_the_selection.go b/pkg/integration/tests/ui/switch_repo_moves_the_selection.go new file mode 100644 index 000000000..eb7c4b2df --- /dev/null +++ b/pkg/integration/tests/ui/switch_repo_moves_the_selection.go @@ -0,0 +1,48 @@ +package ui + +import ( + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SwitchRepoMovesTheSelection = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "The selection follows the focus of the repo being switched to, rather than the one being left", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + otherRepo, _ := filepath.Abs("../other") + config.GetAppState().RecentRepos = []string{otherRepo} + }, + SetupRepo: func(shell *Shell) { + shell.CloneNonBare("other") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + switchToRepo := func(repo string) { + t.GlobalPress(keys.Universal.OpenRecentRepos) + t.ExpectPopup().Menu().Title(Equals("Recent repositories")). + Lines( + Contains(repo).IsSelected(), + Contains("Cancel"), + ).Confirm() + t.Views().Status().Content(Contains(repo + " → master")) + } + + t.Views().Branches(). + Focus(). + SelectionIsActive() + + // The other repo has its own focus, which is the files panel it starts in + switchToRepo("other") + t.Views().Files().IsFocused() + t.Views().Branches().SelectionIsHidden() + + // And coming back, this repo still has the focus we left it with + switchToRepo("repo") + t.Views().Branches(). + IsFocused(). + SelectionIsActive() + t.Views().Files().SelectionIsHidden() + }, +}) diff --git a/pkg/integration/tests/ui/switch_tab_from_menu.go b/pkg/integration/tests/ui/switch_tab_from_menu.go index 61bd991ab..fbcdbd954 100644 --- a/pkg/integration/tests/ui/switch_tab_from_menu.go +++ b/pkg/integration/tests/ui/switch_tab_from_menu.go @@ -14,7 +14,7 @@ var SwitchTabFromMenu = NewIntegrationTest(NewIntegrationTestArgs{ }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Files().IsFocused(). - Press(keys.Universal.OptionMenuAlt1) + Press(keys.Universal.OptionMenu) t.ExpectPopup().Menu().Title(Equals("Keybindings")). Select(Contains("Next tab")). diff --git a/pkg/integration/tests/ui/toggle_whitespace_keeps_unfocused_selection_dimmed.go b/pkg/integration/tests/ui/toggle_whitespace_keeps_unfocused_selection_dimmed.go new file mode 100644 index 000000000..9ffbd2878 --- /dev/null +++ b/pkg/integration/tests/ui/toggle_whitespace_keeps_unfocused_selection_dimmed.go @@ -0,0 +1,31 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ToggleWhitespaceKeepsUnfocusedSelectionDimmed = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Toggling whitespace from the main view leaves the panel beneath it showing a dimmed selection", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "one\n") + shell.Commit("one") + shell.UpdateFile("file1", " one\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines(Contains("file1")). + Press(keys.Universal.FocusMainView) + + t.Views().Main(). + IsFocused(). + Press(keys.Universal.ToggleWhitespaceInDiffView) + + t.Views().Files(). + SelectionIsInactive() + }, +}) diff --git a/pkg/integration/tests/ui/unfocused_list_hides_selection_when_emptied.go b/pkg/integration/tests/ui/unfocused_list_hides_selection_when_emptied.go new file mode 100644 index 000000000..eef409cb2 --- /dev/null +++ b/pkg/integration/tests/ui/unfocused_list_hides_selection_when_emptied.go @@ -0,0 +1,36 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var UnfocusedListHidesSelectionWhenEmptied = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A list that loses its last item while the focus is elsewhere stops showing a selection", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "one\n") + shell.Commit("one") + shell.UpdateFile("file1", "two\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines(Contains("file1")). + SelectionIsActive(). + Press(keys.Universal.FocusMainView) + + t.Views().Main().IsFocused() + + t.Views().Files(). + SelectionIsInactive(). + Tap(func() { + t.Shell().RunCommand([]string{"git", "checkout", "--", "file1"}) + t.RefreshInBackground() + }). + IsEmpty(). + SelectionIsHidden() + }, +}) diff --git a/pkg/integration/tests/ui/unfocused_list_shows_selection_when_filled.go b/pkg/integration/tests/ui/unfocused_list_shows_selection_when_filled.go new file mode 100644 index 000000000..78a8f210d --- /dev/null +++ b/pkg/integration/tests/ui/unfocused_list_shows_selection_when_filled.go @@ -0,0 +1,34 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var UnfocusedListShowsSelectionWhenFilled = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A list that gets its first item while the focus is elsewhere starts showing a selection", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file1", "one\n") + shell.Commit("one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + IsEmpty(). + SelectionIsHidden(). + Press(keys.Universal.FocusMainView) + + t.Views().Main().IsFocused() + + t.Views().Files(). + Tap(func() { + t.Shell().CreateFile("file2", "two\n") + t.RefreshInBackground() + }). + Lines(Contains("file2")). + SelectionIsInactive() + }, +}) diff --git a/pkg/integration/tests/worktree/add_for_existing_branch.go b/pkg/integration/tests/worktree/add_for_existing_branch.go new file mode 100644 index 000000000..7fbbc3fc8 --- /dev/null +++ b/pkg/integration/tests/worktree/add_for_existing_branch.go @@ -0,0 +1,67 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var AddForExistingBranch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a worktree that checks out an existing branch (no new branch), and confirm the option is disabled for an already-checked-out branch", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.NewBranchFrom("otherbranch", "mybranch") + shell.Checkout("mybranch") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Lines( + Contains("mybranch").IsSelected(), + Contains("otherbranch"), + ). + // the current branch is checked out by this worktree, so "Worktree + // for 'mybranch'" is disabled + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup(). + Menu(). + Title(Equals("New worktree")). + Select(Contains("New worktree for 'mybranch'")). + Tooltip(Contains("Branch mybranch is checked out by worktree repo")). + Confirm(). + Tap(func() { + t.ExpectToast(Contains("Branch mybranch is checked out by worktree repo")) + }). + Cancel() + }). + // otherbranch is not checked out anywhere, so we can make a worktree for it + NavigateToLine(Contains("otherbranch")). + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("New worktree")). + Select(Contains("New worktree for 'otherbranch'")). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() + }) + + // we've switched into the new worktree, which has otherbranch checked out + t.Views().Branches(). + IsFocused(). + Lines( + Contains("otherbranch").IsSelected(), + Contains("mybranch (worktree repo)"), + ) + + t.Views().Status(). + Content(Contains("repo(otherbranch) → otherbranch")) + }, +}) diff --git a/pkg/integration/tests/worktree/add_from_branch.go b/pkg/integration/tests/worktree/add_from_branch.go index ab7807571..46dbc09f5 100644 --- a/pkg/integration/tests/worktree/add_from_branch.go +++ b/pkg/integration/tests/worktree/add_from_branch.go @@ -6,7 +6,7 @@ import ( ) var AddFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Add a worktree via the branches view, then switch back to the main worktree via the branches view", + Description: "Create a new branch and worktree from a branch, then switch back to the main worktree via the branches view", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -21,22 +21,23 @@ var AddFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("mybranch"), ). - Press(keys.Worktrees.ViewWorktreeOptions). + Press(keys.Universal.NewWorktree). Tap(func() { t.ExpectPopup().Menu(). - Title(Equals("Worktree")). - Select(Contains(`Create worktree from mybranch`).DoesNotContain("detached")). + Title(Equals("New worktree")). + Select(Contains("New branch and worktree from 'mybranch'")). Confirm() t.ExpectPopup().Prompt(). - Title(Equals("New worktree path")). - Type("../linked-worktree"). - Confirm() - - t.ExpectPopup().Prompt(). - Title(Equals("New branch name")). + Title(Equals("New branch and worktree name")). Type("newbranch"). Confirm() + + // no existing worktrees and no configured default path, so the + // only candidate location is the repo's parent directory; accept it + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() }). // confirm we're still focused on the branches view IsFocused(). @@ -54,7 +55,9 @@ var AddFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ }). Lines( Contains("mybranch").IsSelected(), - Contains("newbranch (worktree linked-worktree)"), + // the worktree's directory name matches the branch name, so the + // branches view shows the compact "(worktree)" with no name + Contains("newbranch (worktree)"), ). // Confirm the files view is still showing in the files window Press(keys.Universal.PrevBlock) diff --git a/pkg/integration/tests/worktree/add_from_branch_detached.go b/pkg/integration/tests/worktree/add_from_branch_detached.go index 70f27dc81..f17a50fef 100644 --- a/pkg/integration/tests/worktree/add_from_branch_detached.go +++ b/pkg/integration/tests/worktree/add_from_branch_detached.go @@ -6,7 +6,7 @@ import ( ) var AddFromBranchDetached = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Add a detached worktree via the branches view", + Description: "Add a detached worktree at a branch via the branches view, choosing a custom location", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -21,15 +21,24 @@ var AddFromBranchDetached = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("mybranch"), ). - Press(keys.Worktrees.ViewWorktreeOptions). + Press(keys.Universal.NewWorktree). Tap(func() { t.ExpectPopup().Menu(). - Title(Equals("Worktree")). - Select(Contains(`Create worktree from mybranch (detached)`)). + Title(Equals("New worktree")). + Select(Contains("New detached worktree at 'mybranch'")). + Confirm() + + // the location menu defaults the directory name to the branch + // name; pick "Other…" to type a different path instead + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Select(Contains("Other…")). Confirm() t.ExpectPopup().Prompt(). Title(Equals("New worktree path")). + InitialText(Contains("mybranch")). + Clear(). Type("../linked-worktree"). Confirm() }). diff --git a/pkg/integration/tests/worktree/add_from_commit.go b/pkg/integration/tests/worktree/add_from_commit.go index 49b69697b..21f26e4a2 100644 --- a/pkg/integration/tests/worktree/add_from_commit.go +++ b/pkg/integration/tests/worktree/add_from_commit.go @@ -6,7 +6,7 @@ import ( ) var AddFromCommit = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Add a worktree via the commits view", + Description: "Create a new branch and worktree from a commit via the commits view", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -24,22 +24,21 @@ var AddFromCommit = NewIntegrationTest(NewIntegrationTestArgs{ Contains("initial commit"), ). NavigateToLine(Contains("initial commit")). - Press(keys.Worktrees.ViewWorktreeOptions). + Press(keys.Universal.NewWorktree). Tap(func() { t.ExpectPopup().Menu(). - Title(Equals("Worktree")). - Select(MatchesRegexp(`Create worktree from .*`).DoesNotContain("detached")). + Title(Equals("New worktree")). + Select(Contains("New branch and worktree from")). Confirm() t.ExpectPopup().Prompt(). - Title(Equals("New worktree path")). - Type("../linked-worktree"). - Confirm() - - t.ExpectPopup().Prompt(). - Title(Equals("New branch name")). + Title(Equals("New branch and worktree name")). Type("newbranch"). Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() }). Lines( Contains("initial commit"), diff --git a/pkg/integration/tests/worktree/add_from_remote_branch.go b/pkg/integration/tests/worktree/add_from_remote_branch.go new file mode 100644 index 000000000..ac3d421fa --- /dev/null +++ b/pkg/integration/tests/worktree/add_from_remote_branch.go @@ -0,0 +1,61 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var AddFromRemoteBranch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a new local tracking branch and worktree from a remote branch", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.NewBranch("feature") + shell.CloneIntoRemote("origin") + shell.Checkout("master") + // drop the local branch so only the remote one remains + shell.RunCommand([]string{"git", "branch", "-D", "feature"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Remotes(). + Focus(). + Lines( + Contains("origin").IsSelected(), + ). + PressEnter() + + t.Views().RemoteBranches(). + IsFocused(). + NavigateToLine(Contains("feature")). + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("New worktree")). + Select(Contains("New local branch and worktree from 'origin/feature'")). + Confirm() + + // the new branch name defaults to the remote branch name with + // the remote stripped off + t.ExpectPopup().Prompt(). + Title(Equals("New branch and worktree name")). + InitialText(Equals("feature")). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() + }) + + // we've switched into the new worktree, on a local branch that tracks + // the remote one (the ✓ confirms tracking is set up) + t.Views().Branches(). + IsFocused(). + Lines( + Contains("feature").Contains("✓").IsSelected(), + Contains("master (worktree repo)"), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/add_from_stash.go b/pkg/integration/tests/worktree/add_from_stash.go new file mode 100644 index 000000000..c2541183c --- /dev/null +++ b/pkg/integration/tests/worktree/add_from_stash.go @@ -0,0 +1,51 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var AddFromStash = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a new branch and worktree from a stash entry", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.UpdateFile("README.md", "work in progress") + shell.Stash("my stash") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Stash(). + Focus(). + Lines( + Contains("my stash").IsSelected(), + ). + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("New worktree")). + Select(Contains("New branch and worktree from 'stash@{0}'")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("New branch and worktree name")). + Type("from-stash"). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() + }) + + // we've switched into the new worktree, on the new branch + t.Views().Branches(). + IsFocused(). + Lines( + Contains("from-stash").IsSelected(), + Contains("mybranch (worktree repo)"), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/add_from_tag.go b/pkg/integration/tests/worktree/add_from_tag.go new file mode 100644 index 000000000..bab7c03d8 --- /dev/null +++ b/pkg/integration/tests/worktree/add_from_tag.go @@ -0,0 +1,54 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var AddFromTag = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a detached worktree at a tag, entering a worktree name", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.CreateLightweightTag("v1.0", "HEAD") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + Lines( + Contains("v1.0").IsSelected(), + ). + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("New worktree")). + Select(Contains("New detached worktree at 'v1.0'")). + Confirm() + + // a tag has no good name to derive, so we're asked for one + t.ExpectPopup().Prompt(). + Title(Equals("New worktree name")). + Type("tag-worktree"). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() + }) + + // we've switched into the new worktree, with a detached head + t.Views().Branches(). + IsFocused(). + Lines( + Contains("(no branch)").IsSelected(), + Contains("mybranch (worktree repo)"), + ) + + t.Views().Status(). + Content(Contains("repo(tag-worktree)")) + }, +}) diff --git a/pkg/integration/tests/worktree/crud.go b/pkg/integration/tests/worktree/crud.go index cd539d10b..9a35d6cf7 100644 --- a/pkg/integration/tests/worktree/crud.go +++ b/pkg/integration/tests/worktree/crud.go @@ -33,25 +33,23 @@ var Crud = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Universal.New). Tap(func() { - t.ExpectPopup().Menu(). - Title(Equals("Worktree")). - Select(Contains(`Create worktree from ref`).DoesNotContain(("detached"))). + // a name that isn't an existing branch creates a new branch off + // the current one + t.ExpectPopup().Prompt(). + Title(Equals("New worktree for branch")). + Type("newbranch"). Confirm() - t.ExpectPopup().Prompt(). - Title(Equals("New worktree base ref")). - InitialText(Equals("mybranch")). + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Select(Contains("Other…")). Confirm() t.ExpectPopup().Prompt(). Title(Equals("New worktree path")). + Clear(). Type("../linked-worktree"). Confirm() - - t.ExpectPopup().Prompt(). - Title(Equals("New branch name (leave blank to checkout mybranch)")). - Type("newbranch"). - Confirm() }). Lines( Contains("linked-worktree").IsSelected(), @@ -108,9 +106,9 @@ var Crud = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("linked-worktree")). Press(keys.Universal.Remove). Tap(func() { - t.ExpectPopup().Confirmation(). - Title(Equals("Remove worktree")). - Content(Contains("Are you sure you want to remove worktree 'linked-worktree'?")). + t.ExpectPopup().Menu(). + Title(Equals("Remove worktree 'linked-worktree'?")). + Select(MatchesRegexp("Remove worktree$")). Confirm() }). Lines( diff --git a/pkg/integration/tests/worktree/custom_command.go b/pkg/integration/tests/worktree/custom_command.go index 00c3c4c06..e00c162c3 100644 --- a/pkg/integration/tests/worktree/custom_command.go +++ b/pkg/integration/tests/worktree/custom_command.go @@ -12,7 +12,7 @@ var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{ SetupConfig: func(cfg *config.AppConfig) { cfg.GetUserConfig().CustomCommands = []config.CustomCommand{ { - Key: "d", + Key: config.Keybinding{"d"}, Context: "worktrees", Command: "git worktree remove {{ .SelectedWorktree.Path | quote }}", }, @@ -32,7 +32,7 @@ var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{ Contains("linked-worktree"), ). NavigateToLine(Contains("linked-worktree")). - Press("d"). + Press(config.Keybinding{"d"}). Lines( Contains("(main worktree)"), ) diff --git a/pkg/integration/tests/worktree/default_path_tilde.go b/pkg/integration/tests/worktree/default_path_tilde.go new file mode 100644 index 000000000..57486f1a8 --- /dev/null +++ b/pkg/integration/tests/worktree/default_path_tilde.go @@ -0,0 +1,51 @@ +package worktree + +import ( + "os" + "path/filepath" + + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DefaultPathTilde = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A leading ~ in the worktree.defaultPath config is expanded to the home directory", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Worktree.DefaultPath = "~/my-worktrees" + }, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + NavigateToLine(Contains("mybranch")). + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("New worktree")). + Select(Contains("New branch and worktree from 'mybranch'")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("New branch and worktree name")). + Type("newbranch"). + Confirm() + + // The default path's "~" is expanded to an absolute home-directory + // path; without expansion it would stay a literal "~" resolved + // against the repo, so the candidate would still contain a "~". + home, _ := os.UserHomeDir() + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + ContainsLines( + Contains(filepath.Join(home, "my-worktrees", "newbranch")).DoesNotContain("~"), + ). + Cancel() + }) + }, +}) diff --git a/pkg/integration/tests/worktree/detach_worktree_from_branch.go b/pkg/integration/tests/worktree/detach_worktree_from_branch.go index acd40e6ad..b36b89349 100644 --- a/pkg/integration/tests/worktree/detach_worktree_from_branch.go +++ b/pkg/integration/tests/worktree/detach_worktree_from_branch.go @@ -6,7 +6,7 @@ import ( ) var DetachWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Detach a worktree from the branches view", + Description: "Delete a branch that's checked out in another worktree by detaching that worktree", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -37,12 +37,12 @@ var DetachWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). Title(Equals("Branch newbranch is checked out by worktree linked-worktree")). - Select(Equals("Detach worktree")). + Select(Contains("Detach worktree and delete branch")). Confirm() }). + // The branch is gone; the worktree stays around (now detached) Lines( - Contains("mybranch"), - Contains("newbranch").DoesNotContain("(worktree)").IsSelected(), + Contains("mybranch").IsSelected(), ) t.Views().Worktrees(). diff --git a/pkg/integration/tests/worktree/force_remove_worktree.go b/pkg/integration/tests/worktree/force_remove_worktree.go index cde9e9da3..3fafa9755 100644 --- a/pkg/integration/tests/worktree/force_remove_worktree.go +++ b/pkg/integration/tests/worktree/force_remove_worktree.go @@ -29,9 +29,9 @@ var ForceRemoveWorktree = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("linked-worktree")). Press(keys.Universal.Remove). Tap(func() { - t.ExpectPopup().Confirmation(). - Title(Equals("Remove worktree")). - Content(Equals("Are you sure you want to remove worktree 'linked-worktree'?")). + t.ExpectPopup().Menu(). + Title(Equals("Remove worktree 'linked-worktree'?")). + Select(MatchesRegexp("Remove worktree$")). Confirm() t.ExpectPopup().Confirmation(). diff --git a/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go b/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go index 4af533e02..82e5a9303 100644 --- a/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go +++ b/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go @@ -29,9 +29,9 @@ var ForceRemoveWorktreeWithSubmodules = NewIntegrationTest(NewIntegrationTestArg NavigateToLine(Contains("linked-worktree")). Press(keys.Universal.Remove). Tap(func() { - t.ExpectPopup().Confirmation(). - Title(Equals("Remove worktree")). - Content(Equals("Are you sure you want to remove worktree 'linked-worktree'?")). + t.ExpectPopup().Menu(). + Title(Equals("Remove worktree 'linked-worktree'?")). + Select(MatchesRegexp("Remove worktree$")). Confirm() t.ExpectPopup().Confirmation(). diff --git a/pkg/integration/tests/worktree/location_candidates.go b/pkg/integration/tests/worktree/location_candidates.go new file mode 100644 index 000000000..5fd835626 --- /dev/null +++ b/pkg/integration/tests/worktree/location_candidates.go @@ -0,0 +1,52 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var LocationCandidates = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "The location menu offers the parents of existing worktrees and the configured default path, and sanitizes the typed name", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Worktree.DefaultPath = "../config-worktrees" + }, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + // a pre-existing linked worktree, so its parent directory is offered as + // a candidate location alongside the configured default path + shell.RunCommand([]string{"git", "worktree", "add", "-b", "existing", "../manual-worktrees/existing"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + NavigateToLine(Contains("mybranch")). + Press(keys.Universal.NewWorktree). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("New worktree")). + Select(Contains("New branch and worktree from 'mybranch'")). + Confirm() + + // the space is sanitized to a dash so it's a valid branch (and + // directory) name + t.ExpectPopup().Prompt(). + Title(Equals("New branch and worktree name")). + Type("new feature"). + Confirm() + + // the parent of the existing worktree comes first, then the + // configured default path; both target the sanitized name + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + ContainsLines( + Contains("manual-worktrees").Contains("new-feature"), + Contains("config-worktrees").Contains("new-feature"), + ). + Cancel() + }) + }, +}) diff --git a/pkg/integration/tests/worktree/new_worktree_picker.go b/pkg/integration/tests/worktree/new_worktree_picker.go new file mode 100644 index 000000000..58915e8b5 --- /dev/null +++ b/pkg/integration/tests/worktree/new_worktree_picker.go @@ -0,0 +1,64 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var NewWorktreePicker = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "From the worktrees panel, the picker suggests only branches not already checked out, guards verbatim type-ins, and checks out an existing branch", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.NewBranchFrom("feature", "mybranch") + shell.Checkout("mybranch") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Worktrees(). + Focus(). + Lines( + Contains("(main worktree)"), + ). + Press(keys.Universal.New). + Tap(func() { + // mybranch is checked out by the current worktree, so it's not + // suggested; feature is + t.ExpectPopup().Prompt(). + Title(Equals("New worktree for branch")). + SuggestionLines(Contains("feature")). + // typing a checked-out branch verbatim is still rejected + Type("mybranch"). + Confirm() + + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("Branch mybranch is checked out by worktree repo")). + Confirm() + }). + Press(keys.Universal.New). + Tap(func() { + // picking an existing branch checks it out (no new branch) + t.ExpectPopup().Prompt(). + Title(Equals("New worktree for branch")). + Type("feature"). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() + }). + // we stay in the worktrees panel, now switched into the new worktree + IsFocused(). + Lines( + Contains("feature").IsSelected(), + Contains("(main worktree)"), + ) + + t.Views().Status(). + Content(Contains("repo(feature) → feature")) + }, +}) diff --git a/pkg/integration/tests/worktree/new_worktree_picker_remote.go b/pkg/integration/tests/worktree/new_worktree_picker_remote.go new file mode 100644 index 000000000..55b156d7f --- /dev/null +++ b/pkg/integration/tests/worktree/new_worktree_picker_remote.go @@ -0,0 +1,60 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var NewWorktreePickerRemote = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "From the worktrees panel, picking a remote branch creates a new local tracking branch and worktree; remote branches whose local branch already exists are filtered out", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.NewBranch("feature") + shell.NewBranch("existing") + shell.CloneIntoRemote("origin") + shell.Checkout("master") + // "feature" now exists only on the remote; "existing" stays as a local + // branch (not checked out) that also has a remote counterpart + shell.RunCommand([]string{"git", "branch", "-D", "feature"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Worktrees(). + Focus(). + Press(keys.Universal.New). + Tap(func() { + // master is checked out, so neither it nor origin/master is + // offered; "existing" already has a local branch, so + // origin/existing is left out too (you'd reach it via the local + // entry); origin/feature has no local branch, so it's offered + t.ExpectPopup().Prompt(). + Title(Equals("New worktree for branch")). + SuggestionLines( + Contains("existing"), + Contains("origin/feature"), + ). + Type("origin/feature"). + Confirm() + + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Confirm() + }). + IsFocused(). + Lines( + Contains("feature").IsSelected(), + Contains("(main worktree)"), + ) + + // the new worktree is on a local branch that tracks the remote one (the + // ✓ confirms tracking is set up) + t.Views().Branches(). + Focus(). + ContainsLines( + Contains("feature").Contains("✓").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/remove_worktree_and_both_branches.go b/pkg/integration/tests/worktree/remove_worktree_and_both_branches.go new file mode 100644 index 000000000..8ba8e9112 --- /dev/null +++ b/pkg/integration/tests/worktree/remove_worktree_and_both_branches.go @@ -0,0 +1,64 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RemoveWorktreeAndBothBranches = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "From the worktrees panel, remove a worktree and delete both its local and remote branch in one go", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CloneIntoRemote("origin") + shell.EmptyCommit("initial commit") + shell.NewBranch("mybranch") + shell.EmptyCommit("commit on mybranch") + shell.PushBranchAndSetUpstream("origin", "mybranch") + shell.EmptyCommit("commit not pushed to the remote") // so mybranch isn't fully merged + shell.Checkout("master") + shell.AddWorktreeCheckout("mybranch", "../linked-worktree") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Worktrees(). + Focus(). + Lines( + Contains("(main worktree)").IsSelected(), + Contains("linked-worktree"), + ). + NavigateToLine(Contains("linked-worktree")). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Remove worktree 'linked-worktree'?")). + Select(Contains("Remove worktree and delete local and remote branch")). + Confirm() + + // mybranch isn't fully merged, so we get the force-delete warning + t.ExpectPopup().Confirmation(). + Title(Equals("Force delete branch")). + Content(Equals("'mybranch' is not fully merged. Are you sure you want to delete it?")). + Confirm() + }). + Lines( + Contains("(main worktree)").IsSelected(), + ) + + // The remote branch is gone too + t.Views().Remotes(). + Focus(). + Lines(Contains("origin")). + PressEnter() + + t.Views().RemoteBranches(). + IsEmpty() + + // And so is the local branch + t.Views().Branches(). + Focus(). + Lines( + Contains("master").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/remove_worktree_and_branch.go b/pkg/integration/tests/worktree/remove_worktree_and_branch.go new file mode 100644 index 000000000..5910b6b7f --- /dev/null +++ b/pkg/integration/tests/worktree/remove_worktree_and_branch.go @@ -0,0 +1,73 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RemoveWorktreeAndBranch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "From the worktrees panel, remove a worktree and delete its branch in one go", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.NewBranch("newbranch") + shell.EmptyCommit("commit on newbranch") + shell.Checkout("mybranch") + shell.AddWorktreeCheckout("newbranch", "../linked-worktree") + shell.RunCommand([]string{"git", "worktree", "add", "--detach", "../detached-worktree"}) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Worktrees(). + Focus(). + Lines( + Contains("(main worktree)").IsSelected(), + Contains("detached-worktree"), + Contains("linked-worktree"), + ). + // A detached worktree has no branch, so neither delete action is offered + NavigateToLine(Contains("detached-worktree")). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Remove worktree 'detached-worktree'?")). + Select(Contains("Remove worktree and delete branch")). + Tooltip(Contains("This worktree is not checked out on a branch")). + Select(Contains("Remove worktree and delete local and remote branch")). + Tooltip(Contains("This worktree is not checked out on a branch")). + Cancel() + }). + // Remove a worktree and delete its branch at once. newbranch has no + // upstream, so deleting the remote branch too isn't offered. + NavigateToLine(Contains("linked-worktree")). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Remove worktree 'linked-worktree'?")). + Select(Contains("Remove worktree and delete local and remote branch")). + Tooltip(Contains("The selected branch has no upstream")). + Select(Contains("Remove worktree and delete branch")). + Confirm() + + // newbranch isn't fully merged, so we get the force-delete warning + t.ExpectPopup().Confirmation(). + Title(Equals("Force delete branch")). + Content(Equals("'newbranch' is not fully merged. Are you sure you want to delete it?")). + Confirm() + }). + Lines( + Contains("(main worktree)"), + Contains("detached-worktree"), + ) + + // The branch is gone too + t.Views().Branches(). + Focus(). + Lines( + Contains("mybranch").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/remove_worktree_and_delete_local_and_remote_branch.go b/pkg/integration/tests/worktree/remove_worktree_and_delete_local_and_remote_branch.go new file mode 100644 index 000000000..09fae45eb --- /dev/null +++ b/pkg/integration/tests/worktree/remove_worktree_and_delete_local_and_remote_branch.go @@ -0,0 +1,71 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RemoveWorktreeAndDeleteLocalAndRemoteBranch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Delete the local branch, the remote branch, and the worktree of a single branch checked out in another worktree, all at once", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CloneIntoRemote("origin") + shell.EmptyCommit("initial commit") + shell.NewBranch("mybranch") + shell.EmptyCommit("commit on mybranch") + shell.PushBranchAndSetUpstream("origin", "mybranch") + shell.EmptyCommit("commit not pushed to the remote") // so mybranch isn't fully merged + shell.Checkout("master") + shell.AddWorktreeCheckout("mybranch", "../linked-worktree") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Lines( + Contains("master").IsSelected(), + Contains("mybranch (worktree linked-worktree)"), + ). + NavigateToLine(Contains("mybranch")). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Delete branch 'mybranch'?")). + Select(Contains("Delete local and remote branch")). + Confirm() + }). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Branch mybranch is checked out by worktree linked-worktree")). + Select(Contains("Remove worktree and delete local and remote branch")). + Confirm() + + // mybranch is not contained in master, so we get the force-delete warning + t.ExpectPopup().Confirmation(). + Title(Equals("Force delete branch")). + Content(Equals("'mybranch' is not fully merged. Are you sure you want to delete it?")). + Confirm() + }). + // The local branch is gone + Lines( + Contains("master").IsSelected(), + ) + + // The remote branch is gone too + t.Views().Remotes(). + Focus(). + Lines(Contains("origin")). + PressEnter() + + t.Views().RemoteBranches(). + IsEmpty() + + // And so is the worktree + t.Views().Worktrees(). + Focus(). + Lines( + Contains("(main worktree)").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/remove_worktree_from_branch.go b/pkg/integration/tests/worktree/remove_worktree_from_branch.go index 1aa9645f3..7823af54c 100644 --- a/pkg/integration/tests/worktree/remove_worktree_from_branch.go +++ b/pkg/integration/tests/worktree/remove_worktree_from_branch.go @@ -6,7 +6,7 @@ import ( ) var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Remove a worktree from the branches view", + Description: "Delete a branch that's checked out in another worktree by removing that worktree", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -38,22 +38,18 @@ var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). Title(Equals("Branch newbranch is checked out by worktree linked-worktree")). - Select(Equals("Remove worktree")). - Confirm() - - t.ExpectPopup().Confirmation(). - Title(Equals("Remove worktree")). - Content(Equals("Are you sure you want to remove worktree 'linked-worktree'?")). + Select(Contains("Remove worktree and delete branch")). Confirm() + // The worktree is dirty, so we get asked to force-remove it t.ExpectPopup().Confirmation(). Title(Equals("Remove worktree")). Content(Equals("'linked-worktree' contains modified or untracked files, or submodules (or all of these). Are you sure you want to remove it?")). Confirm() }). + // The branch is gone, not just unlinked from its worktree Lines( - Contains("mybranch"), - Contains("newbranch").DoesNotContain("(worktree)").IsSelected(), + Contains("mybranch").IsSelected(), ) t.Views().Worktrees(). diff --git a/pkg/integration/tests/worktree/separate_work_tree_config.go b/pkg/integration/tests/worktree/separate_work_tree_config.go new file mode 100644 index 000000000..e6c036b20 --- /dev/null +++ b/pkg/integration/tests/worktree/separate_work_tree_config.go @@ -0,0 +1,70 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// This case is like bare_repo_worktree_config.go, except that lazygit isn't +// told where the git dir is: it is started in the directory containing it, and +// finds it the way git does. The work tree is somewhere else entirely, so git +// can't find its way back from there, and every command we run has to be told +// where the repo is. + +var SeparateWorkTreeConfig = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Open lazygit in the git dir of a repo whose work tree is elsewhere, and add a file and commit", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + // we're going to have a directory structure like this: + // project + // - repo (holds the .git dir, and nothing else; lazygit starts here) + // - worktree (holds the files) + // + // 'repo' is the repository/directory that all lazygit tests start in + + shell.CreateFileAndAdd("blah", "original content\n") + shell.Commit("initial commit") + + // point the repo at a work tree outside of it (core.worktree is + // relative to the .git dir), and fill that work tree from HEAD + shell.CreateDir("../worktree") + shell.SetConfig("core.worktree", "../../worktree") + shell.RunCommand([]string{"git", "reset", "--hard"}) + + // the copy of the file we committed from is not in the work tree, so + // git no longer knows anything about it + shell.DeleteFile("blah") + + shell.UpdateFile("../worktree/blah", "updated content\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("initial commit"), + ) + + t.Views().Files(). + IsFocused(). + Lines( + Contains(" M blah"), // shows as modified + ). + PressPrimaryAction(). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Title(Equals("Commit summary")). + Type("Add blah"). + Confirm() + + t.Views().Files(). + IsEmpty() + + t.Views().Commits(). + Lines( + Contains("Add blah"), + Contains("initial commit"), + ) + }, +}) diff --git a/pkg/integration/tests/worktree/worktree_in_repo.go b/pkg/integration/tests/worktree/worktree_in_repo.go index 5f0ee66ec..f6b5b44a3 100644 --- a/pkg/integration/tests/worktree/worktree_in_repo.go +++ b/pkg/integration/tests/worktree/worktree_in_repo.go @@ -28,25 +28,21 @@ var WorktreeInRepo = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Universal.New). Tap(func() { - t.ExpectPopup().Menu(). - Title(Equals("Worktree")). - Select(Contains(`Create worktree from ref`).DoesNotContain(("detached"))). + t.ExpectPopup().Prompt(). + Title(Equals("New worktree for branch")). + Type("newbranch"). Confirm() - t.ExpectPopup().Prompt(). - Title(Equals("New worktree base ref")). - InitialText(Equals("mybranch")). + t.ExpectPopup().Menu(). + Title(Equals("Worktree location")). + Select(Contains("Other…")). Confirm() t.ExpectPopup().Prompt(). Title(Equals("New worktree path")). + Clear(). Type("linked-worktree"). Confirm() - - t.ExpectPopup().Prompt(). - Title(Equals("New branch name (leave blank to checkout mybranch)")). - Type("newbranch"). - Confirm() }). Lines( Contains("linked-worktree").IsSelected(), diff --git a/pkg/integration/tests/worktree/worktree_inside_repo.go b/pkg/integration/tests/worktree/worktree_inside_repo.go new file mode 100644 index 000000000..bae2ff8f1 --- /dev/null +++ b/pkg/integration/tests/worktree/worktree_inside_repo.go @@ -0,0 +1,28 @@ +package worktree + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var WorktreeInsideRepo = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "A worktree that lives inside the repo's working tree is shown as a single item in the files panel", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.NerdFontsVersion = "3" + }, + SetupRepo: func(shell *Shell) { + shell.NewBranch("mybranch") + shell.CreateFileAndAdd("README.md", "hello world") + shell.Commit("initial commit") + shell.AddWorktree("mybranch", "nested-worktree", "newbranch") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Equals("?? 󰌹 nested-worktree").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/types/types.go b/pkg/integration/types/types.go index 9c4f057d2..325f4ea38 100644 --- a/pkg/integration/types/types.go +++ b/pkg/integration/types/types.go @@ -1,9 +1,9 @@ package types import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" ) @@ -23,9 +23,30 @@ type IntegrationTest interface { // this is the interface through which our integration tests interact with the lazygit gui type GuiDriver interface { PressKey(string) + // Like PressKey, but presses several keys in immediate succession, waiting + // for lazygit to become idle only after the last one. Use it to simulate a + // user typing faster than lazygit processes the input. + PressKeysRapidly(...string) Click(int, int) + ClickAndHold(int, int) + MouseMove(int, int) + MouseRelease(int, int) + ScrollWheelDown(int, int) + // Perform the refresh that a background routine would perform on a timer + RefreshInBackground() + // Can be used to avoid data races with the UI thread in the uncommon cases that + // the test driver needs to assert state while the gui is not idle. + OnUIThreadAndWait(func()) + // Simulate the terminal window regaining focus (which triggers a reload of + // changed config files) + FocusIn() + // Simulate a terminal dispatching focus-in immediately followed by a click, + // without waiting for the focus refresh to finish in between. + FocusInAndClick(int, int) Keys() config.KeybindingConfig CurrentContext() types.Context + // Whether the terminal's text cursor is currently shown + CursorVisible() bool ContextForView(viewName string) types.Context Fail(message string) // These two log methods are for the sake of debugging while testing. There's no need to actually @@ -41,10 +62,17 @@ type GuiDriver interface { // e.g. when we're showing both staged and unstaged changes SecondaryView() *gocui.View View(viewName string) *gocui.View + // the frontmost visible view in the given window, i.e. the currently shown tab + TopViewInWindow(windowName string) *gocui.View SetCaption(caption string) SetCaptionPrefix(prefix string) // Pop the next toast that was displayed; returns nil if there was none NextToast() *string CheckAllToastsAcknowledged() Headless() bool + // Record that the in-progress rebase/merge/etc. is to be treated as one + // that was started from within lazygit. Lets a test that starts an + // operation by running git directly (rather than through the UI) still get + // the "continue?" prompt when its conflicts are resolved. + PretendMergeOrRebaseStartedInLazygit() } diff --git a/pkg/jsonschema/generate.go b/pkg/jsonschema/generate.go index 5e7267e3e..cf7596761 100644 --- a/pkg/jsonschema/generate.go +++ b/pkg/jsonschema/generate.go @@ -58,7 +58,9 @@ func customReflect(v *config.UserConfig) *jsonschema.Schema { } filterOutDevComments(r) schema := r.Reflect(v) + inlineKeybindingRefs(schema) defaultConfig := config.GetDefaultConfig() + defaultConfig.Keybinding.MergeLegacyAltKeybindings() userConfigSchema := schema.Definitions["UserConfig"] defaultValue := reflect.ValueOf(defaultConfig).Elem() @@ -77,6 +79,57 @@ func customReflect(v *config.UserConfig) *jsonschema.Schema { return schema } +// inlineKeybindingRefs replaces every `$ref: #/$defs/Keybinding` in the +// schema with the inlined oneOf union, then drops the Keybinding definition. +// +// The schema generator stores types that implement JSONSchema() as shared +// definitions and uses $ref to point at them. That works for most types +// (where every reference logically points at the same data), but for +// Keybinding fields each property carries its own description and default, +// and writing those onto the shared definition would clobber siblings. +// Inlining sidesteps the issue. +func inlineKeybindingRefs(schema *jsonschema.Schema) { + const ref = "#/$defs/Keybinding" + keybindingDef, ok := schema.Definitions["Keybinding"] + if !ok { + return + } + inline := func(s *jsonschema.Schema) { + desc := s.Description + *s = *keybindingDef + s.Description = desc + } + var visit func(s *jsonschema.Schema) + visit = func(s *jsonschema.Schema) { + if s == nil { + return + } + if s.Properties != nil { + for pair := s.Properties.Oldest(); pair != nil; pair = pair.Next() { + if pair.Value.Ref == ref { + inline(pair.Value) + } else { + visit(pair.Value) + } + } + } + if s.Items != nil { + if s.Items.Ref == ref { + inline(s.Items) + } else { + visit(s.Items) + } + } + if s.AdditionalProperties != nil { + visit(s.AdditionalProperties) + } + } + for _, def := range schema.Definitions { + visit(def) + } + delete(schema.Definitions, "Keybinding") +} + func filterOutDevComments(r *jsonschema.Reflector) { for k, v := range r.CommentMap { commentLines := strings.Split(v, "\n") @@ -91,7 +144,7 @@ func setDefaultVals(rootSchema, schema *jsonschema.Schema, defaults any) { t := reflect.TypeOf(defaults) v := reflect.ValueOf(defaults) - if t.Kind() == reflect.Ptr || t.Kind() == reflect.Interface { + if t.Kind() == reflect.Pointer || t.Kind() == reflect.Interface { t = t.Elem() v = v.Elem() } @@ -149,7 +202,7 @@ func isZeroValue(v any) bool { switch rv.Kind() { case reflect.Slice, reflect.Map: return rv.Len() == 0 - case reflect.Ptr, reflect.Interface: + case reflect.Pointer, reflect.Interface: return rv.IsNil() case reflect.Struct: for i := range rv.NumField() { diff --git a/pkg/logs/logs.go b/pkg/logs/logs.go index 7ec1b91b4..40fc207c5 100644 --- a/pkg/logs/logs.go +++ b/pkg/logs/logs.go @@ -4,6 +4,8 @@ import ( "io" "log" "os" + "sync" + "time" "github.com/sirupsen/logrus" ) @@ -34,6 +36,11 @@ func NewProductionLogger() *logrus.Entry { return formatted(logger) } +// Separates one run's log entries from the previous run's. Only the first +// logger of a run writes it: with LAZYGIT_LOG_PATH set there are two of them +// for the same file, the global one and the app's. +var runSeparator sync.Once + func NewDevelopmentLogger(logPath string) *logrus.Entry { logger := logrus.New() logger.SetLevel(getLogLevel()) @@ -42,6 +49,9 @@ func NewDevelopmentLogger(logPath string) *logrus.Entry { if err != nil { log.Fatalf("Unable to log to log file: %v", err) } + runSeparator.Do(func() { + _, _ = file.WriteString("\n") + }) logger.SetOutput(file) return formatted(logger) } @@ -49,7 +59,7 @@ func NewDevelopmentLogger(logPath string) *logrus.Entry { func formatted(log *logrus.Logger) *logrus.Entry { // highly recommended: tail -f development.log | humanlog // https://github.com/aybabtme/humanlog - log.Formatter = &logrus.JSONFormatter{} + log.Formatter = &logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano} return log.WithFields(logrus.Fields{}) } diff --git a/pkg/logs/tail/logs_windows.go b/pkg/logs/tail/logs_windows.go index 3c45d70af..b116cb405 100644 --- a/pkg/logs/tail/logs_windows.go +++ b/pkg/logs/tail/logs_windows.go @@ -11,8 +11,8 @@ import ( ) func tailLogsForPlatform(logFilePath string, opts *humanlog.HandlerOptions) { - var lastModified int64 = 0 - var lastOffset int64 = 0 + var lastModified int64 + var lastOffset int64 for { stat, err := os.Stat(logFilePath) if err != nil { @@ -55,6 +55,9 @@ func tailFrom(lastOffset int64, logFilePath string, opts *humanlog.HandlerOption lines = append(lines, fileScanner.Text()) } file.Close() + if err := fileScanner.Err(); err != nil { + return err + } lineCount := len(lines) lastTen := lines if lineCount > 10 { diff --git a/pkg/logs/tail/tail.go b/pkg/logs/tail/tail.go index b21bc21e4..1cc5ef05e 100644 --- a/pkg/logs/tail/tail.go +++ b/pkg/logs/tail/tail.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "os" + "time" "github.com/aybabtme/humanlog" ) @@ -15,6 +16,7 @@ func TailLogs(logFilePath string) { opts := humanlog.DefaultOptions opts.Truncates = false + opts.TimeFormat = time.StampMilli _, err := os.Stat(logFilePath) if err != nil { diff --git a/pkg/snake/snake.go b/pkg/snake/snake.go index 62fc0ddfd..7dd2e079c 100644 --- a/pkg/snake/snake.go +++ b/pkg/snake/snake.go @@ -20,7 +20,7 @@ type Game struct { exit chan (struct{}) // channel for specifying the direction the player wants the snake to go in - setNewDir chan (Direction) + setNewDir chan Direction // allows logging for debugging logger func(string) diff --git a/pkg/tasks/async_handler.go b/pkg/tasks/async_handler.go index 658687af9..ab0770568 100644 --- a/pkg/tasks/async_handler.go +++ b/pkg/tasks/async_handler.go @@ -1,7 +1,7 @@ package tasks import ( - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/sasha-s/go-deadlock" ) diff --git a/pkg/tasks/async_handler_test.go b/pkg/tasks/async_handler_test.go index 6da363cd9..6b354d9c5 100644 --- a/pkg/tasks/async_handler_test.go +++ b/pkg/tasks/async_handler_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/stretchr/testify/assert" ) diff --git a/pkg/tasks/read_request_queue.go b/pkg/tasks/read_request_queue.go new file mode 100644 index 000000000..444e514fd --- /dev/null +++ b/pkg/tasks/read_request_queue.go @@ -0,0 +1,101 @@ +package tasks + +import "sync" + +// readRequestQueue is an unbounded, order-preserving FIFO of the read requests a +// view's running command task serves (see LinesToRead), with a reader that comes +// and goes. +// +// It's unbounded, rather than a fixed-size channel, for the same reasons as the +// user-event queue in gocui. Requests are handed over from the UI thread, where a +// blocking send would deadlock against the task that is waiting to be let go, and +// a fixed channel that fills up leaves only bad choices: blocking, dropping, +// reordering, or panicking on overflow. Appending to a slice does none of those. +// +// The reader coming and going is the other half of what it's for. A request is +// how a caller asks for content to be read and hears, through the request's Then, +// that it has been; a request nobody answers leaves that caller waiting for good. +// So asking whether a task is there and handing it the request are one step, and +// so are taking the task away and handing back what it never answered. A request +// made in between finds no task and goes back to its caller to answer. +// +// enqueue appends under the mutex and rings the doorbell; the task selects on the +// doorbell to wake, then takes requests until there are none left. The doorbell is +// buffered(1) and rung with a non-blocking send, so it's a coalescing "work +// pending" flag rather than a per-request signal: a burst of appends leaves at +// most one token, and the task takes everything the token stands for on a single +// wake. A token left over after the queue empties causes one harmless empty wake. +type readRequestQueue struct { + mutex sync.Mutex + requests []LinesToRead + doorbell chan struct{} + + // Whether a task is there to serve the requests. False before the first task + // starts, and between one task ending and the next starting. + serving bool +} + +func newReadRequestQueue() *readRequestQueue { + return &readRequestQueue{doorbell: make(chan struct{}, 1)} +} + +// beginServing says that a task is now there to serve the queue, and returns the +// doorbell that tells it when there is something to serve. +func (self *readRequestQueue) beginServing() <-chan struct{} { + self.mutex.Lock() + defer self.mutex.Unlock() + + self.serving = true + return self.doorbell +} + +// stopServing takes the task away and hands back the requests it never answered, +// for the caller to answer in its place. +func (self *readRequestQueue) stopServing() []LinesToRead { + self.mutex.Lock() + defer self.mutex.Unlock() + + self.serving = false + unanswered := self.requests + self.requests = nil + return unanswered +} + +// enqueue gives a request to the task serving the queue, and reports whether +// there was one to give it to. When there wasn't, the request is the caller's to +// answer. +func (self *readRequestQueue) enqueue(request LinesToRead) bool { + self.mutex.Lock() + if !self.serving { + self.mutex.Unlock() + return false + } + self.requests = append(self.requests, request) + self.mutex.Unlock() + + select { + case self.doorbell <- struct{}{}: + default: + } + return true +} + +// dequeue takes the oldest request, reporting false when there are none. +func (self *readRequestQueue) dequeue() (LinesToRead, bool) { + self.mutex.Lock() + defer self.mutex.Unlock() + + if len(self.requests) == 0 { + return LinesToRead{}, false + } + request := self.requests[0] + if len(self.requests) == 1 { + // Release the backing array whenever the queue drains, so a one-off burst + // doesn't pin its peak size for the rest of the session. + self.requests = nil + } else { + self.requests[0] = LinesToRead{} + self.requests = self.requests[1:] + } + return request, true +} diff --git a/pkg/tasks/read_request_queue_test.go b/pkg/tasks/read_request_queue_test.go new file mode 100644 index 000000000..423b89d09 --- /dev/null +++ b/pkg/tasks/read_request_queue_test.go @@ -0,0 +1,58 @@ +package tasks + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestReadRequestQueueHandsBackWhatNoTaskWillServe(t *testing.T) { + queue := newReadRequestQueue() + + // Nothing has begun serving, so the request comes straight back to its caller. + assert.False(t, queue.enqueue(LinesToRead{Total: 1})) + + queue.beginServing() + assert.True(t, queue.enqueue(LinesToRead{Total: 1})) + assert.True(t, queue.enqueue(LinesToRead{Total: 2})) + + request, ok := queue.dequeue() + assert.True(t, ok) + assert.Equal(t, 1, request.Total) + + // What the task never got to comes back when it stops, and nothing is taken + // from a caller after that. + unanswered := queue.stopServing() + assert.Len(t, unanswered, 1) + assert.Equal(t, 2, unanswered[0].Total) + + assert.False(t, queue.enqueue(LinesToRead{Total: 3})) + _, ok = queue.dequeue() + assert.False(t, ok) +} + +func TestReadRequestQueueRingsTheDoorbell(t *testing.T) { + queue := newReadRequestQueue() + doorbell := queue.beginServing() + + select { + case <-doorbell: + assert.Fail(t, "the doorbell rang before anything was queued") + default: + } + + // A burst leaves one token, which stands for everything queued. + queue.enqueue(LinesToRead{Total: 1}) + queue.enqueue(LinesToRead{Total: 2}) + + select { + case <-doorbell: + default: + assert.Fail(t, "the doorbell didn't ring") + } + select { + case <-doorbell: + assert.Fail(t, "the doorbell rang twice for one wake") + default: + } +} diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go index 5c5875fa8..deaeee042 100644 --- a/pkg/tasks/tasks.go +++ b/pkg/tasks/tasks.go @@ -4,17 +4,44 @@ import ( "bufio" "fmt" "io" + "os" "os/exec" + "strconv" "sync" + "sync/atomic" "time" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/sasha-s/go-deadlock" "github.com/sirupsen/logrus" ) +// Cmd abstracts over a started external process. *exec.Cmd satisfies the bulk +// of it via ExecCmd, but pty implementations can supply their own types — on +// Windows, ConPTY has to spawn via CreateProcess directly and can't use +// *exec.Cmd (see golang/go#62708). +type Cmd interface { + Wait() error + String() string + // Terminate makes the process stop early, as gracefully as the platform + // allows. It doesn't wait for the process to exit. + Terminate() error +} + +// ExecCmd adapts *exec.Cmd to Cmd. +type ExecCmd struct { + *exec.Cmd +} + +// Terminate sends SIGTERM on Unix. On Windows it does nothing, so a stopped +// command keeps running until it next writes to its (by then closed) output +// pipe. +func (c ExecCmd) Terminate() error { + return oscommands.TerminateProcessGracefully(c.Process) +} + // This file revolves around running commands that will be output to the main panel // in the gui. If we're flicking through the commits panel, we want to invoke a // `git show` command for each commit, but we don't want to read the entire output @@ -36,33 +63,84 @@ type ViewBufferManager struct { writer io.Writer waitingMutex deadlock.Mutex - taskIDMutex deadlock.Mutex - Log *logrus.Entry - newTaskID int - readLines chan LinesToRead + // Guards newTaskID and taskKey, which identify the most recently requested + // task. Both are written on the goroutine NewTask spawns, and taskKey is + // read from the UI thread (GetTaskKey), so neither may be touched without + // holding this. + taskIDMutex deadlock.Mutex + Log *logrus.Entry + newTaskID int + // The requests by which the currently-running task is told to read more lines + // (e.g. as the user scrolls), and which it answers once it has. The task + // serving them comes and goes; see readRequestQueue. + readRequests *readRequestQueue taskKey string - onNewKey func() + + // Resets the view's scroll position to the top. A render whose content is + // different from what the view last showed (a different command key) calls + // this — but at its *first paint*, not when the task starts: the off-screen + // render leaves the previous content displayed until the swap, so resetting + // the origin up front would scroll that still-displayed content to the top + // before the new content replaces it. See newContentPending. + resetOrigin func() + + // Whether the content the running task is rendering differs from what the + // view is currently showing (i.e. the command key changed). Two things key + // off it: the loading indicator only takes the view over when it is set, + // since there is no point clearing content we are about to render + // identically; and the first paint that reveals the content resets the + // scroll to the top and clears it. + // + // It deliberately outlives the task that set it: a task can be stopped and + // replaced before it ever paints — a background refresh landing just after + // the user clicked a different item, say — and the replacement, which + // renders the same content and so sets nothing of its own, still has to do + // what that task was owed. + newContentPending atomic.Bool + + // Whether a command task is currently reading content into the view. While + // this is true the content is still growing, so callers (e.g. the layout) + // must not clamp the view's scroll position to the amount loaded so far. + loading atomic.Bool // beforeStart is the function that is called before starting a new task beforeStart func() refreshView func() onEndOfInput func() + // beginRender starts an off-screen render: the new content is built without + // disturbing what's displayed. swapInRender then promotes it to the display + // in one step. Together they keep the view showing the previous render until + // the new one has read enough to paint, instead of revealing it line by line. + beginRender func() + swapInRender func() + // see docs/dev/Busy.md // A gocui task is not the same thing as the tasks defined in this file. // A gocui task simply represents the fact that lazygit is busy doing something, // whereas the tasks in this file are about rendering content to a view. newGocuiTask func() gocui.Task + // Runs f on the UI thread and blocks until it has completed. All mutations + // of the view happen through this, so that the view is only ever touched on + // the UI thread (where it is also laid out and drawn), never on the task's + // own goroutine. + onUIThread func(f func()) error + // if the user flicks through a heap of items, with each one // spawning a process to render something to the main view, // it can slow things down quite a bit. In these situations we - // want to throttle the spawning of processes. - throttle bool + // want to throttle the spawning of processes. Atomic because it's set + // from one task's stop goroutine and read when the next task starts. + throttle atomic.Bool } type LinesToRead struct { - // Total number of lines to read + // The total number of lines the task should have read once this request is + // satisfied. This is an absolute count from the start of the task, not a + // delta: the task keeps track of how many lines it has already read and only + // reads the shortfall, so a request for a total at or below what has already + // been read reads nothing. -1 means read all the way to the end. Total int // Number of lines after which we have read enough to fill the view, and can @@ -75,6 +153,9 @@ type LinesToRead struct { } func (self *ViewBufferManager) GetTaskKey() string { + self.taskIDMutex.Lock() + defer self.taskIDMutex.Unlock() + return self.taskKey } @@ -84,40 +165,82 @@ func NewViewBufferManager( beforeStart func(), refreshView func(), onEndOfInput func(), - onNewKey func(), + resetOrigin func(), + beginRender func(), + swapInRender func(), newGocuiTask func() gocui.Task, + onUIThread func(f func()) error, ) *ViewBufferManager { return &ViewBufferManager{ + readRequests: newReadRequestQueue(), Log: log, writer: writer, beforeStart: beforeStart, refreshView: refreshView, onEndOfInput: onEndOfInput, - readLines: nil, - onNewKey: onNewKey, + resetOrigin: resetOrigin, + beginRender: beginRender, + swapInRender: swapInRender, newGocuiTask: newGocuiTask, + onUIThread: onUIThread, } } -func (self *ViewBufferManager) ReadLines(n int) { - if self.readLines != nil { - go utils.Safe(func() { - self.readLines <- LinesToRead{Total: n, InitialRefreshAfter: -1} - }) - } +// ReadLines asks the task to ensure it has read at least totalLines lines in +// total. Because the count is absolute rather than a delta, repeated requests +// (e.g. as the user scrolls down, back up, and down again) don't re-read lines +// that have already been read: the task only ever reads the shortfall. +func (self *ViewBufferManager) ReadLines(totalLines int) { + // A request with no Then needs no answer, so there is nothing to do when no + // task is there to take it. + self.readRequests.enqueue(LinesToRead{Total: totalLines, InitialRefreshAfter: -1}) +} + +// IsLoading reports whether a command task is currently reading content into the +// view, meaning the content is still growing. +func (self *ViewBufferManager) IsLoading() bool { + return self.loading.Load() +} + +// StartLoading marks the view as loading content. It must be called +// synchronously when a command/pty task is started, before the task's goroutine +// runs, so that a layout pass happening in between doesn't clamp the scroll +// position to the not-yet-loaded content. It is cleared when the task reaches +// the end of its input. +func (self *ViewBufferManager) StartLoading() { + self.loading.Store(true) } func (self *ViewBufferManager) ReadToEnd(then func()) { - if self.readLines != nil { - go utils.Safe(func() { - self.readLines <- LinesToRead{Total: -1, InitialRefreshAfter: -1, Then: then} - }) - } else if then != nil { - then() + // The reading happens on the task's own goroutine, and the caller hears about + // it through then, so lazygit must not count as idle in between. + task := self.newGocuiTask() + answered := func() { + task.Done() + if then != nil { + then() + } + } + + request := LinesToRead{Total: -1, InitialRefreshAfter: -1, Then: answered} + if !self.readRequests.enqueue(request) { + // With no task reading, everything there is to read has been read. + answered() } } -func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), prefix string, linesToRead LinesToRead, onDoneFn func()) func(TaskOpts) error { +// stopServingReadRequests takes the task away from the read-request queue and +// answers whatever it never got to, so that nobody is left waiting for a callback +// that isn't coming. +func (self *ViewBufferManager) stopServingReadRequests() { + for _, request := range self.readRequests.stopServing() { + if request.Then != nil { + request.Then() + } + } +} + +func (self *ViewBufferManager) NewCmdTask(start func() (Cmd, io.Reader), prefix string, linesToRead LinesToRead, onDoneFn func()) func(TaskOpts) error { return func(opts TaskOpts) error { var onDoneOnce sync.Once var onFirstPageShownOnce sync.Once @@ -135,7 +258,7 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p onFirstPageShown() } - if self.throttle { + if self.throttle.Load() { self.Log.Info("throttling task") time.Sleep(THROTTLE_TIME) } @@ -158,23 +281,20 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p case <-done: // The command finished and did not have to be preemptively stopped before the next command. // No need to throttle. - self.throttle = false + self.throttle.Store(false) case <-opts.Stop: // we use the time it took to start the program as a way of checking if things // are running slow at the moment. This is admittedly a crude estimate, but // the point is that we only want to throttle when things are running slow // and the user is flicking through a bunch of items. - self.throttle = time.Since(startTime) < THROTTLE_TIME && timeToStart > COMMAND_START_THRESHOLD + self.throttle.Store(time.Since(startTime) < THROTTLE_TIME && timeToStart > COMMAND_START_THRESHOLD) // Kill the still-running command. The only reason to do this is to save CPU usage // when flicking through several very long diffs when diff.algorithm = histogram is // being used, in which case multiple git processes continue to calculate expensive // diffs in the background even though they have been stopped already. - // - // Unfortunately this will do nothing on Windows, so Windows users will have to live - // with the higher CPU usage. - if err := oscommands.TerminateProcessGracefully(cmd); err != nil { - self.Log.Errorf("error when trying to terminate cmd task: %v; Command: %v %v", err, cmd.Path, cmd.Args) + if err := cmd.Terminate(); err != nil { + self.Log.Errorf("error when trying to terminate cmd task: %v; Command: %v", err, cmd.String()) } // close the task's stdout pipe (or the pty if we're using one) to make the command terminate @@ -184,7 +304,9 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p loadingMutex := deadlock.Mutex{} - self.readLines = make(chan LinesToRead, 1024) + // Begin serving before any goroutine starts, so that the first request below + // can't arrive before there is a task to take it. + readRequests := self.readRequests.beginServing() scanner := bufio.NewScanner(r) scanner.Split(utils.ScanLinesAndTruncateWhenLongerThanBuffer(bufio.MaxScanTokenSize)) @@ -210,6 +332,10 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p <-lineWrittenChan } } + + if err := scanner.Err(); err != nil { + self.Log.Error(err) + } }) loaded := false @@ -222,8 +348,21 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p return case <-ticker.C: loadingMutex.Lock() - if !loaded { + // Only take the view over to say "loading..." when the content coming + // is different from what's on screen. A re-render of the same content + // leaves the view showing exactly what it should already, so clearing + // it for the message and then rendering the same thing back is a + // visible flicker for nothing — and a slow re-render of unchanged + // content is common (a background refresh over a repo with submodules + // that have uncommitted changes, say). The pending flag isn't consumed + // here; the first paint still owes the scroll reset. + if !loaded && self.newContentPending.Load() { self.beforeStart() + // beforeStart cleared the previous content to show "loading...", so + // put the view back at the top for it (beforeStart doesn't touch the + // origin). The origin is view state the UI thread reads while laying + // out, so write it there. + _ = self.onUIThread(self.resetOrigin) _, _ = self.writer.Write([]byte("loading...")) self.refreshView() } @@ -244,18 +383,83 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p } } - outer: - for { + // Go's select picks randomly among ready cases, so once opts.Stop is + // closed the selects below could still service a ready data channel + // instead of bailing. Check stop explicitly first to give it priority: + // a task that's been stopped (it's being replaced by a newer one) must + // not touch the view here — it would start an off-screen render and + // write the prefix into it, clobbering what the incoming task is about + // to render. + stopped := func() bool { select { case <-opts.Stop: + return true + default: + return false + } + } + + // The total number of lines we have read so far. Requests specify an + // absolute target total (see LinesToRead.Total), so we compare against + // this to work out how many more lines, if any, we still need to read. + linesRead := 0 + + // The first paint swaps the off-screen render in to reveal the new + // content, and settles the scroll position in the same step — so the new + // content first appears already where it belongs, and no draw can land + // between the two and show it at the previous render's scroll. It happens + // once, either when we've read far enough (below) or at end of input for + // content shorter than that. Callers run it on the UI thread: it writes + // the view's origin. + painted := false + firstPaint := func() { + if painted { + return + } + painted = true + self.swapInRender() + if self.newContentPending.Swap(false) { + self.resetOrigin() + } + } + + // Set LAZYGIT_SLOW_RENDER= to sleep that long after each + // line is written to the view, stretching async loads out so the frames + // of a re-render become visible. Useful for debugging scroll/flicker + // behaviour; has no effect when the variable is unset. + var slowRenderPerLine time.Duration + if v := os.Getenv("LAZYGIT_SLOW_RENDER"); v != "" { + if ms, err := strconv.Atoi(v); err == nil { + slowRenderPerLine = time.Duration(ms) * time.Millisecond + } + } + + outer: + for { + if stopped() { break outer - case linesToRead := <-self.readLines: + } + linesToRead, ok := self.readRequests.dequeue() + if !ok { + // Nothing to read yet: wait to be told there is, or to be stopped. + select { + case <-opts.Stop: + break outer + case <-readRequests: + } + continue + } + { callThen := func() { if linesToRead.Then != nil { linesToRead.Then() } } - for i := 0; linesToRead.Total == -1 || i < linesToRead.Total; i++ { + for linesToRead.Total == -1 || linesRead < linesToRead.Total { + if stopped() { + callThen() + break outer + } var ok bool var line []byte select { @@ -268,7 +472,10 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p loadingMutex.Lock() if !loaded { - self.beforeStart() + // Build the new content off-screen, leaving the previous render + // displayed until we swap in below; this is what keeps an async + // re-render from showing a half-loaded buffer. + self.beginRender() if prefix != "" { writeToView([]byte(prefix)) } @@ -277,19 +484,53 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p loadingMutex.Unlock() if !ok { - // if we're here then there's nothing left to scan from the source - // so we're at the EOF and can flush the stale content - self.onEndOfInput() + // lineChan is closed. At a genuine end of input we swap in what we + // read and finalize. But lineChan is also closed when this task has + // been stopped to make way for a newer one: stopping closes + // opts.Stop, and the scanner goroutine then closes lineChan, so the + // select above can land here instead of on the opts.Stop case. A + // stopped task is being replaced and must leave the view to the + // incoming task — swapping in its half-read buffer, clamping the + // origin, or clearing `loading` would all corrupt what that task is + // about to render. So bail out here, the same as the explicit stop + // case above. + select { + case <-opts.Stop: + callThen() + break outer + default: + } + // Genuine end of input: do the first paint now if it hasn't happened + // yet (the content was shorter than a screenful, so we never reached + // the point below), and flush the stale content. onEndOfInput reads + // the view's dimensions (to decide whether to scroll) and sets the + // origin, both of which are UI-thread-only, so run it there — as is + // firstPaint, which also writes the origin. + _ = self.onUIThread(func() { + firstPaint() + self.onEndOfInput() + }) + // The content is fully loaded now, so it's safe again for the + // layout to clamp the scroll position to it. We deliberately + // don't clear this when stopped (rather than EOF'd), because that + // means a newer task is taking over and is still loading. + self.loading.Store(false) callThen() break outer } writeToView(append(line, '\n')) lineWrittenChan <- struct{}{} + linesRead++ - if i+1 == linesToRead.InitialRefreshAfter { - // We have read enough lines to fill the view, so do a first refresh - // here to show what we have. Continue reading and refresh again at - // the end to make sure the scrollbar has the right size. + if slowRenderPerLine > 0 { + time.Sleep(slowRenderPerLine) + } + + if linesRead == linesToRead.InitialRefreshAfter { + // We have read enough lines to fill the view, so do the first paint + // and refresh to show it. Continue reading and refresh again at the + // end to make sure the scrollbar has the right size. + _ = self.onUIThread(firstPaint) refreshViewIfStale() } } @@ -299,7 +540,11 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p } } - self.readLines = nil + // Whoever made a request the loop never got to is waiting to hear that the + // content it asked for has been read, and there is nothing here to read it + // any more: at end of input it has all been read already, and a task that + // was stopped is handing the view over to the one replacing it. + self.stopServingReadRequests() refreshViewIfStale() @@ -312,7 +557,7 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p go func() { _ = cmd.Wait() }() default: if err := cmd.Wait(); err != nil { - self.Log.Errorf("Unexpected error when running cmd task: %v; Failed command: %v %v", err, cmd.Path, cmd.Args) + self.Log.Errorf("Unexpected error when running cmd task: %v; Failed command: %v", err, cmd.String()) } } @@ -323,7 +568,7 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p close(lineWrittenChan) }) - self.readLines <- linesToRead + self.readRequests.enqueue(linesToRead) <-done @@ -333,14 +578,21 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p // Close closes the task manager, killing whatever task may currently be running func (self *ViewBufferManager) Close() { - if self.stopCurrentTask == nil { + // stopCurrentTask is written by NewTask's goroutine under waitingMutex (and + // so is the sync.Once it closes over), so read it under the lock and call + // the captured value; a task starting on shutdown must not race us here. + self.waitingMutex.Lock() + stopCurrentTask := self.stopCurrentTask + self.waitingMutex.Unlock() + + if stopCurrentTask == nil { return } c := make(chan struct{}) go utils.Safe(func() { - self.stopCurrentTask() + stopCurrentTask() c <- struct{}{} }) @@ -377,15 +629,38 @@ func (self *ViewBufferManager) NewTask(f func(TaskOpts) error, key string) error }) } + // Assign the taskID synchronously so it reflects NewTask call order + // rather than the order in which the spawned goroutines happen to be + // scheduled. Otherwise two NewTask calls in quick succession can have + // their goroutines race, with the later-called task ending up with the + // lower taskID and losing the staleness check below. + self.taskIDMutex.Lock() + self.newTaskID++ + taskID := self.newTaskID + self.taskIDMutex.Unlock() + go utils.Safe(func() { defer completeGocuiTask() self.taskIDMutex.Lock() - self.newTaskID++ - taskID := self.newTaskID - if self.GetTaskKey() != key && self.onNewKey != nil { - self.onNewKey() + // Bail out before touching shared view state if a newer task has + // already been queued: if we reset the view here we'd do it for a task + // that's about to exit, potentially wiping output the winning task has + // already written. + if taskID < self.newTaskID { + self.taskIDMutex.Unlock() + return + } + + // Note we don't reset the origin here even when the command key changed: + // that's deferred to the first paint that reveals the new content (see + // newContentPending), so the previous content — left displayed until the + // swap — doesn't visibly jump to the top before the new content appears. + // Read taskKey directly: we already hold the mutex that guards it, and + // GetTaskKey would take it again. + if self.taskKey != key && self.resetOrigin != nil { + self.newContentPending.Store(true) } self.taskKey = key @@ -393,6 +668,8 @@ func (self *ViewBufferManager) NewTask(f func(TaskOpts) error, key string) error self.waitingMutex.Lock() + // Re-check staleness after acquiring waitingMutex: a newer task + // may have arrived while we were blocked here. self.taskIDMutex.Lock() if taskID < self.newTaskID { self.waitingMutex.Unlock() @@ -405,7 +682,8 @@ func (self *ViewBufferManager) NewTask(f func(TaskOpts) error, key string) error self.stopCurrentTask() } - self.readLines = nil + // Nothing serves read requests between one task and the next. + self.stopServingReadRequests() stop := make(chan struct{}) notifyStopped := make(chan struct{}) diff --git a/pkg/tasks/tasks_test.go b/pkg/tasks/tasks_test.go index 452b91eaf..c50a54cac 100644 --- a/pkg/tasks/tasks_test.go +++ b/pkg/tasks/tasks_test.go @@ -7,11 +7,13 @@ import ( "reflect" "strings" "sync" + "sync/atomic" "testing" "time" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/stretchr/testify/assert" ) func getCounter() (func(), func() int) { @@ -24,7 +26,9 @@ func TestNewCmdTaskInstantStop(t *testing.T) { beforeStart, getBeforeStartCallCount := getCounter() refreshView, getRefreshViewCallCount := getCounter() onEndOfInput, getOnEndOfInputCallCount := getCounter() - onNewKey, getOnNewKeyCallCount := getCounter() + resetOrigin, getResetOriginCallCount := getCounter() + beginRender, getBeginRenderCallCount := getCounter() + swapInRender, getSwapInRenderCallCount := getCounter() onDone, getOnDoneCallCount := getCounter() task := gocui.NewFakeTask() newTask := func() gocui.Task { @@ -37,19 +41,23 @@ func TestNewCmdTaskInstantStop(t *testing.T) { beforeStart, refreshView, onEndOfInput, - onNewKey, + resetOrigin, + beginRender, + swapInRender, newTask, + // no UI thread in the test; run the view mutations inline + func(f func()) error { f(); return nil }, ) stop := make(chan struct{}) reader := bytes.NewBufferString("test") - start := func() (*exec.Cmd, io.Reader) { + start := func() (Cmd, io.Reader) { // not actually starting this because it's not necessary cmd := exec.Command("blah") close(stop) - return cmd, reader + return ExecCmd{Cmd: cmd}, reader } fn := manager.NewCmdTask(start, "prefix\n", LinesToRead{20, -1, nil}, onDone) @@ -64,7 +72,9 @@ func TestNewCmdTaskInstantStop(t *testing.T) { {0, getBeforeStartCallCount(), "beforeStart"}, {1, getRefreshViewCallCount(), "refreshView"}, {0, getOnEndOfInputCallCount(), "onEndOfInput"}, - {0, getOnNewKeyCallCount(), "onNewKey"}, + {0, getResetOriginCallCount(), "resetOrigin"}, + {0, getBeginRenderCallCount(), "beginRender"}, + {0, getSwapInRenderCallCount(), "swapInRender"}, {1, getOnDoneCallCount(), "onDone"}, } for _, expectation := range callCountExpectations { @@ -89,7 +99,9 @@ func TestNewCmdTask(t *testing.T) { beforeStart, getBeforeStartCallCount := getCounter() refreshView, getRefreshViewCallCount := getCounter() onEndOfInput, getOnEndOfInputCallCount := getCounter() - onNewKey, getOnNewKeyCallCount := getCounter() + resetOrigin, getResetOriginCallCount := getCounter() + beginRender, getBeginRenderCallCount := getCounter() + swapInRender, getSwapInRenderCallCount := getCounter() onDone, getOnDoneCallCount := getCounter() task := gocui.NewFakeTask() newTask := func() gocui.Task { @@ -102,17 +114,21 @@ func TestNewCmdTask(t *testing.T) { beforeStart, refreshView, onEndOfInput, - onNewKey, + resetOrigin, + beginRender, + swapInRender, newTask, + // no UI thread in the test; run the view mutations inline + func(f func()) error { f(); return nil }, ) stop := make(chan struct{}) reader := bytes.NewBufferString("test") - start := func() (*exec.Cmd, io.Reader) { + start := func() (Cmd, io.Reader) { // not actually starting this because it's not necessary cmd := exec.Command("blah") - return cmd, reader + return ExecCmd{Cmd: cmd}, reader } fn := manager.NewCmdTask(start, "prefix\n", LinesToRead{20, -1, nil}, onDone) @@ -130,10 +146,12 @@ func TestNewCmdTask(t *testing.T) { actual int name string }{ - {1, getBeforeStartCallCount(), "beforeStart"}, + {0, getBeforeStartCallCount(), "beforeStart"}, {1, getRefreshViewCallCount(), "refreshView"}, {1, getOnEndOfInputCallCount(), "onEndOfInput"}, - {0, getOnNewKeyCallCount(), "onNewKey"}, + {0, getResetOriginCallCount(), "resetOrigin"}, + {1, getBeginRenderCallCount(), "beginRender"}, + {1, getSwapInRenderCallCount(), "swapInRender"}, {1, getOnDoneCallCount(), "onDone"}, } for _, expectation := range callCountExpectations { @@ -170,6 +188,203 @@ func (d *BlankLineReader) Read(p []byte) (n int, err error) { return 1, nil } +// A dummy reader that yields the given number of blank lines and then blocks +// until unblock is closed, at which point it reports EOF. This lets a test hold +// a task in its "still loading" state for as long as it needs to. +type BlockingLineReader struct { + linesToYield int + linesYielded int + reachedEnd bool + blocked chan struct{} + unblock chan struct{} +} + +func (d *BlockingLineReader) Read(p []byte) (n int, err error) { + if d.linesYielded == d.linesToYield { + if !d.reachedEnd { + d.reachedEnd = true + close(d.blocked) + } + <-d.unblock + return 0, io.EOF + } + + d.linesYielded++ + p[0] = '\n' + return 1, nil +} + +func TestNewCmdTaskQueuedReadAtEndOfInput(t *testing.T) { + writer := bytes.NewBuffer(nil) + task := gocui.NewFakeTask() + + manager := NewViewBufferManager( + utils.NewDummyLog(), + writer, + func() {}, + func() {}, + func() {}, + func() {}, + func() {}, + func() {}, + func() gocui.Task { return task }, + // no UI thread in the test; run the view mutations inline + func(f func()) error { f(); return nil }, + ) + + reader := BlockingLineReader{ + linesToYield: 5, + blocked: make(chan struct{}), + unblock: make(chan struct{}), + } + start := func() (Cmd, io.Reader) { + // not actually starting this because it's not necessary + return ExecCmd{Cmd: exec.Command("blah")}, &reader + } + + // The initial request asks for far more lines than the reader has, so the + // task reaches EOF while that request is still the one being served. + fn := manager.NewCmdTask(start, "", LinesToRead{100, -1, nil}, func() {}) + + thenCalled := false + wg := sync.WaitGroup{} + wg.Go(func() { + _ = fn(TaskOpts{Stop: make(chan struct{}), InitialContentLoaded: func() { task.Done() }}) + }) + + <-reader.blocked + // The request is queued by the time this returns, so it is outstanding when we + // let the task reach EOF below. + manager.ReadToEnd(func() { thenCalled = true }) + close(reader.unblock) + + wg.Wait() + + assert.True(t, thenCalled) +} + +// A task rendering content the view wasn't already showing resets the scroll +// position to the top, at its first paint. If it is stopped and replaced before +// it ever paints — a background refresh landing just after the user clicked a +// different item, say — the replacement renders the same content and so decides +// on no reset of its own; it has to perform the one the stopped task was owed, +// or the view keeps the scroll position of the content it showed before. +func TestResetOriginSurvivesTaskReplacement(t *testing.T) { + resetOrigin, getResetOriginCallCount := getCounter() + + manager := NewViewBufferManager( + utils.NewDummyLog(), + bytes.NewBuffer(nil), + func() {}, + func() {}, + func() {}, + resetOrigin, + func() {}, + func() {}, + func() gocui.Task { return gocui.NewFakeTask() }, + // no UI thread in the test; run the view mutations inline + func(f func()) error { f(); return nil }, + ) + + startTask := func(key string, reader io.Reader, onDone func()) { + start := func() (Cmd, io.Reader) { + // not actually starting this because it's not necessary + return ExecCmd{Cmd: exec.Command("blah")}, reader + } + // The first-paint point is far beyond what any of these readers yield, so + // only reaching EOF paints. + _ = manager.NewTask(manager.NewCmdTask(start, "", LinesToRead{100, 50, nil}, onDone), key) + } + runTaskToCompletion := func(key string) { + done := make(chan struct{}) + startTask(key, &BlankLineReader{totalLinesToYield: 3}, func() { close(done) }) + <-done + } + + // A render of content the view wasn't showing resets the scroll position. + runTaskToCompletion("cmd1") + assert.Equal(t, 1, getResetOriginCallCount()) + + // Different content again, but this task stalls before it can paint. + stalled := BlockingLineReader{ + linesToYield: 3, + blocked: make(chan struct{}), + unblock: make(chan struct{}), + } + defer close(stalled.unblock) + startTask("cmd2", &stalled, nil) + <-stalled.blocked + + // The replacement shows the same content as the stalled task, so it has no + // reset of its own to do — but it must still do that task's. + runTaskToCompletion("cmd2") + assert.Equal(t, 2, getResetOriginCallCount()) +} + +// A render that takes long enough to start takes the view over to say +// "loading...", which means blanking whatever it was showing. That is only worth +// doing when the content coming is different from what's on screen: re-rendering +// the same content (a background refresh, say) would otherwise blank the view and +// paint the same thing back, a visible flicker for nothing. +func TestLoadingIndicatorOnlyTakesOverForNewContent(t *testing.T) { + var beforeStartCount atomic.Int32 + + manager := NewViewBufferManager( + utils.NewDummyLog(), + io.Discard, + func() { beforeStartCount.Add(1) }, + func() {}, + func() {}, + func() {}, + func() {}, + func() {}, + func() gocui.Task { return gocui.NewFakeTask() }, + // no UI thread in the test; run the view mutations inline + func(f func()) error { f(); return nil }, + ) + + startTask := func(key string, reader io.Reader, onDone func()) { + start := func() (Cmd, io.Reader) { + // not actually starting this because it's not necessary + return ExecCmd{Cmd: exec.Command("blah")}, reader + } + _ = manager.NewTask(manager.NewCmdTask(start, "", LinesToRead{100, 50, nil}, onDone), key) + } + // Starts a task whose command produces nothing at all, so that it is still + // waiting for its first line when the loading indicator falls due. Returns + // the reader so the caller can let it finish. + startStalledTask := func(key string) *BlockingLineReader { + reader := &BlockingLineReader{ + blocked: make(chan struct{}), + unblock: make(chan struct{}), + } + startTask(key, reader, nil) + <-reader.blocked + return reader + } + + // Get some content on screen first: the indicator is only due when a render + // is slow, and this one isn't. + done := make(chan struct{}) + startTask("cmd1", &BlankLineReader{totalLinesToYield: 3}, func() { close(done) }) + <-done + assert.EqualValues(t, 0, beforeStartCount.Load()) + + // A slow re-render of that same content must leave the view alone however + // long it takes. The indicator is due 200ms in, so give it well past that. + sameContent := startStalledTask("cmd1") + defer close(sameContent.unblock) + time.Sleep(500 * time.Millisecond) + assert.EqualValues(t, 0, beforeStartCount.Load()) + + // Different content, though, is worth taking the view over for. + newContent := startStalledTask("cmd2") + defer close(newContent.unblock) + assert.Eventually(t, + func() bool { return beforeStartCount.Load() == 1 }, + 2*time.Second, 10*time.Millisecond) +} + func TestNewCmdTaskRefresh(t *testing.T) { type scenario struct { name string @@ -236,16 +451,20 @@ func TestNewCmdTaskRefresh(t *testing.T) { refreshView, func() {}, func() {}, + func() {}, + func() {}, newTask, + // no UI thread in the test; run the view mutations inline + func(f func()) error { f(); return nil }, ) stop := make(chan struct{}) reader := BlankLineReader{totalLinesToYield: s.totalTaskLines} - start := func() (*exec.Cmd, io.Reader) { + start := func() (Cmd, io.Reader) { // not actually starting this because it's not necessary cmd := exec.Command("blah") - return cmd, &reader + return ExecCmd{Cmd: cmd}, &reader } fn := manager.NewCmdTask(start, "", s.linesToRead, func() {}) @@ -264,3 +483,42 @@ func TestNewCmdTaskRefresh(t *testing.T) { } } } + +// A read request is answered by the task that serves it calling the request's Then. +// This checks that requests still waiting when the task is stopped are answered too, +// which is what happens when a re-render replaces the task. +func TestQueuedReadRequestsAreAnsweredWhenTheTaskStops(t *testing.T) { + noop := func() {} + task := gocui.NewFakeTask() + + // A pipe the task blocks on, so that the requests are still waiting when it stops. + pipeReader, pipeWriter := io.Pipe() + defer pipeWriter.Close() + + manager := NewViewBufferManager( + utils.NewDummyLog(), bytes.NewBuffer(nil), noop, noop, noop, noop, noop, noop, + func() gocui.Task { return task }, + func(f func()) error { f(); return nil }, + ) + + stop := make(chan struct{}) + fn := manager.NewCmdTask( + func() (Cmd, io.Reader) { return ExecCmd{Cmd: exec.Command("true")}, pipeReader }, + "", LinesToRead{Total: 1, InitialRefreshAfter: -1}, noop) + go func() { _, _ = pipeWriter.Write([]byte("first line\n")) }() + go func() { _ = fn(TaskOpts{Stop: stop, InitialContentLoaded: noop}) }() + // Let the task start and read the line it was asked for, so that the requests + // below are handed to a task that is waiting for them. + time.Sleep(50 * time.Millisecond) + + answered := atomic.Int32{} + manager.ReadToEnd(func() { answered.Add(1) }) + manager.ReadToEnd(func() { answered.Add(1) }) + + // Let the first request be picked up and block on the pipe, then stop the task. + time.Sleep(50 * time.Millisecond) + close(stop) + time.Sleep(50 * time.Millisecond) + + assert.EqualValues(t, 2, answered.Load()) +} diff --git a/pkg/theme/gocui.go b/pkg/theme/gocui.go index 5f8e6a611..6d10f8666 100644 --- a/pkg/theme/gocui.go +++ b/pkg/theme/gocui.go @@ -2,7 +2,7 @@ package theme import ( "github.com/gookit/color" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/theme/theme.go b/pkg/theme/theme.go index acd8ebf71..d2e5b1291 100644 --- a/pkg/theme/theme.go +++ b/pkg/theme/theme.go @@ -1,8 +1,8 @@ package theme import ( - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/jesseduffield/lazygit/pkg/gui/style" ) diff --git a/pkg/utils/date.go b/pkg/utils/date.go index 9e8c84445..f0303a9c4 100644 --- a/pkg/utils/date.go +++ b/pkg/utils/date.go @@ -57,7 +57,7 @@ func formatSecondsAgo(secondsAgo int64) string { // formats the date in a smart way, if the date is today, it will show the time, otherwise it will show the date func UnixToDateSmart(now time.Time, timestamp int64, longTimeFormat string, shortTimeFormat string) string { - date := time.Unix(timestamp, 0) + date := time.Unix(timestamp, 0).In(now.Location()) if date.Day() == now.Day() && date.Month() == now.Month() && date.Year() == now.Year() { return date.Format(shortTimeFormat) diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go index 0162f5f67..28ad65df8 100644 --- a/pkg/utils/date_test.go +++ b/pkg/utils/date_test.go @@ -2,6 +2,9 @@ package utils import ( "testing" + "time" + + "github.com/stretchr/testify/assert" ) func TestFormatSecondsAgo(t *testing.T) { @@ -95,3 +98,18 @@ func TestFormatSecondsAgo(t *testing.T) { }) } } + +func TestUnixToDateSmart_UsesNowLocationForFormatting(t *testing.T) { + timestamp := int64(1577844184) // 2020-01-01 02:03:04 UTC + now := time.Date(2020, 1, 1, 5, 3, 4, 0, time.UTC) + + assert.Equal(t, "2:03AM", UnixToDateSmart(now, timestamp, "2006-01-02", "3:04PM")) +} + +func TestUnixToDateSmart_SameTimestampDifferentNowLocation(t *testing.T) { + timestamp := int64(1577844184) // 2020-01-01 02:03:04 UTC + loc := time.FixedZone("UTC+1", 3600) + now := time.Date(2020, 1, 1, 6, 3, 4, 0, loc) + + assert.Equal(t, "3:03AM", UnixToDateSmart(now, timestamp, "2006-01-02", "3:04PM")) +} diff --git a/pkg/utils/lines_test.go b/pkg/utils/lines_test.go index 973310a33..2b97761d3 100644 --- a/pkg/utils/lines_test.go +++ b/pkg/utils/lines_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" "github.com/stretchr/testify/assert" ) diff --git a/pkg/utils/rebase_todo.go b/pkg/utils/rebase_todo.go index fe04cbc60..3a3577f80 100644 --- a/pkg/utils/rebase_todo.go +++ b/pkg/utils/rebase_todo.go @@ -144,27 +144,40 @@ func deleteTodos(todos []todo.Todo, todosToDelete []Todo) ([]todo.Todo, error) { } func MoveTodosDown(fileName string, todosToMove []Todo, isInRebase bool, commentChar byte) error { + return MoveTodos(fileName, todosToMove, isInRebase, 1, commentChar) +} + +func MoveTodosUp(fileName string, todosToMove []Todo, isInRebase bool, commentChar byte) error { + return MoveTodos(fileName, todosToMove, isInRebase, -1, commentChar) +} + +func MoveTodos(fileName string, todosToMove []Todo, isInRebase bool, offset int, commentChar byte) error { todos, err := ReadRebaseTodoFile(fileName, commentChar) if err != nil { return err } - rearrangedTodos, err := moveTodosDown(todos, todosToMove, isInRebase) + rearrangedTodos, err := moveTodos(todos, todosToMove, isInRebase, offset) if err != nil { return err } return WriteRebaseTodoFile(fileName, rearrangedTodos, commentChar) } -func MoveTodosUp(fileName string, todosToMove []Todo, isInRebase bool, commentChar byte) error { - todos, err := ReadRebaseTodoFile(fileName, commentChar) - if err != nil { - return err +func moveTodos(todos []todo.Todo, todosToMove []Todo, isInRebase bool, offset int) ([]todo.Todo, error) { + moveOneRow := moveTodosUp + if offset > 0 { + moveOneRow = moveTodosDown } - rearrangedTodos, err := moveTodosUp(todos, todosToMove, isInRebase) - if err != nil { - return err + + for range max(offset, -offset) { + var err error + todos, err = moveOneRow(todos, slices.Clone(todosToMove), isInRebase) + if err != nil { + return nil, err + } } - return WriteRebaseTodoFile(fileName, rearrangedTodos, commentChar) + + return todos, nil } func moveTodoDown(todos []todo.Todo, todoToMove Todo, isInRebase bool) ([]todo.Todo, error) { diff --git a/pkg/utils/rebase_todo_test.go b/pkg/utils/rebase_todo_test.go index 9daf7db01..a9ac1bba5 100644 --- a/pkg/utils/rebase_todo_test.go +++ b/pkg/utils/rebase_todo_test.go @@ -3,12 +3,55 @@ package utils import ( "errors" "fmt" + "slices" "testing" "github.com/stefanhaller/git-todo-parser/todo" "github.com/stretchr/testify/assert" ) +func TestMoveTodos(t *testing.T) { + todos := []todo.Todo{ + {Command: todo.Pick, Commit: "a"}, + {Command: todo.Pick, Commit: "b"}, + {Command: todo.Label, Label: "hidden"}, + {Command: todo.Pick, Commit: "c"}, + {Command: todo.Pick, Commit: "d"}, + {Command: todo.Pick, Commit: "e"}, + {Command: todo.Pick, Commit: "f"}, + } + + t.Run("moves a range up multiple rendered rows", func(t *testing.T) { + actual, err := moveTodos(slices.Clone(todos), []Todo{{Hash: "d"}, {Hash: "c"}}, false, -2) + + assert.NoError(t, err) + assert.Equal(t, []todo.Todo{ + {Command: todo.Pick, Commit: "a"}, + {Command: todo.Pick, Commit: "b"}, + {Command: todo.Label, Label: "hidden"}, + {Command: todo.Pick, Commit: "e"}, + {Command: todo.Pick, Commit: "f"}, + {Command: todo.Pick, Commit: "c"}, + {Command: todo.Pick, Commit: "d"}, + }, actual) + }) + + t.Run("moves a range down multiple rendered rows", func(t *testing.T) { + actual, err := moveTodos(slices.Clone(todos), []Todo{{Hash: "e"}, {Hash: "d"}}, false, 2) + + assert.NoError(t, err) + assert.Equal(t, []todo.Todo{ + {Command: todo.Pick, Commit: "a"}, + {Command: todo.Pick, Commit: "d"}, + {Command: todo.Pick, Commit: "e"}, + {Command: todo.Pick, Commit: "b"}, + {Command: todo.Label, Label: "hidden"}, + {Command: todo.Pick, Commit: "c"}, + {Command: todo.Pick, Commit: "f"}, + }, actual) + }) +} + func TestRebaseCommands_moveTodoDown(t *testing.T) { type scenario struct { testName string diff --git a/pkg/utils/stack.go b/pkg/utils/stack.go new file mode 100644 index 000000000..9cac1f563 --- /dev/null +++ b/pkg/utils/stack.go @@ -0,0 +1,28 @@ +package utils + +type Stack[T any] struct { + stack []T +} + +func (self *Stack[T]) Push(item T) { + self.stack = append(self.stack, item) +} + +func (self *Stack[T]) Pop() T { + if len(self.stack) == 0 { + var zero T + return zero + } + n := len(self.stack) - 1 + last := self.stack[n] + self.stack = self.stack[:n] + return last +} + +func (self *Stack[T]) IsEmpty() bool { + return len(self.stack) == 0 +} + +func (self *Stack[T]) Clear() { + self.stack = nil +} diff --git a/pkg/utils/string_stack.go b/pkg/utils/string_stack.go deleted file mode 100644 index c2d18c70c..000000000 --- a/pkg/utils/string_stack.go +++ /dev/null @@ -1,27 +0,0 @@ -package utils - -type StringStack struct { - stack []string -} - -func (self *StringStack) Push(s string) { - self.stack = append(self.stack, s) -} - -func (self *StringStack) Pop() string { - if len(self.stack) == 0 { - return "" - } - n := len(self.stack) - 1 - last := self.stack[n] - self.stack = self.stack[:n] - return last -} - -func (self *StringStack) IsEmpty() bool { - return len(self.stack) == 0 -} - -func (self *StringStack) Clear() { - self.stack = []string{} -} diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 7eb24b736..0494bb035 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -4,12 +4,13 @@ import ( "encoding/json" "fmt" "os" + "path/filepath" "regexp" "runtime" "strconv" "strings" - "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gocui" ) // GetProjectRoot returns the path to the root of the project. Only to be used @@ -96,3 +97,26 @@ func FilePath(skip int) string { _, path, _, _ := runtime.Caller(skip) return path } + +// ExpandTilde expands a leading "~" that refers to the current user's home +// directory: "~" and "~/foo" become e.g. "/home/user" and "/home/user/foo". A +// tilde anywhere other than the start, or one immediately followed by a +// username ("~other/foo"), is left untouched, as is the path if the home +// directory can't be determined. We expand it ourselves because lazygit runs +// git directly, with no shell to do it for us. +func ExpandTilde(path string) string { + if path != "~" && !strings.HasPrefix(path, "~/") && + !(runtime.GOOS == "windows" && strings.HasPrefix(path, `~\`)) { + return path + } + + home, err := os.UserHomeDir() + if err != nil { + return path + } + + if path == "~" { + return home + } + return filepath.Join(home, path[2:]) +} diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 41b40cd9f..8304e7ba4 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -1,6 +1,8 @@ package utils import ( + "os" + "path/filepath" "testing" "github.com/stretchr/testify/assert" @@ -98,3 +100,28 @@ func TestModuloWithWrap(t *testing.T) { } } } + +func TestExpandTilde(t *testing.T) { + home, err := os.UserHomeDir() + assert.NoError(t, err) + + scenarios := []struct { + name string + path string + expected string + }{ + {"bare tilde", "~", home}, + {"tilde with subpath", "~/worktrees", filepath.Join(home, "worktrees")}, + {"absolute path is untouched", "/absolute/path", "/absolute/path"}, + {"relative path is untouched", "relative/path", "relative/path"}, + {"tilde not at the start is untouched", "/foo/~/bar", "/foo/~/bar"}, + {"tilde followed by a username is untouched", "~other/worktrees", "~other/worktrees"}, + {"empty string is untouched", "", ""}, + } + + for _, s := range scenarios { + t.Run(s.name, func(t *testing.T) { + assert.Equal(t, s.expected, ExpandTilde(s.path)) + }) + } +} diff --git a/pkg/utils/yaml_utils/yaml_utils.go b/pkg/utils/yaml_utils/yaml_utils.go index f8f7f0679..c7a72515b 100644 --- a/pkg/utils/yaml_utils/yaml_utils.go +++ b/pkg/utils/yaml_utils/yaml_utils.go @@ -32,6 +32,23 @@ func RemoveKey(node *yaml.Node, key string) (*yaml.Node, *yaml.Node) { return nil, nil } +// Adds a string field to the given object. Caution: doesn't check for duplicate +// keys, that's the caller's responsibility +func AddStringKey(mappingNode *yaml.Node, key string, value string) { + keyNode := &yaml.Node{ + Kind: yaml.ScalarNode, + Tag: "!!str", + Value: key, + } + valueNode := &yaml.Node{ + Kind: yaml.ScalarNode, + Tag: "!!str", + Value: value, + } + + mappingNode.Content = append(mappingNode.Content, keyNode, valueNode) +} + // Walks a yaml document from the root node to the specified path, and then applies the transformation to that node. // If the requested path is not defined in the document, no changes are made to the document. func TransformNode(rootNode *yaml.Node, path []string, transform func(node *yaml.Node) error) error { @@ -101,6 +118,98 @@ func renameYamlKey(node *yaml.Node, path []string, newKey string) (error, bool) return renameYamlKey(valueNode, path[1:], newKey) } +// Takes the root node of a yaml document, the path to an existing key, and the +// path at which it should live instead. If the key exists, it (and its value) +// is moved to the new path, creating intermediate mapping nodes as needed, and +// any mapping nodes left empty behind it are removed. Does nothing if the key +// at oldPath doesn't exist. Returns an error if a key already exists at newPath, +// or if a node along either path exists but isn't a mapping. +func MoveYamlKey(rootNode *yaml.Node, oldPath []string, newPath []string) (error, bool) { + // Empty document: nothing to do. + if len(rootNode.Content) == 0 { + return nil, false + } + + body := rootNode.Content[0] + + // Bail out early if there's nothing to move. + oldParent, err := findContainingMap(body, oldPath, false) + if err != nil { + return err, false + } + if oldParent == nil { + return nil, false + } + keyNode, valueNode := LookupKey(oldParent, oldPath[len(oldPath)-1]) + if keyNode == nil { + return nil, false + } + + // Find or create the destination map, and make sure it's free. + newParent, err := findContainingMap(body, newPath, true) + if err != nil { + return err, false + } + newKey := newPath[len(newPath)-1] + if existing, _ := LookupKey(newParent, newKey); existing != nil { + return fmt.Errorf("new key `%s' already exists", newKey), false + } + + // Move the key, then prune any maps that became empty behind it. The + // destination is populated first so that a map shared by both paths isn't + // mistaken for empty during pruning. + RemoveKey(oldParent, oldPath[len(oldPath)-1]) + keyNode.Value = newKey + newParent.Content = append(newParent.Content, keyNode, valueNode) + removeEmptyMaps(body, oldPath[:len(oldPath)-1]) + + return nil, true +} + +// Descends path (excluding its final element) and returns the mapping node that +// should directly contain that final element. With create set, missing +// intermediate maps are created; otherwise a missing intermediate yields a nil +// result. Returns an error if a node along the path exists but isn't a mapping. +func findContainingMap(node *yaml.Node, path []string, create bool) (*yaml.Node, error) { + for _, key := range path[:len(path)-1] { + if node.Kind != yaml.MappingNode { + return nil, errors.New("yaml node in path is not a dictionary") + } + _, valueNode := LookupKey(node, key) + if valueNode == nil { + if !create { + return nil, nil + } + valueNode = &yaml.Node{Kind: yaml.MappingNode} + node.Content = append(node.Content, + &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!str", Value: key}, + valueNode) + } + node = valueNode + } + if node.Kind != yaml.MappingNode { + return nil, errors.New("yaml node in path is not a dictionary") + } + return node, nil +} + +// Walks path from node and removes any mapping that is empty once its child has +// been removed, cascading upward. Stops at the first non-empty ancestor (which +// keeps every ancestor above it non-empty too). +func removeEmptyMaps(node *yaml.Node, path []string) { + if len(path) == 0 { + return + } + _, child := LookupKey(node, path[0]) + if child == nil { + return + } + removeEmptyMaps(child, path[1:]) + if child.Kind == yaml.MappingNode && len(child.Content) == 0 { + RemoveKey(node, path[0]) + } +} + // Traverses a yaml document, calling the callback function for each node. The // callback is expected to modify the node in place func Walk(rootNode *yaml.Node, callback func(node *yaml.Node, path string)) error { diff --git a/pkg/utils/yaml_utils/yaml_utils_test.go b/pkg/utils/yaml_utils/yaml_utils_test.go index d4d1fe074..059f65022 100644 --- a/pkg/utils/yaml_utils/yaml_utils_test.go +++ b/pkg/utils/yaml_utils/yaml_utils_test.go @@ -103,6 +103,88 @@ func TestRenameYamlKey(t *testing.T) { } } +func TestMoveYamlKey(t *testing.T) { + tests := []struct { + name string + in string + oldPath []string + newPath []string + expectedOut string + expectedDidMove bool + expectedErr string + }{ + { + name: "move key into an existing section", + in: "keybinding:\n worktrees:\n viewWorktreeOptions: w\n universal:\n quit: q\n", + oldPath: []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + newPath: []string{"keybinding", "universal", "newWorktree"}, + expectedOut: "keybinding:\n universal:\n quit: q\n newWorktree: w\n", + expectedDidMove: true, + }, + { + name: "create the destination section if it doesn't exist", + in: "keybinding:\n worktrees:\n viewWorktreeOptions: w\n", + oldPath: []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + newPath: []string{"keybinding", "universal", "newWorktree"}, + expectedOut: "keybinding:\n universal:\n newWorktree: w\n", + expectedDidMove: true, + }, + { + name: "keep non-empty siblings when pruning the old section", + in: "keybinding:\n worktrees:\n viewWorktreeOptions: w\n other: x\n", + oldPath: []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + newPath: []string{"keybinding", "universal", "newWorktree"}, + expectedOut: "keybinding:\n worktrees:\n other: x\n universal:\n newWorktree: w\n", + expectedDidMove: true, + }, + { + name: "don't rewrite file if the key doesn't exist", + in: "keybinding:\n universal:\n quit: q\n", + oldPath: []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + newPath: []string{"keybinding", "universal", "newWorktree"}, + expectedOut: "keybinding:\n universal:\n quit: q\n", + expectedDidMove: false, + }, + + // Error cases + { + name: "destination key already exists", + in: "keybinding:\n worktrees:\n viewWorktreeOptions: w\n universal:\n newWorktree: x\n", + oldPath: []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + newPath: []string{"keybinding", "universal", "newWorktree"}, + expectedOut: "keybinding:\n worktrees:\n viewWorktreeOptions: w\n universal:\n newWorktree: x\n", + expectedDidMove: false, + expectedErr: "new key `newWorktree' already exists", + }, + { + name: "node in path is not a dictionary", + in: "keybinding:\n worktrees: nonsense\n", + oldPath: []string{"keybinding", "worktrees", "viewWorktreeOptions"}, + newPath: []string{"keybinding", "universal", "newWorktree"}, + expectedOut: "keybinding:\n worktrees: nonsense\n", + expectedDidMove: false, + expectedErr: "yaml node in path is not a dictionary", + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + node := unmarshalForTest(t, test.in) + actualErr, didMove := MoveYamlKey(&node, test.oldPath, test.newPath) + if test.expectedErr == "" { + assert.NoError(t, actualErr) + } else { + assert.EqualError(t, actualErr, test.expectedErr) + } + out := marshalForTest(t, &node) + + assert.Equal(t, test.expectedOut, out) + + assert.Equal(t, test.expectedDidMove, didMove) + }) + } +} + func TestWalk_paths(t *testing.T) { tests := []struct { name string diff --git a/schema-master/config.json b/schema-master/config.json index 54f9fa9ec..45a2b9efe 100644 --- a/schema-master/config.json +++ b/schema-master/config.json @@ -60,8 +60,18 @@ "CustomCommand": { "properties": { "key": { - "type": "string", - "description": "The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md. To bind several alternates to the same command, use a sequence (e.g. `[a, b]`)." }, "commandMenu": { "items": { @@ -165,8 +175,18 @@ ] }, "key": { - "type": "string", - "description": "Keybinding to invoke this menu option without needing to navigate to it" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Keybinding to invoke this menu option without needing to navigate to it. Accepts either a single key or a sequence of alternates." } }, "additionalProperties": false, @@ -235,6 +255,13 @@ "examples": [ "{{ .branch | green }}" ] + }, + "condition": { + "type": "string", + "description": "A Go template expression evaluated against the current form state. If it resolves to empty string or 'false', the prompt is skipped.", + "examples": [ + "{{ eq .Form.Choice \"yes\" }}" + ] } }, "additionalProperties": false, @@ -287,14 +314,58 @@ "type": "object", "description": "Custom icons for filenames and file extensions\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-files-icon--color" }, - "GitConfig": { + "DiffRendererConfig": { "properties": { - "pagers": { + "type": { + "type": "string", + "enum": [ + "stdinFilter", + "extDiff", + "rawGit" + ], + "description": "The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' | 'rawGit'" + }, + "name": { + "type": "string", + "description": "A name for the diff renderer, shown in the notification when cycling renderers. If not set, the name is derived from the first word of the renderer command." + }, + "colorArg": { + "type": "string", + "enum": [ + "always", + "never" + ], + "description": "Value of the --color arg in the git diff command. Only used for type 'stdinFilter'. Some renderers want this to be set to 'always' and some want it set to 'never'." + }, + "command": { + "type": "string", + "description": "The command to use for rendering diffs. This is either a stdinFilter or an external diff command, depending on the type field; not applicable if the type is 'rawGit'.\ne.g.\ndiff-so-fancy\ndelta --dark --paging=never\nydiff -p cat\ndifft --color=always", + "examples": [ + "delta --dark --paging=never", + "diff-so-fancy", + "ydiff -p cat", + "difft --color=always" + ] + }, + "args": { "items": { - "$ref": "#/$defs/PagingConfig" + "type": "string" }, "type": "array", - "description": "Array of pagers. Each entry has the following format:\n\n # Value of the --color arg in the git diff command. Some pagers want\n # this to be set to 'always' and some want it set to 'never'\n colorArg: \"always\"\n\n # e.g.\n # diff-so-fancy\n # delta --dark --paging=never\n # ydiff -p cat -s --wrap --width={{columnWidth}}\n pager: \"\"\n\n # e.g. 'difft --color=always'\n externalDiffCommand: \"\"\n\n # If true, Lazygit will use git's `diff.external` config for paging.\n # The advantage over `externalDiffCommand` is that this can be\n # configured per file type in .gitattributes; see\n # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.\n useExternalDiffGitConfig: false\n\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md for more information." + "description": "Extra arguments (array of strings) passed to the git command. Only applicable if the type is 'rawGit'." + } + }, + "additionalProperties": false, + "type": "object" + }, + "GitConfig": { + "properties": { + "diffRenderers": { + "items": { + "$ref": "#/$defs/DiffRendererConfig" + }, + "type": "array", + "description": "Array of diff renderers. Each entry has the following format:\n\n # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff'\n # | 'rawGit'\n type: \"stdinFilter\"\n\n # A name for the diff renderer, shown in the notification when cycling\n # renderers. If not set, the name is derived from the first word of the\n # renderer command.\n name: \"\"\n\n # Value of the --color arg in the git diff command. Only used for type\n # 'stdinFilter'. Some renderers want this to be set to 'always' and some\n # want it set to 'never'.\n colorArg: \"always\"\n\n # The command to use for rendering diffs. This is either a stdinFilter or\n # an external diff command, depending on the type field; not applicable if\n # the type is 'rawGit'.\n # e.g.\n # diff-so-fancy\n # delta --dark --paging=never\n # ydiff -p cat\n # difft --color=always\n command: \"\"\n\n # Extra arguments (array of strings) passed to the git command. Only\n # applicable if the type is 'rawGit'.\n args: []\n\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md for more information." }, "commit": { "$ref": "#/$defs/CommitConfig", @@ -331,6 +402,11 @@ "description": "If true, periodically refresh files and submodules", "default": true }, + "autoDetectExternalChanges": { + "type": "boolean", + "description": "If true, poll the repo periodically for external ref changes (commits, branch updates, checkouts made outside lazygit) and refresh when one is detected. Independent of autoRefresh, which only governs the files panel.", + "default": true + }, "autoForwardBranches": { "type": "string", "enum": [ @@ -368,7 +444,7 @@ }, "ignoreWhitespaceInDiffView": { "type": "boolean", - "description": "If true, git diffs are rendered with the `--ignore-all-space` flag, which ignores whitespace changes. Can be toggled from within Lazygit with `\u003cc-w\u003e`.", + "description": "If true, git diffs are rendered with the `--ignore-all-space` flag, which ignores whitespace changes. Can be toggled from within Lazygit with `\u003cctrl+w\u003e`.", "default": false }, "diffContextSize": { @@ -503,7 +579,7 @@ "tabWidth": { "type": "integer", "minimum": 1, - "description": "The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.\nNote that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.", + "description": "The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.\nNote that when using a diff renderer, the renderer has its own tab width setting, so you need to pass it separately in the renderer command.", "default": 4 }, "mouseEvents": { @@ -558,6 +634,40 @@ "description": "The weight of the expanded side panel, relative to the other panels. 2 means twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.", "default": 2 }, + "shrinkSidePanelsToContent": { + "type": "boolean", + "description": "If true, don't give a side panel more height than it needs to show its content; when all panels fit, the leftover height is shared among them so that they still fill the screen.", + "default": false + }, + "sidePanels": { + "items": { + "$ref": "#/$defs/SidePanel" + }, + "type": "array", + "description": "The side panels, in the order they appear from top to bottom.\nEach entry is a list of one or more names that share a single panel as tabs (cycle through them with the next-tab/previous-tab keys).\nOmit a name to hide it; give a name its own one-element list to promote a tab to a top-level panel.\nValid names are: 'status', 'files', 'worktrees', 'submodules', 'branches', 'remotes', 'tags', 'commits', 'reflog', 'stash'. 'files', 'branches', and 'commits' must always be included; they can't be hidden.", + "default": [ + [ + "status" + ], + [ + "files", + "worktrees", + "submodules" + ], + [ + "branches", + "remotes", + "tags" + ], + [ + "commits", + "reflog" + ], + [ + "stash" + ] + ] + }, "mainPanelSplitMode": { "type": "string", "enum": [ @@ -632,6 +742,21 @@ "description": "If true, add a \"/\" root item in the file tree representing the root of the repository. It is only added when necessary, i.e. when there is more than one item at top level.", "default": true }, + "fileTreeSortOrder": { + "type": "string", + "enum": [ + "mixed", + "filesFirst", + "foldersFirst" + ], + "description": "How to sort files and directories in the file tree.\nOne of: 'mixed' (default) | 'filesFirst' | 'foldersFirst'", + "default": "mixed" + }, + "fileTreeSortCaseSensitive": { + "type": "boolean", + "description": "If true (default), sort the file tree case-sensitively.", + "default": true + }, "showNumstatInFilesView": { "type": "boolean", "description": "If true, show the number of lines changed per file in the Files view", @@ -754,6 +879,16 @@ "description": "Whether to stack UI components on top of each other.\nOne of 'auto' (default) | 'always' | 'never'", "default": "auto" }, + "portraitModeAutoMaxWidth": { + "type": "integer", + "description": "In 'auto' mode, portrait mode will be used if the window width is less than or equal to portraitModeAutoMaxWidth and the window height is greater than or equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'.", + "default": 84 + }, + "portraitModeAutoMinHeight": { + "type": "integer", + "description": "In 'auto' mode, portrait mode will be used if the window width is less than or equal to portraitModeAutoMaxWidth and the window height is greater than or equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'.", + "default": 46 + }, "filterMode": { "type": "string", "enum": [ @@ -811,15 +946,45 @@ "KeybindingAmendAttributeConfig": { "properties": { "resetAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "setAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" }, "addCoAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" } }, @@ -829,75 +994,269 @@ "KeybindingBranchesConfig": { "properties": { "createPullRequest": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "o" }, "viewPullRequestOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "O" }, + "openPullRequestInBrowser": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "G" + }, "copyPullRequestURL": { - "type": "string", - "default": "\u003cc-y\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+y\u003e" }, "checkoutBranchByName": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" }, "forceCheckoutBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "F" }, "checkoutPreviousBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "-" }, "rebaseBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" }, "renameBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "R" }, "mergeIntoCurrentBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "M" }, "moveCommitsToNewBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "N" }, "viewGitFlowOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "fastForward": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "createTag": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "T" }, "pushTag": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "P" }, "setUpstream": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "u" }, "fetchRemote": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "addForkRemote": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "F" }, "sortOrder": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "s" } }, @@ -907,7 +1266,17 @@ "KeybindingCommitFilesConfig": { "properties": { "checkoutCommitFile": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" } }, @@ -917,8 +1286,18 @@ "KeybindingCommitMessageConfig": { "properties": { "commitMenu": { - "type": "string", - "default": "\u003cc-o\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+o\u003e" } }, "additionalProperties": false, @@ -927,107 +1306,387 @@ "KeybindingCommitsConfig": { "properties": { "squashDown": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "s" }, "renameCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" }, "renameCommitWithEditor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "R" }, "viewResetOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "g" }, "markCommitAsFixup": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "setFixupMessage": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" }, "createFixupCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "F" }, "squashAboveCommits": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "S" }, "moveDownCommit": { - "type": "string", - "default": "\u003cc-j\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cctrl+j\u003e", + "\u003calt-down\u003e" + ] }, "moveUpCommit": { - "type": "string", - "default": "\u003cc-k\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cctrl+k\u003e", + "\u003calt-up\u003e" + ] }, "amendToCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" }, "resetCommitAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "pickCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "p" }, "revertCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "t" }, "cherryPickCopy": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "C" }, "pasteCommits": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "V" }, "markCommitAsBaseForRebase": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "B" }, "tagCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "T" }, "checkoutCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003cspace\u003e" }, "resetCherryPick": { - "type": "string", - "default": "\u003cc-R\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+r\u003e" }, "copyCommitAttributeToClipboard": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "y" }, "openLogMenu": { - "type": "string", - "default": "\u003cc-l\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+l\u003e" }, "openInBrowser": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "o" }, + "openPullRequestInBrowser": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "G" + }, "viewBisectOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "b" }, "startInteractiveRebase": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "selectCommitsOfCurrentBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "*" } }, @@ -1048,9 +1707,6 @@ "branches": { "$ref": "#/$defs/KeybindingBranchesConfig" }, - "worktrees": { - "$ref": "#/$defs/KeybindingWorktreesConfig" - }, "commits": { "$ref": "#/$defs/KeybindingCommitsConfig" }, @@ -1075,84 +1731,274 @@ }, "additionalProperties": false, "type": "object", - "description": "Keybindings" + "description": "Keybindings.\nEach binding can be a single key or a list of keys; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md for the syntax." }, "KeybindingFilesConfig": { "properties": { "commitChanges": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" }, "commitChangesWithoutHook": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "w" }, "amendLastCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" }, "commitChangesWithEditor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "C" }, "findBaseCommitForFixup": { - "type": "string", - "default": "\u003cc-f\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+f\u003e" }, "confirmDiscard": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "x" }, "ignoreFile": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "refreshFiles": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" }, "stashAllChanges": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "s" }, "viewStashOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "S" }, "toggleStagedAll": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "viewResetOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "D" }, "fetch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "toggleTreeView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "`" }, "openMergeOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "M" }, "openStatusFilter": { - "type": "string", - "default": "\u003cc-b\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+b\u003e" }, "copyFileInfoToClipboard": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "y" }, "collapseAll": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "-" }, "expandAll": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "=" } }, @@ -1161,16 +2007,80 @@ }, "KeybindingMainConfig": { "properties": { + "prevHunk": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cleft\u003e", + "h" + ] + }, + "nextHunk": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cright\u003e", + "l" + ] + }, "toggleSelectHunk": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "pickBothHunks": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "b" }, "editSelectHunk": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "E" } }, @@ -1180,11 +2090,31 @@ "KeybindingStashConfig": { "properties": { "popStash": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "g" }, "renameStash": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" } }, @@ -1194,19 +2124,59 @@ "KeybindingStatusConfig": { "properties": { "checkForUpdate": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "u" }, "recentRepos": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "allBranchesLogGraph": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "allBranchesLogGraphReverse": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" } }, @@ -1216,15 +2186,45 @@ "KeybindingSubmodulesConfig": { "properties": { "init": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "update": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "u" }, "bulkMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "b" } }, @@ -1234,116 +2234,428 @@ "KeybindingUniversalConfig": { "properties": { "quit": { - "type": "string", - "default": "q" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "q", + "\u003cctrl+c\u003e" + ] }, "quit-alt1": { - "type": "string", - "default": "\u003cc-c\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `quit` instead.", + "default": "\u003cctrl+c\u003e" }, "suspendApp": { - "type": "string", - "default": "\u003cc-z\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+z\u003e" }, "return": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003cesc\u003e" }, "quitWithoutChangingDirectory": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "Q" }, "togglePanel": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003ctab\u003e" }, "prevItem": { - "type": "string", - "default": "\u003cup\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cup\u003e", + "k" + ] }, "nextItem": { - "type": "string", - "default": "\u003cdown\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cdown\u003e", + "j" + ] }, "prevItem-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `prevItem` instead.", "default": "k" }, "nextItem-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `nextItem` instead.", "default": "j" }, "prevPage": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "," }, "nextPage": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "." }, "scrollLeft": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "H" }, "scrollRight": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "L" }, "gotoTop": { - "type": "string", - "default": "\u003c" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003c", + "\u003chome\u003e" + ] }, "gotoBottom": { - "type": "string", - "default": "\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003e", + "\u003cend\u003e" + ] }, "gotoTop-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `gotoTop` instead.", "default": "\u003chome\u003e" }, "gotoBottom-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `gotoBottom` instead.", "default": "\u003cend\u003e" }, "toggleRangeSelect": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "v" }, "rangeSelectDown": { - "type": "string", - "default": "\u003cs-down\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cshift+down\u003e" }, "rangeSelectUp": { - "type": "string", - "default": "\u003cs-up\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cshift+up\u003e" }, "prevBlock": { - "type": "string", - "default": "\u003cleft\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cleft\u003e", + "h", + "\u003cbacktab\u003e" + ] }, "nextBlock": { - "type": "string", - "default": "\u003cright\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cright\u003e", + "l", + "\u003ctab\u003e" + ] }, "prevBlock-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `prevBlock` instead.", "default": "h" }, "nextBlock-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `nextBlock` instead.", "default": "l" }, "nextBlock-alt2": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `nextBlock` instead.", "default": "\u003ctab\u003e" }, "prevBlock-alt2": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `prevBlock` instead.", "default": "\u003cbacktab\u003e" }, "jumpToBlock": { "items": { - "type": "string" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] }, "type": "array", "default": [ @@ -1355,212 +2667,801 @@ ] }, "focusMainView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "0" }, "nextMatch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "n" }, "prevMatch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "N" }, "startSearch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "/" }, - "optionMenu": { - "type": "string", - "default": "\u003cdisabled\u003e" + "moveWordLeft": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+left\u003e on Mac", + "default": "\u003cctrl+left\u003e" }, - "optionMenu-alt1": { - "type": "string", + "moveWordRight": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+right\u003e on Mac", + "default": "\u003cctrl+right\u003e" + }, + "backspaceWord": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+backspace\u003e on Mac", + "default": "\u003cctrl+backspace\u003e" + }, + "forwardDeleteWord": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+delete\u003e on Mac", + "default": "\u003cctrl+delete\u003e" + }, + "optionMenu": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "?" }, "select": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003cspace\u003e" }, "goInto": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirm": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirmMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirmSuggestion": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirmInEditor": { - "type": "string", - "default": "\u003ca-enter\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003cmeta+enter\u003e on Mac", + "default": [ + "\u003cctrl+enter\u003e", + "\u003cctrl+s\u003e" + ] }, "confirmInEditor-alt": { - "type": "string", - "default": "\u003cc-s\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `confirmInEditor` instead.", + "default": "\u003cctrl+s\u003e" }, "remove": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "d" }, "new": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "n" }, + "newWorktree": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "w" + }, "edit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "e" }, "openFile": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "o" }, "scrollUpMain": { - "type": "string", - "default": "\u003cpgup\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cpgup\u003e", + "K", + "\u003cctrl+u\u003e" + ] }, "scrollDownMain": { - "type": "string", - "default": "\u003cpgdown\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cpgdown\u003e", + "J", + "\u003cctrl+d\u003e" + ] }, "scrollUpMain-alt1": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollUpMain` instead.", "default": "K" }, "scrollDownMain-alt1": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollDownMain` instead.", "default": "J" }, "scrollUpMain-alt2": { - "type": "string", - "default": "\u003cc-u\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollUpMain` instead.", + "default": "\u003cctrl+u\u003e" }, "scrollDownMain-alt2": { - "type": "string", - "default": "\u003cc-d\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollDownMain` instead.", + "default": "\u003cctrl+d\u003e" }, "executeShellCommand": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": ":" }, "createRebaseOptionsMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "m" }, "pushFiles": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "description": "'Files' appended for legacy reasons", "default": "P" }, "pullFiles": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "description": "'Files' appended for legacy reasons", "default": "p" }, "refresh": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "R" }, "createPatchOptionsMenu": { - "type": "string", - "default": "\u003cc-p\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+p\u003e" }, "nextTab": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "]" }, "prevTab": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "[" }, "nextScreenMode": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "+" }, "prevScreenMode": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "_" }, - "cyclePagers": { - "type": "string", + "cycleDiffRenderers": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "|" }, + "cycleDiffRenderersReverse": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\\" + }, "undo": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "z" }, "redo": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "Z" }, "filteringMenu": { - "type": "string", - "default": "\u003cc-s\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+s\u003e" }, "diffingMenu": { - "type": "string", - "default": "W" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "W", + "\u003cctrl+e\u003e" + ] }, "diffingMenu-alt": { - "type": "string", - "default": "\u003cc-e\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `diffingMenu` instead.", + "default": "\u003cctrl+e\u003e" }, "copyToClipboard": { - "type": "string", - "default": "\u003cc-o\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+o\u003e" }, "openRecentRepos": { - "type": "string", - "default": "\u003cc-r\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+r\u003e" }, "submitEditorText": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "extrasMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "@" }, "toggleWhitespaceInDiffView": { - "type": "string", - "default": "\u003cc-w\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+w\u003e" }, "increaseContextInDiffView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "}" }, "decreaseContextInDiffView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "{" }, "increaseRenameSimilarityThreshold": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": ")" }, "decreaseRenameSimilarityThreshold": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "(" }, "openDiffTool": { - "type": "string", - "default": "\u003cc-t\u003e" - } - }, - "additionalProperties": false, - "type": "object" - }, - "KeybindingWorktreesConfig": { - "properties": { - "viewWorktreeOptions": { - "type": "string", - "default": "w" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+t\u003e" + }, + "editConfig": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003calt+shift+c\u003e" } }, "additionalProperties": false, @@ -1576,7 +3477,7 @@ "topo-order", "default" ], - "description": "One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'\n'topo-order' makes it easier to read the git log graph, but commits may not appear chronologically. See https://git-scm.com/docs/\n\nCan be changed from within Lazygit with `Log menu -\u003e Commit sort order` (`\u003cc-l\u003e` in the commits window by default).", + "description": "One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'\n'topo-order' makes it easier to read the git log graph, but commits may not appear chronologically. See https://git-scm.com/docs/\n\nCan be changed from within Lazygit with `Log menu -\u003e Commit sort order` (`\u003cctrl+l\u003e` in the commits window by default).", "default": "topo-order" }, "showGraph": { @@ -1586,7 +3487,7 @@ "never", "when-maximised" ], - "description": "This determines whether the git graph is rendered in the commits panel\nOne of 'always' | 'never' | 'when-maximised'\n\nCan be toggled from within lazygit with `Log menu -\u003e Show git graph` (`\u003cc-l\u003e` in the commits window by default).", + "description": "This determines whether the git graph is rendered in the commits panel\nOne of 'always' | 'never' | 'when-maximised'\n\nCan be toggled from within lazygit with `Log menu -\u003e Show git graph` (`\u003cctrl+l\u003e` in the commits window by default).", "default": "always" }, "showWholeGraph": { @@ -1687,56 +3588,49 @@ "type": "object", "description": "Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc" }, - "PagingConfig": { - "properties": { - "colorArg": { - "type": "string", - "enum": [ - "always", - "never" - ], - "description": "Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'" - }, - "pager": { - "type": "string", - "description": "e.g.\ndiff-so-fancy\ndelta --dark --paging=never\nydiff -p cat -s --wrap --width={{columnWidth}}", - "examples": [ - "delta --dark --paging=never", - "diff-so-fancy", - "ydiff -p cat -s --wrap --width={{columnWidth}}" - ] - }, - "externalDiffCommand": { - "type": "string", - "description": "e.g. 'difft --color=always'" - }, - "useExternalDiffGitConfig": { - "type": "boolean", - "description": "If true, Lazygit will use git's `diff.external` config for paging. The advantage over `externalDiffCommand` is that this can be configured per file type in .gitattributes; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver." - } - }, - "additionalProperties": false, - "type": "object" - }, "RefresherConfig": { "properties": { "refreshInterval": { "type": "integer", - "minimum": 0, + "exclusiveMinimum": 0, "description": "File/submodule refresh interval in seconds.\nAuto-refresh can be disabled via option 'git.autoRefresh'.", "default": 10 }, "fetchInterval": { "type": "integer", - "minimum": 0, + "exclusiveMinimum": 0, "description": "Re-fetch interval in seconds.\nAuto-fetch can be disabled via option 'git.autoFetch'.", "default": 60 + }, + "externalChangeCheckInterval": { + "type": "integer", + "exclusiveMinimum": 0, + "description": "Interval in seconds at which lazygit polls for external ref changes (commits, branch updates, checkouts made outside lazygit).\nDetection can be disabled via option 'git.autoDetectExternalChanges'.", + "default": 2 } }, "additionalProperties": false, "type": "object", "description": "Background refreshes" }, + "SidePanel": { + "items": { + "type": "string", + "enum": [ + "status", + "files", + "worktrees", + "submodules", + "branches", + "remotes", + "tags", + "commits", + "reflog", + "stash" + ] + }, + "type": "array" + }, "SpinnerConfig": { "properties": { "frames": { @@ -1746,17 +3640,17 @@ "type": "array", "description": "The frames of the spinner animation.", "default": [ - "|", - "/", - "-", - "\\" + "●∙∙", + "∙●∙", + "∙∙●", + "∙●∙" ] }, "rate": { "type": "integer", "minimum": 1, "description": "The \"speed\" of the spinner in milliseconds.", - "default": 50 + "default": 180 } }, "additionalProperties": false, @@ -1945,6 +3839,10 @@ "$ref": "#/$defs/GitConfig", "description": "Config relating to git" }, + "worktree": { + "$ref": "#/$defs/WorktreeConfig", + "description": "Config relating to git worktrees" + }, "update": { "$ref": "#/$defs/UpdateConfig", "description": "Periodic update checks" @@ -2005,11 +3903,22 @@ }, "keybinding": { "$ref": "#/$defs/KeybindingConfig", - "description": "Keybindings" + "description": "Keybindings.\nEach binding can be a single key or a list of keys; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md for the syntax." } }, "additionalProperties": false, "type": "object" + }, + "WorktreeConfig": { + "properties": { + "defaultPath": { + "type": "string", + "description": "Default parent directory for new worktrees. It is offered as a candidate location alongside the parent directories of any worktrees you already have.\nA relative path is resolved against the repository's root directory, so \"../worktrees\" sits beside the repo and \".worktrees\" sits inside it.\nA leading \"~\" is expanded to your home directory, so \"~/worktrees\" works." + } + }, + "additionalProperties": false, + "type": "object", + "description": "Config relating to git worktrees" } } } diff --git a/schema/config.json b/schema/config.json index 54f9fa9ec..45a2b9efe 100644 --- a/schema/config.json +++ b/schema/config.json @@ -60,8 +60,18 @@ "CustomCommand": { "properties": { "key": { - "type": "string", - "description": "The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md. To bind several alternates to the same command, use a sequence (e.g. `[a, b]`)." }, "commandMenu": { "items": { @@ -165,8 +175,18 @@ ] }, "key": { - "type": "string", - "description": "Keybinding to invoke this menu option without needing to navigate to it" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Keybinding to invoke this menu option without needing to navigate to it. Accepts either a single key or a sequence of alternates." } }, "additionalProperties": false, @@ -235,6 +255,13 @@ "examples": [ "{{ .branch | green }}" ] + }, + "condition": { + "type": "string", + "description": "A Go template expression evaluated against the current form state. If it resolves to empty string or 'false', the prompt is skipped.", + "examples": [ + "{{ eq .Form.Choice \"yes\" }}" + ] } }, "additionalProperties": false, @@ -287,14 +314,58 @@ "type": "object", "description": "Custom icons for filenames and file extensions\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-files-icon--color" }, - "GitConfig": { + "DiffRendererConfig": { "properties": { - "pagers": { + "type": { + "type": "string", + "enum": [ + "stdinFilter", + "extDiff", + "rawGit" + ], + "description": "The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' | 'rawGit'" + }, + "name": { + "type": "string", + "description": "A name for the diff renderer, shown in the notification when cycling renderers. If not set, the name is derived from the first word of the renderer command." + }, + "colorArg": { + "type": "string", + "enum": [ + "always", + "never" + ], + "description": "Value of the --color arg in the git diff command. Only used for type 'stdinFilter'. Some renderers want this to be set to 'always' and some want it set to 'never'." + }, + "command": { + "type": "string", + "description": "The command to use for rendering diffs. This is either a stdinFilter or an external diff command, depending on the type field; not applicable if the type is 'rawGit'.\ne.g.\ndiff-so-fancy\ndelta --dark --paging=never\nydiff -p cat\ndifft --color=always", + "examples": [ + "delta --dark --paging=never", + "diff-so-fancy", + "ydiff -p cat", + "difft --color=always" + ] + }, + "args": { "items": { - "$ref": "#/$defs/PagingConfig" + "type": "string" }, "type": "array", - "description": "Array of pagers. Each entry has the following format:\n\n # Value of the --color arg in the git diff command. Some pagers want\n # this to be set to 'always' and some want it set to 'never'\n colorArg: \"always\"\n\n # e.g.\n # diff-so-fancy\n # delta --dark --paging=never\n # ydiff -p cat -s --wrap --width={{columnWidth}}\n pager: \"\"\n\n # e.g. 'difft --color=always'\n externalDiffCommand: \"\"\n\n # If true, Lazygit will use git's `diff.external` config for paging.\n # The advantage over `externalDiffCommand` is that this can be\n # configured per file type in .gitattributes; see\n # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.\n useExternalDiffGitConfig: false\n\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md for more information." + "description": "Extra arguments (array of strings) passed to the git command. Only applicable if the type is 'rawGit'." + } + }, + "additionalProperties": false, + "type": "object" + }, + "GitConfig": { + "properties": { + "diffRenderers": { + "items": { + "$ref": "#/$defs/DiffRendererConfig" + }, + "type": "array", + "description": "Array of diff renderers. Each entry has the following format:\n\n # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff'\n # | 'rawGit'\n type: \"stdinFilter\"\n\n # A name for the diff renderer, shown in the notification when cycling\n # renderers. If not set, the name is derived from the first word of the\n # renderer command.\n name: \"\"\n\n # Value of the --color arg in the git diff command. Only used for type\n # 'stdinFilter'. Some renderers want this to be set to 'always' and some\n # want it set to 'never'.\n colorArg: \"always\"\n\n # The command to use for rendering diffs. This is either a stdinFilter or\n # an external diff command, depending on the type field; not applicable if\n # the type is 'rawGit'.\n # e.g.\n # diff-so-fancy\n # delta --dark --paging=never\n # ydiff -p cat\n # difft --color=always\n command: \"\"\n\n # Extra arguments (array of strings) passed to the git command. Only\n # applicable if the type is 'rawGit'.\n args: []\n\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md for more information." }, "commit": { "$ref": "#/$defs/CommitConfig", @@ -331,6 +402,11 @@ "description": "If true, periodically refresh files and submodules", "default": true }, + "autoDetectExternalChanges": { + "type": "boolean", + "description": "If true, poll the repo periodically for external ref changes (commits, branch updates, checkouts made outside lazygit) and refresh when one is detected. Independent of autoRefresh, which only governs the files panel.", + "default": true + }, "autoForwardBranches": { "type": "string", "enum": [ @@ -368,7 +444,7 @@ }, "ignoreWhitespaceInDiffView": { "type": "boolean", - "description": "If true, git diffs are rendered with the `--ignore-all-space` flag, which ignores whitespace changes. Can be toggled from within Lazygit with `\u003cc-w\u003e`.", + "description": "If true, git diffs are rendered with the `--ignore-all-space` flag, which ignores whitespace changes. Can be toggled from within Lazygit with `\u003cctrl+w\u003e`.", "default": false }, "diffContextSize": { @@ -503,7 +579,7 @@ "tabWidth": { "type": "integer", "minimum": 1, - "description": "The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.\nNote that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.", + "description": "The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.\nNote that when using a diff renderer, the renderer has its own tab width setting, so you need to pass it separately in the renderer command.", "default": 4 }, "mouseEvents": { @@ -558,6 +634,40 @@ "description": "The weight of the expanded side panel, relative to the other panels. 2 means twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.", "default": 2 }, + "shrinkSidePanelsToContent": { + "type": "boolean", + "description": "If true, don't give a side panel more height than it needs to show its content; when all panels fit, the leftover height is shared among them so that they still fill the screen.", + "default": false + }, + "sidePanels": { + "items": { + "$ref": "#/$defs/SidePanel" + }, + "type": "array", + "description": "The side panels, in the order they appear from top to bottom.\nEach entry is a list of one or more names that share a single panel as tabs (cycle through them with the next-tab/previous-tab keys).\nOmit a name to hide it; give a name its own one-element list to promote a tab to a top-level panel.\nValid names are: 'status', 'files', 'worktrees', 'submodules', 'branches', 'remotes', 'tags', 'commits', 'reflog', 'stash'. 'files', 'branches', and 'commits' must always be included; they can't be hidden.", + "default": [ + [ + "status" + ], + [ + "files", + "worktrees", + "submodules" + ], + [ + "branches", + "remotes", + "tags" + ], + [ + "commits", + "reflog" + ], + [ + "stash" + ] + ] + }, "mainPanelSplitMode": { "type": "string", "enum": [ @@ -632,6 +742,21 @@ "description": "If true, add a \"/\" root item in the file tree representing the root of the repository. It is only added when necessary, i.e. when there is more than one item at top level.", "default": true }, + "fileTreeSortOrder": { + "type": "string", + "enum": [ + "mixed", + "filesFirst", + "foldersFirst" + ], + "description": "How to sort files and directories in the file tree.\nOne of: 'mixed' (default) | 'filesFirst' | 'foldersFirst'", + "default": "mixed" + }, + "fileTreeSortCaseSensitive": { + "type": "boolean", + "description": "If true (default), sort the file tree case-sensitively.", + "default": true + }, "showNumstatInFilesView": { "type": "boolean", "description": "If true, show the number of lines changed per file in the Files view", @@ -754,6 +879,16 @@ "description": "Whether to stack UI components on top of each other.\nOne of 'auto' (default) | 'always' | 'never'", "default": "auto" }, + "portraitModeAutoMaxWidth": { + "type": "integer", + "description": "In 'auto' mode, portrait mode will be used if the window width is less than or equal to portraitModeAutoMaxWidth and the window height is greater than or equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'.", + "default": 84 + }, + "portraitModeAutoMinHeight": { + "type": "integer", + "description": "In 'auto' mode, portrait mode will be used if the window width is less than or equal to portraitModeAutoMaxWidth and the window height is greater than or equal to portraitModeAutoMinHeight. Unused when portraitMode is not 'auto'.", + "default": 46 + }, "filterMode": { "type": "string", "enum": [ @@ -811,15 +946,45 @@ "KeybindingAmendAttributeConfig": { "properties": { "resetAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "setAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" }, "addCoAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" } }, @@ -829,75 +994,269 @@ "KeybindingBranchesConfig": { "properties": { "createPullRequest": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "o" }, "viewPullRequestOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "O" }, + "openPullRequestInBrowser": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "G" + }, "copyPullRequestURL": { - "type": "string", - "default": "\u003cc-y\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+y\u003e" }, "checkoutBranchByName": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" }, "forceCheckoutBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "F" }, "checkoutPreviousBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "-" }, "rebaseBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" }, "renameBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "R" }, "mergeIntoCurrentBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "M" }, "moveCommitsToNewBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "N" }, "viewGitFlowOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "fastForward": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "createTag": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "T" }, "pushTag": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "P" }, "setUpstream": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "u" }, "fetchRemote": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "addForkRemote": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "F" }, "sortOrder": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "s" } }, @@ -907,7 +1266,17 @@ "KeybindingCommitFilesConfig": { "properties": { "checkoutCommitFile": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" } }, @@ -917,8 +1286,18 @@ "KeybindingCommitMessageConfig": { "properties": { "commitMenu": { - "type": "string", - "default": "\u003cc-o\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+o\u003e" } }, "additionalProperties": false, @@ -927,107 +1306,387 @@ "KeybindingCommitsConfig": { "properties": { "squashDown": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "s" }, "renameCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" }, "renameCommitWithEditor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "R" }, "viewResetOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "g" }, "markCommitAsFixup": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "setFixupMessage": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" }, "createFixupCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "F" }, "squashAboveCommits": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "S" }, "moveDownCommit": { - "type": "string", - "default": "\u003cc-j\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cctrl+j\u003e", + "\u003calt-down\u003e" + ] }, "moveUpCommit": { - "type": "string", - "default": "\u003cc-k\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cctrl+k\u003e", + "\u003calt-up\u003e" + ] }, "amendToCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" }, "resetCommitAuthor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "pickCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "p" }, "revertCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "t" }, "cherryPickCopy": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "C" }, "pasteCommits": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "V" }, "markCommitAsBaseForRebase": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "B" }, "tagCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "T" }, "checkoutCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003cspace\u003e" }, "resetCherryPick": { - "type": "string", - "default": "\u003cc-R\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+r\u003e" }, "copyCommitAttributeToClipboard": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "y" }, "openLogMenu": { - "type": "string", - "default": "\u003cc-l\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+l\u003e" }, "openInBrowser": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "o" }, + "openPullRequestInBrowser": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "G" + }, "viewBisectOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "b" }, "startInteractiveRebase": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "selectCommitsOfCurrentBranch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "*" } }, @@ -1048,9 +1707,6 @@ "branches": { "$ref": "#/$defs/KeybindingBranchesConfig" }, - "worktrees": { - "$ref": "#/$defs/KeybindingWorktreesConfig" - }, "commits": { "$ref": "#/$defs/KeybindingCommitsConfig" }, @@ -1075,84 +1731,274 @@ }, "additionalProperties": false, "type": "object", - "description": "Keybindings" + "description": "Keybindings.\nEach binding can be a single key or a list of keys; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md for the syntax." }, "KeybindingFilesConfig": { "properties": { "commitChanges": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "c" }, "commitChangesWithoutHook": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "w" }, "amendLastCommit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" }, "commitChangesWithEditor": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "C" }, "findBaseCommitForFixup": { - "type": "string", - "default": "\u003cc-f\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+f\u003e" }, "confirmDiscard": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "x" }, "ignoreFile": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "refreshFiles": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" }, "stashAllChanges": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "s" }, "viewStashOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "S" }, "toggleStagedAll": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "viewResetOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "D" }, "fetch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "f" }, "toggleTreeView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "`" }, "openMergeOptions": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "M" }, "openStatusFilter": { - "type": "string", - "default": "\u003cc-b\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+b\u003e" }, "copyFileInfoToClipboard": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "y" }, "collapseAll": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "-" }, "expandAll": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "=" } }, @@ -1161,16 +2007,80 @@ }, "KeybindingMainConfig": { "properties": { + "prevHunk": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cleft\u003e", + "h" + ] + }, + "nextHunk": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cright\u003e", + "l" + ] + }, "toggleSelectHunk": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "pickBothHunks": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "b" }, "editSelectHunk": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "E" } }, @@ -1180,11 +2090,31 @@ "KeybindingStashConfig": { "properties": { "popStash": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "g" }, "renameStash": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "r" } }, @@ -1194,19 +2124,59 @@ "KeybindingStatusConfig": { "properties": { "checkForUpdate": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "u" }, "recentRepos": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "allBranchesLogGraph": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "a" }, "allBranchesLogGraphReverse": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "A" } }, @@ -1216,15 +2186,45 @@ "KeybindingSubmodulesConfig": { "properties": { "init": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "i" }, "update": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "u" }, "bulkMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "b" } }, @@ -1234,116 +2234,428 @@ "KeybindingUniversalConfig": { "properties": { "quit": { - "type": "string", - "default": "q" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "q", + "\u003cctrl+c\u003e" + ] }, "quit-alt1": { - "type": "string", - "default": "\u003cc-c\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `quit` instead.", + "default": "\u003cctrl+c\u003e" }, "suspendApp": { - "type": "string", - "default": "\u003cc-z\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+z\u003e" }, "return": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003cesc\u003e" }, "quitWithoutChangingDirectory": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "Q" }, "togglePanel": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003ctab\u003e" }, "prevItem": { - "type": "string", - "default": "\u003cup\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cup\u003e", + "k" + ] }, "nextItem": { - "type": "string", - "default": "\u003cdown\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cdown\u003e", + "j" + ] }, "prevItem-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `prevItem` instead.", "default": "k" }, "nextItem-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `nextItem` instead.", "default": "j" }, "prevPage": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "," }, "nextPage": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "." }, "scrollLeft": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "H" }, "scrollRight": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "L" }, "gotoTop": { - "type": "string", - "default": "\u003c" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003c", + "\u003chome\u003e" + ] }, "gotoBottom": { - "type": "string", - "default": "\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003e", + "\u003cend\u003e" + ] }, "gotoTop-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `gotoTop` instead.", "default": "\u003chome\u003e" }, "gotoBottom-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `gotoBottom` instead.", "default": "\u003cend\u003e" }, "toggleRangeSelect": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "v" }, "rangeSelectDown": { - "type": "string", - "default": "\u003cs-down\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cshift+down\u003e" }, "rangeSelectUp": { - "type": "string", - "default": "\u003cs-up\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cshift+up\u003e" }, "prevBlock": { - "type": "string", - "default": "\u003cleft\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cleft\u003e", + "h", + "\u003cbacktab\u003e" + ] }, "nextBlock": { - "type": "string", - "default": "\u003cright\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cright\u003e", + "l", + "\u003ctab\u003e" + ] }, "prevBlock-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `prevBlock` instead.", "default": "h" }, "nextBlock-alt": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `nextBlock` instead.", "default": "l" }, "nextBlock-alt2": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `nextBlock` instead.", "default": "\u003ctab\u003e" }, "prevBlock-alt2": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `prevBlock` instead.", "default": "\u003cbacktab\u003e" }, "jumpToBlock": { "items": { - "type": "string" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] }, "type": "array", "default": [ @@ -1355,212 +2667,801 @@ ] }, "focusMainView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "0" }, "nextMatch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "n" }, "prevMatch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "N" }, "startSearch": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "/" }, - "optionMenu": { - "type": "string", - "default": "\u003cdisabled\u003e" + "moveWordLeft": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+left\u003e on Mac", + "default": "\u003cctrl+left\u003e" }, - "optionMenu-alt1": { - "type": "string", + "moveWordRight": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+right\u003e on Mac", + "default": "\u003cctrl+right\u003e" + }, + "backspaceWord": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+backspace\u003e on Mac", + "default": "\u003cctrl+backspace\u003e" + }, + "forwardDeleteWord": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003calt+delete\u003e on Mac", + "default": "\u003cctrl+delete\u003e" + }, + "optionMenu": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "?" }, "select": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003cspace\u003e" }, "goInto": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirm": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirmMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirmSuggestion": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "confirmInEditor": { - "type": "string", - "default": "\u003ca-enter\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "\u003cmeta+enter\u003e on Mac", + "default": [ + "\u003cctrl+enter\u003e", + "\u003cctrl+s\u003e" + ] }, "confirmInEditor-alt": { - "type": "string", - "default": "\u003cc-s\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `confirmInEditor` instead.", + "default": "\u003cctrl+s\u003e" }, "remove": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "d" }, "new": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "n" }, + "newWorktree": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "w" + }, "edit": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "e" }, "openFile": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "o" }, "scrollUpMain": { - "type": "string", - "default": "\u003cpgup\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cpgup\u003e", + "K", + "\u003cctrl+u\u003e" + ] }, "scrollDownMain": { - "type": "string", - "default": "\u003cpgdown\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "\u003cpgdown\u003e", + "J", + "\u003cctrl+d\u003e" + ] }, "scrollUpMain-alt1": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollUpMain` instead.", "default": "K" }, "scrollDownMain-alt1": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollDownMain` instead.", "default": "J" }, "scrollUpMain-alt2": { - "type": "string", - "default": "\u003cc-u\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollUpMain` instead.", + "default": "\u003cctrl+u\u003e" }, "scrollDownMain-alt2": { - "type": "string", - "default": "\u003cc-d\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `scrollDownMain` instead.", + "default": "\u003cctrl+d\u003e" }, "executeShellCommand": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": ":" }, "createRebaseOptionsMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "m" }, "pushFiles": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "description": "'Files' appended for legacy reasons", "default": "P" }, "pullFiles": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "description": "'Files' appended for legacy reasons", "default": "p" }, "refresh": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "R" }, "createPatchOptionsMenu": { - "type": "string", - "default": "\u003cc-p\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+p\u003e" }, "nextTab": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "]" }, "prevTab": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "[" }, "nextScreenMode": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "+" }, "prevScreenMode": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "_" }, - "cyclePagers": { - "type": "string", + "cycleDiffRenderers": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "|" }, + "cycleDiffRenderersReverse": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\\" + }, "undo": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "z" }, "redo": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "Z" }, "filteringMenu": { - "type": "string", - "default": "\u003cc-s\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+s\u003e" }, "diffingMenu": { - "type": "string", - "default": "W" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": [ + "W", + "\u003cctrl+e\u003e" + ] }, "diffingMenu-alt": { - "type": "string", - "default": "\u003cc-e\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "description": "Deprecated: add the key to `diffingMenu` instead.", + "default": "\u003cctrl+e\u003e" }, "copyToClipboard": { - "type": "string", - "default": "\u003cc-o\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+o\u003e" }, "openRecentRepos": { - "type": "string", - "default": "\u003cc-r\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+r\u003e" }, "submitEditorText": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "\u003center\u003e" }, "extrasMenu": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "@" }, "toggleWhitespaceInDiffView": { - "type": "string", - "default": "\u003cc-w\u003e" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+w\u003e" }, "increaseContextInDiffView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "}" }, "decreaseContextInDiffView": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "{" }, "increaseRenameSimilarityThreshold": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": ")" }, "decreaseRenameSimilarityThreshold": { - "type": "string", + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], "default": "(" }, "openDiffTool": { - "type": "string", - "default": "\u003cc-t\u003e" - } - }, - "additionalProperties": false, - "type": "object" - }, - "KeybindingWorktreesConfig": { - "properties": { - "viewWorktreeOptions": { - "type": "string", - "default": "w" + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003cctrl+t\u003e" + }, + "editConfig": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "\u003calt+shift+c\u003e" } }, "additionalProperties": false, @@ -1576,7 +3477,7 @@ "topo-order", "default" ], - "description": "One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'\n'topo-order' makes it easier to read the git log graph, but commits may not appear chronologically. See https://git-scm.com/docs/\n\nCan be changed from within Lazygit with `Log menu -\u003e Commit sort order` (`\u003cc-l\u003e` in the commits window by default).", + "description": "One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'\n'topo-order' makes it easier to read the git log graph, but commits may not appear chronologically. See https://git-scm.com/docs/\n\nCan be changed from within Lazygit with `Log menu -\u003e Commit sort order` (`\u003cctrl+l\u003e` in the commits window by default).", "default": "topo-order" }, "showGraph": { @@ -1586,7 +3487,7 @@ "never", "when-maximised" ], - "description": "This determines whether the git graph is rendered in the commits panel\nOne of 'always' | 'never' | 'when-maximised'\n\nCan be toggled from within lazygit with `Log menu -\u003e Show git graph` (`\u003cc-l\u003e` in the commits window by default).", + "description": "This determines whether the git graph is rendered in the commits panel\nOne of 'always' | 'never' | 'when-maximised'\n\nCan be toggled from within lazygit with `Log menu -\u003e Show git graph` (`\u003cctrl+l\u003e` in the commits window by default).", "default": "always" }, "showWholeGraph": { @@ -1687,56 +3588,49 @@ "type": "object", "description": "Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc" }, - "PagingConfig": { - "properties": { - "colorArg": { - "type": "string", - "enum": [ - "always", - "never" - ], - "description": "Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'" - }, - "pager": { - "type": "string", - "description": "e.g.\ndiff-so-fancy\ndelta --dark --paging=never\nydiff -p cat -s --wrap --width={{columnWidth}}", - "examples": [ - "delta --dark --paging=never", - "diff-so-fancy", - "ydiff -p cat -s --wrap --width={{columnWidth}}" - ] - }, - "externalDiffCommand": { - "type": "string", - "description": "e.g. 'difft --color=always'" - }, - "useExternalDiffGitConfig": { - "type": "boolean", - "description": "If true, Lazygit will use git's `diff.external` config for paging. The advantage over `externalDiffCommand` is that this can be configured per file type in .gitattributes; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver." - } - }, - "additionalProperties": false, - "type": "object" - }, "RefresherConfig": { "properties": { "refreshInterval": { "type": "integer", - "minimum": 0, + "exclusiveMinimum": 0, "description": "File/submodule refresh interval in seconds.\nAuto-refresh can be disabled via option 'git.autoRefresh'.", "default": 10 }, "fetchInterval": { "type": "integer", - "minimum": 0, + "exclusiveMinimum": 0, "description": "Re-fetch interval in seconds.\nAuto-fetch can be disabled via option 'git.autoFetch'.", "default": 60 + }, + "externalChangeCheckInterval": { + "type": "integer", + "exclusiveMinimum": 0, + "description": "Interval in seconds at which lazygit polls for external ref changes (commits, branch updates, checkouts made outside lazygit).\nDetection can be disabled via option 'git.autoDetectExternalChanges'.", + "default": 2 } }, "additionalProperties": false, "type": "object", "description": "Background refreshes" }, + "SidePanel": { + "items": { + "type": "string", + "enum": [ + "status", + "files", + "worktrees", + "submodules", + "branches", + "remotes", + "tags", + "commits", + "reflog", + "stash" + ] + }, + "type": "array" + }, "SpinnerConfig": { "properties": { "frames": { @@ -1746,17 +3640,17 @@ "type": "array", "description": "The frames of the spinner animation.", "default": [ - "|", - "/", - "-", - "\\" + "●∙∙", + "∙●∙", + "∙∙●", + "∙●∙" ] }, "rate": { "type": "integer", "minimum": 1, "description": "The \"speed\" of the spinner in milliseconds.", - "default": 50 + "default": 180 } }, "additionalProperties": false, @@ -1945,6 +3839,10 @@ "$ref": "#/$defs/GitConfig", "description": "Config relating to git" }, + "worktree": { + "$ref": "#/$defs/WorktreeConfig", + "description": "Config relating to git worktrees" + }, "update": { "$ref": "#/$defs/UpdateConfig", "description": "Periodic update checks" @@ -2005,11 +3903,22 @@ }, "keybinding": { "$ref": "#/$defs/KeybindingConfig", - "description": "Keybindings" + "description": "Keybindings.\nEach binding can be a single key or a list of keys; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md for the syntax." } }, "additionalProperties": false, "type": "object" + }, + "WorktreeConfig": { + "properties": { + "defaultPath": { + "type": "string", + "description": "Default parent directory for new worktrees. It is offered as a candidate location alongside the parent directories of any worktrees you already have.\nA relative path is resolved against the repository's root directory, so \"../worktrees\" sits beside the repo and \".worktrees\" sits inside it.\nA leading \"~\" is expanded to your home directory, so \"~/worktrees\" works." + } + }, + "additionalProperties": false, + "type": "object", + "description": "Config relating to git worktrees" } } } diff --git a/scripts/bump_gocui.sh b/scripts/bump_gocui.sh deleted file mode 100755 index 13a1f575a..000000000 --- a/scripts/bump_gocui.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Go's proxy servers are not very up-to-date so that's why we use `GOPROXY=direct` -# We specify the `master` branch to avoid the default behaviour of looking for a semver tag. -GOPROXY=direct go get -u github.com/jesseduffield/gocui@master && go mod vendor && go mod tidy - -# Note to self if you ever want to fork a repo be sure to use this same approach: it's important to use the branch name (e.g. master) diff --git a/scripts/bump_lazycore.sh b/scripts/bump_lazycore.sh index 810e5f08e..a5cfe05ff 100755 --- a/scripts/bump_lazycore.sh +++ b/scripts/bump_lazycore.sh @@ -1,5 +1,5 @@ # Go's proxy servers are not very up-to-date so that's why we use `GOPROXY=direct` # We specify the `awesome` branch to avoid the default behaviour of looking for a semver tag. -GOPROXY=direct go get -u github.com/jesseduffield/lazycore@master && go mod vendor && go mod tidy +GOPROXY=direct go get -u github.com/jesseduffield/lazycore@master && go mod tidy && go mod vendor # Note to self if you ever want to fork a repo be sure to use this same approach: it's important to use the branch name (e.g. master) diff --git a/scripts/check_commit.sh b/scripts/check_commit.sh new file mode 100755 index 000000000..37557462e --- /dev/null +++ b/scripts/check_commit.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Run some tests on the current commit, similar to what CI does; useful for +# checking every commit in a branch with `git rebase -x scripts/check_commit.sh master`. + +set -e + +just test +just lint + +status_before_generate=$(git status --porcelain=v1) +just generate +status_after_generate=$(git status --porcelain=v1) +if [[ "$status_after_generate" != "$status_before_generate" ]]; then + echo "Error: auto-generated files not up to date." + exit 1 +fi diff --git a/scripts/check_for_fixups.sh b/scripts/check_for_fixups.sh index 3d5518360..5184d4820 100755 --- a/scripts/check_for_fixups.sh +++ b/scripts/check_for_fixups.sh @@ -2,7 +2,7 @@ # We will have only done a shallow clone, so the git log will consist only of # commits on the current PR -commits=$(git log --grep='^fixup!' --grep='^squash!' --grep='^amend!' --grep='^[^\n]*WIP' --grep='^[^\n]*DROPME' --format="%h %s") +commits=$(git log --format="%s" | egrep '(^fixup!|^squash!|^amend!|WIP|DROPME)') if [ -z "$commits" ]; then echo "No fixup commits found." diff --git a/scripts/gofumpt-check.sh b/scripts/gofumpt-check.sh new file mode 100755 index 000000000..ff251306c --- /dev/null +++ b/scripts/gofumpt-check.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Checks that all Go files are gofumpt-formatted, and fails if any aren't. +# Used by `just lint`, `make lint`, and CI. We run gofumpt with the version +# pinned in go.mod (via `go tool`) rather than the one bundled with +# golangci-lint, so that formatting is identical across all of them and the +# editor. + +set -e + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_root=$(dirname "$script_dir") + +cd "$repo_root" + +unformatted=$(go tool gofumpt -l .) +if [ -n "$unformatted" ]; then + echo "The following files are not formatted correctly:" + echo "$unformatted" + echo "Run 'just format' (or 'make format') and commit the result." + exit 1 +fi diff --git a/scripts/gofumpt-tool.sh b/scripts/gofumpt-tool.sh new file mode 100755 index 000000000..f9aae65a7 --- /dev/null +++ b/scripts/gofumpt-tool.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# This is used by VSCode; it is not very useful otherwise, since it's easy +# enough to just run `go tool gofumpt` directly, or use `just format`. + +set -e + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_root=$(dirname "$script_dir") + +cd "$repo_root" +exec go tool gofumpt "$@" diff --git a/scripts/golangci-lint-shim.sh b/scripts/golangci-lint-shim.sh index a85ccc4d7..6cb3e007c 100755 --- a/scripts/golangci-lint-shim.sh +++ b/scripts/golangci-lint-shim.sh @@ -3,6 +3,6 @@ set -e # Must be kept in sync with the version in .github/workflows/ci.yml -version="v2.4.0" +version="v2.12.2" go run "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$version" "$@" diff --git a/scripts/just_e2e_completion.zsh b/scripts/just_e2e_completion.zsh new file mode 100644 index 000000000..fa6ab32cd --- /dev/null +++ b/scripts/just_e2e_completion.zsh @@ -0,0 +1,56 @@ +# Zsh completion for the `e2e` and `e2e-cli` recipes in lazygit's justfile. +# +# These recipes take integration-test names (e.g. submodule/reset). This makes +# `just e2e ` complete them from pkg/integration/tests/. To enable it, add +# the following to your ~/.zshrc, *after* the line that runs `compinit`: +# +# source /path/to/lazygit/scripts/just_e2e_completion.zsh +# +# It is a no-op when `just` isn't installed, and only kicks in inside a project +# that has a justfile and a pkg/integration/tests/ directory, so it is harmless +# to source unconditionally. + +(( $+commands[just] )) || return 0 + +# just's own completion is clap-dynamic and has no hook for completing a +# recipe's arguments, so we wrap it: handle the e2e recipes ourselves and +# delegate everything else (recipe names, flags, ...) to just's completer. +source <(JUST_COMPLETE=zsh just) # defines _clap_dynamic_completer_just + +_just_lazygit_e2e() { + if (( CURRENT > 2 )); then + case ${words[2]} in + e2e | e2e-cli) + # Find the justfile's directory, then complete the integration + # tests under pkg/integration/tests/ relative to it. + local dir=$PWD testdir= + while [[ $dir != / ]]; do + if [[ -e $dir/justfile || -e $dir/.justfile || -e $dir/Justfile ]]; then + testdir=$dir/pkg/integration/tests + break + fi + dir=${dir:h} + done + if [[ -d $testdir ]]; then + # A test's name is its path under pkg/integration/tests/ without + # the .go extension, e.g. submodule/reset. Build that list, then + # let _multi_parts complete it one "/"-separated segment at a + # time, so an empty offers only categories. + local -a tests + tests=($testdir/**/*.go(.N:r)) # strip the .go extension + tests=(${tests#$testdir/}) # make relative to the tests dir + tests=(${(M)tests:#*/*}) # keep category/name (drop top-level helpers) + tests=(${tests:#shared/*}) # drop the cross-directory shared package + tests=(${tests:#*/shared}) # drop per-category shared.go helpers + local expl + _wanted tests expl 'integration test' _multi_parts / tests + return + fi + ;; + esac + fi + + _clap_dynamic_completer_just "$@" +} + +compdef _just_lazygit_e2e just # bind last so this wins over the default diff --git a/scripts/preview_release_notes.sh b/scripts/preview_release_notes.sh new file mode 100755 index 000000000..4c58514e4 --- /dev/null +++ b/scripts/preview_release_notes.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# Preview the release notes that would be generated if we were to create a +# release now. + +gh api -X POST /repos/jesseduffield/lazygit/releases/generate-notes \ + -f tag_name=v0.99.0 \ + -f target_commitish=master \ + -q .body | code - diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 579e6d77c..0c659ebfa 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -2,16 +2,6 @@ echo "Running integration tests with $(git --version)" -# This is ugly, but older versions of git don't support the GIT_CONFIG_GLOBAL -# env var; the only way to run tests for these old versions is to copy our test -# config file to the actual global location. Move an existing file out of the -# way so that we can restore it at the end. -if test -f ~/.gitconfig; then - mv ~/.gitconfig ~/.gitconfig.lazygit.bak -fi - -cp test/global_git_config ~/.gitconfig - # if the LAZYGIT_GOCOVERDIR env var is set, we'll capture code coverage data if [ -n "$LAZYGIT_GOCOVERDIR" ]; then # Go expects us to either be running the test binary directly or running `go test`, but because @@ -19,7 +9,7 @@ if [ -n "$LAZYGIT_GOCOVERDIR" ]; then # hacky. To capture the coverage data for the test runner we pass the test.gocoverdir positional # arg, but if we do that then the GOCOVERDIR env var (which you typically pass to the test binary) will be overwritten by the test runner. So we're passing LAZYGIT_COCOVERDIR instead # and then internally passing that to the test binary as GOCOVERDIR. - go test -cover -coverpkg=github.com/jesseduffield/lazygit/pkg/... pkg/integration/clients/*.go -args -test.gocoverdir="/tmp/code_coverage" + go test -timeout 30m -cover -coverpkg=github.com/jesseduffield/lazygit/pkg/... pkg/integration/clients/*.go -args -test.gocoverdir="/tmp/code_coverage" EXITCODE=$? # We're merging the coverage data for the sake of having fewer artefacts to upload. @@ -29,12 +19,16 @@ if [ -n "$LAZYGIT_GOCOVERDIR" ]; then rm -rf /tmp/code_coverage mv /tmp/code_coverage_merged /tmp/code_coverage else - go test pkg/integration/clients/*.go + go test -timeout 30m pkg/integration/clients/*.go EXITCODE=$? fi -if test -f ~/.gitconfig.lazygit.bak; then - mv ~/.gitconfig.lazygit.bak ~/.gitconfig +# If per-test timings were collected (LAZYGIT_TEST_TIMING points at the file the +# harness appends to), print them sorted by slowest first so they show up in the +# CI log. +if [ -n "$LAZYGIT_TEST_TIMING" ] && [ -f "$LAZYGIT_TEST_TIMING" ]; then + echo "Test timings (seconds):" + sort -rn "$LAZYGIT_TEST_TIMING" fi exit $EXITCODE diff --git a/test/default_test_config/config.yml b/test/default_test_config/config.yml index 5a822ae77..198fcbdd1 100644 --- a/test/default_test_config/config.yml +++ b/test/default_test_config/config.yml @@ -20,3 +20,4 @@ git: # TODO: add tests which explicitly test auto-refresh functionality autoRefresh: false autoFetch: false + autoDetectExternalChanges: false diff --git a/test/global_git_config b/test/global_git_config index f4f47c003..b83ea57b4 100644 --- a/test/global_git_config +++ b/test/global_git_config @@ -8,3 +8,12 @@ allow = always [commit] gpgSign = false +[maintenance] + # Every `git commit` forks `git maintenance run --auto --detach`. Since git + # 2.54 that repacks as soon as two objects share the objects/17 fanout + # directory, which happens readily in a fixture repo, and `git repack -d` + # prunes loose objects while the next fixture command -- or lazygit itself -- + # is still working in the same repo. That surfaces as + # "error: invalid object for 'file09.txt'" / "Error building trees". + # Tests must never race a background repack. + auto = false diff --git a/vendor/dario.cat/mergo/FUNDING.json b/vendor/dario.cat/mergo/FUNDING.json new file mode 100644 index 000000000..0585e1fe1 --- /dev/null +++ b/vendor/dario.cat/mergo/FUNDING.json @@ -0,0 +1,7 @@ +{ + "drips": { + "ethereum": { + "ownedBy": "0x6160020e7102237aC41bdb156e94401692D76930" + } + } +} diff --git a/vendor/dario.cat/mergo/README.md b/vendor/dario.cat/mergo/README.md index 0b3c48889..0e4a59afd 100644 --- a/vendor/dario.cat/mergo/README.md +++ b/vendor/dario.cat/mergo/README.md @@ -85,7 +85,6 @@ Mergo is used by [thousands](https://deps.dev/go/dario.cat%2Fmergo/v1.0.0/depend * [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser) * [go-micro/go-micro](https://github.com/go-micro/go-micro) * [grafana/loki](https://github.com/grafana/loki) -* [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes) * [masterminds/sprig](github.com/Masterminds/sprig) * [moby/moby](https://github.com/moby/moby) * [slackhq/nebula](https://github.com/slackhq/nebula) @@ -191,10 +190,6 @@ func main() { } ``` -Note: if test are failing due missing package, please execute: - - go get gopkg.in/yaml.v3 - ### Transformers Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, `time.Time` is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero `time.Time`? diff --git a/vendor/dario.cat/mergo/SECURITY.md b/vendor/dario.cat/mergo/SECURITY.md index a5de61f77..3788fcc1c 100644 --- a/vendor/dario.cat/mergo/SECURITY.md +++ b/vendor/dario.cat/mergo/SECURITY.md @@ -4,8 +4,8 @@ | Version | Supported | | ------- | ------------------ | -| 0.3.x | :white_check_mark: | -| < 0.3 | :x: | +| 1.x.x | :white_check_mark: | +| < 1.0 | :x: | ## Security contact information diff --git a/vendor/github.com/Microsoft/go-winio/.gitattributes b/vendor/github.com/Microsoft/go-winio/.gitattributes deleted file mode 100644 index 94f480de9..000000000 --- a/vendor/github.com/Microsoft/go-winio/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf \ No newline at end of file diff --git a/vendor/github.com/Microsoft/go-winio/.gitignore b/vendor/github.com/Microsoft/go-winio/.gitignore deleted file mode 100644 index 815e20660..000000000 --- a/vendor/github.com/Microsoft/go-winio/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -.vscode/ - -*.exe - -# testing -testdata - -# go workspaces -go.work -go.work.sum diff --git a/vendor/github.com/Microsoft/go-winio/.golangci.yml b/vendor/github.com/Microsoft/go-winio/.golangci.yml deleted file mode 100644 index faedfe937..000000000 --- a/vendor/github.com/Microsoft/go-winio/.golangci.yml +++ /dev/null @@ -1,147 +0,0 @@ -linters: - enable: - # style - - containedctx # struct contains a context - - dupl # duplicate code - - errname # erorrs are named correctly - - nolintlint # "//nolint" directives are properly explained - - revive # golint replacement - - unconvert # unnecessary conversions - - wastedassign - - # bugs, performance, unused, etc ... - - contextcheck # function uses a non-inherited context - - errorlint # errors not wrapped for 1.13 - - exhaustive # check exhaustiveness of enum switch statements - - gofmt # files are gofmt'ed - - gosec # security - - nilerr # returns nil even with non-nil error - - thelper # test helpers without t.Helper() - - unparam # unused function params - -issues: - exclude-dirs: - - pkg/etw/sample - - exclude-rules: - # err is very often shadowed in nested scopes - - linters: - - govet - text: '^shadow: declaration of "err" shadows declaration' - - # ignore long lines for skip autogen directives - - linters: - - revive - text: "^line-length-limit: " - source: "^//(go:generate|sys) " - - #TODO: remove after upgrading to go1.18 - # ignore comment spacing for nolint and sys directives - - linters: - - revive - text: "^comment-spacings: no space between comment delimiter and comment text" - source: "//(cspell:|nolint:|sys |todo)" - - # not on go 1.18 yet, so no any - - linters: - - revive - text: "^use-any: since GO 1.18 'interface{}' can be replaced by 'any'" - - # allow unjustified ignores of error checks in defer statements - - linters: - - nolintlint - text: "^directive `//nolint:errcheck` should provide explanation" - source: '^\s*defer ' - - # allow unjustified ignores of error lints for io.EOF - - linters: - - nolintlint - text: "^directive `//nolint:errorlint` should provide explanation" - source: '[=|!]= io.EOF' - - -linters-settings: - exhaustive: - default-signifies-exhaustive: true - govet: - enable-all: true - disable: - # struct order is often for Win32 compat - # also, ignore pointer bytes/GC issues for now until performance becomes an issue - - fieldalignment - nolintlint: - require-explanation: true - require-specific: true - revive: - # revive is more configurable than static check, so likely the preferred alternative to static-check - # (once the perf issue is solved: https://github.com/golangci/golangci-lint/issues/2997) - enable-all-rules: - true - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md - rules: - # rules with required arguments - - name: argument-limit - disabled: true - - name: banned-characters - disabled: true - - name: cognitive-complexity - disabled: true - - name: cyclomatic - disabled: true - - name: file-header - disabled: true - - name: function-length - disabled: true - - name: function-result-limit - disabled: true - - name: max-public-structs - disabled: true - # geneally annoying rules - - name: add-constant # complains about any and all strings and integers - disabled: true - - name: confusing-naming # we frequently use "Foo()" and "foo()" together - disabled: true - - name: flag-parameter # excessive, and a common idiom we use - disabled: true - - name: unhandled-error # warns over common fmt.Print* and io.Close; rely on errcheck instead - disabled: true - # general config - - name: line-length-limit - arguments: - - 140 - - name: var-naming - arguments: - - [] - - - CID - - CRI - - CTRD - - DACL - - DLL - - DOS - - ETW - - FSCTL - - GCS - - GMSA - - HCS - - HV - - IO - - LCOW - - LDAP - - LPAC - - LTSC - - MMIO - - NT - - OCI - - PMEM - - PWSH - - RX - - SACl - - SID - - SMB - - TX - - VHD - - VHDX - - VMID - - VPCI - - WCOW - - WIM diff --git a/vendor/github.com/Microsoft/go-winio/CODEOWNERS b/vendor/github.com/Microsoft/go-winio/CODEOWNERS deleted file mode 100644 index ae1b4942b..000000000 --- a/vendor/github.com/Microsoft/go-winio/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ - * @microsoft/containerplat diff --git a/vendor/github.com/Microsoft/go-winio/README.md b/vendor/github.com/Microsoft/go-winio/README.md deleted file mode 100644 index 7474b4f0b..000000000 --- a/vendor/github.com/Microsoft/go-winio/README.md +++ /dev/null @@ -1,89 +0,0 @@ -# go-winio [![Build Status](https://github.com/microsoft/go-winio/actions/workflows/ci.yml/badge.svg)](https://github.com/microsoft/go-winio/actions/workflows/ci.yml) - -This repository contains utilities for efficiently performing Win32 IO operations in -Go. Currently, this is focused on accessing named pipes and other file handles, and -for using named pipes as a net transport. - -This code relies on IO completion ports to avoid blocking IO on system threads, allowing Go -to reuse the thread to schedule another goroutine. This limits support to Windows Vista and -newer operating systems. This is similar to the implementation of network sockets in Go's net -package. - -Please see the LICENSE file for licensing information. - -## Contributing - -This project welcomes contributions and suggestions. -Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that -you have the right to, and actually do, grant us the rights to use your contribution. -For details, visit [Microsoft CLA](https://cla.microsoft.com). - -When you submit a pull request, a CLA-bot will automatically determine whether you need to -provide a CLA and decorate the PR appropriately (e.g., label, comment). -Simply follow the instructions provided by the bot. -You will only need to do this once across all repos using our CLA. - -Additionally, the pull request pipeline requires the following steps to be performed before -mergining. - -### Code Sign-Off - -We require that contributors sign their commits using [`git commit --signoff`][git-commit-s] -to certify they either authored the work themselves or otherwise have permission to use it in this project. - -A range of commits can be signed off using [`git rebase --signoff`][git-rebase-s]. - -Please see [the developer certificate](https://developercertificate.org) for more info, -as well as to make sure that you can attest to the rules listed. -Our CI uses the DCO Github app to ensure that all commits in a given PR are signed-off. - -### Linting - -Code must pass a linting stage, which uses [`golangci-lint`][lint]. -The linting settings are stored in [`.golangci.yaml`](./.golangci.yaml), and can be run -automatically with VSCode by adding the following to your workspace or folder settings: - -```json - "go.lintTool": "golangci-lint", - "go.lintOnSave": "package", -``` - -Additional editor [integrations options are also available][lint-ide]. - -Alternatively, `golangci-lint` can be [installed locally][lint-install] and run from the repo root: - -```shell -# use . or specify a path to only lint a package -# to show all lint errors, use flags "--max-issues-per-linter=0 --max-same-issues=0" -> golangci-lint run ./... -``` - -### Go Generate - -The pipeline checks that auto-generated code, via `go generate`, are up to date. - -This can be done for the entire repo: - -```shell -> go generate ./... -``` - -## Code of Conduct - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - -## Special Thanks - -Thanks to [natefinch][natefinch] for the inspiration for this library. -See [npipe](https://github.com/natefinch/npipe) for another named pipe implementation. - -[lint]: https://golangci-lint.run/ -[lint-ide]: https://golangci-lint.run/usage/integrations/#editor-integration -[lint-install]: https://golangci-lint.run/usage/install/#local-installation - -[git-commit-s]: https://git-scm.com/docs/git-commit#Documentation/git-commit.txt--s -[git-rebase-s]: https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---signoff - -[natefinch]: https://github.com/natefinch diff --git a/vendor/github.com/Microsoft/go-winio/SECURITY.md b/vendor/github.com/Microsoft/go-winio/SECURITY.md deleted file mode 100644 index 869fdfe2b..000000000 --- a/vendor/github.com/Microsoft/go-winio/SECURITY.md +++ /dev/null @@ -1,41 +0,0 @@ - - -## Security - -Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). - -If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below. - -## Reporting Security Issues - -**Please do not report security vulnerabilities through public GitHub issues.** - -Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report). - -If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey). - -You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). - -Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: - - * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) - * Full paths of source file(s) related to the manifestation of the issue - * The location of the affected source code (tag/branch/commit or direct URL) - * Any special configuration required to reproduce the issue - * Step-by-step instructions to reproduce the issue - * Proof-of-concept or exploit code (if possible) - * Impact of the issue, including how an attacker might exploit the issue - -This information will help us triage your report more quickly. - -If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs. - -## Preferred Languages - -We prefer all communications to be in English. - -## Policy - -Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd). - - diff --git a/vendor/github.com/Microsoft/go-winio/backup.go b/vendor/github.com/Microsoft/go-winio/backup.go deleted file mode 100644 index b54341daa..000000000 --- a/vendor/github.com/Microsoft/go-winio/backup.go +++ /dev/null @@ -1,287 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "encoding/binary" - "errors" - "fmt" - "io" - "os" - "runtime" - "unicode/utf16" - - "github.com/Microsoft/go-winio/internal/fs" - "golang.org/x/sys/windows" -) - -//sys backupRead(h windows.Handle, b []byte, bytesRead *uint32, abort bool, processSecurity bool, context *uintptr) (err error) = BackupRead -//sys backupWrite(h windows.Handle, b []byte, bytesWritten *uint32, abort bool, processSecurity bool, context *uintptr) (err error) = BackupWrite - -const ( - BackupData = uint32(iota + 1) - BackupEaData - BackupSecurity - BackupAlternateData - BackupLink - BackupPropertyData - BackupObjectId //revive:disable-line:var-naming ID, not Id - BackupReparseData - BackupSparseBlock - BackupTxfsData -) - -const ( - StreamSparseAttributes = uint32(8) -) - -//nolint:revive // var-naming: ALL_CAPS -const ( - WRITE_DAC = windows.WRITE_DAC - WRITE_OWNER = windows.WRITE_OWNER - ACCESS_SYSTEM_SECURITY = windows.ACCESS_SYSTEM_SECURITY -) - -// BackupHeader represents a backup stream of a file. -type BackupHeader struct { - //revive:disable-next-line:var-naming ID, not Id - Id uint32 // The backup stream ID - Attributes uint32 // Stream attributes - Size int64 // The size of the stream in bytes - Name string // The name of the stream (for BackupAlternateData only). - Offset int64 // The offset of the stream in the file (for BackupSparseBlock only). -} - -type win32StreamID struct { - StreamID uint32 - Attributes uint32 - Size uint64 - NameSize uint32 -} - -// BackupStreamReader reads from a stream produced by the BackupRead Win32 API and produces a series -// of BackupHeader values. -type BackupStreamReader struct { - r io.Reader - bytesLeft int64 -} - -// NewBackupStreamReader produces a BackupStreamReader from any io.Reader. -func NewBackupStreamReader(r io.Reader) *BackupStreamReader { - return &BackupStreamReader{r, 0} -} - -// Next returns the next backup stream and prepares for calls to Read(). It skips the remainder of the current stream if -// it was not completely read. -func (r *BackupStreamReader) Next() (*BackupHeader, error) { - if r.bytesLeft > 0 { //nolint:nestif // todo: flatten this - if s, ok := r.r.(io.Seeker); ok { - // Make sure Seek on io.SeekCurrent sometimes succeeds - // before trying the actual seek. - if _, err := s.Seek(0, io.SeekCurrent); err == nil { - if _, err = s.Seek(r.bytesLeft, io.SeekCurrent); err != nil { - return nil, err - } - r.bytesLeft = 0 - } - } - if _, err := io.Copy(io.Discard, r); err != nil { - return nil, err - } - } - var wsi win32StreamID - if err := binary.Read(r.r, binary.LittleEndian, &wsi); err != nil { - return nil, err - } - hdr := &BackupHeader{ - Id: wsi.StreamID, - Attributes: wsi.Attributes, - Size: int64(wsi.Size), - } - if wsi.NameSize != 0 { - name := make([]uint16, int(wsi.NameSize/2)) - if err := binary.Read(r.r, binary.LittleEndian, name); err != nil { - return nil, err - } - hdr.Name = windows.UTF16ToString(name) - } - if wsi.StreamID == BackupSparseBlock { - if err := binary.Read(r.r, binary.LittleEndian, &hdr.Offset); err != nil { - return nil, err - } - hdr.Size -= 8 - } - r.bytesLeft = hdr.Size - return hdr, nil -} - -// Read reads from the current backup stream. -func (r *BackupStreamReader) Read(b []byte) (int, error) { - if r.bytesLeft == 0 { - return 0, io.EOF - } - if int64(len(b)) > r.bytesLeft { - b = b[:r.bytesLeft] - } - n, err := r.r.Read(b) - r.bytesLeft -= int64(n) - if err == io.EOF { - err = io.ErrUnexpectedEOF - } else if r.bytesLeft == 0 && err == nil { - err = io.EOF - } - return n, err -} - -// BackupStreamWriter writes a stream compatible with the BackupWrite Win32 API. -type BackupStreamWriter struct { - w io.Writer - bytesLeft int64 -} - -// NewBackupStreamWriter produces a BackupStreamWriter on top of an io.Writer. -func NewBackupStreamWriter(w io.Writer) *BackupStreamWriter { - return &BackupStreamWriter{w, 0} -} - -// WriteHeader writes the next backup stream header and prepares for calls to Write(). -func (w *BackupStreamWriter) WriteHeader(hdr *BackupHeader) error { - if w.bytesLeft != 0 { - return fmt.Errorf("missing %d bytes", w.bytesLeft) - } - name := utf16.Encode([]rune(hdr.Name)) - wsi := win32StreamID{ - StreamID: hdr.Id, - Attributes: hdr.Attributes, - Size: uint64(hdr.Size), - NameSize: uint32(len(name) * 2), - } - if hdr.Id == BackupSparseBlock { - // Include space for the int64 block offset - wsi.Size += 8 - } - if err := binary.Write(w.w, binary.LittleEndian, &wsi); err != nil { - return err - } - if len(name) != 0 { - if err := binary.Write(w.w, binary.LittleEndian, name); err != nil { - return err - } - } - if hdr.Id == BackupSparseBlock { - if err := binary.Write(w.w, binary.LittleEndian, hdr.Offset); err != nil { - return err - } - } - w.bytesLeft = hdr.Size - return nil -} - -// Write writes to the current backup stream. -func (w *BackupStreamWriter) Write(b []byte) (int, error) { - if w.bytesLeft < int64(len(b)) { - return 0, fmt.Errorf("too many bytes by %d", int64(len(b))-w.bytesLeft) - } - n, err := w.w.Write(b) - w.bytesLeft -= int64(n) - return n, err -} - -// BackupFileReader provides an io.ReadCloser interface on top of the BackupRead Win32 API. -type BackupFileReader struct { - f *os.File - includeSecurity bool - ctx uintptr -} - -// NewBackupFileReader returns a new BackupFileReader from a file handle. If includeSecurity is true, -// Read will attempt to read the security descriptor of the file. -func NewBackupFileReader(f *os.File, includeSecurity bool) *BackupFileReader { - r := &BackupFileReader{f, includeSecurity, 0} - return r -} - -// Read reads a backup stream from the file by calling the Win32 API BackupRead(). -func (r *BackupFileReader) Read(b []byte) (int, error) { - var bytesRead uint32 - err := backupRead(windows.Handle(r.f.Fd()), b, &bytesRead, false, r.includeSecurity, &r.ctx) - if err != nil { - return 0, &os.PathError{Op: "BackupRead", Path: r.f.Name(), Err: err} - } - runtime.KeepAlive(r.f) - if bytesRead == 0 { - return 0, io.EOF - } - return int(bytesRead), nil -} - -// Close frees Win32 resources associated with the BackupFileReader. It does not close -// the underlying file. -func (r *BackupFileReader) Close() error { - if r.ctx != 0 { - _ = backupRead(windows.Handle(r.f.Fd()), nil, nil, true, false, &r.ctx) - runtime.KeepAlive(r.f) - r.ctx = 0 - } - return nil -} - -// BackupFileWriter provides an io.WriteCloser interface on top of the BackupWrite Win32 API. -type BackupFileWriter struct { - f *os.File - includeSecurity bool - ctx uintptr -} - -// NewBackupFileWriter returns a new BackupFileWriter from a file handle. If includeSecurity is true, -// Write() will attempt to restore the security descriptor from the stream. -func NewBackupFileWriter(f *os.File, includeSecurity bool) *BackupFileWriter { - w := &BackupFileWriter{f, includeSecurity, 0} - return w -} - -// Write restores a portion of the file using the provided backup stream. -func (w *BackupFileWriter) Write(b []byte) (int, error) { - var bytesWritten uint32 - err := backupWrite(windows.Handle(w.f.Fd()), b, &bytesWritten, false, w.includeSecurity, &w.ctx) - if err != nil { - return 0, &os.PathError{Op: "BackupWrite", Path: w.f.Name(), Err: err} - } - runtime.KeepAlive(w.f) - if int(bytesWritten) != len(b) { - return int(bytesWritten), errors.New("not all bytes could be written") - } - return len(b), nil -} - -// Close frees Win32 resources associated with the BackupFileWriter. It does not -// close the underlying file. -func (w *BackupFileWriter) Close() error { - if w.ctx != 0 { - _ = backupWrite(windows.Handle(w.f.Fd()), nil, nil, true, false, &w.ctx) - runtime.KeepAlive(w.f) - w.ctx = 0 - } - return nil -} - -// OpenForBackup opens a file or directory, potentially skipping access checks if the backup -// or restore privileges have been acquired. -// -// If the file opened was a directory, it cannot be used with Readdir(). -func OpenForBackup(path string, access uint32, share uint32, createmode uint32) (*os.File, error) { - h, err := fs.CreateFile(path, - fs.AccessMask(access), - fs.FileShareMode(share), - nil, - fs.FileCreationDisposition(createmode), - fs.FILE_FLAG_BACKUP_SEMANTICS|fs.FILE_FLAG_OPEN_REPARSE_POINT, - 0, - ) - if err != nil { - err = &os.PathError{Op: "open", Path: path, Err: err} - return nil, err - } - return os.NewFile(uintptr(h), path), nil -} diff --git a/vendor/github.com/Microsoft/go-winio/doc.go b/vendor/github.com/Microsoft/go-winio/doc.go deleted file mode 100644 index 1f5bfe2d5..000000000 --- a/vendor/github.com/Microsoft/go-winio/doc.go +++ /dev/null @@ -1,22 +0,0 @@ -// This package provides utilities for efficiently performing Win32 IO operations in Go. -// Currently, this package is provides support for genreal IO and management of -// - named pipes -// - files -// - [Hyper-V sockets] -// -// This code is similar to Go's [net] package, and uses IO completion ports to avoid -// blocking IO on system threads, allowing Go to reuse the thread to schedule other goroutines. -// -// This limits support to Windows Vista and newer operating systems. -// -// Additionally, this package provides support for: -// - creating and managing GUIDs -// - writing to [ETW] -// - opening and manageing VHDs -// - parsing [Windows Image files] -// - auto-generating Win32 API code -// -// [Hyper-V sockets]: https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/user-guide/make-integration-service -// [ETW]: https://docs.microsoft.com/en-us/windows-hardware/drivers/devtest/event-tracing-for-windows--etw- -// [Windows Image files]: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/work-with-windows-images -package winio diff --git a/vendor/github.com/Microsoft/go-winio/ea.go b/vendor/github.com/Microsoft/go-winio/ea.go deleted file mode 100644 index e104dbdfd..000000000 --- a/vendor/github.com/Microsoft/go-winio/ea.go +++ /dev/null @@ -1,137 +0,0 @@ -package winio - -import ( - "bytes" - "encoding/binary" - "errors" -) - -type fileFullEaInformation struct { - NextEntryOffset uint32 - Flags uint8 - NameLength uint8 - ValueLength uint16 -} - -var ( - fileFullEaInformationSize = binary.Size(&fileFullEaInformation{}) - - errInvalidEaBuffer = errors.New("invalid extended attribute buffer") - errEaNameTooLarge = errors.New("extended attribute name too large") - errEaValueTooLarge = errors.New("extended attribute value too large") -) - -// ExtendedAttribute represents a single Windows EA. -type ExtendedAttribute struct { - Name string - Value []byte - Flags uint8 -} - -func parseEa(b []byte) (ea ExtendedAttribute, nb []byte, err error) { - var info fileFullEaInformation - err = binary.Read(bytes.NewReader(b), binary.LittleEndian, &info) - if err != nil { - err = errInvalidEaBuffer - return ea, nb, err - } - - nameOffset := fileFullEaInformationSize - nameLen := int(info.NameLength) - valueOffset := nameOffset + int(info.NameLength) + 1 - valueLen := int(info.ValueLength) - nextOffset := int(info.NextEntryOffset) - if valueLen+valueOffset > len(b) || nextOffset < 0 || nextOffset > len(b) { - err = errInvalidEaBuffer - return ea, nb, err - } - - ea.Name = string(b[nameOffset : nameOffset+nameLen]) - ea.Value = b[valueOffset : valueOffset+valueLen] - ea.Flags = info.Flags - if info.NextEntryOffset != 0 { - nb = b[info.NextEntryOffset:] - } - return ea, nb, err -} - -// DecodeExtendedAttributes decodes a list of EAs from a FILE_FULL_EA_INFORMATION -// buffer retrieved from BackupRead, ZwQueryEaFile, etc. -func DecodeExtendedAttributes(b []byte) (eas []ExtendedAttribute, err error) { - for len(b) != 0 { - ea, nb, err := parseEa(b) - if err != nil { - return nil, err - } - - eas = append(eas, ea) - b = nb - } - return eas, err -} - -func writeEa(buf *bytes.Buffer, ea *ExtendedAttribute, last bool) error { - if int(uint8(len(ea.Name))) != len(ea.Name) { - return errEaNameTooLarge - } - if int(uint16(len(ea.Value))) != len(ea.Value) { - return errEaValueTooLarge - } - entrySize := uint32(fileFullEaInformationSize + len(ea.Name) + 1 + len(ea.Value)) - withPadding := (entrySize + 3) &^ 3 - nextOffset := uint32(0) - if !last { - nextOffset = withPadding - } - info := fileFullEaInformation{ - NextEntryOffset: nextOffset, - Flags: ea.Flags, - NameLength: uint8(len(ea.Name)), - ValueLength: uint16(len(ea.Value)), - } - - err := binary.Write(buf, binary.LittleEndian, &info) - if err != nil { - return err - } - - _, err = buf.Write([]byte(ea.Name)) - if err != nil { - return err - } - - err = buf.WriteByte(0) - if err != nil { - return err - } - - _, err = buf.Write(ea.Value) - if err != nil { - return err - } - - _, err = buf.Write([]byte{0, 0, 0}[0 : withPadding-entrySize]) - if err != nil { - return err - } - - return nil -} - -// EncodeExtendedAttributes encodes a list of EAs into a FILE_FULL_EA_INFORMATION -// buffer for use with BackupWrite, ZwSetEaFile, etc. -func EncodeExtendedAttributes(eas []ExtendedAttribute) ([]byte, error) { - var buf bytes.Buffer - for i := range eas { - last := false - if i == len(eas)-1 { - last = true - } - - err := writeEa(&buf, &eas[i], last) - if err != nil { - return nil, err - } - } - return buf.Bytes(), nil -} diff --git a/vendor/github.com/Microsoft/go-winio/file.go b/vendor/github.com/Microsoft/go-winio/file.go deleted file mode 100644 index fe82a180d..000000000 --- a/vendor/github.com/Microsoft/go-winio/file.go +++ /dev/null @@ -1,320 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "errors" - "io" - "runtime" - "sync" - "sync/atomic" - "syscall" - "time" - - "golang.org/x/sys/windows" -) - -//sys cancelIoEx(file windows.Handle, o *windows.Overlapped) (err error) = CancelIoEx -//sys createIoCompletionPort(file windows.Handle, port windows.Handle, key uintptr, threadCount uint32) (newport windows.Handle, err error) = CreateIoCompletionPort -//sys getQueuedCompletionStatus(port windows.Handle, bytes *uint32, key *uintptr, o **ioOperation, timeout uint32) (err error) = GetQueuedCompletionStatus -//sys setFileCompletionNotificationModes(h windows.Handle, flags uint8) (err error) = SetFileCompletionNotificationModes -//sys wsaGetOverlappedResult(h windows.Handle, o *windows.Overlapped, bytes *uint32, wait bool, flags *uint32) (err error) = ws2_32.WSAGetOverlappedResult - -var ( - ErrFileClosed = errors.New("file has already been closed") - ErrTimeout = &timeoutError{} -) - -type timeoutError struct{} - -func (*timeoutError) Error() string { return "i/o timeout" } -func (*timeoutError) Timeout() bool { return true } -func (*timeoutError) Temporary() bool { return true } - -type timeoutChan chan struct{} - -var ioInitOnce sync.Once -var ioCompletionPort windows.Handle - -// ioResult contains the result of an asynchronous IO operation. -type ioResult struct { - bytes uint32 - err error -} - -// ioOperation represents an outstanding asynchronous Win32 IO. -type ioOperation struct { - o windows.Overlapped - ch chan ioResult -} - -func initIO() { - h, err := createIoCompletionPort(windows.InvalidHandle, 0, 0, 0xffffffff) - if err != nil { - panic(err) - } - ioCompletionPort = h - go ioCompletionProcessor(h) -} - -// win32File implements Reader, Writer, and Closer on a Win32 handle without blocking in a syscall. -// It takes ownership of this handle and will close it if it is garbage collected. -type win32File struct { - handle windows.Handle - wg sync.WaitGroup - wgLock sync.RWMutex - closing atomic.Bool - socket bool - readDeadline deadlineHandler - writeDeadline deadlineHandler -} - -type deadlineHandler struct { - setLock sync.Mutex - channel timeoutChan - channelLock sync.RWMutex - timer *time.Timer - timedout atomic.Bool -} - -// makeWin32File makes a new win32File from an existing file handle. -func makeWin32File(h windows.Handle) (*win32File, error) { - f := &win32File{handle: h} - ioInitOnce.Do(initIO) - _, err := createIoCompletionPort(h, ioCompletionPort, 0, 0xffffffff) - if err != nil { - return nil, err - } - err = setFileCompletionNotificationModes(h, windows.FILE_SKIP_COMPLETION_PORT_ON_SUCCESS|windows.FILE_SKIP_SET_EVENT_ON_HANDLE) - if err != nil { - return nil, err - } - f.readDeadline.channel = make(timeoutChan) - f.writeDeadline.channel = make(timeoutChan) - return f, nil -} - -// Deprecated: use NewOpenFile instead. -func MakeOpenFile(h syscall.Handle) (io.ReadWriteCloser, error) { - return NewOpenFile(windows.Handle(h)) -} - -func NewOpenFile(h windows.Handle) (io.ReadWriteCloser, error) { - // If we return the result of makeWin32File directly, it can result in an - // interface-wrapped nil, rather than a nil interface value. - f, err := makeWin32File(h) - if err != nil { - return nil, err - } - return f, nil -} - -// closeHandle closes the resources associated with a Win32 handle. -func (f *win32File) closeHandle() { - f.wgLock.Lock() - // Atomically set that we are closing, releasing the resources only once. - if !f.closing.Swap(true) { - f.wgLock.Unlock() - // cancel all IO and wait for it to complete - _ = cancelIoEx(f.handle, nil) - f.wg.Wait() - // at this point, no new IO can start - windows.Close(f.handle) - f.handle = 0 - } else { - f.wgLock.Unlock() - } -} - -// Close closes a win32File. -func (f *win32File) Close() error { - f.closeHandle() - return nil -} - -// IsClosed checks if the file has been closed. -func (f *win32File) IsClosed() bool { - return f.closing.Load() -} - -// prepareIO prepares for a new IO operation. -// The caller must call f.wg.Done() when the IO is finished, prior to Close() returning. -func (f *win32File) prepareIO() (*ioOperation, error) { - f.wgLock.RLock() - if f.closing.Load() { - f.wgLock.RUnlock() - return nil, ErrFileClosed - } - f.wg.Add(1) - f.wgLock.RUnlock() - c := &ioOperation{} - c.ch = make(chan ioResult) - return c, nil -} - -// ioCompletionProcessor processes completed async IOs forever. -func ioCompletionProcessor(h windows.Handle) { - for { - var bytes uint32 - var key uintptr - var op *ioOperation - err := getQueuedCompletionStatus(h, &bytes, &key, &op, windows.INFINITE) - if op == nil { - panic(err) - } - op.ch <- ioResult{bytes, err} - } -} - -// todo: helsaawy - create an asyncIO version that takes a context - -// asyncIO processes the return value from ReadFile or WriteFile, blocking until -// the operation has actually completed. -func (f *win32File) asyncIO(c *ioOperation, d *deadlineHandler, bytes uint32, err error) (int, error) { - if err != windows.ERROR_IO_PENDING { //nolint:errorlint // err is Errno - return int(bytes), err - } - - if f.closing.Load() { - _ = cancelIoEx(f.handle, &c.o) - } - - var timeout timeoutChan - if d != nil { - d.channelLock.Lock() - timeout = d.channel - d.channelLock.Unlock() - } - - var r ioResult - select { - case r = <-c.ch: - err = r.err - if err == windows.ERROR_OPERATION_ABORTED { //nolint:errorlint // err is Errno - if f.closing.Load() { - err = ErrFileClosed - } - } else if err != nil && f.socket { - // err is from Win32. Query the overlapped structure to get the winsock error. - var bytes, flags uint32 - err = wsaGetOverlappedResult(f.handle, &c.o, &bytes, false, &flags) - } - case <-timeout: - _ = cancelIoEx(f.handle, &c.o) - r = <-c.ch - err = r.err - if err == windows.ERROR_OPERATION_ABORTED { //nolint:errorlint // err is Errno - err = ErrTimeout - } - } - - // runtime.KeepAlive is needed, as c is passed via native - // code to ioCompletionProcessor, c must remain alive - // until the channel read is complete. - // todo: (de)allocate *ioOperation via win32 heap functions, instead of needing to KeepAlive? - runtime.KeepAlive(c) - return int(r.bytes), err -} - -// Read reads from a file handle. -func (f *win32File) Read(b []byte) (int, error) { - c, err := f.prepareIO() - if err != nil { - return 0, err - } - defer f.wg.Done() - - if f.readDeadline.timedout.Load() { - return 0, ErrTimeout - } - - var bytes uint32 - err = windows.ReadFile(f.handle, b, &bytes, &c.o) - n, err := f.asyncIO(c, &f.readDeadline, bytes, err) - runtime.KeepAlive(b) - - // Handle EOF conditions. - if err == nil && n == 0 && len(b) != 0 { - return 0, io.EOF - } else if err == windows.ERROR_BROKEN_PIPE { //nolint:errorlint // err is Errno - return 0, io.EOF - } - return n, err -} - -// Write writes to a file handle. -func (f *win32File) Write(b []byte) (int, error) { - c, err := f.prepareIO() - if err != nil { - return 0, err - } - defer f.wg.Done() - - if f.writeDeadline.timedout.Load() { - return 0, ErrTimeout - } - - var bytes uint32 - err = windows.WriteFile(f.handle, b, &bytes, &c.o) - n, err := f.asyncIO(c, &f.writeDeadline, bytes, err) - runtime.KeepAlive(b) - return n, err -} - -func (f *win32File) SetReadDeadline(deadline time.Time) error { - return f.readDeadline.set(deadline) -} - -func (f *win32File) SetWriteDeadline(deadline time.Time) error { - return f.writeDeadline.set(deadline) -} - -func (f *win32File) Flush() error { - return windows.FlushFileBuffers(f.handle) -} - -func (f *win32File) Fd() uintptr { - return uintptr(f.handle) -} - -func (d *deadlineHandler) set(deadline time.Time) error { - d.setLock.Lock() - defer d.setLock.Unlock() - - if d.timer != nil { - if !d.timer.Stop() { - <-d.channel - } - d.timer = nil - } - d.timedout.Store(false) - - select { - case <-d.channel: - d.channelLock.Lock() - d.channel = make(chan struct{}) - d.channelLock.Unlock() - default: - } - - if deadline.IsZero() { - return nil - } - - timeoutIO := func() { - d.timedout.Store(true) - close(d.channel) - } - - now := time.Now() - duration := deadline.Sub(now) - if deadline.After(now) { - // Deadline is in the future, set a timer to wait - d.timer = time.AfterFunc(duration, timeoutIO) - } else { - // Deadline is in the past. Cancel all pending IO now. - timeoutIO() - } - return nil -} diff --git a/vendor/github.com/Microsoft/go-winio/fileinfo.go b/vendor/github.com/Microsoft/go-winio/fileinfo.go deleted file mode 100644 index c860eb991..000000000 --- a/vendor/github.com/Microsoft/go-winio/fileinfo.go +++ /dev/null @@ -1,106 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "os" - "runtime" - "unsafe" - - "golang.org/x/sys/windows" -) - -// FileBasicInfo contains file access time and file attributes information. -type FileBasicInfo struct { - CreationTime, LastAccessTime, LastWriteTime, ChangeTime windows.Filetime - FileAttributes uint32 - _ uint32 // padding -} - -// alignedFileBasicInfo is a FileBasicInfo, but aligned to uint64 by containing -// uint64 rather than windows.Filetime. Filetime contains two uint32s. uint64 -// alignment is necessary to pass this as FILE_BASIC_INFO. -type alignedFileBasicInfo struct { - CreationTime, LastAccessTime, LastWriteTime, ChangeTime uint64 - FileAttributes uint32 - _ uint32 // padding -} - -// GetFileBasicInfo retrieves times and attributes for a file. -func GetFileBasicInfo(f *os.File) (*FileBasicInfo, error) { - bi := &alignedFileBasicInfo{} - if err := windows.GetFileInformationByHandleEx( - windows.Handle(f.Fd()), - windows.FileBasicInfo, - (*byte)(unsafe.Pointer(bi)), - uint32(unsafe.Sizeof(*bi)), - ); err != nil { - return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err} - } - runtime.KeepAlive(f) - // Reinterpret the alignedFileBasicInfo as a FileBasicInfo so it matches the - // public API of this module. The data may be unnecessarily aligned. - return (*FileBasicInfo)(unsafe.Pointer(bi)), nil -} - -// SetFileBasicInfo sets times and attributes for a file. -func SetFileBasicInfo(f *os.File, bi *FileBasicInfo) error { - // Create an alignedFileBasicInfo based on a FileBasicInfo. The copy is - // suitable to pass to GetFileInformationByHandleEx. - biAligned := *(*alignedFileBasicInfo)(unsafe.Pointer(bi)) - if err := windows.SetFileInformationByHandle( - windows.Handle(f.Fd()), - windows.FileBasicInfo, - (*byte)(unsafe.Pointer(&biAligned)), - uint32(unsafe.Sizeof(biAligned)), - ); err != nil { - return &os.PathError{Op: "SetFileInformationByHandle", Path: f.Name(), Err: err} - } - runtime.KeepAlive(f) - return nil -} - -// FileStandardInfo contains extended information for the file. -// FILE_STANDARD_INFO in WinBase.h -// https://docs.microsoft.com/en-us/windows/win32/api/winbase/ns-winbase-file_standard_info -type FileStandardInfo struct { - AllocationSize, EndOfFile int64 - NumberOfLinks uint32 - DeletePending, Directory bool -} - -// GetFileStandardInfo retrieves ended information for the file. -func GetFileStandardInfo(f *os.File) (*FileStandardInfo, error) { - si := &FileStandardInfo{} - if err := windows.GetFileInformationByHandleEx(windows.Handle(f.Fd()), - windows.FileStandardInfo, - (*byte)(unsafe.Pointer(si)), - uint32(unsafe.Sizeof(*si))); err != nil { - return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err} - } - runtime.KeepAlive(f) - return si, nil -} - -// FileIDInfo contains the volume serial number and file ID for a file. This pair should be -// unique on a system. -type FileIDInfo struct { - VolumeSerialNumber uint64 - FileID [16]byte -} - -// GetFileID retrieves the unique (volume, file ID) pair for a file. -func GetFileID(f *os.File) (*FileIDInfo, error) { - fileID := &FileIDInfo{} - if err := windows.GetFileInformationByHandleEx( - windows.Handle(f.Fd()), - windows.FileIdInfo, - (*byte)(unsafe.Pointer(fileID)), - uint32(unsafe.Sizeof(*fileID)), - ); err != nil { - return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err} - } - runtime.KeepAlive(f) - return fileID, nil -} diff --git a/vendor/github.com/Microsoft/go-winio/hvsock.go b/vendor/github.com/Microsoft/go-winio/hvsock.go deleted file mode 100644 index c4fdd9d4a..000000000 --- a/vendor/github.com/Microsoft/go-winio/hvsock.go +++ /dev/null @@ -1,582 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "context" - "errors" - "fmt" - "io" - "net" - "os" - "time" - "unsafe" - - "golang.org/x/sys/windows" - - "github.com/Microsoft/go-winio/internal/socket" - "github.com/Microsoft/go-winio/pkg/guid" -) - -const afHVSock = 34 // AF_HYPERV - -// Well known Service and VM IDs -// https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/user-guide/make-integration-service#vmid-wildcards - -// HvsockGUIDWildcard is the wildcard VmId for accepting connections from all partitions. -func HvsockGUIDWildcard() guid.GUID { // 00000000-0000-0000-0000-000000000000 - return guid.GUID{} -} - -// HvsockGUIDBroadcast is the wildcard VmId for broadcasting sends to all partitions. -func HvsockGUIDBroadcast() guid.GUID { // ffffffff-ffff-ffff-ffff-ffffffffffff - return guid.GUID{ - Data1: 0xffffffff, - Data2: 0xffff, - Data3: 0xffff, - Data4: [8]uint8{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - } -} - -// HvsockGUIDLoopback is the Loopback VmId for accepting connections to the same partition as the connector. -func HvsockGUIDLoopback() guid.GUID { // e0e16197-dd56-4a10-9195-5ee7a155a838 - return guid.GUID{ - Data1: 0xe0e16197, - Data2: 0xdd56, - Data3: 0x4a10, - Data4: [8]uint8{0x91, 0x95, 0x5e, 0xe7, 0xa1, 0x55, 0xa8, 0x38}, - } -} - -// HvsockGUIDSiloHost is the address of a silo's host partition: -// - The silo host of a hosted silo is the utility VM. -// - The silo host of a silo on a physical host is the physical host. -func HvsockGUIDSiloHost() guid.GUID { // 36bd0c5c-7276-4223-88ba-7d03b654c568 - return guid.GUID{ - Data1: 0x36bd0c5c, - Data2: 0x7276, - Data3: 0x4223, - Data4: [8]byte{0x88, 0xba, 0x7d, 0x03, 0xb6, 0x54, 0xc5, 0x68}, - } -} - -// HvsockGUIDChildren is the wildcard VmId for accepting connections from the connector's child partitions. -func HvsockGUIDChildren() guid.GUID { // 90db8b89-0d35-4f79-8ce9-49ea0ac8b7cd - return guid.GUID{ - Data1: 0x90db8b89, - Data2: 0xd35, - Data3: 0x4f79, - Data4: [8]uint8{0x8c, 0xe9, 0x49, 0xea, 0xa, 0xc8, 0xb7, 0xcd}, - } -} - -// HvsockGUIDParent is the wildcard VmId for accepting connections from the connector's parent partition. -// Listening on this VmId accepts connection from: -// - Inside silos: silo host partition. -// - Inside hosted silo: host of the VM. -// - Inside VM: VM host. -// - Physical host: Not supported. -func HvsockGUIDParent() guid.GUID { // a42e7cda-d03f-480c-9cc2-a4de20abb878 - return guid.GUID{ - Data1: 0xa42e7cda, - Data2: 0xd03f, - Data3: 0x480c, - Data4: [8]uint8{0x9c, 0xc2, 0xa4, 0xde, 0x20, 0xab, 0xb8, 0x78}, - } -} - -// hvsockVsockServiceTemplate is the Service GUID used for the VSOCK protocol. -func hvsockVsockServiceTemplate() guid.GUID { // 00000000-facb-11e6-bd58-64006a7986d3 - return guid.GUID{ - Data2: 0xfacb, - Data3: 0x11e6, - Data4: [8]uint8{0xbd, 0x58, 0x64, 0x00, 0x6a, 0x79, 0x86, 0xd3}, - } -} - -// An HvsockAddr is an address for a AF_HYPERV socket. -type HvsockAddr struct { - VMID guid.GUID - ServiceID guid.GUID -} - -type rawHvsockAddr struct { - Family uint16 - _ uint16 - VMID guid.GUID - ServiceID guid.GUID -} - -var _ socket.RawSockaddr = &rawHvsockAddr{} - -// Network returns the address's network name, "hvsock". -func (*HvsockAddr) Network() string { - return "hvsock" -} - -func (addr *HvsockAddr) String() string { - return fmt.Sprintf("%s:%s", &addr.VMID, &addr.ServiceID) -} - -// VsockServiceID returns an hvsock service ID corresponding to the specified AF_VSOCK port. -func VsockServiceID(port uint32) guid.GUID { - g := hvsockVsockServiceTemplate() // make a copy - g.Data1 = port - return g -} - -func (addr *HvsockAddr) raw() rawHvsockAddr { - return rawHvsockAddr{ - Family: afHVSock, - VMID: addr.VMID, - ServiceID: addr.ServiceID, - } -} - -func (addr *HvsockAddr) fromRaw(raw *rawHvsockAddr) { - addr.VMID = raw.VMID - addr.ServiceID = raw.ServiceID -} - -// Sockaddr returns a pointer to and the size of this struct. -// -// Implements the [socket.RawSockaddr] interface, and allows use in -// [socket.Bind] and [socket.ConnectEx]. -func (r *rawHvsockAddr) Sockaddr() (unsafe.Pointer, int32, error) { - return unsafe.Pointer(r), int32(unsafe.Sizeof(rawHvsockAddr{})), nil -} - -// Sockaddr interface allows use with `sockets.Bind()` and `.ConnectEx()`. -func (r *rawHvsockAddr) FromBytes(b []byte) error { - n := int(unsafe.Sizeof(rawHvsockAddr{})) - - if len(b) < n { - return fmt.Errorf("got %d, want %d: %w", len(b), n, socket.ErrBufferSize) - } - - copy(unsafe.Slice((*byte)(unsafe.Pointer(r)), n), b[:n]) - if r.Family != afHVSock { - return fmt.Errorf("got %d, want %d: %w", r.Family, afHVSock, socket.ErrAddrFamily) - } - - return nil -} - -// HvsockListener is a socket listener for the AF_HYPERV address family. -type HvsockListener struct { - sock *win32File - addr HvsockAddr -} - -var _ net.Listener = &HvsockListener{} - -// HvsockConn is a connected socket of the AF_HYPERV address family. -type HvsockConn struct { - sock *win32File - local, remote HvsockAddr -} - -var _ net.Conn = &HvsockConn{} - -func newHVSocket() (*win32File, error) { - fd, err := windows.Socket(afHVSock, windows.SOCK_STREAM, 1) - if err != nil { - return nil, os.NewSyscallError("socket", err) - } - f, err := makeWin32File(fd) - if err != nil { - windows.Close(fd) - return nil, err - } - f.socket = true - return f, nil -} - -// ListenHvsock listens for connections on the specified hvsock address. -func ListenHvsock(addr *HvsockAddr) (_ *HvsockListener, err error) { - l := &HvsockListener{addr: *addr} - - var sock *win32File - sock, err = newHVSocket() - if err != nil { - return nil, l.opErr("listen", err) - } - defer func() { - if err != nil { - _ = sock.Close() - } - }() - - sa := addr.raw() - err = socket.Bind(sock.handle, &sa) - if err != nil { - return nil, l.opErr("listen", os.NewSyscallError("socket", err)) - } - err = windows.Listen(sock.handle, 16) - if err != nil { - return nil, l.opErr("listen", os.NewSyscallError("listen", err)) - } - return &HvsockListener{sock: sock, addr: *addr}, nil -} - -func (l *HvsockListener) opErr(op string, err error) error { - return &net.OpError{Op: op, Net: "hvsock", Addr: &l.addr, Err: err} -} - -// Addr returns the listener's network address. -func (l *HvsockListener) Addr() net.Addr { - return &l.addr -} - -// Accept waits for the next connection and returns it. -func (l *HvsockListener) Accept() (_ net.Conn, err error) { - sock, err := newHVSocket() - if err != nil { - return nil, l.opErr("accept", err) - } - defer func() { - if sock != nil { - sock.Close() - } - }() - c, err := l.sock.prepareIO() - if err != nil { - return nil, l.opErr("accept", err) - } - defer l.sock.wg.Done() - - // AcceptEx, per documentation, requires an extra 16 bytes per address. - // - // https://docs.microsoft.com/en-us/windows/win32/api/mswsock/nf-mswsock-acceptex - const addrlen = uint32(16 + unsafe.Sizeof(rawHvsockAddr{})) - var addrbuf [addrlen * 2]byte - - var bytes uint32 - err = windows.AcceptEx(l.sock.handle, sock.handle, &addrbuf[0], 0 /* rxdatalen */, addrlen, addrlen, &bytes, &c.o) - if _, err = l.sock.asyncIO(c, nil, bytes, err); err != nil { - return nil, l.opErr("accept", os.NewSyscallError("acceptex", err)) - } - - conn := &HvsockConn{ - sock: sock, - } - // The local address returned in the AcceptEx buffer is the same as the Listener socket's - // address. However, the service GUID reported by GetSockName is different from the Listeners - // socket, and is sometimes the same as the local address of the socket that dialed the - // address, with the service GUID.Data1 incremented, but othertimes is different. - // todo: does the local address matter? is the listener's address or the actual address appropriate? - conn.local.fromRaw((*rawHvsockAddr)(unsafe.Pointer(&addrbuf[0]))) - conn.remote.fromRaw((*rawHvsockAddr)(unsafe.Pointer(&addrbuf[addrlen]))) - - // initialize the accepted socket and update its properties with those of the listening socket - if err = windows.Setsockopt(sock.handle, - windows.SOL_SOCKET, windows.SO_UPDATE_ACCEPT_CONTEXT, - (*byte)(unsafe.Pointer(&l.sock.handle)), int32(unsafe.Sizeof(l.sock.handle))); err != nil { - return nil, conn.opErr("accept", os.NewSyscallError("setsockopt", err)) - } - - sock = nil - return conn, nil -} - -// Close closes the listener, causing any pending Accept calls to fail. -func (l *HvsockListener) Close() error { - return l.sock.Close() -} - -// HvsockDialer configures and dials a Hyper-V Socket (ie, [HvsockConn]). -type HvsockDialer struct { - // Deadline is the time the Dial operation must connect before erroring. - Deadline time.Time - - // Retries is the number of additional connects to try if the connection times out, is refused, - // or the host is unreachable - Retries uint - - // RetryWait is the time to wait after a connection error to retry - RetryWait time.Duration - - rt *time.Timer // redial wait timer -} - -// Dial the Hyper-V socket at addr. -// -// See [HvsockDialer.Dial] for more information. -func Dial(ctx context.Context, addr *HvsockAddr) (conn *HvsockConn, err error) { - return (&HvsockDialer{}).Dial(ctx, addr) -} - -// Dial attempts to connect to the Hyper-V socket at addr, and returns a connection if successful. -// Will attempt (HvsockDialer).Retries if dialing fails, waiting (HvsockDialer).RetryWait between -// retries. -// -// Dialing can be cancelled either by providing (HvsockDialer).Deadline, or cancelling ctx. -func (d *HvsockDialer) Dial(ctx context.Context, addr *HvsockAddr) (conn *HvsockConn, err error) { - op := "dial" - // create the conn early to use opErr() - conn = &HvsockConn{ - remote: *addr, - } - - if !d.Deadline.IsZero() { - var cancel context.CancelFunc - ctx, cancel = context.WithDeadline(ctx, d.Deadline) - defer cancel() - } - - // preemptive timeout/cancellation check - if err = ctx.Err(); err != nil { - return nil, conn.opErr(op, err) - } - - sock, err := newHVSocket() - if err != nil { - return nil, conn.opErr(op, err) - } - defer func() { - if sock != nil { - sock.Close() - } - }() - - sa := addr.raw() - err = socket.Bind(sock.handle, &sa) - if err != nil { - return nil, conn.opErr(op, os.NewSyscallError("bind", err)) - } - - c, err := sock.prepareIO() - if err != nil { - return nil, conn.opErr(op, err) - } - defer sock.wg.Done() - var bytes uint32 - for i := uint(0); i <= d.Retries; i++ { - err = socket.ConnectEx( - sock.handle, - &sa, - nil, // sendBuf - 0, // sendDataLen - &bytes, - (*windows.Overlapped)(unsafe.Pointer(&c.o))) - _, err = sock.asyncIO(c, nil, bytes, err) - if i < d.Retries && canRedial(err) { - if err = d.redialWait(ctx); err == nil { - continue - } - } - break - } - if err != nil { - return nil, conn.opErr(op, os.NewSyscallError("connectex", err)) - } - - // update the connection properties, so shutdown can be used - if err = windows.Setsockopt( - sock.handle, - windows.SOL_SOCKET, - windows.SO_UPDATE_CONNECT_CONTEXT, - nil, // optvalue - 0, // optlen - ); err != nil { - return nil, conn.opErr(op, os.NewSyscallError("setsockopt", err)) - } - - // get the local name - var sal rawHvsockAddr - err = socket.GetSockName(sock.handle, &sal) - if err != nil { - return nil, conn.opErr(op, os.NewSyscallError("getsockname", err)) - } - conn.local.fromRaw(&sal) - - // one last check for timeout, since asyncIO doesn't check the context - if err = ctx.Err(); err != nil { - return nil, conn.opErr(op, err) - } - - conn.sock = sock - sock = nil - - return conn, nil -} - -// redialWait waits before attempting to redial, resetting the timer as appropriate. -func (d *HvsockDialer) redialWait(ctx context.Context) (err error) { - if d.RetryWait == 0 { - return nil - } - - if d.rt == nil { - d.rt = time.NewTimer(d.RetryWait) - } else { - // should already be stopped and drained - d.rt.Reset(d.RetryWait) - } - - select { - case <-ctx.Done(): - case <-d.rt.C: - return nil - } - - // stop and drain the timer - if !d.rt.Stop() { - <-d.rt.C - } - return ctx.Err() -} - -// assumes error is a plain, unwrapped windows.Errno provided by direct syscall. -func canRedial(err error) bool { - //nolint:errorlint // guaranteed to be an Errno - switch err { - case windows.WSAECONNREFUSED, windows.WSAENETUNREACH, windows.WSAETIMEDOUT, - windows.ERROR_CONNECTION_REFUSED, windows.ERROR_CONNECTION_UNAVAIL: - return true - default: - return false - } -} - -func (conn *HvsockConn) opErr(op string, err error) error { - // translate from "file closed" to "socket closed" - if errors.Is(err, ErrFileClosed) { - err = socket.ErrSocketClosed - } - return &net.OpError{Op: op, Net: "hvsock", Source: &conn.local, Addr: &conn.remote, Err: err} -} - -func (conn *HvsockConn) Read(b []byte) (int, error) { - c, err := conn.sock.prepareIO() - if err != nil { - return 0, conn.opErr("read", err) - } - defer conn.sock.wg.Done() - buf := windows.WSABuf{Buf: &b[0], Len: uint32(len(b))} - var flags, bytes uint32 - err = windows.WSARecv(conn.sock.handle, &buf, 1, &bytes, &flags, &c.o, nil) - n, err := conn.sock.asyncIO(c, &conn.sock.readDeadline, bytes, err) - if err != nil { - var eno windows.Errno - if errors.As(err, &eno) { - err = os.NewSyscallError("wsarecv", eno) - } - return 0, conn.opErr("read", err) - } else if n == 0 { - err = io.EOF - } - return n, err -} - -func (conn *HvsockConn) Write(b []byte) (int, error) { - t := 0 - for len(b) != 0 { - n, err := conn.write(b) - if err != nil { - return t + n, err - } - t += n - b = b[n:] - } - return t, nil -} - -func (conn *HvsockConn) write(b []byte) (int, error) { - c, err := conn.sock.prepareIO() - if err != nil { - return 0, conn.opErr("write", err) - } - defer conn.sock.wg.Done() - buf := windows.WSABuf{Buf: &b[0], Len: uint32(len(b))} - var bytes uint32 - err = windows.WSASend(conn.sock.handle, &buf, 1, &bytes, 0, &c.o, nil) - n, err := conn.sock.asyncIO(c, &conn.sock.writeDeadline, bytes, err) - if err != nil { - var eno windows.Errno - if errors.As(err, &eno) { - err = os.NewSyscallError("wsasend", eno) - } - return 0, conn.opErr("write", err) - } - return n, err -} - -// Close closes the socket connection, failing any pending read or write calls. -func (conn *HvsockConn) Close() error { - return conn.sock.Close() -} - -func (conn *HvsockConn) IsClosed() bool { - return conn.sock.IsClosed() -} - -// shutdown disables sending or receiving on a socket. -func (conn *HvsockConn) shutdown(how int) error { - if conn.IsClosed() { - return socket.ErrSocketClosed - } - - err := windows.Shutdown(conn.sock.handle, how) - if err != nil { - // If the connection was closed, shutdowns fail with "not connected" - if errors.Is(err, windows.WSAENOTCONN) || - errors.Is(err, windows.WSAESHUTDOWN) { - err = socket.ErrSocketClosed - } - return os.NewSyscallError("shutdown", err) - } - return nil -} - -// CloseRead shuts down the read end of the socket, preventing future read operations. -func (conn *HvsockConn) CloseRead() error { - err := conn.shutdown(windows.SHUT_RD) - if err != nil { - return conn.opErr("closeread", err) - } - return nil -} - -// CloseWrite shuts down the write end of the socket, preventing future write operations and -// notifying the other endpoint that no more data will be written. -func (conn *HvsockConn) CloseWrite() error { - err := conn.shutdown(windows.SHUT_WR) - if err != nil { - return conn.opErr("closewrite", err) - } - return nil -} - -// LocalAddr returns the local address of the connection. -func (conn *HvsockConn) LocalAddr() net.Addr { - return &conn.local -} - -// RemoteAddr returns the remote address of the connection. -func (conn *HvsockConn) RemoteAddr() net.Addr { - return &conn.remote -} - -// SetDeadline implements the net.Conn SetDeadline method. -func (conn *HvsockConn) SetDeadline(t time.Time) error { - // todo: implement `SetDeadline` for `win32File` - if err := conn.SetReadDeadline(t); err != nil { - return fmt.Errorf("set read deadline: %w", err) - } - if err := conn.SetWriteDeadline(t); err != nil { - return fmt.Errorf("set write deadline: %w", err) - } - return nil -} - -// SetReadDeadline implements the net.Conn SetReadDeadline method. -func (conn *HvsockConn) SetReadDeadline(t time.Time) error { - return conn.sock.SetReadDeadline(t) -} - -// SetWriteDeadline implements the net.Conn SetWriteDeadline method. -func (conn *HvsockConn) SetWriteDeadline(t time.Time) error { - return conn.sock.SetWriteDeadline(t) -} diff --git a/vendor/github.com/Microsoft/go-winio/internal/fs/doc.go b/vendor/github.com/Microsoft/go-winio/internal/fs/doc.go deleted file mode 100644 index 1f6538817..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/fs/doc.go +++ /dev/null @@ -1,2 +0,0 @@ -// This package contains Win32 filesystem functionality. -package fs diff --git a/vendor/github.com/Microsoft/go-winio/internal/fs/fs.go b/vendor/github.com/Microsoft/go-winio/internal/fs/fs.go deleted file mode 100644 index 0cd9621df..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/fs/fs.go +++ /dev/null @@ -1,262 +0,0 @@ -//go:build windows - -package fs - -import ( - "golang.org/x/sys/windows" - - "github.com/Microsoft/go-winio/internal/stringbuffer" -) - -//go:generate go run github.com/Microsoft/go-winio/tools/mkwinsyscall -output zsyscall_windows.go fs.go - -// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew -//sys CreateFile(name string, access AccessMask, mode FileShareMode, sa *windows.SecurityAttributes, createmode FileCreationDisposition, attrs FileFlagOrAttribute, templatefile windows.Handle) (handle windows.Handle, err error) [failretval==windows.InvalidHandle] = CreateFileW - -const NullHandle windows.Handle = 0 - -// AccessMask defines standard, specific, and generic rights. -// -// Used with CreateFile and NtCreateFile (and co.). -// -// Bitmask: -// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 -// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 -// +---------------+---------------+-------------------------------+ -// |G|G|G|G|Resvd|A| StandardRights| SpecificRights | -// |R|W|E|A| |S| | | -// +-+-------------+---------------+-------------------------------+ -// -// GR Generic Read -// GW Generic Write -// GE Generic Exectue -// GA Generic All -// Resvd Reserved -// AS Access Security System -// -// https://learn.microsoft.com/en-us/windows/win32/secauthz/access-mask -// -// https://learn.microsoft.com/en-us/windows/win32/secauthz/generic-access-rights -// -// https://learn.microsoft.com/en-us/windows/win32/fileio/file-access-rights-constants -type AccessMask = windows.ACCESS_MASK - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - // Not actually any. - // - // For CreateFile: "query certain metadata such as file, directory, or device attributes without accessing that file or device" - // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew#parameters - FILE_ANY_ACCESS AccessMask = 0 - - GENERIC_READ AccessMask = 0x8000_0000 - GENERIC_WRITE AccessMask = 0x4000_0000 - GENERIC_EXECUTE AccessMask = 0x2000_0000 - GENERIC_ALL AccessMask = 0x1000_0000 - ACCESS_SYSTEM_SECURITY AccessMask = 0x0100_0000 - - // Specific Object Access - // from ntioapi.h - - FILE_READ_DATA AccessMask = (0x0001) // file & pipe - FILE_LIST_DIRECTORY AccessMask = (0x0001) // directory - - FILE_WRITE_DATA AccessMask = (0x0002) // file & pipe - FILE_ADD_FILE AccessMask = (0x0002) // directory - - FILE_APPEND_DATA AccessMask = (0x0004) // file - FILE_ADD_SUBDIRECTORY AccessMask = (0x0004) // directory - FILE_CREATE_PIPE_INSTANCE AccessMask = (0x0004) // named pipe - - FILE_READ_EA AccessMask = (0x0008) // file & directory - FILE_READ_PROPERTIES AccessMask = FILE_READ_EA - - FILE_WRITE_EA AccessMask = (0x0010) // file & directory - FILE_WRITE_PROPERTIES AccessMask = FILE_WRITE_EA - - FILE_EXECUTE AccessMask = (0x0020) // file - FILE_TRAVERSE AccessMask = (0x0020) // directory - - FILE_DELETE_CHILD AccessMask = (0x0040) // directory - - FILE_READ_ATTRIBUTES AccessMask = (0x0080) // all - - FILE_WRITE_ATTRIBUTES AccessMask = (0x0100) // all - - FILE_ALL_ACCESS AccessMask = (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF) - FILE_GENERIC_READ AccessMask = (STANDARD_RIGHTS_READ | FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE) - FILE_GENERIC_WRITE AccessMask = (STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE) - FILE_GENERIC_EXECUTE AccessMask = (STANDARD_RIGHTS_EXECUTE | FILE_READ_ATTRIBUTES | FILE_EXECUTE | SYNCHRONIZE) - - SPECIFIC_RIGHTS_ALL AccessMask = 0x0000FFFF - - // Standard Access - // from ntseapi.h - - DELETE AccessMask = 0x0001_0000 - READ_CONTROL AccessMask = 0x0002_0000 - WRITE_DAC AccessMask = 0x0004_0000 - WRITE_OWNER AccessMask = 0x0008_0000 - SYNCHRONIZE AccessMask = 0x0010_0000 - - STANDARD_RIGHTS_REQUIRED AccessMask = 0x000F_0000 - - STANDARD_RIGHTS_READ AccessMask = READ_CONTROL - STANDARD_RIGHTS_WRITE AccessMask = READ_CONTROL - STANDARD_RIGHTS_EXECUTE AccessMask = READ_CONTROL - - STANDARD_RIGHTS_ALL AccessMask = 0x001F_0000 -) - -type FileShareMode uint32 - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - FILE_SHARE_NONE FileShareMode = 0x00 - FILE_SHARE_READ FileShareMode = 0x01 - FILE_SHARE_WRITE FileShareMode = 0x02 - FILE_SHARE_DELETE FileShareMode = 0x04 - FILE_SHARE_VALID_FLAGS FileShareMode = 0x07 -) - -type FileCreationDisposition uint32 - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - // from winbase.h - - CREATE_NEW FileCreationDisposition = 0x01 - CREATE_ALWAYS FileCreationDisposition = 0x02 - OPEN_EXISTING FileCreationDisposition = 0x03 - OPEN_ALWAYS FileCreationDisposition = 0x04 - TRUNCATE_EXISTING FileCreationDisposition = 0x05 -) - -// Create disposition values for NtCreate* -type NTFileCreationDisposition uint32 - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - // From ntioapi.h - - FILE_SUPERSEDE NTFileCreationDisposition = 0x00 - FILE_OPEN NTFileCreationDisposition = 0x01 - FILE_CREATE NTFileCreationDisposition = 0x02 - FILE_OPEN_IF NTFileCreationDisposition = 0x03 - FILE_OVERWRITE NTFileCreationDisposition = 0x04 - FILE_OVERWRITE_IF NTFileCreationDisposition = 0x05 - FILE_MAXIMUM_DISPOSITION NTFileCreationDisposition = 0x05 -) - -// CreateFile and co. take flags or attributes together as one parameter. -// Define alias until we can use generics to allow both -// -// https://learn.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants -type FileFlagOrAttribute uint32 - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - // from winnt.h - - FILE_FLAG_WRITE_THROUGH FileFlagOrAttribute = 0x8000_0000 - FILE_FLAG_OVERLAPPED FileFlagOrAttribute = 0x4000_0000 - FILE_FLAG_NO_BUFFERING FileFlagOrAttribute = 0x2000_0000 - FILE_FLAG_RANDOM_ACCESS FileFlagOrAttribute = 0x1000_0000 - FILE_FLAG_SEQUENTIAL_SCAN FileFlagOrAttribute = 0x0800_0000 - FILE_FLAG_DELETE_ON_CLOSE FileFlagOrAttribute = 0x0400_0000 - FILE_FLAG_BACKUP_SEMANTICS FileFlagOrAttribute = 0x0200_0000 - FILE_FLAG_POSIX_SEMANTICS FileFlagOrAttribute = 0x0100_0000 - FILE_FLAG_OPEN_REPARSE_POINT FileFlagOrAttribute = 0x0020_0000 - FILE_FLAG_OPEN_NO_RECALL FileFlagOrAttribute = 0x0010_0000 - FILE_FLAG_FIRST_PIPE_INSTANCE FileFlagOrAttribute = 0x0008_0000 -) - -// NtCreate* functions take a dedicated CreateOptions parameter. -// -// https://learn.microsoft.com/en-us/windows/win32/api/Winternl/nf-winternl-ntcreatefile -// -// https://learn.microsoft.com/en-us/windows/win32/devnotes/nt-create-named-pipe-file -type NTCreateOptions uint32 - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - // From ntioapi.h - - FILE_DIRECTORY_FILE NTCreateOptions = 0x0000_0001 - FILE_WRITE_THROUGH NTCreateOptions = 0x0000_0002 - FILE_SEQUENTIAL_ONLY NTCreateOptions = 0x0000_0004 - FILE_NO_INTERMEDIATE_BUFFERING NTCreateOptions = 0x0000_0008 - - FILE_SYNCHRONOUS_IO_ALERT NTCreateOptions = 0x0000_0010 - FILE_SYNCHRONOUS_IO_NONALERT NTCreateOptions = 0x0000_0020 - FILE_NON_DIRECTORY_FILE NTCreateOptions = 0x0000_0040 - FILE_CREATE_TREE_CONNECTION NTCreateOptions = 0x0000_0080 - - FILE_COMPLETE_IF_OPLOCKED NTCreateOptions = 0x0000_0100 - FILE_NO_EA_KNOWLEDGE NTCreateOptions = 0x0000_0200 - FILE_DISABLE_TUNNELING NTCreateOptions = 0x0000_0400 - FILE_RANDOM_ACCESS NTCreateOptions = 0x0000_0800 - - FILE_DELETE_ON_CLOSE NTCreateOptions = 0x0000_1000 - FILE_OPEN_BY_FILE_ID NTCreateOptions = 0x0000_2000 - FILE_OPEN_FOR_BACKUP_INTENT NTCreateOptions = 0x0000_4000 - FILE_NO_COMPRESSION NTCreateOptions = 0x0000_8000 -) - -type FileSQSFlag = FileFlagOrAttribute - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - // from winbase.h - - SECURITY_ANONYMOUS FileSQSFlag = FileSQSFlag(SecurityAnonymous << 16) - SECURITY_IDENTIFICATION FileSQSFlag = FileSQSFlag(SecurityIdentification << 16) - SECURITY_IMPERSONATION FileSQSFlag = FileSQSFlag(SecurityImpersonation << 16) - SECURITY_DELEGATION FileSQSFlag = FileSQSFlag(SecurityDelegation << 16) - - SECURITY_SQOS_PRESENT FileSQSFlag = 0x0010_0000 - SECURITY_VALID_SQOS_FLAGS FileSQSFlag = 0x001F_0000 -) - -// GetFinalPathNameByHandle flags -// -// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfinalpathnamebyhandlew#parameters -type GetFinalPathFlag uint32 - -//nolint:revive // SNAKE_CASE is not idiomatic in Go, but aligned with Win32 API. -const ( - GetFinalPathDefaultFlag GetFinalPathFlag = 0x0 - - FILE_NAME_NORMALIZED GetFinalPathFlag = 0x0 - FILE_NAME_OPENED GetFinalPathFlag = 0x8 - - VOLUME_NAME_DOS GetFinalPathFlag = 0x0 - VOLUME_NAME_GUID GetFinalPathFlag = 0x1 - VOLUME_NAME_NT GetFinalPathFlag = 0x2 - VOLUME_NAME_NONE GetFinalPathFlag = 0x4 -) - -// getFinalPathNameByHandle facilitates calling the Windows API GetFinalPathNameByHandle -// with the given handle and flags. It transparently takes care of creating a buffer of the -// correct size for the call. -// -// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfinalpathnamebyhandlew -func GetFinalPathNameByHandle(h windows.Handle, flags GetFinalPathFlag) (string, error) { - b := stringbuffer.NewWString() - //TODO: can loop infinitely if Win32 keeps returning the same (or a larger) n? - for { - n, err := windows.GetFinalPathNameByHandle(h, b.Pointer(), b.Cap(), uint32(flags)) - if err != nil { - return "", err - } - // If the buffer wasn't large enough, n will be the total size needed (including null terminator). - // Resize and try again. - if n > b.Cap() { - b.ResizeTo(n) - continue - } - // If the buffer is large enough, n will be the size not including the null terminator. - // Convert to a Go string and return. - return b.String(), nil - } -} diff --git a/vendor/github.com/Microsoft/go-winio/internal/fs/security.go b/vendor/github.com/Microsoft/go-winio/internal/fs/security.go deleted file mode 100644 index 81760ac67..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/fs/security.go +++ /dev/null @@ -1,12 +0,0 @@ -package fs - -// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ne-winnt-security_impersonation_level -type SecurityImpersonationLevel int32 // C default enums underlying type is `int`, which is Go `int32` - -// Impersonation levels -const ( - SecurityAnonymous SecurityImpersonationLevel = 0 - SecurityIdentification SecurityImpersonationLevel = 1 - SecurityImpersonation SecurityImpersonationLevel = 2 - SecurityDelegation SecurityImpersonationLevel = 3 -) diff --git a/vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.go b/vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.go deleted file mode 100644 index a94e234c7..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.go +++ /dev/null @@ -1,61 +0,0 @@ -//go:build windows - -// Code generated by 'go generate' using "github.com/Microsoft/go-winio/tools/mkwinsyscall"; DO NOT EDIT. - -package fs - -import ( - "syscall" - "unsafe" - - "golang.org/x/sys/windows" -) - -var _ unsafe.Pointer - -// Do the interface allocations only once for common -// Errno values. -const ( - errnoERROR_IO_PENDING = 997 -) - -var ( - errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) - errERROR_EINVAL error = syscall.EINVAL -) - -// errnoErr returns common boxed Errno values, to prevent -// allocations at runtime. -func errnoErr(e syscall.Errno) error { - switch e { - case 0: - return errERROR_EINVAL - case errnoERROR_IO_PENDING: - return errERROR_IO_PENDING - } - return e -} - -var ( - modkernel32 = windows.NewLazySystemDLL("kernel32.dll") - - procCreateFileW = modkernel32.NewProc("CreateFileW") -) - -func CreateFile(name string, access AccessMask, mode FileShareMode, sa *windows.SecurityAttributes, createmode FileCreationDisposition, attrs FileFlagOrAttribute, templatefile windows.Handle) (handle windows.Handle, err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(name) - if err != nil { - return - } - return _CreateFile(_p0, access, mode, sa, createmode, attrs, templatefile) -} - -func _CreateFile(name *uint16, access AccessMask, mode FileShareMode, sa *windows.SecurityAttributes, createmode FileCreationDisposition, attrs FileFlagOrAttribute, templatefile windows.Handle) (handle windows.Handle, err error) { - r0, _, e1 := syscall.SyscallN(procCreateFileW.Addr(), uintptr(unsafe.Pointer(name)), uintptr(access), uintptr(mode), uintptr(unsafe.Pointer(sa)), uintptr(createmode), uintptr(attrs), uintptr(templatefile)) - handle = windows.Handle(r0) - if handle == windows.InvalidHandle { - err = errnoErr(e1) - } - return -} diff --git a/vendor/github.com/Microsoft/go-winio/internal/socket/rawaddr.go b/vendor/github.com/Microsoft/go-winio/internal/socket/rawaddr.go deleted file mode 100644 index 7e82f9afa..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/socket/rawaddr.go +++ /dev/null @@ -1,20 +0,0 @@ -package socket - -import ( - "unsafe" -) - -// RawSockaddr allows structs to be used with [Bind] and [ConnectEx]. The -// struct must meet the Win32 sockaddr requirements specified here: -// https://docs.microsoft.com/en-us/windows/win32/winsock/sockaddr-2 -// -// Specifically, the struct size must be least larger than an int16 (unsigned short) -// for the address family. -type RawSockaddr interface { - // Sockaddr returns a pointer to the RawSockaddr and its struct size, allowing - // for the RawSockaddr's data to be overwritten by syscalls (if necessary). - // - // It is the callers responsibility to validate that the values are valid; invalid - // pointers or size can cause a panic. - Sockaddr() (unsafe.Pointer, int32, error) -} diff --git a/vendor/github.com/Microsoft/go-winio/internal/socket/socket.go b/vendor/github.com/Microsoft/go-winio/internal/socket/socket.go deleted file mode 100644 index 88580d974..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/socket/socket.go +++ /dev/null @@ -1,177 +0,0 @@ -//go:build windows - -package socket - -import ( - "errors" - "fmt" - "net" - "sync" - "syscall" - "unsafe" - - "github.com/Microsoft/go-winio/pkg/guid" - "golang.org/x/sys/windows" -) - -//go:generate go run github.com/Microsoft/go-winio/tools/mkwinsyscall -output zsyscall_windows.go socket.go - -//sys getsockname(s windows.Handle, name unsafe.Pointer, namelen *int32) (err error) [failretval==socketError] = ws2_32.getsockname -//sys getpeername(s windows.Handle, name unsafe.Pointer, namelen *int32) (err error) [failretval==socketError] = ws2_32.getpeername -//sys bind(s windows.Handle, name unsafe.Pointer, namelen int32) (err error) [failretval==socketError] = ws2_32.bind - -const socketError = uintptr(^uint32(0)) - -var ( - // todo(helsaawy): create custom error types to store the desired vs actual size and addr family? - - ErrBufferSize = errors.New("buffer size") - ErrAddrFamily = errors.New("address family") - ErrInvalidPointer = errors.New("invalid pointer") - ErrSocketClosed = fmt.Errorf("socket closed: %w", net.ErrClosed) -) - -// todo(helsaawy): replace these with generics, ie: GetSockName[S RawSockaddr](s windows.Handle) (S, error) - -// GetSockName writes the local address of socket s to the [RawSockaddr] rsa. -// If rsa is not large enough, the [windows.WSAEFAULT] is returned. -func GetSockName(s windows.Handle, rsa RawSockaddr) error { - ptr, l, err := rsa.Sockaddr() - if err != nil { - return fmt.Errorf("could not retrieve socket pointer and size: %w", err) - } - - // although getsockname returns WSAEFAULT if the buffer is too small, it does not set - // &l to the correct size, so--apart from doubling the buffer repeatedly--there is no remedy - return getsockname(s, ptr, &l) -} - -// GetPeerName returns the remote address the socket is connected to. -// -// See [GetSockName] for more information. -func GetPeerName(s windows.Handle, rsa RawSockaddr) error { - ptr, l, err := rsa.Sockaddr() - if err != nil { - return fmt.Errorf("could not retrieve socket pointer and size: %w", err) - } - - return getpeername(s, ptr, &l) -} - -func Bind(s windows.Handle, rsa RawSockaddr) (err error) { - ptr, l, err := rsa.Sockaddr() - if err != nil { - return fmt.Errorf("could not retrieve socket pointer and size: %w", err) - } - - return bind(s, ptr, l) -} - -// "golang.org/x/sys/windows".ConnectEx and .Bind only accept internal implementations of the -// their sockaddr interface, so they cannot be used with HvsockAddr -// Replicate functionality here from -// https://cs.opensource.google/go/x/sys/+/master:windows/syscall_windows.go - -// The function pointers to `AcceptEx`, `ConnectEx` and `GetAcceptExSockaddrs` must be loaded at -// runtime via a WSAIoctl call: -// https://docs.microsoft.com/en-us/windows/win32/api/Mswsock/nc-mswsock-lpfn_connectex#remarks - -type runtimeFunc struct { - id guid.GUID - once sync.Once - addr uintptr - err error -} - -func (f *runtimeFunc) Load() error { - f.once.Do(func() { - var s windows.Handle - s, f.err = windows.Socket(windows.AF_INET, windows.SOCK_STREAM, windows.IPPROTO_TCP) - if f.err != nil { - return - } - defer windows.CloseHandle(s) //nolint:errcheck - - var n uint32 - f.err = windows.WSAIoctl(s, - windows.SIO_GET_EXTENSION_FUNCTION_POINTER, - (*byte)(unsafe.Pointer(&f.id)), - uint32(unsafe.Sizeof(f.id)), - (*byte)(unsafe.Pointer(&f.addr)), - uint32(unsafe.Sizeof(f.addr)), - &n, - nil, // overlapped - 0, // completionRoutine - ) - }) - return f.err -} - -var ( - // todo: add `AcceptEx` and `GetAcceptExSockaddrs` - WSAID_CONNECTEX = guid.GUID{ //revive:disable-line:var-naming ALL_CAPS - Data1: 0x25a207b9, - Data2: 0xddf3, - Data3: 0x4660, - Data4: [8]byte{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e}, - } - - connectExFunc = runtimeFunc{id: WSAID_CONNECTEX} -) - -func ConnectEx( - fd windows.Handle, - rsa RawSockaddr, - sendBuf *byte, - sendDataLen uint32, - bytesSent *uint32, - overlapped *windows.Overlapped, -) error { - if err := connectExFunc.Load(); err != nil { - return fmt.Errorf("failed to load ConnectEx function pointer: %w", err) - } - ptr, n, err := rsa.Sockaddr() - if err != nil { - return err - } - return connectEx(fd, ptr, n, sendBuf, sendDataLen, bytesSent, overlapped) -} - -// BOOL LpfnConnectex( -// [in] SOCKET s, -// [in] const sockaddr *name, -// [in] int namelen, -// [in, optional] PVOID lpSendBuffer, -// [in] DWORD dwSendDataLength, -// [out] LPDWORD lpdwBytesSent, -// [in] LPOVERLAPPED lpOverlapped -// ) - -func connectEx( - s windows.Handle, - name unsafe.Pointer, - namelen int32, - sendBuf *byte, - sendDataLen uint32, - bytesSent *uint32, - overlapped *windows.Overlapped, -) (err error) { - r1, _, e1 := syscall.SyscallN(connectExFunc.addr, - uintptr(s), - uintptr(name), - uintptr(namelen), - uintptr(unsafe.Pointer(sendBuf)), - uintptr(sendDataLen), - uintptr(unsafe.Pointer(bytesSent)), - uintptr(unsafe.Pointer(overlapped)), - ) - - if r1 == 0 { - if e1 != 0 { - err = error(e1) - } else { - err = syscall.EINVAL - } - } - return err -} diff --git a/vendor/github.com/Microsoft/go-winio/internal/socket/zsyscall_windows.go b/vendor/github.com/Microsoft/go-winio/internal/socket/zsyscall_windows.go deleted file mode 100644 index e1504126a..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/socket/zsyscall_windows.go +++ /dev/null @@ -1,69 +0,0 @@ -//go:build windows - -// Code generated by 'go generate' using "github.com/Microsoft/go-winio/tools/mkwinsyscall"; DO NOT EDIT. - -package socket - -import ( - "syscall" - "unsafe" - - "golang.org/x/sys/windows" -) - -var _ unsafe.Pointer - -// Do the interface allocations only once for common -// Errno values. -const ( - errnoERROR_IO_PENDING = 997 -) - -var ( - errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) - errERROR_EINVAL error = syscall.EINVAL -) - -// errnoErr returns common boxed Errno values, to prevent -// allocations at runtime. -func errnoErr(e syscall.Errno) error { - switch e { - case 0: - return errERROR_EINVAL - case errnoERROR_IO_PENDING: - return errERROR_IO_PENDING - } - return e -} - -var ( - modws2_32 = windows.NewLazySystemDLL("ws2_32.dll") - - procbind = modws2_32.NewProc("bind") - procgetpeername = modws2_32.NewProc("getpeername") - procgetsockname = modws2_32.NewProc("getsockname") -) - -func bind(s windows.Handle, name unsafe.Pointer, namelen int32) (err error) { - r1, _, e1 := syscall.SyscallN(procbind.Addr(), uintptr(s), uintptr(name), uintptr(namelen)) - if r1 == socketError { - err = errnoErr(e1) - } - return -} - -func getpeername(s windows.Handle, name unsafe.Pointer, namelen *int32) (err error) { - r1, _, e1 := syscall.SyscallN(procgetpeername.Addr(), uintptr(s), uintptr(name), uintptr(unsafe.Pointer(namelen))) - if r1 == socketError { - err = errnoErr(e1) - } - return -} - -func getsockname(s windows.Handle, name unsafe.Pointer, namelen *int32) (err error) { - r1, _, e1 := syscall.SyscallN(procgetsockname.Addr(), uintptr(s), uintptr(name), uintptr(unsafe.Pointer(namelen))) - if r1 == socketError { - err = errnoErr(e1) - } - return -} diff --git a/vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.go b/vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.go deleted file mode 100644 index 42ebc019f..000000000 --- a/vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.go +++ /dev/null @@ -1,132 +0,0 @@ -package stringbuffer - -import ( - "sync" - "unicode/utf16" -) - -// TODO: worth exporting and using in mkwinsyscall? - -// Uint16BufferSize is the buffer size in the pool, chosen somewhat arbitrarily to accommodate -// large path strings: -// MAX_PATH (260) + size of volume GUID prefix (49) + null terminator = 310. -const MinWStringCap = 310 - -// use *[]uint16 since []uint16 creates an extra allocation where the slice header -// is copied to heap and then referenced via pointer in the interface header that sync.Pool -// stores. -var pathPool = sync.Pool{ // if go1.18+ adds Pool[T], use that to store []uint16 directly - New: func() interface{} { - b := make([]uint16, MinWStringCap) - return &b - }, -} - -func newBuffer() []uint16 { return *(pathPool.Get().(*[]uint16)) } - -// freeBuffer copies the slice header data, and puts a pointer to that in the pool. -// This avoids taking a pointer to the slice header in WString, which can be set to nil. -func freeBuffer(b []uint16) { pathPool.Put(&b) } - -// WString is a wide string buffer ([]uint16) meant for storing UTF-16 encoded strings -// for interacting with Win32 APIs. -// Sizes are specified as uint32 and not int. -// -// It is not thread safe. -type WString struct { - // type-def allows casting to []uint16 directly, use struct to prevent that and allow adding fields in the future. - - // raw buffer - b []uint16 -} - -// NewWString returns a [WString] allocated from a shared pool with an -// initial capacity of at least [MinWStringCap]. -// Since the buffer may have been previously used, its contents are not guaranteed to be empty. -// -// The buffer should be freed via [WString.Free] -func NewWString() *WString { - return &WString{ - b: newBuffer(), - } -} - -func (b *WString) Free() { - if b.empty() { - return - } - freeBuffer(b.b) - b.b = nil -} - -// ResizeTo grows the buffer to at least c and returns the new capacity, freeing the -// previous buffer back into pool. -func (b *WString) ResizeTo(c uint32) uint32 { - // already sufficient (or n is 0) - if c <= b.Cap() { - return b.Cap() - } - - if c <= MinWStringCap { - c = MinWStringCap - } - // allocate at-least double buffer size, as is done in [bytes.Buffer] and other places - if c <= 2*b.Cap() { - c = 2 * b.Cap() - } - - b2 := make([]uint16, c) - if !b.empty() { - copy(b2, b.b) - freeBuffer(b.b) - } - b.b = b2 - return c -} - -// Buffer returns the underlying []uint16 buffer. -func (b *WString) Buffer() []uint16 { - if b.empty() { - return nil - } - return b.b -} - -// Pointer returns a pointer to the first uint16 in the buffer. -// If the [WString.Free] has already been called, the pointer will be nil. -func (b *WString) Pointer() *uint16 { - if b.empty() { - return nil - } - return &b.b[0] -} - -// String returns the returns the UTF-8 encoding of the UTF-16 string in the buffer. -// -// It assumes that the data is null-terminated. -func (b *WString) String() string { - // Using [windows.UTF16ToString] would require importing "golang.org/x/sys/windows" - // and would make this code Windows-only, which makes no sense. - // So copy UTF16ToString code into here. - // If other windows-specific code is added, switch to [windows.UTF16ToString] - - s := b.b - for i, v := range s { - if v == 0 { - s = s[:i] - break - } - } - return string(utf16.Decode(s)) -} - -// Cap returns the underlying buffer capacity. -func (b *WString) Cap() uint32 { - if b.empty() { - return 0 - } - return b.cap() -} - -func (b *WString) cap() uint32 { return uint32(cap(b.b)) } -func (b *WString) empty() bool { return b == nil || b.cap() == 0 } diff --git a/vendor/github.com/Microsoft/go-winio/pipe.go b/vendor/github.com/Microsoft/go-winio/pipe.go deleted file mode 100644 index a2da6639d..000000000 --- a/vendor/github.com/Microsoft/go-winio/pipe.go +++ /dev/null @@ -1,586 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "context" - "errors" - "fmt" - "io" - "net" - "os" - "runtime" - "time" - "unsafe" - - "golang.org/x/sys/windows" - - "github.com/Microsoft/go-winio/internal/fs" -) - -//sys connectNamedPipe(pipe windows.Handle, o *windows.Overlapped) (err error) = ConnectNamedPipe -//sys createNamedPipe(name string, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *windows.SecurityAttributes) (handle windows.Handle, err error) [failretval==windows.InvalidHandle] = CreateNamedPipeW -//sys disconnectNamedPipe(pipe windows.Handle) (err error) = DisconnectNamedPipe -//sys getNamedPipeInfo(pipe windows.Handle, flags *uint32, outSize *uint32, inSize *uint32, maxInstances *uint32) (err error) = GetNamedPipeInfo -//sys getNamedPipeHandleState(pipe windows.Handle, state *uint32, curInstances *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName *uint16, maxUserNameSize uint32) (err error) = GetNamedPipeHandleStateW -//sys ntCreateNamedPipeFile(pipe *windows.Handle, access ntAccessMask, oa *objectAttributes, iosb *ioStatusBlock, share ntFileShareMode, disposition ntFileCreationDisposition, options ntFileOptions, typ uint32, readMode uint32, completionMode uint32, maxInstances uint32, inboundQuota uint32, outputQuota uint32, timeout *int64) (status ntStatus) = ntdll.NtCreateNamedPipeFile -//sys rtlNtStatusToDosError(status ntStatus) (winerr error) = ntdll.RtlNtStatusToDosErrorNoTeb -//sys rtlDosPathNameToNtPathName(name *uint16, ntName *unicodeString, filePart uintptr, reserved uintptr) (status ntStatus) = ntdll.RtlDosPathNameToNtPathName_U -//sys rtlDefaultNpAcl(dacl *uintptr) (status ntStatus) = ntdll.RtlDefaultNpAcl - -type PipeConn interface { - net.Conn - Disconnect() error - Flush() error -} - -// type aliases for mkwinsyscall code -type ( - ntAccessMask = fs.AccessMask - ntFileShareMode = fs.FileShareMode - ntFileCreationDisposition = fs.NTFileCreationDisposition - ntFileOptions = fs.NTCreateOptions -) - -type ioStatusBlock struct { - Status, Information uintptr -} - -// typedef struct _OBJECT_ATTRIBUTES { -// ULONG Length; -// HANDLE RootDirectory; -// PUNICODE_STRING ObjectName; -// ULONG Attributes; -// PVOID SecurityDescriptor; -// PVOID SecurityQualityOfService; -// } OBJECT_ATTRIBUTES; -// -// https://learn.microsoft.com/en-us/windows/win32/api/ntdef/ns-ntdef-_object_attributes -type objectAttributes struct { - Length uintptr - RootDirectory uintptr - ObjectName *unicodeString - Attributes uintptr - SecurityDescriptor *securityDescriptor - SecurityQoS uintptr -} - -type unicodeString struct { - Length uint16 - MaximumLength uint16 - Buffer uintptr -} - -// typedef struct _SECURITY_DESCRIPTOR { -// BYTE Revision; -// BYTE Sbz1; -// SECURITY_DESCRIPTOR_CONTROL Control; -// PSID Owner; -// PSID Group; -// PACL Sacl; -// PACL Dacl; -// } SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; -// -// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-security_descriptor -type securityDescriptor struct { - Revision byte - Sbz1 byte - Control uint16 - Owner uintptr - Group uintptr - Sacl uintptr //revive:disable-line:var-naming SACL, not Sacl - Dacl uintptr //revive:disable-line:var-naming DACL, not Dacl -} - -type ntStatus int32 - -func (status ntStatus) Err() error { - if status >= 0 { - return nil - } - return rtlNtStatusToDosError(status) -} - -var ( - // ErrPipeListenerClosed is returned for pipe operations on listeners that have been closed. - ErrPipeListenerClosed = net.ErrClosed - - errPipeWriteClosed = errors.New("pipe has been closed for write") -) - -type win32Pipe struct { - *win32File - path string -} - -var _ PipeConn = (*win32Pipe)(nil) - -type win32MessageBytePipe struct { - win32Pipe - writeClosed bool - readEOF bool -} - -type pipeAddress string - -func (f *win32Pipe) LocalAddr() net.Addr { - return pipeAddress(f.path) -} - -func (f *win32Pipe) RemoteAddr() net.Addr { - return pipeAddress(f.path) -} - -func (f *win32Pipe) SetDeadline(t time.Time) error { - if err := f.SetReadDeadline(t); err != nil { - return err - } - return f.SetWriteDeadline(t) -} - -func (f *win32Pipe) Disconnect() error { - return disconnectNamedPipe(f.win32File.handle) -} - -// CloseWrite closes the write side of a message pipe in byte mode. -func (f *win32MessageBytePipe) CloseWrite() error { - if f.writeClosed { - return errPipeWriteClosed - } - err := f.win32File.Flush() - if err != nil { - return err - } - _, err = f.win32File.Write(nil) - if err != nil { - return err - } - f.writeClosed = true - return nil -} - -// Write writes bytes to a message pipe in byte mode. Zero-byte writes are ignored, since -// they are used to implement CloseWrite(). -func (f *win32MessageBytePipe) Write(b []byte) (int, error) { - if f.writeClosed { - return 0, errPipeWriteClosed - } - if len(b) == 0 { - return 0, nil - } - return f.win32File.Write(b) -} - -// Read reads bytes from a message pipe in byte mode. A read of a zero-byte message on a message -// mode pipe will return io.EOF, as will all subsequent reads. -func (f *win32MessageBytePipe) Read(b []byte) (int, error) { - if f.readEOF { - return 0, io.EOF - } - n, err := f.win32File.Read(b) - if err == io.EOF { //nolint:errorlint - // If this was the result of a zero-byte read, then - // it is possible that the read was due to a zero-size - // message. Since we are simulating CloseWrite with a - // zero-byte message, ensure that all future Read() calls - // also return EOF. - f.readEOF = true - } else if err == windows.ERROR_MORE_DATA { //nolint:errorlint // err is Errno - // ERROR_MORE_DATA indicates that the pipe's read mode is message mode - // and the message still has more bytes. Treat this as a success, since - // this package presents all named pipes as byte streams. - err = nil - } - return n, err -} - -func (pipeAddress) Network() string { - return "pipe" -} - -func (s pipeAddress) String() string { - return string(s) -} - -// tryDialPipe attempts to dial the pipe at `path` until `ctx` cancellation or timeout. -func tryDialPipe(ctx context.Context, path *string, access fs.AccessMask, impLevel PipeImpLevel) (windows.Handle, error) { - for { - select { - case <-ctx.Done(): - return windows.Handle(0), ctx.Err() - default: - h, err := fs.CreateFile(*path, - access, - 0, // mode - nil, // security attributes - fs.OPEN_EXISTING, - fs.FILE_FLAG_OVERLAPPED|fs.SECURITY_SQOS_PRESENT|fs.FileSQSFlag(impLevel), - 0, // template file handle - ) - if err == nil { - return h, nil - } - if err != windows.ERROR_PIPE_BUSY { //nolint:errorlint // err is Errno - return h, &os.PathError{Err: err, Op: "open", Path: *path} - } - // Wait 10 msec and try again. This is a rather simplistic - // view, as we always try each 10 milliseconds. - time.Sleep(10 * time.Millisecond) - } - } -} - -// DialPipe connects to a named pipe by path, timing out if the connection -// takes longer than the specified duration. If timeout is nil, then we use -// a default timeout of 2 seconds. (We do not use WaitNamedPipe.) -func DialPipe(path string, timeout *time.Duration) (net.Conn, error) { - var absTimeout time.Time - if timeout != nil { - absTimeout = time.Now().Add(*timeout) - } else { - absTimeout = time.Now().Add(2 * time.Second) - } - ctx, cancel := context.WithDeadline(context.Background(), absTimeout) - defer cancel() - conn, err := DialPipeContext(ctx, path) - if errors.Is(err, context.DeadlineExceeded) { - return nil, ErrTimeout - } - return conn, err -} - -// DialPipeContext attempts to connect to a named pipe by `path` until `ctx` -// cancellation or timeout. -func DialPipeContext(ctx context.Context, path string) (net.Conn, error) { - return DialPipeAccess(ctx, path, uint32(fs.GENERIC_READ|fs.GENERIC_WRITE)) -} - -// PipeImpLevel is an enumeration of impersonation levels that may be set -// when calling DialPipeAccessImpersonation. -type PipeImpLevel uint32 - -const ( - PipeImpLevelAnonymous = PipeImpLevel(fs.SECURITY_ANONYMOUS) - PipeImpLevelIdentification = PipeImpLevel(fs.SECURITY_IDENTIFICATION) - PipeImpLevelImpersonation = PipeImpLevel(fs.SECURITY_IMPERSONATION) - PipeImpLevelDelegation = PipeImpLevel(fs.SECURITY_DELEGATION) -) - -// DialPipeAccess attempts to connect to a named pipe by `path` with `access` until `ctx` -// cancellation or timeout. -func DialPipeAccess(ctx context.Context, path string, access uint32) (net.Conn, error) { - return DialPipeAccessImpLevel(ctx, path, access, PipeImpLevelAnonymous) -} - -// DialPipeAccessImpLevel attempts to connect to a named pipe by `path` with -// `access` at `impLevel` until `ctx` cancellation or timeout. The other -// DialPipe* implementations use PipeImpLevelAnonymous. -func DialPipeAccessImpLevel(ctx context.Context, path string, access uint32, impLevel PipeImpLevel) (net.Conn, error) { - var err error - var h windows.Handle - h, err = tryDialPipe(ctx, &path, fs.AccessMask(access), impLevel) - if err != nil { - return nil, err - } - - var flags uint32 - err = getNamedPipeInfo(h, &flags, nil, nil, nil) - if err != nil { - return nil, err - } - - f, err := makeWin32File(h) - if err != nil { - windows.Close(h) - return nil, err - } - - // If the pipe is in message mode, return a message byte pipe, which - // supports CloseWrite(). - if flags&windows.PIPE_TYPE_MESSAGE != 0 { - return &win32MessageBytePipe{ - win32Pipe: win32Pipe{win32File: f, path: path}, - }, nil - } - return &win32Pipe{win32File: f, path: path}, nil -} - -type acceptResponse struct { - f *win32File - err error -} - -type win32PipeListener struct { - firstHandle windows.Handle - path string - config PipeConfig - acceptCh chan (chan acceptResponse) - closeCh chan int - doneCh chan int -} - -func makeServerPipeHandle(path string, sd []byte, c *PipeConfig, first bool) (windows.Handle, error) { - path16, err := windows.UTF16FromString(path) - if err != nil { - return 0, &os.PathError{Op: "open", Path: path, Err: err} - } - - var oa objectAttributes - oa.Length = unsafe.Sizeof(oa) - - var ntPath unicodeString - if err := rtlDosPathNameToNtPathName(&path16[0], - &ntPath, - 0, - 0, - ).Err(); err != nil { - return 0, &os.PathError{Op: "open", Path: path, Err: err} - } - defer windows.LocalFree(windows.Handle(ntPath.Buffer)) //nolint:errcheck - oa.ObjectName = &ntPath - oa.Attributes = windows.OBJ_CASE_INSENSITIVE - - // The security descriptor is only needed for the first pipe. - if first { - if sd != nil { - //todo: does `sdb` need to be allocated on the heap, or can go allocate it? - l := uint32(len(sd)) - sdb, err := windows.LocalAlloc(0, l) - if err != nil { - return 0, fmt.Errorf("LocalAlloc for security descriptor with of length %d: %w", l, err) - } - defer windows.LocalFree(windows.Handle(sdb)) //nolint:errcheck - copy((*[0xffff]byte)(unsafe.Pointer(sdb))[:], sd) - oa.SecurityDescriptor = (*securityDescriptor)(unsafe.Pointer(sdb)) - } else { - // Construct the default named pipe security descriptor. - var dacl uintptr - if err := rtlDefaultNpAcl(&dacl).Err(); err != nil { - return 0, fmt.Errorf("getting default named pipe ACL: %w", err) - } - defer windows.LocalFree(windows.Handle(dacl)) //nolint:errcheck - - sdb := &securityDescriptor{ - Revision: 1, - Control: windows.SE_DACL_PRESENT, - Dacl: dacl, - } - oa.SecurityDescriptor = sdb - } - } - - typ := uint32(windows.FILE_PIPE_REJECT_REMOTE_CLIENTS) - if c.MessageMode { - typ |= windows.FILE_PIPE_MESSAGE_TYPE - } - - disposition := fs.FILE_OPEN - access := fs.GENERIC_READ | fs.GENERIC_WRITE | fs.SYNCHRONIZE - if first { - disposition = fs.FILE_CREATE - // By not asking for read or write access, the named pipe file system - // will put this pipe into an initially disconnected state, blocking - // client connections until the next call with first == false. - access = fs.SYNCHRONIZE - } - - timeout := int64(-50 * 10000) // 50ms - - var ( - h windows.Handle - iosb ioStatusBlock - ) - err = ntCreateNamedPipeFile(&h, - access, - &oa, - &iosb, - fs.FILE_SHARE_READ|fs.FILE_SHARE_WRITE, - disposition, - 0, - typ, - 0, - 0, - 0xffffffff, - uint32(c.InputBufferSize), - uint32(c.OutputBufferSize), - &timeout).Err() - if err != nil { - return 0, &os.PathError{Op: "open", Path: path, Err: err} - } - - runtime.KeepAlive(ntPath) - return h, nil -} - -func (l *win32PipeListener) makeServerPipe() (*win32File, error) { - h, err := makeServerPipeHandle(l.path, nil, &l.config, false) - if err != nil { - return nil, err - } - f, err := makeWin32File(h) - if err != nil { - windows.Close(h) - return nil, err - } - return f, nil -} - -func (l *win32PipeListener) makeConnectedServerPipe() (*win32File, error) { - p, err := l.makeServerPipe() - if err != nil { - return nil, err - } - - // Wait for the client to connect. - ch := make(chan error) - go func(p *win32File) { - ch <- connectPipe(p) - }(p) - - select { - case err = <-ch: - if err != nil { - p.Close() - p = nil - } - case <-l.closeCh: - // Abort the connect request by closing the handle. - p.Close() - p = nil - err = <-ch - if err == nil || err == ErrFileClosed { //nolint:errorlint // err is Errno - err = ErrPipeListenerClosed - } - } - return p, err -} - -func (l *win32PipeListener) listenerRoutine() { - closed := false - for !closed { - select { - case <-l.closeCh: - closed = true - case responseCh := <-l.acceptCh: - var ( - p *win32File - err error - ) - for { - p, err = l.makeConnectedServerPipe() - // If the connection was immediately closed by the client, try - // again. - if err != windows.ERROR_NO_DATA { //nolint:errorlint // err is Errno - break - } - } - responseCh <- acceptResponse{p, err} - closed = err == ErrPipeListenerClosed //nolint:errorlint // err is Errno - } - } - windows.Close(l.firstHandle) - l.firstHandle = 0 - // Notify Close() and Accept() callers that the handle has been closed. - close(l.doneCh) -} - -// PipeConfig contain configuration for the pipe listener. -type PipeConfig struct { - // SecurityDescriptor contains a Windows security descriptor in SDDL format. - SecurityDescriptor string - - // MessageMode determines whether the pipe is in byte or message mode. In either - // case the pipe is read in byte mode by default. The only practical difference in - // this implementation is that CloseWrite() is only supported for message mode pipes; - // CloseWrite() is implemented as a zero-byte write, but zero-byte writes are only - // transferred to the reader (and returned as io.EOF in this implementation) - // when the pipe is in message mode. - MessageMode bool - - // InputBufferSize specifies the size of the input buffer, in bytes. - InputBufferSize int32 - - // OutputBufferSize specifies the size of the output buffer, in bytes. - OutputBufferSize int32 -} - -// ListenPipe creates a listener on a Windows named pipe path, e.g. \\.\pipe\mypipe. -// The pipe must not already exist. -func ListenPipe(path string, c *PipeConfig) (net.Listener, error) { - var ( - sd []byte - err error - ) - if c == nil { - c = &PipeConfig{} - } - if c.SecurityDescriptor != "" { - sd, err = SddlToSecurityDescriptor(c.SecurityDescriptor) - if err != nil { - return nil, err - } - } - h, err := makeServerPipeHandle(path, sd, c, true) - if err != nil { - return nil, err - } - l := &win32PipeListener{ - firstHandle: h, - path: path, - config: *c, - acceptCh: make(chan (chan acceptResponse)), - closeCh: make(chan int), - doneCh: make(chan int), - } - go l.listenerRoutine() - return l, nil -} - -func connectPipe(p *win32File) error { - c, err := p.prepareIO() - if err != nil { - return err - } - defer p.wg.Done() - - err = connectNamedPipe(p.handle, &c.o) - _, err = p.asyncIO(c, nil, 0, err) - if err != nil && err != windows.ERROR_PIPE_CONNECTED { //nolint:errorlint // err is Errno - return err - } - return nil -} - -func (l *win32PipeListener) Accept() (net.Conn, error) { - ch := make(chan acceptResponse) - select { - case l.acceptCh <- ch: - response := <-ch - err := response.err - if err != nil { - return nil, err - } - if l.config.MessageMode { - return &win32MessageBytePipe{ - win32Pipe: win32Pipe{win32File: response.f, path: l.path}, - }, nil - } - return &win32Pipe{win32File: response.f, path: l.path}, nil - case <-l.doneCh: - return nil, ErrPipeListenerClosed - } -} - -func (l *win32PipeListener) Close() error { - select { - case l.closeCh <- 1: - <-l.doneCh - case <-l.doneCh: - } - return nil -} - -func (l *win32PipeListener) Addr() net.Addr { - return pipeAddress(l.path) -} diff --git a/vendor/github.com/Microsoft/go-winio/pkg/guid/guid.go b/vendor/github.com/Microsoft/go-winio/pkg/guid/guid.go deleted file mode 100644 index 48ce4e924..000000000 --- a/vendor/github.com/Microsoft/go-winio/pkg/guid/guid.go +++ /dev/null @@ -1,232 +0,0 @@ -// Package guid provides a GUID type. The backing structure for a GUID is -// identical to that used by the golang.org/x/sys/windows GUID type. -// There are two main binary encodings used for a GUID, the big-endian encoding, -// and the Windows (mixed-endian) encoding. See here for details: -// https://en.wikipedia.org/wiki/Universally_unique_identifier#Encoding -package guid - -import ( - "crypto/rand" - "crypto/sha1" //nolint:gosec // not used for secure application - "encoding" - "encoding/binary" - "fmt" - "strconv" -) - -//go:generate go run golang.org/x/tools/cmd/stringer -type=Variant -trimprefix=Variant -linecomment - -// Variant specifies which GUID variant (or "type") of the GUID. It determines -// how the entirety of the rest of the GUID is interpreted. -type Variant uint8 - -// The variants specified by RFC 4122 section 4.1.1. -const ( - // VariantUnknown specifies a GUID variant which does not conform to one of - // the variant encodings specified in RFC 4122. - VariantUnknown Variant = iota - VariantNCS - VariantRFC4122 // RFC 4122 - VariantMicrosoft - VariantFuture -) - -// Version specifies how the bits in the GUID were generated. For instance, a -// version 4 GUID is randomly generated, and a version 5 is generated from the -// hash of an input string. -type Version uint8 - -func (v Version) String() string { - return strconv.FormatUint(uint64(v), 10) -} - -var _ = (encoding.TextMarshaler)(GUID{}) -var _ = (encoding.TextUnmarshaler)(&GUID{}) - -// NewV4 returns a new version 4 (pseudorandom) GUID, as defined by RFC 4122. -func NewV4() (GUID, error) { - var b [16]byte - if _, err := rand.Read(b[:]); err != nil { - return GUID{}, err - } - - g := FromArray(b) - g.setVersion(4) // Version 4 means randomly generated. - g.setVariant(VariantRFC4122) - - return g, nil -} - -// NewV5 returns a new version 5 (generated from a string via SHA-1 hashing) -// GUID, as defined by RFC 4122. The RFC is unclear on the encoding of the name, -// and the sample code treats it as a series of bytes, so we do the same here. -// -// Some implementations, such as those found on Windows, treat the name as a -// big-endian UTF16 stream of bytes. If that is desired, the string can be -// encoded as such before being passed to this function. -func NewV5(namespace GUID, name []byte) (GUID, error) { - b := sha1.New() //nolint:gosec // not used for secure application - namespaceBytes := namespace.ToArray() - b.Write(namespaceBytes[:]) - b.Write(name) - - a := [16]byte{} - copy(a[:], b.Sum(nil)) - - g := FromArray(a) - g.setVersion(5) // Version 5 means generated from a string. - g.setVariant(VariantRFC4122) - - return g, nil -} - -func fromArray(b [16]byte, order binary.ByteOrder) GUID { - var g GUID - g.Data1 = order.Uint32(b[0:4]) - g.Data2 = order.Uint16(b[4:6]) - g.Data3 = order.Uint16(b[6:8]) - copy(g.Data4[:], b[8:16]) - return g -} - -func (g GUID) toArray(order binary.ByteOrder) [16]byte { - b := [16]byte{} - order.PutUint32(b[0:4], g.Data1) - order.PutUint16(b[4:6], g.Data2) - order.PutUint16(b[6:8], g.Data3) - copy(b[8:16], g.Data4[:]) - return b -} - -// FromArray constructs a GUID from a big-endian encoding array of 16 bytes. -func FromArray(b [16]byte) GUID { - return fromArray(b, binary.BigEndian) -} - -// ToArray returns an array of 16 bytes representing the GUID in big-endian -// encoding. -func (g GUID) ToArray() [16]byte { - return g.toArray(binary.BigEndian) -} - -// FromWindowsArray constructs a GUID from a Windows encoding array of bytes. -func FromWindowsArray(b [16]byte) GUID { - return fromArray(b, binary.LittleEndian) -} - -// ToWindowsArray returns an array of 16 bytes representing the GUID in Windows -// encoding. -func (g GUID) ToWindowsArray() [16]byte { - return g.toArray(binary.LittleEndian) -} - -func (g GUID) String() string { - return fmt.Sprintf( - "%08x-%04x-%04x-%04x-%012x", - g.Data1, - g.Data2, - g.Data3, - g.Data4[:2], - g.Data4[2:]) -} - -// FromString parses a string containing a GUID and returns the GUID. The only -// format currently supported is the `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` -// format. -func FromString(s string) (GUID, error) { - if len(s) != 36 { - return GUID{}, fmt.Errorf("invalid GUID %q", s) - } - if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' { - return GUID{}, fmt.Errorf("invalid GUID %q", s) - } - - var g GUID - - data1, err := strconv.ParseUint(s[0:8], 16, 32) - if err != nil { - return GUID{}, fmt.Errorf("invalid GUID %q", s) - } - g.Data1 = uint32(data1) - - data2, err := strconv.ParseUint(s[9:13], 16, 16) - if err != nil { - return GUID{}, fmt.Errorf("invalid GUID %q", s) - } - g.Data2 = uint16(data2) - - data3, err := strconv.ParseUint(s[14:18], 16, 16) - if err != nil { - return GUID{}, fmt.Errorf("invalid GUID %q", s) - } - g.Data3 = uint16(data3) - - for i, x := range []int{19, 21, 24, 26, 28, 30, 32, 34} { - v, err := strconv.ParseUint(s[x:x+2], 16, 8) - if err != nil { - return GUID{}, fmt.Errorf("invalid GUID %q", s) - } - g.Data4[i] = uint8(v) - } - - return g, nil -} - -func (g *GUID) setVariant(v Variant) { - d := g.Data4[0] - switch v { - case VariantNCS: - d = (d & 0x7f) - case VariantRFC4122: - d = (d & 0x3f) | 0x80 - case VariantMicrosoft: - d = (d & 0x1f) | 0xc0 - case VariantFuture: - d = (d & 0x0f) | 0xe0 - case VariantUnknown: - fallthrough - default: - panic(fmt.Sprintf("invalid variant: %d", v)) - } - g.Data4[0] = d -} - -// Variant returns the GUID variant, as defined in RFC 4122. -func (g GUID) Variant() Variant { - b := g.Data4[0] - if b&0x80 == 0 { - return VariantNCS - } else if b&0xc0 == 0x80 { - return VariantRFC4122 - } else if b&0xe0 == 0xc0 { - return VariantMicrosoft - } else if b&0xe0 == 0xe0 { - return VariantFuture - } - return VariantUnknown -} - -func (g *GUID) setVersion(v Version) { - g.Data3 = (g.Data3 & 0x0fff) | (uint16(v) << 12) -} - -// Version returns the GUID version, as defined in RFC 4122. -func (g GUID) Version() Version { - return Version((g.Data3 & 0xF000) >> 12) -} - -// MarshalText returns the textual representation of the GUID. -func (g GUID) MarshalText() ([]byte, error) { - return []byte(g.String()), nil -} - -// UnmarshalText takes the textual representation of a GUID, and unmarhals it -// into this GUID. -func (g *GUID) UnmarshalText(text []byte) error { - g2, err := FromString(string(text)) - if err != nil { - return err - } - *g = g2 - return nil -} diff --git a/vendor/github.com/Microsoft/go-winio/pkg/guid/guid_nonwindows.go b/vendor/github.com/Microsoft/go-winio/pkg/guid/guid_nonwindows.go deleted file mode 100644 index 805bd3548..000000000 --- a/vendor/github.com/Microsoft/go-winio/pkg/guid/guid_nonwindows.go +++ /dev/null @@ -1,16 +0,0 @@ -//go:build !windows -// +build !windows - -package guid - -// GUID represents a GUID/UUID. It has the same structure as -// golang.org/x/sys/windows.GUID so that it can be used with functions expecting -// that type. It is defined as its own type as that is only available to builds -// targeted at `windows`. The representation matches that used by native Windows -// code. -type GUID struct { - Data1 uint32 - Data2 uint16 - Data3 uint16 - Data4 [8]byte -} diff --git a/vendor/github.com/Microsoft/go-winio/pkg/guid/guid_windows.go b/vendor/github.com/Microsoft/go-winio/pkg/guid/guid_windows.go deleted file mode 100644 index 27e45ee5c..000000000 --- a/vendor/github.com/Microsoft/go-winio/pkg/guid/guid_windows.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build windows -// +build windows - -package guid - -import "golang.org/x/sys/windows" - -// GUID represents a GUID/UUID. It has the same structure as -// golang.org/x/sys/windows.GUID so that it can be used with functions expecting -// that type. It is defined as its own type so that stringification and -// marshaling can be supported. The representation matches that used by native -// Windows code. -type GUID windows.GUID diff --git a/vendor/github.com/Microsoft/go-winio/pkg/guid/variant_string.go b/vendor/github.com/Microsoft/go-winio/pkg/guid/variant_string.go deleted file mode 100644 index 4076d3132..000000000 --- a/vendor/github.com/Microsoft/go-winio/pkg/guid/variant_string.go +++ /dev/null @@ -1,27 +0,0 @@ -// Code generated by "stringer -type=Variant -trimprefix=Variant -linecomment"; DO NOT EDIT. - -package guid - -import "strconv" - -func _() { - // An "invalid array index" compiler error signifies that the constant values have changed. - // Re-run the stringer command to generate them again. - var x [1]struct{} - _ = x[VariantUnknown-0] - _ = x[VariantNCS-1] - _ = x[VariantRFC4122-2] - _ = x[VariantMicrosoft-3] - _ = x[VariantFuture-4] -} - -const _Variant_name = "UnknownNCSRFC 4122MicrosoftFuture" - -var _Variant_index = [...]uint8{0, 7, 10, 18, 27, 33} - -func (i Variant) String() string { - if i >= Variant(len(_Variant_index)-1) { - return "Variant(" + strconv.FormatInt(int64(i), 10) + ")" - } - return _Variant_name[_Variant_index[i]:_Variant_index[i+1]] -} diff --git a/vendor/github.com/Microsoft/go-winio/privilege.go b/vendor/github.com/Microsoft/go-winio/privilege.go deleted file mode 100644 index d9b90b6e8..000000000 --- a/vendor/github.com/Microsoft/go-winio/privilege.go +++ /dev/null @@ -1,196 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "bytes" - "encoding/binary" - "fmt" - "runtime" - "sync" - "unicode/utf16" - - "golang.org/x/sys/windows" -) - -//sys adjustTokenPrivileges(token windows.Token, releaseAll bool, input *byte, outputSize uint32, output *byte, requiredSize *uint32) (success bool, err error) [true] = advapi32.AdjustTokenPrivileges -//sys impersonateSelf(level uint32) (err error) = advapi32.ImpersonateSelf -//sys revertToSelf() (err error) = advapi32.RevertToSelf -//sys openThreadToken(thread windows.Handle, accessMask uint32, openAsSelf bool, token *windows.Token) (err error) = advapi32.OpenThreadToken -//sys getCurrentThread() (h windows.Handle) = GetCurrentThread -//sys lookupPrivilegeValue(systemName string, name string, luid *uint64) (err error) = advapi32.LookupPrivilegeValueW -//sys lookupPrivilegeName(systemName string, luid *uint64, buffer *uint16, size *uint32) (err error) = advapi32.LookupPrivilegeNameW -//sys lookupPrivilegeDisplayName(systemName string, name *uint16, buffer *uint16, size *uint32, languageId *uint32) (err error) = advapi32.LookupPrivilegeDisplayNameW - -const ( - //revive:disable-next-line:var-naming ALL_CAPS - SE_PRIVILEGE_ENABLED = windows.SE_PRIVILEGE_ENABLED - - //revive:disable-next-line:var-naming ALL_CAPS - ERROR_NOT_ALL_ASSIGNED windows.Errno = windows.ERROR_NOT_ALL_ASSIGNED - - SeBackupPrivilege = "SeBackupPrivilege" - SeRestorePrivilege = "SeRestorePrivilege" - SeSecurityPrivilege = "SeSecurityPrivilege" -) - -var ( - privNames = make(map[string]uint64) - privNameMutex sync.Mutex -) - -// PrivilegeError represents an error enabling privileges. -type PrivilegeError struct { - privileges []uint64 -} - -func (e *PrivilegeError) Error() string { - s := "Could not enable privilege " - if len(e.privileges) > 1 { - s = "Could not enable privileges " - } - for i, p := range e.privileges { - if i != 0 { - s += ", " - } - s += `"` - s += getPrivilegeName(p) - s += `"` - } - return s -} - -// RunWithPrivilege enables a single privilege for a function call. -func RunWithPrivilege(name string, fn func() error) error { - return RunWithPrivileges([]string{name}, fn) -} - -// RunWithPrivileges enables privileges for a function call. -func RunWithPrivileges(names []string, fn func() error) error { - privileges, err := mapPrivileges(names) - if err != nil { - return err - } - runtime.LockOSThread() - defer runtime.UnlockOSThread() - token, err := newThreadToken() - if err != nil { - return err - } - defer releaseThreadToken(token) - err = adjustPrivileges(token, privileges, SE_PRIVILEGE_ENABLED) - if err != nil { - return err - } - return fn() -} - -func mapPrivileges(names []string) ([]uint64, error) { - privileges := make([]uint64, 0, len(names)) - privNameMutex.Lock() - defer privNameMutex.Unlock() - for _, name := range names { - p, ok := privNames[name] - if !ok { - err := lookupPrivilegeValue("", name, &p) - if err != nil { - return nil, err - } - privNames[name] = p - } - privileges = append(privileges, p) - } - return privileges, nil -} - -// EnableProcessPrivileges enables privileges globally for the process. -func EnableProcessPrivileges(names []string) error { - return enableDisableProcessPrivilege(names, SE_PRIVILEGE_ENABLED) -} - -// DisableProcessPrivileges disables privileges globally for the process. -func DisableProcessPrivileges(names []string) error { - return enableDisableProcessPrivilege(names, 0) -} - -func enableDisableProcessPrivilege(names []string, action uint32) error { - privileges, err := mapPrivileges(names) - if err != nil { - return err - } - - p := windows.CurrentProcess() - var token windows.Token - err = windows.OpenProcessToken(p, windows.TOKEN_ADJUST_PRIVILEGES|windows.TOKEN_QUERY, &token) - if err != nil { - return err - } - - defer token.Close() - return adjustPrivileges(token, privileges, action) -} - -func adjustPrivileges(token windows.Token, privileges []uint64, action uint32) error { - var b bytes.Buffer - _ = binary.Write(&b, binary.LittleEndian, uint32(len(privileges))) - for _, p := range privileges { - _ = binary.Write(&b, binary.LittleEndian, p) - _ = binary.Write(&b, binary.LittleEndian, action) - } - prevState := make([]byte, b.Len()) - reqSize := uint32(0) - success, err := adjustTokenPrivileges(token, false, &b.Bytes()[0], uint32(len(prevState)), &prevState[0], &reqSize) - if !success { - return err - } - if err == ERROR_NOT_ALL_ASSIGNED { //nolint:errorlint // err is Errno - return &PrivilegeError{privileges} - } - return nil -} - -func getPrivilegeName(luid uint64) string { - var nameBuffer [256]uint16 - bufSize := uint32(len(nameBuffer)) - err := lookupPrivilegeName("", &luid, &nameBuffer[0], &bufSize) - if err != nil { - return fmt.Sprintf("", luid) - } - - var displayNameBuffer [256]uint16 - displayBufSize := uint32(len(displayNameBuffer)) - var langID uint32 - err = lookupPrivilegeDisplayName("", &nameBuffer[0], &displayNameBuffer[0], &displayBufSize, &langID) - if err != nil { - return fmt.Sprintf("", string(utf16.Decode(nameBuffer[:bufSize]))) - } - - return string(utf16.Decode(displayNameBuffer[:displayBufSize])) -} - -func newThreadToken() (windows.Token, error) { - err := impersonateSelf(windows.SecurityImpersonation) - if err != nil { - return 0, err - } - - var token windows.Token - err = openThreadToken(getCurrentThread(), windows.TOKEN_ADJUST_PRIVILEGES|windows.TOKEN_QUERY, false, &token) - if err != nil { - rerr := revertToSelf() - if rerr != nil { - panic(rerr) - } - return 0, err - } - return token, nil -} - -func releaseThreadToken(h windows.Token) { - err := revertToSelf() - if err != nil { - panic(err) - } - h.Close() -} diff --git a/vendor/github.com/Microsoft/go-winio/reparse.go b/vendor/github.com/Microsoft/go-winio/reparse.go deleted file mode 100644 index 67d1a104a..000000000 --- a/vendor/github.com/Microsoft/go-winio/reparse.go +++ /dev/null @@ -1,131 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "bytes" - "encoding/binary" - "fmt" - "strings" - "unicode/utf16" - "unsafe" -) - -const ( - reparseTagMountPoint = 0xA0000003 - reparseTagSymlink = 0xA000000C -) - -type reparseDataBuffer struct { - ReparseTag uint32 - ReparseDataLength uint16 - Reserved uint16 - SubstituteNameOffset uint16 - SubstituteNameLength uint16 - PrintNameOffset uint16 - PrintNameLength uint16 -} - -// ReparsePoint describes a Win32 symlink or mount point. -type ReparsePoint struct { - Target string - IsMountPoint bool -} - -// UnsupportedReparsePointError is returned when trying to decode a non-symlink or -// mount point reparse point. -type UnsupportedReparsePointError struct { - Tag uint32 -} - -func (e *UnsupportedReparsePointError) Error() string { - return fmt.Sprintf("unsupported reparse point %x", e.Tag) -} - -// DecodeReparsePoint decodes a Win32 REPARSE_DATA_BUFFER structure containing either a symlink -// or a mount point. -func DecodeReparsePoint(b []byte) (*ReparsePoint, error) { - tag := binary.LittleEndian.Uint32(b[0:4]) - return DecodeReparsePointData(tag, b[8:]) -} - -func DecodeReparsePointData(tag uint32, b []byte) (*ReparsePoint, error) { - isMountPoint := false - switch tag { - case reparseTagMountPoint: - isMountPoint = true - case reparseTagSymlink: - default: - return nil, &UnsupportedReparsePointError{tag} - } - nameOffset := 8 + binary.LittleEndian.Uint16(b[4:6]) - if !isMountPoint { - nameOffset += 4 - } - nameLength := binary.LittleEndian.Uint16(b[6:8]) - name := make([]uint16, nameLength/2) - err := binary.Read(bytes.NewReader(b[nameOffset:nameOffset+nameLength]), binary.LittleEndian, &name) - if err != nil { - return nil, err - } - return &ReparsePoint{string(utf16.Decode(name)), isMountPoint}, nil -} - -func isDriveLetter(c byte) bool { - return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') -} - -// EncodeReparsePoint encodes a Win32 REPARSE_DATA_BUFFER structure describing a symlink or -// mount point. -func EncodeReparsePoint(rp *ReparsePoint) []byte { - // Generate an NT path and determine if this is a relative path. - var ntTarget string - relative := false - if strings.HasPrefix(rp.Target, `\\?\`) { - ntTarget = `\??\` + rp.Target[4:] - } else if strings.HasPrefix(rp.Target, `\\`) { - ntTarget = `\??\UNC\` + rp.Target[2:] - } else if len(rp.Target) >= 2 && isDriveLetter(rp.Target[0]) && rp.Target[1] == ':' { - ntTarget = `\??\` + rp.Target - } else { - ntTarget = rp.Target - relative = true - } - - // The paths must be NUL-terminated even though they are counted strings. - target16 := utf16.Encode([]rune(rp.Target + "\x00")) - ntTarget16 := utf16.Encode([]rune(ntTarget + "\x00")) - - size := int(unsafe.Sizeof(reparseDataBuffer{})) - 8 - size += len(ntTarget16)*2 + len(target16)*2 - - tag := uint32(reparseTagMountPoint) - if !rp.IsMountPoint { - tag = reparseTagSymlink - size += 4 // Add room for symlink flags - } - - data := reparseDataBuffer{ - ReparseTag: tag, - ReparseDataLength: uint16(size), - SubstituteNameOffset: 0, - SubstituteNameLength: uint16((len(ntTarget16) - 1) * 2), - PrintNameOffset: uint16(len(ntTarget16) * 2), - PrintNameLength: uint16((len(target16) - 1) * 2), - } - - var b bytes.Buffer - _ = binary.Write(&b, binary.LittleEndian, &data) - if !rp.IsMountPoint { - flags := uint32(0) - if relative { - flags |= 1 - } - _ = binary.Write(&b, binary.LittleEndian, flags) - } - - _ = binary.Write(&b, binary.LittleEndian, ntTarget16) - _ = binary.Write(&b, binary.LittleEndian, target16) - return b.Bytes() -} diff --git a/vendor/github.com/Microsoft/go-winio/sd.go b/vendor/github.com/Microsoft/go-winio/sd.go deleted file mode 100644 index c3685e98e..000000000 --- a/vendor/github.com/Microsoft/go-winio/sd.go +++ /dev/null @@ -1,133 +0,0 @@ -//go:build windows -// +build windows - -package winio - -import ( - "errors" - "fmt" - "unsafe" - - "golang.org/x/sys/windows" -) - -//sys lookupAccountName(systemName *uint16, accountName string, sid *byte, sidSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) = advapi32.LookupAccountNameW -//sys lookupAccountSid(systemName *uint16, sid *byte, name *uint16, nameSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) = advapi32.LookupAccountSidW -//sys convertSidToStringSid(sid *byte, str **uint16) (err error) = advapi32.ConvertSidToStringSidW -//sys convertStringSidToSid(str *uint16, sid **byte) (err error) = advapi32.ConvertStringSidToSidW - -type AccountLookupError struct { - Name string - Err error -} - -func (e *AccountLookupError) Error() string { - if e.Name == "" { - return "lookup account: empty account name specified" - } - var s string - switch { - case errors.Is(e.Err, windows.ERROR_INVALID_SID): - s = "the security ID structure is invalid" - case errors.Is(e.Err, windows.ERROR_NONE_MAPPED): - s = "not found" - default: - s = e.Err.Error() - } - return "lookup account " + e.Name + ": " + s -} - -func (e *AccountLookupError) Unwrap() error { return e.Err } - -type SddlConversionError struct { - Sddl string - Err error -} - -func (e *SddlConversionError) Error() string { - return "convert " + e.Sddl + ": " + e.Err.Error() -} - -func (e *SddlConversionError) Unwrap() error { return e.Err } - -// LookupSidByName looks up the SID of an account by name -// -//revive:disable-next-line:var-naming SID, not Sid -func LookupSidByName(name string) (sid string, err error) { - if name == "" { - return "", &AccountLookupError{name, windows.ERROR_NONE_MAPPED} - } - - var sidSize, sidNameUse, refDomainSize uint32 - err = lookupAccountName(nil, name, nil, &sidSize, nil, &refDomainSize, &sidNameUse) - if err != nil && err != windows.ERROR_INSUFFICIENT_BUFFER { //nolint:errorlint // err is Errno - return "", &AccountLookupError{name, err} - } - sidBuffer := make([]byte, sidSize) - refDomainBuffer := make([]uint16, refDomainSize) - err = lookupAccountName(nil, name, &sidBuffer[0], &sidSize, &refDomainBuffer[0], &refDomainSize, &sidNameUse) - if err != nil { - return "", &AccountLookupError{name, err} - } - var strBuffer *uint16 - err = convertSidToStringSid(&sidBuffer[0], &strBuffer) - if err != nil { - return "", &AccountLookupError{name, err} - } - sid = windows.UTF16ToString((*[0xffff]uint16)(unsafe.Pointer(strBuffer))[:]) - _, _ = windows.LocalFree(windows.Handle(unsafe.Pointer(strBuffer))) - return sid, nil -} - -// LookupNameBySid looks up the name of an account by SID -// -//revive:disable-next-line:var-naming SID, not Sid -func LookupNameBySid(sid string) (name string, err error) { - if sid == "" { - return "", &AccountLookupError{sid, windows.ERROR_NONE_MAPPED} - } - - sidBuffer, err := windows.UTF16PtrFromString(sid) - if err != nil { - return "", &AccountLookupError{sid, err} - } - - var sidPtr *byte - if err = convertStringSidToSid(sidBuffer, &sidPtr); err != nil { - return "", &AccountLookupError{sid, err} - } - defer windows.LocalFree(windows.Handle(unsafe.Pointer(sidPtr))) //nolint:errcheck - - var nameSize, refDomainSize, sidNameUse uint32 - err = lookupAccountSid(nil, sidPtr, nil, &nameSize, nil, &refDomainSize, &sidNameUse) - if err != nil && err != windows.ERROR_INSUFFICIENT_BUFFER { //nolint:errorlint // err is Errno - return "", &AccountLookupError{sid, err} - } - - nameBuffer := make([]uint16, nameSize) - refDomainBuffer := make([]uint16, refDomainSize) - err = lookupAccountSid(nil, sidPtr, &nameBuffer[0], &nameSize, &refDomainBuffer[0], &refDomainSize, &sidNameUse) - if err != nil { - return "", &AccountLookupError{sid, err} - } - - name = windows.UTF16ToString(nameBuffer) - return name, nil -} - -func SddlToSecurityDescriptor(sddl string) ([]byte, error) { - sd, err := windows.SecurityDescriptorFromString(sddl) - if err != nil { - return nil, &SddlConversionError{Sddl: sddl, Err: err} - } - b := unsafe.Slice((*byte)(unsafe.Pointer(sd)), sd.Length()) - return b, nil -} - -func SecurityDescriptorToSddl(sd []byte) (string, error) { - if l := int(unsafe.Sizeof(windows.SECURITY_DESCRIPTOR{})); len(sd) < l { - return "", fmt.Errorf("SecurityDescriptor (%d) smaller than expected (%d): %w", len(sd), l, windows.ERROR_INCORRECT_SIZE) - } - s := (*windows.SECURITY_DESCRIPTOR)(unsafe.Pointer(&sd[0])) - return s.String(), nil -} diff --git a/vendor/github.com/Microsoft/go-winio/syscall.go b/vendor/github.com/Microsoft/go-winio/syscall.go deleted file mode 100644 index a6ca111b3..000000000 --- a/vendor/github.com/Microsoft/go-winio/syscall.go +++ /dev/null @@ -1,5 +0,0 @@ -//go:build windows - -package winio - -//go:generate go run github.com/Microsoft/go-winio/tools/mkwinsyscall -output zsyscall_windows.go ./*.go diff --git a/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go b/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go deleted file mode 100644 index 89b66eda8..000000000 --- a/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go +++ /dev/null @@ -1,378 +0,0 @@ -//go:build windows - -// Code generated by 'go generate' using "github.com/Microsoft/go-winio/tools/mkwinsyscall"; DO NOT EDIT. - -package winio - -import ( - "syscall" - "unsafe" - - "golang.org/x/sys/windows" -) - -var _ unsafe.Pointer - -// Do the interface allocations only once for common -// Errno values. -const ( - errnoERROR_IO_PENDING = 997 -) - -var ( - errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) - errERROR_EINVAL error = syscall.EINVAL -) - -// errnoErr returns common boxed Errno values, to prevent -// allocations at runtime. -func errnoErr(e syscall.Errno) error { - switch e { - case 0: - return errERROR_EINVAL - case errnoERROR_IO_PENDING: - return errERROR_IO_PENDING - } - return e -} - -var ( - modadvapi32 = windows.NewLazySystemDLL("advapi32.dll") - modkernel32 = windows.NewLazySystemDLL("kernel32.dll") - modntdll = windows.NewLazySystemDLL("ntdll.dll") - modws2_32 = windows.NewLazySystemDLL("ws2_32.dll") - - procAdjustTokenPrivileges = modadvapi32.NewProc("AdjustTokenPrivileges") - procConvertSidToStringSidW = modadvapi32.NewProc("ConvertSidToStringSidW") - procConvertStringSidToSidW = modadvapi32.NewProc("ConvertStringSidToSidW") - procImpersonateSelf = modadvapi32.NewProc("ImpersonateSelf") - procLookupAccountNameW = modadvapi32.NewProc("LookupAccountNameW") - procLookupAccountSidW = modadvapi32.NewProc("LookupAccountSidW") - procLookupPrivilegeDisplayNameW = modadvapi32.NewProc("LookupPrivilegeDisplayNameW") - procLookupPrivilegeNameW = modadvapi32.NewProc("LookupPrivilegeNameW") - procLookupPrivilegeValueW = modadvapi32.NewProc("LookupPrivilegeValueW") - procOpenThreadToken = modadvapi32.NewProc("OpenThreadToken") - procRevertToSelf = modadvapi32.NewProc("RevertToSelf") - procBackupRead = modkernel32.NewProc("BackupRead") - procBackupWrite = modkernel32.NewProc("BackupWrite") - procCancelIoEx = modkernel32.NewProc("CancelIoEx") - procConnectNamedPipe = modkernel32.NewProc("ConnectNamedPipe") - procCreateIoCompletionPort = modkernel32.NewProc("CreateIoCompletionPort") - procCreateNamedPipeW = modkernel32.NewProc("CreateNamedPipeW") - procDisconnectNamedPipe = modkernel32.NewProc("DisconnectNamedPipe") - procGetCurrentThread = modkernel32.NewProc("GetCurrentThread") - procGetNamedPipeHandleStateW = modkernel32.NewProc("GetNamedPipeHandleStateW") - procGetNamedPipeInfo = modkernel32.NewProc("GetNamedPipeInfo") - procGetQueuedCompletionStatus = modkernel32.NewProc("GetQueuedCompletionStatus") - procSetFileCompletionNotificationModes = modkernel32.NewProc("SetFileCompletionNotificationModes") - procNtCreateNamedPipeFile = modntdll.NewProc("NtCreateNamedPipeFile") - procRtlDefaultNpAcl = modntdll.NewProc("RtlDefaultNpAcl") - procRtlDosPathNameToNtPathName_U = modntdll.NewProc("RtlDosPathNameToNtPathName_U") - procRtlNtStatusToDosErrorNoTeb = modntdll.NewProc("RtlNtStatusToDosErrorNoTeb") - procWSAGetOverlappedResult = modws2_32.NewProc("WSAGetOverlappedResult") -) - -func adjustTokenPrivileges(token windows.Token, releaseAll bool, input *byte, outputSize uint32, output *byte, requiredSize *uint32) (success bool, err error) { - var _p0 uint32 - if releaseAll { - _p0 = 1 - } - r0, _, e1 := syscall.SyscallN(procAdjustTokenPrivileges.Addr(), uintptr(token), uintptr(_p0), uintptr(unsafe.Pointer(input)), uintptr(outputSize), uintptr(unsafe.Pointer(output)), uintptr(unsafe.Pointer(requiredSize))) - success = r0 != 0 - if true { - err = errnoErr(e1) - } - return -} - -func convertSidToStringSid(sid *byte, str **uint16) (err error) { - r1, _, e1 := syscall.SyscallN(procConvertSidToStringSidW.Addr(), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(str))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func convertStringSidToSid(str *uint16, sid **byte) (err error) { - r1, _, e1 := syscall.SyscallN(procConvertStringSidToSidW.Addr(), uintptr(unsafe.Pointer(str)), uintptr(unsafe.Pointer(sid))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func impersonateSelf(level uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procImpersonateSelf.Addr(), uintptr(level)) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func lookupAccountName(systemName *uint16, accountName string, sid *byte, sidSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(accountName) - if err != nil { - return - } - return _lookupAccountName(systemName, _p0, sid, sidSize, refDomain, refDomainSize, sidNameUse) -} - -func _lookupAccountName(systemName *uint16, accountName *uint16, sid *byte, sidSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procLookupAccountNameW.Addr(), uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(accountName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(sidSize)), uintptr(unsafe.Pointer(refDomain)), uintptr(unsafe.Pointer(refDomainSize)), uintptr(unsafe.Pointer(sidNameUse))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func lookupAccountSid(systemName *uint16, sid *byte, name *uint16, nameSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procLookupAccountSidW.Addr(), uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameSize)), uintptr(unsafe.Pointer(refDomain)), uintptr(unsafe.Pointer(refDomainSize)), uintptr(unsafe.Pointer(sidNameUse))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func lookupPrivilegeDisplayName(systemName string, name *uint16, buffer *uint16, size *uint32, languageId *uint32) (err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(systemName) - if err != nil { - return - } - return _lookupPrivilegeDisplayName(_p0, name, buffer, size, languageId) -} - -func _lookupPrivilegeDisplayName(systemName *uint16, name *uint16, buffer *uint16, size *uint32, languageId *uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procLookupPrivilegeDisplayNameW.Addr(), uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buffer)), uintptr(unsafe.Pointer(size)), uintptr(unsafe.Pointer(languageId))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func lookupPrivilegeName(systemName string, luid *uint64, buffer *uint16, size *uint32) (err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(systemName) - if err != nil { - return - } - return _lookupPrivilegeName(_p0, luid, buffer, size) -} - -func _lookupPrivilegeName(systemName *uint16, luid *uint64, buffer *uint16, size *uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procLookupPrivilegeNameW.Addr(), uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(luid)), uintptr(unsafe.Pointer(buffer)), uintptr(unsafe.Pointer(size))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func lookupPrivilegeValue(systemName string, name string, luid *uint64) (err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(systemName) - if err != nil { - return - } - var _p1 *uint16 - _p1, err = syscall.UTF16PtrFromString(name) - if err != nil { - return - } - return _lookupPrivilegeValue(_p0, _p1, luid) -} - -func _lookupPrivilegeValue(systemName *uint16, name *uint16, luid *uint64) (err error) { - r1, _, e1 := syscall.SyscallN(procLookupPrivilegeValueW.Addr(), uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(luid))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func openThreadToken(thread windows.Handle, accessMask uint32, openAsSelf bool, token *windows.Token) (err error) { - var _p0 uint32 - if openAsSelf { - _p0 = 1 - } - r1, _, e1 := syscall.SyscallN(procOpenThreadToken.Addr(), uintptr(thread), uintptr(accessMask), uintptr(_p0), uintptr(unsafe.Pointer(token))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func revertToSelf() (err error) { - r1, _, e1 := syscall.SyscallN(procRevertToSelf.Addr()) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func backupRead(h windows.Handle, b []byte, bytesRead *uint32, abort bool, processSecurity bool, context *uintptr) (err error) { - var _p0 *byte - if len(b) > 0 { - _p0 = &b[0] - } - var _p1 uint32 - if abort { - _p1 = 1 - } - var _p2 uint32 - if processSecurity { - _p2 = 1 - } - r1, _, e1 := syscall.SyscallN(procBackupRead.Addr(), uintptr(h), uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(unsafe.Pointer(bytesRead)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(context))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func backupWrite(h windows.Handle, b []byte, bytesWritten *uint32, abort bool, processSecurity bool, context *uintptr) (err error) { - var _p0 *byte - if len(b) > 0 { - _p0 = &b[0] - } - var _p1 uint32 - if abort { - _p1 = 1 - } - var _p2 uint32 - if processSecurity { - _p2 = 1 - } - r1, _, e1 := syscall.SyscallN(procBackupWrite.Addr(), uintptr(h), uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(unsafe.Pointer(bytesWritten)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(context))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func cancelIoEx(file windows.Handle, o *windows.Overlapped) (err error) { - r1, _, e1 := syscall.SyscallN(procCancelIoEx.Addr(), uintptr(file), uintptr(unsafe.Pointer(o))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func connectNamedPipe(pipe windows.Handle, o *windows.Overlapped) (err error) { - r1, _, e1 := syscall.SyscallN(procConnectNamedPipe.Addr(), uintptr(pipe), uintptr(unsafe.Pointer(o))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func createIoCompletionPort(file windows.Handle, port windows.Handle, key uintptr, threadCount uint32) (newport windows.Handle, err error) { - r0, _, e1 := syscall.SyscallN(procCreateIoCompletionPort.Addr(), uintptr(file), uintptr(port), uintptr(key), uintptr(threadCount)) - newport = windows.Handle(r0) - if newport == 0 { - err = errnoErr(e1) - } - return -} - -func createNamedPipe(name string, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *windows.SecurityAttributes) (handle windows.Handle, err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(name) - if err != nil { - return - } - return _createNamedPipe(_p0, flags, pipeMode, maxInstances, outSize, inSize, defaultTimeout, sa) -} - -func _createNamedPipe(name *uint16, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *windows.SecurityAttributes) (handle windows.Handle, err error) { - r0, _, e1 := syscall.SyscallN(procCreateNamedPipeW.Addr(), uintptr(unsafe.Pointer(name)), uintptr(flags), uintptr(pipeMode), uintptr(maxInstances), uintptr(outSize), uintptr(inSize), uintptr(defaultTimeout), uintptr(unsafe.Pointer(sa))) - handle = windows.Handle(r0) - if handle == windows.InvalidHandle { - err = errnoErr(e1) - } - return -} - -func disconnectNamedPipe(pipe windows.Handle) (err error) { - r1, _, e1 := syscall.SyscallN(procDisconnectNamedPipe.Addr(), uintptr(pipe)) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func getCurrentThread() (h windows.Handle) { - r0, _, _ := syscall.SyscallN(procGetCurrentThread.Addr()) - h = windows.Handle(r0) - return -} - -func getNamedPipeHandleState(pipe windows.Handle, state *uint32, curInstances *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName *uint16, maxUserNameSize uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procGetNamedPipeHandleStateW.Addr(), uintptr(pipe), uintptr(unsafe.Pointer(state)), uintptr(unsafe.Pointer(curInstances)), uintptr(unsafe.Pointer(maxCollectionCount)), uintptr(unsafe.Pointer(collectDataTimeout)), uintptr(unsafe.Pointer(userName)), uintptr(maxUserNameSize)) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func getNamedPipeInfo(pipe windows.Handle, flags *uint32, outSize *uint32, inSize *uint32, maxInstances *uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procGetNamedPipeInfo.Addr(), uintptr(pipe), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(outSize)), uintptr(unsafe.Pointer(inSize)), uintptr(unsafe.Pointer(maxInstances))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func getQueuedCompletionStatus(port windows.Handle, bytes *uint32, key *uintptr, o **ioOperation, timeout uint32) (err error) { - r1, _, e1 := syscall.SyscallN(procGetQueuedCompletionStatus.Addr(), uintptr(port), uintptr(unsafe.Pointer(bytes)), uintptr(unsafe.Pointer(key)), uintptr(unsafe.Pointer(o)), uintptr(timeout)) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func setFileCompletionNotificationModes(h windows.Handle, flags uint8) (err error) { - r1, _, e1 := syscall.SyscallN(procSetFileCompletionNotificationModes.Addr(), uintptr(h), uintptr(flags)) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - -func ntCreateNamedPipeFile(pipe *windows.Handle, access ntAccessMask, oa *objectAttributes, iosb *ioStatusBlock, share ntFileShareMode, disposition ntFileCreationDisposition, options ntFileOptions, typ uint32, readMode uint32, completionMode uint32, maxInstances uint32, inboundQuota uint32, outputQuota uint32, timeout *int64) (status ntStatus) { - r0, _, _ := syscall.SyscallN(procNtCreateNamedPipeFile.Addr(), uintptr(unsafe.Pointer(pipe)), uintptr(access), uintptr(unsafe.Pointer(oa)), uintptr(unsafe.Pointer(iosb)), uintptr(share), uintptr(disposition), uintptr(options), uintptr(typ), uintptr(readMode), uintptr(completionMode), uintptr(maxInstances), uintptr(inboundQuota), uintptr(outputQuota), uintptr(unsafe.Pointer(timeout))) - status = ntStatus(r0) - return -} - -func rtlDefaultNpAcl(dacl *uintptr) (status ntStatus) { - r0, _, _ := syscall.SyscallN(procRtlDefaultNpAcl.Addr(), uintptr(unsafe.Pointer(dacl))) - status = ntStatus(r0) - return -} - -func rtlDosPathNameToNtPathName(name *uint16, ntName *unicodeString, filePart uintptr, reserved uintptr) (status ntStatus) { - r0, _, _ := syscall.SyscallN(procRtlDosPathNameToNtPathName_U.Addr(), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(ntName)), uintptr(filePart), uintptr(reserved)) - status = ntStatus(r0) - return -} - -func rtlNtStatusToDosError(status ntStatus) (winerr error) { - r0, _, _ := syscall.SyscallN(procRtlNtStatusToDosErrorNoTeb.Addr(), uintptr(status)) - if r0 != 0 { - winerr = syscall.Errno(r0) - } - return -} - -func wsaGetOverlappedResult(h windows.Handle, o *windows.Overlapped, bytes *uint32, wait bool, flags *uint32) (err error) { - var _p0 uint32 - if wait { - _p0 = 1 - } - r1, _, e1 := syscall.SyscallN(procWSAGetOverlappedResult.Addr(), uintptr(h), uintptr(unsafe.Pointer(o)), uintptr(unsafe.Pointer(bytes)), uintptr(_p0), uintptr(unsafe.Pointer(flags))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/AUTHORS b/vendor/github.com/ProtonMail/go-crypto/AUTHORS deleted file mode 100644 index 2b00ddba0..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -# This source code refers to The Go Authors for copyright purposes. -# The master list of authors is in the main Go distribution, -# visible at https://tip.golang.org/AUTHORS. diff --git a/vendor/github.com/ProtonMail/go-crypto/CONTRIBUTORS b/vendor/github.com/ProtonMail/go-crypto/CONTRIBUTORS deleted file mode 100644 index 1fbd3e976..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/CONTRIBUTORS +++ /dev/null @@ -1,3 +0,0 @@ -# This source code was written by the Go contributors. -# The master list of contributors is in the main Go distribution, -# visible at https://tip.golang.org/CONTRIBUTORS. diff --git a/vendor/github.com/ProtonMail/go-crypto/bitcurves/bitcurve.go b/vendor/github.com/ProtonMail/go-crypto/bitcurves/bitcurve.go deleted file mode 100644 index c85e6befe..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/bitcurves/bitcurve.go +++ /dev/null @@ -1,381 +0,0 @@ -package bitcurves - -// Copyright 2010 The Go Authors. All rights reserved. -// Copyright 2011 ThePiachu. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package bitelliptic implements several Koblitz elliptic curves over prime -// fields. - -// This package operates, internally, on Jacobian coordinates. For a given -// (x, y) position on the curve, the Jacobian coordinates are (x1, y1, z1) -// where x = x1/z1² and y = y1/z1³. The greatest speedups come when the whole -// calculation can be performed within the transform (as in ScalarMult and -// ScalarBaseMult). But even for Add and Double, it's faster to apply and -// reverse the transform than to operate in affine coordinates. - -import ( - "crypto/elliptic" - "io" - "math/big" - "sync" -) - -// A BitCurve represents a Koblitz Curve with a=0. -// See http://www.hyperelliptic.org/EFD/g1p/auto-shortw.html -type BitCurve struct { - Name string - P *big.Int // the order of the underlying field - N *big.Int // the order of the base point - B *big.Int // the constant of the BitCurve equation - Gx, Gy *big.Int // (x,y) of the base point - BitSize int // the size of the underlying field -} - -// Params returns the parameters of the given BitCurve (see BitCurve struct) -func (bitCurve *BitCurve) Params() (cp *elliptic.CurveParams) { - cp = new(elliptic.CurveParams) - cp.Name = bitCurve.Name - cp.P = bitCurve.P - cp.N = bitCurve.N - cp.Gx = bitCurve.Gx - cp.Gy = bitCurve.Gy - cp.BitSize = bitCurve.BitSize - return cp -} - -// IsOnCurve returns true if the given (x,y) lies on the BitCurve. -func (bitCurve *BitCurve) IsOnCurve(x, y *big.Int) bool { - // y² = x³ + b - y2 := new(big.Int).Mul(y, y) //y² - y2.Mod(y2, bitCurve.P) //y²%P - - x3 := new(big.Int).Mul(x, x) //x² - x3.Mul(x3, x) //x³ - - x3.Add(x3, bitCurve.B) //x³+B - x3.Mod(x3, bitCurve.P) //(x³+B)%P - - return x3.Cmp(y2) == 0 -} - -// affineFromJacobian reverses the Jacobian transform. See the comment at the -// top of the file. -func (bitCurve *BitCurve) affineFromJacobian(x, y, z *big.Int) (xOut, yOut *big.Int) { - if z.Cmp(big.NewInt(0)) == 0 { - panic("bitcurve: Can't convert to affine with Jacobian Z = 0") - } - // x = YZ^2 mod P - zinv := new(big.Int).ModInverse(z, bitCurve.P) - zinvsq := new(big.Int).Mul(zinv, zinv) - - xOut = new(big.Int).Mul(x, zinvsq) - xOut.Mod(xOut, bitCurve.P) - // y = YZ^3 mod P - zinvsq.Mul(zinvsq, zinv) - yOut = new(big.Int).Mul(y, zinvsq) - yOut.Mod(yOut, bitCurve.P) - return xOut, yOut -} - -// Add returns the sum of (x1,y1) and (x2,y2) -func (bitCurve *BitCurve) Add(x1, y1, x2, y2 *big.Int) (*big.Int, *big.Int) { - z := new(big.Int).SetInt64(1) - x, y, z := bitCurve.addJacobian(x1, y1, z, x2, y2, z) - return bitCurve.affineFromJacobian(x, y, z) -} - -// addJacobian takes two points in Jacobian coordinates, (x1, y1, z1) and -// (x2, y2, z2) and returns their sum, also in Jacobian form. -func (bitCurve *BitCurve) addJacobian(x1, y1, z1, x2, y2, z2 *big.Int) (*big.Int, *big.Int, *big.Int) { - // See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#addition-add-2007-bl - z1z1 := new(big.Int).Mul(z1, z1) - z1z1.Mod(z1z1, bitCurve.P) - z2z2 := new(big.Int).Mul(z2, z2) - z2z2.Mod(z2z2, bitCurve.P) - - u1 := new(big.Int).Mul(x1, z2z2) - u1.Mod(u1, bitCurve.P) - u2 := new(big.Int).Mul(x2, z1z1) - u2.Mod(u2, bitCurve.P) - h := new(big.Int).Sub(u2, u1) - if h.Sign() == -1 { - h.Add(h, bitCurve.P) - } - i := new(big.Int).Lsh(h, 1) - i.Mul(i, i) - j := new(big.Int).Mul(h, i) - - s1 := new(big.Int).Mul(y1, z2) - s1.Mul(s1, z2z2) - s1.Mod(s1, bitCurve.P) - s2 := new(big.Int).Mul(y2, z1) - s2.Mul(s2, z1z1) - s2.Mod(s2, bitCurve.P) - r := new(big.Int).Sub(s2, s1) - if r.Sign() == -1 { - r.Add(r, bitCurve.P) - } - r.Lsh(r, 1) - v := new(big.Int).Mul(u1, i) - - x3 := new(big.Int).Set(r) - x3.Mul(x3, x3) - x3.Sub(x3, j) - x3.Sub(x3, v) - x3.Sub(x3, v) - x3.Mod(x3, bitCurve.P) - - y3 := new(big.Int).Set(r) - v.Sub(v, x3) - y3.Mul(y3, v) - s1.Mul(s1, j) - s1.Lsh(s1, 1) - y3.Sub(y3, s1) - y3.Mod(y3, bitCurve.P) - - z3 := new(big.Int).Add(z1, z2) - z3.Mul(z3, z3) - z3.Sub(z3, z1z1) - if z3.Sign() == -1 { - z3.Add(z3, bitCurve.P) - } - z3.Sub(z3, z2z2) - if z3.Sign() == -1 { - z3.Add(z3, bitCurve.P) - } - z3.Mul(z3, h) - z3.Mod(z3, bitCurve.P) - - return x3, y3, z3 -} - -// Double returns 2*(x,y) -func (bitCurve *BitCurve) Double(x1, y1 *big.Int) (*big.Int, *big.Int) { - z1 := new(big.Int).SetInt64(1) - return bitCurve.affineFromJacobian(bitCurve.doubleJacobian(x1, y1, z1)) -} - -// doubleJacobian takes a point in Jacobian coordinates, (x, y, z), and -// returns its double, also in Jacobian form. -func (bitCurve *BitCurve) doubleJacobian(x, y, z *big.Int) (*big.Int, *big.Int, *big.Int) { - // See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-dbl-2009-l - - a := new(big.Int).Mul(x, x) //X1² - b := new(big.Int).Mul(y, y) //Y1² - c := new(big.Int).Mul(b, b) //B² - - d := new(big.Int).Add(x, b) //X1+B - d.Mul(d, d) //(X1+B)² - d.Sub(d, a) //(X1+B)²-A - d.Sub(d, c) //(X1+B)²-A-C - d.Mul(d, big.NewInt(2)) //2*((X1+B)²-A-C) - - e := new(big.Int).Mul(big.NewInt(3), a) //3*A - f := new(big.Int).Mul(e, e) //E² - - x3 := new(big.Int).Mul(big.NewInt(2), d) //2*D - x3.Sub(f, x3) //F-2*D - x3.Mod(x3, bitCurve.P) - - y3 := new(big.Int).Sub(d, x3) //D-X3 - y3.Mul(e, y3) //E*(D-X3) - y3.Sub(y3, new(big.Int).Mul(big.NewInt(8), c)) //E*(D-X3)-8*C - y3.Mod(y3, bitCurve.P) - - z3 := new(big.Int).Mul(y, z) //Y1*Z1 - z3.Mul(big.NewInt(2), z3) //3*Y1*Z1 - z3.Mod(z3, bitCurve.P) - - return x3, y3, z3 -} - -// TODO: double check if it is okay -// ScalarMult returns k*(Bx,By) where k is a number in big-endian form. -func (bitCurve *BitCurve) ScalarMult(Bx, By *big.Int, k []byte) (*big.Int, *big.Int) { - // We have a slight problem in that the identity of the group (the - // point at infinity) cannot be represented in (x, y) form on a finite - // machine. Thus the standard add/double algorithm has to be tweaked - // slightly: our initial state is not the identity, but x, and we - // ignore the first true bit in |k|. If we don't find any true bits in - // |k|, then we return nil, nil, because we cannot return the identity - // element. - - Bz := new(big.Int).SetInt64(1) - x := Bx - y := By - z := Bz - - seenFirstTrue := false - for _, byte := range k { - for bitNum := 0; bitNum < 8; bitNum++ { - if seenFirstTrue { - x, y, z = bitCurve.doubleJacobian(x, y, z) - } - if byte&0x80 == 0x80 { - if !seenFirstTrue { - seenFirstTrue = true - } else { - x, y, z = bitCurve.addJacobian(Bx, By, Bz, x, y, z) - } - } - byte <<= 1 - } - } - - if !seenFirstTrue { - return nil, nil - } - - return bitCurve.affineFromJacobian(x, y, z) -} - -// ScalarBaseMult returns k*G, where G is the base point of the group and k is -// an integer in big-endian form. -func (bitCurve *BitCurve) ScalarBaseMult(k []byte) (*big.Int, *big.Int) { - return bitCurve.ScalarMult(bitCurve.Gx, bitCurve.Gy, k) -} - -var mask = []byte{0xff, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f} - -// TODO: double check if it is okay -// GenerateKey returns a public/private key pair. The private key is generated -// using the given reader, which must return random data. -func (bitCurve *BitCurve) GenerateKey(rand io.Reader) (priv []byte, x, y *big.Int, err error) { - byteLen := (bitCurve.BitSize + 7) >> 3 - priv = make([]byte, byteLen) - - for x == nil { - _, err = io.ReadFull(rand, priv) - if err != nil { - return - } - // We have to mask off any excess bits in the case that the size of the - // underlying field is not a whole number of bytes. - priv[0] &= mask[bitCurve.BitSize%8] - // This is because, in tests, rand will return all zeros and we don't - // want to get the point at infinity and loop forever. - priv[1] ^= 0x42 - x, y = bitCurve.ScalarBaseMult(priv) - } - return -} - -// Marshal converts a point into the form specified in section 4.3.6 of ANSI -// X9.62. -func (bitCurve *BitCurve) Marshal(x, y *big.Int) []byte { - byteLen := (bitCurve.BitSize + 7) >> 3 - - ret := make([]byte, 1+2*byteLen) - ret[0] = 4 // uncompressed point - - xBytes := x.Bytes() - copy(ret[1+byteLen-len(xBytes):], xBytes) - yBytes := y.Bytes() - copy(ret[1+2*byteLen-len(yBytes):], yBytes) - return ret -} - -// Unmarshal converts a point, serialised by Marshal, into an x, y pair. On -// error, x = nil. -func (bitCurve *BitCurve) Unmarshal(data []byte) (x, y *big.Int) { - byteLen := (bitCurve.BitSize + 7) >> 3 - if len(data) != 1+2*byteLen { - return - } - if data[0] != 4 { // uncompressed form - return - } - x = new(big.Int).SetBytes(data[1 : 1+byteLen]) - y = new(big.Int).SetBytes(data[1+byteLen:]) - return -} - -//curve parameters taken from: -//http://www.secg.org/collateral/sec2_final.pdf - -var initonce sync.Once -var secp160k1 *BitCurve -var secp192k1 *BitCurve -var secp224k1 *BitCurve -var secp256k1 *BitCurve - -func initAll() { - initS160() - initS192() - initS224() - initS256() -} - -func initS160() { - // See SEC 2 section 2.4.1 - secp160k1 = new(BitCurve) - secp160k1.Name = "secp160k1" - secp160k1.P, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", 16) - secp160k1.N, _ = new(big.Int).SetString("0100000000000000000001B8FA16DFAB9ACA16B6B3", 16) - secp160k1.B, _ = new(big.Int).SetString("0000000000000000000000000000000000000007", 16) - secp160k1.Gx, _ = new(big.Int).SetString("3B4C382CE37AA192A4019E763036F4F5DD4D7EBB", 16) - secp160k1.Gy, _ = new(big.Int).SetString("938CF935318FDCED6BC28286531733C3F03C4FEE", 16) - secp160k1.BitSize = 160 -} - -func initS192() { - // See SEC 2 section 2.5.1 - secp192k1 = new(BitCurve) - secp192k1.Name = "secp192k1" - secp192k1.P, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", 16) - secp192k1.N, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", 16) - secp192k1.B, _ = new(big.Int).SetString("000000000000000000000000000000000000000000000003", 16) - secp192k1.Gx, _ = new(big.Int).SetString("DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D", 16) - secp192k1.Gy, _ = new(big.Int).SetString("9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", 16) - secp192k1.BitSize = 192 -} - -func initS224() { - // See SEC 2 section 2.6.1 - secp224k1 = new(BitCurve) - secp224k1.Name = "secp224k1" - secp224k1.P, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", 16) - secp224k1.N, _ = new(big.Int).SetString("010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", 16) - secp224k1.B, _ = new(big.Int).SetString("00000000000000000000000000000000000000000000000000000005", 16) - secp224k1.Gx, _ = new(big.Int).SetString("A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C", 16) - secp224k1.Gy, _ = new(big.Int).SetString("7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", 16) - secp224k1.BitSize = 224 -} - -func initS256() { - // See SEC 2 section 2.7.1 - secp256k1 = new(BitCurve) - secp256k1.Name = "secp256k1" - secp256k1.P, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", 16) - secp256k1.N, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 16) - secp256k1.B, _ = new(big.Int).SetString("0000000000000000000000000000000000000000000000000000000000000007", 16) - secp256k1.Gx, _ = new(big.Int).SetString("79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798", 16) - secp256k1.Gy, _ = new(big.Int).SetString("483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8", 16) - secp256k1.BitSize = 256 -} - -// S160 returns a BitCurve which implements secp160k1 (see SEC 2 section 2.4.1) -func S160() *BitCurve { - initonce.Do(initAll) - return secp160k1 -} - -// S192 returns a BitCurve which implements secp192k1 (see SEC 2 section 2.5.1) -func S192() *BitCurve { - initonce.Do(initAll) - return secp192k1 -} - -// S224 returns a BitCurve which implements secp224k1 (see SEC 2 section 2.6.1) -func S224() *BitCurve { - initonce.Do(initAll) - return secp224k1 -} - -// S256 returns a BitCurve which implements bitcurves (see SEC 2 section 2.7.1) -func S256() *BitCurve { - initonce.Do(initAll) - return secp256k1 -} diff --git a/vendor/github.com/ProtonMail/go-crypto/brainpool/brainpool.go b/vendor/github.com/ProtonMail/go-crypto/brainpool/brainpool.go deleted file mode 100644 index cb6676de2..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/brainpool/brainpool.go +++ /dev/null @@ -1,134 +0,0 @@ -// Package brainpool implements Brainpool elliptic curves. -// Implementation of rcurves is from github.com/ebfe/brainpool -// Note that these curves are implemented with naive, non-constant time operations -// and are likely not suitable for environments where timing attacks are a concern. -package brainpool - -import ( - "crypto/elliptic" - "math/big" - "sync" -) - -var ( - once sync.Once - p256t1, p384t1, p512t1 *elliptic.CurveParams - p256r1, p384r1, p512r1 *rcurve -) - -func initAll() { - initP256t1() - initP384t1() - initP512t1() - initP256r1() - initP384r1() - initP512r1() -} - -func initP256t1() { - p256t1 = &elliptic.CurveParams{Name: "brainpoolP256t1"} - p256t1.P, _ = new(big.Int).SetString("A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377", 16) - p256t1.N, _ = new(big.Int).SetString("A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7", 16) - p256t1.B, _ = new(big.Int).SetString("662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04", 16) - p256t1.Gx, _ = new(big.Int).SetString("A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F4", 16) - p256t1.Gy, _ = new(big.Int).SetString("2D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE", 16) - p256t1.BitSize = 256 -} - -func initP256r1() { - twisted := p256t1 - params := &elliptic.CurveParams{ - Name: "brainpoolP256r1", - P: twisted.P, - N: twisted.N, - BitSize: twisted.BitSize, - } - params.Gx, _ = new(big.Int).SetString("8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262", 16) - params.Gy, _ = new(big.Int).SetString("547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997", 16) - z, _ := new(big.Int).SetString("3E2D4BD9597B58639AE7AA669CAB9837CF5CF20A2C852D10F655668DFC150EF0", 16) - p256r1 = newrcurve(twisted, params, z) -} - -func initP384t1() { - p384t1 = &elliptic.CurveParams{Name: "brainpoolP384t1"} - p384t1.P, _ = new(big.Int).SetString("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53", 16) - p384t1.N, _ = new(big.Int).SetString("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565", 16) - p384t1.B, _ = new(big.Int).SetString("7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE", 16) - p384t1.Gx, _ = new(big.Int).SetString("18DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC", 16) - p384t1.Gy, _ = new(big.Int).SetString("25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928", 16) - p384t1.BitSize = 384 -} - -func initP384r1() { - twisted := p384t1 - params := &elliptic.CurveParams{ - Name: "brainpoolP384r1", - P: twisted.P, - N: twisted.N, - BitSize: twisted.BitSize, - } - params.Gx, _ = new(big.Int).SetString("1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E", 16) - params.Gy, _ = new(big.Int).SetString("8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315", 16) - z, _ := new(big.Int).SetString("41DFE8DD399331F7166A66076734A89CD0D2BCDB7D068E44E1F378F41ECBAE97D2D63DBC87BCCDDCCC5DA39E8589291C", 16) - p384r1 = newrcurve(twisted, params, z) -} - -func initP512t1() { - p512t1 = &elliptic.CurveParams{Name: "brainpoolP512t1"} - p512t1.P, _ = new(big.Int).SetString("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3", 16) - p512t1.N, _ = new(big.Int).SetString("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069", 16) - p512t1.B, _ = new(big.Int).SetString("7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E", 16) - p512t1.Gx, _ = new(big.Int).SetString("640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA", 16) - p512t1.Gy, _ = new(big.Int).SetString("5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332", 16) - p512t1.BitSize = 512 -} - -func initP512r1() { - twisted := p512t1 - params := &elliptic.CurveParams{ - Name: "brainpoolP512r1", - P: twisted.P, - N: twisted.N, - BitSize: twisted.BitSize, - } - params.Gx, _ = new(big.Int).SetString("81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822", 16) - params.Gy, _ = new(big.Int).SetString("7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892", 16) - z, _ := new(big.Int).SetString("12EE58E6764838B69782136F0F2D3BA06E27695716054092E60A80BEDB212B64E585D90BCE13761F85C3F1D2A64E3BE8FEA2220F01EBA5EEB0F35DBD29D922AB", 16) - p512r1 = newrcurve(twisted, params, z) -} - -// P256t1 returns a Curve which implements Brainpool P256t1 (see RFC 5639, section 3.4) -func P256t1() elliptic.Curve { - once.Do(initAll) - return p256t1 -} - -// P256r1 returns a Curve which implements Brainpool P256r1 (see RFC 5639, section 3.4) -func P256r1() elliptic.Curve { - once.Do(initAll) - return p256r1 -} - -// P384t1 returns a Curve which implements Brainpool P384t1 (see RFC 5639, section 3.6) -func P384t1() elliptic.Curve { - once.Do(initAll) - return p384t1 -} - -// P384r1 returns a Curve which implements Brainpool P384r1 (see RFC 5639, section 3.6) -func P384r1() elliptic.Curve { - once.Do(initAll) - return p384r1 -} - -// P512t1 returns a Curve which implements Brainpool P512t1 (see RFC 5639, section 3.7) -func P512t1() elliptic.Curve { - once.Do(initAll) - return p512t1 -} - -// P512r1 returns a Curve which implements Brainpool P512r1 (see RFC 5639, section 3.7) -func P512r1() elliptic.Curve { - once.Do(initAll) - return p512r1 -} diff --git a/vendor/github.com/ProtonMail/go-crypto/brainpool/rcurve.go b/vendor/github.com/ProtonMail/go-crypto/brainpool/rcurve.go deleted file mode 100644 index 7e291d6aa..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/brainpool/rcurve.go +++ /dev/null @@ -1,83 +0,0 @@ -package brainpool - -import ( - "crypto/elliptic" - "math/big" -) - -var _ elliptic.Curve = (*rcurve)(nil) - -type rcurve struct { - twisted elliptic.Curve - params *elliptic.CurveParams - z *big.Int - zinv *big.Int - z2 *big.Int - z3 *big.Int - zinv2 *big.Int - zinv3 *big.Int -} - -var ( - two = big.NewInt(2) - three = big.NewInt(3) -) - -func newrcurve(twisted elliptic.Curve, params *elliptic.CurveParams, z *big.Int) *rcurve { - zinv := new(big.Int).ModInverse(z, params.P) - return &rcurve{ - twisted: twisted, - params: params, - z: z, - zinv: zinv, - z2: new(big.Int).Exp(z, two, params.P), - z3: new(big.Int).Exp(z, three, params.P), - zinv2: new(big.Int).Exp(zinv, two, params.P), - zinv3: new(big.Int).Exp(zinv, three, params.P), - } -} - -func (curve *rcurve) toTwisted(x, y *big.Int) (*big.Int, *big.Int) { - var tx, ty big.Int - tx.Mul(x, curve.z2) - tx.Mod(&tx, curve.params.P) - ty.Mul(y, curve.z3) - ty.Mod(&ty, curve.params.P) - return &tx, &ty -} - -func (curve *rcurve) fromTwisted(tx, ty *big.Int) (*big.Int, *big.Int) { - var x, y big.Int - x.Mul(tx, curve.zinv2) - x.Mod(&x, curve.params.P) - y.Mul(ty, curve.zinv3) - y.Mod(&y, curve.params.P) - return &x, &y -} - -func (curve *rcurve) Params() *elliptic.CurveParams { - return curve.params -} - -func (curve *rcurve) IsOnCurve(x, y *big.Int) bool { - return curve.twisted.IsOnCurve(curve.toTwisted(x, y)) -} - -func (curve *rcurve) Add(x1, y1, x2, y2 *big.Int) (x, y *big.Int) { - tx1, ty1 := curve.toTwisted(x1, y1) - tx2, ty2 := curve.toTwisted(x2, y2) - return curve.fromTwisted(curve.twisted.Add(tx1, ty1, tx2, ty2)) -} - -func (curve *rcurve) Double(x1, y1 *big.Int) (x, y *big.Int) { - return curve.fromTwisted(curve.twisted.Double(curve.toTwisted(x1, y1))) -} - -func (curve *rcurve) ScalarMult(x1, y1 *big.Int, scalar []byte) (x, y *big.Int) { - tx1, ty1 := curve.toTwisted(x1, y1) - return curve.fromTwisted(curve.twisted.ScalarMult(tx1, ty1, scalar)) -} - -func (curve *rcurve) ScalarBaseMult(scalar []byte) (x, y *big.Int) { - return curve.fromTwisted(curve.twisted.ScalarBaseMult(scalar)) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/eax/eax.go b/vendor/github.com/ProtonMail/go-crypto/eax/eax.go deleted file mode 100644 index 3ae91d594..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/eax/eax.go +++ /dev/null @@ -1,162 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG - -// Package eax provides an implementation of the EAX -// (encrypt-authenticate-translate) mode of operation, as described in -// Bellare, Rogaway, and Wagner "THE EAX MODE OF OPERATION: A TWO-PASS -// AUTHENTICATED-ENCRYPTION SCHEME OPTIMIZED FOR SIMPLICITY AND EFFICIENCY." -// In FSE'04, volume 3017 of LNCS, 2004 -package eax - -import ( - "crypto/cipher" - "crypto/subtle" - "errors" - "github.com/ProtonMail/go-crypto/internal/byteutil" -) - -const ( - defaultTagSize = 16 - defaultNonceSize = 16 -) - -type eax struct { - block cipher.Block // Only AES-{128, 192, 256} supported - tagSize int // At least 12 bytes recommended - nonceSize int -} - -func (e *eax) NonceSize() int { - return e.nonceSize -} - -func (e *eax) Overhead() int { - return e.tagSize -} - -// NewEAX returns an EAX instance with AES-{KEYLENGTH} and default nonce and -// tag lengths. Supports {128, 192, 256}- bit key length. -func NewEAX(block cipher.Block) (cipher.AEAD, error) { - return NewEAXWithNonceAndTagSize(block, defaultNonceSize, defaultTagSize) -} - -// NewEAXWithNonceAndTagSize returns an EAX instance with AES-{keyLength} and -// given nonce and tag lengths in bytes. Panics on zero nonceSize and -// exceedingly long tags. -// -// It is recommended to use at least 12 bytes as tag length (see, for instance, -// NIST SP 800-38D). -// -// Only to be used for compatibility with existing cryptosystems with -// non-standard parameters. For all other cases, prefer NewEAX. -func NewEAXWithNonceAndTagSize( - block cipher.Block, nonceSize, tagSize int) (cipher.AEAD, error) { - if nonceSize < 1 { - return nil, eaxError("Cannot initialize EAX with nonceSize = 0") - } - if tagSize > block.BlockSize() { - return nil, eaxError("Custom tag length exceeds blocksize") - } - return &eax{ - block: block, - tagSize: tagSize, - nonceSize: nonceSize, - }, nil -} - -func (e *eax) Seal(dst, nonce, plaintext, adata []byte) []byte { - if len(nonce) > e.nonceSize { - panic("crypto/eax: Nonce too long for this instance") - } - ret, out := byteutil.SliceForAppend(dst, len(plaintext)+e.tagSize) - omacNonce := e.omacT(0, nonce) - omacAdata := e.omacT(1, adata) - - // Encrypt message using CTR mode and omacNonce as IV - ctr := cipher.NewCTR(e.block, omacNonce) - ciphertextData := out[:len(plaintext)] - ctr.XORKeyStream(ciphertextData, plaintext) - - omacCiphertext := e.omacT(2, ciphertextData) - - tag := out[len(plaintext):] - for i := 0; i < e.tagSize; i++ { - tag[i] = omacCiphertext[i] ^ omacNonce[i] ^ omacAdata[i] - } - return ret -} - -func (e *eax) Open(dst, nonce, ciphertext, adata []byte) ([]byte, error) { - if len(nonce) > e.nonceSize { - panic("crypto/eax: Nonce too long for this instance") - } - if len(ciphertext) < e.tagSize { - return nil, eaxError("Ciphertext shorter than tag length") - } - sep := len(ciphertext) - e.tagSize - - // Compute tag - omacNonce := e.omacT(0, nonce) - omacAdata := e.omacT(1, adata) - omacCiphertext := e.omacT(2, ciphertext[:sep]) - - tag := make([]byte, e.tagSize) - for i := 0; i < e.tagSize; i++ { - tag[i] = omacCiphertext[i] ^ omacNonce[i] ^ omacAdata[i] - } - - // Compare tags - if subtle.ConstantTimeCompare(ciphertext[sep:], tag) != 1 { - return nil, eaxError("Tag authentication failed") - } - - // Decrypt ciphertext - ret, out := byteutil.SliceForAppend(dst, len(ciphertext)) - ctr := cipher.NewCTR(e.block, omacNonce) - ctr.XORKeyStream(out, ciphertext[:sep]) - - return ret[:sep], nil -} - -// Tweakable OMAC - Calls OMAC_K([t]_n || plaintext) -func (e *eax) omacT(t byte, plaintext []byte) []byte { - blockSize := e.block.BlockSize() - byteT := make([]byte, blockSize) - byteT[blockSize-1] = t - concat := append(byteT, plaintext...) - return e.omac(concat) -} - -func (e *eax) omac(plaintext []byte) []byte { - blockSize := e.block.BlockSize() - // L ← E_K(0^n); B ← 2L; P ← 4L - L := make([]byte, blockSize) - e.block.Encrypt(L, L) - B := byteutil.GfnDouble(L) - P := byteutil.GfnDouble(B) - - // CBC with IV = 0 - cbc := cipher.NewCBCEncrypter(e.block, make([]byte, blockSize)) - padded := e.pad(plaintext, B, P) - cbcCiphertext := make([]byte, len(padded)) - cbc.CryptBlocks(cbcCiphertext, padded) - - return cbcCiphertext[len(cbcCiphertext)-blockSize:] -} - -func (e *eax) pad(plaintext, B, P []byte) []byte { - // if |M| in {n, 2n, 3n, ...} - blockSize := e.block.BlockSize() - if len(plaintext) != 0 && len(plaintext)%blockSize == 0 { - return byteutil.RightXor(plaintext, B) - } - - // else return (M || 1 || 0^(n−1−(|M| % n))) xor→ P - ending := make([]byte, blockSize-len(plaintext)%blockSize) - ending[0] = 0x80 - padded := append(plaintext, ending...) - return byteutil.RightXor(padded, P) -} - -func eaxError(err string) error { - return errors.New("crypto/eax: " + err) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/eax/eax_test_vectors.go b/vendor/github.com/ProtonMail/go-crypto/eax/eax_test_vectors.go deleted file mode 100644 index ddb53d079..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/eax/eax_test_vectors.go +++ /dev/null @@ -1,58 +0,0 @@ -package eax - -// Test vectors from -// https://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf -var testVectors = []struct { - msg, key, nonce, header, ciphertext string -}{ - {"", - "233952DEE4D5ED5F9B9C6D6FF80FF478", - "62EC67F9C3A4A407FCB2A8C49031A8B3", - "6BFB914FD07EAE6B", - "E037830E8389F27B025A2D6527E79D01"}, - {"F7FB", - "91945D3F4DCBEE0BF45EF52255F095A4", - "BECAF043B0A23D843194BA972C66DEBD", - "FA3BFD4806EB53FA", - "19DD5C4C9331049D0BDAB0277408F67967E5"}, - {"1A47CB4933", - "01F74AD64077F2E704C0F60ADA3DD523", - "70C3DB4F0D26368400A10ED05D2BFF5E", - "234A3463C1264AC6", - "D851D5BAE03A59F238A23E39199DC9266626C40F80"}, - {"481C9E39B1", - "D07CF6CBB7F313BDDE66B727AFD3C5E8", - "8408DFFF3C1A2B1292DC199E46B7D617", - "33CCE2EABFF5A79D", - "632A9D131AD4C168A4225D8E1FF755939974A7BEDE"}, - {"40D0C07DA5E4", - "35B6D0580005BBC12B0587124557D2C2", - "FDB6B06676EEDC5C61D74276E1F8E816", - "AEB96EAEBE2970E9", - "071DFE16C675CB0677E536F73AFE6A14B74EE49844DD"}, - {"4DE3B35C3FC039245BD1FB7D", - "BD8E6E11475E60B268784C38C62FEB22", - "6EAC5C93072D8E8513F750935E46DA1B", - "D4482D1CA78DCE0F", - "835BB4F15D743E350E728414ABB8644FD6CCB86947C5E10590210A4F"}, - {"8B0A79306C9CE7ED99DAE4F87F8DD61636", - "7C77D6E813BED5AC98BAA417477A2E7D", - "1A8C98DCD73D38393B2BF1569DEEFC19", - "65D2017990D62528", - "02083E3979DA014812F59F11D52630DA30137327D10649B0AA6E1C181DB617D7F2"}, - {"1BDA122BCE8A8DBAF1877D962B8592DD2D56", - "5FFF20CAFAB119CA2FC73549E20F5B0D", - "DDE59B97D722156D4D9AFF2BC7559826", - "54B9F04E6A09189A", - "2EC47B2C4954A489AFC7BA4897EDCDAE8CC33B60450599BD02C96382902AEF7F832A"}, - {"6CF36720872B8513F6EAB1A8A44438D5EF11", - "A4A4782BCFFD3EC5E7EF6D8C34A56123", - "B781FCF2F75FA5A8DE97A9CA48E522EC", - "899A175897561D7E", - "0DE18FD0FDD91E7AF19F1D8EE8733938B1E8E7F6D2231618102FDB7FE55FF1991700"}, - {"CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7", - "8395FCF1E95BEBD697BD010BC766AAC3", - "22E7ADD93CFC6393C57EC0B3C17D6B44", - "126735FCC320D25A", - "CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E"}, -} diff --git a/vendor/github.com/ProtonMail/go-crypto/eax/random_vectors.go b/vendor/github.com/ProtonMail/go-crypto/eax/random_vectors.go deleted file mode 100644 index 4eb19f28d..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/eax/random_vectors.go +++ /dev/null @@ -1,131 +0,0 @@ -// These vectors include key length in {128, 192, 256}, tag size 128, and -// random nonce, header, and plaintext lengths. - -// This file was automatically generated. - -package eax - -var randomVectors = []struct { - key, nonce, header, plaintext, ciphertext string -}{ - {"DFDE093F36B0356E5A81F609786982E3", - "1D8AC604419001816905BA72B14CED7E", - "152A1517A998D7A24163FCDD146DE81AC347C8B97088F502093C1ABB8F6E33D9A219C34D7603A18B1F5ABE02E56661B7D7F67E81EC08C1302EF38D80A859486D450E94A4F26AD9E68EEBBC0C857A0FC5CF9E641D63D565A7E361BC8908F5A8DC8FD6", - "1C8EAAB71077FE18B39730A3156ADE29C5EE824C7EE86ED2A253B775603FB237116E654F6FEC588DD27F523A0E01246FE73FE348491F2A8E9ABC6CA58D663F71CDBCF4AD798BE46C42AE6EE8B599DB44A1A48D7BBBBA0F7D2750181E1C5E66967F7D57CBD30AFBDA5727", - "79E7E150934BBEBF7013F61C60462A14D8B15AF7A248AFB8A344EF021C1500E16666891D6E973D8BB56B71A371F12CA34660C4410C016982B20F547E3762A58B7BF4F20236CADCF559E2BE7D783B13723B2741FC7CDC8997D839E39A3DDD2BADB96743DD7049F1BDB0516A262869915B3F70498AFB7B191BF960"}, - {"F10619EF02E5D94D7550EB84ED364A21", - "8DC0D4F2F745BBAE835CC5574B942D20", - "FE561358F2E8DF7E1024FF1AE9A8D36EBD01352214505CB99D644777A8A1F6027FA2BDBFC529A9B91136D5F2416CFC5F0F4EC3A1AFD32BDDA23CA504C5A5CB451785FABF4DFE4CD50D817491991A60615B30286361C100A95D1712F2A45F8E374461F4CA2B", - "D7B5A971FC219631D30EFC3664AE3127D9CF3097DAD9C24AC7905D15E8D9B25B026B31D68CAE00975CDB81EB1FD96FD5E1A12E2BB83FA25F1B1D91363457657FC03875C27F2946C5", - "2F336ED42D3CC38FC61660C4CD60BA4BD438B05F5965D8B7B399D2E7167F5D34F792D318F94DB15D67463AC449E13D568CC09BFCE32A35EE3EE96A041927680AE329811811E27F2D1E8E657707AF99BA96D13A478D695D59"}, - {"429F514EFC64D98A698A9247274CFF45", - "976AA5EB072F912D126ACEBC954FEC38", - "A71D89DC5B6CEDBB7451A27C3C2CAE09126DB4C421", - "5632FE62AB1DC549D54D3BC3FC868ACCEDEFD9ECF5E9F8", - "848AE4306CA8C7F416F8707625B7F55881C0AB430353A5C967CDA2DA787F581A70E34DBEBB2385"}, - {"398138F309085F47F8457CDF53895A63", - "F8A8A7F2D28E5FFF7BBC2F24353F7A36", - "5D633C21BA7764B8855CAB586F3746E236AD486039C83C6B56EFA9C651D38A41D6B20DAEE3418BFEA44B8BD6", - "A3BBAA91920AF5E10659818B1B3B300AC79BFC129C8329E75251F73A66D3AE0128EB91D5031E0A65C329DB7D1E9C0493E268", - "D078097267606E5FB07CFB7E2B4B718172A82C6A4CEE65D549A4DFB9838003BD2FBF64A7A66988AC1A632FD88F9E9FBB57C5A78AD2E086EACBA3DB68511D81C2970A"}, - {"7A4151EBD3901B42CBA45DAFB2E931BA", - "0FC88ACEE74DD538040321C330974EB8", - "250464FB04733BAB934C59E6AD2D6AE8D662CBCFEFBE61E5A308D4211E58C4C25935B72C69107722E946BFCBF416796600542D76AEB73F2B25BF53BAF97BDEB36ED3A7A51C31E7F170EB897457E7C17571D1BA0A908954E9", - "88C41F3EBEC23FAB8A362D969CAC810FAD4F7CA6A7F7D0D44F060F92E37E1183768DD4A8C733F71C96058D362A39876D183B86C103DE", - "74A25B2182C51096D48A870D80F18E1CE15867778E34FCBA6BD7BFB3739FDCD42AD0F2D9F4EBA29085285C6048C15BCE5E5166F1F962D3337AA88E6062F05523029D0A7F0BF9"}, - {"BFB147E1CD5459424F8C0271FC0E0DC5", - "EABCC126442BF373969EA3015988CC45", - "4C0880E1D71AA2C7", - "BE1B5EC78FBF73E7A6682B21BA7E0E5D2D1C7ABE", - "5660D7C1380E2F306895B1402CB2D6C37876504276B414D120F4CF92FDDDBB293A238EA0"}, - {"595DD6F52D18BC2CA8EB4EDAA18D9FA3", - "0F84B5D36CF4BC3B863313AF3B4D2E97", - "30AE6CC5F99580F12A779D98BD379A60948020C0B6FBD5746B30BA3A15C6CD33DAF376C70A9F15B6C0EB410A93161F7958AE23", - "8EF3687A1642B070970B0B91462229D1D76ABC154D18211F7152AA9FF368", - "317C1DDB11417E5A9CC4DDE7FDFF6659A5AC4B31DE025212580A05CDAC6024D3E4AE7C2966E52B9129E9ECDBED86"}, - {"44E6F2DC8FDC778AD007137D11410F50", - "270A237AD977F7187AA6C158A0BAB24F", - "509B0F0EB12E2AA5C5BA2DE553C07FAF4CE0C9E926531AA709A3D6224FCB783ACCF1559E10B1123EBB7D52E8AB54E6B5352A9ED0D04124BF0E9D9BACFD7E32B817B2E625F5EE94A64EDE9E470DE7FE6886C19B294F9F828209FE257A78", - "8B3D7815DF25618A5D0C55A601711881483878F113A12EC36CF64900549A3199555528559DC118F789788A55FAFD944E6E99A9CA3F72F238CD3F4D88223F7A745992B3FAED1848", - "1CC00D79F7AD82FDA71B58D286E5F34D0CC4CEF30704E771CC1E50746BDF83E182B078DB27149A42BAE619DF0F85B0B1090AD55D3B4471B0D6F6ECCD09C8F876B30081F0E7537A9624F8AAF29DA85E324122EFB4D68A56"}, - {"BB7BC352A03044B4428D8DBB4B0701FDEC4649FD17B81452", - "8B4BBE26CCD9859DCD84884159D6B0A4", - "2212BEB0E78E0F044A86944CF33C8D5C80D9DBE1034BF3BCF73611835C7D3A52F5BD2D81B68FD681B68540A496EE5DA16FD8AC8824E60E1EC2042BE28FB0BFAD4E4B03596446BDD8C37D936D9B3D5295BE19F19CF5ACE1D33A46C952CE4DE5C12F92C1DD051E04AEED", - "9037234CC44FFF828FABED3A7084AF40FA7ABFF8E0C0EFB57A1CC361E18FC4FAC1AB54F3ABFE9FF77263ACE16C3A", - "A9391B805CCD956081E0B63D282BEA46E7025126F1C1631239C33E92AA6F92CD56E5A4C56F00FF9658E93D48AF4EF0EF81628E34AD4DB0CDAEDCD2A17EE7"}, - {"99C0AD703196D2F60A74E6B378B838B31F82EA861F06FC4E", - "92745C018AA708ECFEB1667E9F3F1B01", - "828C69F376C0C0EC651C67749C69577D589EE39E51404D80EBF70C8660A8F5FD375473F4A7C611D59CB546A605D67446CE2AA844135FCD78BB5FBC90222A00D42920BB1D7EEDFB0C4672554F583EF23184F89063CDECBE482367B5F9AF3ACBC3AF61392BD94CBCD9B64677", - "A879214658FD0A5B0E09836639BF82E05EC7A5EF71D4701934BDA228435C68AC3D5CEB54997878B06A655EEACEFB1345C15867E7FE6C6423660C8B88DF128EBD6BCD85118DBAE16E9252FFB204324E5C8F38CA97759BDBF3CB0083", - "51FE87996F194A2585E438B023B345439EA60D1AEBED4650CDAF48A4D4EEC4FC77DC71CC4B09D3BEEF8B7B7AF716CE2B4EFFB3AC9E6323C18AC35E0AA6E2BBBC8889490EB6226C896B0D105EAB42BFE7053CCF00ED66BA94C1BA09A792AA873F0C3B26C5C5F9A936E57B25"}, - {"7086816D00D648FB8304AA8C9E552E1B69A9955FB59B25D1", - "0F45CF7F0BF31CCEB85D9DA10F4D749F", - "93F27C60A417D9F0669E86ACC784FC8917B502DAF30A6338F11B30B94D74FEFE2F8BE1BBE2EAD10FAB7EED3C6F72B7C3ECEE1937C32ED4970A6404E139209C05", - "877F046601F3CBE4FB1491943FA29487E738F94B99AF206262A1D6FF856C9AA0B8D4D08A54370C98F8E88FA3DCC2B14C1F76D71B2A4C7963AEE8AF960464C5BEC8357AD00DC8", - "FE96906B895CE6A8E72BC72344E2C8BB3C63113D70EAFA26C299BAFE77A8A6568172EB447FB3E86648A0AF3512DEB1AAC0819F3EC553903BF28A9FB0F43411237A774BF9EE03E445D280FBB9CD12B9BAAB6EF5E52691"}, - {"062F65A896D5BF1401BADFF70E91B458E1F9BD4888CB2E4D", - "5B11EA1D6008EBB41CF892FCA5B943D1", - "BAF4FF5C8242", - "A8870E091238355984EB2F7D61A865B9170F440BFF999A5993DD41A10F4440D21FF948DDA2BF663B2E03AC3324492DC5E40262ECC6A65C07672353BE23E7FB3A9D79FF6AA38D97960905A38DECC312CB6A59E5467ECF06C311CD43ADC0B543EDF34FE8BE611F176460D5627CA51F8F8D9FED71F55C", - "B10E127A632172CF8AA7539B140D2C9C2590E6F28C3CB892FC498FCE56A34F732FBFF32E79C7B9747D9094E8635A0C084D6F0247F9768FB5FF83493799A9BEC6C39572120C40E9292C8C947AE8573462A9108C36D9D7112E6995AE5867E6C8BB387D1C5D4BEF524F391B9FD9F0A3B4BFA079E915BCD920185CFD38D114C558928BD7D47877"}, - {"38A8E45D6D705A11AF58AED5A1344896998EACF359F2E26A", - "FD82B5B31804FF47D44199B533D0CF84", - "DE454D4E62FE879F2050EE3E25853623D3E9AC52EEC1A1779A48CFAF5ECA0BFDE44749391866D1", - "B804", - "164BB965C05EBE0931A1A63293EDF9C38C27"}, - {"34C33C97C6D7A0850DA94D78A58DC61EC717CD7574833068", - "343BE00DA9483F05C14F2E9EB8EA6AE8", - "78312A43EFDE3CAE34A65796FF059A3FE15304EEA5CF1D9306949FE5BF3349D4977D4EBE76C040FE894C5949E4E4D6681153DA87FB9AC5062063CA2EA183566343362370944CE0362D25FC195E124FD60E8682E665D13F2229DDA3E4B2CB1DCA", - "CC11BB284B1153578E4A5ED9D937B869DAF00F5B1960C23455CA9CC43F486A3BE0B66254F1041F04FDF459C8640465B6E1D2CF899A381451E8E7FCB50CF87823BE77E24B132BBEEDC72E53369B275E1D8F49ECE59F4F215230AC4FE133FC80E4F634EE80BA4682B62C86", - "E7F703DC31A95E3A4919FF957836CB76C063D81702AEA4703E1C2BF30831E58C4609D626EC6810E12EAA5B930F049FF9EFC22C3E3F1EBD4A1FB285CB02A1AC5AD46B425199FC0A85670A5C4E3DAA9636C8F64C199F42F18AAC8EA7457FD377F322DD7752D7D01B946C8F0A97E6113F0D50106F319AFD291AAACE"}, - {"C6ECF7F053573E403E61B83052A343D93CBCC179D1E835BE", - "E280E13D7367042E3AA09A80111B6184", - "21486C9D7A9647", - "5F2639AFA6F17931853791CD8C92382BBB677FD72D0AB1A080D0E49BFAA21810E963E4FACD422E92F65CBFAD5884A60CD94740DF31AF02F95AA57DA0C4401B0ED906", - "5C51DB20755302070C45F52E50128A67C8B2E4ED0EACB7E29998CCE2E8C289DD5655913EC1A51CC3AABE5CDC2402B2BE7D6D4BF6945F266FBD70BA9F37109067157AE7530678B45F64475D4EBFCB5FFF46A5"}, - {"5EC6CF7401BC57B18EF154E8C38ACCA8959E57D2F3975FF5", - "656B41CB3F9CF8C08BAD7EBFC80BD225", - "6B817C2906E2AF425861A7EF59BA5801F143EE2A139EE72697CDE168B4", - "2C0E1DDC9B1E5389BA63845B18B1F8A1DB062037151BCC56EF7C21C0BB4DAE366636BBA975685D7CC5A94AFBE89C769016388C56FB7B57CE750A12B718A8BDCF70E80E8659A8330EFC8F86640F21735E8C80E23FE43ABF23507CE3F964AE4EC99D", - "ED780CF911E6D1AA8C979B889B0B9DC1ABE261832980BDBFB576901D9EF5AB8048998E31A15BE54B3E5845A4D136AD24D0BDA1C3006168DF2F8AC06729CB0818867398150020131D8F04EDF1923758C9EABB5F735DE5EA1758D4BC0ACFCA98AFD202E9839B8720253693B874C65586C6F0"}, - {"C92F678EB2208662F5BCF3403EC05F5961E957908A3E79421E1D25FC19054153", - "DA0F3A40983D92F2D4C01FED33C7A192", - "2B6E9D26DB406A0FAB47608657AA10EFC2B4AA5F459B29FF85AC9A40BFFE7AEB04F77E9A11FAAA116D7F6D4DA417671A9AB02C588E0EF59CB1BFB4B1CC931B63A3B3A159FCEC97A04D1E6F0C7E6A9CEF6B0ABB04758A69F1FE754DF4C2610E8C46B6CF413BDB31351D55BEDCB7B4A13A1C98E10984475E0F2F957853", - "F37326A80E08", - "83519E53E321D334F7C10B568183775C0E9AAE55F806"}, - {"6847E0491BE57E72995D186D50094B0B3593957A5146798FCE68B287B2FB37B5", - "3EE1182AEBB19A02B128F28E1D5F7F99", - "D9F35ABB16D776CE", - "DB7566ED8EA95BDF837F23DB277BAFBC5E70D1105ADFD0D9EF15475051B1EF94709C67DCA9F8D5", - "2CDCED0C9EBD6E2A508822A685F7DCD1CDD99E7A5FCA786C234E7F7F1D27EC49751AD5DCFA30C5EDA87C43CAE3B919B6BBCFE34C8EDA59"}, - {"82B019673642C08388D3E42075A4D5D587558C229E4AB8F660E37650C4C41A0A", - "336F5D681E0410FAE7B607246092C6DC", - "D430CBD8FE435B64214E9E9CDC5DE99D31CFCFB8C10AA0587A49DF276611", - "998404153AD77003E1737EDE93ED79859EE6DCCA93CB40C4363AA817ABF2DBBD46E42A14A7183B6CC01E12A577888141363D0AE011EB6E8D28C0B235", - "9BEF69EEB60BD3D6065707B7557F25292A8872857CFBD24F2F3C088E4450995333088DA50FD9121221C504DF1D0CD5EFE6A12666C5D5BB12282CF4C19906E9CFAB97E9BDF7F49DC17CFC384B"}, - {"747B2E269B1859F0622C15C8BAD6A725028B1F94B8DB7326948D1E6ED663A8BC", - "AB91F7245DDCE3F1C747872D47BE0A8A", - "3B03F786EF1DDD76E1D42646DA4CD2A5165DC5383CE86D1A0B5F13F910DC278A4E451EE0192CBA178E13B3BA27FDC7840DF73D2E104B", - "6B803F4701114F3E5FE21718845F8416F70F626303F545BE197189E0A2BA396F37CE06D389EB2658BC7D56D67868708F6D0D32", - "1570DDB0BCE75AA25D1957A287A2C36B1A5F2270186DA81BA6112B7F43B0F3D1D0ED072591DCF1F1C99BBB25621FC39B896FF9BD9413A2845363A9DCD310C32CF98E57"}, - {"02E59853FB29AEDA0FE1C5F19180AD99A12FF2F144670BB2B8BADF09AD812E0A", - "C691294EF67CD04D1B9242AF83DD1421", - "879334DAE3", - "1E17F46A98FEF5CBB40759D95354", - "FED8C3FF27DDF6313AED444A2985B36CBA268AAD6AAC563C0BA28F6DB5DB"}, - {"F6C1FB9B4188F2288FF03BD716023198C3582CF2A037FC2F29760916C2B7FCDB", - "4228DA0678CA3534588859E77DFF014C", - "D8153CAF35539A61DD8D05B3C9B44F01E564FB9348BCD09A1C23B84195171308861058F0A3CD2A55B912A3AAEE06FF4D356C77275828F2157C2FC7C115DA39E443210CCC56BEDB0CC99BBFB227ABD5CC454F4E7F547C7378A659EEB6A7E809101A84F866503CB18D4484E1FA09B3EC7FC75EB2E35270800AA7", - "23B660A779AD285704B12EC1C580387A47BEC7B00D452C6570", - "5AA642BBABA8E49849002A2FAF31DB8FC7773EFDD656E469CEC19B3206D4174C9A263D0A05484261F6"}, - {"8FF6086F1FADB9A3FBE245EAC52640C43B39D43F89526BB5A6EBA47710931446", - "943188480C99437495958B0AE4831AA9", - "AD5CD0BDA426F6EBA23C8EB23DC73FF9FEC173355EDBD6C9344C4C4383F211888F7CE6B29899A6801DF6B38651A7C77150941A", - "80CD5EA8D7F81DDF5070B934937912E8F541A5301877528EB41AB60C020968D459960ED8FB73083329841A", - "ABAE8EB7F36FCA2362551E72DAC890BA1BB6794797E0FC3B67426EC9372726ED4725D379EA0AC9147E48DCD0005C502863C2C5358A38817C8264B5"}, - {"A083B54E6B1FE01B65D42FCD248F97BB477A41462BBFE6FD591006C022C8FD84", - "B0490F5BD68A52459556B3749ACDF40E", - "8892E047DA5CFBBDF7F3CFCBD1BD21C6D4C80774B1826999234394BD3E513CC7C222BB40E1E3140A152F19B3802F0D036C24A590512AD0E8", - "D7B15752789DC94ED0F36778A5C7BBB207BEC32BAC66E702B39966F06E381E090C6757653C3D26A81EC6AD6C364D66867A334C91BB0B8A8A4B6EACDF0783D09010AEBA2DD2062308FE99CC1F", - "C071280A732ADC93DF272BF1E613B2BB7D46FC6665EF2DC1671F3E211D6BDE1D6ADDD28DF3AA2E47053FC8BB8AE9271EC8BC8B2CFFA320D225B451685B6D23ACEFDD241FE284F8ADC8DB07F456985B14330BBB66E0FB212213E05B3E"}, -} diff --git a/vendor/github.com/ProtonMail/go-crypto/internal/byteutil/byteutil.go b/vendor/github.com/ProtonMail/go-crypto/internal/byteutil/byteutil.go deleted file mode 100644 index d558b9bd8..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/internal/byteutil/byteutil.go +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG -// This file contains necessary tools for the aex and ocb packages. -// -// These functions SHOULD NOT be used elsewhere, since they are optimized for -// specific input nature in the EAX and OCB modes of operation. - -package byteutil - -// GfnDouble computes 2 * input in the field of 2^n elements. -// The irreducible polynomial in the finite field for n=128 is -// x^128 + x^7 + x^2 + x + 1 (equals 0x87) -// Constant-time execution in order to avoid side-channel attacks -func GfnDouble(input []byte) []byte { - if len(input) != 16 { - panic("Doubling in GFn only implemented for n = 128") - } - // If the first bit is zero, return 2L = L << 1 - // Else return (L << 1) xor 0^120 10000111 - shifted := ShiftBytesLeft(input) - shifted[15] ^= ((input[0] >> 7) * 0x87) - return shifted -} - -// ShiftBytesLeft outputs the byte array corresponding to x << 1 in binary. -func ShiftBytesLeft(x []byte) []byte { - l := len(x) - dst := make([]byte, l) - for i := 0; i < l-1; i++ { - dst[i] = (x[i] << 1) | (x[i+1] >> 7) - } - dst[l-1] = x[l-1] << 1 - return dst -} - -// ShiftNBytesLeft puts in dst the byte array corresponding to x << n in binary. -func ShiftNBytesLeft(dst, x []byte, n int) { - // Erase first n / 8 bytes - copy(dst, x[n/8:]) - - // Shift the remaining n % 8 bits - bits := uint(n % 8) - l := len(dst) - for i := 0; i < l-1; i++ { - dst[i] = (dst[i] << bits) | (dst[i+1] >> uint(8-bits)) - } - dst[l-1] = dst[l-1] << bits - - // Append trailing zeroes - dst = append(dst, make([]byte, n/8)...) -} - -// XorBytesMut replaces X with X XOR Y. len(X) must be >= len(Y). -func XorBytesMut(X, Y []byte) { - for i := 0; i < len(Y); i++ { - X[i] ^= Y[i] - } -} - -// XorBytes puts X XOR Y into Z. len(Z) and len(X) must be >= len(Y). -func XorBytes(Z, X, Y []byte) { - for i := 0; i < len(Y); i++ { - Z[i] = X[i] ^ Y[i] - } -} - -// RightXor XORs smaller input (assumed Y) at the right of the larger input (assumed X) -func RightXor(X, Y []byte) []byte { - offset := len(X) - len(Y) - xored := make([]byte, len(X)) - copy(xored, X) - for i := 0; i < len(Y); i++ { - xored[offset+i] ^= Y[i] - } - return xored -} - -// SliceForAppend takes a slice and a requested number of bytes. It returns a -// slice with the contents of the given slice followed by that many bytes and a -// second slice that aliases into it and contains only the extra bytes. If the -// original slice has sufficient capacity then no allocation is performed. -func SliceForAppend(in []byte, n int) (head, tail []byte) { - if total := len(in) + n; cap(in) >= total { - head = in[:total] - } else { - head = make([]byte, total) - copy(head, in) - } - tail = head[len(in):] - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/ocb/ocb.go b/vendor/github.com/ProtonMail/go-crypto/ocb/ocb.go deleted file mode 100644 index 24f893017..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/ocb/ocb.go +++ /dev/null @@ -1,313 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG - -// Package ocb provides an implementation of the OCB (offset codebook) mode of -// operation, as described in RFC-7253 of the IRTF and in Rogaway, Bellare, -// Black and Krovetz - OCB: A BLOCK-CIPHER MODE OF OPERATION FOR EFFICIENT -// AUTHENTICATED ENCRYPTION (2003). -// Security considerations (from RFC-7253): A private key MUST NOT be used to -// encrypt more than 2^48 blocks. Tag length should be at least 12 bytes (a -// brute-force forging adversary succeeds after 2^{tag length} attempts). A -// single key SHOULD NOT be used to decrypt ciphertext with different tag -// lengths. Nonces need not be secret, but MUST NOT be reused. -// This package only supports underlying block ciphers with 128-bit blocks, -// such as AES-{128, 192, 256}, but may be extended to other sizes. -package ocb - -import ( - "bytes" - "crypto/cipher" - "crypto/subtle" - "errors" - "math/bits" - - "github.com/ProtonMail/go-crypto/internal/byteutil" -) - -type ocb struct { - block cipher.Block - tagSize int - nonceSize int - mask mask - // Optimized en/decrypt: For each nonce N used to en/decrypt, the 'Ktop' - // internal variable can be reused for en/decrypting with nonces sharing - // all but the last 6 bits with N. The prefix of the first nonce used to - // compute the new Ktop, and the Ktop value itself, are stored in - // reusableKtop. If using incremental nonces, this saves one block cipher - // call every 63 out of 64 OCB encryptions, and stores one nonce and one - // output of the block cipher in memory only. - reusableKtop reusableKtop -} - -type mask struct { - // L_*, L_$, (L_i)_{i ∈ N} - lAst []byte - lDol []byte - L [][]byte -} - -type reusableKtop struct { - noncePrefix []byte - Ktop []byte -} - -const ( - defaultTagSize = 16 - defaultNonceSize = 15 -) - -const ( - enc = iota - dec -) - -func (o *ocb) NonceSize() int { - return o.nonceSize -} - -func (o *ocb) Overhead() int { - return o.tagSize -} - -// NewOCB returns an OCB instance with the given block cipher and default -// tag and nonce sizes. -func NewOCB(block cipher.Block) (cipher.AEAD, error) { - return NewOCBWithNonceAndTagSize(block, defaultNonceSize, defaultTagSize) -} - -// NewOCBWithNonceAndTagSize returns an OCB instance with the given block -// cipher, nonce length, and tag length. Panics on zero nonceSize and -// exceedingly long tag size. -// -// It is recommended to use at least 12 bytes as tag length. -func NewOCBWithNonceAndTagSize( - block cipher.Block, nonceSize, tagSize int) (cipher.AEAD, error) { - if block.BlockSize() != 16 { - return nil, ocbError("Block cipher must have 128-bit blocks") - } - if nonceSize < 1 { - return nil, ocbError("Incorrect nonce length") - } - if nonceSize >= block.BlockSize() { - return nil, ocbError("Nonce length exceeds blocksize - 1") - } - if tagSize > block.BlockSize() { - return nil, ocbError("Custom tag length exceeds blocksize") - } - return &ocb{ - block: block, - tagSize: tagSize, - nonceSize: nonceSize, - mask: initializeMaskTable(block), - reusableKtop: reusableKtop{ - noncePrefix: nil, - Ktop: nil, - }, - }, nil -} - -func (o *ocb) Seal(dst, nonce, plaintext, adata []byte) []byte { - if len(nonce) > o.nonceSize { - panic("crypto/ocb: Incorrect nonce length given to OCB") - } - sep := len(plaintext) - ret, out := byteutil.SliceForAppend(dst, sep+o.tagSize) - tag := o.crypt(enc, out[:sep], nonce, adata, plaintext) - copy(out[sep:], tag) - return ret -} - -func (o *ocb) Open(dst, nonce, ciphertext, adata []byte) ([]byte, error) { - if len(nonce) > o.nonceSize { - panic("Nonce too long for this instance") - } - if len(ciphertext) < o.tagSize { - return nil, ocbError("Ciphertext shorter than tag length") - } - sep := len(ciphertext) - o.tagSize - ret, out := byteutil.SliceForAppend(dst, sep) - ciphertextData := ciphertext[:sep] - tag := o.crypt(dec, out, nonce, adata, ciphertextData) - if subtle.ConstantTimeCompare(tag, ciphertext[sep:]) == 1 { - return ret, nil - } - for i := range out { - out[i] = 0 - } - return nil, ocbError("Tag authentication failed") -} - -// On instruction enc (resp. dec), crypt is the encrypt (resp. decrypt) -// function. It writes the resulting plain/ciphertext into Y and returns -// the tag. -func (o *ocb) crypt(instruction int, Y, nonce, adata, X []byte) []byte { - // - // Consider X as a sequence of 128-bit blocks - // - // Note: For encryption (resp. decryption), X is the plaintext (resp., the - // ciphertext without the tag). - blockSize := o.block.BlockSize() - - // - // Nonce-dependent and per-encryption variables - // - // Zero out the last 6 bits of the nonce into truncatedNonce to see if Ktop - // is already computed. - truncatedNonce := make([]byte, len(nonce)) - copy(truncatedNonce, nonce) - truncatedNonce[len(truncatedNonce)-1] &= 192 - var Ktop []byte - if bytes.Equal(truncatedNonce, o.reusableKtop.noncePrefix) { - Ktop = o.reusableKtop.Ktop - } else { - // Nonce = num2str(TAGLEN mod 128, 7) || zeros(120 - bitlen(N)) || 1 || N - paddedNonce := append(make([]byte, blockSize-1-len(nonce)), 1) - paddedNonce = append(paddedNonce, truncatedNonce...) - paddedNonce[0] |= byte(((8 * o.tagSize) % (8 * blockSize)) << 1) - // Last 6 bits of paddedNonce are already zero. Encrypt into Ktop - paddedNonce[blockSize-1] &= 192 - Ktop = paddedNonce - o.block.Encrypt(Ktop, Ktop) - o.reusableKtop.noncePrefix = truncatedNonce - o.reusableKtop.Ktop = Ktop - } - - // Stretch = Ktop || ((lower half of Ktop) XOR (lower half of Ktop << 8)) - xorHalves := make([]byte, blockSize/2) - byteutil.XorBytes(xorHalves, Ktop[:blockSize/2], Ktop[1:1+blockSize/2]) - stretch := append(Ktop, xorHalves...) - bottom := int(nonce[len(nonce)-1] & 63) - offset := make([]byte, len(stretch)) - byteutil.ShiftNBytesLeft(offset, stretch, bottom) - offset = offset[:blockSize] - - // - // Process any whole blocks - // - // Note: For encryption Y is ciphertext || tag, for decryption Y is - // plaintext || tag. - checksum := make([]byte, blockSize) - m := len(X) / blockSize - for i := 0; i < m; i++ { - index := bits.TrailingZeros(uint(i + 1)) - if len(o.mask.L)-1 < index { - o.mask.extendTable(index) - } - byteutil.XorBytesMut(offset, o.mask.L[bits.TrailingZeros(uint(i+1))]) - blockX := X[i*blockSize : (i+1)*blockSize] - blockY := Y[i*blockSize : (i+1)*blockSize] - switch instruction { - case enc: - byteutil.XorBytesMut(checksum, blockX) - byteutil.XorBytes(blockY, blockX, offset) - o.block.Encrypt(blockY, blockY) - byteutil.XorBytesMut(blockY, offset) - case dec: - byteutil.XorBytes(blockY, blockX, offset) - o.block.Decrypt(blockY, blockY) - byteutil.XorBytesMut(blockY, offset) - byteutil.XorBytesMut(checksum, blockY) - } - } - // - // Process any final partial block and compute raw tag - // - tag := make([]byte, blockSize) - if len(X)%blockSize != 0 { - byteutil.XorBytesMut(offset, o.mask.lAst) - pad := make([]byte, blockSize) - o.block.Encrypt(pad, offset) - chunkX := X[blockSize*m:] - chunkY := Y[blockSize*m : len(X)] - switch instruction { - case enc: - byteutil.XorBytesMut(checksum, chunkX) - checksum[len(chunkX)] ^= 128 - byteutil.XorBytes(chunkY, chunkX, pad[:len(chunkX)]) - // P_* || bit(1) || zeroes(127) - len(P_*) - case dec: - byteutil.XorBytes(chunkY, chunkX, pad[:len(chunkX)]) - // P_* || bit(1) || zeroes(127) - len(P_*) - byteutil.XorBytesMut(checksum, chunkY) - checksum[len(chunkY)] ^= 128 - } - } - byteutil.XorBytes(tag, checksum, offset) - byteutil.XorBytesMut(tag, o.mask.lDol) - o.block.Encrypt(tag, tag) - byteutil.XorBytesMut(tag, o.hash(adata)) - return tag[:o.tagSize] -} - -// This hash function is used to compute the tag. Per design, on empty input it -// returns a slice of zeros, of the same length as the underlying block cipher -// block size. -func (o *ocb) hash(adata []byte) []byte { - // - // Consider A as a sequence of 128-bit blocks - // - A := make([]byte, len(adata)) - copy(A, adata) - blockSize := o.block.BlockSize() - - // - // Process any whole blocks - // - sum := make([]byte, blockSize) - offset := make([]byte, blockSize) - m := len(A) / blockSize - for i := 0; i < m; i++ { - chunk := A[blockSize*i : blockSize*(i+1)] - index := bits.TrailingZeros(uint(i + 1)) - // If the mask table is too short - if len(o.mask.L)-1 < index { - o.mask.extendTable(index) - } - byteutil.XorBytesMut(offset, o.mask.L[index]) - byteutil.XorBytesMut(chunk, offset) - o.block.Encrypt(chunk, chunk) - byteutil.XorBytesMut(sum, chunk) - } - - // - // Process any final partial block; compute final hash value - // - if len(A)%blockSize != 0 { - byteutil.XorBytesMut(offset, o.mask.lAst) - // Pad block with 1 || 0 ^ 127 - bitlength(a) - ending := make([]byte, blockSize-len(A)%blockSize) - ending[0] = 0x80 - encrypted := append(A[blockSize*m:], ending...) - byteutil.XorBytesMut(encrypted, offset) - o.block.Encrypt(encrypted, encrypted) - byteutil.XorBytesMut(sum, encrypted) - } - return sum -} - -func initializeMaskTable(block cipher.Block) mask { - // - // Key-dependent variables - // - lAst := make([]byte, block.BlockSize()) - block.Encrypt(lAst, lAst) - lDol := byteutil.GfnDouble(lAst) - L := make([][]byte, 1) - L[0] = byteutil.GfnDouble(lDol) - - return mask{ - lAst: lAst, - lDol: lDol, - L: L, - } -} - -// Extends the L array of mask m up to L[limit], with L[i] = GfnDouble(L[i-1]) -func (m *mask) extendTable(limit int) { - for i := len(m.L); i <= limit; i++ { - m.L = append(m.L, byteutil.GfnDouble(m.L[i-1])) - } -} - -func ocbError(err string) error { - return errors.New("crypto/ocb: " + err) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/ocb/random_vectors.go b/vendor/github.com/ProtonMail/go-crypto/ocb/random_vectors.go deleted file mode 100644 index 0efaf344f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/ocb/random_vectors.go +++ /dev/null @@ -1,136 +0,0 @@ -// In the test vectors provided by RFC 7253, the "bottom" -// internal variable, which defines "offset" for the first time, does not -// exceed 15. However, it can attain values up to 63. - -// These vectors include key length in {128, 192, 256}, tag size 128, and -// random nonce, header, and plaintext lengths. - -// This file was automatically generated. - -package ocb - -var randomVectors = []struct { - key, nonce, header, plaintext, ciphertext string -}{ - - {"9438C5D599308EAF13F800D2D31EA7F0", - "C38EE4801BEBFFA1CD8635BE", - "0E507B7DADD8A98CDFE272D3CB6B3E8332B56AE583FB049C0874D4200BED16BD1A044182434E9DA0E841F182DFD5B3016B34641CED0784F1745F63AB3D0DA22D3351C9EF9A658B8081E24498EBF61FCE40DA6D8E184536", - "962D227786FB8913A8BAD5DC3250", - "EEDEF5FFA5986D1E3BF86DDD33EF9ADC79DCA06E215FA772CCBA814F63AD"}, - {"BA7DE631C7D6712167C6724F5B9A2B1D", - "35263EBDA05765DC0E71F1F5", - "0103257B4224507C0242FEFE821EA7FA42E0A82863E5F8B68F7D881B4B44FA428A2B6B21D2F591260802D8AB6D83", - "9D6D1FC93AE8A64E7889B7B2E3521EFA9B920A8DDB692E6F833DDC4A38AFA535E5E2A3ED82CB7E26404AB86C54D01C4668F28398C2DF33D5D561CBA1C8DCFA7A912F5048E545B59483C0E3221F54B14DAA2E4EB657B3BEF9554F34CAD69B2724AE962D3D8A", - "E93852D1985C5E775655E937FA79CE5BF28A585F2AF53A5018853B9634BE3C84499AC0081918FDCE0624494D60E25F76ACD6853AC7576E3C350F332249BFCABD4E73CEABC36BE4EDDA40914E598AE74174A0D7442149B26990899491BDDFE8FC54D6C18E83AE9E9A6FFBF5D376565633862EEAD88D"}, - {"2E74B25289F6FD3E578C24866E9C72A5", - "FD912F15025AF8414642BA1D1D", - "FB5FB8C26F365EEDAB5FE260C6E3CCD27806729C8335F146063A7F9EA93290E56CF84576EB446350D22AD730547C267B1F0BBB97EB34E1E2C41A", - "6C092EBF78F76EE8C1C6E592277D9545BA16EDB67BC7D8480B9827702DC2F8A129E2B08A2CE710CA7E1DA45CE162BB6CD4B512E632116E2211D3C90871EFB06B8D4B902681C7FB", - "6AC0A77F26531BF4F354A1737F99E49BE32ECD909A7A71AD69352906F54B08A9CE9B8CA5D724CBFFC5673437F23F630697F3B84117A1431D6FA8CC13A974FB4AD360300522E09511B99E71065D5AC4BBCB1D791E864EF4"}, - {"E7EC507C802528F790AFF5303A017B17", - "4B97A7A568940A9E3CE7A99E93031E", - "28349BDC5A09390C480F9B8AA3EDEA3DDB8B9D64BCA322C570B8225DF0E31190DAB25A4014BA39519E02ABFB12B89AA28BBFD29E486E7FB28734258C817B63CED9912DBAFEBB93E2798AB2890DE3B0ACFCFF906AB15563EF7823CE83D27CDB251195E22BD1337BCBDE65E7C2C427321C463C2777BFE5AEAA", - "9455B3EA706B74", - "7F33BA3EA848D48A96B9530E26888F43EBD4463C9399B6"}, - {"6C928AA3224736F28EE7378DE0090191", - "8936138E2E4C6A13280017A1622D", - "6202717F2631565BDCDC57C6584543E72A7C8BD444D0D108ED35069819633C", - "DA0691439E5F035F3E455269D14FE5C201C8C9B0A3FE2D3F86BCC59387C868FE65733D388360B31E3CE28B4BF6A8BE636706B536D5720DB66B47CF1C7A5AFD6F61E0EF90F1726D6B0E169F9A768B2B7AE4EE00A17F630AC905FCAAA1B707FFF25B3A1AAE83B504837C64A5639B2A34002B300EC035C9B43654DA55", - "B8804D182AB0F0EEB464FA7BD1329AD6154F982013F3765FEDFE09E26DAC078C9C1439BFC1159D6C02A25E3FF83EF852570117B315852AD5EE20E0FA3AA0A626B0E43BC0CEA38B44579DD36803455FB46989B90E6D229F513FD727AF8372517E9488384C515D6067704119C931299A0982EDDFB9C2E86A90C450C077EB222511EC9CCABC9FCFDB19F70088"}, - {"ECEA315CA4B3F425B0C9957A17805EA4", - "664CDAE18403F4F9BA13015A44FC", - "642AFB090D6C6DB46783F08B01A3EF2A8FEB5736B531EAC226E7888FCC8505F396818F83105065FACB3267485B9E5E4A0261F621041C08FCCB2A809A49AB5252A91D0971BCC620B9D614BD77E57A0EED2FA5", - "6852C31F8083E20E364CEA21BB7854D67CEE812FE1C9ED2425C0932A90D3780728D1BB", - "2ECEF962A9695A463ADABB275BDA9FF8B2BA57AEC2F52EFFB700CD9271A74D2A011C24AEA946051BD6291776429B7E681BA33E"}, - {"4EE616C4A58AAA380878F71A373461F6", - "91B8C9C176D9C385E9C47E52", - "CDA440B7F9762C572A718AC754EDEECC119E5EE0CCB9FEA4FFB22EEE75087C032EBF3DA9CDD8A28CC010B99ED45143B41A4BA50EA2A005473F89639237838867A57F23B0F0ED3BF22490E4501DAC9C658A9B9F", - "D6E645FA9AE410D15B8123FD757FA356A8DBE9258DDB5BE88832E615910993F497EC", - "B70ED7BF959FB2AAED4F36174A2A99BFB16992C8CDF369C782C4DB9C73DE78C5DB8E0615F647243B97ACDB24503BC9CADC48"}, - {"DCD475773136C830D5E3D0C5FE05B7FF", - "BB8E1FBB483BE7616A922C4A", - "36FEF2E1CB29E76A6EA663FC3AF66ECD7404F466382F7B040AABED62293302B56E8783EF7EBC21B4A16C3E78A7483A0A403F253A2CDC5BBF79DC3DAE6C73F39A961D8FBBE8D41B", - "441E886EA38322B2437ECA7DEB5282518865A66780A454E510878E61BFEC3106A3CD93D2A02052E6F9E1832F9791053E3B76BF4C07EFDD6D4106E3027FABB752E60C1AA425416A87D53938163817A1051EBA1D1DEEB4B9B25C7E97368B52E5911A31810B0EC5AF547559B6142D9F4C4A6EF24A4CF75271BF9D48F62B", - "1BE4DD2F4E25A6512C2CC71D24BBB07368589A94C2714962CD0ACE5605688F06342587521E75F0ACAFFD86212FB5C34327D238DB36CF2B787794B9A4412E7CD1410EA5DDD2450C265F29CF96013CD213FD2880657694D718558964BC189B4A84AFCF47EB012935483052399DBA5B088B0A0477F20DFE0E85DCB735E21F22A439FB837DD365A93116D063E607"}, - {"3FBA2B3D30177FFE15C1C59ED2148BB2C091F5615FBA7C07", - "FACF804A4BEBF998505FF9DE", - "8213B9263B2971A5BDA18DBD02208EE1", - "15B323926993B326EA19F892D704439FC478828322AF72118748284A1FD8A6D814E641F70512FD706980337379F31DC63355974738D7FEA87AD2858C0C2EBBFBE74371C21450072373C7B651B334D7C4D43260B9D7CCD3AF9EDB", - "6D35DC1469B26E6AAB26272A41B46916397C24C485B61162E640A062D9275BC33DDCFD3D9E1A53B6C8F51AC89B66A41D59B3574197A40D9B6DCF8A4E2A001409C8112F16B9C389E0096179DB914E05D6D11ED0005AD17E1CE105A2F0BAB8F6B1540DEB968B7A5428FF44"}, - {"53B52B8D4D748BCDF1DDE68857832FA46227FA6E2F32EFA1", - "0B0EF53D4606B28D1398355F", - "F23882436349094AF98BCACA8218E81581A043B19009E28EFBF2DE37883E04864148CC01D240552CA8844EC1456F42034653067DA67E80F87105FD06E14FF771246C9612867BE4D215F6D761", - "F15030679BD4088D42CAC9BF2E9606EAD4798782FA3ED8C57EBE7F84A53236F51B25967C6489D0CD20C9EEA752F9BC", - "67B96E2D67C3729C96DAEAEDF821D61C17E648643A2134C5621FEC621186915AD80864BFD1EB5B238BF526A679385E012A457F583AFA78134242E9D9C1B4E4"}, - {"0272DD80F23399F49BFC320381A5CD8225867245A49A7D41", - "5C83F4896D0738E1366B1836", - "69B0337289B19F73A12BAEEA857CCAF396C11113715D9500CCCF48BA08CFF12BC8B4BADB3084E63B85719DB5058FA7C2C11DEB096D7943CFA7CAF5", - "C01AD10FC8B562CD17C7BC2FAB3E26CBDFF8D7F4DEA816794BBCC12336991712972F52816AABAB244EB43B0137E2BAC1DD413CE79531E78BEF782E6B439612BB3AEF154DE3502784F287958EBC159419F9EBA27916A28D6307324129F506B1DE80C1755A929F87", - "FEFE52DD7159C8DD6E8EC2D3D3C0F37AB6CB471A75A071D17EC4ACDD8F3AA4D7D4F7BB559F3C09099E3D9003E5E8AA1F556B79CECDE66F85B08FA5955E6976BF2695EA076388A62D2AD5BAB7CBF1A7F3F4C8D5CDF37CDE99BD3E30B685D9E5EEE48C7C89118EF4878EB89747F28271FA2CC45F8E9E7601"}, - {"3EEAED04A455D6E5E5AB53CFD5AFD2F2BC625C7BF4BE49A5", - "36B88F63ADBB5668588181D774", - "D367E3CB3703E762D23C6533188EF7028EFF9D935A3977150361997EC9DEAF1E4794BDE26AA8B53C124980B1362EC86FCDDFC7A90073171C1BAEE351A53234B86C66E8AB92FAE99EC6967A6D3428892D80", - "573454C719A9A55E04437BF7CBAAF27563CCCD92ADD5E515CD63305DFF0687E5EEF790C5DCA5C0033E9AB129505E2775438D92B38F08F3B0356BA142C6F694", - "E9F79A5B432D9E682C9AAA5661CFC2E49A0FCB81A431E54B42EB73DD3BED3F377FEC556ABA81624BA64A5D739AD41467460088F8D4F442180A9382CA635745473794C382FCDDC49BA4EB6D8A44AE3C"}, - {"B695C691538F8CBD60F039D0E28894E3693CC7C36D92D79D", - "BC099AEB637361BAC536B57618", - "BFFF1A65AE38D1DC142C71637319F5F6508E2CB33C9DCB94202B359ED5A5ED8042E7F4F09231D32A7242976677E6F4C549BF65FADC99E5AF43F7A46FD95E16C2", - "081DF3FD85B415D803F0BE5AC58CFF0023FDDED99788296C3731D8", - "E50C64E3614D94FE69C47092E46ACC9957C6FEA2CCBF96BC62FBABE7424753C75F9C147C42AE26FE171531"}, - {"C9ACBD2718F0689A1BE9802A551B6B8D9CF5614DAF5E65ED", - "B1B0AAF373B8B026EB80422051D8", - "6648C0E61AC733C76119D23FB24548D637751387AA2EAE9D80E912B7BD486CAAD9EAF4D7A5FE2B54AAD481E8EC94BB4D558000896E2010462B70C9FED1E7273080D1", - "189F591F6CB6D59AFEDD14C341741A8F1037DC0DF00FC57CE65C30F49E860255CEA5DC6019380CC0FE8880BC1A9E685F41C239C38F36E3F2A1388865C5C311059C0A", - "922A5E949B61D03BE34AB5F4E58607D4504EA14017BB363DAE3C873059EA7A1C77A746FB78981671D26C2CF6D9F24952D510044CE02A10177E9DB42D0145211DFE6E84369C5E3BC2669EAB4147B2822895F9"}, - {"7A832BD2CF5BF4919F353CE2A8C86A5E406DA2D52BE16A72", - "2F2F17CECF7E5A756D10785A3CB9DB", - "61DA05E3788CC2D8405DBA70C7A28E5AF699863C9F72E6C6770126929F5D6FA267F005EBCF49495CB46400958A3AE80D1289D1C671", - "44E91121195A41AF14E8CFDBD39A4B517BE0DF1A72977ED8A3EEF8EEDA1166B2EB6DB2C4AE2E74FA0F0C74537F659BFBD141E5DDEC67E64EDA85AABD3F52C85A785B9FB3CECD70E7DF", - "BEDF596EA21288D2B84901E188F6EE1468B14D5161D3802DBFE00D60203A24E2AB62714BF272A45551489838C3A7FEAADC177B591836E73684867CCF4E12901DCF2064058726BBA554E84ADC5136F507E961188D4AF06943D3"}, - {"1508E8AE9079AA15F1CEC4F776B4D11BCCB061B58AA56C18", - "BCA625674F41D1E3AB47672DC0C3", - "8B12CF84F16360F0EAD2A41BC021530FFCEC7F3579CAE658E10E2D3D81870F65AFCED0C77C6C4C6E6BA424FF23088C796BA6195ABA35094BF1829E089662E7A95FC90750AE16D0C8AFA55DAC789D7735B970B58D4BE7CEC7341DA82A0179A01929C27A59C5063215B859EA43", - "E525422519ECE070E82C", - "B47BC07C3ED1C0A43BA52C43CBACBCDBB29CAF1001E09FDF7107"}, - {"7550C2761644E911FE9ADD119BAC07376BEA442845FEAD876D7E7AC1B713E464", - "36D2EC25ADD33CDEDF495205BBC923", - "7FCFE81A3790DE97FFC3DE160C470847EA7E841177C2F759571CBD837EA004A6CA8C6F4AEBFF2E9FD552D73EB8A30705D58D70C0B67AEEA280CBBF0A477358ACEF1E7508F2735CD9A0E4F9AC92B8C008F575D3B6278F1C18BD01227E3502E5255F3AB1893632AD00C717C588EF652A51A43209E7EE90", - "2B1A62F8FDFAA3C16470A21AD307C9A7D03ADE8EF72C69B06F8D738CDE578D7AEFD0D40BD9C022FB9F580DF5394C998ACCCEFC5471A3996FB8F1045A81FDC6F32D13502EA65A211390C8D882B8E0BEFD8DD8CBEF51D1597B124E9F7F", - "C873E02A22DB89EB0787DB6A60B99F7E4A0A085D5C4232A81ADCE2D60AA36F92DDC33F93DD8640AC0E08416B187FB382B3EC3EE85A64B0E6EE41C1366A5AD2A282F66605E87031CCBA2FA7B2DA201D975994AADE3DD1EE122AE09604AD489B84BF0C1AB7129EE16C6934850E"}, - {"A51300285E554FDBDE7F771A9A9A80955639DD87129FAEF74987C91FB9687C71", - "81691D5D20EC818FCFF24B33DECC", - "C948093218AA9EB2A8E44A87EEA73FC8B6B75A196819A14BD83709EA323E8DF8B491045220E1D88729A38DBCFFB60D3056DAD4564498FD6574F74512945DEB34B69329ACED9FFC05D5D59DFCD5B973E2ACAFE6AD1EF8BBBC49351A2DD12508ED89ED", - "EB861165DAF7625F827C6B574ED703F03215", - "C6CD1CE76D2B3679C1B5AA1CFD67CCB55444B6BFD3E22C81CBC9BB738796B83E54E3"}, - {"8CE0156D26FAEB7E0B9B800BBB2E9D4075B5EAC5C62358B0E7F6FCE610223282", - "D2A7B94DD12CDACA909D3AD7", - "E021A78F374FC271389AB9A3E97077D755", - "7C26000B58929F5095E1CEE154F76C2A299248E299F9B5ADE6C403AA1FD4A67FD4E0232F214CE7B919EE7A1027D2B76C57475715CD078461", - "C556FB38DF069B56F337B5FF5775CE6EAA16824DFA754F20B78819028EA635C3BB7AA731DE8776B2DCB67DCA2D33EEDF3C7E52EA450013722A41755A0752433ED17BDD5991AAE77A"}, - {"1E8000A2CE00A561C9920A30BF0D7B983FEF8A1014C8F04C35CA6970E6BA02BD", - "65ED3D63F79F90BBFD19775E", - "336A8C0B7243582A46B221AA677647FCAE91", - "134A8B34824A290E7B", - "914FBEF80D0E6E17F8BDBB6097EBF5FBB0554952DC2B9E5151"}, - {"53D5607BBE690B6E8D8F6D97F3DF2BA853B682597A214B8AA0EA6E598650AF15", - "C391A856B9FE234E14BA1AC7BB40FF", - "479682BC21349C4BE1641D5E78FE2C79EC1B9CF5470936DCAD9967A4DCD7C4EFADA593BC9EDE71E6A08829B8580901B61E274227E9D918502DE3", - "EAD154DC09C5E26C5D26FF33ED148B27120C7F2C23225CC0D0631B03E1F6C6D96FEB88C1A4052ACB4CE746B884B6502931F407021126C6AAB8C514C077A5A38438AE88EE", - "938821286EBB671D999B87C032E1D6055392EB564E57970D55E545FC5E8BAB90E6E3E3C0913F6320995FC636D72CD9919657CC38BD51552F4A502D8D1FE56DB33EBAC5092630E69EBB986F0E15CEE9FC8C052501"}, - {"294362FCC984F440CEA3E9F7D2C06AF20C53AAC1B3738CA2186C914A6E193ABB", - "B15B61C8BB39261A8F55AB178EC3", - "D0729B6B75BB", - "2BD089ADCE9F334BAE3B065996C7D616DD0C27DF4218DCEEA0FBCA0F968837CE26B0876083327E25681FDDD620A32EC0DA12F73FAE826CC94BFF2B90A54D2651", - "AC94B25E4E21DE2437B806966CCD5D9385EF0CD4A51AB9FA6DE675C7B8952D67802E9FEC1FDE9F5D1EAB06057498BC0EEA454804FC9D2068982A3E24182D9AC2E7AB9994DDC899A604264583F63D066B"}, - {"959DBFEB039B1A5B8CE6A44649B602AAA5F98A906DB96143D202CD2024F749D9", - "01D7BDB1133E9C347486C1EFA6", - "F3843955BD741F379DD750585EDC55E2CDA05CCBA8C1F4622AC2FE35214BC3A019B8BD12C4CC42D9213D1E1556941E8D8450830287FFB3B763A13722DD4140ED9846FB5FFF745D7B0B967D810A068222E10B259AF1D392035B0D83DC1498A6830B11B2418A840212599171E0258A1C203B05362978", - "A21811232C950FA8B12237C2EBD6A7CD2C3A155905E9E0C7C120", - "63C1CE397B22F1A03F1FA549B43178BC405B152D3C95E977426D519B3DFCA28498823240592B6EEE7A14"}, - {"096AE499F5294173F34FF2B375F0E5D5AB79D0D03B33B1A74D7D576826345DF4", - "0C52B3D11D636E5910A4DD76D32C", - "229E9ECA3053789E937447BC719467075B6138A142DA528DA8F0CF8DDF022FD9AF8E74779BA3AC306609", - "8B7A00038783E8BAF6EDEAE0C4EAB48FC8FD501A588C7E4A4DB71E3604F2155A97687D3D2FFF8569261375A513CF4398CE0F87CA1658A1050F6EF6C4EA3E25", - "C20B6CF8D3C8241825FD90B2EDAC7593600646E579A8D8DAAE9E2E40C3835FE801B2BE4379131452BC5182C90307B176DFBE2049544222FE7783147B690774F6D9D7CEF52A91E61E298E9AA15464AC"}, -} diff --git a/vendor/github.com/ProtonMail/go-crypto/ocb/rfc7253_test_vectors_suite_a.go b/vendor/github.com/ProtonMail/go-crypto/ocb/rfc7253_test_vectors_suite_a.go deleted file mode 100644 index 330309ff5..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/ocb/rfc7253_test_vectors_suite_a.go +++ /dev/null @@ -1,78 +0,0 @@ -package ocb - -import ( - "encoding/hex" -) - -// Test vectors from https://tools.ietf.org/html/rfc7253. Note that key is -// shared across tests. -var testKey, _ = hex.DecodeString("000102030405060708090A0B0C0D0E0F") - -var rfc7253testVectors = []struct { - nonce, header, plaintext, ciphertext string -}{ - {"BBAA99887766554433221100", - "", - "", - "785407BFFFC8AD9EDCC5520AC9111EE6"}, - {"BBAA99887766554433221101", - "0001020304050607", - "0001020304050607", - "6820B3657B6F615A5725BDA0D3B4EB3A257C9AF1F8F03009"}, - {"BBAA99887766554433221102", - "0001020304050607", - "", - "81017F8203F081277152FADE694A0A00"}, - {"BBAA99887766554433221103", - "", - "0001020304050607", - "45DD69F8F5AAE72414054CD1F35D82760B2CD00D2F99BFA9"}, - {"BBAA99887766554433221104", - "000102030405060708090A0B0C0D0E0F", - "000102030405060708090A0B0C0D0E0F", - "571D535B60B277188BE5147170A9A22C3AD7A4FF3835B8C5701C1CCEC8FC3358"}, - {"BBAA99887766554433221105", - "000102030405060708090A0B0C0D0E0F", - "", - "8CF761B6902EF764462AD86498CA6B97"}, - {"BBAA99887766554433221106", - "", - "000102030405060708090A0B0C0D0E0F", - "5CE88EC2E0692706A915C00AEB8B2396F40E1C743F52436BDF06D8FA1ECA343D"}, - {"BBAA99887766554433221107", - "000102030405060708090A0B0C0D0E0F1011121314151617", - "000102030405060708090A0B0C0D0E0F1011121314151617", - "1CA2207308C87C010756104D8840CE1952F09673A448A122C92C62241051F57356D7F3C90BB0E07F"}, - {"BBAA99887766554433221108", - "000102030405060708090A0B0C0D0E0F1011121314151617", - "", - "6DC225A071FC1B9F7C69F93B0F1E10DE"}, - {"BBAA99887766554433221109", - "", - "000102030405060708090A0B0C0D0E0F1011121314151617", - "221BD0DE7FA6FE993ECCD769460A0AF2D6CDED0C395B1C3CE725F32494B9F914D85C0B1EB38357FF"}, - {"BBAA9988776655443322110A", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F", - "BD6F6C496201C69296C11EFD138A467ABD3C707924B964DEAFFC40319AF5A48540FBBA186C5553C68AD9F592A79A4240"}, - {"BBAA9988776655443322110B", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F", - "", - "FE80690BEE8A485D11F32965BC9D2A32"}, - {"BBAA9988776655443322110C", - "", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F", - "2942BFC773BDA23CABC6ACFD9BFD5835BD300F0973792EF46040C53F1432BCDFB5E1DDE3BC18A5F840B52E653444D5DF"}, - {"BBAA9988776655443322110D", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627", - "D5CA91748410C1751FF8A2F618255B68A0A12E093FF454606E59F9C1D0DDC54B65E8628E568BAD7AED07BA06A4A69483A7035490C5769E60"}, - {"BBAA9988776655443322110E", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627", - "", - "C5CD9D1850C141E358649994EE701B68"}, - {"BBAA9988776655443322110F", - "", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627", - "4412923493C57D5DE0D700F753CCE0D1D2D95060122E9F15A5DDBFC5787E50B5CC55EE507BCB084E479AD363AC366B95A98CA5F3000B1479"}, -} diff --git a/vendor/github.com/ProtonMail/go-crypto/ocb/rfc7253_test_vectors_suite_b.go b/vendor/github.com/ProtonMail/go-crypto/ocb/rfc7253_test_vectors_suite_b.go deleted file mode 100644 index 14a3c336f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/ocb/rfc7253_test_vectors_suite_b.go +++ /dev/null @@ -1,25 +0,0 @@ -package ocb - -// Second set of test vectors from https://tools.ietf.org/html/rfc7253 -var rfc7253TestVectorTaglen96 = struct { - key, nonce, header, plaintext, ciphertext string -}{"0F0E0D0C0B0A09080706050403020100", - "BBAA9988776655443322110D", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627", - "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627", - "1792A4E31E0755FB03E31B22116E6C2DDF9EFD6E33D536F1A0124B0A55BAE884ED93481529C76B6AD0C515F4D1CDD4FDAC4F02AA"} - -var rfc7253AlgorithmTest = []struct { - KEYLEN, TAGLEN int - OUTPUT string -}{ - {128, 128, "67E944D23256C5E0B6C61FA22FDF1EA2"}, - {192, 128, "F673F2C3E7174AAE7BAE986CA9F29E17"}, - {256, 128, "D90EB8E9C977C88B79DD793D7FFA161C"}, - {128, 96, "77A3D8E73589158D25D01209"}, - {192, 96, "05D56EAD2752C86BE6932C5E"}, - {256, 96, "5458359AC23B0CBA9E6330DD"}, - {128, 64, "192C9B7BD90BA06A"}, - {192, 64, "0066BC6E0EF34E24"}, - {256, 64, "7D4EA5D445501CBE"}, -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/aes/keywrap/keywrap.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/aes/keywrap/keywrap.go deleted file mode 100644 index 3c6251d1c..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/aes/keywrap/keywrap.go +++ /dev/null @@ -1,153 +0,0 @@ -// Copyright 2014 Matthew Endsley -// All rights reserved -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted providing that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -// IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. - -// Package keywrap is an implementation of the RFC 3394 AES key wrapping -// algorithm. This is used in OpenPGP with elliptic curve keys. -package keywrap - -import ( - "crypto/aes" - "encoding/binary" - "errors" -) - -var ( - // ErrWrapPlaintext is returned if the plaintext is not a multiple - // of 64 bits. - ErrWrapPlaintext = errors.New("keywrap: plainText must be a multiple of 64 bits") - - // ErrUnwrapCiphertext is returned if the ciphertext is not a - // multiple of 64 bits. - ErrUnwrapCiphertext = errors.New("keywrap: cipherText must by a multiple of 64 bits") - - // ErrUnwrapFailed is returned if unwrapping a key fails. - ErrUnwrapFailed = errors.New("keywrap: failed to unwrap key") - - // NB: the AES NewCipher call only fails if the key is an invalid length. - - // ErrInvalidKey is returned when the AES key is invalid. - ErrInvalidKey = errors.New("keywrap: invalid AES key") -) - -// Wrap a key using the RFC 3394 AES Key Wrap Algorithm. -func Wrap(key, plainText []byte) ([]byte, error) { - if len(plainText)%8 != 0 { - return nil, ErrWrapPlaintext - } - - c, err := aes.NewCipher(key) - if err != nil { - return nil, ErrInvalidKey - } - - nblocks := len(plainText) / 8 - - // 1) Initialize variables. - var block [aes.BlockSize]byte - // - Set A = IV, an initial value (see 2.2.3) - for ii := 0; ii < 8; ii++ { - block[ii] = 0xA6 - } - - // - For i = 1 to n - // - Set R[i] = P[i] - intermediate := make([]byte, len(plainText)) - copy(intermediate, plainText) - - // 2) Calculate intermediate values. - for ii := 0; ii < 6; ii++ { - for jj := 0; jj < nblocks; jj++ { - // - B = AES(K, A | R[i]) - copy(block[8:], intermediate[jj*8:jj*8+8]) - c.Encrypt(block[:], block[:]) - - // - A = MSB(64, B) ^ t where t = (n*j)+1 - t := uint64(ii*nblocks + jj + 1) - val := binary.BigEndian.Uint64(block[:8]) ^ t - binary.BigEndian.PutUint64(block[:8], val) - - // - R[i] = LSB(64, B) - copy(intermediate[jj*8:jj*8+8], block[8:]) - } - } - - // 3) Output results. - // - Set C[0] = A - // - For i = 1 to n - // - C[i] = R[i] - return append(block[:8], intermediate...), nil -} - -// Unwrap a key using the RFC 3394 AES Key Wrap Algorithm. -func Unwrap(key, cipherText []byte) ([]byte, error) { - if len(cipherText)%8 != 0 { - return nil, ErrUnwrapCiphertext - } - - c, err := aes.NewCipher(key) - if err != nil { - return nil, ErrInvalidKey - } - - nblocks := len(cipherText)/8 - 1 - - // 1) Initialize variables. - var block [aes.BlockSize]byte - // - Set A = C[0] - copy(block[:8], cipherText[:8]) - - // - For i = 1 to n - // - Set R[i] = C[i] - intermediate := make([]byte, len(cipherText)-8) - copy(intermediate, cipherText[8:]) - - // 2) Compute intermediate values. - for jj := 5; jj >= 0; jj-- { - for ii := nblocks - 1; ii >= 0; ii-- { - // - B = AES-1(K, (A ^ t) | R[i]) where t = n*j+1 - // - A = MSB(64, B) - t := uint64(jj*nblocks + ii + 1) - val := binary.BigEndian.Uint64(block[:8]) ^ t - binary.BigEndian.PutUint64(block[:8], val) - - copy(block[8:], intermediate[ii*8:ii*8+8]) - c.Decrypt(block[:], block[:]) - - // - R[i] = LSB(B, 64) - copy(intermediate[ii*8:ii*8+8], block[8:]) - } - } - - // 3) Output results. - // - If A is an appropriate initial value (see 2.2.3), - for ii := 0; ii < 8; ii++ { - if block[ii] != 0xA6 { - return nil, ErrUnwrapFailed - } - } - - // - For i = 1 to n - // - P[i] = R[i] - return intermediate, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/armor/armor.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/armor/armor.go deleted file mode 100644 index e0a677f28..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/armor/armor.go +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright 2010 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package armor implements OpenPGP ASCII Armor, see RFC 4880. OpenPGP Armor is -// very similar to PEM except that it has an additional CRC checksum. -package armor // import "github.com/ProtonMail/go-crypto/openpgp/armor" - -import ( - "bufio" - "bytes" - "encoding/base64" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// A Block represents an OpenPGP armored structure. -// -// The encoded form is: -// -// -----BEGIN Type----- -// Headers -// -// base64-encoded Bytes -// '=' base64 encoded checksum (optional) not checked anymore -// -----END Type----- -// -// where Headers is a possibly empty sequence of Key: Value lines. -// -// Since the armored data can be very large, this package presents a streaming -// interface. -type Block struct { - Type string // The type, taken from the preamble (i.e. "PGP SIGNATURE"). - Header map[string]string // Optional headers. - Body io.Reader // A Reader from which the contents can be read - lReader lineReader - oReader openpgpReader -} - -var ArmorCorrupt error = errors.StructuralError("armor invalid") - -var armorStart = []byte("-----BEGIN ") -var armorEnd = []byte("-----END ") -var armorEndOfLine = []byte("-----") - -// lineReader wraps a line based reader. It watches for the end of an armor block -type lineReader struct { - in *bufio.Reader - buf []byte - eof bool -} - -func (l *lineReader) Read(p []byte) (n int, err error) { - if l.eof { - return 0, io.EOF - } - - if len(l.buf) > 0 { - n = copy(p, l.buf) - l.buf = l.buf[n:] - return - } - - line, isPrefix, err := l.in.ReadLine() - if err != nil { - return - } - if isPrefix { - return 0, ArmorCorrupt - } - - if bytes.HasPrefix(line, armorEnd) { - l.eof = true - return 0, io.EOF - } - - if len(line) == 5 && line[0] == '=' { - // This is the checksum line - // Don't check the checksum - - l.eof = true - return 0, io.EOF - } - - if len(line) > 96 { - return 0, ArmorCorrupt - } - - n = copy(p, line) - bytesToSave := len(line) - n - if bytesToSave > 0 { - if cap(l.buf) < bytesToSave { - l.buf = make([]byte, 0, bytesToSave) - } - l.buf = l.buf[0:bytesToSave] - copy(l.buf, line[n:]) - } - - return -} - -// openpgpReader passes Read calls to the underlying base64 decoder. -type openpgpReader struct { - lReader *lineReader - b64Reader io.Reader -} - -func (r *openpgpReader) Read(p []byte) (n int, err error) { - n, err = r.b64Reader.Read(p) - return -} - -// Decode reads a PGP armored block from the given Reader. It will ignore -// leading garbage. If it doesn't find a block, it will return nil, io.EOF. The -// given Reader is not usable after calling this function: an arbitrary amount -// of data may have been read past the end of the block. -func Decode(in io.Reader) (p *Block, err error) { - r := bufio.NewReaderSize(in, 100) - var line []byte - ignoreNext := false - -TryNextBlock: - p = nil - - // Skip leading garbage - for { - ignoreThis := ignoreNext - line, ignoreNext, err = r.ReadLine() - if err != nil { - return - } - if ignoreNext || ignoreThis { - continue - } - line = bytes.TrimSpace(line) - if len(line) > len(armorStart)+len(armorEndOfLine) && bytes.HasPrefix(line, armorStart) { - break - } - } - - p = new(Block) - p.Type = string(line[len(armorStart) : len(line)-len(armorEndOfLine)]) - p.Header = make(map[string]string) - nextIsContinuation := false - var lastKey string - - // Read headers - for { - isContinuation := nextIsContinuation - line, nextIsContinuation, err = r.ReadLine() - if err != nil { - p = nil - return - } - if isContinuation { - p.Header[lastKey] += string(line) - continue - } - line = bytes.TrimSpace(line) - if len(line) == 0 { - break - } - - i := bytes.Index(line, []byte(":")) - if i == -1 { - goto TryNextBlock - } - lastKey = string(line[:i]) - var value string - if len(line) > i+2 { - value = string(line[i+2:]) - } - p.Header[lastKey] = value - } - - p.lReader.in = r - p.oReader.lReader = &p.lReader - p.oReader.b64Reader = base64.NewDecoder(base64.StdEncoding, &p.lReader) - p.Body = &p.oReader - - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/armor/encode.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/armor/encode.go deleted file mode 100644 index 550efddf0..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/armor/encode.go +++ /dev/null @@ -1,206 +0,0 @@ -// Copyright 2010 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package armor - -import ( - "encoding/base64" - "io" - "sort" -) - -var armorHeaderSep = []byte(": ") -var blockEnd = []byte("\n=") -var newline = []byte("\n") -var armorEndOfLineOut = []byte("-----\n") - -const crc24Init = 0xb704ce -const crc24Poly = 0x1864cfb - -// crc24 calculates the OpenPGP checksum as specified in RFC 4880, section 6.1 -func crc24(crc uint32, d []byte) uint32 { - for _, b := range d { - crc ^= uint32(b) << 16 - for i := 0; i < 8; i++ { - crc <<= 1 - if crc&0x1000000 != 0 { - crc ^= crc24Poly - } - } - } - return crc -} - -// writeSlices writes its arguments to the given Writer. -func writeSlices(out io.Writer, slices ...[]byte) (err error) { - for _, s := range slices { - _, err = out.Write(s) - if err != nil { - return err - } - } - return -} - -// lineBreaker breaks data across several lines, all of the same byte length -// (except possibly the last). Lines are broken with a single '\n'. -type lineBreaker struct { - lineLength int - line []byte - used int - out io.Writer - haveWritten bool -} - -func newLineBreaker(out io.Writer, lineLength int) *lineBreaker { - return &lineBreaker{ - lineLength: lineLength, - line: make([]byte, lineLength), - used: 0, - out: out, - } -} - -func (l *lineBreaker) Write(b []byte) (n int, err error) { - n = len(b) - - if n == 0 { - return - } - - if l.used == 0 && l.haveWritten { - _, err = l.out.Write([]byte{'\n'}) - if err != nil { - return - } - } - - if l.used+len(b) < l.lineLength { - l.used += copy(l.line[l.used:], b) - return - } - - l.haveWritten = true - _, err = l.out.Write(l.line[0:l.used]) - if err != nil { - return - } - excess := l.lineLength - l.used - l.used = 0 - - _, err = l.out.Write(b[0:excess]) - if err != nil { - return - } - - _, err = l.Write(b[excess:]) - return -} - -func (l *lineBreaker) Close() (err error) { - if l.used > 0 { - _, err = l.out.Write(l.line[0:l.used]) - if err != nil { - return - } - } - - return -} - -// encoding keeps track of a running CRC24 over the data which has been written -// to it and outputs a OpenPGP checksum when closed, followed by an armor -// trailer. -// -// It's built into a stack of io.Writers: -// -// encoding -> base64 encoder -> lineBreaker -> out -type encoding struct { - out io.Writer - breaker *lineBreaker - b64 io.WriteCloser - crc uint32 - crcEnabled bool - blockType []byte -} - -func (e *encoding) Write(data []byte) (n int, err error) { - if e.crcEnabled { - e.crc = crc24(e.crc, data) - } - return e.b64.Write(data) -} - -func (e *encoding) Close() (err error) { - err = e.b64.Close() - if err != nil { - return - } - e.breaker.Close() - - if e.crcEnabled { - var checksumBytes [3]byte - checksumBytes[0] = byte(e.crc >> 16) - checksumBytes[1] = byte(e.crc >> 8) - checksumBytes[2] = byte(e.crc) - - var b64ChecksumBytes [4]byte - base64.StdEncoding.Encode(b64ChecksumBytes[:], checksumBytes[:]) - - return writeSlices(e.out, blockEnd, b64ChecksumBytes[:], newline, armorEnd, e.blockType, armorEndOfLine) - } - return writeSlices(e.out, newline, armorEnd, e.blockType, armorEndOfLine) -} - -func encode(out io.Writer, blockType string, headers map[string]string, checksum bool) (w io.WriteCloser, err error) { - bType := []byte(blockType) - err = writeSlices(out, armorStart, bType, armorEndOfLineOut) - if err != nil { - return - } - - keys := make([]string, len(headers)) - i := 0 - for k := range headers { - keys[i] = k - i++ - } - sort.Strings(keys) - for _, k := range keys { - err = writeSlices(out, []byte(k), armorHeaderSep, []byte(headers[k]), newline) - if err != nil { - return - } - } - - _, err = out.Write(newline) - if err != nil { - return - } - - e := &encoding{ - out: out, - breaker: newLineBreaker(out, 64), - blockType: bType, - crc: crc24Init, - crcEnabled: checksum, - } - e.b64 = base64.NewEncoder(base64.StdEncoding, e.breaker) - return e, nil -} - -// Encode returns a WriteCloser which will encode the data written to it in -// OpenPGP armor. -func Encode(out io.Writer, blockType string, headers map[string]string) (w io.WriteCloser, err error) { - return encode(out, blockType, headers, true) -} - -// EncodeWithChecksumOption returns a WriteCloser which will encode the data written to it in -// OpenPGP armor and provides the option to include a checksum. -// When forming ASCII Armor, the CRC24 footer SHOULD NOT be generated, -// unless interoperability with implementations that require the CRC24 footer -// to be present is a concern. -func EncodeWithChecksumOption(out io.Writer, blockType string, headers map[string]string, doChecksum bool) (w io.WriteCloser, err error) { - return encode(out, blockType, headers, doChecksum) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/canonical_text.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/canonical_text.go deleted file mode 100644 index 5b40e1375..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/canonical_text.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package openpgp - -import ( - "hash" - "io" -) - -// NewCanonicalTextHash reformats text written to it into the canonical -// form and then applies the hash h. See RFC 4880, section 5.2.1. -func NewCanonicalTextHash(h hash.Hash) hash.Hash { - return &canonicalTextHash{h, 0} -} - -type canonicalTextHash struct { - h hash.Hash - s int -} - -var newline = []byte{'\r', '\n'} - -func writeCanonical(cw io.Writer, buf []byte, s *int) (int, error) { - start := 0 - for i, c := range buf { - switch *s { - case 0: - if c == '\r' { - *s = 1 - } else if c == '\n' { - if _, err := cw.Write(buf[start:i]); err != nil { - return 0, err - } - if _, err := cw.Write(newline); err != nil { - return 0, err - } - start = i + 1 - } - case 1: - *s = 0 - } - } - - if _, err := cw.Write(buf[start:]); err != nil { - return 0, err - } - return len(buf), nil -} - -func (cth *canonicalTextHash) Write(buf []byte) (int, error) { - return writeCanonical(cth.h, buf, &cth.s) -} - -func (cth *canonicalTextHash) Sum(in []byte) []byte { - return cth.h.Sum(in) -} - -func (cth *canonicalTextHash) Reset() { - cth.h.Reset() - cth.s = 0 -} - -func (cth *canonicalTextHash) Size() int { - return cth.h.Size() -} - -func (cth *canonicalTextHash) BlockSize() int { - return cth.h.BlockSize() -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/ecdh/ecdh.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/ecdh/ecdh.go deleted file mode 100644 index db8fb163b..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/ecdh/ecdh.go +++ /dev/null @@ -1,206 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package ecdh implements ECDH encryption, suitable for OpenPGP, -// as specified in RFC 6637, section 8. -package ecdh - -import ( - "bytes" - "errors" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/aes/keywrap" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "github.com/ProtonMail/go-crypto/openpgp/internal/ecc" -) - -type KDF struct { - Hash algorithm.Hash - Cipher algorithm.Cipher -} - -type PublicKey struct { - curve ecc.ECDHCurve - Point []byte - KDF -} - -type PrivateKey struct { - PublicKey - D []byte -} - -func NewPublicKey(curve ecc.ECDHCurve, kdfHash algorithm.Hash, kdfCipher algorithm.Cipher) *PublicKey { - return &PublicKey{ - curve: curve, - KDF: KDF{ - Hash: kdfHash, - Cipher: kdfCipher, - }, - } -} - -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -func (pk *PublicKey) GetCurve() ecc.ECDHCurve { - return pk.curve -} - -func (pk *PublicKey) MarshalPoint() []byte { - return pk.curve.MarshalBytePoint(pk.Point) -} - -func (pk *PublicKey) UnmarshalPoint(p []byte) error { - pk.Point = pk.curve.UnmarshalBytePoint(p) - if pk.Point == nil { - return errors.New("ecdh: failed to parse EC point") - } - return nil -} - -func (sk *PrivateKey) MarshalByteSecret() []byte { - return sk.curve.MarshalByteSecret(sk.D) -} - -func (sk *PrivateKey) UnmarshalByteSecret(d []byte) error { - sk.D = sk.curve.UnmarshalByteSecret(d) - - if sk.D == nil { - return errors.New("ecdh: failed to parse scalar") - } - return nil -} - -func GenerateKey(rand io.Reader, c ecc.ECDHCurve, kdf KDF) (priv *PrivateKey, err error) { - priv = new(PrivateKey) - priv.PublicKey.curve = c - priv.PublicKey.KDF = kdf - priv.PublicKey.Point, priv.D, err = c.GenerateECDH(rand) - return -} - -func Encrypt(random io.Reader, pub *PublicKey, msg, curveOID, fingerprint []byte) (vsG, c []byte, err error) { - if len(msg) > 40 { - return nil, nil, errors.New("ecdh: message too long") - } - // the sender MAY use 21, 13, and 5 bytes of padding for AES-128, - // AES-192, and AES-256, respectively, to provide the same number of - // octets, 40 total, as an input to the key wrapping method. - padding := make([]byte, 40-len(msg)) - for i := range padding { - padding[i] = byte(40 - len(msg)) - } - m := append(msg, padding...) - - ephemeral, zb, err := pub.curve.Encaps(random, pub.Point) - if err != nil { - return nil, nil, err - } - - vsG = pub.curve.MarshalBytePoint(ephemeral) - - z, err := buildKey(pub, zb, curveOID, fingerprint, false, false) - if err != nil { - return nil, nil, err - } - - if c, err = keywrap.Wrap(z, m); err != nil { - return nil, nil, err - } - - return vsG, c, nil - -} - -func Decrypt(priv *PrivateKey, vsG, c, curveOID, fingerprint []byte) (msg []byte, err error) { - var m []byte - zb, err := priv.PublicKey.curve.Decaps(priv.curve.UnmarshalBytePoint(vsG), priv.D) - - // Try buildKey three times to workaround an old bug, see comments in buildKey. - for i := 0; i < 3; i++ { - var z []byte - // RFC6637 §8: "Compute Z = KDF( S, Z_len, Param );" - z, err = buildKey(&priv.PublicKey, zb, curveOID, fingerprint, i == 1, i == 2) - if err != nil { - return nil, err - } - - // RFC6637 §8: "Compute C = AESKeyWrap( Z, c ) as per [RFC3394]" - m, err = keywrap.Unwrap(z, c) - if err == nil { - break - } - } - - // Only return an error after we've tried all (required) variants of buildKey. - if err != nil { - return nil, err - } - - // RFC6637 §8: "m = symm_alg_ID || session key || checksum || pkcs5_padding" - // The last byte should be the length of the padding, as per PKCS5; strip it off. - return m[:len(m)-int(m[len(m)-1])], nil -} - -func buildKey(pub *PublicKey, zb []byte, curveOID, fingerprint []byte, stripLeading, stripTrailing bool) ([]byte, error) { - // Param = curve_OID_len || curve_OID || public_key_alg_ID || 03 - // || 01 || KDF_hash_ID || KEK_alg_ID for AESKeyWrap - // || "Anonymous Sender " || recipient_fingerprint; - param := new(bytes.Buffer) - if _, err := param.Write(curveOID); err != nil { - return nil, err - } - algKDF := []byte{18, 3, 1, pub.KDF.Hash.Id(), pub.KDF.Cipher.Id()} - if _, err := param.Write(algKDF); err != nil { - return nil, err - } - if _, err := param.Write([]byte("Anonymous Sender ")); err != nil { - return nil, err - } - if _, err := param.Write(fingerprint[:]); err != nil { - return nil, err - } - - // MB = Hash ( 00 || 00 || 00 || 01 || ZB || Param ); - h := pub.KDF.Hash.New() - if _, err := h.Write([]byte{0x0, 0x0, 0x0, 0x1}); err != nil { - return nil, err - } - zbLen := len(zb) - i := 0 - j := zbLen - 1 - if stripLeading { - // Work around old go crypto bug where the leading zeros are missing. - for i < zbLen && zb[i] == 0 { - i++ - } - } - if stripTrailing { - // Work around old OpenPGP.js bug where insignificant trailing zeros in - // this little-endian number are missing. - // (See https://github.com/openpgpjs/openpgpjs/pull/853.) - for j >= 0 && zb[j] == 0 { - j-- - } - } - if _, err := h.Write(zb[i : j+1]); err != nil { - return nil, err - } - if _, err := h.Write(param.Bytes()); err != nil { - return nil, err - } - mb := h.Sum(nil) - - return mb[:pub.KDF.Cipher.KeySize()], nil // return oBits leftmost bits of MB. - -} - -func Validate(priv *PrivateKey) error { - return priv.curve.ValidateECDH(priv.Point, priv.D) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/ecdsa/ecdsa.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/ecdsa/ecdsa.go deleted file mode 100644 index f94ae1b2f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/ecdsa/ecdsa.go +++ /dev/null @@ -1,80 +0,0 @@ -// Package ecdsa implements ECDSA signature, suitable for OpenPGP, -// as specified in RFC 6637, section 5. -package ecdsa - -import ( - "errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/ecc" - "io" - "math/big" -) - -type PublicKey struct { - X, Y *big.Int - curve ecc.ECDSACurve -} - -type PrivateKey struct { - PublicKey - D *big.Int -} - -func NewPublicKey(curve ecc.ECDSACurve) *PublicKey { - return &PublicKey{ - curve: curve, - } -} - -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -func (pk *PublicKey) GetCurve() ecc.ECDSACurve { - return pk.curve -} - -func (pk *PublicKey) MarshalPoint() []byte { - return pk.curve.MarshalIntegerPoint(pk.X, pk.Y) -} - -func (pk *PublicKey) UnmarshalPoint(p []byte) error { - pk.X, pk.Y = pk.curve.UnmarshalIntegerPoint(p) - if pk.X == nil { - return errors.New("ecdsa: failed to parse EC point") - } - return nil -} - -func (sk *PrivateKey) MarshalIntegerSecret() []byte { - return sk.curve.MarshalIntegerSecret(sk.D) -} - -func (sk *PrivateKey) UnmarshalIntegerSecret(d []byte) error { - sk.D = sk.curve.UnmarshalIntegerSecret(d) - - if sk.D == nil { - return errors.New("ecdsa: failed to parse scalar") - } - return nil -} - -func GenerateKey(rand io.Reader, c ecc.ECDSACurve) (priv *PrivateKey, err error) { - priv = new(PrivateKey) - priv.PublicKey.curve = c - priv.PublicKey.X, priv.PublicKey.Y, priv.D, err = c.GenerateECDSA(rand) - return -} - -func Sign(rand io.Reader, priv *PrivateKey, hash []byte) (r, s *big.Int, err error) { - return priv.PublicKey.curve.Sign(rand, priv.X, priv.Y, priv.D, hash) -} - -func Verify(pub *PublicKey, hash []byte, r, s *big.Int) bool { - return pub.curve.Verify(pub.X, pub.Y, hash, r, s) -} - -func Validate(priv *PrivateKey) error { - return priv.curve.ValidateECDSA(priv.X, priv.Y, priv.D.Bytes()) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/ed25519/ed25519.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/ed25519/ed25519.go deleted file mode 100644 index 6abdf7c44..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/ed25519/ed25519.go +++ /dev/null @@ -1,115 +0,0 @@ -// Package ed25519 implements the ed25519 signature algorithm for OpenPGP -// as defined in the Open PGP crypto refresh. -package ed25519 - -import ( - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - ed25519lib "github.com/cloudflare/circl/sign/ed25519" -) - -const ( - // PublicKeySize is the size, in bytes, of public keys in this package. - PublicKeySize = ed25519lib.PublicKeySize - // SeedSize is the size, in bytes, of private key seeds. - // The private key representation used by RFC 8032. - SeedSize = ed25519lib.SeedSize - // SignatureSize is the size, in bytes, of signatures generated and verified by this package. - SignatureSize = ed25519lib.SignatureSize -) - -type PublicKey struct { - // Point represents the elliptic curve point of the public key. - Point []byte -} - -type PrivateKey struct { - PublicKey - // Key the private key representation by RFC 8032, - // encoded as seed | pub key point. - Key []byte -} - -// NewPublicKey creates a new empty ed25519 public key. -func NewPublicKey() *PublicKey { - return &PublicKey{} -} - -// NewPrivateKey creates a new empty private key referencing the public key. -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -// Seed returns the ed25519 private key secret seed. -// The private key representation by RFC 8032. -func (pk *PrivateKey) Seed() []byte { - return pk.Key[:SeedSize] -} - -// MarshalByteSecret returns the underlying 32 byte seed of the private key. -func (pk *PrivateKey) MarshalByteSecret() []byte { - return pk.Seed() -} - -// UnmarshalByteSecret computes the private key from the secret seed -// and stores it in the private key object. -func (sk *PrivateKey) UnmarshalByteSecret(seed []byte) error { - sk.Key = ed25519lib.NewKeyFromSeed(seed) - return nil -} - -// GenerateKey generates a fresh private key with the provided randomness source. -func GenerateKey(rand io.Reader) (*PrivateKey, error) { - publicKey, privateKey, err := ed25519lib.GenerateKey(rand) - if err != nil { - return nil, err - } - privateKeyOut := new(PrivateKey) - privateKeyOut.PublicKey.Point = publicKey[:] - privateKeyOut.Key = privateKey[:] - return privateKeyOut, nil -} - -// Sign signs a message with the ed25519 algorithm. -// priv MUST be a valid key! Check this with Validate() before use. -func Sign(priv *PrivateKey, message []byte) ([]byte, error) { - return ed25519lib.Sign(priv.Key, message), nil -} - -// Verify verifies an ed25519 signature. -func Verify(pub *PublicKey, message []byte, signature []byte) bool { - return ed25519lib.Verify(pub.Point, message, signature) -} - -// Validate checks if the ed25519 private key is valid. -func Validate(priv *PrivateKey) error { - expectedPrivateKey := ed25519lib.NewKeyFromSeed(priv.Seed()) - if subtle.ConstantTimeCompare(priv.Key, expectedPrivateKey) == 0 { - return errors.KeyInvalidError("ed25519: invalid ed25519 secret") - } - if subtle.ConstantTimeCompare(priv.PublicKey.Point, expectedPrivateKey[SeedSize:]) == 0 { - return errors.KeyInvalidError("ed25519: invalid ed25519 public key") - } - return nil -} - -// ENCODING/DECODING signature: - -// WriteSignature encodes and writes an ed25519 signature to writer. -func WriteSignature(writer io.Writer, signature []byte) error { - _, err := writer.Write(signature) - return err -} - -// ReadSignature decodes an ed25519 signature from a reader. -func ReadSignature(reader io.Reader) ([]byte, error) { - signature := make([]byte, SignatureSize) - if _, err := io.ReadFull(reader, signature); err != nil { - return nil, err - } - return signature, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/ed448/ed448.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/ed448/ed448.go deleted file mode 100644 index b11fb4fb1..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/ed448/ed448.go +++ /dev/null @@ -1,119 +0,0 @@ -// Package ed448 implements the ed448 signature algorithm for OpenPGP -// as defined in the Open PGP crypto refresh. -package ed448 - -import ( - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - ed448lib "github.com/cloudflare/circl/sign/ed448" -) - -const ( - // PublicKeySize is the size, in bytes, of public keys in this package. - PublicKeySize = ed448lib.PublicKeySize - // SeedSize is the size, in bytes, of private key seeds. - // The private key representation used by RFC 8032. - SeedSize = ed448lib.SeedSize - // SignatureSize is the size, in bytes, of signatures generated and verified by this package. - SignatureSize = ed448lib.SignatureSize -) - -type PublicKey struct { - // Point represents the elliptic curve point of the public key. - Point []byte -} - -type PrivateKey struct { - PublicKey - // Key the private key representation by RFC 8032, - // encoded as seed | public key point. - Key []byte -} - -// NewPublicKey creates a new empty ed448 public key. -func NewPublicKey() *PublicKey { - return &PublicKey{} -} - -// NewPrivateKey creates a new empty private key referencing the public key. -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -// Seed returns the ed448 private key secret seed. -// The private key representation by RFC 8032. -func (pk *PrivateKey) Seed() []byte { - return pk.Key[:SeedSize] -} - -// MarshalByteSecret returns the underlying seed of the private key. -func (pk *PrivateKey) MarshalByteSecret() []byte { - return pk.Seed() -} - -// UnmarshalByteSecret computes the private key from the secret seed -// and stores it in the private key object. -func (sk *PrivateKey) UnmarshalByteSecret(seed []byte) error { - sk.Key = ed448lib.NewKeyFromSeed(seed) - return nil -} - -// GenerateKey generates a fresh private key with the provided randomness source. -func GenerateKey(rand io.Reader) (*PrivateKey, error) { - publicKey, privateKey, err := ed448lib.GenerateKey(rand) - if err != nil { - return nil, err - } - privateKeyOut := new(PrivateKey) - privateKeyOut.PublicKey.Point = publicKey[:] - privateKeyOut.Key = privateKey[:] - return privateKeyOut, nil -} - -// Sign signs a message with the ed448 algorithm. -// priv MUST be a valid key! Check this with Validate() before use. -func Sign(priv *PrivateKey, message []byte) ([]byte, error) { - // Ed448 is used with the empty string as a context string. - // See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-08#section-13.7 - return ed448lib.Sign(priv.Key, message, ""), nil -} - -// Verify verifies a ed448 signature -func Verify(pub *PublicKey, message []byte, signature []byte) bool { - // Ed448 is used with the empty string as a context string. - // See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-08#section-13.7 - return ed448lib.Verify(pub.Point, message, signature, "") -} - -// Validate checks if the ed448 private key is valid -func Validate(priv *PrivateKey) error { - expectedPrivateKey := ed448lib.NewKeyFromSeed(priv.Seed()) - if subtle.ConstantTimeCompare(priv.Key, expectedPrivateKey) == 0 { - return errors.KeyInvalidError("ed448: invalid ed448 secret") - } - if subtle.ConstantTimeCompare(priv.PublicKey.Point, expectedPrivateKey[SeedSize:]) == 0 { - return errors.KeyInvalidError("ed448: invalid ed448 public key") - } - return nil -} - -// ENCODING/DECODING signature: - -// WriteSignature encodes and writes an ed448 signature to writer. -func WriteSignature(writer io.Writer, signature []byte) error { - _, err := writer.Write(signature) - return err -} - -// ReadSignature decodes an ed448 signature from a reader. -func ReadSignature(reader io.Reader) ([]byte, error) { - signature := make([]byte, SignatureSize) - if _, err := io.ReadFull(reader, signature); err != nil { - return nil, err - } - return signature, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/eddsa/eddsa.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/eddsa/eddsa.go deleted file mode 100644 index 99ecfc7f1..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/eddsa/eddsa.go +++ /dev/null @@ -1,91 +0,0 @@ -// Package eddsa implements EdDSA signature, suitable for OpenPGP, as specified in -// https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-13.7 -package eddsa - -import ( - "errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/ecc" - "io" -) - -type PublicKey struct { - X []byte - curve ecc.EdDSACurve -} - -type PrivateKey struct { - PublicKey - D []byte -} - -func NewPublicKey(curve ecc.EdDSACurve) *PublicKey { - return &PublicKey{ - curve: curve, - } -} - -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -func (pk *PublicKey) GetCurve() ecc.EdDSACurve { - return pk.curve -} - -func (pk *PublicKey) MarshalPoint() []byte { - return pk.curve.MarshalBytePoint(pk.X) -} - -func (pk *PublicKey) UnmarshalPoint(x []byte) error { - pk.X = pk.curve.UnmarshalBytePoint(x) - - if pk.X == nil { - return errors.New("eddsa: failed to parse EC point") - } - return nil -} - -func (sk *PrivateKey) MarshalByteSecret() []byte { - return sk.curve.MarshalByteSecret(sk.D) -} - -func (sk *PrivateKey) UnmarshalByteSecret(d []byte) error { - sk.D = sk.curve.UnmarshalByteSecret(d) - - if sk.D == nil { - return errors.New("eddsa: failed to parse scalar") - } - return nil -} - -func GenerateKey(rand io.Reader, c ecc.EdDSACurve) (priv *PrivateKey, err error) { - priv = new(PrivateKey) - priv.PublicKey.curve = c - priv.PublicKey.X, priv.D, err = c.GenerateEdDSA(rand) - return -} - -func Sign(priv *PrivateKey, message []byte) (r, s []byte, err error) { - sig, err := priv.PublicKey.curve.Sign(priv.PublicKey.X, priv.D, message) - if err != nil { - return nil, nil, err - } - - r, s = priv.PublicKey.curve.MarshalSignature(sig) - return -} - -func Verify(pub *PublicKey, message, r, s []byte) bool { - sig := pub.curve.UnmarshalSignature(r, s) - if sig == nil { - return false - } - - return pub.curve.Verify(pub.X, message, sig) -} - -func Validate(priv *PrivateKey) error { - return priv.curve.ValidateEdDSA(priv.PublicKey.X, priv.D) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/elgamal/elgamal.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/elgamal/elgamal.go deleted file mode 100644 index bad277434..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/elgamal/elgamal.go +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package elgamal implements ElGamal encryption, suitable for OpenPGP, -// as specified in "A Public-Key Cryptosystem and a Signature Scheme Based on -// Discrete Logarithms," IEEE Transactions on Information Theory, v. IT-31, -// n. 4, 1985, pp. 469-472. -// -// This form of ElGamal embeds PKCS#1 v1.5 padding, which may make it -// unsuitable for other protocols. RSA should be used in preference in any -// case. -package elgamal // import "github.com/ProtonMail/go-crypto/openpgp/elgamal" - -import ( - "crypto/rand" - "crypto/subtle" - "errors" - "io" - "math/big" -) - -// PublicKey represents an ElGamal public key. -type PublicKey struct { - G, P, Y *big.Int -} - -// PrivateKey represents an ElGamal private key. -type PrivateKey struct { - PublicKey - X *big.Int -} - -// Encrypt encrypts the given message to the given public key. The result is a -// pair of integers. Errors can result from reading random, or because msg is -// too large to be encrypted to the public key. -func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int, err error) { - pLen := (pub.P.BitLen() + 7) / 8 - if len(msg) > pLen-11 { - err = errors.New("elgamal: message too long") - return - } - - // EM = 0x02 || PS || 0x00 || M - em := make([]byte, pLen-1) - em[0] = 2 - ps, mm := em[1:len(em)-len(msg)-1], em[len(em)-len(msg):] - err = nonZeroRandomBytes(ps, random) - if err != nil { - return - } - em[len(em)-len(msg)-1] = 0 - copy(mm, msg) - - m := new(big.Int).SetBytes(em) - - k, err := rand.Int(random, pub.P) - if err != nil { - return - } - - c1 = new(big.Int).Exp(pub.G, k, pub.P) - s := new(big.Int).Exp(pub.Y, k, pub.P) - c2 = s.Mul(s, m) - c2.Mod(c2, pub.P) - - return -} - -// Decrypt takes two integers, resulting from an ElGamal encryption, and -// returns the plaintext of the message. An error can result only if the -// ciphertext is invalid. Users should keep in mind that this is a padding -// oracle and thus, if exposed to an adaptive chosen ciphertext attack, can -// be used to break the cryptosystem. See “Chosen Ciphertext Attacks -// Against Protocols Based on the RSA Encryption Standard PKCS #1”, Daniel -// Bleichenbacher, Advances in Cryptology (Crypto '98), -func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) { - s := new(big.Int).Exp(c1, priv.X, priv.P) - if s.ModInverse(s, priv.P) == nil { - return nil, errors.New("elgamal: invalid private key") - } - s.Mul(s, c2) - s.Mod(s, priv.P) - em := s.Bytes() - - firstByteIsTwo := subtle.ConstantTimeByteEq(em[0], 2) - - // The remainder of the plaintext must be a string of non-zero random - // octets, followed by a 0, followed by the message. - // lookingForIndex: 1 iff we are still looking for the zero. - // index: the offset of the first zero byte. - var lookingForIndex, index int - lookingForIndex = 1 - - for i := 1; i < len(em); i++ { - equals0 := subtle.ConstantTimeByteEq(em[i], 0) - index = subtle.ConstantTimeSelect(lookingForIndex&equals0, i, index) - lookingForIndex = subtle.ConstantTimeSelect(equals0, 0, lookingForIndex) - } - - if firstByteIsTwo != 1 || lookingForIndex != 0 || index < 9 { - return nil, errors.New("elgamal: decryption error") - } - return em[index+1:], nil -} - -// nonZeroRandomBytes fills the given slice with non-zero random octets. -func nonZeroRandomBytes(s []byte, rand io.Reader) (err error) { - _, err = io.ReadFull(rand, s) - if err != nil { - return - } - - for i := 0; i < len(s); i++ { - for s[i] == 0 { - _, err = io.ReadFull(rand, s[i:i+1]) - if err != nil { - return - } - } - } - - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/errors/errors.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/errors/errors.go deleted file mode 100644 index e44b45734..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/errors/errors.go +++ /dev/null @@ -1,200 +0,0 @@ -// Copyright 2010 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package errors contains common error types for the OpenPGP packages. -package errors // import "github.com/ProtonMail/go-crypto/openpgp/errors" - -import ( - "fmt" - "strconv" -) - -var ( - // ErrDecryptSessionKeyParsing is a generic error message for parsing errors in decrypted data - // to reduce the risk of oracle attacks. - ErrDecryptSessionKeyParsing = DecryptWithSessionKeyError("parsing error") - // ErrAEADTagVerification is returned if one of the tag verifications in SEIPDv2 fails - ErrAEADTagVerification error = DecryptWithSessionKeyError("AEAD tag verification failed") - // ErrMDCHashMismatch - ErrMDCHashMismatch error = SignatureError("MDC hash mismatch") - // ErrMDCMissing - ErrMDCMissing error = SignatureError("MDC packet not found") -) - -// A StructuralError is returned when OpenPGP data is found to be syntactically -// invalid. -type StructuralError string - -func (s StructuralError) Error() string { - return "openpgp: invalid data: " + string(s) -} - -// A DecryptWithSessionKeyError is returned when a failure occurs when reading from symmetrically decrypted data or -// an authentication tag verification fails. -// Such an error indicates that the supplied session key is likely wrong or the data got corrupted. -type DecryptWithSessionKeyError string - -func (s DecryptWithSessionKeyError) Error() string { - return "openpgp: decryption with session key failed: " + string(s) -} - -// HandleSensitiveParsingError handles parsing errors when reading data from potentially decrypted data. -// The function makes parsing errors generic to reduce the risk of oracle attacks in SEIPDv1. -func HandleSensitiveParsingError(err error, decrypted bool) error { - if !decrypted { - // Data was not encrypted so we return the inner error. - return err - } - // The data is read from a stream that decrypts using a session key; - // therefore, we need to handle parsing errors appropriately. - // This is essential to mitigate the risk of oracle attacks. - if decError, ok := err.(*DecryptWithSessionKeyError); ok { - return decError - } - if decError, ok := err.(DecryptWithSessionKeyError); ok { - return decError - } - return ErrDecryptSessionKeyParsing -} - -// UnsupportedError indicates that, although the OpenPGP data is valid, it -// makes use of currently unimplemented features. -type UnsupportedError string - -func (s UnsupportedError) Error() string { - return "openpgp: unsupported feature: " + string(s) -} - -// InvalidArgumentError indicates that the caller is in error and passed an -// incorrect value. -type InvalidArgumentError string - -func (i InvalidArgumentError) Error() string { - return "openpgp: invalid argument: " + string(i) -} - -// SignatureError indicates that a syntactically valid signature failed to -// validate. -type SignatureError string - -func (b SignatureError) Error() string { - return "openpgp: invalid signature: " + string(b) -} - -type signatureExpiredError int - -func (se signatureExpiredError) Error() string { - return "openpgp: signature expired" -} - -var ErrSignatureExpired error = signatureExpiredError(0) - -type keyExpiredError int - -func (ke keyExpiredError) Error() string { - return "openpgp: key expired" -} - -var ErrSignatureOlderThanKey error = signatureOlderThanKeyError(0) - -type signatureOlderThanKeyError int - -func (ske signatureOlderThanKeyError) Error() string { - return "openpgp: signature is older than the key" -} - -var ErrKeyExpired error = keyExpiredError(0) - -type keyIncorrectError int - -func (ki keyIncorrectError) Error() string { - return "openpgp: incorrect key" -} - -var ErrKeyIncorrect error = keyIncorrectError(0) - -// KeyInvalidError indicates that the public key parameters are invalid -// as they do not match the private ones -type KeyInvalidError string - -func (e KeyInvalidError) Error() string { - return "openpgp: invalid key: " + string(e) -} - -type unknownIssuerError int - -func (unknownIssuerError) Error() string { - return "openpgp: signature made by unknown entity" -} - -var ErrUnknownIssuer error = unknownIssuerError(0) - -type keyRevokedError int - -func (keyRevokedError) Error() string { - return "openpgp: signature made by revoked key" -} - -var ErrKeyRevoked error = keyRevokedError(0) - -type WeakAlgorithmError string - -func (e WeakAlgorithmError) Error() string { - return "openpgp: weak algorithms are rejected: " + string(e) -} - -type UnknownPacketTypeError uint8 - -func (upte UnknownPacketTypeError) Error() string { - return "openpgp: unknown packet type: " + strconv.Itoa(int(upte)) -} - -type CriticalUnknownPacketTypeError uint8 - -func (upte CriticalUnknownPacketTypeError) Error() string { - return "openpgp: unknown critical packet type: " + strconv.Itoa(int(upte)) -} - -// AEADError indicates that there is a problem when initializing or using a -// AEAD instance, configuration struct, nonces or index values. -type AEADError string - -func (ae AEADError) Error() string { - return "openpgp: aead error: " + string(ae) -} - -// ErrDummyPrivateKey results when operations are attempted on a private key -// that is just a dummy key. See -// https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/DETAILS;h=fe55ae16ab4e26d8356dc574c9e8bc935e71aef1;hb=23191d7851eae2217ecdac6484349849a24fd94a#l1109 -type ErrDummyPrivateKey string - -func (dke ErrDummyPrivateKey) Error() string { - return "openpgp: s2k GNU dummy key: " + string(dke) -} - -// ErrMalformedMessage results when the packet sequence is incorrect -type ErrMalformedMessage string - -func (dke ErrMalformedMessage) Error() string { - return "openpgp: malformed message " + string(dke) -} - -// ErrEncryptionKeySelection is returned if encryption key selection fails (v2 API). -type ErrEncryptionKeySelection struct { - PrimaryKeyId string - PrimaryKeyErr error - EncSelectionKeyId *string - EncSelectionErr error -} - -func (eks ErrEncryptionKeySelection) Error() string { - prefix := fmt.Sprintf("openpgp: key selection for primary key %s:", eks.PrimaryKeyId) - if eks.PrimaryKeyErr != nil { - return fmt.Sprintf("%s invalid primary key: %s", prefix, eks.PrimaryKeyErr) - } - if eks.EncSelectionKeyId != nil { - return fmt.Sprintf("%s invalid encryption key %s: %s", prefix, *eks.EncSelectionKeyId, eks.EncSelectionErr) - } - return fmt.Sprintf("%s no encryption key: %s", prefix, eks.EncSelectionErr) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/hash.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/hash.go deleted file mode 100644 index 526bd7777..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/hash.go +++ /dev/null @@ -1,24 +0,0 @@ -package openpgp - -import ( - "crypto" - - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" -) - -// HashIdToHash returns a crypto.Hash which corresponds to the given OpenPGP -// hash id. -func HashIdToHash(id byte) (h crypto.Hash, ok bool) { - return algorithm.HashIdToHash(id) -} - -// HashIdToString returns the name of the hash function corresponding to the -// given OpenPGP hash id. -func HashIdToString(id byte) (name string, ok bool) { - return algorithm.HashIdToString(id) -} - -// HashToHashId returns an OpenPGP hash id which corresponds the given Hash. -func HashToHashId(h crypto.Hash) (id byte, ok bool) { - return algorithm.HashToHashId(h) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/aead.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/aead.go deleted file mode 100644 index d06706518..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/aead.go +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG - -package algorithm - -import ( - "crypto/cipher" - "github.com/ProtonMail/go-crypto/eax" - "github.com/ProtonMail/go-crypto/ocb" -) - -// AEADMode defines the Authenticated Encryption with Associated Data mode of -// operation. -type AEADMode uint8 - -// Supported modes of operation (see RFC4880bis [EAX] and RFC7253) -const ( - AEADModeEAX = AEADMode(1) - AEADModeOCB = AEADMode(2) - AEADModeGCM = AEADMode(3) -) - -// TagLength returns the length in bytes of authentication tags. -func (mode AEADMode) TagLength() int { - switch mode { - case AEADModeEAX: - return 16 - case AEADModeOCB: - return 16 - case AEADModeGCM: - return 16 - default: - return 0 - } -} - -// NonceLength returns the length in bytes of nonces. -func (mode AEADMode) NonceLength() int { - switch mode { - case AEADModeEAX: - return 16 - case AEADModeOCB: - return 15 - case AEADModeGCM: - return 12 - default: - return 0 - } -} - -// New returns a fresh instance of the given mode -func (mode AEADMode) New(block cipher.Block) (alg cipher.AEAD) { - var err error - switch mode { - case AEADModeEAX: - alg, err = eax.NewEAX(block) - case AEADModeOCB: - alg, err = ocb.NewOCB(block) - case AEADModeGCM: - alg, err = cipher.NewGCM(block) - } - if err != nil { - panic(err.Error()) - } - return alg -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/cipher.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/cipher.go deleted file mode 100644 index c76a75bcd..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/cipher.go +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package algorithm - -import ( - "crypto/aes" - "crypto/cipher" - "crypto/des" - - "golang.org/x/crypto/cast5" -) - -// Cipher is an official symmetric key cipher algorithm. See RFC 4880, -// section 9.2. -type Cipher interface { - // Id returns the algorithm ID, as a byte, of the cipher. - Id() uint8 - // KeySize returns the key size, in bytes, of the cipher. - KeySize() int - // BlockSize returns the block size, in bytes, of the cipher. - BlockSize() int - // New returns a fresh instance of the given cipher. - New(key []byte) cipher.Block -} - -// The following constants mirror the OpenPGP standard (RFC 4880). -const ( - TripleDES = CipherFunction(2) - CAST5 = CipherFunction(3) - AES128 = CipherFunction(7) - AES192 = CipherFunction(8) - AES256 = CipherFunction(9) -) - -// CipherById represents the different block ciphers specified for OpenPGP. See -// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-13 -var CipherById = map[uint8]Cipher{ - TripleDES.Id(): TripleDES, - CAST5.Id(): CAST5, - AES128.Id(): AES128, - AES192.Id(): AES192, - AES256.Id(): AES256, -} - -type CipherFunction uint8 - -// ID returns the algorithm Id, as a byte, of cipher. -func (sk CipherFunction) Id() uint8 { - return uint8(sk) -} - -// KeySize returns the key size, in bytes, of cipher. -func (cipher CipherFunction) KeySize() int { - switch cipher { - case CAST5: - return cast5.KeySize - case AES128: - return 16 - case AES192, TripleDES: - return 24 - case AES256: - return 32 - } - return 0 -} - -// BlockSize returns the block size, in bytes, of cipher. -func (cipher CipherFunction) BlockSize() int { - switch cipher { - case TripleDES: - return des.BlockSize - case CAST5: - return 8 - case AES128, AES192, AES256: - return 16 - } - return 0 -} - -// New returns a fresh instance of the given cipher. -func (cipher CipherFunction) New(key []byte) (block cipher.Block) { - var err error - switch cipher { - case TripleDES: - block, err = des.NewTripleDESCipher(key) - case CAST5: - block, err = cast5.NewCipher(key) - case AES128, AES192, AES256: - block, err = aes.NewCipher(key) - } - if err != nil { - panic(err.Error()) - } - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/hash.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/hash.go deleted file mode 100644 index d1a00fc74..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/algorithm/hash.go +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package algorithm - -import ( - "crypto" - "fmt" - "hash" -) - -// Hash is an official hash function algorithm. See RFC 4880, section 9.4. -type Hash interface { - // Id returns the algorithm ID, as a byte, of Hash. - Id() uint8 - // Available reports whether the given hash function is linked into the binary. - Available() bool - // HashFunc simply returns the value of h so that Hash implements SignerOpts. - HashFunc() crypto.Hash - // New returns a new hash.Hash calculating the given hash function. New - // panics if the hash function is not linked into the binary. - New() hash.Hash - // Size returns the length, in bytes, of a digest resulting from the given - // hash function. It doesn't require that the hash function in question be - // linked into the program. - Size() int - // String is the name of the hash function corresponding to the given - // OpenPGP hash id. - String() string -} - -// The following vars mirror the crypto/Hash supported hash functions. -var ( - SHA1 Hash = cryptoHash{2, crypto.SHA1} - SHA256 Hash = cryptoHash{8, crypto.SHA256} - SHA384 Hash = cryptoHash{9, crypto.SHA384} - SHA512 Hash = cryptoHash{10, crypto.SHA512} - SHA224 Hash = cryptoHash{11, crypto.SHA224} - SHA3_256 Hash = cryptoHash{12, crypto.SHA3_256} - SHA3_512 Hash = cryptoHash{14, crypto.SHA3_512} -) - -// HashById represents the different hash functions specified for OpenPGP. See -// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-14 -var ( - HashById = map[uint8]Hash{ - SHA256.Id(): SHA256, - SHA384.Id(): SHA384, - SHA512.Id(): SHA512, - SHA224.Id(): SHA224, - SHA3_256.Id(): SHA3_256, - SHA3_512.Id(): SHA3_512, - } -) - -// cryptoHash contains pairs relating OpenPGP's hash identifier with -// Go's crypto.Hash type. See RFC 4880, section 9.4. -type cryptoHash struct { - id uint8 - crypto.Hash -} - -// Id returns the algorithm ID, as a byte, of cryptoHash. -func (h cryptoHash) Id() uint8 { - return h.id -} - -var hashNames = map[uint8]string{ - SHA256.Id(): "SHA256", - SHA384.Id(): "SHA384", - SHA512.Id(): "SHA512", - SHA224.Id(): "SHA224", - SHA3_256.Id(): "SHA3-256", - SHA3_512.Id(): "SHA3-512", -} - -func (h cryptoHash) String() string { - s, ok := hashNames[h.id] - if !ok { - panic(fmt.Sprintf("Unsupported hash function %d", h.id)) - } - return s -} - -// HashIdToHash returns a crypto.Hash which corresponds to the given OpenPGP -// hash id. -func HashIdToHash(id byte) (h crypto.Hash, ok bool) { - if hash, ok := HashById[id]; ok { - return hash.HashFunc(), true - } - return 0, false -} - -// HashIdToHashWithSha1 returns a crypto.Hash which corresponds to the given OpenPGP -// hash id, allowing sha1. -func HashIdToHashWithSha1(id byte) (h crypto.Hash, ok bool) { - if hash, ok := HashById[id]; ok { - return hash.HashFunc(), true - } - - if id == SHA1.Id() { - return SHA1.HashFunc(), true - } - - return 0, false -} - -// HashIdToString returns the name of the hash function corresponding to the -// given OpenPGP hash id. -func HashIdToString(id byte) (name string, ok bool) { - if hash, ok := HashById[id]; ok { - return hash.String(), true - } - return "", false -} - -// HashToHashId returns an OpenPGP hash id which corresponds the given Hash. -func HashToHashId(h crypto.Hash) (id byte, ok bool) { - for id, hash := range HashById { - if hash.HashFunc() == h { - return id, true - } - } - - return 0, false -} - -// HashToHashIdWithSha1 returns an OpenPGP hash id which corresponds the given Hash, -// allowing instances of SHA1 -func HashToHashIdWithSha1(h crypto.Hash) (id byte, ok bool) { - for id, hash := range HashById { - if hash.HashFunc() == h { - return id, true - } - } - - if h == SHA1.HashFunc() { - return SHA1.Id(), true - } - - return 0, false -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curve25519.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curve25519.go deleted file mode 100644 index 888767c4e..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curve25519.go +++ /dev/null @@ -1,171 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - x25519lib "github.com/cloudflare/circl/dh/x25519" -) - -type curve25519 struct{} - -func NewCurve25519() *curve25519 { - return &curve25519{} -} - -func (c *curve25519) GetCurveName() string { - return "curve25519" -} - -// MarshalBytePoint encodes the public point from native format, adding the prefix. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6 -func (c *curve25519) MarshalBytePoint(point []byte) []byte { - return append([]byte{0x40}, point...) -} - -// UnmarshalBytePoint decodes the public point to native format, removing the prefix. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6 -func (c *curve25519) UnmarshalBytePoint(point []byte) []byte { - if len(point) != x25519lib.Size+1 { - return nil - } - - // Remove prefix - return point[1:] -} - -// MarshalByteSecret encodes the secret scalar from native format. -// Note that the EC secret scalar differs from the definition of public keys in -// [Curve25519] in two ways: (1) the byte-ordering is big-endian, which is -// more uniform with how big integers are represented in OpenPGP, and (2) the -// leading zeros are truncated. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6.1.1 -// Note that leading zero bytes are stripped later when encoding as an MPI. -func (c *curve25519) MarshalByteSecret(secret []byte) []byte { - d := make([]byte, x25519lib.Size) - copyReversed(d, secret) - - // The following ensures that the private key is a number of the form - // 2^{254} + 8 * [0, 2^{251}), in order to avoid the small subgroup of - // the curve. - // - // This masking is done internally in the underlying lib and so is unnecessary - // for security, but OpenPGP implementations require that private keys be - // pre-masked. - d[0] &= 127 - d[0] |= 64 - d[31] &= 248 - - return d -} - -// UnmarshalByteSecret decodes the secret scalar from native format. -// Note that the EC secret scalar differs from the definition of public keys in -// [Curve25519] in two ways: (1) the byte-ordering is big-endian, which is -// more uniform with how big integers are represented in OpenPGP, and (2) the -// leading zeros are truncated. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6.1.1 -func (c *curve25519) UnmarshalByteSecret(d []byte) []byte { - if len(d) > x25519lib.Size { - return nil - } - - // Ensure truncated leading bytes are re-added - secret := make([]byte, x25519lib.Size) - copyReversed(secret, d) - - return secret -} - -// generateKeyPairBytes Generates a private-public key-pair. -// 'priv' is a private key; a little-endian scalar belonging to the set -// 2^{254} + 8 * [0, 2^{251}), in order to avoid the small subgroup of the -// curve. 'pub' is simply 'priv' * G where G is the base point. -// See https://cr.yp.to/ecdh.html and RFC7748, sec 5. -func (c *curve25519) generateKeyPairBytes(rand io.Reader) (priv, pub x25519lib.Key, err error) { - _, err = io.ReadFull(rand, priv[:]) - if err != nil { - return - } - - x25519lib.KeyGen(&pub, &priv) - return -} - -func (c *curve25519) GenerateECDH(rand io.Reader) (point []byte, secret []byte, err error) { - priv, pub, err := c.generateKeyPairBytes(rand) - if err != nil { - return - } - - return pub[:], priv[:], nil -} - -func (c *genericCurve) MaskSecret(secret []byte) []byte { - return secret -} - -func (c *curve25519) Encaps(rand io.Reader, point []byte) (ephemeral, sharedSecret []byte, err error) { - // RFC6637 §8: "Generate an ephemeral key pair {v, V=vG}" - // ephemeralPrivate corresponds to `v`. - // ephemeralPublic corresponds to `V`. - ephemeralPrivate, ephemeralPublic, err := c.generateKeyPairBytes(rand) - if err != nil { - return nil, nil, err - } - - // RFC6637 §8: "Obtain the authenticated recipient public key R" - // pubKey corresponds to `R`. - var pubKey x25519lib.Key - copy(pubKey[:], point) - - // RFC6637 §8: "Compute the shared point S = vR" - // "VB = convert point V to the octet string" - // sharedPoint corresponds to `VB`. - var sharedPoint x25519lib.Key - x25519lib.Shared(&sharedPoint, &ephemeralPrivate, &pubKey) - - return ephemeralPublic[:], sharedPoint[:], nil -} - -func (c *curve25519) Decaps(vsG, secret []byte) (sharedSecret []byte, err error) { - var ephemeralPublic, decodedPrivate, sharedPoint x25519lib.Key - // RFC6637 §8: "The decryption is the inverse of the method given." - // All quoted descriptions in comments below describe encryption, and - // the reverse is performed. - // vsG corresponds to `VB` in RFC6637 §8 . - - // RFC6637 §8: "VB = convert point V to the octet string" - copy(ephemeralPublic[:], vsG) - - // decodedPrivate corresponds to `r` in RFC6637 §8 . - copy(decodedPrivate[:], secret) - - // RFC6637 §8: "Note that the recipient obtains the shared secret by calculating - // S = rV = rvG, where (r,R) is the recipient's key pair." - // sharedPoint corresponds to `S`. - x25519lib.Shared(&sharedPoint, &decodedPrivate, &ephemeralPublic) - - return sharedPoint[:], nil -} - -func (c *curve25519) ValidateECDH(point []byte, secret []byte) (err error) { - var pk, sk x25519lib.Key - copy(sk[:], secret) - x25519lib.KeyGen(&pk, &sk) - - if subtle.ConstantTimeCompare(point, pk[:]) == 0 { - return errors.KeyInvalidError("ecc: invalid curve25519 public point") - } - - return nil -} - -func copyReversed(out []byte, in []byte) { - l := len(in) - for i := 0; i < l; i++ { - out[i] = in[l-i-1] - } -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curve_info.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curve_info.go deleted file mode 100644 index 0da2d0d85..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curve_info.go +++ /dev/null @@ -1,143 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "bytes" - "crypto/elliptic" - - "github.com/ProtonMail/go-crypto/bitcurves" - "github.com/ProtonMail/go-crypto/brainpool" - "github.com/ProtonMail/go-crypto/openpgp/internal/encoding" -) - -const Curve25519GenName = "Curve25519" - -type CurveInfo struct { - GenName string - Oid *encoding.OID - Curve Curve -} - -var Curves = []CurveInfo{ - { - // NIST P-256 - GenName: "P256", - Oid: encoding.NewOID([]byte{0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07}), - Curve: NewGenericCurve(elliptic.P256()), - }, - { - // NIST P-384 - GenName: "P384", - Oid: encoding.NewOID([]byte{0x2B, 0x81, 0x04, 0x00, 0x22}), - Curve: NewGenericCurve(elliptic.P384()), - }, - { - // NIST P-521 - GenName: "P521", - Oid: encoding.NewOID([]byte{0x2B, 0x81, 0x04, 0x00, 0x23}), - Curve: NewGenericCurve(elliptic.P521()), - }, - { - // SecP256k1 - GenName: "SecP256k1", - Oid: encoding.NewOID([]byte{0x2B, 0x81, 0x04, 0x00, 0x0A}), - Curve: NewGenericCurve(bitcurves.S256()), - }, - { - // Curve25519 - GenName: Curve25519GenName, - Oid: encoding.NewOID([]byte{0x2B, 0x06, 0x01, 0x04, 0x01, 0x97, 0x55, 0x01, 0x05, 0x01}), - Curve: NewCurve25519(), - }, - { - // x448 - GenName: "Curve448", - Oid: encoding.NewOID([]byte{0x2B, 0x65, 0x6F}), - Curve: NewX448(), - }, - { - // Ed25519 - GenName: Curve25519GenName, - Oid: encoding.NewOID([]byte{0x2B, 0x06, 0x01, 0x04, 0x01, 0xDA, 0x47, 0x0F, 0x01}), - Curve: NewEd25519(), - }, - { - // Ed448 - GenName: "Curve448", - Oid: encoding.NewOID([]byte{0x2B, 0x65, 0x71}), - Curve: NewEd448(), - }, - { - // BrainpoolP256r1 - GenName: "BrainpoolP256", - Oid: encoding.NewOID([]byte{0x2B, 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x07}), - Curve: NewGenericCurve(brainpool.P256r1()), - }, - { - // BrainpoolP384r1 - GenName: "BrainpoolP384", - Oid: encoding.NewOID([]byte{0x2B, 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x0B}), - Curve: NewGenericCurve(brainpool.P384r1()), - }, - { - // BrainpoolP512r1 - GenName: "BrainpoolP512", - Oid: encoding.NewOID([]byte{0x2B, 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x0D}), - Curve: NewGenericCurve(brainpool.P512r1()), - }, -} - -func FindByCurve(curve Curve) *CurveInfo { - for _, curveInfo := range Curves { - if curveInfo.Curve.GetCurveName() == curve.GetCurveName() { - return &curveInfo - } - } - return nil -} - -func FindByOid(oid encoding.Field) *CurveInfo { - var rawBytes = oid.Bytes() - for _, curveInfo := range Curves { - if bytes.Equal(curveInfo.Oid.Bytes(), rawBytes) { - return &curveInfo - } - } - return nil -} - -func FindEdDSAByGenName(curveGenName string) EdDSACurve { - for _, curveInfo := range Curves { - if curveInfo.GenName == curveGenName { - curve, ok := curveInfo.Curve.(EdDSACurve) - if ok { - return curve - } - } - } - return nil -} - -func FindECDSAByGenName(curveGenName string) ECDSACurve { - for _, curveInfo := range Curves { - if curveInfo.GenName == curveGenName { - curve, ok := curveInfo.Curve.(ECDSACurve) - if ok { - return curve - } - } - } - return nil -} - -func FindECDHByGenName(curveGenName string) ECDHCurve { - for _, curveInfo := range Curves { - if curveInfo.GenName == curveGenName { - curve, ok := curveInfo.Curve.(ECDHCurve) - if ok { - return curve - } - } - } - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curves.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curves.go deleted file mode 100644 index 5ed9c93b3..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/curves.go +++ /dev/null @@ -1,48 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "io" - "math/big" -) - -type Curve interface { - GetCurveName() string -} - -type ECDSACurve interface { - Curve - MarshalIntegerPoint(x, y *big.Int) []byte - UnmarshalIntegerPoint([]byte) (x, y *big.Int) - MarshalIntegerSecret(d *big.Int) []byte - UnmarshalIntegerSecret(d []byte) *big.Int - GenerateECDSA(rand io.Reader) (x, y, secret *big.Int, err error) - Sign(rand io.Reader, x, y, d *big.Int, hash []byte) (r, s *big.Int, err error) - Verify(x, y *big.Int, hash []byte, r, s *big.Int) bool - ValidateECDSA(x, y *big.Int, secret []byte) error -} - -type EdDSACurve interface { - Curve - MarshalBytePoint(x []byte) []byte - UnmarshalBytePoint([]byte) (x []byte) - MarshalByteSecret(d []byte) []byte - UnmarshalByteSecret(d []byte) []byte - MarshalSignature(sig []byte) (r, s []byte) - UnmarshalSignature(r, s []byte) (sig []byte) - GenerateEdDSA(rand io.Reader) (pub, priv []byte, err error) - Sign(publicKey, privateKey, message []byte) (sig []byte, err error) - Verify(publicKey, message, sig []byte) bool - ValidateEdDSA(publicKey, privateKey []byte) (err error) -} -type ECDHCurve interface { - Curve - MarshalBytePoint([]byte) (encoded []byte) - UnmarshalBytePoint(encoded []byte) []byte - MarshalByteSecret(d []byte) []byte - UnmarshalByteSecret(d []byte) []byte - GenerateECDH(rand io.Reader) (point []byte, secret []byte, err error) - Encaps(rand io.Reader, point []byte) (ephemeral, sharedSecret []byte, err error) - Decaps(ephemeral, secret []byte) (sharedSecret []byte, err error) - ValidateECDH(public []byte, secret []byte) error -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/ed25519.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/ed25519.go deleted file mode 100644 index 5a4c3a859..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/ed25519.go +++ /dev/null @@ -1,120 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "bytes" - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - ed25519lib "github.com/cloudflare/circl/sign/ed25519" -) - -const ed25519Size = 32 - -type ed25519 struct{} - -func NewEd25519() *ed25519 { - return &ed25519{} -} - -func (c *ed25519) GetCurveName() string { - return "ed25519" -} - -// MarshalBytePoint encodes the public point from native format, adding the prefix. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed25519) MarshalBytePoint(x []byte) []byte { - return append([]byte{0x40}, x...) -} - -// UnmarshalBytePoint decodes a point from prefixed format to native. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed25519) UnmarshalBytePoint(point []byte) (x []byte) { - if len(point) != ed25519lib.PublicKeySize+1 { - return nil - } - - // Return unprefixed - return point[1:] -} - -// MarshalByteSecret encodes a scalar in native format. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed25519) MarshalByteSecret(d []byte) []byte { - return d -} - -// UnmarshalByteSecret decodes a scalar in native format and re-adds the stripped leading zeroes -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed25519) UnmarshalByteSecret(s []byte) (d []byte) { - if len(s) > ed25519lib.SeedSize { - return nil - } - - // Handle stripped leading zeroes - d = make([]byte, ed25519lib.SeedSize) - copy(d[ed25519lib.SeedSize-len(s):], s) - return -} - -// MarshalSignature splits a signature in R and S. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.2.3.3.1 -func (c *ed25519) MarshalSignature(sig []byte) (r, s []byte) { - return sig[:ed25519Size], sig[ed25519Size:] -} - -// UnmarshalSignature decodes R and S in the native format, re-adding the stripped leading zeroes -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.2.3.3.1 -func (c *ed25519) UnmarshalSignature(r, s []byte) (sig []byte) { - // Check size - if len(r) > 32 || len(s) > 32 { - return nil - } - - sig = make([]byte, ed25519lib.SignatureSize) - - // Handle stripped leading zeroes - copy(sig[ed25519Size-len(r):ed25519Size], r) - copy(sig[ed25519lib.SignatureSize-len(s):], s) - return sig -} - -func (c *ed25519) GenerateEdDSA(rand io.Reader) (pub, priv []byte, err error) { - pk, sk, err := ed25519lib.GenerateKey(rand) - - if err != nil { - return nil, nil, err - } - - return pk, sk[:ed25519lib.SeedSize], nil -} - -func getEd25519Sk(publicKey, privateKey []byte) ed25519lib.PrivateKey { - privateKeyCap, privateKeyLen, publicKeyLen := cap(privateKey), len(privateKey), len(publicKey) - - if privateKeyCap >= privateKeyLen+publicKeyLen && - bytes.Equal(privateKey[privateKeyLen:privateKeyLen+publicKeyLen], publicKey) { - return privateKey[:privateKeyLen+publicKeyLen] - } - - return append(privateKey[:privateKeyLen:privateKeyLen], publicKey...) -} - -func (c *ed25519) Sign(publicKey, privateKey, message []byte) (sig []byte, err error) { - sig = ed25519lib.Sign(getEd25519Sk(publicKey, privateKey), message) - return sig, nil -} - -func (c *ed25519) Verify(publicKey, message, sig []byte) bool { - return ed25519lib.Verify(publicKey, message, sig) -} - -func (c *ed25519) ValidateEdDSA(publicKey, privateKey []byte) (err error) { - priv := getEd25519Sk(publicKey, privateKey) - expectedPriv := ed25519lib.NewKeyFromSeed(priv.Seed()) - if subtle.ConstantTimeCompare(priv, expectedPriv) == 0 { - return errors.KeyInvalidError("ecc: invalid ed25519 secret") - } - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/ed448.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/ed448.go deleted file mode 100644 index b6edda748..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/ed448.go +++ /dev/null @@ -1,119 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "bytes" - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - ed448lib "github.com/cloudflare/circl/sign/ed448" -) - -type ed448 struct{} - -func NewEd448() *ed448 { - return &ed448{} -} - -func (c *ed448) GetCurveName() string { - return "ed448" -} - -// MarshalBytePoint encodes the public point from native format, adding the prefix. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed448) MarshalBytePoint(x []byte) []byte { - // Return prefixed - return append([]byte{0x40}, x...) -} - -// UnmarshalBytePoint decodes a point from prefixed format to native. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed448) UnmarshalBytePoint(point []byte) (x []byte) { - if len(point) != ed448lib.PublicKeySize+1 { - return nil - } - - // Strip prefix - return point[1:] -} - -// MarshalByteSecret encoded a scalar from native format to prefixed. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed448) MarshalByteSecret(d []byte) []byte { - // Return prefixed - return append([]byte{0x40}, d...) -} - -// UnmarshalByteSecret decodes a scalar from prefixed format to native. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.5 -func (c *ed448) UnmarshalByteSecret(s []byte) (d []byte) { - // Check prefixed size - if len(s) != ed448lib.SeedSize+1 { - return nil - } - - // Strip prefix - return s[1:] -} - -// MarshalSignature splits a signature in R and S, where R is in prefixed native format and -// S is an MPI with value zero. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.2.3.3.2 -func (c *ed448) MarshalSignature(sig []byte) (r, s []byte) { - return append([]byte{0x40}, sig...), []byte{} -} - -// UnmarshalSignature decodes R and S in the native format. Only R is used, in prefixed native format. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.2.3.3.2 -func (c *ed448) UnmarshalSignature(r, s []byte) (sig []byte) { - if len(r) != ed448lib.SignatureSize+1 { - return nil - } - - return r[1:] -} - -func (c *ed448) GenerateEdDSA(rand io.Reader) (pub, priv []byte, err error) { - pk, sk, err := ed448lib.GenerateKey(rand) - - if err != nil { - return nil, nil, err - } - - return pk, sk[:ed448lib.SeedSize], nil -} - -func getEd448Sk(publicKey, privateKey []byte) ed448lib.PrivateKey { - privateKeyCap, privateKeyLen, publicKeyLen := cap(privateKey), len(privateKey), len(publicKey) - - if privateKeyCap >= privateKeyLen+publicKeyLen && - bytes.Equal(privateKey[privateKeyLen:privateKeyLen+publicKeyLen], publicKey) { - return privateKey[:privateKeyLen+publicKeyLen] - } - - return append(privateKey[:privateKeyLen:privateKeyLen], publicKey...) -} - -func (c *ed448) Sign(publicKey, privateKey, message []byte) (sig []byte, err error) { - // Ed448 is used with the empty string as a context string. - // See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-13.7 - sig = ed448lib.Sign(getEd448Sk(publicKey, privateKey), message, "") - - return sig, nil -} - -func (c *ed448) Verify(publicKey, message, sig []byte) bool { - // Ed448 is used with the empty string as a context string. - // See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-13.7 - return ed448lib.Verify(publicKey, message, sig, "") -} - -func (c *ed448) ValidateEdDSA(publicKey, privateKey []byte) (err error) { - priv := getEd448Sk(publicKey, privateKey) - expectedPriv := ed448lib.NewKeyFromSeed(priv.Seed()) - if subtle.ConstantTimeCompare(priv, expectedPriv) == 0 { - return errors.KeyInvalidError("ecc: invalid ed448 secret") - } - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/generic.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/generic.go deleted file mode 100644 index e28d7c710..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/generic.go +++ /dev/null @@ -1,149 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "crypto/ecdsa" - "crypto/elliptic" - "fmt" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "io" - "math/big" -) - -type genericCurve struct { - Curve elliptic.Curve -} - -func NewGenericCurve(c elliptic.Curve) *genericCurve { - return &genericCurve{ - Curve: c, - } -} - -func (c *genericCurve) GetCurveName() string { - return c.Curve.Params().Name -} - -func (c *genericCurve) MarshalBytePoint(point []byte) []byte { - return point -} - -func (c *genericCurve) UnmarshalBytePoint(point []byte) []byte { - return point -} - -func (c *genericCurve) MarshalIntegerPoint(x, y *big.Int) []byte { - return elliptic.Marshal(c.Curve, x, y) -} - -func (c *genericCurve) UnmarshalIntegerPoint(point []byte) (x, y *big.Int) { - return elliptic.Unmarshal(c.Curve, point) -} - -func (c *genericCurve) MarshalByteSecret(d []byte) []byte { - return d -} - -func (c *genericCurve) UnmarshalByteSecret(d []byte) []byte { - return d -} - -func (c *genericCurve) MarshalIntegerSecret(d *big.Int) []byte { - return d.Bytes() -} - -func (c *genericCurve) UnmarshalIntegerSecret(d []byte) *big.Int { - return new(big.Int).SetBytes(d) -} - -func (c *genericCurve) GenerateECDH(rand io.Reader) (point, secret []byte, err error) { - secret, x, y, err := elliptic.GenerateKey(c.Curve, rand) - if err != nil { - return nil, nil, err - } - - point = elliptic.Marshal(c.Curve, x, y) - return point, secret, nil -} - -func (c *genericCurve) GenerateECDSA(rand io.Reader) (x, y, secret *big.Int, err error) { - priv, err := ecdsa.GenerateKey(c.Curve, rand) - if err != nil { - return - } - - return priv.X, priv.Y, priv.D, nil -} - -func (c *genericCurve) Encaps(rand io.Reader, point []byte) (ephemeral, sharedSecret []byte, err error) { - xP, yP := elliptic.Unmarshal(c.Curve, point) - if xP == nil { - panic("invalid point") - } - - d, x, y, err := elliptic.GenerateKey(c.Curve, rand) - if err != nil { - return nil, nil, err - } - - vsG := elliptic.Marshal(c.Curve, x, y) - zbBig, _ := c.Curve.ScalarMult(xP, yP, d) - - byteLen := (c.Curve.Params().BitSize + 7) >> 3 - zb := make([]byte, byteLen) - zbBytes := zbBig.Bytes() - copy(zb[byteLen-len(zbBytes):], zbBytes) - - return vsG, zb, nil -} - -func (c *genericCurve) Decaps(ephemeral, secret []byte) (sharedSecret []byte, err error) { - x, y := elliptic.Unmarshal(c.Curve, ephemeral) - zbBig, _ := c.Curve.ScalarMult(x, y, secret) - byteLen := (c.Curve.Params().BitSize + 7) >> 3 - zb := make([]byte, byteLen) - zbBytes := zbBig.Bytes() - copy(zb[byteLen-len(zbBytes):], zbBytes) - - return zb, nil -} - -func (c *genericCurve) Sign(rand io.Reader, x, y, d *big.Int, hash []byte) (r, s *big.Int, err error) { - priv := &ecdsa.PrivateKey{D: d, PublicKey: ecdsa.PublicKey{X: x, Y: y, Curve: c.Curve}} - return ecdsa.Sign(rand, priv, hash) -} - -func (c *genericCurve) Verify(x, y *big.Int, hash []byte, r, s *big.Int) bool { - pub := &ecdsa.PublicKey{X: x, Y: y, Curve: c.Curve} - return ecdsa.Verify(pub, hash, r, s) -} - -func (c *genericCurve) validate(xP, yP *big.Int, secret []byte) error { - // the public point should not be at infinity (0,0) - zero := new(big.Int) - if xP.Cmp(zero) == 0 && yP.Cmp(zero) == 0 { - return errors.KeyInvalidError(fmt.Sprintf("ecc (%s): infinity point", c.Curve.Params().Name)) - } - - // re-derive the public point Q' = (X,Y) = dG - // to compare to declared Q in public key - expectedX, expectedY := c.Curve.ScalarBaseMult(secret) - if xP.Cmp(expectedX) != 0 || yP.Cmp(expectedY) != 0 { - return errors.KeyInvalidError(fmt.Sprintf("ecc (%s): invalid point", c.Curve.Params().Name)) - } - - return nil -} - -func (c *genericCurve) ValidateECDSA(xP, yP *big.Int, secret []byte) error { - return c.validate(xP, yP, secret) -} - -func (c *genericCurve) ValidateECDH(point []byte, secret []byte) error { - xP, yP := elliptic.Unmarshal(c.Curve, point) - if xP == nil { - return errors.KeyInvalidError(fmt.Sprintf("ecc (%s): invalid point", c.Curve.Params().Name)) - } - - return c.validate(xP, yP, secret) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go deleted file mode 100644 index df04262e9..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go +++ /dev/null @@ -1,107 +0,0 @@ -// Package ecc implements a generic interface for ECDH, ECDSA, and EdDSA. -package ecc - -import ( - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - x448lib "github.com/cloudflare/circl/dh/x448" -) - -type x448 struct{} - -func NewX448() *x448 { - return &x448{} -} - -func (c *x448) GetCurveName() string { - return "x448" -} - -// MarshalBytePoint encodes the public point from native format, adding the prefix. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6 -func (c *x448) MarshalBytePoint(point []byte) []byte { - return append([]byte{0x40}, point...) -} - -// UnmarshalBytePoint decodes a point from prefixed format to native. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6 -func (c *x448) UnmarshalBytePoint(point []byte) []byte { - if len(point) != x448lib.Size+1 { - return nil - } - - return point[1:] -} - -// MarshalByteSecret encoded a scalar from native format to prefixed. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6.1.2 -func (c *x448) MarshalByteSecret(d []byte) []byte { - return append([]byte{0x40}, d...) -} - -// UnmarshalByteSecret decodes a scalar from prefixed format to native. -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh-06#section-5.5.5.6.1.2 -func (c *x448) UnmarshalByteSecret(d []byte) []byte { - if len(d) != x448lib.Size+1 { - return nil - } - - // Store without prefix - return d[1:] -} - -func (c *x448) generateKeyPairBytes(rand io.Reader) (sk, pk x448lib.Key, err error) { - if _, err = rand.Read(sk[:]); err != nil { - return - } - - x448lib.KeyGen(&pk, &sk) - return -} - -func (c *x448) GenerateECDH(rand io.Reader) (point []byte, secret []byte, err error) { - priv, pub, err := c.generateKeyPairBytes(rand) - if err != nil { - return - } - - return pub[:], priv[:], nil -} - -func (c *x448) Encaps(rand io.Reader, point []byte) (ephemeral, sharedSecret []byte, err error) { - var pk, ss x448lib.Key - seed, e, err := c.generateKeyPairBytes(rand) - if err != nil { - return nil, nil, err - } - copy(pk[:], point) - x448lib.Shared(&ss, &seed, &pk) - - return e[:], ss[:], nil -} - -func (c *x448) Decaps(ephemeral, secret []byte) (sharedSecret []byte, err error) { - var ss, sk, e x448lib.Key - - copy(sk[:], secret) - copy(e[:], ephemeral) - x448lib.Shared(&ss, &sk, &e) - - return ss[:], nil -} - -func (c *x448) ValidateECDH(point []byte, secret []byte) error { - var sk, pk, expectedPk x448lib.Key - - copy(pk[:], point) - copy(sk[:], secret) - x448lib.KeyGen(&expectedPk, &sk) - - if subtle.ConstantTimeCompare(expectedPk[:], pk[:]) == 0 { - return errors.KeyInvalidError("ecc: invalid curve25519 public point") - } - - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/encoding.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/encoding.go deleted file mode 100644 index 6c921481b..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/encoding.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package encoding implements openpgp packet field encodings as specified in -// RFC 4880 and 6637. -package encoding - -import "io" - -// Field is an encoded field of an openpgp packet. -type Field interface { - // Bytes returns the decoded data. - Bytes() []byte - - // BitLength is the size in bits of the decoded data. - BitLength() uint16 - - // EncodedBytes returns the encoded data. - EncodedBytes() []byte - - // EncodedLength is the size in bytes of the encoded data. - EncodedLength() uint16 - - // ReadFrom reads the next Field from r. - ReadFrom(r io.Reader) (int64, error) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/mpi.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/mpi.go deleted file mode 100644 index 02e5e695c..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/mpi.go +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package encoding - -import ( - "io" - "math/big" - "math/bits" -) - -// An MPI is used to store the contents of a big integer, along with the bit -// length that was specified in the original input. This allows the MPI to be -// reserialized exactly. -type MPI struct { - bytes []byte - bitLength uint16 -} - -// NewMPI returns a MPI initialized with bytes. -func NewMPI(bytes []byte) *MPI { - for len(bytes) != 0 && bytes[0] == 0 { - bytes = bytes[1:] - } - if len(bytes) == 0 { - bitLength := uint16(0) - return &MPI{bytes, bitLength} - } - bitLength := 8*uint16(len(bytes)-1) + uint16(bits.Len8(bytes[0])) - return &MPI{bytes, bitLength} -} - -// Bytes returns the decoded data. -func (m *MPI) Bytes() []byte { - return m.bytes -} - -// BitLength is the size in bits of the decoded data. -func (m *MPI) BitLength() uint16 { - return m.bitLength -} - -// EncodedBytes returns the encoded data. -func (m *MPI) EncodedBytes() []byte { - return append([]byte{byte(m.bitLength >> 8), byte(m.bitLength)}, m.bytes...) -} - -// EncodedLength is the size in bytes of the encoded data. -func (m *MPI) EncodedLength() uint16 { - return uint16(2 + len(m.bytes)) -} - -// ReadFrom reads into m the next MPI from r. -func (m *MPI) ReadFrom(r io.Reader) (int64, error) { - var buf [2]byte - n, err := io.ReadFull(r, buf[0:]) - if err != nil { - if err == io.EOF { - err = io.ErrUnexpectedEOF - } - return int64(n), err - } - - m.bitLength = uint16(buf[0])<<8 | uint16(buf[1]) - m.bytes = make([]byte, (int(m.bitLength)+7)/8) - - nn, err := io.ReadFull(r, m.bytes) - if err == io.EOF { - err = io.ErrUnexpectedEOF - } - - // remove leading zero bytes from malformed GnuPG encoded MPIs: - // https://bugs.gnupg.org/gnupg/issue1853 - // for _, b := range m.bytes { - // if b != 0 { - // break - // } - // m.bytes = m.bytes[1:] - // m.bitLength -= 8 - // } - - return int64(n) + int64(nn), err -} - -// SetBig initializes m with the bits from n. -func (m *MPI) SetBig(n *big.Int) *MPI { - m.bytes = n.Bytes() - m.bitLength = uint16(n.BitLen()) - return m -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/oid.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/oid.go deleted file mode 100644 index c9df9fe23..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/encoding/oid.go +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package encoding - -import ( - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// OID is used to store a variable-length field with a one-octet size -// prefix. See https://tools.ietf.org/html/rfc6637#section-9. -type OID struct { - bytes []byte -} - -const ( - // maxOID is the maximum number of bytes in a OID. - maxOID = 254 - // reservedOIDLength1 and reservedOIDLength2 are OID lengths that the RFC - // specifies are reserved. - reservedOIDLength1 = 0 - reservedOIDLength2 = 0xff -) - -// NewOID returns a OID initialized with bytes. -func NewOID(bytes []byte) *OID { - switch len(bytes) { - case reservedOIDLength1, reservedOIDLength2: - panic("encoding: NewOID argument length is reserved") - default: - if len(bytes) > maxOID { - panic("encoding: NewOID argument too large") - } - } - - return &OID{ - bytes: bytes, - } -} - -// Bytes returns the decoded data. -func (o *OID) Bytes() []byte { - return o.bytes -} - -// BitLength is the size in bits of the decoded data. -func (o *OID) BitLength() uint16 { - return uint16(len(o.bytes) * 8) -} - -// EncodedBytes returns the encoded data. -func (o *OID) EncodedBytes() []byte { - return append([]byte{byte(len(o.bytes))}, o.bytes...) -} - -// EncodedLength is the size in bytes of the encoded data. -func (o *OID) EncodedLength() uint16 { - return uint16(1 + len(o.bytes)) -} - -// ReadFrom reads into b the next OID from r. -func (o *OID) ReadFrom(r io.Reader) (int64, error) { - var buf [1]byte - n, err := io.ReadFull(r, buf[:]) - if err != nil { - if err == io.EOF { - err = io.ErrUnexpectedEOF - } - return int64(n), err - } - - switch buf[0] { - case reservedOIDLength1, reservedOIDLength2: - return int64(n), errors.UnsupportedError("reserved for future extensions") - } - - o.bytes = make([]byte, buf[0]) - - nn, err := io.ReadFull(r, o.bytes) - if err == io.EOF { - err = io.ErrUnexpectedEOF - } - - return int64(n) + int64(nn), err -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/key_generation.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/key_generation.go deleted file mode 100644 index 77213f66b..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/key_generation.go +++ /dev/null @@ -1,456 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package openpgp - -import ( - "crypto" - "crypto/rand" - "crypto/rsa" - goerrors "errors" - "io" - "math/big" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/ecdh" - "github.com/ProtonMail/go-crypto/openpgp/ecdsa" - "github.com/ProtonMail/go-crypto/openpgp/ed25519" - "github.com/ProtonMail/go-crypto/openpgp/ed448" - "github.com/ProtonMail/go-crypto/openpgp/eddsa" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "github.com/ProtonMail/go-crypto/openpgp/internal/ecc" - "github.com/ProtonMail/go-crypto/openpgp/packet" - "github.com/ProtonMail/go-crypto/openpgp/x25519" - "github.com/ProtonMail/go-crypto/openpgp/x448" -) - -// NewEntity returns an Entity that contains a fresh RSA/RSA keypair with a -// single identity composed of the given full name, comment and email, any of -// which may be empty but must not contain any of "()<>\x00". -// If config is nil, sensible defaults will be used. -func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) { - creationTime := config.Now() - keyLifetimeSecs := config.KeyLifetime() - - // Generate a primary signing key - primaryPrivRaw, err := newSigner(config) - if err != nil { - return nil, err - } - primary := packet.NewSignerPrivateKey(creationTime, primaryPrivRaw) - if config.V6() { - if err := primary.UpgradeToV6(); err != nil { - return nil, err - } - } - - e := &Entity{ - PrimaryKey: &primary.PublicKey, - PrivateKey: primary, - Identities: make(map[string]*Identity), - Subkeys: []Subkey{}, - Signatures: []*packet.Signature{}, - } - - if config.V6() { - // In v6 keys algorithm preferences should be stored in direct key signatures - selfSignature := createSignaturePacket(&primary.PublicKey, packet.SigTypeDirectSignature, config) - err = writeKeyProperties(selfSignature, creationTime, keyLifetimeSecs, config) - if err != nil { - return nil, err - } - err = selfSignature.SignDirectKeyBinding(&primary.PublicKey, primary, config) - if err != nil { - return nil, err - } - e.Signatures = append(e.Signatures, selfSignature) - e.SelfSignature = selfSignature - } - - err = e.addUserId(name, comment, email, config, creationTime, keyLifetimeSecs, !config.V6()) - if err != nil { - return nil, err - } - - // NOTE: No key expiry here, but we will not return this subkey in EncryptionKey() - // if the primary/master key has expired. - err = e.addEncryptionSubkey(config, creationTime, 0) - if err != nil { - return nil, err - } - - return e, nil -} - -func (t *Entity) AddUserId(name, comment, email string, config *packet.Config) error { - creationTime := config.Now() - keyLifetimeSecs := config.KeyLifetime() - return t.addUserId(name, comment, email, config, creationTime, keyLifetimeSecs, !config.V6()) -} - -func writeKeyProperties(selfSignature *packet.Signature, creationTime time.Time, keyLifetimeSecs uint32, config *packet.Config) error { - advertiseAead := config.AEAD() != nil - - selfSignature.CreationTime = creationTime - selfSignature.KeyLifetimeSecs = &keyLifetimeSecs - selfSignature.FlagsValid = true - selfSignature.FlagSign = true - selfSignature.FlagCertify = true - selfSignature.SEIPDv1 = true // true by default, see 5.8 vs. 5.14 - selfSignature.SEIPDv2 = advertiseAead - - // Set the PreferredHash for the SelfSignature from the packet.Config. - // If it is not the must-implement algorithm from rfc4880bis, append that. - hash, ok := algorithm.HashToHashId(config.Hash()) - if !ok { - return errors.UnsupportedError("unsupported preferred hash function") - } - - selfSignature.PreferredHash = []uint8{hash} - if config.Hash() != crypto.SHA256 { - selfSignature.PreferredHash = append(selfSignature.PreferredHash, hashToHashId(crypto.SHA256)) - } - - // Likewise for DefaultCipher. - selfSignature.PreferredSymmetric = []uint8{uint8(config.Cipher())} - if config.Cipher() != packet.CipherAES128 { - selfSignature.PreferredSymmetric = append(selfSignature.PreferredSymmetric, uint8(packet.CipherAES128)) - } - - // We set CompressionNone as the preferred compression algorithm because - // of compression side channel attacks, then append the configured - // DefaultCompressionAlgo if any is set (to signal support for cases - // where the application knows that using compression is safe). - selfSignature.PreferredCompression = []uint8{uint8(packet.CompressionNone)} - if config.Compression() != packet.CompressionNone { - selfSignature.PreferredCompression = append(selfSignature.PreferredCompression, uint8(config.Compression())) - } - - if advertiseAead { - // Get the preferred AEAD mode from the packet.Config. - // If it is not the must-implement algorithm from rfc9580, append that. - modes := []uint8{uint8(config.AEAD().Mode())} - if config.AEAD().Mode() != packet.AEADModeOCB { - modes = append(modes, uint8(packet.AEADModeOCB)) - } - - // For preferred (AES256, GCM), we'll generate (AES256, GCM), (AES256, OCB), (AES128, GCM), (AES128, OCB) - for _, cipher := range selfSignature.PreferredSymmetric { - for _, mode := range modes { - selfSignature.PreferredCipherSuites = append(selfSignature.PreferredCipherSuites, [2]uint8{cipher, mode}) - } - } - } - return nil -} - -func (t *Entity) addUserId(name, comment, email string, config *packet.Config, creationTime time.Time, keyLifetimeSecs uint32, writeProperties bool) error { - uid := packet.NewUserId(name, comment, email) - if uid == nil { - return errors.InvalidArgumentError("user id field contained invalid characters") - } - - if _, ok := t.Identities[uid.Id]; ok { - return errors.InvalidArgumentError("user id exist") - } - - primary := t.PrivateKey - isPrimaryId := len(t.Identities) == 0 - selfSignature := createSignaturePacket(&primary.PublicKey, packet.SigTypePositiveCert, config) - if writeProperties { - err := writeKeyProperties(selfSignature, creationTime, keyLifetimeSecs, config) - if err != nil { - return err - } - } - selfSignature.IsPrimaryId = &isPrimaryId - - // User ID binding signature - err := selfSignature.SignUserId(uid.Id, &primary.PublicKey, primary, config) - if err != nil { - return err - } - t.Identities[uid.Id] = &Identity{ - Name: uid.Id, - UserId: uid, - SelfSignature: selfSignature, - Signatures: []*packet.Signature{selfSignature}, - } - return nil -} - -// AddSigningSubkey adds a signing keypair as a subkey to the Entity. -// If config is nil, sensible defaults will be used. -func (e *Entity) AddSigningSubkey(config *packet.Config) error { - creationTime := config.Now() - keyLifetimeSecs := config.KeyLifetime() - - subPrivRaw, err := newSigner(config) - if err != nil { - return err - } - sub := packet.NewSignerPrivateKey(creationTime, subPrivRaw) - sub.IsSubkey = true - if config.V6() { - if err := sub.UpgradeToV6(); err != nil { - return err - } - } - - subkey := Subkey{ - PublicKey: &sub.PublicKey, - PrivateKey: sub, - } - subkey.Sig = createSignaturePacket(e.PrimaryKey, packet.SigTypeSubkeyBinding, config) - subkey.Sig.CreationTime = creationTime - subkey.Sig.KeyLifetimeSecs = &keyLifetimeSecs - subkey.Sig.FlagsValid = true - subkey.Sig.FlagSign = true - subkey.Sig.EmbeddedSignature = createSignaturePacket(subkey.PublicKey, packet.SigTypePrimaryKeyBinding, config) - subkey.Sig.EmbeddedSignature.CreationTime = creationTime - - err = subkey.Sig.EmbeddedSignature.CrossSignKey(subkey.PublicKey, e.PrimaryKey, subkey.PrivateKey, config) - if err != nil { - return err - } - - err = subkey.Sig.SignKey(subkey.PublicKey, e.PrivateKey, config) - if err != nil { - return err - } - - e.Subkeys = append(e.Subkeys, subkey) - return nil -} - -// AddEncryptionSubkey adds an encryption keypair as a subkey to the Entity. -// If config is nil, sensible defaults will be used. -func (e *Entity) AddEncryptionSubkey(config *packet.Config) error { - creationTime := config.Now() - keyLifetimeSecs := config.KeyLifetime() - return e.addEncryptionSubkey(config, creationTime, keyLifetimeSecs) -} - -func (e *Entity) addEncryptionSubkey(config *packet.Config, creationTime time.Time, keyLifetimeSecs uint32) error { - subPrivRaw, err := newDecrypter(config) - if err != nil { - return err - } - sub := packet.NewDecrypterPrivateKey(creationTime, subPrivRaw) - sub.IsSubkey = true - if config.V6() { - if err := sub.UpgradeToV6(); err != nil { - return err - } - } - - subkey := Subkey{ - PublicKey: &sub.PublicKey, - PrivateKey: sub, - } - subkey.Sig = createSignaturePacket(e.PrimaryKey, packet.SigTypeSubkeyBinding, config) - subkey.Sig.CreationTime = creationTime - subkey.Sig.KeyLifetimeSecs = &keyLifetimeSecs - subkey.Sig.FlagsValid = true - subkey.Sig.FlagEncryptStorage = true - subkey.Sig.FlagEncryptCommunications = true - - err = subkey.Sig.SignKey(subkey.PublicKey, e.PrivateKey, config) - if err != nil { - return err - } - - e.Subkeys = append(e.Subkeys, subkey) - return nil -} - -// Generates a signing key -func newSigner(config *packet.Config) (signer interface{}, err error) { - switch config.PublicKeyAlgorithm() { - case packet.PubKeyAlgoRSA: - bits := config.RSAModulusBits() - if bits < 1024 { - return nil, errors.InvalidArgumentError("bits must be >= 1024") - } - if config != nil && len(config.RSAPrimes) >= 2 { - primes := config.RSAPrimes[0:2] - config.RSAPrimes = config.RSAPrimes[2:] - return generateRSAKeyWithPrimes(config.Random(), 2, bits, primes) - } - return rsa.GenerateKey(config.Random(), bits) - case packet.PubKeyAlgoEdDSA: - if config.V6() { - // Implementations MUST NOT accept or generate v6 key material - // using the deprecated OIDs. - return nil, errors.InvalidArgumentError("EdDSALegacy cannot be used for v6 keys") - } - curve := ecc.FindEdDSAByGenName(string(config.CurveName())) - if curve == nil { - return nil, errors.InvalidArgumentError("unsupported curve") - } - - priv, err := eddsa.GenerateKey(config.Random(), curve) - if err != nil { - return nil, err - } - return priv, nil - case packet.PubKeyAlgoECDSA: - curve := ecc.FindECDSAByGenName(string(config.CurveName())) - if curve == nil { - return nil, errors.InvalidArgumentError("unsupported curve") - } - - priv, err := ecdsa.GenerateKey(config.Random(), curve) - if err != nil { - return nil, err - } - return priv, nil - case packet.PubKeyAlgoEd25519: - priv, err := ed25519.GenerateKey(config.Random()) - if err != nil { - return nil, err - } - return priv, nil - case packet.PubKeyAlgoEd448: - priv, err := ed448.GenerateKey(config.Random()) - if err != nil { - return nil, err - } - return priv, nil - default: - return nil, errors.InvalidArgumentError("unsupported public key algorithm") - } -} - -// Generates an encryption/decryption key -func newDecrypter(config *packet.Config) (decrypter interface{}, err error) { - switch config.PublicKeyAlgorithm() { - case packet.PubKeyAlgoRSA: - bits := config.RSAModulusBits() - if bits < 1024 { - return nil, errors.InvalidArgumentError("bits must be >= 1024") - } - if config != nil && len(config.RSAPrimes) >= 2 { - primes := config.RSAPrimes[0:2] - config.RSAPrimes = config.RSAPrimes[2:] - return generateRSAKeyWithPrimes(config.Random(), 2, bits, primes) - } - return rsa.GenerateKey(config.Random(), bits) - case packet.PubKeyAlgoEdDSA, packet.PubKeyAlgoECDSA: - fallthrough // When passing EdDSA or ECDSA, we generate an ECDH subkey - case packet.PubKeyAlgoECDH: - if config.V6() && - (config.CurveName() == packet.Curve25519 || - config.CurveName() == packet.Curve448) { - // Implementations MUST NOT accept or generate v6 key material - // using the deprecated OIDs. - return nil, errors.InvalidArgumentError("ECDH with Curve25519/448 legacy cannot be used for v6 keys") - } - var kdf = ecdh.KDF{ - Hash: algorithm.SHA512, - Cipher: algorithm.AES256, - } - curve := ecc.FindECDHByGenName(string(config.CurveName())) - if curve == nil { - return nil, errors.InvalidArgumentError("unsupported curve") - } - return ecdh.GenerateKey(config.Random(), curve, kdf) - case packet.PubKeyAlgoEd25519, packet.PubKeyAlgoX25519: // When passing Ed25519, we generate an x25519 subkey - return x25519.GenerateKey(config.Random()) - case packet.PubKeyAlgoEd448, packet.PubKeyAlgoX448: // When passing Ed448, we generate an x448 subkey - return x448.GenerateKey(config.Random()) - default: - return nil, errors.InvalidArgumentError("unsupported public key algorithm") - } -} - -var bigOne = big.NewInt(1) - -// generateRSAKeyWithPrimes generates a multi-prime RSA keypair of the -// given bit size, using the given random source and pre-populated primes. -func generateRSAKeyWithPrimes(random io.Reader, nprimes int, bits int, prepopulatedPrimes []*big.Int) (*rsa.PrivateKey, error) { - priv := new(rsa.PrivateKey) - priv.E = 65537 - - if nprimes < 2 { - return nil, goerrors.New("generateRSAKeyWithPrimes: nprimes must be >= 2") - } - - if bits < 1024 { - return nil, goerrors.New("generateRSAKeyWithPrimes: bits must be >= 1024") - } - - primes := make([]*big.Int, nprimes) - -NextSetOfPrimes: - for { - todo := bits - // crypto/rand should set the top two bits in each prime. - // Thus each prime has the form - // p_i = 2^bitlen(p_i) × 0.11... (in base 2). - // And the product is: - // P = 2^todo × α - // where α is the product of nprimes numbers of the form 0.11... - // - // If α < 1/2 (which can happen for nprimes > 2), we need to - // shift todo to compensate for lost bits: the mean value of 0.11... - // is 7/8, so todo + shift - nprimes * log2(7/8) ~= bits - 1/2 - // will give good results. - if nprimes >= 7 { - todo += (nprimes - 2) / 5 - } - for i := 0; i < nprimes; i++ { - var err error - if len(prepopulatedPrimes) == 0 { - primes[i], err = rand.Prime(random, todo/(nprimes-i)) - if err != nil { - return nil, err - } - } else { - primes[i] = prepopulatedPrimes[0] - prepopulatedPrimes = prepopulatedPrimes[1:] - } - - todo -= primes[i].BitLen() - } - - // Make sure that primes is pairwise unequal. - for i, prime := range primes { - for j := 0; j < i; j++ { - if prime.Cmp(primes[j]) == 0 { - continue NextSetOfPrimes - } - } - } - - n := new(big.Int).Set(bigOne) - totient := new(big.Int).Set(bigOne) - pminus1 := new(big.Int) - for _, prime := range primes { - n.Mul(n, prime) - pminus1.Sub(prime, bigOne) - totient.Mul(totient, pminus1) - } - if n.BitLen() != bits { - // This should never happen for nprimes == 2 because - // crypto/rand should set the top two bits in each prime. - // For nprimes > 2 we hope it does not happen often. - continue NextSetOfPrimes - } - - priv.D = new(big.Int) - e := big.NewInt(int64(priv.E)) - ok := priv.D.ModInverse(e, totient) - - if ok != nil { - priv.Primes = primes - priv.N = n - break - } - } - - priv.Precompute() - return priv, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/keys.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/keys.go deleted file mode 100644 index a071353e2..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/keys.go +++ /dev/null @@ -1,901 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package openpgp - -import ( - goerrors "errors" - "fmt" - "io" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/armor" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/packet" -) - -// PublicKeyType is the armor type for a PGP public key. -var PublicKeyType = "PGP PUBLIC KEY BLOCK" - -// PrivateKeyType is the armor type for a PGP private key. -var PrivateKeyType = "PGP PRIVATE KEY BLOCK" - -// An Entity represents the components of an OpenPGP key: a primary public key -// (which must be a signing key), one or more identities claimed by that key, -// and zero or more subkeys, which may be encryption keys. -type Entity struct { - PrimaryKey *packet.PublicKey - PrivateKey *packet.PrivateKey - Identities map[string]*Identity // indexed by Identity.Name - Revocations []*packet.Signature - Subkeys []Subkey - SelfSignature *packet.Signature // Direct-key self signature of the PrimaryKey (contains primary key properties in v6) - Signatures []*packet.Signature // all (potentially unverified) self-signatures, revocations, and third-party signatures -} - -// An Identity represents an identity claimed by an Entity and zero or more -// assertions by other entities about that claim. -type Identity struct { - Name string // by convention, has the form "Full Name (comment) " - UserId *packet.UserId - SelfSignature *packet.Signature - Revocations []*packet.Signature - Signatures []*packet.Signature // all (potentially unverified) self-signatures, revocations, and third-party signatures -} - -// A Subkey is an additional public key in an Entity. Subkeys can be used for -// encryption. -type Subkey struct { - PublicKey *packet.PublicKey - PrivateKey *packet.PrivateKey - Sig *packet.Signature - Revocations []*packet.Signature -} - -// A Key identifies a specific public key in an Entity. This is either the -// Entity's primary key or a subkey. -type Key struct { - Entity *Entity - PublicKey *packet.PublicKey - PrivateKey *packet.PrivateKey - SelfSignature *packet.Signature - Revocations []*packet.Signature -} - -// A KeyRing provides access to public and private keys. -type KeyRing interface { - // KeysById returns the set of keys that have the given key id. - KeysById(id uint64) []Key - // KeysByIdAndUsage returns the set of keys with the given id - // that also meet the key usage given by requiredUsage. - // The requiredUsage is expressed as the bitwise-OR of - // packet.KeyFlag* values. - KeysByIdUsage(id uint64, requiredUsage byte) []Key - // DecryptionKeys returns all private keys that are valid for - // decryption. - DecryptionKeys() []Key -} - -// PrimaryIdentity returns an Identity, preferring non-revoked identities, -// identities marked as primary, or the latest-created identity, in that order. -func (e *Entity) PrimaryIdentity() *Identity { - var primaryIdentity *Identity - for _, ident := range e.Identities { - if shouldPreferIdentity(primaryIdentity, ident) { - primaryIdentity = ident - } - } - return primaryIdentity -} - -func shouldPreferIdentity(existingId, potentialNewId *Identity) bool { - if existingId == nil { - return true - } - - if len(existingId.Revocations) > len(potentialNewId.Revocations) { - return true - } - - if len(existingId.Revocations) < len(potentialNewId.Revocations) { - return false - } - - if existingId.SelfSignature == nil { - return true - } - - if existingId.SelfSignature.IsPrimaryId != nil && *existingId.SelfSignature.IsPrimaryId && - !(potentialNewId.SelfSignature.IsPrimaryId != nil && *potentialNewId.SelfSignature.IsPrimaryId) { - return false - } - - if !(existingId.SelfSignature.IsPrimaryId != nil && *existingId.SelfSignature.IsPrimaryId) && - potentialNewId.SelfSignature.IsPrimaryId != nil && *potentialNewId.SelfSignature.IsPrimaryId { - return true - } - - return potentialNewId.SelfSignature.CreationTime.After(existingId.SelfSignature.CreationTime) -} - -// EncryptionKey returns the best candidate Key for encrypting a message to the -// given Entity. -func (e *Entity) EncryptionKey(now time.Time) (Key, bool) { - // Fail to find any encryption key if the... - primarySelfSignature, primaryIdentity := e.PrimarySelfSignature() - if primarySelfSignature == nil || // no self-signature found - e.PrimaryKey.KeyExpired(primarySelfSignature, now) || // primary key has expired - e.Revoked(now) || // primary key has been revoked - primarySelfSignature.SigExpired(now) || // user ID or or direct self-signature has expired - (primaryIdentity != nil && primaryIdentity.Revoked(now)) { // user ID has been revoked (for v4 keys) - return Key{}, false - } - - // Iterate the keys to find the newest, unexpired one - candidateSubkey := -1 - var maxTime time.Time - for i, subkey := range e.Subkeys { - if subkey.Sig.FlagsValid && - subkey.Sig.FlagEncryptCommunications && - subkey.PublicKey.PubKeyAlgo.CanEncrypt() && - !subkey.PublicKey.KeyExpired(subkey.Sig, now) && - !subkey.Sig.SigExpired(now) && - !subkey.Revoked(now) && - (maxTime.IsZero() || subkey.Sig.CreationTime.After(maxTime)) { - candidateSubkey = i - maxTime = subkey.Sig.CreationTime - } - } - - if candidateSubkey != -1 { - subkey := e.Subkeys[candidateSubkey] - return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig, subkey.Revocations}, true - } - - // If we don't have any subkeys for encryption and the primary key - // is marked as OK to encrypt with, then we can use it. - if primarySelfSignature.FlagsValid && primarySelfSignature.FlagEncryptCommunications && - e.PrimaryKey.PubKeyAlgo.CanEncrypt() { - return Key{e, e.PrimaryKey, e.PrivateKey, primarySelfSignature, e.Revocations}, true - } - - return Key{}, false -} - -// CertificationKey return the best candidate Key for certifying a key with this -// Entity. -func (e *Entity) CertificationKey(now time.Time) (Key, bool) { - return e.CertificationKeyById(now, 0) -} - -// CertificationKeyById return the Key for key certification with this -// Entity and keyID. -func (e *Entity) CertificationKeyById(now time.Time, id uint64) (Key, bool) { - return e.signingKeyByIdUsage(now, id, packet.KeyFlagCertify) -} - -// SigningKey return the best candidate Key for signing a message with this -// Entity. -func (e *Entity) SigningKey(now time.Time) (Key, bool) { - return e.SigningKeyById(now, 0) -} - -// SigningKeyById return the Key for signing a message with this -// Entity and keyID. -func (e *Entity) SigningKeyById(now time.Time, id uint64) (Key, bool) { - return e.signingKeyByIdUsage(now, id, packet.KeyFlagSign) -} - -func (e *Entity) signingKeyByIdUsage(now time.Time, id uint64, flags int) (Key, bool) { - // Fail to find any signing key if the... - primarySelfSignature, primaryIdentity := e.PrimarySelfSignature() - if primarySelfSignature == nil || // no self-signature found - e.PrimaryKey.KeyExpired(primarySelfSignature, now) || // primary key has expired - e.Revoked(now) || // primary key has been revoked - primarySelfSignature.SigExpired(now) || // user ID or direct self-signature has expired - (primaryIdentity != nil && primaryIdentity.Revoked(now)) { // user ID has been revoked (for v4 keys) - return Key{}, false - } - - // Iterate the keys to find the newest, unexpired one - candidateSubkey := -1 - var maxTime time.Time - for idx, subkey := range e.Subkeys { - if subkey.Sig.FlagsValid && - (flags&packet.KeyFlagCertify == 0 || subkey.Sig.FlagCertify) && - (flags&packet.KeyFlagSign == 0 || subkey.Sig.FlagSign) && - subkey.PublicKey.PubKeyAlgo.CanSign() && - !subkey.PublicKey.KeyExpired(subkey.Sig, now) && - !subkey.Sig.SigExpired(now) && - !subkey.Revoked(now) && - (maxTime.IsZero() || subkey.Sig.CreationTime.After(maxTime)) && - (id == 0 || subkey.PublicKey.KeyId == id) { - candidateSubkey = idx - maxTime = subkey.Sig.CreationTime - } - } - - if candidateSubkey != -1 { - subkey := e.Subkeys[candidateSubkey] - return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig, subkey.Revocations}, true - } - - // If we don't have any subkeys for signing and the primary key - // is marked as OK to sign with, then we can use it. - if primarySelfSignature.FlagsValid && - (flags&packet.KeyFlagCertify == 0 || primarySelfSignature.FlagCertify) && - (flags&packet.KeyFlagSign == 0 || primarySelfSignature.FlagSign) && - e.PrimaryKey.PubKeyAlgo.CanSign() && - (id == 0 || e.PrimaryKey.KeyId == id) { - return Key{e, e.PrimaryKey, e.PrivateKey, primarySelfSignature, e.Revocations}, true - } - - // No keys with a valid Signing Flag or no keys matched the id passed in - return Key{}, false -} - -func revoked(revocations []*packet.Signature, now time.Time) bool { - for _, revocation := range revocations { - if revocation.RevocationReason != nil && *revocation.RevocationReason == packet.KeyCompromised { - // If the key is compromised, the key is considered revoked even before the revocation date. - return true - } - if !revocation.SigExpired(now) { - return true - } - } - return false -} - -// Revoked returns whether the entity has any direct key revocation signatures. -// Note that third-party revocation signatures are not supported. -// Note also that Identity and Subkey revocation should be checked separately. -func (e *Entity) Revoked(now time.Time) bool { - return revoked(e.Revocations, now) -} - -// EncryptPrivateKeys encrypts all non-encrypted keys in the entity with the same key -// derived from the provided passphrase. Public keys and dummy keys are ignored, -// and don't cause an error to be returned. -func (e *Entity) EncryptPrivateKeys(passphrase []byte, config *packet.Config) error { - var keysToEncrypt []*packet.PrivateKey - // Add entity private key to encrypt. - if e.PrivateKey != nil && !e.PrivateKey.Dummy() && !e.PrivateKey.Encrypted { - keysToEncrypt = append(keysToEncrypt, e.PrivateKey) - } - - // Add subkeys to encrypt. - for _, sub := range e.Subkeys { - if sub.PrivateKey != nil && !sub.PrivateKey.Dummy() && !sub.PrivateKey.Encrypted { - keysToEncrypt = append(keysToEncrypt, sub.PrivateKey) - } - } - return packet.EncryptPrivateKeys(keysToEncrypt, passphrase, config) -} - -// DecryptPrivateKeys decrypts all encrypted keys in the entity with the given passphrase. -// Avoids recomputation of similar s2k key derivations. Public keys and dummy keys are ignored, -// and don't cause an error to be returned. -func (e *Entity) DecryptPrivateKeys(passphrase []byte) error { - var keysToDecrypt []*packet.PrivateKey - // Add entity private key to decrypt. - if e.PrivateKey != nil && !e.PrivateKey.Dummy() && e.PrivateKey.Encrypted { - keysToDecrypt = append(keysToDecrypt, e.PrivateKey) - } - - // Add subkeys to decrypt. - for _, sub := range e.Subkeys { - if sub.PrivateKey != nil && !sub.PrivateKey.Dummy() && sub.PrivateKey.Encrypted { - keysToDecrypt = append(keysToDecrypt, sub.PrivateKey) - } - } - return packet.DecryptPrivateKeys(keysToDecrypt, passphrase) -} - -// Revoked returns whether the identity has been revoked by a self-signature. -// Note that third-party revocation signatures are not supported. -func (i *Identity) Revoked(now time.Time) bool { - return revoked(i.Revocations, now) -} - -// Revoked returns whether the subkey has been revoked by a self-signature. -// Note that third-party revocation signatures are not supported. -func (s *Subkey) Revoked(now time.Time) bool { - return revoked(s.Revocations, now) -} - -// Revoked returns whether the key or subkey has been revoked by a self-signature. -// Note that third-party revocation signatures are not supported. -// Note also that Identity revocation should be checked separately. -// Normally, it's not necessary to call this function, except on keys returned by -// KeysById or KeysByIdUsage. -func (key *Key) Revoked(now time.Time) bool { - return revoked(key.Revocations, now) -} - -// An EntityList contains one or more Entities. -type EntityList []*Entity - -// KeysById returns the set of keys that have the given key id. -func (el EntityList) KeysById(id uint64) (keys []Key) { - for _, e := range el { - if e.PrimaryKey.KeyId == id { - selfSig, _ := e.PrimarySelfSignature() - keys = append(keys, Key{e, e.PrimaryKey, e.PrivateKey, selfSig, e.Revocations}) - } - - for _, subKey := range e.Subkeys { - if subKey.PublicKey.KeyId == id { - keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig, subKey.Revocations}) - } - } - } - return -} - -// KeysByIdAndUsage returns the set of keys with the given id that also meet -// the key usage given by requiredUsage. The requiredUsage is expressed as -// the bitwise-OR of packet.KeyFlag* values. -func (el EntityList) KeysByIdUsage(id uint64, requiredUsage byte) (keys []Key) { - for _, key := range el.KeysById(id) { - if requiredUsage != 0 { - if key.SelfSignature == nil || !key.SelfSignature.FlagsValid { - continue - } - - var usage byte - if key.SelfSignature.FlagCertify { - usage |= packet.KeyFlagCertify - } - if key.SelfSignature.FlagSign { - usage |= packet.KeyFlagSign - } - if key.SelfSignature.FlagEncryptCommunications { - usage |= packet.KeyFlagEncryptCommunications - } - if key.SelfSignature.FlagEncryptStorage { - usage |= packet.KeyFlagEncryptStorage - } - if usage&requiredUsage != requiredUsage { - continue - } - } - - keys = append(keys, key) - } - return -} - -// DecryptionKeys returns all private keys that are valid for decryption. -func (el EntityList) DecryptionKeys() (keys []Key) { - for _, e := range el { - for _, subKey := range e.Subkeys { - if subKey.PrivateKey != nil && subKey.Sig.FlagsValid && (subKey.Sig.FlagEncryptStorage || subKey.Sig.FlagEncryptCommunications) { - keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig, subKey.Revocations}) - } - } - } - return -} - -// ReadArmoredKeyRing reads one or more public/private keys from an armor keyring file. -func ReadArmoredKeyRing(r io.Reader) (EntityList, error) { - block, err := armor.Decode(r) - if err == io.EOF { - return nil, errors.InvalidArgumentError("no armored data found") - } - if err != nil { - return nil, err - } - if block.Type != PublicKeyType && block.Type != PrivateKeyType { - return nil, errors.InvalidArgumentError("expected public or private key block, got: " + block.Type) - } - - return ReadKeyRing(block.Body) -} - -// ReadKeyRing reads one or more public/private keys. Unsupported keys are -// ignored as long as at least a single valid key is found. -func ReadKeyRing(r io.Reader) (el EntityList, err error) { - packets := packet.NewReader(r) - var lastUnsupportedError error - - for { - var e *Entity - e, err = ReadEntity(packets) - if err != nil { - // TODO: warn about skipped unsupported/unreadable keys - if _, ok := err.(errors.UnsupportedError); ok { - lastUnsupportedError = err - err = readToNextPublicKey(packets) - } else if _, ok := err.(errors.StructuralError); ok { - // Skip unreadable, badly-formatted keys - lastUnsupportedError = err - err = readToNextPublicKey(packets) - } - if err == io.EOF { - err = nil - break - } - if err != nil { - el = nil - break - } - } else { - el = append(el, e) - } - } - - if len(el) == 0 && err == nil { - err = lastUnsupportedError - } - return -} - -// readToNextPublicKey reads packets until the start of the entity and leaves -// the first packet of the new entity in the Reader. -func readToNextPublicKey(packets *packet.Reader) (err error) { - var p packet.Packet - for { - p, err = packets.Next() - if err == io.EOF { - return - } else if err != nil { - if _, ok := err.(errors.UnsupportedError); ok { - continue - } - return - } - - if pk, ok := p.(*packet.PublicKey); ok && !pk.IsSubkey { - packets.Unread(p) - return - } - } -} - -// ReadEntity reads an entity (public key, identities, subkeys etc) from the -// given Reader. -func ReadEntity(packets *packet.Reader) (*Entity, error) { - e := new(Entity) - e.Identities = make(map[string]*Identity) - - p, err := packets.Next() - if err != nil { - return nil, err - } - - var ok bool - if e.PrimaryKey, ok = p.(*packet.PublicKey); !ok { - if e.PrivateKey, ok = p.(*packet.PrivateKey); !ok { - packets.Unread(p) - return nil, errors.StructuralError("first packet was not a public/private key") - } - e.PrimaryKey = &e.PrivateKey.PublicKey - } - - if !e.PrimaryKey.PubKeyAlgo.CanSign() { - return nil, errors.StructuralError("primary key cannot be used for signatures") - } - - var revocations []*packet.Signature - var directSignatures []*packet.Signature -EachPacket: - for { - p, err := packets.Next() - if err == io.EOF { - break - } else if err != nil { - return nil, err - } - - switch pkt := p.(type) { - case *packet.UserId: - if err := addUserID(e, packets, pkt); err != nil { - return nil, err - } - case *packet.Signature: - if pkt.SigType == packet.SigTypeKeyRevocation { - revocations = append(revocations, pkt) - } else if pkt.SigType == packet.SigTypeDirectSignature { - directSignatures = append(directSignatures, pkt) - } - // Else, ignoring the signature as it does not follow anything - // we would know to attach it to. - case *packet.PrivateKey: - if !pkt.IsSubkey { - packets.Unread(p) - break EachPacket - } - err = addSubkey(e, packets, &pkt.PublicKey, pkt) - if err != nil { - return nil, err - } - case *packet.PublicKey: - if !pkt.IsSubkey { - packets.Unread(p) - break EachPacket - } - err = addSubkey(e, packets, pkt, nil) - if err != nil { - return nil, err - } - default: - // we ignore unknown packets. - } - } - - if len(e.Identities) == 0 && e.PrimaryKey.Version < 6 { - return nil, errors.StructuralError(fmt.Sprintf("v%d entity without any identities", e.PrimaryKey.Version)) - } - - // An implementation MUST ensure that a valid direct-key signature is present before using a v6 key. - if e.PrimaryKey.Version == 6 { - if len(directSignatures) == 0 { - return nil, errors.StructuralError("v6 entity without a valid direct-key signature") - } - // Select main direct key signature. - var mainDirectKeySelfSignature *packet.Signature - for _, directSignature := range directSignatures { - if directSignature.SigType == packet.SigTypeDirectSignature && - directSignature.CheckKeyIdOrFingerprint(e.PrimaryKey) && - (mainDirectKeySelfSignature == nil || - directSignature.CreationTime.After(mainDirectKeySelfSignature.CreationTime)) { - mainDirectKeySelfSignature = directSignature - } - } - if mainDirectKeySelfSignature == nil { - return nil, errors.StructuralError("no valid direct-key self-signature for v6 primary key found") - } - // Check that the main self-signature is valid. - err = e.PrimaryKey.VerifyDirectKeySignature(mainDirectKeySelfSignature) - if err != nil { - return nil, errors.StructuralError("invalid direct-key self-signature for v6 primary key") - } - e.SelfSignature = mainDirectKeySelfSignature - e.Signatures = directSignatures - } - - for _, revocation := range revocations { - err = e.PrimaryKey.VerifyRevocationSignature(revocation) - if err == nil { - e.Revocations = append(e.Revocations, revocation) - } else { - // TODO: RFC 4880 5.2.3.15 defines revocation keys. - return nil, errors.StructuralError("revocation signature signed by alternate key") - } - } - - return e, nil -} - -func addUserID(e *Entity, packets *packet.Reader, pkt *packet.UserId) error { - // Make a new Identity object, that we might wind up throwing away. - // We'll only add it if we get a valid self-signature over this - // userID. - identity := new(Identity) - identity.Name = pkt.Id - identity.UserId = pkt - - for { - p, err := packets.Next() - if err == io.EOF { - break - } else if err != nil { - return err - } - - sig, ok := p.(*packet.Signature) - if !ok { - packets.Unread(p) - break - } - - if sig.SigType != packet.SigTypeGenericCert && - sig.SigType != packet.SigTypePersonaCert && - sig.SigType != packet.SigTypeCasualCert && - sig.SigType != packet.SigTypePositiveCert && - sig.SigType != packet.SigTypeCertificationRevocation { - return errors.StructuralError("user ID signature with wrong type") - } - - if sig.CheckKeyIdOrFingerprint(e.PrimaryKey) { - if err = e.PrimaryKey.VerifyUserIdSignature(pkt.Id, e.PrimaryKey, sig); err != nil { - return errors.StructuralError("user ID self-signature invalid: " + err.Error()) - } - if sig.SigType == packet.SigTypeCertificationRevocation { - identity.Revocations = append(identity.Revocations, sig) - } else if identity.SelfSignature == nil || sig.CreationTime.After(identity.SelfSignature.CreationTime) { - identity.SelfSignature = sig - } - identity.Signatures = append(identity.Signatures, sig) - e.Identities[pkt.Id] = identity - } else { - identity.Signatures = append(identity.Signatures, sig) - } - } - - return nil -} - -func addSubkey(e *Entity, packets *packet.Reader, pub *packet.PublicKey, priv *packet.PrivateKey) error { - var subKey Subkey - subKey.PublicKey = pub - subKey.PrivateKey = priv - - for { - p, err := packets.Next() - if err == io.EOF { - break - } else if err != nil { - return errors.StructuralError("subkey signature invalid: " + err.Error()) - } - - sig, ok := p.(*packet.Signature) - if !ok { - packets.Unread(p) - break - } - - if sig.SigType != packet.SigTypeSubkeyBinding && sig.SigType != packet.SigTypeSubkeyRevocation { - return errors.StructuralError("subkey signature with wrong type") - } - - if err := e.PrimaryKey.VerifyKeySignature(subKey.PublicKey, sig); err != nil { - return errors.StructuralError("subkey signature invalid: " + err.Error()) - } - - switch sig.SigType { - case packet.SigTypeSubkeyRevocation: - subKey.Revocations = append(subKey.Revocations, sig) - case packet.SigTypeSubkeyBinding: - if subKey.Sig == nil || sig.CreationTime.After(subKey.Sig.CreationTime) { - subKey.Sig = sig - } - } - } - - if subKey.Sig == nil { - return errors.StructuralError("subkey packet not followed by signature") - } - - e.Subkeys = append(e.Subkeys, subKey) - - return nil -} - -// SerializePrivate serializes an Entity, including private key material, but -// excluding signatures from other entities, to the given Writer. -// Identities and subkeys are re-signed in case they changed since NewEntry. -// If config is nil, sensible defaults will be used. -func (e *Entity) SerializePrivate(w io.Writer, config *packet.Config) (err error) { - if e.PrivateKey.Dummy() { - return errors.ErrDummyPrivateKey("dummy private key cannot re-sign identities") - } - return e.serializePrivate(w, config, true) -} - -// SerializePrivateWithoutSigning serializes an Entity, including private key -// material, but excluding signatures from other entities, to the given Writer. -// Self-signatures of identities and subkeys are not re-signed. This is useful -// when serializing GNU dummy keys, among other things. -// If config is nil, sensible defaults will be used. -func (e *Entity) SerializePrivateWithoutSigning(w io.Writer, config *packet.Config) (err error) { - return e.serializePrivate(w, config, false) -} - -func (e *Entity) serializePrivate(w io.Writer, config *packet.Config, reSign bool) (err error) { - if e.PrivateKey == nil { - return goerrors.New("openpgp: private key is missing") - } - err = e.PrivateKey.Serialize(w) - if err != nil { - return - } - for _, revocation := range e.Revocations { - err := revocation.Serialize(w) - if err != nil { - return err - } - } - for _, directSignature := range e.Signatures { - err := directSignature.Serialize(w) - if err != nil { - return err - } - } - for _, ident := range e.Identities { - err = ident.UserId.Serialize(w) - if err != nil { - return - } - if reSign { - if ident.SelfSignature == nil { - return goerrors.New("openpgp: can't re-sign identity without valid self-signature") - } - err = ident.SelfSignature.SignUserId(ident.UserId.Id, e.PrimaryKey, e.PrivateKey, config) - if err != nil { - return - } - } - for _, sig := range ident.Signatures { - err = sig.Serialize(w) - if err != nil { - return err - } - } - } - for _, subkey := range e.Subkeys { - err = subkey.PrivateKey.Serialize(w) - if err != nil { - return - } - if reSign { - err = subkey.Sig.SignKey(subkey.PublicKey, e.PrivateKey, config) - if err != nil { - return - } - if subkey.Sig.EmbeddedSignature != nil { - err = subkey.Sig.EmbeddedSignature.CrossSignKey(subkey.PublicKey, e.PrimaryKey, - subkey.PrivateKey, config) - if err != nil { - return - } - } - } - for _, revocation := range subkey.Revocations { - err := revocation.Serialize(w) - if err != nil { - return err - } - } - err = subkey.Sig.Serialize(w) - if err != nil { - return - } - } - return nil -} - -// Serialize writes the public part of the given Entity to w, including -// signatures from other entities. No private key material will be output. -func (e *Entity) Serialize(w io.Writer) error { - err := e.PrimaryKey.Serialize(w) - if err != nil { - return err - } - for _, revocation := range e.Revocations { - err := revocation.Serialize(w) - if err != nil { - return err - } - } - for _, directSignature := range e.Signatures { - err := directSignature.Serialize(w) - if err != nil { - return err - } - } - for _, ident := range e.Identities { - err = ident.UserId.Serialize(w) - if err != nil { - return err - } - for _, sig := range ident.Signatures { - err = sig.Serialize(w) - if err != nil { - return err - } - } - } - for _, subkey := range e.Subkeys { - err = subkey.PublicKey.Serialize(w) - if err != nil { - return err - } - for _, revocation := range subkey.Revocations { - err := revocation.Serialize(w) - if err != nil { - return err - } - } - err = subkey.Sig.Serialize(w) - if err != nil { - return err - } - } - return nil -} - -// SignIdentity adds a signature to e, from signer, attesting that identity is -// associated with e. The provided identity must already be an element of -// e.Identities and the private key of signer must have been decrypted if -// necessary. -// If config is nil, sensible defaults will be used. -func (e *Entity) SignIdentity(identity string, signer *Entity, config *packet.Config) error { - certificationKey, ok := signer.CertificationKey(config.Now()) - if !ok { - return errors.InvalidArgumentError("no valid certification key found") - } - - if certificationKey.PrivateKey.Encrypted { - return errors.InvalidArgumentError("signing Entity's private key must be decrypted") - } - - ident, ok := e.Identities[identity] - if !ok { - return errors.InvalidArgumentError("given identity string not found in Entity") - } - - sig := createSignaturePacket(certificationKey.PublicKey, packet.SigTypeGenericCert, config) - - signingUserID := config.SigningUserId() - if signingUserID != "" { - if _, ok := signer.Identities[signingUserID]; !ok { - return errors.InvalidArgumentError("signer identity string not found in signer Entity") - } - sig.SignerUserId = &signingUserID - } - - if err := sig.SignUserId(identity, e.PrimaryKey, certificationKey.PrivateKey, config); err != nil { - return err - } - ident.Signatures = append(ident.Signatures, sig) - return nil -} - -// RevokeKey generates a key revocation signature (packet.SigTypeKeyRevocation) with the -// specified reason code and text (RFC4880 section-5.2.3.23). -// If config is nil, sensible defaults will be used. -func (e *Entity) RevokeKey(reason packet.ReasonForRevocation, reasonText string, config *packet.Config) error { - revSig := createSignaturePacket(e.PrimaryKey, packet.SigTypeKeyRevocation, config) - revSig.RevocationReason = &reason - revSig.RevocationReasonText = reasonText - - if err := revSig.RevokeKey(e.PrimaryKey, e.PrivateKey, config); err != nil { - return err - } - e.Revocations = append(e.Revocations, revSig) - return nil -} - -// RevokeSubkey generates a subkey revocation signature (packet.SigTypeSubkeyRevocation) for -// a subkey with the specified reason code and text (RFC4880 section-5.2.3.23). -// If config is nil, sensible defaults will be used. -func (e *Entity) RevokeSubkey(sk *Subkey, reason packet.ReasonForRevocation, reasonText string, config *packet.Config) error { - if err := e.PrimaryKey.VerifyKeySignature(sk.PublicKey, sk.Sig); err != nil { - return errors.InvalidArgumentError("given subkey is not associated with this key") - } - - revSig := createSignaturePacket(e.PrimaryKey, packet.SigTypeSubkeyRevocation, config) - revSig.RevocationReason = &reason - revSig.RevocationReasonText = reasonText - - if err := revSig.RevokeSubkey(sk.PublicKey, e.PrivateKey, config); err != nil { - return err - } - - sk.Revocations = append(sk.Revocations, revSig) - return nil -} - -func (e *Entity) primaryDirectSignature() *packet.Signature { - return e.SelfSignature -} - -// PrimarySelfSignature searches the entity for the self-signature that stores key preferences. -// For V4 keys, returns the self-signature of the primary identity, and the identity. -// For V6 keys, returns the latest valid direct-key self-signature, and no identity (nil). -// This self-signature is to be used to check the key expiration, -// algorithm preferences, and so on. -func (e *Entity) PrimarySelfSignature() (*packet.Signature, *Identity) { - if e.PrimaryKey.Version == 6 { - return e.primaryDirectSignature(), nil - } - primaryIdentity := e.PrimaryIdentity() - if primaryIdentity == nil { - return nil, nil - } - return primaryIdentity.SelfSignature, primaryIdentity -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/keys_test_data.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/keys_test_data.go deleted file mode 100644 index 108fd096f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/keys_test_data.go +++ /dev/null @@ -1,538 +0,0 @@ -package openpgp - -const expiringKeyHex = "c6c04d0451d0c680010800abbb021fd03ffc4e96618901180c3fdcb060ee69eeead97b91256d11420d80b5f1b51930248044130bd300605cf8a05b7a40d3d8cfb0a910be2e3db50dcd50a9c54064c2a5550801daa834ff4480b33d3d3ca495ff8a4e84a886977d17d998f881241a874083d8b995beab555b6d22b8a4817ab17ac3e7304f7d4d2c05c495fb2218348d3bc13651db1d92732e368a9dd7dcefa6eddff30b94706a9aaee47e9d39321460b740c59c6fc3c2fd8ab6c0fb868cb87c0051f0321301fe0f0e1820b15e7fb7063395769b525005c7e30a7ce85984f5cac00504e7b4fdc45d74958de8388436fd5c7ba9ea121f1c851b5911dd1b47a14d81a09e92ef37721e2325b6790011010001cd00c2c07b041001080025050251d0c680050900278d00060b09070803020415080a0203160201021901021b03021e01000a0910e7b484133a890a35ae4b0800a1beb82e7f28eaf5273d6af9d3391314f6280b2b624eaca2851f89a9ebcaf80ac589ebd509f168bc4322106ca2e2ce77a76e071a3c7444787d65216b5f05e82c77928860b92aace3b7d0327db59492f422eb9dfab7249266d37429870b091a98aba8724c2259ebf8f85093f21255eafa75aa841e31d94f2ac891b9755fed455e539044ee69fc47950b80e003fc9f298d695660f28329eaa38037c367efde1727458e514faf990d439a21461b719edaddf9296d3d0647b43ca56cb8dbf63b4fcf8b9968e7928c463470fab3b98e44d0d95645062f94b2d04fe56bd52822b71934db8ce845622c40b92fcbe765a142e7f38b61a6aa9606c8e8858dcd3b6eb1894acec04d0451d1f06b01080088bea67444e1789390e7c0335c86775502d58ec783d99c8ef4e06de235ed3dd4b0467f6f358d818c7d8989d43ec6d69fcbc8c32632d5a1b605e3fa8e41d695fcdcaa535936cd0157f9040dce362519803b908eafe838bb13216c885c6f93e9e8d5745607f0d062322085d6bdc760969149a8ff8dd9f5c18d9bfe2e6f63a06e17694cf1f67587c6fb70e9aebf90ffc528ca3b615ac7c9d4a21ea4f7c06f2e98fbbd90a859b8608bf9ea638e3a54289ce44c283110d0c45fa458de6251cd6e7baf71f80f12c8978340490fd90c92b81736ae902ed958e478dceae2835953d189c45d182aff02ea2be61b81d8e94430f041d638647b43e2fcb45fd512fbf5068b810011010001c2c06504180108000f050251d1f06b050900081095021b0c000a0910e7b484133a890a35e63407fe2ec88d6d1e6c9ce7553ece0cb2524747217bad29f251d33df84599ffcc900141a355abd62126800744068a5e05dc167056aa9205273dc7765a2ed49db15c2a83b8d6e6429c902136f1e12229086c1c10c0053242c2a4ae1930db58163387a48cad64607ff2153c320e42843dec28e3fce90e7399d63ac0affa2fee1f0adc0953c89eb3f46ef1d6c04328ed13b491669d5120a3782e3ffb7c69575fb77eebd108794f4dda9d34be2bae57e8e59ec8ebfda2f6f06104b2321be408ea146e2db482b00c5055c8618de36ac9716f80da2617e225556d0fce61b01c8cea2d1e0ea982c31711060ca370f2739366e1e708f38405d784b49d16a26cf62d152eae734327cec04d0451d1f07b010800d5af91c5e7c2fd8951c8d254eab0c97cdcb66822f868b79b78c366255059a68fd74ebca9adb9b970cd9e586690e6e0756705432306878c897b10a4b4ca0005966f99ac8fa4e6f9caf54bf8e53844544beee9872a7ac64c119cf1393d96e674254b661f61ee975633d0e8a8672531edb6bb8e211204e7754a9efa802342118eee850beea742bac95a3f706cc2024cf6037a308bb68162b2f53b9a6346a96e6d31871a2456186e24a1c7a82b82ac04afdfd57cd7fb9ba77a9c760d40b76a170f7be525e5fb6a9848cc726e806187710d9b190387df28700f321f988a392899f93815cc937f309129eb94d5299c5547cb2c085898e6639496e70d746c9d3fb9881d0011010001c2c06504180108000f050251d1f07b050900266305021b0c000a0910e7b484133a890a35bff207fd10dfe8c4a6ea1dd30568012b6fd6891a763c87ad0f7a1d112aad9e8e3239378a3b85588c235865bac2e614348cb4f216d7217f53b3ef48c192e0a4d31d64d7bfa5faccf21155965fa156e887056db644a05ad08a85cc6152d1377d9e37b46f4ff462bbe68ace2dc586ef90070314576c985d8037c2ba63f0a7dc17a62e15bd77e88bc61d9d00858979709f12304264a4cf4225c5cf86f12c8e19486cb9cdcc69f18f027e5f16f4ca8b50e28b3115eaff3a345acd21f624aef81f6ede515c1b55b26b84c1e32264754eab672d5489b287e7277ea855e0a5ff2aa9e8b8c76d579a964ec225255f4d57bf66639ccb34b64798846943e162a41096a7002ca21c7f56" -const subkeyUsageHex = "988d04533a52bc010400d26af43085558f65b9e7dbc90cb9238015259aed5e954637adcfa2181548b2d0b60c65f1f42ec5081cbf1bc0a8aa4900acfb77070837c58f26012fbce297d70afe96e759ad63531f0037538e70dbf8e384569b9720d99d8eb39d8d0a2947233ed242436cb6ac7dfe74123354b3d0119b5c235d3dd9c9d6c004f8ffaf67ad8583001101000188b7041f010200210502533b8552170c8001ce094aa433f7040bb2ddf0be3893cb843d0fe70c020700000a0910a42704b92866382aa98404009d63d916a27543da4221c60087c33f1c44bec9998c5438018ed370cca4962876c748e94b73eb39c58eb698063f3fd6346d58dd2a11c0247934c4a9d71f24754f7468f96fb24c3e791dd2392b62f626148ad724189498cbf993db2df7c0cdc2d677c35da0f16cb16c9ce7c33b4de65a4a91b1d21a130ae9cc26067718910ef8e2b417556d627261203c756d627261407379642e65642e61753e88b80413010200220502533a52bc021b03060b090807030206150802090a0b0416020301021e01021780000a0910a42704b92866382a47840400c0c2bd04f5fca586de408b395b3c280a278259c93eaaa8b79a53b97003f8ed502a8a00446dd9947fb462677e4fcac0dac2f0701847d15130aadb6cd9e0705ea0cf5f92f129136c7be21a718d46c8e641eb7f044f2adae573e11ae423a0a9ca51324f03a8a2f34b91fa40c3cc764bee4dccadedb54c768ba0469b683ea53f1c29b88d04533a52bc01040099c92a5d6f8b744224da27bc2369127c35269b58bec179de6bbc038f749344222f85a31933224f26b70243c4e4b2d242f0c4777eaef7b5502f9dad6d8bf3aaeb471210674b74de2d7078af497d55f5cdad97c7bedfbc1b41e8065a97c9c3d344b21fc81d27723af8e374bc595da26ea242dccb6ae497be26eea57e563ed517e90011010001889f0418010200090502533a52bc021b0c000a0910a42704b92866382afa1403ff70284c2de8a043ff51d8d29772602fa98009b7861c540535f874f2c230af8caf5638151a636b21f8255003997ccd29747fdd06777bb24f9593bd7d98a3e887689bf902f999915fcc94625ae487e5d13e6616f89090ebc4fdc7eb5cad8943e4056995bb61c6af37f8043016876a958ec7ebf39c43d20d53b7f546cfa83e8d2604b88d04533b8283010400c0b529316dbdf58b4c54461e7e669dc11c09eb7f73819f178ccd4177b9182b91d138605fcf1e463262fabefa73f94a52b5e15d1904635541c7ea540f07050ce0fb51b73e6f88644cec86e91107c957a114f69554548a85295d2b70bd0b203992f76eb5d493d86d9eabcaa7ef3fc7db7e458438db3fcdb0ca1cc97c638439a9170011010001889f0418010200090502533b8283021b0c000a0910a42704b92866382adc6d0400cfff6258485a21675adb7a811c3e19ebca18851533f75a7ba317950b9997fda8d1a4c8c76505c08c04b6c2cc31dc704d33da36a21273f2b388a1a706f7c3378b66d887197a525936ed9a69acb57fe7f718133da85ec742001c5d1864e9c6c8ea1b94f1c3759cebfd93b18606066c063a63be86085b7e37bdbc65f9a915bf084bb901a204533b85cd110400aed3d2c52af2b38b5b67904b0ef73d6dd7aef86adb770e2b153cd22489654dcc91730892087bb9856ae2d9f7ed1eb48f214243fe86bfe87b349ebd7c30e630e49c07b21fdabf78b7a95c8b7f969e97e3d33f2e074c63552ba64a2ded7badc05ce0ea2be6d53485f6900c7860c7aa76560376ce963d7271b9b54638a4028b573f00a0d8854bfcdb04986141568046202192263b9b67350400aaa1049dbc7943141ef590a70dcb028d730371d92ea4863de715f7f0f16d168bd3dc266c2450457d46dcbbf0b071547e5fbee7700a820c3750b236335d8d5848adb3c0da010e998908dfd93d961480084f3aea20b247034f8988eccb5546efaa35a92d0451df3aaf1aee5aa36a4c4d462c760ecd9cebcabfbe1412b1f21450f203fd126687cd486496e971a87fd9e1a8a765fe654baa219a6871ab97768596ab05c26c1aeea8f1a2c72395a58dbc12ef9640d2b95784e974a4d2d5a9b17c25fedacfe551bda52602de8f6d2e48443f5dd1a2a2a8e6a5e70ecdb88cd6e766ad9745c7ee91d78cc55c3d06536b49c3fee6c3d0b6ff0fb2bf13a314f57c953b8f4d93bf88e70418010200090502533b85cd021b0200520910a42704b92866382a47200419110200060502533b85cd000a091042ce2c64bc0ba99214b2009e26b26852c8b13b10c35768e40e78fbbb48bd084100a0c79d9ea0844fa5853dd3c85ff3ecae6f2c9dd6c557aa04008bbbc964cd65b9b8299d4ebf31f41cc7264b8cf33a00e82c5af022331fac79efc9563a822497ba012953cefe2629f1242fcdcb911dbb2315985bab060bfd58261ace3c654bdbbe2e8ed27a46e836490145c86dc7bae15c011f7e1ffc33730109b9338cd9f483e7cef3d2f396aab5bd80efb6646d7e778270ee99d934d187dd98" -const revokedKeyHex = "988d045331ce82010400c4fdf7b40a5477f206e6ee278eaef888ca73bf9128a9eef9f2f1ddb8b7b71a4c07cfa241f028a04edb405e4d916c61d6beabc333813dc7b484d2b3c52ee233c6a79b1eea4e9cc51596ba9cd5ac5aeb9df62d86ea051055b79d03f8a4fa9f38386f5bd17529138f3325d46801514ea9047977e0829ed728e68636802796801be10011010001889f04200102000905025331d0e3021d03000a0910a401d9f09a34f7c042aa040086631196405b7e6af71026b88e98012eab44aa9849f6ef3fa930c7c9f23deaedba9db1538830f8652fb7648ec3fcade8dbcbf9eaf428e83c6cbcc272201bfe2fbb90d41963397a7c0637a1a9d9448ce695d9790db2dc95433ad7be19eb3de72dacf1d6db82c3644c13eae2a3d072b99bb341debba012c5ce4006a7d34a1f4b94b444526567205265766f6b657220283c52656727732022424d204261726973746122204b657920262530305c303e5c29203c72656740626d626172697374612e636f2e61753e88b704130102002205025331ce82021b03060b090807030206150802090a0b0416020301021e01021780000a0910a401d9f09a34f7c0019c03f75edfbeb6a73e7225ad3cc52724e2872e04260d7daf0d693c170d8c4b243b8767bc7785763533febc62ec2600c30603c433c095453ede59ff2fcabeb84ce32e0ed9d5cf15ffcbc816202b64370d4d77c1e9077d74e94a16fb4fa2e5bec23a56d7a73cf275f91691ae1801a976fcde09e981a2f6327ac27ea1fecf3185df0d56889c04100102000605025331cfb5000a0910fe9645554e8266b64b4303fc084075396674fb6f778d302ac07cef6bc0b5d07b66b2004c44aef711cbac79617ef06d836b4957522d8772dd94bf41a2f4ac8b1ee6d70c57503f837445a74765a076d07b829b8111fc2a918423ddb817ead7ca2a613ef0bfb9c6b3562aec6c3cf3c75ef3031d81d95f6563e4cdcc9960bcb386c5d757b104fcca5fe11fc709df884604101102000605025331cfe7000a09107b15a67f0b3ddc0317f6009e360beea58f29c1d963a22b962b80788c3fa6c84e009d148cfde6b351469b8eae91187eff07ad9d08fcaab88d045331ce820104009f25e20a42b904f3fa555530fe5c46737cf7bd076c35a2a0d22b11f7e0b61a69320b768f4a80fe13980ce380d1cfc4a0cd8fbe2d2e2ef85416668b77208baa65bf973fe8e500e78cc310d7c8705cdb34328bf80e24f0385fce5845c33bc7943cf6b11b02348a23da0bf6428e57c05135f2dc6bd7c1ce325d666d5a5fd2fd5e410011010001889f04180102000905025331ce82021b0c000a0910a401d9f09a34f7c0418003fe34feafcbeaef348a800a0d908a7a6809cc7304017d820f70f0474d5e23cb17e38b67dc6dca282c6ca00961f4ec9edf2738d0f087b1d81e4871ef08e1798010863afb4eac4c44a376cb343be929c5be66a78cfd4456ae9ec6a99d97f4e1c3ff3583351db2147a65c0acef5c003fb544ab3a2e2dc4d43646f58b811a6c3a369d1f" -const revokedSubkeyHex = "988d04533121f6010400aefc803a3e4bb1a61c86e8a86d2726c6a43e0079e9f2713f1fa017e9854c83877f4aced8e331d675c67ea83ddab80aacbfa0b9040bb12d96f5a3d6be09455e2a76546cbd21677537db941cab710216b6d24ec277ee0bd65b910f416737ed120f6b93a9d3b306245c8cfd8394606fdb462e5cf43c551438d2864506c63367fc890011010001b41d416c696365203c616c69636540626d626172697374612e636f2e61753e88bb041301020025021b03060b090807030206150802090a0b0416020301021e01021780050253312798021901000a09104ef7e4beccde97f015a803ff5448437780f63263b0df8442a995e7f76c221351a51edd06f2063d8166cf3157aada4923dfc44aa0f2a6a4da5cf83b7fe722ba8ab416c976e77c6b5682e7f1069026673bd0de56ba06fd5d7a9f177607f277d9b55ff940a638c3e68525c67517e2b3d976899b93ca267f705b3e5efad7d61220e96b618a4497eab8d04403d23f8846041011020006050253312910000a09107b15a67f0b3ddc03d96e009f50b6365d86c4be5d5e9d0ea42d5e56f5794c617700a0ab274e19c2827780016d23417ce89e0a2c0d987d889c04100102000605025331cf7a000a0910a401d9f09a34f7c0ee970400aca292f213041c9f3b3fc49148cbda9d84afee6183c8dd6c5ff2600b29482db5fecd4303797be1ee6d544a20a858080fec43412061c9a71fae4039fd58013b4ae341273e6c66ad4c7cdd9e68245bedb260562e7b166f2461a1032f2b38c0e0e5715fb3d1656979e052b55ca827a76f872b78a9fdae64bc298170bfcebedc1271b41a416c696365203c616c696365407379646973702e6f722e61753e88b804130102002205025331278b021b03060b090807030206150802090a0b0416020301021e01021780000a09104ef7e4beccde97f06a7003fa03c3af68d272ebc1fa08aa72a03b02189c26496a2833d90450801c4e42c5b5f51ad96ce2d2c9cef4b7c02a6a2fcf1412d6a2d486098eb762f5010a201819c17fd2888aec8eda20c65a3b75744de7ee5cc8ac7bfc470cbe3cb982720405a27a3c6a8c229cfe36905f881b02ed5680f6a8f05866efb9d6c5844897e631deb949ca8846041011020006050253312910000a09107b15a67f0b3ddc0347bc009f7fa35db59147469eb6f2c5aaf6428accb138b22800a0caa2f5f0874bacc5909c652a57a31beda65eddd5889c04100102000605025331cf7a000a0910a401d9f09a34f7c0316403ff46f2a5c101256627f16384d34a38fb47a6c88ba60506843e532d91614339fccae5f884a5741e7582ffaf292ba38ee10a270a05f139bde3814b6a077e8cd2db0f105ebea2a83af70d385f13b507fac2ad93ff79d84950328bb86f3074745a8b7f9b64990fb142e2a12976e27e8d09a28dc5621f957ac49091116da410ac3cbde1b88d04533121f6010400cbd785b56905e4192e2fb62a720727d43c4fa487821203cf72138b884b78b701093243e1d8c92a0248a6c0203a5a88693da34af357499abacaf4b3309c640797d03093870a323b4b6f37865f6eaa2838148a67df4735d43a90ca87942554cdf1c4a751b1e75f9fd4ce4e97e278d6c1c7ed59d33441df7d084f3f02beb68896c70011010001889f0418010200090502533121f6021b0c000a09104ef7e4beccde97f0b98b03fc0a5ccf6a372995835a2f5da33b282a7d612c0ab2a97f59cf9fff73e9110981aac2858c41399afa29624a7fd8a0add11654e3d882c0fd199e161bdad65e5e2548f7b68a437ea64293db1246e3011cbb94dc1bcdeaf0f2539bd88ff16d95547144d97cead6a8c5927660a91e6db0d16eb36b7b49a3525b54d1644e65599b032b7eb901a204533127a0110400bd3edaa09eff9809c4edc2c2a0ebe52e53c50a19c1e49ab78e6167bf61473bb08f2050d78a5cbbc6ed66aff7b42cd503f16b4a0b99fa1609681fca9b7ce2bbb1a5b3864d6cdda4d7ef7849d156d534dea30fb0efb9e4cf8959a2b2ce623905882d5430b995a15c3b9fe92906086788b891002924f94abe139b42cbbfaaabe42f00a0b65dc1a1ad27d798adbcb5b5ad02d2688c89477b03ff4eebb6f7b15a73b96a96bed201c0e5e4ea27e4c6e2dd1005b94d4b90137a5b1cf5e01c6226c070c4cc999938101578877ee76d296b9aab8246d57049caacf489e80a3f40589cade790a020b1ac146d6f7a6241184b8c7fcde680eae3188f5dcbe846d7f7bdad34f6fcfca08413e19c1d5df83fc7c7c627d493492e009c2f52a80400a2fe82de87136fd2e8845888c4431b032ba29d9a29a804277e31002a8201fb8591a3e55c7a0d0881496caf8b9fb07544a5a4879291d0dc026a0ea9e5bd88eb4aa4947bbd694b25012e208a250d65ddc6f1eea59d3aed3b4ec15fcab85e2afaa23a40ab1ef9ce3e11e1bc1c34a0e758e7aa64deb8739276df0af7d4121f834a9b88e70418010200090502533127a0021b02005209104ef7e4beccde97f047200419110200060502533127a0000a0910dbce4ee19529437fe045009c0b32f5ead48ee8a7e98fac0dea3d3e6c0e2c552500a0ad71fadc5007cfaf842d9b7db3335a8cdad15d3d1a6404009b08e2c68fe8f3b45c1bb72a4b3278cdf3012aa0f229883ad74aa1f6000bb90b18301b2f85372ca5d6b9bf478d235b733b1b197d19ccca48e9daf8e890cb64546b4ce1b178faccfff07003c172a2d4f5ebaba9f57153955f3f61a9b80a4f5cb959908f8b211b03b7026a8a82fc612bfedd3794969bcf458c4ce92be215a1176ab88d045331d144010400a5063000c5aaf34953c1aa3bfc95045b3aab9882b9a8027fecfe2142dc6b47ba8aca667399990244d513dd0504716908c17d92c65e74219e004f7b83fc125e575dd58efec3ab6dd22e3580106998523dea42ec75bf9aa111734c82df54630bebdff20fe981cfc36c76f865eb1c2fb62c9e85bc3a6e5015a361a2eb1c8431578d0011010001889f04280102000905025331d433021d03000a09104ef7e4beccde97f02e5503ff5e0630d1b65291f4882b6d40a29da4616bb5088717d469fbcc3648b8276de04a04988b1f1b9f3e18f52265c1f8b6c85861691c1a6b8a3a25a1809a0b32ad330aec5667cb4262f4450649184e8113849b05e5ad06a316ea80c001e8e71838190339a6e48bbde30647bcf245134b9a97fa875c1d83a9862cae87ffd7e2c4ce3a1b89013d04180102000905025331d144021b0200a809104ef7e4beccde97f09d2004190102000605025331d144000a0910677815e371c2fd23522203fe22ab62b8e7a151383cea3edd3a12995693911426f8ccf125e1f6426388c0010f88d9ca7da2224aee8d1c12135998640c5e1813d55a93df472faae75bef858457248db41b4505827590aeccf6f9eb646da7f980655dd3050c6897feddddaca90676dee856d66db8923477d251712bb9b3186b4d0114daf7d6b59272b53218dd1da94a03ff64006fcbe71211e5daecd9961fba66cdb6de3f914882c58ba5beddeba7dcb950c1156d7fba18c19ea880dccc800eae335deec34e3b84ac75ffa24864f782f87815cda1c0f634b3dd2fa67cea30811d21723d21d9551fa12ccbcfa62b6d3a15d01307b99925707992556d50065505b090aadb8579083a20fe65bd2a270da9b011" - -const missingCrossSignatureKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- -Charset: UTF-8 - -mQENBFMYynYBCACVOZ3/e8Bm2b9KH9QyIlHGo/i1bnkpqsgXj8tpJ2MIUOnXMMAY -ztW7kKFLCmgVdLIC0vSoLA4yhaLcMojznh/2CcUglZeb6Ao8Gtelr//Rd5DRfPpG -zqcfUo+m+eO1co2Orabw0tZDfGpg5p3AYl0hmxhUyYSc/xUq93xL1UJzBFgYXY54 -QsM8dgeQgFseSk/YvdP5SMx1ev+eraUyiiUtWzWrWC1TdyRa5p4UZg6Rkoppf+WJ -QrW6BWrhAtqATHc8ozV7uJjeONjUEq24roRc/OFZdmQQGK6yrzKnnbA6MdHhqpdo -9kWDcXYb7pSE63Lc+OBa5X2GUVvXJLS/3nrtABEBAAG0F2ludmFsaWQtc2lnbmlu -Zy1zdWJrZXlziQEoBBMBAgASBQJTnKB5AhsBAgsHAhUIAh4BAAoJEO3UDQUIHpI/ -dN4H/idX4FQ1LIZCnpHS/oxoWQWfpRgdKAEM0qCqjMgiipJeEwSQbqjTCynuh5/R -JlODDz85ABR06aoF4l5ebGLQWFCYifPnJZ/Yf5OYcMGtb7dIbqxWVFL9iLMO/oDL -ioI3dotjPui5e+2hI9pVH1UHB/bZ/GvMGo6Zg0XxLPolKQODMVjpjLAQ0YJ3spew -RAmOGre6tIvbDsMBnm8qREt7a07cBJ6XK7xjxYaZHQBiHVxyEWDa6gyANONx8duW -/fhQ/zDTnyVM/ik6VO0Ty9BhPpcEYLFwh5c1ilFari1ta3e6qKo6ZGa9YMk/REhu -yBHd9nTkI+0CiQUmbckUiVjDKKe5AQ0EUxjKdgEIAJcXQeP+NmuciE99YcJoffxv -2gVLU4ZXBNHEaP0mgaJ1+tmMD089vUQAcyGRvw8jfsNsVZQIOAuRxY94aHQhIRHR -bUzBN28ofo/AJJtfx62C15xt6fDKRV6HXYqAiygrHIpEoRLyiN69iScUsjIJeyFL -C8wa72e8pSL6dkHoaV1N9ZH/xmrJ+k0vsgkQaAh9CzYufncDxcwkoP+aOlGtX1gP -WwWoIbz0JwLEMPHBWvDDXQcQPQTYQyj+LGC9U6f9VZHN25E94subM1MjuT9OhN9Y -MLfWaaIc5WyhLFyQKW2Upofn9wSFi8ubyBnv640Dfd0rVmaWv7LNTZpoZ/GbJAMA -EQEAAYkBHwQYAQIACQUCU5ygeQIbAgAKCRDt1A0FCB6SP0zCB/sEzaVR38vpx+OQ -MMynCBJrakiqDmUZv9xtplY7zsHSQjpd6xGflbU2n+iX99Q+nav0ETQZifNUEd4N -1ljDGQejcTyKD6Pkg6wBL3x9/RJye7Zszazm4+toJXZ8xJ3800+BtaPoI39akYJm -+ijzbskvN0v/j5GOFJwQO0pPRAFtdHqRs9Kf4YanxhedB4dIUblzlIJuKsxFit6N -lgGRblagG3Vv2eBszbxzPbJjHCgVLR3RmrVezKOsZjr/2i7X+xLWIR0uD3IN1qOW -CXQxLBizEEmSNVNxsp7KPGTLnqO3bPtqFirxS9PJLIMPTPLNBY7ZYuPNTMqVIUWF -4artDmrG -=7FfJ ------END PGP PUBLIC KEY BLOCK-----` - -const invalidCrossSignatureKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFMYynYBCACVOZ3/e8Bm2b9KH9QyIlHGo/i1bnkpqsgXj8tpJ2MIUOnXMMAY -ztW7kKFLCmgVdLIC0vSoLA4yhaLcMojznh/2CcUglZeb6Ao8Gtelr//Rd5DRfPpG -zqcfUo+m+eO1co2Orabw0tZDfGpg5p3AYl0hmxhUyYSc/xUq93xL1UJzBFgYXY54 -QsM8dgeQgFseSk/YvdP5SMx1ev+eraUyiiUtWzWrWC1TdyRa5p4UZg6Rkoppf+WJ -QrW6BWrhAtqATHc8ozV7uJjeONjUEq24roRc/OFZdmQQGK6yrzKnnbA6MdHhqpdo -9kWDcXYb7pSE63Lc+OBa5X2GUVvXJLS/3nrtABEBAAG0F2ludmFsaWQtc2lnbmlu -Zy1zdWJrZXlziQEoBBMBAgASBQJTnKB5AhsBAgsHAhUIAh4BAAoJEO3UDQUIHpI/ -dN4H/idX4FQ1LIZCnpHS/oxoWQWfpRgdKAEM0qCqjMgiipJeEwSQbqjTCynuh5/R -JlODDz85ABR06aoF4l5ebGLQWFCYifPnJZ/Yf5OYcMGtb7dIbqxWVFL9iLMO/oDL -ioI3dotjPui5e+2hI9pVH1UHB/bZ/GvMGo6Zg0XxLPolKQODMVjpjLAQ0YJ3spew -RAmOGre6tIvbDsMBnm8qREt7a07cBJ6XK7xjxYaZHQBiHVxyEWDa6gyANONx8duW -/fhQ/zDTnyVM/ik6VO0Ty9BhPpcEYLFwh5c1ilFari1ta3e6qKo6ZGa9YMk/REhu -yBHd9nTkI+0CiQUmbckUiVjDKKe5AQ0EUxjKdgEIAIINDqlj7X6jYKc6DjwrOkjQ -UIRWbQQar0LwmNilehmt70g5DCL1SYm9q4LcgJJ2Nhxj0/5qqsYib50OSWMcKeEe -iRXpXzv1ObpcQtI5ithp0gR53YPXBib80t3bUzomQ5UyZqAAHzMp3BKC54/vUrSK -FeRaxDzNLrCeyI00+LHNUtwghAqHvdNcsIf8VRumK8oTm3RmDh0TyjASWYbrt9c8 -R1Um3zuoACOVy+mEIgIzsfHq0u7dwYwJB5+KeM7ZLx+HGIYdUYzHuUE1sLwVoELh -+SHIGHI1HDicOjzqgajShuIjj5hZTyQySVprrsLKiXS6NEwHAP20+XjayJ/R3tEA -EQEAAYkCPgQYAQIBKAUCU5ygeQIbAsBdIAQZAQIABgUCU5ygeQAKCRCpVlnFZmhO -52RJB/9uD1MSa0wjY6tHOIgquZcP3bHBvHmrHNMw9HR2wRCMO91ZkhrpdS3ZHtgb -u3/55etj0FdvDo1tb8P8FGSVtO5Vcwf5APM8sbbqoi8L951Q3i7qt847lfhu6sMl -w0LWFvPTOLHrliZHItPRjOltS1WAWfr2jUYhsU9ytaDAJmvf9DujxEOsN5G1YJep -54JCKVCkM/y585Zcnn+yxk/XwqoNQ0/iJUT9qRrZWvoeasxhl1PQcwihCwss44A+ -YXaAt3hbk+6LEQuZoYS73yR3WHj+42tfm7YxRGeubXfgCEz/brETEWXMh4pe0vCL -bfWrmfSPq2rDegYcAybxRQz0lF8PAAoJEO3UDQUIHpI/exkH/0vQfdHA8g/N4T6E -i6b1CUVBAkvtdJpCATZjWPhXmShOw62gkDw306vHPilL4SCvEEi4KzG72zkp6VsB -DSRcpxCwT4mHue+duiy53/aRMtSJ+vDfiV1Vhq+3sWAck/yUtfDU9/u4eFaiNok1 -8/Gd7reyuZt5CiJnpdPpjCwelK21l2w7sHAnJF55ITXdOxI8oG3BRKufz0z5lyDY -s2tXYmhhQIggdgelN8LbcMhWs/PBbtUr6uZlNJG2lW1yscD4aI529VjwJlCeo745 -U7pO4eF05VViUJ2mmfoivL3tkhoTUWhx8xs8xCUcCg8DoEoSIhxtOmoTPR22Z9BL -6LCg2mg= -=Dhm4 ------END PGP PUBLIC KEY BLOCK-----` - -const goodCrossSignatureKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mI0EVUqeVwEEAMufHRrMPWK3gyvi0O0tABCs/oON9zV9KDZlr1a1M91ShCSFwCPo -7r80PxdWVWcj0V5h50/CJYtpN3eE/mUIgW2z1uDYQF1OzrQ8ubrksfsJvpAhENom -lTQEppv9mV8qhcM278teb7TX0pgrUHLYF5CfPdp1L957JLLXoQR/lwLVABEBAAG0 -E2dvb2Qtc2lnbmluZy1zdWJrZXmIuAQTAQIAIgUCVUqeVwIbAwYLCQgHAwIGFQgC -CQoLBBYCAwECHgECF4AACgkQNRjL95IRWP69XQQAlH6+eyXJN4DZTLX78KGjHrsw -6FCvxxClEPtPUjcJy/1KCRQmtLAt9PbbA78dvgzjDeZMZqRAwdjyJhjyg/fkU2OH -7wq4ktjUu+dLcOBb+BFMEY+YjKZhf6EJuVfxoTVr5f82XNPbYHfTho9/OABKH6kv -X70PaKZhbwnwij8Nts65AaIEVUqftREEAJ3WxZfqAX0bTDbQPf2CMT2IVMGDfhK7 -GyubOZgDFFjwUJQvHNvsrbeGLZ0xOBumLINyPO1amIfTgJNm1iiWFWfmnHReGcDl -y5mpYG60Mb79Whdcer7CMm3AqYh/dW4g6IB02NwZMKoUHo3PXmFLxMKXnWyJ0clw -R0LI/Qn509yXAKDh1SO20rqrBM+EAP2c5bfI98kyNwQAi3buu94qo3RR1ZbvfxgW -CKXDVm6N99jdZGNK7FbRifXqzJJDLcXZKLnstnC4Sd3uyfyf1uFhmDLIQRryn5m+ -LBYHfDBPN3kdm7bsZDDq9GbTHiFZUfm/tChVKXWxkhpAmHhU/tH6GGzNSMXuIWSO -aOz3Rqq0ED4NXyNKjdF9MiwD/i83S0ZBc0LmJYt4Z10jtH2B6tYdqnAK29uQaadx -yZCX2scE09UIm32/w7pV77CKr1Cp/4OzAXS1tmFzQ+bX7DR+Gl8t4wxr57VeEMvl -BGw4Vjh3X8//m3xynxycQU18Q1zJ6PkiMyPw2owZ/nss3hpSRKFJsxMLhW3fKmKr -Ey2KiOcEGAECAAkFAlVKn7UCGwIAUgkQNRjL95IRWP5HIAQZEQIABgUCVUqftQAK -CRD98VjDN10SqkWrAKDTpEY8D8HC02E/KVC5YUI01B30wgCgurpILm20kXEDCeHp -C5pygfXw1DJrhAP+NyPJ4um/bU1I+rXaHHJYroYJs8YSweiNcwiHDQn0Engh/mVZ -SqLHvbKh2dL/RXymC3+rjPvQf5cup9bPxNMa6WagdYBNAfzWGtkVISeaQW+cTEp/ -MtgVijRGXR/lGLGETPg2X3Afwn9N9bLMBkBprKgbBqU7lpaoPupxT61bL70= -=vtbN ------END PGP PUBLIC KEY BLOCK-----` - -const revokedUserIDKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFsgO5EBCADhREPmcjsPkXe1z7ctvyWL0S7oa9JaoGZ9oPDHFDlQxd0qlX2e -DZJZDg0qYvVixmaULIulApq1puEsaJCn3lHUbHlb4PYKwLEywYXM28JN91KtLsz/ -uaEX2KC5WqeP40utmzkNLq+oRX/xnRMgwbO7yUNVG2UlEa6eI+xOXO3YtLdmJMBW -ClQ066ZnOIzEo1JxnIwha1CDBMWLLfOLrg6l8InUqaXbtEBbnaIYO6fXVXELUjkx -nmk7t/QOk0tXCy8muH9UDqJkwDUESY2l79XwBAcx9riX8vY7vwC34pm22fAUVLCJ -x1SJx0J8bkeNp38jKM2Zd9SUQqSbfBopQ4pPABEBAAG0I0dvbGFuZyBHb3BoZXIg -PG5vLXJlcGx5QGdvbGFuZy5jb20+iQFUBBMBCgA+FiEE5Ik5JLcNx6l6rZfw1oFy -9I6cUoMFAlsgO5ECGwMFCQPCZwAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQ -1oFy9I6cUoMIkwf8DNPeD23i4jRwd/pylbvxwZintZl1fSwTJW1xcOa1emXaEtX2 -depuqhP04fjlRQGfsYAQh7X9jOJxAHjTmhqFBi5sD7QvKU00cPFYbJ/JTx0B41bl -aXnSbGhRPh63QtEZL7ACAs+shwvvojJqysx7kyVRu0EW2wqjXdHwR/SJO6nhNBa2 -DXzSiOU/SUA42mmG+5kjF8Aabq9wPwT9wjraHShEweNerNMmOqJExBOy3yFeyDpa -XwEZFzBfOKoxFNkIaVf5GSdIUGhFECkGvBMB935khftmgR8APxdU4BE7XrXexFJU -8RCuPXonm4WQOwTWR0vQg64pb2WKAzZ8HhwTGbQiR29sYW5nIEdvcGhlciA8cmV2 -b2tlZEBnb2xhbmcuY29tPokBNgQwAQoAIBYhBOSJOSS3Dcepeq2X8NaBcvSOnFKD -BQJbIDv3Ah0AAAoJENaBcvSOnFKDfWMIAKhI/Tvu3h8fSUxp/gSAcduT6bC1JttG -0lYQ5ilKB/58lBUA5CO3ZrKDKlzW3M8VEcvohVaqeTMKeoQd5rCZq8KxHn/KvN6N -s85REfXfniCKfAbnGgVXX3kDmZ1g63pkxrFu0fDZjVDXC6vy+I0sGyI/Inro0Pzb -tvn0QCsxjapKK15BtmSrpgHgzVqVg0cUp8vqZeKFxarYbYB2idtGRci4b9tObOK0 -BSTVFy26+I/mrFGaPrySYiy2Kz5NMEcRhjmTxJ8jSwEr2O2sUR0yjbgUAXbTxDVE -/jg5fQZ1ACvBRQnB7LvMHcInbzjyeTM3FazkkSYQD6b97+dkWwb1iWG5AQ0EWyA7 -kQEIALkg04REDZo1JgdYV4x8HJKFS4xAYWbIva1ZPqvDNmZRUbQZR2+gpJGEwn7z -VofGvnOYiGW56AS5j31SFf5kro1+1bZQ5iOONBng08OOo58/l1hRseIIVGB5TGSa -PCdChKKHreJI6hS3mShxH6hdfFtiZuB45rwoaArMMsYcjaezLwKeLc396cpUwwcZ -snLUNd1Xu5EWEF2OdFkZ2a1qYdxBvAYdQf4+1Nr+NRIx1u1NS9c8jp3PuMOkrQEi -bNtc1v6v0Jy52mKLG4y7mC/erIkvkQBYJdxPaP7LZVaPYc3/xskcyijrJ/5ufoD8 -K71/ShtsZUXSQn9jlRaYR0EbojMAEQEAAYkBPAQYAQoAJhYhBOSJOSS3Dcepeq2X -8NaBcvSOnFKDBQJbIDuRAhsMBQkDwmcAAAoJENaBcvSOnFKDkFMIAIt64bVZ8x7+ -TitH1bR4pgcNkaKmgKoZz6FXu80+SnbuEt2NnDyf1cLOSimSTILpwLIuv9Uft5Pb -OraQbYt3xi9yrqdKqGLv80bxqK0NuryNkvh9yyx5WoG1iKqMj9/FjGghuPrRaT4l -QinNAghGVkEy1+aXGFrG2DsOC1FFI51CC2WVTzZ5RwR2GpiNRfESsU1rZAUqf/2V -yJl9bD5R4SUNy8oQmhOxi+gbhD4Ao34e4W0ilibslI/uawvCiOwlu5NGd8zv5n+U -heiQvzkApQup5c+BhH5zFDFdKJ2CBByxw9+7QjMFI/wgLixKuE0Ob2kAokXf7RlB -7qTZOahrETw= -=IKnw ------END PGP PUBLIC KEY BLOCK-----` - -const keyWithFirstUserIDRevoked = `-----BEGIN PGP PUBLIC KEY BLOCK----- -Version: OpenPGP.js v4.10.10 -Comment: https://openpgpjs.org - -xsBNBFsgO5EBCADhREPmcjsPkXe1z7ctvyWL0S7oa9JaoGZ9oPDHFDlQxd0q -lX2eDZJZDg0qYvVixmaULIulApq1puEsaJCn3lHUbHlb4PYKwLEywYXM28JN -91KtLsz/uaEX2KC5WqeP40utmzkNLq+oRX/xnRMgwbO7yUNVG2UlEa6eI+xO -XO3YtLdmJMBWClQ066ZnOIzEo1JxnIwha1CDBMWLLfOLrg6l8InUqaXbtEBb -naIYO6fXVXELUjkxnmk7t/QOk0tXCy8muH9UDqJkwDUESY2l79XwBAcx9riX -8vY7vwC34pm22fAUVLCJx1SJx0J8bkeNp38jKM2Zd9SUQqSbfBopQ4pPABEB -AAHNIkdvbGFuZyBHb3BoZXIgPHJldm9rZWRAZ29sYW5nLmNvbT7CwI0EMAEK -ACAWIQTkiTkktw3HqXqtl/DWgXL0jpxSgwUCWyA79wIdAAAhCRDWgXL0jpxS -gxYhBOSJOSS3Dcepeq2X8NaBcvSOnFKDfWMIAKhI/Tvu3h8fSUxp/gSAcduT -6bC1JttG0lYQ5ilKB/58lBUA5CO3ZrKDKlzW3M8VEcvohVaqeTMKeoQd5rCZ -q8KxHn/KvN6Ns85REfXfniCKfAbnGgVXX3kDmZ1g63pkxrFu0fDZjVDXC6vy -+I0sGyI/Inro0Pzbtvn0QCsxjapKK15BtmSrpgHgzVqVg0cUp8vqZeKFxarY -bYB2idtGRci4b9tObOK0BSTVFy26+I/mrFGaPrySYiy2Kz5NMEcRhjmTxJ8j -SwEr2O2sUR0yjbgUAXbTxDVE/jg5fQZ1ACvBRQnB7LvMHcInbzjyeTM3Fazk -kSYQD6b97+dkWwb1iWHNI0dvbGFuZyBHb3BoZXIgPG5vLXJlcGx5QGdvbGFu -Zy5jb20+wsCrBBMBCgA+FiEE5Ik5JLcNx6l6rZfw1oFy9I6cUoMFAlsgO5EC -GwMFCQPCZwAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AAIQkQ1oFy9I6cUoMW -IQTkiTkktw3HqXqtl/DWgXL0jpxSgwiTB/wM094PbeLiNHB3+nKVu/HBmKe1 -mXV9LBMlbXFw5rV6ZdoS1fZ16m6qE/Th+OVFAZ+xgBCHtf2M4nEAeNOaGoUG -LmwPtC8pTTRw8Vhsn8lPHQHjVuVpedJsaFE+HrdC0RkvsAICz6yHC++iMmrK -zHuTJVG7QRbbCqNd0fBH9Ik7qeE0FrYNfNKI5T9JQDjaaYb7mSMXwBpur3A/ -BP3COtodKETB416s0yY6okTEE7LfIV7IOlpfARkXMF84qjEU2QhpV/kZJ0hQ -aEUQKQa8EwH3fmSF+2aBHwA/F1TgETtetd7EUlTxEK49eiebhZA7BNZHS9CD -rilvZYoDNnweHBMZzsBNBFsgO5EBCAC5INOERA2aNSYHWFeMfByShUuMQGFm -yL2tWT6rwzZmUVG0GUdvoKSRhMJ+81aHxr5zmIhluegEuY99UhX+ZK6NftW2 -UOYjjjQZ4NPDjqOfP5dYUbHiCFRgeUxkmjwnQoSih63iSOoUt5kocR+oXXxb -YmbgeOa8KGgKzDLGHI2nsy8Cni3N/enKVMMHGbJy1DXdV7uRFhBdjnRZGdmt -amHcQbwGHUH+PtTa/jUSMdbtTUvXPI6dz7jDpK0BImzbXNb+r9CcudpiixuM -u5gv3qyJL5EAWCXcT2j+y2VWj2HN/8bJHMoo6yf+bn6A/Cu9f0obbGVF0kJ/ -Y5UWmEdBG6IzABEBAAHCwJMEGAEKACYWIQTkiTkktw3HqXqtl/DWgXL0jpxS -gwUCWyA7kQIbDAUJA8JnAAAhCRDWgXL0jpxSgxYhBOSJOSS3Dcepeq2X8NaB -cvSOnFKDkFMIAIt64bVZ8x7+TitH1bR4pgcNkaKmgKoZz6FXu80+SnbuEt2N -nDyf1cLOSimSTILpwLIuv9Uft5PbOraQbYt3xi9yrqdKqGLv80bxqK0NuryN -kvh9yyx5WoG1iKqMj9/FjGghuPrRaT4lQinNAghGVkEy1+aXGFrG2DsOC1FF -I51CC2WVTzZ5RwR2GpiNRfESsU1rZAUqf/2VyJl9bD5R4SUNy8oQmhOxi+gb -hD4Ao34e4W0ilibslI/uawvCiOwlu5NGd8zv5n+UheiQvzkApQup5c+BhH5z -FDFdKJ2CBByxw9+7QjMFI/wgLixKuE0Ob2kAokXf7RlB7qTZOahrETw= -=+2T8 ------END PGP PUBLIC KEY BLOCK----- -` - -const keyWithOnlyUserIDRevoked = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEYYwB7RYJKwYBBAHaRw8BAQdARimqhPPzyGAXmfQJjcqM1QVPzLtURJSzNVll -JV4tEaW0KVJldm9rZWQgUHJpbWFyeSBVc2VyIElEIDxyZXZva2VkQGtleS5jb20+ -iHgEMBYIACAWIQSpyJZAXYqVEFkjyKutFcS0yeB0LQUCYYwCtgIdAAAKCRCtFcS0 -yeB0LbSsAQD8OYMaaBjrdzzpwIkP1stgmPd4/kzN/ZG28Ywl6a5F5QEA5Xg7aq4e -/t6Fsb4F5iqB956kSPe6YJrikobD/tBbMwSIkAQTFggAOBYhBKnIlkBdipUQWSPI -q60VxLTJ4HQtBQJhjAHtAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEK0V -xLTJ4HQtBaoBAPZL7luTCji+Tqhn7XNfFE/0QIahCt8k9wfO1cGlB3inAQDf8Tzw -ZGR5fNluUcNoVxQT7bUSFStbaGo3k0BaOYPbCLg4BGGMAe0SCisGAQQBl1UBBQEB -B0DLwSpveSrbIO/IVZD13yrs1XuB3FURZUnafGrRq7+jUAMBCAeIeAQYFggAIBYh -BKnIlkBdipUQWSPIq60VxLTJ4HQtBQJhjAHtAhsMAAoJEK0VxLTJ4HQtZ1oA/j9u -8+p3xTNzsmabTL6BkNbMeB/RUKCrlm6woM6AV+vxAQCcXTn3JC2sNoNrLoXuVzaA -mcG3/TwG5GSQUUPkrDsGDA== -=mFWy ------END PGP PUBLIC KEY BLOCK----- -` - -const keyWithSubKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -mI0EWyKwKQEEALwXhKBnyaaNFeK3ljfc/qn9X/QFw+28EUfgZPHjRmHubuXLE2uR -s3ZoSXY2z7Dkv+NyHYMt8p+X8q5fR7JvUjK2XbPyKoiJVnHINll83yl67DaWfKNL -EjNoO0kIfbXfCkZ7EG6DL+iKtuxniGTcnGT47e+HJSqb/STpLMnWwXjBABEBAAG0 -I0dvbGFuZyBHb3BoZXIgPG5vLXJlcGx5QGdvbGFuZy5jb20+iM4EEwEKADgWIQQ/ -lRafP/p9PytHbwxMvYJsOQdOOAUCWyKwKQIbAwULCQgHAwUVCgkICwUWAgMBAAIe -AQIXgAAKCRBMvYJsOQdOOOsFBAC62mXww8XuqvYLcVOvHkWLT6mhxrQOJXnlfpn7 -2uBV9CMhoG/Ycd43NONsJrB95Apr9TDIqWnVszNbqPCuBhZQSGLdbiDKjxnCWBk0 -69qv4RNtkpOhYB7jK4s8F5oQZqId6JasT/PmJTH92mhBYhhTQr0GYFuPX2UJdkw9 -Sn9C67iNBFsisDUBBAC3A+Yo9lgCnxi/pfskyLrweYif6kIXWLAtLTsM6g/6jt7b -wTrknuCPyTv0QKGXsAEe/cK/Xq3HvX9WfXPGIHc/X56ZIsHQ+RLowbZV/Lhok1IW -FAuQm8axr/by80cRwFnzhfPc/ukkAq2Qyj4hLsGblu6mxeAhzcp8aqmWOO2H9QAR -AQABiLYEKAEKACAWIQQ/lRafP/p9PytHbwxMvYJsOQdOOAUCWyK16gIdAAAKCRBM -vYJsOQdOOB1vA/4u4uLONsE+2GVOyBsHyy7uTdkuxaR9b54A/cz6jT/tzUbeIzgx -22neWhgvIEghnUZd0vEyK9k1wy5vbDlEo6nKzHso32N1QExGr5upRERAxweDxGOj -7luDwNypI7QcifE64lS/JmlnunwRCdRWMKc0Fp+7jtRc5mpwyHN/Suf5RokBagQY -AQoAIBYhBD+VFp8/+n0/K0dvDEy9gmw5B044BQJbIrA1AhsCAL8JEEy9gmw5B044 -tCAEGQEKAB0WIQSNdnkaWY6t62iX336UXbGvYdhXJwUCWyKwNQAKCRCUXbGvYdhX -JxJSA/9fCPHP6sUtGF1o3G1a3yvOUDGr1JWcct9U+QpbCt1mZoNopCNDDQAJvDWl -mvDgHfuogmgNJRjOMznvahbF+wpTXmB7LS0SK412gJzl1fFIpK4bgnhu0TwxNsO1 -8UkCZWqxRMgcNUn9z6XWONK8dgt5JNvHSHrwF4CxxwjL23AAtK+FA/UUoi3U4kbC -0XnSr1Sl+mrzQi1+H7xyMe7zjqe+gGANtskqexHzwWPUJCPZ5qpIa2l8ghiUim6b -4ymJ+N8/T8Yva1FaPEqfMzzqJr8McYFm0URioXJPvOAlRxdHPteZ0qUopt/Jawxl -Xt6B9h1YpeLoJwjwsvbi98UTRs0jXwoY -=3fWu ------END PGP PUBLIC KEY BLOCK-----` - -const keyWithSubKeyAndBadSelfSigOrder = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -mI0EWyLLDQEEAOqIOpJ/ha1OYAGduu9tS3rBz5vyjbNgJO4sFveEM0mgsHQ0X9/L -plonW+d0gRoO1dhJ8QICjDAc6+cna1DE3tEb5m6JtQ30teLZuqrR398Cf6w7NNVz -r3lrlmnH9JaKRuXl7tZciwyovneBfZVCdtsRZjaLI1uMQCz/BToiYe3DABEBAAG0 -I0dvbGFuZyBHb3BoZXIgPG5vLXJlcGx5QGdvbGFuZy5jb20+iM4EEwEKADgWIQRZ -sixZOfQcZdW0wUqmgmdsv1O9xgUCWyLLDQIbAwULCQgHAwUVCgkICwUWAgMBAAIe -AQIXgAAKCRCmgmdsv1O9xql2A/4pix98NxjhdsXtazA9agpAKeADf9tG4Za27Gj+ -3DCww/E4iP2X35jZimSm/30QRB6j08uGCqd9vXkkJxtOt63y/IpVOtWX6vMWSTUm -k8xKkaYMP0/IzKNJ1qC/qYEUYpwERBKg9Z+k99E2Ql4kRHdxXUHq6OzY79H18Y+s -GdeM/riNBFsiyxsBBAC54Pxg/8ZWaZX1phGdwfe5mek27SOYpC0AxIDCSOdMeQ6G -HPk38pywl1d+S+KmF/F4Tdi+kWro62O4eG2uc/T8JQuRDUhSjX0Qa51gPzJrUOVT -CFyUkiZ/3ZDhtXkgfuso8ua2ChBgR9Ngr4v43tSqa9y6AK7v0qjxD1x+xMrjXQAR -AQABiQFxBBgBCgAmAhsCFiEEWbIsWTn0HGXVtMFKpoJnbL9TvcYFAlsizTIFCQAN -MRcAv7QgBBkBCgAdFiEEJcoVUVJIk5RWj1c/o62jUpRPICQFAlsiyxsACgkQo62j -UpRPICQq5gQApoWIigZxXFoM0uw4uJBS5JFZtirTANvirZV5RhndwHeMN6JttaBS -YnjyA4+n1D+zB2VqliD2QrsX12KJN6rGOehCtEIClQ1Hodo9nC6kMzzAwW1O8bZs -nRJmXV+bsvD4sidLZLjdwOVa3Cxh6pvq4Uur6a7/UYx121hEY0Qx0s8JEKaCZ2y/ -U73GGi0D/i20VW8AWYAPACm2zMlzExKTOAV01YTQH/3vW0WLrOse53WcIVZga6es -HuO4So0SOEAvxKMe5HpRIu2dJxTvd99Bo9xk9xJU0AoFrO0vNCRnL+5y68xMlODK -lEw5/kl0jeaTBp6xX0HDQOEVOpPGUwWV4Ij2EnvfNDXaE1vK1kffiQFrBBgBCgAg -AhsCFiEEWbIsWTn0HGXVtMFKpoJnbL9TvcYFAlsi0AYAv7QgBBkBCgAdFiEEJcoV -UVJIk5RWj1c/o62jUpRPICQFAlsiyxsACgkQo62jUpRPICQq5gQApoWIigZxXFoM -0uw4uJBS5JFZtirTANvirZV5RhndwHeMN6JttaBSYnjyA4+n1D+zB2VqliD2QrsX -12KJN6rGOehCtEIClQ1Hodo9nC6kMzzAwW1O8bZsnRJmXV+bsvD4sidLZLjdwOVa -3Cxh6pvq4Uur6a7/UYx121hEY0Qx0s8JEKaCZ2y/U73GRl0EAJokkXmy4zKDHWWi -wvK9gi2gQgRkVnu2AiONxJb5vjeLhM/07BRmH6K1o+w3fOeEQp4FjXj1eQ5fPSM6 -Hhwx2CTl9SDnPSBMiKXsEFRkmwQ2AAsQZLmQZvKBkLZYeBiwf+IY621eYDhZfo+G -1dh1WoUCyREZsJQg2YoIpWIcvw+a -=bNRo ------END PGP PUBLIC KEY BLOCK----- -` - -const onlySubkeyNoPrivateKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- -Version: GnuPG v1 - -lQCVBFggvocBBAC7vBsHn7MKmS6IiiZNTXdciplVgS9cqVd+RTdIAoyNTcsiV1H0 -GQ3QtodOPeDlQDNoqinqaobd7R9g3m3hS53Nor7yBZkCWQ5x9v9JxRtoAq0sklh1 -I1X2zEqZk2l6YrfBF/64zWrhjnW3j23szkrAIVu0faQXbQ4z56tmZrw11wARAQAB -/gdlAkdOVQG0CUdOVSBEdW1teYi4BBMBAgAiBQJYIL6HAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRCd1xxWp1CYAnjGA/9synn6ZXJUKAXQzySgmCZvCIbl -rqBfEpxwLG4Q/lONhm5vthAE0z49I8hj5Gc5e2tLYUtq0o0OCRdCrYHa/efOYWpJ -6RsK99bePOisVzmOABLIgZkcr022kHoMCmkPgv9CUGKP1yqbGl+zzAwQfUjRUmvD -ZIcWLHi2ge4GzPMPi50B2ARYIL6cAQQAxWHnicKejAFcFcF1/3gUSgSH7eiwuBPX -M7vDdgGzlve1o1jbV4tzrjN9jsCl6r0nJPDMfBSzgLr1auNTRG6HpJ4abcOx86ED -Ad+avDcQPZb7z3dPhH/gb2lQejZsHh7bbeOS8WMSzHV3RqCLd8J/xwWPNR5zKn1f -yp4IGfopidMAEQEAAQAD+wQOelnR82+dxyM2IFmZdOB9wSXQeCVOvxSaNMh6Y3lk -UOOkO8Nlic4x0ungQRvjoRs4wBmCuwFK/MII6jKui0B7dn/NDf51i7rGdNGuJXDH -e676By1sEY/NGkc74jr74T+5GWNU64W0vkpfgVmjSAzsUtpmhJMXsc7beBhJdnVl -AgDKCb8hZqj1alcdmLoNvb7ibA3K/V8J462CPD7bMySPBa/uayoFhNxibpoXml2r -oOtHa5izF3b0/9JY97F6rqkdAgD6GdTJ+xmlCoz1Sewoif1I6krq6xoa7gOYpIXo -UL1Afr+LiJeyAnF/M34j/kjIVmPanZJjry0kkjHE5ILjH3uvAf4/6n9np+Th8ujS -YDCIzKwR7639+H+qccOaddCep8Y6KGUMVdD/vTKEx1rMtK+hK/CDkkkxnFslifMJ -kqoqv3WUqCWJAT0EGAECAAkFAlggvpwCGwIAqAkQndccVqdQmAKdIAQZAQIABgUC -WCC+nAAKCRDmGUholQPwvQk+A/9latnSsR5s5/1A9TFki11GzSEnfLbx46FYOdkW -n3YBxZoPQGxNA1vIn8GmouxZInw9CF4jdOJxEdzLlYQJ9YLTLtN5tQEMl/19/bR8 -/qLacAZ9IOezYRWxxZsyn6//jfl7A0Y+FV59d4YajKkEfItcIIlgVBSW6T+TNQT3 -R+EH5HJ/A/4/AN0CmBhhE2vGzTnVU0VPrE4V64pjn1rufFdclgpixNZCuuqpKpoE -VVHn6mnBf4njKjZrAGPs5kfQ+H4NsM7v3Zz4yV6deu9FZc4O6E+V1WJ38rO8eBix -7G2jko106CC6vtxsCPVIzY7aaG3H5pjRtomw+pX7SzrQ7FUg2PGumg== -=F/T0 ------END PGP PRIVATE KEY BLOCK-----` - -const ecdsaPrivateKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -xaUEX1KsSRMIKoZIzj0DAQcCAwTpYqJsnJiFhKKh+8TulWD+lVmerBFNS+Ii -B+nlG3T0xQQ4Sy5eIjJ0CExIQQzi3EElF/Z2l4F3WC5taFA11NgA/gkDCHSS -PThf1M2K4LN8F1MRcvR+sb7i0nH55ojkwuVB1DE6jqIT9m9i+mX1tzjSAS+6 -lPQiweCJvG7xTC7Hs3AzRapf/r1At4TB+v+5G2/CKynNFEJpbGwgPGJpbGxA -aG9tZS5jb20+wncEEBMIAB8FAl9SrEkGCwkHCAMCBBUICgIDFgIBAhkBAhsD -Ah4BAAoJEMpwT3+q3+xqw5UBAMebZN9isEZ1ML+R/jWAAWMwa/knMugrEZ1v -Bl9+ZwM0AQCZdf80/wYY4Nve01qSRFv8OmKswLli3TvDv6FKc4cLz8epBF9S -rEkSCCqGSM49AwEHAgMEAjKnT9b5wY2bf9TpAV3d7OUfPOxKj9c4VzeVzSrH -AtQgo/MuI1cdYVURicV4i76DNjFhQHQFTk7BrC+C2u1yqQMBCAf+CQMIHImA -iYfzQtjgQWSFZYUkCFpbbwhNF0ch+3HNaZkaHCnZRIsWsRnc6FCb6lRQyK9+ -Dq59kHlduE5QgY40894jfmP2JdJHU6nBdYrivbEdbMJhBBgTCAAJBQJfUqxJ -AhsMAAoJEMpwT3+q3+xqUI0BAMykhV08kQ4Ip9Qlbss6Jdufv7YrU0Vd5hou -b5TmiPd0APoDBh3qIic+aLLUcAuG3+Gt1P1AbUlmqV61ozn1WfHxfw== -=KLN8 ------END PGP PRIVATE KEY BLOCK-----` - -const dsaPrivateKeyWithElGamalSubkey = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -lQOBBF9/MLsRCACeaF6BI0jTgDAs86t8/kXPfwlPvR2MCYzB0BCqAdcq1hV/GTYd -oNmJRna/ZJfsI/vf+d8Nv+EYOQkPheFS1MJVBitkAXjQPgm8i1tQWen1FCWZxqGk -/vwZYF4yo8GhZ+Wxi3w09W9Cp9QM/CTmyE1Xe7wpPBGe+oD+me8Zxjyt8JBS4Qx+ -gvWbfHxfHnggh4pz7U8QkItlLsBNQEdX4R5+zwRN66g2ZSX/shaa/EkVnihUhD7r -njP9I51ORWucTQD6OvgooaNQZCkQ/Se9TzdakwWKS2XSIFXiY/e2E5ZgKI/pfKDU -iA/KessxddPb7nP/05OIJqg9AoDrD4vmehLzAQD+zsUS3LDU1m9/cG4LMsQbT2VK -Te4HqbGIAle+eu/asQf8DDJMrbZpiJZvADum9j0TJ0oep6VdMbzo9RSDKvlLKT9m -kG63H8oDWnCZm1a+HmGq9YIX+JHWmsLXXsFLeEouLzHO+mZo0X28eji3V2T87hyR -MmUM0wFo4k7jK8uVmkDXv3XwNp2uByWxUKZd7EnWmcEZWqIiexJ7XpCS0Pg3tRaI -zxve0SRe/dxfUPnTk/9KQ9hS6DWroBKquL182zx1Fggh4LIWWE2zq+UYn8BI0E8A -rmIDFJdF8ymFQGRrEy6g79NnkPmkrZWsgMRYY65P6v4zLVmqohJKkpm3/Uxa6QAP -CCoPh/JTOvPeCP2bOJH8z4Z9Py3ouMIjofQW8sXqRgf/RIHbh0KsINHrwwZ4gVIr -MK3RofpaYxw1ztPIWb4cMWoWZHH1Pxh7ggTGSBpAhKXkiWw2Rxat8QF5aA7e962c -bLvVv8dqsPrD/RnVJHag89cbPTzjn7gY9elE8EM8ithV3oQkwHTr4avYlpDZsgNd -hUW3YgRwGo31tdzxoG04AcpV2t+07P8XMPr9hsfWs4rHohXPi38Hseu1Ji+dBoWQ -3+1w/HH3o55s+jy4Ruaz78AIrjbmAJq+6rA2mIcCgrhw3DnzuwQAKeBvSeqn9zfS -ZC812osMBVmkycwelpaIh64WZ0vWL3GvdXDctV2kXM+qVpDTLEny0LuiXxrwCKQL -Ev4HAwK9uQBcreDEEud7pfRb8EYP5lzO2ZA7RaIvje6EWAGBvJGMRT0QQE5SGqc7 -Fw5geigBdt+vVyRuNNhg3c2fdn/OBQaYu0J/8AiOogG8EaM8tCFlbGdhbWFsQGRz -YS5jb20gPGVsZ2FtYWxAZHNhLmNvbT6IkAQTEQgAOBYhBI+gnfiHQxB35/Dp0XAQ -aE/rsWC5BQJffzC7AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEHAQaE/r -sWC5A4EA/0GcJmyPtN+Klc7b9sVT3JgKTRnB/URxOJfYJofP0hZLAQCkqyMO+adV -JvbgDH0zaITQWZSSXPqpgMpCA6juTrDsd50CawRffzC7EAgAxFFFSAAEQzWTgKU5 -EBtpxxoPzHqcChawTHRxHxjcELXzmUBS5PzfA1HXSPnNqK/x3Ut5ycC3CsW41Fnt -Gm3706Wu9VFbFZVn55F9lPiplUo61n5pqMvOr1gmuQsdXiTa0t5FRa4TZ2VSiHFw -vdAVSPTUsT4ZxJ1rPyFYRtq1n3pQcvdZowd07r0JnzTMjLLMFYCKhwIowoOC4zqJ -iB8enjwOlpaqBATRm9xpVF7SJkroPF6/B1vdhj7E3c1aJyHlo0PYBAg756sSHWHg -UuLyUQ4TA0hcCVenn/L/aSY2LnbdZB1EBhlYjA7dTCgwIqsQhfQmPkjz6g64A7+Y -HbbrLwADBQgAk14QIEQ+J/VHetpQV/jt2pNsFK1kVK7mXK0spTExaC2yj2sXlHjL -Ie3bO5T/KqmIaBEB5db5fA5xK9cZt79qrQHDKsEqUetUeMUWLBx77zBsus3grIgy -bwDZKseRzQ715pwxquxQlScGoDIBKEh08HpwHkq140eIj3w+MAIfndaZaSCNaxaP -Snky7BQmJ7Wc7qrIwoQP6yrnUqyW2yNi81nJYUhxjChqaFSlwzLs/iNGryBKo0ic -BqVIRjikKHBlwBng6WyrltQo/Vt9GG8w+lqaAVXbJRlaBZJUR+2NKi/YhP3qQse3 -v8fi4kns0gh5LK+2C01RvdX4T49QSExuIf4HAwLJqYIGwadA2uem5v7/765ZtFWV -oL0iZ0ueTJDby4wTFDpLVzzDi/uVcB0ZRFrGOp7w6OYcNYTtV8n3xmli2Q5Trw0c -wZVzvg+ABKWiv7faBjMczIFF8y6WZKOIeAQYEQgAIBYhBI+gnfiHQxB35/Dp0XAQ -aE/rsWC5BQJffzC7AhsMAAoJEHAQaE/rsWC5ZmIA/jhS4r4lClbvjuPWt0Yqdn7R -fss2SPMYvMrrDh42aE0OAQD8xn4G6CN8UtW9xihXOY6FpxiJ/sMc2VaneeUd34oa -4g== -=XZm8 ------END PGP PRIVATE KEY BLOCK-----` - -// https://tests.sequoia-pgp.org/#Certificate_expiration -// P _ U p -const expiringPrimaryUIDKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -xsDNBF2lnPIBDAC5cL9PQoQLTMuhjbYvb4Ncuuo0bfmgPRFywX53jPhoFf4Zg6mv -/seOXpgecTdOcVttfzC8ycIKrt3aQTiwOG/ctaR4Bk/t6ayNFfdUNxHWk4WCKzdz -/56fW2O0F23qIRd8UUJp5IIlN4RDdRCtdhVQIAuzvp2oVy/LaS2kxQoKvph/5pQ/ -5whqsyroEWDJoSV0yOb25B/iwk/pLUFoyhDG9bj0kIzDxrEqW+7Ba8nocQlecMF3 -X5KMN5kp2zraLv9dlBBpWW43XktjcCZgMy20SouraVma8Je/ECwUWYUiAZxLIlMv -9CurEOtxUw6N3RdOtLmYZS9uEnn5y1UkF88o8Nku890uk6BrewFzJyLAx5wRZ4F0 -qV/yq36UWQ0JB/AUGhHVPdFf6pl6eaxBwT5GXvbBUibtf8YI2og5RsgTWtXfU7eb -SGXrl5ZMpbA6mbfhd0R8aPxWfmDWiIOhBufhMCvUHh1sApMKVZnvIff9/0Dca3wb -vLIwa3T4CyshfT0AEQEAAc0hQm9iIEJhYmJhZ2UgPGJvYkBvcGVucGdwLmV4YW1w -bGU+wsFcBBMBCgCQBYJhesp/BYkEWQPJBQsJCAcCCRD7/MgqAV5zMEcUAAAAAAAe -ACBzYWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmeEOQlNyTLFkc9I/elp+BpY -495V7KatqtDmsyDr+zDAdwYVCgkICwIEFgIDAQIXgAIbAwIeARYhBNGmbhojsYLJ -mA94jPv8yCoBXnMwAABSCQv/av8hKyynMtXVKFuWOGJw0mR8auDm84WdhMFRZg8t -yTJ1L88+Ny4WUAFeqo2j7DU2yPGrm5rmuvzlEedFYFeOWt+A4adz+oumgRd0nsgG -Lf3QYUWQhLWVlz+H7zubgKqSB2A2RqV65S7mTTVro42nb2Mng6rvGWiqeKG5nrXN -/01p1mIBQGR/KnZSqYLzA2Pw2PiJoSkXT26PDz/kiEMXpjKMR6sicV4bKVlEdUvm -pIImIPBHZq1EsKXEyWtWC41w/pc+FofGE+uSFs2aef1vvEHFkj3BHSK8gRcH3kfR -eFroTET8C2q9V1AOELWm+Ys6PzGzF72URK1MKXlThuL4t4LjvXWGNA78IKW+/RQH -DzK4U0jqSO0mL6qxqVS5Ij6jjL6OTrVEGdtDf5n0vI8tcUTBKtVqYAYk+t2YGT05 -ayxALtb7viVKo8f10WEcCuKshn0gdsEFMRZQzJ89uQIY3R3FbsdRCaE6OEaDgKMQ -UTFROyfhthgzRKbRxfcplMUCzsDNBF2lnPIBDADWML9cbGMrp12CtF9b2P6z9TTT -74S8iyBOzaSvdGDQY/sUtZXRg21HWamXnn9sSXvIDEINOQ6A9QxdxoqWdCHrOuW3 -ofneYXoG+zeKc4dC86wa1TR2q9vW+RMXSO4uImA+Uzula/6k1DogDf28qhCxMwG/ -i/m9g1c/0aApuDyKdQ1PXsHHNlgd/Dn6rrd5y2AObaifV7wIhEJnvqgFXDN2RXGj -LeCOHV4Q2WTYPg/S4k1nMXVDwZXrvIsA0YwIMgIT86Rafp1qKlgPNbiIlC1g9RY/ -iFaGN2b4Ir6GDohBQSfZW2+LXoPZuVE/wGlQ01rh827KVZW4lXvqsge+wtnWlszc -selGATyzqOK9LdHPdZGzROZYI2e8c+paLNDdVPL6vdRBUnkCaEkOtl1mr2JpQi5n -TU+gTX4IeInC7E+1a9UDF/Y85ybUz8XV8rUnR76UqVC7KidNepdHbZjjXCt8/Zo+ -Tec9JNbYNQB/e9ExmDntmlHEsSEQzFwzj8sxH48AEQEAAcLA9gQYAQoAIBYhBNGm -bhojsYLJmA94jPv8yCoBXnMwBQJdpZzyAhsMAAoJEPv8yCoBXnMw6f8L/26C34dk -jBffTzMj5Bdzm8MtF67OYneJ4TQMw7+41IL4rVcSKhIhk/3Ud5knaRtP2ef1+5F6 -6h9/RPQOJ5+tvBwhBAcUWSupKnUrdVaZQanYmtSxcVV2PL9+QEiNN3tzluhaWO// -rACxJ+K/ZXQlIzwQVTpNhfGzAaMVV9zpf3u0k14itcv6alKY8+rLZvO1wIIeRZLm -U0tZDD5HtWDvUV7rIFI1WuoLb+KZgbYn3OWjCPHVdTrdZ2CqnZbG3SXw6awH9bzR -LV9EXkbhIMez0deCVdeo+wFFklh8/5VK2b0vk/+wqMJxfpa1lHvJLobzOP9fvrsw -sr92MA2+k901WeISR7qEzcI0Fdg8AyFAExaEK6VyjP7SXGLwvfisw34OxuZr3qmx -1Sufu4toH3XrB7QJN8XyqqbsGxUCBqWif9RSK4xjzRTe56iPeiSJJOIciMP9i2ld -I+KgLycyeDvGoBj0HCLO3gVaBe4ubVrj5KjhX2PVNEJd3XZRzaXZE2aAMQ== -=AmgT ------END PGP PUBLIC KEY BLOCK-----` - -const rsa2048PrivateKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- -Comment: gpg (GnuPG) 2.2.27 with libgcrypt 1.9.4 - -lQPGBGL07P0BCADL0etN8efyAXA6sL2WfQvHe5wEKYXPWeN2+jiqSppfeRZAOlzP -kZ3U+cloeJriplYvVJwI3ID2aw52Z/TRn8iKRP5eOUFrEgcgl06lazLtOndK7o7p -oBV5mLtHEirFHm6W61fNt10jzM0jx0PV6nseLhFB2J42F1cmU/aBgFo41wjLSZYr -owR+v+O9S5sUXblQF6sEDcY01sBEu09zrIgT49VFwQ1Cvdh9XZEOTQBfdiugoj5a -DS3fAqAka3r1VoQK4eR7/upnYSgSACGeaQ4pUelKku5rpm50gdWTY8ppq0k9e1eT -y2x0OQcW3hWE+j4os1ca0ZEADMdqr/99MOxrABEBAAH+BwMCJWxU4VOZOJ7/I6vX -FxdfBhIBEXlJ52FM3S/oYtXqLhkGyrtmZOeEazVvUtuCe3M3ScHI8xCthcmE8E0j -bi+ZEHPS2NiBZtgHFF27BLn7zZuTc+oD5WKduZdK3463egnyThTqIIMl25WZBuab -k5ycwYrWwBH0jfA4gwJ13ai4pufKC2RM8qIu6YAVPglYBKFLKGvvJHa5vI+LuA0E -K+k35hIic7yVUcQneNnAF2598X5yWiieYnOZpmHlRw1zfbMwOJr3ZNj2v94u7b+L -sTa/1Uv9887Vb6sJp0c2Sh4cwEccoPYkvMqFn3ZrJUr3UdDu1K2vWohPtswzhrYV -+RdPZE5RLoCQufKvlPezk0Pzhzb3bBU7XjUbdGY1nH/EyQeBNp+Gw6qldKvzcBaB -cyOK1c6hPSszpJX93m5UxCN55IeifmcNjmbDh8vGCCdajy6d56qV2n4F3k7vt1J1 -0UlxIGhqijJoaTCX66xjLMC6VXkSz6aHQ35rnXosm/cqPcQshsZTdlfSyWkorfdr -4Hj8viBER26mjYurTMLBKDtUN724ZrR0Ev5jorX9uoKlgl87bDZHty2Ku2S+vR68 -VAvnj6Fi1BYNclnDoqxdRB2z5T9JbWE52HuG83/QsplhEqXxESDxriTyTHMbNxEe -88soVCDh4tgflZFa2ucUr6gEKJKij7jgahARnyaXfPZlQBUAS1YUeILYmN+VR+M/ -sHENpwDWc7TInn8VN638nJV+ScZGMih3AwWZTIoiLju3MMt1K0YZ3NuiqwGH4Jwg -/BbEdTWeCci9y3NEQHQ3uZZ5p6j2CwFVlK11idemCMvAiTVxF+gKdaLMkeCwKxru -J3YzhKEo+iDVYbPYBYizx/EHBn2U5kITQ5SBXzjTaaFMNZJEf9JYsL1ybPB6HOFY -VNVB2KT8CGVwtCJHb2xhbmcgR29waGVyIDxnb2xhbmdAZXhhbXBsZS5vcmc+iQFO -BBMBCgA4FiEEC6K7U7f4qesybTnqSkra7gHusm0FAmL07P0CGwMFCwkIBwIGFQoJ -CAsCBBYCAwECHgECF4AACgkQSkra7gHusm1MvwgAxpClWkeSqIhMQfbiuz0+lOkE -89y1DCFw8bHjZoUf4/4K8hFA3dGkk+q72XFgiyaCpfXxMt6Gi+dN47t+tTv9NIqC -sukbaoJBmJDhN6+djmJOgOYy+FWsW2LAk2LOwKYulpnBZdcA5rlMAhBg7gevQpF+ -ruSU69P7UUaFJl/DC7hDmaIcj+4cjBE/HO26SnVQjoTfjZT82rDh1Wsuf8LnkJUk -b3wezBLpXKjDvdHikdv4gdlR4AputVM38aZntYYglh/EASo5TneyZ7ZscdLNRdcF -r5O2fKqrOJLOdaoYRFZZWOvP5GtEVFDU7WGivOSVfiszBE0wZR3dgZRJipHCXJ0D -xgRi9Oz9AQgAtMJcJqLLVANJHl90tWuoizDkm+Imcwq2ubQAjpclnNrODnDK+7o4 -pBsWmXbZSdkC4gY+LhOQA6bPDD0JEHM58DOnrm49BddxXAyK0HPsk4sGGt2SS86B -OawWNdfJVyqw4bAiHWDmQg4PcjBbt3ocOIxAR6I5kBSiQVxuGQs9T+Zvg3G1r3Or -fS6DzlgY3HFUML5YsGH4lOxNSOoKAP68GIH/WNdUZ+feiRg9knIib6I3Hgtf5eO8 -JRH7aWE/TD7eNu36bLLjT5TZPq5r6xaD2plbtPOyXbNPWs9qI1yG+VnErfaLY0w8 -Qo0aqzbgID+CTZVomXSOpOcQseaFKw8ZfQARAQAB/gcDArha6+/+d4OY/w9N32K9 -hFNYt4LufTETMQ+k/sBeaMuAVzmT47DlAXzkrZhGW4dZOtXMu1rXaUwHlqkhEyzL -L4MYEWVXfD+LbZNEK3MEFss6RK+UAMeT/PTV9aA8cXQVPcSJYzfBXHQ1U1hnOgrO -apn92MN8RmkhX8wJLyeWTMMuP4lXByJMmmGo8WvifeRD2kFY4y0WVBDAXJAV4Ljf -Di/bBiwoc5a+gxHuZT2W9ZSxBQJNXdt4Un2IlyZuo58s5MLx2N0EaNJ8PwRUE6fM -RZYO8aZCEPUtINE4njbvsWOMCtrblsMPwZ1B0SiIaWmLaNyGdCNKea+fCIW7kasC -JYMhnLumpUTXg5HNexkCsl7ABWj0PYBflOE61h8EjWpnQ7JBBVKS2ua4lMjwHRX7 -5o5yxym9k5UZNFdGoXVL7xpizCcdGawxTJvwhs3vBqu1ZWYCegOAZWDrOkCyhUpq -8uKMROZFbn+FwE+7tjt+v2ed62FVEvD6g4V3ThCA6mQqeOARfJWN8GZY8BDm8lht -crOXriUkrx+FlrgGtm2CkwjW5/9Xd7AhFpHnQdFeozOHyq1asNSgJF9sNi9Lz94W -skQSVRi0IExxSXYGI3Y0nnAZUe2BAQflYPJdEveSr3sKlUqXiETTA1VXsTPK3kOC -92CbLzj/Hz199jZvywwyu53I+GKMpF42rMq7zxr2oa61YWY4YE/GDezwwys/wLx/ -QpCW4X3ppI7wJjCSSqEV0baYZSSli1ayheS6dxi8QnSpX1Bmpz6gU7m/M9Sns+hl -J7ZvgpjCAiV7KJTjtclr5/S02zP78LTVkoTWoz/6MOTROwaP63VBUXX8pbJhf/vu -DLmNnDk8joMJxoDXWeNU0EnNl4hP7Z/jExRBOEO4oAnUf/Sf6gCWQhL5qcajtg6w -tGv7vx3f2IkBNgQYAQoAIBYhBAuiu1O3+KnrMm056kpK2u4B7rJtBQJi9Oz9AhsM -AAoJEEpK2u4B7rJt6lgIAMBWqP4BCOGnQXBbgJ0+ACVghpkFUXZTb/tXJc8UUvTM -8uov6k/RsqDGZrvhhufD7Wwt7j9v7dD7VPp7bPyjVWyimglQzWguTUUqLDGlstYH -5uYv1pzma0ZsAGNqFeGlTLsKOSGKFMH4rB2KfN2n51L8POvtp1y7GKZQbWIWneaB -cZr3BINU5GMvYYU7pAYcoR+mJPdJx5Up3Ocn+bn8Tu1sy9C/ArtCQucazGnoE9u1 -HhNLrh0CdzzX7TNH6TQ8LwPOvq0K5l/WqbN9lE0WBBhMv2HydxhluO8AhU+A5GqC -C+wET7nVDnhoOm/fstIeb7/LN7OYejKPeHdFBJEL9GA= -=u442 ------END PGP PRIVATE KEY BLOCK-----` - -const curve25519PrivateKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- -Comment: gpg (GnuPG) 2.2.27 with libgcrypt 1.9.4 - -lFgEYvTtQBYJKwYBBAHaRw8BAQdAxsNXLbrk5xOjpO24VhOMvQ0/F+JcyIkckMDH -X3FIGxcAAQDFOlunZWYuPsCx5JLp78vKqUTfgef9TGG4oD6I/Sa0zBMstCJHb2xh -bmcgR29waGVyIDxnb2xhbmdAZXhhbXBsZS5vcmc+iJAEExYIADgWIQSFQHEOazmo -h1ldII4MvfnLQ4JBNwUCYvTtQAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK -CRAMvfnLQ4JBN5yeAQCKdry8B5ScCPrev2+UByMCss7Sdu5RhomCFsHdNPLcKAEA -8ugei+1owHsV+3cGwWWzKk6sLa8ZN87i3SKuOGp9DQycXQRi9O1AEgorBgEEAZdV -AQUBAQdA5CubPp8l7lrVQ25h7Hx5XN2C8xanRnnpcjzEooCaEA0DAQgHAAD/Rpc+ -sOZUXrFk9HOWB1XU41LoWbDBoG8sP8RWAVYwD5AQRYh4BBgWCAAgFiEEhUBxDms5 -qIdZXSCODL35y0OCQTcFAmL07UACGwwACgkQDL35y0OCQTcvdwEA7lb5g/YisrEf -iq660uwMGoepLUfvtqKzuQ6heYe83y0BAN65Ffg5HYOJzUEi0kZQRf7OhdtuL2kJ -SRXn8DmCTfEB -=cELM ------END PGP PRIVATE KEY BLOCK-----` - -const curve448PrivateKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- -Comment: C1DB 65D5 80D7 B922 7254 4B1E A699 9895 FABA CE52 - -xYUEYV2UmRYDK2VxAc9AFyxgh5xnSbyt50TWl558mw9xdMN+/UBLr5+UMP8IsrvV -MdXuTIE8CyaUQKSotHtH2RkYEXj5nsMAAAHPQIbTMSzjIWug8UFECzAex5FHgAgH -gYF3RK+TS8D24wX8kOu2C/NoVxwGY+p+i0JHaB+7yljriSKAGxs6wsBEBB8WCgCD -BYJhXZSZBYkFpI+9AwsJBwkQppmYlfq6zlJHFAAAAAAAHgAgc2FsdEBub3RhdGlv -bnMuc2VxdW9pYS1wZ3Aub3Jn5wSpIutJ5HncJWk4ruUV8GzQF390rR5+qWEAnAoY -akcDFQoIApsBAh4BFiEEwdtl1YDXuSJyVEseppmYlfq6zlIAALzdA5dA/fsgYg/J -qaQriYKaPUkyHL7EB3BXhV2d1h/gk+qJLvXQuU2WEJ/XSs3GrsBRiiZwvPH4o+7b -mleAxjy5wpS523vqrrBR2YZ5FwIku7WS4litSdn4AtVam/TlLdMNIf41CtFeZKBe -c5R5VNdQy8y7qy8AAADNEUN1cnZlNDQ4IE9wdGlvbiA4wsBHBBMWCgCGBYJhXZSZ -BYkFpI+9AwsJBwkQppmYlfq6zlJHFAAAAAAAHgAgc2FsdEBub3RhdGlvbnMuc2Vx -dW9pYS1wZ3Aub3JnD55UsYMzE6OACP+mgw5zvT+BBgol8/uFQjHg4krjUCMDFQoI -ApkBApsBAh4BFiEEwdtl1YDXuSJyVEseppmYlfq6zlIAAPQJA5dA0Xqwzn/0uwCq -RlsOVCB3f5NOj1exKnlBvRw0xT1VBee1yxvlUt5eIAoCxWoRlWBJob3TTkhm9AEA -8dyhwPmyGfWHzPw5NFG3xsXrZdNXNvit9WMVAPcmsyR7teXuDlJItxRAdJJc/qfJ -YVbBFoaNrhYAAADHhQRhXZSZFgMrZXEBz0BL7THZ9MnCLfSPJ1FMLim9eGkQ3Bfn -M3he5rOwO3t14QI1LjI96OjkeJipMgcFAmEP1Bq/ZHGO7oAAAc9AFnE8iNBaT3OU -EFtxkmWHXtdaYMmGGRdopw9JPXr/UxuunDln5o9dxPxf7q7z26zXrZen+qed/Isa -HsDCwSwEGBYKAWsFgmFdlJkFiQWkj70JEKaZmJX6us5SRxQAAAAAAB4AIHNhbHRA -bm90YXRpb25zLnNlcXVvaWEtcGdwLm9yZxREUizdTcepBzgSMOv2VWQCWbl++3CZ -EbgAWDryvSsyApsCwDGgBBkWCgBvBYJhXZSZCRBKo3SL4S5djkcUAAAAAAAeACBz -YWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmemoGTDjmNQiIzw6HOEddvS0OB7 -UZ/P07jM/EVmnYxTlBYhBAxsnkGpx1UCiH6gUUqjdIvhLl2OAAALYQOXQAMB1oKq -OWxSFmvmgCKNcbAAyA3piF5ERIqs4z07oJvqDYrOWt75UsEIH/04gU/vHc4EmfG2 -JDLJgOLlyTUPkL/08f0ydGZPofFQBhn8HkuFFjnNtJ5oz3GIP4cdWMQFaUw0uvjb -PM9Tm3ptENGd6Ts1AAAAFiEEwdtl1YDXuSJyVEseppmYlfq6zlIAAGpTA5dATR6i -U2GrpUcQgpG+JqfAsGmF4yAOhgFxc1UfidFk3nTup3fLgjipkYY170WLRNbyKkVO -Sodx93GAs58rizO1acDAWiLq3cyEPBFXbyFThbcNPcLl+/77Uk/mgkYrPQFAQWdK -1kSRm4SizDBK37K8ChAAAADHhwRhXZSZEgMrZW8Bx0DMhzvhQo+OsXeqQ6QVw4sF -CaexHh6rLohh7TzL3hQSjoJ27fV6JBkIWdn0LfrMlJIDbSv2SLdlgQMBCgkAAcdA -MO7Dc1myF6Co1fAH+EuP+OxhxP/7V6ljuSCZENDfA49tQkzTta+PniG+pOVB2LHb -huyaKBkqiaogo8LAOQQYFgoAeAWCYV2UmQWJBaSPvQkQppmYlfq6zlJHFAAAAAAA -HgAgc2FsdEBub3RhdGlvbnMuc2VxdW9pYS1wZ3Aub3JnEjBMQAmc/2u45u5FQGmB -QAytjSG2LM3JQN+PPVl5vEkCmwwWIQTB22XVgNe5InJUSx6mmZiV+rrOUgAASdYD -l0DXEHQ9ykNP2rZP35ET1dmiFagFtTj/hLQcWlg16LqvJNGqOgYXuqTerbiOOt02 -XLCBln+wdewpU4ChEffMUDRBfqfQco/YsMqWV7bHJHAO0eC/DMKCjyU90xdH7R/d -QgqsfguR1PqPuJxpXV4bSr6CGAAAAA== -=MSvh ------END PGP PRIVATE KEY BLOCK-----` - -const keyWithNotation = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -xVgEY9gIshYJKwYBBAHaRw8BAQdAF25fSM8OpFlXZhop4Qpqo5ywGZ4jgWlR -ppjhIKDthREAAQC+LFpzFcMJYcjxGKzBGHN0Px2jU4d04YSRnFAik+lVVQ6u -zRdUZXN0IDx0ZXN0QGV4YW1wbGUuY29tPsLACgQQFgoAfAUCY9gIsgQLCQcI -CRD/utJOCym8pR0UgAAAAAAQAAR0ZXh0QGV4YW1wbGUuY29tdGVzdB8UAAAA -AAASAARiaW5hcnlAZXhhbXBsZS5jb20AAQIDAxUICgQWAAIBAhkBAhsDAh4B -FiEEEMCQTUVGKgCX5rDQ/7rSTgspvKUAAPl5AP9Npz90LxzrB97Qr2DrGwfG -wuYn4FSYwtuPfZHHeoIabwD/QEbvpQJ/NBb9EAZuow4Rirlt1yv19mmnF+j5 -8yUzhQjHXQRj2AiyEgorBgEEAZdVAQUBAQdARXAo30DmKcyUg6co7OUm0RNT -z9iqFbDBzA8A47JEt1MDAQgHAAD/XKK3lBm0SqMR558HLWdBrNG6NqKuqb5X -joCML987ZNgRD8J4BBgWCAAqBQJj2AiyCRD/utJOCym8pQIbDBYhBBDAkE1F -RioAl+aw0P+60k4LKbylAADRxgEAg7UfBDiDPp5LHcW9D+SgFHk6+GyEU4ev -VppQxdtxPvAA/34snHBX7Twnip1nMt7P4e2hDiw/hwQ7oqioOvc6jMkP -=Z8YJ ------END PGP PRIVATE KEY BLOCK----- -` diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_config.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_config.go deleted file mode 100644 index fec41a0e7..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_config.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG - -package packet - -import "math/bits" - -// CipherSuite contains a combination of Cipher and Mode -type CipherSuite struct { - // The cipher function - Cipher CipherFunction - // The AEAD mode of operation. - Mode AEADMode -} - -// AEADConfig collects a number of AEAD parameters along with sensible defaults. -// A nil AEADConfig is valid and results in all default values. -type AEADConfig struct { - // The AEAD mode of operation. - DefaultMode AEADMode - // Amount of octets in each chunk of data - ChunkSize uint64 -} - -// Mode returns the AEAD mode of operation. -func (conf *AEADConfig) Mode() AEADMode { - // If no preference is specified, OCB is used (which is mandatory to implement). - if conf == nil || conf.DefaultMode == 0 { - return AEADModeOCB - } - - mode := conf.DefaultMode - if mode != AEADModeEAX && mode != AEADModeOCB && mode != AEADModeGCM { - panic("AEAD mode unsupported") - } - return mode -} - -// ChunkSizeByte returns the byte indicating the chunk size. The effective -// chunk size is computed with the formula uint64(1) << (chunkSizeByte + 6) -// limit to 16 = 4 MiB -// https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-5.13.2 -func (conf *AEADConfig) ChunkSizeByte() byte { - if conf == nil || conf.ChunkSize == 0 { - return 12 // 1 << (12 + 6) == 262144 bytes - } - - chunkSize := conf.ChunkSize - exponent := bits.Len64(chunkSize) - 1 - switch { - case exponent < 6: - exponent = 6 - case exponent > 16: - exponent = 16 - } - - return byte(exponent - 6) -} - -// decodeAEADChunkSize returns the effective chunk size. In 32-bit systems, the -// maximum returned value is 1 << 30. -func decodeAEADChunkSize(c byte) int { - size := uint64(1 << (c + 6)) - if size != uint64(int(size)) { - return 1 << 30 - } - return int(size) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_crypter.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_crypter.go deleted file mode 100644 index 5e4604656..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_crypter.go +++ /dev/null @@ -1,250 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG - -package packet - -import ( - "crypto/cipher" - "encoding/binary" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// aeadCrypter is an AEAD opener/sealer, its configuration, and data for en/decryption. -type aeadCrypter struct { - aead cipher.AEAD - chunkSize int - nonce []byte - associatedData []byte // Chunk-independent associated data - chunkIndex []byte // Chunk counter - packetTag packetType // SEIP packet (v2) or AEAD Encrypted Data packet - bytesProcessed int // Amount of plaintext bytes encrypted/decrypted -} - -// computeNonce takes the incremental index and computes an eXclusive OR with -// the least significant 8 bytes of the receivers' initial nonce (see sec. -// 5.16.1 and 5.16.2). It returns the resulting nonce. -func (wo *aeadCrypter) computeNextNonce() (nonce []byte) { - if wo.packetTag == packetTypeSymmetricallyEncryptedIntegrityProtected { - return wo.nonce - } - - nonce = make([]byte, len(wo.nonce)) - copy(nonce, wo.nonce) - offset := len(wo.nonce) - 8 - for i := 0; i < 8; i++ { - nonce[i+offset] ^= wo.chunkIndex[i] - } - return -} - -// incrementIndex performs an integer increment by 1 of the integer represented by the -// slice, modifying it accordingly. -func (wo *aeadCrypter) incrementIndex() error { - index := wo.chunkIndex - if len(index) == 0 { - return errors.AEADError("Index has length 0") - } - for i := len(index) - 1; i >= 0; i-- { - if index[i] < 255 { - index[i]++ - return nil - } - index[i] = 0 - } - return errors.AEADError("cannot further increment index") -} - -// aeadDecrypter reads and decrypts bytes. It buffers extra decrypted bytes when -// necessary, similar to aeadEncrypter. -type aeadDecrypter struct { - aeadCrypter // Embedded ciphertext opener - reader io.Reader // 'reader' is a partialLengthReader - chunkBytes []byte - peekedBytes []byte // Used to detect last chunk - buffer []byte // Buffered decrypted bytes -} - -// Read decrypts bytes and reads them into dst. It decrypts when necessary and -// buffers extra decrypted bytes. It returns the number of bytes copied into dst -// and an error. -func (ar *aeadDecrypter) Read(dst []byte) (n int, err error) { - // Return buffered plaintext bytes from previous calls - if len(ar.buffer) > 0 { - n = copy(dst, ar.buffer) - ar.buffer = ar.buffer[n:] - return - } - - // Read a chunk - tagLen := ar.aead.Overhead() - copy(ar.chunkBytes, ar.peekedBytes) // Copy bytes peeked in previous chunk or in initialization - bytesRead, errRead := io.ReadFull(ar.reader, ar.chunkBytes[tagLen:]) - if errRead != nil && errRead != io.EOF && errRead != io.ErrUnexpectedEOF { - return 0, errRead - } - - if bytesRead > 0 { - ar.peekedBytes = ar.chunkBytes[bytesRead:bytesRead+tagLen] - - decrypted, errChunk := ar.openChunk(ar.chunkBytes[:bytesRead]) - if errChunk != nil { - return 0, errChunk - } - - // Return decrypted bytes, buffering if necessary - n = copy(dst, decrypted) - ar.buffer = decrypted[n:] - return - } - - return 0, io.EOF -} - -// Close checks the final authentication tag of the stream. -// In the future, this function could also be used to wipe the reader -// and peeked & decrypted bytes, if necessary. -func (ar *aeadDecrypter) Close() (err error) { - errChunk := ar.validateFinalTag(ar.peekedBytes) - if errChunk != nil { - return errChunk - } - return nil -} - -// openChunk decrypts and checks integrity of an encrypted chunk, returning -// the underlying plaintext and an error. It accesses peeked bytes from next -// chunk, to identify the last chunk and decrypt/validate accordingly. -func (ar *aeadDecrypter) openChunk(data []byte) ([]byte, error) { - adata := ar.associatedData - if ar.aeadCrypter.packetTag == packetTypeAEADEncrypted { - adata = append(ar.associatedData, ar.chunkIndex...) - } - - nonce := ar.computeNextNonce() - plainChunk, err := ar.aead.Open(data[:0:len(data)], nonce, data, adata) - if err != nil { - return nil, errors.ErrAEADTagVerification - } - ar.bytesProcessed += len(plainChunk) - if err = ar.aeadCrypter.incrementIndex(); err != nil { - return nil, err - } - return plainChunk, nil -} - -// Checks the summary tag. It takes into account the total decrypted bytes into -// the associated data. It returns an error, or nil if the tag is valid. -func (ar *aeadDecrypter) validateFinalTag(tag []byte) error { - // Associated: tag, version, cipher, aead, chunk size, ... - amountBytes := make([]byte, 8) - binary.BigEndian.PutUint64(amountBytes, uint64(ar.bytesProcessed)) - - adata := ar.associatedData - if ar.aeadCrypter.packetTag == packetTypeAEADEncrypted { - // ... index ... - adata = append(ar.associatedData, ar.chunkIndex...) - } - - // ... and total number of encrypted octets - adata = append(adata, amountBytes...) - nonce := ar.computeNextNonce() - if _, err := ar.aead.Open(nil, nonce, tag, adata); err != nil { - return errors.ErrAEADTagVerification - } - return nil -} - -// aeadEncrypter encrypts and writes bytes. It encrypts when necessary according -// to the AEAD block size, and buffers the extra encrypted bytes for next write. -type aeadEncrypter struct { - aeadCrypter // Embedded plaintext sealer - writer io.WriteCloser // 'writer' is a partialLengthWriter - chunkBytes []byte - offset int -} - -// Write encrypts and writes bytes. It encrypts when necessary and buffers extra -// plaintext bytes for next call. When the stream is finished, Close() MUST be -// called to append the final tag. -func (aw *aeadEncrypter) Write(plaintextBytes []byte) (n int, err error) { - for n != len(plaintextBytes) { - copied := copy(aw.chunkBytes[aw.offset:aw.chunkSize], plaintextBytes[n:]) - n += copied - aw.offset += copied - - if aw.offset == aw.chunkSize { - encryptedChunk, err := aw.sealChunk(aw.chunkBytes[:aw.offset]) - if err != nil { - return n, err - } - _, err = aw.writer.Write(encryptedChunk) - if err != nil { - return n, err - } - aw.offset = 0 - } - } - return -} - -// Close encrypts and writes the remaining buffered plaintext if any, appends -// the final authentication tag, and closes the embedded writer. This function -// MUST be called at the end of a stream. -func (aw *aeadEncrypter) Close() (err error) { - // Encrypt and write a chunk if there's buffered data left, or if we haven't - // written any chunks yet. - if aw.offset > 0 || aw.bytesProcessed == 0 { - lastEncryptedChunk, err := aw.sealChunk(aw.chunkBytes[:aw.offset]) - if err != nil { - return err - } - _, err = aw.writer.Write(lastEncryptedChunk) - if err != nil { - return err - } - } - // Compute final tag (associated data: packet tag, version, cipher, aead, - // chunk size... - adata := aw.associatedData - - if aw.aeadCrypter.packetTag == packetTypeAEADEncrypted { - // ... index ... - adata = append(aw.associatedData, aw.chunkIndex...) - } - - // ... and total number of encrypted octets - amountBytes := make([]byte, 8) - binary.BigEndian.PutUint64(amountBytes, uint64(aw.bytesProcessed)) - adata = append(adata, amountBytes...) - - nonce := aw.computeNextNonce() - finalTag := aw.aead.Seal(nil, nonce, nil, adata) - _, err = aw.writer.Write(finalTag) - if err != nil { - return err - } - return aw.writer.Close() -} - -// sealChunk Encrypts and authenticates the given chunk. -func (aw *aeadEncrypter) sealChunk(data []byte) ([]byte, error) { - if len(data) > aw.chunkSize { - return nil, errors.AEADError("chunk exceeds maximum length") - } - if aw.associatedData == nil { - return nil, errors.AEADError("can't seal without headers") - } - adata := aw.associatedData - if aw.aeadCrypter.packetTag == packetTypeAEADEncrypted { - adata = append(aw.associatedData, aw.chunkIndex...) - } - - nonce := aw.computeNextNonce() - encrypted := aw.aead.Seal(data[:0], nonce, data, adata) - aw.bytesProcessed += len(data) - if err := aw.aeadCrypter.incrementIndex(); err != nil { - return nil, err - } - return encrypted, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_encrypted.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_encrypted.go deleted file mode 100644 index 583765d87..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_encrypted.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (C) 2019 ProtonTech AG - -package packet - -import ( - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" -) - -// AEADEncrypted represents an AEAD Encrypted Packet. -// See https://www.ietf.org/archive/id/draft-koch-openpgp-2015-rfc4880bis-00.html#name-aead-encrypted-data-packet-t -type AEADEncrypted struct { - cipher CipherFunction - mode AEADMode - chunkSizeByte byte - Contents io.Reader // Encrypted chunks and tags - initialNonce []byte // Referred to as IV in RFC4880-bis -} - -// Only currently defined version -const aeadEncryptedVersion = 1 - -func (ae *AEADEncrypted) parse(buf io.Reader) error { - headerData := make([]byte, 4) - if n, err := io.ReadFull(buf, headerData); n < 4 { - return errors.AEADError("could not read aead header:" + err.Error()) - } - // Read initial nonce - mode := AEADMode(headerData[2]) - nonceLen := mode.IvLength() - - // This packet supports only EAX and OCB - // https://www.ietf.org/archive/id/draft-koch-openpgp-2015-rfc4880bis-00.html#name-aead-encrypted-data-packet-t - if nonceLen == 0 || mode > AEADModeOCB { - return errors.AEADError("unknown mode") - } - - initialNonce := make([]byte, nonceLen) - if n, err := io.ReadFull(buf, initialNonce); n < nonceLen { - return errors.AEADError("could not read aead nonce:" + err.Error()) - } - ae.Contents = buf - ae.initialNonce = initialNonce - c := headerData[1] - if _, ok := algorithm.CipherById[c]; !ok { - return errors.UnsupportedError("unknown cipher: " + string(c)) - } - ae.cipher = CipherFunction(c) - ae.mode = mode - ae.chunkSizeByte = headerData[3] - return nil -} - -// Decrypt returns a io.ReadCloser from which decrypted bytes can be read, or -// an error. -func (ae *AEADEncrypted) Decrypt(ciph CipherFunction, key []byte) (io.ReadCloser, error) { - return ae.decrypt(key) -} - -// decrypt prepares an aeadCrypter and returns a ReadCloser from which -// decrypted bytes can be read (see aeadDecrypter.Read()). -func (ae *AEADEncrypted) decrypt(key []byte) (io.ReadCloser, error) { - blockCipher := ae.cipher.new(key) - aead := ae.mode.new(blockCipher) - // Carry the first tagLen bytes - chunkSize := decodeAEADChunkSize(ae.chunkSizeByte) - tagLen := ae.mode.TagLength() - chunkBytes := make([]byte, chunkSize+tagLen*2) - peekedBytes := chunkBytes[chunkSize+tagLen:] - n, err := io.ReadFull(ae.Contents, peekedBytes) - if n < tagLen || (err != nil && err != io.EOF) { - return nil, errors.AEADError("Not enough data to decrypt:" + err.Error()) - } - - return &aeadDecrypter{ - aeadCrypter: aeadCrypter{ - aead: aead, - chunkSize: chunkSize, - nonce: ae.initialNonce, - associatedData: ae.associatedData(), - chunkIndex: make([]byte, 8), - packetTag: packetTypeAEADEncrypted, - }, - reader: ae.Contents, - chunkBytes: chunkBytes, - peekedBytes: peekedBytes, - }, nil -} - -// associatedData for chunks: tag, version, cipher, mode, chunk size byte -func (ae *AEADEncrypted) associatedData() []byte { - return []byte{ - 0xD4, - aeadEncryptedVersion, - byte(ae.cipher), - byte(ae.mode), - ae.chunkSizeByte} -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/compressed.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/compressed.go deleted file mode 100644 index 0bcb38cac..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/compressed.go +++ /dev/null @@ -1,161 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "compress/bzip2" - "compress/flate" - "compress/zlib" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// Compressed represents a compressed OpenPGP packet. The decompressed contents -// will contain more OpenPGP packets. See RFC 4880, section 5.6. -type Compressed struct { - Body io.Reader -} - -const ( - NoCompression = flate.NoCompression - BestSpeed = flate.BestSpeed - BestCompression = flate.BestCompression - DefaultCompression = flate.DefaultCompression -) - -// CompressionConfig contains compressor configuration settings. -type CompressionConfig struct { - // Level is the compression level to use. It must be set to - // between -1 and 9, with -1 causing the compressor to use the - // default compression level, 0 causing the compressor to use - // no compression and 1 to 9 representing increasing (better, - // slower) compression levels. If Level is less than -1 or - // more then 9, a non-nil error will be returned during - // encryption. See the constants above for convenient common - // settings for Level. - Level int -} - -// decompressionReader ensures that the whole compression packet is read. -type decompressionReader struct { - compressed io.Reader - decompressed io.ReadCloser - readAll bool -} - -func newDecompressionReader(r io.Reader, decompressor io.ReadCloser) *decompressionReader { - return &decompressionReader{ - compressed: r, - decompressed: decompressor, - } -} - -func (dr *decompressionReader) Read(data []byte) (n int, err error) { - if dr.readAll { - return 0, io.EOF - } - n, err = dr.decompressed.Read(data) - if err == io.EOF { - dr.readAll = true - // Close the decompressor. - if errDec := dr.decompressed.Close(); errDec != nil { - return n, errDec - } - // Consume all remaining data from the compressed packet. - consumeAll(dr.compressed) - } - return n, err -} - -func (c *Compressed) parse(r io.Reader) error { - var buf [1]byte - _, err := readFull(r, buf[:]) - if err != nil { - return err - } - - switch buf[0] { - case 0: - c.Body = r - case 1: - c.Body = newDecompressionReader(r, flate.NewReader(r)) - case 2: - decompressor, err := zlib.NewReader(r) - if err != nil { - return err - } - c.Body = newDecompressionReader(r, decompressor) - case 3: - c.Body = newDecompressionReader(r, io.NopCloser(bzip2.NewReader(r))) - default: - err = errors.UnsupportedError("unknown compression algorithm: " + strconv.Itoa(int(buf[0]))) - } - - return err -} - -// compressedWriterCloser represents the serialized compression stream -// header and the compressor. Its Close() method ensures that both the -// compressor and serialized stream header are closed. Its Write() -// method writes to the compressor. -type compressedWriteCloser struct { - sh io.Closer // Stream Header - c io.WriteCloser // Compressor -} - -func (cwc compressedWriteCloser) Write(p []byte) (int, error) { - return cwc.c.Write(p) -} - -func (cwc compressedWriteCloser) Close() (err error) { - err = cwc.c.Close() - if err != nil { - return err - } - - return cwc.sh.Close() -} - -// SerializeCompressed serializes a compressed data packet to w and -// returns a WriteCloser to which the literal data packets themselves -// can be written and which MUST be closed on completion. If cc is -// nil, sensible defaults will be used to configure the compression -// algorithm. -func SerializeCompressed(w io.WriteCloser, algo CompressionAlgo, cc *CompressionConfig) (literaldata io.WriteCloser, err error) { - compressed, err := serializeStreamHeader(w, packetTypeCompressed) - if err != nil { - return - } - - _, err = compressed.Write([]byte{uint8(algo)}) - if err != nil { - return - } - - level := DefaultCompression - if cc != nil { - level = cc.Level - } - - var compressor io.WriteCloser - switch algo { - case CompressionZIP: - compressor, err = flate.NewWriter(compressed, level) - case CompressionZLIB: - compressor, err = zlib.NewWriterLevel(compressed, level) - default: - s := strconv.Itoa(int(algo)) - err = errors.UnsupportedError("Unsupported compression algorithm: " + s) - } - if err != nil { - return - } - - literaldata = compressedWriteCloser{compressed, compressor} - - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config.go deleted file mode 100644 index 257398d9d..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config.go +++ /dev/null @@ -1,422 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "crypto" - "crypto/rand" - "io" - "math/big" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/s2k" -) - -var ( - defaultRejectPublicKeyAlgorithms = map[PublicKeyAlgorithm]bool{ - PubKeyAlgoElGamal: true, - PubKeyAlgoDSA: true, - } - defaultRejectHashAlgorithms = map[crypto.Hash]bool{ - crypto.MD5: true, - crypto.RIPEMD160: true, - } - defaultRejectMessageHashAlgorithms = map[crypto.Hash]bool{ - crypto.SHA1: true, - crypto.MD5: true, - crypto.RIPEMD160: true, - } - defaultRejectCurves = map[Curve]bool{ - CurveSecP256k1: true, - } -) - -// A global feature flag to indicate v5 support. -// Can be set via a build tag, e.g.: `go build -tags v5 ./...` -// If the build tag is missing config_v5.go will set it to true. -// -// Disables parsing of v5 keys and v5 signatures. -// These are non-standard entities, which in the crypto-refresh have been superseded -// by v6 keys, v6 signatures and SEIPDv2 encrypted data, respectively. -var V5Disabled = false - -// Config collects a number of parameters along with sensible defaults. -// A nil *Config is valid and results in all default values. -type Config struct { - // Rand provides the source of entropy. - // If nil, the crypto/rand Reader is used. - Rand io.Reader - // DefaultHash is the default hash function to be used. - // If zero, SHA-256 is used. - DefaultHash crypto.Hash - // DefaultCipher is the cipher to be used. - // If zero, AES-128 is used. - DefaultCipher CipherFunction - // Time returns the current time as the number of seconds since the - // epoch. If Time is nil, time.Now is used. - Time func() time.Time - // DefaultCompressionAlgo is the compression algorithm to be - // applied to the plaintext before encryption. If zero, no - // compression is done. - DefaultCompressionAlgo CompressionAlgo - // CompressionConfig configures the compression settings. - CompressionConfig *CompressionConfig - // S2K (String to Key) config, used for key derivation in the context of secret key encryption - // and password-encrypted data. - // If nil, the default configuration is used - S2KConfig *s2k.Config - // Iteration count for Iterated S2K (String to Key). - // Only used if sk2.Mode is nil. - // This value is duplicated here from s2k.Config for backwards compatibility. - // It determines the strength of the passphrase stretching when - // the said passphrase is hashed to produce a key. S2KCount - // should be between 65536 and 65011712, inclusive. If Config - // is nil or S2KCount is 0, the value 16777216 used. Not all - // values in the above range can be represented. S2KCount will - // be rounded up to the next representable value if it cannot - // be encoded exactly. When set, it is strongly encrouraged to - // use a value that is at least 65536. See RFC 4880 Section - // 3.7.1.3. - // - // Deprecated: SK2Count should be configured in S2KConfig instead. - S2KCount int - // RSABits is the number of bits in new RSA keys made with NewEntity. - // If zero, then 2048 bit keys are created. - RSABits int - // The public key algorithm to use - will always create a signing primary - // key and encryption subkey. - Algorithm PublicKeyAlgorithm - // Some known primes that are optionally prepopulated by the caller - RSAPrimes []*big.Int - // Curve configures the desired packet.Curve if the Algorithm is PubKeyAlgoECDSA, - // PubKeyAlgoEdDSA, or PubKeyAlgoECDH. If empty Curve25519 is used. - Curve Curve - // AEADConfig configures the use of the new AEAD Encrypted Data Packet, - // defined in the draft of the next version of the OpenPGP specification. - // If a non-nil AEADConfig is passed, usage of this packet is enabled. By - // default, it is disabled. See the documentation of AEADConfig for more - // configuration options related to AEAD. - // **Note: using this option may break compatibility with other OpenPGP - // implementations, as well as future versions of this library.** - AEADConfig *AEADConfig - // V6Keys configures version 6 key generation. If false, this package still - // supports version 6 keys, but produces version 4 keys. - V6Keys bool - // Minimum RSA key size allowed for key generation and message signing, verification and encryption. - MinRSABits uint16 - // Reject insecure algorithms, only works with v2 api - RejectPublicKeyAlgorithms map[PublicKeyAlgorithm]bool - RejectHashAlgorithms map[crypto.Hash]bool - RejectMessageHashAlgorithms map[crypto.Hash]bool - RejectCurves map[Curve]bool - // "The validity period of the key. This is the number of seconds after - // the key creation time that the key expires. If this is not present - // or has a value of zero, the key never expires. This is found only on - // a self-signature."" - // https://tools.ietf.org/html/rfc4880#section-5.2.3.6 - KeyLifetimeSecs uint32 - // "The validity period of the signature. This is the number of seconds - // after the signature creation time that the signature expires. If - // this is not present or has a value of zero, it never expires." - // https://tools.ietf.org/html/rfc4880#section-5.2.3.10 - SigLifetimeSecs uint32 - // SigningKeyId is used to specify the signing key to use (by Key ID). - // By default, the signing key is selected automatically, preferring - // signing subkeys if available. - SigningKeyId uint64 - // SigningIdentity is used to specify a user ID (packet Signer's User ID, type 28) - // when producing a generic certification signature onto an existing user ID. - // The identity must be present in the signer Entity. - SigningIdentity string - // InsecureAllowUnauthenticatedMessages controls, whether it is tolerated to read - // encrypted messages without Modification Detection Code (MDC). - // MDC is mandated by the IETF OpenPGP Crypto Refresh draft and has long been implemented - // in most OpenPGP implementations. Messages without MDC are considered unnecessarily - // insecure and should be prevented whenever possible. - // In case one needs to deal with messages from very old OpenPGP implementations, there - // might be no other way than to tolerate the missing MDC. Setting this flag, allows this - // mode of operation. It should be considered a measure of last resort. - InsecureAllowUnauthenticatedMessages bool - // InsecureAllowDecryptionWithSigningKeys allows decryption with keys marked as signing keys in the v2 API. - // This setting is potentially insecure, but it is needed as some libraries - // ignored key flags when selecting a key for encryption. - // Not relevant for the v1 API, as all keys were allowed in decryption. - InsecureAllowDecryptionWithSigningKeys bool - // KnownNotations is a map of Notation Data names to bools, which controls - // the notation names that are allowed to be present in critical Notation Data - // signature subpackets. - KnownNotations map[string]bool - // SignatureNotations is a list of Notations to be added to any signatures. - SignatureNotations []*Notation - // CheckIntendedRecipients controls, whether the OpenPGP Intended Recipient Fingerprint feature - // should be enabled for encryption and decryption. - // (See https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-12.html#name-intended-recipient-fingerpr). - // When the flag is set, encryption produces Intended Recipient Fingerprint signature sub-packets and decryption - // checks whether the key it was encrypted to is one of the included fingerprints in the signature. - // If the flag is disabled, no Intended Recipient Fingerprint sub-packets are created or checked. - // The default behavior, when the config or flag is nil, is to enable the feature. - CheckIntendedRecipients *bool - // CacheSessionKey controls if decryption should return the session key used for decryption. - // If the flag is set, the session key is cached in the message details struct. - CacheSessionKey bool - // CheckPacketSequence is a flag that controls if the pgp message reader should strictly check - // that the packet sequence conforms with the grammar mandated by rfc4880. - // The default behavior, when the config or flag is nil, is to check the packet sequence. - CheckPacketSequence *bool - // NonDeterministicSignaturesViaNotation is a flag to enable randomization of signatures. - // If true, a salt notation is used to randomize signatures generated by v4 and v5 keys - // (v6 signatures are always non-deterministic, by design). - // This protects EdDSA signatures from potentially leaking the secret key in case of faults (i.e. bitflips) which, in principle, could occur - // during the signing computation. It is added to signatures of any algo for simplicity, and as it may also serve as protection in case of - // weaknesses in the hash algo, potentially hindering e.g. some chosen-prefix attacks. - // The default behavior, when the config or flag is nil, is to enable the feature. - NonDeterministicSignaturesViaNotation *bool - - // InsecureAllowAllKeyFlagsWhenMissing determines how a key without valid key flags is handled. - // When set to true, a key without flags is treated as if all flags are enabled. - // This behavior is consistent with GPG. - InsecureAllowAllKeyFlagsWhenMissing bool -} - -func (c *Config) Random() io.Reader { - if c == nil || c.Rand == nil { - return rand.Reader - } - return c.Rand -} - -func (c *Config) Hash() crypto.Hash { - if c == nil || uint(c.DefaultHash) == 0 { - return crypto.SHA256 - } - return c.DefaultHash -} - -func (c *Config) Cipher() CipherFunction { - if c == nil || uint8(c.DefaultCipher) == 0 { - return CipherAES128 - } - return c.DefaultCipher -} - -func (c *Config) Now() time.Time { - if c == nil || c.Time == nil { - return time.Now().Truncate(time.Second) - } - return c.Time().Truncate(time.Second) -} - -// KeyLifetime returns the validity period of the key. -func (c *Config) KeyLifetime() uint32 { - if c == nil { - return 0 - } - return c.KeyLifetimeSecs -} - -// SigLifetime returns the validity period of the signature. -func (c *Config) SigLifetime() uint32 { - if c == nil { - return 0 - } - return c.SigLifetimeSecs -} - -func (c *Config) Compression() CompressionAlgo { - if c == nil { - return CompressionNone - } - return c.DefaultCompressionAlgo -} - -func (c *Config) RSAModulusBits() int { - if c == nil || c.RSABits == 0 { - return 2048 - } - return c.RSABits -} - -func (c *Config) PublicKeyAlgorithm() PublicKeyAlgorithm { - if c == nil || c.Algorithm == 0 { - return PubKeyAlgoRSA - } - return c.Algorithm -} - -func (c *Config) CurveName() Curve { - if c == nil || c.Curve == "" { - return Curve25519 - } - return c.Curve -} - -// Deprecated: The hash iterations should now be queried via the S2K() method. -func (c *Config) PasswordHashIterations() int { - if c == nil || c.S2KCount == 0 { - return 0 - } - return c.S2KCount -} - -func (c *Config) S2K() *s2k.Config { - if c == nil { - return nil - } - // for backwards compatibility - if c.S2KCount > 0 && c.S2KConfig == nil { - return &s2k.Config{ - S2KCount: c.S2KCount, - } - } - return c.S2KConfig -} - -func (c *Config) AEAD() *AEADConfig { - if c == nil { - return nil - } - return c.AEADConfig -} - -func (c *Config) SigningKey() uint64 { - if c == nil { - return 0 - } - return c.SigningKeyId -} - -func (c *Config) SigningUserId() string { - if c == nil { - return "" - } - return c.SigningIdentity -} - -func (c *Config) AllowUnauthenticatedMessages() bool { - if c == nil { - return false - } - return c.InsecureAllowUnauthenticatedMessages -} - -func (c *Config) AllowDecryptionWithSigningKeys() bool { - if c == nil { - return false - } - return c.InsecureAllowDecryptionWithSigningKeys -} - -func (c *Config) KnownNotation(notationName string) bool { - if c == nil { - return false - } - return c.KnownNotations[notationName] -} - -func (c *Config) Notations() []*Notation { - if c == nil { - return nil - } - return c.SignatureNotations -} - -func (c *Config) V6() bool { - if c == nil { - return false - } - return c.V6Keys -} - -func (c *Config) IntendedRecipients() bool { - if c == nil || c.CheckIntendedRecipients == nil { - return true - } - return *c.CheckIntendedRecipients -} - -func (c *Config) RetrieveSessionKey() bool { - if c == nil { - return false - } - return c.CacheSessionKey -} - -func (c *Config) MinimumRSABits() uint16 { - if c == nil || c.MinRSABits == 0 { - return 2047 - } - return c.MinRSABits -} - -func (c *Config) RejectPublicKeyAlgorithm(alg PublicKeyAlgorithm) bool { - var rejectedAlgorithms map[PublicKeyAlgorithm]bool - if c == nil || c.RejectPublicKeyAlgorithms == nil { - // Default - rejectedAlgorithms = defaultRejectPublicKeyAlgorithms - } else { - rejectedAlgorithms = c.RejectPublicKeyAlgorithms - } - return rejectedAlgorithms[alg] -} - -func (c *Config) RejectHashAlgorithm(hash crypto.Hash) bool { - var rejectedAlgorithms map[crypto.Hash]bool - if c == nil || c.RejectHashAlgorithms == nil { - // Default - rejectedAlgorithms = defaultRejectHashAlgorithms - } else { - rejectedAlgorithms = c.RejectHashAlgorithms - } - return rejectedAlgorithms[hash] -} - -func (c *Config) RejectMessageHashAlgorithm(hash crypto.Hash) bool { - var rejectedAlgorithms map[crypto.Hash]bool - if c == nil || c.RejectMessageHashAlgorithms == nil { - // Default - rejectedAlgorithms = defaultRejectMessageHashAlgorithms - } else { - rejectedAlgorithms = c.RejectMessageHashAlgorithms - } - return rejectedAlgorithms[hash] -} - -func (c *Config) RejectCurve(curve Curve) bool { - var rejectedCurve map[Curve]bool - if c == nil || c.RejectCurves == nil { - // Default - rejectedCurve = defaultRejectCurves - } else { - rejectedCurve = c.RejectCurves - } - return rejectedCurve[curve] -} - -func (c *Config) StrictPacketSequence() bool { - if c == nil || c.CheckPacketSequence == nil { - return true - } - return *c.CheckPacketSequence -} - -func (c *Config) RandomizeSignaturesViaNotation() bool { - if c == nil || c.NonDeterministicSignaturesViaNotation == nil { - return true - } - return *c.NonDeterministicSignaturesViaNotation -} - -func (c *Config) AllowAllKeyFlagsWhenMissing() bool { - if c == nil { - return false - } - return c.InsecureAllowAllKeyFlagsWhenMissing -} - -// BoolPointer is a helper function to set a boolean pointer in the Config. -// e.g., config.CheckPacketSequence = BoolPointer(true) -func BoolPointer(value bool) *bool { - return &value -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config_v5.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config_v5.go deleted file mode 100644 index f2415906b..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config_v5.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build !v5 - -package packet - -func init() { - V5Disabled = true -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/encrypted_key.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/encrypted_key.go deleted file mode 100644 index b90bb2891..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/encrypted_key.go +++ /dev/null @@ -1,584 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "bytes" - "crypto" - "crypto/rsa" - "encoding/binary" - "encoding/hex" - "io" - "math/big" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/ecdh" - "github.com/ProtonMail/go-crypto/openpgp/elgamal" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/encoding" - "github.com/ProtonMail/go-crypto/openpgp/x25519" - "github.com/ProtonMail/go-crypto/openpgp/x448" -) - -// EncryptedKey represents a public-key encrypted session key. See RFC 4880, -// section 5.1. -type EncryptedKey struct { - Version int - KeyId uint64 - KeyVersion int // v6 - KeyFingerprint []byte // v6 - Algo PublicKeyAlgorithm - CipherFunc CipherFunction // only valid after a successful Decrypt for a v3 packet - Key []byte // only valid after a successful Decrypt - - encryptedMPI1, encryptedMPI2 encoding.Field - ephemeralPublicX25519 *x25519.PublicKey // used for x25519 - ephemeralPublicX448 *x448.PublicKey // used for x448 - encryptedSession []byte // used for x25519 and x448 -} - -func (e *EncryptedKey) parse(r io.Reader) (err error) { - var buf [8]byte - _, err = readFull(r, buf[:versionSize]) - if err != nil { - return - } - e.Version = int(buf[0]) - if e.Version != 3 && e.Version != 6 { - return errors.UnsupportedError("unknown EncryptedKey version " + strconv.Itoa(int(buf[0]))) - } - if e.Version == 6 { - //Read a one-octet size of the following two fields. - if _, err = readFull(r, buf[:1]); err != nil { - return - } - // The size may also be zero, and the key version and - // fingerprint omitted for an "anonymous recipient" - if buf[0] != 0 { - // non-anonymous case - _, err = readFull(r, buf[:versionSize]) - if err != nil { - return - } - e.KeyVersion = int(buf[0]) - if e.KeyVersion != 4 && e.KeyVersion != 6 { - return errors.UnsupportedError("unknown public key version " + strconv.Itoa(e.KeyVersion)) - } - var fingerprint []byte - if e.KeyVersion == 6 { - fingerprint = make([]byte, fingerprintSizeV6) - } else if e.KeyVersion == 4 { - fingerprint = make([]byte, fingerprintSize) - } - _, err = readFull(r, fingerprint) - if err != nil { - return - } - e.KeyFingerprint = fingerprint - if e.KeyVersion == 6 { - e.KeyId = binary.BigEndian.Uint64(e.KeyFingerprint[:keyIdSize]) - } else if e.KeyVersion == 4 { - e.KeyId = binary.BigEndian.Uint64(e.KeyFingerprint[fingerprintSize-keyIdSize : fingerprintSize]) - } - } - } else { - _, err = readFull(r, buf[:8]) - if err != nil { - return - } - e.KeyId = binary.BigEndian.Uint64(buf[:keyIdSize]) - } - - _, err = readFull(r, buf[:1]) - if err != nil { - return - } - e.Algo = PublicKeyAlgorithm(buf[0]) - var cipherFunction byte - switch e.Algo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly: - e.encryptedMPI1 = new(encoding.MPI) - if _, err = e.encryptedMPI1.ReadFrom(r); err != nil { - return - } - case PubKeyAlgoElGamal: - e.encryptedMPI1 = new(encoding.MPI) - if _, err = e.encryptedMPI1.ReadFrom(r); err != nil { - return - } - - e.encryptedMPI2 = new(encoding.MPI) - if _, err = e.encryptedMPI2.ReadFrom(r); err != nil { - return - } - case PubKeyAlgoECDH: - e.encryptedMPI1 = new(encoding.MPI) - if _, err = e.encryptedMPI1.ReadFrom(r); err != nil { - return - } - - e.encryptedMPI2 = new(encoding.OID) - if _, err = e.encryptedMPI2.ReadFrom(r); err != nil { - return - } - case PubKeyAlgoX25519: - e.ephemeralPublicX25519, e.encryptedSession, cipherFunction, err = x25519.DecodeFields(r, e.Version == 6) - if err != nil { - return - } - case PubKeyAlgoX448: - e.ephemeralPublicX448, e.encryptedSession, cipherFunction, err = x448.DecodeFields(r, e.Version == 6) - if err != nil { - return - } - } - if e.Version < 6 { - switch e.Algo { - case PubKeyAlgoX25519, PubKeyAlgoX448: - e.CipherFunc = CipherFunction(cipherFunction) - // Check for validiy is in the Decrypt method - } - } - - _, err = consumeAll(r) - return -} - -// Decrypt decrypts an encrypted session key with the given private key. The -// private key must have been decrypted first. -// If config is nil, sensible defaults will be used. -func (e *EncryptedKey) Decrypt(priv *PrivateKey, config *Config) error { - if e.Version < 6 && e.KeyId != 0 && e.KeyId != priv.KeyId { - return errors.InvalidArgumentError("cannot decrypt encrypted session key for key id " + strconv.FormatUint(e.KeyId, 16) + " with private key id " + strconv.FormatUint(priv.KeyId, 16)) - } - if e.Version == 6 && e.KeyVersion != 0 && !bytes.Equal(e.KeyFingerprint, priv.Fingerprint) { - return errors.InvalidArgumentError("cannot decrypt encrypted session key for key fingerprint " + hex.EncodeToString(e.KeyFingerprint) + " with private key fingerprint " + hex.EncodeToString(priv.Fingerprint)) - } - if e.Algo != priv.PubKeyAlgo { - return errors.InvalidArgumentError("cannot decrypt encrypted session key of type " + strconv.Itoa(int(e.Algo)) + " with private key of type " + strconv.Itoa(int(priv.PubKeyAlgo))) - } - if priv.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - - var err error - var b []byte - - // TODO(agl): use session key decryption routines here to avoid - // padding oracle attacks. - switch priv.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly: - // Supports both *rsa.PrivateKey and crypto.Decrypter - k := priv.PrivateKey.(crypto.Decrypter) - b, err = k.Decrypt(config.Random(), padToKeySize(k.Public().(*rsa.PublicKey), e.encryptedMPI1.Bytes()), nil) - case PubKeyAlgoElGamal: - c1 := new(big.Int).SetBytes(e.encryptedMPI1.Bytes()) - c2 := new(big.Int).SetBytes(e.encryptedMPI2.Bytes()) - b, err = elgamal.Decrypt(priv.PrivateKey.(*elgamal.PrivateKey), c1, c2) - case PubKeyAlgoECDH: - vsG := e.encryptedMPI1.Bytes() - m := e.encryptedMPI2.Bytes() - oid := priv.PublicKey.oid.EncodedBytes() - fp := priv.PublicKey.Fingerprint[:] - if priv.PublicKey.Version == 5 { - // For v5 the, the fingerprint must be restricted to 20 bytes - fp = fp[:20] - } - b, err = ecdh.Decrypt(priv.PrivateKey.(*ecdh.PrivateKey), vsG, m, oid, fp) - case PubKeyAlgoX25519: - b, err = x25519.Decrypt(priv.PrivateKey.(*x25519.PrivateKey), e.ephemeralPublicX25519, e.encryptedSession) - case PubKeyAlgoX448: - b, err = x448.Decrypt(priv.PrivateKey.(*x448.PrivateKey), e.ephemeralPublicX448, e.encryptedSession) - default: - err = errors.InvalidArgumentError("cannot decrypt encrypted session key with private key of type " + strconv.Itoa(int(priv.PubKeyAlgo))) - } - if err != nil { - return err - } - - var key []byte - switch priv.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoElGamal, PubKeyAlgoECDH: - keyOffset := 0 - if e.Version < 6 { - e.CipherFunc = CipherFunction(b[0]) - keyOffset = 1 - if !e.CipherFunc.IsSupported() { - return errors.UnsupportedError("unsupported encryption function") - } - } - key, err = decodeChecksumKey(b[keyOffset:]) - if err != nil { - return err - } - case PubKeyAlgoX25519, PubKeyAlgoX448: - if e.Version < 6 { - switch e.CipherFunc { - case CipherAES128, CipherAES192, CipherAES256: - break - default: - return errors.StructuralError("v3 PKESK mandates AES as cipher function for x25519 and x448") - } - } - key = b[:] - default: - return errors.UnsupportedError("unsupported algorithm for decryption") - } - e.Key = key - return nil -} - -// Serialize writes the encrypted key packet, e, to w. -func (e *EncryptedKey) Serialize(w io.Writer) error { - var encodedLength int - switch e.Algo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly: - encodedLength = int(e.encryptedMPI1.EncodedLength()) - case PubKeyAlgoElGamal: - encodedLength = int(e.encryptedMPI1.EncodedLength()) + int(e.encryptedMPI2.EncodedLength()) - case PubKeyAlgoECDH: - encodedLength = int(e.encryptedMPI1.EncodedLength()) + int(e.encryptedMPI2.EncodedLength()) - case PubKeyAlgoX25519: - encodedLength = x25519.EncodedFieldsLength(e.encryptedSession, e.Version == 6) - case PubKeyAlgoX448: - encodedLength = x448.EncodedFieldsLength(e.encryptedSession, e.Version == 6) - default: - return errors.InvalidArgumentError("don't know how to serialize encrypted key type " + strconv.Itoa(int(e.Algo))) - } - - packetLen := versionSize /* version */ + keyIdSize /* key id */ + algorithmSize /* algo */ + encodedLength - if e.Version == 6 { - packetLen = versionSize /* version */ + algorithmSize /* algo */ + encodedLength + keyVersionSize /* key version */ - if e.KeyVersion == 6 { - packetLen += fingerprintSizeV6 - } else if e.KeyVersion == 4 { - packetLen += fingerprintSize - } - } - - err := serializeHeader(w, packetTypeEncryptedKey, packetLen) - if err != nil { - return err - } - - _, err = w.Write([]byte{byte(e.Version)}) - if err != nil { - return err - } - if e.Version == 6 { - _, err = w.Write([]byte{byte(e.KeyVersion)}) - if err != nil { - return err - } - // The key version number may also be zero, - // and the fingerprint omitted - if e.KeyVersion != 0 { - _, err = w.Write(e.KeyFingerprint) - if err != nil { - return err - } - } - } else { - // Write KeyID - err = binary.Write(w, binary.BigEndian, e.KeyId) - if err != nil { - return err - } - } - _, err = w.Write([]byte{byte(e.Algo)}) - if err != nil { - return err - } - - switch e.Algo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly: - _, err := w.Write(e.encryptedMPI1.EncodedBytes()) - return err - case PubKeyAlgoElGamal: - if _, err := w.Write(e.encryptedMPI1.EncodedBytes()); err != nil { - return err - } - _, err := w.Write(e.encryptedMPI2.EncodedBytes()) - return err - case PubKeyAlgoECDH: - if _, err := w.Write(e.encryptedMPI1.EncodedBytes()); err != nil { - return err - } - _, err := w.Write(e.encryptedMPI2.EncodedBytes()) - return err - case PubKeyAlgoX25519: - err := x25519.EncodeFields(w, e.ephemeralPublicX25519, e.encryptedSession, byte(e.CipherFunc), e.Version == 6) - return err - case PubKeyAlgoX448: - err := x448.EncodeFields(w, e.ephemeralPublicX448, e.encryptedSession, byte(e.CipherFunc), e.Version == 6) - return err - default: - panic("internal error") - } -} - -// SerializeEncryptedKeyAEAD serializes an encrypted key packet to w that contains -// key, encrypted to pub. -// If aeadSupported is set, PKESK v6 is used, otherwise v3. -// Note: aeadSupported MUST match the value passed to SerializeSymmetricallyEncrypted. -// If config is nil, sensible defaults will be used. -func SerializeEncryptedKeyAEAD(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, aeadSupported bool, key []byte, config *Config) error { - return SerializeEncryptedKeyAEADwithHiddenOption(w, pub, cipherFunc, aeadSupported, key, false, config) -} - -// SerializeEncryptedKeyAEADwithHiddenOption serializes an encrypted key packet to w that contains -// key, encrypted to pub. -// Offers the hidden flag option to indicated if the PKESK packet should include a wildcard KeyID. -// If aeadSupported is set, PKESK v6 is used, otherwise v3. -// Note: aeadSupported MUST match the value passed to SerializeSymmetricallyEncrypted. -// If config is nil, sensible defaults will be used. -func SerializeEncryptedKeyAEADwithHiddenOption(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, aeadSupported bool, key []byte, hidden bool, config *Config) error { - var buf [36]byte // max possible header size is v6 - lenHeaderWritten := versionSize - version := 3 - - if aeadSupported { - version = 6 - } - // An implementation MUST NOT generate ElGamal v6 PKESKs. - if version == 6 && pub.PubKeyAlgo == PubKeyAlgoElGamal { - return errors.InvalidArgumentError("ElGamal v6 PKESK are not allowed") - } - // In v3 PKESKs, for x25519 and x448, mandate using AES - if version == 3 && (pub.PubKeyAlgo == PubKeyAlgoX25519 || pub.PubKeyAlgo == PubKeyAlgoX448) { - switch cipherFunc { - case CipherAES128, CipherAES192, CipherAES256: - break - default: - return errors.InvalidArgumentError("v3 PKESK mandates AES for x25519 and x448") - } - } - - buf[0] = byte(version) - - // If hidden is set, the key should be hidden - // An implementation MAY accept or use a Key ID of all zeros, - // or a key version of zero and no key fingerprint, to hide the intended decryption key. - // See Section 5.1.8. in the open pgp crypto refresh - if version == 6 { - if !hidden { - // A one-octet size of the following two fields. - buf[1] = byte(keyVersionSize + len(pub.Fingerprint)) - // A one octet key version number. - buf[2] = byte(pub.Version) - lenHeaderWritten += keyVersionSize + 1 - // The fingerprint of the public key - copy(buf[lenHeaderWritten:lenHeaderWritten+len(pub.Fingerprint)], pub.Fingerprint) - lenHeaderWritten += len(pub.Fingerprint) - } else { - // The size may also be zero, and the key version - // and fingerprint omitted for an "anonymous recipient" - buf[1] = 0 - lenHeaderWritten += 1 - } - } else { - if !hidden { - binary.BigEndian.PutUint64(buf[versionSize:(versionSize+keyIdSize)], pub.KeyId) - } - lenHeaderWritten += keyIdSize - } - buf[lenHeaderWritten] = byte(pub.PubKeyAlgo) - lenHeaderWritten += algorithmSize - - var keyBlock []byte - switch pub.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoElGamal, PubKeyAlgoECDH: - lenKeyBlock := len(key) + 2 - if version < 6 { - lenKeyBlock += 1 // cipher type included - } - keyBlock = make([]byte, lenKeyBlock) - keyOffset := 0 - if version < 6 { - keyBlock[0] = byte(cipherFunc) - keyOffset = 1 - } - encodeChecksumKey(keyBlock[keyOffset:], key) - case PubKeyAlgoX25519, PubKeyAlgoX448: - // algorithm is added in plaintext below - keyBlock = key - } - - switch pub.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly: - return serializeEncryptedKeyRSA(w, config.Random(), buf[:lenHeaderWritten], pub.PublicKey.(*rsa.PublicKey), keyBlock) - case PubKeyAlgoElGamal: - return serializeEncryptedKeyElGamal(w, config.Random(), buf[:lenHeaderWritten], pub.PublicKey.(*elgamal.PublicKey), keyBlock) - case PubKeyAlgoECDH: - return serializeEncryptedKeyECDH(w, config.Random(), buf[:lenHeaderWritten], pub.PublicKey.(*ecdh.PublicKey), keyBlock, pub.oid, pub.Fingerprint) - case PubKeyAlgoX25519: - return serializeEncryptedKeyX25519(w, config.Random(), buf[:lenHeaderWritten], pub.PublicKey.(*x25519.PublicKey), keyBlock, byte(cipherFunc), version) - case PubKeyAlgoX448: - return serializeEncryptedKeyX448(w, config.Random(), buf[:lenHeaderWritten], pub.PublicKey.(*x448.PublicKey), keyBlock, byte(cipherFunc), version) - case PubKeyAlgoDSA, PubKeyAlgoRSASignOnly: - return errors.InvalidArgumentError("cannot encrypt to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo))) - } - - return errors.UnsupportedError("encrypting a key to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo))) -} - -// SerializeEncryptedKey serializes an encrypted key packet to w that contains -// key, encrypted to pub. -// PKESKv6 is used if config.AEAD() is not nil. -// If config is nil, sensible defaults will be used. -// Deprecated: Use SerializeEncryptedKeyAEAD instead. -func SerializeEncryptedKey(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, key []byte, config *Config) error { - return SerializeEncryptedKeyAEAD(w, pub, cipherFunc, config.AEAD() != nil, key, config) -} - -// SerializeEncryptedKeyWithHiddenOption serializes an encrypted key packet to w that contains -// key, encrypted to pub. PKESKv6 is used if config.AEAD() is not nil. -// The hidden option controls if the packet should be anonymous, i.e., omit key metadata. -// If config is nil, sensible defaults will be used. -// Deprecated: Use SerializeEncryptedKeyAEADwithHiddenOption instead. -func SerializeEncryptedKeyWithHiddenOption(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, key []byte, hidden bool, config *Config) error { - return SerializeEncryptedKeyAEADwithHiddenOption(w, pub, cipherFunc, config.AEAD() != nil, key, hidden, config) -} - -func serializeEncryptedKeyRSA(w io.Writer, rand io.Reader, header []byte, pub *rsa.PublicKey, keyBlock []byte) error { - cipherText, err := rsa.EncryptPKCS1v15(rand, pub, keyBlock) - if err != nil { - return errors.InvalidArgumentError("RSA encryption failed: " + err.Error()) - } - - cipherMPI := encoding.NewMPI(cipherText) - packetLen := len(header) /* header length */ + int(cipherMPI.EncodedLength()) - - err = serializeHeader(w, packetTypeEncryptedKey, packetLen) - if err != nil { - return err - } - _, err = w.Write(header[:]) - if err != nil { - return err - } - _, err = w.Write(cipherMPI.EncodedBytes()) - return err -} - -func serializeEncryptedKeyElGamal(w io.Writer, rand io.Reader, header []byte, pub *elgamal.PublicKey, keyBlock []byte) error { - c1, c2, err := elgamal.Encrypt(rand, pub, keyBlock) - if err != nil { - return errors.InvalidArgumentError("ElGamal encryption failed: " + err.Error()) - } - - packetLen := len(header) /* header length */ - packetLen += 2 /* mpi size */ + (c1.BitLen()+7)/8 - packetLen += 2 /* mpi size */ + (c2.BitLen()+7)/8 - - err = serializeHeader(w, packetTypeEncryptedKey, packetLen) - if err != nil { - return err - } - _, err = w.Write(header[:]) - if err != nil { - return err - } - if _, err = w.Write(new(encoding.MPI).SetBig(c1).EncodedBytes()); err != nil { - return err - } - _, err = w.Write(new(encoding.MPI).SetBig(c2).EncodedBytes()) - return err -} - -func serializeEncryptedKeyECDH(w io.Writer, rand io.Reader, header []byte, pub *ecdh.PublicKey, keyBlock []byte, oid encoding.Field, fingerprint []byte) error { - vsG, c, err := ecdh.Encrypt(rand, pub, keyBlock, oid.EncodedBytes(), fingerprint) - if err != nil { - return errors.InvalidArgumentError("ECDH encryption failed: " + err.Error()) - } - - g := encoding.NewMPI(vsG) - m := encoding.NewOID(c) - - packetLen := len(header) /* header length */ - packetLen += int(g.EncodedLength()) + int(m.EncodedLength()) - - err = serializeHeader(w, packetTypeEncryptedKey, packetLen) - if err != nil { - return err - } - - _, err = w.Write(header[:]) - if err != nil { - return err - } - if _, err = w.Write(g.EncodedBytes()); err != nil { - return err - } - _, err = w.Write(m.EncodedBytes()) - return err -} - -func serializeEncryptedKeyX25519(w io.Writer, rand io.Reader, header []byte, pub *x25519.PublicKey, keyBlock []byte, cipherFunc byte, version int) error { - ephemeralPublicX25519, ciphertext, err := x25519.Encrypt(rand, pub, keyBlock) - if err != nil { - return errors.InvalidArgumentError("x25519 encryption failed: " + err.Error()) - } - - packetLen := len(header) /* header length */ - packetLen += x25519.EncodedFieldsLength(ciphertext, version == 6) - - err = serializeHeader(w, packetTypeEncryptedKey, packetLen) - if err != nil { - return err - } - - _, err = w.Write(header[:]) - if err != nil { - return err - } - return x25519.EncodeFields(w, ephemeralPublicX25519, ciphertext, cipherFunc, version == 6) -} - -func serializeEncryptedKeyX448(w io.Writer, rand io.Reader, header []byte, pub *x448.PublicKey, keyBlock []byte, cipherFunc byte, version int) error { - ephemeralPublicX448, ciphertext, err := x448.Encrypt(rand, pub, keyBlock) - if err != nil { - return errors.InvalidArgumentError("x448 encryption failed: " + err.Error()) - } - - packetLen := len(header) /* header length */ - packetLen += x448.EncodedFieldsLength(ciphertext, version == 6) - - err = serializeHeader(w, packetTypeEncryptedKey, packetLen) - if err != nil { - return err - } - - _, err = w.Write(header[:]) - if err != nil { - return err - } - return x448.EncodeFields(w, ephemeralPublicX448, ciphertext, cipherFunc, version == 6) -} - -func checksumKeyMaterial(key []byte) uint16 { - var checksum uint16 - for _, v := range key { - checksum += uint16(v) - } - return checksum -} - -func decodeChecksumKey(msg []byte) (key []byte, err error) { - key = msg[:len(msg)-2] - expectedChecksum := uint16(msg[len(msg)-2])<<8 | uint16(msg[len(msg)-1]) - checksum := checksumKeyMaterial(key) - if checksum != expectedChecksum { - err = errors.StructuralError("session key checksum is incorrect") - } - return -} - -func encodeChecksumKey(buffer []byte, key []byte) { - copy(buffer, key) - checksum := checksumKeyMaterial(key) - buffer[len(key)] = byte(checksum >> 8) - buffer[len(key)+1] = byte(checksum) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/literal.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/literal.go deleted file mode 100644 index 8a028c8a1..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/literal.go +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "encoding/binary" - "io" -) - -// LiteralData represents an encrypted file. See RFC 4880, section 5.9. -type LiteralData struct { - Format uint8 - IsBinary bool - FileName string - Time uint32 // Unix epoch time. Either creation time or modification time. 0 means undefined. - Body io.Reader -} - -// ForEyesOnly returns whether the contents of the LiteralData have been marked -// as especially sensitive. -func (l *LiteralData) ForEyesOnly() bool { - return l.FileName == "_CONSOLE" -} - -func (l *LiteralData) parse(r io.Reader) (err error) { - var buf [256]byte - - _, err = readFull(r, buf[:2]) - if err != nil { - return - } - - l.Format = buf[0] - l.IsBinary = l.Format == 'b' - fileNameLen := int(buf[1]) - - _, err = readFull(r, buf[:fileNameLen]) - if err != nil { - return - } - - l.FileName = string(buf[:fileNameLen]) - - _, err = readFull(r, buf[:4]) - if err != nil { - return - } - - l.Time = binary.BigEndian.Uint32(buf[:4]) - l.Body = r - return -} - -// SerializeLiteral serializes a literal data packet to w and returns a -// WriteCloser to which the data itself can be written and which MUST be closed -// on completion. The fileName is truncated to 255 bytes. -func SerializeLiteral(w io.WriteCloser, isBinary bool, fileName string, time uint32) (plaintext io.WriteCloser, err error) { - var buf [4]byte - buf[0] = 'b' - if !isBinary { - buf[0] = 'u' - } - if len(fileName) > 255 { - fileName = fileName[:255] - } - buf[1] = byte(len(fileName)) - - inner, err := serializeStreamHeader(w, packetTypeLiteralData) - if err != nil { - return - } - - _, err = inner.Write(buf[:2]) - if err != nil { - return - } - _, err = inner.Write([]byte(fileName)) - if err != nil { - return - } - binary.BigEndian.PutUint32(buf[:], time) - _, err = inner.Write(buf[:]) - if err != nil { - return - } - - plaintext = inner - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/marker.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/marker.go deleted file mode 100644 index 1ee378ba3..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/marker.go +++ /dev/null @@ -1,33 +0,0 @@ -package packet - -import ( - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -type Marker struct{} - -const markerString = "PGP" - -// parse just checks if the packet contains "PGP". -func (m *Marker) parse(reader io.Reader) error { - var buffer [3]byte - if _, err := io.ReadFull(reader, buffer[:]); err != nil { - return err - } - if string(buffer[:]) != markerString { - return errors.StructuralError("invalid marker packet") - } - return nil -} - -// SerializeMarker writes a marker packet to writer. -func SerializeMarker(writer io.Writer) error { - err := serializeHeader(writer, packetTypeMarker, len(markerString)) - if err != nil { - return err - } - _, err = writer.Write([]byte(markerString)) - return err -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/notation.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/notation.go deleted file mode 100644 index 2c3e3f50b..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/notation.go +++ /dev/null @@ -1,29 +0,0 @@ -package packet - -// Notation type represents a Notation Data subpacket -// see https://tools.ietf.org/html/rfc4880#section-5.2.3.16 -type Notation struct { - Name string - Value []byte - IsCritical bool - IsHumanReadable bool -} - -func (notation *Notation) getData() []byte { - nameData := []byte(notation.Name) - nameLen := len(nameData) - valueLen := len(notation.Value) - - data := make([]byte, 8+nameLen+valueLen) - if notation.IsHumanReadable { - data[0] = 0x80 - } - - data[4] = byte(nameLen >> 8) - data[5] = byte(nameLen) - data[6] = byte(valueLen >> 8) - data[7] = byte(valueLen) - copy(data[8:8+nameLen], nameData) - copy(data[8+nameLen:], notation.Value) - return data -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/ocfb.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/ocfb.go deleted file mode 100644 index 4f26d0a00..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/ocfb.go +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright 2010 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// OpenPGP CFB Mode. http://tools.ietf.org/html/rfc4880#section-13.9 - -package packet - -import ( - "crypto/cipher" -) - -type ocfbEncrypter struct { - b cipher.Block - fre []byte - outUsed int -} - -// An OCFBResyncOption determines if the "resynchronization step" of OCFB is -// performed. -type OCFBResyncOption bool - -const ( - OCFBResync OCFBResyncOption = true - OCFBNoResync OCFBResyncOption = false -) - -// NewOCFBEncrypter returns a cipher.Stream which encrypts data with OpenPGP's -// cipher feedback mode using the given cipher.Block, and an initial amount of -// ciphertext. randData must be random bytes and be the same length as the -// cipher.Block's block size. Resync determines if the "resynchronization step" -// from RFC 4880, 13.9 step 7 is performed. Different parts of OpenPGP vary on -// this point. -func NewOCFBEncrypter(block cipher.Block, randData []byte, resync OCFBResyncOption) (cipher.Stream, []byte) { - blockSize := block.BlockSize() - if len(randData) != blockSize { - return nil, nil - } - - x := &ocfbEncrypter{ - b: block, - fre: make([]byte, blockSize), - outUsed: 0, - } - prefix := make([]byte, blockSize+2) - - block.Encrypt(x.fre, x.fre) - for i := 0; i < blockSize; i++ { - prefix[i] = randData[i] ^ x.fre[i] - } - - block.Encrypt(x.fre, prefix[:blockSize]) - prefix[blockSize] = x.fre[0] ^ randData[blockSize-2] - prefix[blockSize+1] = x.fre[1] ^ randData[blockSize-1] - - if resync { - block.Encrypt(x.fre, prefix[2:]) - } else { - x.fre[0] = prefix[blockSize] - x.fre[1] = prefix[blockSize+1] - x.outUsed = 2 - } - return x, prefix -} - -func (x *ocfbEncrypter) XORKeyStream(dst, src []byte) { - for i := 0; i < len(src); i++ { - if x.outUsed == len(x.fre) { - x.b.Encrypt(x.fre, x.fre) - x.outUsed = 0 - } - - x.fre[x.outUsed] ^= src[i] - dst[i] = x.fre[x.outUsed] - x.outUsed++ - } -} - -type ocfbDecrypter struct { - b cipher.Block - fre []byte - outUsed int -} - -// NewOCFBDecrypter returns a cipher.Stream which decrypts data with OpenPGP's -// cipher feedback mode using the given cipher.Block. Prefix must be the first -// blockSize + 2 bytes of the ciphertext, where blockSize is the cipher.Block's -// block size. On successful exit, blockSize+2 bytes of decrypted data are written into -// prefix. Resync determines if the "resynchronization step" from RFC 4880, -// 13.9 step 7 is performed. Different parts of OpenPGP vary on this point. -func NewOCFBDecrypter(block cipher.Block, prefix []byte, resync OCFBResyncOption) cipher.Stream { - blockSize := block.BlockSize() - if len(prefix) != blockSize+2 { - return nil - } - - x := &ocfbDecrypter{ - b: block, - fre: make([]byte, blockSize), - outUsed: 0, - } - prefixCopy := make([]byte, len(prefix)) - copy(prefixCopy, prefix) - - block.Encrypt(x.fre, x.fre) - for i := 0; i < blockSize; i++ { - prefixCopy[i] ^= x.fre[i] - } - - block.Encrypt(x.fre, prefix[:blockSize]) - prefixCopy[blockSize] ^= x.fre[0] - prefixCopy[blockSize+1] ^= x.fre[1] - - if resync { - block.Encrypt(x.fre, prefix[2:]) - } else { - x.fre[0] = prefix[blockSize] - x.fre[1] = prefix[blockSize+1] - x.outUsed = 2 - } - copy(prefix, prefixCopy) - return x -} - -func (x *ocfbDecrypter) XORKeyStream(dst, src []byte) { - for i := 0; i < len(src); i++ { - if x.outUsed == len(x.fre) { - x.b.Encrypt(x.fre, x.fre) - x.outUsed = 0 - } - - c := src[i] - dst[i] = x.fre[x.outUsed] ^ src[i] - x.fre[x.outUsed] = c - x.outUsed++ - } -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/one_pass_signature.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/one_pass_signature.go deleted file mode 100644 index f393c4063..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/one_pass_signature.go +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "crypto" - "encoding/binary" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" -) - -// OnePassSignature represents a one-pass signature packet. See RFC 4880, -// section 5.4. -type OnePassSignature struct { - Version int - SigType SignatureType - Hash crypto.Hash - PubKeyAlgo PublicKeyAlgorithm - KeyId uint64 - IsLast bool - Salt []byte // v6 only - KeyFingerprint []byte // v6 only -} - -func (ops *OnePassSignature) parse(r io.Reader) (err error) { - var buf [8]byte - // Read: version | signature type | hash algorithm | public-key algorithm - _, err = readFull(r, buf[:4]) - if err != nil { - return - } - if buf[0] != 3 && buf[0] != 6 { - return errors.UnsupportedError("one-pass-signature packet version " + strconv.Itoa(int(buf[0]))) - } - ops.Version = int(buf[0]) - - var ok bool - ops.Hash, ok = algorithm.HashIdToHashWithSha1(buf[2]) - if !ok { - return errors.UnsupportedError("hash function: " + strconv.Itoa(int(buf[2]))) - } - - ops.SigType = SignatureType(buf[1]) - ops.PubKeyAlgo = PublicKeyAlgorithm(buf[3]) - - if ops.Version == 6 { - // Only for v6, a variable-length field containing the salt - _, err = readFull(r, buf[:1]) - if err != nil { - return - } - saltLength := int(buf[0]) - var expectedSaltLength int - expectedSaltLength, err = SaltLengthForHash(ops.Hash) - if err != nil { - return - } - if saltLength != expectedSaltLength { - err = errors.StructuralError("unexpected salt size for the given hash algorithm") - return - } - salt := make([]byte, expectedSaltLength) - _, err = readFull(r, salt) - if err != nil { - return - } - ops.Salt = salt - - // Only for v6 packets, 32 octets of the fingerprint of the signing key. - fingerprint := make([]byte, 32) - _, err = readFull(r, fingerprint) - if err != nil { - return - } - ops.KeyFingerprint = fingerprint - ops.KeyId = binary.BigEndian.Uint64(ops.KeyFingerprint[:8]) - } else { - _, err = readFull(r, buf[:8]) - if err != nil { - return - } - ops.KeyId = binary.BigEndian.Uint64(buf[:8]) - } - - _, err = readFull(r, buf[:1]) - if err != nil { - return - } - ops.IsLast = buf[0] != 0 - return -} - -// Serialize marshals the given OnePassSignature to w. -func (ops *OnePassSignature) Serialize(w io.Writer) error { - //v3 length 1+1+1+1+8+1 = - packetLength := 13 - if ops.Version == 6 { - // v6 length 1+1+1+1+1+len(salt)+32+1 = - packetLength = 38 + len(ops.Salt) - } - - if err := serializeHeader(w, packetTypeOnePassSignature, packetLength); err != nil { - return err - } - - var buf [8]byte - buf[0] = byte(ops.Version) - buf[1] = uint8(ops.SigType) - var ok bool - buf[2], ok = algorithm.HashToHashIdWithSha1(ops.Hash) - if !ok { - return errors.UnsupportedError("hash type: " + strconv.Itoa(int(ops.Hash))) - } - buf[3] = uint8(ops.PubKeyAlgo) - - _, err := w.Write(buf[:4]) - if err != nil { - return err - } - - if ops.Version == 6 { - // write salt for v6 signatures - _, err := w.Write([]byte{uint8(len(ops.Salt))}) - if err != nil { - return err - } - _, err = w.Write(ops.Salt) - if err != nil { - return err - } - - // write fingerprint v6 signatures - _, err = w.Write(ops.KeyFingerprint) - if err != nil { - return err - } - } else { - binary.BigEndian.PutUint64(buf[:8], ops.KeyId) - _, err := w.Write(buf[:8]) - if err != nil { - return err - } - } - - isLast := []byte{byte(0)} - if ops.IsLast { - isLast[0] = 1 - } - - _, err = w.Write(isLast) - return err -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/opaque.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/opaque.go deleted file mode 100644 index cef7c661d..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/opaque.go +++ /dev/null @@ -1,170 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "bytes" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// OpaquePacket represents an OpenPGP packet as raw, unparsed data. This is -// useful for splitting and storing the original packet contents separately, -// handling unsupported packet types or accessing parts of the packet not yet -// implemented by this package. -type OpaquePacket struct { - // Packet type - Tag uint8 - // Reason why the packet was parsed opaquely - Reason error - // Binary contents of the packet data - Contents []byte -} - -func (op *OpaquePacket) parse(r io.Reader) (err error) { - op.Contents, err = io.ReadAll(r) - return -} - -// Serialize marshals the packet to a writer in its original form, including -// the packet header. -func (op *OpaquePacket) Serialize(w io.Writer) (err error) { - err = serializeHeader(w, packetType(op.Tag), len(op.Contents)) - if err == nil { - _, err = w.Write(op.Contents) - } - return -} - -// Parse attempts to parse the opaque contents into a structure supported by -// this package. If the packet is not known then the result will be another -// OpaquePacket. -func (op *OpaquePacket) Parse() (p Packet, err error) { - hdr := bytes.NewBuffer(nil) - err = serializeHeader(hdr, packetType(op.Tag), len(op.Contents)) - if err != nil { - op.Reason = err - return op, err - } - p, err = Read(io.MultiReader(hdr, bytes.NewBuffer(op.Contents))) - if err != nil { - op.Reason = err - p = op - } - return -} - -// OpaqueReader reads OpaquePackets from an io.Reader. -type OpaqueReader struct { - r io.Reader -} - -func NewOpaqueReader(r io.Reader) *OpaqueReader { - return &OpaqueReader{r: r} -} - -// Read the next OpaquePacket. -func (or *OpaqueReader) Next() (op *OpaquePacket, err error) { - tag, _, contents, err := readHeader(or.r) - if err != nil { - return - } - op = &OpaquePacket{Tag: uint8(tag), Reason: err} - err = op.parse(contents) - if err != nil { - consumeAll(contents) - } - return -} - -// OpaqueSubpacket represents an unparsed OpenPGP subpacket, -// as found in signature and user attribute packets. -type OpaqueSubpacket struct { - SubType uint8 - EncodedLength []byte // Store the original encoded length for signature verifications. - Contents []byte -} - -// OpaqueSubpackets extracts opaque, unparsed OpenPGP subpackets from -// their byte representation. -func OpaqueSubpackets(contents []byte) (result []*OpaqueSubpacket, err error) { - var ( - subHeaderLen int - subPacket *OpaqueSubpacket - ) - for len(contents) > 0 { - subHeaderLen, subPacket, err = nextSubpacket(contents) - if err != nil { - break - } - result = append(result, subPacket) - contents = contents[subHeaderLen+len(subPacket.Contents):] - } - return -} - -func nextSubpacket(contents []byte) (subHeaderLen int, subPacket *OpaqueSubpacket, err error) { - // RFC 4880, section 5.2.3.1 - var subLen uint32 - var encodedLength []byte - if len(contents) < 1 { - goto Truncated - } - subPacket = &OpaqueSubpacket{} - switch { - case contents[0] < 192: - subHeaderLen = 2 // 1 length byte, 1 subtype byte - if len(contents) < subHeaderLen { - goto Truncated - } - encodedLength = contents[0:1] - subLen = uint32(contents[0]) - contents = contents[1:] - case contents[0] < 255: - subHeaderLen = 3 // 2 length bytes, 1 subtype - if len(contents) < subHeaderLen { - goto Truncated - } - encodedLength = contents[0:2] - subLen = uint32(contents[0]-192)<<8 + uint32(contents[1]) + 192 - contents = contents[2:] - default: - subHeaderLen = 6 // 5 length bytes, 1 subtype - if len(contents) < subHeaderLen { - goto Truncated - } - encodedLength = contents[0:5] - subLen = uint32(contents[1])<<24 | - uint32(contents[2])<<16 | - uint32(contents[3])<<8 | - uint32(contents[4]) - contents = contents[5:] - - } - if subLen > uint32(len(contents)) || subLen == 0 { - goto Truncated - } - subPacket.SubType = contents[0] - subPacket.EncodedLength = encodedLength - subPacket.Contents = contents[1:subLen] - return -Truncated: - err = errors.StructuralError("subpacket truncated") - return -} - -func (osp *OpaqueSubpacket) Serialize(w io.Writer) (err error) { - buf := make([]byte, 6) - copy(buf, osp.EncodedLength) - n := len(osp.EncodedLength) - - buf[n] = osp.SubType - if _, err = w.Write(buf[:n+1]); err != nil { - return - } - _, err = w.Write(osp.Contents) - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet.go deleted file mode 100644 index 1e92e22c9..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet.go +++ /dev/null @@ -1,675 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package packet implements parsing and serialization of OpenPGP packets, as -// specified in RFC 4880. -package packet // import "github.com/ProtonMail/go-crypto/openpgp/packet" - -import ( - "bytes" - "crypto/cipher" - "crypto/rsa" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" -) - -// readFull is the same as io.ReadFull except that reading zero bytes returns -// ErrUnexpectedEOF rather than EOF. -func readFull(r io.Reader, buf []byte) (n int, err error) { - n, err = io.ReadFull(r, buf) - if err == io.EOF { - err = io.ErrUnexpectedEOF - } - return -} - -// readLength reads an OpenPGP length from r. See RFC 4880, section 4.2.2. -func readLength(r io.Reader) (length int64, isPartial bool, err error) { - var buf [4]byte - _, err = readFull(r, buf[:1]) - if err != nil { - return - } - switch { - case buf[0] < 192: - length = int64(buf[0]) - case buf[0] < 224: - length = int64(buf[0]-192) << 8 - _, err = readFull(r, buf[0:1]) - if err != nil { - return - } - length += int64(buf[0]) + 192 - case buf[0] < 255: - length = int64(1) << (buf[0] & 0x1f) - isPartial = true - default: - _, err = readFull(r, buf[0:4]) - if err != nil { - return - } - length = int64(buf[0])<<24 | - int64(buf[1])<<16 | - int64(buf[2])<<8 | - int64(buf[3]) - } - return -} - -// partialLengthReader wraps an io.Reader and handles OpenPGP partial lengths. -// The continuation lengths are parsed and removed from the stream and EOF is -// returned at the end of the packet. See RFC 4880, section 4.2.2.4. -type partialLengthReader struct { - r io.Reader - remaining int64 - isPartial bool -} - -func (r *partialLengthReader) Read(p []byte) (n int, err error) { - for r.remaining == 0 { - if !r.isPartial { - return 0, io.EOF - } - r.remaining, r.isPartial, err = readLength(r.r) - if err != nil { - return 0, err - } - } - - toRead := int64(len(p)) - if toRead > r.remaining { - toRead = r.remaining - } - - n, err = r.r.Read(p[:int(toRead)]) - r.remaining -= int64(n) - if n < int(toRead) && err == io.EOF { - err = io.ErrUnexpectedEOF - } - return -} - -// partialLengthWriter writes a stream of data using OpenPGP partial lengths. -// See RFC 4880, section 4.2.2.4. -type partialLengthWriter struct { - w io.WriteCloser - buf bytes.Buffer - lengthByte [1]byte -} - -func (w *partialLengthWriter) Write(p []byte) (n int, err error) { - bufLen := w.buf.Len() - if bufLen > 512 { - for power := uint(30); ; power-- { - l := 1 << power - if bufLen >= l { - w.lengthByte[0] = 224 + uint8(power) - _, err = w.w.Write(w.lengthByte[:]) - if err != nil { - return - } - var m int - m, err = w.w.Write(w.buf.Next(l)) - if err != nil { - return - } - if m != l { - return 0, io.ErrShortWrite - } - break - } - } - } - return w.buf.Write(p) -} - -func (w *partialLengthWriter) Close() (err error) { - len := w.buf.Len() - err = serializeLength(w.w, len) - if err != nil { - return err - } - _, err = w.buf.WriteTo(w.w) - if err != nil { - return err - } - return w.w.Close() -} - -// A spanReader is an io.LimitReader, but it returns ErrUnexpectedEOF if the -// underlying Reader returns EOF before the limit has been reached. -type spanReader struct { - r io.Reader - n int64 -} - -func (l *spanReader) Read(p []byte) (n int, err error) { - if l.n <= 0 { - return 0, io.EOF - } - if int64(len(p)) > l.n { - p = p[0:l.n] - } - n, err = l.r.Read(p) - l.n -= int64(n) - if l.n > 0 && err == io.EOF { - err = io.ErrUnexpectedEOF - } - return -} - -// readHeader parses a packet header and returns an io.Reader which will return -// the contents of the packet. See RFC 4880, section 4.2. -func readHeader(r io.Reader) (tag packetType, length int64, contents io.Reader, err error) { - var buf [4]byte - _, err = io.ReadFull(r, buf[:1]) - if err != nil { - return - } - if buf[0]&0x80 == 0 { - err = errors.StructuralError("tag byte does not have MSB set") - return - } - if buf[0]&0x40 == 0 { - // Old format packet - tag = packetType((buf[0] & 0x3f) >> 2) - lengthType := buf[0] & 3 - if lengthType == 3 { - length = -1 - contents = r - return - } - lengthBytes := 1 << lengthType - _, err = readFull(r, buf[0:lengthBytes]) - if err != nil { - return - } - for i := 0; i < lengthBytes; i++ { - length <<= 8 - length |= int64(buf[i]) - } - contents = &spanReader{r, length} - return - } - - // New format packet - tag = packetType(buf[0] & 0x3f) - length, isPartial, err := readLength(r) - if err != nil { - return - } - if isPartial { - contents = &partialLengthReader{ - remaining: length, - isPartial: true, - r: r, - } - length = -1 - } else { - contents = &spanReader{r, length} - } - return -} - -// serializeHeader writes an OpenPGP packet header to w. See RFC 4880, section -// 4.2. -func serializeHeader(w io.Writer, ptype packetType, length int) (err error) { - err = serializeType(w, ptype) - if err != nil { - return - } - return serializeLength(w, length) -} - -// serializeType writes an OpenPGP packet type to w. See RFC 4880, section -// 4.2. -func serializeType(w io.Writer, ptype packetType) (err error) { - var buf [1]byte - buf[0] = 0x80 | 0x40 | byte(ptype) - _, err = w.Write(buf[:]) - return -} - -// serializeLength writes an OpenPGP packet length to w. See RFC 4880, section -// 4.2.2. -func serializeLength(w io.Writer, length int) (err error) { - var buf [5]byte - var n int - - if length < 192 { - buf[0] = byte(length) - n = 1 - } else if length < 8384 { - length -= 192 - buf[0] = 192 + byte(length>>8) - buf[1] = byte(length) - n = 2 - } else { - buf[0] = 255 - buf[1] = byte(length >> 24) - buf[2] = byte(length >> 16) - buf[3] = byte(length >> 8) - buf[4] = byte(length) - n = 5 - } - - _, err = w.Write(buf[:n]) - return -} - -// serializeStreamHeader writes an OpenPGP packet header to w where the -// length of the packet is unknown. It returns a io.WriteCloser which can be -// used to write the contents of the packet. See RFC 4880, section 4.2. -func serializeStreamHeader(w io.WriteCloser, ptype packetType) (out io.WriteCloser, err error) { - err = serializeType(w, ptype) - if err != nil { - return - } - out = &partialLengthWriter{w: w} - return -} - -// Packet represents an OpenPGP packet. Users are expected to try casting -// instances of this interface to specific packet types. -type Packet interface { - parse(io.Reader) error -} - -// consumeAll reads from the given Reader until error, returning the number of -// bytes read. -func consumeAll(r io.Reader) (n int64, err error) { - var m int - var buf [1024]byte - - for { - m, err = r.Read(buf[:]) - n += int64(m) - if err == io.EOF { - err = nil - return - } - if err != nil { - return - } - } -} - -// packetType represents the numeric ids of the different OpenPGP packet types. See -// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-2 -type packetType uint8 - -const ( - packetTypeEncryptedKey packetType = 1 - packetTypeSignature packetType = 2 - packetTypeSymmetricKeyEncrypted packetType = 3 - packetTypeOnePassSignature packetType = 4 - packetTypePrivateKey packetType = 5 - packetTypePublicKey packetType = 6 - packetTypePrivateSubkey packetType = 7 - packetTypeCompressed packetType = 8 - packetTypeSymmetricallyEncrypted packetType = 9 - packetTypeMarker packetType = 10 - packetTypeLiteralData packetType = 11 - packetTypeTrust packetType = 12 - packetTypeUserId packetType = 13 - packetTypePublicSubkey packetType = 14 - packetTypeUserAttribute packetType = 17 - packetTypeSymmetricallyEncryptedIntegrityProtected packetType = 18 - packetTypeAEADEncrypted packetType = 20 - packetPadding packetType = 21 -) - -// EncryptedDataPacket holds encrypted data. It is currently implemented by -// SymmetricallyEncrypted and AEADEncrypted. -type EncryptedDataPacket interface { - Decrypt(CipherFunction, []byte) (io.ReadCloser, error) -} - -// Read reads a single OpenPGP packet from the given io.Reader. If there is an -// error parsing a packet, the whole packet is consumed from the input. -func Read(r io.Reader) (p Packet, err error) { - tag, len, contents, err := readHeader(r) - if err != nil { - return - } - - switch tag { - case packetTypeEncryptedKey: - p = new(EncryptedKey) - case packetTypeSignature: - p = new(Signature) - case packetTypeSymmetricKeyEncrypted: - p = new(SymmetricKeyEncrypted) - case packetTypeOnePassSignature: - p = new(OnePassSignature) - case packetTypePrivateKey, packetTypePrivateSubkey: - pk := new(PrivateKey) - if tag == packetTypePrivateSubkey { - pk.IsSubkey = true - } - p = pk - case packetTypePublicKey, packetTypePublicSubkey: - isSubkey := tag == packetTypePublicSubkey - p = &PublicKey{IsSubkey: isSubkey} - case packetTypeCompressed: - p = new(Compressed) - case packetTypeSymmetricallyEncrypted: - p = new(SymmetricallyEncrypted) - case packetTypeLiteralData: - p = new(LiteralData) - case packetTypeUserId: - p = new(UserId) - case packetTypeUserAttribute: - p = new(UserAttribute) - case packetTypeSymmetricallyEncryptedIntegrityProtected: - se := new(SymmetricallyEncrypted) - se.IntegrityProtected = true - p = se - case packetTypeAEADEncrypted: - p = new(AEADEncrypted) - case packetPadding: - p = Padding(len) - case packetTypeMarker: - p = new(Marker) - case packetTypeTrust: - // Not implemented, just consume - err = errors.UnknownPacketTypeError(tag) - default: - // Packet Tags from 0 to 39 are critical. - // Packet Tags from 40 to 63 are non-critical. - if tag < 40 { - err = errors.CriticalUnknownPacketTypeError(tag) - } else { - err = errors.UnknownPacketTypeError(tag) - } - } - if p != nil { - err = p.parse(contents) - } - if err != nil { - consumeAll(contents) - } - return -} - -// ReadWithCheck reads a single OpenPGP message packet from the given io.Reader. If there is an -// error parsing a packet, the whole packet is consumed from the input. -// ReadWithCheck additionally checks if the OpenPGP message packet sequence adheres -// to the packet composition rules in rfc4880, if not throws an error. -func ReadWithCheck(r io.Reader, sequence *SequenceVerifier) (p Packet, msgErr error, err error) { - tag, len, contents, err := readHeader(r) - if err != nil { - return - } - switch tag { - case packetTypeEncryptedKey: - msgErr = sequence.Next(ESKSymbol) - p = new(EncryptedKey) - case packetTypeSignature: - msgErr = sequence.Next(SigSymbol) - p = new(Signature) - case packetTypeSymmetricKeyEncrypted: - msgErr = sequence.Next(ESKSymbol) - p = new(SymmetricKeyEncrypted) - case packetTypeOnePassSignature: - msgErr = sequence.Next(OPSSymbol) - p = new(OnePassSignature) - case packetTypeCompressed: - msgErr = sequence.Next(CompSymbol) - p = new(Compressed) - case packetTypeSymmetricallyEncrypted: - msgErr = sequence.Next(EncSymbol) - p = new(SymmetricallyEncrypted) - case packetTypeLiteralData: - msgErr = sequence.Next(LDSymbol) - p = new(LiteralData) - case packetTypeSymmetricallyEncryptedIntegrityProtected: - msgErr = sequence.Next(EncSymbol) - se := new(SymmetricallyEncrypted) - se.IntegrityProtected = true - p = se - case packetTypeAEADEncrypted: - msgErr = sequence.Next(EncSymbol) - p = new(AEADEncrypted) - case packetPadding: - p = Padding(len) - case packetTypeMarker: - p = new(Marker) - case packetTypeTrust: - // Not implemented, just consume - err = errors.UnknownPacketTypeError(tag) - case packetTypePrivateKey, - packetTypePrivateSubkey, - packetTypePublicKey, - packetTypePublicSubkey, - packetTypeUserId, - packetTypeUserAttribute: - msgErr = sequence.Next(UnknownSymbol) - consumeAll(contents) - default: - // Packet Tags from 0 to 39 are critical. - // Packet Tags from 40 to 63 are non-critical. - if tag < 40 { - err = errors.CriticalUnknownPacketTypeError(tag) - } else { - err = errors.UnknownPacketTypeError(tag) - } - } - if p != nil { - err = p.parse(contents) - } - if err != nil { - consumeAll(contents) - } - return -} - -// SignatureType represents the different semantic meanings of an OpenPGP -// signature. See RFC 4880, section 5.2.1. -type SignatureType uint8 - -const ( - SigTypeBinary SignatureType = 0x00 - SigTypeText SignatureType = 0x01 - SigTypeGenericCert SignatureType = 0x10 - SigTypePersonaCert SignatureType = 0x11 - SigTypeCasualCert SignatureType = 0x12 - SigTypePositiveCert SignatureType = 0x13 - SigTypeSubkeyBinding SignatureType = 0x18 - SigTypePrimaryKeyBinding SignatureType = 0x19 - SigTypeDirectSignature SignatureType = 0x1F - SigTypeKeyRevocation SignatureType = 0x20 - SigTypeSubkeyRevocation SignatureType = 0x28 - SigTypeCertificationRevocation SignatureType = 0x30 -) - -// PublicKeyAlgorithm represents the different public key system specified for -// OpenPGP. See -// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-12 -type PublicKeyAlgorithm uint8 - -const ( - PubKeyAlgoRSA PublicKeyAlgorithm = 1 - PubKeyAlgoElGamal PublicKeyAlgorithm = 16 - PubKeyAlgoDSA PublicKeyAlgorithm = 17 - // RFC 6637, Section 5. - PubKeyAlgoECDH PublicKeyAlgorithm = 18 - PubKeyAlgoECDSA PublicKeyAlgorithm = 19 - // https://www.ietf.org/archive/id/draft-koch-eddsa-for-openpgp-04.txt - PubKeyAlgoEdDSA PublicKeyAlgorithm = 22 - // https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh - PubKeyAlgoX25519 PublicKeyAlgorithm = 25 - PubKeyAlgoX448 PublicKeyAlgorithm = 26 - PubKeyAlgoEd25519 PublicKeyAlgorithm = 27 - PubKeyAlgoEd448 PublicKeyAlgorithm = 28 - - // Deprecated in RFC 4880, Section 13.5. Use key flags instead. - PubKeyAlgoRSAEncryptOnly PublicKeyAlgorithm = 2 - PubKeyAlgoRSASignOnly PublicKeyAlgorithm = 3 -) - -// CanEncrypt returns true if it's possible to encrypt a message to a public -// key of the given type. -func (pka PublicKeyAlgorithm) CanEncrypt() bool { - switch pka { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoElGamal, PubKeyAlgoECDH, PubKeyAlgoX25519, PubKeyAlgoX448: - return true - } - return false -} - -// CanSign returns true if it's possible for a public key of the given type to -// sign a message. -func (pka PublicKeyAlgorithm) CanSign() bool { - switch pka { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA, PubKeyAlgoECDSA, PubKeyAlgoEdDSA, PubKeyAlgoEd25519, PubKeyAlgoEd448: - return true - } - return false -} - -// CipherFunction represents the different block ciphers specified for OpenPGP. See -// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-13 -type CipherFunction algorithm.CipherFunction - -const ( - Cipher3DES CipherFunction = 2 - CipherCAST5 CipherFunction = 3 - CipherAES128 CipherFunction = 7 - CipherAES192 CipherFunction = 8 - CipherAES256 CipherFunction = 9 -) - -// KeySize returns the key size, in bytes, of cipher. -func (cipher CipherFunction) KeySize() int { - return algorithm.CipherFunction(cipher).KeySize() -} - -// IsSupported returns true if the cipher is supported from the library -func (cipher CipherFunction) IsSupported() bool { - return algorithm.CipherFunction(cipher).KeySize() > 0 -} - -// blockSize returns the block size, in bytes, of cipher. -func (cipher CipherFunction) blockSize() int { - return algorithm.CipherFunction(cipher).BlockSize() -} - -// new returns a fresh instance of the given cipher. -func (cipher CipherFunction) new(key []byte) (block cipher.Block) { - return algorithm.CipherFunction(cipher).New(key) -} - -// padToKeySize left-pads a MPI with zeroes to match the length of the -// specified RSA public. -func padToKeySize(pub *rsa.PublicKey, b []byte) []byte { - k := (pub.N.BitLen() + 7) / 8 - if len(b) >= k { - return b - } - bb := make([]byte, k) - copy(bb[len(bb)-len(b):], b) - return bb -} - -// CompressionAlgo Represents the different compression algorithms -// supported by OpenPGP (except for BZIP2, which is not currently -// supported). See Section 9.3 of RFC 4880. -type CompressionAlgo uint8 - -const ( - CompressionNone CompressionAlgo = 0 - CompressionZIP CompressionAlgo = 1 - CompressionZLIB CompressionAlgo = 2 -) - -// AEADMode represents the different Authenticated Encryption with Associated -// Data specified for OpenPGP. -// See https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-9.6 -type AEADMode algorithm.AEADMode - -const ( - AEADModeEAX AEADMode = 1 - AEADModeOCB AEADMode = 2 - AEADModeGCM AEADMode = 3 -) - -func (mode AEADMode) IvLength() int { - return algorithm.AEADMode(mode).NonceLength() -} - -func (mode AEADMode) TagLength() int { - return algorithm.AEADMode(mode).TagLength() -} - -// IsSupported returns true if the aead mode is supported from the library -func (mode AEADMode) IsSupported() bool { - return algorithm.AEADMode(mode).TagLength() > 0 -} - -// new returns a fresh instance of the given mode. -func (mode AEADMode) new(block cipher.Block) cipher.AEAD { - return algorithm.AEADMode(mode).New(block) -} - -// ReasonForRevocation represents a revocation reason code as per RFC4880 -// section 5.2.3.23. -type ReasonForRevocation uint8 - -const ( - NoReason ReasonForRevocation = 0 - KeySuperseded ReasonForRevocation = 1 - KeyCompromised ReasonForRevocation = 2 - KeyRetired ReasonForRevocation = 3 - UserIDNotValid ReasonForRevocation = 32 - Unknown ReasonForRevocation = 200 -) - -func NewReasonForRevocation(value byte) ReasonForRevocation { - if value < 4 || value == 32 { - return ReasonForRevocation(value) - } - return Unknown -} - -// Curve is a mapping to supported ECC curves for key generation. -// See https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-06.html#name-curve-specific-wire-formats -type Curve string - -const ( - Curve25519 Curve = "Curve25519" - Curve448 Curve = "Curve448" - CurveNistP256 Curve = "P256" - CurveNistP384 Curve = "P384" - CurveNistP521 Curve = "P521" - CurveSecP256k1 Curve = "SecP256k1" - CurveBrainpoolP256 Curve = "BrainpoolP256" - CurveBrainpoolP384 Curve = "BrainpoolP384" - CurveBrainpoolP512 Curve = "BrainpoolP512" -) - -// TrustLevel represents a trust level per RFC4880 5.2.3.13 -type TrustLevel uint8 - -// TrustAmount represents a trust amount per RFC4880 5.2.3.13 -type TrustAmount uint8 - -const ( - // versionSize is the length in bytes of the version value. - versionSize = 1 - // algorithmSize is the length in bytes of the key algorithm value. - algorithmSize = 1 - // keyVersionSize is the length in bytes of the key version value - keyVersionSize = 1 - // keyIdSize is the length in bytes of the key identifier value. - keyIdSize = 8 - // timestampSize is the length in bytes of encoded timestamps. - timestampSize = 4 - // fingerprintSizeV6 is the length in bytes of the key fingerprint in v6. - fingerprintSizeV6 = 32 - // fingerprintSize is the length in bytes of the key fingerprint. - fingerprintSize = 20 -) diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet_sequence.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet_sequence.go deleted file mode 100644 index 55a8a56c2..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet_sequence.go +++ /dev/null @@ -1,222 +0,0 @@ -package packet - -// This file implements the pushdown automata (PDA) from PGPainless (Paul Schaub) -// to verify pgp packet sequences. See Paul's blogpost for more details: -// https://blog.jabberhead.tk/2022/10/26/implementing-packet-sequence-validation-using-pushdown-automata/ -import ( - "fmt" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -func NewErrMalformedMessage(from State, input InputSymbol, stackSymbol StackSymbol) errors.ErrMalformedMessage { - return errors.ErrMalformedMessage(fmt.Sprintf("state %d, input symbol %d, stack symbol %d ", from, input, stackSymbol)) -} - -// InputSymbol defines the input alphabet of the PDA -type InputSymbol uint8 - -const ( - LDSymbol InputSymbol = iota - SigSymbol - OPSSymbol - CompSymbol - ESKSymbol - EncSymbol - EOSSymbol - UnknownSymbol -) - -// StackSymbol defines the stack alphabet of the PDA -type StackSymbol int8 - -const ( - MsgStackSymbol StackSymbol = iota - OpsStackSymbol - KeyStackSymbol - EndStackSymbol - EmptyStackSymbol -) - -// State defines the states of the PDA -type State int8 - -const ( - OpenPGPMessage State = iota - ESKMessage - LiteralMessage - CompressedMessage - EncryptedMessage - ValidMessage -) - -// transition represents a state transition in the PDA -type transition func(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) - -// SequenceVerifier is a pushdown automata to verify -// PGP messages packet sequences according to rfc4880. -type SequenceVerifier struct { - stack []StackSymbol - state State -} - -// Next performs a state transition with the given input symbol. -// If the transition fails a ErrMalformedMessage is returned. -func (sv *SequenceVerifier) Next(input InputSymbol) error { - for { - stackSymbol := sv.popStack() - transitionFunc := getTransition(sv.state) - nextState, newStackSymbols, redo, err := transitionFunc(input, stackSymbol) - if err != nil { - return err - } - if redo { - sv.pushStack(stackSymbol) - } - for _, newStackSymbol := range newStackSymbols { - sv.pushStack(newStackSymbol) - } - sv.state = nextState - if !redo { - break - } - } - return nil -} - -// Valid returns true if RDA is in a valid state. -func (sv *SequenceVerifier) Valid() bool { - return sv.state == ValidMessage && len(sv.stack) == 0 -} - -func (sv *SequenceVerifier) AssertValid() error { - if !sv.Valid() { - return errors.ErrMalformedMessage("invalid message") - } - return nil -} - -func NewSequenceVerifier() *SequenceVerifier { - return &SequenceVerifier{ - stack: []StackSymbol{EndStackSymbol, MsgStackSymbol}, - state: OpenPGPMessage, - } -} - -func (sv *SequenceVerifier) popStack() StackSymbol { - if len(sv.stack) == 0 { - return EmptyStackSymbol - } - elemIndex := len(sv.stack) - 1 - stackSymbol := sv.stack[elemIndex] - sv.stack = sv.stack[:elemIndex] - return stackSymbol -} - -func (sv *SequenceVerifier) pushStack(stackSymbol StackSymbol) { - sv.stack = append(sv.stack, stackSymbol) -} - -func getTransition(from State) transition { - switch from { - case OpenPGPMessage: - return fromOpenPGPMessage - case LiteralMessage: - return fromLiteralMessage - case CompressedMessage: - return fromCompressedMessage - case EncryptedMessage: - return fromEncryptedMessage - case ESKMessage: - return fromESKMessage - case ValidMessage: - return fromValidMessage - } - return nil -} - -// fromOpenPGPMessage is the transition for the state OpenPGPMessage. -func fromOpenPGPMessage(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) { - if stackSymbol != MsgStackSymbol { - return 0, nil, false, NewErrMalformedMessage(OpenPGPMessage, input, stackSymbol) - } - switch input { - case LDSymbol: - return LiteralMessage, nil, false, nil - case SigSymbol: - return OpenPGPMessage, []StackSymbol{MsgStackSymbol}, false, nil - case OPSSymbol: - return OpenPGPMessage, []StackSymbol{OpsStackSymbol, MsgStackSymbol}, false, nil - case CompSymbol: - return CompressedMessage, nil, false, nil - case ESKSymbol: - return ESKMessage, []StackSymbol{KeyStackSymbol}, false, nil - case EncSymbol: - return EncryptedMessage, nil, false, nil - } - return 0, nil, false, NewErrMalformedMessage(OpenPGPMessage, input, stackSymbol) -} - -// fromESKMessage is the transition for the state ESKMessage. -func fromESKMessage(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) { - if stackSymbol != KeyStackSymbol { - return 0, nil, false, NewErrMalformedMessage(ESKMessage, input, stackSymbol) - } - switch input { - case ESKSymbol: - return ESKMessage, []StackSymbol{KeyStackSymbol}, false, nil - case EncSymbol: - return EncryptedMessage, nil, false, nil - } - return 0, nil, false, NewErrMalformedMessage(ESKMessage, input, stackSymbol) -} - -// fromLiteralMessage is the transition for the state LiteralMessage. -func fromLiteralMessage(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) { - switch input { - case SigSymbol: - if stackSymbol == OpsStackSymbol { - return LiteralMessage, nil, false, nil - } - case EOSSymbol: - if stackSymbol == EndStackSymbol { - return ValidMessage, nil, false, nil - } - } - return 0, nil, false, NewErrMalformedMessage(LiteralMessage, input, stackSymbol) -} - -// fromLiteralMessage is the transition for the state CompressedMessage. -func fromCompressedMessage(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) { - switch input { - case SigSymbol: - if stackSymbol == OpsStackSymbol { - return CompressedMessage, nil, false, nil - } - case EOSSymbol: - if stackSymbol == EndStackSymbol { - return ValidMessage, nil, false, nil - } - } - return OpenPGPMessage, []StackSymbol{MsgStackSymbol}, true, nil -} - -// fromEncryptedMessage is the transition for the state EncryptedMessage. -func fromEncryptedMessage(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) { - switch input { - case SigSymbol: - if stackSymbol == OpsStackSymbol { - return EncryptedMessage, nil, false, nil - } - case EOSSymbol: - if stackSymbol == EndStackSymbol { - return ValidMessage, nil, false, nil - } - } - return OpenPGPMessage, []StackSymbol{MsgStackSymbol}, true, nil -} - -// fromValidMessage is the transition for the state ValidMessage. -func fromValidMessage(input InputSymbol, stackSymbol StackSymbol) (State, []StackSymbol, bool, error) { - return 0, nil, false, NewErrMalformedMessage(ValidMessage, input, stackSymbol) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet_unsupported.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet_unsupported.go deleted file mode 100644 index 2d714723c..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/packet_unsupported.go +++ /dev/null @@ -1,24 +0,0 @@ -package packet - -import ( - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// UnsupportedPackage represents a OpenPGP packet with a known packet type -// but with unsupported content. -type UnsupportedPacket struct { - IncompletePacket Packet - Error errors.UnsupportedError -} - -// Implements the Packet interface -func (up *UnsupportedPacket) parse(read io.Reader) error { - err := up.IncompletePacket.parse(read) - if castedErr, ok := err.(errors.UnsupportedError); ok { - up.Error = castedErr - return nil - } - return err -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/padding.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/padding.go deleted file mode 100644 index 3b6a7045d..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/padding.go +++ /dev/null @@ -1,26 +0,0 @@ -package packet - -import ( - "io" -) - -// Padding type represents a Padding Packet (Tag 21). -// The padding type is represented by the length of its padding. -// see https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh#name-padding-packet-tag-21 -type Padding int - -// parse just ignores the padding content. -func (pad Padding) parse(reader io.Reader) error { - _, err := io.CopyN(io.Discard, reader, int64(pad)) - return err -} - -// SerializePadding writes the padding to writer. -func (pad Padding) SerializePadding(writer io.Writer, rand io.Reader) error { - err := serializeHeader(writer, packetPadding, int(pad)) - if err != nil { - return err - } - _, err = io.CopyN(writer, rand, int64(pad)) - return err -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/private_key.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/private_key.go deleted file mode 100644 index f04e6c6b8..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/private_key.go +++ /dev/null @@ -1,1191 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "bytes" - "crypto" - "crypto/cipher" - "crypto/dsa" - "crypto/rsa" - "crypto/sha1" - "crypto/sha256" - "crypto/subtle" - "fmt" - "io" - "math/big" - "strconv" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/ecdh" - "github.com/ProtonMail/go-crypto/openpgp/ecdsa" - "github.com/ProtonMail/go-crypto/openpgp/ed25519" - "github.com/ProtonMail/go-crypto/openpgp/ed448" - "github.com/ProtonMail/go-crypto/openpgp/eddsa" - "github.com/ProtonMail/go-crypto/openpgp/elgamal" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/encoding" - "github.com/ProtonMail/go-crypto/openpgp/s2k" - "github.com/ProtonMail/go-crypto/openpgp/x25519" - "github.com/ProtonMail/go-crypto/openpgp/x448" - "golang.org/x/crypto/hkdf" -) - -// PrivateKey represents a possibly encrypted private key. See RFC 4880, -// section 5.5.3. -type PrivateKey struct { - PublicKey - Encrypted bool // if true then the private key is unavailable until Decrypt has been called. - encryptedData []byte - cipher CipherFunction - s2k func(out, in []byte) - aead AEADMode // only relevant if S2KAEAD is enabled - // An *{rsa|dsa|elgamal|ecdh|ecdsa|ed25519|ed448}.PrivateKey or - // crypto.Signer/crypto.Decrypter (Decryptor RSA only). - PrivateKey interface{} - iv []byte - - // Type of encryption of the S2K packet - // Allowed values are 0 (Not encrypted), 253 (AEAD), 254 (SHA1), or - // 255 (2-byte checksum) - s2kType S2KType - // Full parameters of the S2K packet - s2kParams *s2k.Params -} - -// S2KType s2k packet type -type S2KType uint8 - -const ( - // S2KNON unencrypt - S2KNON S2KType = 0 - // S2KAEAD use authenticated encryption - S2KAEAD S2KType = 253 - // S2KSHA1 sha1 sum check - S2KSHA1 S2KType = 254 - // S2KCHECKSUM sum check - S2KCHECKSUM S2KType = 255 -) - -func NewRSAPrivateKey(creationTime time.Time, priv *rsa.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewRSAPublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewDSAPrivateKey(creationTime time.Time, priv *dsa.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewDSAPublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewElGamalPrivateKey(creationTime time.Time, priv *elgamal.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewElGamalPublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewECDSAPrivateKey(creationTime time.Time, priv *ecdsa.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewECDSAPublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewEdDSAPrivateKey(creationTime time.Time, priv *eddsa.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewEdDSAPublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewECDHPrivateKey(creationTime time.Time, priv *ecdh.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewECDHPublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewX25519PrivateKey(creationTime time.Time, priv *x25519.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewX25519PublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewX448PrivateKey(creationTime time.Time, priv *x448.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewX448PublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewEd25519PrivateKey(creationTime time.Time, priv *ed25519.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewEd25519PublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -func NewEd448PrivateKey(creationTime time.Time, priv *ed448.PrivateKey) *PrivateKey { - pk := new(PrivateKey) - pk.PublicKey = *NewEd448PublicKey(creationTime, &priv.PublicKey) - pk.PrivateKey = priv - return pk -} - -// NewSignerPrivateKey creates a PrivateKey from a crypto.Signer that -// implements RSA, ECDSA or EdDSA. -func NewSignerPrivateKey(creationTime time.Time, signer interface{}) *PrivateKey { - pk := new(PrivateKey) - // In general, the public Keys should be used as pointers. We still - // type-switch on the values, for backwards-compatibility. - switch pubkey := signer.(type) { - case *rsa.PrivateKey: - pk.PublicKey = *NewRSAPublicKey(creationTime, &pubkey.PublicKey) - case rsa.PrivateKey: - pk.PublicKey = *NewRSAPublicKey(creationTime, &pubkey.PublicKey) - case *ecdsa.PrivateKey: - pk.PublicKey = *NewECDSAPublicKey(creationTime, &pubkey.PublicKey) - case ecdsa.PrivateKey: - pk.PublicKey = *NewECDSAPublicKey(creationTime, &pubkey.PublicKey) - case *eddsa.PrivateKey: - pk.PublicKey = *NewEdDSAPublicKey(creationTime, &pubkey.PublicKey) - case eddsa.PrivateKey: - pk.PublicKey = *NewEdDSAPublicKey(creationTime, &pubkey.PublicKey) - case *ed25519.PrivateKey: - pk.PublicKey = *NewEd25519PublicKey(creationTime, &pubkey.PublicKey) - case ed25519.PrivateKey: - pk.PublicKey = *NewEd25519PublicKey(creationTime, &pubkey.PublicKey) - case *ed448.PrivateKey: - pk.PublicKey = *NewEd448PublicKey(creationTime, &pubkey.PublicKey) - case ed448.PrivateKey: - pk.PublicKey = *NewEd448PublicKey(creationTime, &pubkey.PublicKey) - default: - panic("openpgp: unknown signer type in NewSignerPrivateKey") - } - pk.PrivateKey = signer - return pk -} - -// NewDecrypterPrivateKey creates a PrivateKey from a *{rsa|elgamal|ecdh|x25519|x448}.PrivateKey. -func NewDecrypterPrivateKey(creationTime time.Time, decrypter interface{}) *PrivateKey { - pk := new(PrivateKey) - switch priv := decrypter.(type) { - case *rsa.PrivateKey: - pk.PublicKey = *NewRSAPublicKey(creationTime, &priv.PublicKey) - case *elgamal.PrivateKey: - pk.PublicKey = *NewElGamalPublicKey(creationTime, &priv.PublicKey) - case *ecdh.PrivateKey: - pk.PublicKey = *NewECDHPublicKey(creationTime, &priv.PublicKey) - case *x25519.PrivateKey: - pk.PublicKey = *NewX25519PublicKey(creationTime, &priv.PublicKey) - case *x448.PrivateKey: - pk.PublicKey = *NewX448PublicKey(creationTime, &priv.PublicKey) - default: - panic("openpgp: unknown decrypter type in NewDecrypterPrivateKey") - } - pk.PrivateKey = decrypter - return pk -} - -func (pk *PrivateKey) parse(r io.Reader) (err error) { - err = (&pk.PublicKey).parse(r) - if err != nil { - return - } - v5 := pk.PublicKey.Version == 5 - v6 := pk.PublicKey.Version == 6 - - if V5Disabled && v5 { - return errors.UnsupportedError("support for parsing v5 entities is disabled; build with `-tags v5` if needed") - } - - var buf [1]byte - _, err = readFull(r, buf[:]) - if err != nil { - return - } - pk.s2kType = S2KType(buf[0]) - var optCount [1]byte - if v5 || (v6 && pk.s2kType != S2KNON) { - if _, err = readFull(r, optCount[:]); err != nil { - return - } - } - - switch pk.s2kType { - case S2KNON: - pk.s2k = nil - pk.Encrypted = false - case S2KSHA1, S2KCHECKSUM, S2KAEAD: - if (v5 || v6) && pk.s2kType == S2KCHECKSUM { - return errors.StructuralError(fmt.Sprintf("wrong s2k identifier for version %d", pk.Version)) - } - _, err = readFull(r, buf[:]) - if err != nil { - return - } - pk.cipher = CipherFunction(buf[0]) - if pk.cipher != 0 && !pk.cipher.IsSupported() { - return errors.UnsupportedError("unsupported cipher function in private key") - } - // [Optional] If string-to-key usage octet was 253, - // a one-octet AEAD algorithm. - if pk.s2kType == S2KAEAD { - _, err = readFull(r, buf[:]) - if err != nil { - return - } - pk.aead = AEADMode(buf[0]) - if !pk.aead.IsSupported() { - return errors.UnsupportedError("unsupported aead mode in private key") - } - } - - // [Optional] Only for a version 6 packet, - // and if string-to-key usage octet was 255, 254, or 253, - // an one-octet count of the following field. - if v6 { - _, err = readFull(r, buf[:]) - if err != nil { - return - } - } - - pk.s2kParams, err = s2k.ParseIntoParams(r) - if err != nil { - return - } - if pk.s2kParams.Dummy() { - return - } - if pk.s2kParams.Mode() == s2k.Argon2S2K && pk.s2kType != S2KAEAD { - return errors.StructuralError("using Argon2 S2K without AEAD is not allowed") - } - if pk.s2kParams.Mode() == s2k.SimpleS2K && pk.Version == 6 { - return errors.StructuralError("using Simple S2K with version 6 keys is not allowed") - } - pk.s2k, err = pk.s2kParams.Function() - if err != nil { - return - } - pk.Encrypted = true - default: - return errors.UnsupportedError("deprecated s2k function in private key") - } - - if pk.Encrypted { - var ivSize int - // If the S2K usage octet was 253, the IV is of the size expected by the AEAD mode, - // unless it's a version 5 key, in which case it's the size of the symmetric cipher's block size. - // For all other S2K modes, it's always the block size. - if !v5 && pk.s2kType == S2KAEAD { - ivSize = pk.aead.IvLength() - } else { - ivSize = pk.cipher.blockSize() - } - - if ivSize == 0 { - return errors.UnsupportedError("unsupported cipher in private key: " + strconv.Itoa(int(pk.cipher))) - } - pk.iv = make([]byte, ivSize) - _, err = readFull(r, pk.iv) - if err != nil { - return - } - if v5 && pk.s2kType == S2KAEAD { - pk.iv = pk.iv[:pk.aead.IvLength()] - } - } - - var privateKeyData []byte - if v5 { - var n [4]byte /* secret material four octet count */ - _, err = readFull(r, n[:]) - if err != nil { - return - } - count := uint32(uint32(n[0])<<24 | uint32(n[1])<<16 | uint32(n[2])<<8 | uint32(n[3])) - if !pk.Encrypted { - count = count + 2 /* two octet checksum */ - } - privateKeyData = make([]byte, count) - _, err = readFull(r, privateKeyData) - if err != nil { - return - } - } else { - privateKeyData, err = io.ReadAll(r) - if err != nil { - return - } - } - if !pk.Encrypted { - if len(privateKeyData) < 2 { - return errors.StructuralError("truncated private key data") - } - if pk.Version != 6 { - // checksum - var sum uint16 - for i := 0; i < len(privateKeyData)-2; i++ { - sum += uint16(privateKeyData[i]) - } - if privateKeyData[len(privateKeyData)-2] != uint8(sum>>8) || - privateKeyData[len(privateKeyData)-1] != uint8(sum) { - return errors.StructuralError("private key checksum failure") - } - privateKeyData = privateKeyData[:len(privateKeyData)-2] - return pk.parsePrivateKey(privateKeyData) - } else { - // No checksum - return pk.parsePrivateKey(privateKeyData) - } - } - - pk.encryptedData = privateKeyData - return -} - -// Dummy returns true if the private key is a dummy key. This is a GNU extension. -func (pk *PrivateKey) Dummy() bool { - return pk.s2kParams.Dummy() -} - -func mod64kHash(d []byte) uint16 { - var h uint16 - for _, b := range d { - h += uint16(b) - } - return h -} - -func (pk *PrivateKey) Serialize(w io.Writer) (err error) { - contents := bytes.NewBuffer(nil) - err = pk.PublicKey.serializeWithoutHeaders(contents) - if err != nil { - return - } - if _, err = contents.Write([]byte{uint8(pk.s2kType)}); err != nil { - return - } - - optional := bytes.NewBuffer(nil) - if pk.Encrypted || pk.Dummy() { - // [Optional] If string-to-key usage octet was 255, 254, or 253, - // a one-octet symmetric encryption algorithm. - if _, err = optional.Write([]byte{uint8(pk.cipher)}); err != nil { - return - } - // [Optional] If string-to-key usage octet was 253, - // a one-octet AEAD algorithm. - if pk.s2kType == S2KAEAD { - if _, err = optional.Write([]byte{uint8(pk.aead)}); err != nil { - return - } - } - - s2kBuffer := bytes.NewBuffer(nil) - if err := pk.s2kParams.Serialize(s2kBuffer); err != nil { - return err - } - // [Optional] Only for a version 6 packet, and if string-to-key - // usage octet was 255, 254, or 253, an one-octet - // count of the following field. - if pk.Version == 6 { - if _, err = optional.Write([]byte{uint8(s2kBuffer.Len())}); err != nil { - return - } - } - // [Optional] If string-to-key usage octet was 255, 254, or 253, - // a string-to-key (S2K) specifier. The length of the string-to-key specifier - // depends on its type - if _, err = io.Copy(optional, s2kBuffer); err != nil { - return - } - - // IV - if pk.Encrypted { - if _, err = optional.Write(pk.iv); err != nil { - return - } - if pk.Version == 5 && pk.s2kType == S2KAEAD { - // Add padding for version 5 - padding := make([]byte, pk.cipher.blockSize()-len(pk.iv)) - if _, err = optional.Write(padding); err != nil { - return - } - } - } - } - if pk.Version == 5 || (pk.Version == 6 && pk.s2kType != S2KNON) { - contents.Write([]byte{uint8(optional.Len())}) - } - - if _, err := io.Copy(contents, optional); err != nil { - return err - } - - if !pk.Dummy() { - l := 0 - var priv []byte - if !pk.Encrypted { - buf := bytes.NewBuffer(nil) - err = pk.serializePrivateKey(buf) - if err != nil { - return err - } - l = buf.Len() - if pk.Version != 6 { - checksum := mod64kHash(buf.Bytes()) - buf.Write([]byte{byte(checksum >> 8), byte(checksum)}) - } - priv = buf.Bytes() - } else { - priv, l = pk.encryptedData, len(pk.encryptedData) - } - - if pk.Version == 5 { - contents.Write([]byte{byte(l >> 24), byte(l >> 16), byte(l >> 8), byte(l)}) - } - contents.Write(priv) - } - - ptype := packetTypePrivateKey - if pk.IsSubkey { - ptype = packetTypePrivateSubkey - } - err = serializeHeader(w, ptype, contents.Len()) - if err != nil { - return - } - _, err = io.Copy(w, contents) - if err != nil { - return - } - return -} - -func serializeRSAPrivateKey(w io.Writer, priv *rsa.PrivateKey) error { - if _, err := w.Write(new(encoding.MPI).SetBig(priv.D).EncodedBytes()); err != nil { - return err - } - if _, err := w.Write(new(encoding.MPI).SetBig(priv.Primes[1]).EncodedBytes()); err != nil { - return err - } - if _, err := w.Write(new(encoding.MPI).SetBig(priv.Primes[0]).EncodedBytes()); err != nil { - return err - } - _, err := w.Write(new(encoding.MPI).SetBig(priv.Precomputed.Qinv).EncodedBytes()) - return err -} - -func serializeDSAPrivateKey(w io.Writer, priv *dsa.PrivateKey) error { - _, err := w.Write(new(encoding.MPI).SetBig(priv.X).EncodedBytes()) - return err -} - -func serializeElGamalPrivateKey(w io.Writer, priv *elgamal.PrivateKey) error { - _, err := w.Write(new(encoding.MPI).SetBig(priv.X).EncodedBytes()) - return err -} - -func serializeECDSAPrivateKey(w io.Writer, priv *ecdsa.PrivateKey) error { - _, err := w.Write(encoding.NewMPI(priv.MarshalIntegerSecret()).EncodedBytes()) - return err -} - -func serializeEdDSAPrivateKey(w io.Writer, priv *eddsa.PrivateKey) error { - _, err := w.Write(encoding.NewMPI(priv.MarshalByteSecret()).EncodedBytes()) - return err -} - -func serializeECDHPrivateKey(w io.Writer, priv *ecdh.PrivateKey) error { - _, err := w.Write(encoding.NewMPI(priv.MarshalByteSecret()).EncodedBytes()) - return err -} - -func serializeX25519PrivateKey(w io.Writer, priv *x25519.PrivateKey) error { - _, err := w.Write(priv.Secret) - return err -} - -func serializeX448PrivateKey(w io.Writer, priv *x448.PrivateKey) error { - _, err := w.Write(priv.Secret) - return err -} - -func serializeEd25519PrivateKey(w io.Writer, priv *ed25519.PrivateKey) error { - _, err := w.Write(priv.MarshalByteSecret()) - return err -} - -func serializeEd448PrivateKey(w io.Writer, priv *ed448.PrivateKey) error { - _, err := w.Write(priv.MarshalByteSecret()) - return err -} - -// decrypt decrypts an encrypted private key using a decryption key. -func (pk *PrivateKey) decrypt(decryptionKey []byte) error { - if pk.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - if !pk.Encrypted { - return nil - } - block := pk.cipher.new(decryptionKey) - var data []byte - switch pk.s2kType { - case S2KAEAD: - aead := pk.aead.new(block) - additionalData, err := pk.additionalData() - if err != nil { - return err - } - // Decrypt the encrypted key material with aead - data, err = aead.Open(nil, pk.iv, pk.encryptedData, additionalData) - if err != nil { - return err - } - case S2KSHA1, S2KCHECKSUM: - cfb := cipher.NewCFBDecrypter(block, pk.iv) - data = make([]byte, len(pk.encryptedData)) - cfb.XORKeyStream(data, pk.encryptedData) - if pk.s2kType == S2KSHA1 { - if len(data) < sha1.Size { - return errors.StructuralError("truncated private key data") - } - h := sha1.New() - h.Write(data[:len(data)-sha1.Size]) - sum := h.Sum(nil) - if !bytes.Equal(sum, data[len(data)-sha1.Size:]) { - return errors.StructuralError("private key checksum failure") - } - data = data[:len(data)-sha1.Size] - } else { - if len(data) < 2 { - return errors.StructuralError("truncated private key data") - } - var sum uint16 - for i := 0; i < len(data)-2; i++ { - sum += uint16(data[i]) - } - if data[len(data)-2] != uint8(sum>>8) || - data[len(data)-1] != uint8(sum) { - return errors.StructuralError("private key checksum failure") - } - data = data[:len(data)-2] - } - default: - return errors.InvalidArgumentError("invalid s2k type") - } - - err := pk.parsePrivateKey(data) - if _, ok := err.(errors.KeyInvalidError); ok { - return errors.KeyInvalidError("invalid key parameters") - } - if err != nil { - return err - } - - // Mark key as unencrypted - pk.s2kType = S2KNON - pk.s2k = nil - pk.Encrypted = false - pk.encryptedData = nil - return nil -} - -func (pk *PrivateKey) decryptWithCache(passphrase []byte, keyCache *s2k.Cache) error { - if pk.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - if !pk.Encrypted { - return nil - } - - key, err := keyCache.GetOrComputeDerivedKey(passphrase, pk.s2kParams, pk.cipher.KeySize()) - if err != nil { - return err - } - if pk.s2kType == S2KAEAD { - key = pk.applyHKDF(key) - } - return pk.decrypt(key) -} - -// Decrypt decrypts an encrypted private key using a passphrase. -func (pk *PrivateKey) Decrypt(passphrase []byte) error { - if pk.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - if !pk.Encrypted { - return nil - } - - key := make([]byte, pk.cipher.KeySize()) - pk.s2k(key, passphrase) - if pk.s2kType == S2KAEAD { - key = pk.applyHKDF(key) - } - return pk.decrypt(key) -} - -// DecryptPrivateKeys decrypts all encrypted keys with the given config and passphrase. -// Avoids recomputation of similar s2k key derivations. -func DecryptPrivateKeys(keys []*PrivateKey, passphrase []byte) error { - // Create a cache to avoid recomputation of key derviations for the same passphrase. - s2kCache := &s2k.Cache{} - for _, key := range keys { - if key != nil && !key.Dummy() && key.Encrypted { - err := key.decryptWithCache(passphrase, s2kCache) - if err != nil { - return err - } - } - } - return nil -} - -// encrypt encrypts an unencrypted private key. -func (pk *PrivateKey) encrypt(key []byte, params *s2k.Params, s2kType S2KType, cipherFunction CipherFunction, rand io.Reader) error { - if pk.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - if pk.Encrypted { - return nil - } - // check if encryptionKey has the correct size - if len(key) != cipherFunction.KeySize() { - return errors.InvalidArgumentError("supplied encryption key has the wrong size") - } - - if params.Mode() == s2k.Argon2S2K && s2kType != S2KAEAD { - return errors.InvalidArgumentError("using Argon2 S2K without AEAD is not allowed") - } - if params.Mode() != s2k.Argon2S2K && params.Mode() != s2k.IteratedSaltedS2K && - params.Mode() != s2k.SaltedS2K { // only allowed for high-entropy passphrases - return errors.InvalidArgumentError("insecure S2K mode") - } - - priv := bytes.NewBuffer(nil) - err := pk.serializePrivateKey(priv) - if err != nil { - return err - } - - pk.cipher = cipherFunction - pk.s2kParams = params - pk.s2k, err = pk.s2kParams.Function() - if err != nil { - return err - } - - privateKeyBytes := priv.Bytes() - pk.s2kType = s2kType - block := pk.cipher.new(key) - switch s2kType { - case S2KAEAD: - if pk.aead == 0 { - return errors.StructuralError("aead mode is not set on key") - } - aead := pk.aead.new(block) - additionalData, err := pk.additionalData() - if err != nil { - return err - } - pk.iv = make([]byte, aead.NonceSize()) - _, err = io.ReadFull(rand, pk.iv) - if err != nil { - return err - } - // Decrypt the encrypted key material with aead - pk.encryptedData = aead.Seal(nil, pk.iv, privateKeyBytes, additionalData) - case S2KSHA1, S2KCHECKSUM: - pk.iv = make([]byte, pk.cipher.blockSize()) - _, err = io.ReadFull(rand, pk.iv) - if err != nil { - return err - } - cfb := cipher.NewCFBEncrypter(block, pk.iv) - if s2kType == S2KSHA1 { - h := sha1.New() - h.Write(privateKeyBytes) - sum := h.Sum(nil) - privateKeyBytes = append(privateKeyBytes, sum...) - } else { - var sum uint16 - for _, b := range privateKeyBytes { - sum += uint16(b) - } - privateKeyBytes = append(privateKeyBytes, []byte{uint8(sum >> 8), uint8(sum)}...) - } - pk.encryptedData = make([]byte, len(privateKeyBytes)) - cfb.XORKeyStream(pk.encryptedData, privateKeyBytes) - default: - return errors.InvalidArgumentError("invalid s2k type for encryption") - } - - pk.Encrypted = true - pk.PrivateKey = nil - return err -} - -// EncryptWithConfig encrypts an unencrypted private key using the passphrase and the config. -func (pk *PrivateKey) EncryptWithConfig(passphrase []byte, config *Config) error { - params, err := s2k.Generate(config.Random(), config.S2K()) - if err != nil { - return err - } - // Derive an encryption key with the configured s2k function. - key := make([]byte, config.Cipher().KeySize()) - s2k, err := params.Function() - if err != nil { - return err - } - s2k(key, passphrase) - s2kType := S2KSHA1 - if config.AEAD() != nil { - s2kType = S2KAEAD - pk.aead = config.AEAD().Mode() - pk.cipher = config.Cipher() - key = pk.applyHKDF(key) - } - // Encrypt the private key with the derived encryption key. - return pk.encrypt(key, params, s2kType, config.Cipher(), config.Random()) -} - -// EncryptPrivateKeys encrypts all unencrypted keys with the given config and passphrase. -// Only derives one key from the passphrase, which is then used to encrypt each key. -func EncryptPrivateKeys(keys []*PrivateKey, passphrase []byte, config *Config) error { - params, err := s2k.Generate(config.Random(), config.S2K()) - if err != nil { - return err - } - // Derive an encryption key with the configured s2k function. - encryptionKey := make([]byte, config.Cipher().KeySize()) - s2k, err := params.Function() - if err != nil { - return err - } - s2k(encryptionKey, passphrase) - for _, key := range keys { - if key != nil && !key.Dummy() && !key.Encrypted { - s2kType := S2KSHA1 - if config.AEAD() != nil { - s2kType = S2KAEAD - key.aead = config.AEAD().Mode() - key.cipher = config.Cipher() - derivedKey := key.applyHKDF(encryptionKey) - err = key.encrypt(derivedKey, params, s2kType, config.Cipher(), config.Random()) - } else { - err = key.encrypt(encryptionKey, params, s2kType, config.Cipher(), config.Random()) - } - if err != nil { - return err - } - } - } - return nil -} - -// Encrypt encrypts an unencrypted private key using a passphrase. -func (pk *PrivateKey) Encrypt(passphrase []byte) error { - // Default config of private key encryption - config := &Config{ - S2KConfig: &s2k.Config{ - S2KMode: s2k.IteratedSaltedS2K, - S2KCount: 65536, - Hash: crypto.SHA256, - }, - DefaultCipher: CipherAES256, - } - return pk.EncryptWithConfig(passphrase, config) -} - -func (pk *PrivateKey) serializePrivateKey(w io.Writer) (err error) { - switch priv := pk.PrivateKey.(type) { - case *rsa.PrivateKey: - err = serializeRSAPrivateKey(w, priv) - case *dsa.PrivateKey: - err = serializeDSAPrivateKey(w, priv) - case *elgamal.PrivateKey: - err = serializeElGamalPrivateKey(w, priv) - case *ecdsa.PrivateKey: - err = serializeECDSAPrivateKey(w, priv) - case *eddsa.PrivateKey: - err = serializeEdDSAPrivateKey(w, priv) - case *ecdh.PrivateKey: - err = serializeECDHPrivateKey(w, priv) - case *x25519.PrivateKey: - err = serializeX25519PrivateKey(w, priv) - case *x448.PrivateKey: - err = serializeX448PrivateKey(w, priv) - case *ed25519.PrivateKey: - err = serializeEd25519PrivateKey(w, priv) - case *ed448.PrivateKey: - err = serializeEd448PrivateKey(w, priv) - default: - err = errors.InvalidArgumentError("unknown private key type") - } - return -} - -func (pk *PrivateKey) parsePrivateKey(data []byte) (err error) { - switch pk.PublicKey.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoRSAEncryptOnly: - return pk.parseRSAPrivateKey(data) - case PubKeyAlgoDSA: - return pk.parseDSAPrivateKey(data) - case PubKeyAlgoElGamal: - return pk.parseElGamalPrivateKey(data) - case PubKeyAlgoECDSA: - return pk.parseECDSAPrivateKey(data) - case PubKeyAlgoECDH: - return pk.parseECDHPrivateKey(data) - case PubKeyAlgoEdDSA: - return pk.parseEdDSAPrivateKey(data) - case PubKeyAlgoX25519: - return pk.parseX25519PrivateKey(data) - case PubKeyAlgoX448: - return pk.parseX448PrivateKey(data) - case PubKeyAlgoEd25519: - return pk.parseEd25519PrivateKey(data) - case PubKeyAlgoEd448: - return pk.parseEd448PrivateKey(data) - default: - err = errors.StructuralError("unknown private key type") - return - } -} - -func (pk *PrivateKey) parseRSAPrivateKey(data []byte) (err error) { - rsaPub := pk.PublicKey.PublicKey.(*rsa.PublicKey) - rsaPriv := new(rsa.PrivateKey) - rsaPriv.PublicKey = *rsaPub - - buf := bytes.NewBuffer(data) - d := new(encoding.MPI) - if _, err := d.ReadFrom(buf); err != nil { - return err - } - - p := new(encoding.MPI) - if _, err := p.ReadFrom(buf); err != nil { - return err - } - - q := new(encoding.MPI) - if _, err := q.ReadFrom(buf); err != nil { - return err - } - - rsaPriv.D = new(big.Int).SetBytes(d.Bytes()) - rsaPriv.Primes = make([]*big.Int, 2) - rsaPriv.Primes[0] = new(big.Int).SetBytes(p.Bytes()) - rsaPriv.Primes[1] = new(big.Int).SetBytes(q.Bytes()) - if err := rsaPriv.Validate(); err != nil { - return errors.KeyInvalidError(err.Error()) - } - rsaPriv.Precompute() - pk.PrivateKey = rsaPriv - - return nil -} - -func (pk *PrivateKey) parseDSAPrivateKey(data []byte) (err error) { - dsaPub := pk.PublicKey.PublicKey.(*dsa.PublicKey) - dsaPriv := new(dsa.PrivateKey) - dsaPriv.PublicKey = *dsaPub - - buf := bytes.NewBuffer(data) - x := new(encoding.MPI) - if _, err := x.ReadFrom(buf); err != nil { - return err - } - - dsaPriv.X = new(big.Int).SetBytes(x.Bytes()) - if err := validateDSAParameters(dsaPriv); err != nil { - return err - } - pk.PrivateKey = dsaPriv - - return nil -} - -func (pk *PrivateKey) parseElGamalPrivateKey(data []byte) (err error) { - pub := pk.PublicKey.PublicKey.(*elgamal.PublicKey) - priv := new(elgamal.PrivateKey) - priv.PublicKey = *pub - - buf := bytes.NewBuffer(data) - x := new(encoding.MPI) - if _, err := x.ReadFrom(buf); err != nil { - return err - } - - priv.X = new(big.Int).SetBytes(x.Bytes()) - if err := validateElGamalParameters(priv); err != nil { - return err - } - pk.PrivateKey = priv - - return nil -} - -func (pk *PrivateKey) parseECDSAPrivateKey(data []byte) (err error) { - ecdsaPub := pk.PublicKey.PublicKey.(*ecdsa.PublicKey) - ecdsaPriv := ecdsa.NewPrivateKey(*ecdsaPub) - - buf := bytes.NewBuffer(data) - d := new(encoding.MPI) - if _, err := d.ReadFrom(buf); err != nil { - return err - } - - if err := ecdsaPriv.UnmarshalIntegerSecret(d.Bytes()); err != nil { - return err - } - if err := ecdsa.Validate(ecdsaPriv); err != nil { - return err - } - pk.PrivateKey = ecdsaPriv - - return nil -} - -func (pk *PrivateKey) parseECDHPrivateKey(data []byte) (err error) { - ecdhPub := pk.PublicKey.PublicKey.(*ecdh.PublicKey) - ecdhPriv := ecdh.NewPrivateKey(*ecdhPub) - - buf := bytes.NewBuffer(data) - d := new(encoding.MPI) - if _, err := d.ReadFrom(buf); err != nil { - return err - } - - if err := ecdhPriv.UnmarshalByteSecret(d.Bytes()); err != nil { - return err - } - - if err := ecdh.Validate(ecdhPriv); err != nil { - return err - } - - pk.PrivateKey = ecdhPriv - - return nil -} - -func (pk *PrivateKey) parseX25519PrivateKey(data []byte) (err error) { - publicKey := pk.PublicKey.PublicKey.(*x25519.PublicKey) - privateKey := x25519.NewPrivateKey(*publicKey) - privateKey.PublicKey = *publicKey - - privateKey.Secret = make([]byte, x25519.KeySize) - - if len(data) != x25519.KeySize { - err = errors.StructuralError("wrong x25519 key size") - return err - } - subtle.ConstantTimeCopy(1, privateKey.Secret, data) - if err = x25519.Validate(privateKey); err != nil { - return err - } - pk.PrivateKey = privateKey - return nil -} - -func (pk *PrivateKey) parseX448PrivateKey(data []byte) (err error) { - publicKey := pk.PublicKey.PublicKey.(*x448.PublicKey) - privateKey := x448.NewPrivateKey(*publicKey) - privateKey.PublicKey = *publicKey - - privateKey.Secret = make([]byte, x448.KeySize) - - if len(data) != x448.KeySize { - err = errors.StructuralError("wrong x448 key size") - return err - } - subtle.ConstantTimeCopy(1, privateKey.Secret, data) - if err = x448.Validate(privateKey); err != nil { - return err - } - pk.PrivateKey = privateKey - return nil -} - -func (pk *PrivateKey) parseEd25519PrivateKey(data []byte) (err error) { - publicKey := pk.PublicKey.PublicKey.(*ed25519.PublicKey) - privateKey := ed25519.NewPrivateKey(*publicKey) - privateKey.PublicKey = *publicKey - - if len(data) != ed25519.SeedSize { - err = errors.StructuralError("wrong ed25519 key size") - return err - } - err = privateKey.UnmarshalByteSecret(data) - if err != nil { - return err - } - err = ed25519.Validate(privateKey) - if err != nil { - return err - } - pk.PrivateKey = privateKey - return nil -} - -func (pk *PrivateKey) parseEd448PrivateKey(data []byte) (err error) { - publicKey := pk.PublicKey.PublicKey.(*ed448.PublicKey) - privateKey := ed448.NewPrivateKey(*publicKey) - privateKey.PublicKey = *publicKey - - if len(data) != ed448.SeedSize { - err = errors.StructuralError("wrong ed448 key size") - return err - } - err = privateKey.UnmarshalByteSecret(data) - if err != nil { - return err - } - err = ed448.Validate(privateKey) - if err != nil { - return err - } - pk.PrivateKey = privateKey - return nil -} - -func (pk *PrivateKey) parseEdDSAPrivateKey(data []byte) (err error) { - eddsaPub := pk.PublicKey.PublicKey.(*eddsa.PublicKey) - eddsaPriv := eddsa.NewPrivateKey(*eddsaPub) - eddsaPriv.PublicKey = *eddsaPub - - buf := bytes.NewBuffer(data) - d := new(encoding.MPI) - if _, err := d.ReadFrom(buf); err != nil { - return err - } - - if err = eddsaPriv.UnmarshalByteSecret(d.Bytes()); err != nil { - return err - } - - if err := eddsa.Validate(eddsaPriv); err != nil { - return err - } - - pk.PrivateKey = eddsaPriv - - return nil -} - -func (pk *PrivateKey) additionalData() ([]byte, error) { - additionalData := bytes.NewBuffer(nil) - // Write additional data prefix based on packet type - var packetByte byte - if pk.PublicKey.IsSubkey { - packetByte = 0xc7 - } else { - packetByte = 0xc5 - } - // Write public key to additional data - _, err := additionalData.Write([]byte{packetByte}) - if err != nil { - return nil, err - } - err = pk.PublicKey.serializeWithoutHeaders(additionalData) - if err != nil { - return nil, err - } - return additionalData.Bytes(), nil -} - -func (pk *PrivateKey) applyHKDF(inputKey []byte) []byte { - var packetByte byte - if pk.PublicKey.IsSubkey { - packetByte = 0xc7 - } else { - packetByte = 0xc5 - } - associatedData := []byte{packetByte, byte(pk.Version), byte(pk.cipher), byte(pk.aead)} - hkdfReader := hkdf.New(sha256.New, inputKey, []byte{}, associatedData) - encryptionKey := make([]byte, pk.cipher.KeySize()) - _, _ = readFull(hkdfReader, encryptionKey) - return encryptionKey -} - -func validateDSAParameters(priv *dsa.PrivateKey) error { - p := priv.P // group prime - q := priv.Q // subgroup order - g := priv.G // g has order q mod p - x := priv.X // secret - y := priv.Y // y == g**x mod p - one := big.NewInt(1) - // expect g, y >= 2 and g < p - if g.Cmp(one) <= 0 || y.Cmp(one) <= 0 || g.Cmp(p) > 0 { - return errors.KeyInvalidError("dsa: invalid group") - } - // expect p > q - if p.Cmp(q) <= 0 { - return errors.KeyInvalidError("dsa: invalid group prime") - } - // q should be large enough and divide p-1 - pSub1 := new(big.Int).Sub(p, one) - if q.BitLen() < 150 || new(big.Int).Mod(pSub1, q).Cmp(big.NewInt(0)) != 0 { - return errors.KeyInvalidError("dsa: invalid order") - } - // confirm that g has order q mod p - if !q.ProbablyPrime(32) || new(big.Int).Exp(g, q, p).Cmp(one) != 0 { - return errors.KeyInvalidError("dsa: invalid order") - } - // check y - if new(big.Int).Exp(g, x, p).Cmp(y) != 0 { - return errors.KeyInvalidError("dsa: mismatching values") - } - - return nil -} - -func validateElGamalParameters(priv *elgamal.PrivateKey) error { - p := priv.P // group prime - g := priv.G // g has order p-1 mod p - x := priv.X // secret - y := priv.Y // y == g**x mod p - one := big.NewInt(1) - // Expect g, y >= 2 and g < p - if g.Cmp(one) <= 0 || y.Cmp(one) <= 0 || g.Cmp(p) > 0 { - return errors.KeyInvalidError("elgamal: invalid group") - } - if p.BitLen() < 1024 { - return errors.KeyInvalidError("elgamal: group order too small") - } - pSub1 := new(big.Int).Sub(p, one) - if new(big.Int).Exp(g, pSub1, p).Cmp(one) != 0 { - return errors.KeyInvalidError("elgamal: invalid group") - } - // Since p-1 is not prime, g might have a smaller order that divides p-1. - // We cannot confirm the exact order of g, but we make sure it is not too small. - gExpI := new(big.Int).Set(g) - i := 1 - threshold := 2 << 17 // we want order > threshold - for i < threshold { - i++ // we check every order to make sure key validation is not easily bypassed by guessing y' - gExpI.Mod(new(big.Int).Mul(gExpI, g), p) - if gExpI.Cmp(one) == 0 { - return errors.KeyInvalidError("elgamal: order too small") - } - } - // Check y - if new(big.Int).Exp(g, x, p).Cmp(y) != 0 { - return errors.KeyInvalidError("elgamal: mismatching values") - } - - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/private_key_test_data.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/private_key_test_data.go deleted file mode 100644 index 029b8f1aa..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/private_key_test_data.go +++ /dev/null @@ -1,12 +0,0 @@ -package packet - -// Generated with `gpg --export-secret-keys "Test Key 2"` -const privKeyRSAHex = "9501fe044cc349a8010400b70ca0010e98c090008d45d1ee8f9113bd5861fd57b88bacb7c68658747663f1e1a3b5a98f32fda6472373c024b97359cd2efc88ff60f77751adfbf6af5e615e6a1408cfad8bf0cea30b0d5f53aa27ad59089ba9b15b7ebc2777a25d7b436144027e3bcd203909f147d0e332b240cf63d3395f5dfe0df0a6c04e8655af7eacdf0011010001fe0303024a252e7d475fd445607de39a265472aa74a9320ba2dac395faa687e9e0336aeb7e9a7397e511b5afd9dc84557c80ac0f3d4d7bfec5ae16f20d41c8c84a04552a33870b930420e230e179564f6d19bb153145e76c33ae993886c388832b0fa042ddda7f133924f3854481533e0ede31d51278c0519b29abc3bf53da673e13e3e1214b52413d179d7f66deee35cac8eacb060f78379d70ef4af8607e68131ff529439668fc39c9ce6dfef8a5ac234d234802cbfb749a26107db26406213ae5c06d4673253a3cbee1fcbae58d6ab77e38d6e2c0e7c6317c48e054edadb5a40d0d48acb44643d998139a8a66bb820be1f3f80185bc777d14b5954b60effe2448a036d565c6bc0b915fcea518acdd20ab07bc1529f561c58cd044f723109b93f6fd99f876ff891d64306b5d08f48bab59f38695e9109c4dec34013ba3153488ce070268381ba923ee1eb77125b36afcb4347ec3478c8f2735b06ef17351d872e577fa95d0c397c88c71b59629a36aec" - -// Generated by `gpg --export-secret-keys` followed by a manual extraction of -// the ElGamal subkey from the packets. -const privKeyElGamalHex = "9d0157044df9ee1a100400eb8e136a58ec39b582629cdadf830bc64e0a94ed8103ca8bb247b27b11b46d1d25297ef4bcc3071785ba0c0bedfe89eabc5287fcc0edf81ab5896c1c8e4b20d27d79813c7aede75320b33eaeeaa586edc00fd1036c10133e6ba0ff277245d0d59d04b2b3421b7244aca5f4a8d870c6f1c1fbff9e1c26699a860b9504f35ca1d700030503fd1ededd3b840795be6d9ccbe3c51ee42e2f39233c432b831ddd9c4e72b7025a819317e47bf94f9ee316d7273b05d5fcf2999c3a681f519b1234bbfa6d359b4752bd9c3f77d6b6456cde152464763414ca130f4e91d91041432f90620fec0e6d6b5116076c2985d5aeaae13be492b9b329efcaf7ee25120159a0a30cd976b42d7afe030302dae7eb80db744d4960c4df930d57e87fe81412eaace9f900e6c839817a614ddb75ba6603b9417c33ea7b6c93967dfa2bcff3fa3c74a5ce2c962db65b03aece14c96cbd0038fc" - -// pkcs1PrivKeyHex is a PKCS#1, RSA private key. -// Generated by `openssl genrsa 1024 | openssl rsa -outform DER | xxd -p` -const pkcs1PrivKeyHex = "3082025d02010002818100e98edfa1c3b35884a54d0b36a6a603b0290fa85e49e30fa23fc94fef9c6790bc4849928607aa48d809da326fb42a969d06ad756b98b9c1a90f5d4a2b6d0ac05953c97f4da3120164a21a679793ce181c906dc01d235cc085ddcdf6ea06c389b6ab8885dfd685959e693138856a68a7e5db263337ff82a088d583a897cf2d59e9020301000102818100b6d5c9eb70b02d5369b3ee5b520a14490b5bde8a317d36f7e4c74b7460141311d1e5067735f8f01d6f5908b2b96fbd881f7a1ab9a84d82753e39e19e2d36856be960d05ac9ef8e8782ea1b6d65aee28fdfe1d61451e8cff0adfe84322f12cf455028b581cf60eb9e0e140ba5d21aeba6c2634d7c65318b9a665fc01c3191ca21024100fa5e818da3705b0fa33278bb28d4b6f6050388af2d4b75ec9375dd91ccf2e7d7068086a8b82a8f6282e4fbbdb8a7f2622eb97295249d87acea7f5f816f54d347024100eecf9406d7dc49cdfb95ab1eff4064de84c7a30f64b2798936a0d2018ba9eb52e4b636f82e96c49cc63b80b675e91e40d1b2e4017d4b9adaf33ab3d9cf1c214f024100c173704ace742c082323066226a4655226819a85304c542b9dacbeacbf5d1881ee863485fcf6f59f3a604f9b42289282067447f2b13dfeed3eab7851fc81e0550240741fc41f3fc002b382eed8730e33c5d8de40256e4accee846667f536832f711ab1d4590e7db91a8a116ac5bff3be13d3f9243ff2e976662aa9b395d907f8e9c9024046a5696c9ef882363e06c9fa4e2f5b580906452befba03f4a99d0f873697ef1f851d2226ca7934b30b7c3e80cb634a67172bbbf4781735fe3e09263e2dd723e7" diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key.go deleted file mode 100644 index e2813396e..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key.go +++ /dev/null @@ -1,1125 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "crypto/dsa" - "crypto/rsa" - "crypto/sha1" - "crypto/sha256" - _ "crypto/sha512" - "encoding/binary" - "fmt" - "hash" - "io" - "math/big" - "strconv" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/ecdh" - "github.com/ProtonMail/go-crypto/openpgp/ecdsa" - "github.com/ProtonMail/go-crypto/openpgp/ed25519" - "github.com/ProtonMail/go-crypto/openpgp/ed448" - "github.com/ProtonMail/go-crypto/openpgp/eddsa" - "github.com/ProtonMail/go-crypto/openpgp/elgamal" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "github.com/ProtonMail/go-crypto/openpgp/internal/ecc" - "github.com/ProtonMail/go-crypto/openpgp/internal/encoding" - "github.com/ProtonMail/go-crypto/openpgp/x25519" - "github.com/ProtonMail/go-crypto/openpgp/x448" -) - -// PublicKey represents an OpenPGP public key. See RFC 4880, section 5.5.2. -type PublicKey struct { - Version int - CreationTime time.Time - PubKeyAlgo PublicKeyAlgorithm - PublicKey interface{} // *rsa.PublicKey, *dsa.PublicKey, *ecdsa.PublicKey or *eddsa.PublicKey, *x25519.PublicKey, *x448.PublicKey, *ed25519.PublicKey, *ed448.PublicKey - Fingerprint []byte - KeyId uint64 - IsSubkey bool - - // RFC 4880 fields - n, e, p, q, g, y encoding.Field - - // RFC 6637 fields - // oid contains the OID byte sequence identifying the elliptic curve used - oid encoding.Field - - // kdf stores key derivation function parameters - // used for ECDH encryption. See RFC 6637, Section 9. - kdf encoding.Field -} - -// UpgradeToV5 updates the version of the key to v5, and updates all necessary -// fields. -func (pk *PublicKey) UpgradeToV5() { - pk.Version = 5 - pk.setFingerprintAndKeyId() -} - -// UpgradeToV6 updates the version of the key to v6, and updates all necessary -// fields. -func (pk *PublicKey) UpgradeToV6() error { - pk.Version = 6 - pk.setFingerprintAndKeyId() - return pk.checkV6Compatibility() -} - -// signingKey provides a convenient abstraction over signature verification -// for v3 and v4 public keys. -type signingKey interface { - SerializeForHash(io.Writer) error - SerializeSignaturePrefix(io.Writer) error - serializeWithoutHeaders(io.Writer) error -} - -// NewRSAPublicKey returns a PublicKey that wraps the given rsa.PublicKey. -func NewRSAPublicKey(creationTime time.Time, pub *rsa.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoRSA, - PublicKey: pub, - n: new(encoding.MPI).SetBig(pub.N), - e: new(encoding.MPI).SetBig(big.NewInt(int64(pub.E))), - } - - pk.setFingerprintAndKeyId() - return pk -} - -// NewDSAPublicKey returns a PublicKey that wraps the given dsa.PublicKey. -func NewDSAPublicKey(creationTime time.Time, pub *dsa.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoDSA, - PublicKey: pub, - p: new(encoding.MPI).SetBig(pub.P), - q: new(encoding.MPI).SetBig(pub.Q), - g: new(encoding.MPI).SetBig(pub.G), - y: new(encoding.MPI).SetBig(pub.Y), - } - - pk.setFingerprintAndKeyId() - return pk -} - -// NewElGamalPublicKey returns a PublicKey that wraps the given elgamal.PublicKey. -func NewElGamalPublicKey(creationTime time.Time, pub *elgamal.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoElGamal, - PublicKey: pub, - p: new(encoding.MPI).SetBig(pub.P), - g: new(encoding.MPI).SetBig(pub.G), - y: new(encoding.MPI).SetBig(pub.Y), - } - - pk.setFingerprintAndKeyId() - return pk -} - -func NewECDSAPublicKey(creationTime time.Time, pub *ecdsa.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoECDSA, - PublicKey: pub, - p: encoding.NewMPI(pub.MarshalPoint()), - } - - curveInfo := ecc.FindByCurve(pub.GetCurve()) - if curveInfo == nil { - panic("unknown elliptic curve") - } - pk.oid = curveInfo.Oid - pk.setFingerprintAndKeyId() - return pk -} - -func NewECDHPublicKey(creationTime time.Time, pub *ecdh.PublicKey) *PublicKey { - var pk *PublicKey - var kdf = encoding.NewOID([]byte{0x1, pub.Hash.Id(), pub.Cipher.Id()}) - pk = &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoECDH, - PublicKey: pub, - p: encoding.NewMPI(pub.MarshalPoint()), - kdf: kdf, - } - - curveInfo := ecc.FindByCurve(pub.GetCurve()) - - if curveInfo == nil { - panic("unknown elliptic curve") - } - - pk.oid = curveInfo.Oid - pk.setFingerprintAndKeyId() - return pk -} - -func NewEdDSAPublicKey(creationTime time.Time, pub *eddsa.PublicKey) *PublicKey { - curveInfo := ecc.FindByCurve(pub.GetCurve()) - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoEdDSA, - PublicKey: pub, - oid: curveInfo.Oid, - // Native point format, see draft-koch-eddsa-for-openpgp-04, Appendix B - p: encoding.NewMPI(pub.MarshalPoint()), - } - - pk.setFingerprintAndKeyId() - return pk -} - -func NewX25519PublicKey(creationTime time.Time, pub *x25519.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoX25519, - PublicKey: pub, - } - - pk.setFingerprintAndKeyId() - return pk -} - -func NewX448PublicKey(creationTime time.Time, pub *x448.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoX448, - PublicKey: pub, - } - - pk.setFingerprintAndKeyId() - return pk -} - -func NewEd25519PublicKey(creationTime time.Time, pub *ed25519.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoEd25519, - PublicKey: pub, - } - - pk.setFingerprintAndKeyId() - return pk -} - -func NewEd448PublicKey(creationTime time.Time, pub *ed448.PublicKey) *PublicKey { - pk := &PublicKey{ - Version: 4, - CreationTime: creationTime, - PubKeyAlgo: PubKeyAlgoEd448, - PublicKey: pub, - } - - pk.setFingerprintAndKeyId() - return pk -} - -func (pk *PublicKey) parse(r io.Reader) (err error) { - // RFC 4880, section 5.5.2 - var buf [6]byte - _, err = readFull(r, buf[:]) - if err != nil { - return - } - - pk.Version = int(buf[0]) - if pk.Version != 4 && pk.Version != 5 && pk.Version != 6 { - return errors.UnsupportedError("public key version " + strconv.Itoa(int(buf[0]))) - } - - if V5Disabled && pk.Version == 5 { - return errors.UnsupportedError("support for parsing v5 entities is disabled; build with `-tags v5` if needed") - } - - if pk.Version >= 5 { - // Read the four-octet scalar octet count - // The count is not used in this implementation - var n [4]byte - _, err = readFull(r, n[:]) - if err != nil { - return - } - } - pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0) - pk.PubKeyAlgo = PublicKeyAlgorithm(buf[5]) - // Ignore four-ocet length - switch pk.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly: - err = pk.parseRSA(r) - case PubKeyAlgoDSA: - err = pk.parseDSA(r) - case PubKeyAlgoElGamal: - err = pk.parseElGamal(r) - case PubKeyAlgoECDSA: - err = pk.parseECDSA(r) - case PubKeyAlgoECDH: - err = pk.parseECDH(r) - case PubKeyAlgoEdDSA: - err = pk.parseEdDSA(r) - case PubKeyAlgoX25519: - err = pk.parseX25519(r) - case PubKeyAlgoX448: - err = pk.parseX448(r) - case PubKeyAlgoEd25519: - err = pk.parseEd25519(r) - case PubKeyAlgoEd448: - err = pk.parseEd448(r) - default: - err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo))) - } - if err != nil { - return - } - - pk.setFingerprintAndKeyId() - return -} - -func (pk *PublicKey) setFingerprintAndKeyId() { - // RFC 4880, section 12.2 - if pk.Version >= 5 { - fingerprint := sha256.New() - if err := pk.SerializeForHash(fingerprint); err != nil { - // Should not happen for a hash. - panic(err) - } - pk.Fingerprint = make([]byte, 32) - copy(pk.Fingerprint, fingerprint.Sum(nil)) - pk.KeyId = binary.BigEndian.Uint64(pk.Fingerprint[:8]) - } else { - fingerprint := sha1.New() - if err := pk.SerializeForHash(fingerprint); err != nil { - // Should not happen for a hash. - panic(err) - } - pk.Fingerprint = make([]byte, 20) - copy(pk.Fingerprint, fingerprint.Sum(nil)) - pk.KeyId = binary.BigEndian.Uint64(pk.Fingerprint[12:20]) - } -} - -func (pk *PublicKey) checkV6Compatibility() error { - // Implementations MUST NOT accept or generate version 6 key material using the deprecated OIDs. - switch pk.PubKeyAlgo { - case PubKeyAlgoECDH: - curveInfo := ecc.FindByOid(pk.oid) - if curveInfo == nil { - return errors.UnsupportedError(fmt.Sprintf("unknown oid: %x", pk.oid)) - } - if curveInfo.GenName == ecc.Curve25519GenName { - return errors.StructuralError("cannot generate v6 key with deprecated OID: Curve25519Legacy") - } - case PubKeyAlgoEdDSA: - return errors.StructuralError("cannot generate v6 key with deprecated algorithm: EdDSALegacy") - } - return nil -} - -// parseRSA parses RSA public key material from the given Reader. See RFC 4880, -// section 5.5.2. -func (pk *PublicKey) parseRSA(r io.Reader) (err error) { - pk.n = new(encoding.MPI) - if _, err = pk.n.ReadFrom(r); err != nil { - return - } - pk.e = new(encoding.MPI) - if _, err = pk.e.ReadFrom(r); err != nil { - return - } - - if len(pk.e.Bytes()) > 3 { - err = errors.UnsupportedError("large public exponent") - return - } - rsa := &rsa.PublicKey{ - N: new(big.Int).SetBytes(pk.n.Bytes()), - E: 0, - } - for i := 0; i < len(pk.e.Bytes()); i++ { - rsa.E <<= 8 - rsa.E |= int(pk.e.Bytes()[i]) - } - pk.PublicKey = rsa - return -} - -// parseDSA parses DSA public key material from the given Reader. See RFC 4880, -// section 5.5.2. -func (pk *PublicKey) parseDSA(r io.Reader) (err error) { - pk.p = new(encoding.MPI) - if _, err = pk.p.ReadFrom(r); err != nil { - return - } - pk.q = new(encoding.MPI) - if _, err = pk.q.ReadFrom(r); err != nil { - return - } - pk.g = new(encoding.MPI) - if _, err = pk.g.ReadFrom(r); err != nil { - return - } - pk.y = new(encoding.MPI) - if _, err = pk.y.ReadFrom(r); err != nil { - return - } - - dsa := new(dsa.PublicKey) - dsa.P = new(big.Int).SetBytes(pk.p.Bytes()) - dsa.Q = new(big.Int).SetBytes(pk.q.Bytes()) - dsa.G = new(big.Int).SetBytes(pk.g.Bytes()) - dsa.Y = new(big.Int).SetBytes(pk.y.Bytes()) - pk.PublicKey = dsa - return -} - -// parseElGamal parses ElGamal public key material from the given Reader. See -// RFC 4880, section 5.5.2. -func (pk *PublicKey) parseElGamal(r io.Reader) (err error) { - pk.p = new(encoding.MPI) - if _, err = pk.p.ReadFrom(r); err != nil { - return - } - pk.g = new(encoding.MPI) - if _, err = pk.g.ReadFrom(r); err != nil { - return - } - pk.y = new(encoding.MPI) - if _, err = pk.y.ReadFrom(r); err != nil { - return - } - - elgamal := new(elgamal.PublicKey) - elgamal.P = new(big.Int).SetBytes(pk.p.Bytes()) - elgamal.G = new(big.Int).SetBytes(pk.g.Bytes()) - elgamal.Y = new(big.Int).SetBytes(pk.y.Bytes()) - pk.PublicKey = elgamal - return -} - -// parseECDSA parses ECDSA public key material from the given Reader. See -// RFC 6637, Section 9. -func (pk *PublicKey) parseECDSA(r io.Reader) (err error) { - pk.oid = new(encoding.OID) - if _, err = pk.oid.ReadFrom(r); err != nil { - return - } - - curveInfo := ecc.FindByOid(pk.oid) - if curveInfo == nil { - return errors.UnsupportedError(fmt.Sprintf("unknown oid: %x", pk.oid)) - } - - pk.p = new(encoding.MPI) - if _, err = pk.p.ReadFrom(r); err != nil { - return - } - - c, ok := curveInfo.Curve.(ecc.ECDSACurve) - if !ok { - return errors.UnsupportedError(fmt.Sprintf("unsupported oid: %x", pk.oid)) - } - - ecdsaKey := ecdsa.NewPublicKey(c) - err = ecdsaKey.UnmarshalPoint(pk.p.Bytes()) - pk.PublicKey = ecdsaKey - - return -} - -// parseECDH parses ECDH public key material from the given Reader. See -// RFC 6637, Section 9. -func (pk *PublicKey) parseECDH(r io.Reader) (err error) { - pk.oid = new(encoding.OID) - if _, err = pk.oid.ReadFrom(r); err != nil { - return - } - - curveInfo := ecc.FindByOid(pk.oid) - if curveInfo == nil { - return errors.UnsupportedError(fmt.Sprintf("unknown oid: %x", pk.oid)) - } - - if pk.Version == 6 && curveInfo.GenName == ecc.Curve25519GenName { - // Implementations MUST NOT accept or generate version 6 key material using the deprecated OIDs. - return errors.StructuralError("cannot read v6 key with deprecated OID: Curve25519Legacy") - } - - pk.p = new(encoding.MPI) - if _, err = pk.p.ReadFrom(r); err != nil { - return - } - pk.kdf = new(encoding.OID) - if _, err = pk.kdf.ReadFrom(r); err != nil { - return - } - - c, ok := curveInfo.Curve.(ecc.ECDHCurve) - if !ok { - return errors.UnsupportedError(fmt.Sprintf("unsupported oid: %x", pk.oid)) - } - - if kdfLen := len(pk.kdf.Bytes()); kdfLen < 3 { - return errors.UnsupportedError("unsupported ECDH KDF length: " + strconv.Itoa(kdfLen)) - } - if reserved := pk.kdf.Bytes()[0]; reserved != 0x01 { - return errors.UnsupportedError("unsupported KDF reserved field: " + strconv.Itoa(int(reserved))) - } - kdfHash, ok := algorithm.HashById[pk.kdf.Bytes()[1]] - if !ok { - return errors.UnsupportedError("unsupported ECDH KDF hash: " + strconv.Itoa(int(pk.kdf.Bytes()[1]))) - } - kdfCipher, ok := algorithm.CipherById[pk.kdf.Bytes()[2]] - if !ok { - return errors.UnsupportedError("unsupported ECDH KDF cipher: " + strconv.Itoa(int(pk.kdf.Bytes()[2]))) - } - - ecdhKey := ecdh.NewPublicKey(c, kdfHash, kdfCipher) - err = ecdhKey.UnmarshalPoint(pk.p.Bytes()) - pk.PublicKey = ecdhKey - - return -} - -func (pk *PublicKey) parseEdDSA(r io.Reader) (err error) { - if pk.Version == 6 { - // Implementations MUST NOT accept or generate version 6 key material using the deprecated OIDs. - return errors.StructuralError("cannot generate v6 key with deprecated algorithm: EdDSALegacy") - } - - pk.oid = new(encoding.OID) - if _, err = pk.oid.ReadFrom(r); err != nil { - return - } - - curveInfo := ecc.FindByOid(pk.oid) - if curveInfo == nil { - return errors.UnsupportedError(fmt.Sprintf("unknown oid: %x", pk.oid)) - } - - c, ok := curveInfo.Curve.(ecc.EdDSACurve) - if !ok { - return errors.UnsupportedError(fmt.Sprintf("unsupported oid: %x", pk.oid)) - } - - pk.p = new(encoding.MPI) - if _, err = pk.p.ReadFrom(r); err != nil { - return - } - - if len(pk.p.Bytes()) == 0 { - return errors.StructuralError("empty EdDSA public key") - } - - pub := eddsa.NewPublicKey(c) - - switch flag := pk.p.Bytes()[0]; flag { - case 0x04: - // TODO: see _grcy_ecc_eddsa_ensure_compact in grcypt - return errors.UnsupportedError("unsupported EdDSA compression: " + strconv.Itoa(int(flag))) - case 0x40: - err = pub.UnmarshalPoint(pk.p.Bytes()) - default: - return errors.UnsupportedError("unsupported EdDSA compression: " + strconv.Itoa(int(flag))) - } - - pk.PublicKey = pub - return -} - -func (pk *PublicKey) parseX25519(r io.Reader) (err error) { - point := make([]byte, x25519.KeySize) - _, err = io.ReadFull(r, point) - if err != nil { - return - } - pub := &x25519.PublicKey{ - Point: point, - } - pk.PublicKey = pub - return -} - -func (pk *PublicKey) parseX448(r io.Reader) (err error) { - point := make([]byte, x448.KeySize) - _, err = io.ReadFull(r, point) - if err != nil { - return - } - pub := &x448.PublicKey{ - Point: point, - } - pk.PublicKey = pub - return -} - -func (pk *PublicKey) parseEd25519(r io.Reader) (err error) { - point := make([]byte, ed25519.PublicKeySize) - _, err = io.ReadFull(r, point) - if err != nil { - return - } - pub := &ed25519.PublicKey{ - Point: point, - } - pk.PublicKey = pub - return -} - -func (pk *PublicKey) parseEd448(r io.Reader) (err error) { - point := make([]byte, ed448.PublicKeySize) - _, err = io.ReadFull(r, point) - if err != nil { - return - } - pub := &ed448.PublicKey{ - Point: point, - } - pk.PublicKey = pub - return -} - -// SerializeForHash serializes the PublicKey to w with the special packet -// header format needed for hashing. -func (pk *PublicKey) SerializeForHash(w io.Writer) error { - if err := pk.SerializeSignaturePrefix(w); err != nil { - return err - } - return pk.serializeWithoutHeaders(w) -} - -// SerializeSignaturePrefix writes the prefix for this public key to the given Writer. -// The prefix is used when calculating a signature over this public key. See -// RFC 4880, section 5.2.4. -func (pk *PublicKey) SerializeSignaturePrefix(w io.Writer) error { - var pLength = pk.algorithmSpecificByteCount() - // version, timestamp, algorithm - pLength += versionSize + timestampSize + algorithmSize - if pk.Version >= 5 { - // key octet count (4). - pLength += 4 - _, err := w.Write([]byte{ - // When a v4 signature is made over a key, the hash data starts with the octet 0x99, followed by a two-octet length - // of the key, and then the body of the key packet. When a v6 signature is made over a key, the hash data starts - // with the salt, then octet 0x9B, followed by a four-octet length of the key, and then the body of the key packet. - 0x95 + byte(pk.Version), - byte(pLength >> 24), - byte(pLength >> 16), - byte(pLength >> 8), - byte(pLength), - }) - return err - } - if _, err := w.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)}); err != nil { - return err - } - return nil -} - -func (pk *PublicKey) Serialize(w io.Writer) (err error) { - length := uint32(versionSize + timestampSize + algorithmSize) // 6 byte header - length += pk.algorithmSpecificByteCount() - if pk.Version >= 5 { - length += 4 // octet key count - } - packetType := packetTypePublicKey - if pk.IsSubkey { - packetType = packetTypePublicSubkey - } - err = serializeHeader(w, packetType, int(length)) - if err != nil { - return - } - return pk.serializeWithoutHeaders(w) -} - -func (pk *PublicKey) algorithmSpecificByteCount() uint32 { - length := uint32(0) - switch pk.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly: - length += uint32(pk.n.EncodedLength()) - length += uint32(pk.e.EncodedLength()) - case PubKeyAlgoDSA: - length += uint32(pk.p.EncodedLength()) - length += uint32(pk.q.EncodedLength()) - length += uint32(pk.g.EncodedLength()) - length += uint32(pk.y.EncodedLength()) - case PubKeyAlgoElGamal: - length += uint32(pk.p.EncodedLength()) - length += uint32(pk.g.EncodedLength()) - length += uint32(pk.y.EncodedLength()) - case PubKeyAlgoECDSA: - length += uint32(pk.oid.EncodedLength()) - length += uint32(pk.p.EncodedLength()) - case PubKeyAlgoECDH: - length += uint32(pk.oid.EncodedLength()) - length += uint32(pk.p.EncodedLength()) - length += uint32(pk.kdf.EncodedLength()) - case PubKeyAlgoEdDSA: - length += uint32(pk.oid.EncodedLength()) - length += uint32(pk.p.EncodedLength()) - case PubKeyAlgoX25519: - length += x25519.KeySize - case PubKeyAlgoX448: - length += x448.KeySize - case PubKeyAlgoEd25519: - length += ed25519.PublicKeySize - case PubKeyAlgoEd448: - length += ed448.PublicKeySize - default: - panic("unknown public key algorithm") - } - return length -} - -// serializeWithoutHeaders marshals the PublicKey to w in the form of an -// OpenPGP public key packet, not including the packet header. -func (pk *PublicKey) serializeWithoutHeaders(w io.Writer) (err error) { - t := uint32(pk.CreationTime.Unix()) - if _, err = w.Write([]byte{ - byte(pk.Version), - byte(t >> 24), byte(t >> 16), byte(t >> 8), byte(t), - byte(pk.PubKeyAlgo), - }); err != nil { - return - } - - if pk.Version >= 5 { - n := pk.algorithmSpecificByteCount() - if _, err = w.Write([]byte{ - byte(n >> 24), byte(n >> 16), byte(n >> 8), byte(n), - }); err != nil { - return - } - } - - switch pk.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly: - if _, err = w.Write(pk.n.EncodedBytes()); err != nil { - return - } - _, err = w.Write(pk.e.EncodedBytes()) - return - case PubKeyAlgoDSA: - if _, err = w.Write(pk.p.EncodedBytes()); err != nil { - return - } - if _, err = w.Write(pk.q.EncodedBytes()); err != nil { - return - } - if _, err = w.Write(pk.g.EncodedBytes()); err != nil { - return - } - _, err = w.Write(pk.y.EncodedBytes()) - return - case PubKeyAlgoElGamal: - if _, err = w.Write(pk.p.EncodedBytes()); err != nil { - return - } - if _, err = w.Write(pk.g.EncodedBytes()); err != nil { - return - } - _, err = w.Write(pk.y.EncodedBytes()) - return - case PubKeyAlgoECDSA: - if _, err = w.Write(pk.oid.EncodedBytes()); err != nil { - return - } - _, err = w.Write(pk.p.EncodedBytes()) - return - case PubKeyAlgoECDH: - if _, err = w.Write(pk.oid.EncodedBytes()); err != nil { - return - } - if _, err = w.Write(pk.p.EncodedBytes()); err != nil { - return - } - _, err = w.Write(pk.kdf.EncodedBytes()) - return - case PubKeyAlgoEdDSA: - if _, err = w.Write(pk.oid.EncodedBytes()); err != nil { - return - } - _, err = w.Write(pk.p.EncodedBytes()) - return - case PubKeyAlgoX25519: - publicKey := pk.PublicKey.(*x25519.PublicKey) - _, err = w.Write(publicKey.Point) - return - case PubKeyAlgoX448: - publicKey := pk.PublicKey.(*x448.PublicKey) - _, err = w.Write(publicKey.Point) - return - case PubKeyAlgoEd25519: - publicKey := pk.PublicKey.(*ed25519.PublicKey) - _, err = w.Write(publicKey.Point) - return - case PubKeyAlgoEd448: - publicKey := pk.PublicKey.(*ed448.PublicKey) - _, err = w.Write(publicKey.Point) - return - } - return errors.InvalidArgumentError("bad public-key algorithm") -} - -// CanSign returns true iff this public key can generate signatures -func (pk *PublicKey) CanSign() bool { - return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly && pk.PubKeyAlgo != PubKeyAlgoElGamal && pk.PubKeyAlgo != PubKeyAlgoECDH -} - -// VerifyHashTag returns nil iff sig appears to be a plausible signature of the data -// hashed into signed, based solely on its HashTag. signed is mutated by this call. -func VerifyHashTag(signed hash.Hash, sig *Signature) (err error) { - if sig.Version == 5 && (sig.SigType == 0x00 || sig.SigType == 0x01) { - sig.AddMetadataToHashSuffix() - } - signed.Write(sig.HashSuffix) - hashBytes := signed.Sum(nil) - if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] { - return errors.SignatureError("hash tag doesn't match") - } - return nil -} - -// VerifySignature returns nil iff sig is a valid signature, made by this -// public key, of the data hashed into signed. signed is mutated by this call. -func (pk *PublicKey) VerifySignature(signed hash.Hash, sig *Signature) (err error) { - if !pk.CanSign() { - return errors.InvalidArgumentError("public key cannot generate signatures") - } - if sig.Version == 5 && (sig.SigType == 0x00 || sig.SigType == 0x01) { - sig.AddMetadataToHashSuffix() - } - signed.Write(sig.HashSuffix) - hashBytes := signed.Sum(nil) - // see discussion https://github.com/ProtonMail/go-crypto/issues/107 - if sig.Version >= 5 && (hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1]) { - return errors.SignatureError("hash tag doesn't match") - } - - if pk.PubKeyAlgo != sig.PubKeyAlgo { - return errors.InvalidArgumentError("public key and signature use different algorithms") - } - - switch pk.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly: - rsaPublicKey, _ := pk.PublicKey.(*rsa.PublicKey) - err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, padToKeySize(rsaPublicKey, sig.RSASignature.Bytes())) - if err != nil { - return errors.SignatureError("RSA verification failure") - } - return nil - case PubKeyAlgoDSA: - dsaPublicKey, _ := pk.PublicKey.(*dsa.PublicKey) - // Need to truncate hashBytes to match FIPS 186-3 section 4.6. - subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8 - if len(hashBytes) > subgroupSize { - hashBytes = hashBytes[:subgroupSize] - } - if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.Bytes()), new(big.Int).SetBytes(sig.DSASigS.Bytes())) { - return errors.SignatureError("DSA verification failure") - } - return nil - case PubKeyAlgoECDSA: - ecdsaPublicKey := pk.PublicKey.(*ecdsa.PublicKey) - if !ecdsa.Verify(ecdsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.ECDSASigR.Bytes()), new(big.Int).SetBytes(sig.ECDSASigS.Bytes())) { - return errors.SignatureError("ECDSA verification failure") - } - return nil - case PubKeyAlgoEdDSA: - eddsaPublicKey := pk.PublicKey.(*eddsa.PublicKey) - if !eddsa.Verify(eddsaPublicKey, hashBytes, sig.EdDSASigR.Bytes(), sig.EdDSASigS.Bytes()) { - return errors.SignatureError("EdDSA verification failure") - } - return nil - case PubKeyAlgoEd25519: - ed25519PublicKey := pk.PublicKey.(*ed25519.PublicKey) - if !ed25519.Verify(ed25519PublicKey, hashBytes, sig.EdSig) { - return errors.SignatureError("Ed25519 verification failure") - } - return nil - case PubKeyAlgoEd448: - ed448PublicKey := pk.PublicKey.(*ed448.PublicKey) - if !ed448.Verify(ed448PublicKey, hashBytes, sig.EdSig) { - return errors.SignatureError("ed448 verification failure") - } - return nil - default: - return errors.SignatureError("Unsupported public key algorithm used in signature") - } -} - -// keySignatureHash returns a Hash of the message that needs to be signed for -// pk to assert a subkey relationship to signed. -func keySignatureHash(pk, signed signingKey, hashFunc hash.Hash) (h hash.Hash, err error) { - h = hashFunc - - // RFC 4880, section 5.2.4 - err = pk.SerializeForHash(h) - if err != nil { - return nil, err - } - - err = signed.SerializeForHash(h) - return -} - -// VerifyKeyHashTag returns nil iff sig appears to be a plausible signature over this -// primary key and subkey, based solely on its HashTag. -func (pk *PublicKey) VerifyKeyHashTag(signed *PublicKey, sig *Signature) error { - preparedHash, err := sig.PrepareVerify() - if err != nil { - return err - } - h, err := keySignatureHash(pk, signed, preparedHash) - if err != nil { - return err - } - return VerifyHashTag(h, sig) -} - -// VerifyKeySignature returns nil iff sig is a valid signature, made by this -// public key, of signed. -func (pk *PublicKey) VerifyKeySignature(signed *PublicKey, sig *Signature) error { - preparedHash, err := sig.PrepareVerify() - if err != nil { - return err - } - h, err := keySignatureHash(pk, signed, preparedHash) - if err != nil { - return err - } - if err = pk.VerifySignature(h, sig); err != nil { - return err - } - - if sig.FlagSign { - // Signing subkeys must be cross-signed. See - // https://www.gnupg.org/faq/subkey-cross-certify.html. - if sig.EmbeddedSignature == nil { - return errors.StructuralError("signing subkey is missing cross-signature") - } - preparedHashEmbedded, err := sig.EmbeddedSignature.PrepareVerify() - if err != nil { - return err - } - // Verify the cross-signature. This is calculated over the same - // data as the main signature, so we cannot just recursively - // call signed.VerifyKeySignature(...) - if h, err = keySignatureHash(pk, signed, preparedHashEmbedded); err != nil { - return errors.StructuralError("error while hashing for cross-signature: " + err.Error()) - } - if err := signed.VerifySignature(h, sig.EmbeddedSignature); err != nil { - return errors.StructuralError("error while verifying cross-signature: " + err.Error()) - } - } - - return nil -} - -func keyRevocationHash(pk signingKey, hashFunc hash.Hash) (err error) { - return pk.SerializeForHash(hashFunc) -} - -// VerifyRevocationHashTag returns nil iff sig appears to be a plausible signature -// over this public key, based solely on its HashTag. -func (pk *PublicKey) VerifyRevocationHashTag(sig *Signature) (err error) { - preparedHash, err := sig.PrepareVerify() - if err != nil { - return err - } - if err = keyRevocationHash(pk, preparedHash); err != nil { - return err - } - return VerifyHashTag(preparedHash, sig) -} - -// VerifyRevocationSignature returns nil iff sig is a valid signature, made by this -// public key. -func (pk *PublicKey) VerifyRevocationSignature(sig *Signature) (err error) { - preparedHash, err := sig.PrepareVerify() - if err != nil { - return err - } - if err = keyRevocationHash(pk, preparedHash); err != nil { - return err - } - return pk.VerifySignature(preparedHash, sig) -} - -// VerifySubkeyRevocationSignature returns nil iff sig is a valid subkey revocation signature, -// made by this public key, of signed. -func (pk *PublicKey) VerifySubkeyRevocationSignature(sig *Signature, signed *PublicKey) (err error) { - preparedHash, err := sig.PrepareVerify() - if err != nil { - return err - } - h, err := keySignatureHash(pk, signed, preparedHash) - if err != nil { - return err - } - return pk.VerifySignature(h, sig) -} - -// userIdSignatureHash returns a Hash of the message that needs to be signed -// to assert that pk is a valid key for id. -func userIdSignatureHash(id string, pk *PublicKey, h hash.Hash) (err error) { - - // RFC 4880, section 5.2.4 - if err := pk.SerializeSignaturePrefix(h); err != nil { - return err - } - if err := pk.serializeWithoutHeaders(h); err != nil { - return err - } - - var buf [5]byte - buf[0] = 0xb4 - buf[1] = byte(len(id) >> 24) - buf[2] = byte(len(id) >> 16) - buf[3] = byte(len(id) >> 8) - buf[4] = byte(len(id)) - h.Write(buf[:]) - h.Write([]byte(id)) - - return nil -} - -// directKeySignatureHash returns a Hash of the message that needs to be signed. -func directKeySignatureHash(pk *PublicKey, h hash.Hash) (err error) { - return pk.SerializeForHash(h) -} - -// VerifyUserIdHashTag returns nil iff sig appears to be a plausible signature over this -// public key and UserId, based solely on its HashTag -func (pk *PublicKey) VerifyUserIdHashTag(id string, sig *Signature) (err error) { - preparedHash, err := sig.PrepareVerify() - if err != nil { - return err - } - err = userIdSignatureHash(id, pk, preparedHash) - if err != nil { - return err - } - return VerifyHashTag(preparedHash, sig) -} - -// VerifyUserIdSignature returns nil iff sig is a valid signature, made by this -// public key, that id is the identity of pub. -func (pk *PublicKey) VerifyUserIdSignature(id string, pub *PublicKey, sig *Signature) (err error) { - h, err := sig.PrepareVerify() - if err != nil { - return err - } - if err := userIdSignatureHash(id, pub, h); err != nil { - return err - } - return pk.VerifySignature(h, sig) -} - -// VerifyDirectKeySignature returns nil iff sig is a valid signature, made by this -// public key. -func (pk *PublicKey) VerifyDirectKeySignature(sig *Signature) (err error) { - h, err := sig.PrepareVerify() - if err != nil { - return err - } - if err := directKeySignatureHash(pk, h); err != nil { - return err - } - return pk.VerifySignature(h, sig) -} - -// KeyIdString returns the public key's fingerprint in capital hex -// (e.g. "6C7EE1B8621CC013"). -func (pk *PublicKey) KeyIdString() string { - return fmt.Sprintf("%016X", pk.KeyId) -} - -// KeyIdShortString returns the short form of public key's fingerprint -// in capital hex, as shown by gpg --list-keys (e.g. "621CC013"). -// This function will return the full key id for v5 and v6 keys -// since the short key id is undefined for them. -func (pk *PublicKey) KeyIdShortString() string { - if pk.Version >= 5 { - return pk.KeyIdString() - } - return fmt.Sprintf("%X", pk.Fingerprint[16:20]) -} - -// BitLength returns the bit length for the given public key. -func (pk *PublicKey) BitLength() (bitLength uint16, err error) { - switch pk.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly: - bitLength = pk.n.BitLength() - case PubKeyAlgoDSA: - bitLength = pk.p.BitLength() - case PubKeyAlgoElGamal: - bitLength = pk.p.BitLength() - case PubKeyAlgoECDSA: - bitLength = pk.p.BitLength() - case PubKeyAlgoECDH: - bitLength = pk.p.BitLength() - case PubKeyAlgoEdDSA: - bitLength = pk.p.BitLength() - case PubKeyAlgoX25519: - bitLength = x25519.KeySize * 8 - case PubKeyAlgoX448: - bitLength = x448.KeySize * 8 - case PubKeyAlgoEd25519: - bitLength = ed25519.PublicKeySize * 8 - case PubKeyAlgoEd448: - bitLength = ed448.PublicKeySize * 8 - default: - err = errors.InvalidArgumentError("bad public-key algorithm") - } - return -} - -// Curve returns the used elliptic curve of this public key. -// Returns an error if no elliptic curve is used. -func (pk *PublicKey) Curve() (curve Curve, err error) { - switch pk.PubKeyAlgo { - case PubKeyAlgoECDSA, PubKeyAlgoECDH, PubKeyAlgoEdDSA: - curveInfo := ecc.FindByOid(pk.oid) - if curveInfo == nil { - return "", errors.UnsupportedError(fmt.Sprintf("unknown oid: %x", pk.oid)) - } - curve = Curve(curveInfo.GenName) - case PubKeyAlgoEd25519, PubKeyAlgoX25519: - curve = Curve25519 - case PubKeyAlgoEd448, PubKeyAlgoX448: - curve = Curve448 - default: - err = errors.InvalidArgumentError("public key does not operate with an elliptic curve") - } - return -} - -// KeyExpired returns whether sig is a self-signature of a key that has -// expired or is created in the future. -func (pk *PublicKey) KeyExpired(sig *Signature, currentTime time.Time) bool { - if pk.CreationTime.Unix() > currentTime.Unix() { - return true - } - if sig.KeyLifetimeSecs == nil || *sig.KeyLifetimeSecs == 0 { - return false - } - expiry := pk.CreationTime.Add(time.Duration(*sig.KeyLifetimeSecs) * time.Second) - return currentTime.Unix() > expiry.Unix() -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key_test_data.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key_test_data.go deleted file mode 100644 index b255f1f6f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key_test_data.go +++ /dev/null @@ -1,24 +0,0 @@ -package packet - -const rsaFingerprintHex = "5fb74b1d03b1e3cb31bc2f8aa34d7e18c20c31bb" - -const rsaPkDataHex = "988d044d3c5c10010400b1d13382944bd5aba23a4312968b5095d14f947f600eb478e14a6fcb16b0e0cac764884909c020bc495cfcc39a935387c661507bdb236a0612fb582cac3af9b29cc2c8c70090616c41b662f4da4c1201e195472eb7f4ae1ccbcbf9940fe21d985e379a5563dde5b9a23d35f1cfaa5790da3b79db26f23695107bfaca8e7b5bcd0011010001" - -const dsaFingerprintHex = "eece4c094db002103714c63c8e8fbe54062f19ed" - -const dsaPkDataHex = "9901a2044d432f89110400cd581334f0d7a1e1bdc8b9d6d8c0baf68793632735d2bb0903224cbaa1dfbf35a60ee7a13b92643421e1eb41aa8d79bea19a115a677f6b8ba3c7818ce53a6c2a24a1608bd8b8d6e55c5090cbde09dd26e356267465ae25e69ec8bdd57c7bbb2623e4d73336f73a0a9098f7f16da2e25252130fd694c0e8070c55a812a423ae7f00a0ebf50e70c2f19c3520a551bd4b08d30f23530d3d03ff7d0bf4a53a64a09dc5e6e6e35854b7d70c882b0c60293401958b1bd9e40abec3ea05ba87cf64899299d4bd6aa7f459c201d3fbbd6c82004bdc5e8a9eb8082d12054cc90fa9d4ec251a843236a588bf49552441817436c4f43326966fe85447d4e6d0acf8fa1ef0f014730770603ad7634c3088dc52501c237328417c31c89ed70400b2f1a98b0bf42f11fefc430704bebbaa41d9f355600c3facee1e490f64208e0e094ea55e3a598a219a58500bf78ac677b670a14f4e47e9cf8eab4f368cc1ddcaa18cc59309d4cc62dd4f680e73e6cc3e1ce87a84d0925efbcb26c575c093fc42eecf45135fabf6403a25c2016e1774c0484e440a18319072c617cc97ac0a3bb0" - -const ecdsaFingerprintHex = "9892270b38b8980b05c8d56d43fe956c542ca00b" - -const ecdsaPkDataHex = "9893045071c29413052b8104002304230401f4867769cedfa52c325018896245443968e52e51d0c2df8d939949cb5b330f2921711fbee1c9b9dddb95d15cb0255e99badeddda7cc23d9ddcaacbc290969b9f24019375d61c2e4e3b36953a28d8b2bc95f78c3f1d592fb24499be348656a7b17e3963187b4361afe497bc5f9f81213f04069f8e1fb9e6a6290ae295ca1a92b894396cb4" - -const ecdhFingerprintHex = "722354df2475a42164d1d49faa8b938f9a201946" - -const ecdhPkDataHex = "b90073044d53059212052b810400220303042faa84024a20b6735c4897efa5bfb41bf85b7eefeab5ca0cb9ffc8ea04a46acb25534a577694f9e25340a4ab5223a9dd1eda530c8aa2e6718db10d7e672558c7736fe09369ea5739a2a3554bf16d41faa50562f11c6d39bbd5dffb6b9a9ec91803010909" - -const eddsaFingerprintHex = "b2d5e5ec0e6deca6bc8eeeb00907e75e1dd99ad8" - -const eddsaPkDataHex = "98330456e2132b16092b06010401da470f01010740bbda39266affa511a8c2d02edf690fb784b0499c4406185811a163539ef11dc1b41d74657374696e67203c74657374696e674074657374696e672e636f6d3e8879041316080021050256e2132b021b03050b09080702061508090a0b020416020301021e01021780000a09100907e75e1dd99ad86d0c00fe39d2008359352782bc9b61ac382584cd8eff3f57a18c2287e3afeeb05d1f04ba00fe2d0bc1ddf3ff8adb9afa3e7d9287244b4ec567f3db4d60b74a9b5465ed528203" - -// Source: https://sites.google.com/site/brainhub/pgpecckeys#TOC-ECC-NIST-P-384-key -const ecc384PubHex = `99006f044d53059213052b81040022030304f6b8c5aced5b84ef9f4a209db2e4a9dfb70d28cb8c10ecd57674a9fa5a67389942b62d5e51367df4c7bfd3f8e500feecf07ed265a621a8ebbbe53e947ec78c677eba143bd1533c2b350e1c29f82313e1e1108eba063be1e64b10e6950e799c2db42465635f6473615f64685f333834203c6f70656e70677040627261696e6875622e6f72673e8900cb04101309005305024d530592301480000000002000077072656665727265642d656d61696c2d656e636f64696e67407067702e636f6d7067706d696d65040b090807021901051b03000000021602051e010000000415090a08000a0910098033880f54719fca2b0180aa37350968bd5f115afd8ce7bc7b103822152dbff06d0afcda835329510905b98cb469ba208faab87c7412b799e7b633017f58364ea480e8a1a3f253a0c5f22c446e8be9a9fce6210136ee30811abbd49139de28b5bdf8dc36d06ae748579e9ff503b90073044d53059212052b810400220303042faa84024a20b6735c4897efa5bfb41bf85b7eefeab5ca0cb9ffc8ea04a46acb25534a577694f9e25340a4ab5223a9dd1eda530c8aa2e6718db10d7e672558c7736fe09369ea5739a2a3554bf16d41faa50562f11c6d39bbd5dffb6b9a9ec9180301090989008404181309000c05024d530592051b0c000000000a0910098033880f54719f80970180eee7a6d8fcee41ee4f9289df17f9bcf9d955dca25c583b94336f3a2b2d4986dc5cf417b8d2dc86f741a9e1a6d236c0e3017d1c76575458a0cfb93ae8a2b274fcc65ceecd7a91eec83656ba13219969f06945b48c56bd04152c3a0553c5f2f4bd1267` diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/reader.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/reader.go deleted file mode 100644 index dd8409239..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/reader.go +++ /dev/null @@ -1,209 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -type PacketReader interface { - Next() (p Packet, err error) - Push(reader io.Reader) (err error) - Unread(p Packet) -} - -// Reader reads packets from an io.Reader and allows packets to be 'unread' so -// that they result from the next call to Next. -type Reader struct { - q []Packet - readers []io.Reader -} - -// New io.Readers are pushed when a compressed or encrypted packet is processed -// and recursively treated as a new source of packets. However, a carefully -// crafted packet can trigger an infinite recursive sequence of packets. See -// http://mumble.net/~campbell/misc/pgp-quine -// https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4402 -// This constant limits the number of recursive packets that may be pushed. -const maxReaders = 32 - -// Next returns the most recently unread Packet, or reads another packet from -// the top-most io.Reader. Unknown/unsupported/Marker packet types are skipped. -func (r *Reader) Next() (p Packet, err error) { - for { - p, err := r.read() - if err == io.EOF { - break - } else if err != nil { - if _, ok := err.(errors.UnknownPacketTypeError); ok { - continue - } - if _, ok := err.(errors.UnsupportedError); ok { - switch p.(type) { - case *SymmetricallyEncrypted, *AEADEncrypted, *Compressed, *LiteralData: - return nil, err - } - continue - } - return nil, err - } else { - //A marker packet MUST be ignored when received - switch p.(type) { - case *Marker: - continue - } - return p, nil - } - } - return nil, io.EOF -} - -// Next returns the most recently unread Packet, or reads another packet from -// the top-most io.Reader. Unknown/Marker packet types are skipped while unsupported -// packets are returned as UnsupportedPacket type. -func (r *Reader) NextWithUnsupported() (p Packet, err error) { - for { - p, err = r.read() - if err == io.EOF { - break - } else if err != nil { - if _, ok := err.(errors.UnknownPacketTypeError); ok { - continue - } - if casteErr, ok := err.(errors.UnsupportedError); ok { - return &UnsupportedPacket{ - IncompletePacket: p, - Error: casteErr, - }, nil - } - return - } else { - //A marker packet MUST be ignored when received - switch p.(type) { - case *Marker: - continue - } - return - } - } - return nil, io.EOF -} - -func (r *Reader) read() (p Packet, err error) { - if len(r.q) > 0 { - p = r.q[len(r.q)-1] - r.q = r.q[:len(r.q)-1] - return - } - for len(r.readers) > 0 { - p, err = Read(r.readers[len(r.readers)-1]) - if err == io.EOF { - r.readers = r.readers[:len(r.readers)-1] - continue - } - return p, err - } - return nil, io.EOF -} - -// Push causes the Reader to start reading from a new io.Reader. When an EOF -// error is seen from the new io.Reader, it is popped and the Reader continues -// to read from the next most recent io.Reader. Push returns a StructuralError -// if pushing the reader would exceed the maximum recursion level, otherwise it -// returns nil. -func (r *Reader) Push(reader io.Reader) (err error) { - if len(r.readers) >= maxReaders { - return errors.StructuralError("too many layers of packets") - } - r.readers = append(r.readers, reader) - return nil -} - -// Unread causes the given Packet to be returned from the next call to Next. -func (r *Reader) Unread(p Packet) { - r.q = append(r.q, p) -} - -func NewReader(r io.Reader) *Reader { - return &Reader{ - q: nil, - readers: []io.Reader{r}, - } -} - -// CheckReader is similar to Reader but additionally -// uses the pushdown automata to verify the read packet sequence. -type CheckReader struct { - Reader - verifier *SequenceVerifier - fullyRead bool -} - -// Next returns the most recently unread Packet, or reads another packet from -// the top-most io.Reader. Unknown packet types are skipped. -// If the read packet sequence does not conform to the packet composition -// rules in rfc4880, it returns an error. -func (r *CheckReader) Next() (p Packet, err error) { - if r.fullyRead { - return nil, io.EOF - } - if len(r.q) > 0 { - p = r.q[len(r.q)-1] - r.q = r.q[:len(r.q)-1] - return - } - var errMsg error - for len(r.readers) > 0 { - p, errMsg, err = ReadWithCheck(r.readers[len(r.readers)-1], r.verifier) - if errMsg != nil { - err = errMsg - return - } - if err == nil { - return - } - if err == io.EOF { - r.readers = r.readers[:len(r.readers)-1] - continue - } - //A marker packet MUST be ignored when received - switch p.(type) { - case *Marker: - continue - } - if _, ok := err.(errors.UnknownPacketTypeError); ok { - continue - } - if _, ok := err.(errors.UnsupportedError); ok { - switch p.(type) { - case *SymmetricallyEncrypted, *AEADEncrypted, *Compressed, *LiteralData: - return nil, err - } - continue - } - return nil, err - } - if errMsg = r.verifier.Next(EOSSymbol); errMsg != nil { - return nil, errMsg - } - if errMsg = r.verifier.AssertValid(); errMsg != nil { - return nil, errMsg - } - r.fullyRead = true - return nil, io.EOF -} - -func NewCheckReader(r io.Reader) *CheckReader { - return &CheckReader{ - Reader: Reader{ - q: nil, - readers: []io.Reader{r}, - }, - verifier: NewSequenceVerifier(), - fullyRead: false, - } -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/recipient.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/recipient.go deleted file mode 100644 index fb2e362e4..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/recipient.go +++ /dev/null @@ -1,15 +0,0 @@ -package packet - -// Recipient type represents a Intended Recipient Fingerprint subpacket -// See https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh#name-intended-recipient-fingerpr -type Recipient struct { - KeyVersion int - Fingerprint []byte -} - -func (r *Recipient) Serialize() []byte { - packet := make([]byte, len(r.Fingerprint)+1) - packet[0] = byte(r.KeyVersion) - copy(packet[1:], r.Fingerprint) - return packet -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/signature.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/signature.go deleted file mode 100644 index 84dd3b86f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/signature.go +++ /dev/null @@ -1,1511 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "bytes" - "crypto" - "crypto/dsa" - "encoding/asn1" - "encoding/binary" - "hash" - "io" - "math/big" - "strconv" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/ecdsa" - "github.com/ProtonMail/go-crypto/openpgp/ed25519" - "github.com/ProtonMail/go-crypto/openpgp/ed448" - "github.com/ProtonMail/go-crypto/openpgp/eddsa" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "github.com/ProtonMail/go-crypto/openpgp/internal/encoding" -) - -const ( - // First octet of key flags. - // See RFC 9580, section 5.2.3.29 for details. - KeyFlagCertify = 1 << iota - KeyFlagSign - KeyFlagEncryptCommunications - KeyFlagEncryptStorage - KeyFlagSplitKey - KeyFlagAuthenticate - _ - KeyFlagGroupKey -) - -const ( - // First octet of keyserver preference flags. - // See RFC 9580, section 5.2.3.25 for details. - _ = 1 << iota - _ - _ - _ - _ - _ - _ - KeyserverPrefNoModify -) - -const SaltNotationName = "salt@notations.openpgpjs.org" - -// Signature represents a signature. See RFC 9580, section 5.2. -type Signature struct { - Version int - SigType SignatureType - PubKeyAlgo PublicKeyAlgorithm - Hash crypto.Hash - // salt contains a random salt value for v6 signatures - // See RFC 9580 Section 5.2.4. - salt []byte - - // HashSuffix is extra data that is hashed in after the signed data. - HashSuffix []byte - // HashTag contains the first two bytes of the hash for fast rejection - // of bad signed data. - HashTag [2]byte - - // Metadata includes format, filename and time, and is protected by v5 - // signatures of type 0x00 or 0x01. This metadata is included into the hash - // computation; if nil, six 0x00 bytes are used instead. See section 5.2.4. - Metadata *LiteralData - - CreationTime time.Time - - RSASignature encoding.Field - DSASigR, DSASigS encoding.Field - ECDSASigR, ECDSASigS encoding.Field - EdDSASigR, EdDSASigS encoding.Field - EdSig []byte - - // rawSubpackets contains the unparsed subpackets, in order. - rawSubpackets []outputSubpacket - - // The following are optional so are nil when not included in the - // signature. - - SigLifetimeSecs, KeyLifetimeSecs *uint32 - PreferredSymmetric, PreferredHash, PreferredCompression []uint8 - PreferredCipherSuites [][2]uint8 - IssuerKeyId *uint64 - IssuerFingerprint []byte - SignerUserId *string - IsPrimaryId *bool - Notations []*Notation - IntendedRecipients []*Recipient - - // TrustLevel and TrustAmount can be set by the signer to assert that - // the key is not only valid but also trustworthy at the specified - // level. - // See RFC 9580, section 5.2.3.21 for details. - TrustLevel TrustLevel - TrustAmount TrustAmount - - // TrustRegularExpression can be used in conjunction with trust Signature - // packets to limit the scope of the trust that is extended. - // See RFC 9580, section 5.2.3.22 for details. - TrustRegularExpression *string - - // KeyserverPrefsValid is set if any keyserver preferences were given. See RFC 9580, section - // 5.2.3.25 for details. - KeyserverPrefsValid bool - KeyserverPrefNoModify bool - - // PreferredKeyserver can be set to a URI where the latest version of the - // key that this signature is made over can be found. See RFC 9580, section - // 5.2.3.26 for details. - PreferredKeyserver string - - // PolicyURI can be set to the URI of a document that describes the - // policy under which the signature was issued. See RFC 9580, section - // 5.2.3.28 for details. - PolicyURI string - - // FlagsValid is set if any flags were given. See RFC 9580, section - // 5.2.3.29 for details. - FlagsValid bool - FlagCertify, FlagSign, FlagEncryptCommunications, FlagEncryptStorage, FlagSplitKey, FlagAuthenticate, FlagGroupKey bool - - // RevocationReason is set if this signature has been revoked. - // See RFC 9580, section 5.2.3.31 for details. - RevocationReason *ReasonForRevocation - RevocationReasonText string - - // In a self-signature, these flags are set there is a features subpacket - // indicating that the issuer implementation supports these features - // see https://datatracker.ietf.org/doc/html/draft-ietf-openpgp-crypto-refresh#features-subpacket - SEIPDv1, SEIPDv2 bool - - // EmbeddedSignature, if non-nil, is a signature of the parent key, by - // this key. This prevents an attacker from claiming another's signing - // subkey as their own. - EmbeddedSignature *Signature - - outSubpackets []outputSubpacket -} - -// VerifiableSignature internally keeps state if the -// the signature has been verified before. -type VerifiableSignature struct { - Valid *bool // nil if it has not been verified yet - Packet *Signature -} - -// NewVerifiableSig returns a struct of type VerifiableSignature referencing the input signature. -func NewVerifiableSig(signature *Signature) *VerifiableSignature { - return &VerifiableSignature{ - Packet: signature, - } -} - -// Salt returns the signature salt for v6 signatures. -func (sig *Signature) Salt() []byte { - if sig == nil { - return nil - } - return sig.salt -} - -func (sig *Signature) parse(r io.Reader) (err error) { - // RFC 9580, section 5.2.3 - var buf [7]byte - _, err = readFull(r, buf[:1]) - if err != nil { - return - } - sig.Version = int(buf[0]) - if sig.Version != 4 && sig.Version != 5 && sig.Version != 6 { - err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0]))) - return - } - - if V5Disabled && sig.Version == 5 { - return errors.UnsupportedError("support for parsing v5 entities is disabled; build with `-tags v5` if needed") - } - - if sig.Version == 6 { - _, err = readFull(r, buf[:7]) - } else { - _, err = readFull(r, buf[:5]) - } - if err != nil { - return - } - sig.SigType = SignatureType(buf[0]) - sig.PubKeyAlgo = PublicKeyAlgorithm(buf[1]) - switch sig.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA, PubKeyAlgoECDSA, PubKeyAlgoEdDSA, PubKeyAlgoEd25519, PubKeyAlgoEd448: - default: - err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo))) - return - } - - var ok bool - - if sig.Version < 5 { - sig.Hash, ok = algorithm.HashIdToHashWithSha1(buf[2]) - } else { - sig.Hash, ok = algorithm.HashIdToHash(buf[2]) - } - - if !ok { - return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2]))) - } - - var hashedSubpacketsLength int - if sig.Version == 6 { - // For a v6 signature, a four-octet length is used. - hashedSubpacketsLength = - int(buf[3])<<24 | - int(buf[4])<<16 | - int(buf[5])<<8 | - int(buf[6]) - } else { - hashedSubpacketsLength = int(buf[3])<<8 | int(buf[4]) - } - hashedSubpackets := make([]byte, hashedSubpacketsLength) - _, err = readFull(r, hashedSubpackets) - if err != nil { - return - } - err = sig.buildHashSuffix(hashedSubpackets) - if err != nil { - return - } - - err = parseSignatureSubpackets(sig, hashedSubpackets, true) - if err != nil { - return - } - - if sig.Version == 6 { - _, err = readFull(r, buf[:4]) - } else { - _, err = readFull(r, buf[:2]) - } - - if err != nil { - return - } - var unhashedSubpacketsLength uint32 - if sig.Version == 6 { - unhashedSubpacketsLength = uint32(buf[0])<<24 | uint32(buf[1])<<16 | uint32(buf[2])<<8 | uint32(buf[3]) - } else { - unhashedSubpacketsLength = uint32(buf[0])<<8 | uint32(buf[1]) - } - unhashedSubpackets := make([]byte, unhashedSubpacketsLength) - _, err = readFull(r, unhashedSubpackets) - if err != nil { - return - } - err = parseSignatureSubpackets(sig, unhashedSubpackets, false) - if err != nil { - return - } - - _, err = readFull(r, sig.HashTag[:2]) - if err != nil { - return - } - - if sig.Version == 6 { - // Only for v6 signatures, a variable-length field containing the salt - _, err = readFull(r, buf[:1]) - if err != nil { - return - } - saltLength := int(buf[0]) - var expectedSaltLength int - expectedSaltLength, err = SaltLengthForHash(sig.Hash) - if err != nil { - return - } - if saltLength != expectedSaltLength { - err = errors.StructuralError("unexpected salt size for the given hash algorithm") - return - } - salt := make([]byte, expectedSaltLength) - _, err = readFull(r, salt) - if err != nil { - return - } - sig.salt = salt - } - - switch sig.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly: - sig.RSASignature = new(encoding.MPI) - _, err = sig.RSASignature.ReadFrom(r) - case PubKeyAlgoDSA: - sig.DSASigR = new(encoding.MPI) - if _, err = sig.DSASigR.ReadFrom(r); err != nil { - return - } - - sig.DSASigS = new(encoding.MPI) - _, err = sig.DSASigS.ReadFrom(r) - case PubKeyAlgoECDSA: - sig.ECDSASigR = new(encoding.MPI) - if _, err = sig.ECDSASigR.ReadFrom(r); err != nil { - return - } - - sig.ECDSASigS = new(encoding.MPI) - _, err = sig.ECDSASigS.ReadFrom(r) - case PubKeyAlgoEdDSA: - sig.EdDSASigR = new(encoding.MPI) - if _, err = sig.EdDSASigR.ReadFrom(r); err != nil { - return - } - - sig.EdDSASigS = new(encoding.MPI) - if _, err = sig.EdDSASigS.ReadFrom(r); err != nil { - return - } - case PubKeyAlgoEd25519: - sig.EdSig, err = ed25519.ReadSignature(r) - if err != nil { - return - } - case PubKeyAlgoEd448: - sig.EdSig, err = ed448.ReadSignature(r) - if err != nil { - return - } - default: - panic("unreachable") - } - return -} - -// parseSignatureSubpackets parses subpackets of the main signature packet. See -// RFC 9580, section 5.2.3.1. -func parseSignatureSubpackets(sig *Signature, subpackets []byte, isHashed bool) (err error) { - for len(subpackets) > 0 { - subpackets, err = parseSignatureSubpacket(sig, subpackets, isHashed) - if err != nil { - return - } - } - - if sig.CreationTime.IsZero() { - err = errors.StructuralError("no creation time in signature") - } - - return -} - -type signatureSubpacketType uint8 - -const ( - creationTimeSubpacket signatureSubpacketType = 2 - signatureExpirationSubpacket signatureSubpacketType = 3 - exportableCertSubpacket signatureSubpacketType = 4 - trustSubpacket signatureSubpacketType = 5 - regularExpressionSubpacket signatureSubpacketType = 6 - keyExpirationSubpacket signatureSubpacketType = 9 - prefSymmetricAlgosSubpacket signatureSubpacketType = 11 - issuerSubpacket signatureSubpacketType = 16 - notationDataSubpacket signatureSubpacketType = 20 - prefHashAlgosSubpacket signatureSubpacketType = 21 - prefCompressionSubpacket signatureSubpacketType = 22 - keyserverPrefsSubpacket signatureSubpacketType = 23 - prefKeyserverSubpacket signatureSubpacketType = 24 - primaryUserIdSubpacket signatureSubpacketType = 25 - policyUriSubpacket signatureSubpacketType = 26 - keyFlagsSubpacket signatureSubpacketType = 27 - signerUserIdSubpacket signatureSubpacketType = 28 - reasonForRevocationSubpacket signatureSubpacketType = 29 - featuresSubpacket signatureSubpacketType = 30 - embeddedSignatureSubpacket signatureSubpacketType = 32 - issuerFingerprintSubpacket signatureSubpacketType = 33 - intendedRecipientSubpacket signatureSubpacketType = 35 - prefCipherSuitesSubpacket signatureSubpacketType = 39 -) - -// parseSignatureSubpacket parses a single subpacket. len(subpacket) is >= 1. -func parseSignatureSubpacket(sig *Signature, subpacket []byte, isHashed bool) (rest []byte, err error) { - // RFC 9580, section 5.2.3.7 - var ( - length uint32 - packetType signatureSubpacketType - isCritical bool - ) - if len(subpacket) == 0 { - err = errors.StructuralError("zero length signature subpacket") - return - } - switch { - case subpacket[0] < 192: - length = uint32(subpacket[0]) - subpacket = subpacket[1:] - case subpacket[0] < 255: - if len(subpacket) < 2 { - goto Truncated - } - length = uint32(subpacket[0]-192)<<8 + uint32(subpacket[1]) + 192 - subpacket = subpacket[2:] - default: - if len(subpacket) < 5 { - goto Truncated - } - length = uint32(subpacket[1])<<24 | - uint32(subpacket[2])<<16 | - uint32(subpacket[3])<<8 | - uint32(subpacket[4]) - subpacket = subpacket[5:] - } - if length > uint32(len(subpacket)) { - goto Truncated - } - rest = subpacket[length:] - subpacket = subpacket[:length] - if len(subpacket) == 0 { - err = errors.StructuralError("zero length signature subpacket") - return - } - packetType = signatureSubpacketType(subpacket[0] & 0x7f) - isCritical = subpacket[0]&0x80 == 0x80 - subpacket = subpacket[1:] - sig.rawSubpackets = append(sig.rawSubpackets, outputSubpacket{isHashed, packetType, isCritical, subpacket}) - if !isHashed && - packetType != issuerSubpacket && - packetType != issuerFingerprintSubpacket && - packetType != embeddedSignatureSubpacket { - return - } - switch packetType { - case creationTimeSubpacket: - if len(subpacket) != 4 { - err = errors.StructuralError("signature creation time not four bytes") - return - } - t := binary.BigEndian.Uint32(subpacket) - sig.CreationTime = time.Unix(int64(t), 0) - case signatureExpirationSubpacket: - // Signature expiration time, section 5.2.3.18 - if len(subpacket) != 4 { - err = errors.StructuralError("expiration subpacket with bad length") - return - } - sig.SigLifetimeSecs = new(uint32) - *sig.SigLifetimeSecs = binary.BigEndian.Uint32(subpacket) - case exportableCertSubpacket: - if subpacket[0] == 0 { - err = errors.UnsupportedError("signature with non-exportable certification") - return - } - case trustSubpacket: - if len(subpacket) != 2 { - err = errors.StructuralError("trust subpacket with bad length") - return - } - // Trust level and amount, section 5.2.3.21 - sig.TrustLevel = TrustLevel(subpacket[0]) - sig.TrustAmount = TrustAmount(subpacket[1]) - case regularExpressionSubpacket: - if len(subpacket) == 0 { - err = errors.StructuralError("regexp subpacket with bad length") - return - } - // Trust regular expression, section 5.2.3.22 - // RFC specifies the string should be null-terminated; remove a null byte from the end - if subpacket[len(subpacket)-1] != 0x00 { - err = errors.StructuralError("expected regular expression to be null-terminated") - return - } - trustRegularExpression := string(subpacket[:len(subpacket)-1]) - sig.TrustRegularExpression = &trustRegularExpression - case keyExpirationSubpacket: - // Key expiration time, section 5.2.3.13 - if len(subpacket) != 4 { - err = errors.StructuralError("key expiration subpacket with bad length") - return - } - sig.KeyLifetimeSecs = new(uint32) - *sig.KeyLifetimeSecs = binary.BigEndian.Uint32(subpacket) - case prefSymmetricAlgosSubpacket: - // Preferred symmetric algorithms, section 5.2.3.14 - sig.PreferredSymmetric = make([]byte, len(subpacket)) - copy(sig.PreferredSymmetric, subpacket) - case issuerSubpacket: - // Issuer, section 5.2.3.12 - if sig.Version > 4 && isHashed { - err = errors.StructuralError("issuer subpacket found in v6 key") - return - } - if len(subpacket) != 8 { - err = errors.StructuralError("issuer subpacket with bad length") - return - } - if sig.Version <= 4 { - sig.IssuerKeyId = new(uint64) - *sig.IssuerKeyId = binary.BigEndian.Uint64(subpacket) - } - case notationDataSubpacket: - // Notation data, section 5.2.3.24 - if len(subpacket) < 8 { - err = errors.StructuralError("notation data subpacket with bad length") - return - } - - nameLength := uint32(subpacket[4])<<8 | uint32(subpacket[5]) - valueLength := uint32(subpacket[6])<<8 | uint32(subpacket[7]) - if len(subpacket) != int(nameLength)+int(valueLength)+8 { - err = errors.StructuralError("notation data subpacket with bad length") - return - } - - notation := Notation{ - IsHumanReadable: (subpacket[0] & 0x80) == 0x80, - Name: string(subpacket[8:(nameLength + 8)]), - Value: subpacket[(nameLength + 8):(valueLength + nameLength + 8)], - IsCritical: isCritical, - } - - sig.Notations = append(sig.Notations, ¬ation) - case prefHashAlgosSubpacket: - // Preferred hash algorithms, section 5.2.3.16 - sig.PreferredHash = make([]byte, len(subpacket)) - copy(sig.PreferredHash, subpacket) - case prefCompressionSubpacket: - // Preferred compression algorithms, section 5.2.3.17 - sig.PreferredCompression = make([]byte, len(subpacket)) - copy(sig.PreferredCompression, subpacket) - case keyserverPrefsSubpacket: - // Keyserver preferences, section 5.2.3.25 - sig.KeyserverPrefsValid = true - if len(subpacket) == 0 { - return - } - if subpacket[0]&KeyserverPrefNoModify != 0 { - sig.KeyserverPrefNoModify = true - } - case prefKeyserverSubpacket: - // Preferred keyserver, section 5.2.3.26 - sig.PreferredKeyserver = string(subpacket) - case primaryUserIdSubpacket: - // Primary User ID, section 5.2.3.27 - if len(subpacket) != 1 { - err = errors.StructuralError("primary user id subpacket with bad length") - return - } - sig.IsPrimaryId = new(bool) - if subpacket[0] > 0 { - *sig.IsPrimaryId = true - } - case keyFlagsSubpacket: - // Key flags, section 5.2.3.29 - sig.FlagsValid = true - if len(subpacket) == 0 { - return - } - if subpacket[0]&KeyFlagCertify != 0 { - sig.FlagCertify = true - } - if subpacket[0]&KeyFlagSign != 0 { - sig.FlagSign = true - } - if subpacket[0]&KeyFlagEncryptCommunications != 0 { - sig.FlagEncryptCommunications = true - } - if subpacket[0]&KeyFlagEncryptStorage != 0 { - sig.FlagEncryptStorage = true - } - if subpacket[0]&KeyFlagSplitKey != 0 { - sig.FlagSplitKey = true - } - if subpacket[0]&KeyFlagAuthenticate != 0 { - sig.FlagAuthenticate = true - } - if subpacket[0]&KeyFlagGroupKey != 0 { - sig.FlagGroupKey = true - } - case signerUserIdSubpacket: - userId := string(subpacket) - sig.SignerUserId = &userId - case reasonForRevocationSubpacket: - // Reason For Revocation, section 5.2.3.31 - if len(subpacket) == 0 { - err = errors.StructuralError("empty revocation reason subpacket") - return - } - sig.RevocationReason = new(ReasonForRevocation) - *sig.RevocationReason = NewReasonForRevocation(subpacket[0]) - sig.RevocationReasonText = string(subpacket[1:]) - case featuresSubpacket: - // Features subpacket, section 5.2.3.32 specifies a very general - // mechanism for OpenPGP implementations to signal support for new - // features. - if len(subpacket) > 0 { - if subpacket[0]&0x01 != 0 { - sig.SEIPDv1 = true - } - // 0x02 and 0x04 are reserved - if subpacket[0]&0x08 != 0 { - sig.SEIPDv2 = true - } - } - case embeddedSignatureSubpacket: - // Only usage is in signatures that cross-certify - // signing subkeys. section 5.2.3.34 describes the - // format, with its usage described in section 11.1 - if sig.EmbeddedSignature != nil { - err = errors.StructuralError("Cannot have multiple embedded signatures") - return - } - sig.EmbeddedSignature = new(Signature) - if err := sig.EmbeddedSignature.parse(bytes.NewBuffer(subpacket)); err != nil { - return nil, err - } - if sigType := sig.EmbeddedSignature.SigType; sigType != SigTypePrimaryKeyBinding { - return nil, errors.StructuralError("cross-signature has unexpected type " + strconv.Itoa(int(sigType))) - } - case policyUriSubpacket: - // Policy URI, section 5.2.3.28 - sig.PolicyURI = string(subpacket) - case issuerFingerprintSubpacket: - if len(subpacket) == 0 { - err = errors.StructuralError("empty issuer fingerprint subpacket") - return - } - v, l := subpacket[0], len(subpacket[1:]) - if v >= 5 && l != 32 || v < 5 && l != 20 { - return nil, errors.StructuralError("bad fingerprint length") - } - sig.IssuerFingerprint = make([]byte, l) - copy(sig.IssuerFingerprint, subpacket[1:]) - sig.IssuerKeyId = new(uint64) - if v >= 5 { - *sig.IssuerKeyId = binary.BigEndian.Uint64(subpacket[1:9]) - } else { - *sig.IssuerKeyId = binary.BigEndian.Uint64(subpacket[13:21]) - } - case intendedRecipientSubpacket: - // Intended Recipient Fingerprint, section 5.2.3.36 - if len(subpacket) < 1 { - return nil, errors.StructuralError("invalid intended recipient fingerpring length") - } - version, length := subpacket[0], len(subpacket[1:]) - if version >= 5 && length != 32 || version < 5 && length != 20 { - return nil, errors.StructuralError("invalid fingerprint length") - } - fingerprint := make([]byte, length) - copy(fingerprint, subpacket[1:]) - sig.IntendedRecipients = append(sig.IntendedRecipients, &Recipient{int(version), fingerprint}) - case prefCipherSuitesSubpacket: - // Preferred AEAD cipher suites, section 5.2.3.15 - if len(subpacket)%2 != 0 { - err = errors.StructuralError("invalid aead cipher suite length") - return - } - - sig.PreferredCipherSuites = make([][2]byte, len(subpacket)/2) - - for i := 0; i < len(subpacket)/2; i++ { - sig.PreferredCipherSuites[i] = [2]uint8{subpacket[2*i], subpacket[2*i+1]} - } - default: - if isCritical { - err = errors.UnsupportedError("unknown critical signature subpacket type " + strconv.Itoa(int(packetType))) - return - } - } - return - -Truncated: - err = errors.StructuralError("signature subpacket truncated") - return -} - -// subpacketLengthLength returns the length, in bytes, of an encoded length value. -func subpacketLengthLength(length int) int { - if length < 192 { - return 1 - } - if length < 16320 { - return 2 - } - return 5 -} - -func (sig *Signature) CheckKeyIdOrFingerprint(pk *PublicKey) bool { - if sig.IssuerFingerprint != nil && len(sig.IssuerFingerprint) >= 20 { - return bytes.Equal(sig.IssuerFingerprint, pk.Fingerprint) - } - return sig.IssuerKeyId != nil && *sig.IssuerKeyId == pk.KeyId -} - -func (sig *Signature) CheckKeyIdOrFingerprintExplicit(fingerprint []byte, keyId uint64) bool { - if sig.IssuerFingerprint != nil && len(sig.IssuerFingerprint) >= 20 && fingerprint != nil { - return bytes.Equal(sig.IssuerFingerprint, fingerprint) - } - return sig.IssuerKeyId != nil && *sig.IssuerKeyId == keyId -} - -// serializeSubpacketLength marshals the given length into to. -func serializeSubpacketLength(to []byte, length int) int { - // RFC 9580, Section 4.2.1. - if length < 192 { - to[0] = byte(length) - return 1 - } - if length < 16320 { - length -= 192 - to[0] = byte((length >> 8) + 192) - to[1] = byte(length) - return 2 - } - to[0] = 255 - to[1] = byte(length >> 24) - to[2] = byte(length >> 16) - to[3] = byte(length >> 8) - to[4] = byte(length) - return 5 -} - -// subpacketsLength returns the serialized length, in bytes, of the given -// subpackets. -func subpacketsLength(subpackets []outputSubpacket, hashed bool) (length int) { - for _, subpacket := range subpackets { - if subpacket.hashed == hashed { - length += subpacketLengthLength(len(subpacket.contents) + 1) - length += 1 // type byte - length += len(subpacket.contents) - } - } - return -} - -// serializeSubpackets marshals the given subpackets into to. -func serializeSubpackets(to []byte, subpackets []outputSubpacket, hashed bool) { - for _, subpacket := range subpackets { - if subpacket.hashed == hashed { - n := serializeSubpacketLength(to, len(subpacket.contents)+1) - to[n] = byte(subpacket.subpacketType) - if subpacket.isCritical { - to[n] |= 0x80 - } - to = to[1+n:] - n = copy(to, subpacket.contents) - to = to[n:] - } - } -} - -// SigExpired returns whether sig is a signature that has expired or is created -// in the future. -func (sig *Signature) SigExpired(currentTime time.Time) bool { - if sig.CreationTime.Unix() > currentTime.Unix() { - return true - } - if sig.SigLifetimeSecs == nil || *sig.SigLifetimeSecs == 0 { - return false - } - expiry := sig.CreationTime.Add(time.Duration(*sig.SigLifetimeSecs) * time.Second) - return currentTime.Unix() > expiry.Unix() -} - -// buildHashSuffix constructs the HashSuffix member of sig in preparation for signing. -func (sig *Signature) buildHashSuffix(hashedSubpackets []byte) (err error) { - var hashId byte - var ok bool - - if sig.Version < 5 { - hashId, ok = algorithm.HashToHashIdWithSha1(sig.Hash) - } else { - hashId, ok = algorithm.HashToHashId(sig.Hash) - } - - if !ok { - sig.HashSuffix = nil - return errors.InvalidArgumentError("hash cannot be represented in OpenPGP: " + strconv.Itoa(int(sig.Hash))) - } - - hashedFields := bytes.NewBuffer([]byte{ - uint8(sig.Version), - uint8(sig.SigType), - uint8(sig.PubKeyAlgo), - uint8(hashId), - }) - hashedSubpacketsLength := len(hashedSubpackets) - if sig.Version == 6 { - // v6 signatures store the length in 4 octets - hashedFields.Write([]byte{ - uint8(hashedSubpacketsLength >> 24), - uint8(hashedSubpacketsLength >> 16), - uint8(hashedSubpacketsLength >> 8), - uint8(hashedSubpacketsLength), - }) - } else { - hashedFields.Write([]byte{ - uint8(hashedSubpacketsLength >> 8), - uint8(hashedSubpacketsLength), - }) - } - lenPrefix := hashedFields.Len() - hashedFields.Write(hashedSubpackets) - - var l uint64 = uint64(lenPrefix + len(hashedSubpackets)) - if sig.Version == 5 { - // v5 case - hashedFields.Write([]byte{0x05, 0xff}) - hashedFields.Write([]byte{ - uint8(l >> 56), uint8(l >> 48), uint8(l >> 40), uint8(l >> 32), - uint8(l >> 24), uint8(l >> 16), uint8(l >> 8), uint8(l), - }) - } else { - // v4 and v6 case - hashedFields.Write([]byte{byte(sig.Version), 0xff}) - hashedFields.Write([]byte{ - uint8(l >> 24), uint8(l >> 16), uint8(l >> 8), uint8(l), - }) - } - sig.HashSuffix = make([]byte, hashedFields.Len()) - copy(sig.HashSuffix, hashedFields.Bytes()) - return -} - -func (sig *Signature) signPrepareHash(h hash.Hash) (digest []byte, err error) { - hashedSubpacketsLen := subpacketsLength(sig.outSubpackets, true) - hashedSubpackets := make([]byte, hashedSubpacketsLen) - serializeSubpackets(hashedSubpackets, sig.outSubpackets, true) - err = sig.buildHashSuffix(hashedSubpackets) - if err != nil { - return - } - if sig.Version == 5 && (sig.SigType == 0x00 || sig.SigType == 0x01) { - sig.AddMetadataToHashSuffix() - } - - h.Write(sig.HashSuffix) - digest = h.Sum(nil) - copy(sig.HashTag[:], digest) - return -} - -// PrepareSign must be called to create a hash object before Sign for v6 signatures. -// The created hash object initially hashes a randomly generated salt -// as required by v6 signatures. The generated salt is stored in sig. If the signature is not v6, -// the method returns an empty hash object. -// See RFC 9580 Section 5.2.4. -func (sig *Signature) PrepareSign(config *Config) (hash.Hash, error) { - if !sig.Hash.Available() { - return nil, errors.UnsupportedError("hash function") - } - hasher := sig.Hash.New() - if sig.Version == 6 { - if sig.salt == nil { - var err error - sig.salt, err = SignatureSaltForHash(sig.Hash, config.Random()) - if err != nil { - return nil, err - } - } - hasher.Write(sig.salt) - } - return hasher, nil -} - -// SetSalt sets the signature salt for v6 signatures. -// Assumes salt is generated correctly and checks if length matches. -// If the signature is not v6, the method ignores the salt. -// Use PrepareSign whenever possible instead of generating and -// hashing the salt externally. -// See RFC 9580 Section 5.2.4. -func (sig *Signature) SetSalt(salt []byte) error { - if sig.Version == 6 { - expectedSaltLength, err := SaltLengthForHash(sig.Hash) - if err != nil { - return err - } - if salt == nil || len(salt) != expectedSaltLength { - return errors.InvalidArgumentError("unexpected salt size for the given hash algorithm") - } - sig.salt = salt - } - return nil -} - -// PrepareVerify must be called to create a hash object before verifying v6 signatures. -// The created hash object initially hashes the internally stored salt. -// If the signature is not v6, the method returns an empty hash object. -// See RFC 9580 Section 5.2.4. -func (sig *Signature) PrepareVerify() (hash.Hash, error) { - if !sig.Hash.Available() { - return nil, errors.UnsupportedError("hash function") - } - hasher := sig.Hash.New() - if sig.Version == 6 { - if sig.salt == nil { - return nil, errors.StructuralError("v6 requires a salt for the hash to be signed") - } - hasher.Write(sig.salt) - } - return hasher, nil -} - -// Sign signs a message with a private key. The hash, h, must contain -// the hash of the message to be signed and will be mutated by this function. -// On success, the signature is stored in sig. Call Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) Sign(h hash.Hash, priv *PrivateKey, config *Config) (err error) { - if priv.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - sig.Version = priv.PublicKey.Version - sig.IssuerFingerprint = priv.PublicKey.Fingerprint - if sig.Version < 6 && config.RandomizeSignaturesViaNotation() { - sig.removeNotationsWithName(SaltNotationName) - salt, err := SignatureSaltForHash(sig.Hash, config.Random()) - if err != nil { - return err - } - notation := Notation{ - Name: SaltNotationName, - Value: salt, - IsCritical: false, - IsHumanReadable: false, - } - sig.Notations = append(sig.Notations, ¬ation) - } - sig.outSubpackets, err = sig.buildSubpackets(priv.PublicKey) - if err != nil { - return err - } - digest, err := sig.signPrepareHash(h) - if err != nil { - return - } - switch priv.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly: - // supports both *rsa.PrivateKey and crypto.Signer - sigdata, err := priv.PrivateKey.(crypto.Signer).Sign(config.Random(), digest, sig.Hash) - if err == nil { - sig.RSASignature = encoding.NewMPI(sigdata) - } - case PubKeyAlgoDSA: - dsaPriv := priv.PrivateKey.(*dsa.PrivateKey) - - // Need to truncate hashBytes to match FIPS 186-3 section 4.6. - subgroupSize := (dsaPriv.Q.BitLen() + 7) / 8 - if len(digest) > subgroupSize { - digest = digest[:subgroupSize] - } - r, s, err := dsa.Sign(config.Random(), dsaPriv, digest) - if err == nil { - sig.DSASigR = new(encoding.MPI).SetBig(r) - sig.DSASigS = new(encoding.MPI).SetBig(s) - } - case PubKeyAlgoECDSA: - var r, s *big.Int - if sk, ok := priv.PrivateKey.(*ecdsa.PrivateKey); ok { - r, s, err = ecdsa.Sign(config.Random(), sk, digest) - } else { - var b []byte - b, err = priv.PrivateKey.(crypto.Signer).Sign(config.Random(), digest, sig.Hash) - if err == nil { - r, s, err = unwrapECDSASig(b) - } - } - - if err == nil { - sig.ECDSASigR = new(encoding.MPI).SetBig(r) - sig.ECDSASigS = new(encoding.MPI).SetBig(s) - } - case PubKeyAlgoEdDSA: - sk := priv.PrivateKey.(*eddsa.PrivateKey) - r, s, err := eddsa.Sign(sk, digest) - if err == nil { - sig.EdDSASigR = encoding.NewMPI(r) - sig.EdDSASigS = encoding.NewMPI(s) - } - case PubKeyAlgoEd25519: - sk := priv.PrivateKey.(*ed25519.PrivateKey) - signature, err := ed25519.Sign(sk, digest) - if err == nil { - sig.EdSig = signature - } - case PubKeyAlgoEd448: - sk := priv.PrivateKey.(*ed448.PrivateKey) - signature, err := ed448.Sign(sk, digest) - if err == nil { - sig.EdSig = signature - } - default: - err = errors.UnsupportedError("public key algorithm: " + strconv.Itoa(int(sig.PubKeyAlgo))) - } - - return -} - -// unwrapECDSASig parses the two integer components of an ASN.1-encoded ECDSA signature. -func unwrapECDSASig(b []byte) (r, s *big.Int, err error) { - var ecsdaSig struct { - R, S *big.Int - } - _, err = asn1.Unmarshal(b, &ecsdaSig) - if err != nil { - return - } - return ecsdaSig.R, ecsdaSig.S, nil -} - -// SignUserId computes a signature from priv, asserting that pub is a valid -// key for the identity id. On success, the signature is stored in sig. Call -// Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) SignUserId(id string, pub *PublicKey, priv *PrivateKey, config *Config) error { - if priv.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - prepareHash, err := sig.PrepareSign(config) - if err != nil { - return err - } - if err := userIdSignatureHash(id, pub, prepareHash); err != nil { - return err - } - return sig.Sign(prepareHash, priv, config) -} - -// SignDirectKeyBinding computes a signature from priv -// On success, the signature is stored in sig. -// Call Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) SignDirectKeyBinding(pub *PublicKey, priv *PrivateKey, config *Config) error { - if priv.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - prepareHash, err := sig.PrepareSign(config) - if err != nil { - return err - } - if err := directKeySignatureHash(pub, prepareHash); err != nil { - return err - } - return sig.Sign(prepareHash, priv, config) -} - -// CrossSignKey computes a signature from signingKey on pub hashed using hashKey. On success, -// the signature is stored in sig. Call Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) CrossSignKey(pub *PublicKey, hashKey *PublicKey, signingKey *PrivateKey, - config *Config) error { - prepareHash, err := sig.PrepareSign(config) - if err != nil { - return err - } - h, err := keySignatureHash(hashKey, pub, prepareHash) - if err != nil { - return err - } - return sig.Sign(h, signingKey, config) -} - -// SignKey computes a signature from priv, asserting that pub is a subkey. On -// success, the signature is stored in sig. Call Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) SignKey(pub *PublicKey, priv *PrivateKey, config *Config) error { - if priv.Dummy() { - return errors.ErrDummyPrivateKey("dummy key found") - } - prepareHash, err := sig.PrepareSign(config) - if err != nil { - return err - } - h, err := keySignatureHash(&priv.PublicKey, pub, prepareHash) - if err != nil { - return err - } - return sig.Sign(h, priv, config) -} - -// RevokeKey computes a revocation signature of pub using priv. On success, the signature is -// stored in sig. Call Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) RevokeKey(pub *PublicKey, priv *PrivateKey, config *Config) error { - prepareHash, err := sig.PrepareSign(config) - if err != nil { - return err - } - if err := keyRevocationHash(pub, prepareHash); err != nil { - return err - } - return sig.Sign(prepareHash, priv, config) -} - -// RevokeSubkey computes a subkey revocation signature of pub using priv. -// On success, the signature is stored in sig. Call Serialize to write it out. -// If config is nil, sensible defaults will be used. -func (sig *Signature) RevokeSubkey(pub *PublicKey, priv *PrivateKey, config *Config) error { - // Identical to a subkey binding signature - return sig.SignKey(pub, priv, config) -} - -// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been -// called first. -func (sig *Signature) Serialize(w io.Writer) (err error) { - if len(sig.outSubpackets) == 0 { - sig.outSubpackets = sig.rawSubpackets - } - if sig.RSASignature == nil && sig.DSASigR == nil && sig.ECDSASigR == nil && sig.EdDSASigR == nil && sig.EdSig == nil { - return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize") - } - - sigLength := 0 - switch sig.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly: - sigLength = int(sig.RSASignature.EncodedLength()) - case PubKeyAlgoDSA: - sigLength = int(sig.DSASigR.EncodedLength()) - sigLength += int(sig.DSASigS.EncodedLength()) - case PubKeyAlgoECDSA: - sigLength = int(sig.ECDSASigR.EncodedLength()) - sigLength += int(sig.ECDSASigS.EncodedLength()) - case PubKeyAlgoEdDSA: - sigLength = int(sig.EdDSASigR.EncodedLength()) - sigLength += int(sig.EdDSASigS.EncodedLength()) - case PubKeyAlgoEd25519: - sigLength = ed25519.SignatureSize - case PubKeyAlgoEd448: - sigLength = ed448.SignatureSize - default: - panic("impossible") - } - - hashedSubpacketsLen := subpacketsLength(sig.outSubpackets, true) - unhashedSubpacketsLen := subpacketsLength(sig.outSubpackets, false) - length := 4 + /* length of version|signature type|public-key algorithm|hash algorithm */ - 2 /* length of hashed subpackets */ + hashedSubpacketsLen + - 2 /* length of unhashed subpackets */ + unhashedSubpacketsLen + - 2 /* hash tag */ + sigLength - if sig.Version == 6 { - length += 4 + /* the two length fields are four-octet instead of two */ - 1 + /* salt length */ - len(sig.salt) /* length salt */ - } - err = serializeHeader(w, packetTypeSignature, length) - if err != nil { - return - } - err = sig.serializeBody(w) - if err != nil { - return err - } - return -} - -func (sig *Signature) serializeBody(w io.Writer) (err error) { - var fields []byte - if sig.Version == 6 { - // v6 signatures use 4 octets for length - hashedSubpacketsLen := - uint32(uint32(sig.HashSuffix[4])<<24) | - uint32(uint32(sig.HashSuffix[5])<<16) | - uint32(uint32(sig.HashSuffix[6])<<8) | - uint32(sig.HashSuffix[7]) - fields = sig.HashSuffix[:8+hashedSubpacketsLen] - } else { - hashedSubpacketsLen := uint16(uint16(sig.HashSuffix[4])<<8) | - uint16(sig.HashSuffix[5]) - fields = sig.HashSuffix[:6+hashedSubpacketsLen] - - } - _, err = w.Write(fields) - if err != nil { - return - } - - unhashedSubpacketsLen := subpacketsLength(sig.outSubpackets, false) - var unhashedSubpackets []byte - if sig.Version == 6 { - unhashedSubpackets = make([]byte, 4+unhashedSubpacketsLen) - unhashedSubpackets[0] = byte(unhashedSubpacketsLen >> 24) - unhashedSubpackets[1] = byte(unhashedSubpacketsLen >> 16) - unhashedSubpackets[2] = byte(unhashedSubpacketsLen >> 8) - unhashedSubpackets[3] = byte(unhashedSubpacketsLen) - serializeSubpackets(unhashedSubpackets[4:], sig.outSubpackets, false) - } else { - unhashedSubpackets = make([]byte, 2+unhashedSubpacketsLen) - unhashedSubpackets[0] = byte(unhashedSubpacketsLen >> 8) - unhashedSubpackets[1] = byte(unhashedSubpacketsLen) - serializeSubpackets(unhashedSubpackets[2:], sig.outSubpackets, false) - } - - _, err = w.Write(unhashedSubpackets) - if err != nil { - return - } - _, err = w.Write(sig.HashTag[:]) - if err != nil { - return - } - - if sig.Version == 6 { - // write salt for v6 signatures - _, err = w.Write([]byte{uint8(len(sig.salt))}) - if err != nil { - return - } - _, err = w.Write(sig.salt) - if err != nil { - return - } - } - - switch sig.PubKeyAlgo { - case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly: - _, err = w.Write(sig.RSASignature.EncodedBytes()) - case PubKeyAlgoDSA: - if _, err = w.Write(sig.DSASigR.EncodedBytes()); err != nil { - return - } - _, err = w.Write(sig.DSASigS.EncodedBytes()) - case PubKeyAlgoECDSA: - if _, err = w.Write(sig.ECDSASigR.EncodedBytes()); err != nil { - return - } - _, err = w.Write(sig.ECDSASigS.EncodedBytes()) - case PubKeyAlgoEdDSA: - if _, err = w.Write(sig.EdDSASigR.EncodedBytes()); err != nil { - return - } - _, err = w.Write(sig.EdDSASigS.EncodedBytes()) - case PubKeyAlgoEd25519: - err = ed25519.WriteSignature(w, sig.EdSig) - case PubKeyAlgoEd448: - err = ed448.WriteSignature(w, sig.EdSig) - default: - panic("impossible") - } - return -} - -// outputSubpacket represents a subpacket to be marshaled. -type outputSubpacket struct { - hashed bool // true if this subpacket is in the hashed area. - subpacketType signatureSubpacketType - isCritical bool - contents []byte -} - -func (sig *Signature) buildSubpackets(issuer PublicKey) (subpackets []outputSubpacket, err error) { - creationTime := make([]byte, 4) - binary.BigEndian.PutUint32(creationTime, uint32(sig.CreationTime.Unix())) - // Signature Creation Time - subpackets = append(subpackets, outputSubpacket{true, creationTimeSubpacket, true, creationTime}) - // Signature Expiration Time - if sig.SigLifetimeSecs != nil && *sig.SigLifetimeSecs != 0 { - sigLifetime := make([]byte, 4) - binary.BigEndian.PutUint32(sigLifetime, *sig.SigLifetimeSecs) - subpackets = append(subpackets, outputSubpacket{true, signatureExpirationSubpacket, true, sigLifetime}) - } - // Trust Signature - if sig.TrustLevel != 0 { - subpackets = append(subpackets, outputSubpacket{true, trustSubpacket, true, []byte{byte(sig.TrustLevel), byte(sig.TrustAmount)}}) - } - // Regular Expression - if sig.TrustRegularExpression != nil { - // RFC specifies the string should be null-terminated; add a null byte to the end - subpackets = append(subpackets, outputSubpacket{true, regularExpressionSubpacket, true, []byte(*sig.TrustRegularExpression + "\000")}) - } - // Key Expiration Time - if sig.KeyLifetimeSecs != nil && *sig.KeyLifetimeSecs != 0 { - keyLifetime := make([]byte, 4) - binary.BigEndian.PutUint32(keyLifetime, *sig.KeyLifetimeSecs) - subpackets = append(subpackets, outputSubpacket{true, keyExpirationSubpacket, true, keyLifetime}) - } - // Preferred Symmetric Ciphers for v1 SEIPD - if len(sig.PreferredSymmetric) > 0 { - subpackets = append(subpackets, outputSubpacket{true, prefSymmetricAlgosSubpacket, false, sig.PreferredSymmetric}) - } - // Issuer Key ID - if sig.IssuerKeyId != nil && sig.Version == 4 { - keyId := make([]byte, 8) - binary.BigEndian.PutUint64(keyId, *sig.IssuerKeyId) - // Note: making this critical breaks RPM <=4.16. - // See: https://github.com/ProtonMail/go-crypto/issues/263 - subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, false, keyId}) - } - // Notation Data - for _, notation := range sig.Notations { - subpackets = append( - subpackets, - outputSubpacket{ - true, - notationDataSubpacket, - notation.IsCritical, - notation.getData(), - }) - } - // Preferred Hash Algorithms - if len(sig.PreferredHash) > 0 { - subpackets = append(subpackets, outputSubpacket{true, prefHashAlgosSubpacket, false, sig.PreferredHash}) - } - // Preferred Compression Algorithms - if len(sig.PreferredCompression) > 0 { - subpackets = append(subpackets, outputSubpacket{true, prefCompressionSubpacket, false, sig.PreferredCompression}) - } - // Keyserver Preferences - // Keyserver preferences may only appear in self-signatures or certification signatures. - if sig.KeyserverPrefsValid { - var prefs byte - if sig.KeyserverPrefNoModify { - prefs |= KeyserverPrefNoModify - } - subpackets = append(subpackets, outputSubpacket{true, keyserverPrefsSubpacket, false, []byte{prefs}}) - } - // Preferred Keyserver - if len(sig.PreferredKeyserver) > 0 { - subpackets = append(subpackets, outputSubpacket{true, prefKeyserverSubpacket, false, []uint8(sig.PreferredKeyserver)}) - } - // Primary User ID - if sig.IsPrimaryId != nil && *sig.IsPrimaryId { - subpackets = append(subpackets, outputSubpacket{true, primaryUserIdSubpacket, false, []byte{1}}) - } - // Policy URI - if len(sig.PolicyURI) > 0 { - subpackets = append(subpackets, outputSubpacket{true, policyUriSubpacket, false, []uint8(sig.PolicyURI)}) - } - // Key Flags - // Key flags may only appear in self-signatures or certification signatures. - if sig.FlagsValid { - var flags byte - if sig.FlagCertify { - flags |= KeyFlagCertify - } - if sig.FlagSign { - flags |= KeyFlagSign - } - if sig.FlagEncryptCommunications { - flags |= KeyFlagEncryptCommunications - } - if sig.FlagEncryptStorage { - flags |= KeyFlagEncryptStorage - } - if sig.FlagSplitKey { - flags |= KeyFlagSplitKey - } - if sig.FlagAuthenticate { - flags |= KeyFlagAuthenticate - } - if sig.FlagGroupKey { - flags |= KeyFlagGroupKey - } - subpackets = append(subpackets, outputSubpacket{true, keyFlagsSubpacket, true, []byte{flags}}) - } - // Signer's User ID - if sig.SignerUserId != nil { - subpackets = append(subpackets, outputSubpacket{true, signerUserIdSubpacket, false, []byte(*sig.SignerUserId)}) - } - // Reason for Revocation - // Revocation reason appears only in revocation signatures and is serialized as per section 5.2.3.31. - if sig.RevocationReason != nil { - subpackets = append(subpackets, outputSubpacket{true, reasonForRevocationSubpacket, true, - append([]uint8{uint8(*sig.RevocationReason)}, []uint8(sig.RevocationReasonText)...)}) - } - // Features - var features = byte(0x00) - if sig.SEIPDv1 { - features |= 0x01 - } - if sig.SEIPDv2 { - features |= 0x08 - } - if features != 0x00 { - subpackets = append(subpackets, outputSubpacket{true, featuresSubpacket, false, []byte{features}}) - } - // Embedded Signature - // EmbeddedSignature appears only in subkeys capable of signing and is serialized as per section 5.2.3.34. - if sig.EmbeddedSignature != nil { - var buf bytes.Buffer - err = sig.EmbeddedSignature.serializeBody(&buf) - if err != nil { - return - } - subpackets = append(subpackets, outputSubpacket{true, embeddedSignatureSubpacket, true, buf.Bytes()}) - } - // Issuer Fingerprint - if sig.IssuerFingerprint != nil { - contents := append([]uint8{uint8(issuer.Version)}, sig.IssuerFingerprint...) - subpackets = append(subpackets, outputSubpacket{true, issuerFingerprintSubpacket, sig.Version >= 5, contents}) - } - // Intended Recipient Fingerprint - for _, recipient := range sig.IntendedRecipients { - subpackets = append( - subpackets, - outputSubpacket{ - true, - intendedRecipientSubpacket, - false, - recipient.Serialize(), - }) - } - // Preferred AEAD Ciphersuites - if len(sig.PreferredCipherSuites) > 0 { - serialized := make([]byte, len(sig.PreferredCipherSuites)*2) - for i, cipherSuite := range sig.PreferredCipherSuites { - serialized[2*i] = cipherSuite[0] - serialized[2*i+1] = cipherSuite[1] - } - subpackets = append(subpackets, outputSubpacket{true, prefCipherSuitesSubpacket, false, serialized}) - } - return -} - -// AddMetadataToHashSuffix modifies the current hash suffix to include metadata -// (format, filename, and time). Version 5 keys protect this data including it -// in the hash computation. See section 5.2.4. -func (sig *Signature) AddMetadataToHashSuffix() { - if sig == nil || sig.Version != 5 { - return - } - if sig.SigType != 0x00 && sig.SigType != 0x01 { - return - } - lit := sig.Metadata - if lit == nil { - // This will translate into six 0x00 bytes. - lit = &LiteralData{} - } - - // Extract the current byte count - n := sig.HashSuffix[len(sig.HashSuffix)-8:] - l := uint64( - uint64(n[0])<<56 | uint64(n[1])<<48 | uint64(n[2])<<40 | uint64(n[3])<<32 | - uint64(n[4])<<24 | uint64(n[5])<<16 | uint64(n[6])<<8 | uint64(n[7])) - - suffix := bytes.NewBuffer(nil) - suffix.Write(sig.HashSuffix[:l]) - - // Add the metadata - var buf [4]byte - buf[0] = lit.Format - fileName := lit.FileName - if len(lit.FileName) > 255 { - fileName = fileName[:255] - } - buf[1] = byte(len(fileName)) - suffix.Write(buf[:2]) - suffix.Write([]byte(lit.FileName)) - binary.BigEndian.PutUint32(buf[:], lit.Time) - suffix.Write(buf[:]) - - suffix.Write([]byte{0x05, 0xff}) - suffix.Write([]byte{ - uint8(l >> 56), uint8(l >> 48), uint8(l >> 40), uint8(l >> 32), - uint8(l >> 24), uint8(l >> 16), uint8(l >> 8), uint8(l), - }) - sig.HashSuffix = suffix.Bytes() -} - -// SaltLengthForHash selects the required salt length for the given hash algorithm, -// as per Table 23 (Hash algorithm registry) of the crypto refresh. -// See RFC 9580 Section 9.5. -func SaltLengthForHash(hash crypto.Hash) (int, error) { - switch hash { - case crypto.SHA256, crypto.SHA224, crypto.SHA3_256: - return 16, nil - case crypto.SHA384: - return 24, nil - case crypto.SHA512, crypto.SHA3_512: - return 32, nil - default: - return 0, errors.UnsupportedError("hash function not supported for V6 signatures") - } -} - -// SignatureSaltForHash generates a random signature salt -// with the length for the given hash algorithm. -// See RFC 9580 Section 9.5. -func SignatureSaltForHash(hash crypto.Hash, randReader io.Reader) ([]byte, error) { - saltLength, err := SaltLengthForHash(hash) - if err != nil { - return nil, err - } - salt := make([]byte, saltLength) - _, err = io.ReadFull(randReader, salt) - if err != nil { - return nil, err - } - return salt, nil -} - -// removeNotationsWithName removes all notations in this signature with the given name. -func (sig *Signature) removeNotationsWithName(name string) { - if sig == nil || sig.Notations == nil { - return - } - updatedNotations := make([]*Notation, 0, len(sig.Notations)) - for _, notation := range sig.Notations { - if notation.Name != name { - updatedNotations = append(updatedNotations, notation) - } - } - sig.Notations = updatedNotations -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetric_key_encrypted.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetric_key_encrypted.go deleted file mode 100644 index 2812a1db8..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetric_key_encrypted.go +++ /dev/null @@ -1,331 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "bytes" - "crypto/cipher" - "crypto/sha256" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/s2k" - "golang.org/x/crypto/hkdf" -) - -// This is the largest session key that we'll support. Since at most 256-bit cipher -// is supported in OpenPGP, this is large enough to contain also the auth tag. -const maxSessionKeySizeInBytes = 64 - -// SymmetricKeyEncrypted represents a passphrase protected session key. See RFC -// 4880, section 5.3. -type SymmetricKeyEncrypted struct { - Version int - CipherFunc CipherFunction - Mode AEADMode - s2k func(out, in []byte) - iv []byte - encryptedKey []byte // Contains also the authentication tag for AEAD -} - -// parse parses an SymmetricKeyEncrypted packet as specified in -// https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#name-symmetric-key-encrypted-ses -func (ske *SymmetricKeyEncrypted) parse(r io.Reader) error { - var buf [1]byte - - // Version - if _, err := readFull(r, buf[:]); err != nil { - return err - } - ske.Version = int(buf[0]) - if ske.Version != 4 && ske.Version != 5 && ske.Version != 6 { - return errors.UnsupportedError("unknown SymmetricKeyEncrypted version") - } - - if V5Disabled && ske.Version == 5 { - return errors.UnsupportedError("support for parsing v5 entities is disabled; build with `-tags v5` if needed") - } - - if ske.Version > 5 { - // Scalar octet count - if _, err := readFull(r, buf[:]); err != nil { - return err - } - } - - // Cipher function - if _, err := readFull(r, buf[:]); err != nil { - return err - } - ske.CipherFunc = CipherFunction(buf[0]) - if !ske.CipherFunc.IsSupported() { - return errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(buf[0]))) - } - - if ske.Version >= 5 { - // AEAD mode - if _, err := readFull(r, buf[:]); err != nil { - return errors.StructuralError("cannot read AEAD octet from packet") - } - ske.Mode = AEADMode(buf[0]) - } - - if ske.Version > 5 { - // Scalar octet count - if _, err := readFull(r, buf[:]); err != nil { - return err - } - } - - var err error - if ske.s2k, err = s2k.Parse(r); err != nil { - if _, ok := err.(errors.ErrDummyPrivateKey); ok { - return errors.UnsupportedError("missing key GNU extension in session key") - } - return err - } - - if ske.Version >= 5 { - // AEAD IV - iv := make([]byte, ske.Mode.IvLength()) - _, err := readFull(r, iv) - if err != nil { - return errors.StructuralError("cannot read AEAD IV") - } - - ske.iv = iv - } - - encryptedKey := make([]byte, maxSessionKeySizeInBytes) - // The session key may follow. We just have to try and read to find - // out. If it exists then we limit it to maxSessionKeySizeInBytes. - n, err := readFull(r, encryptedKey) - if err != nil && err != io.ErrUnexpectedEOF { - return err - } - - if n != 0 { - if n == maxSessionKeySizeInBytes { - return errors.UnsupportedError("oversized encrypted session key") - } - ske.encryptedKey = encryptedKey[:n] - } - return nil -} - -// Decrypt attempts to decrypt an encrypted session key and returns the key and -// the cipher to use when decrypting a subsequent Symmetrically Encrypted Data -// packet. -func (ske *SymmetricKeyEncrypted) Decrypt(passphrase []byte) ([]byte, CipherFunction, error) { - key := make([]byte, ske.CipherFunc.KeySize()) - ske.s2k(key, passphrase) - if len(ske.encryptedKey) == 0 { - return key, ske.CipherFunc, nil - } - switch ske.Version { - case 4: - plaintextKey, cipherFunc, err := ske.decryptV4(key) - return plaintextKey, cipherFunc, err - case 5, 6: - plaintextKey, err := ske.aeadDecrypt(ske.Version, key) - return plaintextKey, CipherFunction(0), err - } - err := errors.UnsupportedError("unknown SymmetricKeyEncrypted version") - return nil, CipherFunction(0), err -} - -func (ske *SymmetricKeyEncrypted) decryptV4(key []byte) ([]byte, CipherFunction, error) { - // the IV is all zeros - iv := make([]byte, ske.CipherFunc.blockSize()) - c := cipher.NewCFBDecrypter(ske.CipherFunc.new(key), iv) - plaintextKey := make([]byte, len(ske.encryptedKey)) - c.XORKeyStream(plaintextKey, ske.encryptedKey) - cipherFunc := CipherFunction(plaintextKey[0]) - if cipherFunc.blockSize() == 0 { - return nil, ske.CipherFunc, errors.UnsupportedError( - "unknown cipher: " + strconv.Itoa(int(cipherFunc))) - } - plaintextKey = plaintextKey[1:] - if len(plaintextKey) != cipherFunc.KeySize() { - return nil, cipherFunc, errors.StructuralError( - "length of decrypted key not equal to cipher keysize") - } - return plaintextKey, cipherFunc, nil -} - -func (ske *SymmetricKeyEncrypted) aeadDecrypt(version int, key []byte) ([]byte, error) { - adata := []byte{0xc3, byte(version), byte(ske.CipherFunc), byte(ske.Mode)} - aead := getEncryptedKeyAeadInstance(ske.CipherFunc, ske.Mode, key, adata, version) - - plaintextKey, err := aead.Open(nil, ske.iv, ske.encryptedKey, adata) - if err != nil { - return nil, err - } - return plaintextKey, nil -} - -// SerializeSymmetricKeyEncrypted serializes a symmetric key packet to w. -// The packet contains a random session key, encrypted by a key derived from -// the given passphrase. The session key is returned and must be passed to -// SerializeSymmetricallyEncrypted. -// If config is nil, sensible defaults will be used. -func SerializeSymmetricKeyEncrypted(w io.Writer, passphrase []byte, config *Config) (key []byte, err error) { - cipherFunc := config.Cipher() - - sessionKey := make([]byte, cipherFunc.KeySize()) - _, err = io.ReadFull(config.Random(), sessionKey) - if err != nil { - return - } - - err = SerializeSymmetricKeyEncryptedReuseKey(w, sessionKey, passphrase, config) - if err != nil { - return - } - - key = sessionKey - return -} - -// SerializeSymmetricKeyEncryptedReuseKey serializes a symmetric key packet to w. -// The packet contains the given session key, encrypted by a key derived from -// the given passphrase. The returned session key must be passed to -// SerializeSymmetricallyEncrypted. -// If config is nil, sensible defaults will be used. -// Deprecated: Use SerializeSymmetricKeyEncryptedAEADReuseKey instead. -func SerializeSymmetricKeyEncryptedReuseKey(w io.Writer, sessionKey []byte, passphrase []byte, config *Config) (err error) { - return SerializeSymmetricKeyEncryptedAEADReuseKey(w, sessionKey, passphrase, config.AEAD() != nil, config) -} - -// SerializeSymmetricKeyEncryptedAEADReuseKey serializes a symmetric key packet to w. -// The packet contains the given session key, encrypted by a key derived from -// the given passphrase. The returned session key must be passed to -// SerializeSymmetricallyEncrypted. -// If aeadSupported is set, SKESK v6 is used, otherwise v4. -// Note: aeadSupported MUST match the value passed to SerializeSymmetricallyEncrypted. -// If config is nil, sensible defaults will be used. -func SerializeSymmetricKeyEncryptedAEADReuseKey(w io.Writer, sessionKey []byte, passphrase []byte, aeadSupported bool, config *Config) (err error) { - var version int - if aeadSupported { - version = 6 - } else { - version = 4 - } - cipherFunc := config.Cipher() - // cipherFunc must be AES - if !cipherFunc.IsSupported() || cipherFunc < CipherAES128 || cipherFunc > CipherAES256 { - return errors.UnsupportedError("unsupported cipher: " + strconv.Itoa(int(cipherFunc))) - } - - keySize := cipherFunc.KeySize() - s2kBuf := new(bytes.Buffer) - keyEncryptingKey := make([]byte, keySize) - // s2k.Serialize salts and stretches the passphrase, and writes the - // resulting key to keyEncryptingKey and the s2k descriptor to s2kBuf. - err = s2k.Serialize(s2kBuf, keyEncryptingKey, config.Random(), passphrase, config.S2K()) - if err != nil { - return - } - s2kBytes := s2kBuf.Bytes() - - var packetLength int - switch version { - case 4: - packetLength = 2 /* header */ + len(s2kBytes) + 1 /* cipher type */ + keySize - case 5, 6: - ivLen := config.AEAD().Mode().IvLength() - tagLen := config.AEAD().Mode().TagLength() - packetLength = 3 + len(s2kBytes) + ivLen + keySize + tagLen - } - if version > 5 { - packetLength += 2 // additional octet count fields - } - - err = serializeHeader(w, packetTypeSymmetricKeyEncrypted, packetLength) - if err != nil { - return - } - - // Symmetric Key Encrypted Version - buf := []byte{byte(version)} - - if version > 5 { - // Scalar octet count - buf = append(buf, byte(3+len(s2kBytes)+config.AEAD().Mode().IvLength())) - } - - // Cipher function - buf = append(buf, byte(cipherFunc)) - - if version >= 5 { - // AEAD mode - buf = append(buf, byte(config.AEAD().Mode())) - } - if version > 5 { - // Scalar octet count - buf = append(buf, byte(len(s2kBytes))) - } - _, err = w.Write(buf) - if err != nil { - return - } - _, err = w.Write(s2kBytes) - if err != nil { - return - } - - switch version { - case 4: - iv := make([]byte, cipherFunc.blockSize()) - c := cipher.NewCFBEncrypter(cipherFunc.new(keyEncryptingKey), iv) - encryptedCipherAndKey := make([]byte, keySize+1) - c.XORKeyStream(encryptedCipherAndKey, buf[1:]) - c.XORKeyStream(encryptedCipherAndKey[1:], sessionKey) - _, err = w.Write(encryptedCipherAndKey) - if err != nil { - return - } - case 5, 6: - mode := config.AEAD().Mode() - adata := []byte{0xc3, byte(version), byte(cipherFunc), byte(mode)} - aead := getEncryptedKeyAeadInstance(cipherFunc, mode, keyEncryptingKey, adata, version) - - // Sample iv using random reader - iv := make([]byte, config.AEAD().Mode().IvLength()) - _, err = io.ReadFull(config.Random(), iv) - if err != nil { - return - } - // Seal and write (encryptedData includes auth. tag) - - encryptedData := aead.Seal(nil, iv, sessionKey, adata) - _, err = w.Write(iv) - if err != nil { - return - } - _, err = w.Write(encryptedData) - if err != nil { - return - } - } - - return -} - -func getEncryptedKeyAeadInstance(c CipherFunction, mode AEADMode, inputKey, associatedData []byte, version int) (aead cipher.AEAD) { - var blockCipher cipher.Block - if version > 5 { - hkdfReader := hkdf.New(sha256.New, inputKey, []byte{}, associatedData) - - encryptionKey := make([]byte, c.KeySize()) - _, _ = readFull(hkdfReader, encryptionKey) - - blockCipher = c.new(encryptionKey) - } else { - blockCipher = c.new(inputKey) - } - return mode.new(blockCipher) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted.go deleted file mode 100644 index 0e898742c..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted.go +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "io" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -const aeadSaltSize = 32 - -// SymmetricallyEncrypted represents a symmetrically encrypted byte string. The -// encrypted Contents will consist of more OpenPGP packets. See RFC 4880, -// sections 5.7 and 5.13. -type SymmetricallyEncrypted struct { - Version int - Contents io.Reader // contains tag for version 2 - IntegrityProtected bool // If true it is type 18 (with MDC or AEAD). False is packet type 9 - - // Specific to version 1 - prefix []byte - - // Specific to version 2 - Cipher CipherFunction - Mode AEADMode - ChunkSizeByte byte - Salt [aeadSaltSize]byte -} - -const ( - symmetricallyEncryptedVersionMdc = 1 - symmetricallyEncryptedVersionAead = 2 -) - -func (se *SymmetricallyEncrypted) parse(r io.Reader) error { - if se.IntegrityProtected { - // See RFC 4880, section 5.13. - var buf [1]byte - _, err := readFull(r, buf[:]) - if err != nil { - return err - } - - switch buf[0] { - case symmetricallyEncryptedVersionMdc: - se.Version = symmetricallyEncryptedVersionMdc - case symmetricallyEncryptedVersionAead: - se.Version = symmetricallyEncryptedVersionAead - if err := se.parseAead(r); err != nil { - return err - } - default: - return errors.UnsupportedError("unknown SymmetricallyEncrypted version") - } - } - se.Contents = r - return nil -} - -// Decrypt returns a ReadCloser, from which the decrypted Contents of the -// packet can be read. An incorrect key will only be detected after trying -// to decrypt the entire data. -func (se *SymmetricallyEncrypted) Decrypt(c CipherFunction, key []byte) (io.ReadCloser, error) { - if se.Version == symmetricallyEncryptedVersionAead { - return se.decryptAead(key) - } - - return se.decryptMdc(c, key) -} - -// SerializeSymmetricallyEncrypted serializes a symmetrically encrypted packet -// to w and returns a WriteCloser to which the to-be-encrypted packets can be -// written. -// If aeadSupported is set to true, SEIPDv2 is used with the indicated CipherSuite. -// Otherwise, SEIPDv1 is used with the indicated CipherFunction. -// Note: aeadSupported MUST match the value passed to SerializeEncryptedKeyAEAD -// and/or SerializeSymmetricKeyEncryptedAEADReuseKey. -// If config is nil, sensible defaults will be used. -func SerializeSymmetricallyEncrypted(w io.Writer, c CipherFunction, aeadSupported bool, cipherSuite CipherSuite, key []byte, config *Config) (Contents io.WriteCloser, err error) { - writeCloser := noOpCloser{w} - ciphertext, err := serializeStreamHeader(writeCloser, packetTypeSymmetricallyEncryptedIntegrityProtected) - if err != nil { - return - } - - if aeadSupported { - return serializeSymmetricallyEncryptedAead(ciphertext, cipherSuite, config.AEADConfig.ChunkSizeByte(), config.Random(), key) - } - - return serializeSymmetricallyEncryptedMdc(ciphertext, c, key, config) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_aead.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_aead.go deleted file mode 100644 index 3ddc4fe4a..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_aead.go +++ /dev/null @@ -1,168 +0,0 @@ -// Copyright 2023 Proton AG. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "crypto/cipher" - "crypto/sha256" - "fmt" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - "golang.org/x/crypto/hkdf" -) - -// parseAead parses a V2 SEIPD packet (AEAD) as specified in -// https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-5.13.2 -func (se *SymmetricallyEncrypted) parseAead(r io.Reader) error { - headerData := make([]byte, 3) - if n, err := io.ReadFull(r, headerData); n < 3 { - return errors.StructuralError("could not read aead header: " + err.Error()) - } - - // Cipher - se.Cipher = CipherFunction(headerData[0]) - // cipherFunc must have block size 16 to use AEAD - if se.Cipher.blockSize() != 16 { - return errors.UnsupportedError("invalid aead cipher: " + strconv.Itoa(int(se.Cipher))) - } - - // Mode - se.Mode = AEADMode(headerData[1]) - if se.Mode.TagLength() == 0 { - return errors.UnsupportedError("unknown aead mode: " + strconv.Itoa(int(se.Mode))) - } - - // Chunk size - se.ChunkSizeByte = headerData[2] - if se.ChunkSizeByte > 16 { - return errors.UnsupportedError("invalid aead chunk size byte: " + strconv.Itoa(int(se.ChunkSizeByte))) - } - - // Salt - if n, err := io.ReadFull(r, se.Salt[:]); n < aeadSaltSize { - return errors.StructuralError("could not read aead salt: " + err.Error()) - } - - return nil -} - -// associatedData for chunks: tag, version, cipher, mode, chunk size byte -func (se *SymmetricallyEncrypted) associatedData() []byte { - return []byte{ - 0xD2, - symmetricallyEncryptedVersionAead, - byte(se.Cipher), - byte(se.Mode), - se.ChunkSizeByte, - } -} - -// decryptAead decrypts a V2 SEIPD packet (AEAD) as specified in -// https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-5.13.2 -func (se *SymmetricallyEncrypted) decryptAead(inputKey []byte) (io.ReadCloser, error) { - if se.Cipher.KeySize() != len(inputKey) { - return nil, errors.StructuralError(fmt.Sprintf("invalid session key length for cipher: got %d bytes, but expected %d bytes", len(inputKey), se.Cipher.KeySize())) - } - - aead, nonce := getSymmetricallyEncryptedAeadInstance(se.Cipher, se.Mode, inputKey, se.Salt[:], se.associatedData()) - // Carry the first tagLen bytes - chunkSize := decodeAEADChunkSize(se.ChunkSizeByte) - tagLen := se.Mode.TagLength() - chunkBytes := make([]byte, chunkSize+tagLen*2) - peekedBytes := chunkBytes[chunkSize+tagLen:] - n, err := io.ReadFull(se.Contents, peekedBytes) - if n < tagLen || (err != nil && err != io.EOF) { - return nil, errors.StructuralError("not enough data to decrypt:" + err.Error()) - } - - return &aeadDecrypter{ - aeadCrypter: aeadCrypter{ - aead: aead, - chunkSize: decodeAEADChunkSize(se.ChunkSizeByte), - nonce: nonce, - associatedData: se.associatedData(), - chunkIndex: nonce[len(nonce)-8:], - packetTag: packetTypeSymmetricallyEncryptedIntegrityProtected, - }, - reader: se.Contents, - chunkBytes: chunkBytes, - peekedBytes: peekedBytes, - }, nil -} - -// serializeSymmetricallyEncryptedAead encrypts to a writer a V2 SEIPD packet (AEAD) as specified in -// https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-5.13.2 -func serializeSymmetricallyEncryptedAead(ciphertext io.WriteCloser, cipherSuite CipherSuite, chunkSizeByte byte, rand io.Reader, inputKey []byte) (Contents io.WriteCloser, err error) { - // cipherFunc must have block size 16 to use AEAD - if cipherSuite.Cipher.blockSize() != 16 { - return nil, errors.InvalidArgumentError("invalid aead cipher function") - } - - if cipherSuite.Cipher.KeySize() != len(inputKey) { - return nil, errors.InvalidArgumentError("error in aead serialization: bad key length") - } - - // Data for en/decryption: tag, version, cipher, aead mode, chunk size - prefix := []byte{ - 0xD2, - symmetricallyEncryptedVersionAead, - byte(cipherSuite.Cipher), - byte(cipherSuite.Mode), - chunkSizeByte, - } - - // Write header (that correspond to prefix except first byte) - n, err := ciphertext.Write(prefix[1:]) - if err != nil || n < 4 { - return nil, err - } - - // Random salt - salt := make([]byte, aeadSaltSize) - if _, err := io.ReadFull(rand, salt); err != nil { - return nil, err - } - - if _, err := ciphertext.Write(salt); err != nil { - return nil, err - } - - aead, nonce := getSymmetricallyEncryptedAeadInstance(cipherSuite.Cipher, cipherSuite.Mode, inputKey, salt, prefix) - - chunkSize := decodeAEADChunkSize(chunkSizeByte) - tagLen := aead.Overhead() - chunkBytes := make([]byte, chunkSize+tagLen) - return &aeadEncrypter{ - aeadCrypter: aeadCrypter{ - aead: aead, - chunkSize: chunkSize, - associatedData: prefix, - nonce: nonce, - chunkIndex: nonce[len(nonce)-8:], - packetTag: packetTypeSymmetricallyEncryptedIntegrityProtected, - }, - writer: ciphertext, - chunkBytes: chunkBytes, - }, nil -} - -func getSymmetricallyEncryptedAeadInstance(c CipherFunction, mode AEADMode, inputKey, salt, associatedData []byte) (aead cipher.AEAD, nonce []byte) { - hkdfReader := hkdf.New(sha256.New, inputKey, salt, associatedData) - - encryptionKey := make([]byte, c.KeySize()) - _, _ = readFull(hkdfReader, encryptionKey) - - nonce = make([]byte, mode.IvLength()) - - // Last 64 bits of nonce are the counter - _, _ = readFull(hkdfReader, nonce[:len(nonce)-8]) - - blockCipher := c.new(encryptionKey) - aead = mode.new(blockCipher) - - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_mdc.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_mdc.go deleted file mode 100644 index 8b1862368..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_mdc.go +++ /dev/null @@ -1,256 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "crypto/cipher" - "crypto/sha1" - "crypto/subtle" - "hash" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/errors" -) - -// seMdcReader wraps an io.Reader with a no-op Close method. -type seMdcReader struct { - in io.Reader -} - -func (ser seMdcReader) Read(buf []byte) (int, error) { - return ser.in.Read(buf) -} - -func (ser seMdcReader) Close() error { - return nil -} - -func (se *SymmetricallyEncrypted) decryptMdc(c CipherFunction, key []byte) (io.ReadCloser, error) { - if !c.IsSupported() { - return nil, errors.UnsupportedError("unsupported cipher: " + strconv.Itoa(int(c))) - } - - if len(key) != c.KeySize() { - return nil, errors.InvalidArgumentError("SymmetricallyEncrypted: incorrect key length") - } - - if se.prefix == nil { - se.prefix = make([]byte, c.blockSize()+2) - _, err := readFull(se.Contents, se.prefix) - if err != nil { - return nil, err - } - } else if len(se.prefix) != c.blockSize()+2 { - return nil, errors.InvalidArgumentError("can't try ciphers with different block lengths") - } - - ocfbResync := OCFBResync - if se.IntegrityProtected { - // MDC packets use a different form of OCFB mode. - ocfbResync = OCFBNoResync - } - - s := NewOCFBDecrypter(c.new(key), se.prefix, ocfbResync) - - plaintext := cipher.StreamReader{S: s, R: se.Contents} - - if se.IntegrityProtected { - // IntegrityProtected packets have an embedded hash that we need to check. - h := sha1.New() - h.Write(se.prefix) - return &seMDCReader{in: plaintext, h: h}, nil - } - - // Otherwise, we just need to wrap plaintext so that it's a valid ReadCloser. - return seMdcReader{plaintext}, nil -} - -const mdcTrailerSize = 1 /* tag byte */ + 1 /* length byte */ + sha1.Size - -// An seMDCReader wraps an io.Reader, maintains a running hash and keeps hold -// of the most recent 22 bytes (mdcTrailerSize). Upon EOF, those bytes form an -// MDC packet containing a hash of the previous Contents which is checked -// against the running hash. See RFC 4880, section 5.13. -type seMDCReader struct { - in io.Reader - h hash.Hash - trailer [mdcTrailerSize]byte - scratch [mdcTrailerSize]byte - trailerUsed int - error bool - eof bool -} - -func (ser *seMDCReader) Read(buf []byte) (n int, err error) { - if ser.error { - err = io.ErrUnexpectedEOF - return - } - if ser.eof { - err = io.EOF - return - } - - // If we haven't yet filled the trailer buffer then we must do that - // first. - for ser.trailerUsed < mdcTrailerSize { - n, err = ser.in.Read(ser.trailer[ser.trailerUsed:]) - ser.trailerUsed += n - if err == io.EOF { - if ser.trailerUsed != mdcTrailerSize { - n = 0 - err = io.ErrUnexpectedEOF - ser.error = true - return - } - ser.eof = true - n = 0 - return - } - - if err != nil { - n = 0 - return - } - } - - // If it's a short read then we read into a temporary buffer and shift - // the data into the caller's buffer. - if len(buf) <= mdcTrailerSize { - n, err = readFull(ser.in, ser.scratch[:len(buf)]) - copy(buf, ser.trailer[:n]) - ser.h.Write(buf[:n]) - copy(ser.trailer[:], ser.trailer[n:]) - copy(ser.trailer[mdcTrailerSize-n:], ser.scratch[:]) - if n < len(buf) { - ser.eof = true - err = io.EOF - } - return - } - - n, err = ser.in.Read(buf[mdcTrailerSize:]) - copy(buf, ser.trailer[:]) - ser.h.Write(buf[:n]) - copy(ser.trailer[:], buf[n:]) - - if err == io.EOF { - ser.eof = true - } - return -} - -// This is a new-format packet tag byte for a type 19 (Integrity Protected) packet. -const mdcPacketTagByte = byte(0x80) | 0x40 | 19 - -func (ser *seMDCReader) Close() error { - if ser.error { - return errors.ErrMDCHashMismatch - } - - for !ser.eof { - // We haven't seen EOF so we need to read to the end - var buf [1024]byte - _, err := ser.Read(buf[:]) - if err == io.EOF { - break - } - if err != nil { - return errors.ErrMDCHashMismatch - } - } - - ser.h.Write(ser.trailer[:2]) - - final := ser.h.Sum(nil) - if subtle.ConstantTimeCompare(final, ser.trailer[2:]) != 1 { - return errors.ErrMDCHashMismatch - } - // The hash already includes the MDC header, but we still check its value - // to confirm encryption correctness - if ser.trailer[0] != mdcPacketTagByte || ser.trailer[1] != sha1.Size { - return errors.ErrMDCHashMismatch - } - return nil -} - -// An seMDCWriter writes through to an io.WriteCloser while maintains a running -// hash of the data written. On close, it emits an MDC packet containing the -// running hash. -type seMDCWriter struct { - w io.WriteCloser - h hash.Hash -} - -func (w *seMDCWriter) Write(buf []byte) (n int, err error) { - w.h.Write(buf) - return w.w.Write(buf) -} - -func (w *seMDCWriter) Close() (err error) { - var buf [mdcTrailerSize]byte - - buf[0] = mdcPacketTagByte - buf[1] = sha1.Size - w.h.Write(buf[:2]) - digest := w.h.Sum(nil) - copy(buf[2:], digest) - - _, err = w.w.Write(buf[:]) - if err != nil { - return - } - return w.w.Close() -} - -// noOpCloser is like an ioutil.NopCloser, but for an io.Writer. -type noOpCloser struct { - w io.Writer -} - -func (c noOpCloser) Write(data []byte) (n int, err error) { - return c.w.Write(data) -} - -func (c noOpCloser) Close() error { - return nil -} - -func serializeSymmetricallyEncryptedMdc(ciphertext io.WriteCloser, c CipherFunction, key []byte, config *Config) (Contents io.WriteCloser, err error) { - // Disallow old cipher suites - if !c.IsSupported() || c < CipherAES128 { - return nil, errors.InvalidArgumentError("invalid mdc cipher function") - } - - if c.KeySize() != len(key) { - return nil, errors.InvalidArgumentError("error in mdc serialization: bad key length") - } - - _, err = ciphertext.Write([]byte{symmetricallyEncryptedVersionMdc}) - if err != nil { - return - } - - block := c.new(key) - blockSize := block.BlockSize() - iv := make([]byte, blockSize) - _, err = io.ReadFull(config.Random(), iv) - if err != nil { - return nil, err - } - s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync) - _, err = ciphertext.Write(prefix) - if err != nil { - return - } - plaintext := cipher.StreamWriter{S: s, W: ciphertext} - - h := sha1.New() - h.Write(iv) - h.Write(iv[blockSize-2:]) - Contents = &seMDCWriter{w: plaintext, h: h} - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/userattribute.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/userattribute.go deleted file mode 100644 index 63814ed13..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/userattribute.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2013 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "bytes" - "image" - "image/jpeg" - "io" -) - -const UserAttrImageSubpacket = 1 - -// UserAttribute is capable of storing other types of data about a user -// beyond name, email and a text comment. In practice, user attributes are typically used -// to store a signed thumbnail photo JPEG image of the user. -// See RFC 4880, section 5.12. -type UserAttribute struct { - Contents []*OpaqueSubpacket -} - -// NewUserAttributePhoto creates a user attribute packet -// containing the given images. -func NewUserAttributePhoto(photos ...image.Image) (uat *UserAttribute, err error) { - uat = new(UserAttribute) - for _, photo := range photos { - var buf bytes.Buffer - // RFC 4880, Section 5.12.1. - data := []byte{ - 0x10, 0x00, // Little-endian image header length (16 bytes) - 0x01, // Image header version 1 - 0x01, // JPEG - 0, 0, 0, 0, // 12 reserved octets, must be all zero. - 0, 0, 0, 0, - 0, 0, 0, 0} - if _, err = buf.Write(data); err != nil { - return - } - if err = jpeg.Encode(&buf, photo, nil); err != nil { - return - } - - lengthBuf := make([]byte, 5) - n := serializeSubpacketLength(lengthBuf, len(buf.Bytes())+1) - lengthBuf = lengthBuf[:n] - - uat.Contents = append(uat.Contents, &OpaqueSubpacket{ - SubType: UserAttrImageSubpacket, - EncodedLength: lengthBuf, - Contents: buf.Bytes(), - }) - } - return -} - -// NewUserAttribute creates a new user attribute packet containing the given subpackets. -func NewUserAttribute(contents ...*OpaqueSubpacket) *UserAttribute { - return &UserAttribute{Contents: contents} -} - -func (uat *UserAttribute) parse(r io.Reader) (err error) { - // RFC 4880, section 5.13 - b, err := io.ReadAll(r) - if err != nil { - return - } - uat.Contents, err = OpaqueSubpackets(b) - return -} - -// Serialize marshals the user attribute to w in the form of an OpenPGP packet, including -// header. -func (uat *UserAttribute) Serialize(w io.Writer) (err error) { - var buf bytes.Buffer - for _, sp := range uat.Contents { - err = sp.Serialize(&buf) - if err != nil { - return err - } - } - if err = serializeHeader(w, packetTypeUserAttribute, buf.Len()); err != nil { - return err - } - _, err = w.Write(buf.Bytes()) - return -} - -// ImageData returns zero or more byte slices, each containing -// JPEG File Interchange Format (JFIF), for each photo in the -// user attribute packet. -func (uat *UserAttribute) ImageData() (imageData [][]byte) { - for _, sp := range uat.Contents { - if sp.SubType == UserAttrImageSubpacket && len(sp.Contents) > 16 { - imageData = append(imageData, sp.Contents[16:]) - } - } - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/userid.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/userid.go deleted file mode 100644 index 3c7451a3c..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/packet/userid.go +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package packet - -import ( - "io" - "strings" -) - -// UserId contains text that is intended to represent the name and email -// address of the key holder. See RFC 4880, section 5.11. By convention, this -// takes the form "Full Name (Comment) " -type UserId struct { - Id string // By convention, this takes the form "Full Name (Comment) " which is split out in the fields below. - - Name, Comment, Email string -} - -func hasInvalidCharacters(s string) bool { - for _, c := range s { - switch c { - case '(', ')', '<', '>', 0: - return true - } - } - return false -} - -// NewUserId returns a UserId or nil if any of the arguments contain invalid -// characters. The invalid characters are '\x00', '(', ')', '<' and '>' -func NewUserId(name, comment, email string) *UserId { - // RFC 4880 doesn't deal with the structure of userid strings; the - // name, comment and email form is just a convention. However, there's - // no convention about escaping the metacharacters and GPG just refuses - // to create user ids where, say, the name contains a '('. We mirror - // this behaviour. - - if hasInvalidCharacters(name) || hasInvalidCharacters(comment) || hasInvalidCharacters(email) { - return nil - } - - uid := new(UserId) - uid.Name, uid.Comment, uid.Email = name, comment, email - uid.Id = name - if len(comment) > 0 { - if len(uid.Id) > 0 { - uid.Id += " " - } - uid.Id += "(" - uid.Id += comment - uid.Id += ")" - } - if len(email) > 0 { - if len(uid.Id) > 0 { - uid.Id += " " - } - uid.Id += "<" - uid.Id += email - uid.Id += ">" - } - return uid -} - -func (uid *UserId) parse(r io.Reader) (err error) { - // RFC 4880, section 5.11 - b, err := io.ReadAll(r) - if err != nil { - return - } - uid.Id = string(b) - uid.Name, uid.Comment, uid.Email = parseUserId(uid.Id) - return -} - -// Serialize marshals uid to w in the form of an OpenPGP packet, including -// header. -func (uid *UserId) Serialize(w io.Writer) error { - err := serializeHeader(w, packetTypeUserId, len(uid.Id)) - if err != nil { - return err - } - _, err = w.Write([]byte(uid.Id)) - return err -} - -// parseUserId extracts the name, comment and email from a user id string that -// is formatted as "Full Name (Comment) ". -func parseUserId(id string) (name, comment, email string) { - var n, c, e struct { - start, end int - } - var state int - - for offset, rune := range id { - switch state { - case 0: - // Entering name - n.start = offset - state = 1 - fallthrough - case 1: - // In name - if rune == '(' { - state = 2 - n.end = offset - } else if rune == '<' { - state = 5 - n.end = offset - } - case 2: - // Entering comment - c.start = offset - state = 3 - fallthrough - case 3: - // In comment - if rune == ')' { - state = 4 - c.end = offset - } - case 4: - // Between comment and email - if rune == '<' { - state = 5 - } - case 5: - // Entering email - e.start = offset - state = 6 - fallthrough - case 6: - // In email - if rune == '>' { - state = 7 - e.end = offset - } - default: - // After email - } - } - switch state { - case 1: - // ended in the name - n.end = len(id) - case 3: - // ended in comment - c.end = len(id) - case 6: - // ended in email - e.end = len(id) - } - - name = strings.TrimSpace(id[n.start:n.end]) - comment = strings.TrimSpace(id[c.start:c.end]) - email = strings.TrimSpace(id[e.start:e.end]) - - // RFC 2822 3.4: alternate simple form of a mailbox - if email == "" && strings.ContainsRune(name, '@') { - email = name - name = "" - } - - return -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/read.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/read.go deleted file mode 100644 index e6dd9b5fd..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/read.go +++ /dev/null @@ -1,619 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package openpgp implements high level operations on OpenPGP messages. -package openpgp // import "github.com/ProtonMail/go-crypto/openpgp" - -import ( - "crypto" - _ "crypto/sha256" - _ "crypto/sha512" - "hash" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/armor" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "github.com/ProtonMail/go-crypto/openpgp/packet" - _ "golang.org/x/crypto/sha3" -) - -// SignatureType is the armor type for a PGP signature. -var SignatureType = "PGP SIGNATURE" - -// readArmored reads an armored block with the given type. -func readArmored(r io.Reader, expectedType string) (body io.Reader, err error) { - block, err := armor.Decode(r) - if err != nil { - return - } - - if block.Type != expectedType { - return nil, errors.InvalidArgumentError("expected '" + expectedType + "', got: " + block.Type) - } - - return block.Body, nil -} - -// MessageDetails contains the result of parsing an OpenPGP encrypted and/or -// signed message. -type MessageDetails struct { - IsEncrypted bool // true if the message was encrypted. - EncryptedToKeyIds []uint64 // the list of recipient key ids. - IsSymmetricallyEncrypted bool // true if a passphrase could have decrypted the message. - DecryptedWith Key // the private key used to decrypt the message, if any. - IsSigned bool // true if the message is signed. - SignedByKeyId uint64 // the key id of the signer, if any. - SignedByFingerprint []byte // the key fingerprint of the signer, if any. - SignedBy *Key // the key of the signer, if available. - LiteralData *packet.LiteralData // the metadata of the contents - UnverifiedBody io.Reader // the contents of the message. - - // If IsSigned is true and SignedBy is non-zero then the signature will - // be verified as UnverifiedBody is read. The signature cannot be - // checked until the whole of UnverifiedBody is read so UnverifiedBody - // must be consumed until EOF before the data can be trusted. Even if a - // message isn't signed (or the signer is unknown) the data may contain - // an authentication code that is only checked once UnverifiedBody has - // been consumed. Once EOF has been seen, the following fields are - // valid. (An authentication code failure is reported as a - // SignatureError error when reading from UnverifiedBody.) - Signature *packet.Signature // the signature packet itself. - SignatureError error // nil if the signature is good. - UnverifiedSignatures []*packet.Signature // all other unverified signature packets. - - decrypted io.ReadCloser -} - -// A PromptFunction is used as a callback by functions that may need to decrypt -// a private key, or prompt for a passphrase. It is called with a list of -// acceptable, encrypted private keys and a boolean that indicates whether a -// passphrase is usable. It should either decrypt a private key or return a -// passphrase to try. If the decrypted private key or given passphrase isn't -// correct, the function will be called again, forever. Any error returned will -// be passed up. -type PromptFunction func(keys []Key, symmetric bool) ([]byte, error) - -// A keyEnvelopePair is used to store a private key with the envelope that -// contains a symmetric key, encrypted with that key. -type keyEnvelopePair struct { - key Key - encryptedKey *packet.EncryptedKey -} - -// ReadMessage parses an OpenPGP message that may be signed and/or encrypted. -// The given KeyRing should contain both public keys (for signature -// verification) and, possibly encrypted, private keys for decrypting. -// If config is nil, sensible defaults will be used. -func ReadMessage(r io.Reader, keyring KeyRing, prompt PromptFunction, config *packet.Config) (md *MessageDetails, err error) { - var p packet.Packet - - var symKeys []*packet.SymmetricKeyEncrypted - var pubKeys []keyEnvelopePair - // Integrity protected encrypted packet: SymmetricallyEncrypted or AEADEncrypted - var edp packet.EncryptedDataPacket - - packets := packet.NewReader(r) - md = new(MessageDetails) - md.IsEncrypted = true - - // The message, if encrypted, starts with a number of packets - // containing an encrypted decryption key. The decryption key is either - // encrypted to a public key, or with a passphrase. This loop - // collects these packets. -ParsePackets: - for { - p, err = packets.Next() - if err != nil { - return nil, err - } - switch p := p.(type) { - case *packet.SymmetricKeyEncrypted: - // This packet contains the decryption key encrypted with a passphrase. - md.IsSymmetricallyEncrypted = true - symKeys = append(symKeys, p) - case *packet.EncryptedKey: - // This packet contains the decryption key encrypted to a public key. - md.EncryptedToKeyIds = append(md.EncryptedToKeyIds, p.KeyId) - switch p.Algo { - case packet.PubKeyAlgoRSA, packet.PubKeyAlgoRSAEncryptOnly, packet.PubKeyAlgoElGamal, packet.PubKeyAlgoECDH, packet.PubKeyAlgoX25519, packet.PubKeyAlgoX448: - break - default: - continue - } - if keyring != nil { - var keys []Key - if p.KeyId == 0 { - keys = keyring.DecryptionKeys() - } else { - keys = keyring.KeysById(p.KeyId) - } - for _, k := range keys { - pubKeys = append(pubKeys, keyEnvelopePair{k, p}) - } - } - case *packet.SymmetricallyEncrypted: - if !p.IntegrityProtected && !config.AllowUnauthenticatedMessages() { - return nil, errors.UnsupportedError("message is not integrity protected") - } - edp = p - break ParsePackets - case *packet.AEADEncrypted: - edp = p - break ParsePackets - case *packet.Compressed, *packet.LiteralData, *packet.OnePassSignature: - // This message isn't encrypted. - if len(symKeys) != 0 || len(pubKeys) != 0 { - return nil, errors.StructuralError("key material not followed by encrypted message") - } - packets.Unread(p) - return readSignedMessage(packets, nil, keyring, config) - } - } - - var candidates []Key - var decrypted io.ReadCloser - - // Now that we have the list of encrypted keys we need to decrypt at - // least one of them or, if we cannot, we need to call the prompt - // function so that it can decrypt a key or give us a passphrase. -FindKey: - for { - // See if any of the keys already have a private key available - candidates = candidates[:0] - candidateFingerprints := make(map[string]bool) - - for _, pk := range pubKeys { - if pk.key.PrivateKey == nil { - continue - } - if !pk.key.PrivateKey.Encrypted { - if len(pk.encryptedKey.Key) == 0 { - errDec := pk.encryptedKey.Decrypt(pk.key.PrivateKey, config) - if errDec != nil { - continue - } - } - // Try to decrypt symmetrically encrypted - decrypted, err = edp.Decrypt(pk.encryptedKey.CipherFunc, pk.encryptedKey.Key) - if err != nil && err != errors.ErrKeyIncorrect { - return nil, err - } - if decrypted != nil { - md.DecryptedWith = pk.key - break FindKey - } - } else { - fpr := string(pk.key.PublicKey.Fingerprint[:]) - if v := candidateFingerprints[fpr]; v { - continue - } - candidates = append(candidates, pk.key) - candidateFingerprints[fpr] = true - } - } - - if len(candidates) == 0 && len(symKeys) == 0 { - return nil, errors.ErrKeyIncorrect - } - - if prompt == nil { - return nil, errors.ErrKeyIncorrect - } - - passphrase, err := prompt(candidates, len(symKeys) != 0) - if err != nil { - return nil, err - } - - // Try the symmetric passphrase first - if len(symKeys) != 0 && passphrase != nil { - for _, s := range symKeys { - key, cipherFunc, err := s.Decrypt(passphrase) - // In v4, on wrong passphrase, session key decryption is very likely to result in an invalid cipherFunc: - // only for < 5% of cases we will proceed to decrypt the data - if err == nil { - decrypted, err = edp.Decrypt(cipherFunc, key) - if err != nil { - return nil, err - } - if decrypted != nil { - break FindKey - } - } - } - } - } - - md.decrypted = decrypted - if err := packets.Push(decrypted); err != nil { - return nil, err - } - mdFinal, sensitiveParsingErr := readSignedMessage(packets, md, keyring, config) - if sensitiveParsingErr != nil { - return nil, errors.HandleSensitiveParsingError(sensitiveParsingErr, md.decrypted != nil) - } - return mdFinal, nil -} - -// readSignedMessage reads a possibly signed message if mdin is non-zero then -// that structure is updated and returned. Otherwise a fresh MessageDetails is -// used. -func readSignedMessage(packets *packet.Reader, mdin *MessageDetails, keyring KeyRing, config *packet.Config) (md *MessageDetails, err error) { - if mdin == nil { - mdin = new(MessageDetails) - } - md = mdin - - var p packet.Packet - var h hash.Hash - var wrappedHash hash.Hash - var prevLast bool -FindLiteralData: - for { - p, err = packets.Next() - if err != nil { - return nil, err - } - switch p := p.(type) { - case *packet.Compressed: - if err := packets.Push(p.Body); err != nil { - return nil, err - } - case *packet.OnePassSignature: - if prevLast { - return nil, errors.UnsupportedError("nested signature packets") - } - - if p.IsLast { - prevLast = true - } - - h, wrappedHash, err = hashForSignature(p.Hash, p.SigType, p.Salt) - if err != nil { - md.SignatureError = err - } - - md.IsSigned = true - if p.Version == 6 { - md.SignedByFingerprint = p.KeyFingerprint - } - md.SignedByKeyId = p.KeyId - - if keyring != nil { - keys := keyring.KeysByIdUsage(p.KeyId, packet.KeyFlagSign) - if len(keys) > 0 { - md.SignedBy = &keys[0] - } - } - case *packet.LiteralData: - md.LiteralData = p - break FindLiteralData - } - } - - if md.IsSigned && md.SignatureError == nil { - md.UnverifiedBody = &signatureCheckReader{packets, h, wrappedHash, md, config} - } else if md.decrypted != nil { - md.UnverifiedBody = &checkReader{md, false} - } else { - md.UnverifiedBody = md.LiteralData.Body - } - - return md, nil -} - -func wrapHashForSignature(hashFunc hash.Hash, sigType packet.SignatureType) (hash.Hash, error) { - switch sigType { - case packet.SigTypeBinary: - return hashFunc, nil - case packet.SigTypeText: - return NewCanonicalTextHash(hashFunc), nil - } - return nil, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(sigType))) -} - -// hashForSignature returns a pair of hashes that can be used to verify a -// signature. The signature may specify that the contents of the signed message -// should be preprocessed (i.e. to normalize line endings). Thus this function -// returns two hashes. The second should be used to hash the message itself and -// performs any needed preprocessing. -func hashForSignature(hashFunc crypto.Hash, sigType packet.SignatureType, sigSalt []byte) (hash.Hash, hash.Hash, error) { - if _, ok := algorithm.HashToHashIdWithSha1(hashFunc); !ok { - return nil, nil, errors.UnsupportedError("unsupported hash function") - } - if !hashFunc.Available() { - return nil, nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hashFunc))) - } - h := hashFunc.New() - if sigSalt != nil { - h.Write(sigSalt) - } - wrappedHash, err := wrapHashForSignature(h, sigType) - if err != nil { - return nil, nil, err - } - switch sigType { - case packet.SigTypeBinary: - return h, wrappedHash, nil - case packet.SigTypeText: - return h, wrappedHash, nil - } - return nil, nil, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(sigType))) -} - -// checkReader wraps an io.Reader from a LiteralData packet. When it sees EOF -// it closes the ReadCloser from any SymmetricallyEncrypted packet to trigger -// MDC checks. -type checkReader struct { - md *MessageDetails - checked bool -} - -func (cr *checkReader) Read(buf []byte) (int, error) { - n, sensitiveParsingError := cr.md.LiteralData.Body.Read(buf) - if sensitiveParsingError == io.EOF { - if cr.checked { - // Only check once - return n, io.EOF - } - mdcErr := cr.md.decrypted.Close() - if mdcErr != nil { - return n, mdcErr - } - cr.checked = true - return n, io.EOF - } - - if sensitiveParsingError != nil { - return n, errors.HandleSensitiveParsingError(sensitiveParsingError, true) - } - - return n, nil -} - -// signatureCheckReader wraps an io.Reader from a LiteralData packet and hashes -// the data as it is read. When it sees an EOF from the underlying io.Reader -// it parses and checks a trailing Signature packet and triggers any MDC checks. -type signatureCheckReader struct { - packets *packet.Reader - h, wrappedHash hash.Hash - md *MessageDetails - config *packet.Config -} - -func (scr *signatureCheckReader) Read(buf []byte) (int, error) { - n, sensitiveParsingError := scr.md.LiteralData.Body.Read(buf) - - // Hash only if required - if scr.md.SignedBy != nil { - scr.wrappedHash.Write(buf[:n]) - } - - readsDecryptedData := scr.md.decrypted != nil - if sensitiveParsingError == io.EOF { - var p packet.Packet - var readError error - var sig *packet.Signature - - p, readError = scr.packets.Next() - for readError == nil { - var ok bool - if sig, ok = p.(*packet.Signature); ok { - if sig.Version == 5 && (sig.SigType == 0x00 || sig.SigType == 0x01) { - sig.Metadata = scr.md.LiteralData - } - - // If signature KeyID matches - if scr.md.SignedBy != nil && *sig.IssuerKeyId == scr.md.SignedByKeyId { - key := scr.md.SignedBy - signatureError := key.PublicKey.VerifySignature(scr.h, sig) - if signatureError == nil { - signatureError = checkMessageSignatureDetails(key, sig, scr.config) - } - scr.md.Signature = sig - scr.md.SignatureError = signatureError - } else { - scr.md.UnverifiedSignatures = append(scr.md.UnverifiedSignatures, sig) - } - } - - p, readError = scr.packets.Next() - } - - if scr.md.SignedBy != nil && scr.md.Signature == nil { - if scr.md.UnverifiedSignatures == nil { - scr.md.SignatureError = errors.StructuralError("LiteralData not followed by signature") - } else { - scr.md.SignatureError = errors.StructuralError("No matching signature found") - } - } - - // The SymmetricallyEncrypted packet, if any, might have an - // unsigned hash of its own. In order to check this we need to - // close that Reader. - if scr.md.decrypted != nil { - if sensitiveParsingError := scr.md.decrypted.Close(); sensitiveParsingError != nil { - return n, errors.HandleSensitiveParsingError(sensitiveParsingError, true) - } - } - return n, io.EOF - } - - if sensitiveParsingError != nil { - return n, errors.HandleSensitiveParsingError(sensitiveParsingError, readsDecryptedData) - } - - return n, nil -} - -// VerifyDetachedSignature takes a signed file and a detached signature and -// returns the signature packet and the entity the signature was signed by, -// if any, and a possible signature verification error. -// If the signer isn't known, ErrUnknownIssuer is returned. -func VerifyDetachedSignature(keyring KeyRing, signed, signature io.Reader, config *packet.Config) (sig *packet.Signature, signer *Entity, err error) { - return verifyDetachedSignature(keyring, signed, signature, nil, false, config) -} - -// VerifyDetachedSignatureAndHash performs the same actions as -// VerifyDetachedSignature and checks that the expected hash functions were used. -func VerifyDetachedSignatureAndHash(keyring KeyRing, signed, signature io.Reader, expectedHashes []crypto.Hash, config *packet.Config) (sig *packet.Signature, signer *Entity, err error) { - return verifyDetachedSignature(keyring, signed, signature, expectedHashes, true, config) -} - -// CheckDetachedSignature takes a signed file and a detached signature and -// returns the entity the signature was signed by, if any, and a possible -// signature verification error. If the signer isn't known, -// ErrUnknownIssuer is returned. -func CheckDetachedSignature(keyring KeyRing, signed, signature io.Reader, config *packet.Config) (signer *Entity, err error) { - _, signer, err = verifyDetachedSignature(keyring, signed, signature, nil, false, config) - return -} - -// CheckDetachedSignatureAndHash performs the same actions as -// CheckDetachedSignature and checks that the expected hash functions were used. -func CheckDetachedSignatureAndHash(keyring KeyRing, signed, signature io.Reader, expectedHashes []crypto.Hash, config *packet.Config) (signer *Entity, err error) { - _, signer, err = verifyDetachedSignature(keyring, signed, signature, expectedHashes, true, config) - return -} - -func verifyDetachedSignature(keyring KeyRing, signed, signature io.Reader, expectedHashes []crypto.Hash, checkHashes bool, config *packet.Config) (sig *packet.Signature, signer *Entity, err error) { - var issuerKeyId uint64 - var hashFunc crypto.Hash - var sigType packet.SignatureType - var keys []Key - var p packet.Packet - - packets := packet.NewReader(signature) - for { - p, err = packets.Next() - if err == io.EOF { - return nil, nil, errors.ErrUnknownIssuer - } - if err != nil { - return nil, nil, err - } - - var ok bool - sig, ok = p.(*packet.Signature) - if !ok { - return nil, nil, errors.StructuralError("non signature packet found") - } - if sig.IssuerKeyId == nil { - return nil, nil, errors.StructuralError("signature doesn't have an issuer") - } - issuerKeyId = *sig.IssuerKeyId - hashFunc = sig.Hash - sigType = sig.SigType - if checkHashes { - matchFound := false - // check for hashes - for _, expectedHash := range expectedHashes { - if hashFunc == expectedHash { - matchFound = true - break - } - } - if !matchFound { - return nil, nil, errors.StructuralError("hash algorithm or salt mismatch with cleartext message headers") - } - } - keys = keyring.KeysByIdUsage(issuerKeyId, packet.KeyFlagSign) - if len(keys) > 0 { - break - } - } - - if len(keys) == 0 { - panic("unreachable") - } - - h, err := sig.PrepareVerify() - if err != nil { - return nil, nil, err - } - wrappedHash, err := wrapHashForSignature(h, sigType) - if err != nil { - return nil, nil, err - } - - if _, err := io.Copy(wrappedHash, signed); err != nil && err != io.EOF { - return nil, nil, err - } - - for _, key := range keys { - err = key.PublicKey.VerifySignature(h, sig) - if err == nil { - return sig, key.Entity, checkMessageSignatureDetails(&key, sig, config) - } - } - - return nil, nil, err -} - -// CheckArmoredDetachedSignature performs the same actions as -// CheckDetachedSignature but expects the signature to be armored. -func CheckArmoredDetachedSignature(keyring KeyRing, signed, signature io.Reader, config *packet.Config) (signer *Entity, err error) { - body, err := readArmored(signature, SignatureType) - if err != nil { - return - } - - return CheckDetachedSignature(keyring, signed, body, config) -} - -// checkMessageSignatureDetails returns an error if: -// - The signature (or one of the binding signatures mentioned below) -// has a unknown critical notation data subpacket -// - The primary key of the signing entity is revoked -// - The primary identity is revoked -// - The signature is expired -// - The primary key of the signing entity is expired according to the -// primary identity binding signature -// -// ... or, if the signature was signed by a subkey and: -// - The signing subkey is revoked -// - The signing subkey is expired according to the subkey binding signature -// - The signing subkey binding signature is expired -// - The signing subkey cross-signature is expired -// -// NOTE: The order of these checks is important, as the caller may choose to -// ignore ErrSignatureExpired or ErrKeyExpired errors, but should never -// ignore any other errors. -func checkMessageSignatureDetails(key *Key, signature *packet.Signature, config *packet.Config) error { - now := config.Now() - primarySelfSignature, primaryIdentity := key.Entity.PrimarySelfSignature() - signedBySubKey := key.PublicKey != key.Entity.PrimaryKey - sigsToCheck := []*packet.Signature{signature, primarySelfSignature} - if signedBySubKey { - sigsToCheck = append(sigsToCheck, key.SelfSignature, key.SelfSignature.EmbeddedSignature) - } - for _, sig := range sigsToCheck { - for _, notation := range sig.Notations { - if notation.IsCritical && !config.KnownNotation(notation.Name) { - return errors.SignatureError("unknown critical notation: " + notation.Name) - } - } - } - if key.Entity.Revoked(now) || // primary key is revoked - (signedBySubKey && key.Revoked(now)) || // subkey is revoked - (primaryIdentity != nil && primaryIdentity.Revoked(now)) { // primary identity is revoked for v4 - return errors.ErrKeyRevoked - } - if key.Entity.PrimaryKey.KeyExpired(primarySelfSignature, now) { // primary key is expired - return errors.ErrKeyExpired - } - if signedBySubKey { - if key.PublicKey.KeyExpired(key.SelfSignature, now) { // subkey is expired - return errors.ErrKeyExpired - } - } - for _, sig := range sigsToCheck { - if sig.SigExpired(now) { // any of the relevant signatures are expired - return errors.ErrSignatureExpired - } - } - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/read_write_test_data.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/read_write_test_data.go deleted file mode 100644 index 670d60226..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/read_write_test_data.go +++ /dev/null @@ -1,457 +0,0 @@ -package openpgp - -const testKey1KeyId uint64 = 0xA34D7E18C20C31BB -const testKey3KeyId uint64 = 0x338934250CCC0360 -const testKeyP256KeyId uint64 = 0xd44a2c495918513e - -const signedInput = "Signed message\nline 2\nline 3\n" -const signedTextInput = "Signed message\r\nline 2\r\nline 3\r\n" - -const recipientUnspecifiedHex = "848c0300000000000000000103ff62d4d578d03cf40c3da998dfe216c074fa6ddec5e31c197c9666ba292830d91d18716a80f699f9d897389a90e6d62d0238f5f07a5248073c0f24920e4bc4a30c2d17ee4e0cae7c3d4aaa4e8dced50e3010a80ee692175fa0385f62ecca4b56ee6e9980aa3ec51b61b077096ac9e800edaf161268593eedb6cc7027ff5cb32745d250010d407a6221ae22ef18469b444f2822478c4d190b24d36371a95cb40087cdd42d9399c3d06a53c0673349bfb607927f20d1e122bde1e2bf3aa6cae6edf489629bcaa0689539ae3b718914d88ededc3b" - -const detachedSignatureHex = "889c04000102000605024d449cd1000a0910a34d7e18c20c31bb167603ff57718d09f28a519fdc7b5a68b6a3336da04df85e38c5cd5d5bd2092fa4629848a33d85b1729402a2aab39c3ac19f9d573f773cc62c264dc924c067a79dfd8a863ae06c7c8686120760749f5fd9b1e03a64d20a7df3446ddc8f0aeadeaeba7cbaee5c1e366d65b6a0c6cc749bcb912d2f15013f812795c2e29eb7f7b77f39ce77" - -const detachedSignatureTextHex = "889c04010102000605024d449d21000a0910a34d7e18c20c31bbc8c60400a24fbef7342603a41cb1165767bd18985d015fb72fe05db42db36cfb2f1d455967f1e491194fbf6cf88146222b23bf6ffbd50d17598d976a0417d3192ff9cc0034fd00f287b02e90418bbefe609484b09231e4e7a5f3562e199bf39909ab5276c4d37382fe088f6b5c3426fc1052865da8b3ab158672d58b6264b10823dc4b39" - -const detachedSignatureDSAHex = "884604001102000605024d6c4eac000a0910338934250ccc0360f18d00a087d743d6405ed7b87755476629600b8b694a39e900a0abff8126f46faf1547c1743c37b21b4ea15b8f83" - -const detachedSignatureP256Hex = "885e0400130a0006050256e5bb00000a0910d44a2c495918513edef001009841a4f792beb0befccb35c8838a6a87d9b936beaa86db6745ddc7b045eee0cf00fd1ac1f78306b17e965935dd3f8bae4587a76587e4af231efe19cc4011a8434817" - -// The plaintext is https://www.gutenberg.org/cache/epub/1080/pg1080.txt -const modestProposalSha512 = "lbbrB1+WP3T9AaC9OQqBdOcCjgeEQadlulXsNPgVx0tyqPzDHwUugZ2gE7V0ESKAw6kAVfgkcuvfgxAAGaeHtw==" - -const testKeys1And2Hex = "988d044d3c5c10010400b1d13382944bd5aba23a4312968b5095d14f947f600eb478e14a6fcb16b0e0cac764884909c020bc495cfcc39a935387c661507bdb236a0612fb582cac3af9b29cc2c8c70090616c41b662f4da4c1201e195472eb7f4ae1ccbcbf9940fe21d985e379a5563dde5b9a23d35f1cfaa5790da3b79db26f23695107bfaca8e7b5bcd0011010001b41054657374204b6579203120285253412988b804130102002205024d3c5c10021b03060b090807030206150802090a0b0416020301021e01021780000a0910a34d7e18c20c31bbb5b304009cc45fe610b641a2c146331be94dade0a396e73ca725e1b25c21708d9cab46ecca5ccebc23055879df8f99eea39b377962a400f2ebdc36a7c99c333d74aeba346315137c3ff9d0a09b0273299090343048afb8107cf94cbd1400e3026f0ccac7ecebbc4d78588eb3e478fe2754d3ca664bcf3eac96ca4a6b0c8d7df5102f60f6b0020003b88d044d3c5c10010400b201df61d67487301f11879d514f4248ade90c8f68c7af1284c161098de4c28c2850f1ec7b8e30f959793e571542ffc6532189409cb51c3d30dad78c4ad5165eda18b20d9826d8707d0f742e2ab492103a85bbd9ddf4f5720f6de7064feb0d39ee002219765bb07bcfb8b877f47abe270ddeda4f676108cecb6b9bb2ad484a4f0011010001889f04180102000905024d3c5c10021b0c000a0910a34d7e18c20c31bb1a03040085c8d62e16d05dc4e9dad64953c8a2eed8b6c12f92b1575eeaa6dcf7be9473dd5b24b37b6dffbb4e7c99ed1bd3cb11634be19b3e6e207bed7505c7ca111ccf47cb323bf1f8851eb6360e8034cbff8dd149993c959de89f8f77f38e7e98b8e3076323aa719328e2b408db5ec0d03936efd57422ba04f925cdc7b4c1af7590e40ab0020003988d044d3c5c33010400b488c3e5f83f4d561f317817538d9d0397981e9aef1321ca68ebfae1cf8b7d388e19f4b5a24a82e2fbbf1c6c26557a6c5845307a03d815756f564ac7325b02bc83e87d5480a8fae848f07cb891f2d51ce7df83dcafdc12324517c86d472cc0ee10d47a68fd1d9ae49a6c19bbd36d82af597a0d88cc9c49de9df4e696fc1f0b5d0011010001b42754657374204b6579203220285253412c20656e637279707465642070726976617465206b65792988b804130102002205024d3c5c33021b03060b090807030206150802090a0b0416020301021e01021780000a0910d4984f961e35246b98940400908a73b6a6169f700434f076c6c79015a49bee37130eaf23aaa3cfa9ce60bfe4acaa7bc95f1146ada5867e0079babb38804891f4f0b8ebca57a86b249dee786161a755b7a342e68ccf3f78ed6440a93a6626beb9a37aa66afcd4f888790cb4bb46d94a4ae3eb3d7d3e6b00f6bfec940303e89ec5b32a1eaaacce66497d539328b0020003b88d044d3c5c33010400a4e913f9442abcc7f1804ccab27d2f787ffa592077ca935a8bb23165bd8d57576acac647cc596b2c3f814518cc8c82953c7a4478f32e0cf645630a5ba38d9618ef2bc3add69d459ae3dece5cab778938d988239f8c5ae437807075e06c828019959c644ff05ef6a5a1dab72227c98e3a040b0cf219026640698d7a13d8538a570011010001889f04180102000905024d3c5c33021b0c000a0910d4984f961e35246b26c703ff7ee29ef53bc1ae1ead533c408fa136db508434e233d6e62be621e031e5940bbd4c08142aed0f82217e7c3e1ec8de574bc06ccf3c36633be41ad78a9eacd209f861cae7b064100758545cc9dd83db71806dc1cfd5fb9ae5c7474bba0c19c44034ae61bae5eca379383339dece94ff56ff7aa44a582f3e5c38f45763af577c0934b0020003" - -const testKeys1And2PrivateHex = "9501d8044d3c5c10010400b1d13382944bd5aba23a4312968b5095d14f947f600eb478e14a6fcb16b0e0cac764884909c020bc495cfcc39a935387c661507bdb236a0612fb582cac3af9b29cc2c8c70090616c41b662f4da4c1201e195472eb7f4ae1ccbcbf9940fe21d985e379a5563dde5b9a23d35f1cfaa5790da3b79db26f23695107bfaca8e7b5bcd00110100010003ff4d91393b9a8e3430b14d6209df42f98dc927425b881f1209f319220841273a802a97c7bdb8b3a7740b3ab5866c4d1d308ad0d3a79bd1e883aacf1ac92dfe720285d10d08752a7efe3c609b1d00f17f2805b217be53999a7da7e493bfc3e9618fd17018991b8128aea70a05dbce30e4fbe626aa45775fa255dd9177aabf4df7cf0200c1ded12566e4bc2bb590455e5becfb2e2c9796482270a943343a7835de41080582c2be3caf5981aa838140e97afa40ad652a0b544f83eb1833b0957dce26e47b0200eacd6046741e9ce2ec5beb6fb5e6335457844fb09477f83b050a96be7da043e17f3a9523567ed40e7a521f818813a8b8a72209f1442844843ccc7eb9805442570200bdafe0438d97ac36e773c7162028d65844c4d463e2420aa2228c6e50dc2743c3d6c72d0d782a5173fe7be2169c8a9f4ef8a7cf3e37165e8c61b89c346cdc6c1799d2b41054657374204b6579203120285253412988b804130102002205024d3c5c10021b03060b090807030206150802090a0b0416020301021e01021780000a0910a34d7e18c20c31bbb5b304009cc45fe610b641a2c146331be94dade0a396e73ca725e1b25c21708d9cab46ecca5ccebc23055879df8f99eea39b377962a400f2ebdc36a7c99c333d74aeba346315137c3ff9d0a09b0273299090343048afb8107cf94cbd1400e3026f0ccac7ecebbc4d78588eb3e478fe2754d3ca664bcf3eac96ca4a6b0c8d7df5102f60f6b00200009d01d8044d3c5c10010400b201df61d67487301f11879d514f4248ade90c8f68c7af1284c161098de4c28c2850f1ec7b8e30f959793e571542ffc6532189409cb51c3d30dad78c4ad5165eda18b20d9826d8707d0f742e2ab492103a85bbd9ddf4f5720f6de7064feb0d39ee002219765bb07bcfb8b877f47abe270ddeda4f676108cecb6b9bb2ad484a4f00110100010003fd17a7490c22a79c59281fb7b20f5e6553ec0c1637ae382e8adaea295f50241037f8997cf42c1ce26417e015091451b15424b2c59eb8d4161b0975630408e394d3b00f88d4b4e18e2cc85e8251d4753a27c639c83f5ad4a571c4f19d7cd460b9b73c25ade730c99df09637bd173d8e3e981ac64432078263bb6dc30d3e974150dd0200d0ee05be3d4604d2146fb0457f31ba17c057560785aa804e8ca5530a7cd81d3440d0f4ba6851efcfd3954b7e68908fc0ba47f7ac37bf559c6c168b70d3a7c8cd0200da1c677c4bce06a068070f2b3733b0a714e88d62aa3f9a26c6f5216d48d5c2b5624144f3807c0df30be66b3268eeeca4df1fbded58faf49fc95dc3c35f134f8b01fd1396b6c0fc1b6c4f0eb8f5e44b8eace1e6073e20d0b8bc5385f86f1cf3f050f66af789f3ef1fc107b7f4421e19e0349c730c68f0a226981f4e889054fdb4dc149e8e889f04180102000905024d3c5c10021b0c000a0910a34d7e18c20c31bb1a03040085c8d62e16d05dc4e9dad64953c8a2eed8b6c12f92b1575eeaa6dcf7be9473dd5b24b37b6dffbb4e7c99ed1bd3cb11634be19b3e6e207bed7505c7ca111ccf47cb323bf1f8851eb6360e8034cbff8dd149993c959de89f8f77f38e7e98b8e3076323aa719328e2b408db5ec0d03936efd57422ba04f925cdc7b4c1af7590e40ab00200009501fe044d3c5c33010400b488c3e5f83f4d561f317817538d9d0397981e9aef1321ca68ebfae1cf8b7d388e19f4b5a24a82e2fbbf1c6c26557a6c5845307a03d815756f564ac7325b02bc83e87d5480a8fae848f07cb891f2d51ce7df83dcafdc12324517c86d472cc0ee10d47a68fd1d9ae49a6c19bbd36d82af597a0d88cc9c49de9df4e696fc1f0b5d0011010001fe030302e9030f3c783e14856063f16938530e148bc57a7aa3f3e4f90df9dceccdc779bc0835e1ad3d006e4a8d7b36d08b8e0de5a0d947254ecfbd22037e6572b426bcfdc517796b224b0036ff90bc574b5509bede85512f2eefb520fb4b02aa523ba739bff424a6fe81c5041f253f8d757e69a503d3563a104d0d49e9e890b9d0c26f96b55b743883b472caa7050c4acfd4a21f875bdf1258d88bd61224d303dc9df77f743137d51e6d5246b88c406780528fd9a3e15bab5452e5b93970d9dcc79f48b38651b9f15bfbcf6da452837e9cc70683d1bdca94507870f743e4ad902005812488dd342f836e72869afd00ce1850eea4cfa53ce10e3608e13d3c149394ee3cbd0e23d018fcbcb6e2ec5a1a22972d1d462ca05355d0d290dd2751e550d5efb38c6c89686344df64852bf4ff86638708f644e8ec6bd4af9b50d8541cb91891a431326ab2e332faa7ae86cfb6e0540aa63160c1e5cdd5a4add518b303fff0a20117c6bc77f7cfbaf36b04c865c6c2b42754657374204b6579203220285253412c20656e637279707465642070726976617465206b65792988b804130102002205024d3c5c33021b03060b090807030206150802090a0b0416020301021e01021780000a0910d4984f961e35246b98940400908a73b6a6169f700434f076c6c79015a49bee37130eaf23aaa3cfa9ce60bfe4acaa7bc95f1146ada5867e0079babb38804891f4f0b8ebca57a86b249dee786161a755b7a342e68ccf3f78ed6440a93a6626beb9a37aa66afcd4f888790cb4bb46d94a4ae3eb3d7d3e6b00f6bfec940303e89ec5b32a1eaaacce66497d539328b00200009d01fe044d3c5c33010400a4e913f9442abcc7f1804ccab27d2f787ffa592077ca935a8bb23165bd8d57576acac647cc596b2c3f814518cc8c82953c7a4478f32e0cf645630a5ba38d9618ef2bc3add69d459ae3dece5cab778938d988239f8c5ae437807075e06c828019959c644ff05ef6a5a1dab72227c98e3a040b0cf219026640698d7a13d8538a570011010001fe030302e9030f3c783e148560f936097339ae381d63116efcf802ff8b1c9360767db5219cc987375702a4123fd8657d3e22700f23f95020d1b261eda5257e9a72f9a918e8ef22dd5b3323ae03bbc1923dd224db988cadc16acc04b120a9f8b7e84da9716c53e0334d7b66586ddb9014df604b41be1e960dcfcbc96f4ed150a1a0dd070b9eb14276b9b6be413a769a75b519a53d3ecc0c220e85cd91ca354d57e7344517e64b43b6e29823cbd87eae26e2b2e78e6dedfbb76e3e9f77bcb844f9a8932eb3db2c3f9e44316e6f5d60e9e2a56e46b72abe6b06dc9a31cc63f10023d1f5e12d2a3ee93b675c96f504af0001220991c88db759e231b3320dcedf814dcf723fd9857e3d72d66a0f2af26950b915abdf56c1596f46a325bf17ad4810d3535fb02a259b247ac3dbd4cc3ecf9c51b6c07cebb009c1506fba0a89321ec8683e3fd009a6e551d50243e2d5092fefb3321083a4bad91320dc624bd6b5dddf93553e3d53924c05bfebec1fb4bd47e89a1a889f04180102000905024d3c5c33021b0c000a0910d4984f961e35246b26c703ff7ee29ef53bc1ae1ead533c408fa136db508434e233d6e62be621e031e5940bbd4c08142aed0f82217e7c3e1ec8de574bc06ccf3c36633be41ad78a9eacd209f861cae7b064100758545cc9dd83db71806dc1cfd5fb9ae5c7474bba0c19c44034ae61bae5eca379383339dece94ff56ff7aa44a582f3e5c38f45763af577c0934b0020000" - -const dsaElGamalTestKeysHex = "9501e1044dfcb16a110400aa3e5c1a1f43dd28c2ffae8abf5cfce555ee874134d8ba0a0f7b868ce2214beddc74e5e1e21ded354a95d18acdaf69e5e342371a71fbb9093162e0c5f3427de413a7f2c157d83f5cd2f9d791256dc4f6f0e13f13c3302af27f2384075ab3021dff7a050e14854bbde0a1094174855fc02f0bae8e00a340d94a1f22b32e48485700a0cec672ac21258fb95f61de2ce1af74b2c4fa3e6703ff698edc9be22c02ae4d916e4fa223f819d46582c0516235848a77b577ea49018dcd5e9e15cff9dbb4663a1ae6dd7580fa40946d40c05f72814b0f88481207e6c0832c3bded4853ebba0a7e3bd8e8c66df33d5a537cd4acf946d1080e7a3dcea679cb2b11a72a33a2b6a9dc85f466ad2ddf4c3db6283fa645343286971e3dd700703fc0c4e290d45767f370831a90187e74e9972aae5bff488eeff7d620af0362bfb95c1a6c3413ab5d15a2e4139e5d07a54d72583914661ed6a87cce810be28a0aa8879a2dd39e52fb6fe800f4f181ac7e328f740cde3d09a05cecf9483e4cca4253e60d4429ffd679d9996a520012aad119878c941e3cf151459873bdfc2a9563472fe0303027a728f9feb3b864260a1babe83925ce794710cfd642ee4ae0e5b9d74cee49e9c67b6cd0ea5dfbb582132195a121356a1513e1bca73e5b80c58c7ccb4164453412f456c47616d616c2054657374204b65792031886204131102002205024dfcb16a021b03060b090807030206150802090a0b0416020301021e01021780000a091033af447ccd759b09fadd00a0b8fd6f5a790bad7e9f2dbb7632046dc4493588db009c087c6a9ba9f7f49fab221587a74788c00db4889ab00200009d0157044dfcb16a1004008dec3f9291205255ccff8c532318133a6840739dd68b03ba942676f9038612071447bf07d00d559c5c0875724ea16a4c774f80d8338b55fca691a0522e530e604215b467bbc9ccfd483a1da99d7bc2648b4318fdbd27766fc8bfad3fddb37c62b8ae7ccfe9577e9b8d1e77c1d417ed2c2ef02d52f4da11600d85d3229607943700030503ff506c94c87c8cab778e963b76cf63770f0a79bf48fb49d3b4e52234620fc9f7657f9f8d56c96a2b7c7826ae6b57ebb2221a3fe154b03b6637cea7e6d98e3e45d87cf8dc432f723d3d71f89c5192ac8d7290684d2c25ce55846a80c9a7823f6acd9bb29fa6cd71f20bc90eccfca20451d0c976e460e672b000df49466408d527affe0303027a728f9feb3b864260abd761730327bca2aaa4ea0525c175e92bf240682a0e83b226f97ecb2e935b62c9a133858ce31b271fa8eb41f6a1b3cd72a63025ce1a75ee4180dcc284884904181102000905024dfcb16a021b0c000a091033af447ccd759b09dd0b009e3c3e7296092c81bee5a19929462caaf2fff3ae26009e218c437a2340e7ea628149af1ec98ec091a43992b00200009501e1044dfcb1be1104009f61faa61aa43df75d128cbe53de528c4aec49ce9360c992e70c77072ad5623de0a3a6212771b66b39a30dad6781799e92608316900518ec01184a85d872365b7d2ba4bacfb5882ea3c2473d3750dc6178cc1cf82147fb58caa28b28e9f12f6d1efcb0534abed644156c91cca4ab78834268495160b2400bc422beb37d237c2300a0cac94911b6d493bda1e1fbc6feeca7cb7421d34b03fe22cec6ccb39675bb7b94a335c2b7be888fd3906a1125f33301d8aa6ec6ee6878f46f73961c8d57a3e9544d8ef2a2cbfd4d52da665b1266928cfe4cb347a58c412815f3b2d2369dec04b41ac9a71cc9547426d5ab941cccf3b18575637ccfb42df1a802df3cfe0a999f9e7109331170e3a221991bf868543960f8c816c28097e503fe319db10fb98049f3a57d7c80c420da66d56f3644371631fad3f0ff4040a19a4fedc2d07727a1b27576f75a4d28c47d8246f27071e12d7a8de62aad216ddbae6aa02efd6b8a3e2818cda48526549791ab277e447b3a36c57cefe9b592f5eab73959743fcc8e83cbefec03a329b55018b53eec196765ae40ef9e20521a603c551efe0303020950d53a146bf9c66034d00c23130cce95576a2ff78016ca471276e8227fb30b1ffbd92e61804fb0c3eff9e30b1a826ee8f3e4730b4d86273ca977b4164453412f456c47616d616c2054657374204b65792032886204131102002205024dfcb1be021b03060b090807030206150802090a0b0416020301021e01021780000a0910a86bf526325b21b22bd9009e34511620415c974750a20df5cb56b182f3b48e6600a0a9466cb1a1305a84953445f77d461593f1d42bc1b00200009d0157044dfcb1be1004009565a951da1ee87119d600c077198f1c1bceb0f7aa54552489298e41ff788fa8f0d43a69871f0f6f77ebdfb14a4260cf9fbeb65d5844b4272a1904dd95136d06c3da745dc46327dd44a0f16f60135914368c8039a34033862261806bb2c5ce1152e2840254697872c85441ccb7321431d75a747a4bfb1d2c66362b51ce76311700030503fc0ea76601c196768070b7365a200e6ddb09307f262d5f39eec467b5f5784e22abdf1aa49226f59ab37cb49969d8f5230ea65caf56015abda62604544ed526c5c522bf92bed178a078789f6c807b6d34885688024a5bed9e9f8c58d11d4b82487b44c5f470c5606806a0443b79cadb45e0f897a561a53f724e5349b9267c75ca17fe0303020950d53a146bf9c660bc5f4ce8f072465e2d2466434320c1e712272fafc20e342fe7608101580fa1a1a367e60486a7cd1246b7ef5586cf5e10b32762b710a30144f12dd17dd4884904181102000905024dfcb1be021b0c000a0910a86bf526325b21b2904c00a0b2b66b4b39ccffda1d10f3ea8d58f827e30a8b8e009f4255b2d8112a184e40cde43a34e8655ca7809370b0020000" - -const ed25519wX25519Key = "c54b0663877fe31b00000020f94da7bb48d60a61e567706a6587d0331999bb9d891a08242ead84543df895a3001972817b12be707e8d5f586ce61361201d344eb266a2c82fde6835762b65b0b7c2b1061f1b0a00000042058263877fe3030b090705150a0e080c021600029b03021e09222106cb186c4f0609a697e4d52dfa6c722b0c1f1e27c18a56708f6525ec27bad9acc905270902070200000000ad2820103e2d7d227ec0e6d7ce4471db36bfc97083253690271498a7ef0576c07faae14585b3b903b0127ec4fda2f023045a2ec76bcb4f9571a9651e14aee1137a1d668442c88f951e33c4ffd33fb9a17d511eed758fc6d9cc50cb5fd793b2039d5804c74b0663877fe319000000208693248367f9e5015db922f8f48095dda784987f2d5985b12fbad16caf5e4435004d600a4f794d44775c57a26e0feefed558e9afffd6ad0d582d57fb2ba2dcedb8c29b06181b0a0000002c050263877fe322a106cb186c4f0609a697e4d52dfa6c722b0c1f1e27c18a56708f6525ec27bad9acc9021b0c00000000defa20a6e9186d9d5935fc8fe56314cdb527486a5a5120f9b762a235a729f039010a56b89c658568341fbef3b894e9834ad9bc72afae2f4c9c47a43855e65f1cb0a3f77bbc5f61085c1f8249fe4e7ca59af5f0bcee9398e0fa8d76e522e1d8ab42bb0d" - -const signedMessageHex = "a3019bc0cbccc0c4b8d8b74ee2108fe16ec6d3ca490cbe362d3f8333d3f352531472538b8b13d353b97232f352158c20943157c71c16064626063656269052062e4e01987e9b6fccff4b7df3a34c534b23e679cbec3bc0f8f6e64dfb4b55fe3f8efa9ce110ddb5cd79faf1d753c51aecfa669f7e7aa043436596cccc3359cb7dd6bbe9ecaa69e5989d9e57209571edc0b2fa7f57b9b79a64ee6e99ce1371395fee92fec2796f7b15a77c386ff668ee27f6d38f0baa6c438b561657377bf6acff3c5947befd7bf4c196252f1d6e5c524d0300" - -const signedTextMessageHex = "a3019bc0cbccc8c4b8d8b74ee2108fe16ec6d36a250cbece0c178233d3f352531472538b8b13d35379b97232f352158ca0b4312f57c71c1646462606365626906a062e4e019811591798ff99bf8afee860b0d8a8c2a85c3387e3bcf0bb3b17987f2bbcfab2aa526d930cbfd3d98757184df3995c9f3e7790e36e3e9779f06089d4c64e9e47dd6202cb6e9bc73c5d11bb59fbaf89d22d8dc7cf199ddf17af96e77c5f65f9bbed56f427bd8db7af37f6c9984bf9385efaf5f184f986fb3e6adb0ecfe35bbf92d16a7aa2a344fb0bc52fb7624f0200" - -const signedEncryptedMessageHex = "c18c032a67d68660df41c70103ff5a84c9a72f80e74ef0384c2d6a9ebfe2b09e06a8f298394f6d2abf174e40934ab0ec01fb2d0ddf21211c6fe13eb238563663b017a6b44edca552eb4736c4b7dc6ed907dd9e12a21b51b64b46f902f76fb7aaf805c1db8070574d8d0431a23e324a750f77fb72340a17a42300ee4ca8207301e95a731da229a63ab9c6b44541fbd2c11d016d810b3b3b2b38f15b5b40f0a4910332829c2062f1f7cc61f5b03677d73c54cafa1004ced41f315d46444946faae571d6f426e6dbd45d9780eb466df042005298adabf7ce0ef766dfeb94cd449c7ed0046c880339599c4711af073ce649b1e237c40b50a5536283e03bdbb7afad78bd08707715c67fb43295f905b4c479178809d429a8e167a9a8c6dfd8ab20b4edebdc38d6dec879a3202e1b752690d9bb5b0c07c5a227c79cc200e713a99251a4219d62ad5556900cf69bd384b6c8e726c7be267471d0d23af956da165af4af757246c2ebcc302b39e8ef2fccb4971b234fcda22d759ddb20e27269ee7f7fe67898a9de721bfa02ab0becaa046d00ea16cb1afc4e2eab40d0ac17121c565686e5cbd0cbdfbd9d6db5c70278b9c9db5a83176d04f61fbfbc4471d721340ede2746e5c312ded4f26787985af92b64fae3f253dbdde97f6a5e1996fd4d865599e32ff76325d3e9abe93184c02988ee89a4504356a4ef3b9b7a57cbb9637ca90af34a7676b9ef559325c3cca4e29d69fec1887f5440bb101361d744ad292a8547f22b4f22b419a42aa836169b89190f46d9560824cb2ac6e8771de8223216a5e647e132ab9eebcba89569ab339cb1c3d70fe806b31f4f4c600b4103b8d7583ebff16e43dcda551e6530f975122eb8b29" - -const verifiedSignatureEncryptedMessageHex = "c2b304000108000605026048f6d600210910a34d7e18c20c31bb1621045fb74b1d03b1e3cb31bc2f8aa34d7e18c20c31bb9a3b0400a32ddac1af259c1b0abab0041327ea04970944401978fb647dd1cf9aba4f164e43f0d8a9389501886474bdd4a6e77f6aea945c07dfbf87743835b44cc2c39a1f9aeecfa83135abc92e18e50396f2e6a06c44e0188b0081effbfb4160d28f118d4ff73dd199a102e47cffd8c7ff2bacd83ae72b5820c021a486766dd587b5da61" - -const unverifiedSignatureEncryptedMessageHex = "c2b304000108000605026048f6d600210910a34d7e18c20c31bb1621045fb74b1d03b1e3cb31bc2f8aa34d7e18c20c31bb9a3b0400a32ddac1af259c1b0abab0041327ea04970944401978fb647dd1cf9aba4f164e43f0d8a9389501886474bdd4a6e77f6aea945c07dfbf87743835b44cc2c39a1f9aeecfa83135abc92e18e50396f2e6a06c44e0188b0081effbfb4160d28f118d4ff73dd199a102e47cffd8c7ff2bacd83ae72b5820c021a486766dd587b5da61" - -const signedEncryptedMessage2Hex = "85010e03cf6a7abcd43e36731003fb057f5495b79db367e277cdbe4ab90d924ddee0c0381494112ff8c1238fb0184af35d1731573b01bc4c55ecacd2aafbe2003d36310487d1ecc9ac994f3fada7f9f7f5c3a64248ab7782906c82c6ff1303b69a84d9a9529c31ecafbcdb9ba87e05439897d87e8a2a3dec55e14df19bba7f7bd316291c002ae2efd24f83f9e3441203fc081c0c23dc3092a454ca8a082b27f631abf73aca341686982e8fbda7e0e7d863941d68f3de4a755c2964407f4b5e0477b3196b8c93d551dd23c8beef7d0f03fbb1b6066f78907faf4bf1677d8fcec72651124080e0b7feae6b476e72ab207d38d90b958759fdedfc3c6c35717c9dbfc979b3cfbbff0a76d24a5e57056bb88acbd2a901ef64bc6e4db02adc05b6250ff378de81dca18c1910ab257dff1b9771b85bb9bbe0a69f5989e6d1710a35e6dfcceb7d8fb5ccea8db3932b3d9ff3fe0d327597c68b3622aec8e3716c83a6c93f497543b459b58ba504ed6bcaa747d37d2ca746fe49ae0a6ce4a8b694234e941b5159ff8bd34b9023da2814076163b86f40eed7c9472f81b551452d5ab87004a373c0172ec87ea6ce42ccfa7dbdad66b745496c4873d8019e8c28d6b3" - -const signatureEncryptedMessage2Hex = "c24604001102000605024dfd0166000a091033af447ccd759b09bae600a096ec5e63ecf0a403085e10f75cc3bab327663282009f51fad9df457ed8d2b70d8a73c76e0443eac0f377" - -const symmetricallyEncryptedCompressedHex = "c32e040903085a357c1a7b5614ed00cc0d1d92f428162058b3f558a0fb0980d221ebac6c97d5eda4e0fe32f6e706e94dd263012d6ca1ef8c4bbd324098225e603a10c85ebf09cbf7b5aeeb5ce46381a52edc51038b76a8454483be74e6dcd1e50d5689a8ae7eceaeefed98a0023d49b22eb1f65c2aa1ef1783bb5e1995713b0457102ec3c3075fe871267ffa4b686ad5d52000d857" - -const dsaTestKeyHex = "9901a2044d6c49de110400cb5ce438cf9250907ac2ba5bf6547931270b89f7c4b53d9d09f4d0213a5ef2ec1f26806d3d259960f872a4a102ef1581ea3f6d6882d15134f21ef6a84de933cc34c47cc9106efe3bd84c6aec12e78523661e29bc1a61f0aab17fa58a627fd5fd33f5149153fbe8cd70edf3d963bc287ef875270ff14b5bfdd1bca4483793923b00a0fe46d76cb6e4cbdc568435cd5480af3266d610d303fe33ae8273f30a96d4d34f42fa28ce1112d425b2e3bf7ea553d526e2db6b9255e9dc7419045ce817214d1a0056dbc8d5289956a4b1b69f20f1105124096e6a438f41f2e2495923b0f34b70642607d45559595c7fe94d7fa85fc41bf7d68c1fd509ebeaa5f315f6059a446b9369c277597e4f474a9591535354c7e7f4fd98a08aa60400b130c24ff20bdfbf683313f5daebf1c9b34b3bdadfc77f2ddd72ee1fb17e56c473664bc21d66467655dd74b9005e3a2bacce446f1920cd7017231ae447b67036c9b431b8179deacd5120262d894c26bc015bffe3d827ba7087ad9b700d2ca1f6d16cc1786581e5dd065f293c31209300f9b0afcc3f7c08dd26d0a22d87580b4db41054657374204b65792033202844534129886204131102002205024d6c49de021b03060b090807030206150802090a0b0416020301021e01021780000a0910338934250ccc03607e0400a0bdb9193e8a6b96fc2dfc108ae848914b504481f100a09c4dc148cb693293a67af24dd40d2b13a9e36794" - -const dsaTestKeyPrivateHex = "9501bb044d6c49de110400cb5ce438cf9250907ac2ba5bf6547931270b89f7c4b53d9d09f4d0213a5ef2ec1f26806d3d259960f872a4a102ef1581ea3f6d6882d15134f21ef6a84de933cc34c47cc9106efe3bd84c6aec12e78523661e29bc1a61f0aab17fa58a627fd5fd33f5149153fbe8cd70edf3d963bc287ef875270ff14b5bfdd1bca4483793923b00a0fe46d76cb6e4cbdc568435cd5480af3266d610d303fe33ae8273f30a96d4d34f42fa28ce1112d425b2e3bf7ea553d526e2db6b9255e9dc7419045ce817214d1a0056dbc8d5289956a4b1b69f20f1105124096e6a438f41f2e2495923b0f34b70642607d45559595c7fe94d7fa85fc41bf7d68c1fd509ebeaa5f315f6059a446b9369c277597e4f474a9591535354c7e7f4fd98a08aa60400b130c24ff20bdfbf683313f5daebf1c9b34b3bdadfc77f2ddd72ee1fb17e56c473664bc21d66467655dd74b9005e3a2bacce446f1920cd7017231ae447b67036c9b431b8179deacd5120262d894c26bc015bffe3d827ba7087ad9b700d2ca1f6d16cc1786581e5dd065f293c31209300f9b0afcc3f7c08dd26d0a22d87580b4d00009f592e0619d823953577d4503061706843317e4fee083db41054657374204b65792033202844534129886204131102002205024d6c49de021b03060b090807030206150802090a0b0416020301021e01021780000a0910338934250ccc03607e0400a0bdb9193e8a6b96fc2dfc108ae848914b504481f100a09c4dc148cb693293a67af24dd40d2b13a9e36794" - -const p256TestKeyHex = "98520456e5b83813082a8648ce3d030107020304a2072cd6d21321266c758cc5b83fab0510f751cb8d91897cddb7047d8d6f185546e2107111b0a95cb8ef063c33245502af7a65f004d5919d93ee74eb71a66253b424502d3235362054657374204b6579203c696e76616c6964406578616d706c652e636f6d3e8879041313080021050256e5b838021b03050b09080702061508090a0b020416020301021e01021780000a0910d44a2c495918513e54e50100dfa64f97d9b47766fc1943c6314ba3f2b2a103d71ad286dc5b1efb96a345b0c80100dbc8150b54241f559da6ef4baacea6d31902b4f4b1bdc09b34bf0502334b7754b8560456e5b83812082a8648ce3d030107020304bfe3cea9cee13486f8d518aa487fecab451f25467d2bf08e58f63e5fa525d5482133e6a79299c274b068ef0be448152ad65cf11cf764348588ca4f6a0bcf22b6030108078861041813080009050256e5b838021b0c000a0910d44a2c495918513e4a4800ff49d589fa64024ad30be363a032e3a0e0e6f5db56ba4c73db850518bf0121b8f20100fd78e065f4c70ea5be9df319ea67e493b936fc78da834a71828043d3154af56e" - -const p256TestKeyPrivateHex = "94a50456e5b83813082a8648ce3d030107020304a2072cd6d21321266c758cc5b83fab0510f751cb8d91897cddb7047d8d6f185546e2107111b0a95cb8ef063c33245502af7a65f004d5919d93ee74eb71a66253fe070302f0c2bfb0b6c30f87ee1599472b8636477eab23ced13b271886a4b50ed34c9d8436af5af5b8f88921f0efba6ef8c37c459bbb88bc1c6a13bbd25c4ce9b1e97679569ee77645d469bf4b43de637f5561b424502d3235362054657374204b6579203c696e76616c6964406578616d706c652e636f6d3e8879041313080021050256e5b838021b03050b09080702061508090a0b020416020301021e01021780000a0910d44a2c495918513e54e50100dfa64f97d9b47766fc1943c6314ba3f2b2a103d71ad286dc5b1efb96a345b0c80100dbc8150b54241f559da6ef4baacea6d31902b4f4b1bdc09b34bf0502334b77549ca90456e5b83812082a8648ce3d030107020304bfe3cea9cee13486f8d518aa487fecab451f25467d2bf08e58f63e5fa525d5482133e6a79299c274b068ef0be448152ad65cf11cf764348588ca4f6a0bcf22b603010807fe0703027510012471a603cfee2968dce19f732721ddf03e966fd133b4e3c7a685b788705cbc46fb026dc94724b830c9edbaecd2fb2c662f23169516cacd1fe423f0475c364ecc10abcabcfd4bbbda1a36a1bd8861041813080009050256e5b838021b0c000a0910d44a2c495918513e4a4800ff49d589fa64024ad30be363a032e3a0e0e6f5db56ba4c73db850518bf0121b8f20100fd78e065f4c70ea5be9df319ea67e493b936fc78da834a71828043d3154af56e" - -const armoredPrivateKeyBlock = `-----BEGIN PGP PRIVATE KEY BLOCK----- -Version: GnuPG v1.4.10 (GNU/Linux) - -lQHYBE2rFNoBBADFwqWQIW/DSqcB4yCQqnAFTJ27qS5AnB46ccAdw3u4Greeu3Bp -idpoHdjULy7zSKlwR1EA873dO/k/e11Ml3dlAFUinWeejWaK2ugFP6JjiieSsrKn -vWNicdCS4HTWn0X4sjl0ZiAygw6GNhqEQ3cpLeL0g8E9hnYzJKQ0LWJa0QARAQAB -AAP/TB81EIo2VYNmTq0pK1ZXwUpxCrvAAIG3hwKjEzHcbQznsjNvPUihZ+NZQ6+X -0HCfPAdPkGDCLCb6NavcSW+iNnLTrdDnSI6+3BbIONqWWdRDYJhqZCkqmG6zqSfL -IdkJgCw94taUg5BWP/AAeQrhzjChvpMQTVKQL5mnuZbUCeMCAN5qrYMP2S9iKdnk -VANIFj7656ARKt/nf4CBzxcpHTyB8+d2CtPDKCmlJP6vL8t58Jmih+kHJMvC0dzn -gr5f5+sCAOOe5gt9e0am7AvQWhdbHVfJU0TQJx+m2OiCJAqGTB1nvtBLHdJnfdC9 -TnXXQ6ZXibqLyBies/xeY2sCKL5qtTMCAKnX9+9d/5yQxRyrQUHt1NYhaXZnJbHx -q4ytu0eWz+5i68IYUSK69jJ1NWPM0T6SkqpB3KCAIv68VFm9PxqG1KmhSrQIVGVz -dCBLZXmIuAQTAQIAIgUCTasU2gIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA -CgkQO9o98PRieSoLhgQAkLEZex02Qt7vGhZzMwuN0R22w3VwyYyjBx+fM3JFETy1 -ut4xcLJoJfIaF5ZS38UplgakHG0FQ+b49i8dMij0aZmDqGxrew1m4kBfjXw9B/v+ -eIqpODryb6cOSwyQFH0lQkXC040pjq9YqDsO5w0WYNXYKDnzRV0p4H1pweo2VDid -AdgETasU2gEEAN46UPeWRqKHvA99arOxee38fBt2CI08iiWyI8T3J6ivtFGixSqV -bRcPxYO/qLpVe5l84Nb3X71GfVXlc9hyv7CD6tcowL59hg1E/DC5ydI8K8iEpUmK -/UnHdIY5h8/kqgGxkY/T/hgp5fRQgW1ZoZxLajVlMRZ8W4tFtT0DeA+JABEBAAEA -A/0bE1jaaZKj6ndqcw86jd+QtD1SF+Cf21CWRNeLKnUds4FRRvclzTyUMuWPkUeX -TaNNsUOFqBsf6QQ2oHUBBK4VCHffHCW4ZEX2cd6umz7mpHW6XzN4DECEzOVksXtc -lUC1j4UB91DC/RNQqwX1IV2QLSwssVotPMPqhOi0ZLNY7wIA3n7DWKInxYZZ4K+6 -rQ+POsz6brEoRHwr8x6XlHenq1Oki855pSa1yXIARoTrSJkBtn5oI+f8AzrnN0BN -oyeQAwIA/7E++3HDi5aweWrViiul9cd3rcsS0dEnksPhvS0ozCJiHsq/6GFmy7J8 -QSHZPteedBnZyNp5jR+H7cIfVN3KgwH/Skq4PsuPhDq5TKK6i8Pc1WW8MA6DXTdU -nLkX7RGmMwjC0DBf7KWAlPjFaONAX3a8ndnz//fy1q7u2l9AZwrj1qa1iJ8EGAEC -AAkFAk2rFNoCGwwACgkQO9o98PRieSo2/QP/WTzr4ioINVsvN1akKuekmEMI3LAp -BfHwatufxxP1U+3Si/6YIk7kuPB9Hs+pRqCXzbvPRrI8NHZBmc8qIGthishdCYad -AHcVnXjtxrULkQFGbGvhKURLvS9WnzD/m1K2zzwxzkPTzT9/Yf06O6Mal5AdugPL -VrM0m72/jnpKo04= -=zNCn ------END PGP PRIVATE KEY BLOCK-----` - -const e2ePublicKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- -Charset: UTF-8 - -xv8AAABSBAAAAAATCCqGSM49AwEHAgME1LRoXSpOxtHXDUdmuvzchyg6005qIBJ4 -sfaSxX7QgH9RV2ONUhC+WiayCNADq+UMzuR/vunSr4aQffXvuGnR383/AAAAFDxk -Z2lsQHlhaG9vLWluYy5jb20+wv8AAACGBBATCAA4/wAAAAWCVGvAG/8AAAACiwn/ -AAAACZC2VkQCOjdvYf8AAAAFlQgJCgv/AAAAA5YBAv8AAAACngEAAE1BAP0X8veD -24IjmI5/C6ZAfVNXxgZZFhTAACFX75jUA3oD6AEAzoSwKf1aqH6oq62qhCN/pekX -+WAsVMBhNwzLpqtCRjLO/wAAAFYEAAAAABIIKoZIzj0DAQcCAwT50ain7vXiIRv8 -B1DO3x3cE/aattZ5sHNixJzRCXi2vQIA5QmOxZ6b5jjUekNbdHG3SZi1a2Ak5mfX -fRxC/5VGAwEIB8L/AAAAZQQYEwgAGP8AAAAFglRrwBz/AAAACZC2VkQCOjdvYQAA -FJAA9isX3xtGyMLYwp2F3nXm7QEdY5bq5VUcD/RJlj792VwA/1wH0pCzVLl4Q9F9 -ex7En5r7rHR5xwX82Msc+Rq9dSyO -=7MrZ ------END PGP PUBLIC KEY BLOCK-----` - -const dsaKeyWithSHA512 = `9901a2044f04b07f110400db244efecc7316553ee08d179972aab87bb1214de7692593fcf5b6feb1c80fba268722dd464748539b85b81d574cd2d7ad0ca2444de4d849b8756bad7768c486c83a824f9bba4af773d11742bdfb4ac3b89ef8cc9452d4aad31a37e4b630d33927bff68e879284a1672659b8b298222fc68f370f3e24dccacc4a862442b9438b00a0ea444a24088dc23e26df7daf8f43cba3bffc4fe703fe3d6cd7fdca199d54ed8ae501c30e3ec7871ea9cdd4cf63cfe6fc82281d70a5b8bb493f922cd99fba5f088935596af087c8d818d5ec4d0b9afa7f070b3d7c1dd32a84fca08d8280b4890c8da1dde334de8e3cad8450eed2a4a4fcc2db7b8e5528b869a74a7f0189e11ef097ef1253582348de072bb07a9fa8ab838e993cef0ee203ff49298723e2d1f549b00559f886cd417a41692ce58d0ac1307dc71d85a8af21b0cf6eaa14baf2922d3a70389bedf17cc514ba0febbd107675a372fe84b90162a9e88b14d4b1c6be855b96b33fb198c46f058568817780435b6936167ebb3724b680f32bf27382ada2e37a879b3d9de2abe0c3f399350afd1ad438883f4791e2e3b4184453412068617368207472756e636174696f6e207465737488620413110a002205024f04b07f021b03060b090807030206150802090a0b0416020301021e01021780000a0910ef20e0cefca131581318009e2bf3bf047a44d75a9bacd00161ee04d435522397009a03a60d51bd8a568c6c021c8d7cf1be8d990d6417b0020003` - -const unknownHashFunctionHex = `8a00000040040001990006050253863c24000a09103b4fe6acc0b21f32ffff0101010101010101010101010101010101010101010101010101010101010101010101010101` - -const rsaSignatureBadMPIlength = `8a00000040040001030006050253863c24000a09103b4fe6acc0b21f32ffff0101010101010101010101010101010101010101010101010101010101010101010101010101` - -const missingHashFunctionHex = `8a00000040040001030006050253863c24000a09103b4fe6acc0b21f32ffff0101010101010101010101010101010101010101010101010101010101010101010101010101` - -const campbellQuine = `a0b001000300fcffa0b001000d00f2ff000300fcffa0b001000d00f2ff8270a01c00000500faff8270a01c00000500faff000500faff001400ebff8270a01c00000500faff000500faff001400ebff428821c400001400ebff428821c400001400ebff428821c400001400ebff428821c400001400ebff428821c400000000ffff000000ffff000b00f4ff428821c400000000ffff000000ffff000b00f4ff0233214c40000100feff000233214c40000100feff0000` - -const keyV4forVerifyingSignedMessageV3 = `-----BEGIN PGP PUBLIC KEY BLOCK----- -Comment: GPGTools - https://gpgtools.org - -mI0EVfxoFQEEAMBIqmbDfYygcvP6Phr1wr1XI41IF7Qixqybs/foBF8qqblD9gIY -BKpXjnBOtbkcVOJ0nljd3/sQIfH4E0vQwK5/4YRQSI59eKOqd6Fx+fWQOLG+uu6z -tewpeCj9LLHvibx/Sc7VWRnrznia6ftrXxJ/wHMezSab3tnGC0YPVdGNABEBAAG0 -JEdvY3J5cHRvIFRlc3QgS2V5IDx0aGVtYXhAZ21haWwuY29tPoi5BBMBCgAjBQJV -/GgVAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQeXnQmhdGW9PFVAP+ -K7TU0qX5ArvIONIxh/WAweyOk884c5cE8f+3NOPOOCRGyVy0FId5A7MmD5GOQh4H -JseOZVEVCqlmngEvtHZb3U1VYtVGE5WZ+6rQhGsMcWP5qaT4soYwMBlSYxgYwQcx -YhN9qOr292f9j2Y//TTIJmZT4Oa+lMxhWdqTfX+qMgG4jQRV/GgVAQQArhFSiij1 -b+hT3dnapbEU+23Z1yTu1DfF6zsxQ4XQWEV3eR8v+8mEDDNcz8oyyF56k6UQ3rXi -UMTIwRDg4V6SbZmaFbZYCOwp/EmXJ3rfhm7z7yzXj2OFN22luuqbyVhuL7LRdB0M -pxgmjXb4tTvfgKd26x34S+QqUJ7W6uprY4sAEQEAAYifBBgBCgAJBQJV/GgVAhsM -AAoJEHl50JoXRlvT7y8D/02ckx4OMkKBZo7viyrBw0MLG92i+DC2bs35PooHR6zz -786mitjOp5z2QWNLBvxC70S0qVfCIz8jKupO1J6rq6Z8CcbLF3qjm6h1omUBf8Nd -EfXKD2/2HV6zMKVknnKzIEzauh+eCKS2CeJUSSSryap/QLVAjRnckaES/OsEWhNB -=RZia ------END PGP PUBLIC KEY BLOCK----- -` - -const signedMessageV3 = `-----BEGIN PGP MESSAGE----- -Comment: GPGTools - https://gpgtools.org - -owGbwMvMwMVYWXlhlrhb9GXG03JJDKF/MtxDMjKLFYAoUaEktbhEITe1uDgxPVWP -q5NhKjMrWAVcC9evD8z/bF/uWNjqtk/X3y5/38XGRQHm/57rrDRYuGnTw597Xqka -uM3137/hH3Os+Jf2dc0fXOITKwJvXJvecPVs0ta+Vg7ZO1MLn8w58Xx+6L58mbka -DGHyU9yTueZE8D+QF/Tz28Y78dqtF56R1VPn9Xw4uJqrWYdd7b3vIZ1V6R4Nh05d -iT57d/OhWwA= -=hG7R ------END PGP MESSAGE----- -` - -// https://mailarchive.ietf.org/arch/msg/openpgp/9SheW_LENE0Kxf7haNllovPyAdY/ -const v5PrivKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -lGEFXJH05BYAAAAtCSsGAQQB2kcPAQEHQFhZlVcVVtwf+21xNQPX+ecMJJBL0MPd -fj75iux+my8QAAAAAAAiAQCHZ1SnSUmWqxEsoI6facIVZQu6mph3cBFzzTvcm5lA -Ng5ctBhlbW1hLmdvbGRtYW5AZXhhbXBsZS5uZXSIlgUTFggASCIhBRk0e8mHJGQC -X5nfPsLgAA7ZiEiS4fez6kyUAJFZVptUBQJckfTkAhsDBQsJCAcCAyICAQYVCgkI -CwIEFgIDAQIeBwIXgAAA9cAA/jiR3yMsZMeEQ40u6uzEoXa6UXeV/S3wwJAXRJy9 -M8s0AP9vuL/7AyTfFXwwzSjDnYmzS0qAhbLDQ643N+MXGBJ2BZxmBVyR9OQSAAAA -MgorBgEEAZdVAQUBAQdA+nysrzml2UCweAqtpDuncSPlvrcBWKU0yfU0YvYWWAoD -AQgHAAAAAAAiAP9OdAPppjU1WwpqjIItkxr+VPQRT8Zm/Riw7U3F6v3OiBFHiHoF -GBYIACwiIQUZNHvJhyRkAl+Z3z7C4AAO2YhIkuH3s+pMlACRWVabVAUCXJH05AIb -DAAAOSQBAP4BOOIR/sGLNMOfeb5fPs/02QMieoiSjIBnijhob2U5AQC+RtOHCHx7 -TcIYl5/Uyoi+FOvPLcNw4hOv2nwUzSSVAw== -=IiS2 ------END PGP PRIVATE KEY BLOCK-----` - -// See OpenPGP crypto refresh Section A.3. -const v6PrivKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -xUsGY4d/4xsAAAAg+U2nu0jWCmHlZ3BqZYfQMxmZu52JGggkLq2EVD34laMAGXKB -exK+cH6NX1hs5hNhIB00TrJmosgv3mg1ditlsLfCsQYfGwoAAABCBYJjh3/jAwsJ -BwUVCg4IDAIWAAKbAwIeCSIhBssYbE8GCaaX5NUt+mxyKwwfHifBilZwj2Ul7Ce6 -2azJBScJAgcCAAAAAK0oIBA+LX0ifsDm185Ecds2v8lwgyU2kCcUmKfvBXbAf6rh -RYWzuQOwEn7E/aLwIwRaLsdry0+VcallHhSu4RN6HWaEQsiPlR4zxP/TP7mhfVEe -7XWPxtnMUMtf15OyA51YBMdLBmOHf+MZAAAAIIaTJINn+eUBXbki+PSAld2nhJh/ -LVmFsS+60WyvXkQ1AE1gCk95TUR3XFeibg/u/tVY6a//1q0NWC1X+yui3O24wpsG -GBsKAAAALAWCY4d/4wKbDCIhBssYbE8GCaaX5NUt+mxyKwwfHifBilZwj2Ul7Ce6 -2azJAAAAAAQBIKbpGG2dWTX8j+VjFM21J0hqWlEg+bdiojWnKfA5AQpWUWtnNwDE -M0g12vYxoWM8Y81W+bHBw805I8kWVkXU6vFOi+HWvv/ira7ofJu16NnoUkhclkUr -k0mXubZvyl4GBg== ------END PGP PRIVATE KEY BLOCK-----` - -// See OpenPGP crypto refresh merge request: -// https://gitlab.com/openpgp-wg/rfc4880bis/-/merge_requests/304 -const v6PrivKeyMsg = `-----BEGIN PGP MESSAGE----- - -wV0GIQYSyD8ecG9jCP4VGkF3Q6HwM3kOk+mXhIjR2zeNqZMIhRmHzxjV8bU/gXzO -WgBM85PMiVi93AZfJfhK9QmxfdNnZBjeo1VDeVZheQHgaVf7yopqR6W1FT6NOrfS -aQIHAgZhZBZTW+CwcW1g4FKlbExAf56zaw76/prQoN+bAzxpohup69LA7JW/Vp0l -yZnuSj3hcFj0DfqLTGgr4/u717J+sPWbtQBfgMfG9AOIwwrUBqsFE9zW+f1zdlYo -bhF30A+IitsxxA== ------END PGP MESSAGE-----` - -// See OpenPGP crypto refresh merge request: -// https://gitlab.com/openpgp-wg/rfc4880bis/-/merge_requests/305 -const v6PrivKeyInlineSignMsg = `-----BEGIN PGP MESSAGE----- - -wV0GIQYSyD8ecG9jCP4VGkF3Q6HwM3kOk+mXhIjR2zeNqZMIhRmHzxjV8bU/gXzO -WgBM85PMiVi93AZfJfhK9QmxfdNnZBjeo1VDeVZheQHgaVf7yopqR6W1FT6NOrfS -aQIHAgZhZBZTW+CwcW1g4FKlbExAf56zaw76/prQoN+bAzxpohup69LA7JW/Vp0l -yZnuSj3hcFj0DfqLTGgr4/u717J+sPWbtQBfgMfG9AOIwwrUBqsFE9zW+f1zdlYo -bhF30A+IitsxxA== ------END PGP MESSAGE-----` - -// See https://gitlab.com/openpgp-wg/rfc4880bis/-/merge_requests/274 -// decryption password: "correct horse battery staple" -const v6ArgonSealedPrivKey = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -xYIGY4d/4xsAAAAg+U2nu0jWCmHlZ3BqZYfQMxmZu52JGggkLq2EVD34laP9JgkC -FARdb9ccngltHraRe25uHuyuAQQVtKipJ0+r5jL4dacGWSAheCWPpITYiyfyIOPS -3gIDyg8f7strd1OB4+LZsUhcIjOMpVHgmiY/IutJkulneoBYwrEGHxsKAAAAQgWC -Y4d/4wMLCQcFFQoOCAwCFgACmwMCHgkiIQbLGGxPBgmml+TVLfpscisMHx4nwYpW -cI9lJewnutmsyQUnCQIHAgAAAACtKCAQPi19In7A5tfORHHbNr/JcIMlNpAnFJin -7wV2wH+q4UWFs7kDsBJ+xP2i8CMEWi7Ha8tPlXGpZR4UruETeh1mhELIj5UeM8T/ -0z+5oX1RHu11j8bZzFDLX9eTsgOdWATHggZjh3/jGQAAACCGkySDZ/nlAV25Ivj0 -gJXdp4SYfy1ZhbEvutFsr15ENf0mCQIUBA5hhGgp2oaavg6mFUXcFMwBBBUuE8qf -9Ock+xwusd+GAglBr5LVyr/lup3xxQvHXFSjjA2haXfoN6xUGRdDEHI6+uevKjVR -v5oAxgu7eJpaXNjCmwYYGwoAAAAsBYJjh3/jApsMIiEGyxhsTwYJppfk1S36bHIr -DB8eJ8GKVnCPZSXsJ7rZrMkAAAAABAEgpukYbZ1ZNfyP5WMUzbUnSGpaUSD5t2Ki -Nacp8DkBClZRa2c3AMQzSDXa9jGhYzxjzVb5scHDzTkjyRZWRdTq8U6L4da+/+Kt -ruh8m7Xo2ehSSFyWRSuTSZe5tm/KXgYG ------END PGP PRIVATE KEY BLOCK-----` - -const v4Key25519 = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -xUkEZB3qzRto01j2k2pwN5ux9w70stPinAdXULLr20CRW7U7h2GSeACch0M+ -qzQg8yjFQ8VBvu3uwgKH9senoHmj72lLSCLTmhFKzQR0ZXN0wogEEBsIAD4F -gmQd6s0ECwkHCAmQIf45+TuC+xMDFQgKBBYAAgECGQECmwMCHgEWIQSWEzMi -jJUHvyIbVKIh/jn5O4L7EwAAUhaHNlgudvxARdPPETUzVgjuWi+YIz8w1xIb -lHQMvIrbe2sGCQIethpWofd0x7DHuv/ciHg+EoxJ/Td6h4pWtIoKx0kEZB3q -zRm4CyA7quliq7yx08AoOqHTuuCgvpkSdEhpp3pEyejQOgBo0p6ywIiLPllY -0t+jpNspHpAGfXID6oqjpYuJw3AfVRBlwnQEGBsIACoFgmQd6s0JkCH+Ofk7 -gvsTApsMFiEElhMzIoyVB78iG1SiIf45+TuC+xMAAGgQuN9G73446ykvJ/mL -sCZ7zGFId2gBd1EnG0FTC4npfOKpck0X8dngByrCxU8LDSfvjsEp/xDAiKsQ -aU71tdtNBQ== -=e7jT ------END PGP PRIVATE KEY BLOCK-----` - -const keyWithExpiredCrossSig = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -xsDNBF2lnPIBDAC5cL9PQoQLTMuhjbYvb4Ncuuo0bfmgPRFywX53jPhoFf4Zg6mv -/seOXpgecTdOcVttfzC8ycIKrt3aQTiwOG/ctaR4Bk/t6ayNFfdUNxHWk4WCKzdz -/56fW2O0F23qIRd8UUJp5IIlN4RDdRCtdhVQIAuzvp2oVy/LaS2kxQoKvph/5pQ/ -5whqsyroEWDJoSV0yOb25B/iwk/pLUFoyhDG9bj0kIzDxrEqW+7Ba8nocQlecMF3 -X5KMN5kp2zraLv9dlBBpWW43XktjcCZgMy20SouraVma8Je/ECwUWYUiAZxLIlMv -9CurEOtxUw6N3RdOtLmYZS9uEnn5y1UkF88o8Nku890uk6BrewFzJyLAx5wRZ4F0 -qV/yq36UWQ0JB/AUGhHVPdFf6pl6eaxBwT5GXvbBUibtf8YI2og5RsgTWtXfU7eb -SGXrl5ZMpbA6mbfhd0R8aPxWfmDWiIOhBufhMCvUHh1sApMKVZnvIff9/0Dca3wb -vLIwa3T4CyshfT0AEQEAAc0hQm9iIEJhYmJhZ2UgPGJvYkBvcGVucGdwLmV4YW1w -bGU+wsEABBMBCgATBYJeO2eVAgsJAxUICgKbAQIeAQAhCRD7/MgqAV5zMBYhBNGm -bhojsYLJmA94jPv8yCoBXnMwKWUMAJ3FKZfJ2mXvh+GFqgymvK4NoKkDRPB0CbUN -aDdG7ZOizQrWXo7Da2MYIZ6eZUDqBKLdhZ5gZfVnisDfu/yeCgpENaKib1MPHpA8 -nZQjnPejbBDomNqY8HRzr5jvXNlwywBpjWGtegCKUY9xbSynjbfzIlMrWL4S+Rfl -+bOOQKRyYJWXmECmVyqY8cz2VUYmETjNcwC8VCDUxQnhtcCJ7Aej22hfYwVEPb/J -BsJBPq8WECCiGfJ9Y2y6TF+62KzG9Kfs5hqUeHhQy8V4TSi479ewwL7DH86XmIIK -chSANBS+7iyMtctjNZfmF9zYdGJFvjI/mbBR/lK66E515Inuf75XnL8hqlXuwqvG -ni+i03Aet1DzULZEIio4uIU6ioc1lGO9h7K2Xn4S7QQH1QoISNMWqXibUR0RCGjw -FsEDTt2QwJl8XXxoJCooM7BCcCQo+rMNVUHDjIwrdoQjPld3YZsUQQRcqH6bLuln -cfn5ufl8zTGWKydoj/iTz8KcjZ7w187AzQRdpZzyAQwA1jC/XGxjK6ddgrRfW9j+ -s/U00++EvIsgTs2kr3Rg0GP7FLWV0YNtR1mpl55/bEl7yAxCDTkOgPUMXcaKlnQh -6zrlt6H53mF6Bvs3inOHQvOsGtU0dqvb1vkTF0juLiJgPlM7pWv+pNQ6IA39vKoQ -sTMBv4v5vYNXP9GgKbg8inUNT17BxzZYHfw5+q63ectgDm2on1e8CIRCZ76oBVwz -dkVxoy3gjh1eENlk2D4P0uJNZzF1Q8GV67yLANGMCDICE/OkWn6daipYDzW4iJQt -YPUWP4hWhjdm+CK+hg6IQUEn2Vtvi16D2blRP8BpUNNa4fNuylWVuJV76rIHvsLZ -1pbM3LHpRgE8s6jivS3Rz3WRs0TmWCNnvHPqWizQ3VTy+r3UQVJ5AmhJDrZdZq9i -aUIuZ01PoE1+CHiJwuxPtWvVAxf2POcm1M/F1fK1J0e+lKlQuyonTXqXR22Y41wr -fP2aPk3nPSTW2DUAf3vRMZg57ZpRxLEhEMxcM4/LMR+PABEBAAHCwrIEGAEKAAkF -gl8sAVYCmwIB3QkQ+/zIKgFeczDA+qAEGQEKAAwFgl47Z5UFgwB4TOAAIQkQfC+q -Tfk8N7IWIQQd3OFfCSF87i87N2B8L6pN+Tw3st58C/0exp0X2U4LqicSHEOSqHZj -jiysdqIELHGyo5DSPv92UFPp36aqjF9OFgtNNwSa56fmAVCD4+hor/fKARRIeIjF -qdIC5Y/9a4B10NQFJa5lsvB38x/d39LI2kEoglZnqWgdJskROo3vNQF4KlIcm6FH -dn4WI8UkC5oUUcrpZVMSKoacIaxLwqnXT42nIVgYYuqrd/ZagZZjG5WlrTOd5+NI -zi/l0fWProcPHGLjmAh4Thu8i7omtVw1nQaMnq9I77ffg3cPDgXknYrLL+q8xXh/ -0mEJyIhnmPwllWCSZuLv9DrD5pOexFfdlwXhf6cLzNpW6QhXD/Tf5KrqIPr9aOv8 -9xaEEXWh0vEby2kIsI2++ft+vfdIyxYw/wKqx0awTSnuBV1rG3z1dswX4BfoY66x -Bz3KOVqlz9+mG/FTRQwrgPvR+qgLCHbuotxoGN7fzW+PI75hQG5JQAqhsC9sHjQH -UrI21/VUNwzfw3v5pYsWuFb5bdQ3ASJetICQiMy7IW8WIQTRpm4aI7GCyZgPeIz7 -/MgqAV5zMG6/C/wLpPl/9e6Hf5wmXIUwpZNQbNZvpiCcyx9sXsHXaycOQVxn3McZ -nYOUP9/mobl1tIeDQyTNbkxWjU0zzJl8XQsDZerb5098pg+x7oGIL7M1vn5s5JMl -owROourqF88JEtOBxLMxlAM7X4hB48xKQ3Hu9hS1GdnqLKki4MqRGl4l5FUwyGOM -GjyS3TzkfiDJNwQxybQiC9n57ij20ieNyLfuWCMLcNNnZUgZtnF6wCctoq/0ZIWu -a7nvuA/XC2WW9YjEJJiWdy5109pqac+qWiY11HWy/nms4gpMdxVpT0RhrKGWq4o0 -M5q3ZElOoeN70UO3OSbU5EVrG7gB1GuwF9mTHUVlV0veSTw0axkta3FGT//XfSpD -lRrCkyLzwq0M+UUHQAuYpAfobDlDdnxxOD2jm5GyTzak3GSVFfjW09QFVO6HlGp5 -01/jtzkUiS6nwoHHkfnyn0beZuR8X6KlcrzLB0VFgQFLmkSM9cSOgYhD0PTu9aHb -hW1Hj9AO8lzggBQ= -=Nt+N ------END PGP PUBLIC KEY BLOCK----- -` - -const sigFromKeyWithExpiredCrossSig = `-----BEGIN PGP SIGNATURE----- - -wsDzBAABCgAGBYJfLAFsACEJEHwvqk35PDeyFiEEHdzhXwkhfO4vOzdgfC+qTfk8 -N7KiqwwAts4QGB7v9bABCC2qkTxJhmStC0wQMcHRcjL/qAiVnmasQWmvE9KVsdm3 -AaXd8mIx4a37/RRvr9dYrY2eE4uw72cMqPxNja2tvVXkHQvk1oEUqfkvbXs4ypKI -NyeTWjXNOTZEbg0hbm3nMy+Wv7zgB1CEvAsEboLDJlhGqPcD+X8a6CJGrBGUBUrv -KVmZr3U6vEzClz3DBLpoddCQseJRhT4YM1nKmBlZ5quh2LFgTSpajv5OsZheqt9y -EZAPbqmLhDmWRQwGzkWHKceKS7nZ/ox2WK6OS7Ob8ZGZkM64iPo6/EGj5Yc19vQN -AGiIaPEGszBBWlOpHTPhNm0LB0nMWqqaT87oNYwP8CQuuxDb6rKJ2lffCmZH27Lb -UbQZcH8J+0UhpeaiadPZxH5ATJAcenmVtVVMLVOFnm+eIlxzov9ntpgGYt8hLdXB -ITEG9mMgp3TGS9ZzSifMZ8UGtHdp9QdBg8NEVPFzDOMGxpc/Bftav7RRRuPiAER+ -7A5CBid5 -=aQkm ------END PGP SIGNATURE----- -` - -const signedMessageWithCriticalNotation = `-----BEGIN PGP MESSAGE----- - -owGbwMvMwMH4oOW7S46CznTG09xJDDE3Wl1KUotLuDousDAwcjBYiSmyXL+48d6x -U1PSGUxcj8IUszKBVMpMaWAAAgEGZpAeh9SKxNyCnFS95PzcytRiBi5OAZjyXXzM -f8WYLqv7TXP61Sa4rqT12CI3xaN73YS2pt089f96odCKaEPnWJ3iSGmzJaW/ug10 -2Zo8Wj2k4s7t8wt4H3HtTu+y5UZfV3VOO+l//sdE/o+Lsub8FZH7/eOq7OnbNp4n -vwjE8mqJXetNMfj8r2SCyvkEnlVRYR+/mnge+ib56FdJ8uKtqSxyvgA= -=fRXs ------END PGP MESSAGE-----` - -const criticalNotationSigner = `-----BEGIN PGP PUBLIC KEY BLOCK----- - -mI0EUmEvTgEEANyWtQQMOybQ9JltDqmaX0WnNPJeLILIM36sw6zL0nfTQ5zXSS3+ -fIF6P29lJFxpblWk02PSID5zX/DYU9/zjM2xPO8Oa4xo0cVTOTLj++Ri5mtr//f5 -GLsIXxFrBJhD/ghFsL3Op0GXOeLJ9A5bsOn8th7x6JucNKuaRB6bQbSPABEBAAG0 -JFRlc3QgTWNUZXN0aW5ndG9uIDx0ZXN0QGV4YW1wbGUuY29tPoi5BBMBAgAjBQJS -YS9OAhsvBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQSmNhOk1uQJQwDAP6 -AgrTyqkRlJVqz2pb46TfbDM2TDF7o9CBnBzIGoxBhlRwpqALz7z2kxBDmwpQa+ki -Bq3jZN/UosY9y8bhwMAlnrDY9jP1gdCo+H0sD48CdXybblNwaYpwqC8VSpDdTndf -9j2wE/weihGp/DAdy/2kyBCaiOY1sjhUfJ1GogF49rC4jQRSYS9OAQQA6R/PtBFa -JaT4jq10yqASk4sqwVMsc6HcifM5lSdxzExFP74naUMMyEsKHP53QxTF0Grqusag -Qg/ZtgT0CN1HUM152y7ACOdp1giKjpMzOTQClqCoclyvWOFB+L/SwGEIJf7LSCEr -woBuJifJc8xAVr0XX0JthoW+uP91eTQ3XpsAEQEAAYkBPQQYAQIACQUCUmEvTgIb -LgCoCRBKY2E6TW5AlJ0gBBkBAgAGBQJSYS9OAAoJEOCE90RsICyXuqIEANmmiRCA -SF7YK7PvFkieJNwzeK0V3F2lGX+uu6Y3Q/Zxdtwc4xR+me/CSBmsURyXTO29OWhP -GLszPH9zSJU9BdDi6v0yNprmFPX/1Ng0Abn/sCkwetvjxC1YIvTLFwtUL/7v6NS2 -bZpsUxRTg9+cSrMWWSNjiY9qUKajm1tuzPDZXAUEAMNmAN3xXN/Kjyvj2OK2ck0X -W748sl/tc3qiKPMJ+0AkMF7Pjhmh9nxqE9+QCEl7qinFqqBLjuzgUhBU4QlwX1GD -AtNTq6ihLMD5v1d82ZC7tNatdlDMGWnIdvEMCv2GZcuIqDQ9rXWs49e7tq1NncLY -hz3tYjKhoFTKEIq3y3Pp -=h/aX ------END PGP PUBLIC KEY BLOCK-----` - -const keyv5Test = `-----BEGIN PGP PRIVATE KEY BLOCK----- -Comment: Bob's OpenPGP Transferable Secret Key - -lQVYBF2lnPIBDAC5cL9PQoQLTMuhjbYvb4Ncuuo0bfmgPRFywX53jPhoFf4Zg6mv -/seOXpgecTdOcVttfzC8ycIKrt3aQTiwOG/ctaR4Bk/t6ayNFfdUNxHWk4WCKzdz -/56fW2O0F23qIRd8UUJp5IIlN4RDdRCtdhVQIAuzvp2oVy/LaS2kxQoKvph/5pQ/ -5whqsyroEWDJoSV0yOb25B/iwk/pLUFoyhDG9bj0kIzDxrEqW+7Ba8nocQlecMF3 -X5KMN5kp2zraLv9dlBBpWW43XktjcCZgMy20SouraVma8Je/ECwUWYUiAZxLIlMv -9CurEOtxUw6N3RdOtLmYZS9uEnn5y1UkF88o8Nku890uk6BrewFzJyLAx5wRZ4F0 -qV/yq36UWQ0JB/AUGhHVPdFf6pl6eaxBwT5GXvbBUibtf8YI2og5RsgTWtXfU7eb -SGXrl5ZMpbA6mbfhd0R8aPxWfmDWiIOhBufhMCvUHh1sApMKVZnvIff9/0Dca3wb -vLIwa3T4CyshfT0AEQEAAQAL/RZqbJW2IqQDCnJi4Ozm++gPqBPiX1RhTWSjwxfM -cJKUZfzLj414rMKm6Jh1cwwGY9jekROhB9WmwaaKT8HtcIgrZNAlYzANGRCM4TLK -3VskxfSwKKna8l+s+mZglqbAjUg3wmFuf9Tj2xcUZYmyRm1DEmcN2ZzpvRtHgX7z -Wn1mAKUlSDJZSQks0zjuMNbupcpyJokdlkUg2+wBznBOTKzgMxVNC9b2g5/tMPUs -hGGWmF1UH+7AHMTaS6dlmr2ZBIyogdnfUqdNg5sZwsxSNrbglKP4sqe7X61uEAIQ -bD7rT3LonLbhkrj3I8wilUD8usIwt5IecoHhd9HziqZjRCc1BUBkboUEoyedbDV4 -i4qfsFZ6CEWoLuD5pW7dEp0M+WeuHXO164Rc+LnH6i1VQrpb1Okl4qO6ejIpIjBI -1t3GshtUu/mwGBBxs60KBX5g77mFQ9lLCRj8lSYqOsHRKBhUp4qM869VA+fD0BRP -fqPT0I9IH4Oa/A3jYJcg622GwQYA1LhnP208Waf6PkQSJ6kyr8ymY1yVh9VBE/g6 -fRDYA+pkqKnw9wfH2Qho3ysAA+OmVOX8Hldg+Pc0Zs0e5pCavb0En8iFLvTA0Q2E -LR5rLue9uD7aFuKFU/VdcddY9Ww/vo4k5p/tVGp7F8RYCFn9rSjIWbfvvZi1q5Tx -+akoZbga+4qQ4WYzB/obdX6SCmi6BndcQ1QdjCCQU6gpYx0MddVERbIp9+2SXDyL -hpxjSyz+RGsZi/9UAshT4txP4+MZBgDfK3ZqtW+h2/eMRxkANqOJpxSjMyLO/FXN -WxzTDYeWtHNYiAlOwlQZEPOydZFty9IVzzNFQCIUCGjQ/nNyhw7adSgUk3+BXEx/ -MyJPYY0BYuhLxLYcrfQ9nrhaVKxRJj25SVHj2ASsiwGJRZW4CC3uw40OYxfKEvNC -mer/VxM3kg8qqGf9KUzJ1dVdAvjyx2Hz6jY2qWCyRQ6IMjWHyd43C4r3jxooYKUC -YnstRQyb/gCSKahveSEjo07CiXMr88UGALwzEr3npFAsPW3osGaFLj49y1oRe11E -he9gCHFm+fuzbXrWmdPjYU5/ZdqdojzDqfu4ThfnipknpVUM1o6MQqkjM896FHm8 -zbKVFSMhEP6DPHSCexMFrrSgN03PdwHTO6iBaIBBFqmGY01tmJ03SxvSpiBPON9P -NVvy/6UZFedTq8A07OUAxO62YUSNtT5pmK2vzs3SAZJmbFbMh+NN204TRI72GlqT -t5hcfkuv8hrmwPS/ZR6q312mKQ6w/1pqO9qitCFCb2IgQmFiYmFnZSA8Ym9iQG9w -ZW5wZ3AuZXhhbXBsZT6JAc4EEwEKADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgEC -F4AWIQTRpm4aI7GCyZgPeIz7/MgqAV5zMAUCXaWe+gAKCRD7/MgqAV5zMG9sC/9U -2T3RrqEbw533FPNfEflhEVRIZ8gDXKM8hU6cqqEzCmzZT6xYTe6sv4y+PJBGXJFX -yhj0g6FDkSyboM5litOcTupURObVqMgA/Y4UKERznm4fzzH9qek85c4ljtLyNufe -doL2pp3vkGtn7eD0QFRaLLmnxPKQ/TlZKdLE1G3u8Uot8QHicaR6GnAdc5UXQJE3 -BiV7jZuDyWmZ1cUNwJkKL6oRtp+ZNDOQCrLNLecKHcgCqrpjSQG5oouba1I1Q6Vl -sP44dhA1nkmLHtxlTOzpeHj4jnk1FaXmyasurrrI5CgU/L2Oi39DGKTH/A/cywDN -4ZplIQ9zR8enkbXquUZvFDe+Xz+6xRXtb5MwQyWODB3nHw85HocLwRoIN9WdQEI+ -L8a/56AuOwhs8llkSuiITjR7r9SgKJC2WlAHl7E8lhJ3VDW3ELC56KH308d6mwOG -ZRAqIAKzM1T5FGjMBhq7ZV0eqdEntBh3EcOIfj2M8rg1MzJv+0mHZOIjByawikad -BVgEXaWc8gEMANYwv1xsYyunXYK0X1vY/rP1NNPvhLyLIE7NpK90YNBj+xS1ldGD -bUdZqZeef2xJe8gMQg05DoD1DF3GipZ0Ies65beh+d5hegb7N4pzh0LzrBrVNHar -29b5ExdI7i4iYD5TO6Vr/qTUOiAN/byqELEzAb+L+b2DVz/RoCm4PIp1DU9ewcc2 -WB38Ofqut3nLYA5tqJ9XvAiEQme+qAVcM3ZFcaMt4I4dXhDZZNg+D9LiTWcxdUPB -leu8iwDRjAgyAhPzpFp+nWoqWA81uIiULWD1Fj+IVoY3ZvgivoYOiEFBJ9lbb4te -g9m5UT/AaVDTWuHzbspVlbiVe+qyB77C2daWzNyx6UYBPLOo4r0t0c91kbNE5lgj -Z7xz6los0N1U8vq91EFSeQJoSQ62XWavYmlCLmdNT6BNfgh4icLsT7Vr1QMX9jzn -JtTPxdXytSdHvpSpULsqJ016l0dtmONcK3z9mj5N5z0k1tg1AH970TGYOe2aUcSx -IRDMXDOPyzEfjwARAQABAAv9F2CwsjS+Sjh1M1vegJbZjei4gF1HHpEM0K0PSXsp -SfVvpR4AoSJ4He6CXSMWg0ot8XKtDuZoV9jnJaES5UL9pMAD7JwIOqZm/DYVJM5h -OASCh1c356/wSbFbzRHPtUdZO9Q30WFNJM5pHbCJPjtNoRmRGkf71RxtvHBzy7np -Ga+W6U/NVKHw0i0CYwMI0YlKDakYW3Pm+QL+gHZFvngGweTod0f9l2VLLAmeQR/c -+EZs7lNumhuZ8mXcwhUc9JQIhOkpO+wreDysEFkAcsKbkQP3UDUsA1gFx9pbMzT0 -tr1oZq2a4QBtxShHzP/ph7KLpN+6qtjks3xB/yjTgaGmtrwM8tSe0wD1RwXS+/1o -BHpXTnQ7TfeOGUAu4KCoOQLv6ELpKWbRBLWuiPwMdbGpvVFALO8+kvKAg9/r+/ny -zM2GQHY+J3Jh5JxPiJnHfXNZjIKLbFbIPdSKNyJBuazXW8xIa//mEHMI5OcvsZBK -clAIp7LXzjEjKXIwHwDcTn9pBgDpdOKTHOtJ3JUKx0rWVsDH6wq6iKV/FTVSY5jl -zN+puOEsskF1Lfxn9JsJihAVO3yNsp6RvkKtyNlFazaCVKtDAmkjoh60XNxcNRqr -gCnwdpbgdHP6v/hvZY54ZaJjz6L2e8unNEkYLxDt8cmAyGPgH2XgL7giHIp9jrsQ -aS381gnYwNX6wE1aEikgtY91nqJjwPlibF9avSyYQoMtEqM/1UjTjB2KdD/MitK5 -fP0VpvuXpNYZedmyq4UOMwdkiNMGAOrfmOeT0olgLrTMT5H97Cn3Yxbk13uXHNu/ -ZUZZNe8s+QtuLfUlKAJtLEUutN33TlWQY522FV0m17S+b80xJib3yZVJteVurrh5 -HSWHAM+zghQAvCesg5CLXa2dNMkTCmZKgCBvfDLZuZbjFwnwCI6u/NhOY9egKuUf -SA/je/RXaT8m5VxLYMxwqQXKApzD87fv0tLPlVIEvjEsaf992tFEFSNPcG1l/jpd -5AVXw6kKuf85UkJtYR1x2MkQDrqY1QX/XMw00kt8y9kMZUre19aCArcmor+hDhRJ -E3Gt4QJrD9z/bICESw4b4z2DbgD/Xz9IXsA/r9cKiM1h5QMtXvuhyfVeM01enhxM -GbOH3gjqqGNKysx0UODGEwr6AV9hAd8RWXMchJLaExK9J5SRawSg671ObAU24SdY -vMQ9Z4kAQ2+1ReUZzf3ogSMRZtMT+d18gT6L90/y+APZIaoArLPhebIAGq39HLmJ -26x3z0WAgrpA1kNsjXEXkoiZGPLKIGoe3hqJAbYEGAEKACAWIQTRpm4aI7GCyZgP -eIz7/MgqAV5zMAUCXaWc8gIbDAAKCRD7/MgqAV5zMOn/C/9ugt+HZIwX308zI+QX -c5vDLReuzmJ3ieE0DMO/uNSC+K1XEioSIZP91HeZJ2kbT9nn9fuReuoff0T0Dief -rbwcIQQHFFkrqSp1K3VWmUGp2JrUsXFVdjy/fkBIjTd7c5boWljv/6wAsSfiv2V0 -JSM8EFU6TYXxswGjFVfc6X97tJNeIrXL+mpSmPPqy2bztcCCHkWS5lNLWQw+R7Vg -71Fe6yBSNVrqC2/imYG2J9zlowjx1XU63Wdgqp2Wxt0l8OmsB/W80S1fRF5G4SDH -s9HXglXXqPsBRZJYfP+VStm9L5P/sKjCcX6WtZR7yS6G8zj/X767MLK/djANvpPd -NVniEke6hM3CNBXYPAMhQBMWhCulcoz+0lxi8L34rMN+Dsbma96psdUrn7uLaB91 -6we0CTfF8qqm7BsVAgalon/UUiuMY80U3ueoj3okiSTiHIjD/YtpXSPioC8nMng7 -xqAY9Bwizt4FWgXuLm1a4+So4V9j1TRCXd12Uc2l2RNmgDE= -=miES ------END PGP PRIVATE KEY BLOCK----- -` - -const certv5Test = `-----BEGIN PGP PRIVATE KEY BLOCK----- - -lGEFXJH05BYAAAAtCSsGAQQB2kcPAQEHQFhZlVcVVtwf+21xNQPX+ecMJJBL0MPd -fj75iux+my8QAAAAAAAiAQCHZ1SnSUmWqxEsoI6facIVZQu6mph3cBFzzTvcm5lA -Ng5ctBhlbW1hLmdvbGRtYW5AZXhhbXBsZS5uZXSIlgUTFggASCIhBRk0e8mHJGQC -X5nfPsLgAA7ZiEiS4fez6kyUAJFZVptUBQJckfTkAhsDBQsJCAcCAyICAQYVCgkI -CwIEFgIDAQIeBwIXgAAA9cAA/jiR3yMsZMeEQ40u6uzEoXa6UXeV/S3wwJAXRJy9 -M8s0AP9vuL/7AyTfFXwwzSjDnYmzS0qAhbLDQ643N+MXGBJ2BZxmBVyR9OQSAAAA -MgorBgEEAZdVAQUBAQdA+nysrzml2UCweAqtpDuncSPlvrcBWKU0yfU0YvYWWAoD -AQgHAAAAAAAiAP9OdAPppjU1WwpqjIItkxr+VPQRT8Zm/Riw7U3F6v3OiBFHiHoF -GBYIACwiIQUZNHvJhyRkAl+Z3z7C4AAO2YhIkuH3s+pMlACRWVabVAUCXJH05AIb -DAAAOSQBAP4BOOIR/sGLNMOfeb5fPs/02QMieoiSjIBnijhob2U5AQC+RtOHCHx7 -TcIYl5/Uyoi+FOvPLcNw4hOv2nwUzSSVAw== -=IiS2 ------END PGP PRIVATE KEY BLOCK----- -` - -const msgv5Test = `-----BEGIN PGP MESSAGE----- - -wcDMA3wvqk35PDeyAQv+PcQiLsoYTH30nJYQh3j3cJaO2+jErtVCrIQRIU0+ -rmgMddERYST4A9mA0DQIiTI4FQ0Lp440D3BWCgpq3LlNWewGzduaWwym5rN6 -cwHz5ccDqOcqbd9X0GXXGy/ZH/ljSgzuVMIytMAXKdF/vrRrVgH/+I7cxvm9 -HwnhjMN5dF0j4aEt996H2T7cbtzSr2GN9SWGW8Gyu7I8Zx73hgrGUI7gDiJB -Afaff+P6hfkkHSGOItr94dde8J/7AUF4VEwwxdVVPvsNEFyvv6gRIbYtOCa2 -6RE6h1V/QTxW2O7zZgzWALrE2ui0oaYr9QuqQSssd9CdgExLfdPbI+3/ZAnE -v31Idzpk3/6ILiakYHtXkElPXvf46mCNpobty8ysT34irF+fy3C1p3oGwAsx -5VDV9OSFU6z5U+UPbSPYAy9rkc5ZssuIKxCER2oTvZ2L8Q5cfUvEUiJtRGGn -CJlHrVDdp3FssKv2tlKgLkvxJLyoOjuEkj44H1qRk+D02FzmmUT/0sAHAYYx -lTir6mjHeLpcGjn4waUuWIAJyph8SxUexP60bic0L0NBa6Qp5SxxijKsPIDb -FPHxWwfJSDZRrgUyYT7089YFB/ZM4FHyH9TZcnxn0f0xIB7NS6YNDsxzN2zT -EVEYf+De4qT/dQTsdww78Chtcv9JY9r2kDm77dk2MUGHL2j7n8jasbLtgA7h -pn2DMIWLrGamMLWRmlwslolKr1sMV5x8w+5Ias6C33iBMl9phkg42an0gYmc -byVJHvLO/XErtC+GNIJeMg== -=liRq ------END PGP MESSAGE----- -` diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k.go deleted file mode 100644 index 6871b84fc..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k.go +++ /dev/null @@ -1,436 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package s2k implements the various OpenPGP string-to-key transforms as -// specified in RFC 4800 section 3.7.1, and Argon2 specified in -// draft-ietf-openpgp-crypto-refresh-08 section 3.7.1.4. -package s2k // import "github.com/ProtonMail/go-crypto/openpgp/s2k" - -import ( - "crypto" - "hash" - "io" - "strconv" - - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "golang.org/x/crypto/argon2" -) - -type Mode uint8 - -// Defines the default S2KMode constants -// -// 0 (simple), 1(salted), 3(iterated), 4(argon2) -const ( - SimpleS2K Mode = 0 - SaltedS2K Mode = 1 - IteratedSaltedS2K Mode = 3 - Argon2S2K Mode = 4 - GnuS2K Mode = 101 -) - -const Argon2SaltSize int = 16 - -// Params contains all the parameters of the s2k packet -type Params struct { - // mode is the mode of s2k function. - // It can be 0 (simple), 1(salted), 3(iterated) - // 2(reserved) 100-110(private/experimental). - mode Mode - // hashId is the ID of the hash function used in any of the modes - hashId byte - // salt is a byte array to use as a salt in hashing process or argon2 - saltBytes [Argon2SaltSize]byte - // countByte is used to determine how many rounds of hashing are to - // be performed in s2k mode 3. See RFC 4880 Section 3.7.1.3. - countByte byte - // passes is a parameter in Argon2 to determine the number of iterations - // See RFC the crypto refresh Section 3.7.1.4. - passes byte - // parallelism is a parameter in Argon2 to determine the degree of paralellism - // See RFC the crypto refresh Section 3.7.1.4. - parallelism byte - // memoryExp is a parameter in Argon2 to determine the memory usage - // i.e., 2 ** memoryExp kibibytes - // See RFC the crypto refresh Section 3.7.1.4. - memoryExp byte -} - -// encodeCount converts an iterative "count" in the range 1024 to -// 65011712, inclusive, to an encoded count. The return value is the -// octet that is actually stored in the GPG file. encodeCount panics -// if i is not in the above range (encodedCount above takes care to -// pass i in the correct range). See RFC 4880 Section 3.7.7.1. -func encodeCount(i int) uint8 { - if i < 65536 || i > 65011712 { - panic("count arg i outside the required range") - } - - for encoded := 96; encoded < 256; encoded++ { - count := decodeCount(uint8(encoded)) - if count >= i { - return uint8(encoded) - } - } - - return 255 -} - -// decodeCount returns the s2k mode 3 iterative "count" corresponding to -// the encoded octet c. -func decodeCount(c uint8) int { - return (16 + int(c&15)) << (uint32(c>>4) + 6) -} - -// encodeMemory converts the Argon2 "memory" in the range parallelism*8 to -// 2**31, inclusive, to an encoded memory. The return value is the -// octet that is actually stored in the GPG file. encodeMemory panics -// if is not in the above range -// See OpenPGP crypto refresh Section 3.7.1.4. -func encodeMemory(memory uint32, parallelism uint8) uint8 { - if memory < (8*uint32(parallelism)) || memory > uint32(2147483648) { - panic("Memory argument memory is outside the required range") - } - - for exp := 3; exp < 31; exp++ { - compare := decodeMemory(uint8(exp)) - if compare >= memory { - return uint8(exp) - } - } - - return 31 -} - -// decodeMemory computes the decoded memory in kibibytes as 2**memoryExponent -func decodeMemory(memoryExponent uint8) uint32 { - return uint32(1) << memoryExponent -} - -// Simple writes to out the result of computing the Simple S2K function (RFC -// 4880, section 3.7.1.1) using the given hash and input passphrase. -func Simple(out []byte, h hash.Hash, in []byte) { - Salted(out, h, in, nil) -} - -var zero [1]byte - -// Salted writes to out the result of computing the Salted S2K function (RFC -// 4880, section 3.7.1.2) using the given hash, input passphrase and salt. -func Salted(out []byte, h hash.Hash, in []byte, salt []byte) { - done := 0 - var digest []byte - - for i := 0; done < len(out); i++ { - h.Reset() - for j := 0; j < i; j++ { - h.Write(zero[:]) - } - h.Write(salt) - h.Write(in) - digest = h.Sum(digest[:0]) - n := copy(out[done:], digest) - done += n - } -} - -// Iterated writes to out the result of computing the Iterated and Salted S2K -// function (RFC 4880, section 3.7.1.3) using the given hash, input passphrase, -// salt and iteration count. -func Iterated(out []byte, h hash.Hash, in []byte, salt []byte, count int) { - combined := make([]byte, len(in)+len(salt)) - copy(combined, salt) - copy(combined[len(salt):], in) - - if count < len(combined) { - count = len(combined) - } - - done := 0 - var digest []byte - for i := 0; done < len(out); i++ { - h.Reset() - for j := 0; j < i; j++ { - h.Write(zero[:]) - } - written := 0 - for written < count { - if written+len(combined) > count { - todo := count - written - h.Write(combined[:todo]) - written = count - } else { - h.Write(combined) - written += len(combined) - } - } - digest = h.Sum(digest[:0]) - n := copy(out[done:], digest) - done += n - } -} - -// Argon2 writes to out the key derived from the password (in) with the Argon2 -// function (the crypto refresh, section 3.7.1.4) -func Argon2(out []byte, in []byte, salt []byte, passes uint8, paralellism uint8, memoryExp uint8) { - key := argon2.IDKey(in, salt, uint32(passes), decodeMemory(memoryExp), paralellism, uint32(len(out))) - copy(out[:], key) -} - -// Generate generates valid parameters from given configuration. -// It will enforce the Iterated and Salted or Argon2 S2K method. -func Generate(rand io.Reader, c *Config) (*Params, error) { - var params *Params - if c != nil && c.Mode() == Argon2S2K { - // handle Argon2 case - argonConfig := c.Argon2() - params = &Params{ - mode: Argon2S2K, - passes: argonConfig.Passes(), - parallelism: argonConfig.Parallelism(), - memoryExp: argonConfig.EncodedMemory(), - } - } else if c != nil && c.PassphraseIsHighEntropy && c.Mode() == SaltedS2K { // Allow SaltedS2K if PassphraseIsHighEntropy - hashId, ok := algorithm.HashToHashId(c.hash()) - if !ok { - return nil, errors.UnsupportedError("no such hash") - } - - params = &Params{ - mode: SaltedS2K, - hashId: hashId, - } - } else { // Enforce IteratedSaltedS2K method otherwise - hashId, ok := algorithm.HashToHashId(c.hash()) - if !ok { - return nil, errors.UnsupportedError("no such hash") - } - if c != nil { - c.S2KMode = IteratedSaltedS2K - } - params = &Params{ - mode: IteratedSaltedS2K, - hashId: hashId, - countByte: c.EncodedCount(), - } - } - if _, err := io.ReadFull(rand, params.salt()); err != nil { - return nil, err - } - return params, nil -} - -// Parse reads a binary specification for a string-to-key transformation from r -// and returns a function which performs that transform. If the S2K is a special -// GNU extension that indicates that the private key is missing, then the error -// returned is errors.ErrDummyPrivateKey. -func Parse(r io.Reader) (f func(out, in []byte), err error) { - params, err := ParseIntoParams(r) - if err != nil { - return nil, err - } - - return params.Function() -} - -// ParseIntoParams reads a binary specification for a string-to-key -// transformation from r and returns a struct describing the s2k parameters. -func ParseIntoParams(r io.Reader) (params *Params, err error) { - var buf [Argon2SaltSize + 3]byte - - _, err = io.ReadFull(r, buf[:1]) - if err != nil { - return - } - - params = &Params{ - mode: Mode(buf[0]), - } - - switch params.mode { - case SimpleS2K: - _, err = io.ReadFull(r, buf[:1]) - if err != nil { - return nil, err - } - params.hashId = buf[0] - return params, nil - case SaltedS2K: - _, err = io.ReadFull(r, buf[:9]) - if err != nil { - return nil, err - } - params.hashId = buf[0] - copy(params.salt(), buf[1:9]) - return params, nil - case IteratedSaltedS2K: - _, err = io.ReadFull(r, buf[:10]) - if err != nil { - return nil, err - } - params.hashId = buf[0] - copy(params.salt(), buf[1:9]) - params.countByte = buf[9] - return params, nil - case Argon2S2K: - _, err = io.ReadFull(r, buf[:Argon2SaltSize+3]) - if err != nil { - return nil, err - } - copy(params.salt(), buf[:Argon2SaltSize]) - params.passes = buf[Argon2SaltSize] - params.parallelism = buf[Argon2SaltSize+1] - params.memoryExp = buf[Argon2SaltSize+2] - if err := validateArgon2Params(params); err != nil { - return nil, err - } - return params, nil - case GnuS2K: - // This is a GNU extension. See - // https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/DETAILS;h=fe55ae16ab4e26d8356dc574c9e8bc935e71aef1;hb=23191d7851eae2217ecdac6484349849a24fd94a#l1109 - if _, err = io.ReadFull(r, buf[:5]); err != nil { - return nil, err - } - params.hashId = buf[0] - if buf[1] == 'G' && buf[2] == 'N' && buf[3] == 'U' && buf[4] == 1 { - return params, nil - } - return nil, errors.UnsupportedError("GNU S2K extension") - } - - return nil, errors.UnsupportedError("S2K function") -} - -func (params *Params) Mode() Mode { - return params.mode -} - -func (params *Params) Dummy() bool { - return params != nil && params.mode == GnuS2K -} - -func (params *Params) salt() []byte { - switch params.mode { - case SaltedS2K, IteratedSaltedS2K: - return params.saltBytes[:8] - case Argon2S2K: - return params.saltBytes[:Argon2SaltSize] - default: - return nil - } -} - -func (params *Params) Function() (f func(out, in []byte), err error) { - if params.Dummy() { - return nil, errors.ErrDummyPrivateKey("dummy key found") - } - var hashObj crypto.Hash - if params.mode != Argon2S2K { - var ok bool - hashObj, ok = algorithm.HashIdToHashWithSha1(params.hashId) - if !ok { - return nil, errors.UnsupportedError("hash for S2K function: " + strconv.Itoa(int(params.hashId))) - } - if !hashObj.Available() { - return nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hashObj))) - } - } - - switch params.mode { - case SimpleS2K: - f := func(out, in []byte) { - Simple(out, hashObj.New(), in) - } - - return f, nil - case SaltedS2K: - f := func(out, in []byte) { - Salted(out, hashObj.New(), in, params.salt()) - } - - return f, nil - case IteratedSaltedS2K: - f := func(out, in []byte) { - Iterated(out, hashObj.New(), in, params.salt(), decodeCount(params.countByte)) - } - - return f, nil - case Argon2S2K: - f := func(out, in []byte) { - Argon2(out, in, params.salt(), params.passes, params.parallelism, params.memoryExp) - } - return f, nil - } - - return nil, errors.UnsupportedError("S2K function") -} - -func (params *Params) Serialize(w io.Writer) (err error) { - if _, err = w.Write([]byte{uint8(params.mode)}); err != nil { - return - } - if params.mode != Argon2S2K { - if _, err = w.Write([]byte{params.hashId}); err != nil { - return - } - } - if params.Dummy() { - _, err = w.Write(append([]byte("GNU"), 1)) - return - } - if params.mode > 0 { - if _, err = w.Write(params.salt()); err != nil { - return - } - if params.mode == IteratedSaltedS2K { - _, err = w.Write([]byte{params.countByte}) - } - if params.mode == Argon2S2K { - _, err = w.Write([]byte{params.passes, params.parallelism, params.memoryExp}) - } - } - return -} - -// Serialize salts and stretches the given passphrase and writes the -// resulting key into key. It also serializes an S2K descriptor to -// w. The key stretching can be configured with c, which may be -// nil. In that case, sensible defaults will be used. -func Serialize(w io.Writer, key []byte, rand io.Reader, passphrase []byte, c *Config) error { - params, err := Generate(rand, c) - if err != nil { - return err - } - err = params.Serialize(w) - if err != nil { - return err - } - - f, err := params.Function() - if err != nil { - return err - } - f(key, passphrase) - return nil -} - -// validateArgon2Params checks that the argon2 parameters are valid according to RFC9580. -func validateArgon2Params(params *Params) error { - // The number of passes t and the degree of parallelism p MUST be non-zero. - if params.parallelism == 0 { - return errors.StructuralError("invalid argon2 params: parallelism is 0") - } - if params.passes == 0 { - return errors.StructuralError("invalid argon2 params: iterations is 0") - } - - // The encoded memory size MUST be a value from 3+ceil(log2(p)) to 31, - // such that the decoded memory size m is a value from 8*p to 2^31. - if params.memoryExp > 31 || decodeMemory(params.memoryExp) < 8*uint32(params.parallelism) { - return errors.StructuralError("invalid argon2 params: memory is out of bounds") - } - - return nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k_cache.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k_cache.go deleted file mode 100644 index 616e0d12c..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k_cache.go +++ /dev/null @@ -1,26 +0,0 @@ -package s2k - -// Cache stores keys derived with s2k functions from one passphrase -// to avoid recomputation if multiple items are encrypted with -// the same parameters. -type Cache map[Params][]byte - -// GetOrComputeDerivedKey tries to retrieve the key -// for the given s2k parameters from the cache. -// If there is no hit, it derives the key with the s2k function from the passphrase, -// updates the cache, and returns the key. -func (c *Cache) GetOrComputeDerivedKey(passphrase []byte, params *Params, expectedKeySize int) ([]byte, error) { - key, found := (*c)[*params] - if !found || len(key) != expectedKeySize { - var err error - derivedKey := make([]byte, expectedKeySize) - s2k, err := params.Function() - if err != nil { - return nil, err - } - s2k(derivedKey, passphrase) - (*c)[*params] = key - return derivedKey, nil - } - return key, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k_config.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k_config.go deleted file mode 100644 index b93db1ab8..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/s2k/s2k_config.go +++ /dev/null @@ -1,129 +0,0 @@ -package s2k - -import "crypto" - -// Config collects configuration parameters for s2k key-stretching -// transformations. A nil *Config is valid and results in all default -// values. -type Config struct { - // S2K (String to Key) mode, used for key derivation in the context of secret key encryption - // and passphrase-encrypted data. Either s2k.Argon2S2K or s2k.IteratedSaltedS2K may be used. - // If the passphrase is a high-entropy key, indicated by setting PassphraseIsHighEntropy to true, - // s2k.SaltedS2K can also be used. - // Note: Argon2 is the strongest option but not all OpenPGP implementations are compatible with it - //(pending standardisation). - // 0 (simple), 1(salted), 3(iterated), 4(argon2) - // 2(reserved) 100-110(private/experimental). - S2KMode Mode - // Only relevant if S2KMode is not set to s2k.Argon2S2K. - // Hash is the default hash function to be used. If - // nil, SHA256 is used. - Hash crypto.Hash - // Argon2 parameters for S2K (String to Key). - // Only relevant if S2KMode is set to s2k.Argon2S2K. - // If nil, default parameters are used. - // For more details on the choice of parameters, see https://tools.ietf.org/html/rfc9106#section-4. - Argon2Config *Argon2Config - // Only relevant if S2KMode is set to s2k.IteratedSaltedS2K. - // Iteration count for Iterated S2K (String to Key). It - // determines the strength of the passphrase stretching when - // the said passphrase is hashed to produce a key. S2KCount - // should be between 65536 and 65011712, inclusive. If Config - // is nil or S2KCount is 0, the value 16777216 used. Not all - // values in the above range can be represented. S2KCount will - // be rounded up to the next representable value if it cannot - // be encoded exactly. When set, it is strongly encrouraged to - // use a value that is at least 65536. See RFC 4880 Section - // 3.7.1.3. - S2KCount int - // Indicates whether the passphrase passed by the application is a - // high-entropy key (e.g. it's randomly generated or derived from - // another passphrase using a strong key derivation function). - // When true, allows the S2KMode to be s2k.SaltedS2K. - // When the passphrase is not a high-entropy key, using SaltedS2K is - // insecure, and not allowed by draft-ietf-openpgp-crypto-refresh-08. - PassphraseIsHighEntropy bool -} - -// Argon2Config stores the Argon2 parameters -// A nil *Argon2Config is valid and results in all default -type Argon2Config struct { - NumberOfPasses uint8 - DegreeOfParallelism uint8 - // Memory specifies the desired Argon2 memory usage in kibibytes. - // For example memory=64*1024 sets the memory cost to ~64 MB. - Memory uint32 -} - -func (c *Config) Mode() Mode { - if c == nil { - return IteratedSaltedS2K - } - return c.S2KMode -} - -func (c *Config) hash() crypto.Hash { - if c == nil || uint(c.Hash) == 0 { - return crypto.SHA256 - } - - return c.Hash -} - -func (c *Config) Argon2() *Argon2Config { - if c == nil || c.Argon2Config == nil { - return nil - } - return c.Argon2Config -} - -// EncodedCount get encoded count -func (c *Config) EncodedCount() uint8 { - if c == nil || c.S2KCount == 0 { - return 224 // The common case. Corresponding to 16777216 - } - - i := c.S2KCount - - switch { - case i < 65536: - i = 65536 - case i > 65011712: - i = 65011712 - } - - return encodeCount(i) -} - -func (c *Argon2Config) Passes() uint8 { - if c == nil || c.NumberOfPasses == 0 { - return 3 - } - return c.NumberOfPasses -} - -func (c *Argon2Config) Parallelism() uint8 { - if c == nil || c.DegreeOfParallelism == 0 { - return 4 - } - return c.DegreeOfParallelism -} - -func (c *Argon2Config) EncodedMemory() uint8 { - if c == nil || c.Memory == 0 { - return 16 // 64 MiB of RAM - } - - memory := c.Memory - lowerBound := uint32(c.Parallelism()) * 8 - upperBound := uint32(2147483648) - - switch { - case memory < lowerBound: - memory = lowerBound - case memory > upperBound: - memory = upperBound - } - - return encodeMemory(memory, c.Parallelism()) -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/write.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/write.go deleted file mode 100644 index b0f6ef7b0..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/write.go +++ /dev/null @@ -1,620 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package openpgp - -import ( - "crypto" - "hash" - "io" - "strconv" - "time" - - "github.com/ProtonMail/go-crypto/openpgp/armor" - "github.com/ProtonMail/go-crypto/openpgp/errors" - "github.com/ProtonMail/go-crypto/openpgp/internal/algorithm" - "github.com/ProtonMail/go-crypto/openpgp/packet" -) - -// DetachSign signs message with the private key from signer (which must -// already have been decrypted) and writes the signature to w. -// If config is nil, sensible defaults will be used. -func DetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error { - return detachSign(w, signer, message, packet.SigTypeBinary, config) -} - -// ArmoredDetachSign signs message with the private key from signer (which -// must already have been decrypted) and writes an armored signature to w. -// If config is nil, sensible defaults will be used. -func ArmoredDetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) (err error) { - return armoredDetachSign(w, signer, message, packet.SigTypeBinary, config) -} - -// DetachSignText signs message (after canonicalising the line endings) with -// the private key from signer (which must already have been decrypted) and -// writes the signature to w. -// If config is nil, sensible defaults will be used. -func DetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error { - return detachSign(w, signer, message, packet.SigTypeText, config) -} - -// ArmoredDetachSignText signs message (after canonicalising the line endings) -// with the private key from signer (which must already have been decrypted) -// and writes an armored signature to w. -// If config is nil, sensible defaults will be used. -func ArmoredDetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error { - return armoredDetachSign(w, signer, message, packet.SigTypeText, config) -} - -func armoredDetachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) { - out, err := armor.Encode(w, SignatureType, nil) - if err != nil { - return - } - err = detachSign(out, signer, message, sigType, config) - if err != nil { - return - } - return out.Close() -} - -func detachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) { - signingKey, ok := signer.SigningKeyById(config.Now(), config.SigningKey()) - if !ok { - return errors.InvalidArgumentError("no valid signing keys") - } - if signingKey.PrivateKey == nil { - return errors.InvalidArgumentError("signing key doesn't have a private key") - } - if signingKey.PrivateKey.Encrypted { - return errors.InvalidArgumentError("signing key is encrypted") - } - if _, ok := algorithm.HashToHashId(config.Hash()); !ok { - return errors.InvalidArgumentError("invalid hash function") - } - - sig := createSignaturePacket(signingKey.PublicKey, sigType, config) - - h, err := sig.PrepareSign(config) - if err != nil { - return - } - wrappedHash, err := wrapHashForSignature(h, sig.SigType) - if err != nil { - return - } - if _, err = io.Copy(wrappedHash, message); err != nil { - return err - } - - err = sig.Sign(h, signingKey.PrivateKey, config) - if err != nil { - return - } - - return sig.Serialize(w) -} - -// FileHints contains metadata about encrypted files. This metadata is, itself, -// encrypted. -type FileHints struct { - // IsBinary can be set to hint that the contents are binary data. - IsBinary bool - // FileName hints at the name of the file that should be written. It's - // truncated to 255 bytes if longer. It may be empty to suggest that the - // file should not be written to disk. It may be equal to "_CONSOLE" to - // suggest the data should not be written to disk. - FileName string - // ModTime contains the modification time of the file, or the zero time if not applicable. - ModTime time.Time -} - -// SymmetricallyEncrypt acts like gpg -c: it encrypts a file with a passphrase. -// The resulting WriteCloser must be closed after the contents of the file have -// been written. -// If config is nil, sensible defaults will be used. -func SymmetricallyEncrypt(ciphertext io.Writer, passphrase []byte, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) { - if hints == nil { - hints = &FileHints{} - } - - key, err := packet.SerializeSymmetricKeyEncrypted(ciphertext, passphrase, config) - if err != nil { - return - } - - var w io.WriteCloser - cipherSuite := packet.CipherSuite{ - Cipher: config.Cipher(), - Mode: config.AEAD().Mode(), - } - w, err = packet.SerializeSymmetricallyEncrypted(ciphertext, config.Cipher(), config.AEAD() != nil, cipherSuite, key, config) - if err != nil { - return - } - - literalData := w - if algo := config.Compression(); algo != packet.CompressionNone { - var compConfig *packet.CompressionConfig - if config != nil { - compConfig = config.CompressionConfig - } - literalData, err = packet.SerializeCompressed(w, algo, compConfig) - if err != nil { - return - } - } - - var epochSeconds uint32 - if !hints.ModTime.IsZero() { - epochSeconds = uint32(hints.ModTime.Unix()) - } - return packet.SerializeLiteral(literalData, hints.IsBinary, hints.FileName, epochSeconds) -} - -// intersectPreferences mutates and returns a prefix of a that contains only -// the values in the intersection of a and b. The order of a is preserved. -func intersectPreferences(a []uint8, b []uint8) (intersection []uint8) { - var j int - for _, v := range a { - for _, v2 := range b { - if v == v2 { - a[j] = v - j++ - break - } - } - } - - return a[:j] -} - -// intersectPreferences mutates and returns a prefix of a that contains only -// the values in the intersection of a and b. The order of a is preserved. -func intersectCipherSuites(a [][2]uint8, b [][2]uint8) (intersection [][2]uint8) { - var j int - for _, v := range a { - for _, v2 := range b { - if v[0] == v2[0] && v[1] == v2[1] { - a[j] = v - j++ - break - } - } - } - - return a[:j] -} - -func hashToHashId(h crypto.Hash) uint8 { - v, ok := algorithm.HashToHashId(h) - if !ok { - panic("tried to convert unknown hash") - } - return v -} - -// EncryptText encrypts a message to a number of recipients and, optionally, -// signs it. Optional information is contained in 'hints', also encrypted, that -// aids the recipients in processing the message. The resulting WriteCloser -// must be closed after the contents of the file have been written. If config -// is nil, sensible defaults will be used. The signing is done in text mode. -func EncryptText(ciphertext io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) { - return encrypt(ciphertext, ciphertext, to, signed, hints, packet.SigTypeText, config) -} - -// Encrypt encrypts a message to a number of recipients and, optionally, signs -// it. hints contains optional information, that is also encrypted, that aids -// the recipients in processing the message. The resulting WriteCloser must -// be closed after the contents of the file have been written. -// If config is nil, sensible defaults will be used. -func Encrypt(ciphertext io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) { - return encrypt(ciphertext, ciphertext, to, signed, hints, packet.SigTypeBinary, config) -} - -// EncryptSplit encrypts a message to a number of recipients and, optionally, signs -// it. hints contains optional information, that is also encrypted, that aids -// the recipients in processing the message. The resulting WriteCloser must -// be closed after the contents of the file have been written. -// If config is nil, sensible defaults will be used. -func EncryptSplit(keyWriter io.Writer, dataWriter io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) { - return encrypt(keyWriter, dataWriter, to, signed, hints, packet.SigTypeBinary, config) -} - -// EncryptTextSplit encrypts a message to a number of recipients and, optionally, signs -// it. hints contains optional information, that is also encrypted, that aids -// the recipients in processing the message. The resulting WriteCloser must -// be closed after the contents of the file have been written. -// If config is nil, sensible defaults will be used. -func EncryptTextSplit(keyWriter io.Writer, dataWriter io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) { - return encrypt(keyWriter, dataWriter, to, signed, hints, packet.SigTypeText, config) -} - -// writeAndSign writes the data as a payload package and, optionally, signs -// it. hints contains optional information, that is also encrypted, -// that aids the recipients in processing the message. The resulting -// WriteCloser must be closed after the contents of the file have been -// written. If config is nil, sensible defaults will be used. -func writeAndSign(payload io.WriteCloser, candidateHashes []uint8, signed *Entity, hints *FileHints, sigType packet.SignatureType, config *packet.Config) (plaintext io.WriteCloser, err error) { - var signer *packet.PrivateKey - if signed != nil { - signKey, ok := signed.SigningKeyById(config.Now(), config.SigningKey()) - if !ok { - return nil, errors.InvalidArgumentError("no valid signing keys") - } - signer = signKey.PrivateKey - if signer == nil { - return nil, errors.InvalidArgumentError("no private key in signing key") - } - if signer.Encrypted { - return nil, errors.InvalidArgumentError("signing key must be decrypted") - } - } - - var hash crypto.Hash - for _, hashId := range candidateHashes { - if h, ok := algorithm.HashIdToHash(hashId); ok && h.Available() { - hash = h - break - } - } - - // If the hash specified by config is a candidate, we'll use that. - if configuredHash := config.Hash(); configuredHash.Available() { - for _, hashId := range candidateHashes { - if h, ok := algorithm.HashIdToHash(hashId); ok && h == configuredHash { - hash = h - break - } - } - } - - if hash == 0 { - hashId := candidateHashes[0] - name, ok := algorithm.HashIdToString(hashId) - if !ok { - name = "#" + strconv.Itoa(int(hashId)) - } - return nil, errors.InvalidArgumentError("cannot encrypt because no candidate hash functions are compiled in. (Wanted " + name + " in this case.)") - } - - var salt []byte - if signer != nil { - var opsVersion = 3 - if signer.Version == 6 { - opsVersion = signer.Version - } - ops := &packet.OnePassSignature{ - Version: opsVersion, - SigType: sigType, - Hash: hash, - PubKeyAlgo: signer.PubKeyAlgo, - KeyId: signer.KeyId, - IsLast: true, - } - if opsVersion == 6 { - ops.KeyFingerprint = signer.Fingerprint - salt, err = packet.SignatureSaltForHash(hash, config.Random()) - if err != nil { - return nil, err - } - ops.Salt = salt - } - if err := ops.Serialize(payload); err != nil { - return nil, err - } - } - - if hints == nil { - hints = &FileHints{} - } - - w := payload - if signer != nil { - // If we need to write a signature packet after the literal - // data then we need to stop literalData from closing - // encryptedData. - w = noOpCloser{w} - - } - var epochSeconds uint32 - if !hints.ModTime.IsZero() { - epochSeconds = uint32(hints.ModTime.Unix()) - } - literalData, err := packet.SerializeLiteral(w, hints.IsBinary, hints.FileName, epochSeconds) - if err != nil { - return nil, err - } - - if signer != nil { - h, wrappedHash, err := hashForSignature(hash, sigType, salt) - if err != nil { - return nil, err - } - metadata := &packet.LiteralData{ - Format: 'u', - FileName: hints.FileName, - Time: epochSeconds, - } - if hints.IsBinary { - metadata.Format = 'b' - } - return signatureWriter{payload, literalData, hash, wrappedHash, h, salt, signer, sigType, config, metadata}, nil - } - return literalData, nil -} - -// encrypt encrypts a message to a number of recipients and, optionally, signs -// it. hints contains optional information, that is also encrypted, that aids -// the recipients in processing the message. The resulting WriteCloser must -// be closed after the contents of the file have been written. -// If config is nil, sensible defaults will be used. -func encrypt(keyWriter io.Writer, dataWriter io.Writer, to []*Entity, signed *Entity, hints *FileHints, sigType packet.SignatureType, config *packet.Config) (plaintext io.WriteCloser, err error) { - if len(to) == 0 { - return nil, errors.InvalidArgumentError("no encryption recipient provided") - } - - // These are the possible ciphers that we'll use for the message. - candidateCiphers := []uint8{ - uint8(packet.CipherAES256), - uint8(packet.CipherAES128), - } - - // These are the possible hash functions that we'll use for the signature. - candidateHashes := []uint8{ - hashToHashId(crypto.SHA256), - hashToHashId(crypto.SHA384), - hashToHashId(crypto.SHA512), - hashToHashId(crypto.SHA3_256), - hashToHashId(crypto.SHA3_512), - } - - // Prefer GCM if everyone supports it - candidateCipherSuites := [][2]uint8{ - {uint8(packet.CipherAES256), uint8(packet.AEADModeGCM)}, - {uint8(packet.CipherAES256), uint8(packet.AEADModeEAX)}, - {uint8(packet.CipherAES256), uint8(packet.AEADModeOCB)}, - {uint8(packet.CipherAES128), uint8(packet.AEADModeGCM)}, - {uint8(packet.CipherAES128), uint8(packet.AEADModeEAX)}, - {uint8(packet.CipherAES128), uint8(packet.AEADModeOCB)}, - } - - candidateCompression := []uint8{ - uint8(packet.CompressionNone), - uint8(packet.CompressionZIP), - uint8(packet.CompressionZLIB), - } - - encryptKeys := make([]Key, len(to)) - - // AEAD is used only if config enables it and every key supports it - aeadSupported := config.AEAD() != nil - - for i := range to { - var ok bool - encryptKeys[i], ok = to[i].EncryptionKey(config.Now()) - if !ok { - return nil, errors.InvalidArgumentError("cannot encrypt a message to key id " + strconv.FormatUint(to[i].PrimaryKey.KeyId, 16) + " because it has no valid encryption keys") - } - - primarySelfSignature, _ := to[i].PrimarySelfSignature() - if primarySelfSignature == nil { - return nil, errors.InvalidArgumentError("entity without a self-signature") - } - - if !primarySelfSignature.SEIPDv2 { - aeadSupported = false - } - - candidateCiphers = intersectPreferences(candidateCiphers, primarySelfSignature.PreferredSymmetric) - candidateHashes = intersectPreferences(candidateHashes, primarySelfSignature.PreferredHash) - candidateCipherSuites = intersectCipherSuites(candidateCipherSuites, primarySelfSignature.PreferredCipherSuites) - candidateCompression = intersectPreferences(candidateCompression, primarySelfSignature.PreferredCompression) - } - - // In the event that the intersection of supported algorithms is empty we use the ones - // labelled as MUST that every implementation supports. - if len(candidateCiphers) == 0 { - // https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-9.3 - candidateCiphers = []uint8{uint8(packet.CipherAES128)} - } - if len(candidateHashes) == 0 { - // https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#hash-algos - candidateHashes = []uint8{hashToHashId(crypto.SHA256)} - } - if len(candidateCipherSuites) == 0 { - // https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-9.6 - candidateCipherSuites = [][2]uint8{{uint8(packet.CipherAES128), uint8(packet.AEADModeOCB)}} - } - - cipher := packet.CipherFunction(candidateCiphers[0]) - aeadCipherSuite := packet.CipherSuite{ - Cipher: packet.CipherFunction(candidateCipherSuites[0][0]), - Mode: packet.AEADMode(candidateCipherSuites[0][1]), - } - - // If the cipher specified by config is a candidate, we'll use that. - configuredCipher := config.Cipher() - for _, c := range candidateCiphers { - cipherFunc := packet.CipherFunction(c) - if cipherFunc == configuredCipher { - cipher = cipherFunc - break - } - } - - var symKey []byte - if aeadSupported { - symKey = make([]byte, aeadCipherSuite.Cipher.KeySize()) - } else { - symKey = make([]byte, cipher.KeySize()) - } - - if _, err := io.ReadFull(config.Random(), symKey); err != nil { - return nil, err - } - - for _, key := range encryptKeys { - if err := packet.SerializeEncryptedKeyAEAD(keyWriter, key.PublicKey, cipher, aeadSupported, symKey, config); err != nil { - return nil, err - } - } - - var payload io.WriteCloser - payload, err = packet.SerializeSymmetricallyEncrypted(dataWriter, cipher, aeadSupported, aeadCipherSuite, symKey, config) - if err != nil { - return - } - - payload, err = handleCompression(payload, candidateCompression, config) - if err != nil { - return nil, err - } - - return writeAndSign(payload, candidateHashes, signed, hints, sigType, config) -} - -// Sign signs a message. The resulting WriteCloser must be closed after the -// contents of the file have been written. hints contains optional information -// that aids the recipients in processing the message. -// If config is nil, sensible defaults will be used. -func Sign(output io.Writer, signed *Entity, hints *FileHints, config *packet.Config) (input io.WriteCloser, err error) { - if signed == nil { - return nil, errors.InvalidArgumentError("no signer provided") - } - - // These are the possible hash functions that we'll use for the signature. - candidateHashes := []uint8{ - hashToHashId(crypto.SHA256), - hashToHashId(crypto.SHA384), - hashToHashId(crypto.SHA512), - hashToHashId(crypto.SHA3_256), - hashToHashId(crypto.SHA3_512), - } - defaultHashes := candidateHashes[0:1] - primarySelfSignature, _ := signed.PrimarySelfSignature() - if primarySelfSignature == nil { - return nil, errors.StructuralError("signed entity has no self-signature") - } - preferredHashes := primarySelfSignature.PreferredHash - if len(preferredHashes) == 0 { - preferredHashes = defaultHashes - } - candidateHashes = intersectPreferences(candidateHashes, preferredHashes) - if len(candidateHashes) == 0 { - return nil, errors.StructuralError("cannot sign because signing key shares no common algorithms with candidate hashes") - } - - return writeAndSign(noOpCloser{output}, candidateHashes, signed, hints, packet.SigTypeBinary, config) -} - -// signatureWriter hashes the contents of a message while passing it along to -// literalData. When closed, it closes literalData, writes a signature packet -// to encryptedData and then also closes encryptedData. -type signatureWriter struct { - encryptedData io.WriteCloser - literalData io.WriteCloser - hashType crypto.Hash - wrappedHash hash.Hash - h hash.Hash - salt []byte // v6 only - signer *packet.PrivateKey - sigType packet.SignatureType - config *packet.Config - metadata *packet.LiteralData // V5 signatures protect document metadata -} - -func (s signatureWriter) Write(data []byte) (int, error) { - s.wrappedHash.Write(data) - switch s.sigType { - case packet.SigTypeBinary: - return s.literalData.Write(data) - case packet.SigTypeText: - flag := 0 - return writeCanonical(s.literalData, data, &flag) - } - return 0, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(s.sigType))) -} - -func (s signatureWriter) Close() error { - sig := createSignaturePacket(&s.signer.PublicKey, s.sigType, s.config) - sig.Hash = s.hashType - sig.Metadata = s.metadata - - if err := sig.SetSalt(s.salt); err != nil { - return err - } - - if err := sig.Sign(s.h, s.signer, s.config); err != nil { - return err - } - if err := s.literalData.Close(); err != nil { - return err - } - if err := sig.Serialize(s.encryptedData); err != nil { - return err - } - return s.encryptedData.Close() -} - -func createSignaturePacket(signer *packet.PublicKey, sigType packet.SignatureType, config *packet.Config) *packet.Signature { - sigLifetimeSecs := config.SigLifetime() - return &packet.Signature{ - Version: signer.Version, - SigType: sigType, - PubKeyAlgo: signer.PubKeyAlgo, - Hash: config.Hash(), - CreationTime: config.Now(), - IssuerKeyId: &signer.KeyId, - IssuerFingerprint: signer.Fingerprint, - Notations: config.Notations(), - SigLifetimeSecs: &sigLifetimeSecs, - } -} - -// noOpCloser is like an ioutil.NopCloser, but for an io.Writer. -// TODO: we have two of these in OpenPGP packages alone. This probably needs -// to be promoted somewhere more common. -type noOpCloser struct { - w io.Writer -} - -func (c noOpCloser) Write(data []byte) (n int, err error) { - return c.w.Write(data) -} - -func (c noOpCloser) Close() error { - return nil -} - -func handleCompression(compressed io.WriteCloser, candidateCompression []uint8, config *packet.Config) (data io.WriteCloser, err error) { - data = compressed - confAlgo := config.Compression() - if confAlgo == packet.CompressionNone { - return - } - - // Set algorithm labelled as MUST as fallback - // https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-07.html#section-9.4 - finalAlgo := packet.CompressionNone - // if compression specified by config available we will use it - for _, c := range candidateCompression { - if uint8(confAlgo) == c { - finalAlgo = confAlgo - break - } - } - - if finalAlgo != packet.CompressionNone { - var compConfig *packet.CompressionConfig - if config != nil { - compConfig = config.CompressionConfig - } - data, err = packet.SerializeCompressed(compressed, finalAlgo, compConfig) - if err != nil { - return - } - } - return data, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/x25519/x25519.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/x25519/x25519.go deleted file mode 100644 index 38afcc74f..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/x25519/x25519.go +++ /dev/null @@ -1,221 +0,0 @@ -package x25519 - -import ( - "crypto/sha256" - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/aes/keywrap" - "github.com/ProtonMail/go-crypto/openpgp/errors" - x25519lib "github.com/cloudflare/circl/dh/x25519" - "golang.org/x/crypto/hkdf" -) - -const ( - hkdfInfo = "OpenPGP X25519" - aes128KeySize = 16 - // The size of a public or private key in bytes. - KeySize = x25519lib.Size -) - -type PublicKey struct { - // Point represents the encoded elliptic curve point of the public key. - Point []byte -} - -type PrivateKey struct { - PublicKey - // Secret represents the secret of the private key. - Secret []byte -} - -// NewPrivateKey creates a new empty private key including the public key. -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -// Validate validates that the provided public key matches the private key. -func Validate(pk *PrivateKey) (err error) { - var expectedPublicKey, privateKey x25519lib.Key - subtle.ConstantTimeCopy(1, privateKey[:], pk.Secret) - x25519lib.KeyGen(&expectedPublicKey, &privateKey) - if subtle.ConstantTimeCompare(expectedPublicKey[:], pk.PublicKey.Point) == 0 { - return errors.KeyInvalidError("x25519: invalid key") - } - return nil -} - -// GenerateKey generates a new x25519 key pair. -func GenerateKey(rand io.Reader) (*PrivateKey, error) { - var privateKey, publicKey x25519lib.Key - privateKeyOut := new(PrivateKey) - err := generateKey(rand, &privateKey, &publicKey) - if err != nil { - return nil, err - } - privateKeyOut.PublicKey.Point = publicKey[:] - privateKeyOut.Secret = privateKey[:] - return privateKeyOut, nil -} - -func generateKey(rand io.Reader, privateKey *x25519lib.Key, publicKey *x25519lib.Key) error { - maxRounds := 10 - isZero := true - for round := 0; isZero; round++ { - if round == maxRounds { - return errors.InvalidArgumentError("x25519: zero keys only, randomness source might be corrupt") - } - _, err := io.ReadFull(rand, privateKey[:]) - if err != nil { - return err - } - isZero = constantTimeIsZero(privateKey[:]) - } - x25519lib.KeyGen(publicKey, privateKey) - return nil -} - -// Encrypt encrypts a sessionKey with x25519 according to -// the OpenPGP crypto refresh specification section 5.1.6. The function assumes that the -// sessionKey has the correct format and padding according to the specification. -func Encrypt(rand io.Reader, publicKey *PublicKey, sessionKey []byte) (ephemeralPublicKey *PublicKey, encryptedSessionKey []byte, err error) { - var ephemeralPrivate, ephemeralPublic, staticPublic, shared x25519lib.Key - // Check that the input static public key has 32 bytes - if len(publicKey.Point) != KeySize { - err = errors.KeyInvalidError("x25519: the public key has the wrong size") - return - } - copy(staticPublic[:], publicKey.Point) - // Generate ephemeral keyPair - err = generateKey(rand, &ephemeralPrivate, &ephemeralPublic) - if err != nil { - return - } - // Compute shared key - ok := x25519lib.Shared(&shared, &ephemeralPrivate, &staticPublic) - if !ok { - err = errors.KeyInvalidError("x25519: the public key is a low order point") - return - } - // Derive the encryption key from the shared secret - encryptionKey := applyHKDF(ephemeralPublic[:], publicKey.Point[:], shared[:]) - ephemeralPublicKey = &PublicKey{ - Point: ephemeralPublic[:], - } - // Encrypt the sessionKey with aes key wrapping - encryptedSessionKey, err = keywrap.Wrap(encryptionKey, sessionKey) - return -} - -// Decrypt decrypts a session key stored in ciphertext with the provided x25519 -// private key and ephemeral public key. -func Decrypt(privateKey *PrivateKey, ephemeralPublicKey *PublicKey, ciphertext []byte) (encodedSessionKey []byte, err error) { - var ephemeralPublic, staticPrivate, shared x25519lib.Key - // Check that the input ephemeral public key has 32 bytes - if len(ephemeralPublicKey.Point) != KeySize { - err = errors.KeyInvalidError("x25519: the public key has the wrong size") - return - } - copy(ephemeralPublic[:], ephemeralPublicKey.Point) - subtle.ConstantTimeCopy(1, staticPrivate[:], privateKey.Secret) - // Compute shared key - ok := x25519lib.Shared(&shared, &staticPrivate, &ephemeralPublic) - if !ok { - err = errors.KeyInvalidError("x25519: the ephemeral public key is a low order point") - return - } - // Derive the encryption key from the shared secret - encryptionKey := applyHKDF(ephemeralPublicKey.Point[:], privateKey.PublicKey.Point[:], shared[:]) - // Decrypt the session key with aes key wrapping - encodedSessionKey, err = keywrap.Unwrap(encryptionKey, ciphertext) - return -} - -func applyHKDF(ephemeralPublicKey []byte, publicKey []byte, sharedSecret []byte) []byte { - inputKey := make([]byte, 3*KeySize) - // ephemeral public key | recipient public key | shared secret - subtle.ConstantTimeCopy(1, inputKey[:KeySize], ephemeralPublicKey) - subtle.ConstantTimeCopy(1, inputKey[KeySize:2*KeySize], publicKey) - subtle.ConstantTimeCopy(1, inputKey[2*KeySize:], sharedSecret) - hkdfReader := hkdf.New(sha256.New, inputKey, []byte{}, []byte(hkdfInfo)) - encryptionKey := make([]byte, aes128KeySize) - _, _ = io.ReadFull(hkdfReader, encryptionKey) - return encryptionKey -} - -func constantTimeIsZero(bytes []byte) bool { - isZero := byte(0) - for _, b := range bytes { - isZero |= b - } - return isZero == 0 -} - -// ENCODING/DECODING ciphertexts: - -// EncodeFieldsLength returns the length of the ciphertext encoding -// given the encrypted session key. -func EncodedFieldsLength(encryptedSessionKey []byte, v6 bool) int { - lenCipherFunction := 0 - if !v6 { - lenCipherFunction = 1 - } - return KeySize + 1 + len(encryptedSessionKey) + lenCipherFunction -} - -// EncodeField encodes x25519 session key encryption fields as -// ephemeral x25519 public key | follow byte length | cipherFunction (v3 only) | encryptedSessionKey -// and writes it to writer. -func EncodeFields(writer io.Writer, ephemeralPublicKey *PublicKey, encryptedSessionKey []byte, cipherFunction byte, v6 bool) (err error) { - lenAlgorithm := 0 - if !v6 { - lenAlgorithm = 1 - } - if _, err = writer.Write(ephemeralPublicKey.Point); err != nil { - return err - } - if _, err = writer.Write([]byte{byte(len(encryptedSessionKey) + lenAlgorithm)}); err != nil { - return err - } - if !v6 { - if _, err = writer.Write([]byte{cipherFunction}); err != nil { - return err - } - } - _, err = writer.Write(encryptedSessionKey) - return err -} - -// DecodeField decodes a x25519 session key encryption as -// ephemeral x25519 public key | follow byte length | cipherFunction (v3 only) | encryptedSessionKey. -func DecodeFields(reader io.Reader, v6 bool) (ephemeralPublicKey *PublicKey, encryptedSessionKey []byte, cipherFunction byte, err error) { - var buf [1]byte - ephemeralPublicKey = &PublicKey{ - Point: make([]byte, KeySize), - } - // 32 octets representing an ephemeral x25519 public key. - if _, err = io.ReadFull(reader, ephemeralPublicKey.Point); err != nil { - return nil, nil, 0, err - } - // A one-octet size of the following fields. - if _, err = io.ReadFull(reader, buf[:]); err != nil { - return nil, nil, 0, err - } - followingLen := buf[0] - // The one-octet algorithm identifier, if it was passed (in the case of a v3 PKESK packet). - if !v6 { - if _, err = io.ReadFull(reader, buf[:]); err != nil { - return nil, nil, 0, err - } - cipherFunction = buf[0] - followingLen -= 1 - } - // The encrypted session key. - encryptedSessionKey = make([]byte, followingLen) - if _, err = io.ReadFull(reader, encryptedSessionKey); err != nil { - return nil, nil, 0, err - } - return ephemeralPublicKey, encryptedSessionKey, cipherFunction, nil -} diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/x448/x448.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/x448/x448.go deleted file mode 100644 index 65a082dab..000000000 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/x448/x448.go +++ /dev/null @@ -1,229 +0,0 @@ -package x448 - -import ( - "crypto/sha512" - "crypto/subtle" - "io" - - "github.com/ProtonMail/go-crypto/openpgp/aes/keywrap" - "github.com/ProtonMail/go-crypto/openpgp/errors" - x448lib "github.com/cloudflare/circl/dh/x448" - "golang.org/x/crypto/hkdf" -) - -const ( - hkdfInfo = "OpenPGP X448" - aes256KeySize = 32 - // The size of a public or private key in bytes. - KeySize = x448lib.Size -) - -type PublicKey struct { - // Point represents the encoded elliptic curve point of the public key. - Point []byte -} - -type PrivateKey struct { - PublicKey - // Secret represents the secret of the private key. - Secret []byte -} - -// NewPrivateKey creates a new empty private key including the public key. -func NewPrivateKey(key PublicKey) *PrivateKey { - return &PrivateKey{ - PublicKey: key, - } -} - -// Validate validates that the provided public key matches -// the private key. -func Validate(pk *PrivateKey) (err error) { - var expectedPublicKey, privateKey x448lib.Key - subtle.ConstantTimeCopy(1, privateKey[:], pk.Secret) - x448lib.KeyGen(&expectedPublicKey, &privateKey) - if subtle.ConstantTimeCompare(expectedPublicKey[:], pk.PublicKey.Point) == 0 { - return errors.KeyInvalidError("x448: invalid key") - } - return nil -} - -// GenerateKey generates a new x448 key pair. -func GenerateKey(rand io.Reader) (*PrivateKey, error) { - var privateKey, publicKey x448lib.Key - privateKeyOut := new(PrivateKey) - err := generateKey(rand, &privateKey, &publicKey) - if err != nil { - return nil, err - } - privateKeyOut.PublicKey.Point = publicKey[:] - privateKeyOut.Secret = privateKey[:] - return privateKeyOut, nil -} - -func generateKey(rand io.Reader, privateKey *x448lib.Key, publicKey *x448lib.Key) error { - maxRounds := 10 - isZero := true - for round := 0; isZero; round++ { - if round == maxRounds { - return errors.InvalidArgumentError("x448: zero keys only, randomness source might be corrupt") - } - _, err := io.ReadFull(rand, privateKey[:]) - if err != nil { - return err - } - isZero = constantTimeIsZero(privateKey[:]) - } - x448lib.KeyGen(publicKey, privateKey) - return nil -} - -// Encrypt encrypts a sessionKey with x448 according to -// the OpenPGP crypto refresh specification section 5.1.7. The function assumes that the -// sessionKey has the correct format and padding according to the specification. -func Encrypt(rand io.Reader, publicKey *PublicKey, sessionKey []byte) (ephemeralPublicKey *PublicKey, encryptedSessionKey []byte, err error) { - var ephemeralPrivate, ephemeralPublic, staticPublic, shared x448lib.Key - // Check that the input static public key has 56 bytes. - if len(publicKey.Point) != KeySize { - err = errors.KeyInvalidError("x448: the public key has the wrong size") - return nil, nil, err - } - copy(staticPublic[:], publicKey.Point) - // Generate ephemeral keyPair. - if err = generateKey(rand, &ephemeralPrivate, &ephemeralPublic); err != nil { - return nil, nil, err - } - // Compute shared key. - ok := x448lib.Shared(&shared, &ephemeralPrivate, &staticPublic) - if !ok { - err = errors.KeyInvalidError("x448: the public key is a low order point") - return nil, nil, err - } - // Derive the encryption key from the shared secret. - encryptionKey := applyHKDF(ephemeralPublic[:], publicKey.Point[:], shared[:]) - ephemeralPublicKey = &PublicKey{ - Point: ephemeralPublic[:], - } - // Encrypt the sessionKey with aes key wrapping. - encryptedSessionKey, err = keywrap.Wrap(encryptionKey, sessionKey) - if err != nil { - return nil, nil, err - } - return ephemeralPublicKey, encryptedSessionKey, nil -} - -// Decrypt decrypts a session key stored in ciphertext with the provided x448 -// private key and ephemeral public key. -func Decrypt(privateKey *PrivateKey, ephemeralPublicKey *PublicKey, ciphertext []byte) (encodedSessionKey []byte, err error) { - var ephemeralPublic, staticPrivate, shared x448lib.Key - // Check that the input ephemeral public key has 56 bytes. - if len(ephemeralPublicKey.Point) != KeySize { - err = errors.KeyInvalidError("x448: the public key has the wrong size") - return nil, err - } - copy(ephemeralPublic[:], ephemeralPublicKey.Point) - subtle.ConstantTimeCopy(1, staticPrivate[:], privateKey.Secret) - // Compute shared key. - ok := x448lib.Shared(&shared, &staticPrivate, &ephemeralPublic) - if !ok { - err = errors.KeyInvalidError("x448: the ephemeral public key is a low order point") - return nil, err - } - // Derive the encryption key from the shared secret. - encryptionKey := applyHKDF(ephemeralPublicKey.Point[:], privateKey.PublicKey.Point[:], shared[:]) - // Decrypt the session key with aes key wrapping. - encodedSessionKey, err = keywrap.Unwrap(encryptionKey, ciphertext) - if err != nil { - return nil, err - } - return encodedSessionKey, nil -} - -func applyHKDF(ephemeralPublicKey []byte, publicKey []byte, sharedSecret []byte) []byte { - inputKey := make([]byte, 3*KeySize) - // ephemeral public key | recipient public key | shared secret. - subtle.ConstantTimeCopy(1, inputKey[:KeySize], ephemeralPublicKey) - subtle.ConstantTimeCopy(1, inputKey[KeySize:2*KeySize], publicKey) - subtle.ConstantTimeCopy(1, inputKey[2*KeySize:], sharedSecret) - hkdfReader := hkdf.New(sha512.New, inputKey, []byte{}, []byte(hkdfInfo)) - encryptionKey := make([]byte, aes256KeySize) - _, _ = io.ReadFull(hkdfReader, encryptionKey) - return encryptionKey -} - -func constantTimeIsZero(bytes []byte) bool { - isZero := byte(0) - for _, b := range bytes { - isZero |= b - } - return isZero == 0 -} - -// ENCODING/DECODING ciphertexts: - -// EncodeFieldsLength returns the length of the ciphertext encoding -// given the encrypted session key. -func EncodedFieldsLength(encryptedSessionKey []byte, v6 bool) int { - lenCipherFunction := 0 - if !v6 { - lenCipherFunction = 1 - } - return KeySize + 1 + len(encryptedSessionKey) + lenCipherFunction -} - -// EncodeField encodes x448 session key encryption fields as -// ephemeral x448 public key | follow byte length | cipherFunction (v3 only) | encryptedSessionKey -// and writes it to writer. -func EncodeFields(writer io.Writer, ephemeralPublicKey *PublicKey, encryptedSessionKey []byte, cipherFunction byte, v6 bool) (err error) { - lenAlgorithm := 0 - if !v6 { - lenAlgorithm = 1 - } - if _, err = writer.Write(ephemeralPublicKey.Point); err != nil { - return err - } - if _, err = writer.Write([]byte{byte(len(encryptedSessionKey) + lenAlgorithm)}); err != nil { - return err - } - if !v6 { - if _, err = writer.Write([]byte{cipherFunction}); err != nil { - return err - } - } - if _, err = writer.Write(encryptedSessionKey); err != nil { - return err - } - return nil -} - -// DecodeField decodes a x448 session key encryption as -// ephemeral x448 public key | follow byte length | cipherFunction (v3 only) | encryptedSessionKey. -func DecodeFields(reader io.Reader, v6 bool) (ephemeralPublicKey *PublicKey, encryptedSessionKey []byte, cipherFunction byte, err error) { - var buf [1]byte - ephemeralPublicKey = &PublicKey{ - Point: make([]byte, KeySize), - } - // 56 octets representing an ephemeral x448 public key. - if _, err = io.ReadFull(reader, ephemeralPublicKey.Point); err != nil { - return nil, nil, 0, err - } - // A one-octet size of the following fields. - if _, err = io.ReadFull(reader, buf[:]); err != nil { - return nil, nil, 0, err - } - followingLen := buf[0] - // The one-octet algorithm identifier, if it was passed (in the case of a v3 PKESK packet). - if !v6 { - if _, err = io.ReadFull(reader, buf[:]); err != nil { - return nil, nil, 0, err - } - cipherFunction = buf[0] - followingLen -= 1 - } - // The encrypted session key. - encryptedSessionKey = make([]byte, followingLen) - if _, err = io.ReadFull(reader, encryptedSessionKey); err != nil { - return nil, nil, 0, err - } - return ephemeralPublicKey, encryptedSessionKey, cipherFunction, nil -} diff --git a/vendor/github.com/adrg/xdg/README.md b/vendor/github.com/adrg/xdg/README.md index b55403c27..cf16c5a5e 100644 --- a/vendor/github.com/adrg/xdg/README.md +++ b/vendor/github.com/adrg/xdg/README.md @@ -7,8 +7,8 @@

Go implementation of the XDG Base Directory Specification and XDG user directories.

- - Build status + + Tests status Code coverage @@ -41,8 +41,9 @@ Provides an implementation of the [XDG Base Directory Specification](https://spe The specification defines a set of standard paths for storing application files, including data and configuration files. For portability and flexibility reasons, applications should use the XDG defined locations instead of hardcoding paths. -The package also includes the locations of well known [user directories](https://wiki.archlinux.org/index.php/XDG_user_directories), as well as -other common directories such as fonts and applications. + +The package also includes the locations of well known [user directories](https://wiki.archlinux.org/index.php/XDG_user_directories), +support for the non-standard `XDG_BIN_HOME` directory, as well as other common directories such as fonts and applications. The current implementation supports **most flavors of Unix**, **Windows**, **macOS** and **Plan 9**. On Windows, where XDG environment variables are not usually set, the package uses [Known Folders](https://docs.microsoft.com/en-us/windows/win32/shell/known-folders) @@ -58,7 +59,7 @@ See usage [examples](#usage) below. Full documentation can be found at https://p The package defines sensible defaults for XDG variables which are empty or not present in the environment. -- On Unix-like operating systems, XDG environment variables are tipically defined. +- On Unix-like operating systems, XDG environment variables are typically defined. Appropriate default locations are used for the environment variables which are not set. - On Windows, XDG environment variables are usually not set. If that is the case, the package relies on the appropriate [Known Folders](https://docs.microsoft.com/en-us/windows/win32/shell/knownfolderid). @@ -70,15 +71,16 @@ Sensible fallback locations are used for the folders which are not set.

Unix-like operating systems
-| |

Unix

|

macOS

|

Plan 9

| -| :------------------------------------------------------------: | :-----------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------: | -| XDG_DATA_HOME | ~/.local/share | ~/Library/Application Support | $home/lib | -| XDG_DATA_DIRS | /usr/local/share
/usr/share | /Library/Application Support | /lib | -| XDG_CONFIG_HOME | ~/.config | ~/Library/Application Support | $home/lib | -| XDG_CONFIG_DIRS | /etc/xdg | ~/Library/Preferences
/Library/Application Support
/Library/Preferences | /lib | -| XDG_STATE_HOME | ~/.local/state | ~/Library/Application Support | $home/lib/state | -| XDG_CACHE_HOME | ~/.cache | ~/Library/Caches | $home/lib/cache | -| XDG_RUNTIME_DIR | /run/user/UID | ~/Library/Application Support | /tmp | +| |

Unix

|

macOS

|

Plan 9

| +| :------------------------------------------------------------: | :-----------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------: | +| XDG_DATA_HOME | ~/.local/share | ~/Library/Application Support | $home/lib | +| XDG_DATA_DIRS | /usr/local/share
/usr/share | /Library/Application Support~/.local/share | /lib | +| XDG_CONFIG_HOME | ~/.config | ~/Library/Application Support | $home/lib | +| XDG_CONFIG_DIRS | /etc/xdg | ~/Library/Preferences
/Library/Application Support
/Library/Preferences
~/.config | /lib | +| XDG_STATE_HOME | ~/.local/state | ~/Library/Application Support | $home/lib/state | +| XDG_CACHE_HOME | ~/.cache | ~/Library/Caches | $home/lib/cache | +| XDG_RUNTIME_DIR | /run/user/$UID | ~/Library/Application Support | /tmp | +| XDG_BIN_HOME | ~/.local/bin | ~/.local/bin | $home/bin | @@ -95,11 +97,23 @@ Sensible fallback locations are used for the folders which are not set. | XDG_STATE_HOME | LocalAppData | %LOCALAPPDATA% | | XDG_CACHE_HOME | LocalAppData\cache | %LOCALAPPDATA%\cache | | XDG_RUNTIME_DIR | LocalAppData | %LOCALAPPDATA% | +| XDG_BIN_HOME | UserProgramFiles | %LOCALAPPDATA%\Programs | ### XDG user directories +XDG user directories environment variables are usually **not** set on most +operating systems. However, if they are present in the environment, they take +precedence. Appropriate fallback locations are used for the environment +variables which are not set. + +- On Unix-like operating systems (except macOS and Plan 9), the package reads the [user-dirs.dirs](https://man.archlinux.org/man/user-dirs.dirs.5.en) config file. +- On Windows, the package uses the appropriate [Known Folders](https://docs.microsoft.com/en-us/windows/win32/shell/knownfolderid). + +Lastly, default locations are used for any user directories which are not set, +as shown in the following tables. +
Unix-like operating systems
@@ -152,11 +166,11 @@ Sensible fallback locations are used for the folders which are not set. Microsoft Windows
-| |

Known Folder(s)

|

Fallback(s)

| -| :-----------------------------------------------------------: | :--------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | -| Home | Profile | %USERPROFILE% | -| Applications | Programs
CommonPrograms | %APPDATA%\Microsoft\Windows\Start Menu\Programs
%ProgramData%\Microsoft\Windows\Start Menu\Programs | -| Fonts | Fonts
- | %SystemRoot%\Fonts
%LOCALAPPDATA%\Microsoft\Windows\Fonts | +| |

Known Folder(s)

|

Fallback(s)

| +| :-----------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| Home | Profile | %USERPROFILE% | +| Applications | Programs
CommonPrograms
ProgramFiles
ProgramFilesCommon
UserProgramFiles
UserProgramFilesCommon | %APPDATA%\Microsoft\Windows\Start Menu\Programs
%ProgramData%\Microsoft\Windows\Start Menu\Programs
%ProgramFiles%
%ProgramFiles%\Common Files
%LOCALAPPDATA%\Programs
%LOCALAPPDATA%\Programs\Common| +| Fonts | Fonts | %SystemRoot%\Fonts
%LOCALAPPDATA%\Microsoft\Windows\Fonts |
@@ -182,6 +196,7 @@ func main() { log.Println("Home state directory:", xdg.StateHome) log.Println("Cache directory:", xdg.CacheHome) log.Println("Runtime directory:", xdg.RuntimeDir) + log.Println("Home binaries directory:", xdg.BinHome) // Other common directories. log.Println("Home directory:", xdg.Home) @@ -192,6 +207,9 @@ func main() { // ConfigFile takes one parameter which must contain the name of the file, // but it can also contain a set of parent directories. If the directories // don't exist, they will be created relative to the base config directory. + // It is recommended for files to be saved inside an application directory + // relative to the base directory rather than directly inside the base + // directory (e.g. `appname/config.yaml` instead of `appname-config.yaml`). configFilePath, err := xdg.ConfigFile("appname/config.yaml") if err != nil { log.Fatal(err) @@ -263,7 +281,11 @@ See [CONTRIBUTING.MD](CONTRIBUTING.md). [gabriel-vasile](https://github.com/gabriel-vasile), [KalleDK](https://github.com/KalleDK), [nvkv](https://github.com/nvkv), -[djdv](https://github.com/djdv). +[djdv](https://github.com/djdv), +[rrjjvv](https://github.com/rrjjvv), +[GreyXor](https://github.com/GreyXor), +[Rican7](https://github.com/Rican7), +[nothub](https://github.com/nothub). ## References diff --git a/vendor/github.com/adrg/xdg/base_dirs.go b/vendor/github.com/adrg/xdg/base_dirs.go index a8a3fd55c..65f3e3fa3 100644 --- a/vendor/github.com/adrg/xdg/base_dirs.go +++ b/vendor/github.com/adrg/xdg/base_dirs.go @@ -1,6 +1,10 @@ package xdg -import "github.com/adrg/xdg/internal/pathutil" +import ( + "os" + + "github.com/adrg/xdg/internal/pathutil" +) // XDG Base Directory environment variables. const ( @@ -11,6 +15,9 @@ const ( envStateHome = "XDG_STATE_HOME" envCacheHome = "XDG_CACHE_HOME" envRuntimeDir = "XDG_RUNTIME_DIR" + + // Non-standard. + envBinHome = "XDG_BIN_HOME" ) type baseDirectories struct { @@ -22,7 +29,8 @@ type baseDirectories struct { cacheHome string runtime string - // Non-standard directories. + // Non-standard. + binHome string fonts []string applications []string } @@ -44,7 +52,13 @@ func (bd baseDirectories) cacheFile(relPath string) (string, error) { } func (bd baseDirectories) runtimeFile(relPath string) (string, error) { - return pathutil.Create(relPath, []string{bd.runtime}) + var paths []string + for _, p := range pathutil.Unique([]string{bd.runtime, os.TempDir()}) { + if pathutil.Exists(p) { + paths = append(paths, p) + } + } + return pathutil.Create(relPath, paths) } func (bd baseDirectories) searchDataFile(relPath string) (string, error) { @@ -64,5 +78,5 @@ func (bd baseDirectories) searchCacheFile(relPath string) (string, error) { } func (bd baseDirectories) searchRuntimeFile(relPath string) (string, error) { - return pathutil.Search(relPath, []string{bd.runtime}) + return pathutil.Search(relPath, pathutil.Unique([]string{bd.runtime, os.TempDir()})) } diff --git a/vendor/github.com/adrg/xdg/doc.go b/vendor/github.com/adrg/xdg/doc.go index 7747b183e..22ba4782e 100644 --- a/vendor/github.com/adrg/xdg/doc.go +++ b/vendor/github.com/adrg/xdg/doc.go @@ -16,9 +16,10 @@ The current implementation supports most flavors of Unix, Windows, Mac OS and Pl For more information regarding the Windows Known Folders see: https://docs.microsoft.com/en-us/windows/win32/shell/known-folders -Usage +# Usage XDG Base Directory + package main import ( @@ -36,6 +37,7 @@ XDG Base Directory log.Println("Home state directory:", xdg.StateHome) log.Println("Cache directory:", xdg.CacheHome) log.Println("Runtime directory:", xdg.RuntimeDir) + log.Println("Home binaries directory:", xdg.BinHome) // Other common directories. log.Println("Home directory:", xdg.Home) @@ -46,6 +48,9 @@ XDG Base Directory // ConfigFile takes one parameter which must contain the name of the file, // but it can also contain a set of parent directories. If the directories // don't exist, they will be created relative to the base config directory. + // It is recommended for files to be saved inside an application directory + // relative to the base directory rather than directly inside the base + // directory (e.g. `appname/config.yaml` instead of `appname-config.yaml`). configFilePath, err := xdg.ConfigFile("appname/config.yaml") if err != nil { log.Fatal(err) @@ -76,6 +81,7 @@ XDG Base Directory } XDG user directories + package main import ( diff --git a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil.go b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil.go index 7422342b3..981580d19 100644 --- a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil.go +++ b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil.go @@ -4,22 +4,20 @@ import ( "fmt" "os" "path/filepath" - "strings" ) // Unique eliminates the duplicate paths from the provided slice and returns -// the result. The items in the output slice are in the order in which they -// occur in the input slice. If a `home` location is provided, the paths are -// expanded using the `ExpandHome` function. -func Unique(paths []string, home string) []string { +// the result. The paths are expanded using the `ExpandHome` function and only +// absolute paths are kept. The items in the output slice are in the order in +// which they occur in the input slice. +func Unique(paths []string) []string { var ( uniq []string registry = map[string]struct{}{} ) for _, p := range paths { - p = ExpandHome(p, home) - if p != "" && filepath.IsAbs(p) { + if p = ExpandHome(p); p != "" && filepath.IsAbs(p) { if _, ok := registry[p]; ok { continue } @@ -32,6 +30,18 @@ func Unique(paths []string, home string) []string { return uniq } +// First returns the first absolute path from the provided slice. +// The paths in the input slice are expanded using the `ExpandHome` function. +func First(paths []string) string { + for _, p := range paths { + if p = ExpandHome(p); p != "" && filepath.IsAbs(p) { + return p + } + } + + return "" +} + // Create returns a suitable location relative to which the file with the // specified `name` can be written. The first path from the provided `paths` // slice which is successfully created (or already exists) is used as a base @@ -40,7 +50,7 @@ func Unique(paths []string, home string) []string { // it can also contain a set of parent directories, which will be created // relative to the selected parent path. func Create(name string, paths []string) (string, error) { - var searchedPaths []string + searchedPaths := make([]string, 0, len(paths)) for _, p := range paths { p = filepath.Join(p, name) @@ -48,22 +58,22 @@ func Create(name string, paths []string) (string, error) { if Exists(dir) { return p, nil } - if err := os.MkdirAll(dir, os.ModeDir|0700); err == nil { + if err := os.MkdirAll(dir, os.ModeDir|0o700); err == nil { return p, nil } searchedPaths = append(searchedPaths, dir) } - return "", fmt.Errorf("could not create any of the following paths: %s", - strings.Join(searchedPaths, ", ")) + return "", fmt.Errorf("could not create any of the following paths: %v", + searchedPaths) } // Search searches for the file with the specified `name` in the provided // slice of `paths`. The `name` parameter must contain the name of the file, // but it can also contain a set of parent directories. func Search(name string, paths []string) (string, error) { - var searchedPaths []string + searchedPaths := make([]string, 0, len(paths)) for _, p := range paths { p = filepath.Join(p, name) if Exists(p) { @@ -73,6 +83,32 @@ func Search(name string, paths []string) (string, error) { searchedPaths = append(searchedPaths, filepath.Dir(p)) } - return "", fmt.Errorf("could not locate `%s` in any of the following paths: %s", - filepath.Base(name), strings.Join(searchedPaths, ", ")) + return "", fmt.Errorf("could not locate `%s` in any of the following paths: %v", + filepath.Base(name), searchedPaths) +} + +// EnvPath returns the value of the environment variable with the specified +// `name` if it is an absolute path, or the first absolute fallback path. +// All paths are expanded using the `ExpandHome` function. +func EnvPath(name string, fallbackPaths ...string) string { + dir := ExpandHome(os.Getenv(name)) + if dir != "" && filepath.IsAbs(dir) { + return dir + } + + return First(fallbackPaths) +} + +// EnvPathList reads the value of the environment variable with the specified +// `name` and attempts to extract a list of absolute paths from it. If there +// are none, a list of absolute fallback paths is returned instead. Duplicate +// paths are removed from the returned slice. All paths are expanded using the +// `ExpandHome` function. +func EnvPathList(name string, fallbackPaths ...string) []string { + dirs := Unique(filepath.SplitList(os.Getenv(name))) + if len(dirs) != 0 { + return dirs + } + + return Unique(fallbackPaths) } diff --git a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_plan9.go b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_plan9.go index 8ee4e8d2f..a6e378a2d 100644 --- a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_plan9.go +++ b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_plan9.go @@ -1,20 +1,31 @@ package pathutil import ( + "errors" + "io/fs" "os" "path/filepath" "strings" ) +// UserHomeDir returns the home directory of the current user. +func UserHomeDir() string { + if home := os.Getenv("home"); home != "" { + return home + } + + return "/" +} + // Exists returns true if the specified path exists. func Exists(path string) bool { _, err := os.Stat(path) - return err == nil || os.IsExist(err) + return err == nil || errors.Is(err, fs.ErrExist) } -// ExpandHome substitutes `~` and `$home` at the start of the specified -// `path` using the provided `home` location. -func ExpandHome(path, home string) string { +// ExpandHome substitutes `~` and `$home` at the start of the specified `path`. +func ExpandHome(path string) string { + home := UserHomeDir() if path == "" || home == "" { return path } diff --git a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_unix.go b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_unix.go index a014c66ef..3114a8c0a 100644 --- a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_unix.go +++ b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_unix.go @@ -1,23 +1,33 @@ //go:build aix || darwin || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris -// +build aix darwin dragonfly freebsd js,wasm nacl linux netbsd openbsd solaris package pathutil import ( + "errors" + "io/fs" "os" "path/filepath" "strings" ) +// UserHomeDir returns the home directory of the current user. +func UserHomeDir() string { + if home := os.Getenv("HOME"); home != "" { + return home + } + + return "/" +} + // Exists returns true if the specified path exists. func Exists(path string) bool { _, err := os.Stat(path) - return err == nil || os.IsExist(err) + return err == nil || errors.Is(err, fs.ErrExist) } -// ExpandHome substitutes `~` and `$HOME` at the start of the specified -// `path` using the provided `home` location. -func ExpandHome(path, home string) string { +// ExpandHome substitutes `~` and `$HOME` at the start of the specified `path`. +func ExpandHome(path string) string { + home := UserHomeDir() if path == "" || home == "" { return path } diff --git a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_windows.go b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_windows.go index 44080e3ab..5b18155f1 100644 --- a/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_windows.go +++ b/vendor/github.com/adrg/xdg/internal/pathutil/pathutil_windows.go @@ -1,6 +1,8 @@ package pathutil import ( + "errors" + "io/fs" "os" "path/filepath" "strings" @@ -8,6 +10,11 @@ import ( "golang.org/x/sys/windows" ) +// UserHomeDir returns the home directory of the current user. +func UserHomeDir() string { + return KnownFolder(windows.FOLDERID_Profile, []string{"USERPROFILE"}, nil) +} + // Exists returns true if the specified path exists. func Exists(path string) bool { fi, err := os.Lstat(path) @@ -15,12 +22,12 @@ func Exists(path string) bool { _, err = filepath.EvalSymlinks(path) } - return err == nil || os.IsExist(err) + return err == nil || errors.Is(err, fs.ErrExist) } -// ExpandHome substitutes `%USERPROFILE%` at the start of the specified -// `path` using the provided `home` location. -func ExpandHome(path, home string) string { +// ExpandHome substitutes `%USERPROFILE%` at the start of the specified `path`. +func ExpandHome(path string) string { + home := UserHomeDir() if path == "" || home == "" { return path } diff --git a/vendor/github.com/adrg/xdg/internal/userdirs/config_unix.go b/vendor/github.com/adrg/xdg/internal/userdirs/config_unix.go new file mode 100644 index 000000000..ac7efb964 --- /dev/null +++ b/vendor/github.com/adrg/xdg/internal/userdirs/config_unix.go @@ -0,0 +1,82 @@ +//go:build aix || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris + +package userdirs + +import ( + "bufio" + "io" + "os" + "strings" + + "github.com/adrg/xdg/internal/pathutil" +) + +// ParseConfigFile parses the user directories config file at the +// specified location. +func ParseConfigFile(name string) (*Directories, error) { + f, err := os.Open(name) + if err != nil { + return nil, err + } + defer f.Close() + + return ParseConfig(f) +} + +// ParseConfig parses the user directories config file contained in +// the provided reader. +func ParseConfig(r io.Reader) (*Directories, error) { + dirs := &Directories{} + fieldsMap := map[string]*string{ + EnvDesktopDir: &dirs.Desktop, + EnvDownloadDir: &dirs.Download, + EnvDocumentsDir: &dirs.Documents, + EnvMusicDir: &dirs.Music, + EnvPicturesDir: &dirs.Pictures, + EnvVideosDir: &dirs.Videos, + EnvTemplatesDir: &dirs.Templates, + EnvPublicShareDir: &dirs.PublicShare, + } + + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := strings.TrimSpace(scanner.Text()) + if len(line) == 0 || line[0] == '#' { + continue + } + if !strings.HasPrefix(line, "XDG_") { + continue + } + + parts := strings.Split(line, "=") + if len(parts) < 2 { + continue + } + + // Parse key. + field, ok := fieldsMap[strings.TrimSpace(parts[0])] + if !ok { + continue + } + + // Parse value. + runes := []rune(strings.TrimSpace(parts[1])) + + lenRunes := len(runes) + if lenRunes <= 2 || runes[0] != '"' { + continue + } + + for i := 1; i < lenRunes; i++ { + if runes[i] == '"' { + *field = pathutil.ExpandHome(string(runes[1:i])) + break + } + } + } + if err := scanner.Err(); err != nil { + return nil, err + } + + return dirs, nil +} diff --git a/vendor/github.com/adrg/xdg/user_dirs.go b/vendor/github.com/adrg/xdg/internal/userdirs/userdirs.go similarity index 62% rename from vendor/github.com/adrg/xdg/user_dirs.go rename to vendor/github.com/adrg/xdg/internal/userdirs/userdirs.go index 72088748d..b3c30cf90 100644 --- a/vendor/github.com/adrg/xdg/user_dirs.go +++ b/vendor/github.com/adrg/xdg/internal/userdirs/userdirs.go @@ -1,19 +1,19 @@ -package xdg +package userdirs // XDG user directories environment variables. const ( - envDesktopDir = "XDG_DESKTOP_DIR" - envDownloadDir = "XDG_DOWNLOAD_DIR" - envDocumentsDir = "XDG_DOCUMENTS_DIR" - envMusicDir = "XDG_MUSIC_DIR" - envPicturesDir = "XDG_PICTURES_DIR" - envVideosDir = "XDG_VIDEOS_DIR" - envTemplatesDir = "XDG_TEMPLATES_DIR" - envPublicShareDir = "XDG_PUBLICSHARE_DIR" + EnvDesktopDir = "XDG_DESKTOP_DIR" + EnvDownloadDir = "XDG_DOWNLOAD_DIR" + EnvDocumentsDir = "XDG_DOCUMENTS_DIR" + EnvMusicDir = "XDG_MUSIC_DIR" + EnvPicturesDir = "XDG_PICTURES_DIR" + EnvVideosDir = "XDG_VIDEOS_DIR" + EnvTemplatesDir = "XDG_TEMPLATES_DIR" + EnvPublicShareDir = "XDG_PUBLICSHARE_DIR" ) -// UserDirectories defines the locations of well known user directories. -type UserDirectories struct { +// Directories defines the locations of well known user directories. +type Directories struct { // Desktop defines the location of the user's desktop directory. Desktop string diff --git a/vendor/github.com/adrg/xdg/paths_darwin.go b/vendor/github.com/adrg/xdg/paths_darwin.go index bfe9ad9bc..3b3d05f8f 100644 --- a/vendor/github.com/adrg/xdg/paths_darwin.go +++ b/vendor/github.com/adrg/xdg/paths_darwin.go @@ -1,18 +1,12 @@ package xdg import ( - "os" "path/filepath" + + "github.com/adrg/xdg/internal/pathutil" + "github.com/adrg/xdg/internal/userdirs" ) -func homeDir() string { - if home := os.Getenv("HOME"); home != "" { - return home - } - - return "/" -} - func initDirs(home string) { initBaseDirs(home) initUserDirs(home) @@ -23,19 +17,25 @@ func initBaseDirs(home string) { rootAppSupport := "/Library/Application Support" // Initialize standard directories. - baseDirs.dataHome = xdgPath(envDataHome, homeAppSupport) - baseDirs.data = xdgPaths(envDataDirs, rootAppSupport) - baseDirs.configHome = xdgPath(envConfigHome, homeAppSupport) - baseDirs.config = xdgPaths(envConfigDirs, + baseDirs.dataHome = pathutil.EnvPath(envDataHome, homeAppSupport) + baseDirs.data = pathutil.EnvPathList(envDataDirs, + rootAppSupport, + filepath.Join(home, ".local", "share"), + ) + baseDirs.configHome = pathutil.EnvPath(envConfigHome, homeAppSupport) + baseDirs.config = pathutil.EnvPathList(envConfigDirs, filepath.Join(home, "Library", "Preferences"), rootAppSupport, "/Library/Preferences", + filepath.Join(home, ".config"), ) - baseDirs.stateHome = xdgPath(envStateHome, homeAppSupport) - baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(home, "Library", "Caches")) - baseDirs.runtime = xdgPath(envRuntimeDir, homeAppSupport) + baseDirs.stateHome = pathutil.EnvPath(envStateHome, homeAppSupport) + baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(home, "Library", "Caches")) + baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, homeAppSupport) // Initialize non-standard directories. + baseDirs.binHome = pathutil.EnvPath(envBinHome, filepath.Join(home, ".local", "bin")) + baseDirs.applications = []string{ "/Applications", } @@ -49,12 +49,12 @@ func initBaseDirs(home string) { } func initUserDirs(home string) { - UserDirs.Desktop = xdgPath(envDesktopDir, filepath.Join(home, "Desktop")) - UserDirs.Download = xdgPath(envDownloadDir, filepath.Join(home, "Downloads")) - UserDirs.Documents = xdgPath(envDocumentsDir, filepath.Join(home, "Documents")) - UserDirs.Music = xdgPath(envMusicDir, filepath.Join(home, "Music")) - UserDirs.Pictures = xdgPath(envPicturesDir, filepath.Join(home, "Pictures")) - UserDirs.Videos = xdgPath(envVideosDir, filepath.Join(home, "Movies")) - UserDirs.Templates = xdgPath(envTemplatesDir, filepath.Join(home, "Templates")) - UserDirs.PublicShare = xdgPath(envPublicShareDir, filepath.Join(home, "Public")) + UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, filepath.Join(home, "Desktop")) + UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, filepath.Join(home, "Downloads")) + UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, filepath.Join(home, "Documents")) + UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, filepath.Join(home, "Music")) + UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, filepath.Join(home, "Pictures")) + UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, filepath.Join(home, "Movies")) + UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, filepath.Join(home, "Templates")) + UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, filepath.Join(home, "Public")) } diff --git a/vendor/github.com/adrg/xdg/paths_plan9.go b/vendor/github.com/adrg/xdg/paths_plan9.go index 2882f688b..d0c36baa8 100644 --- a/vendor/github.com/adrg/xdg/paths_plan9.go +++ b/vendor/github.com/adrg/xdg/paths_plan9.go @@ -1,18 +1,12 @@ package xdg import ( - "os" "path/filepath" + + "github.com/adrg/xdg/internal/pathutil" + "github.com/adrg/xdg/internal/userdirs" ) -func homeDir() string { - if home := os.Getenv("home"); home != "" { - return home - } - - return "/" -} - func initDirs(home string) { initBaseDirs(home) initUserDirs(home) @@ -23,15 +17,17 @@ func initBaseDirs(home string) { rootLibDir := "/lib" // Initialize standard directories. - baseDirs.dataHome = xdgPath(envDataHome, homeLibDir) - baseDirs.data = xdgPaths(envDataDirs, rootLibDir) - baseDirs.configHome = xdgPath(envConfigHome, homeLibDir) - baseDirs.config = xdgPaths(envConfigDirs, rootLibDir) - baseDirs.stateHome = xdgPath(envStateHome, filepath.Join(homeLibDir, "state")) - baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(homeLibDir, "cache")) - baseDirs.runtime = xdgPath(envRuntimeDir, "/tmp") + baseDirs.dataHome = pathutil.EnvPath(envDataHome, homeLibDir) + baseDirs.data = pathutil.EnvPathList(envDataDirs, rootLibDir) + baseDirs.configHome = pathutil.EnvPath(envConfigHome, homeLibDir) + baseDirs.config = pathutil.EnvPathList(envConfigDirs, rootLibDir) + baseDirs.stateHome = pathutil.EnvPath(envStateHome, filepath.Join(homeLibDir, "state")) + baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(homeLibDir, "cache")) + baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, "/tmp") // Initialize non-standard directories. + baseDirs.binHome = pathutil.EnvPath(envBinHome, filepath.Join(home, "bin")) + baseDirs.applications = []string{ filepath.Join(home, "bin"), "/bin", @@ -44,12 +40,12 @@ func initBaseDirs(home string) { } func initUserDirs(home string) { - UserDirs.Desktop = xdgPath(envDesktopDir, filepath.Join(home, "desktop")) - UserDirs.Download = xdgPath(envDownloadDir, filepath.Join(home, "downloads")) - UserDirs.Documents = xdgPath(envDocumentsDir, filepath.Join(home, "documents")) - UserDirs.Music = xdgPath(envMusicDir, filepath.Join(home, "music")) - UserDirs.Pictures = xdgPath(envPicturesDir, filepath.Join(home, "pictures")) - UserDirs.Videos = xdgPath(envVideosDir, filepath.Join(home, "videos")) - UserDirs.Templates = xdgPath(envTemplatesDir, filepath.Join(home, "templates")) - UserDirs.PublicShare = xdgPath(envPublicShareDir, filepath.Join(home, "public")) + UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, filepath.Join(home, "desktop")) + UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, filepath.Join(home, "downloads")) + UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, filepath.Join(home, "documents")) + UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, filepath.Join(home, "music")) + UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, filepath.Join(home, "pictures")) + UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, filepath.Join(home, "videos")) + UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, filepath.Join(home, "templates")) + UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, filepath.Join(home, "public")) } diff --git a/vendor/github.com/adrg/xdg/paths_unix.go b/vendor/github.com/adrg/xdg/paths_unix.go index ad571dfc8..8a07809b9 100644 --- a/vendor/github.com/adrg/xdg/paths_unix.go +++ b/vendor/github.com/adrg/xdg/paths_unix.go @@ -1,5 +1,4 @@ //go:build aix || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris -// +build aix dragonfly freebsd js,wasm nacl linux netbsd openbsd solaris package xdg @@ -9,32 +8,27 @@ import ( "strconv" "github.com/adrg/xdg/internal/pathutil" + "github.com/adrg/xdg/internal/userdirs" ) -func homeDir() string { - if home := os.Getenv("HOME"); home != "" { - return home - } - - return "/" -} - func initDirs(home string) { initBaseDirs(home) - initUserDirs(home) + initUserDirs(home, baseDirs.configHome) } func initBaseDirs(home string) { // Initialize standard directories. - baseDirs.dataHome = xdgPath(envDataHome, filepath.Join(home, ".local", "share")) - baseDirs.data = xdgPaths(envDataDirs, "/usr/local/share", "/usr/share") - baseDirs.configHome = xdgPath(envConfigHome, filepath.Join(home, ".config")) - baseDirs.config = xdgPaths(envConfigDirs, "/etc/xdg") - baseDirs.stateHome = xdgPath(envStateHome, filepath.Join(home, ".local", "state")) - baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(home, ".cache")) - baseDirs.runtime = xdgPath(envRuntimeDir, filepath.Join("/run/user", strconv.Itoa(os.Getuid()))) + baseDirs.dataHome = pathutil.EnvPath(envDataHome, filepath.Join(home, ".local", "share")) + baseDirs.data = pathutil.EnvPathList(envDataDirs, "/usr/local/share", "/usr/share") + baseDirs.configHome = pathutil.EnvPath(envConfigHome, filepath.Join(home, ".config")) + baseDirs.config = pathutil.EnvPathList(envConfigDirs, "/etc/xdg") + baseDirs.stateHome = pathutil.EnvPath(envStateHome, filepath.Join(home, ".local", "state")) + baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(home, ".cache")) + baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, filepath.Join("/run/user", strconv.Itoa(os.Getuid()))) // Initialize non-standard directories. + baseDirs.binHome = pathutil.EnvPath(envBinHome, filepath.Join(home, ".local", "bin")) + appDirs := []string{ filepath.Join(baseDirs.dataHome, "applications"), filepath.Join(home, ".local/share/applications"), @@ -55,17 +49,22 @@ func initBaseDirs(home string) { fontDirs = append(fontDirs, filepath.Join(dir, "fonts")) } - baseDirs.applications = pathutil.Unique(appDirs, Home) - baseDirs.fonts = pathutil.Unique(fontDirs, Home) + baseDirs.applications = pathutil.Unique(appDirs) + baseDirs.fonts = pathutil.Unique(fontDirs) } -func initUserDirs(home string) { - UserDirs.Desktop = xdgPath(envDesktopDir, filepath.Join(home, "Desktop")) - UserDirs.Download = xdgPath(envDownloadDir, filepath.Join(home, "Downloads")) - UserDirs.Documents = xdgPath(envDocumentsDir, filepath.Join(home, "Documents")) - UserDirs.Music = xdgPath(envMusicDir, filepath.Join(home, "Music")) - UserDirs.Pictures = xdgPath(envPicturesDir, filepath.Join(home, "Pictures")) - UserDirs.Videos = xdgPath(envVideosDir, filepath.Join(home, "Videos")) - UserDirs.Templates = xdgPath(envTemplatesDir, filepath.Join(home, "Templates")) - UserDirs.PublicShare = xdgPath(envPublicShareDir, filepath.Join(home, "Public")) +func initUserDirs(home, configHome string) { + dirs, err := userdirs.ParseConfigFile(filepath.Join(configHome, "user-dirs.dirs")) + if err != nil { + dirs = &UserDirectories{} + } + + UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, dirs.Desktop, filepath.Join(home, "Desktop")) + UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, dirs.Download, filepath.Join(home, "Downloads")) + UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, dirs.Documents, filepath.Join(home, "Documents")) + UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, dirs.Music, filepath.Join(home, "Music")) + UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, dirs.Pictures, filepath.Join(home, "Pictures")) + UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, dirs.Videos, filepath.Join(home, "Videos")) + UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, dirs.Templates, filepath.Join(home, "Templates")) + UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, dirs.PublicShare, filepath.Join(home, "Public")) } diff --git a/vendor/github.com/adrg/xdg/paths_windows.go b/vendor/github.com/adrg/xdg/paths_windows.go index 722d3e785..bb80819ff 100644 --- a/vendor/github.com/adrg/xdg/paths_windows.go +++ b/vendor/github.com/adrg/xdg/paths_windows.go @@ -4,17 +4,10 @@ import ( "path/filepath" "github.com/adrg/xdg/internal/pathutil" + "github.com/adrg/xdg/internal/userdirs" "golang.org/x/sys/windows" ) -func homeDir() string { - return pathutil.KnownFolder( - windows.FOLDERID_Profile, - []string{"USERPROFILE"}, - nil, - ) -} - func initDirs(home string) { kf := initKnownFolders(home) initBaseDirs(home, kf) @@ -23,19 +16,26 @@ func initDirs(home string) { func initBaseDirs(home string, kf *knownFolders) { // Initialize standard directories. - baseDirs.dataHome = xdgPath(envDataHome, kf.localAppData) - baseDirs.data = xdgPaths(envDataDirs, kf.roamingAppData, kf.programData) - baseDirs.configHome = xdgPath(envConfigHome, kf.localAppData) - baseDirs.config = xdgPaths(envConfigDirs, kf.programData, kf.roamingAppData) - baseDirs.stateHome = xdgPath(envStateHome, kf.localAppData) - baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(kf.localAppData, "cache")) - baseDirs.runtime = xdgPath(envRuntimeDir, kf.localAppData) + baseDirs.dataHome = pathutil.EnvPath(envDataHome, kf.localAppData) + baseDirs.data = pathutil.EnvPathList(envDataDirs, kf.roamingAppData, kf.programData) + baseDirs.configHome = pathutil.EnvPath(envConfigHome, kf.localAppData) + baseDirs.config = pathutil.EnvPathList(envConfigDirs, kf.programData, kf.roamingAppData) + baseDirs.stateHome = pathutil.EnvPath(envStateHome, kf.localAppData) + baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(kf.localAppData, "cache")) + baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, kf.localAppData) // Initialize non-standard directories. + baseDirs.binHome = pathutil.EnvPath(envBinHome, kf.userProgramFiles) + baseDirs.applications = []string{ kf.programs, kf.commonPrograms, + kf.programFiles, + kf.programFilesCommon, + kf.userProgramFiles, + kf.userProgramFilesCommon, } + baseDirs.fonts = []string{ kf.fonts, filepath.Join(kf.localAppData, "Microsoft", "Windows", "Fonts"), @@ -43,35 +43,39 @@ func initBaseDirs(home string, kf *knownFolders) { } func initUserDirs(home string, kf *knownFolders) { - UserDirs.Desktop = xdgPath(envDesktopDir, kf.desktop) - UserDirs.Download = xdgPath(envDownloadDir, kf.downloads) - UserDirs.Documents = xdgPath(envDocumentsDir, kf.documents) - UserDirs.Music = xdgPath(envMusicDir, kf.music) - UserDirs.Pictures = xdgPath(envPicturesDir, kf.pictures) - UserDirs.Videos = xdgPath(envVideosDir, kf.videos) - UserDirs.Templates = xdgPath(envTemplatesDir, kf.templates) - UserDirs.PublicShare = xdgPath(envPublicShareDir, kf.public) + UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, kf.desktop) + UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, kf.downloads) + UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, kf.documents) + UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, kf.music) + UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, kf.pictures) + UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, kf.videos) + UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, kf.templates) + UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, kf.public) } type knownFolders struct { - systemDrive string - systemRoot string - programData string - userProfile string - userProfiles string - roamingAppData string - localAppData string - desktop string - downloads string - documents string - music string - pictures string - videos string - templates string - public string - fonts string - programs string - commonPrograms string + systemDrive string + systemRoot string + programData string + userProfile string + userProfiles string + roamingAppData string + localAppData string + desktop string + downloads string + documents string + music string + pictures string + videos string + templates string + public string + fonts string + programs string + commonPrograms string + programFiles string + programFilesCommon string + userProgramFiles string + userProgramFilesCommon string } func initKnownFolders(home string) *knownFolders { @@ -163,6 +167,30 @@ func initKnownFolders(home string) *knownFolders { nil, []string{filepath.Join(kf.programData, "Microsoft", "Windows", "Start Menu", "Programs")}, ) + kf.programFiles = pathutil.KnownFolder( + windows.FOLDERID_ProgramFiles, + []string{"ProgramFiles"}, + []string{filepath.Join(kf.systemDrive, "Program Files")}, + ) + kf.programFilesCommon = pathutil.KnownFolder( + windows.FOLDERID_ProgramFilesCommon, + nil, + []string{filepath.Join(kf.programFiles, "Common Files")}, + ) + kf.userProgramFiles = pathutil.KnownFolder( + windows.FOLDERID_UserProgramFiles, + nil, + []string{ + filepath.Join(kf.localAppData, "Programs"), + }, + ) + kf.userProgramFilesCommon = pathutil.KnownFolder( + windows.FOLDERID_UserProgramFilesCommon, + nil, + []string{ + filepath.Join(kf.userProgramFiles, "Common"), + }, + ) return kf } diff --git a/vendor/github.com/adrg/xdg/xdg.go b/vendor/github.com/adrg/xdg/xdg.go index 3d33ca6e5..f4f1d4fed 100644 --- a/vendor/github.com/adrg/xdg/xdg.go +++ b/vendor/github.com/adrg/xdg/xdg.go @@ -1,12 +1,13 @@ package xdg import ( - "os" - "path/filepath" - "github.com/adrg/xdg/internal/pathutil" + "github.com/adrg/xdg/internal/userdirs" ) +// UserDirectories defines the locations of well known user directories. +type UserDirectories = userdirs.Directories + var ( // Home contains the path of the user's home directory. Home string @@ -29,7 +30,7 @@ var ( // ConfigHome defines the base directory relative to which user-specific // configuration files should be written. This directory is defined by - // the $XDG_CONFIG_HOME environment variable. If the variable is not + // the $XDG_CONFIG_HOME environment variable. If the variable is // not set, a default equal to $HOME/.config should be used. ConfigHome string @@ -66,6 +67,12 @@ var ( // swapped out to disk. RuntimeDir string + // BinHome defines the base directory relative to which user-specific + // binary files should be written. This directory is defined by + // the non-standard $XDG_BIN_HOME environment variable. If the variable is + // not set, a default equal to $HOME/.local/bin should be used. + BinHome string + // UserDirs defines the locations of well known user directories. UserDirs UserDirectories @@ -88,7 +95,7 @@ func init() { // in the environment. func Reload() { // Initialize home directory. - Home = homeDir() + Home = pathutil.UserHomeDir() // Initialize base and user directories. initDirs(Home) @@ -103,6 +110,7 @@ func Reload() { RuntimeDir = baseDirs.runtime // Set non-standard directories. + BinHome = baseDirs.binHome FontDirs = baseDirs.fonts ApplicationDirs = baseDirs.applications } @@ -153,8 +161,9 @@ func CacheFile(relPath string) (string, error) { // The relPath parameter must contain the name of the runtime file, and // optionally, a set of parent directories (e.g. appname/app.pid). // If the specified directories do not exist, they will be created relative -// to the base runtime directory. On failure, an error containing the -// attempted paths is returned. +// to the base runtime directory. If the base runtime directory does not exist, +// the operating system's temporary directory is used as a fallback. On failure, +// an error containing the attempted paths is returned. func RuntimeFile(relPath string) (string, error) { return baseDirs.runtimeFile(relPath) } @@ -193,26 +202,11 @@ func SearchCacheFile(relPath string) (string, error) { // SearchRuntimeFile searches for the specified file in the runtime search path. // The relPath parameter must contain the name of the runtime file, and -// optionally, a set of parent directories (e.g. appname/app.pid). If the -// file cannot be found, an error specifying the searched path is returned. +// optionally, a set of parent directories (e.g. appname/app.pid). The runtime +// file is also searched in the operating system's temporary directory in order +// to cover cases in which the runtime base directory does not exist or is not +// accessible. If the file cannot be found, an error specifying the searched +// paths is returned. func SearchRuntimeFile(relPath string) (string, error) { return baseDirs.searchRuntimeFile(relPath) } - -func xdgPath(name, defaultPath string) string { - dir := pathutil.ExpandHome(os.Getenv(name), Home) - if dir != "" && filepath.IsAbs(dir) { - return dir - } - - return defaultPath -} - -func xdgPaths(name string, defaultPaths ...string) []string { - dirs := pathutil.Unique(filepath.SplitList(os.Getenv(name)), Home) - if len(dirs) != 0 { - return dirs - } - - return pathutil.Unique(defaultPaths, Home) -} diff --git a/vendor/github.com/buger/jsonparser/.travis.yml b/vendor/github.com/buger/jsonparser/.travis.yml index dbfb7cf98..56f9c9c42 100644 --- a/vendor/github.com/buger/jsonparser/.travis.yml +++ b/vendor/github.com/buger/jsonparser/.travis.yml @@ -3,9 +3,10 @@ arch: - amd64 - ppc64le go: - - 1.7.x - - 1.8.x - - 1.9.x - - 1.10.x - - 1.11.x + - 1.13.x + - 1.14.x + - 1.15.x + - 1.16.x + - 1.17.x + - 1.18.x script: go test -v ./. diff --git a/vendor/github.com/buger/jsonparser/README.md b/vendor/github.com/buger/jsonparser/README.md index d7e0ec397..0b2f1fb03 100644 --- a/vendor/github.com/buger/jsonparser/README.md +++ b/vendor/github.com/buger/jsonparser/README.md @@ -90,10 +90,6 @@ jsonparser.EachKey(data, func(idx int, value []byte, vt jsonparser.ValueType, er // For more information see docs below ``` -## Need to speedup your app? - -I'm available for consulting and can help you push your app performance to the limits. Ping me at: leonsbox@gmail.com. - ## Reference Library API is really simple. You just need the `Get` method to perform any operation. The rest is just helpers around it. diff --git a/vendor/github.com/buger/jsonparser/bytes.go b/vendor/github.com/buger/jsonparser/bytes.go index 0bb0ff395..9d6e701f5 100644 --- a/vendor/github.com/buger/jsonparser/bytes.go +++ b/vendor/github.com/buger/jsonparser/bytes.go @@ -1,11 +1,8 @@ package jsonparser -import ( - bio "bytes" -) - -// minInt64 '-9223372036854775808' is the smallest representable number in int64 -const minInt64 = `9223372036854775808` +const absMinInt64 = 1 << 63 +const maxInt64 = 1<<63 - 1 +const maxUint64 = 1<<64 - 1 // About 2x faster then strconv.ParseInt because it only supports base 10, which is enough for JSON func parseInt(bytes []byte) (v int64, ok bool, overflow bool) { @@ -19,29 +16,32 @@ func parseInt(bytes []byte) (v int64, ok bool, overflow bool) { bytes = bytes[1:] } - var b int64 = 0 + var n uint64 = 0 for _, c := range bytes { - if c >= '0' && c <= '9' { - b = (10 * v) + int64(c-'0') - } else { + if c < '0' || c > '9' { return 0, false, false } - if overflow = (b < v); overflow { - break + if n > maxUint64/10 { + return 0, false, true } - v = b + n *= 10 + n1 := n + uint64(c-'0') + if n1 < n { + return 0, false, true + } + n = n1 } - if overflow { - if neg && bio.Equal(bytes, []byte(minInt64)) { - return b, true, false + if n > maxInt64 { + if neg && n == absMinInt64 { + return -absMinInt64, true, false } return 0, false, true } if neg { - return -v, true, false + return -int64(n), true, false } else { - return v, true, false + return int64(n), true, false } } diff --git a/vendor/github.com/buger/jsonparser/parser.go b/vendor/github.com/buger/jsonparser/parser.go index 14b80bc48..1a4e33722 100644 --- a/vendor/github.com/buger/jsonparser/parser.go +++ b/vendor/github.com/buger/jsonparser/parser.go @@ -18,6 +18,7 @@ var ( MalformedValueError = errors.New("Value looks like Number/Boolean/None, but can't find its end: ',' or '}' symbol") OverflowIntegerError = errors.New("Value is number, but overflowed while parsing") MalformedStringEscapeError = errors.New("Encountered an invalid escape sequence in a string") + NullValueError = errors.New("Value is null") ) // How much stack space to allocate for unescaping JSON strings; if a string longer @@ -49,10 +50,13 @@ func findTokenStart(data []byte, token byte) int { } func findKeyStart(data []byte, key string) (int, error) { - i := 0 + i := nextToken(data) + if i == -1 { + return i, KeyPathNotFoundError + } ln := len(data) - if ln > 0 && (data[0] == '{' || data[0] == '[') { - i = 1 + if ln > 0 && (data[i] == '{' || data[i] == '[') { + i += 1 } var stackbuf [unescapeStackBufSize]byte // stack-allocated array for allocation-free unescaping of small strings @@ -308,7 +312,7 @@ func searchKeys(data []byte, keys ...string) int { case '[': // If we want to get array element by index if keyLevel == level && keys[level][0] == '[' { - var keyLen = len(keys[level]) + keyLen := len(keys[level]) if keyLen < 3 || keys[level][0] != '[' || keys[level][keyLen-1] != ']' { return -1 } @@ -319,7 +323,7 @@ func searchKeys(data []byte, keys ...string) int { var curIdx int var valueFound []byte var valueOffset int - var curI = i + curI := i ArrayEach(data[i:], func(value []byte, dataType ValueType, offset int, err error) { if curIdx == aIdx { valueFound = value @@ -374,12 +378,19 @@ func sameTree(p1, p2 []string) bool { return true } +const stackArraySize = 128 + func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]string) int { var x struct{} - pathFlags := make([]bool, len(paths)) var level, pathsMatched, i int ln := len(data) + pathFlags := make([]bool, stackArraySize)[:] + if len(paths) > cap(pathFlags) { + pathFlags = make([]bool, len(paths))[:] + } + pathFlags = pathFlags[0:len(paths)] + var maxPath int for _, p := range paths { if len(p) > maxPath { @@ -387,7 +398,11 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str } } - pathsBuf := make([]string, maxPath) + pathsBuf := make([]string, stackArraySize)[:] + if maxPath > cap(pathsBuf) { + pathsBuf = make([]string, maxPath)[:] + } + pathsBuf = pathsBuf[0:maxPath] for i < ln { switch data[i] { @@ -484,7 +499,12 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str case '[': var ok bool arrIdxFlags := make(map[int]struct{}) - pIdxFlags := make([]bool, len(paths)) + + pIdxFlags := make([]bool, stackArraySize)[:] + if len(paths) > cap(pIdxFlags) { + pIdxFlags = make([]bool, len(paths))[:] + } + pIdxFlags = pIdxFlags[0:len(paths)] if level < 0 { cb(-1, nil, Unknown, MalformedJsonError) @@ -662,7 +682,6 @@ func calcAllocateSpace(keys []string, setValue []byte, comma, object bool) int { } } - lk += len(setValue) for i := 1; i < len(keys); i++ { if string(keys[i][0]) == "[" { @@ -712,7 +731,7 @@ func Delete(data []byte, keys ...string) []byte { if !array { if len(keys) > 1 { _, _, startOffset, endOffset, err = internalGet(data, keys[:lk-1]...) - if err == KeyPathNotFoundError { + if err != nil { // problem parsing the data return data } @@ -724,7 +743,11 @@ func Delete(data []byte, keys ...string) []byte { return data } keyOffset += startOffset - _, _, _, subEndOffset, _ := internalGet(data[startOffset:endOffset], keys[lk-1]) + var subEndOffset int + _, _, _, subEndOffset, err = internalGet(data[startOffset:endOffset], keys[lk-1]) + if err != nil { + return data + } endOffset = startOffset + subEndOffset tokEnd := tokenEnd(data[endOffset:]) tokStart := findTokenStart(data[:keyOffset], ","[0]) @@ -738,7 +761,7 @@ func Delete(data []byte, keys ...string) []byte { } } else { _, _, keyOffset, endOffset, err = internalGet(data, keys...) - if err == KeyPathNotFoundError { + if err != nil { // problem parsing the data return data } @@ -1178,6 +1201,9 @@ func GetString(data []byte, keys ...string) (val string, err error) { } if t != String { + if t == Null { + return "", NullValueError + } return "", fmt.Errorf("Value is not a string: %s", string(v)) } @@ -1200,6 +1226,9 @@ func GetFloat(data []byte, keys ...string) (val float64, err error) { } if t != Number { + if t == Null { + return 0, NullValueError + } return 0, fmt.Errorf("Value is not a number: %s", string(v)) } @@ -1216,6 +1245,9 @@ func GetInt(data []byte, keys ...string) (val int64, err error) { } if t != Number { + if t == Null { + return 0, NullValueError + } return 0, fmt.Errorf("Value is not a number: %s", string(v)) } @@ -1233,6 +1265,9 @@ func GetBoolean(data []byte, keys ...string) (val bool, err error) { } if t != Boolean { + if t == Null { + return false, NullValueError + } return false, fmt.Errorf("Value is not a boolean: %s", string(v)) } diff --git a/vendor/github.com/Microsoft/go-winio/LICENSE b/vendor/github.com/cli/go-gh/v2/LICENSE similarity index 95% rename from vendor/github.com/Microsoft/go-winio/LICENSE rename to vendor/github.com/cli/go-gh/v2/LICENSE index b8b569d77..af732f027 100644 --- a/vendor/github.com/Microsoft/go-winio/LICENSE +++ b/vendor/github.com/cli/go-gh/v2/LICENSE @@ -1,6 +1,6 @@ -The MIT License (MIT) +MIT License -Copyright (c) 2015 Microsoft +Copyright (c) 2021 GitHub Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/vendor/github.com/cli/go-gh/v2/internal/set/string_set.go b/vendor/github.com/cli/go-gh/v2/internal/set/string_set.go new file mode 100644 index 000000000..8be4492f1 --- /dev/null +++ b/vendor/github.com/cli/go-gh/v2/internal/set/string_set.go @@ -0,0 +1,70 @@ +package set + +var exists = struct{}{} + +type stringSet struct { + v []string + m map[string]struct{} +} + +func NewStringSet() *stringSet { + s := &stringSet{} + s.m = make(map[string]struct{}) + s.v = []string{} + return s +} + +func (s *stringSet) Add(value string) { + if s.Contains(value) { + return + } + s.m[value] = exists + s.v = append(s.v, value) +} + +func (s *stringSet) AddValues(values []string) { + for _, v := range values { + s.Add(v) + } +} + +func (s *stringSet) Remove(value string) { + if !s.Contains(value) { + return + } + delete(s.m, value) + s.v = sliceWithout(s.v, value) +} + +func sliceWithout(s []string, v string) []string { + idx := -1 + for i, item := range s { + if item == v { + idx = i + break + } + } + if idx < 0 { + return s + } + return append(s[:idx], s[idx+1:]...) +} + +func (s *stringSet) RemoveValues(values []string) { + for _, v := range values { + s.Remove(v) + } +} + +func (s *stringSet) Contains(value string) bool { + _, c := s.m[value] + return c +} + +func (s *stringSet) Len() int { + return len(s.m) +} + +func (s *stringSet) ToSlice() []string { + return s.v +} diff --git a/vendor/github.com/cli/go-gh/v2/internal/yamlmap/yaml_map.go b/vendor/github.com/cli/go-gh/v2/internal/yamlmap/yaml_map.go new file mode 100644 index 000000000..b4725d3ee --- /dev/null +++ b/vendor/github.com/cli/go-gh/v2/internal/yamlmap/yaml_map.go @@ -0,0 +1,210 @@ +// Package yamlmap is a wrapper of gopkg.in/yaml.v3 for interacting +// with yaml data as if it were a map. +package yamlmap + +import ( + "errors" + + "gopkg.in/yaml.v3" +) + +const ( + modified = "modifed" +) + +type Map struct { + *yaml.Node +} + +var ErrNotFound = errors.New("not found") +var ErrInvalidYaml = errors.New("invalid yaml") +var ErrInvalidFormat = errors.New("invalid format") + +func StringValue(value string) *Map { + return &Map{&yaml.Node{ + Kind: yaml.ScalarNode, + Tag: "!!str", + Value: value, + }} +} + +func MapValue() *Map { + return &Map{&yaml.Node{ + Kind: yaml.MappingNode, + Tag: "!!map", + }} +} + +func NullValue() *Map { + return &Map{&yaml.Node{ + Kind: yaml.ScalarNode, + Tag: "!!null", + }} +} + +func Unmarshal(data []byte) (*Map, error) { + var root yaml.Node + err := yaml.Unmarshal(data, &root) + if err != nil { + return nil, ErrInvalidYaml + } + if len(root.Content) == 0 { + return MapValue(), nil + } + if root.Content[0].Kind != yaml.MappingNode { + return nil, ErrInvalidFormat + } + return &Map{root.Content[0]}, nil +} + +func Marshal(m *Map) ([]byte, error) { + return yaml.Marshal(m.Node) +} + +func (m *Map) AddEntry(key string, value *Map) { + keyNode := &yaml.Node{ + Kind: yaml.ScalarNode, + Tag: "!!str", + Value: key, + } + m.Content = append(m.Content, keyNode, value.Node) + m.SetModified() +} + +func (m *Map) Empty() bool { + return len(m.Content) == 0 +} + +func (m *Map) FindEntry(key string) (*Map, error) { + // Note: The content slice of a yamlMap looks like [key1, value1, key2, value2, ...]. + // When iterating over the content slice we only want to compare the keys of the yamlMap. + for i, v := range m.Content { + if i%2 != 0 { + continue + } + if v.Value == key { + if i+1 < len(m.Content) { + return &Map{m.Content[i+1]}, nil + } + } + } + return nil, ErrNotFound +} + +func (m *Map) Keys() []string { + // Note: The content slice of a yamlMap looks like [key1, value1, key2, value2, ...]. + // When iterating over the content slice we only want to select the keys of the yamlMap. + keys := []string{} + for i, v := range m.Content { + if i%2 != 0 { + continue + } + keys = append(keys, v.Value) + } + return keys +} + +func (m *Map) RemoveEntry(key string) error { + // Note: The content slice of a yamlMap looks like [key1, value1, key2, value2, ...]. + // When iterating over the content slice we only want to compare the keys of the yamlMap. + // If we find they key to remove, remove the key and its value from the content slice. + found, skipNext := false, false + newContent := []*yaml.Node{} + for i, v := range m.Content { + if skipNext { + skipNext = false + continue + } + if i%2 != 0 || v.Value != key { + newContent = append(newContent, v) + } else { + found = true + skipNext = true + m.SetModified() + } + } + if !found { + return ErrNotFound + } + m.Content = newContent + return nil +} + +func (m *Map) SetEntry(key string, value *Map) { + // Note: The content slice of a yamlMap looks like [key1, value1, key2, value2, ...]. + // When iterating over the content slice we only want to compare the keys of the yamlMap. + // If we find they key to set, set the next item in the content slice to the new value. + m.SetModified() + for i, v := range m.Content { + if i%2 != 0 || v.Value != key { + continue + } + if v.Value == key { + if i+1 < len(m.Content) { + m.Content[i+1] = value.Node + return + } + } + } + m.AddEntry(key, value) +} + +// SetModified marks the map as modified. +// +// Note: This is a hack to introduce the concept of modified/unmodified +// on top of gopkg.in/yaml.v3. This works by setting the Value property +// of a MappingNode to a specific value and then later checking if the +// node's Value property is that specific value. When a MappingNode gets +// output as a string the Value property is not used, thus changing it +// has no impact for our purposes. +func (m *Map) SetModified() { + // Can not mark a non-mapping node as modified + if m.Node.Kind != yaml.MappingNode && m.Node.Tag == "!!null" { + m.Node.Kind = yaml.MappingNode + m.Node.Tag = "!!map" + } + if m.Node.Kind == yaml.MappingNode { + m.Node.Value = modified + } +} + +// SetUnmodified traverses the map using BFS to set all nodes as unmodified. +func (m *Map) SetUnmodified() { + i := 0 + queue := []*yaml.Node{m.Node} + for i < len(queue) { + q := queue[i] + i = i + 1 + if q.Kind != yaml.MappingNode { + continue + } + q.Value = "" + queue = append(queue, q.Content...) + } +} + +// IsModified traverses the map using BFS to search for any nodes that have been modified. +func (m *Map) IsModified() bool { + i := 0 + queue := []*yaml.Node{m.Node} + for i < len(queue) { + q := queue[i] + i = i + 1 + if q.Kind != yaml.MappingNode { + continue + } + if q.Value == modified { + return true + } + queue = append(queue, q.Content...) + } + return false +} + +func (m *Map) String() string { + data, err := Marshal(m) + if err != nil { + return "" + } + return string(data) +} diff --git a/vendor/github.com/cli/go-gh/v2/pkg/auth/auth.go b/vendor/github.com/cli/go-gh/v2/pkg/auth/auth.go new file mode 100644 index 000000000..4c54642f3 --- /dev/null +++ b/vendor/github.com/cli/go-gh/v2/pkg/auth/auth.go @@ -0,0 +1,203 @@ +// Package auth is a set of functions for retrieving authentication tokens +// and authenticated hosts. +package auth + +import ( + "fmt" + "os" + "os/exec" + "strings" + + "github.com/cli/go-gh/v2/internal/set" + "github.com/cli/go-gh/v2/pkg/config" + "github.com/cli/safeexec" +) + +const ( + codespaces = "CODESPACES" + defaultSource = "default" + ghEnterpriseToken = "GH_ENTERPRISE_TOKEN" + ghHost = "GH_HOST" + ghToken = "GH_TOKEN" + github = "github.com" + githubEnterpriseToken = "GITHUB_ENTERPRISE_TOKEN" + githubToken = "GITHUB_TOKEN" + hostsKey = "hosts" + localhost = "github.localhost" + oauthToken = "oauth_token" + tenancyHost = "ghe.com" // TenancyHost is the domain suffix of a tenancy GitHub instance. +) + +// TokenForHost retrieves an authentication token and the source of that token for the specified +// host. The source can be either an environment variable, configuration file, or the system +// keyring. In the latter case, this shells out to "gh auth token" to obtain the token. +// +// Returns "", "default" if no applicable token is found. +func TokenForHost(host string) (string, string) { + if token, source := TokenFromEnvOrConfig(host); token != "" { + return token, source + } + + ghExe := os.Getenv("GH_PATH") + if ghExe == "" { + ghExe, _ = safeexec.LookPath("gh") + } + + if ghExe != "" { + if token, source := tokenFromGh(ghExe, host); token != "" { + return token, source + } + } + + return "", defaultSource +} + +// TokenFromEnvOrConfig retrieves an authentication token from environment variables or the config +// file as fallback, but does not support reading the token from system keyring. Most consumers +// should use TokenForHost. +func TokenFromEnvOrConfig(host string) (string, string) { + cfg, _ := config.Read(nil) + return tokenForHost(cfg, host) +} + +func tokenForHost(cfg *config.Config, host string) (string, string) { + normalizedHost := NormalizeHostname(host) + // This code is currently the exact opposite of IsEnterprise. However, we have chosen + // to write it separately, directly in line, because it is much clearer in the exact + // scenarios that we expect to use GH_TOKEN and GITHUB_TOKEN. + if normalizedHost == github || IsTenancy(normalizedHost) || normalizedHost == localhost { + if token := os.Getenv(ghToken); token != "" { + return token, ghToken + } + + if token := os.Getenv(githubToken); token != "" { + return token, githubToken + } + } else { + if token := os.Getenv(ghEnterpriseToken); token != "" { + return token, ghEnterpriseToken + } + + if token := os.Getenv(githubEnterpriseToken); token != "" { + return token, githubEnterpriseToken + } + } + + // If config is nil, something has failed much earlier and it's probably + // more correct to panic because we don't expect to support anything + // where the config isn't available, but that would be a breaking change, + // so it's worth thinking about carefully, if we wanted to rework this. + if cfg == nil { + return "", defaultSource + } + + token, err := cfg.Get([]string{hostsKey, normalizedHost, oauthToken}) + if err != nil { + return "", defaultSource + } + + return token, oauthToken +} + +func tokenFromGh(path string, host string) (string, string) { + cmd := exec.Command(path, "auth", "token", "--secure-storage", "--hostname", host) + result, err := cmd.Output() + if err != nil { + return "", "gh" + } + return strings.TrimSpace(string(result)), "gh" +} + +// KnownHosts retrieves a list of hosts that have corresponding +// authentication tokens, either from environment variables +// or from the configuration file. +// Returns an empty string slice if no hosts are found. +func KnownHosts() []string { + cfg, _ := config.Read(nil) + return knownHosts(cfg) +} + +func knownHosts(cfg *config.Config) []string { + hosts := set.NewStringSet() + if host := os.Getenv(ghHost); host != "" { + hosts.Add(host) + } + if token, _ := tokenForHost(cfg, github); token != "" { + hosts.Add(github) + } + if cfg != nil { + keys, err := cfg.Keys([]string{hostsKey}) + if err == nil { + hosts.AddValues(keys) + } + } + return hosts.ToSlice() +} + +// DefaultHost retrieves an authenticated host and the source of host. +// The source can be either an environment variable or from the +// configuration file. +// Returns "github.com", "default" if no viable host is found. +func DefaultHost() (string, string) { + cfg, _ := config.Read(nil) + return defaultHost(cfg) +} + +func defaultHost(cfg *config.Config) (string, string) { + if host := os.Getenv(ghHost); host != "" { + return host, ghHost + } + if cfg != nil { + keys, err := cfg.Keys([]string{hostsKey}) + if err == nil && len(keys) == 1 { + return keys[0], hostsKey + } + } + return github, defaultSource +} + +// IsEnterprise determines if a provided host is a GitHub Enterprise Server instance, +// rather than GitHub.com, a tenancy GitHub instance, or github.localhost. +func IsEnterprise(host string) bool { + // Note that if you are making changes here, you should also consider making the equivalent + // in tokenForHost, which is the exact opposite of this function. + normalizedHost := NormalizeHostname(host) + return normalizedHost != github && normalizedHost != localhost && !IsTenancy(normalizedHost) +} + +// IsTenancy determines if a provided host is a tenancy GitHub instance, +// rather than GitHub.com or a GitHub Enterprise Server instance. +func IsTenancy(host string) bool { + normalizedHost := NormalizeHostname(host) + return strings.HasSuffix(normalizedHost, "."+tenancyHost) +} + +// NormalizeHostname ensures the host matches the values used throughout +// the rest of the codebase with respect to hostnames. These are github, +// localhost, and tenancyHost. +func NormalizeHostname(host string) string { + hostname := strings.ToLower(host) + if strings.HasSuffix(hostname, "."+github) { + return github + } + if strings.HasSuffix(hostname, "."+localhost) { + return localhost + } + // This has been copied over from the cli/cli NormalizeHostname function + // to ensure compatible behaviour but we don't fully understand when or + // why it would be useful here. We can't see what harm will come of + // duplicating the logic. + if before, found := cutSuffix(hostname, "."+tenancyHost); found { + idx := strings.LastIndex(before, ".") + return fmt.Sprintf("%s.%s", before[idx+1:], tenancyHost) + } + return hostname +} + +// Backport strings.CutSuffix from Go 1.20. +func cutSuffix(s, suffix string) (string, bool) { + if !strings.HasSuffix(s, suffix) { + return s, false + } + return s[:len(s)-len(suffix)], true +} diff --git a/vendor/github.com/cli/go-gh/v2/pkg/config/config.go b/vendor/github.com/cli/go-gh/v2/pkg/config/config.go new file mode 100644 index 000000000..9789a06f8 --- /dev/null +++ b/vendor/github.com/cli/go-gh/v2/pkg/config/config.go @@ -0,0 +1,344 @@ +// Package config is a set of types for interacting with the gh configuration files. +// Note: This package is intended for use only in gh, any other use cases are subject +// to breakage and non-backwards compatible updates. +package config + +import ( + "errors" + "io" + "os" + "path/filepath" + "runtime" + "sync" + + "github.com/cli/go-gh/v2/internal/yamlmap" +) + +const ( + appData = "AppData" + ghConfigDir = "GH_CONFIG_DIR" + localAppData = "LocalAppData" + xdgConfigHome = "XDG_CONFIG_HOME" + xdgDataHome = "XDG_DATA_HOME" + xdgStateHome = "XDG_STATE_HOME" + xdgCacheHome = "XDG_CACHE_HOME" +) + +var ( + cfg *Config + once sync.Once + loadErr error +) + +// Config is a in memory representation of the gh configuration files. +// It can be thought of as map where entries consist of a key that +// correspond to either a string value or a map value, allowing for +// multi-level maps. +type Config struct { + entries *yamlmap.Map + mu sync.RWMutex +} + +// Get a string value from a Config. +// The keys argument is a sequence of key values so that nested +// entries can be retrieved. A undefined string will be returned +// if trying to retrieve a key that corresponds to a map value. +// Returns "", KeyNotFoundError if any of the keys can not be found. +func (c *Config) Get(keys []string) (string, error) { + c.mu.RLock() + defer c.mu.RUnlock() + m := c.entries + for _, key := range keys { + var err error + m, err = m.FindEntry(key) + if err != nil { + return "", &KeyNotFoundError{key} + } + } + return m.Value, nil +} + +// Keys enumerates a Config's keys. +// The keys argument is a sequence of key values so that nested +// map values can be have their keys enumerated. +// Returns nil, KeyNotFoundError if any of the keys can not be found. +func (c *Config) Keys(keys []string) ([]string, error) { + c.mu.RLock() + defer c.mu.RUnlock() + m := c.entries + for _, key := range keys { + var err error + m, err = m.FindEntry(key) + if err != nil { + return nil, &KeyNotFoundError{key} + } + } + return m.Keys(), nil +} + +// Remove an entry from a Config. +// The keys argument is a sequence of key values so that nested +// entries can be removed. Removing an entry that has nested +// entries removes those also. +// Returns KeyNotFoundError if any of the keys can not be found. +func (c *Config) Remove(keys []string) error { + c.mu.Lock() + defer c.mu.Unlock() + m := c.entries + for i := 0; i < len(keys)-1; i++ { + var err error + key := keys[i] + m, err = m.FindEntry(key) + if err != nil { + return &KeyNotFoundError{key} + } + } + err := m.RemoveEntry(keys[len(keys)-1]) + if err != nil { + return &KeyNotFoundError{keys[len(keys)-1]} + } + return nil +} + +// Set a string value in a Config. +// The keys argument is a sequence of key values so that nested +// entries can be set. If any of the keys do not exist they will +// be created. If the string value to be set is empty it will be +// represented as null not an empty string when written. +// +// var c *Config +// c.Set([]string{"key"}, "") +// Write(c) // writes `key: ` not `key: ""` +func (c *Config) Set(keys []string, value string) { + c.mu.Lock() + defer c.mu.Unlock() + m := c.entries + for i := 0; i < len(keys)-1; i++ { + key := keys[i] + entry, err := m.FindEntry(key) + if err != nil { + entry = yamlmap.MapValue() + m.AddEntry(key, entry) + } + m = entry + } + val := yamlmap.StringValue(value) + if value == "" { + val = yamlmap.NullValue() + } + m.SetEntry(keys[len(keys)-1], val) +} + +func (c *Config) deepCopy() *Config { + return ReadFromString(c.entries.String()) +} + +// Read gh configuration files from the local file system and +// returns a Config. A copy of the fallback configuration will +// be returned when there are no configuration files to load. +// If there are no configuration files and no fallback configuration +// an empty configuration will be returned. +var Read = func(fallback *Config) (*Config, error) { + once.Do(func() { + cfg, loadErr = load(generalConfigFile(), hostsConfigFile(), fallback) + }) + return cfg, loadErr +} + +// ReadFromString takes a yaml string and returns a Config. +func ReadFromString(str string) *Config { + m, _ := mapFromString(str) + if m == nil { + m = yamlmap.MapValue() + } + return &Config{entries: m} +} + +// Write gh configuration files to the local file system. +// It will only write gh configuration files that have been modified +// since last being read. +func Write(c *Config) error { + c.mu.Lock() + defer c.mu.Unlock() + hosts, err := c.entries.FindEntry("hosts") + if err == nil && hosts.IsModified() { + err := writeFile(hostsConfigFile(), []byte(hosts.String())) + if err != nil { + return err + } + hosts.SetUnmodified() + } + + if c.entries.IsModified() { + // Hosts gets written to a different file above so remove it + // before writing and add it back in after writing. + hostsMap, hostsErr := c.entries.FindEntry("hosts") + if hostsErr == nil { + _ = c.entries.RemoveEntry("hosts") + } + err := writeFile(generalConfigFile(), []byte(c.entries.String())) + if err != nil { + return err + } + c.entries.SetUnmodified() + if hostsErr == nil { + c.entries.AddEntry("hosts", hostsMap) + } + } + + return nil +} + +func load(generalFilePath, hostsFilePath string, fallback *Config) (*Config, error) { + generalMap, err := mapFromFile(generalFilePath) + if err != nil && !os.IsNotExist(err) { + if errors.Is(err, yamlmap.ErrInvalidYaml) || + errors.Is(err, yamlmap.ErrInvalidFormat) { + return nil, &InvalidConfigFileError{Path: generalFilePath, Err: err} + } + return nil, err + } + + if generalMap == nil { + generalMap = yamlmap.MapValue() + } + + hostsMap, err := mapFromFile(hostsFilePath) + if err != nil && !os.IsNotExist(err) { + if errors.Is(err, yamlmap.ErrInvalidYaml) || + errors.Is(err, yamlmap.ErrInvalidFormat) { + return nil, &InvalidConfigFileError{Path: hostsFilePath, Err: err} + } + return nil, err + } + + if hostsMap != nil && !hostsMap.Empty() { + generalMap.AddEntry("hosts", hostsMap) + generalMap.SetUnmodified() + } + + if generalMap.Empty() && fallback != nil { + return fallback.deepCopy(), nil + } + + return &Config{entries: generalMap}, nil +} + +func generalConfigFile() string { + return filepath.Join(ConfigDir(), "config.yml") +} + +func hostsConfigFile() string { + return filepath.Join(ConfigDir(), "hosts.yml") +} + +func mapFromFile(filename string) (*yamlmap.Map, error) { + data, err := readFile(filename) + if err != nil { + return nil, err + } + return yamlmap.Unmarshal(data) +} + +func mapFromString(str string) (*yamlmap.Map, error) { + return yamlmap.Unmarshal([]byte(str)) +} + +// ConfigDir returns the path to the configuration directory. +// +// Config path precedence: GH_CONFIG_DIR, XDG_CONFIG_HOME, AppData (windows only), HOME. +func ConfigDir() string { + var path string + if a := os.Getenv(ghConfigDir); a != "" { + path = a + } else if b := os.Getenv(xdgConfigHome); b != "" { + path = filepath.Join(b, "gh") + } else if c := os.Getenv(appData); runtime.GOOS == "windows" && c != "" { + path = filepath.Join(c, "GitHub CLI") + } else { + d, _ := os.UserHomeDir() + path = filepath.Join(d, ".config", "gh") + } + return path +} + +// StateDir returns the path to the state directory. +// +// State path precedence: XDG_STATE_HOME, LocalAppData (windows only), HOME. +func StateDir() string { + var path string + if a := os.Getenv(xdgStateHome); a != "" { + path = filepath.Join(a, "gh") + } else if b := os.Getenv(localAppData); runtime.GOOS == "windows" && b != "" { + path = filepath.Join(b, "GitHub CLI") + } else { + c, _ := os.UserHomeDir() + path = filepath.Join(c, ".local", "state", "gh") + } + return path +} + +// DataDir returns the path to the data directory. +// +// Data path precedence: XDG_DATA_HOME, LocalAppData (windows only), HOME. +func DataDir() string { + var path string + if a := os.Getenv(xdgDataHome); a != "" { + path = filepath.Join(a, "gh") + } else if b := os.Getenv(localAppData); runtime.GOOS == "windows" && b != "" { + path = filepath.Join(b, "GitHub CLI") + } else { + c, _ := os.UserHomeDir() + path = filepath.Join(c, ".local", "share", "gh") + } + return path +} + +// CacheDir returns the path to the cache directory. +// +// Cache path precedence: XDG_CACHE_HOME, LocalAppData (windows only), HOME, legacy gh-cli-cache. +func CacheDir() string { + if a := os.Getenv(xdgCacheHome); a != "" { + return filepath.Join(a, "gh") + } else if b := os.Getenv(localAppData); runtime.GOOS == "windows" && b != "" { + return filepath.Join(b, "GitHub CLI") + } else if c, err := os.UserHomeDir(); err == nil { + return filepath.Join(c, ".cache", "gh") + } else { + // Note that this has a minor security issue because /tmp is world-writeable. + // As such, it is possible for other users on a shared system to overwrite cached data. + // The practical risk of this is low, but it's worth calling out as a risk. + // I've included this here for backwards compatibility but we should consider removing it. + return filepath.Join(os.TempDir(), "gh-cli-cache") + } +} + +func readFile(filename string) ([]byte, error) { + f, err := os.Open(filename) + if err != nil { + return nil, err + } + defer f.Close() + data, err := io.ReadAll(f) + if err != nil { + return nil, err + } + return data, nil +} + +func writeFile(filename string, data []byte) (writeErr error) { + if writeErr = os.MkdirAll(filepath.Dir(filename), 0771); writeErr != nil { + return + } + var file *os.File + if file, writeErr = os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600); writeErr != nil { + return + } + defer func() { + if err := file.Close(); writeErr == nil && err != nil { + writeErr = err + } + }() + _, writeErr = file.Write(data) + return +} diff --git a/vendor/github.com/cli/go-gh/v2/pkg/config/errors.go b/vendor/github.com/cli/go-gh/v2/pkg/config/errors.go new file mode 100644 index 000000000..f30e9c9a4 --- /dev/null +++ b/vendor/github.com/cli/go-gh/v2/pkg/config/errors.go @@ -0,0 +1,32 @@ +package config + +import ( + "fmt" +) + +// InvalidConfigFileError represents an error when trying to read a config file. +type InvalidConfigFileError struct { + Path string + Err error +} + +// Error allows InvalidConfigFileError to satisfy error interface. +func (e *InvalidConfigFileError) Error() string { + return fmt.Sprintf("invalid config file %s: %s", e.Path, e.Err) +} + +// Unwrap allows InvalidConfigFileError to be unwrapped. +func (e *InvalidConfigFileError) Unwrap() error { + return e.Err +} + +// KeyNotFoundError represents an error when trying to find a config key +// that does not exist. +type KeyNotFoundError struct { + Key string +} + +// Error allows KeyNotFoundError to satisfy error interface. +func (e *KeyNotFoundError) Error() string { + return fmt.Sprintf("could not find key %q", e.Key) +} diff --git a/vendor/github.com/cli/safeexec/LICENSE b/vendor/github.com/cli/safeexec/LICENSE new file mode 100644 index 000000000..ca498575a --- /dev/null +++ b/vendor/github.com/cli/safeexec/LICENSE @@ -0,0 +1,25 @@ +BSD 2-Clause License + +Copyright (c) 2020, GitHub Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/cli/safeexec/README.md b/vendor/github.com/cli/safeexec/README.md new file mode 100644 index 000000000..4ff1c2aca --- /dev/null +++ b/vendor/github.com/cli/safeexec/README.md @@ -0,0 +1,48 @@ +# safeexec + +A Go module that provides a stabler alternative to `exec.LookPath()` that: +- Avoids a Windows security risk of executing commands found in the current directory; and +- Allows executing commands found in PATH, even if they come from relative PATH entries. + +This is an alternative to [`golang.org/x/sys/execabs`](https://pkg.go.dev/golang.org/x/sys/execabs). + +## Usage +```go +import ( + "os/exec" + "github.com/cli/safeexec" +) + +func gitStatus() error { + gitBin, err := safeexec.LookPath("git") + if err != nil { + return err + } + cmd := exec.Command(gitBin, "status") + return cmd.Run() +} +``` + +## Background +### Windows security vulnerability with Go <= 1.18 +Go 1.18 (and older) standard library has a security vulnerability when executing programs: +```go +import "os/exec" + +func gitStatus() error { + // On Windows, this will result in `.\git.exe` or `.\git.bat` being executed + // if either were found in the current working directory. + cmd := exec.Command("git", "status") + return cmd.Run() +} +``` + +For historic reasons, Go used to implicitly [include the current directory](https://github.com/golang/go/issues/38736) in the PATH resolution on Windows. The `safeexec` package avoids searching the current directory on Windows. + +### Relative PATH entries with Go 1.19+ + +Go 1.19 (and newer) standard library [throws an error](https://github.com/golang/go/issues/43724) if `exec.LookPath("git")` resolved to an executable relative to the current directory. This can happen on other platforms if the PATH environment variable contains relative entries, e.g. `PATH=./bin:$PATH`. The `safeexec` package allows respecting relative PATH entries as it assumes that the responsibility for keeping PATH safe lies outside of the Go program. + +## TODO + +Ideally, this module would also provide `exec.Command()` and `exec.CommandContext()` equivalents that delegate to the patched version of `LookPath`. However, this doesn't seem possible since `LookPath` may return an error, while `exec.Command/CommandContext()` themselves do not return an error. In the standard library, the resulting `exec.Cmd` struct stores the LookPath error in a private field, but that functionality isn't available to us. diff --git a/vendor/github.com/cli/safeexec/lookpath.go b/vendor/github.com/cli/safeexec/lookpath.go new file mode 100644 index 000000000..e649ca7d1 --- /dev/null +++ b/vendor/github.com/cli/safeexec/lookpath.go @@ -0,0 +1,17 @@ +//go:build !windows && go1.19 +// +build !windows,go1.19 + +package safeexec + +import ( + "errors" + "os/exec" +) + +func LookPath(file string) (string, error) { + path, err := exec.LookPath(file) + if errors.Is(err, exec.ErrDot) { + return path, nil + } + return path, err +} diff --git a/vendor/github.com/cli/safeexec/lookpath_1.18.go b/vendor/github.com/cli/safeexec/lookpath_1.18.go new file mode 100644 index 000000000..bb4a27e4f --- /dev/null +++ b/vendor/github.com/cli/safeexec/lookpath_1.18.go @@ -0,0 +1,10 @@ +//go:build !windows && !go1.19 +// +build !windows,!go1.19 + +package safeexec + +import "os/exec" + +func LookPath(file string) (string, error) { + return exec.LookPath(file) +} diff --git a/vendor/github.com/cli/safeexec/lookpath_windows.go b/vendor/github.com/cli/safeexec/lookpath_windows.go new file mode 100644 index 000000000..19b3e52f7 --- /dev/null +++ b/vendor/github.com/cli/safeexec/lookpath_windows.go @@ -0,0 +1,120 @@ +// Copyright (c) 2009 The Go Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Package safeexec provides alternatives for exec package functions to avoid +// accidentally executing binaries found in the current working directory on +// Windows. +package safeexec + +import ( + "os" + "os/exec" + "path/filepath" + "strings" +) + +func chkStat(file string) error { + d, err := os.Stat(file) + if err != nil { + return err + } + if d.IsDir() { + return os.ErrPermission + } + return nil +} + +func hasExt(file string) bool { + i := strings.LastIndex(file, ".") + if i < 0 { + return false + } + return strings.LastIndexAny(file, `:\/`) < i +} + +func findExecutable(file string, exts []string) (string, error) { + if len(exts) == 0 { + return file, chkStat(file) + } + if hasExt(file) { + if chkStat(file) == nil { + return file, nil + } + } + for _, e := range exts { + if f := file + e; chkStat(f) == nil { + return f, nil + } + } + return "", os.ErrNotExist +} + +// LookPath searches for an executable named file in the +// directories named by the PATH environment variable. +// If file contains a slash, it is tried directly and the PATH is not consulted. +// LookPath also uses PATHEXT environment variable to match +// a suitable candidate. +// The result may be an absolute path or a path relative to the current directory. +func LookPath(file string) (string, error) { + var exts []string + x := os.Getenv(`PATHEXT`) + if x != "" { + for _, e := range strings.Split(strings.ToLower(x), `;`) { + if e == "" { + continue + } + if e[0] != '.' { + e = "." + e + } + exts = append(exts, e) + } + } else { + exts = []string{".com", ".exe", ".bat", ".cmd"} + } + + if strings.ContainsAny(file, `:\/`) { + if f, err := findExecutable(file, exts); err == nil { + return f, nil + } else { + return "", &exec.Error{file, err} + } + } + + // https://github.com/golang/go/issues/38736 + // if f, err := findExecutable(filepath.Join(".", file), exts); err == nil { + // return f, nil + // } + + path := os.Getenv("path") + for _, dir := range filepath.SplitList(path) { + if f, err := findExecutable(filepath.Join(dir, file), exts); err == nil { + return f, nil + } + } + return "", &exec.Error{file, exec.ErrNotFound} +} diff --git a/vendor/github.com/clipperhouse/displaywidth/.gitignore b/vendor/github.com/clipperhouse/displaywidth/.gitignore new file mode 100644 index 000000000..b356d43c6 --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +*.out +*.test diff --git a/vendor/github.com/clipperhouse/displaywidth/AGENTS.md b/vendor/github.com/clipperhouse/displaywidth/AGENTS.md new file mode 100644 index 000000000..9ae951b25 --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/AGENTS.md @@ -0,0 +1,51 @@ +The goals and overview of this package can be found in the README.md file, +start by reading that. + +The goal of this package is to determine the display (column) width of a +string, UTF-8 bytes, or runes, as would happen in a monospace font, especially +in a terminal. + +When troubleshooting, write Go unit tests instead of executing debug scripts. +The tests can return whatever logs or output you need. If those tests are +only for temporary troubleshooting, clean up the tests after the debugging is +done. + +(Separate executable debugging scripts are messy, tend to have conflicting +dependencies and are hard to cleanup.) + +If you make changes to the trie generation in internal/gen, it can be invoked +by running `go generate` from the top package directory. + +## Pull Requests and branches + +For PRs (pull requests), you can use the gh CLI tool. Compare the current branch with main. Reviewing a PR and reviewing a branch are about the same, but the PR may add context. + +Understand the goals of the PR. Note any API changes, especially breaking changes. + +Look for thoroughness of tests, as well as GoDoc comments. + +Retrieve and consider the comments on the PR, which may have come from GitHub Copilot or Cursor BugBot. Think like GitHub Copilot or Cursor BugBot. + +Offer to optionally post a brief summary of the review to the PR, via the gh CLI tool. + +## Tagged Go releases + +If I ask you whether we are ready to release, this means a tagged Go release on the main branch. Go releases are git tagged with a version number. + +Review the changes since the last release, i.e. the previous git tag. Ensure that the changes are complete and correct. Identify new features, bug fixes, and performance improvements. + +Identify breaking changes, especially API changes. + +Ensure good test coverage. Look for performance changes, especially performance regressions, by running benchmarks against the previous release. + +Ensure that the documentation in READMEs and GoDocs are complete, correct and consistent. + +## Comparisons to go-runewidth + +We originally attempted to make this package compatible with go-runewidth. +However, we found that there were too many differences in the handling of +certain characters and properties. + +We believe, preliminarily, that our choices are more correct and complete, +by using more complete categories such as Unicode Cf (format) for zero-width +and Mn (Nonspacing_Mark) for combining marks. diff --git a/vendor/github.com/clipperhouse/displaywidth/CHANGELOG.md b/vendor/github.com/clipperhouse/displaywidth/CHANGELOG.md new file mode 100644 index 000000000..8c6efc10d --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/CHANGELOG.md @@ -0,0 +1,129 @@ +# Changelog + +## [0.11.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.10.0...v0.11.0) + +### Added +- New `ControlSequences8Bit` option to treat 8-bit ECMA-48 (C1) escape sequences as zero-width. (#22) + +### Changed +- Upgraded uax29 dependency to v2.7.0 for 8-bit escape sequence support in the grapheme iterator. +- Truncation now validates that preserved trailing escape sequences are zero-width, preventing edge cases where non-zero-width sequences could leak into output. + +### Note +- `ControlSequences8Bit` is deliberately ignored by `TruncateString` and `TruncateBytes`, because C1 byte values (0x80–0x9F) overlap with UTF-8 multi-byte encoding. + +## [0.10.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.9.0...v0.10.0) + +### Added +- New `ControlSequences` option to treat ECMA-48/ANSI escape sequences as zero-width. (#20) +- `TruncateString` and `TruncateBytes` now preserve trailing ANSI escape sequences (such as SGR resets) when `ControlSequences` is true, preventing color bleed in terminal output. + +### Changed +- Removed `stringish` dependency; generic type constraints are now inline `~string | []byte`. +- Upgraded uax29 dependency to v2.6.0 for ANSI escape sequence support in the grapheme iterator. + +## [0.9.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.8.0...v0.9.0) + +### Changed +- Unicode 17 support: East Asian Width and emoji data updated to Unicode 17.0.0. (#18) +- Upgraded uax29 dependency to v2.5.0 (Unicode 17 grapheme segmentation). + +## [0.8.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.7.0...v0.8.0) + +### Changed +- Performance: ASCII fast path that applies to any run of printable + ASCII. 2x-10x faster for ASCII text vs v0.7.0. (#16) +- Upgraded uax29 dependency to v2.4.0 for Unicode 16 support. Text that includes + Indic_Conjunct_Break may segment differently (and more correctly). (#15) + +## [0.7.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.6.2...v0.7.0) + +### Added +- New `TruncateString` and `TruncateBytes` methods to truncate strings to a + maximum display width, with optional tail (like an ellipsis). (#13) + +## [0.6.2] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.6.1...v0.6.2) + +### Changed +- Internal: reduced property categories for simpler trie. + +## [0.6.1] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.6.0...v0.6.1) + +### Changed +- Perf improvements: replaced the ASCII lookup table with a simple + function. A bit more cache-friendly. More inlining. +- Bug fix: single regional indicators are now treated as width 2, since that + is what actual terminals do. + +## [0.6.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.5.0...v0.6.0) + +### Added +- New `StringGraphemes` and `BytesGraphemes` methods, for iterating over the +widths of grapheme clusters. + +### Changed +- Fast ASCII lookups + +## [0.5.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.4.1...v0.5.0) + +### Added +- Unicode 16 support +- Improved emoji presentation handling per Unicode TR51 + +### Changed +- Corrected VS15 (U+FE0E) handling: now preserves base character width (no-op) per Unicode TR51 +- Performance optimizations: reduced property lookups + +### Fixed +- VS15 variation selector now correctly preserves base character width instead of forcing width 1 + +## [0.4.1] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.4.0...v0.4.1) + +### Changed +- Updated uax29 dependency +- Improved flag handling + +## [0.4.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.3.1...v0.4.0) + +### Added +- Support for variation selectors (VS15, VS16) and regional indicator pairs (flags) + +## [0.3.1] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.3.0...v0.3.1) + +### Added +- Fuzz testing support + +### Changed +- Updated stringish dependency + +## [0.3.0] + +[Compare](https://github.com/clipperhouse/displaywidth/compare/v0.2.0...v0.3.0) + +### Changed +- Dropped compatibility with go-runewidth +- Trie implementation cleanup diff --git a/vendor/github.com/jbenet/go-context/LICENSE b/vendor/github.com/clipperhouse/displaywidth/LICENSE similarity index 86% rename from vendor/github.com/jbenet/go-context/LICENSE rename to vendor/github.com/clipperhouse/displaywidth/LICENSE index c7386b3c9..4b8064eb3 100644 --- a/vendor/github.com/jbenet/go-context/LICENSE +++ b/vendor/github.com/clipperhouse/displaywidth/LICENSE @@ -1,6 +1,6 @@ -The MIT License (MIT) +MIT License -Copyright (c) 2014 Juan Batiz-Benet +Copyright (c) 2025 Matt Sherman Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/clipperhouse/displaywidth/README.md b/vendor/github.com/clipperhouse/displaywidth/README.md new file mode 100644 index 000000000..506822b02 --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/README.md @@ -0,0 +1,190 @@ +# displaywidth + +A high-performance Go package for measuring the monospace display width of strings, UTF-8 bytes, and runes. + +[![Documentation](https://pkg.go.dev/badge/github.com/clipperhouse/displaywidth.svg)](https://pkg.go.dev/github.com/clipperhouse/displaywidth) +[![Test](https://github.com/clipperhouse/displaywidth/actions/workflows/gotest.yml/badge.svg)](https://github.com/clipperhouse/displaywidth/actions/workflows/gotest.yml) +[![Fuzz](https://github.com/clipperhouse/displaywidth/actions/workflows/gofuzz.yml/badge.svg)](https://github.com/clipperhouse/displaywidth/actions/workflows/gofuzz.yml) + +## Install +```bash +go get github.com/clipperhouse/displaywidth +``` + +## Usage + +```go +package main + +import ( + "fmt" + "github.com/clipperhouse/displaywidth" +) + +func main() { + width := displaywidth.String("Hello, 世界!") + fmt.Println(width) + + width = displaywidth.Bytes([]byte("🌍")) + fmt.Println(width) + + width = displaywidth.Rune('🌍') + fmt.Println(width) +} +``` + +For most purposes, you should use the `String` or `Bytes` methods. They sum +the widths of grapheme clusters in the string or byte slice. + +> Note: in your application, iterating over runes to measure width is likely incorrect; +the smallest unit of display is a grapheme, not a rune. + +### Iterating over graphemes + +If you need the individual graphemes: + +```go +import ( + "fmt" + "github.com/clipperhouse/displaywidth" +) + +func main() { + g := displaywidth.StringGraphemes("Hello, 世界!") + for g.Next() { + width := g.Width() + value := g.Value() + // do something with the width or value + } +} +``` + +### Options + +Create the options you need, and then use methods on the options struct. + +```go +var myOptions = displaywidth.Options{ + EastAsianWidth: true, + ControlSequences: true, +} + +width := myOptions.String("Hello, 世界!") +``` + +#### ControlSequences + +`ControlSequences` specifies whether to ignore ECMA-48 escape sequences +when calculating the display width. When `false` (default), ANSI escape +sequences are treated as just a series of characters. When `true`, they are +treated as a single zero-width unit. + +#### ControlSequences8Bit + +`ControlSequences8Bit` specifies whether to ignore 8-bit ECMA-48 escape sequences +when calculating the display width. When `false` (default), these are treated +as just a series of characters. When `true`, they are treated as a single +zero-width unit. + +Note: this option is ignored by the `Truncate` methods, as the concatenation +can lead to unintended UTF-8 semantics. + +#### EastAsianWidth + +`EastAsianWidth` defines how +[East Asian Ambiguous characters](https://www.unicode.org/reports/tr11/#Ambiguous) +are treated. + +When `false` (default), East Asian Ambiguous characters are treated as width 1. +When `true`, they are treated as width 2. + +You may wish to configure this based on environment variables or locale. + `go-runewidth`, for example, does so + [during package initialization](https://github.com/mattn/go-runewidth/blob/master/runewidth.go#L26C1-L45C2). `displaywidth` does not do this automatically, we prefer to leave it to you. + + +## Technical standards and compatibility + +This package implements the Unicode East Asian Width standard +([UAX #11](https://www.unicode.org/reports/tr11/tr11-43.html)), and handles +[version selectors](https://en.wikipedia.org/wiki/Variation_Selectors_(Unicode_block)), +and [regional indicator pairs](https://en.wikipedia.org/wiki/Regional_indicator_symbol) +(flags). We implement [Unicode TR51](https://www.unicode.org/reports/tr51/tr51-27.html) +for emojis. We are keeping an eye on +[emerging standards](https://www.jeffquast.com/post/state-of-terminal-emulation-2025/). + +For control sequences, we implement the [ECMA-48](https://ecma-international.org/publications-and-standards/standards/ecma-48/) standard for 7-bit and 8-bit control sequences. + +`clipperhouse/displaywidth`, `mattn/go-runewidth`, and `rivo/uniseg` will +give the same outputs for most real-world text. Extensive details are in the +[compatibility analysis](comparison/COMPATIBILITY_ANALYSIS.md). + +## Invalid UTF-8 + +This package does not validate UTF-8. If you pass invalid UTF-8, the results +are undefined. We fuzz against invalid UTF-8 to ensure we don't panic or +loop indefinitely. + +The `ControlSequences8Bit` option means that we will segment valid 8-bit +control sequences, which are typically _not_ valid UTF-8. 8-bit control bytes +happen to also be UTF-8 continuation bytes. Use with caution. + +## Prior Art + +[mattn/go-runewidth](https://github.com/mattn/go-runewidth) + +[rivo/uniseg](https://github.com/rivo/uniseg) + +[x/text/width](https://pkg.go.dev/golang.org/x/text/width) + +[x/text/internal/triegen](https://pkg.go.dev/golang.org/x/text/internal/triegen) + +## Benchmarks + +```bash +cd comparison +go test -bench=. -benchmem +``` + +``` +goos: darwin +goarch: arm64 +pkg: github.com/clipperhouse/displaywidth/comparison +cpu: Apple M2 + +BenchmarkString_Mixed/clipperhouse/displaywidth-8 5784 ns/op 291.69 MB/s 0 B/op 0 allocs/op +BenchmarkString_Mixed/mattn/go-runewidth-8 14751 ns/op 114.36 MB/s 0 B/op 0 allocs/op +BenchmarkString_Mixed/rivo/uniseg-8 19360 ns/op 87.14 MB/s 0 B/op 0 allocs/op + +BenchmarkString_ASCII/clipperhouse/displaywidth-8 54.60 ns/op 2344.32 MB/s 0 B/op 0 allocs/op +BenchmarkString_ASCII/mattn/go-runewidth-8 1195 ns/op 107.08 MB/s 0 B/op 0 allocs/op +BenchmarkString_ASCII/rivo/uniseg-8 1578 ns/op 81.13 MB/s 0 B/op 0 allocs/op + +BenchmarkString_EastAsian/clipperhouse/displaywidth-8 5837 ns/op 289.01 MB/s 0 B/op 0 allocs/op +BenchmarkString_EastAsian/mattn/go-runewidth-8 24418 ns/op 69.09 MB/s 0 B/op 0 allocs/op +BenchmarkString_EastAsian/rivo/uniseg-8 19339 ns/op 87.23 MB/s 0 B/op 0 allocs/op + +BenchmarkString_Emoji/clipperhouse/displaywidth-8 3225 ns/op 224.51 MB/s 0 B/op 0 allocs/op +BenchmarkString_Emoji/mattn/go-runewidth-8 4851 ns/op 149.25 MB/s 0 B/op 0 allocs/op +BenchmarkString_Emoji/rivo/uniseg-8 6591 ns/op 109.85 MB/s 0 B/op 0 allocs/op + +BenchmarkRune_Mixed/clipperhouse/displaywidth-8 3385 ns/op 498.34 MB/s 0 B/op 0 allocs/op +BenchmarkRune_Mixed/mattn/go-runewidth-8 5354 ns/op 315.07 MB/s 0 B/op 0 allocs/op + +BenchmarkRune_EastAsian/clipperhouse/displaywidth-8 3397 ns/op 496.56 MB/s 0 B/op 0 allocs/op +BenchmarkRune_EastAsian/mattn/go-runewidth-8 15673 ns/op 107.64 MB/s 0 B/op 0 allocs/op + +BenchmarkRune_ASCII/clipperhouse/displaywidth-8 255.7 ns/op 500.53 MB/s 0 B/op 0 allocs/op +BenchmarkRune_ASCII/mattn/go-runewidth-8 261.5 ns/op 489.55 MB/s 0 B/op 0 allocs/op + +BenchmarkRune_Emoji/clipperhouse/displaywidth-8 1371 ns/op 528.22 MB/s 0 B/op 0 allocs/op +BenchmarkRune_Emoji/mattn/go-runewidth-8 2267 ns/op 319.43 MB/s 0 B/op 0 allocs/op + +BenchmarkTruncateWithTail/clipperhouse/displaywidth-8 3229 ns/op 54.82 MB/s 192 B/op 14 allocs/op +BenchmarkTruncateWithTail/mattn/go-runewidth-8 8408 ns/op 21.05 MB/s 192 B/op 14 allocs/op + +BenchmarkTruncateWithoutTail/clipperhouse/displaywidth-8 3554 ns/op 64.43 MB/s 0 B/op 0 allocs/op +BenchmarkTruncateWithoutTail/mattn/go-runewidth-8 11189 ns/op 20.47 MB/s 0 B/op 0 allocs/op +``` + +Here are some notes on [how to make Unicode things fast](https://clipperhouse.com/go-unicode/). diff --git a/vendor/github.com/clipperhouse/displaywidth/gen.go b/vendor/github.com/clipperhouse/displaywidth/gen.go new file mode 100644 index 000000000..52e1085bc --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/gen.go @@ -0,0 +1,3 @@ +package displaywidth + +//go:generate go run -C internal/gen . diff --git a/vendor/github.com/clipperhouse/displaywidth/graphemes.go b/vendor/github.com/clipperhouse/displaywidth/graphemes.go new file mode 100644 index 000000000..14a52788b --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/graphemes.go @@ -0,0 +1,73 @@ +package displaywidth + +import ( + "github.com/clipperhouse/uax29/v2/graphemes" +) + +// Graphemes is an iterator over grapheme clusters. +// +// Iterate using the Next method, and get the width of the current grapheme +// using the Width method. +type Graphemes[T ~string | []byte] struct { + iter *graphemes.Iterator[T] + options Options +} + +// Next advances the iterator to the next grapheme cluster. +func (g *Graphemes[T]) Next() bool { + return g.iter.Next() +} + +// Value returns the current grapheme cluster. +func (g *Graphemes[T]) Value() T { + return g.iter.Value() +} + +// Width returns the display width of the current grapheme cluster. +func (g *Graphemes[T]) Width() int { + return graphemeWidth(g.Value(), g.options) +} + +// StringGraphemes returns an iterator over grapheme clusters for the given +// string. +// +// Iterate using the Next method, and get the width of the current grapheme +// using the Width method. +func StringGraphemes(s string) Graphemes[string] { + return DefaultOptions.StringGraphemes(s) +} + +// StringGraphemes returns an iterator over grapheme clusters for the given +// string, with the given options. +// +// Iterate using the Next method, and get the width of the current grapheme +// using the Width method. +func (options Options) StringGraphemes(s string) Graphemes[string] { + g := graphemes.FromString(s) + g.AnsiEscapeSequences = options.ControlSequences + g.AnsiEscapeSequences8Bit = options.ControlSequences8Bit + + return Graphemes[string]{iter: g, options: options} +} + +// BytesGraphemes returns an iterator over grapheme clusters for the given +// []byte. +// +// Iterate using the Next method, and get the width of the current grapheme +// using the Width method. +func BytesGraphemes(s []byte) Graphemes[[]byte] { + return DefaultOptions.BytesGraphemes(s) +} + +// BytesGraphemes returns an iterator over grapheme clusters for the given +// []byte, with the given options. +// +// Iterate using the Next method, and get the width of the current grapheme +// using the Width method. +func (options Options) BytesGraphemes(s []byte) Graphemes[[]byte] { + g := graphemes.FromBytes(s) + g.AnsiEscapeSequences = options.ControlSequences + g.AnsiEscapeSequences8Bit = options.ControlSequences8Bit + + return Graphemes[[]byte]{iter: g, options: options} +} diff --git a/vendor/github.com/clipperhouse/displaywidth/options.go b/vendor/github.com/clipperhouse/displaywidth/options.go new file mode 100644 index 000000000..b63b585aa --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/options.go @@ -0,0 +1,30 @@ +package displaywidth + +// Options allows you to specify the treatment of ambiguous East Asian +// characters and ANSI escape sequences. +type Options struct { + // EastAsianWidth specifies whether to treat ambiguous East Asian characters + // as width 1 or 2. When false (default), ambiguous East Asian characters + // are treated as width 1. When true, they are width 2. + EastAsianWidth bool + + // ControlSequences specifies whether to ignore 7-bit ECMA-48 escape sequences + // when calculating the display width. When false (default), ANSI escape + // sequences are treated as just a series of characters. When true, they are + // treated as a single zero-width unit. + ControlSequences bool + // ControlSequences8Bit specifies whether to ignore 8-bit ECMA-48 escape sequences + // when calculating the display width. When false (default), these are treated + // as just a series of characters. When true, they are treated as a single + // zero-width unit. + ControlSequences8Bit bool +} + +// DefaultOptions is the default options for the display width +// calculation, which is EastAsianWidth false, ControlSequences false, and +// ControlSequences8Bit false. +var DefaultOptions = Options{ + EastAsianWidth: false, + ControlSequences: false, + ControlSequences8Bit: false, +} diff --git a/vendor/github.com/clipperhouse/displaywidth/trie.go b/vendor/github.com/clipperhouse/displaywidth/trie.go new file mode 100644 index 000000000..1d3a98300 --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/trie.go @@ -0,0 +1,1699 @@ +// Code generated by internal/gen/main.go. DO NOT EDIT. + +package displaywidth + +// property is an enum representing the properties of a character +type property uint8 + +const ( + // Always 0 width, includes combining marks, control characters, non-printable, etc + _Zero_Width property = iota + 1 + // Always 2 wide (East Asian Wide F/W, Emoji, Regional Indicator) + _Wide + // Width depends on EastAsianWidth option + _East_Asian_Ambiguous +) + +// lookup returns the trie value for the first UTF-8 encoding in s and +// the width in bytes of this encoding. The size will be 0 if s does not +// hold enough bytes to complete the encoding. len(s) must be greater than 0. +func lookup[T ~string | []byte](s T) (v uint8, sz int) { + c0 := s[0] + switch { + case c0 < 0x80: // is ASCII + return stringWidthValues[c0], 1 + case c0 < 0xC2: + return 0, 1 // Illegal UTF-8: not a starter, not ASCII. + case c0 < 0xE0: // 2-byte UTF-8 + if len(s) < 2 { + return 0, 0 + } + i := stringWidthIndex[c0] + c1 := s[1] + if c1 < 0x80 || 0xC0 <= c1 { + return 0, 1 // Illegal UTF-8: not a continuation byte. + } + return lookupValue(uint32(i), c1), 2 + case c0 < 0xF0: // 3-byte UTF-8 + if len(s) < 3 { + return 0, 0 + } + i := stringWidthIndex[c0] + c1 := s[1] + if c1 < 0x80 || 0xC0 <= c1 { + return 0, 1 // Illegal UTF-8: not a continuation byte. + } + o := uint32(i)<<6 + uint32(c1) + i = stringWidthIndex[o] + c2 := s[2] + if c2 < 0x80 || 0xC0 <= c2 { + return 0, 2 // Illegal UTF-8: not a continuation byte. + } + return lookupValue(uint32(i), c2), 3 + case c0 < 0xF8: // 4-byte UTF-8 + if len(s) < 4 { + return 0, 0 + } + i := stringWidthIndex[c0] + c1 := s[1] + if c1 < 0x80 || 0xC0 <= c1 { + return 0, 1 // Illegal UTF-8: not a continuation byte. + } + o := uint32(i)<<6 + uint32(c1) + i = stringWidthIndex[o] + c2 := s[2] + if c2 < 0x80 || 0xC0 <= c2 { + return 0, 2 // Illegal UTF-8: not a continuation byte. + } + o = uint32(i)<<6 + uint32(c2) + i = stringWidthIndex[o] + c3 := s[3] + if c3 < 0x80 || 0xC0 <= c3 { + return 0, 3 // Illegal UTF-8: not a continuation byte. + } + return lookupValue(uint32(i), c3), 4 + } + // Illegal rune + return 0, 1 +} + +// stringWidthTrie. Total size: 17664 bytes (17.25 KiB). Checksum: 220983462f26d765. +// type stringWidthTrie struct { } + +// func newStringWidthTrie(i int) *stringWidthTrie { +// return &stringWidthTrie{} +// } + +// lookupValue determines the type of block n and looks up the value for b. +func lookupValue(n uint32, b byte) uint8 { + switch { + default: + return uint8(stringWidthValues[n<<6+uint32(b)]) + } +} + +// stringWidthValues: 246 blocks, 15744 entries, 15744 bytes +// The third block is the zero block. +var stringWidthValues = [15744]uint8{ + // Block 0x0, offset 0x0 + // Block 0x1, offset 0x40 + // Block 0x2, offset 0x80 + // Block 0x3, offset 0xc0 + 0xc0: 0x0001, 0xc1: 0x0001, 0xc2: 0x0001, 0xc3: 0x0001, 0xc4: 0x0001, 0xc5: 0x0001, + 0xc6: 0x0001, 0xc7: 0x0001, 0xc8: 0x0001, 0xc9: 0x0001, 0xca: 0x0001, 0xcb: 0x0001, + 0xcc: 0x0001, 0xcd: 0x0001, 0xce: 0x0001, 0xcf: 0x0001, 0xd0: 0x0001, 0xd1: 0x0001, + 0xd2: 0x0001, 0xd3: 0x0001, 0xd4: 0x0001, 0xd5: 0x0001, 0xd6: 0x0001, 0xd7: 0x0001, + 0xd8: 0x0001, 0xd9: 0x0001, 0xda: 0x0001, 0xdb: 0x0001, 0xdc: 0x0001, 0xdd: 0x0001, + 0xde: 0x0001, 0xdf: 0x0001, 0xe1: 0x0003, + 0xe4: 0x0003, 0xe7: 0x0003, 0xe8: 0x0003, + 0xea: 0x0003, 0xed: 0x0001, 0xee: 0x0003, + 0xf0: 0x0003, 0xf1: 0x0003, 0xf2: 0x0003, 0xf3: 0x0003, 0xf4: 0x0003, + 0xf6: 0x0003, 0xf7: 0x0003, 0xf8: 0x0003, 0xf9: 0x0003, 0xfa: 0x0003, + 0xfc: 0x0003, 0xfd: 0x0003, 0xfe: 0x0003, 0xff: 0x0003, + // Block 0x4, offset 0x100 + 0x106: 0x0003, + 0x110: 0x0003, + 0x117: 0x0003, + 0x118: 0x0003, + 0x11e: 0x0003, 0x11f: 0x0003, 0x120: 0x0003, 0x121: 0x0003, + 0x126: 0x0003, 0x128: 0x0003, 0x129: 0x0003, + 0x12a: 0x0003, 0x12c: 0x0003, 0x12d: 0x0003, + 0x130: 0x0003, 0x132: 0x0003, 0x133: 0x0003, + 0x137: 0x0003, 0x138: 0x0003, 0x139: 0x0003, 0x13a: 0x0003, + 0x13c: 0x0003, 0x13e: 0x0003, + // Block 0x5, offset 0x140 + 0x141: 0x0003, + 0x151: 0x0003, + 0x153: 0x0003, + 0x15b: 0x0003, + 0x166: 0x0003, 0x167: 0x0003, + 0x16b: 0x0003, + 0x171: 0x0003, 0x172: 0x0003, 0x173: 0x0003, + 0x178: 0x0003, + 0x17f: 0x0003, + // Block 0x6, offset 0x180 + 0x180: 0x0003, 0x181: 0x0003, 0x182: 0x0003, 0x184: 0x0003, + 0x188: 0x0003, 0x189: 0x0003, 0x18a: 0x0003, 0x18b: 0x0003, + 0x18d: 0x0003, + 0x192: 0x0003, 0x193: 0x0003, + 0x1a6: 0x0003, 0x1a7: 0x0003, + 0x1ab: 0x0003, + // Block 0x7, offset 0x1c0 + 0x1ce: 0x0003, 0x1d0: 0x0003, + 0x1d2: 0x0003, 0x1d4: 0x0003, 0x1d6: 0x0003, + 0x1d8: 0x0003, 0x1da: 0x0003, 0x1dc: 0x0003, + // Block 0x8, offset 0x200 + 0x211: 0x0003, + 0x221: 0x0003, + // Block 0x9, offset 0x240 + 0x244: 0x0003, + 0x247: 0x0003, 0x249: 0x0003, 0x24a: 0x0003, 0x24b: 0x0003, + 0x24d: 0x0003, 0x250: 0x0003, + 0x258: 0x0003, 0x259: 0x0003, 0x25a: 0x0003, 0x25b: 0x0003, 0x25d: 0x0003, + 0x25f: 0x0003, + // Block 0xa, offset 0x280 + 0x280: 0x0001, 0x281: 0x0001, 0x282: 0x0001, 0x283: 0x0001, 0x284: 0x0001, 0x285: 0x0001, + 0x286: 0x0001, 0x287: 0x0001, 0x288: 0x0001, 0x289: 0x0001, 0x28a: 0x0001, 0x28b: 0x0001, + 0x28c: 0x0001, 0x28d: 0x0001, 0x28e: 0x0001, 0x28f: 0x0001, 0x290: 0x0001, 0x291: 0x0001, + 0x292: 0x0001, 0x293: 0x0001, 0x294: 0x0001, 0x295: 0x0001, 0x296: 0x0001, 0x297: 0x0001, + 0x298: 0x0001, 0x299: 0x0001, 0x29a: 0x0001, 0x29b: 0x0001, 0x29c: 0x0001, 0x29d: 0x0001, + 0x29e: 0x0001, 0x29f: 0x0001, 0x2a0: 0x0001, 0x2a1: 0x0001, 0x2a2: 0x0001, 0x2a3: 0x0001, + 0x2a4: 0x0001, 0x2a5: 0x0001, 0x2a6: 0x0001, 0x2a7: 0x0001, 0x2a8: 0x0001, 0x2a9: 0x0001, + 0x2aa: 0x0001, 0x2ab: 0x0001, 0x2ac: 0x0001, 0x2ad: 0x0001, 0x2ae: 0x0001, 0x2af: 0x0001, + 0x2b0: 0x0001, 0x2b1: 0x0001, 0x2b2: 0x0001, 0x2b3: 0x0001, 0x2b4: 0x0001, 0x2b5: 0x0001, + 0x2b6: 0x0001, 0x2b7: 0x0001, 0x2b8: 0x0001, 0x2b9: 0x0001, 0x2ba: 0x0001, 0x2bb: 0x0001, + 0x2bc: 0x0001, 0x2bd: 0x0001, 0x2be: 0x0001, 0x2bf: 0x0001, + // Block 0xb, offset 0x2c0 + 0x2c0: 0x0001, 0x2c1: 0x0001, 0x2c2: 0x0001, 0x2c3: 0x0001, 0x2c4: 0x0001, 0x2c5: 0x0001, + 0x2c6: 0x0001, 0x2c7: 0x0001, 0x2c8: 0x0001, 0x2c9: 0x0001, 0x2ca: 0x0001, 0x2cb: 0x0001, + 0x2cc: 0x0001, 0x2cd: 0x0001, 0x2ce: 0x0001, 0x2cf: 0x0001, 0x2d0: 0x0001, 0x2d1: 0x0001, + 0x2d2: 0x0001, 0x2d3: 0x0001, 0x2d4: 0x0001, 0x2d5: 0x0001, 0x2d6: 0x0001, 0x2d7: 0x0001, + 0x2d8: 0x0001, 0x2d9: 0x0001, 0x2da: 0x0001, 0x2db: 0x0001, 0x2dc: 0x0001, 0x2dd: 0x0001, + 0x2de: 0x0001, 0x2df: 0x0001, 0x2e0: 0x0001, 0x2e1: 0x0001, 0x2e2: 0x0001, 0x2e3: 0x0001, + 0x2e4: 0x0001, 0x2e5: 0x0001, 0x2e6: 0x0001, 0x2e7: 0x0001, 0x2e8: 0x0001, 0x2e9: 0x0001, + 0x2ea: 0x0001, 0x2eb: 0x0001, 0x2ec: 0x0001, 0x2ed: 0x0001, 0x2ee: 0x0001, 0x2ef: 0x0001, + // Block 0xc, offset 0x300 + 0x311: 0x0003, + 0x312: 0x0003, 0x313: 0x0003, 0x314: 0x0003, 0x315: 0x0003, 0x316: 0x0003, 0x317: 0x0003, + 0x318: 0x0003, 0x319: 0x0003, 0x31a: 0x0003, 0x31b: 0x0003, 0x31c: 0x0003, 0x31d: 0x0003, + 0x31e: 0x0003, 0x31f: 0x0003, 0x320: 0x0003, 0x321: 0x0003, 0x323: 0x0003, + 0x324: 0x0003, 0x325: 0x0003, 0x326: 0x0003, 0x327: 0x0003, 0x328: 0x0003, 0x329: 0x0003, + 0x331: 0x0003, 0x332: 0x0003, 0x333: 0x0003, 0x334: 0x0003, 0x335: 0x0003, + 0x336: 0x0003, 0x337: 0x0003, 0x338: 0x0003, 0x339: 0x0003, 0x33a: 0x0003, 0x33b: 0x0003, + 0x33c: 0x0003, 0x33d: 0x0003, 0x33e: 0x0003, 0x33f: 0x0003, + // Block 0xd, offset 0x340 + 0x340: 0x0003, 0x341: 0x0003, 0x343: 0x0003, 0x344: 0x0003, 0x345: 0x0003, + 0x346: 0x0003, 0x347: 0x0003, 0x348: 0x0003, 0x349: 0x0003, + // Block 0xe, offset 0x380 + 0x381: 0x0003, + 0x390: 0x0003, 0x391: 0x0003, + 0x392: 0x0003, 0x393: 0x0003, 0x394: 0x0003, 0x395: 0x0003, 0x396: 0x0003, 0x397: 0x0003, + 0x398: 0x0003, 0x399: 0x0003, 0x39a: 0x0003, 0x39b: 0x0003, 0x39c: 0x0003, 0x39d: 0x0003, + 0x39e: 0x0003, 0x39f: 0x0003, 0x3a0: 0x0003, 0x3a1: 0x0003, 0x3a2: 0x0003, 0x3a3: 0x0003, + 0x3a4: 0x0003, 0x3a5: 0x0003, 0x3a6: 0x0003, 0x3a7: 0x0003, 0x3a8: 0x0003, 0x3a9: 0x0003, + 0x3aa: 0x0003, 0x3ab: 0x0003, 0x3ac: 0x0003, 0x3ad: 0x0003, 0x3ae: 0x0003, 0x3af: 0x0003, + 0x3b0: 0x0003, 0x3b1: 0x0003, 0x3b2: 0x0003, 0x3b3: 0x0003, 0x3b4: 0x0003, 0x3b5: 0x0003, + 0x3b6: 0x0003, 0x3b7: 0x0003, 0x3b8: 0x0003, 0x3b9: 0x0003, 0x3ba: 0x0003, 0x3bb: 0x0003, + 0x3bc: 0x0003, 0x3bd: 0x0003, 0x3be: 0x0003, 0x3bf: 0x0003, + // Block 0xf, offset 0x3c0 + 0x3c0: 0x0003, 0x3c1: 0x0003, 0x3c2: 0x0003, 0x3c3: 0x0003, 0x3c4: 0x0003, 0x3c5: 0x0003, + 0x3c6: 0x0003, 0x3c7: 0x0003, 0x3c8: 0x0003, 0x3c9: 0x0003, 0x3ca: 0x0003, 0x3cb: 0x0003, + 0x3cc: 0x0003, 0x3cd: 0x0003, 0x3ce: 0x0003, 0x3cf: 0x0003, 0x3d1: 0x0003, + // Block 0x10, offset 0x400 + 0x403: 0x0001, 0x404: 0x0001, 0x405: 0x0001, + 0x406: 0x0001, 0x407: 0x0001, 0x408: 0x0001, 0x409: 0x0001, + // Block 0x11, offset 0x440 + 0x451: 0x0001, + 0x452: 0x0001, 0x453: 0x0001, 0x454: 0x0001, 0x455: 0x0001, 0x456: 0x0001, 0x457: 0x0001, + 0x458: 0x0001, 0x459: 0x0001, 0x45a: 0x0001, 0x45b: 0x0001, 0x45c: 0x0001, 0x45d: 0x0001, + 0x45e: 0x0001, 0x45f: 0x0001, 0x460: 0x0001, 0x461: 0x0001, 0x462: 0x0001, 0x463: 0x0001, + 0x464: 0x0001, 0x465: 0x0001, 0x466: 0x0001, 0x467: 0x0001, 0x468: 0x0001, 0x469: 0x0001, + 0x46a: 0x0001, 0x46b: 0x0001, 0x46c: 0x0001, 0x46d: 0x0001, 0x46e: 0x0001, 0x46f: 0x0001, + 0x470: 0x0001, 0x471: 0x0001, 0x472: 0x0001, 0x473: 0x0001, 0x474: 0x0001, 0x475: 0x0001, + 0x476: 0x0001, 0x477: 0x0001, 0x478: 0x0001, 0x479: 0x0001, 0x47a: 0x0001, 0x47b: 0x0001, + 0x47c: 0x0001, 0x47d: 0x0001, 0x47f: 0x0001, + // Block 0x12, offset 0x480 + 0x481: 0x0001, 0x482: 0x0001, 0x484: 0x0001, 0x485: 0x0001, + 0x487: 0x0001, + // Block 0x13, offset 0x4c0 + 0x4c0: 0x0001, 0x4c1: 0x0001, 0x4c2: 0x0001, 0x4c3: 0x0001, 0x4c4: 0x0001, 0x4c5: 0x0001, + 0x4d0: 0x0001, 0x4d1: 0x0001, + 0x4d2: 0x0001, 0x4d3: 0x0001, 0x4d4: 0x0001, 0x4d5: 0x0001, 0x4d6: 0x0001, 0x4d7: 0x0001, + 0x4d8: 0x0001, 0x4d9: 0x0001, 0x4da: 0x0001, 0x4dc: 0x0001, + // Block 0x14, offset 0x500 + 0x50b: 0x0001, + 0x50c: 0x0001, 0x50d: 0x0001, 0x50e: 0x0001, 0x50f: 0x0001, 0x510: 0x0001, 0x511: 0x0001, + 0x512: 0x0001, 0x513: 0x0001, 0x514: 0x0001, 0x515: 0x0001, 0x516: 0x0001, 0x517: 0x0001, + 0x518: 0x0001, 0x519: 0x0001, 0x51a: 0x0001, 0x51b: 0x0001, 0x51c: 0x0001, 0x51d: 0x0001, + 0x51e: 0x0001, 0x51f: 0x0001, + 0x530: 0x0001, + // Block 0x15, offset 0x540 + 0x556: 0x0001, 0x557: 0x0001, + 0x558: 0x0001, 0x559: 0x0001, 0x55a: 0x0001, 0x55b: 0x0001, 0x55c: 0x0001, 0x55d: 0x0001, + 0x55f: 0x0001, 0x560: 0x0001, 0x561: 0x0001, 0x562: 0x0001, 0x563: 0x0001, + 0x564: 0x0001, 0x567: 0x0001, 0x568: 0x0001, + 0x56a: 0x0001, 0x56b: 0x0001, 0x56c: 0x0001, 0x56d: 0x0001, + // Block 0x16, offset 0x580 + 0x58f: 0x0001, 0x591: 0x0001, + 0x5b0: 0x0001, 0x5b1: 0x0001, 0x5b2: 0x0001, 0x5b3: 0x0001, 0x5b4: 0x0001, 0x5b5: 0x0001, + 0x5b6: 0x0001, 0x5b7: 0x0001, 0x5b8: 0x0001, 0x5b9: 0x0001, 0x5ba: 0x0001, 0x5bb: 0x0001, + 0x5bc: 0x0001, 0x5bd: 0x0001, 0x5be: 0x0001, 0x5bf: 0x0001, + // Block 0x17, offset 0x5c0 + 0x5c0: 0x0001, 0x5c1: 0x0001, 0x5c2: 0x0001, 0x5c3: 0x0001, 0x5c4: 0x0001, 0x5c5: 0x0001, + 0x5c6: 0x0001, 0x5c7: 0x0001, 0x5c8: 0x0001, 0x5c9: 0x0001, 0x5ca: 0x0001, + // Block 0x18, offset 0x600 + 0x626: 0x0001, 0x627: 0x0001, 0x628: 0x0001, 0x629: 0x0001, + 0x62a: 0x0001, 0x62b: 0x0001, 0x62c: 0x0001, 0x62d: 0x0001, 0x62e: 0x0001, 0x62f: 0x0001, + 0x630: 0x0001, + // Block 0x19, offset 0x640 + 0x66b: 0x0001, 0x66c: 0x0001, 0x66d: 0x0001, 0x66e: 0x0001, 0x66f: 0x0001, + 0x670: 0x0001, 0x671: 0x0001, 0x672: 0x0001, 0x673: 0x0001, + 0x67d: 0x0001, + // Block 0x1a, offset 0x680 + 0x696: 0x0001, 0x697: 0x0001, + 0x698: 0x0001, 0x699: 0x0001, 0x69b: 0x0001, 0x69c: 0x0001, 0x69d: 0x0001, + 0x69e: 0x0001, 0x69f: 0x0001, 0x6a0: 0x0001, 0x6a1: 0x0001, 0x6a2: 0x0001, 0x6a3: 0x0001, + 0x6a5: 0x0001, 0x6a6: 0x0001, 0x6a7: 0x0001, 0x6a9: 0x0001, + 0x6aa: 0x0001, 0x6ab: 0x0001, 0x6ac: 0x0001, 0x6ad: 0x0001, + // Block 0x1b, offset 0x6c0 + 0x6d9: 0x0001, 0x6da: 0x0001, 0x6db: 0x0001, + // Block 0x1c, offset 0x700 + 0x710: 0x0001, 0x711: 0x0001, + 0x718: 0x0001, 0x719: 0x0001, 0x71a: 0x0001, 0x71b: 0x0001, 0x71c: 0x0001, 0x71d: 0x0001, + 0x71e: 0x0001, 0x71f: 0x0001, + // Block 0x1d, offset 0x740 + 0x74a: 0x0001, 0x74b: 0x0001, + 0x74c: 0x0001, 0x74d: 0x0001, 0x74e: 0x0001, 0x74f: 0x0001, 0x750: 0x0001, 0x751: 0x0001, + 0x752: 0x0001, 0x753: 0x0001, 0x754: 0x0001, 0x755: 0x0001, 0x756: 0x0001, 0x757: 0x0001, + 0x758: 0x0001, 0x759: 0x0001, 0x75a: 0x0001, 0x75b: 0x0001, 0x75c: 0x0001, 0x75d: 0x0001, + 0x75e: 0x0001, 0x75f: 0x0001, 0x760: 0x0001, 0x761: 0x0001, 0x762: 0x0001, 0x763: 0x0001, + 0x764: 0x0001, 0x765: 0x0001, 0x766: 0x0001, 0x767: 0x0001, 0x768: 0x0001, 0x769: 0x0001, + 0x76a: 0x0001, 0x76b: 0x0001, 0x76c: 0x0001, 0x76d: 0x0001, 0x76e: 0x0001, 0x76f: 0x0001, + 0x770: 0x0001, 0x771: 0x0001, 0x772: 0x0001, 0x773: 0x0001, 0x774: 0x0001, 0x775: 0x0001, + 0x776: 0x0001, 0x777: 0x0001, 0x778: 0x0001, 0x779: 0x0001, 0x77a: 0x0001, 0x77b: 0x0001, + 0x77c: 0x0001, 0x77d: 0x0001, 0x77e: 0x0001, 0x77f: 0x0001, + // Block 0x1e, offset 0x780 + 0x780: 0x0001, 0x781: 0x0001, 0x782: 0x0001, + 0x7ba: 0x0001, + 0x7bc: 0x0001, + // Block 0x1f, offset 0x7c0 + 0x7c1: 0x0001, 0x7c2: 0x0001, 0x7c3: 0x0001, 0x7c4: 0x0001, 0x7c5: 0x0001, + 0x7c6: 0x0001, 0x7c7: 0x0001, 0x7c8: 0x0001, + 0x7cd: 0x0001, 0x7d1: 0x0001, + 0x7d2: 0x0001, 0x7d3: 0x0001, 0x7d4: 0x0001, 0x7d5: 0x0001, 0x7d6: 0x0001, 0x7d7: 0x0001, + 0x7e2: 0x0001, 0x7e3: 0x0001, + // Block 0x20, offset 0x800 + 0x801: 0x0001, + 0x83c: 0x0001, + // Block 0x21, offset 0x840 + 0x841: 0x0001, 0x842: 0x0001, 0x843: 0x0001, 0x844: 0x0001, + 0x84d: 0x0001, + 0x862: 0x0001, 0x863: 0x0001, + 0x87e: 0x0001, + // Block 0x22, offset 0x880 + 0x881: 0x0001, 0x882: 0x0001, + 0x8bc: 0x0001, + // Block 0x23, offset 0x8c0 + 0x8c1: 0x0001, 0x8c2: 0x0001, + 0x8c7: 0x0001, 0x8c8: 0x0001, 0x8cb: 0x0001, + 0x8cc: 0x0001, 0x8cd: 0x0001, 0x8d1: 0x0001, + 0x8f0: 0x0001, 0x8f1: 0x0001, 0x8f5: 0x0001, + // Block 0x24, offset 0x900 + 0x901: 0x0001, 0x902: 0x0001, 0x903: 0x0001, 0x904: 0x0001, 0x905: 0x0001, + 0x907: 0x0001, 0x908: 0x0001, + 0x90d: 0x0001, + 0x922: 0x0001, 0x923: 0x0001, + 0x93a: 0x0001, 0x93b: 0x0001, + 0x93c: 0x0001, 0x93d: 0x0001, 0x93e: 0x0001, 0x93f: 0x0001, + // Block 0x25, offset 0x940 + 0x941: 0x0001, + 0x97c: 0x0001, 0x97f: 0x0001, + // Block 0x26, offset 0x980 + 0x981: 0x0001, 0x982: 0x0001, 0x983: 0x0001, 0x984: 0x0001, + 0x98d: 0x0001, + 0x995: 0x0001, 0x996: 0x0001, + 0x9a2: 0x0001, 0x9a3: 0x0001, + // Block 0x27, offset 0x9c0 + 0x9c2: 0x0001, + // Block 0x28, offset 0xa00 + 0xa00: 0x0001, + 0xa0d: 0x0001, + // Block 0x29, offset 0xa40 + 0xa40: 0x0001, 0xa44: 0x0001, + 0xa7c: 0x0001, 0xa7e: 0x0001, 0xa7f: 0x0001, + // Block 0x2a, offset 0xa80 + 0xa80: 0x0001, + 0xa86: 0x0001, 0xa87: 0x0001, 0xa88: 0x0001, 0xa8a: 0x0001, 0xa8b: 0x0001, + 0xa8c: 0x0001, 0xa8d: 0x0001, + 0xa95: 0x0001, 0xa96: 0x0001, + 0xaa2: 0x0001, 0xaa3: 0x0001, + // Block 0x2b, offset 0xac0 + 0xac6: 0x0001, + 0xacc: 0x0001, 0xacd: 0x0001, + 0xae2: 0x0001, 0xae3: 0x0001, + // Block 0x2c, offset 0xb00 + 0xb00: 0x0001, 0xb01: 0x0001, + 0xb3b: 0x0001, + 0xb3c: 0x0001, + // Block 0x2d, offset 0xb40 + 0xb41: 0x0001, 0xb42: 0x0001, 0xb43: 0x0001, 0xb44: 0x0001, + 0xb4d: 0x0001, + 0xb62: 0x0001, 0xb63: 0x0001, + // Block 0x2e, offset 0xb80 + 0xb81: 0x0001, + // Block 0x2f, offset 0xbc0 + 0xbca: 0x0001, + 0xbd2: 0x0001, 0xbd3: 0x0001, 0xbd4: 0x0001, 0xbd6: 0x0001, + // Block 0x30, offset 0xc00 + 0xc31: 0x0001, 0xc34: 0x0001, 0xc35: 0x0001, + 0xc36: 0x0001, 0xc37: 0x0001, 0xc38: 0x0001, 0xc39: 0x0001, 0xc3a: 0x0001, + // Block 0x31, offset 0xc40 + 0xc47: 0x0001, 0xc48: 0x0001, 0xc49: 0x0001, 0xc4a: 0x0001, 0xc4b: 0x0001, + 0xc4c: 0x0001, 0xc4d: 0x0001, 0xc4e: 0x0001, + // Block 0x32, offset 0xc80 + 0xcb1: 0x0001, 0xcb4: 0x0001, 0xcb5: 0x0001, + 0xcb6: 0x0001, 0xcb7: 0x0001, 0xcb8: 0x0001, 0xcb9: 0x0001, 0xcba: 0x0001, 0xcbb: 0x0001, + 0xcbc: 0x0001, + // Block 0x33, offset 0xcc0 + 0xcc8: 0x0001, 0xcc9: 0x0001, 0xcca: 0x0001, 0xccb: 0x0001, + 0xccc: 0x0001, 0xccd: 0x0001, 0xcce: 0x0001, + // Block 0x34, offset 0xd00 + 0xd18: 0x0001, 0xd19: 0x0001, + 0xd35: 0x0001, + 0xd37: 0x0001, 0xd39: 0x0001, + // Block 0x35, offset 0xd40 + 0xd71: 0x0001, 0xd72: 0x0001, 0xd73: 0x0001, 0xd74: 0x0001, 0xd75: 0x0001, + 0xd76: 0x0001, 0xd77: 0x0001, 0xd78: 0x0001, 0xd79: 0x0001, 0xd7a: 0x0001, 0xd7b: 0x0001, + 0xd7c: 0x0001, 0xd7d: 0x0001, 0xd7e: 0x0001, + // Block 0x36, offset 0xd80 + 0xd80: 0x0001, 0xd81: 0x0001, 0xd82: 0x0001, 0xd83: 0x0001, 0xd84: 0x0001, + 0xd86: 0x0001, 0xd87: 0x0001, + 0xd8d: 0x0001, 0xd8e: 0x0001, 0xd8f: 0x0001, 0xd90: 0x0001, 0xd91: 0x0001, + 0xd92: 0x0001, 0xd93: 0x0001, 0xd94: 0x0001, 0xd95: 0x0001, 0xd96: 0x0001, 0xd97: 0x0001, + 0xd99: 0x0001, 0xd9a: 0x0001, 0xd9b: 0x0001, 0xd9c: 0x0001, 0xd9d: 0x0001, + 0xd9e: 0x0001, 0xd9f: 0x0001, 0xda0: 0x0001, 0xda1: 0x0001, 0xda2: 0x0001, 0xda3: 0x0001, + 0xda4: 0x0001, 0xda5: 0x0001, 0xda6: 0x0001, 0xda7: 0x0001, 0xda8: 0x0001, 0xda9: 0x0001, + 0xdaa: 0x0001, 0xdab: 0x0001, 0xdac: 0x0001, 0xdad: 0x0001, 0xdae: 0x0001, 0xdaf: 0x0001, + 0xdb0: 0x0001, 0xdb1: 0x0001, 0xdb2: 0x0001, 0xdb3: 0x0001, 0xdb4: 0x0001, 0xdb5: 0x0001, + 0xdb6: 0x0001, 0xdb7: 0x0001, 0xdb8: 0x0001, 0xdb9: 0x0001, 0xdba: 0x0001, 0xdbb: 0x0001, + 0xdbc: 0x0001, + // Block 0x37, offset 0xdc0 + 0xdc6: 0x0001, + // Block 0x38, offset 0xe00 + 0xe2d: 0x0001, 0xe2e: 0x0001, 0xe2f: 0x0001, + 0xe30: 0x0001, 0xe32: 0x0001, 0xe33: 0x0001, 0xe34: 0x0001, 0xe35: 0x0001, + 0xe36: 0x0001, 0xe37: 0x0001, 0xe39: 0x0001, 0xe3a: 0x0001, + 0xe3d: 0x0001, 0xe3e: 0x0001, + // Block 0x39, offset 0xe40 + 0xe58: 0x0001, 0xe59: 0x0001, + 0xe5e: 0x0001, 0xe5f: 0x0001, 0xe60: 0x0001, + 0xe71: 0x0001, 0xe72: 0x0001, 0xe73: 0x0001, 0xe74: 0x0001, + // Block 0x3a, offset 0xe80 + 0xe82: 0x0001, 0xe85: 0x0001, + 0xe86: 0x0001, + 0xe8d: 0x0001, + 0xe9d: 0x0001, + // Block 0x3b, offset 0xec0 + 0xec0: 0x0002, 0xec1: 0x0002, 0xec2: 0x0002, 0xec3: 0x0002, 0xec4: 0x0002, 0xec5: 0x0002, + 0xec6: 0x0002, 0xec7: 0x0002, 0xec8: 0x0002, 0xec9: 0x0002, 0xeca: 0x0002, 0xecb: 0x0002, + 0xecc: 0x0002, 0xecd: 0x0002, 0xece: 0x0002, 0xecf: 0x0002, 0xed0: 0x0002, 0xed1: 0x0002, + 0xed2: 0x0002, 0xed3: 0x0002, 0xed4: 0x0002, 0xed5: 0x0002, 0xed6: 0x0002, 0xed7: 0x0002, + 0xed8: 0x0002, 0xed9: 0x0002, 0xeda: 0x0002, 0xedb: 0x0002, 0xedc: 0x0002, 0xedd: 0x0002, + 0xede: 0x0002, 0xedf: 0x0002, 0xee0: 0x0002, 0xee1: 0x0002, 0xee2: 0x0002, 0xee3: 0x0002, + 0xee4: 0x0002, 0xee5: 0x0002, 0xee6: 0x0002, 0xee7: 0x0002, 0xee8: 0x0002, 0xee9: 0x0002, + 0xeea: 0x0002, 0xeeb: 0x0002, 0xeec: 0x0002, 0xeed: 0x0002, 0xeee: 0x0002, 0xeef: 0x0002, + 0xef0: 0x0002, 0xef1: 0x0002, 0xef2: 0x0002, 0xef3: 0x0002, 0xef4: 0x0002, 0xef5: 0x0002, + 0xef6: 0x0002, 0xef7: 0x0002, 0xef8: 0x0002, 0xef9: 0x0002, 0xefa: 0x0002, 0xefb: 0x0002, + 0xefc: 0x0002, 0xefd: 0x0002, 0xefe: 0x0002, 0xeff: 0x0002, + // Block 0x3c, offset 0xf00 + 0xf00: 0x0002, 0xf01: 0x0002, 0xf02: 0x0002, 0xf03: 0x0002, 0xf04: 0x0002, 0xf05: 0x0002, + 0xf06: 0x0002, 0xf07: 0x0002, 0xf08: 0x0002, 0xf09: 0x0002, 0xf0a: 0x0002, 0xf0b: 0x0002, + 0xf0c: 0x0002, 0xf0d: 0x0002, 0xf0e: 0x0002, 0xf0f: 0x0002, 0xf10: 0x0002, 0xf11: 0x0002, + 0xf12: 0x0002, 0xf13: 0x0002, 0xf14: 0x0002, 0xf15: 0x0002, 0xf16: 0x0002, 0xf17: 0x0002, + 0xf18: 0x0002, 0xf19: 0x0002, 0xf1a: 0x0002, 0xf1b: 0x0002, 0xf1c: 0x0002, 0xf1d: 0x0002, + 0xf1e: 0x0002, 0xf1f: 0x0002, + // Block 0x3d, offset 0xf40 + 0xf5d: 0x0001, + 0xf5e: 0x0001, 0xf5f: 0x0001, + // Block 0x3e, offset 0xf80 + 0xf92: 0x0001, 0xf93: 0x0001, 0xf94: 0x0001, + 0xfb2: 0x0001, 0xfb3: 0x0001, + // Block 0x3f, offset 0xfc0 + 0xfd2: 0x0001, 0xfd3: 0x0001, + 0xff2: 0x0001, 0xff3: 0x0001, + // Block 0x40, offset 0x1000 + 0x1034: 0x0001, 0x1035: 0x0001, + 0x1037: 0x0001, 0x1038: 0x0001, 0x1039: 0x0001, 0x103a: 0x0001, 0x103b: 0x0001, + 0x103c: 0x0001, 0x103d: 0x0001, + // Block 0x41, offset 0x1040 + 0x1046: 0x0001, 0x1049: 0x0001, 0x104a: 0x0001, 0x104b: 0x0001, + 0x104c: 0x0001, 0x104d: 0x0001, 0x104e: 0x0001, 0x104f: 0x0001, 0x1050: 0x0001, 0x1051: 0x0001, + 0x1052: 0x0001, 0x1053: 0x0001, + 0x105d: 0x0001, + // Block 0x42, offset 0x1080 + 0x108b: 0x0001, + 0x108c: 0x0001, 0x108d: 0x0001, 0x108e: 0x0001, 0x108f: 0x0001, + // Block 0x43, offset 0x10c0 + 0x10c5: 0x0001, + 0x10c6: 0x0001, + 0x10e9: 0x0001, + // Block 0x44, offset 0x1100 + 0x1120: 0x0001, 0x1121: 0x0001, 0x1122: 0x0001, + 0x1127: 0x0001, 0x1128: 0x0001, + 0x1132: 0x0001, + 0x1139: 0x0001, 0x113a: 0x0001, 0x113b: 0x0001, + // Block 0x45, offset 0x1140 + 0x1157: 0x0001, + 0x1158: 0x0001, 0x115b: 0x0001, + // Block 0x46, offset 0x1180 + 0x1196: 0x0001, + 0x1198: 0x0001, 0x1199: 0x0001, 0x119a: 0x0001, 0x119b: 0x0001, 0x119c: 0x0001, 0x119d: 0x0001, + 0x119e: 0x0001, 0x11a0: 0x0001, 0x11a2: 0x0001, + 0x11a5: 0x0001, 0x11a6: 0x0001, 0x11a7: 0x0001, 0x11a8: 0x0001, 0x11a9: 0x0001, + 0x11aa: 0x0001, 0x11ab: 0x0001, 0x11ac: 0x0001, + 0x11b3: 0x0001, 0x11b4: 0x0001, 0x11b5: 0x0001, + 0x11b6: 0x0001, 0x11b7: 0x0001, 0x11b8: 0x0001, 0x11b9: 0x0001, 0x11ba: 0x0001, 0x11bb: 0x0001, + 0x11bc: 0x0001, 0x11bf: 0x0001, + // Block 0x47, offset 0x11c0 + 0x11f0: 0x0001, 0x11f1: 0x0001, 0x11f2: 0x0001, 0x11f3: 0x0001, 0x11f4: 0x0001, 0x11f5: 0x0001, + 0x11f6: 0x0001, 0x11f7: 0x0001, 0x11f8: 0x0001, 0x11f9: 0x0001, 0x11fa: 0x0001, 0x11fb: 0x0001, + 0x11fc: 0x0001, 0x11fd: 0x0001, 0x11fe: 0x0001, 0x11ff: 0x0001, + // Block 0x48, offset 0x1200 + 0x1200: 0x0001, 0x1201: 0x0001, 0x1202: 0x0001, 0x1203: 0x0001, 0x1204: 0x0001, 0x1205: 0x0001, + 0x1206: 0x0001, 0x1207: 0x0001, 0x1208: 0x0001, 0x1209: 0x0001, 0x120a: 0x0001, 0x120b: 0x0001, + 0x120c: 0x0001, 0x120d: 0x0001, 0x120e: 0x0001, + // Block 0x49, offset 0x1240 + 0x1240: 0x0001, 0x1241: 0x0001, 0x1242: 0x0001, 0x1243: 0x0001, + 0x1274: 0x0001, + 0x1276: 0x0001, 0x1277: 0x0001, 0x1278: 0x0001, 0x1279: 0x0001, 0x127a: 0x0001, + 0x127c: 0x0001, + // Block 0x4a, offset 0x1280 + 0x1282: 0x0001, + 0x12ab: 0x0001, 0x12ac: 0x0001, 0x12ad: 0x0001, 0x12ae: 0x0001, 0x12af: 0x0001, + 0x12b0: 0x0001, 0x12b1: 0x0001, 0x12b2: 0x0001, 0x12b3: 0x0001, + // Block 0x4b, offset 0x12c0 + 0x12c0: 0x0001, 0x12c1: 0x0001, + 0x12e2: 0x0001, 0x12e3: 0x0001, + 0x12e4: 0x0001, 0x12e5: 0x0001, 0x12e8: 0x0001, 0x12e9: 0x0001, + 0x12eb: 0x0001, 0x12ec: 0x0001, 0x12ed: 0x0001, + // Block 0x4c, offset 0x1300 + 0x1326: 0x0001, 0x1328: 0x0001, 0x1329: 0x0001, + 0x132d: 0x0001, 0x132f: 0x0001, + 0x1330: 0x0001, 0x1331: 0x0001, + // Block 0x4d, offset 0x1340 + 0x136c: 0x0001, 0x136d: 0x0001, 0x136e: 0x0001, 0x136f: 0x0001, + 0x1370: 0x0001, 0x1371: 0x0001, 0x1372: 0x0001, 0x1373: 0x0001, + 0x1376: 0x0001, 0x1377: 0x0001, + // Block 0x4e, offset 0x1380 + 0x1390: 0x0001, 0x1391: 0x0001, + 0x1392: 0x0001, 0x1394: 0x0001, 0x1395: 0x0001, 0x1396: 0x0001, 0x1397: 0x0001, + 0x1398: 0x0001, 0x1399: 0x0001, 0x139a: 0x0001, 0x139b: 0x0001, 0x139c: 0x0001, 0x139d: 0x0001, + 0x139e: 0x0001, 0x139f: 0x0001, 0x13a0: 0x0001, 0x13a2: 0x0001, 0x13a3: 0x0001, + 0x13a4: 0x0001, 0x13a5: 0x0001, 0x13a6: 0x0001, 0x13a7: 0x0001, 0x13a8: 0x0001, + 0x13ad: 0x0001, + 0x13b4: 0x0001, + 0x13b8: 0x0001, 0x13b9: 0x0001, + // Block 0x4f, offset 0x13c0 + 0x13cb: 0x0001, + 0x13cc: 0x0001, 0x13cd: 0x0001, 0x13ce: 0x0001, 0x13cf: 0x0001, 0x13d0: 0x0003, + 0x13d3: 0x0003, 0x13d4: 0x0003, 0x13d5: 0x0003, 0x13d6: 0x0003, + 0x13d8: 0x0003, 0x13d9: 0x0003, 0x13dc: 0x0003, 0x13dd: 0x0003, + 0x13e0: 0x0003, 0x13e1: 0x0003, 0x13e2: 0x0003, + 0x13e4: 0x0003, 0x13e5: 0x0003, 0x13e6: 0x0003, 0x13e7: 0x0003, 0x13e8: 0x0001, 0x13e9: 0x0001, + 0x13ea: 0x0001, 0x13eb: 0x0001, 0x13ec: 0x0001, 0x13ed: 0x0001, 0x13ee: 0x0001, + 0x13f0: 0x0003, 0x13f2: 0x0003, 0x13f3: 0x0003, 0x13f5: 0x0003, + 0x13fb: 0x0003, + 0x13fe: 0x0003, + // Block 0x50, offset 0x1400 + 0x1420: 0x0001, 0x1421: 0x0001, 0x1422: 0x0001, 0x1423: 0x0001, + 0x1424: 0x0001, 0x1426: 0x0001, 0x1427: 0x0001, 0x1428: 0x0001, 0x1429: 0x0001, + 0x142a: 0x0001, 0x142b: 0x0001, 0x142c: 0x0001, 0x142d: 0x0001, 0x142e: 0x0001, 0x142f: 0x0001, + 0x1434: 0x0003, + 0x143f: 0x0003, + // Block 0x51, offset 0x1440 + 0x1441: 0x0003, 0x1442: 0x0003, 0x1443: 0x0003, 0x1444: 0x0003, + 0x146c: 0x0003, + // Block 0x52, offset 0x1480 + 0x1490: 0x0001, 0x1491: 0x0001, + 0x1492: 0x0001, 0x1493: 0x0001, 0x1494: 0x0001, 0x1495: 0x0001, 0x1496: 0x0001, 0x1497: 0x0001, + 0x1498: 0x0001, 0x1499: 0x0001, 0x149a: 0x0001, 0x149b: 0x0001, 0x149c: 0x0001, 0x149d: 0x0001, + 0x149e: 0x0001, 0x149f: 0x0001, 0x14a0: 0x0001, 0x14a1: 0x0001, 0x14a2: 0x0001, 0x14a3: 0x0001, + 0x14a4: 0x0001, 0x14a5: 0x0001, 0x14a6: 0x0001, 0x14a7: 0x0001, 0x14a8: 0x0001, 0x14a9: 0x0001, + 0x14aa: 0x0001, 0x14ab: 0x0001, 0x14ac: 0x0001, 0x14ad: 0x0001, 0x14ae: 0x0001, 0x14af: 0x0001, + 0x14b0: 0x0001, + // Block 0x53, offset 0x14c0 + 0x14c3: 0x0003, 0x14c5: 0x0003, + 0x14c9: 0x0003, + 0x14d3: 0x0003, 0x14d6: 0x0003, + 0x14e1: 0x0003, 0x14e2: 0x0003, + 0x14e6: 0x0003, + 0x14eb: 0x0003, + // Block 0x54, offset 0x1500 + 0x1513: 0x0003, 0x1514: 0x0003, + 0x151b: 0x0003, 0x151c: 0x0003, 0x151d: 0x0003, + 0x151e: 0x0003, 0x1520: 0x0003, 0x1521: 0x0003, 0x1522: 0x0003, 0x1523: 0x0003, + 0x1524: 0x0003, 0x1525: 0x0003, 0x1526: 0x0003, 0x1527: 0x0003, 0x1528: 0x0003, 0x1529: 0x0003, + 0x152a: 0x0003, 0x152b: 0x0003, + 0x1530: 0x0003, 0x1531: 0x0003, 0x1532: 0x0003, 0x1533: 0x0003, 0x1534: 0x0003, 0x1535: 0x0003, + 0x1536: 0x0003, 0x1537: 0x0003, 0x1538: 0x0003, 0x1539: 0x0003, + // Block 0x55, offset 0x1540 + 0x1549: 0x0003, + 0x1550: 0x0003, 0x1551: 0x0003, + 0x1552: 0x0003, 0x1553: 0x0003, 0x1554: 0x0003, 0x1555: 0x0003, 0x1556: 0x0003, 0x1557: 0x0003, + 0x1558: 0x0003, 0x1559: 0x0003, + 0x1578: 0x0003, 0x1579: 0x0003, + // Block 0x56, offset 0x1580 + 0x1592: 0x0003, 0x1594: 0x0003, + 0x15a7: 0x0003, + // Block 0x57, offset 0x15c0 + 0x15c0: 0x0003, 0x15c2: 0x0003, 0x15c3: 0x0003, + 0x15c7: 0x0003, 0x15c8: 0x0003, 0x15cb: 0x0003, + 0x15cf: 0x0003, 0x15d1: 0x0003, + 0x15d5: 0x0003, + 0x15da: 0x0003, 0x15dd: 0x0003, + 0x15de: 0x0003, 0x15df: 0x0003, 0x15e0: 0x0003, 0x15e3: 0x0003, + 0x15e5: 0x0003, 0x15e7: 0x0003, 0x15e8: 0x0003, 0x15e9: 0x0003, + 0x15ea: 0x0003, 0x15eb: 0x0003, 0x15ec: 0x0003, 0x15ee: 0x0003, + 0x15f4: 0x0003, 0x15f5: 0x0003, + 0x15f6: 0x0003, 0x15f7: 0x0003, + 0x15fc: 0x0003, 0x15fd: 0x0003, + // Block 0x58, offset 0x1600 + 0x1608: 0x0003, + 0x160c: 0x0003, + 0x1612: 0x0003, + 0x1620: 0x0003, 0x1621: 0x0003, + 0x1624: 0x0003, 0x1625: 0x0003, 0x1626: 0x0003, 0x1627: 0x0003, + 0x162a: 0x0003, 0x162b: 0x0003, 0x162e: 0x0003, 0x162f: 0x0003, + // Block 0x59, offset 0x1640 + 0x1642: 0x0003, 0x1643: 0x0003, + 0x1646: 0x0003, 0x1647: 0x0003, + 0x1655: 0x0003, + 0x1659: 0x0003, + 0x1665: 0x0003, + 0x167f: 0x0003, + // Block 0x5a, offset 0x1680 + 0x1692: 0x0003, + 0x169a: 0x0002, 0x169b: 0x0002, + 0x16a9: 0x0002, + 0x16aa: 0x0002, + // Block 0x5b, offset 0x16c0 + 0x16e9: 0x0002, + 0x16ea: 0x0002, 0x16eb: 0x0002, 0x16ec: 0x0002, + 0x16f0: 0x0002, 0x16f3: 0x0002, + // Block 0x5c, offset 0x1700 + 0x1720: 0x0003, 0x1721: 0x0003, 0x1722: 0x0003, 0x1723: 0x0003, + 0x1724: 0x0003, 0x1725: 0x0003, 0x1726: 0x0003, 0x1727: 0x0003, 0x1728: 0x0003, 0x1729: 0x0003, + 0x172a: 0x0003, 0x172b: 0x0003, 0x172c: 0x0003, 0x172d: 0x0003, 0x172e: 0x0003, 0x172f: 0x0003, + 0x1730: 0x0003, 0x1731: 0x0003, 0x1732: 0x0003, 0x1733: 0x0003, 0x1734: 0x0003, 0x1735: 0x0003, + 0x1736: 0x0003, 0x1737: 0x0003, 0x1738: 0x0003, 0x1739: 0x0003, 0x173a: 0x0003, 0x173b: 0x0003, + 0x173c: 0x0003, 0x173d: 0x0003, 0x173e: 0x0003, 0x173f: 0x0003, + // Block 0x5d, offset 0x1740 + 0x1740: 0x0003, 0x1741: 0x0003, 0x1742: 0x0003, 0x1743: 0x0003, 0x1744: 0x0003, 0x1745: 0x0003, + 0x1746: 0x0003, 0x1747: 0x0003, 0x1748: 0x0003, 0x1749: 0x0003, 0x174a: 0x0003, 0x174b: 0x0003, + 0x174c: 0x0003, 0x174d: 0x0003, 0x174e: 0x0003, 0x174f: 0x0003, 0x1750: 0x0003, 0x1751: 0x0003, + 0x1752: 0x0003, 0x1753: 0x0003, 0x1754: 0x0003, 0x1755: 0x0003, 0x1756: 0x0003, 0x1757: 0x0003, + 0x1758: 0x0003, 0x1759: 0x0003, 0x175a: 0x0003, 0x175b: 0x0003, 0x175c: 0x0003, 0x175d: 0x0003, + 0x175e: 0x0003, 0x175f: 0x0003, 0x1760: 0x0003, 0x1761: 0x0003, 0x1762: 0x0003, 0x1763: 0x0003, + 0x1764: 0x0003, 0x1765: 0x0003, 0x1766: 0x0003, 0x1767: 0x0003, 0x1768: 0x0003, 0x1769: 0x0003, + 0x176a: 0x0003, 0x176b: 0x0003, 0x176c: 0x0003, 0x176d: 0x0003, 0x176e: 0x0003, 0x176f: 0x0003, + 0x1770: 0x0003, 0x1771: 0x0003, 0x1772: 0x0003, 0x1773: 0x0003, 0x1774: 0x0003, 0x1775: 0x0003, + 0x1776: 0x0003, 0x1777: 0x0003, 0x1778: 0x0003, 0x1779: 0x0003, 0x177a: 0x0003, 0x177b: 0x0003, + 0x177c: 0x0003, 0x177d: 0x0003, 0x177e: 0x0003, 0x177f: 0x0003, + // Block 0x5e, offset 0x1780 + 0x1780: 0x0003, 0x1781: 0x0003, 0x1782: 0x0003, 0x1783: 0x0003, 0x1784: 0x0003, 0x1785: 0x0003, + 0x1786: 0x0003, 0x1787: 0x0003, 0x1788: 0x0003, 0x1789: 0x0003, 0x178a: 0x0003, 0x178b: 0x0003, + 0x178c: 0x0003, 0x178d: 0x0003, 0x178e: 0x0003, 0x178f: 0x0003, 0x1790: 0x0003, 0x1791: 0x0003, + 0x1792: 0x0003, 0x1793: 0x0003, 0x1794: 0x0003, 0x1795: 0x0003, 0x1796: 0x0003, 0x1797: 0x0003, + 0x1798: 0x0003, 0x1799: 0x0003, 0x179a: 0x0003, 0x179b: 0x0003, 0x179c: 0x0003, 0x179d: 0x0003, + 0x179e: 0x0003, 0x179f: 0x0003, 0x17a0: 0x0003, 0x17a1: 0x0003, 0x17a2: 0x0003, 0x17a3: 0x0003, + 0x17a4: 0x0003, 0x17a5: 0x0003, 0x17a6: 0x0003, 0x17a7: 0x0003, 0x17a8: 0x0003, 0x17a9: 0x0003, + 0x17ab: 0x0003, 0x17ac: 0x0003, 0x17ad: 0x0003, 0x17ae: 0x0003, 0x17af: 0x0003, + 0x17b0: 0x0003, 0x17b1: 0x0003, 0x17b2: 0x0003, 0x17b3: 0x0003, 0x17b4: 0x0003, 0x17b5: 0x0003, + 0x17b6: 0x0003, 0x17b7: 0x0003, 0x17b8: 0x0003, 0x17b9: 0x0003, 0x17ba: 0x0003, 0x17bb: 0x0003, + 0x17bc: 0x0003, 0x17bd: 0x0003, 0x17be: 0x0003, 0x17bf: 0x0003, + // Block 0x5f, offset 0x17c0 + 0x17c0: 0x0003, 0x17c1: 0x0003, 0x17c2: 0x0003, 0x17c3: 0x0003, 0x17c4: 0x0003, 0x17c5: 0x0003, + 0x17c6: 0x0003, 0x17c7: 0x0003, 0x17c8: 0x0003, 0x17c9: 0x0003, 0x17ca: 0x0003, 0x17cb: 0x0003, + 0x17d0: 0x0003, 0x17d1: 0x0003, + 0x17d2: 0x0003, 0x17d3: 0x0003, 0x17d4: 0x0003, 0x17d5: 0x0003, 0x17d6: 0x0003, 0x17d7: 0x0003, + 0x17d8: 0x0003, 0x17d9: 0x0003, 0x17da: 0x0003, 0x17db: 0x0003, 0x17dc: 0x0003, 0x17dd: 0x0003, + 0x17de: 0x0003, 0x17df: 0x0003, 0x17e0: 0x0003, 0x17e1: 0x0003, 0x17e2: 0x0003, 0x17e3: 0x0003, + 0x17e4: 0x0003, 0x17e5: 0x0003, 0x17e6: 0x0003, 0x17e7: 0x0003, 0x17e8: 0x0003, 0x17e9: 0x0003, + 0x17ea: 0x0003, 0x17eb: 0x0003, 0x17ec: 0x0003, 0x17ed: 0x0003, 0x17ee: 0x0003, 0x17ef: 0x0003, + 0x17f0: 0x0003, 0x17f1: 0x0003, 0x17f2: 0x0003, 0x17f3: 0x0003, + // Block 0x60, offset 0x1800 + 0x1800: 0x0003, 0x1801: 0x0003, 0x1802: 0x0003, 0x1803: 0x0003, 0x1804: 0x0003, 0x1805: 0x0003, + 0x1806: 0x0003, 0x1807: 0x0003, 0x1808: 0x0003, 0x1809: 0x0003, 0x180a: 0x0003, 0x180b: 0x0003, + 0x180c: 0x0003, 0x180d: 0x0003, 0x180e: 0x0003, 0x180f: 0x0003, + 0x1812: 0x0003, 0x1813: 0x0003, 0x1814: 0x0003, 0x1815: 0x0003, + 0x1820: 0x0003, 0x1821: 0x0003, 0x1823: 0x0003, + 0x1824: 0x0003, 0x1825: 0x0003, 0x1826: 0x0003, 0x1827: 0x0003, 0x1828: 0x0003, 0x1829: 0x0003, + 0x1832: 0x0003, 0x1833: 0x0003, + 0x1836: 0x0003, 0x1837: 0x0003, + 0x183c: 0x0003, 0x183d: 0x0003, + // Block 0x61, offset 0x1840 + 0x1840: 0x0003, 0x1841: 0x0003, + 0x1846: 0x0003, 0x1847: 0x0003, 0x1848: 0x0003, 0x184b: 0x0003, + 0x184e: 0x0003, 0x184f: 0x0003, 0x1850: 0x0003, 0x1851: 0x0003, + 0x1862: 0x0003, 0x1863: 0x0003, + 0x1864: 0x0003, 0x1865: 0x0003, + 0x186f: 0x0003, + 0x187d: 0x0002, 0x187e: 0x0002, + // Block 0x62, offset 0x1880 + 0x1885: 0x0003, + 0x1886: 0x0003, 0x1889: 0x0003, + 0x188e: 0x0003, 0x188f: 0x0003, + 0x1894: 0x0002, 0x1895: 0x0002, + 0x189c: 0x0003, + 0x189e: 0x0003, + 0x18b0: 0x0002, 0x18b1: 0x0002, 0x18b2: 0x0002, 0x18b3: 0x0002, 0x18b4: 0x0002, 0x18b5: 0x0002, + 0x18b6: 0x0002, 0x18b7: 0x0002, + // Block 0x63, offset 0x18c0 + 0x18c0: 0x0003, 0x18c2: 0x0003, + 0x18c8: 0x0002, 0x18c9: 0x0002, 0x18ca: 0x0002, 0x18cb: 0x0002, + 0x18cc: 0x0002, 0x18cd: 0x0002, 0x18ce: 0x0002, 0x18cf: 0x0002, 0x18d0: 0x0002, 0x18d1: 0x0002, + 0x18d2: 0x0002, 0x18d3: 0x0002, + 0x18e0: 0x0003, 0x18e1: 0x0003, 0x18e3: 0x0003, + 0x18e4: 0x0003, 0x18e5: 0x0003, 0x18e7: 0x0003, 0x18e8: 0x0003, 0x18e9: 0x0003, + 0x18ea: 0x0003, 0x18ec: 0x0003, 0x18ed: 0x0003, 0x18ef: 0x0003, + 0x18ff: 0x0002, + // Block 0x64, offset 0x1900 + 0x190a: 0x0002, 0x190b: 0x0002, + 0x190c: 0x0002, 0x190d: 0x0002, 0x190e: 0x0002, 0x190f: 0x0002, + 0x1913: 0x0002, + 0x191e: 0x0003, 0x191f: 0x0003, 0x1921: 0x0002, + 0x192a: 0x0002, 0x192b: 0x0002, + 0x193d: 0x0002, 0x193e: 0x0002, 0x193f: 0x0003, + // Block 0x65, offset 0x1940 + 0x1944: 0x0002, 0x1945: 0x0002, + 0x1946: 0x0003, 0x1947: 0x0003, 0x1948: 0x0003, 0x1949: 0x0003, 0x194a: 0x0003, 0x194b: 0x0003, + 0x194c: 0x0003, 0x194d: 0x0003, 0x194e: 0x0002, 0x194f: 0x0003, 0x1950: 0x0003, 0x1951: 0x0003, + 0x1952: 0x0003, 0x1953: 0x0003, 0x1954: 0x0002, 0x1955: 0x0003, 0x1956: 0x0003, 0x1957: 0x0003, + 0x1958: 0x0003, 0x1959: 0x0003, 0x195a: 0x0003, 0x195b: 0x0003, 0x195c: 0x0003, 0x195d: 0x0003, + 0x195e: 0x0003, 0x195f: 0x0003, 0x1960: 0x0003, 0x1961: 0x0003, 0x1963: 0x0003, + 0x1968: 0x0003, 0x1969: 0x0003, + 0x196a: 0x0002, 0x196b: 0x0003, 0x196c: 0x0003, 0x196d: 0x0003, 0x196e: 0x0003, 0x196f: 0x0003, + 0x1970: 0x0003, 0x1971: 0x0003, 0x1972: 0x0002, 0x1973: 0x0002, 0x1974: 0x0003, 0x1975: 0x0002, + 0x1976: 0x0003, 0x1977: 0x0003, 0x1978: 0x0003, 0x1979: 0x0003, 0x197a: 0x0002, 0x197b: 0x0003, + 0x197c: 0x0003, 0x197d: 0x0002, 0x197e: 0x0003, 0x197f: 0x0003, + // Block 0x66, offset 0x1980 + 0x1985: 0x0002, + 0x198a: 0x0002, 0x198b: 0x0002, + 0x19a8: 0x0002, + 0x19bd: 0x0003, + // Block 0x67, offset 0x19c0 + 0x19cc: 0x0002, 0x19ce: 0x0002, + 0x19d3: 0x0002, 0x19d4: 0x0002, 0x19d5: 0x0002, 0x19d7: 0x0002, + 0x19f6: 0x0003, 0x19f7: 0x0003, 0x19f8: 0x0003, 0x19f9: 0x0003, 0x19fa: 0x0003, 0x19fb: 0x0003, + 0x19fc: 0x0003, 0x19fd: 0x0003, 0x19fe: 0x0003, 0x19ff: 0x0003, + // Block 0x68, offset 0x1a00 + 0x1a15: 0x0002, 0x1a16: 0x0002, 0x1a17: 0x0002, + 0x1a30: 0x0002, + 0x1a3f: 0x0002, + // Block 0x69, offset 0x1a40 + 0x1a5b: 0x0002, 0x1a5c: 0x0002, + // Block 0x6a, offset 0x1a80 + 0x1a90: 0x0002, + 0x1a95: 0x0002, 0x1a96: 0x0003, 0x1a97: 0x0003, + 0x1a98: 0x0003, 0x1a99: 0x0003, + // Block 0x6b, offset 0x1ac0 + 0x1aef: 0x0001, + 0x1af0: 0x0001, 0x1af1: 0x0001, + // Block 0x6c, offset 0x1b00 + 0x1b3f: 0x0001, + // Block 0x6d, offset 0x1b40 + 0x1b60: 0x0001, 0x1b61: 0x0001, 0x1b62: 0x0001, 0x1b63: 0x0001, + 0x1b64: 0x0001, 0x1b65: 0x0001, 0x1b66: 0x0001, 0x1b67: 0x0001, 0x1b68: 0x0001, 0x1b69: 0x0001, + 0x1b6a: 0x0001, 0x1b6b: 0x0001, 0x1b6c: 0x0001, 0x1b6d: 0x0001, 0x1b6e: 0x0001, 0x1b6f: 0x0001, + 0x1b70: 0x0001, 0x1b71: 0x0001, 0x1b72: 0x0001, 0x1b73: 0x0001, 0x1b74: 0x0001, 0x1b75: 0x0001, + 0x1b76: 0x0001, 0x1b77: 0x0001, 0x1b78: 0x0001, 0x1b79: 0x0001, 0x1b7a: 0x0001, 0x1b7b: 0x0001, + 0x1b7c: 0x0001, 0x1b7d: 0x0001, 0x1b7e: 0x0001, 0x1b7f: 0x0001, + // Block 0x6e, offset 0x1b80 + 0x1b80: 0x0002, 0x1b81: 0x0002, 0x1b82: 0x0002, 0x1b83: 0x0002, 0x1b84: 0x0002, 0x1b85: 0x0002, + 0x1b86: 0x0002, 0x1b87: 0x0002, 0x1b88: 0x0002, 0x1b89: 0x0002, 0x1b8a: 0x0002, 0x1b8b: 0x0002, + 0x1b8c: 0x0002, 0x1b8d: 0x0002, 0x1b8e: 0x0002, 0x1b8f: 0x0002, 0x1b90: 0x0002, 0x1b91: 0x0002, + 0x1b92: 0x0002, 0x1b93: 0x0002, 0x1b94: 0x0002, 0x1b95: 0x0002, 0x1b96: 0x0002, 0x1b97: 0x0002, + 0x1b98: 0x0002, 0x1b99: 0x0002, 0x1b9b: 0x0002, 0x1b9c: 0x0002, 0x1b9d: 0x0002, + 0x1b9e: 0x0002, 0x1b9f: 0x0002, 0x1ba0: 0x0002, 0x1ba1: 0x0002, 0x1ba2: 0x0002, 0x1ba3: 0x0002, + 0x1ba4: 0x0002, 0x1ba5: 0x0002, 0x1ba6: 0x0002, 0x1ba7: 0x0002, 0x1ba8: 0x0002, 0x1ba9: 0x0002, + 0x1baa: 0x0002, 0x1bab: 0x0002, 0x1bac: 0x0002, 0x1bad: 0x0002, 0x1bae: 0x0002, 0x1baf: 0x0002, + 0x1bb0: 0x0002, 0x1bb1: 0x0002, 0x1bb2: 0x0002, 0x1bb3: 0x0002, 0x1bb4: 0x0002, 0x1bb5: 0x0002, + 0x1bb6: 0x0002, 0x1bb7: 0x0002, 0x1bb8: 0x0002, 0x1bb9: 0x0002, 0x1bba: 0x0002, 0x1bbb: 0x0002, + 0x1bbc: 0x0002, 0x1bbd: 0x0002, 0x1bbe: 0x0002, 0x1bbf: 0x0002, + // Block 0x6f, offset 0x1bc0 + 0x1bc0: 0x0002, 0x1bc1: 0x0002, 0x1bc2: 0x0002, 0x1bc3: 0x0002, 0x1bc4: 0x0002, 0x1bc5: 0x0002, + 0x1bc6: 0x0002, 0x1bc7: 0x0002, 0x1bc8: 0x0002, 0x1bc9: 0x0002, 0x1bca: 0x0002, 0x1bcb: 0x0002, + 0x1bcc: 0x0002, 0x1bcd: 0x0002, 0x1bce: 0x0002, 0x1bcf: 0x0002, 0x1bd0: 0x0002, 0x1bd1: 0x0002, + 0x1bd2: 0x0002, 0x1bd3: 0x0002, 0x1bd4: 0x0002, 0x1bd5: 0x0002, 0x1bd6: 0x0002, 0x1bd7: 0x0002, + 0x1bd8: 0x0002, 0x1bd9: 0x0002, 0x1bda: 0x0002, 0x1bdb: 0x0002, 0x1bdc: 0x0002, 0x1bdd: 0x0002, + 0x1bde: 0x0002, 0x1bdf: 0x0002, 0x1be0: 0x0002, 0x1be1: 0x0002, 0x1be2: 0x0002, 0x1be3: 0x0002, + 0x1be4: 0x0002, 0x1be5: 0x0002, 0x1be6: 0x0002, 0x1be7: 0x0002, 0x1be8: 0x0002, 0x1be9: 0x0002, + 0x1bea: 0x0002, 0x1beb: 0x0002, 0x1bec: 0x0002, 0x1bed: 0x0002, 0x1bee: 0x0002, 0x1bef: 0x0002, + 0x1bf0: 0x0002, 0x1bf1: 0x0002, 0x1bf2: 0x0002, 0x1bf3: 0x0002, + // Block 0x70, offset 0x1c00 + 0x1c00: 0x0002, 0x1c01: 0x0002, 0x1c02: 0x0002, 0x1c03: 0x0002, 0x1c04: 0x0002, 0x1c05: 0x0002, + 0x1c06: 0x0002, 0x1c07: 0x0002, 0x1c08: 0x0002, 0x1c09: 0x0002, 0x1c0a: 0x0002, 0x1c0b: 0x0002, + 0x1c0c: 0x0002, 0x1c0d: 0x0002, 0x1c0e: 0x0002, 0x1c0f: 0x0002, 0x1c10: 0x0002, 0x1c11: 0x0002, + 0x1c12: 0x0002, 0x1c13: 0x0002, 0x1c14: 0x0002, 0x1c15: 0x0002, + 0x1c30: 0x0002, 0x1c31: 0x0002, 0x1c32: 0x0002, 0x1c33: 0x0002, 0x1c34: 0x0002, 0x1c35: 0x0002, + 0x1c36: 0x0002, 0x1c37: 0x0002, 0x1c38: 0x0002, 0x1c39: 0x0002, 0x1c3a: 0x0002, 0x1c3b: 0x0002, + 0x1c3c: 0x0002, 0x1c3d: 0x0002, 0x1c3e: 0x0002, 0x1c3f: 0x0002, + // Block 0x71, offset 0x1c40 + 0x1c40: 0x0002, 0x1c41: 0x0002, 0x1c42: 0x0002, 0x1c43: 0x0002, 0x1c44: 0x0002, 0x1c45: 0x0002, + 0x1c46: 0x0002, 0x1c47: 0x0002, 0x1c48: 0x0002, 0x1c49: 0x0002, 0x1c4a: 0x0002, 0x1c4b: 0x0002, + 0x1c4c: 0x0002, 0x1c4d: 0x0002, 0x1c4e: 0x0002, 0x1c4f: 0x0002, 0x1c50: 0x0002, 0x1c51: 0x0002, + 0x1c52: 0x0002, 0x1c53: 0x0002, 0x1c54: 0x0002, 0x1c55: 0x0002, 0x1c56: 0x0002, 0x1c57: 0x0002, + 0x1c58: 0x0002, 0x1c59: 0x0002, 0x1c5a: 0x0002, 0x1c5b: 0x0002, 0x1c5c: 0x0002, 0x1c5d: 0x0002, + 0x1c5e: 0x0002, 0x1c5f: 0x0002, 0x1c60: 0x0002, 0x1c61: 0x0002, 0x1c62: 0x0002, 0x1c63: 0x0002, + 0x1c64: 0x0002, 0x1c65: 0x0002, 0x1c66: 0x0002, 0x1c67: 0x0002, 0x1c68: 0x0002, 0x1c69: 0x0002, + 0x1c6a: 0x0001, 0x1c6b: 0x0001, 0x1c6c: 0x0001, 0x1c6d: 0x0001, 0x1c6e: 0x0002, 0x1c6f: 0x0002, + 0x1c70: 0x0002, 0x1c71: 0x0002, 0x1c72: 0x0002, 0x1c73: 0x0002, 0x1c74: 0x0002, 0x1c75: 0x0002, + 0x1c76: 0x0002, 0x1c77: 0x0002, 0x1c78: 0x0002, 0x1c79: 0x0002, 0x1c7a: 0x0002, 0x1c7b: 0x0002, + 0x1c7c: 0x0002, 0x1c7d: 0x0002, 0x1c7e: 0x0002, + // Block 0x72, offset 0x1c80 + 0x1c81: 0x0002, 0x1c82: 0x0002, 0x1c83: 0x0002, 0x1c84: 0x0002, 0x1c85: 0x0002, + 0x1c86: 0x0002, 0x1c87: 0x0002, 0x1c88: 0x0002, 0x1c89: 0x0002, 0x1c8a: 0x0002, 0x1c8b: 0x0002, + 0x1c8c: 0x0002, 0x1c8d: 0x0002, 0x1c8e: 0x0002, 0x1c8f: 0x0002, 0x1c90: 0x0002, 0x1c91: 0x0002, + 0x1c92: 0x0002, 0x1c93: 0x0002, 0x1c94: 0x0002, 0x1c95: 0x0002, 0x1c96: 0x0002, 0x1c97: 0x0002, + 0x1c98: 0x0002, 0x1c99: 0x0002, 0x1c9a: 0x0002, 0x1c9b: 0x0002, 0x1c9c: 0x0002, 0x1c9d: 0x0002, + 0x1c9e: 0x0002, 0x1c9f: 0x0002, 0x1ca0: 0x0002, 0x1ca1: 0x0002, 0x1ca2: 0x0002, 0x1ca3: 0x0002, + 0x1ca4: 0x0002, 0x1ca5: 0x0002, 0x1ca6: 0x0002, 0x1ca7: 0x0002, 0x1ca8: 0x0002, 0x1ca9: 0x0002, + 0x1caa: 0x0002, 0x1cab: 0x0002, 0x1cac: 0x0002, 0x1cad: 0x0002, 0x1cae: 0x0002, 0x1caf: 0x0002, + 0x1cb0: 0x0002, 0x1cb1: 0x0002, 0x1cb2: 0x0002, 0x1cb3: 0x0002, 0x1cb4: 0x0002, 0x1cb5: 0x0002, + 0x1cb6: 0x0002, 0x1cb7: 0x0002, 0x1cb8: 0x0002, 0x1cb9: 0x0002, 0x1cba: 0x0002, 0x1cbb: 0x0002, + 0x1cbc: 0x0002, 0x1cbd: 0x0002, 0x1cbe: 0x0002, 0x1cbf: 0x0002, + // Block 0x73, offset 0x1cc0 + 0x1cc0: 0x0002, 0x1cc1: 0x0002, 0x1cc2: 0x0002, 0x1cc3: 0x0002, 0x1cc4: 0x0002, 0x1cc5: 0x0002, + 0x1cc6: 0x0002, 0x1cc7: 0x0002, 0x1cc8: 0x0002, 0x1cc9: 0x0002, 0x1cca: 0x0002, 0x1ccb: 0x0002, + 0x1ccc: 0x0002, 0x1ccd: 0x0002, 0x1cce: 0x0002, 0x1ccf: 0x0002, 0x1cd0: 0x0002, 0x1cd1: 0x0002, + 0x1cd2: 0x0002, 0x1cd3: 0x0002, 0x1cd4: 0x0002, 0x1cd5: 0x0002, 0x1cd6: 0x0002, + 0x1cd9: 0x0001, 0x1cda: 0x0001, 0x1cdb: 0x0002, 0x1cdc: 0x0002, 0x1cdd: 0x0002, + 0x1cde: 0x0002, 0x1cdf: 0x0002, 0x1ce0: 0x0002, 0x1ce1: 0x0002, 0x1ce2: 0x0002, 0x1ce3: 0x0002, + 0x1ce4: 0x0002, 0x1ce5: 0x0002, 0x1ce6: 0x0002, 0x1ce7: 0x0002, 0x1ce8: 0x0002, 0x1ce9: 0x0002, + 0x1cea: 0x0002, 0x1ceb: 0x0002, 0x1cec: 0x0002, 0x1ced: 0x0002, 0x1cee: 0x0002, 0x1cef: 0x0002, + 0x1cf0: 0x0002, 0x1cf1: 0x0002, 0x1cf2: 0x0002, 0x1cf3: 0x0002, 0x1cf4: 0x0002, 0x1cf5: 0x0002, + 0x1cf6: 0x0002, 0x1cf7: 0x0002, 0x1cf8: 0x0002, 0x1cf9: 0x0002, 0x1cfa: 0x0002, 0x1cfb: 0x0002, + 0x1cfc: 0x0002, 0x1cfd: 0x0002, 0x1cfe: 0x0002, 0x1cff: 0x0002, + // Block 0x74, offset 0x1d00 + 0x1d05: 0x0002, + 0x1d06: 0x0002, 0x1d07: 0x0002, 0x1d08: 0x0002, 0x1d09: 0x0002, 0x1d0a: 0x0002, 0x1d0b: 0x0002, + 0x1d0c: 0x0002, 0x1d0d: 0x0002, 0x1d0e: 0x0002, 0x1d0f: 0x0002, 0x1d10: 0x0002, 0x1d11: 0x0002, + 0x1d12: 0x0002, 0x1d13: 0x0002, 0x1d14: 0x0002, 0x1d15: 0x0002, 0x1d16: 0x0002, 0x1d17: 0x0002, + 0x1d18: 0x0002, 0x1d19: 0x0002, 0x1d1a: 0x0002, 0x1d1b: 0x0002, 0x1d1c: 0x0002, 0x1d1d: 0x0002, + 0x1d1e: 0x0002, 0x1d1f: 0x0002, 0x1d20: 0x0002, 0x1d21: 0x0002, 0x1d22: 0x0002, 0x1d23: 0x0002, + 0x1d24: 0x0002, 0x1d25: 0x0002, 0x1d26: 0x0002, 0x1d27: 0x0002, 0x1d28: 0x0002, 0x1d29: 0x0002, + 0x1d2a: 0x0002, 0x1d2b: 0x0002, 0x1d2c: 0x0002, 0x1d2d: 0x0002, 0x1d2e: 0x0002, 0x1d2f: 0x0002, + 0x1d31: 0x0002, 0x1d32: 0x0002, 0x1d33: 0x0002, 0x1d34: 0x0002, 0x1d35: 0x0002, + 0x1d36: 0x0002, 0x1d37: 0x0002, 0x1d38: 0x0002, 0x1d39: 0x0002, 0x1d3a: 0x0002, 0x1d3b: 0x0002, + 0x1d3c: 0x0002, 0x1d3d: 0x0002, 0x1d3e: 0x0002, 0x1d3f: 0x0002, + // Block 0x75, offset 0x1d40 + 0x1d40: 0x0002, 0x1d41: 0x0002, 0x1d42: 0x0002, 0x1d43: 0x0002, 0x1d44: 0x0002, 0x1d45: 0x0002, + 0x1d46: 0x0002, 0x1d47: 0x0002, 0x1d48: 0x0002, 0x1d49: 0x0002, 0x1d4a: 0x0002, 0x1d4b: 0x0002, + 0x1d4c: 0x0002, 0x1d4d: 0x0002, 0x1d4e: 0x0002, 0x1d50: 0x0002, 0x1d51: 0x0002, + 0x1d52: 0x0002, 0x1d53: 0x0002, 0x1d54: 0x0002, 0x1d55: 0x0002, 0x1d56: 0x0002, 0x1d57: 0x0002, + 0x1d58: 0x0002, 0x1d59: 0x0002, 0x1d5a: 0x0002, 0x1d5b: 0x0002, 0x1d5c: 0x0002, 0x1d5d: 0x0002, + 0x1d5e: 0x0002, 0x1d5f: 0x0002, 0x1d60: 0x0002, 0x1d61: 0x0002, 0x1d62: 0x0002, 0x1d63: 0x0002, + 0x1d64: 0x0002, 0x1d65: 0x0002, 0x1d66: 0x0002, 0x1d67: 0x0002, 0x1d68: 0x0002, 0x1d69: 0x0002, + 0x1d6a: 0x0002, 0x1d6b: 0x0002, 0x1d6c: 0x0002, 0x1d6d: 0x0002, 0x1d6e: 0x0002, 0x1d6f: 0x0002, + 0x1d70: 0x0002, 0x1d71: 0x0002, 0x1d72: 0x0002, 0x1d73: 0x0002, 0x1d74: 0x0002, 0x1d75: 0x0002, + 0x1d76: 0x0002, 0x1d77: 0x0002, 0x1d78: 0x0002, 0x1d79: 0x0002, 0x1d7a: 0x0002, 0x1d7b: 0x0002, + 0x1d7c: 0x0002, 0x1d7d: 0x0002, 0x1d7e: 0x0002, 0x1d7f: 0x0002, + // Block 0x76, offset 0x1d80 + 0x1d80: 0x0002, 0x1d81: 0x0002, 0x1d82: 0x0002, 0x1d83: 0x0002, 0x1d84: 0x0002, 0x1d85: 0x0002, + 0x1d86: 0x0002, 0x1d87: 0x0002, 0x1d88: 0x0002, 0x1d89: 0x0002, 0x1d8a: 0x0002, 0x1d8b: 0x0002, + 0x1d8c: 0x0002, 0x1d8d: 0x0002, 0x1d8e: 0x0002, 0x1d8f: 0x0002, 0x1d90: 0x0002, 0x1d91: 0x0002, + 0x1d92: 0x0002, 0x1d93: 0x0002, 0x1d94: 0x0002, 0x1d95: 0x0002, 0x1d96: 0x0002, 0x1d97: 0x0002, + 0x1d98: 0x0002, 0x1d99: 0x0002, 0x1d9a: 0x0002, 0x1d9b: 0x0002, 0x1d9c: 0x0002, 0x1d9d: 0x0002, + 0x1d9e: 0x0002, 0x1d9f: 0x0002, 0x1da0: 0x0002, 0x1da1: 0x0002, 0x1da2: 0x0002, 0x1da3: 0x0002, + 0x1da4: 0x0002, 0x1da5: 0x0002, + 0x1daf: 0x0002, + 0x1db0: 0x0002, 0x1db1: 0x0002, 0x1db2: 0x0002, 0x1db3: 0x0002, 0x1db4: 0x0002, 0x1db5: 0x0002, + 0x1db6: 0x0002, 0x1db7: 0x0002, 0x1db8: 0x0002, 0x1db9: 0x0002, 0x1dba: 0x0002, 0x1dbb: 0x0002, + 0x1dbc: 0x0002, 0x1dbd: 0x0002, 0x1dbe: 0x0002, 0x1dbf: 0x0002, + // Block 0x77, offset 0x1dc0 + 0x1dc0: 0x0002, 0x1dc1: 0x0002, 0x1dc2: 0x0002, 0x1dc3: 0x0002, 0x1dc4: 0x0002, 0x1dc5: 0x0002, + 0x1dc6: 0x0002, 0x1dc7: 0x0002, 0x1dc8: 0x0002, 0x1dc9: 0x0002, 0x1dca: 0x0002, 0x1dcb: 0x0002, + 0x1dcc: 0x0002, 0x1dcd: 0x0002, 0x1dce: 0x0002, 0x1dcf: 0x0002, 0x1dd0: 0x0002, 0x1dd1: 0x0002, + 0x1dd2: 0x0002, 0x1dd3: 0x0002, 0x1dd4: 0x0002, 0x1dd5: 0x0002, 0x1dd6: 0x0002, 0x1dd7: 0x0002, + 0x1dd8: 0x0002, 0x1dd9: 0x0002, 0x1dda: 0x0002, 0x1ddb: 0x0002, 0x1ddc: 0x0002, 0x1ddd: 0x0002, + 0x1dde: 0x0002, 0x1de0: 0x0002, 0x1de1: 0x0002, 0x1de2: 0x0002, 0x1de3: 0x0002, + 0x1de4: 0x0002, 0x1de5: 0x0002, 0x1de6: 0x0002, 0x1de7: 0x0002, 0x1de8: 0x0002, 0x1de9: 0x0002, + 0x1dea: 0x0002, 0x1deb: 0x0002, 0x1dec: 0x0002, 0x1ded: 0x0002, 0x1dee: 0x0002, 0x1def: 0x0002, + 0x1df0: 0x0002, 0x1df1: 0x0002, 0x1df2: 0x0002, 0x1df3: 0x0002, 0x1df4: 0x0002, 0x1df5: 0x0002, + 0x1df6: 0x0002, 0x1df7: 0x0002, 0x1df8: 0x0002, 0x1df9: 0x0002, 0x1dfa: 0x0002, 0x1dfb: 0x0002, + 0x1dfc: 0x0002, 0x1dfd: 0x0002, 0x1dfe: 0x0002, 0x1dff: 0x0002, + // Block 0x78, offset 0x1e00 + 0x1e00: 0x0002, 0x1e01: 0x0002, 0x1e02: 0x0002, 0x1e03: 0x0002, 0x1e04: 0x0002, 0x1e05: 0x0002, + 0x1e06: 0x0002, 0x1e07: 0x0002, 0x1e08: 0x0003, 0x1e09: 0x0003, 0x1e0a: 0x0003, 0x1e0b: 0x0003, + 0x1e0c: 0x0003, 0x1e0d: 0x0003, 0x1e0e: 0x0003, 0x1e0f: 0x0003, 0x1e10: 0x0002, 0x1e11: 0x0002, + 0x1e12: 0x0002, 0x1e13: 0x0002, 0x1e14: 0x0002, 0x1e15: 0x0002, 0x1e16: 0x0002, 0x1e17: 0x0002, + 0x1e18: 0x0002, 0x1e19: 0x0002, 0x1e1a: 0x0002, 0x1e1b: 0x0002, 0x1e1c: 0x0002, 0x1e1d: 0x0002, + 0x1e1e: 0x0002, 0x1e1f: 0x0002, 0x1e20: 0x0002, 0x1e21: 0x0002, 0x1e22: 0x0002, 0x1e23: 0x0002, + 0x1e24: 0x0002, 0x1e25: 0x0002, 0x1e26: 0x0002, 0x1e27: 0x0002, 0x1e28: 0x0002, 0x1e29: 0x0002, + 0x1e2a: 0x0002, 0x1e2b: 0x0002, 0x1e2c: 0x0002, 0x1e2d: 0x0002, 0x1e2e: 0x0002, 0x1e2f: 0x0002, + 0x1e30: 0x0002, 0x1e31: 0x0002, 0x1e32: 0x0002, 0x1e33: 0x0002, 0x1e34: 0x0002, 0x1e35: 0x0002, + 0x1e36: 0x0002, 0x1e37: 0x0002, 0x1e38: 0x0002, 0x1e39: 0x0002, 0x1e3a: 0x0002, 0x1e3b: 0x0002, + 0x1e3c: 0x0002, 0x1e3d: 0x0002, 0x1e3e: 0x0002, 0x1e3f: 0x0002, + // Block 0x79, offset 0x1e40 + 0x1e40: 0x0002, 0x1e41: 0x0002, 0x1e42: 0x0002, 0x1e43: 0x0002, 0x1e44: 0x0002, 0x1e45: 0x0002, + 0x1e46: 0x0002, 0x1e47: 0x0002, 0x1e48: 0x0002, 0x1e49: 0x0002, 0x1e4a: 0x0002, 0x1e4b: 0x0002, + 0x1e4c: 0x0002, 0x1e50: 0x0002, 0x1e51: 0x0002, + 0x1e52: 0x0002, 0x1e53: 0x0002, 0x1e54: 0x0002, 0x1e55: 0x0002, 0x1e56: 0x0002, 0x1e57: 0x0002, + 0x1e58: 0x0002, 0x1e59: 0x0002, 0x1e5a: 0x0002, 0x1e5b: 0x0002, 0x1e5c: 0x0002, 0x1e5d: 0x0002, + 0x1e5e: 0x0002, 0x1e5f: 0x0002, 0x1e60: 0x0002, 0x1e61: 0x0002, 0x1e62: 0x0002, 0x1e63: 0x0002, + 0x1e64: 0x0002, 0x1e65: 0x0002, 0x1e66: 0x0002, 0x1e67: 0x0002, 0x1e68: 0x0002, 0x1e69: 0x0002, + 0x1e6a: 0x0002, 0x1e6b: 0x0002, 0x1e6c: 0x0002, 0x1e6d: 0x0002, 0x1e6e: 0x0002, 0x1e6f: 0x0002, + 0x1e70: 0x0002, 0x1e71: 0x0002, 0x1e72: 0x0002, 0x1e73: 0x0002, 0x1e74: 0x0002, 0x1e75: 0x0002, + 0x1e76: 0x0002, 0x1e77: 0x0002, 0x1e78: 0x0002, 0x1e79: 0x0002, 0x1e7a: 0x0002, 0x1e7b: 0x0002, + 0x1e7c: 0x0002, 0x1e7d: 0x0002, 0x1e7e: 0x0002, 0x1e7f: 0x0002, + // Block 0x7a, offset 0x1e80 + 0x1e80: 0x0002, 0x1e81: 0x0002, 0x1e82: 0x0002, 0x1e83: 0x0002, 0x1e84: 0x0002, 0x1e85: 0x0002, + 0x1e86: 0x0002, + // Block 0x7b, offset 0x1ec0 + 0x1eef: 0x0001, + 0x1ef0: 0x0001, 0x1ef1: 0x0001, 0x1ef2: 0x0001, 0x1ef4: 0x0001, 0x1ef5: 0x0001, + 0x1ef6: 0x0001, 0x1ef7: 0x0001, 0x1ef8: 0x0001, 0x1ef9: 0x0001, 0x1efa: 0x0001, 0x1efb: 0x0001, + 0x1efc: 0x0001, 0x1efd: 0x0001, + // Block 0x7c, offset 0x1f00 + 0x1f1e: 0x0001, 0x1f1f: 0x0001, + // Block 0x7d, offset 0x1f40 + 0x1f70: 0x0001, 0x1f71: 0x0001, + // Block 0x7e, offset 0x1f80 + 0x1f82: 0x0001, + 0x1f86: 0x0001, 0x1f8b: 0x0001, + 0x1fa5: 0x0001, 0x1fa6: 0x0001, + 0x1fac: 0x0001, + // Block 0x7f, offset 0x1fc0 + 0x1fc4: 0x0001, 0x1fc5: 0x0001, + 0x1fe0: 0x0001, 0x1fe1: 0x0001, 0x1fe2: 0x0001, 0x1fe3: 0x0001, + 0x1fe4: 0x0001, 0x1fe5: 0x0001, 0x1fe6: 0x0001, 0x1fe7: 0x0001, 0x1fe8: 0x0001, 0x1fe9: 0x0001, + 0x1fea: 0x0001, 0x1feb: 0x0001, 0x1fec: 0x0001, 0x1fed: 0x0001, 0x1fee: 0x0001, 0x1fef: 0x0001, + 0x1ff0: 0x0001, 0x1ff1: 0x0001, + 0x1fff: 0x0001, + // Block 0x80, offset 0x2000 + 0x2026: 0x0001, 0x2027: 0x0001, 0x2028: 0x0001, 0x2029: 0x0001, + 0x202a: 0x0001, 0x202b: 0x0001, 0x202c: 0x0001, 0x202d: 0x0001, + // Block 0x81, offset 0x2040 + 0x2047: 0x0001, 0x2048: 0x0001, 0x2049: 0x0001, 0x204a: 0x0001, 0x204b: 0x0001, + 0x204c: 0x0001, 0x204d: 0x0001, 0x204e: 0x0001, 0x204f: 0x0001, 0x2050: 0x0001, 0x2051: 0x0001, + 0x2060: 0x0002, 0x2061: 0x0002, 0x2062: 0x0002, 0x2063: 0x0002, + 0x2064: 0x0002, 0x2065: 0x0002, 0x2066: 0x0002, 0x2067: 0x0002, 0x2068: 0x0002, 0x2069: 0x0002, + 0x206a: 0x0002, 0x206b: 0x0002, 0x206c: 0x0002, 0x206d: 0x0002, 0x206e: 0x0002, 0x206f: 0x0002, + 0x2070: 0x0002, 0x2071: 0x0002, 0x2072: 0x0002, 0x2073: 0x0002, 0x2074: 0x0002, 0x2075: 0x0002, + 0x2076: 0x0002, 0x2077: 0x0002, 0x2078: 0x0002, 0x2079: 0x0002, 0x207a: 0x0002, 0x207b: 0x0002, + 0x207c: 0x0002, + // Block 0x82, offset 0x2080 + 0x2080: 0x0001, 0x2081: 0x0001, 0x2082: 0x0001, + 0x20b3: 0x0001, + 0x20b6: 0x0001, 0x20b7: 0x0001, 0x20b8: 0x0001, 0x20b9: 0x0001, + 0x20bc: 0x0001, 0x20bd: 0x0001, + // Block 0x83, offset 0x20c0 + 0x20e5: 0x0001, + // Block 0x84, offset 0x2100 + 0x2129: 0x0001, + 0x212a: 0x0001, 0x212b: 0x0001, 0x212c: 0x0001, 0x212d: 0x0001, 0x212e: 0x0001, + 0x2131: 0x0001, 0x2132: 0x0001, 0x2135: 0x0001, + 0x2136: 0x0001, + // Block 0x85, offset 0x2140 + 0x2143: 0x0001, + 0x214c: 0x0001, + 0x217c: 0x0001, + // Block 0x86, offset 0x2180 + 0x21b0: 0x0001, 0x21b2: 0x0001, 0x21b3: 0x0001, 0x21b4: 0x0001, + 0x21b7: 0x0001, 0x21b8: 0x0001, + 0x21be: 0x0001, 0x21bf: 0x0001, + // Block 0x87, offset 0x21c0 + 0x21c1: 0x0001, + 0x21ec: 0x0001, 0x21ed: 0x0001, + 0x21f6: 0x0001, + // Block 0x88, offset 0x2200 + 0x2225: 0x0001, 0x2228: 0x0001, + 0x222d: 0x0001, + // Block 0x89, offset 0x2240 + 0x2240: 0x0002, 0x2241: 0x0002, 0x2242: 0x0002, 0x2243: 0x0002, 0x2244: 0x0002, 0x2245: 0x0002, + 0x2246: 0x0002, 0x2247: 0x0002, 0x2248: 0x0002, 0x2249: 0x0002, 0x224a: 0x0002, 0x224b: 0x0002, + 0x224c: 0x0002, 0x224d: 0x0002, 0x224e: 0x0002, 0x224f: 0x0002, 0x2250: 0x0002, 0x2251: 0x0002, + 0x2252: 0x0002, 0x2253: 0x0002, 0x2254: 0x0002, 0x2255: 0x0002, 0x2256: 0x0002, 0x2257: 0x0002, + 0x2258: 0x0002, 0x2259: 0x0002, 0x225a: 0x0002, 0x225b: 0x0002, 0x225c: 0x0002, 0x225d: 0x0002, + 0x225e: 0x0002, 0x225f: 0x0002, 0x2260: 0x0002, 0x2261: 0x0002, 0x2262: 0x0002, 0x2263: 0x0002, + // Block 0x8a, offset 0x2280 + 0x229e: 0x0001, + // Block 0x8b, offset 0x22c0 + 0x22c0: 0x0001, 0x22c1: 0x0001, 0x22c2: 0x0001, 0x22c3: 0x0001, 0x22c4: 0x0001, 0x22c5: 0x0001, + 0x22c6: 0x0001, 0x22c7: 0x0001, 0x22c8: 0x0001, 0x22c9: 0x0001, 0x22ca: 0x0001, 0x22cb: 0x0001, + 0x22cc: 0x0001, 0x22cd: 0x0001, 0x22ce: 0x0001, 0x22cf: 0x0001, 0x22d0: 0x0002, 0x22d1: 0x0002, + 0x22d2: 0x0002, 0x22d3: 0x0002, 0x22d4: 0x0002, 0x22d5: 0x0002, 0x22d6: 0x0002, 0x22d7: 0x0002, + 0x22d8: 0x0002, 0x22d9: 0x0002, + 0x22e0: 0x0001, 0x22e1: 0x0001, 0x22e2: 0x0001, 0x22e3: 0x0001, + 0x22e4: 0x0001, 0x22e5: 0x0001, 0x22e6: 0x0001, 0x22e7: 0x0001, 0x22e8: 0x0001, 0x22e9: 0x0001, + 0x22ea: 0x0001, 0x22eb: 0x0001, 0x22ec: 0x0001, 0x22ed: 0x0001, 0x22ee: 0x0001, 0x22ef: 0x0001, + 0x22f0: 0x0002, 0x22f1: 0x0002, 0x22f2: 0x0002, 0x22f3: 0x0002, 0x22f4: 0x0002, 0x22f5: 0x0002, + 0x22f6: 0x0002, 0x22f7: 0x0002, 0x22f8: 0x0002, 0x22f9: 0x0002, 0x22fa: 0x0002, 0x22fb: 0x0002, + 0x22fc: 0x0002, 0x22fd: 0x0002, 0x22fe: 0x0002, 0x22ff: 0x0002, + // Block 0x8c, offset 0x2300 + 0x2300: 0x0002, 0x2301: 0x0002, 0x2302: 0x0002, 0x2303: 0x0002, 0x2304: 0x0002, 0x2305: 0x0002, + 0x2306: 0x0002, 0x2307: 0x0002, 0x2308: 0x0002, 0x2309: 0x0002, 0x230a: 0x0002, 0x230b: 0x0002, + 0x230c: 0x0002, 0x230d: 0x0002, 0x230e: 0x0002, 0x230f: 0x0002, 0x2310: 0x0002, 0x2311: 0x0002, + 0x2312: 0x0002, 0x2314: 0x0002, 0x2315: 0x0002, 0x2316: 0x0002, 0x2317: 0x0002, + 0x2318: 0x0002, 0x2319: 0x0002, 0x231a: 0x0002, 0x231b: 0x0002, 0x231c: 0x0002, 0x231d: 0x0002, + 0x231e: 0x0002, 0x231f: 0x0002, 0x2320: 0x0002, 0x2321: 0x0002, 0x2322: 0x0002, 0x2323: 0x0002, + 0x2324: 0x0002, 0x2325: 0x0002, 0x2326: 0x0002, 0x2328: 0x0002, 0x2329: 0x0002, + 0x232a: 0x0002, 0x232b: 0x0002, + // Block 0x8d, offset 0x2340 + 0x2340: 0x0002, 0x2341: 0x0002, 0x2342: 0x0002, 0x2343: 0x0002, 0x2344: 0x0002, 0x2345: 0x0002, + 0x2346: 0x0002, 0x2347: 0x0002, 0x2348: 0x0002, 0x2349: 0x0002, 0x234a: 0x0002, 0x234b: 0x0002, + 0x234c: 0x0002, 0x234d: 0x0002, 0x234e: 0x0002, 0x234f: 0x0002, 0x2350: 0x0002, 0x2351: 0x0002, + 0x2352: 0x0002, 0x2353: 0x0002, 0x2354: 0x0002, 0x2355: 0x0002, 0x2356: 0x0002, 0x2357: 0x0002, + 0x2358: 0x0002, 0x2359: 0x0002, 0x235a: 0x0002, 0x235b: 0x0002, 0x235c: 0x0002, 0x235d: 0x0002, + 0x235e: 0x0002, 0x235f: 0x0002, 0x2360: 0x0002, + // Block 0x8e, offset 0x2380 + 0x23a0: 0x0002, 0x23a1: 0x0002, 0x23a2: 0x0002, 0x23a3: 0x0002, + 0x23a4: 0x0002, 0x23a5: 0x0002, 0x23a6: 0x0002, + 0x23b9: 0x0001, 0x23ba: 0x0001, 0x23bb: 0x0001, + 0x23be: 0x0001, 0x23bf: 0x0001, + // Block 0x8f, offset 0x23c0 + 0x23fd: 0x0001, + // Block 0x90, offset 0x2400 + 0x2420: 0x0001, + // Block 0x91, offset 0x2440 + 0x2476: 0x0001, 0x2477: 0x0001, 0x2478: 0x0001, 0x2479: 0x0001, 0x247a: 0x0001, + // Block 0x92, offset 0x2480 + 0x2481: 0x0001, 0x2482: 0x0001, 0x2483: 0x0001, 0x2485: 0x0001, + 0x2486: 0x0001, + 0x248c: 0x0001, 0x248d: 0x0001, 0x248e: 0x0001, 0x248f: 0x0001, + 0x24b8: 0x0001, 0x24b9: 0x0001, 0x24ba: 0x0001, + 0x24bf: 0x0001, + // Block 0x93, offset 0x24c0 + 0x24e5: 0x0001, 0x24e6: 0x0001, + // Block 0x94, offset 0x2500 + 0x2524: 0x0001, 0x2525: 0x0001, 0x2526: 0x0001, 0x2527: 0x0001, + // Block 0x95, offset 0x2540 + 0x256b: 0x0001, 0x256c: 0x0001, + // Block 0x96, offset 0x2580 + 0x25bd: 0x0001, 0x25be: 0x0001, 0x25bf: 0x0001, + // Block 0x97, offset 0x25c0 + 0x25c6: 0x0001, 0x25c7: 0x0001, 0x25c8: 0x0001, 0x25c9: 0x0001, 0x25ca: 0x0001, 0x25cb: 0x0001, + 0x25cc: 0x0001, 0x25cd: 0x0001, 0x25ce: 0x0001, 0x25cf: 0x0001, 0x25d0: 0x0001, + // Block 0x98, offset 0x2600 + 0x2602: 0x0001, 0x2603: 0x0001, 0x2604: 0x0001, 0x2605: 0x0001, + // Block 0x99, offset 0x2640 + 0x2641: 0x0001, + 0x2678: 0x0001, 0x2679: 0x0001, 0x267a: 0x0001, 0x267b: 0x0001, + 0x267c: 0x0001, 0x267d: 0x0001, 0x267e: 0x0001, 0x267f: 0x0001, + // Block 0x9a, offset 0x2680 + 0x2680: 0x0001, 0x2681: 0x0001, 0x2682: 0x0001, 0x2683: 0x0001, 0x2684: 0x0001, 0x2685: 0x0001, + 0x2686: 0x0001, + 0x26b0: 0x0001, 0x26b3: 0x0001, 0x26b4: 0x0001, + 0x26bf: 0x0001, + // Block 0x9b, offset 0x26c0 + 0x26c0: 0x0001, 0x26c1: 0x0001, + 0x26f3: 0x0001, 0x26f4: 0x0001, 0x26f5: 0x0001, + 0x26f6: 0x0001, 0x26f9: 0x0001, 0x26fa: 0x0001, + 0x26fd: 0x0001, + // Block 0x9c, offset 0x2700 + 0x2702: 0x0001, + 0x270d: 0x0001, + // Block 0x9d, offset 0x2740 + 0x2740: 0x0001, 0x2741: 0x0001, 0x2742: 0x0001, + 0x2767: 0x0001, 0x2768: 0x0001, 0x2769: 0x0001, + 0x276a: 0x0001, 0x276b: 0x0001, 0x276d: 0x0001, 0x276e: 0x0001, 0x276f: 0x0001, + 0x2770: 0x0001, 0x2771: 0x0001, 0x2772: 0x0001, 0x2773: 0x0001, 0x2774: 0x0001, + // Block 0x9e, offset 0x2780 + 0x27b3: 0x0001, + // Block 0x9f, offset 0x27c0 + 0x27c0: 0x0001, 0x27c1: 0x0001, + 0x27f6: 0x0001, 0x27f7: 0x0001, 0x27f8: 0x0001, 0x27f9: 0x0001, 0x27fa: 0x0001, 0x27fb: 0x0001, + 0x27fc: 0x0001, 0x27fd: 0x0001, 0x27fe: 0x0001, + // Block 0xa0, offset 0x2800 + 0x2809: 0x0001, 0x280a: 0x0001, 0x280b: 0x0001, + 0x280c: 0x0001, 0x280f: 0x0001, + // Block 0xa1, offset 0x2840 + 0x286f: 0x0001, + 0x2870: 0x0001, 0x2871: 0x0001, 0x2874: 0x0001, + 0x2876: 0x0001, 0x2877: 0x0001, + 0x287e: 0x0001, + // Block 0xa2, offset 0x2880 + 0x289f: 0x0001, 0x28a3: 0x0001, + 0x28a4: 0x0001, 0x28a5: 0x0001, 0x28a6: 0x0001, 0x28a7: 0x0001, 0x28a8: 0x0001, 0x28a9: 0x0001, + 0x28aa: 0x0001, + // Block 0xa3, offset 0x28c0 + 0x28c0: 0x0001, + 0x28e6: 0x0001, 0x28e7: 0x0001, 0x28e8: 0x0001, 0x28e9: 0x0001, + 0x28ea: 0x0001, 0x28eb: 0x0001, 0x28ec: 0x0001, + 0x28f0: 0x0001, 0x28f1: 0x0001, 0x28f2: 0x0001, 0x28f3: 0x0001, 0x28f4: 0x0001, + // Block 0xa4, offset 0x2900 + 0x2938: 0x0001, 0x2939: 0x0001, 0x293a: 0x0001, 0x293b: 0x0001, + 0x293c: 0x0001, 0x293d: 0x0001, 0x293e: 0x0001, 0x293f: 0x0001, + // Block 0xa5, offset 0x2940 + 0x2942: 0x0001, 0x2943: 0x0001, 0x2944: 0x0001, + 0x2946: 0x0001, + 0x295e: 0x0001, + // Block 0xa6, offset 0x2980 + 0x29b3: 0x0001, 0x29b4: 0x0001, 0x29b5: 0x0001, + 0x29b6: 0x0001, 0x29b7: 0x0001, 0x29b8: 0x0001, 0x29ba: 0x0001, + 0x29bf: 0x0001, + // Block 0xa7, offset 0x29c0 + 0x29c0: 0x0001, 0x29c2: 0x0001, 0x29c3: 0x0001, + // Block 0xa8, offset 0x2a00 + 0x2a32: 0x0001, 0x2a33: 0x0001, 0x2a34: 0x0001, 0x2a35: 0x0001, + 0x2a3c: 0x0001, 0x2a3d: 0x0001, 0x2a3f: 0x0001, + // Block 0xa9, offset 0x2a40 + 0x2a40: 0x0001, + 0x2a5c: 0x0001, 0x2a5d: 0x0001, + // Block 0xaa, offset 0x2a80 + 0x2ab3: 0x0001, 0x2ab4: 0x0001, 0x2ab5: 0x0001, + 0x2ab6: 0x0001, 0x2ab7: 0x0001, 0x2ab8: 0x0001, 0x2ab9: 0x0001, 0x2aba: 0x0001, + 0x2abd: 0x0001, 0x2abf: 0x0001, + // Block 0xab, offset 0x2ac0 + 0x2ac0: 0x0001, + // Block 0xac, offset 0x2b00 + 0x2b2b: 0x0001, 0x2b2d: 0x0001, + 0x2b30: 0x0001, 0x2b31: 0x0001, 0x2b32: 0x0001, 0x2b33: 0x0001, 0x2b34: 0x0001, 0x2b35: 0x0001, + 0x2b37: 0x0001, + // Block 0xad, offset 0x2b40 + 0x2b5d: 0x0001, + 0x2b5e: 0x0001, 0x2b5f: 0x0001, 0x2b62: 0x0001, 0x2b63: 0x0001, + 0x2b64: 0x0001, 0x2b65: 0x0001, 0x2b67: 0x0001, 0x2b68: 0x0001, 0x2b69: 0x0001, + 0x2b6a: 0x0001, 0x2b6b: 0x0001, + // Block 0xae, offset 0x2b80 + 0x2baf: 0x0001, + 0x2bb0: 0x0001, 0x2bb1: 0x0001, 0x2bb2: 0x0001, 0x2bb3: 0x0001, 0x2bb4: 0x0001, 0x2bb5: 0x0001, + 0x2bb6: 0x0001, 0x2bb7: 0x0001, 0x2bb9: 0x0001, 0x2bba: 0x0001, + // Block 0xaf, offset 0x2bc0 + 0x2bfb: 0x0001, + 0x2bfc: 0x0001, 0x2bfe: 0x0001, + // Block 0xb0, offset 0x2c00 + 0x2c03: 0x0001, + // Block 0xb1, offset 0x2c40 + 0x2c54: 0x0001, 0x2c55: 0x0001, 0x2c56: 0x0001, 0x2c57: 0x0001, + 0x2c5a: 0x0001, 0x2c5b: 0x0001, + 0x2c60: 0x0001, + // Block 0xb2, offset 0x2c80 + 0x2c81: 0x0001, 0x2c82: 0x0001, 0x2c83: 0x0001, 0x2c84: 0x0001, 0x2c85: 0x0001, + 0x2c86: 0x0001, 0x2c87: 0x0001, 0x2c88: 0x0001, 0x2c89: 0x0001, 0x2c8a: 0x0001, + 0x2cb3: 0x0001, 0x2cb4: 0x0001, 0x2cb5: 0x0001, + 0x2cb6: 0x0001, 0x2cb7: 0x0001, 0x2cb8: 0x0001, 0x2cbb: 0x0001, + 0x2cbc: 0x0001, 0x2cbd: 0x0001, 0x2cbe: 0x0001, + // Block 0xb3, offset 0x2cc0 + 0x2cc7: 0x0001, + 0x2cd1: 0x0001, + 0x2cd2: 0x0001, 0x2cd3: 0x0001, 0x2cd4: 0x0001, 0x2cd5: 0x0001, 0x2cd6: 0x0001, + 0x2cd9: 0x0001, 0x2cda: 0x0001, 0x2cdb: 0x0001, + // Block 0xb4, offset 0x2d00 + 0x2d0a: 0x0001, 0x2d0b: 0x0001, + 0x2d0c: 0x0001, 0x2d0d: 0x0001, 0x2d0e: 0x0001, 0x2d0f: 0x0001, 0x2d10: 0x0001, 0x2d11: 0x0001, + 0x2d12: 0x0001, 0x2d13: 0x0001, 0x2d14: 0x0001, 0x2d15: 0x0001, 0x2d16: 0x0001, + 0x2d18: 0x0001, 0x2d19: 0x0001, + // Block 0xb5, offset 0x2d40 + 0x2d70: 0x0001, 0x2d71: 0x0001, 0x2d72: 0x0001, 0x2d73: 0x0001, 0x2d74: 0x0001, 0x2d75: 0x0001, + 0x2d76: 0x0001, 0x2d78: 0x0001, 0x2d79: 0x0001, 0x2d7a: 0x0001, 0x2d7b: 0x0001, + 0x2d7c: 0x0001, 0x2d7d: 0x0001, 0x2d7f: 0x0001, + // Block 0xb6, offset 0x2d80 + 0x2d92: 0x0001, 0x2d93: 0x0001, 0x2d94: 0x0001, 0x2d95: 0x0001, 0x2d96: 0x0001, 0x2d97: 0x0001, + 0x2d98: 0x0001, 0x2d99: 0x0001, 0x2d9a: 0x0001, 0x2d9b: 0x0001, 0x2d9c: 0x0001, 0x2d9d: 0x0001, + 0x2d9e: 0x0001, 0x2d9f: 0x0001, 0x2da0: 0x0001, 0x2da1: 0x0001, 0x2da2: 0x0001, 0x2da3: 0x0001, + 0x2da4: 0x0001, 0x2da5: 0x0001, 0x2da6: 0x0001, 0x2da7: 0x0001, + 0x2daa: 0x0001, 0x2dab: 0x0001, 0x2dac: 0x0001, 0x2dad: 0x0001, 0x2dae: 0x0001, 0x2daf: 0x0001, + 0x2db0: 0x0001, 0x2db2: 0x0001, 0x2db3: 0x0001, 0x2db5: 0x0001, + 0x2db6: 0x0001, + // Block 0xb7, offset 0x2dc0 + 0x2df1: 0x0001, 0x2df2: 0x0001, 0x2df3: 0x0001, 0x2df4: 0x0001, 0x2df5: 0x0001, + 0x2df6: 0x0001, 0x2dfa: 0x0001, + 0x2dfc: 0x0001, 0x2dfd: 0x0001, 0x2dff: 0x0001, + // Block 0xb8, offset 0x2e00 + 0x2e00: 0x0001, 0x2e01: 0x0001, 0x2e02: 0x0001, 0x2e03: 0x0001, 0x2e04: 0x0001, 0x2e05: 0x0001, + 0x2e07: 0x0001, + // Block 0xb9, offset 0x2e40 + 0x2e50: 0x0001, 0x2e51: 0x0001, + 0x2e55: 0x0001, 0x2e57: 0x0001, + // Block 0xba, offset 0x2e80 + 0x2eb3: 0x0001, 0x2eb4: 0x0001, + // Block 0xbb, offset 0x2ec0 + 0x2ec0: 0x0001, 0x2ec1: 0x0001, + 0x2ef6: 0x0001, 0x2ef7: 0x0001, 0x2ef8: 0x0001, 0x2ef9: 0x0001, 0x2efa: 0x0001, + // Block 0xbc, offset 0x2f00 + 0x2f00: 0x0001, 0x2f02: 0x0001, + // Block 0xbd, offset 0x2f40 + 0x2f40: 0x0001, + 0x2f47: 0x0001, 0x2f48: 0x0001, 0x2f49: 0x0001, 0x2f4a: 0x0001, 0x2f4b: 0x0001, + 0x2f4c: 0x0001, 0x2f4d: 0x0001, 0x2f4e: 0x0001, 0x2f4f: 0x0001, 0x2f50: 0x0001, 0x2f51: 0x0001, + 0x2f52: 0x0001, 0x2f53: 0x0001, 0x2f54: 0x0001, 0x2f55: 0x0001, + // Block 0xbe, offset 0x2f80 + 0x2fb0: 0x0001, 0x2fb1: 0x0001, 0x2fb2: 0x0001, 0x2fb3: 0x0001, 0x2fb4: 0x0001, + // Block 0xbf, offset 0x2fc0 + 0x2ff0: 0x0001, 0x2ff1: 0x0001, 0x2ff2: 0x0001, 0x2ff3: 0x0001, 0x2ff4: 0x0001, 0x2ff5: 0x0001, + 0x2ff6: 0x0001, + // Block 0xc0, offset 0x3000 + 0x300f: 0x0001, + // Block 0xc1, offset 0x3040 + 0x304f: 0x0001, 0x3050: 0x0001, 0x3051: 0x0001, + 0x3052: 0x0001, + // Block 0xc2, offset 0x3080 + 0x30a0: 0x0002, 0x30a1: 0x0002, 0x30a2: 0x0002, 0x30a3: 0x0002, + 0x30a4: 0x0001, + 0x30b0: 0x0002, 0x30b1: 0x0002, 0x30b2: 0x0002, 0x30b3: 0x0002, 0x30b4: 0x0002, 0x30b5: 0x0002, + 0x30b6: 0x0002, + // Block 0xc3, offset 0x30c0 + 0x30c0: 0x0002, 0x30c1: 0x0002, 0x30c2: 0x0002, 0x30c3: 0x0002, 0x30c4: 0x0002, 0x30c5: 0x0002, + 0x30c6: 0x0002, 0x30c7: 0x0002, 0x30c8: 0x0002, 0x30c9: 0x0002, 0x30ca: 0x0002, 0x30cb: 0x0002, + 0x30cc: 0x0002, 0x30cd: 0x0002, 0x30ce: 0x0002, 0x30cf: 0x0002, 0x30d0: 0x0002, 0x30d1: 0x0002, + 0x30d2: 0x0002, 0x30d3: 0x0002, 0x30d4: 0x0002, 0x30d5: 0x0002, + 0x30ff: 0x0002, + // Block 0xc4, offset 0x3100 + 0x3100: 0x0002, 0x3101: 0x0002, 0x3102: 0x0002, 0x3103: 0x0002, 0x3104: 0x0002, 0x3105: 0x0002, + 0x3106: 0x0002, 0x3107: 0x0002, 0x3108: 0x0002, 0x3109: 0x0002, 0x310a: 0x0002, 0x310b: 0x0002, + 0x310c: 0x0002, 0x310d: 0x0002, 0x310e: 0x0002, 0x310f: 0x0002, 0x3110: 0x0002, 0x3111: 0x0002, + 0x3112: 0x0002, 0x3113: 0x0002, 0x3114: 0x0002, 0x3115: 0x0002, 0x3116: 0x0002, 0x3117: 0x0002, + 0x3118: 0x0002, 0x3119: 0x0002, 0x311a: 0x0002, 0x311b: 0x0002, 0x311c: 0x0002, 0x311d: 0x0002, + 0x311e: 0x0002, + // Block 0xc5, offset 0x3140 + 0x3140: 0x0002, 0x3141: 0x0002, 0x3142: 0x0002, 0x3143: 0x0002, 0x3144: 0x0002, 0x3145: 0x0002, + 0x3146: 0x0002, 0x3147: 0x0002, 0x3148: 0x0002, 0x3149: 0x0002, 0x314a: 0x0002, 0x314b: 0x0002, + 0x314c: 0x0002, 0x314d: 0x0002, 0x314e: 0x0002, 0x314f: 0x0002, 0x3150: 0x0002, 0x3151: 0x0002, + 0x3152: 0x0002, 0x3153: 0x0002, 0x3154: 0x0002, 0x3155: 0x0002, 0x3156: 0x0002, 0x3157: 0x0002, + 0x3158: 0x0002, 0x3159: 0x0002, 0x315a: 0x0002, 0x315b: 0x0002, 0x315c: 0x0002, 0x315d: 0x0002, + 0x315e: 0x0002, 0x315f: 0x0002, 0x3160: 0x0002, 0x3161: 0x0002, 0x3162: 0x0002, 0x3163: 0x0002, + 0x3164: 0x0002, 0x3165: 0x0002, 0x3166: 0x0002, 0x3167: 0x0002, 0x3168: 0x0002, 0x3169: 0x0002, + 0x316a: 0x0002, 0x316b: 0x0002, 0x316c: 0x0002, 0x316d: 0x0002, 0x316e: 0x0002, 0x316f: 0x0002, + 0x3170: 0x0002, 0x3171: 0x0002, 0x3172: 0x0002, + // Block 0xc6, offset 0x3180 + 0x31b0: 0x0002, 0x31b1: 0x0002, 0x31b2: 0x0002, 0x31b3: 0x0002, 0x31b5: 0x0002, + 0x31b6: 0x0002, 0x31b7: 0x0002, 0x31b8: 0x0002, 0x31b9: 0x0002, 0x31ba: 0x0002, 0x31bb: 0x0002, + 0x31bd: 0x0002, 0x31be: 0x0002, + // Block 0xc7, offset 0x31c0 + 0x31c0: 0x0002, 0x31c1: 0x0002, 0x31c2: 0x0002, 0x31c3: 0x0002, 0x31c4: 0x0002, 0x31c5: 0x0002, + 0x31c6: 0x0002, 0x31c7: 0x0002, 0x31c8: 0x0002, 0x31c9: 0x0002, 0x31ca: 0x0002, 0x31cb: 0x0002, + 0x31cc: 0x0002, 0x31cd: 0x0002, 0x31ce: 0x0002, 0x31cf: 0x0002, 0x31d0: 0x0002, 0x31d1: 0x0002, + 0x31d2: 0x0002, 0x31d3: 0x0002, 0x31d4: 0x0002, 0x31d5: 0x0002, 0x31d6: 0x0002, 0x31d7: 0x0002, + 0x31d8: 0x0002, 0x31d9: 0x0002, 0x31da: 0x0002, 0x31db: 0x0002, 0x31dc: 0x0002, 0x31dd: 0x0002, + 0x31de: 0x0002, 0x31df: 0x0002, 0x31e0: 0x0002, 0x31e1: 0x0002, 0x31e2: 0x0002, + 0x31f2: 0x0002, + // Block 0xc8, offset 0x3200 + 0x3210: 0x0002, 0x3211: 0x0002, + 0x3212: 0x0002, 0x3215: 0x0002, + 0x3224: 0x0002, 0x3225: 0x0002, 0x3226: 0x0002, 0x3227: 0x0002, + 0x3230: 0x0002, 0x3231: 0x0002, 0x3232: 0x0002, 0x3233: 0x0002, 0x3234: 0x0002, 0x3235: 0x0002, + 0x3236: 0x0002, 0x3237: 0x0002, 0x3238: 0x0002, 0x3239: 0x0002, 0x323a: 0x0002, 0x323b: 0x0002, + 0x323c: 0x0002, 0x323d: 0x0002, 0x323e: 0x0002, 0x323f: 0x0002, + // Block 0xc9, offset 0x3240 + 0x3240: 0x0002, 0x3241: 0x0002, 0x3242: 0x0002, 0x3243: 0x0002, 0x3244: 0x0002, 0x3245: 0x0002, + 0x3246: 0x0002, 0x3247: 0x0002, 0x3248: 0x0002, 0x3249: 0x0002, 0x324a: 0x0002, 0x324b: 0x0002, + 0x324c: 0x0002, 0x324d: 0x0002, 0x324e: 0x0002, 0x324f: 0x0002, 0x3250: 0x0002, 0x3251: 0x0002, + 0x3252: 0x0002, 0x3253: 0x0002, 0x3254: 0x0002, 0x3255: 0x0002, 0x3256: 0x0002, 0x3257: 0x0002, + 0x3258: 0x0002, 0x3259: 0x0002, 0x325a: 0x0002, 0x325b: 0x0002, 0x325c: 0x0002, 0x325d: 0x0002, + 0x325e: 0x0002, 0x325f: 0x0002, 0x3260: 0x0002, 0x3261: 0x0002, 0x3262: 0x0002, 0x3263: 0x0002, + 0x3264: 0x0002, 0x3265: 0x0002, 0x3266: 0x0002, 0x3267: 0x0002, 0x3268: 0x0002, 0x3269: 0x0002, + 0x326a: 0x0002, 0x326b: 0x0002, 0x326c: 0x0002, 0x326d: 0x0002, 0x326e: 0x0002, 0x326f: 0x0002, + 0x3270: 0x0002, 0x3271: 0x0002, 0x3272: 0x0002, 0x3273: 0x0002, 0x3274: 0x0002, 0x3275: 0x0002, + 0x3276: 0x0002, 0x3277: 0x0002, 0x3278: 0x0002, 0x3279: 0x0002, 0x327a: 0x0002, 0x327b: 0x0002, + // Block 0xca, offset 0x3280 + 0x329d: 0x0001, + 0x329e: 0x0001, 0x32a0: 0x0001, 0x32a1: 0x0001, 0x32a2: 0x0001, 0x32a3: 0x0001, + // Block 0xcb, offset 0x32c0 + 0x32c0: 0x0001, 0x32c1: 0x0001, 0x32c2: 0x0001, 0x32c3: 0x0001, 0x32c4: 0x0001, 0x32c5: 0x0001, + 0x32c6: 0x0001, 0x32c7: 0x0001, 0x32c8: 0x0001, 0x32c9: 0x0001, 0x32ca: 0x0001, 0x32cb: 0x0001, + 0x32cc: 0x0001, 0x32cd: 0x0001, 0x32ce: 0x0001, 0x32cf: 0x0001, 0x32d0: 0x0001, 0x32d1: 0x0001, + 0x32d2: 0x0001, 0x32d3: 0x0001, 0x32d4: 0x0001, 0x32d5: 0x0001, 0x32d6: 0x0001, 0x32d7: 0x0001, + 0x32d8: 0x0001, 0x32d9: 0x0001, 0x32da: 0x0001, 0x32db: 0x0001, 0x32dc: 0x0001, 0x32dd: 0x0001, + 0x32de: 0x0001, 0x32df: 0x0001, 0x32e0: 0x0001, 0x32e1: 0x0001, 0x32e2: 0x0001, 0x32e3: 0x0001, + 0x32e4: 0x0001, 0x32e5: 0x0001, 0x32e6: 0x0001, 0x32e7: 0x0001, 0x32e8: 0x0001, 0x32e9: 0x0001, + 0x32ea: 0x0001, 0x32eb: 0x0001, 0x32ec: 0x0001, 0x32ed: 0x0001, + 0x32f0: 0x0001, 0x32f1: 0x0001, 0x32f2: 0x0001, 0x32f3: 0x0001, 0x32f4: 0x0001, 0x32f5: 0x0001, + 0x32f6: 0x0001, 0x32f7: 0x0001, 0x32f8: 0x0001, 0x32f9: 0x0001, 0x32fa: 0x0001, 0x32fb: 0x0001, + 0x32fc: 0x0001, 0x32fd: 0x0001, 0x32fe: 0x0001, 0x32ff: 0x0001, + // Block 0xcc, offset 0x3300 + 0x3300: 0x0001, 0x3301: 0x0001, 0x3302: 0x0001, 0x3303: 0x0001, 0x3304: 0x0001, 0x3305: 0x0001, + 0x3306: 0x0001, + // Block 0xcd, offset 0x3340 + 0x3367: 0x0001, 0x3368: 0x0001, 0x3369: 0x0001, + 0x3373: 0x0001, 0x3374: 0x0001, 0x3375: 0x0001, + 0x3376: 0x0001, 0x3377: 0x0001, 0x3378: 0x0001, 0x3379: 0x0001, 0x337a: 0x0001, 0x337b: 0x0001, + 0x337c: 0x0001, 0x337d: 0x0001, 0x337e: 0x0001, 0x337f: 0x0001, + // Block 0xce, offset 0x3380 + 0x3380: 0x0001, 0x3381: 0x0001, 0x3382: 0x0001, 0x3385: 0x0001, + 0x3386: 0x0001, 0x3387: 0x0001, 0x3388: 0x0001, 0x3389: 0x0001, 0x338a: 0x0001, 0x338b: 0x0001, + 0x33aa: 0x0001, 0x33ab: 0x0001, 0x33ac: 0x0001, 0x33ad: 0x0001, + // Block 0xcf, offset 0x33c0 + 0x33c2: 0x0001, 0x33c3: 0x0001, 0x33c4: 0x0001, + // Block 0xd0, offset 0x3400 + 0x3400: 0x0002, 0x3401: 0x0002, 0x3402: 0x0002, 0x3403: 0x0002, 0x3404: 0x0002, 0x3405: 0x0002, + 0x3406: 0x0002, 0x3407: 0x0002, 0x3408: 0x0002, 0x3409: 0x0002, 0x340a: 0x0002, 0x340b: 0x0002, + 0x340c: 0x0002, 0x340d: 0x0002, 0x340e: 0x0002, 0x340f: 0x0002, 0x3410: 0x0002, 0x3411: 0x0002, + 0x3412: 0x0002, 0x3413: 0x0002, 0x3414: 0x0002, 0x3415: 0x0002, 0x3416: 0x0002, + 0x3420: 0x0002, 0x3421: 0x0002, 0x3422: 0x0002, 0x3423: 0x0002, + 0x3424: 0x0002, 0x3425: 0x0002, 0x3426: 0x0002, 0x3427: 0x0002, 0x3428: 0x0002, 0x3429: 0x0002, + 0x342a: 0x0002, 0x342b: 0x0002, 0x342c: 0x0002, 0x342d: 0x0002, 0x342e: 0x0002, 0x342f: 0x0002, + 0x3430: 0x0002, 0x3431: 0x0002, 0x3432: 0x0002, 0x3433: 0x0002, 0x3434: 0x0002, 0x3435: 0x0002, + 0x3436: 0x0002, + // Block 0xd1, offset 0x3440 + 0x3440: 0x0001, 0x3441: 0x0001, 0x3442: 0x0001, 0x3443: 0x0001, 0x3444: 0x0001, 0x3445: 0x0001, + 0x3446: 0x0001, 0x3447: 0x0001, 0x3448: 0x0001, 0x3449: 0x0001, 0x344a: 0x0001, 0x344b: 0x0001, + 0x344c: 0x0001, 0x344d: 0x0001, 0x344e: 0x0001, 0x344f: 0x0001, 0x3450: 0x0001, 0x3451: 0x0001, + 0x3452: 0x0001, 0x3453: 0x0001, 0x3454: 0x0001, 0x3455: 0x0001, 0x3456: 0x0001, 0x3457: 0x0001, + 0x3458: 0x0001, 0x3459: 0x0001, 0x345a: 0x0001, 0x345b: 0x0001, 0x345c: 0x0001, 0x345d: 0x0001, + 0x345e: 0x0001, 0x345f: 0x0001, 0x3460: 0x0001, 0x3461: 0x0001, 0x3462: 0x0001, 0x3463: 0x0001, + 0x3464: 0x0001, 0x3465: 0x0001, 0x3466: 0x0001, 0x3467: 0x0001, 0x3468: 0x0001, 0x3469: 0x0001, + 0x346a: 0x0001, 0x346b: 0x0001, 0x346c: 0x0001, 0x346d: 0x0001, 0x346e: 0x0001, 0x346f: 0x0001, + 0x3470: 0x0001, 0x3471: 0x0001, 0x3472: 0x0001, 0x3473: 0x0001, 0x3474: 0x0001, 0x3475: 0x0001, + 0x3476: 0x0001, 0x347b: 0x0001, + 0x347c: 0x0001, 0x347d: 0x0001, 0x347e: 0x0001, 0x347f: 0x0001, + // Block 0xd2, offset 0x3480 + 0x3480: 0x0001, 0x3481: 0x0001, 0x3482: 0x0001, 0x3483: 0x0001, 0x3484: 0x0001, 0x3485: 0x0001, + 0x3486: 0x0001, 0x3487: 0x0001, 0x3488: 0x0001, 0x3489: 0x0001, 0x348a: 0x0001, 0x348b: 0x0001, + 0x348c: 0x0001, 0x348d: 0x0001, 0x348e: 0x0001, 0x348f: 0x0001, 0x3490: 0x0001, 0x3491: 0x0001, + 0x3492: 0x0001, 0x3493: 0x0001, 0x3494: 0x0001, 0x3495: 0x0001, 0x3496: 0x0001, 0x3497: 0x0001, + 0x3498: 0x0001, 0x3499: 0x0001, 0x349a: 0x0001, 0x349b: 0x0001, 0x349c: 0x0001, 0x349d: 0x0001, + 0x349e: 0x0001, 0x349f: 0x0001, 0x34a0: 0x0001, 0x34a1: 0x0001, 0x34a2: 0x0001, 0x34a3: 0x0001, + 0x34a4: 0x0001, 0x34a5: 0x0001, 0x34a6: 0x0001, 0x34a7: 0x0001, 0x34a8: 0x0001, 0x34a9: 0x0001, + 0x34aa: 0x0001, 0x34ab: 0x0001, 0x34ac: 0x0001, + 0x34b5: 0x0001, + // Block 0xd3, offset 0x34c0 + 0x34c4: 0x0001, + 0x34db: 0x0001, 0x34dc: 0x0001, 0x34dd: 0x0001, + 0x34de: 0x0001, 0x34df: 0x0001, 0x34e1: 0x0001, 0x34e2: 0x0001, 0x34e3: 0x0001, + 0x34e4: 0x0001, 0x34e5: 0x0001, 0x34e6: 0x0001, 0x34e7: 0x0001, 0x34e8: 0x0001, 0x34e9: 0x0001, + 0x34ea: 0x0001, 0x34eb: 0x0001, 0x34ec: 0x0001, 0x34ed: 0x0001, 0x34ee: 0x0001, 0x34ef: 0x0001, + // Block 0xd4, offset 0x3500 + 0x3500: 0x0001, 0x3501: 0x0001, 0x3502: 0x0001, 0x3503: 0x0001, 0x3504: 0x0001, 0x3505: 0x0001, + 0x3506: 0x0001, 0x3508: 0x0001, 0x3509: 0x0001, 0x350a: 0x0001, 0x350b: 0x0001, + 0x350c: 0x0001, 0x350d: 0x0001, 0x350e: 0x0001, 0x350f: 0x0001, 0x3510: 0x0001, 0x3511: 0x0001, + 0x3512: 0x0001, 0x3513: 0x0001, 0x3514: 0x0001, 0x3515: 0x0001, 0x3516: 0x0001, 0x3517: 0x0001, + 0x3518: 0x0001, 0x351b: 0x0001, 0x351c: 0x0001, 0x351d: 0x0001, + 0x351e: 0x0001, 0x351f: 0x0001, 0x3520: 0x0001, 0x3521: 0x0001, 0x3523: 0x0001, + 0x3524: 0x0001, 0x3526: 0x0001, 0x3527: 0x0001, 0x3528: 0x0001, 0x3529: 0x0001, + 0x352a: 0x0001, + // Block 0xd5, offset 0x3540 + 0x356e: 0x0001, + // Block 0xd6, offset 0x3580 + 0x35ac: 0x0001, 0x35ad: 0x0001, 0x35ae: 0x0001, 0x35af: 0x0001, + // Block 0xd7, offset 0x35c0 + 0x35d0: 0x0001, 0x35d1: 0x0001, + 0x35d2: 0x0001, 0x35d3: 0x0001, 0x35d4: 0x0001, 0x35d5: 0x0001, 0x35d6: 0x0001, + // Block 0xd8, offset 0x3600 + 0x3604: 0x0001, 0x3605: 0x0001, + 0x3606: 0x0001, 0x3607: 0x0001, 0x3608: 0x0001, 0x3609: 0x0001, 0x360a: 0x0001, + // Block 0xd9, offset 0x3640 + 0x3644: 0x0002, + // Block 0xda, offset 0x3680 + 0x368f: 0x0002, + // Block 0xdb, offset 0x36c0 + 0x36c0: 0x0003, 0x36c1: 0x0003, 0x36c2: 0x0003, 0x36c3: 0x0003, 0x36c4: 0x0003, 0x36c5: 0x0003, + 0x36c6: 0x0003, 0x36c7: 0x0003, 0x36c8: 0x0003, 0x36c9: 0x0003, 0x36ca: 0x0003, + 0x36d0: 0x0003, 0x36d1: 0x0003, + 0x36d2: 0x0003, 0x36d3: 0x0003, 0x36d4: 0x0003, 0x36d5: 0x0003, 0x36d6: 0x0003, 0x36d7: 0x0003, + 0x36d8: 0x0003, 0x36d9: 0x0003, 0x36da: 0x0003, 0x36db: 0x0003, 0x36dc: 0x0003, 0x36dd: 0x0003, + 0x36de: 0x0003, 0x36df: 0x0003, 0x36e0: 0x0003, 0x36e1: 0x0003, 0x36e2: 0x0003, 0x36e3: 0x0003, + 0x36e4: 0x0003, 0x36e5: 0x0003, 0x36e6: 0x0003, 0x36e7: 0x0003, 0x36e8: 0x0003, 0x36e9: 0x0003, + 0x36ea: 0x0003, 0x36eb: 0x0003, 0x36ec: 0x0003, 0x36ed: 0x0003, + 0x36f0: 0x0003, 0x36f1: 0x0003, 0x36f2: 0x0003, 0x36f3: 0x0003, 0x36f4: 0x0003, 0x36f5: 0x0003, + 0x36f6: 0x0003, 0x36f7: 0x0003, 0x36f8: 0x0003, 0x36f9: 0x0003, 0x36fa: 0x0003, 0x36fb: 0x0003, + 0x36fc: 0x0003, 0x36fd: 0x0003, 0x36fe: 0x0003, 0x36ff: 0x0003, + // Block 0xdc, offset 0x3700 + 0x3700: 0x0003, 0x3701: 0x0003, 0x3702: 0x0003, 0x3703: 0x0003, 0x3704: 0x0003, 0x3705: 0x0003, + 0x3706: 0x0003, 0x3707: 0x0003, 0x3708: 0x0003, 0x3709: 0x0003, 0x370a: 0x0003, 0x370b: 0x0003, + 0x370c: 0x0003, 0x370d: 0x0003, 0x370e: 0x0003, 0x370f: 0x0003, 0x3710: 0x0003, 0x3711: 0x0003, + 0x3712: 0x0003, 0x3713: 0x0003, 0x3714: 0x0003, 0x3715: 0x0003, 0x3716: 0x0003, 0x3717: 0x0003, + 0x3718: 0x0003, 0x3719: 0x0003, 0x371a: 0x0003, 0x371b: 0x0003, 0x371c: 0x0003, 0x371d: 0x0003, + 0x371e: 0x0003, 0x371f: 0x0003, 0x3720: 0x0003, 0x3721: 0x0003, 0x3722: 0x0003, 0x3723: 0x0003, + 0x3724: 0x0003, 0x3725: 0x0003, 0x3726: 0x0003, 0x3727: 0x0003, 0x3728: 0x0003, 0x3729: 0x0003, + 0x3730: 0x0003, 0x3731: 0x0003, 0x3732: 0x0003, 0x3733: 0x0003, 0x3734: 0x0003, 0x3735: 0x0003, + 0x3736: 0x0003, 0x3737: 0x0003, 0x3738: 0x0003, 0x3739: 0x0003, 0x373a: 0x0003, 0x373b: 0x0003, + 0x373c: 0x0003, 0x373d: 0x0003, 0x373e: 0x0003, 0x373f: 0x0003, + // Block 0xdd, offset 0x3740 + 0x3740: 0x0003, 0x3741: 0x0003, 0x3742: 0x0003, 0x3743: 0x0003, 0x3744: 0x0003, 0x3745: 0x0003, + 0x3746: 0x0003, 0x3747: 0x0003, 0x3748: 0x0003, 0x3749: 0x0003, 0x374a: 0x0003, 0x374b: 0x0003, + 0x374c: 0x0003, 0x374d: 0x0003, 0x374e: 0x0002, 0x374f: 0x0003, 0x3750: 0x0003, 0x3751: 0x0002, + 0x3752: 0x0002, 0x3753: 0x0002, 0x3754: 0x0002, 0x3755: 0x0002, 0x3756: 0x0002, 0x3757: 0x0002, + 0x3758: 0x0002, 0x3759: 0x0002, 0x375a: 0x0002, 0x375b: 0x0003, 0x375c: 0x0003, 0x375d: 0x0003, + 0x375e: 0x0003, 0x375f: 0x0003, 0x3760: 0x0003, 0x3761: 0x0003, 0x3762: 0x0003, 0x3763: 0x0003, + 0x3764: 0x0003, 0x3765: 0x0003, 0x3766: 0x0003, 0x3767: 0x0003, 0x3768: 0x0003, 0x3769: 0x0003, + 0x376a: 0x0003, 0x376b: 0x0003, 0x376c: 0x0003, + // Block 0xde, offset 0x3780 + 0x37a6: 0x0002, 0x37a7: 0x0002, 0x37a8: 0x0002, 0x37a9: 0x0002, + 0x37aa: 0x0002, 0x37ab: 0x0002, 0x37ac: 0x0002, 0x37ad: 0x0002, 0x37ae: 0x0002, 0x37af: 0x0002, + 0x37b0: 0x0002, 0x37b1: 0x0002, 0x37b2: 0x0002, 0x37b3: 0x0002, 0x37b4: 0x0002, 0x37b5: 0x0002, + 0x37b6: 0x0002, 0x37b7: 0x0002, 0x37b8: 0x0002, 0x37b9: 0x0002, 0x37ba: 0x0002, 0x37bb: 0x0002, + 0x37bc: 0x0002, 0x37bd: 0x0002, 0x37be: 0x0002, 0x37bf: 0x0002, + // Block 0xdf, offset 0x37c0 + 0x37c0: 0x0002, 0x37c1: 0x0002, 0x37c2: 0x0002, + 0x37d0: 0x0002, 0x37d1: 0x0002, + 0x37d2: 0x0002, 0x37d3: 0x0002, 0x37d4: 0x0002, 0x37d5: 0x0002, 0x37d6: 0x0002, 0x37d7: 0x0002, + 0x37d8: 0x0002, 0x37d9: 0x0002, 0x37da: 0x0002, 0x37db: 0x0002, 0x37dc: 0x0002, 0x37dd: 0x0002, + 0x37de: 0x0002, 0x37df: 0x0002, 0x37e0: 0x0002, 0x37e1: 0x0002, 0x37e2: 0x0002, 0x37e3: 0x0002, + 0x37e4: 0x0002, 0x37e5: 0x0002, 0x37e6: 0x0002, 0x37e7: 0x0002, 0x37e8: 0x0002, 0x37e9: 0x0002, + 0x37ea: 0x0002, 0x37eb: 0x0002, 0x37ec: 0x0002, 0x37ed: 0x0002, 0x37ee: 0x0002, 0x37ef: 0x0002, + 0x37f0: 0x0002, 0x37f1: 0x0002, 0x37f2: 0x0002, 0x37f3: 0x0002, 0x37f4: 0x0002, 0x37f5: 0x0002, + 0x37f6: 0x0002, 0x37f7: 0x0002, 0x37f8: 0x0002, 0x37f9: 0x0002, 0x37fa: 0x0002, 0x37fb: 0x0002, + // Block 0xe0, offset 0x3800 + 0x3800: 0x0002, 0x3801: 0x0002, 0x3802: 0x0002, 0x3803: 0x0002, 0x3804: 0x0002, 0x3805: 0x0002, + 0x3806: 0x0002, 0x3807: 0x0002, 0x3808: 0x0002, + 0x3810: 0x0002, 0x3811: 0x0002, + 0x3820: 0x0002, 0x3821: 0x0002, 0x3822: 0x0002, 0x3823: 0x0002, + 0x3824: 0x0002, 0x3825: 0x0002, + // Block 0xe1, offset 0x3840 + 0x3840: 0x0002, 0x3841: 0x0002, 0x3842: 0x0002, 0x3843: 0x0002, 0x3844: 0x0002, 0x3845: 0x0002, + 0x3846: 0x0002, 0x3847: 0x0002, 0x3848: 0x0002, 0x3849: 0x0002, 0x384a: 0x0002, 0x384b: 0x0002, + 0x384c: 0x0002, 0x384d: 0x0002, 0x384e: 0x0002, 0x384f: 0x0002, 0x3850: 0x0002, 0x3851: 0x0002, + 0x3852: 0x0002, 0x3853: 0x0002, 0x3854: 0x0002, 0x3855: 0x0002, 0x3856: 0x0002, 0x3857: 0x0002, + 0x3858: 0x0002, 0x3859: 0x0002, 0x385a: 0x0002, 0x385b: 0x0002, 0x385c: 0x0002, 0x385d: 0x0002, + 0x385e: 0x0002, 0x385f: 0x0002, 0x3860: 0x0002, + 0x386d: 0x0002, 0x386e: 0x0002, 0x386f: 0x0002, + 0x3870: 0x0002, 0x3871: 0x0002, 0x3872: 0x0002, 0x3873: 0x0002, 0x3874: 0x0002, 0x3875: 0x0002, + 0x3877: 0x0002, 0x3878: 0x0002, 0x3879: 0x0002, 0x387a: 0x0002, 0x387b: 0x0002, + 0x387c: 0x0002, 0x387d: 0x0002, 0x387e: 0x0002, 0x387f: 0x0002, + // Block 0xe2, offset 0x3880 + 0x3880: 0x0002, 0x3881: 0x0002, 0x3882: 0x0002, 0x3883: 0x0002, 0x3884: 0x0002, 0x3885: 0x0002, + 0x3886: 0x0002, 0x3887: 0x0002, 0x3888: 0x0002, 0x3889: 0x0002, 0x388a: 0x0002, 0x388b: 0x0002, + 0x388c: 0x0002, 0x388d: 0x0002, 0x388e: 0x0002, 0x388f: 0x0002, 0x3890: 0x0002, 0x3891: 0x0002, + 0x3892: 0x0002, 0x3893: 0x0002, 0x3894: 0x0002, 0x3895: 0x0002, 0x3896: 0x0002, 0x3897: 0x0002, + 0x3898: 0x0002, 0x3899: 0x0002, 0x389a: 0x0002, 0x389b: 0x0002, 0x389c: 0x0002, 0x389d: 0x0002, + 0x389e: 0x0002, 0x389f: 0x0002, 0x38a0: 0x0002, 0x38a1: 0x0002, 0x38a2: 0x0002, 0x38a3: 0x0002, + 0x38a4: 0x0002, 0x38a5: 0x0002, 0x38a6: 0x0002, 0x38a7: 0x0002, 0x38a8: 0x0002, 0x38a9: 0x0002, + 0x38aa: 0x0002, 0x38ab: 0x0002, 0x38ac: 0x0002, 0x38ad: 0x0002, 0x38ae: 0x0002, 0x38af: 0x0002, + 0x38b0: 0x0002, 0x38b1: 0x0002, 0x38b2: 0x0002, 0x38b3: 0x0002, 0x38b4: 0x0002, 0x38b5: 0x0002, + 0x38b6: 0x0002, 0x38b7: 0x0002, 0x38b8: 0x0002, 0x38b9: 0x0002, 0x38ba: 0x0002, 0x38bb: 0x0002, + 0x38bc: 0x0002, 0x38be: 0x0002, 0x38bf: 0x0002, + // Block 0xe3, offset 0x38c0 + 0x38c0: 0x0002, 0x38c1: 0x0002, 0x38c2: 0x0002, 0x38c3: 0x0002, 0x38c4: 0x0002, 0x38c5: 0x0002, + 0x38c6: 0x0002, 0x38c7: 0x0002, 0x38c8: 0x0002, 0x38c9: 0x0002, 0x38ca: 0x0002, 0x38cb: 0x0002, + 0x38cc: 0x0002, 0x38cd: 0x0002, 0x38ce: 0x0002, 0x38cf: 0x0002, 0x38d0: 0x0002, 0x38d1: 0x0002, + 0x38d2: 0x0002, 0x38d3: 0x0002, + 0x38e0: 0x0002, 0x38e1: 0x0002, 0x38e2: 0x0002, 0x38e3: 0x0002, + 0x38e4: 0x0002, 0x38e5: 0x0002, 0x38e6: 0x0002, 0x38e7: 0x0002, 0x38e8: 0x0002, 0x38e9: 0x0002, + 0x38ea: 0x0002, 0x38eb: 0x0002, 0x38ec: 0x0002, 0x38ed: 0x0002, 0x38ee: 0x0002, 0x38ef: 0x0002, + 0x38f0: 0x0002, 0x38f1: 0x0002, 0x38f2: 0x0002, 0x38f3: 0x0002, 0x38f4: 0x0002, 0x38f5: 0x0002, + 0x38f6: 0x0002, 0x38f7: 0x0002, 0x38f8: 0x0002, 0x38f9: 0x0002, 0x38fa: 0x0002, 0x38fb: 0x0002, + 0x38fc: 0x0002, 0x38fd: 0x0002, 0x38fe: 0x0002, 0x38ff: 0x0002, + // Block 0xe4, offset 0x3900 + 0x3900: 0x0002, 0x3901: 0x0002, 0x3902: 0x0002, 0x3903: 0x0002, 0x3904: 0x0002, 0x3905: 0x0002, + 0x3906: 0x0002, 0x3907: 0x0002, 0x3908: 0x0002, 0x3909: 0x0002, 0x390a: 0x0002, + 0x390f: 0x0002, 0x3910: 0x0002, 0x3911: 0x0002, + 0x3912: 0x0002, 0x3913: 0x0002, + 0x3920: 0x0002, 0x3921: 0x0002, 0x3922: 0x0002, 0x3923: 0x0002, + 0x3924: 0x0002, 0x3925: 0x0002, 0x3926: 0x0002, 0x3927: 0x0002, 0x3928: 0x0002, 0x3929: 0x0002, + 0x392a: 0x0002, 0x392b: 0x0002, 0x392c: 0x0002, 0x392d: 0x0002, 0x392e: 0x0002, 0x392f: 0x0002, + 0x3930: 0x0002, 0x3934: 0x0002, + 0x3938: 0x0002, 0x3939: 0x0002, 0x393a: 0x0002, 0x393b: 0x0002, + 0x393c: 0x0002, 0x393d: 0x0002, 0x393e: 0x0002, 0x393f: 0x0002, + // Block 0xe5, offset 0x3940 + 0x3940: 0x0002, 0x3941: 0x0002, 0x3942: 0x0002, 0x3943: 0x0002, 0x3944: 0x0002, 0x3945: 0x0002, + 0x3946: 0x0002, 0x3947: 0x0002, 0x3948: 0x0002, 0x3949: 0x0002, 0x394a: 0x0002, 0x394b: 0x0002, + 0x394c: 0x0002, 0x394d: 0x0002, 0x394e: 0x0002, 0x394f: 0x0002, 0x3950: 0x0002, 0x3951: 0x0002, + 0x3952: 0x0002, 0x3953: 0x0002, 0x3954: 0x0002, 0x3955: 0x0002, 0x3956: 0x0002, 0x3957: 0x0002, + 0x3958: 0x0002, 0x3959: 0x0002, 0x395a: 0x0002, 0x395b: 0x0002, 0x395c: 0x0002, 0x395d: 0x0002, + 0x395e: 0x0002, 0x395f: 0x0002, 0x3960: 0x0002, 0x3961: 0x0002, 0x3962: 0x0002, 0x3963: 0x0002, + 0x3964: 0x0002, 0x3965: 0x0002, 0x3966: 0x0002, 0x3967: 0x0002, 0x3968: 0x0002, 0x3969: 0x0002, + 0x396a: 0x0002, 0x396b: 0x0002, 0x396c: 0x0002, 0x396d: 0x0002, 0x396e: 0x0002, 0x396f: 0x0002, + 0x3970: 0x0002, 0x3971: 0x0002, 0x3972: 0x0002, 0x3973: 0x0002, 0x3974: 0x0002, 0x3975: 0x0002, + 0x3976: 0x0002, 0x3977: 0x0002, 0x3978: 0x0002, 0x3979: 0x0002, 0x397a: 0x0002, 0x397b: 0x0002, + 0x397c: 0x0002, 0x397d: 0x0002, 0x397e: 0x0002, + // Block 0xe6, offset 0x3980 + 0x3980: 0x0002, 0x3982: 0x0002, 0x3983: 0x0002, 0x3984: 0x0002, 0x3985: 0x0002, + 0x3986: 0x0002, 0x3987: 0x0002, 0x3988: 0x0002, 0x3989: 0x0002, 0x398a: 0x0002, 0x398b: 0x0002, + 0x398c: 0x0002, 0x398d: 0x0002, 0x398e: 0x0002, 0x398f: 0x0002, 0x3990: 0x0002, 0x3991: 0x0002, + 0x3992: 0x0002, 0x3993: 0x0002, 0x3994: 0x0002, 0x3995: 0x0002, 0x3996: 0x0002, 0x3997: 0x0002, + 0x3998: 0x0002, 0x3999: 0x0002, 0x399a: 0x0002, 0x399b: 0x0002, 0x399c: 0x0002, 0x399d: 0x0002, + 0x399e: 0x0002, 0x399f: 0x0002, 0x39a0: 0x0002, 0x39a1: 0x0002, 0x39a2: 0x0002, 0x39a3: 0x0002, + 0x39a4: 0x0002, 0x39a5: 0x0002, 0x39a6: 0x0002, 0x39a7: 0x0002, 0x39a8: 0x0002, 0x39a9: 0x0002, + 0x39aa: 0x0002, 0x39ab: 0x0002, 0x39ac: 0x0002, 0x39ad: 0x0002, 0x39ae: 0x0002, 0x39af: 0x0002, + 0x39b0: 0x0002, 0x39b1: 0x0002, 0x39b2: 0x0002, 0x39b3: 0x0002, 0x39b4: 0x0002, 0x39b5: 0x0002, + 0x39b6: 0x0002, 0x39b7: 0x0002, 0x39b8: 0x0002, 0x39b9: 0x0002, 0x39ba: 0x0002, 0x39bb: 0x0002, + 0x39bc: 0x0002, 0x39bd: 0x0002, 0x39be: 0x0002, 0x39bf: 0x0002, + // Block 0xe7, offset 0x39c0 + 0x39c0: 0x0002, 0x39c1: 0x0002, 0x39c2: 0x0002, 0x39c3: 0x0002, 0x39c4: 0x0002, 0x39c5: 0x0002, + 0x39c6: 0x0002, 0x39c7: 0x0002, 0x39c8: 0x0002, 0x39c9: 0x0002, 0x39ca: 0x0002, 0x39cb: 0x0002, + 0x39cc: 0x0002, 0x39cd: 0x0002, 0x39ce: 0x0002, 0x39cf: 0x0002, 0x39d0: 0x0002, 0x39d1: 0x0002, + 0x39d2: 0x0002, 0x39d3: 0x0002, 0x39d4: 0x0002, 0x39d5: 0x0002, 0x39d6: 0x0002, 0x39d7: 0x0002, + 0x39d8: 0x0002, 0x39d9: 0x0002, 0x39da: 0x0002, 0x39db: 0x0002, 0x39dc: 0x0002, 0x39dd: 0x0002, + 0x39de: 0x0002, 0x39df: 0x0002, 0x39e0: 0x0002, 0x39e1: 0x0002, 0x39e2: 0x0002, 0x39e3: 0x0002, + 0x39e4: 0x0002, 0x39e5: 0x0002, 0x39e6: 0x0002, 0x39e7: 0x0002, 0x39e8: 0x0002, 0x39e9: 0x0002, + 0x39ea: 0x0002, 0x39eb: 0x0002, 0x39ec: 0x0002, 0x39ed: 0x0002, 0x39ee: 0x0002, 0x39ef: 0x0002, + 0x39f0: 0x0002, 0x39f1: 0x0002, 0x39f2: 0x0002, 0x39f3: 0x0002, 0x39f4: 0x0002, 0x39f5: 0x0002, + 0x39f6: 0x0002, 0x39f7: 0x0002, 0x39f8: 0x0002, 0x39f9: 0x0002, 0x39fa: 0x0002, 0x39fb: 0x0002, + 0x39fc: 0x0002, 0x39ff: 0x0002, + // Block 0xe8, offset 0x3a00 + 0x3a00: 0x0002, 0x3a01: 0x0002, 0x3a02: 0x0002, 0x3a03: 0x0002, 0x3a04: 0x0002, 0x3a05: 0x0002, + 0x3a06: 0x0002, 0x3a07: 0x0002, 0x3a08: 0x0002, 0x3a09: 0x0002, 0x3a0a: 0x0002, 0x3a0b: 0x0002, + 0x3a0c: 0x0002, 0x3a0d: 0x0002, 0x3a0e: 0x0002, 0x3a0f: 0x0002, 0x3a10: 0x0002, 0x3a11: 0x0002, + 0x3a12: 0x0002, 0x3a13: 0x0002, 0x3a14: 0x0002, 0x3a15: 0x0002, 0x3a16: 0x0002, 0x3a17: 0x0002, + 0x3a18: 0x0002, 0x3a19: 0x0002, 0x3a1a: 0x0002, 0x3a1b: 0x0002, 0x3a1c: 0x0002, 0x3a1d: 0x0002, + 0x3a1e: 0x0002, 0x3a1f: 0x0002, 0x3a20: 0x0002, 0x3a21: 0x0002, 0x3a22: 0x0002, 0x3a23: 0x0002, + 0x3a24: 0x0002, 0x3a25: 0x0002, 0x3a26: 0x0002, 0x3a27: 0x0002, 0x3a28: 0x0002, 0x3a29: 0x0002, + 0x3a2a: 0x0002, 0x3a2b: 0x0002, 0x3a2c: 0x0002, 0x3a2d: 0x0002, 0x3a2e: 0x0002, 0x3a2f: 0x0002, + 0x3a30: 0x0002, 0x3a31: 0x0002, 0x3a32: 0x0002, 0x3a33: 0x0002, 0x3a34: 0x0002, 0x3a35: 0x0002, + 0x3a36: 0x0002, 0x3a37: 0x0002, 0x3a38: 0x0002, 0x3a39: 0x0002, 0x3a3a: 0x0002, 0x3a3b: 0x0002, + 0x3a3c: 0x0002, 0x3a3d: 0x0002, + // Block 0xe9, offset 0x3a40 + 0x3a4b: 0x0002, + 0x3a4c: 0x0002, 0x3a4d: 0x0002, 0x3a4e: 0x0002, 0x3a50: 0x0002, 0x3a51: 0x0002, + 0x3a52: 0x0002, 0x3a53: 0x0002, 0x3a54: 0x0002, 0x3a55: 0x0002, 0x3a56: 0x0002, 0x3a57: 0x0002, + 0x3a58: 0x0002, 0x3a59: 0x0002, 0x3a5a: 0x0002, 0x3a5b: 0x0002, 0x3a5c: 0x0002, 0x3a5d: 0x0002, + 0x3a5e: 0x0002, 0x3a5f: 0x0002, 0x3a60: 0x0002, 0x3a61: 0x0002, 0x3a62: 0x0002, 0x3a63: 0x0002, + 0x3a64: 0x0002, 0x3a65: 0x0002, 0x3a66: 0x0002, 0x3a67: 0x0002, + 0x3a7a: 0x0002, + // Block 0xea, offset 0x3a80 + 0x3a95: 0x0002, 0x3a96: 0x0002, + 0x3aa4: 0x0002, + // Block 0xeb, offset 0x3ac0 + 0x3afb: 0x0002, + 0x3afc: 0x0002, 0x3afd: 0x0002, 0x3afe: 0x0002, 0x3aff: 0x0002, + // Block 0xec, offset 0x3b00 + 0x3b00: 0x0002, 0x3b01: 0x0002, 0x3b02: 0x0002, 0x3b03: 0x0002, 0x3b04: 0x0002, 0x3b05: 0x0002, + 0x3b06: 0x0002, 0x3b07: 0x0002, 0x3b08: 0x0002, 0x3b09: 0x0002, 0x3b0a: 0x0002, 0x3b0b: 0x0002, + 0x3b0c: 0x0002, 0x3b0d: 0x0002, 0x3b0e: 0x0002, 0x3b0f: 0x0002, + // Block 0xed, offset 0x3b40 + 0x3b40: 0x0002, 0x3b41: 0x0002, 0x3b42: 0x0002, 0x3b43: 0x0002, 0x3b44: 0x0002, 0x3b45: 0x0002, + 0x3b4c: 0x0002, 0x3b50: 0x0002, 0x3b51: 0x0002, + 0x3b52: 0x0002, 0x3b55: 0x0002, 0x3b56: 0x0002, 0x3b57: 0x0002, + 0x3b58: 0x0002, 0x3b5c: 0x0002, 0x3b5d: 0x0002, + 0x3b5e: 0x0002, 0x3b5f: 0x0002, + 0x3b6b: 0x0002, 0x3b6c: 0x0002, + 0x3b74: 0x0002, 0x3b75: 0x0002, + 0x3b76: 0x0002, 0x3b77: 0x0002, 0x3b78: 0x0002, 0x3b79: 0x0002, 0x3b7a: 0x0002, 0x3b7b: 0x0002, + 0x3b7c: 0x0002, + // Block 0xee, offset 0x3b80 + 0x3ba0: 0x0002, 0x3ba1: 0x0002, 0x3ba2: 0x0002, 0x3ba3: 0x0002, + 0x3ba4: 0x0002, 0x3ba5: 0x0002, 0x3ba6: 0x0002, 0x3ba7: 0x0002, 0x3ba8: 0x0002, 0x3ba9: 0x0002, + 0x3baa: 0x0002, 0x3bab: 0x0002, + 0x3bb0: 0x0002, + // Block 0xef, offset 0x3bc0 + 0x3bcc: 0x0002, 0x3bcd: 0x0002, 0x3bce: 0x0002, 0x3bcf: 0x0002, 0x3bd0: 0x0002, 0x3bd1: 0x0002, + 0x3bd2: 0x0002, 0x3bd3: 0x0002, 0x3bd4: 0x0002, 0x3bd5: 0x0002, 0x3bd6: 0x0002, 0x3bd7: 0x0002, + 0x3bd8: 0x0002, 0x3bd9: 0x0002, 0x3bda: 0x0002, 0x3bdb: 0x0002, 0x3bdc: 0x0002, 0x3bdd: 0x0002, + 0x3bde: 0x0002, 0x3bdf: 0x0002, 0x3be0: 0x0002, 0x3be1: 0x0002, 0x3be2: 0x0002, 0x3be3: 0x0002, + 0x3be4: 0x0002, 0x3be5: 0x0002, 0x3be6: 0x0002, 0x3be7: 0x0002, 0x3be8: 0x0002, 0x3be9: 0x0002, + 0x3bea: 0x0002, 0x3beb: 0x0002, 0x3bec: 0x0002, 0x3bed: 0x0002, 0x3bee: 0x0002, 0x3bef: 0x0002, + 0x3bf0: 0x0002, 0x3bf1: 0x0002, 0x3bf2: 0x0002, 0x3bf3: 0x0002, 0x3bf4: 0x0002, 0x3bf5: 0x0002, + 0x3bf6: 0x0002, 0x3bf7: 0x0002, 0x3bf8: 0x0002, 0x3bf9: 0x0002, 0x3bfa: 0x0002, + 0x3bfc: 0x0002, 0x3bfd: 0x0002, 0x3bfe: 0x0002, 0x3bff: 0x0002, + // Block 0xf0, offset 0x3c00 + 0x3c00: 0x0002, 0x3c01: 0x0002, 0x3c02: 0x0002, 0x3c03: 0x0002, 0x3c04: 0x0002, 0x3c05: 0x0002, + 0x3c07: 0x0002, 0x3c08: 0x0002, 0x3c09: 0x0002, 0x3c0a: 0x0002, 0x3c0b: 0x0002, + 0x3c0c: 0x0002, 0x3c0d: 0x0002, 0x3c0e: 0x0002, 0x3c0f: 0x0002, 0x3c10: 0x0002, 0x3c11: 0x0002, + 0x3c12: 0x0002, 0x3c13: 0x0002, 0x3c14: 0x0002, 0x3c15: 0x0002, 0x3c16: 0x0002, 0x3c17: 0x0002, + 0x3c18: 0x0002, 0x3c19: 0x0002, 0x3c1a: 0x0002, 0x3c1b: 0x0002, 0x3c1c: 0x0002, 0x3c1d: 0x0002, + 0x3c1e: 0x0002, 0x3c1f: 0x0002, 0x3c20: 0x0002, 0x3c21: 0x0002, 0x3c22: 0x0002, 0x3c23: 0x0002, + 0x3c24: 0x0002, 0x3c25: 0x0002, 0x3c26: 0x0002, 0x3c27: 0x0002, 0x3c28: 0x0002, 0x3c29: 0x0002, + 0x3c2a: 0x0002, 0x3c2b: 0x0002, 0x3c2c: 0x0002, 0x3c2d: 0x0002, 0x3c2e: 0x0002, 0x3c2f: 0x0002, + 0x3c30: 0x0002, 0x3c31: 0x0002, 0x3c32: 0x0002, 0x3c33: 0x0002, 0x3c34: 0x0002, 0x3c35: 0x0002, + 0x3c36: 0x0002, 0x3c37: 0x0002, 0x3c38: 0x0002, 0x3c39: 0x0002, 0x3c3a: 0x0002, 0x3c3b: 0x0002, + 0x3c3c: 0x0002, 0x3c3d: 0x0002, 0x3c3e: 0x0002, 0x3c3f: 0x0002, + // Block 0xf1, offset 0x3c40 + 0x3c70: 0x0002, 0x3c71: 0x0002, 0x3c72: 0x0002, 0x3c73: 0x0002, 0x3c74: 0x0002, 0x3c75: 0x0002, + 0x3c76: 0x0002, 0x3c77: 0x0002, 0x3c78: 0x0002, 0x3c79: 0x0002, 0x3c7a: 0x0002, 0x3c7b: 0x0002, + 0x3c7c: 0x0002, + // Block 0xf2, offset 0x3c80 + 0x3c80: 0x0002, 0x3c81: 0x0002, 0x3c82: 0x0002, 0x3c83: 0x0002, 0x3c84: 0x0002, 0x3c85: 0x0002, + 0x3c86: 0x0002, 0x3c87: 0x0002, 0x3c88: 0x0002, 0x3c89: 0x0002, 0x3c8a: 0x0002, + 0x3c8e: 0x0002, 0x3c8f: 0x0002, 0x3c90: 0x0002, 0x3c91: 0x0002, + 0x3c92: 0x0002, 0x3c93: 0x0002, 0x3c94: 0x0002, 0x3c95: 0x0002, 0x3c96: 0x0002, 0x3c97: 0x0002, + 0x3c98: 0x0002, 0x3c99: 0x0002, 0x3c9a: 0x0002, 0x3c9b: 0x0002, 0x3c9c: 0x0002, 0x3c9d: 0x0002, + 0x3c9e: 0x0002, 0x3c9f: 0x0002, 0x3ca0: 0x0002, 0x3ca1: 0x0002, 0x3ca2: 0x0002, 0x3ca3: 0x0002, + 0x3ca4: 0x0002, 0x3ca5: 0x0002, 0x3ca6: 0x0002, 0x3ca7: 0x0002, 0x3ca8: 0x0002, 0x3ca9: 0x0002, + 0x3caa: 0x0002, 0x3cab: 0x0002, 0x3cac: 0x0002, 0x3cad: 0x0002, 0x3cae: 0x0002, 0x3caf: 0x0002, + 0x3cb0: 0x0002, 0x3cb1: 0x0002, 0x3cb2: 0x0002, 0x3cb3: 0x0002, 0x3cb4: 0x0002, 0x3cb5: 0x0002, + 0x3cb6: 0x0002, 0x3cb7: 0x0002, 0x3cb8: 0x0002, 0x3cb9: 0x0002, 0x3cba: 0x0002, 0x3cbb: 0x0002, + 0x3cbc: 0x0002, 0x3cbd: 0x0002, 0x3cbe: 0x0002, 0x3cbf: 0x0002, + // Block 0xf3, offset 0x3cc0 + 0x3cc0: 0x0002, 0x3cc1: 0x0002, 0x3cc2: 0x0002, 0x3cc3: 0x0002, 0x3cc4: 0x0002, 0x3cc5: 0x0002, + 0x3cc6: 0x0002, 0x3cc8: 0x0002, + 0x3ccd: 0x0002, 0x3cce: 0x0002, 0x3ccf: 0x0002, 0x3cd0: 0x0002, 0x3cd1: 0x0002, + 0x3cd2: 0x0002, 0x3cd3: 0x0002, 0x3cd4: 0x0002, 0x3cd5: 0x0002, 0x3cd6: 0x0002, 0x3cd7: 0x0002, + 0x3cd8: 0x0002, 0x3cd9: 0x0002, 0x3cda: 0x0002, 0x3cdb: 0x0002, 0x3cdc: 0x0002, + 0x3cdf: 0x0002, 0x3ce0: 0x0002, 0x3ce1: 0x0002, 0x3ce2: 0x0002, 0x3ce3: 0x0002, + 0x3ce4: 0x0002, 0x3ce5: 0x0002, 0x3ce6: 0x0002, 0x3ce7: 0x0002, 0x3ce8: 0x0002, 0x3ce9: 0x0002, + 0x3cea: 0x0002, 0x3cef: 0x0002, + 0x3cf0: 0x0002, 0x3cf1: 0x0002, 0x3cf2: 0x0002, 0x3cf3: 0x0002, 0x3cf4: 0x0002, 0x3cf5: 0x0002, + 0x3cf6: 0x0002, 0x3cf7: 0x0002, 0x3cf8: 0x0002, + // Block 0xf4, offset 0x3d00 + 0x3d01: 0x0001, + 0x3d20: 0x0001, 0x3d21: 0x0001, 0x3d22: 0x0001, 0x3d23: 0x0001, + 0x3d24: 0x0001, 0x3d25: 0x0001, 0x3d26: 0x0001, 0x3d27: 0x0001, 0x3d28: 0x0001, 0x3d29: 0x0001, + 0x3d2a: 0x0001, 0x3d2b: 0x0001, 0x3d2c: 0x0001, 0x3d2d: 0x0001, 0x3d2e: 0x0001, 0x3d2f: 0x0001, + 0x3d30: 0x0001, 0x3d31: 0x0001, 0x3d32: 0x0001, 0x3d33: 0x0001, 0x3d34: 0x0001, 0x3d35: 0x0001, + 0x3d36: 0x0001, 0x3d37: 0x0001, 0x3d38: 0x0001, 0x3d39: 0x0001, 0x3d3a: 0x0001, 0x3d3b: 0x0001, + 0x3d3c: 0x0001, 0x3d3d: 0x0001, 0x3d3e: 0x0001, 0x3d3f: 0x0001, + // Block 0xf5, offset 0x3d40 + 0x3d40: 0x0003, 0x3d41: 0x0003, 0x3d42: 0x0003, 0x3d43: 0x0003, 0x3d44: 0x0003, 0x3d45: 0x0003, + 0x3d46: 0x0003, 0x3d47: 0x0003, 0x3d48: 0x0003, 0x3d49: 0x0003, 0x3d4a: 0x0003, 0x3d4b: 0x0003, + 0x3d4c: 0x0003, 0x3d4d: 0x0003, 0x3d4e: 0x0003, 0x3d4f: 0x0003, 0x3d50: 0x0003, 0x3d51: 0x0003, + 0x3d52: 0x0003, 0x3d53: 0x0003, 0x3d54: 0x0003, 0x3d55: 0x0003, 0x3d56: 0x0003, 0x3d57: 0x0003, + 0x3d58: 0x0003, 0x3d59: 0x0003, 0x3d5a: 0x0003, 0x3d5b: 0x0003, 0x3d5c: 0x0003, 0x3d5d: 0x0003, + 0x3d5e: 0x0003, 0x3d5f: 0x0003, 0x3d60: 0x0003, 0x3d61: 0x0003, 0x3d62: 0x0003, 0x3d63: 0x0003, + 0x3d64: 0x0003, 0x3d65: 0x0003, 0x3d66: 0x0003, 0x3d67: 0x0003, 0x3d68: 0x0003, 0x3d69: 0x0003, + 0x3d6a: 0x0003, 0x3d6b: 0x0003, 0x3d6c: 0x0003, 0x3d6d: 0x0003, 0x3d6e: 0x0003, 0x3d6f: 0x0003, + 0x3d70: 0x0003, 0x3d71: 0x0003, 0x3d72: 0x0003, 0x3d73: 0x0003, 0x3d74: 0x0003, 0x3d75: 0x0003, + 0x3d76: 0x0003, 0x3d77: 0x0003, 0x3d78: 0x0003, 0x3d79: 0x0003, 0x3d7a: 0x0003, 0x3d7b: 0x0003, + 0x3d7c: 0x0003, 0x3d7d: 0x0003, +} + +// stringWidthIndex: 30 blocks, 1920 entries, 1920 bytes +// Block 0 is the zero block. +var stringWidthIndex = [1920]uint8{ + // Block 0x0, offset 0x0 + // Block 0x1, offset 0x40 + // Block 0x2, offset 0x80 + // Block 0x3, offset 0xc0 + 0xc2: 0x01, 0xc3: 0x02, 0xc4: 0x03, 0xc5: 0x04, 0xc7: 0x05, + 0xc9: 0x06, 0xcb: 0x07, 0xcc: 0x08, 0xcd: 0x09, 0xce: 0x0a, 0xcf: 0x0b, + 0xd0: 0x0c, 0xd1: 0x0d, 0xd2: 0x0e, 0xd6: 0x0f, 0xd7: 0x10, + 0xd8: 0x11, 0xd9: 0x12, 0xdb: 0x13, 0xdc: 0x14, 0xdd: 0x15, 0xde: 0x16, 0xdf: 0x17, + 0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06, 0xe5: 0x06, 0xe6: 0x06, 0xe7: 0x06, + 0xe8: 0x06, 0xe9: 0x06, 0xea: 0x07, 0xeb: 0x06, 0xec: 0x06, 0xed: 0x08, 0xee: 0x09, 0xef: 0x0a, + 0xf0: 0x17, 0xf3: 0x1a, 0xf4: 0x1b, + // Block 0x4, offset 0x100 + 0x120: 0x18, 0x121: 0x19, 0x122: 0x1a, 0x123: 0x1b, 0x124: 0x1c, 0x125: 0x1d, 0x126: 0x1e, 0x127: 0x1f, + 0x128: 0x20, 0x129: 0x21, 0x12a: 0x20, 0x12b: 0x22, 0x12c: 0x23, 0x12d: 0x24, 0x12e: 0x25, 0x12f: 0x26, + 0x130: 0x27, 0x131: 0x28, 0x132: 0x23, 0x133: 0x29, 0x134: 0x2a, 0x135: 0x2b, 0x136: 0x2c, 0x137: 0x2d, + 0x138: 0x2e, 0x139: 0x2f, 0x13a: 0x30, 0x13b: 0x31, 0x13c: 0x32, 0x13d: 0x33, 0x13e: 0x34, 0x13f: 0x35, + // Block 0x5, offset 0x140 + 0x140: 0x36, 0x141: 0x37, 0x142: 0x38, 0x144: 0x39, 0x145: 0x3a, + 0x14d: 0x3b, + 0x15c: 0x3c, 0x15d: 0x3d, 0x15e: 0x3e, 0x15f: 0x3f, + 0x160: 0x40, 0x162: 0x41, 0x164: 0x42, + 0x168: 0x43, 0x169: 0x44, 0x16a: 0x45, 0x16b: 0x46, 0x16c: 0x47, 0x16d: 0x48, 0x16e: 0x49, 0x16f: 0x4a, + 0x170: 0x4b, 0x173: 0x4c, 0x177: 0x08, + // Block 0x6, offset 0x180 + 0x180: 0x4d, 0x181: 0x4e, 0x182: 0x4f, 0x183: 0x50, 0x184: 0x51, 0x185: 0x52, 0x186: 0x53, 0x187: 0x54, + 0x188: 0x55, 0x189: 0x56, 0x18a: 0x57, 0x18c: 0x58, 0x18f: 0x59, + 0x191: 0x5a, 0x192: 0x5b, 0x193: 0x5c, 0x194: 0x5b, 0x195: 0x5d, 0x196: 0x5e, 0x197: 0x5f, + 0x198: 0x60, 0x199: 0x61, 0x19a: 0x62, 0x19b: 0x63, 0x19c: 0x64, 0x19d: 0x65, 0x19e: 0x66, + 0x1ac: 0x67, 0x1ad: 0x68, + 0x1b3: 0x69, 0x1b5: 0x6a, 0x1b7: 0x6b, + 0x1ba: 0x6c, 0x1bb: 0x6d, 0x1bc: 0x39, 0x1bd: 0x39, 0x1be: 0x39, 0x1bf: 0x6e, + // Block 0x7, offset 0x1c0 + 0x1c0: 0x6f, 0x1c1: 0x70, 0x1c2: 0x71, 0x1c3: 0x39, 0x1c4: 0x72, 0x1c5: 0x39, 0x1c6: 0x73, 0x1c7: 0x74, + 0x1c8: 0x75, 0x1c9: 0x76, 0x1ca: 0x39, 0x1cb: 0x39, 0x1cc: 0x39, 0x1cd: 0x39, 0x1ce: 0x39, 0x1cf: 0x39, + 0x1d0: 0x39, 0x1d1: 0x39, 0x1d2: 0x39, 0x1d3: 0x39, 0x1d4: 0x39, 0x1d5: 0x39, 0x1d6: 0x39, 0x1d7: 0x39, + 0x1d8: 0x39, 0x1d9: 0x39, 0x1da: 0x39, 0x1db: 0x39, 0x1dc: 0x39, 0x1dd: 0x39, 0x1de: 0x39, 0x1df: 0x39, + 0x1e0: 0x39, 0x1e1: 0x39, 0x1e2: 0x39, 0x1e3: 0x39, 0x1e4: 0x39, 0x1e5: 0x39, 0x1e6: 0x39, 0x1e7: 0x39, + 0x1e8: 0x39, 0x1e9: 0x39, 0x1ea: 0x39, 0x1eb: 0x39, 0x1ec: 0x39, 0x1ed: 0x39, 0x1ee: 0x39, 0x1ef: 0x39, + 0x1f0: 0x39, 0x1f1: 0x39, 0x1f2: 0x39, 0x1f3: 0x39, 0x1f4: 0x39, 0x1f5: 0x39, 0x1f6: 0x39, 0x1f7: 0x39, + 0x1f8: 0x39, 0x1f9: 0x39, 0x1fa: 0x39, 0x1fb: 0x39, 0x1fc: 0x39, 0x1fd: 0x39, 0x1fe: 0x39, 0x1ff: 0x39, + // Block 0x8, offset 0x200 + 0x200: 0x39, 0x201: 0x39, 0x202: 0x39, 0x203: 0x39, 0x204: 0x39, 0x205: 0x39, 0x206: 0x39, 0x207: 0x39, + 0x208: 0x39, 0x209: 0x39, 0x20a: 0x39, 0x20b: 0x39, 0x20c: 0x39, 0x20d: 0x39, 0x20e: 0x39, 0x20f: 0x39, + 0x210: 0x39, 0x211: 0x39, 0x212: 0x39, 0x213: 0x39, 0x214: 0x39, 0x215: 0x39, 0x216: 0x39, 0x217: 0x39, + 0x218: 0x39, 0x219: 0x39, 0x21a: 0x39, 0x21b: 0x39, 0x21c: 0x39, 0x21d: 0x39, 0x21e: 0x39, 0x21f: 0x39, + 0x220: 0x39, 0x221: 0x39, 0x222: 0x39, 0x223: 0x39, 0x224: 0x39, 0x225: 0x39, 0x226: 0x39, 0x227: 0x39, + 0x228: 0x39, 0x229: 0x39, 0x22a: 0x39, 0x22b: 0x39, 0x22c: 0x39, 0x22d: 0x39, 0x22e: 0x39, 0x22f: 0x39, + 0x230: 0x39, 0x231: 0x39, 0x232: 0x39, 0x233: 0x39, 0x234: 0x39, 0x235: 0x39, 0x236: 0x39, 0x237: 0x39, + 0x238: 0x39, 0x239: 0x39, 0x23a: 0x39, 0x23b: 0x39, 0x23c: 0x39, 0x23d: 0x39, 0x23e: 0x39, 0x23f: 0x39, + // Block 0x9, offset 0x240 + 0x240: 0x39, 0x241: 0x39, 0x242: 0x39, 0x243: 0x39, 0x244: 0x39, 0x245: 0x39, 0x246: 0x39, 0x247: 0x39, + 0x248: 0x39, 0x249: 0x39, 0x24a: 0x39, 0x24b: 0x39, 0x24c: 0x39, 0x24d: 0x39, 0x24e: 0x39, 0x24f: 0x39, + 0x250: 0x39, 0x251: 0x39, 0x252: 0x77, 0x253: 0x78, + 0x259: 0x79, 0x25a: 0x7a, 0x25b: 0x7b, + 0x260: 0x7c, 0x263: 0x7d, 0x264: 0x7e, 0x265: 0x7f, 0x266: 0x80, 0x267: 0x81, + 0x268: 0x82, 0x269: 0x83, 0x26a: 0x84, 0x26b: 0x85, 0x26f: 0x86, + 0x270: 0x39, 0x271: 0x39, 0x272: 0x39, 0x273: 0x39, 0x274: 0x39, 0x275: 0x39, 0x276: 0x39, 0x277: 0x39, + 0x278: 0x39, 0x279: 0x39, 0x27a: 0x39, 0x27b: 0x39, 0x27c: 0x39, 0x27d: 0x39, 0x27e: 0x39, 0x27f: 0x39, + // Block 0xa, offset 0x280 + 0x280: 0x39, 0x281: 0x39, 0x282: 0x39, 0x283: 0x39, 0x284: 0x39, 0x285: 0x39, 0x286: 0x39, 0x287: 0x39, + 0x288: 0x39, 0x289: 0x39, 0x28a: 0x39, 0x28b: 0x39, 0x28c: 0x39, 0x28d: 0x39, 0x28e: 0x39, 0x28f: 0x39, + 0x290: 0x39, 0x291: 0x39, 0x292: 0x39, 0x293: 0x39, 0x294: 0x39, 0x295: 0x39, 0x296: 0x39, 0x297: 0x39, + 0x298: 0x39, 0x299: 0x39, 0x29a: 0x39, 0x29b: 0x39, 0x29c: 0x39, 0x29d: 0x39, 0x29e: 0x87, + // Block 0xb, offset 0x2c0 + 0x2c0: 0x5b, 0x2c1: 0x5b, 0x2c2: 0x5b, 0x2c3: 0x5b, 0x2c4: 0x5b, 0x2c5: 0x5b, 0x2c6: 0x5b, 0x2c7: 0x5b, + 0x2c8: 0x5b, 0x2c9: 0x5b, 0x2ca: 0x5b, 0x2cb: 0x5b, 0x2cc: 0x5b, 0x2cd: 0x5b, 0x2ce: 0x5b, 0x2cf: 0x5b, + 0x2d0: 0x5b, 0x2d1: 0x5b, 0x2d2: 0x5b, 0x2d3: 0x5b, 0x2d4: 0x5b, 0x2d5: 0x5b, 0x2d6: 0x5b, 0x2d7: 0x5b, + 0x2d8: 0x5b, 0x2d9: 0x5b, 0x2da: 0x5b, 0x2db: 0x5b, 0x2dc: 0x5b, 0x2dd: 0x5b, 0x2de: 0x5b, 0x2df: 0x5b, + 0x2e0: 0x5b, 0x2e1: 0x5b, 0x2e2: 0x5b, 0x2e3: 0x5b, 0x2e4: 0x5b, 0x2e5: 0x5b, 0x2e6: 0x5b, 0x2e7: 0x5b, + 0x2e8: 0x5b, 0x2e9: 0x5b, 0x2ea: 0x5b, 0x2eb: 0x5b, 0x2ec: 0x5b, 0x2ed: 0x5b, 0x2ee: 0x5b, 0x2ef: 0x5b, + 0x2f0: 0x5b, 0x2f1: 0x5b, 0x2f2: 0x5b, 0x2f3: 0x5b, 0x2f4: 0x5b, 0x2f5: 0x5b, 0x2f6: 0x5b, 0x2f7: 0x5b, + 0x2f8: 0x5b, 0x2f9: 0x5b, 0x2fa: 0x5b, 0x2fb: 0x5b, 0x2fc: 0x5b, 0x2fd: 0x5b, 0x2fe: 0x5b, 0x2ff: 0x5b, + // Block 0xc, offset 0x300 + 0x300: 0x5b, 0x301: 0x5b, 0x302: 0x5b, 0x303: 0x5b, 0x304: 0x5b, 0x305: 0x5b, 0x306: 0x5b, 0x307: 0x5b, + 0x308: 0x5b, 0x309: 0x5b, 0x30a: 0x5b, 0x30b: 0x5b, 0x30c: 0x5b, 0x30d: 0x5b, 0x30e: 0x5b, 0x30f: 0x5b, + 0x310: 0x5b, 0x311: 0x5b, 0x312: 0x5b, 0x313: 0x5b, 0x314: 0x5b, 0x315: 0x5b, 0x316: 0x5b, 0x317: 0x5b, + 0x318: 0x5b, 0x319: 0x5b, 0x31a: 0x5b, 0x31b: 0x5b, 0x31c: 0x5b, 0x31d: 0x5b, 0x31e: 0x5b, 0x31f: 0x5b, + 0x320: 0x5b, 0x321: 0x5b, 0x322: 0x5b, 0x323: 0x5b, 0x324: 0x39, 0x325: 0x39, 0x326: 0x39, 0x327: 0x39, + 0x328: 0x39, 0x329: 0x39, 0x32a: 0x39, 0x32b: 0x39, 0x32c: 0x88, + 0x338: 0x89, 0x339: 0x8a, 0x33b: 0x6a, 0x33c: 0x70, 0x33d: 0x8b, 0x33f: 0x8c, + // Block 0xd, offset 0x340 + 0x347: 0x8d, + 0x34b: 0x8e, 0x34d: 0x8f, + 0x368: 0x90, 0x36b: 0x91, + 0x374: 0x92, + 0x37a: 0x93, 0x37b: 0x94, 0x37d: 0x95, 0x37e: 0x96, + // Block 0xe, offset 0x380 + 0x380: 0x97, 0x381: 0x98, 0x382: 0x99, 0x383: 0x9a, 0x384: 0x9b, 0x385: 0x9c, 0x386: 0x9d, 0x387: 0x9e, + 0x388: 0x9f, 0x389: 0x2c, 0x38b: 0xa0, 0x38c: 0x2a, 0x38d: 0xa1, + 0x390: 0xa2, 0x391: 0xa3, 0x392: 0xa4, 0x393: 0xa5, 0x396: 0xa6, 0x397: 0xa7, + 0x398: 0xa8, 0x399: 0xa9, 0x39a: 0xaa, 0x39c: 0xab, + 0x3a0: 0xac, 0x3a4: 0xad, 0x3a5: 0xae, 0x3a7: 0xaf, + 0x3a8: 0xb0, 0x3a9: 0xb1, 0x3aa: 0xb2, + 0x3b0: 0xb3, 0x3b2: 0xb4, 0x3b4: 0xb5, 0x3b5: 0xb6, 0x3b6: 0xb7, + 0x3bb: 0xb8, 0x3bc: 0xb9, 0x3bd: 0xba, + // Block 0xf, offset 0x3c0 + 0x3d0: 0x45, 0x3d1: 0xbb, + // Block 0x10, offset 0x400 + 0x42b: 0xbc, 0x42c: 0xbd, + 0x43d: 0xbe, 0x43e: 0xbf, 0x43f: 0xc0, + // Block 0x11, offset 0x440 + 0x440: 0x39, 0x441: 0x39, 0x442: 0x39, 0x443: 0x39, 0x444: 0x39, 0x445: 0x39, 0x446: 0x39, 0x447: 0x39, + 0x448: 0x39, 0x449: 0x39, 0x44a: 0x39, 0x44b: 0x39, 0x44c: 0x39, 0x44d: 0x39, 0x44e: 0x39, 0x44f: 0x39, + 0x450: 0x39, 0x451: 0x39, 0x452: 0x39, 0x453: 0x39, 0x454: 0x39, 0x455: 0x39, 0x456: 0x39, 0x457: 0x39, + 0x458: 0x39, 0x459: 0x39, 0x45a: 0x39, 0x45b: 0x39, 0x45c: 0x39, 0x45d: 0x39, 0x45e: 0x39, 0x45f: 0x39, + 0x460: 0x39, 0x461: 0x39, 0x462: 0x39, 0x463: 0x39, 0x464: 0x39, 0x465: 0x39, 0x466: 0x39, 0x467: 0x39, + 0x468: 0x39, 0x469: 0x39, 0x46a: 0x39, 0x46b: 0x39, 0x46c: 0x39, 0x46d: 0x39, 0x46e: 0x39, 0x46f: 0x39, + 0x470: 0x39, 0x471: 0x39, 0x472: 0x39, 0x473: 0xc1, 0x474: 0xc2, 0x476: 0x39, 0x477: 0xc3, + // Block 0x12, offset 0x480 + 0x4bf: 0xc4, + // Block 0x13, offset 0x4c0 + 0x4c0: 0x39, 0x4c1: 0x39, 0x4c2: 0x39, 0x4c3: 0x39, 0x4c4: 0xc5, 0x4c5: 0xc6, 0x4c6: 0x39, 0x4c7: 0x39, + 0x4c8: 0x39, 0x4c9: 0x39, 0x4ca: 0x39, 0x4cb: 0xc7, + 0x4f2: 0xc8, + // Block 0x14, offset 0x500 + 0x53c: 0xc9, 0x53d: 0xca, + // Block 0x15, offset 0x540 + 0x545: 0xcb, 0x546: 0xcc, + 0x549: 0xcd, 0x54c: 0x39, 0x54d: 0xce, + 0x568: 0xcf, 0x569: 0xd0, 0x56a: 0xd1, + // Block 0x16, offset 0x580 + 0x580: 0xd2, 0x582: 0xbe, 0x584: 0xbd, + 0x58a: 0xd3, 0x58b: 0xd4, + 0x593: 0xd4, + 0x5a3: 0xd5, 0x5a5: 0xd6, + // Block 0x17, offset 0x5c0 + 0x5c0: 0xd7, 0x5c3: 0xd8, 0x5c4: 0xd9, 0x5c5: 0xda, 0x5c6: 0xdb, 0x5c7: 0xdc, + 0x5c8: 0xdd, 0x5c9: 0xde, 0x5cc: 0xdf, 0x5cd: 0xe0, 0x5ce: 0xe1, 0x5cf: 0xe2, + 0x5d0: 0xe3, 0x5d1: 0xe4, 0x5d2: 0x39, 0x5d3: 0xe5, 0x5d4: 0xe6, 0x5d5: 0xe7, 0x5d6: 0xe8, 0x5d7: 0xe9, + 0x5d8: 0x39, 0x5d9: 0xea, 0x5da: 0x39, 0x5db: 0xeb, 0x5df: 0xec, + 0x5e4: 0xed, 0x5e5: 0xee, 0x5e6: 0x39, 0x5e7: 0x39, + 0x5e9: 0xef, 0x5ea: 0xf0, 0x5eb: 0xf1, + // Block 0x18, offset 0x600 + 0x600: 0x39, 0x601: 0x39, 0x602: 0x39, 0x603: 0x39, 0x604: 0x39, 0x605: 0x39, 0x606: 0x39, 0x607: 0x39, + 0x608: 0x39, 0x609: 0x39, 0x60a: 0x39, 0x60b: 0x39, 0x60c: 0x39, 0x60d: 0x39, 0x60e: 0x39, 0x60f: 0x39, + 0x610: 0x39, 0x611: 0x39, 0x612: 0x39, 0x613: 0x39, 0x614: 0x39, 0x615: 0x39, 0x616: 0x39, 0x617: 0x39, + 0x618: 0x39, 0x619: 0x39, 0x61a: 0x39, 0x61b: 0x39, 0x61c: 0x39, 0x61d: 0x39, 0x61e: 0x39, 0x61f: 0x39, + 0x620: 0x39, 0x621: 0x39, 0x622: 0x39, 0x623: 0x39, 0x624: 0x39, 0x625: 0x39, 0x626: 0x39, 0x627: 0x39, + 0x628: 0x39, 0x629: 0x39, 0x62a: 0x39, 0x62b: 0x39, 0x62c: 0x39, 0x62d: 0x39, 0x62e: 0x39, 0x62f: 0x39, + 0x630: 0x39, 0x631: 0x39, 0x632: 0x39, 0x633: 0x39, 0x634: 0x39, 0x635: 0x39, 0x636: 0x39, 0x637: 0x39, + 0x638: 0x39, 0x639: 0x39, 0x63a: 0x39, 0x63b: 0x39, 0x63c: 0x39, 0x63d: 0x39, 0x63e: 0x39, 0x63f: 0xe6, + // Block 0x19, offset 0x640 + 0x650: 0x0b, 0x651: 0x0c, 0x653: 0x0d, 0x656: 0x0e, 0x657: 0x06, + 0x658: 0x0f, 0x65a: 0x10, 0x65b: 0x11, 0x65c: 0x12, 0x65d: 0x13, 0x65e: 0x14, 0x65f: 0x15, + 0x660: 0x06, 0x661: 0x06, 0x662: 0x06, 0x663: 0x06, 0x664: 0x06, 0x665: 0x06, 0x666: 0x06, 0x667: 0x06, + 0x668: 0x06, 0x669: 0x06, 0x66a: 0x06, 0x66b: 0x06, 0x66c: 0x06, 0x66d: 0x06, 0x66e: 0x06, 0x66f: 0x16, + 0x670: 0x06, 0x671: 0x06, 0x672: 0x06, 0x673: 0x06, 0x674: 0x06, 0x675: 0x06, 0x676: 0x06, 0x677: 0x06, + 0x678: 0x06, 0x679: 0x06, 0x67a: 0x06, 0x67b: 0x06, 0x67c: 0x06, 0x67d: 0x06, 0x67e: 0x06, 0x67f: 0x16, + // Block 0x1a, offset 0x680 + 0x680: 0xf2, 0x681: 0x08, 0x684: 0x08, 0x685: 0x08, 0x686: 0x08, 0x687: 0x09, + // Block 0x1b, offset 0x6c0 + 0x6c0: 0x5b, 0x6c1: 0x5b, 0x6c2: 0x5b, 0x6c3: 0x5b, 0x6c4: 0x5b, 0x6c5: 0x5b, 0x6c6: 0x5b, 0x6c7: 0x5b, + 0x6c8: 0x5b, 0x6c9: 0x5b, 0x6ca: 0x5b, 0x6cb: 0x5b, 0x6cc: 0x5b, 0x6cd: 0x5b, 0x6ce: 0x5b, 0x6cf: 0x5b, + 0x6d0: 0x5b, 0x6d1: 0x5b, 0x6d2: 0x5b, 0x6d3: 0x5b, 0x6d4: 0x5b, 0x6d5: 0x5b, 0x6d6: 0x5b, 0x6d7: 0x5b, + 0x6d8: 0x5b, 0x6d9: 0x5b, 0x6da: 0x5b, 0x6db: 0x5b, 0x6dc: 0x5b, 0x6dd: 0x5b, 0x6de: 0x5b, 0x6df: 0x5b, + 0x6e0: 0x5b, 0x6e1: 0x5b, 0x6e2: 0x5b, 0x6e3: 0x5b, 0x6e4: 0x5b, 0x6e5: 0x5b, 0x6e6: 0x5b, 0x6e7: 0x5b, + 0x6e8: 0x5b, 0x6e9: 0x5b, 0x6ea: 0x5b, 0x6eb: 0x5b, 0x6ec: 0x5b, 0x6ed: 0x5b, 0x6ee: 0x5b, 0x6ef: 0x5b, + 0x6f0: 0x5b, 0x6f1: 0x5b, 0x6f2: 0x5b, 0x6f3: 0x5b, 0x6f4: 0x5b, 0x6f5: 0x5b, 0x6f6: 0x5b, 0x6f7: 0x5b, + 0x6f8: 0x5b, 0x6f9: 0x5b, 0x6fa: 0x5b, 0x6fb: 0x5b, 0x6fc: 0x5b, 0x6fd: 0x5b, 0x6fe: 0x5b, 0x6ff: 0xf3, + // Block 0x1c, offset 0x700 + 0x720: 0x18, + 0x730: 0x09, 0x731: 0x09, 0x732: 0x09, 0x733: 0x09, 0x734: 0x09, 0x735: 0x09, 0x736: 0x09, 0x737: 0x09, + 0x738: 0x09, 0x739: 0x09, 0x73a: 0x09, 0x73b: 0x09, 0x73c: 0x09, 0x73d: 0x09, 0x73e: 0x09, 0x73f: 0x19, + // Block 0x1d, offset 0x740 + 0x740: 0x09, 0x741: 0x09, 0x742: 0x09, 0x743: 0x09, 0x744: 0x09, 0x745: 0x09, 0x746: 0x09, 0x747: 0x09, + 0x748: 0x09, 0x749: 0x09, 0x74a: 0x09, 0x74b: 0x09, 0x74c: 0x09, 0x74d: 0x09, 0x74e: 0x09, 0x74f: 0x19, +} diff --git a/vendor/github.com/clipperhouse/displaywidth/truncate.go b/vendor/github.com/clipperhouse/displaywidth/truncate.go new file mode 100644 index 000000000..b3e696f49 --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/truncate.go @@ -0,0 +1,149 @@ +package displaywidth + +import ( + "strings" + + "github.com/clipperhouse/uax29/v2/graphemes" +) + +// TruncateString truncates a string to the given maxWidth, and appends the +// given tail if the string is truncated. +// +// It ensures the visible width, including the width of the tail, is less than or +// equal to maxWidth. +// +// When [Options.ControlSequences] is true, 7-bit ANSI escape sequences that +// appear after the truncation point are preserved in the output. This ensures +// that escape sequences such as SGR resets are not lost, preventing color +// bleed in terminal output. +// +// [Options.ControlSequences8Bit] is ignored by truncation. 8-bit C1 byte values +// (0x80-0x9F) overlap with UTF-8 multi-byte encoding, so manipulating them +// during truncation can shift byte boundaries and form unintended visible +// characters. Use [Options.String] or [Options.Bytes] for 8-bit-aware width +// measurement. +func (options Options) TruncateString(s string, maxWidth int, tail string) string { + // We deliberately ignore ControlSequences8Bit for truncation, see above. + options.ControlSequences8Bit = false + + maxWidthWithoutTail := maxWidth - options.String(tail) + + var pos, total int + g := graphemes.FromString(s) + g.AnsiEscapeSequences = options.ControlSequences + + for g.Next() { + gw := graphemeWidth(g.Value(), options) + if total+gw <= maxWidthWithoutTail { + pos = g.End() + } + total += gw + if total > maxWidth { + if options.ControlSequences { + // Build result with trailing 7-bit ANSI escape sequences preserved + var b strings.Builder + b.Grow(len(s) + len(tail)) // at most original + tail + b.WriteString(s[:pos]) + b.WriteString(tail) + + rem := graphemes.FromString(s[pos:]) + rem.AnsiEscapeSequences = options.ControlSequences + + for rem.Next() { + v := rem.Value() + // Only preserve 7-bit escapes (ESC = 0x1B) that measure + // as zero-width on their own; some sequences (e.g. SOS) + // are only valid in their original context. + if len(v) > 0 && v[0] == 0x1B && options.String(v) == 0 { + b.WriteString(v) + } + } + return b.String() + } + return s[:pos] + tail + } + } + // No truncation + return s +} + +// TruncateString truncates a string to the given maxWidth, and appends the +// given tail if the string is truncated. +// +// It ensures the total width, including the width of the tail, is less than or +// equal to maxWidth. +func TruncateString(s string, maxWidth int, tail string) string { + return DefaultOptions.TruncateString(s, maxWidth, tail) +} + +// TruncateBytes truncates a []byte to the given maxWidth, and appends the +// given tail if the []byte is truncated. +// +// It ensures the visible width, including the width of the tail, is less than or +// equal to maxWidth. +// +// When [Options.ControlSequences] is true, 7-bit ANSI escape sequences that +// appear after the truncation point are preserved in the output. This ensures +// that escape sequences such as SGR resets are not lost, preventing color +// bleed in terminal output. +// +// [Options.ControlSequences8Bit] is ignored by truncation. 8-bit C1 byte values +// (0x80-0x9F) overlap with UTF-8 multi-byte encoding, so manipulating them +// during truncation can shift byte boundaries and form unintended visible +// characters. Use [Options.String] or [Options.Bytes] for 8-bit-aware width +// measurement. +func (options Options) TruncateBytes(s []byte, maxWidth int, tail []byte) []byte { + // We deliberately ignore ControlSequences8Bit for truncation, see above. + options.ControlSequences8Bit = false + + maxWidthWithoutTail := maxWidth - options.Bytes(tail) + + var pos, total int + g := graphemes.FromBytes(s) + g.AnsiEscapeSequences = options.ControlSequences + + for g.Next() { + gw := graphemeWidth(g.Value(), options) + if total+gw <= maxWidthWithoutTail { + pos = g.End() + } + total += gw + if total > maxWidth { + if options.ControlSequences { + // Build result with trailing 7-bit ANSI escape sequences preserved + result := make([]byte, 0, len(s)+len(tail)) // at most original + tail + result = append(result, s[:pos]...) + result = append(result, tail...) + + rem := graphemes.FromBytes(s[pos:]) + rem.AnsiEscapeSequences = options.ControlSequences + + for rem.Next() { + v := rem.Value() + // Only preserve 7-bit escapes (ESC = 0x1B) that measure + // as zero-width on their own; some sequences (e.g. SOS) + // are only valid in their original context. + if len(v) > 0 && v[0] == 0x1B && options.Bytes(v) == 0 { + result = append(result, v...) + } + } + return result + } + result := make([]byte, 0, pos+len(tail)) + result = append(result, s[:pos]...) + result = append(result, tail...) + return result + } + } + // No truncation + return s +} + +// TruncateBytes truncates a []byte to the given maxWidth, and appends the +// given tail if the []byte is truncated. +// +// It ensures the total width, including the width of the tail, is less than or +// equal to maxWidth. +func TruncateBytes(s []byte, maxWidth int, tail []byte) []byte { + return DefaultOptions.TruncateBytes(s, maxWidth, tail) +} diff --git a/vendor/github.com/clipperhouse/displaywidth/width.go b/vendor/github.com/clipperhouse/displaywidth/width.go new file mode 100644 index 000000000..f6e0ab7fd --- /dev/null +++ b/vendor/github.com/clipperhouse/displaywidth/width.go @@ -0,0 +1,239 @@ +package displaywidth + +import ( + "unicode/utf8" + + "github.com/clipperhouse/uax29/v2/graphemes" +) + +// String calculates the display width of a string, +// by iterating over grapheme clusters in the string +// and summing their widths. +func String(s string) int { + return DefaultOptions.String(s) +} + +// String calculates the display width of a string, for the given options, by +// iterating over grapheme clusters in the string and summing their widths. +func (options Options) String(s string) int { + width := 0 + pos := 0 + + for pos < len(s) { + // Try ASCII optimization + asciiLen := printableASCIILength(s[pos:]) + if asciiLen > 0 { + width += asciiLen + pos += asciiLen + continue + } + + // Not ASCII, use grapheme parsing + g := graphemes.FromString(s[pos:]) + g.AnsiEscapeSequences = options.ControlSequences + g.AnsiEscapeSequences8Bit = options.ControlSequences8Bit + + start := pos + + for g.Next() { + v := g.Value() + width += graphemeWidth(v, options) + pos += len(v) + + // Quick check: if remaining might have printable ASCII, break to outer loop + if pos < len(s) && s[pos] >= 0x20 && s[pos] <= 0x7E { + break + } + } + + // Defensive, should not happen: if no progress was made, + // skip a byte to prevent infinite loop. Only applies if + // the grapheme parser misbehaves. + if pos == start { + pos++ + } + } + + return width +} + +// Bytes calculates the display width of a []byte, +// by iterating over grapheme clusters in the byte slice +// and summing their widths. +func Bytes(s []byte) int { + return DefaultOptions.Bytes(s) +} + +// Bytes calculates the display width of a []byte, for the given options, by +// iterating over grapheme clusters in the slice and summing their widths. +func (options Options) Bytes(s []byte) int { + width := 0 + pos := 0 + + for pos < len(s) { + // Try ASCII optimization + asciiLen := printableASCIILength(s[pos:]) + if asciiLen > 0 { + width += asciiLen + pos += asciiLen + continue + } + + // Not ASCII, use grapheme parsing + g := graphemes.FromBytes(s[pos:]) + g.AnsiEscapeSequences = options.ControlSequences + g.AnsiEscapeSequences8Bit = options.ControlSequences8Bit + + start := pos + + for g.Next() { + v := g.Value() + width += graphemeWidth(v, options) + pos += len(v) + + // Quick check: if remaining might have printable ASCII, break to outer loop + if pos < len(s) && s[pos] >= 0x20 && s[pos] <= 0x7E { + break + } + } + + // Defensive, should not happen: if no progress was made, + // skip a byte to prevent infinite loop. Only applies if + // the grapheme parser misbehaves. + if pos == start { + pos++ + } + } + + return width +} + +// Rune calculates the display width of a rune. You +// should almost certainly use [String] or [Bytes] for +// most purposes. +// +// The smallest unit of display width is a grapheme +// cluster, not a rune. Iterating over runes to measure +// width is incorrect in many cases. +func Rune(r rune) int { + return DefaultOptions.Rune(r) +} + +// Rune calculates the display width of a rune, for the given options. +// +// You should almost certainly use [String] or [Bytes] for most purposes. +// +// The smallest unit of display width is a grapheme cluster, not a rune. +// Iterating over runes to measure width is incorrect in many cases. +func (options Options) Rune(r rune) int { + if r < utf8.RuneSelf { + return asciiWidth(byte(r)) + } + + // Surrogates (U+D800-U+DFFF) are invalid UTF-8. + if r >= 0xD800 && r <= 0xDFFF { + return 0 + } + + var buf [4]byte + n := utf8.EncodeRune(buf[:], r) + + // Skip the grapheme iterator + return graphemeWidth(buf[:n], options) +} + +const _Default property = 0 + +// graphemeWidth returns the display width of a grapheme cluster. +// The passed string must be a single grapheme cluster. +func graphemeWidth[T ~string | []byte](s T, options Options) int { + if len(s) == 0 { + return 0 + } + + // C1 controls (0x80-0x9F) are zero-width when 8-bit control sequences + // are enabled. This must be checked before the single-byte optimization + // below, which would otherwise return width 1 for these bytes. + if options.ControlSequences8Bit && s[0] >= 0x80 && s[0] <= 0x9F { + return 0 + } + + // Optimization: single-byte graphemes need no property lookup + if len(s) == 1 { + return asciiWidth(s[0]) + } + + // Multi-byte grapheme clusters led by a C0 control (0x00-0x1F) + if s[0] <= 0x1F { + return 0 + } + + p, sz := lookup(s) + prop := property(p) + + // Variation Selector 16 (VS16) requests emoji presentation + if prop != _Wide && sz > 0 && len(s) >= sz+3 { + vs := s[sz : sz+3] + if isVS16(vs) { + prop = _Wide + } + // VS15 (0x8E) requests text presentation but does not affect width, + // in my reading of Unicode TR51. Falls through to return the base + // character's property. + } + + if options.EastAsianWidth && prop == _East_Asian_Ambiguous { + prop = _Wide + } + + if prop > upperBound { + prop = _Default + } + + return propertyWidths[prop] +} + +func asciiWidth(b byte) int { + if b <= 0x1F || b == 0x7F { + return 0 + } + return 1 +} + +// printableASCIILength returns the length of consecutive printable ASCII bytes +// starting at the beginning of s. +func printableASCIILength[T string | []byte](s T) int { + i := 0 + for ; i < len(s); i++ { + b := s[i] + // Printable ASCII is 0x20-0x7E (space through tilde) + if b < 0x20 || b > 0x7E { + break + } + } + + // If the next byte is non-ASCII (>= 0x80), back off by 1. The grapheme + // parser may group the last ASCII byte with subsequent non-ASCII bytes, + // such as combining marks. + if i > 0 && i < len(s) && s[i] >= 0x80 { + i-- + } + + return i +} + +// isVS16 checks if the slice matches VS16 (U+FE0F) UTF-8 encoding +// (EF B8 8F). It assumes len(s) >= 3. +func isVS16[T ~string | []byte](s T) bool { + return s[0] == 0xEF && s[1] == 0xB8 && s[2] == 0x8F +} + +// propertyWidths is a jump table of sorts, instead of a switch +var propertyWidths = [4]int{ + _Default: 1, + _Zero_Width: 0, + _Wide: 2, + _East_Asian_Ambiguous: 1, +} + +const upperBound = property(len(propertyWidths) - 1) diff --git a/vendor/github.com/clipperhouse/uax29/v2/LICENSE b/vendor/github.com/clipperhouse/uax29/v2/LICENSE new file mode 100644 index 000000000..6ae86a9a1 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Matt Sherman + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/README.md b/vendor/github.com/clipperhouse/uax29/v2/graphemes/README.md new file mode 100644 index 000000000..3f8a5e3f9 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/README.md @@ -0,0 +1,120 @@ +An implementation of grapheme cluster boundaries from [Unicode text segmentation](https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries) (UAX 29), for Unicode 17. + +[![Documentation](https://pkg.go.dev/badge/github.com/clipperhouse/uax29/v2/graphemes.svg)](https://pkg.go.dev/github.com/clipperhouse/uax29/v2/graphemes) +![Tests](https://github.com/clipperhouse/uax29/actions/workflows/gotest.yml/badge.svg) +![Fuzz](https://github.com/clipperhouse/uax29/actions/workflows/gofuzz.yml/badge.svg) + +## Quick start + +``` +go get github.com/clipperhouse/uax29/v2/graphemes +``` + +```go +import "github.com/clipperhouse/uax29/v2/graphemes" + +text := "Hello, 世界. Nice dog! 👍🐶" +g := graphemes.FromString(text) + +for g.Next() { // Next() returns true until end of data + fmt.Println(g.Value()) // Do something with the current grapheme +} +``` + +_A grapheme is a “single visible character”, which might be a simple as a single letter, or a complex emoji that consists of several Unicode code points._ + +## Conformance + +We use the Unicode [test suite](https://unicode.org/reports/tr41/tr41-36.html#Tests29). + +![Tests](https://github.com/clipperhouse/uax29/actions/workflows/gotest.yml/badge.svg) +![Fuzz](https://github.com/clipperhouse/uax29/actions/workflows/gofuzz.yml/badge.svg) + +## APIs + +### If you have a `string` + +```go +text := "Hello, 世界. Nice dog! 👍🐶" +g := graphemes.FromString(text) + +for g.Next() { // Next() returns true until end of data + fmt.Println(g.Value()) // Do something with the current grapheme +} +``` + +### If you have an `io.Reader` + +`FromReader` embeds a [`bufio.Scanner`](https://pkg.go.dev/bufio#Scanner), so just use those methods. + +```go +r := getYourReader() // from a file or network maybe +g := graphemes.FromReader(r) + +for g.Scan() { // Scan() returns true until error or EOF + fmt.Println(g.Text()) // Do something with the current grapheme +} + +if g.Err() != nil { // Check the error + log.Fatal(g.Err()) +} +``` + +### If you have a `[]byte` + +```go +b := []byte("Hello, 世界. Nice dog! 👍🐶") + +g := graphemes.FromBytes(b) + +for g.Next() { // Next() returns true until end of data + fmt.Println(g.Value()) // Do something with the current grapheme +} +``` + +### ANSI escape sequences + +By the UAX 29 specification, ANSI escape sequences are not grapheme clusters. To treat 7-bit ANSI escape sequences as a single cluster, set `AnsiEscapeSequences` to true. + +```go +text := "Hello, \x1b[31mworld\x1b[0m!" +g := graphemes.FromString(text) +g.AnsiEscapeSequences = true + +for g.Next() { + fmt.Println(g.Value()) +} +``` + +To also parse 8-bit C1 controls (non-UTF-8 bytes), set `AnsiEscapeSequences8Bit` to true. + +```go +g.AnsiEscapeSequences = true // 7-bit forms (ESC ...) +g.AnsiEscapeSequences8Bit = true // 8-bit C1 forms (0x80-0x9F), not valid UTF-8 +``` + +For ESC-initiated (7-bit) control strings, only 7-bit terminators are recognized. +For C1-initiated (8-bit) control strings, only C1 ST (`0x9C`) is recognized as ST. + +We implement [ECMA-48](https://ecma-international.org/publications-and-standards/standards/ecma-48/) control codes in both 7-bit and 8-bit representations. 8-bit control codes are not UTF-8 encoded and are not valid UTF-8, caveat emptor. + +### Benchmarks + +``` +goos: darwin +goarch: arm64 +pkg: github.com/clipperhouse/uax29/graphemes/comparative +cpu: Apple M2 + +BenchmarkGraphemesMixed/clipperhouse/uax29-8 142635 ns/op 245.12 MB/s 0 B/op 0 allocs/op +BenchmarkGraphemesMixed/rivo/uniseg-8 2018284 ns/op 17.32 MB/s 0 B/op 0 allocs/op + +BenchmarkGraphemesASCII/clipperhouse/uax29-8 8846 ns/op 508.73 MB/s 0 B/op 0 allocs/op +BenchmarkGraphemesASCII/rivo/uniseg-8 366760 ns/op 12.27 MB/s 0 B/op 0 allocs/op +``` + +### Invalid inputs + +Invalid UTF-8 input is considered undefined behavior. We test to ensure that bad inputs will not cause pathological outcomes, such as a panic or infinite loop. Callers should expect “garbage-in, garbage-out”. + +Your pipeline should probably include a call to [`utf8.Valid()`](https://pkg.go.dev/unicode/utf8#Valid). diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/ansi.go b/vendor/github.com/clipperhouse/uax29/v2/graphemes/ansi.go new file mode 100644 index 000000000..9cd09b426 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/ansi.go @@ -0,0 +1,138 @@ +package graphemes + +// ansiEscapeLength returns the byte length of a valid 7-bit ANSI escape +// sequence at the start of data, or 0 if none. +// +// Recognized forms (ECMA-48 / ISO 6429): +// - CSI: ESC [ then parameter bytes (0x30-0x3F), intermediate (0x20-0x2F), final (0x40-0x7E) +// - OSC: ESC ] then payload until BEL (0x07), 7-bit ST (ESC \), CAN (0x18), or SUB (0x1A) +// - DCS, SOS, PM, APC: ESC P/X/^/_ then payload until 7-bit ST (ESC \), CAN, or SUB +// - Two-byte: ESC + Fe/Fs (0x40-0x7E excluding above), or Fp (0x30-0x3F), or nF (0x20-0x2F then final) +func ansiEscapeLength[T ~string | ~[]byte](data T) int { + n := len(data) + if n < 2 || data[0] != esc { + return 0 + } + + b1 := data[1] + switch b1 { + case '[': // CSI + body := csiBodyLength(data[2:]) + if body == 0 { + return 0 + } + return 2 + body + case ']': // OSC - allows BEL or 7-bit ST terminator + body := oscLength(data[2:]) + if body < 0 { + return 0 + } + return 2 + body + case 'P', 'X', '^', '_': // DCS, SOS, PM, APC + body := stSequenceLength(data[2:]) + if body < 0 { + return 0 + } + return 2 + body + } + + if b1 >= 0x40 && b1 <= 0x7E { + // Fe/Fs two-byte; [ ] P X ^ _ handled above + return 2 + } + if b1 >= 0x30 && b1 <= 0x3F { + // Fp (private) two-byte + return 2 + } + if b1 >= 0x20 && b1 <= 0x2F { + // nF: intermediates then one final (0x30-0x7E) + i := 2 + for i < n && data[i] >= 0x20 && data[i] <= 0x2F { + i++ + } + if i < n && data[i] >= 0x30 && data[i] <= 0x7E { + return i + 1 + } + return 0 + } + + return 0 +} + +// csiBodyLength returns the length of the CSI body (param/intermediate/final bytes). +// data is the slice after "ESC [". +// Per ECMA-48, the CSI body has the form: +// +// parameters (0x30–0x3F)*, intermediates (0x20–0x2F)*, final (0x40–0x7E) +// +// Once an intermediate byte is seen, subsequent parameter bytes are invalid. +func csiBodyLength[T ~string | ~[]byte](data T) int { + seenIntermediate := false + for i := 0; i < len(data); i++ { + b := data[i] + if b >= 0x30 && b <= 0x3F { + if seenIntermediate { + return 0 + } + continue + } + if b >= 0x20 && b <= 0x2F { + seenIntermediate = true + continue + } + if b >= 0x40 && b <= 0x7E { + return i + 1 + } + return 0 + } + return 0 +} + +// oscLength returns the length of the OSC body. +// data is the slice after "ESC ]". +// +// Returns: +// - n >= 0: consumed body length (includes BEL/ST terminator when present) +// - -1: not terminated in the provided data +// +// OSC accepts BEL (0x07) or 7-bit ST (ESC \) as terminators by widespread convention. +// Per ECMA-48, CAN (0x18) and SUB (0x1A) cancel the control string; in that +// case they are not part of the OSC sequence length. +func oscLength[T ~string | ~[]byte](data T) int { + for i := 0; i < len(data); i++ { + b := data[i] + if b == bel { + return i + 1 + } + if b == can || b == sub { + return i + } + if b == esc && i+1 < len(data) && data[i+1] == '\\' { + return i + 2 + } + } + return -1 +} + +// stSequenceLength returns the length of a control-string body. +// data is the slice after "ESC x". +// +// Returns: +// - n >= 0: consumed body length (includes ST terminator when present) +// - -1: not terminated in the provided data +// +// Used for DCS, SOS, PM, and APC, which per ECMA-48 terminate with ST. +// ST here is the 7-bit form (ESC \). +// CAN (0x18) and SUB (0x1A) cancel the control string; in that case they are +// not part of the sequence length. +func stSequenceLength[T ~string | ~[]byte](data T) int { + for i := 0; i < len(data); i++ { + if data[i] == can || data[i] == sub { + return i + } + if data[i] == esc && i+1 < len(data) && data[i+1] == '\\' { + return i + 2 + } + } + return -1 +} diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/ansi8.go b/vendor/github.com/clipperhouse/uax29/v2/graphemes/ansi8.go new file mode 100644 index 000000000..d9b0c48b6 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/ansi8.go @@ -0,0 +1,79 @@ +package graphemes + +// ansiEscapeLength8Bit returns the byte length of a valid 8-bit C1 ANSI +// sequence at the start of data, or 0 if none. +// +// Recognized forms (ECMA-48 / ISO 6429): +// - C1 CSI (0x9B) body as parameter/intermediate/final bytes +// - C1 OSC (0x9D) body terminated by BEL, C1 ST, CAN, or SUB +// - C1 DCS/SOS/PM/APC (0x90/0x98/0x9E/0x9F) body terminated by C1 ST, CAN, or SUB +// - Standalone C1 controls (0x80..0x9F not listed above): single byte +func ansiEscapeLength8Bit[T ~string | ~[]byte](data T) int { + if len(data) == 0 { + return 0 + } + + switch data[0] { + case 0x9B: // C1 CSI + body := csiBodyLength(data[1:]) + if body == 0 { + return 0 + } + return 1 + body + case 0x9D: // C1 OSC + body := oscLengthC1(data[1:]) + if body < 0 { + return 0 + } + return 1 + body + case 0x90, 0x98, 0x9E, 0x9F: // C1 DCS, SOS, PM, APC + body := stSequenceLengthC1(data[1:]) + if body < 0 { + return 0 + } + return 1 + body + default: + if data[0] >= 0x80 && data[0] <= 0x9F { + return 1 + } + } + + return 0 +} + +// oscLengthC1 returns the length of a C1 OSC body. +// data is the slice after the C1 OSC initiator (0x9D). +// +// Returns: +// - n >= 0: consumed body length (includes BEL/ST terminator when present) +// - -1: not terminated in the provided data +// +// Terminators: BEL (0x07) or C1 ST (0x9C). +// CAN (0x18) and SUB (0x1A) cancel the control string. +func oscLengthC1[T ~string | ~[]byte](data T) int { + for i := 0; i < len(data); i++ { + b := data[i] + if b == bel || b == st { + return i + 1 + } + if b == can || b == sub { + return i + } + } + return -1 +} + +// stSequenceLengthC1 parses DCS/SOS/PM/APC bodies that terminate with C1 ST +// (0x9C), or are canceled by CAN/SUB. +func stSequenceLengthC1[T ~string | ~[]byte](data T) int { + for i := 0; i < len(data); i++ { + b := data[i] + if b == can || b == sub { + return i + } + if b == st { + return i + 1 + } + } + return -1 +} diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/iterator.go b/vendor/github.com/clipperhouse/uax29/v2/graphemes/iterator.go new file mode 100644 index 000000000..d37d43d71 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/iterator.go @@ -0,0 +1,144 @@ +package graphemes + +import "unicode/utf8" + +// FromString returns an iterator for the grapheme clusters in the input string. +// Iterate while Next() is true, and access the grapheme via Value(). +func FromString(s string) *Iterator[string] { + return &Iterator[string]{ + split: splitFuncString, + data: s, + } +} + +// FromBytes returns an iterator for the grapheme clusters in the input bytes. +// Iterate while Next() is true, and access the grapheme via Value(). +func FromBytes(b []byte) *Iterator[[]byte] { + return &Iterator[[]byte]{ + split: splitFuncBytes, + data: b, + } +} + +// Iterator is a generic iterator for grapheme clusters in strings or byte slices, +// with an ASCII hot path optimization. +type Iterator[T ~string | ~[]byte] struct { + split func(T, bool) (int, T, error) + data T + pos int + start int + // AnsiEscapeSequences treats 7-bit ANSI escape sequences (ECMA-48) as + // single grapheme clusters when true. The default is false. + // + // 8-bit controls are not enabled by this option. See [AnsiEscapeSequences8Bit]. + AnsiEscapeSequences bool + // AnsiEscapeSequences8Bit treats 8-bit C1 ANSI escape sequences (ECMA-48) as single + // grapheme clusters when true. The default is false. + // + // 8-bit control bytes are not UTF-8 encoded, i.e. not valid UTF-8. If you + // choose this option, you are choosing to interpret non-UTF-8 data, caveat + // emptor. + AnsiEscapeSequences8Bit bool +} + +var ( + splitFuncString = splitFunc[string] + splitFuncBytes = splitFunc[[]byte] +) + +const ( + esc = 0x1B + cr = 0x0D + bel = 0x07 + can = 0x18 + sub = 0x1A + st = 0x9C +) + +// Next advances the iterator to the next grapheme cluster. +// Returns false when there are no more grapheme clusters. +func (iter *Iterator[T]) Next() bool { + if iter.pos >= len(iter.data) { + return false + } + iter.start = iter.pos + + b := iter.data[iter.pos] + if iter.AnsiEscapeSequences && b == esc { + if a := ansiEscapeLength(iter.data[iter.pos:]); a > 0 { + iter.pos += a + return true + } + } + if iter.AnsiEscapeSequences8Bit && b >= 0x80 && b <= 0x9F { + if a := ansiEscapeLength8Bit(iter.data[iter.pos:]); a > 0 { + iter.pos += a + return true + } + } + + // ASCII hot path: any ASCII is one grapheme when next byte is ASCII or end. + if b < utf8.RuneSelf && b != cr { + if iter.pos+1 >= len(iter.data) || iter.data[iter.pos+1] < utf8.RuneSelf { + iter.pos++ + return true + } + } + + // Fall back to UAX29 grapheme parsing + remaining := iter.data[iter.pos:] + advance, _, err := iter.split(remaining, true) + if err != nil { + panic(err) + } + if advance <= 0 { + panic("splitFunc returned a zero or negative advance") + } + iter.pos += advance + if iter.pos > len(iter.data) { + panic("splitFunc advanced beyond end of data") + } + return true +} + +// Value returns the current grapheme cluster. +func (iter *Iterator[T]) Value() T { + return iter.data[iter.start:iter.pos] +} + +// Start returns the byte position of the current grapheme in the original data. +func (iter *Iterator[T]) Start() int { + return iter.start +} + +// End returns the byte position after the current grapheme in the original data. +func (iter *Iterator[T]) End() int { + return iter.pos +} + +// Reset resets the iterator to the beginning of the data. +func (iter *Iterator[T]) Reset() { + iter.start = 0 + iter.pos = 0 +} + +// SetText sets the data for the iterator to operate on, and resets all state. +func (iter *Iterator[T]) SetText(data T) { + iter.data = data + iter.start = 0 + iter.pos = 0 +} + +// First returns the first grapheme cluster without advancing the iterator. +func (iter *Iterator[T]) First() T { + if len(iter.data) == 0 { + return iter.data + } + + // Use a copy to leverage Next()'s ASCII optimization + cp := *iter + cp.pos = 0 + cp.start = 0 + cp.Next() + return cp.Value() +} diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/reader.go b/vendor/github.com/clipperhouse/uax29/v2/graphemes/reader.go new file mode 100644 index 000000000..9aa006618 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/reader.go @@ -0,0 +1,25 @@ +// Package graphemes implements Unicode grapheme cluster boundaries: https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries +package graphemes + +import ( + "bufio" + "io" +) + +type Scanner struct { + *bufio.Scanner +} + +// FromReader returns a Scanner, to split graphemes per +// https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries. +// +// It embeds a [bufio.Scanner], so you can use its methods. +// +// Iterate through graphemes by calling Scan() until false, then check Err(). +func FromReader(r io.Reader) *Scanner { + sc := bufio.NewScanner(r) + sc.Split(SplitFunc) + return &Scanner{ + Scanner: sc, + } +} diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/splitfunc.go b/vendor/github.com/clipperhouse/uax29/v2/graphemes/splitfunc.go new file mode 100644 index 000000000..0ac7c6fb4 --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/splitfunc.go @@ -0,0 +1,205 @@ +package graphemes + +import ( + "bufio" +) + +// is determines if lookup intersects propert(ies) +func (lookup property) is(properties property) bool { + return (lookup & properties) != 0 +} + +const _Ignore = _Extend + +// incbState tracks state for GB9c rule (Indic conjunct clusters) +// Pattern: Consonant (Extend|Linker)* Linker (Extend|Linker)* × Consonant +type incbState int + +const ( + incbNone incbState = iota // initial/reset + incbConsonant // seen Consonant, awaiting Linker + incbLinker // seen Consonant and Linker (conjunct ready) +) + +// SplitFunc is a bufio.SplitFunc implementation of Unicode grapheme cluster segmentation, for use with bufio.Scanner. +// +// See https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries. +var SplitFunc bufio.SplitFunc = splitFunc[[]byte] + +func splitFunc[T ~string | ~[]byte](data T, atEOF bool) (advance int, token T, err error) { + var empty T + if len(data) == 0 { + return 0, empty, nil + } + + // These vars are stateful across loop iterations + var pos int + var lastExIgnore property = 0 // "last excluding ignored categories" + var lastLastExIgnore property = 0 // "last one before that" + var regionalIndicatorCount int + + // GB9c state: tracking Indic conjunct clusters + var incb incbState + + // Rules are usually of the form Cat1 × Cat2; "current" refers to the first property + // to the right of the ×, from which we look back or forward + + current, w := lookup(data[pos:]) + if w == 0 { + if !atEOF { + // Rune extends past current data, request more + return 0, empty, nil + } + pos = len(data) + return pos, data[:pos], nil + } + + // https://unicode.org/reports/tr29/#GB1 + // Start of text always advances + pos += w + + for { + eot := pos == len(data) // "end of text" + + if eot { + if !atEOF { + // Token extends past current data, request more + return 0, empty, nil + } + + // https://unicode.org/reports/tr29/#GB2 + break + } + + /* + We've switched the evaluation order of GB1↓ and GB2↑. It's ok: + because we've checked for len(data) at the top of this function, + sot and eot are mutually exclusive, order doesn't matter. + */ + + // Rules are usually of the form Cat1 × Cat2; "current" refers to the first property + // to the right of the ×, from which we look back or forward + + // Remember previous properties to avoid lookups/lookbacks + last := current + if !last.is(_Ignore) { + lastLastExIgnore = lastExIgnore + lastExIgnore = last + } + + // Update GB9c state based on what we just advanced past + if last.is(_InCBConsonant | _InCBLinker | _InCBExtend) { + switch { + case last.is(_InCBConsonant): + if incb != incbLinker { + incb = incbConsonant + } + case last.is(_InCBLinker): + if incb >= incbConsonant { + incb = incbLinker + } + // case last.is(_InCBExtend): stay in current state + } + } else { + incb = incbNone + } + + current, w = lookup(data[pos:]) + if w == 0 { + if atEOF { + // Just return the bytes, we can't do anything with them + pos = len(data) + break + } + // Rune extends past current data, request more + return 0, empty, nil + } + + // Optimization: no rule can possibly apply + if current|last == 0 { // i.e. both are zero + break + } + + // https://unicode.org/reports/tr29/#GB3 + if current.is(_LF) && last.is(_CR) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB4 + // https://unicode.org/reports/tr29/#GB5 + if (current | last).is(_Control | _CR | _LF) { + break + } + + // https://unicode.org/reports/tr29/#GB6 + if current.is(_L|_V|_LV|_LVT) && last.is(_L) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB7 + if current.is(_V|_T) && last.is(_LV|_V) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB8 + if current.is(_T) && last.is(_LVT|_T) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB9 + if current.is(_Extend | _ZWJ) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB9a + if current.is(_SpacingMark) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB9b + if last.is(_Prepend) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB9c + // Do not break within certain combinations with Indic_Conjunct_Break (InCB)=Linker. + if incb == incbLinker && current.is(_InCBConsonant) { + // After matching the pattern, reset state to start tracking a new pattern + // The current Consonant becomes the start of the new pattern + incb = incbConsonant + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB11 + if current.is(_ExtendedPictographic) && last.is(_ZWJ) && lastLastExIgnore.is(_ExtendedPictographic) { + pos += w + continue + } + + // https://unicode.org/reports/tr29/#GB12 + // https://unicode.org/reports/tr29/#GB13 + if (current & last).is(_RegionalIndicator) { + regionalIndicatorCount++ + + odd := regionalIndicatorCount%2 == 1 + if odd { + pos += w + continue + } + } + + // If we fall through all the above rules, it's a grapheme cluster break + break + } + + // Return token + return pos, data[:pos], nil +} diff --git a/vendor/github.com/clipperhouse/uax29/v2/graphemes/trie.go b/vendor/github.com/clipperhouse/uax29/v2/graphemes/trie.go new file mode 100644 index 000000000..56192b7ee --- /dev/null +++ b/vendor/github.com/clipperhouse/uax29/v2/graphemes/trie.go @@ -0,0 +1,1717 @@ +package graphemes + +// generated by github.com/clipperhouse/uax29/v2 +// from https://www.unicode.org/Public/17.0.0/ucd/auxiliary/GraphemeBreakProperty.txt + +type property uint32 + +const ( + _CR property = 1 << iota + _Control + _Extend + _ExtendedPictographic + _InCBConsonant + _InCBExtend + _InCBLinker + _L + _LF + _LV + _LVT + _Prepend + _RegionalIndicator + _SpacingMark + _T + _V + _ZWJ +) + +// lookup returns the trie value for the first UTF-8 encoding in s and +// the width in bytes of this encoding. The size will be 0 if s does not +// hold enough bytes to complete the encoding. len(s) must be greater than 0. +func lookup[T ~string | ~[]byte](s T) (v property, sz int) { + c0 := s[0] + switch { + case c0 < 0x80: // is ASCII + return graphemesValues[c0], 1 + case c0 < 0xC2: + return 0, 1 // Illegal UTF-8: not a starter, not ASCII. + case c0 < 0xE0: // 2-byte UTF-8 + if len(s) < 2 { + return 0, 0 + } + i := graphemesIndex[c0] + c1 := s[1] + if c1 < 0x80 || 0xC0 <= c1 { + return 0, 1 // Illegal UTF-8: not a continuation byte. + } + return lookupValue(uint32(i), c1), 2 + case c0 < 0xF0: // 3-byte UTF-8 + if len(s) < 3 { + return 0, 0 + } + i := graphemesIndex[c0] + c1 := s[1] + if c1 < 0x80 || 0xC0 <= c1 { + return 0, 1 // Illegal UTF-8: not a continuation byte. + } + o := uint32(i)<<6 + uint32(c1) + i = graphemesIndex[o] + c2 := s[2] + if c2 < 0x80 || 0xC0 <= c2 { + return 0, 2 // Illegal UTF-8: not a continuation byte. + } + return lookupValue(uint32(i), c2), 3 + case c0 < 0xF8: // 4-byte UTF-8 + if len(s) < 4 { + return 0, 0 + } + i := graphemesIndex[c0] + c1 := s[1] + if c1 < 0x80 || 0xC0 <= c1 { + return 0, 1 // Illegal UTF-8: not a continuation byte. + } + o := uint32(i)<<6 + uint32(c1) + i = graphemesIndex[o] + c2 := s[2] + if c2 < 0x80 || 0xC0 <= c2 { + return 0, 2 // Illegal UTF-8: not a continuation byte. + } + o = uint32(i)<<6 + uint32(c2) + i = graphemesIndex[o] + c3 := s[3] + if c3 < 0x80 || 0xC0 <= c3 { + return 0, 3 // Illegal UTF-8: not a continuation byte. + } + return lookupValue(uint32(i), c3), 4 + } + // Illegal rune + return 0, 1 +} + +// graphemesTrie. Total size: 61760 bytes (60.31 KiB). Checksum: af733ba94cd94ba6. +// type graphemesTrie struct { } + +// func newGraphemesTrie(i int) *graphemesTrie { +// return &graphemesTrie{} +// } + +// lookupValue determines the type of block n and looks up the value for b. +func lookupValue(n uint32, b byte) property { + switch { + default: + return property(graphemesValues[n<<6+uint32(b)]) + } +} + +// graphemesValues: 235 blocks, 15040 entries, 60160 bytes +// The third block is the zero block. +var graphemesValues = [15040]property{ + // Block 0x0, offset 0x0 + 0x00: 0x0002, 0x01: 0x0002, 0x02: 0x0002, 0x03: 0x0002, 0x04: 0x0002, 0x05: 0x0002, + 0x06: 0x0002, 0x07: 0x0002, 0x08: 0x0002, 0x09: 0x0002, 0x0a: 0x0100, 0x0b: 0x0002, + 0x0c: 0x0002, 0x0d: 0x0001, 0x0e: 0x0002, 0x0f: 0x0002, 0x10: 0x0002, 0x11: 0x0002, + 0x12: 0x0002, 0x13: 0x0002, 0x14: 0x0002, 0x15: 0x0002, 0x16: 0x0002, 0x17: 0x0002, + 0x18: 0x0002, 0x19: 0x0002, 0x1a: 0x0002, 0x1b: 0x0002, 0x1c: 0x0002, 0x1d: 0x0002, + 0x1e: 0x0002, 0x1f: 0x0002, + // Block 0x1, offset 0x40 + 0x7f: 0x0002, + // Block 0x2, offset 0x80 + // Block 0x3, offset 0xc0 + 0xc0: 0x0002, 0xc1: 0x0002, 0xc2: 0x0002, 0xc3: 0x0002, 0xc4: 0x0002, 0xc5: 0x0002, + 0xc6: 0x0002, 0xc7: 0x0002, 0xc8: 0x0002, 0xc9: 0x0002, 0xca: 0x0002, 0xcb: 0x0002, + 0xcc: 0x0002, 0xcd: 0x0002, 0xce: 0x0002, 0xcf: 0x0002, 0xd0: 0x0002, 0xd1: 0x0002, + 0xd2: 0x0002, 0xd3: 0x0002, 0xd4: 0x0002, 0xd5: 0x0002, 0xd6: 0x0002, 0xd7: 0x0002, + 0xd8: 0x0002, 0xd9: 0x0002, 0xda: 0x0002, 0xdb: 0x0002, 0xdc: 0x0002, 0xdd: 0x0002, + 0xde: 0x0002, 0xdf: 0x0002, + 0xe9: 0x0008, + 0xed: 0x0002, 0xee: 0x0008, + // Block 0x4, offset 0x100 + 0x100: 0x0024, 0x101: 0x0024, 0x102: 0x0024, 0x103: 0x0024, 0x104: 0x0024, 0x105: 0x0024, + 0x106: 0x0024, 0x107: 0x0024, 0x108: 0x0024, 0x109: 0x0024, 0x10a: 0x0024, 0x10b: 0x0024, + 0x10c: 0x0024, 0x10d: 0x0024, 0x10e: 0x0024, 0x10f: 0x0024, 0x110: 0x0024, 0x111: 0x0024, + 0x112: 0x0024, 0x113: 0x0024, 0x114: 0x0024, 0x115: 0x0024, 0x116: 0x0024, 0x117: 0x0024, + 0x118: 0x0024, 0x119: 0x0024, 0x11a: 0x0024, 0x11b: 0x0024, 0x11c: 0x0024, 0x11d: 0x0024, + 0x11e: 0x0024, 0x11f: 0x0024, 0x120: 0x0024, 0x121: 0x0024, 0x122: 0x0024, 0x123: 0x0024, + 0x124: 0x0024, 0x125: 0x0024, 0x126: 0x0024, 0x127: 0x0024, 0x128: 0x0024, 0x129: 0x0024, + 0x12a: 0x0024, 0x12b: 0x0024, 0x12c: 0x0024, 0x12d: 0x0024, 0x12e: 0x0024, 0x12f: 0x0024, + 0x130: 0x0024, 0x131: 0x0024, 0x132: 0x0024, 0x133: 0x0024, 0x134: 0x0024, 0x135: 0x0024, + 0x136: 0x0024, 0x137: 0x0024, 0x138: 0x0024, 0x139: 0x0024, 0x13a: 0x0024, 0x13b: 0x0024, + 0x13c: 0x0024, 0x13d: 0x0024, 0x13e: 0x0024, 0x13f: 0x0024, + // Block 0x5, offset 0x140 + 0x140: 0x0024, 0x141: 0x0024, 0x142: 0x0024, 0x143: 0x0024, 0x144: 0x0024, 0x145: 0x0024, + 0x146: 0x0024, 0x147: 0x0024, 0x148: 0x0024, 0x149: 0x0024, 0x14a: 0x0024, 0x14b: 0x0024, + 0x14c: 0x0024, 0x14d: 0x0024, 0x14e: 0x0024, 0x14f: 0x0024, 0x150: 0x0024, 0x151: 0x0024, + 0x152: 0x0024, 0x153: 0x0024, 0x154: 0x0024, 0x155: 0x0024, 0x156: 0x0024, 0x157: 0x0024, + 0x158: 0x0024, 0x159: 0x0024, 0x15a: 0x0024, 0x15b: 0x0024, 0x15c: 0x0024, 0x15d: 0x0024, + 0x15e: 0x0024, 0x15f: 0x0024, 0x160: 0x0024, 0x161: 0x0024, 0x162: 0x0024, 0x163: 0x0024, + 0x164: 0x0024, 0x165: 0x0024, 0x166: 0x0024, 0x167: 0x0024, 0x168: 0x0024, 0x169: 0x0024, + 0x16a: 0x0024, 0x16b: 0x0024, 0x16c: 0x0024, 0x16d: 0x0024, 0x16e: 0x0024, 0x16f: 0x0024, + // Block 0x6, offset 0x180 + 0x183: 0x0024, 0x184: 0x0024, 0x185: 0x0024, + 0x186: 0x0024, 0x187: 0x0024, 0x188: 0x0024, 0x189: 0x0024, + // Block 0x7, offset 0x1c0 + 0x1d1: 0x0024, + 0x1d2: 0x0024, 0x1d3: 0x0024, 0x1d4: 0x0024, 0x1d5: 0x0024, 0x1d6: 0x0024, 0x1d7: 0x0024, + 0x1d8: 0x0024, 0x1d9: 0x0024, 0x1da: 0x0024, 0x1db: 0x0024, 0x1dc: 0x0024, 0x1dd: 0x0024, + 0x1de: 0x0024, 0x1df: 0x0024, 0x1e0: 0x0024, 0x1e1: 0x0024, 0x1e2: 0x0024, 0x1e3: 0x0024, + 0x1e4: 0x0024, 0x1e5: 0x0024, 0x1e6: 0x0024, 0x1e7: 0x0024, 0x1e8: 0x0024, 0x1e9: 0x0024, + 0x1ea: 0x0024, 0x1eb: 0x0024, 0x1ec: 0x0024, 0x1ed: 0x0024, 0x1ee: 0x0024, 0x1ef: 0x0024, + 0x1f0: 0x0024, 0x1f1: 0x0024, 0x1f2: 0x0024, 0x1f3: 0x0024, 0x1f4: 0x0024, 0x1f5: 0x0024, + 0x1f6: 0x0024, 0x1f7: 0x0024, 0x1f8: 0x0024, 0x1f9: 0x0024, 0x1fa: 0x0024, 0x1fb: 0x0024, + 0x1fc: 0x0024, 0x1fd: 0x0024, 0x1ff: 0x0024, + // Block 0x8, offset 0x200 + 0x201: 0x0024, 0x202: 0x0024, 0x204: 0x0024, 0x205: 0x0024, + 0x207: 0x0024, + // Block 0x9, offset 0x240 + 0x240: 0x0800, 0x241: 0x0800, 0x242: 0x0800, 0x243: 0x0800, 0x244: 0x0800, 0x245: 0x0800, + 0x250: 0x0024, 0x251: 0x0024, + 0x252: 0x0024, 0x253: 0x0024, 0x254: 0x0024, 0x255: 0x0024, 0x256: 0x0024, 0x257: 0x0024, + 0x258: 0x0024, 0x259: 0x0024, 0x25a: 0x0024, 0x25c: 0x0002, + // Block 0xa, offset 0x280 + 0x28b: 0x0024, + 0x28c: 0x0024, 0x28d: 0x0024, 0x28e: 0x0024, 0x28f: 0x0024, 0x290: 0x0024, 0x291: 0x0024, + 0x292: 0x0024, 0x293: 0x0024, 0x294: 0x0024, 0x295: 0x0024, 0x296: 0x0024, 0x297: 0x0024, + 0x298: 0x0024, 0x299: 0x0024, 0x29a: 0x0024, 0x29b: 0x0024, 0x29c: 0x0024, 0x29d: 0x0024, + 0x29e: 0x0024, 0x29f: 0x0024, + 0x2b0: 0x0024, + // Block 0xb, offset 0x2c0 + 0x2d6: 0x0024, 0x2d7: 0x0024, + 0x2d8: 0x0024, 0x2d9: 0x0024, 0x2da: 0x0024, 0x2db: 0x0024, 0x2dc: 0x0024, 0x2dd: 0x0800, + 0x2df: 0x0024, 0x2e0: 0x0024, 0x2e1: 0x0024, 0x2e2: 0x0024, 0x2e3: 0x0024, + 0x2e4: 0x0024, 0x2e7: 0x0024, 0x2e8: 0x0024, + 0x2ea: 0x0024, 0x2eb: 0x0024, 0x2ec: 0x0024, 0x2ed: 0x0024, + // Block 0xc, offset 0x300 + 0x30f: 0x0800, 0x311: 0x0024, + 0x330: 0x0024, 0x331: 0x0024, 0x332: 0x0024, 0x333: 0x0024, 0x334: 0x0024, 0x335: 0x0024, + 0x336: 0x0024, 0x337: 0x0024, 0x338: 0x0024, 0x339: 0x0024, 0x33a: 0x0024, 0x33b: 0x0024, + 0x33c: 0x0024, 0x33d: 0x0024, 0x33e: 0x0024, 0x33f: 0x0024, + // Block 0xd, offset 0x340 + 0x340: 0x0024, 0x341: 0x0024, 0x342: 0x0024, 0x343: 0x0024, 0x344: 0x0024, 0x345: 0x0024, + 0x346: 0x0024, 0x347: 0x0024, 0x348: 0x0024, 0x349: 0x0024, 0x34a: 0x0024, + // Block 0xe, offset 0x380 + 0x3a6: 0x0024, 0x3a7: 0x0024, 0x3a8: 0x0024, 0x3a9: 0x0024, + 0x3aa: 0x0024, 0x3ab: 0x0024, 0x3ac: 0x0024, 0x3ad: 0x0024, 0x3ae: 0x0024, 0x3af: 0x0024, + 0x3b0: 0x0024, + // Block 0xf, offset 0x3c0 + 0x3eb: 0x0024, 0x3ec: 0x0024, 0x3ed: 0x0024, 0x3ee: 0x0024, 0x3ef: 0x0024, + 0x3f0: 0x0024, 0x3f1: 0x0024, 0x3f2: 0x0024, 0x3f3: 0x0024, + 0x3fd: 0x0024, + // Block 0x10, offset 0x400 + 0x416: 0x0024, 0x417: 0x0024, + 0x418: 0x0024, 0x419: 0x0024, 0x41b: 0x0024, 0x41c: 0x0024, 0x41d: 0x0024, + 0x41e: 0x0024, 0x41f: 0x0024, 0x420: 0x0024, 0x421: 0x0024, 0x422: 0x0024, 0x423: 0x0024, + 0x425: 0x0024, 0x426: 0x0024, 0x427: 0x0024, 0x429: 0x0024, + 0x42a: 0x0024, 0x42b: 0x0024, 0x42c: 0x0024, 0x42d: 0x0024, + // Block 0x11, offset 0x440 + 0x459: 0x0024, 0x45a: 0x0024, 0x45b: 0x0024, + // Block 0x12, offset 0x480 + 0x490: 0x0800, 0x491: 0x0800, + 0x497: 0x0024, + 0x498: 0x0024, 0x499: 0x0024, 0x49a: 0x0024, 0x49b: 0x0024, 0x49c: 0x0024, 0x49d: 0x0024, + 0x49e: 0x0024, 0x49f: 0x0024, + // Block 0x13, offset 0x4c0 + 0x4ca: 0x0024, 0x4cb: 0x0024, + 0x4cc: 0x0024, 0x4cd: 0x0024, 0x4ce: 0x0024, 0x4cf: 0x0024, 0x4d0: 0x0024, 0x4d1: 0x0024, + 0x4d2: 0x0024, 0x4d3: 0x0024, 0x4d4: 0x0024, 0x4d5: 0x0024, 0x4d6: 0x0024, 0x4d7: 0x0024, + 0x4d8: 0x0024, 0x4d9: 0x0024, 0x4da: 0x0024, 0x4db: 0x0024, 0x4dc: 0x0024, 0x4dd: 0x0024, + 0x4de: 0x0024, 0x4df: 0x0024, 0x4e0: 0x0024, 0x4e1: 0x0024, 0x4e2: 0x0800, 0x4e3: 0x0024, + 0x4e4: 0x0024, 0x4e5: 0x0024, 0x4e6: 0x0024, 0x4e7: 0x0024, 0x4e8: 0x0024, 0x4e9: 0x0024, + 0x4ea: 0x0024, 0x4eb: 0x0024, 0x4ec: 0x0024, 0x4ed: 0x0024, 0x4ee: 0x0024, 0x4ef: 0x0024, + 0x4f0: 0x0024, 0x4f1: 0x0024, 0x4f2: 0x0024, 0x4f3: 0x0024, 0x4f4: 0x0024, 0x4f5: 0x0024, + 0x4f6: 0x0024, 0x4f7: 0x0024, 0x4f8: 0x0024, 0x4f9: 0x0024, 0x4fa: 0x0024, 0x4fb: 0x0024, + 0x4fc: 0x0024, 0x4fd: 0x0024, 0x4fe: 0x0024, 0x4ff: 0x0024, + // Block 0x14, offset 0x500 + 0x500: 0x0024, 0x501: 0x0024, 0x502: 0x0024, 0x503: 0x2000, + 0x515: 0x0010, 0x516: 0x0010, 0x517: 0x0010, + 0x518: 0x0010, 0x519: 0x0010, 0x51a: 0x0010, 0x51b: 0x0010, 0x51c: 0x0010, 0x51d: 0x0010, + 0x51e: 0x0010, 0x51f: 0x0010, 0x520: 0x0010, 0x521: 0x0010, 0x522: 0x0010, 0x523: 0x0010, + 0x524: 0x0010, 0x525: 0x0010, 0x526: 0x0010, 0x527: 0x0010, 0x528: 0x0010, 0x529: 0x0010, + 0x52a: 0x0010, 0x52b: 0x0010, 0x52c: 0x0010, 0x52d: 0x0010, 0x52e: 0x0010, 0x52f: 0x0010, + 0x530: 0x0010, 0x531: 0x0010, 0x532: 0x0010, 0x533: 0x0010, 0x534: 0x0010, 0x535: 0x0010, + 0x536: 0x0010, 0x537: 0x0010, 0x538: 0x0010, 0x539: 0x0010, 0x53a: 0x0024, 0x53b: 0x2000, + 0x53c: 0x0024, 0x53e: 0x2000, 0x53f: 0x2000, + // Block 0x15, offset 0x540 + 0x540: 0x2000, 0x541: 0x0024, 0x542: 0x0024, 0x543: 0x0024, 0x544: 0x0024, 0x545: 0x0024, + 0x546: 0x0024, 0x547: 0x0024, 0x548: 0x0024, 0x549: 0x2000, 0x54a: 0x2000, 0x54b: 0x2000, + 0x54c: 0x2000, 0x54d: 0x0044, 0x54e: 0x2000, 0x54f: 0x2000, 0x551: 0x0024, + 0x552: 0x0024, 0x553: 0x0024, 0x554: 0x0024, 0x555: 0x0024, 0x556: 0x0024, 0x557: 0x0024, + 0x558: 0x0010, 0x559: 0x0010, 0x55a: 0x0010, 0x55b: 0x0010, 0x55c: 0x0010, 0x55d: 0x0010, + 0x55e: 0x0010, 0x55f: 0x0010, 0x562: 0x0024, 0x563: 0x0024, + 0x578: 0x0010, 0x579: 0x0010, 0x57a: 0x0010, 0x57b: 0x0010, + 0x57c: 0x0010, 0x57d: 0x0010, 0x57e: 0x0010, 0x57f: 0x0010, + // Block 0x16, offset 0x580 + 0x581: 0x0024, 0x582: 0x2000, 0x583: 0x2000, + 0x595: 0x0010, 0x596: 0x0010, 0x597: 0x0010, + 0x598: 0x0010, 0x599: 0x0010, 0x59a: 0x0010, 0x59b: 0x0010, 0x59c: 0x0010, 0x59d: 0x0010, + 0x59e: 0x0010, 0x59f: 0x0010, 0x5a0: 0x0010, 0x5a1: 0x0010, 0x5a2: 0x0010, 0x5a3: 0x0010, + 0x5a4: 0x0010, 0x5a5: 0x0010, 0x5a6: 0x0010, 0x5a7: 0x0010, 0x5a8: 0x0010, + 0x5aa: 0x0010, 0x5ab: 0x0010, 0x5ac: 0x0010, 0x5ad: 0x0010, 0x5ae: 0x0010, 0x5af: 0x0010, + 0x5b0: 0x0010, 0x5b2: 0x0010, + 0x5b6: 0x0010, 0x5b7: 0x0010, 0x5b8: 0x0010, 0x5b9: 0x0010, + 0x5bc: 0x0024, 0x5be: 0x0024, 0x5bf: 0x2000, + // Block 0x17, offset 0x5c0 + 0x5c0: 0x2000, 0x5c1: 0x0024, 0x5c2: 0x0024, 0x5c3: 0x0024, 0x5c4: 0x0024, + 0x5c7: 0x2000, 0x5c8: 0x2000, 0x5cb: 0x2000, + 0x5cc: 0x2000, 0x5cd: 0x0044, + 0x5d7: 0x0024, + 0x5dc: 0x0010, 0x5dd: 0x0010, + 0x5df: 0x0010, 0x5e2: 0x0024, 0x5e3: 0x0024, + 0x5f0: 0x0010, 0x5f1: 0x0010, + 0x5fe: 0x0024, + // Block 0x18, offset 0x600 + 0x601: 0x0024, 0x602: 0x0024, 0x603: 0x2000, + 0x63c: 0x0024, 0x63e: 0x2000, 0x63f: 0x2000, + // Block 0x19, offset 0x640 + 0x640: 0x2000, 0x641: 0x0024, 0x642: 0x0024, + 0x647: 0x0024, 0x648: 0x0024, 0x64b: 0x0024, + 0x64c: 0x0024, 0x64d: 0x0024, 0x651: 0x0024, + 0x670: 0x0024, 0x671: 0x0024, 0x675: 0x0024, + // Block 0x1a, offset 0x680 + 0x681: 0x0024, 0x682: 0x0024, 0x683: 0x2000, + 0x695: 0x0010, 0x696: 0x0010, 0x697: 0x0010, + 0x698: 0x0010, 0x699: 0x0010, 0x69a: 0x0010, 0x69b: 0x0010, 0x69c: 0x0010, 0x69d: 0x0010, + 0x69e: 0x0010, 0x69f: 0x0010, 0x6a0: 0x0010, 0x6a1: 0x0010, 0x6a2: 0x0010, 0x6a3: 0x0010, + 0x6a4: 0x0010, 0x6a5: 0x0010, 0x6a6: 0x0010, 0x6a7: 0x0010, 0x6a8: 0x0010, + 0x6aa: 0x0010, 0x6ab: 0x0010, 0x6ac: 0x0010, 0x6ad: 0x0010, 0x6ae: 0x0010, 0x6af: 0x0010, + 0x6b0: 0x0010, 0x6b2: 0x0010, 0x6b3: 0x0010, 0x6b5: 0x0010, + 0x6b6: 0x0010, 0x6b7: 0x0010, 0x6b8: 0x0010, 0x6b9: 0x0010, + 0x6bc: 0x0024, 0x6be: 0x2000, 0x6bf: 0x2000, + // Block 0x1b, offset 0x6c0 + 0x6c0: 0x2000, 0x6c1: 0x0024, 0x6c2: 0x0024, 0x6c3: 0x0024, 0x6c4: 0x0024, 0x6c5: 0x0024, + 0x6c7: 0x0024, 0x6c8: 0x0024, 0x6c9: 0x2000, 0x6cb: 0x2000, + 0x6cc: 0x2000, 0x6cd: 0x0044, + 0x6e2: 0x0024, 0x6e3: 0x0024, + 0x6f9: 0x0010, 0x6fa: 0x0024, 0x6fb: 0x0024, + 0x6fc: 0x0024, 0x6fd: 0x0024, 0x6fe: 0x0024, 0x6ff: 0x0024, + // Block 0x1c, offset 0x700 + 0x701: 0x0024, 0x702: 0x2000, 0x703: 0x2000, + 0x715: 0x0010, 0x716: 0x0010, 0x717: 0x0010, + 0x718: 0x0010, 0x719: 0x0010, 0x71a: 0x0010, 0x71b: 0x0010, 0x71c: 0x0010, 0x71d: 0x0010, + 0x71e: 0x0010, 0x71f: 0x0010, 0x720: 0x0010, 0x721: 0x0010, 0x722: 0x0010, 0x723: 0x0010, + 0x724: 0x0010, 0x725: 0x0010, 0x726: 0x0010, 0x727: 0x0010, 0x728: 0x0010, + 0x72a: 0x0010, 0x72b: 0x0010, 0x72c: 0x0010, 0x72d: 0x0010, 0x72e: 0x0010, 0x72f: 0x0010, + 0x730: 0x0010, 0x732: 0x0010, 0x733: 0x0010, 0x735: 0x0010, + 0x736: 0x0010, 0x737: 0x0010, 0x738: 0x0010, 0x739: 0x0010, + 0x73c: 0x0024, 0x73e: 0x0024, 0x73f: 0x0024, + // Block 0x1d, offset 0x740 + 0x740: 0x2000, 0x741: 0x0024, 0x742: 0x0024, 0x743: 0x0024, 0x744: 0x0024, + 0x747: 0x2000, 0x748: 0x2000, 0x74b: 0x2000, + 0x74c: 0x2000, 0x74d: 0x0044, + 0x755: 0x0024, 0x756: 0x0024, 0x757: 0x0024, + 0x75c: 0x0010, 0x75d: 0x0010, + 0x75f: 0x0010, 0x762: 0x0024, 0x763: 0x0024, + 0x771: 0x0010, + // Block 0x1e, offset 0x780 + 0x782: 0x0024, + 0x7be: 0x0024, 0x7bf: 0x2000, + // Block 0x1f, offset 0x7c0 + 0x7c0: 0x0024, 0x7c1: 0x2000, 0x7c2: 0x2000, + 0x7c6: 0x2000, 0x7c7: 0x2000, 0x7c8: 0x2000, 0x7ca: 0x2000, 0x7cb: 0x2000, + 0x7cc: 0x2000, 0x7cd: 0x0024, + 0x7d7: 0x0024, + // Block 0x20, offset 0x800 + 0x800: 0x0024, 0x801: 0x2000, 0x802: 0x2000, 0x803: 0x2000, 0x804: 0x0024, + 0x815: 0x0010, 0x816: 0x0010, 0x817: 0x0010, + 0x818: 0x0010, 0x819: 0x0010, 0x81a: 0x0010, 0x81b: 0x0010, 0x81c: 0x0010, 0x81d: 0x0010, + 0x81e: 0x0010, 0x81f: 0x0010, 0x820: 0x0010, 0x821: 0x0010, 0x822: 0x0010, 0x823: 0x0010, + 0x824: 0x0010, 0x825: 0x0010, 0x826: 0x0010, 0x827: 0x0010, 0x828: 0x0010, + 0x82a: 0x0010, 0x82b: 0x0010, 0x82c: 0x0010, 0x82d: 0x0010, 0x82e: 0x0010, 0x82f: 0x0010, + 0x830: 0x0010, 0x831: 0x0010, 0x832: 0x0010, 0x833: 0x0010, 0x834: 0x0010, 0x835: 0x0010, + 0x836: 0x0010, 0x837: 0x0010, 0x838: 0x0010, 0x839: 0x0010, + 0x83c: 0x0024, 0x83e: 0x0024, 0x83f: 0x0024, + // Block 0x21, offset 0x840 + 0x840: 0x0024, 0x841: 0x2000, 0x842: 0x2000, 0x843: 0x2000, 0x844: 0x2000, + 0x846: 0x0024, 0x847: 0x0024, 0x848: 0x0024, 0x84a: 0x0024, 0x84b: 0x0024, + 0x84c: 0x0024, 0x84d: 0x0044, + 0x855: 0x0024, 0x856: 0x0024, + 0x858: 0x0010, 0x859: 0x0010, 0x85a: 0x0010, + 0x862: 0x0024, 0x863: 0x0024, + // Block 0x22, offset 0x880 + 0x881: 0x0024, 0x882: 0x2000, 0x883: 0x2000, + 0x8bc: 0x0024, 0x8be: 0x2000, 0x8bf: 0x0024, + // Block 0x23, offset 0x8c0 + 0x8c0: 0x0024, 0x8c1: 0x2000, 0x8c2: 0x0024, 0x8c3: 0x2000, 0x8c4: 0x2000, + 0x8c6: 0x0024, 0x8c7: 0x0024, 0x8c8: 0x0024, 0x8ca: 0x0024, 0x8cb: 0x0024, + 0x8cc: 0x0024, 0x8cd: 0x0024, + 0x8d5: 0x0024, 0x8d6: 0x0024, + 0x8e2: 0x0024, 0x8e3: 0x0024, + 0x8f3: 0x2000, + // Block 0x24, offset 0x900 + 0x900: 0x0024, 0x901: 0x0024, 0x902: 0x2000, 0x903: 0x2000, + 0x915: 0x0010, 0x916: 0x0010, 0x917: 0x0010, + 0x918: 0x0010, 0x919: 0x0010, 0x91a: 0x0010, 0x91b: 0x0010, 0x91c: 0x0010, 0x91d: 0x0010, + 0x91e: 0x0010, 0x91f: 0x0010, 0x920: 0x0010, 0x921: 0x0010, 0x922: 0x0010, 0x923: 0x0010, + 0x924: 0x0010, 0x925: 0x0010, 0x926: 0x0010, 0x927: 0x0010, 0x928: 0x0010, 0x929: 0x0010, + 0x92a: 0x0010, 0x92b: 0x0010, 0x92c: 0x0010, 0x92d: 0x0010, 0x92e: 0x0010, 0x92f: 0x0010, + 0x930: 0x0010, 0x931: 0x0010, 0x932: 0x0010, 0x933: 0x0010, 0x934: 0x0010, 0x935: 0x0010, + 0x936: 0x0010, 0x937: 0x0010, 0x938: 0x0010, 0x939: 0x0010, 0x93a: 0x0010, 0x93b: 0x0024, + 0x93c: 0x0024, 0x93e: 0x0024, 0x93f: 0x2000, + // Block 0x25, offset 0x940 + 0x940: 0x2000, 0x941: 0x0024, 0x942: 0x0024, 0x943: 0x0024, 0x944: 0x0024, + 0x946: 0x2000, 0x947: 0x2000, 0x948: 0x2000, 0x94a: 0x2000, 0x94b: 0x2000, + 0x94c: 0x2000, 0x94d: 0x0044, 0x94e: 0x0800, + 0x957: 0x0024, + 0x962: 0x0024, 0x963: 0x0024, + // Block 0x26, offset 0x980 + 0x981: 0x0024, 0x982: 0x2000, 0x983: 0x2000, + // Block 0x27, offset 0x9c0 + 0x9ca: 0x0024, + 0x9cf: 0x0024, 0x9d0: 0x2000, 0x9d1: 0x2000, + 0x9d2: 0x0024, 0x9d3: 0x0024, 0x9d4: 0x0024, 0x9d6: 0x0024, + 0x9d8: 0x2000, 0x9d9: 0x2000, 0x9da: 0x2000, 0x9db: 0x2000, 0x9dc: 0x2000, 0x9dd: 0x2000, + 0x9de: 0x2000, 0x9df: 0x0024, + 0x9f2: 0x2000, 0x9f3: 0x2000, + // Block 0x28, offset 0xa00 + 0xa31: 0x0024, 0xa33: 0x2000, 0xa34: 0x0024, 0xa35: 0x0024, + 0xa36: 0x0024, 0xa37: 0x0024, 0xa38: 0x0024, 0xa39: 0x0024, 0xa3a: 0x0024, + // Block 0x29, offset 0xa40 + 0xa47: 0x0024, 0xa48: 0x0024, 0xa49: 0x0024, 0xa4a: 0x0024, 0xa4b: 0x0024, + 0xa4c: 0x0024, 0xa4d: 0x0024, 0xa4e: 0x0024, + // Block 0x2a, offset 0xa80 + 0xab1: 0x0024, 0xab3: 0x2000, 0xab4: 0x0024, 0xab5: 0x0024, + 0xab6: 0x0024, 0xab7: 0x0024, 0xab8: 0x0024, 0xab9: 0x0024, 0xaba: 0x0024, 0xabb: 0x0024, + 0xabc: 0x0024, + // Block 0x2b, offset 0xac0 + 0xac8: 0x0024, 0xac9: 0x0024, 0xaca: 0x0024, 0xacb: 0x0024, + 0xacc: 0x0024, 0xacd: 0x0024, 0xace: 0x0024, + // Block 0x2c, offset 0xb00 + 0xb18: 0x0024, 0xb19: 0x0024, + 0xb35: 0x0024, + 0xb37: 0x0024, 0xb39: 0x0024, + 0xb3e: 0x2000, 0xb3f: 0x2000, + // Block 0x2d, offset 0xb40 + 0xb71: 0x0024, 0xb72: 0x0024, 0xb73: 0x0024, 0xb74: 0x0024, 0xb75: 0x0024, + 0xb76: 0x0024, 0xb77: 0x0024, 0xb78: 0x0024, 0xb79: 0x0024, 0xb7a: 0x0024, 0xb7b: 0x0024, + 0xb7c: 0x0024, 0xb7d: 0x0024, 0xb7e: 0x0024, 0xb7f: 0x2000, + // Block 0x2e, offset 0xb80 + 0xb80: 0x0024, 0xb81: 0x0024, 0xb82: 0x0024, 0xb83: 0x0024, 0xb84: 0x0024, + 0xb86: 0x0024, 0xb87: 0x0024, + 0xb8d: 0x0024, 0xb8e: 0x0024, 0xb8f: 0x0024, 0xb90: 0x0024, 0xb91: 0x0024, + 0xb92: 0x0024, 0xb93: 0x0024, 0xb94: 0x0024, 0xb95: 0x0024, 0xb96: 0x0024, 0xb97: 0x0024, + 0xb99: 0x0024, 0xb9a: 0x0024, 0xb9b: 0x0024, 0xb9c: 0x0024, 0xb9d: 0x0024, + 0xb9e: 0x0024, 0xb9f: 0x0024, 0xba0: 0x0024, 0xba1: 0x0024, 0xba2: 0x0024, 0xba3: 0x0024, + 0xba4: 0x0024, 0xba5: 0x0024, 0xba6: 0x0024, 0xba7: 0x0024, 0xba8: 0x0024, 0xba9: 0x0024, + 0xbaa: 0x0024, 0xbab: 0x0024, 0xbac: 0x0024, 0xbad: 0x0024, 0xbae: 0x0024, 0xbaf: 0x0024, + 0xbb0: 0x0024, 0xbb1: 0x0024, 0xbb2: 0x0024, 0xbb3: 0x0024, 0xbb4: 0x0024, 0xbb5: 0x0024, + 0xbb6: 0x0024, 0xbb7: 0x0024, 0xbb8: 0x0024, 0xbb9: 0x0024, 0xbba: 0x0024, 0xbbb: 0x0024, + 0xbbc: 0x0024, + // Block 0x2f, offset 0xbc0 + 0xbc6: 0x0024, + // Block 0x30, offset 0xc00 + 0xc00: 0x0010, 0xc01: 0x0010, 0xc02: 0x0010, 0xc03: 0x0010, 0xc04: 0x0010, 0xc05: 0x0010, + 0xc06: 0x0010, 0xc07: 0x0010, 0xc08: 0x0010, 0xc09: 0x0010, 0xc0a: 0x0010, 0xc0b: 0x0010, + 0xc0c: 0x0010, 0xc0d: 0x0010, 0xc0e: 0x0010, 0xc0f: 0x0010, 0xc10: 0x0010, 0xc11: 0x0010, + 0xc12: 0x0010, 0xc13: 0x0010, 0xc14: 0x0010, 0xc15: 0x0010, 0xc16: 0x0010, 0xc17: 0x0010, + 0xc18: 0x0010, 0xc19: 0x0010, 0xc1a: 0x0010, 0xc1b: 0x0010, 0xc1c: 0x0010, 0xc1d: 0x0010, + 0xc1e: 0x0010, 0xc1f: 0x0010, 0xc20: 0x0010, 0xc21: 0x0010, 0xc22: 0x0010, 0xc23: 0x0010, + 0xc24: 0x0010, 0xc25: 0x0010, 0xc26: 0x0010, 0xc27: 0x0010, 0xc28: 0x0010, 0xc29: 0x0010, + 0xc2a: 0x0010, 0xc2d: 0x0024, 0xc2e: 0x0024, 0xc2f: 0x0024, + 0xc30: 0x0024, 0xc31: 0x2000, 0xc32: 0x0024, 0xc33: 0x0024, 0xc34: 0x0024, 0xc35: 0x0024, + 0xc36: 0x0024, 0xc37: 0x0024, 0xc39: 0x0044, 0xc3a: 0x0024, 0xc3b: 0x2000, + 0xc3c: 0x2000, 0xc3d: 0x0024, 0xc3e: 0x0024, 0xc3f: 0x0010, + // Block 0x31, offset 0xc40 + 0xc50: 0x0010, 0xc51: 0x0010, + 0xc52: 0x0010, 0xc53: 0x0010, 0xc54: 0x0010, 0xc55: 0x0010, 0xc56: 0x2000, 0xc57: 0x2000, + 0xc58: 0x0024, 0xc59: 0x0024, 0xc5a: 0x0010, 0xc5b: 0x0010, 0xc5c: 0x0010, 0xc5d: 0x0010, + 0xc5e: 0x0024, 0xc5f: 0x0024, 0xc60: 0x0024, 0xc61: 0x0010, + 0xc65: 0x0010, 0xc66: 0x0010, + 0xc6e: 0x0010, 0xc6f: 0x0010, + 0xc70: 0x0010, 0xc71: 0x0024, 0xc72: 0x0024, 0xc73: 0x0024, 0xc74: 0x0024, 0xc75: 0x0010, + 0xc76: 0x0010, 0xc77: 0x0010, 0xc78: 0x0010, 0xc79: 0x0010, 0xc7a: 0x0010, 0xc7b: 0x0010, + 0xc7c: 0x0010, 0xc7d: 0x0010, 0xc7e: 0x0010, 0xc7f: 0x0010, + // Block 0x32, offset 0xc80 + 0xc80: 0x0010, 0xc81: 0x0010, 0xc82: 0x0024, 0xc84: 0x2000, 0xc85: 0x0024, + 0xc86: 0x0024, + 0xc8d: 0x0024, 0xc8e: 0x0010, + 0xc9d: 0x0024, + // Block 0x33, offset 0xcc0 + 0xcc0: 0x0080, 0xcc1: 0x0080, 0xcc2: 0x0080, 0xcc3: 0x0080, 0xcc4: 0x0080, 0xcc5: 0x0080, + 0xcc6: 0x0080, 0xcc7: 0x0080, 0xcc8: 0x0080, 0xcc9: 0x0080, 0xcca: 0x0080, 0xccb: 0x0080, + 0xccc: 0x0080, 0xccd: 0x0080, 0xcce: 0x0080, 0xccf: 0x0080, 0xcd0: 0x0080, 0xcd1: 0x0080, + 0xcd2: 0x0080, 0xcd3: 0x0080, 0xcd4: 0x0080, 0xcd5: 0x0080, 0xcd6: 0x0080, 0xcd7: 0x0080, + 0xcd8: 0x0080, 0xcd9: 0x0080, 0xcda: 0x0080, 0xcdb: 0x0080, 0xcdc: 0x0080, 0xcdd: 0x0080, + 0xcde: 0x0080, 0xcdf: 0x0080, 0xce0: 0x0080, 0xce1: 0x0080, 0xce2: 0x0080, 0xce3: 0x0080, + 0xce4: 0x0080, 0xce5: 0x0080, 0xce6: 0x0080, 0xce7: 0x0080, 0xce8: 0x0080, 0xce9: 0x0080, + 0xcea: 0x0080, 0xceb: 0x0080, 0xcec: 0x0080, 0xced: 0x0080, 0xcee: 0x0080, 0xcef: 0x0080, + 0xcf0: 0x0080, 0xcf1: 0x0080, 0xcf2: 0x0080, 0xcf3: 0x0080, 0xcf4: 0x0080, 0xcf5: 0x0080, + 0xcf6: 0x0080, 0xcf7: 0x0080, 0xcf8: 0x0080, 0xcf9: 0x0080, 0xcfa: 0x0080, 0xcfb: 0x0080, + 0xcfc: 0x0080, 0xcfd: 0x0080, 0xcfe: 0x0080, 0xcff: 0x0080, + // Block 0x34, offset 0xd00 + 0xd00: 0x0080, 0xd01: 0x0080, 0xd02: 0x0080, 0xd03: 0x0080, 0xd04: 0x0080, 0xd05: 0x0080, + 0xd06: 0x0080, 0xd07: 0x0080, 0xd08: 0x0080, 0xd09: 0x0080, 0xd0a: 0x0080, 0xd0b: 0x0080, + 0xd0c: 0x0080, 0xd0d: 0x0080, 0xd0e: 0x0080, 0xd0f: 0x0080, 0xd10: 0x0080, 0xd11: 0x0080, + 0xd12: 0x0080, 0xd13: 0x0080, 0xd14: 0x0080, 0xd15: 0x0080, 0xd16: 0x0080, 0xd17: 0x0080, + 0xd18: 0x0080, 0xd19: 0x0080, 0xd1a: 0x0080, 0xd1b: 0x0080, 0xd1c: 0x0080, 0xd1d: 0x0080, + 0xd1e: 0x0080, 0xd1f: 0x0080, 0xd20: 0x8000, 0xd21: 0x8000, 0xd22: 0x8000, 0xd23: 0x8000, + 0xd24: 0x8000, 0xd25: 0x8000, 0xd26: 0x8000, 0xd27: 0x8000, 0xd28: 0x8000, 0xd29: 0x8000, + 0xd2a: 0x8000, 0xd2b: 0x8000, 0xd2c: 0x8000, 0xd2d: 0x8000, 0xd2e: 0x8000, 0xd2f: 0x8000, + 0xd30: 0x8000, 0xd31: 0x8000, 0xd32: 0x8000, 0xd33: 0x8000, 0xd34: 0x8000, 0xd35: 0x8000, + 0xd36: 0x8000, 0xd37: 0x8000, 0xd38: 0x8000, 0xd39: 0x8000, 0xd3a: 0x8000, 0xd3b: 0x8000, + 0xd3c: 0x8000, 0xd3d: 0x8000, 0xd3e: 0x8000, 0xd3f: 0x8000, + // Block 0x35, offset 0xd40 + 0xd40: 0x8000, 0xd41: 0x8000, 0xd42: 0x8000, 0xd43: 0x8000, 0xd44: 0x8000, 0xd45: 0x8000, + 0xd46: 0x8000, 0xd47: 0x8000, 0xd48: 0x8000, 0xd49: 0x8000, 0xd4a: 0x8000, 0xd4b: 0x8000, + 0xd4c: 0x8000, 0xd4d: 0x8000, 0xd4e: 0x8000, 0xd4f: 0x8000, 0xd50: 0x8000, 0xd51: 0x8000, + 0xd52: 0x8000, 0xd53: 0x8000, 0xd54: 0x8000, 0xd55: 0x8000, 0xd56: 0x8000, 0xd57: 0x8000, + 0xd58: 0x8000, 0xd59: 0x8000, 0xd5a: 0x8000, 0xd5b: 0x8000, 0xd5c: 0x8000, 0xd5d: 0x8000, + 0xd5e: 0x8000, 0xd5f: 0x8000, 0xd60: 0x8000, 0xd61: 0x8000, 0xd62: 0x8000, 0xd63: 0x8000, + 0xd64: 0x8000, 0xd65: 0x8000, 0xd66: 0x8000, 0xd67: 0x8000, 0xd68: 0x4000, 0xd69: 0x4000, + 0xd6a: 0x4000, 0xd6b: 0x4000, 0xd6c: 0x4000, 0xd6d: 0x4000, 0xd6e: 0x4000, 0xd6f: 0x4000, + 0xd70: 0x4000, 0xd71: 0x4000, 0xd72: 0x4000, 0xd73: 0x4000, 0xd74: 0x4000, 0xd75: 0x4000, + 0xd76: 0x4000, 0xd77: 0x4000, 0xd78: 0x4000, 0xd79: 0x4000, 0xd7a: 0x4000, 0xd7b: 0x4000, + 0xd7c: 0x4000, 0xd7d: 0x4000, 0xd7e: 0x4000, 0xd7f: 0x4000, + // Block 0x36, offset 0xd80 + 0xd80: 0x4000, 0xd81: 0x4000, 0xd82: 0x4000, 0xd83: 0x4000, 0xd84: 0x4000, 0xd85: 0x4000, + 0xd86: 0x4000, 0xd87: 0x4000, 0xd88: 0x4000, 0xd89: 0x4000, 0xd8a: 0x4000, 0xd8b: 0x4000, + 0xd8c: 0x4000, 0xd8d: 0x4000, 0xd8e: 0x4000, 0xd8f: 0x4000, 0xd90: 0x4000, 0xd91: 0x4000, + 0xd92: 0x4000, 0xd93: 0x4000, 0xd94: 0x4000, 0xd95: 0x4000, 0xd96: 0x4000, 0xd97: 0x4000, + 0xd98: 0x4000, 0xd99: 0x4000, 0xd9a: 0x4000, 0xd9b: 0x4000, 0xd9c: 0x4000, 0xd9d: 0x4000, + 0xd9e: 0x4000, 0xd9f: 0x4000, 0xda0: 0x4000, 0xda1: 0x4000, 0xda2: 0x4000, 0xda3: 0x4000, + 0xda4: 0x4000, 0xda5: 0x4000, 0xda6: 0x4000, 0xda7: 0x4000, 0xda8: 0x4000, 0xda9: 0x4000, + 0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000, 0xdae: 0x4000, 0xdaf: 0x4000, + 0xdb0: 0x4000, 0xdb1: 0x4000, 0xdb2: 0x4000, 0xdb3: 0x4000, 0xdb4: 0x4000, 0xdb5: 0x4000, + 0xdb6: 0x4000, 0xdb7: 0x4000, 0xdb8: 0x4000, 0xdb9: 0x4000, 0xdba: 0x4000, 0xdbb: 0x4000, + 0xdbc: 0x4000, 0xdbd: 0x4000, 0xdbe: 0x4000, 0xdbf: 0x4000, + // Block 0x37, offset 0xdc0 + 0xddd: 0x0024, + 0xdde: 0x0024, 0xddf: 0x0024, + // Block 0x38, offset 0xe00 + 0xe12: 0x0024, 0xe13: 0x0024, 0xe14: 0x0024, 0xe15: 0x0024, + 0xe32: 0x0024, 0xe33: 0x0024, 0xe34: 0x0024, + // Block 0x39, offset 0xe40 + 0xe52: 0x0024, 0xe53: 0x0024, + 0xe72: 0x0024, 0xe73: 0x0024, + // Block 0x3a, offset 0xe80 + 0xe80: 0x0010, 0xe81: 0x0010, 0xe82: 0x0010, 0xe83: 0x0010, 0xe84: 0x0010, 0xe85: 0x0010, + 0xe86: 0x0010, 0xe87: 0x0010, 0xe88: 0x0010, 0xe89: 0x0010, 0xe8a: 0x0010, 0xe8b: 0x0010, + 0xe8c: 0x0010, 0xe8d: 0x0010, 0xe8e: 0x0010, 0xe8f: 0x0010, 0xe90: 0x0010, 0xe91: 0x0010, + 0xe92: 0x0010, 0xe93: 0x0010, 0xe94: 0x0010, 0xe95: 0x0010, 0xe96: 0x0010, 0xe97: 0x0010, + 0xe98: 0x0010, 0xe99: 0x0010, 0xe9a: 0x0010, 0xe9b: 0x0010, 0xe9c: 0x0010, 0xe9d: 0x0010, + 0xe9e: 0x0010, 0xe9f: 0x0010, 0xea0: 0x0010, 0xea1: 0x0010, 0xea2: 0x0010, 0xea3: 0x0010, + 0xea4: 0x0010, 0xea5: 0x0010, 0xea6: 0x0010, 0xea7: 0x0010, 0xea8: 0x0010, 0xea9: 0x0010, + 0xeaa: 0x0010, 0xeab: 0x0010, 0xeac: 0x0010, 0xead: 0x0010, 0xeae: 0x0010, 0xeaf: 0x0010, + 0xeb0: 0x0010, 0xeb1: 0x0010, 0xeb2: 0x0010, 0xeb3: 0x0010, 0xeb4: 0x0024, 0xeb5: 0x0024, + 0xeb6: 0x2000, 0xeb7: 0x0024, 0xeb8: 0x0024, 0xeb9: 0x0024, 0xeba: 0x0024, 0xebb: 0x0024, + 0xebc: 0x0024, 0xebd: 0x0024, 0xebe: 0x2000, 0xebf: 0x2000, + // Block 0x3b, offset 0xec0 + 0xec0: 0x2000, 0xec1: 0x2000, 0xec2: 0x2000, 0xec3: 0x2000, 0xec4: 0x2000, 0xec5: 0x2000, + 0xec6: 0x0024, 0xec7: 0x2000, 0xec8: 0x2000, 0xec9: 0x0024, 0xeca: 0x0024, 0xecb: 0x0024, + 0xecc: 0x0024, 0xecd: 0x0024, 0xece: 0x0024, 0xecf: 0x0024, 0xed0: 0x0024, 0xed1: 0x0024, + 0xed2: 0x0044, 0xed3: 0x0024, + 0xedd: 0x0024, + // Block 0x3c, offset 0xf00 + 0xf0b: 0x0024, + 0xf0c: 0x0024, 0xf0d: 0x0024, 0xf0e: 0x0002, 0xf0f: 0x0024, + // Block 0x3d, offset 0xf40 + 0xf45: 0x0024, + 0xf46: 0x0024, + 0xf69: 0x0024, + // Block 0x3e, offset 0xf80 + 0xfa0: 0x0024, 0xfa1: 0x0024, 0xfa2: 0x0024, 0xfa3: 0x2000, + 0xfa4: 0x2000, 0xfa5: 0x2000, 0xfa6: 0x2000, 0xfa7: 0x0024, 0xfa8: 0x0024, 0xfa9: 0x2000, + 0xfaa: 0x2000, 0xfab: 0x2000, + 0xfb0: 0x2000, 0xfb1: 0x2000, 0xfb2: 0x0024, 0xfb3: 0x2000, 0xfb4: 0x2000, 0xfb5: 0x2000, + 0xfb6: 0x2000, 0xfb7: 0x2000, 0xfb8: 0x2000, 0xfb9: 0x0024, 0xfba: 0x0024, 0xfbb: 0x0024, + // Block 0x3f, offset 0xfc0 + 0xfd7: 0x0024, + 0xfd8: 0x0024, 0xfd9: 0x2000, 0xfda: 0x2000, 0xfdb: 0x0024, + 0xfe0: 0x0010, 0xfe1: 0x0010, 0xfe2: 0x0010, 0xfe3: 0x0010, + 0xfe4: 0x0010, 0xfe5: 0x0010, 0xfe6: 0x0010, 0xfe7: 0x0010, 0xfe8: 0x0010, 0xfe9: 0x0010, + 0xfea: 0x0010, 0xfeb: 0x0010, 0xfec: 0x0010, 0xfed: 0x0010, 0xfee: 0x0010, 0xfef: 0x0010, + 0xff0: 0x0010, 0xff1: 0x0010, 0xff2: 0x0010, 0xff3: 0x0010, 0xff4: 0x0010, 0xff5: 0x0010, + 0xff6: 0x0010, 0xff7: 0x0010, 0xff8: 0x0010, 0xff9: 0x0010, 0xffa: 0x0010, 0xffb: 0x0010, + 0xffc: 0x0010, 0xffd: 0x0010, 0xffe: 0x0010, 0xfff: 0x0010, + // Block 0x40, offset 0x1000 + 0x1000: 0x0010, 0x1001: 0x0010, 0x1002: 0x0010, 0x1003: 0x0010, 0x1004: 0x0010, 0x1005: 0x0010, + 0x1006: 0x0010, 0x1007: 0x0010, 0x1008: 0x0010, 0x1009: 0x0010, 0x100a: 0x0010, 0x100b: 0x0010, + 0x100c: 0x0010, 0x100d: 0x0010, 0x100e: 0x0010, 0x100f: 0x0010, 0x1010: 0x0010, 0x1011: 0x0010, + 0x1012: 0x0010, 0x1013: 0x0010, 0x1014: 0x0010, 0x1015: 0x2000, 0x1016: 0x0024, 0x1017: 0x2000, + 0x1018: 0x0024, 0x1019: 0x0024, 0x101a: 0x0024, 0x101b: 0x0024, 0x101c: 0x0024, 0x101d: 0x0024, + 0x101e: 0x0024, 0x1020: 0x0044, 0x1022: 0x0024, + 0x1025: 0x0024, 0x1026: 0x0024, 0x1027: 0x0024, 0x1028: 0x0024, 0x1029: 0x0024, + 0x102a: 0x0024, 0x102b: 0x0024, 0x102c: 0x0024, 0x102d: 0x2000, 0x102e: 0x2000, 0x102f: 0x2000, + 0x1030: 0x2000, 0x1031: 0x2000, 0x1032: 0x2000, 0x1033: 0x0024, 0x1034: 0x0024, 0x1035: 0x0024, + 0x1036: 0x0024, 0x1037: 0x0024, 0x1038: 0x0024, 0x1039: 0x0024, 0x103a: 0x0024, 0x103b: 0x0024, + 0x103c: 0x0024, 0x103f: 0x0024, + // Block 0x41, offset 0x1040 + 0x1070: 0x0024, 0x1071: 0x0024, 0x1072: 0x0024, 0x1073: 0x0024, 0x1074: 0x0024, 0x1075: 0x0024, + 0x1076: 0x0024, 0x1077: 0x0024, 0x1078: 0x0024, 0x1079: 0x0024, 0x107a: 0x0024, 0x107b: 0x0024, + 0x107c: 0x0024, 0x107d: 0x0024, 0x107e: 0x0024, 0x107f: 0x0024, + // Block 0x42, offset 0x1080 + 0x1080: 0x0024, 0x1081: 0x0024, 0x1082: 0x0024, 0x1083: 0x0024, 0x1084: 0x0024, 0x1085: 0x0024, + 0x1086: 0x0024, 0x1087: 0x0024, 0x1088: 0x0024, 0x1089: 0x0024, 0x108a: 0x0024, 0x108b: 0x0024, + 0x108c: 0x0024, 0x108d: 0x0024, 0x108e: 0x0024, 0x108f: 0x0024, 0x1090: 0x0024, 0x1091: 0x0024, + 0x1092: 0x0024, 0x1093: 0x0024, 0x1094: 0x0024, 0x1095: 0x0024, 0x1096: 0x0024, 0x1097: 0x0024, + 0x1098: 0x0024, 0x1099: 0x0024, 0x109a: 0x0024, 0x109b: 0x0024, 0x109c: 0x0024, 0x109d: 0x0024, + 0x10a0: 0x0024, 0x10a1: 0x0024, 0x10a2: 0x0024, 0x10a3: 0x0024, + 0x10a4: 0x0024, 0x10a5: 0x0024, 0x10a6: 0x0024, 0x10a7: 0x0024, 0x10a8: 0x0024, 0x10a9: 0x0024, + 0x10aa: 0x0024, 0x10ab: 0x0024, + // Block 0x43, offset 0x10c0 + 0x10c0: 0x0024, 0x10c1: 0x0024, 0x10c2: 0x0024, 0x10c3: 0x0024, 0x10c4: 0x2000, + 0x10cb: 0x0010, + 0x10cc: 0x0010, + 0x10d3: 0x0010, 0x10d4: 0x0010, 0x10d5: 0x0010, 0x10d6: 0x0010, 0x10d7: 0x0010, + 0x10d8: 0x0010, 0x10d9: 0x0010, 0x10da: 0x0010, 0x10db: 0x0010, 0x10dc: 0x0010, 0x10dd: 0x0010, + 0x10de: 0x0010, 0x10df: 0x0010, 0x10e0: 0x0010, 0x10e1: 0x0010, 0x10e2: 0x0010, 0x10e3: 0x0010, + 0x10e4: 0x0010, 0x10e5: 0x0010, 0x10e6: 0x0010, 0x10e7: 0x0010, 0x10e8: 0x0010, 0x10e9: 0x0010, + 0x10ea: 0x0010, 0x10eb: 0x0010, 0x10ec: 0x0010, 0x10ed: 0x0010, 0x10ee: 0x0010, 0x10ef: 0x0010, + 0x10f0: 0x0010, 0x10f1: 0x0010, 0x10f2: 0x0010, 0x10f3: 0x0010, 0x10f4: 0x0024, 0x10f5: 0x0024, + 0x10f6: 0x0024, 0x10f7: 0x0024, 0x10f8: 0x0024, 0x10f9: 0x0024, 0x10fa: 0x0024, 0x10fb: 0x0024, + 0x10fc: 0x0024, 0x10fd: 0x0024, 0x10fe: 0x2000, 0x10ff: 0x2000, + // Block 0x44, offset 0x1100 + 0x1100: 0x2000, 0x1101: 0x2000, 0x1102: 0x0024, 0x1103: 0x0024, 0x1104: 0x0044, 0x1105: 0x0010, + 0x1106: 0x0010, 0x1107: 0x0010, 0x1108: 0x0010, 0x1109: 0x0010, 0x110a: 0x0010, 0x110b: 0x0010, + 0x110c: 0x0010, + 0x112b: 0x0024, 0x112c: 0x0024, 0x112d: 0x0024, 0x112e: 0x0024, 0x112f: 0x0024, + 0x1130: 0x0024, 0x1131: 0x0024, 0x1132: 0x0024, 0x1133: 0x0024, + // Block 0x45, offset 0x1140 + 0x1140: 0x0024, 0x1141: 0x0024, 0x1142: 0x2000, 0x1143: 0x0010, 0x1144: 0x0010, 0x1145: 0x0010, + 0x1146: 0x0010, 0x1147: 0x0010, 0x1148: 0x0010, 0x1149: 0x0010, 0x114a: 0x0010, 0x114b: 0x0010, + 0x114c: 0x0010, 0x114d: 0x0010, 0x114e: 0x0010, 0x114f: 0x0010, 0x1150: 0x0010, 0x1151: 0x0010, + 0x1152: 0x0010, 0x1153: 0x0010, 0x1154: 0x0010, 0x1155: 0x0010, 0x1156: 0x0010, 0x1157: 0x0010, + 0x1158: 0x0010, 0x1159: 0x0010, 0x115a: 0x0010, 0x115b: 0x0010, 0x115c: 0x0010, 0x115d: 0x0010, + 0x115e: 0x0010, 0x115f: 0x0010, 0x1160: 0x0010, 0x1161: 0x2000, 0x1162: 0x0024, 0x1163: 0x0024, + 0x1164: 0x0024, 0x1165: 0x0024, 0x1166: 0x2000, 0x1167: 0x2000, 0x1168: 0x0024, 0x1169: 0x0024, + 0x116a: 0x0024, 0x116b: 0x0044, 0x116c: 0x0024, 0x116d: 0x0024, 0x116e: 0x0010, 0x116f: 0x0010, + 0x117b: 0x0010, + 0x117c: 0x0010, 0x117d: 0x0010, + // Block 0x46, offset 0x1180 + 0x11a6: 0x0024, 0x11a7: 0x2000, 0x11a8: 0x0024, 0x11a9: 0x0024, + 0x11aa: 0x2000, 0x11ab: 0x2000, 0x11ac: 0x2000, 0x11ad: 0x0024, 0x11ae: 0x2000, 0x11af: 0x0024, + 0x11b0: 0x0024, 0x11b1: 0x0024, 0x11b2: 0x0024, 0x11b3: 0x0024, + // Block 0x47, offset 0x11c0 + 0x11e4: 0x2000, 0x11e5: 0x2000, 0x11e6: 0x2000, 0x11e7: 0x2000, 0x11e8: 0x2000, 0x11e9: 0x2000, + 0x11ea: 0x2000, 0x11eb: 0x2000, 0x11ec: 0x0024, 0x11ed: 0x0024, 0x11ee: 0x0024, 0x11ef: 0x0024, + 0x11f0: 0x0024, 0x11f1: 0x0024, 0x11f2: 0x0024, 0x11f3: 0x0024, 0x11f4: 0x2000, 0x11f5: 0x2000, + 0x11f6: 0x0024, 0x11f7: 0x0024, + // Block 0x48, offset 0x1200 + 0x1210: 0x0024, 0x1211: 0x0024, + 0x1212: 0x0024, 0x1214: 0x0024, 0x1215: 0x0024, 0x1216: 0x0024, 0x1217: 0x0024, + 0x1218: 0x0024, 0x1219: 0x0024, 0x121a: 0x0024, 0x121b: 0x0024, 0x121c: 0x0024, 0x121d: 0x0024, + 0x121e: 0x0024, 0x121f: 0x0024, 0x1220: 0x0024, 0x1221: 0x2000, 0x1222: 0x0024, 0x1223: 0x0024, + 0x1224: 0x0024, 0x1225: 0x0024, 0x1226: 0x0024, 0x1227: 0x0024, 0x1228: 0x0024, + 0x122d: 0x0024, + 0x1234: 0x0024, + 0x1237: 0x2000, 0x1238: 0x0024, 0x1239: 0x0024, + // Block 0x49, offset 0x1240 + 0x124b: 0x0002, + 0x124c: 0x0004, 0x124d: 0x10020, 0x124e: 0x0002, 0x124f: 0x0002, + 0x1268: 0x0002, 0x1269: 0x0002, + 0x126a: 0x0002, 0x126b: 0x0002, 0x126c: 0x0002, 0x126d: 0x0002, 0x126e: 0x0002, + 0x127c: 0x0008, + // Block 0x4a, offset 0x1280 + 0x1289: 0x0008, + 0x12a0: 0x0002, 0x12a1: 0x0002, 0x12a2: 0x0002, 0x12a3: 0x0002, + 0x12a4: 0x0002, 0x12a5: 0x0002, 0x12a6: 0x0002, 0x12a7: 0x0002, 0x12a8: 0x0002, 0x12a9: 0x0002, + 0x12aa: 0x0002, 0x12ab: 0x0002, 0x12ac: 0x0002, 0x12ad: 0x0002, 0x12ae: 0x0002, 0x12af: 0x0002, + // Block 0x4b, offset 0x12c0 + 0x12d0: 0x0024, 0x12d1: 0x0024, + 0x12d2: 0x0024, 0x12d3: 0x0024, 0x12d4: 0x0024, 0x12d5: 0x0024, 0x12d6: 0x0024, 0x12d7: 0x0024, + 0x12d8: 0x0024, 0x12d9: 0x0024, 0x12da: 0x0024, 0x12db: 0x0024, 0x12dc: 0x0024, 0x12dd: 0x0024, + 0x12de: 0x0024, 0x12df: 0x0024, 0x12e0: 0x0024, 0x12e1: 0x0024, 0x12e2: 0x0024, 0x12e3: 0x0024, + 0x12e4: 0x0024, 0x12e5: 0x0024, 0x12e6: 0x0024, 0x12e7: 0x0024, 0x12e8: 0x0024, 0x12e9: 0x0024, + 0x12ea: 0x0024, 0x12eb: 0x0024, 0x12ec: 0x0024, 0x12ed: 0x0024, 0x12ee: 0x0024, 0x12ef: 0x0024, + 0x12f0: 0x0024, + // Block 0x4c, offset 0x1300 + 0x1322: 0x0008, + 0x1339: 0x0008, + // Block 0x4d, offset 0x1340 + 0x1354: 0x0008, 0x1355: 0x0008, 0x1356: 0x0008, 0x1357: 0x0008, + 0x1358: 0x0008, 0x1359: 0x0008, + 0x1369: 0x0008, + 0x136a: 0x0008, + // Block 0x4e, offset 0x1380 + 0x139a: 0x0008, 0x139b: 0x0008, + 0x13a8: 0x0008, + // Block 0x4f, offset 0x13c0 + 0x13cf: 0x0008, + 0x13e9: 0x0008, + 0x13ea: 0x0008, 0x13eb: 0x0008, 0x13ec: 0x0008, 0x13ed: 0x0008, 0x13ee: 0x0008, 0x13ef: 0x0008, + 0x13f0: 0x0008, 0x13f1: 0x0008, 0x13f2: 0x0008, 0x13f3: 0x0008, + 0x13f8: 0x0008, 0x13f9: 0x0008, 0x13fa: 0x0008, + // Block 0x50, offset 0x1400 + 0x1402: 0x0008, + // Block 0x51, offset 0x1440 + 0x146a: 0x0008, 0x146b: 0x0008, + 0x1476: 0x0008, + // Block 0x52, offset 0x1480 + 0x1480: 0x0008, + 0x14bb: 0x0008, + 0x14bc: 0x0008, 0x14bd: 0x0008, 0x14be: 0x0008, + // Block 0x53, offset 0x14c0 + 0x14c0: 0x0008, 0x14c1: 0x0008, 0x14c2: 0x0008, 0x14c3: 0x0008, 0x14c4: 0x0008, + 0x14ce: 0x0008, 0x14d1: 0x0008, + 0x14d4: 0x0008, 0x14d5: 0x0008, + 0x14d8: 0x0008, 0x14dd: 0x0008, + 0x14e0: 0x0008, 0x14e2: 0x0008, 0x14e3: 0x0008, + 0x14e6: 0x0008, + 0x14ea: 0x0008, 0x14ee: 0x0008, 0x14ef: 0x0008, + 0x14f8: 0x0008, 0x14f9: 0x0008, 0x14fa: 0x0008, + // Block 0x54, offset 0x1500 + 0x1500: 0x0008, 0x1502: 0x0008, + 0x1508: 0x0008, 0x1509: 0x0008, 0x150a: 0x0008, 0x150b: 0x0008, + 0x150c: 0x0008, 0x150d: 0x0008, 0x150e: 0x0008, 0x150f: 0x0008, 0x1510: 0x0008, 0x1511: 0x0008, + 0x1512: 0x0008, 0x1513: 0x0008, + 0x151f: 0x0008, 0x1520: 0x0008, 0x1523: 0x0008, + 0x1525: 0x0008, 0x1526: 0x0008, 0x1528: 0x0008, + 0x153b: 0x0008, + 0x153e: 0x0008, 0x153f: 0x0008, + // Block 0x55, offset 0x1540 + 0x1552: 0x0008, 0x1553: 0x0008, 0x1554: 0x0008, 0x1555: 0x0008, 0x1556: 0x0008, 0x1557: 0x0008, + 0x1559: 0x0008, 0x155b: 0x0008, 0x155c: 0x0008, + 0x1560: 0x0008, 0x1561: 0x0008, + 0x1567: 0x0008, + 0x156a: 0x0008, 0x156b: 0x0008, + 0x1570: 0x0008, 0x1571: 0x0008, + 0x157d: 0x0008, 0x157e: 0x0008, + // Block 0x56, offset 0x1580 + 0x1584: 0x0008, 0x1585: 0x0008, + 0x1588: 0x0008, + 0x158e: 0x0008, 0x158f: 0x0008, 0x1591: 0x0008, + 0x1593: 0x0008, 0x1594: 0x0008, + 0x15a9: 0x0008, + 0x15aa: 0x0008, + 0x15b0: 0x0008, 0x15b1: 0x0008, 0x15b2: 0x0008, 0x15b3: 0x0008, 0x15b4: 0x0008, 0x15b5: 0x0008, + 0x15b7: 0x0008, 0x15b8: 0x0008, 0x15b9: 0x0008, 0x15ba: 0x0008, + 0x15bd: 0x0008, + // Block 0x57, offset 0x15c0 + 0x15c2: 0x0008, 0x15c5: 0x0008, + 0x15c8: 0x0008, 0x15c9: 0x0008, 0x15ca: 0x0008, 0x15cb: 0x0008, + 0x15cc: 0x0008, 0x15cd: 0x0008, 0x15cf: 0x0008, + 0x15d2: 0x0008, 0x15d4: 0x0008, 0x15d6: 0x0008, + 0x15dd: 0x0008, + 0x15e1: 0x0008, + 0x15e8: 0x0008, + 0x15f3: 0x0008, 0x15f4: 0x0008, + // Block 0x58, offset 0x1600 + 0x1604: 0x0008, + 0x1607: 0x0008, + 0x160c: 0x0008, 0x160e: 0x0008, + 0x1613: 0x0008, 0x1614: 0x0008, 0x1615: 0x0008, 0x1617: 0x0008, + 0x1623: 0x0008, + 0x1624: 0x0008, + // Block 0x59, offset 0x1640 + 0x1655: 0x0008, 0x1656: 0x0008, 0x1657: 0x0008, + 0x1661: 0x0008, + 0x1670: 0x0008, + 0x167f: 0x0008, + // Block 0x5a, offset 0x1680 + 0x16b4: 0x0008, 0x16b5: 0x0008, + // Block 0x5b, offset 0x16c0 + 0x16c5: 0x0008, + 0x16c6: 0x0008, 0x16c7: 0x0008, + 0x16db: 0x0008, 0x16dc: 0x0008, + // Block 0x5c, offset 0x1700 + 0x1710: 0x0008, + 0x1715: 0x0008, + // Block 0x5d, offset 0x1740 + 0x176f: 0x0024, + 0x1770: 0x0024, 0x1771: 0x0024, + // Block 0x5e, offset 0x1780 + 0x17bf: 0x0024, + // Block 0x5f, offset 0x17c0 + 0x17e0: 0x0024, 0x17e1: 0x0024, 0x17e2: 0x0024, 0x17e3: 0x0024, + 0x17e4: 0x0024, 0x17e5: 0x0024, 0x17e6: 0x0024, 0x17e7: 0x0024, 0x17e8: 0x0024, 0x17e9: 0x0024, + 0x17ea: 0x0024, 0x17eb: 0x0024, 0x17ec: 0x0024, 0x17ed: 0x0024, 0x17ee: 0x0024, 0x17ef: 0x0024, + 0x17f0: 0x0024, 0x17f1: 0x0024, 0x17f2: 0x0024, 0x17f3: 0x0024, 0x17f4: 0x0024, 0x17f5: 0x0024, + 0x17f6: 0x0024, 0x17f7: 0x0024, 0x17f8: 0x0024, 0x17f9: 0x0024, 0x17fa: 0x0024, 0x17fb: 0x0024, + 0x17fc: 0x0024, 0x17fd: 0x0024, 0x17fe: 0x0024, 0x17ff: 0x0024, + // Block 0x60, offset 0x1800 + 0x182a: 0x0024, 0x182b: 0x0024, 0x182c: 0x0024, 0x182d: 0x0024, 0x182e: 0x0024, 0x182f: 0x0024, + 0x1830: 0x0008, + 0x183d: 0x0008, + // Block 0x61, offset 0x1840 + 0x1859: 0x0024, 0x185a: 0x0024, + // Block 0x62, offset 0x1880 + 0x1897: 0x0008, + 0x1899: 0x0008, + // Block 0x63, offset 0x18c0 + 0x18ef: 0x0024, + 0x18f0: 0x0024, 0x18f1: 0x0024, 0x18f2: 0x0024, 0x18f4: 0x0024, 0x18f5: 0x0024, + 0x18f6: 0x0024, 0x18f7: 0x0024, 0x18f8: 0x0024, 0x18f9: 0x0024, 0x18fa: 0x0024, 0x18fb: 0x0024, + 0x18fc: 0x0024, 0x18fd: 0x0024, + // Block 0x64, offset 0x1900 + 0x191e: 0x0024, 0x191f: 0x0024, + // Block 0x65, offset 0x1940 + 0x1970: 0x0024, 0x1971: 0x0024, + // Block 0x66, offset 0x1980 + 0x1982: 0x0024, + 0x1986: 0x0024, 0x198b: 0x0024, + 0x19a3: 0x2000, + 0x19a4: 0x2000, 0x19a5: 0x0024, 0x19a6: 0x0024, 0x19a7: 0x2000, + 0x19ac: 0x0024, + // Block 0x67, offset 0x19c0 + 0x19c0: 0x2000, 0x19c1: 0x2000, + 0x19f4: 0x2000, 0x19f5: 0x2000, + 0x19f6: 0x2000, 0x19f7: 0x2000, 0x19f8: 0x2000, 0x19f9: 0x2000, 0x19fa: 0x2000, 0x19fb: 0x2000, + 0x19fc: 0x2000, 0x19fd: 0x2000, 0x19fe: 0x2000, 0x19ff: 0x2000, + // Block 0x68, offset 0x1a00 + 0x1a00: 0x2000, 0x1a01: 0x2000, 0x1a02: 0x2000, 0x1a03: 0x2000, 0x1a04: 0x0024, 0x1a05: 0x0024, + 0x1a20: 0x0024, 0x1a21: 0x0024, 0x1a22: 0x0024, 0x1a23: 0x0024, + 0x1a24: 0x0024, 0x1a25: 0x0024, 0x1a26: 0x0024, 0x1a27: 0x0024, 0x1a28: 0x0024, 0x1a29: 0x0024, + 0x1a2a: 0x0024, 0x1a2b: 0x0024, 0x1a2c: 0x0024, 0x1a2d: 0x0024, 0x1a2e: 0x0024, 0x1a2f: 0x0024, + 0x1a30: 0x0024, 0x1a31: 0x0024, + 0x1a3f: 0x0024, + // Block 0x69, offset 0x1a40 + 0x1a66: 0x0024, 0x1a67: 0x0024, 0x1a68: 0x0024, 0x1a69: 0x0024, + 0x1a6a: 0x0024, 0x1a6b: 0x0024, 0x1a6c: 0x0024, 0x1a6d: 0x0024, + // Block 0x6a, offset 0x1a80 + 0x1a87: 0x0024, 0x1a88: 0x0024, 0x1a89: 0x0024, 0x1a8a: 0x0024, 0x1a8b: 0x0024, + 0x1a8c: 0x0024, 0x1a8d: 0x0024, 0x1a8e: 0x0024, 0x1a8f: 0x0024, 0x1a90: 0x0024, 0x1a91: 0x0024, + 0x1a92: 0x2000, 0x1a93: 0x0024, + 0x1aa0: 0x0080, 0x1aa1: 0x0080, 0x1aa2: 0x0080, 0x1aa3: 0x0080, + 0x1aa4: 0x0080, 0x1aa5: 0x0080, 0x1aa6: 0x0080, 0x1aa7: 0x0080, 0x1aa8: 0x0080, 0x1aa9: 0x0080, + 0x1aaa: 0x0080, 0x1aab: 0x0080, 0x1aac: 0x0080, 0x1aad: 0x0080, 0x1aae: 0x0080, 0x1aaf: 0x0080, + 0x1ab0: 0x0080, 0x1ab1: 0x0080, 0x1ab2: 0x0080, 0x1ab3: 0x0080, 0x1ab4: 0x0080, 0x1ab5: 0x0080, + 0x1ab6: 0x0080, 0x1ab7: 0x0080, 0x1ab8: 0x0080, 0x1ab9: 0x0080, 0x1aba: 0x0080, 0x1abb: 0x0080, + 0x1abc: 0x0080, + // Block 0x6b, offset 0x1ac0 + 0x1ac0: 0x0024, 0x1ac1: 0x0024, 0x1ac2: 0x0024, 0x1ac3: 0x2000, + 0x1ac9: 0x0010, 0x1aca: 0x0010, 0x1acb: 0x0010, + 0x1acf: 0x0010, 0x1ad0: 0x0010, 0x1ad1: 0x0010, + 0x1ad2: 0x0010, 0x1ad3: 0x0010, 0x1ad4: 0x0010, 0x1ad5: 0x0010, 0x1ad6: 0x0010, 0x1ad7: 0x0010, + 0x1ad8: 0x0010, 0x1ad9: 0x0010, 0x1ada: 0x0010, 0x1adb: 0x0010, 0x1adc: 0x0010, 0x1add: 0x0010, + 0x1ade: 0x0010, 0x1adf: 0x0010, 0x1ae0: 0x0010, 0x1ae1: 0x0010, 0x1ae2: 0x0010, 0x1ae3: 0x0010, + 0x1ae4: 0x0010, 0x1ae5: 0x0010, 0x1ae6: 0x0010, 0x1ae7: 0x0010, 0x1ae8: 0x0010, 0x1ae9: 0x0010, + 0x1aea: 0x0010, 0x1aeb: 0x0010, 0x1aec: 0x0010, 0x1aed: 0x0010, 0x1aee: 0x0010, 0x1aef: 0x0010, + 0x1af0: 0x0010, 0x1af1: 0x0010, 0x1af2: 0x0010, 0x1af3: 0x0024, 0x1af4: 0x2000, 0x1af5: 0x2000, + 0x1af6: 0x0024, 0x1af7: 0x0024, 0x1af8: 0x0024, 0x1af9: 0x0024, 0x1afa: 0x2000, 0x1afb: 0x2000, + 0x1afc: 0x0024, 0x1afd: 0x0024, 0x1afe: 0x2000, 0x1aff: 0x2000, + // Block 0x6c, offset 0x1b00 + 0x1b00: 0x0044, + 0x1b20: 0x0010, 0x1b21: 0x0010, 0x1b22: 0x0010, 0x1b23: 0x0010, + 0x1b24: 0x0010, 0x1b25: 0x0024, 0x1b27: 0x0010, 0x1b28: 0x0010, 0x1b29: 0x0010, + 0x1b2a: 0x0010, 0x1b2b: 0x0010, 0x1b2c: 0x0010, 0x1b2d: 0x0010, 0x1b2e: 0x0010, 0x1b2f: 0x0010, + 0x1b3a: 0x0010, 0x1b3b: 0x0010, + 0x1b3c: 0x0010, 0x1b3d: 0x0010, 0x1b3e: 0x0010, + // Block 0x6d, offset 0x1b40 + 0x1b69: 0x0024, + 0x1b6a: 0x0024, 0x1b6b: 0x0024, 0x1b6c: 0x0024, 0x1b6d: 0x0024, 0x1b6e: 0x0024, 0x1b6f: 0x2000, + 0x1b70: 0x2000, 0x1b71: 0x0024, 0x1b72: 0x0024, 0x1b73: 0x2000, 0x1b74: 0x2000, 0x1b75: 0x0024, + 0x1b76: 0x0024, + // Block 0x6e, offset 0x1b80 + 0x1b83: 0x0024, + 0x1b8c: 0x0024, 0x1b8d: 0x2000, + 0x1ba0: 0x0010, 0x1ba1: 0x0010, 0x1ba2: 0x0010, 0x1ba3: 0x0010, + 0x1ba4: 0x0010, 0x1ba5: 0x0010, 0x1ba6: 0x0010, 0x1ba7: 0x0010, 0x1ba8: 0x0010, 0x1ba9: 0x0010, + 0x1baa: 0x0010, 0x1bab: 0x0010, 0x1bac: 0x0010, 0x1bad: 0x0010, 0x1bae: 0x0010, 0x1baf: 0x0010, + 0x1bb1: 0x0010, 0x1bb2: 0x0010, 0x1bb3: 0x0010, + 0x1bba: 0x0010, + 0x1bbc: 0x0024, 0x1bbe: 0x0010, 0x1bbf: 0x0010, + // Block 0x6f, offset 0x1bc0 + 0x1bf0: 0x0024, 0x1bf2: 0x0024, 0x1bf3: 0x0024, 0x1bf4: 0x0024, + 0x1bf7: 0x0024, 0x1bf8: 0x0024, + 0x1bfe: 0x0024, 0x1bff: 0x0024, + // Block 0x70, offset 0x1c00 + 0x1c01: 0x0024, + 0x1c20: 0x0010, 0x1c21: 0x0010, 0x1c22: 0x0010, 0x1c23: 0x0010, + 0x1c24: 0x0010, 0x1c25: 0x0010, 0x1c26: 0x0010, 0x1c27: 0x0010, 0x1c28: 0x0010, 0x1c29: 0x0010, + 0x1c2a: 0x0010, 0x1c2b: 0x2000, 0x1c2c: 0x0024, 0x1c2d: 0x0024, 0x1c2e: 0x2000, 0x1c2f: 0x2000, + 0x1c35: 0x2000, + 0x1c36: 0x0044, + // Block 0x71, offset 0x1c40 + 0x1c40: 0x0010, 0x1c41: 0x0010, 0x1c42: 0x0010, 0x1c43: 0x0010, 0x1c44: 0x0010, 0x1c45: 0x0010, + 0x1c46: 0x0010, 0x1c47: 0x0010, 0x1c48: 0x0010, 0x1c49: 0x0010, 0x1c4a: 0x0010, 0x1c4b: 0x0010, + 0x1c4c: 0x0010, 0x1c4d: 0x0010, 0x1c4e: 0x0010, 0x1c4f: 0x0010, 0x1c50: 0x0010, 0x1c51: 0x0010, + 0x1c52: 0x0010, 0x1c53: 0x0010, 0x1c54: 0x0010, 0x1c55: 0x0010, 0x1c56: 0x0010, 0x1c57: 0x0010, + 0x1c58: 0x0010, 0x1c59: 0x0010, 0x1c5a: 0x0010, + 0x1c63: 0x2000, + 0x1c64: 0x2000, 0x1c65: 0x0024, 0x1c66: 0x2000, 0x1c67: 0x2000, 0x1c68: 0x0024, 0x1c69: 0x2000, + 0x1c6a: 0x2000, 0x1c6c: 0x2000, 0x1c6d: 0x0024, + // Block 0x72, offset 0x1c80 + 0x1c80: 0x0200, 0x1c81: 0x0400, 0x1c82: 0x0400, 0x1c83: 0x0400, 0x1c84: 0x0400, 0x1c85: 0x0400, + 0x1c86: 0x0400, 0x1c87: 0x0400, 0x1c88: 0x0400, 0x1c89: 0x0400, 0x1c8a: 0x0400, 0x1c8b: 0x0400, + 0x1c8c: 0x0400, 0x1c8d: 0x0400, 0x1c8e: 0x0400, 0x1c8f: 0x0400, 0x1c90: 0x0400, 0x1c91: 0x0400, + 0x1c92: 0x0400, 0x1c93: 0x0400, 0x1c94: 0x0400, 0x1c95: 0x0400, 0x1c96: 0x0400, 0x1c97: 0x0400, + 0x1c98: 0x0400, 0x1c99: 0x0400, 0x1c9a: 0x0400, 0x1c9b: 0x0400, 0x1c9c: 0x0200, 0x1c9d: 0x0400, + 0x1c9e: 0x0400, 0x1c9f: 0x0400, 0x1ca0: 0x0400, 0x1ca1: 0x0400, 0x1ca2: 0x0400, 0x1ca3: 0x0400, + 0x1ca4: 0x0400, 0x1ca5: 0x0400, 0x1ca6: 0x0400, 0x1ca7: 0x0400, 0x1ca8: 0x0400, 0x1ca9: 0x0400, + 0x1caa: 0x0400, 0x1cab: 0x0400, 0x1cac: 0x0400, 0x1cad: 0x0400, 0x1cae: 0x0400, 0x1caf: 0x0400, + 0x1cb0: 0x0400, 0x1cb1: 0x0400, 0x1cb2: 0x0400, 0x1cb3: 0x0400, 0x1cb4: 0x0400, 0x1cb5: 0x0400, + 0x1cb6: 0x0400, 0x1cb7: 0x0400, 0x1cb8: 0x0200, 0x1cb9: 0x0400, 0x1cba: 0x0400, 0x1cbb: 0x0400, + 0x1cbc: 0x0400, 0x1cbd: 0x0400, 0x1cbe: 0x0400, 0x1cbf: 0x0400, + // Block 0x73, offset 0x1cc0 + 0x1cc0: 0x0400, 0x1cc1: 0x0400, 0x1cc2: 0x0400, 0x1cc3: 0x0400, 0x1cc4: 0x0400, 0x1cc5: 0x0400, + 0x1cc6: 0x0400, 0x1cc7: 0x0400, 0x1cc8: 0x0400, 0x1cc9: 0x0400, 0x1cca: 0x0400, 0x1ccb: 0x0400, + 0x1ccc: 0x0400, 0x1ccd: 0x0400, 0x1cce: 0x0400, 0x1ccf: 0x0400, 0x1cd0: 0x0400, 0x1cd1: 0x0400, + 0x1cd2: 0x0400, 0x1cd3: 0x0400, 0x1cd4: 0x0200, 0x1cd5: 0x0400, 0x1cd6: 0x0400, 0x1cd7: 0x0400, + 0x1cd8: 0x0400, 0x1cd9: 0x0400, 0x1cda: 0x0400, 0x1cdb: 0x0400, 0x1cdc: 0x0400, 0x1cdd: 0x0400, + 0x1cde: 0x0400, 0x1cdf: 0x0400, 0x1ce0: 0x0400, 0x1ce1: 0x0400, 0x1ce2: 0x0400, 0x1ce3: 0x0400, + 0x1ce4: 0x0400, 0x1ce5: 0x0400, 0x1ce6: 0x0400, 0x1ce7: 0x0400, 0x1ce8: 0x0400, 0x1ce9: 0x0400, + 0x1cea: 0x0400, 0x1ceb: 0x0400, 0x1cec: 0x0400, 0x1ced: 0x0400, 0x1cee: 0x0400, 0x1cef: 0x0400, + 0x1cf0: 0x0200, 0x1cf1: 0x0400, 0x1cf2: 0x0400, 0x1cf3: 0x0400, 0x1cf4: 0x0400, 0x1cf5: 0x0400, + 0x1cf6: 0x0400, 0x1cf7: 0x0400, 0x1cf8: 0x0400, 0x1cf9: 0x0400, 0x1cfa: 0x0400, 0x1cfb: 0x0400, + 0x1cfc: 0x0400, 0x1cfd: 0x0400, 0x1cfe: 0x0400, 0x1cff: 0x0400, + // Block 0x74, offset 0x1d00 + 0x1d00: 0x0400, 0x1d01: 0x0400, 0x1d02: 0x0400, 0x1d03: 0x0400, 0x1d04: 0x0400, 0x1d05: 0x0400, + 0x1d06: 0x0400, 0x1d07: 0x0400, 0x1d08: 0x0400, 0x1d09: 0x0400, 0x1d0a: 0x0400, 0x1d0b: 0x0400, + 0x1d0c: 0x0200, 0x1d0d: 0x0400, 0x1d0e: 0x0400, 0x1d0f: 0x0400, 0x1d10: 0x0400, 0x1d11: 0x0400, + 0x1d12: 0x0400, 0x1d13: 0x0400, 0x1d14: 0x0400, 0x1d15: 0x0400, 0x1d16: 0x0400, 0x1d17: 0x0400, + 0x1d18: 0x0400, 0x1d19: 0x0400, 0x1d1a: 0x0400, 0x1d1b: 0x0400, 0x1d1c: 0x0400, 0x1d1d: 0x0400, + 0x1d1e: 0x0400, 0x1d1f: 0x0400, 0x1d20: 0x0400, 0x1d21: 0x0400, 0x1d22: 0x0400, 0x1d23: 0x0400, + 0x1d24: 0x0400, 0x1d25: 0x0400, 0x1d26: 0x0400, 0x1d27: 0x0400, 0x1d28: 0x0200, 0x1d29: 0x0400, + 0x1d2a: 0x0400, 0x1d2b: 0x0400, 0x1d2c: 0x0400, 0x1d2d: 0x0400, 0x1d2e: 0x0400, 0x1d2f: 0x0400, + 0x1d30: 0x0400, 0x1d31: 0x0400, 0x1d32: 0x0400, 0x1d33: 0x0400, 0x1d34: 0x0400, 0x1d35: 0x0400, + 0x1d36: 0x0400, 0x1d37: 0x0400, 0x1d38: 0x0400, 0x1d39: 0x0400, 0x1d3a: 0x0400, 0x1d3b: 0x0400, + 0x1d3c: 0x0400, 0x1d3d: 0x0400, 0x1d3e: 0x0400, 0x1d3f: 0x0400, + // Block 0x75, offset 0x1d40 + 0x1d40: 0x0400, 0x1d41: 0x0400, 0x1d42: 0x0400, 0x1d43: 0x0400, 0x1d44: 0x0200, 0x1d45: 0x0400, + 0x1d46: 0x0400, 0x1d47: 0x0400, 0x1d48: 0x0400, 0x1d49: 0x0400, 0x1d4a: 0x0400, 0x1d4b: 0x0400, + 0x1d4c: 0x0400, 0x1d4d: 0x0400, 0x1d4e: 0x0400, 0x1d4f: 0x0400, 0x1d50: 0x0400, 0x1d51: 0x0400, + 0x1d52: 0x0400, 0x1d53: 0x0400, 0x1d54: 0x0400, 0x1d55: 0x0400, 0x1d56: 0x0400, 0x1d57: 0x0400, + 0x1d58: 0x0400, 0x1d59: 0x0400, 0x1d5a: 0x0400, 0x1d5b: 0x0400, 0x1d5c: 0x0400, 0x1d5d: 0x0400, + 0x1d5e: 0x0400, 0x1d5f: 0x0400, 0x1d60: 0x0200, 0x1d61: 0x0400, 0x1d62: 0x0400, 0x1d63: 0x0400, + 0x1d64: 0x0400, 0x1d65: 0x0400, 0x1d66: 0x0400, 0x1d67: 0x0400, 0x1d68: 0x0400, 0x1d69: 0x0400, + 0x1d6a: 0x0400, 0x1d6b: 0x0400, 0x1d6c: 0x0400, 0x1d6d: 0x0400, 0x1d6e: 0x0400, 0x1d6f: 0x0400, + 0x1d70: 0x0400, 0x1d71: 0x0400, 0x1d72: 0x0400, 0x1d73: 0x0400, 0x1d74: 0x0400, 0x1d75: 0x0400, + 0x1d76: 0x0400, 0x1d77: 0x0400, 0x1d78: 0x0400, 0x1d79: 0x0400, 0x1d7a: 0x0400, 0x1d7b: 0x0400, + 0x1d7c: 0x0200, 0x1d7d: 0x0400, 0x1d7e: 0x0400, 0x1d7f: 0x0400, + // Block 0x76, offset 0x1d80 + 0x1d80: 0x0400, 0x1d81: 0x0400, 0x1d82: 0x0400, 0x1d83: 0x0400, 0x1d84: 0x0400, 0x1d85: 0x0400, + 0x1d86: 0x0400, 0x1d87: 0x0400, 0x1d88: 0x0400, 0x1d89: 0x0400, 0x1d8a: 0x0400, 0x1d8b: 0x0400, + 0x1d8c: 0x0400, 0x1d8d: 0x0400, 0x1d8e: 0x0400, 0x1d8f: 0x0400, 0x1d90: 0x0400, 0x1d91: 0x0400, + 0x1d92: 0x0400, 0x1d93: 0x0400, 0x1d94: 0x0400, 0x1d95: 0x0400, 0x1d96: 0x0400, 0x1d97: 0x0400, + 0x1d98: 0x0200, 0x1d99: 0x0400, 0x1d9a: 0x0400, 0x1d9b: 0x0400, 0x1d9c: 0x0400, 0x1d9d: 0x0400, + 0x1d9e: 0x0400, 0x1d9f: 0x0400, 0x1da0: 0x0400, 0x1da1: 0x0400, 0x1da2: 0x0400, 0x1da3: 0x0400, + 0x1da4: 0x0400, 0x1da5: 0x0400, 0x1da6: 0x0400, 0x1da7: 0x0400, 0x1da8: 0x0400, 0x1da9: 0x0400, + 0x1daa: 0x0400, 0x1dab: 0x0400, 0x1dac: 0x0400, 0x1dad: 0x0400, 0x1dae: 0x0400, 0x1daf: 0x0400, + 0x1db0: 0x0400, 0x1db1: 0x0400, 0x1db2: 0x0400, 0x1db3: 0x0400, 0x1db4: 0x0200, 0x1db5: 0x0400, + 0x1db6: 0x0400, 0x1db7: 0x0400, 0x1db8: 0x0400, 0x1db9: 0x0400, 0x1dba: 0x0400, 0x1dbb: 0x0400, + 0x1dbc: 0x0400, 0x1dbd: 0x0400, 0x1dbe: 0x0400, 0x1dbf: 0x0400, + // Block 0x77, offset 0x1dc0 + 0x1dc0: 0x0400, 0x1dc1: 0x0400, 0x1dc2: 0x0400, 0x1dc3: 0x0400, 0x1dc4: 0x0400, 0x1dc5: 0x0400, + 0x1dc6: 0x0400, 0x1dc7: 0x0400, 0x1dc8: 0x0400, 0x1dc9: 0x0400, 0x1dca: 0x0400, 0x1dcb: 0x0400, + 0x1dcc: 0x0400, 0x1dcd: 0x0400, 0x1dce: 0x0400, 0x1dcf: 0x0400, 0x1dd0: 0x0200, 0x1dd1: 0x0400, + 0x1dd2: 0x0400, 0x1dd3: 0x0400, 0x1dd4: 0x0400, 0x1dd5: 0x0400, 0x1dd6: 0x0400, 0x1dd7: 0x0400, + 0x1dd8: 0x0400, 0x1dd9: 0x0400, 0x1dda: 0x0400, 0x1ddb: 0x0400, 0x1ddc: 0x0400, 0x1ddd: 0x0400, + 0x1dde: 0x0400, 0x1ddf: 0x0400, 0x1de0: 0x0400, 0x1de1: 0x0400, 0x1de2: 0x0400, 0x1de3: 0x0400, + 0x1de4: 0x0400, 0x1de5: 0x0400, 0x1de6: 0x0400, 0x1de7: 0x0400, 0x1de8: 0x0400, 0x1de9: 0x0400, + 0x1dea: 0x0400, 0x1deb: 0x0400, 0x1dec: 0x0200, 0x1ded: 0x0400, 0x1dee: 0x0400, 0x1def: 0x0400, + 0x1df0: 0x0400, 0x1df1: 0x0400, 0x1df2: 0x0400, 0x1df3: 0x0400, 0x1df4: 0x0400, 0x1df5: 0x0400, + 0x1df6: 0x0400, 0x1df7: 0x0400, 0x1df8: 0x0400, 0x1df9: 0x0400, 0x1dfa: 0x0400, 0x1dfb: 0x0400, + 0x1dfc: 0x0400, 0x1dfd: 0x0400, 0x1dfe: 0x0400, 0x1dff: 0x0400, + // Block 0x78, offset 0x1e00 + 0x1e00: 0x0400, 0x1e01: 0x0400, 0x1e02: 0x0400, 0x1e03: 0x0400, 0x1e04: 0x0400, 0x1e05: 0x0400, + 0x1e06: 0x0400, 0x1e07: 0x0400, 0x1e08: 0x0200, 0x1e09: 0x0400, 0x1e0a: 0x0400, 0x1e0b: 0x0400, + 0x1e0c: 0x0400, 0x1e0d: 0x0400, 0x1e0e: 0x0400, 0x1e0f: 0x0400, 0x1e10: 0x0400, 0x1e11: 0x0400, + 0x1e12: 0x0400, 0x1e13: 0x0400, 0x1e14: 0x0400, 0x1e15: 0x0400, 0x1e16: 0x0400, 0x1e17: 0x0400, + 0x1e18: 0x0400, 0x1e19: 0x0400, 0x1e1a: 0x0400, 0x1e1b: 0x0400, 0x1e1c: 0x0400, 0x1e1d: 0x0400, + 0x1e1e: 0x0400, 0x1e1f: 0x0400, 0x1e20: 0x0400, 0x1e21: 0x0400, 0x1e22: 0x0400, 0x1e23: 0x0400, + 0x1e24: 0x0200, 0x1e25: 0x0400, 0x1e26: 0x0400, 0x1e27: 0x0400, 0x1e28: 0x0400, 0x1e29: 0x0400, + 0x1e2a: 0x0400, 0x1e2b: 0x0400, 0x1e2c: 0x0400, 0x1e2d: 0x0400, 0x1e2e: 0x0400, 0x1e2f: 0x0400, + 0x1e30: 0x0400, 0x1e31: 0x0400, 0x1e32: 0x0400, 0x1e33: 0x0400, 0x1e34: 0x0400, 0x1e35: 0x0400, + 0x1e36: 0x0400, 0x1e37: 0x0400, 0x1e38: 0x0400, 0x1e39: 0x0400, 0x1e3a: 0x0400, 0x1e3b: 0x0400, + 0x1e3c: 0x0400, 0x1e3d: 0x0400, 0x1e3e: 0x0400, 0x1e3f: 0x0400, + // Block 0x79, offset 0x1e40 + 0x1e40: 0x0400, 0x1e41: 0x0400, 0x1e42: 0x0400, 0x1e43: 0x0400, 0x1e44: 0x0400, 0x1e45: 0x0400, + 0x1e46: 0x0400, 0x1e47: 0x0400, 0x1e48: 0x0200, 0x1e49: 0x0400, 0x1e4a: 0x0400, 0x1e4b: 0x0400, + 0x1e4c: 0x0400, 0x1e4d: 0x0400, 0x1e4e: 0x0400, 0x1e4f: 0x0400, 0x1e50: 0x0400, 0x1e51: 0x0400, + 0x1e52: 0x0400, 0x1e53: 0x0400, 0x1e54: 0x0400, 0x1e55: 0x0400, 0x1e56: 0x0400, 0x1e57: 0x0400, + 0x1e58: 0x0400, 0x1e59: 0x0400, 0x1e5a: 0x0400, 0x1e5b: 0x0400, 0x1e5c: 0x0400, 0x1e5d: 0x0400, + 0x1e5e: 0x0400, 0x1e5f: 0x0400, 0x1e60: 0x0400, 0x1e61: 0x0400, 0x1e62: 0x0400, 0x1e63: 0x0400, + 0x1e70: 0x8000, 0x1e71: 0x8000, 0x1e72: 0x8000, 0x1e73: 0x8000, 0x1e74: 0x8000, 0x1e75: 0x8000, + 0x1e76: 0x8000, 0x1e77: 0x8000, 0x1e78: 0x8000, 0x1e79: 0x8000, 0x1e7a: 0x8000, 0x1e7b: 0x8000, + 0x1e7c: 0x8000, 0x1e7d: 0x8000, 0x1e7e: 0x8000, 0x1e7f: 0x8000, + // Block 0x7a, offset 0x1e80 + 0x1e80: 0x8000, 0x1e81: 0x8000, 0x1e82: 0x8000, 0x1e83: 0x8000, 0x1e84: 0x8000, 0x1e85: 0x8000, + 0x1e86: 0x8000, 0x1e8b: 0x4000, + 0x1e8c: 0x4000, 0x1e8d: 0x4000, 0x1e8e: 0x4000, 0x1e8f: 0x4000, 0x1e90: 0x4000, 0x1e91: 0x4000, + 0x1e92: 0x4000, 0x1e93: 0x4000, 0x1e94: 0x4000, 0x1e95: 0x4000, 0x1e96: 0x4000, 0x1e97: 0x4000, + 0x1e98: 0x4000, 0x1e99: 0x4000, 0x1e9a: 0x4000, 0x1e9b: 0x4000, 0x1e9c: 0x4000, 0x1e9d: 0x4000, + 0x1e9e: 0x4000, 0x1e9f: 0x4000, 0x1ea0: 0x4000, 0x1ea1: 0x4000, 0x1ea2: 0x4000, 0x1ea3: 0x4000, + 0x1ea4: 0x4000, 0x1ea5: 0x4000, 0x1ea6: 0x4000, 0x1ea7: 0x4000, 0x1ea8: 0x4000, 0x1ea9: 0x4000, + 0x1eaa: 0x4000, 0x1eab: 0x4000, 0x1eac: 0x4000, 0x1ead: 0x4000, 0x1eae: 0x4000, 0x1eaf: 0x4000, + 0x1eb0: 0x4000, 0x1eb1: 0x4000, 0x1eb2: 0x4000, 0x1eb3: 0x4000, 0x1eb4: 0x4000, 0x1eb5: 0x4000, + 0x1eb6: 0x4000, 0x1eb7: 0x4000, 0x1eb8: 0x4000, 0x1eb9: 0x4000, 0x1eba: 0x4000, 0x1ebb: 0x4000, + // Block 0x7b, offset 0x1ec0 + 0x1ede: 0x0024, + // Block 0x7c, offset 0x1f00 + 0x1f00: 0x0024, 0x1f01: 0x0024, 0x1f02: 0x0024, 0x1f03: 0x0024, 0x1f04: 0x0024, 0x1f05: 0x0024, + 0x1f06: 0x0024, 0x1f07: 0x0024, 0x1f08: 0x0024, 0x1f09: 0x0024, 0x1f0a: 0x0024, 0x1f0b: 0x0024, + 0x1f0c: 0x0024, 0x1f0d: 0x0024, 0x1f0e: 0x0024, 0x1f0f: 0x0024, + 0x1f20: 0x0024, 0x1f21: 0x0024, 0x1f22: 0x0024, 0x1f23: 0x0024, + 0x1f24: 0x0024, 0x1f25: 0x0024, 0x1f26: 0x0024, 0x1f27: 0x0024, 0x1f28: 0x0024, 0x1f29: 0x0024, + 0x1f2a: 0x0024, 0x1f2b: 0x0024, 0x1f2c: 0x0024, 0x1f2d: 0x0024, 0x1f2e: 0x0024, 0x1f2f: 0x0024, + // Block 0x7d, offset 0x1f40 + 0x1f7f: 0x0002, + // Block 0x7e, offset 0x1f80 + 0x1fb0: 0x0002, 0x1fb1: 0x0002, 0x1fb2: 0x0002, 0x1fb3: 0x0002, 0x1fb4: 0x0002, 0x1fb5: 0x0002, + 0x1fb6: 0x0002, 0x1fb7: 0x0002, 0x1fb8: 0x0002, 0x1fb9: 0x0002, 0x1fba: 0x0002, 0x1fbb: 0x0002, + // Block 0x7f, offset 0x1fc0 + 0x1ffd: 0x0024, + // Block 0x80, offset 0x2000 + 0x2020: 0x0024, + // Block 0x81, offset 0x2040 + 0x2076: 0x0024, 0x2077: 0x0024, 0x2078: 0x0024, 0x2079: 0x0024, 0x207a: 0x0024, + // Block 0x82, offset 0x2080 + 0x2080: 0x0010, 0x2081: 0x0024, 0x2082: 0x0024, 0x2083: 0x0024, 0x2085: 0x0024, + 0x2086: 0x0024, + 0x208c: 0x0024, 0x208d: 0x0024, 0x208e: 0x0024, 0x208f: 0x0024, 0x2090: 0x0010, 0x2091: 0x0010, + 0x2092: 0x0010, 0x2093: 0x0010, 0x2095: 0x0010, 0x2096: 0x0010, 0x2097: 0x0010, + 0x2099: 0x0010, 0x209a: 0x0010, 0x209b: 0x0010, 0x209c: 0x0010, 0x209d: 0x0010, + 0x209e: 0x0010, 0x209f: 0x0010, 0x20a0: 0x0010, 0x20a1: 0x0010, 0x20a2: 0x0010, 0x20a3: 0x0010, + 0x20a4: 0x0010, 0x20a5: 0x0010, 0x20a6: 0x0010, 0x20a7: 0x0010, 0x20a8: 0x0010, 0x20a9: 0x0010, + 0x20aa: 0x0010, 0x20ab: 0x0010, 0x20ac: 0x0010, 0x20ad: 0x0010, 0x20ae: 0x0010, 0x20af: 0x0010, + 0x20b0: 0x0010, 0x20b1: 0x0010, 0x20b2: 0x0010, 0x20b3: 0x0010, 0x20b4: 0x0010, 0x20b5: 0x0010, + 0x20b8: 0x0024, 0x20b9: 0x0024, 0x20ba: 0x0024, + 0x20bf: 0x0044, + // Block 0x83, offset 0x20c0 + 0x20e5: 0x0024, 0x20e6: 0x0024, + // Block 0x84, offset 0x2100 + 0x2124: 0x0024, 0x2125: 0x0024, 0x2126: 0x0024, 0x2127: 0x0024, + // Block 0x85, offset 0x2140 + 0x2169: 0x0024, + 0x216a: 0x0024, 0x216b: 0x0024, 0x216c: 0x0024, 0x216d: 0x0024, + // Block 0x86, offset 0x2180 + 0x21ab: 0x0024, 0x21ac: 0x0024, + // Block 0x87, offset 0x21c0 + 0x21fa: 0x0024, 0x21fb: 0x0024, + 0x21fc: 0x0024, 0x21fd: 0x0024, 0x21fe: 0x0024, 0x21ff: 0x0024, + // Block 0x88, offset 0x2200 + 0x2206: 0x0024, 0x2207: 0x0024, 0x2208: 0x0024, 0x2209: 0x0024, 0x220a: 0x0024, 0x220b: 0x0024, + 0x220c: 0x0024, 0x220d: 0x0024, 0x220e: 0x0024, 0x220f: 0x0024, 0x2210: 0x0024, + // Block 0x89, offset 0x2240 + 0x2242: 0x0024, 0x2243: 0x0024, 0x2244: 0x0024, 0x2245: 0x0024, + // Block 0x8a, offset 0x2280 + 0x2280: 0x2000, 0x2281: 0x0024, 0x2282: 0x2000, + 0x22b8: 0x0024, 0x22b9: 0x0024, 0x22ba: 0x0024, 0x22bb: 0x0024, + 0x22bc: 0x0024, 0x22bd: 0x0024, 0x22be: 0x0024, 0x22bf: 0x0024, + // Block 0x8b, offset 0x22c0 + 0x22c0: 0x0024, 0x22c1: 0x0024, 0x22c2: 0x0024, 0x22c3: 0x0024, 0x22c4: 0x0024, 0x22c5: 0x0024, + 0x22c6: 0x0024, + 0x22f0: 0x0024, 0x22f3: 0x0024, 0x22f4: 0x0024, + 0x22ff: 0x0024, + // Block 0x8c, offset 0x2300 + 0x2300: 0x0024, 0x2301: 0x0024, 0x2302: 0x2000, + 0x2330: 0x2000, 0x2331: 0x2000, 0x2332: 0x2000, 0x2333: 0x0024, 0x2334: 0x0024, 0x2335: 0x0024, + 0x2336: 0x0024, 0x2337: 0x2000, 0x2338: 0x2000, 0x2339: 0x0024, 0x233a: 0x0024, + 0x233d: 0x0800, + // Block 0x8d, offset 0x2340 + 0x2342: 0x0024, + 0x234d: 0x0800, + // Block 0x8e, offset 0x2380 + 0x2380: 0x0024, 0x2381: 0x0024, 0x2382: 0x0024, 0x2383: 0x0010, 0x2384: 0x0010, 0x2385: 0x0010, + 0x2386: 0x0010, 0x2387: 0x0010, 0x2388: 0x0010, 0x2389: 0x0010, 0x238a: 0x0010, 0x238b: 0x0010, + 0x238c: 0x0010, 0x238d: 0x0010, 0x238e: 0x0010, 0x238f: 0x0010, 0x2390: 0x0010, 0x2391: 0x0010, + 0x2392: 0x0010, 0x2393: 0x0010, 0x2394: 0x0010, 0x2395: 0x0010, 0x2396: 0x0010, 0x2397: 0x0010, + 0x2398: 0x0010, 0x2399: 0x0010, 0x239a: 0x0010, 0x239b: 0x0010, 0x239c: 0x0010, 0x239d: 0x0010, + 0x239e: 0x0010, 0x239f: 0x0010, 0x23a0: 0x0010, 0x23a1: 0x0010, 0x23a2: 0x0010, 0x23a3: 0x0010, + 0x23a4: 0x0010, 0x23a5: 0x0010, 0x23a6: 0x0010, 0x23a7: 0x0024, 0x23a8: 0x0024, 0x23a9: 0x0024, + 0x23aa: 0x0024, 0x23ab: 0x0024, 0x23ac: 0x2000, 0x23ad: 0x0024, 0x23ae: 0x0024, 0x23af: 0x0024, + 0x23b0: 0x0024, 0x23b1: 0x0024, 0x23b2: 0x0024, 0x23b3: 0x0044, 0x23b4: 0x0024, + // Block 0x8f, offset 0x23c0 + 0x23c4: 0x0010, 0x23c5: 0x2000, + 0x23c6: 0x2000, 0x23c7: 0x0010, + 0x23f3: 0x0024, + // Block 0x90, offset 0x2400 + 0x2400: 0x0024, 0x2401: 0x0024, 0x2402: 0x2000, + 0x2433: 0x2000, 0x2434: 0x2000, 0x2435: 0x2000, + 0x2436: 0x0024, 0x2437: 0x0024, 0x2438: 0x0024, 0x2439: 0x0024, 0x243a: 0x0024, 0x243b: 0x0024, + 0x243c: 0x0024, 0x243d: 0x0024, 0x243e: 0x0024, 0x243f: 0x2000, + // Block 0x91, offset 0x2440 + 0x2440: 0x0024, 0x2442: 0x0800, 0x2443: 0x0800, + 0x2449: 0x0024, 0x244a: 0x0024, 0x244b: 0x0024, + 0x244c: 0x0024, 0x244e: 0x2000, 0x244f: 0x0024, + // Block 0x92, offset 0x2480 + 0x24ac: 0x2000, 0x24ad: 0x2000, 0x24ae: 0x2000, 0x24af: 0x0024, + 0x24b0: 0x0024, 0x24b1: 0x0024, 0x24b2: 0x2000, 0x24b3: 0x2000, 0x24b4: 0x0024, 0x24b5: 0x0024, + 0x24b6: 0x0024, 0x24b7: 0x0024, + 0x24be: 0x0024, + // Block 0x93, offset 0x24c0 + 0x24c1: 0x0024, + // Block 0x94, offset 0x2500 + 0x251f: 0x0024, 0x2520: 0x2000, 0x2521: 0x2000, 0x2522: 0x2000, 0x2523: 0x0024, + 0x2524: 0x0024, 0x2525: 0x0024, 0x2526: 0x0024, 0x2527: 0x0024, 0x2528: 0x0024, 0x2529: 0x0024, + 0x252a: 0x0024, + // Block 0x95, offset 0x2540 + 0x2540: 0x0024, 0x2541: 0x0024, 0x2542: 0x2000, 0x2543: 0x2000, + 0x257b: 0x0024, + 0x257c: 0x0024, 0x257e: 0x0024, 0x257f: 0x2000, + // Block 0x96, offset 0x2580 + 0x2580: 0x0024, 0x2581: 0x2000, 0x2582: 0x2000, 0x2583: 0x2000, 0x2584: 0x2000, + 0x2587: 0x2000, 0x2588: 0x2000, 0x258b: 0x2000, + 0x258c: 0x2000, 0x258d: 0x0024, + 0x2597: 0x0024, + 0x25a2: 0x2000, 0x25a3: 0x2000, + 0x25a6: 0x0024, 0x25a7: 0x0024, 0x25a8: 0x0024, 0x25a9: 0x0024, + 0x25aa: 0x0024, 0x25ab: 0x0024, 0x25ac: 0x0024, + 0x25b0: 0x0024, 0x25b1: 0x0024, 0x25b2: 0x0024, 0x25b3: 0x0024, 0x25b4: 0x0024, + // Block 0x97, offset 0x25c0 + 0x25c0: 0x0010, 0x25c1: 0x0010, 0x25c2: 0x0010, 0x25c3: 0x0010, 0x25c4: 0x0010, 0x25c5: 0x0010, + 0x25c6: 0x0010, 0x25c7: 0x0010, 0x25c8: 0x0010, 0x25c9: 0x0010, 0x25cb: 0x0010, + 0x25ce: 0x0010, 0x25d0: 0x0010, 0x25d1: 0x0010, + 0x25d2: 0x0010, 0x25d3: 0x0010, 0x25d4: 0x0010, 0x25d5: 0x0010, 0x25d6: 0x0010, 0x25d7: 0x0010, + 0x25d8: 0x0010, 0x25d9: 0x0010, 0x25da: 0x0010, 0x25db: 0x0010, 0x25dc: 0x0010, 0x25dd: 0x0010, + 0x25de: 0x0010, 0x25df: 0x0010, 0x25e0: 0x0010, 0x25e1: 0x0010, 0x25e2: 0x0010, 0x25e3: 0x0010, + 0x25e4: 0x0010, 0x25e5: 0x0010, 0x25e6: 0x0010, 0x25e7: 0x0010, 0x25e8: 0x0010, 0x25e9: 0x0010, + 0x25ea: 0x0010, 0x25eb: 0x0010, 0x25ec: 0x0010, 0x25ed: 0x0010, 0x25ee: 0x0010, 0x25ef: 0x0010, + 0x25f0: 0x0010, 0x25f1: 0x0010, 0x25f2: 0x0010, 0x25f3: 0x0010, 0x25f4: 0x0010, 0x25f5: 0x0010, + 0x25f8: 0x0024, 0x25f9: 0x2000, 0x25fa: 0x2000, 0x25fb: 0x0024, + 0x25fc: 0x0024, 0x25fd: 0x0024, 0x25fe: 0x0024, 0x25ff: 0x0024, + // Block 0x98, offset 0x2600 + 0x2600: 0x0024, 0x2602: 0x0024, 0x2605: 0x0024, + 0x2607: 0x0024, 0x2608: 0x0024, 0x2609: 0x0024, 0x260a: 0x2000, + 0x260c: 0x2000, 0x260d: 0x2000, 0x260e: 0x0024, 0x260f: 0x0024, 0x2610: 0x0044, 0x2611: 0x0800, + 0x2612: 0x0024, + 0x2621: 0x0024, 0x2622: 0x0024, + // Block 0x99, offset 0x2640 + 0x2675: 0x2000, + 0x2676: 0x2000, 0x2677: 0x2000, 0x2678: 0x0024, 0x2679: 0x0024, 0x267a: 0x0024, 0x267b: 0x0024, + 0x267c: 0x0024, 0x267d: 0x0024, 0x267e: 0x0024, 0x267f: 0x0024, + // Block 0x9a, offset 0x2680 + 0x2680: 0x2000, 0x2681: 0x2000, 0x2682: 0x0024, 0x2683: 0x0024, 0x2684: 0x0024, 0x2685: 0x2000, + 0x2686: 0x0024, + 0x269e: 0x0024, + // Block 0x9b, offset 0x26c0 + 0x26f0: 0x0024, 0x26f1: 0x2000, 0x26f2: 0x2000, 0x26f3: 0x0024, 0x26f4: 0x0024, 0x26f5: 0x0024, + 0x26f6: 0x0024, 0x26f7: 0x0024, 0x26f8: 0x0024, 0x26f9: 0x2000, 0x26fa: 0x0024, 0x26fb: 0x2000, + 0x26fc: 0x2000, 0x26fd: 0x0024, 0x26fe: 0x2000, 0x26ff: 0x0024, + // Block 0x9c, offset 0x2700 + 0x2700: 0x0024, 0x2701: 0x2000, 0x2702: 0x0024, 0x2703: 0x0024, + // Block 0x9d, offset 0x2740 + 0x276f: 0x0024, + 0x2770: 0x2000, 0x2771: 0x2000, 0x2772: 0x0024, 0x2773: 0x0024, 0x2774: 0x0024, 0x2775: 0x0024, + 0x2778: 0x2000, 0x2779: 0x2000, 0x277a: 0x2000, 0x277b: 0x2000, + 0x277c: 0x0024, 0x277d: 0x0024, 0x277e: 0x2000, 0x277f: 0x0024, + // Block 0x9e, offset 0x2780 + 0x2780: 0x0024, + 0x279c: 0x0024, 0x279d: 0x0024, + // Block 0x9f, offset 0x27c0 + 0x27f0: 0x2000, 0x27f1: 0x2000, 0x27f2: 0x2000, 0x27f3: 0x0024, 0x27f4: 0x0024, 0x27f5: 0x0024, + 0x27f6: 0x0024, 0x27f7: 0x0024, 0x27f8: 0x0024, 0x27f9: 0x0024, 0x27fa: 0x0024, 0x27fb: 0x2000, + 0x27fc: 0x2000, 0x27fd: 0x0024, 0x27fe: 0x2000, 0x27ff: 0x0024, + // Block 0xa0, offset 0x2800 + 0x2800: 0x0024, + // Block 0xa1, offset 0x2840 + 0x286b: 0x0024, 0x286c: 0x2000, 0x286d: 0x0024, 0x286e: 0x2000, 0x286f: 0x2000, + 0x2870: 0x0024, 0x2871: 0x0024, 0x2872: 0x0024, 0x2873: 0x0024, 0x2874: 0x0024, 0x2875: 0x0024, + 0x2876: 0x0024, 0x2877: 0x0024, + // Block 0xa2, offset 0x2880 + 0x289d: 0x0024, + 0x289e: 0x2000, 0x289f: 0x0024, 0x28a2: 0x0024, 0x28a3: 0x0024, + 0x28a4: 0x0024, 0x28a5: 0x0024, 0x28a6: 0x2000, 0x28a7: 0x0024, 0x28a8: 0x0024, 0x28a9: 0x0024, + 0x28aa: 0x0024, 0x28ab: 0x0024, + // Block 0xa3, offset 0x28c0 + 0x28ec: 0x2000, 0x28ed: 0x2000, 0x28ee: 0x2000, 0x28ef: 0x0024, + 0x28f0: 0x0024, 0x28f1: 0x0024, 0x28f2: 0x0024, 0x28f3: 0x0024, 0x28f4: 0x0024, 0x28f5: 0x0024, + 0x28f6: 0x0024, 0x28f7: 0x0024, 0x28f8: 0x2000, 0x28f9: 0x0024, 0x28fa: 0x0024, + // Block 0xa4, offset 0x2900 + 0x2900: 0x0010, 0x2901: 0x0010, 0x2902: 0x0010, 0x2903: 0x0010, 0x2904: 0x0010, 0x2905: 0x0010, + 0x2906: 0x0010, 0x2909: 0x0010, + 0x290c: 0x0010, 0x290d: 0x0010, 0x290e: 0x0010, 0x290f: 0x0010, 0x2910: 0x0010, 0x2911: 0x0010, + 0x2912: 0x0010, 0x2913: 0x0010, 0x2915: 0x0010, 0x2916: 0x0010, + 0x2918: 0x0010, 0x2919: 0x0010, 0x291a: 0x0010, 0x291b: 0x0010, 0x291c: 0x0010, 0x291d: 0x0010, + 0x291e: 0x0010, 0x291f: 0x0010, 0x2920: 0x0010, 0x2921: 0x0010, 0x2922: 0x0010, 0x2923: 0x0010, + 0x2924: 0x0010, 0x2925: 0x0010, 0x2926: 0x0010, 0x2927: 0x0010, 0x2928: 0x0010, 0x2929: 0x0010, + 0x292a: 0x0010, 0x292b: 0x0010, 0x292c: 0x0010, 0x292d: 0x0010, 0x292e: 0x0010, 0x292f: 0x0010, + 0x2930: 0x0024, 0x2931: 0x2000, 0x2932: 0x2000, 0x2933: 0x2000, 0x2934: 0x2000, 0x2935: 0x2000, + 0x2937: 0x2000, 0x2938: 0x2000, 0x293b: 0x0024, + 0x293c: 0x0024, 0x293d: 0x0024, 0x293e: 0x0044, 0x293f: 0x0800, + // Block 0xa5, offset 0x2940 + 0x2940: 0x2000, 0x2941: 0x0800, 0x2942: 0x2000, 0x2943: 0x0024, + // Block 0xa6, offset 0x2980 + 0x2991: 0x2000, + 0x2992: 0x2000, 0x2993: 0x2000, 0x2994: 0x0024, 0x2995: 0x0024, 0x2996: 0x0024, 0x2997: 0x0024, + 0x299a: 0x0024, 0x299b: 0x0024, 0x299c: 0x2000, 0x299d: 0x2000, + 0x299e: 0x2000, 0x299f: 0x2000, 0x29a0: 0x0024, + 0x29a4: 0x2000, + // Block 0xa7, offset 0x29c0 + 0x29c0: 0x0010, 0x29c1: 0x0024, 0x29c2: 0x0024, 0x29c3: 0x0024, 0x29c4: 0x0024, 0x29c5: 0x0024, + 0x29c6: 0x0024, 0x29c7: 0x0024, 0x29c8: 0x0024, 0x29c9: 0x0024, 0x29ca: 0x0024, 0x29cb: 0x0010, + 0x29cc: 0x0010, 0x29cd: 0x0010, 0x29ce: 0x0010, 0x29cf: 0x0010, 0x29d0: 0x0010, 0x29d1: 0x0010, + 0x29d2: 0x0010, 0x29d3: 0x0010, 0x29d4: 0x0010, 0x29d5: 0x0010, 0x29d6: 0x0010, 0x29d7: 0x0010, + 0x29d8: 0x0010, 0x29d9: 0x0010, 0x29da: 0x0010, 0x29db: 0x0010, 0x29dc: 0x0010, 0x29dd: 0x0010, + 0x29de: 0x0010, 0x29df: 0x0010, 0x29e0: 0x0010, 0x29e1: 0x0010, 0x29e2: 0x0010, 0x29e3: 0x0010, + 0x29e4: 0x0010, 0x29e5: 0x0010, 0x29e6: 0x0010, 0x29e7: 0x0010, 0x29e8: 0x0010, 0x29e9: 0x0010, + 0x29ea: 0x0010, 0x29eb: 0x0010, 0x29ec: 0x0010, 0x29ed: 0x0010, 0x29ee: 0x0010, 0x29ef: 0x0010, + 0x29f0: 0x0010, 0x29f1: 0x0010, 0x29f2: 0x0010, 0x29f3: 0x0024, 0x29f4: 0x0024, 0x29f5: 0x0024, + 0x29f6: 0x0024, 0x29f7: 0x0024, 0x29f8: 0x0024, 0x29f9: 0x2000, 0x29fb: 0x0024, + 0x29fc: 0x0024, 0x29fd: 0x0024, 0x29fe: 0x0024, + // Block 0xa8, offset 0x2a00 + 0x2a07: 0x0044, + 0x2a10: 0x0010, 0x2a11: 0x0024, + 0x2a12: 0x0024, 0x2a13: 0x0024, 0x2a14: 0x0024, 0x2a15: 0x0024, 0x2a16: 0x0024, 0x2a17: 0x2000, + 0x2a18: 0x2000, 0x2a19: 0x0024, 0x2a1a: 0x0024, 0x2a1b: 0x0024, 0x2a1c: 0x0010, 0x2a1d: 0x0010, + 0x2a1e: 0x0010, 0x2a1f: 0x0010, 0x2a20: 0x0010, 0x2a21: 0x0010, 0x2a22: 0x0010, 0x2a23: 0x0010, + 0x2a24: 0x0010, 0x2a25: 0x0010, 0x2a26: 0x0010, 0x2a27: 0x0010, 0x2a28: 0x0010, 0x2a29: 0x0010, + 0x2a2a: 0x0010, 0x2a2b: 0x0010, 0x2a2c: 0x0010, 0x2a2d: 0x0010, 0x2a2e: 0x0010, 0x2a2f: 0x0010, + 0x2a30: 0x0010, 0x2a31: 0x0010, 0x2a32: 0x0010, 0x2a33: 0x0010, 0x2a34: 0x0010, 0x2a35: 0x0010, + 0x2a36: 0x0010, 0x2a37: 0x0010, 0x2a38: 0x0010, 0x2a39: 0x0010, 0x2a3a: 0x0010, 0x2a3b: 0x0010, + 0x2a3c: 0x0010, 0x2a3d: 0x0010, 0x2a3e: 0x0010, 0x2a3f: 0x0010, + // Block 0xa9, offset 0x2a40 + 0x2a40: 0x0010, 0x2a41: 0x0010, 0x2a42: 0x0010, 0x2a43: 0x0010, 0x2a44: 0x0800, 0x2a45: 0x0800, + 0x2a46: 0x0800, 0x2a47: 0x0800, 0x2a48: 0x0800, 0x2a49: 0x0800, 0x2a4a: 0x0024, 0x2a4b: 0x0024, + 0x2a4c: 0x0024, 0x2a4d: 0x0024, 0x2a4e: 0x0024, 0x2a4f: 0x0024, 0x2a50: 0x0024, 0x2a51: 0x0024, + 0x2a52: 0x0024, 0x2a53: 0x0024, 0x2a54: 0x0024, 0x2a55: 0x0024, 0x2a56: 0x0024, 0x2a57: 0x2000, + 0x2a58: 0x0024, 0x2a59: 0x0044, + // Block 0xaa, offset 0x2a80 + 0x2aa0: 0x0024, 0x2aa1: 0x2000, 0x2aa2: 0x0024, 0x2aa3: 0x0024, + 0x2aa4: 0x0024, 0x2aa5: 0x2000, 0x2aa6: 0x0024, 0x2aa7: 0x2000, + // Block 0xab, offset 0x2ac0 + 0x2aef: 0x2000, + 0x2af0: 0x0024, 0x2af1: 0x0024, 0x2af2: 0x0024, 0x2af3: 0x0024, 0x2af4: 0x0024, 0x2af5: 0x0024, + 0x2af6: 0x0024, 0x2af8: 0x0024, 0x2af9: 0x0024, 0x2afa: 0x0024, 0x2afb: 0x0024, + 0x2afc: 0x0024, 0x2afd: 0x0024, 0x2afe: 0x2000, 0x2aff: 0x0024, + // Block 0xac, offset 0x2b00 + 0x2b12: 0x0024, 0x2b13: 0x0024, 0x2b14: 0x0024, 0x2b15: 0x0024, 0x2b16: 0x0024, 0x2b17: 0x0024, + 0x2b18: 0x0024, 0x2b19: 0x0024, 0x2b1a: 0x0024, 0x2b1b: 0x0024, 0x2b1c: 0x0024, 0x2b1d: 0x0024, + 0x2b1e: 0x0024, 0x2b1f: 0x0024, 0x2b20: 0x0024, 0x2b21: 0x0024, 0x2b22: 0x0024, 0x2b23: 0x0024, + 0x2b24: 0x0024, 0x2b25: 0x0024, 0x2b26: 0x0024, 0x2b27: 0x0024, 0x2b29: 0x2000, + 0x2b2a: 0x0024, 0x2b2b: 0x0024, 0x2b2c: 0x0024, 0x2b2d: 0x0024, 0x2b2e: 0x0024, 0x2b2f: 0x0024, + 0x2b30: 0x0024, 0x2b31: 0x2000, 0x2b32: 0x0024, 0x2b33: 0x0024, 0x2b34: 0x2000, 0x2b35: 0x0024, + 0x2b36: 0x0024, + // Block 0xad, offset 0x2b40 + 0x2b71: 0x0024, 0x2b72: 0x0024, 0x2b73: 0x0024, 0x2b74: 0x0024, 0x2b75: 0x0024, + 0x2b76: 0x0024, 0x2b7a: 0x0024, + 0x2b7c: 0x0024, 0x2b7d: 0x0024, 0x2b7f: 0x0024, + // Block 0xae, offset 0x2b80 + 0x2b80: 0x0024, 0x2b81: 0x0024, 0x2b82: 0x0024, 0x2b83: 0x0024, 0x2b84: 0x0024, 0x2b85: 0x0024, + 0x2b86: 0x0800, 0x2b87: 0x0024, + // Block 0xaf, offset 0x2bc0 + 0x2bca: 0x2000, 0x2bcb: 0x2000, + 0x2bcc: 0x2000, 0x2bcd: 0x2000, 0x2bce: 0x2000, 0x2bd0: 0x0024, 0x2bd1: 0x0024, + 0x2bd3: 0x2000, 0x2bd4: 0x2000, 0x2bd5: 0x0024, 0x2bd6: 0x2000, 0x2bd7: 0x0024, + // Block 0xb0, offset 0x2c00 + 0x2c33: 0x0024, 0x2c34: 0x0024, 0x2c35: 0x2000, + 0x2c36: 0x2000, + // Block 0xb1, offset 0x2c40 + 0x2c40: 0x0024, 0x2c41: 0x0024, 0x2c42: 0x0800, 0x2c43: 0x2000, 0x2c44: 0x0010, 0x2c45: 0x0010, + 0x2c46: 0x0010, 0x2c47: 0x0010, 0x2c48: 0x0010, 0x2c49: 0x0010, 0x2c4a: 0x0010, 0x2c4b: 0x0010, + 0x2c4c: 0x0010, 0x2c4d: 0x0010, 0x2c4e: 0x0010, 0x2c4f: 0x0010, 0x2c50: 0x0010, + 0x2c52: 0x0010, 0x2c53: 0x0010, 0x2c54: 0x0010, 0x2c55: 0x0010, 0x2c56: 0x0010, 0x2c57: 0x0010, + 0x2c58: 0x0010, 0x2c59: 0x0010, 0x2c5a: 0x0010, 0x2c5b: 0x0010, 0x2c5c: 0x0010, 0x2c5d: 0x0010, + 0x2c5e: 0x0010, 0x2c5f: 0x0010, 0x2c60: 0x0010, 0x2c61: 0x0010, 0x2c62: 0x0010, 0x2c63: 0x0010, + 0x2c64: 0x0010, 0x2c65: 0x0010, 0x2c66: 0x0010, 0x2c67: 0x0010, 0x2c68: 0x0010, 0x2c69: 0x0010, + 0x2c6a: 0x0010, 0x2c6b: 0x0010, 0x2c6c: 0x0010, 0x2c6d: 0x0010, 0x2c6e: 0x0010, 0x2c6f: 0x0010, + 0x2c70: 0x0010, 0x2c71: 0x0010, 0x2c72: 0x0010, 0x2c73: 0x0010, 0x2c74: 0x2000, 0x2c75: 0x2000, + 0x2c76: 0x0024, 0x2c77: 0x0024, 0x2c78: 0x0024, 0x2c79: 0x0024, 0x2c7a: 0x0024, + 0x2c7e: 0x2000, 0x2c7f: 0x2000, + // Block 0xb2, offset 0x2c80 + 0x2c80: 0x0024, 0x2c81: 0x0024, 0x2c82: 0x0044, + 0x2c9a: 0x0024, + // Block 0xb3, offset 0x2cc0 + 0x2cf0: 0x0002, 0x2cf1: 0x0002, 0x2cf2: 0x0002, 0x2cf3: 0x0002, 0x2cf4: 0x0002, 0x2cf5: 0x0002, + 0x2cf6: 0x0002, 0x2cf7: 0x0002, 0x2cf8: 0x0002, 0x2cf9: 0x0002, 0x2cfa: 0x0002, 0x2cfb: 0x0002, + 0x2cfc: 0x0002, 0x2cfd: 0x0002, 0x2cfe: 0x0002, 0x2cff: 0x0002, + // Block 0xb4, offset 0x2d00 + 0x2d00: 0x0024, + 0x2d07: 0x0024, 0x2d08: 0x0024, 0x2d09: 0x0024, 0x2d0a: 0x0024, 0x2d0b: 0x0024, + 0x2d0c: 0x0024, 0x2d0d: 0x0024, 0x2d0e: 0x0024, 0x2d0f: 0x0024, 0x2d10: 0x0024, 0x2d11: 0x0024, + 0x2d12: 0x0024, 0x2d13: 0x0024, 0x2d14: 0x0024, 0x2d15: 0x0024, + // Block 0xb5, offset 0x2d40 + 0x2d5e: 0x0024, 0x2d5f: 0x0024, 0x2d60: 0x0024, 0x2d61: 0x0024, 0x2d62: 0x0024, 0x2d63: 0x0024, + 0x2d64: 0x0024, 0x2d65: 0x0024, 0x2d66: 0x0024, 0x2d67: 0x0024, 0x2d68: 0x0024, 0x2d69: 0x0024, + 0x2d6a: 0x2000, 0x2d6b: 0x2000, 0x2d6c: 0x2000, 0x2d6d: 0x0024, 0x2d6e: 0x0024, 0x2d6f: 0x0024, + // Block 0xb6, offset 0x2d80 + 0x2db0: 0x0024, 0x2db1: 0x0024, 0x2db2: 0x0024, 0x2db3: 0x0024, 0x2db4: 0x0024, + // Block 0xb7, offset 0x2dc0 + 0x2df0: 0x0024, 0x2df1: 0x0024, 0x2df2: 0x0024, 0x2df3: 0x0024, 0x2df4: 0x0024, 0x2df5: 0x0024, + 0x2df6: 0x0024, + // Block 0xb8, offset 0x2e00 + 0x2e23: 0x8000, + 0x2e27: 0x8000, 0x2e28: 0x8000, 0x2e29: 0x8000, + 0x2e2a: 0x8000, + // Block 0xb9, offset 0x2e40 + 0x2e4f: 0x0024, 0x2e51: 0x2000, + 0x2e52: 0x2000, 0x2e53: 0x2000, 0x2e54: 0x2000, 0x2e55: 0x2000, 0x2e56: 0x2000, 0x2e57: 0x2000, + 0x2e58: 0x2000, 0x2e59: 0x2000, 0x2e5a: 0x2000, 0x2e5b: 0x2000, 0x2e5c: 0x2000, 0x2e5d: 0x2000, + 0x2e5e: 0x2000, 0x2e5f: 0x2000, 0x2e60: 0x2000, 0x2e61: 0x2000, 0x2e62: 0x2000, 0x2e63: 0x2000, + 0x2e64: 0x2000, 0x2e65: 0x2000, 0x2e66: 0x2000, 0x2e67: 0x2000, 0x2e68: 0x2000, 0x2e69: 0x2000, + 0x2e6a: 0x2000, 0x2e6b: 0x2000, 0x2e6c: 0x2000, 0x2e6d: 0x2000, 0x2e6e: 0x2000, 0x2e6f: 0x2000, + 0x2e70: 0x2000, 0x2e71: 0x2000, 0x2e72: 0x2000, 0x2e73: 0x2000, 0x2e74: 0x2000, 0x2e75: 0x2000, + 0x2e76: 0x2000, 0x2e77: 0x2000, 0x2e78: 0x2000, 0x2e79: 0x2000, 0x2e7a: 0x2000, 0x2e7b: 0x2000, + 0x2e7c: 0x2000, 0x2e7d: 0x2000, 0x2e7e: 0x2000, 0x2e7f: 0x2000, + // Block 0xba, offset 0x2e80 + 0x2e80: 0x2000, 0x2e81: 0x2000, 0x2e82: 0x2000, 0x2e83: 0x2000, 0x2e84: 0x2000, 0x2e85: 0x2000, + 0x2e86: 0x2000, 0x2e87: 0x2000, + 0x2e8f: 0x0024, 0x2e90: 0x0024, 0x2e91: 0x0024, + 0x2e92: 0x0024, + // Block 0xbb, offset 0x2ec0 + 0x2ee4: 0x0024, + 0x2ef0: 0x0024, 0x2ef1: 0x0024, + // Block 0xbc, offset 0x2f00 + 0x2f1d: 0x0024, + 0x2f1e: 0x0024, 0x2f20: 0x0002, 0x2f21: 0x0002, 0x2f22: 0x0002, 0x2f23: 0x0002, + // Block 0xbd, offset 0x2f40 + 0x2f40: 0x0024, 0x2f41: 0x0024, 0x2f42: 0x0024, 0x2f43: 0x0024, 0x2f44: 0x0024, 0x2f45: 0x0024, + 0x2f46: 0x0024, 0x2f47: 0x0024, 0x2f48: 0x0024, 0x2f49: 0x0024, 0x2f4a: 0x0024, 0x2f4b: 0x0024, + 0x2f4c: 0x0024, 0x2f4d: 0x0024, 0x2f4e: 0x0024, 0x2f4f: 0x0024, 0x2f50: 0x0024, 0x2f51: 0x0024, + 0x2f52: 0x0024, 0x2f53: 0x0024, 0x2f54: 0x0024, 0x2f55: 0x0024, 0x2f56: 0x0024, 0x2f57: 0x0024, + 0x2f58: 0x0024, 0x2f59: 0x0024, 0x2f5a: 0x0024, 0x2f5b: 0x0024, 0x2f5c: 0x0024, 0x2f5d: 0x0024, + 0x2f5e: 0x0024, 0x2f5f: 0x0024, 0x2f60: 0x0024, 0x2f61: 0x0024, 0x2f62: 0x0024, 0x2f63: 0x0024, + 0x2f64: 0x0024, 0x2f65: 0x0024, 0x2f66: 0x0024, 0x2f67: 0x0024, 0x2f68: 0x0024, 0x2f69: 0x0024, + 0x2f6a: 0x0024, 0x2f6b: 0x0024, 0x2f6c: 0x0024, 0x2f6d: 0x0024, + 0x2f70: 0x0024, 0x2f71: 0x0024, 0x2f72: 0x0024, 0x2f73: 0x0024, 0x2f74: 0x0024, 0x2f75: 0x0024, + 0x2f76: 0x0024, 0x2f77: 0x0024, 0x2f78: 0x0024, 0x2f79: 0x0024, 0x2f7a: 0x0024, 0x2f7b: 0x0024, + 0x2f7c: 0x0024, 0x2f7d: 0x0024, 0x2f7e: 0x0024, 0x2f7f: 0x0024, + // Block 0xbe, offset 0x2f80 + 0x2f80: 0x0024, 0x2f81: 0x0024, 0x2f82: 0x0024, 0x2f83: 0x0024, 0x2f84: 0x0024, 0x2f85: 0x0024, + 0x2f86: 0x0024, + // Block 0xbf, offset 0x2fc0 + 0x2fe5: 0x0024, 0x2fe6: 0x0024, 0x2fe7: 0x0024, 0x2fe8: 0x0024, 0x2fe9: 0x0024, + 0x2fed: 0x0024, 0x2fee: 0x0024, 0x2fef: 0x0024, + 0x2ff0: 0x0024, 0x2ff1: 0x0024, 0x2ff2: 0x0024, 0x2ff3: 0x0002, 0x2ff4: 0x0002, 0x2ff5: 0x0002, + 0x2ff6: 0x0002, 0x2ff7: 0x0002, 0x2ff8: 0x0002, 0x2ff9: 0x0002, 0x2ffa: 0x0002, 0x2ffb: 0x0024, + 0x2ffc: 0x0024, 0x2ffd: 0x0024, 0x2ffe: 0x0024, 0x2fff: 0x0024, + // Block 0xc0, offset 0x3000 + 0x3000: 0x0024, 0x3001: 0x0024, 0x3002: 0x0024, 0x3005: 0x0024, + 0x3006: 0x0024, 0x3007: 0x0024, 0x3008: 0x0024, 0x3009: 0x0024, 0x300a: 0x0024, 0x300b: 0x0024, + 0x302a: 0x0024, 0x302b: 0x0024, 0x302c: 0x0024, 0x302d: 0x0024, + // Block 0xc1, offset 0x3040 + 0x3042: 0x0024, 0x3043: 0x0024, 0x3044: 0x0024, + // Block 0xc2, offset 0x3080 + 0x3080: 0x0024, 0x3081: 0x0024, 0x3082: 0x0024, 0x3083: 0x0024, 0x3084: 0x0024, 0x3085: 0x0024, + 0x3086: 0x0024, 0x3087: 0x0024, 0x3088: 0x0024, 0x3089: 0x0024, 0x308a: 0x0024, 0x308b: 0x0024, + 0x308c: 0x0024, 0x308d: 0x0024, 0x308e: 0x0024, 0x308f: 0x0024, 0x3090: 0x0024, 0x3091: 0x0024, + 0x3092: 0x0024, 0x3093: 0x0024, 0x3094: 0x0024, 0x3095: 0x0024, 0x3096: 0x0024, 0x3097: 0x0024, + 0x3098: 0x0024, 0x3099: 0x0024, 0x309a: 0x0024, 0x309b: 0x0024, 0x309c: 0x0024, 0x309d: 0x0024, + 0x309e: 0x0024, 0x309f: 0x0024, 0x30a0: 0x0024, 0x30a1: 0x0024, 0x30a2: 0x0024, 0x30a3: 0x0024, + 0x30a4: 0x0024, 0x30a5: 0x0024, 0x30a6: 0x0024, 0x30a7: 0x0024, 0x30a8: 0x0024, 0x30a9: 0x0024, + 0x30aa: 0x0024, 0x30ab: 0x0024, 0x30ac: 0x0024, 0x30ad: 0x0024, 0x30ae: 0x0024, 0x30af: 0x0024, + 0x30b0: 0x0024, 0x30b1: 0x0024, 0x30b2: 0x0024, 0x30b3: 0x0024, 0x30b4: 0x0024, 0x30b5: 0x0024, + 0x30b6: 0x0024, 0x30bb: 0x0024, + 0x30bc: 0x0024, 0x30bd: 0x0024, 0x30be: 0x0024, 0x30bf: 0x0024, + // Block 0xc3, offset 0x30c0 + 0x30c0: 0x0024, 0x30c1: 0x0024, 0x30c2: 0x0024, 0x30c3: 0x0024, 0x30c4: 0x0024, 0x30c5: 0x0024, + 0x30c6: 0x0024, 0x30c7: 0x0024, 0x30c8: 0x0024, 0x30c9: 0x0024, 0x30ca: 0x0024, 0x30cb: 0x0024, + 0x30cc: 0x0024, 0x30cd: 0x0024, 0x30ce: 0x0024, 0x30cf: 0x0024, 0x30d0: 0x0024, 0x30d1: 0x0024, + 0x30d2: 0x0024, 0x30d3: 0x0024, 0x30d4: 0x0024, 0x30d5: 0x0024, 0x30d6: 0x0024, 0x30d7: 0x0024, + 0x30d8: 0x0024, 0x30d9: 0x0024, 0x30da: 0x0024, 0x30db: 0x0024, 0x30dc: 0x0024, 0x30dd: 0x0024, + 0x30de: 0x0024, 0x30df: 0x0024, 0x30e0: 0x0024, 0x30e1: 0x0024, 0x30e2: 0x0024, 0x30e3: 0x0024, + 0x30e4: 0x0024, 0x30e5: 0x0024, 0x30e6: 0x0024, 0x30e7: 0x0024, 0x30e8: 0x0024, 0x30e9: 0x0024, + 0x30ea: 0x0024, 0x30eb: 0x0024, 0x30ec: 0x0024, + 0x30f5: 0x0024, + // Block 0xc4, offset 0x3100 + 0x3104: 0x0024, + 0x311b: 0x0024, 0x311c: 0x0024, 0x311d: 0x0024, + 0x311e: 0x0024, 0x311f: 0x0024, 0x3121: 0x0024, 0x3122: 0x0024, 0x3123: 0x0024, + 0x3124: 0x0024, 0x3125: 0x0024, 0x3126: 0x0024, 0x3127: 0x0024, 0x3128: 0x0024, 0x3129: 0x0024, + 0x312a: 0x0024, 0x312b: 0x0024, 0x312c: 0x0024, 0x312d: 0x0024, 0x312e: 0x0024, 0x312f: 0x0024, + // Block 0xc5, offset 0x3140 + 0x3140: 0x0024, 0x3141: 0x0024, 0x3142: 0x0024, 0x3143: 0x0024, 0x3144: 0x0024, 0x3145: 0x0024, + 0x3146: 0x0024, 0x3148: 0x0024, 0x3149: 0x0024, 0x314a: 0x0024, 0x314b: 0x0024, + 0x314c: 0x0024, 0x314d: 0x0024, 0x314e: 0x0024, 0x314f: 0x0024, 0x3150: 0x0024, 0x3151: 0x0024, + 0x3152: 0x0024, 0x3153: 0x0024, 0x3154: 0x0024, 0x3155: 0x0024, 0x3156: 0x0024, 0x3157: 0x0024, + 0x3158: 0x0024, 0x315b: 0x0024, 0x315c: 0x0024, 0x315d: 0x0024, + 0x315e: 0x0024, 0x315f: 0x0024, 0x3160: 0x0024, 0x3161: 0x0024, 0x3163: 0x0024, + 0x3164: 0x0024, 0x3166: 0x0024, 0x3167: 0x0024, 0x3168: 0x0024, 0x3169: 0x0024, + 0x316a: 0x0024, + // Block 0xc6, offset 0x3180 + 0x318f: 0x0024, + // Block 0xc7, offset 0x31c0 + 0x31ee: 0x0024, + // Block 0xc8, offset 0x3200 + 0x322c: 0x0024, 0x322d: 0x0024, 0x322e: 0x0024, 0x322f: 0x0024, + // Block 0xc9, offset 0x3240 + 0x326e: 0x0024, 0x326f: 0x0024, + // Block 0xca, offset 0x3280 + 0x32a3: 0x0024, + 0x32a6: 0x0024, + 0x32ae: 0x0024, 0x32af: 0x0024, + 0x32b5: 0x0024, + // Block 0xcb, offset 0x32c0 + 0x32d0: 0x0024, 0x32d1: 0x0024, + 0x32d2: 0x0024, 0x32d3: 0x0024, 0x32d4: 0x0024, 0x32d5: 0x0024, 0x32d6: 0x0024, + // Block 0xcc, offset 0x3300 + 0x3304: 0x0024, 0x3305: 0x0024, + 0x3306: 0x0024, 0x3307: 0x0024, 0x3308: 0x0024, 0x3309: 0x0024, 0x330a: 0x0024, + // Block 0xcd, offset 0x3340 + 0x3344: 0x0008, + 0x336c: 0x0008, 0x336d: 0x0008, 0x336e: 0x0008, 0x336f: 0x0008, + // Block 0xce, offset 0x3380 + 0x3394: 0x0008, 0x3395: 0x0008, 0x3396: 0x0008, 0x3397: 0x0008, + 0x3398: 0x0008, 0x3399: 0x0008, 0x339a: 0x0008, 0x339b: 0x0008, 0x339c: 0x0008, 0x339d: 0x0008, + 0x339e: 0x0008, 0x339f: 0x0008, + 0x33af: 0x0008, + 0x33b0: 0x0008, + // Block 0xcf, offset 0x33c0 + 0x33c0: 0x0008, + 0x33cf: 0x0008, 0x33d0: 0x0008, + 0x33f6: 0x0008, 0x33f7: 0x0008, 0x33f8: 0x0008, 0x33f9: 0x0008, 0x33fa: 0x0008, 0x33fb: 0x0008, + 0x33fc: 0x0008, 0x33fd: 0x0008, 0x33fe: 0x0008, 0x33ff: 0x0008, + // Block 0xd0, offset 0x3400 + 0x3430: 0x0008, 0x3431: 0x0008, + 0x343e: 0x0008, 0x343f: 0x0008, + // Block 0xd1, offset 0x3440 + 0x344e: 0x0008, 0x3451: 0x0008, + 0x3452: 0x0008, 0x3453: 0x0008, 0x3454: 0x0008, 0x3455: 0x0008, 0x3456: 0x0008, 0x3457: 0x0008, + 0x3458: 0x0008, 0x3459: 0x0008, 0x345a: 0x0008, + 0x346e: 0x0008, 0x346f: 0x0008, + 0x3470: 0x0008, 0x3471: 0x0008, 0x3472: 0x0008, 0x3473: 0x0008, 0x3474: 0x0008, 0x3475: 0x0008, + 0x3476: 0x0008, 0x3477: 0x0008, 0x3478: 0x0008, 0x3479: 0x0008, 0x347a: 0x0008, 0x347b: 0x0008, + 0x347c: 0x0008, 0x347d: 0x0008, 0x347e: 0x0008, 0x347f: 0x0008, + // Block 0xd2, offset 0x3480 + 0x3480: 0x0008, 0x3481: 0x0008, 0x3482: 0x0008, 0x3483: 0x0008, 0x3484: 0x0008, 0x3485: 0x0008, + 0x3486: 0x0008, 0x3487: 0x0008, 0x3488: 0x0008, 0x3489: 0x0008, 0x348a: 0x0008, 0x348b: 0x0008, + 0x348c: 0x0008, 0x348d: 0x0008, 0x348e: 0x0008, 0x348f: 0x0008, 0x3490: 0x0008, 0x3491: 0x0008, + 0x3492: 0x0008, 0x3493: 0x0008, 0x3494: 0x0008, 0x3495: 0x0008, 0x3496: 0x0008, 0x3497: 0x0008, + 0x3498: 0x0008, 0x3499: 0x0008, 0x349a: 0x0008, 0x349b: 0x0008, 0x349c: 0x0008, 0x349d: 0x0008, + 0x349e: 0x0008, 0x349f: 0x0008, 0x34a0: 0x0008, 0x34a1: 0x0008, 0x34a2: 0x0008, 0x34a3: 0x0008, + 0x34a4: 0x0008, 0x34a5: 0x0008, 0x34a6: 0x1000, 0x34a7: 0x1000, 0x34a8: 0x1000, 0x34a9: 0x1000, + 0x34aa: 0x1000, 0x34ab: 0x1000, 0x34ac: 0x1000, 0x34ad: 0x1000, 0x34ae: 0x1000, 0x34af: 0x1000, + 0x34b0: 0x1000, 0x34b1: 0x1000, 0x34b2: 0x1000, 0x34b3: 0x1000, 0x34b4: 0x1000, 0x34b5: 0x1000, + 0x34b6: 0x1000, 0x34b7: 0x1000, 0x34b8: 0x1000, 0x34b9: 0x1000, 0x34ba: 0x1000, 0x34bb: 0x1000, + 0x34bc: 0x1000, 0x34bd: 0x1000, 0x34be: 0x1000, 0x34bf: 0x1000, + // Block 0xd3, offset 0x34c0 + 0x34c1: 0x0008, 0x34c2: 0x0008, 0x34c3: 0x0008, 0x34c4: 0x0008, 0x34c5: 0x0008, + 0x34c6: 0x0008, 0x34c7: 0x0008, 0x34c8: 0x0008, 0x34c9: 0x0008, 0x34ca: 0x0008, 0x34cb: 0x0008, + 0x34cc: 0x0008, 0x34cd: 0x0008, 0x34ce: 0x0008, 0x34cf: 0x0008, + 0x34da: 0x0008, + 0x34ef: 0x0008, + 0x34f2: 0x0008, 0x34f3: 0x0008, 0x34f4: 0x0008, 0x34f5: 0x0008, + 0x34f6: 0x0008, 0x34f7: 0x0008, 0x34f8: 0x0008, 0x34f9: 0x0008, 0x34fa: 0x0008, + 0x34fc: 0x0008, 0x34fd: 0x0008, 0x34fe: 0x0008, 0x34ff: 0x0008, + // Block 0xd4, offset 0x3500 + 0x3509: 0x0008, 0x350a: 0x0008, 0x350b: 0x0008, + 0x350c: 0x0008, 0x350d: 0x0008, 0x350e: 0x0008, 0x350f: 0x0008, 0x3510: 0x0008, 0x3511: 0x0008, + 0x3512: 0x0008, 0x3513: 0x0008, 0x3514: 0x0008, 0x3515: 0x0008, 0x3516: 0x0008, 0x3517: 0x0008, + 0x3518: 0x0008, 0x3519: 0x0008, 0x351a: 0x0008, 0x351b: 0x0008, 0x351c: 0x0008, 0x351d: 0x0008, + 0x351e: 0x0008, 0x351f: 0x0008, + 0x3526: 0x0008, 0x3527: 0x0008, 0x3528: 0x0008, 0x3529: 0x0008, + 0x352a: 0x0008, 0x352b: 0x0008, 0x352c: 0x0008, 0x352d: 0x0008, 0x352e: 0x0008, 0x352f: 0x0008, + 0x3530: 0x0008, 0x3531: 0x0008, 0x3532: 0x0008, 0x3533: 0x0008, 0x3534: 0x0008, 0x3535: 0x0008, + 0x3536: 0x0008, 0x3537: 0x0008, 0x3538: 0x0008, 0x3539: 0x0008, 0x353a: 0x0008, 0x353b: 0x0008, + 0x353c: 0x0008, 0x353d: 0x0008, 0x353e: 0x0008, 0x353f: 0x0008, + // Block 0xd5, offset 0x3540 + 0x3540: 0x0008, 0x3541: 0x0008, 0x3542: 0x0008, 0x3543: 0x0008, 0x3544: 0x0008, 0x3545: 0x0008, + 0x3546: 0x0008, 0x3547: 0x0008, 0x3548: 0x0008, 0x3549: 0x0008, 0x354a: 0x0008, 0x354b: 0x0008, + 0x354c: 0x0008, 0x354d: 0x0008, 0x354e: 0x0008, 0x354f: 0x0008, 0x3550: 0x0008, 0x3551: 0x0008, + 0x3552: 0x0008, 0x3553: 0x0008, 0x3554: 0x0008, 0x3555: 0x0008, 0x3556: 0x0008, 0x3557: 0x0008, + 0x3558: 0x0008, 0x3559: 0x0008, 0x355a: 0x0008, 0x355b: 0x0008, 0x355c: 0x0008, 0x355d: 0x0008, + 0x355e: 0x0008, 0x355f: 0x0008, 0x3560: 0x0008, 0x3561: 0x0008, 0x3562: 0x0008, 0x3563: 0x0008, + 0x3564: 0x0008, 0x3565: 0x0008, 0x3566: 0x0008, 0x3567: 0x0008, 0x3568: 0x0008, 0x3569: 0x0008, + 0x356a: 0x0008, 0x356b: 0x0008, 0x356c: 0x0008, 0x356d: 0x0008, 0x356e: 0x0008, 0x356f: 0x0008, + 0x3570: 0x0008, 0x3571: 0x0008, 0x3572: 0x0008, 0x3573: 0x0008, 0x3574: 0x0008, 0x3575: 0x0008, + 0x3576: 0x0008, 0x3577: 0x0008, 0x3578: 0x0008, 0x3579: 0x0008, 0x357a: 0x0008, 0x357b: 0x0008, + 0x357c: 0x0008, 0x357d: 0x0008, 0x357e: 0x0008, 0x357f: 0x0008, + // Block 0xd6, offset 0x3580 + 0x3580: 0x0008, 0x3581: 0x0008, 0x3582: 0x0008, 0x3583: 0x0008, 0x3584: 0x0008, 0x3585: 0x0008, + 0x3586: 0x0008, 0x3587: 0x0008, 0x3588: 0x0008, 0x3589: 0x0008, 0x358a: 0x0008, 0x358b: 0x0008, + 0x358c: 0x0008, 0x358d: 0x0008, 0x358e: 0x0008, 0x358f: 0x0008, 0x3590: 0x0008, 0x3591: 0x0008, + 0x3592: 0x0008, 0x3593: 0x0008, 0x3594: 0x0008, 0x3595: 0x0008, 0x3596: 0x0008, 0x3597: 0x0008, + 0x3598: 0x0008, 0x3599: 0x0008, 0x359a: 0x0008, 0x359b: 0x0008, 0x359c: 0x0008, 0x359d: 0x0008, + 0x359e: 0x0008, 0x359f: 0x0008, 0x35a0: 0x0008, 0x35a1: 0x0008, + 0x35a4: 0x0008, 0x35a5: 0x0008, 0x35a6: 0x0008, 0x35a7: 0x0008, 0x35a8: 0x0008, 0x35a9: 0x0008, + 0x35aa: 0x0008, 0x35ab: 0x0008, 0x35ac: 0x0008, 0x35ad: 0x0008, 0x35ae: 0x0008, 0x35af: 0x0008, + 0x35b0: 0x0008, 0x35b1: 0x0008, 0x35b2: 0x0008, 0x35b3: 0x0008, 0x35b4: 0x0008, 0x35b5: 0x0008, + 0x35b6: 0x0008, 0x35b7: 0x0008, 0x35b8: 0x0008, 0x35b9: 0x0008, 0x35ba: 0x0008, 0x35bb: 0x0008, + 0x35bc: 0x0008, 0x35bd: 0x0008, 0x35be: 0x0008, 0x35bf: 0x0008, + // Block 0xd7, offset 0x35c0 + 0x35c0: 0x0008, 0x35c1: 0x0008, 0x35c2: 0x0008, 0x35c3: 0x0008, 0x35c4: 0x0008, 0x35c5: 0x0008, + 0x35c6: 0x0008, 0x35c7: 0x0008, 0x35c8: 0x0008, 0x35c9: 0x0008, 0x35ca: 0x0008, 0x35cb: 0x0008, + 0x35cc: 0x0008, 0x35cd: 0x0008, 0x35ce: 0x0008, 0x35cf: 0x0008, 0x35d0: 0x0008, 0x35d1: 0x0008, + 0x35d2: 0x0008, 0x35d3: 0x0008, 0x35d6: 0x0008, 0x35d7: 0x0008, + 0x35d9: 0x0008, 0x35da: 0x0008, 0x35db: 0x0008, + 0x35de: 0x0008, 0x35df: 0x0008, 0x35e0: 0x0008, 0x35e1: 0x0008, 0x35e2: 0x0008, 0x35e3: 0x0008, + 0x35e4: 0x0008, 0x35e5: 0x0008, 0x35e6: 0x0008, 0x35e7: 0x0008, 0x35e8: 0x0008, 0x35e9: 0x0008, + 0x35ea: 0x0008, 0x35eb: 0x0008, 0x35ec: 0x0008, 0x35ed: 0x0008, 0x35ee: 0x0008, 0x35ef: 0x0008, + 0x35f0: 0x0008, 0x35f1: 0x0008, 0x35f2: 0x0008, 0x35f3: 0x0008, 0x35f4: 0x0008, 0x35f5: 0x0008, + 0x35f6: 0x0008, 0x35f7: 0x0008, 0x35f8: 0x0008, 0x35f9: 0x0008, 0x35fa: 0x0008, 0x35fb: 0x0008, + 0x35fc: 0x0008, 0x35fd: 0x0008, 0x35fe: 0x0008, 0x35ff: 0x0008, + // Block 0xd8, offset 0x3600 + 0x3600: 0x0008, 0x3601: 0x0008, 0x3602: 0x0008, 0x3603: 0x0008, 0x3604: 0x0008, 0x3605: 0x0008, + 0x3606: 0x0008, 0x3607: 0x0008, 0x3608: 0x0008, 0x3609: 0x0008, 0x360a: 0x0008, 0x360b: 0x0008, + 0x360c: 0x0008, 0x360d: 0x0008, 0x360e: 0x0008, 0x360f: 0x0008, 0x3610: 0x0008, 0x3611: 0x0008, + 0x3612: 0x0008, 0x3613: 0x0008, 0x3614: 0x0008, 0x3615: 0x0008, 0x3616: 0x0008, 0x3617: 0x0008, + 0x3618: 0x0008, 0x3619: 0x0008, 0x361a: 0x0008, 0x361b: 0x0008, 0x361c: 0x0008, 0x361d: 0x0008, + 0x361e: 0x0008, 0x361f: 0x0008, 0x3620: 0x0008, 0x3621: 0x0008, 0x3622: 0x0008, 0x3623: 0x0008, + 0x3624: 0x0008, 0x3625: 0x0008, 0x3626: 0x0008, 0x3627: 0x0008, 0x3628: 0x0008, 0x3629: 0x0008, + 0x362a: 0x0008, 0x362b: 0x0008, 0x362c: 0x0008, 0x362d: 0x0008, 0x362e: 0x0008, 0x362f: 0x0008, + 0x3630: 0x0008, 0x3633: 0x0008, 0x3634: 0x0008, 0x3635: 0x0008, + 0x3637: 0x0008, 0x3638: 0x0008, 0x3639: 0x0008, 0x363a: 0x0008, 0x363b: 0x0024, + 0x363c: 0x0024, 0x363d: 0x0024, 0x363e: 0x0024, 0x363f: 0x0024, + // Block 0xd9, offset 0x3640 + 0x3640: 0x0008, 0x3641: 0x0008, 0x3642: 0x0008, 0x3643: 0x0008, 0x3644: 0x0008, 0x3645: 0x0008, + 0x3646: 0x0008, 0x3647: 0x0008, 0x3648: 0x0008, 0x3649: 0x0008, 0x364a: 0x0008, 0x364b: 0x0008, + 0x364c: 0x0008, 0x364d: 0x0008, 0x364e: 0x0008, 0x364f: 0x0008, 0x3650: 0x0008, 0x3651: 0x0008, + 0x3652: 0x0008, 0x3653: 0x0008, 0x3654: 0x0008, 0x3655: 0x0008, 0x3656: 0x0008, 0x3657: 0x0008, + 0x3658: 0x0008, 0x3659: 0x0008, 0x365a: 0x0008, 0x365b: 0x0008, 0x365c: 0x0008, 0x365d: 0x0008, + 0x365e: 0x0008, 0x365f: 0x0008, 0x3660: 0x0008, 0x3661: 0x0008, 0x3662: 0x0008, 0x3663: 0x0008, + 0x3664: 0x0008, 0x3665: 0x0008, 0x3666: 0x0008, 0x3667: 0x0008, 0x3668: 0x0008, 0x3669: 0x0008, + 0x366a: 0x0008, 0x366b: 0x0008, 0x366c: 0x0008, 0x366d: 0x0008, 0x366e: 0x0008, 0x366f: 0x0008, + 0x3670: 0x0008, 0x3671: 0x0008, 0x3672: 0x0008, 0x3673: 0x0008, 0x3674: 0x0008, 0x3675: 0x0008, + 0x3676: 0x0008, 0x3677: 0x0008, 0x3678: 0x0008, 0x3679: 0x0008, 0x367a: 0x0008, 0x367b: 0x0008, + 0x367c: 0x0008, 0x367d: 0x0008, 0x367f: 0x0008, + // Block 0xda, offset 0x3680 + 0x3680: 0x0008, 0x3681: 0x0008, 0x3682: 0x0008, 0x3683: 0x0008, 0x3684: 0x0008, 0x3685: 0x0008, + 0x3686: 0x0008, 0x3687: 0x0008, 0x3688: 0x0008, 0x3689: 0x0008, 0x368a: 0x0008, 0x368b: 0x0008, + 0x368c: 0x0008, 0x368d: 0x0008, 0x368e: 0x0008, 0x368f: 0x0008, 0x3690: 0x0008, 0x3691: 0x0008, + 0x3692: 0x0008, 0x3693: 0x0008, 0x3694: 0x0008, 0x3695: 0x0008, 0x3696: 0x0008, 0x3697: 0x0008, + 0x3698: 0x0008, 0x3699: 0x0008, 0x369a: 0x0008, 0x369b: 0x0008, 0x369c: 0x0008, 0x369d: 0x0008, + 0x369e: 0x0008, 0x369f: 0x0008, 0x36a0: 0x0008, 0x36a1: 0x0008, 0x36a2: 0x0008, 0x36a3: 0x0008, + 0x36a4: 0x0008, 0x36a5: 0x0008, 0x36a6: 0x0008, 0x36a7: 0x0008, 0x36a8: 0x0008, 0x36a9: 0x0008, + 0x36aa: 0x0008, 0x36ab: 0x0008, 0x36ac: 0x0008, 0x36ad: 0x0008, 0x36ae: 0x0008, 0x36af: 0x0008, + 0x36b0: 0x0008, 0x36b1: 0x0008, 0x36b2: 0x0008, 0x36b3: 0x0008, 0x36b4: 0x0008, 0x36b5: 0x0008, + 0x36b6: 0x0008, 0x36b7: 0x0008, 0x36b8: 0x0008, 0x36b9: 0x0008, 0x36ba: 0x0008, 0x36bb: 0x0008, + 0x36bc: 0x0008, 0x36bd: 0x0008, + // Block 0xdb, offset 0x36c0 + 0x36c9: 0x0008, 0x36ca: 0x0008, 0x36cb: 0x0008, + 0x36cc: 0x0008, 0x36cd: 0x0008, 0x36ce: 0x0008, 0x36d0: 0x0008, 0x36d1: 0x0008, + 0x36d2: 0x0008, 0x36d3: 0x0008, 0x36d4: 0x0008, 0x36d5: 0x0008, 0x36d6: 0x0008, 0x36d7: 0x0008, + 0x36d8: 0x0008, 0x36d9: 0x0008, 0x36da: 0x0008, 0x36db: 0x0008, 0x36dc: 0x0008, 0x36dd: 0x0008, + 0x36de: 0x0008, 0x36df: 0x0008, 0x36e0: 0x0008, 0x36e1: 0x0008, 0x36e2: 0x0008, 0x36e3: 0x0008, + 0x36e4: 0x0008, 0x36e5: 0x0008, 0x36e6: 0x0008, 0x36e7: 0x0008, + 0x36ef: 0x0008, + 0x36f0: 0x0008, 0x36f3: 0x0008, 0x36f4: 0x0008, 0x36f5: 0x0008, + 0x36f6: 0x0008, 0x36f7: 0x0008, 0x36f8: 0x0008, 0x36f9: 0x0008, 0x36fa: 0x0008, + // Block 0xdc, offset 0x3700 + 0x3707: 0x0008, 0x370a: 0x0008, 0x370b: 0x0008, + 0x370c: 0x0008, 0x370d: 0x0008, 0x3710: 0x0008, + 0x3715: 0x0008, 0x3716: 0x0008, + 0x3724: 0x0008, 0x3725: 0x0008, 0x3728: 0x0008, + 0x3731: 0x0008, 0x3732: 0x0008, + 0x373c: 0x0008, + // Block 0xdd, offset 0x3740 + 0x3742: 0x0008, 0x3743: 0x0008, 0x3744: 0x0008, + 0x3751: 0x0008, + 0x3752: 0x0008, 0x3753: 0x0008, + 0x375c: 0x0008, 0x375d: 0x0008, + 0x375e: 0x0008, 0x3761: 0x0008, 0x3763: 0x0008, + 0x3768: 0x0008, + 0x376f: 0x0008, + 0x3773: 0x0008, + 0x377a: 0x0008, 0x377b: 0x0008, + 0x377c: 0x0008, 0x377d: 0x0008, 0x377e: 0x0008, 0x377f: 0x0008, + // Block 0xde, offset 0x3780 + 0x3780: 0x0008, 0x3781: 0x0008, 0x3782: 0x0008, 0x3783: 0x0008, 0x3784: 0x0008, 0x3785: 0x0008, + 0x3786: 0x0008, 0x3787: 0x0008, 0x3788: 0x0008, 0x3789: 0x0008, 0x378a: 0x0008, 0x378b: 0x0008, + 0x378c: 0x0008, 0x378d: 0x0008, 0x378e: 0x0008, 0x378f: 0x0008, + // Block 0xdf, offset 0x37c0 + 0x37c0: 0x0008, 0x37c1: 0x0008, 0x37c2: 0x0008, 0x37c3: 0x0008, 0x37c4: 0x0008, 0x37c5: 0x0008, + 0x37cb: 0x0008, + 0x37cc: 0x0008, 0x37cd: 0x0008, 0x37ce: 0x0008, 0x37cf: 0x0008, 0x37d0: 0x0008, 0x37d1: 0x0008, + 0x37d2: 0x0008, 0x37d5: 0x0008, 0x37d6: 0x0008, 0x37d7: 0x0008, + 0x37d8: 0x0008, 0x37d9: 0x0008, 0x37da: 0x0008, 0x37db: 0x0008, 0x37dc: 0x0008, 0x37dd: 0x0008, + 0x37de: 0x0008, 0x37df: 0x0008, 0x37e0: 0x0008, 0x37e1: 0x0008, 0x37e2: 0x0008, 0x37e3: 0x0008, + 0x37e4: 0x0008, 0x37e5: 0x0008, 0x37e9: 0x0008, + 0x37eb: 0x0008, 0x37ec: 0x0008, 0x37ed: 0x0008, 0x37ee: 0x0008, 0x37ef: 0x0008, + 0x37f0: 0x0008, 0x37f3: 0x0008, 0x37f4: 0x0008, 0x37f5: 0x0008, + 0x37f6: 0x0008, 0x37f7: 0x0008, 0x37f8: 0x0008, 0x37f9: 0x0008, 0x37fa: 0x0008, 0x37fb: 0x0008, + 0x37fc: 0x0008, 0x37fd: 0x0008, 0x37fe: 0x0008, 0x37ff: 0x0008, + // Block 0xe0, offset 0x3800 + 0x381a: 0x0008, 0x381b: 0x0008, 0x381c: 0x0008, 0x381d: 0x0008, + 0x381e: 0x0008, 0x381f: 0x0008, 0x3820: 0x0008, 0x3821: 0x0008, 0x3822: 0x0008, 0x3823: 0x0008, + 0x3824: 0x0008, 0x3825: 0x0008, 0x3826: 0x0008, 0x3827: 0x0008, 0x3828: 0x0008, 0x3829: 0x0008, + 0x382a: 0x0008, 0x382b: 0x0008, 0x382c: 0x0008, 0x382d: 0x0008, 0x382e: 0x0008, 0x382f: 0x0008, + 0x3830: 0x0008, 0x3831: 0x0008, 0x3832: 0x0008, 0x3833: 0x0008, 0x3834: 0x0008, 0x3835: 0x0008, + 0x3836: 0x0008, 0x3837: 0x0008, 0x3838: 0x0008, 0x3839: 0x0008, 0x383a: 0x0008, 0x383b: 0x0008, + 0x383c: 0x0008, 0x383d: 0x0008, 0x383e: 0x0008, 0x383f: 0x0008, + // Block 0xe1, offset 0x3840 + 0x384c: 0x0008, 0x384d: 0x0008, 0x384e: 0x0008, 0x384f: 0x0008, + // Block 0xe2, offset 0x3880 + 0x3888: 0x0008, 0x3889: 0x0008, 0x388a: 0x0008, 0x388b: 0x0008, + 0x388c: 0x0008, 0x388d: 0x0008, 0x388e: 0x0008, 0x388f: 0x0008, + 0x389a: 0x0008, 0x389b: 0x0008, 0x389c: 0x0008, 0x389d: 0x0008, + 0x389e: 0x0008, 0x389f: 0x0008, + // Block 0xe3, offset 0x38c0 + 0x38c8: 0x0008, 0x38c9: 0x0008, 0x38ca: 0x0008, 0x38cb: 0x0008, + 0x38cc: 0x0008, 0x38cd: 0x0008, 0x38ce: 0x0008, 0x38cf: 0x0008, + 0x38ee: 0x0008, 0x38ef: 0x0008, + 0x38fc: 0x0008, 0x38fd: 0x0008, 0x38fe: 0x0008, 0x38ff: 0x0008, + // Block 0xe4, offset 0x3900 + 0x3902: 0x0008, 0x3903: 0x0008, 0x3904: 0x0008, 0x3905: 0x0008, + 0x3906: 0x0008, 0x3907: 0x0008, 0x3908: 0x0008, 0x3909: 0x0008, 0x390a: 0x0008, 0x390b: 0x0008, + 0x390c: 0x0008, 0x390d: 0x0008, 0x390e: 0x0008, 0x390f: 0x0008, + 0x3919: 0x0008, 0x391a: 0x0008, 0x391b: 0x0008, 0x391c: 0x0008, 0x391d: 0x0008, + 0x391e: 0x0008, 0x391f: 0x0008, 0x3920: 0x0008, 0x3921: 0x0008, 0x3922: 0x0008, 0x3923: 0x0008, + 0x3924: 0x0008, 0x3925: 0x0008, 0x3926: 0x0008, 0x3927: 0x0008, 0x3928: 0x0008, 0x3929: 0x0008, + 0x392a: 0x0008, 0x392b: 0x0008, 0x392c: 0x0008, 0x392d: 0x0008, 0x392e: 0x0008, 0x392f: 0x0008, + 0x3930: 0x0008, 0x3931: 0x0008, 0x3932: 0x0008, 0x3933: 0x0008, 0x3934: 0x0008, 0x3935: 0x0008, + 0x3936: 0x0008, 0x3937: 0x0008, 0x3938: 0x0008, 0x3939: 0x0008, 0x393a: 0x0008, 0x393b: 0x0008, + 0x393c: 0x0008, 0x393d: 0x0008, 0x393e: 0x0008, 0x393f: 0x0008, + // Block 0xe5, offset 0x3940 + 0x394c: 0x0008, 0x394d: 0x0008, 0x394e: 0x0008, 0x394f: 0x0008, 0x3950: 0x0008, 0x3951: 0x0008, + 0x3952: 0x0008, 0x3953: 0x0008, 0x3954: 0x0008, 0x3955: 0x0008, 0x3956: 0x0008, 0x3957: 0x0008, + 0x3958: 0x0008, 0x3959: 0x0008, 0x395a: 0x0008, 0x395b: 0x0008, 0x395c: 0x0008, 0x395d: 0x0008, + 0x395e: 0x0008, 0x395f: 0x0008, 0x3960: 0x0008, 0x3961: 0x0008, 0x3962: 0x0008, 0x3963: 0x0008, + 0x3964: 0x0008, 0x3965: 0x0008, 0x3966: 0x0008, 0x3967: 0x0008, 0x3968: 0x0008, 0x3969: 0x0008, + 0x396a: 0x0008, 0x396b: 0x0008, 0x396c: 0x0008, 0x396d: 0x0008, 0x396e: 0x0008, 0x396f: 0x0008, + 0x3970: 0x0008, 0x3971: 0x0008, 0x3972: 0x0008, 0x3973: 0x0008, 0x3974: 0x0008, 0x3975: 0x0008, + 0x3976: 0x0008, 0x3977: 0x0008, 0x3978: 0x0008, 0x3979: 0x0008, 0x397a: 0x0008, + 0x397c: 0x0008, 0x397d: 0x0008, 0x397e: 0x0008, 0x397f: 0x0008, + // Block 0xe6, offset 0x3980 + 0x3980: 0x0008, 0x3981: 0x0008, 0x3982: 0x0008, 0x3983: 0x0008, 0x3984: 0x0008, 0x3985: 0x0008, + 0x3987: 0x0008, 0x3988: 0x0008, 0x3989: 0x0008, 0x398a: 0x0008, 0x398b: 0x0008, + 0x398c: 0x0008, 0x398d: 0x0008, 0x398e: 0x0008, 0x398f: 0x0008, 0x3990: 0x0008, 0x3991: 0x0008, + 0x3992: 0x0008, 0x3993: 0x0008, 0x3994: 0x0008, 0x3995: 0x0008, 0x3996: 0x0008, 0x3997: 0x0008, + 0x3998: 0x0008, 0x3999: 0x0008, 0x399a: 0x0008, 0x399b: 0x0008, 0x399c: 0x0008, 0x399d: 0x0008, + 0x399e: 0x0008, 0x399f: 0x0008, 0x39a0: 0x0008, 0x39a1: 0x0008, 0x39a2: 0x0008, 0x39a3: 0x0008, + 0x39a4: 0x0008, 0x39a5: 0x0008, 0x39a6: 0x0008, 0x39a7: 0x0008, 0x39a8: 0x0008, 0x39a9: 0x0008, + 0x39aa: 0x0008, 0x39ab: 0x0008, 0x39ac: 0x0008, 0x39ad: 0x0008, 0x39ae: 0x0008, 0x39af: 0x0008, + 0x39b0: 0x0008, 0x39b1: 0x0008, 0x39b2: 0x0008, 0x39b3: 0x0008, 0x39b4: 0x0008, 0x39b5: 0x0008, + 0x39b6: 0x0008, 0x39b7: 0x0008, 0x39b8: 0x0008, 0x39b9: 0x0008, 0x39ba: 0x0008, 0x39bb: 0x0008, + 0x39bc: 0x0008, 0x39bd: 0x0008, 0x39be: 0x0008, 0x39bf: 0x0008, + // Block 0xe7, offset 0x39c0 + 0x39d8: 0x0008, 0x39d9: 0x0008, 0x39da: 0x0008, 0x39db: 0x0008, 0x39dc: 0x0008, 0x39dd: 0x0008, + 0x39de: 0x0008, 0x39df: 0x0008, + 0x39ee: 0x0008, 0x39ef: 0x0008, + 0x39f0: 0x0008, 0x39f1: 0x0008, 0x39f2: 0x0008, 0x39f3: 0x0008, 0x39f4: 0x0008, 0x39f5: 0x0008, + 0x39f6: 0x0008, 0x39f7: 0x0008, 0x39f8: 0x0008, 0x39f9: 0x0008, 0x39fa: 0x0008, 0x39fb: 0x0008, + 0x39fc: 0x0008, 0x39fd: 0x0008, 0x39fe: 0x0008, 0x39ff: 0x0008, + // Block 0xe8, offset 0x3a00 + 0x3a00: 0x0002, 0x3a01: 0x0002, 0x3a02: 0x0002, 0x3a03: 0x0002, 0x3a04: 0x0002, 0x3a05: 0x0002, + 0x3a06: 0x0002, 0x3a07: 0x0002, 0x3a08: 0x0002, 0x3a09: 0x0002, 0x3a0a: 0x0002, 0x3a0b: 0x0002, + 0x3a0c: 0x0002, 0x3a0d: 0x0002, 0x3a0e: 0x0002, 0x3a0f: 0x0002, 0x3a10: 0x0002, 0x3a11: 0x0002, + 0x3a12: 0x0002, 0x3a13: 0x0002, 0x3a14: 0x0002, 0x3a15: 0x0002, 0x3a16: 0x0002, 0x3a17: 0x0002, + 0x3a18: 0x0002, 0x3a19: 0x0002, 0x3a1a: 0x0002, 0x3a1b: 0x0002, 0x3a1c: 0x0002, 0x3a1d: 0x0002, + 0x3a1e: 0x0002, 0x3a1f: 0x0002, 0x3a20: 0x0024, 0x3a21: 0x0024, 0x3a22: 0x0024, 0x3a23: 0x0024, + 0x3a24: 0x0024, 0x3a25: 0x0024, 0x3a26: 0x0024, 0x3a27: 0x0024, 0x3a28: 0x0024, 0x3a29: 0x0024, + 0x3a2a: 0x0024, 0x3a2b: 0x0024, 0x3a2c: 0x0024, 0x3a2d: 0x0024, 0x3a2e: 0x0024, 0x3a2f: 0x0024, + 0x3a30: 0x0024, 0x3a31: 0x0024, 0x3a32: 0x0024, 0x3a33: 0x0024, 0x3a34: 0x0024, 0x3a35: 0x0024, + 0x3a36: 0x0024, 0x3a37: 0x0024, 0x3a38: 0x0024, 0x3a39: 0x0024, 0x3a3a: 0x0024, 0x3a3b: 0x0024, + 0x3a3c: 0x0024, 0x3a3d: 0x0024, 0x3a3e: 0x0024, 0x3a3f: 0x0024, + // Block 0xe9, offset 0x3a40 + 0x3a40: 0x0002, 0x3a41: 0x0002, 0x3a42: 0x0002, 0x3a43: 0x0002, 0x3a44: 0x0002, 0x3a45: 0x0002, + 0x3a46: 0x0002, 0x3a47: 0x0002, 0x3a48: 0x0002, 0x3a49: 0x0002, 0x3a4a: 0x0002, 0x3a4b: 0x0002, + 0x3a4c: 0x0002, 0x3a4d: 0x0002, 0x3a4e: 0x0002, 0x3a4f: 0x0002, 0x3a50: 0x0002, 0x3a51: 0x0002, + 0x3a52: 0x0002, 0x3a53: 0x0002, 0x3a54: 0x0002, 0x3a55: 0x0002, 0x3a56: 0x0002, 0x3a57: 0x0002, + 0x3a58: 0x0002, 0x3a59: 0x0002, 0x3a5a: 0x0002, 0x3a5b: 0x0002, 0x3a5c: 0x0002, 0x3a5d: 0x0002, + 0x3a5e: 0x0002, 0x3a5f: 0x0002, 0x3a60: 0x0002, 0x3a61: 0x0002, 0x3a62: 0x0002, 0x3a63: 0x0002, + 0x3a64: 0x0002, 0x3a65: 0x0002, 0x3a66: 0x0002, 0x3a67: 0x0002, 0x3a68: 0x0002, 0x3a69: 0x0002, + 0x3a6a: 0x0002, 0x3a6b: 0x0002, 0x3a6c: 0x0002, 0x3a6d: 0x0002, 0x3a6e: 0x0002, 0x3a6f: 0x0002, + 0x3a70: 0x0002, 0x3a71: 0x0002, 0x3a72: 0x0002, 0x3a73: 0x0002, 0x3a74: 0x0002, 0x3a75: 0x0002, + 0x3a76: 0x0002, 0x3a77: 0x0002, 0x3a78: 0x0002, 0x3a79: 0x0002, 0x3a7a: 0x0002, 0x3a7b: 0x0002, + 0x3a7c: 0x0002, 0x3a7d: 0x0002, 0x3a7e: 0x0002, 0x3a7f: 0x0002, + // Block 0xea, offset 0x3a80 + 0x3a80: 0x0024, 0x3a81: 0x0024, 0x3a82: 0x0024, 0x3a83: 0x0024, 0x3a84: 0x0024, 0x3a85: 0x0024, + 0x3a86: 0x0024, 0x3a87: 0x0024, 0x3a88: 0x0024, 0x3a89: 0x0024, 0x3a8a: 0x0024, 0x3a8b: 0x0024, + 0x3a8c: 0x0024, 0x3a8d: 0x0024, 0x3a8e: 0x0024, 0x3a8f: 0x0024, 0x3a90: 0x0024, 0x3a91: 0x0024, + 0x3a92: 0x0024, 0x3a93: 0x0024, 0x3a94: 0x0024, 0x3a95: 0x0024, 0x3a96: 0x0024, 0x3a97: 0x0024, + 0x3a98: 0x0024, 0x3a99: 0x0024, 0x3a9a: 0x0024, 0x3a9b: 0x0024, 0x3a9c: 0x0024, 0x3a9d: 0x0024, + 0x3a9e: 0x0024, 0x3a9f: 0x0024, 0x3aa0: 0x0024, 0x3aa1: 0x0024, 0x3aa2: 0x0024, 0x3aa3: 0x0024, + 0x3aa4: 0x0024, 0x3aa5: 0x0024, 0x3aa6: 0x0024, 0x3aa7: 0x0024, 0x3aa8: 0x0024, 0x3aa9: 0x0024, + 0x3aaa: 0x0024, 0x3aab: 0x0024, 0x3aac: 0x0024, 0x3aad: 0x0024, 0x3aae: 0x0024, 0x3aaf: 0x0024, + 0x3ab0: 0x0002, 0x3ab1: 0x0002, 0x3ab2: 0x0002, 0x3ab3: 0x0002, 0x3ab4: 0x0002, 0x3ab5: 0x0002, + 0x3ab6: 0x0002, 0x3ab7: 0x0002, 0x3ab8: 0x0002, 0x3ab9: 0x0002, 0x3aba: 0x0002, 0x3abb: 0x0002, + 0x3abc: 0x0002, 0x3abd: 0x0002, 0x3abe: 0x0002, 0x3abf: 0x0002, +} + +// graphemesIndex: 25 blocks, 1600 entries, 1600 bytes +// Block 0 is the zero block. +var graphemesIndex = [1600]property{ + // Block 0x0, offset 0x0 + // Block 0x1, offset 0x40 + // Block 0x2, offset 0x80 + // Block 0x3, offset 0xc0 + 0xc2: 0x01, + 0xcc: 0x02, 0xcd: 0x03, + 0xd2: 0x04, 0xd6: 0x05, 0xd7: 0x06, + 0xd8: 0x07, 0xd9: 0x08, 0xdb: 0x09, 0xdc: 0x0a, 0xdd: 0x0b, 0xde: 0x0c, 0xdf: 0x0d, + 0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, + 0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a, + 0xf0: 0x14, 0xf3: 0x16, + // Block 0x4, offset 0x100 + 0x120: 0x0e, 0x121: 0x0f, 0x122: 0x10, 0x123: 0x11, 0x124: 0x12, 0x125: 0x13, 0x126: 0x14, 0x127: 0x15, + 0x128: 0x16, 0x129: 0x17, 0x12a: 0x18, 0x12b: 0x19, 0x12c: 0x1a, 0x12d: 0x1b, 0x12e: 0x1c, 0x12f: 0x1d, + 0x130: 0x1e, 0x131: 0x1f, 0x132: 0x20, 0x133: 0x21, 0x134: 0x22, 0x135: 0x23, 0x136: 0x24, 0x137: 0x25, + 0x138: 0x26, 0x139: 0x27, 0x13a: 0x28, 0x13b: 0x29, 0x13c: 0x2a, 0x13d: 0x2b, 0x13e: 0x2c, 0x13f: 0x2d, + // Block 0x5, offset 0x140 + 0x140: 0x2e, 0x141: 0x2f, 0x142: 0x30, 0x144: 0x31, 0x145: 0x32, 0x146: 0x33, 0x147: 0x34, + 0x14d: 0x35, + 0x15c: 0x36, 0x15d: 0x37, 0x15e: 0x38, 0x15f: 0x39, + 0x160: 0x3a, 0x162: 0x3b, 0x164: 0x3c, + 0x168: 0x3d, 0x169: 0x3e, 0x16a: 0x3f, 0x16b: 0x40, 0x16c: 0x41, 0x16d: 0x42, 0x16e: 0x43, 0x16f: 0x44, + 0x170: 0x45, 0x173: 0x46, 0x177: 0x02, + // Block 0x6, offset 0x180 + 0x180: 0x47, 0x181: 0x48, 0x183: 0x49, 0x184: 0x4a, 0x186: 0x4b, + 0x18c: 0x4c, 0x18f: 0x4d, + 0x193: 0x4e, 0x196: 0x4f, 0x197: 0x50, + 0x198: 0x51, 0x199: 0x52, 0x19a: 0x53, 0x19b: 0x54, 0x19c: 0x55, 0x19d: 0x56, 0x19e: 0x57, + 0x1a4: 0x58, + 0x1ac: 0x59, 0x1ad: 0x5a, + 0x1b3: 0x5b, 0x1b5: 0x5c, 0x1b7: 0x5d, + // Block 0x7, offset 0x1c0 + 0x1c0: 0x5e, 0x1c2: 0x5f, + 0x1ca: 0x60, + // Block 0x8, offset 0x200 + 0x219: 0x61, 0x21a: 0x62, 0x21b: 0x63, + 0x220: 0x64, 0x222: 0x65, 0x223: 0x66, 0x224: 0x67, 0x225: 0x68, 0x226: 0x69, 0x227: 0x6a, + 0x228: 0x6b, 0x229: 0x6c, 0x22a: 0x6d, 0x22b: 0x6e, 0x22f: 0x6f, + 0x230: 0x70, 0x231: 0x71, 0x232: 0x72, 0x233: 0x73, 0x234: 0x74, 0x235: 0x75, 0x236: 0x76, 0x237: 0x70, + 0x238: 0x71, 0x239: 0x72, 0x23a: 0x73, 0x23b: 0x74, 0x23c: 0x75, 0x23d: 0x76, 0x23e: 0x70, 0x23f: 0x71, + // Block 0x9, offset 0x240 + 0x240: 0x72, 0x241: 0x73, 0x242: 0x74, 0x243: 0x75, 0x244: 0x76, 0x245: 0x70, 0x246: 0x71, 0x247: 0x72, + 0x248: 0x73, 0x249: 0x74, 0x24a: 0x75, 0x24b: 0x76, 0x24c: 0x70, 0x24d: 0x71, 0x24e: 0x72, 0x24f: 0x73, + 0x250: 0x74, 0x251: 0x75, 0x252: 0x76, 0x253: 0x70, 0x254: 0x71, 0x255: 0x72, 0x256: 0x73, 0x257: 0x74, + 0x258: 0x75, 0x259: 0x76, 0x25a: 0x70, 0x25b: 0x71, 0x25c: 0x72, 0x25d: 0x73, 0x25e: 0x74, 0x25f: 0x75, + 0x260: 0x76, 0x261: 0x70, 0x262: 0x71, 0x263: 0x72, 0x264: 0x73, 0x265: 0x74, 0x266: 0x75, 0x267: 0x76, + 0x268: 0x70, 0x269: 0x71, 0x26a: 0x72, 0x26b: 0x73, 0x26c: 0x74, 0x26d: 0x75, 0x26e: 0x76, 0x26f: 0x70, + 0x270: 0x71, 0x271: 0x72, 0x272: 0x73, 0x273: 0x74, 0x274: 0x75, 0x275: 0x76, 0x276: 0x70, 0x277: 0x71, + 0x278: 0x72, 0x279: 0x73, 0x27a: 0x74, 0x27b: 0x75, 0x27c: 0x76, 0x27d: 0x70, 0x27e: 0x71, 0x27f: 0x72, + // Block 0xa, offset 0x280 + 0x280: 0x73, 0x281: 0x74, 0x282: 0x75, 0x283: 0x76, 0x284: 0x70, 0x285: 0x71, 0x286: 0x72, 0x287: 0x73, + 0x288: 0x74, 0x289: 0x75, 0x28a: 0x76, 0x28b: 0x70, 0x28c: 0x71, 0x28d: 0x72, 0x28e: 0x73, 0x28f: 0x74, + 0x290: 0x75, 0x291: 0x76, 0x292: 0x70, 0x293: 0x71, 0x294: 0x72, 0x295: 0x73, 0x296: 0x74, 0x297: 0x75, + 0x298: 0x76, 0x299: 0x70, 0x29a: 0x71, 0x29b: 0x72, 0x29c: 0x73, 0x29d: 0x74, 0x29e: 0x75, 0x29f: 0x76, + 0x2a0: 0x70, 0x2a1: 0x71, 0x2a2: 0x72, 0x2a3: 0x73, 0x2a4: 0x74, 0x2a5: 0x75, 0x2a6: 0x76, 0x2a7: 0x70, + 0x2a8: 0x71, 0x2a9: 0x72, 0x2aa: 0x73, 0x2ab: 0x74, 0x2ac: 0x75, 0x2ad: 0x76, 0x2ae: 0x70, 0x2af: 0x71, + 0x2b0: 0x72, 0x2b1: 0x73, 0x2b2: 0x74, 0x2b3: 0x75, 0x2b4: 0x76, 0x2b5: 0x70, 0x2b6: 0x71, 0x2b7: 0x72, + 0x2b8: 0x73, 0x2b9: 0x74, 0x2ba: 0x75, 0x2bb: 0x76, 0x2bc: 0x70, 0x2bd: 0x71, 0x2be: 0x72, 0x2bf: 0x73, + // Block 0xb, offset 0x2c0 + 0x2c0: 0x74, 0x2c1: 0x75, 0x2c2: 0x76, 0x2c3: 0x70, 0x2c4: 0x71, 0x2c5: 0x72, 0x2c6: 0x73, 0x2c7: 0x74, + 0x2c8: 0x75, 0x2c9: 0x76, 0x2ca: 0x70, 0x2cb: 0x71, 0x2cc: 0x72, 0x2cd: 0x73, 0x2ce: 0x74, 0x2cf: 0x75, + 0x2d0: 0x76, 0x2d1: 0x70, 0x2d2: 0x71, 0x2d3: 0x72, 0x2d4: 0x73, 0x2d5: 0x74, 0x2d6: 0x75, 0x2d7: 0x76, + 0x2d8: 0x70, 0x2d9: 0x71, 0x2da: 0x72, 0x2db: 0x73, 0x2dc: 0x74, 0x2dd: 0x75, 0x2de: 0x77, 0x2df: 0x78, + // Block 0xc, offset 0x300 + 0x32c: 0x79, + 0x338: 0x7a, 0x33b: 0x7b, 0x33e: 0x62, 0x33f: 0x7c, + // Block 0xd, offset 0x340 + 0x347: 0x7d, + 0x34b: 0x7e, 0x34d: 0x7f, + 0x368: 0x80, 0x36b: 0x81, + 0x374: 0x82, 0x375: 0x83, + 0x37a: 0x84, 0x37b: 0x85, 0x37d: 0x86, 0x37e: 0x87, + // Block 0xe, offset 0x380 + 0x380: 0x88, 0x381: 0x89, 0x382: 0x8a, 0x383: 0x8b, 0x384: 0x8c, 0x385: 0x8d, 0x386: 0x8e, 0x387: 0x8f, + 0x388: 0x90, 0x389: 0x91, 0x38b: 0x92, 0x38c: 0x93, 0x38d: 0x94, 0x38e: 0x95, 0x38f: 0x96, + 0x390: 0x97, 0x391: 0x98, 0x392: 0x99, 0x393: 0x9a, 0x396: 0x9b, 0x397: 0x9c, + 0x398: 0x9d, 0x399: 0x9e, 0x39a: 0x9f, 0x39c: 0xa0, + 0x3a0: 0xa1, 0x3a4: 0xa2, 0x3a5: 0xa3, 0x3a7: 0xa4, + 0x3a8: 0xa5, 0x3a9: 0xa6, 0x3aa: 0xa7, 0x3ad: 0xa8, + 0x3b0: 0xa9, 0x3b2: 0xaa, 0x3b4: 0xab, 0x3b5: 0xac, 0x3b6: 0xad, + 0x3bb: 0xae, 0x3bc: 0xaf, 0x3bd: 0xb0, + // Block 0xf, offset 0x3c0 + 0x3d0: 0xb1, 0x3d1: 0xb2, + // Block 0x10, offset 0x400 + 0x404: 0xb3, + 0x42b: 0xb4, 0x42c: 0xb5, + 0x435: 0xb6, + 0x43d: 0xb7, 0x43e: 0xb8, 0x43f: 0xb9, + // Block 0x11, offset 0x440 + 0x472: 0xba, + // Block 0x12, offset 0x480 + 0x4bc: 0xbb, 0x4bd: 0xbc, + // Block 0x13, offset 0x4c0 + 0x4c5: 0xbd, 0x4c6: 0xbe, + 0x4c9: 0xbf, + 0x4e8: 0xc0, 0x4e9: 0xc1, 0x4ea: 0xc2, + // Block 0x14, offset 0x500 + 0x500: 0xc3, 0x502: 0xc4, 0x504: 0xb5, + 0x50a: 0xc5, 0x50b: 0xc6, + 0x513: 0xc6, 0x517: 0xc7, + 0x51b: 0xc8, + 0x523: 0xc9, 0x525: 0xca, + // Block 0x15, offset 0x540 + 0x540: 0xcb, 0x542: 0xcc, 0x543: 0xcd, 0x545: 0xce, 0x546: 0xcf, 0x547: 0xd0, + 0x548: 0xd1, 0x549: 0xd2, 0x54a: 0xd3, 0x54b: 0xd3, 0x54c: 0xd4, 0x54d: 0xd3, 0x54e: 0xd5, 0x54f: 0xd6, + 0x550: 0xd3, 0x551: 0xd3, 0x552: 0xd3, 0x553: 0xd7, 0x554: 0xd8, 0x555: 0xd9, 0x556: 0xda, 0x557: 0xdb, + 0x558: 0xd3, 0x559: 0xdc, 0x55a: 0xd3, 0x55b: 0xdd, 0x55f: 0xde, + 0x560: 0xdf, 0x561: 0xe0, 0x562: 0xe1, 0x563: 0xe2, 0x564: 0xe3, 0x565: 0xe4, 0x566: 0xd3, 0x567: 0xd3, + 0x569: 0xe5, 0x56a: 0xd3, 0x56b: 0xd3, + 0x570: 0xd3, 0x571: 0xd3, 0x572: 0xd3, 0x573: 0xd3, 0x574: 0xd3, 0x575: 0xd3, 0x576: 0xd3, 0x577: 0xd3, + 0x578: 0xd3, 0x579: 0xd3, 0x57a: 0xd3, 0x57b: 0xd3, 0x57c: 0xd3, 0x57d: 0xd3, 0x57e: 0xd3, 0x57f: 0xd8, + // Block 0x16, offset 0x580 + 0x590: 0x0b, 0x591: 0x0c, 0x593: 0x0d, 0x596: 0x0e, + 0x59b: 0x0f, 0x59c: 0x10, 0x59d: 0x11, 0x59e: 0x12, 0x59f: 0x13, + // Block 0x17, offset 0x5c0 + 0x5c0: 0xe6, 0x5c1: 0x02, 0x5c2: 0xe7, 0x5c3: 0xe7, 0x5c4: 0x02, 0x5c5: 0x02, 0x5c6: 0x02, 0x5c7: 0xe8, + 0x5c8: 0xe7, 0x5c9: 0xe7, 0x5ca: 0xe7, 0x5cb: 0xe7, 0x5cc: 0xe7, 0x5cd: 0xe7, 0x5ce: 0xe7, 0x5cf: 0xe7, + 0x5d0: 0xe7, 0x5d1: 0xe7, 0x5d2: 0xe7, 0x5d3: 0xe7, 0x5d4: 0xe7, 0x5d5: 0xe7, 0x5d6: 0xe7, 0x5d7: 0xe7, + 0x5d8: 0xe7, 0x5d9: 0xe7, 0x5da: 0xe7, 0x5db: 0xe7, 0x5dc: 0xe7, 0x5dd: 0xe7, 0x5de: 0xe7, 0x5df: 0xe7, + 0x5e0: 0xe7, 0x5e1: 0xe7, 0x5e2: 0xe7, 0x5e3: 0xe7, 0x5e4: 0xe7, 0x5e5: 0xe7, 0x5e6: 0xe7, 0x5e7: 0xe7, + 0x5e8: 0xe7, 0x5e9: 0xe7, 0x5ea: 0xe7, 0x5eb: 0xe7, 0x5ec: 0xe7, 0x5ed: 0xe7, 0x5ee: 0xe7, 0x5ef: 0xe7, + 0x5f0: 0xe7, 0x5f1: 0xe7, 0x5f2: 0xe7, 0x5f3: 0xe7, 0x5f4: 0xe7, 0x5f5: 0xe7, 0x5f6: 0xe7, 0x5f7: 0xe7, + 0x5f8: 0xe7, 0x5f9: 0xe7, 0x5fa: 0xe7, 0x5fb: 0xe7, 0x5fc: 0xe7, 0x5fd: 0xe7, 0x5fe: 0xe7, 0x5ff: 0xe7, + // Block 0x18, offset 0x600 + 0x620: 0x15, +} diff --git a/vendor/github.com/cloudflare/circl/LICENSE b/vendor/github.com/cloudflare/circl/LICENSE deleted file mode 100644 index 67edaa90a..000000000 --- a/vendor/github.com/cloudflare/circl/LICENSE +++ /dev/null @@ -1,57 +0,0 @@ -Copyright (c) 2019 Cloudflare. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Cloudflare nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -======================================================================== - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/curve.go b/vendor/github.com/cloudflare/circl/dh/x25519/curve.go deleted file mode 100644 index f9057c2b8..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/curve.go +++ /dev/null @@ -1,96 +0,0 @@ -package x25519 - -import ( - fp "github.com/cloudflare/circl/math/fp25519" -) - -// ladderJoye calculates a fixed-point multiplication with the generator point. -// The algorithm is the right-to-left Joye's ladder as described -// in "How to precompute a ladder" in SAC'2017. -func ladderJoye(k *Key) { - w := [5]fp.Elt{} // [mu,x1,z1,x2,z2] order must be preserved. - fp.SetOne(&w[1]) // x1 = 1 - fp.SetOne(&w[2]) // z1 = 1 - w[3] = fp.Elt{ // x2 = G-S - 0xbd, 0xaa, 0x2f, 0xc8, 0xfe, 0xe1, 0x94, 0x7e, - 0xf8, 0xed, 0xb2, 0x14, 0xae, 0x95, 0xf0, 0xbb, - 0xe2, 0x48, 0x5d, 0x23, 0xb9, 0xa0, 0xc7, 0xad, - 0x34, 0xab, 0x7c, 0xe2, 0xee, 0xcd, 0xae, 0x1e, - } - fp.SetOne(&w[4]) // z2 = 1 - - const n = 255 - const h = 3 - swap := uint(1) - for s := 0; s < n-h; s++ { - i := (s + h) / 8 - j := (s + h) % 8 - bit := uint((k[i] >> uint(j)) & 1) - copy(w[0][:], tableGenerator[s*Size:(s+1)*Size]) - diffAdd(&w, swap^bit) - swap = bit - } - for s := 0; s < h; s++ { - double(&w[1], &w[2]) - } - toAffine((*[fp.Size]byte)(k), &w[1], &w[2]) -} - -// ladderMontgomery calculates a generic scalar point multiplication -// The algorithm implemented is the left-to-right Montgomery's ladder. -func ladderMontgomery(k, xP *Key) { - w := [5]fp.Elt{} // [x1, x2, z2, x3, z3] order must be preserved. - w[0] = *(*fp.Elt)(xP) // x1 = xP - fp.SetOne(&w[1]) // x2 = 1 - w[3] = *(*fp.Elt)(xP) // x3 = xP - fp.SetOne(&w[4]) // z3 = 1 - - move := uint(0) - for s := 255 - 1; s >= 0; s-- { - i := s / 8 - j := s % 8 - bit := uint((k[i] >> uint(j)) & 1) - ladderStep(&w, move^bit) - move = bit - } - toAffine((*[fp.Size]byte)(k), &w[1], &w[2]) -} - -func toAffine(k *[fp.Size]byte, x, z *fp.Elt) { - fp.Inv(z, z) - fp.Mul(x, x, z) - _ = fp.ToBytes(k[:], x) -} - -var lowOrderPoints = [5]fp.Elt{ - { /* (0,_,1) point of order 2 on Curve25519 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }, - { /* (1,_,1) point of order 4 on Curve25519 */ - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }, - { /* (x,_,1) first point of order 8 on Curve25519 */ - 0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, - 0x16, 0x56, 0xe3, 0xfa, 0xf1, 0x9f, 0xc4, 0x6a, - 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, 0xb1, 0xfd, - 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00, - }, - { /* (x,_,1) second point of order 8 on Curve25519 */ - 0x5f, 0x9c, 0x95, 0xbc, 0xa3, 0x50, 0x8c, 0x24, - 0xb1, 0xd0, 0xb1, 0x55, 0x9c, 0x83, 0xef, 0x5b, - 0x04, 0x44, 0x5c, 0xc4, 0x58, 0x1c, 0x8e, 0x86, - 0xd8, 0x22, 0x4e, 0xdd, 0xd0, 0x9f, 0x11, 0x57, - }, - { /* (-1,_,1) a point of order 4 on the twist of Curve25519 */ - 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, - }, -} diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.go b/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.go deleted file mode 100644 index 8a3d54c57..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.go +++ /dev/null @@ -1,30 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -package x25519 - -import ( - fp "github.com/cloudflare/circl/math/fp25519" - "golang.org/x/sys/cpu" -) - -var hasBmi2Adx = cpu.X86.HasBMI2 && cpu.X86.HasADX - -var _ = hasBmi2Adx - -func double(x, z *fp.Elt) { doubleAmd64(x, z) } -func diffAdd(w *[5]fp.Elt, b uint) { diffAddAmd64(w, b) } -func ladderStep(w *[5]fp.Elt, b uint) { ladderStepAmd64(w, b) } -func mulA24(z, x *fp.Elt) { mulA24Amd64(z, x) } - -//go:noescape -func ladderStepAmd64(w *[5]fp.Elt, b uint) - -//go:noescape -func diffAddAmd64(w *[5]fp.Elt, b uint) - -//go:noescape -func doubleAmd64(x, z *fp.Elt) - -//go:noescape -func mulA24Amd64(z, x *fp.Elt) diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.h b/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.h deleted file mode 100644 index 8c1ae4d0f..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.h +++ /dev/null @@ -1,111 +0,0 @@ -#define ladderStepLeg \ - addSub(x2,z2) \ - addSub(x3,z3) \ - integerMulLeg(b0,x2,z3) \ - integerMulLeg(b1,x3,z2) \ - reduceFromDoubleLeg(t0,b0) \ - reduceFromDoubleLeg(t1,b1) \ - addSub(t0,t1) \ - cselect(x2,x3,regMove) \ - cselect(z2,z3,regMove) \ - integerSqrLeg(b0,t0) \ - integerSqrLeg(b1,t1) \ - reduceFromDoubleLeg(x3,b0) \ - reduceFromDoubleLeg(z3,b1) \ - integerMulLeg(b0,x1,z3) \ - reduceFromDoubleLeg(z3,b0) \ - integerSqrLeg(b0,x2) \ - integerSqrLeg(b1,z2) \ - reduceFromDoubleLeg(x2,b0) \ - reduceFromDoubleLeg(z2,b1) \ - subtraction(t0,x2,z2) \ - multiplyA24Leg(t1,t0) \ - additionLeg(t1,t1,z2) \ - integerMulLeg(b0,x2,z2) \ - integerMulLeg(b1,t0,t1) \ - reduceFromDoubleLeg(x2,b0) \ - reduceFromDoubleLeg(z2,b1) - -#define ladderStepBmi2Adx \ - addSub(x2,z2) \ - addSub(x3,z3) \ - integerMulAdx(b0,x2,z3) \ - integerMulAdx(b1,x3,z2) \ - reduceFromDoubleAdx(t0,b0) \ - reduceFromDoubleAdx(t1,b1) \ - addSub(t0,t1) \ - cselect(x2,x3,regMove) \ - cselect(z2,z3,regMove) \ - integerSqrAdx(b0,t0) \ - integerSqrAdx(b1,t1) \ - reduceFromDoubleAdx(x3,b0) \ - reduceFromDoubleAdx(z3,b1) \ - integerMulAdx(b0,x1,z3) \ - reduceFromDoubleAdx(z3,b0) \ - integerSqrAdx(b0,x2) \ - integerSqrAdx(b1,z2) \ - reduceFromDoubleAdx(x2,b0) \ - reduceFromDoubleAdx(z2,b1) \ - subtraction(t0,x2,z2) \ - multiplyA24Adx(t1,t0) \ - additionAdx(t1,t1,z2) \ - integerMulAdx(b0,x2,z2) \ - integerMulAdx(b1,t0,t1) \ - reduceFromDoubleAdx(x2,b0) \ - reduceFromDoubleAdx(z2,b1) - -#define difAddLeg \ - addSub(x1,z1) \ - integerMulLeg(b0,z1,ui) \ - reduceFromDoubleLeg(z1,b0) \ - addSub(x1,z1) \ - integerSqrLeg(b0,x1) \ - integerSqrLeg(b1,z1) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) \ - integerMulLeg(b0,x1,z2) \ - integerMulLeg(b1,z1,x2) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) - -#define difAddBmi2Adx \ - addSub(x1,z1) \ - integerMulAdx(b0,z1,ui) \ - reduceFromDoubleAdx(z1,b0) \ - addSub(x1,z1) \ - integerSqrAdx(b0,x1) \ - integerSqrAdx(b1,z1) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) \ - integerMulAdx(b0,x1,z2) \ - integerMulAdx(b1,z1,x2) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) - -#define doubleLeg \ - addSub(x1,z1) \ - integerSqrLeg(b0,x1) \ - integerSqrLeg(b1,z1) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) \ - subtraction(t0,x1,z1) \ - multiplyA24Leg(t1,t0) \ - additionLeg(t1,t1,z1) \ - integerMulLeg(b0,x1,z1) \ - integerMulLeg(b1,t0,t1) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) - -#define doubleBmi2Adx \ - addSub(x1,z1) \ - integerSqrAdx(b0,x1) \ - integerSqrAdx(b1,z1) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) \ - subtraction(t0,x1,z1) \ - multiplyA24Adx(t1,t0) \ - additionAdx(t1,t1,z1) \ - integerMulAdx(b0,x1,z1) \ - integerMulAdx(b1,t0,t1) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.s b/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.s deleted file mode 100644 index ce9f06289..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/curve_amd64.s +++ /dev/null @@ -1,157 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -#include "textflag.h" - -// Depends on circl/math/fp25519 package -#include "../../math/fp25519/fp_amd64.h" -#include "curve_amd64.h" - -// CTE_A24 is (A+2)/4 from Curve25519 -#define CTE_A24 121666 - -#define Size 32 - -// multiplyA24Leg multiplies x times CTE_A24 and stores in z -// Uses: AX, DX, R8-R13, FLAGS -// Instr: x86_64, cmov -#define multiplyA24Leg(z,x) \ - MOVL $CTE_A24, AX; MULQ 0+x; MOVQ AX, R8; MOVQ DX, R9; \ - MOVL $CTE_A24, AX; MULQ 8+x; MOVQ AX, R12; MOVQ DX, R10; \ - MOVL $CTE_A24, AX; MULQ 16+x; MOVQ AX, R13; MOVQ DX, R11; \ - MOVL $CTE_A24, AX; MULQ 24+x; \ - ADDQ R12, R9; \ - ADCQ R13, R10; \ - ADCQ AX, R11; \ - ADCQ $0, DX; \ - MOVL $38, AX; /* 2*C = 38 = 2^256 MOD 2^255-19*/ \ - IMULQ AX, DX; \ - ADDQ DX, R8; \ - ADCQ $0, R9; MOVQ R9, 8+z; \ - ADCQ $0, R10; MOVQ R10, 16+z; \ - ADCQ $0, R11; MOVQ R11, 24+z; \ - MOVQ $0, DX; \ - CMOVQCS AX, DX; \ - ADDQ DX, R8; MOVQ R8, 0+z; - -// multiplyA24Adx multiplies x times CTE_A24 and stores in z -// Uses: AX, DX, R8-R12, FLAGS -// Instr: x86_64, cmov, bmi2 -#define multiplyA24Adx(z,x) \ - MOVQ $CTE_A24, DX; \ - MULXQ 0+x, R8, R10; \ - MULXQ 8+x, R9, R11; ADDQ R10, R9; \ - MULXQ 16+x, R10, AX; ADCQ R11, R10; \ - MULXQ 24+x, R11, R12; ADCQ AX, R11; \ - ;;;;;;;;;;;;;;;;;;;;; ADCQ $0, R12; \ - MOVL $38, DX; /* 2*C = 38 = 2^256 MOD 2^255-19*/ \ - IMULQ DX, R12; \ - ADDQ R12, R8; \ - ADCQ $0, R9; MOVQ R9, 8+z; \ - ADCQ $0, R10; MOVQ R10, 16+z; \ - ADCQ $0, R11; MOVQ R11, 24+z; \ - MOVQ $0, R12; \ - CMOVQCS DX, R12; \ - ADDQ R12, R8; MOVQ R8, 0+z; - -#define mulA24Legacy \ - multiplyA24Leg(0(DI),0(SI)) -#define mulA24Bmi2Adx \ - multiplyA24Adx(0(DI),0(SI)) - -// func mulA24Amd64(z, x *fp255.Elt) -TEXT ·mulA24Amd64(SB),NOSPLIT,$0-16 - MOVQ z+0(FP), DI - MOVQ x+8(FP), SI - CHECK_BMI2ADX(LMA24, mulA24Legacy, mulA24Bmi2Adx) - - -// func ladderStepAmd64(w *[5]fp255.Elt, b uint) -// ladderStepAmd64 calculates a point addition and doubling as follows: -// (x2,z2) = 2*(x2,z2) and (x3,z3) = (x2,z2)+(x3,z3) using as a difference (x1,-). -// work = (x1,x2,z2,x3,z3) are five fp255.Elt of 32 bytes. -// stack = (t0,t1) are two fp.Elt of fp.Size bytes, and -// (b0,b1) are two-double precision fp.Elt of 2*fp.Size bytes. -TEXT ·ladderStepAmd64(SB),NOSPLIT,$192-16 - // Parameters - #define regWork DI - #define regMove SI - #define x1 0*Size(regWork) - #define x2 1*Size(regWork) - #define z2 2*Size(regWork) - #define x3 3*Size(regWork) - #define z3 4*Size(regWork) - // Local variables - #define t0 0*Size(SP) - #define t1 1*Size(SP) - #define b0 2*Size(SP) - #define b1 4*Size(SP) - MOVQ w+0(FP), regWork - MOVQ b+8(FP), regMove - CHECK_BMI2ADX(LLADSTEP, ladderStepLeg, ladderStepBmi2Adx) - #undef regWork - #undef regMove - #undef x1 - #undef x2 - #undef z2 - #undef x3 - #undef z3 - #undef t0 - #undef t1 - #undef b0 - #undef b1 - -// func diffAddAmd64(w *[5]fp255.Elt, b uint) -// diffAddAmd64 calculates a differential point addition using a precomputed point. -// (x1,z1) = (x1,z1)+(mu) using a difference point (x2,z2) -// w = (mu,x1,z1,x2,z2) are five fp.Elt, and -// stack = (b0,b1) are two-double precision fp.Elt of 2*fp.Size bytes. -TEXT ·diffAddAmd64(SB),NOSPLIT,$128-16 - // Parameters - #define regWork DI - #define regSwap SI - #define ui 0*Size(regWork) - #define x1 1*Size(regWork) - #define z1 2*Size(regWork) - #define x2 3*Size(regWork) - #define z2 4*Size(regWork) - // Local variables - #define b0 0*Size(SP) - #define b1 2*Size(SP) - MOVQ w+0(FP), regWork - MOVQ b+8(FP), regSwap - cswap(x1,x2,regSwap) - cswap(z1,z2,regSwap) - CHECK_BMI2ADX(LDIFADD, difAddLeg, difAddBmi2Adx) - #undef regWork - #undef regSwap - #undef ui - #undef x1 - #undef z1 - #undef x2 - #undef z2 - #undef b0 - #undef b1 - -// func doubleAmd64(x, z *fp255.Elt) -// doubleAmd64 calculates a point doubling (x1,z1) = 2*(x1,z1). -// stack = (t0,t1) are two fp.Elt of fp.Size bytes, and -// (b0,b1) are two-double precision fp.Elt of 2*fp.Size bytes. -TEXT ·doubleAmd64(SB),NOSPLIT,$192-16 - // Parameters - #define x1 0(DI) - #define z1 0(SI) - // Local variables - #define t0 0*Size(SP) - #define t1 1*Size(SP) - #define b0 2*Size(SP) - #define b1 4*Size(SP) - MOVQ x+0(FP), DI - MOVQ z+8(FP), SI - CHECK_BMI2ADX(LDOUB,doubleLeg,doubleBmi2Adx) - #undef x1 - #undef z1 - #undef t0 - #undef t1 - #undef b0 - #undef b1 diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/curve_generic.go b/vendor/github.com/cloudflare/circl/dh/x25519/curve_generic.go deleted file mode 100644 index dae67ea37..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/curve_generic.go +++ /dev/null @@ -1,85 +0,0 @@ -package x25519 - -import ( - "encoding/binary" - "math/bits" - - fp "github.com/cloudflare/circl/math/fp25519" -) - -func doubleGeneric(x, z *fp.Elt) { - t0, t1 := &fp.Elt{}, &fp.Elt{} - fp.AddSub(x, z) - fp.Sqr(x, x) - fp.Sqr(z, z) - fp.Sub(t0, x, z) - mulA24Generic(t1, t0) - fp.Add(t1, t1, z) - fp.Mul(x, x, z) - fp.Mul(z, t0, t1) -} - -func diffAddGeneric(w *[5]fp.Elt, b uint) { - mu, x1, z1, x2, z2 := &w[0], &w[1], &w[2], &w[3], &w[4] - fp.Cswap(x1, x2, b) - fp.Cswap(z1, z2, b) - fp.AddSub(x1, z1) - fp.Mul(z1, z1, mu) - fp.AddSub(x1, z1) - fp.Sqr(x1, x1) - fp.Sqr(z1, z1) - fp.Mul(x1, x1, z2) - fp.Mul(z1, z1, x2) -} - -func ladderStepGeneric(w *[5]fp.Elt, b uint) { - x1, x2, z2, x3, z3 := &w[0], &w[1], &w[2], &w[3], &w[4] - t0 := &fp.Elt{} - t1 := &fp.Elt{} - fp.AddSub(x2, z2) - fp.AddSub(x3, z3) - fp.Mul(t0, x2, z3) - fp.Mul(t1, x3, z2) - fp.AddSub(t0, t1) - fp.Cmov(x2, x3, b) - fp.Cmov(z2, z3, b) - fp.Sqr(x3, t0) - fp.Sqr(z3, t1) - fp.Mul(z3, x1, z3) - fp.Sqr(x2, x2) - fp.Sqr(z2, z2) - fp.Sub(t0, x2, z2) - mulA24Generic(t1, t0) - fp.Add(t1, t1, z2) - fp.Mul(x2, x2, z2) - fp.Mul(z2, t0, t1) -} - -func mulA24Generic(z, x *fp.Elt) { - const A24 = 121666 - const n = 8 - var xx [4]uint64 - for i := range xx { - xx[i] = binary.LittleEndian.Uint64(x[i*n : (i+1)*n]) - } - - h0, l0 := bits.Mul64(xx[0], A24) - h1, l1 := bits.Mul64(xx[1], A24) - h2, l2 := bits.Mul64(xx[2], A24) - h3, l3 := bits.Mul64(xx[3], A24) - - var c3 uint64 - l1, c0 := bits.Add64(h0, l1, 0) - l2, c1 := bits.Add64(h1, l2, c0) - l3, c2 := bits.Add64(h2, l3, c1) - l4, _ := bits.Add64(h3, 0, c2) - _, l4 = bits.Mul64(l4, 38) - l0, c0 = bits.Add64(l0, l4, 0) - xx[1], c1 = bits.Add64(l1, 0, c0) - xx[2], c2 = bits.Add64(l2, 0, c1) - xx[3], c3 = bits.Add64(l3, 0, c2) - xx[0], _ = bits.Add64(l0, (-c3)&38, 0) - for i := range xx { - binary.LittleEndian.PutUint64(z[i*n:(i+1)*n], xx[i]) - } -} diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/curve_noasm.go b/vendor/github.com/cloudflare/circl/dh/x25519/curve_noasm.go deleted file mode 100644 index 07fab97d2..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/curve_noasm.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build !amd64 || purego -// +build !amd64 purego - -package x25519 - -import fp "github.com/cloudflare/circl/math/fp25519" - -func double(x, z *fp.Elt) { doubleGeneric(x, z) } -func diffAdd(w *[5]fp.Elt, b uint) { diffAddGeneric(w, b) } -func ladderStep(w *[5]fp.Elt, b uint) { ladderStepGeneric(w, b) } -func mulA24(z, x *fp.Elt) { mulA24Generic(z, x) } diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/doc.go b/vendor/github.com/cloudflare/circl/dh/x25519/doc.go deleted file mode 100644 index 3ce102d14..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/doc.go +++ /dev/null @@ -1,19 +0,0 @@ -/* -Package x25519 provides Diffie-Hellman functions as specified in RFC-7748. - -Validation of public keys. - -The Diffie-Hellman function, as described in RFC-7748 [1], works for any -public key. However, if a different protocol requires contributory -behaviour [2,3], then the public keys must be validated against low-order -points [3,4]. To do that, the Shared function performs this validation -internally and returns false when the public key is invalid (i.e., it -is a low-order point). - -References: - - [1] RFC7748 by Langley, Hamburg, Turner (https://rfc-editor.org/rfc/rfc7748.txt) - - [2] Curve25519 by Bernstein (https://cr.yp.to/ecdh.html) - - [3] Bernstein (https://cr.yp.to/ecdh.html#validate) - - [4] Cremers&Jackson (https://eprint.iacr.org/2019/526) -*/ -package x25519 diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/key.go b/vendor/github.com/cloudflare/circl/dh/x25519/key.go deleted file mode 100644 index c76f72ac7..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/key.go +++ /dev/null @@ -1,47 +0,0 @@ -package x25519 - -import ( - "crypto/subtle" - - fp "github.com/cloudflare/circl/math/fp25519" -) - -// Size is the length in bytes of a X25519 key. -const Size = 32 - -// Key represents a X25519 key. -type Key [Size]byte - -func (k *Key) clamp(in *Key) *Key { - *k = *in - k[0] &= 248 - k[31] = (k[31] & 127) | 64 - return k -} - -// isValidPubKey verifies if the public key is not a low-order point. -func (k *Key) isValidPubKey() bool { - fp.Modp((*fp.Elt)(k)) - var isLowOrder int - for _, P := range lowOrderPoints { - isLowOrder |= subtle.ConstantTimeCompare(P[:], k[:]) - } - return isLowOrder == 0 -} - -// KeyGen obtains a public key given a secret key. -func KeyGen(public, secret *Key) { - ladderJoye(public.clamp(secret)) -} - -// Shared calculates Alice's shared key from Alice's secret key and Bob's -// public key returning true on success. A failure case happens when the public -// key is a low-order point, thus the shared key is all-zeros and the function -// returns false. -func Shared(shared, secret, public *Key) bool { - validPk := *public - validPk[31] &= (1 << (255 % 8)) - 1 - ok := validPk.isValidPubKey() - ladderMontgomery(shared.clamp(secret), &validPk) - return ok -} diff --git a/vendor/github.com/cloudflare/circl/dh/x25519/table.go b/vendor/github.com/cloudflare/circl/dh/x25519/table.go deleted file mode 100644 index 28c8c4ac0..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x25519/table.go +++ /dev/null @@ -1,268 +0,0 @@ -package x25519 - -import "github.com/cloudflare/circl/math/fp25519" - -// tableGenerator contains the set of points: -// -// t[i] = (xi+1)/(xi-1), -// -// where (xi,yi) = 2^iG and G is the generator point -// Size = (256)*(256/8) = 8192 bytes. -var tableGenerator = [256 * fp25519.Size]byte{ - /* (2^ 0)P */ 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, - /* (2^ 1)P */ 0x96, 0xfe, 0xaa, 0x16, 0xf4, 0x20, 0x82, 0x6b, 0x34, 0x6a, 0x56, 0x4f, 0x2b, 0xeb, 0xeb, 0x82, 0x0f, 0x95, 0xa5, 0x75, 0xb0, 0xa5, 0xa9, 0xd5, 0xf4, 0x88, 0x24, 0x4b, 0xcf, 0xb2, 0x42, 0x51, - /* (2^ 2)P */ 0x0c, 0x68, 0x69, 0x00, 0x75, 0xbc, 0xae, 0x6a, 0x41, 0x9c, 0xf9, 0xa0, 0x20, 0x78, 0xcf, 0x89, 0xf4, 0xd0, 0x56, 0x3b, 0x18, 0xd9, 0x58, 0x2a, 0xa4, 0x11, 0x60, 0xe3, 0x80, 0xca, 0x5a, 0x4b, - /* (2^ 3)P */ 0x5d, 0x74, 0x29, 0x8c, 0x34, 0x32, 0x91, 0x32, 0xd7, 0x2f, 0x64, 0xe1, 0x16, 0xe6, 0xa2, 0xf4, 0x34, 0xbc, 0x67, 0xff, 0x03, 0xbb, 0x45, 0x1e, 0x4a, 0x9b, 0x2a, 0xf4, 0xd0, 0x12, 0x69, 0x30, - /* (2^ 4)P */ 0x54, 0x71, 0xaf, 0xe6, 0x07, 0x65, 0x88, 0xff, 0x2f, 0xc8, 0xee, 0xdf, 0x13, 0x0e, 0xf5, 0x04, 0xce, 0xb5, 0xba, 0x2a, 0xe8, 0x2f, 0x51, 0xaa, 0x22, 0xf2, 0xd5, 0x68, 0x1a, 0x25, 0x4e, 0x17, - /* (2^ 5)P */ 0x98, 0x88, 0x02, 0x82, 0x0d, 0x70, 0x96, 0xcf, 0xc5, 0x02, 0x2c, 0x0a, 0x37, 0xe3, 0x43, 0x17, 0xaa, 0x6e, 0xe8, 0xb4, 0x98, 0xec, 0x9e, 0x37, 0x2e, 0x48, 0xe0, 0x51, 0x8a, 0x88, 0x59, 0x0c, - /* (2^ 6)P */ 0x89, 0xd1, 0xb5, 0x99, 0xd6, 0xf1, 0xcb, 0xfb, 0x84, 0xdc, 0x9f, 0x8e, 0xd5, 0xf0, 0xae, 0xac, 0x14, 0x76, 0x1f, 0x23, 0x06, 0x0d, 0xc2, 0xc1, 0x72, 0xf9, 0x74, 0xa2, 0x8d, 0x21, 0x38, 0x29, - /* (2^ 7)P */ 0x18, 0x7f, 0x1d, 0xff, 0xbe, 0x49, 0xaf, 0xf6, 0xc2, 0xc9, 0x7a, 0x38, 0x22, 0x1c, 0x54, 0xcc, 0x6b, 0xc5, 0x15, 0x40, 0xef, 0xc9, 0xfc, 0x96, 0xa9, 0x13, 0x09, 0x69, 0x7c, 0x62, 0xc1, 0x69, - /* (2^ 8)P */ 0x0e, 0xdb, 0x33, 0x47, 0x2f, 0xfd, 0x86, 0x7a, 0xe9, 0x7d, 0x08, 0x9e, 0xf2, 0xc4, 0xb8, 0xfd, 0x29, 0xa2, 0xa2, 0x8e, 0x1a, 0x4b, 0x5e, 0x09, 0x79, 0x7a, 0xb3, 0x29, 0xc8, 0xa7, 0xd7, 0x1a, - /* (2^ 9)P */ 0xc0, 0xa0, 0x7e, 0xd1, 0xca, 0x89, 0x2d, 0x34, 0x51, 0x20, 0xed, 0xcc, 0xa6, 0xdd, 0xbe, 0x67, 0x74, 0x2f, 0xb4, 0x2b, 0xbf, 0x31, 0xca, 0x19, 0xbb, 0xac, 0x80, 0x49, 0xc8, 0xb4, 0xf7, 0x3d, - /* (2^ 10)P */ 0x83, 0xd8, 0x0a, 0xc8, 0x4d, 0x44, 0xc6, 0xa8, 0x85, 0xab, 0xe3, 0x66, 0x03, 0x44, 0x1e, 0xb9, 0xd8, 0xf6, 0x64, 0x01, 0xa0, 0xcd, 0x15, 0xc2, 0x68, 0xe6, 0x47, 0xf2, 0x6e, 0x7c, 0x86, 0x3d, - /* (2^ 11)P */ 0x8c, 0x65, 0x3e, 0xcc, 0x2b, 0x58, 0xdd, 0xc7, 0x28, 0x55, 0x0e, 0xee, 0x48, 0x47, 0x2c, 0xfd, 0x71, 0x4f, 0x9f, 0xcc, 0x95, 0x9b, 0xfd, 0xa0, 0xdf, 0x5d, 0x67, 0xb0, 0x71, 0xd8, 0x29, 0x75, - /* (2^ 12)P */ 0x78, 0xbd, 0x3c, 0x2d, 0xb4, 0x68, 0xf5, 0xb8, 0x82, 0xda, 0xf3, 0x91, 0x1b, 0x01, 0x33, 0x12, 0x62, 0x3b, 0x7c, 0x4a, 0xcd, 0x6c, 0xce, 0x2d, 0x03, 0x86, 0x49, 0x9e, 0x8e, 0xfc, 0xe7, 0x75, - /* (2^ 13)P */ 0xec, 0xb6, 0xd0, 0xfc, 0xf1, 0x13, 0x4f, 0x2f, 0x45, 0x7a, 0xff, 0x29, 0x1f, 0xca, 0xa8, 0xf1, 0x9b, 0xe2, 0x81, 0x29, 0xa7, 0xc1, 0x49, 0xc2, 0x6a, 0xb5, 0x83, 0x8c, 0xbb, 0x0d, 0xbe, 0x6e, - /* (2^ 14)P */ 0x22, 0xb2, 0x0b, 0x17, 0x8d, 0xfa, 0x14, 0x71, 0x5f, 0x93, 0x93, 0xbf, 0xd5, 0xdc, 0xa2, 0x65, 0x9a, 0x97, 0x9c, 0xb5, 0x68, 0x1f, 0xc4, 0xbd, 0x89, 0x92, 0xce, 0xa2, 0x79, 0xef, 0x0e, 0x2f, - /* (2^ 15)P */ 0xce, 0x37, 0x3c, 0x08, 0x0c, 0xbf, 0xec, 0x42, 0x22, 0x63, 0x49, 0xec, 0x09, 0xbc, 0x30, 0x29, 0x0d, 0xac, 0xfe, 0x9c, 0xc1, 0xb0, 0x94, 0xf2, 0x80, 0xbb, 0xfa, 0xed, 0x4b, 0xaa, 0x80, 0x37, - /* (2^ 16)P */ 0x29, 0xd9, 0xea, 0x7c, 0x3e, 0x7d, 0xc1, 0x56, 0xc5, 0x22, 0x57, 0x2e, 0xeb, 0x4b, 0xcb, 0xe7, 0x5a, 0xe1, 0xbf, 0x2d, 0x73, 0x31, 0xe9, 0x0c, 0xf8, 0x52, 0x10, 0x62, 0xc7, 0x83, 0xb8, 0x41, - /* (2^ 17)P */ 0x50, 0x53, 0xd2, 0xc3, 0xa0, 0x5c, 0xf7, 0xdb, 0x51, 0xe3, 0xb1, 0x6e, 0x08, 0xbe, 0x36, 0x29, 0x12, 0xb2, 0xa9, 0xb4, 0x3c, 0xe0, 0x36, 0xc9, 0xaa, 0x25, 0x22, 0x32, 0x82, 0xbf, 0x45, 0x1d, - /* (2^ 18)P */ 0xc5, 0x4c, 0x02, 0x6a, 0x03, 0xb1, 0x1a, 0xe8, 0x72, 0x9a, 0x4c, 0x30, 0x1c, 0x20, 0x12, 0xe2, 0xfc, 0xb1, 0x32, 0x68, 0xba, 0x3f, 0xd7, 0xc5, 0x81, 0x95, 0x83, 0x4d, 0x5a, 0xdb, 0xff, 0x20, - /* (2^ 19)P */ 0xad, 0x0f, 0x5d, 0xbe, 0x67, 0xd3, 0x83, 0xa2, 0x75, 0x44, 0x16, 0x8b, 0xca, 0x25, 0x2b, 0x6c, 0x2e, 0xf2, 0xaa, 0x7c, 0x46, 0x35, 0x49, 0x9d, 0x49, 0xff, 0x85, 0xee, 0x8e, 0x40, 0x66, 0x51, - /* (2^ 20)P */ 0x61, 0xe3, 0xb4, 0xfa, 0xa2, 0xba, 0x67, 0x3c, 0xef, 0x5c, 0xf3, 0x7e, 0xc6, 0x33, 0xe4, 0xb3, 0x1c, 0x9b, 0x15, 0x41, 0x92, 0x72, 0x59, 0x52, 0x33, 0xab, 0xb0, 0xd5, 0x92, 0x18, 0x62, 0x6a, - /* (2^ 21)P */ 0xcb, 0xcd, 0x55, 0x75, 0x38, 0x4a, 0xb7, 0x20, 0x3f, 0x92, 0x08, 0x12, 0x0e, 0xa1, 0x2a, 0x53, 0xd1, 0x1d, 0x28, 0x62, 0x77, 0x7b, 0xa1, 0xea, 0xbf, 0x44, 0x5c, 0xf0, 0x43, 0x34, 0xab, 0x61, - /* (2^ 22)P */ 0xf8, 0xde, 0x24, 0x23, 0x42, 0x6c, 0x7a, 0x25, 0x7f, 0xcf, 0xe3, 0x17, 0x10, 0x6c, 0x1c, 0x13, 0x57, 0xa2, 0x30, 0xf6, 0x39, 0x87, 0x75, 0x23, 0x80, 0x85, 0xa7, 0x01, 0x7a, 0x40, 0x5a, 0x29, - /* (2^ 23)P */ 0xd9, 0xa8, 0x5d, 0x6d, 0x24, 0x43, 0xc4, 0xf8, 0x5d, 0xfa, 0x52, 0x0c, 0x45, 0x75, 0xd7, 0x19, 0x3d, 0xf8, 0x1b, 0x73, 0x92, 0xfc, 0xfc, 0x2a, 0x00, 0x47, 0x2b, 0x1b, 0xe8, 0xc8, 0x10, 0x7d, - /* (2^ 24)P */ 0x0b, 0xa2, 0xba, 0x70, 0x1f, 0x27, 0xe0, 0xc8, 0x57, 0x39, 0xa6, 0x7c, 0x86, 0x48, 0x37, 0x99, 0xbb, 0xd4, 0x7e, 0xcb, 0xb3, 0xef, 0x12, 0x54, 0x75, 0x29, 0xe6, 0x73, 0x61, 0xd3, 0x96, 0x31, - /* (2^ 25)P */ 0xfc, 0xdf, 0xc7, 0x41, 0xd1, 0xca, 0x5b, 0xde, 0x48, 0xc8, 0x95, 0xb3, 0xd2, 0x8c, 0xcc, 0x47, 0xcb, 0xf3, 0x1a, 0xe1, 0x42, 0xd9, 0x4c, 0xa3, 0xc2, 0xce, 0x4e, 0xd0, 0xf2, 0xdb, 0x56, 0x02, - /* (2^ 26)P */ 0x7f, 0x66, 0x0e, 0x4b, 0xe9, 0xb7, 0x5a, 0x87, 0x10, 0x0d, 0x85, 0xc0, 0x83, 0xdd, 0xd4, 0xca, 0x9f, 0xc7, 0x72, 0x4e, 0x8f, 0x2e, 0xf1, 0x47, 0x9b, 0xb1, 0x85, 0x8c, 0xbb, 0x87, 0x1a, 0x5f, - /* (2^ 27)P */ 0xb8, 0x51, 0x7f, 0x43, 0xb6, 0xd0, 0xe9, 0x7a, 0x65, 0x90, 0x87, 0x18, 0x55, 0xce, 0xc7, 0x12, 0xee, 0x7a, 0xf7, 0x5c, 0xfe, 0x09, 0xde, 0x2a, 0x27, 0x56, 0x2c, 0x7d, 0x2f, 0x5a, 0xa0, 0x23, - /* (2^ 28)P */ 0x9a, 0x16, 0x7c, 0xf1, 0x28, 0xe1, 0x08, 0x59, 0x2d, 0x85, 0xd0, 0x8a, 0xdd, 0x98, 0x74, 0xf7, 0x64, 0x2f, 0x10, 0xab, 0xce, 0xc4, 0xb4, 0x74, 0x45, 0x98, 0x13, 0x10, 0xdd, 0xba, 0x3a, 0x18, - /* (2^ 29)P */ 0xac, 0xaa, 0x92, 0xaa, 0x8d, 0xba, 0x65, 0xb1, 0x05, 0x67, 0x38, 0x99, 0x95, 0xef, 0xc5, 0xd5, 0xd1, 0x40, 0xfc, 0xf8, 0x0c, 0x8f, 0x2f, 0xbe, 0x14, 0x45, 0x20, 0xee, 0x35, 0xe6, 0x01, 0x27, - /* (2^ 30)P */ 0x14, 0x65, 0x15, 0x20, 0x00, 0xa8, 0x9f, 0x62, 0xce, 0xc1, 0xa8, 0x64, 0x87, 0x86, 0x23, 0xf2, 0x0e, 0x06, 0x3f, 0x0b, 0xff, 0x4f, 0x89, 0x5b, 0xfa, 0xa3, 0x08, 0xf7, 0x4c, 0x94, 0xd9, 0x60, - /* (2^ 31)P */ 0x1f, 0x20, 0x7a, 0x1c, 0x1a, 0x00, 0xea, 0xae, 0x63, 0xce, 0xe2, 0x3e, 0x63, 0x6a, 0xf1, 0xeb, 0xe1, 0x07, 0x7a, 0x4c, 0x59, 0x09, 0x77, 0x6f, 0xcb, 0x08, 0x02, 0x0d, 0x15, 0x58, 0xb9, 0x79, - /* (2^ 32)P */ 0xe7, 0x10, 0xd4, 0x01, 0x53, 0x5e, 0xb5, 0x24, 0x4d, 0xc8, 0xfd, 0xf3, 0xdf, 0x4e, 0xa3, 0xe3, 0xd8, 0x32, 0x40, 0x90, 0xe4, 0x68, 0x87, 0xd8, 0xec, 0xae, 0x3a, 0x7b, 0x42, 0x84, 0x13, 0x13, - /* (2^ 33)P */ 0x14, 0x4f, 0x23, 0x86, 0x12, 0xe5, 0x05, 0x84, 0x29, 0xc5, 0xb4, 0xad, 0x39, 0x47, 0xdc, 0x14, 0xfd, 0x4f, 0x63, 0x50, 0xb2, 0xb5, 0xa2, 0xb8, 0x93, 0xff, 0xa7, 0xd8, 0x4a, 0xa9, 0xe2, 0x2f, - /* (2^ 34)P */ 0xdd, 0xfa, 0x43, 0xe8, 0xef, 0x57, 0x5c, 0xec, 0x18, 0x99, 0xbb, 0xf0, 0x40, 0xce, 0x43, 0x28, 0x05, 0x63, 0x3d, 0xcf, 0xd6, 0x61, 0xb5, 0xa4, 0x7e, 0x77, 0xfb, 0xe8, 0xbd, 0x29, 0x36, 0x74, - /* (2^ 35)P */ 0x8f, 0x73, 0xaf, 0xbb, 0x46, 0xdd, 0x3e, 0x34, 0x51, 0xa6, 0x01, 0xb1, 0x28, 0x18, 0x98, 0xed, 0x7a, 0x79, 0x2c, 0x88, 0x0b, 0x76, 0x01, 0xa4, 0x30, 0x87, 0xc8, 0x8d, 0xe2, 0x23, 0xc2, 0x1f, - /* (2^ 36)P */ 0x0e, 0xba, 0x0f, 0xfc, 0x91, 0x4e, 0x60, 0x48, 0xa4, 0x6f, 0x2c, 0x05, 0x8f, 0xf7, 0x37, 0xb6, 0x9c, 0x23, 0xe9, 0x09, 0x3d, 0xac, 0xcc, 0x91, 0x7c, 0x68, 0x7a, 0x43, 0xd4, 0xee, 0xf7, 0x23, - /* (2^ 37)P */ 0x00, 0xd8, 0x9b, 0x8d, 0x11, 0xb1, 0x73, 0x51, 0xa7, 0xd4, 0x89, 0x31, 0xb6, 0x41, 0xd6, 0x29, 0x86, 0xc5, 0xbb, 0x88, 0x79, 0x17, 0xbf, 0xfd, 0xf5, 0x1d, 0xd8, 0xca, 0x4f, 0x89, 0x59, 0x29, - /* (2^ 38)P */ 0x99, 0xc8, 0xbb, 0xb4, 0xf3, 0x8e, 0xbc, 0xae, 0xb9, 0x92, 0x69, 0xb2, 0x5a, 0x99, 0x48, 0x41, 0xfb, 0x2c, 0xf9, 0x34, 0x01, 0x0b, 0xe2, 0x24, 0xe8, 0xde, 0x05, 0x4a, 0x89, 0x58, 0xd1, 0x40, - /* (2^ 39)P */ 0xf6, 0x76, 0xaf, 0x85, 0x11, 0x0b, 0xb0, 0x46, 0x79, 0x7a, 0x18, 0x73, 0x78, 0xc7, 0xba, 0x26, 0x5f, 0xff, 0x8f, 0xab, 0x95, 0xbf, 0xc0, 0x3d, 0xd7, 0x24, 0x55, 0x94, 0xd8, 0x8b, 0x60, 0x2a, - /* (2^ 40)P */ 0x02, 0x63, 0x44, 0xbd, 0x88, 0x95, 0x44, 0x26, 0x9c, 0x43, 0x88, 0x03, 0x1c, 0xc2, 0x4b, 0x7c, 0xb2, 0x11, 0xbd, 0x83, 0xf3, 0xa4, 0x98, 0x8e, 0xb9, 0x76, 0xd8, 0xc9, 0x7b, 0x8d, 0x21, 0x26, - /* (2^ 41)P */ 0x8a, 0x17, 0x7c, 0x99, 0x42, 0x15, 0x08, 0xe3, 0x6f, 0x60, 0xb6, 0x6f, 0xa8, 0x29, 0x2d, 0x3c, 0x74, 0x93, 0x27, 0xfa, 0x36, 0x77, 0x21, 0x5c, 0xfa, 0xb1, 0xfe, 0x4a, 0x73, 0x05, 0xde, 0x7d, - /* (2^ 42)P */ 0xab, 0x2b, 0xd4, 0x06, 0x39, 0x0e, 0xf1, 0x3b, 0x9c, 0x64, 0x80, 0x19, 0x3e, 0x80, 0xf7, 0xe4, 0x7a, 0xbf, 0x95, 0x95, 0xf8, 0x3b, 0x05, 0xe6, 0x30, 0x55, 0x24, 0xda, 0x38, 0xaf, 0x4f, 0x39, - /* (2^ 43)P */ 0xf4, 0x28, 0x69, 0x89, 0x58, 0xfb, 0x8e, 0x7a, 0x3c, 0x11, 0x6a, 0xcc, 0xe9, 0x78, 0xc7, 0xfb, 0x6f, 0x59, 0xaf, 0x30, 0xe3, 0x0c, 0x67, 0x72, 0xf7, 0x6c, 0x3d, 0x1d, 0xa8, 0x22, 0xf2, 0x48, - /* (2^ 44)P */ 0xa7, 0xca, 0x72, 0x0d, 0x41, 0xce, 0x1f, 0xf0, 0x95, 0x55, 0x3b, 0x21, 0xc7, 0xec, 0x20, 0x5a, 0x83, 0x14, 0xfa, 0xc1, 0x65, 0x11, 0xc2, 0x7b, 0x41, 0xa7, 0xa8, 0x1d, 0xe3, 0x9a, 0xf8, 0x07, - /* (2^ 45)P */ 0xf9, 0x0f, 0x83, 0xc6, 0xb4, 0xc2, 0xd2, 0x05, 0x93, 0x62, 0x31, 0xc6, 0x0f, 0x33, 0x3e, 0xd4, 0x04, 0xa9, 0xd3, 0x96, 0x0a, 0x59, 0xa5, 0xa5, 0xb6, 0x33, 0x53, 0xa6, 0x91, 0xdb, 0x5e, 0x70, - /* (2^ 46)P */ 0xf7, 0xa5, 0xb9, 0x0b, 0x5e, 0xe1, 0x8e, 0x04, 0x5d, 0xaf, 0x0a, 0x9e, 0xca, 0xcf, 0x40, 0x32, 0x0b, 0xa4, 0xc4, 0xed, 0xce, 0x71, 0x4b, 0x8f, 0x6d, 0x4a, 0x54, 0xde, 0xa3, 0x0d, 0x1c, 0x62, - /* (2^ 47)P */ 0x91, 0x40, 0x8c, 0xa0, 0x36, 0x28, 0x87, 0x92, 0x45, 0x14, 0xc9, 0x10, 0xb0, 0x75, 0x83, 0xce, 0x94, 0x63, 0x27, 0x4f, 0x52, 0xeb, 0x72, 0x8a, 0x35, 0x36, 0xc8, 0x7e, 0xfa, 0xfc, 0x67, 0x26, - /* (2^ 48)P */ 0x2a, 0x75, 0xe8, 0x45, 0x33, 0x17, 0x4c, 0x7f, 0xa5, 0x79, 0x70, 0xee, 0xfe, 0x47, 0x1b, 0x06, 0x34, 0xff, 0x86, 0x9f, 0xfa, 0x9a, 0xdd, 0x25, 0x9c, 0xc8, 0x5d, 0x42, 0xf5, 0xce, 0x80, 0x37, - /* (2^ 49)P */ 0xe9, 0xb4, 0x3b, 0x51, 0x5a, 0x03, 0x46, 0x1a, 0xda, 0x5a, 0x57, 0xac, 0x79, 0xf3, 0x1e, 0x3e, 0x50, 0x4b, 0xa2, 0x5f, 0x1c, 0x5f, 0x8c, 0xc7, 0x22, 0x9f, 0xfd, 0x34, 0x76, 0x96, 0x1a, 0x32, - /* (2^ 50)P */ 0xfa, 0x27, 0x6e, 0x82, 0xb8, 0x07, 0x67, 0x94, 0xd0, 0x6f, 0x50, 0x4c, 0xd6, 0x84, 0xca, 0x3d, 0x36, 0x14, 0xe9, 0x75, 0x80, 0x21, 0x89, 0xc1, 0x84, 0x84, 0x3b, 0x9b, 0x16, 0x84, 0x92, 0x6d, - /* (2^ 51)P */ 0xdf, 0x2d, 0x3f, 0x38, 0x40, 0xe8, 0x67, 0x3a, 0x75, 0x9b, 0x4f, 0x0c, 0xa3, 0xc9, 0xee, 0x33, 0x47, 0xef, 0x83, 0xa7, 0x6f, 0xc8, 0xc7, 0x3e, 0xc4, 0xfb, 0xc9, 0xba, 0x9f, 0x44, 0xec, 0x26, - /* (2^ 52)P */ 0x7d, 0x9e, 0x9b, 0xa0, 0xcb, 0x38, 0x0f, 0x5c, 0x8c, 0x47, 0xa3, 0x62, 0xc7, 0x8c, 0x16, 0x81, 0x1c, 0x12, 0xfc, 0x06, 0xd3, 0xb0, 0x23, 0x3e, 0xdd, 0xdc, 0xef, 0xa5, 0xa0, 0x8a, 0x23, 0x5a, - /* (2^ 53)P */ 0xff, 0x43, 0xea, 0xc4, 0x21, 0x61, 0xa2, 0x1b, 0xb5, 0x32, 0x88, 0x7c, 0x7f, 0xc7, 0xf8, 0x36, 0x9a, 0xf9, 0xdc, 0x0a, 0x0b, 0xea, 0xfb, 0x88, 0xf9, 0xeb, 0x5b, 0xc2, 0x8e, 0x93, 0xa9, 0x5c, - /* (2^ 54)P */ 0xa0, 0xcd, 0xfc, 0x51, 0x5e, 0x6a, 0x43, 0xd5, 0x3b, 0x89, 0xcd, 0xc2, 0x97, 0x47, 0xbc, 0x1d, 0x08, 0x4a, 0x22, 0xd3, 0x65, 0x6a, 0x34, 0x19, 0x66, 0xf4, 0x9a, 0x9b, 0xe4, 0x34, 0x50, 0x0f, - /* (2^ 55)P */ 0x6e, 0xb9, 0xe0, 0xa1, 0x67, 0x39, 0x3c, 0xf2, 0x88, 0x4d, 0x7a, 0x86, 0xfa, 0x08, 0x8b, 0xe5, 0x79, 0x16, 0x34, 0xa7, 0xc6, 0xab, 0x2f, 0xfb, 0x46, 0x69, 0x02, 0xb6, 0x1e, 0x38, 0x75, 0x2a, - /* (2^ 56)P */ 0xac, 0x20, 0x94, 0xc1, 0xe4, 0x3b, 0x0a, 0xc8, 0xdc, 0xb6, 0xf2, 0x81, 0xc6, 0xf6, 0xb1, 0x66, 0x88, 0x33, 0xe9, 0x61, 0x67, 0x03, 0xf7, 0x7c, 0xc4, 0xa4, 0x60, 0xa6, 0xd8, 0xbb, 0xab, 0x25, - /* (2^ 57)P */ 0x98, 0x51, 0xfd, 0x14, 0xba, 0x12, 0xea, 0x91, 0xa9, 0xff, 0x3c, 0x4a, 0xfc, 0x50, 0x49, 0x68, 0x28, 0xad, 0xf5, 0x30, 0x21, 0x84, 0x26, 0xf8, 0x41, 0xa4, 0x01, 0x53, 0xf7, 0x88, 0xa9, 0x3e, - /* (2^ 58)P */ 0x6f, 0x8c, 0x5f, 0x69, 0x9a, 0x10, 0x78, 0xc9, 0xf3, 0xc3, 0x30, 0x05, 0x4a, 0xeb, 0x46, 0x17, 0x95, 0x99, 0x45, 0xb4, 0x77, 0x6d, 0x4d, 0x44, 0xc7, 0x5c, 0x4e, 0x05, 0x8c, 0x2b, 0x95, 0x75, - /* (2^ 59)P */ 0xaa, 0xd6, 0xf4, 0x15, 0x79, 0x3f, 0x70, 0xa3, 0xd8, 0x47, 0x26, 0x2f, 0x20, 0x46, 0xc3, 0x66, 0x4b, 0x64, 0x1d, 0x81, 0xdf, 0x69, 0x14, 0xd0, 0x1f, 0xd7, 0xa5, 0x81, 0x7d, 0xa4, 0xfe, 0x77, - /* (2^ 60)P */ 0x81, 0xa3, 0x7c, 0xf5, 0x9e, 0x52, 0xe9, 0xc5, 0x1a, 0x88, 0x2f, 0xce, 0xb9, 0xb4, 0xee, 0x6e, 0xd6, 0x9b, 0x00, 0xe8, 0x28, 0x1a, 0xe9, 0xb6, 0xec, 0x3f, 0xfc, 0x9a, 0x3e, 0xbe, 0x80, 0x4b, - /* (2^ 61)P */ 0xc5, 0xd2, 0xae, 0x26, 0xc5, 0x73, 0x37, 0x7e, 0x9d, 0xa4, 0xc9, 0x53, 0xb4, 0xfc, 0x4a, 0x1b, 0x4d, 0xb2, 0xff, 0xba, 0xd7, 0xbd, 0x20, 0xa9, 0x0e, 0x40, 0x2d, 0x12, 0x9f, 0x69, 0x54, 0x7c, - /* (2^ 62)P */ 0xc8, 0x4b, 0xa9, 0x4f, 0xe1, 0xc8, 0x46, 0xef, 0x5e, 0xed, 0x52, 0x29, 0xce, 0x74, 0xb0, 0xe0, 0xd5, 0x85, 0xd8, 0xdb, 0xe1, 0x50, 0xa4, 0xbe, 0x2c, 0x71, 0x0f, 0x32, 0x49, 0x86, 0xb6, 0x61, - /* (2^ 63)P */ 0xd1, 0xbd, 0xcc, 0x09, 0x73, 0x5f, 0x48, 0x8a, 0x2d, 0x1a, 0x4d, 0x7d, 0x0d, 0x32, 0x06, 0xbd, 0xf4, 0xbe, 0x2d, 0x32, 0x73, 0x29, 0x23, 0x25, 0x70, 0xf7, 0x17, 0x8c, 0x75, 0xc4, 0x5d, 0x44, - /* (2^ 64)P */ 0x3c, 0x93, 0xc8, 0x7c, 0x17, 0x34, 0x04, 0xdb, 0x9f, 0x05, 0xea, 0x75, 0x21, 0xe8, 0x6f, 0xed, 0x34, 0xdb, 0x53, 0xc0, 0xfd, 0xbe, 0xfe, 0x1e, 0x99, 0xaf, 0x5d, 0xc6, 0x67, 0xe8, 0xdb, 0x4a, - /* (2^ 65)P */ 0xdf, 0x09, 0x06, 0xa9, 0xa2, 0x71, 0xcd, 0x3a, 0x50, 0x40, 0xd0, 0x6d, 0x85, 0x91, 0xe9, 0xe5, 0x3c, 0xc2, 0x57, 0x81, 0x68, 0x9b, 0xc6, 0x1e, 0x4d, 0xfe, 0x5c, 0x88, 0xf6, 0x27, 0x74, 0x69, - /* (2^ 66)P */ 0x51, 0xa8, 0xe1, 0x65, 0x9b, 0x7b, 0xbe, 0xd7, 0xdd, 0x36, 0xc5, 0x22, 0xd5, 0x28, 0x3d, 0xa0, 0x45, 0xb6, 0xd2, 0x8f, 0x65, 0x9d, 0x39, 0x28, 0xe1, 0x41, 0x26, 0x7c, 0xe1, 0xb7, 0xe5, 0x49, - /* (2^ 67)P */ 0xa4, 0x57, 0x04, 0x70, 0x98, 0x3a, 0x8c, 0x6f, 0x78, 0x67, 0xbb, 0x5e, 0xa2, 0xf0, 0x78, 0x50, 0x0f, 0x96, 0x82, 0xc3, 0xcb, 0x3c, 0x3c, 0xd1, 0xb1, 0x84, 0xdf, 0xa7, 0x58, 0x32, 0x00, 0x2e, - /* (2^ 68)P */ 0x1c, 0x6a, 0x29, 0xe6, 0x9b, 0xf3, 0xd1, 0x8a, 0xb2, 0xbf, 0x5f, 0x2a, 0x65, 0xaa, 0xee, 0xc1, 0xcb, 0xf3, 0x26, 0xfd, 0x73, 0x06, 0xee, 0x33, 0xcc, 0x2c, 0x9d, 0xa6, 0x73, 0x61, 0x25, 0x59, - /* (2^ 69)P */ 0x41, 0xfc, 0x18, 0x4e, 0xaa, 0x07, 0xea, 0x41, 0x1e, 0xa5, 0x87, 0x7c, 0x52, 0x19, 0xfc, 0xd9, 0x6f, 0xca, 0x31, 0x58, 0x80, 0xcb, 0xaa, 0xbd, 0x4f, 0x69, 0x16, 0xc9, 0x2d, 0x65, 0x5b, 0x44, - /* (2^ 70)P */ 0x15, 0x23, 0x17, 0xf2, 0xa7, 0xa3, 0x92, 0xce, 0x64, 0x99, 0x1b, 0xe1, 0x2d, 0x28, 0xdc, 0x1e, 0x4a, 0x31, 0x4c, 0xe0, 0xaf, 0x3a, 0x82, 0xa1, 0x86, 0xf5, 0x7c, 0x43, 0x94, 0x2d, 0x0a, 0x79, - /* (2^ 71)P */ 0x09, 0xe0, 0xf6, 0x93, 0xfb, 0x47, 0xc4, 0x71, 0x76, 0x52, 0x84, 0x22, 0x67, 0xa5, 0x22, 0x89, 0x69, 0x51, 0x4f, 0x20, 0x3b, 0x90, 0x70, 0xbf, 0xfe, 0x19, 0xa3, 0x1b, 0x89, 0x89, 0x7a, 0x2f, - /* (2^ 72)P */ 0x0c, 0x14, 0xe2, 0x77, 0xb5, 0x8e, 0xa0, 0x02, 0xf4, 0xdc, 0x7b, 0x42, 0xd4, 0x4e, 0x9a, 0xed, 0xd1, 0x3c, 0x32, 0xe4, 0x44, 0xec, 0x53, 0x52, 0x5b, 0x35, 0xe9, 0x14, 0x3c, 0x36, 0x88, 0x3e, - /* (2^ 73)P */ 0x8c, 0x0b, 0x11, 0x77, 0x42, 0xc1, 0x66, 0xaa, 0x90, 0x33, 0xa2, 0x10, 0x16, 0x39, 0xe0, 0x1a, 0xa2, 0xc2, 0x3f, 0xc9, 0x12, 0xbd, 0x30, 0x20, 0xab, 0xc7, 0x55, 0x95, 0x57, 0x41, 0xe1, 0x3e, - /* (2^ 74)P */ 0x41, 0x7d, 0x6e, 0x6d, 0x3a, 0xde, 0x14, 0x92, 0xfe, 0x7e, 0xf1, 0x07, 0x86, 0xd8, 0xcd, 0x3c, 0x17, 0x12, 0xe1, 0xf8, 0x88, 0x12, 0x4f, 0x67, 0xd0, 0x93, 0x9f, 0x32, 0x0f, 0x25, 0x82, 0x56, - /* (2^ 75)P */ 0x6e, 0x39, 0x2e, 0x6d, 0x13, 0x0b, 0xf0, 0x6c, 0xbf, 0xde, 0x14, 0x10, 0x6f, 0xf8, 0x4c, 0x6e, 0x83, 0x4e, 0xcc, 0xbf, 0xb5, 0xb1, 0x30, 0x59, 0xb6, 0x16, 0xba, 0x8a, 0xb4, 0x69, 0x70, 0x04, - /* (2^ 76)P */ 0x93, 0x07, 0xb2, 0x69, 0xab, 0xe4, 0x4c, 0x0d, 0x9e, 0xfb, 0xd0, 0x97, 0x1a, 0xb9, 0x4d, 0xb2, 0x1d, 0xd0, 0x00, 0x4e, 0xf5, 0x50, 0xfa, 0xcd, 0xb5, 0xdd, 0x8b, 0x36, 0x85, 0x10, 0x1b, 0x22, - /* (2^ 77)P */ 0xd2, 0xd8, 0xe3, 0xb1, 0x68, 0x94, 0xe5, 0xe7, 0x93, 0x2f, 0x12, 0xbd, 0x63, 0x65, 0xc5, 0x53, 0x09, 0x3f, 0x66, 0xe0, 0x03, 0xa9, 0xe8, 0xee, 0x42, 0x3d, 0xbe, 0xcb, 0x62, 0xa6, 0xef, 0x61, - /* (2^ 78)P */ 0x2a, 0xab, 0x6e, 0xde, 0xdd, 0xdd, 0xf8, 0x2c, 0x31, 0xf2, 0x35, 0x14, 0xd5, 0x0a, 0xf8, 0x9b, 0x73, 0x49, 0xf0, 0xc9, 0xce, 0xda, 0xea, 0x5d, 0x27, 0x9b, 0xd2, 0x41, 0x5d, 0x5b, 0x27, 0x29, - /* (2^ 79)P */ 0x4f, 0xf1, 0xeb, 0x95, 0x08, 0x0f, 0xde, 0xcf, 0xa7, 0x05, 0x49, 0x05, 0x6b, 0xb9, 0xaa, 0xb9, 0xfd, 0x20, 0xc4, 0xa1, 0xd9, 0x0d, 0xe8, 0xca, 0xc7, 0xbb, 0x73, 0x16, 0x2f, 0xbf, 0x63, 0x0a, - /* (2^ 80)P */ 0x8c, 0xbc, 0x8f, 0x95, 0x11, 0x6e, 0x2f, 0x09, 0xad, 0x2f, 0x82, 0x04, 0xe8, 0x81, 0x2a, 0x67, 0x17, 0x25, 0xd5, 0x60, 0x15, 0x35, 0xc8, 0xca, 0xf8, 0x92, 0xf1, 0xc8, 0x22, 0x77, 0x3f, 0x6f, - /* (2^ 81)P */ 0xb7, 0x94, 0xe8, 0xc2, 0xcc, 0x90, 0xba, 0xf8, 0x0d, 0x9f, 0xff, 0x38, 0xa4, 0x57, 0x75, 0x2c, 0x59, 0x23, 0xe5, 0x5a, 0x85, 0x1d, 0x4d, 0x89, 0x69, 0x3d, 0x74, 0x7b, 0x15, 0x22, 0xe1, 0x68, - /* (2^ 82)P */ 0xf3, 0x19, 0xb9, 0xcf, 0x70, 0x55, 0x7e, 0xd8, 0xb9, 0x8d, 0x79, 0x95, 0xcd, 0xde, 0x2c, 0x3f, 0xce, 0xa2, 0xc0, 0x10, 0x47, 0x15, 0x21, 0x21, 0xb2, 0xc5, 0x6d, 0x24, 0x15, 0xa1, 0x66, 0x3c, - /* (2^ 83)P */ 0x72, 0xcb, 0x4e, 0x29, 0x62, 0xc5, 0xed, 0xcb, 0x16, 0x0b, 0x28, 0x6a, 0xc3, 0x43, 0x71, 0xba, 0x67, 0x8b, 0x07, 0xd4, 0xef, 0xc2, 0x10, 0x96, 0x1e, 0x4b, 0x6a, 0x94, 0x5d, 0x73, 0x44, 0x61, - /* (2^ 84)P */ 0x50, 0x33, 0x5b, 0xd7, 0x1e, 0x11, 0x6f, 0x53, 0x1b, 0xd8, 0x41, 0x20, 0x8c, 0xdb, 0x11, 0x02, 0x3c, 0x41, 0x10, 0x0e, 0x00, 0xb1, 0x3c, 0xf9, 0x76, 0x88, 0x9e, 0x03, 0x3c, 0xfd, 0x9d, 0x14, - /* (2^ 85)P */ 0x5b, 0x15, 0x63, 0x6b, 0xe4, 0xdd, 0x79, 0xd4, 0x76, 0x79, 0x83, 0x3c, 0xe9, 0x15, 0x6e, 0xb6, 0x38, 0xe0, 0x13, 0x1f, 0x3b, 0xe4, 0xfd, 0xda, 0x35, 0x0b, 0x4b, 0x2e, 0x1a, 0xda, 0xaf, 0x5f, - /* (2^ 86)P */ 0x81, 0x75, 0x19, 0x17, 0xdf, 0xbb, 0x00, 0x36, 0xc2, 0xd2, 0x3c, 0xbe, 0x0b, 0x05, 0x72, 0x39, 0x86, 0xbe, 0xd5, 0xbd, 0x6d, 0x90, 0x38, 0x59, 0x0f, 0x86, 0x9b, 0x3f, 0xe4, 0xe5, 0xfc, 0x34, - /* (2^ 87)P */ 0x02, 0x4d, 0xd1, 0x42, 0xcd, 0xa4, 0xa8, 0x75, 0x65, 0xdf, 0x41, 0x34, 0xc5, 0xab, 0x8d, 0x82, 0xd3, 0x31, 0xe1, 0xd2, 0xed, 0xab, 0xdc, 0x33, 0x5f, 0xd2, 0x14, 0xb8, 0x6f, 0xd7, 0xba, 0x3e, - /* (2^ 88)P */ 0x0f, 0xe1, 0x70, 0x6f, 0x56, 0x6f, 0x90, 0xd4, 0x5a, 0x0f, 0x69, 0x51, 0xaa, 0xf7, 0x12, 0x5d, 0xf2, 0xfc, 0xce, 0x76, 0x6e, 0xb1, 0xad, 0x45, 0x99, 0x29, 0x23, 0xad, 0xae, 0x68, 0xf7, 0x01, - /* (2^ 89)P */ 0xbd, 0xfe, 0x48, 0x62, 0x7b, 0xc7, 0x6c, 0x2b, 0xfd, 0xaf, 0x3a, 0xec, 0x28, 0x06, 0xd3, 0x3c, 0x6a, 0x48, 0xef, 0xd4, 0x80, 0x0b, 0x1c, 0xce, 0x23, 0x6c, 0xf6, 0xa6, 0x2e, 0xff, 0x3b, 0x4c, - /* (2^ 90)P */ 0x5f, 0xeb, 0xea, 0x4a, 0x09, 0xc4, 0x2e, 0x3f, 0xa7, 0x2c, 0x37, 0x6e, 0x28, 0x9b, 0xb1, 0x61, 0x1d, 0x70, 0x2a, 0xde, 0x66, 0xa9, 0xef, 0x5e, 0xef, 0xe3, 0x55, 0xde, 0x65, 0x05, 0xb2, 0x23, - /* (2^ 91)P */ 0x57, 0x85, 0xd5, 0x79, 0x52, 0xca, 0x01, 0xe3, 0x4f, 0x87, 0xc2, 0x27, 0xce, 0xd4, 0xb2, 0x07, 0x67, 0x1d, 0xcf, 0x9d, 0x8a, 0xcd, 0x32, 0xa5, 0x56, 0xff, 0x2b, 0x3f, 0xe2, 0xfe, 0x52, 0x2a, - /* (2^ 92)P */ 0x3d, 0x66, 0xd8, 0x7c, 0xb3, 0xef, 0x24, 0x86, 0x94, 0x75, 0xbd, 0xff, 0x20, 0xac, 0xc7, 0xbb, 0x45, 0x74, 0xd3, 0x82, 0x9c, 0x5e, 0xb8, 0x57, 0x66, 0xec, 0xa6, 0x86, 0xcb, 0x52, 0x30, 0x7b, - /* (2^ 93)P */ 0x1e, 0xe9, 0x25, 0x25, 0xad, 0xf0, 0x82, 0x34, 0xa0, 0xdc, 0x8e, 0xd2, 0x43, 0x80, 0xb6, 0x2c, 0x3a, 0x00, 0x1b, 0x2e, 0x05, 0x6d, 0x4f, 0xaf, 0x0a, 0x1b, 0x78, 0x29, 0x25, 0x8c, 0x5f, 0x18, - /* (2^ 94)P */ 0xd6, 0xe0, 0x0c, 0xd8, 0x5b, 0xde, 0x41, 0xaa, 0xd6, 0xe9, 0x53, 0x68, 0x41, 0xb2, 0x07, 0x94, 0x3a, 0x4c, 0x7f, 0x35, 0x6e, 0xc3, 0x3e, 0x56, 0xce, 0x7b, 0x29, 0x0e, 0xdd, 0xb8, 0xc4, 0x4c, - /* (2^ 95)P */ 0x0e, 0x73, 0xb8, 0xff, 0x52, 0x1a, 0xfc, 0xa2, 0x37, 0x8e, 0x05, 0x67, 0x6e, 0xf1, 0x11, 0x18, 0xe1, 0x4e, 0xdf, 0xcd, 0x66, 0xa3, 0xf9, 0x10, 0x99, 0xf0, 0xb9, 0xa0, 0xc4, 0xa0, 0xf4, 0x72, - /* (2^ 96)P */ 0xa7, 0x4e, 0x3f, 0x66, 0x6f, 0xc0, 0x16, 0x8c, 0xba, 0x0f, 0x97, 0x4e, 0xf7, 0x3a, 0x3b, 0x69, 0x45, 0xc3, 0x9e, 0xd6, 0xf1, 0xe7, 0x02, 0x21, 0x89, 0x80, 0x8a, 0x96, 0xbc, 0x3c, 0xa5, 0x0b, - /* (2^ 97)P */ 0x37, 0x55, 0xa1, 0xfe, 0xc7, 0x9d, 0x3d, 0xca, 0x93, 0x64, 0x53, 0x51, 0xbb, 0x24, 0x68, 0x4c, 0xb1, 0x06, 0x40, 0x84, 0x14, 0x63, 0x88, 0xb9, 0x60, 0xcc, 0x54, 0xb4, 0x2a, 0xa7, 0xd2, 0x40, - /* (2^ 98)P */ 0x75, 0x09, 0x57, 0x12, 0xb7, 0xa1, 0x36, 0x59, 0x57, 0xa6, 0xbd, 0xde, 0x48, 0xd6, 0xb9, 0x91, 0xea, 0x30, 0x43, 0xb6, 0x4b, 0x09, 0x44, 0x33, 0xd0, 0x51, 0xee, 0x12, 0x0d, 0xa1, 0x6b, 0x00, - /* (2^ 99)P */ 0x58, 0x5d, 0xde, 0xf5, 0x68, 0x84, 0x22, 0x19, 0xb0, 0x05, 0xcc, 0x38, 0x4c, 0x2f, 0xb1, 0x0e, 0x90, 0x19, 0x60, 0xd5, 0x9d, 0x9f, 0x03, 0xa1, 0x0b, 0x0e, 0xff, 0x4f, 0xce, 0xd4, 0x02, 0x45, - /* (2^100)P */ 0x89, 0xc1, 0x37, 0x68, 0x10, 0x54, 0x20, 0xeb, 0x3c, 0xb9, 0xd3, 0x6d, 0x4c, 0x54, 0xf6, 0xd0, 0x4f, 0xd7, 0x16, 0xc4, 0x64, 0x70, 0x72, 0x40, 0xf0, 0x2e, 0x50, 0x4b, 0x11, 0xc6, 0x15, 0x6e, - /* (2^101)P */ 0x6b, 0xa7, 0xb1, 0xcf, 0x98, 0xa3, 0xf2, 0x4d, 0xb1, 0xf6, 0xf2, 0x19, 0x74, 0x6c, 0x25, 0x11, 0x43, 0x60, 0x6e, 0x06, 0x62, 0x79, 0x49, 0x4a, 0x44, 0x5b, 0x35, 0x41, 0xab, 0x3a, 0x5b, 0x70, - /* (2^102)P */ 0xd8, 0xb1, 0x97, 0xd7, 0x36, 0xf5, 0x5e, 0x36, 0xdb, 0xf0, 0xdd, 0x22, 0xd6, 0x6b, 0x07, 0x00, 0x88, 0x5a, 0x57, 0xe0, 0xb0, 0x33, 0xbf, 0x3b, 0x4d, 0xca, 0xe4, 0xc8, 0x05, 0xaa, 0x77, 0x37, - /* (2^103)P */ 0x5f, 0xdb, 0x78, 0x55, 0xc8, 0x45, 0x27, 0x39, 0xe2, 0x5a, 0xae, 0xdb, 0x49, 0x41, 0xda, 0x6f, 0x67, 0x98, 0xdc, 0x8a, 0x0b, 0xb0, 0xf0, 0xb1, 0xa3, 0x1d, 0x6f, 0xd3, 0x37, 0x34, 0x96, 0x09, - /* (2^104)P */ 0x53, 0x38, 0xdc, 0xa5, 0x90, 0x4e, 0x82, 0x7e, 0xbd, 0x5c, 0x13, 0x1f, 0x64, 0xf6, 0xb5, 0xcc, 0xcc, 0x8f, 0xce, 0x87, 0x6c, 0xd8, 0x36, 0x67, 0x9f, 0x24, 0x04, 0x66, 0xe2, 0x3c, 0x5f, 0x62, - /* (2^105)P */ 0x3f, 0xf6, 0x02, 0x95, 0x05, 0xc8, 0x8a, 0xaf, 0x69, 0x14, 0x35, 0x2e, 0x0a, 0xe7, 0x05, 0x0c, 0x05, 0x63, 0x4b, 0x76, 0x9c, 0x2e, 0x29, 0x35, 0xc3, 0x3a, 0xe2, 0xc7, 0x60, 0x43, 0x39, 0x1a, - /* (2^106)P */ 0x64, 0x32, 0x18, 0x51, 0x32, 0xd5, 0xc6, 0xd5, 0x4f, 0xb7, 0xc2, 0x43, 0xbd, 0x5a, 0x06, 0x62, 0x9b, 0x3f, 0x97, 0x3b, 0xd0, 0xf5, 0xfb, 0xb5, 0x5e, 0x6e, 0x20, 0x61, 0x36, 0xda, 0xa3, 0x13, - /* (2^107)P */ 0xe5, 0x94, 0x5d, 0x72, 0x37, 0x58, 0xbd, 0xc6, 0xc5, 0x16, 0x50, 0x20, 0x12, 0x09, 0xe3, 0x18, 0x68, 0x3c, 0x03, 0x70, 0x15, 0xce, 0x88, 0x20, 0x87, 0x79, 0x83, 0x5c, 0x49, 0x1f, 0xba, 0x7f, - /* (2^108)P */ 0x9d, 0x07, 0xf9, 0xf2, 0x23, 0x74, 0x8c, 0x5a, 0xc5, 0x3f, 0x02, 0x34, 0x7b, 0x15, 0x35, 0x17, 0x51, 0xb3, 0xfa, 0xd2, 0x9a, 0xb4, 0xf9, 0xe4, 0x3c, 0xe3, 0x78, 0xc8, 0x72, 0xff, 0x91, 0x66, - /* (2^109)P */ 0x3e, 0xff, 0x5e, 0xdc, 0xde, 0x2a, 0x2c, 0x12, 0xf4, 0x6c, 0x95, 0xd8, 0xf1, 0x4b, 0xdd, 0xf8, 0xda, 0x5b, 0x9e, 0x9e, 0x5d, 0x20, 0x86, 0xeb, 0x43, 0xc7, 0x75, 0xd9, 0xb9, 0x92, 0x9b, 0x04, - /* (2^110)P */ 0x5a, 0xc0, 0xf6, 0xb0, 0x30, 0x97, 0x37, 0xa5, 0x53, 0xa5, 0xf3, 0xc6, 0xac, 0xff, 0xa0, 0x72, 0x6d, 0xcd, 0x0d, 0xb2, 0x34, 0x2c, 0x03, 0xb0, 0x4a, 0x16, 0xd5, 0x88, 0xbc, 0x9d, 0x0e, 0x47, - /* (2^111)P */ 0x47, 0xc0, 0x37, 0xa2, 0x0c, 0xf1, 0x9c, 0xb1, 0xa2, 0x81, 0x6c, 0x1f, 0x71, 0x66, 0x54, 0xb6, 0x43, 0x0b, 0xd8, 0x6d, 0xd1, 0x1b, 0x32, 0xb3, 0x8e, 0xbe, 0x5f, 0x0c, 0x60, 0x4f, 0xc1, 0x48, - /* (2^112)P */ 0x03, 0xc8, 0xa6, 0x4a, 0x26, 0x1c, 0x45, 0x66, 0xa6, 0x7d, 0xfa, 0xa4, 0x04, 0x39, 0x6e, 0xb6, 0x95, 0x83, 0x12, 0xb3, 0xb0, 0x19, 0x5f, 0xd4, 0x10, 0xbc, 0xc9, 0xc3, 0x27, 0x26, 0x60, 0x31, - /* (2^113)P */ 0x0d, 0xe1, 0xe4, 0x32, 0x48, 0xdc, 0x20, 0x31, 0xf7, 0x17, 0xc7, 0x56, 0x67, 0xc4, 0x20, 0xeb, 0x94, 0x02, 0x28, 0x67, 0x3f, 0x2e, 0xf5, 0x00, 0x09, 0xc5, 0x30, 0x47, 0xc1, 0x4f, 0x6d, 0x56, - /* (2^114)P */ 0x06, 0x72, 0x83, 0xfd, 0x40, 0x5d, 0x3a, 0x7e, 0x7a, 0x54, 0x59, 0x71, 0xdc, 0x26, 0xe9, 0xc1, 0x95, 0x60, 0x8d, 0xa6, 0xfb, 0x30, 0x67, 0x21, 0xa7, 0xce, 0x69, 0x3f, 0x84, 0xc3, 0xe8, 0x22, - /* (2^115)P */ 0x2b, 0x4b, 0x0e, 0x93, 0xe8, 0x74, 0xd0, 0x33, 0x16, 0x58, 0xd1, 0x84, 0x0e, 0x35, 0xe4, 0xb6, 0x65, 0x23, 0xba, 0xd6, 0x6a, 0xc2, 0x34, 0x55, 0xf3, 0xf3, 0xf1, 0x89, 0x2f, 0xc1, 0x73, 0x77, - /* (2^116)P */ 0xaa, 0x62, 0x79, 0xa5, 0x4d, 0x40, 0xba, 0x8c, 0x56, 0xce, 0x99, 0x19, 0xa8, 0x97, 0x98, 0x5b, 0xfc, 0x92, 0x16, 0x12, 0x2f, 0x86, 0x8e, 0x50, 0x91, 0xc2, 0x93, 0xa0, 0x7f, 0x90, 0x81, 0x3a, - /* (2^117)P */ 0x10, 0xa5, 0x25, 0x47, 0xff, 0xd0, 0xde, 0x0d, 0x03, 0xc5, 0x3f, 0x67, 0x10, 0xcc, 0xd8, 0x10, 0x89, 0x4e, 0x1f, 0x9f, 0x1c, 0x15, 0x9d, 0x5b, 0x4c, 0xa4, 0x09, 0xcb, 0xd5, 0xc1, 0xa5, 0x32, - /* (2^118)P */ 0xfb, 0x41, 0x05, 0xb9, 0x42, 0xa4, 0x0a, 0x1e, 0xdb, 0x85, 0xb4, 0xc1, 0x7c, 0xeb, 0x85, 0x5f, 0xe5, 0xf2, 0x9d, 0x8a, 0xce, 0x95, 0xe5, 0xbe, 0x36, 0x22, 0x42, 0x22, 0xc7, 0x96, 0xe4, 0x25, - /* (2^119)P */ 0xb9, 0xe5, 0x0f, 0xcd, 0x46, 0x3c, 0xdf, 0x5e, 0x88, 0x33, 0xa4, 0xd2, 0x7e, 0x5a, 0xe7, 0x34, 0x52, 0xe3, 0x61, 0xd7, 0x11, 0xde, 0x88, 0xe4, 0x5c, 0x54, 0x85, 0xa0, 0x01, 0x8a, 0x87, 0x0e, - /* (2^120)P */ 0x04, 0xbb, 0x21, 0xe0, 0x77, 0x3c, 0x49, 0xba, 0x9a, 0x89, 0xdf, 0xc7, 0x43, 0x18, 0x4d, 0x2b, 0x67, 0x0d, 0xe8, 0x7a, 0x48, 0x7a, 0xa3, 0x9e, 0x94, 0x17, 0xe4, 0x11, 0x80, 0x95, 0xa9, 0x67, - /* (2^121)P */ 0x65, 0xb0, 0x97, 0x66, 0x1a, 0x05, 0x58, 0x4b, 0xd4, 0xa6, 0x6b, 0x8d, 0x7d, 0x3f, 0xe3, 0x47, 0xc1, 0x46, 0xca, 0x83, 0xd4, 0xa8, 0x4d, 0xbb, 0x0d, 0xdb, 0xc2, 0x81, 0xa1, 0xca, 0xbe, 0x68, - /* (2^122)P */ 0xa5, 0x9a, 0x98, 0x0b, 0xe9, 0x80, 0x89, 0x8d, 0x9b, 0xc9, 0x93, 0x2c, 0x4a, 0xb1, 0x5e, 0xf9, 0xa2, 0x73, 0x6e, 0x79, 0xc4, 0xc7, 0xc6, 0x51, 0x69, 0xb5, 0xef, 0xb5, 0x63, 0x83, 0x22, 0x6e, - /* (2^123)P */ 0xc8, 0x24, 0xd6, 0x2d, 0xb0, 0xc0, 0xbb, 0xc6, 0xee, 0x70, 0x81, 0xec, 0x7d, 0xb4, 0x7e, 0x77, 0xa9, 0xaf, 0xcf, 0x04, 0xa0, 0x15, 0xde, 0x3c, 0x9b, 0xbf, 0x60, 0x71, 0x08, 0xbc, 0xc6, 0x1d, - /* (2^124)P */ 0x02, 0x40, 0xc3, 0xee, 0x43, 0xe0, 0x07, 0x2e, 0x7f, 0xdc, 0x68, 0x7a, 0x67, 0xfc, 0xe9, 0x18, 0x9a, 0x5b, 0xd1, 0x8b, 0x18, 0x03, 0xda, 0xd8, 0x53, 0x82, 0x56, 0x00, 0xbb, 0xc3, 0xfb, 0x48, - /* (2^125)P */ 0xe1, 0x4c, 0x65, 0xfb, 0x4c, 0x7d, 0x54, 0x57, 0xad, 0xe2, 0x58, 0xa0, 0x82, 0x5b, 0x56, 0xd3, 0x78, 0x44, 0x15, 0xbf, 0x0b, 0xaf, 0x3e, 0xf6, 0x18, 0xbb, 0xdf, 0x14, 0xf1, 0x1e, 0x53, 0x47, - /* (2^126)P */ 0x87, 0xc5, 0x78, 0x42, 0x0a, 0x63, 0xec, 0xe1, 0xf3, 0x83, 0x8e, 0xca, 0x46, 0xd5, 0x07, 0x55, 0x2b, 0x0c, 0xdc, 0x3a, 0xc6, 0x35, 0xe1, 0x85, 0x4e, 0x84, 0x82, 0x56, 0xa8, 0xef, 0xa7, 0x0a, - /* (2^127)P */ 0x15, 0xf6, 0xe1, 0xb3, 0xa8, 0x1b, 0x69, 0x72, 0xfa, 0x3f, 0xbe, 0x1f, 0x70, 0xe9, 0xb4, 0x32, 0x68, 0x78, 0xbb, 0x39, 0x2e, 0xd9, 0xb6, 0x97, 0xe8, 0x39, 0x2e, 0xa0, 0xde, 0x53, 0xfe, 0x2c, - /* (2^128)P */ 0xb0, 0x52, 0xcd, 0x85, 0xcd, 0x92, 0x73, 0x68, 0x31, 0x98, 0xe2, 0x10, 0xc9, 0x66, 0xff, 0x27, 0x06, 0x2d, 0x83, 0xa9, 0x56, 0x45, 0x13, 0x97, 0xa0, 0xf8, 0x84, 0x0a, 0x36, 0xb0, 0x9b, 0x26, - /* (2^129)P */ 0x5c, 0xf8, 0x43, 0x76, 0x45, 0x55, 0x6e, 0x70, 0x1b, 0x7d, 0x59, 0x9b, 0x8c, 0xa4, 0x34, 0x37, 0x72, 0xa4, 0xef, 0xc6, 0xe8, 0x91, 0xee, 0x7a, 0xe0, 0xd9, 0xa9, 0x98, 0xc1, 0xab, 0xd6, 0x5c, - /* (2^130)P */ 0x1a, 0xe4, 0x3c, 0xcb, 0x06, 0xde, 0x04, 0x0e, 0x38, 0xe1, 0x02, 0x34, 0x89, 0xeb, 0xc6, 0xd8, 0x72, 0x37, 0x6e, 0x68, 0xbb, 0x59, 0x46, 0x90, 0xc8, 0xa8, 0x6b, 0x74, 0x71, 0xc3, 0x15, 0x72, - /* (2^131)P */ 0xd9, 0xa2, 0xe4, 0xea, 0x7e, 0xa9, 0x12, 0xfd, 0xc5, 0xf2, 0x94, 0x63, 0x51, 0xb7, 0x14, 0x95, 0x94, 0xf2, 0x08, 0x92, 0x80, 0xd5, 0x6f, 0x26, 0xb9, 0x26, 0x9a, 0x61, 0x85, 0x70, 0x84, 0x5c, - /* (2^132)P */ 0xea, 0x94, 0xd6, 0xfe, 0x10, 0x54, 0x98, 0x52, 0x54, 0xd2, 0x2e, 0x4a, 0x93, 0x5b, 0x90, 0x3c, 0x67, 0xe4, 0x3b, 0x2d, 0x69, 0x47, 0xbb, 0x10, 0xe1, 0xe9, 0xe5, 0x69, 0x2d, 0x3d, 0x3b, 0x06, - /* (2^133)P */ 0xeb, 0x7d, 0xa5, 0xdd, 0xee, 0x26, 0x27, 0x47, 0x91, 0x18, 0xf4, 0x10, 0xae, 0xc4, 0xb6, 0xef, 0x14, 0x76, 0x30, 0x7b, 0x91, 0x41, 0x16, 0x2b, 0x7c, 0x5b, 0xf4, 0xc4, 0x4f, 0x55, 0x7c, 0x11, - /* (2^134)P */ 0x12, 0x88, 0x9d, 0x8f, 0x11, 0xf3, 0x7c, 0xc0, 0x39, 0x79, 0x01, 0x50, 0x20, 0xd8, 0xdb, 0x01, 0x27, 0x28, 0x1b, 0x17, 0xf4, 0x03, 0xe8, 0xd7, 0xea, 0x25, 0xd2, 0x87, 0x74, 0xe8, 0x15, 0x10, - /* (2^135)P */ 0x4d, 0xcc, 0x3a, 0xd2, 0xfe, 0xe3, 0x8d, 0xc5, 0x2d, 0xbe, 0xa7, 0x94, 0xc2, 0x91, 0xdb, 0x50, 0x57, 0xf4, 0x9c, 0x1c, 0x3d, 0xd4, 0x94, 0x0b, 0x4a, 0x52, 0x37, 0x6e, 0xfa, 0x40, 0x16, 0x6b, - /* (2^136)P */ 0x09, 0x0d, 0xda, 0x5f, 0x6c, 0x34, 0x2f, 0x69, 0x51, 0x31, 0x4d, 0xfa, 0x59, 0x1c, 0x0b, 0x20, 0x96, 0xa2, 0x77, 0x07, 0x76, 0x6f, 0xc4, 0xb8, 0xcf, 0xfb, 0xfd, 0x3f, 0x5f, 0x39, 0x38, 0x4b, - /* (2^137)P */ 0x71, 0xd6, 0x54, 0xbe, 0x00, 0x5e, 0xd2, 0x18, 0xa6, 0xab, 0xc8, 0xbe, 0x82, 0x05, 0xd5, 0x60, 0x82, 0xb9, 0x78, 0x3b, 0x26, 0x8f, 0xad, 0x87, 0x32, 0x04, 0xda, 0x9c, 0x4e, 0xf6, 0xfd, 0x50, - /* (2^138)P */ 0xf0, 0xdc, 0x78, 0xc5, 0xaa, 0x67, 0xf5, 0x90, 0x3b, 0x13, 0xa3, 0xf2, 0x0e, 0x9b, 0x1e, 0xef, 0x71, 0xde, 0xd9, 0x42, 0x92, 0xba, 0xeb, 0x0e, 0xc7, 0x01, 0x31, 0xf0, 0x9b, 0x3c, 0x47, 0x15, - /* (2^139)P */ 0x95, 0x80, 0xb7, 0x56, 0xae, 0xe8, 0x77, 0x7c, 0x8e, 0x07, 0x6f, 0x6e, 0x66, 0xe7, 0x78, 0xb6, 0x1f, 0xba, 0x48, 0x53, 0x61, 0xb9, 0xa0, 0x2d, 0x0b, 0x3f, 0x73, 0xff, 0xc1, 0x31, 0xf9, 0x7c, - /* (2^140)P */ 0x6c, 0x36, 0x0a, 0x0a, 0xf5, 0x57, 0xb3, 0x26, 0x32, 0xd7, 0x87, 0x2b, 0xf4, 0x8c, 0x70, 0xe9, 0xc0, 0xb2, 0x1c, 0xf9, 0xa5, 0xee, 0x3a, 0xc1, 0x4c, 0xbb, 0x43, 0x11, 0x99, 0x0c, 0xd9, 0x35, - /* (2^141)P */ 0xdc, 0xd9, 0xa0, 0xa9, 0x04, 0xc4, 0xc1, 0x47, 0x51, 0xd2, 0x72, 0x19, 0x45, 0x58, 0x9e, 0x65, 0x31, 0x8c, 0xb3, 0x73, 0xc4, 0xa8, 0x75, 0x38, 0x24, 0x1f, 0x56, 0x79, 0xd3, 0x9e, 0xbd, 0x1f, - /* (2^142)P */ 0x8d, 0xc2, 0x1e, 0xd4, 0x6f, 0xbc, 0xfa, 0x11, 0xca, 0x2d, 0x2a, 0xcd, 0xe3, 0xdf, 0xf8, 0x7e, 0x95, 0x45, 0x40, 0x8c, 0x5d, 0x3b, 0xe7, 0x72, 0x27, 0x2f, 0xb7, 0x54, 0x49, 0xfa, 0x35, 0x61, - /* (2^143)P */ 0x9c, 0xb6, 0x24, 0xde, 0xa2, 0x32, 0xfc, 0xcc, 0x88, 0x5d, 0x09, 0x1f, 0x8c, 0x69, 0x55, 0x3f, 0x29, 0xf9, 0xc3, 0x5a, 0xed, 0x50, 0x33, 0xbe, 0xeb, 0x7e, 0x47, 0xca, 0x06, 0xf8, 0x9b, 0x5e, - /* (2^144)P */ 0x68, 0x9f, 0x30, 0x3c, 0xb6, 0x8f, 0xce, 0xe9, 0xf4, 0xf9, 0xe1, 0x65, 0x35, 0xf6, 0x76, 0x53, 0xf1, 0x93, 0x63, 0x5a, 0xb3, 0xcf, 0xaf, 0xd1, 0x06, 0x35, 0x62, 0xe5, 0xed, 0xa1, 0x32, 0x66, - /* (2^145)P */ 0x4c, 0xed, 0x2d, 0x0c, 0x39, 0x6c, 0x7d, 0x0b, 0x1f, 0xcb, 0x04, 0xdf, 0x81, 0x32, 0xcb, 0x56, 0xc7, 0xc3, 0xec, 0x49, 0x12, 0x5a, 0x30, 0x66, 0x2a, 0xa7, 0x8c, 0xa3, 0x60, 0x8b, 0x58, 0x5d, - /* (2^146)P */ 0x2d, 0xf4, 0xe5, 0xe8, 0x78, 0xbf, 0xec, 0xa6, 0xec, 0x3e, 0x8a, 0x3c, 0x4b, 0xb4, 0xee, 0x86, 0x04, 0x16, 0xd2, 0xfb, 0x48, 0x9c, 0x21, 0xec, 0x31, 0x67, 0xc3, 0x17, 0xf5, 0x1a, 0xaf, 0x1a, - /* (2^147)P */ 0xe7, 0xbd, 0x69, 0x67, 0x83, 0xa2, 0x06, 0xc3, 0xdb, 0x2a, 0x1e, 0x2b, 0x62, 0x80, 0x82, 0x20, 0xa6, 0x94, 0xff, 0xfb, 0x1f, 0xf5, 0x27, 0x80, 0x6b, 0xf2, 0x24, 0x11, 0xce, 0xa1, 0xcf, 0x76, - /* (2^148)P */ 0xb6, 0xab, 0x22, 0x24, 0x56, 0x00, 0xeb, 0x18, 0xc3, 0x29, 0x8c, 0x8f, 0xd5, 0xc4, 0x77, 0xf3, 0x1a, 0x56, 0x31, 0xf5, 0x07, 0xc2, 0xbb, 0x4d, 0x27, 0x8a, 0x12, 0x82, 0xf0, 0xb7, 0x53, 0x02, - /* (2^149)P */ 0xe0, 0x17, 0x2c, 0xb6, 0x1c, 0x09, 0x1f, 0x3d, 0xa9, 0x28, 0x46, 0xd6, 0xab, 0xe1, 0x60, 0x48, 0x53, 0x42, 0x9d, 0x30, 0x36, 0x74, 0xd1, 0x52, 0x76, 0xe5, 0xfa, 0x3e, 0xe1, 0x97, 0x6f, 0x35, - /* (2^150)P */ 0x5b, 0x53, 0x50, 0xa1, 0x1a, 0xe1, 0x51, 0xd3, 0xcc, 0x78, 0xd8, 0x1d, 0xbb, 0x45, 0x6b, 0x3e, 0x98, 0x2c, 0xd9, 0xbe, 0x28, 0x61, 0x77, 0x0c, 0xb8, 0x85, 0x28, 0x03, 0x93, 0xae, 0x34, 0x1d, - /* (2^151)P */ 0xc3, 0xa4, 0x5b, 0xa8, 0x8c, 0x48, 0xa0, 0x4b, 0xce, 0xe6, 0x9c, 0x3c, 0xc3, 0x48, 0x53, 0x98, 0x70, 0xa7, 0xbd, 0x97, 0x6f, 0x4c, 0x12, 0x66, 0x4a, 0x12, 0x54, 0x06, 0x29, 0xa0, 0x81, 0x0f, - /* (2^152)P */ 0xfd, 0x86, 0x9b, 0x56, 0xa6, 0x9c, 0xd0, 0x9e, 0x2d, 0x9a, 0xaf, 0x18, 0xfd, 0x09, 0x10, 0x81, 0x0a, 0xc2, 0xd8, 0x93, 0x3f, 0xd0, 0x08, 0xff, 0x6b, 0xf2, 0xae, 0x9f, 0x19, 0x48, 0xa1, 0x52, - /* (2^153)P */ 0x73, 0x1b, 0x8d, 0x2d, 0xdc, 0xf9, 0x03, 0x3e, 0x70, 0x1a, 0x96, 0x73, 0x18, 0x80, 0x05, 0x42, 0x70, 0x59, 0xa3, 0x41, 0xf0, 0x87, 0xd9, 0xc0, 0x49, 0xd5, 0xc0, 0xa1, 0x15, 0x1f, 0xaa, 0x07, - /* (2^154)P */ 0x24, 0x72, 0xd2, 0x8c, 0xe0, 0x6c, 0xd4, 0xdf, 0x39, 0x42, 0x4e, 0x93, 0x4f, 0x02, 0x0a, 0x6d, 0x59, 0x7b, 0x89, 0x99, 0x63, 0x7a, 0x8a, 0x80, 0xa2, 0x95, 0x3d, 0xe1, 0xe9, 0x56, 0x45, 0x0a, - /* (2^155)P */ 0x45, 0x30, 0xc1, 0xe9, 0x1f, 0x99, 0x1a, 0xd2, 0xb8, 0x51, 0x77, 0xfe, 0x48, 0x85, 0x0e, 0x9b, 0x35, 0x00, 0xf3, 0x4b, 0xcb, 0x43, 0xa6, 0x5d, 0x21, 0xf7, 0x40, 0x39, 0xd6, 0x28, 0xdb, 0x77, - /* (2^156)P */ 0x11, 0x90, 0xdc, 0x4a, 0x61, 0xeb, 0x5e, 0xfc, 0xeb, 0x11, 0xc4, 0xe8, 0x9a, 0x41, 0x29, 0x52, 0x74, 0xcf, 0x1d, 0x7d, 0x78, 0xe7, 0xc3, 0x9e, 0xb5, 0x4c, 0x6e, 0x21, 0x3e, 0x05, 0x0d, 0x34, - /* (2^157)P */ 0xb4, 0xf2, 0x8d, 0xb4, 0x39, 0xaf, 0xc7, 0xca, 0x94, 0x0a, 0xa1, 0x71, 0x28, 0xec, 0xfa, 0xc0, 0xed, 0x75, 0xa5, 0x5c, 0x24, 0x69, 0x0a, 0x14, 0x4c, 0x3a, 0x27, 0x34, 0x71, 0xc3, 0xf1, 0x0c, - /* (2^158)P */ 0xa5, 0xb8, 0x24, 0xc2, 0x6a, 0x30, 0xee, 0xc8, 0xb0, 0x30, 0x49, 0xcb, 0x7c, 0xee, 0xea, 0x57, 0x4f, 0xe7, 0xcb, 0xaa, 0xbd, 0x06, 0xe8, 0xa1, 0x7d, 0x65, 0xeb, 0x2e, 0x74, 0x62, 0x9a, 0x7d, - /* (2^159)P */ 0x30, 0x48, 0x6c, 0x54, 0xef, 0xb6, 0xb6, 0x9e, 0x2e, 0x6e, 0xb3, 0xdd, 0x1f, 0xca, 0x5c, 0x88, 0x05, 0x71, 0x0d, 0xef, 0x83, 0xf3, 0xb9, 0xe6, 0x12, 0x04, 0x2e, 0x9d, 0xef, 0x4f, 0x65, 0x58, - /* (2^160)P */ 0x26, 0x8e, 0x0e, 0xbe, 0xff, 0xc4, 0x05, 0xa9, 0x6e, 0x81, 0x31, 0x9b, 0xdf, 0xe5, 0x2d, 0x94, 0xe1, 0x88, 0x2e, 0x80, 0x3f, 0x72, 0x7d, 0x49, 0x8d, 0x40, 0x2f, 0x60, 0xea, 0x4d, 0x68, 0x30, - /* (2^161)P */ 0x34, 0xcb, 0xe6, 0xa3, 0x78, 0xa2, 0xe5, 0x21, 0xc4, 0x1d, 0x15, 0x5b, 0x6f, 0x6e, 0xfb, 0xae, 0x15, 0xca, 0x77, 0x9d, 0x04, 0x8e, 0x0b, 0xb3, 0x81, 0x89, 0xb9, 0x53, 0xcf, 0xc9, 0xc3, 0x28, - /* (2^162)P */ 0x2a, 0xdd, 0x6c, 0x55, 0x21, 0xb7, 0x7f, 0x28, 0x74, 0x22, 0x02, 0x97, 0xa8, 0x7c, 0x31, 0x0d, 0x58, 0x32, 0x54, 0x3a, 0x42, 0xc7, 0x68, 0x74, 0x2f, 0x64, 0xb5, 0x4e, 0x46, 0x11, 0x7f, 0x4a, - /* (2^163)P */ 0xa6, 0x3a, 0x19, 0x4d, 0x77, 0xa4, 0x37, 0xa2, 0xa1, 0x29, 0x21, 0xa9, 0x6e, 0x98, 0x65, 0xd8, 0x88, 0x1a, 0x7c, 0xf8, 0xec, 0x15, 0xc5, 0x24, 0xeb, 0xf5, 0x39, 0x5f, 0x57, 0x03, 0x40, 0x60, - /* (2^164)P */ 0x27, 0x9b, 0x0a, 0x57, 0x89, 0xf1, 0xb9, 0x47, 0x78, 0x4b, 0x5e, 0x46, 0xde, 0xce, 0x98, 0x2b, 0x20, 0x5c, 0xb8, 0xdb, 0x51, 0xf5, 0x6d, 0x02, 0x01, 0x19, 0xe2, 0x47, 0x10, 0xd9, 0xfc, 0x74, - /* (2^165)P */ 0xa3, 0xbf, 0xc1, 0x23, 0x0a, 0xa9, 0xe2, 0x13, 0xf6, 0x19, 0x85, 0x47, 0x4e, 0x07, 0xb0, 0x0c, 0x44, 0xcf, 0xf6, 0x3a, 0xbe, 0xcb, 0xf1, 0x5f, 0xbe, 0x2d, 0x81, 0xbe, 0x38, 0x54, 0xfe, 0x67, - /* (2^166)P */ 0xb0, 0x05, 0x0f, 0xa4, 0x4f, 0xf6, 0x3c, 0xd1, 0x87, 0x37, 0x28, 0x32, 0x2f, 0xfb, 0x4d, 0x05, 0xea, 0x2a, 0x0d, 0x7f, 0x5b, 0x91, 0x73, 0x41, 0x4e, 0x0d, 0x61, 0x1f, 0x4f, 0x14, 0x2f, 0x48, - /* (2^167)P */ 0x34, 0x82, 0x7f, 0xb4, 0x01, 0x02, 0x21, 0xf6, 0x90, 0xb9, 0x70, 0x9e, 0x92, 0xe1, 0x0a, 0x5d, 0x7c, 0x56, 0x49, 0xb0, 0x55, 0xf4, 0xd7, 0xdc, 0x01, 0x6f, 0x91, 0xf0, 0xf1, 0xd0, 0x93, 0x7e, - /* (2^168)P */ 0xfa, 0xb4, 0x7d, 0x8a, 0xf1, 0xcb, 0x79, 0xdd, 0x2f, 0xc6, 0x74, 0x6f, 0xbf, 0x91, 0x83, 0xbe, 0xbd, 0x91, 0x82, 0x4b, 0xd1, 0x45, 0x71, 0x02, 0x05, 0x17, 0xbf, 0x2c, 0xea, 0x73, 0x5a, 0x58, - /* (2^169)P */ 0xb2, 0x0d, 0x8a, 0x92, 0x3e, 0xa0, 0x5c, 0x48, 0xe7, 0x57, 0x28, 0x74, 0xa5, 0x01, 0xfc, 0x10, 0xa7, 0x51, 0xd5, 0xd6, 0xdb, 0x2e, 0x48, 0x2f, 0x8a, 0xdb, 0x8f, 0x04, 0xb5, 0x33, 0x04, 0x0f, - /* (2^170)P */ 0x47, 0x62, 0xdc, 0xd7, 0x8d, 0x2e, 0xda, 0x60, 0x9a, 0x81, 0xd4, 0x8c, 0xd3, 0xc9, 0xb4, 0x88, 0x97, 0x66, 0xf6, 0x01, 0xc0, 0x3a, 0x03, 0x13, 0x75, 0x7d, 0x36, 0x3b, 0xfe, 0x24, 0x3b, 0x27, - /* (2^171)P */ 0xd4, 0xb9, 0xb3, 0x31, 0x6a, 0xf6, 0xe8, 0xc6, 0xd5, 0x49, 0xdf, 0x94, 0xa4, 0x14, 0x15, 0x28, 0xa7, 0x3d, 0xb2, 0xc8, 0xdf, 0x6f, 0x72, 0xd1, 0x48, 0xe5, 0xde, 0x03, 0xd1, 0xe7, 0x3a, 0x4b, - /* (2^172)P */ 0x7e, 0x9d, 0x4b, 0xce, 0x19, 0x6e, 0x25, 0xc6, 0x1c, 0xc6, 0xe3, 0x86, 0xf1, 0x5c, 0x5c, 0xff, 0x45, 0xc1, 0x8e, 0x4b, 0xa3, 0x3c, 0xc6, 0xac, 0x74, 0x65, 0xe6, 0xfe, 0x88, 0x18, 0x62, 0x74, - /* (2^173)P */ 0x1e, 0x0a, 0x29, 0x45, 0x96, 0x40, 0x6f, 0x95, 0x2e, 0x96, 0x3a, 0x26, 0xe3, 0xf8, 0x0b, 0xef, 0x7b, 0x64, 0xc2, 0x5e, 0xeb, 0x50, 0x6a, 0xed, 0x02, 0x75, 0xca, 0x9d, 0x3a, 0x28, 0x94, 0x06, - /* (2^174)P */ 0xd1, 0xdc, 0xa2, 0x43, 0x36, 0x96, 0x9b, 0x76, 0x53, 0x53, 0xfc, 0x09, 0xea, 0xc8, 0xb7, 0x42, 0xab, 0x7e, 0x39, 0x13, 0xee, 0x2a, 0x00, 0x4f, 0x3a, 0xd6, 0xb7, 0x19, 0x2c, 0x5e, 0x00, 0x63, - /* (2^175)P */ 0xea, 0x3b, 0x02, 0x63, 0xda, 0x36, 0x67, 0xca, 0xb7, 0x99, 0x2a, 0xb1, 0x6d, 0x7f, 0x6c, 0x96, 0xe1, 0xc5, 0x37, 0xc5, 0x90, 0x93, 0xe0, 0xac, 0xee, 0x89, 0xaa, 0xa1, 0x63, 0x60, 0x69, 0x0b, - /* (2^176)P */ 0xe5, 0x56, 0x8c, 0x28, 0x97, 0x3e, 0xb0, 0xeb, 0xe8, 0x8b, 0x8c, 0x93, 0x9f, 0x9f, 0x2a, 0x43, 0x71, 0x7f, 0x71, 0x5b, 0x3d, 0xa9, 0xa5, 0xa6, 0x97, 0x9d, 0x8f, 0xe1, 0xc3, 0xb4, 0x5f, 0x1a, - /* (2^177)P */ 0xce, 0xcd, 0x60, 0x1c, 0xad, 0xe7, 0x94, 0x1c, 0xa0, 0xc4, 0x02, 0xfc, 0x43, 0x2a, 0x20, 0xee, 0x20, 0x6a, 0xc4, 0x67, 0xd8, 0xe4, 0xaf, 0x8d, 0x58, 0x7b, 0xc2, 0x8a, 0x3c, 0x26, 0x10, 0x0a, - /* (2^178)P */ 0x4a, 0x2a, 0x43, 0xe4, 0xdf, 0xa9, 0xde, 0xd0, 0xc5, 0x77, 0x92, 0xbe, 0x7b, 0xf8, 0x6a, 0x85, 0x1a, 0xc7, 0x12, 0xc2, 0xac, 0x72, 0x84, 0xce, 0x91, 0x1e, 0xbb, 0x9b, 0x6d, 0x1b, 0x15, 0x6f, - /* (2^179)P */ 0x6a, 0xd5, 0xee, 0x7c, 0x52, 0x6c, 0x77, 0x26, 0xec, 0xfa, 0xf8, 0xfb, 0xb7, 0x1c, 0x21, 0x7d, 0xcc, 0x09, 0x46, 0xfd, 0xa6, 0x66, 0xae, 0x37, 0x42, 0x0c, 0x77, 0xd2, 0x02, 0xb7, 0x81, 0x1f, - /* (2^180)P */ 0x92, 0x83, 0xc5, 0xea, 0x57, 0xb0, 0xb0, 0x2f, 0x9d, 0x4e, 0x74, 0x29, 0xfe, 0x89, 0xdd, 0xe1, 0xf8, 0xb4, 0xbe, 0x17, 0xeb, 0xf8, 0x64, 0xc9, 0x1e, 0xd4, 0xa2, 0xc9, 0x73, 0x10, 0x57, 0x29, - /* (2^181)P */ 0x54, 0xe2, 0xc0, 0x81, 0x89, 0xa1, 0x48, 0xa9, 0x30, 0x28, 0xb2, 0x65, 0x9b, 0x36, 0xf6, 0x2d, 0xc6, 0xd3, 0xcf, 0x5f, 0xd7, 0xb2, 0x3e, 0xa3, 0x1f, 0xa0, 0x99, 0x41, 0xec, 0xd6, 0x8c, 0x07, - /* (2^182)P */ 0x2f, 0x0d, 0x90, 0xad, 0x41, 0x4a, 0x58, 0x4a, 0x52, 0x4c, 0xc7, 0xe2, 0x78, 0x2b, 0x14, 0x32, 0x78, 0xc9, 0x31, 0x84, 0x33, 0xe8, 0xc4, 0x68, 0xc2, 0x9f, 0x68, 0x08, 0x90, 0xea, 0x69, 0x7f, - /* (2^183)P */ 0x65, 0x82, 0xa3, 0x46, 0x1e, 0xc8, 0xf2, 0x52, 0xfd, 0x32, 0xa8, 0x04, 0x2d, 0x07, 0x78, 0xfd, 0x94, 0x9e, 0x35, 0x25, 0xfa, 0xd5, 0xd7, 0x8c, 0xd2, 0x29, 0xcc, 0x54, 0x74, 0x1b, 0xe7, 0x4d, - /* (2^184)P */ 0xc9, 0x6a, 0xda, 0x1e, 0xad, 0x60, 0xeb, 0x42, 0x3a, 0x9c, 0xc0, 0xdb, 0xdf, 0x37, 0xad, 0x0a, 0x91, 0xc1, 0x3c, 0xe3, 0x71, 0x4b, 0x00, 0x81, 0x3c, 0x80, 0x22, 0x51, 0x34, 0xbe, 0xe6, 0x44, - /* (2^185)P */ 0xdb, 0x20, 0x19, 0xba, 0x88, 0x83, 0xfe, 0x03, 0x08, 0xb0, 0x0d, 0x15, 0x32, 0x7c, 0xd5, 0xf5, 0x29, 0x0c, 0xf6, 0x1a, 0x28, 0xc4, 0xc8, 0x49, 0xee, 0x1a, 0x70, 0xde, 0x18, 0xb5, 0xed, 0x21, - /* (2^186)P */ 0x99, 0xdc, 0x06, 0x8f, 0x41, 0x3e, 0xb6, 0x7f, 0xb8, 0xd7, 0x66, 0xc1, 0x99, 0x0d, 0x46, 0xa4, 0x83, 0x0a, 0x52, 0xce, 0x48, 0x52, 0xdd, 0x24, 0x58, 0x83, 0x92, 0x2b, 0x71, 0xad, 0xc3, 0x5e, - /* (2^187)P */ 0x0f, 0x93, 0x17, 0xbd, 0x5f, 0x2a, 0x02, 0x15, 0xe3, 0x70, 0x25, 0xd8, 0x77, 0x4a, 0xf6, 0xa4, 0x12, 0x37, 0x78, 0x15, 0x69, 0x8d, 0xbc, 0x12, 0xbb, 0x0a, 0x62, 0xfc, 0xc0, 0x94, 0x81, 0x49, - /* (2^188)P */ 0x82, 0x6c, 0x68, 0x55, 0xd2, 0xd9, 0xa2, 0x38, 0xf0, 0x21, 0x3e, 0x19, 0xd9, 0x6b, 0x5c, 0x78, 0x84, 0x54, 0x4a, 0xb2, 0x1a, 0xc8, 0xd5, 0xe4, 0x89, 0x09, 0xe2, 0xb2, 0x60, 0x78, 0x30, 0x56, - /* (2^189)P */ 0xc4, 0x74, 0x4d, 0x8b, 0xf7, 0x55, 0x9d, 0x42, 0x31, 0x01, 0x35, 0x43, 0x46, 0x83, 0xf1, 0x22, 0xff, 0x1f, 0xc7, 0x98, 0x45, 0xc2, 0x60, 0x1e, 0xef, 0x83, 0x99, 0x97, 0x14, 0xf0, 0xf2, 0x59, - /* (2^190)P */ 0x44, 0x4a, 0x49, 0xeb, 0x56, 0x7d, 0xa4, 0x46, 0x8e, 0xa1, 0x36, 0xd6, 0x54, 0xa8, 0x22, 0x3e, 0x3b, 0x1c, 0x49, 0x74, 0x52, 0xe1, 0x46, 0xb3, 0xe7, 0xcd, 0x90, 0x53, 0x4e, 0xfd, 0xea, 0x2c, - /* (2^191)P */ 0x75, 0x66, 0x0d, 0xbe, 0x38, 0x85, 0x8a, 0xba, 0x23, 0x8e, 0x81, 0x50, 0xbb, 0x74, 0x90, 0x4b, 0xc3, 0x04, 0xd3, 0x85, 0x90, 0xb8, 0xda, 0xcb, 0xc4, 0x92, 0x61, 0xe5, 0xe0, 0x4f, 0xa2, 0x61, - /* (2^192)P */ 0xcb, 0x5b, 0x52, 0xdb, 0xe6, 0x15, 0x76, 0xcb, 0xca, 0xe4, 0x67, 0xa5, 0x35, 0x8c, 0x7d, 0xdd, 0x69, 0xdd, 0xfc, 0xca, 0x3a, 0x15, 0xb4, 0xe6, 0x66, 0x97, 0x3c, 0x7f, 0x09, 0x8e, 0x66, 0x2d, - /* (2^193)P */ 0xf0, 0x5e, 0xe5, 0x5c, 0x26, 0x7e, 0x7e, 0xa5, 0x67, 0xb9, 0xd4, 0x7c, 0x52, 0x4e, 0x9f, 0x5d, 0xe5, 0xd1, 0x2f, 0x49, 0x06, 0x36, 0xc8, 0xfb, 0xae, 0xf7, 0xc3, 0xb7, 0xbe, 0x52, 0x0d, 0x09, - /* (2^194)P */ 0x7c, 0x4d, 0x7b, 0x1e, 0x5a, 0x51, 0xb9, 0x09, 0xc0, 0x44, 0xda, 0x99, 0x25, 0x6a, 0x26, 0x1f, 0x04, 0x55, 0xc5, 0xe2, 0x48, 0x95, 0xc4, 0xa1, 0xcc, 0x15, 0x6f, 0x12, 0x87, 0x42, 0xf0, 0x7e, - /* (2^195)P */ 0x15, 0xef, 0x30, 0xbd, 0x9d, 0x65, 0xd1, 0xfe, 0x7b, 0x27, 0xe0, 0xc4, 0xee, 0xb9, 0x4a, 0x8b, 0x91, 0x32, 0xdf, 0xa5, 0x36, 0x62, 0x4d, 0x88, 0x88, 0xf7, 0x5c, 0xbf, 0xa6, 0x6e, 0xd9, 0x1f, - /* (2^196)P */ 0x9a, 0x0d, 0x19, 0x1f, 0x98, 0x61, 0xa1, 0x42, 0xc1, 0x52, 0x60, 0x7e, 0x50, 0x49, 0xd8, 0x61, 0xd5, 0x2c, 0x5a, 0x28, 0xbf, 0x13, 0xe1, 0x9f, 0xd8, 0x85, 0xad, 0xdb, 0x76, 0xd6, 0x22, 0x7c, - /* (2^197)P */ 0x7d, 0xd2, 0xfb, 0x2b, 0xed, 0x70, 0xe7, 0x82, 0xa5, 0xf5, 0x96, 0xe9, 0xec, 0xb2, 0x05, 0x4c, 0x50, 0x01, 0x90, 0xb0, 0xc2, 0xa9, 0x40, 0xcd, 0x64, 0xbf, 0xd9, 0x13, 0x92, 0x31, 0x95, 0x58, - /* (2^198)P */ 0x08, 0x2e, 0xea, 0x3f, 0x70, 0x5d, 0xcc, 0xe7, 0x8c, 0x18, 0xe2, 0x58, 0x12, 0x49, 0x0c, 0xb5, 0xf0, 0x5b, 0x20, 0x48, 0xaa, 0x0b, 0xe3, 0xcc, 0x62, 0x2d, 0xa3, 0xcf, 0x9c, 0x65, 0x7c, 0x53, - /* (2^199)P */ 0x88, 0xc0, 0xcf, 0x98, 0x3a, 0x62, 0xb6, 0x37, 0xa4, 0xac, 0xd6, 0xa4, 0x1f, 0xed, 0x9b, 0xfe, 0xb0, 0xd1, 0xa8, 0x56, 0x8e, 0x9b, 0xd2, 0x04, 0x75, 0x95, 0x51, 0x0b, 0xc4, 0x71, 0x5f, 0x72, - /* (2^200)P */ 0xe6, 0x9c, 0x33, 0xd0, 0x9c, 0xf8, 0xc7, 0x28, 0x8b, 0xc1, 0xdd, 0x69, 0x44, 0xb1, 0x67, 0x83, 0x2c, 0x65, 0xa1, 0xa6, 0x83, 0xda, 0x3a, 0x88, 0x17, 0x6c, 0x4d, 0x03, 0x74, 0x19, 0x5f, 0x58, - /* (2^201)P */ 0x88, 0x91, 0xb1, 0xf1, 0x66, 0xb2, 0xcf, 0x89, 0x17, 0x52, 0xc3, 0xe7, 0x63, 0x48, 0x3b, 0xe6, 0x6a, 0x52, 0xc0, 0xb4, 0xa6, 0x9d, 0x8c, 0xd8, 0x35, 0x46, 0x95, 0xf0, 0x9d, 0x5c, 0x03, 0x3e, - /* (2^202)P */ 0x9d, 0xde, 0x45, 0xfb, 0x12, 0x54, 0x9d, 0xdd, 0x0d, 0xf4, 0xcf, 0xe4, 0x32, 0x45, 0x68, 0xdd, 0x1c, 0x67, 0x1d, 0x15, 0x9b, 0x99, 0x5c, 0x4b, 0x90, 0xf6, 0xe7, 0x11, 0xc8, 0x2c, 0x8c, 0x2d, - /* (2^203)P */ 0x40, 0x5d, 0x05, 0x90, 0x1d, 0xbe, 0x54, 0x7f, 0x40, 0xaf, 0x4a, 0x46, 0xdf, 0xc5, 0x64, 0xa4, 0xbe, 0x17, 0xe9, 0xf0, 0x24, 0x96, 0x97, 0x33, 0x30, 0x6b, 0x35, 0x27, 0xc5, 0x8d, 0x01, 0x2c, - /* (2^204)P */ 0xd4, 0xb3, 0x30, 0xe3, 0x24, 0x50, 0x41, 0xa5, 0xd3, 0x52, 0x16, 0x69, 0x96, 0x3d, 0xff, 0x73, 0xf1, 0x59, 0x9b, 0xef, 0xc4, 0x42, 0xec, 0x94, 0x5a, 0x8e, 0xd0, 0x18, 0x16, 0x20, 0x47, 0x07, - /* (2^205)P */ 0x53, 0x1c, 0x41, 0xca, 0x8a, 0xa4, 0x6c, 0x4d, 0x19, 0x61, 0xa6, 0xcf, 0x2f, 0x5f, 0x41, 0x66, 0xff, 0x27, 0xe2, 0x51, 0x00, 0xd4, 0x4d, 0x9c, 0xeb, 0xf7, 0x02, 0x9a, 0xc0, 0x0b, 0x81, 0x59, - /* (2^206)P */ 0x1d, 0x10, 0xdc, 0xb3, 0x71, 0xb1, 0x7e, 0x2a, 0x8e, 0xf6, 0xfe, 0x9f, 0xb9, 0x5a, 0x1c, 0x44, 0xea, 0x59, 0xb3, 0x93, 0x9b, 0x5c, 0x02, 0x32, 0x2f, 0x11, 0x9d, 0x1e, 0xa7, 0xe0, 0x8c, 0x5e, - /* (2^207)P */ 0xfd, 0x03, 0x95, 0x42, 0x92, 0xcb, 0xcc, 0xbf, 0x55, 0x5d, 0x09, 0x2f, 0x75, 0xba, 0x71, 0xd2, 0x1e, 0x09, 0x2d, 0x97, 0x5e, 0xad, 0x5e, 0x34, 0xba, 0x03, 0x31, 0xa8, 0x11, 0xdf, 0xc8, 0x18, - /* (2^208)P */ 0x4c, 0x0f, 0xed, 0x9a, 0x9a, 0x94, 0xcd, 0x90, 0x7e, 0xe3, 0x60, 0x66, 0xcb, 0xf4, 0xd1, 0xc5, 0x0b, 0x2e, 0xc5, 0x56, 0x2d, 0xc5, 0xca, 0xb8, 0x0d, 0x8e, 0x80, 0xc5, 0x00, 0xe4, 0x42, 0x6e, - /* (2^209)P */ 0x23, 0xfd, 0xae, 0xee, 0x66, 0x69, 0xb4, 0xa3, 0xca, 0xcd, 0x9e, 0xe3, 0x0b, 0x1f, 0x4f, 0x0c, 0x1d, 0xa5, 0x83, 0xd6, 0xc9, 0xc8, 0x9d, 0x18, 0x1b, 0x35, 0x09, 0x4c, 0x05, 0x7f, 0xf2, 0x51, - /* (2^210)P */ 0x82, 0x06, 0x32, 0x2a, 0xcd, 0x7c, 0x48, 0x4c, 0x96, 0x1c, 0xdf, 0xb3, 0x5b, 0xa9, 0x7e, 0x58, 0xe8, 0xb8, 0x5c, 0x55, 0x9e, 0xf7, 0xcc, 0xc8, 0x3d, 0xd7, 0x06, 0xa2, 0x29, 0xc8, 0x7d, 0x54, - /* (2^211)P */ 0x06, 0x9b, 0xc3, 0x80, 0xcd, 0xa6, 0x22, 0xb8, 0xc6, 0xd4, 0x00, 0x20, 0x73, 0x54, 0x6d, 0xe9, 0x4d, 0x3b, 0x46, 0x91, 0x6f, 0x5b, 0x53, 0x28, 0x1d, 0x6e, 0x48, 0xe2, 0x60, 0x46, 0x8f, 0x22, - /* (2^212)P */ 0xbf, 0x3a, 0x8d, 0xde, 0x38, 0x95, 0x79, 0x98, 0x6e, 0xca, 0xeb, 0x45, 0x00, 0x33, 0xd8, 0x8c, 0x38, 0xe7, 0x21, 0x82, 0x00, 0x2a, 0x95, 0x79, 0xbb, 0xd2, 0x5c, 0x53, 0xa7, 0xe1, 0x22, 0x43, - /* (2^213)P */ 0x1c, 0x80, 0xd1, 0x19, 0x18, 0xc1, 0x14, 0xb1, 0xc7, 0x5e, 0x3f, 0x4f, 0xd8, 0xe4, 0x16, 0x20, 0x4c, 0x0f, 0x26, 0x09, 0xf4, 0x2d, 0x0e, 0xdd, 0x66, 0x72, 0x5f, 0xae, 0xc0, 0x62, 0xc3, 0x5e, - /* (2^214)P */ 0xee, 0xb4, 0xb2, 0xb8, 0x18, 0x2b, 0x46, 0xc0, 0xfb, 0x1a, 0x4d, 0x27, 0x50, 0xd9, 0xc8, 0x7c, 0xd2, 0x02, 0x6b, 0x43, 0x05, 0x71, 0x5f, 0xf2, 0xd3, 0xcc, 0xf9, 0xbf, 0xdc, 0xf8, 0xbb, 0x43, - /* (2^215)P */ 0xdf, 0xe9, 0x39, 0xa0, 0x67, 0x17, 0xad, 0xb6, 0x83, 0x35, 0x9d, 0xf6, 0xa8, 0x4d, 0x71, 0xb0, 0xf5, 0x31, 0x29, 0xb4, 0x18, 0xfa, 0x55, 0x5e, 0x61, 0x09, 0xc6, 0x33, 0x8f, 0x55, 0xd5, 0x4e, - /* (2^216)P */ 0xdd, 0xa5, 0x47, 0xc6, 0x01, 0x79, 0xe3, 0x1f, 0x57, 0xd3, 0x81, 0x80, 0x1f, 0xdf, 0x3d, 0x59, 0xa6, 0xd7, 0x3f, 0x81, 0xfd, 0xa4, 0x49, 0x02, 0x61, 0xaf, 0x9c, 0x4e, 0x27, 0xca, 0xac, 0x69, - /* (2^217)P */ 0xc9, 0x21, 0x07, 0x33, 0xea, 0xa3, 0x7b, 0x04, 0xa0, 0x1e, 0x7e, 0x0e, 0xc2, 0x3f, 0x42, 0x83, 0x60, 0x4a, 0x31, 0x01, 0xaf, 0xc0, 0xf4, 0x1d, 0x27, 0x95, 0x28, 0x89, 0xab, 0x2d, 0xa6, 0x09, - /* (2^218)P */ 0x00, 0xcb, 0xc6, 0x9c, 0xa4, 0x25, 0xb3, 0xa5, 0xb6, 0x6c, 0xb5, 0x54, 0xc6, 0x5d, 0x4b, 0xe9, 0xa0, 0x94, 0xc9, 0xad, 0x79, 0x87, 0xe2, 0x3b, 0xad, 0x4a, 0x3a, 0xba, 0xf8, 0xe8, 0x96, 0x42, - /* (2^219)P */ 0xab, 0x1e, 0x45, 0x1e, 0x76, 0x89, 0x86, 0x32, 0x4a, 0x59, 0x59, 0xff, 0x8b, 0x59, 0x4d, 0x2e, 0x4a, 0x08, 0xa7, 0xd7, 0x53, 0x68, 0xb9, 0x49, 0xa8, 0x20, 0x14, 0x60, 0x19, 0xa3, 0x80, 0x49, - /* (2^220)P */ 0x42, 0x2c, 0x55, 0x2f, 0xe1, 0xb9, 0x65, 0x95, 0x96, 0xfe, 0x00, 0x71, 0xdb, 0x18, 0x53, 0x8a, 0xd7, 0xd0, 0xad, 0x43, 0x4d, 0x0b, 0xc9, 0x05, 0xda, 0x4e, 0x5d, 0x6a, 0xd6, 0x4c, 0x8b, 0x53, - /* (2^221)P */ 0x9f, 0x03, 0x9f, 0xe8, 0xc3, 0x4f, 0xe9, 0xf4, 0x45, 0x80, 0x61, 0x6f, 0xf2, 0x9a, 0x2c, 0x59, 0x50, 0x95, 0x4b, 0xfd, 0xb5, 0x6e, 0xa3, 0x08, 0x19, 0x14, 0xed, 0xc2, 0xf6, 0xfa, 0xff, 0x25, - /* (2^222)P */ 0x54, 0xd3, 0x79, 0xcc, 0x59, 0x44, 0x43, 0x34, 0x6b, 0x47, 0xd5, 0xb1, 0xb4, 0xbf, 0xec, 0xee, 0x99, 0x5d, 0x61, 0x61, 0xa0, 0x34, 0xeb, 0xdd, 0x73, 0xb7, 0x64, 0xeb, 0xcc, 0xce, 0x29, 0x51, - /* (2^223)P */ 0x20, 0x35, 0x99, 0x94, 0x58, 0x21, 0x43, 0xee, 0x3b, 0x0b, 0x4c, 0xf1, 0x7c, 0x9c, 0x2f, 0x77, 0xd5, 0xda, 0xbe, 0x06, 0xe3, 0xfc, 0xe2, 0xd2, 0x97, 0x6a, 0xf0, 0x46, 0xb5, 0x42, 0x5f, 0x71, - /* (2^224)P */ 0x1a, 0x5f, 0x5b, 0xda, 0xce, 0xcd, 0x4e, 0x43, 0xa9, 0x41, 0x97, 0xa4, 0x15, 0x71, 0xa1, 0x0d, 0x2e, 0xad, 0xed, 0x73, 0x7c, 0xd7, 0x0b, 0x68, 0x41, 0x90, 0xdd, 0x4e, 0x35, 0x02, 0x7c, 0x48, - /* (2^225)P */ 0xc4, 0xd9, 0x0e, 0xa7, 0xf3, 0xef, 0xef, 0xb8, 0x02, 0xe3, 0x57, 0xe8, 0xa3, 0x2a, 0xa3, 0x56, 0xa0, 0xa5, 0xa2, 0x48, 0xbd, 0x68, 0x3a, 0xdf, 0x44, 0xc4, 0x76, 0x31, 0xb7, 0x50, 0xf6, 0x07, - /* (2^226)P */ 0xb1, 0xcc, 0xe0, 0x26, 0x16, 0x9b, 0x8b, 0xe3, 0x36, 0xfb, 0x09, 0x8b, 0xc1, 0x53, 0xe0, 0x79, 0x64, 0x49, 0xf9, 0xc9, 0x19, 0x03, 0xd9, 0x56, 0xc4, 0xf5, 0x9f, 0xac, 0xe7, 0x41, 0xa9, 0x1c, - /* (2^227)P */ 0xbb, 0xa0, 0x2f, 0x16, 0x29, 0xdf, 0xc4, 0x49, 0x05, 0x33, 0xb3, 0x82, 0x32, 0xcf, 0x88, 0x84, 0x7d, 0x43, 0xbb, 0xca, 0x14, 0xda, 0xdf, 0x95, 0x86, 0xad, 0xd5, 0x64, 0x82, 0xf7, 0x91, 0x33, - /* (2^228)P */ 0x5d, 0x09, 0xb5, 0xe2, 0x6a, 0xe0, 0x9a, 0x72, 0x46, 0xa9, 0x59, 0x32, 0xd7, 0x58, 0x8a, 0xd5, 0xed, 0x21, 0x39, 0xd1, 0x62, 0x42, 0x83, 0xe9, 0x92, 0xb5, 0x4b, 0xa5, 0xfa, 0xda, 0xfe, 0x27, - /* (2^229)P */ 0xbb, 0x48, 0xad, 0x29, 0xb8, 0xc5, 0x9d, 0xa9, 0x60, 0xe2, 0x9e, 0x49, 0x42, 0x57, 0x02, 0x5f, 0xfd, 0x13, 0x75, 0x5d, 0xcd, 0x8e, 0x2c, 0x80, 0x38, 0xd9, 0x6d, 0x3f, 0xef, 0xb3, 0xce, 0x78, - /* (2^230)P */ 0x94, 0x5d, 0x13, 0x8a, 0x4f, 0xf4, 0x42, 0xc3, 0xa3, 0xdd, 0x8c, 0x82, 0x44, 0xdb, 0x9e, 0x7b, 0xe7, 0xcf, 0x37, 0x05, 0x1a, 0xd1, 0x36, 0x94, 0xc8, 0xb4, 0x1a, 0xec, 0x64, 0xb1, 0x64, 0x50, - /* (2^231)P */ 0xfc, 0xb2, 0x7e, 0xd3, 0xcf, 0xec, 0x20, 0x70, 0xfc, 0x25, 0x0d, 0xd9, 0x3e, 0xea, 0x31, 0x1f, 0x34, 0xbb, 0xa1, 0xdf, 0x7b, 0x0d, 0x93, 0x1b, 0x44, 0x30, 0x11, 0x48, 0x7a, 0x46, 0x44, 0x53, - /* (2^232)P */ 0xfb, 0x6d, 0x5e, 0xf2, 0x70, 0x31, 0x07, 0x70, 0xc8, 0x4c, 0x11, 0x50, 0x1a, 0xdc, 0x85, 0xe3, 0x00, 0x4f, 0xfc, 0xc8, 0x8a, 0x69, 0x48, 0x23, 0xd8, 0x40, 0xdd, 0x84, 0x52, 0xa5, 0x77, 0x2a, - /* (2^233)P */ 0xe4, 0x6c, 0x8c, 0xc9, 0xe0, 0xaf, 0x06, 0xfe, 0xe4, 0xd6, 0xdf, 0xdd, 0x96, 0xdf, 0x35, 0xc2, 0xd3, 0x1e, 0xbf, 0x33, 0x1e, 0xd0, 0x28, 0x14, 0xaf, 0xbd, 0x00, 0x93, 0xec, 0x68, 0x57, 0x78, - /* (2^234)P */ 0x3b, 0xb6, 0xde, 0x91, 0x7a, 0xe5, 0x02, 0x97, 0x80, 0x8b, 0xce, 0xe5, 0xbf, 0xb8, 0xbd, 0x61, 0xac, 0x58, 0x1d, 0x3d, 0x6f, 0x42, 0x5b, 0x64, 0xbc, 0x57, 0xa5, 0x27, 0x22, 0xa8, 0x04, 0x48, - /* (2^235)P */ 0x01, 0x26, 0x4d, 0xb4, 0x8a, 0x04, 0x57, 0x8e, 0x35, 0x69, 0x3a, 0x4b, 0x1a, 0x50, 0xd6, 0x68, 0x93, 0xc2, 0xe1, 0xf9, 0xc3, 0x9e, 0x9c, 0xc3, 0xe2, 0x63, 0xde, 0xd4, 0x57, 0xf2, 0x72, 0x41, - /* (2^236)P */ 0x01, 0x64, 0x0c, 0x33, 0x50, 0xb4, 0x68, 0xd3, 0x91, 0x23, 0x8f, 0x41, 0x17, 0x30, 0x0d, 0x04, 0x0d, 0xd9, 0xb7, 0x90, 0x60, 0xbb, 0x34, 0x2c, 0x1f, 0xd5, 0xdf, 0x8f, 0x22, 0x49, 0xf6, 0x16, - /* (2^237)P */ 0xf5, 0x8e, 0x92, 0x2b, 0x8e, 0x81, 0xa6, 0xbe, 0x72, 0x1e, 0xc1, 0xcd, 0x91, 0xcf, 0x8c, 0xe2, 0xcd, 0x36, 0x7a, 0xe7, 0x68, 0xaa, 0x4a, 0x59, 0x0f, 0xfd, 0x7f, 0x6c, 0x80, 0x34, 0x30, 0x31, - /* (2^238)P */ 0x65, 0xbd, 0x49, 0x22, 0xac, 0x27, 0x9d, 0x8a, 0x12, 0x95, 0x8e, 0x01, 0x64, 0xb4, 0xa3, 0x19, 0xc7, 0x7e, 0xb3, 0x52, 0xf3, 0xcf, 0x6c, 0xc2, 0x21, 0x7b, 0x79, 0x1d, 0x34, 0x68, 0x6f, 0x05, - /* (2^239)P */ 0x27, 0x23, 0xfd, 0x7e, 0x75, 0xd6, 0x79, 0x5e, 0x15, 0xfe, 0x3a, 0x55, 0xb6, 0xbc, 0xbd, 0xfa, 0x60, 0x5a, 0xaf, 0x6e, 0x2c, 0x22, 0xe7, 0xd3, 0x3b, 0x74, 0xae, 0x4d, 0x6d, 0xc7, 0x46, 0x70, - /* (2^240)P */ 0x55, 0x4a, 0x8d, 0xb1, 0x72, 0xe8, 0x0b, 0x66, 0x96, 0x14, 0x4e, 0x57, 0x18, 0x25, 0x99, 0x19, 0xbb, 0xdc, 0x2b, 0x30, 0x3a, 0x05, 0x03, 0xc1, 0x8e, 0x8e, 0x21, 0x0b, 0x80, 0xe9, 0xd8, 0x3e, - /* (2^241)P */ 0x3e, 0xe0, 0x75, 0xfa, 0x39, 0x92, 0x0b, 0x7b, 0x83, 0xc0, 0x33, 0x46, 0x68, 0xfb, 0xe9, 0xef, 0x93, 0x77, 0x1a, 0x39, 0xbe, 0x5f, 0xa3, 0x98, 0x34, 0xfe, 0xd0, 0xe2, 0x0f, 0x51, 0x65, 0x60, - /* (2^242)P */ 0x0c, 0xad, 0xab, 0x48, 0x85, 0x66, 0xcb, 0x55, 0x27, 0xe5, 0x87, 0xda, 0x48, 0x45, 0x58, 0xb4, 0xdd, 0xc1, 0x07, 0x01, 0xea, 0xec, 0x43, 0x2c, 0x35, 0xde, 0x72, 0x93, 0x80, 0x28, 0x60, 0x52, - /* (2^243)P */ 0x1f, 0x3b, 0x21, 0xf9, 0x6a, 0xc5, 0x15, 0x34, 0xdb, 0x98, 0x7e, 0x01, 0x4d, 0x1a, 0xee, 0x5b, 0x9b, 0x70, 0xcf, 0xb5, 0x05, 0xb1, 0xf6, 0x13, 0xb6, 0x9a, 0xb2, 0x82, 0x34, 0x0e, 0xf2, 0x5f, - /* (2^244)P */ 0x90, 0x6c, 0x2e, 0xcc, 0x75, 0x9c, 0xa2, 0x0a, 0x06, 0xe2, 0x70, 0x3a, 0xca, 0x73, 0x7d, 0xfc, 0x15, 0xc5, 0xb5, 0xc4, 0x8f, 0xc3, 0x9f, 0x89, 0x07, 0xc2, 0xff, 0x24, 0xb1, 0x86, 0x03, 0x25, - /* (2^245)P */ 0x56, 0x2b, 0x3d, 0xae, 0xd5, 0x28, 0xea, 0x54, 0xce, 0x60, 0xde, 0xd6, 0x9d, 0x14, 0x13, 0x99, 0xc1, 0xd6, 0x06, 0x8f, 0xc5, 0x4f, 0x69, 0x16, 0xc7, 0x8f, 0x01, 0xeb, 0x75, 0x39, 0xb2, 0x46, - /* (2^246)P */ 0xe2, 0xb4, 0xb7, 0xb4, 0x0f, 0x6a, 0x0a, 0x47, 0xde, 0x53, 0x72, 0x8f, 0x5a, 0x47, 0x92, 0x5d, 0xdb, 0x3a, 0xbd, 0x2f, 0xb5, 0xe5, 0xee, 0xab, 0x68, 0x69, 0x80, 0xa0, 0x01, 0x08, 0xa2, 0x7f, - /* (2^247)P */ 0xd2, 0x14, 0x77, 0x9f, 0xf1, 0xfa, 0xf3, 0x76, 0xc3, 0x60, 0x46, 0x2f, 0xc1, 0x40, 0xe8, 0xb3, 0x4e, 0x74, 0x12, 0xf2, 0x8d, 0xcd, 0xb4, 0x0f, 0xd2, 0x2d, 0x3a, 0x1d, 0x25, 0x5a, 0x06, 0x4b, - /* (2^248)P */ 0x4a, 0xcd, 0x77, 0x3d, 0x38, 0xde, 0xeb, 0x5c, 0xb1, 0x9c, 0x2c, 0x88, 0xdf, 0x39, 0xdf, 0x6a, 0x59, 0xf7, 0x9a, 0xb0, 0x2e, 0x24, 0xdd, 0xa2, 0x22, 0x64, 0x5f, 0x0e, 0xe5, 0xc0, 0x47, 0x31, - /* (2^249)P */ 0xdb, 0x50, 0x13, 0x1d, 0x10, 0xa5, 0x4c, 0x16, 0x62, 0xc9, 0x3f, 0xc3, 0x79, 0x34, 0xd1, 0xf8, 0x08, 0xda, 0xe5, 0x13, 0x4d, 0xce, 0x40, 0xe6, 0xba, 0xf8, 0x61, 0x50, 0xc4, 0xe0, 0xde, 0x4b, - /* (2^250)P */ 0xc9, 0xb1, 0xed, 0xa4, 0xc1, 0x6d, 0xc4, 0xd7, 0x8a, 0xd9, 0x7f, 0x43, 0xb6, 0xd7, 0x14, 0x55, 0x0b, 0xc0, 0xa1, 0xb2, 0x6b, 0x2f, 0x94, 0x58, 0x0e, 0x71, 0x70, 0x1d, 0xab, 0xb2, 0xff, 0x2d, - /* (2^251)P */ 0x68, 0x6d, 0x8b, 0xc1, 0x2f, 0xcf, 0xdf, 0xcc, 0x67, 0x61, 0x80, 0xb7, 0xa8, 0xcb, 0xeb, 0xa8, 0xe3, 0x37, 0x29, 0x5e, 0xf9, 0x97, 0x06, 0x98, 0x8c, 0x6e, 0x12, 0xd0, 0x1c, 0xba, 0xfb, 0x02, - /* (2^252)P */ 0x65, 0x45, 0xff, 0xad, 0x60, 0xc3, 0x98, 0xcb, 0x19, 0x15, 0xdb, 0x4b, 0xd2, 0x01, 0x71, 0x44, 0xd5, 0x15, 0xfb, 0x75, 0x74, 0xc8, 0xc4, 0x98, 0x7d, 0xa2, 0x22, 0x6e, 0x6d, 0xc7, 0xf8, 0x05, - /* (2^253)P */ 0x94, 0xf4, 0xb9, 0xfe, 0xdf, 0xe5, 0x69, 0xab, 0x75, 0x6b, 0x40, 0x18, 0x9d, 0xc7, 0x09, 0xae, 0x1d, 0x2d, 0xa4, 0x94, 0xfb, 0x45, 0x9b, 0x19, 0x84, 0xfa, 0x2a, 0xae, 0xeb, 0x0a, 0x71, 0x79, - /* (2^254)P */ 0xdf, 0xd2, 0x34, 0xf3, 0xa7, 0xed, 0xad, 0xa6, 0xb4, 0x57, 0x2a, 0xaf, 0x51, 0x9c, 0xde, 0x7b, 0xa8, 0xea, 0xdc, 0x86, 0x4f, 0xc6, 0x8f, 0xa9, 0x7b, 0xd0, 0x0e, 0xc2, 0x35, 0x03, 0xbe, 0x6b, - /* (2^255)P */ 0x44, 0x43, 0x98, 0x53, 0xbe, 0xdc, 0x7f, 0x66, 0xa8, 0x49, 0x59, 0x00, 0x1c, 0xbc, 0x72, 0x07, 0x8e, 0xd6, 0xbe, 0x4e, 0x9f, 0xa4, 0x07, 0xba, 0xbf, 0x30, 0xdf, 0xba, 0x85, 0xb0, 0xa7, 0x1f, -} diff --git a/vendor/github.com/cloudflare/circl/dh/x448/curve.go b/vendor/github.com/cloudflare/circl/dh/x448/curve.go deleted file mode 100644 index d59564e4b..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/curve.go +++ /dev/null @@ -1,104 +0,0 @@ -package x448 - -import ( - fp "github.com/cloudflare/circl/math/fp448" -) - -// ladderJoye calculates a fixed-point multiplication with the generator point. -// The algorithm is the right-to-left Joye's ladder as described -// in "How to precompute a ladder" in SAC'2017. -func ladderJoye(k *Key) { - w := [5]fp.Elt{} // [mu,x1,z1,x2,z2] order must be preserved. - w[1] = fp.Elt{ // x1 = S - 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - } - fp.SetOne(&w[2]) // z1 = 1 - w[3] = fp.Elt{ // x2 = G-S - 0x20, 0x27, 0x9d, 0xc9, 0x7d, 0x19, 0xb1, 0xac, - 0xf8, 0xba, 0x69, 0x1c, 0xff, 0x33, 0xac, 0x23, - 0x51, 0x1b, 0xce, 0x3a, 0x64, 0x65, 0xbd, 0xf1, - 0x23, 0xf8, 0xc1, 0x84, 0x9d, 0x45, 0x54, 0x29, - 0x67, 0xb9, 0x81, 0x1c, 0x03, 0xd1, 0xcd, 0xda, - 0x7b, 0xeb, 0xff, 0x1a, 0x88, 0x03, 0xcf, 0x3a, - 0x42, 0x44, 0x32, 0x01, 0x25, 0xb7, 0xfa, 0xf0, - } - fp.SetOne(&w[4]) // z2 = 1 - - const n = 448 - const h = 2 - swap := uint(1) - for s := 0; s < n-h; s++ { - i := (s + h) / 8 - j := (s + h) % 8 - bit := uint((k[i] >> uint(j)) & 1) - copy(w[0][:], tableGenerator[s*Size:(s+1)*Size]) - diffAdd(&w, swap^bit) - swap = bit - } - for s := 0; s < h; s++ { - double(&w[1], &w[2]) - } - toAffine((*[fp.Size]byte)(k), &w[1], &w[2]) -} - -// ladderMontgomery calculates a generic scalar point multiplication -// The algorithm implemented is the left-to-right Montgomery's ladder. -func ladderMontgomery(k, xP *Key) { - w := [5]fp.Elt{} // [x1, x2, z2, x3, z3] order must be preserved. - w[0] = *(*fp.Elt)(xP) // x1 = xP - fp.SetOne(&w[1]) // x2 = 1 - w[3] = *(*fp.Elt)(xP) // x3 = xP - fp.SetOne(&w[4]) // z3 = 1 - - move := uint(0) - for s := 448 - 1; s >= 0; s-- { - i := s / 8 - j := s % 8 - bit := uint((k[i] >> uint(j)) & 1) - ladderStep(&w, move^bit) - move = bit - } - toAffine((*[fp.Size]byte)(k), &w[1], &w[2]) -} - -func toAffine(k *[fp.Size]byte, x, z *fp.Elt) { - fp.Inv(z, z) - fp.Mul(x, x, z) - _ = fp.ToBytes(k[:], x) -} - -var lowOrderPoints = [3]fp.Elt{ - { /* (0,_,1) point of order 2 on Curve448 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }, - { /* (1,_,1) a point of order 4 on the twist of Curve448 */ - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }, - { /* (-1,_,1) point of order 4 on Curve448 */ - 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - }, -} diff --git a/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.go b/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.go deleted file mode 100644 index a06226661..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.go +++ /dev/null @@ -1,30 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -package x448 - -import ( - fp "github.com/cloudflare/circl/math/fp448" - "golang.org/x/sys/cpu" -) - -var hasBmi2Adx = cpu.X86.HasBMI2 && cpu.X86.HasADX - -var _ = hasBmi2Adx - -func double(x, z *fp.Elt) { doubleAmd64(x, z) } -func diffAdd(w *[5]fp.Elt, b uint) { diffAddAmd64(w, b) } -func ladderStep(w *[5]fp.Elt, b uint) { ladderStepAmd64(w, b) } -func mulA24(z, x *fp.Elt) { mulA24Amd64(z, x) } - -//go:noescape -func doubleAmd64(x, z *fp.Elt) - -//go:noescape -func diffAddAmd64(w *[5]fp.Elt, b uint) - -//go:noescape -func ladderStepAmd64(w *[5]fp.Elt, b uint) - -//go:noescape -func mulA24Amd64(z, x *fp.Elt) diff --git a/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.h b/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.h deleted file mode 100644 index 8c1ae4d0f..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.h +++ /dev/null @@ -1,111 +0,0 @@ -#define ladderStepLeg \ - addSub(x2,z2) \ - addSub(x3,z3) \ - integerMulLeg(b0,x2,z3) \ - integerMulLeg(b1,x3,z2) \ - reduceFromDoubleLeg(t0,b0) \ - reduceFromDoubleLeg(t1,b1) \ - addSub(t0,t1) \ - cselect(x2,x3,regMove) \ - cselect(z2,z3,regMove) \ - integerSqrLeg(b0,t0) \ - integerSqrLeg(b1,t1) \ - reduceFromDoubleLeg(x3,b0) \ - reduceFromDoubleLeg(z3,b1) \ - integerMulLeg(b0,x1,z3) \ - reduceFromDoubleLeg(z3,b0) \ - integerSqrLeg(b0,x2) \ - integerSqrLeg(b1,z2) \ - reduceFromDoubleLeg(x2,b0) \ - reduceFromDoubleLeg(z2,b1) \ - subtraction(t0,x2,z2) \ - multiplyA24Leg(t1,t0) \ - additionLeg(t1,t1,z2) \ - integerMulLeg(b0,x2,z2) \ - integerMulLeg(b1,t0,t1) \ - reduceFromDoubleLeg(x2,b0) \ - reduceFromDoubleLeg(z2,b1) - -#define ladderStepBmi2Adx \ - addSub(x2,z2) \ - addSub(x3,z3) \ - integerMulAdx(b0,x2,z3) \ - integerMulAdx(b1,x3,z2) \ - reduceFromDoubleAdx(t0,b0) \ - reduceFromDoubleAdx(t1,b1) \ - addSub(t0,t1) \ - cselect(x2,x3,regMove) \ - cselect(z2,z3,regMove) \ - integerSqrAdx(b0,t0) \ - integerSqrAdx(b1,t1) \ - reduceFromDoubleAdx(x3,b0) \ - reduceFromDoubleAdx(z3,b1) \ - integerMulAdx(b0,x1,z3) \ - reduceFromDoubleAdx(z3,b0) \ - integerSqrAdx(b0,x2) \ - integerSqrAdx(b1,z2) \ - reduceFromDoubleAdx(x2,b0) \ - reduceFromDoubleAdx(z2,b1) \ - subtraction(t0,x2,z2) \ - multiplyA24Adx(t1,t0) \ - additionAdx(t1,t1,z2) \ - integerMulAdx(b0,x2,z2) \ - integerMulAdx(b1,t0,t1) \ - reduceFromDoubleAdx(x2,b0) \ - reduceFromDoubleAdx(z2,b1) - -#define difAddLeg \ - addSub(x1,z1) \ - integerMulLeg(b0,z1,ui) \ - reduceFromDoubleLeg(z1,b0) \ - addSub(x1,z1) \ - integerSqrLeg(b0,x1) \ - integerSqrLeg(b1,z1) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) \ - integerMulLeg(b0,x1,z2) \ - integerMulLeg(b1,z1,x2) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) - -#define difAddBmi2Adx \ - addSub(x1,z1) \ - integerMulAdx(b0,z1,ui) \ - reduceFromDoubleAdx(z1,b0) \ - addSub(x1,z1) \ - integerSqrAdx(b0,x1) \ - integerSqrAdx(b1,z1) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) \ - integerMulAdx(b0,x1,z2) \ - integerMulAdx(b1,z1,x2) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) - -#define doubleLeg \ - addSub(x1,z1) \ - integerSqrLeg(b0,x1) \ - integerSqrLeg(b1,z1) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) \ - subtraction(t0,x1,z1) \ - multiplyA24Leg(t1,t0) \ - additionLeg(t1,t1,z1) \ - integerMulLeg(b0,x1,z1) \ - integerMulLeg(b1,t0,t1) \ - reduceFromDoubleLeg(x1,b0) \ - reduceFromDoubleLeg(z1,b1) - -#define doubleBmi2Adx \ - addSub(x1,z1) \ - integerSqrAdx(b0,x1) \ - integerSqrAdx(b1,z1) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) \ - subtraction(t0,x1,z1) \ - multiplyA24Adx(t1,t0) \ - additionAdx(t1,t1,z1) \ - integerMulAdx(b0,x1,z1) \ - integerMulAdx(b1,t0,t1) \ - reduceFromDoubleAdx(x1,b0) \ - reduceFromDoubleAdx(z1,b1) diff --git a/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.s b/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.s deleted file mode 100644 index ed33ba3d0..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/curve_amd64.s +++ /dev/null @@ -1,194 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -#include "textflag.h" - -// Depends on circl/math/fp448 package -#include "../../math/fp448/fp_amd64.h" -#include "curve_amd64.h" - -// CTE_A24 is (A+2)/4 from Curve448 -#define CTE_A24 39082 - -#define Size 56 - -// multiplyA24Leg multiplies x times CTE_A24 and stores in z -// Uses: AX, DX, R8-R15, FLAGS -// Instr: x86_64, cmov, adx -#define multiplyA24Leg(z,x) \ - MOVQ $CTE_A24, R15; \ - MOVQ 0+x, AX; MULQ R15; MOVQ AX, R8; ;;;;;;;;;;;; MOVQ DX, R9; \ - MOVQ 8+x, AX; MULQ R15; ADDQ AX, R9; ADCQ $0, DX; MOVQ DX, R10; \ - MOVQ 16+x, AX; MULQ R15; ADDQ AX, R10; ADCQ $0, DX; MOVQ DX, R11; \ - MOVQ 24+x, AX; MULQ R15; ADDQ AX, R11; ADCQ $0, DX; MOVQ DX, R12; \ - MOVQ 32+x, AX; MULQ R15; ADDQ AX, R12; ADCQ $0, DX; MOVQ DX, R13; \ - MOVQ 40+x, AX; MULQ R15; ADDQ AX, R13; ADCQ $0, DX; MOVQ DX, R14; \ - MOVQ 48+x, AX; MULQ R15; ADDQ AX, R14; ADCQ $0, DX; \ - MOVQ DX, AX; \ - SHLQ $32, AX; \ - ADDQ DX, R8; MOVQ $0, DX; \ - ADCQ $0, R9; \ - ADCQ $0, R10; \ - ADCQ AX, R11; \ - ADCQ $0, R12; \ - ADCQ $0, R13; \ - ADCQ $0, R14; \ - ADCQ $0, DX; \ - MOVQ DX, AX; \ - SHLQ $32, AX; \ - ADDQ DX, R8; \ - ADCQ $0, R9; \ - ADCQ $0, R10; \ - ADCQ AX, R11; \ - ADCQ $0, R12; \ - ADCQ $0, R13; \ - ADCQ $0, R14; \ - MOVQ R8, 0+z; \ - MOVQ R9, 8+z; \ - MOVQ R10, 16+z; \ - MOVQ R11, 24+z; \ - MOVQ R12, 32+z; \ - MOVQ R13, 40+z; \ - MOVQ R14, 48+z; - -// multiplyA24Adx multiplies x times CTE_A24 and stores in z -// Uses: AX, DX, R8-R14, FLAGS -// Instr: x86_64, bmi2 -#define multiplyA24Adx(z,x) \ - MOVQ $CTE_A24, DX; \ - MULXQ 0+x, R8, R9; \ - MULXQ 8+x, AX, R10; ADDQ AX, R9; \ - MULXQ 16+x, AX, R11; ADCQ AX, R10; \ - MULXQ 24+x, AX, R12; ADCQ AX, R11; \ - MULXQ 32+x, AX, R13; ADCQ AX, R12; \ - MULXQ 40+x, AX, R14; ADCQ AX, R13; \ - MULXQ 48+x, AX, DX; ADCQ AX, R14; \ - ;;;;;;;;;;;;;;;;;;;; ADCQ $0, DX; \ - MOVQ DX, AX; \ - SHLQ $32, AX; \ - ADDQ DX, R8; MOVQ $0, DX; \ - ADCQ $0, R9; \ - ADCQ $0, R10; \ - ADCQ AX, R11; \ - ADCQ $0, R12; \ - ADCQ $0, R13; \ - ADCQ $0, R14; \ - ADCQ $0, DX; \ - MOVQ DX, AX; \ - SHLQ $32, AX; \ - ADDQ DX, R8; \ - ADCQ $0, R9; \ - ADCQ $0, R10; \ - ADCQ AX, R11; \ - ADCQ $0, R12; \ - ADCQ $0, R13; \ - ADCQ $0, R14; \ - MOVQ R8, 0+z; \ - MOVQ R9, 8+z; \ - MOVQ R10, 16+z; \ - MOVQ R11, 24+z; \ - MOVQ R12, 32+z; \ - MOVQ R13, 40+z; \ - MOVQ R14, 48+z; - -#define mulA24Legacy \ - multiplyA24Leg(0(DI),0(SI)) -#define mulA24Bmi2Adx \ - multiplyA24Adx(0(DI),0(SI)) - -// func mulA24Amd64(z, x *fp448.Elt) -TEXT ·mulA24Amd64(SB),NOSPLIT,$0-16 - MOVQ z+0(FP), DI - MOVQ x+8(FP), SI - CHECK_BMI2ADX(LMA24, mulA24Legacy, mulA24Bmi2Adx) - -// func ladderStepAmd64(w *[5]fp448.Elt, b uint) -// ladderStepAmd64 calculates a point addition and doubling as follows: -// (x2,z2) = 2*(x2,z2) and (x3,z3) = (x2,z2)+(x3,z3) using as a difference (x1,-). -// w = {x1,x2,z2,x3,z4} are five fp255.Elt of 56 bytes. -// stack = (t0,t1) are two fp.Elt of fp.Size bytes, and -// (b0,b1) are two-double precision fp.Elt of 2*fp.Size bytes. -TEXT ·ladderStepAmd64(SB),NOSPLIT,$336-16 - // Parameters - #define regWork DI - #define regMove SI - #define x1 0*Size(regWork) - #define x2 1*Size(regWork) - #define z2 2*Size(regWork) - #define x3 3*Size(regWork) - #define z3 4*Size(regWork) - // Local variables - #define t0 0*Size(SP) - #define t1 1*Size(SP) - #define b0 2*Size(SP) - #define b1 4*Size(SP) - MOVQ w+0(FP), regWork - MOVQ b+8(FP), regMove - CHECK_BMI2ADX(LLADSTEP, ladderStepLeg, ladderStepBmi2Adx) - #undef regWork - #undef regMove - #undef x1 - #undef x2 - #undef z2 - #undef x3 - #undef z3 - #undef t0 - #undef t1 - #undef b0 - #undef b1 - -// func diffAddAmd64(work *[5]fp.Elt, swap uint) -// diffAddAmd64 calculates a differential point addition using a precomputed point. -// (x1,z1) = (x1,z1)+(mu) using a difference point (x2,z2) -// work = {mu,x1,z1,x2,z2} are five fp448.Elt of 56 bytes, and -// stack = (b0,b1) are two-double precision fp.Elt of 2*fp.Size bytes. -// This is Equation 7 at https://eprint.iacr.org/2017/264. -TEXT ·diffAddAmd64(SB),NOSPLIT,$224-16 - // Parameters - #define regWork DI - #define regSwap SI - #define ui 0*Size(regWork) - #define x1 1*Size(regWork) - #define z1 2*Size(regWork) - #define x2 3*Size(regWork) - #define z2 4*Size(regWork) - // Local variables - #define b0 0*Size(SP) - #define b1 2*Size(SP) - MOVQ w+0(FP), regWork - MOVQ b+8(FP), regSwap - cswap(x1,x2,regSwap) - cswap(z1,z2,regSwap) - CHECK_BMI2ADX(LDIFADD, difAddLeg, difAddBmi2Adx) - #undef regWork - #undef regSwap - #undef ui - #undef x1 - #undef z1 - #undef x2 - #undef z2 - #undef b0 - #undef b1 - -// func doubleAmd64(x, z *fp448.Elt) -// doubleAmd64 calculates a point doubling (x1,z1) = 2*(x1,z1). -// stack = (t0,t1) are two fp.Elt of fp.Size bytes, and -// (b0,b1) are two-double precision fp.Elt of 2*fp.Size bytes. -TEXT ·doubleAmd64(SB),NOSPLIT,$336-16 - // Parameters - #define x1 0(DI) - #define z1 0(SI) - // Local variables - #define t0 0*Size(SP) - #define t1 1*Size(SP) - #define b0 2*Size(SP) - #define b1 4*Size(SP) - MOVQ x+0(FP), DI - MOVQ z+8(FP), SI - CHECK_BMI2ADX(LDOUB,doubleLeg,doubleBmi2Adx) - #undef x1 - #undef z1 - #undef t0 - #undef t1 - #undef b0 - #undef b1 diff --git a/vendor/github.com/cloudflare/circl/dh/x448/curve_generic.go b/vendor/github.com/cloudflare/circl/dh/x448/curve_generic.go deleted file mode 100644 index b0b65ccf7..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/curve_generic.go +++ /dev/null @@ -1,100 +0,0 @@ -package x448 - -import ( - "encoding/binary" - "math/bits" - - "github.com/cloudflare/circl/math/fp448" -) - -func doubleGeneric(x, z *fp448.Elt) { - t0, t1 := &fp448.Elt{}, &fp448.Elt{} - fp448.AddSub(x, z) - fp448.Sqr(x, x) - fp448.Sqr(z, z) - fp448.Sub(t0, x, z) - mulA24Generic(t1, t0) - fp448.Add(t1, t1, z) - fp448.Mul(x, x, z) - fp448.Mul(z, t0, t1) -} - -func diffAddGeneric(w *[5]fp448.Elt, b uint) { - mu, x1, z1, x2, z2 := &w[0], &w[1], &w[2], &w[3], &w[4] - fp448.Cswap(x1, x2, b) - fp448.Cswap(z1, z2, b) - fp448.AddSub(x1, z1) - fp448.Mul(z1, z1, mu) - fp448.AddSub(x1, z1) - fp448.Sqr(x1, x1) - fp448.Sqr(z1, z1) - fp448.Mul(x1, x1, z2) - fp448.Mul(z1, z1, x2) -} - -func ladderStepGeneric(w *[5]fp448.Elt, b uint) { - x1, x2, z2, x3, z3 := &w[0], &w[1], &w[2], &w[3], &w[4] - t0 := &fp448.Elt{} - t1 := &fp448.Elt{} - fp448.AddSub(x2, z2) - fp448.AddSub(x3, z3) - fp448.Mul(t0, x2, z3) - fp448.Mul(t1, x3, z2) - fp448.AddSub(t0, t1) - fp448.Cmov(x2, x3, b) - fp448.Cmov(z2, z3, b) - fp448.Sqr(x3, t0) - fp448.Sqr(z3, t1) - fp448.Mul(z3, x1, z3) - fp448.Sqr(x2, x2) - fp448.Sqr(z2, z2) - fp448.Sub(t0, x2, z2) - mulA24Generic(t1, t0) - fp448.Add(t1, t1, z2) - fp448.Mul(x2, x2, z2) - fp448.Mul(z2, t0, t1) -} - -func mulA24Generic(z, x *fp448.Elt) { - const A24 = 39082 - const n = 8 - var xx [7]uint64 - for i := range xx { - xx[i] = binary.LittleEndian.Uint64(x[i*n : (i+1)*n]) - } - h0, l0 := bits.Mul64(xx[0], A24) - h1, l1 := bits.Mul64(xx[1], A24) - h2, l2 := bits.Mul64(xx[2], A24) - h3, l3 := bits.Mul64(xx[3], A24) - h4, l4 := bits.Mul64(xx[4], A24) - h5, l5 := bits.Mul64(xx[5], A24) - h6, l6 := bits.Mul64(xx[6], A24) - - l1, c0 := bits.Add64(h0, l1, 0) - l2, c1 := bits.Add64(h1, l2, c0) - l3, c2 := bits.Add64(h2, l3, c1) - l4, c3 := bits.Add64(h3, l4, c2) - l5, c4 := bits.Add64(h4, l5, c3) - l6, c5 := bits.Add64(h5, l6, c4) - l7, _ := bits.Add64(h6, 0, c5) - - l0, c0 = bits.Add64(l0, l7, 0) - l1, c1 = bits.Add64(l1, 0, c0) - l2, c2 = bits.Add64(l2, 0, c1) - l3, c3 = bits.Add64(l3, l7<<32, c2) - l4, c4 = bits.Add64(l4, 0, c3) - l5, c5 = bits.Add64(l5, 0, c4) - l6, l7 = bits.Add64(l6, 0, c5) - - xx[0], c0 = bits.Add64(l0, l7, 0) - xx[1], c1 = bits.Add64(l1, 0, c0) - xx[2], c2 = bits.Add64(l2, 0, c1) - xx[3], c3 = bits.Add64(l3, l7<<32, c2) - xx[4], c4 = bits.Add64(l4, 0, c3) - xx[5], c5 = bits.Add64(l5, 0, c4) - xx[6], _ = bits.Add64(l6, 0, c5) - - for i := range xx { - binary.LittleEndian.PutUint64(z[i*n:(i+1)*n], xx[i]) - } -} diff --git a/vendor/github.com/cloudflare/circl/dh/x448/curve_noasm.go b/vendor/github.com/cloudflare/circl/dh/x448/curve_noasm.go deleted file mode 100644 index 3755b7c83..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/curve_noasm.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build !amd64 || purego -// +build !amd64 purego - -package x448 - -import fp "github.com/cloudflare/circl/math/fp448" - -func double(x, z *fp.Elt) { doubleGeneric(x, z) } -func diffAdd(w *[5]fp.Elt, b uint) { diffAddGeneric(w, b) } -func ladderStep(w *[5]fp.Elt, b uint) { ladderStepGeneric(w, b) } -func mulA24(z, x *fp.Elt) { mulA24Generic(z, x) } diff --git a/vendor/github.com/cloudflare/circl/dh/x448/doc.go b/vendor/github.com/cloudflare/circl/dh/x448/doc.go deleted file mode 100644 index c02904fed..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/doc.go +++ /dev/null @@ -1,19 +0,0 @@ -/* -Package x448 provides Diffie-Hellman functions as specified in RFC-7748. - -Validation of public keys. - -The Diffie-Hellman function, as described in RFC-7748 [1], works for any -public key. However, if a different protocol requires contributory -behaviour [2,3], then the public keys must be validated against low-order -points [3,4]. To do that, the Shared function performs this validation -internally and returns false when the public key is invalid (i.e., it -is a low-order point). - -References: - - [1] RFC7748 by Langley, Hamburg, Turner (https://rfc-editor.org/rfc/rfc7748.txt) - - [2] Curve25519 by Bernstein (https://cr.yp.to/ecdh.html) - - [3] Bernstein (https://cr.yp.to/ecdh.html#validate) - - [4] Cremers&Jackson (https://eprint.iacr.org/2019/526) -*/ -package x448 diff --git a/vendor/github.com/cloudflare/circl/dh/x448/key.go b/vendor/github.com/cloudflare/circl/dh/x448/key.go deleted file mode 100644 index 2fdde5116..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/key.go +++ /dev/null @@ -1,46 +0,0 @@ -package x448 - -import ( - "crypto/subtle" - - fp "github.com/cloudflare/circl/math/fp448" -) - -// Size is the length in bytes of a X448 key. -const Size = 56 - -// Key represents a X448 key. -type Key [Size]byte - -func (k *Key) clamp(in *Key) *Key { - *k = *in - k[0] &= 252 - k[55] |= 128 - return k -} - -// isValidPubKey verifies if the public key is not a low-order point. -func (k *Key) isValidPubKey() bool { - fp.Modp((*fp.Elt)(k)) - var isLowOrder int - for _, P := range lowOrderPoints { - isLowOrder |= subtle.ConstantTimeCompare(P[:], k[:]) - } - return isLowOrder == 0 -} - -// KeyGen obtains a public key given a secret key. -func KeyGen(public, secret *Key) { - ladderJoye(public.clamp(secret)) -} - -// Shared calculates Alice's shared key from Alice's secret key and Bob's -// public key returning true on success. A failure case happens when the public -// key is a low-order point, thus the shared key is all-zeros and the function -// returns false. -func Shared(shared, secret, public *Key) bool { - validPk := *public - ok := validPk.isValidPubKey() - ladderMontgomery(shared.clamp(secret), &validPk) - return ok -} diff --git a/vendor/github.com/cloudflare/circl/dh/x448/table.go b/vendor/github.com/cloudflare/circl/dh/x448/table.go deleted file mode 100644 index eef53c30f..000000000 --- a/vendor/github.com/cloudflare/circl/dh/x448/table.go +++ /dev/null @@ -1,460 +0,0 @@ -package x448 - -import fp "github.com/cloudflare/circl/math/fp448" - -// tableGenerator contains the set of points: -// -// t[i] = (xi+1)/(xi-1), -// -// where (xi,yi) = 2^iG and G is the generator point -// Size = (448)*(448/8) = 25088 bytes. -var tableGenerator = [448 * fp.Size]byte{ - /* (2^ 0)P */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, - /* (2^ 1)P */ 0x37, 0xfa, 0xaa, 0x0d, 0x86, 0xa6, 0x24, 0xe9, 0x6c, 0x95, 0x08, 0x34, 0xba, 0x1a, 0x81, 0x3a, 0xae, 0x01, 0xa5, 0xa7, 0x05, 0x85, 0x96, 0x00, 0x06, 0x5a, 0xd7, 0xff, 0xee, 0x8e, 0x8f, 0x94, 0xd2, 0xdc, 0xd7, 0xfc, 0xe7, 0xe5, 0x99, 0x1d, 0x05, 0x46, 0x43, 0xe8, 0xbc, 0x12, 0xb7, 0xeb, 0x30, 0x5e, 0x7a, 0x85, 0x68, 0xed, 0x9d, 0x28, - /* (2^ 2)P */ 0xf1, 0x7d, 0x08, 0x2b, 0x32, 0x4a, 0x62, 0x80, 0x36, 0xe7, 0xa4, 0x76, 0x5a, 0x2a, 0x1e, 0xf7, 0x9e, 0x3c, 0x40, 0x46, 0x9a, 0x1b, 0x61, 0xc1, 0xbf, 0x1a, 0x1b, 0xae, 0x91, 0x80, 0xa3, 0x76, 0x6c, 0xd4, 0x8f, 0xa4, 0xee, 0x26, 0x39, 0x23, 0xa4, 0x80, 0xf4, 0x66, 0x92, 0xe4, 0xe1, 0x18, 0x76, 0xc5, 0xe2, 0x19, 0x87, 0xd5, 0xc3, 0xe8, - /* (2^ 3)P */ 0xfb, 0xc9, 0xf0, 0x07, 0xf2, 0x93, 0xd8, 0x50, 0x36, 0xed, 0xfb, 0xbd, 0xb2, 0xd3, 0xfc, 0xdf, 0xd5, 0x2a, 0x6e, 0x26, 0x09, 0xce, 0xd4, 0x07, 0x64, 0x9f, 0x40, 0x74, 0xad, 0x98, 0x2f, 0x1c, 0xb6, 0xdc, 0x2d, 0x42, 0xff, 0xbf, 0x97, 0xd8, 0xdb, 0xef, 0x99, 0xca, 0x73, 0x99, 0x1a, 0x04, 0x3b, 0x56, 0x2c, 0x1f, 0x87, 0x9d, 0x9f, 0x03, - /* (2^ 4)P */ 0x4c, 0x35, 0x97, 0xf7, 0x81, 0x2c, 0x84, 0xa6, 0xe0, 0xcb, 0xce, 0x37, 0x4c, 0x21, 0x1c, 0x67, 0xfa, 0xab, 0x18, 0x4d, 0xef, 0xd0, 0xf0, 0x44, 0xa9, 0xfb, 0xc0, 0x8e, 0xda, 0x57, 0xa1, 0xd8, 0xeb, 0x87, 0xf4, 0x17, 0xea, 0x66, 0x0f, 0x16, 0xea, 0xcd, 0x5f, 0x3e, 0x88, 0xea, 0x09, 0x68, 0x40, 0xdf, 0x43, 0xcc, 0x54, 0x61, 0x58, 0xaa, - /* (2^ 5)P */ 0x8d, 0xe7, 0x59, 0xd7, 0x5e, 0x63, 0x37, 0xa7, 0x3f, 0xd1, 0x49, 0x85, 0x01, 0xdd, 0x5e, 0xb3, 0xe6, 0x29, 0xcb, 0x25, 0x93, 0xdd, 0x08, 0x96, 0x83, 0x52, 0x76, 0x85, 0xf5, 0x5d, 0x02, 0xbf, 0xe9, 0x6d, 0x15, 0x27, 0xc1, 0x09, 0xd1, 0x14, 0x4d, 0x6e, 0xe8, 0xaf, 0x59, 0x58, 0x34, 0x9d, 0x2a, 0x99, 0x85, 0x26, 0xbe, 0x4b, 0x1e, 0xb9, - /* (2^ 6)P */ 0x8d, 0xce, 0x94, 0xe2, 0x18, 0x56, 0x0d, 0x82, 0x8e, 0xdf, 0x85, 0x01, 0x8f, 0x93, 0x3c, 0xc6, 0xbd, 0x61, 0xfb, 0xf4, 0x22, 0xc5, 0x16, 0x87, 0xd1, 0xb1, 0x9e, 0x09, 0xc5, 0x83, 0x2e, 0x4a, 0x07, 0x88, 0xee, 0xe0, 0x29, 0x8d, 0x2e, 0x1f, 0x88, 0xad, 0xfd, 0x18, 0x93, 0xb7, 0xed, 0x42, 0x86, 0x78, 0xf0, 0xb8, 0x70, 0xbe, 0x01, 0x67, - /* (2^ 7)P */ 0xdf, 0x62, 0x2d, 0x94, 0xc7, 0x35, 0x23, 0xda, 0x27, 0xbb, 0x2b, 0xdb, 0x30, 0x80, 0x68, 0x16, 0xa3, 0xae, 0xd7, 0xd2, 0xa7, 0x7c, 0xbf, 0x6a, 0x1d, 0x83, 0xde, 0x96, 0x0a, 0x43, 0xb6, 0x30, 0x37, 0xd6, 0xee, 0x63, 0x59, 0x9a, 0xbf, 0xa3, 0x30, 0x6c, 0xaf, 0x0c, 0xee, 0x3d, 0xcb, 0x35, 0x4b, 0x55, 0x5f, 0x84, 0x85, 0xcb, 0x4f, 0x1e, - /* (2^ 8)P */ 0x9d, 0x04, 0x68, 0x89, 0xa4, 0xa9, 0x0d, 0x87, 0xc1, 0x70, 0xf1, 0xeb, 0xfb, 0x47, 0x0a, 0xf0, 0xde, 0x67, 0xb7, 0x94, 0xcd, 0x36, 0x43, 0xa5, 0x49, 0x43, 0x67, 0xc3, 0xee, 0x3c, 0x6b, 0xec, 0xd0, 0x1a, 0xf4, 0xad, 0xef, 0x06, 0x4a, 0xe8, 0x46, 0x24, 0xd7, 0x93, 0xbf, 0xf0, 0xe3, 0x81, 0x61, 0xec, 0xea, 0x64, 0xfe, 0x67, 0xeb, 0xc7, - /* (2^ 9)P */ 0x95, 0x45, 0x79, 0xcf, 0x2c, 0xfd, 0x9b, 0xfe, 0x84, 0x46, 0x4b, 0x8f, 0xa1, 0xcf, 0xc3, 0x04, 0x94, 0x78, 0xdb, 0xc9, 0xa6, 0x01, 0x75, 0xa4, 0xb4, 0x93, 0x72, 0x43, 0xa7, 0x7d, 0xda, 0x31, 0x38, 0x54, 0xab, 0x4e, 0x3f, 0x89, 0xa6, 0xab, 0x57, 0xc0, 0x16, 0x65, 0xdb, 0x92, 0x96, 0xe4, 0xc8, 0xae, 0xe7, 0x4c, 0x7a, 0xeb, 0xbb, 0x5a, - /* (2^ 10)P */ 0xbe, 0xfe, 0x86, 0xc3, 0x97, 0xe0, 0x6a, 0x18, 0x20, 0x21, 0xca, 0x22, 0x55, 0xa1, 0xeb, 0xf5, 0x74, 0xe5, 0xc9, 0x59, 0xa7, 0x92, 0x65, 0x15, 0x08, 0x71, 0xd1, 0x09, 0x7e, 0x83, 0xfc, 0xbc, 0x5a, 0x93, 0x38, 0x0d, 0x43, 0x42, 0xfd, 0x76, 0x30, 0xe8, 0x63, 0x60, 0x09, 0x8d, 0x6c, 0xd3, 0xf8, 0x56, 0x3d, 0x68, 0x47, 0xab, 0xa0, 0x1d, - /* (2^ 11)P */ 0x38, 0x50, 0x1c, 0xb1, 0xac, 0x88, 0x8f, 0x38, 0xe3, 0x69, 0xe6, 0xfc, 0x4f, 0x8f, 0xe1, 0x9b, 0xb1, 0x1a, 0x09, 0x39, 0x19, 0xdf, 0xcd, 0x98, 0x7b, 0x64, 0x42, 0xf6, 0x11, 0xea, 0xc7, 0xe8, 0x92, 0x65, 0x00, 0x2c, 0x75, 0xb5, 0x94, 0x1e, 0x5b, 0xa6, 0x66, 0x81, 0x77, 0xf3, 0x39, 0x94, 0xac, 0xbd, 0xe4, 0x2a, 0x66, 0x84, 0x9c, 0x60, - /* (2^ 12)P */ 0xb5, 0xb6, 0xd9, 0x03, 0x67, 0xa4, 0xa8, 0x0a, 0x4a, 0x2b, 0x9d, 0xfa, 0x13, 0xe1, 0x99, 0x25, 0x4a, 0x5c, 0x67, 0xb9, 0xb2, 0xb7, 0xdd, 0x1e, 0xaf, 0xeb, 0x63, 0x41, 0xb6, 0xb9, 0xa0, 0x87, 0x0a, 0xe0, 0x06, 0x07, 0xaa, 0x97, 0xf8, 0xf9, 0x38, 0x4f, 0xdf, 0x0c, 0x40, 0x7c, 0xc3, 0x98, 0xa9, 0x74, 0xf1, 0x5d, 0xda, 0xd1, 0xc0, 0x0a, - /* (2^ 13)P */ 0xf2, 0x0a, 0xab, 0xab, 0x94, 0x50, 0xf0, 0xa3, 0x6f, 0xc6, 0x66, 0xba, 0xa6, 0xdc, 0x44, 0xdd, 0xd6, 0x08, 0xf4, 0xd3, 0xed, 0xb1, 0x40, 0x93, 0xee, 0xf6, 0xb8, 0x8e, 0xb4, 0x7c, 0xb9, 0x82, 0xc9, 0x9d, 0x45, 0x3b, 0x8e, 0x10, 0xcb, 0x70, 0x1e, 0xba, 0x3c, 0x62, 0x50, 0xda, 0xa9, 0x93, 0xb5, 0xd7, 0xd0, 0x6f, 0x29, 0x52, 0x95, 0xae, - /* (2^ 14)P */ 0x14, 0x68, 0x69, 0x23, 0xa8, 0x44, 0x87, 0x9e, 0x22, 0x91, 0xe8, 0x92, 0xdf, 0xf7, 0xae, 0xba, 0x1c, 0x96, 0xe1, 0xc3, 0x94, 0xed, 0x6c, 0x95, 0xae, 0x96, 0xa7, 0x15, 0x9f, 0xf1, 0x17, 0x11, 0x92, 0x42, 0xd5, 0xcd, 0x18, 0xe7, 0xa9, 0xb5, 0x2f, 0xcd, 0xde, 0x6c, 0xc9, 0x7d, 0xfc, 0x7e, 0xbd, 0x7f, 0x10, 0x3d, 0x01, 0x00, 0x8d, 0x95, - /* (2^ 15)P */ 0x3b, 0x76, 0x72, 0xae, 0xaf, 0x84, 0xf2, 0xf7, 0xd1, 0x6d, 0x13, 0x9c, 0x47, 0xe1, 0xb7, 0xa3, 0x19, 0x16, 0xee, 0x75, 0x45, 0xf6, 0x1a, 0x7b, 0x78, 0x49, 0x79, 0x05, 0x86, 0xf0, 0x7f, 0x9f, 0xfc, 0xc4, 0xbd, 0x86, 0xf3, 0x41, 0xa7, 0xfe, 0x01, 0xd5, 0x67, 0x16, 0x10, 0x5b, 0xa5, 0x16, 0xf3, 0x7f, 0x60, 0xce, 0xd2, 0x0c, 0x8e, 0x4b, - /* (2^ 16)P */ 0x4a, 0x07, 0x99, 0x4a, 0x0f, 0x74, 0x91, 0x14, 0x68, 0xb9, 0x48, 0xb7, 0x44, 0x77, 0x9b, 0x4a, 0xe0, 0x68, 0x0e, 0x43, 0x4d, 0x98, 0x98, 0xbf, 0xa8, 0x3a, 0xb7, 0x6d, 0x2a, 0x9a, 0x77, 0x5f, 0x62, 0xf5, 0x6b, 0x4a, 0xb7, 0x7d, 0xe5, 0x09, 0x6b, 0xc0, 0x8b, 0x9c, 0x88, 0x37, 0x33, 0xf2, 0x41, 0xac, 0x22, 0x1f, 0xcf, 0x3b, 0x82, 0x34, - /* (2^ 17)P */ 0x00, 0xc3, 0x78, 0x42, 0x32, 0x2e, 0xdc, 0xda, 0xb1, 0x96, 0x21, 0xa4, 0xe4, 0xbb, 0xe9, 0x9d, 0xbb, 0x0f, 0x93, 0xed, 0x26, 0x3d, 0xb5, 0xdb, 0x94, 0x31, 0x37, 0x07, 0xa2, 0xb2, 0xd5, 0x99, 0x0d, 0x93, 0xe1, 0xce, 0x3f, 0x0b, 0x96, 0x82, 0x47, 0xfe, 0x60, 0x6f, 0x8f, 0x61, 0x88, 0xd7, 0x05, 0x95, 0x0b, 0x46, 0x06, 0xb7, 0x32, 0x06, - /* (2^ 18)P */ 0x44, 0xf5, 0x34, 0xdf, 0x2f, 0x9c, 0x5d, 0x9f, 0x53, 0x5c, 0x42, 0x8f, 0xc9, 0xdc, 0xd8, 0x40, 0xa2, 0xe7, 0x6a, 0x4a, 0x05, 0xf7, 0x86, 0x77, 0x2b, 0xae, 0x37, 0xed, 0x48, 0xfb, 0xf7, 0x62, 0x7c, 0x17, 0x59, 0x92, 0x41, 0x61, 0x93, 0x38, 0x30, 0xd1, 0xef, 0x54, 0x54, 0x03, 0x17, 0x57, 0x91, 0x15, 0x11, 0x33, 0xb5, 0xfa, 0xfb, 0x17, - /* (2^ 19)P */ 0x29, 0xbb, 0xd4, 0xb4, 0x9c, 0xf1, 0x72, 0x94, 0xce, 0x6a, 0x29, 0xa8, 0x89, 0x18, 0x19, 0xf7, 0xb7, 0xcc, 0xee, 0x9a, 0x02, 0xe3, 0xc0, 0xb1, 0xe0, 0xee, 0x83, 0x78, 0xb4, 0x9e, 0x07, 0x87, 0xdf, 0xb0, 0x82, 0x26, 0x4e, 0xa4, 0x0c, 0x33, 0xaf, 0x40, 0x59, 0xb6, 0xdd, 0x52, 0x45, 0xf0, 0xb4, 0xf6, 0xe8, 0x4e, 0x4e, 0x79, 0x1a, 0x5d, - /* (2^ 20)P */ 0x27, 0x33, 0x4d, 0x4c, 0x6b, 0x4f, 0x75, 0xb1, 0xbc, 0x1f, 0xab, 0x5b, 0x2b, 0xf0, 0x1c, 0x57, 0x86, 0xdd, 0xfd, 0x60, 0xb0, 0x8c, 0xe7, 0x9a, 0xe5, 0x5c, 0xeb, 0x11, 0x3a, 0xda, 0x22, 0x25, 0x99, 0x06, 0x8d, 0xf4, 0xaf, 0x29, 0x7a, 0xc9, 0xe5, 0xd2, 0x16, 0x9e, 0xd4, 0x63, 0x1d, 0x64, 0xa6, 0x47, 0x96, 0x37, 0x6f, 0x93, 0x2c, 0xcc, - /* (2^ 21)P */ 0xc1, 0x94, 0x74, 0x86, 0x75, 0xf2, 0x91, 0x58, 0x23, 0x85, 0x63, 0x76, 0x54, 0xc7, 0xb4, 0x8c, 0xbc, 0x4e, 0xc4, 0xa7, 0xba, 0xa0, 0x55, 0x26, 0x71, 0xd5, 0x33, 0x72, 0xc9, 0xad, 0x1e, 0xf9, 0x5d, 0x78, 0x70, 0x93, 0x4e, 0x85, 0xfc, 0x39, 0x06, 0x73, 0x76, 0xff, 0xe8, 0x64, 0x69, 0x42, 0x45, 0xb2, 0x69, 0xb5, 0x32, 0xe7, 0x2c, 0xde, - /* (2^ 22)P */ 0xde, 0x16, 0xd8, 0x33, 0x49, 0x32, 0xe9, 0x0e, 0x3a, 0x60, 0xee, 0x2e, 0x24, 0x75, 0xe3, 0x9c, 0x92, 0x07, 0xdb, 0xad, 0x92, 0xf5, 0x11, 0xdf, 0xdb, 0xb0, 0x17, 0x5c, 0xd6, 0x1a, 0x70, 0x00, 0xb7, 0xe2, 0x18, 0xec, 0xdc, 0xc2, 0x02, 0x93, 0xb3, 0xc8, 0x3f, 0x4f, 0x1b, 0x96, 0xe6, 0x33, 0x8c, 0xfb, 0xcc, 0xa5, 0x4e, 0xe8, 0xe7, 0x11, - /* (2^ 23)P */ 0x05, 0x7a, 0x74, 0x52, 0xf8, 0xdf, 0x0d, 0x7c, 0x6a, 0x1a, 0x4e, 0x9a, 0x02, 0x1d, 0xae, 0x77, 0xf8, 0x8e, 0xf9, 0xa2, 0x38, 0x54, 0x50, 0xb2, 0x2c, 0x08, 0x9d, 0x9b, 0x9f, 0xfb, 0x2b, 0x06, 0xde, 0x9d, 0xc2, 0x03, 0x0b, 0x22, 0x2b, 0x10, 0x5b, 0x3a, 0x73, 0x29, 0x8e, 0x3e, 0x37, 0x08, 0x2c, 0x3b, 0xf8, 0x80, 0xc1, 0x66, 0x1e, 0x98, - /* (2^ 24)P */ 0xd8, 0xd6, 0x3e, 0xcd, 0x63, 0x8c, 0x2b, 0x41, 0x81, 0xc0, 0x0c, 0x06, 0x87, 0xd6, 0xe7, 0x92, 0xfe, 0xf1, 0x0c, 0x4a, 0x84, 0x5b, 0xaf, 0x40, 0x53, 0x6f, 0x60, 0xd6, 0x6b, 0x76, 0x4b, 0xc2, 0xad, 0xc9, 0xb6, 0xb6, 0x6a, 0xa2, 0xb3, 0xf5, 0xf5, 0xc2, 0x55, 0x83, 0xb2, 0xd3, 0xe9, 0x41, 0x6c, 0x63, 0x51, 0xb8, 0x81, 0x74, 0xc8, 0x2c, - /* (2^ 25)P */ 0xb2, 0xaf, 0x1c, 0xee, 0x07, 0xb0, 0x58, 0xa8, 0x2c, 0x6a, 0xc9, 0x2d, 0x62, 0x28, 0x75, 0x0c, 0x40, 0xb6, 0x11, 0x33, 0x96, 0x80, 0x28, 0x6d, 0xd5, 0x9e, 0x87, 0x90, 0x01, 0x66, 0x1d, 0x1c, 0xf8, 0xb4, 0x92, 0xac, 0x38, 0x18, 0x05, 0xc2, 0x4c, 0x4b, 0x54, 0x7d, 0x80, 0x46, 0x87, 0x2d, 0x99, 0x8e, 0x70, 0x80, 0x69, 0x71, 0x8b, 0xed, - /* (2^ 26)P */ 0x37, 0xa7, 0x6b, 0x71, 0x36, 0x75, 0x8e, 0xff, 0x0f, 0x42, 0xda, 0x5a, 0x46, 0xa6, 0x97, 0x79, 0x7e, 0x30, 0xb3, 0x8f, 0xc7, 0x3a, 0xa0, 0xcb, 0x1d, 0x9c, 0x78, 0x77, 0x36, 0xc2, 0xe7, 0xf4, 0x2f, 0x29, 0x07, 0xb1, 0x07, 0xfd, 0xed, 0x1b, 0x39, 0x77, 0x06, 0x38, 0x77, 0x0f, 0x50, 0x31, 0x12, 0xbf, 0x92, 0xbf, 0x72, 0x79, 0x54, 0xa9, - /* (2^ 27)P */ 0xbd, 0x4d, 0x46, 0x6b, 0x1a, 0x80, 0x46, 0x2d, 0xed, 0xfd, 0x64, 0x6d, 0x94, 0xbc, 0x4a, 0x6e, 0x0c, 0x12, 0xf6, 0x12, 0xab, 0x54, 0x88, 0xd3, 0x85, 0xac, 0x51, 0xae, 0x6f, 0xca, 0xc4, 0xb7, 0xec, 0x22, 0x54, 0x6d, 0x80, 0xb2, 0x1c, 0x63, 0x33, 0x76, 0x6b, 0x8e, 0x6d, 0x59, 0xcd, 0x73, 0x92, 0x5f, 0xff, 0xad, 0x10, 0x35, 0x70, 0x5f, - /* (2^ 28)P */ 0xb3, 0x84, 0xde, 0xc8, 0x04, 0x43, 0x63, 0xfa, 0x29, 0xd9, 0xf0, 0x69, 0x65, 0x5a, 0x0c, 0xe8, 0x2e, 0x0b, 0xfe, 0xb0, 0x7a, 0x42, 0xb3, 0xc3, 0xfc, 0xe6, 0xb8, 0x92, 0x29, 0xae, 0xed, 0xec, 0xd5, 0xe8, 0x4a, 0xa1, 0xbd, 0x3b, 0xd3, 0xc0, 0x07, 0xab, 0x65, 0x65, 0x35, 0x9a, 0xa6, 0x5e, 0x78, 0x18, 0x76, 0x1c, 0x15, 0x49, 0xe6, 0x75, - /* (2^ 29)P */ 0x45, 0xb3, 0x92, 0xa9, 0xc3, 0xb8, 0x11, 0x68, 0x64, 0x3a, 0x83, 0x5d, 0xa8, 0x94, 0x6a, 0x9d, 0xaa, 0x27, 0x9f, 0x98, 0x5d, 0xc0, 0x29, 0xf0, 0xc0, 0x4b, 0x14, 0x3c, 0x05, 0xe7, 0xf8, 0xbd, 0x38, 0x22, 0x96, 0x75, 0x65, 0x5e, 0x0d, 0x3f, 0xbb, 0x6f, 0xe8, 0x3f, 0x96, 0x76, 0x9f, 0xba, 0xd9, 0x44, 0x92, 0x96, 0x22, 0xe7, 0x52, 0xe7, - /* (2^ 30)P */ 0xf4, 0xa3, 0x95, 0x90, 0x47, 0xdf, 0x7d, 0xdc, 0xf4, 0x13, 0x87, 0x67, 0x7d, 0x4f, 0x9d, 0xa0, 0x00, 0x46, 0x72, 0x08, 0xc3, 0xa2, 0x7a, 0x3e, 0xe7, 0x6d, 0x52, 0x7c, 0x11, 0x36, 0x50, 0x83, 0x89, 0x64, 0xcb, 0x1f, 0x08, 0x83, 0x46, 0xcb, 0xac, 0xa6, 0xd8, 0x9c, 0x1b, 0xe8, 0x05, 0x47, 0xc7, 0x26, 0x06, 0x83, 0x39, 0xe9, 0xb1, 0x1c, - /* (2^ 31)P */ 0x11, 0xe8, 0xc8, 0x42, 0xbf, 0x30, 0x9c, 0xa3, 0xf1, 0x85, 0x96, 0x95, 0x4f, 0x4f, 0x52, 0xa2, 0xf5, 0x8b, 0x68, 0x24, 0x16, 0xac, 0x9b, 0xa9, 0x27, 0x28, 0x0e, 0x84, 0x03, 0x46, 0x22, 0x5f, 0xf7, 0x0d, 0xa6, 0x85, 0x88, 0xc1, 0x45, 0x4b, 0x85, 0x1a, 0x10, 0x7f, 0xc9, 0x94, 0x20, 0xb0, 0x04, 0x28, 0x12, 0x30, 0xb9, 0xe6, 0x40, 0x6b, - /* (2^ 32)P */ 0xac, 0x1b, 0x57, 0xb6, 0x42, 0xdb, 0x81, 0x8d, 0x76, 0xfd, 0x9b, 0x1c, 0x29, 0x30, 0xd5, 0x3a, 0xcc, 0x53, 0xd9, 0x26, 0x7a, 0x0f, 0x9c, 0x2e, 0x79, 0xf5, 0x62, 0xeb, 0x61, 0x9d, 0x9b, 0x80, 0x39, 0xcd, 0x60, 0x2e, 0x1f, 0x08, 0x22, 0xbc, 0x19, 0xb3, 0x2a, 0x43, 0x44, 0xf2, 0x4e, 0x66, 0xf4, 0x36, 0xa6, 0xa7, 0xbc, 0xa4, 0x15, 0x7e, - /* (2^ 33)P */ 0xc1, 0x90, 0x8a, 0xde, 0xff, 0x78, 0xc3, 0x73, 0x16, 0xee, 0x76, 0xa0, 0x84, 0x60, 0x8d, 0xe6, 0x82, 0x0f, 0xde, 0x4e, 0xc5, 0x99, 0x34, 0x06, 0x90, 0x44, 0x55, 0xf8, 0x91, 0xd8, 0xe1, 0xe4, 0x2c, 0x8a, 0xde, 0x94, 0x1e, 0x78, 0x25, 0x3d, 0xfd, 0xd8, 0x59, 0x7d, 0xaf, 0x6e, 0xbe, 0x96, 0xbe, 0x3c, 0x16, 0x23, 0x0f, 0x4c, 0xa4, 0x28, - /* (2^ 34)P */ 0xba, 0x11, 0x35, 0x57, 0x03, 0xb6, 0xf4, 0x24, 0x89, 0xb8, 0x5a, 0x0d, 0x50, 0x9c, 0xaa, 0x51, 0x7f, 0xa4, 0x0e, 0xfc, 0x71, 0xb3, 0x3b, 0xf1, 0x96, 0x50, 0x23, 0x15, 0xf5, 0xf5, 0xd4, 0x23, 0xdc, 0x8b, 0x26, 0x9e, 0xae, 0xb7, 0x50, 0xcd, 0xc4, 0x25, 0xf6, 0x75, 0x40, 0x9c, 0x37, 0x79, 0x33, 0x60, 0xd4, 0x4b, 0x13, 0x32, 0xee, 0xe2, - /* (2^ 35)P */ 0x43, 0xb8, 0x56, 0x59, 0xf0, 0x68, 0x23, 0xb3, 0xea, 0x70, 0x58, 0x4c, 0x1e, 0x5a, 0x16, 0x54, 0x03, 0xb2, 0xf4, 0x73, 0xb6, 0xd9, 0x5c, 0x9c, 0x6f, 0xcf, 0x82, 0x2e, 0x54, 0x15, 0x46, 0x2c, 0xa3, 0xda, 0x4e, 0x87, 0xf5, 0x2b, 0xba, 0x91, 0xa3, 0xa0, 0x89, 0xba, 0x48, 0x2b, 0xfa, 0x64, 0x02, 0x7f, 0x78, 0x03, 0xd1, 0xe8, 0x3b, 0xe9, - /* (2^ 36)P */ 0x15, 0xa4, 0x71, 0xd4, 0x0c, 0x24, 0xe9, 0x07, 0xa1, 0x43, 0xf4, 0x7f, 0xbb, 0xa2, 0xa6, 0x6b, 0xfa, 0xb7, 0xea, 0x58, 0xd1, 0x96, 0xb0, 0x24, 0x5c, 0xc7, 0x37, 0x4e, 0x60, 0x0f, 0x40, 0xf2, 0x2f, 0x44, 0x70, 0xea, 0x80, 0x63, 0xfe, 0xfc, 0x46, 0x59, 0x12, 0x27, 0xb5, 0x27, 0xfd, 0xb7, 0x73, 0x0b, 0xca, 0x8b, 0xc2, 0xd3, 0x71, 0x08, - /* (2^ 37)P */ 0x26, 0x0e, 0xd7, 0x52, 0x6f, 0xf1, 0xf2, 0x9d, 0xb8, 0x3d, 0xbd, 0xd4, 0x75, 0x97, 0xd8, 0xbf, 0xa8, 0x86, 0x96, 0xa5, 0x80, 0xa0, 0x45, 0x75, 0xf6, 0x77, 0x71, 0xdb, 0x77, 0x96, 0x55, 0x99, 0x31, 0xd0, 0x4f, 0x34, 0xf4, 0x35, 0x39, 0x41, 0xd3, 0x7d, 0xf7, 0xe2, 0x74, 0xde, 0xbe, 0x5b, 0x1f, 0x39, 0x10, 0x21, 0xa3, 0x4d, 0x3b, 0xc8, - /* (2^ 38)P */ 0x04, 0x00, 0x2a, 0x45, 0xb2, 0xaf, 0x9b, 0x18, 0x6a, 0xeb, 0x96, 0x28, 0xa4, 0x77, 0xd0, 0x13, 0xcf, 0x17, 0x65, 0xe8, 0xc5, 0x81, 0x28, 0xad, 0x39, 0x7a, 0x0b, 0xaa, 0x55, 0x2b, 0xf3, 0xfc, 0x86, 0x40, 0xad, 0x0d, 0x1e, 0x28, 0xa2, 0x2d, 0xc5, 0xd6, 0x04, 0x15, 0xa2, 0x30, 0x3d, 0x12, 0x8e, 0xd6, 0xb5, 0xf7, 0x69, 0xbb, 0x84, 0x20, - /* (2^ 39)P */ 0xd7, 0x7a, 0x77, 0x2c, 0xfb, 0x81, 0x80, 0xe9, 0x1e, 0xc6, 0x36, 0x31, 0x79, 0xc3, 0x7c, 0xa9, 0x57, 0x6b, 0xb5, 0x70, 0xfb, 0xe4, 0xa1, 0xff, 0xfd, 0x21, 0xa5, 0x7c, 0xfa, 0x44, 0xba, 0x0d, 0x96, 0x3d, 0xc4, 0x5c, 0x39, 0x52, 0x87, 0xd7, 0x22, 0x0f, 0x52, 0x88, 0x91, 0x87, 0x96, 0xac, 0xfa, 0x3b, 0xdf, 0xdc, 0x83, 0x8c, 0x99, 0x29, - /* (2^ 40)P */ 0x98, 0x6b, 0x3a, 0x8d, 0x83, 0x17, 0xe1, 0x62, 0xd8, 0x80, 0x4c, 0x97, 0xce, 0x6b, 0xaa, 0x10, 0xa7, 0xc4, 0xe9, 0xeb, 0xa5, 0xfb, 0xc9, 0xdd, 0x2d, 0xeb, 0xfc, 0x9a, 0x71, 0xcd, 0x68, 0x6e, 0xc0, 0x35, 0x64, 0x62, 0x1b, 0x95, 0x12, 0xe8, 0x53, 0xec, 0xf0, 0xf4, 0x86, 0x86, 0x78, 0x18, 0xc4, 0xc6, 0xbc, 0x5a, 0x59, 0x8f, 0x7c, 0x7e, - /* (2^ 41)P */ 0x7f, 0xd7, 0x1e, 0xc5, 0x83, 0xdc, 0x1f, 0xbe, 0x0b, 0xcf, 0x2e, 0x01, 0x01, 0xed, 0xac, 0x17, 0x3b, 0xed, 0xa4, 0x30, 0x96, 0x0e, 0x14, 0x7e, 0x19, 0x2b, 0xa5, 0x67, 0x1e, 0xb3, 0x34, 0x03, 0xa8, 0xbb, 0x0a, 0x7d, 0x08, 0x2d, 0xd5, 0x53, 0x19, 0x6f, 0x13, 0xd5, 0xc0, 0x90, 0x8a, 0xcc, 0xc9, 0x5c, 0xab, 0x24, 0xd7, 0x03, 0xf6, 0x57, - /* (2^ 42)P */ 0x49, 0xcb, 0xb4, 0x96, 0x5f, 0xa6, 0xf8, 0x71, 0x6f, 0x59, 0xad, 0x05, 0x24, 0x2d, 0xaf, 0x67, 0xa8, 0xbe, 0x95, 0xdf, 0x0d, 0x28, 0x5a, 0x7f, 0x6e, 0x87, 0x8c, 0x6e, 0x67, 0x0c, 0xf4, 0xe0, 0x1c, 0x30, 0xc2, 0x66, 0xae, 0x20, 0xa1, 0x34, 0xec, 0x9c, 0xbc, 0xae, 0x3d, 0xa1, 0x28, 0x28, 0x95, 0x1d, 0xc9, 0x3a, 0xa8, 0xfd, 0xfc, 0xa1, - /* (2^ 43)P */ 0xe2, 0x2b, 0x9d, 0xed, 0x02, 0x99, 0x67, 0xbb, 0x2e, 0x16, 0x62, 0x05, 0x70, 0xc7, 0x27, 0xb9, 0x1c, 0x3f, 0xf2, 0x11, 0x01, 0xd8, 0x51, 0xa4, 0x18, 0x92, 0xa9, 0x5d, 0xfb, 0xa9, 0xe4, 0x42, 0xba, 0x38, 0x34, 0x1a, 0x4a, 0xc5, 0x6a, 0x37, 0xde, 0xa7, 0x0c, 0xb4, 0x7e, 0x7f, 0xde, 0xa6, 0xee, 0xcd, 0x55, 0x57, 0x05, 0x06, 0xfd, 0x5d, - /* (2^ 44)P */ 0x2f, 0x32, 0xcf, 0x2e, 0x2c, 0x7b, 0xbe, 0x9a, 0x0c, 0x57, 0x35, 0xf8, 0x87, 0xda, 0x9c, 0xec, 0x48, 0xf2, 0xbb, 0xe2, 0xda, 0x10, 0x58, 0x20, 0xc6, 0xd3, 0x87, 0xe9, 0xc7, 0x26, 0xd1, 0x9a, 0x46, 0x87, 0x90, 0xda, 0xdc, 0xde, 0xc3, 0xb3, 0xf2, 0xe8, 0x6f, 0x4a, 0xe6, 0xe8, 0x9d, 0x98, 0x36, 0x20, 0x03, 0x47, 0x15, 0x3f, 0x64, 0x59, - /* (2^ 45)P */ 0xd4, 0x71, 0x49, 0x0a, 0x67, 0x97, 0xaa, 0x3f, 0xf4, 0x1b, 0x3a, 0x6e, 0x5e, 0x17, 0xcc, 0x0a, 0x8f, 0x81, 0x6a, 0x41, 0x38, 0x77, 0x40, 0x8a, 0x11, 0x42, 0x62, 0xd2, 0x50, 0x32, 0x79, 0x78, 0x28, 0xc2, 0x2e, 0x10, 0x01, 0x94, 0x30, 0x4f, 0x7f, 0x18, 0x17, 0x56, 0x85, 0x4e, 0xad, 0xf7, 0xcb, 0x87, 0x3c, 0x3f, 0x50, 0x2c, 0xc0, 0xba, - /* (2^ 46)P */ 0xbc, 0x30, 0x8e, 0x65, 0x8e, 0x57, 0x5b, 0x38, 0x7a, 0xd4, 0x95, 0x52, 0x7a, 0x32, 0x59, 0x69, 0xcd, 0x9d, 0x47, 0x34, 0x5b, 0x55, 0xa5, 0x24, 0x60, 0xdd, 0xc0, 0xc1, 0x62, 0x73, 0x44, 0xae, 0x4c, 0x9c, 0x65, 0x55, 0x1b, 0x9d, 0x8a, 0x29, 0xb0, 0x1a, 0x52, 0xa8, 0xf1, 0xe6, 0x9a, 0xb3, 0xf6, 0xa3, 0xc9, 0x0a, 0x70, 0x7d, 0x0f, 0xee, - /* (2^ 47)P */ 0x77, 0xd3, 0xe5, 0x8e, 0xfa, 0x00, 0xeb, 0x1b, 0x7f, 0xdc, 0x68, 0x3f, 0x92, 0xbd, 0xb7, 0x0b, 0xb7, 0xb5, 0x24, 0xdf, 0xc5, 0x67, 0x53, 0xd4, 0x36, 0x79, 0xc4, 0x7b, 0x57, 0xbc, 0x99, 0x97, 0x60, 0xef, 0xe4, 0x01, 0xa1, 0xa7, 0xaa, 0x12, 0x36, 0x29, 0xb1, 0x03, 0xc2, 0x83, 0x1c, 0x2b, 0x83, 0xef, 0x2e, 0x2c, 0x23, 0x92, 0xfd, 0xd1, - /* (2^ 48)P */ 0x94, 0xef, 0x03, 0x59, 0xfa, 0x8a, 0x18, 0x76, 0xee, 0x58, 0x08, 0x4d, 0x44, 0xce, 0xf1, 0x52, 0x33, 0x49, 0xf6, 0x69, 0x71, 0xe3, 0xa9, 0xbc, 0x86, 0xe3, 0x43, 0xde, 0x33, 0x7b, 0x90, 0x8b, 0x3e, 0x7d, 0xd5, 0x4a, 0xf0, 0x23, 0x99, 0xa6, 0xea, 0x5f, 0x08, 0xe5, 0xb9, 0x49, 0x8b, 0x0d, 0x6a, 0x21, 0xab, 0x07, 0x62, 0xcd, 0xc4, 0xbe, - /* (2^ 49)P */ 0x61, 0xbf, 0x70, 0x14, 0xfa, 0x4e, 0x9e, 0x7c, 0x0c, 0xf8, 0xb2, 0x48, 0x71, 0x62, 0x83, 0xd6, 0xd1, 0xdc, 0x9c, 0x29, 0x66, 0xb1, 0x34, 0x9c, 0x8d, 0xe6, 0x88, 0xaf, 0xbe, 0xdc, 0x4d, 0xeb, 0xb0, 0xe7, 0x28, 0xae, 0xb2, 0x05, 0x56, 0xc6, 0x0e, 0x10, 0x26, 0xab, 0x2c, 0x59, 0x72, 0x03, 0x66, 0xfe, 0x8f, 0x2c, 0x51, 0x2d, 0xdc, 0xae, - /* (2^ 50)P */ 0xdc, 0x63, 0xf1, 0x8b, 0x5c, 0x65, 0x0b, 0xf1, 0xa6, 0x22, 0xe2, 0xd9, 0xdb, 0x49, 0xb1, 0x3c, 0x47, 0xc2, 0xfe, 0xac, 0x86, 0x07, 0x52, 0xec, 0xb0, 0x08, 0x69, 0xfb, 0xd1, 0x06, 0xdc, 0x48, 0x5c, 0x3d, 0xb2, 0x4d, 0xb8, 0x1a, 0x4e, 0xda, 0xb9, 0xc1, 0x2b, 0xab, 0x4b, 0x62, 0x81, 0x21, 0x9a, 0xfc, 0x3d, 0x39, 0x83, 0x11, 0x36, 0xeb, - /* (2^ 51)P */ 0x94, 0xf3, 0x17, 0xef, 0xf9, 0x60, 0x54, 0xc3, 0xd7, 0x27, 0x35, 0xc5, 0x98, 0x5e, 0xf6, 0x63, 0x6c, 0xa0, 0x4a, 0xd3, 0xa3, 0x98, 0xd9, 0x42, 0xe3, 0xf1, 0xf8, 0x81, 0x96, 0xa9, 0xea, 0x6d, 0x4b, 0x8e, 0x33, 0xca, 0x94, 0x0d, 0xa0, 0xf7, 0xbb, 0x64, 0xa3, 0x36, 0x6f, 0xdc, 0x5a, 0x94, 0x42, 0xca, 0x06, 0xb2, 0x2b, 0x9a, 0x9f, 0x71, - /* (2^ 52)P */ 0xec, 0xdb, 0xa6, 0x1f, 0xdf, 0x15, 0x36, 0xa3, 0xda, 0x8a, 0x7a, 0xb6, 0xa7, 0xe3, 0xaf, 0x52, 0xe0, 0x8d, 0xe8, 0xf2, 0x44, 0x20, 0xeb, 0xa1, 0x20, 0xc4, 0x65, 0x3c, 0x7c, 0x6c, 0x49, 0xed, 0x2f, 0x66, 0x23, 0x68, 0x61, 0x91, 0x40, 0x9f, 0x50, 0x19, 0xd1, 0x84, 0xa7, 0xe2, 0xed, 0x34, 0x37, 0xe3, 0xe4, 0x11, 0x7f, 0x87, 0x55, 0x0f, - /* (2^ 53)P */ 0xb3, 0xa1, 0x0f, 0xb0, 0x48, 0xc0, 0x4d, 0x96, 0xa7, 0xcf, 0x5a, 0x81, 0xb8, 0x4a, 0x46, 0xef, 0x0a, 0xd3, 0x40, 0x7e, 0x02, 0xe3, 0x63, 0xaa, 0x50, 0xd1, 0x2a, 0x37, 0x22, 0x4a, 0x7f, 0x4f, 0xb6, 0xf9, 0x01, 0x82, 0x78, 0x3d, 0x93, 0x14, 0x11, 0x8a, 0x90, 0x60, 0xcd, 0x45, 0x4e, 0x7b, 0x42, 0xb9, 0x3e, 0x6e, 0x68, 0x1f, 0x36, 0x41, - /* (2^ 54)P */ 0x13, 0x73, 0x0e, 0x4f, 0x79, 0x93, 0x9e, 0x29, 0x70, 0x7b, 0x4a, 0x59, 0x1a, 0x9a, 0xf4, 0x55, 0x08, 0xf0, 0xdb, 0x17, 0x58, 0xec, 0x64, 0xad, 0x7f, 0x29, 0xeb, 0x3f, 0x85, 0x4e, 0x60, 0x28, 0x98, 0x1f, 0x73, 0x4e, 0xe6, 0xa8, 0xab, 0xd5, 0xd6, 0xfc, 0xa1, 0x36, 0x6d, 0x15, 0xc6, 0x13, 0x83, 0xa0, 0xc2, 0x6e, 0xd9, 0xdb, 0xc9, 0xcc, - /* (2^ 55)P */ 0xff, 0xd8, 0x52, 0xa3, 0xdc, 0x99, 0xcf, 0x3e, 0x19, 0xb3, 0x68, 0xd0, 0xb5, 0x0d, 0xb8, 0xee, 0x3f, 0xef, 0x6e, 0xc0, 0x38, 0x28, 0x44, 0x92, 0x78, 0x91, 0x1a, 0x08, 0x78, 0x6c, 0x65, 0x24, 0xf3, 0xa2, 0x3d, 0xf2, 0xe5, 0x79, 0x62, 0x69, 0x29, 0xf4, 0x22, 0xc5, 0xdb, 0x6a, 0xae, 0xf4, 0x44, 0xa3, 0x6f, 0xc7, 0x86, 0xab, 0xef, 0xef, - /* (2^ 56)P */ 0xbf, 0x54, 0x9a, 0x09, 0x5d, 0x17, 0xd0, 0xde, 0xfb, 0xf5, 0xca, 0xff, 0x13, 0x20, 0x88, 0x82, 0x3a, 0xe2, 0xd0, 0x3b, 0xfb, 0x05, 0x76, 0xd1, 0xc0, 0x02, 0x71, 0x3b, 0x94, 0xe8, 0xc9, 0x84, 0xcf, 0xa4, 0xe9, 0x28, 0x7b, 0xf5, 0x09, 0xc3, 0x2b, 0x22, 0x40, 0xf1, 0x68, 0x24, 0x24, 0x7d, 0x9f, 0x6e, 0xcd, 0xfe, 0xb0, 0x19, 0x61, 0xf5, - /* (2^ 57)P */ 0xe8, 0x63, 0x51, 0xb3, 0x95, 0x6b, 0x7b, 0x74, 0x92, 0x52, 0x45, 0xa4, 0xed, 0xea, 0x0e, 0x0d, 0x2b, 0x01, 0x1e, 0x2c, 0xbc, 0x91, 0x06, 0x69, 0xdb, 0x1f, 0xb5, 0x77, 0x1d, 0x56, 0xf5, 0xb4, 0x02, 0x80, 0x49, 0x56, 0x12, 0xce, 0x86, 0x05, 0xc9, 0xd9, 0xae, 0xf3, 0x6d, 0xe6, 0x3f, 0x40, 0x52, 0xe9, 0x49, 0x2b, 0x31, 0x06, 0x86, 0x14, - /* (2^ 58)P */ 0xf5, 0x09, 0x3b, 0xd2, 0xff, 0xdf, 0x11, 0xa5, 0x1c, 0x99, 0xe8, 0x1b, 0xa4, 0x2c, 0x7d, 0x8e, 0xc8, 0xf7, 0x03, 0x46, 0xfa, 0xb6, 0xde, 0x73, 0x91, 0x7e, 0x5a, 0x7a, 0xd7, 0x9a, 0x5b, 0x80, 0x24, 0x62, 0x5e, 0x92, 0xf1, 0xa3, 0x45, 0xa3, 0x43, 0x92, 0x8a, 0x2a, 0x5b, 0x0c, 0xb4, 0xc8, 0xad, 0x1c, 0xb6, 0x6c, 0x5e, 0x81, 0x18, 0x91, - /* (2^ 59)P */ 0x96, 0xb3, 0xca, 0x2b, 0xe3, 0x7a, 0x59, 0x72, 0x17, 0x74, 0x29, 0x21, 0xe7, 0x78, 0x07, 0xad, 0xda, 0xb6, 0xcd, 0xf9, 0x27, 0x4d, 0xc8, 0xf2, 0x98, 0x22, 0xca, 0xf2, 0x33, 0x74, 0x7a, 0xdd, 0x1e, 0x71, 0xec, 0xe3, 0x3f, 0xe2, 0xa2, 0xd2, 0x38, 0x75, 0xb0, 0xd0, 0x0a, 0xcf, 0x7d, 0x36, 0xdc, 0x49, 0x38, 0x25, 0x34, 0x4f, 0x20, 0x9a, - /* (2^ 60)P */ 0x2b, 0x6e, 0x04, 0x0d, 0x4f, 0x3d, 0x3b, 0x24, 0xf6, 0x4e, 0x5e, 0x0a, 0xbd, 0x48, 0x96, 0xba, 0x81, 0x8f, 0x39, 0x82, 0x13, 0xe6, 0x72, 0xf3, 0x0f, 0xb6, 0x94, 0xf4, 0xc5, 0x90, 0x74, 0x91, 0xa8, 0xf2, 0xc9, 0xca, 0x9a, 0x4d, 0x98, 0xf2, 0xdf, 0x52, 0x4e, 0x97, 0x2f, 0xeb, 0x84, 0xd3, 0xaf, 0xc2, 0xcc, 0xfb, 0x4c, 0x26, 0x4b, 0xe4, - /* (2^ 61)P */ 0x12, 0x9e, 0xfb, 0x9d, 0x78, 0x79, 0x99, 0xdd, 0xb3, 0x0b, 0x2e, 0x56, 0x41, 0x8e, 0x3f, 0x39, 0xb8, 0x97, 0x89, 0x53, 0x9b, 0x8a, 0x3c, 0x40, 0x9d, 0xa4, 0x6c, 0x2e, 0x31, 0x71, 0xc6, 0x0a, 0x41, 0xd4, 0x95, 0x06, 0x5e, 0xc1, 0xab, 0xc2, 0x14, 0xc4, 0xc7, 0x15, 0x08, 0x3a, 0xad, 0x7a, 0xb4, 0x62, 0xa3, 0x0c, 0x90, 0xf4, 0x47, 0x08, - /* (2^ 62)P */ 0x7f, 0xec, 0x09, 0x82, 0xf5, 0x94, 0x09, 0x93, 0x32, 0xd3, 0xdc, 0x56, 0x80, 0x7b, 0x5b, 0x22, 0x80, 0x6a, 0x96, 0x72, 0xb1, 0xc2, 0xd9, 0xa1, 0x8b, 0x66, 0x42, 0x16, 0xe2, 0x07, 0xb3, 0x2d, 0xf1, 0x75, 0x35, 0x72, 0xc7, 0x98, 0xbe, 0x63, 0x3b, 0x20, 0x75, 0x05, 0xc1, 0x3e, 0x31, 0x5a, 0xf7, 0xaa, 0xae, 0x4b, 0xdb, 0x1d, 0xd0, 0x74, - /* (2^ 63)P */ 0x36, 0x5c, 0x74, 0xe6, 0x5d, 0x59, 0x3f, 0x15, 0x4b, 0x4d, 0x4e, 0x67, 0x41, 0xfe, 0x98, 0x1f, 0x49, 0x76, 0x91, 0x0f, 0x9b, 0xf4, 0xaf, 0x86, 0xaf, 0x66, 0x19, 0xed, 0x46, 0xf1, 0x05, 0x9a, 0xcc, 0xd1, 0x14, 0x1f, 0x82, 0x12, 0x8e, 0xe6, 0xf4, 0xc3, 0x42, 0x5c, 0x4e, 0x33, 0x93, 0xbe, 0x30, 0xe7, 0x64, 0xa9, 0x35, 0x00, 0x4d, 0xf9, - /* (2^ 64)P */ 0x1f, 0xc1, 0x1e, 0xb7, 0xe3, 0x7c, 0xfa, 0xa3, 0x6b, 0x76, 0xaf, 0x9c, 0x05, 0x85, 0x4a, 0xa9, 0xfb, 0xe3, 0x7e, 0xf2, 0x49, 0x56, 0xdc, 0x2f, 0x57, 0x10, 0xba, 0x37, 0xb2, 0x62, 0xf5, 0x6b, 0xe5, 0x8f, 0x0a, 0x87, 0xd1, 0x6a, 0xcb, 0x9d, 0x07, 0xd0, 0xf6, 0x38, 0x99, 0x2c, 0x61, 0x4a, 0x4e, 0xd8, 0xd2, 0x88, 0x29, 0x99, 0x11, 0x95, - /* (2^ 65)P */ 0x6f, 0xdc, 0xd5, 0xd6, 0xd6, 0xa7, 0x4c, 0x46, 0x93, 0x65, 0x62, 0x23, 0x95, 0x32, 0x9c, 0xde, 0x40, 0x41, 0x68, 0x2c, 0x18, 0x4e, 0x5a, 0x8c, 0xc0, 0xc5, 0xc5, 0xea, 0x5c, 0x45, 0x0f, 0x60, 0x78, 0x39, 0xb6, 0x36, 0x23, 0x12, 0xbc, 0x21, 0x9a, 0xf8, 0x91, 0xac, 0xc4, 0x70, 0xdf, 0x85, 0x8e, 0x3c, 0xec, 0x22, 0x04, 0x98, 0xa8, 0xaa, - /* (2^ 66)P */ 0xcc, 0x52, 0x10, 0x5b, 0x4b, 0x6c, 0xc5, 0xfa, 0x3e, 0xd4, 0xf8, 0x1c, 0x04, 0x14, 0x48, 0x33, 0xd9, 0xfc, 0x5f, 0xb0, 0xa5, 0x48, 0x8c, 0x45, 0x8a, 0xee, 0x3e, 0xa7, 0xc1, 0x2e, 0x34, 0xca, 0xf6, 0xc9, 0xeb, 0x10, 0xbb, 0xe1, 0x59, 0x84, 0x25, 0xe8, 0x81, 0x70, 0xc0, 0x09, 0x42, 0xa7, 0x3b, 0x0d, 0x33, 0x00, 0xb5, 0x77, 0xbe, 0x25, - /* (2^ 67)P */ 0xcd, 0x1f, 0xbc, 0x7d, 0xef, 0xe5, 0xca, 0x91, 0xaf, 0xa9, 0x59, 0x6a, 0x09, 0xca, 0xd6, 0x1b, 0x3d, 0x55, 0xde, 0xa2, 0x6a, 0x80, 0xd6, 0x95, 0x47, 0xe4, 0x5f, 0x68, 0x54, 0x08, 0xdf, 0x29, 0xba, 0x2a, 0x02, 0x84, 0xe8, 0xe9, 0x00, 0x77, 0x99, 0x36, 0x03, 0xf6, 0x4a, 0x3e, 0x21, 0x81, 0x7d, 0xb8, 0xa4, 0x8a, 0xa2, 0x05, 0xef, 0xbc, - /* (2^ 68)P */ 0x7c, 0x59, 0x5f, 0x66, 0xd9, 0xb7, 0x83, 0x43, 0x8a, 0xa1, 0x8d, 0x51, 0x70, 0xba, 0xf2, 0x9b, 0x95, 0xc0, 0x4b, 0x4c, 0xa0, 0x14, 0xd3, 0xa4, 0x5d, 0x4a, 0x37, 0x36, 0x97, 0x31, 0x1e, 0x12, 0xe7, 0xbb, 0x08, 0x67, 0xa5, 0x23, 0xd7, 0xfb, 0x97, 0xd8, 0x6a, 0x03, 0xb1, 0xf8, 0x7f, 0xda, 0x58, 0xd9, 0x3f, 0x73, 0x4a, 0x53, 0xe1, 0x7b, - /* (2^ 69)P */ 0x55, 0x83, 0x98, 0x78, 0x6c, 0x56, 0x5e, 0xed, 0xf7, 0x23, 0x3e, 0x4c, 0x7d, 0x09, 0x2d, 0x09, 0x9c, 0x58, 0x8b, 0x32, 0xca, 0xfe, 0xbf, 0x47, 0x03, 0xeb, 0x4d, 0xe7, 0xeb, 0x9c, 0x83, 0x05, 0x68, 0xaa, 0x80, 0x89, 0x44, 0xf9, 0xd4, 0xdc, 0xdb, 0xb1, 0xdb, 0x77, 0xac, 0xf9, 0x2a, 0xae, 0x35, 0xac, 0x74, 0xb5, 0x95, 0x62, 0x18, 0x85, - /* (2^ 70)P */ 0xab, 0x82, 0x7e, 0x10, 0xd7, 0xe6, 0x57, 0xd1, 0x66, 0x12, 0x31, 0x9c, 0x9c, 0xa6, 0x27, 0x59, 0x71, 0x2e, 0xeb, 0xa0, 0x68, 0xc5, 0x87, 0x51, 0xf4, 0xca, 0x3f, 0x98, 0x56, 0xb0, 0x89, 0xb1, 0xc7, 0x7b, 0x46, 0xb3, 0xae, 0x36, 0xf2, 0xee, 0x15, 0x1a, 0x60, 0xf4, 0x50, 0x76, 0x4f, 0xc4, 0x53, 0x0d, 0x36, 0x4d, 0x31, 0xb1, 0x20, 0x51, - /* (2^ 71)P */ 0xf7, 0x1d, 0x8c, 0x1b, 0x5e, 0xe5, 0x02, 0x6f, 0xc5, 0xa5, 0xe0, 0x5f, 0xc6, 0xb6, 0x63, 0x43, 0xaf, 0x3c, 0x19, 0x6c, 0xf4, 0xaf, 0xa4, 0x33, 0xb1, 0x0a, 0x37, 0x3d, 0xd9, 0x4d, 0xe2, 0x29, 0x24, 0x26, 0x94, 0x7c, 0x02, 0xe4, 0xe2, 0xf2, 0xbe, 0xbd, 0xac, 0x1b, 0x48, 0xb8, 0xdd, 0xe9, 0x0d, 0x9a, 0x50, 0x1a, 0x98, 0x71, 0x6e, 0xdc, - /* (2^ 72)P */ 0x9f, 0x40, 0xb1, 0xb3, 0x66, 0x28, 0x6c, 0xfe, 0xa6, 0x7d, 0xf8, 0x3e, 0xb8, 0xf3, 0xde, 0x52, 0x76, 0x52, 0xa3, 0x92, 0x98, 0x23, 0xab, 0x4f, 0x88, 0x97, 0xfc, 0x22, 0xe1, 0x6b, 0x67, 0xcd, 0x13, 0x95, 0xda, 0x65, 0xdd, 0x3b, 0x67, 0x3f, 0x5f, 0x4c, 0xf2, 0x8a, 0xad, 0x98, 0xa7, 0x94, 0x24, 0x45, 0x87, 0x11, 0x7c, 0x75, 0x79, 0x85, - /* (2^ 73)P */ 0x70, 0xbf, 0xf9, 0x3b, 0xa9, 0x44, 0x57, 0x72, 0x96, 0xc9, 0xa4, 0x98, 0x65, 0xbf, 0x87, 0xb3, 0x3a, 0x39, 0x12, 0xde, 0xe5, 0x39, 0x01, 0x4f, 0xf7, 0xc0, 0x71, 0x52, 0x36, 0x85, 0xb3, 0x18, 0xf8, 0x14, 0xc0, 0x6d, 0xae, 0x9e, 0x4f, 0xb0, 0x72, 0x87, 0xac, 0x5c, 0xd1, 0x6c, 0x41, 0x6c, 0x90, 0x9d, 0x22, 0x81, 0xe4, 0x2b, 0xea, 0xe5, - /* (2^ 74)P */ 0xfc, 0xea, 0x1a, 0x65, 0xd9, 0x49, 0x6a, 0x39, 0xb5, 0x96, 0x72, 0x7b, 0x32, 0xf1, 0xd0, 0xe9, 0x45, 0xd9, 0x31, 0x55, 0xc7, 0x34, 0xe9, 0x5a, 0xec, 0x73, 0x0b, 0x03, 0xc4, 0xb3, 0xe6, 0xc9, 0x5e, 0x0a, 0x17, 0xfe, 0x53, 0x66, 0x7f, 0x21, 0x18, 0x74, 0x54, 0x1b, 0xc9, 0x49, 0x16, 0xd2, 0x48, 0xaf, 0x5b, 0x47, 0x7b, 0xeb, 0xaa, 0xc9, - /* (2^ 75)P */ 0x47, 0x04, 0xf5, 0x5a, 0x87, 0x77, 0x9e, 0x21, 0x34, 0x4e, 0x83, 0x88, 0xaf, 0x02, 0x1d, 0xb0, 0x5a, 0x1d, 0x1d, 0x7d, 0x8d, 0x2c, 0xd3, 0x8d, 0x63, 0xa9, 0x45, 0xfb, 0x15, 0x6d, 0x86, 0x45, 0xcd, 0x38, 0x0e, 0xf7, 0x37, 0x79, 0xed, 0x6d, 0x5a, 0xbc, 0x32, 0xcc, 0x66, 0xf1, 0x3a, 0xb2, 0x87, 0x6f, 0x70, 0x71, 0xd9, 0xf2, 0xfa, 0x7b, - /* (2^ 76)P */ 0x68, 0x07, 0xdc, 0x61, 0x40, 0xe4, 0xec, 0x32, 0xc8, 0xbe, 0x66, 0x30, 0x54, 0x80, 0xfd, 0x13, 0x7a, 0xef, 0xae, 0xed, 0x2e, 0x00, 0x6d, 0x3f, 0xbd, 0xfc, 0x91, 0x24, 0x53, 0x7f, 0x63, 0x9d, 0x2e, 0xe3, 0x76, 0xe0, 0xf3, 0xe1, 0x8f, 0x7a, 0xc4, 0x77, 0x0c, 0x91, 0xc0, 0xc2, 0x18, 0x6b, 0x04, 0xad, 0xb6, 0x70, 0x9a, 0x64, 0xc5, 0x82, - /* (2^ 77)P */ 0x7f, 0xea, 0x13, 0xd8, 0x9e, 0xfc, 0x5b, 0x06, 0xb5, 0x4f, 0xda, 0x38, 0xe0, 0x9c, 0xd2, 0x3a, 0xc1, 0x1c, 0x62, 0x70, 0x7f, 0xc6, 0x24, 0x0a, 0x47, 0x04, 0x01, 0xc4, 0x55, 0x09, 0xd1, 0x7a, 0x07, 0xba, 0xa3, 0x80, 0x4f, 0xc1, 0x65, 0x36, 0x6d, 0xc0, 0x10, 0xcf, 0x94, 0xa9, 0xa2, 0x01, 0x44, 0xd1, 0xf9, 0x1c, 0x4c, 0xfb, 0xf8, 0x99, - /* (2^ 78)P */ 0x6c, 0xb9, 0x6b, 0xee, 0x43, 0x5b, 0xb9, 0xbb, 0xee, 0x2e, 0x52, 0xc1, 0xc6, 0xb9, 0x61, 0xd2, 0x93, 0xa5, 0xaf, 0x52, 0xf4, 0xa4, 0x1a, 0x51, 0x61, 0xa7, 0xcb, 0x9e, 0xbb, 0x56, 0x65, 0xe2, 0xbf, 0x75, 0xb9, 0x9c, 0x50, 0x96, 0x60, 0x81, 0x74, 0x47, 0xc0, 0x04, 0x88, 0x71, 0x76, 0x39, 0x9a, 0xa7, 0xb1, 0x4e, 0x43, 0x15, 0xe0, 0xbb, - /* (2^ 79)P */ 0xbb, 0xce, 0xe2, 0xbb, 0xf9, 0x17, 0x0f, 0x82, 0x40, 0xad, 0x73, 0xe3, 0xeb, 0x3b, 0x06, 0x1a, 0xcf, 0x8e, 0x6e, 0x28, 0xb8, 0x26, 0xd9, 0x5b, 0xb7, 0xb3, 0xcf, 0xb4, 0x6a, 0x1c, 0xbf, 0x7f, 0xb8, 0xb5, 0x79, 0xcf, 0x45, 0x68, 0x7d, 0xc5, 0xeb, 0xf3, 0xbe, 0x39, 0x40, 0xfc, 0x07, 0x90, 0x7a, 0x62, 0xad, 0x86, 0x08, 0x71, 0x25, 0xe1, - /* (2^ 80)P */ 0x9b, 0x46, 0xac, 0xef, 0xc1, 0x4e, 0xa1, 0x97, 0x95, 0x76, 0xf9, 0x1b, 0xc2, 0xb2, 0x6a, 0x41, 0xea, 0x80, 0x3d, 0xe9, 0x08, 0x52, 0x5a, 0xe3, 0xf2, 0x08, 0xc5, 0xea, 0x39, 0x3f, 0x44, 0x71, 0x4d, 0xea, 0x0d, 0x05, 0x23, 0xe4, 0x2e, 0x3c, 0x89, 0xfe, 0x12, 0x8a, 0x95, 0x42, 0x0a, 0x68, 0xea, 0x5a, 0x28, 0x06, 0x9e, 0xe3, 0x5f, 0xe0, - /* (2^ 81)P */ 0x00, 0x61, 0x6c, 0x98, 0x9b, 0xe7, 0xb9, 0x06, 0x1c, 0xc5, 0x1b, 0xed, 0xbe, 0xc8, 0xb3, 0xea, 0x87, 0xf0, 0xc4, 0x24, 0x7d, 0xbb, 0x5d, 0xa4, 0x1d, 0x7a, 0x16, 0x00, 0x55, 0x94, 0x67, 0x78, 0xbd, 0x58, 0x02, 0x82, 0x90, 0x53, 0x76, 0xd4, 0x72, 0x99, 0x51, 0x6f, 0x7b, 0xcf, 0x80, 0x30, 0x31, 0x3b, 0x01, 0xc7, 0xc1, 0xef, 0xe6, 0x42, - /* (2^ 82)P */ 0xe2, 0x35, 0xaf, 0x4b, 0x79, 0xc6, 0x12, 0x24, 0x99, 0xc0, 0x68, 0xb0, 0x43, 0x3e, 0xe5, 0xef, 0xe2, 0x29, 0xea, 0xb8, 0xb3, 0xbc, 0x6a, 0x53, 0x2c, 0x69, 0x18, 0x5a, 0xf9, 0x15, 0xae, 0x66, 0x58, 0x18, 0xd3, 0x2d, 0x4b, 0x00, 0xfd, 0x84, 0xab, 0x4f, 0xae, 0x70, 0x6b, 0x9e, 0x9a, 0xdf, 0x83, 0xfd, 0x2e, 0x3c, 0xcf, 0xf8, 0x88, 0x5b, - /* (2^ 83)P */ 0xa4, 0x90, 0x31, 0x85, 0x13, 0xcd, 0xdf, 0x64, 0xc9, 0xa1, 0x0b, 0xe7, 0xb6, 0x73, 0x8a, 0x1b, 0x22, 0x78, 0x4c, 0xd4, 0xae, 0x48, 0x18, 0x00, 0x00, 0xa8, 0x9f, 0x06, 0xf9, 0xfb, 0x2d, 0xc3, 0xb1, 0x2a, 0xbc, 0x13, 0x99, 0x57, 0xaf, 0xf0, 0x8d, 0x61, 0x54, 0x29, 0xd5, 0xf2, 0x72, 0x00, 0x96, 0xd1, 0x85, 0x12, 0x8a, 0xf0, 0x23, 0xfb, - /* (2^ 84)P */ 0x69, 0xc7, 0xdb, 0xd9, 0x92, 0x75, 0x08, 0x9b, 0xeb, 0xa5, 0x93, 0xd1, 0x1a, 0xf4, 0xf5, 0xaf, 0xe6, 0xc4, 0x4a, 0x0d, 0x35, 0x26, 0x39, 0x9d, 0xd3, 0x17, 0x3e, 0xae, 0x2d, 0xbf, 0x73, 0x9f, 0xb7, 0x74, 0x91, 0xd1, 0xd8, 0x5c, 0x14, 0xf9, 0x75, 0xdf, 0xeb, 0xc2, 0x22, 0xd8, 0x14, 0x8d, 0x86, 0x23, 0x4d, 0xd1, 0x2d, 0xdb, 0x6b, 0x42, - /* (2^ 85)P */ 0x8c, 0xda, 0xc6, 0xf8, 0x71, 0xba, 0x2b, 0x06, 0x78, 0xae, 0xcc, 0x3a, 0xe3, 0xe3, 0xa1, 0x8b, 0xe2, 0x34, 0x6d, 0x28, 0x9e, 0x46, 0x13, 0x4d, 0x9e, 0xa6, 0x73, 0x49, 0x65, 0x79, 0x88, 0xb9, 0x3a, 0xd1, 0x6d, 0x2f, 0x48, 0x2b, 0x0a, 0x7f, 0x58, 0x20, 0x37, 0xf4, 0x0e, 0xbb, 0x4a, 0x95, 0x58, 0x0c, 0x88, 0x30, 0xc4, 0x74, 0xdd, 0xfd, - /* (2^ 86)P */ 0x6d, 0x13, 0x4e, 0x89, 0x2d, 0xa9, 0xa3, 0xed, 0x09, 0xe3, 0x0e, 0x71, 0x3e, 0x4a, 0xab, 0x90, 0xde, 0x03, 0xeb, 0x56, 0x46, 0x60, 0x06, 0xf5, 0x71, 0xe5, 0xee, 0x9b, 0xef, 0xff, 0xc4, 0x2c, 0x9f, 0x37, 0x48, 0x45, 0x94, 0x12, 0x41, 0x81, 0x15, 0x70, 0x91, 0x99, 0x5e, 0x56, 0x6b, 0xf4, 0xa6, 0xc9, 0xf5, 0x69, 0x9d, 0x78, 0x37, 0x57, - /* (2^ 87)P */ 0xf3, 0x51, 0x57, 0x7e, 0x43, 0x6f, 0xc6, 0x67, 0x59, 0x0c, 0xcf, 0x94, 0xe6, 0x3d, 0xb5, 0x07, 0xc9, 0x77, 0x48, 0xc9, 0x68, 0x0d, 0x98, 0x36, 0x62, 0x35, 0x38, 0x1c, 0xf5, 0xc5, 0xec, 0x66, 0x78, 0xfe, 0x47, 0xab, 0x26, 0xd6, 0x44, 0xb6, 0x06, 0x0f, 0x89, 0xe3, 0x19, 0x40, 0x1a, 0xe7, 0xd8, 0x65, 0x55, 0xf7, 0x1a, 0xfc, 0xa3, 0x0e, - /* (2^ 88)P */ 0x0e, 0x30, 0xa6, 0xb7, 0x58, 0x60, 0x62, 0x2a, 0x6c, 0x13, 0xa8, 0x14, 0x9b, 0xb8, 0xf2, 0x70, 0xd8, 0xb1, 0x71, 0x88, 0x8c, 0x18, 0x31, 0x25, 0x93, 0x90, 0xb4, 0xc7, 0x49, 0xd8, 0xd4, 0xdb, 0x1e, 0x1e, 0x7f, 0xaa, 0xba, 0xc9, 0xf2, 0x5d, 0xa9, 0x3a, 0x43, 0xb4, 0x5c, 0xee, 0x7b, 0xc7, 0x97, 0xb7, 0x66, 0xd7, 0x23, 0xd9, 0x22, 0x59, - /* (2^ 89)P */ 0x28, 0x19, 0xa6, 0xf9, 0x89, 0x20, 0x78, 0xd4, 0x6d, 0xcb, 0x79, 0x8f, 0x61, 0x6f, 0xb2, 0x5c, 0x4f, 0xa6, 0x54, 0x84, 0x95, 0x24, 0x36, 0x64, 0xcb, 0x39, 0xe7, 0x8f, 0x97, 0x9c, 0x5c, 0x3c, 0xfb, 0x51, 0x11, 0x01, 0x17, 0xdb, 0xc9, 0x9b, 0x51, 0x03, 0x9a, 0xe9, 0xe5, 0x24, 0x1e, 0xf5, 0xda, 0xe0, 0x48, 0x02, 0x23, 0xd0, 0x2c, 0x81, - /* (2^ 90)P */ 0x42, 0x1b, 0xe4, 0x91, 0x85, 0x2a, 0x0c, 0xd2, 0x28, 0x66, 0x57, 0x9e, 0x33, 0x8d, 0x25, 0x71, 0x10, 0x65, 0x76, 0xa2, 0x8c, 0x21, 0x86, 0x81, 0x15, 0xc2, 0x27, 0xeb, 0x54, 0x2d, 0x4f, 0x6c, 0xe6, 0xd6, 0x24, 0x9c, 0x1a, 0x12, 0xb8, 0x81, 0xe2, 0x0a, 0xf3, 0xd3, 0xf0, 0xd3, 0xe1, 0x74, 0x1f, 0x9b, 0x11, 0x47, 0xd0, 0xcf, 0xb6, 0x54, - /* (2^ 91)P */ 0x26, 0x45, 0xa2, 0x10, 0xd4, 0x2d, 0xae, 0xc0, 0xb0, 0xe8, 0x86, 0xb3, 0xc7, 0xea, 0x70, 0x87, 0x61, 0xb5, 0xa5, 0x55, 0xbe, 0x88, 0x1d, 0x7a, 0xd9, 0x6f, 0xeb, 0x83, 0xe2, 0x44, 0x7f, 0x98, 0x04, 0xd6, 0x50, 0x9d, 0xa7, 0x86, 0x66, 0x09, 0x63, 0xe1, 0xed, 0x72, 0xb1, 0xe4, 0x1d, 0x3a, 0xfd, 0x47, 0xce, 0x1c, 0xaa, 0x3b, 0x8f, 0x1b, - /* (2^ 92)P */ 0xf4, 0x3c, 0x4a, 0xb6, 0xc2, 0x9c, 0xe0, 0x2e, 0xb7, 0x38, 0xea, 0x61, 0x35, 0x97, 0x10, 0x90, 0xae, 0x22, 0x48, 0xb3, 0xa9, 0xc6, 0x7a, 0xbb, 0x23, 0xf2, 0xf8, 0x1b, 0xa7, 0xa1, 0x79, 0xcc, 0xc4, 0xf8, 0x08, 0x76, 0x8a, 0x5a, 0x1c, 0x1b, 0xc5, 0x33, 0x91, 0xa9, 0xb8, 0xb9, 0xd3, 0xf8, 0x49, 0xcd, 0xe5, 0x82, 0x43, 0xf7, 0xca, 0x68, - /* (2^ 93)P */ 0x38, 0xba, 0xae, 0x44, 0xfe, 0x57, 0x64, 0x56, 0x7c, 0x0e, 0x9c, 0xca, 0xff, 0xa9, 0x82, 0xbb, 0x38, 0x4a, 0xa7, 0xf7, 0x47, 0xab, 0xbe, 0x6d, 0x23, 0x0b, 0x8a, 0xed, 0xc2, 0xb9, 0x8f, 0xf1, 0xec, 0x91, 0x44, 0x73, 0x64, 0xba, 0xd5, 0x8f, 0x37, 0x38, 0x0d, 0xd5, 0xf8, 0x73, 0x57, 0xb6, 0xc2, 0x45, 0xdc, 0x25, 0xb2, 0xb6, 0xea, 0xd9, - /* (2^ 94)P */ 0xbf, 0xe9, 0x1a, 0x40, 0x4d, 0xcc, 0xe6, 0x1d, 0x70, 0x1a, 0x65, 0xcc, 0x34, 0x2c, 0x37, 0x2c, 0x2d, 0x6b, 0x6d, 0xe5, 0x2f, 0x19, 0x9e, 0xe4, 0xe1, 0xaa, 0xd4, 0xab, 0x54, 0xf4, 0xa8, 0xe4, 0x69, 0x2d, 0x8e, 0x4d, 0xd7, 0xac, 0xb0, 0x5b, 0xfe, 0xe3, 0x26, 0x07, 0xc3, 0xf8, 0x1b, 0x43, 0xa8, 0x1d, 0x64, 0xa5, 0x25, 0x88, 0xbb, 0x77, - /* (2^ 95)P */ 0x92, 0xcd, 0x6e, 0xa0, 0x79, 0x04, 0x18, 0xf4, 0x11, 0x58, 0x48, 0xb5, 0x3c, 0x7b, 0xd1, 0xcc, 0xd3, 0x14, 0x2c, 0xa0, 0xdd, 0x04, 0x44, 0x11, 0xb3, 0x6d, 0x2f, 0x0d, 0xf5, 0x2a, 0x75, 0x5d, 0x1d, 0xda, 0x86, 0x8d, 0x7d, 0x6b, 0x32, 0x68, 0xb6, 0x6c, 0x64, 0x9e, 0xde, 0x80, 0x88, 0xce, 0x08, 0xbf, 0x0b, 0xe5, 0x8e, 0x4f, 0x1d, 0xfb, - /* (2^ 96)P */ 0xaf, 0xe8, 0x85, 0xbf, 0x7f, 0x37, 0x8d, 0x66, 0x7c, 0xd5, 0xd3, 0x96, 0xa5, 0x81, 0x67, 0x95, 0xff, 0x48, 0xde, 0xde, 0xd7, 0x7a, 0x46, 0x34, 0xb1, 0x13, 0x70, 0x29, 0xed, 0x87, 0x90, 0xb0, 0x40, 0x2c, 0xa6, 0x43, 0x6e, 0xb6, 0xbc, 0x48, 0x8a, 0xc1, 0xae, 0xb8, 0xd4, 0xe2, 0xc0, 0x32, 0xb2, 0xa6, 0x2a, 0x8f, 0xb5, 0x16, 0x9e, 0xc3, - /* (2^ 97)P */ 0xff, 0x4d, 0xd2, 0xd6, 0x74, 0xef, 0x2c, 0x96, 0xc1, 0x11, 0xa8, 0xb8, 0xfe, 0x94, 0x87, 0x3e, 0xa0, 0xfb, 0x57, 0xa3, 0xfc, 0x7a, 0x7e, 0x6a, 0x59, 0x6c, 0x54, 0xbb, 0xbb, 0xa2, 0x25, 0x38, 0x1b, 0xdf, 0x5d, 0x7b, 0x94, 0x14, 0xde, 0x07, 0x6e, 0xd3, 0xab, 0x02, 0x26, 0x74, 0x16, 0x12, 0xdf, 0x2e, 0x2a, 0xa7, 0xb0, 0xe8, 0x29, 0xc0, - /* (2^ 98)P */ 0x6a, 0x38, 0x0b, 0xd3, 0xba, 0x45, 0x23, 0xe0, 0x04, 0x3b, 0x83, 0x39, 0xc5, 0x11, 0xe6, 0xcf, 0x39, 0x0a, 0xb3, 0xb0, 0x3b, 0x27, 0x29, 0x63, 0x1c, 0xf3, 0x00, 0xe6, 0xd2, 0x55, 0x21, 0x1f, 0x84, 0x97, 0x9f, 0x01, 0x49, 0x43, 0x30, 0x5f, 0xe0, 0x1d, 0x24, 0xc4, 0x4e, 0xa0, 0x2b, 0x0b, 0x12, 0x55, 0xc3, 0x27, 0xae, 0x08, 0x83, 0x7c, - /* (2^ 99)P */ 0x5d, 0x1a, 0xb7, 0xa9, 0xf5, 0xfd, 0xec, 0xad, 0xb7, 0x87, 0x02, 0x5f, 0x0d, 0x30, 0x4d, 0xe2, 0x65, 0x87, 0xa4, 0x41, 0x45, 0x1d, 0x67, 0xe0, 0x30, 0x5c, 0x13, 0x87, 0xf6, 0x2e, 0x08, 0xc1, 0xc7, 0x12, 0x45, 0xc8, 0x9b, 0xad, 0xb8, 0xd5, 0x57, 0xbb, 0x5c, 0x48, 0x3a, 0xe1, 0x91, 0x5e, 0xf6, 0x4d, 0x8a, 0x63, 0x75, 0x69, 0x0c, 0x01, - /* (2^100)P */ 0x8f, 0x53, 0x2d, 0xa0, 0x71, 0x3d, 0xfc, 0x45, 0x10, 0x96, 0xcf, 0x56, 0xf9, 0xbb, 0x40, 0x3c, 0x86, 0x52, 0x76, 0xbe, 0x84, 0xf9, 0xa6, 0x9d, 0x3d, 0x27, 0xbe, 0xb4, 0x00, 0x49, 0x94, 0xf5, 0x5d, 0xe1, 0x62, 0x85, 0x66, 0xe5, 0xb8, 0x20, 0x2c, 0x09, 0x7d, 0x9d, 0x3d, 0x6e, 0x74, 0x39, 0xab, 0xad, 0xa0, 0x90, 0x97, 0x5f, 0xbb, 0xa7, - /* (2^101)P */ 0xdb, 0x2d, 0x99, 0x08, 0x16, 0x46, 0x83, 0x7a, 0xa8, 0xea, 0x3d, 0x28, 0x5b, 0x49, 0xfc, 0xb9, 0x6d, 0x00, 0x9e, 0x54, 0x4f, 0x47, 0x64, 0x9b, 0x58, 0x4d, 0x07, 0x0c, 0x6f, 0x29, 0x56, 0x0b, 0x00, 0x14, 0x85, 0x96, 0x41, 0x04, 0xb9, 0x5c, 0xa4, 0xf6, 0x16, 0x73, 0x6a, 0xc7, 0x62, 0x0c, 0x65, 0x2f, 0x93, 0xbf, 0xf7, 0xb9, 0xb7, 0xf1, - /* (2^102)P */ 0xeb, 0x6d, 0xb3, 0x46, 0x32, 0xd2, 0xcb, 0x08, 0x94, 0x14, 0xbf, 0x3f, 0xc5, 0xcb, 0x5f, 0x9f, 0x8a, 0x89, 0x0c, 0x1b, 0x45, 0xad, 0x4c, 0x50, 0xb4, 0xe1, 0xa0, 0x6b, 0x11, 0x92, 0xaf, 0x1f, 0x00, 0xcc, 0xe5, 0x13, 0x7e, 0xe4, 0x2e, 0xa0, 0x57, 0xf3, 0xa7, 0x84, 0x79, 0x7a, 0xc2, 0xb7, 0xb7, 0xfc, 0x5d, 0xa5, 0xa9, 0x64, 0xcc, 0xd8, - /* (2^103)P */ 0xa9, 0xc4, 0x12, 0x8b, 0x34, 0x78, 0x3e, 0x38, 0xfd, 0x3f, 0x87, 0xfa, 0x88, 0x94, 0xd5, 0xd9, 0x7f, 0xeb, 0x58, 0xff, 0xb9, 0x45, 0xdb, 0xa1, 0xed, 0x22, 0x28, 0x1d, 0x00, 0x6d, 0x79, 0x85, 0x7a, 0x75, 0x5d, 0xf0, 0xb1, 0x9e, 0x47, 0x28, 0x8c, 0x62, 0xdf, 0xfb, 0x4c, 0x7b, 0xc5, 0x1a, 0x42, 0x95, 0xef, 0x9a, 0xb7, 0x27, 0x7e, 0xda, - /* (2^104)P */ 0xca, 0xd5, 0xc0, 0x17, 0xa1, 0x66, 0x79, 0x9c, 0x2a, 0xb7, 0x0a, 0xfe, 0x62, 0xe4, 0x26, 0x78, 0x90, 0xa7, 0xcb, 0xb0, 0x4f, 0x6d, 0xf9, 0x8f, 0xf7, 0x7d, 0xac, 0xb8, 0x78, 0x1f, 0x41, 0xea, 0x97, 0x1e, 0x62, 0x97, 0x43, 0x80, 0x58, 0x80, 0xb6, 0x69, 0x7d, 0xee, 0x16, 0xd2, 0xa1, 0x81, 0xd7, 0xb1, 0x27, 0x03, 0x48, 0xda, 0xab, 0xec, - /* (2^105)P */ 0x5b, 0xed, 0x40, 0x8e, 0x8c, 0xc1, 0x66, 0x90, 0x7f, 0x0c, 0xb2, 0xfc, 0xbd, 0x16, 0xac, 0x7d, 0x4c, 0x6a, 0xf9, 0xae, 0xe7, 0x4e, 0x11, 0x12, 0xe9, 0xbe, 0x17, 0x09, 0xc6, 0xc1, 0x5e, 0xb5, 0x7b, 0x50, 0x5c, 0x27, 0xfb, 0x80, 0xab, 0x01, 0xfa, 0x5b, 0x9b, 0x75, 0x16, 0x6e, 0xb2, 0x5c, 0x8c, 0x2f, 0xa5, 0x6a, 0x1a, 0x68, 0xa6, 0x90, - /* (2^106)P */ 0x75, 0xfe, 0xb6, 0x96, 0x96, 0x87, 0x4c, 0x12, 0xa9, 0xd1, 0xd8, 0x03, 0xa3, 0xc1, 0x15, 0x96, 0xe8, 0xa0, 0x75, 0x82, 0xa0, 0x6d, 0xea, 0x54, 0xdc, 0x5f, 0x0d, 0x7e, 0xf6, 0x70, 0xb5, 0xdc, 0x7a, 0xf6, 0xc4, 0xd4, 0x21, 0x49, 0xf5, 0xd4, 0x14, 0x6d, 0x48, 0x1d, 0x7c, 0x99, 0x42, 0xdf, 0x78, 0x6b, 0x9d, 0xb9, 0x30, 0x3c, 0xd0, 0x29, - /* (2^107)P */ 0x85, 0xd6, 0xd8, 0xf3, 0x91, 0x74, 0xdd, 0xbd, 0x72, 0x96, 0x10, 0xe4, 0x76, 0x02, 0x5a, 0x72, 0x67, 0xd3, 0x17, 0x72, 0x14, 0x9a, 0x20, 0x5b, 0x0f, 0x8d, 0xed, 0x6d, 0x4e, 0xe3, 0xd9, 0x82, 0xc2, 0x99, 0xee, 0x39, 0x61, 0x69, 0x8a, 0x24, 0x01, 0x92, 0x15, 0xe7, 0xfc, 0xf9, 0x4d, 0xac, 0xf1, 0x30, 0x49, 0x01, 0x0b, 0x6e, 0x0f, 0x20, - /* (2^108)P */ 0xd8, 0x25, 0x94, 0x5e, 0x43, 0x29, 0xf5, 0xcc, 0xe8, 0xe3, 0x55, 0x41, 0x3c, 0x9f, 0x58, 0x5b, 0x00, 0xeb, 0xc5, 0xdf, 0xcf, 0xfb, 0xfd, 0x6e, 0x92, 0xec, 0x99, 0x30, 0xd6, 0x05, 0xdd, 0x80, 0x7a, 0x5d, 0x6d, 0x16, 0x85, 0xd8, 0x9d, 0x43, 0x65, 0xd8, 0x2c, 0x33, 0x2f, 0x5c, 0x41, 0xea, 0xb7, 0x95, 0x77, 0xf2, 0x9e, 0x59, 0x09, 0xe8, - /* (2^109)P */ 0x00, 0xa0, 0x03, 0x80, 0xcd, 0x60, 0xe5, 0x17, 0xd4, 0x15, 0x99, 0xdd, 0x4f, 0xbf, 0x66, 0xb8, 0xc0, 0xf5, 0xf9, 0xfc, 0x6d, 0x42, 0x18, 0x34, 0x1c, 0x7d, 0x5b, 0xb5, 0x09, 0xd0, 0x99, 0x57, 0x81, 0x0b, 0x62, 0xb3, 0xa2, 0xf9, 0x0b, 0xae, 0x95, 0xb8, 0xc2, 0x3b, 0x0d, 0x5b, 0x00, 0xf1, 0xed, 0xbc, 0x05, 0x9d, 0x61, 0xbc, 0x73, 0x9d, - /* (2^110)P */ 0xd4, 0xdb, 0x29, 0xe5, 0x85, 0xe9, 0xc6, 0x89, 0x2a, 0xa8, 0x54, 0xab, 0xb3, 0x7f, 0x88, 0xc0, 0x4d, 0xe0, 0xd1, 0x74, 0x6e, 0xa3, 0xa7, 0x39, 0xd5, 0xcc, 0xa1, 0x8a, 0xcb, 0x5b, 0x34, 0xad, 0x92, 0xb4, 0xd8, 0xd5, 0x17, 0xf6, 0x77, 0x18, 0x9e, 0xaf, 0x45, 0x3b, 0x03, 0xe2, 0xf8, 0x52, 0x60, 0xdc, 0x15, 0x20, 0x9e, 0xdf, 0xd8, 0x5d, - /* (2^111)P */ 0x02, 0xc1, 0xac, 0x1a, 0x15, 0x8e, 0x6c, 0xf5, 0x1e, 0x1e, 0xba, 0x7e, 0xc2, 0xda, 0x7d, 0x02, 0xda, 0x43, 0xae, 0x04, 0x70, 0x28, 0x54, 0x78, 0x94, 0xf5, 0x4f, 0x07, 0x84, 0x8f, 0xed, 0xaa, 0xc0, 0xb8, 0xcd, 0x7f, 0x7e, 0x33, 0xa3, 0xbe, 0x21, 0x29, 0xc8, 0x56, 0x34, 0xc0, 0x76, 0x87, 0x8f, 0xc7, 0x73, 0x58, 0x90, 0x16, 0xfc, 0xd6, - /* (2^112)P */ 0xb8, 0x3f, 0xe1, 0xdf, 0x3a, 0x91, 0x25, 0x0c, 0xf6, 0x47, 0xa8, 0x89, 0xc4, 0xc6, 0x61, 0xec, 0x86, 0x2c, 0xfd, 0xbe, 0xa4, 0x6f, 0xc2, 0xd4, 0x46, 0x19, 0x70, 0x5d, 0x09, 0x02, 0x86, 0xd3, 0x4b, 0xe9, 0x16, 0x7b, 0xf0, 0x0d, 0x6c, 0xff, 0x91, 0x05, 0xbf, 0x55, 0xb4, 0x00, 0x8d, 0xe5, 0x6d, 0x68, 0x20, 0x90, 0x12, 0xb5, 0x5c, 0x32, - /* (2^113)P */ 0x80, 0x45, 0xc8, 0x51, 0x87, 0xba, 0x1c, 0x5c, 0xcf, 0x5f, 0x4b, 0x3c, 0x9e, 0x3b, 0x36, 0xd2, 0x26, 0xa2, 0x7f, 0xab, 0xb7, 0xbf, 0xda, 0x68, 0x23, 0x8f, 0xc3, 0xa0, 0xfd, 0xad, 0xf1, 0x56, 0x3b, 0xd0, 0x75, 0x2b, 0x44, 0x61, 0xd8, 0xf4, 0xf1, 0x05, 0x49, 0x53, 0x07, 0xee, 0x47, 0xef, 0xc0, 0x7c, 0x9d, 0xe4, 0x15, 0x88, 0xc5, 0x47, - /* (2^114)P */ 0x2d, 0xb5, 0x09, 0x80, 0xb9, 0xd3, 0xd8, 0xfe, 0x4c, 0xd2, 0xa6, 0x6e, 0xd3, 0x75, 0xcf, 0xb0, 0x99, 0xcb, 0x50, 0x8d, 0xe9, 0x67, 0x9b, 0x20, 0xe8, 0x57, 0xd8, 0x14, 0x85, 0x73, 0x6a, 0x74, 0xe0, 0x99, 0xf0, 0x6b, 0x6e, 0x59, 0x30, 0x31, 0x33, 0x96, 0x5f, 0xa1, 0x0c, 0x1b, 0xf4, 0xca, 0x09, 0xe1, 0x9b, 0xb5, 0xcf, 0x6d, 0x0b, 0xeb, - /* (2^115)P */ 0x1a, 0xde, 0x50, 0xa9, 0xac, 0x3e, 0x10, 0x43, 0x4f, 0x82, 0x4f, 0xc0, 0xfe, 0x3f, 0x33, 0xd2, 0x64, 0x86, 0x50, 0xa9, 0x51, 0x76, 0x5e, 0x50, 0x97, 0x6c, 0x73, 0x8d, 0x77, 0xa3, 0x75, 0x03, 0xbc, 0xc9, 0xfb, 0x50, 0xd9, 0x6d, 0x16, 0xad, 0x5d, 0x32, 0x3d, 0xac, 0x44, 0xdf, 0x51, 0xf7, 0x19, 0xd4, 0x0b, 0x57, 0x78, 0x0b, 0x81, 0x4e, - /* (2^116)P */ 0x32, 0x24, 0xf1, 0x6c, 0x55, 0x62, 0x1d, 0xb3, 0x1f, 0xda, 0xfa, 0x6a, 0x8f, 0x98, 0x01, 0x16, 0xde, 0x44, 0x50, 0x0d, 0x2e, 0x6c, 0x0b, 0xa2, 0xd3, 0x74, 0x0e, 0xa9, 0xbf, 0x8d, 0xa9, 0xc8, 0xc8, 0x2f, 0x62, 0xc1, 0x35, 0x5e, 0xfd, 0x3a, 0xb3, 0x83, 0x2d, 0xee, 0x4e, 0xfd, 0x5c, 0x5e, 0xad, 0x85, 0xa5, 0x10, 0xb5, 0x4f, 0x34, 0xa7, - /* (2^117)P */ 0xd1, 0x58, 0x6f, 0xe6, 0x54, 0x2c, 0xc2, 0xcd, 0xcf, 0x83, 0xdc, 0x88, 0x0c, 0xb9, 0xb4, 0x62, 0x18, 0x89, 0x65, 0x28, 0xe9, 0x72, 0x4b, 0x65, 0xcf, 0xd6, 0x90, 0x88, 0xd7, 0x76, 0x17, 0x4f, 0x74, 0x64, 0x1e, 0xcb, 0xd3, 0xf5, 0x4b, 0xaa, 0x2e, 0x4d, 0x2d, 0x7c, 0x13, 0x1f, 0xfd, 0xd9, 0x60, 0x83, 0x7e, 0xda, 0x64, 0x1c, 0xdc, 0x9f, - /* (2^118)P */ 0xad, 0xef, 0xac, 0x1b, 0xc1, 0x30, 0x5a, 0x15, 0xc9, 0x1f, 0xac, 0xf1, 0xca, 0x44, 0x95, 0x95, 0xea, 0xf2, 0x22, 0xe7, 0x8d, 0x25, 0xf0, 0xff, 0xd8, 0x71, 0xf7, 0xf8, 0x8f, 0x8f, 0xcd, 0xf4, 0x1e, 0xfe, 0x6c, 0x68, 0x04, 0xb8, 0x78, 0xa1, 0x5f, 0xa6, 0x5d, 0x5e, 0xf9, 0x8d, 0xea, 0x80, 0xcb, 0xf3, 0x17, 0xa6, 0x03, 0xc9, 0x38, 0xd5, - /* (2^119)P */ 0x79, 0x14, 0x31, 0xc3, 0x38, 0xe5, 0xaa, 0xbf, 0x17, 0xa3, 0x04, 0x4e, 0x80, 0x59, 0x9c, 0x9f, 0x19, 0x39, 0xe4, 0x2d, 0x23, 0x54, 0x4a, 0x7f, 0x3e, 0xf3, 0xd9, 0xc7, 0xba, 0x6c, 0x8f, 0x6b, 0xfa, 0x34, 0xb5, 0x23, 0x17, 0x1d, 0xff, 0x1d, 0xea, 0x1f, 0xd7, 0xba, 0x61, 0xb2, 0xe0, 0x38, 0x6a, 0xe9, 0xcf, 0x48, 0x5d, 0x6a, 0x10, 0x9c, - /* (2^120)P */ 0xc8, 0xbb, 0x13, 0x1c, 0x3f, 0x3c, 0x34, 0xfd, 0xac, 0x37, 0x52, 0x44, 0x25, 0xa8, 0xde, 0x1d, 0x63, 0xf4, 0x81, 0x9a, 0xbe, 0x0b, 0x74, 0x2e, 0xc8, 0x51, 0x16, 0xd3, 0xac, 0x4a, 0xaf, 0xe2, 0x5f, 0x3a, 0x89, 0x32, 0xd1, 0x9b, 0x7c, 0x90, 0x0d, 0xac, 0xdc, 0x8b, 0x73, 0x45, 0x45, 0x97, 0xb1, 0x90, 0x2c, 0x1b, 0x31, 0xca, 0xb1, 0x94, - /* (2^121)P */ 0x07, 0x28, 0xdd, 0x10, 0x14, 0xa5, 0x95, 0x7e, 0xf3, 0xe4, 0xd4, 0x14, 0xb4, 0x7e, 0x76, 0xdb, 0x42, 0xd6, 0x94, 0x3e, 0xeb, 0x44, 0x64, 0x88, 0x0d, 0xec, 0xc1, 0x21, 0xf0, 0x79, 0xe0, 0x83, 0x67, 0x55, 0x53, 0xc2, 0xf6, 0xc5, 0xc5, 0x89, 0x39, 0xe8, 0x42, 0xd0, 0x17, 0xbd, 0xff, 0x35, 0x59, 0x0e, 0xc3, 0x06, 0x86, 0xd4, 0x64, 0xcf, - /* (2^122)P */ 0x91, 0xa8, 0xdb, 0x57, 0x9b, 0xe2, 0x96, 0x31, 0x10, 0x6e, 0xd7, 0x9a, 0x97, 0xb3, 0xab, 0xb5, 0x15, 0x66, 0xbe, 0xcc, 0x6d, 0x9a, 0xac, 0x06, 0xb3, 0x0d, 0xaa, 0x4b, 0x9c, 0x96, 0x79, 0x6c, 0x34, 0xee, 0x9e, 0x53, 0x4d, 0x6e, 0xbd, 0x88, 0x02, 0xbf, 0x50, 0x54, 0x12, 0x5d, 0x01, 0x02, 0x46, 0xc6, 0x74, 0x02, 0x8c, 0x24, 0xae, 0xb1, - /* (2^123)P */ 0xf5, 0x22, 0xea, 0xac, 0x7d, 0x9c, 0x33, 0x8a, 0xa5, 0x36, 0x79, 0x6a, 0x4f, 0xa4, 0xdc, 0xa5, 0x73, 0x64, 0xc4, 0x6f, 0x43, 0x02, 0x3b, 0x94, 0x66, 0xd2, 0x4b, 0x4f, 0xf6, 0x45, 0x33, 0x5d, 0x10, 0x33, 0x18, 0x1e, 0xa3, 0xfc, 0xf7, 0xd2, 0xb8, 0xc8, 0xa7, 0xe0, 0x76, 0x8a, 0xcd, 0xff, 0x4f, 0x99, 0x34, 0x47, 0x84, 0x91, 0x96, 0x9f, - /* (2^124)P */ 0x8a, 0x48, 0x3b, 0x48, 0x4a, 0xbc, 0xac, 0xe2, 0x80, 0xd6, 0xd2, 0x35, 0xde, 0xd0, 0x56, 0x42, 0x33, 0xb3, 0x56, 0x5a, 0xcd, 0xb8, 0x3d, 0xb5, 0x25, 0xc1, 0xed, 0xff, 0x87, 0x0b, 0x79, 0xff, 0xf2, 0x62, 0xe1, 0x76, 0xc6, 0xa2, 0x0f, 0xa8, 0x9b, 0x0d, 0xcc, 0x3f, 0x3d, 0x35, 0x27, 0x8d, 0x0b, 0x74, 0xb0, 0xc3, 0x78, 0x8c, 0xcc, 0xc8, - /* (2^125)P */ 0xfc, 0x9a, 0x0c, 0xa8, 0x49, 0x42, 0xb8, 0xdf, 0xcf, 0xb3, 0x19, 0xa6, 0x64, 0x57, 0xfe, 0xe8, 0xf8, 0xa6, 0x4b, 0x86, 0xa1, 0xd5, 0x83, 0x7f, 0x14, 0x99, 0x18, 0x0c, 0x7d, 0x5b, 0xf7, 0x3d, 0xf9, 0x4b, 0x79, 0xb1, 0x86, 0x30, 0xb4, 0x5e, 0x6a, 0xe8, 0x9d, 0xfa, 0x8a, 0x41, 0xc4, 0x30, 0xfc, 0x56, 0x74, 0x14, 0x42, 0xc8, 0x96, 0x0e, - /* (2^126)P */ 0xdf, 0x66, 0xec, 0xbc, 0x44, 0xdb, 0x19, 0xce, 0xd4, 0xb5, 0x49, 0x40, 0x07, 0x49, 0xe0, 0x3a, 0x61, 0x10, 0xfb, 0x7d, 0xba, 0xb1, 0xe0, 0x28, 0x5b, 0x99, 0x59, 0x96, 0xa2, 0xee, 0xe0, 0x23, 0x37, 0x39, 0x1f, 0xe6, 0x57, 0x9f, 0xf8, 0xf8, 0xdc, 0x74, 0xf6, 0x8f, 0x4f, 0x5e, 0x51, 0xa4, 0x12, 0xac, 0xbe, 0xe4, 0xf3, 0xd1, 0xf0, 0x24, - /* (2^127)P */ 0x1e, 0x3e, 0x9a, 0x5f, 0xdf, 0x9f, 0xd6, 0x4e, 0x8a, 0x28, 0xc3, 0xcd, 0x96, 0x9d, 0x57, 0xc7, 0x61, 0x81, 0x90, 0xff, 0xae, 0xb1, 0x4f, 0xc2, 0x96, 0x8b, 0x1a, 0x18, 0xf4, 0x50, 0xcb, 0x31, 0xe1, 0x57, 0xf4, 0x90, 0xa8, 0xea, 0xac, 0xe7, 0x61, 0x98, 0xb6, 0x15, 0xc1, 0x7b, 0x29, 0xa4, 0xc3, 0x18, 0xef, 0xb9, 0xd8, 0xdf, 0xf6, 0xac, - /* (2^128)P */ 0xca, 0xa8, 0x6c, 0xf1, 0xb4, 0xca, 0xfe, 0x31, 0xee, 0x48, 0x38, 0x8b, 0x0e, 0xbb, 0x7a, 0x30, 0xaa, 0xf9, 0xee, 0x27, 0x53, 0x24, 0xdc, 0x2e, 0x15, 0xa6, 0x48, 0x8f, 0xa0, 0x7e, 0xf1, 0xdc, 0x93, 0x87, 0x39, 0xeb, 0x7f, 0x38, 0x92, 0x92, 0x4c, 0x29, 0xe9, 0x57, 0xd8, 0x59, 0xfc, 0xe9, 0x9c, 0x44, 0xc0, 0x65, 0xcf, 0xac, 0x4b, 0xdc, - /* (2^129)P */ 0xa3, 0xd0, 0x37, 0x8f, 0x86, 0x2f, 0xc6, 0x47, 0x55, 0x46, 0x65, 0x26, 0x4b, 0x91, 0xe2, 0x18, 0x5c, 0x4f, 0x23, 0xc1, 0x37, 0x29, 0xb9, 0xc1, 0x27, 0xc5, 0x3c, 0xbf, 0x7e, 0x23, 0xdb, 0x73, 0x99, 0xbd, 0x1b, 0xb2, 0x31, 0x68, 0x3a, 0xad, 0xb7, 0xb0, 0x10, 0xc5, 0xe5, 0x11, 0x51, 0xba, 0xa7, 0x60, 0x66, 0x54, 0xf0, 0x08, 0xd7, 0x69, - /* (2^130)P */ 0x89, 0x41, 0x79, 0xcc, 0xeb, 0x0a, 0xf5, 0x4b, 0xa3, 0x4c, 0xce, 0x52, 0xb0, 0xa7, 0xe4, 0x41, 0x75, 0x7d, 0x04, 0xbb, 0x09, 0x4c, 0x50, 0x9f, 0xdf, 0xea, 0x74, 0x61, 0x02, 0xad, 0xb4, 0x9d, 0xb7, 0x05, 0xb9, 0xea, 0xeb, 0x91, 0x35, 0xe7, 0x49, 0xea, 0xd3, 0x4f, 0x3c, 0x60, 0x21, 0x7a, 0xde, 0xc7, 0xe2, 0x5a, 0xee, 0x8e, 0x93, 0xc7, - /* (2^131)P */ 0x00, 0xe8, 0xed, 0xd0, 0xb3, 0x0d, 0xaf, 0xb2, 0xde, 0x2c, 0xf6, 0x00, 0xe2, 0xea, 0x6d, 0xf8, 0x0e, 0xd9, 0x67, 0x59, 0xa9, 0x50, 0xbb, 0x17, 0x8f, 0xff, 0xb1, 0x9f, 0x17, 0xb6, 0xf2, 0xb5, 0xba, 0x80, 0xf7, 0x0f, 0xba, 0xd5, 0x09, 0x43, 0xaa, 0x4e, 0x3a, 0x67, 0x6a, 0x89, 0x9b, 0x18, 0x65, 0x35, 0xf8, 0x3a, 0x49, 0x91, 0x30, 0x51, - /* (2^132)P */ 0x8d, 0x25, 0xe9, 0x0e, 0x7d, 0x50, 0x76, 0xe4, 0x58, 0x7e, 0xb9, 0x33, 0xe6, 0x65, 0x90, 0xc2, 0x50, 0x9d, 0x50, 0x2e, 0x11, 0xad, 0xd5, 0x43, 0x52, 0x32, 0x41, 0x4f, 0x7b, 0xb6, 0xa0, 0xec, 0x81, 0x75, 0x36, 0x7c, 0x77, 0x85, 0x59, 0x70, 0xe4, 0xf9, 0xef, 0x66, 0x8d, 0x35, 0xc8, 0x2a, 0x6e, 0x5b, 0xc6, 0x0d, 0x0b, 0x29, 0x60, 0x68, - /* (2^133)P */ 0xf8, 0xce, 0xb0, 0x3a, 0x56, 0x7d, 0x51, 0x9a, 0x25, 0x73, 0xea, 0xdd, 0xe4, 0xe0, 0x0e, 0xf0, 0x07, 0xc0, 0x31, 0x00, 0x73, 0x35, 0xd0, 0x39, 0xc4, 0x9b, 0xb7, 0x95, 0xe0, 0x62, 0x70, 0x36, 0x0b, 0xcb, 0xa0, 0x42, 0xde, 0x51, 0xcf, 0x41, 0xe0, 0xb8, 0xb4, 0xc0, 0xe5, 0x46, 0x99, 0x9f, 0x02, 0x7f, 0x14, 0x8c, 0xc1, 0x4e, 0xef, 0xe8, - /* (2^134)P */ 0x10, 0x01, 0x57, 0x0a, 0xbe, 0x8b, 0x18, 0xc8, 0xca, 0x00, 0x28, 0x77, 0x4a, 0x9a, 0xc7, 0x55, 0x2a, 0xcc, 0x0c, 0x7b, 0xb9, 0xe9, 0xc8, 0x97, 0x7c, 0x02, 0xe3, 0x09, 0x2f, 0x62, 0x30, 0xb8, 0x40, 0x09, 0x65, 0xe9, 0x55, 0x63, 0xb5, 0x07, 0xca, 0x9f, 0x00, 0xdf, 0x9d, 0x5c, 0xc7, 0xee, 0x57, 0xa5, 0x90, 0x15, 0x1e, 0x22, 0xa0, 0x12, - /* (2^135)P */ 0x71, 0x2d, 0xc9, 0xef, 0x27, 0xb9, 0xd8, 0x12, 0x43, 0x6b, 0xa8, 0xce, 0x3b, 0x6d, 0x6e, 0x91, 0x43, 0x23, 0xbc, 0x32, 0xb3, 0xbf, 0xe1, 0xc7, 0x39, 0xcf, 0x7c, 0x42, 0x4c, 0xb1, 0x30, 0xe2, 0xdd, 0x69, 0x06, 0xe5, 0xea, 0xf0, 0x2a, 0x16, 0x50, 0x71, 0xca, 0x92, 0xdf, 0xc1, 0xcc, 0xec, 0xe6, 0x54, 0x07, 0xf3, 0x18, 0x8d, 0xd8, 0x29, - /* (2^136)P */ 0x98, 0x51, 0x48, 0x8f, 0xfa, 0x2e, 0x5e, 0x67, 0xb0, 0xc6, 0x17, 0x12, 0xb6, 0x7d, 0xc9, 0xad, 0x81, 0x11, 0xad, 0x0c, 0x1c, 0x2d, 0x45, 0xdf, 0xac, 0x66, 0xbd, 0x08, 0x6f, 0x7c, 0xc7, 0x06, 0x6e, 0x19, 0x08, 0x39, 0x64, 0xd7, 0xe4, 0xd1, 0x11, 0x5f, 0x1c, 0xf4, 0x67, 0xc3, 0x88, 0x6a, 0xe6, 0x07, 0xa3, 0x83, 0xd7, 0xfd, 0x2a, 0xf9, - /* (2^137)P */ 0x87, 0xed, 0xeb, 0xd9, 0xdf, 0xff, 0x43, 0x8b, 0xaa, 0x20, 0x58, 0xb0, 0xb4, 0x6b, 0x14, 0xb8, 0x02, 0xc5, 0x40, 0x20, 0x22, 0xbb, 0xf7, 0xb4, 0xf3, 0x05, 0x1e, 0x4d, 0x94, 0xff, 0xe3, 0xc5, 0x22, 0x82, 0xfe, 0xaf, 0x90, 0x42, 0x98, 0x6b, 0x76, 0x8b, 0x3e, 0x89, 0x3f, 0x42, 0x2a, 0xa7, 0x26, 0x00, 0xda, 0x5c, 0xa2, 0x2b, 0xec, 0xdd, - /* (2^138)P */ 0x5c, 0x21, 0x16, 0x0d, 0x46, 0xb8, 0xd0, 0xa7, 0x88, 0xe7, 0x25, 0xcb, 0x3e, 0x50, 0x73, 0x61, 0xe7, 0xaf, 0x5a, 0x3f, 0x47, 0x8b, 0x3d, 0x97, 0x79, 0x2c, 0xe6, 0x6d, 0x95, 0x74, 0x65, 0x70, 0x36, 0xfd, 0xd1, 0x9e, 0x13, 0x18, 0x63, 0xb1, 0x2d, 0x0b, 0xb5, 0x36, 0x3e, 0xe7, 0x35, 0x42, 0x3b, 0xe6, 0x1f, 0x4d, 0x9d, 0x59, 0xa2, 0x43, - /* (2^139)P */ 0x8c, 0x0c, 0x7c, 0x24, 0x9e, 0xe0, 0xf8, 0x05, 0x1c, 0x9e, 0x1f, 0x31, 0xc0, 0x70, 0xb3, 0xfb, 0x4e, 0xf8, 0x0a, 0x57, 0xb7, 0x49, 0xb5, 0x73, 0xa1, 0x5f, 0x9b, 0x6a, 0x07, 0x6c, 0x87, 0x71, 0x87, 0xd4, 0xbe, 0x98, 0x1e, 0x98, 0xee, 0x52, 0xc1, 0x7b, 0x95, 0x0f, 0x28, 0x32, 0x36, 0x28, 0xd0, 0x3a, 0x0f, 0x7d, 0x2a, 0xa9, 0x62, 0xb9, - /* (2^140)P */ 0x97, 0xe6, 0x18, 0x77, 0xf9, 0x34, 0xac, 0xbc, 0xe0, 0x62, 0x9f, 0x42, 0xde, 0xbd, 0x2f, 0xf7, 0x1f, 0xb7, 0x14, 0x52, 0x8a, 0x79, 0xb2, 0x3f, 0xd2, 0x95, 0x71, 0x01, 0xe8, 0xaf, 0x8c, 0xa4, 0xa4, 0xa7, 0x27, 0xf3, 0x5c, 0xdf, 0x3e, 0x57, 0x7a, 0xf1, 0x76, 0x49, 0xe6, 0x42, 0x3f, 0x8f, 0x1e, 0x63, 0x4a, 0x65, 0xb5, 0x41, 0xf5, 0x02, - /* (2^141)P */ 0x72, 0x85, 0xc5, 0x0b, 0xe1, 0x47, 0x64, 0x02, 0xc5, 0x4d, 0x81, 0x69, 0xb2, 0xcf, 0x0f, 0x6c, 0xd4, 0x6d, 0xd0, 0xc7, 0xb4, 0x1c, 0xd0, 0x32, 0x59, 0x89, 0xe2, 0xe0, 0x96, 0x8b, 0x12, 0x98, 0xbf, 0x63, 0x7a, 0x4c, 0x76, 0x7e, 0x58, 0x17, 0x8f, 0x5b, 0x0a, 0x59, 0x65, 0x75, 0xbc, 0x61, 0x1f, 0xbe, 0xc5, 0x6e, 0x0a, 0x57, 0x52, 0x70, - /* (2^142)P */ 0x92, 0x1c, 0x77, 0xbb, 0x62, 0x02, 0x6c, 0x25, 0x9c, 0x66, 0x07, 0x83, 0xab, 0xcc, 0x80, 0x5d, 0xd2, 0x76, 0x0c, 0xa4, 0xc5, 0xb4, 0x8a, 0x68, 0x23, 0x31, 0x32, 0x29, 0x8a, 0x47, 0x92, 0x12, 0x80, 0xb3, 0xfa, 0x18, 0xe4, 0x8d, 0xc0, 0x4d, 0xfe, 0x97, 0x5f, 0x72, 0x41, 0xb5, 0x5c, 0x7a, 0xbd, 0xf0, 0xcf, 0x5e, 0x97, 0xaa, 0x64, 0x32, - /* (2^143)P */ 0x35, 0x3f, 0x75, 0xc1, 0x7a, 0x75, 0x7e, 0xa9, 0xc6, 0x0b, 0x4e, 0x32, 0x62, 0xec, 0xe3, 0x5c, 0xfb, 0x01, 0x43, 0xb6, 0xd4, 0x5b, 0x75, 0xd2, 0xee, 0x7f, 0x5d, 0x23, 0x2b, 0xb3, 0x54, 0x34, 0x4c, 0xd3, 0xb4, 0x32, 0x84, 0x81, 0xb5, 0x09, 0x76, 0x19, 0xda, 0x58, 0xda, 0x7c, 0xdb, 0x2e, 0xdd, 0x4c, 0x8e, 0xdd, 0x5d, 0x89, 0x10, 0x10, - /* (2^144)P */ 0x57, 0x25, 0x6a, 0x08, 0x37, 0x92, 0xa8, 0xdf, 0x24, 0xef, 0x8f, 0x33, 0x34, 0x52, 0xa4, 0x4c, 0xf0, 0x77, 0x9f, 0x69, 0x77, 0xd5, 0x8f, 0xd2, 0x9a, 0xb3, 0xb6, 0x1d, 0x2d, 0xa6, 0xf7, 0x1f, 0xda, 0xd7, 0xcb, 0x75, 0x11, 0xc3, 0x6b, 0xc0, 0x38, 0xb1, 0xd5, 0x2d, 0x96, 0x84, 0x16, 0xfa, 0x26, 0xb9, 0xcc, 0x3f, 0x16, 0x47, 0x23, 0x74, - /* (2^145)P */ 0x9b, 0x61, 0x2a, 0x1c, 0xdd, 0x39, 0xa5, 0xfa, 0x1c, 0x7d, 0x63, 0x50, 0xca, 0xe6, 0x9d, 0xfa, 0xb7, 0xc4, 0x4c, 0x6a, 0x97, 0x5f, 0x36, 0x4e, 0x47, 0xdd, 0x17, 0xf7, 0xf9, 0x19, 0xce, 0x75, 0x17, 0xad, 0xce, 0x2a, 0xf3, 0xfe, 0x27, 0x8f, 0x3e, 0x48, 0xc0, 0x60, 0x87, 0x24, 0x19, 0xae, 0x59, 0xe4, 0x5a, 0x00, 0x2a, 0xba, 0xa2, 0x1f, - /* (2^146)P */ 0x26, 0x88, 0x42, 0x60, 0x9f, 0x6e, 0x2c, 0x7c, 0x39, 0x0f, 0x47, 0x6a, 0x0e, 0x02, 0xbb, 0x4b, 0x34, 0x29, 0x55, 0x18, 0x36, 0xcf, 0x3b, 0x47, 0xf1, 0x2e, 0xfc, 0x6e, 0x94, 0xff, 0xe8, 0x6b, 0x06, 0xd2, 0xba, 0x77, 0x5e, 0x60, 0xd7, 0x19, 0xef, 0x02, 0x9d, 0x3a, 0xc2, 0xb7, 0xa9, 0xd8, 0x57, 0xee, 0x7e, 0x2b, 0xf2, 0x6d, 0x28, 0xda, - /* (2^147)P */ 0xdf, 0xd9, 0x92, 0x11, 0x98, 0x23, 0xe2, 0x45, 0x2f, 0x74, 0x70, 0xee, 0x0e, 0x55, 0x65, 0x79, 0x86, 0x38, 0x17, 0x92, 0x85, 0x87, 0x99, 0x50, 0xd9, 0x7c, 0xdb, 0xa1, 0x10, 0xec, 0x30, 0xb7, 0x40, 0xa3, 0x23, 0x9b, 0x0e, 0x27, 0x49, 0x29, 0x03, 0x94, 0xff, 0x53, 0xdc, 0xd7, 0xed, 0x49, 0xa9, 0x5a, 0x3b, 0xee, 0xd7, 0xc7, 0x65, 0xaf, - /* (2^148)P */ 0xa0, 0xbd, 0xbe, 0x03, 0xee, 0x0c, 0xbe, 0x32, 0x00, 0x7b, 0x52, 0xcb, 0x92, 0x29, 0xbf, 0xa0, 0xc6, 0xd9, 0xd2, 0xd6, 0x15, 0xe8, 0x3a, 0x75, 0x61, 0x65, 0x56, 0xae, 0xad, 0x3c, 0x2a, 0x64, 0x14, 0x3f, 0x8e, 0xc1, 0x2d, 0x0c, 0x8d, 0x20, 0xdb, 0x58, 0x4b, 0xe5, 0x40, 0x15, 0x4b, 0xdc, 0xa8, 0xbd, 0xef, 0x08, 0xa7, 0xd1, 0xf4, 0xb0, - /* (2^149)P */ 0xa9, 0x0f, 0x05, 0x94, 0x66, 0xac, 0x1f, 0x65, 0x3f, 0xe1, 0xb8, 0xe1, 0x34, 0x5e, 0x1d, 0x8f, 0xe3, 0x93, 0x03, 0x15, 0xff, 0xb6, 0x65, 0xb6, 0x6e, 0xc0, 0x2f, 0xd4, 0x2e, 0xb9, 0x2c, 0x13, 0x3c, 0x99, 0x1c, 0xb5, 0x87, 0xba, 0x79, 0xcb, 0xf0, 0x18, 0x06, 0x86, 0x04, 0x14, 0x25, 0x09, 0xcd, 0x1c, 0x14, 0xda, 0x35, 0xd0, 0x38, 0x3b, - /* (2^150)P */ 0x1b, 0x04, 0xa3, 0x27, 0xb4, 0xd3, 0x37, 0x48, 0x1e, 0x8f, 0x69, 0xd3, 0x5a, 0x2f, 0x20, 0x02, 0x36, 0xbe, 0x06, 0x7b, 0x6b, 0x6c, 0x12, 0x5b, 0x80, 0x74, 0x44, 0xe6, 0xf8, 0xf5, 0x95, 0x59, 0x29, 0xab, 0x51, 0x47, 0x83, 0x28, 0xe0, 0xad, 0xde, 0xaa, 0xd3, 0xb1, 0x1a, 0xcb, 0xa3, 0xcd, 0x8b, 0x6a, 0xb1, 0xa7, 0x0a, 0xd1, 0xf9, 0xbe, - /* (2^151)P */ 0xce, 0x2f, 0x85, 0xca, 0x74, 0x6d, 0x49, 0xb8, 0xce, 0x80, 0x44, 0xe0, 0xda, 0x5b, 0xcf, 0x2f, 0x79, 0x74, 0xfe, 0xb4, 0x2c, 0x99, 0x20, 0x6e, 0x09, 0x04, 0xfb, 0x6d, 0x57, 0x5b, 0x95, 0x0c, 0x45, 0xda, 0x4f, 0x7f, 0x63, 0xcc, 0x85, 0x5a, 0x67, 0x50, 0x68, 0x71, 0xb4, 0x67, 0xb1, 0x2e, 0xc1, 0x1c, 0xdc, 0xff, 0x2a, 0x7c, 0x10, 0x5e, - /* (2^152)P */ 0xa6, 0xde, 0xf3, 0xd4, 0x22, 0x30, 0x24, 0x9e, 0x0b, 0x30, 0x54, 0x59, 0x7e, 0xa2, 0xeb, 0x89, 0x54, 0x65, 0x3e, 0x40, 0xd1, 0xde, 0xe6, 0xee, 0x4d, 0xbf, 0x5e, 0x40, 0x1d, 0xee, 0x4f, 0x68, 0xd9, 0xa7, 0x2f, 0xb3, 0x64, 0xb3, 0xf5, 0xc8, 0xd3, 0xaa, 0x70, 0x70, 0x3d, 0xef, 0xd3, 0x95, 0x54, 0xdb, 0x3e, 0x94, 0x95, 0x92, 0x1f, 0x45, - /* (2^153)P */ 0x22, 0x80, 0x1d, 0x9d, 0x96, 0xa5, 0x78, 0x6f, 0xe0, 0x1e, 0x1b, 0x66, 0x42, 0xc8, 0xae, 0x9e, 0x46, 0x45, 0x08, 0x41, 0xdf, 0x80, 0xae, 0x6f, 0xdb, 0x15, 0x5a, 0x21, 0x31, 0x7a, 0xd0, 0xf2, 0x54, 0x15, 0x88, 0xd3, 0x0f, 0x7f, 0x14, 0x5a, 0x14, 0x97, 0xab, 0xf4, 0x58, 0x6a, 0x9f, 0xea, 0x74, 0xe5, 0x6b, 0x90, 0x59, 0x2b, 0x48, 0xd9, - /* (2^154)P */ 0x12, 0x24, 0x04, 0xf5, 0x50, 0xc2, 0x8c, 0xb0, 0x7c, 0x46, 0x98, 0xd5, 0x24, 0xad, 0xf6, 0x72, 0xdc, 0x82, 0x1a, 0x60, 0xc1, 0xeb, 0x48, 0xef, 0x7f, 0x6e, 0xe6, 0xcc, 0xdb, 0x7b, 0xae, 0xbe, 0x5e, 0x1e, 0x5c, 0xe6, 0x0a, 0x70, 0xdf, 0xa4, 0xa3, 0x85, 0x1b, 0x1b, 0x7f, 0x72, 0xb9, 0x96, 0x6f, 0xdc, 0x03, 0x76, 0x66, 0xfb, 0xa0, 0x33, - /* (2^155)P */ 0x37, 0x40, 0xbb, 0xbc, 0x68, 0x58, 0x86, 0xca, 0xbb, 0xa5, 0x24, 0x76, 0x3d, 0x48, 0xd1, 0xad, 0xb4, 0xa8, 0xcf, 0xc3, 0xb6, 0xa8, 0xba, 0x1a, 0x3a, 0xbe, 0x33, 0x75, 0x04, 0x5c, 0x13, 0x8c, 0x0d, 0x70, 0x8d, 0xa6, 0x4e, 0x2a, 0xeb, 0x17, 0x3c, 0x22, 0xdd, 0x3e, 0x96, 0x40, 0x11, 0x9e, 0x4e, 0xae, 0x3d, 0xf8, 0x91, 0xd7, 0x50, 0xc8, - /* (2^156)P */ 0xd8, 0xca, 0xde, 0x19, 0xcf, 0x00, 0xe4, 0x73, 0x18, 0x7f, 0x9b, 0x9f, 0xf4, 0x5b, 0x49, 0x49, 0x99, 0xdc, 0xa4, 0x46, 0x21, 0xb5, 0xd7, 0x3e, 0xb7, 0x47, 0x1b, 0xa9, 0x9f, 0x4c, 0x69, 0x7d, 0xec, 0x33, 0xd6, 0x1c, 0x51, 0x7f, 0x47, 0x74, 0x7a, 0x6c, 0xf3, 0xd2, 0x2e, 0xbf, 0xdf, 0x6c, 0x9e, 0x77, 0x3b, 0x34, 0xf6, 0x73, 0x80, 0xed, - /* (2^157)P */ 0x16, 0xfb, 0x16, 0xc3, 0xc2, 0x83, 0xe4, 0xf4, 0x03, 0x7f, 0x52, 0xb0, 0x67, 0x51, 0x7b, 0x24, 0x5a, 0x51, 0xd3, 0xb6, 0x4e, 0x59, 0x76, 0xcd, 0x08, 0x7b, 0x1d, 0x7a, 0x9c, 0x65, 0xae, 0xce, 0xaa, 0xd2, 0x1c, 0x85, 0x66, 0x68, 0x06, 0x15, 0xa8, 0x06, 0xe6, 0x16, 0x37, 0xf4, 0x49, 0x9e, 0x0f, 0x50, 0x37, 0xb1, 0xb2, 0x93, 0x70, 0x43, - /* (2^158)P */ 0x18, 0x3a, 0x16, 0xe5, 0x8d, 0xc8, 0x35, 0xd6, 0x7b, 0x09, 0xec, 0x61, 0x5f, 0x5c, 0x2a, 0x19, 0x96, 0x2e, 0xc3, 0xfd, 0xab, 0xe6, 0x23, 0xae, 0xab, 0xc5, 0xcb, 0xb9, 0x7b, 0x2d, 0x34, 0x51, 0xb9, 0x41, 0x9e, 0x7d, 0xca, 0xda, 0x25, 0x45, 0x14, 0xb0, 0xc7, 0x4d, 0x26, 0x2b, 0xfe, 0x43, 0xb0, 0x21, 0x5e, 0xfa, 0xdc, 0x7c, 0xf9, 0x5a, - /* (2^159)P */ 0x94, 0xad, 0x42, 0x17, 0xf5, 0xcd, 0x1c, 0x0d, 0xf6, 0x41, 0xd2, 0x55, 0xbb, 0x50, 0xf1, 0xc6, 0xbc, 0xa6, 0xc5, 0x3a, 0xfd, 0x9b, 0x75, 0x3e, 0xf6, 0x1a, 0xa7, 0xb2, 0x6e, 0x64, 0x12, 0xdc, 0x3c, 0xe5, 0xf6, 0xfc, 0x3b, 0xfa, 0x43, 0x81, 0xd4, 0xa5, 0xee, 0xf5, 0x9c, 0x47, 0x2f, 0xd0, 0x9c, 0xde, 0xa1, 0x48, 0x91, 0x9a, 0x34, 0xc1, - /* (2^160)P */ 0x37, 0x1b, 0xb3, 0x88, 0xc9, 0x98, 0x4e, 0xfb, 0x84, 0x4f, 0x2b, 0x0a, 0xb6, 0x8f, 0x35, 0x15, 0xcd, 0x61, 0x7a, 0x5f, 0x5c, 0xa0, 0xca, 0x23, 0xa0, 0x93, 0x1f, 0xcc, 0x3c, 0x39, 0x3a, 0x24, 0xa7, 0x49, 0xad, 0x8d, 0x59, 0xcc, 0x94, 0x5a, 0x16, 0xf5, 0x70, 0xe8, 0x52, 0x1e, 0xee, 0x20, 0x30, 0x17, 0x7e, 0xf0, 0x4c, 0x93, 0x06, 0x5a, - /* (2^161)P */ 0x81, 0xba, 0x3b, 0xd7, 0x3e, 0xb4, 0x32, 0x3a, 0x22, 0x39, 0x2a, 0xfc, 0x19, 0xd9, 0xd2, 0xf6, 0xc5, 0x79, 0x6c, 0x0e, 0xde, 0xda, 0x01, 0xff, 0x52, 0xfb, 0xb6, 0x95, 0x4e, 0x7a, 0x10, 0xb8, 0x06, 0x86, 0x3c, 0xcd, 0x56, 0xd6, 0x15, 0xbf, 0x6e, 0x3e, 0x4f, 0x35, 0x5e, 0xca, 0xbc, 0xa5, 0x95, 0xa2, 0xdf, 0x2d, 0x1d, 0xaf, 0x59, 0xf9, - /* (2^162)P */ 0x69, 0xe5, 0xe2, 0xfa, 0xc9, 0x7f, 0xdd, 0x09, 0xf5, 0x6b, 0x4e, 0x2e, 0xbe, 0xb4, 0xbf, 0x3e, 0xb2, 0xf2, 0x81, 0x30, 0xe1, 0x07, 0xa8, 0x0d, 0x2b, 0xd2, 0x5a, 0x55, 0xbe, 0x4b, 0x86, 0x5d, 0xb0, 0x5e, 0x7c, 0x8f, 0xc1, 0x3c, 0x81, 0x4c, 0xf7, 0x6d, 0x7d, 0xe6, 0x4f, 0x8a, 0x85, 0xc2, 0x2f, 0x28, 0xef, 0x8c, 0x69, 0xc2, 0xc2, 0x1a, - /* (2^163)P */ 0xd9, 0xe4, 0x0e, 0x1e, 0xc2, 0xf7, 0x2f, 0x9f, 0xa1, 0x40, 0xfe, 0x46, 0x16, 0xaf, 0x2e, 0xd1, 0xec, 0x15, 0x9b, 0x61, 0x92, 0xce, 0xfc, 0x10, 0x43, 0x1d, 0x00, 0xf6, 0xbe, 0x20, 0x80, 0x80, 0x6f, 0x3c, 0x16, 0x94, 0x59, 0xba, 0x03, 0x53, 0x6e, 0xb6, 0xdd, 0x25, 0x7b, 0x86, 0xbf, 0x96, 0xf4, 0x2f, 0xa1, 0x96, 0x8d, 0xf9, 0xb3, 0x29, - /* (2^164)P */ 0x3b, 0x04, 0x60, 0x6e, 0xce, 0xab, 0xd2, 0x63, 0x18, 0x53, 0x88, 0x16, 0x4a, 0x6a, 0xab, 0x72, 0x03, 0x68, 0xa5, 0xd4, 0x0d, 0xb2, 0x82, 0x81, 0x1f, 0x2b, 0x5c, 0x75, 0xe8, 0xd2, 0x1d, 0x7f, 0xe7, 0x1b, 0x35, 0x02, 0xde, 0xec, 0xbd, 0xcb, 0xc7, 0x01, 0xd3, 0x95, 0x61, 0xfe, 0xb2, 0x7a, 0x66, 0x09, 0x4c, 0x6d, 0xfd, 0x39, 0xf7, 0x52, - /* (2^165)P */ 0x42, 0xc1, 0x5f, 0xf8, 0x35, 0x52, 0xc1, 0xfe, 0xc5, 0x11, 0x80, 0x1c, 0x11, 0x46, 0x31, 0x11, 0xbe, 0xd0, 0xc4, 0xb6, 0x07, 0x13, 0x38, 0xa0, 0x8d, 0x65, 0xf0, 0x56, 0x9e, 0x16, 0xbf, 0x9d, 0xcd, 0x51, 0x34, 0xf9, 0x08, 0x48, 0x7b, 0x76, 0x0c, 0x7b, 0x30, 0x07, 0xa8, 0x76, 0xaf, 0xa3, 0x29, 0x38, 0xb0, 0x58, 0xde, 0x72, 0x4b, 0x45, - /* (2^166)P */ 0xd4, 0x16, 0xa7, 0xc0, 0xb4, 0x9f, 0xdf, 0x1a, 0x37, 0xc8, 0x35, 0xed, 0xc5, 0x85, 0x74, 0x64, 0x09, 0x22, 0xef, 0xe9, 0x0c, 0xaf, 0x12, 0x4c, 0x9e, 0xf8, 0x47, 0x56, 0xe0, 0x7f, 0x4e, 0x24, 0x6b, 0x0c, 0xe7, 0xad, 0xc6, 0x47, 0x1d, 0xa4, 0x0d, 0x86, 0x89, 0x65, 0xe8, 0x5f, 0x71, 0xc7, 0xe9, 0xcd, 0xec, 0x6c, 0x62, 0xc7, 0xe3, 0xb3, - /* (2^167)P */ 0xb5, 0xea, 0x86, 0xe3, 0x15, 0x18, 0x3f, 0x6d, 0x7b, 0x05, 0x95, 0x15, 0x53, 0x26, 0x1c, 0xeb, 0xbe, 0x7e, 0x16, 0x42, 0x4b, 0xa2, 0x3d, 0xdd, 0x0e, 0xff, 0xba, 0x67, 0xb5, 0xae, 0x7a, 0x17, 0xde, 0x23, 0xad, 0x14, 0xcc, 0xd7, 0xaf, 0x57, 0x01, 0xe0, 0xdd, 0x48, 0xdd, 0xd7, 0xe3, 0xdf, 0xe9, 0x2d, 0xda, 0x67, 0xa4, 0x9f, 0x29, 0x04, - /* (2^168)P */ 0x16, 0x53, 0xe6, 0x9c, 0x4e, 0xe5, 0x1e, 0x70, 0x81, 0x25, 0x02, 0x9b, 0x47, 0x6d, 0xd2, 0x08, 0x73, 0xbe, 0x0a, 0xf1, 0x7b, 0xeb, 0x24, 0xeb, 0x38, 0x23, 0x5c, 0xb6, 0x3e, 0xce, 0x1e, 0xe3, 0xbc, 0x82, 0x35, 0x1f, 0xaf, 0x3a, 0x3a, 0xe5, 0x4e, 0xc1, 0xca, 0xbf, 0x47, 0xb4, 0xbb, 0xbc, 0x5f, 0xea, 0xc6, 0xca, 0xf3, 0xa0, 0xa2, 0x73, - /* (2^169)P */ 0xef, 0xa4, 0x7a, 0x4e, 0xe4, 0xc7, 0xb6, 0x43, 0x2e, 0xa5, 0xe4, 0xa5, 0xba, 0x1e, 0xa5, 0xfe, 0x9e, 0xce, 0xa9, 0x80, 0x04, 0xcb, 0x4f, 0xd8, 0x74, 0x05, 0x48, 0xfa, 0x99, 0x11, 0x5d, 0x97, 0x3b, 0x07, 0x0d, 0xdd, 0xe6, 0xb1, 0x74, 0x87, 0x1a, 0xd3, 0x26, 0xb7, 0x8f, 0xe1, 0x63, 0x3d, 0xec, 0x53, 0x93, 0xb0, 0x81, 0x78, 0x34, 0xa4, - /* (2^170)P */ 0xe1, 0xe7, 0xd4, 0x58, 0x9d, 0x0e, 0x8b, 0x65, 0x66, 0x37, 0x16, 0x48, 0x6f, 0xaa, 0x42, 0x37, 0x77, 0xad, 0xb1, 0x56, 0x48, 0xdf, 0x65, 0x36, 0x30, 0xb8, 0x00, 0x12, 0xd8, 0x32, 0x28, 0x7f, 0xc1, 0x71, 0xeb, 0x93, 0x0f, 0x48, 0x04, 0xe1, 0x5a, 0x6a, 0x96, 0xc1, 0xca, 0x89, 0x6d, 0x1b, 0x82, 0x4c, 0x18, 0x6d, 0x55, 0x4b, 0xea, 0xfd, - /* (2^171)P */ 0x62, 0x1a, 0x53, 0xb4, 0xb1, 0xbe, 0x6f, 0x15, 0x18, 0x88, 0xd4, 0x66, 0x61, 0xc7, 0x12, 0x69, 0x02, 0xbd, 0x03, 0x23, 0x2b, 0xef, 0xf9, 0x54, 0xa4, 0x85, 0xa8, 0xe3, 0xb7, 0xbd, 0xa9, 0xa3, 0xf3, 0x2a, 0xdd, 0xf1, 0xd4, 0x03, 0x0f, 0xa9, 0xa1, 0xd8, 0xa3, 0xcd, 0xb2, 0x71, 0x90, 0x4b, 0x35, 0x62, 0xf2, 0x2f, 0xce, 0x67, 0x1f, 0xaa, - /* (2^172)P */ 0x9e, 0x1e, 0xcd, 0x43, 0x7e, 0x87, 0x37, 0x94, 0x3a, 0x97, 0x4c, 0x7e, 0xee, 0xc9, 0x37, 0x85, 0xf1, 0xd9, 0x4f, 0xbf, 0xf9, 0x6f, 0x39, 0x9a, 0x39, 0x87, 0x2e, 0x25, 0x84, 0x42, 0xc3, 0x80, 0xcb, 0x07, 0x22, 0xae, 0x30, 0xd5, 0x50, 0xa1, 0x23, 0xcc, 0x31, 0x81, 0x9d, 0xf1, 0x30, 0xd9, 0x2b, 0x73, 0x41, 0x16, 0x50, 0xab, 0x2d, 0xa2, - /* (2^173)P */ 0xa4, 0x69, 0x4f, 0xa1, 0x4e, 0xb9, 0xbf, 0x14, 0xe8, 0x2b, 0x04, 0x93, 0xb7, 0x6e, 0x9f, 0x7d, 0x73, 0x0a, 0xc5, 0x14, 0xb8, 0xde, 0x8c, 0xc1, 0xfe, 0xc0, 0xa7, 0xa4, 0xcc, 0x42, 0x42, 0x81, 0x15, 0x65, 0x8a, 0x80, 0xb9, 0xde, 0x1f, 0x60, 0x33, 0x0e, 0xcb, 0xfc, 0xe0, 0xdb, 0x83, 0xa1, 0xe5, 0xd0, 0x16, 0x86, 0x2c, 0xe2, 0x87, 0xed, - /* (2^174)P */ 0x7a, 0xc0, 0xeb, 0x6b, 0xf6, 0x0d, 0x4c, 0x6d, 0x1e, 0xdb, 0xab, 0xe7, 0x19, 0x45, 0xc6, 0xe3, 0xb2, 0x06, 0xbb, 0xbc, 0x70, 0x99, 0x83, 0x33, 0xeb, 0x28, 0xc8, 0x77, 0xf6, 0x4d, 0x01, 0xb7, 0x59, 0xa0, 0xd2, 0xb3, 0x2a, 0x72, 0x30, 0xe7, 0x11, 0x39, 0xb6, 0x41, 0x29, 0x65, 0x5a, 0x14, 0xb9, 0x86, 0x08, 0xe0, 0x7d, 0x32, 0x8c, 0xf0, - /* (2^175)P */ 0x5c, 0x11, 0x30, 0x9e, 0x05, 0x27, 0xf5, 0x45, 0x0f, 0xb3, 0xc9, 0x75, 0xc3, 0xd7, 0xe1, 0x82, 0x3b, 0x8e, 0x87, 0x23, 0x00, 0x15, 0x19, 0x07, 0xd9, 0x21, 0x53, 0xc7, 0xf1, 0xa3, 0xbf, 0x70, 0x64, 0x15, 0x18, 0xca, 0x23, 0x9e, 0xd3, 0x08, 0xc3, 0x2a, 0x8b, 0xe5, 0x83, 0x04, 0x89, 0x14, 0xfd, 0x28, 0x25, 0x1c, 0xe3, 0x26, 0xa7, 0x22, - /* (2^176)P */ 0xdc, 0xd4, 0x75, 0x60, 0x99, 0x94, 0xea, 0x09, 0x8e, 0x8a, 0x3c, 0x1b, 0xf9, 0xbd, 0x33, 0x0d, 0x51, 0x3d, 0x12, 0x6f, 0x4e, 0x72, 0xe0, 0x17, 0x20, 0xe9, 0x75, 0xe6, 0x3a, 0xb2, 0x13, 0x83, 0x4e, 0x7a, 0x08, 0x9e, 0xd1, 0x04, 0x5f, 0x6b, 0x42, 0x0b, 0x76, 0x2a, 0x2d, 0x77, 0x53, 0x6c, 0x65, 0x6d, 0x8e, 0x25, 0x3c, 0xb6, 0x8b, 0x69, - /* (2^177)P */ 0xb9, 0x49, 0x28, 0xd0, 0xdc, 0x6c, 0x8f, 0x4c, 0xc9, 0x14, 0x8a, 0x38, 0xa3, 0xcb, 0xc4, 0x9d, 0x53, 0xcf, 0xe9, 0xe3, 0xcf, 0xe0, 0xb1, 0xf2, 0x1b, 0x4c, 0x7f, 0x83, 0x2a, 0x7a, 0xe9, 0x8b, 0x3b, 0x86, 0x61, 0x30, 0xe9, 0x99, 0xbd, 0xba, 0x19, 0x6e, 0x65, 0x2a, 0x12, 0x3e, 0x9c, 0xa8, 0xaf, 0xc3, 0xcf, 0xf8, 0x1f, 0x77, 0x86, 0xea, - /* (2^178)P */ 0x30, 0xde, 0xe7, 0xff, 0x54, 0xf7, 0xa2, 0x59, 0xf6, 0x0b, 0xfb, 0x7a, 0xf2, 0x39, 0xf0, 0xdb, 0x39, 0xbc, 0xf0, 0xfa, 0x60, 0xeb, 0x6b, 0x4f, 0x47, 0x17, 0xc8, 0x00, 0x65, 0x6d, 0x25, 0x1c, 0xd0, 0x48, 0x56, 0x53, 0x45, 0x11, 0x30, 0x02, 0x49, 0x20, 0x27, 0xac, 0xf2, 0x4c, 0xac, 0x64, 0x3d, 0x52, 0xb8, 0x89, 0xe0, 0x93, 0x16, 0x0f, - /* (2^179)P */ 0x84, 0x09, 0xba, 0x40, 0xb2, 0x2f, 0xa3, 0xa8, 0xc2, 0xba, 0x46, 0x33, 0x05, 0x9d, 0x62, 0xad, 0xa1, 0x3c, 0x33, 0xef, 0x0d, 0xeb, 0xf0, 0x77, 0x11, 0x5a, 0xb0, 0x21, 0x9c, 0xdf, 0x55, 0x24, 0x25, 0x35, 0x51, 0x61, 0x92, 0xf0, 0xb1, 0xce, 0xf5, 0xd4, 0x7b, 0x6c, 0x21, 0x9d, 0x56, 0x52, 0xf8, 0xa1, 0x4c, 0xe9, 0x27, 0x55, 0xac, 0x91, - /* (2^180)P */ 0x03, 0x3e, 0x30, 0xd2, 0x0a, 0xfa, 0x7d, 0x82, 0x3d, 0x1f, 0x8b, 0xcb, 0xb6, 0x04, 0x5c, 0xcc, 0x8b, 0xda, 0xe2, 0x68, 0x74, 0x08, 0x8c, 0x44, 0x83, 0x57, 0x6d, 0x6f, 0x80, 0xb0, 0x7e, 0xa9, 0x82, 0x91, 0x7b, 0x4c, 0x37, 0x97, 0xd1, 0x63, 0xd1, 0xbd, 0x45, 0xe6, 0x8a, 0x86, 0xd6, 0x89, 0x54, 0xfd, 0xd2, 0xb1, 0xd7, 0x54, 0xad, 0xaf, - /* (2^181)P */ 0x8b, 0x33, 0x62, 0x49, 0x9f, 0x63, 0xf9, 0x87, 0x42, 0x58, 0xbf, 0xb3, 0xe6, 0x68, 0x02, 0x60, 0x5c, 0x76, 0x62, 0xf7, 0x61, 0xd7, 0x36, 0x31, 0xf7, 0x9c, 0xb5, 0xe5, 0x13, 0x6c, 0xea, 0x78, 0xae, 0xcf, 0xde, 0xbf, 0xb6, 0xeb, 0x4f, 0xc8, 0x2a, 0xb4, 0x9a, 0x9f, 0xf3, 0xd1, 0x6a, 0xec, 0x0c, 0xbd, 0x85, 0x98, 0x40, 0x06, 0x1c, 0x2a, - /* (2^182)P */ 0x74, 0x3b, 0xe7, 0x81, 0xd5, 0xae, 0x54, 0x56, 0x03, 0xe8, 0x97, 0x16, 0x76, 0xcf, 0x24, 0x96, 0x96, 0x5b, 0xcc, 0x09, 0xab, 0x23, 0x6f, 0x54, 0xae, 0x8f, 0xe4, 0x12, 0xcb, 0xfd, 0xbc, 0xac, 0x93, 0x45, 0x3d, 0x68, 0x08, 0x22, 0x59, 0xc6, 0xf0, 0x47, 0x19, 0x8c, 0x79, 0x93, 0x1e, 0x0e, 0x30, 0xb0, 0x94, 0xfb, 0x17, 0x1d, 0x5a, 0x12, - /* (2^183)P */ 0x85, 0xff, 0x40, 0x18, 0x85, 0xff, 0x44, 0x37, 0x69, 0x23, 0x4d, 0x34, 0xe1, 0xeb, 0xa3, 0x1b, 0x55, 0x40, 0xc1, 0x64, 0xf4, 0xd4, 0x13, 0x0a, 0x9f, 0xb9, 0x19, 0xfc, 0x88, 0x7d, 0xc0, 0x72, 0xcf, 0x69, 0x2f, 0xd2, 0x0c, 0x82, 0x0f, 0xda, 0x08, 0xba, 0x0f, 0xaa, 0x3b, 0xe9, 0xe5, 0x83, 0x7a, 0x06, 0xe8, 0x1b, 0x38, 0x43, 0xc3, 0x54, - /* (2^184)P */ 0x14, 0xaa, 0xb3, 0x6e, 0xe6, 0x28, 0xee, 0xc5, 0x22, 0x6c, 0x7c, 0xf9, 0xa8, 0x71, 0xcc, 0xfe, 0x68, 0x7e, 0xd3, 0xb8, 0x37, 0x96, 0xca, 0x0b, 0xd9, 0xb6, 0x06, 0xa9, 0xf6, 0x71, 0xe8, 0x31, 0xf7, 0xd8, 0xf1, 0x5d, 0xab, 0xb9, 0xf0, 0x5c, 0x98, 0xcf, 0x22, 0xa2, 0x2a, 0xf6, 0xd0, 0x59, 0xf0, 0x9d, 0xd9, 0x6a, 0x4f, 0x59, 0x57, 0xad, - /* (2^185)P */ 0xd7, 0x2b, 0x3d, 0x38, 0x4c, 0x2e, 0x23, 0x4d, 0x49, 0xa2, 0x62, 0x62, 0xf9, 0x0f, 0xde, 0x08, 0xf3, 0x86, 0x71, 0xb6, 0xc7, 0xf9, 0x85, 0x9c, 0x33, 0xa1, 0xcf, 0x16, 0xaa, 0x60, 0xb9, 0xb7, 0xea, 0xed, 0x01, 0x1c, 0x59, 0xdb, 0x3f, 0x3f, 0x97, 0x2e, 0xf0, 0x09, 0x9f, 0x10, 0x85, 0x5f, 0x53, 0x39, 0xf3, 0x13, 0x40, 0x56, 0x95, 0xf9, - /* (2^186)P */ 0xb4, 0xe3, 0xda, 0xc6, 0x1f, 0x78, 0x8e, 0xac, 0xd4, 0x20, 0x1d, 0xa0, 0xbf, 0x4c, 0x09, 0x16, 0xa7, 0x30, 0xb5, 0x8d, 0x9e, 0xa1, 0x5f, 0x6d, 0x52, 0xf4, 0x71, 0xb6, 0x32, 0x2d, 0x21, 0x51, 0xc6, 0xfc, 0x2f, 0x08, 0xf4, 0x13, 0x6c, 0x55, 0xba, 0x72, 0x81, 0x24, 0x49, 0x0e, 0x4f, 0x06, 0x36, 0x39, 0x6a, 0xc5, 0x81, 0xfc, 0xeb, 0xb2, - /* (2^187)P */ 0x7d, 0x8d, 0xc8, 0x6c, 0xea, 0xb4, 0xb9, 0xe8, 0x40, 0xc9, 0x69, 0xc9, 0x30, 0x05, 0xfd, 0x34, 0x46, 0xfd, 0x94, 0x05, 0x16, 0xf5, 0x4b, 0x13, 0x3d, 0x24, 0x1a, 0xd6, 0x64, 0x2b, 0x9c, 0xe2, 0xa5, 0xd9, 0x98, 0xe0, 0xe8, 0xf4, 0xbc, 0x2c, 0xbd, 0xa2, 0x56, 0xe3, 0x9e, 0x14, 0xdb, 0xbf, 0x05, 0xbf, 0x9a, 0x13, 0x5d, 0xf7, 0x91, 0xa3, - /* (2^188)P */ 0x8b, 0xcb, 0x27, 0xf3, 0x15, 0x26, 0x05, 0x40, 0x0f, 0xa6, 0x15, 0x13, 0x71, 0x95, 0xa2, 0xc6, 0x38, 0x04, 0x67, 0xf8, 0x9a, 0x83, 0x06, 0xaa, 0x25, 0x36, 0x72, 0x01, 0x6f, 0x74, 0x5f, 0xe5, 0x6e, 0x44, 0x99, 0xce, 0x13, 0xbc, 0x82, 0xc2, 0x0d, 0xa4, 0x98, 0x50, 0x38, 0xf3, 0xa2, 0xc5, 0xe5, 0x24, 0x1f, 0x6f, 0x56, 0x3e, 0x07, 0xb2, - /* (2^189)P */ 0xbd, 0x0f, 0x32, 0x60, 0x07, 0xb1, 0xd7, 0x0b, 0x11, 0x07, 0x57, 0x02, 0x89, 0xe8, 0x8b, 0xe8, 0x5a, 0x1f, 0xee, 0x54, 0x6b, 0xff, 0xb3, 0x04, 0x07, 0x57, 0x13, 0x0b, 0x94, 0xa8, 0x4d, 0x81, 0xe2, 0x17, 0x16, 0x45, 0xd4, 0x4b, 0xf7, 0x7e, 0x64, 0x66, 0x20, 0xe8, 0x0b, 0x26, 0xfd, 0xa9, 0x8a, 0x47, 0x52, 0x89, 0x14, 0xd0, 0xd1, 0xa1, - /* (2^190)P */ 0xdc, 0x03, 0xe6, 0x20, 0x44, 0x47, 0x8f, 0x04, 0x16, 0x24, 0x22, 0xc1, 0x55, 0x5c, 0xbe, 0x43, 0xc3, 0x92, 0xc5, 0x54, 0x3d, 0x5d, 0xd1, 0x05, 0x9c, 0xc6, 0x7c, 0xbf, 0x23, 0x84, 0x1a, 0xba, 0x4f, 0x1f, 0xfc, 0xa1, 0xae, 0x1a, 0x64, 0x02, 0x51, 0xf1, 0xcb, 0x7a, 0x20, 0xce, 0xb2, 0x34, 0x3c, 0xca, 0xe0, 0xe4, 0xba, 0x22, 0xd4, 0x7b, - /* (2^191)P */ 0xca, 0xfd, 0xca, 0xd7, 0xde, 0x61, 0xae, 0xf0, 0x79, 0x0c, 0x20, 0xab, 0xbc, 0x6f, 0x4d, 0x61, 0xf0, 0xc7, 0x9c, 0x8d, 0x4b, 0x52, 0xf3, 0xb9, 0x48, 0x63, 0x0b, 0xb6, 0xd2, 0x25, 0x9a, 0x96, 0x72, 0xc1, 0x6b, 0x0c, 0xb5, 0xfb, 0x71, 0xaa, 0xad, 0x47, 0x5b, 0xe7, 0xc0, 0x0a, 0x55, 0xb2, 0xd4, 0x16, 0x2f, 0xb1, 0x01, 0xfd, 0xce, 0x27, - /* (2^192)P */ 0x64, 0x11, 0x4b, 0xab, 0x57, 0x09, 0xc6, 0x49, 0x4a, 0x37, 0xc3, 0x36, 0xc4, 0x7b, 0x81, 0x1f, 0x42, 0xed, 0xbb, 0xe0, 0xa0, 0x8d, 0x51, 0xe6, 0xca, 0x8b, 0xb9, 0xcd, 0x99, 0x2d, 0x91, 0x53, 0xa9, 0x47, 0xcb, 0x32, 0xc7, 0xa4, 0x92, 0xec, 0x46, 0x74, 0x44, 0x6d, 0x71, 0x9f, 0x6d, 0x0c, 0x69, 0xa4, 0xf8, 0xbe, 0x9f, 0x7f, 0xa0, 0xd7, - /* (2^193)P */ 0x5f, 0x33, 0xb6, 0x91, 0xc8, 0xa5, 0x3f, 0x5d, 0x7f, 0x38, 0x6e, 0x74, 0x20, 0x4a, 0xd6, 0x2b, 0x98, 0x2a, 0x41, 0x4b, 0x83, 0x64, 0x0b, 0x92, 0x7a, 0x06, 0x1e, 0xc6, 0x2c, 0xf6, 0xe4, 0x91, 0xe5, 0xb1, 0x2e, 0x6e, 0x4e, 0xa8, 0xc8, 0x14, 0x32, 0x57, 0x44, 0x1c, 0xe4, 0xb9, 0x7f, 0x54, 0x51, 0x08, 0x81, 0xaa, 0x4e, 0xce, 0xa1, 0x5d, - /* (2^194)P */ 0x5c, 0xd5, 0x9b, 0x5e, 0x7c, 0xb5, 0xb1, 0x52, 0x73, 0x00, 0x41, 0x56, 0x79, 0x08, 0x7e, 0x07, 0x28, 0x06, 0xa6, 0xfb, 0x7f, 0x69, 0xbd, 0x7a, 0x3c, 0xae, 0x9f, 0x39, 0xbb, 0x54, 0xa2, 0x79, 0xb9, 0x0e, 0x7f, 0xbb, 0xe0, 0xe6, 0xb7, 0x27, 0x64, 0x38, 0x45, 0xdb, 0x84, 0xe4, 0x61, 0x72, 0x3f, 0xe2, 0x24, 0xfe, 0x7a, 0x31, 0x9a, 0xc9, - /* (2^195)P */ 0xa1, 0xd2, 0xa4, 0xee, 0x24, 0x96, 0xe5, 0x5b, 0x79, 0x78, 0x3c, 0x7b, 0x82, 0x3b, 0x8b, 0x58, 0x0b, 0xa3, 0x63, 0x2d, 0xbc, 0x75, 0x46, 0xe8, 0x83, 0x1a, 0xc0, 0x2a, 0x92, 0x61, 0xa8, 0x75, 0x37, 0x3c, 0xbf, 0x0f, 0xef, 0x8f, 0x6c, 0x97, 0x75, 0x10, 0x05, 0x7a, 0xde, 0x23, 0xe8, 0x2a, 0x35, 0xeb, 0x41, 0x64, 0x7d, 0xcf, 0xe0, 0x52, - /* (2^196)P */ 0x4a, 0xd0, 0x49, 0x93, 0xae, 0xf3, 0x24, 0x8c, 0xe1, 0x09, 0x98, 0x45, 0xd8, 0xb9, 0xfe, 0x8e, 0x8c, 0xa8, 0x2c, 0xc9, 0x9f, 0xce, 0x01, 0xdc, 0x38, 0x11, 0xab, 0x85, 0xb9, 0xe8, 0x00, 0x51, 0xfd, 0x82, 0xe1, 0x9b, 0x4e, 0xfc, 0xb5, 0x2a, 0x0f, 0x8b, 0xda, 0x4e, 0x02, 0xca, 0xcc, 0xe3, 0x91, 0xc4, 0xe0, 0xcf, 0x7b, 0xd6, 0xe6, 0x6a, - /* (2^197)P */ 0xfe, 0x11, 0xd7, 0xaa, 0xe3, 0x0c, 0x52, 0x2e, 0x04, 0xe0, 0xe0, 0x61, 0xc8, 0x05, 0xd7, 0x31, 0x4c, 0xc3, 0x9b, 0x2d, 0xce, 0x59, 0xbe, 0x12, 0xb7, 0x30, 0x21, 0xfc, 0x81, 0xb8, 0x5e, 0x57, 0x73, 0xd0, 0xad, 0x8e, 0x9e, 0xe4, 0xeb, 0xcd, 0xcf, 0xd2, 0x0f, 0x01, 0x35, 0x16, 0xed, 0x7a, 0x43, 0x8e, 0x42, 0xdc, 0xea, 0x4c, 0xa8, 0x7c, - /* (2^198)P */ 0x37, 0x26, 0xcc, 0x76, 0x0b, 0xe5, 0x76, 0xdd, 0x3e, 0x19, 0x3c, 0xc4, 0x6c, 0x7f, 0xd0, 0x03, 0xc1, 0xb8, 0x59, 0x82, 0xca, 0x36, 0xc1, 0xe4, 0xc8, 0xb2, 0x83, 0x69, 0x9c, 0xc5, 0x9d, 0x12, 0x82, 0x1c, 0xea, 0xb2, 0x84, 0x9f, 0xf3, 0x52, 0x6b, 0xbb, 0xd8, 0x81, 0x56, 0x83, 0x04, 0x66, 0x05, 0x22, 0x49, 0x37, 0x93, 0xb1, 0xfd, 0xd5, - /* (2^199)P */ 0xaf, 0x96, 0xbf, 0x03, 0xbe, 0xe6, 0x5d, 0x78, 0x19, 0xba, 0x37, 0x46, 0x0a, 0x2b, 0x52, 0x7c, 0xd8, 0x51, 0x9e, 0x3d, 0x29, 0x42, 0xdb, 0x0e, 0x31, 0x20, 0x94, 0xf8, 0x43, 0x9a, 0x2d, 0x22, 0xd3, 0xe3, 0xa1, 0x79, 0x68, 0xfb, 0x2d, 0x7e, 0xd6, 0x79, 0xda, 0x0b, 0xc6, 0x5b, 0x76, 0x68, 0xf0, 0xfe, 0x72, 0x59, 0xbb, 0xa1, 0x9c, 0x74, - /* (2^200)P */ 0x0a, 0xd9, 0xec, 0xc5, 0xbd, 0xf0, 0xda, 0xcf, 0x82, 0xab, 0x46, 0xc5, 0x32, 0x13, 0xdc, 0x5b, 0xac, 0xc3, 0x53, 0x9a, 0x7f, 0xef, 0xa5, 0x40, 0x5a, 0x1f, 0xc1, 0x12, 0x91, 0x54, 0x83, 0x6a, 0xb0, 0x9a, 0x85, 0x4d, 0xbf, 0x36, 0x8e, 0xd3, 0xa2, 0x2b, 0xe5, 0xd6, 0xc6, 0xe1, 0x58, 0x5b, 0x82, 0x9b, 0xc8, 0xf2, 0x03, 0xba, 0xf5, 0x92, - /* (2^201)P */ 0xfb, 0x21, 0x7e, 0xde, 0xe7, 0xb4, 0xc0, 0x56, 0x86, 0x3a, 0x5b, 0x78, 0xf8, 0xf0, 0xf4, 0xe7, 0x5c, 0x00, 0xd2, 0xd7, 0xd6, 0xf8, 0x75, 0x5e, 0x0f, 0x3e, 0xd1, 0x4b, 0x77, 0xd8, 0xad, 0xb0, 0xc9, 0x8b, 0x59, 0x7d, 0x30, 0x76, 0x64, 0x7a, 0x76, 0xd9, 0x51, 0x69, 0xfc, 0xbd, 0x8e, 0xb5, 0x55, 0xe0, 0xd2, 0x07, 0x15, 0xa9, 0xf7, 0xa4, - /* (2^202)P */ 0xaa, 0x2d, 0x2f, 0x2b, 0x3c, 0x15, 0xdd, 0xcd, 0xe9, 0x28, 0x82, 0x4f, 0xa2, 0xaa, 0x31, 0x48, 0xcc, 0xfa, 0x07, 0x73, 0x8a, 0x34, 0x74, 0x0d, 0xab, 0x1a, 0xca, 0xd2, 0xbf, 0x3a, 0xdb, 0x1a, 0x5f, 0x50, 0x62, 0xf4, 0x6b, 0x83, 0x38, 0x43, 0x96, 0xee, 0x6b, 0x39, 0x1e, 0xf0, 0x17, 0x80, 0x1e, 0x9b, 0xed, 0x2b, 0x2f, 0xcc, 0x65, 0xf7, - /* (2^203)P */ 0x03, 0xb3, 0x23, 0x9c, 0x0d, 0xd1, 0xeb, 0x7e, 0x34, 0x17, 0x8a, 0x4c, 0xde, 0x54, 0x39, 0xc4, 0x11, 0x82, 0xd3, 0xa4, 0x00, 0x32, 0x95, 0x9c, 0xa6, 0x64, 0x76, 0x6e, 0xd6, 0x53, 0x27, 0xb4, 0x6a, 0x14, 0x8c, 0x54, 0xf6, 0x58, 0x9e, 0x22, 0x4a, 0x55, 0x18, 0x77, 0xd0, 0x08, 0x6b, 0x19, 0x8a, 0xb5, 0xe7, 0x19, 0xb8, 0x60, 0x92, 0xb1, - /* (2^204)P */ 0x66, 0xec, 0xf3, 0x12, 0xde, 0x67, 0x7f, 0xd4, 0x5b, 0xf6, 0x70, 0x64, 0x0a, 0xb5, 0xc2, 0xf9, 0xb3, 0x64, 0xab, 0x56, 0x46, 0xc7, 0x93, 0xc2, 0x8b, 0x2d, 0xd0, 0xd6, 0x39, 0x3b, 0x1f, 0xcd, 0xb3, 0xac, 0xcc, 0x2c, 0x27, 0x6a, 0xbc, 0xb3, 0x4b, 0xa8, 0x3c, 0x69, 0x20, 0xe2, 0x18, 0x35, 0x17, 0xe1, 0x8a, 0xd3, 0x11, 0x74, 0xaa, 0x4d, - /* (2^205)P */ 0x96, 0xc4, 0x16, 0x7e, 0xfd, 0xf5, 0xd0, 0x7d, 0x1f, 0x32, 0x1b, 0xdb, 0xa6, 0xfd, 0x51, 0x75, 0x4d, 0xd7, 0x00, 0xe5, 0x7f, 0x58, 0x5b, 0xeb, 0x4b, 0x6a, 0x78, 0xfe, 0xe5, 0xd6, 0x8f, 0x99, 0x17, 0xca, 0x96, 0x45, 0xf7, 0x52, 0xdf, 0x84, 0x06, 0x77, 0xb9, 0x05, 0x63, 0x5d, 0xe9, 0x91, 0xb1, 0x4b, 0x82, 0x5a, 0xdb, 0xd7, 0xca, 0x69, - /* (2^206)P */ 0x02, 0xd3, 0x38, 0x38, 0x87, 0xea, 0xbd, 0x9f, 0x11, 0xca, 0xf3, 0x21, 0xf1, 0x9b, 0x35, 0x97, 0x98, 0xff, 0x8e, 0x6d, 0x3d, 0xd6, 0xb2, 0xfa, 0x68, 0xcb, 0x7e, 0x62, 0x85, 0xbb, 0xc7, 0x5d, 0xee, 0x32, 0x30, 0x2e, 0x71, 0x96, 0x63, 0x43, 0x98, 0xc4, 0xa7, 0xde, 0x60, 0xb2, 0xd9, 0x43, 0x4a, 0xfa, 0x97, 0x2d, 0x5f, 0x21, 0xd4, 0xfe, - /* (2^207)P */ 0x3b, 0x20, 0x29, 0x07, 0x07, 0xb5, 0x78, 0xc3, 0xc7, 0xab, 0x56, 0xba, 0x40, 0xde, 0x1d, 0xcf, 0xc3, 0x00, 0x56, 0x21, 0x0c, 0xc8, 0x42, 0xd9, 0x0e, 0xcd, 0x02, 0x7c, 0x07, 0xb9, 0x11, 0xd7, 0x96, 0xaf, 0xff, 0xad, 0xc5, 0xba, 0x30, 0x6d, 0x82, 0x3a, 0xbf, 0xef, 0x7b, 0xf7, 0x0a, 0x74, 0xbd, 0x31, 0x0c, 0xe4, 0xec, 0x1a, 0xe5, 0xc5, - /* (2^208)P */ 0xcc, 0xf2, 0x28, 0x16, 0x12, 0xbf, 0xef, 0x85, 0xbc, 0xf7, 0xcb, 0x9f, 0xdb, 0xa8, 0xb2, 0x49, 0x53, 0x48, 0xa8, 0x24, 0xa8, 0x68, 0x8d, 0xbb, 0x21, 0x0a, 0x5a, 0xbd, 0xb2, 0x91, 0x61, 0x47, 0xc4, 0x43, 0x08, 0xa6, 0x19, 0xef, 0x8e, 0x88, 0x39, 0xc6, 0x33, 0x30, 0xf3, 0x0e, 0xc5, 0x92, 0x66, 0xd6, 0xfe, 0xc5, 0x12, 0xd9, 0x4c, 0x2d, - /* (2^209)P */ 0x30, 0x34, 0x07, 0xbf, 0x9c, 0x5a, 0x4e, 0x65, 0xf1, 0x39, 0x35, 0x38, 0xae, 0x7b, 0x55, 0xac, 0x6a, 0x92, 0x24, 0x7e, 0x50, 0xd3, 0xba, 0x78, 0x51, 0xfe, 0x4d, 0x32, 0x05, 0x11, 0xf5, 0x52, 0xf1, 0x31, 0x45, 0x39, 0x98, 0x7b, 0x28, 0x56, 0xc3, 0x5d, 0x4f, 0x07, 0x6f, 0x84, 0xb8, 0x1a, 0x58, 0x0b, 0xc4, 0x7c, 0xc4, 0x8d, 0x32, 0x8e, - /* (2^210)P */ 0x7e, 0xaf, 0x98, 0xce, 0xc5, 0x2b, 0x9d, 0xf6, 0xfa, 0x2c, 0xb6, 0x2a, 0x5a, 0x1d, 0xc0, 0x24, 0x8d, 0xa4, 0xce, 0xb1, 0x12, 0x01, 0xf9, 0x79, 0xc6, 0x79, 0x38, 0x0c, 0xd4, 0x07, 0xc9, 0xf7, 0x37, 0xa1, 0x0b, 0xfe, 0x72, 0xec, 0x5d, 0xd6, 0xb0, 0x1c, 0x70, 0xbe, 0x70, 0x01, 0x13, 0xe0, 0x86, 0x95, 0xc7, 0x2e, 0x12, 0x3b, 0xe6, 0xa6, - /* (2^211)P */ 0x24, 0x82, 0x67, 0xe0, 0x14, 0x7b, 0x56, 0x08, 0x38, 0x44, 0xdb, 0xa0, 0x3a, 0x05, 0x47, 0xb2, 0xc0, 0xac, 0xd1, 0xcc, 0x3f, 0x82, 0xb8, 0x8a, 0x88, 0xbc, 0xf5, 0x33, 0xa1, 0x35, 0x0f, 0xf6, 0xe2, 0xef, 0x6c, 0xf7, 0x37, 0x9e, 0xe8, 0x10, 0xca, 0xb0, 0x8e, 0x80, 0x86, 0x00, 0x23, 0xd0, 0x4a, 0x76, 0x9f, 0xf7, 0x2c, 0x52, 0x15, 0x0e, - /* (2^212)P */ 0x5e, 0x49, 0xe1, 0x2c, 0x9a, 0x01, 0x76, 0xa6, 0xb3, 0x07, 0x5b, 0xa4, 0x07, 0xef, 0x1d, 0xc3, 0x6a, 0xbb, 0x64, 0xbe, 0x71, 0x15, 0x6e, 0x32, 0x31, 0x46, 0x9a, 0x9e, 0x8f, 0x45, 0x73, 0xce, 0x0b, 0x94, 0x1a, 0x52, 0x07, 0xf4, 0x50, 0x30, 0x49, 0x53, 0x50, 0xfb, 0x71, 0x1f, 0x5a, 0x03, 0xa9, 0x76, 0xf2, 0x8f, 0x42, 0xff, 0xed, 0xed, - /* (2^213)P */ 0xed, 0x08, 0xdb, 0x91, 0x1c, 0xee, 0xa2, 0xb4, 0x47, 0xa2, 0xfa, 0xcb, 0x03, 0xd1, 0xff, 0x8c, 0xad, 0x64, 0x50, 0x61, 0xcd, 0xfc, 0x88, 0xa0, 0x31, 0x95, 0x30, 0xb9, 0x58, 0xdd, 0xd7, 0x43, 0xe4, 0x46, 0xc2, 0x16, 0xd9, 0x72, 0x4a, 0x56, 0x51, 0x70, 0x85, 0xf1, 0xa1, 0x80, 0x40, 0xd5, 0xba, 0x67, 0x81, 0xda, 0xcd, 0x03, 0xea, 0x51, - /* (2^214)P */ 0x42, 0x50, 0xf0, 0xef, 0x37, 0x61, 0x72, 0x85, 0xe1, 0xf1, 0xff, 0x6f, 0x3d, 0xe8, 0x7b, 0x21, 0x5c, 0xe5, 0x50, 0x03, 0xde, 0x00, 0xc1, 0xf7, 0x3a, 0x55, 0x12, 0x1c, 0x9e, 0x1e, 0xce, 0xd1, 0x2f, 0xaf, 0x05, 0x70, 0x5b, 0x47, 0xf2, 0x04, 0x7a, 0x89, 0xbc, 0x78, 0xa6, 0x65, 0x6c, 0xaa, 0x3c, 0xa2, 0x3c, 0x8b, 0x5c, 0xa9, 0x22, 0x48, - /* (2^215)P */ 0x7e, 0x8c, 0x8f, 0x2f, 0x60, 0xe3, 0x5a, 0x94, 0xd4, 0xce, 0xdd, 0x9d, 0x83, 0x3b, 0x77, 0x78, 0x43, 0x1d, 0xfd, 0x8f, 0xc8, 0xe8, 0x02, 0x90, 0xab, 0xf6, 0xc9, 0xfc, 0xf1, 0x63, 0xaa, 0x5f, 0x42, 0xf1, 0x78, 0x34, 0x64, 0x16, 0x75, 0x9c, 0x7d, 0xd0, 0xe4, 0x74, 0x5a, 0xa8, 0xfb, 0xcb, 0xac, 0x20, 0xa3, 0xc2, 0xa6, 0x20, 0xf8, 0x1b, - /* (2^216)P */ 0x00, 0x4f, 0x1e, 0x56, 0xb5, 0x34, 0xb2, 0x87, 0x31, 0xe5, 0xee, 0x8d, 0xf1, 0x41, 0x67, 0xb7, 0x67, 0x3a, 0x54, 0x86, 0x5c, 0xf0, 0x0b, 0x37, 0x2f, 0x1b, 0x92, 0x5d, 0x58, 0x93, 0xdc, 0xd8, 0x58, 0xcc, 0x9e, 0x67, 0xd0, 0x97, 0x3a, 0xaf, 0x49, 0x39, 0x2d, 0x3b, 0xd8, 0x98, 0xfb, 0x76, 0x6b, 0xe7, 0xaf, 0xc3, 0x45, 0x44, 0x53, 0x94, - /* (2^217)P */ 0x30, 0xbd, 0x90, 0x75, 0xd3, 0xbd, 0x3b, 0x58, 0x27, 0x14, 0x9f, 0x6b, 0xd4, 0x31, 0x99, 0xcd, 0xde, 0x3a, 0x21, 0x1e, 0xb4, 0x02, 0xe4, 0x33, 0x04, 0x02, 0xb0, 0x50, 0x66, 0x68, 0x90, 0xdd, 0x7b, 0x69, 0x31, 0xd9, 0xcf, 0x68, 0x73, 0xf1, 0x60, 0xdd, 0xc8, 0x1d, 0x5d, 0xe3, 0xd6, 0x5b, 0x2a, 0xa4, 0xea, 0xc4, 0x3f, 0x08, 0xcd, 0x9c, - /* (2^218)P */ 0x6b, 0x1a, 0xbf, 0x55, 0xc1, 0x1b, 0x0c, 0x05, 0x09, 0xdf, 0xf5, 0x5e, 0xa3, 0x77, 0x95, 0xe9, 0xdf, 0x19, 0xdd, 0xc7, 0x94, 0xcb, 0x06, 0x73, 0xd0, 0x88, 0x02, 0x33, 0x94, 0xca, 0x7a, 0x2f, 0x8e, 0x3d, 0x72, 0x61, 0x2d, 0x4d, 0xa6, 0x61, 0x1f, 0x32, 0x5e, 0x87, 0x53, 0x36, 0x11, 0x15, 0x20, 0xb3, 0x5a, 0x57, 0x51, 0x93, 0x20, 0xd8, - /* (2^219)P */ 0xb7, 0x56, 0xf4, 0xab, 0x7d, 0x0c, 0xfb, 0x99, 0x1a, 0x30, 0x29, 0xb0, 0x75, 0x2a, 0xf8, 0x53, 0x71, 0x23, 0xbd, 0xa7, 0xd8, 0x0a, 0xe2, 0x27, 0x65, 0xe9, 0x74, 0x26, 0x98, 0x4a, 0x69, 0x19, 0xb2, 0x4d, 0x0a, 0x17, 0x98, 0xb2, 0xa9, 0x57, 0x4e, 0xf6, 0x86, 0xc8, 0x01, 0xa4, 0xc6, 0x98, 0xad, 0x5a, 0x90, 0x2c, 0x05, 0x46, 0x64, 0xb7, - /* (2^220)P */ 0x7b, 0x91, 0xdf, 0xfc, 0xf8, 0x1c, 0x8c, 0x15, 0x9e, 0xf7, 0xd5, 0xa8, 0xe8, 0xe7, 0xe3, 0xa3, 0xb0, 0x04, 0x74, 0xfa, 0x78, 0xfb, 0x26, 0xbf, 0x67, 0x42, 0xf9, 0x8c, 0x9b, 0xb4, 0x69, 0x5b, 0x02, 0x13, 0x6d, 0x09, 0x6c, 0xd6, 0x99, 0x61, 0x7b, 0x89, 0x4a, 0x67, 0x75, 0xa3, 0x98, 0x13, 0x23, 0x1d, 0x18, 0x24, 0x0e, 0xef, 0x41, 0x79, - /* (2^221)P */ 0x86, 0x33, 0xab, 0x08, 0xcb, 0xbf, 0x1e, 0x76, 0x3c, 0x0b, 0xbd, 0x30, 0xdb, 0xe9, 0xa3, 0x35, 0x87, 0x1b, 0xe9, 0x07, 0x00, 0x66, 0x7f, 0x3b, 0x35, 0x0c, 0x8a, 0x3f, 0x61, 0xbc, 0xe0, 0xae, 0xf6, 0xcc, 0x54, 0xe1, 0x72, 0x36, 0x2d, 0xee, 0x93, 0x24, 0xf8, 0xd7, 0xc5, 0xf9, 0xcb, 0xb0, 0xe5, 0x88, 0x0d, 0x23, 0x4b, 0x76, 0x15, 0xa2, - /* (2^222)P */ 0x37, 0xdb, 0x83, 0xd5, 0x6d, 0x06, 0x24, 0x37, 0x1b, 0x15, 0x85, 0x15, 0xe2, 0xc0, 0x4e, 0x02, 0xa9, 0x6d, 0x0a, 0x3a, 0x94, 0x4a, 0x6f, 0x49, 0x00, 0x01, 0x72, 0xbb, 0x60, 0x14, 0x35, 0xae, 0xb4, 0xc6, 0x01, 0x0a, 0x00, 0x9e, 0xc3, 0x58, 0xc5, 0xd1, 0x5e, 0x30, 0x73, 0x96, 0x24, 0x85, 0x9d, 0xf0, 0xf9, 0xec, 0x09, 0xd3, 0xe7, 0x70, - /* (2^223)P */ 0xf3, 0xbd, 0x96, 0x87, 0xe9, 0x71, 0xbd, 0xd6, 0xa2, 0x45, 0xeb, 0x0a, 0xcd, 0x2c, 0xf1, 0x72, 0xa6, 0x31, 0xa9, 0x6f, 0x09, 0xa1, 0x5e, 0xdd, 0xc8, 0x8d, 0x0d, 0xbc, 0x5a, 0x8d, 0xb1, 0x2c, 0x9a, 0xcc, 0x37, 0x74, 0xc2, 0xa9, 0x4e, 0xd6, 0xc0, 0x3c, 0xa0, 0x23, 0xb0, 0xa0, 0x77, 0x14, 0x80, 0x45, 0x71, 0x6a, 0x2d, 0x41, 0xc3, 0x82, - /* (2^224)P */ 0x37, 0x44, 0xec, 0x8a, 0x3e, 0xc1, 0x0c, 0xa9, 0x12, 0x9c, 0x08, 0x88, 0xcb, 0xd9, 0xf8, 0xba, 0x00, 0xd6, 0xc3, 0xdf, 0xef, 0x7a, 0x44, 0x7e, 0x25, 0x69, 0xc9, 0xc1, 0x46, 0xe5, 0x20, 0x9e, 0xcc, 0x0b, 0x05, 0x3e, 0xf4, 0x78, 0x43, 0x0c, 0xa6, 0x2f, 0xc1, 0xfa, 0x70, 0xb2, 0x3c, 0x31, 0x7a, 0x63, 0x58, 0xab, 0x17, 0xcf, 0x4c, 0x4f, - /* (2^225)P */ 0x2b, 0x08, 0x31, 0x59, 0x75, 0x8b, 0xec, 0x0a, 0xa9, 0x79, 0x70, 0xdd, 0xf1, 0x11, 0xc3, 0x11, 0x1f, 0xab, 0x37, 0xaa, 0x26, 0xea, 0x53, 0xc4, 0x79, 0xa7, 0x91, 0x00, 0xaa, 0x08, 0x42, 0xeb, 0x8b, 0x8b, 0xe8, 0xc3, 0x2f, 0xb8, 0x78, 0x90, 0x38, 0x0e, 0x8a, 0x42, 0x0c, 0x0f, 0xbf, 0x3e, 0xf8, 0xd8, 0x07, 0xcf, 0x6a, 0x34, 0xc9, 0xfa, - /* (2^226)P */ 0x11, 0xe0, 0x76, 0x4d, 0x23, 0xc5, 0xa6, 0xcc, 0x9f, 0x9a, 0x2a, 0xde, 0x3a, 0xb5, 0x92, 0x39, 0x19, 0x8a, 0xf1, 0x8d, 0xf9, 0x4d, 0xc9, 0xb4, 0x39, 0x9f, 0x57, 0xd8, 0x72, 0xab, 0x1d, 0x61, 0x6a, 0xb2, 0xff, 0x52, 0xba, 0x54, 0x0e, 0xfb, 0x83, 0x30, 0x8a, 0xf7, 0x3b, 0xf4, 0xd8, 0xae, 0x1a, 0x94, 0x3a, 0xec, 0x63, 0xfe, 0x6e, 0x7c, - /* (2^227)P */ 0xdc, 0x70, 0x8e, 0x55, 0x44, 0xbf, 0xd2, 0x6a, 0xa0, 0x14, 0x61, 0x89, 0xd5, 0x55, 0x45, 0x3c, 0xf6, 0x40, 0x0d, 0x83, 0x85, 0x44, 0xb4, 0x62, 0x56, 0xfe, 0x60, 0xd7, 0x07, 0x1d, 0x47, 0x30, 0x3b, 0x73, 0xa4, 0xb5, 0xb7, 0xea, 0xac, 0xda, 0xf1, 0x17, 0xaa, 0x60, 0xdf, 0xe9, 0x84, 0xda, 0x31, 0x32, 0x61, 0xbf, 0xd0, 0x7e, 0x8a, 0x02, - /* (2^228)P */ 0xb9, 0x51, 0xb3, 0x89, 0x21, 0x5d, 0xa2, 0xfe, 0x79, 0x2a, 0xb3, 0x2a, 0x3b, 0xe6, 0x6f, 0x2b, 0x22, 0x03, 0xea, 0x7b, 0x1f, 0xaf, 0x85, 0xc3, 0x38, 0x55, 0x5b, 0x8e, 0xb4, 0xaa, 0x77, 0xfe, 0x03, 0x6e, 0xda, 0x91, 0x24, 0x0c, 0x48, 0x39, 0x27, 0x43, 0x16, 0xd2, 0x0a, 0x0d, 0x43, 0xa3, 0x0e, 0xca, 0x45, 0xd1, 0x7f, 0xf5, 0xd3, 0x16, - /* (2^229)P */ 0x3d, 0x32, 0x9b, 0x38, 0xf8, 0x06, 0x93, 0x78, 0x5b, 0x50, 0x2b, 0x06, 0xd8, 0x66, 0xfe, 0xab, 0x9b, 0x58, 0xc7, 0xd1, 0x4d, 0xd5, 0xf8, 0x3b, 0x10, 0x7e, 0x85, 0xde, 0x58, 0x4e, 0xdf, 0x53, 0xd9, 0x58, 0xe0, 0x15, 0x81, 0x9f, 0x1a, 0x78, 0xfc, 0x9f, 0x10, 0xc2, 0x23, 0xd6, 0x78, 0xd1, 0x9d, 0xd2, 0xd5, 0x1c, 0x53, 0xe2, 0xc9, 0x76, - /* (2^230)P */ 0x98, 0x1e, 0x38, 0x7b, 0x71, 0x18, 0x4b, 0x15, 0xaf, 0xa1, 0xa6, 0x98, 0xcb, 0x26, 0xa3, 0xc8, 0x07, 0x46, 0xda, 0x3b, 0x70, 0x65, 0xec, 0x7a, 0x2b, 0x34, 0x94, 0xa8, 0xb6, 0x14, 0xf8, 0x1a, 0xce, 0xf7, 0xc8, 0x60, 0xf3, 0x88, 0xf4, 0x33, 0x60, 0x7b, 0xd1, 0x02, 0xe7, 0xda, 0x00, 0x4a, 0xea, 0xd2, 0xfd, 0x88, 0xd2, 0x99, 0x28, 0xf3, - /* (2^231)P */ 0x28, 0x24, 0x1d, 0x26, 0xc2, 0xeb, 0x8b, 0x3b, 0xb4, 0x6b, 0xbe, 0x6b, 0x77, 0xff, 0xf3, 0x21, 0x3b, 0x26, 0x6a, 0x8c, 0x8e, 0x2a, 0x44, 0xa8, 0x01, 0x2b, 0x71, 0xea, 0x64, 0x30, 0xfd, 0xfd, 0x95, 0xcb, 0x39, 0x38, 0x48, 0xfa, 0x96, 0x97, 0x8c, 0x2f, 0x33, 0xca, 0x03, 0xe6, 0xd7, 0x94, 0x55, 0x6c, 0xc3, 0xb3, 0xa8, 0xf7, 0xae, 0x8c, - /* (2^232)P */ 0xea, 0x62, 0x8a, 0xb4, 0xeb, 0x74, 0xf7, 0xb8, 0xae, 0xc5, 0x20, 0x71, 0x06, 0xd6, 0x7c, 0x62, 0x9b, 0x69, 0x74, 0xef, 0xa7, 0x6d, 0xd6, 0x8c, 0x37, 0xb9, 0xbf, 0xcf, 0xeb, 0xe4, 0x2f, 0x04, 0x02, 0x21, 0x7d, 0x75, 0x6b, 0x92, 0x48, 0xf8, 0x70, 0xad, 0x69, 0xe2, 0xea, 0x0e, 0x88, 0x67, 0x72, 0xcc, 0x2d, 0x10, 0xce, 0x2d, 0xcf, 0x65, - /* (2^233)P */ 0x49, 0xf3, 0x57, 0x64, 0xe5, 0x5c, 0xc5, 0x65, 0x49, 0x97, 0xc4, 0x8a, 0xcc, 0xa9, 0xca, 0x94, 0x7b, 0x86, 0x88, 0xb6, 0x51, 0x27, 0x69, 0xa5, 0x0f, 0x8b, 0x06, 0x59, 0xa0, 0x94, 0xef, 0x63, 0x1a, 0x01, 0x9e, 0x4f, 0xd2, 0x5a, 0x93, 0xc0, 0x7c, 0xe6, 0x61, 0x77, 0xb6, 0xf5, 0x40, 0xd9, 0x98, 0x43, 0x5b, 0x56, 0x68, 0xe9, 0x37, 0x8f, - /* (2^234)P */ 0xee, 0x87, 0xd2, 0x05, 0x1b, 0x39, 0x89, 0x10, 0x07, 0x6d, 0xe8, 0xfd, 0x8b, 0x4d, 0xb2, 0xa7, 0x7b, 0x1e, 0xa0, 0x6c, 0x0d, 0x3d, 0x3d, 0x49, 0xba, 0x61, 0x36, 0x1f, 0xc2, 0x84, 0x4a, 0xcc, 0x87, 0xa9, 0x1b, 0x23, 0x04, 0xe2, 0x3e, 0x97, 0xe1, 0xdb, 0xd5, 0x5a, 0xe8, 0x41, 0x6b, 0xe5, 0x5a, 0xa1, 0x99, 0xe5, 0x7b, 0xa7, 0xe0, 0x3b, - /* (2^235)P */ 0xea, 0xa3, 0x6a, 0xdd, 0x77, 0x7f, 0x77, 0x41, 0xc5, 0x6a, 0xe4, 0xaf, 0x11, 0x5f, 0x88, 0xa5, 0x10, 0xee, 0xd0, 0x8c, 0x0c, 0xb4, 0xa5, 0x2a, 0xd0, 0xd8, 0x1d, 0x47, 0x06, 0xc0, 0xd5, 0xce, 0x51, 0x54, 0x9b, 0x2b, 0xe6, 0x2f, 0xe7, 0xe7, 0x31, 0x5f, 0x5c, 0x23, 0x81, 0x3e, 0x03, 0x93, 0xaa, 0x2d, 0x71, 0x84, 0xa0, 0x89, 0x32, 0xa6, - /* (2^236)P */ 0x55, 0xa3, 0x13, 0x92, 0x4e, 0x93, 0x7d, 0xec, 0xca, 0x57, 0xfb, 0x37, 0xae, 0xd2, 0x18, 0x2e, 0x54, 0x05, 0x6c, 0xd1, 0x28, 0xca, 0x90, 0x40, 0x82, 0x2e, 0x79, 0xc6, 0x5a, 0xc7, 0xdd, 0x84, 0x93, 0xdf, 0x15, 0xb8, 0x1f, 0xb1, 0xf9, 0xaf, 0x2c, 0xe5, 0x32, 0xcd, 0xc2, 0x99, 0x6d, 0xac, 0x85, 0x5c, 0x63, 0xd3, 0xe2, 0xff, 0x24, 0xda, - /* (2^237)P */ 0x2d, 0x8d, 0xfd, 0x65, 0xcc, 0xe5, 0x02, 0xa0, 0xe5, 0xb9, 0xec, 0x59, 0x09, 0x50, 0x27, 0xb7, 0x3d, 0x2a, 0x79, 0xb2, 0x76, 0x5d, 0x64, 0x95, 0xf8, 0xc5, 0xaf, 0x8a, 0x62, 0x11, 0x5c, 0x56, 0x1c, 0x05, 0x64, 0x9e, 0x5e, 0xbd, 0x54, 0x04, 0xe6, 0x9e, 0xab, 0xe6, 0x22, 0x7e, 0x42, 0x54, 0xb5, 0xa5, 0xd0, 0x8d, 0x28, 0x6b, 0x0f, 0x0b, - /* (2^238)P */ 0x2d, 0xb2, 0x8c, 0x59, 0x10, 0x37, 0x84, 0x3b, 0x9b, 0x65, 0x1b, 0x0f, 0x10, 0xf9, 0xea, 0x60, 0x1b, 0x02, 0xf5, 0xee, 0x8b, 0xe6, 0x32, 0x7d, 0x10, 0x7f, 0x5f, 0x8c, 0x72, 0x09, 0x4e, 0x1f, 0x29, 0xff, 0x65, 0xcb, 0x3e, 0x3a, 0xd2, 0x96, 0x50, 0x1e, 0xea, 0x64, 0x99, 0xb5, 0x4c, 0x7a, 0x69, 0xb8, 0x95, 0xae, 0x48, 0xc0, 0x7c, 0xb1, - /* (2^239)P */ 0xcd, 0x7c, 0x4f, 0x3e, 0xea, 0xf3, 0x90, 0xcb, 0x12, 0x76, 0xd1, 0x17, 0xdc, 0x0d, 0x13, 0x0f, 0xfd, 0x4d, 0xb5, 0x1f, 0xe4, 0xdd, 0xf2, 0x4d, 0x58, 0xea, 0xa5, 0x66, 0x92, 0xcf, 0xe5, 0x54, 0xea, 0x9b, 0x35, 0x83, 0x1a, 0x44, 0x8e, 0x62, 0x73, 0x45, 0x98, 0xa3, 0x89, 0x95, 0x52, 0x93, 0x1a, 0x8d, 0x63, 0x0f, 0xc2, 0x57, 0x3c, 0xb1, - /* (2^240)P */ 0x72, 0xb4, 0xdf, 0x51, 0xb7, 0xf6, 0x52, 0xa2, 0x14, 0x56, 0xe5, 0x0a, 0x2e, 0x75, 0x81, 0x02, 0xee, 0x93, 0x48, 0x0a, 0x92, 0x4e, 0x0c, 0x0f, 0xdf, 0x09, 0x89, 0x99, 0xf6, 0xf9, 0x22, 0xa2, 0x32, 0xf8, 0xb0, 0x76, 0x0c, 0xb2, 0x4d, 0x6e, 0xbe, 0x83, 0x35, 0x61, 0x44, 0xd2, 0x58, 0xc7, 0xdd, 0x14, 0xcf, 0xc3, 0x4b, 0x7c, 0x07, 0xee, - /* (2^241)P */ 0x8b, 0x03, 0xee, 0xcb, 0xa7, 0x2e, 0x28, 0xbd, 0x97, 0xd1, 0x4c, 0x2b, 0xd1, 0x92, 0x67, 0x5b, 0x5a, 0x12, 0xbf, 0x29, 0x17, 0xfc, 0x50, 0x09, 0x74, 0x76, 0xa2, 0xd4, 0x82, 0xfd, 0x2c, 0x0c, 0x90, 0xf7, 0xe7, 0xe5, 0x9a, 0x2c, 0x16, 0x40, 0xb9, 0x6c, 0xd9, 0xe0, 0x22, 0x9e, 0xf8, 0xdd, 0x73, 0xe4, 0x7b, 0x9e, 0xbe, 0x4f, 0x66, 0x22, - /* (2^242)P */ 0xa4, 0x10, 0xbe, 0xb8, 0x83, 0x3a, 0x77, 0x8e, 0xea, 0x0a, 0xc4, 0x97, 0x3e, 0xb6, 0x6c, 0x81, 0xd7, 0x65, 0xd9, 0xf7, 0xae, 0xe6, 0xbe, 0xab, 0x59, 0x81, 0x29, 0x4b, 0xff, 0xe1, 0x0f, 0xc3, 0x2b, 0xad, 0x4b, 0xef, 0xc4, 0x50, 0x9f, 0x88, 0x31, 0xf2, 0xde, 0x80, 0xd6, 0xf4, 0x20, 0x9c, 0x77, 0x9b, 0xbe, 0xbe, 0x08, 0xf5, 0xf0, 0x95, - /* (2^243)P */ 0x0e, 0x7c, 0x7b, 0x7c, 0xb3, 0xd8, 0x83, 0xfc, 0x8c, 0x75, 0x51, 0x74, 0x1b, 0xe1, 0x6d, 0x11, 0x05, 0x46, 0x24, 0x0d, 0xa4, 0x2b, 0x32, 0xfd, 0x2c, 0x4e, 0x21, 0xdf, 0x39, 0x6b, 0x96, 0xfc, 0xff, 0x92, 0xfc, 0x35, 0x0d, 0x9a, 0x4b, 0xc0, 0x70, 0x46, 0x32, 0x7d, 0xc0, 0xc4, 0x04, 0xe0, 0x2d, 0x83, 0xa7, 0x00, 0xc7, 0xcb, 0xb4, 0x8f, - /* (2^244)P */ 0xa9, 0x5a, 0x7f, 0x0e, 0xdd, 0x2c, 0x85, 0xaa, 0x4d, 0xac, 0xde, 0xb3, 0xb6, 0xaf, 0xe6, 0xd1, 0x06, 0x7b, 0x2c, 0xa4, 0x01, 0x19, 0x22, 0x7d, 0x78, 0xf0, 0x3a, 0xea, 0x89, 0xfe, 0x21, 0x61, 0x6d, 0xb8, 0xfe, 0xa5, 0x2a, 0xab, 0x0d, 0x7b, 0x51, 0x39, 0xb6, 0xde, 0xbc, 0xf0, 0xc5, 0x48, 0xd7, 0x09, 0x82, 0x6e, 0x66, 0x75, 0xc5, 0xcd, - /* (2^245)P */ 0xee, 0xdf, 0x2b, 0x6c, 0xa8, 0xde, 0x61, 0xe1, 0x27, 0xfa, 0x2a, 0x0f, 0x68, 0xe7, 0x7a, 0x9b, 0x13, 0xe9, 0x56, 0xd2, 0x1c, 0x3d, 0x2f, 0x3c, 0x7a, 0xf6, 0x6f, 0x45, 0xee, 0xe8, 0xf4, 0xa0, 0xa6, 0xe8, 0xa5, 0x27, 0xee, 0xf2, 0x85, 0xa9, 0xd5, 0x0e, 0xa9, 0x26, 0x60, 0xfe, 0xee, 0xc7, 0x59, 0x99, 0x5e, 0xa3, 0xdf, 0x23, 0x36, 0xd5, - /* (2^246)P */ 0x15, 0x66, 0x6f, 0xd5, 0x78, 0xa4, 0x0a, 0xf7, 0xb1, 0xe8, 0x75, 0x6b, 0x48, 0x7d, 0xa6, 0x4d, 0x3d, 0x36, 0x9b, 0xc7, 0xcc, 0x68, 0x9a, 0xfe, 0x2f, 0x39, 0x2a, 0x51, 0x31, 0x39, 0x7d, 0x73, 0x6f, 0xc8, 0x74, 0x72, 0x6f, 0x6e, 0xda, 0x5f, 0xad, 0x48, 0xc8, 0x40, 0xe1, 0x06, 0x01, 0x36, 0xa1, 0x88, 0xc8, 0x99, 0x9c, 0xd1, 0x11, 0x8f, - /* (2^247)P */ 0xab, 0xc5, 0xcb, 0xcf, 0xbd, 0x73, 0x21, 0xd0, 0x82, 0xb1, 0x2e, 0x2d, 0xd4, 0x36, 0x1b, 0xed, 0xa9, 0x8a, 0x26, 0x79, 0xc4, 0x17, 0xae, 0xe5, 0x09, 0x0a, 0x0c, 0xa4, 0x21, 0xa0, 0x6e, 0xdd, 0x62, 0x8e, 0x44, 0x62, 0xcc, 0x50, 0xff, 0x93, 0xb3, 0x9a, 0x72, 0x8c, 0x3f, 0xa1, 0xa6, 0x4d, 0x87, 0xd5, 0x1c, 0x5a, 0xc0, 0x0b, 0x1a, 0xd6, - /* (2^248)P */ 0x67, 0x36, 0x6a, 0x1f, 0x96, 0xe5, 0x80, 0x20, 0xa9, 0xe8, 0x0b, 0x0e, 0x21, 0x29, 0x3f, 0xc8, 0x0a, 0x6d, 0x27, 0x47, 0xca, 0xd9, 0x05, 0x55, 0xbf, 0x11, 0xcf, 0x31, 0x7a, 0x37, 0xc7, 0x90, 0xa9, 0xf4, 0x07, 0x5e, 0xd5, 0xc3, 0x92, 0xaa, 0x95, 0xc8, 0x23, 0x2a, 0x53, 0x45, 0xe3, 0x3a, 0x24, 0xe9, 0x67, 0x97, 0x3a, 0x82, 0xf9, 0xa6, - /* (2^249)P */ 0x92, 0x9e, 0x6d, 0x82, 0x67, 0xe9, 0xf9, 0x17, 0x96, 0x2c, 0xa7, 0xd3, 0x89, 0xf9, 0xdb, 0xd8, 0x20, 0xc6, 0x2e, 0xec, 0x4a, 0x76, 0x64, 0xbf, 0x27, 0x40, 0xe2, 0xb4, 0xdf, 0x1f, 0xa0, 0xef, 0x07, 0x80, 0xfb, 0x8e, 0x12, 0xf8, 0xb8, 0xe1, 0xc6, 0xdf, 0x7c, 0x69, 0x35, 0x5a, 0xe1, 0x8e, 0x5d, 0x69, 0x84, 0x56, 0xb6, 0x31, 0x1c, 0x0b, - /* (2^250)P */ 0xd6, 0x94, 0x5c, 0xef, 0xbb, 0x46, 0x45, 0x44, 0x5b, 0xa1, 0xae, 0x03, 0x65, 0xdd, 0xb5, 0x66, 0x88, 0x35, 0x29, 0x95, 0x16, 0x54, 0xa6, 0xf5, 0xc9, 0x78, 0x34, 0xe6, 0x0f, 0xc4, 0x2b, 0x5b, 0x79, 0x51, 0x68, 0x48, 0x3a, 0x26, 0x87, 0x05, 0x70, 0xaf, 0x8b, 0xa6, 0xc7, 0x2e, 0xb3, 0xa9, 0x10, 0x01, 0xb0, 0xb9, 0x31, 0xfd, 0xdc, 0x80, - /* (2^251)P */ 0x25, 0xf2, 0xad, 0xd6, 0x75, 0xa3, 0x04, 0x05, 0x64, 0x8a, 0x97, 0x60, 0x27, 0x2a, 0xe5, 0x6d, 0xb0, 0x73, 0xf4, 0x07, 0x2a, 0x9d, 0xe9, 0x46, 0xb4, 0x1c, 0x51, 0xf8, 0x63, 0x98, 0x7e, 0xe5, 0x13, 0x51, 0xed, 0x98, 0x65, 0x98, 0x4f, 0x8f, 0xe7, 0x7e, 0x72, 0xd7, 0x64, 0x11, 0x2f, 0xcd, 0x12, 0xf8, 0xc4, 0x63, 0x52, 0x0f, 0x7f, 0xc4, - /* (2^252)P */ 0x5c, 0xd9, 0x85, 0x63, 0xc7, 0x8a, 0x65, 0x9a, 0x25, 0x83, 0x31, 0x73, 0x49, 0xf0, 0x93, 0x96, 0x70, 0x67, 0x6d, 0xb1, 0xff, 0x95, 0x54, 0xe4, 0xf8, 0x15, 0x6c, 0x5f, 0xbd, 0xf6, 0x0f, 0x38, 0x7b, 0x68, 0x7d, 0xd9, 0x3d, 0xf0, 0xa9, 0xa0, 0xe4, 0xd1, 0xb6, 0x34, 0x6d, 0x14, 0x16, 0xc2, 0x4c, 0x30, 0x0e, 0x67, 0xd3, 0xbe, 0x2e, 0xc0, - /* (2^253)P */ 0x06, 0x6b, 0x52, 0xc8, 0x14, 0xcd, 0xae, 0x03, 0x93, 0xea, 0xc1, 0xf2, 0xf6, 0x8b, 0xc5, 0xb6, 0xdc, 0x82, 0x42, 0x29, 0x94, 0xe0, 0x25, 0x6c, 0x3f, 0x9f, 0x5d, 0xe4, 0x96, 0xf6, 0x8e, 0x3f, 0xf9, 0x72, 0xc4, 0x77, 0x60, 0x8b, 0xa4, 0xf9, 0xa8, 0xc3, 0x0a, 0x81, 0xb1, 0x97, 0x70, 0x18, 0xab, 0xea, 0x37, 0x8a, 0x08, 0xc7, 0xe2, 0x95, - /* (2^254)P */ 0x94, 0x49, 0xd9, 0x5f, 0x76, 0x72, 0x82, 0xad, 0x2d, 0x50, 0x1a, 0x7a, 0x5b, 0xe6, 0x95, 0x1e, 0x95, 0x65, 0x87, 0x1c, 0x52, 0xd7, 0x44, 0xe6, 0x9b, 0x56, 0xcd, 0x6f, 0x05, 0xff, 0x67, 0xc5, 0xdb, 0xa2, 0xac, 0xe4, 0xa2, 0x28, 0x63, 0x5f, 0xfb, 0x0c, 0x3b, 0xf1, 0x87, 0xc3, 0x36, 0x78, 0x3f, 0x77, 0xfa, 0x50, 0x85, 0xf9, 0xd7, 0x82, - /* (2^255)P */ 0x64, 0xc0, 0xe0, 0xd8, 0x2d, 0xed, 0xcb, 0x6a, 0xfd, 0xcd, 0xbc, 0x7e, 0x9f, 0xc8, 0x85, 0xe9, 0xc1, 0x7c, 0x0f, 0xe5, 0x18, 0xea, 0xd4, 0x51, 0xad, 0x59, 0x13, 0x75, 0xd9, 0x3d, 0xd4, 0x8a, 0xb2, 0xbe, 0x78, 0x52, 0x2b, 0x52, 0x94, 0x37, 0x41, 0xd6, 0xb4, 0xb6, 0x45, 0x20, 0x76, 0xe0, 0x1f, 0x31, 0xdb, 0xb1, 0xa1, 0x43, 0xf0, 0x18, - /* (2^256)P */ 0x74, 0xa9, 0xa4, 0xa9, 0xdd, 0x6e, 0x3e, 0x68, 0xe5, 0xc3, 0x2e, 0x92, 0x17, 0xa4, 0xcb, 0x80, 0xb1, 0xf0, 0x06, 0x93, 0xef, 0xe6, 0x00, 0xe6, 0x3b, 0xb1, 0x32, 0x65, 0x7b, 0x83, 0xb6, 0x8a, 0x49, 0x1b, 0x14, 0x89, 0xee, 0xba, 0xf5, 0x6a, 0x8d, 0x36, 0xef, 0xb0, 0xd8, 0xb2, 0x16, 0x99, 0x17, 0x35, 0x02, 0x16, 0x55, 0x58, 0xdd, 0x82, - /* (2^257)P */ 0x36, 0x95, 0xe8, 0xf4, 0x36, 0x42, 0xbb, 0xc5, 0x3e, 0xfa, 0x30, 0x84, 0x9e, 0x59, 0xfd, 0xd2, 0x95, 0x42, 0xf8, 0x64, 0xd9, 0xb9, 0x0e, 0x9f, 0xfa, 0xd0, 0x7b, 0x20, 0x31, 0x77, 0x48, 0x29, 0x4d, 0xd0, 0x32, 0x57, 0x56, 0x30, 0xa6, 0x17, 0x53, 0x04, 0xbf, 0x08, 0x28, 0xec, 0xb8, 0x46, 0xc1, 0x03, 0x89, 0xdc, 0xed, 0xa0, 0x35, 0x53, - /* (2^258)P */ 0xc5, 0x7f, 0x9e, 0xd8, 0xc5, 0xba, 0x5f, 0x68, 0xc8, 0x23, 0x75, 0xea, 0x0d, 0xd9, 0x5a, 0xfd, 0x61, 0x1a, 0xa3, 0x2e, 0x45, 0x63, 0x14, 0x55, 0x86, 0x21, 0x29, 0xbe, 0xef, 0x5e, 0x50, 0xe5, 0x18, 0x59, 0xe7, 0xe3, 0xce, 0x4d, 0x8c, 0x15, 0x8f, 0x89, 0x66, 0x44, 0x52, 0x3d, 0xfa, 0xc7, 0x9a, 0x59, 0x90, 0x8e, 0xc0, 0x06, 0x3f, 0xc9, - /* (2^259)P */ 0x8e, 0x04, 0xd9, 0x16, 0x50, 0x1d, 0x8c, 0x9f, 0xd5, 0xe3, 0xce, 0xfd, 0x47, 0x04, 0x27, 0x4d, 0xc2, 0xfa, 0x71, 0xd9, 0x0b, 0xb8, 0x65, 0xf4, 0x11, 0xf3, 0x08, 0xee, 0x81, 0xc8, 0x67, 0x99, 0x0b, 0x8d, 0x77, 0xa3, 0x4f, 0xb5, 0x9b, 0xdb, 0x26, 0xf1, 0x97, 0xeb, 0x04, 0x54, 0xeb, 0x80, 0x08, 0x1d, 0x1d, 0xf6, 0x3d, 0x1f, 0x5a, 0xb8, - /* (2^260)P */ 0xb7, 0x9c, 0x9d, 0xee, 0xb9, 0x5c, 0xad, 0x0d, 0x9e, 0xfd, 0x60, 0x3c, 0x27, 0x4e, 0xa2, 0x95, 0xfb, 0x64, 0x7e, 0x79, 0x64, 0x87, 0x10, 0xb4, 0x73, 0xe0, 0x9d, 0x46, 0x4d, 0x3d, 0xee, 0x83, 0xe4, 0x16, 0x88, 0x97, 0xe6, 0x4d, 0xba, 0x70, 0xb6, 0x96, 0x7b, 0xff, 0x4b, 0xc8, 0xcf, 0x72, 0x83, 0x3e, 0x5b, 0x24, 0x2e, 0x57, 0xf1, 0x82, - /* (2^261)P */ 0x30, 0x71, 0x40, 0x51, 0x4f, 0x44, 0xbb, 0xc7, 0xf0, 0x54, 0x6e, 0x9d, 0xeb, 0x15, 0xad, 0xf8, 0x61, 0x43, 0x5a, 0xef, 0xc0, 0xb1, 0x57, 0xae, 0x03, 0x40, 0xe8, 0x68, 0x6f, 0x03, 0x20, 0x4f, 0x8a, 0x51, 0x2a, 0x9e, 0xd2, 0x45, 0xaf, 0xb4, 0xf5, 0xd4, 0x95, 0x7f, 0x3d, 0x3d, 0xb7, 0xb6, 0x28, 0xc5, 0x08, 0x8b, 0x44, 0xd6, 0x3f, 0xe7, - /* (2^262)P */ 0xa9, 0x52, 0x04, 0x67, 0xcb, 0x20, 0x63, 0xf8, 0x18, 0x01, 0x44, 0x21, 0x6a, 0x8a, 0x83, 0x48, 0xd4, 0xaf, 0x23, 0x0f, 0x35, 0x8d, 0xe5, 0x5a, 0xc4, 0x7c, 0x55, 0x46, 0x19, 0x5f, 0x35, 0xe0, 0x5d, 0x97, 0x4c, 0x2d, 0x04, 0xed, 0x59, 0xd4, 0xb0, 0xb2, 0xc6, 0xe3, 0x51, 0xe1, 0x38, 0xc6, 0x30, 0x49, 0x8f, 0xae, 0x61, 0x64, 0xce, 0xa8, - /* (2^263)P */ 0x9b, 0x64, 0x83, 0x3c, 0xd3, 0xdf, 0xb9, 0x27, 0xe7, 0x5b, 0x7f, 0xeb, 0xf3, 0x26, 0xcf, 0xb1, 0x8f, 0xaf, 0x26, 0xc8, 0x48, 0xce, 0xa1, 0xac, 0x7d, 0x10, 0x34, 0x28, 0xe1, 0x1f, 0x69, 0x03, 0x64, 0x77, 0x61, 0xdd, 0x4a, 0x9b, 0x18, 0x47, 0xf8, 0xca, 0x63, 0xc9, 0x03, 0x2d, 0x20, 0x2a, 0x69, 0x6e, 0x42, 0xd0, 0xe7, 0xaa, 0xb5, 0xf3, - /* (2^264)P */ 0xea, 0x31, 0x0c, 0x57, 0x0f, 0x3e, 0xe3, 0x35, 0xd8, 0x30, 0xa5, 0x6f, 0xdd, 0x95, 0x43, 0xc6, 0x66, 0x07, 0x4f, 0x34, 0xc3, 0x7e, 0x04, 0x10, 0x2d, 0xc4, 0x1c, 0x94, 0x52, 0x2e, 0x5b, 0x9a, 0x65, 0x2f, 0x91, 0xaa, 0x4f, 0x3c, 0xdc, 0x23, 0x18, 0xe1, 0x4f, 0x85, 0xcd, 0xf4, 0x8c, 0x51, 0xf7, 0xab, 0x4f, 0xdc, 0x15, 0x5c, 0x9e, 0xc5, - /* (2^265)P */ 0x54, 0x57, 0x23, 0x17, 0xe7, 0x82, 0x2f, 0x04, 0x7d, 0xfe, 0xe7, 0x1f, 0xa2, 0x57, 0x79, 0xe9, 0x58, 0x9b, 0xbe, 0xc6, 0x16, 0x4a, 0x17, 0x50, 0x90, 0x4a, 0x34, 0x70, 0x87, 0x37, 0x01, 0x26, 0xd8, 0xa3, 0x5f, 0x07, 0x7c, 0xd0, 0x7d, 0x05, 0x8a, 0x93, 0x51, 0x2f, 0x99, 0xea, 0xcf, 0x00, 0xd8, 0xc7, 0xe6, 0x9b, 0x8c, 0x62, 0x45, 0x87, - /* (2^266)P */ 0xc3, 0xfd, 0x29, 0x66, 0xe7, 0x30, 0x29, 0x77, 0xe0, 0x0d, 0x63, 0x5b, 0xe6, 0x90, 0x1a, 0x1e, 0x99, 0xc2, 0xa7, 0xab, 0xff, 0xa7, 0xbd, 0x79, 0x01, 0x97, 0xfd, 0x27, 0x1b, 0x43, 0x2b, 0xe6, 0xfe, 0x5e, 0xf1, 0xb9, 0x35, 0x38, 0x08, 0x25, 0x55, 0x90, 0x68, 0x2e, 0xc3, 0x67, 0x39, 0x9f, 0x2b, 0x2c, 0x70, 0x48, 0x8c, 0x47, 0xee, 0x56, - /* (2^267)P */ 0xf7, 0x32, 0x70, 0xb5, 0xe6, 0x42, 0xfd, 0x0a, 0x39, 0x9b, 0x07, 0xfe, 0x0e, 0xf4, 0x47, 0xba, 0x6a, 0x3f, 0xf5, 0x2c, 0x15, 0xf3, 0x60, 0x3f, 0xb1, 0x83, 0x7b, 0x2e, 0x34, 0x58, 0x1a, 0x6e, 0x4a, 0x49, 0x05, 0x45, 0xca, 0xdb, 0x00, 0x01, 0x0c, 0x42, 0x5e, 0x60, 0x40, 0x5f, 0xd9, 0xc7, 0x3a, 0x9e, 0x1c, 0x8d, 0xab, 0x11, 0x55, 0x65, - /* (2^268)P */ 0x87, 0x40, 0xb7, 0x0d, 0xaa, 0x34, 0x89, 0x90, 0x75, 0x6d, 0xa2, 0xfe, 0x3b, 0x6d, 0x5c, 0x39, 0x98, 0x10, 0x9e, 0x15, 0xc5, 0x35, 0xa2, 0x27, 0x23, 0x0a, 0x2d, 0x60, 0xe2, 0xa8, 0x7f, 0x3e, 0x77, 0x8f, 0xcc, 0x44, 0xcc, 0x30, 0x28, 0xe2, 0xf0, 0x04, 0x8c, 0xee, 0xe4, 0x5f, 0x68, 0x8c, 0xdf, 0x70, 0xbf, 0x31, 0xee, 0x2a, 0xfc, 0xce, - /* (2^269)P */ 0x92, 0xf2, 0xa0, 0xd9, 0x58, 0x3b, 0x7c, 0x1a, 0x99, 0x46, 0x59, 0x54, 0x60, 0x06, 0x8d, 0x5e, 0xf0, 0x22, 0xa1, 0xed, 0x92, 0x8a, 0x4d, 0x76, 0x95, 0x05, 0x0b, 0xff, 0xfc, 0x9a, 0xd1, 0xcc, 0x05, 0xb9, 0x5e, 0x99, 0xe8, 0x2a, 0x76, 0x7b, 0xfd, 0xa6, 0xe2, 0xd1, 0x1a, 0xd6, 0x76, 0x9f, 0x2f, 0x0e, 0xd1, 0xa8, 0x77, 0x5a, 0x40, 0x5a, - /* (2^270)P */ 0xff, 0xf9, 0x3f, 0xa9, 0xa6, 0x6c, 0x6d, 0x03, 0x8b, 0xa7, 0x10, 0x5d, 0x3f, 0xec, 0x3e, 0x1c, 0x0b, 0x6b, 0xa2, 0x6a, 0x22, 0xa9, 0x28, 0xd0, 0x66, 0xc9, 0xc2, 0x3d, 0x47, 0x20, 0x7d, 0xa6, 0x1d, 0xd8, 0x25, 0xb5, 0xf2, 0xf9, 0x70, 0x19, 0x6b, 0xf8, 0x43, 0x36, 0xc5, 0x1f, 0xe4, 0x5a, 0x4c, 0x13, 0xe4, 0x6d, 0x08, 0x0b, 0x1d, 0xb1, - /* (2^271)P */ 0x3f, 0x20, 0x9b, 0xfb, 0xec, 0x7d, 0x31, 0xc5, 0xfc, 0x88, 0x0b, 0x30, 0xed, 0x36, 0xc0, 0x63, 0xb1, 0x7d, 0x10, 0xda, 0xb6, 0x2e, 0xad, 0xf3, 0xec, 0x94, 0xe7, 0xec, 0xb5, 0x9c, 0xfe, 0xf5, 0x35, 0xf0, 0xa2, 0x2d, 0x7f, 0xca, 0x6b, 0x67, 0x1a, 0xf6, 0xb3, 0xda, 0x09, 0x2a, 0xaa, 0xdf, 0xb1, 0xca, 0x9b, 0xfb, 0xeb, 0xb3, 0xcd, 0xc0, - /* (2^272)P */ 0xcd, 0x4d, 0x89, 0x00, 0xa4, 0x3b, 0x48, 0xf0, 0x76, 0x91, 0x35, 0xa5, 0xf8, 0xc9, 0xb6, 0x46, 0xbc, 0xf6, 0x9a, 0x45, 0x47, 0x17, 0x96, 0x80, 0x5b, 0x3a, 0x28, 0x33, 0xf9, 0x5a, 0xef, 0x43, 0x07, 0xfe, 0x3b, 0xf4, 0x8e, 0x19, 0xce, 0xd2, 0x94, 0x4b, 0x6d, 0x8e, 0x67, 0x20, 0xc7, 0x4f, 0x2f, 0x59, 0x8e, 0xe1, 0xa1, 0xa9, 0xf9, 0x0e, - /* (2^273)P */ 0xdc, 0x7b, 0xb5, 0x50, 0x2e, 0xe9, 0x7e, 0x8b, 0x78, 0xa1, 0x38, 0x96, 0x22, 0xc3, 0x61, 0x67, 0x6d, 0xc8, 0x58, 0xed, 0x41, 0x1d, 0x5d, 0x86, 0x98, 0x7f, 0x2f, 0x1b, 0x8d, 0x3e, 0xaa, 0xc1, 0xd2, 0x0a, 0xf3, 0xbf, 0x95, 0x04, 0xf3, 0x10, 0x3c, 0x2b, 0x7f, 0x90, 0x46, 0x04, 0xaa, 0x6a, 0xa9, 0x35, 0x76, 0xac, 0x49, 0xb5, 0x00, 0x45, - /* (2^274)P */ 0xb1, 0x93, 0x79, 0x84, 0x4a, 0x2a, 0x30, 0x78, 0x16, 0xaa, 0xc5, 0x74, 0x06, 0xce, 0xa5, 0xa7, 0x32, 0x86, 0xe0, 0xf9, 0x10, 0xd2, 0x58, 0x76, 0xfb, 0x66, 0x49, 0x76, 0x3a, 0x90, 0xba, 0xb5, 0xcc, 0x99, 0xcd, 0x09, 0xc1, 0x9a, 0x74, 0x23, 0xdf, 0x0c, 0xfe, 0x99, 0x52, 0x80, 0xa3, 0x7c, 0x1c, 0x71, 0x5f, 0x2c, 0x49, 0x57, 0xf4, 0xf9, - /* (2^275)P */ 0x6d, 0xbf, 0x52, 0xe6, 0x25, 0x98, 0xed, 0xcf, 0xe3, 0xbc, 0x08, 0xa2, 0x1a, 0x90, 0xae, 0xa0, 0xbf, 0x07, 0x15, 0xad, 0x0a, 0x9f, 0x3e, 0x47, 0x44, 0xc2, 0x10, 0x46, 0xa6, 0x7a, 0x9e, 0x2f, 0x57, 0xbc, 0xe2, 0xf0, 0x1d, 0xd6, 0x9a, 0x06, 0xed, 0xfc, 0x54, 0x95, 0x92, 0x15, 0xa2, 0xf7, 0x8d, 0x6b, 0xef, 0xb2, 0x05, 0xed, 0x5c, 0x63, - /* (2^276)P */ 0xbc, 0x0b, 0x27, 0x3a, 0x3a, 0xf8, 0xe1, 0x48, 0x02, 0x7e, 0x27, 0xe6, 0x81, 0x62, 0x07, 0x73, 0x74, 0xe5, 0x52, 0xd7, 0xf8, 0x26, 0xca, 0x93, 0x4d, 0x3e, 0x9b, 0x55, 0x09, 0x8e, 0xe3, 0xd7, 0xa6, 0xe3, 0xb6, 0x2a, 0xa9, 0xb3, 0xb0, 0xa0, 0x8c, 0x01, 0xbb, 0x07, 0x90, 0x78, 0x6d, 0x6d, 0xe9, 0xf0, 0x7a, 0x90, 0xbd, 0xdc, 0x0c, 0x36, - /* (2^277)P */ 0x7f, 0x20, 0x12, 0x0f, 0x40, 0x00, 0x53, 0xd8, 0x0c, 0x27, 0x47, 0x47, 0x22, 0x80, 0xfb, 0x62, 0xe4, 0xa7, 0xf7, 0xbd, 0x42, 0xa5, 0xc3, 0x2b, 0xb2, 0x7f, 0x50, 0xcc, 0xe2, 0xfb, 0xd5, 0xc0, 0x63, 0xdd, 0x24, 0x5f, 0x7c, 0x08, 0x91, 0xbf, 0x6e, 0x47, 0x44, 0xd4, 0x6a, 0xc0, 0xc3, 0x09, 0x39, 0x27, 0xdd, 0xc7, 0xca, 0x06, 0x29, 0x55, - /* (2^278)P */ 0x76, 0x28, 0x58, 0xb0, 0xd2, 0xf3, 0x0f, 0x04, 0xe9, 0xc9, 0xab, 0x66, 0x5b, 0x75, 0x51, 0xdc, 0xe5, 0x8f, 0xe8, 0x1f, 0xdb, 0x03, 0x0f, 0xb0, 0x7d, 0xf9, 0x20, 0x64, 0x89, 0xe9, 0xdc, 0xe6, 0x24, 0xc3, 0xd5, 0xd2, 0x41, 0xa6, 0xe4, 0xe3, 0xc4, 0x79, 0x7c, 0x0f, 0xa1, 0x61, 0x2f, 0xda, 0xa4, 0xc9, 0xfd, 0xad, 0x5c, 0x65, 0x6a, 0xf3, - /* (2^279)P */ 0xd5, 0xab, 0x72, 0x7a, 0x3b, 0x59, 0xea, 0xcf, 0xd5, 0x17, 0xd2, 0xb2, 0x5f, 0x2d, 0xab, 0xad, 0x9e, 0x88, 0x64, 0x55, 0x96, 0x6e, 0xf3, 0x44, 0xa9, 0x11, 0xf5, 0xf8, 0x3a, 0xf1, 0xcd, 0x79, 0x4c, 0x99, 0x6d, 0x23, 0x6a, 0xa0, 0xc2, 0x1a, 0x19, 0x45, 0xb5, 0xd8, 0x95, 0x2f, 0x49, 0xe9, 0x46, 0x39, 0x26, 0x60, 0x04, 0x15, 0x8b, 0xcc, - /* (2^280)P */ 0x66, 0x0c, 0xf0, 0x54, 0x41, 0x02, 0x91, 0xab, 0xe5, 0x85, 0x8a, 0x44, 0xa6, 0x34, 0x96, 0x32, 0xc0, 0xdf, 0x6c, 0x41, 0x39, 0xd4, 0xc6, 0xe1, 0xe3, 0x81, 0xb0, 0x4c, 0x34, 0x4f, 0xe5, 0xf4, 0x35, 0x46, 0x1f, 0xeb, 0x75, 0xfd, 0x43, 0x37, 0x50, 0x99, 0xab, 0xad, 0xb7, 0x8c, 0xa1, 0x57, 0xcb, 0xe6, 0xce, 0x16, 0x2e, 0x85, 0xcc, 0xf9, - /* (2^281)P */ 0x63, 0xd1, 0x3f, 0x9e, 0xa2, 0x17, 0x2e, 0x1d, 0x3e, 0xce, 0x48, 0x2d, 0xbb, 0x8f, 0x69, 0xc9, 0xa6, 0x3d, 0x4e, 0xfe, 0x09, 0x56, 0xb3, 0x02, 0x5f, 0x99, 0x97, 0x0c, 0x54, 0xda, 0x32, 0x97, 0x9b, 0xf4, 0x95, 0xf1, 0xad, 0xe3, 0x2b, 0x04, 0xa7, 0x9b, 0x3f, 0xbb, 0xe7, 0x87, 0x2e, 0x1f, 0x8b, 0x4b, 0x7a, 0xa4, 0x43, 0x0c, 0x0f, 0x35, - /* (2^282)P */ 0x05, 0xdc, 0xe0, 0x2c, 0xa1, 0xc1, 0xd0, 0xf1, 0x1f, 0x4e, 0xc0, 0x6c, 0x35, 0x7b, 0xca, 0x8f, 0x8b, 0x02, 0xb1, 0xf7, 0xd6, 0x2e, 0xe7, 0x93, 0x80, 0x85, 0x18, 0x88, 0x19, 0xb9, 0xb4, 0x4a, 0xbc, 0xeb, 0x5a, 0x78, 0x38, 0xed, 0xc6, 0x27, 0x2a, 0x74, 0x76, 0xf0, 0x1b, 0x79, 0x92, 0x2f, 0xd2, 0x81, 0x98, 0xdf, 0xa9, 0x50, 0x19, 0xeb, - /* (2^283)P */ 0xb5, 0xe7, 0xb4, 0x11, 0x3a, 0x81, 0xb6, 0xb4, 0xf8, 0xa2, 0xb3, 0x6c, 0xfc, 0x9d, 0xe0, 0xc0, 0xe0, 0x59, 0x7f, 0x05, 0x37, 0xef, 0x2c, 0xa9, 0x3a, 0x24, 0xac, 0x7b, 0x25, 0xa0, 0x55, 0xd2, 0x44, 0x82, 0x82, 0x6e, 0x64, 0xa3, 0x58, 0xc8, 0x67, 0xae, 0x26, 0xa7, 0x0f, 0x42, 0x63, 0xe1, 0x93, 0x01, 0x52, 0x19, 0xaf, 0x49, 0x3e, 0x33, - /* (2^284)P */ 0x05, 0x85, 0xe6, 0x66, 0xaf, 0x5f, 0xdf, 0xbf, 0x9d, 0x24, 0x62, 0x60, 0x90, 0xe2, 0x4c, 0x7d, 0x4e, 0xc3, 0x74, 0x5d, 0x4f, 0x53, 0xf3, 0x63, 0x13, 0xf4, 0x74, 0x28, 0x6b, 0x7d, 0x57, 0x0c, 0x9d, 0x84, 0xa7, 0x1a, 0xff, 0xa0, 0x79, 0xdf, 0xfc, 0x65, 0x98, 0x8e, 0x22, 0x0d, 0x62, 0x7e, 0xf2, 0x34, 0x60, 0x83, 0x05, 0x14, 0xb1, 0xc1, - /* (2^285)P */ 0x64, 0x22, 0xcc, 0xdf, 0x5c, 0xbc, 0x88, 0x68, 0x4c, 0xd9, 0xbc, 0x0e, 0xc9, 0x8b, 0xb4, 0x23, 0x52, 0xad, 0xb0, 0xb3, 0xf1, 0x17, 0xd8, 0x15, 0x04, 0x6b, 0x99, 0xf0, 0xc4, 0x7d, 0x48, 0x22, 0x4a, 0xf8, 0x6f, 0xaa, 0x88, 0x0d, 0xc5, 0x5e, 0xa9, 0x1c, 0x61, 0x3d, 0x95, 0xa9, 0x7b, 0x6a, 0x79, 0x33, 0x0a, 0x2b, 0x99, 0xe3, 0x4e, 0x48, - /* (2^286)P */ 0x6b, 0x9b, 0x6a, 0x2a, 0xf1, 0x60, 0x31, 0xb4, 0x73, 0xd1, 0x87, 0x45, 0x9c, 0x15, 0x58, 0x4b, 0x91, 0x6d, 0x94, 0x1c, 0x41, 0x11, 0x4a, 0x83, 0xec, 0xaf, 0x65, 0xbc, 0x34, 0xaa, 0x26, 0xe2, 0xaf, 0xed, 0x46, 0x05, 0x4e, 0xdb, 0xc6, 0x4e, 0x10, 0x28, 0x4e, 0x72, 0xe5, 0x31, 0xa3, 0x20, 0xd7, 0xb1, 0x96, 0x64, 0xf6, 0xce, 0x08, 0x08, - /* (2^287)P */ 0x16, 0xa9, 0x5c, 0x9f, 0x9a, 0xb4, 0xb8, 0xc8, 0x32, 0x78, 0xc0, 0x3a, 0xd9, 0x5f, 0x94, 0xac, 0x3a, 0x42, 0x1f, 0x43, 0xd6, 0x80, 0x47, 0x2c, 0xdc, 0x76, 0x27, 0xfa, 0x50, 0xe5, 0xa1, 0xe4, 0xc3, 0xcb, 0x61, 0x31, 0xe1, 0x2e, 0xde, 0x81, 0x3b, 0x77, 0x1c, 0x39, 0x3c, 0xdb, 0xda, 0x87, 0x4b, 0x84, 0x12, 0xeb, 0xdd, 0x54, 0xbf, 0xe7, - /* (2^288)P */ 0xbf, 0xcb, 0x73, 0x21, 0x3d, 0x7e, 0x13, 0x8c, 0xa6, 0x34, 0x21, 0x2b, 0xa5, 0xe4, 0x9f, 0x8e, 0x9c, 0x01, 0x9c, 0x43, 0xd9, 0xc7, 0xb9, 0xf1, 0xbe, 0x7f, 0x45, 0x51, 0x97, 0xa1, 0x8e, 0x01, 0xf8, 0xbd, 0xd2, 0xbf, 0x81, 0x3a, 0x8b, 0xab, 0xe4, 0x89, 0xb7, 0xbd, 0xf2, 0xcd, 0xa9, 0x8a, 0x8a, 0xde, 0xfb, 0x8a, 0x55, 0x12, 0x7b, 0x17, - /* (2^289)P */ 0x1b, 0x95, 0x58, 0x4d, 0xe6, 0x51, 0x31, 0x52, 0x1c, 0xd8, 0x15, 0x84, 0xb1, 0x0d, 0x36, 0x25, 0x88, 0x91, 0x46, 0x71, 0x42, 0x56, 0xe2, 0x90, 0x08, 0x9e, 0x77, 0x1b, 0xee, 0x22, 0x3f, 0xec, 0xee, 0x8c, 0x7b, 0x2e, 0x79, 0xc4, 0x6c, 0x07, 0xa1, 0x7e, 0x52, 0xf5, 0x26, 0x5c, 0x84, 0x2a, 0x50, 0x6e, 0x82, 0xb3, 0x76, 0xda, 0x35, 0x16, - /* (2^290)P */ 0x0a, 0x6f, 0x99, 0x87, 0xc0, 0x7d, 0x8a, 0xb2, 0xca, 0xae, 0xe8, 0x65, 0x98, 0x0f, 0xb3, 0x44, 0xe1, 0xdc, 0x52, 0x79, 0x75, 0xec, 0x8f, 0x95, 0x87, 0x45, 0xd1, 0x32, 0x18, 0x55, 0x15, 0xce, 0x64, 0x9b, 0x08, 0x4f, 0x2c, 0xea, 0xba, 0x1c, 0x57, 0x06, 0x63, 0xc8, 0xb1, 0xfd, 0xc5, 0x67, 0xe7, 0x1f, 0x87, 0x9e, 0xde, 0x72, 0x7d, 0xec, - /* (2^291)P */ 0x36, 0x8b, 0x4d, 0x2c, 0xc2, 0x46, 0xe8, 0x96, 0xac, 0x0b, 0x8c, 0xc5, 0x09, 0x10, 0xfc, 0xf2, 0xda, 0xea, 0x22, 0xb2, 0xd3, 0x89, 0xeb, 0xb2, 0x85, 0x0f, 0xff, 0x59, 0x50, 0x2c, 0x99, 0x5a, 0x1f, 0xec, 0x2a, 0x6f, 0xec, 0xcf, 0xe9, 0xce, 0x12, 0x6b, 0x19, 0xd8, 0xde, 0x9b, 0xce, 0x0e, 0x6a, 0xaa, 0xe1, 0x32, 0xea, 0x4c, 0xfe, 0x92, - /* (2^292)P */ 0x5f, 0x17, 0x70, 0x53, 0x26, 0x03, 0x0b, 0xab, 0xd1, 0xc1, 0x42, 0x0b, 0xab, 0x2b, 0x3d, 0x31, 0xa4, 0xd5, 0x2b, 0x5e, 0x00, 0xd5, 0x9a, 0x22, 0x34, 0xe0, 0x53, 0x3f, 0x59, 0x7f, 0x2c, 0x6d, 0x72, 0x9a, 0xa4, 0xbe, 0x3d, 0x42, 0x05, 0x1b, 0xf2, 0x7f, 0x88, 0x56, 0xd1, 0x7c, 0x7d, 0x6b, 0x9f, 0x43, 0xfe, 0x65, 0x19, 0xae, 0x9c, 0x4c, - /* (2^293)P */ 0xf3, 0x7c, 0x20, 0xa9, 0xfc, 0xf2, 0xf2, 0x3b, 0x3c, 0x57, 0x41, 0x94, 0xe5, 0xcc, 0x6a, 0x37, 0x5d, 0x09, 0xf2, 0xab, 0xc2, 0xca, 0x60, 0x38, 0x6b, 0x7a, 0xe1, 0x78, 0x2b, 0xc1, 0x1d, 0xe8, 0xfd, 0xbc, 0x3d, 0x5c, 0xa2, 0xdb, 0x49, 0x20, 0x79, 0xe6, 0x1b, 0x9b, 0x65, 0xd9, 0x6d, 0xec, 0x57, 0x1d, 0xd2, 0xe9, 0x90, 0xeb, 0x43, 0x7b, - /* (2^294)P */ 0x2a, 0x8b, 0x2e, 0x19, 0x18, 0x10, 0xb8, 0x83, 0xe7, 0x7d, 0x2d, 0x9a, 0x3a, 0xe5, 0xd1, 0xe4, 0x7c, 0x38, 0xe5, 0x59, 0x2a, 0x6e, 0xd9, 0x01, 0x29, 0x3d, 0x23, 0xf7, 0x52, 0xba, 0x61, 0x04, 0x9a, 0xde, 0xc4, 0x31, 0x50, 0xeb, 0x1b, 0xaa, 0xde, 0x39, 0x58, 0xd8, 0x1b, 0x1e, 0xfc, 0x57, 0x9a, 0x28, 0x43, 0x9e, 0x97, 0x5e, 0xaa, 0xa3, - /* (2^295)P */ 0x97, 0x0a, 0x74, 0xc4, 0x39, 0x99, 0x6b, 0x40, 0xc7, 0x3e, 0x8c, 0xa7, 0xb1, 0x4e, 0x9a, 0x59, 0x6e, 0x1c, 0xfe, 0xfc, 0x2a, 0x5e, 0x73, 0x2b, 0x8c, 0xa9, 0x71, 0xf5, 0xda, 0x6b, 0x15, 0xab, 0xf7, 0xbe, 0x2a, 0x44, 0x5f, 0xba, 0xae, 0x67, 0x93, 0xc5, 0x86, 0xc1, 0xb8, 0xdf, 0xdc, 0xcb, 0xd7, 0xff, 0xb1, 0x71, 0x7c, 0x6f, 0x88, 0xf8, - /* (2^296)P */ 0x3f, 0x89, 0xb1, 0xbf, 0x24, 0x16, 0xac, 0x56, 0xfe, 0xdf, 0x94, 0x71, 0xbf, 0xd6, 0x57, 0x0c, 0xb4, 0x77, 0x37, 0xaa, 0x2a, 0x70, 0x76, 0x49, 0xaf, 0x0c, 0x97, 0x8e, 0x78, 0x2a, 0x67, 0xc9, 0x3b, 0x3d, 0x5b, 0x01, 0x2f, 0xda, 0xd5, 0xa8, 0xde, 0x02, 0xa9, 0xac, 0x76, 0x00, 0x0b, 0x46, 0xc6, 0x2d, 0xdc, 0x08, 0xf4, 0x10, 0x2c, 0xbe, - /* (2^297)P */ 0xcb, 0x07, 0xf9, 0x91, 0xc6, 0xd5, 0x3e, 0x54, 0x63, 0xae, 0xfc, 0x10, 0xbe, 0x3a, 0x20, 0x73, 0x4e, 0x65, 0x0e, 0x2d, 0x86, 0x77, 0x83, 0x9d, 0xe2, 0x0a, 0xe9, 0xac, 0x22, 0x52, 0x76, 0xd4, 0x6e, 0xfa, 0xe0, 0x09, 0xef, 0x78, 0x82, 0x9f, 0x26, 0xf9, 0x06, 0xb5, 0xe7, 0x05, 0x0e, 0xf2, 0x46, 0x72, 0x93, 0xd3, 0x24, 0xbd, 0x87, 0x60, - /* (2^298)P */ 0x14, 0x55, 0x84, 0x7b, 0x6c, 0x60, 0x80, 0x73, 0x8c, 0xbe, 0x2d, 0xd6, 0x69, 0xd6, 0x17, 0x26, 0x44, 0x9f, 0x88, 0xa2, 0x39, 0x7c, 0x89, 0xbc, 0x6d, 0x9e, 0x46, 0xb6, 0x68, 0x66, 0xea, 0xdc, 0x31, 0xd6, 0x21, 0x51, 0x9f, 0x28, 0x28, 0xaf, 0x9e, 0x47, 0x2c, 0x4c, 0x8f, 0xf3, 0xaf, 0x1f, 0xe4, 0xab, 0xac, 0xe9, 0x0c, 0x91, 0x3a, 0x61, - /* (2^299)P */ 0xb0, 0x37, 0x55, 0x4b, 0xe9, 0xc3, 0xb1, 0xce, 0x42, 0xe6, 0xc5, 0x11, 0x7f, 0x2c, 0x11, 0xfc, 0x4e, 0x71, 0x17, 0x00, 0x74, 0x7f, 0xbf, 0x07, 0x4d, 0xfd, 0x40, 0xb2, 0x87, 0xb0, 0xef, 0x1f, 0x35, 0x2c, 0x2d, 0xd7, 0xe1, 0xe4, 0xad, 0x0e, 0x7f, 0x63, 0x66, 0x62, 0x23, 0x41, 0xf6, 0xc1, 0x14, 0xa6, 0xd7, 0xa9, 0x11, 0x56, 0x9d, 0x1b, - /* (2^300)P */ 0x02, 0x82, 0x42, 0x18, 0x4f, 0x1b, 0xc9, 0x5d, 0x78, 0x5f, 0xee, 0xed, 0x01, 0x49, 0x8f, 0xf2, 0xa0, 0xe2, 0x6e, 0xbb, 0x6b, 0x04, 0x8d, 0xb2, 0x41, 0xae, 0xc8, 0x1b, 0x59, 0x34, 0xb8, 0x2a, 0xdb, 0x1f, 0xd2, 0x52, 0xdf, 0x3f, 0x35, 0x00, 0x8b, 0x61, 0xbc, 0x97, 0xa0, 0xc4, 0x77, 0xd1, 0xe4, 0x2c, 0x59, 0x68, 0xff, 0x30, 0xf2, 0xe2, - /* (2^301)P */ 0x79, 0x08, 0xb1, 0xdb, 0x55, 0xae, 0xd0, 0xed, 0xda, 0xa0, 0xec, 0x6c, 0xae, 0x68, 0xf2, 0x0b, 0x61, 0xb3, 0xf5, 0x21, 0x69, 0x87, 0x0b, 0x03, 0xea, 0x8a, 0x15, 0xd9, 0x7e, 0xca, 0xf7, 0xcd, 0xf3, 0x33, 0xb3, 0x4c, 0x5b, 0x23, 0x4e, 0x6f, 0x90, 0xad, 0x91, 0x4b, 0x4f, 0x46, 0x37, 0xe5, 0xe8, 0xb7, 0xeb, 0xd5, 0xca, 0x34, 0x4e, 0x23, - /* (2^302)P */ 0x09, 0x02, 0xdd, 0xfd, 0x70, 0xac, 0x56, 0x80, 0x36, 0x5e, 0x49, 0xd0, 0x3f, 0xc2, 0xe0, 0xba, 0x46, 0x7f, 0x5c, 0xf7, 0xc5, 0xbd, 0xd5, 0x55, 0x7d, 0x3f, 0xd5, 0x7d, 0x06, 0xdf, 0x27, 0x20, 0x4f, 0xe9, 0x30, 0xec, 0x1b, 0xa0, 0x0c, 0xd4, 0x2c, 0xe1, 0x2b, 0x65, 0x73, 0xea, 0x75, 0x35, 0xe8, 0xe6, 0x56, 0xd6, 0x07, 0x15, 0x99, 0xdf, - /* (2^303)P */ 0x4e, 0x10, 0xb7, 0xd0, 0x63, 0x8c, 0xcf, 0x16, 0x00, 0x7c, 0x58, 0xdf, 0x86, 0xdc, 0x4e, 0xca, 0x9c, 0x40, 0x5a, 0x42, 0xfd, 0xec, 0x98, 0xa4, 0x42, 0x53, 0xae, 0x16, 0x9d, 0xfd, 0x75, 0x5a, 0x12, 0x56, 0x1e, 0xc6, 0x57, 0xcc, 0x79, 0x27, 0x96, 0x00, 0xcf, 0x80, 0x4f, 0x8a, 0x36, 0x5c, 0xbb, 0xe9, 0x12, 0xdb, 0xb6, 0x2b, 0xad, 0x96, - /* (2^304)P */ 0x92, 0x32, 0x1f, 0xfd, 0xc6, 0x02, 0x94, 0x08, 0x1b, 0x60, 0x6a, 0x9f, 0x8b, 0xd6, 0xc8, 0xad, 0xd5, 0x1b, 0x27, 0x4e, 0xa4, 0x4d, 0x4a, 0x00, 0x10, 0x5f, 0x86, 0x11, 0xf5, 0xe3, 0x14, 0x32, 0x43, 0xee, 0xb9, 0xc7, 0xab, 0xf4, 0x6f, 0xe5, 0x66, 0x0c, 0x06, 0x0d, 0x96, 0x79, 0x28, 0xaf, 0x45, 0x2b, 0x56, 0xbe, 0xe4, 0x4a, 0x52, 0xd6, - /* (2^305)P */ 0x15, 0x16, 0x69, 0xef, 0x60, 0xca, 0x82, 0x25, 0x0f, 0xc6, 0x30, 0xa0, 0x0a, 0xd1, 0x83, 0x29, 0xcd, 0xb6, 0x89, 0x6c, 0xf5, 0xb2, 0x08, 0x38, 0xe6, 0xca, 0x6b, 0x19, 0x93, 0xc6, 0x5f, 0x75, 0x8e, 0x60, 0x34, 0x23, 0xc4, 0x13, 0x17, 0x69, 0x55, 0xcc, 0x72, 0x9c, 0x2b, 0x6c, 0x80, 0xf4, 0x4b, 0x8b, 0xb6, 0x97, 0x65, 0x07, 0xb6, 0xfb, - /* (2^306)P */ 0x01, 0x99, 0x74, 0x28, 0xa6, 0x67, 0xa3, 0xe5, 0x25, 0xfb, 0xdf, 0x82, 0x93, 0xe7, 0x35, 0x74, 0xce, 0xe3, 0x15, 0x1c, 0x1d, 0x79, 0x52, 0x84, 0x08, 0x04, 0x2f, 0x5c, 0xb8, 0xcd, 0x7f, 0x89, 0xb0, 0x39, 0x93, 0x63, 0xc9, 0x5d, 0x06, 0x01, 0x59, 0xf7, 0x7e, 0xf1, 0x4c, 0x3d, 0x12, 0x8d, 0x69, 0x1d, 0xb7, 0x21, 0x5e, 0x88, 0x82, 0xa2, - /* (2^307)P */ 0x8e, 0x69, 0xaf, 0x9a, 0x41, 0x0d, 0x9d, 0xcf, 0x8e, 0x8d, 0x5c, 0x51, 0x6e, 0xde, 0x0e, 0x48, 0x23, 0x89, 0xe5, 0x37, 0x80, 0xd6, 0x9d, 0x72, 0x32, 0x26, 0x38, 0x2d, 0x63, 0xa0, 0xfa, 0xd3, 0x40, 0xc0, 0x8c, 0x68, 0x6f, 0x2b, 0x1e, 0x9a, 0x39, 0x51, 0x78, 0x74, 0x9a, 0x7b, 0x4a, 0x8f, 0x0c, 0xa0, 0x88, 0x60, 0xa5, 0x21, 0xcd, 0xc7, - /* (2^308)P */ 0x3a, 0x7f, 0x73, 0x14, 0xbf, 0x89, 0x6a, 0x4c, 0x09, 0x5d, 0xf2, 0x93, 0x20, 0x2d, 0xc4, 0x29, 0x86, 0x06, 0x95, 0xab, 0x22, 0x76, 0x4c, 0x54, 0xe1, 0x7e, 0x80, 0x6d, 0xab, 0x29, 0x61, 0x87, 0x77, 0xf6, 0xc0, 0x3e, 0xda, 0xab, 0x65, 0x7e, 0x39, 0x12, 0xa1, 0x6b, 0x42, 0xf7, 0xc5, 0x97, 0x77, 0xec, 0x6f, 0x22, 0xbe, 0x44, 0xc7, 0x03, - /* (2^309)P */ 0xa5, 0x23, 0x90, 0x41, 0xa3, 0xc5, 0x3e, 0xe0, 0xa5, 0x32, 0x49, 0x1f, 0x39, 0x78, 0xb1, 0xd8, 0x24, 0xea, 0xd4, 0x87, 0x53, 0x42, 0x51, 0xf4, 0xd9, 0x46, 0x25, 0x2f, 0x62, 0xa9, 0x90, 0x9a, 0x4a, 0x25, 0x8a, 0xd2, 0x10, 0xe7, 0x3c, 0xbc, 0x58, 0x8d, 0x16, 0x14, 0x96, 0xa4, 0x6f, 0xf8, 0x12, 0x69, 0x91, 0x73, 0xe2, 0xfa, 0xf4, 0x57, - /* (2^310)P */ 0x51, 0x45, 0x3f, 0x96, 0xdc, 0x97, 0x38, 0xa6, 0x01, 0x63, 0x09, 0xea, 0xc2, 0x13, 0x30, 0xb0, 0x00, 0xb8, 0x0a, 0xce, 0xd1, 0x8f, 0x3e, 0x69, 0x62, 0x46, 0x33, 0x9c, 0xbf, 0x4b, 0xcb, 0x0c, 0x90, 0x1c, 0x45, 0xcf, 0x37, 0x5b, 0xf7, 0x4b, 0x5e, 0x95, 0xc3, 0x28, 0x9f, 0x08, 0x83, 0x53, 0x74, 0xab, 0x0c, 0xb4, 0xc0, 0xa1, 0xbc, 0x89, - /* (2^311)P */ 0x06, 0xb1, 0x51, 0x15, 0x65, 0x60, 0x21, 0x17, 0x7a, 0x20, 0x65, 0xee, 0x12, 0x35, 0x4d, 0x46, 0xf4, 0xf8, 0xd0, 0xb1, 0xca, 0x09, 0x30, 0x08, 0x89, 0x23, 0x3b, 0xe7, 0xab, 0x8b, 0x77, 0xa6, 0xad, 0x25, 0xdd, 0xea, 0x3c, 0x7d, 0xa5, 0x24, 0xb3, 0xe8, 0xfa, 0xfb, 0xc9, 0xf2, 0x71, 0xe9, 0xfa, 0xf2, 0xdc, 0x54, 0xdd, 0x55, 0x2e, 0x2f, - /* (2^312)P */ 0x7f, 0x96, 0x96, 0xfb, 0x52, 0x86, 0xcf, 0xea, 0x62, 0x18, 0xf1, 0x53, 0x1f, 0x61, 0x2a, 0x9f, 0x8c, 0x51, 0xca, 0x2c, 0xde, 0x6d, 0xce, 0xab, 0x58, 0x32, 0x0b, 0x33, 0x9b, 0x99, 0xb4, 0x5c, 0x88, 0x2a, 0x76, 0xcc, 0x3e, 0x54, 0x1e, 0x9d, 0xa2, 0x89, 0xe4, 0x19, 0xba, 0x80, 0xc8, 0x39, 0x32, 0x7f, 0x0f, 0xc7, 0x84, 0xbb, 0x43, 0x56, - /* (2^313)P */ 0x9b, 0x07, 0xb4, 0x42, 0xa9, 0xa0, 0x78, 0x4f, 0x28, 0x70, 0x2b, 0x7e, 0x61, 0xe0, 0xdd, 0x02, 0x98, 0xfc, 0xed, 0x31, 0x80, 0xf1, 0x15, 0x52, 0x89, 0x23, 0xcd, 0x5d, 0x2b, 0xc5, 0x19, 0x32, 0xfb, 0x70, 0x50, 0x7a, 0x97, 0x6b, 0x42, 0xdb, 0xca, 0xdb, 0xc4, 0x59, 0x99, 0xe0, 0x12, 0x1f, 0x17, 0xba, 0x8b, 0xf0, 0xc4, 0x38, 0x5d, 0x27, - /* (2^314)P */ 0x29, 0x1d, 0xdc, 0x2b, 0xf6, 0x5b, 0x04, 0x61, 0x36, 0x76, 0xa0, 0x56, 0x36, 0x6e, 0xd7, 0x24, 0x4d, 0xe7, 0xef, 0x44, 0xd2, 0xd5, 0x07, 0xcd, 0xc4, 0x9d, 0x80, 0x48, 0xc3, 0x38, 0xcf, 0xd8, 0xa3, 0xdd, 0xb2, 0x5e, 0xb5, 0x70, 0x15, 0xbb, 0x36, 0x85, 0x8a, 0xd7, 0xfb, 0x56, 0x94, 0x73, 0x9c, 0x81, 0xbe, 0xb1, 0x44, 0x28, 0xf1, 0x37, - /* (2^315)P */ 0xbf, 0xcf, 0x5c, 0xd2, 0xe2, 0xea, 0xc2, 0xcd, 0x70, 0x7a, 0x9d, 0xcb, 0x81, 0xc1, 0xe9, 0xf1, 0x56, 0x71, 0x52, 0xf7, 0x1b, 0x87, 0xc6, 0xd8, 0xcc, 0xb2, 0x69, 0xf3, 0xb0, 0xbd, 0xba, 0x83, 0x12, 0x26, 0xc4, 0xce, 0x72, 0xde, 0x3b, 0x21, 0x28, 0x9e, 0x5a, 0x94, 0xf5, 0x04, 0xa3, 0xc8, 0x0f, 0x5e, 0xbc, 0x71, 0xf9, 0x0d, 0xce, 0xf5, - /* (2^316)P */ 0x93, 0x97, 0x00, 0x85, 0xf4, 0xb4, 0x40, 0xec, 0xd9, 0x2b, 0x6c, 0xd6, 0x63, 0x9e, 0x93, 0x0a, 0x5a, 0xf4, 0xa7, 0x9a, 0xe3, 0x3c, 0xf0, 0x55, 0xd1, 0x96, 0x6c, 0xf5, 0x2a, 0xce, 0xd7, 0x95, 0x72, 0xbf, 0xc5, 0x0c, 0xce, 0x79, 0xa2, 0x0a, 0x78, 0xe0, 0x72, 0xd0, 0x66, 0x28, 0x05, 0x75, 0xd3, 0x23, 0x09, 0x91, 0xed, 0x7e, 0xc4, 0xbc, - /* (2^317)P */ 0x77, 0xc2, 0x9a, 0xf7, 0xa6, 0xe6, 0x18, 0xb4, 0xe7, 0xf6, 0xda, 0xec, 0x44, 0x6d, 0xfb, 0x08, 0xee, 0x65, 0xa8, 0x92, 0x85, 0x1f, 0xba, 0x38, 0x93, 0x20, 0x5c, 0x4d, 0xd2, 0x18, 0x0f, 0x24, 0xbe, 0x1a, 0x96, 0x44, 0x7d, 0xeb, 0xb3, 0xda, 0x95, 0xf4, 0xaf, 0x6c, 0x06, 0x0f, 0x47, 0x37, 0xc8, 0x77, 0x63, 0xe1, 0x29, 0xef, 0xff, 0xa5, - /* (2^318)P */ 0x16, 0x12, 0xd9, 0x47, 0x90, 0x22, 0x9b, 0x05, 0xf2, 0xa5, 0x9a, 0xae, 0x83, 0x98, 0xb5, 0xac, 0xab, 0x29, 0xaa, 0xdc, 0x5f, 0xde, 0xcd, 0xf7, 0x42, 0xad, 0x3b, 0x96, 0xd6, 0x3e, 0x6e, 0x52, 0x47, 0xb1, 0xab, 0x51, 0xde, 0x49, 0x7c, 0x87, 0x8d, 0x86, 0xe2, 0x70, 0x13, 0x21, 0x51, 0x1c, 0x0c, 0x25, 0xc1, 0xb0, 0xe6, 0x19, 0xcf, 0x12, - /* (2^319)P */ 0xf0, 0xbc, 0x97, 0x8f, 0x4b, 0x2f, 0xd1, 0x1f, 0x8c, 0x57, 0xed, 0x3c, 0xf4, 0x26, 0x19, 0xbb, 0x60, 0xca, 0x24, 0xc5, 0xd9, 0x97, 0xe2, 0x5f, 0x76, 0x49, 0x39, 0x7e, 0x2d, 0x12, 0x21, 0x98, 0xda, 0xe6, 0xdb, 0xd2, 0xd8, 0x9f, 0x18, 0xd8, 0x83, 0x6c, 0xba, 0x89, 0x8d, 0x29, 0xfa, 0x46, 0x33, 0x8c, 0x28, 0xdf, 0x6a, 0xb3, 0x69, 0x28, - /* (2^320)P */ 0x86, 0x17, 0xbc, 0xd6, 0x7c, 0xba, 0x1e, 0x83, 0xbb, 0x84, 0xb5, 0x8c, 0xad, 0xdf, 0xa1, 0x24, 0x81, 0x70, 0x40, 0x0f, 0xad, 0xad, 0x3b, 0x23, 0xd0, 0x93, 0xa0, 0x49, 0x5c, 0x4b, 0x51, 0xbe, 0x20, 0x49, 0x4e, 0xda, 0x2d, 0xd3, 0xad, 0x1b, 0x74, 0x08, 0x41, 0xf0, 0xef, 0x19, 0xe9, 0x45, 0x5d, 0x02, 0xae, 0x26, 0x25, 0xd9, 0xd1, 0xc2, - /* (2^321)P */ 0x48, 0x81, 0x3e, 0xb2, 0x83, 0xf8, 0x4d, 0xb3, 0xd0, 0x4c, 0x75, 0xb3, 0xa0, 0x52, 0x26, 0xf2, 0xaf, 0x5d, 0x36, 0x70, 0x72, 0xd6, 0xb7, 0x88, 0x08, 0x69, 0xbd, 0x15, 0x25, 0xb1, 0x45, 0x1b, 0xb7, 0x0b, 0x5f, 0x71, 0x5d, 0x83, 0x49, 0xb9, 0x84, 0x3b, 0x7c, 0xc1, 0x50, 0x93, 0x05, 0x53, 0xe0, 0x61, 0xea, 0xc1, 0xef, 0xdb, 0x82, 0x97, - /* (2^322)P */ 0x00, 0xd5, 0xc3, 0x3a, 0x4d, 0x8a, 0x23, 0x7a, 0xef, 0xff, 0x37, 0xef, 0xf3, 0xbc, 0xa9, 0xb6, 0xae, 0xd7, 0x3a, 0x7b, 0xfd, 0x3e, 0x8e, 0x9b, 0xab, 0x44, 0x54, 0x60, 0x28, 0x6c, 0xbf, 0x15, 0x24, 0x4a, 0x56, 0x60, 0x7f, 0xa9, 0x7a, 0x28, 0x59, 0x2c, 0x8a, 0xd1, 0x7d, 0x6b, 0x00, 0xfd, 0xa5, 0xad, 0xbc, 0x19, 0x3f, 0xcb, 0x73, 0xe0, - /* (2^323)P */ 0xcf, 0x9e, 0x66, 0x06, 0x4d, 0x2b, 0xf5, 0x9c, 0xc2, 0x9d, 0x9e, 0xed, 0x5a, 0x5c, 0x2d, 0x00, 0xbf, 0x29, 0x90, 0x88, 0xe4, 0x5d, 0xfd, 0xe2, 0xf0, 0x38, 0xec, 0x4d, 0x26, 0xea, 0x54, 0xf0, 0x3c, 0x84, 0x10, 0x6a, 0xf9, 0x66, 0x9c, 0xe7, 0x21, 0xfd, 0x0f, 0xc7, 0x13, 0x50, 0x81, 0xb6, 0x50, 0xf9, 0x04, 0x7f, 0xa4, 0x37, 0x85, 0x14, - /* (2^324)P */ 0xdb, 0x87, 0x49, 0xc7, 0xa8, 0x39, 0x0c, 0x32, 0x98, 0x0c, 0xb9, 0x1a, 0x1b, 0x4d, 0xe0, 0x8a, 0x9a, 0x8e, 0x8f, 0xab, 0x5a, 0x17, 0x3d, 0x04, 0x21, 0xce, 0x3e, 0x2c, 0xf9, 0xa3, 0x97, 0xe4, 0x77, 0x95, 0x0e, 0xb6, 0xa5, 0x15, 0xad, 0x3a, 0x1e, 0x46, 0x53, 0x17, 0x09, 0x83, 0x71, 0x4e, 0x86, 0x38, 0xd5, 0x23, 0x44, 0x16, 0x8d, 0xc8, - /* (2^325)P */ 0x05, 0x5e, 0x99, 0x08, 0xbb, 0xc3, 0xc0, 0xb7, 0x6c, 0x12, 0xf2, 0xf3, 0xf4, 0x7c, 0x6a, 0x4d, 0x9e, 0xeb, 0x3d, 0xb9, 0x63, 0x94, 0xce, 0x81, 0xd8, 0x11, 0xcb, 0x55, 0x69, 0x4a, 0x20, 0x0b, 0x4c, 0x2e, 0x14, 0xb8, 0xd4, 0x6a, 0x7c, 0xf0, 0xed, 0xfc, 0x8f, 0xef, 0xa0, 0xeb, 0x6c, 0x01, 0xe2, 0xdc, 0x10, 0x22, 0xa2, 0x01, 0x85, 0x64, - /* (2^326)P */ 0x58, 0xe1, 0x9c, 0x27, 0x55, 0xc6, 0x25, 0xa6, 0x7d, 0x67, 0x88, 0x65, 0x99, 0x6c, 0xcb, 0xdb, 0x27, 0x4f, 0x44, 0x29, 0xf5, 0x4a, 0x23, 0x10, 0xbc, 0x03, 0x3f, 0x36, 0x1e, 0xef, 0xb0, 0xba, 0x75, 0xe8, 0x74, 0x5f, 0x69, 0x3e, 0x26, 0x40, 0xb4, 0x2f, 0xdc, 0x43, 0xbf, 0xa1, 0x8b, 0xbd, 0xca, 0x6e, 0xc1, 0x6e, 0x21, 0x79, 0xa0, 0xd0, - /* (2^327)P */ 0x78, 0x93, 0x4a, 0x2d, 0x22, 0x6e, 0x6e, 0x7d, 0x74, 0xd2, 0x66, 0x58, 0xce, 0x7b, 0x1d, 0x97, 0xb1, 0xf2, 0xda, 0x1c, 0x79, 0xfb, 0xba, 0xd1, 0xc0, 0xc5, 0x6e, 0xc9, 0x11, 0x89, 0xd2, 0x41, 0x8d, 0x70, 0xb9, 0xcc, 0xea, 0x6a, 0xb3, 0x45, 0xb6, 0x05, 0x2e, 0xf2, 0x17, 0xf1, 0x27, 0xb8, 0xed, 0x06, 0x1f, 0xdb, 0x9d, 0x1f, 0x69, 0x28, - /* (2^328)P */ 0x93, 0x12, 0xa8, 0x11, 0xe1, 0x92, 0x30, 0x8d, 0xac, 0xe1, 0x1c, 0x60, 0x7c, 0xed, 0x2d, 0x2e, 0xd3, 0x03, 0x5c, 0x9c, 0xc5, 0xbd, 0x64, 0x4a, 0x8c, 0xba, 0x76, 0xfe, 0xc6, 0xc1, 0xea, 0xc2, 0x4f, 0xbe, 0x70, 0x3d, 0x64, 0xcf, 0x8e, 0x18, 0xcb, 0xcd, 0x57, 0xa7, 0xf7, 0x36, 0xa9, 0x6b, 0x3e, 0xb8, 0x69, 0xee, 0x47, 0xa2, 0x7e, 0xb2, - /* (2^329)P */ 0x96, 0xaf, 0x3a, 0xf5, 0xed, 0xcd, 0xaf, 0xf7, 0x82, 0xaf, 0x59, 0x62, 0x0b, 0x36, 0x85, 0xf9, 0xaf, 0xd6, 0x38, 0xff, 0x87, 0x2e, 0x1d, 0x6c, 0x8b, 0xaf, 0x3b, 0xdf, 0x28, 0xa2, 0xd6, 0x4d, 0x80, 0x92, 0xc3, 0x0f, 0x34, 0xa8, 0xae, 0x69, 0x5d, 0x7b, 0x9d, 0xbc, 0xf5, 0xfd, 0x1d, 0xb1, 0x96, 0x55, 0x86, 0xe1, 0x5c, 0xb6, 0xac, 0xb9, - /* (2^330)P */ 0x50, 0x9e, 0x37, 0x28, 0x7d, 0xa8, 0x33, 0x63, 0xda, 0x3f, 0x20, 0x98, 0x0e, 0x09, 0xa8, 0x77, 0x3b, 0x7a, 0xfc, 0x16, 0x85, 0x44, 0x64, 0x77, 0x65, 0x68, 0x92, 0x41, 0xc6, 0x1f, 0xdf, 0x27, 0xf9, 0xec, 0xa0, 0x61, 0x22, 0xea, 0x19, 0xe7, 0x75, 0x8b, 0x4e, 0xe5, 0x0f, 0xb7, 0xf7, 0xd2, 0x53, 0xf4, 0xdd, 0x4a, 0xaa, 0x78, 0x40, 0xb7, - /* (2^331)P */ 0xd4, 0x89, 0xe3, 0x79, 0xba, 0xb6, 0xc3, 0xda, 0xe6, 0x78, 0x65, 0x7d, 0x6e, 0x22, 0x62, 0xb1, 0x3d, 0xea, 0x90, 0x84, 0x30, 0x5e, 0xd4, 0x39, 0x84, 0x78, 0xd9, 0x75, 0xd6, 0xce, 0x2a, 0x11, 0x29, 0x69, 0xa4, 0x5e, 0xaa, 0x2a, 0x98, 0x5a, 0xe5, 0x91, 0x8f, 0xb2, 0xfb, 0xda, 0x97, 0xe8, 0x83, 0x6f, 0x04, 0xb9, 0x5d, 0xaf, 0xe1, 0x9b, - /* (2^332)P */ 0x8b, 0xe4, 0xe1, 0x48, 0x9c, 0xc4, 0x83, 0x89, 0xdf, 0x65, 0xd3, 0x35, 0x55, 0x13, 0xf4, 0x1f, 0x36, 0x92, 0x33, 0x38, 0xcb, 0xed, 0x15, 0xe6, 0x60, 0x2d, 0x25, 0xf5, 0x36, 0x60, 0x3a, 0x37, 0x9b, 0x71, 0x9d, 0x42, 0xb0, 0x14, 0xc8, 0xba, 0x62, 0xa3, 0x49, 0xb0, 0x88, 0xc1, 0x72, 0x73, 0xdd, 0x62, 0x40, 0xa9, 0x62, 0x88, 0x99, 0xca, - /* (2^333)P */ 0x47, 0x7b, 0xea, 0xda, 0x46, 0x2f, 0x45, 0xc6, 0xe3, 0xb4, 0x4d, 0x8d, 0xac, 0x0b, 0x54, 0x22, 0x06, 0x31, 0x16, 0x66, 0x3e, 0xe4, 0x38, 0x12, 0xcd, 0xf3, 0xe7, 0x99, 0x37, 0xd9, 0x62, 0x24, 0x4b, 0x05, 0xf2, 0x58, 0xe6, 0x29, 0x4b, 0x0d, 0xf6, 0xc1, 0xba, 0xa0, 0x1e, 0x0f, 0xcb, 0x1f, 0xc6, 0x2b, 0x19, 0xfc, 0x82, 0x01, 0xd0, 0x86, - /* (2^334)P */ 0xa2, 0xae, 0x77, 0x20, 0xfb, 0xa8, 0x18, 0xb4, 0x61, 0xef, 0xe8, 0x52, 0x79, 0xbb, 0x86, 0x90, 0x5d, 0x2e, 0x76, 0xed, 0x66, 0x60, 0x5d, 0x00, 0xb5, 0xa4, 0x00, 0x40, 0x89, 0xec, 0xd1, 0xd2, 0x0d, 0x26, 0xb9, 0x30, 0xb2, 0xd2, 0xb8, 0xe8, 0x0e, 0x56, 0xf9, 0x67, 0x94, 0x2e, 0x62, 0xe1, 0x79, 0x48, 0x2b, 0xa9, 0xfa, 0xea, 0xdb, 0x28, - /* (2^335)P */ 0x35, 0xf1, 0xb0, 0x43, 0xbd, 0x27, 0xef, 0x18, 0x44, 0xa2, 0x04, 0xb4, 0x69, 0xa1, 0x97, 0x1f, 0x8c, 0x04, 0x82, 0x9b, 0x00, 0x6d, 0xf8, 0xbf, 0x7d, 0xc1, 0x5b, 0xab, 0xe8, 0xb2, 0x34, 0xbd, 0xaf, 0x7f, 0xb2, 0x0d, 0xf3, 0xed, 0xfc, 0x5b, 0x50, 0xee, 0xe7, 0x4a, 0x20, 0xd9, 0xf5, 0xc6, 0x9a, 0x97, 0x6d, 0x07, 0x2f, 0xb9, 0x31, 0x02, - /* (2^336)P */ 0xf9, 0x54, 0x4a, 0xc5, 0x61, 0x7e, 0x1d, 0xa6, 0x0e, 0x1a, 0xa8, 0xd3, 0x8c, 0x36, 0x7d, 0xf1, 0x06, 0xb1, 0xac, 0x93, 0xcd, 0xe9, 0x8f, 0x61, 0x6c, 0x5d, 0x03, 0x23, 0xdf, 0x85, 0x53, 0x39, 0x63, 0x5e, 0xeb, 0xf3, 0xd3, 0xd3, 0x75, 0x97, 0x9b, 0x62, 0x9b, 0x01, 0xb3, 0x19, 0xd8, 0x2b, 0x36, 0xf2, 0x2c, 0x2c, 0x6f, 0x36, 0xc6, 0x3c, - /* (2^337)P */ 0x05, 0x74, 0x43, 0x10, 0xb6, 0xb0, 0xf8, 0xbf, 0x02, 0x46, 0x9a, 0xee, 0xc1, 0xaf, 0xc1, 0xe5, 0x5a, 0x2e, 0xbb, 0xe1, 0xdc, 0xc6, 0xce, 0x51, 0x29, 0x50, 0xbf, 0x1b, 0xde, 0xff, 0xba, 0x4d, 0x8d, 0x8b, 0x7e, 0xe7, 0xbd, 0x5b, 0x8f, 0xbe, 0xe3, 0x75, 0x71, 0xff, 0x37, 0x05, 0x5a, 0x10, 0xeb, 0x54, 0x7e, 0x44, 0x72, 0x2c, 0xd4, 0xfc, - /* (2^338)P */ 0x03, 0x12, 0x1c, 0xb2, 0x08, 0x90, 0xa1, 0x2d, 0x50, 0xa0, 0xad, 0x7f, 0x8d, 0xa6, 0x97, 0xc1, 0xbd, 0xdc, 0xc3, 0xa7, 0xad, 0x31, 0xdf, 0xb8, 0x03, 0x84, 0xc3, 0xb9, 0x29, 0x3d, 0x92, 0x2e, 0xc3, 0x90, 0x07, 0xe8, 0xa7, 0xc7, 0xbc, 0x61, 0xe9, 0x3e, 0xa0, 0x35, 0xda, 0x1d, 0xab, 0x48, 0xfe, 0x50, 0xc9, 0x25, 0x59, 0x23, 0x69, 0x3f, - /* (2^339)P */ 0x8e, 0x91, 0xab, 0x6b, 0x91, 0x4f, 0x89, 0x76, 0x67, 0xad, 0xb2, 0x65, 0x9d, 0xad, 0x02, 0x36, 0xdc, 0xac, 0x96, 0x93, 0x97, 0x21, 0x14, 0xd0, 0xe8, 0x11, 0x60, 0x1e, 0xeb, 0x96, 0x06, 0xf2, 0x53, 0xf2, 0x6d, 0xb7, 0x93, 0x6f, 0x26, 0x91, 0x23, 0xe3, 0x34, 0x04, 0x92, 0x91, 0x37, 0x08, 0x50, 0xd6, 0x28, 0x09, 0x27, 0xa1, 0x0c, 0x00, - /* (2^340)P */ 0x1f, 0xbb, 0x21, 0x26, 0x33, 0xcb, 0xa4, 0xd1, 0xee, 0x85, 0xf9, 0xd9, 0x3c, 0x90, 0xc3, 0xd1, 0x26, 0xa2, 0x25, 0x93, 0x43, 0x61, 0xed, 0x91, 0x6e, 0x54, 0x03, 0x2e, 0x42, 0x9d, 0xf7, 0xa6, 0x02, 0x0f, 0x2f, 0x9c, 0x7a, 0x8d, 0x12, 0xc2, 0x18, 0xfc, 0x41, 0xff, 0x85, 0x26, 0x1a, 0x44, 0x55, 0x0b, 0x89, 0xab, 0x6f, 0x62, 0x33, 0x8c, - /* (2^341)P */ 0xe0, 0x3c, 0x5d, 0x70, 0x64, 0x87, 0x81, 0x35, 0xf2, 0x37, 0xa6, 0x24, 0x3e, 0xe0, 0x62, 0xd5, 0x71, 0xe7, 0x93, 0xfb, 0xac, 0xc3, 0xe7, 0xc7, 0x04, 0xe2, 0x70, 0xd3, 0x29, 0x5b, 0x21, 0xbf, 0xf4, 0x26, 0x5d, 0xf3, 0x95, 0xb4, 0x2a, 0x6a, 0x07, 0x55, 0xa6, 0x4b, 0x3b, 0x15, 0xf2, 0x25, 0x8a, 0x95, 0x3f, 0x63, 0x2f, 0x7a, 0x23, 0x96, - /* (2^342)P */ 0x0d, 0x3d, 0xd9, 0x13, 0xa7, 0xb3, 0x5e, 0x67, 0xf7, 0x02, 0x23, 0xee, 0x84, 0xff, 0x99, 0xda, 0xb9, 0x53, 0xf8, 0xf0, 0x0e, 0x39, 0x2f, 0x3c, 0x64, 0x34, 0xe3, 0x09, 0xfd, 0x2b, 0x33, 0xc7, 0xfe, 0x62, 0x2b, 0x84, 0xdf, 0x2b, 0xd2, 0x7c, 0x26, 0x01, 0x70, 0x66, 0x5b, 0x85, 0xc2, 0xbe, 0x88, 0x37, 0xf1, 0x30, 0xac, 0xb8, 0x76, 0xa3, - /* (2^343)P */ 0x6e, 0x01, 0xf0, 0x55, 0x35, 0xe4, 0xbd, 0x43, 0x62, 0x9d, 0xd6, 0x11, 0xef, 0x6f, 0xb8, 0x8c, 0xaa, 0x98, 0x87, 0xc6, 0x6d, 0xc4, 0xcc, 0x74, 0x92, 0x53, 0x4a, 0xdf, 0xe4, 0x08, 0x89, 0x17, 0xd0, 0x0f, 0xf4, 0x00, 0x60, 0x78, 0x08, 0x44, 0xb5, 0xda, 0x18, 0xed, 0x98, 0xc8, 0x61, 0x3d, 0x39, 0xdb, 0xcf, 0x1d, 0x49, 0x40, 0x65, 0x75, - /* (2^344)P */ 0x8e, 0x10, 0xae, 0x5f, 0x06, 0xd2, 0x95, 0xfd, 0x20, 0x16, 0x49, 0x5b, 0x57, 0xbe, 0x22, 0x8b, 0x43, 0xfb, 0xe6, 0xcc, 0x26, 0xa5, 0x5d, 0xd3, 0x68, 0xc5, 0xf9, 0x5a, 0x86, 0x24, 0x87, 0x27, 0x05, 0xfd, 0xe2, 0xff, 0xb3, 0xa3, 0x7b, 0x37, 0x59, 0xc5, 0x4e, 0x14, 0x94, 0xf9, 0x3b, 0xcb, 0x7c, 0xed, 0xca, 0x1d, 0xb2, 0xac, 0x05, 0x4a, - /* (2^345)P */ 0xf4, 0xd1, 0x81, 0xeb, 0x89, 0xbf, 0xfe, 0x1e, 0x41, 0x92, 0x29, 0xee, 0xe1, 0x43, 0xf5, 0x86, 0x1d, 0x2f, 0xbb, 0x1e, 0x84, 0x5d, 0x7b, 0x8d, 0xd5, 0xda, 0xee, 0x1e, 0x8a, 0xd0, 0x27, 0xf2, 0x60, 0x51, 0x59, 0x82, 0xf4, 0x84, 0x2b, 0x5b, 0x14, 0x2d, 0x81, 0x82, 0x3e, 0x2b, 0xb4, 0x6d, 0x51, 0x4f, 0xc5, 0xcb, 0xbf, 0x74, 0xe3, 0xb4, - /* (2^346)P */ 0x19, 0x2f, 0x22, 0xb3, 0x04, 0x5f, 0x81, 0xca, 0x05, 0x60, 0xb9, 0xaa, 0xee, 0x0e, 0x2f, 0x48, 0x38, 0xf9, 0x91, 0xb4, 0x66, 0xe4, 0x57, 0x28, 0x54, 0x10, 0xe9, 0x61, 0x9d, 0xd4, 0x90, 0x75, 0xb1, 0x39, 0x23, 0xb6, 0xfc, 0x82, 0xe0, 0xfa, 0xbb, 0x5c, 0x6e, 0xc3, 0x44, 0x13, 0x00, 0x83, 0x55, 0x9e, 0x8e, 0x10, 0x61, 0x81, 0x91, 0x04, - /* (2^347)P */ 0x5f, 0x2a, 0xd7, 0x81, 0xd9, 0x9c, 0xbb, 0x79, 0xbc, 0x62, 0x56, 0x98, 0x03, 0x5a, 0x18, 0x85, 0x2a, 0x9c, 0xd0, 0xfb, 0xd2, 0xb1, 0xaf, 0xef, 0x0d, 0x24, 0xc5, 0xfa, 0x39, 0xbb, 0x6b, 0xed, 0xa4, 0xdf, 0xe4, 0x87, 0xcd, 0x41, 0xd3, 0x72, 0x32, 0xc6, 0x28, 0x21, 0xb1, 0xba, 0x8b, 0xa3, 0x91, 0x79, 0x76, 0x22, 0x25, 0x10, 0x61, 0xd1, - /* (2^348)P */ 0x73, 0xb5, 0x32, 0x97, 0xdd, 0xeb, 0xdd, 0x22, 0x22, 0xf1, 0x33, 0x3c, 0x77, 0x56, 0x7d, 0x6b, 0x48, 0x2b, 0x05, 0x81, 0x03, 0x03, 0x91, 0x9a, 0xe3, 0x5e, 0xd4, 0xee, 0x3f, 0xf8, 0xbb, 0x50, 0x21, 0x32, 0x4c, 0x4a, 0x58, 0x49, 0xde, 0x0c, 0xde, 0x30, 0x82, 0x3d, 0x92, 0xf0, 0x6c, 0xcc, 0x32, 0x3e, 0xd2, 0x78, 0x8a, 0x6e, 0x2c, 0xd0, - /* (2^349)P */ 0xf0, 0xf7, 0xa1, 0x0b, 0xc1, 0x74, 0x85, 0xa8, 0xe9, 0xdd, 0x48, 0xa1, 0xc0, 0x16, 0xd8, 0x2b, 0x61, 0x08, 0xc2, 0x2b, 0x30, 0x26, 0x79, 0xce, 0x9e, 0xfd, 0x39, 0xd7, 0x81, 0xa4, 0x63, 0x8c, 0xd5, 0x74, 0xa0, 0x88, 0xfa, 0x03, 0x30, 0xe9, 0x7f, 0x2b, 0xc6, 0x02, 0xc9, 0x5e, 0xe4, 0xd5, 0x4d, 0x92, 0xd0, 0xf6, 0xf2, 0x5b, 0x79, 0x08, - /* (2^350)P */ 0x34, 0x89, 0x81, 0x43, 0xd1, 0x94, 0x2c, 0x10, 0x54, 0x9b, 0xa0, 0xe5, 0x44, 0xe8, 0xc2, 0x2f, 0x3e, 0x0e, 0x74, 0xae, 0xba, 0xe2, 0xac, 0x85, 0x6b, 0xd3, 0x5c, 0x97, 0xf7, 0x90, 0xf1, 0x12, 0xc0, 0x03, 0xc8, 0x1f, 0x37, 0x72, 0x8c, 0x9b, 0x9c, 0x17, 0x96, 0x9d, 0xc7, 0xbf, 0xa3, 0x3f, 0x44, 0x3d, 0x87, 0x81, 0xbd, 0x81, 0xa6, 0x5f, - /* (2^351)P */ 0xe4, 0xff, 0x78, 0x62, 0x82, 0x5b, 0x76, 0x58, 0xf5, 0x5b, 0xa6, 0xc4, 0x53, 0x11, 0x3b, 0x7b, 0xaa, 0x67, 0xf8, 0xea, 0x3b, 0x5d, 0x9a, 0x2e, 0x04, 0xeb, 0x4a, 0x24, 0xfb, 0x56, 0xf0, 0xa8, 0xd4, 0x14, 0xed, 0x0f, 0xfd, 0xc5, 0x26, 0x17, 0x2a, 0xf0, 0xb9, 0x13, 0x8c, 0xbd, 0x65, 0x14, 0x24, 0x95, 0x27, 0x12, 0x63, 0x2a, 0x09, 0x18, - /* (2^352)P */ 0xe1, 0x5c, 0xe7, 0xe0, 0x00, 0x6a, 0x96, 0xf2, 0x49, 0x6a, 0x39, 0xa5, 0xe0, 0x17, 0x79, 0x4a, 0x63, 0x07, 0x62, 0x09, 0x61, 0x1b, 0x6e, 0xa9, 0xb5, 0x62, 0xb7, 0xde, 0xdf, 0x80, 0x4c, 0x5a, 0x99, 0x73, 0x59, 0x9d, 0xfb, 0xb1, 0x5e, 0xbe, 0xb8, 0xb7, 0x63, 0x93, 0xe8, 0xad, 0x5e, 0x1f, 0xae, 0x59, 0x1c, 0xcd, 0xb4, 0xc2, 0xb3, 0x8a, - /* (2^353)P */ 0x78, 0x53, 0xa1, 0x4c, 0x70, 0x9c, 0x63, 0x7e, 0xb3, 0x12, 0x40, 0x5f, 0xbb, 0x23, 0xa7, 0xf7, 0x77, 0x96, 0x5b, 0x4d, 0x91, 0x10, 0x52, 0x85, 0x9e, 0xa5, 0x38, 0x0b, 0xfd, 0x25, 0x01, 0x4b, 0xfa, 0x4d, 0xd3, 0x3f, 0x78, 0x74, 0x42, 0xff, 0x62, 0x2d, 0x27, 0xdc, 0x9d, 0xd1, 0x29, 0x76, 0x2e, 0x78, 0xb3, 0x35, 0xfa, 0x15, 0xd5, 0x38, - /* (2^354)P */ 0x8b, 0xc7, 0x43, 0xce, 0xf0, 0x5e, 0xf1, 0x0d, 0x02, 0x38, 0xe8, 0x82, 0xc9, 0x25, 0xad, 0x2d, 0x27, 0xa4, 0x54, 0x18, 0xb2, 0x30, 0x73, 0xa4, 0x41, 0x08, 0xe4, 0x86, 0xe6, 0x8c, 0xe9, 0x2a, 0x34, 0xb3, 0xd6, 0x61, 0x8f, 0x66, 0x26, 0x08, 0xb6, 0x06, 0x33, 0xaa, 0x12, 0xac, 0x72, 0xec, 0x2e, 0x52, 0xa3, 0x25, 0x3e, 0xd7, 0x62, 0xe8, - /* (2^355)P */ 0xc4, 0xbb, 0x89, 0xc8, 0x40, 0xcc, 0x84, 0xec, 0x4a, 0xd9, 0xc4, 0x55, 0x78, 0x00, 0xcf, 0xd8, 0xe9, 0x24, 0x59, 0xdc, 0x5e, 0xf0, 0x66, 0xa1, 0x83, 0xae, 0x97, 0x18, 0xc5, 0x54, 0x27, 0xa2, 0x21, 0x52, 0x03, 0x31, 0x5b, 0x11, 0x67, 0xf6, 0x12, 0x00, 0x87, 0x2f, 0xff, 0x59, 0x70, 0x8f, 0x6d, 0x71, 0xab, 0xab, 0x24, 0xb8, 0xba, 0x35, - /* (2^356)P */ 0x69, 0x43, 0xa7, 0x14, 0x06, 0x96, 0xe9, 0xc2, 0xe3, 0x2b, 0x45, 0x22, 0xc0, 0xd0, 0x2f, 0x34, 0xd1, 0x01, 0x99, 0xfc, 0x99, 0x38, 0xa1, 0x25, 0x2e, 0x59, 0x6c, 0x27, 0xc9, 0xeb, 0x7b, 0xdc, 0x4e, 0x26, 0x68, 0xba, 0xfa, 0xec, 0x02, 0x05, 0x64, 0x80, 0x30, 0x20, 0x5c, 0x26, 0x7f, 0xaf, 0x95, 0x17, 0x3d, 0x5c, 0x9e, 0x96, 0x96, 0xaf, - /* (2^357)P */ 0xa6, 0xba, 0x21, 0x29, 0x32, 0xe2, 0x98, 0xde, 0x9b, 0x6d, 0x0b, 0x44, 0x91, 0xa8, 0x3e, 0xd4, 0xb8, 0x04, 0x6c, 0xf6, 0x04, 0x39, 0xbd, 0x52, 0x05, 0x15, 0x27, 0x78, 0x8e, 0x55, 0xac, 0x79, 0xc5, 0xe6, 0x00, 0x7f, 0x90, 0xa2, 0xdd, 0x07, 0x13, 0xe0, 0x24, 0x70, 0x5c, 0x0f, 0x4d, 0xa9, 0xf9, 0xae, 0xcb, 0x34, 0x10, 0x9d, 0x89, 0x9d, - /* (2^358)P */ 0x12, 0xe0, 0xb3, 0x9f, 0xc4, 0x96, 0x1d, 0xcf, 0xed, 0x99, 0x64, 0x28, 0x8d, 0xc7, 0x31, 0x82, 0xee, 0x5e, 0x75, 0x48, 0xff, 0x3a, 0xf2, 0x09, 0x34, 0x03, 0x93, 0x52, 0x19, 0xb2, 0xc5, 0x81, 0x93, 0x45, 0x5e, 0x59, 0x21, 0x2b, 0xec, 0x89, 0xba, 0x36, 0x6e, 0xf9, 0x82, 0x75, 0x7e, 0x82, 0x3f, 0xaa, 0xe2, 0xe3, 0x3b, 0x94, 0xfd, 0x98, - /* (2^359)P */ 0x7c, 0xdb, 0x75, 0x31, 0x61, 0xfb, 0x15, 0x28, 0x94, 0xd7, 0xc3, 0x5a, 0xa9, 0xa1, 0x0a, 0x66, 0x0f, 0x2b, 0x13, 0x3e, 0x42, 0xb5, 0x28, 0x3a, 0xca, 0x83, 0xf3, 0x61, 0x22, 0xf4, 0x40, 0xc5, 0xdf, 0xe7, 0x31, 0x9f, 0x7e, 0x51, 0x75, 0x06, 0x9d, 0x51, 0xc8, 0xe7, 0x9f, 0xc3, 0x71, 0x4f, 0x3d, 0x5b, 0xfb, 0xe9, 0x8e, 0x08, 0x40, 0x8e, - /* (2^360)P */ 0xf7, 0x31, 0xad, 0x50, 0x5d, 0x25, 0x93, 0x73, 0x68, 0xf6, 0x7c, 0x89, 0x5a, 0x3d, 0x9f, 0x9b, 0x05, 0x82, 0xe7, 0x70, 0x4b, 0x19, 0xaa, 0xcf, 0xff, 0xde, 0x50, 0x8f, 0x2f, 0x69, 0xd3, 0xf0, 0x99, 0x51, 0x6b, 0x9d, 0xb6, 0x56, 0x6f, 0xf8, 0x4c, 0x74, 0x8b, 0x4c, 0x91, 0xf9, 0xa9, 0xb1, 0x3e, 0x07, 0xdf, 0x0b, 0x27, 0x8a, 0xb1, 0xed, - /* (2^361)P */ 0xfb, 0x67, 0xd9, 0x48, 0xd2, 0xe4, 0x44, 0x9b, 0x43, 0x15, 0x8a, 0xeb, 0x00, 0x53, 0xad, 0x25, 0xc7, 0x7e, 0x19, 0x30, 0x87, 0xb7, 0xd5, 0x5f, 0x04, 0xf8, 0xaa, 0xdd, 0x57, 0xae, 0x34, 0x75, 0xe2, 0x84, 0x4b, 0x54, 0x60, 0x37, 0x95, 0xe4, 0xd3, 0xec, 0xac, 0xef, 0x47, 0x31, 0xa3, 0xc8, 0x31, 0x22, 0xdb, 0x26, 0xe7, 0x6a, 0xb5, 0xad, - /* (2^362)P */ 0x44, 0x09, 0x5c, 0x95, 0xe4, 0x72, 0x3c, 0x1a, 0xd1, 0xac, 0x42, 0x51, 0x99, 0x6f, 0xfa, 0x1f, 0xf2, 0x22, 0xbe, 0xff, 0x7b, 0x66, 0xf5, 0x6c, 0xb3, 0x66, 0xc7, 0x4d, 0x78, 0x31, 0x83, 0x80, 0xf5, 0x41, 0xe9, 0x7f, 0xbe, 0xf7, 0x23, 0x49, 0x6b, 0x84, 0x4e, 0x7e, 0x47, 0x07, 0x6e, 0x74, 0xdf, 0xe5, 0x9d, 0x9e, 0x56, 0x2a, 0xc0, 0xbc, - /* (2^363)P */ 0xac, 0x10, 0x80, 0x8c, 0x7c, 0xfa, 0x83, 0xdf, 0xb3, 0xd0, 0xc4, 0xbe, 0xfb, 0x9f, 0xac, 0xc9, 0xc3, 0x40, 0x95, 0x0b, 0x09, 0x23, 0xda, 0x63, 0x67, 0xcf, 0xe7, 0x9f, 0x7d, 0x7b, 0x6b, 0xe2, 0xe6, 0x6d, 0xdb, 0x87, 0x9e, 0xa6, 0xff, 0x6d, 0xab, 0xbd, 0xfb, 0x54, 0x84, 0x68, 0xcf, 0x89, 0xf1, 0xd0, 0xe2, 0x85, 0x61, 0xdc, 0x22, 0xd1, - /* (2^364)P */ 0xa8, 0x48, 0xfb, 0x8c, 0x6a, 0x63, 0x01, 0x72, 0x43, 0x43, 0xeb, 0x21, 0xa3, 0x00, 0x8a, 0xc0, 0x87, 0x51, 0x9e, 0x86, 0x75, 0x16, 0x79, 0xf9, 0x6b, 0x11, 0x80, 0x62, 0xc2, 0x9d, 0xb8, 0x8c, 0x30, 0x8e, 0x8d, 0x03, 0x52, 0x7e, 0x31, 0x59, 0x38, 0xf9, 0x25, 0xc7, 0x0f, 0xc7, 0xa8, 0x2b, 0x5c, 0x80, 0xfa, 0x90, 0xa2, 0x63, 0xca, 0xe7, - /* (2^365)P */ 0xf1, 0x5d, 0xb5, 0xd9, 0x20, 0x10, 0x7d, 0x0f, 0xc5, 0x50, 0x46, 0x07, 0xff, 0x02, 0x75, 0x2b, 0x4a, 0xf3, 0x39, 0x91, 0x72, 0xb7, 0xd5, 0xcc, 0x38, 0xb8, 0xe7, 0x36, 0x26, 0x5e, 0x11, 0x97, 0x25, 0xfb, 0x49, 0x68, 0xdc, 0xb4, 0x46, 0x87, 0x5c, 0xc2, 0x7f, 0xaa, 0x7d, 0x36, 0x23, 0xa6, 0xc6, 0x53, 0xec, 0xbc, 0x57, 0x47, 0xc1, 0x2b, - /* (2^366)P */ 0x25, 0x5d, 0x7d, 0x95, 0xda, 0x0b, 0x8f, 0x78, 0x1e, 0x19, 0x09, 0xfa, 0x67, 0xe0, 0xa0, 0x17, 0x24, 0x76, 0x6c, 0x30, 0x1f, 0x62, 0x3d, 0xbe, 0x45, 0x70, 0xcc, 0xb6, 0x1e, 0x68, 0x06, 0x25, 0x68, 0x16, 0x1a, 0x33, 0x3f, 0x90, 0xc7, 0x78, 0x2d, 0x98, 0x3c, 0x2f, 0xb9, 0x2d, 0x94, 0x0b, 0xfb, 0x49, 0x56, 0x30, 0xd7, 0xc1, 0xe6, 0x48, - /* (2^367)P */ 0x7a, 0xd1, 0xe0, 0x8e, 0x67, 0xfc, 0x0b, 0x50, 0x1f, 0x84, 0x98, 0xfa, 0xaf, 0xae, 0x2e, 0x31, 0x27, 0xcf, 0x3f, 0xf2, 0x6e, 0x8d, 0x81, 0x8f, 0xd2, 0x5f, 0xde, 0xd3, 0x5e, 0xe9, 0xe7, 0x13, 0x48, 0x83, 0x5a, 0x4e, 0x84, 0xd1, 0x58, 0xcf, 0x6b, 0x84, 0xdf, 0x13, 0x1d, 0x91, 0x85, 0xe8, 0xcb, 0x29, 0x79, 0xd2, 0xca, 0xac, 0x6a, 0x93, - /* (2^368)P */ 0x53, 0x82, 0xce, 0x61, 0x96, 0x88, 0x6f, 0xe1, 0x4a, 0x4c, 0x1e, 0x30, 0x73, 0xe8, 0x74, 0xde, 0x40, 0x2b, 0xe0, 0xc4, 0xb5, 0xd8, 0x7c, 0x15, 0xe7, 0xe1, 0xb1, 0xe0, 0xd6, 0x88, 0xb1, 0x6a, 0x57, 0x19, 0x6a, 0x22, 0x66, 0x57, 0xf6, 0x8d, 0xfd, 0xc0, 0xf2, 0xa3, 0x03, 0x56, 0xfb, 0x2e, 0x75, 0x5e, 0xc7, 0x8e, 0x22, 0x96, 0x5c, 0x06, - /* (2^369)P */ 0x98, 0x7e, 0xbf, 0x3e, 0xbf, 0x24, 0x9d, 0x15, 0xd3, 0xf6, 0xd3, 0xd2, 0xf0, 0x11, 0xf2, 0xdb, 0x36, 0x23, 0x38, 0xf7, 0x1d, 0x71, 0x20, 0xd2, 0x54, 0x7f, 0x1e, 0x24, 0x8f, 0xe2, 0xaa, 0xf7, 0x3f, 0x6b, 0x41, 0x4e, 0xdc, 0x0e, 0xec, 0xe8, 0x35, 0x0a, 0x08, 0x6d, 0x89, 0x5b, 0x32, 0x91, 0x01, 0xb6, 0xe0, 0x2c, 0xc6, 0xa1, 0xbe, 0xb4, - /* (2^370)P */ 0x29, 0xf2, 0x1e, 0x1c, 0xdc, 0x68, 0x8a, 0x43, 0x87, 0x2c, 0x48, 0xb3, 0x9e, 0xed, 0xd2, 0x82, 0x46, 0xac, 0x2f, 0xef, 0x93, 0x34, 0x37, 0xca, 0x64, 0x8d, 0xc9, 0x06, 0x90, 0xbb, 0x78, 0x0a, 0x3c, 0x4c, 0xcf, 0x35, 0x7a, 0x0f, 0xf7, 0xa7, 0xf4, 0x2f, 0x45, 0x69, 0x3f, 0xa9, 0x5d, 0xce, 0x7b, 0x8a, 0x84, 0xc3, 0xae, 0xf4, 0xda, 0xd5, - /* (2^371)P */ 0xca, 0xba, 0x95, 0x43, 0x05, 0x7b, 0x06, 0xd9, 0x5c, 0x0a, 0x18, 0x5f, 0x6a, 0x6a, 0xce, 0xc0, 0x3d, 0x95, 0x51, 0x0e, 0x1a, 0xbe, 0x85, 0x7a, 0xf2, 0x69, 0xec, 0xc0, 0x8c, 0xca, 0xa3, 0x32, 0x0a, 0x76, 0x50, 0xc6, 0x76, 0x61, 0x00, 0x89, 0xbf, 0x6e, 0x0f, 0x48, 0x90, 0x31, 0x93, 0xec, 0x34, 0x70, 0xf0, 0xc3, 0x8d, 0xf0, 0x0f, 0xb5, - /* (2^372)P */ 0xbe, 0x23, 0xe2, 0x18, 0x99, 0xf1, 0xed, 0x8a, 0xf6, 0xc9, 0xac, 0xb8, 0x1e, 0x9a, 0x3c, 0x15, 0xae, 0xd7, 0x6d, 0xb3, 0x04, 0xee, 0x5b, 0x0d, 0x1e, 0x79, 0xb7, 0xf9, 0xf9, 0x8d, 0xad, 0xf9, 0x8f, 0x5a, 0x6a, 0x7b, 0xd7, 0x9b, 0xca, 0x62, 0xfe, 0x9c, 0xc0, 0x6f, 0x6d, 0x9d, 0x76, 0xa3, 0x69, 0xb9, 0x4c, 0xa1, 0xc4, 0x0c, 0x76, 0xaa, - /* (2^373)P */ 0x1c, 0x06, 0xfe, 0x3f, 0x45, 0x70, 0xcd, 0x97, 0xa9, 0xa2, 0xb1, 0xd3, 0xf2, 0xa5, 0x0c, 0x49, 0x2c, 0x75, 0x73, 0x1f, 0xcf, 0x00, 0xaf, 0xd5, 0x2e, 0xde, 0x0d, 0x8f, 0x8f, 0x7c, 0xc4, 0x58, 0xce, 0xd4, 0xf6, 0x24, 0x19, 0x2e, 0xd8, 0xc5, 0x1d, 0x1a, 0x3f, 0xb8, 0x4f, 0xbc, 0x7d, 0xbd, 0x68, 0xe3, 0x81, 0x98, 0x1b, 0xa8, 0xc9, 0xd9, - /* (2^374)P */ 0x39, 0x95, 0x78, 0x24, 0x6c, 0x38, 0xe4, 0xe7, 0xd0, 0x8d, 0xb9, 0x38, 0x71, 0x5e, 0xc1, 0x62, 0x80, 0xcc, 0xcb, 0x8c, 0x97, 0xca, 0xf8, 0xb9, 0xd9, 0x9c, 0xce, 0x72, 0x7b, 0x70, 0xee, 0x5f, 0xea, 0xa2, 0xdf, 0xa9, 0x14, 0x10, 0xf9, 0x6e, 0x59, 0x9f, 0x9c, 0xe0, 0x0c, 0xb2, 0x07, 0x97, 0xcd, 0xd2, 0x89, 0x16, 0xfd, 0x9c, 0xa8, 0xa5, - /* (2^375)P */ 0x5a, 0x61, 0xf1, 0x59, 0x7c, 0x38, 0xda, 0xe2, 0x85, 0x99, 0x68, 0xe9, 0xc9, 0xf7, 0x32, 0x7e, 0xc4, 0xca, 0xb7, 0x11, 0x08, 0x69, 0x2b, 0x66, 0x02, 0xf7, 0x2e, 0x18, 0xc3, 0x8e, 0xe1, 0xf9, 0xc5, 0x19, 0x9a, 0x0a, 0x9c, 0x07, 0xba, 0xc7, 0x9c, 0x03, 0x34, 0x89, 0x99, 0x67, 0x0b, 0x16, 0x4b, 0x07, 0x36, 0x16, 0x36, 0x2c, 0xe2, 0xa1, - /* (2^376)P */ 0x70, 0x10, 0x91, 0x27, 0xa8, 0x24, 0x8e, 0x29, 0x04, 0x6f, 0x79, 0x1f, 0xd3, 0xa5, 0x68, 0xd3, 0x0b, 0x7d, 0x56, 0x4d, 0x14, 0x57, 0x7b, 0x2e, 0x00, 0x9f, 0x9a, 0xfd, 0x6c, 0x63, 0x18, 0x81, 0xdb, 0x9d, 0xb7, 0xd7, 0xa4, 0x1e, 0xe8, 0x40, 0xf1, 0x4c, 0xa3, 0x01, 0xd5, 0x4b, 0x75, 0xea, 0xdd, 0x97, 0xfd, 0x5b, 0xb2, 0x66, 0x6a, 0x24, - /* (2^377)P */ 0x72, 0x11, 0xfe, 0x73, 0x1b, 0xd3, 0xea, 0x7f, 0x93, 0x15, 0x15, 0x05, 0xfe, 0x40, 0xe8, 0x28, 0xd8, 0x50, 0x47, 0x66, 0xfa, 0xb7, 0xb5, 0x04, 0xba, 0x35, 0x1e, 0x32, 0x9f, 0x5f, 0x32, 0xba, 0x3d, 0xd1, 0xed, 0x9a, 0x76, 0xca, 0xa3, 0x3e, 0x77, 0xd8, 0xd8, 0x7c, 0x5f, 0x68, 0x42, 0xb5, 0x86, 0x7f, 0x3b, 0xc9, 0xc1, 0x89, 0x64, 0xda, - /* (2^378)P */ 0xd5, 0xd4, 0x17, 0x31, 0xfc, 0x6a, 0xfd, 0xb8, 0xe8, 0xe5, 0x3e, 0x39, 0x06, 0xe4, 0xd1, 0x90, 0x2a, 0xca, 0xf6, 0x54, 0x6c, 0x1b, 0x2f, 0x49, 0x97, 0xb1, 0x2a, 0x82, 0x43, 0x3d, 0x1f, 0x8b, 0xe2, 0x47, 0xc5, 0x24, 0xa8, 0xd5, 0x53, 0x29, 0x7d, 0xc6, 0x87, 0xa6, 0x25, 0x3a, 0x64, 0xdd, 0x71, 0x08, 0x9e, 0xcd, 0xe9, 0x45, 0xc7, 0xba, - /* (2^379)P */ 0x37, 0x72, 0x6d, 0x13, 0x7a, 0x8d, 0x04, 0x31, 0xe6, 0xe3, 0x9e, 0x36, 0x71, 0x3e, 0xc0, 0x1e, 0xe3, 0x71, 0xd3, 0x49, 0x4e, 0x4a, 0x36, 0x42, 0x68, 0x68, 0x61, 0xc7, 0x3c, 0xdb, 0x81, 0x49, 0xf7, 0x91, 0x4d, 0xea, 0x4c, 0x4f, 0x98, 0xc6, 0x7e, 0x60, 0x84, 0x4b, 0x6a, 0x37, 0xbb, 0x52, 0xf7, 0xce, 0x02, 0xe4, 0xad, 0xd1, 0x3c, 0xa7, - /* (2^380)P */ 0x51, 0x06, 0x2d, 0xf8, 0x08, 0xe8, 0xf1, 0x0c, 0xe5, 0xa9, 0xac, 0x29, 0x73, 0x3b, 0xed, 0x98, 0x5f, 0x55, 0x08, 0x38, 0x51, 0x44, 0x36, 0x5d, 0xea, 0xc3, 0xb8, 0x0e, 0xa0, 0x4f, 0xd2, 0x79, 0xe9, 0x98, 0xc3, 0xf5, 0x00, 0xb9, 0x26, 0x27, 0x42, 0xa8, 0x07, 0xc1, 0x12, 0x31, 0xc1, 0xc3, 0x3c, 0x3b, 0x7a, 0x72, 0x97, 0xc2, 0x70, 0x3a, - /* (2^381)P */ 0xf4, 0xb2, 0xba, 0x32, 0xbc, 0xa9, 0x2f, 0x87, 0xc7, 0x3c, 0x45, 0xcd, 0xae, 0xe2, 0x13, 0x6d, 0x3a, 0xf2, 0xf5, 0x66, 0x97, 0x29, 0xaf, 0x53, 0x9f, 0xda, 0xea, 0x14, 0xdf, 0x04, 0x98, 0x19, 0x95, 0x9e, 0x2a, 0x00, 0x5c, 0x9d, 0x1d, 0xf0, 0x39, 0x23, 0xff, 0xfc, 0xca, 0x36, 0xb7, 0xde, 0xdf, 0x37, 0x78, 0x52, 0x21, 0xfa, 0x19, 0x10, - /* (2^382)P */ 0x50, 0x20, 0x73, 0x74, 0x62, 0x21, 0xf2, 0xf7, 0x9b, 0x66, 0x85, 0x34, 0x74, 0xd4, 0x9d, 0x60, 0xd7, 0xbc, 0xc8, 0x46, 0x3b, 0xb8, 0x80, 0x42, 0x15, 0x0a, 0x6c, 0x35, 0x1a, 0x69, 0xf0, 0x1d, 0x4b, 0x29, 0x54, 0x5a, 0x9a, 0x48, 0xec, 0x9f, 0x37, 0x74, 0x91, 0xd0, 0xd1, 0x9e, 0x00, 0xc2, 0x76, 0x56, 0xd6, 0xa0, 0x15, 0x14, 0x83, 0x59, - /* (2^383)P */ 0xc2, 0xf8, 0x22, 0x20, 0x23, 0x07, 0xbd, 0x1d, 0x6f, 0x1e, 0x8c, 0x56, 0x06, 0x6a, 0x4b, 0x9f, 0xe2, 0xa9, 0x92, 0x46, 0x4b, 0x46, 0x59, 0xd7, 0xe1, 0xda, 0x14, 0x98, 0x07, 0x65, 0x7e, 0x28, 0x20, 0xf2, 0x9d, 0x4f, 0x36, 0x5c, 0x92, 0xe0, 0x9d, 0xfe, 0x3e, 0xda, 0xe4, 0x47, 0x19, 0x3c, 0x00, 0x7f, 0x22, 0xf2, 0x9e, 0x51, 0xae, 0x4d, - /* (2^384)P */ 0xbe, 0x8c, 0x1b, 0x10, 0xb6, 0xad, 0xcc, 0xcc, 0xd8, 0x5e, 0x21, 0xa6, 0xfb, 0xf1, 0xf6, 0xbd, 0x0a, 0x24, 0x67, 0xb4, 0x57, 0x7a, 0xbc, 0xe8, 0xe9, 0xff, 0xee, 0x0a, 0x1f, 0xee, 0xbd, 0xc8, 0x44, 0xed, 0x2b, 0xbb, 0x55, 0x1f, 0xdd, 0x7c, 0xb3, 0xeb, 0x3f, 0x63, 0xa1, 0x28, 0x91, 0x21, 0xab, 0x71, 0xc6, 0x4c, 0xd0, 0xe9, 0xb0, 0x21, - /* (2^385)P */ 0xad, 0xc9, 0x77, 0x2b, 0xee, 0x89, 0xa4, 0x7b, 0xfd, 0xf9, 0xf6, 0x14, 0xe4, 0xed, 0x1a, 0x16, 0x9b, 0x78, 0x41, 0x43, 0xa8, 0x83, 0x72, 0x06, 0x2e, 0x7c, 0xdf, 0xeb, 0x7e, 0xdd, 0xd7, 0x8b, 0xea, 0x9a, 0x2b, 0x03, 0xba, 0x57, 0xf3, 0xf1, 0xd9, 0xe5, 0x09, 0xc5, 0x98, 0x61, 0x1c, 0x51, 0x6d, 0x5d, 0x6e, 0xfb, 0x5e, 0x95, 0x9f, 0xb5, - /* (2^386)P */ 0x23, 0xe2, 0x1e, 0x95, 0xa3, 0x5e, 0x42, 0x10, 0xc7, 0xc3, 0x70, 0xbf, 0x4b, 0x6b, 0x83, 0x36, 0x93, 0xb7, 0x68, 0x47, 0x88, 0x3a, 0x10, 0x88, 0x48, 0x7f, 0x8c, 0xae, 0x54, 0x10, 0x02, 0xa4, 0x52, 0x8f, 0x8d, 0xf7, 0x26, 0x4f, 0x50, 0xc3, 0x6a, 0xe2, 0x4e, 0x3b, 0x4c, 0xb9, 0x8a, 0x14, 0x15, 0x6d, 0x21, 0x29, 0xb3, 0x6e, 0x4e, 0xd0, - /* (2^387)P */ 0x4c, 0x8a, 0x18, 0x3f, 0xb7, 0x20, 0xfd, 0x3e, 0x54, 0xca, 0x68, 0x3c, 0xea, 0x6f, 0xf4, 0x6b, 0xa2, 0xbd, 0x01, 0xbd, 0xfe, 0x08, 0xa8, 0xd8, 0xc2, 0x20, 0x36, 0x05, 0xcd, 0xe9, 0xf3, 0x9e, 0xfa, 0x85, 0x66, 0x8f, 0x4b, 0x1d, 0x8c, 0x64, 0x4f, 0xb8, 0xc6, 0x0f, 0x5b, 0x57, 0xd8, 0x24, 0x19, 0x5a, 0x14, 0x4b, 0x92, 0xd3, 0x96, 0xbc, - /* (2^388)P */ 0xa9, 0x3f, 0xc9, 0x6c, 0xca, 0x64, 0x1e, 0x6f, 0xdf, 0x65, 0x7f, 0x9a, 0x47, 0x6b, 0x8a, 0x60, 0x31, 0xa6, 0x06, 0xac, 0x69, 0x30, 0xe6, 0xea, 0x63, 0x42, 0x26, 0x5f, 0xdb, 0xd0, 0xf2, 0x8e, 0x34, 0x0a, 0x3a, 0xeb, 0xf3, 0x79, 0xc8, 0xb7, 0x60, 0x56, 0x5c, 0x37, 0x95, 0x71, 0xf8, 0x7f, 0x49, 0x3e, 0x9e, 0x01, 0x26, 0x1e, 0x80, 0x9f, - /* (2^389)P */ 0xf8, 0x16, 0x9a, 0xaa, 0xb0, 0x28, 0xb5, 0x8e, 0xd0, 0x60, 0xe5, 0x26, 0xa9, 0x47, 0xc4, 0x5c, 0xa9, 0x39, 0xfe, 0x0a, 0xd8, 0x07, 0x2b, 0xb3, 0xce, 0xf1, 0xea, 0x1a, 0xf4, 0x7b, 0x98, 0x31, 0x3d, 0x13, 0x29, 0x80, 0xe8, 0x0d, 0xcf, 0x56, 0x39, 0x86, 0x50, 0x0c, 0xb3, 0x18, 0xf4, 0xc5, 0xca, 0xf2, 0x6f, 0xcd, 0x8d, 0xd5, 0x02, 0xb0, - /* (2^390)P */ 0xbf, 0x39, 0x3f, 0xac, 0x6d, 0x1a, 0x6a, 0xe4, 0x42, 0x24, 0xd6, 0x41, 0x9d, 0xb9, 0x5b, 0x46, 0x73, 0x93, 0x76, 0xaa, 0xb7, 0x37, 0x36, 0xa6, 0x09, 0xe5, 0x04, 0x3b, 0x66, 0xc4, 0x29, 0x3e, 0x41, 0xc2, 0xcb, 0xe5, 0x17, 0xd7, 0x34, 0x67, 0x1d, 0x2c, 0x12, 0xec, 0x24, 0x7a, 0x40, 0xa2, 0x45, 0x41, 0xf0, 0x75, 0xed, 0x43, 0x30, 0xc9, - /* (2^391)P */ 0x80, 0xf6, 0x47, 0x5b, 0xad, 0x54, 0x02, 0xbc, 0xdd, 0xa4, 0xb2, 0xd7, 0x42, 0x95, 0xf2, 0x0d, 0x1b, 0xef, 0x37, 0xa7, 0xb4, 0x34, 0x04, 0x08, 0x71, 0x1b, 0xd3, 0xdf, 0xa1, 0xf0, 0x2b, 0xfa, 0xc0, 0x1f, 0xf3, 0x44, 0xb5, 0xc6, 0x47, 0x3d, 0x65, 0x67, 0x45, 0x4d, 0x2f, 0xde, 0x52, 0x73, 0xfc, 0x30, 0x01, 0x6b, 0xc1, 0x03, 0xd8, 0xd7, - /* (2^392)P */ 0x1c, 0x67, 0x55, 0x3e, 0x01, 0x17, 0x0f, 0x3e, 0xe5, 0x34, 0x58, 0xfc, 0xcb, 0x71, 0x24, 0x74, 0x5d, 0x36, 0x1e, 0x89, 0x2a, 0x63, 0xf8, 0xf8, 0x9f, 0x50, 0x9f, 0x32, 0x92, 0x29, 0xd8, 0x1a, 0xec, 0x76, 0x57, 0x6c, 0x67, 0x12, 0x6a, 0x6e, 0xef, 0x97, 0x1f, 0xc3, 0x77, 0x60, 0x3c, 0x22, 0xcb, 0xc7, 0x04, 0x1a, 0x89, 0x2d, 0x10, 0xa6, - /* (2^393)P */ 0x12, 0xf5, 0xa9, 0x26, 0x16, 0xd9, 0x3c, 0x65, 0x5d, 0x83, 0xab, 0xd1, 0x70, 0x6b, 0x1c, 0xdb, 0xe7, 0x86, 0x0d, 0xfb, 0xe7, 0xf8, 0x2a, 0x58, 0x6e, 0x7a, 0x66, 0x13, 0x53, 0x3a, 0x6f, 0x8d, 0x43, 0x5f, 0x14, 0x23, 0x14, 0xff, 0x3d, 0x52, 0x7f, 0xee, 0xbd, 0x7a, 0x34, 0x8b, 0x35, 0x24, 0xc3, 0x7a, 0xdb, 0xcf, 0x22, 0x74, 0x9a, 0x8f, - /* (2^394)P */ 0xdb, 0x20, 0xfc, 0xe5, 0x39, 0x4e, 0x7d, 0x78, 0xee, 0x0b, 0xbf, 0x1d, 0x80, 0xd4, 0x05, 0x4f, 0xb9, 0xd7, 0x4e, 0x94, 0x88, 0x9a, 0x50, 0x78, 0x1a, 0x70, 0x8c, 0xcc, 0x25, 0xb6, 0x61, 0x09, 0xdc, 0x7b, 0xea, 0x3f, 0x7f, 0xea, 0x2a, 0x0d, 0x47, 0x1c, 0x8e, 0xa6, 0x5b, 0xd2, 0xa3, 0x61, 0x93, 0x3c, 0x68, 0x9f, 0x8b, 0xea, 0xb0, 0xcb, - /* (2^395)P */ 0xff, 0x54, 0x02, 0x19, 0xae, 0x8b, 0x4c, 0x2c, 0x3a, 0xe0, 0xe4, 0xac, 0x87, 0xf7, 0x51, 0x45, 0x41, 0x43, 0xdc, 0xaa, 0xcd, 0xcb, 0xdc, 0x40, 0xe3, 0x44, 0x3b, 0x1d, 0x9e, 0x3d, 0xb9, 0x82, 0xcc, 0x7a, 0xc5, 0x12, 0xf8, 0x1e, 0xdd, 0xdb, 0x8d, 0xb0, 0x2a, 0xe8, 0xe6, 0x6c, 0x94, 0x3b, 0xb7, 0x2d, 0xba, 0x79, 0x3b, 0xb5, 0x86, 0xfb, - /* (2^396)P */ 0x82, 0x88, 0x13, 0xdd, 0x6c, 0xcd, 0x85, 0x2b, 0x90, 0x86, 0xb7, 0xac, 0x16, 0xa6, 0x6e, 0x6a, 0x94, 0xd8, 0x1e, 0x4e, 0x41, 0x0f, 0xce, 0x81, 0x6a, 0xa8, 0x26, 0x56, 0x43, 0x52, 0x52, 0xe6, 0xff, 0x88, 0xcf, 0x47, 0x05, 0x1d, 0xff, 0xf3, 0xa0, 0x10, 0xb2, 0x97, 0x87, 0xeb, 0x47, 0xbb, 0xfa, 0x1f, 0xe8, 0x4c, 0xce, 0xc4, 0xcd, 0x93, - /* (2^397)P */ 0xf4, 0x11, 0xf5, 0x8d, 0x89, 0x29, 0x79, 0xb3, 0x59, 0x0b, 0x29, 0x7d, 0x9c, 0x12, 0x4a, 0x65, 0x72, 0x3a, 0xf9, 0xec, 0x37, 0x18, 0x86, 0xef, 0x44, 0x07, 0x25, 0x74, 0x76, 0x53, 0xed, 0x51, 0x01, 0xc6, 0x28, 0xc5, 0xc3, 0x4a, 0x0f, 0x99, 0xec, 0xc8, 0x40, 0x5a, 0x83, 0x30, 0x79, 0xa2, 0x3e, 0x63, 0x09, 0x2d, 0x6f, 0x23, 0x54, 0x1c, - /* (2^398)P */ 0x5c, 0x6f, 0x3b, 0x1c, 0x30, 0x77, 0x7e, 0x87, 0x66, 0x83, 0x2e, 0x7e, 0x85, 0x50, 0xfd, 0xa0, 0x7a, 0xc2, 0xf5, 0x0f, 0xc1, 0x64, 0xe7, 0x0b, 0xbd, 0x59, 0xa7, 0xe7, 0x65, 0x53, 0xc3, 0xf5, 0x55, 0x5b, 0xe1, 0x82, 0x30, 0x5a, 0x61, 0xcd, 0xa0, 0x89, 0x32, 0xdb, 0x87, 0xfc, 0x21, 0x8a, 0xab, 0x6d, 0x82, 0xa8, 0x42, 0x81, 0x4f, 0xf2, - /* (2^399)P */ 0xb3, 0xeb, 0x88, 0x18, 0xf6, 0x56, 0x96, 0xbf, 0xba, 0x5d, 0x71, 0xa1, 0x5a, 0xd1, 0x04, 0x7b, 0xd5, 0x46, 0x01, 0x74, 0xfe, 0x15, 0x25, 0xb7, 0xff, 0x0c, 0x24, 0x47, 0xac, 0xfd, 0xab, 0x47, 0x32, 0xe1, 0x6a, 0x4e, 0xca, 0xcf, 0x7f, 0xdd, 0xf8, 0xd2, 0x4b, 0x3b, 0xf5, 0x17, 0xba, 0xba, 0x8b, 0xa1, 0xec, 0x28, 0x3f, 0x97, 0xab, 0x2a, - /* (2^400)P */ 0x51, 0x38, 0xc9, 0x5e, 0xc6, 0xb3, 0x64, 0xf2, 0x24, 0x4d, 0x04, 0x7d, 0xc8, 0x39, 0x0c, 0x4a, 0xc9, 0x73, 0x74, 0x1b, 0x5c, 0xb2, 0xc5, 0x41, 0x62, 0xa0, 0x4c, 0x6d, 0x8d, 0x91, 0x9a, 0x7b, 0x88, 0xab, 0x9c, 0x7e, 0x23, 0xdb, 0x6f, 0xb5, 0x72, 0xd6, 0x47, 0x40, 0xef, 0x22, 0x58, 0x62, 0x19, 0x6c, 0x38, 0xba, 0x5b, 0x00, 0x30, 0x9f, - /* (2^401)P */ 0x65, 0xbb, 0x3b, 0x9b, 0xe9, 0xae, 0xbf, 0xbe, 0xe4, 0x13, 0x95, 0xf3, 0xe3, 0x77, 0xcb, 0xe4, 0x9a, 0x22, 0xb5, 0x4a, 0x08, 0x9d, 0xb3, 0x9e, 0x27, 0xe0, 0x15, 0x6c, 0x9f, 0x7e, 0x9a, 0x5e, 0x15, 0x45, 0x25, 0x8d, 0x01, 0x0a, 0xd2, 0x2b, 0xbd, 0x48, 0x06, 0x0d, 0x18, 0x97, 0x4b, 0xdc, 0xbc, 0xf0, 0xcd, 0xb2, 0x52, 0x3c, 0xac, 0xf5, - /* (2^402)P */ 0x3e, 0xed, 0x47, 0x6b, 0x5c, 0xf6, 0x76, 0xd0, 0xe9, 0x15, 0xa3, 0xcb, 0x36, 0x00, 0x21, 0xa3, 0x79, 0x20, 0xa5, 0x3e, 0x88, 0x03, 0xcb, 0x7e, 0x63, 0xbb, 0xed, 0xa9, 0x13, 0x35, 0x16, 0xaf, 0x2e, 0xb4, 0x70, 0x14, 0x93, 0xfb, 0xc4, 0x9b, 0xd8, 0xb1, 0xbe, 0x43, 0xd1, 0x85, 0xb8, 0x97, 0xef, 0xea, 0x88, 0xa1, 0x25, 0x52, 0x62, 0x75, - /* (2^403)P */ 0x8e, 0x4f, 0xaa, 0x23, 0x62, 0x7e, 0x2b, 0x37, 0x89, 0x00, 0x11, 0x30, 0xc5, 0x33, 0x4a, 0x89, 0x8a, 0xe2, 0xfc, 0x5c, 0x6a, 0x75, 0xe5, 0xf7, 0x02, 0x4a, 0x9b, 0xf7, 0xb5, 0x6a, 0x85, 0x31, 0xd3, 0x5a, 0xcf, 0xc3, 0xf8, 0xde, 0x2f, 0xcf, 0xb5, 0x24, 0xf4, 0xe3, 0xa1, 0xad, 0x42, 0xae, 0x09, 0xb9, 0x2e, 0x04, 0x2d, 0x01, 0x22, 0x3f, - /* (2^404)P */ 0x41, 0x16, 0xfb, 0x7d, 0x50, 0xfd, 0xb5, 0xba, 0x88, 0x24, 0xba, 0xfd, 0x3d, 0xb2, 0x90, 0x15, 0xb7, 0xfa, 0xa2, 0xe1, 0x4c, 0x7d, 0xb9, 0xc6, 0xff, 0x81, 0x57, 0xb6, 0xc2, 0x9e, 0xcb, 0xc4, 0x35, 0xbd, 0x01, 0xb7, 0xaa, 0xce, 0xd0, 0xe9, 0xb5, 0xd6, 0x72, 0xbf, 0xd2, 0xee, 0xc7, 0xac, 0x94, 0xff, 0x29, 0x57, 0x02, 0x49, 0x09, 0xad, - /* (2^405)P */ 0x27, 0xa5, 0x78, 0x1b, 0xbf, 0x6b, 0xaf, 0x0b, 0x8c, 0xd9, 0xa8, 0x37, 0xb0, 0x67, 0x18, 0xb6, 0xc7, 0x05, 0x8a, 0x67, 0x03, 0x30, 0x62, 0x6e, 0x56, 0x82, 0xa9, 0x54, 0x3e, 0x0c, 0x4e, 0x07, 0xe1, 0x5a, 0x38, 0xed, 0xfa, 0xc8, 0x55, 0x6b, 0x08, 0xa3, 0x6b, 0x64, 0x2a, 0x15, 0xd6, 0x39, 0x6f, 0x47, 0x99, 0x42, 0x3f, 0x33, 0x84, 0x8f, - /* (2^406)P */ 0xbc, 0x45, 0x29, 0x81, 0x0e, 0xa4, 0xc5, 0x72, 0x3a, 0x10, 0xe1, 0xc4, 0x1e, 0xda, 0xc3, 0xfe, 0xb0, 0xce, 0xd2, 0x13, 0x34, 0x67, 0x21, 0xc6, 0x7e, 0xf9, 0x8c, 0xff, 0x39, 0x50, 0xae, 0x92, 0x60, 0x35, 0x2f, 0x8b, 0x6e, 0xc9, 0xc1, 0x27, 0x3a, 0x94, 0x66, 0x3e, 0x26, 0x84, 0x93, 0xc8, 0x6c, 0xcf, 0xd2, 0x03, 0xa1, 0x10, 0xcf, 0xb7, - /* (2^407)P */ 0x64, 0xda, 0x19, 0xf6, 0xc5, 0x73, 0x17, 0x44, 0x88, 0x81, 0x07, 0x0d, 0x34, 0xb2, 0x75, 0xf9, 0xd9, 0xe2, 0xe0, 0x8b, 0x71, 0xcf, 0x72, 0x34, 0x83, 0xb4, 0xce, 0xfc, 0xd7, 0x29, 0x09, 0x5a, 0x98, 0xbf, 0x14, 0xac, 0x77, 0x55, 0x38, 0x47, 0x5b, 0x0f, 0x40, 0x24, 0xe5, 0xa5, 0xa6, 0xac, 0x2d, 0xa6, 0xff, 0x9c, 0x73, 0xfe, 0x5c, 0x7e, - /* (2^408)P */ 0x1e, 0x33, 0xcc, 0x68, 0xb2, 0xbc, 0x8c, 0x93, 0xaf, 0xcc, 0x38, 0xf8, 0xd9, 0x16, 0x72, 0x50, 0xac, 0xd9, 0xb5, 0x0b, 0x9a, 0xbe, 0x46, 0x7a, 0xf1, 0xee, 0xf1, 0xad, 0xec, 0x5b, 0x59, 0x27, 0x9c, 0x05, 0xa3, 0x87, 0xe0, 0x37, 0x2c, 0x83, 0xce, 0xb3, 0x65, 0x09, 0x8e, 0xc3, 0x9c, 0xbf, 0x6a, 0xa2, 0x00, 0xcc, 0x12, 0x36, 0xc5, 0x95, - /* (2^409)P */ 0x36, 0x11, 0x02, 0x14, 0x9c, 0x3c, 0xeb, 0x2f, 0x23, 0x5b, 0x6b, 0x2b, 0x08, 0x54, 0x53, 0xac, 0xb2, 0xa3, 0xe0, 0x26, 0x62, 0x3c, 0xe4, 0xe1, 0x81, 0xee, 0x13, 0x3e, 0xa4, 0x97, 0xef, 0xf9, 0x92, 0x27, 0x01, 0xce, 0x54, 0x8b, 0x3e, 0x31, 0xbe, 0xa7, 0x88, 0xcf, 0x47, 0x99, 0x3c, 0x10, 0x6f, 0x60, 0xb3, 0x06, 0x4e, 0xee, 0x1b, 0xf0, - /* (2^410)P */ 0x59, 0x49, 0x66, 0xcf, 0x22, 0xe6, 0xf6, 0x73, 0xfe, 0xa3, 0x1c, 0x09, 0xfa, 0x5f, 0x65, 0xa8, 0xf0, 0x82, 0xc2, 0xef, 0x16, 0x63, 0x6e, 0x79, 0x69, 0x51, 0x39, 0x07, 0x65, 0xc4, 0x81, 0xec, 0x73, 0x0f, 0x15, 0x93, 0xe1, 0x30, 0x33, 0xe9, 0x37, 0x86, 0x42, 0x4c, 0x1f, 0x9b, 0xad, 0xee, 0x3f, 0xf1, 0x2a, 0x8e, 0x6a, 0xa3, 0xc8, 0x35, - /* (2^411)P */ 0x1e, 0x49, 0xf1, 0xdd, 0xd2, 0x9c, 0x8e, 0x78, 0xb2, 0x06, 0xe4, 0x6a, 0xab, 0x3a, 0xdc, 0xcd, 0xf4, 0xeb, 0xe1, 0xe7, 0x2f, 0xaa, 0xeb, 0x40, 0x31, 0x9f, 0xb9, 0xab, 0x13, 0xa9, 0x78, 0xbf, 0x38, 0x89, 0x0e, 0x85, 0x14, 0x8b, 0x46, 0x76, 0x14, 0xda, 0xcf, 0x33, 0xc8, 0x79, 0xd3, 0xd5, 0xa3, 0x6a, 0x69, 0x45, 0x70, 0x34, 0xc3, 0xe9, - /* (2^412)P */ 0x5e, 0xe7, 0x78, 0xe9, 0x24, 0xcc, 0xe9, 0xf4, 0xc8, 0x6b, 0xe0, 0xfb, 0x3a, 0xbe, 0xcc, 0x42, 0x4a, 0x00, 0x22, 0xf8, 0xe6, 0x32, 0xbe, 0x6d, 0x18, 0x55, 0x60, 0xe9, 0x72, 0x69, 0x50, 0x56, 0xca, 0x04, 0x18, 0x38, 0xa1, 0xee, 0xd8, 0x38, 0x3c, 0xa7, 0x70, 0xe2, 0xb9, 0x4c, 0xa0, 0xc8, 0x89, 0x72, 0xcf, 0x49, 0x7f, 0xdf, 0xbc, 0x67, - /* (2^413)P */ 0x1d, 0x17, 0xcb, 0x0b, 0xbd, 0xb2, 0x36, 0xe3, 0xa8, 0x99, 0x31, 0xb6, 0x26, 0x9c, 0x0c, 0x74, 0xaf, 0x4d, 0x24, 0x61, 0xcf, 0x31, 0x7b, 0xed, 0xdd, 0xc3, 0xf6, 0x32, 0x70, 0xfe, 0x17, 0xf6, 0x51, 0x37, 0x65, 0xce, 0x5d, 0xaf, 0xa5, 0x2f, 0x2a, 0xfe, 0x00, 0x71, 0x7c, 0x50, 0xbe, 0x21, 0xc7, 0xed, 0xc6, 0xfc, 0x67, 0xcf, 0x9c, 0xdd, - /* (2^414)P */ 0x26, 0x3e, 0xf8, 0xbb, 0xd0, 0xb1, 0x01, 0xd8, 0xeb, 0x0b, 0x62, 0x87, 0x35, 0x4c, 0xde, 0xca, 0x99, 0x9c, 0x6d, 0xf7, 0xb6, 0xf0, 0x57, 0x0a, 0x52, 0x29, 0x6a, 0x3f, 0x26, 0x31, 0x04, 0x07, 0x2a, 0xc9, 0xfa, 0x9b, 0x0e, 0x62, 0x8e, 0x72, 0xf2, 0xad, 0xce, 0xb6, 0x35, 0x7a, 0xc1, 0xae, 0x35, 0xc7, 0xa3, 0x14, 0xcf, 0x0c, 0x28, 0xb7, - /* (2^415)P */ 0xa6, 0xf1, 0x32, 0x3a, 0x20, 0xd2, 0x24, 0x97, 0xcf, 0x5d, 0x37, 0x99, 0xaf, 0x33, 0x7a, 0x5b, 0x7a, 0xcc, 0x4e, 0x41, 0x38, 0xb1, 0x4e, 0xad, 0xc9, 0xd9, 0x71, 0x7e, 0xb2, 0xf5, 0xd5, 0x01, 0x6c, 0x4d, 0xfd, 0xa1, 0xda, 0x03, 0x38, 0x9b, 0x3d, 0x92, 0x92, 0xf2, 0xca, 0xbf, 0x1f, 0x24, 0xa4, 0xbb, 0x30, 0x6a, 0x74, 0x56, 0xc8, 0xce, - /* (2^416)P */ 0x27, 0xf4, 0xed, 0xc9, 0xc3, 0xb1, 0x79, 0x85, 0xbe, 0xf6, 0xeb, 0xf3, 0x55, 0xc7, 0xaa, 0xa6, 0xe9, 0x07, 0x5d, 0xf4, 0xeb, 0xa6, 0x81, 0xe3, 0x0e, 0xcf, 0xa3, 0xc1, 0xef, 0xe7, 0x34, 0xb2, 0x03, 0x73, 0x8a, 0x91, 0xf1, 0xad, 0x05, 0xc7, 0x0b, 0x43, 0x99, 0x12, 0x31, 0xc8, 0xc7, 0xc5, 0xa4, 0x3d, 0xcd, 0xe5, 0x4e, 0x6d, 0x24, 0xdd, - /* (2^417)P */ 0x61, 0x54, 0xd0, 0x95, 0x2c, 0x45, 0x75, 0xac, 0xb5, 0x1a, 0x9d, 0x11, 0xeb, 0xed, 0x6b, 0x57, 0xa3, 0xe6, 0xcd, 0x77, 0xd4, 0x83, 0x8e, 0x39, 0xf1, 0x0f, 0x98, 0xcb, 0x40, 0x02, 0x6e, 0x10, 0x82, 0x9e, 0xb4, 0x93, 0x76, 0xd7, 0x97, 0xa3, 0x53, 0x12, 0x86, 0xc6, 0x15, 0x78, 0x73, 0x93, 0xe7, 0x7f, 0xcf, 0x1f, 0xbf, 0xcd, 0xd2, 0x7a, - /* (2^418)P */ 0xc2, 0x21, 0xdc, 0xd5, 0x69, 0xff, 0xca, 0x49, 0x3a, 0xe1, 0xc3, 0x69, 0x41, 0x56, 0xc1, 0x76, 0x63, 0x24, 0xbd, 0x64, 0x1b, 0x3d, 0x92, 0xf9, 0x13, 0x04, 0x25, 0xeb, 0x27, 0xa6, 0xef, 0x39, 0x3a, 0x80, 0xe0, 0xf8, 0x27, 0xee, 0xc9, 0x49, 0x77, 0xef, 0x3f, 0x29, 0x3d, 0x5e, 0xe6, 0x66, 0x83, 0xd1, 0xf6, 0xfe, 0x9d, 0xbc, 0xf1, 0x96, - /* (2^419)P */ 0x6b, 0xc6, 0x99, 0x26, 0x3c, 0xf3, 0x63, 0xf9, 0xc7, 0x29, 0x8c, 0x52, 0x62, 0x2d, 0xdc, 0x8a, 0x66, 0xce, 0x2c, 0xa7, 0xe4, 0xf0, 0xd7, 0x37, 0x17, 0x1e, 0xe4, 0xa3, 0x53, 0x7b, 0x29, 0x8e, 0x60, 0x99, 0xf9, 0x0c, 0x7c, 0x6f, 0xa2, 0xcc, 0x9f, 0x80, 0xdd, 0x5e, 0x46, 0xaa, 0x0d, 0x6c, 0xc9, 0x6c, 0xf7, 0x78, 0x5b, 0x38, 0xe3, 0x24, - /* (2^420)P */ 0x4b, 0x75, 0x6a, 0x2f, 0x08, 0xe1, 0x72, 0x76, 0xab, 0x82, 0x96, 0xdf, 0x3b, 0x1f, 0x9b, 0xd8, 0xed, 0xdb, 0xcd, 0x15, 0x09, 0x5a, 0x1e, 0xb7, 0xc5, 0x26, 0x72, 0x07, 0x0c, 0x50, 0xcd, 0x3b, 0x4d, 0x3f, 0xa2, 0x67, 0xc2, 0x02, 0x61, 0x2e, 0x68, 0xe9, 0x6f, 0xf0, 0x21, 0x2a, 0xa7, 0x3b, 0x88, 0x04, 0x11, 0x64, 0x49, 0x0d, 0xb4, 0x46, - /* (2^421)P */ 0x63, 0x85, 0xf3, 0xc5, 0x2b, 0x5a, 0x9f, 0xf0, 0x17, 0xcb, 0x45, 0x0a, 0xf3, 0x6e, 0x7e, 0xb0, 0x7c, 0xbc, 0xf0, 0x4f, 0x3a, 0xb0, 0xbc, 0x36, 0x36, 0x52, 0x51, 0xcb, 0xfe, 0x9a, 0xcb, 0xe8, 0x7e, 0x4b, 0x06, 0x7f, 0xaa, 0x35, 0xc8, 0x0e, 0x7a, 0x30, 0xa3, 0xb1, 0x09, 0xbb, 0x86, 0x4c, 0xbe, 0xb8, 0xbd, 0xe0, 0x32, 0xa5, 0xd4, 0xf7, - /* (2^422)P */ 0x7d, 0x50, 0x37, 0x68, 0x4e, 0x22, 0xb2, 0x2c, 0xd5, 0x0f, 0x2b, 0x6d, 0xb1, 0x51, 0xf2, 0x82, 0xe9, 0x98, 0x7c, 0x50, 0xc7, 0x96, 0x7e, 0x0e, 0xdc, 0xb1, 0x0e, 0xb2, 0x63, 0x8c, 0x30, 0x37, 0x72, 0x21, 0x9c, 0x61, 0xc2, 0xa7, 0x33, 0xd9, 0xb2, 0x63, 0x93, 0xd1, 0x6b, 0x6a, 0x73, 0xa5, 0x58, 0x80, 0xff, 0x04, 0xc7, 0x83, 0x21, 0x29, - /* (2^423)P */ 0x29, 0x04, 0xbc, 0x99, 0x39, 0xc9, 0x58, 0xc9, 0x6b, 0x17, 0xe8, 0x90, 0xb3, 0xe6, 0xa9, 0xb6, 0x28, 0x9b, 0xcb, 0x3b, 0x28, 0x90, 0x68, 0x71, 0xff, 0xcf, 0x08, 0x78, 0xc9, 0x8d, 0xa8, 0x4e, 0x43, 0xd1, 0x1c, 0x9e, 0xa4, 0xe3, 0xdf, 0xbf, 0x92, 0xf4, 0xf9, 0x41, 0xba, 0x4d, 0x1c, 0xf9, 0xdd, 0x74, 0x76, 0x1c, 0x6e, 0x3e, 0x94, 0x87, - /* (2^424)P */ 0xe4, 0xda, 0xc5, 0xd7, 0xfb, 0x87, 0xc5, 0x4d, 0x6b, 0x19, 0xaa, 0xb9, 0xbc, 0x8c, 0xf2, 0x8a, 0xd8, 0x5d, 0xdb, 0x4d, 0xef, 0xa6, 0xf2, 0x65, 0xf1, 0x22, 0x9c, 0xf1, 0x46, 0x30, 0x71, 0x7c, 0xe4, 0x53, 0x8e, 0x55, 0x2e, 0x9c, 0x9a, 0x31, 0x2a, 0xc3, 0xab, 0x0f, 0xde, 0xe4, 0xbe, 0xd8, 0x96, 0x50, 0x6e, 0x0c, 0x54, 0x49, 0xe6, 0xec, - /* (2^425)P */ 0x3c, 0x1d, 0x5a, 0xa5, 0xda, 0xad, 0xdd, 0xc2, 0xae, 0xac, 0x6f, 0x86, 0x75, 0x31, 0x91, 0x64, 0x45, 0x9d, 0xa4, 0xf0, 0x81, 0xf1, 0x0e, 0xba, 0x74, 0xaf, 0x7b, 0xcd, 0x6f, 0xfe, 0xac, 0x4e, 0xdb, 0x4e, 0x45, 0x35, 0x36, 0xc5, 0xc0, 0x6c, 0x3d, 0x64, 0xf4, 0xd8, 0x07, 0x62, 0xd1, 0xec, 0xf3, 0xfc, 0x93, 0xc9, 0x28, 0x0c, 0x2c, 0xf3, - /* (2^426)P */ 0x0c, 0x69, 0x2b, 0x5c, 0xb6, 0x41, 0x69, 0xf1, 0xa4, 0xf1, 0x5b, 0x75, 0x4c, 0x42, 0x8b, 0x47, 0xeb, 0x69, 0xfb, 0xa8, 0xe6, 0xf9, 0x7b, 0x48, 0x50, 0xaf, 0xd3, 0xda, 0xb2, 0x35, 0x10, 0xb5, 0x5b, 0x40, 0x90, 0x39, 0xc9, 0x07, 0x06, 0x73, 0x26, 0x20, 0x95, 0x01, 0xa4, 0x2d, 0xf0, 0xe7, 0x2e, 0x00, 0x7d, 0x41, 0x09, 0x68, 0x13, 0xc4, - /* (2^427)P */ 0xbe, 0x38, 0x78, 0xcf, 0xc9, 0x4f, 0x36, 0xca, 0x09, 0x61, 0x31, 0x3c, 0x57, 0x2e, 0xec, 0x17, 0xa4, 0x7d, 0x19, 0x2b, 0x9b, 0x5b, 0xbe, 0x8f, 0xd6, 0xc5, 0x2f, 0x86, 0xf2, 0x64, 0x76, 0x17, 0x00, 0x6e, 0x1a, 0x8c, 0x67, 0x1b, 0x68, 0xeb, 0x15, 0xa2, 0xd6, 0x09, 0x91, 0xdd, 0x23, 0x0d, 0x98, 0xb2, 0x10, 0x19, 0x55, 0x9b, 0x63, 0xf2, - /* (2^428)P */ 0x51, 0x1f, 0x93, 0xea, 0x2a, 0x3a, 0xfa, 0x41, 0xc0, 0x57, 0xfb, 0x74, 0xa6, 0x65, 0x09, 0x56, 0x14, 0xb6, 0x12, 0xaa, 0xb3, 0x1a, 0x8d, 0x3b, 0x76, 0x91, 0x7a, 0x23, 0x56, 0x9c, 0x6a, 0xc0, 0xe0, 0x3c, 0x3f, 0xb5, 0x1a, 0xf4, 0x57, 0x71, 0x93, 0x2b, 0xb1, 0xa7, 0x70, 0x57, 0x22, 0x80, 0xf5, 0xb8, 0x07, 0x77, 0x87, 0x0c, 0xbe, 0x83, - /* (2^429)P */ 0x07, 0x9b, 0x0e, 0x52, 0x38, 0x63, 0x13, 0x86, 0x6a, 0xa6, 0xb4, 0xd2, 0x60, 0x68, 0x9a, 0x99, 0x82, 0x0a, 0x04, 0x5f, 0x89, 0x7a, 0x1a, 0x2a, 0xae, 0x2d, 0x35, 0x0c, 0x1e, 0xad, 0xef, 0x4f, 0x9a, 0xfc, 0xc8, 0xd9, 0xcf, 0x9d, 0x48, 0x71, 0xa5, 0x55, 0x79, 0x73, 0x39, 0x1b, 0xd8, 0x73, 0xec, 0x9b, 0x03, 0x16, 0xd8, 0x82, 0xf7, 0x67, - /* (2^430)P */ 0x52, 0x67, 0x42, 0x21, 0xc9, 0x40, 0x78, 0x82, 0x2b, 0x95, 0x2d, 0x20, 0x92, 0xd1, 0xe2, 0x61, 0x25, 0xb0, 0xc6, 0x9c, 0x20, 0x59, 0x8e, 0x28, 0x6f, 0xf3, 0xfd, 0xd3, 0xc1, 0x32, 0x43, 0xc9, 0xa6, 0x08, 0x7a, 0x77, 0x9c, 0x4c, 0x8c, 0x33, 0x71, 0x13, 0x69, 0xe3, 0x52, 0x30, 0xa7, 0xf5, 0x07, 0x67, 0xac, 0xad, 0x46, 0x8a, 0x26, 0x25, - /* (2^431)P */ 0xda, 0x86, 0xc4, 0xa2, 0x71, 0x56, 0xdd, 0xd2, 0x48, 0xd3, 0xde, 0x42, 0x63, 0x01, 0xa7, 0x2c, 0x92, 0x83, 0x6f, 0x2e, 0xd8, 0x1e, 0x3f, 0xc1, 0xc5, 0x42, 0x4e, 0x34, 0x19, 0x54, 0x6e, 0x35, 0x2c, 0x51, 0x2e, 0xfd, 0x0f, 0x9a, 0x45, 0x66, 0x5e, 0x4a, 0x83, 0xda, 0x0a, 0x53, 0x68, 0x63, 0xfa, 0xce, 0x47, 0x20, 0xd3, 0x34, 0xba, 0x0d, - /* (2^432)P */ 0xd0, 0xe9, 0x64, 0xa4, 0x61, 0x4b, 0x86, 0xe5, 0x93, 0x6f, 0xda, 0x0e, 0x31, 0x7e, 0x6e, 0xe3, 0xc6, 0x73, 0xd8, 0xa3, 0x08, 0x57, 0x52, 0xcd, 0x51, 0x63, 0x1d, 0x9f, 0x93, 0x00, 0x62, 0x91, 0x26, 0x21, 0xa7, 0xdd, 0x25, 0x0f, 0x09, 0x0d, 0x35, 0xad, 0xcf, 0x11, 0x8e, 0x6e, 0xe8, 0xae, 0x1d, 0x95, 0xcb, 0x88, 0xf8, 0x70, 0x7b, 0x91, - /* (2^433)P */ 0x0c, 0x19, 0x5c, 0xd9, 0x8d, 0xda, 0x9d, 0x2c, 0x90, 0x54, 0x65, 0xe8, 0xb6, 0x35, 0x50, 0xae, 0xea, 0xae, 0x43, 0xb7, 0x1e, 0x99, 0x8b, 0x4c, 0x36, 0x4e, 0xe4, 0x1e, 0xc4, 0x64, 0x43, 0xb6, 0xeb, 0xd4, 0xe9, 0x60, 0x22, 0xee, 0xcf, 0xb8, 0x52, 0x1b, 0xf0, 0x04, 0xce, 0xbc, 0x2b, 0xf0, 0xbe, 0xcd, 0x44, 0x74, 0x1e, 0x1f, 0x63, 0xf9, - /* (2^434)P */ 0xe1, 0x3f, 0x95, 0x94, 0xb2, 0xb6, 0x31, 0xa9, 0x1b, 0xdb, 0xfd, 0x0e, 0xdb, 0xdd, 0x1a, 0x22, 0x78, 0x60, 0x9f, 0x75, 0x5f, 0x93, 0x06, 0x0c, 0xd8, 0xbb, 0xa2, 0x85, 0x2b, 0x5e, 0xc0, 0x9b, 0xa8, 0x5d, 0xaf, 0x93, 0x91, 0x91, 0x47, 0x41, 0x1a, 0xfc, 0xb4, 0x51, 0x85, 0xad, 0x69, 0x4d, 0x73, 0x69, 0xd5, 0x4e, 0x82, 0xfb, 0x66, 0xcb, - /* (2^435)P */ 0x7c, 0xbe, 0xc7, 0x51, 0xc4, 0x74, 0x6e, 0xab, 0xfd, 0x41, 0x4f, 0x76, 0x4f, 0x24, 0x03, 0xd6, 0x2a, 0xb7, 0x42, 0xb4, 0xda, 0x41, 0x2c, 0x82, 0x48, 0x4c, 0x7f, 0x6f, 0x25, 0x5d, 0x36, 0xd4, 0x69, 0xf5, 0xef, 0x02, 0x81, 0xea, 0x6f, 0x19, 0x69, 0xe8, 0x6f, 0x5b, 0x2f, 0x14, 0x0e, 0x6f, 0x89, 0xb4, 0xb5, 0xd8, 0xae, 0xef, 0x7b, 0x87, - /* (2^436)P */ 0xe9, 0x91, 0xa0, 0x8b, 0xc9, 0xe0, 0x01, 0x90, 0x37, 0xc1, 0x6f, 0xdc, 0x5e, 0xf7, 0xbf, 0x43, 0x00, 0xaa, 0x10, 0x76, 0x76, 0x18, 0x6e, 0x19, 0x1e, 0x94, 0x50, 0x11, 0x0a, 0xd1, 0xe2, 0xdb, 0x08, 0x21, 0xa0, 0x1f, 0xdb, 0x54, 0xfe, 0xea, 0x6e, 0xa3, 0x68, 0x56, 0x87, 0x0b, 0x22, 0x4e, 0x66, 0xf3, 0x82, 0x82, 0x00, 0xcd, 0xd4, 0x12, - /* (2^437)P */ 0x25, 0x8e, 0x24, 0x77, 0x64, 0x4c, 0xe0, 0xf8, 0x18, 0xc0, 0xdc, 0xc7, 0x1b, 0x35, 0x65, 0xde, 0x67, 0x41, 0x5e, 0x6f, 0x90, 0x82, 0xa7, 0x2e, 0x6d, 0xf1, 0x47, 0xb4, 0x92, 0x9c, 0xfd, 0x6a, 0x9a, 0x41, 0x36, 0x20, 0x24, 0x58, 0xc3, 0x59, 0x07, 0x9a, 0xfa, 0x9f, 0x03, 0xcb, 0xc7, 0x69, 0x37, 0x60, 0xe1, 0xab, 0x13, 0x72, 0xee, 0xa2, - /* (2^438)P */ 0x74, 0x78, 0xfb, 0x13, 0xcb, 0x8e, 0x37, 0x1a, 0xf6, 0x1d, 0x17, 0x83, 0x06, 0xd4, 0x27, 0x06, 0x21, 0xe8, 0xda, 0xdf, 0x6b, 0xf3, 0x83, 0x6b, 0x34, 0x8a, 0x8c, 0xee, 0x01, 0x05, 0x5b, 0xed, 0xd3, 0x1b, 0xc9, 0x64, 0x83, 0xc9, 0x49, 0xc2, 0x57, 0x1b, 0xdd, 0xcf, 0xf1, 0x9d, 0x63, 0xee, 0x1c, 0x0d, 0xa0, 0x0a, 0x73, 0x1f, 0x5b, 0x32, - /* (2^439)P */ 0x29, 0xce, 0x1e, 0xc0, 0x6a, 0xf5, 0xeb, 0x99, 0x5a, 0x39, 0x23, 0xe9, 0xdd, 0xac, 0x44, 0x88, 0xbc, 0x80, 0x22, 0xde, 0x2c, 0xcb, 0xa8, 0x3b, 0xff, 0xf7, 0x6f, 0xc7, 0x71, 0x72, 0xa8, 0xa3, 0xf6, 0x4d, 0xc6, 0x75, 0xda, 0x80, 0xdc, 0xd9, 0x30, 0xd9, 0x07, 0x50, 0x5a, 0x54, 0x7d, 0xda, 0x39, 0x6f, 0x78, 0x94, 0xbf, 0x25, 0x98, 0xdc, - /* (2^440)P */ 0x01, 0x26, 0x62, 0x44, 0xfb, 0x0f, 0x11, 0x72, 0x73, 0x0a, 0x16, 0xc7, 0x16, 0x9c, 0x9b, 0x37, 0xd8, 0xff, 0x4f, 0xfe, 0x57, 0xdb, 0xae, 0xef, 0x7d, 0x94, 0x30, 0x04, 0x70, 0x83, 0xde, 0x3c, 0xd4, 0xb5, 0x70, 0xda, 0xa7, 0x55, 0xc8, 0x19, 0xe1, 0x36, 0x15, 0x61, 0xe7, 0x3b, 0x7d, 0x85, 0xbb, 0xf3, 0x42, 0x5a, 0x94, 0xf4, 0x53, 0x2a, - /* (2^441)P */ 0x14, 0x60, 0xa6, 0x0b, 0x83, 0xe1, 0x23, 0x77, 0xc0, 0xce, 0x50, 0xed, 0x35, 0x8d, 0x98, 0x99, 0x7d, 0xf5, 0x8d, 0xce, 0x94, 0x25, 0xc8, 0x0f, 0x6d, 0xfa, 0x4a, 0xa4, 0x3a, 0x1f, 0x66, 0xfb, 0x5a, 0x64, 0xaf, 0x8b, 0x54, 0x54, 0x44, 0x3f, 0x5b, 0x88, 0x61, 0xe4, 0x48, 0x45, 0x26, 0x20, 0xbe, 0x0d, 0x06, 0xbb, 0x65, 0x59, 0xe1, 0x36, - /* (2^442)P */ 0xb7, 0x98, 0xce, 0xa3, 0xe3, 0xee, 0x11, 0x1b, 0x9e, 0x24, 0x59, 0x75, 0x31, 0x37, 0x44, 0x6f, 0x6b, 0x9e, 0xec, 0xb7, 0x44, 0x01, 0x7e, 0xab, 0xbb, 0x69, 0x5d, 0x11, 0xb0, 0x30, 0x64, 0xea, 0x91, 0xb4, 0x7a, 0x8c, 0x02, 0x4c, 0xb9, 0x10, 0xa7, 0xc7, 0x79, 0xe6, 0xdc, 0x77, 0xe3, 0xc8, 0xef, 0x3e, 0xf9, 0x38, 0x81, 0xce, 0x9a, 0xb2, - /* (2^443)P */ 0x91, 0x12, 0x76, 0xd0, 0x10, 0xb4, 0xaf, 0xe1, 0x89, 0x3a, 0x93, 0x6b, 0x5c, 0x19, 0x5f, 0x24, 0xed, 0x04, 0x92, 0xc7, 0xf0, 0x00, 0x08, 0xc1, 0x92, 0xff, 0x90, 0xdb, 0xb2, 0xbf, 0xdf, 0x49, 0xcd, 0xbd, 0x5c, 0x6e, 0xbf, 0x16, 0xbb, 0x61, 0xf9, 0x20, 0x33, 0x35, 0x93, 0x11, 0xbc, 0x59, 0x69, 0xce, 0x18, 0x9f, 0xf8, 0x7b, 0xa1, 0x6e, - /* (2^444)P */ 0xa1, 0xf4, 0xaf, 0xad, 0xf8, 0xe6, 0x99, 0xd2, 0xa1, 0x4d, 0xde, 0x56, 0xc9, 0x7b, 0x0b, 0x11, 0x3e, 0xbf, 0x89, 0x1a, 0x9a, 0x90, 0xe5, 0xe2, 0xa6, 0x37, 0x88, 0xa1, 0x68, 0x59, 0xae, 0x8c, 0xec, 0x02, 0x14, 0x8d, 0xb7, 0x2e, 0x25, 0x75, 0x7f, 0x76, 0x1a, 0xd3, 0x4d, 0xad, 0x8a, 0x00, 0x6c, 0x96, 0x49, 0xa4, 0xc3, 0x2e, 0x5c, 0x7b, - /* (2^445)P */ 0x26, 0x53, 0xf7, 0xda, 0xa8, 0x01, 0x14, 0xb1, 0x63, 0xe3, 0xc3, 0x89, 0x88, 0xb0, 0x85, 0x40, 0x2b, 0x26, 0x9a, 0x10, 0x1a, 0x70, 0x33, 0xf4, 0x50, 0x9d, 0x4d, 0xd8, 0x64, 0xc6, 0x0f, 0xe1, 0x17, 0xc8, 0x10, 0x4b, 0xfc, 0xa0, 0xc9, 0xba, 0x2c, 0x98, 0x09, 0xf5, 0x84, 0xb6, 0x7c, 0x4e, 0xa3, 0xe3, 0x81, 0x1b, 0x32, 0x60, 0x02, 0xdd, - /* (2^446)P */ 0xa3, 0xe5, 0x86, 0xd4, 0x43, 0xa8, 0xd1, 0x98, 0x9d, 0x9d, 0xdb, 0x04, 0xcf, 0x6e, 0x35, 0x05, 0x30, 0x53, 0x3b, 0xbc, 0x90, 0x00, 0x4a, 0xc5, 0x40, 0x2a, 0x0f, 0xde, 0x1a, 0xd7, 0x36, 0x27, 0x44, 0x62, 0xa6, 0xac, 0x9d, 0xd2, 0x70, 0x69, 0x14, 0x39, 0x9b, 0xd1, 0xc3, 0x0a, 0x3a, 0x82, 0x0e, 0xf1, 0x94, 0xd7, 0x42, 0x94, 0xd5, 0x7d, - /* (2^447)P */ 0x04, 0xc0, 0x6e, 0x12, 0x90, 0x70, 0xf9, 0xdf, 0xf7, 0xc9, 0x86, 0xc0, 0xe6, 0x92, 0x8b, 0x0a, 0xa1, 0xc1, 0x3b, 0xcc, 0x33, 0xb7, 0xf0, 0xeb, 0x51, 0x50, 0x80, 0x20, 0x69, 0x1c, 0x4f, 0x89, 0x05, 0x1e, 0xe4, 0x7a, 0x0a, 0xc2, 0xf0, 0xf5, 0x78, 0x91, 0x76, 0x34, 0x45, 0xdc, 0x24, 0x53, 0x24, 0x98, 0xe2, 0x73, 0x6f, 0xe6, 0x46, 0x67, -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/constants.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/constants.go deleted file mode 100644 index b6b236e5d..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/constants.go +++ /dev/null @@ -1,71 +0,0 @@ -package goldilocks - -import fp "github.com/cloudflare/circl/math/fp448" - -var ( - // genX is the x-coordinate of the generator of Goldilocks curve. - genX = fp.Elt{ - 0x5e, 0xc0, 0x0c, 0xc7, 0x2b, 0xa8, 0x26, 0x26, - 0x8e, 0x93, 0x00, 0x8b, 0xe1, 0x80, 0x3b, 0x43, - 0x11, 0x65, 0xb6, 0x2a, 0xf7, 0x1a, 0xae, 0x12, - 0x64, 0xa4, 0xd3, 0xa3, 0x24, 0xe3, 0x6d, 0xea, - 0x67, 0x17, 0x0f, 0x47, 0x70, 0x65, 0x14, 0x9e, - 0xda, 0x36, 0xbf, 0x22, 0xa6, 0x15, 0x1d, 0x22, - 0xed, 0x0d, 0xed, 0x6b, 0xc6, 0x70, 0x19, 0x4f, - } - // genY is the y-coordinate of the generator of Goldilocks curve. - genY = fp.Elt{ - 0x14, 0xfa, 0x30, 0xf2, 0x5b, 0x79, 0x08, 0x98, - 0xad, 0xc8, 0xd7, 0x4e, 0x2c, 0x13, 0xbd, 0xfd, - 0xc4, 0x39, 0x7c, 0xe6, 0x1c, 0xff, 0xd3, 0x3a, - 0xd7, 0xc2, 0xa0, 0x05, 0x1e, 0x9c, 0x78, 0x87, - 0x40, 0x98, 0xa3, 0x6c, 0x73, 0x73, 0xea, 0x4b, - 0x62, 0xc7, 0xc9, 0x56, 0x37, 0x20, 0x76, 0x88, - 0x24, 0xbc, 0xb6, 0x6e, 0x71, 0x46, 0x3f, 0x69, - } - // paramD is -39081 in Fp. - paramD = fp.Elt{ - 0x56, 0x67, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - } - // order is 2^446-0x8335dc163bb124b65129c96fde933d8d723a70aadc873d6d54a7bb0d, - // which is the number of points in the prime subgroup. - order = Scalar{ - 0xf3, 0x44, 0x58, 0xab, 0x92, 0xc2, 0x78, 0x23, - 0x55, 0x8f, 0xc5, 0x8d, 0x72, 0xc2, 0x6c, 0x21, - 0x90, 0x36, 0xd6, 0xae, 0x49, 0xdb, 0x4e, 0xc4, - 0xe9, 0x23, 0xca, 0x7c, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, - } - // residue448 is 2^448 mod order. - residue448 = [4]uint64{ - 0x721cf5b5529eec34, 0x7a4cf635c8e9c2ab, 0xeec492d944a725bf, 0x20cd77058, - } - // invFour is 1/4 mod order. - invFour = Scalar{ - 0x3d, 0x11, 0xd6, 0xaa, 0xa4, 0x30, 0xde, 0x48, - 0xd5, 0x63, 0x71, 0xa3, 0x9c, 0x30, 0x5b, 0x08, - 0xa4, 0x8d, 0xb5, 0x6b, 0xd2, 0xb6, 0x13, 0x71, - 0xfa, 0x88, 0x32, 0xdf, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, - } - // paramDTwist is -39082 in Fp. The D parameter of the twist curve. - paramDTwist = fp.Elt{ - 0x55, 0x67, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - } -) diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/curve.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/curve.go deleted file mode 100644 index 1f165141a..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/curve.go +++ /dev/null @@ -1,84 +0,0 @@ -// Package goldilocks provides elliptic curve operations over the goldilocks curve. -package goldilocks - -import fp "github.com/cloudflare/circl/math/fp448" - -// Curve is the Goldilocks curve x^2+y^2=z^2-39081x^2y^2. -type Curve struct{} - -// Identity returns the identity point. -func (Curve) Identity() *Point { - return &Point{ - y: fp.One(), - z: fp.One(), - } -} - -// IsOnCurve returns true if the point lies on the curve. -func (Curve) IsOnCurve(P *Point) bool { - x2, y2, t, t2, z2 := &fp.Elt{}, &fp.Elt{}, &fp.Elt{}, &fp.Elt{}, &fp.Elt{} - rhs, lhs := &fp.Elt{}, &fp.Elt{} - // Check z != 0 - eq0 := !fp.IsZero(&P.z) - - fp.Mul(t, &P.ta, &P.tb) // t = ta*tb - fp.Sqr(x2, &P.x) // x^2 - fp.Sqr(y2, &P.y) // y^2 - fp.Sqr(z2, &P.z) // z^2 - fp.Sqr(t2, t) // t^2 - fp.Add(lhs, x2, y2) // x^2 + y^2 - fp.Mul(rhs, t2, ¶mD) // dt^2 - fp.Add(rhs, rhs, z2) // z^2 + dt^2 - fp.Sub(lhs, lhs, rhs) // x^2 + y^2 - (z^2 + dt^2) - eq1 := fp.IsZero(lhs) - - fp.Mul(lhs, &P.x, &P.y) // xy - fp.Mul(rhs, t, &P.z) // tz - fp.Sub(lhs, lhs, rhs) // xy - tz - eq2 := fp.IsZero(lhs) - - return eq0 && eq1 && eq2 -} - -// Generator returns the generator point. -func (Curve) Generator() *Point { - return &Point{ - x: genX, - y: genY, - z: fp.One(), - ta: genX, - tb: genY, - } -} - -// Order returns the number of points in the prime subgroup. -func (Curve) Order() Scalar { return order } - -// Double returns 2P. -func (Curve) Double(P *Point) *Point { R := *P; R.Double(); return &R } - -// Add returns P+Q. -func (Curve) Add(P, Q *Point) *Point { R := *P; R.Add(Q); return &R } - -// ScalarMult returns kP. This function runs in constant time. -func (e Curve) ScalarMult(k *Scalar, P *Point) *Point { - k4 := &Scalar{} - k4.divBy4(k) - return e.pull(twistCurve{}.ScalarMult(k4, e.push(P))) -} - -// ScalarBaseMult returns kG where G is the generator point. This function runs in constant time. -func (e Curve) ScalarBaseMult(k *Scalar) *Point { - k4 := &Scalar{} - k4.divBy4(k) - return e.pull(twistCurve{}.ScalarBaseMult(k4)) -} - -// CombinedMult returns mG+nP, where G is the generator point. This function is non-constant time. -func (e Curve) CombinedMult(m, n *Scalar, P *Point) *Point { - m4 := &Scalar{} - n4 := &Scalar{} - m4.divBy4(m) - n4.divBy4(n) - return e.pull(twistCurve{}.CombinedMult(m4, n4, twistCurve{}.pull(P))) -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/isogeny.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/isogeny.go deleted file mode 100644 index b1daab851..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/isogeny.go +++ /dev/null @@ -1,52 +0,0 @@ -package goldilocks - -import fp "github.com/cloudflare/circl/math/fp448" - -func (Curve) pull(P *twistPoint) *Point { return twistCurve{}.push(P) } -func (twistCurve) pull(P *Point) *twistPoint { return Curve{}.push(P) } - -// push sends a point on the Goldilocks curve to a point on the twist curve. -func (Curve) push(P *Point) *twistPoint { - Q := &twistPoint{} - Px, Py, Pz := &P.x, &P.y, &P.z - a, b, c, d, e, f, g, h := &Q.x, &Q.y, &Q.z, &fp.Elt{}, &Q.ta, &Q.x, &Q.y, &Q.tb - fp.Add(e, Px, Py) // x+y - fp.Sqr(a, Px) // A = x^2 - fp.Sqr(b, Py) // B = y^2 - fp.Sqr(c, Pz) // z^2 - fp.Add(c, c, c) // C = 2*z^2 - *d = *a // D = A - fp.Sqr(e, e) // (x+y)^2 - fp.Sub(e, e, a) // (x+y)^2-A - fp.Sub(e, e, b) // E = (x+y)^2-A-B - fp.Add(h, b, d) // H = B+D - fp.Sub(g, b, d) // G = B-D - fp.Sub(f, c, h) // F = C-H - fp.Mul(&Q.z, f, g) // Z = F * G - fp.Mul(&Q.x, e, f) // X = E * F - fp.Mul(&Q.y, g, h) // Y = G * H, // T = E * H - return Q -} - -// push sends a point on the twist curve to a point on the Goldilocks curve. -func (twistCurve) push(P *twistPoint) *Point { - Q := &Point{} - Px, Py, Pz := &P.x, &P.y, &P.z - a, b, c, d, e, f, g, h := &Q.x, &Q.y, &Q.z, &fp.Elt{}, &Q.ta, &Q.x, &Q.y, &Q.tb - fp.Add(e, Px, Py) // x+y - fp.Sqr(a, Px) // A = x^2 - fp.Sqr(b, Py) // B = y^2 - fp.Sqr(c, Pz) // z^2 - fp.Add(c, c, c) // C = 2*z^2 - fp.Neg(d, a) // D = -A - fp.Sqr(e, e) // (x+y)^2 - fp.Sub(e, e, a) // (x+y)^2-A - fp.Sub(e, e, b) // E = (x+y)^2-A-B - fp.Add(h, b, d) // H = B+D - fp.Sub(g, b, d) // G = B-D - fp.Sub(f, c, h) // F = C-H - fp.Mul(&Q.z, f, g) // Z = F * G - fp.Mul(&Q.x, e, f) // X = E * F - fp.Mul(&Q.y, g, h) // Y = G * H, // T = E * H - return Q -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/point.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/point.go deleted file mode 100644 index 11f73de05..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/point.go +++ /dev/null @@ -1,171 +0,0 @@ -package goldilocks - -import ( - "errors" - "fmt" - - fp "github.com/cloudflare/circl/math/fp448" -) - -// Point is a point on the Goldilocks Curve. -type Point struct{ x, y, z, ta, tb fp.Elt } - -func (P Point) String() string { - return fmt.Sprintf("x: %v\ny: %v\nz: %v\nta: %v\ntb: %v", P.x, P.y, P.z, P.ta, P.tb) -} - -// FromAffine creates a point from affine coordinates. -func FromAffine(x, y *fp.Elt) (*Point, error) { - P := &Point{ - x: *x, - y: *y, - z: fp.One(), - ta: *x, - tb: *y, - } - if !(Curve{}).IsOnCurve(P) { - return P, errors.New("point not on curve") - } - return P, nil -} - -// isLessThan returns true if 0 <= x < y, and assumes that slices are of the -// same length and are interpreted in little-endian order. -func isLessThan(x, y []byte) bool { - i := len(x) - 1 - for i > 0 && x[i] == y[i] { - i-- - } - return x[i] < y[i] -} - -// FromBytes returns a point from the input buffer. -func FromBytes(in []byte) (*Point, error) { - if len(in) < fp.Size+1 { - return nil, errors.New("wrong input length") - } - err := errors.New("invalid decoding") - P := &Point{} - signX := in[fp.Size] >> 7 - copy(P.y[:], in[:fp.Size]) - p := fp.P() - if !isLessThan(P.y[:], p[:]) { - return nil, err - } - - u, v := &fp.Elt{}, &fp.Elt{} - one := fp.One() - fp.Sqr(u, &P.y) // u = y^2 - fp.Mul(v, u, ¶mD) // v = dy^2 - fp.Sub(u, u, &one) // u = y^2-1 - fp.Sub(v, v, &one) // v = dy^2-1 - isQR := fp.InvSqrt(&P.x, u, v) // x = sqrt(u/v) - if !isQR { - return nil, err - } - fp.Modp(&P.x) // x = x mod p - if fp.IsZero(&P.x) && signX == 1 { - return nil, err - } - if signX != (P.x[0] & 1) { - fp.Neg(&P.x, &P.x) - } - P.ta = P.x - P.tb = P.y - P.z = fp.One() - return P, nil -} - -// IsIdentity returns true is P is the identity Point. -func (P *Point) IsIdentity() bool { - return fp.IsZero(&P.x) && !fp.IsZero(&P.y) && !fp.IsZero(&P.z) && P.y == P.z -} - -// IsEqual returns true if P is equivalent to Q. -func (P *Point) IsEqual(Q *Point) bool { - l, r := &fp.Elt{}, &fp.Elt{} - fp.Mul(l, &P.x, &Q.z) - fp.Mul(r, &Q.x, &P.z) - fp.Sub(l, l, r) - b := fp.IsZero(l) - fp.Mul(l, &P.y, &Q.z) - fp.Mul(r, &Q.y, &P.z) - fp.Sub(l, l, r) - b = b && fp.IsZero(l) - fp.Mul(l, &P.ta, &P.tb) - fp.Mul(l, l, &Q.z) - fp.Mul(r, &Q.ta, &Q.tb) - fp.Mul(r, r, &P.z) - fp.Sub(l, l, r) - b = b && fp.IsZero(l) - return b -} - -// Neg obtains the inverse of the Point. -func (P *Point) Neg() { fp.Neg(&P.x, &P.x); fp.Neg(&P.ta, &P.ta) } - -// ToAffine returns the x,y affine coordinates of P. -func (P *Point) ToAffine() (x, y fp.Elt) { - fp.Inv(&P.z, &P.z) // 1/z - fp.Mul(&P.x, &P.x, &P.z) // x/z - fp.Mul(&P.y, &P.y, &P.z) // y/z - fp.Modp(&P.x) - fp.Modp(&P.y) - fp.SetOne(&P.z) - P.ta = P.x - P.tb = P.y - return P.x, P.y -} - -// ToBytes stores P into a slice of bytes. -func (P *Point) ToBytes(out []byte) error { - if len(out) < fp.Size+1 { - return errors.New("invalid decoding") - } - x, y := P.ToAffine() - out[fp.Size] = (x[0] & 1) << 7 - return fp.ToBytes(out[:fp.Size], &y) -} - -// MarshalBinary encodes the receiver into a binary form and returns the result. -func (P *Point) MarshalBinary() (data []byte, err error) { - data = make([]byte, fp.Size+1) - err = P.ToBytes(data[:fp.Size+1]) - return data, err -} - -// UnmarshalBinary must be able to decode the form generated by MarshalBinary. -func (P *Point) UnmarshalBinary(data []byte) error { Q, err := FromBytes(data); *P = *Q; return err } - -// Double sets P = 2Q. -func (P *Point) Double() { P.Add(P) } - -// Add sets P =P+Q.. -func (P *Point) Add(Q *Point) { - // This is formula (5) from "Twisted Edwards Curves Revisited" by - // Hisil H., Wong K.KH., Carter G., Dawson E. (2008) - // https://doi.org/10.1007/978-3-540-89255-7_20 - x1, y1, z1, ta1, tb1 := &P.x, &P.y, &P.z, &P.ta, &P.tb - x2, y2, z2, ta2, tb2 := &Q.x, &Q.y, &Q.z, &Q.ta, &Q.tb - x3, y3, z3, E, H := &P.x, &P.y, &P.z, &P.ta, &P.tb - A, B, C, D := &fp.Elt{}, &fp.Elt{}, &fp.Elt{}, &fp.Elt{} - t1, t2, F, G := C, D, &fp.Elt{}, &fp.Elt{} - fp.Mul(t1, ta1, tb1) // t1 = ta1*tb1 - fp.Mul(t2, ta2, tb2) // t2 = ta2*tb2 - fp.Mul(A, x1, x2) // A = x1*x2 - fp.Mul(B, y1, y2) // B = y1*y2 - fp.Mul(C, t1, t2) // t1*t2 - fp.Mul(C, C, ¶mD) // C = d*t1*t2 - fp.Mul(D, z1, z2) // D = z1*z2 - fp.Add(F, x1, y1) // x1+y1 - fp.Add(E, x2, y2) // x2+y2 - fp.Mul(E, E, F) // (x1+y1)*(x2+y2) - fp.Sub(E, E, A) // (x1+y1)*(x2+y2)-A - fp.Sub(E, E, B) // E = (x1+y1)*(x2+y2)-A-B - fp.Sub(F, D, C) // F = D-C - fp.Add(G, D, C) // G = D+C - fp.Sub(H, B, A) // H = B-A - fp.Mul(z3, F, G) // Z = F * G - fp.Mul(x3, E, F) // X = E * F - fp.Mul(y3, G, H) // Y = G * H, T = E * H -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/scalar.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/scalar.go deleted file mode 100644 index f98117b25..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/scalar.go +++ /dev/null @@ -1,203 +0,0 @@ -package goldilocks - -import ( - "encoding/binary" - "math/bits" -) - -// ScalarSize is the size (in bytes) of scalars. -const ScalarSize = 56 // 448 / 8 - -// _N is the number of 64-bit words to store scalars. -const _N = 7 // 448 / 64 - -// Scalar represents a positive integer stored in little-endian order. -type Scalar [ScalarSize]byte - -type scalar64 [_N]uint64 - -func (z *scalar64) fromScalar(x *Scalar) { - z[0] = binary.LittleEndian.Uint64(x[0*8 : 1*8]) - z[1] = binary.LittleEndian.Uint64(x[1*8 : 2*8]) - z[2] = binary.LittleEndian.Uint64(x[2*8 : 3*8]) - z[3] = binary.LittleEndian.Uint64(x[3*8 : 4*8]) - z[4] = binary.LittleEndian.Uint64(x[4*8 : 5*8]) - z[5] = binary.LittleEndian.Uint64(x[5*8 : 6*8]) - z[6] = binary.LittleEndian.Uint64(x[6*8 : 7*8]) -} - -func (z *scalar64) toScalar(x *Scalar) { - binary.LittleEndian.PutUint64(x[0*8:1*8], z[0]) - binary.LittleEndian.PutUint64(x[1*8:2*8], z[1]) - binary.LittleEndian.PutUint64(x[2*8:3*8], z[2]) - binary.LittleEndian.PutUint64(x[3*8:4*8], z[3]) - binary.LittleEndian.PutUint64(x[4*8:5*8], z[4]) - binary.LittleEndian.PutUint64(x[5*8:6*8], z[5]) - binary.LittleEndian.PutUint64(x[6*8:7*8], z[6]) -} - -// add calculates z = x + y. Assumes len(z) > max(len(x),len(y)). -func add(z, x, y []uint64) uint64 { - l, L, zz := len(x), len(y), y - if l > L { - l, L, zz = L, l, x - } - c := uint64(0) - for i := 0; i < l; i++ { - z[i], c = bits.Add64(x[i], y[i], c) - } - for i := l; i < L; i++ { - z[i], c = bits.Add64(zz[i], 0, c) - } - return c -} - -// sub calculates z = x - y. Assumes len(z) > max(len(x),len(y)). -func sub(z, x, y []uint64) uint64 { - l, L, zz := len(x), len(y), y - if l > L { - l, L, zz = L, l, x - } - c := uint64(0) - for i := 0; i < l; i++ { - z[i], c = bits.Sub64(x[i], y[i], c) - } - for i := l; i < L; i++ { - z[i], c = bits.Sub64(zz[i], 0, c) - } - return c -} - -// mulWord calculates z = x * y. Assumes len(z) >= len(x)+1. -func mulWord(z, x []uint64, y uint64) { - for i := range z { - z[i] = 0 - } - carry := uint64(0) - for i := range x { - hi, lo := bits.Mul64(x[i], y) - lo, cc := bits.Add64(lo, z[i], 0) - hi, _ = bits.Add64(hi, 0, cc) - z[i], cc = bits.Add64(lo, carry, 0) - carry, _ = bits.Add64(hi, 0, cc) - } - z[len(x)] = carry -} - -// Cmov moves x into z if b=1. -func (z *scalar64) Cmov(b uint64, x *scalar64) { - m := uint64(0) - b - for i := range z { - z[i] = (z[i] &^ m) | (x[i] & m) - } -} - -// leftShift shifts to the left the words of z returning the more significant word. -func (z *scalar64) leftShift(low uint64) uint64 { - high := z[_N-1] - for i := _N - 1; i > 0; i-- { - z[i] = z[i-1] - } - z[0] = low - return high -} - -// reduceOneWord calculates z = z + 2^448*x such that the result fits in a Scalar. -func (z *scalar64) reduceOneWord(x uint64) { - prod := (&scalar64{})[:] - mulWord(prod, residue448[:], x) - cc := add(z[:], z[:], prod) - mulWord(prod, residue448[:], cc) - add(z[:], z[:], prod) -} - -// modOrder reduces z mod order. -func (z *scalar64) modOrder() { - var o64, x scalar64 - o64.fromScalar(&order) - // Performs: while (z >= order) { z = z-order } - // At most 8 (eight) iterations reduce 3 bits by subtracting. - for i := 0; i < 8; i++ { - c := sub(x[:], z[:], o64[:]) // (c || x) = z-order - z.Cmov(1-c, &x) // if c != 0 { z = x } - } -} - -// FromBytes stores z = x mod order, where x is a number stored in little-endian order. -func (z *Scalar) FromBytes(x []byte) { - n := len(x) - nCeil := (n + 7) >> 3 - for i := range z { - z[i] = 0 - } - if nCeil < _N { - copy(z[:], x) - return - } - copy(z[:], x[8*(nCeil-_N):]) - var z64 scalar64 - z64.fromScalar(z) - for i := nCeil - _N - 1; i >= 0; i-- { - low := binary.LittleEndian.Uint64(x[8*i:]) - high := z64.leftShift(low) - z64.reduceOneWord(high) - } - z64.modOrder() - z64.toScalar(z) -} - -// divBy4 calculates z = x/4 mod order. -func (z *Scalar) divBy4(x *Scalar) { z.Mul(x, &invFour) } - -// Red reduces z mod order. -func (z *Scalar) Red() { var t scalar64; t.fromScalar(z); t.modOrder(); t.toScalar(z) } - -// Neg calculates z = -z mod order. -func (z *Scalar) Neg() { z.Sub(&order, z) } - -// Add calculates z = x+y mod order. -func (z *Scalar) Add(x, y *Scalar) { - var z64, x64, y64, t scalar64 - x64.fromScalar(x) - y64.fromScalar(y) - c := add(z64[:], x64[:], y64[:]) - add(t[:], z64[:], residue448[:]) - z64.Cmov(c, &t) - z64.modOrder() - z64.toScalar(z) -} - -// Sub calculates z = x-y mod order. -func (z *Scalar) Sub(x, y *Scalar) { - var z64, x64, y64, t scalar64 - x64.fromScalar(x) - y64.fromScalar(y) - c := sub(z64[:], x64[:], y64[:]) - sub(t[:], z64[:], residue448[:]) - z64.Cmov(c, &t) - z64.modOrder() - z64.toScalar(z) -} - -// Mul calculates z = x*y mod order. -func (z *Scalar) Mul(x, y *Scalar) { - var z64, x64, y64 scalar64 - prod := (&[_N + 1]uint64{})[:] - x64.fromScalar(x) - y64.fromScalar(y) - mulWord(prod, x64[:], y64[_N-1]) - copy(z64[:], prod[:_N]) - z64.reduceOneWord(prod[_N]) - for i := _N - 2; i >= 0; i-- { - h := z64.leftShift(0) - z64.reduceOneWord(h) - mulWord(prod, x64[:], y64[i]) - c := add(z64[:], z64[:], prod[:_N]) - z64.reduceOneWord(prod[_N] + c) - } - z64.modOrder() - z64.toScalar(z) -} - -// IsZero returns true if z=0. -func (z *Scalar) IsZero() bool { z.Red(); return *z == Scalar{} } diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twist.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/twist.go deleted file mode 100644 index 83d7cdadd..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twist.go +++ /dev/null @@ -1,138 +0,0 @@ -package goldilocks - -import ( - "crypto/subtle" - "math/bits" - - "github.com/cloudflare/circl/internal/conv" - "github.com/cloudflare/circl/math" - fp "github.com/cloudflare/circl/math/fp448" -) - -// twistCurve is -x^2+y^2=1-39082x^2y^2 and is 4-isogenous to Goldilocks. -type twistCurve struct{} - -// Identity returns the identity point. -func (twistCurve) Identity() *twistPoint { - return &twistPoint{ - y: fp.One(), - z: fp.One(), - } -} - -// subYDiv16 update x = (x - y) / 16. -func subYDiv16(x *scalar64, y int64) { - s := uint64(y >> 63) - x0, b0 := bits.Sub64((*x)[0], uint64(y), 0) - x1, b1 := bits.Sub64((*x)[1], s, b0) - x2, b2 := bits.Sub64((*x)[2], s, b1) - x3, b3 := bits.Sub64((*x)[3], s, b2) - x4, b4 := bits.Sub64((*x)[4], s, b3) - x5, b5 := bits.Sub64((*x)[5], s, b4) - x6, _ := bits.Sub64((*x)[6], s, b5) - x[0] = (x0 >> 4) | (x1 << 60) - x[1] = (x1 >> 4) | (x2 << 60) - x[2] = (x2 >> 4) | (x3 << 60) - x[3] = (x3 >> 4) | (x4 << 60) - x[4] = (x4 >> 4) | (x5 << 60) - x[5] = (x5 >> 4) | (x6 << 60) - x[6] = (x6 >> 4) -} - -func recodeScalar(d *[113]int8, k *Scalar) { - var k64 scalar64 - k64.fromScalar(k) - for i := 0; i < 112; i++ { - d[i] = int8((k64[0] & 0x1f) - 16) - subYDiv16(&k64, int64(d[i])) - } - d[112] = int8(k64[0]) -} - -// ScalarMult returns kP. -func (e twistCurve) ScalarMult(k *Scalar, P *twistPoint) *twistPoint { - var TabP [8]preTwistPointProy - var S preTwistPointProy - var d [113]int8 - - var isZero int - if k.IsZero() { - isZero = 1 - } - subtle.ConstantTimeCopy(isZero, k[:], order[:]) - - minusK := *k - isEven := 1 - int(k[0]&0x1) - minusK.Neg() - subtle.ConstantTimeCopy(isEven, k[:], minusK[:]) - recodeScalar(&d, k) - - P.oddMultiples(TabP[:]) - Q := e.Identity() - for i := 112; i >= 0; i-- { - Q.Double() - Q.Double() - Q.Double() - Q.Double() - mask := d[i] >> 7 - absDi := (d[i] + mask) ^ mask - inx := int32((absDi - 1) >> 1) - sig := int((d[i] >> 7) & 0x1) - for j := range TabP { - S.cmov(&TabP[j], uint(subtle.ConstantTimeEq(inx, int32(j)))) - } - S.cneg(sig) - Q.mixAdd(&S) - } - Q.cneg(uint(isEven)) - return Q -} - -const ( - omegaFix = 7 - omegaVar = 5 -) - -// CombinedMult returns mG+nP. -func (e twistCurve) CombinedMult(m, n *Scalar, P *twistPoint) *twistPoint { - nafFix := math.OmegaNAF(conv.BytesLe2BigInt(m[:]), omegaFix) - nafVar := math.OmegaNAF(conv.BytesLe2BigInt(n[:]), omegaVar) - - if len(nafFix) > len(nafVar) { - nafVar = append(nafVar, make([]int32, len(nafFix)-len(nafVar))...) - } else if len(nafFix) < len(nafVar) { - nafFix = append(nafFix, make([]int32, len(nafVar)-len(nafFix))...) - } - - var TabQ [1 << (omegaVar - 2)]preTwistPointProy - P.oddMultiples(TabQ[:]) - Q := e.Identity() - for i := len(nafFix) - 1; i >= 0; i-- { - Q.Double() - // Generator point - if nafFix[i] != 0 { - idxM := absolute(nafFix[i]) >> 1 - R := tabVerif[idxM] - if nafFix[i] < 0 { - R.neg() - } - Q.mixAddZ1(&R) - } - // Variable input point - if nafVar[i] != 0 { - idxN := absolute(nafVar[i]) >> 1 - S := TabQ[idxN] - if nafVar[i] < 0 { - S.neg() - } - Q.mixAdd(&S) - } - } - return Q -} - -// absolute returns always a positive value. -func absolute(x int32) int32 { - mask := x >> 31 - return (x + mask) ^ mask -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twistPoint.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/twistPoint.go deleted file mode 100644 index c55db77b0..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twistPoint.go +++ /dev/null @@ -1,135 +0,0 @@ -package goldilocks - -import ( - "fmt" - - fp "github.com/cloudflare/circl/math/fp448" -) - -type twistPoint struct{ x, y, z, ta, tb fp.Elt } - -type preTwistPointAffine struct{ addYX, subYX, dt2 fp.Elt } - -type preTwistPointProy struct { - preTwistPointAffine - z2 fp.Elt -} - -func (P *twistPoint) String() string { - return fmt.Sprintf("x: %v\ny: %v\nz: %v\nta: %v\ntb: %v", P.x, P.y, P.z, P.ta, P.tb) -} - -// cneg conditionally negates the point if b=1. -func (P *twistPoint) cneg(b uint) { - t := &fp.Elt{} - fp.Neg(t, &P.x) - fp.Cmov(&P.x, t, b) - fp.Neg(t, &P.ta) - fp.Cmov(&P.ta, t, b) -} - -// Double updates P with 2P. -func (P *twistPoint) Double() { - // This is formula (7) from "Twisted Edwards Curves Revisited" by - // Hisil H., Wong K.KH., Carter G., Dawson E. (2008) - // https://doi.org/10.1007/978-3-540-89255-7_20 - Px, Py, Pz, Pta, Ptb := &P.x, &P.y, &P.z, &P.ta, &P.tb - a, b, c, e, f, g, h := Px, Py, Pz, Pta, Px, Py, Ptb - fp.Add(e, Px, Py) // x+y - fp.Sqr(a, Px) // A = x^2 - fp.Sqr(b, Py) // B = y^2 - fp.Sqr(c, Pz) // z^2 - fp.Add(c, c, c) // C = 2*z^2 - fp.Add(h, a, b) // H = A+B - fp.Sqr(e, e) // (x+y)^2 - fp.Sub(e, e, h) // E = (x+y)^2-A-B - fp.Sub(g, b, a) // G = B-A - fp.Sub(f, c, g) // F = C-G - fp.Mul(Pz, f, g) // Z = F * G - fp.Mul(Px, e, f) // X = E * F - fp.Mul(Py, g, h) // Y = G * H, T = E * H -} - -// mixAdd calculates P= P+Q, where Q is a precomputed point with Z_Q = 1. -func (P *twistPoint) mixAddZ1(Q *preTwistPointAffine) { - fp.Add(&P.z, &P.z, &P.z) // D = 2*z1 (z2=1) - P.coreAddition(Q) -} - -// coreAddition calculates P=P+Q for curves with A=-1. -func (P *twistPoint) coreAddition(Q *preTwistPointAffine) { - // This is the formula following (5) from "Twisted Edwards Curves Revisited" by - // Hisil H., Wong K.KH., Carter G., Dawson E. (2008) - // https://doi.org/10.1007/978-3-540-89255-7_20 - Px, Py, Pz, Pta, Ptb := &P.x, &P.y, &P.z, &P.ta, &P.tb - addYX2, subYX2, dt2 := &Q.addYX, &Q.subYX, &Q.dt2 - a, b, c, d, e, f, g, h := Px, Py, &fp.Elt{}, Pz, Pta, Px, Py, Ptb - fp.Mul(c, Pta, Ptb) // t1 = ta*tb - fp.Sub(h, Py, Px) // y1-x1 - fp.Add(b, Py, Px) // y1+x1 - fp.Mul(a, h, subYX2) // A = (y1-x1)*(y2-x2) - fp.Mul(b, b, addYX2) // B = (y1+x1)*(y2+x2) - fp.Mul(c, c, dt2) // C = 2*D*t1*t2 - fp.Sub(e, b, a) // E = B-A - fp.Add(h, b, a) // H = B+A - fp.Sub(f, d, c) // F = D-C - fp.Add(g, d, c) // G = D+C - fp.Mul(Pz, f, g) // Z = F * G - fp.Mul(Px, e, f) // X = E * F - fp.Mul(Py, g, h) // Y = G * H, T = E * H -} - -func (P *preTwistPointAffine) neg() { - P.addYX, P.subYX = P.subYX, P.addYX - fp.Neg(&P.dt2, &P.dt2) -} - -func (P *preTwistPointAffine) cneg(b int) { - t := &fp.Elt{} - fp.Cswap(&P.addYX, &P.subYX, uint(b)) - fp.Neg(t, &P.dt2) - fp.Cmov(&P.dt2, t, uint(b)) -} - -func (P *preTwistPointAffine) cmov(Q *preTwistPointAffine, b uint) { - fp.Cmov(&P.addYX, &Q.addYX, b) - fp.Cmov(&P.subYX, &Q.subYX, b) - fp.Cmov(&P.dt2, &Q.dt2, b) -} - -// mixAdd calculates P= P+Q, where Q is a precomputed point with Z_Q != 1. -func (P *twistPoint) mixAdd(Q *preTwistPointProy) { - fp.Mul(&P.z, &P.z, &Q.z2) // D = 2*z1*z2 - P.coreAddition(&Q.preTwistPointAffine) -} - -// oddMultiples calculates T[i] = (2*i-1)P for 0 < i < len(T). -func (P *twistPoint) oddMultiples(T []preTwistPointProy) { - if n := len(T); n > 0 { - T[0].FromTwistPoint(P) - _2P := *P - _2P.Double() - R := &preTwistPointProy{} - R.FromTwistPoint(&_2P) - for i := 1; i < n; i++ { - P.mixAdd(R) - T[i].FromTwistPoint(P) - } - } -} - -// cmov conditionally moves Q into P if b=1. -func (P *preTwistPointProy) cmov(Q *preTwistPointProy, b uint) { - P.preTwistPointAffine.cmov(&Q.preTwistPointAffine, b) - fp.Cmov(&P.z2, &Q.z2, b) -} - -// FromTwistPoint precomputes some coordinates of Q for missed addition. -func (P *preTwistPointProy) FromTwistPoint(Q *twistPoint) { - fp.Add(&P.addYX, &Q.y, &Q.x) // addYX = X + Y - fp.Sub(&P.subYX, &Q.y, &Q.x) // subYX = Y - X - fp.Mul(&P.dt2, &Q.ta, &Q.tb) // T = ta*tb - fp.Mul(&P.dt2, &P.dt2, ¶mDTwist) // D*T - fp.Add(&P.dt2, &P.dt2, &P.dt2) // dt2 = 2*D*T - fp.Add(&P.z2, &Q.z, &Q.z) // z2 = 2*Z -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twistTables.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/twistTables.go deleted file mode 100644 index ed432e02c..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twistTables.go +++ /dev/null @@ -1,216 +0,0 @@ -package goldilocks - -import fp "github.com/cloudflare/circl/math/fp448" - -var tabFixMult = [fxV][fx2w1]preTwistPointAffine{ - { - { - addYX: fp.Elt{0x65, 0x4a, 0xdd, 0xdf, 0xb4, 0x79, 0x60, 0xc8, 0xa1, 0x70, 0xb4, 0x3a, 0x1e, 0x0c, 0x9b, 0x19, 0xe5, 0x48, 0x3f, 0xd7, 0x44, 0x18, 0x18, 0x14, 0x14, 0x27, 0x45, 0xd0, 0x2b, 0x24, 0xd5, 0x93, 0xc3, 0x74, 0x4c, 0x50, 0x70, 0x43, 0x26, 0x05, 0x08, 0x24, 0xca, 0x78, 0x30, 0xc1, 0x06, 0x8d, 0xd4, 0x86, 0x42, 0xf0, 0x14, 0xde, 0x08, 0x05}, - subYX: fp.Elt{0x64, 0x4a, 0xdd, 0xdf, 0xb4, 0x79, 0x60, 0xc8, 0xa1, 0x70, 0xb4, 0x3a, 0x1e, 0x0c, 0x9b, 0x19, 0xe5, 0x48, 0x3f, 0xd7, 0x44, 0x18, 0x18, 0x14, 0x14, 0x27, 0x45, 0xd0, 0x2d, 0x24, 0xd5, 0x93, 0xc3, 0x74, 0x4c, 0x50, 0x70, 0x43, 0x26, 0x05, 0x08, 0x24, 0xca, 0x78, 0x30, 0xc1, 0x06, 0x8d, 0xd4, 0x86, 0x42, 0xf0, 0x14, 0xde, 0x08, 0x05}, - dt2: fp.Elt{0x1a, 0x33, 0xea, 0x64, 0x45, 0x1c, 0xdf, 0x17, 0x1d, 0x16, 0x34, 0x28, 0xd6, 0x61, 0x19, 0x67, 0x79, 0xb4, 0x13, 0xcf, 0x3e, 0x7c, 0x0e, 0x72, 0xda, 0xf1, 0x5f, 0xda, 0xe6, 0xcf, 0x42, 0xd3, 0xb6, 0x17, 0xc2, 0x68, 0x13, 0x2d, 0xd9, 0x60, 0x3e, 0xae, 0xf0, 0x5b, 0x96, 0xf0, 0xcd, 0xaf, 0xea, 0xb7, 0x0d, 0x59, 0x16, 0xa7, 0xff, 0x55}, - }, - { - addYX: fp.Elt{0xca, 0xd8, 0x7d, 0x86, 0x1a, 0xef, 0xad, 0x11, 0xe3, 0x27, 0x41, 0x7e, 0x7f, 0x3e, 0xa9, 0xd2, 0xb5, 0x4e, 0x50, 0xe0, 0x77, 0x91, 0xc2, 0x13, 0x52, 0x73, 0x41, 0x09, 0xa6, 0x57, 0x9a, 0xc8, 0xa8, 0x90, 0x9d, 0x26, 0x14, 0xbb, 0xa1, 0x2a, 0xf7, 0x45, 0x43, 0x4e, 0xea, 0x35, 0x62, 0xe1, 0x08, 0x85, 0x46, 0xb8, 0x24, 0x05, 0x2d, 0xab}, - subYX: fp.Elt{0x9b, 0xe6, 0xd3, 0xe5, 0xfe, 0x50, 0x36, 0x3c, 0x3c, 0x6d, 0x74, 0x1d, 0x74, 0xc0, 0xde, 0x5b, 0x45, 0x27, 0xe5, 0x12, 0xee, 0x63, 0x35, 0x6b, 0x13, 0xe2, 0x41, 0x6b, 0x3a, 0x05, 0x2b, 0xb1, 0x89, 0x26, 0xb6, 0xc6, 0xd1, 0x84, 0xff, 0x0e, 0x9b, 0xa3, 0xfb, 0x21, 0x36, 0x6b, 0x01, 0xf7, 0x9f, 0x7c, 0xeb, 0xf5, 0x18, 0x7a, 0x2a, 0x70}, - dt2: fp.Elt{0x09, 0xad, 0x99, 0x1a, 0x38, 0xd3, 0xdf, 0x22, 0x37, 0x32, 0x61, 0x8b, 0xf3, 0x19, 0x48, 0x08, 0xe8, 0x49, 0xb6, 0x4a, 0xa7, 0xed, 0xa4, 0xa2, 0xee, 0x86, 0xd7, 0x31, 0x5e, 0xce, 0x95, 0x76, 0x86, 0x42, 0x1c, 0x9d, 0x07, 0x14, 0x8c, 0x34, 0x18, 0x9c, 0x6d, 0x3a, 0xdf, 0xa9, 0xe8, 0x36, 0x7e, 0xe4, 0x95, 0xbe, 0xb5, 0x09, 0xf8, 0x9c}, - }, - { - addYX: fp.Elt{0x51, 0xdb, 0x49, 0xa8, 0x9f, 0xe3, 0xd7, 0xec, 0x0d, 0x0f, 0x49, 0xe8, 0xb6, 0xc5, 0x0f, 0x5a, 0x1c, 0xce, 0x54, 0x0d, 0xb1, 0x8d, 0x5b, 0xbf, 0xf4, 0xaa, 0x34, 0x77, 0xc4, 0x5d, 0x59, 0xb6, 0xc5, 0x0e, 0x5a, 0xd8, 0x5b, 0x30, 0xc2, 0x1d, 0xec, 0x85, 0x1c, 0x42, 0xbe, 0x24, 0x2e, 0x50, 0x55, 0x44, 0xb2, 0x3a, 0x01, 0xaa, 0x98, 0xfb}, - subYX: fp.Elt{0xe7, 0x29, 0xb7, 0xd0, 0xaa, 0x4f, 0x32, 0x53, 0x56, 0xde, 0xbc, 0xd1, 0x92, 0x5d, 0x19, 0xbe, 0xa3, 0xe3, 0x75, 0x48, 0xe0, 0x7a, 0x1b, 0x54, 0x7a, 0xb7, 0x41, 0x77, 0x84, 0x38, 0xdd, 0x14, 0x9f, 0xca, 0x3f, 0xa3, 0xc8, 0xa7, 0x04, 0x70, 0xf1, 0x4d, 0x3d, 0xb3, 0x84, 0x79, 0xcb, 0xdb, 0xe4, 0xc5, 0x42, 0x9b, 0x57, 0x19, 0xf1, 0x2d}, - dt2: fp.Elt{0x20, 0xb4, 0x94, 0x9e, 0xdf, 0x31, 0x44, 0x0b, 0xc9, 0x7b, 0x75, 0x40, 0x9d, 0xd1, 0x96, 0x39, 0x70, 0x71, 0x15, 0xc8, 0x93, 0xd5, 0xc5, 0xe5, 0xba, 0xfe, 0xee, 0x08, 0x6a, 0x98, 0x0a, 0x1b, 0xb2, 0xaa, 0x3a, 0xf4, 0xa4, 0x79, 0xf9, 0x8e, 0x4d, 0x65, 0x10, 0x9b, 0x3a, 0x6e, 0x7c, 0x87, 0x94, 0x92, 0x11, 0x65, 0xbf, 0x1a, 0x09, 0xde}, - }, - { - addYX: fp.Elt{0xf3, 0x84, 0x76, 0x77, 0xa5, 0x6b, 0x27, 0x3b, 0x83, 0x3d, 0xdf, 0xa0, 0xeb, 0x32, 0x6d, 0x58, 0x81, 0x57, 0x64, 0xc2, 0x21, 0x7c, 0x9b, 0xea, 0xe6, 0xb0, 0x93, 0xf9, 0xe7, 0xc3, 0xed, 0x5a, 0x8e, 0xe2, 0xb4, 0x72, 0x76, 0x66, 0x0f, 0x22, 0x29, 0x94, 0x3e, 0x63, 0x48, 0x5e, 0x80, 0xcb, 0xac, 0xfa, 0x95, 0xb6, 0x4b, 0xc4, 0x95, 0x33}, - subYX: fp.Elt{0x0c, 0x55, 0xd1, 0x5e, 0x5f, 0xbf, 0xbf, 0xe2, 0x4c, 0xfc, 0x37, 0x4a, 0xc4, 0xb1, 0xf4, 0x83, 0x61, 0x93, 0x60, 0x8e, 0x9f, 0x31, 0xf0, 0xa0, 0x41, 0xff, 0x1d, 0xe2, 0x7f, 0xca, 0x40, 0xd6, 0x88, 0xe8, 0x91, 0x61, 0xe2, 0x11, 0x18, 0x83, 0xf3, 0x25, 0x2f, 0x3f, 0x49, 0x40, 0xd4, 0x83, 0xe2, 0xd7, 0x74, 0x6a, 0x16, 0x86, 0x4e, 0xab}, - dt2: fp.Elt{0xdd, 0x58, 0x65, 0xd8, 0x9f, 0xdd, 0x70, 0x7f, 0x0f, 0xec, 0xbd, 0x5c, 0x5c, 0x9b, 0x7e, 0x1b, 0x9f, 0x79, 0x36, 0x1f, 0xfd, 0x79, 0x10, 0x1c, 0x52, 0xf3, 0x22, 0xa4, 0x1f, 0x71, 0x6e, 0x63, 0x14, 0xf4, 0xa7, 0x3e, 0xbe, 0xad, 0x43, 0x30, 0x38, 0x8c, 0x29, 0xc6, 0xcf, 0x50, 0x75, 0x21, 0xe5, 0x78, 0xfd, 0xb0, 0x9a, 0xc4, 0x6d, 0xd4}, - }, - }, - { - { - addYX: fp.Elt{0x7a, 0xa1, 0x38, 0xa6, 0xfd, 0x0e, 0x96, 0xd5, 0x26, 0x76, 0x86, 0x70, 0x80, 0x30, 0xa6, 0x67, 0xeb, 0xf4, 0x39, 0xdb, 0x22, 0xf5, 0x9f, 0x98, 0xe4, 0xb5, 0x3a, 0x0c, 0x59, 0xbf, 0x85, 0xc6, 0xf0, 0x0b, 0x1c, 0x41, 0x38, 0x09, 0x01, 0xdb, 0xd6, 0x3c, 0xb7, 0xf1, 0x08, 0x6b, 0x4b, 0x9e, 0x63, 0x53, 0x83, 0xd3, 0xab, 0xa3, 0x72, 0x0d}, - subYX: fp.Elt{0x84, 0x68, 0x25, 0xe8, 0xe9, 0x8f, 0x91, 0xbf, 0xf7, 0xa4, 0x30, 0xae, 0xea, 0x9f, 0xdd, 0x56, 0x64, 0x09, 0xc9, 0x54, 0x68, 0x4e, 0x33, 0xc5, 0x6f, 0x7b, 0x2d, 0x52, 0x2e, 0x42, 0xbe, 0xbe, 0xf5, 0x64, 0xbf, 0x77, 0x54, 0xdf, 0xb0, 0x10, 0xd2, 0x16, 0x5d, 0xce, 0xaf, 0x9f, 0xfb, 0xa3, 0x63, 0x50, 0xcb, 0xc0, 0xd0, 0x88, 0x44, 0xa3}, - dt2: fp.Elt{0xc3, 0x8b, 0xa5, 0xf1, 0x44, 0xe4, 0x41, 0xcd, 0x75, 0xe3, 0x17, 0x69, 0x5b, 0xb9, 0xbb, 0xee, 0x82, 0xbb, 0xce, 0x57, 0xdf, 0x2a, 0x9c, 0x12, 0xab, 0x66, 0x08, 0x68, 0x05, 0x1b, 0x87, 0xee, 0x5d, 0x1e, 0x18, 0x14, 0x22, 0x4b, 0x99, 0x61, 0x75, 0x28, 0xe7, 0x65, 0x1c, 0x36, 0xb6, 0x18, 0x09, 0xa8, 0xdf, 0xef, 0x30, 0x35, 0xbc, 0x58}, - }, - { - addYX: fp.Elt{0xc5, 0xd3, 0x0e, 0x6f, 0xaf, 0x06, 0x69, 0xc4, 0x07, 0x9e, 0x58, 0x6e, 0x3f, 0x49, 0xd9, 0x0a, 0x3c, 0x2c, 0x37, 0xcd, 0x27, 0x4d, 0x87, 0x91, 0x7a, 0xb0, 0x28, 0xad, 0x2f, 0x68, 0x92, 0x05, 0x97, 0xf1, 0x30, 0x5f, 0x4c, 0x10, 0x20, 0x30, 0xd3, 0x08, 0x3f, 0xc1, 0xc6, 0xb7, 0xb5, 0xd1, 0x71, 0x7b, 0xa8, 0x0a, 0xd8, 0xf5, 0x17, 0xcf}, - subYX: fp.Elt{0x64, 0xd4, 0x8f, 0x91, 0x40, 0xab, 0x6e, 0x1a, 0x62, 0x83, 0xdc, 0xd7, 0x30, 0x1a, 0x4a, 0x2a, 0x4c, 0x54, 0x86, 0x19, 0x81, 0x5d, 0x04, 0x52, 0xa3, 0xca, 0x82, 0x38, 0xdc, 0x1e, 0xf0, 0x7a, 0x78, 0x76, 0x49, 0x4f, 0x71, 0xc4, 0x74, 0x2f, 0xf0, 0x5b, 0x2e, 0x5e, 0xac, 0xef, 0x17, 0xe4, 0x8e, 0x6e, 0xed, 0x43, 0x23, 0x61, 0x99, 0x49}, - dt2: fp.Elt{0x64, 0x90, 0x72, 0x76, 0xf8, 0x2c, 0x7d, 0x57, 0xf9, 0x30, 0x5e, 0x7a, 0x10, 0x74, 0x19, 0x39, 0xd9, 0xaf, 0x0a, 0xf1, 0x43, 0xed, 0x88, 0x9c, 0x8b, 0xdc, 0x9b, 0x1c, 0x90, 0xe7, 0xf7, 0xa3, 0xa5, 0x0d, 0xc6, 0xbc, 0x30, 0xfb, 0x91, 0x1a, 0x51, 0xba, 0x2d, 0xbe, 0x89, 0xdf, 0x1d, 0xdc, 0x53, 0xa8, 0x82, 0x8a, 0xd3, 0x8d, 0x16, 0x68}, - }, - { - addYX: fp.Elt{0xef, 0x5c, 0xe3, 0x74, 0xbf, 0x13, 0x4a, 0xbf, 0x66, 0x73, 0x64, 0xb7, 0xd4, 0xce, 0x98, 0x82, 0x05, 0xfa, 0x98, 0x0c, 0x0a, 0xae, 0xe5, 0x6b, 0x9f, 0xac, 0xbb, 0x6e, 0x1f, 0xcf, 0xff, 0xa6, 0x71, 0x9a, 0xa8, 0x7a, 0x9e, 0x64, 0x1f, 0x20, 0x4a, 0x61, 0xa2, 0xd6, 0x50, 0xe3, 0xba, 0x81, 0x0c, 0x50, 0x59, 0x69, 0x59, 0x15, 0x55, 0xdb}, - subYX: fp.Elt{0xe8, 0x77, 0x4d, 0xe8, 0x66, 0x3d, 0xc1, 0x00, 0x3c, 0xf2, 0x25, 0x00, 0xdc, 0xb2, 0xe5, 0x9b, 0x12, 0x89, 0xf3, 0xd6, 0xea, 0x85, 0x60, 0xfe, 0x67, 0x91, 0xfd, 0x04, 0x7c, 0xe0, 0xf1, 0x86, 0x06, 0x11, 0x66, 0xee, 0xd4, 0xd5, 0xbe, 0x3b, 0x0f, 0xe3, 0x59, 0xb3, 0x4f, 0x00, 0xb6, 0xce, 0x80, 0xc1, 0x61, 0xf7, 0xaf, 0x04, 0x6a, 0x3c}, - dt2: fp.Elt{0x00, 0xd7, 0x32, 0x93, 0x67, 0x70, 0x6f, 0xd7, 0x69, 0xab, 0xb1, 0xd3, 0xdc, 0xd6, 0xa8, 0xdd, 0x35, 0x25, 0xca, 0xd3, 0x8a, 0x6d, 0xce, 0xfb, 0xfd, 0x2b, 0x83, 0xf0, 0xd4, 0xac, 0x66, 0xfb, 0x72, 0x87, 0x7e, 0x55, 0xb7, 0x91, 0x58, 0x10, 0xc3, 0x11, 0x7e, 0x15, 0xfe, 0x7c, 0x55, 0x90, 0xa3, 0x9e, 0xed, 0x9a, 0x7f, 0xa7, 0xb7, 0xeb}, - }, - { - addYX: fp.Elt{0x25, 0x0f, 0xc2, 0x09, 0x9c, 0x10, 0xc8, 0x7c, 0x93, 0xa7, 0xbe, 0xe9, 0x26, 0x25, 0x7c, 0x21, 0xfe, 0xe7, 0x5f, 0x3c, 0x02, 0x83, 0xa7, 0x9e, 0xdf, 0xc0, 0x94, 0x2b, 0x7d, 0x1a, 0xd0, 0x1d, 0xcc, 0x2e, 0x7d, 0xd4, 0x85, 0xe7, 0xc1, 0x15, 0x66, 0xd6, 0xd6, 0x32, 0xb8, 0xf7, 0x63, 0xaa, 0x3b, 0xa5, 0xea, 0x49, 0xad, 0x88, 0x9b, 0x66}, - subYX: fp.Elt{0x09, 0x97, 0x79, 0x36, 0x41, 0x56, 0x9b, 0xdf, 0x15, 0xd8, 0x43, 0x28, 0x17, 0x5b, 0x96, 0xc9, 0xcf, 0x39, 0x1f, 0x13, 0xf7, 0x4d, 0x1d, 0x1f, 0xda, 0x51, 0x56, 0xe7, 0x0a, 0x5a, 0x65, 0xb6, 0x2a, 0x87, 0x49, 0x86, 0xc2, 0x2b, 0xcd, 0xfe, 0x07, 0xf6, 0x4c, 0xe2, 0x1d, 0x9b, 0xd8, 0x82, 0x09, 0x5b, 0x11, 0x10, 0x62, 0x56, 0x89, 0xbd}, - dt2: fp.Elt{0xd9, 0x15, 0x73, 0xf2, 0x96, 0x35, 0x53, 0xb0, 0xe7, 0xa8, 0x0b, 0x93, 0x35, 0x0b, 0x3a, 0x00, 0xf5, 0x18, 0xb1, 0xc3, 0x12, 0x3f, 0x91, 0x17, 0xc1, 0x4c, 0x15, 0x5a, 0x86, 0x92, 0x11, 0xbd, 0x44, 0x40, 0x5a, 0x7b, 0x15, 0x89, 0xba, 0xc1, 0xc1, 0xbc, 0x43, 0x45, 0xe6, 0x52, 0x02, 0x73, 0x0a, 0xd0, 0x2a, 0x19, 0xda, 0x47, 0xa8, 0xff}, - }, - }, -} - -// tabVerif contains the odd multiples of P. The entry T[i] = (2i+1)P, where -// P = phi(G) and G is the generator of the Goldilocks curve, and phi is a -// 4-degree isogeny. -var tabVerif = [1 << (omegaFix - 2)]preTwistPointAffine{ - { /* 1P*/ - addYX: fp.Elt{0x65, 0x4a, 0xdd, 0xdf, 0xb4, 0x79, 0x60, 0xc8, 0xa1, 0x70, 0xb4, 0x3a, 0x1e, 0x0c, 0x9b, 0x19, 0xe5, 0x48, 0x3f, 0xd7, 0x44, 0x18, 0x18, 0x14, 0x14, 0x27, 0x45, 0xd0, 0x2b, 0x24, 0xd5, 0x93, 0xc3, 0x74, 0x4c, 0x50, 0x70, 0x43, 0x26, 0x05, 0x08, 0x24, 0xca, 0x78, 0x30, 0xc1, 0x06, 0x8d, 0xd4, 0x86, 0x42, 0xf0, 0x14, 0xde, 0x08, 0x05}, - subYX: fp.Elt{0x64, 0x4a, 0xdd, 0xdf, 0xb4, 0x79, 0x60, 0xc8, 0xa1, 0x70, 0xb4, 0x3a, 0x1e, 0x0c, 0x9b, 0x19, 0xe5, 0x48, 0x3f, 0xd7, 0x44, 0x18, 0x18, 0x14, 0x14, 0x27, 0x45, 0xd0, 0x2d, 0x24, 0xd5, 0x93, 0xc3, 0x74, 0x4c, 0x50, 0x70, 0x43, 0x26, 0x05, 0x08, 0x24, 0xca, 0x78, 0x30, 0xc1, 0x06, 0x8d, 0xd4, 0x86, 0x42, 0xf0, 0x14, 0xde, 0x08, 0x05}, - dt2: fp.Elt{0x1a, 0x33, 0xea, 0x64, 0x45, 0x1c, 0xdf, 0x17, 0x1d, 0x16, 0x34, 0x28, 0xd6, 0x61, 0x19, 0x67, 0x79, 0xb4, 0x13, 0xcf, 0x3e, 0x7c, 0x0e, 0x72, 0xda, 0xf1, 0x5f, 0xda, 0xe6, 0xcf, 0x42, 0xd3, 0xb6, 0x17, 0xc2, 0x68, 0x13, 0x2d, 0xd9, 0x60, 0x3e, 0xae, 0xf0, 0x5b, 0x96, 0xf0, 0xcd, 0xaf, 0xea, 0xb7, 0x0d, 0x59, 0x16, 0xa7, 0xff, 0x55}, - }, - { /* 3P*/ - addYX: fp.Elt{0xd1, 0xe9, 0xa8, 0x33, 0x20, 0x76, 0x18, 0x08, 0x45, 0x2a, 0xc9, 0x67, 0x2a, 0xc3, 0x15, 0x24, 0xf9, 0x74, 0x21, 0x30, 0x99, 0x59, 0x8b, 0xb2, 0xf0, 0xa4, 0x07, 0xe2, 0x6a, 0x36, 0x8d, 0xd9, 0xd2, 0x4a, 0x7f, 0x73, 0x50, 0x39, 0x3d, 0xaa, 0xa7, 0x51, 0x73, 0x0d, 0x2b, 0x8b, 0x96, 0x47, 0xac, 0x3c, 0x5d, 0xaa, 0x39, 0x9c, 0xcf, 0xd5}, - subYX: fp.Elt{0x6b, 0x11, 0x5d, 0x1a, 0xf9, 0x41, 0x9d, 0xc5, 0x30, 0x3e, 0xad, 0x25, 0x2c, 0x04, 0x45, 0xea, 0xcc, 0x67, 0x07, 0x85, 0xe9, 0xda, 0x0e, 0xb5, 0x40, 0xb7, 0x32, 0xb4, 0x49, 0xdd, 0xff, 0xaa, 0xfc, 0xbb, 0x19, 0xca, 0x8b, 0x79, 0x2b, 0x8f, 0x8d, 0x00, 0x33, 0xc2, 0xad, 0xe9, 0xd3, 0x12, 0xa8, 0xaa, 0x87, 0x62, 0xad, 0x2d, 0xff, 0xa4}, - dt2: fp.Elt{0xb0, 0xaf, 0x3b, 0xea, 0xf0, 0x42, 0x0b, 0x5e, 0x88, 0xd3, 0x98, 0x08, 0x87, 0x59, 0x72, 0x0a, 0xc2, 0xdf, 0xcb, 0x7f, 0x59, 0xb5, 0x4c, 0x63, 0x68, 0xe8, 0x41, 0x38, 0x67, 0x4f, 0xe9, 0xc6, 0xb2, 0x6b, 0x08, 0xa7, 0xf7, 0x0e, 0xcd, 0xea, 0xca, 0x3d, 0xaf, 0x8e, 0xda, 0x4b, 0x2e, 0xd2, 0x88, 0x64, 0x8d, 0xc5, 0x5f, 0x76, 0x0f, 0x3d}, - }, - { /* 5P*/ - addYX: fp.Elt{0xe5, 0x65, 0xc9, 0xe2, 0x75, 0xf0, 0x7d, 0x1a, 0xba, 0xa4, 0x40, 0x4b, 0x93, 0x12, 0xa2, 0x80, 0x95, 0x0d, 0x03, 0x93, 0xe8, 0xa5, 0x4d, 0xe2, 0x3d, 0x81, 0xf5, 0xce, 0xd4, 0x2d, 0x25, 0x59, 0x16, 0x5c, 0xe7, 0xda, 0xc7, 0x45, 0xd2, 0x7e, 0x2c, 0x38, 0xd4, 0x37, 0x64, 0xb2, 0xc2, 0x28, 0xc5, 0x72, 0x16, 0x32, 0x45, 0x36, 0x6f, 0x9f}, - subYX: fp.Elt{0x09, 0xf4, 0x7e, 0xbd, 0x89, 0xdb, 0x19, 0x58, 0xe1, 0x08, 0x00, 0x8a, 0xf4, 0x5f, 0x2a, 0x32, 0x40, 0xf0, 0x2c, 0x3f, 0x5d, 0xe4, 0xfc, 0x89, 0x11, 0x24, 0xb4, 0x2f, 0x97, 0xad, 0xac, 0x8f, 0x19, 0xab, 0xfa, 0x12, 0xe5, 0xf9, 0x50, 0x4e, 0x50, 0x6f, 0x32, 0x30, 0x88, 0xa6, 0xe5, 0x48, 0x28, 0xa2, 0x1b, 0x9f, 0xcd, 0xe2, 0x43, 0x38}, - dt2: fp.Elt{0xa9, 0xcc, 0x53, 0x39, 0x86, 0x02, 0x60, 0x75, 0x34, 0x99, 0x57, 0xbd, 0xfc, 0x5a, 0x8e, 0xce, 0x5e, 0x98, 0x22, 0xd0, 0xa5, 0x24, 0xff, 0x90, 0x28, 0x9f, 0x58, 0xf3, 0x39, 0xe9, 0xba, 0x36, 0x23, 0xfb, 0x7f, 0x41, 0xcc, 0x2b, 0x5a, 0x25, 0x3f, 0x4c, 0x2a, 0xf1, 0x52, 0x6f, 0x2f, 0x07, 0xe3, 0x88, 0x81, 0x77, 0xdd, 0x7c, 0x88, 0x82}, - }, - { /* 7P*/ - addYX: fp.Elt{0xf7, 0xee, 0x88, 0xfd, 0x3a, 0xbf, 0x7e, 0x28, 0x39, 0x23, 0x79, 0xe6, 0x5c, 0x56, 0xcb, 0xb5, 0x48, 0x6a, 0x80, 0x6d, 0x37, 0x60, 0x6c, 0x10, 0x35, 0x49, 0x4b, 0x46, 0x60, 0xd4, 0x79, 0xd4, 0x53, 0xd3, 0x67, 0x88, 0xd0, 0x41, 0xd5, 0x43, 0x85, 0xc8, 0x71, 0xe3, 0x1c, 0xb6, 0xda, 0x22, 0x64, 0x8f, 0x80, 0xac, 0xad, 0x7d, 0xd5, 0x82}, - subYX: fp.Elt{0x92, 0x40, 0xc1, 0x83, 0x21, 0x9b, 0xd5, 0x7d, 0x3f, 0x29, 0xb6, 0x26, 0xef, 0x12, 0xb9, 0x27, 0x39, 0x42, 0x37, 0x97, 0x09, 0x9a, 0x08, 0xe1, 0x68, 0xb6, 0x7a, 0x3f, 0x9f, 0x45, 0xf8, 0x37, 0x19, 0x83, 0x97, 0xe6, 0x73, 0x30, 0x32, 0x35, 0xcf, 0xae, 0x5c, 0x12, 0x68, 0xdf, 0x6e, 0x2b, 0xde, 0x83, 0xa0, 0x44, 0x74, 0x2e, 0x4a, 0xe9}, - dt2: fp.Elt{0xcb, 0x22, 0x0a, 0xda, 0x6b, 0xc1, 0x8a, 0x29, 0xa1, 0xac, 0x8b, 0x5b, 0x8b, 0x32, 0x20, 0xf2, 0x21, 0xae, 0x0c, 0x43, 0xc4, 0xd7, 0x19, 0x37, 0x3d, 0x79, 0x25, 0x98, 0x6c, 0x9c, 0x22, 0x31, 0x2a, 0x55, 0x9f, 0xda, 0x5e, 0xa8, 0x13, 0xdb, 0x8e, 0x2e, 0x16, 0x39, 0xf4, 0x91, 0x6f, 0xec, 0x71, 0x71, 0xc9, 0x10, 0xf2, 0xa4, 0x8f, 0x11}, - }, - { /* 9P*/ - addYX: fp.Elt{0x85, 0xdd, 0x37, 0x62, 0x74, 0x8e, 0x33, 0x5b, 0x25, 0x12, 0x1b, 0xe7, 0xdf, 0x47, 0xe5, 0x12, 0xfd, 0x3a, 0x3a, 0xf5, 0x5d, 0x4c, 0xa2, 0x29, 0x3c, 0x5c, 0x2f, 0xee, 0x18, 0x19, 0x0a, 0x2b, 0xef, 0x67, 0x50, 0x7a, 0x0d, 0x29, 0xae, 0x55, 0x82, 0xcd, 0xd6, 0x41, 0x90, 0xb4, 0x13, 0x31, 0x5d, 0x11, 0xb8, 0xaa, 0x12, 0x86, 0x08, 0xac}, - subYX: fp.Elt{0xcc, 0x37, 0x8d, 0x83, 0x5f, 0xfd, 0xde, 0xd5, 0xf7, 0xf1, 0xae, 0x0a, 0xa7, 0x0b, 0xeb, 0x6d, 0x19, 0x8a, 0xb6, 0x1a, 0x59, 0xd8, 0xff, 0x3c, 0xbc, 0xbc, 0xef, 0x9c, 0xda, 0x7b, 0x75, 0x12, 0xaf, 0x80, 0x8f, 0x2c, 0x3c, 0xaa, 0x0b, 0x17, 0x86, 0x36, 0x78, 0x18, 0xc8, 0x8a, 0xf6, 0xb8, 0x2c, 0x2f, 0x57, 0x2c, 0x62, 0x57, 0xf6, 0x90}, - dt2: fp.Elt{0x83, 0xbc, 0xa2, 0x07, 0xa5, 0x38, 0x96, 0xea, 0xfe, 0x11, 0x46, 0x1d, 0x3b, 0xcd, 0x42, 0xc5, 0xee, 0x67, 0x04, 0x72, 0x08, 0xd8, 0xd9, 0x96, 0x07, 0xf7, 0xac, 0xc3, 0x64, 0xf1, 0x98, 0x2c, 0x55, 0xd7, 0x7d, 0xc8, 0x6c, 0xbd, 0x2c, 0xff, 0x15, 0xd6, 0x6e, 0xb8, 0x17, 0x8e, 0xa8, 0x27, 0x66, 0xb1, 0x73, 0x79, 0x96, 0xff, 0x29, 0x10}, - }, - { /* 11P*/ - addYX: fp.Elt{0x76, 0xcb, 0x9b, 0x0c, 0x5b, 0xfe, 0xe1, 0x2a, 0xdd, 0x6f, 0x6c, 0xdd, 0x6f, 0xb4, 0xc0, 0xc2, 0x1b, 0x4b, 0x38, 0xe8, 0x66, 0x8c, 0x1e, 0x31, 0x63, 0xb9, 0x94, 0xcd, 0xc3, 0x8c, 0x44, 0x25, 0x7b, 0xd5, 0x39, 0x80, 0xfc, 0x01, 0xaa, 0xf7, 0x2a, 0x61, 0x8a, 0x25, 0xd2, 0x5f, 0xc5, 0x66, 0x38, 0xa4, 0x17, 0xcf, 0x3e, 0x11, 0x0f, 0xa3}, - subYX: fp.Elt{0xe0, 0xb6, 0xd1, 0x9c, 0x71, 0x49, 0x2e, 0x7b, 0xde, 0x00, 0xda, 0x6b, 0xf1, 0xec, 0xe6, 0x7a, 0x15, 0x38, 0x71, 0xe9, 0x7b, 0xdb, 0xf8, 0x98, 0xc0, 0x91, 0x2e, 0x53, 0xee, 0x92, 0x87, 0x25, 0xc9, 0xb0, 0xbb, 0x33, 0x15, 0x46, 0x7f, 0xfd, 0x4f, 0x8b, 0x77, 0x05, 0x96, 0xb6, 0xe2, 0x08, 0xdb, 0x0d, 0x09, 0xee, 0x5b, 0xd1, 0x2a, 0x63}, - dt2: fp.Elt{0x8f, 0x7b, 0x57, 0x8c, 0xbf, 0x06, 0x0d, 0x43, 0x21, 0x92, 0x94, 0x2d, 0x6a, 0x38, 0x07, 0x0f, 0xa0, 0xf1, 0xe3, 0xd8, 0x2a, 0xbf, 0x46, 0xc6, 0x9e, 0x1f, 0x8f, 0x2b, 0x46, 0x84, 0x0b, 0x74, 0xed, 0xff, 0xf8, 0xa5, 0x94, 0xae, 0xf1, 0x67, 0xb1, 0x9b, 0xdd, 0x4a, 0xd0, 0xdb, 0xc2, 0xb5, 0x58, 0x49, 0x0c, 0xa9, 0x1d, 0x7d, 0xa9, 0xd3}, - }, - { /* 13P*/ - addYX: fp.Elt{0x73, 0x84, 0x2e, 0x31, 0x1f, 0xdc, 0xed, 0x9f, 0x74, 0xfa, 0xe0, 0x35, 0xb1, 0x85, 0x6a, 0x8d, 0x86, 0xd0, 0xff, 0xd6, 0x08, 0x43, 0x73, 0x1a, 0xd5, 0xf8, 0x43, 0xd4, 0xb3, 0xe5, 0x3f, 0xa8, 0x84, 0x17, 0x59, 0x65, 0x4e, 0xe6, 0xee, 0x54, 0x9c, 0xda, 0x5e, 0x7e, 0x98, 0x29, 0x6d, 0x73, 0x34, 0x1f, 0x99, 0x80, 0x54, 0x54, 0x81, 0x0b}, - subYX: fp.Elt{0xb1, 0xe5, 0xbb, 0x80, 0x22, 0x9c, 0x81, 0x6d, 0xaf, 0x27, 0x65, 0x6f, 0x7e, 0x9c, 0xb6, 0x8d, 0x35, 0x5c, 0x2e, 0x20, 0x48, 0x7a, 0x28, 0xf0, 0x97, 0xfe, 0xb7, 0x71, 0xce, 0xd6, 0xad, 0x3a, 0x81, 0xf6, 0x74, 0x5e, 0xf3, 0xfd, 0x1b, 0xd4, 0x1e, 0x7c, 0xc2, 0xb7, 0xc8, 0xa6, 0xc9, 0x89, 0x03, 0x47, 0xec, 0x24, 0xd6, 0x0e, 0xec, 0x9c}, - dt2: fp.Elt{0x91, 0x0a, 0x43, 0x34, 0x20, 0xc2, 0x64, 0xf7, 0x4e, 0x48, 0xc8, 0xd2, 0x95, 0x83, 0xd1, 0xa4, 0xfb, 0x4e, 0x41, 0x3b, 0x0d, 0xd5, 0x07, 0xd9, 0xf1, 0x13, 0x16, 0x78, 0x54, 0x57, 0xd0, 0xf1, 0x4f, 0x20, 0xac, 0xcf, 0x9c, 0x3b, 0x33, 0x0b, 0x99, 0x54, 0xc3, 0x7f, 0x3e, 0x57, 0x26, 0x86, 0xd5, 0xa5, 0x2b, 0x8d, 0xe3, 0x19, 0x36, 0xf7}, - }, - { /* 15P*/ - addYX: fp.Elt{0x23, 0x69, 0x47, 0x14, 0xf9, 0x9a, 0x50, 0xff, 0x64, 0xd1, 0x50, 0x35, 0xc3, 0x11, 0xd3, 0x19, 0xcf, 0x87, 0xda, 0x30, 0x0b, 0x50, 0xda, 0xc0, 0xe0, 0x25, 0x00, 0xe5, 0x68, 0x93, 0x04, 0xc2, 0xaf, 0xbd, 0x2f, 0x36, 0x5f, 0x47, 0x96, 0x10, 0xa8, 0xbd, 0xe4, 0x88, 0xac, 0x80, 0x52, 0x61, 0x73, 0xe9, 0x63, 0xdd, 0x99, 0xad, 0x20, 0x5b}, - subYX: fp.Elt{0x1b, 0x5e, 0xa2, 0x2a, 0x25, 0x0f, 0x86, 0xc0, 0xb1, 0x2e, 0x0c, 0x13, 0x40, 0x8d, 0xf0, 0xe6, 0x00, 0x55, 0x08, 0xc5, 0x7d, 0xf4, 0xc9, 0x31, 0x25, 0x3a, 0x99, 0x69, 0xdd, 0x67, 0x63, 0x9a, 0xd6, 0x89, 0x2e, 0xa1, 0x19, 0xca, 0x2c, 0xd9, 0x59, 0x5f, 0x5d, 0xc3, 0x6e, 0x62, 0x36, 0x12, 0x59, 0x15, 0xe1, 0xdc, 0xa4, 0xad, 0xc9, 0xd0}, - dt2: fp.Elt{0xbc, 0xea, 0xfc, 0xaf, 0x66, 0x23, 0xb7, 0x39, 0x6b, 0x2a, 0x96, 0xa8, 0x54, 0x43, 0xe9, 0xaa, 0x32, 0x40, 0x63, 0x92, 0x5e, 0xdf, 0x35, 0xc2, 0x9f, 0x24, 0x0c, 0xed, 0xfc, 0xde, 0x73, 0x8f, 0xa7, 0xd5, 0xa3, 0x2b, 0x18, 0x1f, 0xb0, 0xf8, 0xeb, 0x55, 0xd9, 0xc3, 0xfd, 0x28, 0x7c, 0x4f, 0xce, 0x0d, 0xf7, 0xae, 0xc2, 0x83, 0xc3, 0x78}, - }, - { /* 17P*/ - addYX: fp.Elt{0x71, 0xe6, 0x60, 0x93, 0x37, 0xdb, 0x01, 0xa5, 0x4c, 0xba, 0xe8, 0x8e, 0xd5, 0xf9, 0xd3, 0x98, 0xe5, 0xeb, 0xab, 0x3a, 0x15, 0x8b, 0x35, 0x60, 0xbe, 0xe5, 0x9c, 0x2d, 0x10, 0x9b, 0x2e, 0xcf, 0x65, 0x64, 0xea, 0x8f, 0x72, 0xce, 0xf5, 0x18, 0xe5, 0xe2, 0xf0, 0x0e, 0xae, 0x04, 0xec, 0xa0, 0x20, 0x65, 0x63, 0x07, 0xb1, 0x9f, 0x03, 0x97}, - subYX: fp.Elt{0x9e, 0x41, 0x64, 0x30, 0x95, 0x7f, 0x3a, 0x89, 0x7b, 0x0a, 0x79, 0x59, 0x23, 0x9a, 0x3b, 0xfe, 0xa4, 0x13, 0x08, 0xb2, 0x2e, 0x04, 0x50, 0x10, 0x30, 0xcd, 0x2e, 0xa4, 0x91, 0x71, 0x50, 0x36, 0x4a, 0x02, 0xf4, 0x8d, 0xa3, 0x36, 0x1b, 0xf4, 0x52, 0xba, 0x15, 0x04, 0x8b, 0x80, 0x25, 0xd9, 0xae, 0x67, 0x20, 0xd9, 0x88, 0x8f, 0x97, 0xa6}, - dt2: fp.Elt{0xb5, 0xe7, 0x46, 0xbd, 0x55, 0x23, 0xa0, 0x68, 0xc0, 0x12, 0xd9, 0xf1, 0x0a, 0x75, 0xe2, 0xda, 0xf4, 0x6b, 0xca, 0x14, 0xe4, 0x9f, 0x0f, 0xb5, 0x3c, 0xa6, 0xa5, 0xa2, 0x63, 0x94, 0xd1, 0x1c, 0x39, 0x58, 0x57, 0x02, 0x27, 0x98, 0xb6, 0x47, 0xc6, 0x61, 0x4b, 0x5c, 0xab, 0x6f, 0x2d, 0xab, 0xe3, 0xc1, 0x69, 0xf9, 0x12, 0xb0, 0xc8, 0xd5}, - }, - { /* 19P*/ - addYX: fp.Elt{0x19, 0x7d, 0xd5, 0xac, 0x79, 0xa2, 0x82, 0x9b, 0x28, 0x31, 0x22, 0xc0, 0x73, 0x02, 0x76, 0x17, 0x10, 0x70, 0x79, 0x57, 0xc9, 0x84, 0x62, 0x8e, 0x04, 0x04, 0x61, 0x67, 0x08, 0x48, 0xb4, 0x4b, 0xde, 0x53, 0x8c, 0xff, 0x36, 0x1b, 0x62, 0x86, 0x5d, 0xe1, 0x9b, 0xb1, 0xe5, 0xe8, 0x44, 0x64, 0xa1, 0x68, 0x3f, 0xa8, 0x45, 0x52, 0x91, 0xed}, - subYX: fp.Elt{0x42, 0x1a, 0x36, 0x1f, 0x90, 0x15, 0x24, 0x8d, 0x24, 0x80, 0xe6, 0xfe, 0x1e, 0xf0, 0xad, 0xaf, 0x6a, 0x93, 0xf0, 0xa6, 0x0d, 0x5d, 0xea, 0xf6, 0x62, 0x96, 0x7a, 0x05, 0x76, 0x85, 0x74, 0x32, 0xc7, 0xc8, 0x64, 0x53, 0x62, 0xe7, 0x54, 0x84, 0xe0, 0x40, 0x66, 0x19, 0x70, 0x40, 0x95, 0x35, 0x68, 0x64, 0x43, 0xcd, 0xba, 0x29, 0x32, 0xa8}, - dt2: fp.Elt{0x3e, 0xf6, 0xd6, 0xe4, 0x99, 0xeb, 0x20, 0x66, 0x08, 0x2e, 0x26, 0x64, 0xd7, 0x76, 0xf3, 0xb4, 0xc5, 0xa4, 0x35, 0x92, 0xd2, 0x99, 0x70, 0x5a, 0x1a, 0xe9, 0xe9, 0x3d, 0x3b, 0xe1, 0xcd, 0x0e, 0xee, 0x24, 0x13, 0x03, 0x22, 0xd6, 0xd6, 0x72, 0x08, 0x2b, 0xde, 0xfd, 0x93, 0xed, 0x0c, 0x7f, 0x5e, 0x31, 0x22, 0x4d, 0x80, 0x78, 0xc0, 0x48}, - }, - { /* 21P*/ - addYX: fp.Elt{0x8f, 0x72, 0xd2, 0x9e, 0xc4, 0xcd, 0x2c, 0xbf, 0xa8, 0xd3, 0x24, 0x62, 0x28, 0xee, 0x39, 0x0a, 0x19, 0x3a, 0x58, 0xff, 0x21, 0x2e, 0x69, 0x6c, 0x6e, 0x18, 0xd0, 0xcd, 0x61, 0xc1, 0x18, 0x02, 0x5a, 0xe9, 0xe3, 0xef, 0x1f, 0x8e, 0x10, 0xe8, 0x90, 0x2b, 0x48, 0xcd, 0xee, 0x38, 0xbd, 0x3a, 0xca, 0xbc, 0x2d, 0xe2, 0x3a, 0x03, 0x71, 0x02}, - subYX: fp.Elt{0xf8, 0xa4, 0x32, 0x26, 0x66, 0xaf, 0x3b, 0x53, 0xe7, 0xb0, 0x91, 0x92, 0xf5, 0x3c, 0x74, 0xce, 0xf2, 0xdd, 0x68, 0xa9, 0xf4, 0xcd, 0x5f, 0x60, 0xab, 0x71, 0xdf, 0xcd, 0x5c, 0x5d, 0x51, 0x72, 0x3a, 0x96, 0xea, 0xd6, 0xde, 0x54, 0x8e, 0x55, 0x4c, 0x08, 0x4c, 0x60, 0xdd, 0x34, 0xa9, 0x6f, 0xf3, 0x04, 0x02, 0xa8, 0xa6, 0x4e, 0x4d, 0x62}, - dt2: fp.Elt{0x76, 0x4a, 0xae, 0x38, 0x62, 0x69, 0x72, 0xdc, 0xe8, 0x43, 0xbe, 0x1d, 0x61, 0xde, 0x31, 0xc3, 0x42, 0x8f, 0x33, 0x9d, 0xca, 0xc7, 0x9c, 0xec, 0x6a, 0xe2, 0xaa, 0x01, 0x49, 0x78, 0x8d, 0x72, 0x4f, 0x38, 0xea, 0x52, 0xc2, 0xd3, 0xc9, 0x39, 0x71, 0xba, 0xb9, 0x09, 0x9b, 0xa3, 0x7f, 0x45, 0x43, 0x65, 0x36, 0x29, 0xca, 0xe7, 0x5c, 0x5f}, - }, - { /* 23P*/ - addYX: fp.Elt{0x89, 0x42, 0x35, 0x48, 0x6d, 0x74, 0xe5, 0x1f, 0xc3, 0xdd, 0x28, 0x5b, 0x84, 0x41, 0x33, 0x9f, 0x42, 0xf3, 0x1d, 0x5d, 0x15, 0x6d, 0x76, 0x33, 0x36, 0xaf, 0xe9, 0xdd, 0xfa, 0x63, 0x4f, 0x7a, 0x9c, 0xeb, 0x1c, 0x4f, 0x34, 0x65, 0x07, 0x54, 0xbb, 0x4c, 0x8b, 0x62, 0x9d, 0xd0, 0x06, 0x99, 0xb3, 0xe9, 0xda, 0x85, 0x19, 0xb0, 0x3d, 0x3c}, - subYX: fp.Elt{0xbb, 0x99, 0xf6, 0xbf, 0xaf, 0x2c, 0x22, 0x0d, 0x7a, 0xaa, 0x98, 0x6f, 0x01, 0x82, 0x99, 0xcf, 0x88, 0xbd, 0x0e, 0x3a, 0x89, 0xe0, 0x9c, 0x8c, 0x17, 0x20, 0xc4, 0xe0, 0xcf, 0x43, 0x7a, 0xef, 0x0d, 0x9f, 0x87, 0xd4, 0xfb, 0xf2, 0x96, 0xb8, 0x03, 0xe8, 0xcb, 0x5c, 0xec, 0x65, 0x5f, 0x49, 0xa4, 0x7c, 0x85, 0xb4, 0xf6, 0xc7, 0xdb, 0xa3}, - dt2: fp.Elt{0x11, 0xf3, 0x32, 0xa3, 0xa7, 0xb2, 0x7d, 0x51, 0x82, 0x44, 0xeb, 0xa2, 0x7d, 0x72, 0xcb, 0xc6, 0xf6, 0xc7, 0xb2, 0x38, 0x0e, 0x0f, 0x4f, 0x29, 0x00, 0xe4, 0x5b, 0x94, 0x46, 0x86, 0x66, 0xa1, 0x83, 0xb3, 0xeb, 0x15, 0xb6, 0x31, 0x50, 0x28, 0xeb, 0xed, 0x0d, 0x32, 0x39, 0xe9, 0x23, 0x81, 0x99, 0x3e, 0xff, 0x17, 0x4c, 0x11, 0x43, 0xd1}, - }, - { /* 25P*/ - addYX: fp.Elt{0xce, 0xe7, 0xf8, 0x94, 0x8f, 0x96, 0xf8, 0x96, 0xe6, 0x72, 0x20, 0x44, 0x2c, 0xa7, 0xfc, 0xba, 0xc8, 0xe1, 0xbb, 0xc9, 0x16, 0x85, 0xcd, 0x0b, 0xe5, 0xb5, 0x5a, 0x7f, 0x51, 0x43, 0x63, 0x8b, 0x23, 0x8e, 0x1d, 0x31, 0xff, 0x46, 0x02, 0x66, 0xcc, 0x9e, 0x4d, 0xa2, 0xca, 0xe2, 0xc7, 0xfd, 0x22, 0xb1, 0xdb, 0xdf, 0x6f, 0xe6, 0xa5, 0x82}, - subYX: fp.Elt{0xd0, 0xf5, 0x65, 0x40, 0xec, 0x8e, 0x65, 0x42, 0x78, 0xc1, 0x65, 0xe4, 0x10, 0xc8, 0x0b, 0x1b, 0xdd, 0x96, 0x68, 0xce, 0xee, 0x45, 0x55, 0xd8, 0x6e, 0xd3, 0xe6, 0x77, 0x19, 0xae, 0xc2, 0x8d, 0x8d, 0x3e, 0x14, 0x3f, 0x6d, 0x00, 0x2f, 0x9b, 0xd1, 0x26, 0x60, 0x28, 0x0f, 0x3a, 0x47, 0xb3, 0xe6, 0x68, 0x28, 0x24, 0x25, 0xca, 0xc8, 0x06}, - dt2: fp.Elt{0x54, 0xbb, 0x60, 0x92, 0xdb, 0x8f, 0x0f, 0x38, 0xe0, 0xe6, 0xe4, 0xc9, 0xcc, 0x14, 0x62, 0x01, 0xc4, 0x2b, 0x0f, 0xcf, 0xed, 0x7d, 0x8e, 0xa4, 0xd9, 0x73, 0x0b, 0xba, 0x0c, 0xaf, 0x0c, 0xf9, 0xe2, 0xeb, 0x29, 0x2a, 0x53, 0xdf, 0x2c, 0x5a, 0xfa, 0x8f, 0xc1, 0x01, 0xd7, 0xb1, 0x45, 0x73, 0x92, 0x32, 0x83, 0x85, 0x12, 0x74, 0x89, 0x44}, - }, - { /* 27P*/ - addYX: fp.Elt{0x0b, 0x73, 0x3c, 0xc2, 0xb1, 0x2e, 0xe1, 0xa7, 0xf5, 0xc9, 0x7a, 0xfb, 0x3d, 0x2d, 0xac, 0x59, 0xdb, 0xfa, 0x36, 0x11, 0xd1, 0x13, 0x04, 0x51, 0x1d, 0xab, 0x9b, 0x6b, 0x93, 0xfe, 0xda, 0xb0, 0x8e, 0xb4, 0x79, 0x11, 0x21, 0x0f, 0x65, 0xb9, 0xbb, 0x79, 0x96, 0x2a, 0xfd, 0x30, 0xe0, 0xb4, 0x2d, 0x9a, 0x55, 0x25, 0x5d, 0xd4, 0xad, 0x2a}, - subYX: fp.Elt{0x9e, 0xc5, 0x04, 0xfe, 0xec, 0x3c, 0x64, 0x1c, 0xed, 0x95, 0xed, 0xae, 0xaf, 0x5c, 0x6e, 0x08, 0x9e, 0x02, 0x29, 0x59, 0x7e, 0x5f, 0xc4, 0x9a, 0xd5, 0x32, 0x72, 0x86, 0xe1, 0x4e, 0x3c, 0xce, 0x99, 0x69, 0x3b, 0xc4, 0xdd, 0x4d, 0xb7, 0xbb, 0xda, 0x3b, 0x1a, 0x99, 0xaa, 0x62, 0x15, 0xc1, 0xf0, 0xb6, 0x6c, 0xec, 0x56, 0xc1, 0xff, 0x0c}, - dt2: fp.Elt{0x2f, 0xf1, 0x3f, 0x7a, 0x2d, 0x56, 0x19, 0x7f, 0xea, 0xbe, 0x59, 0x2e, 0x13, 0x67, 0x81, 0xfb, 0xdb, 0xc8, 0xa3, 0x1d, 0xd5, 0xe9, 0x13, 0x8b, 0x29, 0xdf, 0xcf, 0x9f, 0xe7, 0xd9, 0x0b, 0x70, 0xd3, 0x15, 0x57, 0x4a, 0xe9, 0x50, 0x12, 0x1b, 0x81, 0x4b, 0x98, 0x98, 0xa8, 0x31, 0x1d, 0x27, 0x47, 0x38, 0xed, 0x57, 0x99, 0x26, 0xb2, 0xee}, - }, - { /* 29P*/ - addYX: fp.Elt{0x1c, 0xb2, 0xb2, 0x67, 0x3b, 0x8b, 0x3d, 0x5a, 0x30, 0x7e, 0x38, 0x7e, 0x3c, 0x3d, 0x28, 0x56, 0x59, 0xd8, 0x87, 0x53, 0x8b, 0xe6, 0x6c, 0x5d, 0xe5, 0x0a, 0x33, 0x10, 0xce, 0xa2, 0x17, 0x0d, 0xe8, 0x76, 0xee, 0x68, 0xa8, 0x72, 0x54, 0xbd, 0xa6, 0x24, 0x94, 0x6e, 0x77, 0xc7, 0x53, 0xb7, 0x89, 0x1c, 0x7a, 0xe9, 0x78, 0x9a, 0x74, 0x5f}, - subYX: fp.Elt{0x76, 0x96, 0x1c, 0xcf, 0x08, 0x55, 0xd8, 0x1e, 0x0d, 0xa3, 0x59, 0x95, 0x32, 0xf4, 0xc2, 0x8e, 0x84, 0x5e, 0x4b, 0x04, 0xda, 0x71, 0xc9, 0x78, 0x52, 0xde, 0x14, 0xb4, 0x31, 0xf4, 0xd4, 0xb8, 0x58, 0xc5, 0x20, 0xe8, 0xdd, 0x15, 0xb5, 0xee, 0xea, 0x61, 0xe0, 0xf5, 0xd6, 0xae, 0x55, 0x59, 0x05, 0x3e, 0xaf, 0x74, 0xac, 0x1f, 0x17, 0x82}, - dt2: fp.Elt{0x59, 0x24, 0xcd, 0xfc, 0x11, 0x7e, 0x85, 0x18, 0x3d, 0x69, 0xf7, 0x71, 0x31, 0x66, 0x98, 0x42, 0x95, 0x00, 0x8c, 0xb2, 0xae, 0x39, 0x7e, 0x85, 0xd6, 0xb0, 0x02, 0xec, 0xce, 0xfc, 0x25, 0xb2, 0xe3, 0x99, 0x8e, 0x5b, 0x61, 0x96, 0x2e, 0x6d, 0x96, 0x57, 0x71, 0xa5, 0x93, 0x41, 0x0e, 0x6f, 0xfd, 0x0a, 0xbf, 0xa9, 0xf7, 0x56, 0xa9, 0x3e}, - }, - { /* 31P*/ - addYX: fp.Elt{0xa2, 0x2e, 0x0c, 0x17, 0x4d, 0xcc, 0x85, 0x2c, 0x18, 0xa0, 0xd2, 0x08, 0xba, 0x11, 0xfa, 0x47, 0x71, 0x86, 0xaf, 0x36, 0x6a, 0xd7, 0xfe, 0xb9, 0xb0, 0x2f, 0x89, 0x98, 0x49, 0x69, 0xf8, 0x6a, 0xad, 0x27, 0x5e, 0x0a, 0x22, 0x60, 0x5e, 0x5d, 0xca, 0x06, 0x51, 0x27, 0x99, 0x29, 0x85, 0x68, 0x98, 0xe1, 0xc4, 0x21, 0x50, 0xa0, 0xe9, 0xc1}, - subYX: fp.Elt{0x4d, 0x70, 0xee, 0x91, 0x92, 0x3f, 0xb7, 0xd3, 0x1d, 0xdb, 0x8d, 0x6e, 0x16, 0xf5, 0x65, 0x7d, 0x5f, 0xb5, 0x6c, 0x59, 0x26, 0x70, 0x4b, 0xf2, 0xfc, 0xe7, 0xdf, 0x86, 0xfe, 0xa5, 0xa7, 0xa6, 0x5d, 0xfb, 0x06, 0xe9, 0xf9, 0xcc, 0xc0, 0x37, 0xcc, 0xd8, 0x09, 0x04, 0xd2, 0xa5, 0x1d, 0xd7, 0xb7, 0xce, 0x92, 0xac, 0x3c, 0xad, 0xfb, 0xae}, - dt2: fp.Elt{0x17, 0xa3, 0x9a, 0xc7, 0x86, 0x2a, 0x51, 0xf7, 0x96, 0x79, 0x49, 0x22, 0x2e, 0x5a, 0x01, 0x5c, 0xb5, 0x95, 0xd4, 0xe8, 0xcb, 0x00, 0xca, 0x2d, 0x55, 0xb6, 0x34, 0x36, 0x0b, 0x65, 0x46, 0xf0, 0x49, 0xfc, 0x87, 0x86, 0xe5, 0xc3, 0x15, 0xdb, 0x32, 0xcd, 0xf2, 0xd3, 0x82, 0x4c, 0xe6, 0x61, 0x8a, 0xaf, 0xd4, 0x9e, 0x0f, 0x5a, 0xf2, 0x81}, - }, - { /* 33P*/ - addYX: fp.Elt{0x88, 0x10, 0xc0, 0xcb, 0xf5, 0x77, 0xae, 0xa5, 0xbe, 0xf6, 0xcd, 0x2e, 0x8b, 0x7e, 0xbd, 0x79, 0x62, 0x4a, 0xeb, 0x69, 0xc3, 0x28, 0xaa, 0x72, 0x87, 0xa9, 0x25, 0x87, 0x46, 0xea, 0x0e, 0x62, 0xa3, 0x6a, 0x1a, 0xe2, 0xba, 0xdc, 0x81, 0x10, 0x33, 0x01, 0xf6, 0x16, 0x89, 0x80, 0xc6, 0xcd, 0xdb, 0xdc, 0xba, 0x0e, 0x09, 0x4a, 0x35, 0x4a}, - subYX: fp.Elt{0x86, 0xb2, 0x2b, 0xd0, 0xb8, 0x4a, 0x6d, 0x66, 0x7b, 0x32, 0xdf, 0x3b, 0x1a, 0x19, 0x1f, 0x63, 0xee, 0x1f, 0x3d, 0x1c, 0x5c, 0x14, 0x60, 0x5b, 0x72, 0x49, 0x07, 0xb1, 0x0d, 0x72, 0xc6, 0x35, 0xf0, 0xbc, 0x5e, 0xda, 0x80, 0x6b, 0x64, 0x5b, 0xe5, 0x34, 0x54, 0x39, 0xdd, 0xe6, 0x3c, 0xcb, 0xe5, 0x29, 0x32, 0x06, 0xc6, 0xb1, 0x96, 0x34}, - dt2: fp.Elt{0x85, 0x86, 0xf5, 0x84, 0x86, 0xe6, 0x77, 0x8a, 0x71, 0x85, 0x0c, 0x4f, 0x81, 0x5b, 0x29, 0x06, 0xb5, 0x2e, 0x26, 0x71, 0x07, 0x78, 0x07, 0xae, 0xbc, 0x95, 0x46, 0xc3, 0x65, 0xac, 0xe3, 0x76, 0x51, 0x7d, 0xd4, 0x85, 0x31, 0xe3, 0x43, 0xf3, 0x1b, 0x7c, 0xf7, 0x6b, 0x2c, 0xf8, 0x1c, 0xbb, 0x8d, 0xca, 0xab, 0x4b, 0xba, 0x7f, 0xa4, 0xe2}, - }, - { /* 35P*/ - addYX: fp.Elt{0x1a, 0xee, 0xe7, 0xa4, 0x8a, 0x9d, 0x53, 0x80, 0xc6, 0xb8, 0x4e, 0xdc, 0x89, 0xe0, 0xc4, 0x2b, 0x60, 0x52, 0x6f, 0xec, 0x81, 0xd2, 0x55, 0x6b, 0x1b, 0x6f, 0x17, 0x67, 0x8e, 0x42, 0x26, 0x4c, 0x65, 0x23, 0x29, 0xc6, 0x7b, 0xcd, 0x9f, 0xad, 0x4b, 0x42, 0xd3, 0x0c, 0x75, 0xc3, 0x8a, 0xf5, 0xbe, 0x9e, 0x55, 0xf7, 0x47, 0x5d, 0xbd, 0x3a}, - subYX: fp.Elt{0x0d, 0xa8, 0x3b, 0xf9, 0xc7, 0x7e, 0xc6, 0x86, 0x94, 0xc0, 0x01, 0xff, 0x27, 0xce, 0x43, 0xac, 0xe5, 0xe1, 0xd2, 0x8d, 0xc1, 0x22, 0x31, 0xbe, 0xe1, 0xaf, 0xf9, 0x4a, 0x78, 0xa1, 0x0c, 0xaa, 0xd4, 0x80, 0xe4, 0x09, 0x8d, 0xfb, 0x1d, 0x52, 0xc8, 0x60, 0x2d, 0xf2, 0xa2, 0x89, 0x02, 0x56, 0x3d, 0x56, 0x27, 0x85, 0xc7, 0xf0, 0x2b, 0x9a}, - dt2: fp.Elt{0x62, 0x7c, 0xc7, 0x6b, 0x2c, 0x9d, 0x0a, 0x7c, 0xe5, 0x50, 0x3c, 0xe6, 0x87, 0x1c, 0x82, 0x30, 0x67, 0x3c, 0x39, 0xb6, 0xa0, 0x31, 0xfb, 0x03, 0x7b, 0xa1, 0x58, 0xdf, 0x12, 0x76, 0x5d, 0x5d, 0x0a, 0x8f, 0x9b, 0x37, 0x32, 0xc3, 0x60, 0x33, 0xea, 0x9f, 0x0a, 0x99, 0xfa, 0x20, 0xd0, 0x33, 0x21, 0xc3, 0x94, 0xd4, 0x86, 0x49, 0x7c, 0x4e}, - }, - { /* 37P*/ - addYX: fp.Elt{0xc7, 0x0c, 0x71, 0xfe, 0x55, 0xd1, 0x95, 0x8f, 0x43, 0xbb, 0x6b, 0x74, 0x30, 0xbd, 0xe8, 0x6f, 0x1c, 0x1b, 0x06, 0x62, 0xf5, 0xfc, 0x65, 0xa0, 0xeb, 0x81, 0x12, 0xc9, 0x64, 0x66, 0x61, 0xde, 0xf3, 0x6d, 0xd4, 0xae, 0x8e, 0xb1, 0x72, 0xe0, 0xcd, 0x37, 0x01, 0x28, 0x52, 0xd7, 0x39, 0x46, 0x0c, 0x55, 0xcf, 0x47, 0x70, 0xef, 0xa1, 0x17}, - subYX: fp.Elt{0x8d, 0x58, 0xde, 0x83, 0x88, 0x16, 0x0e, 0x12, 0x42, 0x03, 0x50, 0x60, 0x4b, 0xdf, 0xbf, 0x95, 0xcc, 0x7d, 0x18, 0x17, 0x7e, 0x31, 0x5d, 0x8a, 0x66, 0xc1, 0xcf, 0x14, 0xea, 0xf4, 0xf4, 0xe5, 0x63, 0x2d, 0x32, 0x86, 0x9b, 0xed, 0x1f, 0x4f, 0x03, 0xaf, 0x33, 0x92, 0xcb, 0xaf, 0x9c, 0x05, 0x0d, 0x47, 0x1b, 0x42, 0xba, 0x13, 0x22, 0x98}, - dt2: fp.Elt{0xb5, 0x48, 0xeb, 0x7d, 0x3d, 0x10, 0x9f, 0x59, 0xde, 0xf8, 0x1c, 0x4f, 0x7d, 0x9d, 0x40, 0x4d, 0x9e, 0x13, 0x24, 0xb5, 0x21, 0x09, 0xb7, 0xee, 0x98, 0x5c, 0x56, 0xbc, 0x5e, 0x2b, 0x78, 0x38, 0x06, 0xac, 0xe3, 0xe0, 0xfa, 0x2e, 0xde, 0x4f, 0xd2, 0xb3, 0xfb, 0x2d, 0x71, 0x84, 0xd1, 0x9d, 0x12, 0x5b, 0x35, 0xc8, 0x03, 0x68, 0x67, 0xc7}, - }, - { /* 39P*/ - addYX: fp.Elt{0xb6, 0x65, 0xfb, 0xa7, 0x06, 0x35, 0xbb, 0xe0, 0x31, 0x8d, 0x91, 0x40, 0x98, 0xab, 0x30, 0xe4, 0xca, 0x12, 0x59, 0x89, 0xed, 0x65, 0x5d, 0x7f, 0xae, 0x69, 0xa0, 0xa4, 0xfa, 0x78, 0xb4, 0xf7, 0xed, 0xae, 0x86, 0x78, 0x79, 0x64, 0x24, 0xa6, 0xd4, 0xe1, 0xf6, 0xd3, 0xa0, 0x89, 0xba, 0x20, 0xf4, 0x54, 0x0d, 0x8f, 0xdb, 0x1a, 0x79, 0xdb}, - subYX: fp.Elt{0xe1, 0x82, 0x0c, 0x4d, 0xde, 0x9f, 0x40, 0xf0, 0xc1, 0xbd, 0x8b, 0xd3, 0x24, 0x03, 0xcd, 0xf2, 0x92, 0x7d, 0xe2, 0x68, 0x7f, 0xf1, 0xbe, 0x69, 0xde, 0x34, 0x67, 0x4c, 0x85, 0x3b, 0xec, 0x98, 0xcc, 0x4d, 0x3e, 0xc0, 0x96, 0x27, 0xe6, 0x75, 0xfc, 0xdf, 0x37, 0xc0, 0x1e, 0x27, 0xe0, 0xf6, 0xc2, 0xbd, 0xbc, 0x3d, 0x9b, 0x39, 0xdc, 0xe2}, - dt2: fp.Elt{0xd8, 0x29, 0xa7, 0x39, 0xe3, 0x9f, 0x2f, 0x0e, 0x4b, 0x24, 0x21, 0x70, 0xef, 0xfd, 0x91, 0xea, 0xbf, 0xe1, 0x72, 0x90, 0xcc, 0xc9, 0x84, 0x0e, 0xad, 0xd5, 0xe6, 0xbb, 0xc5, 0x99, 0x7f, 0xa4, 0xf0, 0x2e, 0xcc, 0x95, 0x64, 0x27, 0x19, 0xd8, 0x4c, 0x27, 0x0d, 0xff, 0xb6, 0x29, 0xe2, 0x6c, 0xfa, 0xbb, 0x4d, 0x9c, 0xbb, 0xaf, 0xa5, 0xec}, - }, - { /* 41P*/ - addYX: fp.Elt{0xd6, 0x33, 0x3f, 0x9f, 0xcf, 0xfd, 0x4c, 0xd1, 0xfe, 0xe5, 0xeb, 0x64, 0x27, 0xae, 0x7a, 0xa2, 0x82, 0x50, 0x6d, 0xaa, 0xe3, 0x5d, 0xe2, 0x48, 0x60, 0xb3, 0x76, 0x04, 0xd9, 0x19, 0xa7, 0xa1, 0x73, 0x8d, 0x38, 0xa9, 0xaf, 0x45, 0xb5, 0xb2, 0x62, 0x9b, 0xf1, 0x35, 0x7b, 0x84, 0x66, 0xeb, 0x06, 0xef, 0xf1, 0xb2, 0x2d, 0x6a, 0x61, 0x15}, - subYX: fp.Elt{0x86, 0x50, 0x42, 0xf7, 0xda, 0x59, 0xb2, 0xcf, 0x0d, 0x3d, 0xee, 0x8e, 0x53, 0x5d, 0xf7, 0x9e, 0x6a, 0x26, 0x2d, 0xc7, 0x8c, 0x8e, 0x18, 0x50, 0x6d, 0xb7, 0x51, 0x4c, 0xa7, 0x52, 0x6e, 0x0e, 0x0a, 0x16, 0x74, 0xb2, 0x81, 0x8b, 0x56, 0x27, 0x22, 0x84, 0xf4, 0x56, 0xc5, 0x06, 0xe1, 0x8b, 0xca, 0x2d, 0xdb, 0x9a, 0xf6, 0x10, 0x9c, 0x51}, - dt2: fp.Elt{0x1f, 0x16, 0xa2, 0x78, 0x96, 0x1b, 0x85, 0x9c, 0x76, 0x49, 0xd4, 0x0f, 0xac, 0xb0, 0xf4, 0xd0, 0x06, 0x2c, 0x7e, 0x6d, 0x6e, 0x8e, 0xc7, 0x9f, 0x18, 0xad, 0xfc, 0x88, 0x0c, 0x0c, 0x09, 0x05, 0x05, 0xa0, 0x79, 0x72, 0x32, 0x72, 0x87, 0x0f, 0x49, 0x87, 0x0c, 0xb4, 0x12, 0xc2, 0x09, 0xf8, 0x9f, 0x30, 0x72, 0xa9, 0x47, 0x13, 0x93, 0x49}, - }, - { /* 43P*/ - addYX: fp.Elt{0xcc, 0xb1, 0x4c, 0xd3, 0xc0, 0x9e, 0x9e, 0x4d, 0x6d, 0x28, 0x0b, 0xa5, 0x94, 0xa7, 0x2e, 0xc2, 0xc7, 0xaf, 0x29, 0x73, 0xc9, 0x68, 0xea, 0x0f, 0x34, 0x37, 0x8d, 0x96, 0x8f, 0x3a, 0x3d, 0x73, 0x1e, 0x6d, 0x9f, 0xcf, 0x8d, 0x83, 0xb5, 0x71, 0xb9, 0xe1, 0x4b, 0x67, 0x71, 0xea, 0xcf, 0x56, 0xe5, 0xeb, 0x72, 0x15, 0x2f, 0x9e, 0xa8, 0xaa}, - subYX: fp.Elt{0xf4, 0x3e, 0x85, 0x1c, 0x1a, 0xef, 0x50, 0xd1, 0xb4, 0x20, 0xb2, 0x60, 0x05, 0x98, 0xfe, 0x47, 0x3b, 0xc1, 0x76, 0xca, 0x2c, 0x4e, 0x5a, 0x42, 0xa3, 0xf7, 0x20, 0xaa, 0x57, 0x39, 0xee, 0x34, 0x1f, 0xe1, 0x68, 0xd3, 0x7e, 0x06, 0xc4, 0x6c, 0xc7, 0x76, 0x2b, 0xe4, 0x1c, 0x48, 0x44, 0xe6, 0xe5, 0x44, 0x24, 0x8d, 0xb3, 0xb6, 0x88, 0x32}, - dt2: fp.Elt{0x18, 0xa7, 0xba, 0xd0, 0x44, 0x6f, 0x33, 0x31, 0x00, 0xf8, 0xf6, 0x12, 0xe3, 0xc5, 0xc7, 0xb5, 0x91, 0x9c, 0x91, 0xb5, 0x75, 0x18, 0x18, 0x8a, 0xab, 0xed, 0x24, 0x11, 0x2e, 0xce, 0x5a, 0x0f, 0x94, 0x5f, 0x2e, 0xca, 0xd3, 0x80, 0xea, 0xe5, 0x34, 0x96, 0x67, 0x8b, 0x6a, 0x26, 0x5e, 0xc8, 0x9d, 0x2c, 0x5e, 0x6c, 0xa2, 0x0c, 0xbf, 0xf0}, - }, - { /* 45P*/ - addYX: fp.Elt{0xb3, 0xbf, 0xa3, 0x85, 0xee, 0xf6, 0x58, 0x02, 0x78, 0xc4, 0x30, 0xd6, 0x57, 0x59, 0x8c, 0x88, 0x08, 0x7c, 0xbc, 0xbe, 0x0a, 0x74, 0xa9, 0xde, 0x69, 0xe7, 0x41, 0xd8, 0xbf, 0x66, 0x8d, 0x3d, 0x28, 0x00, 0x8c, 0x47, 0x65, 0x34, 0xfe, 0x86, 0x9e, 0x6a, 0xf2, 0x41, 0x6a, 0x94, 0xc4, 0x88, 0x75, 0x23, 0x0d, 0x52, 0x69, 0xee, 0x07, 0x89}, - subYX: fp.Elt{0x22, 0x3c, 0xa1, 0x70, 0x58, 0x97, 0x93, 0xbe, 0x59, 0xa8, 0x0b, 0x8a, 0x46, 0x2a, 0x38, 0x1e, 0x08, 0x6b, 0x61, 0x9f, 0xf2, 0x4a, 0x8b, 0x80, 0x68, 0x6e, 0xc8, 0x92, 0x60, 0xf3, 0xc9, 0x89, 0xb2, 0x6d, 0x63, 0xb0, 0xeb, 0x83, 0x15, 0x63, 0x0e, 0x64, 0xbb, 0xb8, 0xfe, 0xb4, 0x81, 0x90, 0x01, 0x28, 0x10, 0xb9, 0x74, 0x6e, 0xde, 0xa4}, - dt2: fp.Elt{0x1a, 0x23, 0x45, 0xa8, 0x6f, 0x4e, 0xa7, 0x4a, 0x0c, 0xeb, 0xb0, 0x43, 0xf9, 0xef, 0x99, 0x60, 0x5b, 0xdb, 0x66, 0xc0, 0x86, 0x71, 0x43, 0xb1, 0x22, 0x7b, 0x1c, 0xe7, 0x8d, 0x09, 0x1d, 0x83, 0x76, 0x9c, 0xd3, 0x5a, 0xdd, 0x42, 0xd9, 0x2f, 0x2d, 0xba, 0x7a, 0xc2, 0xd9, 0x6b, 0xd4, 0x7a, 0xf1, 0xd5, 0x5f, 0x6b, 0x85, 0xbf, 0x0b, 0xf1}, - }, - { /* 47P*/ - addYX: fp.Elt{0xb2, 0x83, 0xfa, 0x1f, 0xd2, 0xce, 0xb6, 0xf2, 0x2d, 0xea, 0x1b, 0xe5, 0x29, 0xa5, 0x72, 0xf9, 0x25, 0x48, 0x4e, 0xf2, 0x50, 0x1b, 0x39, 0xda, 0x34, 0xc5, 0x16, 0x13, 0xb4, 0x0c, 0xa1, 0x00, 0x79, 0x7a, 0xf5, 0x8b, 0xf3, 0x70, 0x14, 0xb6, 0xfc, 0x9a, 0x47, 0x68, 0x1e, 0x42, 0x70, 0x64, 0x2a, 0x84, 0x3e, 0x3d, 0x20, 0x58, 0xf9, 0x6a}, - subYX: fp.Elt{0xd9, 0xee, 0xc0, 0xc4, 0xf5, 0xc2, 0x86, 0xaf, 0x45, 0xd2, 0xd2, 0x87, 0x1b, 0x64, 0xd5, 0xe0, 0x8c, 0x44, 0x00, 0x4f, 0x43, 0x89, 0x04, 0x48, 0x4a, 0x0b, 0xca, 0x94, 0x06, 0x2f, 0x23, 0x5b, 0x6c, 0x8d, 0x44, 0x66, 0x53, 0xf5, 0x5a, 0x20, 0x72, 0x28, 0x58, 0x84, 0xcc, 0x73, 0x22, 0x5e, 0xd1, 0x0b, 0x56, 0x5e, 0x6a, 0xa3, 0x11, 0x91}, - dt2: fp.Elt{0x6e, 0x9f, 0x88, 0xa8, 0x68, 0x2f, 0x12, 0x37, 0x88, 0xfc, 0x92, 0x8f, 0x24, 0xeb, 0x5b, 0x2a, 0x2a, 0xd0, 0x14, 0x40, 0x4c, 0xa9, 0xa4, 0x03, 0x0c, 0x45, 0x48, 0x13, 0xe8, 0xa6, 0x37, 0xab, 0xc0, 0x06, 0x38, 0x6c, 0x96, 0x73, 0x40, 0x6c, 0xc6, 0xea, 0x56, 0xc6, 0xe9, 0x1a, 0x69, 0xeb, 0x7a, 0xd1, 0x33, 0x69, 0x58, 0x2b, 0xea, 0x2f}, - }, - { /* 49P*/ - addYX: fp.Elt{0x58, 0xa8, 0x05, 0x41, 0x00, 0x9d, 0xaa, 0xd9, 0x98, 0xcf, 0xb9, 0x41, 0xb5, 0x4a, 0x8d, 0xe2, 0xe7, 0xc0, 0x72, 0xef, 0xc8, 0x28, 0x6b, 0x68, 0x9d, 0xc9, 0xdf, 0x05, 0x8b, 0xd0, 0x04, 0x74, 0x79, 0x45, 0x52, 0x05, 0xa3, 0x6e, 0x35, 0x3a, 0xe3, 0xef, 0xb2, 0xdc, 0x08, 0x6f, 0x4e, 0x76, 0x85, 0x67, 0xba, 0x23, 0x8f, 0xdd, 0xaf, 0x09}, - subYX: fp.Elt{0xb4, 0x38, 0xc8, 0xff, 0x4f, 0x65, 0x2a, 0x7e, 0xad, 0xb1, 0xc6, 0xb9, 0x3d, 0xd6, 0xf7, 0x14, 0xcf, 0xf6, 0x98, 0x75, 0xbb, 0x47, 0x83, 0x90, 0xe7, 0xe1, 0xf6, 0x14, 0x99, 0x7e, 0xfa, 0xe4, 0x77, 0x24, 0xe3, 0xe7, 0xf0, 0x1e, 0xdb, 0x27, 0x4e, 0x16, 0x04, 0xf2, 0x08, 0x52, 0xfc, 0xec, 0x55, 0xdb, 0x2e, 0x67, 0xe1, 0x94, 0x32, 0x89}, - dt2: fp.Elt{0x00, 0xad, 0x03, 0x35, 0x1a, 0xb1, 0x88, 0xf0, 0xc9, 0x11, 0xe4, 0x12, 0x52, 0x61, 0xfd, 0x8a, 0x1b, 0x6a, 0x0a, 0x4c, 0x42, 0x46, 0x22, 0x0e, 0xa5, 0xf9, 0xe2, 0x50, 0xf2, 0xb2, 0x1f, 0x20, 0x78, 0x10, 0xf6, 0xbf, 0x7f, 0x0c, 0x9c, 0xad, 0x40, 0x8b, 0x82, 0xd4, 0xba, 0x69, 0x09, 0xac, 0x4b, 0x6d, 0xc4, 0x49, 0x17, 0x81, 0x57, 0x3b}, - }, - { /* 51P*/ - addYX: fp.Elt{0x0d, 0xfe, 0xb4, 0x35, 0x11, 0xbd, 0x1d, 0x6b, 0xc2, 0xc5, 0x3b, 0xd2, 0x23, 0x2c, 0x72, 0xe3, 0x48, 0xb1, 0x48, 0x73, 0xfb, 0xa3, 0x21, 0x6e, 0xc0, 0x09, 0x69, 0xac, 0xe1, 0x60, 0xbc, 0x24, 0x03, 0x99, 0x63, 0x0a, 0x00, 0xf0, 0x75, 0xf6, 0x92, 0xc5, 0xd6, 0xdb, 0x51, 0xd4, 0x7d, 0xe6, 0xf4, 0x11, 0x79, 0xd7, 0xc3, 0xaf, 0x48, 0xd0}, - subYX: fp.Elt{0xf4, 0x4f, 0xaf, 0x31, 0xe3, 0x10, 0x89, 0x95, 0xf0, 0x8a, 0xf6, 0x31, 0x9f, 0x48, 0x02, 0xba, 0x42, 0x2b, 0x3c, 0x22, 0x8b, 0xcc, 0x12, 0x98, 0x6e, 0x7a, 0x64, 0x3a, 0xc4, 0xca, 0x32, 0x2a, 0x72, 0xf8, 0x2c, 0xcf, 0x78, 0x5e, 0x7a, 0x75, 0x6e, 0x72, 0x46, 0x48, 0x62, 0x28, 0xac, 0x58, 0x1a, 0xc6, 0x59, 0x88, 0x2a, 0x44, 0x9e, 0x83}, - dt2: fp.Elt{0xb3, 0xde, 0x36, 0xfd, 0xeb, 0x1b, 0xd4, 0x24, 0x1b, 0x08, 0x8c, 0xfe, 0xa9, 0x41, 0xa1, 0x64, 0xf2, 0x6d, 0xdb, 0xf9, 0x94, 0xae, 0x86, 0x71, 0xab, 0x10, 0xbf, 0xa3, 0xb2, 0xa0, 0xdf, 0x10, 0x8c, 0x74, 0xce, 0xb3, 0xfc, 0xdb, 0xba, 0x15, 0xf6, 0x91, 0x7a, 0x9c, 0x36, 0x1e, 0x45, 0x07, 0x3c, 0xec, 0x1a, 0x61, 0x26, 0x93, 0xe3, 0x50}, - }, - { /* 53P*/ - addYX: fp.Elt{0xc5, 0x50, 0xc5, 0x83, 0xb0, 0xbd, 0xd9, 0xf6, 0x6d, 0x15, 0x5e, 0xc1, 0x1a, 0x33, 0xa0, 0xce, 0x13, 0x70, 0x3b, 0xe1, 0x31, 0xc6, 0xc4, 0x02, 0xec, 0x8c, 0xd5, 0x9c, 0x97, 0xd3, 0x12, 0xc4, 0xa2, 0xf9, 0xd5, 0xfb, 0x22, 0x69, 0x94, 0x09, 0x2f, 0x59, 0xce, 0xdb, 0xf2, 0xf2, 0x00, 0xe0, 0xa9, 0x08, 0x44, 0x2e, 0x8b, 0x6b, 0xf5, 0xb3}, - subYX: fp.Elt{0x90, 0xdd, 0xec, 0xa2, 0x65, 0xb7, 0x61, 0xbc, 0xaa, 0x70, 0xa2, 0x15, 0xd8, 0xb0, 0xf8, 0x8e, 0x23, 0x3d, 0x9f, 0x46, 0xa3, 0x29, 0x20, 0xd1, 0xa1, 0x15, 0x81, 0xc6, 0xb6, 0xde, 0xbe, 0x60, 0x63, 0x24, 0xac, 0x15, 0xfb, 0xeb, 0xd3, 0xea, 0x57, 0x13, 0x86, 0x38, 0x1e, 0x22, 0xf4, 0x8c, 0x5d, 0xaf, 0x1b, 0x27, 0x21, 0x4f, 0xa3, 0x63}, - dt2: fp.Elt{0x07, 0x15, 0x87, 0xc4, 0xfd, 0xa1, 0x97, 0x7a, 0x07, 0x1f, 0x56, 0xcc, 0xe3, 0x6a, 0x01, 0x90, 0xce, 0xf9, 0xfa, 0x50, 0xb2, 0xe0, 0x87, 0x8b, 0x6c, 0x63, 0x6c, 0xf6, 0x2a, 0x09, 0xef, 0xef, 0xd2, 0x31, 0x40, 0x25, 0xf6, 0x84, 0xcb, 0xe0, 0xc4, 0x23, 0xc1, 0xcb, 0xe2, 0x02, 0x83, 0x2d, 0xed, 0x74, 0x74, 0x8b, 0xf8, 0x7c, 0x81, 0x18}, - }, - { /* 55P*/ - addYX: fp.Elt{0x9e, 0xe5, 0x59, 0x95, 0x63, 0x2e, 0xac, 0x8b, 0x03, 0x3c, 0xc1, 0x8e, 0xe1, 0x5b, 0x56, 0x3c, 0x16, 0x41, 0xe4, 0xc2, 0x60, 0x0c, 0x6d, 0x65, 0x9f, 0xfc, 0x27, 0x68, 0x43, 0x44, 0x05, 0x12, 0x6c, 0xda, 0x04, 0xef, 0xcf, 0xcf, 0xdc, 0x0a, 0x1a, 0x7f, 0x12, 0xd3, 0xeb, 0x02, 0xb6, 0x04, 0xca, 0xd6, 0xcb, 0xf0, 0x22, 0xba, 0x35, 0x6d}, - subYX: fp.Elt{0x09, 0x6d, 0xf9, 0x64, 0x4c, 0xe6, 0x41, 0xff, 0x01, 0x4d, 0xce, 0x1e, 0xfa, 0x38, 0xa2, 0x25, 0x62, 0xff, 0x03, 0x39, 0x18, 0x91, 0xbb, 0x9d, 0xce, 0x02, 0xf0, 0xf1, 0x3c, 0x55, 0x18, 0xa9, 0xab, 0x4d, 0xd2, 0x35, 0xfd, 0x8d, 0xa9, 0xb2, 0xad, 0xb7, 0x06, 0x6e, 0xc6, 0x69, 0x49, 0xd6, 0x98, 0x98, 0x0b, 0x22, 0x81, 0x6b, 0xbd, 0xa0}, - dt2: fp.Elt{0x22, 0xf4, 0x85, 0x5d, 0x2b, 0xf1, 0x55, 0xa5, 0xd6, 0x27, 0x86, 0x57, 0x12, 0x1f, 0x16, 0x0a, 0x5a, 0x9b, 0xf2, 0x38, 0xb6, 0x28, 0xd8, 0x99, 0x0c, 0x89, 0x1d, 0x7f, 0xca, 0x21, 0x17, 0x1a, 0x0b, 0x02, 0x5f, 0x77, 0x2f, 0x73, 0x30, 0x7c, 0xc8, 0xd7, 0x2b, 0xcc, 0xe7, 0xf3, 0x21, 0xac, 0x53, 0xa7, 0x11, 0x5d, 0xd8, 0x1d, 0x9b, 0xf5}, - }, - { /* 57P*/ - addYX: fp.Elt{0x94, 0x63, 0x5d, 0xef, 0xfd, 0x6d, 0x25, 0x4e, 0x6d, 0x29, 0x03, 0xed, 0x24, 0x28, 0x27, 0x57, 0x47, 0x3e, 0x6a, 0x1a, 0xfe, 0x37, 0xee, 0x5f, 0x83, 0x29, 0x14, 0xfd, 0x78, 0x25, 0x8a, 0xe1, 0x02, 0x38, 0xd8, 0xca, 0x65, 0x55, 0x40, 0x7d, 0x48, 0x2c, 0x7c, 0x7e, 0x60, 0xb6, 0x0c, 0x6d, 0xf7, 0xe8, 0xb3, 0x62, 0x53, 0xd6, 0x9c, 0x2b}, - subYX: fp.Elt{0x47, 0x25, 0x70, 0x62, 0xf5, 0x65, 0x93, 0x62, 0x08, 0xac, 0x59, 0x66, 0xdb, 0x08, 0xd9, 0x1a, 0x19, 0xaf, 0xf4, 0xef, 0x02, 0xa2, 0x78, 0xa9, 0x55, 0x1c, 0xfa, 0x08, 0x11, 0xcb, 0xa3, 0x71, 0x74, 0xb1, 0x62, 0xe7, 0xc7, 0xf3, 0x5a, 0xb5, 0x8b, 0xd4, 0xf6, 0x10, 0x57, 0x79, 0x72, 0x2f, 0x13, 0x86, 0x7b, 0x44, 0x5f, 0x48, 0xfd, 0x88}, - dt2: fp.Elt{0x10, 0x02, 0xcd, 0x05, 0x9a, 0xc3, 0x32, 0x6d, 0x10, 0x3a, 0x74, 0xba, 0x06, 0xc4, 0x3b, 0x34, 0xbc, 0x36, 0xed, 0xa3, 0xba, 0x9a, 0xdb, 0x6d, 0xd4, 0x69, 0x99, 0x97, 0xd0, 0xe4, 0xdd, 0xf5, 0xd4, 0x7c, 0xd3, 0x4e, 0xab, 0xd1, 0x3b, 0xbb, 0xe9, 0xc7, 0x6a, 0x94, 0x25, 0x61, 0xf0, 0x06, 0xc5, 0x12, 0xa8, 0x86, 0xe5, 0x35, 0x46, 0xeb}, - }, - { /* 59P*/ - addYX: fp.Elt{0x9e, 0x95, 0x11, 0xc6, 0xc7, 0xe8, 0xee, 0x5a, 0x26, 0xa0, 0x72, 0x72, 0x59, 0x91, 0x59, 0x16, 0x49, 0x99, 0x7e, 0xbb, 0xd7, 0x15, 0xb4, 0xf2, 0x40, 0xf9, 0x5a, 0x4d, 0xc8, 0xa0, 0xe2, 0x34, 0x7b, 0x34, 0xf3, 0x99, 0xbf, 0xa9, 0xf3, 0x79, 0xc1, 0x1a, 0x0c, 0xf4, 0x86, 0x74, 0x4e, 0xcb, 0xbc, 0x90, 0xad, 0xb6, 0x51, 0x6d, 0xaa, 0x33}, - subYX: fp.Elt{0x9f, 0xd1, 0xc5, 0xa2, 0x6c, 0x24, 0x88, 0x15, 0x71, 0x68, 0xf6, 0x07, 0x45, 0x02, 0xc4, 0x73, 0x7e, 0x75, 0x87, 0xca, 0x7c, 0xf0, 0x92, 0x00, 0x75, 0xd6, 0x5a, 0xdd, 0xe0, 0x64, 0x16, 0x9d, 0x62, 0x80, 0x33, 0x9f, 0xf4, 0x8e, 0x1a, 0x15, 0x1c, 0xd3, 0x0f, 0x4d, 0x4f, 0x62, 0x2d, 0xd7, 0xa5, 0x77, 0xe3, 0xea, 0xf0, 0xfb, 0x1a, 0xdb}, - dt2: fp.Elt{0x6a, 0xa2, 0xb1, 0xaa, 0xfb, 0x5a, 0x32, 0x4e, 0xff, 0x47, 0x06, 0xd5, 0x9a, 0x4f, 0xce, 0x83, 0x5b, 0x82, 0x34, 0x3e, 0x47, 0xb8, 0xf8, 0xe9, 0x7c, 0x67, 0x69, 0x8d, 0x9c, 0xb7, 0xde, 0x57, 0xf4, 0x88, 0x41, 0x56, 0x0c, 0x87, 0x1e, 0xc9, 0x2f, 0x54, 0xbf, 0x5c, 0x68, 0x2c, 0xd9, 0xc4, 0xef, 0x53, 0x73, 0x1e, 0xa6, 0x38, 0x02, 0x10}, - }, - { /* 61P*/ - addYX: fp.Elt{0x08, 0x80, 0x4a, 0xc9, 0xb7, 0xa8, 0x88, 0xd9, 0xfc, 0x6a, 0xc0, 0x3e, 0xc2, 0x33, 0x4d, 0x2b, 0x2a, 0xa3, 0x6d, 0x72, 0x3e, 0xdc, 0x34, 0x68, 0x08, 0xbf, 0x27, 0xef, 0xf4, 0xff, 0xe2, 0x0c, 0x31, 0x0c, 0xa2, 0x0a, 0x1f, 0x65, 0xc1, 0x4c, 0x61, 0xd3, 0x1b, 0xbc, 0x25, 0xb1, 0xd0, 0xd4, 0x89, 0xb2, 0x53, 0xfb, 0x43, 0xa5, 0xaf, 0x04}, - subYX: fp.Elt{0xe3, 0xe1, 0x37, 0xad, 0x58, 0xa9, 0x55, 0x81, 0xee, 0x64, 0x21, 0xb9, 0xf5, 0x4c, 0x35, 0xea, 0x4a, 0xd3, 0x26, 0xaa, 0x90, 0xd4, 0x60, 0x46, 0x09, 0x4b, 0x4a, 0x62, 0xf9, 0xcd, 0xe1, 0xee, 0xbb, 0xc2, 0x09, 0x0b, 0xb0, 0x96, 0x8e, 0x43, 0x77, 0xaf, 0x25, 0x20, 0x5e, 0x47, 0xe4, 0x1d, 0x50, 0x69, 0x74, 0x08, 0xd7, 0xb9, 0x90, 0x13}, - dt2: fp.Elt{0x51, 0x91, 0x95, 0x64, 0x03, 0x16, 0xfd, 0x6e, 0x26, 0x94, 0x6b, 0x61, 0xe7, 0xd9, 0xe0, 0x4a, 0x6d, 0x7c, 0xfa, 0xc0, 0xe2, 0x43, 0x23, 0x53, 0x70, 0xf5, 0x6f, 0x73, 0x8b, 0x81, 0xb0, 0x0c, 0xee, 0x2e, 0x46, 0xf2, 0x8d, 0xa6, 0xfb, 0xb5, 0x1c, 0x33, 0xbf, 0x90, 0x59, 0xc9, 0x7c, 0xb8, 0x6f, 0xad, 0x75, 0x02, 0x90, 0x8e, 0x59, 0x75}, - }, - { /* 63P*/ - addYX: fp.Elt{0x36, 0x4d, 0x77, 0x04, 0xb8, 0x7d, 0x4a, 0xd1, 0xc5, 0xbb, 0x7b, 0x50, 0x5f, 0x8d, 0x9d, 0x62, 0x0f, 0x66, 0x71, 0xec, 0x87, 0xc5, 0x80, 0x82, 0xc8, 0xf4, 0x6a, 0x94, 0x92, 0x5b, 0xb0, 0x16, 0x9b, 0xb2, 0xc9, 0x6f, 0x2b, 0x2d, 0xee, 0x95, 0x73, 0x2e, 0xc2, 0x1b, 0xc5, 0x55, 0x36, 0x86, 0x24, 0xf8, 0x20, 0x05, 0x0d, 0x93, 0xd7, 0x76}, - subYX: fp.Elt{0x7f, 0x01, 0xeb, 0x2e, 0x48, 0x4d, 0x1d, 0xf1, 0x06, 0x7e, 0x7c, 0x2a, 0x43, 0xbf, 0x28, 0xac, 0xe9, 0x58, 0x13, 0xc8, 0xbf, 0x8e, 0xc0, 0xef, 0xe8, 0x4f, 0x46, 0x8a, 0xe7, 0xc0, 0xf6, 0x0f, 0x0a, 0x03, 0x48, 0x91, 0x55, 0x39, 0x2a, 0xe3, 0xdc, 0xf6, 0x22, 0x9d, 0x4d, 0x71, 0x55, 0x68, 0x25, 0x6e, 0x95, 0x52, 0xee, 0x4c, 0xd9, 0x01}, - dt2: fp.Elt{0xac, 0x33, 0x3f, 0x7c, 0x27, 0x35, 0x15, 0x91, 0x33, 0x8d, 0xf9, 0xc4, 0xf4, 0xf3, 0x90, 0x09, 0x75, 0x69, 0x62, 0x9f, 0x61, 0x35, 0x83, 0x92, 0x04, 0xef, 0x96, 0x38, 0x80, 0x9e, 0x88, 0xb3, 0x67, 0x95, 0xbe, 0x79, 0x3c, 0x35, 0xd8, 0xdc, 0xb2, 0x3e, 0x2d, 0xe6, 0x46, 0xbe, 0x81, 0xf3, 0x32, 0x0e, 0x37, 0x23, 0x75, 0x2a, 0x3d, 0xa0}, - }, -} diff --git a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twist_basemult.go b/vendor/github.com/cloudflare/circl/ecc/goldilocks/twist_basemult.go deleted file mode 100644 index f6ac5edbb..000000000 --- a/vendor/github.com/cloudflare/circl/ecc/goldilocks/twist_basemult.go +++ /dev/null @@ -1,62 +0,0 @@ -package goldilocks - -import ( - "crypto/subtle" - - mlsb "github.com/cloudflare/circl/math/mlsbset" -) - -const ( - // MLSBRecoding parameters - fxT = 448 - fxV = 2 - fxW = 3 - fx2w1 = 1 << (uint(fxW) - 1) -) - -// ScalarBaseMult returns kG where G is the generator point. -func (e twistCurve) ScalarBaseMult(k *Scalar) *twistPoint { - m, err := mlsb.New(fxT, fxV, fxW) - if err != nil { - panic(err) - } - if m.IsExtended() { - panic("not extended") - } - - var isZero int - if k.IsZero() { - isZero = 1 - } - subtle.ConstantTimeCopy(isZero, k[:], order[:]) - - minusK := *k - isEven := 1 - int(k[0]&0x1) - minusK.Neg() - subtle.ConstantTimeCopy(isEven, k[:], minusK[:]) - c, err := m.Encode(k[:]) - if err != nil { - panic(err) - } - - gP := c.Exp(groupMLSB{}) - P := gP.(*twistPoint) - P.cneg(uint(isEven)) - return P -} - -type groupMLSB struct{} - -func (e groupMLSB) ExtendedEltP() mlsb.EltP { return nil } -func (e groupMLSB) Sqr(x mlsb.EltG) { x.(*twistPoint).Double() } -func (e groupMLSB) Mul(x mlsb.EltG, y mlsb.EltP) { x.(*twistPoint).mixAddZ1(y.(*preTwistPointAffine)) } -func (e groupMLSB) Identity() mlsb.EltG { return twistCurve{}.Identity() } -func (e groupMLSB) NewEltP() mlsb.EltP { return &preTwistPointAffine{} } -func (e groupMLSB) Lookup(a mlsb.EltP, v uint, s, u int32) { - Tabj := &tabFixMult[v] - P := a.(*preTwistPointAffine) - for k := range Tabj { - P.cmov(&Tabj[k], uint(subtle.ConstantTimeEq(int32(k), u))) - } - P.cneg(int(s >> 31)) -} diff --git a/vendor/github.com/cloudflare/circl/internal/conv/conv.go b/vendor/github.com/cloudflare/circl/internal/conv/conv.go deleted file mode 100644 index 3fd0df496..000000000 --- a/vendor/github.com/cloudflare/circl/internal/conv/conv.go +++ /dev/null @@ -1,173 +0,0 @@ -package conv - -import ( - "encoding/binary" - "fmt" - "math/big" - "strings" - - "golang.org/x/crypto/cryptobyte" -) - -// BytesLe2Hex returns an hexadecimal string of a number stored in a -// little-endian order slice x. -func BytesLe2Hex(x []byte) string { - b := &strings.Builder{} - b.Grow(2*len(x) + 2) - fmt.Fprint(b, "0x") - if len(x) == 0 { - fmt.Fprint(b, "00") - } - for i := len(x) - 1; i >= 0; i-- { - fmt.Fprintf(b, "%02x", x[i]) - } - return b.String() -} - -// BytesLe2BigInt converts a little-endian slice x into a big-endian -// math/big.Int. -func BytesLe2BigInt(x []byte) *big.Int { - n := len(x) - b := new(big.Int) - if len(x) > 0 { - y := make([]byte, n) - for i := 0; i < n; i++ { - y[n-1-i] = x[i] - } - b.SetBytes(y) - } - return b -} - -// BytesBe2Uint64Le converts a big-endian slice x to a little-endian slice of uint64. -func BytesBe2Uint64Le(x []byte) []uint64 { - l := len(x) - z := make([]uint64, (l+7)/8) - blocks := l / 8 - for i := 0; i < blocks; i++ { - z[i] = binary.BigEndian.Uint64(x[l-8*(i+1):]) - } - remBytes := l % 8 - for i := 0; i < remBytes; i++ { - z[blocks] |= uint64(x[l-1-8*blocks-i]) << uint(8*i) - } - return z -} - -// BigInt2BytesLe stores a positive big.Int number x into a little-endian slice z. -// The slice is modified if the bitlength of x <= 8*len(z) (padding with zeros). -// If x does not fit in the slice or is negative, z is not modified. -func BigInt2BytesLe(z []byte, x *big.Int) { - xLen := (x.BitLen() + 7) >> 3 - zLen := len(z) - if zLen >= xLen && x.Sign() >= 0 { - y := x.Bytes() - for i := 0; i < xLen; i++ { - z[i] = y[xLen-1-i] - } - for i := xLen; i < zLen; i++ { - z[i] = 0 - } - } -} - -// Uint64Le2BigInt converts a little-endian slice x into a big number. -func Uint64Le2BigInt(x []uint64) *big.Int { - n := len(x) - b := new(big.Int) - var bi big.Int - for i := n - 1; i >= 0; i-- { - bi.SetUint64(x[i]) - b.Lsh(b, 64) - b.Add(b, &bi) - } - return b -} - -// Uint64Le2BytesLe converts a little-endian slice x to a little-endian slice of bytes. -func Uint64Le2BytesLe(x []uint64) []byte { - b := make([]byte, 8*len(x)) - n := len(x) - for i := 0; i < n; i++ { - binary.LittleEndian.PutUint64(b[i*8:], x[i]) - } - return b -} - -// Uint64Le2BytesBe converts a little-endian slice x to a big-endian slice of bytes. -func Uint64Le2BytesBe(x []uint64) []byte { - b := make([]byte, 8*len(x)) - n := len(x) - for i := 0; i < n; i++ { - binary.BigEndian.PutUint64(b[i*8:], x[n-1-i]) - } - return b -} - -// Uint64Le2Hex returns an hexadecimal string of a number stored in a -// little-endian order slice x. -func Uint64Le2Hex(x []uint64) string { - b := new(strings.Builder) - b.Grow(16*len(x) + 2) - fmt.Fprint(b, "0x") - if len(x) == 0 { - fmt.Fprint(b, "00") - } - for i := len(x) - 1; i >= 0; i-- { - fmt.Fprintf(b, "%016x", x[i]) - } - return b.String() -} - -// BigInt2Uint64Le stores a positive big.Int number x into a little-endian slice z. -// The slice is modified if the bitlength of x <= 8*len(z) (padding with zeros). -// If x does not fit in the slice or is negative, z is not modified. -func BigInt2Uint64Le(z []uint64, x *big.Int) { - xLen := (x.BitLen() + 63) >> 6 // number of 64-bit words - zLen := len(z) - if zLen >= xLen && x.Sign() > 0 { - var y, yi big.Int - y.Set(x) - two64 := big.NewInt(1) - two64.Lsh(two64, 64).Sub(two64, big.NewInt(1)) - for i := 0; i < xLen; i++ { - yi.And(&y, two64) - z[i] = yi.Uint64() - y.Rsh(&y, 64) - } - } - for i := xLen; i < zLen; i++ { - z[i] = 0 - } -} - -// MarshalBinary encodes a value into a byte array in a format readable by UnmarshalBinary. -func MarshalBinary(v cryptobyte.MarshalingValue) ([]byte, error) { - const DefaultSize = 32 - b := cryptobyte.NewBuilder(make([]byte, 0, DefaultSize)) - b.AddValue(v) - return b.Bytes() -} - -// MarshalBinaryLen encodes a value into an array of n bytes in a format readable by UnmarshalBinary. -func MarshalBinaryLen(v cryptobyte.MarshalingValue, length uint) ([]byte, error) { - b := cryptobyte.NewFixedBuilder(make([]byte, 0, length)) - b.AddValue(v) - return b.Bytes() -} - -// A UnmarshalingValue decodes itself from a cryptobyte.String and advances the pointer. -// It reports whether the read was successful. -type UnmarshalingValue interface { - Unmarshal(*cryptobyte.String) bool -} - -// UnmarshalBinary recovers a value from a byte array. -// It returns an error if the read was unsuccessful. -func UnmarshalBinary(v UnmarshalingValue, data []byte) (err error) { - s := cryptobyte.String(data) - if data == nil || !v.Unmarshal(&s) || !s.Empty() { - err = fmt.Errorf("cannot read %T from input string", v) - } - return -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/doc.go b/vendor/github.com/cloudflare/circl/internal/sha3/doc.go deleted file mode 100644 index 7e0230907..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/doc.go +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package sha3 implements the SHA-3 fixed-output-length hash functions and -// the SHAKE variable-output-length hash functions defined by FIPS-202. -// -// Both types of hash function use the "sponge" construction and the Keccak -// permutation. For a detailed specification see http://keccak.noekeon.org/ -// -// # Guidance -// -// If you aren't sure what function you need, use SHAKE256 with at least 64 -// bytes of output. The SHAKE instances are faster than the SHA3 instances; -// the latter have to allocate memory to conform to the hash.Hash interface. -// -// If you need a secret-key MAC (message authentication code), prepend the -// secret key to the input, hash with SHAKE256 and read at least 32 bytes of -// output. -// -// # Security strengths -// -// The SHA3-x (x equals 224, 256, 384, or 512) functions have a security -// strength against preimage attacks of x bits. Since they only produce "x" -// bits of output, their collision-resistance is only "x/2" bits. -// -// The SHAKE-256 and -128 functions have a generic security strength of 256 and -// 128 bits against all attacks, provided that at least 2x bits of their output -// is used. Requesting more than 64 or 32 bytes of output, respectively, does -// not increase the collision-resistance of the SHAKE functions. -// -// # The sponge construction -// -// A sponge builds a pseudo-random function from a public pseudo-random -// permutation, by applying the permutation to a state of "rate + capacity" -// bytes, but hiding "capacity" of the bytes. -// -// A sponge starts out with a zero state. To hash an input using a sponge, up -// to "rate" bytes of the input are XORed into the sponge's state. The sponge -// is then "full" and the permutation is applied to "empty" it. This process is -// repeated until all the input has been "absorbed". The input is then padded. -// The digest is "squeezed" from the sponge in the same way, except that output -// is copied out instead of input being XORed in. -// -// A sponge is parameterized by its generic security strength, which is equal -// to half its capacity; capacity + rate is equal to the permutation's width. -// Since the KeccakF-1600 permutation is 1600 bits (200 bytes) wide, this means -// that the security strength of a sponge instance is equal to (1600 - bitrate) / 2. -// -// # Recommendations -// -// The SHAKE functions are recommended for most new uses. They can produce -// output of arbitrary length. SHAKE256, with an output length of at least -// 64 bytes, provides 256-bit security against all attacks. The Keccak team -// recommends it for most applications upgrading from SHA2-512. (NIST chose a -// much stronger, but much slower, sponge instance for SHA3-512.) -// -// The SHA-3 functions are "drop-in" replacements for the SHA-2 functions. -// They produce output of the same length, with the same security strengths -// against all attacks. This means, in particular, that SHA3-256 only has -// 128-bit collision resistance, because its output length is 32 bytes. -package sha3 diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/hashes.go b/vendor/github.com/cloudflare/circl/internal/sha3/hashes.go deleted file mode 100644 index 7d2365a76..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/hashes.go +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package sha3 - -// This file provides functions for creating instances of the SHA-3 -// and SHAKE hash functions, as well as utility functions for hashing -// bytes. - -// New224 creates a new SHA3-224 hash. -// Its generic security strength is 224 bits against preimage attacks, -// and 112 bits against collision attacks. -func New224() State { - return State{rate: 144, outputLen: 28, dsbyte: 0x06} -} - -// New256 creates a new SHA3-256 hash. -// Its generic security strength is 256 bits against preimage attacks, -// and 128 bits against collision attacks. -func New256() State { - return State{rate: 136, outputLen: 32, dsbyte: 0x06} -} - -// New384 creates a new SHA3-384 hash. -// Its generic security strength is 384 bits against preimage attacks, -// and 192 bits against collision attacks. -func New384() State { - return State{rate: 104, outputLen: 48, dsbyte: 0x06} -} - -// New512 creates a new SHA3-512 hash. -// Its generic security strength is 512 bits against preimage attacks, -// and 256 bits against collision attacks. -func New512() State { - return State{rate: 72, outputLen: 64, dsbyte: 0x06} -} - -// Sum224 returns the SHA3-224 digest of the data. -func Sum224(data []byte) (digest [28]byte) { - h := New224() - _, _ = h.Write(data) - h.Sum(digest[:0]) - return -} - -// Sum256 returns the SHA3-256 digest of the data. -func Sum256(data []byte) (digest [32]byte) { - h := New256() - _, _ = h.Write(data) - h.Sum(digest[:0]) - return -} - -// Sum384 returns the SHA3-384 digest of the data. -func Sum384(data []byte) (digest [48]byte) { - h := New384() - _, _ = h.Write(data) - h.Sum(digest[:0]) - return -} - -// Sum512 returns the SHA3-512 digest of the data. -func Sum512(data []byte) (digest [64]byte) { - h := New512() - _, _ = h.Write(data) - h.Sum(digest[:0]) - return -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/keccakf.go b/vendor/github.com/cloudflare/circl/internal/sha3/keccakf.go deleted file mode 100644 index 1755fd1e6..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/keccakf.go +++ /dev/null @@ -1,391 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package sha3 - -// KeccakF1600 applies the Keccak permutation to a 1600b-wide -// state represented as a slice of 25 uint64s. -// If turbo is true, applies the 12-round variant instead of the -// regular 24-round variant. -// nolint:funlen -func KeccakF1600(a *[25]uint64, turbo bool) { - // Implementation translated from Keccak-inplace.c - // in the keccak reference code. - var t, bc0, bc1, bc2, bc3, bc4, d0, d1, d2, d3, d4 uint64 - - i := 0 - - if turbo { - i = 12 - } - - for ; i < 24; i += 4 { - // Combines the 5 steps in each round into 2 steps. - // Unrolls 4 rounds per loop and spreads some steps across rounds. - - // Round 1 - bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20] - bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21] - bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22] - bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23] - bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24] - d0 = bc4 ^ (bc1<<1 | bc1>>63) - d1 = bc0 ^ (bc2<<1 | bc2>>63) - d2 = bc1 ^ (bc3<<1 | bc3>>63) - d3 = bc2 ^ (bc4<<1 | bc4>>63) - d4 = bc3 ^ (bc0<<1 | bc0>>63) - - bc0 = a[0] ^ d0 - t = a[6] ^ d1 - bc1 = t<<44 | t>>(64-44) - t = a[12] ^ d2 - bc2 = t<<43 | t>>(64-43) - t = a[18] ^ d3 - bc3 = t<<21 | t>>(64-21) - t = a[24] ^ d4 - bc4 = t<<14 | t>>(64-14) - a[0] = bc0 ^ (bc2 &^ bc1) ^ RC[i] - a[6] = bc1 ^ (bc3 &^ bc2) - a[12] = bc2 ^ (bc4 &^ bc3) - a[18] = bc3 ^ (bc0 &^ bc4) - a[24] = bc4 ^ (bc1 &^ bc0) - - t = a[10] ^ d0 - bc2 = t<<3 | t>>(64-3) - t = a[16] ^ d1 - bc3 = t<<45 | t>>(64-45) - t = a[22] ^ d2 - bc4 = t<<61 | t>>(64-61) - t = a[3] ^ d3 - bc0 = t<<28 | t>>(64-28) - t = a[9] ^ d4 - bc1 = t<<20 | t>>(64-20) - a[10] = bc0 ^ (bc2 &^ bc1) - a[16] = bc1 ^ (bc3 &^ bc2) - a[22] = bc2 ^ (bc4 &^ bc3) - a[3] = bc3 ^ (bc0 &^ bc4) - a[9] = bc4 ^ (bc1 &^ bc0) - - t = a[20] ^ d0 - bc4 = t<<18 | t>>(64-18) - t = a[1] ^ d1 - bc0 = t<<1 | t>>(64-1) - t = a[7] ^ d2 - bc1 = t<<6 | t>>(64-6) - t = a[13] ^ d3 - bc2 = t<<25 | t>>(64-25) - t = a[19] ^ d4 - bc3 = t<<8 | t>>(64-8) - a[20] = bc0 ^ (bc2 &^ bc1) - a[1] = bc1 ^ (bc3 &^ bc2) - a[7] = bc2 ^ (bc4 &^ bc3) - a[13] = bc3 ^ (bc0 &^ bc4) - a[19] = bc4 ^ (bc1 &^ bc0) - - t = a[5] ^ d0 - bc1 = t<<36 | t>>(64-36) - t = a[11] ^ d1 - bc2 = t<<10 | t>>(64-10) - t = a[17] ^ d2 - bc3 = t<<15 | t>>(64-15) - t = a[23] ^ d3 - bc4 = t<<56 | t>>(64-56) - t = a[4] ^ d4 - bc0 = t<<27 | t>>(64-27) - a[5] = bc0 ^ (bc2 &^ bc1) - a[11] = bc1 ^ (bc3 &^ bc2) - a[17] = bc2 ^ (bc4 &^ bc3) - a[23] = bc3 ^ (bc0 &^ bc4) - a[4] = bc4 ^ (bc1 &^ bc0) - - t = a[15] ^ d0 - bc3 = t<<41 | t>>(64-41) - t = a[21] ^ d1 - bc4 = t<<2 | t>>(64-2) - t = a[2] ^ d2 - bc0 = t<<62 | t>>(64-62) - t = a[8] ^ d3 - bc1 = t<<55 | t>>(64-55) - t = a[14] ^ d4 - bc2 = t<<39 | t>>(64-39) - a[15] = bc0 ^ (bc2 &^ bc1) - a[21] = bc1 ^ (bc3 &^ bc2) - a[2] = bc2 ^ (bc4 &^ bc3) - a[8] = bc3 ^ (bc0 &^ bc4) - a[14] = bc4 ^ (bc1 &^ bc0) - - // Round 2 - bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20] - bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21] - bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22] - bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23] - bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24] - d0 = bc4 ^ (bc1<<1 | bc1>>63) - d1 = bc0 ^ (bc2<<1 | bc2>>63) - d2 = bc1 ^ (bc3<<1 | bc3>>63) - d3 = bc2 ^ (bc4<<1 | bc4>>63) - d4 = bc3 ^ (bc0<<1 | bc0>>63) - - bc0 = a[0] ^ d0 - t = a[16] ^ d1 - bc1 = t<<44 | t>>(64-44) - t = a[7] ^ d2 - bc2 = t<<43 | t>>(64-43) - t = a[23] ^ d3 - bc3 = t<<21 | t>>(64-21) - t = a[14] ^ d4 - bc4 = t<<14 | t>>(64-14) - a[0] = bc0 ^ (bc2 &^ bc1) ^ RC[i+1] - a[16] = bc1 ^ (bc3 &^ bc2) - a[7] = bc2 ^ (bc4 &^ bc3) - a[23] = bc3 ^ (bc0 &^ bc4) - a[14] = bc4 ^ (bc1 &^ bc0) - - t = a[20] ^ d0 - bc2 = t<<3 | t>>(64-3) - t = a[11] ^ d1 - bc3 = t<<45 | t>>(64-45) - t = a[2] ^ d2 - bc4 = t<<61 | t>>(64-61) - t = a[18] ^ d3 - bc0 = t<<28 | t>>(64-28) - t = a[9] ^ d4 - bc1 = t<<20 | t>>(64-20) - a[20] = bc0 ^ (bc2 &^ bc1) - a[11] = bc1 ^ (bc3 &^ bc2) - a[2] = bc2 ^ (bc4 &^ bc3) - a[18] = bc3 ^ (bc0 &^ bc4) - a[9] = bc4 ^ (bc1 &^ bc0) - - t = a[15] ^ d0 - bc4 = t<<18 | t>>(64-18) - t = a[6] ^ d1 - bc0 = t<<1 | t>>(64-1) - t = a[22] ^ d2 - bc1 = t<<6 | t>>(64-6) - t = a[13] ^ d3 - bc2 = t<<25 | t>>(64-25) - t = a[4] ^ d4 - bc3 = t<<8 | t>>(64-8) - a[15] = bc0 ^ (bc2 &^ bc1) - a[6] = bc1 ^ (bc3 &^ bc2) - a[22] = bc2 ^ (bc4 &^ bc3) - a[13] = bc3 ^ (bc0 &^ bc4) - a[4] = bc4 ^ (bc1 &^ bc0) - - t = a[10] ^ d0 - bc1 = t<<36 | t>>(64-36) - t = a[1] ^ d1 - bc2 = t<<10 | t>>(64-10) - t = a[17] ^ d2 - bc3 = t<<15 | t>>(64-15) - t = a[8] ^ d3 - bc4 = t<<56 | t>>(64-56) - t = a[24] ^ d4 - bc0 = t<<27 | t>>(64-27) - a[10] = bc0 ^ (bc2 &^ bc1) - a[1] = bc1 ^ (bc3 &^ bc2) - a[17] = bc2 ^ (bc4 &^ bc3) - a[8] = bc3 ^ (bc0 &^ bc4) - a[24] = bc4 ^ (bc1 &^ bc0) - - t = a[5] ^ d0 - bc3 = t<<41 | t>>(64-41) - t = a[21] ^ d1 - bc4 = t<<2 | t>>(64-2) - t = a[12] ^ d2 - bc0 = t<<62 | t>>(64-62) - t = a[3] ^ d3 - bc1 = t<<55 | t>>(64-55) - t = a[19] ^ d4 - bc2 = t<<39 | t>>(64-39) - a[5] = bc0 ^ (bc2 &^ bc1) - a[21] = bc1 ^ (bc3 &^ bc2) - a[12] = bc2 ^ (bc4 &^ bc3) - a[3] = bc3 ^ (bc0 &^ bc4) - a[19] = bc4 ^ (bc1 &^ bc0) - - // Round 3 - bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20] - bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21] - bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22] - bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23] - bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24] - d0 = bc4 ^ (bc1<<1 | bc1>>63) - d1 = bc0 ^ (bc2<<1 | bc2>>63) - d2 = bc1 ^ (bc3<<1 | bc3>>63) - d3 = bc2 ^ (bc4<<1 | bc4>>63) - d4 = bc3 ^ (bc0<<1 | bc0>>63) - - bc0 = a[0] ^ d0 - t = a[11] ^ d1 - bc1 = t<<44 | t>>(64-44) - t = a[22] ^ d2 - bc2 = t<<43 | t>>(64-43) - t = a[8] ^ d3 - bc3 = t<<21 | t>>(64-21) - t = a[19] ^ d4 - bc4 = t<<14 | t>>(64-14) - a[0] = bc0 ^ (bc2 &^ bc1) ^ RC[i+2] - a[11] = bc1 ^ (bc3 &^ bc2) - a[22] = bc2 ^ (bc4 &^ bc3) - a[8] = bc3 ^ (bc0 &^ bc4) - a[19] = bc4 ^ (bc1 &^ bc0) - - t = a[15] ^ d0 - bc2 = t<<3 | t>>(64-3) - t = a[1] ^ d1 - bc3 = t<<45 | t>>(64-45) - t = a[12] ^ d2 - bc4 = t<<61 | t>>(64-61) - t = a[23] ^ d3 - bc0 = t<<28 | t>>(64-28) - t = a[9] ^ d4 - bc1 = t<<20 | t>>(64-20) - a[15] = bc0 ^ (bc2 &^ bc1) - a[1] = bc1 ^ (bc3 &^ bc2) - a[12] = bc2 ^ (bc4 &^ bc3) - a[23] = bc3 ^ (bc0 &^ bc4) - a[9] = bc4 ^ (bc1 &^ bc0) - - t = a[5] ^ d0 - bc4 = t<<18 | t>>(64-18) - t = a[16] ^ d1 - bc0 = t<<1 | t>>(64-1) - t = a[2] ^ d2 - bc1 = t<<6 | t>>(64-6) - t = a[13] ^ d3 - bc2 = t<<25 | t>>(64-25) - t = a[24] ^ d4 - bc3 = t<<8 | t>>(64-8) - a[5] = bc0 ^ (bc2 &^ bc1) - a[16] = bc1 ^ (bc3 &^ bc2) - a[2] = bc2 ^ (bc4 &^ bc3) - a[13] = bc3 ^ (bc0 &^ bc4) - a[24] = bc4 ^ (bc1 &^ bc0) - - t = a[20] ^ d0 - bc1 = t<<36 | t>>(64-36) - t = a[6] ^ d1 - bc2 = t<<10 | t>>(64-10) - t = a[17] ^ d2 - bc3 = t<<15 | t>>(64-15) - t = a[3] ^ d3 - bc4 = t<<56 | t>>(64-56) - t = a[14] ^ d4 - bc0 = t<<27 | t>>(64-27) - a[20] = bc0 ^ (bc2 &^ bc1) - a[6] = bc1 ^ (bc3 &^ bc2) - a[17] = bc2 ^ (bc4 &^ bc3) - a[3] = bc3 ^ (bc0 &^ bc4) - a[14] = bc4 ^ (bc1 &^ bc0) - - t = a[10] ^ d0 - bc3 = t<<41 | t>>(64-41) - t = a[21] ^ d1 - bc4 = t<<2 | t>>(64-2) - t = a[7] ^ d2 - bc0 = t<<62 | t>>(64-62) - t = a[18] ^ d3 - bc1 = t<<55 | t>>(64-55) - t = a[4] ^ d4 - bc2 = t<<39 | t>>(64-39) - a[10] = bc0 ^ (bc2 &^ bc1) - a[21] = bc1 ^ (bc3 &^ bc2) - a[7] = bc2 ^ (bc4 &^ bc3) - a[18] = bc3 ^ (bc0 &^ bc4) - a[4] = bc4 ^ (bc1 &^ bc0) - - // Round 4 - bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20] - bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21] - bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22] - bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23] - bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24] - d0 = bc4 ^ (bc1<<1 | bc1>>63) - d1 = bc0 ^ (bc2<<1 | bc2>>63) - d2 = bc1 ^ (bc3<<1 | bc3>>63) - d3 = bc2 ^ (bc4<<1 | bc4>>63) - d4 = bc3 ^ (bc0<<1 | bc0>>63) - - bc0 = a[0] ^ d0 - t = a[1] ^ d1 - bc1 = t<<44 | t>>(64-44) - t = a[2] ^ d2 - bc2 = t<<43 | t>>(64-43) - t = a[3] ^ d3 - bc3 = t<<21 | t>>(64-21) - t = a[4] ^ d4 - bc4 = t<<14 | t>>(64-14) - a[0] = bc0 ^ (bc2 &^ bc1) ^ RC[i+3] - a[1] = bc1 ^ (bc3 &^ bc2) - a[2] = bc2 ^ (bc4 &^ bc3) - a[3] = bc3 ^ (bc0 &^ bc4) - a[4] = bc4 ^ (bc1 &^ bc0) - - t = a[5] ^ d0 - bc2 = t<<3 | t>>(64-3) - t = a[6] ^ d1 - bc3 = t<<45 | t>>(64-45) - t = a[7] ^ d2 - bc4 = t<<61 | t>>(64-61) - t = a[8] ^ d3 - bc0 = t<<28 | t>>(64-28) - t = a[9] ^ d4 - bc1 = t<<20 | t>>(64-20) - a[5] = bc0 ^ (bc2 &^ bc1) - a[6] = bc1 ^ (bc3 &^ bc2) - a[7] = bc2 ^ (bc4 &^ bc3) - a[8] = bc3 ^ (bc0 &^ bc4) - a[9] = bc4 ^ (bc1 &^ bc0) - - t = a[10] ^ d0 - bc4 = t<<18 | t>>(64-18) - t = a[11] ^ d1 - bc0 = t<<1 | t>>(64-1) - t = a[12] ^ d2 - bc1 = t<<6 | t>>(64-6) - t = a[13] ^ d3 - bc2 = t<<25 | t>>(64-25) - t = a[14] ^ d4 - bc3 = t<<8 | t>>(64-8) - a[10] = bc0 ^ (bc2 &^ bc1) - a[11] = bc1 ^ (bc3 &^ bc2) - a[12] = bc2 ^ (bc4 &^ bc3) - a[13] = bc3 ^ (bc0 &^ bc4) - a[14] = bc4 ^ (bc1 &^ bc0) - - t = a[15] ^ d0 - bc1 = t<<36 | t>>(64-36) - t = a[16] ^ d1 - bc2 = t<<10 | t>>(64-10) - t = a[17] ^ d2 - bc3 = t<<15 | t>>(64-15) - t = a[18] ^ d3 - bc4 = t<<56 | t>>(64-56) - t = a[19] ^ d4 - bc0 = t<<27 | t>>(64-27) - a[15] = bc0 ^ (bc2 &^ bc1) - a[16] = bc1 ^ (bc3 &^ bc2) - a[17] = bc2 ^ (bc4 &^ bc3) - a[18] = bc3 ^ (bc0 &^ bc4) - a[19] = bc4 ^ (bc1 &^ bc0) - - t = a[20] ^ d0 - bc3 = t<<41 | t>>(64-41) - t = a[21] ^ d1 - bc4 = t<<2 | t>>(64-2) - t = a[22] ^ d2 - bc0 = t<<62 | t>>(64-62) - t = a[23] ^ d3 - bc1 = t<<55 | t>>(64-55) - t = a[24] ^ d4 - bc2 = t<<39 | t>>(64-39) - a[20] = bc0 ^ (bc2 &^ bc1) - a[21] = bc1 ^ (bc3 &^ bc2) - a[22] = bc2 ^ (bc4 &^ bc3) - a[23] = bc3 ^ (bc0 &^ bc4) - a[24] = bc4 ^ (bc1 &^ bc0) - } -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/rc.go b/vendor/github.com/cloudflare/circl/internal/sha3/rc.go deleted file mode 100644 index 6a3df42f3..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/rc.go +++ /dev/null @@ -1,29 +0,0 @@ -package sha3 - -// RC stores the round constants for use in the ι step. -var RC = [24]uint64{ - 0x0000000000000001, - 0x0000000000008082, - 0x800000000000808A, - 0x8000000080008000, - 0x000000000000808B, - 0x0000000080000001, - 0x8000000080008081, - 0x8000000000008009, - 0x000000000000008A, - 0x0000000000000088, - 0x0000000080008009, - 0x000000008000000A, - 0x000000008000808B, - 0x800000000000008B, - 0x8000000000008089, - 0x8000000000008003, - 0x8000000000008002, - 0x8000000000000080, - 0x000000000000800A, - 0x800000008000000A, - 0x8000000080008081, - 0x8000000000008080, - 0x0000000080000001, - 0x8000000080008008, -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/sha3.go b/vendor/github.com/cloudflare/circl/internal/sha3/sha3.go deleted file mode 100644 index a0df5aa6c..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/sha3.go +++ /dev/null @@ -1,200 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package sha3 - -// spongeDirection indicates the direction bytes are flowing through the sponge. -type spongeDirection int - -const ( - // spongeAbsorbing indicates that the sponge is absorbing input. - spongeAbsorbing spongeDirection = iota - // spongeSqueezing indicates that the sponge is being squeezed. - spongeSqueezing -) - -const ( - // maxRate is the maximum size of the internal buffer. SHAKE-256 - // currently needs the largest buffer. - maxRate = 168 -) - -func (d *State) buf() []byte { - return d.storage.asBytes()[d.bufo:d.bufe] -} - -type State struct { - // Generic sponge components. - a [25]uint64 // main state of the hash - rate int // the number of bytes of state to use - - bufo int // offset of buffer in storage - bufe int // end of buffer in storage - - // dsbyte contains the "domain separation" bits and the first bit of - // the padding. Sections 6.1 and 6.2 of [1] separate the outputs of the - // SHA-3 and SHAKE functions by appending bitstrings to the message. - // Using a little-endian bit-ordering convention, these are "01" for SHA-3 - // and "1111" for SHAKE, or 00000010b and 00001111b, respectively. Then the - // padding rule from section 5.1 is applied to pad the message to a multiple - // of the rate, which involves adding a "1" bit, zero or more "0" bits, and - // a final "1" bit. We merge the first "1" bit from the padding into dsbyte, - // giving 00000110b (0x06) and 00011111b (0x1f). - // [1] http://csrc.nist.gov/publications/drafts/fips-202/fips_202_draft.pdf - // "Draft FIPS 202: SHA-3 Standard: Permutation-Based Hash and - // Extendable-Output Functions (May 2014)" - dsbyte byte - - storage storageBuf - - // Specific to SHA-3 and SHAKE. - outputLen int // the default output size in bytes - state spongeDirection // whether the sponge is absorbing or squeezing - turbo bool // Whether we're using 12 rounds instead of 24 -} - -// BlockSize returns the rate of sponge underlying this hash function. -func (d *State) BlockSize() int { return d.rate } - -// Size returns the output size of the hash function in bytes. -func (d *State) Size() int { return d.outputLen } - -// Reset clears the internal state by zeroing the sponge state and -// the byte buffer, and setting Sponge.state to absorbing. -func (d *State) Reset() { - // Zero the permutation's state. - for i := range d.a { - d.a[i] = 0 - } - d.state = spongeAbsorbing - d.bufo = 0 - d.bufe = 0 -} - -func (d *State) clone() *State { - ret := *d - return &ret -} - -// permute applies the KeccakF-1600 permutation. It handles -// any input-output buffering. -func (d *State) permute() { - switch d.state { - case spongeAbsorbing: - // If we're absorbing, we need to xor the input into the state - // before applying the permutation. - xorIn(d, d.buf()) - d.bufe = 0 - d.bufo = 0 - KeccakF1600(&d.a, d.turbo) - case spongeSqueezing: - // If we're squeezing, we need to apply the permutation before - // copying more output. - KeccakF1600(&d.a, d.turbo) - d.bufe = d.rate - d.bufo = 0 - copyOut(d, d.buf()) - } -} - -// pads appends the domain separation bits in dsbyte, applies -// the multi-bitrate 10..1 padding rule, and permutes the state. -func (d *State) padAndPermute(dsbyte byte) { - // Pad with this instance's domain-separator bits. We know that there's - // at least one byte of space in d.buf() because, if it were full, - // permute would have been called to empty it. dsbyte also contains the - // first one bit for the padding. See the comment in the state struct. - zerosStart := d.bufe + 1 - d.bufe = d.rate - buf := d.buf() - buf[zerosStart-1] = dsbyte - for i := zerosStart; i < d.rate; i++ { - buf[i] = 0 - } - // This adds the final one bit for the padding. Because of the way that - // bits are numbered from the LSB upwards, the final bit is the MSB of - // the last byte. - buf[d.rate-1] ^= 0x80 - // Apply the permutation - d.permute() - d.state = spongeSqueezing - d.bufe = d.rate - copyOut(d, buf) -} - -// Write absorbs more data into the hash's state. It produces an error -// if more data is written to the ShakeHash after writing -func (d *State) Write(p []byte) (written int, err error) { - if d.state != spongeAbsorbing { - panic("sha3: write to sponge after read") - } - written = len(p) - - for len(p) > 0 { - bufl := d.bufe - d.bufo - if bufl == 0 && len(p) >= d.rate { - // The fast path; absorb a full "rate" bytes of input and apply the permutation. - xorIn(d, p[:d.rate]) - p = p[d.rate:] - KeccakF1600(&d.a, d.turbo) - } else { - // The slow path; buffer the input until we can fill the sponge, and then xor it in. - todo := d.rate - bufl - if todo > len(p) { - todo = len(p) - } - d.bufe += todo - buf := d.buf() - copy(buf[bufl:], p[:todo]) - p = p[todo:] - - // If the sponge is full, apply the permutation. - if d.bufe == d.rate { - d.permute() - } - } - } - - return written, nil -} - -// Read squeezes an arbitrary number of bytes from the sponge. -func (d *State) Read(out []byte) (n int, err error) { - // If we're still absorbing, pad and apply the permutation. - if d.state == spongeAbsorbing { - d.padAndPermute(d.dsbyte) - } - - n = len(out) - - // Now, do the squeezing. - for len(out) > 0 { - buf := d.buf() - n := copy(out, buf) - d.bufo += n - out = out[n:] - - // Apply the permutation if we've squeezed the sponge dry. - if d.bufo == d.bufe { - d.permute() - } - } - - return -} - -// Sum applies padding to the hash state and then squeezes out the desired -// number of output bytes. -func (d *State) Sum(in []byte) []byte { - // Make a copy of the original hash so that caller can keep writing - // and summing. - dup := d.clone() - hash := make([]byte, dup.outputLen) - _, _ = dup.Read(hash) - return append(in, hash...) -} - -func (d *State) IsAbsorbing() bool { - return d.state == spongeAbsorbing -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/sha3_s390x.s b/vendor/github.com/cloudflare/circl/internal/sha3/sha3_s390x.s deleted file mode 100644 index 8a4458f63..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/sha3_s390x.s +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build !gccgo,!appengine - -#include "textflag.h" - -// func kimd(function code, chain *[200]byte, src []byte) -TEXT ·kimd(SB), NOFRAME|NOSPLIT, $0-40 - MOVD function+0(FP), R0 - MOVD chain+8(FP), R1 - LMG src+16(FP), R2, R3 // R2=base, R3=len - -continue: - WORD $0xB93E0002 // KIMD --, R2 - BVS continue // continue if interrupted - MOVD $0, R0 // reset R0 for pre-go1.8 compilers - RET - -// func klmd(function code, chain *[200]byte, dst, src []byte) -TEXT ·klmd(SB), NOFRAME|NOSPLIT, $0-64 - // TODO: SHAKE support - MOVD function+0(FP), R0 - MOVD chain+8(FP), R1 - LMG dst+16(FP), R2, R3 // R2=base, R3=len - LMG src+40(FP), R4, R5 // R4=base, R5=len - -continue: - WORD $0xB93F0024 // KLMD R2, R4 - BVS continue // continue if interrupted - MOVD $0, R0 // reset R0 for pre-go1.8 compilers - RET diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/shake.go b/vendor/github.com/cloudflare/circl/internal/sha3/shake.go deleted file mode 100644 index 77817f758..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/shake.go +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package sha3 - -// This file defines the ShakeHash interface, and provides -// functions for creating SHAKE and cSHAKE instances, as well as utility -// functions for hashing bytes to arbitrary-length output. -// -// -// SHAKE implementation is based on FIPS PUB 202 [1] -// cSHAKE implementations is based on NIST SP 800-185 [2] -// -// [1] https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf -// [2] https://doi.org/10.6028/NIST.SP.800-185 - -import ( - "io" -) - -// ShakeHash defines the interface to hash functions that -// support arbitrary-length output. -type ShakeHash interface { - // Write absorbs more data into the hash's state. It panics if input is - // written to it after output has been read from it. - io.Writer - - // Read reads more output from the hash; reading affects the hash's - // state. (ShakeHash.Read is thus very different from Hash.Sum) - // It never returns an error. - io.Reader - - // Clone returns a copy of the ShakeHash in its current state. - Clone() ShakeHash - - // Reset resets the ShakeHash to its initial state. - Reset() -} - -// Consts for configuring initial SHA-3 state -const ( - dsbyteShake = 0x1f - rate128 = 168 - rate256 = 136 -) - -// Clone returns copy of SHAKE context within its current state. -func (d *State) Clone() ShakeHash { - return d.clone() -} - -// NewShake128 creates a new SHAKE128 variable-output-length ShakeHash. -// Its generic security strength is 128 bits against all attacks if at -// least 32 bytes of its output are used. -func NewShake128() State { - return State{rate: rate128, dsbyte: dsbyteShake} -} - -// NewTurboShake128 creates a new TurboSHAKE128 variable-output-length ShakeHash. -// Its generic security strength is 128 bits against all attacks if at -// least 32 bytes of its output are used. -// D is the domain separation byte and must be between 0x01 and 0x7f inclusive. -func NewTurboShake128(D byte) State { - if D == 0 || D > 0x7f { - panic("turboshake: D out of range") - } - return State{rate: rate128, dsbyte: D, turbo: true} -} - -// NewShake256 creates a new SHAKE256 variable-output-length ShakeHash. -// Its generic security strength is 256 bits against all attacks if -// at least 64 bytes of its output are used. -func NewShake256() State { - return State{rate: rate256, dsbyte: dsbyteShake} -} - -// NewTurboShake256 creates a new TurboSHAKE256 variable-output-length ShakeHash. -// Its generic security strength is 256 bits against all attacks if -// at least 64 bytes of its output are used. -// D is the domain separation byte and must be between 0x01 and 0x7f inclusive. -func NewTurboShake256(D byte) State { - if D == 0 || D > 0x7f { - panic("turboshake: D out of range") - } - return State{rate: rate256, dsbyte: D, turbo: true} -} - -// ShakeSum128 writes an arbitrary-length digest of data into hash. -func ShakeSum128(hash, data []byte) { - h := NewShake128() - _, _ = h.Write(data) - _, _ = h.Read(hash) -} - -// ShakeSum256 writes an arbitrary-length digest of data into hash. -func ShakeSum256(hash, data []byte) { - h := NewShake256() - _, _ = h.Write(data) - _, _ = h.Read(hash) -} - -// TurboShakeSum128 writes an arbitrary-length digest of data into hash. -func TurboShakeSum128(hash, data []byte, D byte) { - h := NewTurboShake128(D) - _, _ = h.Write(data) - _, _ = h.Read(hash) -} - -// TurboShakeSum256 writes an arbitrary-length digest of data into hash. -func TurboShakeSum256(hash, data []byte, D byte) { - h := NewTurboShake256(D) - _, _ = h.Write(data) - _, _ = h.Read(hash) -} - -func (d *State) SwitchDS(D byte) { - d.dsbyte = D -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/xor.go b/vendor/github.com/cloudflare/circl/internal/sha3/xor.go deleted file mode 100644 index 1e2133745..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/xor.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build (!amd64 && !386 && !ppc64le) || appengine -// +build !amd64,!386,!ppc64le appengine - -package sha3 - -// A storageBuf is an aligned array of maxRate bytes. -type storageBuf [maxRate]byte - -func (b *storageBuf) asBytes() *[maxRate]byte { - return (*[maxRate]byte)(b) -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/xor_generic.go b/vendor/github.com/cloudflare/circl/internal/sha3/xor_generic.go deleted file mode 100644 index 2b0c66179..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/xor_generic.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build (!amd64 || appengine) && (!386 || appengine) && (!ppc64le || appengine) -// +build !amd64 appengine -// +build !386 appengine -// +build !ppc64le appengine - -package sha3 - -import "encoding/binary" - -// xorIn xors the bytes in buf into the state; it -// makes no non-portable assumptions about memory layout -// or alignment. -func xorIn(d *State, buf []byte) { - n := len(buf) / 8 - - for i := 0; i < n; i++ { - a := binary.LittleEndian.Uint64(buf) - d.a[i] ^= a - buf = buf[8:] - } -} - -// copyOut copies ulint64s to a byte buffer. -func copyOut(d *State, b []byte) { - for i := 0; len(b) >= 8; i++ { - binary.LittleEndian.PutUint64(b, d.a[i]) - b = b[8:] - } -} diff --git a/vendor/github.com/cloudflare/circl/internal/sha3/xor_unaligned.go b/vendor/github.com/cloudflare/circl/internal/sha3/xor_unaligned.go deleted file mode 100644 index 091061346..000000000 --- a/vendor/github.com/cloudflare/circl/internal/sha3/xor_unaligned.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build (amd64 || 386 || ppc64le) && !appengine -// +build amd64 386 ppc64le -// +build !appengine - -package sha3 - -import "unsafe" - -// A storageBuf is an aligned array of maxRate bytes. -type storageBuf [maxRate / 8]uint64 - -func (b *storageBuf) asBytes() *[maxRate]byte { - return (*[maxRate]byte)(unsafe.Pointer(b)) //nolint:gosec -} - -// xorInuses unaligned reads and writes to update d.a to contain d.a -// XOR buf. -func xorIn(d *State, buf []byte) { - n := len(buf) - bw := (*[maxRate / 8]uint64)(unsafe.Pointer(&buf[0]))[: n/8 : n/8] //nolint:gosec - if n >= 72 { - d.a[0] ^= bw[0] - d.a[1] ^= bw[1] - d.a[2] ^= bw[2] - d.a[3] ^= bw[3] - d.a[4] ^= bw[4] - d.a[5] ^= bw[5] - d.a[6] ^= bw[6] - d.a[7] ^= bw[7] - d.a[8] ^= bw[8] - } - if n >= 104 { - d.a[9] ^= bw[9] - d.a[10] ^= bw[10] - d.a[11] ^= bw[11] - d.a[12] ^= bw[12] - } - if n >= 136 { - d.a[13] ^= bw[13] - d.a[14] ^= bw[14] - d.a[15] ^= bw[15] - d.a[16] ^= bw[16] - } - if n >= 144 { - d.a[17] ^= bw[17] - } - if n >= 168 { - d.a[18] ^= bw[18] - d.a[19] ^= bw[19] - d.a[20] ^= bw[20] - } -} - -func copyOut(d *State, buf []byte) { - ab := (*[maxRate]uint8)(unsafe.Pointer(&d.a[0])) //nolint:gosec - copy(buf, ab[:]) -} diff --git a/vendor/github.com/cloudflare/circl/math/fp25519/fp.go b/vendor/github.com/cloudflare/circl/math/fp25519/fp.go deleted file mode 100644 index 57a50ff5e..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp25519/fp.go +++ /dev/null @@ -1,205 +0,0 @@ -// Package fp25519 provides prime field arithmetic over GF(2^255-19). -package fp25519 - -import ( - "errors" - - "github.com/cloudflare/circl/internal/conv" -) - -// Size in bytes of an element. -const Size = 32 - -// Elt is a prime field element. -type Elt [Size]byte - -func (e Elt) String() string { return conv.BytesLe2Hex(e[:]) } - -// p is the prime modulus 2^255-19. -var p = Elt{ - 0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, -} - -// P returns the prime modulus 2^255-19. -func P() Elt { return p } - -// ToBytes stores in b the little-endian byte representation of x. -func ToBytes(b []byte, x *Elt) error { - if len(b) != Size { - return errors.New("wrong size") - } - Modp(x) - copy(b, x[:]) - return nil -} - -// IsZero returns true if x is equal to 0. -func IsZero(x *Elt) bool { Modp(x); return *x == Elt{} } - -// SetOne assigns x=1. -func SetOne(x *Elt) { *x = Elt{}; x[0] = 1 } - -// Neg calculates z = -x. -func Neg(z, x *Elt) { Sub(z, &p, x) } - -// InvSqrt calculates z = sqrt(x/y) iff x/y is a quadratic-residue, which is -// indicated by returning isQR = true. Otherwise, when x/y is a quadratic -// non-residue, z will have an undetermined value and isQR = false. -func InvSqrt(z, x, y *Elt) (isQR bool) { - sqrtMinusOne := &Elt{ - 0xb0, 0xa0, 0x0e, 0x4a, 0x27, 0x1b, 0xee, 0xc4, - 0x78, 0xe4, 0x2f, 0xad, 0x06, 0x18, 0x43, 0x2f, - 0xa7, 0xd7, 0xfb, 0x3d, 0x99, 0x00, 0x4d, 0x2b, - 0x0b, 0xdf, 0xc1, 0x4f, 0x80, 0x24, 0x83, 0x2b, - } - t0, t1, t2, t3 := &Elt{}, &Elt{}, &Elt{}, &Elt{} - - Mul(t0, x, y) // t0 = u*v - Sqr(t1, y) // t1 = v^2 - Mul(t2, t0, t1) // t2 = u*v^3 - Sqr(t0, t1) // t0 = v^4 - Mul(t1, t0, t2) // t1 = u*v^7 - - var Tab [4]*Elt - Tab[0] = &Elt{} - Tab[1] = &Elt{} - Tab[2] = t3 - Tab[3] = t1 - - *Tab[0] = *t1 - Sqr(Tab[0], Tab[0]) - Sqr(Tab[1], Tab[0]) - Sqr(Tab[1], Tab[1]) - Mul(Tab[1], Tab[1], Tab[3]) - Mul(Tab[0], Tab[0], Tab[1]) - Sqr(Tab[0], Tab[0]) - Mul(Tab[0], Tab[0], Tab[1]) - Sqr(Tab[1], Tab[0]) - for i := 0; i < 4; i++ { - Sqr(Tab[1], Tab[1]) - } - Mul(Tab[1], Tab[1], Tab[0]) - Sqr(Tab[2], Tab[1]) - for i := 0; i < 4; i++ { - Sqr(Tab[2], Tab[2]) - } - Mul(Tab[2], Tab[2], Tab[0]) - Sqr(Tab[1], Tab[2]) - for i := 0; i < 14; i++ { - Sqr(Tab[1], Tab[1]) - } - Mul(Tab[1], Tab[1], Tab[2]) - Sqr(Tab[2], Tab[1]) - for i := 0; i < 29; i++ { - Sqr(Tab[2], Tab[2]) - } - Mul(Tab[2], Tab[2], Tab[1]) - Sqr(Tab[1], Tab[2]) - for i := 0; i < 59; i++ { - Sqr(Tab[1], Tab[1]) - } - Mul(Tab[1], Tab[1], Tab[2]) - for i := 0; i < 5; i++ { - Sqr(Tab[1], Tab[1]) - } - Mul(Tab[1], Tab[1], Tab[0]) - Sqr(Tab[2], Tab[1]) - for i := 0; i < 124; i++ { - Sqr(Tab[2], Tab[2]) - } - Mul(Tab[2], Tab[2], Tab[1]) - Sqr(Tab[2], Tab[2]) - Sqr(Tab[2], Tab[2]) - Mul(Tab[2], Tab[2], Tab[3]) - - Mul(z, t3, t2) // z = xy^(p+3)/8 = xy^3*(xy^7)^(p-5)/8 - // Checking whether y z^2 == x - Sqr(t0, z) // t0 = z^2 - Mul(t0, t0, y) // t0 = yz^2 - Sub(t1, t0, x) // t1 = t0-u - Add(t2, t0, x) // t2 = t0+u - if IsZero(t1) { - return true - } else if IsZero(t2) { - Mul(z, z, sqrtMinusOne) // z = z*sqrt(-1) - return true - } else { - return false - } -} - -// Inv calculates z = 1/x mod p. -func Inv(z, x *Elt) { - x0, x1, x2 := &Elt{}, &Elt{}, &Elt{} - Sqr(x1, x) - Sqr(x0, x1) - Sqr(x0, x0) - Mul(x0, x0, x) - Mul(z, x0, x1) - Sqr(x1, z) - Mul(x0, x0, x1) - Sqr(x1, x0) - for i := 0; i < 4; i++ { - Sqr(x1, x1) - } - Mul(x0, x0, x1) - Sqr(x1, x0) - for i := 0; i < 9; i++ { - Sqr(x1, x1) - } - Mul(x1, x1, x0) - Sqr(x2, x1) - for i := 0; i < 19; i++ { - Sqr(x2, x2) - } - Mul(x2, x2, x1) - for i := 0; i < 10; i++ { - Sqr(x2, x2) - } - Mul(x2, x2, x0) - Sqr(x0, x2) - for i := 0; i < 49; i++ { - Sqr(x0, x0) - } - Mul(x0, x0, x2) - Sqr(x1, x0) - for i := 0; i < 99; i++ { - Sqr(x1, x1) - } - Mul(x1, x1, x0) - for i := 0; i < 50; i++ { - Sqr(x1, x1) - } - Mul(x1, x1, x2) - for i := 0; i < 5; i++ { - Sqr(x1, x1) - } - Mul(z, z, x1) -} - -// Cmov assigns y to x if n is 1. -func Cmov(x, y *Elt, n uint) { cmov(x, y, n) } - -// Cswap interchanges x and y if n is 1. -func Cswap(x, y *Elt, n uint) { cswap(x, y, n) } - -// Add calculates z = x+y mod p. -func Add(z, x, y *Elt) { add(z, x, y) } - -// Sub calculates z = x-y mod p. -func Sub(z, x, y *Elt) { sub(z, x, y) } - -// AddSub calculates (x,y) = (x+y mod p, x-y mod p). -func AddSub(x, y *Elt) { addsub(x, y) } - -// Mul calculates z = x*y mod p. -func Mul(z, x, y *Elt) { mul(z, x, y) } - -// Sqr calculates z = x^2 mod p. -func Sqr(z, x *Elt) { sqr(z, x) } - -// Modp ensures that z is between [0,p-1]. -func Modp(z *Elt) { modp(z) } diff --git a/vendor/github.com/cloudflare/circl/math/fp25519/fp_amd64.go b/vendor/github.com/cloudflare/circl/math/fp25519/fp_amd64.go deleted file mode 100644 index 057f0d280..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp25519/fp_amd64.go +++ /dev/null @@ -1,45 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -package fp25519 - -import ( - "golang.org/x/sys/cpu" -) - -var hasBmi2Adx = cpu.X86.HasBMI2 && cpu.X86.HasADX - -var _ = hasBmi2Adx - -func cmov(x, y *Elt, n uint) { cmovAmd64(x, y, n) } -func cswap(x, y *Elt, n uint) { cswapAmd64(x, y, n) } -func add(z, x, y *Elt) { addAmd64(z, x, y) } -func sub(z, x, y *Elt) { subAmd64(z, x, y) } -func addsub(x, y *Elt) { addsubAmd64(x, y) } -func mul(z, x, y *Elt) { mulAmd64(z, x, y) } -func sqr(z, x *Elt) { sqrAmd64(z, x) } -func modp(z *Elt) { modpAmd64(z) } - -//go:noescape -func cmovAmd64(x, y *Elt, n uint) - -//go:noescape -func cswapAmd64(x, y *Elt, n uint) - -//go:noescape -func addAmd64(z, x, y *Elt) - -//go:noescape -func subAmd64(z, x, y *Elt) - -//go:noescape -func addsubAmd64(x, y *Elt) - -//go:noescape -func mulAmd64(z, x, y *Elt) - -//go:noescape -func sqrAmd64(z, x *Elt) - -//go:noescape -func modpAmd64(z *Elt) diff --git a/vendor/github.com/cloudflare/circl/math/fp25519/fp_amd64.h b/vendor/github.com/cloudflare/circl/math/fp25519/fp_amd64.h deleted file mode 100644 index b884b584a..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp25519/fp_amd64.h +++ /dev/null @@ -1,351 +0,0 @@ -// This code was imported from https://github.com/armfazh/rfc7748_precomputed - -// CHECK_BMI2ADX triggers bmi2adx if supported, -// otherwise it fallbacks to legacy code. -#define CHECK_BMI2ADX(label, legacy, bmi2adx) \ - CMPB ·hasBmi2Adx(SB), $0 \ - JE label \ - bmi2adx \ - RET \ - label: \ - legacy \ - RET - -// cselect is a conditional move -// if b=1: it copies y into x; -// if b=0: x remains with the same value; -// if b<> 0,1: undefined. -// Uses: AX, DX, FLAGS -// Instr: x86_64, cmov -#define cselect(x,y,b) \ - TESTQ b, b \ - MOVQ 0+x, AX; MOVQ 0+y, DX; CMOVQNE DX, AX; MOVQ AX, 0+x; \ - MOVQ 8+x, AX; MOVQ 8+y, DX; CMOVQNE DX, AX; MOVQ AX, 8+x; \ - MOVQ 16+x, AX; MOVQ 16+y, DX; CMOVQNE DX, AX; MOVQ AX, 16+x; \ - MOVQ 24+x, AX; MOVQ 24+y, DX; CMOVQNE DX, AX; MOVQ AX, 24+x; - -// cswap is a conditional swap -// if b=1: x,y <- y,x; -// if b=0: x,y remain with the same values; -// if b<> 0,1: undefined. -// Uses: AX, DX, R8, FLAGS -// Instr: x86_64, cmov -#define cswap(x,y,b) \ - TESTQ b, b \ - MOVQ 0+x, AX; MOVQ AX, R8; MOVQ 0+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 0+x; MOVQ DX, 0+y; \ - MOVQ 8+x, AX; MOVQ AX, R8; MOVQ 8+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 8+x; MOVQ DX, 8+y; \ - MOVQ 16+x, AX; MOVQ AX, R8; MOVQ 16+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 16+x; MOVQ DX, 16+y; \ - MOVQ 24+x, AX; MOVQ AX, R8; MOVQ 24+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 24+x; MOVQ DX, 24+y; - -// additionLeg adds x and y and stores in z -// Uses: AX, DX, R8-R11, FLAGS -// Instr: x86_64, cmov -#define additionLeg(z,x,y) \ - MOVL $38, AX; \ - MOVL $0, DX; \ - MOVQ 0+x, R8; ADDQ 0+y, R8; \ - MOVQ 8+x, R9; ADCQ 8+y, R9; \ - MOVQ 16+x, R10; ADCQ 16+y, R10; \ - MOVQ 24+x, R11; ADCQ 24+y, R11; \ - CMOVQCS AX, DX; \ - ADDQ DX, R8; \ - ADCQ $0, R9; MOVQ R9, 8+z; \ - ADCQ $0, R10; MOVQ R10, 16+z; \ - ADCQ $0, R11; MOVQ R11, 24+z; \ - MOVL $0, DX; \ - CMOVQCS AX, DX; \ - ADDQ DX, R8; MOVQ R8, 0+z; - -// additionAdx adds x and y and stores in z -// Uses: AX, DX, R8-R11, FLAGS -// Instr: x86_64, cmov, adx -#define additionAdx(z,x,y) \ - MOVL $38, AX; \ - XORL DX, DX; \ - MOVQ 0+x, R8; ADCXQ 0+y, R8; \ - MOVQ 8+x, R9; ADCXQ 8+y, R9; \ - MOVQ 16+x, R10; ADCXQ 16+y, R10; \ - MOVQ 24+x, R11; ADCXQ 24+y, R11; \ - CMOVQCS AX, DX ; \ - XORL AX, AX; \ - ADCXQ DX, R8; \ - ADCXQ AX, R9; MOVQ R9, 8+z; \ - ADCXQ AX, R10; MOVQ R10, 16+z; \ - ADCXQ AX, R11; MOVQ R11, 24+z; \ - MOVL $38, DX; \ - CMOVQCS DX, AX; \ - ADDQ AX, R8; MOVQ R8, 0+z; - -// subtraction subtracts y from x and stores in z -// Uses: AX, DX, R8-R11, FLAGS -// Instr: x86_64, cmov -#define subtraction(z,x,y) \ - MOVL $38, AX; \ - MOVQ 0+x, R8; SUBQ 0+y, R8; \ - MOVQ 8+x, R9; SBBQ 8+y, R9; \ - MOVQ 16+x, R10; SBBQ 16+y, R10; \ - MOVQ 24+x, R11; SBBQ 24+y, R11; \ - MOVL $0, DX; \ - CMOVQCS AX, DX; \ - SUBQ DX, R8; \ - SBBQ $0, R9; MOVQ R9, 8+z; \ - SBBQ $0, R10; MOVQ R10, 16+z; \ - SBBQ $0, R11; MOVQ R11, 24+z; \ - MOVL $0, DX; \ - CMOVQCS AX, DX; \ - SUBQ DX, R8; MOVQ R8, 0+z; - -// integerMulAdx multiplies x and y and stores in z -// Uses: AX, DX, R8-R15, FLAGS -// Instr: x86_64, bmi2, adx -#define integerMulAdx(z,x,y) \ - MOVL $0,R15; \ - MOVQ 0+y, DX; XORL AX, AX; \ - MULXQ 0+x, AX, R8; MOVQ AX, 0+z; \ - MULXQ 8+x, AX, R9; ADCXQ AX, R8; \ - MULXQ 16+x, AX, R10; ADCXQ AX, R9; \ - MULXQ 24+x, AX, R11; ADCXQ AX, R10; \ - MOVL $0, AX;;;;;;;;; ADCXQ AX, R11; \ - MOVQ 8+y, DX; XORL AX, AX; \ - MULXQ 0+x, AX, R12; ADCXQ R8, AX; MOVQ AX, 8+z; \ - MULXQ 8+x, AX, R13; ADCXQ R9, R12; ADOXQ AX, R12; \ - MULXQ 16+x, AX, R14; ADCXQ R10, R13; ADOXQ AX, R13; \ - MULXQ 24+x, AX, R15; ADCXQ R11, R14; ADOXQ AX, R14; \ - MOVL $0, AX;;;;;;;;; ADCXQ AX, R15; ADOXQ AX, R15; \ - MOVQ 16+y, DX; XORL AX, AX; \ - MULXQ 0+x, AX, R8; ADCXQ R12, AX; MOVQ AX, 16+z; \ - MULXQ 8+x, AX, R9; ADCXQ R13, R8; ADOXQ AX, R8; \ - MULXQ 16+x, AX, R10; ADCXQ R14, R9; ADOXQ AX, R9; \ - MULXQ 24+x, AX, R11; ADCXQ R15, R10; ADOXQ AX, R10; \ - MOVL $0, AX;;;;;;;;; ADCXQ AX, R11; ADOXQ AX, R11; \ - MOVQ 24+y, DX; XORL AX, AX; \ - MULXQ 0+x, AX, R12; ADCXQ R8, AX; MOVQ AX, 24+z; \ - MULXQ 8+x, AX, R13; ADCXQ R9, R12; ADOXQ AX, R12; MOVQ R12, 32+z; \ - MULXQ 16+x, AX, R14; ADCXQ R10, R13; ADOXQ AX, R13; MOVQ R13, 40+z; \ - MULXQ 24+x, AX, R15; ADCXQ R11, R14; ADOXQ AX, R14; MOVQ R14, 48+z; \ - MOVL $0, AX;;;;;;;;; ADCXQ AX, R15; ADOXQ AX, R15; MOVQ R15, 56+z; - -// integerMulLeg multiplies x and y and stores in z -// Uses: AX, DX, R8-R15, FLAGS -// Instr: x86_64 -#define integerMulLeg(z,x,y) \ - MOVQ 0+y, R8; \ - MOVQ 0+x, AX; MULQ R8; MOVQ AX, 0+z; MOVQ DX, R15; \ - MOVQ 8+x, AX; MULQ R8; MOVQ AX, R13; MOVQ DX, R10; \ - MOVQ 16+x, AX; MULQ R8; MOVQ AX, R14; MOVQ DX, R11; \ - MOVQ 24+x, AX; MULQ R8; \ - ADDQ R13, R15; \ - ADCQ R14, R10; MOVQ R10, 16+z; \ - ADCQ AX, R11; MOVQ R11, 24+z; \ - ADCQ $0, DX; MOVQ DX, 32+z; \ - MOVQ 8+y, R8; \ - MOVQ 0+x, AX; MULQ R8; MOVQ AX, R12; MOVQ DX, R9; \ - MOVQ 8+x, AX; MULQ R8; MOVQ AX, R13; MOVQ DX, R10; \ - MOVQ 16+x, AX; MULQ R8; MOVQ AX, R14; MOVQ DX, R11; \ - MOVQ 24+x, AX; MULQ R8; \ - ADDQ R12, R15; MOVQ R15, 8+z; \ - ADCQ R13, R9; \ - ADCQ R14, R10; \ - ADCQ AX, R11; \ - ADCQ $0, DX; \ - ADCQ 16+z, R9; MOVQ R9, R15; \ - ADCQ 24+z, R10; MOVQ R10, 24+z; \ - ADCQ 32+z, R11; MOVQ R11, 32+z; \ - ADCQ $0, DX; MOVQ DX, 40+z; \ - MOVQ 16+y, R8; \ - MOVQ 0+x, AX; MULQ R8; MOVQ AX, R12; MOVQ DX, R9; \ - MOVQ 8+x, AX; MULQ R8; MOVQ AX, R13; MOVQ DX, R10; \ - MOVQ 16+x, AX; MULQ R8; MOVQ AX, R14; MOVQ DX, R11; \ - MOVQ 24+x, AX; MULQ R8; \ - ADDQ R12, R15; MOVQ R15, 16+z; \ - ADCQ R13, R9; \ - ADCQ R14, R10; \ - ADCQ AX, R11; \ - ADCQ $0, DX; \ - ADCQ 24+z, R9; MOVQ R9, R15; \ - ADCQ 32+z, R10; MOVQ R10, 32+z; \ - ADCQ 40+z, R11; MOVQ R11, 40+z; \ - ADCQ $0, DX; MOVQ DX, 48+z; \ - MOVQ 24+y, R8; \ - MOVQ 0+x, AX; MULQ R8; MOVQ AX, R12; MOVQ DX, R9; \ - MOVQ 8+x, AX; MULQ R8; MOVQ AX, R13; MOVQ DX, R10; \ - MOVQ 16+x, AX; MULQ R8; MOVQ AX, R14; MOVQ DX, R11; \ - MOVQ 24+x, AX; MULQ R8; \ - ADDQ R12, R15; MOVQ R15, 24+z; \ - ADCQ R13, R9; \ - ADCQ R14, R10; \ - ADCQ AX, R11; \ - ADCQ $0, DX; \ - ADCQ 32+z, R9; MOVQ R9, 32+z; \ - ADCQ 40+z, R10; MOVQ R10, 40+z; \ - ADCQ 48+z, R11; MOVQ R11, 48+z; \ - ADCQ $0, DX; MOVQ DX, 56+z; - -// integerSqrLeg squares x and stores in z -// Uses: AX, CX, DX, R8-R15, FLAGS -// Instr: x86_64 -#define integerSqrLeg(z,x) \ - MOVQ 0+x, R8; \ - MOVQ 8+x, AX; MULQ R8; MOVQ AX, R9; MOVQ DX, R10; /* A[0]*A[1] */ \ - MOVQ 16+x, AX; MULQ R8; MOVQ AX, R14; MOVQ DX, R11; /* A[0]*A[2] */ \ - MOVQ 24+x, AX; MULQ R8; MOVQ AX, R15; MOVQ DX, R12; /* A[0]*A[3] */ \ - MOVQ 24+x, R8; \ - MOVQ 8+x, AX; MULQ R8; MOVQ AX, CX; MOVQ DX, R13; /* A[3]*A[1] */ \ - MOVQ 16+x, AX; MULQ R8; /* A[3]*A[2] */ \ - \ - ADDQ R14, R10;\ - ADCQ R15, R11; MOVL $0, R15;\ - ADCQ CX, R12;\ - ADCQ AX, R13;\ - ADCQ $0, DX; MOVQ DX, R14;\ - MOVQ 8+x, AX; MULQ 16+x;\ - \ - ADDQ AX, R11;\ - ADCQ DX, R12;\ - ADCQ $0, R13;\ - ADCQ $0, R14;\ - ADCQ $0, R15;\ - \ - SHLQ $1, R14, R15; MOVQ R15, 56+z;\ - SHLQ $1, R13, R14; MOVQ R14, 48+z;\ - SHLQ $1, R12, R13; MOVQ R13, 40+z;\ - SHLQ $1, R11, R12; MOVQ R12, 32+z;\ - SHLQ $1, R10, R11; MOVQ R11, 24+z;\ - SHLQ $1, R9, R10; MOVQ R10, 16+z;\ - SHLQ $1, R9; MOVQ R9, 8+z;\ - \ - MOVQ 0+x,AX; MULQ AX; MOVQ AX, 0+z; MOVQ DX, R9;\ - MOVQ 8+x,AX; MULQ AX; MOVQ AX, R10; MOVQ DX, R11;\ - MOVQ 16+x,AX; MULQ AX; MOVQ AX, R12; MOVQ DX, R13;\ - MOVQ 24+x,AX; MULQ AX; MOVQ AX, R14; MOVQ DX, R15;\ - \ - ADDQ 8+z, R9; MOVQ R9, 8+z;\ - ADCQ 16+z, R10; MOVQ R10, 16+z;\ - ADCQ 24+z, R11; MOVQ R11, 24+z;\ - ADCQ 32+z, R12; MOVQ R12, 32+z;\ - ADCQ 40+z, R13; MOVQ R13, 40+z;\ - ADCQ 48+z, R14; MOVQ R14, 48+z;\ - ADCQ 56+z, R15; MOVQ R15, 56+z; - -// integerSqrAdx squares x and stores in z -// Uses: AX, CX, DX, R8-R15, FLAGS -// Instr: x86_64, bmi2, adx -#define integerSqrAdx(z,x) \ - MOVQ 0+x, DX; /* A[0] */ \ - MULXQ 8+x, R8, R14; /* A[1]*A[0] */ XORL R15, R15; \ - MULXQ 16+x, R9, R10; /* A[2]*A[0] */ ADCXQ R14, R9; \ - MULXQ 24+x, AX, CX; /* A[3]*A[0] */ ADCXQ AX, R10; \ - MOVQ 24+x, DX; /* A[3] */ \ - MULXQ 8+x, R11, R12; /* A[1]*A[3] */ ADCXQ CX, R11; \ - MULXQ 16+x, AX, R13; /* A[2]*A[3] */ ADCXQ AX, R12; \ - MOVQ 8+x, DX; /* A[1] */ ADCXQ R15, R13; \ - MULXQ 16+x, AX, CX; /* A[2]*A[1] */ MOVL $0, R14; \ - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ADCXQ R15, R14; \ - XORL R15, R15; \ - ADOXQ AX, R10; ADCXQ R8, R8; \ - ADOXQ CX, R11; ADCXQ R9, R9; \ - ADOXQ R15, R12; ADCXQ R10, R10; \ - ADOXQ R15, R13; ADCXQ R11, R11; \ - ADOXQ R15, R14; ADCXQ R12, R12; \ - ;;;;;;;;;;;;;;; ADCXQ R13, R13; \ - ;;;;;;;;;;;;;;; ADCXQ R14, R14; \ - MOVQ 0+x, DX; MULXQ DX, AX, CX; /* A[0]^2 */ \ - ;;;;;;;;;;;;;;; MOVQ AX, 0+z; \ - ADDQ CX, R8; MOVQ R8, 8+z; \ - MOVQ 8+x, DX; MULXQ DX, AX, CX; /* A[1]^2 */ \ - ADCQ AX, R9; MOVQ R9, 16+z; \ - ADCQ CX, R10; MOVQ R10, 24+z; \ - MOVQ 16+x, DX; MULXQ DX, AX, CX; /* A[2]^2 */ \ - ADCQ AX, R11; MOVQ R11, 32+z; \ - ADCQ CX, R12; MOVQ R12, 40+z; \ - MOVQ 24+x, DX; MULXQ DX, AX, CX; /* A[3]^2 */ \ - ADCQ AX, R13; MOVQ R13, 48+z; \ - ADCQ CX, R14; MOVQ R14, 56+z; - -// reduceFromDouble finds z congruent to x modulo p such that 0> 63) - // PUT BIT 255 IN CARRY FLAG AND CLEAR - x3 &^= 1 << 63 - - x0, c0 := bits.Add64(x0, cx, 0) - x1, c1 := bits.Add64(x1, 0, c0) - x2, c2 := bits.Add64(x2, 0, c1) - x3, _ = bits.Add64(x3, 0, c2) - - // TEST FOR BIT 255 AGAIN; ONLY TRIGGERED ON OVERFLOW MODULO 2^255-19 - // cx = C[255] ? 0 : 19 - cx = uint64(19) &^ (-(x3 >> 63)) - // CLEAR BIT 255 - x3 &^= 1 << 63 - - x0, c0 = bits.Sub64(x0, cx, 0) - x1, c1 = bits.Sub64(x1, 0, c0) - x2, c2 = bits.Sub64(x2, 0, c1) - x3, _ = bits.Sub64(x3, 0, c2) - - binary.LittleEndian.PutUint64(x[0*8:1*8], x0) - binary.LittleEndian.PutUint64(x[1*8:2*8], x1) - binary.LittleEndian.PutUint64(x[2*8:3*8], x2) - binary.LittleEndian.PutUint64(x[3*8:4*8], x3) -} - -func red64(z *Elt, x0, x1, x2, x3, x4, x5, x6, x7 uint64) { - h0, l0 := bits.Mul64(x4, 38) - h1, l1 := bits.Mul64(x5, 38) - h2, l2 := bits.Mul64(x6, 38) - h3, l3 := bits.Mul64(x7, 38) - - l1, c0 := bits.Add64(h0, l1, 0) - l2, c1 := bits.Add64(h1, l2, c0) - l3, c2 := bits.Add64(h2, l3, c1) - l4, _ := bits.Add64(h3, 0, c2) - - l0, c0 = bits.Add64(l0, x0, 0) - l1, c1 = bits.Add64(l1, x1, c0) - l2, c2 = bits.Add64(l2, x2, c1) - l3, c3 := bits.Add64(l3, x3, c2) - l4, _ = bits.Add64(l4, 0, c3) - - _, l4 = bits.Mul64(l4, 38) - l0, c0 = bits.Add64(l0, l4, 0) - z1, c1 := bits.Add64(l1, 0, c0) - z2, c2 := bits.Add64(l2, 0, c1) - z3, c3 := bits.Add64(l3, 0, c2) - z0, _ := bits.Add64(l0, (-c3)&38, 0) - - binary.LittleEndian.PutUint64(z[0*8:1*8], z0) - binary.LittleEndian.PutUint64(z[1*8:2*8], z1) - binary.LittleEndian.PutUint64(z[2*8:3*8], z2) - binary.LittleEndian.PutUint64(z[3*8:4*8], z3) -} diff --git a/vendor/github.com/cloudflare/circl/math/fp25519/fp_noasm.go b/vendor/github.com/cloudflare/circl/math/fp25519/fp_noasm.go deleted file mode 100644 index 26ca4d01b..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp25519/fp_noasm.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build !amd64 || purego -// +build !amd64 purego - -package fp25519 - -func cmov(x, y *Elt, n uint) { cmovGeneric(x, y, n) } -func cswap(x, y *Elt, n uint) { cswapGeneric(x, y, n) } -func add(z, x, y *Elt) { addGeneric(z, x, y) } -func sub(z, x, y *Elt) { subGeneric(z, x, y) } -func addsub(x, y *Elt) { addsubGeneric(x, y) } -func mul(z, x, y *Elt) { mulGeneric(z, x, y) } -func sqr(z, x *Elt) { sqrGeneric(z, x) } -func modp(z *Elt) { modpGeneric(z) } diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fp.go b/vendor/github.com/cloudflare/circl/math/fp448/fp.go deleted file mode 100644 index a5e36600b..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fp.go +++ /dev/null @@ -1,164 +0,0 @@ -// Package fp448 provides prime field arithmetic over GF(2^448-2^224-1). -package fp448 - -import ( - "errors" - - "github.com/cloudflare/circl/internal/conv" -) - -// Size in bytes of an element. -const Size = 56 - -// Elt is a prime field element. -type Elt [Size]byte - -func (e Elt) String() string { return conv.BytesLe2Hex(e[:]) } - -// p is the prime modulus 2^448-2^224-1. -var p = Elt{ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -} - -// P returns the prime modulus 2^448-2^224-1. -func P() Elt { return p } - -// ToBytes stores in b the little-endian byte representation of x. -func ToBytes(b []byte, x *Elt) error { - if len(b) != Size { - return errors.New("wrong size") - } - Modp(x) - copy(b, x[:]) - return nil -} - -// IsZero returns true if x is equal to 0. -func IsZero(x *Elt) bool { Modp(x); return *x == Elt{} } - -// IsOne returns true if x is equal to 1. -func IsOne(x *Elt) bool { Modp(x); return *x == Elt{1} } - -// SetOne assigns x=1. -func SetOne(x *Elt) { *x = Elt{1} } - -// One returns the 1 element. -func One() (x Elt) { x = Elt{1}; return } - -// Neg calculates z = -x. -func Neg(z, x *Elt) { Sub(z, &p, x) } - -// Modp ensures that z is between [0,p-1]. -func Modp(z *Elt) { Sub(z, z, &p) } - -// InvSqrt calculates z = sqrt(x/y) iff x/y is a quadratic-residue. If so, -// isQR = true; otherwise, isQR = false, since x/y is a quadratic non-residue, -// and z = sqrt(-x/y). -func InvSqrt(z, x, y *Elt) (isQR bool) { - // First note that x^(2(k+1)) = x^(p-1)/2 * x = legendre(x) * x - // so that's x if x is a quadratic residue and -x otherwise. - // Next, y^(6k+3) = y^(4k+2) * y^(2k+1) = y^(p-1) * y^((p-1)/2) = legendre(y). - // So the z we compute satisfies z^2 y = x^(2(k+1)) y^(6k+3) = legendre(x)*legendre(y). - // Thus if x and y are quadratic residues, then z is indeed sqrt(x/y). - t0, t1 := &Elt{}, &Elt{} - Mul(t0, x, y) // x*y - Sqr(t1, y) // y^2 - Mul(t1, t0, t1) // x*y^3 - powPminus3div4(z, t1) // (x*y^3)^k - Mul(z, z, t0) // z = x*y*(x*y^3)^k = x^(k+1) * y^(3k+1) - - // Check if x/y is a quadratic residue - Sqr(t0, z) // z^2 - Mul(t0, t0, y) // y*z^2 - Sub(t0, t0, x) // y*z^2-x - return IsZero(t0) -} - -// Inv calculates z = 1/x mod p. -func Inv(z, x *Elt) { - // Calculates z = x^(4k+1) = x^(p-3+1) = x^(p-2) = x^-1, where k = (p-3)/4. - t := &Elt{} - powPminus3div4(t, x) // t = x^k - Sqr(t, t) // t = x^2k - Sqr(t, t) // t = x^4k - Mul(z, t, x) // z = x^(4k+1) -} - -// powPminus3div4 calculates z = x^k mod p, where k = (p-3)/4. -func powPminus3div4(z, x *Elt) { - x0, x1 := &Elt{}, &Elt{} - Sqr(z, x) - Mul(z, z, x) - Sqr(x0, z) - Mul(x0, x0, x) - Sqr(z, x0) - Sqr(z, z) - Sqr(z, z) - Mul(z, z, x0) - Sqr(x1, z) - for i := 0; i < 5; i++ { - Sqr(x1, x1) - } - Mul(x1, x1, z) - Sqr(z, x1) - for i := 0; i < 11; i++ { - Sqr(z, z) - } - Mul(z, z, x1) - Sqr(z, z) - Sqr(z, z) - Sqr(z, z) - Mul(z, z, x0) - Sqr(x1, z) - for i := 0; i < 26; i++ { - Sqr(x1, x1) - } - Mul(x1, x1, z) - Sqr(z, x1) - for i := 0; i < 53; i++ { - Sqr(z, z) - } - Mul(z, z, x1) - Sqr(z, z) - Sqr(z, z) - Sqr(z, z) - Mul(z, z, x0) - Sqr(x1, z) - for i := 0; i < 110; i++ { - Sqr(x1, x1) - } - Mul(x1, x1, z) - Sqr(z, x1) - Mul(z, z, x) - for i := 0; i < 223; i++ { - Sqr(z, z) - } - Mul(z, z, x1) -} - -// Cmov assigns y to x if n is 1. -func Cmov(x, y *Elt, n uint) { cmov(x, y, n) } - -// Cswap interchanges x and y if n is 1. -func Cswap(x, y *Elt, n uint) { cswap(x, y, n) } - -// Add calculates z = x+y mod p. -func Add(z, x, y *Elt) { add(z, x, y) } - -// Sub calculates z = x-y mod p. -func Sub(z, x, y *Elt) { sub(z, x, y) } - -// AddSub calculates (x,y) = (x+y mod p, x-y mod p). -func AddSub(x, y *Elt) { addsub(x, y) } - -// Mul calculates z = x*y mod p. -func Mul(z, x, y *Elt) { mul(z, x, y) } - -// Sqr calculates z = x^2 mod p. -func Sqr(z, x *Elt) { sqr(z, x) } diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.go b/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.go deleted file mode 100644 index 6a12209a7..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.go +++ /dev/null @@ -1,43 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -package fp448 - -import ( - "golang.org/x/sys/cpu" -) - -var hasBmi2Adx = cpu.X86.HasBMI2 && cpu.X86.HasADX - -var _ = hasBmi2Adx - -func cmov(x, y *Elt, n uint) { cmovAmd64(x, y, n) } -func cswap(x, y *Elt, n uint) { cswapAmd64(x, y, n) } -func add(z, x, y *Elt) { addAmd64(z, x, y) } -func sub(z, x, y *Elt) { subAmd64(z, x, y) } -func addsub(x, y *Elt) { addsubAmd64(x, y) } -func mul(z, x, y *Elt) { mulAmd64(z, x, y) } -func sqr(z, x *Elt) { sqrAmd64(z, x) } - -/* Functions defined in fp_amd64.s */ - -//go:noescape -func cmovAmd64(x, y *Elt, n uint) - -//go:noescape -func cswapAmd64(x, y *Elt, n uint) - -//go:noescape -func addAmd64(z, x, y *Elt) - -//go:noescape -func subAmd64(z, x, y *Elt) - -//go:noescape -func addsubAmd64(x, y *Elt) - -//go:noescape -func mulAmd64(z, x, y *Elt) - -//go:noescape -func sqrAmd64(z, x *Elt) diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.h b/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.h deleted file mode 100644 index 536fe5bdf..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.h +++ /dev/null @@ -1,591 +0,0 @@ -// This code was imported from https://github.com/armfazh/rfc7748_precomputed - -// CHECK_BMI2ADX triggers bmi2adx if supported, -// otherwise it fallbacks to legacy code. -#define CHECK_BMI2ADX(label, legacy, bmi2adx) \ - CMPB ·hasBmi2Adx(SB), $0 \ - JE label \ - bmi2adx \ - RET \ - label: \ - legacy \ - RET - -// cselect is a conditional move -// if b=1: it copies y into x; -// if b=0: x remains with the same value; -// if b<> 0,1: undefined. -// Uses: AX, DX, FLAGS -// Instr: x86_64, cmov -#define cselect(x,y,b) \ - TESTQ b, b \ - MOVQ 0+x, AX; MOVQ 0+y, DX; CMOVQNE DX, AX; MOVQ AX, 0+x; \ - MOVQ 8+x, AX; MOVQ 8+y, DX; CMOVQNE DX, AX; MOVQ AX, 8+x; \ - MOVQ 16+x, AX; MOVQ 16+y, DX; CMOVQNE DX, AX; MOVQ AX, 16+x; \ - MOVQ 24+x, AX; MOVQ 24+y, DX; CMOVQNE DX, AX; MOVQ AX, 24+x; \ - MOVQ 32+x, AX; MOVQ 32+y, DX; CMOVQNE DX, AX; MOVQ AX, 32+x; \ - MOVQ 40+x, AX; MOVQ 40+y, DX; CMOVQNE DX, AX; MOVQ AX, 40+x; \ - MOVQ 48+x, AX; MOVQ 48+y, DX; CMOVQNE DX, AX; MOVQ AX, 48+x; - -// cswap is a conditional swap -// if b=1: x,y <- y,x; -// if b=0: x,y remain with the same values; -// if b<> 0,1: undefined. -// Uses: AX, DX, R8, FLAGS -// Instr: x86_64, cmov -#define cswap(x,y,b) \ - TESTQ b, b \ - MOVQ 0+x, AX; MOVQ AX, R8; MOVQ 0+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 0+x; MOVQ DX, 0+y; \ - MOVQ 8+x, AX; MOVQ AX, R8; MOVQ 8+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 8+x; MOVQ DX, 8+y; \ - MOVQ 16+x, AX; MOVQ AX, R8; MOVQ 16+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 16+x; MOVQ DX, 16+y; \ - MOVQ 24+x, AX; MOVQ AX, R8; MOVQ 24+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 24+x; MOVQ DX, 24+y; \ - MOVQ 32+x, AX; MOVQ AX, R8; MOVQ 32+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 32+x; MOVQ DX, 32+y; \ - MOVQ 40+x, AX; MOVQ AX, R8; MOVQ 40+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 40+x; MOVQ DX, 40+y; \ - MOVQ 48+x, AX; MOVQ AX, R8; MOVQ 48+y, DX; CMOVQNE DX, AX; CMOVQNE R8, DX; MOVQ AX, 48+x; MOVQ DX, 48+y; - -// additionLeg adds x and y and stores in z -// Uses: AX, DX, R8-R14, FLAGS -// Instr: x86_64 -#define additionLeg(z,x,y) \ - MOVQ 0+x, R8; ADDQ 0+y, R8; \ - MOVQ 8+x, R9; ADCQ 8+y, R9; \ - MOVQ 16+x, R10; ADCQ 16+y, R10; \ - MOVQ 24+x, R11; ADCQ 24+y, R11; \ - MOVQ 32+x, R12; ADCQ 32+y, R12; \ - MOVQ 40+x, R13; ADCQ 40+y, R13; \ - MOVQ 48+x, R14; ADCQ 48+y, R14; \ - MOVQ $0, AX; ADCQ $0, AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - ADDQ AX, R8; MOVQ $0, AX; \ - ADCQ $0, R9; \ - ADCQ $0, R10; \ - ADCQ DX, R11; \ - ADCQ $0, R12; \ - ADCQ $0, R13; \ - ADCQ $0, R14; \ - ADCQ $0, AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - ADDQ AX, R8; MOVQ R8, 0+z; \ - ADCQ $0, R9; MOVQ R9, 8+z; \ - ADCQ $0, R10; MOVQ R10, 16+z; \ - ADCQ DX, R11; MOVQ R11, 24+z; \ - ADCQ $0, R12; MOVQ R12, 32+z; \ - ADCQ $0, R13; MOVQ R13, 40+z; \ - ADCQ $0, R14; MOVQ R14, 48+z; - - -// additionAdx adds x and y and stores in z -// Uses: AX, DX, R8-R15, FLAGS -// Instr: x86_64, adx -#define additionAdx(z,x,y) \ - MOVL $32, R15; \ - XORL DX, DX; \ - MOVQ 0+x, R8; ADCXQ 0+y, R8; \ - MOVQ 8+x, R9; ADCXQ 8+y, R9; \ - MOVQ 16+x, R10; ADCXQ 16+y, R10; \ - MOVQ 24+x, R11; ADCXQ 24+y, R11; \ - MOVQ 32+x, R12; ADCXQ 32+y, R12; \ - MOVQ 40+x, R13; ADCXQ 40+y, R13; \ - MOVQ 48+x, R14; ADCXQ 48+y, R14; \ - ;;;;;;;;;;;;;;; ADCXQ DX, DX; \ - XORL AX, AX; \ - ADCXQ DX, R8; SHLXQ R15, DX, DX; \ - ADCXQ AX, R9; \ - ADCXQ AX, R10; \ - ADCXQ DX, R11; \ - ADCXQ AX, R12; \ - ADCXQ AX, R13; \ - ADCXQ AX, R14; \ - ADCXQ AX, AX; \ - XORL DX, DX; \ - ADCXQ AX, R8; MOVQ R8, 0+z; SHLXQ R15, AX, AX; \ - ADCXQ DX, R9; MOVQ R9, 8+z; \ - ADCXQ DX, R10; MOVQ R10, 16+z; \ - ADCXQ AX, R11; MOVQ R11, 24+z; \ - ADCXQ DX, R12; MOVQ R12, 32+z; \ - ADCXQ DX, R13; MOVQ R13, 40+z; \ - ADCXQ DX, R14; MOVQ R14, 48+z; - -// subtraction subtracts y from x and stores in z -// Uses: AX, DX, R8-R14, FLAGS -// Instr: x86_64 -#define subtraction(z,x,y) \ - MOVQ 0+x, R8; SUBQ 0+y, R8; \ - MOVQ 8+x, R9; SBBQ 8+y, R9; \ - MOVQ 16+x, R10; SBBQ 16+y, R10; \ - MOVQ 24+x, R11; SBBQ 24+y, R11; \ - MOVQ 32+x, R12; SBBQ 32+y, R12; \ - MOVQ 40+x, R13; SBBQ 40+y, R13; \ - MOVQ 48+x, R14; SBBQ 48+y, R14; \ - MOVQ $0, AX; SETCS AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - SUBQ AX, R8; MOVQ $0, AX; \ - SBBQ $0, R9; \ - SBBQ $0, R10; \ - SBBQ DX, R11; \ - SBBQ $0, R12; \ - SBBQ $0, R13; \ - SBBQ $0, R14; \ - SETCS AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - SUBQ AX, R8; MOVQ R8, 0+z; \ - SBBQ $0, R9; MOVQ R9, 8+z; \ - SBBQ $0, R10; MOVQ R10, 16+z; \ - SBBQ DX, R11; MOVQ R11, 24+z; \ - SBBQ $0, R12; MOVQ R12, 32+z; \ - SBBQ $0, R13; MOVQ R13, 40+z; \ - SBBQ $0, R14; MOVQ R14, 48+z; - -// maddBmi2Adx multiplies x and y and accumulates in z -// Uses: AX, DX, R15, FLAGS -// Instr: x86_64, bmi2, adx -#define maddBmi2Adx(z,x,y,i,r0,r1,r2,r3,r4,r5,r6) \ - MOVQ i+y, DX; XORL AX, AX; \ - MULXQ 0+x, AX, R8; ADOXQ AX, r0; ADCXQ R8, r1; MOVQ r0,i+z; \ - MULXQ 8+x, AX, r0; ADOXQ AX, r1; ADCXQ r0, r2; MOVQ $0, R8; \ - MULXQ 16+x, AX, r0; ADOXQ AX, r2; ADCXQ r0, r3; \ - MULXQ 24+x, AX, r0; ADOXQ AX, r3; ADCXQ r0, r4; \ - MULXQ 32+x, AX, r0; ADOXQ AX, r4; ADCXQ r0, r5; \ - MULXQ 40+x, AX, r0; ADOXQ AX, r5; ADCXQ r0, r6; \ - MULXQ 48+x, AX, r0; ADOXQ AX, r6; ADCXQ R8, r0; \ - ;;;;;;;;;;;;;;;;;;; ADOXQ R8, r0; - -// integerMulAdx multiplies x and y and stores in z -// Uses: AX, DX, R8-R15, FLAGS -// Instr: x86_64, bmi2, adx -#define integerMulAdx(z,x,y) \ - MOVL $0,R15; \ - MOVQ 0+y, DX; XORL AX, AX; MOVQ $0, R8; \ - MULXQ 0+x, AX, R9; MOVQ AX, 0+z; \ - MULXQ 8+x, AX, R10; ADCXQ AX, R9; \ - MULXQ 16+x, AX, R11; ADCXQ AX, R10; \ - MULXQ 24+x, AX, R12; ADCXQ AX, R11; \ - MULXQ 32+x, AX, R13; ADCXQ AX, R12; \ - MULXQ 40+x, AX, R14; ADCXQ AX, R13; \ - MULXQ 48+x, AX, R15; ADCXQ AX, R14; \ - ;;;;;;;;;;;;;;;;;;;; ADCXQ R8, R15; \ - maddBmi2Adx(z,x,y, 8, R9,R10,R11,R12,R13,R14,R15) \ - maddBmi2Adx(z,x,y,16,R10,R11,R12,R13,R14,R15, R9) \ - maddBmi2Adx(z,x,y,24,R11,R12,R13,R14,R15, R9,R10) \ - maddBmi2Adx(z,x,y,32,R12,R13,R14,R15, R9,R10,R11) \ - maddBmi2Adx(z,x,y,40,R13,R14,R15, R9,R10,R11,R12) \ - maddBmi2Adx(z,x,y,48,R14,R15, R9,R10,R11,R12,R13) \ - MOVQ R15, 56+z; \ - MOVQ R9, 64+z; \ - MOVQ R10, 72+z; \ - MOVQ R11, 80+z; \ - MOVQ R12, 88+z; \ - MOVQ R13, 96+z; \ - MOVQ R14, 104+z; - -// maddLegacy multiplies x and y and accumulates in z -// Uses: AX, DX, R15, FLAGS -// Instr: x86_64 -#define maddLegacy(z,x,y,i) \ - MOVQ i+y, R15; \ - MOVQ 0+x, AX; MULQ R15; MOVQ AX, R8; ;;;;;;;;;;;; MOVQ DX, R9; \ - MOVQ 8+x, AX; MULQ R15; ADDQ AX, R9; ADCQ $0, DX; MOVQ DX, R10; \ - MOVQ 16+x, AX; MULQ R15; ADDQ AX, R10; ADCQ $0, DX; MOVQ DX, R11; \ - MOVQ 24+x, AX; MULQ R15; ADDQ AX, R11; ADCQ $0, DX; MOVQ DX, R12; \ - MOVQ 32+x, AX; MULQ R15; ADDQ AX, R12; ADCQ $0, DX; MOVQ DX, R13; \ - MOVQ 40+x, AX; MULQ R15; ADDQ AX, R13; ADCQ $0, DX; MOVQ DX, R14; \ - MOVQ 48+x, AX; MULQ R15; ADDQ AX, R14; ADCQ $0, DX; \ - ADDQ 0+i+z, R8; MOVQ R8, 0+i+z; \ - ADCQ 8+i+z, R9; MOVQ R9, 8+i+z; \ - ADCQ 16+i+z, R10; MOVQ R10, 16+i+z; \ - ADCQ 24+i+z, R11; MOVQ R11, 24+i+z; \ - ADCQ 32+i+z, R12; MOVQ R12, 32+i+z; \ - ADCQ 40+i+z, R13; MOVQ R13, 40+i+z; \ - ADCQ 48+i+z, R14; MOVQ R14, 48+i+z; \ - ADCQ $0, DX; MOVQ DX, 56+i+z; - -// integerMulLeg multiplies x and y and stores in z -// Uses: AX, DX, R8-R15, FLAGS -// Instr: x86_64 -#define integerMulLeg(z,x,y) \ - MOVQ 0+y, R15; \ - MOVQ 0+x, AX; MULQ R15; MOVQ AX, 0+z; ;;;;;;;;;;;; MOVQ DX, R8; \ - MOVQ 8+x, AX; MULQ R15; ADDQ AX, R8; ADCQ $0, DX; MOVQ DX, R9; MOVQ R8, 8+z; \ - MOVQ 16+x, AX; MULQ R15; ADDQ AX, R9; ADCQ $0, DX; MOVQ DX, R10; MOVQ R9, 16+z; \ - MOVQ 24+x, AX; MULQ R15; ADDQ AX, R10; ADCQ $0, DX; MOVQ DX, R11; MOVQ R10, 24+z; \ - MOVQ 32+x, AX; MULQ R15; ADDQ AX, R11; ADCQ $0, DX; MOVQ DX, R12; MOVQ R11, 32+z; \ - MOVQ 40+x, AX; MULQ R15; ADDQ AX, R12; ADCQ $0, DX; MOVQ DX, R13; MOVQ R12, 40+z; \ - MOVQ 48+x, AX; MULQ R15; ADDQ AX, R13; ADCQ $0, DX; MOVQ DX,56+z; MOVQ R13, 48+z; \ - maddLegacy(z,x,y, 8) \ - maddLegacy(z,x,y,16) \ - maddLegacy(z,x,y,24) \ - maddLegacy(z,x,y,32) \ - maddLegacy(z,x,y,40) \ - maddLegacy(z,x,y,48) - -// integerSqrLeg squares x and stores in z -// Uses: AX, CX, DX, R8-R15, FLAGS -// Instr: x86_64 -#define integerSqrLeg(z,x) \ - XORL R15, R15; \ - MOVQ 0+x, CX; \ - MOVQ CX, AX; MULQ CX; MOVQ AX, 0+z; MOVQ DX, R8; \ - ADDQ CX, CX; ADCQ $0, R15; \ - MOVQ 8+x, AX; MULQ CX; ADDQ AX, R8; ADCQ $0, DX; MOVQ DX, R9; MOVQ R8, 8+z; \ - MOVQ 16+x, AX; MULQ CX; ADDQ AX, R9; ADCQ $0, DX; MOVQ DX, R10; \ - MOVQ 24+x, AX; MULQ CX; ADDQ AX, R10; ADCQ $0, DX; MOVQ DX, R11; \ - MOVQ 32+x, AX; MULQ CX; ADDQ AX, R11; ADCQ $0, DX; MOVQ DX, R12; \ - MOVQ 40+x, AX; MULQ CX; ADDQ AX, R12; ADCQ $0, DX; MOVQ DX, R13; \ - MOVQ 48+x, AX; MULQ CX; ADDQ AX, R13; ADCQ $0, DX; MOVQ DX, R14; \ - \ - MOVQ 8+x, CX; \ - MOVQ CX, AX; ADDQ R15, CX; MOVQ $0, R15; ADCQ $0, R15; \ - ;;;;;;;;;;;;;; MULQ CX; ADDQ AX, R9; ADCQ $0, DX; MOVQ R9,16+z; \ - MOVQ R15, AX; NEGQ AX; ANDQ 8+x, AX; ADDQ AX, DX; ADCQ $0, R11; MOVQ DX, R8; \ - ADDQ 8+x, CX; ADCQ $0, R15; \ - MOVQ 16+x, AX; MULQ CX; ADDQ AX, R10; ADCQ $0, DX; ADDQ R8, R10; ADCQ $0, DX; MOVQ DX, R8; MOVQ R10, 24+z; \ - MOVQ 24+x, AX; MULQ CX; ADDQ AX, R11; ADCQ $0, DX; ADDQ R8, R11; ADCQ $0, DX; MOVQ DX, R8; \ - MOVQ 32+x, AX; MULQ CX; ADDQ AX, R12; ADCQ $0, DX; ADDQ R8, R12; ADCQ $0, DX; MOVQ DX, R8; \ - MOVQ 40+x, AX; MULQ CX; ADDQ AX, R13; ADCQ $0, DX; ADDQ R8, R13; ADCQ $0, DX; MOVQ DX, R8; \ - MOVQ 48+x, AX; MULQ CX; ADDQ AX, R14; ADCQ $0, DX; ADDQ R8, R14; ADCQ $0, DX; MOVQ DX, R9; \ - \ - MOVQ 16+x, CX; \ - MOVQ CX, AX; ADDQ R15, CX; MOVQ $0, R15; ADCQ $0, R15; \ - ;;;;;;;;;;;;;; MULQ CX; ADDQ AX, R11; ADCQ $0, DX; MOVQ R11, 32+z; \ - MOVQ R15, AX; NEGQ AX; ANDQ 16+x,AX; ADDQ AX, DX; ADCQ $0, R13; MOVQ DX, R8; \ - ADDQ 16+x, CX; ADCQ $0, R15; \ - MOVQ 24+x, AX; MULQ CX; ADDQ AX, R12; ADCQ $0, DX; ADDQ R8, R12; ADCQ $0, DX; MOVQ DX, R8; MOVQ R12, 40+z; \ - MOVQ 32+x, AX; MULQ CX; ADDQ AX, R13; ADCQ $0, DX; ADDQ R8, R13; ADCQ $0, DX; MOVQ DX, R8; \ - MOVQ 40+x, AX; MULQ CX; ADDQ AX, R14; ADCQ $0, DX; ADDQ R8, R14; ADCQ $0, DX; MOVQ DX, R8; \ - MOVQ 48+x, AX; MULQ CX; ADDQ AX, R9; ADCQ $0, DX; ADDQ R8, R9; ADCQ $0, DX; MOVQ DX,R10; \ - \ - MOVQ 24+x, CX; \ - MOVQ CX, AX; ADDQ R15, CX; MOVQ $0, R15; ADCQ $0, R15; \ - ;;;;;;;;;;;;;; MULQ CX; ADDQ AX, R13; ADCQ $0, DX; MOVQ R13, 48+z; \ - MOVQ R15, AX; NEGQ AX; ANDQ 24+x,AX; ADDQ AX, DX; ADCQ $0, R9; MOVQ DX, R8; \ - ADDQ 24+x, CX; ADCQ $0, R15; \ - MOVQ 32+x, AX; MULQ CX; ADDQ AX, R14; ADCQ $0, DX; ADDQ R8, R14; ADCQ $0, DX; MOVQ DX, R8; MOVQ R14, 56+z; \ - MOVQ 40+x, AX; MULQ CX; ADDQ AX, R9; ADCQ $0, DX; ADDQ R8, R9; ADCQ $0, DX; MOVQ DX, R8; \ - MOVQ 48+x, AX; MULQ CX; ADDQ AX, R10; ADCQ $0, DX; ADDQ R8, R10; ADCQ $0, DX; MOVQ DX,R11; \ - \ - MOVQ 32+x, CX; \ - MOVQ CX, AX; ADDQ R15, CX; MOVQ $0, R15; ADCQ $0, R15; \ - ;;;;;;;;;;;;;; MULQ CX; ADDQ AX, R9; ADCQ $0, DX; MOVQ R9, 64+z; \ - MOVQ R15, AX; NEGQ AX; ANDQ 32+x,AX; ADDQ AX, DX; ADCQ $0, R11; MOVQ DX, R8; \ - ADDQ 32+x, CX; ADCQ $0, R15; \ - MOVQ 40+x, AX; MULQ CX; ADDQ AX, R10; ADCQ $0, DX; ADDQ R8, R10; ADCQ $0, DX; MOVQ DX, R8; MOVQ R10, 72+z; \ - MOVQ 48+x, AX; MULQ CX; ADDQ AX, R11; ADCQ $0, DX; ADDQ R8, R11; ADCQ $0, DX; MOVQ DX,R12; \ - \ - XORL R13, R13; \ - XORL R14, R14; \ - MOVQ 40+x, CX; \ - MOVQ CX, AX; ADDQ R15, CX; MOVQ $0, R15; ADCQ $0, R15; \ - ;;;;;;;;;;;;;; MULQ CX; ADDQ AX, R11; ADCQ $0, DX; MOVQ R11, 80+z; \ - MOVQ R15, AX; NEGQ AX; ANDQ 40+x,AX; ADDQ AX, DX; ADCQ $0, R13; MOVQ DX, R8; \ - ADDQ 40+x, CX; ADCQ $0, R15; \ - MOVQ 48+x, AX; MULQ CX; ADDQ AX, R12; ADCQ $0, DX; ADDQ R8, R12; ADCQ $0, DX; MOVQ DX, R8; MOVQ R12, 88+z; \ - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ADDQ R8, R13; ADCQ $0,R14; \ - \ - XORL R9, R9; \ - MOVQ 48+x, CX; \ - MOVQ CX, AX; ADDQ R15, CX; MOVQ $0, R15; ADCQ $0, R15; \ - ;;;;;;;;;;;;;; MULQ CX; ADDQ AX, R13; ADCQ $0, DX; MOVQ R13, 96+z; \ - MOVQ R15, AX; NEGQ AX; ANDQ 48+x,AX; ADDQ AX, DX; ADCQ $0, R9; MOVQ DX, R8; \ - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ADDQ R8,R14; ADCQ $0, R9; MOVQ R14, 104+z; - - -// integerSqrAdx squares x and stores in z -// Uses: AX, CX, DX, R8-R15, FLAGS -// Instr: x86_64, bmi2, adx -#define integerSqrAdx(z,x) \ - XORL R15, R15; \ - MOVQ 0+x, DX; \ - ;;;;;;;;;;;;;; MULXQ DX, AX, R8; MOVQ AX, 0+z; \ - ADDQ DX, DX; ADCQ $0, R15; CLC; \ - MULXQ 8+x, AX, R9; ADCXQ AX, R8; MOVQ R8, 8+z; \ - MULXQ 16+x, AX, R10; ADCXQ AX, R9; MOVQ $0, R8;\ - MULXQ 24+x, AX, R11; ADCXQ AX, R10; \ - MULXQ 32+x, AX, R12; ADCXQ AX, R11; \ - MULXQ 40+x, AX, R13; ADCXQ AX, R12; \ - MULXQ 48+x, AX, R14; ADCXQ AX, R13; \ - ;;;;;;;;;;;;;;;;;;;; ADCXQ R8, R14; \ - \ - MOVQ 8+x, DX; \ - MOVQ DX, AX; ADDQ R15, DX; MOVQ $0, R15; ADCQ $0, R15; \ - MULXQ AX, AX, CX; \ - MOVQ R15, R8; NEGQ R8; ANDQ 8+x, R8; \ - ADDQ AX, R9; MOVQ R9, 16+z; \ - ADCQ CX, R8; \ - ADCQ $0, R11; \ - ADDQ 8+x, DX; \ - ADCQ $0, R15; \ - XORL R9, R9; ;;;;;;;;;;;;;;;;;;;;; ADOXQ R8, R10; \ - MULXQ 16+x, AX, CX; ADCXQ AX, R10; ADOXQ CX, R11; MOVQ R10, 24+z; \ - MULXQ 24+x, AX, CX; ADCXQ AX, R11; ADOXQ CX, R12; MOVQ $0, R10; \ - MULXQ 32+x, AX, CX; ADCXQ AX, R12; ADOXQ CX, R13; \ - MULXQ 40+x, AX, CX; ADCXQ AX, R13; ADOXQ CX, R14; \ - MULXQ 48+x, AX, CX; ADCXQ AX, R14; ADOXQ CX, R9; \ - ;;;;;;;;;;;;;;;;;;; ADCXQ R10, R9; \ - \ - MOVQ 16+x, DX; \ - MOVQ DX, AX; ADDQ R15, DX; MOVQ $0, R15; ADCQ $0, R15; \ - MULXQ AX, AX, CX; \ - MOVQ R15, R8; NEGQ R8; ANDQ 16+x, R8; \ - ADDQ AX, R11; MOVQ R11, 32+z; \ - ADCQ CX, R8; \ - ADCQ $0, R13; \ - ADDQ 16+x, DX; \ - ADCQ $0, R15; \ - XORL R11, R11; ;;;;;;;;;;;;;;;;;;; ADOXQ R8, R12; \ - MULXQ 24+x, AX, CX; ADCXQ AX, R12; ADOXQ CX, R13; MOVQ R12, 40+z; \ - MULXQ 32+x, AX, CX; ADCXQ AX, R13; ADOXQ CX, R14; MOVQ $0, R12; \ - MULXQ 40+x, AX, CX; ADCXQ AX, R14; ADOXQ CX, R9; \ - MULXQ 48+x, AX, CX; ADCXQ AX, R9; ADOXQ CX, R10; \ - ;;;;;;;;;;;;;;;;;;; ADCXQ R11,R10; \ - \ - MOVQ 24+x, DX; \ - MOVQ DX, AX; ADDQ R15, DX; MOVQ $0, R15; ADCQ $0, R15; \ - MULXQ AX, AX, CX; \ - MOVQ R15, R8; NEGQ R8; ANDQ 24+x, R8; \ - ADDQ AX, R13; MOVQ R13, 48+z; \ - ADCQ CX, R8; \ - ADCQ $0, R9; \ - ADDQ 24+x, DX; \ - ADCQ $0, R15; \ - XORL R13, R13; ;;;;;;;;;;;;;;;;;;; ADOXQ R8, R14; \ - MULXQ 32+x, AX, CX; ADCXQ AX, R14; ADOXQ CX, R9; MOVQ R14, 56+z; \ - MULXQ 40+x, AX, CX; ADCXQ AX, R9; ADOXQ CX, R10; MOVQ $0, R14; \ - MULXQ 48+x, AX, CX; ADCXQ AX, R10; ADOXQ CX, R11; \ - ;;;;;;;;;;;;;;;;;;; ADCXQ R12,R11; \ - \ - MOVQ 32+x, DX; \ - MOVQ DX, AX; ADDQ R15, DX; MOVQ $0, R15; ADCQ $0, R15; \ - MULXQ AX, AX, CX; \ - MOVQ R15, R8; NEGQ R8; ANDQ 32+x, R8; \ - ADDQ AX, R9; MOVQ R9, 64+z; \ - ADCQ CX, R8; \ - ADCQ $0, R11; \ - ADDQ 32+x, DX; \ - ADCQ $0, R15; \ - XORL R9, R9; ;;;;;;;;;;;;;;;;;;;;; ADOXQ R8, R10; \ - MULXQ 40+x, AX, CX; ADCXQ AX, R10; ADOXQ CX, R11; MOVQ R10, 72+z; \ - MULXQ 48+x, AX, CX; ADCXQ AX, R11; ADOXQ CX, R12; \ - ;;;;;;;;;;;;;;;;;;; ADCXQ R13,R12; \ - \ - MOVQ 40+x, DX; \ - MOVQ DX, AX; ADDQ R15, DX; MOVQ $0, R15; ADCQ $0, R15; \ - MULXQ AX, AX, CX; \ - MOVQ R15, R8; NEGQ R8; ANDQ 40+x, R8; \ - ADDQ AX, R11; MOVQ R11, 80+z; \ - ADCQ CX, R8; \ - ADCQ $0, R13; \ - ADDQ 40+x, DX; \ - ADCQ $0, R15; \ - XORL R11, R11; ;;;;;;;;;;;;;;;;;;; ADOXQ R8, R12; \ - MULXQ 48+x, AX, CX; ADCXQ AX, R12; ADOXQ CX, R13; MOVQ R12, 88+z; \ - ;;;;;;;;;;;;;;;;;;; ADCXQ R14,R13; \ - \ - MOVQ 48+x, DX; \ - MOVQ DX, AX; ADDQ R15, DX; MOVQ $0, R15; ADCQ $0, R15; \ - MULXQ AX, AX, CX; \ - MOVQ R15, R8; NEGQ R8; ANDQ 48+x, R8; \ - XORL R10, R10; ;;;;;;;;;;;;;; ADOXQ CX, R14; \ - ;;;;;;;;;;;;;; ADCXQ AX, R13; ;;;;;;;;;;;;;; MOVQ R13, 96+z; \ - ;;;;;;;;;;;;;; ADCXQ R8, R14; MOVQ R14, 104+z; - -// reduceFromDoubleLeg finds a z=x modulo p such that z<2^448 and stores in z -// Uses: AX, R8-R15, FLAGS -// Instr: x86_64 -#define reduceFromDoubleLeg(z,x) \ - /* ( ,2C13,2C12,2C11,2C10|C10,C9,C8, C7) + (C6,...,C0) */ \ - /* (r14, r13, r12, r11, r10,r9,r8,r15) */ \ - MOVQ 80+x,AX; MOVQ AX,R10; \ - MOVQ $0xFFFFFFFF00000000, R8; \ - ANDQ R8,R10; \ - \ - MOVQ $0,R14; \ - MOVQ 104+x,R13; SHLQ $1,R13,R14; \ - MOVQ 96+x,R12; SHLQ $1,R12,R13; \ - MOVQ 88+x,R11; SHLQ $1,R11,R12; \ - MOVQ 72+x, R9; SHLQ $1,R10,R11; \ - MOVQ 64+x, R8; SHLQ $1,R10; \ - MOVQ $0xFFFFFFFF,R15; ANDQ R15,AX; ORQ AX,R10; \ - MOVQ 56+x,R15; \ - \ - ADDQ 0+x,R15; MOVQ R15, 0+z; MOVQ 56+x,R15; \ - ADCQ 8+x, R8; MOVQ R8, 8+z; MOVQ 64+x, R8; \ - ADCQ 16+x, R9; MOVQ R9,16+z; MOVQ 72+x, R9; \ - ADCQ 24+x,R10; MOVQ R10,24+z; MOVQ 80+x,R10; \ - ADCQ 32+x,R11; MOVQ R11,32+z; MOVQ 88+x,R11; \ - ADCQ 40+x,R12; MOVQ R12,40+z; MOVQ 96+x,R12; \ - ADCQ 48+x,R13; MOVQ R13,48+z; MOVQ 104+x,R13; \ - ADCQ $0,R14; \ - /* (c10c9,c9c8,c8c7,c7c13,c13c12,c12c11,c11c10) + (c6,...,c0) */ \ - /* ( r9, r8, r15, r13, r12, r11, r10) */ \ - MOVQ R10, AX; \ - SHRQ $32,R11,R10; \ - SHRQ $32,R12,R11; \ - SHRQ $32,R13,R12; \ - SHRQ $32,R15,R13; \ - SHRQ $32, R8,R15; \ - SHRQ $32, R9, R8; \ - SHRQ $32, AX, R9; \ - \ - ADDQ 0+z,R10; \ - ADCQ 8+z,R11; \ - ADCQ 16+z,R12; \ - ADCQ 24+z,R13; \ - ADCQ 32+z,R15; \ - ADCQ 40+z, R8; \ - ADCQ 48+z, R9; \ - ADCQ $0,R14; \ - /* ( c7) + (c6,...,c0) */ \ - /* (r14) */ \ - MOVQ R14, AX; SHLQ $32, AX; \ - ADDQ R14,R10; MOVQ $0,R14; \ - ADCQ $0,R11; \ - ADCQ $0,R12; \ - ADCQ AX,R13; \ - ADCQ $0,R15; \ - ADCQ $0, R8; \ - ADCQ $0, R9; \ - ADCQ $0,R14; \ - /* ( c7) + (c6,...,c0) */ \ - /* (r14) */ \ - MOVQ R14, AX; SHLQ $32,AX; \ - ADDQ R14,R10; MOVQ R10, 0+z; \ - ADCQ $0,R11; MOVQ R11, 8+z; \ - ADCQ $0,R12; MOVQ R12,16+z; \ - ADCQ AX,R13; MOVQ R13,24+z; \ - ADCQ $0,R15; MOVQ R15,32+z; \ - ADCQ $0, R8; MOVQ R8,40+z; \ - ADCQ $0, R9; MOVQ R9,48+z; - -// reduceFromDoubleAdx finds a z=x modulo p such that z<2^448 and stores in z -// Uses: AX, R8-R15, FLAGS -// Instr: x86_64, adx -#define reduceFromDoubleAdx(z,x) \ - /* ( ,2C13,2C12,2C11,2C10|C10,C9,C8, C7) + (C6,...,C0) */ \ - /* (r14, r13, r12, r11, r10,r9,r8,r15) */ \ - MOVQ 80+x,AX; MOVQ AX,R10; \ - MOVQ $0xFFFFFFFF00000000, R8; \ - ANDQ R8,R10; \ - \ - MOVQ $0,R14; \ - MOVQ 104+x,R13; SHLQ $1,R13,R14; \ - MOVQ 96+x,R12; SHLQ $1,R12,R13; \ - MOVQ 88+x,R11; SHLQ $1,R11,R12; \ - MOVQ 72+x, R9; SHLQ $1,R10,R11; \ - MOVQ 64+x, R8; SHLQ $1,R10; \ - MOVQ $0xFFFFFFFF,R15; ANDQ R15,AX; ORQ AX,R10; \ - MOVQ 56+x,R15; \ - \ - XORL AX,AX; \ - ADCXQ 0+x,R15; MOVQ R15, 0+z; MOVQ 56+x,R15; \ - ADCXQ 8+x, R8; MOVQ R8, 8+z; MOVQ 64+x, R8; \ - ADCXQ 16+x, R9; MOVQ R9,16+z; MOVQ 72+x, R9; \ - ADCXQ 24+x,R10; MOVQ R10,24+z; MOVQ 80+x,R10; \ - ADCXQ 32+x,R11; MOVQ R11,32+z; MOVQ 88+x,R11; \ - ADCXQ 40+x,R12; MOVQ R12,40+z; MOVQ 96+x,R12; \ - ADCXQ 48+x,R13; MOVQ R13,48+z; MOVQ 104+x,R13; \ - ADCXQ AX,R14; \ - /* (c10c9,c9c8,c8c7,c7c13,c13c12,c12c11,c11c10) + (c6,...,c0) */ \ - /* ( r9, r8, r15, r13, r12, r11, r10) */ \ - MOVQ R10, AX; \ - SHRQ $32,R11,R10; \ - SHRQ $32,R12,R11; \ - SHRQ $32,R13,R12; \ - SHRQ $32,R15,R13; \ - SHRQ $32, R8,R15; \ - SHRQ $32, R9, R8; \ - SHRQ $32, AX, R9; \ - \ - XORL AX,AX; \ - ADCXQ 0+z,R10; \ - ADCXQ 8+z,R11; \ - ADCXQ 16+z,R12; \ - ADCXQ 24+z,R13; \ - ADCXQ 32+z,R15; \ - ADCXQ 40+z, R8; \ - ADCXQ 48+z, R9; \ - ADCXQ AX,R14; \ - /* ( c7) + (c6,...,c0) */ \ - /* (r14) */ \ - MOVQ R14, AX; SHLQ $32, AX; \ - CLC; \ - ADCXQ R14,R10; MOVQ $0,R14; \ - ADCXQ R14,R11; \ - ADCXQ R14,R12; \ - ADCXQ AX,R13; \ - ADCXQ R14,R15; \ - ADCXQ R14, R8; \ - ADCXQ R14, R9; \ - ADCXQ R14,R14; \ - /* ( c7) + (c6,...,c0) */ \ - /* (r14) */ \ - MOVQ R14, AX; SHLQ $32, AX; \ - CLC; \ - ADCXQ R14,R10; MOVQ R10, 0+z; MOVQ $0,R14; \ - ADCXQ R14,R11; MOVQ R11, 8+z; \ - ADCXQ R14,R12; MOVQ R12,16+z; \ - ADCXQ AX,R13; MOVQ R13,24+z; \ - ADCXQ R14,R15; MOVQ R15,32+z; \ - ADCXQ R14, R8; MOVQ R8,40+z; \ - ADCXQ R14, R9; MOVQ R9,48+z; - -// addSub calculates two operations: x,y = x+y,x-y -// Uses: AX, DX, R8-R15, FLAGS -#define addSub(x,y) \ - MOVQ 0+x, R8; ADDQ 0+y, R8; \ - MOVQ 8+x, R9; ADCQ 8+y, R9; \ - MOVQ 16+x, R10; ADCQ 16+y, R10; \ - MOVQ 24+x, R11; ADCQ 24+y, R11; \ - MOVQ 32+x, R12; ADCQ 32+y, R12; \ - MOVQ 40+x, R13; ADCQ 40+y, R13; \ - MOVQ 48+x, R14; ADCQ 48+y, R14; \ - MOVQ $0, AX; ADCQ $0, AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - ADDQ AX, R8; MOVQ $0, AX; \ - ADCQ $0, R9; \ - ADCQ $0, R10; \ - ADCQ DX, R11; \ - ADCQ $0, R12; \ - ADCQ $0, R13; \ - ADCQ $0, R14; \ - ADCQ $0, AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - ADDQ AX, R8; MOVQ 0+x,AX; MOVQ R8, 0+x; MOVQ AX, R8; \ - ADCQ $0, R9; MOVQ 8+x,AX; MOVQ R9, 8+x; MOVQ AX, R9; \ - ADCQ $0, R10; MOVQ 16+x,AX; MOVQ R10, 16+x; MOVQ AX, R10; \ - ADCQ DX, R11; MOVQ 24+x,AX; MOVQ R11, 24+x; MOVQ AX, R11; \ - ADCQ $0, R12; MOVQ 32+x,AX; MOVQ R12, 32+x; MOVQ AX, R12; \ - ADCQ $0, R13; MOVQ 40+x,AX; MOVQ R13, 40+x; MOVQ AX, R13; \ - ADCQ $0, R14; MOVQ 48+x,AX; MOVQ R14, 48+x; MOVQ AX, R14; \ - SUBQ 0+y, R8; \ - SBBQ 8+y, R9; \ - SBBQ 16+y, R10; \ - SBBQ 24+y, R11; \ - SBBQ 32+y, R12; \ - SBBQ 40+y, R13; \ - SBBQ 48+y, R14; \ - MOVQ $0, AX; SETCS AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - SUBQ AX, R8; MOVQ $0, AX; \ - SBBQ $0, R9; \ - SBBQ $0, R10; \ - SBBQ DX, R11; \ - SBBQ $0, R12; \ - SBBQ $0, R13; \ - SBBQ $0, R14; \ - SETCS AX; \ - MOVQ AX, DX; \ - SHLQ $32, DX; \ - SUBQ AX, R8; MOVQ R8, 0+y; \ - SBBQ $0, R9; MOVQ R9, 8+y; \ - SBBQ $0, R10; MOVQ R10, 16+y; \ - SBBQ DX, R11; MOVQ R11, 24+y; \ - SBBQ $0, R12; MOVQ R12, 32+y; \ - SBBQ $0, R13; MOVQ R13, 40+y; \ - SBBQ $0, R14; MOVQ R14, 48+y; diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.s b/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.s deleted file mode 100644 index 3f1f07c98..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fp_amd64.s +++ /dev/null @@ -1,75 +0,0 @@ -//go:build amd64 && !purego -// +build amd64,!purego - -#include "textflag.h" -#include "fp_amd64.h" - -// func cmovAmd64(x, y *Elt, n uint) -TEXT ·cmovAmd64(SB),NOSPLIT,$0-24 - MOVQ x+0(FP), DI - MOVQ y+8(FP), SI - MOVQ n+16(FP), BX - cselect(0(DI),0(SI),BX) - RET - -// func cswapAmd64(x, y *Elt, n uint) -TEXT ·cswapAmd64(SB),NOSPLIT,$0-24 - MOVQ x+0(FP), DI - MOVQ y+8(FP), SI - MOVQ n+16(FP), BX - cswap(0(DI),0(SI),BX) - RET - -// func subAmd64(z, x, y *Elt) -TEXT ·subAmd64(SB),NOSPLIT,$0-24 - MOVQ z+0(FP), DI - MOVQ x+8(FP), SI - MOVQ y+16(FP), BX - subtraction(0(DI),0(SI),0(BX)) - RET - -// func addsubAmd64(x, y *Elt) -TEXT ·addsubAmd64(SB),NOSPLIT,$0-16 - MOVQ x+0(FP), DI - MOVQ y+8(FP), SI - addSub(0(DI),0(SI)) - RET - -#define addLegacy \ - additionLeg(0(DI),0(SI),0(BX)) -#define addBmi2Adx \ - additionAdx(0(DI),0(SI),0(BX)) - -#define mulLegacy \ - integerMulLeg(0(SP),0(SI),0(BX)) \ - reduceFromDoubleLeg(0(DI),0(SP)) -#define mulBmi2Adx \ - integerMulAdx(0(SP),0(SI),0(BX)) \ - reduceFromDoubleAdx(0(DI),0(SP)) - -#define sqrLegacy \ - integerSqrLeg(0(SP),0(SI)) \ - reduceFromDoubleLeg(0(DI),0(SP)) -#define sqrBmi2Adx \ - integerSqrAdx(0(SP),0(SI)) \ - reduceFromDoubleAdx(0(DI),0(SP)) - -// func addAmd64(z, x, y *Elt) -TEXT ·addAmd64(SB),NOSPLIT,$0-24 - MOVQ z+0(FP), DI - MOVQ x+8(FP), SI - MOVQ y+16(FP), BX - CHECK_BMI2ADX(LADD, addLegacy, addBmi2Adx) - -// func mulAmd64(z, x, y *Elt) -TEXT ·mulAmd64(SB),NOSPLIT,$112-24 - MOVQ z+0(FP), DI - MOVQ x+8(FP), SI - MOVQ y+16(FP), BX - CHECK_BMI2ADX(LMUL, mulLegacy, mulBmi2Adx) - -// func sqrAmd64(z, x *Elt) -TEXT ·sqrAmd64(SB),NOSPLIT,$112-16 - MOVQ z+0(FP), DI - MOVQ x+8(FP), SI - CHECK_BMI2ADX(LSQR, sqrLegacy, sqrBmi2Adx) diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fp_generic.go b/vendor/github.com/cloudflare/circl/math/fp448/fp_generic.go deleted file mode 100644 index 47a0b6320..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fp_generic.go +++ /dev/null @@ -1,339 +0,0 @@ -package fp448 - -import ( - "encoding/binary" - "math/bits" -) - -func cmovGeneric(x, y *Elt, n uint) { - m := -uint64(n & 0x1) - x0 := binary.LittleEndian.Uint64(x[0*8 : 1*8]) - x1 := binary.LittleEndian.Uint64(x[1*8 : 2*8]) - x2 := binary.LittleEndian.Uint64(x[2*8 : 3*8]) - x3 := binary.LittleEndian.Uint64(x[3*8 : 4*8]) - x4 := binary.LittleEndian.Uint64(x[4*8 : 5*8]) - x5 := binary.LittleEndian.Uint64(x[5*8 : 6*8]) - x6 := binary.LittleEndian.Uint64(x[6*8 : 7*8]) - - y0 := binary.LittleEndian.Uint64(y[0*8 : 1*8]) - y1 := binary.LittleEndian.Uint64(y[1*8 : 2*8]) - y2 := binary.LittleEndian.Uint64(y[2*8 : 3*8]) - y3 := binary.LittleEndian.Uint64(y[3*8 : 4*8]) - y4 := binary.LittleEndian.Uint64(y[4*8 : 5*8]) - y5 := binary.LittleEndian.Uint64(y[5*8 : 6*8]) - y6 := binary.LittleEndian.Uint64(y[6*8 : 7*8]) - - x0 = (x0 &^ m) | (y0 & m) - x1 = (x1 &^ m) | (y1 & m) - x2 = (x2 &^ m) | (y2 & m) - x3 = (x3 &^ m) | (y3 & m) - x4 = (x4 &^ m) | (y4 & m) - x5 = (x5 &^ m) | (y5 & m) - x6 = (x6 &^ m) | (y6 & m) - - binary.LittleEndian.PutUint64(x[0*8:1*8], x0) - binary.LittleEndian.PutUint64(x[1*8:2*8], x1) - binary.LittleEndian.PutUint64(x[2*8:3*8], x2) - binary.LittleEndian.PutUint64(x[3*8:4*8], x3) - binary.LittleEndian.PutUint64(x[4*8:5*8], x4) - binary.LittleEndian.PutUint64(x[5*8:6*8], x5) - binary.LittleEndian.PutUint64(x[6*8:7*8], x6) -} - -func cswapGeneric(x, y *Elt, n uint) { - m := -uint64(n & 0x1) - x0 := binary.LittleEndian.Uint64(x[0*8 : 1*8]) - x1 := binary.LittleEndian.Uint64(x[1*8 : 2*8]) - x2 := binary.LittleEndian.Uint64(x[2*8 : 3*8]) - x3 := binary.LittleEndian.Uint64(x[3*8 : 4*8]) - x4 := binary.LittleEndian.Uint64(x[4*8 : 5*8]) - x5 := binary.LittleEndian.Uint64(x[5*8 : 6*8]) - x6 := binary.LittleEndian.Uint64(x[6*8 : 7*8]) - - y0 := binary.LittleEndian.Uint64(y[0*8 : 1*8]) - y1 := binary.LittleEndian.Uint64(y[1*8 : 2*8]) - y2 := binary.LittleEndian.Uint64(y[2*8 : 3*8]) - y3 := binary.LittleEndian.Uint64(y[3*8 : 4*8]) - y4 := binary.LittleEndian.Uint64(y[4*8 : 5*8]) - y5 := binary.LittleEndian.Uint64(y[5*8 : 6*8]) - y6 := binary.LittleEndian.Uint64(y[6*8 : 7*8]) - - t0 := m & (x0 ^ y0) - t1 := m & (x1 ^ y1) - t2 := m & (x2 ^ y2) - t3 := m & (x3 ^ y3) - t4 := m & (x4 ^ y4) - t5 := m & (x5 ^ y5) - t6 := m & (x6 ^ y6) - x0 ^= t0 - x1 ^= t1 - x2 ^= t2 - x3 ^= t3 - x4 ^= t4 - x5 ^= t5 - x6 ^= t6 - y0 ^= t0 - y1 ^= t1 - y2 ^= t2 - y3 ^= t3 - y4 ^= t4 - y5 ^= t5 - y6 ^= t6 - - binary.LittleEndian.PutUint64(x[0*8:1*8], x0) - binary.LittleEndian.PutUint64(x[1*8:2*8], x1) - binary.LittleEndian.PutUint64(x[2*8:3*8], x2) - binary.LittleEndian.PutUint64(x[3*8:4*8], x3) - binary.LittleEndian.PutUint64(x[4*8:5*8], x4) - binary.LittleEndian.PutUint64(x[5*8:6*8], x5) - binary.LittleEndian.PutUint64(x[6*8:7*8], x6) - - binary.LittleEndian.PutUint64(y[0*8:1*8], y0) - binary.LittleEndian.PutUint64(y[1*8:2*8], y1) - binary.LittleEndian.PutUint64(y[2*8:3*8], y2) - binary.LittleEndian.PutUint64(y[3*8:4*8], y3) - binary.LittleEndian.PutUint64(y[4*8:5*8], y4) - binary.LittleEndian.PutUint64(y[5*8:6*8], y5) - binary.LittleEndian.PutUint64(y[6*8:7*8], y6) -} - -func addGeneric(z, x, y *Elt) { - x0 := binary.LittleEndian.Uint64(x[0*8 : 1*8]) - x1 := binary.LittleEndian.Uint64(x[1*8 : 2*8]) - x2 := binary.LittleEndian.Uint64(x[2*8 : 3*8]) - x3 := binary.LittleEndian.Uint64(x[3*8 : 4*8]) - x4 := binary.LittleEndian.Uint64(x[4*8 : 5*8]) - x5 := binary.LittleEndian.Uint64(x[5*8 : 6*8]) - x6 := binary.LittleEndian.Uint64(x[6*8 : 7*8]) - - y0 := binary.LittleEndian.Uint64(y[0*8 : 1*8]) - y1 := binary.LittleEndian.Uint64(y[1*8 : 2*8]) - y2 := binary.LittleEndian.Uint64(y[2*8 : 3*8]) - y3 := binary.LittleEndian.Uint64(y[3*8 : 4*8]) - y4 := binary.LittleEndian.Uint64(y[4*8 : 5*8]) - y5 := binary.LittleEndian.Uint64(y[5*8 : 6*8]) - y6 := binary.LittleEndian.Uint64(y[6*8 : 7*8]) - - z0, c0 := bits.Add64(x0, y0, 0) - z1, c1 := bits.Add64(x1, y1, c0) - z2, c2 := bits.Add64(x2, y2, c1) - z3, c3 := bits.Add64(x3, y3, c2) - z4, c4 := bits.Add64(x4, y4, c3) - z5, c5 := bits.Add64(x5, y5, c4) - z6, z7 := bits.Add64(x6, y6, c5) - - z0, c0 = bits.Add64(z0, z7, 0) - z1, c1 = bits.Add64(z1, 0, c0) - z2, c2 = bits.Add64(z2, 0, c1) - z3, c3 = bits.Add64(z3, z7<<32, c2) - z4, c4 = bits.Add64(z4, 0, c3) - z5, c5 = bits.Add64(z5, 0, c4) - z6, z7 = bits.Add64(z6, 0, c5) - - z0, c0 = bits.Add64(z0, z7, 0) - z1, c1 = bits.Add64(z1, 0, c0) - z2, c2 = bits.Add64(z2, 0, c1) - z3, c3 = bits.Add64(z3, z7<<32, c2) - z4, c4 = bits.Add64(z4, 0, c3) - z5, c5 = bits.Add64(z5, 0, c4) - z6, _ = bits.Add64(z6, 0, c5) - - binary.LittleEndian.PutUint64(z[0*8:1*8], z0) - binary.LittleEndian.PutUint64(z[1*8:2*8], z1) - binary.LittleEndian.PutUint64(z[2*8:3*8], z2) - binary.LittleEndian.PutUint64(z[3*8:4*8], z3) - binary.LittleEndian.PutUint64(z[4*8:5*8], z4) - binary.LittleEndian.PutUint64(z[5*8:6*8], z5) - binary.LittleEndian.PutUint64(z[6*8:7*8], z6) -} - -func subGeneric(z, x, y *Elt) { - x0 := binary.LittleEndian.Uint64(x[0*8 : 1*8]) - x1 := binary.LittleEndian.Uint64(x[1*8 : 2*8]) - x2 := binary.LittleEndian.Uint64(x[2*8 : 3*8]) - x3 := binary.LittleEndian.Uint64(x[3*8 : 4*8]) - x4 := binary.LittleEndian.Uint64(x[4*8 : 5*8]) - x5 := binary.LittleEndian.Uint64(x[5*8 : 6*8]) - x6 := binary.LittleEndian.Uint64(x[6*8 : 7*8]) - - y0 := binary.LittleEndian.Uint64(y[0*8 : 1*8]) - y1 := binary.LittleEndian.Uint64(y[1*8 : 2*8]) - y2 := binary.LittleEndian.Uint64(y[2*8 : 3*8]) - y3 := binary.LittleEndian.Uint64(y[3*8 : 4*8]) - y4 := binary.LittleEndian.Uint64(y[4*8 : 5*8]) - y5 := binary.LittleEndian.Uint64(y[5*8 : 6*8]) - y6 := binary.LittleEndian.Uint64(y[6*8 : 7*8]) - - z0, c0 := bits.Sub64(x0, y0, 0) - z1, c1 := bits.Sub64(x1, y1, c0) - z2, c2 := bits.Sub64(x2, y2, c1) - z3, c3 := bits.Sub64(x3, y3, c2) - z4, c4 := bits.Sub64(x4, y4, c3) - z5, c5 := bits.Sub64(x5, y5, c4) - z6, z7 := bits.Sub64(x6, y6, c5) - - z0, c0 = bits.Sub64(z0, z7, 0) - z1, c1 = bits.Sub64(z1, 0, c0) - z2, c2 = bits.Sub64(z2, 0, c1) - z3, c3 = bits.Sub64(z3, z7<<32, c2) - z4, c4 = bits.Sub64(z4, 0, c3) - z5, c5 = bits.Sub64(z5, 0, c4) - z6, z7 = bits.Sub64(z6, 0, c5) - - z0, c0 = bits.Sub64(z0, z7, 0) - z1, c1 = bits.Sub64(z1, 0, c0) - z2, c2 = bits.Sub64(z2, 0, c1) - z3, c3 = bits.Sub64(z3, z7<<32, c2) - z4, c4 = bits.Sub64(z4, 0, c3) - z5, c5 = bits.Sub64(z5, 0, c4) - z6, _ = bits.Sub64(z6, 0, c5) - - binary.LittleEndian.PutUint64(z[0*8:1*8], z0) - binary.LittleEndian.PutUint64(z[1*8:2*8], z1) - binary.LittleEndian.PutUint64(z[2*8:3*8], z2) - binary.LittleEndian.PutUint64(z[3*8:4*8], z3) - binary.LittleEndian.PutUint64(z[4*8:5*8], z4) - binary.LittleEndian.PutUint64(z[5*8:6*8], z5) - binary.LittleEndian.PutUint64(z[6*8:7*8], z6) -} - -func addsubGeneric(x, y *Elt) { - z := &Elt{} - addGeneric(z, x, y) - subGeneric(y, x, y) - *x = *z -} - -func mulGeneric(z, x, y *Elt) { - x0 := binary.LittleEndian.Uint64(x[0*8 : 1*8]) - x1 := binary.LittleEndian.Uint64(x[1*8 : 2*8]) - x2 := binary.LittleEndian.Uint64(x[2*8 : 3*8]) - x3 := binary.LittleEndian.Uint64(x[3*8 : 4*8]) - x4 := binary.LittleEndian.Uint64(x[4*8 : 5*8]) - x5 := binary.LittleEndian.Uint64(x[5*8 : 6*8]) - x6 := binary.LittleEndian.Uint64(x[6*8 : 7*8]) - - y0 := binary.LittleEndian.Uint64(y[0*8 : 1*8]) - y1 := binary.LittleEndian.Uint64(y[1*8 : 2*8]) - y2 := binary.LittleEndian.Uint64(y[2*8 : 3*8]) - y3 := binary.LittleEndian.Uint64(y[3*8 : 4*8]) - y4 := binary.LittleEndian.Uint64(y[4*8 : 5*8]) - y5 := binary.LittleEndian.Uint64(y[5*8 : 6*8]) - y6 := binary.LittleEndian.Uint64(y[6*8 : 7*8]) - - yy := [7]uint64{y0, y1, y2, y3, y4, y5, y6} - zz := [7]uint64{} - - yi := yy[0] - h0, l0 := bits.Mul64(x0, yi) - h1, l1 := bits.Mul64(x1, yi) - h2, l2 := bits.Mul64(x2, yi) - h3, l3 := bits.Mul64(x3, yi) - h4, l4 := bits.Mul64(x4, yi) - h5, l5 := bits.Mul64(x5, yi) - h6, l6 := bits.Mul64(x6, yi) - - zz[0] = l0 - a0, c0 := bits.Add64(h0, l1, 0) - a1, c1 := bits.Add64(h1, l2, c0) - a2, c2 := bits.Add64(h2, l3, c1) - a3, c3 := bits.Add64(h3, l4, c2) - a4, c4 := bits.Add64(h4, l5, c3) - a5, c5 := bits.Add64(h5, l6, c4) - a6, _ := bits.Add64(h6, 0, c5) - - for i := 1; i < 7; i++ { - yi = yy[i] - h0, l0 = bits.Mul64(x0, yi) - h1, l1 = bits.Mul64(x1, yi) - h2, l2 = bits.Mul64(x2, yi) - h3, l3 = bits.Mul64(x3, yi) - h4, l4 = bits.Mul64(x4, yi) - h5, l5 = bits.Mul64(x5, yi) - h6, l6 = bits.Mul64(x6, yi) - - zz[i], c0 = bits.Add64(a0, l0, 0) - a0, c1 = bits.Add64(a1, l1, c0) - a1, c2 = bits.Add64(a2, l2, c1) - a2, c3 = bits.Add64(a3, l3, c2) - a3, c4 = bits.Add64(a4, l4, c3) - a4, c5 = bits.Add64(a5, l5, c4) - a5, a6 = bits.Add64(a6, l6, c5) - - a0, c0 = bits.Add64(a0, h0, 0) - a1, c1 = bits.Add64(a1, h1, c0) - a2, c2 = bits.Add64(a2, h2, c1) - a3, c3 = bits.Add64(a3, h3, c2) - a4, c4 = bits.Add64(a4, h4, c3) - a5, c5 = bits.Add64(a5, h5, c4) - a6, _ = bits.Add64(a6, h6, c5) - } - red64(z, &zz, &[7]uint64{a0, a1, a2, a3, a4, a5, a6}) -} - -func sqrGeneric(z, x *Elt) { mulGeneric(z, x, x) } - -func red64(z *Elt, l, h *[7]uint64) { - /* (2C13, 2C12, 2C11, 2C10|C10, C9, C8, C7) + (C6,...,C0) */ - h0 := h[0] - h1 := h[1] - h2 := h[2] - h3 := ((h[3] & (0xFFFFFFFF << 32)) << 1) | (h[3] & 0xFFFFFFFF) - h4 := (h[3] >> 63) | (h[4] << 1) - h5 := (h[4] >> 63) | (h[5] << 1) - h6 := (h[5] >> 63) | (h[6] << 1) - h7 := (h[6] >> 63) - - l0, c0 := bits.Add64(h0, l[0], 0) - l1, c1 := bits.Add64(h1, l[1], c0) - l2, c2 := bits.Add64(h2, l[2], c1) - l3, c3 := bits.Add64(h3, l[3], c2) - l4, c4 := bits.Add64(h4, l[4], c3) - l5, c5 := bits.Add64(h5, l[5], c4) - l6, c6 := bits.Add64(h6, l[6], c5) - l7, _ := bits.Add64(h7, 0, c6) - - /* (C10C9, C9C8,C8C7,C7C13,C13C12,C12C11,C11C10) + (C6,...,C0) */ - h0 = (h[3] >> 32) | (h[4] << 32) - h1 = (h[4] >> 32) | (h[5] << 32) - h2 = (h[5] >> 32) | (h[6] << 32) - h3 = (h[6] >> 32) | (h[0] << 32) - h4 = (h[0] >> 32) | (h[1] << 32) - h5 = (h[1] >> 32) | (h[2] << 32) - h6 = (h[2] >> 32) | (h[3] << 32) - - l0, c0 = bits.Add64(l0, h0, 0) - l1, c1 = bits.Add64(l1, h1, c0) - l2, c2 = bits.Add64(l2, h2, c1) - l3, c3 = bits.Add64(l3, h3, c2) - l4, c4 = bits.Add64(l4, h4, c3) - l5, c5 = bits.Add64(l5, h5, c4) - l6, c6 = bits.Add64(l6, h6, c5) - l7, _ = bits.Add64(l7, 0, c6) - - /* (C7) + (C6,...,C0) */ - l0, c0 = bits.Add64(l0, l7, 0) - l1, c1 = bits.Add64(l1, 0, c0) - l2, c2 = bits.Add64(l2, 0, c1) - l3, c3 = bits.Add64(l3, l7<<32, c2) - l4, c4 = bits.Add64(l4, 0, c3) - l5, c5 = bits.Add64(l5, 0, c4) - l6, l7 = bits.Add64(l6, 0, c5) - - /* (C7) + (C6,...,C0) */ - l0, c0 = bits.Add64(l0, l7, 0) - l1, c1 = bits.Add64(l1, 0, c0) - l2, c2 = bits.Add64(l2, 0, c1) - l3, c3 = bits.Add64(l3, l7<<32, c2) - l4, c4 = bits.Add64(l4, 0, c3) - l5, c5 = bits.Add64(l5, 0, c4) - l6, _ = bits.Add64(l6, 0, c5) - - binary.LittleEndian.PutUint64(z[0*8:1*8], l0) - binary.LittleEndian.PutUint64(z[1*8:2*8], l1) - binary.LittleEndian.PutUint64(z[2*8:3*8], l2) - binary.LittleEndian.PutUint64(z[3*8:4*8], l3) - binary.LittleEndian.PutUint64(z[4*8:5*8], l4) - binary.LittleEndian.PutUint64(z[5*8:6*8], l5) - binary.LittleEndian.PutUint64(z[6*8:7*8], l6) -} diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fp_noasm.go b/vendor/github.com/cloudflare/circl/math/fp448/fp_noasm.go deleted file mode 100644 index a62225d29..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fp_noasm.go +++ /dev/null @@ -1,12 +0,0 @@ -//go:build !amd64 || purego -// +build !amd64 purego - -package fp448 - -func cmov(x, y *Elt, n uint) { cmovGeneric(x, y, n) } -func cswap(x, y *Elt, n uint) { cswapGeneric(x, y, n) } -func add(z, x, y *Elt) { addGeneric(z, x, y) } -func sub(z, x, y *Elt) { subGeneric(z, x, y) } -func addsub(x, y *Elt) { addsubGeneric(x, y) } -func mul(z, x, y *Elt) { mulGeneric(z, x, y) } -func sqr(z, x *Elt) { sqrGeneric(z, x) } diff --git a/vendor/github.com/cloudflare/circl/math/fp448/fuzzer.go b/vendor/github.com/cloudflare/circl/math/fp448/fuzzer.go deleted file mode 100644 index 2d7afc805..000000000 --- a/vendor/github.com/cloudflare/circl/math/fp448/fuzzer.go +++ /dev/null @@ -1,75 +0,0 @@ -//go:build gofuzz -// +build gofuzz - -// How to run the fuzzer: -// -// $ go get -u github.com/dvyukov/go-fuzz/go-fuzz -// $ go get -u github.com/dvyukov/go-fuzz/go-fuzz-build -// $ go-fuzz-build -libfuzzer -func FuzzReduction -o lib.a -// $ clang -fsanitize=fuzzer lib.a -o fu.exe -// $ ./fu.exe -package fp448 - -import ( - "encoding/binary" - "fmt" - "math/big" - - "github.com/cloudflare/circl/internal/conv" -) - -// FuzzReduction is a fuzzer target for red64 function, which reduces t -// (112 bits) to a number t' (56 bits) congruent modulo p448. -func FuzzReduction(data []byte) int { - if len(data) != 2*Size { - return -1 - } - var got, want Elt - var lo, hi [7]uint64 - a := data[:Size] - b := data[Size:] - lo[0] = binary.LittleEndian.Uint64(a[0*8 : 1*8]) - lo[1] = binary.LittleEndian.Uint64(a[1*8 : 2*8]) - lo[2] = binary.LittleEndian.Uint64(a[2*8 : 3*8]) - lo[3] = binary.LittleEndian.Uint64(a[3*8 : 4*8]) - lo[4] = binary.LittleEndian.Uint64(a[4*8 : 5*8]) - lo[5] = binary.LittleEndian.Uint64(a[5*8 : 6*8]) - lo[6] = binary.LittleEndian.Uint64(a[6*8 : 7*8]) - - hi[0] = binary.LittleEndian.Uint64(b[0*8 : 1*8]) - hi[1] = binary.LittleEndian.Uint64(b[1*8 : 2*8]) - hi[2] = binary.LittleEndian.Uint64(b[2*8 : 3*8]) - hi[3] = binary.LittleEndian.Uint64(b[3*8 : 4*8]) - hi[4] = binary.LittleEndian.Uint64(b[4*8 : 5*8]) - hi[5] = binary.LittleEndian.Uint64(b[5*8 : 6*8]) - hi[6] = binary.LittleEndian.Uint64(b[6*8 : 7*8]) - - red64(&got, &lo, &hi) - - t := conv.BytesLe2BigInt(data[:2*Size]) - - two448 := big.NewInt(1) - two448.Lsh(two448, 448) // 2^448 - mask448 := big.NewInt(1) - mask448.Sub(two448, mask448) // 2^448-1 - two224plus1 := big.NewInt(1) - two224plus1.Lsh(two224plus1, 224) - two224plus1.Add(two224plus1, big.NewInt(1)) // 2^224+1 - - var loBig, hiBig big.Int - for t.Cmp(two448) >= 0 { - loBig.And(t, mask448) - hiBig.Rsh(t, 448) - t.Mul(&hiBig, two224plus1) - t.Add(t, &loBig) - } - conv.BigInt2BytesLe(want[:], t) - - if got != want { - fmt.Printf("in: %v\n", conv.BytesLe2BigInt(data[:2*Size])) - fmt.Printf("got: %v\n", got) - fmt.Printf("want: %v\n", want) - panic("error found") - } - return 1 -} diff --git a/vendor/github.com/cloudflare/circl/math/integer.go b/vendor/github.com/cloudflare/circl/math/integer.go deleted file mode 100644 index 9c80c23b5..000000000 --- a/vendor/github.com/cloudflare/circl/math/integer.go +++ /dev/null @@ -1,16 +0,0 @@ -package math - -import "math/bits" - -// NextPow2 finds the next power of two (N=2^k, k>=0) greater than n. -// If n is already a power of two, then this function returns n, and log2(n). -func NextPow2(n uint) (N uint, k uint) { - if bits.OnesCount(n) == 1 { - k = uint(bits.TrailingZeros(n)) - N = n - } else { - k = uint(bits.Len(n)) - N = uint(1) << k - } - return -} diff --git a/vendor/github.com/cloudflare/circl/math/mlsbset/mlsbset.go b/vendor/github.com/cloudflare/circl/math/mlsbset/mlsbset.go deleted file mode 100644 index a43851b8b..000000000 --- a/vendor/github.com/cloudflare/circl/math/mlsbset/mlsbset.go +++ /dev/null @@ -1,122 +0,0 @@ -// Package mlsbset provides a constant-time exponentiation method with precomputation. -// -// References: "Efficient and secure algorithms for GLV-based scalar -// multiplication and their implementation on GLV–GLS curves" by (Faz-Hernandez et al.) -// - https://doi.org/10.1007/s13389-014-0085-7 -// - https://eprint.iacr.org/2013/158 -package mlsbset - -import ( - "errors" - "fmt" - "math/big" - - "github.com/cloudflare/circl/internal/conv" -) - -// EltG is a group element. -type EltG interface{} - -// EltP is a precomputed group element. -type EltP interface{} - -// Group defines the operations required by MLSBSet exponentiation method. -type Group interface { - Identity() EltG // Returns the identity of the group. - Sqr(x EltG) // Calculates x = x^2. - Mul(x EltG, y EltP) // Calculates x = x*y. - NewEltP() EltP // Returns an arbitrary precomputed element. - ExtendedEltP() EltP // Returns the precomputed element x^(2^(w*d)). - Lookup(a EltP, v uint, s, u int32) // Sets a = s*T[v][u]. -} - -// Params contains the parameters of the encoding. -type Params struct { - T uint // T is the maximum size (in bits) of exponents. - V uint // V is the number of tables. - W uint // W is the window size. - E uint // E is the number of digits per table. - D uint // D is the number of digits in total. - L uint // L is the length of the code. -} - -// Encoder allows to convert integers into valid powers. -type Encoder struct{ p Params } - -// New produces an encoder of the MLSBSet algorithm. -func New(t, v, w uint) (Encoder, error) { - if !(t > 1 && v >= 1 && w >= 2) { - return Encoder{}, errors.New("t>1, v>=1, w>=2") - } - e := (t + w*v - 1) / (w * v) - d := e * v - l := d * w - return Encoder{Params{t, v, w, e, d, l}}, nil -} - -// Encode converts an odd integer k into a valid power for exponentiation. -func (m Encoder) Encode(k []byte) (*Power, error) { - if len(k) == 0 { - return nil, errors.New("empty slice") - } - if !(len(k) <= int(m.p.L+7)>>3) { - return nil, errors.New("k too big") - } - if k[0]%2 == 0 { - return nil, errors.New("k must be odd") - } - ap := int((m.p.L+7)/8) - len(k) - k = append(k, make([]byte, ap)...) - s := m.signs(k) - b := make([]int32, m.p.L-m.p.D) - c := conv.BytesLe2BigInt(k) - c.Rsh(c, m.p.D) - var bi big.Int - for i := m.p.D; i < m.p.L; i++ { - c0 := int32(c.Bit(0)) - b[i-m.p.D] = s[i%m.p.D] * c0 - bi.SetInt64(int64(b[i-m.p.D] >> 1)) - c.Rsh(c, 1) - c.Sub(c, &bi) - } - carry := int(c.Int64()) - return &Power{m, s, b, carry}, nil -} - -// signs calculates the set of signs. -func (m Encoder) signs(k []byte) []int32 { - s := make([]int32, m.p.D) - s[m.p.D-1] = 1 - for i := uint(1); i < m.p.D; i++ { - ki := int32((k[i>>3] >> (i & 0x7)) & 0x1) - s[i-1] = 2*ki - 1 - } - return s -} - -// GetParams returns the complementary parameters of the encoding. -func (m Encoder) GetParams() Params { return m.p } - -// tableSize returns the size of each table. -func (m Encoder) tableSize() uint { return 1 << (m.p.W - 1) } - -// Elts returns the total number of elements that must be precomputed. -func (m Encoder) Elts() uint { return m.p.V * m.tableSize() } - -// IsExtended returns true if the element x^(2^(wd)) must be calculated. -func (m Encoder) IsExtended() bool { q := m.p.T / (m.p.V * m.p.W); return m.p.T == q*m.p.V*m.p.W } - -// Ops returns the number of squares and multiplications executed during an exponentiation. -func (m Encoder) Ops() (S uint, M uint) { - S = m.p.E - M = m.p.E * m.p.V - if m.IsExtended() { - M++ - } - return -} - -func (m Encoder) String() string { - return fmt.Sprintf("T: %v W: %v V: %v e: %v d: %v l: %v wv|t: %v", - m.p.T, m.p.W, m.p.V, m.p.E, m.p.D, m.p.L, m.IsExtended()) -} diff --git a/vendor/github.com/cloudflare/circl/math/mlsbset/power.go b/vendor/github.com/cloudflare/circl/math/mlsbset/power.go deleted file mode 100644 index 3f214c304..000000000 --- a/vendor/github.com/cloudflare/circl/math/mlsbset/power.go +++ /dev/null @@ -1,64 +0,0 @@ -package mlsbset - -import "fmt" - -// Power is a valid exponent produced by the MLSBSet encoding algorithm. -type Power struct { - set Encoder // parameters of code. - s []int32 // set of signs. - b []int32 // set of digits. - c int // carry is {0,1}. -} - -// Exp is calculates x^k, where x is a predetermined element of a group G. -func (p *Power) Exp(G Group) EltG { - a, b := G.Identity(), G.NewEltP() - for e := int(p.set.p.E - 1); e >= 0; e-- { - G.Sqr(a) - for v := uint(0); v < p.set.p.V; v++ { - sgnElt, idElt := p.Digit(v, uint(e)) - G.Lookup(b, v, sgnElt, idElt) - G.Mul(a, b) - } - } - if p.set.IsExtended() && p.c == 1 { - G.Mul(a, G.ExtendedEltP()) - } - return a -} - -// Digit returns the (v,e)-th digit and its sign. -func (p *Power) Digit(v, e uint) (sgn, dig int32) { - sgn = p.bit(0, v, e) - dig = 0 - for i := p.set.p.W - 1; i > 0; i-- { - dig = 2*dig + p.bit(i, v, e) - } - mask := dig >> 31 - dig = (dig + mask) ^ mask - return sgn, dig -} - -// bit returns the (w,v,e)-th bit of the code. -func (p *Power) bit(w, v, e uint) int32 { - if !(w < p.set.p.W && - v < p.set.p.V && - e < p.set.p.E) { - panic(fmt.Errorf("indexes outside (%v,%v,%v)", w, v, e)) - } - if w == 0 { - return p.s[p.set.p.E*v+e] - } - return p.b[p.set.p.D*(w-1)+p.set.p.E*v+e] -} - -func (p *Power) String() string { - dig := "" - for j := uint(0); j < p.set.p.V; j++ { - for i := uint(0); i < p.set.p.E; i++ { - s, d := p.Digit(j, i) - dig += fmt.Sprintf("(%2v,%2v) = %+2v %+2v\n", j, i, s, d) - } - } - return fmt.Sprintf("len: %v\ncarry: %v\ndigits:\n%v", len(p.b)+len(p.s), p.c, dig) -} diff --git a/vendor/github.com/cloudflare/circl/math/primes.go b/vendor/github.com/cloudflare/circl/math/primes.go deleted file mode 100644 index 158fd83a7..000000000 --- a/vendor/github.com/cloudflare/circl/math/primes.go +++ /dev/null @@ -1,34 +0,0 @@ -package math - -import ( - "crypto/rand" - "io" - "math/big" -) - -// IsSafePrime reports whether p is (probably) a safe prime. -// The prime p=2*q+1 is safe prime if both p and q are primes. -// Note that ProbablyPrime is not suitable for judging primes -// that an adversary may have crafted to fool the test. -func IsSafePrime(p *big.Int) bool { - pdiv2 := new(big.Int).Rsh(p, 1) - return p.ProbablyPrime(20) && pdiv2.ProbablyPrime(20) -} - -// SafePrime returns a number of the given bit length that is a safe prime with high probability. -// The number returned p=2*q+1 is a safe prime if both p and q are primes. -// SafePrime will return error for any error returned by rand.Read or if bits < 2. -func SafePrime(random io.Reader, bits int) (*big.Int, error) { - one := big.NewInt(1) - p := new(big.Int) - for { - q, err := rand.Prime(random, bits-1) - if err != nil { - return nil, err - } - p.Lsh(q, 1).Add(p, one) - if p.ProbablyPrime(20) { - return p, nil - } - } -} diff --git a/vendor/github.com/cloudflare/circl/math/wnaf.go b/vendor/github.com/cloudflare/circl/math/wnaf.go deleted file mode 100644 index 94a1ec504..000000000 --- a/vendor/github.com/cloudflare/circl/math/wnaf.go +++ /dev/null @@ -1,84 +0,0 @@ -// Package math provides some utility functions for big integers. -package math - -import "math/big" - -// SignedDigit obtains the signed-digit recoding of n and returns a list L of -// digits such that n = sum( L[i]*2^(i*(w-1)) ), and each L[i] is an odd number -// in the set {±1, ±3, ..., ±2^(w-1)-1}. The third parameter ensures that the -// output has ceil(l/(w-1)) digits. -// -// Restrictions: -// - n is odd and n > 0. -// - 1 < w < 32. -// - l >= bit length of n. -// -// References: -// - Alg.6 in "Exponent Recoding and Regular Exponentiation Algorithms" -// by Joye-Tunstall. http://doi.org/10.1007/978-3-642-02384-2_21 -// - Alg.6 in "Selecting Elliptic Curves for Cryptography: An Efficiency and -// Security Analysis" by Bos et al. http://doi.org/10.1007/s13389-015-0097-y -func SignedDigit(n *big.Int, w, l uint) []int32 { - if n.Sign() <= 0 || n.Bit(0) == 0 { - panic("n must be non-zero, odd, and positive") - } - if w <= 1 || w >= 32 { - panic("Verify that 1 < w < 32") - } - if uint(n.BitLen()) > l { - panic("n is too big to fit in l digits") - } - lenN := (l + (w - 1) - 1) / (w - 1) // ceil(l/(w-1)) - L := make([]int32, lenN+1) - var k, v big.Int - k.Set(n) - - var i uint - for i = 0; i < lenN; i++ { - words := k.Bits() - value := int32(words[0] & ((1 << w) - 1)) - value -= int32(1) << (w - 1) - L[i] = value - v.SetInt64(int64(value)) - k.Sub(&k, &v) - k.Rsh(&k, w-1) - } - L[i] = int32(k.Int64()) - return L -} - -// OmegaNAF obtains the window-w Non-Adjacent Form of a positive number n and -// 1 < w < 32. The returned slice L holds n = sum( L[i]*2^i ). -// -// Reference: -// - Alg.9 "Efficient arithmetic on Koblitz curves" by Solinas. -// http://doi.org/10.1023/A:1008306223194 -func OmegaNAF(n *big.Int, w uint) (L []int32) { - if n.Sign() < 0 { - panic("n must be positive") - } - if w <= 1 || w >= 32 { - panic("Verify that 1 < w < 32") - } - - L = make([]int32, n.BitLen()+1) - var k, v big.Int - k.Set(n) - - i := 0 - for ; k.Sign() > 0; i++ { - value := int32(0) - if k.Bit(0) == 1 { - words := k.Bits() - value = int32(words[0] & ((1 << w) - 1)) - if value >= (int32(1) << (w - 1)) { - value -= int32(1) << w - } - v.SetInt64(int64(value)) - k.Sub(&k, &v) - } - L[i] = value - k.Rsh(&k, 1) - } - return L[:i] -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/ed25519.go b/vendor/github.com/cloudflare/circl/sign/ed25519/ed25519.go deleted file mode 100644 index 2c73c26fb..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/ed25519.go +++ /dev/null @@ -1,453 +0,0 @@ -// Package ed25519 implements Ed25519 signature scheme as described in RFC-8032. -// -// This package provides optimized implementations of the three signature -// variants and maintaining closer compatibility with crypto/ed25519. -// -// | Scheme Name | Sign Function | Verification | Context | -// |-------------|-------------------|---------------|-------------------| -// | Ed25519 | Sign | Verify | None | -// | Ed25519Ph | SignPh | VerifyPh | Yes, can be empty | -// | Ed25519Ctx | SignWithCtx | VerifyWithCtx | Yes, non-empty | -// | All above | (PrivateKey).Sign | VerifyAny | As above | -// -// Specific functions for sign and verify are defined. A generic signing -// function for all schemes is available through the crypto.Signer interface, -// which is implemented by the PrivateKey type. A correspond all-in-one -// verification method is provided by the VerifyAny function. -// -// Signing with Ed25519Ph or Ed25519Ctx requires a context string for domain -// separation. This parameter is passed using a SignerOptions struct defined -// in this package. While Ed25519Ph accepts an empty context, Ed25519Ctx -// enforces non-empty context strings. -// -// # Compatibility with crypto.ed25519 -// -// These functions are compatible with the “Ed25519” function defined in -// RFC-8032. However, unlike RFC 8032's formulation, this package's private -// key representation includes a public key suffix to make multiple signing -// operations with the same key more efficient. This package refers to the -// RFC-8032 private key as the “seed”. -// -// References -// -// - RFC-8032: https://rfc-editor.org/rfc/rfc8032.txt -// - Ed25519: https://ed25519.cr.yp.to/ -// - EdDSA: High-speed high-security signatures. https://doi.org/10.1007/s13389-012-0027-1 -package ed25519 - -import ( - "bytes" - "crypto" - cryptoRand "crypto/rand" - "crypto/sha512" - "crypto/subtle" - "errors" - "fmt" - "io" - "strconv" - - "github.com/cloudflare/circl/sign" -) - -const ( - // ContextMaxSize is the maximum length (in bytes) allowed for context. - ContextMaxSize = 255 - // PublicKeySize is the size, in bytes, of public keys as used in this package. - PublicKeySize = 32 - // PrivateKeySize is the size, in bytes, of private keys as used in this package. - PrivateKeySize = 64 - // SignatureSize is the size, in bytes, of signatures generated and verified by this package. - SignatureSize = 64 - // SeedSize is the size, in bytes, of private key seeds. These are the private key representations used by RFC 8032. - SeedSize = 32 -) - -const ( - paramB = 256 / 8 // Size of keys in bytes. -) - -// SignerOptions implements crypto.SignerOpts and augments with parameters -// that are specific to the Ed25519 signature schemes. -type SignerOptions struct { - // Hash must be crypto.Hash(0) for Ed25519/Ed25519ctx, or crypto.SHA512 - // for Ed25519ph. - crypto.Hash - - // Context is an optional domain separation string for Ed25519ph and a - // must for Ed25519ctx. Its length must be less or equal than 255 bytes. - Context string - - // Scheme is an identifier for choosing a signature scheme. The zero value - // is ED25519. - Scheme SchemeID -} - -// SchemeID is an identifier for each signature scheme. -type SchemeID uint - -const ( - ED25519 SchemeID = iota - ED25519Ph - ED25519Ctx -) - -// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer. -type PrivateKey []byte - -// Equal reports whether priv and x have the same value. -func (priv PrivateKey) Equal(x crypto.PrivateKey) bool { - xx, ok := x.(PrivateKey) - return ok && subtle.ConstantTimeCompare(priv, xx) == 1 -} - -// Public returns the PublicKey corresponding to priv. -func (priv PrivateKey) Public() crypto.PublicKey { - publicKey := make(PublicKey, PublicKeySize) - copy(publicKey, priv[SeedSize:]) - return publicKey -} - -// Seed returns the private key seed corresponding to priv. It is provided for -// interoperability with RFC 8032. RFC 8032's private keys correspond to seeds -// in this package. -func (priv PrivateKey) Seed() []byte { - seed := make([]byte, SeedSize) - copy(seed, priv[:SeedSize]) - return seed -} - -func (priv PrivateKey) Scheme() sign.Scheme { return sch } - -func (pub PublicKey) Scheme() sign.Scheme { return sch } - -func (priv PrivateKey) MarshalBinary() (data []byte, err error) { - privateKey := make(PrivateKey, PrivateKeySize) - copy(privateKey, priv) - return privateKey, nil -} - -func (pub PublicKey) MarshalBinary() (data []byte, err error) { - publicKey := make(PublicKey, PublicKeySize) - copy(publicKey, pub) - return publicKey, nil -} - -// Equal reports whether pub and x have the same value. -func (pub PublicKey) Equal(x crypto.PublicKey) bool { - xx, ok := x.(PublicKey) - return ok && bytes.Equal(pub, xx) -} - -// Sign creates a signature of a message with priv key. -// This function is compatible with crypto.ed25519 and also supports the -// three signature variants defined in RFC-8032, namely Ed25519 (or pure -// EdDSA), Ed25519Ph, and Ed25519Ctx. -// The opts.HashFunc() must return zero to specify either Ed25519 or Ed25519Ctx -// variant. This can be achieved by passing crypto.Hash(0) as the value for -// opts. -// The opts.HashFunc() must return SHA512 to specify the Ed25519Ph variant. -// This can be achieved by passing crypto.SHA512 as the value for opts. -// Use a SignerOptions struct (defined in this package) to pass a context -// string for signing. -func (priv PrivateKey) Sign( - rand io.Reader, - message []byte, - opts crypto.SignerOpts, -) (signature []byte, err error) { - var ctx string - var scheme SchemeID - if o, ok := opts.(SignerOptions); ok { - ctx = o.Context - scheme = o.Scheme - } - - switch true { - case scheme == ED25519 && opts.HashFunc() == crypto.Hash(0): - return Sign(priv, message), nil - case scheme == ED25519Ph && opts.HashFunc() == crypto.SHA512: - return SignPh(priv, message, ctx), nil - case scheme == ED25519Ctx && opts.HashFunc() == crypto.Hash(0) && len(ctx) > 0: - return SignWithCtx(priv, message, ctx), nil - default: - return nil, errors.New("ed25519: bad hash algorithm") - } -} - -// GenerateKey generates a public/private key pair using entropy from rand. -// If rand is nil, crypto/rand.Reader will be used. -func GenerateKey(rand io.Reader) (PublicKey, PrivateKey, error) { - if rand == nil { - rand = cryptoRand.Reader - } - - seed := make([]byte, SeedSize) - if _, err := io.ReadFull(rand, seed); err != nil { - return nil, nil, err - } - - privateKey := NewKeyFromSeed(seed) - publicKey := make(PublicKey, PublicKeySize) - copy(publicKey, privateKey[SeedSize:]) - - return publicKey, privateKey, nil -} - -// NewKeyFromSeed calculates a private key from a seed. It will panic if -// len(seed) is not SeedSize. This function is provided for interoperability -// with RFC 8032. RFC 8032's private keys correspond to seeds in this -// package. -func NewKeyFromSeed(seed []byte) PrivateKey { - privateKey := make(PrivateKey, PrivateKeySize) - newKeyFromSeed(privateKey, seed) - return privateKey -} - -func newKeyFromSeed(privateKey, seed []byte) { - if l := len(seed); l != SeedSize { - panic("ed25519: bad seed length: " + strconv.Itoa(l)) - } - var P pointR1 - k := sha512.Sum512(seed) - clamp(k[:]) - reduceModOrder(k[:paramB], false) - P.fixedMult(k[:paramB]) - copy(privateKey[:SeedSize], seed) - _ = P.ToBytes(privateKey[SeedSize:]) -} - -func signAll(signature []byte, privateKey PrivateKey, message, ctx []byte, preHash bool) { - if l := len(privateKey); l != PrivateKeySize { - panic("ed25519: bad private key length: " + strconv.Itoa(l)) - } - - H := sha512.New() - var PHM []byte - - if preHash { - _, _ = H.Write(message) - PHM = H.Sum(nil) - H.Reset() - } else { - PHM = message - } - - // 1. Hash the 32-byte private key using SHA-512. - _, _ = H.Write(privateKey[:SeedSize]) - h := H.Sum(nil) - clamp(h[:]) - prefix, s := h[paramB:], h[:paramB] - - // 2. Compute SHA-512(dom2(F, C) || prefix || PH(M)) - H.Reset() - - writeDom(H, ctx, preHash) - - _, _ = H.Write(prefix) - _, _ = H.Write(PHM) - r := H.Sum(nil) - reduceModOrder(r[:], true) - - // 3. Compute the point [r]B. - var P pointR1 - P.fixedMult(r[:paramB]) - R := (&[paramB]byte{})[:] - if err := P.ToBytes(R); err != nil { - panic(err) - } - - // 4. Compute SHA512(dom2(F, C) || R || A || PH(M)). - H.Reset() - - writeDom(H, ctx, preHash) - - _, _ = H.Write(R) - _, _ = H.Write(privateKey[SeedSize:]) - _, _ = H.Write(PHM) - hRAM := H.Sum(nil) - - reduceModOrder(hRAM[:], true) - - // 5. Compute S = (r + k * s) mod order. - S := (&[paramB]byte{})[:] - calculateS(S, r[:paramB], hRAM[:paramB], s) - - // 6. The signature is the concatenation of R and S. - copy(signature[:paramB], R[:]) - copy(signature[paramB:], S[:]) -} - -// Sign signs the message with privateKey and returns a signature. -// This function supports the signature variant defined in RFC-8032: Ed25519, -// also known as the pure version of EdDSA. -// It will panic if len(privateKey) is not PrivateKeySize. -func Sign(privateKey PrivateKey, message []byte) []byte { - signature := make([]byte, SignatureSize) - signAll(signature, privateKey, message, []byte(""), false) - return signature -} - -// SignPh creates a signature of a message with private key and context. -// This function supports the signature variant defined in RFC-8032: Ed25519ph, -// meaning it internally hashes the message using SHA-512, and optionally -// accepts a context string. -// It will panic if len(privateKey) is not PrivateKeySize. -// Context could be passed to this function, which length should be no more than -// ContextMaxSize=255. It can be empty. -func SignPh(privateKey PrivateKey, message []byte, ctx string) []byte { - if len(ctx) > ContextMaxSize { - panic(fmt.Errorf("ed25519: bad context length: %v", len(ctx))) - } - - signature := make([]byte, SignatureSize) - signAll(signature, privateKey, message, []byte(ctx), true) - return signature -} - -// SignWithCtx creates a signature of a message with private key and context. -// This function supports the signature variant defined in RFC-8032: Ed25519ctx, -// meaning it accepts a non-empty context string. -// It will panic if len(privateKey) is not PrivateKeySize. -// Context must be passed to this function, which length should be no more than -// ContextMaxSize=255 and cannot be empty. -func SignWithCtx(privateKey PrivateKey, message []byte, ctx string) []byte { - if len(ctx) == 0 || len(ctx) > ContextMaxSize { - panic(fmt.Errorf("ed25519: bad context length: %v > %v", len(ctx), ContextMaxSize)) - } - - signature := make([]byte, SignatureSize) - signAll(signature, privateKey, message, []byte(ctx), false) - return signature -} - -func verify(public PublicKey, message, signature, ctx []byte, preHash bool) bool { - if len(public) != PublicKeySize || - len(signature) != SignatureSize || - !isLessThanOrder(signature[paramB:]) { - return false - } - - var P pointR1 - if ok := P.FromBytes(public); !ok { - return false - } - - H := sha512.New() - var PHM []byte - - if preHash { - _, _ = H.Write(message) - PHM = H.Sum(nil) - H.Reset() - } else { - PHM = message - } - - R := signature[:paramB] - - writeDom(H, ctx, preHash) - - _, _ = H.Write(R) - _, _ = H.Write(public) - _, _ = H.Write(PHM) - hRAM := H.Sum(nil) - reduceModOrder(hRAM[:], true) - - var Q pointR1 - encR := (&[paramB]byte{})[:] - P.neg() - Q.doubleMult(&P, signature[paramB:], hRAM[:paramB]) - _ = Q.ToBytes(encR) - return bytes.Equal(R, encR) -} - -// VerifyAny returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded. -// This function supports all the three signature variants defined in RFC-8032, -// namely Ed25519 (or pure EdDSA), Ed25519Ph, and Ed25519Ctx. -// The opts.HashFunc() must return zero to specify either Ed25519 or Ed25519Ctx -// variant. This can be achieved by passing crypto.Hash(0) as the value for opts. -// The opts.HashFunc() must return SHA512 to specify the Ed25519Ph variant. -// This can be achieved by passing crypto.SHA512 as the value for opts. -// Use a SignerOptions struct to pass a context string for signing. -func VerifyAny(public PublicKey, message, signature []byte, opts crypto.SignerOpts) bool { - var ctx string - var scheme SchemeID - if o, ok := opts.(SignerOptions); ok { - ctx = o.Context - scheme = o.Scheme - } - - switch true { - case scheme == ED25519 && opts.HashFunc() == crypto.Hash(0): - return Verify(public, message, signature) - case scheme == ED25519Ph && opts.HashFunc() == crypto.SHA512: - return VerifyPh(public, message, signature, ctx) - case scheme == ED25519Ctx && opts.HashFunc() == crypto.Hash(0) && len(ctx) > 0: - return VerifyWithCtx(public, message, signature, ctx) - default: - return false - } -} - -// Verify returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded. -// This function supports the signature variant defined in RFC-8032: Ed25519, -// also known as the pure version of EdDSA. -func Verify(public PublicKey, message, signature []byte) bool { - return verify(public, message, signature, []byte(""), false) -} - -// VerifyPh returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded. -// This function supports the signature variant defined in RFC-8032: Ed25519ph, -// meaning it internally hashes the message using SHA-512. -// Context could be passed to this function, which length should be no more than -// 255. It can be empty. -func VerifyPh(public PublicKey, message, signature []byte, ctx string) bool { - return verify(public, message, signature, []byte(ctx), true) -} - -// VerifyWithCtx returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded, or when context is -// not provided. -// This function supports the signature variant defined in RFC-8032: Ed25519ctx, -// meaning it does not handle prehashed messages. Non-empty context string must be -// provided, and must not be more than 255 of length. -func VerifyWithCtx(public PublicKey, message, signature []byte, ctx string) bool { - if len(ctx) == 0 || len(ctx) > ContextMaxSize { - return false - } - - return verify(public, message, signature, []byte(ctx), false) -} - -func clamp(k []byte) { - k[0] &= 248 - k[paramB-1] = (k[paramB-1] & 127) | 64 -} - -// isLessThanOrder returns true if 0 <= x < order. -func isLessThanOrder(x []byte) bool { - i := len(order) - 1 - for i > 0 && x[i] == order[i] { - i-- - } - return x[i] < order[i] -} - -func writeDom(h io.Writer, ctx []byte, preHash bool) { - dom2 := "SigEd25519 no Ed25519 collisions" - - if len(ctx) > 0 { - _, _ = h.Write([]byte(dom2)) - if preHash { - _, _ = h.Write([]byte{byte(0x01), byte(len(ctx))}) - } else { - _, _ = h.Write([]byte{byte(0x00), byte(len(ctx))}) - } - _, _ = h.Write(ctx) - } else if preHash { - _, _ = h.Write([]byte(dom2)) - _, _ = h.Write([]byte{0x01, 0x00}) - } -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/modular.go b/vendor/github.com/cloudflare/circl/sign/ed25519/modular.go deleted file mode 100644 index 10efafdca..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/modular.go +++ /dev/null @@ -1,175 +0,0 @@ -package ed25519 - -import ( - "encoding/binary" - "math/bits" -) - -var order = [paramB]byte{ - 0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, - 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, -} - -// isLessThan returns true if 0 <= x < y, and assumes that slices have the same length. -func isLessThan(x, y []byte) bool { - i := len(x) - 1 - for i > 0 && x[i] == y[i] { - i-- - } - return x[i] < y[i] -} - -// reduceModOrder calculates k = k mod order of the curve. -func reduceModOrder(k []byte, is512Bit bool) { - var X [((2 * paramB) * 8) / 64]uint64 - numWords := len(k) >> 3 - for i := 0; i < numWords; i++ { - X[i] = binary.LittleEndian.Uint64(k[i*8 : (i+1)*8]) - } - red512(&X, is512Bit) - for i := 0; i < numWords; i++ { - binary.LittleEndian.PutUint64(k[i*8:(i+1)*8], X[i]) - } -} - -// red512 calculates x = x mod Order of the curve. -func red512(x *[8]uint64, full bool) { - // Implementation of Algs.(14.47)+(14.52) of Handbook of Applied - // Cryptography, by A. Menezes, P. van Oorschot, and S. Vanstone. - const ( - ell0 = uint64(0x5812631a5cf5d3ed) - ell1 = uint64(0x14def9dea2f79cd6) - ell160 = uint64(0x812631a5cf5d3ed0) - ell161 = uint64(0x4def9dea2f79cd65) - ell162 = uint64(0x0000000000000001) - ) - - var c0, c1, c2, c3 uint64 - r0, r1, r2, r3, r4 := x[0], x[1], x[2], x[3], uint64(0) - - if full { - q0, q1, q2, q3 := x[4], x[5], x[6], x[7] - - for i := 0; i < 3; i++ { - h0, s0 := bits.Mul64(q0, ell160) - h1, s1 := bits.Mul64(q1, ell160) - h2, s2 := bits.Mul64(q2, ell160) - h3, s3 := bits.Mul64(q3, ell160) - - s1, c0 = bits.Add64(h0, s1, 0) - s2, c1 = bits.Add64(h1, s2, c0) - s3, c2 = bits.Add64(h2, s3, c1) - s4, _ := bits.Add64(h3, 0, c2) - - h0, l0 := bits.Mul64(q0, ell161) - h1, l1 := bits.Mul64(q1, ell161) - h2, l2 := bits.Mul64(q2, ell161) - h3, l3 := bits.Mul64(q3, ell161) - - l1, c0 = bits.Add64(h0, l1, 0) - l2, c1 = bits.Add64(h1, l2, c0) - l3, c2 = bits.Add64(h2, l3, c1) - l4, _ := bits.Add64(h3, 0, c2) - - s1, c0 = bits.Add64(s1, l0, 0) - s2, c1 = bits.Add64(s2, l1, c0) - s3, c2 = bits.Add64(s3, l2, c1) - s4, c3 = bits.Add64(s4, l3, c2) - s5, s6 := bits.Add64(l4, 0, c3) - - s2, c0 = bits.Add64(s2, q0, 0) - s3, c1 = bits.Add64(s3, q1, c0) - s4, c2 = bits.Add64(s4, q2, c1) - s5, c3 = bits.Add64(s5, q3, c2) - s6, s7 := bits.Add64(s6, 0, c3) - - q := q0 | q1 | q2 | q3 - m := -((q | -q) >> 63) // if q=0 then m=0...0 else m=1..1 - s0 &= m - s1 &= m - s2 &= m - s3 &= m - q0, q1, q2, q3 = s4, s5, s6, s7 - - if (i+1)%2 == 0 { - r0, c0 = bits.Add64(r0, s0, 0) - r1, c1 = bits.Add64(r1, s1, c0) - r2, c2 = bits.Add64(r2, s2, c1) - r3, c3 = bits.Add64(r3, s3, c2) - r4, _ = bits.Add64(r4, 0, c3) - } else { - r0, c0 = bits.Sub64(r0, s0, 0) - r1, c1 = bits.Sub64(r1, s1, c0) - r2, c2 = bits.Sub64(r2, s2, c1) - r3, c3 = bits.Sub64(r3, s3, c2) - r4, _ = bits.Sub64(r4, 0, c3) - } - } - - m := -(r4 >> 63) - r0, c0 = bits.Add64(r0, m&ell160, 0) - r1, c1 = bits.Add64(r1, m&ell161, c0) - r2, c2 = bits.Add64(r2, m&ell162, c1) - r3, c3 = bits.Add64(r3, 0, c2) - r4, _ = bits.Add64(r4, m&1, c3) - x[4], x[5], x[6], x[7] = 0, 0, 0, 0 - } - - q0 := (r4 << 4) | (r3 >> 60) - r3 &= (uint64(1) << 60) - 1 - - h0, s0 := bits.Mul64(ell0, q0) - h1, s1 := bits.Mul64(ell1, q0) - s1, c0 = bits.Add64(h0, s1, 0) - s2, _ := bits.Add64(h1, 0, c0) - - r0, c0 = bits.Sub64(r0, s0, 0) - r1, c1 = bits.Sub64(r1, s1, c0) - r2, c2 = bits.Sub64(r2, s2, c1) - r3, _ = bits.Sub64(r3, 0, c2) - - x[0], x[1], x[2], x[3] = r0, r1, r2, r3 -} - -// calculateS performs s = r+k*a mod Order of the curve. -func calculateS(s, r, k, a []byte) { - K := [4]uint64{ - binary.LittleEndian.Uint64(k[0*8 : 1*8]), - binary.LittleEndian.Uint64(k[1*8 : 2*8]), - binary.LittleEndian.Uint64(k[2*8 : 3*8]), - binary.LittleEndian.Uint64(k[3*8 : 4*8]), - } - S := [8]uint64{ - binary.LittleEndian.Uint64(r[0*8 : 1*8]), - binary.LittleEndian.Uint64(r[1*8 : 2*8]), - binary.LittleEndian.Uint64(r[2*8 : 3*8]), - binary.LittleEndian.Uint64(r[3*8 : 4*8]), - } - var c3 uint64 - for i := range K { - ai := binary.LittleEndian.Uint64(a[i*8 : (i+1)*8]) - - h0, l0 := bits.Mul64(K[0], ai) - h1, l1 := bits.Mul64(K[1], ai) - h2, l2 := bits.Mul64(K[2], ai) - h3, l3 := bits.Mul64(K[3], ai) - - l1, c0 := bits.Add64(h0, l1, 0) - l2, c1 := bits.Add64(h1, l2, c0) - l3, c2 := bits.Add64(h2, l3, c1) - l4, _ := bits.Add64(h3, 0, c2) - - S[i+0], c0 = bits.Add64(S[i+0], l0, 0) - S[i+1], c1 = bits.Add64(S[i+1], l1, c0) - S[i+2], c2 = bits.Add64(S[i+2], l2, c1) - S[i+3], c3 = bits.Add64(S[i+3], l3, c2) - S[i+4], _ = bits.Add64(S[i+4], l4, c3) - } - red512(&S, true) - binary.LittleEndian.PutUint64(s[0*8:1*8], S[0]) - binary.LittleEndian.PutUint64(s[1*8:2*8], S[1]) - binary.LittleEndian.PutUint64(s[2*8:3*8], S[2]) - binary.LittleEndian.PutUint64(s[3*8:4*8], S[3]) -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/mult.go b/vendor/github.com/cloudflare/circl/sign/ed25519/mult.go deleted file mode 100644 index 3216aae30..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/mult.go +++ /dev/null @@ -1,180 +0,0 @@ -package ed25519 - -import ( - "crypto/subtle" - "encoding/binary" - "math/bits" - - "github.com/cloudflare/circl/internal/conv" - "github.com/cloudflare/circl/math" - fp "github.com/cloudflare/circl/math/fp25519" -) - -var paramD = fp.Elt{ - 0xa3, 0x78, 0x59, 0x13, 0xca, 0x4d, 0xeb, 0x75, - 0xab, 0xd8, 0x41, 0x41, 0x4d, 0x0a, 0x70, 0x00, - 0x98, 0xe8, 0x79, 0x77, 0x79, 0x40, 0xc7, 0x8c, - 0x73, 0xfe, 0x6f, 0x2b, 0xee, 0x6c, 0x03, 0x52, -} - -// mLSBRecoding parameters. -const ( - fxT = 257 - fxV = 2 - fxW = 3 - fx2w1 = 1 << (uint(fxW) - 1) - numWords64 = (paramB * 8 / 64) -) - -// mLSBRecoding is the odd-only modified LSB-set. -// -// Reference: -// -// "Efficient and secure algorithms for GLV-based scalar multiplication and -// their implementation on GLV–GLS curves" by (Faz-Hernandez et al.) -// http://doi.org/10.1007/s13389-014-0085-7. -func mLSBRecoding(L []int8, k []byte) { - const ee = (fxT + fxW*fxV - 1) / (fxW * fxV) - const dd = ee * fxV - const ll = dd * fxW - if len(L) == (ll + 1) { - var m [numWords64 + 1]uint64 - for i := 0; i < numWords64; i++ { - m[i] = binary.LittleEndian.Uint64(k[8*i : 8*i+8]) - } - condAddOrderN(&m) - L[dd-1] = 1 - for i := 0; i < dd-1; i++ { - kip1 := (m[(i+1)/64] >> (uint(i+1) % 64)) & 0x1 - L[i] = int8(kip1<<1) - 1 - } - { // right-shift by d - right := uint(dd % 64) - left := uint(64) - right - lim := ((numWords64+1)*64 - dd) / 64 - j := dd / 64 - for i := 0; i < lim; i++ { - m[i] = (m[i+j] >> right) | (m[i+j+1] << left) - } - m[lim] = m[lim+j] >> right - } - for i := dd; i < ll; i++ { - L[i] = L[i%dd] * int8(m[0]&0x1) - div2subY(m[:], int64(L[i]>>1), numWords64) - } - L[ll] = int8(m[0]) - } -} - -// absolute returns always a positive value. -func absolute(x int32) int32 { - mask := x >> 31 - return (x + mask) ^ mask -} - -// condAddOrderN updates x = x+order if x is even, otherwise x remains unchanged. -func condAddOrderN(x *[numWords64 + 1]uint64) { - isOdd := (x[0] & 0x1) - 1 - c := uint64(0) - for i := 0; i < numWords64; i++ { - orderWord := binary.LittleEndian.Uint64(order[8*i : 8*i+8]) - o := isOdd & orderWord - x0, c0 := bits.Add64(x[i], o, c) - x[i] = x0 - c = c0 - } - x[numWords64], _ = bits.Add64(x[numWords64], 0, c) -} - -// div2subY update x = (x/2) - y. -func div2subY(x []uint64, y int64, l int) { - s := uint64(y >> 63) - for i := 0; i < l-1; i++ { - x[i] = (x[i] >> 1) | (x[i+1] << 63) - } - x[l-1] = (x[l-1] >> 1) - - b := uint64(0) - x0, b0 := bits.Sub64(x[0], uint64(y), b) - x[0] = x0 - b = b0 - for i := 1; i < l-1; i++ { - x0, b0 := bits.Sub64(x[i], s, b) - x[i] = x0 - b = b0 - } - x[l-1], _ = bits.Sub64(x[l-1], s, b) -} - -func (P *pointR1) fixedMult(scalar []byte) { - if len(scalar) != paramB { - panic("wrong scalar size") - } - const ee = (fxT + fxW*fxV - 1) / (fxW * fxV) - const dd = ee * fxV - const ll = dd * fxW - - L := make([]int8, ll+1) - mLSBRecoding(L[:], scalar) - S := &pointR3{} - P.SetIdentity() - for ii := ee - 1; ii >= 0; ii-- { - P.double() - for j := 0; j < fxV; j++ { - dig := L[fxW*dd-j*ee+ii-ee] - for i := (fxW-1)*dd - j*ee + ii - ee; i >= (2*dd - j*ee + ii - ee); i = i - dd { - dig = 2*dig + L[i] - } - idx := absolute(int32(dig)) - sig := L[dd-j*ee+ii-ee] - Tabj := &tabSign[fxV-j-1] - for k := 0; k < fx2w1; k++ { - S.cmov(&Tabj[k], subtle.ConstantTimeEq(int32(k), idx)) - } - S.cneg(subtle.ConstantTimeEq(int32(sig), -1)) - P.mixAdd(S) - } - } -} - -const ( - omegaFix = 7 - omegaVar = 5 -) - -// doubleMult returns P=mG+nQ. -func (P *pointR1) doubleMult(Q *pointR1, m, n []byte) { - nafFix := math.OmegaNAF(conv.BytesLe2BigInt(m), omegaFix) - nafVar := math.OmegaNAF(conv.BytesLe2BigInt(n), omegaVar) - - if len(nafFix) > len(nafVar) { - nafVar = append(nafVar, make([]int32, len(nafFix)-len(nafVar))...) - } else if len(nafFix) < len(nafVar) { - nafFix = append(nafFix, make([]int32, len(nafVar)-len(nafFix))...) - } - - var TabQ [1 << (omegaVar - 2)]pointR2 - Q.oddMultiples(TabQ[:]) - P.SetIdentity() - for i := len(nafFix) - 1; i >= 0; i-- { - P.double() - // Generator point - if nafFix[i] != 0 { - idxM := absolute(nafFix[i]) >> 1 - R := tabVerif[idxM] - if nafFix[i] < 0 { - R.neg() - } - P.mixAdd(&R) - } - // Variable input point - if nafVar[i] != 0 { - idxN := absolute(nafVar[i]) >> 1 - S := TabQ[idxN] - if nafVar[i] < 0 { - S.neg() - } - P.add(&S) - } - } -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/point.go b/vendor/github.com/cloudflare/circl/sign/ed25519/point.go deleted file mode 100644 index d1c3b146b..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/point.go +++ /dev/null @@ -1,195 +0,0 @@ -package ed25519 - -import fp "github.com/cloudflare/circl/math/fp25519" - -type ( - pointR1 struct{ x, y, z, ta, tb fp.Elt } - pointR2 struct { - pointR3 - z2 fp.Elt - } -) -type pointR3 struct{ addYX, subYX, dt2 fp.Elt } - -func (P *pointR1) neg() { - fp.Neg(&P.x, &P.x) - fp.Neg(&P.ta, &P.ta) -} - -func (P *pointR1) SetIdentity() { - P.x = fp.Elt{} - fp.SetOne(&P.y) - fp.SetOne(&P.z) - P.ta = fp.Elt{} - P.tb = fp.Elt{} -} - -func (P *pointR1) toAffine() { - fp.Inv(&P.z, &P.z) - fp.Mul(&P.x, &P.x, &P.z) - fp.Mul(&P.y, &P.y, &P.z) - fp.Modp(&P.x) - fp.Modp(&P.y) - fp.SetOne(&P.z) - P.ta = P.x - P.tb = P.y -} - -func (P *pointR1) ToBytes(k []byte) error { - P.toAffine() - var x [fp.Size]byte - err := fp.ToBytes(k[:fp.Size], &P.y) - if err != nil { - return err - } - err = fp.ToBytes(x[:], &P.x) - if err != nil { - return err - } - b := x[0] & 1 - k[paramB-1] = k[paramB-1] | (b << 7) - return nil -} - -func (P *pointR1) FromBytes(k []byte) bool { - if len(k) != paramB { - panic("wrong size") - } - signX := k[paramB-1] >> 7 - copy(P.y[:], k[:fp.Size]) - P.y[fp.Size-1] &= 0x7F - p := fp.P() - if !isLessThan(P.y[:], p[:]) { - return false - } - - one, u, v := &fp.Elt{}, &fp.Elt{}, &fp.Elt{} - fp.SetOne(one) - fp.Sqr(u, &P.y) // u = y^2 - fp.Mul(v, u, ¶mD) // v = dy^2 - fp.Sub(u, u, one) // u = y^2-1 - fp.Add(v, v, one) // v = dy^2+1 - isQR := fp.InvSqrt(&P.x, u, v) // x = sqrt(u/v) - if !isQR { - return false - } - fp.Modp(&P.x) // x = x mod p - if fp.IsZero(&P.x) && signX == 1 { - return false - } - if signX != (P.x[0] & 1) { - fp.Neg(&P.x, &P.x) - } - P.ta = P.x - P.tb = P.y - fp.SetOne(&P.z) - return true -} - -// double calculates 2P for curves with A=-1. -func (P *pointR1) double() { - Px, Py, Pz, Pta, Ptb := &P.x, &P.y, &P.z, &P.ta, &P.tb - a, b, c, e, f, g, h := Px, Py, Pz, Pta, Px, Py, Ptb - fp.Add(e, Px, Py) // x+y - fp.Sqr(a, Px) // A = x^2 - fp.Sqr(b, Py) // B = y^2 - fp.Sqr(c, Pz) // z^2 - fp.Add(c, c, c) // C = 2*z^2 - fp.Add(h, a, b) // H = A+B - fp.Sqr(e, e) // (x+y)^2 - fp.Sub(e, e, h) // E = (x+y)^2-A-B - fp.Sub(g, b, a) // G = B-A - fp.Sub(f, c, g) // F = C-G - fp.Mul(Pz, f, g) // Z = F * G - fp.Mul(Px, e, f) // X = E * F - fp.Mul(Py, g, h) // Y = G * H, T = E * H -} - -func (P *pointR1) mixAdd(Q *pointR3) { - fp.Add(&P.z, &P.z, &P.z) // D = 2*z1 - P.coreAddition(Q) -} - -func (P *pointR1) add(Q *pointR2) { - fp.Mul(&P.z, &P.z, &Q.z2) // D = 2*z1*z2 - P.coreAddition(&Q.pointR3) -} - -// coreAddition calculates P=P+Q for curves with A=-1. -func (P *pointR1) coreAddition(Q *pointR3) { - Px, Py, Pz, Pta, Ptb := &P.x, &P.y, &P.z, &P.ta, &P.tb - addYX2, subYX2, dt2 := &Q.addYX, &Q.subYX, &Q.dt2 - a, b, c, d, e, f, g, h := Px, Py, &fp.Elt{}, Pz, Pta, Px, Py, Ptb - fp.Mul(c, Pta, Ptb) // t1 = ta*tb - fp.Sub(h, Py, Px) // y1-x1 - fp.Add(b, Py, Px) // y1+x1 - fp.Mul(a, h, subYX2) // A = (y1-x1)*(y2-x2) - fp.Mul(b, b, addYX2) // B = (y1+x1)*(y2+x2) - fp.Mul(c, c, dt2) // C = 2*D*t1*t2 - fp.Sub(e, b, a) // E = B-A - fp.Add(h, b, a) // H = B+A - fp.Sub(f, d, c) // F = D-C - fp.Add(g, d, c) // G = D+C - fp.Mul(Pz, f, g) // Z = F * G - fp.Mul(Px, e, f) // X = E * F - fp.Mul(Py, g, h) // Y = G * H, T = E * H -} - -func (P *pointR1) oddMultiples(T []pointR2) { - var R pointR2 - n := len(T) - T[0].fromR1(P) - _2P := *P - _2P.double() - R.fromR1(&_2P) - for i := 1; i < n; i++ { - P.add(&R) - T[i].fromR1(P) - } -} - -func (P *pointR1) isEqual(Q *pointR1) bool { - l, r := &fp.Elt{}, &fp.Elt{} - fp.Mul(l, &P.x, &Q.z) - fp.Mul(r, &Q.x, &P.z) - fp.Sub(l, l, r) - b := fp.IsZero(l) - fp.Mul(l, &P.y, &Q.z) - fp.Mul(r, &Q.y, &P.z) - fp.Sub(l, l, r) - b = b && fp.IsZero(l) - fp.Mul(l, &P.ta, &P.tb) - fp.Mul(l, l, &Q.z) - fp.Mul(r, &Q.ta, &Q.tb) - fp.Mul(r, r, &P.z) - fp.Sub(l, l, r) - b = b && fp.IsZero(l) - return b && !fp.IsZero(&P.z) && !fp.IsZero(&Q.z) -} - -func (P *pointR3) neg() { - P.addYX, P.subYX = P.subYX, P.addYX - fp.Neg(&P.dt2, &P.dt2) -} - -func (P *pointR2) fromR1(Q *pointR1) { - fp.Add(&P.addYX, &Q.y, &Q.x) - fp.Sub(&P.subYX, &Q.y, &Q.x) - fp.Mul(&P.dt2, &Q.ta, &Q.tb) - fp.Mul(&P.dt2, &P.dt2, ¶mD) - fp.Add(&P.dt2, &P.dt2, &P.dt2) - fp.Add(&P.z2, &Q.z, &Q.z) -} - -func (P *pointR3) cneg(b int) { - t := &fp.Elt{} - fp.Cswap(&P.addYX, &P.subYX, uint(b)) - fp.Neg(t, &P.dt2) - fp.Cmov(&P.dt2, t, uint(b)) -} - -func (P *pointR3) cmov(Q *pointR3, b int) { - fp.Cmov(&P.addYX, &Q.addYX, uint(b)) - fp.Cmov(&P.subYX, &Q.subYX, uint(b)) - fp.Cmov(&P.dt2, &Q.dt2, uint(b)) -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/pubkey.go b/vendor/github.com/cloudflare/circl/sign/ed25519/pubkey.go deleted file mode 100644 index c3505b67a..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/pubkey.go +++ /dev/null @@ -1,9 +0,0 @@ -//go:build go1.13 -// +build go1.13 - -package ed25519 - -import cryptoEd25519 "crypto/ed25519" - -// PublicKey is the type of Ed25519 public keys. -type PublicKey cryptoEd25519.PublicKey diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/pubkey112.go b/vendor/github.com/cloudflare/circl/sign/ed25519/pubkey112.go deleted file mode 100644 index d57d86eff..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/pubkey112.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build !go1.13 -// +build !go1.13 - -package ed25519 - -// PublicKey is the type of Ed25519 public keys. -type PublicKey []byte diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/signapi.go b/vendor/github.com/cloudflare/circl/sign/ed25519/signapi.go deleted file mode 100644 index e4520f520..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/signapi.go +++ /dev/null @@ -1,87 +0,0 @@ -package ed25519 - -import ( - "crypto/rand" - "encoding/asn1" - - "github.com/cloudflare/circl/sign" -) - -var sch sign.Scheme = &scheme{} - -// Scheme returns a signature interface. -func Scheme() sign.Scheme { return sch } - -type scheme struct{} - -func (*scheme) Name() string { return "Ed25519" } -func (*scheme) PublicKeySize() int { return PublicKeySize } -func (*scheme) PrivateKeySize() int { return PrivateKeySize } -func (*scheme) SignatureSize() int { return SignatureSize } -func (*scheme) SeedSize() int { return SeedSize } -func (*scheme) TLSIdentifier() uint { return 0x0807 } -func (*scheme) SupportsContext() bool { return false } -func (*scheme) Oid() asn1.ObjectIdentifier { - return asn1.ObjectIdentifier{1, 3, 101, 112} -} - -func (*scheme) GenerateKey() (sign.PublicKey, sign.PrivateKey, error) { - return GenerateKey(rand.Reader) -} - -func (*scheme) Sign( - sk sign.PrivateKey, - message []byte, - opts *sign.SignatureOpts, -) []byte { - priv, ok := sk.(PrivateKey) - if !ok { - panic(sign.ErrTypeMismatch) - } - if opts != nil && opts.Context != "" { - panic(sign.ErrContextNotSupported) - } - return Sign(priv, message) -} - -func (*scheme) Verify( - pk sign.PublicKey, - message, signature []byte, - opts *sign.SignatureOpts, -) bool { - pub, ok := pk.(PublicKey) - if !ok { - panic(sign.ErrTypeMismatch) - } - if opts != nil { - if opts.Context != "" { - panic(sign.ErrContextNotSupported) - } - } - return Verify(pub, message, signature) -} - -func (*scheme) DeriveKey(seed []byte) (sign.PublicKey, sign.PrivateKey) { - privateKey := NewKeyFromSeed(seed) - publicKey := make(PublicKey, PublicKeySize) - copy(publicKey, privateKey[SeedSize:]) - return publicKey, privateKey -} - -func (*scheme) UnmarshalBinaryPublicKey(buf []byte) (sign.PublicKey, error) { - if len(buf) < PublicKeySize { - return nil, sign.ErrPubKeySize - } - pub := make(PublicKey, PublicKeySize) - copy(pub, buf[:PublicKeySize]) - return pub, nil -} - -func (*scheme) UnmarshalBinaryPrivateKey(buf []byte) (sign.PrivateKey, error) { - if len(buf) < PrivateKeySize { - return nil, sign.ErrPrivKeySize - } - priv := make(PrivateKey, PrivateKeySize) - copy(priv, buf[:PrivateKeySize]) - return priv, nil -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed25519/tables.go b/vendor/github.com/cloudflare/circl/sign/ed25519/tables.go deleted file mode 100644 index 8763b426f..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed25519/tables.go +++ /dev/null @@ -1,213 +0,0 @@ -package ed25519 - -import fp "github.com/cloudflare/circl/math/fp25519" - -var tabSign = [fxV][fx2w1]pointR3{ - { - pointR3{ - addYX: fp.Elt{0x85, 0x3b, 0x8c, 0xf5, 0xc6, 0x93, 0xbc, 0x2f, 0x19, 0x0e, 0x8c, 0xfb, 0xc6, 0x2d, 0x93, 0xcf, 0xc2, 0x42, 0x3d, 0x64, 0x98, 0x48, 0x0b, 0x27, 0x65, 0xba, 0xd4, 0x33, 0x3a, 0x9d, 0xcf, 0x07}, - subYX: fp.Elt{0x3e, 0x91, 0x40, 0xd7, 0x05, 0x39, 0x10, 0x9d, 0xb3, 0xbe, 0x40, 0xd1, 0x05, 0x9f, 0x39, 0xfd, 0x09, 0x8a, 0x8f, 0x68, 0x34, 0x84, 0xc1, 0xa5, 0x67, 0x12, 0xf8, 0x98, 0x92, 0x2f, 0xfd, 0x44}, - dt2: fp.Elt{0x68, 0xaa, 0x7a, 0x87, 0x05, 0x12, 0xc9, 0xab, 0x9e, 0xc4, 0xaa, 0xcc, 0x23, 0xe8, 0xd9, 0x26, 0x8c, 0x59, 0x43, 0xdd, 0xcb, 0x7d, 0x1b, 0x5a, 0xa8, 0x65, 0x0c, 0x9f, 0x68, 0x7b, 0x11, 0x6f}, - }, - { - addYX: fp.Elt{0x7c, 0xb0, 0x9e, 0xe6, 0xc5, 0xbf, 0xfa, 0x13, 0x8e, 0x0d, 0x22, 0xde, 0xc8, 0xd1, 0xce, 0x52, 0x02, 0xd5, 0x62, 0x31, 0x71, 0x0e, 0x8e, 0x9d, 0xb0, 0xd6, 0x00, 0xa5, 0x5a, 0x0e, 0xce, 0x72}, - subYX: fp.Elt{0x1a, 0x8e, 0x5c, 0xdc, 0xa4, 0xb3, 0x6c, 0x51, 0x18, 0xa0, 0x09, 0x80, 0x9a, 0x46, 0x33, 0xd5, 0xe0, 0x3c, 0x4d, 0x3b, 0xfc, 0x49, 0xa2, 0x43, 0x29, 0xe1, 0x29, 0xa9, 0x93, 0xea, 0x7c, 0x35}, - dt2: fp.Elt{0x08, 0x46, 0x6f, 0x68, 0x7f, 0x0b, 0x7c, 0x9e, 0xad, 0xba, 0x07, 0x61, 0x74, 0x83, 0x2f, 0xfc, 0x26, 0xd6, 0x09, 0xb9, 0x00, 0x34, 0x36, 0x4f, 0x01, 0xf3, 0x48, 0xdb, 0x43, 0xba, 0x04, 0x44}, - }, - { - addYX: fp.Elt{0x4c, 0xda, 0x0d, 0x13, 0x66, 0xfd, 0x82, 0x84, 0x9f, 0x75, 0x5b, 0xa2, 0x17, 0xfe, 0x34, 0xbf, 0x1f, 0xcb, 0xba, 0x90, 0x55, 0x80, 0x83, 0xfd, 0x63, 0xb9, 0x18, 0xf8, 0x5b, 0x5d, 0x94, 0x1e}, - subYX: fp.Elt{0xb9, 0xdb, 0x6c, 0x04, 0x88, 0x22, 0xd8, 0x79, 0x83, 0x2f, 0x8d, 0x65, 0x6b, 0xd2, 0xab, 0x1b, 0xdd, 0x65, 0xe5, 0x93, 0x63, 0xf8, 0xa2, 0xd8, 0x3c, 0xf1, 0x4b, 0xc5, 0x99, 0xd1, 0xf2, 0x12}, - dt2: fp.Elt{0x05, 0x4c, 0xb8, 0x3b, 0xfe, 0xf5, 0x9f, 0x2e, 0xd1, 0xb2, 0xb8, 0xff, 0xfe, 0x6d, 0xd9, 0x37, 0xe0, 0xae, 0xb4, 0x5a, 0x51, 0x80, 0x7e, 0x9b, 0x1d, 0xd1, 0x8d, 0x8c, 0x56, 0xb1, 0x84, 0x35}, - }, - { - addYX: fp.Elt{0x39, 0x71, 0x43, 0x34, 0xe3, 0x42, 0x45, 0xa1, 0xf2, 0x68, 0x71, 0xa7, 0xe8, 0x23, 0xfd, 0x9f, 0x86, 0x48, 0xff, 0xe5, 0x96, 0x74, 0xcf, 0x05, 0x49, 0xe2, 0xb3, 0x6c, 0x17, 0x77, 0x2f, 0x6d}, - subYX: fp.Elt{0x73, 0x3f, 0xc1, 0xc7, 0x6a, 0x66, 0xa1, 0x20, 0xdd, 0x11, 0xfb, 0x7a, 0x6e, 0xa8, 0x51, 0xb8, 0x3f, 0x9d, 0xa2, 0x97, 0x84, 0xb5, 0xc7, 0x90, 0x7c, 0xab, 0x48, 0xd6, 0x84, 0xa3, 0xd5, 0x1a}, - dt2: fp.Elt{0x63, 0x27, 0x3c, 0x49, 0x4b, 0xfc, 0x22, 0xf2, 0x0b, 0x50, 0xc2, 0x0f, 0xb4, 0x1f, 0x31, 0x0c, 0x2f, 0x53, 0xab, 0xaa, 0x75, 0x6f, 0xe0, 0x69, 0x39, 0x56, 0xe0, 0x3b, 0xb7, 0xa8, 0xbf, 0x45}, - }, - }, - { - { - addYX: fp.Elt{0x00, 0x45, 0xd9, 0x0d, 0x58, 0x03, 0xfc, 0x29, 0x93, 0xec, 0xbb, 0x6f, 0xa4, 0x7a, 0xd2, 0xec, 0xf8, 0xa7, 0xe2, 0xc2, 0x5f, 0x15, 0x0a, 0x13, 0xd5, 0xa1, 0x06, 0xb7, 0x1a, 0x15, 0x6b, 0x41}, - subYX: fp.Elt{0x85, 0x8c, 0xb2, 0x17, 0xd6, 0x3b, 0x0a, 0xd3, 0xea, 0x3b, 0x77, 0x39, 0xb7, 0x77, 0xd3, 0xc5, 0xbf, 0x5c, 0x6a, 0x1e, 0x8c, 0xe7, 0xc6, 0xc6, 0xc4, 0xb7, 0x2a, 0x8b, 0xf7, 0xb8, 0x61, 0x0d}, - dt2: fp.Elt{0xb0, 0x36, 0xc1, 0xe9, 0xef, 0xd7, 0xa8, 0x56, 0x20, 0x4b, 0xe4, 0x58, 0xcd, 0xe5, 0x07, 0xbd, 0xab, 0xe0, 0x57, 0x1b, 0xda, 0x2f, 0xe6, 0xaf, 0xd2, 0xe8, 0x77, 0x42, 0xf7, 0x2a, 0x1a, 0x19}, - }, - { - addYX: fp.Elt{0x6a, 0x6d, 0x6d, 0xd1, 0xfa, 0xf5, 0x03, 0x30, 0xbd, 0x6d, 0xc2, 0xc8, 0xf5, 0x38, 0x80, 0x4f, 0xb2, 0xbe, 0xa1, 0x76, 0x50, 0x1a, 0x73, 0xf2, 0x78, 0x2b, 0x8e, 0x3a, 0x1e, 0x34, 0x47, 0x7b}, - subYX: fp.Elt{0xc3, 0x2c, 0x36, 0xdc, 0xc5, 0x45, 0xbc, 0xef, 0x1b, 0x64, 0xd6, 0x65, 0x28, 0xe9, 0xda, 0x84, 0x13, 0xbe, 0x27, 0x8e, 0x3f, 0x98, 0x2a, 0x37, 0xee, 0x78, 0x97, 0xd6, 0xc0, 0x6f, 0xb4, 0x53}, - dt2: fp.Elt{0x58, 0x5d, 0xa7, 0xa3, 0x68, 0xbb, 0x20, 0x30, 0x2e, 0x03, 0xe9, 0xb1, 0xd4, 0x90, 0x72, 0xe3, 0x71, 0xb2, 0x36, 0x3e, 0x73, 0xa0, 0x2e, 0x3d, 0xd1, 0x85, 0x33, 0x62, 0x4e, 0xa7, 0x7b, 0x31}, - }, - { - addYX: fp.Elt{0xbf, 0xc4, 0x38, 0x53, 0xfb, 0x68, 0xa9, 0x77, 0xce, 0x55, 0xf9, 0x05, 0xcb, 0xeb, 0xfb, 0x8c, 0x46, 0xc2, 0x32, 0x7c, 0xf0, 0xdb, 0xd7, 0x2c, 0x62, 0x8e, 0xdd, 0x54, 0x75, 0xcf, 0x3f, 0x33}, - subYX: fp.Elt{0x49, 0x50, 0x1f, 0x4e, 0x6e, 0x55, 0x55, 0xde, 0x8c, 0x4e, 0x77, 0x96, 0x38, 0x3b, 0xfe, 0xb6, 0x43, 0x3c, 0x86, 0x69, 0xc2, 0x72, 0x66, 0x1f, 0x6b, 0xf9, 0x87, 0xbc, 0x4f, 0x37, 0x3e, 0x3c}, - dt2: fp.Elt{0xd2, 0x2f, 0x06, 0x6b, 0x08, 0x07, 0x69, 0x77, 0xc0, 0x94, 0xcc, 0xae, 0x43, 0x00, 0x59, 0x6e, 0xa3, 0x63, 0xa8, 0xdd, 0xfa, 0x24, 0x18, 0xd0, 0x35, 0xc7, 0x78, 0xf7, 0x0d, 0xd4, 0x5a, 0x1e}, - }, - { - addYX: fp.Elt{0x45, 0xc1, 0x17, 0x51, 0xf8, 0xed, 0x7e, 0xc7, 0xa9, 0x1a, 0x11, 0x6e, 0x2d, 0xef, 0x0b, 0xd5, 0x3f, 0x98, 0xb0, 0xa3, 0x9d, 0x65, 0xf1, 0xcd, 0x53, 0x4a, 0x8a, 0x18, 0x70, 0x0a, 0x7f, 0x23}, - subYX: fp.Elt{0xdd, 0xef, 0xbe, 0x3a, 0x31, 0xe0, 0xbc, 0xbe, 0x6d, 0x5d, 0x79, 0x87, 0xd6, 0xbe, 0x68, 0xe3, 0x59, 0x76, 0x8c, 0x86, 0x0e, 0x7a, 0x92, 0x13, 0x14, 0x8f, 0x67, 0xb3, 0xcb, 0x1a, 0x76, 0x76}, - dt2: fp.Elt{0x56, 0x7a, 0x1c, 0x9d, 0xca, 0x96, 0xf9, 0xf9, 0x03, 0x21, 0xd4, 0xe8, 0xb3, 0xd5, 0xe9, 0x52, 0xc8, 0x54, 0x1e, 0x1b, 0x13, 0xb6, 0xfd, 0x47, 0x7d, 0x02, 0x32, 0x33, 0x27, 0xe2, 0x1f, 0x19}, - }, - }, -} - -var tabVerif = [1 << (omegaFix - 2)]pointR3{ - { /* 1P */ - addYX: fp.Elt{0x85, 0x3b, 0x8c, 0xf5, 0xc6, 0x93, 0xbc, 0x2f, 0x19, 0x0e, 0x8c, 0xfb, 0xc6, 0x2d, 0x93, 0xcf, 0xc2, 0x42, 0x3d, 0x64, 0x98, 0x48, 0x0b, 0x27, 0x65, 0xba, 0xd4, 0x33, 0x3a, 0x9d, 0xcf, 0x07}, - subYX: fp.Elt{0x3e, 0x91, 0x40, 0xd7, 0x05, 0x39, 0x10, 0x9d, 0xb3, 0xbe, 0x40, 0xd1, 0x05, 0x9f, 0x39, 0xfd, 0x09, 0x8a, 0x8f, 0x68, 0x34, 0x84, 0xc1, 0xa5, 0x67, 0x12, 0xf8, 0x98, 0x92, 0x2f, 0xfd, 0x44}, - dt2: fp.Elt{0x68, 0xaa, 0x7a, 0x87, 0x05, 0x12, 0xc9, 0xab, 0x9e, 0xc4, 0xaa, 0xcc, 0x23, 0xe8, 0xd9, 0x26, 0x8c, 0x59, 0x43, 0xdd, 0xcb, 0x7d, 0x1b, 0x5a, 0xa8, 0x65, 0x0c, 0x9f, 0x68, 0x7b, 0x11, 0x6f}, - }, - { /* 3P */ - addYX: fp.Elt{0x30, 0x97, 0xee, 0x4c, 0xa8, 0xb0, 0x25, 0xaf, 0x8a, 0x4b, 0x86, 0xe8, 0x30, 0x84, 0x5a, 0x02, 0x32, 0x67, 0x01, 0x9f, 0x02, 0x50, 0x1b, 0xc1, 0xf4, 0xf8, 0x80, 0x9a, 0x1b, 0x4e, 0x16, 0x7a}, - subYX: fp.Elt{0x65, 0xd2, 0xfc, 0xa4, 0xe8, 0x1f, 0x61, 0x56, 0x7d, 0xba, 0xc1, 0xe5, 0xfd, 0x53, 0xd3, 0x3b, 0xbd, 0xd6, 0x4b, 0x21, 0x1a, 0xf3, 0x31, 0x81, 0x62, 0xda, 0x5b, 0x55, 0x87, 0x15, 0xb9, 0x2a}, - dt2: fp.Elt{0x89, 0xd8, 0xd0, 0x0d, 0x3f, 0x93, 0xae, 0x14, 0x62, 0xda, 0x35, 0x1c, 0x22, 0x23, 0x94, 0x58, 0x4c, 0xdb, 0xf2, 0x8c, 0x45, 0xe5, 0x70, 0xd1, 0xc6, 0xb4, 0xb9, 0x12, 0xaf, 0x26, 0x28, 0x5a}, - }, - { /* 5P */ - addYX: fp.Elt{0x33, 0xbb, 0xa5, 0x08, 0x44, 0xbc, 0x12, 0xa2, 0x02, 0xed, 0x5e, 0xc7, 0xc3, 0x48, 0x50, 0x8d, 0x44, 0xec, 0xbf, 0x5a, 0x0c, 0xeb, 0x1b, 0xdd, 0xeb, 0x06, 0xe2, 0x46, 0xf1, 0xcc, 0x45, 0x29}, - subYX: fp.Elt{0xba, 0xd6, 0x47, 0xa4, 0xc3, 0x82, 0x91, 0x7f, 0xb7, 0x29, 0x27, 0x4b, 0xd1, 0x14, 0x00, 0xd5, 0x87, 0xa0, 0x64, 0xb8, 0x1c, 0xf1, 0x3c, 0xe3, 0xf3, 0x55, 0x1b, 0xeb, 0x73, 0x7e, 0x4a, 0x15}, - dt2: fp.Elt{0x85, 0x82, 0x2a, 0x81, 0xf1, 0xdb, 0xbb, 0xbc, 0xfc, 0xd1, 0xbd, 0xd0, 0x07, 0x08, 0x0e, 0x27, 0x2d, 0xa7, 0xbd, 0x1b, 0x0b, 0x67, 0x1b, 0xb4, 0x9a, 0xb6, 0x3b, 0x6b, 0x69, 0xbe, 0xaa, 0x43}, - }, - { /* 7P */ - addYX: fp.Elt{0xbf, 0xa3, 0x4e, 0x94, 0xd0, 0x5c, 0x1a, 0x6b, 0xd2, 0xc0, 0x9d, 0xb3, 0x3a, 0x35, 0x70, 0x74, 0x49, 0x2e, 0x54, 0x28, 0x82, 0x52, 0xb2, 0x71, 0x7e, 0x92, 0x3c, 0x28, 0x69, 0xea, 0x1b, 0x46}, - subYX: fp.Elt{0xb1, 0x21, 0x32, 0xaa, 0x9a, 0x2c, 0x6f, 0xba, 0xa7, 0x23, 0xba, 0x3b, 0x53, 0x21, 0xa0, 0x6c, 0x3a, 0x2c, 0x19, 0x92, 0x4f, 0x76, 0xea, 0x9d, 0xe0, 0x17, 0x53, 0x2e, 0x5d, 0xdd, 0x6e, 0x1d}, - dt2: fp.Elt{0xa2, 0xb3, 0xb8, 0x01, 0xc8, 0x6d, 0x83, 0xf1, 0x9a, 0xa4, 0x3e, 0x05, 0x47, 0x5f, 0x03, 0xb3, 0xf3, 0xad, 0x77, 0x58, 0xba, 0x41, 0x9c, 0x52, 0xa7, 0x90, 0x0f, 0x6a, 0x1c, 0xbb, 0x9f, 0x7a}, - }, - { /* 9P */ - addYX: fp.Elt{0x2f, 0x63, 0xa8, 0xa6, 0x8a, 0x67, 0x2e, 0x9b, 0xc5, 0x46, 0xbc, 0x51, 0x6f, 0x9e, 0x50, 0xa6, 0xb5, 0xf5, 0x86, 0xc6, 0xc9, 0x33, 0xb2, 0xce, 0x59, 0x7f, 0xdd, 0x8a, 0x33, 0xed, 0xb9, 0x34}, - subYX: fp.Elt{0x64, 0x80, 0x9d, 0x03, 0x7e, 0x21, 0x6e, 0xf3, 0x9b, 0x41, 0x20, 0xf5, 0xb6, 0x81, 0xa0, 0x98, 0x44, 0xb0, 0x5e, 0xe7, 0x08, 0xc6, 0xcb, 0x96, 0x8f, 0x9c, 0xdc, 0xfa, 0x51, 0x5a, 0xc0, 0x49}, - dt2: fp.Elt{0x1b, 0xaf, 0x45, 0x90, 0xbf, 0xe8, 0xb4, 0x06, 0x2f, 0xd2, 0x19, 0xa7, 0xe8, 0x83, 0xff, 0xe2, 0x16, 0xcf, 0xd4, 0x93, 0x29, 0xfc, 0xf6, 0xaa, 0x06, 0x8b, 0x00, 0x1b, 0x02, 0x72, 0xc1, 0x73}, - }, - { /* 11P */ - addYX: fp.Elt{0xde, 0x2a, 0x80, 0x8a, 0x84, 0x00, 0xbf, 0x2f, 0x27, 0x2e, 0x30, 0x02, 0xcf, 0xfe, 0xd9, 0xe5, 0x06, 0x34, 0x70, 0x17, 0x71, 0x84, 0x3e, 0x11, 0xaf, 0x8f, 0x6d, 0x54, 0xe2, 0xaa, 0x75, 0x42}, - subYX: fp.Elt{0x48, 0x43, 0x86, 0x49, 0x02, 0x5b, 0x5f, 0x31, 0x81, 0x83, 0x08, 0x77, 0x69, 0xb3, 0xd6, 0x3e, 0x95, 0xeb, 0x8d, 0x6a, 0x55, 0x75, 0xa0, 0xa3, 0x7f, 0xc7, 0xd5, 0x29, 0x80, 0x59, 0xab, 0x18}, - dt2: fp.Elt{0xe9, 0x89, 0x60, 0xfd, 0xc5, 0x2c, 0x2b, 0xd8, 0xa4, 0xe4, 0x82, 0x32, 0xa1, 0xb4, 0x1e, 0x03, 0x22, 0x86, 0x1a, 0xb5, 0x99, 0x11, 0x31, 0x44, 0x48, 0xf9, 0x3d, 0xb5, 0x22, 0x55, 0xc6, 0x3d}, - }, - { /* 13P */ - addYX: fp.Elt{0x6d, 0x7f, 0x00, 0xa2, 0x22, 0xc2, 0x70, 0xbf, 0xdb, 0xde, 0xbc, 0xb5, 0x9a, 0xb3, 0x84, 0xbf, 0x07, 0xba, 0x07, 0xfb, 0x12, 0x0e, 0x7a, 0x53, 0x41, 0xf2, 0x46, 0xc3, 0xee, 0xd7, 0x4f, 0x23}, - subYX: fp.Elt{0x93, 0xbf, 0x7f, 0x32, 0x3b, 0x01, 0x6f, 0x50, 0x6b, 0x6f, 0x77, 0x9b, 0xc9, 0xeb, 0xfc, 0xae, 0x68, 0x59, 0xad, 0xaa, 0x32, 0xb2, 0x12, 0x9d, 0xa7, 0x24, 0x60, 0x17, 0x2d, 0x88, 0x67, 0x02}, - dt2: fp.Elt{0x78, 0xa3, 0x2e, 0x73, 0x19, 0xa1, 0x60, 0x53, 0x71, 0xd4, 0x8d, 0xdf, 0xb1, 0xe6, 0x37, 0x24, 0x33, 0xe5, 0xa7, 0x91, 0xf8, 0x37, 0xef, 0xa2, 0x63, 0x78, 0x09, 0xaa, 0xfd, 0xa6, 0x7b, 0x49}, - }, - { /* 15P */ - addYX: fp.Elt{0xa0, 0xea, 0xcf, 0x13, 0x03, 0xcc, 0xce, 0x24, 0x6d, 0x24, 0x9c, 0x18, 0x8d, 0xc2, 0x48, 0x86, 0xd0, 0xd4, 0xf2, 0xc1, 0xfa, 0xbd, 0xbd, 0x2d, 0x2b, 0xe7, 0x2d, 0xf1, 0x17, 0x29, 0xe2, 0x61}, - subYX: fp.Elt{0x0b, 0xcf, 0x8c, 0x46, 0x86, 0xcd, 0x0b, 0x04, 0xd6, 0x10, 0x99, 0x2a, 0xa4, 0x9b, 0x82, 0xd3, 0x92, 0x51, 0xb2, 0x07, 0x08, 0x30, 0x08, 0x75, 0xbf, 0x5e, 0xd0, 0x18, 0x42, 0xcd, 0xb5, 0x43}, - dt2: fp.Elt{0x16, 0xb5, 0xd0, 0x9b, 0x2f, 0x76, 0x9a, 0x5d, 0xee, 0xde, 0x3f, 0x37, 0x4e, 0xaf, 0x38, 0xeb, 0x70, 0x42, 0xd6, 0x93, 0x7d, 0x5a, 0x2e, 0x03, 0x42, 0xd8, 0xe4, 0x0a, 0x21, 0x61, 0x1d, 0x51}, - }, - { /* 17P */ - addYX: fp.Elt{0x81, 0x9d, 0x0e, 0x95, 0xef, 0x76, 0xc6, 0x92, 0x4f, 0x04, 0xd7, 0xc0, 0xcd, 0x20, 0x46, 0xa5, 0x48, 0x12, 0x8f, 0x6f, 0x64, 0x36, 0x9b, 0xaa, 0xe3, 0x55, 0xb8, 0xdd, 0x24, 0x59, 0x32, 0x6d}, - subYX: fp.Elt{0x87, 0xde, 0x20, 0x44, 0x48, 0x86, 0x13, 0x08, 0xb4, 0xed, 0x92, 0xb5, 0x16, 0xf0, 0x1c, 0x8a, 0x25, 0x2d, 0x94, 0x29, 0x27, 0x4e, 0xfa, 0x39, 0x10, 0x28, 0x48, 0xe2, 0x6f, 0xfe, 0xa7, 0x71}, - dt2: fp.Elt{0x54, 0xc8, 0xc8, 0xa5, 0xb8, 0x82, 0x71, 0x6c, 0x03, 0x2a, 0x5f, 0xfe, 0x79, 0x14, 0xfd, 0x33, 0x0c, 0x8d, 0x77, 0x83, 0x18, 0x59, 0xcf, 0x72, 0xa9, 0xea, 0x9e, 0x55, 0xb6, 0xc4, 0x46, 0x47}, - }, - { /* 19P */ - addYX: fp.Elt{0x2b, 0x9a, 0xc6, 0x6d, 0x3c, 0x7b, 0x77, 0xd3, 0x17, 0xf6, 0x89, 0x6f, 0x27, 0xb2, 0xfa, 0xde, 0xb5, 0x16, 0x3a, 0xb5, 0xf7, 0x1c, 0x65, 0x45, 0xb7, 0x9f, 0xfe, 0x34, 0xde, 0x51, 0x9a, 0x5c}, - subYX: fp.Elt{0x47, 0x11, 0x74, 0x64, 0xc8, 0x46, 0x85, 0x34, 0x49, 0xc8, 0xfc, 0x0e, 0xdd, 0xae, 0x35, 0x7d, 0x32, 0xa3, 0x72, 0x06, 0x76, 0x9a, 0x93, 0xff, 0xd6, 0xe6, 0xb5, 0x7d, 0x49, 0x63, 0x96, 0x21}, - dt2: fp.Elt{0x67, 0x0e, 0xf1, 0x79, 0xcf, 0xf1, 0x10, 0xf5, 0x5b, 0x51, 0x58, 0xe6, 0xa1, 0xda, 0xdd, 0xff, 0x77, 0x22, 0x14, 0x10, 0x17, 0xa7, 0xc3, 0x09, 0xbb, 0x23, 0x82, 0x60, 0x3c, 0x50, 0x04, 0x48}, - }, - { /* 21P */ - addYX: fp.Elt{0xc7, 0x7f, 0xa3, 0x2c, 0xd0, 0x9e, 0x24, 0xc4, 0xab, 0xac, 0x15, 0xa6, 0xe3, 0xa0, 0x59, 0xa0, 0x23, 0x0e, 0x6e, 0xc9, 0xd7, 0x6e, 0xa9, 0x88, 0x6d, 0x69, 0x50, 0x16, 0xa5, 0x98, 0x33, 0x55}, - subYX: fp.Elt{0x75, 0xd1, 0x36, 0x3a, 0xd2, 0x21, 0x68, 0x3b, 0x32, 0x9e, 0x9b, 0xe9, 0xa7, 0x0a, 0xb4, 0xbb, 0x47, 0x8a, 0x83, 0x20, 0xe4, 0x5c, 0x9e, 0x5d, 0x5e, 0x4c, 0xde, 0x58, 0x88, 0x09, 0x1e, 0x77}, - dt2: fp.Elt{0xdf, 0x1e, 0x45, 0x78, 0xd2, 0xf5, 0x12, 0x9a, 0xcb, 0x9c, 0x89, 0x85, 0x79, 0x5d, 0xda, 0x3a, 0x08, 0x95, 0xa5, 0x9f, 0x2d, 0x4a, 0x7f, 0x47, 0x11, 0xa6, 0xf5, 0x8f, 0xd6, 0xd1, 0x5e, 0x5a}, - }, - { /* 23P */ - addYX: fp.Elt{0x83, 0x0e, 0x15, 0xfe, 0x2a, 0x12, 0x95, 0x11, 0xd8, 0x35, 0x4b, 0x7e, 0x25, 0x9a, 0x20, 0xcf, 0x20, 0x1e, 0x71, 0x1e, 0x29, 0xf8, 0x87, 0x73, 0xf0, 0x92, 0xbf, 0xd8, 0x97, 0xb8, 0xac, 0x44}, - subYX: fp.Elt{0x59, 0x73, 0x52, 0x58, 0xc5, 0xe0, 0xe5, 0xba, 0x7e, 0x9d, 0xdb, 0xca, 0x19, 0x5c, 0x2e, 0x39, 0xe9, 0xab, 0x1c, 0xda, 0x1e, 0x3c, 0x65, 0x28, 0x44, 0xdc, 0xef, 0x5f, 0x13, 0x60, 0x9b, 0x01}, - dt2: fp.Elt{0x83, 0x4b, 0x13, 0x5e, 0x14, 0x68, 0x60, 0x1e, 0x16, 0x4c, 0x30, 0x24, 0x4f, 0xe6, 0xf5, 0xc4, 0xd7, 0x3e, 0x1a, 0xfc, 0xa8, 0x88, 0x6e, 0x50, 0x92, 0x2f, 0xad, 0xe6, 0xfd, 0x49, 0x0c, 0x15}, - }, - { /* 25P */ - addYX: fp.Elt{0x38, 0x11, 0x47, 0x09, 0x95, 0xf2, 0x7b, 0x8e, 0x51, 0xa6, 0x75, 0x4f, 0x39, 0xef, 0x6f, 0x5d, 0xad, 0x08, 0xa7, 0x25, 0xc4, 0x79, 0xaf, 0x10, 0x22, 0x99, 0xb9, 0x5b, 0x07, 0x5a, 0x2b, 0x6b}, - subYX: fp.Elt{0x68, 0xa8, 0xdc, 0x9c, 0x3c, 0x86, 0x49, 0xb8, 0xd0, 0x4a, 0x71, 0xb8, 0xdb, 0x44, 0x3f, 0xc8, 0x8d, 0x16, 0x36, 0x0c, 0x56, 0xe3, 0x3e, 0xfe, 0xc1, 0xfb, 0x05, 0x1e, 0x79, 0xd7, 0xa6, 0x78}, - dt2: fp.Elt{0x76, 0xb9, 0xa0, 0x47, 0x4b, 0x70, 0xbf, 0x58, 0xd5, 0x48, 0x17, 0x74, 0x55, 0xb3, 0x01, 0xa6, 0x90, 0xf5, 0x42, 0xd5, 0xb1, 0x1f, 0x2b, 0xaa, 0x00, 0x5d, 0xd5, 0x4a, 0xfc, 0x7f, 0x5c, 0x72}, - }, - { /* 27P */ - addYX: fp.Elt{0xb2, 0x99, 0xcf, 0xd1, 0x15, 0x67, 0x42, 0xe4, 0x34, 0x0d, 0xa2, 0x02, 0x11, 0xd5, 0x52, 0x73, 0x9f, 0x10, 0x12, 0x8b, 0x7b, 0x15, 0xd1, 0x23, 0xa3, 0xf3, 0xb1, 0x7c, 0x27, 0xc9, 0x4c, 0x79}, - subYX: fp.Elt{0xc0, 0x98, 0xd0, 0x1c, 0xf7, 0x2b, 0x80, 0x91, 0x66, 0x63, 0x5e, 0xed, 0xa4, 0x6c, 0x41, 0xfe, 0x4c, 0x99, 0x02, 0x49, 0x71, 0x5d, 0x58, 0xdf, 0xe7, 0xfa, 0x55, 0xf8, 0x25, 0x46, 0xd5, 0x4c}, - dt2: fp.Elt{0x53, 0x50, 0xac, 0xc2, 0x26, 0xc4, 0xf6, 0x4a, 0x58, 0x72, 0xf6, 0x32, 0xad, 0xed, 0x9a, 0xbc, 0x21, 0x10, 0x31, 0x0a, 0xf1, 0x32, 0xd0, 0x2a, 0x85, 0x8e, 0xcc, 0x6f, 0x7b, 0x35, 0x08, 0x70}, - }, - { /* 29P */ - addYX: fp.Elt{0x01, 0x3f, 0x77, 0x38, 0x27, 0x67, 0x88, 0x0b, 0xfb, 0xcc, 0xfb, 0x95, 0xfa, 0xc8, 0xcc, 0xb8, 0xb6, 0x29, 0xad, 0xb9, 0xa3, 0xd5, 0x2d, 0x8d, 0x6a, 0x0f, 0xad, 0x51, 0x98, 0x7e, 0xef, 0x06}, - subYX: fp.Elt{0x34, 0x4a, 0x58, 0x82, 0xbb, 0x9f, 0x1b, 0xd0, 0x2b, 0x79, 0xb4, 0xd2, 0x63, 0x64, 0xab, 0x47, 0x02, 0x62, 0x53, 0x48, 0x9c, 0x63, 0x31, 0xb6, 0x28, 0xd4, 0xd6, 0x69, 0x36, 0x2a, 0xa9, 0x13}, - dt2: fp.Elt{0xe5, 0x7d, 0x57, 0xc0, 0x1c, 0x77, 0x93, 0xca, 0x5c, 0xdc, 0x35, 0x50, 0x1e, 0xe4, 0x40, 0x75, 0x71, 0xe0, 0x02, 0xd8, 0x01, 0x0f, 0x68, 0x24, 0x6a, 0xf8, 0x2a, 0x8a, 0xdf, 0x6d, 0x29, 0x3c}, - }, - { /* 31P */ - addYX: fp.Elt{0x13, 0xa7, 0x14, 0xd9, 0xf9, 0x15, 0xad, 0xae, 0x12, 0xf9, 0x8f, 0x8c, 0xf9, 0x7b, 0x2f, 0xa9, 0x30, 0xd7, 0x53, 0x9f, 0x17, 0x23, 0xf8, 0xaf, 0xba, 0x77, 0x0c, 0x49, 0x93, 0xd3, 0x99, 0x7a}, - subYX: fp.Elt{0x41, 0x25, 0x1f, 0xbb, 0x2e, 0x4d, 0xeb, 0xfc, 0x1f, 0xb9, 0xad, 0x40, 0xc7, 0x10, 0x95, 0xb8, 0x05, 0xad, 0xa1, 0xd0, 0x7d, 0xa3, 0x71, 0xfc, 0x7b, 0x71, 0x47, 0x07, 0x70, 0x2c, 0x89, 0x0a}, - dt2: fp.Elt{0xe8, 0xa3, 0xbd, 0x36, 0x24, 0xed, 0x52, 0x8f, 0x94, 0x07, 0xe8, 0x57, 0x41, 0xc8, 0xa8, 0x77, 0xe0, 0x9c, 0x2f, 0x26, 0x63, 0x65, 0xa9, 0xa5, 0xd2, 0xf7, 0x02, 0x83, 0xd2, 0x62, 0x67, 0x28}, - }, - { /* 33P */ - addYX: fp.Elt{0x25, 0x5b, 0xe3, 0x3c, 0x09, 0x36, 0x78, 0x4e, 0x97, 0xaa, 0x6b, 0xb2, 0x1d, 0x18, 0xe1, 0x82, 0x3f, 0xb8, 0xc7, 0xcb, 0xd3, 0x92, 0xc1, 0x0c, 0x3a, 0x9d, 0x9d, 0x6a, 0x04, 0xda, 0xf1, 0x32}, - subYX: fp.Elt{0xbd, 0xf5, 0x2e, 0xce, 0x2b, 0x8e, 0x55, 0x7c, 0x63, 0xbc, 0x47, 0x67, 0xb4, 0x6c, 0x98, 0xe4, 0xb8, 0x89, 0xbb, 0x3b, 0x9f, 0x17, 0x4a, 0x15, 0x7a, 0x76, 0xf1, 0xd6, 0xa3, 0xf2, 0x86, 0x76}, - dt2: fp.Elt{0x6a, 0x7c, 0x59, 0x6d, 0xa6, 0x12, 0x8d, 0xaa, 0x2b, 0x85, 0xd3, 0x04, 0x03, 0x93, 0x11, 0x8f, 0x22, 0xb0, 0x09, 0xc2, 0x73, 0xdc, 0x91, 0x3f, 0xa6, 0x28, 0xad, 0xa9, 0xf8, 0x05, 0x13, 0x56}, - }, - { /* 35P */ - addYX: fp.Elt{0xd1, 0xae, 0x92, 0xec, 0x8d, 0x97, 0x0c, 0x10, 0xe5, 0x73, 0x6d, 0x4d, 0x43, 0xd5, 0x43, 0xca, 0x48, 0xba, 0x47, 0xd8, 0x22, 0x1b, 0x13, 0x83, 0x2c, 0x4d, 0x5d, 0xe3, 0x53, 0xec, 0xaa}, - subYX: fp.Elt{0xd5, 0xc0, 0xb0, 0xe7, 0x28, 0xcc, 0x22, 0x67, 0x53, 0x5c, 0x07, 0xdb, 0xbb, 0xe9, 0x9d, 0x70, 0x61, 0x0a, 0x01, 0xd7, 0xa7, 0x8d, 0xf6, 0xca, 0x6c, 0xcc, 0x57, 0x2c, 0xef, 0x1a, 0x0a, 0x03}, - dt2: fp.Elt{0xaa, 0xd2, 0x3a, 0x00, 0x73, 0xf7, 0xb1, 0x7b, 0x08, 0x66, 0x21, 0x2b, 0x80, 0x29, 0x3f, 0x0b, 0x3e, 0xd2, 0x0e, 0x52, 0x86, 0xdc, 0x21, 0x78, 0x80, 0x54, 0x06, 0x24, 0x1c, 0x9c, 0xbe, 0x20}, - }, - { /* 37P */ - addYX: fp.Elt{0xa6, 0x73, 0x96, 0x24, 0xd8, 0x87, 0x53, 0xe1, 0x93, 0xe4, 0x46, 0xf5, 0x2d, 0xbc, 0x43, 0x59, 0xb5, 0x63, 0x6f, 0xc3, 0x81, 0x9a, 0x7f, 0x1c, 0xde, 0xc1, 0x0a, 0x1f, 0x36, 0xb3, 0x0a, 0x75}, - subYX: fp.Elt{0x60, 0x5e, 0x02, 0xe2, 0x4a, 0xe4, 0xe0, 0x20, 0x38, 0xb9, 0xdc, 0xcb, 0x2f, 0x3b, 0x3b, 0xb0, 0x1c, 0x0d, 0x5a, 0xf9, 0x9c, 0x63, 0x5d, 0x10, 0x11, 0xe3, 0x67, 0x50, 0x54, 0x4c, 0x76, 0x69}, - dt2: fp.Elt{0x37, 0x10, 0xf8, 0xa2, 0x83, 0x32, 0x8a, 0x1e, 0xf1, 0xcb, 0x7f, 0xbd, 0x23, 0xda, 0x2e, 0x6f, 0x63, 0x25, 0x2e, 0xac, 0x5b, 0xd1, 0x2f, 0xb7, 0x40, 0x50, 0x07, 0xb7, 0x3f, 0x6b, 0xf9, 0x54}, - }, - { /* 39P */ - addYX: fp.Elt{0x79, 0x92, 0x66, 0x29, 0x04, 0xf2, 0xad, 0x0f, 0x4a, 0x72, 0x7d, 0x7d, 0x04, 0xa2, 0xdd, 0x3a, 0xf1, 0x60, 0x57, 0x8c, 0x82, 0x94, 0x3d, 0x6f, 0x9e, 0x53, 0xb7, 0x2b, 0xc5, 0xe9, 0x7f, 0x3d}, - subYX: fp.Elt{0xcd, 0x1e, 0xb1, 0x16, 0xc6, 0xaf, 0x7d, 0x17, 0x79, 0x64, 0x57, 0xfa, 0x9c, 0x4b, 0x76, 0x89, 0x85, 0xe7, 0xec, 0xe6, 0x10, 0xa1, 0xa8, 0xb7, 0xf0, 0xdb, 0x85, 0xbe, 0x9f, 0x83, 0xe6, 0x78}, - dt2: fp.Elt{0x6b, 0x85, 0xb8, 0x37, 0xf7, 0x2d, 0x33, 0x70, 0x8a, 0x17, 0x1a, 0x04, 0x43, 0x5d, 0xd0, 0x75, 0x22, 0x9e, 0xe5, 0xa0, 0x4a, 0xf7, 0x0f, 0x32, 0x42, 0x82, 0x08, 0x50, 0xf3, 0x68, 0xf2, 0x70}, - }, - { /* 41P */ - addYX: fp.Elt{0x47, 0x5f, 0x80, 0xb1, 0x83, 0x45, 0x86, 0x66, 0x19, 0x7c, 0xdd, 0x60, 0xd1, 0xc5, 0x35, 0xf5, 0x06, 0xb0, 0x4c, 0x1e, 0xb7, 0x4e, 0x87, 0xe9, 0xd9, 0x89, 0xd8, 0xfa, 0x5c, 0x34, 0x0d, 0x7c}, - subYX: fp.Elt{0x55, 0xf3, 0xdc, 0x70, 0x20, 0x11, 0x24, 0x23, 0x17, 0xe1, 0xfc, 0xe7, 0x7e, 0xc9, 0x0c, 0x38, 0x98, 0xb6, 0x52, 0x35, 0xed, 0xde, 0x1d, 0xb3, 0xb9, 0xc4, 0xb8, 0x39, 0xc0, 0x56, 0x4e, 0x40}, - dt2: fp.Elt{0x8a, 0x33, 0x78, 0x8c, 0x4b, 0x1f, 0x1f, 0x59, 0xe1, 0xb5, 0xe0, 0x67, 0xb1, 0x6a, 0x36, 0xa0, 0x44, 0x3d, 0x5f, 0xb4, 0x52, 0x41, 0xbc, 0x5c, 0x77, 0xc7, 0xae, 0x2a, 0x76, 0x54, 0xd7, 0x20}, - }, - { /* 43P */ - addYX: fp.Elt{0x58, 0xb7, 0x3b, 0xc7, 0x6f, 0xc3, 0x8f, 0x5e, 0x9a, 0xbb, 0x3c, 0x36, 0xa5, 0x43, 0xe5, 0xac, 0x22, 0xc9, 0x3b, 0x90, 0x7d, 0x4a, 0x93, 0xa9, 0x62, 0xec, 0xce, 0xf3, 0x46, 0x1e, 0x8f, 0x2b}, - subYX: fp.Elt{0x43, 0xf5, 0xb9, 0x35, 0xb1, 0xfe, 0x74, 0x9d, 0x6c, 0x95, 0x8c, 0xde, 0xf1, 0x7d, 0xb3, 0x84, 0xa9, 0x8b, 0x13, 0x57, 0x07, 0x2b, 0x32, 0xe9, 0xe1, 0x4c, 0x0b, 0x79, 0xa8, 0xad, 0xb8, 0x38}, - dt2: fp.Elt{0x5d, 0xf9, 0x51, 0xdf, 0x9c, 0x4a, 0xc0, 0xb5, 0xac, 0xde, 0x1f, 0xcb, 0xae, 0x52, 0x39, 0x2b, 0xda, 0x66, 0x8b, 0x32, 0x8b, 0x6d, 0x10, 0x1d, 0x53, 0x19, 0xba, 0xce, 0x32, 0xeb, 0x9a, 0x04}, - }, - { /* 45P */ - addYX: fp.Elt{0x31, 0x79, 0xfc, 0x75, 0x0b, 0x7d, 0x50, 0xaa, 0xd3, 0x25, 0x67, 0x7a, 0x4b, 0x92, 0xef, 0x0f, 0x30, 0x39, 0x6b, 0x39, 0x2b, 0x54, 0x82, 0x1d, 0xfc, 0x74, 0xf6, 0x30, 0x75, 0xe1, 0x5e, 0x79}, - subYX: fp.Elt{0x7e, 0xfe, 0xdc, 0x63, 0x3c, 0x7d, 0x76, 0xd7, 0x40, 0x6e, 0x85, 0x97, 0x48, 0x59, 0x9c, 0x20, 0x13, 0x7c, 0x4f, 0xe1, 0x61, 0x68, 0x67, 0xb6, 0xfc, 0x25, 0xd6, 0xc8, 0xe0, 0x65, 0xc6, 0x51}, - dt2: fp.Elt{0x81, 0xbd, 0xec, 0x52, 0x0a, 0x5b, 0x4a, 0x25, 0xe7, 0xaf, 0x34, 0xe0, 0x6e, 0x1f, 0x41, 0x5d, 0x31, 0x4a, 0xee, 0xca, 0x0d, 0x4d, 0xa2, 0xe6, 0x77, 0x44, 0xc5, 0x9d, 0xf4, 0x9b, 0xd1, 0x6c}, - }, - { /* 47P */ - addYX: fp.Elt{0x86, 0xc3, 0xaf, 0x65, 0x21, 0x61, 0xfe, 0x1f, 0x10, 0x1b, 0xd5, 0xb8, 0x88, 0x2a, 0x2a, 0x08, 0xaa, 0x0b, 0x99, 0x20, 0x7e, 0x62, 0xf6, 0x76, 0xe7, 0x43, 0x9e, 0x42, 0xa7, 0xb3, 0x01, 0x5e}, - subYX: fp.Elt{0xa3, 0x9c, 0x17, 0x52, 0x90, 0x61, 0x87, 0x7e, 0x85, 0x9f, 0x2c, 0x0b, 0x06, 0x0a, 0x1d, 0x57, 0x1e, 0x71, 0x99, 0x84, 0xa8, 0xba, 0xa2, 0x80, 0x38, 0xe6, 0xb2, 0x40, 0xdb, 0xf3, 0x20, 0x75}, - dt2: fp.Elt{0xa1, 0x57, 0x93, 0xd3, 0xe3, 0x0b, 0xb5, 0x3d, 0xa5, 0x94, 0x9e, 0x59, 0xdd, 0x6c, 0x7b, 0x96, 0x6e, 0x1e, 0x31, 0xdf, 0x64, 0x9a, 0x30, 0x1a, 0x86, 0xc9, 0xf3, 0xce, 0x9c, 0x2c, 0x09, 0x71}, - }, - { /* 49P */ - addYX: fp.Elt{0xcf, 0x1d, 0x05, 0x74, 0xac, 0xd8, 0x6b, 0x85, 0x1e, 0xaa, 0xb7, 0x55, 0x08, 0xa4, 0xf6, 0x03, 0xeb, 0x3c, 0x74, 0xc9, 0xcb, 0xe7, 0x4a, 0x3a, 0xde, 0xab, 0x37, 0x71, 0xbb, 0xa5, 0x73, 0x41}, - subYX: fp.Elt{0x8c, 0x91, 0x64, 0x03, 0x3f, 0x52, 0xd8, 0x53, 0x1c, 0x6b, 0xab, 0x3f, 0xf4, 0x04, 0xb4, 0xa2, 0xa4, 0xe5, 0x81, 0x66, 0x9e, 0x4a, 0x0b, 0x08, 0xa7, 0x7b, 0x25, 0xd0, 0x03, 0x5b, 0xa1, 0x0e}, - dt2: fp.Elt{0x8a, 0x21, 0xf9, 0xf0, 0x31, 0x6e, 0xc5, 0x17, 0x08, 0x47, 0xfc, 0x1a, 0x2b, 0x6e, 0x69, 0x5a, 0x76, 0xf1, 0xb2, 0xf4, 0x68, 0x16, 0x93, 0xf7, 0x67, 0x3a, 0x4e, 0x4a, 0x61, 0x65, 0xc5, 0x5f}, - }, - { /* 51P */ - addYX: fp.Elt{0x8e, 0x98, 0x90, 0x77, 0xe6, 0xe1, 0x92, 0x48, 0x22, 0xd7, 0x5c, 0x1c, 0x0f, 0x95, 0xd5, 0x01, 0xed, 0x3e, 0x92, 0xe5, 0x9a, 0x81, 0xb0, 0xe3, 0x1b, 0x65, 0x46, 0x9d, 0x40, 0xc7, 0x14, 0x32}, - subYX: fp.Elt{0xe5, 0x7a, 0x6d, 0xc4, 0x0d, 0x57, 0x6e, 0x13, 0x8f, 0xdc, 0xf8, 0x54, 0xcc, 0xaa, 0xd0, 0x0f, 0x86, 0xad, 0x0d, 0x31, 0x03, 0x9f, 0x54, 0x59, 0xa1, 0x4a, 0x45, 0x4c, 0x41, 0x1c, 0x71, 0x62}, - dt2: fp.Elt{0x70, 0x17, 0x65, 0x06, 0x74, 0x82, 0x29, 0x13, 0x36, 0x94, 0x27, 0x8a, 0x66, 0xa0, 0xa4, 0x3b, 0x3c, 0x22, 0x5d, 0x18, 0xec, 0xb8, 0xb6, 0xd9, 0x3c, 0x83, 0xcb, 0x3e, 0x07, 0x94, 0xea, 0x5b}, - }, - { /* 53P */ - addYX: fp.Elt{0xf8, 0xd2, 0x43, 0xf3, 0x63, 0xce, 0x70, 0xb4, 0xf1, 0xe8, 0x43, 0x05, 0x8f, 0xba, 0x67, 0x00, 0x6f, 0x7b, 0x11, 0xa2, 0xa1, 0x51, 0xda, 0x35, 0x2f, 0xbd, 0xf1, 0x44, 0x59, 0x78, 0xd0, 0x4a}, - subYX: fp.Elt{0xe4, 0x9b, 0xc8, 0x12, 0x09, 0xbf, 0x1d, 0x64, 0x9c, 0x57, 0x6e, 0x7d, 0x31, 0x8b, 0xf3, 0xac, 0x65, 0xb0, 0x97, 0xf6, 0x02, 0x9e, 0xfe, 0xab, 0xec, 0x1e, 0xf6, 0x48, 0xc1, 0xd5, 0xac, 0x3a}, - dt2: fp.Elt{0x01, 0x83, 0x31, 0xc3, 0x34, 0x3b, 0x8e, 0x85, 0x26, 0x68, 0x31, 0x07, 0x47, 0xc0, 0x99, 0xdc, 0x8c, 0xa8, 0x9d, 0xd3, 0x2e, 0x5b, 0x08, 0x34, 0x3d, 0x85, 0x02, 0xd9, 0xb1, 0x0c, 0xff, 0x3a}, - }, - { /* 55P */ - addYX: fp.Elt{0x05, 0x35, 0xc5, 0xf4, 0x0b, 0x43, 0x26, 0x92, 0x83, 0x22, 0x1f, 0x26, 0x13, 0x9c, 0xe4, 0x68, 0xc6, 0x27, 0xd3, 0x8f, 0x78, 0x33, 0xef, 0x09, 0x7f, 0x9e, 0xd9, 0x2b, 0x73, 0x9f, 0xcf, 0x2c}, - subYX: fp.Elt{0x5e, 0x40, 0x20, 0x3a, 0xeb, 0xc7, 0xc5, 0x87, 0xc9, 0x56, 0xad, 0xed, 0xef, 0x11, 0xe3, 0x8e, 0xf9, 0xd5, 0x29, 0xad, 0x48, 0x2e, 0x25, 0x29, 0x1d, 0x25, 0xcd, 0xf4, 0x86, 0x7e, 0x0e, 0x11}, - dt2: fp.Elt{0xe4, 0xf5, 0x03, 0xd6, 0x9e, 0xd8, 0xc0, 0x57, 0x0c, 0x20, 0xb0, 0xf0, 0x28, 0x86, 0x88, 0x12, 0xb7, 0x3b, 0x2e, 0xa0, 0x09, 0x27, 0x17, 0x53, 0x37, 0x3a, 0x69, 0xb9, 0xe0, 0x57, 0xc5, 0x05}, - }, - { /* 57P */ - addYX: fp.Elt{0xb0, 0x0e, 0xc2, 0x89, 0xb0, 0xbb, 0x76, 0xf7, 0x5c, 0xd8, 0x0f, 0xfa, 0xf6, 0x5b, 0xf8, 0x61, 0xfb, 0x21, 0x44, 0x63, 0x4e, 0x3f, 0xb9, 0xb6, 0x05, 0x12, 0x86, 0x41, 0x08, 0xef, 0x9f, 0x28}, - subYX: fp.Elt{0x6f, 0x7e, 0xc9, 0x1f, 0x31, 0xce, 0xf9, 0xd8, 0xae, 0xfd, 0xf9, 0x11, 0x30, 0x26, 0x3f, 0x7a, 0xdd, 0x25, 0xed, 0x8b, 0xa0, 0x7e, 0x5b, 0xe1, 0x5a, 0x87, 0xe9, 0x8f, 0x17, 0x4c, 0x15, 0x6e}, - dt2: fp.Elt{0xbf, 0x9a, 0xd6, 0xfe, 0x36, 0x63, 0x61, 0xcf, 0x4f, 0xc9, 0x35, 0x83, 0xe7, 0xe4, 0x16, 0x9b, 0xe7, 0x7f, 0x3a, 0x75, 0x65, 0x97, 0x78, 0x13, 0x19, 0xa3, 0x5c, 0xa9, 0x42, 0xf6, 0xfb, 0x6a}, - }, - { /* 59P */ - addYX: fp.Elt{0xcc, 0xa8, 0x13, 0xf9, 0x70, 0x50, 0xe5, 0x5d, 0x61, 0xf5, 0x0c, 0x2b, 0x7b, 0x16, 0x1d, 0x7d, 0x89, 0xd4, 0xea, 0x90, 0xb6, 0x56, 0x29, 0xda, 0xd9, 0x1e, 0x80, 0xdb, 0xce, 0x93, 0xc0, 0x12}, - subYX: fp.Elt{0xc1, 0xd2, 0xf5, 0x62, 0x0c, 0xde, 0xa8, 0x7d, 0x9a, 0x7b, 0x0e, 0xb0, 0xa4, 0x3d, 0xfc, 0x98, 0xe0, 0x70, 0xad, 0x0d, 0xda, 0x6a, 0xeb, 0x7d, 0xc4, 0x38, 0x50, 0xb9, 0x51, 0xb8, 0xb4, 0x0d}, - dt2: fp.Elt{0x0f, 0x19, 0xb8, 0x08, 0x93, 0x7f, 0x14, 0xfc, 0x10, 0xe3, 0x1a, 0xa1, 0xa0, 0x9d, 0x96, 0x06, 0xfd, 0xd7, 0xc7, 0xda, 0x72, 0x55, 0xe7, 0xce, 0xe6, 0x5c, 0x63, 0xc6, 0x99, 0x87, 0xaa, 0x33}, - }, - { /* 61P */ - addYX: fp.Elt{0xb1, 0x6c, 0x15, 0xfc, 0x88, 0xf5, 0x48, 0x83, 0x27, 0x6d, 0x0a, 0x1a, 0x9b, 0xba, 0xa2, 0x6d, 0xb6, 0x5a, 0xca, 0x87, 0x5c, 0x2d, 0x26, 0xe2, 0xa6, 0x89, 0xd5, 0xc8, 0xc1, 0xd0, 0x2c, 0x21}, - subYX: fp.Elt{0xf2, 0x5c, 0x08, 0xbd, 0x1e, 0xf5, 0x0f, 0xaf, 0x1f, 0x3f, 0xd3, 0x67, 0x89, 0x1a, 0xf5, 0x78, 0x3c, 0x03, 0x60, 0x50, 0xe1, 0xbf, 0xc2, 0x6e, 0x86, 0x1a, 0xe2, 0xe8, 0x29, 0x6f, 0x3c, 0x23}, - dt2: fp.Elt{0x81, 0xc7, 0x18, 0x7f, 0x10, 0xd5, 0xf4, 0xd2, 0x28, 0x9d, 0x7e, 0x52, 0xf2, 0xcd, 0x2e, 0x12, 0x41, 0x33, 0x3d, 0x3d, 0x2a, 0x86, 0x0a, 0xa7, 0xe3, 0x4c, 0x91, 0x11, 0x89, 0x77, 0xb7, 0x1d}, - }, - { /* 63P */ - addYX: fp.Elt{0xb6, 0x1a, 0x70, 0xdd, 0x69, 0x47, 0x39, 0xb3, 0xa5, 0x8d, 0xcf, 0x19, 0xd4, 0xde, 0xb8, 0xe2, 0x52, 0xc8, 0x2a, 0xfd, 0x61, 0x41, 0xdf, 0x15, 0xbe, 0x24, 0x7d, 0x01, 0x8a, 0xca, 0xe2, 0x7a}, - subYX: fp.Elt{0x6f, 0xc2, 0x6b, 0x7c, 0x39, 0x52, 0xf3, 0xdd, 0x13, 0x01, 0xd5, 0x53, 0xcc, 0xe2, 0x97, 0x7a, 0x30, 0xa3, 0x79, 0xbf, 0x3a, 0xf4, 0x74, 0x7c, 0xfc, 0xad, 0xe2, 0x26, 0xad, 0x97, 0xad, 0x31}, - dt2: fp.Elt{0x62, 0xb9, 0x20, 0x09, 0xed, 0x17, 0xe8, 0xb7, 0x9d, 0xda, 0x19, 0x3f, 0xcc, 0x18, 0x85, 0x1e, 0x64, 0x0a, 0x56, 0x25, 0x4f, 0xc1, 0x91, 0xe4, 0x83, 0x2c, 0x62, 0xa6, 0x53, 0xfc, 0xd1, 0x1e}, - }, -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed448/ed448.go b/vendor/github.com/cloudflare/circl/sign/ed448/ed448.go deleted file mode 100644 index c368b181b..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed448/ed448.go +++ /dev/null @@ -1,411 +0,0 @@ -// Package ed448 implements Ed448 signature scheme as described in RFC-8032. -// -// This package implements two signature variants. -// -// | Scheme Name | Sign Function | Verification | Context | -// |-------------|-------------------|---------------|-------------------| -// | Ed448 | Sign | Verify | Yes, can be empty | -// | Ed448Ph | SignPh | VerifyPh | Yes, can be empty | -// | All above | (PrivateKey).Sign | VerifyAny | As above | -// -// Specific functions for sign and verify are defined. A generic signing -// function for all schemes is available through the crypto.Signer interface, -// which is implemented by the PrivateKey type. A correspond all-in-one -// verification method is provided by the VerifyAny function. -// -// Both schemes require a context string for domain separation. This parameter -// is passed using a SignerOptions struct defined in this package. -// -// References: -// -// - RFC8032: https://rfc-editor.org/rfc/rfc8032.txt -// - EdDSA for more curves: https://eprint.iacr.org/2015/677 -// - High-speed high-security signatures: https://doi.org/10.1007/s13389-012-0027-1 -package ed448 - -import ( - "bytes" - "crypto" - cryptoRand "crypto/rand" - "crypto/subtle" - "errors" - "fmt" - "io" - "strconv" - - "github.com/cloudflare/circl/ecc/goldilocks" - "github.com/cloudflare/circl/internal/sha3" - "github.com/cloudflare/circl/sign" -) - -const ( - // ContextMaxSize is the maximum length (in bytes) allowed for context. - ContextMaxSize = 255 - // PublicKeySize is the length in bytes of Ed448 public keys. - PublicKeySize = 57 - // PrivateKeySize is the length in bytes of Ed448 private keys. - PrivateKeySize = 114 - // SignatureSize is the length in bytes of signatures. - SignatureSize = 114 - // SeedSize is the size, in bytes, of private key seeds. These are the private key representations used by RFC 8032. - SeedSize = 57 -) - -const ( - paramB = 456 / 8 // Size of keys in bytes. - hashSize = 2 * paramB // Size of the hash function's output. -) - -// SignerOptions implements crypto.SignerOpts and augments with parameters -// that are specific to the Ed448 signature schemes. -type SignerOptions struct { - // Hash must be crypto.Hash(0) for both Ed448 and Ed448Ph. - crypto.Hash - - // Context is an optional domain separation string for signing. - // Its length must be less or equal than 255 bytes. - Context string - - // Scheme is an identifier for choosing a signature scheme. - Scheme SchemeID -} - -// SchemeID is an identifier for each signature scheme. -type SchemeID uint - -const ( - ED448 SchemeID = iota - ED448Ph -) - -// PublicKey is the type of Ed448 public keys. -type PublicKey []byte - -// Equal reports whether pub and x have the same value. -func (pub PublicKey) Equal(x crypto.PublicKey) bool { - xx, ok := x.(PublicKey) - return ok && bytes.Equal(pub, xx) -} - -// PrivateKey is the type of Ed448 private keys. It implements crypto.Signer. -type PrivateKey []byte - -// Equal reports whether priv and x have the same value. -func (priv PrivateKey) Equal(x crypto.PrivateKey) bool { - xx, ok := x.(PrivateKey) - return ok && subtle.ConstantTimeCompare(priv, xx) == 1 -} - -// Public returns the PublicKey corresponding to priv. -func (priv PrivateKey) Public() crypto.PublicKey { - publicKey := make([]byte, PublicKeySize) - copy(publicKey, priv[SeedSize:]) - return PublicKey(publicKey) -} - -// Seed returns the private key seed corresponding to priv. It is provided for -// interoperability with RFC 8032. RFC 8032's private keys correspond to seeds -// in this package. -func (priv PrivateKey) Seed() []byte { - seed := make([]byte, SeedSize) - copy(seed, priv[:SeedSize]) - return seed -} - -func (priv PrivateKey) Scheme() sign.Scheme { return sch } - -func (pub PublicKey) Scheme() sign.Scheme { return sch } - -func (priv PrivateKey) MarshalBinary() (data []byte, err error) { - privateKey := make(PrivateKey, PrivateKeySize) - copy(privateKey, priv) - return privateKey, nil -} - -func (pub PublicKey) MarshalBinary() (data []byte, err error) { - publicKey := make(PublicKey, PublicKeySize) - copy(publicKey, pub) - return publicKey, nil -} - -// Sign creates a signature of a message given a key pair. -// This function supports all the two signature variants defined in RFC-8032, -// namely Ed448 (or pure EdDSA) and Ed448Ph. -// The opts.HashFunc() must return zero to the specify Ed448 variant. This can -// be achieved by passing crypto.Hash(0) as the value for opts. -// Use an Options struct to pass a bool indicating that the ed448Ph variant -// should be used. -// The struct can also be optionally used to pass a context string for signing. -func (priv PrivateKey) Sign( - rand io.Reader, - message []byte, - opts crypto.SignerOpts, -) (signature []byte, err error) { - var ctx string - var scheme SchemeID - - if o, ok := opts.(SignerOptions); ok { - ctx = o.Context - scheme = o.Scheme - } - - switch true { - case scheme == ED448 && opts.HashFunc() == crypto.Hash(0): - return Sign(priv, message, ctx), nil - case scheme == ED448Ph && opts.HashFunc() == crypto.Hash(0): - return SignPh(priv, message, ctx), nil - default: - return nil, errors.New("ed448: bad hash algorithm") - } -} - -// GenerateKey generates a public/private key pair using entropy from rand. -// If rand is nil, crypto/rand.Reader will be used. -func GenerateKey(rand io.Reader) (PublicKey, PrivateKey, error) { - if rand == nil { - rand = cryptoRand.Reader - } - - seed := make(PrivateKey, SeedSize) - if _, err := io.ReadFull(rand, seed); err != nil { - return nil, nil, err - } - - privateKey := NewKeyFromSeed(seed) - publicKey := make([]byte, PublicKeySize) - copy(publicKey, privateKey[SeedSize:]) - - return publicKey, privateKey, nil -} - -// NewKeyFromSeed calculates a private key from a seed. It will panic if -// len(seed) is not SeedSize. This function is provided for interoperability -// with RFC 8032. RFC 8032's private keys correspond to seeds in this -// package. -func NewKeyFromSeed(seed []byte) PrivateKey { - privateKey := make([]byte, PrivateKeySize) - newKeyFromSeed(privateKey, seed) - return privateKey -} - -func newKeyFromSeed(privateKey, seed []byte) { - if l := len(seed); l != SeedSize { - panic("ed448: bad seed length: " + strconv.Itoa(l)) - } - - var h [hashSize]byte - H := sha3.NewShake256() - _, _ = H.Write(seed) - _, _ = H.Read(h[:]) - s := &goldilocks.Scalar{} - deriveSecretScalar(s, h[:paramB]) - - copy(privateKey[:SeedSize], seed) - _ = goldilocks.Curve{}.ScalarBaseMult(s).ToBytes(privateKey[SeedSize:]) -} - -func signAll(signature []byte, privateKey PrivateKey, message, ctx []byte, preHash bool) { - if len(ctx) > ContextMaxSize { - panic(fmt.Errorf("ed448: bad context length: %v", len(ctx))) - } - - H := sha3.NewShake256() - var PHM []byte - - if preHash { - var h [64]byte - _, _ = H.Write(message) - _, _ = H.Read(h[:]) - PHM = h[:] - H.Reset() - } else { - PHM = message - } - - // 1. Hash the 57-byte private key using SHAKE256(x, 114). - var h [hashSize]byte - _, _ = H.Write(privateKey[:SeedSize]) - _, _ = H.Read(h[:]) - s := &goldilocks.Scalar{} - deriveSecretScalar(s, h[:paramB]) - prefix := h[paramB:] - - // 2. Compute SHAKE256(dom4(F, C) || prefix || PH(M), 114). - var rPM [hashSize]byte - H.Reset() - - writeDom(&H, ctx, preHash) - - _, _ = H.Write(prefix) - _, _ = H.Write(PHM) - _, _ = H.Read(rPM[:]) - - // 3. Compute the point [r]B. - r := &goldilocks.Scalar{} - r.FromBytes(rPM[:]) - R := (&[paramB]byte{})[:] - if err := (goldilocks.Curve{}.ScalarBaseMult(r).ToBytes(R)); err != nil { - panic(err) - } - // 4. Compute SHAKE256(dom4(F, C) || R || A || PH(M), 114) - var hRAM [hashSize]byte - H.Reset() - - writeDom(&H, ctx, preHash) - - _, _ = H.Write(R) - _, _ = H.Write(privateKey[SeedSize:]) - _, _ = H.Write(PHM) - _, _ = H.Read(hRAM[:]) - - // 5. Compute S = (r + k * s) mod order. - k := &goldilocks.Scalar{} - k.FromBytes(hRAM[:]) - S := &goldilocks.Scalar{} - S.Mul(k, s) - S.Add(S, r) - - // 6. The signature is the concatenation of R and S. - copy(signature[:paramB], R[:]) - copy(signature[paramB:], S[:]) -} - -// Sign signs the message with privateKey and returns a signature. -// This function supports the signature variant defined in RFC-8032: Ed448, -// also known as the pure version of EdDSA. -// It will panic if len(privateKey) is not PrivateKeySize. -func Sign(priv PrivateKey, message []byte, ctx string) []byte { - signature := make([]byte, SignatureSize) - signAll(signature, priv, message, []byte(ctx), false) - return signature -} - -// SignPh creates a signature of a message given a keypair. -// This function supports the signature variant defined in RFC-8032: Ed448ph, -// meaning it internally hashes the message using SHAKE-256. -// Context could be passed to this function, which length should be no more than -// 255. It can be empty. -func SignPh(priv PrivateKey, message []byte, ctx string) []byte { - signature := make([]byte, SignatureSize) - signAll(signature, priv, message, []byte(ctx), true) - return signature -} - -func verify(public PublicKey, message, signature, ctx []byte, preHash bool) bool { - if len(public) != PublicKeySize || - len(signature) != SignatureSize || - len(ctx) > ContextMaxSize || - !isLessThanOrder(signature[paramB:]) { - return false - } - - P, err := goldilocks.FromBytes(public) - if err != nil { - return false - } - - H := sha3.NewShake256() - var PHM []byte - - if preHash { - var h [64]byte - _, _ = H.Write(message) - _, _ = H.Read(h[:]) - PHM = h[:] - H.Reset() - } else { - PHM = message - } - - var hRAM [hashSize]byte - R := signature[:paramB] - - writeDom(&H, ctx, preHash) - - _, _ = H.Write(R) - _, _ = H.Write(public) - _, _ = H.Write(PHM) - _, _ = H.Read(hRAM[:]) - - k := &goldilocks.Scalar{} - k.FromBytes(hRAM[:]) - S := &goldilocks.Scalar{} - S.FromBytes(signature[paramB:]) - - encR := (&[paramB]byte{})[:] - P.Neg() - _ = goldilocks.Curve{}.CombinedMult(S, k, P).ToBytes(encR) - return bytes.Equal(R, encR) -} - -// VerifyAny returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded. -// This function supports all the two signature variants defined in RFC-8032, -// namely Ed448 (or pure EdDSA) and Ed448Ph. -// The opts.HashFunc() must return zero, this can be achieved by passing -// crypto.Hash(0) as the value for opts. -// Use a SignerOptions struct to pass a context string for signing. -func VerifyAny(public PublicKey, message, signature []byte, opts crypto.SignerOpts) bool { - var ctx string - var scheme SchemeID - if o, ok := opts.(SignerOptions); ok { - ctx = o.Context - scheme = o.Scheme - } - - switch true { - case scheme == ED448 && opts.HashFunc() == crypto.Hash(0): - return Verify(public, message, signature, ctx) - case scheme == ED448Ph && opts.HashFunc() == crypto.Hash(0): - return VerifyPh(public, message, signature, ctx) - default: - return false - } -} - -// Verify returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded. -// This function supports the signature variant defined in RFC-8032: Ed448, -// also known as the pure version of EdDSA. -func Verify(public PublicKey, message, signature []byte, ctx string) bool { - return verify(public, message, signature, []byte(ctx), false) -} - -// VerifyPh returns true if the signature is valid. Failure cases are invalid -// signature, or when the public key cannot be decoded. -// This function supports the signature variant defined in RFC-8032: Ed448ph, -// meaning it internally hashes the message using SHAKE-256. -// Context could be passed to this function, which length should be no more than -// 255. It can be empty. -func VerifyPh(public PublicKey, message, signature []byte, ctx string) bool { - return verify(public, message, signature, []byte(ctx), true) -} - -func deriveSecretScalar(s *goldilocks.Scalar, h []byte) { - h[0] &= 0xFC // The two least significant bits of the first octet are cleared, - h[paramB-1] = 0x00 // all eight bits the last octet are cleared, and - h[paramB-2] |= 0x80 // the highest bit of the second to last octet is set. - s.FromBytes(h[:paramB]) -} - -// isLessThanOrder returns true if 0 <= x < order and if the last byte of x is zero. -func isLessThanOrder(x []byte) bool { - order := goldilocks.Curve{}.Order() - i := len(order) - 1 - for i > 0 && x[i] == order[i] { - i-- - } - return x[paramB-1] == 0 && x[i] < order[i] -} - -func writeDom(h io.Writer, ctx []byte, preHash bool) { - dom4 := "SigEd448" - _, _ = h.Write([]byte(dom4)) - - if preHash { - _, _ = h.Write([]byte{byte(0x01), byte(len(ctx))}) - } else { - _, _ = h.Write([]byte{byte(0x00), byte(len(ctx))}) - } - _, _ = h.Write(ctx) -} diff --git a/vendor/github.com/cloudflare/circl/sign/ed448/signapi.go b/vendor/github.com/cloudflare/circl/sign/ed448/signapi.go deleted file mode 100644 index 22da8bc0a..000000000 --- a/vendor/github.com/cloudflare/circl/sign/ed448/signapi.go +++ /dev/null @@ -1,87 +0,0 @@ -package ed448 - -import ( - "crypto/rand" - "encoding/asn1" - - "github.com/cloudflare/circl/sign" -) - -var sch sign.Scheme = &scheme{} - -// Scheme returns a signature interface. -func Scheme() sign.Scheme { return sch } - -type scheme struct{} - -func (*scheme) Name() string { return "Ed448" } -func (*scheme) PublicKeySize() int { return PublicKeySize } -func (*scheme) PrivateKeySize() int { return PrivateKeySize } -func (*scheme) SignatureSize() int { return SignatureSize } -func (*scheme) SeedSize() int { return SeedSize } -func (*scheme) TLSIdentifier() uint { return 0x0808 } -func (*scheme) SupportsContext() bool { return true } -func (*scheme) Oid() asn1.ObjectIdentifier { - return asn1.ObjectIdentifier{1, 3, 101, 113} -} - -func (*scheme) GenerateKey() (sign.PublicKey, sign.PrivateKey, error) { - return GenerateKey(rand.Reader) -} - -func (*scheme) Sign( - sk sign.PrivateKey, - message []byte, - opts *sign.SignatureOpts, -) []byte { - priv, ok := sk.(PrivateKey) - if !ok { - panic(sign.ErrTypeMismatch) - } - ctx := "" - if opts != nil { - ctx = opts.Context - } - return Sign(priv, message, ctx) -} - -func (*scheme) Verify( - pk sign.PublicKey, - message, signature []byte, - opts *sign.SignatureOpts, -) bool { - pub, ok := pk.(PublicKey) - if !ok { - panic(sign.ErrTypeMismatch) - } - ctx := "" - if opts != nil { - ctx = opts.Context - } - return Verify(pub, message, signature, ctx) -} - -func (*scheme) DeriveKey(seed []byte) (sign.PublicKey, sign.PrivateKey) { - privateKey := NewKeyFromSeed(seed) - publicKey := make(PublicKey, PublicKeySize) - copy(publicKey, privateKey[SeedSize:]) - return publicKey, privateKey -} - -func (*scheme) UnmarshalBinaryPublicKey(buf []byte) (sign.PublicKey, error) { - if len(buf) < PublicKeySize { - return nil, sign.ErrPubKeySize - } - pub := make(PublicKey, PublicKeySize) - copy(pub, buf[:PublicKeySize]) - return pub, nil -} - -func (*scheme) UnmarshalBinaryPrivateKey(buf []byte) (sign.PrivateKey, error) { - if len(buf) < PrivateKeySize { - return nil, sign.ErrPrivKeySize - } - priv := make(PrivateKey, PrivateKeySize) - copy(priv, buf[:PrivateKeySize]) - return priv, nil -} diff --git a/vendor/github.com/cloudflare/circl/sign/sign.go b/vendor/github.com/cloudflare/circl/sign/sign.go deleted file mode 100644 index 1247f1b62..000000000 --- a/vendor/github.com/cloudflare/circl/sign/sign.go +++ /dev/null @@ -1,119 +0,0 @@ -// Package sign provides unified interfaces for signature schemes. -// -// A register of schemes is available in the package -// -// github.com/cloudflare/circl/sign/schemes -package sign - -import ( - "crypto" - "encoding" - "errors" -) - -type SignatureOpts struct { - // If non-empty, includes the given context in the signature if supported - // and will cause an error during signing otherwise. - Context string -} - -// A public key is used to verify a signature set by the corresponding private -// key. -type PublicKey interface { - // Returns the signature scheme for this public key. - Scheme() Scheme - Equal(crypto.PublicKey) bool - encoding.BinaryMarshaler - crypto.PublicKey -} - -// A private key allows one to create signatures. -type PrivateKey interface { - // Returns the signature scheme for this private key. - Scheme() Scheme - Equal(crypto.PrivateKey) bool - // For compatibility with Go standard library - crypto.Signer - crypto.PrivateKey - encoding.BinaryMarshaler -} - -// A private key that retains the seed with which it was generated. -type Seeded interface { - // returns the seed if retained, otherwise nil - Seed() []byte -} - -// A Scheme represents a specific instance of a signature scheme. -type Scheme interface { - // Name of the scheme. - Name() string - - // GenerateKey creates a new key-pair. - GenerateKey() (PublicKey, PrivateKey, error) - - // Creates a signature using the PrivateKey on the given message and - // returns the signature. opts are additional options which can be nil. - // - // Panics if key is nil or wrong type or opts context is not supported. - Sign(sk PrivateKey, message []byte, opts *SignatureOpts) []byte - - // Checks whether the given signature is a valid signature set by - // the private key corresponding to the given public key on the - // given message. opts are additional options which can be nil. - // - // Panics if key is nil or wrong type or opts context is not supported. - Verify(pk PublicKey, message []byte, signature []byte, opts *SignatureOpts) bool - - // Deterministically derives a keypair from a seed. If you're unsure, - // you're better off using GenerateKey(). - // - // Panics if seed is not of length SeedSize(). - DeriveKey(seed []byte) (PublicKey, PrivateKey) - - // Unmarshals a PublicKey from the provided buffer. - UnmarshalBinaryPublicKey([]byte) (PublicKey, error) - - // Unmarshals a PublicKey from the provided buffer. - UnmarshalBinaryPrivateKey([]byte) (PrivateKey, error) - - // Size of binary marshalled public keys. - PublicKeySize() int - - // Size of binary marshalled public keys. - PrivateKeySize() int - - // Size of signatures. - SignatureSize() int - - // Size of seeds. - SeedSize() int - - // Returns whether contexts are supported. - SupportsContext() bool -} - -var ( - // ErrTypeMismatch is the error used if types of, for instance, private - // and public keys don't match. - ErrTypeMismatch = errors.New("types mismatch") - - // ErrSeedSize is the error used if the provided seed is of the wrong - // size. - ErrSeedSize = errors.New("wrong seed size") - - // ErrPubKeySize is the error used if the provided public key is of - // the wrong size. - ErrPubKeySize = errors.New("wrong size for public key") - - // ErrPrivKeySize is the error used if the provided private key is of - // the wrong size. - ErrPrivKeySize = errors.New("wrong size for private key") - - // ErrContextNotSupported is the error used if a context is not - // supported. - ErrContextNotSupported = errors.New("context not supported") - - // ErrContextTooLong is the error used if the context string is too long. - ErrContextTooLong = errors.New("context string too long") -) diff --git a/vendor/github.com/creack/pty/.editorconfig b/vendor/github.com/creack/pty/.editorconfig new file mode 100644 index 000000000..349f67aa2 --- /dev/null +++ b/vendor/github.com/creack/pty/.editorconfig @@ -0,0 +1,54 @@ +root = true + +# Sane defaults. +[*] +# Always use unix end of line. +end_of_line = lf +# Always insert a new line at the end of files. +insert_final_newline = true +# Don't leave trailing whitespaces. +trim_trailing_whitespace = true +# Default to utf8 encoding. +charset = utf-8 +# Space > tab for consistent aligns. +indent_style = space +# Default to 2 spaces for indent/tabs. +indent_size = 2 +# Flag long lines. +max_line_length = 140 + +# Explicitly define settings for commonly used files. + +[*.go] +indent_style = tab +indent_size = 8 + +[*.feature] +indent_style = space +indent_size = 2 + +[*.json] +indent_style = space +indent_size = 2 + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 + +[*.tf] +indent_style = space +indent_size = 2 + +[*.md] +# Don't check line lenghts in files. +max_line_length = 0 + +[{Makefile,*.mk}] +indent_style = tab +indent_size = 8 + +[{Dockerfile,Dockerfile.*}] +indent_size = 4 + +[*.sql] +indent_size = 2 diff --git a/vendor/github.com/creack/pty/.golangci.yml b/vendor/github.com/creack/pty/.golangci.yml new file mode 100644 index 000000000..f023e0f76 --- /dev/null +++ b/vendor/github.com/creack/pty/.golangci.yml @@ -0,0 +1,324 @@ +--- +# Reference: https://golangci-lint.run/usage/configuration/ +run: + timeout: 5m + # modules-download-mode: vendor + + # Include test files. + tests: true + + skip-dirs: [] + + skip-files: [] + +output: + # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number". + format: colored-line-number + print-issued-lines: true + print-linter-name: true + +# Linter specific settings. See below in the `linter.enable` section for details on what each linter is doing. +linters-settings: + dogsled: + # Checks assignments with too many blank identifiers. Default is 2. + max-blank-identifiers: 2 + + dupl: + # Tokens count to trigger issue. + threshold: 150 + + errcheck: + # Report about not checking of errors in type assertions: `a := b.(MyStruct)`. + # Enabled as this is often overlooked by developers. + check-type-assertions: true + # Report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`. + # Disabled as we consider that if the developer did type `_`, it was on purpose. + # Note that while this isn't enforced by the linter, each and every case of ignored error should + # be accompanied with a comment explaining why that error is being discarded. + check-blank: false + + exhaustive: + # Indicates that switch statements are to be considered exhaustive if a + # 'default' case is present, even if all enum members aren't listed in the + # switch. + default-signifies-exhaustive: false + + funlen: + # funlen checks the number of lines/statements in a function. + # While is is always best to keep functions short for readability, maintainability and testing, + # the default are a bit too strict (60 lines / 40 statements), increase it to be more flexible. + lines: 160 + statements: 70 + + # NOTE: We don't set `gci` for import order as it supports only one prefix. Use `goimports.local-prefixes` instead. + + gocognit: + # Minimal code complexity to report, defaults to 30 in gocognit, defaults 10 in golangci. + # Use 15 as it allows for some flexibility while preventing too much complexity. + # NOTE: Similar to gocyclo. + min-complexity: 35 + + nestif: + # Minimal complexity of if statements to report. + min-complexity: 8 + + goconst: + # Minimal length of string constant. + min-len: 4 + # Minimal occurrences count to trigger. + # Increase the default from 3 to 5 as small number of const usage can reduce readability instead of improving it. + min-occurrences: 5 + + gocritic: + # Which checks should be disabled; can't be combined with 'enabled-checks'. + # See https://go-critic.github.io/overview#checks-overview + # To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run` + disabled-checks: + - hugeParam # Very strict check on the size of variables being copied. Too strict for most developer. + # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks. + # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags". + enabled-tags: + - diagnostic + - style + - opinionated + - performance + settings: + rangeValCopy: + sizeThreshold: 1024 # Increase the allowed copied bytes in range. + + cyclop: + max-complexity: 35 + + gocyclo: + # Similar check as gocognit. + # NOTE: We might be able to remove this linter as it is redundant with gocyclo. It is in golangci-lint, so we keep it for now. + min-complexity: 35 + + godot: + # Check all top-level comments, not only declarations. + check-all: true + + gofmt: + # simplify code: gofmt with `-s` option. + simplify: true + + # NOTE: the goheader settings are set per-project. + + goimports: + # Put imports beginning with prefix after 3rd-party packages. + # It's a comma-separated list of prefixes. + local-prefixes: "github.com/creack/pty" + + golint: + # Minimal confidence for issues, default is 0.8. + min-confidence: 0.8 + + gosimple: + # Select the Go version to target. The default is '1.13'. + go: "1.18" + # https://staticcheck.io/docs/options#checks + checks: ["all"] + + gosec: + + govet: + # Enable all available checks from go vet. + enable-all: false + # Report about shadowed variables. + check-shadowing: true + + # NOTE: depguard is disabled as it is very slow and made redundant by gomodguard. + + lll: + # Make sure everyone is on the same level, fix the tab width to go's default. + tab-width: 8 + # Increase the default max line length to give more flexibility. Forcing newlines can reduce readability instead of improving it. + line-length: 180 + + misspell: + locale: US + ignore-words: + + nakedret: + # Make an issue if func has more lines of code than this setting and it has naked returns; default is 30. + # NOTE: Consider setting this to 1 to prevent naked returns. + max-func-lines: 30 + + nolintlint: + # Prevent ununsed directive to avoid stale comments. + allow-unused: false + # Require an explanation of nonzero length after each nolint directive. + require-explanation: true + # Exclude following linters from requiring an explanation. + # NOTE: It is strongly discouraged to put anything in there. + allow-no-explanation: [] + # Enable to require nolint directives to mention the specific linter being suppressed. This ensurce the developer understand the reason being the error. + require-specific: true + + prealloc: + # NOTE: For most programs usage of prealloc will be a premature optimization. + # Keep thing simple, pre-alloc what is obvious and profile the program for more complex scenarios. + # + simple: true # Checkonly on simple loops that have no returns/breaks/continues/gotos in them. + range-loops: true # Check range loops, true by default + for-loops: false # Check suggestions on for loops, false by default + + rowserrcheck: + packages: [] + + staticcheck: + # Select the Go version to target. The default is '1.13'. + go: "1.18" + # https://staticcheck.io/docs/options#checks + checks: ["all"] + + stylecheck: + # Select the Go version to target. The default is '1.13'. + go: "1.18" + # https://staticcheck.io/docs/options#checks + checks: ["all"] # "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022"] + + tagliatelle: + # Check the struck tag name case. + case: + # Use the struct field name to check the name of the struct tag. + use-field-name: false + rules: + # Any struct tag type can be used. + # support string case: `camel`, `pascal`, `kebab`, `snake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower` + json: snake + firestore: camel + yaml: camel + xml: camel + bson: camel + avro: snake + mapstructure: kebab + envconfig: upper + + unparam: + # Don't create an error if an exported code have static params being used. It is often expected in libraries. + # NOTE: It would be nice if this linter would differentiate between a main package and a lib. + check-exported: true + + unused: {} + + whitespace: + multi-if: false # Enforces newlines (or comments) after every multi-line if statement + multi-func: false # Enforces newlines (or comments) after every multi-line function signature + +# Run `golangci-lint help linters` to get the full list of linter with their description. +linters: + disable-all: true + # NOTE: enable-all is deprecated because too many people don't pin versions... + # We still require explicit documentation on why some linters are disabled. + # disable: + # - depguard # Go linter that checks if package imports are in a list of acceptable packages [fast: true, auto-fix: false] + # - exhaustivestruct # Checks if all struct's fields are initialized [fast: true, auto-fix: false] + # - forbidigo # Forbids identifiers [fast: true, auto-fix: false] + # - gci # Gci control golang package import order and make it always deterministic. [fast: true, auto-fix: true] + # - godox # Tool for detection of FIXME, TODO and other comment keywords [fast: true, auto-fix: false] + # - goerr113 # Golang linter to check the errors handling expressions [fast: true, auto-fix: false] + # - golint # Golint differs from gofmt. Gofmt reformats Go source code, whereas golint prints out style mistakes [fast: false, auto-fix: false] + # - gomnd # An analyzer to detect magic numbers. [fast: true, auto-fix: false] + # - gomoddirectives # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod. [fast: true, auto-fix: false] + # - interfacer # Linter that suggests narrower interface types [fast: false, auto-fix: false] + # - maligned # Tool to detect Go structs that would take less memory if their fields were sorted [fast: false, auto-fix: false] + # - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false] + # - scopelint # Scopelint checks for unpinned variables in go programs [fast: true, auto-fix: false] + # - wrapcheck # Checks that errors returned from external packages are wrapped [fast: false, auto-fix: false] + # - wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false] + + # disable-reasons: + # - depguard # Checks whitelisted/blacklisted import path, but runs way too slow. Not that useful. + # - exhaustivestruct # Good concept, but not mature enough (errors on not assignable fields like locks) and too noisy when using AWS SDK as most fields are unused. + # - forbidigo # Great idea, but too strict out of the box. Probably will re-enable soon. + # - gci # Conflicts with goimports/gofumpt. + # - godox # Don't fail when finding TODO, FIXME, etc. + # - goerr113 # Too many false positives. + # - golint # Deprecated (since v1.41.0) due to: The repository of the linter has been archived by the owner. Replaced by revive. + # - gomnd # Checks for magic numbers. Disabled due to too many false positives not configurable (03/01/2020 v1.23.7). + # - gomoddirectives # Doesn't support //nolint to whitelist. + # - interfacer # Deprecated (since v1.38.0) due to: The repository of the linter has been archived by the owner. + # - maligned # Deprecated (since v1.38.0) due to: The repository of the linter has been archived by the owner. Replaced by govet 'fieldalignment'. + # - nlreturn # Actually reduces readability in most cases. + # - scopelint # Deprecated (since v1.39.0) due to: The repository of the linter has been deprecated by the owner. Replaced by exportloopref. + # - wrapcheck # Good concept, but always warns for http coded errors. Need to re-enable and whitelist our error package. + # - wsl # Forces to add newlines around blocks. Lots of false positives, not that useful. + + enable: + - asciicheck # Simple linter to check that your code does not contain non-ASCII identifiers [fast: true, auto-fix: false] + - bodyclose # checks whether HTTP response body is closed successfully [fast: false, auto-fix: false] + - cyclop # checks function and package cyclomatic complexity [fast: false, auto-fix: false] + - dogsled # Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f()) [fast: true, auto-fix: false] + - dupl # Tool for code clone detection [fast: true, auto-fix: false] + - durationcheck # check for two durations multiplied together [fast: false, auto-fix: false] + - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false] + - errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false] + - errorlint # go-errorlint is a source code linter for Go software that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false] + - exhaustive # check exhaustiveness of enum switch statements [fast: false, auto-fix: false] + - exportloopref # checks for pointers to enclosing loop variables [fast: false, auto-fix: false] + - forcetypeassert # finds forced type assertions [fast: true, auto-fix: false] + - funlen # Tool for detection of long functions [fast: true, auto-fix: false] + - gochecknoglobals # check that no global variables exist [fast: true, auto-fix: false] + - gochecknoinits # Checks that no init functions are present in Go code [fast: true, auto-fix: false] + - gocognit # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false] + - goconst # Finds repeated strings that could be replaced by a constant [fast: true, auto-fix: false] + - gocritic # Provides many diagnostics that check for bugs, performance and style issues. [fast: false, auto-fix: false] + - gocyclo # Computes and checks the cyclomatic complexity of functions [fast: true, auto-fix: false] + - godot # Check if comments end in a period [fast: true, auto-fix: true] + - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true] + - gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true] + - goheader # Checks is file header matches to pattern [fast: true, auto-fix: false] + - goimports # Goimports does everything that gofmt does. Additionally it checks unused imports [fast: true, auto-fix: true] + - gomodguard # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations. [fast: true, auto-fix: false] + - goprintffuncname # Checks that printf-like functions are named with `f` at the end [fast: true, auto-fix: false] + - gosec # (gas): Inspects source code for security problems [fast: false, auto-fix: false] + - gosimple # (megacheck): Linter for Go source code that specializes in simplifying a code [fast: false, auto-fix: false] + - govet # (vet, vetshadow): Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string [fast: false, auto-fix: false] + - importas # Enforces consistent import aliases [fast: false, auto-fix: false] + - ineffassign # Detects when assignments to existing variables are not used [fast: true, auto-fix: false] + - lll # Reports long lines [fast: true, auto-fix: false] + - makezero # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false] + - misspell # Finds commonly misspelled English words in comments [fast: true, auto-fix: true] + - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false] + - nestif # Reports deeply nested if statements [fast: true, auto-fix: false] + - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false] + - noctx # noctx finds sending http request without context.Context [fast: false, auto-fix: false] + - nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false] + - paralleltest # paralleltest detects missing usage of t.Parallel() method in your Go test [fast: true, auto-fix: false] + - prealloc # Finds slice declarations that could potentially be preallocated [fast: true, auto-fix: false] + - predeclared # find code that shadows one of Go's predeclared identifiers [fast: true, auto-fix: false] + - promlinter # Check Prometheus metrics naming via promlint [fast: true, auto-fix: false] + - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint. [fast: false, auto-fix: false] + # Disabled due to generic. Work in progress upstream. + # - rowserrcheck # checks whether Err of rows is checked successfully [fast: false, auto-fix: false] + # Disabled due to generic. Work in progress upstream. + # - sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed. [fast: false, auto-fix: false] + - staticcheck # (megacheck): Staticcheck is a go vet on steroids, applying a ton of static analysis checks [fast: false, auto-fix: false] + - stylecheck # Stylecheck is a replacement for golint [fast: false, auto-fix: false] + # Disabled due to generic. Work in progress upstream. + # - tagliatelle # Checks the struct tags. [fast: true, auto-fix: false] + # - testpackage # linter that makes you use a separate _test package [fast: true, auto-fix: false] + - thelper # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers [fast: false, auto-fix: false] + - tparallel # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes [fast: false, auto-fix: false] + - typecheck # Like the front-end of a Go compiler, parses and type-checks Go code [fast: false, auto-fix: false] + - unconvert # Remove unnecessary type conversions [fast: false, auto-fix: false] + - unparam # Reports unused function parameters [fast: false, auto-fix: false] + # Disabled due to way too many false positive in go1.20. + # - unused # (megacheck): Checks Go code for unused constants, variables, functions and types [fast: false, auto-fix: false] + # Disabled due to generic. Work in progress upstream. + # - wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false] + - whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true] + +issues: + exclude: + # Allow shadowing of 'err'. + - 'shadow: declaration of "err" shadows declaration' + # Allow shadowing of `ctx`. + - 'shadow: declaration of "ctx" shadows declaration' + # Maximum issues count per one linter. Set to 0 to disable. Default is 50. + max-per-linter: 10 + # Disable default excludes. Always be explicit on what we exclude. + exclude-use-default: false + # Exclude some linters from running on tests files. + exclude-rules: [] diff --git a/vendor/github.com/creack/pty/Dockerfile.golang b/vendor/github.com/creack/pty/Dockerfile.golang new file mode 100644 index 000000000..b6153421c --- /dev/null +++ b/vendor/github.com/creack/pty/Dockerfile.golang @@ -0,0 +1,17 @@ +ARG GOVERSION=1.18.2 +FROM golang:${GOVERSION} + +# Set base env. +ARG GOOS=linux +ARG GOARCH=amd64 +ENV GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOFLAGS='-v -ldflags=-s -ldflags=-w' + +# Pre compile the stdlib for 386/arm (32bits). +RUN go build -a std + +# Add the code to the image. +WORKDIR pty +ADD . . + +# Build the lib. +RUN go build diff --git a/vendor/github.com/creack/pty/Dockerfile.riscv b/vendor/github.com/creack/pty/Dockerfile.riscv deleted file mode 100644 index adfdf82c8..000000000 --- a/vendor/github.com/creack/pty/Dockerfile.riscv +++ /dev/null @@ -1,14 +0,0 @@ -FROM golang:1.13 - -# Clone and complie a riscv compatible version of the go compiler. -RUN git clone https://review.gerrithub.io/riscv/riscv-go /riscv-go -# riscvdev branch HEAD as of 2019-06-29. -RUN cd /riscv-go && git checkout 04885fddd096d09d4450726064d06dd107e374bf -ENV PATH=/riscv-go/misc/riscv:/riscv-go/bin:$PATH -RUN cd /riscv-go/src && GOROOT_BOOTSTRAP=$(go env GOROOT) ./make.bash -ENV GOROOT=/riscv-go - -# Make sure we compile. -WORKDIR pty -ADD . . -RUN GOOS=linux GOARCH=riscv go build diff --git a/vendor/github.com/creack/pty/README.md b/vendor/github.com/creack/pty/README.md index 5275014a7..b6a1cf568 100644 --- a/vendor/github.com/creack/pty/README.md +++ b/vendor/github.com/creack/pty/README.md @@ -4,9 +4,13 @@ Pty is a Go package for using unix pseudo-terminals. ## Install - go get github.com/creack/pty +```sh +go get github.com/creack/pty +``` -## Example +## Examples + +Note that those examples are for demonstration purpose only, to showcase how to use the library. They are not meant to be used in any kind of production environment. If you want to **set deadlines to work** and `Close()` **interrupting** `Read()` on the returned `*os.File`, you will need to call `syscall.SetNonblock` manually. ### Command @@ -14,10 +18,11 @@ Pty is a Go package for using unix pseudo-terminals. package main import ( - "github.com/creack/pty" "io" "os" "os/exec" + + "github.com/creack/pty" ) func main() { @@ -51,7 +56,7 @@ import ( "syscall" "github.com/creack/pty" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" ) func test() error { @@ -77,15 +82,17 @@ func test() error { } }() ch <- syscall.SIGWINCH // Initial resize. + defer func() { signal.Stop(ch); close(ch) }() // Cleanup signals when done. // Set stdin in raw mode. - oldState, err := terminal.MakeRaw(int(os.Stdin.Fd())) + oldState, err := term.MakeRaw(int(os.Stdin.Fd())) if err != nil { panic(err) } - defer func() { _ = terminal.Restore(int(os.Stdin.Fd()), oldState) }() // Best effort. + defer func() { _ = term.Restore(int(os.Stdin.Fd()), oldState) }() // Best effort. // Copy stdin to the pty and the pty to stdout. + // NOTE: The goroutine will keep reading until the next keystroke before returning. go func() { _, _ = io.Copy(ptmx, os.Stdin) }() _, _ = io.Copy(os.Stdout, ptmx) diff --git a/vendor/github.com/creack/pty/asm_solaris_amd64.s b/vendor/github.com/creack/pty/asm_solaris_amd64.s new file mode 100644 index 000000000..7fbef8ee6 --- /dev/null +++ b/vendor/github.com/creack/pty/asm_solaris_amd64.s @@ -0,0 +1,18 @@ +// Copyright 2014 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +//go:build gc +//+build gc + +#include "textflag.h" + +// +// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go +// + +TEXT ·sysvicall6(SB),NOSPLIT,$0-88 + JMP syscall·sysvicall6(SB) + +TEXT ·rawSysvicall6(SB),NOSPLIT,$0-88 + JMP syscall·rawSysvicall6(SB) diff --git a/vendor/github.com/creack/pty/doc.go b/vendor/github.com/creack/pty/doc.go index 190cfbea9..3c8b3244e 100644 --- a/vendor/github.com/creack/pty/doc.go +++ b/vendor/github.com/creack/pty/doc.go @@ -10,7 +10,7 @@ import ( // available on the current platform. var ErrUnsupported = errors.New("unsupported") -// Opens a pty and its corresponding tty. +// Open a pty and its corresponding tty. func Open() (pty, tty *os.File, err error) { return open() } diff --git a/vendor/github.com/creack/pty/ioctl.go b/vendor/github.com/creack/pty/ioctl.go index c85cdcd14..7b6b770b7 100644 --- a/vendor/github.com/creack/pty/ioctl.go +++ b/vendor/github.com/creack/pty/ioctl.go @@ -1,13 +1,28 @@ -// +build !windows,!solaris +//go:build !windows && go1.12 +// +build !windows,go1.12 package pty -import "syscall" +import "os" -func ioctl(fd, cmd, ptr uintptr) error { - _, _, e := syscall.Syscall(syscall.SYS_IOCTL, fd, cmd, ptr) - if e != 0 { +func ioctl(f *os.File, cmd, ptr uintptr) error { + return ioctlInner(f.Fd(), cmd, ptr) // Fall back to blocking io. +} + +// NOTE: Unused. Keeping for reference. +func ioctlNonblock(f *os.File, cmd, ptr uintptr) error { + sc, e := f.SyscallConn() + if e != nil { + return ioctlInner(f.Fd(), cmd, ptr) // Fall back to blocking io (old behavior). + } + + ch := make(chan error, 1) + defer close(ch) + + e = sc.Control(func(fd uintptr) { ch <- ioctlInner(fd, cmd, ptr) }) + if e != nil { return e } - return nil + e = <-ch + return e } diff --git a/vendor/github.com/creack/pty/ioctl_bsd.go b/vendor/github.com/creack/pty/ioctl_bsd.go index 73b12c53c..db3bf845b 100644 --- a/vendor/github.com/creack/pty/ioctl_bsd.go +++ b/vendor/github.com/creack/pty/ioctl_bsd.go @@ -1,3 +1,4 @@ +//go:build darwin || dragonfly || freebsd || netbsd || openbsd // +build darwin dragonfly freebsd netbsd openbsd package pty diff --git a/vendor/github.com/creack/pty/ioctl_inner.go b/vendor/github.com/creack/pty/ioctl_inner.go new file mode 100644 index 000000000..272b50b97 --- /dev/null +++ b/vendor/github.com/creack/pty/ioctl_inner.go @@ -0,0 +1,20 @@ +//go:build !windows && !solaris && !aix +// +build !windows,!solaris,!aix + +package pty + +import "syscall" + +// Local syscall const values. +const ( + TIOCGWINSZ = syscall.TIOCGWINSZ + TIOCSWINSZ = syscall.TIOCSWINSZ +) + +func ioctlInner(fd, cmd, ptr uintptr) error { + _, _, e := syscall.Syscall(syscall.SYS_IOCTL, fd, cmd, ptr) + if e != 0 { + return e + } + return nil +} diff --git a/vendor/github.com/creack/pty/ioctl_legacy.go b/vendor/github.com/creack/pty/ioctl_legacy.go new file mode 100644 index 000000000..f7e923cd0 --- /dev/null +++ b/vendor/github.com/creack/pty/ioctl_legacy.go @@ -0,0 +1,10 @@ +//go:build !windows && !go1.12 +// +build !windows,!go1.12 + +package pty + +import "os" + +func ioctl(f *os.File, cmd, ptr uintptr) error { + return ioctlInner(f.Fd(), cmd, ptr) // fall back to blocking io (old behavior) +} diff --git a/vendor/github.com/creack/pty/ioctl_solaris.go b/vendor/github.com/creack/pty/ioctl_solaris.go index f63985f34..6fd8bfeee 100644 --- a/vendor/github.com/creack/pty/ioctl_solaris.go +++ b/vendor/github.com/creack/pty/ioctl_solaris.go @@ -1,30 +1,48 @@ +//go:build solaris +// +build solaris + package pty import ( - "golang.org/x/sys/unix" + "syscall" "unsafe" ) +//go:cgo_import_dynamic libc_ioctl ioctl "libc.so" +//go:linkname procioctl libc_ioctl +var procioctl uintptr + const ( // see /usr/include/sys/stropts.h - I_PUSH = uintptr((int32('S')<<8 | 002)) - I_STR = uintptr((int32('S')<<8 | 010)) - I_FIND = uintptr((int32('S')<<8 | 013)) + I_PUSH = uintptr((int32('S')<<8 | 002)) + I_STR = uintptr((int32('S')<<8 | 010)) + I_FIND = uintptr((int32('S')<<8 | 013)) + // see /usr/include/sys/ptms.h ISPTM = (int32('P') << 8) | 1 UNLKPT = (int32('P') << 8) | 2 PTSSTTY = (int32('P') << 8) | 3 ZONEPT = (int32('P') << 8) | 4 OWNERPT = (int32('P') << 8) | 5 + + // see /usr/include/sys/termios.h + TIOCSWINSZ = (uint32('T') << 8) | 103 + TIOCGWINSZ = (uint32('T') << 8) | 104 ) type strioctl struct { - ic_cmd int32 - ic_timout int32 - ic_len int32 - ic_dp unsafe.Pointer + icCmd int32 + icTimeout int32 + icLen int32 + icDP unsafe.Pointer } -func ioctl(fd, cmd, ptr uintptr) error { - return unix.IoctlSetInt(int(fd), uint(cmd), int(ptr)) +// Defined in asm_solaris_amd64.s. +func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) + +func ioctlInner(fd, cmd, ptr uintptr) error { + if _, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, fd, cmd, ptr, 0, 0, 0); errno != 0 { + return errno + } + return nil } diff --git a/vendor/github.com/creack/pty/ioctl_unsupported.go b/vendor/github.com/creack/pty/ioctl_unsupported.go new file mode 100644 index 000000000..e17908d44 --- /dev/null +++ b/vendor/github.com/creack/pty/ioctl_unsupported.go @@ -0,0 +1,13 @@ +//go:build aix +// +build aix + +package pty + +const ( + TIOCGWINSZ = 0 + TIOCSWINSZ = 0 +) + +func ioctlInner(fd, cmd, ptr uintptr) error { + return ErrUnsupported +} diff --git a/vendor/github.com/creack/pty/mktypes.bash b/vendor/github.com/creack/pty/mktypes.bash index 82ee16721..7f71bda6a 100644 --- a/vendor/github.com/creack/pty/mktypes.bash +++ b/vendor/github.com/creack/pty/mktypes.bash @@ -13,7 +13,7 @@ GODEFS="go tool cgo -godefs" $GODEFS types.go |gofmt > ztypes_$GOARCH.go case $GOOS in -freebsd|dragonfly|openbsd) +freebsd|dragonfly|netbsd|openbsd) $GODEFS types_$GOOS.go |gofmt > ztypes_$GOOSARCH.go ;; esac diff --git a/vendor/github.com/creack/pty/pty_darwin.go b/vendor/github.com/creack/pty/pty_darwin.go index 6344b6b0e..eadf6ab7c 100644 --- a/vendor/github.com/creack/pty/pty_darwin.go +++ b/vendor/github.com/creack/pty/pty_darwin.go @@ -1,3 +1,6 @@ +//go:build darwin +// +build darwin + package pty import ( @@ -33,7 +36,7 @@ func open() (pty, tty *os.File, err error) { return nil, nil, err } - t, err := os.OpenFile(sname, os.O_RDWR, 0) + t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0) if err != nil { return nil, nil, err } @@ -43,7 +46,7 @@ func open() (pty, tty *os.File, err error) { func ptsname(f *os.File) (string, error) { n := make([]byte, _IOC_PARM_LEN(syscall.TIOCPTYGNAME)) - err := ioctl(f.Fd(), syscall.TIOCPTYGNAME, uintptr(unsafe.Pointer(&n[0]))) + err := ioctl(f, syscall.TIOCPTYGNAME, uintptr(unsafe.Pointer(&n[0]))) if err != nil { return "", err } @@ -57,9 +60,9 @@ func ptsname(f *os.File) (string, error) { } func grantpt(f *os.File) error { - return ioctl(f.Fd(), syscall.TIOCPTYGRANT, 0) + return ioctl(f, syscall.TIOCPTYGRANT, 0) } func unlockpt(f *os.File) error { - return ioctl(f.Fd(), syscall.TIOCPTYUNLK, 0) + return ioctl(f, syscall.TIOCPTYUNLK, 0) } diff --git a/vendor/github.com/creack/pty/pty_dragonfly.go b/vendor/github.com/creack/pty/pty_dragonfly.go index b7d1f20f2..12803de04 100644 --- a/vendor/github.com/creack/pty/pty_dragonfly.go +++ b/vendor/github.com/creack/pty/pty_dragonfly.go @@ -1,3 +1,6 @@ +//go:build dragonfly +// +build dragonfly + package pty import ( @@ -42,17 +45,17 @@ func open() (pty, tty *os.File, err error) { } func grantpt(f *os.File) error { - _, err := isptmaster(f.Fd()) + _, err := isptmaster(f) return err } func unlockpt(f *os.File) error { - _, err := isptmaster(f.Fd()) + _, err := isptmaster(f) return err } -func isptmaster(fd uintptr) (bool, error) { - err := ioctl(fd, syscall.TIOCISPTMASTER, 0) +func isptmaster(f *os.File) (bool, error) { + err := ioctl(f, syscall.TIOCISPTMASTER, 0) return err == nil, err } @@ -65,7 +68,7 @@ func ptsname(f *os.File) (string, error) { name := make([]byte, _C_SPECNAMELEN) fa := fiodgnameArg{Name: (*byte)(unsafe.Pointer(&name[0])), Len: _C_SPECNAMELEN, Pad_cgo_0: [4]byte{0, 0, 0, 0}} - err := ioctl(f.Fd(), ioctl_FIODNAME, uintptr(unsafe.Pointer(&fa))) + err := ioctl(f, ioctl_FIODNAME, uintptr(unsafe.Pointer(&fa))) if err != nil { return "", err } diff --git a/vendor/github.com/creack/pty/pty_freebsd.go b/vendor/github.com/creack/pty/pty_freebsd.go index 63b6d9133..47afcfeec 100644 --- a/vendor/github.com/creack/pty/pty_freebsd.go +++ b/vendor/github.com/creack/pty/pty_freebsd.go @@ -1,3 +1,6 @@ +//go:build freebsd +// +build freebsd + package pty import ( @@ -41,8 +44,8 @@ func open() (pty, tty *os.File, err error) { return p, t, nil } -func isptmaster(fd uintptr) (bool, error) { - err := ioctl(fd, syscall.TIOCPTMASTER, 0) +func isptmaster(f *os.File) (bool, error) { + err := ioctl(f, syscall.TIOCPTMASTER, 0) return err == nil, err } @@ -52,7 +55,7 @@ var ( ) func ptsname(f *os.File) (string, error) { - master, err := isptmaster(f.Fd()) + master, err := isptmaster(f) if err != nil { return "", err } @@ -65,7 +68,7 @@ func ptsname(f *os.File) (string, error) { buf = make([]byte, n) arg = fiodgnameArg{Len: n, Buf: (*byte)(unsafe.Pointer(&buf[0]))} ) - if err := ioctl(f.Fd(), ioctlFIODGNAME, uintptr(unsafe.Pointer(&arg))); err != nil { + if err := ioctl(f, ioctlFIODGNAME, uintptr(unsafe.Pointer(&arg))); err != nil { return "", err } diff --git a/vendor/github.com/creack/pty/pty_linux.go b/vendor/github.com/creack/pty/pty_linux.go index 4a833de18..e7e01c0aa 100644 --- a/vendor/github.com/creack/pty/pty_linux.go +++ b/vendor/github.com/creack/pty/pty_linux.go @@ -1,3 +1,6 @@ +//go:build linux +// +build linux + package pty import ( @@ -28,7 +31,7 @@ func open() (pty, tty *os.File, err error) { return nil, nil, err } - t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0) + t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0) //nolint:gosec // Expected Open from a variable. if err != nil { return nil, nil, err } @@ -37,7 +40,7 @@ func open() (pty, tty *os.File, err error) { func ptsname(f *os.File) (string, error) { var n _C_uint - err := ioctl(f.Fd(), syscall.TIOCGPTN, uintptr(unsafe.Pointer(&n))) + err := ioctl(f, syscall.TIOCGPTN, uintptr(unsafe.Pointer(&n))) //nolint:gosec // Expected unsafe pointer for Syscall call. if err != nil { return "", err } @@ -46,6 +49,6 @@ func ptsname(f *os.File) (string, error) { func unlockpt(f *os.File) error { var u _C_int - // use TIOCSPTLCK with a pointer to zero to clear the lock - return ioctl(f.Fd(), syscall.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))) + // use TIOCSPTLCK with a pointer to zero to clear the lock. + return ioctl(f, syscall.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))) //nolint:gosec // Expected unsafe pointer for Syscall call. } diff --git a/vendor/github.com/creack/pty/pty_netbsd.go b/vendor/github.com/creack/pty/pty_netbsd.go new file mode 100644 index 000000000..dd5611dbd --- /dev/null +++ b/vendor/github.com/creack/pty/pty_netbsd.go @@ -0,0 +1,69 @@ +//go:build netbsd +// +build netbsd + +package pty + +import ( + "errors" + "os" + "syscall" + "unsafe" +) + +func open() (pty, tty *os.File, err error) { + p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0) + if err != nil { + return nil, nil, err + } + // In case of error after this point, make sure we close the ptmx fd. + defer func() { + if err != nil { + _ = p.Close() // Best effort. + } + }() + + sname, err := ptsname(p) + if err != nil { + return nil, nil, err + } + + if err := grantpt(p); err != nil { + return nil, nil, err + } + + // In NetBSD unlockpt() does nothing, so it isn't called here. + + t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0) + if err != nil { + return nil, nil, err + } + return p, t, nil +} + +func ptsname(f *os.File) (string, error) { + /* + * from ptsname(3): The ptsname() function is equivalent to: + * struct ptmget pm; + * ioctl(fd, TIOCPTSNAME, &pm) == -1 ? NULL : pm.sn; + */ + var ptm ptmget + if err := ioctl(f, uintptr(ioctl_TIOCPTSNAME), uintptr(unsafe.Pointer(&ptm))); err != nil { + return "", err + } + name := make([]byte, len(ptm.Sn)) + for i, c := range ptm.Sn { + name[i] = byte(c) + if c == 0 { + return string(name[:i]), nil + } + } + return "", errors.New("TIOCPTSNAME string not NUL-terminated") +} + +func grantpt(f *os.File) error { + /* + * from grantpt(3): Calling grantpt() is equivalent to: + * ioctl(fd, TIOCGRANTPT, 0); + */ + return ioctl(f, uintptr(ioctl_TIOCGRANTPT), 0) +} diff --git a/vendor/github.com/creack/pty/pty_openbsd.go b/vendor/github.com/creack/pty/pty_openbsd.go index a6a35d1e6..337c39f3f 100644 --- a/vendor/github.com/creack/pty/pty_openbsd.go +++ b/vendor/github.com/creack/pty/pty_openbsd.go @@ -1,3 +1,6 @@ +//go:build openbsd +// +build openbsd + package pty import ( @@ -6,6 +9,17 @@ import ( "unsafe" ) +func cInt8ToString(in []int8) string { + var s []byte + for _, v := range in { + if v == 0 { + break + } + s = append(s, byte(v)) + } + return string(s) +} + func open() (pty, tty *os.File, err error) { /* * from ptm(4): @@ -22,12 +36,12 @@ func open() (pty, tty *os.File, err error) { defer p.Close() var ptm ptmget - if err := ioctl(p.Fd(), uintptr(ioctl_PTMGET), uintptr(unsafe.Pointer(&ptm))); err != nil { + if err := ioctl(p, uintptr(ioctl_PTMGET), uintptr(unsafe.Pointer(&ptm))); err != nil { return nil, nil, err } - pty = os.NewFile(uintptr(ptm.Cfd), "/dev/ptm") - tty = os.NewFile(uintptr(ptm.Sfd), "/dev/ptm") + pty = os.NewFile(uintptr(ptm.Cfd), cInt8ToString(ptm.Cn[:])) + tty = os.NewFile(uintptr(ptm.Sfd), cInt8ToString(ptm.Sn[:])) return pty, tty, nil } diff --git a/vendor/github.com/creack/pty/pty_solaris.go b/vendor/github.com/creack/pty/pty_solaris.go index 09ec1b797..4e22416b0 100644 --- a/vendor/github.com/creack/pty/pty_solaris.go +++ b/vendor/github.com/creack/pty/pty_solaris.go @@ -1,3 +1,6 @@ +//go:build solaris +// +build solaris + package pty /* based on: @@ -6,122 +9,153 @@ http://src.illumos.org/source/xref/illumos-gate/usr/src/lib/libc/port/gen/pt.c import ( "errors" - "golang.org/x/sys/unix" "os" "strconv" "syscall" "unsafe" ) -const NODEV = ^uint64(0) - func open() (pty, tty *os.File, err error) { - masterfd, err := syscall.Open("/dev/ptmx", syscall.O_RDWR|unix.O_NOCTTY, 0) - //masterfd, err := syscall.Open("/dev/ptmx", syscall.O_RDWR|syscall.O_CLOEXEC|unix.O_NOCTTY, 0) + ptmxfd, err := syscall.Open("/dev/ptmx", syscall.O_RDWR|syscall.O_NOCTTY, 0) if err != nil { return nil, nil, err } - p := os.NewFile(uintptr(masterfd), "/dev/ptmx") + p := os.NewFile(uintptr(ptmxfd), "/dev/ptmx") + // In case of error after this point, make sure we close the ptmx fd. + defer func() { + if err != nil { + _ = p.Close() // Best effort. + } + }() sname, err := ptsname(p) if err != nil { return nil, nil, err } - err = grantpt(p) - if err != nil { + if err := grantpt(p); err != nil { return nil, nil, err } - err = unlockpt(p) - if err != nil { + if err := unlockpt(p); err != nil { return nil, nil, err } - slavefd, err := syscall.Open(sname, os.O_RDWR|unix.O_NOCTTY, 0) + ptsfd, err := syscall.Open(sname, os.O_RDWR|syscall.O_NOCTTY, 0) if err != nil { return nil, nil, err } - t := os.NewFile(uintptr(slavefd), sname) + t := os.NewFile(uintptr(ptsfd), sname) + + // In case of error after this point, make sure we close the pts fd. + defer func() { + if err != nil { + _ = t.Close() // Best effort. + } + }() // pushing terminal driver STREAMS modules as per pts(7) - for _, mod := range([]string{"ptem", "ldterm", "ttcompat"}) { - err = streams_push(t, mod) - if err != nil { + for _, mod := range []string{"ptem", "ldterm", "ttcompat"} { + if err := streamsPush(t, mod); err != nil { return nil, nil, err } } - + return p, t, nil } -func minor(x uint64) uint64 { - return x & 0377 -} - -func ptsdev(fd uintptr) uint64 { - istr := strioctl{ISPTM, 0, 0, nil} - err := ioctl(fd, I_STR, uintptr(unsafe.Pointer(&istr))) - if err != nil { - return NODEV - } - var status unix.Stat_t - err = unix.Fstat(int(fd), &status) - if err != nil { - return NODEV - } - return uint64(minor(status.Rdev)) -} - func ptsname(f *os.File) (string, error) { - dev := ptsdev(f.Fd()) - if dev == NODEV { - return "", errors.New("not a master pty") + dev, err := ptsdev(f) + if err != nil { + return "", err } fn := "/dev/pts/" + strconv.FormatInt(int64(dev), 10) - // access(2) creates the slave device (if the pty exists) - // F_OK == 0 (unistd.h) - err := unix.Access(fn, 0) - if err != nil { + + if err := syscall.Access(fn, 0); err != nil { return "", err } return fn, nil } -type pt_own struct { - pto_ruid int32 - pto_rgid int32 +func unlockpt(f *os.File) error { + istr := strioctl{ + icCmd: UNLKPT, + icTimeout: 0, + icLen: 0, + icDP: nil, + } + return ioctl(f, I_STR, uintptr(unsafe.Pointer(&istr))) +} + +func minor(x uint64) uint64 { return x & 0377 } + +func ptsdev(f *os.File) (uint64, error) { + istr := strioctl{ + icCmd: ISPTM, + icTimeout: 0, + icLen: 0, + icDP: nil, + } + + if err := ioctl(f, I_STR, uintptr(unsafe.Pointer(&istr))); err != nil { + return 0, err + } + var errors = make(chan error, 1) + var results = make(chan uint64, 1) + defer close(errors) + defer close(results) + + var err error + var sc syscall.RawConn + sc, err = f.SyscallConn() + if err != nil { + return 0, err + } + err = sc.Control(func(fd uintptr) { + var status syscall.Stat_t + if err := syscall.Fstat(int(fd), &status); err != nil { + results <- 0 + errors <- err + } + results <- uint64(minor(status.Rdev)) + errors <- nil + }) + if err != nil { + return 0, err + } + return <-results, <-errors +} + +type ptOwn struct { + rUID int32 + rGID int32 } func grantpt(f *os.File) error { - if ptsdev(f.Fd()) == NODEV { - return errors.New("not a master pty") + if _, err := ptsdev(f); err != nil { + return err } - var pto pt_own - pto.pto_ruid = int32(os.Getuid()) - // XXX should first attempt to get gid of DEFAULT_TTY_GROUP="tty" - pto.pto_rgid = int32(os.Getgid()) - var istr strioctl - istr.ic_cmd = OWNERPT - istr.ic_timout = 0 - istr.ic_len = int32(unsafe.Sizeof(istr)) - istr.ic_dp = unsafe.Pointer(&pto) - err := ioctl(f.Fd(), I_STR, uintptr(unsafe.Pointer(&istr))) - if err != nil { + pto := ptOwn{ + rUID: int32(os.Getuid()), + // XXX should first attempt to get gid of DEFAULT_TTY_GROUP="tty" + rGID: int32(os.Getgid()), + } + istr := strioctl{ + icCmd: OWNERPT, + icTimeout: 0, + icLen: int32(unsafe.Sizeof(strioctl{})), + icDP: unsafe.Pointer(&pto), + } + if err := ioctl(f, I_STR, uintptr(unsafe.Pointer(&istr))); err != nil { return errors.New("access denied") } return nil } -func unlockpt(f *os.File) error { - istr := strioctl{UNLKPT, 0, 0, nil} - return ioctl(f.Fd(), I_STR, uintptr(unsafe.Pointer(&istr))) -} - -// push STREAMS modules if not already done so -func streams_push(f *os.File, mod string) error { - var err error +// streamsPush pushes STREAMS modules if not already done so. +func streamsPush(f *os.File, mod string) error { buf := []byte(mod) + // XXX I_FIND is not returning an error when the module // is already pushed even though truss reports a return // value of 1. A bug in the Go Solaris syscall interface? @@ -129,11 +163,9 @@ func streams_push(f *os.File, mod string) error { // https://www.illumos.org/issues/9042 // but since we are not using libc or XPG4.2, we should not be // double-pushing modules - - err = ioctl(f.Fd(), I_FIND, uintptr(unsafe.Pointer(&buf[0]))) - if err != nil { + + if err := ioctl(f, I_FIND, uintptr(unsafe.Pointer(&buf[0]))); err != nil { return nil } - err = ioctl(f.Fd(), I_PUSH, uintptr(unsafe.Pointer(&buf[0]))) - return err + return ioctl(f, I_PUSH, uintptr(unsafe.Pointer(&buf[0]))) } diff --git a/vendor/github.com/creack/pty/pty_unsupported.go b/vendor/github.com/creack/pty/pty_unsupported.go index ceb425b19..0971dc74e 100644 --- a/vendor/github.com/creack/pty/pty_unsupported.go +++ b/vendor/github.com/creack/pty/pty_unsupported.go @@ -1,4 +1,5 @@ -// +build !linux,!darwin,!freebsd,!dragonfly,!openbsd,!solaris +//go:build !linux && !darwin && !freebsd && !dragonfly && !netbsd && !openbsd && !solaris && !zos +// +build !linux,!darwin,!freebsd,!dragonfly,!netbsd,!openbsd,!solaris,!zos package pty diff --git a/vendor/github.com/creack/pty/pty_zos.go b/vendor/github.com/creack/pty/pty_zos.go new file mode 100644 index 000000000..18e61e196 --- /dev/null +++ b/vendor/github.com/creack/pty/pty_zos.go @@ -0,0 +1,141 @@ +//go:build zos +// +build zos + +package pty + +import ( + "os" + "runtime" + "syscall" + "unsafe" +) + +const ( + SYS_UNLOCKPT = 0x37B + SYS_GRANTPT = 0x37A + SYS_POSIX_OPENPT = 0xC66 + SYS_FCNTL = 0x18C + SYS___PTSNAME_A = 0x718 + + SETCVTON = 1 + + O_NONBLOCK = 0x04 + + F_SETFL = 4 + F_CONTROL_CVT = 13 +) + +type f_cnvrt struct { + Cvtcmd int32 + Pccsid int16 + Fccsid int16 +} + +func open() (pty, tty *os.File, err error) { + ptmxfd, err := openpt(os.O_RDWR | syscall.O_NOCTTY) + if err != nil { + return nil, nil, err + } + + // Needed for z/OS so that the characters are not garbled if ptyp* is untagged + cvtreq := f_cnvrt{Cvtcmd: SETCVTON, Pccsid: 0, Fccsid: 1047} + if _, err = fcntl(uintptr(ptmxfd), F_CONTROL_CVT, uintptr(unsafe.Pointer(&cvtreq))); err != nil { + return nil, nil, err + } + + p := os.NewFile(uintptr(ptmxfd), "/dev/ptmx") + if p == nil { + return nil, nil, err + } + + // In case of error after this point, make sure we close the ptmx fd. + defer func() { + if err != nil { + _ = p.Close() // Best effort. + } + }() + + sname, err := ptsname(ptmxfd) + if err != nil { + return nil, nil, err + } + + _, err = grantpt(ptmxfd) + if err != nil { + return nil, nil, err + } + + if _, err = unlockpt(ptmxfd); err != nil { + return nil, nil, err + } + + ptsfd, err := syscall.Open(sname, os.O_RDWR|syscall.O_NOCTTY, 0) + if err != nil { + return nil, nil, err + } + + if _, err = fcntl(uintptr(ptsfd), F_CONTROL_CVT, uintptr(unsafe.Pointer(&cvtreq))); err != nil { + return nil, nil, err + } + + t := os.NewFile(uintptr(ptsfd), sname) + if err != nil { + return nil, nil, err + } + + return p, t, nil +} + +func openpt(oflag int) (fd int, err error) { + r0, _, e1 := runtime.CallLeFuncWithErr(runtime.GetZosLibVec()+SYS_POSIX_OPENPT<<4, uintptr(oflag)) + fd = int(r0) + if e1 != 0 { + err = syscall.Errno(e1) + } + return +} + +func fcntl(fd uintptr, cmd int, arg uintptr) (val int, err error) { + r0, _, e1 := runtime.CallLeFuncWithErr(runtime.GetZosLibVec()+SYS_FCNTL<<4, uintptr(fd), uintptr(cmd), arg) + val = int(r0) + if e1 != 0 { + err = syscall.Errno(e1) + } + return +} + +func ptsname(fd int) (name string, err error) { + r0, _, e1 := runtime.CallLeFuncWithPtrReturn(runtime.GetZosLibVec()+SYS___PTSNAME_A<<4, uintptr(fd)) + name = u2s(unsafe.Pointer(r0)) + if e1 != 0 { + err = syscall.Errno(e1) + } + return +} + +func grantpt(fildes int) (rc int, err error) { + r0, _, e1 := runtime.CallLeFuncWithErr(runtime.GetZosLibVec()+SYS_GRANTPT<<4, uintptr(fildes)) + rc = int(r0) + if e1 != 0 { + err = syscall.Errno(e1) + } + return +} + +func unlockpt(fildes int) (rc int, err error) { + r0, _, e1 := runtime.CallLeFuncWithErr(runtime.GetZosLibVec()+SYS_UNLOCKPT<<4, uintptr(fildes)) + rc = int(r0) + if e1 != 0 { + err = syscall.Errno(e1) + } + return +} + +func u2s(cstr unsafe.Pointer) string { + str := (*[1024]uint8)(cstr) + i := 0 + for str[i] != 0 { + i++ + } + return string(str[:i]) +} diff --git a/vendor/github.com/creack/pty/run.go b/vendor/github.com/creack/pty/run.go index b07942514..475536620 100644 --- a/vendor/github.com/creack/pty/run.go +++ b/vendor/github.com/creack/pty/run.go @@ -1,5 +1,3 @@ -// +build !windows - package pty import ( @@ -13,23 +11,8 @@ import ( // corresponding pty. // // Starts the process in a new session and sets the controlling terminal. -func Start(c *exec.Cmd) (pty *os.File, err error) { - return StartWithSize(c, nil) -} - -// StartWithSize assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout, -// and c.Stderr, calls c.Start, and returns the File of the tty's -// corresponding pty. -// -// This will resize the pty to the specified size before starting the command. -// Starts the process in a new session and sets the controlling terminal. -func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) { - if c.SysProcAttr == nil { - c.SysProcAttr = &syscall.SysProcAttr{} - } - c.SysProcAttr.Setsid = true - c.SysProcAttr.Setctty = true - return StartWithAttrs(c, sz, c.SysProcAttr) +func Start(cmd *exec.Cmd) (*os.File, error) { + return StartWithSize(cmd, nil) } // StartWithAttrs assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout, @@ -41,16 +24,16 @@ func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) { // // This should generally not be needed. Used in some edge cases where it is needed to create a pty // without a controlling terminal. -func StartWithAttrs(c *exec.Cmd, sz *Winsize, attrs *syscall.SysProcAttr) (pty *os.File, err error) { +func StartWithAttrs(c *exec.Cmd, sz *Winsize, attrs *syscall.SysProcAttr) (*os.File, error) { pty, tty, err := Open() if err != nil { return nil, err } - defer tty.Close() + defer func() { _ = tty.Close() }() // Best effort. if sz != nil { if err := Setsize(pty, sz); err != nil { - pty.Close() + _ = pty.Close() // Best effort. return nil, err } } @@ -67,7 +50,7 @@ func StartWithAttrs(c *exec.Cmd, sz *Winsize, attrs *syscall.SysProcAttr) (pty * c.SysProcAttr = attrs if err := c.Start(); err != nil { - _ = pty.Close() + _ = pty.Close() // Best effort. return nil, err } return pty, err diff --git a/vendor/github.com/creack/pty/start.go b/vendor/github.com/creack/pty/start.go new file mode 100644 index 000000000..9b51635f5 --- /dev/null +++ b/vendor/github.com/creack/pty/start.go @@ -0,0 +1,25 @@ +//go:build !windows +// +build !windows + +package pty + +import ( + "os" + "os/exec" + "syscall" +) + +// StartWithSize assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout, +// and c.Stderr, calls c.Start, and returns the File of the tty's +// corresponding pty. +// +// This will resize the pty to the specified size before starting the command. +// Starts the process in a new session and sets the controlling terminal. +func StartWithSize(cmd *exec.Cmd, ws *Winsize) (*os.File, error) { + if cmd.SysProcAttr == nil { + cmd.SysProcAttr = &syscall.SysProcAttr{} + } + cmd.SysProcAttr.Setsid = true + cmd.SysProcAttr.Setctty = true + return StartWithAttrs(cmd, ws, cmd.SysProcAttr) +} diff --git a/vendor/github.com/creack/pty/start_windows.go b/vendor/github.com/creack/pty/start_windows.go new file mode 100644 index 000000000..7e9530ba0 --- /dev/null +++ b/vendor/github.com/creack/pty/start_windows.go @@ -0,0 +1,19 @@ +//go:build windows +// +build windows + +package pty + +import ( + "os" + "os/exec" +) + +// StartWithSize assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout, +// and c.Stderr, calls c.Start, and returns the File of the tty's +// corresponding pty. +// +// This will resize the pty to the specified size before starting the command. +// Starts the process in a new session and sets the controlling terminal. +func StartWithSize(cmd *exec.Cmd, ws *Winsize) (*os.File, error) { + return nil, ErrUnsupported +} diff --git a/vendor/github.com/creack/pty/test_crosscompile.sh b/vendor/github.com/creack/pty/test_crosscompile.sh index c4b9e3734..40df89add 100644 --- a/vendor/github.com/creack/pty/test_crosscompile.sh +++ b/vendor/github.com/creack/pty/test_crosscompile.sh @@ -4,31 +4,31 @@ # Does not actually test the logic, just the compilation so we make sure we don't break code depending on the lib. echo2() { - echo $@ >&2 + echo $@ >&2 } trap end 0 end() { - [ "$?" = 0 ] && echo2 "Pass." || (echo2 "Fail."; exit 1) + [ "$?" = 0 ] && echo2 "Pass." || (echo2 "Fail."; exit 1) } cross() { - os=$1 - shift - echo2 "Build for $os." - for arch in $@; do - echo2 " - $os/$arch" - GOOS=$os GOARCH=$arch go build - done - echo2 + os=$1 + shift + echo2 "Build for $os." + for arch in $@; do + echo2 " - $os/$arch" + GOOS=$os GOARCH=$arch go build + done + echo2 } set -e -cross linux amd64 386 arm arm64 ppc64 ppc64le s390x mips mipsle mips64 mips64le -cross darwin amd64 386 arm arm64 -cross freebsd amd64 386 arm -cross netbsd amd64 386 arm +cross linux amd64 386 arm arm64 ppc64 ppc64le s390x mips mipsle mips64 mips64le riscv64 +cross darwin amd64 arm64 +cross freebsd amd64 386 arm arm64 riscv64 +cross netbsd amd64 386 arm arm64 cross openbsd amd64 386 arm arm64 cross dragonfly amd64 cross solaris amd64 @@ -41,10 +41,20 @@ cross windows amd64 386 arm # Some os/arch require a different compiler. Run in docker. if ! hash docker; then - # If docker is not present, stop here. - return + # If docker is not present, stop here. + return fi -echo2 "Build for linux." -echo2 " - linux/riscv" -docker build -t test -f Dockerfile.riscv . +# Golang dropped support for darwin 32bits since go1.15. Make sure the lib still compile with go1.14 on those archs. +echo2 "Build for darwin (32bits)." +echo2 " - darwin/386" +docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.14 --build-arg=GOOS=darwin --build-arg=GOARCH=386 . +echo2 " - darwin/arm" +docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.14 --build-arg=GOOS=darwin --build-arg=GOARCH=arm . + +# Run a single test for an old go version. Would be best with go1.0, but not available on Dockerhub. +# Using 1.6 as it is the base version for the RISCV compiler. +# Would also be better to run all the tests, not just one, need to refactor this file to allow for specifc archs per version. +echo2 "Build for linux - go1.6." +echo2 " - linux/amd64" +docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.6 --build-arg=GOOS=linux --build-arg=GOARCH=amd64 . diff --git a/vendor/github.com/creack/pty/util.go b/vendor/github.com/creack/pty/util.go deleted file mode 100644 index 8fdde0bab..000000000 --- a/vendor/github.com/creack/pty/util.go +++ /dev/null @@ -1,64 +0,0 @@ -// +build !windows,!solaris - -package pty - -import ( - "os" - "syscall" - "unsafe" -) - -// InheritSize applies the terminal size of pty to tty. This should be run -// in a signal handler for syscall.SIGWINCH to automatically resize the tty when -// the pty receives a window size change notification. -func InheritSize(pty, tty *os.File) error { - size, err := GetsizeFull(pty) - if err != nil { - return err - } - err = Setsize(tty, size) - if err != nil { - return err - } - return nil -} - -// Setsize resizes t to s. -func Setsize(t *os.File, ws *Winsize) error { - return windowRectCall(ws, t.Fd(), syscall.TIOCSWINSZ) -} - -// GetsizeFull returns the full terminal size description. -func GetsizeFull(t *os.File) (size *Winsize, err error) { - var ws Winsize - err = windowRectCall(&ws, t.Fd(), syscall.TIOCGWINSZ) - return &ws, err -} - -// Getsize returns the number of rows (lines) and cols (positions -// in each line) in terminal t. -func Getsize(t *os.File) (rows, cols int, err error) { - ws, err := GetsizeFull(t) - return int(ws.Rows), int(ws.Cols), err -} - -// Winsize describes the terminal size. -type Winsize struct { - Rows uint16 // ws_row: Number of rows (in cells) - Cols uint16 // ws_col: Number of columns (in cells) - X uint16 // ws_xpixel: Width in pixels - Y uint16 // ws_ypixel: Height in pixels -} - -func windowRectCall(ws *Winsize, fd, a2 uintptr) error { - _, _, errno := syscall.Syscall( - syscall.SYS_IOCTL, - fd, - a2, - uintptr(unsafe.Pointer(ws)), - ) - if errno != 0 { - return syscall.Errno(errno) - } - return nil -} diff --git a/vendor/github.com/creack/pty/util_solaris.go b/vendor/github.com/creack/pty/util_solaris.go deleted file mode 100644 index e88969248..000000000 --- a/vendor/github.com/creack/pty/util_solaris.go +++ /dev/null @@ -1,51 +0,0 @@ -// - -package pty - -import ( - "os" - "golang.org/x/sys/unix" -) - -const ( - TIOCGWINSZ = 21608 // 'T' << 8 | 104 - TIOCSWINSZ = 21607 // 'T' << 8 | 103 -) - -// Winsize describes the terminal size. -type Winsize struct { - Rows uint16 // ws_row: Number of rows (in cells) - Cols uint16 // ws_col: Number of columns (in cells) - X uint16 // ws_xpixel: Width in pixels - Y uint16 // ws_ypixel: Height in pixels -} - -// GetsizeFull returns the full terminal size description. -func GetsizeFull(t *os.File) (size *Winsize, err error) { - var wsz *unix.Winsize - wsz, err = unix.IoctlGetWinsize(int(t.Fd()), TIOCGWINSZ) - - if err != nil { - return nil, err - } else { - return &Winsize{wsz.Row, wsz.Col, wsz.Xpixel, wsz.Ypixel}, nil - } -} - -// Get Windows Size -func Getsize(t *os.File) (rows, cols int, err error) { - var wsz *unix.Winsize - wsz, err = unix.IoctlGetWinsize(int(t.Fd()), TIOCGWINSZ) - - if err != nil { - return 80, 25, err - } else { - return int(wsz.Row), int(wsz.Col), nil - } -} - -// Setsize resizes t to s. -func Setsize(t *os.File, ws *Winsize) error { - wsz := unix.Winsize{ws.Rows, ws.Cols, ws.X, ws.Y} - return unix.IoctlSetWinsize(int(t.Fd()), TIOCSWINSZ, &wsz) -} diff --git a/vendor/github.com/creack/pty/winsize.go b/vendor/github.com/creack/pty/winsize.go new file mode 100644 index 000000000..cfa3e5f39 --- /dev/null +++ b/vendor/github.com/creack/pty/winsize.go @@ -0,0 +1,24 @@ +package pty + +import "os" + +// InheritSize applies the terminal size of pty to tty. This should be run +// in a signal handler for syscall.SIGWINCH to automatically resize the tty when +// the pty receives a window size change notification. +func InheritSize(pty, tty *os.File) error { + size, err := GetsizeFull(pty) + if err != nil { + return err + } + return Setsize(tty, size) +} + +// Getsize returns the number of rows (lines) and cols (positions +// in each line) in terminal t. +func Getsize(t *os.File) (rows, cols int, err error) { + ws, err := GetsizeFull(t) + if err != nil { + return 0, 0, err + } + return int(ws.Rows), int(ws.Cols), nil +} diff --git a/vendor/github.com/creack/pty/winsize_unix.go b/vendor/github.com/creack/pty/winsize_unix.go new file mode 100644 index 000000000..8dbbcda0f --- /dev/null +++ b/vendor/github.com/creack/pty/winsize_unix.go @@ -0,0 +1,35 @@ +//go:build !windows +// +build !windows + +package pty + +import ( + "os" + "syscall" + "unsafe" +) + +// Winsize describes the terminal size. +type Winsize struct { + Rows uint16 // ws_row: Number of rows (in cells). + Cols uint16 // ws_col: Number of columns (in cells). + X uint16 // ws_xpixel: Width in pixels. + Y uint16 // ws_ypixel: Height in pixels. +} + +// Setsize resizes t to s. +func Setsize(t *os.File, ws *Winsize) error { + //nolint:gosec // Expected unsafe pointer for Syscall call. + return ioctl(t, syscall.TIOCSWINSZ, uintptr(unsafe.Pointer(ws))) +} + +// GetsizeFull returns the full terminal size description. +func GetsizeFull(t *os.File) (size *Winsize, err error) { + var ws Winsize + + //nolint:gosec // Expected unsafe pointer for Syscall call. + if err := ioctl(t, syscall.TIOCGWINSZ, uintptr(unsafe.Pointer(&ws))); err != nil { + return nil, err + } + return &ws, nil +} diff --git a/vendor/github.com/creack/pty/winsize_unsupported.go b/vendor/github.com/creack/pty/winsize_unsupported.go new file mode 100644 index 000000000..0d2109938 --- /dev/null +++ b/vendor/github.com/creack/pty/winsize_unsupported.go @@ -0,0 +1,23 @@ +//go:build windows +// +build windows + +package pty + +import ( + "os" +) + +// Winsize is a dummy struct to enable compilation on unsupported platforms. +type Winsize struct { + Rows, Cols, X, Y uint16 +} + +// Setsize resizes t to s. +func Setsize(*os.File, *Winsize) error { + return ErrUnsupported +} + +// GetsizeFull returns the full terminal size description. +func GetsizeFull(*os.File) (*Winsize, error) { + return nil, ErrUnsupported +} diff --git a/vendor/github.com/creack/pty/ztypes_386.go b/vendor/github.com/creack/pty/ztypes_386.go index ff0b8fd83..d126f4aa5 100644 --- a/vendor/github.com/creack/pty/ztypes_386.go +++ b/vendor/github.com/creack/pty/ztypes_386.go @@ -1,3 +1,6 @@ +//go:build 386 +// +build 386 + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types.go diff --git a/vendor/github.com/creack/pty/ztypes_amd64.go b/vendor/github.com/creack/pty/ztypes_amd64.go index ff0b8fd83..6c4a7677f 100644 --- a/vendor/github.com/creack/pty/ztypes_amd64.go +++ b/vendor/github.com/creack/pty/ztypes_amd64.go @@ -1,3 +1,6 @@ +//go:build amd64 +// +build amd64 + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types.go diff --git a/vendor/github.com/creack/pty/ztypes_arm.go b/vendor/github.com/creack/pty/ztypes_arm.go index ff0b8fd83..de6fe160e 100644 --- a/vendor/github.com/creack/pty/ztypes_arm.go +++ b/vendor/github.com/creack/pty/ztypes_arm.go @@ -1,3 +1,6 @@ +//go:build arm +// +build arm + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types.go diff --git a/vendor/github.com/creack/pty/ztypes_arm64.go b/vendor/github.com/creack/pty/ztypes_arm64.go index 6c29a4b91..c4f315cac 100644 --- a/vendor/github.com/creack/pty/ztypes_arm64.go +++ b/vendor/github.com/creack/pty/ztypes_arm64.go @@ -1,8 +1,9 @@ +//go:build arm64 +// +build arm64 + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types.go -// +build arm64 - package pty type ( diff --git a/vendor/github.com/creack/pty/ztypes_dragonfly_amd64.go b/vendor/github.com/creack/pty/ztypes_dragonfly_amd64.go index 6b0ba037f..183c42147 100644 --- a/vendor/github.com/creack/pty/ztypes_dragonfly_amd64.go +++ b/vendor/github.com/creack/pty/ztypes_dragonfly_amd64.go @@ -1,3 +1,6 @@ +//go:build amd64 && dragonfly +// +build amd64,dragonfly + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types_dragonfly.go diff --git a/vendor/github.com/creack/pty/ztypes_freebsd_386.go b/vendor/github.com/creack/pty/ztypes_freebsd_386.go index d9975374e..d80dbf717 100644 --- a/vendor/github.com/creack/pty/ztypes_freebsd_386.go +++ b/vendor/github.com/creack/pty/ztypes_freebsd_386.go @@ -1,3 +1,6 @@ +//go:build 386 && freebsd +// +build 386,freebsd + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types_freebsd.go diff --git a/vendor/github.com/creack/pty/ztypes_freebsd_amd64.go b/vendor/github.com/creack/pty/ztypes_freebsd_amd64.go index 5fa102fcd..bfab4e458 100644 --- a/vendor/github.com/creack/pty/ztypes_freebsd_amd64.go +++ b/vendor/github.com/creack/pty/ztypes_freebsd_amd64.go @@ -1,3 +1,6 @@ +//go:build amd64 && freebsd +// +build amd64,freebsd + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types_freebsd.go diff --git a/vendor/github.com/creack/pty/ztypes_freebsd_arm.go b/vendor/github.com/creack/pty/ztypes_freebsd_arm.go index d9975374e..3a8aeae37 100644 --- a/vendor/github.com/creack/pty/ztypes_freebsd_arm.go +++ b/vendor/github.com/creack/pty/ztypes_freebsd_arm.go @@ -1,3 +1,6 @@ +//go:build arm && freebsd +// +build arm,freebsd + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types_freebsd.go diff --git a/vendor/github.com/creack/pty/ztypes_freebsd_arm64.go b/vendor/github.com/creack/pty/ztypes_freebsd_arm64.go index 4418139b2..a83924918 100644 --- a/vendor/github.com/creack/pty/ztypes_freebsd_arm64.go +++ b/vendor/github.com/creack/pty/ztypes_freebsd_arm64.go @@ -1,3 +1,6 @@ +//go:build arm64 && freebsd +// +build arm64,freebsd + // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs types_freebsd.go diff --git a/vendor/github.com/creack/pty/ztypes_freebsd_ppc64.go b/vendor/github.com/creack/pty/ztypes_freebsd_ppc64.go new file mode 100644 index 000000000..5fa102fcd --- /dev/null +++ b/vendor/github.com/creack/pty/ztypes_freebsd_ppc64.go @@ -0,0 +1,14 @@ +// Created by cgo -godefs - DO NOT EDIT +// cgo -godefs types_freebsd.go + +package pty + +const ( + _C_SPECNAMELEN = 0x3f +) + +type fiodgnameArg struct { + Len int32 + Pad_cgo_0 [4]byte + Buf *byte +} diff --git a/vendor/github.com/creack/pty/ztypes_freebsd_riscv64.go b/vendor/github.com/creack/pty/ztypes_freebsd_riscv64.go new file mode 100644 index 000000000..b3c544098 --- /dev/null +++ b/vendor/github.com/creack/pty/ztypes_freebsd_riscv64.go @@ -0,0 +1,13 @@ +// Code generated by cmd/cgo -godefs; DO NOT EDIT. +// cgo -godefs types_freebsd.go + +package pty + +const ( + _C_SPECNAMELEN = 0x3f +) + +type fiodgnameArg struct { + Len int32 + Buf *byte +} diff --git a/vendor/github.com/creack/pty/ztypes_loong64.go b/vendor/github.com/creack/pty/ztypes_loong64.go new file mode 100644 index 000000000..3beb5c176 --- /dev/null +++ b/vendor/github.com/creack/pty/ztypes_loong64.go @@ -0,0 +1,12 @@ +//go:build loong64 +// +build loong64 + +// Created by cgo -godefs - DO NOT EDIT +// cgo -godefs types.go + +package pty + +type ( + _C_int int32 + _C_uint uint32 +) diff --git a/vendor/github.com/creack/pty/ztypes_mipsx.go b/vendor/github.com/creack/pty/ztypes_mipsx.go index f0ce74086..281277977 100644 --- a/vendor/github.com/creack/pty/ztypes_mipsx.go +++ b/vendor/github.com/creack/pty/ztypes_mipsx.go @@ -1,9 +1,10 @@ +//go:build (mips || mipsle || mips64 || mips64le) && linux +// +build mips mipsle mips64 mips64le +// +build linux + // Created by cgo -godefs - DO NOT EDIT // cgo -godefs types.go -// +build linux -// +build mips mipsle mips64 mips64le - package pty type ( diff --git a/vendor/github.com/creack/pty/ztypes_netbsd_32bit_int.go b/vendor/github.com/creack/pty/ztypes_netbsd_32bit_int.go new file mode 100644 index 000000000..2ab7c4559 --- /dev/null +++ b/vendor/github.com/creack/pty/ztypes_netbsd_32bit_int.go @@ -0,0 +1,17 @@ +//go:build (386 || amd64 || arm || arm64) && netbsd +// +build 386 amd64 arm arm64 +// +build netbsd + +package pty + +type ptmget struct { + Cfd int32 + Sfd int32 + Cn [1024]int8 + Sn [1024]int8 +} + +var ( + ioctl_TIOCPTSNAME = 0x48087448 + ioctl_TIOCGRANTPT = 0x20007447 +) diff --git a/vendor/github.com/creack/pty/ztypes_openbsd_32bit_int.go b/vendor/github.com/creack/pty/ztypes_openbsd_32bit_int.go index d7cab4a2a..811312dd3 100644 --- a/vendor/github.com/creack/pty/ztypes_openbsd_32bit_int.go +++ b/vendor/github.com/creack/pty/ztypes_openbsd_32bit_int.go @@ -1,13 +1,13 @@ +//go:build openbsd // +build openbsd -// +build 386 amd64 arm arm64 package pty type ptmget struct { - Cfd int32 - Sfd int32 - Cn [16]int8 - Sn [16]int8 + Cfd int32 + Sfd int32 + Cn [16]int8 + Sn [16]int8 } var ioctl_PTMGET = 0x40287401 diff --git a/vendor/github.com/creack/pty/ztypes_ppc.go b/vendor/github.com/creack/pty/ztypes_ppc.go new file mode 100644 index 000000000..ff0b8fd83 --- /dev/null +++ b/vendor/github.com/creack/pty/ztypes_ppc.go @@ -0,0 +1,9 @@ +// Created by cgo -godefs - DO NOT EDIT +// cgo -godefs types.go + +package pty + +type ( + _C_int int32 + _C_uint uint32 +) diff --git a/vendor/github.com/creack/pty/ztypes_ppc64.go b/vendor/github.com/creack/pty/ztypes_ppc64.go index 4e1af8431..bbb3da832 100644 --- a/vendor/github.com/creack/pty/ztypes_ppc64.go +++ b/vendor/github.com/creack/pty/ztypes_ppc64.go @@ -1,3 +1,4 @@ +//go:build ppc64 // +build ppc64 // Created by cgo -godefs - DO NOT EDIT diff --git a/vendor/github.com/creack/pty/ztypes_ppc64le.go b/vendor/github.com/creack/pty/ztypes_ppc64le.go index e6780f4e2..8a4fac3e9 100644 --- a/vendor/github.com/creack/pty/ztypes_ppc64le.go +++ b/vendor/github.com/creack/pty/ztypes_ppc64le.go @@ -1,3 +1,4 @@ +//go:build ppc64le // +build ppc64le // Created by cgo -godefs - DO NOT EDIT diff --git a/vendor/github.com/creack/pty/ztypes_riscvx.go b/vendor/github.com/creack/pty/ztypes_riscvx.go index 99eec8ecb..dc5da9050 100644 --- a/vendor/github.com/creack/pty/ztypes_riscvx.go +++ b/vendor/github.com/creack/pty/ztypes_riscvx.go @@ -1,8 +1,9 @@ +//go:build riscv || riscv64 +// +build riscv riscv64 + // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs types.go -// +build riscv riscv64 - package pty type ( diff --git a/vendor/github.com/creack/pty/ztypes_s390x.go b/vendor/github.com/creack/pty/ztypes_s390x.go index a7452b61c..3433be7ca 100644 --- a/vendor/github.com/creack/pty/ztypes_s390x.go +++ b/vendor/github.com/creack/pty/ztypes_s390x.go @@ -1,3 +1,4 @@ +//go:build s390x // +build s390x // Created by cgo -godefs - DO NOT EDIT diff --git a/vendor/github.com/creack/pty/ztypes_sparcx.go b/vendor/github.com/creack/pty/ztypes_sparcx.go new file mode 100644 index 000000000..06e44311d --- /dev/null +++ b/vendor/github.com/creack/pty/ztypes_sparcx.go @@ -0,0 +1,12 @@ +//go:build sparc || sparc64 +// +build sparc sparc64 + +// Code generated by cmd/cgo -godefs; DO NOT EDIT. +// cgo -godefs types.go + +package pty + +type ( + _C_int int32 + _C_uint uint32 +) diff --git a/vendor/github.com/cyphar/filepath-securejoin/CHANGELOG.md b/vendor/github.com/cyphar/filepath-securejoin/CHANGELOG.md deleted file mode 100644 index ca0e3c62c..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/CHANGELOG.md +++ /dev/null @@ -1,256 +0,0 @@ -# Changelog # -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/) -and this project adheres to [Semantic Versioning](http://semver.org/). - -## [Unreleased] ## - -## [0.4.1] - 2025-01-28 ## - -### Fixed ### -- The restrictions added for `root` paths passed to `SecureJoin` in 0.4.0 was - found to be too strict and caused some regressions when folks tried to - update, so this restriction has been relaxed to only return an error if the - path contains a `..` component. We still recommend users use `filepath.Clean` - (and even `filepath.EvalSymlinks`) on the `root` path they are using, but at - least you will no longer be punished for "trivial" unclean paths. - -## [0.4.0] - 2025-01-13 ## - -### Breaking #### -- `SecureJoin(VFS)` will now return an error if the provided `root` is not a - `filepath.Clean`'d path. - - While it is ultimately the responsibility of the caller to ensure the root is - a safe path to use, passing a path like `/symlink/..` as a root would result - in the `SecureJoin`'d path being placed in `/` even though `/symlink/..` - might be a different directory, and so we should more strongly discourage - such usage. - - All major users of `securejoin.SecureJoin` already ensure that the paths they - provide are safe (and this is ultimately a question of user error), but - removing this foot-gun is probably a good idea. Of course, this is - necessarily a breaking API change (though we expect no real users to be - affected by it). - - Thanks to [Erik Sjölund](https://github.com/eriksjolund), who initially - reported this issue as a possible security issue. - -- `MkdirAll` and `MkdirHandle` now take an `os.FileMode`-style mode argument - instead of a raw `unix.S_*`-style mode argument, which may cause compile-time - type errors depending on how you use `filepath-securejoin`. For most users, - there will be no change in behaviour aside from the type change (as the - bottom `0o777` bits are the same in both formats, and most users are probably - only using those bits). - - However, if you were using `unix.S_ISVTX` to set the sticky bit with - `MkdirAll(Handle)` you will need to switch to `os.ModeSticky` otherwise you - will get a runtime error with this update. In addition, the error message you - will get from passing `unix.S_ISUID` and `unix.S_ISGID` will be different as - they are treated as invalid bits now (note that previously passing said bits - was also an error). - -## [0.3.6] - 2024-12-17 ## - -### Compatibility ### -- The minimum Go version requirement for `filepath-securejoin` is now Go 1.18 - (we use generics internally). - - For reference, `filepath-securejoin@v0.3.0` somewhat-arbitrarily bumped the - Go version requirement to 1.21. - - While we did make some use of Go 1.21 stdlib features (and in principle Go - versions <= 1.21 are no longer even supported by upstream anymore), some - downstreams have complained that the version bump has meant that they have to - do workarounds when backporting fixes that use the new `filepath-securejoin` - API onto old branches. This is not an ideal situation, but since using this - library is probably better for most downstreams than a hand-rolled - workaround, we now have compatibility shims that allow us to build on older - Go versions. -- Lower minimum version requirement for `golang.org/x/sys` to `v0.18.0` (we - need the wrappers for `fsconfig(2)`), which should also make backporting - patches to older branches easier. - -## [0.3.5] - 2024-12-06 ## - -### Fixed ### -- `MkdirAll` will now no longer return an `EEXIST` error if two racing - processes are creating the same directory. We will still verify that the path - is a directory, but this will avoid spurious errors when multiple threads or - programs are trying to `MkdirAll` the same path. opencontainers/runc#4543 - -## [0.3.4] - 2024-10-09 ## - -### Fixed ### -- Previously, some testing mocks we had resulted in us doing `import "testing"` - in non-`_test.go` code, which made some downstreams like Kubernetes unhappy. - This has been fixed. (#32) - -## [0.3.3] - 2024-09-30 ## - -### Fixed ### -- The mode and owner verification logic in `MkdirAll` has been removed. This - was originally intended to protect against some theoretical attacks but upon - further consideration these protections don't actually buy us anything and - they were causing spurious errors with more complicated filesystem setups. -- The "is the created directory empty" logic in `MkdirAll` has also been - removed. This was not causing us issues yet, but some pseudofilesystems (such - as `cgroup`) create non-empty directories and so this logic would've been - wrong for such cases. - -## [0.3.2] - 2024-09-13 ## - -### Changed ### -- Passing the `S_ISUID` or `S_ISGID` modes to `MkdirAllInRoot` will now return - an explicit error saying that those bits are ignored by `mkdirat(2)`. In the - past a different error was returned, but since the silent ignoring behaviour - is codified in the man pages a more explicit error seems apt. While silently - ignoring these bits would be the most compatible option, it could lead to - users thinking their code sets these bits when it doesn't. Programs that need - to deal with compatibility can mask the bits themselves. (#23, #25) - -### Fixed ### -- If a directory has `S_ISGID` set, then all child directories will have - `S_ISGID` set when created and a different gid will be used for any inode - created under the directory. Previously, the "expected owner and mode" - validation in `securejoin.MkdirAll` did not correctly handle this. We now - correctly handle this case. (#24, #25) - -## [0.3.1] - 2024-07-23 ## - -### Changed ### -- By allowing `Open(at)InRoot` to opt-out of the extra work done by `MkdirAll` - to do the necessary "partial lookups", `Open(at)InRoot` now does less work - for both implementations (resulting in a many-fold decrease in the number of - operations for `openat2`, and a modest improvement for non-`openat2`) and is - far more guaranteed to match the correct `openat2(RESOLVE_IN_ROOT)` - behaviour. -- We now use `readlinkat(fd, "")` where possible. For `Open(at)InRoot` this - effectively just means that we no longer risk getting spurious errors during - rename races. However, for our hardened procfs handler, this in theory should - prevent mount attacks from tricking us when doing magic-link readlinks (even - when using the unsafe host `/proc` handle). Unfortunately `Reopen` is still - potentially vulnerable to those kinds of somewhat-esoteric attacks. - - Technically this [will only work on post-2.6.39 kernels][linux-readlinkat-emptypath] - but it seems incredibly unlikely anyone is using `filepath-securejoin` on a - pre-2011 kernel. - -### Fixed ### -- Several improvements were made to the errors returned by `Open(at)InRoot` and - `MkdirAll` when dealing with invalid paths under the emulated (ie. - non-`openat2`) implementation. Previously, some paths would return the wrong - error (`ENOENT` when the last component was a non-directory), and other paths - would be returned as though they were acceptable (trailing-slash components - after a non-directory would be ignored by `Open(at)InRoot`). - - These changes were done to match `openat2`'s behaviour and purely is a - consistency fix (most users are going to be using `openat2` anyway). - -[linux-readlinkat-emptypath]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=65cfc6722361570bfe255698d9cd4dccaf47570d - -## [0.3.0] - 2024-07-11 ## - -### Added ### -- A new set of `*os.File`-based APIs have been added. These are adapted from - [libpathrs][] and we strongly suggest using them if possible (as they provide - far more protection against attacks than `SecureJoin`): - - - `Open(at)InRoot` resolves a path inside a rootfs and returns an `*os.File` - handle to the path. Note that the handle returned is an `O_PATH` handle, - which cannot be used for reading or writing (as well as some other - operations -- [see open(2) for more details][open.2]) - - - `Reopen` takes an `O_PATH` file handle and safely re-opens it to upgrade - it to a regular handle. This can also be used with non-`O_PATH` handles, - but `O_PATH` is the most obvious application. - - - `MkdirAll` is an implementation of `os.MkdirAll` that is safe to use to - create a directory tree within a rootfs. - - As these are new APIs, they may change in the future. However, they should be - safe to start migrating to as we have extensive tests ensuring they behave - correctly and are safe against various races and other attacks. - -[libpathrs]: https://github.com/openSUSE/libpathrs -[open.2]: https://www.man7.org/linux/man-pages/man2/open.2.html - -## [0.2.5] - 2024-05-03 ## - -### Changed ### -- Some minor changes were made to how lexical components (like `..` and `.`) - are handled during path generation in `SecureJoin`. There is no behaviour - change as a result of this fix (the resulting paths are the same). - -### Fixed ### -- The error returned when we hit a symlink loop now references the correct - path. (#10) - -## [0.2.4] - 2023-09-06 ## - -### Security ### -- This release fixes a potential security issue in filepath-securejoin when - used on Windows ([GHSA-6xv5-86q9-7xr8][], which could be used to generate - paths outside of the provided rootfs in certain cases), as well as improving - the overall behaviour of filepath-securejoin when dealing with Windows paths - that contain volume names. Thanks to Paulo Gomes for discovering and fixing - these issues. - -### Fixed ### -- Switch to GitHub Actions for CI so we can test on Windows as well as Linux - and MacOS. - -[GHSA-6xv5-86q9-7xr8]: https://github.com/advisories/GHSA-6xv5-86q9-7xr8 - -## [0.2.3] - 2021-06-04 ## - -### Changed ### -- Switch to Go 1.13-style `%w` error wrapping, letting us drop the dependency - on `github.com/pkg/errors`. - -## [0.2.2] - 2018-09-05 ## - -### Changed ### -- Use `syscall.ELOOP` as the base error for symlink loops, rather than our own - (internal) error. This allows callers to more easily use `errors.Is` to check - for this case. - -## [0.2.1] - 2018-09-05 ## - -### Fixed ### -- Use our own `IsNotExist` implementation, which lets us handle `ENOTDIR` - properly within `SecureJoin`. - -## [0.2.0] - 2017-07-19 ## - -We now have 100% test coverage! - -### Added ### -- Add a `SecureJoinVFS` API that can be used for mocking (as we do in our new - tests) or for implementing custom handling of lookup operations (such as for - rootless containers, where work is necessary to access directories with weird - modes because we don't have `CAP_DAC_READ_SEARCH` or `CAP_DAC_OVERRIDE`). - -## 0.1.0 - 2017-07-19 - -This is our first release of `github.com/cyphar/filepath-securejoin`, -containing a full implementation with a coverage of 93.5% (the only missing -cases are the error cases, which are hard to mocktest at the moment). - -[Unreleased]: https://github.com/cyphar/filepath-securejoin/compare/v0.4.1...HEAD -[0.4.1]: https://github.com/cyphar/filepath-securejoin/compare/v0.4.0...v0.4.1 -[0.4.0]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.6...v0.4.0 -[0.3.6]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.5...v0.3.6 -[0.3.5]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.4...v0.3.5 -[0.3.4]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.3...v0.3.4 -[0.3.3]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.2...v0.3.3 -[0.3.2]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.1...v0.3.2 -[0.3.1]: https://github.com/cyphar/filepath-securejoin/compare/v0.3.0...v0.3.1 -[0.3.0]: https://github.com/cyphar/filepath-securejoin/compare/v0.2.5...v0.3.0 -[0.2.5]: https://github.com/cyphar/filepath-securejoin/compare/v0.2.4...v0.2.5 -[0.2.4]: https://github.com/cyphar/filepath-securejoin/compare/v0.2.3...v0.2.4 -[0.2.3]: https://github.com/cyphar/filepath-securejoin/compare/v0.2.2...v0.2.3 -[0.2.2]: https://github.com/cyphar/filepath-securejoin/compare/v0.2.1...v0.2.2 -[0.2.1]: https://github.com/cyphar/filepath-securejoin/compare/v0.2.0...v0.2.1 -[0.2.0]: https://github.com/cyphar/filepath-securejoin/compare/v0.1.0...v0.2.0 diff --git a/vendor/github.com/cyphar/filepath-securejoin/LICENSE b/vendor/github.com/cyphar/filepath-securejoin/LICENSE deleted file mode 100644 index cb1ab88da..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (C) 2014-2015 Docker Inc & Go Authors. All rights reserved. -Copyright (C) 2017-2024 SUSE LLC. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/cyphar/filepath-securejoin/README.md b/vendor/github.com/cyphar/filepath-securejoin/README.md deleted file mode 100644 index eaeb53fcd..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/README.md +++ /dev/null @@ -1,169 +0,0 @@ -## `filepath-securejoin` ## - -[![Go Documentation](https://pkg.go.dev/badge/github.com/cyphar/filepath-securejoin.svg)](https://pkg.go.dev/github.com/cyphar/filepath-securejoin) -[![Build Status](https://github.com/cyphar/filepath-securejoin/actions/workflows/ci.yml/badge.svg)](https://github.com/cyphar/filepath-securejoin/actions/workflows/ci.yml) - -### Old API ### - -This library was originally just an implementation of `SecureJoin` which was -[intended to be included in the Go standard library][go#20126] as a safer -`filepath.Join` that would restrict the path lookup to be inside a root -directory. - -The implementation was based on code that existed in several container -runtimes. Unfortunately, this API is **fundamentally unsafe** against attackers -that can modify path components after `SecureJoin` returns and before the -caller uses the path, allowing for some fairly trivial TOCTOU attacks. - -`SecureJoin` (and `SecureJoinVFS`) are still provided by this library to -support legacy users, but new users are strongly suggested to avoid using -`SecureJoin` and instead use the [new api](#new-api) or switch to -[libpathrs][libpathrs]. - -With the above limitations in mind, this library guarantees the following: - -* If no error is set, the resulting string **must** be a child path of - `root` and will not contain any symlink path components (they will all be - expanded). - -* When expanding symlinks, all symlink path components **must** be resolved - relative to the provided root. In particular, this can be considered a - userspace implementation of how `chroot(2)` operates on file paths. Note that - these symlinks will **not** be expanded lexically (`filepath.Clean` is not - called on the input before processing). - -* Non-existent path components are unaffected by `SecureJoin` (similar to - `filepath.EvalSymlinks`'s semantics). - -* The returned path will always be `filepath.Clean`ed and thus not contain any - `..` components. - -A (trivial) implementation of this function on GNU/Linux systems could be done -with the following (note that this requires root privileges and is far more -opaque than the implementation in this library, and also requires that -`readlink` is inside the `root` path and is trustworthy): - -```go -package securejoin - -import ( - "os/exec" - "path/filepath" -) - -func SecureJoin(root, unsafePath string) (string, error) { - unsafePath = string(filepath.Separator) + unsafePath - cmd := exec.Command("chroot", root, - "readlink", "--canonicalize-missing", "--no-newline", unsafePath) - output, err := cmd.CombinedOutput() - if err != nil { - return "", err - } - expanded := string(output) - return filepath.Join(root, expanded), nil -} -``` - -[libpathrs]: https://github.com/openSUSE/libpathrs -[go#20126]: https://github.com/golang/go/issues/20126 - -### New API ### - -While we recommend users switch to [libpathrs][libpathrs] as soon as it has a -stable release, some methods implemented by libpathrs have been ported to this -library to ease the transition. These APIs are only supported on Linux. - -These APIs are implemented such that `filepath-securejoin` will -opportunistically use certain newer kernel APIs that make these operations far -more secure. In particular: - -* All of the lookup operations will use [`openat2`][openat2.2] on new enough - kernels (Linux 5.6 or later) to restrict lookups through magic-links and - bind-mounts (for certain operations) and to make use of `RESOLVE_IN_ROOT` to - efficiently resolve symlinks within a rootfs. - -* The APIs provide hardening against a malicious `/proc` mount to either detect - or avoid being tricked by a `/proc` that is not legitimate. This is done - using [`openat2`][openat2.2] for all users, and privileged users will also be - further protected by using [`fsopen`][fsopen.2] and [`open_tree`][open_tree.2] - (Linux 5.2 or later). - -[openat2.2]: https://www.man7.org/linux/man-pages/man2/openat2.2.html -[fsopen.2]: https://github.com/brauner/man-pages-md/blob/main/fsopen.md -[open_tree.2]: https://github.com/brauner/man-pages-md/blob/main/open_tree.md - -#### `OpenInRoot` #### - -```go -func OpenInRoot(root, unsafePath string) (*os.File, error) -func OpenatInRoot(root *os.File, unsafePath string) (*os.File, error) -func Reopen(handle *os.File, flags int) (*os.File, error) -``` - -`OpenInRoot` is a much safer version of - -```go -path, err := securejoin.SecureJoin(root, unsafePath) -file, err := os.OpenFile(path, unix.O_PATH|unix.O_CLOEXEC) -``` - -that protects against various race attacks that could lead to serious security -issues, depending on the application. Note that the returned `*os.File` is an -`O_PATH` file descriptor, which is quite restricted. Callers will probably need -to use `Reopen` to get a more usable handle (this split is done to provide -useful features like PTY spawning and to avoid users accidentally opening bad -inodes that could cause a DoS). - -Callers need to be careful in how they use the returned `*os.File`. Usually it -is only safe to operate on the handle directly, and it is very easy to create a -security issue. [libpathrs][libpathrs] provides far more helpers to make using -these handles safer -- there is currently no plan to port them to -`filepath-securejoin`. - -`OpenatInRoot` is like `OpenInRoot` except that the root is provided using an -`*os.File`. This allows you to ensure that multiple `OpenatInRoot` (or -`MkdirAllHandle`) calls are operating on the same rootfs. - -> **NOTE**: Unlike `SecureJoin`, `OpenInRoot` will error out as soon as it hits -> a dangling symlink or non-existent path. This is in contrast to `SecureJoin` -> which treated non-existent components as though they were real directories, -> and would allow for partial resolution of dangling symlinks. These behaviours -> are at odds with how Linux treats non-existent paths and dangling symlinks, -> and so these are no longer allowed. - -#### `MkdirAll` #### - -```go -func MkdirAll(root, unsafePath string, mode int) error -func MkdirAllHandle(root *os.File, unsafePath string, mode int) (*os.File, error) -``` - -`MkdirAll` is a much safer version of - -```go -path, err := securejoin.SecureJoin(root, unsafePath) -err = os.MkdirAll(path, mode) -``` - -that protects against the same kinds of races that `OpenInRoot` protects -against. - -`MkdirAllHandle` is like `MkdirAll` except that the root is provided using an -`*os.File` (the reason for this is the same as with `OpenatInRoot`) and an -`*os.File` of the final created directory is returned (this directory is -guaranteed to be effectively identical to the directory created by -`MkdirAllHandle`, which is not possible to ensure by just using `OpenatInRoot` -after `MkdirAll`). - -> **NOTE**: Unlike `SecureJoin`, `MkdirAll` will error out as soon as it hits -> a dangling symlink or non-existent path. This is in contrast to `SecureJoin` -> which treated non-existent components as though they were real directories, -> and would allow for partial resolution of dangling symlinks. These behaviours -> are at odds with how Linux treats non-existent paths and dangling symlinks, -> and so these are no longer allowed. This means that `MkdirAll` will not -> create non-existent directories referenced by a dangling symlink. - -### License ### - -The license of this project is the same as Go, which is a BSD 3-clause license -available in the `LICENSE` file. diff --git a/vendor/github.com/cyphar/filepath-securejoin/VERSION b/vendor/github.com/cyphar/filepath-securejoin/VERSION deleted file mode 100644 index 267577d47..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.4.1 diff --git a/vendor/github.com/cyphar/filepath-securejoin/doc.go b/vendor/github.com/cyphar/filepath-securejoin/doc.go deleted file mode 100644 index 1ec7d065e..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/doc.go +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2014-2015 Docker Inc & Go Authors. All rights reserved. -// Copyright (C) 2017-2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package securejoin implements a set of helpers to make it easier to write Go -// code that is safe against symlink-related escape attacks. The primary idea -// is to let you resolve a path within a rootfs directory as if the rootfs was -// a chroot. -// -// securejoin has two APIs, a "legacy" API and a "modern" API. -// -// The legacy API is [SecureJoin] and [SecureJoinVFS]. These methods are -// **not** safe against race conditions where an attacker changes the -// filesystem after (or during) the [SecureJoin] operation. -// -// The new API is made up of [OpenInRoot] and [MkdirAll] (and derived -// functions). These are safe against racing attackers and have several other -// protections that are not provided by the legacy API. There are many more -// operations that most programs expect to be able to do safely, but we do not -// provide explicit support for them because we want to encourage users to -// switch to [libpathrs](https://github.com/openSUSE/libpathrs) which is a -// cross-language next-generation library that is entirely designed around -// operating on paths safely. -// -// securejoin has been used by several container runtimes (Docker, runc, -// Kubernetes, etc) for quite a few years as a de-facto standard for operating -// on container filesystem paths "safely". However, most users still use the -// legacy API which is unsafe against various attacks (there is a fairly long -// history of CVEs in dependent as a result). Users should switch to the modern -// API as soon as possible (or even better, switch to libpathrs). -// -// This project was initially intended to be included in the Go standard -// library, but [it was rejected](https://go.dev/issue/20126). There is now a -// [new Go proposal](https://go.dev/issue/67002) for a safe path resolution API -// that shares some of the goals of filepath-securejoin. However, that design -// is intended to work like `openat2(RESOLVE_BENEATH)` which does not fit the -// usecase of container runtimes and most system tools. -package securejoin diff --git a/vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_go120.go b/vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_go120.go deleted file mode 100644 index 42452bbf9..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_go120.go +++ /dev/null @@ -1,18 +0,0 @@ -//go:build linux && go1.20 - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "fmt" -) - -// wrapBaseError is a helper that is equivalent to fmt.Errorf("%w: %w"), except -// that on pre-1.20 Go versions only errors.Is() works properly (errors.Unwrap) -// is only guaranteed to give you baseErr. -func wrapBaseError(baseErr, extraErr error) error { - return fmt.Errorf("%w: %w", extraErr, baseErr) -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_unsupported.go b/vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_unsupported.go deleted file mode 100644 index e7adca3fd..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_unsupported.go +++ /dev/null @@ -1,38 +0,0 @@ -//go:build linux && !go1.20 - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "fmt" -) - -type wrappedError struct { - inner error - isError error -} - -func (err wrappedError) Is(target error) bool { - return err.isError == target -} - -func (err wrappedError) Unwrap() error { - return err.inner -} - -func (err wrappedError) Error() string { - return fmt.Sprintf("%v: %v", err.isError, err.inner) -} - -// wrapBaseError is a helper that is equivalent to fmt.Errorf("%w: %w"), except -// that on pre-1.20 Go versions only errors.Is() works properly (errors.Unwrap) -// is only guaranteed to give you baseErr. -func wrapBaseError(baseErr, extraErr error) error { - return wrappedError{ - inner: baseErr, - isError: extraErr, - } -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_go121.go b/vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_go121.go deleted file mode 100644 index ddd6fa9a4..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_go121.go +++ /dev/null @@ -1,32 +0,0 @@ -//go:build linux && go1.21 - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "slices" - "sync" -) - -func slices_DeleteFunc[S ~[]E, E any](slice S, delFn func(E) bool) S { - return slices.DeleteFunc(slice, delFn) -} - -func slices_Contains[S ~[]E, E comparable](slice S, val E) bool { - return slices.Contains(slice, val) -} - -func slices_Clone[S ~[]E, E any](slice S) S { - return slices.Clone(slice) -} - -func sync_OnceValue[T any](f func() T) func() T { - return sync.OnceValue(f) -} - -func sync_OnceValues[T1, T2 any](f func() (T1, T2)) func() (T1, T2) { - return sync.OnceValues(f) -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_unsupported.go b/vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_unsupported.go deleted file mode 100644 index f1e6fe7e7..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_unsupported.go +++ /dev/null @@ -1,124 +0,0 @@ -//go:build linux && !go1.21 - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "sync" -) - -// These are very minimal implementations of functions that appear in Go 1.21's -// stdlib, included so that we can build on older Go versions. Most are -// borrowed directly from the stdlib, and a few are modified to be "obviously -// correct" without needing to copy too many other helpers. - -// clearSlice is equivalent to the builtin clear from Go 1.21. -// Copied from the Go 1.24 stdlib implementation. -func clearSlice[S ~[]E, E any](slice S) { - var zero E - for i := range slice { - slice[i] = zero - } -} - -// Copied from the Go 1.24 stdlib implementation. -func slices_IndexFunc[S ~[]E, E any](s S, f func(E) bool) int { - for i := range s { - if f(s[i]) { - return i - } - } - return -1 -} - -// Copied from the Go 1.24 stdlib implementation. -func slices_DeleteFunc[S ~[]E, E any](s S, del func(E) bool) S { - i := slices_IndexFunc(s, del) - if i == -1 { - return s - } - // Don't start copying elements until we find one to delete. - for j := i + 1; j < len(s); j++ { - if v := s[j]; !del(v) { - s[i] = v - i++ - } - } - clearSlice(s[i:]) // zero/nil out the obsolete elements, for GC - return s[:i] -} - -// Similar to the stdlib slices.Contains, except that we don't have -// slices.Index so we need to use slices.IndexFunc for this non-Func helper. -func slices_Contains[S ~[]E, E comparable](s S, v E) bool { - return slices_IndexFunc(s, func(e E) bool { return e == v }) >= 0 -} - -// Copied from the Go 1.24 stdlib implementation. -func slices_Clone[S ~[]E, E any](s S) S { - // Preserve nil in case it matters. - if s == nil { - return nil - } - return append(S([]E{}), s...) -} - -// Copied from the Go 1.24 stdlib implementation. -func sync_OnceValue[T any](f func() T) func() T { - var ( - once sync.Once - valid bool - p any - result T - ) - g := func() { - defer func() { - p = recover() - if !valid { - panic(p) - } - }() - result = f() - f = nil - valid = true - } - return func() T { - once.Do(g) - if !valid { - panic(p) - } - return result - } -} - -// Copied from the Go 1.24 stdlib implementation. -func sync_OnceValues[T1, T2 any](f func() (T1, T2)) func() (T1, T2) { - var ( - once sync.Once - valid bool - p any - r1 T1 - r2 T2 - ) - g := func() { - defer func() { - p = recover() - if !valid { - panic(p) - } - }() - r1, r2 = f() - f = nil - valid = true - } - return func() (T1, T2) { - once.Do(g) - if !valid { - panic(p) - } - return r1, r2 - } -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/join.go b/vendor/github.com/cyphar/filepath-securejoin/join.go deleted file mode 100644 index e6634d477..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/join.go +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright (C) 2014-2015 Docker Inc & Go Authors. All rights reserved. -// Copyright (C) 2017-2025 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "errors" - "os" - "path/filepath" - "strings" - "syscall" -) - -const maxSymlinkLimit = 255 - -// IsNotExist tells you if err is an error that implies that either the path -// accessed does not exist (or path components don't exist). This is -// effectively a more broad version of [os.IsNotExist]. -func IsNotExist(err error) bool { - // Check that it's not actually an ENOTDIR, which in some cases is a more - // convoluted case of ENOENT (usually involving weird paths). - return errors.Is(err, os.ErrNotExist) || errors.Is(err, syscall.ENOTDIR) || errors.Is(err, syscall.ENOENT) -} - -// errUnsafeRoot is returned if the user provides SecureJoinVFS with a path -// that contains ".." components. -var errUnsafeRoot = errors.New("root path provided to SecureJoin contains '..' components") - -// stripVolume just gets rid of the Windows volume included in a path. Based on -// some godbolt tests, the Go compiler is smart enough to make this a no-op on -// Linux. -func stripVolume(path string) string { - return path[len(filepath.VolumeName(path)):] -} - -// hasDotDot checks if the path contains ".." components in a platform-agnostic -// way. -func hasDotDot(path string) bool { - // If we are on Windows, strip any volume letters. It turns out that - // C:..\foo may (or may not) be a valid pathname and we need to handle that - // leading "..". - path = stripVolume(path) - // Look for "/../" in the path, but we need to handle leading and trailing - // ".."s by adding separators. Doing this with filepath.Separator is ugly - // so just convert to Unix-style "/" first. - path = filepath.ToSlash(path) - return strings.Contains("/"+path+"/", "/../") -} - -// SecureJoinVFS joins the two given path components (similar to [filepath.Join]) except -// that the returned path is guaranteed to be scoped inside the provided root -// path (when evaluated). Any symbolic links in the path are evaluated with the -// given root treated as the root of the filesystem, similar to a chroot. The -// filesystem state is evaluated through the given [VFS] interface (if nil, the -// standard [os].* family of functions are used). -// -// Note that the guarantees provided by this function only apply if the path -// components in the returned string are not modified (in other words are not -// replaced with symlinks on the filesystem) after this function has returned. -// Such a symlink race is necessarily out-of-scope of SecureJoinVFS. -// -// NOTE: Due to the above limitation, Linux users are strongly encouraged to -// use [OpenInRoot] instead, which does safely protect against these kinds of -// attacks. There is no way to solve this problem with SecureJoinVFS because -// the API is fundamentally wrong (you cannot return a "safe" path string and -// guarantee it won't be modified afterwards). -// -// Volume names in unsafePath are always discarded, regardless if they are -// provided via direct input or when evaluating symlinks. Therefore: -// -// "C:\Temp" + "D:\path\to\file.txt" results in "C:\Temp\path\to\file.txt" -// -// If the provided root is not [filepath.Clean] then an error will be returned, -// as such root paths are bordering on somewhat unsafe and using such paths is -// not best practice. We also strongly suggest that any root path is first -// fully resolved using [filepath.EvalSymlinks] or otherwise constructed to -// avoid containing symlink components. Of course, the root also *must not* be -// attacker-controlled. -func SecureJoinVFS(root, unsafePath string, vfs VFS) (string, error) { - // The root path must not contain ".." components, otherwise when we join - // the subpath we will end up with a weird path. We could work around this - // in other ways but users shouldn't be giving us non-lexical root paths in - // the first place. - if hasDotDot(root) { - return "", errUnsafeRoot - } - - // Use the os.* VFS implementation if none was specified. - if vfs == nil { - vfs = osVFS{} - } - - unsafePath = filepath.FromSlash(unsafePath) - var ( - currentPath string - remainingPath = unsafePath - linksWalked int - ) - for remainingPath != "" { - // On Windows, if we managed to end up at a path referencing a volume, - // drop the volume to make sure we don't end up with broken paths or - // escaping the root volume. - remainingPath = stripVolume(remainingPath) - - // Get the next path component. - var part string - if i := strings.IndexRune(remainingPath, filepath.Separator); i == -1 { - part, remainingPath = remainingPath, "" - } else { - part, remainingPath = remainingPath[:i], remainingPath[i+1:] - } - - // Apply the component lexically to the path we are building. - // currentPath does not contain any symlinks, and we are lexically - // dealing with a single component, so it's okay to do a filepath.Clean - // here. - nextPath := filepath.Join(string(filepath.Separator), currentPath, part) - if nextPath == string(filepath.Separator) { - currentPath = "" - continue - } - fullPath := root + string(filepath.Separator) + nextPath - - // Figure out whether the path is a symlink. - fi, err := vfs.Lstat(fullPath) - if err != nil && !IsNotExist(err) { - return "", err - } - // Treat non-existent path components the same as non-symlinks (we - // can't do any better here). - if IsNotExist(err) || fi.Mode()&os.ModeSymlink == 0 { - currentPath = nextPath - continue - } - - // It's a symlink, so get its contents and expand it by prepending it - // to the yet-unparsed path. - linksWalked++ - if linksWalked > maxSymlinkLimit { - return "", &os.PathError{Op: "SecureJoin", Path: root + string(filepath.Separator) + unsafePath, Err: syscall.ELOOP} - } - - dest, err := vfs.Readlink(fullPath) - if err != nil { - return "", err - } - remainingPath = dest + string(filepath.Separator) + remainingPath - // Absolute symlinks reset any work we've already done. - if filepath.IsAbs(dest) { - currentPath = "" - } - } - - // There should be no lexical components like ".." left in the path here, - // but for safety clean up the path before joining it to the root. - finalPath := filepath.Join(string(filepath.Separator), currentPath) - return filepath.Join(root, finalPath), nil -} - -// SecureJoin is a wrapper around [SecureJoinVFS] that just uses the [os].* library -// of functions as the [VFS]. If in doubt, use this function over [SecureJoinVFS]. -func SecureJoin(root, unsafePath string) (string, error) { - return SecureJoinVFS(root, unsafePath, nil) -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/lookup_linux.go b/vendor/github.com/cyphar/filepath-securejoin/lookup_linux.go deleted file mode 100644 index be81e498d..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/lookup_linux.go +++ /dev/null @@ -1,388 +0,0 @@ -//go:build linux - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "errors" - "fmt" - "os" - "path" - "path/filepath" - "strings" - - "golang.org/x/sys/unix" -) - -type symlinkStackEntry struct { - // (dir, remainingPath) is what we would've returned if the link didn't - // exist. This matches what openat2(RESOLVE_IN_ROOT) would return in - // this case. - dir *os.File - remainingPath string - // linkUnwalked is the remaining path components from the original - // Readlink which we have yet to walk. When this slice is empty, we - // drop the link from the stack. - linkUnwalked []string -} - -func (se symlinkStackEntry) String() string { - return fmt.Sprintf("<%s>/%s [->%s]", se.dir.Name(), se.remainingPath, strings.Join(se.linkUnwalked, "/")) -} - -func (se symlinkStackEntry) Close() { - _ = se.dir.Close() -} - -type symlinkStack []*symlinkStackEntry - -func (s *symlinkStack) IsEmpty() bool { - return s == nil || len(*s) == 0 -} - -func (s *symlinkStack) Close() { - if s != nil { - for _, link := range *s { - link.Close() - } - // TODO: Switch to clear once we switch to Go 1.21. - *s = nil - } -} - -var ( - errEmptyStack = errors.New("[internal] stack is empty") - errBrokenSymlinkStack = errors.New("[internal error] broken symlink stack") -) - -func (s *symlinkStack) popPart(part string) error { - if s == nil || s.IsEmpty() { - // If there is nothing in the symlink stack, then the part was from the - // real path provided by the user, and this is a no-op. - return errEmptyStack - } - if part == "." { - // "." components are no-ops -- we drop them when doing SwapLink. - return nil - } - - tailEntry := (*s)[len(*s)-1] - - // Double-check that we are popping the component we expect. - if len(tailEntry.linkUnwalked) == 0 { - return fmt.Errorf("%w: trying to pop component %q of empty stack entry %s", errBrokenSymlinkStack, part, tailEntry) - } - headPart := tailEntry.linkUnwalked[0] - if headPart != part { - return fmt.Errorf("%w: trying to pop component %q but the last stack entry is %s (%q)", errBrokenSymlinkStack, part, tailEntry, headPart) - } - - // Drop the component, but keep the entry around in case we are dealing - // with a "tail-chained" symlink. - tailEntry.linkUnwalked = tailEntry.linkUnwalked[1:] - return nil -} - -func (s *symlinkStack) PopPart(part string) error { - if err := s.popPart(part); err != nil { - if errors.Is(err, errEmptyStack) { - // Skip empty stacks. - err = nil - } - return err - } - - // Clean up any of the trailing stack entries that are empty. - for lastGood := len(*s) - 1; lastGood >= 0; lastGood-- { - entry := (*s)[lastGood] - if len(entry.linkUnwalked) > 0 { - break - } - entry.Close() - (*s) = (*s)[:lastGood] - } - return nil -} - -func (s *symlinkStack) push(dir *os.File, remainingPath, linkTarget string) error { - if s == nil { - return nil - } - // Split the link target and clean up any "" parts. - linkTargetParts := slices_DeleteFunc( - strings.Split(linkTarget, "/"), - func(part string) bool { return part == "" || part == "." }) - - // Copy the directory so the caller doesn't close our copy. - dirCopy, err := dupFile(dir) - if err != nil { - return err - } - - // Add to the stack. - *s = append(*s, &symlinkStackEntry{ - dir: dirCopy, - remainingPath: remainingPath, - linkUnwalked: linkTargetParts, - }) - return nil -} - -func (s *symlinkStack) SwapLink(linkPart string, dir *os.File, remainingPath, linkTarget string) error { - // If we are currently inside a symlink resolution, remove the symlink - // component from the last symlink entry, but don't remove the entry even - // if it's empty. If we are a "tail-chained" symlink (a trailing symlink we - // hit during a symlink resolution) we need to keep the old symlink until - // we finish the resolution. - if err := s.popPart(linkPart); err != nil { - if !errors.Is(err, errEmptyStack) { - return err - } - // Push the component regardless of whether the stack was empty. - } - return s.push(dir, remainingPath, linkTarget) -} - -func (s *symlinkStack) PopTopSymlink() (*os.File, string, bool) { - if s == nil || s.IsEmpty() { - return nil, "", false - } - tailEntry := (*s)[0] - *s = (*s)[1:] - return tailEntry.dir, tailEntry.remainingPath, true -} - -// partialLookupInRoot tries to lookup as much of the request path as possible -// within the provided root (a-la RESOLVE_IN_ROOT) and opens the final existing -// component of the requested path, returning a file handle to the final -// existing component and a string containing the remaining path components. -func partialLookupInRoot(root *os.File, unsafePath string) (*os.File, string, error) { - return lookupInRoot(root, unsafePath, true) -} - -func completeLookupInRoot(root *os.File, unsafePath string) (*os.File, error) { - handle, remainingPath, err := lookupInRoot(root, unsafePath, false) - if remainingPath != "" && err == nil { - // should never happen - err = fmt.Errorf("[bug] non-empty remaining path when doing a non-partial lookup: %q", remainingPath) - } - // lookupInRoot(partial=false) will always close the handle if an error is - // returned, so no need to double-check here. - return handle, err -} - -func lookupInRoot(root *os.File, unsafePath string, partial bool) (Handle *os.File, _ string, _ error) { - unsafePath = filepath.ToSlash(unsafePath) // noop - - // This is very similar to SecureJoin, except that we operate on the - // components using file descriptors. We then return the last component we - // managed open, along with the remaining path components not opened. - - // Try to use openat2 if possible. - if hasOpenat2() { - return lookupOpenat2(root, unsafePath, partial) - } - - // Get the "actual" root path from /proc/self/fd. This is necessary if the - // root is some magic-link like /proc/$pid/root, in which case we want to - // make sure when we do checkProcSelfFdPath that we are using the correct - // root path. - logicalRootPath, err := procSelfFdReadlink(root) - if err != nil { - return nil, "", fmt.Errorf("get real root path: %w", err) - } - - currentDir, err := dupFile(root) - if err != nil { - return nil, "", fmt.Errorf("clone root fd: %w", err) - } - defer func() { - // If a handle is not returned, close the internal handle. - if Handle == nil { - _ = currentDir.Close() - } - }() - - // symlinkStack is used to emulate how openat2(RESOLVE_IN_ROOT) treats - // dangling symlinks. If we hit a non-existent path while resolving a - // symlink, we need to return the (dir, remainingPath) that we had when we - // hit the symlink (treating the symlink as though it were a regular file). - // The set of (dir, remainingPath) sets is stored within the symlinkStack - // and we add and remove parts when we hit symlink and non-symlink - // components respectively. We need a stack because of recursive symlinks - // (symlinks that contain symlink components in their target). - // - // Note that the stack is ONLY used for book-keeping. All of the actual - // path walking logic is still based on currentPath/remainingPath and - // currentDir (as in SecureJoin). - var symStack *symlinkStack - if partial { - symStack = new(symlinkStack) - defer symStack.Close() - } - - var ( - linksWalked int - currentPath string - remainingPath = unsafePath - ) - for remainingPath != "" { - // Save the current remaining path so if the part is not real we can - // return the path including the component. - oldRemainingPath := remainingPath - - // Get the next path component. - var part string - if i := strings.IndexByte(remainingPath, '/'); i == -1 { - part, remainingPath = remainingPath, "" - } else { - part, remainingPath = remainingPath[:i], remainingPath[i+1:] - } - // If we hit an empty component, we need to treat it as though it is - // "." so that trailing "/" and "//" components on a non-directory - // correctly return the right error code. - if part == "" { - part = "." - } - - // Apply the component lexically to the path we are building. - // currentPath does not contain any symlinks, and we are lexically - // dealing with a single component, so it's okay to do a filepath.Clean - // here. - nextPath := path.Join("/", currentPath, part) - // If we logically hit the root, just clone the root rather than - // opening the part and doing all of the other checks. - if nextPath == "/" { - if err := symStack.PopPart(part); err != nil { - return nil, "", fmt.Errorf("walking into root with part %q failed: %w", part, err) - } - // Jump to root. - rootClone, err := dupFile(root) - if err != nil { - return nil, "", fmt.Errorf("clone root fd: %w", err) - } - _ = currentDir.Close() - currentDir = rootClone - currentPath = nextPath - continue - } - - // Try to open the next component. - nextDir, err := openatFile(currentDir, part, unix.O_PATH|unix.O_NOFOLLOW|unix.O_CLOEXEC, 0) - switch { - case err == nil: - st, err := nextDir.Stat() - if err != nil { - _ = nextDir.Close() - return nil, "", fmt.Errorf("stat component %q: %w", part, err) - } - - switch st.Mode() & os.ModeType { - case os.ModeSymlink: - // readlinkat implies AT_EMPTY_PATH since Linux 2.6.39. See - // Linux commit 65cfc6722361 ("readlinkat(), fchownat() and - // fstatat() with empty relative pathnames"). - linkDest, err := readlinkatFile(nextDir, "") - // We don't need the handle anymore. - _ = nextDir.Close() - if err != nil { - return nil, "", err - } - - linksWalked++ - if linksWalked > maxSymlinkLimit { - return nil, "", &os.PathError{Op: "securejoin.lookupInRoot", Path: logicalRootPath + "/" + unsafePath, Err: unix.ELOOP} - } - - // Swap out the symlink's component for the link entry itself. - if err := symStack.SwapLink(part, currentDir, oldRemainingPath, linkDest); err != nil { - return nil, "", fmt.Errorf("walking into symlink %q failed: push symlink: %w", part, err) - } - - // Update our logical remaining path. - remainingPath = linkDest + "/" + remainingPath - // Absolute symlinks reset any work we've already done. - if path.IsAbs(linkDest) { - // Jump to root. - rootClone, err := dupFile(root) - if err != nil { - return nil, "", fmt.Errorf("clone root fd: %w", err) - } - _ = currentDir.Close() - currentDir = rootClone - currentPath = "/" - } - - default: - // If we are dealing with a directory, simply walk into it. - _ = currentDir.Close() - currentDir = nextDir - currentPath = nextPath - - // The part was real, so drop it from the symlink stack. - if err := symStack.PopPart(part); err != nil { - return nil, "", fmt.Errorf("walking into directory %q failed: %w", part, err) - } - - // If we are operating on a .., make sure we haven't escaped. - // We only have to check for ".." here because walking down - // into a regular component component cannot cause you to - // escape. This mirrors the logic in RESOLVE_IN_ROOT, except we - // have to check every ".." rather than only checking after a - // rename or mount on the system. - if part == ".." { - // Make sure the root hasn't moved. - if err := checkProcSelfFdPath(logicalRootPath, root); err != nil { - return nil, "", fmt.Errorf("root path moved during lookup: %w", err) - } - // Make sure the path is what we expect. - fullPath := logicalRootPath + nextPath - if err := checkProcSelfFdPath(fullPath, currentDir); err != nil { - return nil, "", fmt.Errorf("walking into %q had unexpected result: %w", part, err) - } - } - } - - default: - if !partial { - return nil, "", err - } - // If there are any remaining components in the symlink stack, we - // are still within a symlink resolution and thus we hit a dangling - // symlink. So pretend that the first symlink in the stack we hit - // was an ENOENT (to match openat2). - if oldDir, remainingPath, ok := symStack.PopTopSymlink(); ok { - _ = currentDir.Close() - return oldDir, remainingPath, err - } - // We have hit a final component that doesn't exist, so we have our - // partial open result. Note that we have to use the OLD remaining - // path, since the lookup failed. - return currentDir, oldRemainingPath, err - } - } - - // If the unsafePath had a trailing slash, we need to make sure we try to - // do a relative "." open so that we will correctly return an error when - // the final component is a non-directory (to match openat2). In the - // context of openat2, a trailing slash and a trailing "/." are completely - // equivalent. - if strings.HasSuffix(unsafePath, "/") { - nextDir, err := openatFile(currentDir, ".", unix.O_PATH|unix.O_NOFOLLOW|unix.O_CLOEXEC, 0) - if err != nil { - if !partial { - _ = currentDir.Close() - currentDir = nil - } - return currentDir, "", err - } - _ = currentDir.Close() - currentDir = nextDir - } - - // All of the components existed! - return currentDir, "", nil -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/mkdir_linux.go b/vendor/github.com/cyphar/filepath-securejoin/mkdir_linux.go deleted file mode 100644 index a17ae3b03..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/mkdir_linux.go +++ /dev/null @@ -1,236 +0,0 @@ -//go:build linux - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "errors" - "fmt" - "os" - "path/filepath" - "strings" - - "golang.org/x/sys/unix" -) - -var ( - errInvalidMode = errors.New("invalid permission mode") - errPossibleAttack = errors.New("possible attack detected") -) - -// modePermExt is like os.ModePerm except that it also includes the set[ug]id -// and sticky bits. -const modePermExt = os.ModePerm | os.ModeSetuid | os.ModeSetgid | os.ModeSticky - -//nolint:cyclop // this function needs to handle a lot of cases -func toUnixMode(mode os.FileMode) (uint32, error) { - sysMode := uint32(mode.Perm()) - if mode&os.ModeSetuid != 0 { - sysMode |= unix.S_ISUID - } - if mode&os.ModeSetgid != 0 { - sysMode |= unix.S_ISGID - } - if mode&os.ModeSticky != 0 { - sysMode |= unix.S_ISVTX - } - // We don't allow file type bits. - if mode&os.ModeType != 0 { - return 0, fmt.Errorf("%w %+.3o (%s): type bits not permitted", errInvalidMode, mode, mode) - } - // We don't allow other unknown modes. - if mode&^modePermExt != 0 || sysMode&unix.S_IFMT != 0 { - return 0, fmt.Errorf("%w %+.3o (%s): unknown mode bits", errInvalidMode, mode, mode) - } - return sysMode, nil -} - -// MkdirAllHandle is equivalent to [MkdirAll], except that it is safer to use -// in two respects: -// -// - The caller provides the root directory as an *[os.File] (preferably O_PATH) -// handle. This means that the caller can be sure which root directory is -// being used. Note that this can be emulated by using /proc/self/fd/... as -// the root path with [os.MkdirAll]. -// -// - Once all of the directories have been created, an *[os.File] O_PATH handle -// to the directory at unsafePath is returned to the caller. This is done in -// an effectively-race-free way (an attacker would only be able to swap the -// final directory component), which is not possible to emulate with -// [MkdirAll]. -// -// In addition, the returned handle is obtained far more efficiently than doing -// a brand new lookup of unsafePath (such as with [SecureJoin] or openat2) after -// doing [MkdirAll]. If you intend to open the directory after creating it, you -// should use MkdirAllHandle. -func MkdirAllHandle(root *os.File, unsafePath string, mode os.FileMode) (_ *os.File, Err error) { - unixMode, err := toUnixMode(mode) - if err != nil { - return nil, err - } - // On Linux, mkdirat(2) (and os.Mkdir) silently ignore the suid and sgid - // bits. We could also silently ignore them but since we have very few - // users it seems more prudent to return an error so users notice that - // these bits will not be set. - if unixMode&^0o1777 != 0 { - return nil, fmt.Errorf("%w for mkdir %+.3o: suid and sgid are ignored by mkdir", errInvalidMode, mode) - } - - // Try to open as much of the path as possible. - currentDir, remainingPath, err := partialLookupInRoot(root, unsafePath) - defer func() { - if Err != nil { - _ = currentDir.Close() - } - }() - if err != nil && !errors.Is(err, unix.ENOENT) { - return nil, fmt.Errorf("find existing subpath of %q: %w", unsafePath, err) - } - - // If there is an attacker deleting directories as we walk into them, - // detect this proactively. Note this is guaranteed to detect if the - // attacker deleted any part of the tree up to currentDir. - // - // Once we walk into a dead directory, partialLookupInRoot would not be - // able to walk further down the tree (directories must be empty before - // they are deleted), and if the attacker has removed the entire tree we - // can be sure that anything that was originally inside a dead directory - // must also be deleted and thus is a dead directory in its own right. - // - // This is mostly a quality-of-life check, because mkdir will simply fail - // later if the attacker deletes the tree after this check. - if err := isDeadInode(currentDir); err != nil { - return nil, fmt.Errorf("finding existing subpath of %q: %w", unsafePath, err) - } - - // Re-open the path to match the O_DIRECTORY reopen loop later (so that we - // always return a non-O_PATH handle). We also check that we actually got a - // directory. - if reopenDir, err := Reopen(currentDir, unix.O_DIRECTORY|unix.O_CLOEXEC); errors.Is(err, unix.ENOTDIR) { - return nil, fmt.Errorf("cannot create subdirectories in %q: %w", currentDir.Name(), unix.ENOTDIR) - } else if err != nil { - return nil, fmt.Errorf("re-opening handle to %q: %w", currentDir.Name(), err) - } else { - _ = currentDir.Close() - currentDir = reopenDir - } - - remainingParts := strings.Split(remainingPath, string(filepath.Separator)) - if slices_Contains(remainingParts, "..") { - // The path contained ".." components after the end of the "real" - // components. We could try to safely resolve ".." here but that would - // add a bunch of extra logic for something that it's not clear even - // needs to be supported. So just return an error. - // - // If we do filepath.Clean(remainingPath) then we end up with the - // problem that ".." can erase a trailing dangling symlink and produce - // a path that doesn't quite match what the user asked for. - return nil, fmt.Errorf("%w: yet-to-be-created path %q contains '..' components", unix.ENOENT, remainingPath) - } - - // Create the remaining components. - for _, part := range remainingParts { - switch part { - case "", ".": - // Skip over no-op paths. - continue - } - - // NOTE: mkdir(2) will not follow trailing symlinks, so we can safely - // create the final component without worrying about symlink-exchange - // attacks. - // - // If we get -EEXIST, it's possible that another program created the - // directory at the same time as us. In that case, just continue on as - // if we created it (if the created inode is not a directory, the - // following open call will fail). - if err := unix.Mkdirat(int(currentDir.Fd()), part, unixMode); err != nil && !errors.Is(err, unix.EEXIST) { - err = &os.PathError{Op: "mkdirat", Path: currentDir.Name() + "/" + part, Err: err} - // Make the error a bit nicer if the directory is dead. - if deadErr := isDeadInode(currentDir); deadErr != nil { - // TODO: Once we bump the minimum Go version to 1.20, we can use - // multiple %w verbs for this wrapping. For now we need to use a - // compatibility shim for older Go versions. - //err = fmt.Errorf("%w (%w)", err, deadErr) - err = wrapBaseError(err, deadErr) - } - return nil, err - } - - // Get a handle to the next component. O_DIRECTORY means we don't need - // to use O_PATH. - var nextDir *os.File - if hasOpenat2() { - nextDir, err = openat2File(currentDir, part, &unix.OpenHow{ - Flags: unix.O_NOFOLLOW | unix.O_DIRECTORY | unix.O_CLOEXEC, - Resolve: unix.RESOLVE_BENEATH | unix.RESOLVE_NO_SYMLINKS | unix.RESOLVE_NO_XDEV, - }) - } else { - nextDir, err = openatFile(currentDir, part, unix.O_NOFOLLOW|unix.O_DIRECTORY|unix.O_CLOEXEC, 0) - } - if err != nil { - return nil, err - } - _ = currentDir.Close() - currentDir = nextDir - - // It's possible that the directory we just opened was swapped by an - // attacker. Unfortunately there isn't much we can do to protect - // against this, and MkdirAll's behaviour is that we will reuse - // existing directories anyway so the need to protect against this is - // incredibly limited (and arguably doesn't even deserve mention here). - // - // Ideally we might want to check that the owner and mode match what we - // would've created -- unfortunately, it is non-trivial to verify that - // the owner and mode of the created directory match. While plain Unix - // DAC rules seem simple enough to emulate, there are a bunch of other - // factors that can change the mode or owner of created directories - // (default POSIX ACLs, mount options like uid=1,gid=2,umask=0 on - // filesystems like vfat, etc etc). We used to try to verify this but - // it just lead to a series of spurious errors. - // - // We could also check that the directory is non-empty, but - // unfortunately some pseduofilesystems (like cgroupfs) create - // non-empty directories, which would result in different spurious - // errors. - } - return currentDir, nil -} - -// MkdirAll is a race-safe alternative to the [os.MkdirAll] function, -// where the new directory is guaranteed to be within the root directory (if an -// attacker can move directories from inside the root to outside the root, the -// created directory tree might be outside of the root but the key constraint -// is that at no point will we walk outside of the directory tree we are -// creating). -// -// Effectively, MkdirAll(root, unsafePath, mode) is equivalent to -// -// path, _ := securejoin.SecureJoin(root, unsafePath) -// err := os.MkdirAll(path, mode) -// -// But is much safer. The above implementation is unsafe because if an attacker -// can modify the filesystem tree between [SecureJoin] and [os.MkdirAll], it is -// possible for MkdirAll to resolve unsafe symlink components and create -// directories outside of the root. -// -// If you plan to open the directory after you have created it or want to use -// an open directory handle as the root, you should use [MkdirAllHandle] instead. -// This function is a wrapper around [MkdirAllHandle]. -func MkdirAll(root, unsafePath string, mode os.FileMode) error { - rootDir, err := os.OpenFile(root, unix.O_PATH|unix.O_DIRECTORY|unix.O_CLOEXEC, 0) - if err != nil { - return err - } - defer rootDir.Close() - - f, err := MkdirAllHandle(rootDir, unsafePath, mode) - if err != nil { - return err - } - _ = f.Close() - return nil -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/open_linux.go b/vendor/github.com/cyphar/filepath-securejoin/open_linux.go deleted file mode 100644 index 230be73f0..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/open_linux.go +++ /dev/null @@ -1,103 +0,0 @@ -//go:build linux - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "fmt" - "os" - "strconv" - - "golang.org/x/sys/unix" -) - -// OpenatInRoot is equivalent to [OpenInRoot], except that the root is provided -// using an *[os.File] handle, to ensure that the correct root directory is used. -func OpenatInRoot(root *os.File, unsafePath string) (*os.File, error) { - handle, err := completeLookupInRoot(root, unsafePath) - if err != nil { - return nil, &os.PathError{Op: "securejoin.OpenInRoot", Path: unsafePath, Err: err} - } - return handle, nil -} - -// OpenInRoot safely opens the provided unsafePath within the root. -// Effectively, OpenInRoot(root, unsafePath) is equivalent to -// -// path, _ := securejoin.SecureJoin(root, unsafePath) -// handle, err := os.OpenFile(path, unix.O_PATH|unix.O_CLOEXEC) -// -// But is much safer. The above implementation is unsafe because if an attacker -// can modify the filesystem tree between [SecureJoin] and [os.OpenFile], it is -// possible for the returned file to be outside of the root. -// -// Note that the returned handle is an O_PATH handle, meaning that only a very -// limited set of operations will work on the handle. This is done to avoid -// accidentally opening an untrusted file that could cause issues (such as a -// disconnected TTY that could cause a DoS, or some other issue). In order to -// use the returned handle, you can "upgrade" it to a proper handle using -// [Reopen]. -func OpenInRoot(root, unsafePath string) (*os.File, error) { - rootDir, err := os.OpenFile(root, unix.O_PATH|unix.O_DIRECTORY|unix.O_CLOEXEC, 0) - if err != nil { - return nil, err - } - defer rootDir.Close() - return OpenatInRoot(rootDir, unsafePath) -} - -// Reopen takes an *[os.File] handle and re-opens it through /proc/self/fd. -// Reopen(file, flags) is effectively equivalent to -// -// fdPath := fmt.Sprintf("/proc/self/fd/%d", file.Fd()) -// os.OpenFile(fdPath, flags|unix.O_CLOEXEC) -// -// But with some extra hardenings to ensure that we are not tricked by a -// maliciously-configured /proc mount. While this attack scenario is not -// common, in container runtimes it is possible for higher-level runtimes to be -// tricked into configuring an unsafe /proc that can be used to attack file -// operations. See [CVE-2019-19921] for more details. -// -// [CVE-2019-19921]: https://github.com/advisories/GHSA-fh74-hm69-rqjw -func Reopen(handle *os.File, flags int) (*os.File, error) { - procRoot, err := getProcRoot() - if err != nil { - return nil, err - } - - // We can't operate on /proc/thread-self/fd/$n directly when doing a - // re-open, so we need to open /proc/thread-self/fd and then open a single - // final component. - procFdDir, closer, err := procThreadSelf(procRoot, "fd/") - if err != nil { - return nil, fmt.Errorf("get safe /proc/thread-self/fd handle: %w", err) - } - defer procFdDir.Close() - defer closer() - - // Try to detect if there is a mount on top of the magic-link we are about - // to open. If we are using unsafeHostProcRoot(), this could change after - // we check it (and there's nothing we can do about that) but for - // privateProcRoot() this should be guaranteed to be safe (at least since - // Linux 5.12[1], when anonymous mount namespaces were completely isolated - // from external mounts including mount propagation events). - // - // [1]: Linux commit ee2e3f50629f ("mount: fix mounting of detached mounts - // onto targets that reside on shared mounts"). - fdStr := strconv.Itoa(int(handle.Fd())) - if err := checkSymlinkOvermount(procRoot, procFdDir, fdStr); err != nil { - return nil, fmt.Errorf("check safety of /proc/thread-self/fd/%s magiclink: %w", fdStr, err) - } - - flags |= unix.O_CLOEXEC - // Rather than just wrapping openatFile, open-code it so we can copy - // handle.Name(). - reopenFd, err := unix.Openat(int(procFdDir.Fd()), fdStr, flags, 0) - if err != nil { - return nil, fmt.Errorf("reopen fd %d: %w", handle.Fd(), err) - } - return os.NewFile(uintptr(reopenFd), handle.Name()), nil -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/openat2_linux.go b/vendor/github.com/cyphar/filepath-securejoin/openat2_linux.go deleted file mode 100644 index f7a13e69c..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/openat2_linux.go +++ /dev/null @@ -1,127 +0,0 @@ -//go:build linux - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "errors" - "fmt" - "os" - "path/filepath" - "strings" - - "golang.org/x/sys/unix" -) - -var hasOpenat2 = sync_OnceValue(func() bool { - fd, err := unix.Openat2(unix.AT_FDCWD, ".", &unix.OpenHow{ - Flags: unix.O_PATH | unix.O_CLOEXEC, - Resolve: unix.RESOLVE_NO_SYMLINKS | unix.RESOLVE_IN_ROOT, - }) - if err != nil { - return false - } - _ = unix.Close(fd) - return true -}) - -func scopedLookupShouldRetry(how *unix.OpenHow, err error) bool { - // RESOLVE_IN_ROOT (and RESOLVE_BENEATH) can return -EAGAIN if we resolve - // ".." while a mount or rename occurs anywhere on the system. This could - // happen spuriously, or as the result of an attacker trying to mess with - // us during lookup. - // - // In addition, scoped lookups have a "safety check" at the end of - // complete_walk which will return -EXDEV if the final path is not in the - // root. - return how.Resolve&(unix.RESOLVE_IN_ROOT|unix.RESOLVE_BENEATH) != 0 && - (errors.Is(err, unix.EAGAIN) || errors.Is(err, unix.EXDEV)) -} - -const scopedLookupMaxRetries = 10 - -func openat2File(dir *os.File, path string, how *unix.OpenHow) (*os.File, error) { - fullPath := dir.Name() + "/" + path - // Make sure we always set O_CLOEXEC. - how.Flags |= unix.O_CLOEXEC - var tries int - for tries < scopedLookupMaxRetries { - fd, err := unix.Openat2(int(dir.Fd()), path, how) - if err != nil { - if scopedLookupShouldRetry(how, err) { - // We retry a couple of times to avoid the spurious errors, and - // if we are being attacked then returning -EAGAIN is the best - // we can do. - tries++ - continue - } - return nil, &os.PathError{Op: "openat2", Path: fullPath, Err: err} - } - // If we are using RESOLVE_IN_ROOT, the name we generated may be wrong. - // NOTE: The procRoot code MUST NOT use RESOLVE_IN_ROOT, otherwise - // you'll get infinite recursion here. - if how.Resolve&unix.RESOLVE_IN_ROOT == unix.RESOLVE_IN_ROOT { - if actualPath, err := rawProcSelfFdReadlink(fd); err == nil { - fullPath = actualPath - } - } - return os.NewFile(uintptr(fd), fullPath), nil - } - return nil, &os.PathError{Op: "openat2", Path: fullPath, Err: errPossibleAttack} -} - -func lookupOpenat2(root *os.File, unsafePath string, partial bool) (*os.File, string, error) { - if !partial { - file, err := openat2File(root, unsafePath, &unix.OpenHow{ - Flags: unix.O_PATH | unix.O_CLOEXEC, - Resolve: unix.RESOLVE_IN_ROOT | unix.RESOLVE_NO_MAGICLINKS, - }) - return file, "", err - } - return partialLookupOpenat2(root, unsafePath) -} - -// partialLookupOpenat2 is an alternative implementation of -// partialLookupInRoot, using openat2(RESOLVE_IN_ROOT) to more safely get a -// handle to the deepest existing child of the requested path within the root. -func partialLookupOpenat2(root *os.File, unsafePath string) (*os.File, string, error) { - // TODO: Implement this as a git-bisect-like binary search. - - unsafePath = filepath.ToSlash(unsafePath) // noop - endIdx := len(unsafePath) - var lastError error - for endIdx > 0 { - subpath := unsafePath[:endIdx] - - handle, err := openat2File(root, subpath, &unix.OpenHow{ - Flags: unix.O_PATH | unix.O_CLOEXEC, - Resolve: unix.RESOLVE_IN_ROOT | unix.RESOLVE_NO_MAGICLINKS, - }) - if err == nil { - // Jump over the slash if we have a non-"" remainingPath. - if endIdx < len(unsafePath) { - endIdx += 1 - } - // We found a subpath! - return handle, unsafePath[endIdx:], lastError - } - if errors.Is(err, unix.ENOENT) || errors.Is(err, unix.ENOTDIR) { - // That path doesn't exist, let's try the next directory up. - endIdx = strings.LastIndexByte(subpath, '/') - lastError = err - continue - } - return nil, "", fmt.Errorf("open subpath: %w", err) - } - // If we couldn't open anything, the whole subpath is missing. Return a - // copy of the root fd so that the caller doesn't close this one by - // accident. - rootClone, err := dupFile(root) - if err != nil { - return nil, "", err - } - return rootClone, unsafePath, lastError -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/openat_linux.go b/vendor/github.com/cyphar/filepath-securejoin/openat_linux.go deleted file mode 100644 index 949fb5f2d..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/openat_linux.go +++ /dev/null @@ -1,59 +0,0 @@ -//go:build linux - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "os" - "path/filepath" - - "golang.org/x/sys/unix" -) - -func dupFile(f *os.File) (*os.File, error) { - fd, err := unix.FcntlInt(f.Fd(), unix.F_DUPFD_CLOEXEC, 0) - if err != nil { - return nil, os.NewSyscallError("fcntl(F_DUPFD_CLOEXEC)", err) - } - return os.NewFile(uintptr(fd), f.Name()), nil -} - -func openatFile(dir *os.File, path string, flags int, mode int) (*os.File, error) { - // Make sure we always set O_CLOEXEC. - flags |= unix.O_CLOEXEC - fd, err := unix.Openat(int(dir.Fd()), path, flags, uint32(mode)) - if err != nil { - return nil, &os.PathError{Op: "openat", Path: dir.Name() + "/" + path, Err: err} - } - // All of the paths we use with openatFile(2) are guaranteed to be - // lexically safe, so we can use path.Join here. - fullPath := filepath.Join(dir.Name(), path) - return os.NewFile(uintptr(fd), fullPath), nil -} - -func fstatatFile(dir *os.File, path string, flags int) (unix.Stat_t, error) { - var stat unix.Stat_t - if err := unix.Fstatat(int(dir.Fd()), path, &stat, flags); err != nil { - return stat, &os.PathError{Op: "fstatat", Path: dir.Name() + "/" + path, Err: err} - } - return stat, nil -} - -func readlinkatFile(dir *os.File, path string) (string, error) { - size := 4096 - for { - linkBuf := make([]byte, size) - n, err := unix.Readlinkat(int(dir.Fd()), path, linkBuf) - if err != nil { - return "", &os.PathError{Op: "readlinkat", Path: dir.Name() + "/" + path, Err: err} - } - if n != size { - return string(linkBuf[:n]), nil - } - // Possible truncation, resize the buffer. - size *= 2 - } -} diff --git a/vendor/github.com/cyphar/filepath-securejoin/procfs_linux.go b/vendor/github.com/cyphar/filepath-securejoin/procfs_linux.go deleted file mode 100644 index 809a579cb..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/procfs_linux.go +++ /dev/null @@ -1,452 +0,0 @@ -//go:build linux - -// Copyright (C) 2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import ( - "errors" - "fmt" - "os" - "runtime" - "strconv" - - "golang.org/x/sys/unix" -) - -func fstat(f *os.File) (unix.Stat_t, error) { - var stat unix.Stat_t - if err := unix.Fstat(int(f.Fd()), &stat); err != nil { - return stat, &os.PathError{Op: "fstat", Path: f.Name(), Err: err} - } - return stat, nil -} - -func fstatfs(f *os.File) (unix.Statfs_t, error) { - var statfs unix.Statfs_t - if err := unix.Fstatfs(int(f.Fd()), &statfs); err != nil { - return statfs, &os.PathError{Op: "fstatfs", Path: f.Name(), Err: err} - } - return statfs, nil -} - -// The kernel guarantees that the root inode of a procfs mount has an -// f_type of PROC_SUPER_MAGIC and st_ino of PROC_ROOT_INO. -const ( - procSuperMagic = 0x9fa0 // PROC_SUPER_MAGIC - procRootIno = 1 // PROC_ROOT_INO -) - -func verifyProcRoot(procRoot *os.File) error { - if statfs, err := fstatfs(procRoot); err != nil { - return err - } else if statfs.Type != procSuperMagic { - return fmt.Errorf("%w: incorrect procfs root filesystem type 0x%x", errUnsafeProcfs, statfs.Type) - } - if stat, err := fstat(procRoot); err != nil { - return err - } else if stat.Ino != procRootIno { - return fmt.Errorf("%w: incorrect procfs root inode number %d", errUnsafeProcfs, stat.Ino) - } - return nil -} - -var hasNewMountApi = sync_OnceValue(func() bool { - // All of the pieces of the new mount API we use (fsopen, fsconfig, - // fsmount, open_tree) were added together in Linux 5.1[1,2], so we can - // just check for one of the syscalls and the others should also be - // available. - // - // Just try to use open_tree(2) to open a file without OPEN_TREE_CLONE. - // This is equivalent to openat(2), but tells us if open_tree is - // available (and thus all of the other basic new mount API syscalls). - // open_tree(2) is most light-weight syscall to test here. - // - // [1]: merge commit 400913252d09 - // [2]: - fd, err := unix.OpenTree(-int(unix.EBADF), "/", unix.OPEN_TREE_CLOEXEC) - if err != nil { - return false - } - _ = unix.Close(fd) - return true -}) - -func fsopen(fsName string, flags int) (*os.File, error) { - // Make sure we always set O_CLOEXEC. - flags |= unix.FSOPEN_CLOEXEC - fd, err := unix.Fsopen(fsName, flags) - if err != nil { - return nil, os.NewSyscallError("fsopen "+fsName, err) - } - return os.NewFile(uintptr(fd), "fscontext:"+fsName), nil -} - -func fsmount(ctx *os.File, flags, mountAttrs int) (*os.File, error) { - // Make sure we always set O_CLOEXEC. - flags |= unix.FSMOUNT_CLOEXEC - fd, err := unix.Fsmount(int(ctx.Fd()), flags, mountAttrs) - if err != nil { - return nil, os.NewSyscallError("fsmount "+ctx.Name(), err) - } - return os.NewFile(uintptr(fd), "fsmount:"+ctx.Name()), nil -} - -func newPrivateProcMount() (*os.File, error) { - procfsCtx, err := fsopen("proc", unix.FSOPEN_CLOEXEC) - if err != nil { - return nil, err - } - defer procfsCtx.Close() - - // Try to configure hidepid=ptraceable,subset=pid if possible, but ignore errors. - _ = unix.FsconfigSetString(int(procfsCtx.Fd()), "hidepid", "ptraceable") - _ = unix.FsconfigSetString(int(procfsCtx.Fd()), "subset", "pid") - - // Get an actual handle. - if err := unix.FsconfigCreate(int(procfsCtx.Fd())); err != nil { - return nil, os.NewSyscallError("fsconfig create procfs", err) - } - return fsmount(procfsCtx, unix.FSMOUNT_CLOEXEC, unix.MS_RDONLY|unix.MS_NODEV|unix.MS_NOEXEC|unix.MS_NOSUID) -} - -func openTree(dir *os.File, path string, flags uint) (*os.File, error) { - dirFd := -int(unix.EBADF) - dirName := "." - if dir != nil { - dirFd = int(dir.Fd()) - dirName = dir.Name() - } - // Make sure we always set O_CLOEXEC. - flags |= unix.OPEN_TREE_CLOEXEC - fd, err := unix.OpenTree(dirFd, path, flags) - if err != nil { - return nil, &os.PathError{Op: "open_tree", Path: path, Err: err} - } - return os.NewFile(uintptr(fd), dirName+"/"+path), nil -} - -func clonePrivateProcMount() (_ *os.File, Err error) { - // Try to make a clone without using AT_RECURSIVE if we can. If this works, - // we can be sure there are no over-mounts and so if the root is valid then - // we're golden. Otherwise, we have to deal with over-mounts. - procfsHandle, err := openTree(nil, "/proc", unix.OPEN_TREE_CLONE) - if err != nil || hookForcePrivateProcRootOpenTreeAtRecursive(procfsHandle) { - procfsHandle, err = openTree(nil, "/proc", unix.OPEN_TREE_CLONE|unix.AT_RECURSIVE) - } - if err != nil { - return nil, fmt.Errorf("creating a detached procfs clone: %w", err) - } - defer func() { - if Err != nil { - _ = procfsHandle.Close() - } - }() - if err := verifyProcRoot(procfsHandle); err != nil { - return nil, err - } - return procfsHandle, nil -} - -func privateProcRoot() (*os.File, error) { - if !hasNewMountApi() || hookForceGetProcRootUnsafe() { - return nil, fmt.Errorf("new mount api: %w", unix.ENOTSUP) - } - // Try to create a new procfs mount from scratch if we can. This ensures we - // can get a procfs mount even if /proc is fake (for whatever reason). - procRoot, err := newPrivateProcMount() - if err != nil || hookForcePrivateProcRootOpenTree(procRoot) { - // Try to clone /proc then... - procRoot, err = clonePrivateProcMount() - } - return procRoot, err -} - -func unsafeHostProcRoot() (_ *os.File, Err error) { - procRoot, err := os.OpenFile("/proc", unix.O_PATH|unix.O_NOFOLLOW|unix.O_DIRECTORY|unix.O_CLOEXEC, 0) - if err != nil { - return nil, err - } - defer func() { - if Err != nil { - _ = procRoot.Close() - } - }() - if err := verifyProcRoot(procRoot); err != nil { - return nil, err - } - return procRoot, nil -} - -func doGetProcRoot() (*os.File, error) { - procRoot, err := privateProcRoot() - if err != nil { - // Fall back to using a /proc handle if making a private mount failed. - // If we have openat2, at least we can avoid some kinds of over-mount - // attacks, but without openat2 there's not much we can do. - procRoot, err = unsafeHostProcRoot() - } - return procRoot, err -} - -var getProcRoot = sync_OnceValues(func() (*os.File, error) { - return doGetProcRoot() -}) - -var hasProcThreadSelf = sync_OnceValue(func() bool { - return unix.Access("/proc/thread-self/", unix.F_OK) == nil -}) - -var errUnsafeProcfs = errors.New("unsafe procfs detected") - -type procThreadSelfCloser func() - -// procThreadSelf returns a handle to /proc/thread-self/ (or an -// equivalent handle on older kernels where /proc/thread-self doesn't exist). -// Once finished with the handle, you must call the returned closer function -// (runtime.UnlockOSThread). You must not pass the returned *os.File to other -// Go threads or use the handle after calling the closer. -// -// This is similar to ProcThreadSelf from runc, but with extra hardening -// applied and using *os.File. -func procThreadSelf(procRoot *os.File, subpath string) (_ *os.File, _ procThreadSelfCloser, Err error) { - // We need to lock our thread until the caller is done with the handle - // because between getting the handle and using it we could get interrupted - // by the Go runtime and hit the case where the underlying thread is - // swapped out and the original thread is killed, resulting in - // pull-your-hair-out-hard-to-debug issues in the caller. - runtime.LockOSThread() - defer func() { - if Err != nil { - runtime.UnlockOSThread() - } - }() - - // Figure out what prefix we want to use. - threadSelf := "thread-self/" - if !hasProcThreadSelf() || hookForceProcSelfTask() { - /// Pre-3.17 kernels don't have /proc/thread-self, so do it manually. - threadSelf = "self/task/" + strconv.Itoa(unix.Gettid()) + "/" - if _, err := fstatatFile(procRoot, threadSelf, unix.AT_SYMLINK_NOFOLLOW); err != nil || hookForceProcSelf() { - // In this case, we running in a pid namespace that doesn't match - // the /proc mount we have. This can happen inside runc. - // - // Unfortunately, there is no nice way to get the correct TID to - // use here because of the age of the kernel, so we have to just - // use /proc/self and hope that it works. - threadSelf = "self/" - } - } - - // Grab the handle. - var ( - handle *os.File - err error - ) - if hasOpenat2() { - // We prefer being able to use RESOLVE_NO_XDEV if we can, to be - // absolutely sure we are operating on a clean /proc handle that - // doesn't have any cheeky overmounts that could trick us (including - // symlink mounts on top of /proc/thread-self). RESOLVE_BENEATH isn't - // strictly needed, but just use it since we have it. - // - // NOTE: /proc/self is technically a magic-link (the contents of the - // symlink are generated dynamically), but it doesn't use - // nd_jump_link() so RESOLVE_NO_MAGICLINKS allows it. - // - // NOTE: We MUST NOT use RESOLVE_IN_ROOT here, as openat2File uses - // procSelfFdReadlink to clean up the returned f.Name() if we use - // RESOLVE_IN_ROOT (which would lead to an infinite recursion). - handle, err = openat2File(procRoot, threadSelf+subpath, &unix.OpenHow{ - Flags: unix.O_PATH | unix.O_NOFOLLOW | unix.O_CLOEXEC, - Resolve: unix.RESOLVE_BENEATH | unix.RESOLVE_NO_XDEV | unix.RESOLVE_NO_MAGICLINKS, - }) - if err != nil { - // TODO: Once we bump the minimum Go version to 1.20, we can use - // multiple %w verbs for this wrapping. For now we need to use a - // compatibility shim for older Go versions. - //err = fmt.Errorf("%w: %w", errUnsafeProcfs, err) - return nil, nil, wrapBaseError(err, errUnsafeProcfs) - } - } else { - handle, err = openatFile(procRoot, threadSelf+subpath, unix.O_PATH|unix.O_NOFOLLOW|unix.O_CLOEXEC, 0) - if err != nil { - // TODO: Once we bump the minimum Go version to 1.20, we can use - // multiple %w verbs for this wrapping. For now we need to use a - // compatibility shim for older Go versions. - //err = fmt.Errorf("%w: %w", errUnsafeProcfs, err) - return nil, nil, wrapBaseError(err, errUnsafeProcfs) - } - defer func() { - if Err != nil { - _ = handle.Close() - } - }() - // We can't detect bind-mounts of different parts of procfs on top of - // /proc (a-la RESOLVE_NO_XDEV), but we can at least be sure that we - // aren't on the wrong filesystem here. - if statfs, err := fstatfs(handle); err != nil { - return nil, nil, err - } else if statfs.Type != procSuperMagic { - return nil, nil, fmt.Errorf("%w: incorrect /proc/self/fd filesystem type 0x%x", errUnsafeProcfs, statfs.Type) - } - } - return handle, runtime.UnlockOSThread, nil -} - -// STATX_MNT_ID_UNIQUE is provided in golang.org/x/sys@v0.20.0, but in order to -// avoid bumping the requirement for a single constant we can just define it -// ourselves. -const STATX_MNT_ID_UNIQUE = 0x4000 - -var hasStatxMountId = sync_OnceValue(func() bool { - var ( - stx unix.Statx_t - // We don't care which mount ID we get. The kernel will give us the - // unique one if it is supported. - wantStxMask uint32 = STATX_MNT_ID_UNIQUE | unix.STATX_MNT_ID - ) - err := unix.Statx(-int(unix.EBADF), "/", 0, int(wantStxMask), &stx) - return err == nil && stx.Mask&wantStxMask != 0 -}) - -func getMountId(dir *os.File, path string) (uint64, error) { - // If we don't have statx(STATX_MNT_ID*) support, we can't do anything. - if !hasStatxMountId() { - return 0, nil - } - - var ( - stx unix.Statx_t - // We don't care which mount ID we get. The kernel will give us the - // unique one if it is supported. - wantStxMask uint32 = STATX_MNT_ID_UNIQUE | unix.STATX_MNT_ID - ) - - err := unix.Statx(int(dir.Fd()), path, unix.AT_EMPTY_PATH|unix.AT_SYMLINK_NOFOLLOW, int(wantStxMask), &stx) - if stx.Mask&wantStxMask == 0 { - // It's not a kernel limitation, for some reason we couldn't get a - // mount ID. Assume it's some kind of attack. - err = fmt.Errorf("%w: could not get mount id", errUnsafeProcfs) - } - if err != nil { - return 0, &os.PathError{Op: "statx(STATX_MNT_ID_...)", Path: dir.Name() + "/" + path, Err: err} - } - return stx.Mnt_id, nil -} - -func checkSymlinkOvermount(procRoot *os.File, dir *os.File, path string) error { - // Get the mntId of our procfs handle. - expectedMountId, err := getMountId(procRoot, "") - if err != nil { - return err - } - // Get the mntId of the target magic-link. - gotMountId, err := getMountId(dir, path) - if err != nil { - return err - } - // As long as the directory mount is alive, even with wrapping mount IDs, - // we would expect to see a different mount ID here. (Of course, if we're - // using unsafeHostProcRoot() then an attaker could change this after we - // did this check.) - if expectedMountId != gotMountId { - return fmt.Errorf("%w: symlink %s/%s has an overmount obscuring the real link (mount ids do not match %d != %d)", errUnsafeProcfs, dir.Name(), path, expectedMountId, gotMountId) - } - return nil -} - -func doRawProcSelfFdReadlink(procRoot *os.File, fd int) (string, error) { - fdPath := fmt.Sprintf("fd/%d", fd) - procFdLink, closer, err := procThreadSelf(procRoot, fdPath) - if err != nil { - return "", fmt.Errorf("get safe /proc/thread-self/%s handle: %w", fdPath, err) - } - defer procFdLink.Close() - defer closer() - - // Try to detect if there is a mount on top of the magic-link. Since we use the handle directly - // provide to the closure. If the closure uses the handle directly, this - // should be safe in general (a mount on top of the path afterwards would - // not affect the handle itself) and will definitely be safe if we are - // using privateProcRoot() (at least since Linux 5.12[1], when anonymous - // mount namespaces were completely isolated from external mounts including - // mount propagation events). - // - // [1]: Linux commit ee2e3f50629f ("mount: fix mounting of detached mounts - // onto targets that reside on shared mounts"). - if err := checkSymlinkOvermount(procRoot, procFdLink, ""); err != nil { - return "", fmt.Errorf("check safety of /proc/thread-self/fd/%d magiclink: %w", fd, err) - } - - // readlinkat implies AT_EMPTY_PATH since Linux 2.6.39. See Linux commit - // 65cfc6722361 ("readlinkat(), fchownat() and fstatat() with empty - // relative pathnames"). - return readlinkatFile(procFdLink, "") -} - -func rawProcSelfFdReadlink(fd int) (string, error) { - procRoot, err := getProcRoot() - if err != nil { - return "", err - } - return doRawProcSelfFdReadlink(procRoot, fd) -} - -func procSelfFdReadlink(f *os.File) (string, error) { - return rawProcSelfFdReadlink(int(f.Fd())) -} - -var ( - errPossibleBreakout = errors.New("possible breakout detected") - errInvalidDirectory = errors.New("wandered into deleted directory") - errDeletedInode = errors.New("cannot verify path of deleted inode") -) - -func isDeadInode(file *os.File) error { - // If the nlink of a file drops to 0, there is an attacker deleting - // directories during our walk, which could result in weird /proc values. - // It's better to error out in this case. - stat, err := fstat(file) - if err != nil { - return fmt.Errorf("check for dead inode: %w", err) - } - if stat.Nlink == 0 { - err := errDeletedInode - if stat.Mode&unix.S_IFMT == unix.S_IFDIR { - err = errInvalidDirectory - } - return fmt.Errorf("%w %q", err, file.Name()) - } - return nil -} - -func checkProcSelfFdPath(path string, file *os.File) error { - if err := isDeadInode(file); err != nil { - return err - } - actualPath, err := procSelfFdReadlink(file) - if err != nil { - return fmt.Errorf("get path of handle: %w", err) - } - if actualPath != path { - return fmt.Errorf("%w: handle path %q doesn't match expected path %q", errPossibleBreakout, actualPath, path) - } - return nil -} - -// Test hooks used in the procfs tests to verify that the fallback logic works. -// See testing_mocks_linux_test.go and procfs_linux_test.go for more details. -var ( - hookForcePrivateProcRootOpenTree = hookDummyFile - hookForcePrivateProcRootOpenTreeAtRecursive = hookDummyFile - hookForceGetProcRootUnsafe = hookDummy - - hookForceProcSelfTask = hookDummy - hookForceProcSelf = hookDummy -) - -func hookDummy() bool { return false } -func hookDummyFile(_ *os.File) bool { return false } diff --git a/vendor/github.com/cyphar/filepath-securejoin/vfs.go b/vendor/github.com/cyphar/filepath-securejoin/vfs.go deleted file mode 100644 index 36373f8c5..000000000 --- a/vendor/github.com/cyphar/filepath-securejoin/vfs.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2017-2024 SUSE LLC. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package securejoin - -import "os" - -// In future this should be moved into a separate package, because now there -// are several projects (umoci and go-mtree) that are using this sort of -// interface. - -// VFS is the minimal interface necessary to use [SecureJoinVFS]. A nil VFS is -// equivalent to using the standard [os].* family of functions. This is mainly -// used for the purposes of mock testing, but also can be used to otherwise use -// [SecureJoinVFS] with VFS-like system. -type VFS interface { - // Lstat returns an [os.FileInfo] describing the named file. If the - // file is a symbolic link, the returned [os.FileInfo] describes the - // symbolic link. Lstat makes no attempt to follow the link. - // The semantics are identical to [os.Lstat]. - Lstat(name string) (os.FileInfo, error) - - // Readlink returns the destination of the named symbolic link. - // The semantics are identical to [os.Readlink]. - Readlink(name string) (string, error) -} - -// osVFS is the "nil" VFS, in that it just passes everything through to the os -// module. -type osVFS struct{} - -func (o osVFS) Lstat(name string) (os.FileInfo, error) { return os.Lstat(name) } - -func (o osVFS) Readlink(name string) (string, error) { return os.Readlink(name) } diff --git a/vendor/github.com/emirpasic/gods/LICENSE b/vendor/github.com/emirpasic/gods/LICENSE deleted file mode 100644 index e5e449b6e..000000000 --- a/vendor/github.com/emirpasic/gods/LICENSE +++ /dev/null @@ -1,41 +0,0 @@ -Copyright (c) 2015, Emir Pasic -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------------------------------------------------- - -AVL Tree: - -Copyright (c) 2017 Benjamin Scher Purcell - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/vendor/github.com/emirpasic/gods/containers/containers.go b/vendor/github.com/emirpasic/gods/containers/containers.go deleted file mode 100644 index a512a3cba..000000000 --- a/vendor/github.com/emirpasic/gods/containers/containers.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package containers provides core interfaces and functions for data structures. -// -// Container is the base interface for all data structures to implement. -// -// Iterators provide stateful iterators. -// -// Enumerable provides Ruby inspired (each, select, map, find, any?, etc.) container functions. -// -// Serialization provides serializers (marshalers) and deserializers (unmarshalers). -package containers - -import "github.com/emirpasic/gods/utils" - -// Container is base interface that all data structures implement. -type Container interface { - Empty() bool - Size() int - Clear() - Values() []interface{} - String() string -} - -// GetSortedValues returns sorted container's elements with respect to the passed comparator. -// Does not affect the ordering of elements within the container. -func GetSortedValues(container Container, comparator utils.Comparator) []interface{} { - values := container.Values() - if len(values) < 2 { - return values - } - utils.Sort(values, comparator) - return values -} diff --git a/vendor/github.com/emirpasic/gods/containers/enumerable.go b/vendor/github.com/emirpasic/gods/containers/enumerable.go deleted file mode 100644 index 70660054a..000000000 --- a/vendor/github.com/emirpasic/gods/containers/enumerable.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package containers - -// EnumerableWithIndex provides functions for ordered containers whose values can be fetched by an index. -type EnumerableWithIndex interface { - // Each calls the given function once for each element, passing that element's index and value. - Each(func(index int, value interface{})) - - // Map invokes the given function once for each element and returns a - // container containing the values returned by the given function. - // Map(func(index int, value interface{}) interface{}) Container - - // Select returns a new container containing all elements for which the given function returns a true value. - // Select(func(index int, value interface{}) bool) Container - - // Any passes each element of the container to the given function and - // returns true if the function ever returns true for any element. - Any(func(index int, value interface{}) bool) bool - - // All passes each element of the container to the given function and - // returns true if the function returns true for all elements. - All(func(index int, value interface{}) bool) bool - - // Find passes each element of the container to the given function and returns - // the first (index,value) for which the function is true or -1,nil otherwise - // if no element matches the criteria. - Find(func(index int, value interface{}) bool) (int, interface{}) -} - -// EnumerableWithKey provides functions for ordered containers whose values whose elements are key/value pairs. -type EnumerableWithKey interface { - // Each calls the given function once for each element, passing that element's key and value. - Each(func(key interface{}, value interface{})) - - // Map invokes the given function once for each element and returns a container - // containing the values returned by the given function as key/value pairs. - // Map(func(key interface{}, value interface{}) (interface{}, interface{})) Container - - // Select returns a new container containing all elements for which the given function returns a true value. - // Select(func(key interface{}, value interface{}) bool) Container - - // Any passes each element of the container to the given function and - // returns true if the function ever returns true for any element. - Any(func(key interface{}, value interface{}) bool) bool - - // All passes each element of the container to the given function and - // returns true if the function returns true for all elements. - All(func(key interface{}, value interface{}) bool) bool - - // Find passes each element of the container to the given function and returns - // the first (key,value) for which the function is true or nil,nil otherwise if no element - // matches the criteria. - Find(func(key interface{}, value interface{}) bool) (interface{}, interface{}) -} diff --git a/vendor/github.com/emirpasic/gods/containers/iterator.go b/vendor/github.com/emirpasic/gods/containers/iterator.go deleted file mode 100644 index 73994ec82..000000000 --- a/vendor/github.com/emirpasic/gods/containers/iterator.go +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package containers - -// IteratorWithIndex is stateful iterator for ordered containers whose values can be fetched by an index. -type IteratorWithIndex interface { - // Next moves the iterator to the next element and returns true if there was a next element in the container. - // If Next() returns true, then next element's index and value can be retrieved by Index() and Value(). - // If Next() was called for the first time, then it will point the iterator to the first element if it exists. - // Modifies the state of the iterator. - Next() bool - - // Value returns the current element's value. - // Does not modify the state of the iterator. - Value() interface{} - - // Index returns the current element's index. - // Does not modify the state of the iterator. - Index() int - - // Begin resets the iterator to its initial state (one-before-first) - // Call Next() to fetch the first element if any. - Begin() - - // First moves the iterator to the first element and returns true if there was a first element in the container. - // If First() returns true, then first element's index and value can be retrieved by Index() and Value(). - // Modifies the state of the iterator. - First() bool - - // NextTo moves the iterator to the next element from current position that satisfies the condition given by the - // passed function, and returns true if there was a next element in the container. - // If NextTo() returns true, then next element's index and value can be retrieved by Index() and Value(). - // Modifies the state of the iterator. - NextTo(func(index int, value interface{}) bool) bool -} - -// IteratorWithKey is a stateful iterator for ordered containers whose elements are key value pairs. -type IteratorWithKey interface { - // Next moves the iterator to the next element and returns true if there was a next element in the container. - // If Next() returns true, then next element's key and value can be retrieved by Key() and Value(). - // If Next() was called for the first time, then it will point the iterator to the first element if it exists. - // Modifies the state of the iterator. - Next() bool - - // Value returns the current element's value. - // Does not modify the state of the iterator. - Value() interface{} - - // Key returns the current element's key. - // Does not modify the state of the iterator. - Key() interface{} - - // Begin resets the iterator to its initial state (one-before-first) - // Call Next() to fetch the first element if any. - Begin() - - // First moves the iterator to the first element and returns true if there was a first element in the container. - // If First() returns true, then first element's key and value can be retrieved by Key() and Value(). - // Modifies the state of the iterator. - First() bool - - // NextTo moves the iterator to the next element from current position that satisfies the condition given by the - // passed function, and returns true if there was a next element in the container. - // If NextTo() returns true, then next element's key and value can be retrieved by Key() and Value(). - // Modifies the state of the iterator. - NextTo(func(key interface{}, value interface{}) bool) bool -} - -// ReverseIteratorWithIndex is stateful iterator for ordered containers whose values can be fetched by an index. -// -// Essentially it is the same as IteratorWithIndex, but provides additional: -// -// Prev() function to enable traversal in reverse -// -// Last() function to move the iterator to the last element. -// -// End() function to move the iterator past the last element (one-past-the-end). -type ReverseIteratorWithIndex interface { - // Prev moves the iterator to the previous element and returns true if there was a previous element in the container. - // If Prev() returns true, then previous element's index and value can be retrieved by Index() and Value(). - // Modifies the state of the iterator. - Prev() bool - - // End moves the iterator past the last element (one-past-the-end). - // Call Prev() to fetch the last element if any. - End() - - // Last moves the iterator to the last element and returns true if there was a last element in the container. - // If Last() returns true, then last element's index and value can be retrieved by Index() and Value(). - // Modifies the state of the iterator. - Last() bool - - // PrevTo moves the iterator to the previous element from current position that satisfies the condition given by the - // passed function, and returns true if there was a next element in the container. - // If PrevTo() returns true, then next element's index and value can be retrieved by Index() and Value(). - // Modifies the state of the iterator. - PrevTo(func(index int, value interface{}) bool) bool - - IteratorWithIndex -} - -// ReverseIteratorWithKey is a stateful iterator for ordered containers whose elements are key value pairs. -// -// Essentially it is the same as IteratorWithKey, but provides additional: -// -// Prev() function to enable traversal in reverse -// -// Last() function to move the iterator to the last element. -type ReverseIteratorWithKey interface { - // Prev moves the iterator to the previous element and returns true if there was a previous element in the container. - // If Prev() returns true, then previous element's key and value can be retrieved by Key() and Value(). - // Modifies the state of the iterator. - Prev() bool - - // End moves the iterator past the last element (one-past-the-end). - // Call Prev() to fetch the last element if any. - End() - - // Last moves the iterator to the last element and returns true if there was a last element in the container. - // If Last() returns true, then last element's key and value can be retrieved by Key() and Value(). - // Modifies the state of the iterator. - Last() bool - - // PrevTo moves the iterator to the previous element from current position that satisfies the condition given by the - // passed function, and returns true if there was a next element in the container. - // If PrevTo() returns true, then next element's key and value can be retrieved by Key() and Value(). - // Modifies the state of the iterator. - PrevTo(func(key interface{}, value interface{}) bool) bool - - IteratorWithKey -} diff --git a/vendor/github.com/emirpasic/gods/containers/serialization.go b/vendor/github.com/emirpasic/gods/containers/serialization.go deleted file mode 100644 index fd9cbe23a..000000000 --- a/vendor/github.com/emirpasic/gods/containers/serialization.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package containers - -// JSONSerializer provides JSON serialization -type JSONSerializer interface { - // ToJSON outputs the JSON representation of containers's elements. - ToJSON() ([]byte, error) - // MarshalJSON @implements json.Marshaler - MarshalJSON() ([]byte, error) -} - -// JSONDeserializer provides JSON deserialization -type JSONDeserializer interface { - // FromJSON populates containers's elements from the input JSON representation. - FromJSON([]byte) error - // UnmarshalJSON @implements json.Unmarshaler - UnmarshalJSON([]byte) error -} diff --git a/vendor/github.com/emirpasic/gods/lists/arraylist/arraylist.go b/vendor/github.com/emirpasic/gods/lists/arraylist/arraylist.go deleted file mode 100644 index 60ce45832..000000000 --- a/vendor/github.com/emirpasic/gods/lists/arraylist/arraylist.go +++ /dev/null @@ -1,227 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package arraylist implements the array list. -// -// Structure is not thread safe. -// -// Reference: https://en.wikipedia.org/wiki/List_%28abstract_data_type%29 -package arraylist - -import ( - "fmt" - "strings" - - "github.com/emirpasic/gods/lists" - "github.com/emirpasic/gods/utils" -) - -// Assert List implementation -var _ lists.List = (*List)(nil) - -// List holds the elements in a slice -type List struct { - elements []interface{} - size int -} - -const ( - growthFactor = float32(2.0) // growth by 100% - shrinkFactor = float32(0.25) // shrink when size is 25% of capacity (0 means never shrink) -) - -// New instantiates a new list and adds the passed values, if any, to the list -func New(values ...interface{}) *List { - list := &List{} - if len(values) > 0 { - list.Add(values...) - } - return list -} - -// Add appends a value at the end of the list -func (list *List) Add(values ...interface{}) { - list.growBy(len(values)) - for _, value := range values { - list.elements[list.size] = value - list.size++ - } -} - -// Get returns the element at index. -// Second return parameter is true if index is within bounds of the array and array is not empty, otherwise false. -func (list *List) Get(index int) (interface{}, bool) { - - if !list.withinRange(index) { - return nil, false - } - - return list.elements[index], true -} - -// Remove removes the element at the given index from the list. -func (list *List) Remove(index int) { - - if !list.withinRange(index) { - return - } - - list.elements[index] = nil // cleanup reference - copy(list.elements[index:], list.elements[index+1:list.size]) // shift to the left by one (slow operation, need ways to optimize this) - list.size-- - - list.shrink() -} - -// Contains checks if elements (one or more) are present in the set. -// All elements have to be present in the set for the method to return true. -// Performance time complexity of n^2. -// Returns true if no arguments are passed at all, i.e. set is always super-set of empty set. -func (list *List) Contains(values ...interface{}) bool { - - for _, searchValue := range values { - found := false - for index := 0; index < list.size; index++ { - if list.elements[index] == searchValue { - found = true - break - } - } - if !found { - return false - } - } - return true -} - -// Values returns all elements in the list. -func (list *List) Values() []interface{} { - newElements := make([]interface{}, list.size, list.size) - copy(newElements, list.elements[:list.size]) - return newElements -} - -//IndexOf returns index of provided element -func (list *List) IndexOf(value interface{}) int { - if list.size == 0 { - return -1 - } - for index, element := range list.elements { - if element == value { - return index - } - } - return -1 -} - -// Empty returns true if list does not contain any elements. -func (list *List) Empty() bool { - return list.size == 0 -} - -// Size returns number of elements within the list. -func (list *List) Size() int { - return list.size -} - -// Clear removes all elements from the list. -func (list *List) Clear() { - list.size = 0 - list.elements = []interface{}{} -} - -// Sort sorts values (in-place) using. -func (list *List) Sort(comparator utils.Comparator) { - if len(list.elements) < 2 { - return - } - utils.Sort(list.elements[:list.size], comparator) -} - -// Swap swaps the two values at the specified positions. -func (list *List) Swap(i, j int) { - if list.withinRange(i) && list.withinRange(j) { - list.elements[i], list.elements[j] = list.elements[j], list.elements[i] - } -} - -// Insert inserts values at specified index position shifting the value at that position (if any) and any subsequent elements to the right. -// Does not do anything if position is negative or bigger than list's size -// Note: position equal to list's size is valid, i.e. append. -func (list *List) Insert(index int, values ...interface{}) { - - if !list.withinRange(index) { - // Append - if index == list.size { - list.Add(values...) - } - return - } - - l := len(values) - list.growBy(l) - list.size += l - copy(list.elements[index+l:], list.elements[index:list.size-l]) - copy(list.elements[index:], values) -} - -// Set the value at specified index -// Does not do anything if position is negative or bigger than list's size -// Note: position equal to list's size is valid, i.e. append. -func (list *List) Set(index int, value interface{}) { - - if !list.withinRange(index) { - // Append - if index == list.size { - list.Add(value) - } - return - } - - list.elements[index] = value -} - -// String returns a string representation of container -func (list *List) String() string { - str := "ArrayList\n" - values := []string{} - for _, value := range list.elements[:list.size] { - values = append(values, fmt.Sprintf("%v", value)) - } - str += strings.Join(values, ", ") - return str -} - -// Check that the index is within bounds of the list -func (list *List) withinRange(index int) bool { - return index >= 0 && index < list.size -} - -func (list *List) resize(cap int) { - newElements := make([]interface{}, cap, cap) - copy(newElements, list.elements) - list.elements = newElements -} - -// Expand the array if necessary, i.e. capacity will be reached if we add n elements -func (list *List) growBy(n int) { - // When capacity is reached, grow by a factor of growthFactor and add number of elements - currentCapacity := cap(list.elements) - if list.size+n >= currentCapacity { - newCapacity := int(growthFactor * float32(currentCapacity+n)) - list.resize(newCapacity) - } -} - -// Shrink the array if necessary, i.e. when size is shrinkFactor percent of current capacity -func (list *List) shrink() { - if shrinkFactor == 0.0 { - return - } - // Shrink when size is at shrinkFactor * capacity - currentCapacity := cap(list.elements) - if list.size <= int(float32(currentCapacity)*shrinkFactor) { - list.resize(list.size) - } -} diff --git a/vendor/github.com/emirpasic/gods/lists/arraylist/enumerable.go b/vendor/github.com/emirpasic/gods/lists/arraylist/enumerable.go deleted file mode 100644 index 8bd60b0a5..000000000 --- a/vendor/github.com/emirpasic/gods/lists/arraylist/enumerable.go +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package arraylist - -import "github.com/emirpasic/gods/containers" - -// Assert Enumerable implementation -var _ containers.EnumerableWithIndex = (*List)(nil) - -// Each calls the given function once for each element, passing that element's index and value. -func (list *List) Each(f func(index int, value interface{})) { - iterator := list.Iterator() - for iterator.Next() { - f(iterator.Index(), iterator.Value()) - } -} - -// Map invokes the given function once for each element and returns a -// container containing the values returned by the given function. -func (list *List) Map(f func(index int, value interface{}) interface{}) *List { - newList := &List{} - iterator := list.Iterator() - for iterator.Next() { - newList.Add(f(iterator.Index(), iterator.Value())) - } - return newList -} - -// Select returns a new container containing all elements for which the given function returns a true value. -func (list *List) Select(f func(index int, value interface{}) bool) *List { - newList := &List{} - iterator := list.Iterator() - for iterator.Next() { - if f(iterator.Index(), iterator.Value()) { - newList.Add(iterator.Value()) - } - } - return newList -} - -// Any passes each element of the collection to the given function and -// returns true if the function ever returns true for any element. -func (list *List) Any(f func(index int, value interface{}) bool) bool { - iterator := list.Iterator() - for iterator.Next() { - if f(iterator.Index(), iterator.Value()) { - return true - } - } - return false -} - -// All passes each element of the collection to the given function and -// returns true if the function returns true for all elements. -func (list *List) All(f func(index int, value interface{}) bool) bool { - iterator := list.Iterator() - for iterator.Next() { - if !f(iterator.Index(), iterator.Value()) { - return false - } - } - return true -} - -// Find passes each element of the container to the given function and returns -// the first (index,value) for which the function is true or -1,nil otherwise -// if no element matches the criteria. -func (list *List) Find(f func(index int, value interface{}) bool) (int, interface{}) { - iterator := list.Iterator() - for iterator.Next() { - if f(iterator.Index(), iterator.Value()) { - return iterator.Index(), iterator.Value() - } - } - return -1, nil -} diff --git a/vendor/github.com/emirpasic/gods/lists/arraylist/iterator.go b/vendor/github.com/emirpasic/gods/lists/arraylist/iterator.go deleted file mode 100644 index f9efe20c5..000000000 --- a/vendor/github.com/emirpasic/gods/lists/arraylist/iterator.go +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package arraylist - -import "github.com/emirpasic/gods/containers" - -// Assert Iterator implementation -var _ containers.ReverseIteratorWithIndex = (*Iterator)(nil) - -// Iterator holding the iterator's state -type Iterator struct { - list *List - index int -} - -// Iterator returns a stateful iterator whose values can be fetched by an index. -func (list *List) Iterator() Iterator { - return Iterator{list: list, index: -1} -} - -// Next moves the iterator to the next element and returns true if there was a next element in the container. -// If Next() returns true, then next element's index and value can be retrieved by Index() and Value(). -// If Next() was called for the first time, then it will point the iterator to the first element if it exists. -// Modifies the state of the iterator. -func (iterator *Iterator) Next() bool { - if iterator.index < iterator.list.size { - iterator.index++ - } - return iterator.list.withinRange(iterator.index) -} - -// Prev moves the iterator to the previous element and returns true if there was a previous element in the container. -// If Prev() returns true, then previous element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) Prev() bool { - if iterator.index >= 0 { - iterator.index-- - } - return iterator.list.withinRange(iterator.index) -} - -// Value returns the current element's value. -// Does not modify the state of the iterator. -func (iterator *Iterator) Value() interface{} { - return iterator.list.elements[iterator.index] -} - -// Index returns the current element's index. -// Does not modify the state of the iterator. -func (iterator *Iterator) Index() int { - return iterator.index -} - -// Begin resets the iterator to its initial state (one-before-first) -// Call Next() to fetch the first element if any. -func (iterator *Iterator) Begin() { - iterator.index = -1 -} - -// End moves the iterator past the last element (one-past-the-end). -// Call Prev() to fetch the last element if any. -func (iterator *Iterator) End() { - iterator.index = iterator.list.size -} - -// First moves the iterator to the first element and returns true if there was a first element in the container. -// If First() returns true, then first element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) First() bool { - iterator.Begin() - return iterator.Next() -} - -// Last moves the iterator to the last element and returns true if there was a last element in the container. -// If Last() returns true, then last element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) Last() bool { - iterator.End() - return iterator.Prev() -} - -// NextTo moves the iterator to the next element from current position that satisfies the condition given by the -// passed function, and returns true if there was a next element in the container. -// If NextTo() returns true, then next element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) NextTo(f func(index int, value interface{}) bool) bool { - for iterator.Next() { - index, value := iterator.Index(), iterator.Value() - if f(index, value) { - return true - } - } - return false -} - -// PrevTo moves the iterator to the previous element from current position that satisfies the condition given by the -// passed function, and returns true if there was a next element in the container. -// If PrevTo() returns true, then next element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) PrevTo(f func(index int, value interface{}) bool) bool { - for iterator.Prev() { - index, value := iterator.Index(), iterator.Value() - if f(index, value) { - return true - } - } - return false -} diff --git a/vendor/github.com/emirpasic/gods/lists/arraylist/serialization.go b/vendor/github.com/emirpasic/gods/lists/arraylist/serialization.go deleted file mode 100644 index 5e86fe96f..000000000 --- a/vendor/github.com/emirpasic/gods/lists/arraylist/serialization.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package arraylist - -import ( - "encoding/json" - "github.com/emirpasic/gods/containers" -) - -// Assert Serialization implementation -var _ containers.JSONSerializer = (*List)(nil) -var _ containers.JSONDeserializer = (*List)(nil) - -// ToJSON outputs the JSON representation of list's elements. -func (list *List) ToJSON() ([]byte, error) { - return json.Marshal(list.elements[:list.size]) -} - -// FromJSON populates list's elements from the input JSON representation. -func (list *List) FromJSON(data []byte) error { - err := json.Unmarshal(data, &list.elements) - if err == nil { - list.size = len(list.elements) - } - return err -} - -// UnmarshalJSON @implements json.Unmarshaler -func (list *List) UnmarshalJSON(bytes []byte) error { - return list.FromJSON(bytes) -} - -// MarshalJSON @implements json.Marshaler -func (list *List) MarshalJSON() ([]byte, error) { - return list.ToJSON() -} diff --git a/vendor/github.com/emirpasic/gods/lists/lists.go b/vendor/github.com/emirpasic/gods/lists/lists.go deleted file mode 100644 index 55bd619e2..000000000 --- a/vendor/github.com/emirpasic/gods/lists/lists.go +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package lists provides an abstract List interface. -// -// In computer science, a list or sequence is an abstract data type that represents an ordered sequence of values, where the same value may occur more than once. An instance of a list is a computer representation of the mathematical concept of a finite sequence; the (potentially) infinite analog of a list is a stream. Lists are a basic example of containers, as they contain other values. If the same value occurs multiple times, each occurrence is considered a distinct item. -// -// Reference: https://en.wikipedia.org/wiki/List_%28abstract_data_type%29 -package lists - -import ( - "github.com/emirpasic/gods/containers" - "github.com/emirpasic/gods/utils" -) - -// List interface that all lists implement -type List interface { - Get(index int) (interface{}, bool) - Remove(index int) - Add(values ...interface{}) - Contains(values ...interface{}) bool - Sort(comparator utils.Comparator) - Swap(index1, index2 int) - Insert(index int, values ...interface{}) - Set(index int, value interface{}) - - containers.Container - // Empty() bool - // Size() int - // Clear() - // Values() []interface{} - // String() string -} diff --git a/vendor/github.com/emirpasic/gods/trees/binaryheap/binaryheap.go b/vendor/github.com/emirpasic/gods/trees/binaryheap/binaryheap.go deleted file mode 100644 index e658f2577..000000000 --- a/vendor/github.com/emirpasic/gods/trees/binaryheap/binaryheap.go +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package binaryheap implements a binary heap backed by array list. -// -// Comparator defines this heap as either min or max heap. -// -// Structure is not thread safe. -// -// References: http://en.wikipedia.org/wiki/Binary_heap -package binaryheap - -import ( - "fmt" - "github.com/emirpasic/gods/lists/arraylist" - "github.com/emirpasic/gods/trees" - "github.com/emirpasic/gods/utils" - "strings" -) - -// Assert Tree implementation -var _ trees.Tree = (*Heap)(nil) - -// Heap holds elements in an array-list -type Heap struct { - list *arraylist.List - Comparator utils.Comparator -} - -// NewWith instantiates a new empty heap tree with the custom comparator. -func NewWith(comparator utils.Comparator) *Heap { - return &Heap{list: arraylist.New(), Comparator: comparator} -} - -// NewWithIntComparator instantiates a new empty heap with the IntComparator, i.e. elements are of type int. -func NewWithIntComparator() *Heap { - return &Heap{list: arraylist.New(), Comparator: utils.IntComparator} -} - -// NewWithStringComparator instantiates a new empty heap with the StringComparator, i.e. elements are of type string. -func NewWithStringComparator() *Heap { - return &Heap{list: arraylist.New(), Comparator: utils.StringComparator} -} - -// Push adds a value onto the heap and bubbles it up accordingly. -func (heap *Heap) Push(values ...interface{}) { - if len(values) == 1 { - heap.list.Add(values[0]) - heap.bubbleUp() - } else { - // Reference: https://en.wikipedia.org/wiki/Binary_heap#Building_a_heap - for _, value := range values { - heap.list.Add(value) - } - size := heap.list.Size()/2 + 1 - for i := size; i >= 0; i-- { - heap.bubbleDownIndex(i) - } - } -} - -// Pop removes top element on heap and returns it, or nil if heap is empty. -// Second return parameter is true, unless the heap was empty and there was nothing to pop. -func (heap *Heap) Pop() (value interface{}, ok bool) { - value, ok = heap.list.Get(0) - if !ok { - return - } - lastIndex := heap.list.Size() - 1 - heap.list.Swap(0, lastIndex) - heap.list.Remove(lastIndex) - heap.bubbleDown() - return -} - -// Peek returns top element on the heap without removing it, or nil if heap is empty. -// Second return parameter is true, unless the heap was empty and there was nothing to peek. -func (heap *Heap) Peek() (value interface{}, ok bool) { - return heap.list.Get(0) -} - -// Empty returns true if heap does not contain any elements. -func (heap *Heap) Empty() bool { - return heap.list.Empty() -} - -// Size returns number of elements within the heap. -func (heap *Heap) Size() int { - return heap.list.Size() -} - -// Clear removes all elements from the heap. -func (heap *Heap) Clear() { - heap.list.Clear() -} - -// Values returns all elements in the heap. -func (heap *Heap) Values() []interface{} { - values := make([]interface{}, heap.list.Size(), heap.list.Size()) - for it := heap.Iterator(); it.Next(); { - values[it.Index()] = it.Value() - } - return values -} - -// String returns a string representation of container -func (heap *Heap) String() string { - str := "BinaryHeap\n" - values := []string{} - for it := heap.Iterator(); it.Next(); { - values = append(values, fmt.Sprintf("%v", it.Value())) - } - str += strings.Join(values, ", ") - return str -} - -// Performs the "bubble down" operation. This is to place the element that is at the root -// of the heap in its correct place so that the heap maintains the min/max-heap order property. -func (heap *Heap) bubbleDown() { - heap.bubbleDownIndex(0) -} - -// Performs the "bubble down" operation. This is to place the element that is at the index -// of the heap in its correct place so that the heap maintains the min/max-heap order property. -func (heap *Heap) bubbleDownIndex(index int) { - size := heap.list.Size() - for leftIndex := index<<1 + 1; leftIndex < size; leftIndex = index<<1 + 1 { - rightIndex := index<<1 + 2 - smallerIndex := leftIndex - leftValue, _ := heap.list.Get(leftIndex) - rightValue, _ := heap.list.Get(rightIndex) - if rightIndex < size && heap.Comparator(leftValue, rightValue) > 0 { - smallerIndex = rightIndex - } - indexValue, _ := heap.list.Get(index) - smallerValue, _ := heap.list.Get(smallerIndex) - if heap.Comparator(indexValue, smallerValue) > 0 { - heap.list.Swap(index, smallerIndex) - } else { - break - } - index = smallerIndex - } -} - -// Performs the "bubble up" operation. This is to place a newly inserted -// element (i.e. last element in the list) in its correct place so that -// the heap maintains the min/max-heap order property. -func (heap *Heap) bubbleUp() { - index := heap.list.Size() - 1 - for parentIndex := (index - 1) >> 1; index > 0; parentIndex = (index - 1) >> 1 { - indexValue, _ := heap.list.Get(index) - parentValue, _ := heap.list.Get(parentIndex) - if heap.Comparator(parentValue, indexValue) <= 0 { - break - } - heap.list.Swap(index, parentIndex) - index = parentIndex - } -} - -// Check that the index is within bounds of the list -func (heap *Heap) withinRange(index int) bool { - return index >= 0 && index < heap.list.Size() -} diff --git a/vendor/github.com/emirpasic/gods/trees/binaryheap/iterator.go b/vendor/github.com/emirpasic/gods/trees/binaryheap/iterator.go deleted file mode 100644 index f2179633b..000000000 --- a/vendor/github.com/emirpasic/gods/trees/binaryheap/iterator.go +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package binaryheap - -import ( - "github.com/emirpasic/gods/containers" -) - -// Assert Iterator implementation -var _ containers.ReverseIteratorWithIndex = (*Iterator)(nil) - -// Iterator returns a stateful iterator whose values can be fetched by an index. -type Iterator struct { - heap *Heap - index int -} - -// Iterator returns a stateful iterator whose values can be fetched by an index. -func (heap *Heap) Iterator() Iterator { - return Iterator{heap: heap, index: -1} -} - -// Next moves the iterator to the next element and returns true if there was a next element in the container. -// If Next() returns true, then next element's index and value can be retrieved by Index() and Value(). -// If Next() was called for the first time, then it will point the iterator to the first element if it exists. -// Modifies the state of the iterator. -func (iterator *Iterator) Next() bool { - if iterator.index < iterator.heap.Size() { - iterator.index++ - } - return iterator.heap.withinRange(iterator.index) -} - -// Prev moves the iterator to the previous element and returns true if there was a previous element in the container. -// If Prev() returns true, then previous element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) Prev() bool { - if iterator.index >= 0 { - iterator.index-- - } - return iterator.heap.withinRange(iterator.index) -} - -// Value returns the current element's value. -// Does not modify the state of the iterator. -func (iterator *Iterator) Value() interface{} { - start, end := evaluateRange(iterator.index) - if end > iterator.heap.Size() { - end = iterator.heap.Size() - } - tmpHeap := NewWith(iterator.heap.Comparator) - for n := start; n < end; n++ { - value, _ := iterator.heap.list.Get(n) - tmpHeap.Push(value) - } - for n := 0; n < iterator.index-start; n++ { - tmpHeap.Pop() - } - value, _ := tmpHeap.Pop() - return value -} - -// Index returns the current element's index. -// Does not modify the state of the iterator. -func (iterator *Iterator) Index() int { - return iterator.index -} - -// Begin resets the iterator to its initial state (one-before-first) -// Call Next() to fetch the first element if any. -func (iterator *Iterator) Begin() { - iterator.index = -1 -} - -// End moves the iterator past the last element (one-past-the-end). -// Call Prev() to fetch the last element if any. -func (iterator *Iterator) End() { - iterator.index = iterator.heap.Size() -} - -// First moves the iterator to the first element and returns true if there was a first element in the container. -// If First() returns true, then first element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) First() bool { - iterator.Begin() - return iterator.Next() -} - -// Last moves the iterator to the last element and returns true if there was a last element in the container. -// If Last() returns true, then last element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) Last() bool { - iterator.End() - return iterator.Prev() -} - -// NextTo moves the iterator to the next element from current position that satisfies the condition given by the -// passed function, and returns true if there was a next element in the container. -// If NextTo() returns true, then next element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) NextTo(f func(index int, value interface{}) bool) bool { - for iterator.Next() { - index, value := iterator.Index(), iterator.Value() - if f(index, value) { - return true - } - } - return false -} - -// PrevTo moves the iterator to the previous element from current position that satisfies the condition given by the -// passed function, and returns true if there was a next element in the container. -// If PrevTo() returns true, then next element's index and value can be retrieved by Index() and Value(). -// Modifies the state of the iterator. -func (iterator *Iterator) PrevTo(f func(index int, value interface{}) bool) bool { - for iterator.Prev() { - index, value := iterator.Index(), iterator.Value() - if f(index, value) { - return true - } - } - return false -} - -// numOfBits counts the number of bits of an int -func numOfBits(n int) uint { - var count uint - for n != 0 { - count++ - n >>= 1 - } - return count -} - -// evaluateRange evaluates the index range [start,end) of same level nodes in the heap as the index -func evaluateRange(index int) (start int, end int) { - bits := numOfBits(index+1) - 1 - start = 1< b -type Comparator func(a, b interface{}) int - -// StringComparator provides a fast comparison on strings -func StringComparator(a, b interface{}) int { - s1 := a.(string) - s2 := b.(string) - min := len(s2) - if len(s1) < len(s2) { - min = len(s1) - } - diff := 0 - for i := 0; i < min && diff == 0; i++ { - diff = int(s1[i]) - int(s2[i]) - } - if diff == 0 { - diff = len(s1) - len(s2) - } - if diff < 0 { - return -1 - } - if diff > 0 { - return 1 - } - return 0 -} - -// IntComparator provides a basic comparison on int -func IntComparator(a, b interface{}) int { - aAsserted := a.(int) - bAsserted := b.(int) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// Int8Comparator provides a basic comparison on int8 -func Int8Comparator(a, b interface{}) int { - aAsserted := a.(int8) - bAsserted := b.(int8) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// Int16Comparator provides a basic comparison on int16 -func Int16Comparator(a, b interface{}) int { - aAsserted := a.(int16) - bAsserted := b.(int16) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// Int32Comparator provides a basic comparison on int32 -func Int32Comparator(a, b interface{}) int { - aAsserted := a.(int32) - bAsserted := b.(int32) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// Int64Comparator provides a basic comparison on int64 -func Int64Comparator(a, b interface{}) int { - aAsserted := a.(int64) - bAsserted := b.(int64) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// UIntComparator provides a basic comparison on uint -func UIntComparator(a, b interface{}) int { - aAsserted := a.(uint) - bAsserted := b.(uint) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// UInt8Comparator provides a basic comparison on uint8 -func UInt8Comparator(a, b interface{}) int { - aAsserted := a.(uint8) - bAsserted := b.(uint8) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// UInt16Comparator provides a basic comparison on uint16 -func UInt16Comparator(a, b interface{}) int { - aAsserted := a.(uint16) - bAsserted := b.(uint16) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// UInt32Comparator provides a basic comparison on uint32 -func UInt32Comparator(a, b interface{}) int { - aAsserted := a.(uint32) - bAsserted := b.(uint32) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// UInt64Comparator provides a basic comparison on uint64 -func UInt64Comparator(a, b interface{}) int { - aAsserted := a.(uint64) - bAsserted := b.(uint64) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// Float32Comparator provides a basic comparison on float32 -func Float32Comparator(a, b interface{}) int { - aAsserted := a.(float32) - bAsserted := b.(float32) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// Float64Comparator provides a basic comparison on float64 -func Float64Comparator(a, b interface{}) int { - aAsserted := a.(float64) - bAsserted := b.(float64) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// ByteComparator provides a basic comparison on byte -func ByteComparator(a, b interface{}) int { - aAsserted := a.(byte) - bAsserted := b.(byte) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// RuneComparator provides a basic comparison on rune -func RuneComparator(a, b interface{}) int { - aAsserted := a.(rune) - bAsserted := b.(rune) - switch { - case aAsserted > bAsserted: - return 1 - case aAsserted < bAsserted: - return -1 - default: - return 0 - } -} - -// TimeComparator provides a basic comparison on time.Time -func TimeComparator(a, b interface{}) int { - aAsserted := a.(time.Time) - bAsserted := b.(time.Time) - - switch { - case aAsserted.After(bAsserted): - return 1 - case aAsserted.Before(bAsserted): - return -1 - default: - return 0 - } -} diff --git a/vendor/github.com/emirpasic/gods/utils/sort.go b/vendor/github.com/emirpasic/gods/utils/sort.go deleted file mode 100644 index 79ced1f5d..000000000 --- a/vendor/github.com/emirpasic/gods/utils/sort.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package utils - -import "sort" - -// Sort sorts values (in-place) with respect to the given comparator. -// -// Uses Go's sort (hybrid of quicksort for large and then insertion sort for smaller slices). -func Sort(values []interface{}, comparator Comparator) { - sort.Sort(sortable{values, comparator}) -} - -type sortable struct { - values []interface{} - comparator Comparator -} - -func (s sortable) Len() int { - return len(s.values) -} -func (s sortable) Swap(i, j int) { - s.values[i], s.values[j] = s.values[j], s.values[i] -} -func (s sortable) Less(i, j int) bool { - return s.comparator(s.values[i], s.values[j]) < 0 -} diff --git a/vendor/github.com/emirpasic/gods/utils/utils.go b/vendor/github.com/emirpasic/gods/utils/utils.go deleted file mode 100644 index 262c62576..000000000 --- a/vendor/github.com/emirpasic/gods/utils/utils.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2015, Emir Pasic. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package utils provides common utility functions. -// -// Provided functionalities: -// - sorting -// - comparators -package utils - -import ( - "fmt" - "strconv" -) - -// ToString converts a value to string. -func ToString(value interface{}) string { - switch value := value.(type) { - case string: - return value - case int8: - return strconv.FormatInt(int64(value), 10) - case int16: - return strconv.FormatInt(int64(value), 10) - case int32: - return strconv.FormatInt(int64(value), 10) - case int64: - return strconv.FormatInt(value, 10) - case uint8: - return strconv.FormatUint(uint64(value), 10) - case uint16: - return strconv.FormatUint(uint64(value), 10) - case uint32: - return strconv.FormatUint(uint64(value), 10) - case uint64: - return strconv.FormatUint(value, 10) - case float32: - return strconv.FormatFloat(float64(value), 'g', -1, 64) - case float64: - return strconv.FormatFloat(value, 'g', -1, 64) - case bool: - return strconv.FormatBool(value) - default: - return fmt.Sprintf("%+v", value) - } -} diff --git a/vendor/github.com/gdamore/tcell/v2/README-wasm.md b/vendor/github.com/gdamore/tcell/v2/README-wasm.md deleted file mode 100644 index 09591095e..000000000 --- a/vendor/github.com/gdamore/tcell/v2/README-wasm.md +++ /dev/null @@ -1,61 +0,0 @@ -# WASM for _Tcell_ - -You can build _Tcell_ project into a webpage by compiling it slightly differently. This will result in a _Tcell_ project you can embed into another html page, or use as a standalone page. - -## Building your project - -WASM needs special build flags in order to work. You can build it by executing -```sh -GOOS=js GOARCH=wasm go build -o yourfile.wasm -``` - -## Additional files - -You also need 5 other files in the same directory as the wasm. Four (`tcell.html`, `tcell.js`, `termstyle.css`, and `beep.wav`) are provided in the `webfiles` directory. The last one, `wasm_exec.js`, can be copied from GOROOT into the current directory by executing -```sh -cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./ -``` - -In `tcell.js`, you also need to change the constant -```js -const wasmFilePath = "yourfile.wasm" -``` -to the file you outputted to when building. - -## Displaying your project - -### Standalone - -You can see the project (with an white background around the terminal) by serving the directory. You can do this using any framework, including another golang project: - -```golang -// server.go - -package main - -import ( - "log" - "net/http" -) - -func main() { - log.Fatal(http.ListenAndServe(":8080", - http.FileServer(http.Dir("/path/to/dir/to/serve")), - )) -} - -``` - -To see the webpage with this example, you can type in `localhost:8080/tcell.html` into your browser while `server.go` is running. - -### Embedding -It is recommended to use an iframe if you want to embed the app into a webpage: -```html - -``` - -## Other considerations - -### Accessing files - -`io.Open(filename)` and other related functions for reading file systems do not work; use `http.Get(filename)` instead. diff --git a/vendor/github.com/gdamore/tcell/v2/color.go b/vendor/github.com/gdamore/tcell/v2/color.go deleted file mode 100644 index 904848eaa..000000000 --- a/vendor/github.com/gdamore/tcell/v2/color.go +++ /dev/null @@ -1,1128 +0,0 @@ -// Copyright 2023 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -import ( - "fmt" - ic "image/color" - "strconv" -) - -// Color represents a color. The low numeric values are the same as used -// by ECMA-48, and beyond that XTerm. A 24-bit RGB value may be used by -// adding in the ColorIsRGB flag. For Color names we use the W3C approved -// color names. -// -// We use a 64-bit integer to allow future expansion if we want to add an -// 8-bit alpha, while still leaving us some room for extra options. -// -// Note that on various terminals colors may be approximated however, or -// not supported at all. If no suitable representation for a color is known, -// the library will simply not set any color, deferring to whatever default -// attributes the terminal uses. -type Color uint64 - -const ( - // ColorDefault is used to leave the Color unchanged from whatever - // system or terminal default may exist. It's also the zero value. - ColorDefault Color = 0 - - // ColorValid is used to indicate the color value is actually - // valid (initialized). This is useful to permit the zero value - // to be treated as the default. - ColorValid Color = 1 << 32 - - // ColorIsRGB is used to indicate that the numeric value is not - // a known color constant, but rather an RGB value. The lower - // order 3 bytes are RGB. - ColorIsRGB Color = 1 << 33 - - // ColorSpecial is a flag used to indicate that the values have - // special meaning, and live outside of the color space(s). - ColorSpecial Color = 1 << 34 -) - -// Note that the order of these options is important -- it follows the -// definitions used by ECMA and XTerm. Hence any further named colors -// must begin at a value not less than 256. -const ( - ColorBlack = ColorValid + iota - ColorMaroon - ColorGreen - ColorOlive - ColorNavy - ColorPurple - ColorTeal - ColorSilver - ColorGray - ColorRed - ColorLime - ColorYellow - ColorBlue - ColorFuchsia - ColorAqua - ColorWhite - Color16 - Color17 - Color18 - Color19 - Color20 - Color21 - Color22 - Color23 - Color24 - Color25 - Color26 - Color27 - Color28 - Color29 - Color30 - Color31 - Color32 - Color33 - Color34 - Color35 - Color36 - Color37 - Color38 - Color39 - Color40 - Color41 - Color42 - Color43 - Color44 - Color45 - Color46 - Color47 - Color48 - Color49 - Color50 - Color51 - Color52 - Color53 - Color54 - Color55 - Color56 - Color57 - Color58 - Color59 - Color60 - Color61 - Color62 - Color63 - Color64 - Color65 - Color66 - Color67 - Color68 - Color69 - Color70 - Color71 - Color72 - Color73 - Color74 - Color75 - Color76 - Color77 - Color78 - Color79 - Color80 - Color81 - Color82 - Color83 - Color84 - Color85 - Color86 - Color87 - Color88 - Color89 - Color90 - Color91 - Color92 - Color93 - Color94 - Color95 - Color96 - Color97 - Color98 - Color99 - Color100 - Color101 - Color102 - Color103 - Color104 - Color105 - Color106 - Color107 - Color108 - Color109 - Color110 - Color111 - Color112 - Color113 - Color114 - Color115 - Color116 - Color117 - Color118 - Color119 - Color120 - Color121 - Color122 - Color123 - Color124 - Color125 - Color126 - Color127 - Color128 - Color129 - Color130 - Color131 - Color132 - Color133 - Color134 - Color135 - Color136 - Color137 - Color138 - Color139 - Color140 - Color141 - Color142 - Color143 - Color144 - Color145 - Color146 - Color147 - Color148 - Color149 - Color150 - Color151 - Color152 - Color153 - Color154 - Color155 - Color156 - Color157 - Color158 - Color159 - Color160 - Color161 - Color162 - Color163 - Color164 - Color165 - Color166 - Color167 - Color168 - Color169 - Color170 - Color171 - Color172 - Color173 - Color174 - Color175 - Color176 - Color177 - Color178 - Color179 - Color180 - Color181 - Color182 - Color183 - Color184 - Color185 - Color186 - Color187 - Color188 - Color189 - Color190 - Color191 - Color192 - Color193 - Color194 - Color195 - Color196 - Color197 - Color198 - Color199 - Color200 - Color201 - Color202 - Color203 - Color204 - Color205 - Color206 - Color207 - Color208 - Color209 - Color210 - Color211 - Color212 - Color213 - Color214 - Color215 - Color216 - Color217 - Color218 - Color219 - Color220 - Color221 - Color222 - Color223 - Color224 - Color225 - Color226 - Color227 - Color228 - Color229 - Color230 - Color231 - Color232 - Color233 - Color234 - Color235 - Color236 - Color237 - Color238 - Color239 - Color240 - Color241 - Color242 - Color243 - Color244 - Color245 - Color246 - Color247 - Color248 - Color249 - Color250 - Color251 - Color252 - Color253 - Color254 - Color255 - ColorAliceBlue = ColorIsRGB | ColorValid | 0xF0F8FF - ColorAntiqueWhite = ColorIsRGB | ColorValid | 0xFAEBD7 - ColorAquaMarine = ColorIsRGB | ColorValid | 0x7FFFD4 - ColorAzure = ColorIsRGB | ColorValid | 0xF0FFFF - ColorBeige = ColorIsRGB | ColorValid | 0xF5F5DC - ColorBisque = ColorIsRGB | ColorValid | 0xFFE4C4 - ColorBlanchedAlmond = ColorIsRGB | ColorValid | 0xFFEBCD - ColorBlueViolet = ColorIsRGB | ColorValid | 0x8A2BE2 - ColorBrown = ColorIsRGB | ColorValid | 0xA52A2A - ColorBurlyWood = ColorIsRGB | ColorValid | 0xDEB887 - ColorCadetBlue = ColorIsRGB | ColorValid | 0x5F9EA0 - ColorChartreuse = ColorIsRGB | ColorValid | 0x7FFF00 - ColorChocolate = ColorIsRGB | ColorValid | 0xD2691E - ColorCoral = ColorIsRGB | ColorValid | 0xFF7F50 - ColorCornflowerBlue = ColorIsRGB | ColorValid | 0x6495ED - ColorCornsilk = ColorIsRGB | ColorValid | 0xFFF8DC - ColorCrimson = ColorIsRGB | ColorValid | 0xDC143C - ColorDarkBlue = ColorIsRGB | ColorValid | 0x00008B - ColorDarkCyan = ColorIsRGB | ColorValid | 0x008B8B - ColorDarkGoldenrod = ColorIsRGB | ColorValid | 0xB8860B - ColorDarkGray = ColorIsRGB | ColorValid | 0xA9A9A9 - ColorDarkGreen = ColorIsRGB | ColorValid | 0x006400 - ColorDarkKhaki = ColorIsRGB | ColorValid | 0xBDB76B - ColorDarkMagenta = ColorIsRGB | ColorValid | 0x8B008B - ColorDarkOliveGreen = ColorIsRGB | ColorValid | 0x556B2F - ColorDarkOrange = ColorIsRGB | ColorValid | 0xFF8C00 - ColorDarkOrchid = ColorIsRGB | ColorValid | 0x9932CC - ColorDarkRed = ColorIsRGB | ColorValid | 0x8B0000 - ColorDarkSalmon = ColorIsRGB | ColorValid | 0xE9967A - ColorDarkSeaGreen = ColorIsRGB | ColorValid | 0x8FBC8F - ColorDarkSlateBlue = ColorIsRGB | ColorValid | 0x483D8B - ColorDarkSlateGray = ColorIsRGB | ColorValid | 0x2F4F4F - ColorDarkTurquoise = ColorIsRGB | ColorValid | 0x00CED1 - ColorDarkViolet = ColorIsRGB | ColorValid | 0x9400D3 - ColorDeepPink = ColorIsRGB | ColorValid | 0xFF1493 - ColorDeepSkyBlue = ColorIsRGB | ColorValid | 0x00BFFF - ColorDimGray = ColorIsRGB | ColorValid | 0x696969 - ColorDodgerBlue = ColorIsRGB | ColorValid | 0x1E90FF - ColorFireBrick = ColorIsRGB | ColorValid | 0xB22222 - ColorFloralWhite = ColorIsRGB | ColorValid | 0xFFFAF0 - ColorForestGreen = ColorIsRGB | ColorValid | 0x228B22 - ColorGainsboro = ColorIsRGB | ColorValid | 0xDCDCDC - ColorGhostWhite = ColorIsRGB | ColorValid | 0xF8F8FF - ColorGold = ColorIsRGB | ColorValid | 0xFFD700 - ColorGoldenrod = ColorIsRGB | ColorValid | 0xDAA520 - ColorGreenYellow = ColorIsRGB | ColorValid | 0xADFF2F - ColorHoneydew = ColorIsRGB | ColorValid | 0xF0FFF0 - ColorHotPink = ColorIsRGB | ColorValid | 0xFF69B4 - ColorIndianRed = ColorIsRGB | ColorValid | 0xCD5C5C - ColorIndigo = ColorIsRGB | ColorValid | 0x4B0082 - ColorIvory = ColorIsRGB | ColorValid | 0xFFFFF0 - ColorKhaki = ColorIsRGB | ColorValid | 0xF0E68C - ColorLavender = ColorIsRGB | ColorValid | 0xE6E6FA - ColorLavenderBlush = ColorIsRGB | ColorValid | 0xFFF0F5 - ColorLawnGreen = ColorIsRGB | ColorValid | 0x7CFC00 - ColorLemonChiffon = ColorIsRGB | ColorValid | 0xFFFACD - ColorLightBlue = ColorIsRGB | ColorValid | 0xADD8E6 - ColorLightCoral = ColorIsRGB | ColorValid | 0xF08080 - ColorLightCyan = ColorIsRGB | ColorValid | 0xE0FFFF - ColorLightGoldenrodYellow = ColorIsRGB | ColorValid | 0xFAFAD2 - ColorLightGray = ColorIsRGB | ColorValid | 0xD3D3D3 - ColorLightGreen = ColorIsRGB | ColorValid | 0x90EE90 - ColorLightPink = ColorIsRGB | ColorValid | 0xFFB6C1 - ColorLightSalmon = ColorIsRGB | ColorValid | 0xFFA07A - ColorLightSeaGreen = ColorIsRGB | ColorValid | 0x20B2AA - ColorLightSkyBlue = ColorIsRGB | ColorValid | 0x87CEFA - ColorLightSlateGray = ColorIsRGB | ColorValid | 0x778899 - ColorLightSteelBlue = ColorIsRGB | ColorValid | 0xB0C4DE - ColorLightYellow = ColorIsRGB | ColorValid | 0xFFFFE0 - ColorLimeGreen = ColorIsRGB | ColorValid | 0x32CD32 - ColorLinen = ColorIsRGB | ColorValid | 0xFAF0E6 - ColorMediumAquamarine = ColorIsRGB | ColorValid | 0x66CDAA - ColorMediumBlue = ColorIsRGB | ColorValid | 0x0000CD - ColorMediumOrchid = ColorIsRGB | ColorValid | 0xBA55D3 - ColorMediumPurple = ColorIsRGB | ColorValid | 0x9370DB - ColorMediumSeaGreen = ColorIsRGB | ColorValid | 0x3CB371 - ColorMediumSlateBlue = ColorIsRGB | ColorValid | 0x7B68EE - ColorMediumSpringGreen = ColorIsRGB | ColorValid | 0x00FA9A - ColorMediumTurquoise = ColorIsRGB | ColorValid | 0x48D1CC - ColorMediumVioletRed = ColorIsRGB | ColorValid | 0xC71585 - ColorMidnightBlue = ColorIsRGB | ColorValid | 0x191970 - ColorMintCream = ColorIsRGB | ColorValid | 0xF5FFFA - ColorMistyRose = ColorIsRGB | ColorValid | 0xFFE4E1 - ColorMoccasin = ColorIsRGB | ColorValid | 0xFFE4B5 - ColorNavajoWhite = ColorIsRGB | ColorValid | 0xFFDEAD - ColorOldLace = ColorIsRGB | ColorValid | 0xFDF5E6 - ColorOliveDrab = ColorIsRGB | ColorValid | 0x6B8E23 - ColorOrange = ColorIsRGB | ColorValid | 0xFFA500 - ColorOrangeRed = ColorIsRGB | ColorValid | 0xFF4500 - ColorOrchid = ColorIsRGB | ColorValid | 0xDA70D6 - ColorPaleGoldenrod = ColorIsRGB | ColorValid | 0xEEE8AA - ColorPaleGreen = ColorIsRGB | ColorValid | 0x98FB98 - ColorPaleTurquoise = ColorIsRGB | ColorValid | 0xAFEEEE - ColorPaleVioletRed = ColorIsRGB | ColorValid | 0xDB7093 - ColorPapayaWhip = ColorIsRGB | ColorValid | 0xFFEFD5 - ColorPeachPuff = ColorIsRGB | ColorValid | 0xFFDAB9 - ColorPeru = ColorIsRGB | ColorValid | 0xCD853F - ColorPink = ColorIsRGB | ColorValid | 0xFFC0CB - ColorPlum = ColorIsRGB | ColorValid | 0xDDA0DD - ColorPowderBlue = ColorIsRGB | ColorValid | 0xB0E0E6 - ColorRebeccaPurple = ColorIsRGB | ColorValid | 0x663399 - ColorRosyBrown = ColorIsRGB | ColorValid | 0xBC8F8F - ColorRoyalBlue = ColorIsRGB | ColorValid | 0x4169E1 - ColorSaddleBrown = ColorIsRGB | ColorValid | 0x8B4513 - ColorSalmon = ColorIsRGB | ColorValid | 0xFA8072 - ColorSandyBrown = ColorIsRGB | ColorValid | 0xF4A460 - ColorSeaGreen = ColorIsRGB | ColorValid | 0x2E8B57 - ColorSeashell = ColorIsRGB | ColorValid | 0xFFF5EE - ColorSienna = ColorIsRGB | ColorValid | 0xA0522D - ColorSkyblue = ColorIsRGB | ColorValid | 0x87CEEB - ColorSlateBlue = ColorIsRGB | ColorValid | 0x6A5ACD - ColorSlateGray = ColorIsRGB | ColorValid | 0x708090 - ColorSnow = ColorIsRGB | ColorValid | 0xFFFAFA - ColorSpringGreen = ColorIsRGB | ColorValid | 0x00FF7F - ColorSteelBlue = ColorIsRGB | ColorValid | 0x4682B4 - ColorTan = ColorIsRGB | ColorValid | 0xD2B48C - ColorThistle = ColorIsRGB | ColorValid | 0xD8BFD8 - ColorTomato = ColorIsRGB | ColorValid | 0xFF6347 - ColorTurquoise = ColorIsRGB | ColorValid | 0x40E0D0 - ColorViolet = ColorIsRGB | ColorValid | 0xEE82EE - ColorWheat = ColorIsRGB | ColorValid | 0xF5DEB3 - ColorWhiteSmoke = ColorIsRGB | ColorValid | 0xF5F5F5 - ColorYellowGreen = ColorIsRGB | ColorValid | 0x9ACD32 -) - -// These are aliases for the color gray, because some of us spell -// it as grey. -const ( - ColorGrey = ColorGray - ColorDimGrey = ColorDimGray - ColorDarkGrey = ColorDarkGray - ColorDarkSlateGrey = ColorDarkSlateGray - ColorLightGrey = ColorLightGray - ColorLightSlateGrey = ColorLightSlateGray - ColorSlateGrey = ColorSlateGray -) - -// ColorValues maps color constants to their RGB values. -var ColorValues = map[Color]int32{ - ColorBlack: 0x000000, - ColorMaroon: 0x800000, - ColorGreen: 0x008000, - ColorOlive: 0x808000, - ColorNavy: 0x000080, - ColorPurple: 0x800080, - ColorTeal: 0x008080, - ColorSilver: 0xC0C0C0, - ColorGray: 0x808080, - ColorRed: 0xFF0000, - ColorLime: 0x00FF00, - ColorYellow: 0xFFFF00, - ColorBlue: 0x0000FF, - ColorFuchsia: 0xFF00FF, - ColorAqua: 0x00FFFF, - ColorWhite: 0xFFFFFF, - Color16: 0x000000, // black - Color17: 0x00005F, - Color18: 0x000087, - Color19: 0x0000AF, - Color20: 0x0000D7, - Color21: 0x0000FF, // blue - Color22: 0x005F00, - Color23: 0x005F5F, - Color24: 0x005F87, - Color25: 0x005FAF, - Color26: 0x005FD7, - Color27: 0x005FFF, - Color28: 0x008700, - Color29: 0x00875F, - Color30: 0x008787, - Color31: 0x0087Af, - Color32: 0x0087D7, - Color33: 0x0087FF, - Color34: 0x00AF00, - Color35: 0x00AF5F, - Color36: 0x00AF87, - Color37: 0x00AFAF, - Color38: 0x00AFD7, - Color39: 0x00AFFF, - Color40: 0x00D700, - Color41: 0x00D75F, - Color42: 0x00D787, - Color43: 0x00D7AF, - Color44: 0x00D7D7, - Color45: 0x00D7FF, - Color46: 0x00FF00, // lime - Color47: 0x00FF5F, - Color48: 0x00FF87, - Color49: 0x00FFAF, - Color50: 0x00FFd7, - Color51: 0x00FFFF, // aqua - Color52: 0x5F0000, - Color53: 0x5F005F, - Color54: 0x5F0087, - Color55: 0x5F00AF, - Color56: 0x5F00D7, - Color57: 0x5F00FF, - Color58: 0x5F5F00, - Color59: 0x5F5F5F, - Color60: 0x5F5F87, - Color61: 0x5F5FAF, - Color62: 0x5F5FD7, - Color63: 0x5F5FFF, - Color64: 0x5F8700, - Color65: 0x5F875F, - Color66: 0x5F8787, - Color67: 0x5F87AF, - Color68: 0x5F87D7, - Color69: 0x5F87FF, - Color70: 0x5FAF00, - Color71: 0x5FAF5F, - Color72: 0x5FAF87, - Color73: 0x5FAFAF, - Color74: 0x5FAFD7, - Color75: 0x5FAFFF, - Color76: 0x5FD700, - Color77: 0x5FD75F, - Color78: 0x5FD787, - Color79: 0x5FD7AF, - Color80: 0x5FD7D7, - Color81: 0x5FD7FF, - Color82: 0x5FFF00, - Color83: 0x5FFF5F, - Color84: 0x5FFF87, - Color85: 0x5FFFAF, - Color86: 0x5FFFD7, - Color87: 0x5FFFFF, - Color88: 0x870000, - Color89: 0x87005F, - Color90: 0x870087, - Color91: 0x8700AF, - Color92: 0x8700D7, - Color93: 0x8700FF, - Color94: 0x875F00, - Color95: 0x875F5F, - Color96: 0x875F87, - Color97: 0x875FAF, - Color98: 0x875FD7, - Color99: 0x875FFF, - Color100: 0x878700, - Color101: 0x87875F, - Color102: 0x878787, - Color103: 0x8787AF, - Color104: 0x8787D7, - Color105: 0x8787FF, - Color106: 0x87AF00, - Color107: 0x87AF5F, - Color108: 0x87AF87, - Color109: 0x87AFAF, - Color110: 0x87AFD7, - Color111: 0x87AFFF, - Color112: 0x87D700, - Color113: 0x87D75F, - Color114: 0x87D787, - Color115: 0x87D7AF, - Color116: 0x87D7D7, - Color117: 0x87D7FF, - Color118: 0x87FF00, - Color119: 0x87FF5F, - Color120: 0x87FF87, - Color121: 0x87FFAF, - Color122: 0x87FFD7, - Color123: 0x87FFFF, - Color124: 0xAF0000, - Color125: 0xAF005F, - Color126: 0xAF0087, - Color127: 0xAF00AF, - Color128: 0xAF00D7, - Color129: 0xAF00FF, - Color130: 0xAF5F00, - Color131: 0xAF5F5F, - Color132: 0xAF5F87, - Color133: 0xAF5FAF, - Color134: 0xAF5FD7, - Color135: 0xAF5FFF, - Color136: 0xAF8700, - Color137: 0xAF875F, - Color138: 0xAF8787, - Color139: 0xAF87AF, - Color140: 0xAF87D7, - Color141: 0xAF87FF, - Color142: 0xAFAF00, - Color143: 0xAFAF5F, - Color144: 0xAFAF87, - Color145: 0xAFAFAF, - Color146: 0xAFAFD7, - Color147: 0xAFAFFF, - Color148: 0xAFD700, - Color149: 0xAFD75F, - Color150: 0xAFD787, - Color151: 0xAFD7AF, - Color152: 0xAFD7D7, - Color153: 0xAFD7FF, - Color154: 0xAFFF00, - Color155: 0xAFFF5F, - Color156: 0xAFFF87, - Color157: 0xAFFFAF, - Color158: 0xAFFFD7, - Color159: 0xAFFFFF, - Color160: 0xD70000, - Color161: 0xD7005F, - Color162: 0xD70087, - Color163: 0xD700AF, - Color164: 0xD700D7, - Color165: 0xD700FF, - Color166: 0xD75F00, - Color167: 0xD75F5F, - Color168: 0xD75F87, - Color169: 0xD75FAF, - Color170: 0xD75FD7, - Color171: 0xD75FFF, - Color172: 0xD78700, - Color173: 0xD7875F, - Color174: 0xD78787, - Color175: 0xD787AF, - Color176: 0xD787D7, - Color177: 0xD787FF, - Color178: 0xD7AF00, - Color179: 0xD7AF5F, - Color180: 0xD7AF87, - Color181: 0xD7AFAF, - Color182: 0xD7AFD7, - Color183: 0xD7AFFF, - Color184: 0xD7D700, - Color185: 0xD7D75F, - Color186: 0xD7D787, - Color187: 0xD7D7AF, - Color188: 0xD7D7D7, - Color189: 0xD7D7FF, - Color190: 0xD7FF00, - Color191: 0xD7FF5F, - Color192: 0xD7FF87, - Color193: 0xD7FFAF, - Color194: 0xD7FFD7, - Color195: 0xD7FFFF, - Color196: 0xFF0000, // red - Color197: 0xFF005F, - Color198: 0xFF0087, - Color199: 0xFF00AF, - Color200: 0xFF00D7, - Color201: 0xFF00FF, // fuchsia - Color202: 0xFF5F00, - Color203: 0xFF5F5F, - Color204: 0xFF5F87, - Color205: 0xFF5FAF, - Color206: 0xFF5FD7, - Color207: 0xFF5FFF, - Color208: 0xFF8700, - Color209: 0xFF875F, - Color210: 0xFF8787, - Color211: 0xFF87AF, - Color212: 0xFF87D7, - Color213: 0xFF87FF, - Color214: 0xFFAF00, - Color215: 0xFFAF5F, - Color216: 0xFFAF87, - Color217: 0xFFAFAF, - Color218: 0xFFAFD7, - Color219: 0xFFAFFF, - Color220: 0xFFD700, - Color221: 0xFFD75F, - Color222: 0xFFD787, - Color223: 0xFFD7AF, - Color224: 0xFFD7D7, - Color225: 0xFFD7FF, - Color226: 0xFFFF00, // yellow - Color227: 0xFFFF5F, - Color228: 0xFFFF87, - Color229: 0xFFFFAF, - Color230: 0xFFFFD7, - Color231: 0xFFFFFF, // white - Color232: 0x080808, - Color233: 0x121212, - Color234: 0x1C1C1C, - Color235: 0x262626, - Color236: 0x303030, - Color237: 0x3A3A3A, - Color238: 0x444444, - Color239: 0x4E4E4E, - Color240: 0x585858, - Color241: 0x626262, - Color242: 0x6C6C6C, - Color243: 0x767676, - Color244: 0x808080, // grey - Color245: 0x8A8A8A, - Color246: 0x949494, - Color247: 0x9E9E9E, - Color248: 0xA8A8A8, - Color249: 0xB2B2B2, - Color250: 0xBCBCBC, - Color251: 0xC6C6C6, - Color252: 0xD0D0D0, - Color253: 0xDADADA, - Color254: 0xE4E4E4, - Color255: 0xEEEEEE, - ColorAliceBlue: 0xF0F8FF, - ColorAntiqueWhite: 0xFAEBD7, - ColorAquaMarine: 0x7FFFD4, - ColorAzure: 0xF0FFFF, - ColorBeige: 0xF5F5DC, - ColorBisque: 0xFFE4C4, - ColorBlanchedAlmond: 0xFFEBCD, - ColorBlueViolet: 0x8A2BE2, - ColorBrown: 0xA52A2A, - ColorBurlyWood: 0xDEB887, - ColorCadetBlue: 0x5F9EA0, - ColorChartreuse: 0x7FFF00, - ColorChocolate: 0xD2691E, - ColorCoral: 0xFF7F50, - ColorCornflowerBlue: 0x6495ED, - ColorCornsilk: 0xFFF8DC, - ColorCrimson: 0xDC143C, - ColorDarkBlue: 0x00008B, - ColorDarkCyan: 0x008B8B, - ColorDarkGoldenrod: 0xB8860B, - ColorDarkGray: 0xA9A9A9, - ColorDarkGreen: 0x006400, - ColorDarkKhaki: 0xBDB76B, - ColorDarkMagenta: 0x8B008B, - ColorDarkOliveGreen: 0x556B2F, - ColorDarkOrange: 0xFF8C00, - ColorDarkOrchid: 0x9932CC, - ColorDarkRed: 0x8B0000, - ColorDarkSalmon: 0xE9967A, - ColorDarkSeaGreen: 0x8FBC8F, - ColorDarkSlateBlue: 0x483D8B, - ColorDarkSlateGray: 0x2F4F4F, - ColorDarkTurquoise: 0x00CED1, - ColorDarkViolet: 0x9400D3, - ColorDeepPink: 0xFF1493, - ColorDeepSkyBlue: 0x00BFFF, - ColorDimGray: 0x696969, - ColorDodgerBlue: 0x1E90FF, - ColorFireBrick: 0xB22222, - ColorFloralWhite: 0xFFFAF0, - ColorForestGreen: 0x228B22, - ColorGainsboro: 0xDCDCDC, - ColorGhostWhite: 0xF8F8FF, - ColorGold: 0xFFD700, - ColorGoldenrod: 0xDAA520, - ColorGreenYellow: 0xADFF2F, - ColorHoneydew: 0xF0FFF0, - ColorHotPink: 0xFF69B4, - ColorIndianRed: 0xCD5C5C, - ColorIndigo: 0x4B0082, - ColorIvory: 0xFFFFF0, - ColorKhaki: 0xF0E68C, - ColorLavender: 0xE6E6FA, - ColorLavenderBlush: 0xFFF0F5, - ColorLawnGreen: 0x7CFC00, - ColorLemonChiffon: 0xFFFACD, - ColorLightBlue: 0xADD8E6, - ColorLightCoral: 0xF08080, - ColorLightCyan: 0xE0FFFF, - ColorLightGoldenrodYellow: 0xFAFAD2, - ColorLightGray: 0xD3D3D3, - ColorLightGreen: 0x90EE90, - ColorLightPink: 0xFFB6C1, - ColorLightSalmon: 0xFFA07A, - ColorLightSeaGreen: 0x20B2AA, - ColorLightSkyBlue: 0x87CEFA, - ColorLightSlateGray: 0x778899, - ColorLightSteelBlue: 0xB0C4DE, - ColorLightYellow: 0xFFFFE0, - ColorLimeGreen: 0x32CD32, - ColorLinen: 0xFAF0E6, - ColorMediumAquamarine: 0x66CDAA, - ColorMediumBlue: 0x0000CD, - ColorMediumOrchid: 0xBA55D3, - ColorMediumPurple: 0x9370DB, - ColorMediumSeaGreen: 0x3CB371, - ColorMediumSlateBlue: 0x7B68EE, - ColorMediumSpringGreen: 0x00FA9A, - ColorMediumTurquoise: 0x48D1CC, - ColorMediumVioletRed: 0xC71585, - ColorMidnightBlue: 0x191970, - ColorMintCream: 0xF5FFFA, - ColorMistyRose: 0xFFE4E1, - ColorMoccasin: 0xFFE4B5, - ColorNavajoWhite: 0xFFDEAD, - ColorOldLace: 0xFDF5E6, - ColorOliveDrab: 0x6B8E23, - ColorOrange: 0xFFA500, - ColorOrangeRed: 0xFF4500, - ColorOrchid: 0xDA70D6, - ColorPaleGoldenrod: 0xEEE8AA, - ColorPaleGreen: 0x98FB98, - ColorPaleTurquoise: 0xAFEEEE, - ColorPaleVioletRed: 0xDB7093, - ColorPapayaWhip: 0xFFEFD5, - ColorPeachPuff: 0xFFDAB9, - ColorPeru: 0xCD853F, - ColorPink: 0xFFC0CB, - ColorPlum: 0xDDA0DD, - ColorPowderBlue: 0xB0E0E6, - ColorRebeccaPurple: 0x663399, - ColorRosyBrown: 0xBC8F8F, - ColorRoyalBlue: 0x4169E1, - ColorSaddleBrown: 0x8B4513, - ColorSalmon: 0xFA8072, - ColorSandyBrown: 0xF4A460, - ColorSeaGreen: 0x2E8B57, - ColorSeashell: 0xFFF5EE, - ColorSienna: 0xA0522D, - ColorSkyblue: 0x87CEEB, - ColorSlateBlue: 0x6A5ACD, - ColorSlateGray: 0x708090, - ColorSnow: 0xFFFAFA, - ColorSpringGreen: 0x00FF7F, - ColorSteelBlue: 0x4682B4, - ColorTan: 0xD2B48C, - ColorThistle: 0xD8BFD8, - ColorTomato: 0xFF6347, - ColorTurquoise: 0x40E0D0, - ColorViolet: 0xEE82EE, - ColorWheat: 0xF5DEB3, - ColorWhiteSmoke: 0xF5F5F5, - ColorYellowGreen: 0x9ACD32, -} - -// Special colors. -const ( - // ColorReset is used to indicate that the color should use the - // vanilla terminal colors. (Basically go back to the defaults.) - ColorReset = ColorSpecial | iota - - // ColorNone indicates that we should not change the color from - // whatever is already displayed. This can only be used in limited - // circumstances. - ColorNone -) - -// ColorNames holds the written names of colors. Useful to present a list of -// recognized named colors. -var ColorNames = map[string]Color{ - "black": ColorBlack, - "maroon": ColorMaroon, - "green": ColorGreen, - "olive": ColorOlive, - "navy": ColorNavy, - "purple": ColorPurple, - "teal": ColorTeal, - "silver": ColorSilver, - "gray": ColorGray, - "red": ColorRed, - "lime": ColorLime, - "yellow": ColorYellow, - "blue": ColorBlue, - "fuchsia": ColorFuchsia, - "aqua": ColorAqua, - "white": ColorWhite, - "aliceblue": ColorAliceBlue, - "antiquewhite": ColorAntiqueWhite, - "aquamarine": ColorAquaMarine, - "azure": ColorAzure, - "beige": ColorBeige, - "bisque": ColorBisque, - "blanchedalmond": ColorBlanchedAlmond, - "blueviolet": ColorBlueViolet, - "brown": ColorBrown, - "burlywood": ColorBurlyWood, - "cadetblue": ColorCadetBlue, - "chartreuse": ColorChartreuse, - "chocolate": ColorChocolate, - "coral": ColorCoral, - "cornflowerblue": ColorCornflowerBlue, - "cornsilk": ColorCornsilk, - "crimson": ColorCrimson, - "darkblue": ColorDarkBlue, - "darkcyan": ColorDarkCyan, - "darkgoldenrod": ColorDarkGoldenrod, - "darkgray": ColorDarkGray, - "darkgreen": ColorDarkGreen, - "darkkhaki": ColorDarkKhaki, - "darkmagenta": ColorDarkMagenta, - "darkolivegreen": ColorDarkOliveGreen, - "darkorange": ColorDarkOrange, - "darkorchid": ColorDarkOrchid, - "darkred": ColorDarkRed, - "darksalmon": ColorDarkSalmon, - "darkseagreen": ColorDarkSeaGreen, - "darkslateblue": ColorDarkSlateBlue, - "darkslategray": ColorDarkSlateGray, - "darkturquoise": ColorDarkTurquoise, - "darkviolet": ColorDarkViolet, - "deeppink": ColorDeepPink, - "deepskyblue": ColorDeepSkyBlue, - "dimgray": ColorDimGray, - "dodgerblue": ColorDodgerBlue, - "firebrick": ColorFireBrick, - "floralwhite": ColorFloralWhite, - "forestgreen": ColorForestGreen, - "gainsboro": ColorGainsboro, - "ghostwhite": ColorGhostWhite, - "gold": ColorGold, - "goldenrod": ColorGoldenrod, - "greenyellow": ColorGreenYellow, - "honeydew": ColorHoneydew, - "hotpink": ColorHotPink, - "indianred": ColorIndianRed, - "indigo": ColorIndigo, - "ivory": ColorIvory, - "khaki": ColorKhaki, - "lavender": ColorLavender, - "lavenderblush": ColorLavenderBlush, - "lawngreen": ColorLawnGreen, - "lemonchiffon": ColorLemonChiffon, - "lightblue": ColorLightBlue, - "lightcoral": ColorLightCoral, - "lightcyan": ColorLightCyan, - "lightgoldenrodyellow": ColorLightGoldenrodYellow, - "lightgray": ColorLightGray, - "lightgreen": ColorLightGreen, - "lightpink": ColorLightPink, - "lightsalmon": ColorLightSalmon, - "lightseagreen": ColorLightSeaGreen, - "lightskyblue": ColorLightSkyBlue, - "lightslategray": ColorLightSlateGray, - "lightsteelblue": ColorLightSteelBlue, - "lightyellow": ColorLightYellow, - "limegreen": ColorLimeGreen, - "linen": ColorLinen, - "mediumaquamarine": ColorMediumAquamarine, - "mediumblue": ColorMediumBlue, - "mediumorchid": ColorMediumOrchid, - "mediumpurple": ColorMediumPurple, - "mediumseagreen": ColorMediumSeaGreen, - "mediumslateblue": ColorMediumSlateBlue, - "mediumspringgreen": ColorMediumSpringGreen, - "mediumturquoise": ColorMediumTurquoise, - "mediumvioletred": ColorMediumVioletRed, - "midnightblue": ColorMidnightBlue, - "mintcream": ColorMintCream, - "mistyrose": ColorMistyRose, - "moccasin": ColorMoccasin, - "navajowhite": ColorNavajoWhite, - "oldlace": ColorOldLace, - "olivedrab": ColorOliveDrab, - "orange": ColorOrange, - "orangered": ColorOrangeRed, - "orchid": ColorOrchid, - "palegoldenrod": ColorPaleGoldenrod, - "palegreen": ColorPaleGreen, - "paleturquoise": ColorPaleTurquoise, - "palevioletred": ColorPaleVioletRed, - "papayawhip": ColorPapayaWhip, - "peachpuff": ColorPeachPuff, - "peru": ColorPeru, - "pink": ColorPink, - "plum": ColorPlum, - "powderblue": ColorPowderBlue, - "rebeccapurple": ColorRebeccaPurple, - "rosybrown": ColorRosyBrown, - "royalblue": ColorRoyalBlue, - "saddlebrown": ColorSaddleBrown, - "salmon": ColorSalmon, - "sandybrown": ColorSandyBrown, - "seagreen": ColorSeaGreen, - "seashell": ColorSeashell, - "sienna": ColorSienna, - "skyblue": ColorSkyblue, - "slateblue": ColorSlateBlue, - "slategray": ColorSlateGray, - "snow": ColorSnow, - "springgreen": ColorSpringGreen, - "steelblue": ColorSteelBlue, - "tan": ColorTan, - "thistle": ColorThistle, - "tomato": ColorTomato, - "turquoise": ColorTurquoise, - "violet": ColorViolet, - "wheat": ColorWheat, - "whitesmoke": ColorWhiteSmoke, - "yellowgreen": ColorYellowGreen, - "grey": ColorGray, - "dimgrey": ColorDimGray, - "darkgrey": ColorDarkGray, - "darkslategrey": ColorDarkSlateGray, - "lightgrey": ColorLightGray, - "lightslategrey": ColorLightSlateGray, - "slategrey": ColorSlateGray, -} - -// Valid indicates the color is a valid value (has been set). -func (c Color) Valid() bool { - return c&ColorValid != 0 -} - -// IsRGB is true if the color is an RGB specific value. -func (c Color) IsRGB() bool { - return c&(ColorValid|ColorIsRGB) == (ColorValid | ColorIsRGB) -} - -// CSS returns the CSS hex string ( #ABCDEF ) if valid -// if not a valid color returns empty string -func (c Color) CSS() string { - if !c.Valid() { - return "" - } - return fmt.Sprintf("#%06X", c.Hex()) -} - -// String implements fmt.Stringer to return either the -// W3C name if it has one or the CSS hex string '#ABCDEF' -func (c Color) String() string { - if !c.Valid() { - switch c { - case ColorNone: - return "none" - case ColorDefault: - return "default" - case ColorReset: - return "reset" - } - return "" - } - return c.Name(true) -} - -// Name returns W3C name or an empty string if no arguments -// if passed true as an argument it will falls back to -// the CSS hex string if no W3C name found '#ABCDEF' -func (c Color) Name(css ...bool) string { - for name, hex := range ColorNames { - if c == hex { - return name - } - } - if len(css) > 0 && css[0] { - return c.CSS() - } - return "" -} - -// Hex returns the color's hexadecimal RGB 24-bit value with each component -// consisting of a single byte, R << 16 | G << 8 | B. If the color -// is unknown or unset, -1 is returned. -func (c Color) Hex() int32 { - if !c.Valid() { - return -1 - } - if c&ColorIsRGB != 0 { - return int32(c & 0xffffff) - } - if v, ok := ColorValues[c]; ok { - return v - } - return -1 -} - -// RGB returns the red, green, and blue components of the color, with -// each component represented as a value 0-255. In the event that the -// color cannot be broken up (not set usually), -1 is returned for each value. -func (c Color) RGB() (int32, int32, int32) { - v := c.Hex() - if v < 0 { - return -1, -1, -1 - } - return (v >> 16) & 0xff, (v >> 8) & 0xff, v & 0xff -} - -// TrueColor returns the true color (RGB) version of the provided color. -// This is useful for ensuring color accuracy when using named colors. -// This will override terminal theme colors. -func (c Color) TrueColor() Color { - if !c.Valid() { - return ColorDefault - } - if c&ColorIsRGB != 0 { - return c | ColorValid - } - return Color(c.Hex()) | ColorIsRGB | ColorValid -} - -// NewRGBColor returns a new color with the given red, green, and blue values. -// Each value must be represented in the range 0-255. -func NewRGBColor(r, g, b int32) Color { - return NewHexColor(((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff)) -} - -// NewHexColor returns a color using the given 24-bit RGB value. -func NewHexColor(v int32) Color { - return ColorIsRGB | Color(v) | ColorValid -} - -// GetColor creates a Color from a color name (W3C name). A hex value may -// be supplied as a string in the format "#ffffff". -func GetColor(name string) Color { - if c, ok := ColorNames[name]; ok { - return c - } - if len(name) == 7 && name[0] == '#' { - if v, e := strconv.ParseInt(name[1:], 16, 32); e == nil { - return NewHexColor(int32(v)) - } - } - return ColorDefault -} - -// PaletteColor creates a color based on the palette index. -func PaletteColor(index int) Color { - return Color(index) | ColorValid -} - -// FromImageColor converts an image/color.Color into tcell.Color. -// The alpha value is dropped, so it should be tracked separately if it is -// needed. -func FromImageColor(imageColor ic.Color) Color { - r, g, b, _ := imageColor.RGBA() - // NOTE image/color.Color RGB values range is [0, 0xFFFF] as uint32 - return NewRGBColor(int32(r>>8), int32(g>>8), int32(b>>8)) -} diff --git a/vendor/github.com/gdamore/tcell/v2/console_stub.go b/vendor/github.com/gdamore/tcell/v2/console_stub.go deleted file mode 100644 index 6ff7e92a0..000000000 --- a/vendor/github.com/gdamore/tcell/v2/console_stub.go +++ /dev/null @@ -1,24 +0,0 @@ -//go:build !windows -// +build !windows - -// Copyright 2015 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -// NewConsoleScreen returns a console based screen. This platform -// doesn't have support for any, so it returns nil and a suitable error. -func NewConsoleScreen() (Screen, error) { - return nil, ErrNoScreen -} diff --git a/vendor/github.com/gdamore/tcell/v2/console_win.go b/vendor/github.com/gdamore/tcell/v2/console_win.go deleted file mode 100644 index 1cfdb8dad..000000000 --- a/vendor/github.com/gdamore/tcell/v2/console_win.go +++ /dev/null @@ -1,1275 +0,0 @@ -//go:build windows -// +build windows - -// Copyright 2025 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -import ( - "errors" - "fmt" - "os" - "strings" - "sync" - "syscall" - "unicode/utf16" - "unsafe" -) - -type cScreen struct { - in syscall.Handle - out syscall.Handle - cancelflag syscall.Handle - scandone chan struct{} - quit chan struct{} - curx int - cury int - style Style - fini bool - truecolor bool - running bool - disableAlt bool // disable the alternate screen - title string - - w int - h int - - oscreen consoleInfo - ocursor cursorInfo - cursorStyle CursorStyle - cursorColor Color - oimode uint32 - oomode uint32 - cells CellBuffer - focusEnable bool - - mouseEnabled bool - wg sync.WaitGroup - eventQ chan Event - stopQ chan struct{} - finiOnce sync.Once - - sync.Mutex -} - -var winLock sync.Mutex - -var winPalette = []Color{ - ColorBlack, - ColorMaroon, - ColorGreen, - ColorNavy, - ColorOlive, - ColorPurple, - ColorTeal, - ColorSilver, - ColorGray, - ColorRed, - ColorLime, - ColorBlue, - ColorYellow, - ColorFuchsia, - ColorAqua, - ColorWhite, -} - -var winColors = map[Color]Color{ - ColorBlack: ColorBlack, - ColorMaroon: ColorMaroon, - ColorGreen: ColorGreen, - ColorNavy: ColorNavy, - ColorOlive: ColorOlive, - ColorPurple: ColorPurple, - ColorTeal: ColorTeal, - ColorSilver: ColorSilver, - ColorGray: ColorGray, - ColorRed: ColorRed, - ColorLime: ColorLime, - ColorBlue: ColorBlue, - ColorYellow: ColorYellow, - ColorFuchsia: ColorFuchsia, - ColorAqua: ColorAqua, - ColorWhite: ColorWhite, -} - -var ( - u32 = syscall.NewLazyDLL("user32.dll") -) - -// We have to bring in the kernel32 and user32 DLLs directly, so we can get -// access to some system calls that the core Go API lacks. -// -// Note that Windows appends some functions with W to indicate that wide -// characters (Unicode) are in use. The documentation refers to them -// without this suffix, as the resolution is made via preprocessor. -var ( - procGetConsoleCursorInfo = k32.NewProc("GetConsoleCursorInfo") - procSetConsoleCursorInfo = k32.NewProc("SetConsoleCursorInfo") - procSetConsoleWindowInfo = k32.NewProc("SetConsoleWindowInfo") - procSetConsoleScreenBufferSize = k32.NewProc("SetConsoleScreenBufferSize") - procSetConsoleTextAttribute = k32.NewProc("SetConsoleTextAttribute") - procGetLargestConsoleWindowSize = k32.NewProc("GetLargestConsoleWindowSize") - procMessageBeep = u32.NewProc("MessageBeep") -) - -const ( - w32Infinite = ^uintptr(0) - w32WaitObject0 = uintptr(0) -) - -const ( - // VT100/XTerm escapes understood by the console - vtShowCursor = "\x1b[?25h" - vtHideCursor = "\x1b[?25l" - vtCursorPos = "\x1b[%d;%dH" // Note that it is Y then X - vtSgr0 = "\x1b[0m" - vtBold = "\x1b[1m" - vtUnderline = "\x1b[4m" - vtBlink = "\x1b[5m" // Not sure if this is processed - vtReverse = "\x1b[7m" - vtSetFg = "\x1b[38;5;%dm" - vtSetBg = "\x1b[48;5;%dm" - vtSetFgRGB = "\x1b[38;2;%d;%d;%dm" // RGB - vtSetBgRGB = "\x1b[48;2;%d;%d;%dm" // RGB - vtCursorDefault = "\x1b[0 q" - vtCursorBlinkingBlock = "\x1b[1 q" - vtCursorSteadyBlock = "\x1b[2 q" - vtCursorBlinkingUnderline = "\x1b[3 q" - vtCursorSteadyUnderline = "\x1b[4 q" - vtCursorBlinkingBar = "\x1b[5 q" - vtCursorSteadyBar = "\x1b[6 q" - vtDisableAm = "\x1b[?7l" - vtEnableAm = "\x1b[?7h" - vtEnterCA = "\x1b[?1049h\x1b[22;0;0t" - vtExitCA = "\x1b[?1049l\x1b[23;0;0t" - vtDoubleUnderline = "\x1b[4:2m" - vtCurlyUnderline = "\x1b[4:3m" - vtDottedUnderline = "\x1b[4:4m" - vtDashedUnderline = "\x1b[4:5m" - vtUnderColor = "\x1b[58:5:%dm" - vtUnderColorRGB = "\x1b[58:2::%d:%d:%dm" - vtUnderColorReset = "\x1b[59m" - vtEnterUrl = "\x1b]8;%s;%s\x1b\\" // NB arg 1 is id, arg 2 is url - vtExitUrl = "\x1b]8;;\x1b\\" - vtCursorColorRGB = "\x1b]12;#%02x%02x%02x\007" - vtCursorColorReset = "\x1b]112\007" - vtSaveTitle = "\x1b[22;2t" - vtRestoreTitle = "\x1b[23;2t" - vtSetTitle = "\x1b]2;%s\x1b\\" -) - -var vtCursorStyles = map[CursorStyle]string{ - CursorStyleDefault: vtCursorDefault, - CursorStyleBlinkingBlock: vtCursorBlinkingBlock, - CursorStyleSteadyBlock: vtCursorSteadyBlock, - CursorStyleBlinkingUnderline: vtCursorBlinkingUnderline, - CursorStyleSteadyUnderline: vtCursorSteadyUnderline, - CursorStyleBlinkingBar: vtCursorBlinkingBar, - CursorStyleSteadyBar: vtCursorSteadyBar, -} - -// NewConsoleScreen returns a Screen for the Windows console associated -// with the current process. The Screen makes use of the Windows Console -// API to display content and read events. -// -// Deprecated: The console API based implementation will be fully replaced -// with the VT based model. Use NewScreen() to get a reasonable screen -// by default. -func NewConsoleScreen() (Screen, error) { - return &baseScreen{screenImpl: &cScreen{}}, nil -} - -func (s *cScreen) Init() error { - s.eventQ = make(chan Event, 10) - s.quit = make(chan struct{}) - s.scandone = make(chan struct{}) - in, e := syscall.Open("CONIN$", syscall.O_RDWR, 0) - if e != nil { - return e - } - s.in = in - out, e := syscall.Open("CONOUT$", syscall.O_RDWR, 0) - if e != nil { - _ = syscall.Close(s.in) - return e - } - s.out = out - - s.truecolor = true - - switch os.Getenv("TCELL_TRUECOLOR") { - case "disable": - s.truecolor = false - case "enable": - s.truecolor = true - } - - s.Lock() - - s.curx = -1 - s.cury = -1 - s.style = StyleDefault - s.getCursorInfo(&s.ocursor) - s.getConsoleInfo(&s.oscreen) - s.getOutMode(&s.oomode) - s.getInMode(&s.oimode) - s.resize() - - s.fini = false - s.setInMode(modeResizeEn | modeExtendFlg) - - switch os.Getenv("TCELL_ALTSCREEN") { - case "enable": - s.disableAlt = false // also the default - case "disable": - s.disableAlt = true - } - s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline) - var om uint32 - s.getOutMode(&om) - if om&modeVtOutput != modeVtOutput { - return errors.New("failed to initialize: VT output not supported?") - } - - s.Unlock() - - return s.engage() -} - -func (s *cScreen) CharacterSet() string { - // We are always UTF-16LE on Windows - return "UTF-16LE" -} - -func (s *cScreen) EnableMouse(...MouseFlags) { - s.Lock() - s.mouseEnabled = true - s.enableMouse(true) - s.Unlock() -} - -func (s *cScreen) DisableMouse() { - s.Lock() - s.mouseEnabled = false - s.enableMouse(false) - s.Unlock() -} - -func (s *cScreen) enableMouse(on bool) { - if on { - s.setInMode(modeResizeEn | modeMouseEn | modeExtendFlg) - } else { - s.setInMode(modeResizeEn | modeExtendFlg) - } -} - -// Windows lacks bracketed paste (for now) - -func (s *cScreen) EnablePaste() {} - -func (s *cScreen) DisablePaste() {} - -func (s *cScreen) EnableFocus() { - s.Lock() - s.focusEnable = true - s.Unlock() -} - -func (s *cScreen) DisableFocus() { - s.Lock() - s.focusEnable = false - s.Unlock() -} - -func (s *cScreen) Fini() { - s.finiOnce.Do(func() { - close(s.quit) - s.disengage() - }) -} - -func (s *cScreen) disengage() { - s.Lock() - if !s.running { - s.Unlock() - return - } - s.running = false - stopQ := s.stopQ - _, _, _ = procSetEvent.Call(uintptr(s.cancelflag)) - close(stopQ) - s.Unlock() - - s.wg.Wait() - - s.emitVtString(vtCursorStyles[CursorStyleDefault]) - s.emitVtString(vtCursorColorReset) - s.emitVtString(vtEnableAm) - if !s.disableAlt { - s.emitVtString(vtRestoreTitle) - s.emitVtString(vtExitCA) - } - s.setCursorInfo(&s.ocursor) - s.setBufferSize(int(s.oscreen.size.x), int(s.oscreen.size.y)) - s.setInMode(s.oimode) - s.setOutMode(s.oomode) - _, _, _ = procSetConsoleTextAttribute.Call( - uintptr(s.out), - uintptr(s.mapStyle(StyleDefault))) -} - -func (s *cScreen) engage() error { - s.Lock() - defer s.Unlock() - if s.running { - return errors.New("already engaged") - } - s.stopQ = make(chan struct{}) - cf, _, e := procCreateEvent.Call( - uintptr(0), - uintptr(1), - uintptr(0), - uintptr(0)) - if cf == uintptr(0) { - return e - } - s.running = true - s.cancelflag = syscall.Handle(cf) - s.enableMouse(s.mouseEnabled) - s.setInMode(modeVtInput | modeResizeEn | modeExtendFlg) - s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline) - if !s.disableAlt { - s.emitVtString(vtSaveTitle) - s.emitVtString(vtEnterCA) - } - s.emitVtString(vtDisableAm) - if s.title != "" { - s.emitVtString(fmt.Sprintf(vtSetTitle, s.title)) - } - - s.clearScreen(s.style) - s.hideCursor() - - s.cells.Invalidate() - s.hideCursor() - s.resize() - s.draw() - s.doCursor() - - s.wg.Add(1) - go s.scanInput(s.stopQ) - return nil -} - -type cursorInfo struct { - size uint32 - visible uint32 -} - -type coord struct { - x int16 - y int16 -} - -func (c coord) uintptr() uintptr { - // little endian, put x first - return uintptr(c.x) | (uintptr(c.y) << 16) -} - -type rect struct { - left int16 - top int16 - right int16 - bottom int16 -} - -func (s *cScreen) emitVtString(vs string) { - esc := utf16.Encode([]rune(vs)) - _ = syscall.WriteConsole(s.out, &esc[0], uint32(len(esc)), nil, nil) -} - -func (s *cScreen) showCursor() { - s.emitVtString(vtShowCursor) - s.emitVtString(vtCursorStyles[s.cursorStyle]) - if s.cursorColor == ColorReset { - s.emitVtString(vtCursorColorReset) - } else if s.cursorColor.Valid() { - r, g, b := s.cursorColor.RGB() - s.emitVtString(fmt.Sprintf(vtCursorColorRGB, r, g, b)) - } -} - -func (s *cScreen) hideCursor() { - s.emitVtString(vtHideCursor) -} - -func (s *cScreen) ShowCursor(x, y int) { - s.Lock() - if !s.fini { - s.curx = x - s.cury = y - } - s.doCursor() - s.Unlock() -} - -func (s *cScreen) SetCursor(cs CursorStyle, cc Color) { - s.Lock() - if !s.fini { - if _, ok := vtCursorStyles[cs]; ok { - s.cursorStyle = cs - s.cursorColor = cc - s.doCursor() - } - } - s.Unlock() -} - -func (s *cScreen) doCursor() { - x, y := s.curx, s.cury - - if x < 0 || y < 0 || x >= s.w || y >= s.h { - s.hideCursor() - } else { - s.setCursorPos(x, y) - s.showCursor() - } -} - -func (s *cScreen) HideCursor() { - s.ShowCursor(-1, -1) -} - -type mouseRecord struct { - x int16 - y int16 - btns uint32 - mod uint32 - flags uint32 -} - -type focusRecord struct { - focused int32 // actually BOOL -} - -const ( - mouseHWheeled uint32 = 0x8 - mouseVWheeled uint32 = 0x4 - // mouseDoubleClick uint32 = 0x2 - // mouseMoved uint32 = 0x1 -) - -type resizeRecord struct { - x int16 - y int16 -} - -type keyRecord struct { - isdown int32 - repeat uint16 - kcode uint16 - scode uint16 - ch uint16 - mod uint32 -} - -const ( - // Constants per Microsoft. We don't put the modifiers - // here. - vkCancel = 0x03 - vkBack = 0x08 // Backspace - vkTab = 0x09 - vkClear = 0x0c - vkReturn = 0x0d - vkPause = 0x13 - vkEscape = 0x1b - vkSpace = 0x20 - vkPrior = 0x21 // PgUp - vkNext = 0x22 // PgDn - vkEnd = 0x23 - vkHome = 0x24 - vkLeft = 0x25 - vkUp = 0x26 - vkRight = 0x27 - vkDown = 0x28 - vkPrint = 0x2a - vkPrtScr = 0x2c - vkInsert = 0x2d - vkDelete = 0x2e - vkHelp = 0x2f - vkF1 = 0x70 - vkF2 = 0x71 - vkF3 = 0x72 - vkF4 = 0x73 - vkF5 = 0x74 - vkF6 = 0x75 - vkF7 = 0x76 - vkF8 = 0x77 - vkF9 = 0x78 - vkF10 = 0x79 - vkF11 = 0x7a - vkF12 = 0x7b - vkF13 = 0x7c - vkF14 = 0x7d - vkF15 = 0x7e - vkF16 = 0x7f - vkF17 = 0x80 - vkF18 = 0x81 - vkF19 = 0x82 - vkF20 = 0x83 - vkF21 = 0x84 - vkF22 = 0x85 - vkF23 = 0x86 - vkF24 = 0x87 -) - -var vkKeys = map[uint16]Key{ - vkCancel: KeyCancel, - vkBack: KeyBackspace, - vkTab: KeyTab, - vkClear: KeyClear, - vkPause: KeyPause, - vkPrint: KeyPrint, - vkPrtScr: KeyPrint, - vkPrior: KeyPgUp, - vkNext: KeyPgDn, - vkReturn: KeyEnter, - vkEnd: KeyEnd, - vkHome: KeyHome, - vkLeft: KeyLeft, - vkUp: KeyUp, - vkRight: KeyRight, - vkDown: KeyDown, - vkInsert: KeyInsert, - vkDelete: KeyDelete, - vkHelp: KeyHelp, - vkEscape: KeyEscape, - vkSpace: ' ', - vkF1: KeyF1, - vkF2: KeyF2, - vkF3: KeyF3, - vkF4: KeyF4, - vkF5: KeyF5, - vkF6: KeyF6, - vkF7: KeyF7, - vkF8: KeyF8, - vkF9: KeyF9, - vkF10: KeyF10, - vkF11: KeyF11, - vkF12: KeyF12, - vkF13: KeyF13, - vkF14: KeyF14, - vkF15: KeyF15, - vkF16: KeyF16, - vkF17: KeyF17, - vkF18: KeyF18, - vkF19: KeyF19, - vkF20: KeyF20, - vkF21: KeyF21, - vkF22: KeyF22, - vkF23: KeyF23, - vkF24: KeyF24, -} - -// NB: All Windows platforms are little endian. We assume this -// never, ever change. The following code is endian safe. and does -// not use unsafe pointers. -func getu32(v []byte) uint32 { - return uint32(v[0]) + (uint32(v[1]) << 8) + (uint32(v[2]) << 16) + (uint32(v[3]) << 24) -} - -func geti32(v []byte) int32 { - return int32(getu32(v)) -} - -func getu16(v []byte) uint16 { - return uint16(v[0]) + (uint16(v[1]) << 8) -} - -func geti16(v []byte) int16 { - return int16(getu16(v)) -} - -// Convert windows dwControlKeyState to modifier mask -func mod2mask(cks uint32, filter_ctrl_alt bool) ModMask { - mm := ModNone - // Left or right control - ctrl := (cks & (0x0008 | 0x0004)) != 0 - // Left or right alt - alt := (cks & (0x0002 | 0x0001)) != 0 - // Filter out ctrl+alt (it means AltGr) - if !filter_ctrl_alt || !(ctrl && alt) { - if ctrl { - mm |= ModCtrl - } - if alt { - mm |= ModAlt - } - } - // Any shift - if (cks & 0x0010) != 0 { - mm |= ModShift - } - return mm -} - -func mrec2btns(mbtns, flags uint32) ButtonMask { - btns := ButtonNone - if mbtns&0x1 != 0 { - btns |= Button1 - } - if mbtns&0x2 != 0 { - btns |= Button2 - } - if mbtns&0x4 != 0 { - btns |= Button3 - } - if mbtns&0x8 != 0 { - btns |= Button4 - } - if mbtns&0x10 != 0 { - btns |= Button5 - } - if mbtns&0x20 != 0 { - btns |= Button6 - } - if mbtns&0x40 != 0 { - btns |= Button7 - } - if mbtns&0x80 != 0 { - btns |= Button8 - } - - if flags&mouseVWheeled != 0 { - if mbtns&0x80000000 == 0 { - btns |= WheelUp - } else { - btns |= WheelDown - } - } - if flags&mouseHWheeled != 0 { - if mbtns&0x80000000 == 0 { - btns |= WheelRight - } else { - btns |= WheelLeft - } - } - return btns -} - -func (s *cScreen) postEvent(ev Event) { - select { - case s.eventQ <- ev: - case <-s.quit: - } -} - -func (s *cScreen) getConsoleInput() error { - // cancelFlag comes first as WaitForMultipleObjects returns the lowest index - // in the event that both events are signalled. - waitObjects := []syscall.Handle{s.cancelflag, s.in} - // As arrays are contiguous in memory, a pointer to the first object is the - // same as a pointer to the array itself. - pWaitObjects := unsafe.Pointer(&waitObjects[0]) - - rv, _, er := procWaitForMultipleObjects.Call( - uintptr(len(waitObjects)), - uintptr(pWaitObjects), - uintptr(0), - w32Infinite) - // WaitForMultipleObjects returns WAIT_OBJECT_0 + the index. - switch rv { - case w32WaitObject0: // s.cancelFlag - return errors.New("cancelled") - case w32WaitObject0 + 1: // s.in - rec := &inputRecord{} - var nrec int32 - rv, _, er := procReadConsoleInput.Call( - uintptr(s.in), - uintptr(unsafe.Pointer(rec)), - uintptr(1), - uintptr(unsafe.Pointer(&nrec))) - if rv == 0 { - return er - } - if nrec != 1 { - return nil - } - switch rec.typ { - case keyEvent: - krec := &keyRecord{} - krec.isdown = geti32(rec.data[0:]) - krec.repeat = getu16(rec.data[4:]) - krec.kcode = getu16(rec.data[6:]) - krec.scode = getu16(rec.data[8:]) - krec.ch = getu16(rec.data[10:]) - krec.mod = getu32(rec.data[12:]) - - if krec.isdown == 0 || krec.repeat < 1 { - // it's a key release event, ignore it - return nil - } - if krec.ch != 0 { - // synthesized key code - for krec.repeat > 0 { - if krec.ch < ' ' && mod2mask(krec.mod, false) == ModCtrl { - krec.ch += '\x60' - } - - // convert shift+tab to backtab - if mod2mask(krec.mod, false) == ModShift && krec.ch == vkTab { - s.postEvent(NewEventKey(KeyBacktab, 0, ModNone)) - } else { - s.postEvent(NewEventKey(KeyRune, rune(krec.ch), mod2mask(krec.mod, true))) - } - krec.repeat-- - } - return nil - } - key := KeyNUL // impossible on Windows - ok := false - if key, ok = vkKeys[krec.kcode]; !ok { - return nil - } - for krec.repeat > 0 { - s.postEvent(NewEventKey(key, rune(krec.ch), mod2mask(krec.mod, false))) - krec.repeat-- - } - - case mouseEvent: - var mrec mouseRecord - mrec.x = geti16(rec.data[0:]) - mrec.y = geti16(rec.data[2:]) - mrec.btns = getu32(rec.data[4:]) - mrec.mod = getu32(rec.data[8:]) - mrec.flags = getu32(rec.data[12:]) - btns := mrec2btns(mrec.btns, mrec.flags) - // we ignore double click, events are delivered normally - s.postEvent(NewEventMouse(int(mrec.x), int(mrec.y), btns, mod2mask(mrec.mod, false))) - - case resizeEvent: - var rrec resizeRecord - rrec.x = geti16(rec.data[0:]) - rrec.y = geti16(rec.data[2:]) - s.postEvent(NewEventResize(int(rrec.x), int(rrec.y))) - - case focusEvent: - var focus focusRecord - focus.focused = geti32(rec.data[0:]) - s.Lock() - enabled := s.focusEnable - s.Unlock() - if enabled { - s.postEvent(NewEventFocus(focus.focused != 0)) - } - - default: - } - default: - return er - } - - return nil -} - -func (s *cScreen) scanInput(stopQ chan struct{}) { - defer s.wg.Done() - for { - select { - case <-stopQ: - return - default: - } - if e := s.getConsoleInput(); e != nil { - return - } - } -} - -func (s *cScreen) Colors() int { - if !s.truecolor { - return 16 - } - return 1 << 24 -} - -var vgaColors = map[Color]uint16{ - ColorBlack: 0, - ColorMaroon: 0x4, - ColorGreen: 0x2, - ColorNavy: 0x1, - ColorOlive: 0x6, - ColorPurple: 0x5, - ColorTeal: 0x3, - ColorSilver: 0x7, - ColorGrey: 0x8, - ColorRed: 0xc, - ColorLime: 0xa, - ColorBlue: 0x9, - ColorYellow: 0xe, - ColorFuchsia: 0xd, - ColorAqua: 0xb, - ColorWhite: 0xf, -} - -// Windows uses RGB signals -func mapColor2RGB(c Color) uint16 { - winLock.Lock() - if v, ok := winColors[c]; ok { - c = v - } else { - v = FindColor(c, winPalette) - winColors[c] = v - c = v - } - winLock.Unlock() - - if vc, ok := vgaColors[c]; ok { - return vc - } - return 0 -} - -// Map a tcell style to Windows attributes -func (s *cScreen) mapStyle(style Style) uint16 { - f, b, a := style.fg, style.bg, style.attrs - fa := s.oscreen.attrs & 0xf - ba := (s.oscreen.attrs) >> 4 & 0xf - if f != ColorDefault && f != ColorReset { - fa = mapColor2RGB(f) - } - if b != ColorDefault && b != ColorReset { - ba = mapColor2RGB(b) - } - var attr uint16 - // We simulate reverse by doing the color swap ourselves. - // Apparently windows cannot really do this except in DBCS - // views. - if a&AttrReverse != 0 { - attr = ba - attr |= fa << 4 - } else { - attr = fa - attr |= ba << 4 - } - if a&AttrBold != 0 { - attr |= 0x8 - } - if a&AttrDim != 0 { - attr &^= 0x8 - } - if a&AttrUnderline != 0 { - // Best effort -- doesn't seem to work though. - attr |= 0x8000 - } - // Blink is unsupported - return attr -} - -func (s *cScreen) makeVtStyle(style Style) string { - esc := &strings.Builder{} - - fg, bg, attrs := style.fg, style.bg, style.attrs - us, uc := style.ulStyle, style.ulColor - - esc.WriteString(vtSgr0) - if attrs&(AttrBold|AttrDim) == AttrBold { - esc.WriteString(vtBold) - } - if attrs&AttrBlink != 0 { - esc.WriteString(vtBlink) - } - if us != UnderlineStyleNone { - if uc == ColorReset { - esc.WriteString(vtUnderColorReset) - } else if uc.IsRGB() { - r, g, b := uc.RGB() - _, _ = fmt.Fprintf(esc, vtUnderColorRGB, int(r), int(g), int(b)) - } else if uc.Valid() { - _, _ = fmt.Fprintf(esc, vtUnderColor, uc&0xff) - } - - esc.WriteString(vtUnderline) - // legacy ConHost does not understand these but Terminal does - switch us { - case UnderlineStyleSolid: - case UnderlineStyleDouble: - esc.WriteString(vtDoubleUnderline) - case UnderlineStyleCurly: - esc.WriteString(vtCurlyUnderline) - case UnderlineStyleDotted: - esc.WriteString(vtDottedUnderline) - case UnderlineStyleDashed: - esc.WriteString(vtDashedUnderline) - } - } - - if attrs&AttrReverse != 0 { - esc.WriteString(vtReverse) - } - if fg.IsRGB() { - r, g, b := fg.RGB() - _, _ = fmt.Fprintf(esc, vtSetFgRGB, r, g, b) - } else if fg.Valid() { - _, _ = fmt.Fprintf(esc, vtSetFg, fg&0xff) - } - if bg.IsRGB() { - r, g, b := bg.RGB() - _, _ = fmt.Fprintf(esc, vtSetBgRGB, r, g, b) - } else if bg.Valid() { - _, _ = fmt.Fprintf(esc, vtSetBg, bg&0xff) - } - // URL string can be long, so don't send it unless we really need to - if style.url != "" { - _, _ = fmt.Fprintf(esc, vtEnterUrl, style.urlId, style.url) - } else { - esc.WriteString(vtExitUrl) - } - - return esc.String() -} - -func (s *cScreen) sendVtStyle(style Style) { - s.emitVtString(s.makeVtStyle(style)) -} - -func (s *cScreen) writeString(x, y int, style Style, vtBuf, ch []uint16) { - // we assume the caller has hidden the cursor - if len(ch) == 0 { - return - } - - vtBuf = append(vtBuf, utf16.Encode([]rune(fmt.Sprintf(vtCursorPos, y+1, x+1)))...) - styleStr := s.makeVtStyle(style) - vtBuf = append(vtBuf, utf16.Encode([]rune(styleStr))...) - vtBuf = append(vtBuf, ch...) - _ = syscall.WriteConsole(s.out, &vtBuf[0], uint32(len(vtBuf)), nil, nil) - vtBuf = vtBuf[:0] -} - -func (s *cScreen) draw() { - // allocate a scratch line bit enough for no combining chars. - // if you have combining characters, you may pay for extra allocations. - buf := make([]uint16, 0, s.w) - var vtBuf []uint16 - wcs := buf[:] - lstyle := styleInvalid - - lx, ly := -1, -1 - ra := make([]rune, 1) - - for y := 0; y < s.h; y++ { - for x := 0; x < s.w; x++ { - mainc, combc, style, width := s.cells.GetContent(x, y) - dirty := s.cells.Dirty(x, y) - if style == StyleDefault { - style = s.style - } - - if !dirty || style != lstyle { - // write out any data queued thus far - // because we are going to skip over some - // cells, or because we need to change styles - s.writeString(lx, ly, lstyle, vtBuf, wcs) - wcs = buf[0:0] - lstyle = StyleDefault - if !dirty { - continue - } - } - if x > s.w-width { - mainc = ' ' - combc = nil - width = 1 - } - if len(wcs) == 0 { - lstyle = style - lx = x - ly = y - } - ra[0] = mainc - wcs = append(wcs, utf16.Encode(ra)...) - if len(combc) != 0 { - wcs = append(wcs, utf16.Encode(combc)...) - } - for dx := 0; dx < width; dx++ { - s.cells.SetDirty(x+dx, y, false) - } - x += width - 1 - } - s.writeString(lx, ly, lstyle, vtBuf, wcs) - wcs = buf[0:0] - lstyle = styleInvalid - } -} - -func (s *cScreen) Show() { - s.Lock() - if !s.fini { - s.hideCursor() - s.resize() - s.draw() - s.doCursor() - } - s.Unlock() -} - -func (s *cScreen) Sync() { - s.Lock() - if !s.fini { - s.cells.Invalidate() - s.hideCursor() - s.resize() - s.draw() - s.doCursor() - } - s.Unlock() -} - -type consoleInfo struct { - size coord - pos coord - attrs uint16 - win rect - maxsz coord -} - -func (s *cScreen) getConsoleInfo(info *consoleInfo) { - _, _, _ = procGetConsoleScreenBufferInfo.Call( - uintptr(s.out), - uintptr(unsafe.Pointer(info))) -} - -func (s *cScreen) getCursorInfo(info *cursorInfo) { - _, _, _ = procGetConsoleCursorInfo.Call( - uintptr(s.out), - uintptr(unsafe.Pointer(info))) -} - -func (s *cScreen) setCursorInfo(info *cursorInfo) { - _, _, _ = procSetConsoleCursorInfo.Call( - uintptr(s.out), - uintptr(unsafe.Pointer(info))) -} - -func (s *cScreen) setCursorPos(x, y int) { - // Note that the string is Y first. Origin is 1,1. - s.emitVtString(fmt.Sprintf(vtCursorPos, y+1, x+1)) -} - -func (s *cScreen) setBufferSize(x, y int) { - _, _, _ = procSetConsoleScreenBufferSize.Call( - uintptr(s.out), - coord{int16(x), int16(y)}.uintptr()) -} - -func (s *cScreen) Size() (int, int) { - s.Lock() - w, h := s.w, s.h - s.Unlock() - - return w, h -} - -func (s *cScreen) SetSize(w, h int) { - xy, _, _ := procGetLargestConsoleWindowSize.Call(uintptr(s.out)) - - // xy is little endian packed - y := int(xy >> 16) - x := int(xy & 0xffff) - - if x == 0 || y == 0 { - return - } - - // This is a hacky workaround for Windows Terminal. - // Essentially Windows Terminal (Windows 11) does not support application - // initiated resizing. To detect this, we look for an extremely large size - // for the maximum width. If it is > 500, then this is almost certainly - // Windows Terminal, and won't support this. (Note that the legacy console - // does support application resizing.) - if x >= 500 { - return - } - - s.setBufferSize(x, y) - r := rect{0, 0, int16(w - 1), int16(h - 1)} - _, _, _ = procSetConsoleWindowInfo.Call( - uintptr(s.out), - uintptr(1), - uintptr(unsafe.Pointer(&r))) - - s.resize() -} - -func (s *cScreen) resize() { - info := consoleInfo{} - s.getConsoleInfo(&info) - - w := int((info.win.right - info.win.left) + 1) - h := int((info.win.bottom - info.win.top) + 1) - - if s.w == w && s.h == h { - return - } - - s.cells.Resize(w, h) - s.w = w - s.h = h - - s.setBufferSize(w, h) - - r := rect{0, 0, int16(w - 1), int16(h - 1)} - _, _, _ = procSetConsoleWindowInfo.Call( - uintptr(s.out), - uintptr(1), - uintptr(unsafe.Pointer(&r))) - select { - case s.eventQ <- NewEventResize(w, h): - default: - } -} - -func (s *cScreen) clearScreen(style Style) { - s.sendVtStyle(style) - row := strings.Repeat(" ", s.w) - for y := 0; y < s.h; y++ { - s.setCursorPos(0, y) - s.emitVtString(row) - } - s.setCursorPos(0, 0) -} - -const ( - // Input modes - modeExtendFlg = uint32(0x0080) - modeMouseEn = uint32(0x0010) - modeResizeEn = uint32(0x0008) - modeVtInput = uint32(0x0200) - // modeCooked = uint32(0x0001) - - // Output modes - modeCookedOut = uint32(0x0001) - modeVtOutput = uint32(0x0004) - modeNoAutoNL = uint32(0x0008) - modeUnderline = uint32(0x0010) // ENABLE_LVB_GRID_WORLDWIDE, needed for underlines - // modeWrapEOL = uint32(0x0002) -) - -func (s *cScreen) setInMode(mode uint32) { - _, _, _ = procSetConsoleMode.Call( - uintptr(s.in), - uintptr(mode)) -} - -func (s *cScreen) setOutMode(mode uint32) { - _, _, _ = procSetConsoleMode.Call( - uintptr(s.out), - uintptr(mode)) -} - -func (s *cScreen) getInMode(v *uint32) { - _, _, _ = procGetConsoleMode.Call( - uintptr(s.in), - uintptr(unsafe.Pointer(v))) -} - -func (s *cScreen) getOutMode(v *uint32) { - _, _, _ = procGetConsoleMode.Call( - uintptr(s.out), - uintptr(unsafe.Pointer(v))) -} - -func (s *cScreen) SetStyle(style Style) { - s.Lock() - s.style = style - s.Unlock() -} - -func (s *cScreen) SetTitle(title string) { - s.Lock() - s.title = title - s.emitVtString(fmt.Sprintf(vtSetTitle, title)) - s.Unlock() -} - -// No fallback rune support, since we have Unicode. Yay! - -func (s *cScreen) RegisterRuneFallback(_ rune, _ string) { -} - -func (s *cScreen) UnregisterRuneFallback(_ rune) { -} - -func (s *cScreen) CanDisplay(_ rune, _ bool) bool { - // We presume we can display anything -- we're Unicode. - // (Sadly this not precisely true. Combining characters are especially - // poorly supported under Windows.) - return true -} - -func (s *cScreen) HasMouse() bool { - return true -} - -func (s *cScreen) SetClipboard(_ []byte) { -} - -func (s *cScreen) GetClipboard() { -} - -func (s *cScreen) Resize(int, int, int, int) {} - -func (s *cScreen) HasKey(_ Key) bool { - return true -} - -func (s *cScreen) Beep() error { - // A simple beep. If the sound card is not available, the sound is generated - // using the speaker. - // - // Reference: - // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-messagebeep - const simpleBeep = 0xffffffff - if rv, _, err := procMessageBeep.Call(simpleBeep); rv == 0 { - return err - } - return nil -} - -func (s *cScreen) Suspend() error { - s.disengage() - return nil -} - -func (s *cScreen) Resume() error { - return s.engage() -} - -func (s *cScreen) Tty() (Tty, bool) { - return nil, false -} - -func (s *cScreen) GetCells() *CellBuffer { - return &s.cells -} - -func (s *cScreen) EventQ() chan Event { - return s.eventQ -} - -func (s *cScreen) StopQ() <-chan struct{} { - return s.quit -} diff --git a/vendor/github.com/gdamore/tcell/v2/doc.go b/vendor/github.com/gdamore/tcell/v2/doc.go deleted file mode 100644 index 690dd27ad..000000000 --- a/vendor/github.com/gdamore/tcell/v2/doc.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2018 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package tcell provides a lower-level, portable API for building -// programs that interact with terminals or consoles. It works with -// both common (and many uncommon!) terminals or terminal emulators, -// and Windows console implementations. -// -// It provides support for up to 256 colors, text attributes, and box drawing -// elements. A database of terminals built from a real terminfo database -// is provided, along with code to generate new database entries. -// -// Tcell offers very rich support for mice, dependent upon the terminal -// of course. (Windows, XTerm, and iTerm 2 are known to work very well.) -// -// If the environment is not Unicode by default, such as an ISO8859 based -// locale or GB18030, Tcell can convert input and output, so that your -// terminal can operate in whatever locale is most convenient, while the -// application program can just assume "everything is UTF-8". Reasonable -// defaults are used for updating characters to something suitable for -// display. Unicode box drawing characters will be converted to use the -// alternate character set of your terminal, if native conversions are -// not available. If no ACS is available, then some ASCII fallbacks will -// be used. -// -// Note that support for non-UTF-8 locales (other than C) must be enabled -// by the application using RegisterEncoding() -- we don't have them all -// enabled by default to avoid bloating the application unnecessarily. -// (These days UTF-8 is good enough for almost everyone, and nobody should -// be using legacy locales anymore.) Also, actual glyphs for various code -// point will only be displayed if your terminal or emulator (or the font -// the emulator is using) supports them. -// -// A rich set of key codes is supported, with support for up to 65 function -// keys, and various other special keys. -package tcell diff --git a/vendor/github.com/gdamore/tcell/v2/input.go b/vendor/github.com/gdamore/tcell/v2/input.go deleted file mode 100644 index d5dbf51a6..000000000 --- a/vendor/github.com/gdamore/tcell/v2/input.go +++ /dev/null @@ -1,928 +0,0 @@ -// Copyright 2025 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file describes a generic VT input processor. It parses key sequences, -// (input bytes) and loads them into events. It expects UTF-8 or UTF-16 as the input -// feed, along with ECMA-48 sequences. The assumption here is that all potential -// key sequences are unambiguous between terminal variants (analysis of extant terminfo -// data appears to support this conjecture). This allows us to implement this once, -// in the most efficient and terminal-agnostic way possible. -// -// There is unfortunately *one* conflict, with aixterm, for CSI-P - which is KeyDelete -// in aixterm, but F1 in others. - -package tcell - -import ( - "encoding/base64" - "os" - "strconv" - "strings" - "sync" - "time" - "unicode/utf16" - "unicode/utf8" -) - -type inpState int - -const ( - inpStateInit = inpState(iota) - inpStateUtf - inpStateEsc - inpStateCsi // control sequence introducer - inpStateOsc // operating system command - inpStateDcs // device control string - inpStateSos // start of string (unused) - inpStatePm // privacy message (unused) - inpStateApc // application program command - inpStateSt // string terminator - inpStateSs2 // single shift 2 - inpStateSs3 // single shift 3 - inpStateLFK // linux F-key (not ECMA-48 compliant - bogus CSI) -) - -type InputProcessor interface { - ScanUTF8([]byte) - ScanUTF16([]uint16) - SetSize(rows, cols int) -} - -func NewInputProcessor(eq chan<- Event) InputProcessor { - return &inputProcessor{ - evch: eq, - buf: make([]rune, 0, 128), - } -} - -type inputProcessor struct { - ut8 []byte - ut16 []uint16 - buf []rune - scratch []byte - csiParams []byte - csiInterm []byte - escaped bool - btnDown bool // mouse button tracking for broken terms - state inpState - strState inpState // saved str state (needed for ST) - timer *time.Timer - expire time.Time - l sync.Mutex - encBuf []rune - evch chan<- Event - rows int // used for clipping mouse coordinates - cols int // used for clipping mouse coordinates - surrogate rune - nested *inputProcessor -} - -func (ip *inputProcessor) SetSize(w, h int) { - if ip.nested != nil { - ip.nested.SetSize(w, h) - return - } - go func() { - ip.l.Lock() - ip.rows = h - ip.cols = w - ip.post(NewEventResize(w, h)) - ip.l.Unlock() - }() -} -func (ip *inputProcessor) post(ev Event) { - if ip.escaped { - ip.escaped = false - if ke, ok := ev.(*EventKey); ok { - ev = NewEventKey(ke.Key(), ke.Rune(), ke.Modifiers()|ModAlt) - } - } else if ke, ok := ev.(*EventKey); ok { - switch ke.Key() { - case keyPasteStart: - ev = NewEventPaste(true) - case keyPasteEnd: - ev = NewEventPaste(false) - } - } - - ip.evch <- ev -} - -func (ip *inputProcessor) escTimeout() { - ip.l.Lock() - defer ip.l.Unlock() - if ip.state == inpStateEsc && ip.expire.Before(time.Now()) { - // post it - ip.state = inpStateInit - ip.escaped = false - ip.post(NewEventKey(KeyEsc, 0, ModNone)) - } -} - -type csiParamMode struct { - M rune // Mode - P int // Parameter (first) -} - -type keyMap struct { - Key Key - Mod ModMask - Rune rune -} - -var csiAllKeys = map[csiParamMode]keyMap{ - {M: 'A'}: {Key: KeyUp}, - {M: 'B'}: {Key: KeyDown}, - {M: 'C'}: {Key: KeyRight}, - {M: 'D'}: {Key: KeyLeft}, - {M: 'F'}: {Key: KeyEnd}, - {M: 'H'}: {Key: KeyHome}, - {M: 'L'}: {Key: KeyInsert}, - {M: 'P'}: {Key: KeyF1}, // except for aixterm, where this is Delete - {M: 'Q'}: {Key: KeyF2}, - {M: 'S'}: {Key: KeyF4}, - {M: 'Z'}: {Key: KeyBacktab}, - {M: 'a'}: {Key: KeyUp, Mod: ModShift}, - {M: 'b'}: {Key: KeyDown, Mod: ModShift}, - {M: 'c'}: {Key: KeyRight, Mod: ModShift}, - {M: 'd'}: {Key: KeyLeft, Mod: ModShift}, - {M: 'q', P: 1}: {Key: KeyF1}, // all these 'q' are for aixterm - {M: 'q', P: 2}: {Key: KeyF2}, - {M: 'q', P: 3}: {Key: KeyF3}, - {M: 'q', P: 4}: {Key: KeyF4}, - {M: 'q', P: 5}: {Key: KeyF5}, - {M: 'q', P: 6}: {Key: KeyF6}, - {M: 'q', P: 7}: {Key: KeyF7}, - {M: 'q', P: 8}: {Key: KeyF8}, - {M: 'q', P: 9}: {Key: KeyF9}, - {M: 'q', P: 10}: {Key: KeyF10}, - {M: 'q', P: 11}: {Key: KeyF11}, - {M: 'q', P: 12}: {Key: KeyF12}, - {M: 'q', P: 13}: {Key: KeyF13}, - {M: 'q', P: 14}: {Key: KeyF14}, - {M: 'q', P: 15}: {Key: KeyF15}, - {M: 'q', P: 16}: {Key: KeyF16}, - {M: 'q', P: 17}: {Key: KeyF17}, - {M: 'q', P: 18}: {Key: KeyF18}, - {M: 'q', P: 19}: {Key: KeyF19}, - {M: 'q', P: 20}: {Key: KeyF20}, - {M: 'q', P: 21}: {Key: KeyF21}, - {M: 'q', P: 22}: {Key: KeyF22}, - {M: 'q', P: 23}: {Key: KeyF23}, - {M: 'q', P: 24}: {Key: KeyF24}, - {M: 'q', P: 25}: {Key: KeyF25}, - {M: 'q', P: 26}: {Key: KeyF26}, - {M: 'q', P: 27}: {Key: KeyF27}, - {M: 'q', P: 28}: {Key: KeyF28}, - {M: 'q', P: 29}: {Key: KeyF29}, - {M: 'q', P: 30}: {Key: KeyF30}, - {M: 'q', P: 31}: {Key: KeyF31}, - {M: 'q', P: 32}: {Key: KeyF32}, - {M: 'q', P: 33}: {Key: KeyF33}, - {M: 'q', P: 34}: {Key: KeyF34}, - {M: 'q', P: 35}: {Key: KeyF35}, - {M: 'q', P: 36}: {Key: KeyF36}, - {M: 'q', P: 144}: {Key: KeyClear}, - {M: 'q', P: 146}: {Key: KeyEnd}, - {M: 'q', P: 150}: {Key: KeyPgUp}, - {M: 'q', P: 154}: {Key: KeyPgDn}, - {M: 'z', P: 214}: {Key: KeyHome}, - {M: 'z', P: 216}: {Key: KeyPgUp}, - {M: 'z', P: 220}: {Key: KeyEnd}, - {M: 'z', P: 222}: {Key: KeyPgDn}, - {M: 'z', P: 224}: {Key: KeyF1}, - {M: 'z', P: 225}: {Key: KeyF2}, - {M: 'z', P: 226}: {Key: KeyF3}, - {M: 'z', P: 227}: {Key: KeyF4}, - {M: 'z', P: 228}: {Key: KeyF5}, - {M: 'z', P: 229}: {Key: KeyF6}, - {M: 'z', P: 230}: {Key: KeyF7}, - {M: 'z', P: 231}: {Key: KeyF8}, - {M: 'z', P: 232}: {Key: KeyF9}, - {M: 'z', P: 233}: {Key: KeyF10}, - {M: 'z', P: 234}: {Key: KeyF11}, - {M: 'z', P: 235}: {Key: KeyF12}, - {M: 'z', P: 247}: {Key: KeyInsert}, - {M: '^', P: 7}: {Key: KeyHome, Mod: ModCtrl}, - {M: '^', P: 8}: {Key: KeyEnd, Mod: ModCtrl}, - {M: '^', P: 11}: {Key: KeyF23}, - {M: '^', P: 12}: {Key: KeyF24}, - {M: '^', P: 13}: {Key: KeyF25}, - {M: '^', P: 14}: {Key: KeyF26}, - {M: '^', P: 15}: {Key: KeyF27}, - {M: '^', P: 17}: {Key: KeyF28}, // 16 is a gap - {M: '^', P: 18}: {Key: KeyF29}, - {M: '^', P: 19}: {Key: KeyF30}, - {M: '^', P: 20}: {Key: KeyF31}, - {M: '^', P: 21}: {Key: KeyF32}, - {M: '^', P: 23}: {Key: KeyF33}, // 22 is a gap - {M: '^', P: 24}: {Key: KeyF34}, - {M: '^', P: 25}: {Key: KeyF35}, - {M: '^', P: 26}: {Key: KeyF36}, // 27 is a gap - {M: '^', P: 28}: {Key: KeyF37}, - {M: '^', P: 29}: {Key: KeyF38}, // 30 is a gap - {M: '^', P: 31}: {Key: KeyF39}, - {M: '^', P: 32}: {Key: KeyF40}, - {M: '^', P: 33}: {Key: KeyF41}, - {M: '^', P: 34}: {Key: KeyF42}, - {M: '@', P: 23}: {Key: KeyF43}, - {M: '@', P: 24}: {Key: KeyF44}, - {M: '$', P: 2}: {Key: KeyInsert, Mod: ModShift}, - {M: '$', P: 3}: {Key: KeyDelete, Mod: ModShift}, - {M: '$', P: 7}: {Key: KeyHome, Mod: ModShift}, - {M: '$', P: 8}: {Key: KeyEnd, Mod: ModShift}, - {M: '$', P: 23}: {Key: KeyF21}, - {M: '$', P: 24}: {Key: KeyF22}, - {M: '~', P: 1}: {Key: KeyHome}, - {M: '~', P: 2}: {Key: KeyInsert}, - {M: '~', P: 3}: {Key: KeyDelete}, - {M: '~', P: 4}: {Key: KeyEnd}, - {M: '~', P: 5}: {Key: KeyPgUp}, - {M: '~', P: 6}: {Key: KeyPgDn}, - {M: '~', P: 7}: {Key: KeyHome}, - {M: '~', P: 8}: {Key: KeyEnd}, - {M: '~', P: 11}: {Key: KeyF1}, - {M: '~', P: 12}: {Key: KeyF2}, - {M: '~', P: 13}: {Key: KeyF3}, - {M: '~', P: 14}: {Key: KeyF4}, - {M: '~', P: 15}: {Key: KeyF5}, - {M: '~', P: 17}: {Key: KeyF6}, - {M: '~', P: 18}: {Key: KeyF7}, - {M: '~', P: 19}: {Key: KeyF8}, - {M: '~', P: 20}: {Key: KeyF9}, - {M: '~', P: 21}: {Key: KeyF10}, - {M: '~', P: 23}: {Key: KeyF11}, - {M: '~', P: 24}: {Key: KeyF12}, - {M: '~', P: 25}: {Key: KeyF13}, - {M: '~', P: 26}: {Key: KeyF14}, - {M: '~', P: 28}: {Key: KeyF15}, // aka KeyHelp - {M: '~', P: 29}: {Key: KeyF16}, - {M: '~', P: 31}: {Key: KeyF17}, - {M: '~', P: 32}: {Key: KeyF18}, - {M: '~', P: 33}: {Key: KeyF19}, - {M: '~', P: 34}: {Key: KeyF20}, - {M: '~', P: 200}: {Key: keyPasteStart}, - {M: '~', P: 201}: {Key: keyPasteEnd}, -} - -// keys reported using Kitty csi-u protocol -var csiUKeys = map[int]keyMap{ - 27: {Key: KeyESC}, - 9: {Key: KeyTAB}, - 13: {Key: KeyEnter}, - 127: {Key: KeyBS}, - 57358: {Key: KeyCapsLock}, - 57359: {Key: KeyScrollLock}, - 57360: {Key: KeyNumLock}, - 57361: {Key: KeyPrint}, - 57362: {Key: KeyPause}, - 57363: {Key: KeyMenu}, - 57376: {Key: KeyF13}, - 57377: {Key: KeyF14}, - 57378: {Key: KeyF15}, - 57379: {Key: KeyF16}, - 57380: {Key: KeyF17}, - 57381: {Key: KeyF18}, - 57382: {Key: KeyF19}, - 57383: {Key: KeyF20}, - 57384: {Key: KeyF21}, - 57385: {Key: KeyF22}, - 57386: {Key: KeyF23}, - 57387: {Key: KeyF24}, - 57388: {Key: KeyF25}, - 57389: {Key: KeyF26}, - 57390: {Key: KeyF27}, - 57391: {Key: KeyF28}, - 57392: {Key: KeyF29}, - 57393: {Key: KeyF30}, - 57394: {Key: KeyF31}, - 57395: {Key: KeyF32}, - 57396: {Key: KeyF33}, - 57397: {Key: KeyF34}, - 57398: {Key: KeyF35}, - 57399: {Key: KeyRune, Rune: '0'}, // KP 0 - 57400: {Key: KeyRune, Rune: '1'}, // KP 1 - 57401: {Key: KeyRune, Rune: '2'}, // KP 2 - 57402: {Key: KeyRune, Rune: '3'}, // KP 3 - 57403: {Key: KeyRune, Rune: '4'}, // KP 4 - 57404: {Key: KeyRune, Rune: '5'}, // KP 5 - 57405: {Key: KeyRune, Rune: '6'}, // KP 6 - 57406: {Key: KeyRune, Rune: '7'}, // KP 7 - 57407: {Key: KeyRune, Rune: '8'}, // KP 8 - 57408: {Key: KeyRune, Rune: '9'}, // KP 9 - 57409: {Key: KeyRune, Rune: '.'}, // KP_DECIMAL - 57410: {Key: KeyRune, Rune: '/'}, // KP_DIVIDE - 57411: {Key: KeyRune, Rune: '*'}, // KP_MULTIPLY - 57412: {Key: KeyRune, Rune: '-'}, // KP_SUBTRACT - 57413: {Key: KeyRune, Rune: '+'}, // KP_ADD - 57414: {Key: KeyEnter}, // KP_ENTER - 57415: {Key: KeyRune, Rune: '='}, // KP_EQUAL - 57416: {Key: KeyClear}, // KP_SEPARATOR - 57417: {Key: KeyLeft}, // KP_LEFT - 57418: {Key: KeyRight}, // KP_RIGHT - 57419: {Key: KeyUp}, // KP_UP - 57420: {Key: KeyDown}, // KP_DOWN - 57421: {Key: KeyPgUp}, // KP_PG_UP - 57422: {Key: KeyPgDn}, // KP_PG_DN - 57423: {Key: KeyHome}, // KP_HOME - 57424: {Key: KeyEnd}, // KP_END - 57425: {Key: KeyInsert}, // KP_INSERT - 57426: {Key: KeyDelete}, // KP_DELETE - // 57427: {Key: KeyBegin}, // KP_BEGIN - - // TODO: Media keys -} - -// windows virtual key codes per microsoft -var winKeys = map[int]Key{ - 0x03: KeyCancel, // vkCancel - 0x08: KeyBackspace, // vkBackspace - 0x09: KeyTab, // vkTab - 0x0c: KeyClear, // vClear - 0x0d: KeyEnter, // vkReturn - 0x13: KeyPause, // vkPause - 0x1b: KeyEscape, // vkEscape - 0x21: KeyPgUp, // vkPrior - 0x22: KeyPgDn, // vkNext - 0x23: KeyEnd, // vkEnd - 0x24: KeyHome, // vkHome - 0x25: KeyLeft, // vkLeft - 0x26: KeyUp, // vkUp - 0x27: KeyRight, // vkRight - 0x28: KeyDown, // vkDown - 0x2a: KeyPrint, // vkPrint - 0x2c: KeyPrint, // vkPrtScr - 0x2d: KeyInsert, // vkInsert - 0x2e: KeyDelete, // vkDelete - 0x2f: KeyHelp, // vkHelp - 0x70: KeyF1, // vkF1 - 0x71: KeyF2, // vkF2 - 0x72: KeyF3, // vkF3 - 0x73: KeyF4, // vkF4 - 0x74: KeyF5, // vkF5 - 0x75: KeyF6, // vkF6 - 0x76: KeyF7, // vkF7 - 0x77: KeyF8, // vkF8 - 0x78: KeyF9, // vkF9 - 0x79: KeyF10, // vkF10 - 0x7a: KeyF11, // vkF11 - 0x7b: KeyF12, // vkF12 - 0x7c: KeyF13, // vkF13 - 0x7d: KeyF14, // vkF14 - 0x7e: KeyF15, // vkF15 - 0x7f: KeyF16, // vkF16 - 0x80: KeyF17, // vkF17 - 0x81: KeyF18, // vkF18 - 0x82: KeyF19, // vkF19 - 0x83: KeyF20, // vkF20 - 0x84: KeyF21, // vkF21 - 0x85: KeyF22, // vkF22 - 0x86: KeyF23, // vkF23 - 0x87: KeyF24, // vkF24 -} - -// keys by their SS3 - used in application mode usually (legacy VT-style) -var ss3Keys = map[rune]Key{ - 'A': KeyUp, - 'B': KeyDown, - 'C': KeyRight, - 'D': KeyLeft, - 'F': KeyEnd, - 'H': KeyHome, - 'P': KeyF1, - 'Q': KeyF2, - 'R': KeyF3, - 'S': KeyF4, - 't': KeyF5, - 'u': KeyF6, - 'v': KeyF7, - 'l': KeyF8, - 'w': KeyF9, - 'x': KeyF10, -} - -// linux terminal uses these non ECMA keys prefixed by CSI-[ -var linuxFKeys = map[rune]Key{ - 'A': KeyF1, - 'B': KeyF2, - 'C': KeyF3, - 'D': KeyF4, - 'E': KeyF5, -} - -func (ip *inputProcessor) scan() { - for _, r := range ip.buf { - ip.buf = ip.buf[1:] - if r > 0x7F { - // 8-bit extended Unicode we just treat as such - this will swallow anything else queued up - ip.state = inpStateInit - ip.post(NewEventKey(KeyRune, r, ModNone)) - continue - } - switch ip.state { - case inpStateInit: - switch r { - case '\x1b': - // escape.. pending - ip.state = inpStateEsc - if len(ip.buf) == 0 && ip.nested == nil { - ip.expire = time.Now().Add(time.Millisecond * 50) - ip.timer = time.AfterFunc(time.Millisecond*60, ip.escTimeout) - } - case '\t': - ip.post(NewEventKey(KeyTab, 0, ModNone)) - case '\b', '\x7F': - ip.post(NewEventKey(KeyBackspace, 0, ModNone)) - case '\r': - ip.post(NewEventKey(KeyEnter, 0, ModNone)) - default: - // Control keys - legacy handling - if r < ' ' { - ip.post(NewEventKey(KeyCtrlSpace+Key(r), 0, ModCtrl)) - } else { - ip.post(NewEventKey(KeyRune, r, ModNone)) - } - } - case inpStateEsc: - switch r { - case '[': - ip.state = inpStateCsi - ip.csiInterm = nil - ip.csiParams = nil - case ']': - ip.state = inpStateOsc - ip.scratch = nil - case 'N': - ip.state = inpStateSs2 // no known uses - ip.scratch = nil - case 'O': - ip.state = inpStateSs3 - ip.scratch = nil - case 'X': - ip.state = inpStateSos - ip.scratch = nil - case '^': - ip.state = inpStatePm - ip.scratch = nil - case '_': - ip.state = inpStateApc - ip.scratch = nil - case '\\': - // string terminator reached, (orphaned?) - ip.state = inpStateInit - case '\t': - // Linux console only, does not conform to ECMA - ip.state = inpStateInit - ip.post(NewEventKey(KeyBacktab, 0, ModNone)) - default: - if r == '\x1b' { - // leading ESC to capture alt - ip.escaped = true - } else { - // treat as alt-key ... legacy emulators only (no CSI-u or other) - ip.state = inpStateInit - mod := ModAlt - if r < ' ' { - mod |= ModCtrl - r += 0x60 - } - ip.post(NewEventKey(KeyRune, r, mod)) - } - } - case inpStateCsi: - // usual case for incoming keys - if r >= 0x30 && r <= 0x3F { // parameter bytes - ip.csiParams = append(ip.csiParams, byte(r)) - } else if r >= 0x20 && r <= 0x2F { // intermediate bytes, rarely used - ip.csiInterm = append(ip.csiInterm, byte(r)) - } else if r >= 0x40 && r <= 0x7F { // final byte - ip.handleCsi(r, ip.csiParams, ip.csiInterm) - } else { - // bad parse, just swallow it all - ip.state = inpStateInit - } - case inpStateSs2: - // No known uses for SS2 - ip.state = inpStateInit - - case inpStateSs3: // typically application mode keys or older terminals - ip.state = inpStateInit - if k, ok := ss3Keys[r]; ok { - ip.post(NewEventKey(k, 0, ModNone)) - } - - case inpStatePm, inpStateApc, inpStateSos, inpStateDcs: // these we just eat - switch r { - case '\x1b': - ip.strState = ip.state - ip.state = inpStateSt - case '\x07': // bell - some send this instead of ST - ip.state = inpStateInit - } - - case inpStateOsc: // not sure if used - switch r { - case '\x1b': - ip.strState = ip.state - ip.state = inpStateSt - case '\x07': - ip.handleOsc(string(ip.scratch)) - default: - ip.scratch = append(ip.scratch, byte(r&0x7f)) - } - case inpStateSt: - if r == '\\' || r == '\x07' { - ip.state = inpStateInit - switch ip.strState { - case inpStateOsc: - ip.handleOsc(string(ip.scratch)) - case inpStatePm, inpStateApc, inpStateSos, inpStateDcs: - ip.state = inpStateInit - } - } else { - ip.scratch = append(ip.scratch, '\x1b', byte(r)) - ip.state = ip.strState - } - case inpStateLFK: - // linux console does not follow ECMA - if k, ok := linuxFKeys[r]; ok { - ip.post(NewEventKey(k, 0, ModNone)) - } - ip.state = inpStateInit - } - } -} - -func (ip *inputProcessor) handleOsc(str string) { - ip.state = inpStateInit - if content, ok := strings.CutPrefix(str, "52;c;"); ok { - decoded := make([]byte, base64.StdEncoding.DecodedLen(len(content))) - if count, err := base64.StdEncoding.Decode(decoded, []byte(content)); err == nil { - ip.post(NewEventClipboard(decoded[:count])) - return - } - } -} - -func calcModifier(n int) ModMask { - n-- - m := ModNone - if n&1 != 0 { - m |= ModShift - } - if n&2 != 0 { - m |= ModAlt - } - if n&4 != 0 { - m |= ModCtrl - } - if n&8 != 0 { - m |= ModMeta // kitty calls this Super - } - if n&16 != 0 { - m |= ModHyper - } - if n&32 != 0 { - m |= ModMeta // for now not separating from Super - } - // Not doing (kitty only): - // caps_lock 0b1000000 (64) - // num_lock 0b10000000 (128) - - return m -} - -// func (ip *inputProcessor) handleMouse(x, y, btn int, down bool) *EventMouse { -func (ip *inputProcessor) handleMouse(mode rune, params []int) { - - // XTerm mouse events only report at most one button at a time, - // which may include a wheel button. Wheel motion events are - // reported as single impulses, while other button events are reported - // as separate press & release events. - if len(params) < 3 { - return - } - btn := params[0] - // Some terminals will report mouse coordinates outside the - // screen, especially with click-drag events. Clip the coordinates - // to the screen in that case. - x := max(min(params[1]-1, ip.cols-1), 0) - y := max(min(params[2]-1, ip.rows-1), 0) - motion := (btn & 0x20) != 0 - scroll := (btn & 0x42) == 0x40 - btn &^= 0x20 - if mode == 'm' { - // mouse release, clear all buttons - btn |= 3 - btn &^= 0x40 - ip.btnDown = false - } else if motion { - /* - * Some broken terminals appear to send - * mouse button one motion events, instead of - * encoding 35 (no buttons) into these events. - * We resolve these by looking for a non-motion - * event first. - */ - if !ip.btnDown { - btn |= 3 - btn &^= 0x40 - } - } else if !scroll { - ip.btnDown = true - } - - button := ButtonNone - mod := ModNone - - // Mouse wheel has bit 6 set, no release events. It should be noted - // that wheel events are sometimes misdelivered as mouse button events - // during a click-drag, so we debounce these, considering them to be - // button press events unless we see an intervening release event. - switch btn & 0x43 { - case 0: - button = Button1 - case 1: - button = Button3 // Note we prefer to treat right as button 2 - case 2: - button = Button2 // And the middle button as button 3 - case 3: - button = ButtonNone - case 0x40: - button = WheelUp - case 0x41: - button = WheelDown - case 0x42: - button = WheelLeft - case 0x43: - button = WheelRight - } - - if btn&0x4 != 0 { - mod |= ModShift - } - if btn&0x8 != 0 { - mod |= ModAlt - } - if btn&0x10 != 0 { - mod |= ModCtrl - } - - ip.post(NewEventMouse(x, y, button, mod)) -} - -func (ip *inputProcessor) handleWinKey(P []int) { - // win32-input-mode - // ^[ [ Vk ; Sc ; Uc ; Kd ; Cs ; Rc _ - // Vk: the value of wVirtualKeyCode - any number. If omitted, defaults to '0'. - // Sc: the value of wVirtualScanCode - any number. If omitted, defaults to '0'. - // Uc: the decimal value of UnicodeChar - for example, NUL is "0", LF is - // "10", the character 'A' is "65". If omitted, defaults to '0'. - // Kd: the value of bKeyDown - either a '0' or '1'. If omitted, defaults to '0'. - // Cs: the value of dwControlKeyState - any number. If omitted, defaults to '0'. - // Rc: the value of wRepeatCount - any number. If omitted, defaults to '1'. - // - // Note that some 3rd party terminal emulators (not Terminal) suffer from a bug - // where other events, such as mouse events, are doubly encoded, using Vk 0 - // for each character. (So a CSI-M sequence is encoded as a series of CSI-_ - // sequences.) We consider this a bug in those terminal emulators -- Windows 11 - // Terminal does not suffer this brain damage. (We've observed this with both Alacritty - // and WezTerm.) - for len(P) < 6 { - P = append(P, 0) // ensure sufficient length - } - if P[3] == 0 { - // key up event ignore ignore - return - } - - if P[0] == 0 && P[1] == 0 && P[2] > 0 && P[2] < 0x80 { // only ASCII in win32-input-mode - if ip.nested == nil { - ip.nested = &inputProcessor{ - evch: ip.evch, - rows: ip.rows, - cols: ip.cols, - } - } - - ip.nested.ScanUTF8([]byte{byte(P[2])}) - return - } - - key := KeyRune - chr := rune(P[2]) - mod := ModNone - rpt := max(1, P[5]) - if k1, ok := winKeys[P[0]]; ok { - chr = 0 - key = k1 - } else if chr == 0 && P[0] >= 0x30 && P[0] <= 0x39 { - chr = rune(P[0]) - } else if chr < ' ' && P[0] >= 0x41 && P[0] <= 0x5a { - key = Key(P[0]) - chr = 0 - - } else if chr >= 0xD800 && chr <= 0xDBFF { - // high surrogate pair - ip.surrogate = chr - return - } else if chr >= 0xDC00 && chr <= 0xDFFF { - // low surrogate pair - chr = utf16.DecodeRune(ip.surrogate, chr) - } else if P[0] == 0x10 || P[0] == 0x11 || P[0] == 0x12 || P[0] == 0x14 { - // lone modifiers - ip.surrogate = 0 - return - } - - ip.surrogate = 0 - - // Modifiers - if P[4]&0x010 != 0 { - mod |= ModShift - } - if P[4]&0x000c != 0 { - mod |= ModCtrl - } - if P[4]&0x0003 != 0 { - mod |= ModAlt - } - if key == KeyRune && chr > ' ' && mod == ModShift { - // filter out lone shift for printable chars - mod = ModNone - } - if chr != 0 && mod&(ModCtrl|ModAlt) == ModCtrl|ModAlt { - // Filter out ctrl+alt (it means AltGr) - mod = ModNone - } - - for range rpt { - if key != KeyRune || chr != 0 { - ip.post(NewEventKey(key, chr, mod)) - } - } -} - -func (ip *inputProcessor) handleCsi(mode rune, params []byte, intermediate []byte) { - - // reset state - ip.state = inpStateInit - - if len(intermediate) != 0 { - // we don't know what to do with these for now - return - } - - var parts []string - var P []int - hasLT := false - pstr := string(params) - // extract numeric parameters - if strings.HasPrefix(pstr, "<") { - hasLT = true - pstr = pstr[1:] - } - if pstr != "" && pstr[0] >= '0' && pstr[0] <= '9' { - parts = strings.Split(pstr, ";") - for i := range parts { - if parts[i] != "" { - if n, e := strconv.ParseInt(parts[i], 10, 32); e == nil { - P = append(P, int(n)) - } - } - } - } - var P0 int - if len(P) > 0 { - P0 = P[0] - } - - if hasLT { - switch mode { - case 'm', 'M': // mouse event, we only do SGR tracking - ip.handleMouse(mode, P) - } - } - - switch mode { - case 'I': // focus in - ip.post(NewEventFocus(true)) - return - case 'O': // focus out - ip.post(NewEventFocus(false)) - return - case '[': - // linux console F-key - CSI-[ modifies next key - ip.state = inpStateLFK - return - case 'u': - // CSI-u kitty keyboard protocol - if len(P) > 0 && !hasLT { - mod := ModNone - key := KeyRune - chr := rune(0) - if k1, ok := csiUKeys[P0]; ok { - key = k1.Key - chr = k1.Rune - } else { - chr = rune(P0) - } - if len(P) > 1 { - mod = calcModifier(P[1]) - } - ip.post(NewEventKey(key, chr, mod)) - } - return - case '_': - if len(intermediate) == 0 && len(P) > 0 { - ip.handleWinKey(P) - return - } - case '~': - if len(intermediate) == 0 && len(P) >= 2 { - mod := calcModifier(P[1]) - if ks, ok := csiAllKeys[csiParamMode{M: mode, P: P0}]; ok { - ip.post(NewEventKey(ks.Key, 0, mod)) - return - } - if P0 == 27 && len(P) > 2 && P[2] > 0 && P[2] <= 0xff { - if P[2] < ' ' || P[2] == 0x7F { - ip.post(NewEventKey(Key(P[2]), 0, mod)) - } else { - ip.post(NewEventKey(KeyRune, rune(P[2]), mod)) - } - return - } - } - } - - if ks, ok := csiAllKeys[csiParamMode{M: mode, P: P0}]; ok && !hasLT { - if mode == '~' && len(P) > 1 && ks.Mod == ModNone { - // apply modifiers if present - ks.Mod = calcModifier(P[1]) - } else if mode == 'P' && os.Getenv("TERM") == "aixterm" { - ks.Key = KeyDelete // aixterm hack - conflicts with kitty protocol - } - ip.post(NewEventKey(ks.Key, 0, ks.Mod)) - return - } - - // this might have been an SS3 style key with modifiers applied - if k, ok := ss3Keys[mode]; ok && P0 == 1 && len(P) > 1 { - ip.post(NewEventKey(k, 0, calcModifier(P[1]))) - return - } - // if we got here we just swallow the unknown sequence -} - -func (ip *inputProcessor) ScanUTF8(b []byte) { - ip.l.Lock() - defer ip.l.Unlock() - - ip.ut8 = append(ip.ut8, b...) - for len(ip.ut8) > 0 { - // fast path, basic ascii - if ip.ut8[0] < 0x7F { - ip.buf = append(ip.buf, rune(ip.ut8[0])) - ip.ut8 = ip.ut8[1:] - } else { - r, len := utf8.DecodeRune(ip.ut8) - if r == utf8.RuneError { - r = rune(ip.ut8[0]) - len = 1 - } - ip.buf = append(ip.buf, r) - ip.ut8 = ip.ut8[len:] - } - } - - ip.scan() -} - -func (ip *inputProcessor) ScanUTF16(u []uint16) { - ip.l.Lock() - defer ip.l.Unlock() - ip.ut16 = append(ip.ut16, u...) - for len(ip.ut16) > 0 { - if !utf16.IsSurrogate(rune(ip.ut16[0])) { - ip.buf = append(ip.buf, rune(ip.ut16[0])) - ip.ut16 = ip.ut16[1:] - } else if len(ip.ut16) > 1 { - ip.buf = append(ip.buf, utf16.DecodeRune(rune(ip.ut16[0]), rune(ip.ut16[1]))) - ip.ut16 = ip.ut16[2:] - } else { - break - } - } -} diff --git a/vendor/github.com/gdamore/tcell/v2/key.go b/vendor/github.com/gdamore/tcell/v2/key.go deleted file mode 100644 index 58f8c4388..000000000 --- a/vendor/github.com/gdamore/tcell/v2/key.go +++ /dev/null @@ -1,527 +0,0 @@ -// Copyright 2025 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -import ( - "fmt" - "strings" - "time" -) - -// EventKey represents a key press. Usually this is a key press followed -// by a key release, but since terminal programs don't have a way to report -// key release events, we usually get just one event. If a key is held down -// then the terminal may synthesize repeated key presses at some predefined -// rate. We have no control over that, nor visibility into it. -// -// In some cases, we can have a modifier key, such as ModAlt, that can be -// generated with a key press. (This usually is represented by having the -// high bit set, or in some cases, by sending an ESC prior to the rune.) -// -// If the value of Key() is KeyRune, then the actual key value will be -// available with the Rune() method. This will be the case for most keys. -// In most situations, the modifiers will not be set. For example, if the -// rune is 'A', this will be reported without the ModShift bit set, since -// really can't tell if the Shift key was pressed (it might have been CAPSLOCK, -// or a terminal that only can send capitals, or keyboard with separate -// capital letters from lower case letters). -// -// Generally, terminal applications have far less visibility into keyboard -// activity than graphical applications. Hence, they should avoid depending -// overly much on availability of modifiers, or the availability of any -// specific keys. -type EventKey struct { - t time.Time - mod ModMask - key Key - ch rune -} - -// When returns the time when this Event was created, which should closely -// match the time when the key was pressed. -func (ev *EventKey) When() time.Time { - return ev.t -} - -// Rune returns the rune corresponding to the key press, if it makes sense. -// The result is only defined if the value of Key() is KeyRune. -func (ev *EventKey) Rune() rune { - return ev.ch -} - -// Key returns a virtual key code. We use this to identify specific key -// codes, such as KeyEnter, etc. Most control and function keys are reported -// with unique Key values. Normal alphanumeric and punctuation keys will -// generally return KeyRune here; the specific key can be further decoded -// using the Rune() function. -func (ev *EventKey) Key() Key { - return ev.key -} - -// Modifiers returns the modifiers that were present with the key press. Note -// that not all platforms and terminals support this equally well, and some -// cases we will not not know for sure. Hence, applications should avoid -// using this in most circumstances. -func (ev *EventKey) Modifiers() ModMask { - return ev.mod -} - -// KeyNames holds the written names of special keys. Useful to echo back a key -// name, or to look up a key from a string value. -var KeyNames = map[Key]string{ - KeyEnter: "Enter", - KeyBackspace: "Backspace", - KeyTab: "Tab", - KeyBacktab: "Backtab", - KeyEsc: "Esc", - KeyBackspace2: "Backspace2", - KeyDelete: "Delete", - KeyInsert: "Insert", - KeyUp: "Up", - KeyDown: "Down", - KeyLeft: "Left", - KeyRight: "Right", - KeyHome: "Home", - KeyEnd: "End", - KeyUpLeft: "UpLeft", - KeyUpRight: "UpRight", - KeyDownLeft: "DownLeft", - KeyDownRight: "DownRight", - KeyCenter: "Center", - KeyPgDn: "PgDn", - KeyPgUp: "PgUp", - KeyClear: "Clear", - KeyExit: "Exit", - KeyCancel: "Cancel", - KeyPause: "Pause", - KeyPrint: "Print", - KeyF1: "F1", - KeyF2: "F2", - KeyF3: "F3", - KeyF4: "F4", - KeyF5: "F5", - KeyF6: "F6", - KeyF7: "F7", - KeyF8: "F8", - KeyF9: "F9", - KeyF10: "F10", - KeyF11: "F11", - KeyF12: "F12", - KeyF13: "F13", - KeyF14: "F14", - KeyF15: "F15", - KeyF16: "F16", - KeyF17: "F17", - KeyF18: "F18", - KeyF19: "F19", - KeyF20: "F20", - KeyF21: "F21", - KeyF22: "F22", - KeyF23: "F23", - KeyF24: "F24", - KeyF25: "F25", - KeyF26: "F26", - KeyF27: "F27", - KeyF28: "F28", - KeyF29: "F29", - KeyF30: "F30", - KeyF31: "F31", - KeyF32: "F32", - KeyF33: "F33", - KeyF34: "F34", - KeyF35: "F35", - KeyF36: "F36", - KeyF37: "F37", - KeyF38: "F38", - KeyF39: "F39", - KeyF40: "F40", - KeyF41: "F41", - KeyF42: "F42", - KeyF43: "F43", - KeyF44: "F44", - KeyF45: "F45", - KeyF46: "F46", - KeyF47: "F47", - KeyF48: "F48", - KeyF49: "F49", - KeyF50: "F50", - KeyF51: "F51", - KeyF52: "F52", - KeyF53: "F53", - KeyF54: "F54", - KeyF55: "F55", - KeyF56: "F56", - KeyF57: "F57", - KeyF58: "F58", - KeyF59: "F59", - KeyF60: "F60", - KeyF61: "F61", - KeyF62: "F62", - KeyF63: "F63", - KeyF64: "F64", - KeyMenu: "Menu", - KeyCapsLock: "CapsLock", - KeyScrollLock: "ScrollLock", - KeyNumLock: "NumLock", - KeyCtrlSpace: "Ctrl-Space", - KeyCtrlA: "Ctrl-A", - KeyCtrlB: "Ctrl-B", - KeyCtrlC: "Ctrl-C", - KeyCtrlD: "Ctrl-D", - KeyCtrlE: "Ctrl-E", - KeyCtrlF: "Ctrl-F", - KeyCtrlG: "Ctrl-G", - KeyCtrlH: "Ctrl-H", - KeyCtrlI: "Ctrl-I", - KeyCtrlJ: "Ctrl-J", - KeyCtrlK: "Ctrl-K", - KeyCtrlL: "Ctrl-L", - KeyCtrlM: "Ctrl-M", - KeyCtrlN: "Ctrl-N", - KeyCtrlO: "Ctrl-O", - KeyCtrlP: "Ctrl-P", - KeyCtrlQ: "Ctrl-Q", - KeyCtrlR: "Ctrl-R", - KeyCtrlS: "Ctrl-S", - KeyCtrlT: "Ctrl-T", - KeyCtrlU: "Ctrl-U", - KeyCtrlV: "Ctrl-V", - KeyCtrlW: "Ctrl-W", - KeyCtrlX: "Ctrl-X", - KeyCtrlY: "Ctrl-Y", - KeyCtrlZ: "Ctrl-Z", - KeyCtrlLeftSq: "Ctrl-[", - KeyCtrlRightSq: "Ctrl-]", - KeyCtrlBackslash: "Ctrl-\\", - KeyCtrlCarat: "Ctrl-^", - KeyCtrlUnderscore: "Ctrl-_", -} - -// Name returns a printable value or the key stroke. This can be used -// when printing the event, for example. -func (ev *EventKey) Name() string { - s := "" - m := []string{} - if ev.mod&ModShift != 0 { - m = append(m, "Shift") - } - if ev.mod&ModAlt != 0 { - m = append(m, "Alt") - } - if ev.mod&ModMeta != 0 { - m = append(m, "Meta") - } - if ev.mod&ModCtrl != 0 { - m = append(m, "Ctrl") - } - if ev.mod&ModHyper != 0 { - m = append(m, "Hyper") - } - - ok := false - if s, ok = KeyNames[ev.key]; !ok { - if ev.key == KeyRune { - s = "Rune[" + string(ev.ch) + "]" - } else { - s = fmt.Sprintf("Key[%d,%d]", ev.key, int(ev.ch)) - } - } - if len(m) != 0 { - if ev.mod&ModCtrl != 0 && strings.HasPrefix(s, "Ctrl-") { - s = s[5:] - } - return fmt.Sprintf("%s+%s", strings.Join(m, "+"), s) - } - return s -} - -// NewEventKey attempts to create a suitable event. It parses the various -// ASCII control sequences if KeyRune is passed for Key, but if the caller -// has more precise information it should set that specifically. Callers -// that aren't sure about modifier state (most) should just pass ModNone. -func NewEventKey(k Key, ch rune, mod ModMask) *EventKey { - if k == KeyRune && (ch < ' ' || ch == 0x7f) { - // Turn specials into proper key codes. This is for - // control characters and the DEL. - k = Key(ch) - if mod == ModNone && ch < ' ' { - switch k { - case KeyBackspace, KeyTab, KeyEsc, KeyEnter: - // these keys are directly typeable without CTRL - default: - // most likely entered with a CTRL keypress - mod = ModCtrl - } - ch = ch + '\x60' - } - } - if k == KeyRune && ch >= 'A' && ch <= 'Z' && mod == ModCtrl { - // We don't do Ctrl-[ or backslash or those specially. - k = KeyCtrlA + Key(ch-'A') - } - - // Might be lower case - if k == KeyRune && ch >= 'a' && ch <= 'z' && mod == ModCtrl { - // We don't do Ctrl-[ or backslash or those specially. - k = KeyCtrlA + Key(ch-'a') - } - - // Windows reports ModShift for shifted keys. This is inconsistent - // with UNIX, lets harmonize this. - if k == KeyRune && mod == ModShift && ch != 0 { - mod = ModNone - } - - if k >= KeyCtrlA && k <= KeyCtrlZ { - if mod&ModShift != 0 { - ch = rune((k - KeyCtrlA) + 'A') - } else { - ch = rune((k - KeyCtrlA) + 'a') - } - } - - // Backspace2 is just another name for backspace. - if k == KeyBackspace2 { - k = KeyBackspace - } - - // Shift-Tab should be Backtab. - if k == KeyTab && (mod&ModShift) != 0 { - k = KeyBacktab - mod &^= ModShift - } - - return &EventKey{t: time.Now(), key: k, ch: ch, mod: mod} -} - -// ModMask is a mask of modifier keys. Note that it will not always be -// possible to report modifier keys. -type ModMask int16 - -// These are the modifiers keys that can be sent either with a key press, -// or a mouse event. Note that as of now, due to the confusion associated -// with Meta, and the lack of support for it on many/most platforms, the -// current implementations never use it. Instead, they use ModAlt, even for -// events that could possibly have been distinguished from ModAlt. -const ( - ModShift ModMask = 1 << iota - ModCtrl - ModAlt - ModMeta - ModHyper - ModNone ModMask = 0 -) - -// Key is a generic value for representing keys, and especially special -// keys (function keys, cursor movement keys, etc.) For normal keys, like -// ASCII letters, we use KeyRune, and then expect the application to -// inspect the Rune() member of the EventKey. -type Key int16 - -// This is the list of named keys. KeyRune is special however, in that it is -// a place holder key indicating that a printable character was sent. The -// actual value of the rune will be transported in the Rune of the associated -// EventKey. -const ( - KeyRune Key = iota + 256 - KeyUp - KeyDown - KeyRight - KeyLeft - KeyUpLeft - KeyUpRight - KeyDownLeft - KeyDownRight - KeyCenter - KeyPgUp - KeyPgDn - KeyHome - KeyEnd - KeyInsert - KeyDelete - KeyHelp - KeyExit - KeyClear - KeyCancel - KeyPrint - KeyPause - KeyBacktab - KeyF1 - KeyF2 - KeyF3 - KeyF4 - KeyF5 - KeyF6 - KeyF7 - KeyF8 - KeyF9 - KeyF10 - KeyF11 - KeyF12 - KeyF13 - KeyF14 - KeyF15 - KeyF16 - KeyF17 - KeyF18 - KeyF19 - KeyF20 - KeyF21 - KeyF22 - KeyF23 - KeyF24 - KeyF25 - KeyF26 - KeyF27 - KeyF28 - KeyF29 - KeyF30 - KeyF31 - KeyF32 - KeyF33 - KeyF34 - KeyF35 - KeyF36 - KeyF37 - KeyF38 - KeyF39 - KeyF40 - KeyF41 - KeyF42 - KeyF43 - KeyF44 - KeyF45 - KeyF46 - KeyF47 - KeyF48 - KeyF49 - KeyF50 - KeyF51 - KeyF52 - KeyF53 - KeyF54 - KeyF55 - KeyF56 - KeyF57 - KeyF58 - KeyF59 - KeyF60 - KeyF61 - KeyF62 - KeyF63 - KeyF64 - KeyMenu - KeyCapsLock - KeyScrollLock - KeyNumLock -) - -const ( - // These key codes are used internally, and will never appear to applications. - keyPasteStart Key = iota + 16384 - keyPasteEnd -) - -// These are the control keys, they will also be reported with the -// rune (lower case) and control modifier. If the shift key -// or other modifiers are present then these will *NOT* be reported, -// but reported instead as KeyRune. -const ( - KeyCtrlSpace Key = iota + 64 - KeyCtrlA - KeyCtrlB - KeyCtrlC - KeyCtrlD - KeyCtrlE - KeyCtrlF - KeyCtrlG - KeyCtrlH - KeyCtrlI - KeyCtrlJ - KeyCtrlK - KeyCtrlL - KeyCtrlM - KeyCtrlN - KeyCtrlO - KeyCtrlP - KeyCtrlQ - KeyCtrlR - KeyCtrlS - KeyCtrlT - KeyCtrlU - KeyCtrlV - KeyCtrlW - KeyCtrlX - KeyCtrlY - KeyCtrlZ - KeyCtrlLeftSq // Escape - KeyCtrlBackslash - KeyCtrlRightSq - KeyCtrlCarat - KeyCtrlUnderscore -) - -// Special values - these are fixed in an attempt to make it more likely -// that aliases will encode the same way. - -// These are the defined ASCII values for key codes. They generally match -// with KeyCtrl values. -const ( - KeyNUL Key = iota - KeySOH - KeySTX - KeyETX - KeyEOT - KeyENQ - KeyACK - KeyBEL - KeyBS - KeyTAB - KeyLF - KeyVT - KeyFF - KeyCR - KeySO - KeySI - KeyDLE - KeyDC1 - KeyDC2 - KeyDC3 - KeyDC4 - KeyNAK - KeySYN - KeyETB - KeyCAN - KeyEM - KeySUB - KeyESC - KeyFS - KeyGS - KeyRS - KeyUS - KeyDEL Key = 0x7F -) - -// These keys are aliases for other names. -const ( - KeyBackspace = KeyBS - KeyTab = KeyTAB - KeyEsc = KeyESC - KeyEscape = KeyESC - KeyEnter = KeyCR - - // NB: This key will be translated to KeyBackspace - KeyBackspace2 = KeyDEL -) diff --git a/vendor/github.com/gdamore/tcell/v2/simulation.go b/vendor/github.com/gdamore/tcell/v2/simulation.go deleted file mode 100644 index 9a09c3c0e..000000000 --- a/vendor/github.com/gdamore/tcell/v2/simulation.go +++ /dev/null @@ -1,535 +0,0 @@ -// Copyright 2024 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -import ( - "sync" - "unicode/utf8" - - "golang.org/x/text/transform" -) - -// NewSimulationScreen returns a SimulationScreen. Note that -// SimulationScreen is also a Screen. -func NewSimulationScreen(charset string) SimulationScreen { - if charset == "" { - charset = "UTF-8" - } - ss := &simscreen{charset: charset} - ss.Screen = &baseScreen{screenImpl: ss} - return ss -} - -// SimulationScreen represents a screen simulation. This is intended to -// be a superset of normal Screens, but also adds some important interfaces -// for testing. -type SimulationScreen interface { - Screen - - // InjectKeyBytes injects a stream of bytes corresponding to - // the native encoding (see charset). It turns true if the entire - // set of bytes were processed and delivered as KeyEvents, false - // if any bytes were not fully understood. Any bytes that are not - // fully converted are discarded. - InjectKeyBytes(buf []byte) bool - - // InjectKey injects a key event. The rune is a UTF-8 rune, post - // any translation. - InjectKey(key Key, r rune, mod ModMask) - - // InjectMouse injects a mouse event. - InjectMouse(x, y int, buttons ButtonMask, mod ModMask) - - // GetContents returns screen contents as an array of - // cells, along with the physical width & height. Note that the - // physical contents will be used until the next time SetSize() - // is called. - GetContents() (cells []SimCell, width int, height int) - - // GetCursor returns the cursor details. - GetCursor() (x int, y int, visible bool) - - // GetTitle gets the previously set title. - GetTitle() string - - // GetClipboardData gets the actual data for the clipboard. - GetClipboardData() []byte -} - -// SimCell represents a simulated screen cell. The purpose of this -// is to track on screen content. -type SimCell struct { - // Bytes is the actual character bytes. Normally this is - // rune data, but it could be be data in another encoding system. - Bytes []byte - - // Style is the style used to display the data. - Style Style - - // Runes is the list of runes, unadulterated, in UTF-8. - Runes []rune -} - -type simscreen struct { - physw int - physh int - fini bool - style Style - evch chan Event - quit chan struct{} - - front []SimCell - back CellBuffer - clear bool - cursorx int - cursory int - cursorvis bool - mouse bool - paste bool - charset string - encoder transform.Transformer - decoder transform.Transformer - fillchar rune - fillstyle Style - fallback map[rune]string - title string - clipboard []byte - - Screen - sync.Mutex -} - -func (s *simscreen) Init() error { - s.evch = make(chan Event, 10) - s.quit = make(chan struct{}) - s.fillchar = 'X' - s.fillstyle = StyleDefault - s.mouse = false - s.physw = 80 - s.physh = 25 - s.cursorx = -1 - s.cursory = -1 - s.style = StyleDefault - - if enc := GetEncoding(s.charset); enc != nil { - s.encoder = enc.NewEncoder() - s.decoder = enc.NewDecoder() - } else { - return ErrNoCharset - } - - s.front = make([]SimCell, s.physw*s.physh) - s.back.Resize(80, 25) - - // default fallbacks - s.fallback = make(map[rune]string) - for k, v := range RuneFallbacks { - s.fallback[k] = v - } - return nil -} - -func (s *simscreen) Fini() { - s.Lock() - s.fini = true - s.back.Resize(0, 0) - s.Unlock() - if s.quit != nil { - close(s.quit) - } - s.physw = 0 - s.physh = 0 - s.front = nil -} - -func (s *simscreen) SetStyle(style Style) { - s.Lock() - s.style = style - s.Unlock() -} - -func (s *simscreen) drawCell(x, y int) int { - - mainc, combc, style, width := s.back.GetContent(x, y) - if !s.back.Dirty(x, y) { - return width - } - if x >= s.physw || y >= s.physh || x < 0 || y < 0 { - return width - } - simc := &s.front[(y*s.physw)+x] - - if style == StyleDefault { - style = s.style - } - simc.Style = style - simc.Runes = append([]rune{mainc}, combc...) - - // now emit runes - taking care to not overrun width with a - // wide character, and to ensure that we emit exactly one regular - // character followed up by any residual combing characters - - simc.Bytes = nil - - if x > s.physw-width { - simc.Runes = []rune{' '} - simc.Bytes = []byte{' '} - return width - } - - lbuf := make([]byte, 12) - ubuf := make([]byte, 12) - nout := 0 - - for _, r := range simc.Runes { - - l := utf8.EncodeRune(ubuf, r) - - nout, _, _ = s.encoder.Transform(lbuf, ubuf[:l], true) - - if nout == 0 || lbuf[0] == '\x1a' { - - // skip combining - - if subst, ok := s.fallback[r]; ok { - simc.Bytes = append(simc.Bytes, - []byte(subst)...) - - } else if r >= ' ' && r <= '~' { - simc.Bytes = append(simc.Bytes, byte(r)) - - } else if simc.Bytes == nil { - simc.Bytes = append(simc.Bytes, '?') - } - } else { - simc.Bytes = append(simc.Bytes, lbuf[:nout]...) - } - } - s.back.SetDirty(x, y, false) - return width -} - -func (s *simscreen) ShowCursor(x, y int) { - s.Lock() - s.cursorx, s.cursory = x, y - s.showCursor() - s.Unlock() -} - -func (s *simscreen) HideCursor() { - s.ShowCursor(-1, -1) -} - -func (s *simscreen) showCursor() { - - x, y := s.cursorx, s.cursory - if x < 0 || y < 0 || x >= s.physw || y >= s.physh { - s.cursorvis = false - } else { - s.cursorvis = true - } -} - -func (s *simscreen) hideCursor() { - // does not update cursor position - s.cursorvis = false -} - -func (s *simscreen) SetCursor(CursorStyle, Color) {} - -func (s *simscreen) Show() { - s.Lock() - s.resize() - s.draw() - s.Unlock() -} - -func (s *simscreen) clearScreen() { - // We emulate a hardware clear by filling with a specific pattern - for i := range s.front { - s.front[i].Style = s.fillstyle - s.front[i].Runes = []rune{s.fillchar} - s.front[i].Bytes = []byte{byte(s.fillchar)} - } - s.clear = false -} - -func (s *simscreen) draw() { - s.hideCursor() - if s.clear { - s.clearScreen() - } - - w, h := s.back.Size() - for y := 0; y < h; y++ { - for x := 0; x < w; x++ { - width := s.drawCell(x, y) - x += width - 1 - } - } - s.showCursor() -} - -func (s *simscreen) EnableMouse(...MouseFlags) { - s.mouse = true -} - -func (s *simscreen) DisableMouse() { - s.mouse = false -} - -func (s *simscreen) EnablePaste() { - s.paste = true -} - -func (s *simscreen) DisablePaste() { - s.paste = false -} - -func (s *simscreen) EnableFocus() { -} - -func (s *simscreen) DisableFocus() { -} - -func (s *simscreen) Size() (int, int) { - s.Lock() - w, h := s.back.Size() - s.Unlock() - return w, h -} - -func (s *simscreen) resize() { - w, h := s.physw, s.physh - ow, oh := s.back.Size() - if w != ow || h != oh { - s.back.Resize(w, h) - ev := NewEventResize(w, h) - s.postEvent(ev) - } -} - -func (s *simscreen) Colors() int { - return 256 -} - -func (s *simscreen) postEvent(ev Event) { - select { - case s.evch <- ev: - case <-s.quit: - } -} - -func (s *simscreen) InjectMouse(x, y int, buttons ButtonMask, mod ModMask) { - ev := NewEventMouse(x, y, buttons, mod) - s.postEvent(ev) -} - -func (s *simscreen) InjectKey(key Key, r rune, mod ModMask) { - ev := NewEventKey(key, r, mod) - s.postEvent(ev) -} - -func (s *simscreen) InjectKeyBytes(b []byte) bool { - failed := false - -outer: - for len(b) > 0 { - if b[0] >= ' ' && b[0] <= 0x7F { - // printable ASCII easy to deal with -- no encodings - ev := NewEventKey(KeyRune, rune(b[0]), ModNone) - s.postEvent(ev) - b = b[1:] - continue - } - - if b[0] < 0x80 { - // No encodings start with low numbered values - if b[0] > 0 && b[0] < ' ' { // control keys - switch Key(b[0]) { - case KeyESC, KeyEnter, KeyTAB: - s.postEvent(NewEventKey(Key(b[0]), 0, 0)) - continue; - default: - s.postEvent(NewEventKey(Key(b[0]), rune(b[0])+'\x60', ModCtrl)) - continue - } - } - mod := ModNone - ev := NewEventKey(Key(b[0]), 0, mod) - s.postEvent(ev) - b = b[1:] - continue - } - - utfb := make([]byte, len(b)*4) // worst case - for l := 1; l < len(b); l++ { - s.decoder.Reset() - nout, nin, _ := s.decoder.Transform(utfb, b[:l], true) - - if nout != 0 { - r, _ := utf8.DecodeRune(utfb[:nout]) - if r != utf8.RuneError { - ev := NewEventKey(KeyRune, r, ModNone) - s.postEvent(ev) - } - b = b[nin:] - continue outer - } - } - failed = true - b = b[1:] - continue - } - - return !failed -} - -func (s *simscreen) Sync() { - s.Lock() - s.clear = true - s.resize() - s.back.Invalidate() - s.draw() - s.Unlock() -} - -func (s *simscreen) CharacterSet() string { - return s.charset -} - -func (s *simscreen) SetSize(w, h int) { - s.Lock() - newc := make([]SimCell, w*h) - for row := 0; row < h && row < s.physh; row++ { - for col := 0; col < w && col < s.physw; col++ { - newc[(row*w)+col] = s.front[(row*s.physw)+col] - } - } - s.cursorx, s.cursory = -1, -1 - s.physw, s.physh = w, h - s.front = newc - s.back.Resize(w, h) - s.Unlock() -} - -func (s *simscreen) GetContents() ([]SimCell, int, int) { - s.Lock() - cells, w, h := s.front, s.physw, s.physh - s.Unlock() - return cells, w, h -} - -func (s *simscreen) GetCursor() (int, int, bool) { - s.Lock() - x, y, vis := s.cursorx, s.cursory, s.cursorvis - s.Unlock() - return x, y, vis -} - -func (s *simscreen) RegisterRuneFallback(r rune, subst string) { - s.Lock() - s.fallback[r] = subst - s.Unlock() -} - -func (s *simscreen) UnregisterRuneFallback(r rune) { - s.Lock() - delete(s.fallback, r) - s.Unlock() -} - -func (s *simscreen) CanDisplay(r rune, checkFallbacks bool) bool { - - if enc := s.encoder; enc != nil { - nb := make([]byte, 6) - ob := make([]byte, 6) - num := utf8.EncodeRune(ob, r) - - enc.Reset() - dst, _, err := enc.Transform(nb, ob[:num], true) - if dst != 0 && err == nil && nb[0] != '\x1A' { - return true - } - } - if !checkFallbacks { - return false - } - if _, ok := s.fallback[r]; ok { - return true - } - return false -} - -func (s *simscreen) HasMouse() bool { - return false -} - -func (s *simscreen) Resize(int, int, int, int) {} - -func (s *simscreen) HasKey(Key) bool { - return true -} - -func (s *simscreen) Beep() error { - return nil -} - -func (s *simscreen) Suspend() error { - return nil -} - -func (s *simscreen) Resume() error { - return nil -} - -func (s *simscreen) Tty() (Tty, bool) { - return nil, false -} - -func (s *simscreen) GetCells() *CellBuffer { - return &s.back -} - -func (s *simscreen) EventQ() chan Event { - return s.evch -} - -func (s *simscreen) StopQ() <-chan struct{} { - return s.quit -} - -func (s *simscreen) SetTitle(title string) { - s.title = title -} - -func (s *simscreen) GetTitle() string { - return s.title -} - -func (s *simscreen) SetClipboard(data []byte) { - s.clipboard = data -} - -func (s *simscreen) GetClipboard() { - if s.clipboard != nil { - ev := NewEventClipboard(s.clipboard) - s.postEvent(ev) - } -} - -func (s *simscreen) GetClipboardData() []byte { - return s.clipboard -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/.gitignore b/vendor/github.com/gdamore/tcell/v2/terminfo/.gitignore deleted file mode 100644 index 74f3c04fd..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -mkinfo diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/README.md b/vendor/github.com/gdamore/tcell/v2/terminfo/README.md deleted file mode 100644 index 20ae937f3..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/README.md +++ /dev/null @@ -1,25 +0,0 @@ -This package represents the parent for all terminals. - -In older versions of tcell we had (a couple of) different -external file formats for the terminal database. Those are -now removed. All terminal definitions are supplied by -one of two methods: - -1. Compiled Go code - -2. For systems with terminfo and infocmp, dynamically - generated at runtime. - -The Go code can be generated using the mkinfo utility in -this directory. The database entry should be generated -into a package in a directory named as the first character -of the package name. (This permits us to group them all -without having a huge directory of little packages.) - -It may be desirable to add new packages to the extended -package, or -- rarely -- the base package. - -Applications which want to have the large set of terminal -descriptions built into the binary can simply import the -extended package. Otherwise a smaller reasonable default -set (the base package) will be included instead. diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/TERMINALS.md b/vendor/github.com/gdamore/tcell/v2/terminfo/TERMINALS.md deleted file mode 100644 index 85c1e61c2..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/TERMINALS.md +++ /dev/null @@ -1,7 +0,0 @@ -TERMINALS -========= - -The best way to populate terminals on Debian is to install ncurses, -ncurses-term, screen, tmux, rxvt-unicode, and dvtm. This populates the -the terminfo database so that we can have a reasonable set of starting -terminals. diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/aixterm/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/a/aixterm/term.go deleted file mode 100644 index 4da68f4e0..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/aixterm/term.go +++ /dev/null @@ -1,31 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package aixterm - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // IBM Aixterm Terminal Emulator - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "aixterm", - Columns: 80, - Lines: 25, - Colors: 8, - Clear: "\x1b[H\x1b[J", - AttrOff: "\x1b[0;10m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Reverse: "\x1b[7m", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[32m\x1b[40m", - PadChar: "\x00", - AltChars: "jjkkllmmnnqqttuuvvwwxx", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/direct.go b/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/direct.go deleted file mode 100644 index 8026a721e..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/direct.go +++ /dev/null @@ -1,41 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package alacritty - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // alacritty with direct color indexing - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "alacritty-direct", - Columns: 80, - Lines: 24, - Colors: 16777216, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - TrueColor: true, - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go deleted file mode 100644 index 0e45869c0..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go +++ /dev/null @@ -1,44 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package alacritty - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // alacritty terminal emulator - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "alacritty", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/ansi/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/a/ansi/term.go deleted file mode 100644 index 24370a777..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/ansi/term.go +++ /dev/null @@ -1,32 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package ansi - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // ansi/pc-term compatible with color - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "ansi", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[J", - AttrOff: "\x1b[0;10m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe", - EnterAcs: "\x1b[11m", - ExitAcs: "\x1b[10m", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/base/base.go b/vendor/github.com/gdamore/tcell/v2/terminfo/base/base.go deleted file mode 100644 index 75aeb15f2..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/base/base.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2020 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This is just a "minimalist" set of the base terminal descriptions. -// It should be sufficient for most applications. - -// Package base contains the base terminal descriptions that are likely -// to be needed by any stock application. It is imported by default in the -// terminfo package, so terminal types listed here will be available to any -// tcell application. -package base - -import ( - // The following imports just register themselves -- - // these are the terminal types we aggregate in this package. - _ "github.com/gdamore/tcell/v2/terminfo/a/ansi" - _ "github.com/gdamore/tcell/v2/terminfo/t/tmux" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt100" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt102" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt220" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm" -) diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/c/cygwin/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/c/cygwin/term.go deleted file mode 100644 index 1ea431626..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/c/cygwin/term.go +++ /dev/null @@ -1,32 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package cygwin - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // ANSI emulation for Cygwin - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "cygwin", - Colors: 8, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - AttrOff: "\x1b[0;10m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Reverse: "\x1b[7m", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe", - EnterAcs: "\x1b[11m", - ExitAcs: "\x1b[10m", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go deleted file mode 100644 index b4e49b76f..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go +++ /dev/null @@ -1,38 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package dtterm - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // CDE desktop terminal - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "dtterm", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[J", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/dynamic/dynamic.go b/vendor/github.com/gdamore/tcell/v2/terminfo/dynamic/dynamic.go deleted file mode 100644 index 8bc0dbb7a..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/dynamic/dynamic.go +++ /dev/null @@ -1,266 +0,0 @@ -// Copyright 2021 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// The dynamic package is used to generate a terminal description dynamically, -// using infocmp. This is really a method of last resort, as the performance -// will be slow, and it requires a working infocmp. But, the hope is that it -// will assist folks who have to deal with a terminal description that isn't -// already built in. This requires infocmp to be in the user's path, and to -// support reasonably the -1 option. - -package dynamic - -import ( - "bytes" - "errors" - "fmt" - "os/exec" - "regexp" - "strconv" - "strings" - - "github.com/gdamore/tcell/v2/terminfo" -) - -type termcap struct { - name string - desc string - aliases []string - bools map[string]bool - nums map[string]int - strs map[string]string -} - -func (tc *termcap) getnum(s string) int { - return (tc.nums[s]) -} - -func (tc *termcap) getflag(s string) bool { - return (tc.bools[s]) -} - -func (tc *termcap) getstr(s string) string { - return (tc.strs[s]) -} - -const ( - none = iota - control - escaped -) - -var errNotAddressable = errors.New("terminal not cursor addressable") - -func unescape(s string) string { - // Various escapes are in \x format. Control codes are - // encoded as ^M (carat followed by ASCII equivalent). - // escapes are: \e, \E - escape - // \0 NULL, \n \l \r \t \b \f \s for equivalent C escape. - buf := &bytes.Buffer{} - esc := none - - for i := 0; i < len(s); i++ { - c := s[i] - switch esc { - case none: - switch c { - case '\\': - esc = escaped - case '^': - esc = control - default: - buf.WriteByte(c) - } - case control: - buf.WriteByte(c ^ 1<<6) - esc = none - case escaped: - switch c { - case 'E', 'e': - buf.WriteByte(0x1b) - case '0', '1', '2', '3', '4', '5', '6', '7': - if i+2 < len(s) && s[i+1] >= '0' && s[i+1] <= '7' && s[i+2] >= '0' && s[i+2] <= '7' { - buf.WriteByte(((c - '0') * 64) + ((s[i+1] - '0') * 8) + (s[i+2] - '0')) - i = i + 2 - } else if c == '0' { - buf.WriteByte(0) - } - case 'n': - buf.WriteByte('\n') - case 'r': - buf.WriteByte('\r') - case 't': - buf.WriteByte('\t') - case 'b': - buf.WriteByte('\b') - case 'f': - buf.WriteByte('\f') - case 's': - buf.WriteByte(' ') - default: - buf.WriteByte(c) - } - esc = none - } - } - return (buf.String()) -} - -func (tc *termcap) setupterm(name string) error { - cmd := exec.Command("infocmp", "-1", name) - output := &bytes.Buffer{} - cmd.Stdout = output - - tc.strs = make(map[string]string) - tc.bools = make(map[string]bool) - tc.nums = make(map[string]int) - - if err := cmd.Run(); err != nil { - return fmt.Errorf("couldn't open terminfo ($TERM) file for %s: %w", name, err) - } - - // Now parse the output. - // We get comment lines (starting with "#"), followed by - // a header line that looks like "||...|" - // then capabilities, one per line, starting with a tab and ending - // with a comma and newline. - lines := strings.Split(output.String(), "\n") - for len(lines) > 0 && strings.HasPrefix(lines[0], "#") { - lines = lines[1:] - } - - // Ditch trailing empty last line - if lines[len(lines)-1] == "" { - lines = lines[:len(lines)-1] - } - header := lines[0] - header = strings.TrimSuffix(header, ",") - names := strings.Split(header, "|") - tc.name = names[0] - names = names[1:] - if len(names) > 0 { - tc.desc = names[len(names)-1] - names = names[:len(names)-1] - } - tc.aliases = names - for _, val := range lines[1:] { - if (!strings.HasPrefix(val, "\t")) || - (!strings.HasSuffix(val, ",")) { - return (errors.New("malformed infocmp: " + val)) - } - - val = val[1:] - val = val[:len(val)-1] - - if k := strings.SplitN(val, "=", 2); len(k) == 2 { - tc.strs[k[0]] = unescape(k[1]) - } else if k := strings.SplitN(val, "#", 2); len(k) == 2 { - u, err := strconv.ParseUint(k[1], 0, 0) - if err != nil { - return (err) - } - tc.nums[k[0]] = int(u) - } else { - tc.bools[val] = true - } - } - return nil -} - -// LoadTerminfo creates a Terminfo by for named terminal by attempting to parse -// the output from infocmp. This returns the terminfo entry, a description of -// the terminal, and either nil or an error. -func LoadTerminfo(name string) (*terminfo.Terminfo, string, error) { - var tc termcap - if err := tc.setupterm(name); err != nil { - return nil, "", err - } - t := &terminfo.Terminfo{} - t.Name = tc.name - t.Aliases = tc.aliases - t.Colors = tc.getnum("colors") - t.Columns = tc.getnum("cols") - t.Lines = tc.getnum("lines") - t.Clear = tc.getstr("clear") - t.EnterCA = tc.getstr("smcup") - t.ExitCA = tc.getstr("rmcup") - t.ShowCursor = tc.getstr("cnorm") - t.HideCursor = tc.getstr("civis") - t.AttrOff = tc.getstr("sgr0") - t.Underline = tc.getstr("smul") - t.Bold = tc.getstr("bold") - t.Blink = tc.getstr("blink") - t.Dim = tc.getstr("dim") - t.Italic = tc.getstr("sitm") - t.Reverse = tc.getstr("rev") - t.EnterKeypad = tc.getstr("smkx") - t.ExitKeypad = tc.getstr("rmkx") - t.SetFg = tc.getstr("setaf") - t.SetBg = tc.getstr("setab") - t.SetCursor = tc.getstr("cup") - t.AltChars = tc.getstr("acsc") - t.EnterAcs = tc.getstr("smacs") - t.ExitAcs = tc.getstr("rmacs") - t.EnableAcs = tc.getstr("enacs") - t.Mouse = tc.getstr("kmous") - - // Technically the RGB flag that is provided for xterm-direct is not - // quite right. The problem is that the -direct flag that was introduced - // with ncurses 6.1 requires a parsing for the parameters that we lack. - // For this case we'll just assume it's XTerm compatible. Someday this - // may be incorrect, but right now it is correct, and nobody uses it - // anyway. - if tc.getflag("Tc") { - // This presumes XTerm 24-bit true color. - t.TrueColor = true - } else if tc.getflag("RGB") { - // This is for xterm-direct, which uses a different scheme entirely. - // (ncurses went a very different direction from everyone else, and - // so it's unlikely anything is using this definition.) - t.TrueColor = true - t.SetBg = "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m" - t.SetFg = "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m" - } - - // We only support colors in ANSI 8 or 256 color mode. - if t.Colors < 8 || t.SetFg == "" { - t.Colors = 0 - } - if t.SetCursor == "" { - return nil, "", errNotAddressable - } - - // For padding, we lookup the pad char. If that isn't present, - // and npc is *not* set, then we assume a null byte. - t.PadChar = tc.getstr("pad") - if t.PadChar == "" { - if !tc.getflag("npc") { - t.PadChar = "\u0000" - } - } - - // For terminals that use "standard" SGR sequences, lets combine the - // foreground and background together. - if strings.HasPrefix(t.SetFg, "\x1b[") && - strings.HasPrefix(t.SetBg, "\x1b[") && - strings.HasSuffix(t.SetFg, "m") && - strings.HasSuffix(t.SetBg, "m") { - fg := t.SetFg[:len(t.SetFg)-1] - r := regexp.MustCompile("%p1") - bg := r.ReplaceAllString(t.SetBg[2:], "%p2") - t.SetFgBg = fg + ";" + bg - } - - return t, tc.desc, nil -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go deleted file mode 100644 index 80358b553..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go +++ /dev/null @@ -1,48 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package emacs - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // GNU Emacs term.el terminal emulation - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "eterm", - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - AttrOff: "\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Reverse: "\x1b[7m", - PadChar: "\x00", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) - - // Emacs term.el terminal emulator term-protocol-version 0.96 - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "eterm-color", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - AttrOff: "\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - SetFg: "\x1b[%p1%{30}%+%dm", - SetBg: "\x1b[%p1%'('%+%dm", - SetFgBg: "\x1b[%p1%{30}%+%d;%p2%'('%+%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go b/vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go deleted file mode 100644 index 3b75d8e15..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2024 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package extended contains an extended set of terminal descriptions. -// Applications desiring to have a better chance of Just Working by -// default should include this package. This will significantly increase -// the size of the program. -package extended - -import ( - // The following imports just register themselves -- - // these are the terminal types we aggregate in this package. - _ "github.com/gdamore/tcell/v2/terminfo/a/aixterm" - _ "github.com/gdamore/tcell/v2/terminfo/a/alacritty" - _ "github.com/gdamore/tcell/v2/terminfo/a/ansi" - _ "github.com/gdamore/tcell/v2/terminfo/c/cygwin" - _ "github.com/gdamore/tcell/v2/terminfo/d/dtterm" - _ "github.com/gdamore/tcell/v2/terminfo/e/emacs" - _ "github.com/gdamore/tcell/v2/terminfo/f/foot" - _ "github.com/gdamore/tcell/v2/terminfo/g/gnome" - _ "github.com/gdamore/tcell/v2/terminfo/k/konsole" - _ "github.com/gdamore/tcell/v2/terminfo/k/kterm" - _ "github.com/gdamore/tcell/v2/terminfo/l/linux" - _ "github.com/gdamore/tcell/v2/terminfo/p/pcansi" - _ "github.com/gdamore/tcell/v2/terminfo/r/rxvt" - _ "github.com/gdamore/tcell/v2/terminfo/s/screen" - _ "github.com/gdamore/tcell/v2/terminfo/s/simpleterm" - _ "github.com/gdamore/tcell/v2/terminfo/s/sun" - _ "github.com/gdamore/tcell/v2/terminfo/t/tmux" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt100" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt102" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt220" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt320" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt400" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt420" - _ "github.com/gdamore/tcell/v2/terminfo/x/xfce" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm_ghostty" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty" -) diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/f/foot/foot.go b/vendor/github.com/gdamore/tcell/v2/terminfo/f/foot/foot.go deleted file mode 100644 index a07572738..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/f/foot/foot.go +++ /dev/null @@ -1,42 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package foot - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // foot terminal emulator - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "foot", - Aliases: []string{"foot-extra"}, - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38:5:%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48:5:%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38:5:%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48:5:%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go deleted file mode 100644 index 29565169d..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go +++ /dev/null @@ -1,80 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package gnome - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // GNOME Terminal - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "gnome", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // GNOME Terminal with xterm 256-colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "gnome-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/gen.sh b/vendor/github.com/gdamore/tcell/v2/terminfo/gen.sh deleted file mode 100644 index 851175a3f..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/gen.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -while read line -do - case "$line" in - *'|'*) - alias=${line#*|} - line=${line%|*} - ;; - *) - alias=${line%%,*} - ;; - esac - - alias=${alias//-/_} - direc=${alias:0:1} - - mkdir -p ${direc}/${alias} - go run mkinfo.go -P ${alias} -go ${direc}/${alias}/term.go ${line//,/ } -done < models.txt diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go deleted file mode 100644 index 88dad2f17..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go +++ /dev/null @@ -1,82 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package konsole - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // KDE console window - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "konsole", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // KDE console window with xterm 256-colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "konsole-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go deleted file mode 100644 index a402ab9da..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go +++ /dev/null @@ -1,39 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package kterm - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // kterm kanji terminal emulator (X window system) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "kterm", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - AttrOff: "\x1b[m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aajjkkllmmnnooppqqrrssttuuvvwwxx~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go deleted file mode 100644 index 250c8e4b8..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go +++ /dev/null @@ -1,38 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package linux - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // Linux console - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "linux", - Colors: 8, - Clear: "\x1b[H\x1b[J", - ShowCursor: "\x1b[?25h\x1b[?0c", - HideCursor: "\x1b[?25l\x1b[?1c", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/models.txt b/vendor/github.com/gdamore/tcell/v2/terminfo/models.txt deleted file mode 100644 index f12a8dbca..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/models.txt +++ /dev/null @@ -1,29 +0,0 @@ -aixterm -alacritty -ansi -cygwin -dtterm -eterm,eterm-color|emacs -gnome,gnome-256color -hpterm -konsole,konsole-256color -kterm -linux -pcansi -rxvt,rxvt-256color,rxvt-88color,rxvt-unicode,rxvt-unicode-256color -screen,screen-256color -st,st-256color|simpleterm -tmux,tmux-256color -vt100 -vt102 -vt220 -vt320 -vt400 -vt420 -wy50 -wy60 -wy99-ansi,wy99a-ansi -xfce -xterm,xterm-88color,xterm-256color -xterm-ghostty -xterm-kitty diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go deleted file mode 100644 index a6050176e..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go +++ /dev/null @@ -1,32 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package pcansi - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // ibm-pc terminal programs claiming to be ANSI - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "pcansi", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[J", - AttrOff: "\x1b[0;10m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[37;40m", - PadChar: "\x00", - AltChars: "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe", - EnterAcs: "\x1b[12m", - ExitAcs: "\x1b[10m", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go deleted file mode 100644 index 1a9f6884c..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go +++ /dev/null @@ -1,176 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package rxvt - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // rxvt terminal emulator (X Window System) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "rxvt", - Aliases: []string{"rxvt-color"}, - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b=", - ExitKeypad: "\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // rxvt 2.7.9 with xterm 256-colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "rxvt-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b=", - ExitKeypad: "\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // rxvt 2.7.9 with xterm 88-colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "rxvt-88color", - Columns: 80, - Lines: 24, - Colors: 88, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b=", - ExitKeypad: "\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // rxvt-unicode terminal (X Window System) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "rxvt-unicode", - Columns: 80, - Lines: 24, - Colors: 88, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[r\x1b[?1049l", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b=", - ExitKeypad: "\x1b>", - SetFg: "\x1b[38;5;%p1%dm", - SetBg: "\x1b[48;5;%p1%dm", - SetFgBg: "\x1b[38;5;%p1%d;48;5;%p2%dm", - ResetFgBg: "\x1b[39;49m", - AltChars: "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) - - // rxvt-unicode terminal with 256 colors (X Window System) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "rxvt-unicode-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[r\x1b[?1049l", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b=", - ExitKeypad: "\x1b>", - SetFg: "\x1b[38;5;%p1%dm", - SetBg: "\x1b[48;5;%p1%dm", - SetFgBg: "\x1b[38;5;%p1%d;48;5;%p2%dm", - ResetFgBg: "\x1b[39;49m", - AltChars: "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go deleted file mode 100644 index 4d5065498..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go +++ /dev/null @@ -1,74 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package screen - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // VT 100/ANSI X3.64 virtual terminal - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "screen", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[34h\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) - - // GNU Screen with 256 colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "screen-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[34h\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go deleted file mode 100644 index a0640ac68..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go +++ /dev/null @@ -1,80 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package simpleterm - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // aka simpleterm - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "st", - Aliases: []string{"stterm"}, - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - AltChars: "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAcs: "\x1b)0", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // simpleterm with 256 colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "st-256color", - Aliases: []string{"stterm-256color"}, - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAcs: "\x1b)0", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/s/sun/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/s/sun/term.go deleted file mode 100644 index 52327bccb..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/s/sun/term.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2021 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This terminal definition is hand-coded, as the default terminfo for -// this terminal is busted with respect to color. Unlike pretty much every -// other ANSI compliant terminal, this terminal cannot combine foreground and -// background escapes. The default terminfo also only provides escapes for -// 16-bit color. - -package sun - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // Sun Microsystems Inc. workstation console - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "sun", - Aliases: []string{"sun1", "sun2"}, - Columns: 80, - Lines: 34, - Clear: "\f", - AttrOff: "\x1b[m", - Reverse: "\x1b[7m", - PadChar: "\x00", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) - - // Sun Microsystems Workstation console with color support (IA systems) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "sun-color", - Columns: 80, - Lines: 34, - Colors: 256, - Clear: "\f", - AttrOff: "\x1b[m", - Bold: "\x1b[1m", - Reverse: "\x1b[7m", - SetFg: "\x1b[38;5;%p1%dm", - SetBg: "\x1b[48;5;%p1%dm", - ResetFgBg: "\x1b[0m", - PadChar: "\x00", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go deleted file mode 100644 index 5f4c87176..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go +++ /dev/null @@ -1,80 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package tmux - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // tmux terminal multiplexer - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "tmux", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[34h\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // tmux with 256 colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "tmux-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[34h\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/terminfo.go b/vendor/github.com/gdamore/tcell/v2/terminfo/terminfo.go deleted file mode 100644 index 2e1e5638c..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/terminfo.go +++ /dev/null @@ -1,628 +0,0 @@ -// Copyright 2025 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package terminfo - -import ( - "bytes" - "errors" - "fmt" - "io" - "os" - "strconv" - "strings" - "sync" - "time" -) - -var ( - // ErrTermNotFound indicates that a suitable terminal entry could - // not be found. This can result from either not having TERM set, - // or from the TERM failing to support certain minimal functionality, - // in particular absolute cursor addressability (the cup capability) - // is required. For example, legacy "adm3" lacks this capability, - // whereas the slightly newer "adm3a" supports it. This failure - // occurs most often with "dumb". - ErrTermNotFound = errors.New("terminal entry not found") -) - -// Terminfo represents a terminfo entry. Note that we use friendly names -// in Go, but when we write out JSON, we use the same names as terminfo. -// The name, aliases and smous, rmous fields do not come from terminfo directly. -type Terminfo struct { - Name string - Aliases []string - Columns int // cols - Lines int // lines - Colors int // colors - Clear string // clear - EnterCA string // smcup - ExitCA string // rmcup - ShowCursor string // cnorm - HideCursor string // civis - AttrOff string // sgr0 - Underline string // smul - Bold string // bold - Blink string // blink - Reverse string // rev - Dim string // dim - Italic string // sitm - EnterKeypad string // smkx - ExitKeypad string // rmkx - SetFg string // setaf - SetBg string // setab - ResetFgBg string // op - SetCursor string // cup - PadChar string // pad - Mouse string // kmous - AltChars string // acsc - EnterAcs string // smacs - ExitAcs string // rmacs - EnableAcs string // enacs - - // These are non-standard extensions to terminfo. This includes - // true color support, and some additional keys. Its kind of bizarre - // that shifted variants of left and right exist, but not up and down. - // Terminal support for these are going to vary amongst XTerm - // emulations, so don't depend too much on them in your application. - - StrikeThrough string // smxx - SetFgBg string // setfgbg - SetFgBgRGB string // setfgbgrgb - SetFgRGB string // setfrgb - SetBgRGB string // setbrgb - InsertChar string // string to insert a character (ich1) - AutoMargin bool // true if writing to last cell in line advances - TrueColor bool // true if the terminal supports direct color - DisableAutoMargin string // smam - EnableAutoMargin string // rmam - XTermLike bool // (XT) has XTerm extensions -} - -type stack []any - -func (st stack) Push(v any) stack { - if b, ok := v.(bool); ok { - if b { - return append(st, 1) - } else { - return append(st, 0) - } - } - return append(st, v) -} - -func (st stack) PopString() (string, stack) { - if len(st) > 0 { - e := st[len(st)-1] - var s string - switch v := e.(type) { - case int: - s = strconv.Itoa(v) - case string: - s = v - } - return s, st[:len(st)-1] - } - return "", st - -} -func (st stack) PopInt() (int, stack) { - if len(st) > 0 { - e := st[len(st)-1] - var i int - switch v := e.(type) { - case int: - i = v - case string: - i, _ = strconv.Atoi(v) - } - return i, st[:len(st)-1] - } - return 0, st -} - -// static vars -var svars [26]string - -type paramsBuffer struct { - out bytes.Buffer - buf bytes.Buffer -} - -// Start initializes the params buffer with the initial string data. -// It also locks the paramsBuffer. The caller must call End() when -// finished. -func (pb *paramsBuffer) Start(s string) { - pb.out.Reset() - pb.buf.Reset() - pb.buf.WriteString(s) -} - -// End returns the final output from TParam, but it also releases the lock. -func (pb *paramsBuffer) End() string { - s := pb.out.String() - return s -} - -// NextCh returns the next input character to the expander. -func (pb *paramsBuffer) NextCh() (byte, error) { - return pb.buf.ReadByte() -} - -// PutCh "emits" (rather schedules for output) a single byte character. -func (pb *paramsBuffer) PutCh(ch byte) { - pb.out.WriteByte(ch) -} - -// PutString schedules a string for output. -func (pb *paramsBuffer) PutString(s string) { - pb.out.WriteString(s) -} - -// TParm takes a terminfo parameterized string, such as setaf or cup, and -// evaluates the string, and returns the result with the parameter -// applied. -func (t *Terminfo) TParm(s string, p ...any) string { - var stk stack - var a string - var ai, bi int - var dvars [26]string - var params [9]any - var pb = ¶msBuffer{} - - pb.Start(s) - - // make sure we always have 9 parameters -- makes it easier - // later to skip checks - for i := 0; i < len(params) && i < len(p); i++ { - params[i] = p[i] - } - - const ( - emit = iota - toEnd - toElse - ) - - skip := emit - - for { - - ch, err := pb.NextCh() - if err != nil { - break - } - - if ch != '%' { - if skip == emit { - pb.PutCh(ch) - } - continue - } - - ch, err = pb.NextCh() - if err != nil { - // XXX Error - break - } - if skip == toEnd { - if ch == ';' { - skip = emit - } - continue - } else if skip == toElse { - if ch == 'e' || ch == ';' { - skip = emit - } - continue - } - - switch ch { - case '%': // quoted % - pb.PutCh(ch) - - case 'i': // increment both parameters (ANSI cup support) - if i, ok := params[0].(int); ok { - params[0] = i + 1 - } - if i, ok := params[1].(int); ok { - params[1] = i + 1 - } - - case 's': - // NB: 's', 'c', and 'd' below are special cased for - // efficiency. They could be handled by the richer - // format support below, less efficiently. - a, stk = stk.PopString() - pb.PutString(a) - - case 'c': - // Integer as special character. - ai, stk = stk.PopInt() - pb.PutCh(byte(ai)) - - case 'd': - ai, stk = stk.PopInt() - pb.PutString(strconv.Itoa(ai)) - - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'x', 'X', 'o', ':': - // This is pretty suboptimal, but this is rarely used. - // None of the mainstream terminals use any of this, - // and it would surprise me if this code is ever - // executed outside test cases. - f := "%" - if ch == ':' { - ch, _ = pb.NextCh() - } - f += string(ch) - for ch == '+' || ch == '-' || ch == '#' || ch == ' ' { - ch, _ = pb.NextCh() - f += string(ch) - } - for (ch >= '0' && ch <= '9') || ch == '.' { - ch, _ = pb.NextCh() - f += string(ch) - } - switch ch { - case 'd', 'x', 'X', 'o': - ai, stk = stk.PopInt() - pb.PutString(fmt.Sprintf(f, ai)) - case 's': - a, stk = stk.PopString() - pb.PutString(fmt.Sprintf(f, a)) - case 'c': - ai, stk = stk.PopInt() - pb.PutString(fmt.Sprintf(f, ai)) - } - - case 'p': // push parameter - ch, _ = pb.NextCh() - ai = int(ch - '1') - if ai >= 0 && ai < len(params) { - stk = stk.Push(params[ai]) - } else { - stk = stk.Push(0) - } - - case 'P': // pop & store variable - ch, _ = pb.NextCh() - if ch >= 'A' && ch <= 'Z' { - svars[int(ch-'A')], stk = stk.PopString() - } else if ch >= 'a' && ch <= 'z' { - dvars[int(ch-'a')], stk = stk.PopString() - } - - case 'g': // recall & push variable - ch, _ = pb.NextCh() - if ch >= 'A' && ch <= 'Z' { - stk = stk.Push(svars[int(ch-'A')]) - } else if ch >= 'a' && ch <= 'z' { - stk = stk.Push(dvars[int(ch-'a')]) - } - - case '\'': // push(char) - the integer value of it - ch, _ = pb.NextCh() - _, _ = pb.NextCh() // must be ' but we don't check - stk = stk.Push(int(ch)) - - case '{': // push(int) - ai = 0 - ch, _ = pb.NextCh() - for ch >= '0' && ch <= '9' { - ai *= 10 - ai += int(ch - '0') - ch, _ = pb.NextCh() - } - // ch must be '}' but no verification - stk = stk.Push(ai) - - case 'l': // push(strlen(pop)) - a, stk = stk.PopString() - stk = stk.Push(len(a)) - - case '+': - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai + bi) - - case '-': - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai - bi) - - case '*': - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai * bi) - - case '/': - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - if bi != 0 { - stk = stk.Push(ai / bi) - } else { - stk = stk.Push(0) - } - - case 'm': // push(pop mod pop) - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - if bi != 0 { - stk = stk.Push(ai % bi) - } else { - stk = stk.Push(0) - } - - case '&': // AND - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai & bi) - - case '|': // OR - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai | bi) - - case '^': // XOR - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai ^ bi) - - case '~': // bit complement - ai, stk = stk.PopInt() - stk = stk.Push(ai ^ -1) - - case '!': // logical NOT - ai, stk = stk.PopInt() - stk = stk.Push(ai == 0) - - case '=': // numeric compare - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai == bi) - - case '>': // greater than, numeric - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai > bi) - - case '<': // less than, numeric - bi, stk = stk.PopInt() - ai, stk = stk.PopInt() - stk = stk.Push(ai < bi) - - case '?': // start conditional - - case ';': - skip = emit - - case 't': - ai, stk = stk.PopInt() - if ai == 0 { - skip = toElse - } - - case 'e': - skip = toEnd - - default: - pb.PutString("%" + string(ch)) - } - } - - return pb.End() -} - -// TPuts emits the string to the writer, but expands inline padding -// indications (of the form $<[delay]> where [delay] is msec) to -// a suitable time (unless the terminfo string indicates this isn't needed -// by specifying npc - no padding). All Terminfo based strings should be -// emitted using this function. -func (t *Terminfo) TPuts(w io.Writer, s string) { - for { - beg := strings.Index(s, "$<") - if beg < 0 { - // Most strings don't need padding, which is good news! - _, _ = io.WriteString(w, s) - return - } - _, _ = io.WriteString(w, s[:beg]) - s = s[beg+2:] - end := strings.Index(s, ">") - if end < 0 { - // unterminated.. just emit bytes unadulterated - _, _ = io.WriteString(w, "$<"+s) - return - } - val := s[:end] - s = s[end+1:] - padus := 0 - unit := time.Millisecond - dot := false - loop: - for i := range val { - switch val[i] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - padus *= 10 - padus += int(val[i] - '0') - if dot { - unit /= 10 - } - case '.': - if !dot { - dot = true - } else { - break loop - } - default: - break loop - } - } - - // Curses historically uses padding to achieve "fine grained" - // delays. We have much better clocks these days, and so we - // do not rely on padding but simply sleep a bit. - if len(t.PadChar) > 0 { - time.Sleep(unit * time.Duration(padus)) - } - } -} - -// TGoto returns a string suitable for addressing the cursor at the given -// row and column. The origin 0, 0 is in the upper left corner of the screen. -func (t *Terminfo) TGoto(col, row int) string { - return t.TParm(t.SetCursor, row, col) -} - -// TColor returns a string corresponding to the given foreground and background -// colors. Either fg or bg can be set to -1 to elide. -func (t *Terminfo) TColor(fi, bi int) string { - rv := "" - // As a special case, we map bright colors to lower versions if the - // color table only holds 8. For the remaining 240 colors, the user - // is out of luck. Someday we could create a mapping table, but its - // not worth it. - if t.Colors == 8 { - if fi > 7 && fi < 16 { - fi -= 8 - } - if bi > 7 && bi < 16 { - bi -= 8 - } - } - if t.Colors > fi && fi >= 0 { - rv += t.TParm(t.SetFg, fi) - } - if t.Colors > bi && bi >= 0 { - rv += t.TParm(t.SetBg, bi) - } - return rv -} - -var ( - dblock sync.Mutex - terminfos = make(map[string]*Terminfo) -) - -// AddTerminfo can be called to register a new Terminfo entry. -func AddTerminfo(t *Terminfo) { - dblock.Lock() - - terminfos[t.Name] = t - for _, x := range t.Aliases { - terminfos[x] = t - } - dblock.Unlock() -} - -// LookupTerminfo attempts to find a definition for the named $TERM. -func LookupTerminfo(name string) (*Terminfo, error) { - if name == "" { - // else on windows: index out of bounds - // on the name[0] reference below - return nil, ErrTermNotFound - } - - addtruecolor := false - add256color := false - switch os.Getenv("COLORTERM") { - case "truecolor", "24bit", "24-bit": - addtruecolor = true - } - dblock.Lock() - t := terminfos[name] - dblock.Unlock() - - // If the name ends in -truecolor, then fabricate an entry - // from the corresponding -256color, -color, or bare terminal. - if t != nil && t.TrueColor { - addtruecolor = true - } else if t == nil && strings.HasSuffix(name, "-truecolor") { - - suffixes := []string{ - "-256color", - "-88color", - "-color", - "", - } - base := name[:len(name)-len("-truecolor")] - for _, s := range suffixes { - if t, _ = LookupTerminfo(base + s); t != nil { - addtruecolor = true - break - } - } - } - - // If the name ends in -256color, maybe fabricate using the xterm 256 color sequences - if t == nil && strings.HasSuffix(name, "-256color") { - suffixes := []string{ - "-88color", - "-color", - } - base := name[:len(name)-len("-256color")] - for _, s := range suffixes { - if t, _ = LookupTerminfo(base + s); t != nil { - add256color = true - break - } - } - } - - if t == nil { - return nil, ErrTermNotFound - } - - switch os.Getenv("TCELL_TRUECOLOR") { - case "": - case "disable": - addtruecolor = false - default: - addtruecolor = true - } - - // If the user has requested 24-bit color with $COLORTERM, then - // amend the value (unless already present). This means we don't - // need to have a value present. - if addtruecolor && - t.SetFgBgRGB == "" && - t.SetFgRGB == "" && - t.SetBgRGB == "" { - - // Supply vanilla ISO 8613-6:1994 24-bit color sequences. - t.SetFgRGB = "\x1b[38;2;%p1%d;%p2%d;%p3%dm" - t.SetBgRGB = "\x1b[48;2;%p1%d;%p2%d;%p3%dm" - t.SetFgBgRGB = "\x1b[38;2;%p1%d;%p2%d;%p3%d;" + - "48;2;%p4%d;%p5%d;%p6%dm" - } - - if add256color { - t.Colors = 256 - t.SetFg = "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m" - t.SetBg = "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m" - t.SetFgBg = "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m" - t.ResetFgBg = "\x1b[39;49m" - } - - return t, nil -} - -func TerminfoNames() []string { - res := make([]string, 0, len(terminfos)) - for m := range terminfos { - res = append(res, m) - } - return res -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go deleted file mode 100644 index ddd09efa3..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go +++ /dev/null @@ -1,33 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package vt100 - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // DEC VT100 (w/advanced video) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "vt100", - Aliases: []string{"vt100-am"}, - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[J$<50>", - AttrOff: "\x1b[m\x0f$<2>", - Underline: "\x1b[4m$<2>", - Bold: "\x1b[1m$<2>", - Blink: "\x1b[5m$<2>", - Reverse: "\x1b[7m$<2>", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH$<5>", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go deleted file mode 100644 index df5d23d98..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go +++ /dev/null @@ -1,32 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package vt102 - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // DEC VT102 - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "vt102", - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[J$<50>", - AttrOff: "\x1b[m\x0f$<2>", - Underline: "\x1b[4m$<2>", - Bold: "\x1b[1m$<2>", - Blink: "\x1b[5m$<2>", - Reverse: "\x1b[7m$<2>", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b(B\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH$<5>", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go deleted file mode 100644 index b851993a2..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go +++ /dev/null @@ -1,33 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package vt220 - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // DEC VT220 - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "vt220", - Aliases: []string{"vt200"}, - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[J", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0$<2>", - ExitAcs: "\x1b(B$<4>", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go deleted file mode 100644 index d50a2d7d8..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go +++ /dev/null @@ -1,34 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package vt320 - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // DEC VT320 7 bit terminal - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "vt320", - Aliases: []string{"vt300"}, - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[2J", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go deleted file mode 100644 index 573eae8fe..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go +++ /dev/null @@ -1,35 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package vt400 - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // DEC VT400 24x80 column autowrap - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "vt400", - Aliases: []string{"vt400-24", "dec-vt400"}, - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[J$<10/>", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x1b(B", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - InsertChar: "\x1b[@", - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go deleted file mode 100644 index 275f9b59a..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go +++ /dev/null @@ -1,37 +0,0 @@ -// This file was originally generated automatically, -// but it is edited to correct for errors in the VT420 -// terminfo data. Additionally we have added extended -// information for the extended F-keys. - -package vt420 - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // DEC VT420 - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "vt420", - Columns: 80, - Lines: 24, - Clear: "\x1b[H\x1b[2J$<50>", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[m\x1b(B$<2>", - Underline: "\x1b[4m", - Bold: "\x1b[1m$<2>", - Blink: "\x1b[5m$<2>", - Reverse: "\x1b[7m$<2>", - EnterKeypad: "\x1b=", - ExitKeypad: "\x1b>", - PadChar: "\x00", - AltChars: "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0$<2>", - ExitAcs: "\x1b(B$<4>", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - SetCursor: "\x1b[%i%p1%d;%p2%dH$<10>", - AutoMargin: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go deleted file mode 100644 index 1a4490091..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go +++ /dev/null @@ -1,42 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package xfce - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // Xfce Terminal - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xfce", - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b7\x1b[?47h", - ExitCA: "\x1b[2J\x1b[?47l\x1b8", - ShowCursor: "\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b[0m\x0f", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - PadChar: "\x00", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x0e", - ExitAcs: "\x0f", - EnableAcs: "\x1b)0", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/direct.go b/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/direct.go deleted file mode 100644 index 18917f14a..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/direct.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2021 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This terminal definition is derived from the xterm-256color definition, but -// makes use of the RGB property these terminals have to support direct color. -// The terminfo entry for this uses a new format for the color handling introduced -// by ncurses 6.1 (and used by nobody else), so this override ensures we get -// good handling even in the face of this. - -package xterm - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // derived from xterm-256color, but adds full RGB support - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xterm-direct", - Aliases: []string{"xterm-truecolor"}, - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - SetFgRGB: "\x1b[38;2;%p1%d;%p2%d;%p3%dm", - SetBgRGB: "\x1b[48;2;%p1%d;%p2%d;%p3%dm", - SetFgBgRGB: "\x1b[38;2;%p1%d;%p2%d;%p3%d;48;2;%p4%d;%p5%d;%p6%dm", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - TrueColor: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go deleted file mode 100644 index 7595f51e0..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go +++ /dev/null @@ -1,117 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package xterm - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // xterm terminal emulator (X Window System) - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xterm", - Aliases: []string{"xterm-debian"}, - Columns: 80, - Lines: 24, - Colors: 8, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[3%p1%dm", - SetBg: "\x1b[4%p1%dm", - SetFgBg: "\x1b[3%p1%d;4%p2%dm", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // xterm with 88 colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xterm-88color", - Columns: 80, - Lines: 24, - Colors: 88, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) - - // xterm with 256 colors - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xterm-256color", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h\x1b[22;0;0t", - ExitCA: "\x1b[?1049l\x1b[23;0;0t", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_ghostty/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_ghostty/term.go deleted file mode 100644 index c57951212..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_ghostty/term.go +++ /dev/null @@ -1,47 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package xterm_ghostty - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // Ghostty - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xterm-ghostty", - Aliases: []string{"ghostty"}, - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[?12l\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Blink: "\x1b[5m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h\x1b=", - ExitKeypad: "\x1b[?1l\x1b>", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[<", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - TrueColor: true, - AutoMargin: true, - InsertChar: "\x1b[@", - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go b/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go deleted file mode 100644 index f7edaf3aa..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go +++ /dev/null @@ -1,44 +0,0 @@ -// Generated automatically. DO NOT HAND-EDIT. - -package xterm_kitty - -import "github.com/gdamore/tcell/v2/terminfo" - -func init() { - - // KovIdTTY - terminfo.AddTerminfo(&terminfo.Terminfo{ - Name: "xterm-kitty", - Columns: 80, - Lines: 24, - Colors: 256, - Clear: "\x1b[H\x1b[2J", - EnterCA: "\x1b[?1049h", - ExitCA: "\x1b[?1049l", - ShowCursor: "\x1b[?12h\x1b[?25h", - HideCursor: "\x1b[?25l", - AttrOff: "\x1b(B\x1b[m", - Underline: "\x1b[4m", - Bold: "\x1b[1m", - Dim: "\x1b[2m", - Italic: "\x1b[3m", - Reverse: "\x1b[7m", - EnterKeypad: "\x1b[?1h", - ExitKeypad: "\x1b[?1l", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", - ResetFgBg: "\x1b[39;49m", - AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - EnterAcs: "\x1b(0", - ExitAcs: "\x1b(B", - EnableAutoMargin: "\x1b[?7h", - DisableAutoMargin: "\x1b[?7l", - StrikeThrough: "\x1b[9m", - Mouse: "\x1b[M", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - TrueColor: true, - AutoMargin: true, - XTermLike: true, - }) -} diff --git a/vendor/github.com/gdamore/tcell/v2/terms_dynamic.go b/vendor/github.com/gdamore/tcell/v2/terms_dynamic.go deleted file mode 100644 index 9e5494498..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terms_dynamic.go +++ /dev/null @@ -1,43 +0,0 @@ -//go:build !tcell_minimal && !nacl && !js && !zos && !plan9 && !windows && !android -// +build !tcell_minimal,!nacl,!js,!zos,!plan9,!windows,!android - -// Copyright 2019 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -import ( - // This imports a dynamic version of the terminal database, which - // is built using infocmp. This relies on a working installation - // of infocmp (typically supplied with ncurses). We only do this - // for systems likely to have that -- i.e. UNIX based hosts. We - // also don't support Android here, because you really don't want - // to run external programs there. Generally the android terminals - // will be automatically included anyway. - "github.com/gdamore/tcell/v2/terminfo" - "github.com/gdamore/tcell/v2/terminfo/dynamic" - - "fmt" -) - -func loadDynamicTerminfo(term string) (*terminfo.Terminfo, error) { - if term == "" { - return nil, fmt.Errorf("%w: term not set", ErrTermNotFound) - } - ti, _, e := dynamic.LoadTerminfo(term) - if e != nil { - return nil, e - } - return ti, nil -} diff --git a/vendor/github.com/gdamore/tcell/v2/terms_static.go b/vendor/github.com/gdamore/tcell/v2/terms_static.go deleted file mode 100644 index 6d725cbcc..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terms_static.go +++ /dev/null @@ -1,28 +0,0 @@ -//go:build tcell_minimal || nacl || zos || plan9 || windows || android || js -// +build tcell_minimal nacl zos plan9 windows android js - -// Copyright 2019 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tcell - -import ( - "errors" - - "github.com/gdamore/tcell/v2/terminfo" -) - -func loadDynamicTerminfo(_ string) (*terminfo.Terminfo, error) { - return nil, errors.New("terminal type unsupported") -} diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen.go b/vendor/github.com/gdamore/tcell/v2/tscreen.go deleted file mode 100644 index 7dc7cdf81..000000000 --- a/vendor/github.com/gdamore/tcell/v2/tscreen.go +++ /dev/null @@ -1,1317 +0,0 @@ -// Copyright 2025 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build !(js && wasm) -// +build !js !wasm - -package tcell - -import ( - "bytes" - "encoding/base64" - "errors" - "io" - "maps" - "os" - "runtime" - "strconv" - "strings" - "sync" - "unicode/utf8" - - "golang.org/x/term" - "golang.org/x/text/transform" - - "github.com/gdamore/tcell/v2/terminfo" -) - -// NewTerminfoScreen returns a Screen that uses the stock TTY interface -// and POSIX terminal control, combined with a terminfo description taken from -// the $TERM environment variable. It returns an error if the terminal -// is not supported for any reason. -// -// For terminals that do not support dynamic resize events, the $LINES -// $COLUMNS environment variables can be set to the actual window size, -// otherwise defaults taken from the terminal database are used. -func NewTerminfoScreen() (Screen, error) { - return NewTerminfoScreenFromTty(nil) -} - -// LookupTerminfo attempts to find a definition for the named $TERM falling -// back to attempting to parse the output from infocmp. -func LookupTerminfo(name string) (ti *terminfo.Terminfo, e error) { - ti, e = terminfo.LookupTerminfo(name) - if e != nil { - ti, e = loadDynamicTerminfo(name) - if e != nil { - return nil, e - } - terminfo.AddTerminfo(ti) - } - - return -} - -var defaultTerm string - -// NewTerminfoScreenFromTtyTerminfo returns a Screen using a custom Tty -// implementation and custom terminfo specification. -// If the passed in tty is nil, then a reasonable default (typically /dev/tty) -// is presumed, at least on UNIX hosts. (Windows hosts will typically fail this -// call altogether.) -// If passed terminfo is nil, then TERM environment variable is queried for -// terminal specification. -func NewTerminfoScreenFromTtyTerminfo(tty Tty, ti *terminfo.Terminfo) (s Screen, e error) { - term := defaultTerm - if term == "" { - term = os.Getenv("TERM") - } - if ti == nil { - ti, e = LookupTerminfo(term) - if e != nil { - return nil, e - } - } - - t := &tScreen{ti: ti, tty: tty} - - if len(ti.Mouse) > 0 { - t.mouse = []byte(ti.Mouse) - } - t.prepareKeys() - t.buildAcsMap() - t.resizeQ = make(chan bool, 1) - t.fallback = make(map[rune]string) - maps.Copy(t.fallback, RuneFallbacks) - - return &baseScreen{screenImpl: t}, nil -} - -// NewTerminfoScreenFromTty returns a Screen using a custom Tty implementation. -// If the passed in tty is nil, then a reasonable default (typically /dev/tty) -// is presumed, at least on UNIX hosts. (Windows hosts will typically fail this -// call altogether.) -func NewTerminfoScreenFromTty(tty Tty) (Screen, error) { - return NewTerminfoScreenFromTtyTerminfo(tty, nil) -} - -// tKeyCode represents a combination of a key code and modifiers. -type tKeyCode struct { - key Key - mod ModMask -} - -// tScreen represents a screen backed by a terminfo implementation. -type tScreen struct { - ti *terminfo.Terminfo - tty Tty - h int - w int - fini bool - cells CellBuffer - buffering bool // true if we are collecting writes to buf instead of sending directly to out - buf bytes.Buffer - curstyle Style - style Style - resizeQ chan bool - quit chan struct{} - keychan chan []byte - cx int - cy int - mouse []byte - clear bool - cursorx int - cursory int - acs map[rune]string - charset string - encoder transform.Transformer - decoder transform.Transformer - fallback map[rune]string - colors map[Color]Color - palette []Color - truecolor bool - escaped bool - buttondn bool - finiOnce sync.Once - enablePaste string - disablePaste string - enterUrl string - exitUrl string - setWinSize string - enableFocus string - disableFocus string - doubleUnder string - curlyUnder string - dottedUnder string - dashedUnder string - underColor string - underRGB string - underFg string // reset underline color to foreground - cursorStyles map[CursorStyle]string - cursorStyle CursorStyle - cursorColor Color - cursorRGB string - cursorFg string - saved *term.State - stopQ chan struct{} - eventQ chan Event - running bool - wg sync.WaitGroup - mouseFlags MouseFlags - pasteEnabled bool - focusEnabled bool - setTitle string - saveTitle string - restoreTitle string - title string - setClipboard string - startSyncOut string - endSyncOut string - enableCsiU string - disableCsiU string - disableEmojiWA bool // if true don't try to workaround emoji bugs - input InputProcessor - - sync.Mutex -} - -func (t *tScreen) Init() error { - if e := t.initialize(); e != nil { - return e - } - - t.keychan = make(chan []byte, 10) - - t.charset = getCharset() - if enc := GetEncoding(t.charset); enc != nil { - t.encoder = enc.NewEncoder() - t.decoder = enc.NewDecoder() - } else { - return ErrNoCharset - } - ti := t.ti - - // environment overrides - w := ti.Columns - h := ti.Lines - if i, _ := strconv.Atoi(os.Getenv("LINES")); i != 0 { - h = i - } - if i, _ := strconv.Atoi(os.Getenv("COLUMNS")); i != 0 { - w = i - } - if t.ti.SetFgBgRGB != "" || t.ti.SetFgRGB != "" || t.ti.SetBgRGB != "" { - t.truecolor = true - } - // A user who wants to have his themes honored can - // set this environment variable. - if os.Getenv("TCELL_TRUECOLOR") == "disable" { - t.truecolor = false - } - // clip to reasonable limits - nColors := min(t.nColors(), 256) - t.colors = make(map[Color]Color, nColors) - t.palette = make([]Color, nColors) - for i := range nColors { - t.palette[i] = Color(i) | ColorValid - // identity map for our builtin colors - t.colors[Color(i)|ColorValid] = Color(i) | ColorValid - } - - t.quit = make(chan struct{}) - t.eventQ = make(chan Event, 256) - t.input = NewInputProcessor(t.eventQ) - - t.Lock() - t.cx = -1 - t.cy = -1 - t.style = StyleDefault - t.cells.Resize(w, h) - t.cursorx = -1 - t.cursory = -1 - t.resize() - t.Unlock() - - if err := t.engage(); err != nil { - return err - } - - return nil -} - -func (t *tScreen) prepareBracketedPaste() { - // Another workaround for lack of reporting in terminfo. - // We assume if the terminal has a mouse entry, that it - // offers bracketed paste. But we allow specific overrides - // via our terminal database. - if t.ti.Mouse != "" || t.ti.XTermLike { - t.enablePaste = "\x1b[?2004h" - t.disablePaste = "\x1b[?2004l" - } -} - -func (t *tScreen) prepareUnderlines() { - if t.ti.XTermLike { - t.doubleUnder = "\x1b[4:2m" - t.curlyUnder = "\x1b[4:3m" - t.dottedUnder = "\x1b[4:4m" - t.dashedUnder = "\x1b[4:5m" - t.underColor = "\x1b[58:5:%p1%dm" - t.underRGB = "\x1b[58:2::%p1%d:%p2%d:%p3%dm" - t.underFg = "\x1b[59m" - } -} - -func (t *tScreen) prepareExtendedOSC() { - // Linux is a special beast - because it has a mouse entry, but does - // not swallow these OSC commands properly. - if strings.Contains(t.ti.Name, "linux") { - return - } - // More stuff for limits in terminfo. This time we are applying - // the most common OSC (operating system commands). Generally - // terminals that don't understand these will ignore them. - // Again, we condition this based on mouse capabilities. - if t.ti.Mouse != "" || t.ti.XTermLike { - t.enterUrl = "\x1b]8;%p2%s;%p1%s\x1b\\" - t.exitUrl = "\x1b]8;;\x1b\\" - } - - if t.ti.Mouse != "" || t.ti.XTermLike { - t.setWinSize = "\x1b[8;%p1%p2%d;%dt" - } - - if t.ti.Mouse != "" || t.ti.XTermLike { - t.enableFocus = "\x1b[?1004h" - t.disableFocus = "\x1b[?1004l" - } - - if t.ti.XTermLike { - t.saveTitle = "\x1b[22;2t" - t.restoreTitle = "\x1b[23;2t" - // this also tries to request that UTF-8 is allowed in the title - t.setTitle = "\x1b[>2t\x1b]2;%p1%s\x1b\\" - } - - if t.setClipboard == "" && t.ti.XTermLike { - // this string takes a base64 string and sends it to the clipboard. - // it will also be able to retrieve the clipboard using "?" as the - // sent string, when we support that. - t.setClipboard = "\x1b]52;c;%p1%s\x1b\\" - } - - if t.startSyncOut == "" && t.ti.XTermLike { - // this is in theory a queryable private mode, but we just assume it will be ok - // The terminals we have been able to test it all either just swallow it, or - // handle it. - t.startSyncOut = "\x1b[?2026h" - t.endSyncOut = "\x1b[?2026l" - } - - if t.enableCsiU == "" && t.ti.XTermLike { - if runtime.GOOS == "windows" && os.Getenv("TERM") == "" { - // on Windows, if we don't have a TERM, use only win32-input-mode - t.enableCsiU = "\x1b[?9001h" - t.disableCsiU = "\x1b[?9001l" - } else { - // three advanced keyboard protocols: - // - xterm modifyOtherKeys (uses CSI 27 ~ ) - // - kitty csi-u (uses CSI u) - // - win32-input-mode (uses CSI _) - t.enableCsiU = "\x1b[>4;2m" + "\x1b[>1u" + "\x1b[?9001h" - t.disableCsiU = "\x1b[?9001l" + "\x1b[4;0m" - } - } -} - -func (t *tScreen) prepareCursorStyles() { - if t.ti.Mouse != "" || t.ti.XTermLike { - t.cursorStyles = map[CursorStyle]string{ - CursorStyleDefault: "\x1b[0 q", - CursorStyleBlinkingBlock: "\x1b[1 q", - CursorStyleSteadyBlock: "\x1b[2 q", - CursorStyleBlinkingUnderline: "\x1b[3 q", - CursorStyleSteadyUnderline: "\x1b[4 q", - CursorStyleBlinkingBar: "\x1b[5 q", - CursorStyleSteadyBar: "\x1b[6 q", - } - if t.cursorRGB == "" { - t.cursorRGB = "\x1b]12;#%p1%02x%p2%02x%p3%02x\007" - t.cursorFg = "\x1b]112\007" - } - } -} - -func (t *tScreen) prepareKeys() { - ti := t.ti - if strings.HasPrefix(ti.Name, "xterm") { - // assume its some form of XTerm clone - t.ti.XTermLike = true - ti.XTermLike = true - } - t.prepareBracketedPaste() - t.prepareCursorStyles() - t.prepareUnderlines() - t.prepareExtendedOSC() -} - -func (t *tScreen) Fini() { - t.finiOnce.Do(t.finish) -} - -func (t *tScreen) finish() { - close(t.quit) - t.finalize() -} - -func (t *tScreen) SetStyle(style Style) { - t.Lock() - if !t.fini { - t.style = style - } - t.Unlock() -} - -func (t *tScreen) encodeStr(s string) []byte { - - var dstBuf [128]byte - var buf []byte - nb := dstBuf[:] - dst := 0 - var err error - if enc := t.encoder; enc != nil { - enc.Reset() - dst, _, err = enc.Transform(nb, []byte(s), true) - } - if err != nil || dst == 0 || nb[0] == '\x1a' { - // Combining characters are elided - r, _ := utf8.DecodeRuneInString(s) - if len(buf) == 0 { - if acs, ok := t.acs[r]; ok { - buf = append(buf, []byte(acs)...) - } else if fb, ok := t.fallback[r]; ok { - buf = append(buf, []byte(fb)...) - } else { - buf = append(buf, '?') - } - } - } else { - buf = append(buf, nb[:dst]...) - } - - return buf -} - -func (t *tScreen) sendFgBg(fg Color, bg Color, attr AttrMask) AttrMask { - ti := t.ti - if t.Colors() == 0 { - // foreground vs background, we calculate luminance - // and possibly do a reverse video - if !fg.Valid() { - return attr - } - v, ok := t.colors[fg] - if !ok { - v = FindColor(fg, []Color{ColorBlack, ColorWhite}) - t.colors[fg] = v - } - switch v { - case ColorWhite: - return attr - case ColorBlack: - return attr ^ AttrReverse - } - } - - if fg == ColorReset || bg == ColorReset { - t.TPuts(ti.ResetFgBg) - } - if t.truecolor { - if ti.SetFgBgRGB != "" && fg.IsRGB() && bg.IsRGB() { - r1, g1, b1 := fg.RGB() - r2, g2, b2 := bg.RGB() - t.TPuts(ti.TParm(ti.SetFgBgRGB, - int(r1), int(g1), int(b1), - int(r2), int(g2), int(b2))) - return attr - } - - if fg.IsRGB() && ti.SetFgRGB != "" { - r, g, b := fg.RGB() - t.TPuts(ti.TParm(ti.SetFgRGB, int(r), int(g), int(b))) - fg = ColorDefault - } - - if bg.IsRGB() && ti.SetBgRGB != "" { - r, g, b := bg.RGB() - t.TPuts(ti.TParm(ti.SetBgRGB, - int(r), int(g), int(b))) - bg = ColorDefault - } - } - - if fg.Valid() { - if v, ok := t.colors[fg]; ok { - fg = v - } else { - v = FindColor(fg, t.palette) - t.colors[fg] = v - fg = v - } - } - - if bg.Valid() { - if v, ok := t.colors[bg]; ok { - bg = v - } else { - v = FindColor(bg, t.palette) - t.colors[bg] = v - bg = v - } - } - - if fg.Valid() && bg.Valid() && ti.SetFgBg != "" { - t.TPuts(ti.TParm(ti.SetFgBg, int(fg&0xff), int(bg&0xff))) - } else { - if fg.Valid() && ti.SetFg != "" { - t.TPuts(ti.TParm(ti.SetFg, int(fg&0xff))) - } - if bg.Valid() && ti.SetBg != "" { - t.TPuts(ti.TParm(ti.SetBg, int(bg&0xff))) - } - } - return attr -} - -func (t *tScreen) drawCell(x, y int) int { - - ti := t.ti - - str, style, width := t.cells.Get(x, y) - if !t.cells.Dirty(x, y) { - return width - } - - if y == t.h-1 && x == t.w-1 && t.ti.AutoMargin && ti.DisableAutoMargin == "" && ti.InsertChar != "" { - // our solution is somewhat goofy. - // we write to the second to the last cell what we want in the last cell, then we - // insert a character at that 2nd to last position to shift the last column into - // place, then we rewrite that 2nd to last cell. Old terminals suck. - t.TPuts(ti.TGoto(x-1, y)) - defer func() { - t.TPuts(ti.TGoto(x-1, y)) - t.TPuts(ti.InsertChar) - t.cy = y - t.cx = x - 1 - t.cells.SetDirty(x-1, y, true) - _ = t.drawCell(x-1, y) - t.TPuts(t.ti.TGoto(0, 0)) - t.cy = 0 - t.cx = 0 - }() - } else if t.cy != y || t.cx != x { - t.TPuts(ti.TGoto(x, y)) - t.cx = x - t.cy = y - } - - if style == StyleDefault { - style = t.style - } - if style != t.curstyle { - fg, bg, attrs := style.fg, style.bg, style.attrs - - t.TPuts(ti.AttrOff) - - attrs = t.sendFgBg(fg, bg, attrs) - if attrs&AttrBold != 0 { - t.TPuts(ti.Bold) - } - if us, uc := style.ulStyle, style.ulColor; us != UnderlineStyleNone { - if t.underColor != "" || t.underRGB != "" { - if uc == ColorReset { - t.TPuts(t.underFg) - } else if uc.IsRGB() { - if t.underRGB != "" { - r, g, b := uc.RGB() - t.TPuts(ti.TParm(t.underRGB, int(r), int(g), int(b))) - } else { - if v, ok := t.colors[uc]; ok { - uc = v - } else { - v = FindColor(uc, t.palette) - t.colors[uc] = v - uc = v - } - t.TPuts(ti.TParm(t.underColor, int(uc&0xff))) - } - } else if uc.Valid() { - t.TPuts(ti.TParm(t.underColor, int(uc&0xff))) - } - } - t.TPuts(ti.Underline) // to ensure everyone gets at least a basic underline - switch us { - case UnderlineStyleDouble: - t.TPuts(t.doubleUnder) - case UnderlineStyleCurly: - t.TPuts(t.curlyUnder) - case UnderlineStyleDotted: - t.TPuts(t.dottedUnder) - case UnderlineStyleDashed: - t.TPuts(t.dashedUnder) - } - } - if attrs&AttrReverse != 0 { - t.TPuts(ti.Reverse) - } - if attrs&AttrBlink != 0 { - t.TPuts(ti.Blink) - } - if attrs&AttrDim != 0 { - t.TPuts(ti.Dim) - } - if attrs&AttrItalic != 0 { - t.TPuts(ti.Italic) - } - if attrs&AttrStrikeThrough != 0 { - t.TPuts(ti.StrikeThrough) - } - - // URL string can be long, so don't send it unless we really need to - if t.enterUrl != "" && t.curstyle.url != style.url { - if style.url != "" { - t.TPuts(ti.TParm(t.enterUrl, style.url, style.urlId)) - } else { - t.TPuts(t.exitUrl) - } - } - - t.curstyle = style - } - - // now emit runes - taking care to not overrun width with a - // wide character, and to ensure that we emit exactly one regular - // character followed up by any residual combing characters - - if width < 1 { - width = 1 - } - - buf := t.encodeStr(str) - str = string(buf) - - if width > 1 && str == "?" { - // No FullWidth character support - str = "? " - t.cx = -1 - } - - if x > t.w-width { - // too wide to fit; emit a single space instead - width = 1 - str = " " - } - if width > 1 && x+width < t.w { - // Clobber over any content in the next cell. - // This fixes a problem with some terminals where overwriting two - // adjacent single cells with a wide rune would leave an image - // of the second cell. This is a workaround for buggy terminals. - t.writeString(" \b\b") - } - - t.writeString(str) - t.cx += width - t.cells.SetDirty(x, y, false) - if width > 1 { - t.cx = -1 - } - - return width -} - -func (t *tScreen) ShowCursor(x, y int) { - t.Lock() - t.cursorx = x - t.cursory = y - t.Unlock() -} - -func (t *tScreen) SetCursor(cs CursorStyle, cc Color) { - t.Lock() - t.cursorStyle = cs - t.cursorColor = cc - t.Unlock() -} - -func (t *tScreen) HideCursor() { - t.ShowCursor(-1, -1) -} - -func (t *tScreen) showCursor() { - - x, y := t.cursorx, t.cursory - w, h := t.cells.Size() - if x < 0 || y < 0 || x >= w || y >= h { - t.hideCursor() - return - } - t.TPuts(t.ti.TGoto(x, y)) - t.TPuts(t.ti.ShowCursor) - if t.cursorStyles != nil { - if esc, ok := t.cursorStyles[t.cursorStyle]; ok { - t.TPuts(esc) - } - } - if t.cursorRGB != "" { - if t.cursorColor == ColorReset { - t.TPuts(t.cursorFg) - } else if t.cursorColor.Valid() { - r, g, b := t.cursorColor.RGB() - t.TPuts(t.ti.TParm(t.cursorRGB, int(r), int(g), int(b))) - } - } - t.cx = x - t.cy = y -} - -// writeString sends a string to the terminal. The string is sent as-is and -// this function does not expand inline padding indications (of the form -// $<[delay]> where [delay] is msec). In order to have these expanded, use -// TPuts. If the screen is "buffering", the string is collected in a buffer, -// with the intention that the entire buffer be sent to the terminal in one -// write operation at some point later. -func (t *tScreen) writeString(s string) { - if t.buffering { - _, _ = io.WriteString(&t.buf, s) - } else { - _, _ = io.WriteString(t.tty, s) - } -} - -func (t *tScreen) TPuts(s string) { - if t.buffering { - t.ti.TPuts(&t.buf, s) - } else { - t.ti.TPuts(t.tty, s) - } -} - -func (t *tScreen) Show() { - t.Lock() - if !t.fini { - t.resize() - t.draw() - } - t.Unlock() -} - -func (t *tScreen) clearScreen() { - t.TPuts(t.ti.AttrOff) - t.TPuts(t.exitUrl) - _ = t.sendFgBg(t.style.fg, t.style.bg, AttrNone) - t.TPuts(t.ti.Clear) - t.clear = false -} - -func (t *tScreen) startBuffering() { - t.TPuts(t.startSyncOut) -} - -func (t *tScreen) endBuffering() { - t.TPuts(t.endSyncOut) -} - -func (t *tScreen) hideCursor() { - // does not update cursor position - if t.ti.HideCursor != "" { - t.TPuts(t.ti.HideCursor) - } else { - // No way to hide cursor, stick it - // at bottom right of screen - t.cx, t.cy = t.cells.Size() - t.TPuts(t.ti.TGoto(t.cx, t.cy)) - } -} - -func (t *tScreen) draw() { - // clobber cursor position, because we're going to change it all - t.cx = -1 - t.cy = -1 - // make no style assumptions - t.curstyle = styleInvalid - - t.buf.Reset() - t.buffering = true - t.startBuffering() - defer func() { - t.buffering = false - t.endBuffering() - }() - - // hide the cursor while we move stuff around - t.hideCursor() - - if t.clear { - t.clearScreen() - } - - for y := 0; y < t.h; y++ { - for x := 0; x < t.w; x++ { - width := t.drawCell(x, y) - if width > 1 { - if x+1 < t.w { - // this is necessary so that if we ever - // go back to drawing that cell, we - // actually will *draw* it. - t.cells.SetDirty(x+1, y, true) - } - } - x += width - 1 - } - } - - // restore the cursor - t.showCursor() - - _, _ = t.buf.WriteTo(t.tty) -} - -func (t *tScreen) EnableMouse(flags ...MouseFlags) { - var f MouseFlags - flagsPresent := false - for _, flag := range flags { - f |= flag - flagsPresent = true - } - if !flagsPresent { - f = MouseMotionEvents | MouseDragEvents | MouseButtonEvents - } - - t.Lock() - t.mouseFlags = f - t.enableMouse(f) - t.Unlock() -} - -func (t *tScreen) enableMouse(f MouseFlags) { - // Rather than using terminfo to find mouse escape sequences, we rely on the fact that - // pretty much *every* terminal that supports mouse tracking follows the - // XTerm standards (the modern ones). - if len(t.mouse) != 0 { - // start by disabling all tracking. - t.TPuts("\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l") - if f&MouseButtonEvents != 0 { - t.TPuts("\x1b[?1000h") - } - if f&MouseDragEvents != 0 { - t.TPuts("\x1b[?1002h") - } - if f&MouseMotionEvents != 0 { - t.TPuts("\x1b[?1003h") - } - if f&(MouseButtonEvents|MouseDragEvents|MouseMotionEvents) != 0 { - t.TPuts("\x1b[?1006h") - } - } - -} - -func (t *tScreen) DisableMouse() { - t.Lock() - t.mouseFlags = 0 - t.enableMouse(0) - t.Unlock() -} - -func (t *tScreen) EnablePaste() { - t.Lock() - t.pasteEnabled = true - t.enablePasting(true) - t.Unlock() -} - -func (t *tScreen) DisablePaste() { - t.Lock() - t.pasteEnabled = false - t.enablePasting(false) - t.Unlock() -} - -func (t *tScreen) enablePasting(on bool) { - var s string - if on { - s = t.enablePaste - } else { - s = t.disablePaste - } - if s != "" { - t.TPuts(s) - } -} - -func (t *tScreen) EnableFocus() { - t.Lock() - t.focusEnabled = true - t.enableFocusReporting() - t.Unlock() -} - -func (t *tScreen) DisableFocus() { - t.Lock() - t.focusEnabled = false - t.disableFocusReporting() - t.Unlock() -} - -func (t *tScreen) enableFocusReporting() { - if t.enableFocus != "" { - t.TPuts(t.enableFocus) - } -} - -func (t *tScreen) disableFocusReporting() { - if t.disableFocus != "" { - t.TPuts(t.disableFocus) - } -} - -func (t *tScreen) Size() (int, int) { - t.Lock() - w, h := t.w, t.h - t.Unlock() - return w, h -} - -func (t *tScreen) resize() { - ws, err := t.tty.WindowSize() - if err != nil { - return - } - if ws.Width == t.w && ws.Height == t.h { - return - } - t.cx = -1 - t.cy = -1 - - t.cells.Resize(ws.Width, ws.Height) - t.cells.Invalidate() - t.h = ws.Height - t.w = ws.Width - t.input.SetSize(ws.Width, ws.Height) -} - -func (t *tScreen) Colors() int { - if os.Getenv("NO_COLOR") != "" { - return 0 - } - // this doesn't change, no need for lock - if t.truecolor { - return 1 << 24 - } - return t.ti.Colors -} - -// nColors returns the size of the built-in palette. -// This is distinct from Colors(), as it will generally -// always be a small number. (<= 256) -func (t *tScreen) nColors() int { - if os.Getenv("NO_COLOR") != "" { - return 0 - } - return t.ti.Colors -} - -// vtACSNames is a map of bytes defined by terminfo that are used in -// the terminals Alternate Character Set to represent other glyphs. -// For example, the upper left corner of the box drawing set can be -// displayed by printing "l" while in the alternate character set. -// It's not quite that simple, since the "l" is the terminfo name, -// and it may be necessary to use a different character based on -// the terminal implementation (or the terminal may lack support for -// this altogether). See buildAcsMap below for detail. -var vtACSNames = map[byte]rune{ - '+': RuneRArrow, - ',': RuneLArrow, - '-': RuneUArrow, - '.': RuneDArrow, - '0': RuneBlock, - '`': RuneDiamond, - 'a': RuneCkBoard, - 'b': '␉', // VT100, Not defined by terminfo - 'c': '␌', // VT100, Not defined by terminfo - 'd': '␋', // VT100, Not defined by terminfo - 'e': '␊', // VT100, Not defined by terminfo - 'f': RuneDegree, - 'g': RunePlMinus, - 'h': RuneBoard, - 'i': RuneLantern, - 'j': RuneLRCorner, - 'k': RuneURCorner, - 'l': RuneULCorner, - 'm': RuneLLCorner, - 'n': RunePlus, - 'o': RuneS1, - 'p': RuneS3, - 'q': RuneHLine, - 'r': RuneS7, - 's': RuneS9, - 't': RuneLTee, - 'u': RuneRTee, - 'v': RuneBTee, - 'w': RuneTTee, - 'x': RuneVLine, - 'y': RuneLEqual, - 'z': RuneGEqual, - '{': RunePi, - '|': RuneNEqual, - '}': RuneSterling, - '~': RuneBullet, -} - -// buildAcsMap builds a map of characters that we translate from Unicode to -// alternate character encodings. To do this, we use the standard VT100 ACS -// maps. This is only done if the terminal lacks support for Unicode; we -// always prefer to emit Unicode glyphs when we are able. -func (t *tScreen) buildAcsMap() { - acsstr := t.ti.AltChars - t.acs = make(map[rune]string) - for len(acsstr) > 2 { - srcv := acsstr[0] - dstv := string(acsstr[1]) - if r, ok := vtACSNames[srcv]; ok { - t.acs[r] = t.ti.EnterAcs + dstv + t.ti.ExitAcs - } - acsstr = acsstr[2:] - } -} - -func (t *tScreen) scanInput(buf *bytes.Buffer) { - // The end of the buffer isn't necessarily the end of the input, because - // large inputs are chunked. Set atEOF to false so the UTF-8 validating decoder - // returns ErrShortSrc instead of ErrInvalidUTF8 for incomplete multi-byte codepoints. - const atEOF = false - - for buf.Len() > 0 { - utf := make([]byte, min(8, max(buf.Len()*2, 128))) - nOut, nIn, e := t.decoder.Transform(utf, buf.Bytes(), atEOF) - _ = buf.Next(nIn) - t.input.ScanUTF8(utf[:nOut]) - if e == transform.ErrShortSrc { - return - } - } -} - -func (t *tScreen) mainLoop(stopQ chan struct{}) { - defer t.wg.Done() - buf := &bytes.Buffer{} - for { - select { - case <-stopQ: - return - case <-t.quit: - return - case <-t.resizeQ: - t.Lock() - t.cx = -1 - t.cy = -1 - t.resize() - t.cells.Invalidate() - t.draw() - t.Unlock() - continue - case chunk := <-t.keychan: - buf.Write(chunk) - t.scanInput(buf) - } - } -} - -func (t *tScreen) inputLoop(stopQ chan struct{}) { - - defer t.wg.Done() - for { - select { - case <-stopQ: - return - default: - } - chunk := make([]byte, 128) - n, e := t.tty.Read(chunk) - switch e { - case nil: - default: - t.Lock() - running := t.running - t.Unlock() - if running { - select { - case t.eventQ <- NewEventError(e): - case <-t.quit: - } - } - return - } - if n > 0 { - t.keychan <- chunk[:n] - } - } -} - -func (t *tScreen) Sync() { - t.Lock() - t.cx = -1 - t.cy = -1 - if !t.fini { - t.resize() - t.clear = true - t.cells.Invalidate() - t.draw() - } - t.Unlock() -} - -func (t *tScreen) CharacterSet() string { - return t.charset -} - -func (t *tScreen) RegisterRuneFallback(orig rune, fallback string) { - t.Lock() - t.fallback[orig] = fallback - t.Unlock() -} - -func (t *tScreen) UnregisterRuneFallback(orig rune) { - t.Lock() - delete(t.fallback, orig) - t.Unlock() -} - -func (t *tScreen) CanDisplay(r rune, checkFallbacks bool) bool { - - if enc := t.encoder; enc != nil { - nb := make([]byte, 6) - - enc.Reset() - dst, _, err := enc.Transform(nb, []byte(string(r)), true) - if dst != 0 && err == nil && nb[0] != '\x1A' { - return true - } - } - // Terminal fallbacks always permitted, since we assume they are - // basically nearly perfect renditions. - if _, ok := t.acs[r]; ok { - return true - } - if !checkFallbacks { - return false - } - if _, ok := t.fallback[r]; ok { - return true - } - return false -} - -func (t *tScreen) HasMouse() bool { - return len(t.mouse) != 0 -} - -func (t *tScreen) HasKey(_ Key) bool { - // We always return true - return true -} - -func (t *tScreen) SetSize(w, h int) { - if t.setWinSize != "" { - t.TPuts(t.ti.TParm(t.setWinSize, w, h)) - } - t.cells.Invalidate() - t.resize() -} - -func (t *tScreen) Resize(int, int, int, int) {} - -func (t *tScreen) Suspend() error { - t.disengage() - return nil -} - -func (t *tScreen) Resume() error { - return t.engage() -} - -func (t *tScreen) Tty() (Tty, bool) { - return t.tty, true -} - -// engage is used to place the terminal in raw mode and establish screen size, etc. -// Think of this is as tcell "engaging" the clutch, as it's going to be driving the -// terminal interface. -func (t *tScreen) engage() error { - t.Lock() - defer t.Unlock() - if t.tty == nil { - return ErrNoScreen - } - t.tty.NotifyResize(func() { - select { - case t.resizeQ <- true: - default: - } - }) - if t.running { - return errors.New("already engaged") - } - if err := t.tty.Start(); err != nil { - return err - } - t.running = true - if ws, err := t.tty.WindowSize(); err == nil && ws.Width != 0 && ws.Height != 0 { - t.cells.Resize(ws.Width, ws.Height) - } - stopQ := make(chan struct{}) - t.stopQ = stopQ - t.enableMouse(t.mouseFlags) - t.enablePasting(t.pasteEnabled) - if t.focusEnabled { - t.enableFocusReporting() - } - ti := t.ti - if os.Getenv("TCELL_ALTSCREEN") != "disable" { - // Technically this may not be right, but every terminal we know about - // (even Wyse 60) uses this to enter the alternate screen buffer, and - // possibly save and restore the window title and/or icon. - // (In theory there could be terminals that don't support X,Y cursor - // positions without a setup command, but we don't support them.) - t.TPuts(ti.EnterCA) - t.TPuts(t.saveTitle) - } - t.TPuts(ti.EnterKeypad) - t.TPuts(ti.HideCursor) - t.TPuts(ti.EnableAcs) - t.TPuts(ti.DisableAutoMargin) - t.TPuts(ti.Clear) - if t.title != "" && t.setTitle != "" { - t.TPuts(t.ti.TParm(t.setTitle, t.title)) - } - t.TPuts(t.enableCsiU) - - t.wg.Add(2) - go t.inputLoop(stopQ) - go t.mainLoop(stopQ) - return nil -} - -// disengage is used to release the terminal back to support from the caller. -// Think of this as tcell disengaging the clutch, so that another application -// can take over the terminal interface. This restores the TTY mode that was -// present when the application was first started. -func (t *tScreen) disengage() { - - t.Lock() - if !t.running { - t.Unlock() - return - } - - t.running = false - stopQ := t.stopQ - close(stopQ) - _ = t.tty.Drain() - t.Unlock() - - t.tty.NotifyResize(nil) - // wait for everything to shut down - t.wg.Wait() - - // shutdown the screen and disable special modes (e.g. mouse and bracketed paste) - ti := t.ti - t.cells.Resize(0, 0) - t.TPuts(ti.ShowCursor) - if t.cursorStyles != nil && t.cursorStyle != CursorStyleDefault { - t.TPuts(t.cursorStyles[CursorStyleDefault]) - } - if t.cursorFg != "" && t.cursorColor.Valid() { - t.TPuts(t.cursorFg) - } - t.TPuts(ti.ResetFgBg) - t.TPuts(ti.AttrOff) - t.TPuts(ti.ExitKeypad) - t.TPuts(ti.EnableAutoMargin) - t.TPuts(t.disableCsiU) - if os.Getenv("TCELL_ALTSCREEN") != "disable" { - if t.restoreTitle != "" { - t.TPuts(t.restoreTitle) - } - t.TPuts(ti.Clear) // only needed if ExitCA is empty - t.TPuts(ti.ExitCA) - } - t.enableMouse(0) - t.enablePasting(false) - t.disableFocusReporting() - - _ = t.tty.Stop() -} - -// Beep emits a beep to the terminal. -func (t *tScreen) Beep() error { - t.writeString(string(byte(7))) - return nil -} - -// finalize is used to at application shutdown, and restores the terminal -// to it's initial state. It should not be called more than once. -func (t *tScreen) finalize() { - t.disengage() - _ = t.tty.Close() -} - -func (t *tScreen) StopQ() <-chan struct{} { - return t.quit -} - -func (t *tScreen) EventQ() chan Event { - return t.eventQ -} - -func (t *tScreen) GetCells() *CellBuffer { - return &t.cells -} - -func (t *tScreen) SetTitle(title string) { - t.Lock() - t.title = title - if t.setTitle != "" && t.running { - t.TPuts(t.ti.TParm(t.setTitle, title)) - } - t.Unlock() -} - -func (t *tScreen) SetClipboard(data []byte) { - // Post binary data to the system clipboard. It might be UTF-8, it might not be. - t.Lock() - if t.setClipboard != "" { - encoded := base64.StdEncoding.EncodeToString(data) - t.TPuts(t.ti.TParm(t.setClipboard, encoded)) - } - t.Unlock() -} - -func (t *tScreen) GetClipboard() { - t.Lock() - if t.setClipboard != "" { - t.TPuts(t.ti.TParm(t.setClipboard, "?")) - } - t.Unlock() -} diff --git a/vendor/github.com/gdamore/tcell/v2/wscreen.go b/vendor/github.com/gdamore/tcell/v2/wscreen.go deleted file mode 100644 index 4c866d1e8..000000000 --- a/vendor/github.com/gdamore/tcell/v2/wscreen.go +++ /dev/null @@ -1,629 +0,0 @@ -// Copyright 2025 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build js && wasm -// +build js,wasm - -package tcell - -import ( - "errors" - "fmt" - "sync" - "syscall/js" - "unicode/utf8" - - "github.com/gdamore/tcell/v2/terminfo" -) - -func NewTerminfoScreen() (Screen, error) { - t := &wScreen{} - t.fallback = make(map[rune]string) - - return &baseScreen{screenImpl: t}, nil -} - -type wScreen struct { - w, h int - style Style - cells CellBuffer - - running bool - clear bool - flagsPresent bool - pasteEnabled bool - mouseFlags MouseFlags - - cursorStyle CursorStyle - - quit chan struct{} - evch chan Event - fallback map[rune]string - finiOnce sync.Once - - sync.Mutex -} - -func (t *wScreen) Init() error { - t.w, t.h = 80, 24 // default for html as of now - t.evch = make(chan Event, 10) - t.quit = make(chan struct{}) - - t.Lock() - t.running = true - t.style = StyleDefault - t.cells.Resize(t.w, t.h) - t.Unlock() - - js.Global().Set("onKeyEvent", js.FuncOf(t.onKeyEvent)) - js.Global().Set("onMouseClick", js.FuncOf(t.unset)) - js.Global().Set("onMouseMove", js.FuncOf(t.unset)) - js.Global().Set("onFocus", js.FuncOf(t.unset)) - - return nil -} - -func (t *wScreen) Fini() { - t.finiOnce.Do(func() { - close(t.quit) - }) -} - -func (t *wScreen) SetStyle(style Style) { - t.Lock() - t.style = style - t.Unlock() -} - -// paletteColor gives a more natural palette color actually matching -// typical XTerm. We might in the future want to permit styling these -// via CSS. - -var palette = map[Color]int32{ - ColorBlack: 0x000000, - ColorMaroon: 0xcd0000, - ColorGreen: 0x00cd00, - ColorOlive: 0xcdcd00, - ColorNavy: 0x0000ee, - ColorPurple: 0xcd00cd, - ColorTeal: 0x00cdcd, - ColorSilver: 0xe5e5e5, - ColorGray: 0x7f7f7f, - ColorRed: 0xff0000, - ColorLime: 0x00ff00, - ColorYellow: 0xffff00, - ColorBlue: 0x5c5cff, - ColorFuchsia: 0xff00ff, - ColorAqua: 0x00ffff, - ColorWhite: 0xffffff, -} - -func paletteColor(c Color) int32 { - if c.IsRGB() { - return int32(c & 0xffffff) - } - if c >= ColorBlack && c <= ColorWhite { - return palette[c] - } - return c.Hex() -} - -func (t *wScreen) drawCell(x, y int) int { - str, style, width := t.cells.Get(x, y) - - if !t.cells.Dirty(x, y) { - return width - } - - if style == StyleDefault { - style = t.style - } - - fg, bg := paletteColor(style.fg), paletteColor(style.bg) - if fg == -1 { - fg = 0xe5e5e5 - } - if bg == -1 { - bg = 0x000000 - } - us, uc := style.ulStyle, paletteColor(style.ulColor) - if uc == -1 { - uc = 0x000000 - } - - t.cells.SetDirty(x, y, false) - js.Global().Call("drawCell", x, y, str, fg, bg, int(style.attrs), int(us), int(uc)) - - return width -} - -func (t *wScreen) ShowCursor(x, y int) { - t.Lock() - js.Global().Call("showCursor", x, y) - t.Unlock() -} - -func (t *wScreen) SetCursor(cs CursorStyle, cc Color) { - if !cc.Valid() { - cc = ColorLightGray - } - t.Lock() - js.Global().Call("setCursorStyle", curStyleClasses[cs], fmt.Sprintf("#%06x", cc.Hex())) - t.Unlock() -} - -func (t *wScreen) HideCursor() { - t.ShowCursor(-1, -1) -} - -func (t *wScreen) Show() { - t.Lock() - t.resize() - t.draw() - t.Unlock() -} - -func (t *wScreen) clearScreen() { - js.Global().Call("clearScreen", t.style.fg.Hex(), t.style.bg.Hex()) - t.clear = false -} - -func (t *wScreen) draw() { - if t.clear { - t.clearScreen() - } - - for y := 0; y < t.h; y++ { - for x := 0; x < t.w; x++ { - width := t.drawCell(x, y) - x += width - 1 - } - } - - js.Global().Call("show") -} - -func (t *wScreen) EnableMouse(flags ...MouseFlags) { - var f MouseFlags - flagsPresent := false - for _, flag := range flags { - f |= flag - flagsPresent = true - } - if !flagsPresent { - f = MouseMotionEvents | MouseDragEvents | MouseButtonEvents - } - - t.Lock() - t.mouseFlags = f - t.enableMouse(f) - t.Unlock() -} - -func (t *wScreen) enableMouse(f MouseFlags) { - if f&MouseButtonEvents != 0 { - js.Global().Set("onMouseClick", js.FuncOf(t.onMouseEvent)) - } else { - js.Global().Set("onMouseClick", js.FuncOf(t.unset)) - } - - if f&MouseDragEvents != 0 || f&MouseMotionEvents != 0 { - js.Global().Set("onMouseMove", js.FuncOf(t.onMouseEvent)) - } else { - js.Global().Set("onMouseMove", js.FuncOf(t.unset)) - } -} - -func (t *wScreen) DisableMouse() { - t.Lock() - t.mouseFlags = 0 - t.enableMouse(0) - t.Unlock() -} - -func (t *wScreen) EnablePaste() { - t.Lock() - t.pasteEnabled = true - t.enablePasting(true) - t.Unlock() -} - -func (t *wScreen) DisablePaste() { - t.Lock() - t.pasteEnabled = false - t.enablePasting(false) - t.Unlock() -} - -func (t *wScreen) enablePasting(on bool) { - if on { - js.Global().Set("onPaste", js.FuncOf(t.onPaste)) - } else { - js.Global().Set("onPaste", js.FuncOf(t.unset)) - } -} - -func (t *wScreen) EnableFocus() { - t.Lock() - js.Global().Set("onFocus", js.FuncOf(t.onFocus)) - t.Unlock() -} - -func (t *wScreen) DisableFocus() { - t.Lock() - js.Global().Set("onFocus", js.FuncOf(t.unset)) - t.Unlock() -} - -func (s *wScreen) GetClipboard() { -} - -func (s *wScreen) SetClipboard(_ []byte) { -} - -func (t *wScreen) Size() (int, int) { - t.Lock() - w, h := t.w, t.h - t.Unlock() - return w, h -} - -// resize does nothing, as asking the web window to resize -// without a specified width or height will cause no change. -func (t *wScreen) resize() {} - -func (t *wScreen) Colors() int { - return 16777216 // 256 ^ 3 -} - -func (t *wScreen) clip(x, y int) (int, int) { - w, h := t.cells.Size() - if x < 0 { - x = 0 - } - if y < 0 { - y = 0 - } - if x > w-1 { - x = w - 1 - } - if y > h-1 { - y = h - 1 - } - return x, y -} - -func (t *wScreen) postEvent(ev Event) { - select { - case t.evch <- ev: - case <-t.quit: - } -} - -func (t *wScreen) onMouseEvent(this js.Value, args []js.Value) interface{} { - mod := ModNone - button := ButtonNone - - switch args[2].Int() { - case 0: - if t.mouseFlags&MouseMotionEvents == 0 { - // don't want this event! is a mouse motion event, but user has asked not. - return nil - } - button = ButtonNone - case 1: - button = Button1 - case 2: - button = Button3 // Note we prefer to treat right as button 2 - case 3: - button = Button2 // And the middle button as button 3 - } - - if args[3].Bool() { // mod shift - mod |= ModShift - } - - if args[4].Bool() { // mod alt - mod |= ModAlt - } - - if args[5].Bool() { // mod ctrl - mod |= ModCtrl - } - - t.postEvent(NewEventMouse(args[0].Int(), args[1].Int(), button, mod)) - return nil -} - -func (t *wScreen) onKeyEvent(this js.Value, args []js.Value) interface{} { - key := args[0].String() - - // don't accept any modifier keys as their own - if key == "Control" || key == "Alt" || key == "Meta" || key == "Shift" { - return nil - } - - mod := ModNone - if args[1].Bool() { // mod shift - mod |= ModShift - } - - if args[2].Bool() { // mod alt - mod |= ModAlt - } - - if args[3].Bool() { // mod ctrl - mod |= ModCtrl - } - - if args[4].Bool() { // mod meta - mod |= ModMeta - } - - // next try function keys - if k, ok := WebKeyNames[key]; ok { - t.postEvent(NewEventKey(k, 0, mod)) - return nil - } - - // finally try normal, printable chars - r, _ := utf8.DecodeRuneInString(key) - t.postEvent(NewEventKey(KeyRune, r, mod)) - return nil -} - -func (t *wScreen) onPaste(this js.Value, args []js.Value) interface{} { - t.postEvent(NewEventPaste(args[0].Bool())) - return nil -} - -func (t *wScreen) onFocus(this js.Value, args []js.Value) interface{} { - t.postEvent(NewEventFocus(args[0].Bool())) - return nil -} - -// unset is a dummy function for js when we want nothing to -// happen when javascript calls a function (for example, when -// mouse input is disabled, when onMouseEvent() is called from -// js, it redirects here and does nothing). -func (t *wScreen) unset(this js.Value, args []js.Value) interface{} { - return nil -} - -func (t *wScreen) Sync() { - t.Lock() - t.resize() - t.clear = true - t.cells.Invalidate() - t.draw() - t.Unlock() -} - -func (t *wScreen) CharacterSet() string { - return "UTF-8" -} - -func (t *wScreen) RegisterRuneFallback(orig rune, fallback string) { - t.Lock() - t.fallback[orig] = fallback - t.Unlock() -} - -func (t *wScreen) UnregisterRuneFallback(orig rune) { - t.Lock() - delete(t.fallback, orig) - t.Unlock() -} - -func (t *wScreen) CanDisplay(r rune, checkFallbacks bool) bool { - if utf8.ValidRune(r) { - return true - } - if !checkFallbacks { - return false - } - if _, ok := t.fallback[r]; ok { - return true - } - return false -} - -func (t *wScreen) HasMouse() bool { - return true -} - -func (t *wScreen) HasKey(k Key) bool { - return true -} - -func (t *wScreen) SetSize(w, h int) { - if w == t.w && h == t.h { - return - } - - t.cells.Invalidate() - t.cells.Resize(w, h) - js.Global().Call("resize", w, h) - t.w, t.h = w, h - t.postEvent(NewEventResize(w, h)) -} - -func (t *wScreen) Resize(int, int, int, int) {} - -// Suspend simply pauses all input and output, and clears the screen. -// There isn't a "default terminal" to go back to. -func (t *wScreen) Suspend() error { - t.Lock() - if !t.running { - t.Unlock() - return nil - } - t.running = false - t.clearScreen() - t.enableMouse(0) - t.enablePasting(false) - js.Global().Set("onKeyEvent", js.FuncOf(t.unset)) // stop keypresses - return nil -} - -func (t *wScreen) Resume() error { - t.Lock() - - if t.running { - return errors.New("already engaged") - } - t.running = true - - t.enableMouse(t.mouseFlags) - t.enablePasting(t.pasteEnabled) - - js.Global().Set("onKeyEvent", js.FuncOf(t.onKeyEvent)) - - t.Unlock() - return nil -} - -func (t *wScreen) Beep() error { - js.Global().Call("beep") - return nil -} - -func (t *wScreen) Tty() (Tty, bool) { - return nil, false -} - -func (t *wScreen) GetCells() *CellBuffer { - return &t.cells -} - -func (t *wScreen) EventQ() chan Event { - return t.evch -} - -func (t *wScreen) StopQ() <-chan struct{} { - return t.quit -} - -func (t *wScreen) SetTitle(title string) { - js.Global().Call("setTitle", title) -} - -// WebKeyNames maps string names reported from HTML -// (KeyboardEvent.key) to tcell accepted keys. -var WebKeyNames = map[string]Key{ - "Enter": KeyEnter, - "Backspace": KeyBackspace, - "Tab": KeyTab, - "Backtab": KeyBacktab, - "Escape": KeyEsc, - "Backspace2": KeyBackspace2, - "Delete": KeyDelete, - "Insert": KeyInsert, - "ArrowUp": KeyUp, - "ArrowDown": KeyDown, - "ArrowLeft": KeyLeft, - "ArrowRight": KeyRight, - "Home": KeyHome, - "End": KeyEnd, - "UpLeft": KeyUpLeft, // not supported by HTML - "UpRight": KeyUpRight, // not supported by HTML - "DownLeft": KeyDownLeft, // not supported by HTML - "DownRight": KeyDownRight, // not supported by HTML - "Center": KeyCenter, - "PgDn": KeyPgDn, - "PgUp": KeyPgUp, - "Clear": KeyClear, - "Exit": KeyExit, - "Cancel": KeyCancel, - "Pause": KeyPause, - "Print": KeyPrint, - "F1": KeyF1, - "F2": KeyF2, - "F3": KeyF3, - "F4": KeyF4, - "F5": KeyF5, - "F6": KeyF6, - "F7": KeyF7, - "F8": KeyF8, - "F9": KeyF9, - "F10": KeyF10, - "F11": KeyF11, - "F12": KeyF12, - "F13": KeyF13, - "F14": KeyF14, - "F15": KeyF15, - "F16": KeyF16, - "F17": KeyF17, - "F18": KeyF18, - "F19": KeyF19, - "F20": KeyF20, - "F21": KeyF21, - "F22": KeyF22, - "F23": KeyF23, - "F24": KeyF24, - "F25": KeyF25, - "F26": KeyF26, - "F27": KeyF27, - "F28": KeyF28, - "F29": KeyF29, - "F30": KeyF30, - "F31": KeyF31, - "F32": KeyF32, - "F33": KeyF33, - "F34": KeyF34, - "F35": KeyF35, - "F36": KeyF36, - "F37": KeyF37, - "F38": KeyF38, - "F39": KeyF39, - "F40": KeyF40, - "F41": KeyF41, - "F42": KeyF42, - "F43": KeyF43, - "F44": KeyF44, - "F45": KeyF45, - "F46": KeyF46, - "F47": KeyF47, - "F48": KeyF48, - "F49": KeyF49, - "F50": KeyF50, - "F51": KeyF51, - "F52": KeyF52, - "F53": KeyF53, - "F54": KeyF54, - "F55": KeyF55, - "F56": KeyF56, - "F57": KeyF57, - "F58": KeyF58, - "F59": KeyF59, - "F60": KeyF60, - "F61": KeyF61, - "F62": KeyF62, - "F63": KeyF63, - "F64": KeyF64, -} - -var curStyleClasses = map[CursorStyle]string{ - CursorStyleDefault: "cursor-blinking-block", - CursorStyleBlinkingBlock: "cursor-blinking-block", - CursorStyleSteadyBlock: "cursor-steady-block", - CursorStyleBlinkingUnderline: "cursor-blinking-underline", - CursorStyleSteadyUnderline: "cursor-steady-underline", - CursorStyleBlinkingBar: "cursor-blinking-bar", - CursorStyleSteadyBar: "cursor-steady-bar", -} - -func LookupTerminfo(name string) (ti *terminfo.Terminfo, e error) { - return nil, errors.New("LookupTermInfo not supported") -} diff --git a/vendor/github.com/gdamore/tcell/v3/.codecov.yml b/vendor/github.com/gdamore/tcell/v3/.codecov.yml new file mode 100644 index 000000000..8bd926d8f --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v3/.codecov.yml @@ -0,0 +1,2 @@ +ignore: + - "vt/tests" diff --git a/vendor/github.com/gdamore/tcell/v2/.gitignore b/vendor/github.com/gdamore/tcell/v3/.gitignore similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/.gitignore rename to vendor/github.com/gdamore/tcell/v3/.gitignore diff --git a/vendor/github.com/gdamore/tcell/v3/AGENTS.md b/vendor/github.com/gdamore/tcell/v3/AGENTS.md new file mode 100644 index 000000000..11d8d9f6a --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v3/AGENTS.md @@ -0,0 +1 @@ +Use the `gopls` MCP server by default when working on Go code in this repository, unless I explicitly ask you not to. diff --git a/vendor/github.com/gdamore/tcell/v2/AUTHORS b/vendor/github.com/gdamore/tcell/v3/AUTHORS similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/AUTHORS rename to vendor/github.com/gdamore/tcell/v3/AUTHORS diff --git a/vendor/github.com/gdamore/tcell/v2/CHANGESv2.md b/vendor/github.com/gdamore/tcell/v3/CHANGESv2.md similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/CHANGESv2.md rename to vendor/github.com/gdamore/tcell/v3/CHANGESv2.md index ad97c11b5..4b5affd93 100644 --- a/vendor/github.com/gdamore/tcell/v2/CHANGESv2.md +++ b/vendor/github.com/gdamore/tcell/v3/CHANGESv2.md @@ -79,4 +79,4 @@ _Tcell_ provides the long requested capability to discriminate paste event by us bracketed-paste capability present in some terminals. This is automatically available on terminals that support XTerm style mouse handling, but applications must opt-in to this by using the new `EnablePaste()` function. A new `EventPaste` type of event will be -delivered when starting and finishing a paste operation. \ No newline at end of file +delivered when starting and finishing a paste operation. diff --git a/vendor/github.com/gdamore/tcell/v3/CHANGESv3.md b/vendor/github.com/gdamore/tcell/v3/CHANGESv3.md new file mode 100644 index 000000000..c3fcb3f4f --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v3/CHANGESv3.md @@ -0,0 +1,118 @@ +## Breaking Changes in _Tcell_ v3 + +There are a number of changes in _Tcell_ v3, mostly aimed at simplifying things for +applications, but some also intended to reduce the burden for support. Every application +will need at least some changes, but it is expected that those changes will be small, +possibly even mechanical in nature. + +### Cell and Contents APIs + +In order to improve support for multi-rune grapheme clusters, and to provide an +experience that reduces friction when using it, some APIs have been removed, and +newer APIs exist in their place. + +- `SetCell` and `SetContents` are removed. Use `Put` instead. +- `GetContents` is removed. Use `Get` instead. + +### Events (PostEvent, PollEvent, ChannelEvents) + +The event channel is now directly exposed via `EventQ`, and events may be read from or written +directly to the channel in the standard Go fashion. This should help applications that want to +integrate into `select` statements (e.g. for timed key presses). + +The `ChannelEvents`, `PollEvent`, `PostEvent`, and `PostEventWait` functions are removed, as +applications can now just access the event channel directly. + +### Key Event Changes + +`EventKey` now carries a string for `KeyRune` instead of a single rune. +As a result the old `Rune` method for `EventKey` is replaced by `Str`. +The main difference for most users will be that `Str` returns a string, and most +of the time that string will consist of only a single rune. However, it is possible +now to inject synthetic key strokes consisting of multi-rune grapheme clusters. + +Additionally the following special keys are removed, as they are delivered +instead as `KeyRune` with the relevant rune, and the `ModCtrl` modifier: +`KeyCtrlSpace`, `KeyCtrlLeftSq`, `KeyCtrlRightSq`, `KeyCtrlBackslash`, and +`KeyCtrlUnderscore`. + +Note that `KeyRune` will never have a `ModShift` applied unless it is applied +also with other modifiers. + +The `KeyCtrlA` through `KeyCtrlZ` keys are delivered, but will also carry +the associated lower case rune (e.g. "a", "b", etc.) and `ModCtrl`. + +The `KeyBackspace2` key is no longer delivered, but is converted to +`KeyBackspace`. (This resolves some inconsistency around e.g. CTRL-H vs DELETE.) + +When advanced key reporting is enabled, Shift-Tab is reported as `KeyTab` with +`ModShift`, not as `KeyBacktab`. Legacy key reporting still reports Shift-Tab +as `KeyBacktab`. + +### Termbox Compatibility Removed + +The `termbox` compatibility package is removed. Few applications were using it, +and the compatibility was imperfect. Also the package had limited support for many +newer features. Further, _Termbox_ itself is no longer being maintained. +Applications that still need this should keep using _Tcell_ v2. + +### Terminfo Removed + +The Terminfo subsystem has been removed entirely. +Essentially the old terminfo based design has long proved to be inferior for modern terminal +applications, and has not kept up with newer terminal features such as 24-bit color, +different mouse reporting modes, bracketed paste, advanced text styling, and so forth. + +As part of this, we're removing the parsed terminfo logic entirely. It turns out that pretty much +all of the terminal logic can be consolidated to just a few classes of terminals with substantial +overlap. + +A consequence of this is that support for some legacy terminals that are either functionally +extinct (such as _hpterm_) or unlikely to be found outside of a museum (such as VT52, Wyse50, or +anything produced more than 40 years ago.) + +Note that VT100 and later will work in emulation, and VT220 and later physical terminals should still work. +VT100 physical terminals may not work, as the padding delays that existed for them are removed. +Those delays hurt emulations that do not need them, and existed only to accommodate limitations found on the +physical hardware from the 1970s. + +Note that we still examine `$TERM` when appropriate, but if the value is not one we recognize, +then we will assume something reasonably capable and compatible at some level with _xterm_ or +at least ECMA-48. + +### Color, Attributes, Etc. Bit Sizes + +The `Color` type is now only 32-bits, which should save some memory on large terminal windows. +The `AttrMask` type is now only 16-bits, and the `UnderlineStyle` is now 8 bits. +All these lead to further savings in the memory per cell. + +### Underline + +`AttrUnderline` is gone. It was not sufficient to describe styled and colored underlines. + +### Removed Capability Queries + +Deprecated APIs `HasKey`, `HasMouse`, and `CanDisplay` are removed. +These functions weren't reliable and served no useful purpose. + +### Windows Console API + +`NewConsoleScreen` is removed as is support for Windows console mode. + +Instead this uses the more modern Windows VT modes. +As a consequence, this means that _Tcell_ on Windows requires at least Windows 10 build 1703 (the Creators Update). +If you are using a version of Windows 10 older than that, you should really upgrade for _many_ reasons, not just +because _Tcell_ doesn't support it anymore. + +### InputProcessor is no longer Public + +This structure, and the associated `NewInputProcessor` function, were made public incorrectly. +They are not part of our public API going forward, and are now private symbols. + +## SimulationScreen is Removed + +While never part of the public _Tcell_ API, some projects may have used the +`SimulationScreen` for their own tests. That facility was very limited, and +we implemented a much more complete emulation of a terminal in `MockScreen` +and `MockTerm`. (To be clear, those facilities are still intended for _Tcell_'s +own testing, and are still not part of the public API.) diff --git a/vendor/github.com/gdamore/tcell/v2/LICENSE b/vendor/github.com/gdamore/tcell/v3/LICENSE similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/LICENSE rename to vendor/github.com/gdamore/tcell/v3/LICENSE diff --git a/vendor/github.com/gdamore/tcell/v3/README-plan9.md b/vendor/github.com/gdamore/tcell/v3/README-plan9.md new file mode 100644 index 000000000..2d0934011 --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v3/README-plan9.md @@ -0,0 +1,16 @@ +# _Tcell_ on Plan 9 + +> [!NOTE] +> Plan 9 is supported on a best-effort basis, as the main _Tcell_ development team does not have a Plan 9 environment. + +The Plan 9 backend opens `/dev/cons` for I/O, enables raw mode by writing `rawon`/`rawoff` to `/dev/consctl`. +It watches `/dev/wctl` for resize notifications. + +The default mode for `vt((1)` is VT100, which will only provide basic monochrome text, and few additional features. +In this case, it is expected that `TERM=vt100` is set. + +It may be possible to emulate more modern terminals using `-2` (VT220), `-a` (ANSI), or `-x` (XTerm) flags to `vt`. +While this has not been tested, the use of `-x` to get xterm like features, combinerd with a `TERM=xterm` may yield superior results, +including possibly color and mouse support. + +Note that if _Tcell_ does not find a suitable value for `TERM` in the environment, it will assume XTerm like functionality. diff --git a/vendor/github.com/gdamore/tcell/v3/README-wasm.md b/vendor/github.com/gdamore/tcell/v3/README-wasm.md new file mode 100644 index 000000000..1a92a4e5c --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v3/README-wasm.md @@ -0,0 +1,98 @@ +# WASM for _Tcell_ + +You can build _Tcell_ project into a webpage by compiling it slightly differently. This will result in a _Tcell_ project you can embed into another html page, or use as a standalone page. + +## Building your project + +WASM needs special build flags in order to work. You can build it by executing +```sh +GOOS=js GOARCH=wasm go build -o yourfile.wasm +``` + +## Additional files + +You also need the supporting web files in the same directory as the wasm. The files `tcell.html`, `tcell.js`, `termstyle.css`, and `beep.wav`, plus the `ghostty-web` directory, are provided in the `webfiles` directory. The last file, `wasm_exec.js`, can be copied from GOROOT into the current directory by executing +```sh +cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./ +``` + +The web frontend uses `ghostty-web`. The required browser runtime files are vendored in `webfiles/ghostty-web` and must be copied alongside `tcell.js`; no npm, bundler, or external CDN is required. The vendored `ghostty-web` files are MIT licensed; see `webfiles/ghostty-web/LICENSE`. + +```sh +cp -R webfiles/ghostty-web /path/to/dir/to/serve/ +``` + +The vendored `ghostty-web.js` is intentionally browser-only. Its upstream Node `readFile` fallback import is removed so browser-oriented servers and bundlers such as Vite do not try to resolve a Node file-system shim; the bundled code loads `ghostty-vt.wasm` with `fetch`. + +The vendored `ghostty-web.js` is also de-inlined: upstream embeds a base64 copy of `ghostty-vt.wasm` twice inside the JS (as default candidates for `Ghostty.load()`), which more than tripled the shipped bytes. Those inline `data:application/wasm;base64,...` defaults are removed; `tcell.js` passes an explicit URL to `Ghostty.load()`, and the `./ghostty-vt.wasm` / `/ghostty-vt.wasm` relative paths remain as no-argument fallbacks. The wasm is therefore shipped once, as the separate `ghostty-vt.wasm`. + +For example: + +```sh +mkdir -p /tmp/tcell-wasm +cp webfiles/tcell.html webfiles/tcell.js webfiles/termstyle.css webfiles/beep.wav /tmp/tcell-wasm/ +cp -R webfiles/ghostty-web /tmp/tcell-wasm/ +cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" /tmp/tcell-wasm/ +GOOS=js GOARCH=wasm go build -o /tmp/tcell-wasm/main.wasm ./demos/unicode +python3 -m http.server -d /tmp/tcell-wasm 8080 +``` + +In `tcell.js`, you also need to change the constant +```js +const wasmFilePath = "yourfile.wasm" +``` +to the file you outputted to when building. + +## Displaying your project + +### Standalone + +You can see the project (with an white background around the terminal) by serving the directory. You can do this using any framework, including another golang project: + +```golang +// server.go + +package main + +import ( + "log" + "net/http" +) + +func main() { + log.Fatal(http.ListenAndServe(":8080", + http.FileServer(http.Dir("/path/to/dir/to/serve")), + )) +} + +``` + +To see the webpage with this example, you can type in `localhost:8080/tcell.html` into your browser while `server.go` is running. + +### Embedding +It is recommended to use an iframe if you want to embed the app into a webpage: +```html + +``` + +### Sizing + +By default the web terminal fits itself to the size of the `#terminal` element and reacts to container resizes. The bundled `termstyle.css` makes this full-page by default. + +You can override the terminal cell dimensions explicitly in HTML: + +```html +

+```
+
+If only one of `data-cols` or `data-rows` is set, the other dimension remains reactive.
+
+## Other considerations
+
+### Accessing files
+
+`io.Open(filename)` and other related functions for reading file systems do not work; use `http.Get(filename)` instead.
+
+### Keyboard shortcuts
+
+The browser may reserve some key combinations before JavaScript can see or cancel them. This is especially common for Meta/Command shortcuts on macOS, such as Command-L. Standalone Meta key events can be reported, but Meta-modified key combinations are browser-dependent and should not be relied upon in WASM web mode.
diff --git a/vendor/github.com/gdamore/tcell/v3/README-windows.md b/vendor/github.com/gdamore/tcell/v3/README-windows.md
new file mode 100644
index 000000000..e85ac23d8
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/README-windows.md
@@ -0,0 +1,52 @@
+# _Tcell_ on Windows
+
+Windows is supported starting from either Windows 10 version 1703 (the Creators Update, released in April 2017)
+or Windows Server 2016.
+
+> [NOTE!]
+> Windows 8 and earlier are _not_ supported!
+
+On Windows, _Tcell_ uses the modern VT API for console applications, including the _win32-input-mode_ to give
+advanced key reporting. However, in order to receive resize notifications, the `ReadConsoleInput` API is
+used even while in VT input mode.
+
+On Windows we use 24-bit color by default.
+
+## Terminal Emulators
+
+Our preferred terminal emulator on Windows 11 is actually the modern _Windows Terminal_, which can also be
+used as a portable application.  This is the main test target we use, and the one we recommend if problems are
+encountered using third party applications.
+
+We have tested _Alacritty_ and found it to work reasonably well, including support for modern
+key reporting, mouse events, and bracketed paste, although its support support for advanced Unicode features
+is limited.
+
+We have also tested _WezTerm_, _Termius_, _Putty_, and _MobaXterm_.
+These appear to work reasonably for remote sessions, but do not support the newer keyboard protocols, and
+may not work well for local sessions at all.
+
+_Termius_ in particular gave a poor experience when used for local sessions, and we would not recommend it.
+
+While historically popular, we cannot recommend _ConEmu_ or _mintty_.  These applications have not kept pace
+with modern APIs nor modern terminal standards, and we found their experience suboptimal.
+
+## SSH From Windows
+
+Unfortunately, we have found that some features (particularly the rich keyboard support) are degraded when
+using SSH from a Windows Terminal (and probably other terminals as well!) to a remote host. It appears that
+the full _win32-input-mode_ is captured and refactored into legacy VT style encodings, which can result in
+old-school issues such as the inability to to distinguish CTRL-I from TAB.  This appears to be something
+done by the Windows SSH or terminal application and is nothing we can fix.
+
+It's likely that WSL will suffer these limitations as well.
+
+Further, you'll probably need to request 24-bit color explicitly by setting `COLORTERM=truecolor` in your
+environment, as this is not typically done for Windows terminals as it is for Posix terminals.
+
+Note that _Alacritty_ has support for the full key bindings both locally and remotely. Others may as well.
+_WezTerm_, while not great locally, performed quite well as an SSH client, with complete support for all
+various modern keyboard featuers, bracketed paste, and good Unicode support.
+
+Another option might be to run an X11 server (such as _MobaXterm_) and then remotely display a Linux terminal
+application such as _Ghostty_ or _Kitty_.
diff --git a/vendor/github.com/gdamore/tcell/v2/README.md b/vendor/github.com/gdamore/tcell/v3/README.md
similarity index 53%
rename from vendor/github.com/gdamore/tcell/v2/README.md
rename to vendor/github.com/gdamore/tcell/v3/README.md
index e40a278b6..d37c163e7 100644
--- a/vendor/github.com/gdamore/tcell/v2/README.md
+++ b/vendor/github.com/gdamore/tcell/v3/README.md
@@ -5,19 +5,23 @@
 _Tcell_ is a _Go_ package that provides a cell based view for text terminals, like _XTerm_.
 It was inspired by _termbox_, but includes many additional improvements.
 
-[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://stand-with-ukraine.pp.ua)
+[![Stand With Ukraine](logos/ukraine.svg)](https://stand-with-ukraine.pp.ua)
+[![Docs](https://img.shields.io/badge/godoc-reference-blue.svg?label=&logo=go)](https://pkg.go.dev/github.com/gdamore/tcell/v3)
 [![Linux](https://img.shields.io/github/actions/workflow/status/gdamore/tcell/linux.yml?branch=main&logoColor=grey&logo=linux&label=)](https://github.com/gdamore/tcell/actions/workflows/linux.yml)
-[![Windows](https://img.shields.io/github/actions/workflow/status/gdamore/tcell/windows.yml?branch=main&logoColor=grey&label=Windows)](https://github.com/gdamore/tcell/actions/workflows/windows.yml)
+[![macOS](https://img.shields.io/github/actions/workflow/status/gdamore/tcell/macos.yml?branch=main&logoColor=grey&logo=apple&label=)](https://github.com/gdamore/tcell/actions/workflows/macos.yml)
+[![Windows](https://custom-icon-badges.demolab.com/github/actions/workflow/status/gdamore/tcell/windows.yml?branch=main&logoColor=grey&logo=windows10&label=)](https://github.com/gdamore/tcell/actions/workflows/windows.yml)
 [![Web Assembly](https://img.shields.io/github/actions/workflow/status/gdamore/tcell/webasm.yml?branch=main&logoColor=grey&logo=webassembly&label=)](https://github.com/gdamore/tcell/actions/workflows/webasm.yml)
-[![Apache License](https://img.shields.io/github/license/gdamore/tcell.svg?logoColor=silver&logo=opensourceinitiative&color=blue&label=)](https://github.com/gdamore/tcell/blob/master/LICENSE)
-[![Docs](https://img.shields.io/badge/godoc-reference-blue.svg?label=&logo=go)](https://pkg.go.dev/github.com/gdamore/tcell/v2)
-[![Discord](https://img.shields.io/discord/639503822733180969?label=&logo=discord)](https://discord.gg/urTTxDN)
 [![Coverage](https://img.shields.io/codecov/c/github/gdamore/tcell?logoColor=grey&logo=codecov&label=)](https://codecov.io/gh/gdamore/tcell)
-[![Go Report Card](https://goreportcard.com/badge/github.com/gdamore/tcell/v2)](https://goreportcard.com/report/github.com/gdamore/tcell/v2)
+[![Go Report Card](https://img.shields.io/badge/go%20report-A+-brightgreen.svg?style=flat&label=&logo=go&logoColor=grey)](https://goreportcard.com/report/github.com/gdamore/tcell/v3)
+[![Discord](https://img.shields.io/discord/639503822733180969?label=&logo=discord)](https://discord.gg/urTTxDN)
 [![Latest Release](https://img.shields.io/github/v/release/gdamore/tcell.svg?logo=github&label=)](https://github.com/gdamore/tcell/releases)
 
-NOTE: This is version 2 of _Tcell_. There are breaking changes relative to version 1.
-Version 1.x remains available using the import `github.com/gdamore/tcell`.
+> [!NOTE]
+> This is version 3 of _Tcell_.
+> There are breaking changes relative to versions 1 and 2.
+> [Version 2](https://github.com/gdamore/tcell/tree/v2) remains available using the import `github.com/gdamore/tcell/v2`.
+> [Version 1](https://github.com/gdamore/tcell/tree/v1) Version 1.x remains available using the import `github.com/gdamore/tcell`, but is
+> unmaintained and should not be used.
 
 ## Tutorial
 
@@ -26,14 +30,14 @@ A brief, and still somewhat rough, [tutorial](TUTORIAL.md) is available.
 ## Examples
 
 A number of example are posted up on our [Gallery](https://github.com/gdamore/tcell/wikis/Gallery/).
+That's a wiki, and please do submit updates if you have something you want to showcase.
 
-Let us know if you want to add your masterpiece to the list!
+There are also demonstration programs in the `./demos` directory, as well as some in `./_demos`.
 
 ## More Portable
 
-_Tcell_ is portable to a wide variety of systems, and is pure Go, without
-any need for CGO.
-_Tcell_ is believed to work with mainstream systems officially supported by golang.
+_Tcell_ is portable to a wide variety of systems, and is pure Go, without any need for CGO.
+_Tcell_ works with mainstream systems officially supported by golang.
 
 Following the Go support policy, _Tcell_ officially only supports the current ("stable") version of go,
 and the version immediately prior ("oldstable").  This policy is necessary to make sure that we can
@@ -43,9 +47,7 @@ update dependencies to pick up security fixes and new features, and it allows us
 ## Rich Unicode & non-Unicode support
 
 _Tcell_ includes enhanced support for Unicode, including wide characters and
-combining characters, provided your terminal can support them.
-Note that
-Windows terminals generally don't support the full Unicode repertoire.
+grapheme clusters, provided your terminal can support them.
 
 It will also convert to and from Unicode locales, so that the program
 can work with UTF-8 internally, and get reasonable output in other locales.
@@ -53,21 +55,17 @@ _Tcell_ tries hard to convert to native characters on both input and output.
 On output _Tcell_ even makes use of the alternate character set to facilitate
 drawing certain characters.
 
-## More Function Keys
+## Better Keyboard Support
 
 _Tcell_ also has richer support for a larger number of special keys that some
-terminals can send.
+terminals can send. On modern terminal emulators we can also support a rich set of
+modifiers, and can discriminate between e.g. CTRL-I and TAB.  (This does require
+the terminal emulator to support one of the modern keyboard protocols.)
 
 ## Better Mouse Support
 
 _Tcell_ supports enhanced mouse tracking mode, so your application can receive
-regular mouse motion events, and wheel events, if your terminal supports it.
-
-## _Termbox_ Compatibility
-
-A compatibility layer for _termbox_ is provided in the `compat` directory.
-To use it, try importing `github.com/gdamore/tcell/termbox` instead.
-Most _termbox-go_ programs will probably work without further modification.
+regular mouse motion events, click-drag, and wheel events, if your terminal supports it.
 
 ## Working With Unicode
 
@@ -82,8 +80,8 @@ If you're lazy, and want them all anyway, see the `encoding` sub-directory.
 ## Wide & Combining Characters
 
 The `Put()` API takes a string, which should be legal UTF-8, and displays
-the first grapheme (which may composed of multiple runes). It returns the
-actual width displayed, which can be used to advance the column positiion
+the first grapheme cluster (which may composed of multiple runes).
+It returns the actual width displayed, which can be used to advance the column positiion
 for the next display grapheme.  Alternatively, `PutStr()` or `PutStrStyled()`
 can be used to display a single line of text (which will be clipped at the
 edge of the screen).
@@ -93,12 +91,8 @@ wide character (offset by one instead of by two), then the results are undefined
 
 ## Colors
 
-_Tcell_ assumes the ANSI/XTerm color model, including the 256 color map that
-XTerm uses when it supports 256 colors. The terminfo guidance will be
-honored, with respect to the number of colors supported. Also, only
-terminals which expose ANSI style `setaf` and `setab` will support color;
-if you have a color terminal that only has `setf` and `setb`, please submit
-a ticket.
+_Tcell_ assumes the ANSI/XTerm color palette for up to 256 colors, although terminals
+such as legacy ANSI terminals may only support 8 colors.
 
 ## 24-bit Color
 
@@ -106,18 +100,14 @@ _Tcell_ _supports 24-bit color!_ (That is, if your terminal can support it.)
 
 There are a few ways you can enable (or disable) 24-bit color.
 
-- For many terminals, we can detect it automatically if your terminal
-  includes the `RGB` or `Tc` capabilities (or rather it did when the database
-  was updated.)
-
 - You can force this one by setting the `COLORTERM` environment variable to
-  `24-bit`, `truecolor` or `24bit`. This is the same method used
-  by most other terminal applications that support 24-bit color.
+  `truecolor`. This environment variable is frequently set by terminal emulators
+  that support 24-bit color.
+
+- On Windows, 24-bit color support is assumed. (All modern Windows terminal emulators support it.)
 
 - If you set your `TERM` environment variable to a value with the suffix `-truecolor`
-  then 24-bit color compatible with XTerm and ECMA-48 will be assumed.
-  (This feature is deprecated.
-  It is recommended to use one of other methods listed above.)
+  or `-direct`, then 24-bit color compatible with XTerm and ECMA-48 will be assumed.
 
 - You can disable 24-bit color by setting `TCELL_TRUECOLOR=disable` in your
   environment.
@@ -129,6 +119,24 @@ than respecting themes. For other cases, such as typical text apps that
 only use a few colors, its more desirable to respect the themes that
 the user has established.)
 
+## Terminal Overrides
+
+_Tcell_ normally negotiates terminal capabilities automatically, but some
+terminal emulators answer those queries incorrectly. These environment
+variables provide user escape hatches when the automatic path is not reliable:
+
+- `TCELL_KEYBOARD_PROTOCOL=auto|legacy|kitty|win32|xterm` forces the keyboard
+  reporting protocol.
+- `TCELL_NEGOTIATE=auto|disable` disables startup capability negotiation when
+  terminal responses themselves are problematic.
+- `TCELL_MOUSE=auto|disable` prevents applications from enabling terminal mouse
+  reporting.
+
+Applications can also choose a keyboard protocol with `OptKeyboardProtocol` or
+disable startup negotiation with `OptNegotiation`. Environment variables take
+precedence so users can recover from bad terminal behavior without modifying an
+application.
+
 ## Performance
 
 Reasonable attempts have been made to minimize sending data to terminals,
@@ -136,42 +144,44 @@ avoiding repeated sequences or drawing the same cell on refresh updates.
 
 ## Mouse Support
 
-Mouse tracking, buttons, and even wheel mice works fine on most terminal
+Mouse tracking, buttons, and even wheel mice are supported on most terminal
 emulators, as well as Windows.
 
 ## Bracketed Paste
 
-Terminals that appear to support the XTerm mouse model also can support
-bracketed paste, for applications that opt-in. See `EnablePaste()` for details.
+Terminals that support support it, can use bracketed paste.
+See `EnablePaste()` for details.
 
-## Testability
+## Breaking Changes in v3
 
-There is a `SimulationScreen`, that can be used to simulate a real screen
-for automated testing. The supplied tests do this. The simulation contains
-event delivery, screen resizing support, and capabilities to inject events
-and examine "`physical`" screen contents.
+There are a number of changes in _Tcell_ version 3, which break compatibility with
+version 2 and version 1. 
+
+Your application will almost certainly need some minor updates to work with version 3.
+
+Please see the [CHANGESv3](CHANGESv3.md) document for a list.
 
 ## Platforms
 
 ### POSIX (Linux, FreeBSD, macOS, Solaris, etc.)
 
-Everything works using pure Go on mainstream platforms. Some more esoteric
-platforms (e.g., AIX) may need to be added. Pull requests are welcome!
+Everything works using pure Go on mainstream platforms.
+Esoteric platforms (e.g. zOS or AIX) are supported on a best-effort
+only basis. Pull requests to fix any issues found are welcome!
 
 ### Windows
 
-Windows console mode applications are supported.
-
-Modern console applications like ConEmu and the Windows Terminal,
-support all the good features (resize, mouse tracking, etc.)
+Modern Windows is supported.  Please see the [README-windows](README-windows.md)
+document for much more detailed information.
 
 ### WASM
 
 WASM is supported, but needs additional setup detailed in [README-wasm](README-wasm.md).
 
-### Plan9 and its variants
+### Plan 9
 
-Plan 9 is supported on a limited basis. The Plan 9 backend opens `/dev/cons` for I/O, enables raw mode by writing `rawon`/`rawoff` to `/dev/consctl`, watches `/dev/wctl` for resize notifications, and then constructs a **terminfo-backed** `Screen` (so `NewScreen` works as on other platforms). Typical usage is inside `vt(1)` with `TERM=vt100`. Expect **monochrome text** and **no mouse reporting** under stock `vt(1)` (it generally does not emit ANSI color or xterm mouse sequences). If a Plan 9 terminal supplies ANSI color escape sequences and xterm-style mouse reporting, color can be picked up via **terminfo** and mouse support could be added by wiring those sequences into the Plan 9 TTY path; contributions that improve terminal detection and broaden feature support are welcome.
+Plan 9 is supported on a best-effort basis.  Please see the [README-plan9](README-plan9.md)
+document for more information.
 
 ### Commercial Support
 
diff --git a/vendor/github.com/gdamore/tcell/v2/SECURITY.md b/vendor/github.com/gdamore/tcell/v3/SECURITY.md
similarity index 94%
rename from vendor/github.com/gdamore/tcell/v2/SECURITY.md
rename to vendor/github.com/gdamore/tcell/v3/SECURITY.md
index 5c0aa5ab4..65bd7cdc5 100644
--- a/vendor/github.com/gdamore/tcell/v2/SECURITY.md
+++ b/vendor/github.com/gdamore/tcell/v3/SECURITY.md
@@ -3,7 +3,7 @@
 It's somewhat unlikely that tcell is in a security sensitive path,
 but we do take security seriously.
 
-## Vulnerabilityu Response
+## Vulnerability Response
 
 If you report a vulnerability, we will respond within 2 business days.
 
diff --git a/vendor/github.com/gdamore/tcell/v2/TUTORIAL.md b/vendor/github.com/gdamore/tcell/v3/TUTORIAL.md
similarity index 87%
rename from vendor/github.com/gdamore/tcell/v2/TUTORIAL.md
rename to vendor/github.com/gdamore/tcell/v3/TUTORIAL.md
index 92321c763..fa734c26b 100644
--- a/vendor/github.com/gdamore/tcell/v2/TUTORIAL.md
+++ b/vendor/github.com/gdamore/tcell/v3/TUTORIAL.md
@@ -38,8 +38,8 @@ When a non-rune key is pressed, it is available as the `Key` of the event.
 ```go
 switch ev := ev.(type) {
 case *tcell.EventKey:
-    mod, key, ch := ev.Mod(), ev.Key(), ev.Rune()
-    logMessage(fmt.Sprintf("EventKey Modifiers: %d Key: %d Rune: %d", mod, key, ch))
+    mod, key, ch := ev.Mod(), ev.Key(), ev.Str()
+    logMessage(fmt.Sprintf("EventKey Modifiers: %d Key: %d Str: %q", mod, key, ch))
 }
 ```
 
@@ -100,7 +100,7 @@ if err := s.Init(); err != nil {
 }
 
 // Set default text style
-defStyle := tcell.StyleDefault.Background(tcell.ColorReset).Foreground(tcell.ColorReset)
+defStyle := tcell.StyleDefault.Background(color.Reset).Foreground(color.Reset)
 s.SetStyle(defStyle)
 
 // Clear screen
@@ -110,9 +110,9 @@ s.Clear()
 Text may be drawn on the screen using `Put`, `PutStr`, or `PutStrStyled`.
 
 ```go
-s.Put(0, 0, 'H', defStyle)
-s.Put(1, 0, 'i', defStyle)
-s.Put(2, 0, '!', defStyle)
+s.Put(0, 0, "H", defStyle)
+s.Put(1, 0, "i", defStyle)
+s.Put(2, 0, "!", defStyle)
 ```
 
 which is equivalent to
@@ -157,8 +157,8 @@ for {
     // Update screen
     s.Show()
 
-    // Poll event
-    ev := s.PollEvent()
+    // Poll event (can be used in select statement as well)
+    ev := <-s.EventQ()
 
     // Process event
     switch ev := ev.(type) {
@@ -183,7 +183,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell/v3"
+	"github.com/gdamore/tcell/v3/color"
 )
 
 func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string) {
@@ -244,8 +245,8 @@ func drawBox(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string)
 }
 
 func main() {
-	defStyle := tcell.StyleDefault.Background(tcell.ColorReset).Foreground(tcell.ColorReset)
-	boxStyle := tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorPurple)
+	defStyle := tcell.StyleDefault.Background(color.Reset).Foreground(color.Reset)
+	boxStyle := tcell.StyleDefault.Foreground(color.White).Background(color.Purple)
 
 	// Initialize screen
 	s, err := tcell.NewScreen()
@@ -280,10 +281,11 @@ func main() {
 	// xmax, ymax := s.Size()
 
 	// Here's an example of how to inject a keystroke where it will
-	// be picked up by the next PollEvent call.  Note that the
-	// queue is LIFO, it has a limited length, and PostEvent() can
-	// return an error.
-	// s.PostEvent(tcell.NewEventKey(tcell.KeyRune, rune('a'), 0))
+	// be picked up by a future read of the event queue.  Note that
+	// care should be used to avoid blocking writes to the queue if
+	// this is done from the same thread that is responsible for reading
+	// the queue, or else a single-party deadlock might occur.
+	// s.EventQ() <- tcell.NewEventKey(tcell.KeyRune, rune('a'), 0)
 
 	// Event loop
 	ox, oy := -1, -1
@@ -291,8 +293,8 @@ func main() {
 		// Update screen
 		s.Show()
 
-		// Poll event
-		ev := s.PollEvent()
+		// Poll event (this can be in a select statement as well)
+		ev := <-s.EventQ()
 
 		// Process event
 		switch ev := ev.(type) {
@@ -303,7 +305,7 @@ func main() {
 				return
 			} else if ev.Key() == tcell.KeyCtrlL {
 				s.Sync()
-			} else if ev.Rune() == 'C' || ev.Rune() == 'c' {
+			} else if ev.Str() == "C" || ev.Str() == "c" {
 				s.Clear()
 			}
 		case *tcell.EventMouse:
diff --git a/vendor/github.com/gdamore/tcell/v2/attr.go b/vendor/github.com/gdamore/tcell/v3/attr.go
similarity index 72%
rename from vendor/github.com/gdamore/tcell/v2/attr.go
rename to vendor/github.com/gdamore/tcell/v3/attr.go
index 05af5e5d7..66fc2b096 100644
--- a/vendor/github.com/gdamore/tcell/v2/attr.go
+++ b/vendor/github.com/gdamore/tcell/v3/attr.go
@@ -1,8 +1,8 @@
 // Copyright 2024 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -16,7 +16,10 @@ package tcell
 
 // AttrMask represents a mask of text attributes, apart from color.
 // Note that support for attributes may vary widely across terminals.
-type AttrMask uint
+// Deprecated: This should not be used directly by applications.
+// Instead use the accessor functions on the style.  (In particular the
+// details of the encoding are subject to change.)
+type AttrMask uint16
 
 // Attributes are not colors, but affect the display of text.  They can
 // be combined, in some cases, but not others. (E.g. you can have Dim Italic,
@@ -25,10 +28,9 @@ const (
 	AttrBold AttrMask = 1 << iota
 	AttrBlink
 	AttrReverse
-	AttrUnderline // Deprecated: Use UnderlineStyle
 	AttrDim
 	AttrItalic
 	AttrStrikeThrough
-	AttrInvalid AttrMask = 1 << 31 // Mark the style or attributes invalid
+	AttrInvalid AttrMask = 1 << 15 // Mark the style or attributes invalid
 	AttrNone    AttrMask = 0       // Just normal text.
 )
diff --git a/vendor/github.com/gdamore/tcell/v2/cell.go b/vendor/github.com/gdamore/tcell/v3/cell.go
similarity index 76%
rename from vendor/github.com/gdamore/tcell/v2/cell.go
rename to vendor/github.com/gdamore/tcell/v3/cell.go
index c139fbda7..73756b37d 100644
--- a/vendor/github.com/gdamore/tcell/v2/cell.go
+++ b/vendor/github.com/gdamore/tcell/v3/cell.go
@@ -1,8 +1,8 @@
-// Copyright 2025 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -14,9 +14,7 @@
 
 package tcell
 
-import (
-	"github.com/rivo/uniseg"
-)
+import "unicode/utf8"
 
 type cell struct {
 	currStr   string
@@ -29,7 +27,15 @@ type cell struct {
 
 func (c *cell) setDirty(dirty bool) {
 	if dirty {
-		c.lastStr = ""
+		// Empty cells use currStr == "" until they are first drawn, at which
+		// point SetDirty(false) normalizes them to a space.  Using "" as the
+		// dirty marker for an untouched empty cell would therefore leave
+		// lastStr == currStr and fail to force a redraw.
+		if c.currStr == "" {
+			c.lastStr = " "
+		} else {
+			c.lastStr = ""
+		}
 	} else {
 		if c.currStr == "" {
 			c.currStr = " "
@@ -40,43 +46,49 @@ func (c *cell) setDirty(dirty bool) {
 }
 
 // CellBuffer represents a two-dimensional array of character cells.
-// This is primarily intended for use by Screen implementors; it
+// This is primarily intended for use by Screen implementers; it
 // contains much of the common code they need.  To create one, just
 // declare a variable of its type; no explicit initialization is necessary.
 //
 // CellBuffer is not thread safe.
 type CellBuffer struct {
-	w     int
-	h     int
-	cells []cell
-}
-
-// SetContent sets the contents (primary rune, combining runes,
-// and style) for a cell at a given location.  If the background or
-// foreground of the style is set to ColorNone, then the respective
-// color is left un changed.
-//
-// Deprecated: Use Put instead, which this is implemented in terms of.
-func (cb *CellBuffer) SetContent(x int, y int, mainc rune, combc []rune, style Style) {
-	cb.Put(x, y, string(append([]rune{mainc}, combc...)), style)
+	w               int
+	h               int
+	cells           []cell
+	sanitizeContent bool
 }
 
 // Put a single styled grapheme using the given string and style
 // at the same location.  Note that only the first grapheme in the string
-// will bre displayed, using only the 1 or 2 (depending on width) cells
+// will be displayed, using only the 1 or 2 (depending on width) cells
 // located at x, y. It returns the rest of the string, and the width used.
 func (cb *CellBuffer) Put(x int, y int, str string, style Style) (string, int) {
+	if cb.sanitizeContent {
+		str = stripOSCControlsIfNeeded(str)
+	}
+	return cb.put(x, y, str, style)
+}
+
+func (cb *CellBuffer) put(x int, y int, str string, style Style) (string, int) {
 	var width int = 0
 	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
 		var cl string
 		c := &cb.cells[(y*cb.w)+x]
-		state := -1
-		for width == 0 && str != "" {
-			var g string
-			g, str, width, state = uniseg.FirstGraphemeClusterInString(str, state)
-			cl += g
-			if g == "" {
-				break
+		if str == c.currStr && c.width > 0 {
+			// Identical re-Put (a full-screen redraw): the grapheme split is
+			// unchanged, so reuse the measured width instead of segmenting.
+			cl, width, str = str, c.width, ""
+		} else if len(str) > 0 && str[0] >= ' ' && str[0] <= '~' && (len(str) == 1 || str[1] < utf8.RuneSelf) {
+			// Printable ASCII followed by ASCII cannot be part of a larger
+			// grapheme cluster, so avoid constructing a grapheme iterator.
+			cl, width, str = str[:1], 1, str[1:]
+		} else {
+			g := textWidthOptions.StringGraphemes(str)
+			for width == 0 && g.Next() {
+				cluster := g.Value()
+				cl += cluster
+				width = g.Width()
+				str = str[len(cluster):]
 			}
 		}
 
@@ -84,8 +96,8 @@ func (cb *CellBuffer) Put(x int, y int, str string, style Style) (string, int) {
 		// dirty as well as the base cell, to make sure we consider
 		// both cells as dirty together.  We only need to do this
 		// if we're changing content
-		if width > 0 && cl != c.currStr {
-			// Prevent unnecessary boundchecks for first cell, since we already
+		if width > 1 && cl != c.currStr {
+			// Prevent unnecessary bounds checks for first cell, since we already
 			// received that one.
 			c.setDirty(true)
 			for i := 1; i < width; i++ {
@@ -126,28 +138,6 @@ func (cb *CellBuffer) Get(x, y int) (string, Style, int) {
 	return str, style, width
 }
 
-// GetContent returns the contents of a character cell, including the
-// primary rune, any combining character runes (which will usually be
-// nil), the style, and the display width in cells.  (The width can be
-// either 1, normally, or 2 for East Asian full-width characters.)
-//
-// Deprecated: Use Get, which this implemented in terms of.
-func (cb *CellBuffer) GetContent(x, y int) (rune, []rune, Style, int) {
-	var style Style
-	var width int
-	var mainc rune
-	var combc []rune
-	str, style, width := cb.Get(x, y)
-	for i, r := range str {
-		if i == 0 {
-			mainc = r
-		} else {
-			combc = append(combc, r)
-		}
-	}
-	return mainc, combc, style, width
-}
-
 // Size returns the (width, height) in cells of the buffer.
 func (cb *CellBuffer) Size() (int, int) {
 	return cb.w, cb.h
@@ -156,7 +146,7 @@ func (cb *CellBuffer) Size() (int, int) {
 // Invalidate marks all characters within the buffer as dirty.
 func (cb *CellBuffer) Invalidate() {
 	for i := range cb.cells {
-		cb.cells[i].lastStr = ""
+		cb.cells[i].setDirty(true)
 	}
 }
 
diff --git a/vendor/github.com/gdamore/tcell/v2/charset_plan9.go b/vendor/github.com/gdamore/tcell/v3/charset_plan9.go
similarity index 85%
rename from vendor/github.com/gdamore/tcell/v2/charset_plan9.go
rename to vendor/github.com/gdamore/tcell/v3/charset_plan9.go
index 959d181e1..9b33545e3 100644
--- a/vendor/github.com/gdamore/tcell/v2/charset_plan9.go
+++ b/vendor/github.com/gdamore/tcell/v3/charset_plan9.go
@@ -4,8 +4,8 @@
 // Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
diff --git a/vendor/github.com/gdamore/tcell/v2/charset_unix.go b/vendor/github.com/gdamore/tcell/v3/charset_unix.go
similarity index 83%
rename from vendor/github.com/gdamore/tcell/v2/charset_unix.go
rename to vendor/github.com/gdamore/tcell/v3/charset_unix.go
index 8bbf1f5ed..63877372d 100644
--- a/vendor/github.com/gdamore/tcell/v2/charset_unix.go
+++ b/vendor/github.com/gdamore/tcell/v3/charset_unix.go
@@ -1,11 +1,11 @@
-//go:build !windows && !nacl && !plan9
-// +build !windows,!nacl,!plan9
+//go:build unix
+// +build unix
 
-// Copyright 2016 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -45,6 +45,5 @@ func getCharset() string {
 		// without a character set, which we assume implies UTF-8.
 		return "UTF-8"
 	}
-	// XXX: add support for aliases
 	return locale
 }
diff --git a/vendor/github.com/gdamore/tcell/v2/charset_windows.go b/vendor/github.com/gdamore/tcell/v3/charset_windows.go
similarity index 83%
rename from vendor/github.com/gdamore/tcell/v2/charset_windows.go
rename to vendor/github.com/gdamore/tcell/v3/charset_windows.go
index 68e498291..0b45c7f23 100644
--- a/vendor/github.com/gdamore/tcell/v2/charset_windows.go
+++ b/vendor/github.com/gdamore/tcell/v3/charset_windows.go
@@ -4,8 +4,8 @@
 // Copyright 2015 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
diff --git a/vendor/github.com/gdamore/tcell/v3/color.go b/vendor/github.com/gdamore/tcell/v3/color.go
new file mode 100644
index 000000000..fe414d8ae
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/color.go
@@ -0,0 +1,515 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tcell
+
+import (
+	ic "image/color"
+
+	"github.com/gdamore/tcell/v3/color"
+)
+
+// Note that the entire contents of this file should be considered deprecated
+// in favor of the color subpackage.  (This also means others can use the color
+// package without importing the entirety of tcell into their binaries.)
+
+// Color represents a color.  The low numeric values are the same as used
+// by ECMA-48, and beyond that XTerm.
+//
+// Note that on various terminals colors may be approximated however, or
+// not supported at all.  If no suitable representation for a color is known,
+// the library will simply not set any color, deferring to whatever default
+// attributes the terminal uses.
+type Color = color.Color
+
+const (
+	// ColorDefault is used to leave the Color unchanged from whatever
+	// system or terminal default may exist.  It's also the zero value.
+	ColorDefault = color.Default
+
+	// ColorValid is used to indicate the color value is actually
+	// valid (initialized).
+	// Deprecated: Use color.IsValid instead.
+	ColorValid = color.IsValid
+
+	// ColorIsRGB is used to indicate that the numeric value is not
+	// a known color constant, but rather an RGB value.
+	// Deprecated: Use color.IsRGB instead.
+	ColorIsRGB = color.IsRGB
+
+	// ColorSpecial is a flag used to indicate that the values have
+	// special meaning, and live outside of the color space(s).
+	// Deprecated.
+	ColorSpecial = color.IsSpecial
+)
+
+// Note that the order of these options is important -- it follows the
+// definitions used by ECMA and XTerm.  Hence any further named colors
+// must begin at a value not less than 256.
+//
+// Deprecated: Use color.XXX symbols instead.
+const (
+	ColorBlack                = color.XTerm0
+	ColorMaroon               = color.XTerm1
+	ColorGreen                = color.XTerm2
+	ColorOlive                = color.XTerm3
+	ColorNavy                 = color.XTerm4
+	ColorPurple               = color.XTerm5
+	ColorTeal                 = color.XTerm6
+	ColorSilver               = color.XTerm7
+	ColorGray                 = color.XTerm8
+	ColorRed                  = color.XTerm9
+	ColorLime                 = color.XTerm10
+	ColorYellow               = color.XTerm11
+	ColorBlue                 = color.XTerm12
+	ColorFuchsia              = color.XTerm13
+	ColorAqua                 = color.XTerm14
+	ColorWhite                = color.XTerm15
+	Color16                   = color.XTerm16
+	Color17                   = color.XTerm17
+	Color18                   = color.XTerm18
+	Color19                   = color.XTerm19
+	Color20                   = color.XTerm20
+	Color21                   = color.XTerm21
+	Color22                   = color.XTerm22
+	Color23                   = color.XTerm23
+	Color24                   = color.XTerm24
+	Color25                   = color.XTerm25
+	Color26                   = color.XTerm26
+	Color27                   = color.XTerm27
+	Color28                   = color.XTerm28
+	Color29                   = color.XTerm29
+	Color30                   = color.XTerm30
+	Color31                   = color.XTerm31
+	Color32                   = color.XTerm32
+	Color33                   = color.XTerm33
+	Color34                   = color.XTerm34
+	Color35                   = color.XTerm35
+	Color36                   = color.XTerm36
+	Color37                   = color.XTerm37
+	Color38                   = color.XTerm38
+	Color39                   = color.XTerm39
+	Color40                   = color.XTerm40
+	Color41                   = color.XTerm41
+	Color42                   = color.XTerm42
+	Color43                   = color.XTerm43
+	Color44                   = color.XTerm44
+	Color45                   = color.XTerm45
+	Color46                   = color.XTerm46
+	Color47                   = color.XTerm47
+	Color48                   = color.XTerm48
+	Color49                   = color.XTerm49
+	Color50                   = color.XTerm50
+	Color51                   = color.XTerm51
+	Color52                   = color.XTerm52
+	Color53                   = color.XTerm53
+	Color54                   = color.XTerm54
+	Color55                   = color.XTerm55
+	Color56                   = color.XTerm56
+	Color57                   = color.XTerm57
+	Color58                   = color.XTerm58
+	Color59                   = color.XTerm59
+	Color60                   = color.XTerm60
+	Color61                   = color.XTerm61
+	Color62                   = color.XTerm62
+	Color63                   = color.XTerm63
+	Color64                   = color.XTerm64
+	Color65                   = color.XTerm65
+	Color66                   = color.XTerm66
+	Color67                   = color.XTerm67
+	Color68                   = color.XTerm68
+	Color69                   = color.XTerm69
+	Color70                   = color.XTerm70
+	Color71                   = color.XTerm71
+	Color72                   = color.XTerm72
+	Color73                   = color.XTerm73
+	Color74                   = color.XTerm74
+	Color75                   = color.XTerm75
+	Color76                   = color.XTerm76
+	Color77                   = color.XTerm77
+	Color78                   = color.XTerm78
+	Color79                   = color.XTerm79
+	Color80                   = color.XTerm80
+	Color81                   = color.XTerm81
+	Color82                   = color.XTerm82
+	Color83                   = color.XTerm83
+	Color84                   = color.XTerm84
+	Color85                   = color.XTerm85
+	Color86                   = color.XTerm86
+	Color87                   = color.XTerm87
+	Color88                   = color.XTerm88
+	Color89                   = color.XTerm89
+	Color90                   = color.XTerm90
+	Color91                   = color.XTerm91
+	Color92                   = color.XTerm92
+	Color93                   = color.XTerm93
+	Color94                   = color.XTerm94
+	Color95                   = color.XTerm95
+	Color96                   = color.XTerm96
+	Color97                   = color.XTerm97
+	Color98                   = color.XTerm98
+	Color99                   = color.XTerm99
+	Color100                  = color.XTerm100
+	Color101                  = color.XTerm101
+	Color102                  = color.XTerm102
+	Color103                  = color.XTerm103
+	Color104                  = color.XTerm104
+	Color105                  = color.XTerm105
+	Color106                  = color.XTerm106
+	Color107                  = color.XTerm107
+	Color108                  = color.XTerm108
+	Color109                  = color.XTerm109
+	Color110                  = color.XTerm110
+	Color111                  = color.XTerm111
+	Color112                  = color.XTerm112
+	Color113                  = color.XTerm113
+	Color114                  = color.XTerm114
+	Color115                  = color.XTerm115
+	Color116                  = color.XTerm116
+	Color117                  = color.XTerm117
+	Color118                  = color.XTerm118
+	Color119                  = color.XTerm119
+	Color120                  = color.XTerm120
+	Color121                  = color.XTerm121
+	Color122                  = color.XTerm122
+	Color123                  = color.XTerm123
+	Color124                  = color.XTerm124
+	Color125                  = color.XTerm125
+	Color126                  = color.XTerm126
+	Color127                  = color.XTerm127
+	Color128                  = color.XTerm128
+	Color129                  = color.XTerm129
+	Color130                  = color.XTerm130
+	Color131                  = color.XTerm131
+	Color132                  = color.XTerm132
+	Color133                  = color.XTerm133
+	Color134                  = color.XTerm134
+	Color135                  = color.XTerm135
+	Color136                  = color.XTerm136
+	Color137                  = color.XTerm137
+	Color138                  = color.XTerm138
+	Color139                  = color.XTerm139
+	Color140                  = color.XTerm140
+	Color141                  = color.XTerm141
+	Color142                  = color.XTerm142
+	Color143                  = color.XTerm143
+	Color144                  = color.XTerm144
+	Color145                  = color.XTerm145
+	Color146                  = color.XTerm146
+	Color147                  = color.XTerm147
+	Color148                  = color.XTerm148
+	Color149                  = color.XTerm149
+	Color150                  = color.XTerm150
+	Color151                  = color.XTerm151
+	Color152                  = color.XTerm152
+	Color153                  = color.XTerm153
+	Color154                  = color.XTerm154
+	Color155                  = color.XTerm155
+	Color156                  = color.XTerm156
+	Color157                  = color.XTerm157
+	Color158                  = color.XTerm158
+	Color159                  = color.XTerm159
+	Color160                  = color.XTerm160
+	Color161                  = color.XTerm161
+	Color162                  = color.XTerm162
+	Color163                  = color.XTerm163
+	Color164                  = color.XTerm164
+	Color165                  = color.XTerm165
+	Color166                  = color.XTerm166
+	Color167                  = color.XTerm167
+	Color168                  = color.XTerm168
+	Color169                  = color.XTerm169
+	Color170                  = color.XTerm170
+	Color171                  = color.XTerm171
+	Color172                  = color.XTerm172
+	Color173                  = color.XTerm173
+	Color174                  = color.XTerm174
+	Color175                  = color.XTerm175
+	Color176                  = color.XTerm176
+	Color177                  = color.XTerm177
+	Color178                  = color.XTerm178
+	Color179                  = color.XTerm179
+	Color180                  = color.XTerm180
+	Color181                  = color.XTerm181
+	Color182                  = color.XTerm182
+	Color183                  = color.XTerm183
+	Color184                  = color.XTerm184
+	Color185                  = color.XTerm185
+	Color186                  = color.XTerm186
+	Color187                  = color.XTerm187
+	Color188                  = color.XTerm188
+	Color189                  = color.XTerm189
+	Color190                  = color.XTerm190
+	Color191                  = color.XTerm191
+	Color192                  = color.XTerm192
+	Color193                  = color.XTerm193
+	Color194                  = color.XTerm194
+	Color195                  = color.XTerm195
+	Color196                  = color.XTerm196
+	Color197                  = color.XTerm197
+	Color198                  = color.XTerm198
+	Color199                  = color.XTerm199
+	Color200                  = color.XTerm200
+	Color201                  = color.XTerm201
+	Color202                  = color.XTerm202
+	Color203                  = color.XTerm203
+	Color204                  = color.XTerm204
+	Color205                  = color.XTerm205
+	Color206                  = color.XTerm206
+	Color207                  = color.XTerm207
+	Color208                  = color.XTerm208
+	Color209                  = color.XTerm209
+	Color210                  = color.XTerm210
+	Color211                  = color.XTerm211
+	Color212                  = color.XTerm212
+	Color213                  = color.XTerm213
+	Color214                  = color.XTerm214
+	Color215                  = color.XTerm215
+	Color216                  = color.XTerm216
+	Color217                  = color.XTerm217
+	Color218                  = color.XTerm218
+	Color219                  = color.XTerm219
+	Color220                  = color.XTerm220
+	Color221                  = color.XTerm221
+	Color222                  = color.XTerm222
+	Color223                  = color.XTerm223
+	Color224                  = color.XTerm224
+	Color225                  = color.XTerm225
+	Color226                  = color.XTerm226
+	Color227                  = color.XTerm227
+	Color228                  = color.XTerm228
+	Color229                  = color.XTerm229
+	Color230                  = color.XTerm230
+	Color231                  = color.XTerm231
+	Color232                  = color.XTerm232
+	Color233                  = color.XTerm233
+	Color234                  = color.XTerm234
+	Color235                  = color.XTerm235
+	Color236                  = color.XTerm236
+	Color237                  = color.XTerm237
+	Color238                  = color.XTerm238
+	Color239                  = color.XTerm239
+	Color240                  = color.XTerm240
+	Color241                  = color.XTerm241
+	Color242                  = color.XTerm242
+	Color243                  = color.XTerm243
+	Color244                  = color.XTerm244
+	Color245                  = color.XTerm245
+	Color246                  = color.XTerm246
+	Color247                  = color.XTerm247
+	Color248                  = color.XTerm248
+	Color249                  = color.XTerm249
+	Color250                  = color.XTerm250
+	Color251                  = color.XTerm251
+	Color252                  = color.XTerm252
+	Color253                  = color.XTerm253
+	Color254                  = color.XTerm254
+	Color255                  = color.XTerm255
+	ColorAliceBlue            = color.AliceBlue
+	ColorAntiqueWhite         = color.AntiqueWhite
+	ColorAquaMarine           = color.AquaMarine
+	ColorAzure                = color.Azure
+	ColorBeige                = color.Beige
+	ColorBisque               = color.Bisque
+	ColorBlanchedAlmond       = color.BlanchedAlmond
+	ColorBlueViolet           = color.BlueViolet
+	ColorBrown                = color.Brown
+	ColorBurlyWood            = color.BurlyWood
+	ColorCadetBlue            = color.CadetBlue
+	ColorChartreuse           = color.Chartreuse
+	ColorChocolate            = color.Chocolate
+	ColorCoral                = color.Coral
+	ColorCornflowerBlue       = color.CornflowerBlue
+	ColorCornsilk             = color.Cornsilk
+	ColorCrimson              = color.Crimson
+	ColorDarkBlue             = color.DarkBlue
+	ColorDarkCyan             = color.DarkCyan
+	ColorDarkGoldenrod        = color.DarkGoldenrod
+	ColorDarkGray             = color.DarkGray
+	ColorDarkGreen            = color.DarkGreen
+	ColorDarkKhaki            = color.DarkKhaki
+	ColorDarkMagenta          = color.DarkMagenta
+	ColorDarkOliveGreen       = color.DarkOliveGreen
+	ColorDarkOrange           = color.DarkOrange
+	ColorDarkOrchid           = color.DarkOrchid
+	ColorDarkRed              = color.DarkRed
+	ColorDarkSalmon           = color.DarkSalmon
+	ColorDarkSeaGreen         = color.DarkSeaGreen
+	ColorDarkSlateBlue        = color.DarkSlateBlue
+	ColorDarkSlateGray        = color.DarkSlateGray
+	ColorDarkTurquoise        = color.DarkTurquoise
+	ColorDarkViolet           = color.DarkViolet
+	ColorDeepPink             = color.DeepPink
+	ColorDeepSkyBlue          = color.DeepSkyBlue
+	ColorDimGray              = color.DimGray
+	ColorDodgerBlue           = color.DodgerBlue
+	ColorFireBrick            = color.FireBrick
+	ColorFloralWhite          = color.FloralWhite
+	ColorForestGreen          = color.ForestGreen
+	ColorGainsboro            = color.Gainsboro
+	ColorGhostWhite           = color.GhostWhite
+	ColorGold                 = color.Gold
+	ColorGoldenrod            = color.Goldenrod
+	ColorGreenYellow          = color.GreenYellow
+	ColorHoneydew             = color.Honeydew
+	ColorHotPink              = color.HotPink
+	ColorIndianRed            = color.IndianRed
+	ColorIndigo               = color.Indigo
+	ColorIvory                = color.Ivory
+	ColorKhaki                = color.Khaki
+	ColorLavender             = color.Lavender
+	ColorLavenderBlush        = color.LavenderBlush
+	ColorLawnGreen            = color.LawnGreen
+	ColorLemonChiffon         = color.LemonChiffon
+	ColorLightBlue            = color.LightBlue
+	ColorLightCoral           = color.LightCoral
+	ColorLightCyan            = color.LightCyan
+	ColorLightGoldenrodYellow = color.LightGoldenrodYellow
+	ColorLightGray            = color.LightGray
+	ColorLightGreen           = color.LightGreen
+	ColorLightPink            = color.LightPink
+	ColorLightSalmon          = color.LightSalmon
+	ColorLightSeaGreen        = color.LightSeaGreen
+	ColorLightSkyBlue         = color.LightSkyBlue
+	ColorLightSlateGray       = color.LightSlateGray
+	ColorLightSteelBlue       = color.LightSteelBlue
+	ColorLightYellow          = color.LightYellow
+	ColorLimeGreen            = color.LimeGreen
+	ColorLinen                = color.Linen
+	ColorMediumAquamarine     = color.MediumAquamarine
+	ColorMediumBlue           = color.MediumBlue
+	ColorMediumOrchid         = color.MediumOrchid
+	ColorMediumPurple         = color.MediumPurple
+	ColorMediumSeaGreen       = color.MediumSeaGreen
+	ColorMediumSlateBlue      = color.MediumSlateBlue
+	ColorMediumSpringGreen    = color.MediumSpringGreen
+	ColorMediumTurquoise      = color.MediumTurquoise
+	ColorMediumVioletRed      = color.MediumVioletRed
+	ColorMidnightBlue         = color.MidnightBlue
+	ColorMintCream            = color.MintCream
+	ColorMistyRose            = color.MistyRose
+	ColorMoccasin             = color.Moccasin
+	ColorNavajoWhite          = color.NavajoWhite
+	ColorOldLace              = color.OldLace
+	ColorOliveDrab            = color.OliveDrab
+	ColorOrange               = color.Orange
+	ColorOrangeRed            = color.OrangeRed
+	ColorOrchid               = color.Orchid
+	ColorPaleGoldenrod        = color.PaleGoldenrod
+	ColorPaleGreen            = color.PaleGreen
+	ColorPaleTurquoise        = color.PaleTurquoise
+	ColorPaleVioletRed        = color.PaleVioletRed
+	ColorPapayaWhip           = color.PapayaWhip
+	ColorPeachPuff            = color.PeachPuff
+	ColorPeru                 = color.Peru
+	ColorPink                 = color.Pink
+	ColorPlum                 = color.Plum
+	ColorPowderBlue           = color.PowderBlue
+	ColorRebeccaPurple        = color.RebeccaPurple
+	ColorRosyBrown            = color.RosyBrown
+	ColorRoyalBlue            = color.RoyalBlue
+	ColorSaddleBrown          = color.SaddleBrown
+	ColorSalmon               = color.Salmon
+	ColorSandyBrown           = color.SandyBrown
+	ColorSeaGreen             = color.SeaGreen
+	ColorSeashell             = color.Seashell
+	ColorSienna               = color.Sienna
+	ColorSkyblue              = color.Skyblue
+	ColorSlateBlue            = color.SlateBlue
+	ColorSlateGray            = color.SlateGray
+	ColorSnow                 = color.Snow
+	ColorSpringGreen          = color.SpringGreen
+	ColorSteelBlue            = color.SteelBlue
+	ColorTan                  = color.Tan
+	ColorThistle              = color.Thistle
+	ColorTomato               = color.Tomato
+	ColorTurquoise            = color.Turquoise
+	ColorViolet               = color.Violet
+	ColorWheat                = color.Wheat
+	ColorWhiteSmoke           = color.WhiteSmoke
+	ColorYellowGreen          = color.YellowGreen
+)
+
+// These are aliases for the color gray, because some of us spell
+// it as grey. Deprecated: Use color values.
+const (
+	ColorGrey           = color.Gray
+	ColorDimGrey        = color.DimGray
+	ColorDarkGrey       = color.DarkGray
+	ColorDarkSlateGrey  = color.DarkSlateGray
+	ColorLightGrey      = color.LightGray
+	ColorLightSlateGrey = color.LightSlateGray
+	ColorSlateGrey      = color.SlateGray
+)
+
+// ColorValues maps color constants to their RGB values.
+var ColorValues = color.ColorValues
+
+// Special colors.
+const (
+	// ColorReset is used to indicate that the color should use the
+	// vanilla terminal colors.  (Basically go back to the defaults.)
+	// Deprecated: Use color.Reset.
+	ColorReset = color.Reset
+
+	// ColorNone indicates that we should not change the color from
+	// whatever is already displayed.  This can only be used in limited
+	// circumstances.
+	// Deprecated: Use color.None.
+	ColorNone = color.None
+)
+
+// ColorNames holds the written names of colors. Useful to present a list of
+// recognized named colors. Deprecated: Use color.Names.
+var ColorNames = color.Names
+
+// NewRGBColor returns a new color with the given red, green, and blue values.
+// Each value must be represented in the range 0-255.
+// Deprecated: Use color.NewRGBColor.
+func NewRGBColor(r, g, b int32) Color {
+	return color.NewRGBColor(r, g, b)
+}
+
+// NewHexColor returns a color using the given 24-bit RGB value.
+// Deprecated: Use color.NewHexColor.
+func NewHexColor(v int32) Color {
+	return color.NewHexColor(v)
+}
+
+// GetColor creates a Color from a color name (W3C name). A hex value may
+// be supplied as a string in the format "#ffffff".
+// Deprecated: Use color.GetColor.
+func GetColor(name string) Color {
+	return color.GetColor(name)
+}
+
+// PaletteColor creates a color based on the palette index.
+// Deprecated: Use color.PaletteColor.
+func PaletteColor(index int) Color {
+	return color.PaletteColor(index)
+}
+
+// FromImageColor converts an image/color.Color into Color.
+// Deprecated: Use color.FromImageColor.
+func FromImageColor(imageColor ic.Color) Color {
+	return color.FromImageColor(imageColor)
+}
+
+// FindColor attempts to find a given color, or the best match possible for it,
+// from the palette given.  This is an expensive operation, so results should
+// be cached by the caller.
+// Deprecated: Use color.Find.
+func FindColor(c Color, palette []Color) Color {
+	return color.Find(c, palette)
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/color/color.go b/vendor/github.com/gdamore/tcell/v3/color/color.go
new file mode 100644
index 000000000..0634e3986
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/color/color.go
@@ -0,0 +1,1174 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package color
+
+import (
+	"fmt"
+	ic "image/color"
+	"strconv"
+)
+
+// Color represents a color.  The low numeric values are the same as used
+// by ECMA-48, and beyond that XTerm.
+//
+// For Color names we use the W3C approved color names.
+//
+// Note that on various terminals colors may be approximated however, or
+// not supported at all.  If no suitable representation for a color is known,
+// the library will simply not set any color, deferring to whatever default
+// attributes the terminal uses.
+type Color uint32
+
+const (
+	// Default is used to leave the Color unchanged from whatever
+	// system or terminal default may exist.  It's also the zero value.
+	Default Color = 0
+
+	// IsValid is used to indicate the color value is actually
+	// valid (initialized).  This is useful to permit the zero value
+	// to be treated as the default. This should not be used
+	// directly by applications.  Use the IsValid method on Color instead.
+	IsValid Color = 1 << 31
+
+	// IsRGB is used to indicate that the numeric value is not
+	// a known color constant, but rather an RGB value.  The lower
+	// order 3 bytes are RGB.  This should not be used directly,
+	// instead use the Color.IsRGB method.
+	IsRGB Color = 1 << 30
+
+	// IsSpecial is a flag used to indicate that the values have
+	// special meaning, and live outside of the color space(s).
+	// This should not be used directly by applications.
+	IsSpecial Color = 1 << 29
+)
+
+// Note that the order of these options is important -- it follows the
+// definitions used by ECMA and XTerm.  Hence any further named colors
+// must begin at a value not less than 256.
+const (
+	Black   = XTerm0
+	Maroon  = XTerm1
+	Green   = XTerm2
+	Olive   = XTerm3
+	Navy    = XTerm4
+	Purple  = XTerm5
+	Teal    = XTerm6
+	Silver  = XTerm7
+	Gray    = XTerm8
+	Red     = XTerm9
+	Lime    = XTerm10
+	Yellow  = XTerm11
+	Blue    = XTerm12
+	Fuchsia = XTerm13
+	Aqua    = XTerm14
+	White   = XTerm15
+)
+
+const (
+	XTerm0 = IsValid + iota
+	XTerm1
+	XTerm2
+	XTerm3
+	XTerm4
+	XTerm5
+	XTerm6
+	XTerm7
+	XTerm8
+	XTerm9
+	XTerm10
+	XTerm11
+	XTerm12
+	XTerm13
+	XTerm14
+	XTerm15
+	XTerm16
+	XTerm17
+	XTerm18
+	XTerm19
+	XTerm20
+	XTerm21
+	XTerm22
+	XTerm23
+	XTerm24
+	XTerm25
+	XTerm26
+	XTerm27
+	XTerm28
+	XTerm29
+	XTerm30
+	XTerm31
+	XTerm32
+	XTerm33
+	XTerm34
+	XTerm35
+	XTerm36
+	XTerm37
+	XTerm38
+	XTerm39
+	XTerm40
+	XTerm41
+	XTerm42
+	XTerm43
+	XTerm44
+	XTerm45
+	XTerm46
+	XTerm47
+	XTerm48
+	XTerm49
+	XTerm50
+	XTerm51
+	XTerm52
+	XTerm53
+	XTerm54
+	XTerm55
+	XTerm56
+	XTerm57
+	XTerm58
+	XTerm59
+	XTerm60
+	XTerm61
+	XTerm62
+	XTerm63
+	XTerm64
+	XTerm65
+	XTerm66
+	XTerm67
+	XTerm68
+	XTerm69
+	XTerm70
+	XTerm71
+	XTerm72
+	XTerm73
+	XTerm74
+	XTerm75
+	XTerm76
+	XTerm77
+	XTerm78
+	XTerm79
+	XTerm80
+	XTerm81
+	XTerm82
+	XTerm83
+	XTerm84
+	XTerm85
+	XTerm86
+	XTerm87
+	XTerm88
+	XTerm89
+	XTerm90
+	XTerm91
+	XTerm92
+	XTerm93
+	XTerm94
+	XTerm95
+	XTerm96
+	XTerm97
+	XTerm98
+	XTerm99
+	XTerm100
+	XTerm101
+	XTerm102
+	XTerm103
+	XTerm104
+	XTerm105
+	XTerm106
+	XTerm107
+	XTerm108
+	XTerm109
+	XTerm110
+	XTerm111
+	XTerm112
+	XTerm113
+	XTerm114
+	XTerm115
+	XTerm116
+	XTerm117
+	XTerm118
+	XTerm119
+	XTerm120
+	XTerm121
+	XTerm122
+	XTerm123
+	XTerm124
+	XTerm125
+	XTerm126
+	XTerm127
+	XTerm128
+	XTerm129
+	XTerm130
+	XTerm131
+	XTerm132
+	XTerm133
+	XTerm134
+	XTerm135
+	XTerm136
+	XTerm137
+	XTerm138
+	XTerm139
+	XTerm140
+	XTerm141
+	XTerm142
+	XTerm143
+	XTerm144
+	XTerm145
+	XTerm146
+	XTerm147
+	XTerm148
+	XTerm149
+	XTerm150
+	XTerm151
+	XTerm152
+	XTerm153
+	XTerm154
+	XTerm155
+	XTerm156
+	XTerm157
+	XTerm158
+	XTerm159
+	XTerm160
+	XTerm161
+	XTerm162
+	XTerm163
+	XTerm164
+	XTerm165
+	XTerm166
+	XTerm167
+	XTerm168
+	XTerm169
+	XTerm170
+	XTerm171
+	XTerm172
+	XTerm173
+	XTerm174
+	XTerm175
+	XTerm176
+	XTerm177
+	XTerm178
+	XTerm179
+	XTerm180
+	XTerm181
+	XTerm182
+	XTerm183
+	XTerm184
+	XTerm185
+	XTerm186
+	XTerm187
+	XTerm188
+	XTerm189
+	XTerm190
+	XTerm191
+	XTerm192
+	XTerm193
+	XTerm194
+	XTerm195
+	XTerm196
+	XTerm197
+	XTerm198
+	XTerm199
+	XTerm200
+	XTerm201
+	XTerm202
+	XTerm203
+	XTerm204
+	XTerm205
+	XTerm206
+	XTerm207
+	XTerm208
+	XTerm209
+	XTerm210
+	XTerm211
+	XTerm212
+	XTerm213
+	XTerm214
+	XTerm215
+	XTerm216
+	XTerm217
+	XTerm218
+	XTerm219
+	XTerm220
+	XTerm221
+	XTerm222
+	XTerm223
+	XTerm224
+	XTerm225
+	XTerm226
+	XTerm227
+	XTerm228
+	XTerm229
+	XTerm230
+	XTerm231
+	XTerm232
+	XTerm233
+	XTerm234
+	XTerm235
+	XTerm236
+	XTerm237
+	XTerm238
+	XTerm239
+	XTerm240
+	XTerm241
+	XTerm242
+	XTerm243
+	XTerm244
+	XTerm245
+	XTerm246
+	XTerm247
+	XTerm248
+	XTerm249
+	XTerm250
+	XTerm251
+	XTerm252
+	XTerm253
+	XTerm254
+	XTerm255
+	AliceBlue            = IsRGB | IsValid | 0xF0F8FF
+	AntiqueWhite         = IsRGB | IsValid | 0xFAEBD7
+	AquaMarine           = IsRGB | IsValid | 0x7FFFD4
+	Azure                = IsRGB | IsValid | 0xF0FFFF
+	Beige                = IsRGB | IsValid | 0xF5F5DC
+	Bisque               = IsRGB | IsValid | 0xFFE4C4
+	BlanchedAlmond       = IsRGB | IsValid | 0xFFEBCD
+	BlueViolet           = IsRGB | IsValid | 0x8A2BE2
+	Brown                = IsRGB | IsValid | 0xA52A2A
+	BurlyWood            = IsRGB | IsValid | 0xDEB887
+	CadetBlue            = IsRGB | IsValid | 0x5F9EA0
+	Chartreuse           = IsRGB | IsValid | 0x7FFF00
+	Chocolate            = IsRGB | IsValid | 0xD2691E
+	Coral                = IsRGB | IsValid | 0xFF7F50
+	CornflowerBlue       = IsRGB | IsValid | 0x6495ED
+	Cornsilk             = IsRGB | IsValid | 0xFFF8DC
+	Crimson              = IsRGB | IsValid | 0xDC143C
+	DarkBlue             = IsRGB | IsValid | 0x00008B
+	DarkCyan             = IsRGB | IsValid | 0x008B8B
+	DarkGoldenrod        = IsRGB | IsValid | 0xB8860B
+	DarkGray             = IsRGB | IsValid | 0xA9A9A9
+	DarkGreen            = IsRGB | IsValid | 0x006400
+	DarkKhaki            = IsRGB | IsValid | 0xBDB76B
+	DarkMagenta          = IsRGB | IsValid | 0x8B008B
+	DarkOliveGreen       = IsRGB | IsValid | 0x556B2F
+	DarkOrange           = IsRGB | IsValid | 0xFF8C00
+	DarkOrchid           = IsRGB | IsValid | 0x9932CC
+	DarkRed              = IsRGB | IsValid | 0x8B0000
+	DarkSalmon           = IsRGB | IsValid | 0xE9967A
+	DarkSeaGreen         = IsRGB | IsValid | 0x8FBC8F
+	DarkSlateBlue        = IsRGB | IsValid | 0x483D8B
+	DarkSlateGray        = IsRGB | IsValid | 0x2F4F4F
+	DarkTurquoise        = IsRGB | IsValid | 0x00CED1
+	DarkViolet           = IsRGB | IsValid | 0x9400D3
+	DeepPink             = IsRGB | IsValid | 0xFF1493
+	DeepSkyBlue          = IsRGB | IsValid | 0x00BFFF
+	DimGray              = IsRGB | IsValid | 0x696969
+	DodgerBlue           = IsRGB | IsValid | 0x1E90FF
+	FireBrick            = IsRGB | IsValid | 0xB22222
+	FloralWhite          = IsRGB | IsValid | 0xFFFAF0
+	ForestGreen          = IsRGB | IsValid | 0x228B22
+	Gainsboro            = IsRGB | IsValid | 0xDCDCDC
+	GhostWhite           = IsRGB | IsValid | 0xF8F8FF
+	Gold                 = IsRGB | IsValid | 0xFFD700
+	Goldenrod            = IsRGB | IsValid | 0xDAA520
+	GreenYellow          = IsRGB | IsValid | 0xADFF2F
+	Honeydew             = IsRGB | IsValid | 0xF0FFF0
+	HotPink              = IsRGB | IsValid | 0xFF69B4
+	IndianRed            = IsRGB | IsValid | 0xCD5C5C
+	Indigo               = IsRGB | IsValid | 0x4B0082
+	Ivory                = IsRGB | IsValid | 0xFFFFF0
+	Khaki                = IsRGB | IsValid | 0xF0E68C
+	Lavender             = IsRGB | IsValid | 0xE6E6FA
+	LavenderBlush        = IsRGB | IsValid | 0xFFF0F5
+	LawnGreen            = IsRGB | IsValid | 0x7CFC00
+	LemonChiffon         = IsRGB | IsValid | 0xFFFACD
+	LightBlue            = IsRGB | IsValid | 0xADD8E6
+	LightCoral           = IsRGB | IsValid | 0xF08080
+	LightCyan            = IsRGB | IsValid | 0xE0FFFF
+	LightGoldenrodYellow = IsRGB | IsValid | 0xFAFAD2
+	LightGray            = IsRGB | IsValid | 0xD3D3D3
+	LightGreen           = IsRGB | IsValid | 0x90EE90
+	LightPink            = IsRGB | IsValid | 0xFFB6C1
+	LightSalmon          = IsRGB | IsValid | 0xFFA07A
+	LightSeaGreen        = IsRGB | IsValid | 0x20B2AA
+	LightSkyBlue         = IsRGB | IsValid | 0x87CEFA
+	LightSlateGray       = IsRGB | IsValid | 0x778899
+	LightSteelBlue       = IsRGB | IsValid | 0xB0C4DE
+	LightYellow          = IsRGB | IsValid | 0xFFFFE0
+	LimeGreen            = IsRGB | IsValid | 0x32CD32
+	Linen                = IsRGB | IsValid | 0xFAF0E6
+	MediumAquamarine     = IsRGB | IsValid | 0x66CDAA
+	MediumBlue           = IsRGB | IsValid | 0x0000CD
+	MediumOrchid         = IsRGB | IsValid | 0xBA55D3
+	MediumPurple         = IsRGB | IsValid | 0x9370DB
+	MediumSeaGreen       = IsRGB | IsValid | 0x3CB371
+	MediumSlateBlue      = IsRGB | IsValid | 0x7B68EE
+	MediumSpringGreen    = IsRGB | IsValid | 0x00FA9A
+	MediumTurquoise      = IsRGB | IsValid | 0x48D1CC
+	MediumVioletRed      = IsRGB | IsValid | 0xC71585
+	MidnightBlue         = IsRGB | IsValid | 0x191970
+	MintCream            = IsRGB | IsValid | 0xF5FFFA
+	MistyRose            = IsRGB | IsValid | 0xFFE4E1
+	Moccasin             = IsRGB | IsValid | 0xFFE4B5
+	NavajoWhite          = IsRGB | IsValid | 0xFFDEAD
+	OldLace              = IsRGB | IsValid | 0xFDF5E6
+	OliveDrab            = IsRGB | IsValid | 0x6B8E23
+	Orange               = IsRGB | IsValid | 0xFFA500
+	OrangeRed            = IsRGB | IsValid | 0xFF4500
+	Orchid               = IsRGB | IsValid | 0xDA70D6
+	PaleGoldenrod        = IsRGB | IsValid | 0xEEE8AA
+	PaleGreen            = IsRGB | IsValid | 0x98FB98
+	PaleTurquoise        = IsRGB | IsValid | 0xAFEEEE
+	PaleVioletRed        = IsRGB | IsValid | 0xDB7093
+	PapayaWhip           = IsRGB | IsValid | 0xFFEFD5
+	PeachPuff            = IsRGB | IsValid | 0xFFDAB9
+	Peru                 = IsRGB | IsValid | 0xCD853F
+	Pink                 = IsRGB | IsValid | 0xFFC0CB
+	Plum                 = IsRGB | IsValid | 0xDDA0DD
+	PowderBlue           = IsRGB | IsValid | 0xB0E0E6
+	RebeccaPurple        = IsRGB | IsValid | 0x663399
+	RosyBrown            = IsRGB | IsValid | 0xBC8F8F
+	RoyalBlue            = IsRGB | IsValid | 0x4169E1
+	SaddleBrown          = IsRGB | IsValid | 0x8B4513
+	Salmon               = IsRGB | IsValid | 0xFA8072
+	SandyBrown           = IsRGB | IsValid | 0xF4A460
+	SeaGreen             = IsRGB | IsValid | 0x2E8B57
+	Seashell             = IsRGB | IsValid | 0xFFF5EE
+	Sienna               = IsRGB | IsValid | 0xA0522D
+	Skyblue              = IsRGB | IsValid | 0x87CEEB
+	SlateBlue            = IsRGB | IsValid | 0x6A5ACD
+	SlateGray            = IsRGB | IsValid | 0x708090
+	Snow                 = IsRGB | IsValid | 0xFFFAFA
+	SpringGreen          = IsRGB | IsValid | 0x00FF7F
+	SteelBlue            = IsRGB | IsValid | 0x4682B4
+	Tan                  = IsRGB | IsValid | 0xD2B48C
+	Thistle              = IsRGB | IsValid | 0xD8BFD8
+	Tomato               = IsRGB | IsValid | 0xFF6347
+	Turquoise            = IsRGB | IsValid | 0x40E0D0
+	Violet               = IsRGB | IsValid | 0xEE82EE
+	Wheat                = IsRGB | IsValid | 0xF5DEB3
+	WhiteSmoke           = IsRGB | IsValid | 0xF5F5F5
+	YellowGreen          = IsRGB | IsValid | 0x9ACD32
+)
+
+// These are aliases for the color gray, because some of us spell
+// it as grey.
+const (
+	Grey           = Gray
+	DimGrey        = DimGray
+	DarkGrey       = DarkGray
+	DarkSlateGrey  = DarkSlateGray
+	LightGrey      = LightGray
+	LightSlateGrey = LightSlateGray
+	SlateGrey      = SlateGray
+)
+
+// ColorValues maps color constants to their RGB values.
+var ColorValues = map[Color]int32{
+	Black:                0x000000,
+	Maroon:               0x800000,
+	Green:                0x008000,
+	Olive:                0x808000,
+	Navy:                 0x000080,
+	Purple:               0x800080,
+	Teal:                 0x008080,
+	Silver:               0xC0C0C0,
+	Gray:                 0x808080,
+	Red:                  0xFF0000,
+	Lime:                 0x00FF00,
+	Yellow:               0xFFFF00,
+	Blue:                 0x0000FF,
+	Fuchsia:              0xFF00FF,
+	Aqua:                 0x00FFFF,
+	White:                0xFFFFFF,
+	XTerm16:              0x000000, // black
+	XTerm17:              0x00005F,
+	XTerm18:              0x000087,
+	XTerm19:              0x0000AF,
+	XTerm20:              0x0000D7,
+	XTerm21:              0x0000FF, // blue
+	XTerm22:              0x005F00,
+	XTerm23:              0x005F5F,
+	XTerm24:              0x005F87,
+	XTerm25:              0x005FAF,
+	XTerm26:              0x005FD7,
+	XTerm27:              0x005FFF,
+	XTerm28:              0x008700,
+	XTerm29:              0x00875F,
+	XTerm30:              0x008787,
+	XTerm31:              0x0087Af,
+	XTerm32:              0x0087D7,
+	XTerm33:              0x0087FF,
+	XTerm34:              0x00AF00,
+	XTerm35:              0x00AF5F,
+	XTerm36:              0x00AF87,
+	XTerm37:              0x00AFAF,
+	XTerm38:              0x00AFD7,
+	XTerm39:              0x00AFFF,
+	XTerm40:              0x00D700,
+	XTerm41:              0x00D75F,
+	XTerm42:              0x00D787,
+	XTerm43:              0x00D7AF,
+	XTerm44:              0x00D7D7,
+	XTerm45:              0x00D7FF,
+	XTerm46:              0x00FF00, // lime
+	XTerm47:              0x00FF5F,
+	XTerm48:              0x00FF87,
+	XTerm49:              0x00FFAF,
+	XTerm50:              0x00FFd7,
+	XTerm51:              0x00FFFF, // aqua
+	XTerm52:              0x5F0000,
+	XTerm53:              0x5F005F,
+	XTerm54:              0x5F0087,
+	XTerm55:              0x5F00AF,
+	XTerm56:              0x5F00D7,
+	XTerm57:              0x5F00FF,
+	XTerm58:              0x5F5F00,
+	XTerm59:              0x5F5F5F,
+	XTerm60:              0x5F5F87,
+	XTerm61:              0x5F5FAF,
+	XTerm62:              0x5F5FD7,
+	XTerm63:              0x5F5FFF,
+	XTerm64:              0x5F8700,
+	XTerm65:              0x5F875F,
+	XTerm66:              0x5F8787,
+	XTerm67:              0x5F87AF,
+	XTerm68:              0x5F87D7,
+	XTerm69:              0x5F87FF,
+	XTerm70:              0x5FAF00,
+	XTerm71:              0x5FAF5F,
+	XTerm72:              0x5FAF87,
+	XTerm73:              0x5FAFAF,
+	XTerm74:              0x5FAFD7,
+	XTerm75:              0x5FAFFF,
+	XTerm76:              0x5FD700,
+	XTerm77:              0x5FD75F,
+	XTerm78:              0x5FD787,
+	XTerm79:              0x5FD7AF,
+	XTerm80:              0x5FD7D7,
+	XTerm81:              0x5FD7FF,
+	XTerm82:              0x5FFF00,
+	XTerm83:              0x5FFF5F,
+	XTerm84:              0x5FFF87,
+	XTerm85:              0x5FFFAF,
+	XTerm86:              0x5FFFD7,
+	XTerm87:              0x5FFFFF,
+	XTerm88:              0x870000,
+	XTerm89:              0x87005F,
+	XTerm90:              0x870087,
+	XTerm91:              0x8700AF,
+	XTerm92:              0x8700D7,
+	XTerm93:              0x8700FF,
+	XTerm94:              0x875F00,
+	XTerm95:              0x875F5F,
+	XTerm96:              0x875F87,
+	XTerm97:              0x875FAF,
+	XTerm98:              0x875FD7,
+	XTerm99:              0x875FFF,
+	XTerm100:             0x878700,
+	XTerm101:             0x87875F,
+	XTerm102:             0x878787,
+	XTerm103:             0x8787AF,
+	XTerm104:             0x8787D7,
+	XTerm105:             0x8787FF,
+	XTerm106:             0x87AF00,
+	XTerm107:             0x87AF5F,
+	XTerm108:             0x87AF87,
+	XTerm109:             0x87AFAF,
+	XTerm110:             0x87AFD7,
+	XTerm111:             0x87AFFF,
+	XTerm112:             0x87D700,
+	XTerm113:             0x87D75F,
+	XTerm114:             0x87D787,
+	XTerm115:             0x87D7AF,
+	XTerm116:             0x87D7D7,
+	XTerm117:             0x87D7FF,
+	XTerm118:             0x87FF00,
+	XTerm119:             0x87FF5F,
+	XTerm120:             0x87FF87,
+	XTerm121:             0x87FFAF,
+	XTerm122:             0x87FFD7,
+	XTerm123:             0x87FFFF,
+	XTerm124:             0xAF0000,
+	XTerm125:             0xAF005F,
+	XTerm126:             0xAF0087,
+	XTerm127:             0xAF00AF,
+	XTerm128:             0xAF00D7,
+	XTerm129:             0xAF00FF,
+	XTerm130:             0xAF5F00,
+	XTerm131:             0xAF5F5F,
+	XTerm132:             0xAF5F87,
+	XTerm133:             0xAF5FAF,
+	XTerm134:             0xAF5FD7,
+	XTerm135:             0xAF5FFF,
+	XTerm136:             0xAF8700,
+	XTerm137:             0xAF875F,
+	XTerm138:             0xAF8787,
+	XTerm139:             0xAF87AF,
+	XTerm140:             0xAF87D7,
+	XTerm141:             0xAF87FF,
+	XTerm142:             0xAFAF00,
+	XTerm143:             0xAFAF5F,
+	XTerm144:             0xAFAF87,
+	XTerm145:             0xAFAFAF,
+	XTerm146:             0xAFAFD7,
+	XTerm147:             0xAFAFFF,
+	XTerm148:             0xAFD700,
+	XTerm149:             0xAFD75F,
+	XTerm150:             0xAFD787,
+	XTerm151:             0xAFD7AF,
+	XTerm152:             0xAFD7D7,
+	XTerm153:             0xAFD7FF,
+	XTerm154:             0xAFFF00,
+	XTerm155:             0xAFFF5F,
+	XTerm156:             0xAFFF87,
+	XTerm157:             0xAFFFAF,
+	XTerm158:             0xAFFFD7,
+	XTerm159:             0xAFFFFF,
+	XTerm160:             0xD70000,
+	XTerm161:             0xD7005F,
+	XTerm162:             0xD70087,
+	XTerm163:             0xD700AF,
+	XTerm164:             0xD700D7,
+	XTerm165:             0xD700FF,
+	XTerm166:             0xD75F00,
+	XTerm167:             0xD75F5F,
+	XTerm168:             0xD75F87,
+	XTerm169:             0xD75FAF,
+	XTerm170:             0xD75FD7,
+	XTerm171:             0xD75FFF,
+	XTerm172:             0xD78700,
+	XTerm173:             0xD7875F,
+	XTerm174:             0xD78787,
+	XTerm175:             0xD787AF,
+	XTerm176:             0xD787D7,
+	XTerm177:             0xD787FF,
+	XTerm178:             0xD7AF00,
+	XTerm179:             0xD7AF5F,
+	XTerm180:             0xD7AF87,
+	XTerm181:             0xD7AFAF,
+	XTerm182:             0xD7AFD7,
+	XTerm183:             0xD7AFFF,
+	XTerm184:             0xD7D700,
+	XTerm185:             0xD7D75F,
+	XTerm186:             0xD7D787,
+	XTerm187:             0xD7D7AF,
+	XTerm188:             0xD7D7D7,
+	XTerm189:             0xD7D7FF,
+	XTerm190:             0xD7FF00,
+	XTerm191:             0xD7FF5F,
+	XTerm192:             0xD7FF87,
+	XTerm193:             0xD7FFAF,
+	XTerm194:             0xD7FFD7,
+	XTerm195:             0xD7FFFF,
+	XTerm196:             0xFF0000, // red
+	XTerm197:             0xFF005F,
+	XTerm198:             0xFF0087,
+	XTerm199:             0xFF00AF,
+	XTerm200:             0xFF00D7,
+	XTerm201:             0xFF00FF, // fuchsia
+	XTerm202:             0xFF5F00,
+	XTerm203:             0xFF5F5F,
+	XTerm204:             0xFF5F87,
+	XTerm205:             0xFF5FAF,
+	XTerm206:             0xFF5FD7,
+	XTerm207:             0xFF5FFF,
+	XTerm208:             0xFF8700,
+	XTerm209:             0xFF875F,
+	XTerm210:             0xFF8787,
+	XTerm211:             0xFF87AF,
+	XTerm212:             0xFF87D7,
+	XTerm213:             0xFF87FF,
+	XTerm214:             0xFFAF00,
+	XTerm215:             0xFFAF5F,
+	XTerm216:             0xFFAF87,
+	XTerm217:             0xFFAFAF,
+	XTerm218:             0xFFAFD7,
+	XTerm219:             0xFFAFFF,
+	XTerm220:             0xFFD700,
+	XTerm221:             0xFFD75F,
+	XTerm222:             0xFFD787,
+	XTerm223:             0xFFD7AF,
+	XTerm224:             0xFFD7D7,
+	XTerm225:             0xFFD7FF,
+	XTerm226:             0xFFFF00, // yellow
+	XTerm227:             0xFFFF5F,
+	XTerm228:             0xFFFF87,
+	XTerm229:             0xFFFFAF,
+	XTerm230:             0xFFFFD7,
+	XTerm231:             0xFFFFFF, // white
+	XTerm232:             0x080808,
+	XTerm233:             0x121212,
+	XTerm234:             0x1C1C1C,
+	XTerm235:             0x262626,
+	XTerm236:             0x303030,
+	XTerm237:             0x3A3A3A,
+	XTerm238:             0x444444,
+	XTerm239:             0x4E4E4E,
+	XTerm240:             0x585858,
+	XTerm241:             0x626262,
+	XTerm242:             0x6C6C6C,
+	XTerm243:             0x767676,
+	XTerm244:             0x808080, // grey
+	XTerm245:             0x8A8A8A,
+	XTerm246:             0x949494,
+	XTerm247:             0x9E9E9E,
+	XTerm248:             0xA8A8A8,
+	XTerm249:             0xB2B2B2,
+	XTerm250:             0xBCBCBC,
+	XTerm251:             0xC6C6C6,
+	XTerm252:             0xD0D0D0,
+	XTerm253:             0xDADADA,
+	XTerm254:             0xE4E4E4,
+	XTerm255:             0xEEEEEE,
+	AliceBlue:            0xF0F8FF,
+	AntiqueWhite:         0xFAEBD7,
+	AquaMarine:           0x7FFFD4,
+	Azure:                0xF0FFFF,
+	Beige:                0xF5F5DC,
+	Bisque:               0xFFE4C4,
+	BlanchedAlmond:       0xFFEBCD,
+	BlueViolet:           0x8A2BE2,
+	Brown:                0xA52A2A,
+	BurlyWood:            0xDEB887,
+	CadetBlue:            0x5F9EA0,
+	Chartreuse:           0x7FFF00,
+	Chocolate:            0xD2691E,
+	Coral:                0xFF7F50,
+	CornflowerBlue:       0x6495ED,
+	Cornsilk:             0xFFF8DC,
+	Crimson:              0xDC143C,
+	DarkBlue:             0x00008B,
+	DarkCyan:             0x008B8B,
+	DarkGoldenrod:        0xB8860B,
+	DarkGray:             0xA9A9A9,
+	DarkGreen:            0x006400,
+	DarkKhaki:            0xBDB76B,
+	DarkMagenta:          0x8B008B,
+	DarkOliveGreen:       0x556B2F,
+	DarkOrange:           0xFF8C00,
+	DarkOrchid:           0x9932CC,
+	DarkRed:              0x8B0000,
+	DarkSalmon:           0xE9967A,
+	DarkSeaGreen:         0x8FBC8F,
+	DarkSlateBlue:        0x483D8B,
+	DarkSlateGray:        0x2F4F4F,
+	DarkTurquoise:        0x00CED1,
+	DarkViolet:           0x9400D3,
+	DeepPink:             0xFF1493,
+	DeepSkyBlue:          0x00BFFF,
+	DimGray:              0x696969,
+	DodgerBlue:           0x1E90FF,
+	FireBrick:            0xB22222,
+	FloralWhite:          0xFFFAF0,
+	ForestGreen:          0x228B22,
+	Gainsboro:            0xDCDCDC,
+	GhostWhite:           0xF8F8FF,
+	Gold:                 0xFFD700,
+	Goldenrod:            0xDAA520,
+	GreenYellow:          0xADFF2F,
+	Honeydew:             0xF0FFF0,
+	HotPink:              0xFF69B4,
+	IndianRed:            0xCD5C5C,
+	Indigo:               0x4B0082,
+	Ivory:                0xFFFFF0,
+	Khaki:                0xF0E68C,
+	Lavender:             0xE6E6FA,
+	LavenderBlush:        0xFFF0F5,
+	LawnGreen:            0x7CFC00,
+	LemonChiffon:         0xFFFACD,
+	LightBlue:            0xADD8E6,
+	LightCoral:           0xF08080,
+	LightCyan:            0xE0FFFF,
+	LightGoldenrodYellow: 0xFAFAD2,
+	LightGray:            0xD3D3D3,
+	LightGreen:           0x90EE90,
+	LightPink:            0xFFB6C1,
+	LightSalmon:          0xFFA07A,
+	LightSeaGreen:        0x20B2AA,
+	LightSkyBlue:         0x87CEFA,
+	LightSlateGray:       0x778899,
+	LightSteelBlue:       0xB0C4DE,
+	LightYellow:          0xFFFFE0,
+	LimeGreen:            0x32CD32,
+	Linen:                0xFAF0E6,
+	MediumAquamarine:     0x66CDAA,
+	MediumBlue:           0x0000CD,
+	MediumOrchid:         0xBA55D3,
+	MediumPurple:         0x9370DB,
+	MediumSeaGreen:       0x3CB371,
+	MediumSlateBlue:      0x7B68EE,
+	MediumSpringGreen:    0x00FA9A,
+	MediumTurquoise:      0x48D1CC,
+	MediumVioletRed:      0xC71585,
+	MidnightBlue:         0x191970,
+	MintCream:            0xF5FFFA,
+	MistyRose:            0xFFE4E1,
+	Moccasin:             0xFFE4B5,
+	NavajoWhite:          0xFFDEAD,
+	OldLace:              0xFDF5E6,
+	OliveDrab:            0x6B8E23,
+	Orange:               0xFFA500,
+	OrangeRed:            0xFF4500,
+	Orchid:               0xDA70D6,
+	PaleGoldenrod:        0xEEE8AA,
+	PaleGreen:            0x98FB98,
+	PaleTurquoise:        0xAFEEEE,
+	PaleVioletRed:        0xDB7093,
+	PapayaWhip:           0xFFEFD5,
+	PeachPuff:            0xFFDAB9,
+	Peru:                 0xCD853F,
+	Pink:                 0xFFC0CB,
+	Plum:                 0xDDA0DD,
+	PowderBlue:           0xB0E0E6,
+	RebeccaPurple:        0x663399,
+	RosyBrown:            0xBC8F8F,
+	RoyalBlue:            0x4169E1,
+	SaddleBrown:          0x8B4513,
+	Salmon:               0xFA8072,
+	SandyBrown:           0xF4A460,
+	SeaGreen:             0x2E8B57,
+	Seashell:             0xFFF5EE,
+	Sienna:               0xA0522D,
+	Skyblue:              0x87CEEB,
+	SlateBlue:            0x6A5ACD,
+	SlateGray:            0x708090,
+	Snow:                 0xFFFAFA,
+	SpringGreen:          0x00FF7F,
+	SteelBlue:            0x4682B4,
+	Tan:                  0xD2B48C,
+	Thistle:              0xD8BFD8,
+	Tomato:               0xFF6347,
+	Turquoise:            0x40E0D0,
+	Violet:               0xEE82EE,
+	Wheat:                0xF5DEB3,
+	WhiteSmoke:           0xF5F5F5,
+	YellowGreen:          0x9ACD32,
+}
+
+// Special colors.
+const (
+	// Reset is used to indicate that the color should use the
+	// vanilla terminal colors.  (Basically go back to the defaults.)
+	Reset = IsSpecial | iota
+
+	// None indicates that we should not change the color from
+	// whatever is already displayed.  This can only be used in limited
+	// circumstances.
+	None
+)
+
+// Names holds the written names of colors. Useful to present a list of
+// recognized named colors.
+var Names = map[string]Color{
+	"black":                Black,
+	"maroon":               Maroon,
+	"green":                Green,
+	"olive":                Olive,
+	"navy":                 Navy,
+	"purple":               Purple,
+	"teal":                 Teal,
+	"silver":               Silver,
+	"gray":                 Gray,
+	"red":                  Red,
+	"lime":                 Lime,
+	"yellow":               Yellow,
+	"blue":                 Blue,
+	"fuchsia":              Fuchsia,
+	"aqua":                 Aqua,
+	"white":                White,
+	"aliceblue":            AliceBlue,
+	"antiquewhite":         AntiqueWhite,
+	"aquamarine":           AquaMarine,
+	"azure":                Azure,
+	"beige":                Beige,
+	"bisque":               Bisque,
+	"blanchedalmond":       BlanchedAlmond,
+	"blueviolet":           BlueViolet,
+	"brown":                Brown,
+	"burlywood":            BurlyWood,
+	"cadetblue":            CadetBlue,
+	"chartreuse":           Chartreuse,
+	"chocolate":            Chocolate,
+	"coral":                Coral,
+	"cornflowerblue":       CornflowerBlue,
+	"cornsilk":             Cornsilk,
+	"crimson":              Crimson,
+	"darkblue":             DarkBlue,
+	"darkcyan":             DarkCyan,
+	"darkgoldenrod":        DarkGoldenrod,
+	"darkgray":             DarkGray,
+	"darkgreen":            DarkGreen,
+	"darkkhaki":            DarkKhaki,
+	"darkmagenta":          DarkMagenta,
+	"darkolivegreen":       DarkOliveGreen,
+	"darkorange":           DarkOrange,
+	"darkorchid":           DarkOrchid,
+	"darkred":              DarkRed,
+	"darksalmon":           DarkSalmon,
+	"darkseagreen":         DarkSeaGreen,
+	"darkslateblue":        DarkSlateBlue,
+	"darkslategray":        DarkSlateGray,
+	"darkturquoise":        DarkTurquoise,
+	"darkviolet":           DarkViolet,
+	"deeppink":             DeepPink,
+	"deepskyblue":          DeepSkyBlue,
+	"dimgray":              DimGray,
+	"dodgerblue":           DodgerBlue,
+	"firebrick":            FireBrick,
+	"floralwhite":          FloralWhite,
+	"forestgreen":          ForestGreen,
+	"gainsboro":            Gainsboro,
+	"ghostwhite":           GhostWhite,
+	"gold":                 Gold,
+	"goldenrod":            Goldenrod,
+	"greenyellow":          GreenYellow,
+	"honeydew":             Honeydew,
+	"hotpink":              HotPink,
+	"indianred":            IndianRed,
+	"indigo":               Indigo,
+	"ivory":                Ivory,
+	"khaki":                Khaki,
+	"lavender":             Lavender,
+	"lavenderblush":        LavenderBlush,
+	"lawngreen":            LawnGreen,
+	"lemonchiffon":         LemonChiffon,
+	"lightblue":            LightBlue,
+	"lightcoral":           LightCoral,
+	"lightcyan":            LightCyan,
+	"lightgoldenrodyellow": LightGoldenrodYellow,
+	"lightgray":            LightGray,
+	"lightgreen":           LightGreen,
+	"lightpink":            LightPink,
+	"lightsalmon":          LightSalmon,
+	"lightseagreen":        LightSeaGreen,
+	"lightskyblue":         LightSkyBlue,
+	"lightslategray":       LightSlateGray,
+	"lightsteelblue":       LightSteelBlue,
+	"lightyellow":          LightYellow,
+	"limegreen":            LimeGreen,
+	"linen":                Linen,
+	"mediumaquamarine":     MediumAquamarine,
+	"mediumblue":           MediumBlue,
+	"mediumorchid":         MediumOrchid,
+	"mediumpurple":         MediumPurple,
+	"mediumseagreen":       MediumSeaGreen,
+	"mediumslateblue":      MediumSlateBlue,
+	"mediumspringgreen":    MediumSpringGreen,
+	"mediumturquoise":      MediumTurquoise,
+	"mediumvioletred":      MediumVioletRed,
+	"midnightblue":         MidnightBlue,
+	"mintcream":            MintCream,
+	"mistyrose":            MistyRose,
+	"moccasin":             Moccasin,
+	"navajowhite":          NavajoWhite,
+	"oldlace":              OldLace,
+	"olivedrab":            OliveDrab,
+	"orange":               Orange,
+	"orangered":            OrangeRed,
+	"orchid":               Orchid,
+	"palegoldenrod":        PaleGoldenrod,
+	"palegreen":            PaleGreen,
+	"paleturquoise":        PaleTurquoise,
+	"palevioletred":        PaleVioletRed,
+	"papayawhip":           PapayaWhip,
+	"peachpuff":            PeachPuff,
+	"peru":                 Peru,
+	"pink":                 Pink,
+	"plum":                 Plum,
+	"powderblue":           PowderBlue,
+	"rebeccapurple":        RebeccaPurple,
+	"rosybrown":            RosyBrown,
+	"royalblue":            RoyalBlue,
+	"saddlebrown":          SaddleBrown,
+	"salmon":               Salmon,
+	"sandybrown":           SandyBrown,
+	"seagreen":             SeaGreen,
+	"seashell":             Seashell,
+	"sienna":               Sienna,
+	"skyblue":              Skyblue,
+	"slateblue":            SlateBlue,
+	"slategray":            SlateGray,
+	"snow":                 Snow,
+	"springgreen":          SpringGreen,
+	"steelblue":            SteelBlue,
+	"tan":                  Tan,
+	"thistle":              Thistle,
+	"tomato":               Tomato,
+	"turquoise":            Turquoise,
+	"violet":               Violet,
+	"wheat":                Wheat,
+	"whitesmoke":           WhiteSmoke,
+	"yellowgreen":          YellowGreen,
+	"grey":                 Gray,
+	"dimgrey":              DimGray,
+	"darkgrey":             DarkGray,
+	"darkslategrey":        DarkSlateGray,
+	"lightgrey":            LightGray,
+	"lightslategrey":       LightSlateGray,
+	"slategrey":            SlateGray,
+}
+
+// Valid indicates the color is a valid value (has been set).
+func (c Color) Valid() bool {
+	return c&IsValid != 0
+}
+
+// IsRGB is true if the color is an RGB specific value.
+func (c Color) IsRGB() bool {
+	return c&(IsValid|IsRGB) == (IsValid | IsRGB)
+}
+
+// CSS returns the CSS hex string ( #ABCDEF ) if valid
+// if not a valid color returns empty string
+func (c Color) CSS() string {
+	if !c.Valid() {
+		return ""
+	}
+	return fmt.Sprintf("#%06X", c.Hex())
+}
+
+// String implements fmt.Stringer to return either the
+// W3C name if it has one or the CSS hex string '#ABCDEF'
+func (c Color) String() string {
+	if !c.Valid() {
+		switch c {
+		case None:
+			return "none"
+		case Default:
+			return "default"
+		case Reset:
+			return "reset"
+		}
+		return ""
+	}
+	return c.Name(true)
+}
+
+// Name returns W3C name or an empty string if no arguments
+// if passed true as an argument it will falls back to
+// the CSS hex string if no W3C name found '#ABCDEF'
+func (c Color) Name(css ...bool) string {
+	for name, hex := range Names {
+		if c == hex {
+			return name
+		}
+	}
+	if len(css) > 0 && css[0] {
+		return c.CSS()
+	}
+	return ""
+}
+
+// Hex returns the color's hexadecimal RGB 24-bit value with each component
+// consisting of a single byte, R << 16 | G << 8 | B.  If the color
+// is unknown or unset, -1 is returned.
+func (c Color) Hex() int32 {
+	if !c.Valid() {
+		return -1
+	}
+	if c&IsRGB != 0 {
+		return int32(c & 0xffffff)
+	}
+	if v, ok := ColorValues[c]; ok {
+		return v
+	}
+	return -1
+}
+
+// RGB returns the red, green, and blue components of the color, with
+// each component represented as a value 0-255.  In the event that the
+// color cannot be broken up (not set usually), -1 is returned for each value.
+func (c Color) RGB() (int32, int32, int32) {
+	v := c.Hex()
+	if v < 0 {
+		return -1, -1, -1
+	}
+	return (v >> 16) & 0xff, (v >> 8) & 0xff, v & 0xff
+}
+
+// TrueColor returns the true color (RGB) version of the provided color.
+// This is useful for ensuring color accuracy when using named colors.
+// This will override terminal theme colors.
+func (c Color) TrueColor() Color {
+	if !c.Valid() {
+		return Default
+	}
+	if c&IsRGB != 0 {
+		return c | IsValid
+	}
+	if hex := c.Hex(); hex < 0 {
+		return Default
+	} else {
+		return Color(hex) | IsRGB | IsValid
+	}
+}
+
+// RGBA makes these colors directly usable as imageColor colors.
+// The values are scaled only to 16 bits.  Invalid colors are returned
+// with all values being zero (notably the alpha is zero, so fully transparent),
+// otherwise the alpha channel is set to 0xffff (fully opaque).
+func (c Color) RGBA() (r, g, b, a uint32) {
+	if !c.Valid() {
+		return 0, 0, 0, 0
+	}
+	r1, g1, b1 := c.RGB()
+	r = uint32(r1)
+	g = uint32(g1)
+	b = uint32(b1)
+	r = r | r<<8
+	g = g | g<<8
+	b = b | b<<8
+	a = 0xffff
+	return r, g, b, a
+}
+
+// NewRGBColor returns a new color with the given red, green, and blue values.
+// Each value must be represented in the range 0-255.
+func NewRGBColor(r, g, b int32) Color {
+	return NewHexColor(((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff))
+}
+
+// NewHexColor returns a color using the given 24-bit RGB value.
+func NewHexColor(v int32) Color {
+	return IsRGB | Color(v) | IsValid
+}
+
+// GetColor creates a Color from a color name (W3C name). A hex value may
+// be supplied as a string in the format "#ffffff".
+func GetColor(name string) Color {
+	if c, ok := Names[name]; ok {
+		return c
+	}
+	if len(name) == 7 && name[0] == '#' {
+		if v, e := strconv.ParseInt(name[1:], 16, 32); e == nil {
+			return NewHexColor(int32(v))
+		}
+	}
+	return Default
+}
+
+// PaletteColor creates a color based on the palette index.
+func PaletteColor(index int) Color {
+	return Color(index) | IsValid
+}
+
+// FromImageColor converts an image/color.Color into Color.
+// The alpha value is limited to just zero and non-zero, so it should
+// be tracked separately if full detail is needed. (A zero alpha
+// becomes the default color, which means no color change at all.)
+func FromImageColor(imageColor ic.Color) Color {
+	r, g, b, a := imageColor.RGBA()
+	if a == 0 {
+		return Default
+	}
+	// NOTE image/color.Color RGB values range is [0, 0xFFFF] as uint32
+	return NewRGBColor(int32(r>>8), int32(g>>8), int32(b>>8))
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/colorfit.go b/vendor/github.com/gdamore/tcell/v3/color/fit.go
similarity index 70%
rename from vendor/github.com/gdamore/tcell/v2/colorfit.go
rename to vendor/github.com/gdamore/tcell/v3/color/fit.go
index f690097f5..c8e292d34 100644
--- a/vendor/github.com/gdamore/tcell/v2/colorfit.go
+++ b/vendor/github.com/gdamore/tcell/v3/color/fit.go
@@ -1,8 +1,8 @@
-// Copyright 2016 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -12,19 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tcell
+package color
 
 import (
-	"math"
-
 	"github.com/lucasb-eyer/go-colorful"
 )
 
-// FindColor attempts to find a given color, or the best match possible for it,
+// Find attempts to find a given color, or the best match possible for it,
 // from the palette given.  This is an expensive operation, so results should
 // be cached by the caller.
-func FindColor(c Color, palette []Color) Color {
-	match := ColorDefault
+func Find(c Color, palette []Color) Color {
+	match := Default
 	dist := float64(0)
 	r, g, b := c.RGB()
 	c1 := colorful.Color{
@@ -41,10 +39,9 @@ func FindColor(c Color, palette []Color) Color {
 		}
 		// CIE94 is more accurate, but really really expensive.
 		nd := c1.DistanceCIE76(c2)
-		if math.IsNaN(nd) {
-			nd = math.Inf(1)
-		}
-		if match == ColorDefault || nd < dist {
+		// NB: nd < dist is false if is NaN.
+		// We have never seen a case where the CIE76 algorithm returns NaN.
+		if match == Default || nd < dist {
 			match = d
 			dist = nd
 		}
diff --git a/vendor/github.com/gdamore/tcell/v3/doc.go b/vendor/github.com/gdamore/tcell/v3/doc.go
new file mode 100644
index 000000000..54075d455
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/doc.go
@@ -0,0 +1,23 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package tcell provides a lower-level, portable API for building
+// programs that interact with terminals or consoles.  It works with
+// both common (and many uncommon!) terminals or terminal emulators,
+// and Windows console implementations.
+//
+// It supports rich color, and modern terminal capabilities such as
+// rich key reporting, mouse tracking, bracketed paste, desktop notifications
+// and 24-bit color, when the underlying terminal supports it.
+package tcell
diff --git a/vendor/github.com/gdamore/tcell/v2/charset_stub.go b/vendor/github.com/gdamore/tcell/v3/eastasian.go
similarity index 64%
rename from vendor/github.com/gdamore/tcell/v2/charset_stub.go
rename to vendor/github.com/gdamore/tcell/v3/eastasian.go
index 829be2c26..dd3abc0d0 100644
--- a/vendor/github.com/gdamore/tcell/v2/charset_stub.go
+++ b/vendor/github.com/gdamore/tcell/v3/eastasian.go
@@ -1,11 +1,8 @@
-//go:build nacl
-// +build nacl
-
-// Copyright 2015 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -17,6 +14,8 @@
 
 package tcell
 
-func getCharset() string {
-	return ""
-}
+import (
+	"github.com/gdamore/tcell/v3/internal/widthutil"
+)
+
+var textWidthOptions = widthutil.Options()
diff --git a/vendor/github.com/gdamore/tcell/v2/encoding.go b/vendor/github.com/gdamore/tcell/v3/encoding.go
similarity index 81%
rename from vendor/github.com/gdamore/tcell/v2/encoding.go
rename to vendor/github.com/gdamore/tcell/v3/encoding.go
index b7644c27e..0a06d377e 100644
--- a/vendor/github.com/gdamore/tcell/v2/encoding.go
+++ b/vendor/github.com/gdamore/tcell/v3/encoding.go
@@ -1,8 +1,8 @@
 // Copyright 2022 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -25,23 +25,17 @@ import (
 
 var encodings map[string]encoding.Encoding
 var encodingLk sync.Mutex
-var encodingFallback EncodingFallback = EncodingFallbackFail
+var encodingFallback EncodingFallback = EncodingFallbackASCII
 
 // RegisterEncoding may be called by the application to register an encoding.
 // The presence of additional encodings will facilitate application usage with
 // terminal environments where the I/O subsystem does not support Unicode.
 //
-// Windows systems use Unicode natively, and do not need any of the encoding
-// subsystem when using Windows Console screens.
+// Modern systems and terminal emulators usually use UTF-8, and for those
+// systems, this API is also unnecessary.  For example, Windows, macOS, and
+// modern Linux systems generally will work out of the box without any of this.
 //
-// Please see the Go documentation for golang.org/x/text/encoding -- most of
-// the common ones exist already as stock variables.  For example, ISO8859-15
-// can be registered using the following code:
-//
-//	import "golang.org/x/text/encoding/charmap"
-//
-//	  ...
-//	  RegisterEncoding("ISO8859-15", charmap.ISO8859_15)
+// Use of UTF-8 is recommended when possible, as it saves quite a lot processing overhead.
 //
 // Aliases can be registered as well, for example "8859-15" could be an alias
 // for "ISO8859-15".
@@ -57,16 +51,14 @@ var encodingFallback EncodingFallback = EncodingFallbackFail
 // or "C", then we assume US-ASCII (the POSIX 'portable character set'
 // and assume all other characters are somehow invalid.)
 //
-// Modern POSIX systems and terminal emulators may use UTF-8, and for those
-// systems, this API is also unnecessary.  For example, Darwin (MacOS X) and
-// modern Linux running modern xterm generally will out of the box without
-// any of this.  Use of UTF-8 is recommended when possible, as it saves
-// quite a lot processing overhead.
+// Please see the Go documentation for golang.org/x/text/encoding -- most of
+// the common ones exist already as stock variables.  For example, ISO8859-15
+// can be registered using the following code:
 //
 // Note that some encodings are quite large (for example GB18030 which is a
 // superset of Unicode) and so the application size can be expected to
 // increase quite a bit as each encoding is added.
-
+//
 // The East Asian encodings have been seen to add 100-200K per encoding to the
 // size of the resulting binary.
 func RegisterEncoding(charset string, enc encoding.Encoding) {
@@ -82,22 +74,21 @@ func RegisterEncoding(charset string, enc encoding.Encoding) {
 // supported automatically.  Other character sets must be added using the
 // RegisterEncoding API.  (A large group of nearly all of them can be
 // added using the RegisterAll function in the encoding sub package.)
+// The default action will be to fallback to UTF-8.
 type EncodingFallback int
 
 const (
+	// EncodingFallbackUTF8 behavior causes GetEncoding to assume
+	// UTF8 can pass unmodified upon failure.
+	EncodingFallbackUTF8 = iota
+
 	// EncodingFallbackFail behavior causes GetEncoding to fail
 	// when it cannot find an encoding.
-	EncodingFallbackFail = iota
+	EncodingFallbackFail
 
 	// EncodingFallbackASCII behavior causes GetEncoding to fall back
 	// to a 7-bit ASCII encoding, if no other encoding can be found.
 	EncodingFallbackASCII
-
-	// EncodingFallbackUTF8 behavior causes GetEncoding to assume
-	// UTF8 can pass unmodified upon failure.  Note that this behavior
-	// is not recommended, unless you are sure your terminal can cope
-	// with real UTF8 sequences.
-	EncodingFallbackUTF8
 )
 
 // SetEncodingFallback changes the behavior of GetEncoding when a suitable
diff --git a/vendor/github.com/gdamore/tcell/v2/errors.go b/vendor/github.com/gdamore/tcell/v3/errors.go
similarity index 64%
rename from vendor/github.com/gdamore/tcell/v2/errors.go
rename to vendor/github.com/gdamore/tcell/v3/errors.go
index 201dff9f8..db17b735f 100644
--- a/vendor/github.com/gdamore/tcell/v2/errors.go
+++ b/vendor/github.com/gdamore/tcell/v3/errors.go
@@ -1,8 +1,8 @@
-// Copyright 2015 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -16,24 +16,12 @@ package tcell
 
 import (
 	"errors"
-	"time"
-
-	"github.com/gdamore/tcell/v2/terminfo"
 )
 
 var (
-	// ErrTermNotFound indicates that a suitable terminal entry could
-	// not be found.  This can result from either not having TERM set,
-	// or from the TERM failing to support certain minimal functionality,
-	// in particular absolute cursor addressability (the cup capability)
-	// is required.  For example, legacy "adm3" lacks this capability,
-	// whereas the slightly newer "adm3a" supports it.  This failure
-	// occurs most often with "dumb".
-	ErrTermNotFound = terminfo.ErrTermNotFound
-
 	// ErrNoScreen indicates that no suitable screen could be found.
 	// This may result from attempting to run on a platform where there
-	// is no support for either termios or console I/O (such as nacl),
+	// is no support for either termios or console I/O (such as js),
 	// or from running in an environment where there is no access to
 	// a suitable console/terminal device.  (For example, running on
 	// without a controlling TTY or with no /dev/tty on POSIX platforms.)
@@ -53,21 +41,25 @@ var (
 // An EventError is an event representing some sort of error, and carries
 // an error payload.
 type EventError struct {
-	t   time.Time
+	EventTime
 	err error
 }
 
-// When returns the time when the event was created.
-func (ev *EventError) When() time.Time {
-	return ev.t
-}
-
 // Error implements the error.
 func (ev *EventError) Error() string {
 	return ev.err.Error()
 }
 
+// Unwrap exposes the underlying error payload so callers can use
+// errors.Is / errors.As to match against sentinel values such as
+// io.EOF.
+func (ev *EventError) Unwrap() error {
+	return ev.err
+}
+
 // NewEventError creates an ErrorEvent with the given error payload.
 func NewEventError(err error) *EventError {
-	return &EventError{t: time.Now(), err: err}
+	ev := &EventError{err: err}
+	ev.SetEventNow()
+	return ev
 }
diff --git a/vendor/github.com/gdamore/tcell/v2/event.go b/vendor/github.com/gdamore/tcell/v3/event.go
similarity index 92%
rename from vendor/github.com/gdamore/tcell/v2/event.go
rename to vendor/github.com/gdamore/tcell/v3/event.go
index a3b770063..23440537d 100644
--- a/vendor/github.com/gdamore/tcell/v2/event.go
+++ b/vendor/github.com/gdamore/tcell/v3/event.go
@@ -1,8 +1,8 @@
 // Copyright 2015 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
diff --git a/vendor/github.com/gdamore/tcell/v2/focus.go b/vendor/github.com/gdamore/tcell/v3/focus.go
similarity index 80%
rename from vendor/github.com/gdamore/tcell/v2/focus.go
rename to vendor/github.com/gdamore/tcell/v3/focus.go
index e9b93ef6d..cadd68780 100644
--- a/vendor/github.com/gdamore/tcell/v2/focus.go
+++ b/vendor/github.com/gdamore/tcell/v3/focus.go
@@ -1,8 +1,8 @@
 // Copyright 2023 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -17,12 +17,14 @@ package tcell
 // EventFocus is a focus event. It is sent when the terminal window (or tab)
 // gets or loses focus.
 type EventFocus struct {
-	*EventTime
+	EventTime
 
 	// True if the window received focus, false if it lost focus
 	Focused bool
 }
 
 func NewEventFocus(focused bool) *EventFocus {
-	return &EventFocus{Focused: focused}
+	ev := &EventFocus{Focused: focused}
+	ev.SetEventNow()
+	return ev
 }
diff --git a/vendor/github.com/gdamore/tcell/v3/input.go b/vendor/github.com/gdamore/tcell/v3/input.go
new file mode 100644
index 000000000..0c279f998
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/input.go
@@ -0,0 +1,1591 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file describes a generic VT input processor.  It parses key sequences,
+// (input bytes) and loads them into events.  It expects UTF-8 or UTF-16 as the input
+// feed, along with ECMA-48 sequences.  The assumption here is that all potential
+// key sequences are unambiguous between terminal variants (analysis of extant terminfo
+// data appears to support this conjecture). This allows us to implement  this once,
+// in the most efficient and terminal-agnostic way possible.
+//
+// There is unfortunately *one* conflict, with aixterm, for CSI-P - which is KeyDelete
+// in aixterm, but F1 in others.
+
+//go:build (!js && !wasm) || (js && wasm)
+// +build !js,!wasm js,wasm
+
+package tcell
+
+import (
+	"encoding/base64"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+	"unicode/utf16"
+	"unicode/utf8"
+
+	"github.com/gdamore/tcell/v3/vt"
+)
+
+type inputState int
+
+const (
+	istInit = inputState(iota)
+	istUtf  // utf8 state
+	istEsc  // escape
+	istCsi  // control sequence introducer
+	istOsc  // operating system command
+	istDcs  // device control string
+	istSos  // start of string (unused)
+	istPm   // privacy message (unused)
+	istApc  // application program command
+	istSt   // string terminator
+	istSs2  // single shift 2
+	istSs3  // single shift 3
+	istLnx  // linux F-key (not ECMA-48 compliant - bogus CSI)
+	istXda  // extended device attributes (ESC P Ps ST)
+)
+
+// defaultControlStringLimit caps inbound OSC/XDA control-string payloads
+// before they can grow without bound while waiting for a string terminator.
+const defaultControlStringLimit = 64 * 1024
+
+const (
+	// loneEscapeTimeout keeps bare Escape responsive when using legacy
+	// keyboard reporting, where ESC can also prefix an Alt-modified key.
+	loneEscapeTimeout = 200 * time.Millisecond
+
+	// escapeSequenceTimeout bounds incomplete escape sequences. Once a
+	// sequence introducer has arrived, it is no longer ambiguous with a lone
+	// Escape and can tolerate a substantially longer inter-byte delay.
+	escapeSequenceTimeout = time.Second
+)
+
+func newInputParser(eq chan<- Event) *inputParser {
+	return &inputParser{
+		evch:             eq,
+		buf:              make([]rune, 0, 128),
+		legacy:           true,
+		controlStringMax: defaultControlStringLimit,
+	}
+}
+
+type inputParser struct {
+	buf              []rune       // bytes to process (ingest data)
+	utfBuf           []byte       // accrued UTF8 bytes
+	strBuf           []byte       // accrued string data (for ST, OSC, etc.)
+	csiParams        []byte       // accrued parameter bytes for CSI (and SS3)
+	csiInterm        []byte       // accrued intermediate bytes for CSI
+	escChar          byte         // last byte for escape
+	escaped          bool         // true if next key should be modified by ESC
+	btnsDown         ButtonMask   // mouse buttons down (excludes wheel buttons)
+	state            inputState   // tracks processor state
+	strState         inputState   // saved str state (needed for ST)
+	l                sync.Mutex   // protects local state
+	evch             chan<- Event // where events are routed
+	rows             int          // used for clipping mouse coordinates
+	cols             int          // used for clipping mouse coordinates
+	pixelMouse       bool         // mouse reports in pixels (CSI ?1016h); skip cell clipping
+	keyTime          time.Time    // time of last key press / byte ingested
+	nested           *inputParser // for buggy win32-input-mode implementations
+	surrogate        rune         // high surrogate pair seen (for Win32 input mode)
+	advanced         bool         // use advanced key reporting semantics
+	legacy           bool         // keyboard protocol has ambiguous ESC prefixes
+	controlStringMax int          // maximum inbound OSC/XDA payload size; 0 means unlimited
+	discardString    bool         // drop the rest of an over-limit OSC/XDA sequence
+}
+
+func keyFromInt(n int) (Key, bool) {
+	if n < 0 || n > 32767 {
+		return 0, false
+	}
+	return Key(n), true
+}
+
+func keyFromRune(r rune) (Key, bool) {
+	if r < 0 || r > 32767 {
+		return 0, false
+	}
+	return Key(r), true
+}
+
+func asciiByteFromInt(n int) (byte, bool) {
+	if n <= 0 || n >= 0x80 {
+		return 0, false
+	}
+	return byte(n), true
+}
+
+// Waiting returns true if the processor is waiting for
+// some more input (i.e. we are not in in the initial state.)
+// This can occur when we have ambiguous escape sequences, such
+// as the lone escape.  If this is typed, we expect at least a minimal
+// inter-key delay before the next stroke occurs, and the caller
+// should check for waiting, and call Scan() or ScanUTF8() to
+// finish the processing.  (Typically after a delay of around 100ms.)
+func (ip *inputParser) Waiting() bool {
+	ip.l.Lock()
+	defer ip.l.Unlock()
+	return ip.state != istInit
+}
+
+// waitDuration reports how long to wait for the next byte before resetting an
+// incomplete escape sequence. A bare ESC is only ambiguous with legacy
+// keyboard reporting; other protocols can use the longer sequence deadline.
+func (ip *inputParser) waitDuration() time.Duration {
+	if ip.state == istInit {
+		return 0
+	}
+	if ip.state == istEsc && ip.legacy {
+		return loneEscapeTimeout
+	}
+	return escapeSequenceTimeout
+}
+
+func (ip *inputParser) WaitDuration() time.Duration {
+	ip.l.Lock()
+	defer ip.l.Unlock()
+	return ip.waitDuration()
+}
+
+func (ip *inputParser) SetKeyboardProtocol(protocol KeyProtocol) {
+	ip.l.Lock()
+	ip.legacy = protocol == LegacyKeyboard
+	nested := ip.nested
+	ip.l.Unlock()
+	if nested != nil {
+		nested.SetKeyboardProtocol(protocol)
+	}
+}
+
+// SetPixelMouse toggles whether SGR mouse reports are interpreted as
+// pixel coordinates (CSI ?1016h) rather than character cells (CSI ?1006h).
+// When enabled, mouse coordinates are not clipped to the screen size.
+// The setting is also forwarded to the lazily-created nested parser used
+// for win32-input-mode, if one exists, so both stay in sync.
+func (ip *inputParser) SetPixelMouse(on bool) {
+	ip.l.Lock()
+	ip.pixelMouse = on
+	nested := ip.nested
+	ip.l.Unlock()
+	if nested != nil {
+		nested.SetPixelMouse(on)
+	}
+}
+
+func (ip *inputParser) SetSize(w, h int) {
+	if ip.nested != nil {
+		ip.nested.SetSize(w, h)
+		return
+	}
+	go func() {
+		ip.l.Lock()
+		ip.rows = h
+		ip.cols = w
+		ip.post(NewEventResize(w, h))
+		ip.l.Unlock()
+	}()
+}
+func (ip *inputParser) post(ev Event) {
+	if ip.escaped {
+		ip.escaped = false
+		if ke, ok := ev.(*EventKey); ok {
+			ev = ip.newKey(ke.Key(), ke.Str(), ke.Modifiers()|ModAlt, ke.Pressed(), ke.Physical(), ke.Repeat())
+		}
+	} else if ke, ok := ev.(*EventKey); ok {
+		switch ke.Key() {
+		case keyPasteStart:
+			ev = NewEventPaste(true)
+		case keyPasteEnd:
+			ev = NewEventPaste(false)
+		}
+	}
+
+	ip.evch <- ev
+}
+
+func (ip *inputParser) newKey(k Key, str string, mod ModMask, pressed bool, physical Key, repeat int) *EventKey {
+	if ip.advanced {
+		return NewEventKeyEx(k, str, mod, pressed, physical, repeat)
+	}
+	return NewEventKey(k, str, mod)
+}
+
+func (ip *inputParser) postKey(k Key, str string, mod ModMask) {
+	ip.post(ip.newKey(k, str, mod, true, 0, 1))
+}
+
+func (ip *inputParser) postKeyEx(k Key, str string, mod ModMask, pressed bool, physical Key, repeat int) {
+	ip.post(ip.newKey(k, str, mod, pressed, physical, repeat))
+}
+
+func (ip *inputParser) postControlKey(r rune, mod ModMask) {
+	if r == 0 {
+		ip.postKeyEx(KeyRune, " ", mod|ModCtrl, true, Key(' '), 1)
+	} else if ip.advanced && r >= 1 && r <= 26 {
+		ip.postKeyEx(KeyRune, string('a'+r-1), mod|ModCtrl, true, Key('a'+r-1), 1)
+	} else {
+		ip.postKey(KeyRune, string(r+0x40), mod|ModCtrl)
+	}
+}
+
+type csiParamMode struct {
+	M rune // Mode
+	P int  // Parameter (first)
+}
+
+type keyMap struct {
+	Key  Key
+	Mod  ModMask
+	Rune rune
+}
+
+var csiAllKeys = map[csiParamMode]keyMap{
+	{M: 'A'}:         {Key: KeyUp},
+	{M: 'B'}:         {Key: KeyDown},
+	{M: 'C'}:         {Key: KeyRight},
+	{M: 'D'}:         {Key: KeyLeft},
+	{M: 'E'}:         {Key: KeyClear},
+	{M: 'F'}:         {Key: KeyEnd},
+	{M: 'H'}:         {Key: KeyHome},
+	{M: 'L'}:         {Key: KeyInsert},
+	{M: 'P'}:         {Key: KeyF1}, // except for aixterm, where this is Delete
+	{M: 'Q'}:         {Key: KeyF2},
+	{M: 'R'}:         {Key: KeyF3},
+	{M: 'S'}:         {Key: KeyF4},
+	{M: 'Z'}:         {Key: KeyBacktab},
+	{M: 'a'}:         {Key: KeyUp, Mod: ModShift},
+	{M: 'b'}:         {Key: KeyDown, Mod: ModShift},
+	{M: 'c'}:         {Key: KeyRight, Mod: ModShift},
+	{M: 'd'}:         {Key: KeyLeft, Mod: ModShift},
+	{M: 'q', P: 1}:   {Key: KeyF1}, // all these 'q' are for aixterm
+	{M: 'q', P: 2}:   {Key: KeyF2},
+	{M: 'q', P: 3}:   {Key: KeyF3},
+	{M: 'q', P: 4}:   {Key: KeyF4},
+	{M: 'q', P: 5}:   {Key: KeyF5},
+	{M: 'q', P: 6}:   {Key: KeyF6},
+	{M: 'q', P: 7}:   {Key: KeyF7},
+	{M: 'q', P: 8}:   {Key: KeyF8},
+	{M: 'q', P: 9}:   {Key: KeyF9},
+	{M: 'q', P: 10}:  {Key: KeyF10},
+	{M: 'q', P: 11}:  {Key: KeyF11},
+	{M: 'q', P: 12}:  {Key: KeyF12},
+	{M: 'q', P: 13}:  {Key: KeyF13},
+	{M: 'q', P: 14}:  {Key: KeyF14},
+	{M: 'q', P: 15}:  {Key: KeyF15},
+	{M: 'q', P: 16}:  {Key: KeyF16},
+	{M: 'q', P: 17}:  {Key: KeyF17},
+	{M: 'q', P: 18}:  {Key: KeyF18},
+	{M: 'q', P: 19}:  {Key: KeyF19},
+	{M: 'q', P: 20}:  {Key: KeyF20},
+	{M: 'q', P: 21}:  {Key: KeyF21},
+	{M: 'q', P: 22}:  {Key: KeyF22},
+	{M: 'q', P: 23}:  {Key: KeyF23},
+	{M: 'q', P: 24}:  {Key: KeyF24},
+	{M: 'q', P: 25}:  {Key: KeyF25},
+	{M: 'q', P: 26}:  {Key: KeyF26},
+	{M: 'q', P: 27}:  {Key: KeyF27},
+	{M: 'q', P: 28}:  {Key: KeyF28},
+	{M: 'q', P: 29}:  {Key: KeyF29},
+	{M: 'q', P: 30}:  {Key: KeyF30},
+	{M: 'q', P: 31}:  {Key: KeyF31},
+	{M: 'q', P: 32}:  {Key: KeyF32},
+	{M: 'q', P: 33}:  {Key: KeyF33},
+	{M: 'q', P: 34}:  {Key: KeyF34},
+	{M: 'q', P: 35}:  {Key: KeyF35},
+	{M: 'q', P: 36}:  {Key: KeyF36},
+	{M: 'q', P: 144}: {Key: KeyClear},
+	{M: 'q', P: 146}: {Key: KeyEnd},
+	{M: 'q', P: 150}: {Key: KeyPgUp},
+	{M: 'q', P: 154}: {Key: KeyPgDn},
+	{M: 'z', P: 214}: {Key: KeyHome},
+	{M: 'z', P: 216}: {Key: KeyPgUp},
+	{M: 'z', P: 220}: {Key: KeyEnd},
+	{M: 'z', P: 222}: {Key: KeyPgDn},
+	{M: 'z', P: 224}: {Key: KeyF1},
+	{M: 'z', P: 225}: {Key: KeyF2},
+	{M: 'z', P: 226}: {Key: KeyF3},
+	{M: 'z', P: 227}: {Key: KeyF4},
+	{M: 'z', P: 228}: {Key: KeyF5},
+	{M: 'z', P: 229}: {Key: KeyF6},
+	{M: 'z', P: 230}: {Key: KeyF7},
+	{M: 'z', P: 231}: {Key: KeyF8},
+	{M: 'z', P: 232}: {Key: KeyF9},
+	{M: 'z', P: 233}: {Key: KeyF10},
+	{M: 'z', P: 234}: {Key: KeyF11},
+	{M: 'z', P: 235}: {Key: KeyF12},
+	{M: 'z', P: 247}: {Key: KeyInsert},
+	{M: '^', P: 1}:   {Key: KeyHome, Mod: ModCtrl},
+	{M: '^', P: 2}:   {Key: KeyInsert, Mod: ModCtrl},
+	{M: '^', P: 3}:   {Key: KeyDelete, Mod: ModCtrl},
+	{M: '^', P: 4}:   {Key: KeyEnd, Mod: ModCtrl},
+	{M: '^', P: 5}:   {Key: KeyPgUp, Mod: ModCtrl},
+	{M: '^', P: 6}:   {Key: KeyPgDn, Mod: ModCtrl},
+	{M: '^', P: 7}:   {Key: KeyHome, Mod: ModCtrl},
+	{M: '^', P: 8}:   {Key: KeyEnd, Mod: ModCtrl},
+	{M: '^', P: 11}:  {Key: KeyF23},
+	{M: '^', P: 12}:  {Key: KeyF24},
+	{M: '^', P: 13}:  {Key: KeyF25},
+	{M: '^', P: 14}:  {Key: KeyF26},
+	{M: '^', P: 15}:  {Key: KeyF27},
+	{M: '^', P: 17}:  {Key: KeyF28}, // 16 is a gap
+	{M: '^', P: 18}:  {Key: KeyF29},
+	{M: '^', P: 19}:  {Key: KeyF30},
+	{M: '^', P: 20}:  {Key: KeyF31},
+	{M: '^', P: 21}:  {Key: KeyF32},
+	{M: '^', P: 23}:  {Key: KeyF33}, // 22 is a gap
+	{M: '^', P: 24}:  {Key: KeyF34},
+	{M: '^', P: 25}:  {Key: KeyF35},
+	{M: '^', P: 26}:  {Key: KeyF36}, // 27 is a gap
+	{M: '^', P: 28}:  {Key: KeyF37},
+	{M: '^', P: 29}:  {Key: KeyF38}, // 30 is a gap
+	{M: '^', P: 31}:  {Key: KeyF39},
+	{M: '^', P: 32}:  {Key: KeyF40},
+	{M: '^', P: 33}:  {Key: KeyF41},
+	{M: '^', P: 34}:  {Key: KeyF42},
+	{M: '@', P: 23}:  {Key: KeyF43},
+	{M: '@', P: 24}:  {Key: KeyF44},
+	{M: '@', P: 1}:   {Key: KeyHome, Mod: ModShift | ModCtrl},
+	{M: '@', P: 2}:   {Key: KeyInsert, Mod: ModShift | ModCtrl},
+	{M: '@', P: 3}:   {Key: KeyDelete, Mod: ModShift | ModCtrl},
+	{M: '@', P: 4}:   {Key: KeyEnd, Mod: ModShift | ModCtrl},
+	{M: '@', P: 5}:   {Key: KeyPgUp, Mod: ModShift | ModCtrl},
+	{M: '@', P: 6}:   {Key: KeyPgDn, Mod: ModShift | ModCtrl},
+	{M: '@', P: 7}:   {Key: KeyHome, Mod: ModShift | ModCtrl},
+	{M: '@', P: 8}:   {Key: KeyEnd, Mod: ModShift | ModCtrl},
+	{M: '$', P: 1}:   {Key: KeyHome, Mod: ModShift},
+	{M: '$', P: 2}:   {Key: KeyInsert, Mod: ModShift},
+	{M: '$', P: 3}:   {Key: KeyDelete, Mod: ModShift},
+	{M: '$', P: 5}:   {Key: KeyPgUp, Mod: ModShift},
+	{M: '$', P: 6}:   {Key: KeyPgDn, Mod: ModShift},
+	{M: '$', P: 7}:   {Key: KeyHome, Mod: ModShift},
+	{M: '$', P: 8}:   {Key: KeyEnd, Mod: ModShift},
+	{M: '$', P: 23}:  {Key: KeyF21},
+	{M: '$', P: 24}:  {Key: KeyF22},
+	{M: '~', P: 1}:   {Key: KeyHome},
+	{M: '~', P: 2}:   {Key: KeyInsert},
+	{M: '~', P: 3}:   {Key: KeyDelete},
+	{M: '~', P: 4}:   {Key: KeyEnd},
+	{M: '~', P: 5}:   {Key: KeyPgUp},
+	{M: '~', P: 6}:   {Key: KeyPgDn},
+	{M: '~', P: 7}:   {Key: KeyHome},
+	{M: '~', P: 8}:   {Key: KeyEnd},
+	{M: '~', P: 11}:  {Key: KeyF1},
+	{M: '~', P: 12}:  {Key: KeyF2},
+	{M: '~', P: 13}:  {Key: KeyF3},
+	{M: '~', P: 14}:  {Key: KeyF4},
+	{M: '~', P: 15}:  {Key: KeyF5},
+	{M: '~', P: 17}:  {Key: KeyF6},
+	{M: '~', P: 18}:  {Key: KeyF7},
+	{M: '~', P: 19}:  {Key: KeyF8},
+	{M: '~', P: 20}:  {Key: KeyF9},
+	{M: '~', P: 21}:  {Key: KeyF10},
+	{M: '~', P: 23}:  {Key: KeyF11},
+	{M: '~', P: 24}:  {Key: KeyF12},
+	{M: '~', P: 25}:  {Key: KeyF13},
+	{M: '~', P: 26}:  {Key: KeyF14},
+	{M: '~', P: 28}:  {Key: KeyF15}, // aka KeyHelp
+	{M: '~', P: 29}:  {Key: KeyF16},
+	{M: '~', P: 31}:  {Key: KeyF17},
+	{M: '~', P: 32}:  {Key: KeyF18},
+	{M: '~', P: 33}:  {Key: KeyF19},
+	{M: '~', P: 34}:  {Key: KeyF20},
+	{M: '~', P: 200}: {Key: keyPasteStart},
+	{M: '~', P: 201}: {Key: keyPasteEnd},
+}
+
+// keys reported using Kitty csi-u protocol
+var csiUKeys = map[int]keyMap{
+	27:    {Key: KeyESC},
+	9:     {Key: KeyTAB},
+	13:    {Key: KeyEnter},
+	127:   {Key: KeyBS},
+	57358: {Key: KeyCapsLock},
+	57359: {Key: KeyScrollLock},
+	57360: {Key: KeyNumLock},
+	57361: {Key: KeyPrint},
+	57362: {Key: KeyPause},
+	57363: {Key: KeyMenu},
+	57376: {Key: KeyF13},
+	57377: {Key: KeyF14},
+	57378: {Key: KeyF15},
+	57379: {Key: KeyF16},
+	57380: {Key: KeyF17},
+	57381: {Key: KeyF18},
+	57382: {Key: KeyF19},
+	57383: {Key: KeyF20},
+	57384: {Key: KeyF21},
+	57385: {Key: KeyF22},
+	57386: {Key: KeyF23},
+	57387: {Key: KeyF24},
+	57388: {Key: KeyF25},
+	57389: {Key: KeyF26},
+	57390: {Key: KeyF27},
+	57391: {Key: KeyF28},
+	57392: {Key: KeyF29},
+	57393: {Key: KeyF30},
+	57394: {Key: KeyF31},
+	57395: {Key: KeyF32},
+	57396: {Key: KeyF33},
+	57397: {Key: KeyF34},
+	57398: {Key: KeyF35},
+	57399: {Key: KeyRune, Rune: '0'}, // KP 0
+	57400: {Key: KeyRune, Rune: '1'}, // KP 1
+	57401: {Key: KeyRune, Rune: '2'}, // KP 2
+	57402: {Key: KeyRune, Rune: '3'}, // KP 3
+	57403: {Key: KeyRune, Rune: '4'}, // KP 4
+	57404: {Key: KeyRune, Rune: '5'}, // KP 5
+	57405: {Key: KeyRune, Rune: '6'}, // KP 6
+	57406: {Key: KeyRune, Rune: '7'}, // KP 7
+	57407: {Key: KeyRune, Rune: '8'}, // KP 8
+	57408: {Key: KeyRune, Rune: '9'}, // KP 9
+	57409: {Key: KeyRune, Rune: '.'}, // KP_DECIMAL
+	57410: {Key: KeyRune, Rune: '/'}, // KP_DIVIDE
+	57411: {Key: KeyRune, Rune: '*'}, // KP_MULTIPLY
+	57412: {Key: KeyRune, Rune: '-'}, // KP_SUBTRACT
+	57413: {Key: KeyRune, Rune: '+'}, // KP_ADD
+	57414: {Key: KeyEnter},           // KP_ENTER
+	57415: {Key: KeyRune, Rune: '='}, // KP_EQUAL
+	57416: {Key: KeyClear},           // KP_SEPARATOR
+	57417: {Key: KeyLeft},            // KP_LEFT
+	57418: {Key: KeyRight},           // KP_RIGHT
+	57419: {Key: KeyUp},              // KP_UP
+	57420: {Key: KeyDown},            // KP_DOWN
+	57421: {Key: KeyPgUp},            // KP_PG_UP
+	57422: {Key: KeyPgDn},            // KP_PG_DN
+	57423: {Key: KeyHome},            // KP_HOME
+	57424: {Key: KeyEnd},             // KP_END
+	57425: {Key: KeyInsert},          // KP_INSERT
+	57426: {Key: KeyDelete},          // KP_DELETE
+	// 57427: {Key: KeyBegin},          // KP_BEGIN
+	57441: {Key: KeyShift}, // LEFT_SHIFT
+	57442: {Key: KeyCtrl},  // LEFT_CONTROL
+	57443: {Key: KeyAlt},   // LEFT_ALT
+	57444: {Key: KeyMeta},  // LEFT_SUPER
+	57447: {Key: KeyShift}, // RIGHT_SHIFT
+	57448: {Key: KeyCtrl},  // RIGHT_CONTROL
+	57449: {Key: KeyAlt},   // RIGHT_ALT
+	57450: {Key: KeyMeta},  // RIGHT_SUPER
+
+	// TODO: Media keys
+}
+
+// windows virtual key codes per microsoft
+var winKeys = map[int]Key{
+	0x03: KeyCancel,    // vkCancel
+	0x08: KeyBackspace, // vkBackspace
+	0x09: KeyTab,       // vkTab
+	0x0d: KeyEnter,     // vkReturn
+	0x13: KeyPause,     // vkPause
+	0x1b: KeyEscape,    // vkEscape
+	0x21: KeyPgUp,      // vkPrior
+	0x22: KeyPgDn,      // vkNext
+	0x23: KeyEnd,       // vkEnd
+	0x24: KeyHome,      // vkHome
+	0x25: KeyLeft,      // vkLeft
+	0x26: KeyUp,        // vkUp
+	0x27: KeyRight,     // vkRight
+	0x28: KeyDown,      // vkDown
+	0x2a: KeyPrint,     // vkPrint
+	0x2c: KeyPrint,     // vkPrtScr
+	0x2d: KeyInsert,    // vkInsert
+	0x2e: KeyDelete,    // vkDelete
+	0x2f: KeyHelp,      // vkHelp
+	0x70: KeyF1,        // vkF1
+	0x71: KeyF2,        // vkF2
+	0x72: KeyF3,        // vkF3
+	0x73: KeyF4,        // vkF4
+	0x74: KeyF5,        // vkF5
+	0x75: KeyF6,        // vkF6
+	0x76: KeyF7,        // vkF7
+	0x77: KeyF8,        // vkF8
+	0x78: KeyF9,        // vkF9
+	0x79: KeyF10,       // vkF10
+	0x7a: KeyF11,       // vkF11
+	0x7b: KeyF12,       // vkF12
+	0x7c: KeyF13,       // vkF13
+	0x7d: KeyF14,       // vkF14
+	0x7e: KeyF15,       // vkF15
+	0x7f: KeyF16,       // vkF16
+	0x80: KeyF17,       // vkF17
+	0x81: KeyF18,       // vkF18
+	0x82: KeyF19,       // vkF19
+	0x83: KeyF20,       // vkF20
+	0x84: KeyF21,       // vkF21
+	0x85: KeyF22,       // vkF22
+	0x86: KeyF23,       // vkF23
+	0x87: KeyF24,       // vkF24
+}
+
+type ss3Key struct {
+	key Key
+	str string
+}
+
+// keys by their SS3 - used in application mode usually (legacy VT-style)
+var ss3Keys = map[rune]ss3Key{
+	'A': {key: KeyUp},
+	'B': {key: KeyDown},
+	'C': {key: KeyRight},
+	'D': {key: KeyLeft},
+	'E': {key: KeyClear},
+	'F': {key: KeyEnd},
+	'H': {key: KeyHome},
+	'P': {key: KeyF1},
+	'Q': {key: KeyF2},
+	'R': {key: KeyF3},
+	'S': {key: KeyF4},
+
+	// DEC application-keypad sequences. The VT100 terminfo entry calls some
+	// of these F5-F10, but that is a terminfo naming artifact: a VT100 has
+	// only PF1-PF4. Decode them by their PC keypad navigation meanings.
+	'p': {key: KeyInsert},
+	'q': {key: KeyEnd},
+	'r': {key: KeyDown},
+	's': {key: KeyPgDn},
+	't': {key: KeyLeft},
+	'u': {key: KeyClear},
+	'v': {key: KeyRight},
+	'w': {key: KeyHome},
+	'x': {key: KeyUp},
+	'y': {key: KeyPgUp},
+	'M': {key: KeyEnter},
+	'n': {key: KeyDelete},
+	'j': {key: KeyRune, str: "*"},
+	'k': {key: KeyRune, str: "+"},
+	'l': {key: KeyRune, str: ","},
+	'm': {key: KeyRune, str: "-"},
+	'o': {key: KeyRune, str: "/"},
+	'X': {key: KeyRune, str: "="},
+}
+
+// linux terminal uses these non ECMA keys prefixed by CSI-[
+var linuxFKeys = map[rune]Key{
+	'A': KeyF1,
+	'B': KeyF2,
+	'C': KeyF3,
+	'D': KeyF4,
+	'E': KeyF5,
+}
+
+func (ip *inputParser) scan() {
+	for _, r := range ip.buf {
+		ip.buf = ip.buf[1:]
+		ip.escChar = 0
+		ip.keyTime = time.Now()
+		if r >= 0xA0 {
+			// 8-bit extended Unicode we just treat as such - this will swallow anything else queued up
+			ip.state = istInit
+			physical, _ := keyFromRune(r)
+			ip.postKeyEx(KeyRune, string(r), ModNone, true, physical, 1)
+			continue
+		} else if r >= 0x80 {
+			// ISO 2022 control chars
+			ip.state = istEsc
+			r -= 0x40
+			// we fall through so it will be treated as the 7-bit equivalent
+		}
+		switch ip.state {
+		case istInit:
+			switch r {
+			case '\x1b':
+				// escape.. pending
+				ip.state = istEsc
+				ip.escChar = 0
+			case '\t':
+				ip.postKey(KeyTab, "", ModNone)
+			case '\b', '\x7F':
+				ip.postKey(KeyBackspace, "", ModNone)
+			case '\r':
+				ip.postKey(KeyEnter, "", ModNone)
+			default:
+				// Control keys - legacy handling
+				if r == 0 {
+					ip.postControlKey(r, ModNone)
+				} else if r < ' ' {
+					ip.postControlKey(r, ModNone)
+				} else {
+					physical, _ := keyFromRune(r)
+					ip.postKeyEx(KeyRune, string(r), ModNone, true, physical, 1)
+				}
+			}
+		case istEsc:
+			switch r {
+			case '[':
+				ip.state = istCsi
+				ip.csiInterm = nil
+				ip.csiParams = nil
+				ip.escChar = byte(r)
+			case ']':
+				ip.state = istOsc
+				ip.strBuf = nil
+				ip.discardString = false
+				ip.escChar = byte(r)
+			case 'N':
+				ip.state = istSs2 // no known uses
+				ip.strBuf = nil
+				ip.escChar = byte(r)
+			case 'O':
+				ip.state = istSs3
+				ip.csiParams = nil
+				ip.strBuf = nil
+				ip.escChar = byte(r)
+			case 'P':
+				ip.state = istXda
+				ip.csiParams = nil
+				ip.strBuf = nil
+				ip.discardString = false
+				ip.escChar = byte(r)
+			case 'X':
+				ip.state = istSos
+				ip.strBuf = nil
+				ip.escChar = byte(r)
+			case '^':
+				ip.state = istPm
+				ip.strBuf = nil
+				ip.escChar = byte(r)
+			case '_':
+				ip.state = istApc
+				ip.strBuf = nil
+				ip.escChar = byte(r)
+			case '\\':
+				// string terminator reached, (orphaned?)
+				ip.state = istInit
+			case '\t':
+				// Linux console only, does not conform to ECMA
+				ip.state = istInit
+				ip.postKey(KeyBacktab, "", ModNone)
+			default:
+				if r == '\x1b' {
+					// leading ESC to capture alt
+					ip.escaped = true
+					ip.escChar = byte(r)
+				} else {
+					// treat as alt-key ... legacy emulators only (no CSI-u or other)
+					ip.state = istInit
+					mod := ModAlt
+					if r < ' ' {
+						mod |= ModCtrl
+						r += 0x60
+					}
+					physical, _ := keyFromRune(r)
+					ip.postKeyEx(KeyRune, string(r), mod, true, physical, 1)
+				}
+			}
+		case istCsi:
+			// usual case for incoming keys
+			// NB: rxvt uses terminating '$' which is not a legal CSI terminator,
+			// for certain shifted key sequences.  We special case this, and it's ok
+			// because no other terminal seems to use this for CSI intermediates from
+			// the terminal to the host (queries in the other direction can use it.)
+			// However, this is only true if the first parameter does not have a "?",
+			// because it *does* collide with DEC private mode queries otherwise.
+			if r == '\x1b' {
+				// Per ECMA-48 §5.3.1, ESC restarts the escape
+				// sequence machine from any intermediate state.
+				ip.state = istEsc
+				ip.escChar = 0
+			} else if r >= 0x30 && r <= 0x3F { // parameter bytes
+				ip.csiParams = append(ip.csiParams, byte(r))
+			} else if r == '$' && len(ip.csiParams) > 0 && ip.csiParams[0] != '?' { // rxvt non-standard
+				ip.handleCsi(r, ip.csiParams, ip.csiInterm)
+			} else if r >= 0x20 && r <= 0x2F { // intermediate bytes, rarely used
+				ip.csiInterm = append(ip.csiInterm, byte(r))
+			} else if r >= 0x40 && r <= 0x7F { // final byte
+				ip.handleCsi(r, ip.csiParams, ip.csiInterm)
+			} else {
+				// bad parse, just swallow it all
+				ip.state = istInit
+			}
+		case istSs2:
+			// No known uses for SS2
+			ip.state = istInit
+
+		case istSs3: // typically application mode keys or older terminals
+			ip.state = istInit
+			// some SS3 sequences (old VTE) encode modifiers here just like CSI
+			if r == '\x1b' {
+				// Per ECMA-48 §5.3.1, ESC restarts the escape
+				// sequence machine from any intermediate state.
+				ip.state = istEsc
+				ip.escChar = 0
+			} else if r >= 0x30 && r <= 0x3F {
+				ip.csiParams = append(ip.csiParams, byte(r))
+				ip.state = istSs3
+			} else if k, ok := ss3Keys[r]; ok {
+				// If there are no parameters, then it's simple without modifiers.
+				// The options for parameters are "1;" , or ";modifiers" (empty
+				// first parameter defaults to 1), or just .  If a sequence has
+				// parameters that do not match one of these forms, we just discard it.
+				if len(ip.csiParams) == 0 {
+					// simple SS3 case
+					ip.postKey(k.key, k.str, ModNone)
+				} else if parts := strings.Split(string(ip.csiParams), ";"); len(parts) >= 1 {
+					// SS3 with modifier (old style).  Note old terminfo would declare these as high
+					// numbered function keys, but we encode as modified since that's how they are entered.
+					if len(parts) >= 2 {
+						if m, err := strconv.Atoi(parts[1]); err == nil && (parts[0] == "1" || parts[0] == "") {
+							ip.postKey(k.key, k.str, calcModifier(m))
+						}
+					} else if m, err := strconv.Atoi(parts[0]); err == nil {
+						ip.postKey(k.key, k.str, calcModifier(m))
+					}
+				}
+			}
+
+		case istPm, istApc, istSos, istDcs: // these we just eat
+			switch r {
+			case '\x1b':
+				ip.strState = ip.state
+				ip.state = istSt
+			case '\x07': // bell - some send this instead of ST
+				ip.state = istInit
+			}
+
+		case istXda:
+			switch r {
+			case '\x1b':
+				ip.strState = ip.state
+				ip.state = istSt
+			case '\x07':
+				if ip.discardString {
+					ip.discardString = false
+					ip.state = istInit
+				} else {
+					ip.handleXda(string(ip.strBuf))
+				}
+			default:
+				if !ip.discardString {
+					ip.appendStringBytes(byte(r & 0x7f))
+				}
+			}
+
+		case istOsc: // not sure if used
+			switch r {
+			case '\x1b':
+				ip.strState = ip.state
+				ip.state = istSt
+			case '\x07':
+				if ip.discardString {
+					ip.discardString = false
+					ip.state = istInit
+				} else {
+					ip.handleOsc(string(ip.strBuf))
+				}
+			default:
+				if !ip.discardString {
+					ip.appendStringBytes(byte(r & 0x7f))
+				}
+			}
+		case istSt:
+			if r == '\\' || r == '\x07' {
+				ip.state = istInit
+				if ip.discardString {
+					ip.discardString = false
+				} else {
+					switch ip.strState {
+					case istOsc:
+						ip.handleOsc(string(ip.strBuf))
+					case istXda:
+						ip.handleXda(string(ip.strBuf))
+					case istPm, istApc, istSos, istDcs:
+						ip.state = istInit
+					}
+				}
+			} else {
+				if !ip.discardString {
+					ip.appendStringBytes('\x1b', byte(r))
+				}
+				ip.state = ip.strState
+			}
+		case istLnx:
+			// linux console does not follow ECMA
+			if k, ok := linuxFKeys[r]; ok {
+				ip.postKey(k, "", ModNone)
+			}
+			ip.state = istInit
+		}
+	}
+
+	if timeout := ip.waitDuration(); timeout > 0 && time.Since(ip.keyTime) > timeout {
+		if ip.state == istEsc {
+			ip.postKey(KeyEscape, "", ModNone)
+		} else if ec := ip.escChar; ec != 0 {
+			ip.postKey(KeyRune, string(ec), ModAlt)
+		}
+		// if we take too long between bytes, reset the state machine.
+		ip.state = istInit
+		ip.discardString = false
+	}
+}
+
+func (ip *inputParser) appendStringBytes(bs ...byte) {
+	if ip.controlStringMax > 0 && len(ip.strBuf)+len(bs) > ip.controlStringMax {
+		ip.strBuf = nil
+		ip.discardString = true
+		return
+	}
+	ip.strBuf = append(ip.strBuf, bs...)
+}
+
+func (ip *inputParser) handleOsc(str string) {
+	ip.state = istInit
+	if content, ok := strings.CutPrefix(str, "52;c;"); ok {
+		decoded := make([]byte, base64.StdEncoding.DecodedLen(len(content)))
+		if count, err := base64.StdEncoding.Decode(decoded, []byte(content)); err == nil {
+			ip.post(NewEventClipboard(decoded[:count]))
+			return
+		}
+	}
+}
+
+func (ip *inputParser) handleXda(str string) {
+	ip.state = istInit
+	if content, ok := strings.CutPrefix(str, ">|"); ok {
+		// two approaches, one with version like (1.23) another with just spaces
+		if name, vers, ok := strings.Cut(content, "("); ok && strings.HasSuffix(vers, ")") {
+			name = strings.TrimSpace(name)
+			vers = strings.TrimSpace(strings.TrimSuffix(vers, ")"))
+			ip.post(&eventTermName{Name: name, Version: vers})
+		} else if name, vers, ok = strings.Cut(content, " "); ok {
+			ip.post(&eventTermName{Name: name, Version: vers})
+		}
+	}
+}
+
+func calcModifier(n int) ModMask {
+	n--
+	m := ModNone
+	if n&1 != 0 {
+		m |= ModShift
+	}
+	if n&2 != 0 {
+		m |= ModAlt
+	}
+	if n&4 != 0 {
+		m |= ModCtrl
+	}
+	if n&8 != 0 {
+		m |= ModMeta // kitty calls this Super
+	}
+	if n&16 != 0 {
+		m |= ModHyper
+	}
+	if n&32 != 0 {
+		m |= ModMeta // for now not separating from Super
+	}
+	// Not doing (kitty only):
+	// caps_lock 0b1000000   (64)
+	// num_lock  0b10000000  (128)
+
+	return m
+}
+
+func calcWinModifier(n int, advanced bool) ModMask {
+	m := ModNone
+	if n&0x010 != 0 {
+		m |= ModShift
+	}
+	if advanced {
+		// Bits through 0x0100 match Win32 dwControlKeyState. 0x0040 and
+		// 0x0080 are ScrollLock and CapsLock, not Meta. The 0x0200 and
+		// 0x0400 bits are tcell extensions used by the WASM browser shim,
+		// which has Meta keys but no native Win32 bit assignment for them.
+		if n&0x0008 != 0 {
+			m |= ModLCtrl
+		}
+		if n&0x0004 != 0 {
+			m |= ModRCtrl
+		}
+		if n&0x0002 != 0 {
+			m |= ModLAlt
+		}
+		if n&0x0001 != 0 {
+			m |= ModRAlt
+		}
+		if n&0x0200 != 0 {
+			m |= ModLMeta
+		}
+		if n&0x0400 != 0 {
+			m |= ModRMeta
+		}
+	} else {
+		if n&0x000c != 0 {
+			m |= ModCtrl
+		}
+		if n&0x0003 != 0 {
+			m |= ModAlt
+		}
+	}
+	return m
+}
+
+func winModifierKey(vk int) (Key, ModMask, bool) {
+	switch vk {
+	case 0x10:
+		return KeyShift, ModShift, true
+	case 0xa0:
+		return KeyShift, ModLShift, true
+	case 0xa1:
+		return KeyShift, ModRShift, true
+	case 0x11:
+		return KeyCtrl, ModCtrl, true
+	case 0xa2:
+		return KeyCtrl, ModLCtrl, true
+	case 0xa3:
+		return KeyCtrl, ModRCtrl, true
+	case 0x12:
+		return KeyAlt, ModAlt, true
+	case 0xa4:
+		return KeyAlt, ModLAlt, true
+	case 0xa5:
+		return KeyAlt, ModRAlt, true
+	case 0x5b:
+		return KeyMeta, ModLMeta, true
+	case 0x5c:
+		return KeyMeta, ModRMeta, true
+	case 0x14:
+		return KeyCapsLock, ModNone, true
+	default:
+		return 0, ModNone, false
+	}
+}
+
+func kittyModifierKey(code int) ModMask {
+	switch code {
+	case 57441:
+		return ModLShift
+	case 57447:
+		return ModRShift
+	case 57442:
+		return ModLCtrl
+	case 57448:
+		return ModRCtrl
+	case 57443:
+		return ModLAlt
+	case 57449:
+		return ModRAlt
+	case 57444:
+		return ModLMeta
+	case 57450:
+		return ModRMeta
+	default:
+		return ModNone
+	}
+}
+
+func (ip *inputParser) handleMouse(mode rune, params []int) {
+
+	// XTerm mouse events only report at most one button at a time,
+	// which may include a wheel button.  Wheel motion events are
+	// reported as single impulses, while other button events are reported
+	// as separate press & release events.
+	if len(params) < 3 {
+		return
+	}
+	btn := params[0]
+	// Some terminals will report mouse coordinates outside the
+	// screen, especially with click-drag events.  Clip the coordinates
+	// to the screen in that case.  In pixel-reporting mode (CSI ?1016h)
+	// the values are already pixels rather than cells, so skip the clip
+	// and pass them through unchanged for the application to interpret.
+	x := params[1] - 1
+	y := params[2] - 1
+	if !ip.pixelMouse {
+		x = max(min(x, ip.cols-1), 0)
+		y = max(min(y, ip.rows-1), 0)
+	}
+
+	button := ButtonNone
+	mod := ModNone
+
+	// Mouse wheel has bit 6 set, no release events.  It should be noted
+	// that wheel events are sometimes misdelivered as mouse button events
+	// during a click-drag, so we debounce these, considering them to be
+	// button press events unless we see an intervening release event.
+	// This excludes motion (bit 5) and modifiers (bits 2, 3, 4) for now.
+	switch btn & 0xC3 {
+	case 0:
+		button = Button1
+	case 1:
+		button = Button3 // Note we prefer to treat right as button 2
+	case 2:
+		button = Button2 // And the middle button as button 3
+	case 3:
+		button = ButtonNone
+	case 0x40:
+		button = WheelUp
+	case 0x41:
+		button = WheelDown
+	case 0x42:
+		button = WheelLeft
+	case 0x43:
+		button = WheelRight
+	case 0x80:
+		button = Button4
+	case 0x81:
+		button = Button5
+	case 0x82:
+		button = Button6
+	case 0x83:
+		button = Button7
+	}
+
+	switch mode {
+	case 'm':
+		if (ip.btnsDown & button) == 0 {
+			// a release without a corresponding press, so clear it
+			button = ButtonNone
+		} else {
+			ip.btnsDown &^= button
+			button = ip.btnsDown
+		}
+
+	case 'M':
+		if btn&0x20 != 0 && button != ButtonNone && (ip.btnsDown&button) == 0 {
+			// Ghostty may send out motion signals that indicate a button has
+			// been pressed, even when the button is not actually pressed.
+			// Do not create a synthetic button-down state from these packets.
+			button = ip.btnsDown
+			break
+		}
+		// record this press
+		ip.btnsDown |= button
+		// and use the full set so can see chords
+		button = ip.btnsDown
+		// mice wheel do not have release events
+		ip.btnsDown &^= (WheelDown | WheelUp | WheelLeft | WheelRight)
+	}
+
+	if btn&0x4 != 0 {
+		mod |= ModShift
+	}
+	if btn&0x8 != 0 {
+		mod |= ModAlt
+	}
+	if btn&0x10 != 0 {
+		mod |= ModCtrl
+	}
+
+	ip.post(NewEventMouse(x, y, button, mod))
+}
+
+func (ip *inputParser) handleWinKey(P []int) {
+	// win32-input-mode
+	//  ^[ [ Vk ; Sc ; Uc ; Kd ; Cs ; Rc _
+	// Vk: the value of wVirtualKeyCode - any number. If omitted, defaults to '0'.
+	// Sc: the value of wVirtualScanCode - any number. If omitted, defaults to '0'.
+	// Uc: the decimal value of UnicodeChar - for example, NUL is "0", LF is
+	//     "10", the character 'A' is "65". If omitted, defaults to '0'.
+	// Kd: the value of bKeyDown - either a '0' or '1'. If omitted, defaults to '0'.
+	// Cs: the value of dwControlKeyState - any number. If omitted, defaults to '0'.
+	// Rc: the value of wRepeatCount - any number. If omitted, defaults to '1'.
+	//
+	// Note that some 3rd party terminal emulators (not Terminal) suffer from a bug
+	// where other events, such as mouse events, are doubly encoded, using Vk 0
+	// for each character.  (So a CSI-M sequence is encoded as a series of CSI-_
+	// sequences.)  We consider this a bug in those terminal emulators -- Windows 11
+	// Terminal does not suffer this brain damage. (We've observed this with both Alacritty
+	// and WezTerm.)
+	for len(P) < 6 {
+		P = append(P, 0) // ensure sufficient length
+	}
+	if P[3] == 0 && !ip.advanced {
+		// key up event ignore ignore
+		return
+	}
+
+	// these terminals never send ambiguous escapes
+	ip.escaped = false
+
+	if P[0] == 0 && P[1] == 0 { // only ASCII in win32-input-mode
+		if b, ok := asciiByteFromInt(P[2]); ok {
+			if ip.nested == nil {
+				ip.nested = &inputParser{
+					evch:             ip.evch,
+					rows:             ip.rows,
+					cols:             ip.cols,
+					advanced:         ip.advanced,
+					legacy:           ip.legacy,
+					pixelMouse:       ip.pixelMouse,
+					controlStringMax: ip.controlStringMax,
+				}
+			}
+			ip.nested.ScanUTF8([]byte{b})
+			return
+		}
+	}
+
+	key := KeyRune
+	chr := rune(P[2])
+	mod := ModNone
+	rpt := max(1, P[5])
+	decoded := false
+	if k1, ok := winKeys[P[0]]; ok {
+		chr = 0
+		key = k1
+		decoded = true
+	} else if ip.advanced {
+		if k1, mod1, ok := winModifierKey(P[0]); ok {
+			key = k1
+			mod = mod1
+			chr = 0
+			decoded = true
+		}
+	}
+	if decoded {
+		// Already decoded.
+	} else if chr == 0 && P[0] >= 0x30 && P[0] <= 0x39 {
+		chr = rune(P[0])
+	} else if chr < ' ' && P[0] >= 0x41 && P[0] <= 0x5a {
+		if ip.advanced {
+			key = KeyRune
+			chr = rune(P[0] + 0x20)
+		} else {
+			var ok bool
+			if key, ok = keyFromInt(P[0]); !ok {
+				return
+			}
+			chr = 0
+		}
+	} else if chr >= 0xD800 && chr <= 0xDBFF {
+		// high surrogate pair
+		if ip.surrogate != 0 {
+			ip.postKeyEx(KeyRune, string(utf8.RuneError), mod, P[3] != 0, 0, rpt)
+		}
+		ip.surrogate = chr
+		return
+	} else if chr >= 0xDC00 && chr <= 0xDFFF {
+		// low surrogate pair
+		if ip.surrogate == 0 {
+			chr = utf8.RuneError
+		} else {
+			chr = utf16.DecodeRune(ip.surrogate, chr)
+		}
+	} else if ip.surrogate != 0 {
+		ip.postKeyEx(KeyRune, string(utf8.RuneError), mod, P[3] != 0, 0, rpt)
+	} else if _, _, ok := winModifierKey(P[0]); ok {
+		// Lone modifier releases are ignored unless advanced mode is enabled.
+		ip.surrogate = 0
+		return
+	}
+
+	ip.surrogate = 0
+
+	mod |= calcWinModifier(P[4], ip.advanced)
+	if key == KeyRune && chr > ' ' && mod == ModShift && !ip.advanced {
+		// filter out lone shift for printable chars
+		mod = ModNone
+	}
+	if chr != 0 && mod&(ModCtrl|ModAlt) == ModCtrl|ModAlt {
+		// Filter out ctrl+alt (it means AltGr)
+		mod = ModNone
+	}
+
+	physical := key
+	if key == KeyRune && chr != 0 {
+		physical, _ = keyFromRune(chr)
+		if ip.advanced && P[0] >= 0x41 && P[0] <= 0x5a {
+			physical, _ = keyFromInt(P[0] + 0x20)
+		}
+	}
+	if key != KeyRune {
+		ip.postKeyEx(key, "", mod, P[3] != 0, physical, rpt)
+	} else if chr != 0 {
+		ip.postKeyEx(KeyRune, string(chr), mod, P[3] != 0, physical, rpt)
+	}
+}
+
+func (ip *inputParser) handlePrimaryDA(params []int) {
+	if len(params) < 1 {
+		return
+	}
+	evDA := &eventPrimaryAttributes{Class: params[0]}
+	params = params[1:]
+	if evDA.Class >= 60 {
+		for _, v := range params {
+			switch v {
+			case 3:
+				evDA.ReGIS = true
+			case 4:
+				evDA.Sixel = true
+			case 9:
+				evDA.National = true
+			case 12:
+				evDA.SerboCroation = true
+			case 22:
+				evDA.Color = true
+			case 23:
+				evDA.Greek = true
+			case 24:
+				evDA.Turkish = true
+			case 42:
+				evDA.Latin2 = true
+			case 52:
+				evDA.Clipboard = true
+			}
+		}
+	}
+	ip.post(evDA)
+}
+
+func (ip *inputParser) handlePrivateModeResponse(params []int) {
+	for len(params) < 2 {
+		params = append(params, 0)
+	}
+	if params[1] >= 0 && params[1] <= 4 {
+		ev := &eventPrivateMode{
+			Mode:   vt.PrivateMode(params[0]),
+			Status: vt.ModeStatus(params[1]),
+		}
+		ip.post(ev)
+	}
+}
+
+func (ip *inputParser) handleKittyMode(params []int) {
+	if len(params) == 1 && params[0] >= 0 && params[0] < 32 {
+		ev := &eventKittyKbdMode{
+			Mode: KittyKbdMode(params[0] & 0xffff),
+		}
+		ip.post(ev)
+	}
+}
+
+func (ip *inputParser) handleXTermMode(params []int) {
+	if len(params) >= 1 && params[0] == 4 {
+		if len(params) == 1 {
+			params = append(params, 0)
+		}
+		ev := &eventXTermKbdMode{
+			Mode: XtermKbdMode(params[1] & 0x3),
+		}
+		ip.post(ev)
+	}
+}
+
+func (ip *inputParser) handleCsi(mode rune, params []byte, intermediate []byte) {
+
+	// reset state
+	ip.state = istInit
+
+	var P []int
+	hasLT := false
+	hasQM := false
+	hasGT := false
+	pstr := string(params)
+	// extract numeric parameters
+	if strings.HasPrefix(pstr, "<") {
+		hasLT = true
+		pstr = pstr[1:]
+	} else if strings.HasPrefix(pstr, "?") {
+		hasQM = true
+		pstr = pstr[1:]
+	} else if strings.HasPrefix(pstr, ">") {
+		hasGT = true
+		pstr = pstr[1:]
+	}
+
+	pressed := true
+	repeat := 1
+	physical := Key(0)
+	if pstr != "" && pstr[0] >= '0' && pstr[0] <= '9' {
+		var PSubs [][]int
+
+		parts := strings.Split(pstr, ";")
+		for i := range parts {
+			subparts := strings.Split(parts[i], ":")
+			if subparts[0] != "" {
+				if n, e := strconv.ParseInt(subparts[0], 10, 32); e == nil {
+					P = append(P, int(n))
+				} else {
+					P = append(P, 0)
+				}
+			} else {
+				P = append(P, 0)
+			}
+			subs := []int{}
+			for _, sub := range subparts[1:] {
+				if sub != "" {
+					if n, e := strconv.ParseInt(sub, 10, 32); e == nil {
+						subs = append(subs, int(n))
+					}
+				} else {
+					subs = append(subs, 0)
+				}
+			}
+			PSubs = append(PSubs, subs)
+		}
+		if len(PSubs) > 1 && len(PSubs[1]) > 0 {
+			switch PSubs[1][0] {
+			case 2:
+				repeat = 2
+			case 3:
+				pressed = false
+			}
+		}
+		if len(PSubs) > 0 && len(PSubs[0]) > 0 {
+			base := PSubs[0][0]
+			if baseKey, ok := csiUKeys[base]; ok {
+				physical = baseKey.Key
+				if physical == KeyRune && baseKey.Rune != 0 {
+					physical, _ = keyFromRune(baseKey.Rune)
+				}
+			} else if base != 0 {
+				physical, _ = keyFromInt(base)
+			}
+		}
+	}
+	var P0 int
+	if len(P) > 0 {
+		P0 = P[0]
+	}
+
+	if hasLT && len(intermediate) == 0 {
+		switch mode {
+		case 'm', 'M': // mouse event, we only do SGR tracking
+			ip.handleMouse(mode, P)
+		}
+		return
+	}
+	if hasQM {
+		switch mode {
+		case 'c':
+			if len(intermediate) == 0 {
+				ip.handlePrimaryDA(P)
+			}
+		case 'y':
+			if string(intermediate) == "$" {
+				ip.handlePrivateModeResponse(P)
+			}
+		case 'u':
+			if len(intermediate) == 0 {
+				ip.handleKittyMode(P)
+			}
+		}
+		return
+	}
+	if hasGT {
+		switch mode {
+		case 'm':
+			if len(intermediate) == 0 {
+				ip.handleXTermMode(P)
+			}
+		}
+		return
+	}
+
+	if len(intermediate) != 0 {
+		// we don't know what to do with these for now
+		return
+	}
+
+	switch mode {
+	case 'I': // focus in
+		ip.post(NewEventFocus(true))
+		return
+	case 'O': // focus out
+		ip.post(NewEventFocus(false))
+		return
+	case '[':
+		// linux console F-key - CSI-[ modifies next key
+		ip.state = istLnx
+		return
+	case 'u':
+		// CSI-u kitty keyboard protocol, is unambiguous
+		if len(P) > 0 {
+			mod := ModNone
+			key := KeyRune
+			chr := rune(0)
+			if k1, ok := csiUKeys[P0]; ok {
+				key = k1.Key
+				chr = k1.Rune
+			} else {
+				chr = rune(P0)
+			}
+			if len(P) > 1 {
+				mod = calcModifier(P[1])
+			}
+			if mod1 := kittyModifierKey(P0); mod1 != ModNone {
+				mod |= mod1
+			}
+			if key != KeyRune {
+				ip.postKeyEx(key, "", mod, pressed, physical, repeat)
+			} else if chr != 0 {
+				ip.postKeyEx(KeyRune, string(chr), mod, pressed, physical, repeat)
+			}
+			return
+		}
+	case '_':
+		if len(P) > 0 {
+			ip.handleWinKey(P)
+			return
+		}
+	case 't':
+		if len(P) < 1 {
+			break
+		}
+		switch P[0] {
+		case 8:
+			if len(P) > 2 {
+				// window size report
+				h := P[1]
+				w := P[2]
+				if h != ip.rows || w != ip.cols {
+					ip.SetSize(w, h)
+				}
+				return
+			}
+		case 48:
+			if len(P) > 2 {
+				// window resize report
+				ip.post(NewEventResize(P[2], P[1]))
+				return
+			}
+		}
+	case '~':
+		if len(P) >= 2 {
+			mod := calcModifier(P[1])
+			if ks, ok := csiAllKeys[csiParamMode{M: mode, P: P0}]; ok {
+				ip.postKeyEx(ks.Key, "", mod, pressed, 0, repeat)
+				return
+			}
+			if P0 == 27 && len(P) > 2 && P[2] > 0 && P[2] <= utf8.MaxRune {
+				if P[2] < ' ' || P[2] == 0x7F {
+					if key, ok := keyFromInt(P[2]); ok {
+						ip.postKey(key, "", mod)
+					}
+				} else {
+					physical, _ := keyFromRune(rune(P[2]))
+					ip.postKeyEx(KeyRune, string(rune(P[2])), mod, true, physical, 1)
+				}
+				return
+			}
+		}
+	}
+
+	if ks, ok := csiAllKeys[csiParamMode{M: mode, P: P0}]; ok {
+		if mode == '~' && len(P) > 1 && ks.Mod == ModNone {
+			// apply modifiers if present
+			ks.Mod = calcModifier(P[1])
+		} else if mode == 'P' && os.Getenv("TERM") == "aixterm" {
+			ks.Key = KeyDelete // aixterm hack - conflicts with kitty protocol
+		}
+		ip.postKey(ks.Key, "", ks.Mod)
+		return
+	}
+
+	// this might have been an SS3 style key with modifiers applied
+	if k, ok := ss3Keys[mode]; ok && P0 == 1 && len(P) > 1 {
+		ip.postKeyEx(k.key, k.str, calcModifier(P[1]), pressed, 0, repeat)
+		return
+	}
+	// if we got here we just swallow the unknown sequence
+}
+
+func (ip *inputParser) ScanUTF8(b []byte) {
+	ip.l.Lock()
+	defer ip.l.Unlock()
+
+	ip.utfBuf = append(ip.utfBuf, b...)
+	for len(ip.utfBuf) > 0 {
+		// fast path, basic ascii, also includes ISO2022 8-bit controls
+		if ip.utfBuf[0] < 0xA0 {
+			ip.buf = append(ip.buf, rune(ip.utfBuf[0]))
+			ip.utfBuf = ip.utfBuf[1:]
+		} else {
+			r, utfLen := utf8.DecodeRune(ip.utfBuf)
+			if r == utf8.RuneError {
+				// discard the leading byte as bad,
+				// hopefully it will recover.
+				utfLen = 1
+			} else {
+				ip.buf = append(ip.buf, r)
+			}
+			ip.utfBuf = ip.utfBuf[utfLen:]
+		}
+	}
+
+	ip.scan()
+}
+
+// Scan scans the existing input, but does not take new content.
+// This is typically called after a delay when Waiting() is true.
+func (ip *inputParser) Scan() {
+	ip.l.Lock()
+	ip.scan()
+	ip.l.Unlock()
+}
+
+// Private events between input and tscreen.
+
+// eventPrimaryAttributes is for primary device attributes -- this should be
+// the last event returned during initial handshaking
+type eventPrimaryAttributes struct {
+	EventTime
+	Class         int  // Terminal class, 1 is vt100, vt101, 6 is vt102, > 60 for vt200 and up
+	ReGIS         bool // Terminal supports ReGIS graphics (DA 3)
+	Sixel         bool // Terminal supports Sixel graphics (DA 4)
+	National      bool // Terminal supports national replacement character sets (DA 9)
+	SerboCroation bool // Serbo-Croatian(DA 12)
+	Color         bool // Terminal supports color (DA 22)
+	Greek         bool // Greek (DA 23)
+	Turkish       bool // Turkish (DA 24)
+	Latin2        bool // ISO Latin-2 (DA 42)
+	Clipboard     bool // OSC 52 support (DA 52)
+}
+
+// eventTermName is for extended attributes
+type eventTermName struct {
+	EventTime
+	Name    string
+	Version string
+}
+
+type eventPrivateMode struct {
+	EventTime
+	Mode   vt.PrivateMode // numeric mode e.g. 7 for auto-margin, 1006 for SGR mouse reports, etc
+	Status vt.ModeStatus  // value of status
+}
+
+type KittyKbdMode uint16
+
+const (
+	KittyKbdModeOff       = KittyKbdMode(0)  // Disable Kitty keyboard mode
+	KittyKbdModeBase      = KittyKbdMode(1)  // Enable disambiguated keys
+	KittyKbdModeEvents    = KittyKbdMode(2)  // Report event types (e.g. key release)
+	KittyKbdModeAlternate = KittyKbdMode(4)  // Report alternate keys
+	KittyKbdModeAll       = KittyKbdMode(8)  // Report all keys using kitty keyboard protocol
+	KittyKbdModeText      = KittyKbdMode(16) // Report associated text
+)
+
+type eventKittyKbdMode struct {
+	EventTime
+	Mode KittyKbdMode
+}
+
+type XtermKbdMode uint16
+
+const (
+	XtermKbdModeOff  = XtermKbdMode(0) // Disabled
+	XtermKbdModeBase = XtermKbdMode(1) // Enabled except for ones with legacy behavior
+	XtermKbdModeExt  = XtermKbdMode(2) // Enabled for all modified keys
+	XtermKbdModeAll  = XtermKbdMode(3) // Send all keys (including unmodified)
+)
+
+type eventXTermKbdMode struct {
+	EventTime
+	Mode XtermKbdMode
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/eastasian.go b/vendor/github.com/gdamore/tcell/v3/internal/widthutil/widthutil.go
similarity index 55%
rename from vendor/github.com/gdamore/tcell/v2/eastasian.go
rename to vendor/github.com/gdamore/tcell/v3/internal/widthutil/widthutil.go
index 56b9af692..7ab693181 100644
--- a/vendor/github.com/gdamore/tcell/v2/eastasian.go
+++ b/vendor/github.com/gdamore/tcell/v3/internal/widthutil/widthutil.go
@@ -1,8 +1,8 @@
-// Copyright 2025 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -12,19 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tcell
+package widthutil
 
 import (
 	"os"
 	"strings"
 
-	"github.com/rivo/uniseg"
+	"github.com/clipperhouse/displaywidth"
 )
 
-func init() {
+// Options returns the display-width options derived from the user's
+// environment. We preserve the historical RUNEWIDTH_EASTASIAN toggle.
+func Options() displaywidth.Options {
 	if rw := strings.ToLower(os.Getenv("RUNEWIDTH_EASTASIAN")); rw == "1" || rw == "true" || rw == "yes" {
-		uniseg.EastAsianAmbiguousWidth = 2
-	} else {
-		uniseg.EastAsianAmbiguousWidth = 1
+		return displaywidth.Options{EastAsianWidth: true}
 	}
+	return displaywidth.Options{}
 }
diff --git a/vendor/github.com/gdamore/tcell/v2/interrupt.go b/vendor/github.com/gdamore/tcell/v3/interrupt.go
similarity index 62%
rename from vendor/github.com/gdamore/tcell/v2/interrupt.go
rename to vendor/github.com/gdamore/tcell/v3/interrupt.go
index 70dddfce2..2aeaa990f 100644
--- a/vendor/github.com/gdamore/tcell/v2/interrupt.go
+++ b/vendor/github.com/gdamore/tcell/v3/interrupt.go
@@ -1,8 +1,8 @@
-// Copyright 2015 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -14,28 +14,21 @@
 
 package tcell
 
-import (
-	"time"
-)
-
 // EventInterrupt is a generic wakeup event.  Its can be used to
 // to request a redraw.  It can carry an arbitrary payload, as well.
 type EventInterrupt struct {
-	t time.Time
-	v interface{}
-}
-
-// When returns the time when this event was created.
-func (ev *EventInterrupt) When() time.Time {
-	return ev.t
+	EventTime
+	v any
 }
 
 // Data is used to obtain the opaque event payload.
-func (ev *EventInterrupt) Data() interface{} {
+func (ev *EventInterrupt) Data() any {
 	return ev.v
 }
 
 // NewEventInterrupt creates an EventInterrupt with the given payload.
-func NewEventInterrupt(data interface{}) *EventInterrupt {
-	return &EventInterrupt{t: time.Now(), v: data}
+func NewEventInterrupt(data any) *EventInterrupt {
+	ev := &EventInterrupt{v: data}
+	ev.SetEventNow()
+	return ev
 }
diff --git a/vendor/github.com/gdamore/tcell/v3/key.go b/vendor/github.com/gdamore/tcell/v3/key.go
new file mode 100644
index 000000000..bb4c790ea
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/key.go
@@ -0,0 +1,757 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tcell
+
+import (
+	"fmt"
+	"strings"
+)
+
+// EventKey represents a key press.  Usually this is a key press followed
+// by a key release, but since terminal programs don't have a way to report
+// key release events, we usually get just one event.  If a key is held down
+// then the terminal may synthesize repeated key presses at some predefined
+// rate.  We have no control over that, nor visibility into it.
+//
+// In some cases, we can have a modifier key, such as ModAlt, that can be
+// generated with a key press.  (This usually is represented by having the
+// high bit set, or in some cases, by sending an ESC prior to the rune.)
+//
+// If the value of Key() is KeyRune, then the actual key value will be
+// available (as a grapheme cluster) with the Str() method.
+// This will be the case for most keys.
+//
+// In most situations, the modifiers will not be set.  For example, if the
+// rune is 'A', this will be reported without the ModShift bit set, since
+// really can't tell if the Shift key was pressed (it might have been CAPSLOCK,
+// or a terminal that only can send capitals, or keyboard with separate
+// capital letters from lower case letters).
+//
+// Generally, terminal applications have far less visibility into keyboard
+// activity than graphical applications.  Hence, they should avoid depending
+// overly much on availability of modifiers, or the availability of any
+// specific keys.
+type EventKey struct {
+	EventTime
+	mod      ModMask
+	key      Key
+	physical Key
+	str      string // string for key, usually just one character, but may be composed sequence
+	pressed  bool
+	repeat   int
+}
+
+// Str returns the string corresponding to the key press, if it makes sense.
+// The result is only defined if the value of Key() is KeyRune.  It will be
+// either one key (e.g. 'A'), or could be a composed sequence.
+func (ev *EventKey) Str() string {
+	return ev.str
+}
+
+// Key returns a virtual key code.  We use this to identify specific key
+// codes, such as KeyEnter, etc.  Most control and function keys are reported
+// with unique Key values.  Normal alphanumeric and punctuation keys will
+// generally return KeyRune here; the specific key can be further decoded
+// using the Str() function.
+func (ev *EventKey) Key() Key {
+	return ev.key
+}
+
+// Physical returns the physical key that was pressed, when known.
+//
+// This is different from Key() and Str(), which describe the logical key result
+// delivered to the application.  For example, on a US keyboard Shift-/ may
+// produce Str() == "?", while Physical() reports KeySlash.  Most applications
+// should use Key() and Str(); Physical is intended for layout-independent uses
+// such as keyboard remappers, embedded terminal emulators, and games that care
+// about key location rather than the printed character.
+//
+// For letter keys, compare physical values against the lowercase aliases
+// KeyA through KeyZ.  The legacy KeyCtrlA through KeyCtrlZ constants occupy
+// the same numeric range as Key('A') through Key('Z'), so Key('A') is not a
+// physical "A" key identifier.
+//
+// If the physical key is unknown, this returns zero.
+func (ev *EventKey) Physical() Key {
+	return ev.physical
+}
+
+// Pressed returns true for key press events, and false for key release events.
+// Legacy keyboard reporting only reports presses.
+func (ev *EventKey) Pressed() bool {
+	return ev.pressed
+}
+
+// Repeat returns the repeat count for this key event.  Legacy keyboard
+// reporting synthesizes repeated key presses as separate events, so this will
+// normally be 1.
+func (ev *EventKey) Repeat() int {
+	return ev.repeat
+}
+
+// Modifiers returns the modifiers that were present with the key press.  Note
+// that not all platforms and terminals support this equally well, and some
+// cases we will not not know for sure.  Hence, applications should avoid
+// using this in most circumstances.
+func (ev *EventKey) Modifiers() ModMask {
+	return ev.mod
+}
+
+// KeyProtocol identifies the keyboard reporting protocol that the terminal
+// is currently using.  More capable protocols allow disambiguating modifier
+// combinations, distinguishing key release events, etc.
+type KeyProtocol int
+
+// These are the keyboard protocols that tcell can report.
+const (
+	LegacyKeyboard KeyProtocol = iota // basic VT100 style reports
+	KittyKeyboard                     // kitty supports events, unambiguous keys modulo left/right modifiers
+	Win32Keyboard                     // win32 supports the full feature set
+	XTermKeyboard                     // xterm modify other keys, disambiguation only, no release events
+)
+
+// KeyNames holds the written names of special keys. Useful to echo back a key
+// name, or to look up a key from a string value.
+var KeyNames = map[Key]string{
+	KeyEnter:      "Enter",
+	KeyBackspace:  "Backspace",
+	KeyTab:        "Tab",
+	KeyBacktab:    "Backtab",
+	KeyEsc:        "Esc",
+	KeyBackspace2: "Backspace2",
+	KeyDelete:     "Delete",
+	KeyInsert:     "Insert",
+	KeyUp:         "Up",
+	KeyDown:       "Down",
+	KeyLeft:       "Left",
+	KeyRight:      "Right",
+	KeyHome:       "Home",
+	KeyEnd:        "End",
+	KeyUpLeft:     "UpLeft",
+	KeyUpRight:    "UpRight",
+	KeyDownLeft:   "DownLeft",
+	KeyDownRight:  "DownRight",
+	KeyCenter:     "Center",
+	KeyPgDn:       "PgDn",
+	KeyPgUp:       "PgUp",
+	KeyClear:      "Clear",
+	KeyExit:       "Exit",
+	KeyCancel:     "Cancel",
+	KeyPause:      "Pause",
+	KeyPrint:      "Print",
+	KeyF1:         "F1",
+	KeyF2:         "F2",
+	KeyF3:         "F3",
+	KeyF4:         "F4",
+	KeyF5:         "F5",
+	KeyF6:         "F6",
+	KeyF7:         "F7",
+	KeyF8:         "F8",
+	KeyF9:         "F9",
+	KeyF10:        "F10",
+	KeyF11:        "F11",
+	KeyF12:        "F12",
+	KeyF13:        "F13",
+	KeyF14:        "F14",
+	KeyF15:        "F15",
+	KeyF16:        "F16",
+	KeyF17:        "F17",
+	KeyF18:        "F18",
+	KeyF19:        "F19",
+	KeyF20:        "F20",
+	KeyF21:        "F21",
+	KeyF22:        "F22",
+	KeyF23:        "F23",
+	KeyF24:        "F24",
+	KeyF25:        "F25",
+	KeyF26:        "F26",
+	KeyF27:        "F27",
+	KeyF28:        "F28",
+	KeyF29:        "F29",
+	KeyF30:        "F30",
+	KeyF31:        "F31",
+	KeyF32:        "F32",
+	KeyF33:        "F33",
+	KeyF34:        "F34",
+	KeyF35:        "F35",
+	KeyF36:        "F36",
+	KeyF37:        "F37",
+	KeyF38:        "F38",
+	KeyF39:        "F39",
+	KeyF40:        "F40",
+	KeyF41:        "F41",
+	KeyF42:        "F42",
+	KeyF43:        "F43",
+	KeyF44:        "F44",
+	KeyF45:        "F45",
+	KeyF46:        "F46",
+	KeyF47:        "F47",
+	KeyF48:        "F48",
+	KeyF49:        "F49",
+	KeyF50:        "F50",
+	KeyF51:        "F51",
+	KeyF52:        "F52",
+	KeyF53:        "F53",
+	KeyF54:        "F54",
+	KeyF55:        "F55",
+	KeyF56:        "F56",
+	KeyF57:        "F57",
+	KeyF58:        "F58",
+	KeyF59:        "F59",
+	KeyF60:        "F60",
+	KeyF61:        "F61",
+	KeyF62:        "F62",
+	KeyF63:        "F63",
+	KeyF64:        "F64",
+	KeyMenu:       "Menu",
+	KeyCapsLock:   "CapsLock",
+	KeyScrollLock: "ScrollLock",
+	KeyNumLock:    "NumLock",
+	KeyShift:      "Shift",
+	KeyCtrl:       "Ctrl",
+	KeyAlt:        "Alt",
+	KeyMeta:       "Meta",
+	KeyHyper:      "Hyper",
+	KeyCtrlA:      "Ctrl-A",
+	KeyCtrlB:      "Ctrl-B",
+	KeyCtrlC:      "Ctrl-C",
+	KeyCtrlD:      "Ctrl-D",
+	KeyCtrlE:      "Ctrl-E",
+	KeyCtrlF:      "Ctrl-F",
+	KeyCtrlG:      "Ctrl-G",
+	KeyCtrlH:      "Ctrl-H",
+	KeyCtrlI:      "Ctrl-I",
+	KeyCtrlJ:      "Ctrl-J",
+	KeyCtrlK:      "Ctrl-K",
+	KeyCtrlL:      "Ctrl-L",
+	KeyCtrlM:      "Ctrl-M",
+	KeyCtrlN:      "Ctrl-N",
+	KeyCtrlO:      "Ctrl-O",
+	KeyCtrlP:      "Ctrl-P",
+	KeyCtrlQ:      "Ctrl-Q",
+	KeyCtrlR:      "Ctrl-R",
+	KeyCtrlS:      "Ctrl-S",
+	KeyCtrlT:      "Ctrl-T",
+	KeyCtrlU:      "Ctrl-U",
+	KeyCtrlV:      "Ctrl-V",
+	KeyCtrlW:      "Ctrl-W",
+	KeyCtrlX:      "Ctrl-X",
+	KeyCtrlY:      "Ctrl-Y",
+	KeyCtrlZ:      "Ctrl-Z",
+}
+
+// Name returns a printable value or the key stroke.  This can be used
+// when printing the event, for example.
+func (ev *EventKey) Name() string {
+	s := ""
+	m := []string{}
+	if ev.mod&modLShift != 0 {
+		m = append(m, "LeftShift")
+	}
+	if ev.mod&modRShift != 0 {
+		m = append(m, "RightShift")
+	}
+	if ev.mod&ModShift != 0 && ev.mod&(modLShift|modRShift) == 0 {
+		m = append(m, "Shift")
+	}
+	if ev.mod&modLAlt != 0 {
+		m = append(m, "LeftAlt")
+	}
+	if ev.mod&modRAlt != 0 {
+		m = append(m, "RightAlt")
+	}
+	if ev.mod&ModAlt != 0 && ev.mod&(modLAlt|modRAlt) == 0 {
+		m = append(m, "Alt")
+	}
+	if ev.mod&modLMeta != 0 {
+		m = append(m, "LeftMeta")
+	}
+	if ev.mod&modRMeta != 0 {
+		m = append(m, "RightMeta")
+	}
+	if ev.mod&ModMeta != 0 && ev.mod&(modLMeta|modRMeta) == 0 {
+		m = append(m, "Meta")
+	}
+	if ev.mod&modLCtrl != 0 {
+		m = append(m, "LeftCtrl")
+	}
+	if ev.mod&modRCtrl != 0 {
+		m = append(m, "RightCtrl")
+	}
+	if ev.mod&ModCtrl != 0 && ev.mod&(modLCtrl|modRCtrl) == 0 {
+		m = append(m, "Ctrl")
+	}
+	if ev.mod&modLHyper != 0 {
+		m = append(m, "LeftHyper")
+	}
+	if ev.mod&modRHyper != 0 {
+		m = append(m, "RightHyper")
+	}
+	if ev.mod&ModHyper != 0 && ev.mod&(modLHyper|modRHyper) == 0 {
+		m = append(m, "Hyper")
+	}
+
+	ok := false
+	if s, ok = KeyNames[ev.key]; !ok {
+		if ev.key == KeyRune {
+			s = "Rune[" + ev.str + "]"
+		} else {
+			s = fmt.Sprintf("Key[%d,%s]", ev.key, ev.str)
+		}
+	}
+	if len(m) != 0 {
+		switch ev.key {
+		case KeyShift:
+			if ev.mod&(modLShift|modRShift|ModShift) != 0 {
+				return strings.Join(m, "+")
+			}
+		case KeyCtrl:
+			if ev.mod&(modLCtrl|modRCtrl|ModCtrl) != 0 {
+				return strings.Join(m, "+")
+			}
+		case KeyAlt:
+			if ev.mod&(modLAlt|modRAlt|ModAlt) != 0 {
+				return strings.Join(m, "+")
+			}
+		case KeyMeta:
+			if ev.mod&(modLMeta|modRMeta|ModMeta) != 0 {
+				return strings.Join(m, "+")
+			}
+		case KeyHyper:
+			if ev.mod&(modLHyper|modRHyper|ModHyper) != 0 {
+				return strings.Join(m, "+")
+			}
+		}
+		if ev.mod&ModCtrl != 0 && strings.HasPrefix(s, "Ctrl-") {
+			s = s[5:]
+		}
+		return fmt.Sprintf("%s+%s", strings.Join(m, "+"), s)
+	}
+	return s
+}
+
+// NewEventKey attempts to create a suitable event.  It parses the various
+// ASCII control sequences if KeyRune is passed for Key, but if the caller
+// has more precise information it should set that specifically.  Callers
+// that aren't sure about modifier state (most) should just pass ModNone.
+func NewEventKey(k Key, str string, mod ModMask) *EventKey {
+	return newEventKey(k, str, mod, true, 0, 1, false)
+}
+
+// NewEventKeyEx creates an extended key event with press/release, physical key,
+// and repeat metadata.  It also uses the newer key normalization rules: ASCII
+// control letters are reported as KeyRune plus ModCtrl instead of legacy
+// KeyCtrlA through KeyCtrlZ values.
+func NewEventKeyEx(k Key, str string, mod ModMask, pressed bool, physical Key, repeat int) *EventKey {
+	return newEventKey(k, str, mod, pressed, physical, repeat, true)
+}
+
+func newEventKey(k Key, str string, mod ModMask, pressed bool, physical Key, repeat int, advanced bool) *EventKey {
+	ch := rune(0)
+	if len(str) == 1 {
+		ch = []rune(str)[0]
+	}
+	if repeat <= 0 {
+		repeat = 1
+	}
+
+	if k == KeyRune {
+		if ch != 0 && (ch < ' ' || ch == 0x7f) {
+			// Turn specials into proper key codes.  This is for
+			// control characters and the DEL.
+			k = Key(ch)
+			if mod == ModNone && ch < ' ' {
+				switch k {
+				case KeyBackspace, KeyTab, KeyEsc, KeyEnter:
+					// these keys are directly typeable without CTRL
+					str = ""
+				default:
+					// most likely entered with a CTRL keypress
+					mod = ModCtrl
+				}
+				ch = ch + '\x60'
+			}
+		}
+
+		// For legacy reasons, if Ctrl is pressed with an ASCII alphabetic, then we
+		// emit it as a KeyCtrlXX symbol.
+		if mod == ModCtrl && !advanced {
+			// We don't do Ctrl-[ or backslash or those specially.
+			if ch >= 'A' && ch <= 'Z' { // upper case
+				k = KeyCtrlA + Key(ch-'A')
+				str = ""
+			} else if ch >= 'a' && ch <= 'z' { // lower case
+				k = KeyCtrlA + Key(ch-'a')
+				str = ""
+			}
+		}
+
+		// Windows reports ModShift for shifted keys.  This is inconsistent
+		// with UNIX, lets harmonize this.
+		if mod == ModShift && str != "" && !advanced {
+			mod = ModNone
+		}
+	}
+
+	// Backspace2 is just another name for backspace.
+	if k == KeyBackspace2 {
+		k = KeyBackspace
+	}
+
+	// Advanced key reporting exposes Shift-Tab directly.  Backtab is a legacy
+	// alias from terminals that cannot distinguish a physical Backtab key.
+	if k == KeyBacktab && advanced {
+		k = KeyTab
+		mod |= ModShift
+		if physical == 0 || physical == KeyBacktab {
+			physical = KeyTab
+		}
+	}
+
+	// Shift-Tab should be Backtab.
+	if k == KeyTab && (mod&ModShift) != 0 && !advanced {
+		k = KeyBacktab
+		mod &^= ModShift
+	}
+	ev := &EventKey{key: k, str: str, mod: mod, pressed: pressed, physical: physical, repeat: repeat}
+	ev.SetEventNow()
+	return ev
+}
+
+// ModMask is a mask of modifier keys.  Note that it will not always be
+// possible to report modifier keys.
+type ModMask int32
+
+// These are the modifiers keys that can be sent either with a key press,
+// or a mouse event.  Note that as of now, due to the confusion associated
+// with Meta, and the lack of support for it on many/most platforms, the
+// current implementations never use it.  Instead, they use ModAlt, even for
+// events that could possibly have been distinguished from ModAlt.
+const (
+	ModShift ModMask = 1 << iota
+	ModCtrl
+	ModAlt
+	ModMeta
+	ModHyper
+	ModNone ModMask = 0
+)
+
+const (
+	modLShift ModMask = 1 << (iota + 5)
+	modRShift
+	modLCtrl
+	modRCtrl
+	modLAlt
+	modRAlt
+	modLMeta
+	modRMeta
+	modLHyper
+	modRHyper
+)
+
+// These modifiers identify a specific side when the keyboard protocol reports
+// one.  They include the aggregate modifier bit, so ModLCtrl also satisfies
+// checks for ModCtrl.
+const (
+	ModLShift = ModShift | modLShift
+	ModRShift = ModShift | modRShift
+	ModLCtrl  = ModCtrl | modLCtrl
+	ModRCtrl  = ModCtrl | modRCtrl
+	ModLAlt   = ModAlt | modLAlt
+	ModRAlt   = ModAlt | modRAlt
+	ModLMeta  = ModMeta | modLMeta
+	ModRMeta  = ModMeta | modRMeta
+	ModLHyper = ModHyper | modLHyper
+	ModRHyper = ModHyper | modRHyper
+)
+
+// These keys are aliases for printable physical keys.  They are primarily
+// useful with EventKey.Physical, which may report a base key location separately
+// from the generated text.
+//
+// These names identify the unshifted base key on a US-style keyboard layout.
+// They do not identify logical characters produced by modifiers or other
+// layouts.  For example, the physical key named KeySlash may produce "/" or
+// "?" on a US keyboard depending on Shift, and may produce different text on
+// other layouts.  Applications interested in the logical key sequence should
+// use EventKey.Key and EventKey.Str instead.
+const (
+	KeySpace Key = ' '
+	Key0     Key = '0'
+	Key1     Key = '1'
+	Key2     Key = '2'
+	Key3     Key = '3'
+	Key4     Key = '4'
+	Key5     Key = '5'
+	Key6     Key = '6'
+	Key7     Key = '7'
+	Key8     Key = '8'
+	Key9     Key = '9'
+
+	KeyGrave      Key = '`'
+	KeyBacktick   Key = KeyGrave
+	KeyMinus      Key = '-'
+	KeyEqual      Key = '='
+	KeyLBrace     Key = '['
+	KeyLBracket   Key = KeyLBrace
+	KeyRBrace     Key = ']'
+	KeyRBracket   Key = KeyRBrace
+	KeyBackslash  Key = '\\'
+	KeySemi       Key = ';'
+	KeySemicolon  Key = KeySemi
+	KeyQuote      Key = '\''
+	KeyApostrophe Key = KeyQuote
+	KeyComma      Key = ','
+	KeyPeriod     Key = '.'
+	KeySlash      Key = '/'
+
+	KeyA Key = 'a'
+	KeyB Key = 'b'
+	KeyC Key = 'c'
+	KeyD Key = 'd'
+	KeyE Key = 'e'
+	KeyF Key = 'f'
+	KeyG Key = 'g'
+	KeyH Key = 'h'
+	KeyI Key = 'i'
+	KeyJ Key = 'j'
+	KeyK Key = 'k'
+	KeyL Key = 'l'
+	KeyM Key = 'm'
+	KeyN Key = 'n'
+	KeyO Key = 'o'
+	KeyP Key = 'p'
+	KeyQ Key = 'q'
+	KeyR Key = 'r'
+	KeyS Key = 's'
+	KeyT Key = 't'
+	KeyU Key = 'u'
+	KeyV Key = 'v'
+	KeyW Key = 'w'
+	KeyX Key = 'x'
+	KeyY Key = 'y'
+	KeyZ Key = 'z'
+)
+
+// Key is a generic value for representing keys, and especially special
+// keys (function keys, cursor movement keys, etc.)  For normal keys, like
+// ASCII letters, we use KeyRune, and then expect the application to
+// inspect the Str() member of the EventKey.
+type Key int16
+
+// This is the list of named keys.  KeyRune is special however, in that it is
+// a place holder key indicating that a printable character was sent.  The
+// actual value of the rune will be transported in the Rune of the associated
+// EventKey.
+const (
+	KeyRune Key = iota + 256
+	KeyUp
+	KeyDown
+	KeyRight
+	KeyLeft
+	KeyUpLeft
+	KeyUpRight
+	KeyDownLeft
+	KeyDownRight
+	KeyCenter
+	KeyPgUp
+	KeyPgDn
+	KeyHome
+	KeyEnd
+	KeyInsert
+	KeyDelete
+	KeyHelp
+	KeyExit
+	KeyClear
+	KeyCancel
+	KeyPrint
+	KeyPause
+	// KeyBacktab is used for legacy Shift-Tab reporting.  In advanced key
+	// reporting mode, Shift-Tab is reported as KeyTab with ModShift instead.
+	KeyBacktab
+	KeyF1
+	KeyF2
+	KeyF3
+	KeyF4
+	KeyF5
+	KeyF6
+	KeyF7
+	KeyF8
+	KeyF9
+	KeyF10
+	KeyF11
+	KeyF12
+	KeyF13
+	KeyF14
+	KeyF15
+	KeyF16
+	KeyF17
+	KeyF18
+	KeyF19
+	KeyF20
+	KeyF21
+	KeyF22
+	KeyF23
+	KeyF24
+	KeyF25
+	KeyF26
+	KeyF27
+	KeyF28
+	KeyF29
+	KeyF30
+	KeyF31
+	KeyF32
+	KeyF33
+	KeyF34
+	KeyF35
+	KeyF36
+	KeyF37
+	KeyF38
+	KeyF39
+	KeyF40
+	KeyF41
+	KeyF42
+	KeyF43
+	KeyF44
+	KeyF45
+	KeyF46
+	KeyF47
+	KeyF48
+	KeyF49
+	KeyF50
+	KeyF51
+	KeyF52
+	KeyF53
+	KeyF54
+	KeyF55
+	KeyF56
+	KeyF57
+	KeyF58
+	KeyF59
+	KeyF60
+	KeyF61
+	KeyF62
+	KeyF63
+	KeyF64
+	KeyMenu
+	KeyCapsLock
+	KeyScrollLock
+	KeyNumLock
+	KeyShift
+	KeyCtrl
+	KeyAlt
+	KeyMeta
+	KeyHyper
+)
+
+const (
+	// These key codes are used internally, and will never appear to applications.
+	keyPasteStart Key = iota + 16384
+	keyPasteEnd
+)
+
+// These are the control keys, they will also be reported with the
+// rune (lower case) and control modifier.  If the shift key
+// or other modifiers are present then these will *NOT* be reported,
+// but reported instead as KeyRune.
+//
+// Note that these are not reported in advanced key reporting mode.
+// Instead, for advanced keys, expect KeyRune and a modifier with the
+// associated rune to be sent.
+const (
+	KeyCtrlA Key = iota + 65
+	KeyCtrlB
+	KeyCtrlC
+	KeyCtrlD
+	KeyCtrlE
+	KeyCtrlF
+	KeyCtrlG
+	KeyCtrlH
+	KeyCtrlI
+	KeyCtrlJ
+	KeyCtrlK
+	KeyCtrlL
+	KeyCtrlM
+	KeyCtrlN
+	KeyCtrlO
+	KeyCtrlP
+	KeyCtrlQ
+	KeyCtrlR
+	KeyCtrlS
+	KeyCtrlT
+	KeyCtrlU
+	KeyCtrlV
+	KeyCtrlW
+	KeyCtrlX
+	KeyCtrlY
+	KeyCtrlZ
+)
+
+// Special values - these are fixed in an attempt to make it more likely
+// that aliases will encode the same way.
+
+// These are the defined ASCII values for key codes.  They generally match
+// with KeyCtrl values.
+//
+// Most of these will not be reported in advanced key reporting mode, as they
+// are not possible to type directly. Some notable exceptions are KeyESC, KeyBS,
+// KeyTAB, and KeyCR, which have aliases below.
+const (
+	KeyNUL Key = iota
+	KeySOH
+	KeySTX
+	KeyETX
+	KeyEOT
+	KeyENQ
+	KeyACK
+	KeyBEL
+	KeyBS
+	KeyTAB
+	KeyLF
+	KeyVT
+	KeyFF
+	KeyCR
+	KeySO
+	KeySI
+	KeyDLE
+	KeyDC1
+	KeyDC2
+	KeyDC3
+	KeyDC4
+	KeyNAK
+	KeySYN
+	KeyETB
+	KeyCAN
+	KeyEM
+	KeySUB
+	KeyESC
+	KeyFS
+	KeyGS
+	KeyRS
+	KeyUS
+	KeyDEL Key = 0x7F
+)
+
+// These keys are aliases for other names.
+const (
+	KeyBackspace = KeyBS
+	KeyTab       = KeyTAB
+	KeyEsc       = KeyESC
+	KeyEscape    = KeyESC
+	KeyEnter     = KeyCR
+
+	// NB: This key will be translated to KeyBackspace
+	KeyBackspace2 = KeyDEL
+)
diff --git a/vendor/github.com/gdamore/tcell/v2/mouse.go b/vendor/github.com/gdamore/tcell/v3/mouse.go
similarity index 87%
rename from vendor/github.com/gdamore/tcell/v2/mouse.go
rename to vendor/github.com/gdamore/tcell/v3/mouse.go
index 29de4c3a4..683ae0243 100644
--- a/vendor/github.com/gdamore/tcell/v2/mouse.go
+++ b/vendor/github.com/gdamore/tcell/v3/mouse.go
@@ -1,8 +1,8 @@
 // Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -14,10 +14,6 @@
 
 package tcell
 
-import (
-	"time"
-)
-
 // EventMouse is a mouse event.  It is sent on either mouse up or mouse down
 // events.  It is also sent on mouse motion events - if the terminal supports
 // it.  We make every effort to ensure that mouse release events are delivered.
@@ -35,18 +31,13 @@ import (
 // Applications can inspect the time between events to resolve double or
 // triple clicks.
 type EventMouse struct {
-	t   time.Time
+	EventTime
 	btn ButtonMask
 	mod ModMask
 	x   int
 	y   int
 }
 
-// When returns the time when this EventMouse was created.
-func (ev *EventMouse) When() time.Time {
-	return ev.t
-}
-
 // Buttons returns the list of buttons that were pressed or wheel motions.
 func (ev *EventMouse) Buttons() ButtonMask {
 	return ev.btn
@@ -58,16 +49,19 @@ func (ev *EventMouse) Modifiers() ModMask {
 	return ev.mod
 }
 
-// Position returns the mouse position in character cells.  The origin
-// 0, 0 is at the upper left corner.
+// Position returns the mouse position.  The origin 0, 0 is at the upper
+// left corner.  The unit is character cells unless the screen was started
+// with MousePixelEvents, in which case the unit is terminal pixels.
 func (ev *EventMouse) Position() (int, int) {
 	return ev.x, ev.y
 }
 
 // NewEventMouse is used to create a new mouse event.  Applications
-// shouldn't need to use this; its mostly for screen implementors.
+// shouldn't need to use this; its mostly for screen implementers.
 func NewEventMouse(x, y int, btn ButtonMask, mod ModMask) *EventMouse {
-	return &EventMouse{t: time.Now(), x: x, y: y, btn: btn, mod: mod}
+	ev := &EventMouse{x: x, y: y, btn: btn, mod: mod}
+	ev.SetEventNow()
+	return ev
 }
 
 // ButtonMask is a mask of mouse buttons and wheel events.  Mouse button presses
diff --git a/vendor/github.com/gdamore/tcell/v2/paste.go b/vendor/github.com/gdamore/tcell/v3/paste.go
similarity index 93%
rename from vendor/github.com/gdamore/tcell/v2/paste.go
rename to vendor/github.com/gdamore/tcell/v3/paste.go
index f511f63cb..9d7f0c7e3 100644
--- a/vendor/github.com/gdamore/tcell/v2/paste.go
+++ b/vendor/github.com/gdamore/tcell/v3/paste.go
@@ -1,8 +1,8 @@
 // Copyright 2024 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -26,7 +26,6 @@ import (
 type EventPaste struct {
 	start bool
 	t     time.Time
-	data  []byte
 }
 
 // When returns the time when this EventPaste was created.
diff --git a/vendor/github.com/gdamore/tcell/v2/resize.go b/vendor/github.com/gdamore/tcell/v3/resize.go
similarity index 63%
rename from vendor/github.com/gdamore/tcell/v2/resize.go
rename to vendor/github.com/gdamore/tcell/v3/resize.go
index f3e2b3a5f..8c713e259 100644
--- a/vendor/github.com/gdamore/tcell/v2/resize.go
+++ b/vendor/github.com/gdamore/tcell/v3/resize.go
@@ -1,8 +1,8 @@
-// Copyright 2015 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -14,13 +14,11 @@
 
 package tcell
 
-import (
-	"time"
-)
+import "github.com/gdamore/tcell/v3/tty"
 
 // EventResize is sent when the window size changes.
 type EventResize struct {
-	t  time.Time
+	EventTime
 	ws WindowSize
 }
 
@@ -31,12 +29,9 @@ func NewEventResize(width, height int) *EventResize {
 		Width:  width,
 		Height: height,
 	}
-	return &EventResize{t: time.Now(), ws: ws}
-}
-
-// When returns the time when the Event was created.
-func (ev *EventResize) When() time.Time {
-	return ev.t
+	ev := &EventResize{ws: ws}
+	ev.SetEventNow()
+	return ev
 }
 
 // Size returns the new window size as width, height in character cells.
@@ -50,17 +45,4 @@ func (ev *EventResize) PixelSize() (int, int) {
 	return ev.ws.PixelWidth, ev.ws.PixelHeight
 }
 
-type WindowSize struct {
-	Width       int
-	Height      int
-	PixelWidth  int
-	PixelHeight int
-}
-
-// CellDimensions returns the dimensions of a single cell, in pixels
-func (ws WindowSize) CellDimensions() (int, int) {
-	if ws.PixelWidth == 0 || ws.PixelHeight == 0 {
-		return 0, 0
-	}
-	return (ws.PixelWidth / ws.Width), (ws.PixelHeight / ws.Height)
-}
+type WindowSize = tty.WindowSize
diff --git a/vendor/github.com/gdamore/tcell/v2/runes.go b/vendor/github.com/gdamore/tcell/v3/runes.go
similarity index 96%
rename from vendor/github.com/gdamore/tcell/v2/runes.go
rename to vendor/github.com/gdamore/tcell/v3/runes.go
index ed9c63b5c..f707113d6 100644
--- a/vendor/github.com/gdamore/tcell/v2/runes.go
+++ b/vendor/github.com/gdamore/tcell/v3/runes.go
@@ -1,8 +1,8 @@
 // Copyright 2015 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
diff --git a/vendor/github.com/gdamore/tcell/v2/screen.go b/vendor/github.com/gdamore/tcell/v3/screen.go
similarity index 71%
rename from vendor/github.com/gdamore/tcell/v2/screen.go
rename to vendor/github.com/gdamore/tcell/v3/screen.go
index db2f0088e..553709c4d 100644
--- a/vendor/github.com/gdamore/tcell/v2/screen.go
+++ b/vendor/github.com/gdamore/tcell/v3/screen.go
@@ -1,8 +1,8 @@
-// Copyright 2025 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -14,7 +14,11 @@
 
 package tcell
 
-import "sync"
+import (
+	"sync"
+
+	"github.com/gdamore/tcell/v3/color"
+)
 
 // Screen represents the physical (or emulated) screen.
 // This can be a terminal window or a physical console.  Platforms implement
@@ -35,7 +39,7 @@ type Screen interface {
 	// is called (or Sync).
 	Fill(rune, Style)
 
-	// Put writes the first graphme of the given string with th
+	// Put writes the first grapheme of the given string with th
 	// given style at the given coordinates. (Only the first grapheme
 	// occupying either one or two cells is stored.) It returns the
 	// remainder of the string, and the width displayed.
@@ -46,14 +50,9 @@ type Screen interface {
 	PutStr(x int, y int, str string)
 
 	// PutStrStyled writes a string starting at the given position, using
-	// the given style. The cont4ent is clipped to the screen dimensions.
+	// the given style. The content is clipped to the screen dimensions.
 	PutStrStyled(x int, y int, str string, style Style)
 
-	// SetCell is an older API, and will be removed.
-	//jj
-	// Deprecated: Please use Put instead.
-	SetCell(x int, y int, style Style, ch ...rune)
-
 	// Get the contents at the given location.  If the
 	// coordinates are out of range, then the values will be 0, nil,
 	// StyleDefault.  Note that the contents returned are logical contents
@@ -63,11 +62,6 @@ type Screen interface {
 	// characters and emoji require two cells.
 	Get(x, y int) (str string, style Style, width int)
 
-	// GetContent is the old way to get cell contents.
-	//
-	// Deprecated: Use Get() instead.
-	GetContent(x, y int) (primary rune, combining []rune, style Style, width int)
-
 	// SetContent sets the contents of the given cell location.  If
 	// the coordinates are out of range, then the operation is ignored.
 	//
@@ -101,52 +95,19 @@ type Screen interface {
 	// is not supported (or cursor styles are not supported at all),
 	// then this will have no effect.  Color will be changed if supplied,
 	// and the terminal supports doing so.
-	SetCursorStyle(CursorStyle, ...Color)
+	SetCursorStyle(CursorStyle, ...color.Color)
 
 	// Size returns the screen size as width, height.  This changes in
 	// response to a call to Clear or Flush.
 	Size() (width, height int)
 
-	// ChannelEvents is an infinite loop that waits for an event and
-	// channels it into the user provided channel ch.  Closing the
-	// quit channel and calling the Fini method are cancellation
-	// signals.  When a cancellation signal is received the method
-	// returns after closing ch.
-	//
-	// This method should be used as a goroutine.
-	//
-	// NOTE: PollEvent should not be called while this method is running.
-	ChannelEvents(ch chan<- Event, quit <-chan struct{})
-
-	// PollEvent waits for events to arrive.  Main application loops
-	// must spin on this to prevent the application from stalling.
-	// Furthermore, this will return nil if the Screen is finalized.
-	PollEvent() Event
-
-	// HasPendingEvent returns true if PollEvent would return an event
-	// without blocking.  If the screen is stopped and PollEvent would
-	// return nil, then the return value from this function is unspecified.
-	// The purpose of this function is to allow multiple events to be collected
-	// at once, to minimize screen redraws.
-	HasPendingEvent() bool
-
-	// PostEvent tries to post an event into the event stream.  This
-	// can fail if the event queue is full.  In that case, the event
-	// is dropped, and ErrEventQFull is returned.
-	PostEvent(ev Event) error
-
-	// Deprecated: PostEventWait is unsafe, and will be removed
-	// in the future.
-	//
-	// PostEventWait is like PostEvent, but if the queue is full, it
-	// blocks until there is space in the queue, making delivery
-	// reliable.  However, it is VERY important that this function
-	// never be called from within whatever event loop is polling
-	// with PollEvent(), otherwise a deadlock may arise.
-	//
-	// For this reason, when using this function, the use of a
-	// Goroutine is recommended to ensure no deadlock can occur.
-	PostEventWait(ev Event)
+	// EventQ returns the channel of events, and is usable just like
+	// any other channel.  Events can be injected by writing to
+	// the channel, and they can be read by reading from it.  The
+	// channel will remain open until the screen is completely shut down
+	// with Fini().  Consequently, applications must not write to this
+	// channel after Fini() is called.
+	EventQ() chan Event
 
 	// EnableMouse enables the mouse.  (If your terminal supports it.)
 	// If no flags are specified, then all events are reported, if the
@@ -168,12 +129,6 @@ type Screen interface {
 	// DisableFocus disables reporting of focus events.
 	DisableFocus()
 
-	// HasMouse returns true if the terminal (apparently) supports a
-	// mouse.  Note that the return value of true doesn't guarantee that
-	// a mouse/pointing device is present; a false return definitely
-	// indicates no mouse support is available.
-	HasMouse() bool
-
 	// Colors returns the number of colors.  All colors are assumed to
 	// use the ANSI color map.  If a terminal is monochrome, it will
 	// return 0.
@@ -232,34 +187,11 @@ type Screen interface {
 	// by your terminal except by changing the terminal database.
 	UnregisterRuneFallback(r rune)
 
-	// CanDisplay returns true if the given rune can be displayed on
-	// this screen.  Note that this is a best-guess effort -- whether
-	// your fonts support the character or not may be questionable.
-	// Mostly this is for folks who work outside of Unicode.
-	//
-	// If checkFallbacks is true, then if any (possibly imperfect)
-	// fallbacks are registered, this will return true.  This will
-	// also return true if the terminal can replace the glyph with
-	// one that is visually indistinguishable from the one requested.
-	//
-	// Deprecated: This is not a particularly useful or reliable function,
-	// due to limitations in fonts, etc.  It will be removed in the future.
-	CanDisplay(r rune, checkFallbacks bool) bool
-
 	// Resize does nothing, since it's generally not possible to
 	// ask a screen to resize, but it allows the Screen to implement
 	// the View interface.
 	Resize(int, int, int, int)
 
-	// HasKey always returns true.
-	//
-	// Deprecated: This function always returns true.  Applications
-	// cannot reliably detect whether a key is supported or not with
-	// modern terminal emulators. (The intended use here was to help
-	// applications determine whether a given key stroke was supported
-	// by the terminal, but it was never reliable.)
-	HasKey(Key) bool
-
 	// Suspend pauses input and output processing.  It also restores the
 	// terminal settings to what they were when the application started.
 	// This can be used to, for example, run a sub-shell.
@@ -298,6 +230,7 @@ type Screen interface {
 	// SetClipboard is used to post arbitrary data to the system clipboard.
 	// This need not be UTF-8 string data.  It's up to the recipient to decode the
 	// data meaningfully.  Terminals may prevent this for security reasons.
+	// An empty byte or nil can be used to clear the clipboard.
 	SetClipboard([]byte)
 
 	// GetClipboard is used to request the clipboard contents.  It may be ignored.
@@ -305,20 +238,60 @@ type Screen interface {
 	// EventPaste with the clipboard content as the Data() field.  Terminals may
 	// prevent this for security reasons.
 	GetClipboard()
+
+	// HasClipboard is true if the screen claims to support the clipboard.
+	// Note that GetClipboard may still not work, but SetClipboard should be functional.
+	// Note that many terminals that support the clipboard don't actually report that they
+	// do, so a false indication is not necessarily conclusive.
+	HasClipboard() bool
+
+	// ShowNotification is used to show a desktop notification, when the terminal
+	// supports it.  Right now only terminals supporting OSC 777 support this.
+	ShowNotification(title string, body string)
+
+	// KeyboardProtocol returns the keyboard protocol currently in use.
+	KeyboardProtocol() KeyProtocol
+
+	// Terminal returns the terminal name and version if known.  If either of these
+	// are unknown, then empty strings are returned in their place.  This is intended
+	// to facilitate debug, and also applications that wish to enable very specific
+	// behaviors for the terminal
+	Terminal() (string, string)
 }
 
-// NewScreen returns a default Screen suitable for the user's terminal
-// environment.
-func NewScreen() (Screen, error) {
-	if s, e := NewTerminfoScreen(); s != nil {
+var overrideScreen chan Screen
+var overrideOnce sync.Once
+
+// NewScreen returns a default Screen suitable for the user's terminal environment.
+// Any options are passed through to NewTerminfoScreen.
+func NewScreen(opts ...TerminfoScreenOption) (Screen, error) {
+
+	// Allow an application (presumably test code) to inject a replacement default
+	// screen.  This could also be used to create shims for things like nesting screens.
+	select {
+	case s := <-overrideScreen:
 		return s, nil
-	} else if s, _ := NewConsoleScreen(); s != nil {
+	default:
+	}
+
+	if s, e := NewTerminfoScreen(opts...); s != nil {
 		return s, nil
 	} else {
 		return nil, e
 	}
 }
 
+// ShimScreen allows an application to override the screen that will
+// be returned by NewScreen.  Typically this  is used for testing,
+// where the test code calls this once before running an example.
+// It could also be used to intercept a regular Screen.
+func ShimScreen(s Screen) {
+	overrideOnce.Do(func() {
+		overrideScreen = make(chan Screen, 8) // normally would only be one anyway
+	})
+	overrideScreen <- s
+}
+
 // MouseFlags are options to modify the handling of mouse events.
 // Actual events can be ORed together.
 type MouseFlags int
@@ -327,6 +300,15 @@ const (
 	MouseButtonEvents = MouseFlags(1) // Click events only
 	MouseDragEvents   = MouseFlags(2) // Click-drag events (includes button events)
 	MouseMotionEvents = MouseFlags(4) // All mouse events (includes click and drag events)
+	// MousePixelEvents requests that mouse coordinates be reported in
+	// terminal pixels rather than character cells (xterm SGR-Pixel mode,
+	// CSI ?1016h). It is a modifier on the other mouse flags: at least one
+	// of MouseButtonEvents, MouseDragEvents, or MouseMotionEvents must also
+	// be set for any events to be delivered. When this mode is active,
+	// EventMouse.Position() returns coordinates in pixels; the application
+	// is responsible for mapping those to its own grid (e.g. via the
+	// terminal's reported cell-pixel size).
+	MousePixelEvents = MouseFlags(8)
 )
 
 // CursorStyle represents a given cursor style, which can include the shape and
@@ -351,7 +333,7 @@ type screenImpl interface {
 	SetStyle(style Style)
 	ShowCursor(x int, y int)
 	HideCursor()
-	SetCursor(CursorStyle, Color)
+	SetCursor(CursorStyle, color.Color)
 	Size() (width, height int)
 	EnableMouse(...MouseFlags)
 	DisableMouse()
@@ -359,16 +341,13 @@ type screenImpl interface {
 	DisablePaste()
 	EnableFocus()
 	DisableFocus()
-	HasMouse() bool
 	Colors() int
 	Show()
 	Sync()
 	CharacterSet() string
 	RegisterRuneFallback(r rune, subst string)
 	UnregisterRuneFallback(r rune)
-	CanDisplay(r rune, checkFallbacks bool) bool
 	Resize(int, int, int, int)
-	HasKey(Key) bool
 	Suspend() error
 	Resume() error
 	Beep() error
@@ -377,6 +356,10 @@ type screenImpl interface {
 	Tty() (Tty, bool)
 	SetClipboard([]byte)
 	GetClipboard()
+	HasClipboard() bool
+	ShowNotification(string, string)
+	KeyboardProtocol() KeyProtocol
+	Terminal() (string, string)
 
 	// Following methods are not part of the Screen api, but are used for interaction with
 	// the common layer code.
@@ -413,30 +396,25 @@ func (b *baseScreen) Put(x int, y int, str string, style Style) (remain string,
 func (b *baseScreen) PutStrStyled(x int, y int, str string, style Style) {
 	cells := b.GetCells()
 	b.Lock()
+	defer b.Unlock()
 	cols, rows := cells.Size()
+	if cells.sanitizeContent {
+		str = stripOSCControlsIfNeeded(str)
+	}
 	width := 0
 	for str != "" && x < cols && y < rows {
-		str, width = cells.Put(x, y, str, style)
+		str, width = cells.put(x, y, str, style)
 		if width == 0 {
 			break
 		}
 		x += width
 	}
-	defer b.Unlock()
 }
 
 func (b *baseScreen) PutStr(x, y int, str string) {
 	b.PutStrStyled(x, y, str, StyleDefault)
 }
 
-func (b *baseScreen) SetCell(x int, y int, style Style, ch ...rune) {
-	if len(ch) > 0 {
-		b.Put(x, y, string(ch), style)
-	} else {
-		b.Put(x, y, " ", style)
-	}
-}
-
 func (b *baseScreen) Clear() {
 	b.Fill(' ', StyleDefault)
 }
@@ -459,18 +437,6 @@ func (b *baseScreen) Get(x, y int) (string, Style, int) {
 	return cells.Get(x, y)
 }
 
-func (b *baseScreen) GetContent(x, y int) (rune, []rune, Style, int) {
-	var primary rune
-	var combining []rune
-	var style Style
-	var width int
-	cells := b.GetCells()
-	b.Lock()
-	primary, combining, style, width = cells.GetContent(x, y)
-	b.Unlock()
-	return primary, combining, style, width
-}
-
 func (b *baseScreen) LockRegion(x, y, width, height int, lock bool) {
 	cells := b.GetCells()
 	b.Lock()
@@ -487,56 +453,7 @@ func (b *baseScreen) LockRegion(x, y, width, height int, lock bool) {
 	b.Unlock()
 }
 
-func (b *baseScreen) ChannelEvents(ch chan<- Event, quit <-chan struct{}) {
-	defer close(ch)
-	for {
-		select {
-		case <-quit:
-			return
-		case <-b.StopQ():
-			return
-		case ev := <-b.EventQ():
-			select {
-			case <-quit:
-				return
-			case <-b.StopQ():
-				return
-			case ch <- ev:
-			}
-		}
-	}
-}
-
-func (b *baseScreen) PollEvent() Event {
-	select {
-	case <-b.StopQ():
-		return nil
-	case ev := <-b.EventQ():
-		return ev
-	}
-}
-
-func (b *baseScreen) HasPendingEvent() bool {
-	return len(b.EventQ()) > 0
-}
-
-func (b *baseScreen) PostEventWait(ev Event) {
-	select {
-	case b.EventQ() <- ev:
-	case <-b.StopQ():
-	}
-}
-
-func (b *baseScreen) PostEvent(ev Event) error {
-	select {
-	case b.EventQ() <- ev:
-		return nil
-	default:
-		return ErrEventQFull
-	}
-}
-
-func (b *baseScreen) SetCursorStyle(cs CursorStyle, ccs ...Color) {
+func (b *baseScreen) SetCursorStyle(cs CursorStyle, ccs ...color.Color) {
 	if len(ccs) > 0 {
 		b.SetCursor(cs, ccs[0])
 	} else {
diff --git a/vendor/github.com/gdamore/tcell/v2/style.go b/vendor/github.com/gdamore/tcell/v3/style.go
similarity index 53%
rename from vendor/github.com/gdamore/tcell/v2/style.go
rename to vendor/github.com/gdamore/tcell/v3/style.go
index 73995c0e4..7f629da3f 100644
--- a/vendor/github.com/gdamore/tcell/v2/style.go
+++ b/vendor/github.com/gdamore/tcell/v3/style.go
@@ -1,8 +1,8 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -14,6 +14,13 @@
 
 package tcell
 
+import (
+	"strings"
+	"unicode/utf8"
+
+	"github.com/gdamore/tcell/v3/color"
+)
+
 // Style represents a complete text style, including both foreground color,
 // background color, and additional attributes such as "bold" or "underline".
 //
@@ -23,13 +30,55 @@ package tcell
 //
 // To use Style, just declare a variable of its type.
 type Style struct {
-	fg      Color
-	bg      Color
-	ulStyle UnderlineStyle
-	ulColor Color
+	fg      color.Color
+	bg      color.Color
+	ulColor color.Color
 	attrs   AttrMask
-	url     string
-	urlId   string
+	ulStyle UnderlineStyle
+	url     *urlInfo
+}
+
+type urlInfo struct {
+	url string
+	id  string
+}
+
+// stripOSCControls removes control bytes that can terminate OSC payloads early.
+func stripOSCControls(s string) string {
+	var b strings.Builder
+	b.Grow(len(s))
+	for i := 0; i < len(s); {
+		r, size := utf8.DecodeRuneInString(s[i:])
+		if r == utf8.RuneError && size == 1 {
+			c := s[i]
+			if c <= 0x1f || c == 0x7f || (c >= 0x80 && c <= 0x9f) {
+				i++
+				continue
+			}
+			_ = b.WriteByte(c)
+			i++
+			continue
+		}
+		if r <= 0x1f || r == 0x7f || (r >= 0x80 && r <= 0x9f) {
+			i += size
+			continue
+		}
+		b.WriteString(s[i : i+size])
+		i += size
+	}
+	return b.String()
+}
+
+// stripOSCControlsIfNeeded returns the original string when it contains no
+// control bytes and only allocates when stripping is required.
+func stripOSCControlsIfNeeded(s string) string {
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		if c <= 0x1f || c == 0x7f || (c >= 0x80 && c <= 0x9f) {
+			return stripOSCControls(s)
+		}
+	}
+	return s
 }
 
 // StyleDefault represents a default style, based upon the context.
@@ -41,7 +90,7 @@ var styleInvalid = Style{attrs: AttrInvalid}
 
 // Foreground returns a new style based on s, with the foreground color set
 // as requested.  ColorDefault can be used to select the global default.
-func (s Style) Foreground(c Color) Style {
+func (s Style) Foreground(c color.Color) Style {
 	s2 := s
 	s2.fg = c
 	return s2
@@ -49,20 +98,12 @@ func (s Style) Foreground(c Color) Style {
 
 // Background returns a new style based on s, with the background color set
 // as requested.  ColorDefault can be used to select the global default.
-func (s Style) Background(c Color) Style {
+func (s Style) Background(c color.Color) Style {
 	s2 := s
 	s2.bg = c
 	return s2
 }
 
-// Decompose breaks a style up, returning the foreground, background,
-// and other attributes.  The URL if set is not included.
-// Deprecated: Applications should not attempt to decompose style,
-// as this content is not sufficient to describe the actual style.
-func (s Style) Decompose() (fg Color, bg Color, attr AttrMask) {
-	return s.fg, s.bg, s.attrs
-}
-
 func (s Style) setAttrs(attrs AttrMask, on bool) Style {
 	s2 := s
 	if on {
@@ -74,10 +115,15 @@ func (s Style) setAttrs(attrs AttrMask, on bool) Style {
 }
 
 // Normal returns the style with all attributes disabled.
+// Colors are preserved, as are hyperlinks.  (Underline color
+// will also be preserved, but no underline is currently shown.
+// Apart from color, the underline style is reset as well.)
 func (s Style) Normal() Style {
 	return Style{
-		fg: s.fg,
-		bg: s.bg,
+		fg:      s.fg,
+		bg:      s.bg,
+		ulColor: s.ulColor,
+		url:     s.url,
 	}
 }
 
@@ -112,14 +158,14 @@ func (s Style) Reverse(on bool) Style {
 	return s.setAttrs(AttrReverse, on)
 }
 
-// StrikeThrough sets strikethrough mode.
+// StrikeThrough sets strike-through mode.
 func (s Style) StrikeThrough(on bool) Style {
 	return s.setAttrs(AttrStrikeThrough, on)
 }
 
 // Underline style.  Modern terminals have the option of rendering the
 // underline using different styles, and even different colors.
-type UnderlineStyle int
+type UnderlineStyle uint8
 
 const (
 	UnderlineStyleNone = UnderlineStyle(iota)
@@ -136,24 +182,17 @@ const (
 // bool: on / off - enables just a simple underline
 // UnderlineStyle: sets a specific style (should not coexist with the bool)
 // Color: the color to use
-func (s Style) Underline(params ...interface{}) Style {
+func (s Style) Underline(params ...any) Style {
 	s2 := s
 	for _, param := range params {
 		switch v := param.(type) {
 		case bool:
 			if v {
 				s2.ulStyle = UnderlineStyleSolid
-				s2.attrs |= AttrUnderline
 			} else {
 				s2.ulStyle = UnderlineStyleNone
-				s2.attrs &^= AttrUnderline
 			}
 		case UnderlineStyle:
-			if v == UnderlineStyleNone {
-				s2.attrs &^= AttrUnderline
-			} else {
-				s2.attrs |= AttrUnderline
-			}
 			s2.ulStyle = v
 		case Color:
 			s2.ulColor = v
@@ -164,30 +203,55 @@ func (s Style) Underline(params ...interface{}) Style {
 	return s2
 }
 
+// GetForeground returns the foreground (text) color.
+func (s Style) GetForeground() color.Color {
+	return s.fg
+}
+
+// GetBackground returns the background color.
+func (s Style) GetBackground() color.Color {
+	return s.bg
+}
+
 // GetUnderlineStyle returns the underline style for the style.
 func (s Style) GetUnderlineStyle() UnderlineStyle {
 	return s.ulStyle
 }
 
 // GetUnderlineColor returns the underline color for the style.
-func (s Style) GetUnderlineColor() Color {
+func (s Style) GetUnderlineColor() color.Color {
 	return s.ulColor
 }
 
 // Attributes returns a new style based on s, with its attributes set as
 // specified.
+//
+// Deprecated: Use direct functions instead.
 func (s Style) Attributes(attrs AttrMask) Style {
 	s2 := s
 	s2.attrs = attrs
 	return s2
 }
 
+// GetAttributes gets the attributes for a style.
+// Deprecated: Use individual properties instead.
+func (s Style) GetAttributes() AttrMask {
+	return s.attrs
+}
+
 // Url returns a style with the Url set.  If the provided Url is not empty,
 // and the terminal supports it, text will typically be marked up as a clickable
 // link to that Url.  If the Url is empty, then this mode is turned off.
 func (s Style) Url(url string) Style {
+
 	s2 := s
-	s2.url = url
+	s2.url = &urlInfo{url: stripOSCControlsIfNeeded(url)}
+	if s.url != nil {
+		s2.url.id = s.url.id
+	}
+	if s2.url.url == "" && s2.url.id == "" {
+		s2.url = nil
+	}
 	return s2
 }
 
@@ -197,6 +261,62 @@ func (s Style) Url(url string) Style {
 // were one Url, even if it spans multiple lines.
 func (s Style) UrlId(id string) Style {
 	s2 := s
-	s2.urlId = "id=" + id
+	s2.url = &urlInfo{}
+	if id = stripOSCControlsIfNeeded(id); id != "" {
+		s2.url.id = "id=" + id
+	}
+	if s.url != nil {
+		s2.url.url = s.url.url
+	}
+	if s2.url.url == "" && s2.url.id == "" {
+		s2.url = nil
+	}
 	return s2
 }
+
+// GetUrl returns the URL (id and actual URL) associated with the style.
+// This is a hyper link that will be used for cells marked up with this style.
+func (s Style) GetUrl() (id string, url string) {
+	if s.url != nil {
+		return strings.TrimPrefix(s.url.id, "id="), s.url.url
+	}
+	return "", ""
+}
+
+// HasBold returns true if the style indicates bold text.
+// Note that on some terminals bold text is simply brighter.
+func (s Style) HasBold() bool {
+	return s.attrs&AttrBold != 0
+}
+
+// HasBlink returns true if the style indicates blinking text.
+func (s Style) HasBlink() bool {
+	return s.attrs&AttrBlink != 0
+}
+
+// HasReverse returns true if the style indicates reverse video text.
+func (s Style) HasReverse() bool {
+	return s.attrs&AttrReverse != 0
+}
+
+// HasItalic returns true if the style indicates italicized text.
+func (s Style) HasItalic() bool {
+	return s.attrs&AttrItalic != 0
+}
+
+// HasDim returns true if the style indicates dim or faint text.
+func (s Style) HasDim() bool {
+	return s.attrs&AttrDim != 0
+}
+
+// HasStrikeThrough returns true if the style indicates crossed-out text.
+func (s Style) HasStrikeThrough() bool {
+	return s.attrs&AttrStrikeThrough != 0
+}
+
+// HasUnderline returns true if any underline style is set.
+// Note that more detail is available via the GetUnderlineStyle
+// and GetUnderlineColor methods.
+func (s Style) HasUnderline() bool {
+	return s.ulStyle != UnderlineStyleNone
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/tscreen.go b/vendor/github.com/gdamore/tcell/v3/tscreen.go
new file mode 100644
index 000000000..bbd31e316
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/tscreen.go
@@ -0,0 +1,1843 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build (!js && !wasm) || (js && wasm)
+// +build !js,!wasm js,wasm
+
+package tcell
+
+import (
+	"bytes"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"maps"
+	"os"
+	"runtime"
+	"slices"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+	"unicode/utf8"
+
+	"github.com/gdamore/tcell/v3/color"
+	"github.com/gdamore/tcell/v3/vt"
+	"golang.org/x/text/transform"
+)
+
+// NewTerminfoScreen returns a Screen that uses the stock TTY interface
+// and POSIX terminal control, combined with a terminfo description taken from
+// the $TERM environment variable.  It returns an error if the terminal
+// is not supported for any reason.
+//
+// For terminals that do not support dynamic resize events, the $LINES
+// $COLUMNS environment variables can be set to the actual window size,
+// otherwise defaults taken from the terminal database are used.
+func NewTerminfoScreen(opts ...TerminfoScreenOption) (Screen, error) {
+	return NewTerminfoScreenFromTty(nil, opts...)
+}
+
+type TerminfoScreenOption interface {
+	apply(*tScreen)
+}
+
+// OptColors forces the number of colors, overriding the value
+// of the color count that would be detected by the environment.
+// If the value is 0, then color is forced off.  Other reasonable values
+// are 8, 16, 88, 256, or 1<<24.  The latter case intrinsically enables
+// 24-bit color as well.
+type OptColors int
+
+func (o OptColors) apply(t *tScreen) {
+	t.ncolor = min(int(o), 256)
+	t.truecolor = o > 256
+	t.noColor = o == 0
+}
+
+// OptTerm overrides the detection of $TERM.
+type OptTerm string
+
+func (o OptTerm) apply(t *tScreen) {
+	t.term = string(o)
+}
+
+// OptAltScreen controls whether the alternate screen buffer is used.
+// The default is true. The TCELL_ALTSCREEN=disable environment override
+// is still honored.
+type OptAltScreen bool
+
+func (o OptAltScreen) apply(t *tScreen) {
+	t.altScreen = bool(o)
+}
+
+// OptSanitizeContent enables stripping control characters from content passed
+// to Put and PutStr. This is safer, but a little slower than leaving content
+// unsanitized.
+type OptSanitizeContent bool
+
+func (o OptSanitizeContent) apply(t *tScreen) {
+	t.cells.sanitizeContent = bool(o)
+}
+
+// OptAdvancedKeys enables richer key reporting where supported.  In this mode
+// key events may include release state, repeat counts, and physical keys, and
+// ASCII control letters are reported as KeyRune with ModCtrl instead of
+// KeyCtrlA through KeyCtrlZ.  Shift-Tab is reported as KeyTab with ModShift,
+// rather than KeyBacktab.
+type OptAdvancedKeys bool
+
+func (o OptAdvancedKeys) apply(t *tScreen) {
+	t.advancedKeys = bool(o)
+}
+
+// OptKeyboardProtocol forces the keyboard reporting protocol instead of using
+// startup negotiation. The zero value forces legacy keyboard reporting.
+type OptKeyboardProtocol KeyProtocol
+
+func (o OptKeyboardProtocol) apply(t *tScreen) {
+	t.forceKeyboardProtocol(KeyProtocol(o))
+}
+
+// OptNegotiation controls whether terminal capabilities are negotiated during
+// startup. The default is true.
+type OptNegotiation bool
+
+func (o OptNegotiation) apply(t *tScreen) {
+	t.negotiate = bool(o)
+}
+
+// OptControlStringLimit sets the maximum inbound control-string payload size
+// accepted from the terminal before the parser drops the sequence. This limits
+// OSC and XDA strings, including OSC 52 clipboard strings; OSC 52 is the
+// protocol used for writing clipboard data through the terminal. The default is
+// 64 KiB; a value of 0 disables the limit.
+type OptControlStringLimit int
+
+func (o OptControlStringLimit) apply(t *tScreen) {
+	t.controlStringLimit = max(int(o), 0)
+}
+
+// Some terminal escapes that are basically universal.
+// We would really like to be able to use private mode queries for some of
+// these but generally we've found that support for queries is not always present,
+// even when the private modes can be controlled. It appears that *all* terminals
+// will happily swallow the escapes that they do not recognize, with the small annoyance
+// in "st" where it prints error messages to its stderr (which is usually not visible
+// to the user unless they started it from another terminal session).  But apart from
+// the complaint to stderr from "st", everything else is fine.
+const (
+	enableAutoMargin  = "\x1b[?7h" // dec private mode 7
+	setCursorPosition = "\x1b[%[1]d;%[2]dH"
+	sgr0              = "\x1b[m" // attrOff
+	bold              = "\x1b[1m"
+	dim               = "\x1b[2m"
+	italic            = "\x1b[3m"
+	underline         = "\x1b[4m"
+	blink             = "\x1b[5m"
+	reverse           = "\x1b[7m"
+	strikeThrough     = "\x1b[9m"
+	clear             = "\x1b[H\x1b[J"
+	doubleUnder       = "\x1b[4:2m"
+	curlyUnder        = "\x1b[4:3m"
+	dottedUnder       = "\x1b[4:4m"
+	dashedUnder       = "\x1b[4:5m"
+	underColor        = "\x1b[58:5:%dm"
+	underRGB          = "\x1b[58:2::%d:%d:%dm"
+	underFg           = "\x1b[59m"
+	enableAltChars    = "\x1b(B\x1b)0"                      // set G0 as US-ASCII, G1 as DEC line drawing
+	startAltChars     = "\x0e"                              // aka Shift-Out
+	endAltChars       = "\x0f"                              // aka Shift-In
+	setFg8            = "\x1b[3%dm"                         // for colors less than 8
+	setFg256          = "\x1b[38;5;%dm"                     // for colors less than 256
+	setFgRgb          = "\x1b[38;2;%d;%d;%dm"               // for RGB
+	setBg8            = "\x1b[4%dm"                         // color colors less than 8
+	setBg256          = "\x1b[48;5;%dm"                     // for colors less than 256
+	setBgRgb          = "\x1b[48;2;%d;%d;%dm"               // for RGB
+	setFgBgRgb        = "\x1b[38;2;%d;%d;%d;48;2;%d;%d;%dm" // for RGB, in one shot
+	enterCA           = "\x1b[?1049h"                       // alternate screen
+	exitCA            = "\x1b[?1049l"                       // alternate screen
+	enterKeypad       = "\x1b[?1h\x1b="                     // Note mode 1 might not be supported everywhere
+	exitKeypad        = "\x1b[?1l\x1b>"                     // Also mode 1
+	requestWindowSize = "\x1b[18t"                          // For modern terminals
+	requestPrimaryDA  = "\x1b[c"                            // Request primary device attributes
+	requestExtAttr    = "\x1b[>q"                           // Request extended attribute (emulator name and version)
+	setClipboard      = "\x1b]52;c;%s\x1b\\"                // Clipboard content is base64
+	notifyDesktop9    = "\x1b]9;%[2]s\x1b\\"                // Args are title, body (but OSC 9 only has body)
+	notifyDesktop777  = "\x1b]777;notify;%s;%s\x1b\\"       // Most commonly supported
+	queryKittyKbd     = "\x1b[?u"                           // Query for Kitty keyboard support
+	enableKittyKbd    = "\x1b[=1u"                          // Technically this pushes
+	enableKittyKbdAdv = "\x1b[=15u"                         // disambiguation, events, alternate keys, all keys
+	disableKittyKbd   = "\x1b[=0u"                          // Technically this means pop previous mode
+	queryXTermKbd     = "\x1b[?4m"                          // Query for XTerm modify other keys support
+	enableXTermKbd    = "\x1b[>4;2m"                        // Enable modify other keys protocol
+	disableXTermKbd   = "\x1b[>4;0m"                        // Disable modify other keys protocol
+)
+
+// NewTerminfoScreenFromTty returns a Screen using a custom Tty implementation.
+// If the passed in tty is nil, then a reasonable default (typically /dev/tty)
+// is presumed, at least on UNIX hosts. (Windows hosts will typically fail this
+// call altogether.)
+func NewTerminfoScreenFromTty(tty Tty, opts ...TerminfoScreenOption) (Screen, error) {
+	t := &tScreen{
+		tty:                tty,
+		altScreen:          true,
+		negotiate:          true,
+		controlStringLimit: defaultControlStringLimit,
+	}
+
+	t.prepareCursorStyles()
+	t.prepareExtendedOSC()
+	t.buildAcsMap()
+	t.resizeQ = make(chan bool, 1)
+	t.fallback = make(map[rune]string)
+	maps.Copy(t.fallback, RuneFallbacks)
+	for _, o := range opts {
+		o.apply(t)
+	}
+
+	return &baseScreen{screenImpl: t}, nil
+}
+
+// tScreen represents a screen backed by a terminfo implementation.
+type tScreen struct {
+	tty                Tty
+	h                  int
+	w                  int
+	fini               bool
+	cells              CellBuffer
+	buffering          bool // true if we are collecting writes to buf instead of sending directly to out
+	buf                bytes.Buffer
+	curstyle           Style
+	style              Style
+	resizeQ            chan bool
+	quit               chan struct{}
+	keyQ               chan []byte
+	cx                 int
+	cy                 int
+	cls                bool // clear screen
+	cursorx            int
+	cursory            int
+	acs                map[rune]string
+	charset            string
+	encoder            transform.Transformer
+	decoder            transform.Transformer
+	fallback           map[rune]string
+	ncolor             int
+	colors             map[color.Color]color.Color
+	palette            []color.Color
+	truecolor          bool
+	noColor            bool
+	legacy             bool
+	hasClipboard       bool // true if OSC 52 reported via DA1
+	finiOnce           sync.Once
+	initFiniLock       sync.Mutex
+	enterUrl           string
+	exitUrl            string
+	setWinSize         string
+	cursorStyles       map[CursorStyle]string
+	cursorStyle        CursorStyle
+	cursorColor        color.Color
+	cursorRGB          string
+	cursorFg           string
+	stopQ              chan struct{}
+	eventQ             chan Event
+	initQ              chan Event
+	initted            bool
+	running            bool
+	startTime          time.Time
+	wg                 sync.WaitGroup
+	eventWg            sync.WaitGroup
+	mouseFlags         MouseFlags
+	pasteEnabled       bool
+	focusEnabled       bool
+	setTitle           string
+	saveTitle          string
+	restoreTitle       string
+	title              string
+	setClipboard       string
+	notifyDesktop      string
+	termName           string
+	termVers           string
+	term               string // value from $TERM
+	altScreen          bool
+	inlineResize       bool
+	haveMouse          bool
+	haveMouseSgr       bool
+	haveKittyKbd       bool
+	haveWin32Kbd       bool
+	haveXTermKbd       bool
+	forcedKbd          KeyProtocol
+	forceKbd           bool
+	negotiate          bool
+	mouseDisabled      bool
+	advancedKeys       bool
+	controlStringLimit int
+	input              *inputParser
+	compat             struct {
+		mouseUnsupported         bool
+		focusUnsupported         bool
+		clipboardReadUnsupported bool
+	}
+	sync.Mutex
+}
+
+func (t *tScreen) useAltScreen() bool {
+	return t.altScreen && os.Getenv("TCELL_ALTSCREEN") != "disable"
+}
+
+func validKeyboardProtocol(p KeyProtocol) bool {
+	switch p {
+	case LegacyKeyboard, KittyKeyboard, Win32Keyboard, XTermKeyboard:
+		return true
+	default:
+		return false
+	}
+}
+
+func parseKeyboardProtocol(s string) (KeyProtocol, bool) {
+	switch s {
+	case "legacy":
+		return LegacyKeyboard, true
+	case "kitty":
+		return KittyKeyboard, true
+	case "win32":
+		return Win32Keyboard, true
+	case "xterm":
+		return XTermKeyboard, true
+	default:
+		return LegacyKeyboard, false
+	}
+}
+
+func (t *tScreen) forceKeyboardProtocol(p KeyProtocol) bool {
+	if !validKeyboardProtocol(p) {
+		return false
+	}
+	t.forcedKbd = p
+	t.forceKbd = true
+	return true
+}
+
+func (t *tScreen) applyKeyboardProtocolOverride() {
+	if !t.forceKbd {
+		return
+	}
+	t.haveKittyKbd = t.forcedKbd == KittyKeyboard
+	t.haveWin32Kbd = t.forcedKbd == Win32Keyboard
+	t.haveXTermKbd = t.forcedKbd == XTermKeyboard
+}
+
+func (t *tScreen) applyEnvironmentOverrides() {
+	switch os.Getenv("TCELL_KEYBOARD_PROTOCOL") {
+	case "auto":
+		t.forceKbd = false
+	case "":
+	default:
+		if p, ok := parseKeyboardProtocol(os.Getenv("TCELL_KEYBOARD_PROTOCOL")); ok {
+			t.forceKeyboardProtocol(p)
+		}
+	}
+
+	switch os.Getenv("TCELL_NEGOTIATE") {
+	case "auto":
+		t.negotiate = true
+	case "disable":
+		t.negotiate = false
+	}
+
+	t.mouseDisabled = os.Getenv("TCELL_MOUSE") == "disable"
+}
+
+func (t *tScreen) Init() error {
+	t.initFiniLock.Lock()
+	defer t.initFiniLock.Unlock()
+
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return errors.New("screen finalized")
+	}
+	if t.running {
+		t.Unlock()
+		return errors.New("already initialized")
+	}
+	t.Unlock()
+
+	if e := t.initialize(); e != nil {
+		return e
+	}
+
+	t.startTime = time.Now()
+	t.keyQ = make(chan []byte, 10)
+
+	t.charset = getCharset()
+	if enc := GetEncoding(t.charset); enc != nil {
+		t.encoder = enc.NewEncoder()
+		t.decoder = enc.NewDecoder()
+	} else {
+		return ErrNoCharset
+	}
+
+	// environment overrides
+	w := 80
+	h := 24
+	if i, _ := strconv.Atoi(os.Getenv("LINES")); i != 0 {
+		h = i
+	}
+	if i, _ := strconv.Atoi(os.Getenv("COLUMNS")); i != 0 {
+		w = i
+	}
+	if t.term == "" {
+		t.term = os.Getenv("TERM")
+	}
+	nterm := t.term
+
+	if t.ncolor == 0 && !t.noColor {
+		cterm := os.Getenv("COLORTERM")
+
+		// On Windows, enable 24-bit color by default (all terminals there are 24-bit capable)
+		if runtime.GOOS == "windows" {
+			t.truecolor = true
+			t.ncolor = 256
+		} else if slices.Contains([]string{"truecolor", "direct", "24bit"}, cterm) || strings.HasSuffix(nterm, "-direct") || strings.HasSuffix(nterm, "-truecolor") {
+			t.truecolor = true
+			t.ncolor = 256 // base 8-bit palette
+		} else if strings.HasSuffix(nterm, "-256color") || strings.Contains(cterm, "256") {
+			t.ncolor = 256
+		} else if strings.HasSuffix(nterm, "-88color") {
+			t.ncolor = 88
+		} else if strings.HasSuffix(nterm, "-16color") {
+			t.ncolor = 16
+		} else if strings.Contains(nterm, "color") || cterm != "" {
+			t.ncolor = 8
+		} else if strings.Contains(nterm, "mono") || strings.HasSuffix(nterm, "-m") { // monochrome variants
+			t.ncolor = 0
+		} else if strings.Contains(nterm, "ansi") || slices.Contains([]string{"dtterm", "xterm", "aixterm", "linux"}, nterm) {
+			t.ncolor = 8
+		} else if strings.HasPrefix(nterm, "vt") || nterm == "sun" {
+			// legacy DEC VT 100/220 etc. family.  (technically the VT525 can do ANSI, but they should set to ansi)
+			t.ncolor = 0
+		} else {
+			// best guess - this covers all the modern variants like ghostty,
+			t.ncolor = 256
+		}
+		if os.Getenv("NO_COLOR") != "" {
+			t.truecolor = false
+			t.ncolor = 0
+			t.noColor = true
+		}
+		// A user who wants to have his themes honored can set this environment variable.
+		if os.Getenv("TCELL_TRUECOLOR") == "disable" {
+			t.truecolor = false
+		}
+	}
+
+	if strings.HasPrefix(nterm, "vt") || strings.Contains(nterm, "ansi") || nterm == "linux" || nterm == "sun" || nterm == "sun-color" {
+		// these terminals are "legacy" and not expected to support most OSC functions
+		t.legacy = true
+	}
+
+	t.applyEnvironmentOverrides()
+
+	t.initted = false
+	t.quit = make(chan struct{})
+	t.initQ = make(chan Event, 32)
+	t.eventQ = make(chan Event, 128)
+	t.input = newInputParser(t.filterEvents())
+	t.input.advanced = t.advancedKeys
+	t.input.controlStringMax = t.controlStringLimit
+
+	t.Lock()
+	t.cx = -1
+	t.cy = -1
+	t.style = StyleDefault
+	t.cells.Resize(w, h)
+	t.cursorx = -1
+	t.cursory = -1
+	t.resize()
+	t.Unlock()
+
+	if err := t.engage(); err != nil {
+		return err
+	}
+
+	// clip to reasonable limits
+	nColors := min(t.ncolor, 256)
+	t.colors = make(map[color.Color]color.Color, nColors)
+	t.palette = make([]color.Color, nColors)
+	for i := range nColors {
+		t.palette[i] = color.PaletteColor(i)
+		// identity map for our builtin colors
+		t.colors[color.PaletteColor(i)] = color.PaletteColor(i)
+	}
+
+	return nil
+}
+
+func (t *tScreen) processInitQ() {
+	// NB: called with lock held
+	if t.initted {
+		return
+	}
+
+	expire := time.After(time.Second)
+
+	for {
+		select {
+		case <-expire:
+			t.initted = true
+			return
+		case ev := <-t.initQ:
+			switch ev := ev.(type) {
+			case *eventPrimaryAttributes:
+				if ev.Color && t.ncolor == 0 && !t.noColor {
+					t.ncolor = 8
+				}
+				if ev.Clipboard && t.setClipboard == "" {
+					t.setClipboard = setClipboard
+				}
+				t.hasClipboard = ev.Clipboard
+				t.initted = true
+				return
+			case *eventTermName:
+				// terminal specific overrides
+				t.termName = ev.Name
+				t.termVers = ev.Version
+				switch ev.Name {
+				case "iTerm2":
+					// Some terminals can use OSC 9.  Unfortunately we can only discover
+					// them using this means.  It appears that pretty much all of them
+					// except iTerm2 also support more standard OSC 777, and it seems like
+					// only Kitty has its OSC 99 thing, but it also does OSC 777 well.
+					t.notifyDesktop = notifyDesktop9
+				}
+			case *eventPrivateMode:
+				switch ev.Mode {
+				case vt.PmResizeReports:
+					t.inlineResize = ev.Status.Changeable()
+				case vt.PmMouseSgr:
+					t.haveMouseSgr = ev.Status.Changeable()
+				case vt.PmMouseButton:
+					t.haveMouse = ev.Status.Changeable()
+				case vt.PmWin32Input:
+					t.haveWin32Kbd = ev.Status.Changeable()
+				}
+			case *eventKittyKbdMode:
+				t.haveKittyKbd = true
+			case *eventXTermKbdMode:
+				t.haveXTermKbd = true
+			}
+		}
+	}
+}
+
+func (t *tScreen) filterEvents() chan Event {
+	inQ := make(chan Event, 128)
+	t.eventWg.Add(1)
+	go func() {
+		defer t.eventWg.Done()
+		for {
+			var ev Event
+			select {
+			case ev = <-inQ:
+			case <-t.quit:
+				return
+			}
+			switch ev.(type) {
+			case *eventTermName, *eventPrimaryAttributes, *eventPrivateMode, *eventKittyKbdMode, *eventXTermKbdMode:
+				select {
+				case t.initQ <- ev:
+				default:
+				}
+
+			default:
+				select {
+				case t.eventQ <- ev:
+				case <-t.quit:
+					return
+				}
+			}
+		}
+	}()
+	return inQ
+}
+
+func (t *tScreen) prepareExtendedOSC() {
+	if t.legacy {
+		return
+	}
+
+	// OSC 8 is for enter/exit URL.
+	t.enterUrl = "\x1b]8;%[2]s;%[1]s\x1b\\"
+	t.exitUrl = "\x1b]8;;\x1b\\"
+
+	// CSI .. t is for window operations.
+	t.setWinSize = "\x1b[8;%[2]d;%[1]dt"
+	t.saveTitle = "\x1b[22;2t"
+	t.restoreTitle = "\x1b[23;2t"
+	// this also tries to request that UTF-8 is allowed in the title
+	t.setTitle = "\x1b[>2t\x1b]2;%s\x1b\\"
+
+	// OSC 52 is for saving to the clipboard.
+	// this string takes a base64 string and sends it to the clipboard.
+	// it will also be able to retrieve the clipboard using "?" as the
+	// sent string, when we support that.
+	t.setClipboard = setClipboard
+
+	// OSC 777 is the desktop notification supported by a variety of
+	// newer terminals.  (There was also OSC 9 and OSC 99, but they
+	// are not as widely deployed, and OSC 9 is not unique.)
+	t.notifyDesktop = notifyDesktop777
+}
+
+func (t *tScreen) prepareCursorStyles() {
+	t.cursorStyles = map[CursorStyle]string{
+		CursorStyleDefault:           "\x1b[0 q",
+		CursorStyleBlinkingBlock:     "\x1b[1 q",
+		CursorStyleSteadyBlock:       "\x1b[2 q",
+		CursorStyleBlinkingUnderline: "\x1b[3 q",
+		CursorStyleSteadyUnderline:   "\x1b[4 q",
+		CursorStyleBlinkingBar:       "\x1b[5 q",
+		CursorStyleSteadyBar:         "\x1b[6 q",
+	}
+	if t.legacy {
+		return
+	}
+	if t.cursorRGB == "" {
+		t.cursorRGB = "\x1b]12;#%02x%02x%02x\007"
+		t.cursorFg = "\x1b]112\007"
+	}
+}
+
+func (t *tScreen) Fini() {
+	t.initFiniLock.Lock()
+	defer t.initFiniLock.Unlock()
+
+	// Ensure that enough time passes for terminals to  finish sending
+	// their initial response (gnome-terminal sends terminal dimensions
+	// asynchronously later than the response to primary DA for some reason.)
+	if time.Since(t.startTime) < 50*time.Millisecond {
+		time.Sleep(time.Millisecond * 50)
+	}
+	t.finiOnce.Do(t.finish)
+}
+
+func (t *tScreen) finish() {
+	t.Lock()
+	t.fini = true
+	t.Unlock()
+	close(t.quit)
+	t.finalize()
+}
+
+func (t *tScreen) SetStyle(style Style) {
+	t.Lock()
+	if !t.fini {
+		t.style = style
+	}
+	t.Unlock()
+}
+
+func (t *tScreen) encodeStr(s string) []byte {
+
+	var dstBuf [128]byte
+	var buf []byte
+	nb := dstBuf[:]
+	dst := 0
+	var err error
+	if enc := t.encoder; enc != nil {
+		enc.Reset()
+		dst, _, err = enc.Transform(nb, []byte(s), true)
+	}
+	if err != nil || dst == 0 || nb[0] == '\x1a' {
+		// Combining characters are elided
+		r, _ := utf8.DecodeRuneInString(s)
+		if len(buf) == 0 {
+			if acs, ok := t.acs[r]; ok {
+				buf = append(buf, []byte(acs)...)
+			} else if fb, ok := t.fallback[r]; ok {
+				buf = append(buf, []byte(fb)...)
+			} else {
+				buf = append(buf, '?')
+			}
+		}
+	} else {
+		buf = append(buf, nb[:dst]...)
+	}
+
+	return buf
+}
+
+// resolvePalette looks up a color to obtain the palette entry for it.
+func (t *tScreen) resolvePalette(c Color) Color {
+	if v, ok := t.colors[c]; ok {
+		return v
+	}
+	v := color.Find(c, t.palette)
+	t.colors[c] = v
+	return v
+}
+
+// sendFgBg sends the foreground and background.  It is assumed that sgr0
+// was already emitted prior to calling this (so colors are already in default).
+func (t *tScreen) sendFgBg(fg Color, bg Color, attr AttrMask) AttrMask {
+	if t.Colors() == 0 {
+		// foreground vs background, we calculate luminance
+		// and possibly do a reverse video
+		if !fg.Valid() {
+			return attr
+		}
+		v, ok := t.colors[fg]
+		if !ok {
+			v = color.Find(fg, []Color{ColorBlack, ColorWhite})
+			t.colors[fg] = v
+		}
+		switch v {
+		case ColorWhite:
+			return attr
+		case ColorBlack:
+			return attr ^ AttrReverse
+		}
+	}
+
+	if t.truecolor {
+		if fg.IsRGB() && bg.IsRGB() {
+			r1, g1, b1 := fg.RGB()
+			r2, g2, b2 := bg.RGB()
+			t.Printf(setFgBgRgb, r1, g1, b1, r2, g2, b2)
+			return attr
+		}
+
+		if fg.IsRGB() {
+			r, g, b := fg.RGB()
+			t.Printf(setFgRgb, r, g, b)
+			fg = ColorDefault
+		}
+
+		if bg.IsRGB() {
+			r, g, b := bg.RGB()
+			t.Printf(setBgRgb, r, g, b)
+			bg = ColorDefault
+		}
+	}
+
+	if fg.Valid() {
+		fg = t.resolvePalette(fg)
+		fgc := fg & 0xffffff
+		if fgc < 8 {
+			t.Printf(setFg8, fgc)
+		} else if fgc < 256 {
+			t.Printf(setFg256, fgc)
+		}
+	}
+
+	if bg.Valid() {
+		bg = t.resolvePalette(bg)
+		bgc := bg & 0xffffff
+		if bgc < 8 {
+			t.Printf(setBg8, bgc)
+		} else if bgc < 256 {
+			t.Printf(setBg256, bgc)
+		}
+	}
+
+	return attr
+}
+
+// emitAttrs dumps prints the attributes, aside from underline that is special
+// The assumption is that sgr0 was already printed ahead of this.
+func (t *tScreen) emitAttrs(attrs AttrMask) {
+
+	if attrs&AttrBold != 0 {
+		t.Print(bold)
+	}
+	if attrs&AttrReverse != 0 {
+		t.Print(reverse)
+	}
+	if attrs&AttrBlink != 0 {
+		t.Print(blink)
+	}
+	if attrs&AttrDim != 0 {
+		t.Print(dim)
+	}
+	if attrs&AttrItalic != 0 {
+		t.Print(italic)
+	}
+	if attrs&AttrStrikeThrough != 0 {
+		t.Print(strikeThrough)
+	}
+}
+
+// emitUl dumps prints the underline, which may be colored.
+// The assumption is that sgr0 was already printed ahead of this.
+func (t *tScreen) emitUnderline(us UnderlineStyle, uc Color) {
+	if us != UnderlineStyleNone {
+		if t.legacy {
+			t.Print(underline)
+			return
+		}
+		// NB: under color should have been reset by sgr0
+		if uc.IsRGB() {
+			r, g, b := uc.RGB()
+			uc = t.resolvePalette(uc)
+			t.Printf(underColor, uc&0xff)
+			t.Printf(underRGB, r, g, b)
+		} else if uc.Valid() {
+			t.Printf(underColor, uc&0xff)
+		}
+
+		t.Print(underline) // to ensure everyone gets at least a basic underline
+		switch us {
+		case UnderlineStyleDouble:
+			t.Print(doubleUnder)
+		case UnderlineStyleCurly:
+			t.Print(curlyUnder)
+		case UnderlineStyleDotted:
+			t.Print(dottedUnder)
+		case UnderlineStyleDashed:
+			t.Print(dashedUnder)
+		}
+	}
+}
+
+// emitUrl either emits a url (OSC 8), or if the string is empty
+// then the OSC 8 to exit the URL.  It should only be called if we
+// either have a new URL, or need to exit an old one, as it always emits
+// the OSC 8 sequence (if OSC 8 is supported).
+func (t *tScreen) emitUrl(u urlInfo) {
+	if t.enterUrl != "" {
+		if u.url != "" {
+			t.Printf(t.enterUrl, u.url, u.id)
+		} else {
+			t.Print(t.exitUrl)
+		}
+	}
+}
+
+// urlNeedsEmission reports whether a hyperlink transition has any wire effect.
+// Url ids can be staged before the Url itself, and id-only transitions have no
+// OSC 8 representation of their own.
+func urlNeedsEmission(oldUrl, newUrl urlInfo) bool {
+	return oldUrl != newUrl && (oldUrl.url != "" || newUrl.url != "")
+}
+
+func (t *tScreen) drawCell(x, y int) int {
+
+	str, style, width := t.cells.Get(x, y)
+	if !t.cells.Dirty(x, y) {
+		return width
+	}
+
+	if t.cy != y || t.cx != x {
+		t.Printf(setCursorPosition, y+1, x+1)
+		t.cx = x
+		t.cy = y
+	}
+
+	if style == StyleDefault {
+		style = t.style
+	}
+	if style != t.curstyle {
+		fg, bg, attrs := style.fg, style.bg, style.attrs
+
+		t.Print(sgr0)
+
+		attrs = t.sendFgBg(fg, bg, attrs)
+		t.emitAttrs(attrs)
+		t.emitUnderline(style.ulStyle, style.ulColor)
+
+		var newUrl urlInfo
+		var oldUrl urlInfo
+		if t.curstyle.url != nil {
+			oldUrl = *t.curstyle.url
+		}
+		if style.url != nil {
+			newUrl = *style.url
+		}
+		// URL string can be long, so don't send it unless we really need to.
+		if urlNeedsEmission(oldUrl, newUrl) {
+			t.emitUrl(newUrl)
+		}
+
+		t.curstyle = style
+	}
+
+	// now emit runes - taking care to not overrun width with a
+	// wide character, and to ensure that we emit exactly one regular
+	// character followed up by any residual combing characters
+
+	if width < 1 {
+		width = 1
+	}
+
+	buf := t.encodeStr(str)
+	str = string(buf)
+
+	if width > 1 && str == "?" {
+		// No FullWidth character support
+		str = "? "
+		t.cx = -1
+	}
+
+	if x > t.w-width {
+		// too wide to fit; emit a single space instead
+		width = 1
+		str = " "
+	}
+	if width > 1 && x+width < t.w {
+		// Clobber over any content in the next cell.
+		// This fixes a problem with some terminals where overwriting two
+		// adjacent single cells with a wide rune would leave an image
+		// of the second cell.  This is a workaround for buggy terminals.
+		t.Print("  \b\b")
+	}
+	t.Print(str)
+	t.cx += width
+	t.cells.SetDirty(x, y, false)
+	if width > 1 && len([]rune(str)) > 1 {
+		t.cx = -1
+	}
+
+	return width
+}
+
+func (t *tScreen) ShowCursor(x, y int) {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.cursorx = x
+	t.cursory = y
+	t.Unlock()
+}
+
+func (t *tScreen) SetCursor(cs CursorStyle, cc Color) {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.cursorStyle = cs
+	t.cursorColor = cc
+	t.Unlock()
+}
+
+func (t *tScreen) HideCursor() {
+	t.ShowCursor(-1, -1)
+}
+
+func (t *tScreen) showCursor() {
+
+	x, y := t.cursorx, t.cursory
+	w, h := t.cells.Size()
+	if x < 0 || y < 0 || x >= w || y >= h {
+		t.hideCursor()
+		return
+	}
+	t.Printf(setCursorPosition, y+1, x+1)
+	t.Print(vt.PmShowCursor.Enable())
+	if t.cursorStyles != nil {
+		if esc, ok := t.cursorStyles[t.cursorStyle]; ok {
+			t.Print(esc)
+		}
+	}
+	if t.cursorRGB != "" {
+		if t.cursorColor == ColorReset {
+			t.Print(t.cursorFg)
+		} else if t.cursorColor.Valid() {
+			r, g, b := t.cursorColor.RGB()
+			t.Printf(t.cursorRGB, r, g, b)
+		}
+	}
+	t.cx = x
+	t.cy = y
+}
+
+func (t *tScreen) Write(b []byte) (int, error) {
+	if t.buffering {
+		return t.buf.Write(b)
+	}
+	return t.tty.Write(b)
+}
+
+func (t *tScreen) Print(s string) {
+	_, _ = io.WriteString(t, s)
+}
+
+func (t *tScreen) Printf(f string, args ...any) {
+	_, _ = fmt.Fprintf(t, f, args...)
+}
+
+func (t *tScreen) Show() {
+	t.Lock()
+	if !t.fini {
+		t.resize()
+		t.draw()
+	}
+	t.Unlock()
+}
+
+func (t *tScreen) clearScreen() {
+	t.Print(sgr0)
+	t.Print(t.exitUrl)
+	_ = t.sendFgBg(t.style.fg, t.style.bg, AttrNone)
+
+	t.Print(clear)
+
+	t.cls = false
+}
+
+func (t *tScreen) startBuffering() {
+	t.Print(vt.PmSyncOutput.Enable())
+}
+
+func (t *tScreen) endBuffering() {
+	t.Print(vt.PmSyncOutput.Disable())
+}
+
+func (t *tScreen) hideCursor() {
+	// just in case we cannot hide it, move it to the end
+	t.cx, t.cy = t.cells.Size()
+	t.Printf(setCursorPosition, t.cy+1, t.cx+1)
+	// then hide it
+	t.Print(vt.PmShowCursor.Disable())
+}
+
+func (t *tScreen) draw() {
+	if !t.running {
+		// While disengaged (e.g. suspended) the terminal belongs to some
+		// other application, so we must not emit anything; also the cell
+		// buffer is released, so there is nothing valid to draw from.
+		return
+	}
+
+	// clobber cursor position, because we're going to change it all
+	t.cx = -1
+	t.cy = -1
+	// make no style assumptions
+	t.curstyle = styleInvalid
+
+	t.buf.Reset()
+	t.buffering = true
+	t.startBuffering()
+	defer func() {
+		t.buffering = false
+		t.endBuffering()
+	}()
+
+	// hide the cursor while we move stuff around
+	t.hideCursor()
+
+	if t.cls {
+		t.clearScreen()
+	}
+
+	for y := 0; y < t.h; y++ {
+		for x := 0; x < t.w; x++ {
+			width := t.drawCell(x, y)
+			if width > 1 {
+				if x+1 < t.w {
+					// this is necessary so that if we ever
+					// go back to drawing that cell, we
+					// actually will *draw* it.
+					t.cells.SetDirty(x+1, y, true)
+				}
+			} else if width < 1 {
+				// drawCell reports width 0 for coordinates outside the
+				// cell buffer; never let the scan stall
+				width = 1
+			}
+			x += width - 1
+		}
+	}
+
+	if t.curstyle.url != nil && t.curstyle.url.url != "" {
+		t.emitUrl(urlInfo{})
+	}
+
+	// restore the cursor
+	t.showCursor()
+
+	_, _ = t.buf.WriteTo(t.tty)
+}
+
+func (t *tScreen) EnableMouse(flags ...MouseFlags) {
+	var f MouseFlags
+	flagsPresent := false
+	for _, flag := range flags {
+		f |= flag
+		flagsPresent = true
+	}
+	if !flagsPresent {
+		f = MouseMotionEvents | MouseDragEvents | MouseButtonEvents
+	}
+
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.mouseFlags = f
+	t.enableMouse(f)
+	t.Unlock()
+}
+
+func (t *tScreen) enableMouse(f MouseFlags) {
+	// Rather than using terminfo to find mouse escape sequences, we rely on the fact that
+	// pretty much *every* terminal that supports mouse tracking follows the
+	// XTerm standards (the modern ones).  It is expected that all terminals understand
+	// the same DEC private modes.  Note that the SGR mode is required for the mouse sequences
+	// to be understood.
+
+	// We rely on dec private mode queries for this.
+	// If your terminal doesn't support these, then ask them to fix it.
+	// Note that as of macOS 26, macOS Terminal does not support them,
+	// so we enable the mouse unconditionally unless we get a report
+	// that says we have mouse, but not SGR mouse.  This is suboptimal, but
+	// a concession forced by the sorry state of terminal emulators.
+	if t.compat.mouseUnsupported {
+		return
+	}
+	if t.mouseDisabled {
+		f = 0
+	}
+	if f != 0 && t.haveMouse && !t.haveMouseSgr {
+		return
+	}
+
+	// start by disabling all tracking.
+	t.Print(vt.PmMouseButton.Disable())
+	t.Print(vt.PmMouseDrag.Disable())
+	t.Print(vt.PmMouseMotion.Disable())
+	t.Print(vt.PmMouseSgr.Disable())
+	t.Print(vt.PmMouseSgrPixel.Disable())
+
+	pixel := f&MousePixelEvents != 0
+	t.input.SetPixelMouse(pixel)
+
+	if f&(MouseButtonEvents|MouseDragEvents|MouseMotionEvents) != 0 {
+		t.Print(vt.PmMouseButton.Enable())
+	}
+	if f&MouseDragEvents != 0 {
+		t.Print(vt.PmMouseDrag.Enable())
+	}
+	if f&MouseMotionEvents != 0 {
+		t.Print(vt.PmMouseMotion.Enable())
+	}
+	if f&(MouseButtonEvents|MouseDragEvents|MouseMotionEvents) != 0 {
+		if pixel {
+			t.Print(vt.PmMouseSgrPixel.Enable())
+		} else {
+			t.Print(vt.PmMouseSgr.Enable())
+		}
+	}
+}
+
+func (t *tScreen) DisableMouse() {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.mouseFlags = 0
+	t.enableMouse(0)
+	t.Unlock()
+}
+
+func (t *tScreen) EnablePaste() {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.pasteEnabled = true
+	t.enablePasting(true)
+	t.Unlock()
+}
+
+func (t *tScreen) DisablePaste() {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.pasteEnabled = false
+	t.enablePasting(false)
+	t.Unlock()
+}
+
+func (t *tScreen) enablePasting(on bool) {
+	var s string
+	if on {
+		s = vt.PmBracketedPaste.Enable()
+	} else {
+		s = vt.PmBracketedPaste.Disable()
+	}
+	if s != "" {
+		t.Print(s)
+	}
+}
+
+func (t *tScreen) EnableFocus() {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.focusEnabled = true
+	t.enableFocusReporting()
+	t.Unlock()
+}
+
+func (t *tScreen) DisableFocus() {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.focusEnabled = false
+	t.disableFocusReporting()
+	t.Unlock()
+}
+
+func (t *tScreen) enableFocusReporting() {
+	if t.compat.focusUnsupported {
+		return
+	}
+	t.Print(vt.PmFocusReports.Enable())
+}
+
+func (t *tScreen) disableFocusReporting() {
+	if t.compat.focusUnsupported {
+		return
+	}
+	t.Print(vt.PmFocusReports.Disable())
+}
+
+func (t *tScreen) Size() (int, int) {
+	t.Lock()
+	w, h := t.w, t.h
+	t.Unlock()
+	return w, h
+}
+
+func (t *tScreen) resize() {
+	ws, err := t.tty.WindowSize()
+	if err != nil {
+		return
+	}
+	if ws.Width == t.w && ws.Height == t.h {
+		return
+	}
+	t.cx = -1
+	t.cy = -1
+
+	t.cells.Resize(ws.Width, ws.Height)
+	t.cells.Invalidate()
+	t.h = ws.Height
+	t.w = ws.Width
+	t.input.SetSize(ws.Width, ws.Height)
+}
+
+func (t *tScreen) Colors() int {
+	// this doesn't change, no need for lock
+	if t.truecolor {
+		return 1 << 24
+	}
+	return t.ncolor
+}
+
+// vtACSNames is a map of bytes defined by terminfo that are used in
+// the terminals Alternate Character Set to represent other glyphs.
+// For example, the upper left corner of the box drawing set can be
+// displayed by printing "l" while in the alternate character set.
+// It's not quite that simple, since the "l" is the terminfo name,
+// and it may be necessary to use a different character based on
+// the terminal implementation (or the terminal may lack support for
+// this altogether).  These values are from the DEC VT100, and all
+// modern terminal emulators support this as charset 0.
+var vtACSNames = map[byte]rune{
+	'`': RuneDiamond,
+	'a': RuneCkBoard,
+	'f': RuneDegree,
+	'g': RunePlMinus,
+	'h': RuneBoard,
+	'i': RuneLantern,
+	'j': RuneLRCorner,
+	'k': RuneURCorner,
+	'l': RuneULCorner,
+	'm': RuneLLCorner,
+	'n': RunePlus,
+	'o': RuneS1,
+	'p': RuneS3,
+	'q': RuneHLine,
+	'r': RuneS7,
+	's': RuneS9,
+	't': RuneLTee,
+	'u': RuneRTee,
+	'v': RuneBTee,
+	'w': RuneTTee,
+	'x': RuneVLine,
+	'y': RuneLEqual,
+	'z': RuneGEqual,
+	'{': RunePi,
+	'|': RuneNEqual,
+	'}': RuneSterling,
+	'~': RuneBullet,
+}
+
+// buildAcsMap builds a map of characters that we translate from Unicode to
+// alternate character encodings.  To do this, we use the standard VT100 ACS
+// maps.  This is only done if the terminal lacks support for Unicode; we
+// always prefer to emit Unicode glyphs when we are able.
+func (t *tScreen) buildAcsMap() {
+	const acsstr = "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~"
+
+	t.acs = make(map[rune]string)
+	for b, r := range vtACSNames {
+		t.acs[r] = startAltChars + string(b) + endAltChars
+	}
+}
+
+func (t *tScreen) scanInput(buf *bytes.Buffer) {
+	// The end of the buffer isn't necessarily the end of the input, because
+	// large inputs are chunked. Set atEOF to false so the UTF-8 validating decoder
+	// returns ErrShortSrc instead of ErrInvalidUTF8 for incomplete multi-byte codepoints.
+	const atEOF = false
+
+	for buf.Len() > 0 {
+		utf := make([]byte, min(8, max(buf.Len()*2, 128)))
+		nOut, nIn, e := t.decoder.Transform(utf, buf.Bytes(), atEOF)
+		_ = buf.Next(nIn)
+		t.input.ScanUTF8(utf[:nOut])
+		if e == transform.ErrShortSrc {
+			return
+		}
+	}
+}
+
+func (t *tScreen) mainLoop(stopQ chan struct{}) {
+	defer t.wg.Done()
+	buf := &bytes.Buffer{}
+	var ta <-chan time.Time
+	for {
+		select {
+		case <-stopQ:
+			return
+		case <-t.quit:
+			return
+		case <-t.resizeQ:
+			go func() {
+				t.Lock()
+				t.cx = -1
+				t.cy = -1
+				t.resize()
+				t.cells.Invalidate()
+				t.draw()
+				t.Unlock()
+			}()
+			continue
+		case chunk := <-t.keyQ:
+			buf.Write(chunk)
+			t.scanInput(buf)
+			if timeout := t.input.WaitDuration(); timeout > 0 {
+				ta = time.After(timeout)
+			} else {
+				ta = nil
+			}
+		case <-ta:
+			t.input.Scan()
+			if timeout := t.input.WaitDuration(); timeout > 0 {
+				ta = time.After(timeout)
+			} else {
+				ta = nil
+			}
+		}
+	}
+}
+
+func (t *tScreen) inputLoop(stopQ chan struct{}) {
+
+	defer t.wg.Done()
+	for {
+		select {
+		case <-stopQ:
+			return
+		default:
+		}
+		chunk := make([]byte, 128)
+		n, e := t.tty.Read(chunk)
+		switch e {
+		case nil:
+		default:
+			t.Lock()
+			running := t.running
+			t.Unlock()
+			if running {
+				select {
+				case t.eventQ <- NewEventError(e):
+				case <-t.quit:
+				}
+			}
+			return
+		}
+		if n > 0 {
+			select {
+			case t.keyQ <- chunk[:n]:
+			case <-t.quit:
+				return
+			}
+		}
+	}
+}
+
+func (t *tScreen) Sync() {
+	t.Lock()
+	t.cx = -1
+	t.cy = -1
+	if !t.fini {
+		t.resize()
+		t.cls = true
+		t.cells.Invalidate()
+		t.draw()
+	}
+	t.Unlock()
+}
+
+func (t *tScreen) CharacterSet() string {
+	return t.charset
+}
+
+func (t *tScreen) RegisterRuneFallback(orig rune, fallback string) {
+	t.Lock()
+	t.fallback[orig] = fallback
+	t.Unlock()
+}
+
+func (t *tScreen) UnregisterRuneFallback(orig rune) {
+	t.Lock()
+	delete(t.fallback, orig)
+	t.Unlock()
+}
+
+func (t *tScreen) SetSize(w, h int) {
+	t.Lock()
+	defer t.Unlock()
+	if t.fini {
+		return
+	}
+	if t.setWinSize != "" {
+		t.Printf(t.setWinSize, w, h)
+	}
+	t.cells.Invalidate()
+	t.resize()
+}
+
+func (t *tScreen) Resize(int, int, int, int) {}
+
+func (t *tScreen) Suspend() error {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return nil
+	}
+	finish := t.disengageStart()
+	t.Unlock()
+	if finish {
+		t.disengageFinish()
+	}
+	return nil
+}
+
+func (t *tScreen) Resume() error {
+	t.Lock()
+	defer t.Unlock()
+	if t.fini {
+		return nil
+	}
+	return t.engageLocked()
+}
+
+func (t *tScreen) Tty() (Tty, bool) {
+	return t.tty, true
+}
+
+func isSTTerminal(term string) bool {
+	return term == "st" || strings.HasPrefix(term, "st-")
+}
+
+func (t *tScreen) applyKnownTerminalProfile(goos, term, termProgram string) bool {
+	if isSTTerminal(term) {
+		// st implements a small subset of xterm extensions.  In particular,
+		// it has neither an advanced keyboard protocol nor SGR mouse or focus
+		// reporting.  It also reports unsupported CSI and OSC sequences to
+		// stderr, so avoid probing or using extensions it does not implement.
+		t.legacy = true
+		t.compat.mouseUnsupported = true
+		t.compat.focusUnsupported = true
+		t.enterUrl = ""
+		t.exitUrl = ""
+		t.setWinSize = ""
+		t.saveTitle = ""
+		t.restoreTitle = ""
+		t.setTitle = "\x1b]2;%s\x1b\\"
+		t.notifyDesktop = ""
+		t.compat.clipboardReadUnsupported = true
+		t.termName = "st"
+		return true
+	}
+
+	switch termProgram {
+	case "Apple_Terminal":
+		// macOS Terminal.app cannot handle the startup queries, but it does
+		// support modern mouse reporting.
+		t.haveMouse = true
+		t.haveMouseSgr = true
+		t.termName = "Terminal.app"
+		t.termVers = os.Getenv("TERM_PROGRAM_VERSION")
+		return true
+	case "WezTerm":
+		// The WezTerm keyboard protocol to use is in theory driven by its
+		// own configuration, but we have found this unreliable because it
+		// does not mask unsupported capabilities.  Furthermore, on Windows
+		// builds the kitty protocol implementation is broken, while on other
+		// builds win32-input-mode is broken.  This is a best effort to make
+		// WezTerm work reasonably; our stronger advice is to choose another
+		// terminal program altogether.  This workaround will probably not
+		// apply to ssh sessions, as TERM_PROGRAM is not normally propagated.
+		if goos == "windows" {
+			t.haveWin32Kbd = true
+		} else {
+			t.haveKittyKbd = true
+			t.haveWin32Kbd = false
+		}
+		t.haveMouse = true
+		t.haveMouseSgr = true
+		t.initted = true
+		t.termName = "WezTerm"
+		t.termVers = os.Getenv("TERM_PROGRAM_VERSION")
+		return true
+	}
+	return false
+}
+
+func useVTWindowSizeQuery(goos string) bool {
+	return goos != "windows"
+}
+
+func useXTermKeyboardQuery(goos string) bool {
+	return goos != "windows"
+}
+
+// engage is used to place the terminal in raw mode and establish screen size, etc.
+// Think of this is as tcell "engaging" the clutch, as it's going to be driving the
+// terminal interface.
+func (t *tScreen) engage() error {
+	t.Lock()
+	defer t.Unlock()
+	return t.engageLocked()
+}
+
+// engageLocked is engage's implementation when t's lock is already held.
+func (t *tScreen) engageLocked() error {
+	if t.tty == nil {
+		return ErrNoScreen
+	}
+	if t.running {
+		return errors.New("already engaged")
+	}
+	if err := t.tty.Start(); err != nil {
+		return err
+	}
+
+	stopQ := make(chan struct{})
+	t.stopQ = stopQ
+	t.wg.Add(2)
+	go t.inputLoop(stopQ)
+	go t.mainLoop(stopQ)
+
+	if !t.initted {
+		// macOS Terminal.app is brain damaged
+		// https://garrett.damore.org/2025/12/macos-terminal-still-missing-mark-apple.html
+		// Eventually they'll hopefully fix this.  As the environment variable
+		// does not convey by default via ssh, remote sessions might see spurious characters
+		// emitted during startup.  See the blog post for alternatives.
+		if !t.applyKnownTerminalProfile(runtime.GOOS, t.term, os.Getenv("TERM_PROGRAM")) && t.negotiate {
+			if useVTWindowSizeQuery(runtime.GOOS) {
+				t.Print(requestWindowSize)
+			}
+			t.Print(vt.PmResizeReports.Query())
+			t.Print(vt.PmMouseButton.Query())
+			t.Print(vt.PmMouseSgr.Query())
+			if !t.forceKbd {
+				t.Print(vt.PmWin32Input.Query())
+				t.Print(queryKittyKbd)
+				if useXTermKeyboardQuery(runtime.GOOS) {
+					// XTerm's modifyOtherKeys mode is mainly useful for XTerm
+					// itself, and we do not use it on Windows.
+					t.Print(queryXTermKbd)
+				}
+			}
+			t.Print(requestExtAttr)
+		}
+		if !t.negotiate {
+			t.initted = true
+		} else if !t.initted {
+			t.Print(requestPrimaryDA) // NB: MUST BE LAST
+		}
+	}
+	t.processInitQ()
+	t.applyKeyboardProtocolOverride()
+	t.input.SetKeyboardProtocol(t.keyboardProtocol())
+	if t.useAltScreen() {
+		// Technically this may not be right, but every terminal we know about
+		// (even Wyse 60) uses this to enter the alternate screen buffer, and
+		// possibly save and restore the window title and/or icon.
+		// (In theory there could be terminals that don't support X,Y cursor
+		// positions without a setup command, but we don't support them.)
+		t.Print(enterCA)
+		t.Print(t.saveTitle)
+	}
+	if t.haveWin32Kbd {
+		t.Print(vt.PmWin32Input.Enable())
+	} else if t.haveKittyKbd {
+		if t.advancedKeys {
+			t.Print(enableKittyKbdAdv)
+		} else {
+			t.Print(enableKittyKbd)
+		}
+	} else if t.haveXTermKbd {
+		t.Print(enableXTermKbd)
+	}
+
+	t.running = true
+	if ws, err := t.tty.WindowSize(); err == nil && ws.Width != 0 && ws.Height != 0 {
+		t.cells.Resize(ws.Width, ws.Height)
+	}
+	t.enableMouse(t.mouseFlags)
+	t.enablePasting(t.pasteEnabled)
+	if t.focusEnabled {
+		t.enableFocusReporting()
+	}
+	t.Print(enterKeypad)
+	t.Print(enableAltChars)
+	t.Print(vt.PmShowCursor.Disable())
+	t.Print(vt.PmAutoMargin.Disable())
+	t.Print(clear)
+	if t.title != "" && t.setTitle != "" {
+		t.Printf(t.setTitle, t.title)
+	}
+	if t.negotiate && !t.legacy && useVTWindowSizeQuery(runtime.GOOS) {
+		t.Print(requestWindowSize)
+	}
+
+	if t.inlineResize {
+		t.Print(vt.PmResizeReports.Enable())
+	} else {
+		t.tty.NotifyResize(t.resizeQ)
+	}
+	return nil
+}
+
+// disengage is used to release the terminal back to support from the caller.
+// Think of this as tcell disengaging the clutch, so that another application
+// can take over the terminal interface.  This restores the TTY mode that was
+// present when the application was first started.
+func (t *tScreen) disengage() {
+	t.Lock()
+	finish := t.disengageStart()
+	t.Unlock()
+	if finish {
+		t.disengageFinish()
+	}
+}
+
+// disengageStart begins a disengage operation while t's lock is already held.
+// It returns true when disengageFinish must be called after releasing the lock.
+func (t *tScreen) disengageStart() bool {
+	if !t.running {
+		return false
+	}
+
+	t.running = false
+	if t.inlineResize {
+		t.Print(vt.PmResizeReports.Disable())
+	} else {
+		t.tty.NotifyResize(nil)
+	}
+	stopQ := t.stopQ
+	close(stopQ)
+	_ = t.tty.Drain()
+	return true
+}
+
+// disengageFinish completes a disengage operation after disengageStart has
+// released the running loops.
+func (t *tScreen) disengageFinish() {
+	// wait for everything to shut down
+	t.wg.Wait()
+
+	// shutdown the screen and disable special modes (e.g. mouse and bracketed paste)
+	t.cells.Resize(0, 0)
+	t.Print(vt.PmShowCursor.Enable())
+	if t.cursorStyles != nil && t.cursorStyle != CursorStyleDefault {
+		t.Print(t.cursorStyles[CursorStyleDefault])
+	}
+	if t.cursorFg != "" && t.cursorColor.Valid() {
+		t.Print(t.cursorFg)
+	}
+	t.Print(exitKeypad)
+	t.Print(sgr0)
+	t.Print(vt.PmAutoMargin.Enable())
+	if t.haveWin32Kbd {
+		t.Print(vt.PmWin32Input.Disable())
+	}
+	if t.haveKittyKbd {
+		t.Print(disableKittyKbd)
+	}
+	if t.haveXTermKbd {
+		t.Print(disableXTermKbd)
+	}
+
+	// Hack for Windows.
+	if runtime.GOOS == "windows" {
+		t.Print(vt.PmWin32Input.Disable())
+	}
+
+	// t.Print(t.disableCsiU)
+	if t.useAltScreen() {
+		t.Print(t.restoreTitle)
+		t.Print(clear)
+		t.Print(exitCA)
+	}
+	t.enableMouse(0)
+	t.enablePasting(false)
+	t.disableFocusReporting()
+
+	_ = t.tty.Stop()
+}
+
+// Beep emits a beep to the terminal.
+func (t *tScreen) Beep() error {
+	t.Lock()
+	defer t.Unlock()
+	if t.fini {
+		return nil
+	}
+	t.Print(string(byte(7)))
+	return nil
+}
+
+// finalize is used to at application shutdown, and restores the terminal
+// to it's initial state.  It should not be called more than once.
+func (t *tScreen) finalize() {
+	t.disengage()
+	_ = t.tty.Close()
+	t.eventWg.Wait()
+	close(t.eventQ)
+}
+
+func (t *tScreen) StopQ() <-chan struct{} {
+	return t.quit
+}
+
+func (t *tScreen) EventQ() chan Event {
+	return t.eventQ
+}
+
+func (t *tScreen) GetCells() *CellBuffer {
+	return &t.cells
+}
+
+func (t *tScreen) SetTitle(title string) {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.title = stripOSCControlsIfNeeded(title)
+	if t.setTitle != "" && t.running {
+		t.Printf(t.setTitle, t.title)
+	}
+	t.Unlock()
+}
+
+func (t *tScreen) SetClipboard(data []byte) {
+	// Post binary data to the system clipboard.  It might be UTF-8, it might not be.
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	if t.setClipboard != "" {
+		encoded := base64.StdEncoding.EncodeToString(data)
+		t.Printf(t.setClipboard, encoded)
+	}
+	t.Unlock()
+}
+
+func (t *tScreen) GetClipboard() {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	if !t.compat.clipboardReadUnsupported && t.setClipboard != "" {
+		t.Printf(t.setClipboard, "?")
+	}
+	t.Unlock()
+}
+
+func (t *tScreen) HasClipboard() bool {
+	return t.hasClipboard
+}
+
+func (t *tScreen) ShowNotification(title string, body string) {
+	t.Lock()
+	if t.fini {
+		t.Unlock()
+		return
+	}
+	t.Printf(t.notifyDesktop, stripOSCControlsIfNeeded(title), stripOSCControlsIfNeeded(body))
+	t.Unlock()
+}
+
+func (t *tScreen) Terminal() (string, string) {
+	t.Lock()
+	defer t.Unlock()
+	return t.termName, t.termVers
+}
+
+func (t *tScreen) KeyboardProtocol() KeyProtocol {
+	t.Lock()
+	defer t.Unlock()
+	return t.keyboardProtocol()
+}
+
+// keyboardProtocol reports the selected keyboard protocol while t is locked.
+func (t *tScreen) keyboardProtocol() KeyProtocol {
+	if t.haveWin32Kbd {
+		return Win32Keyboard
+	}
+	if t.haveKittyKbd {
+		return KittyKeyboard
+	}
+	if t.haveXTermKbd {
+		return XTermKeyboard
+	}
+	return LegacyKeyboard
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen_plan9.go b/vendor/github.com/gdamore/tcell/v3/tscreen_plan9.go
similarity index 72%
rename from vendor/github.com/gdamore/tcell/v2/tscreen_plan9.go
rename to vendor/github.com/gdamore/tcell/v3/tscreen_plan9.go
index fdd55b8c8..1b165f74b 100644
--- a/vendor/github.com/gdamore/tcell/v2/tscreen_plan9.go
+++ b/vendor/github.com/gdamore/tcell/v3/tscreen_plan9.go
@@ -4,8 +4,8 @@
 // Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -17,14 +17,8 @@
 
 package tcell
 
-import "os"
-
 // initialize on Plan 9: if no TTY was provided, use the Plan 9 TTY.
 func (t *tScreen) initialize() error {
-    if os.Getenv("TERM") == "" {
-        // TERM should be "vt100" in a vt(1) window; color/mouse support will be limited.
-        _ = os.Setenv("TERM", "vt100")
-    }
 	if t.tty == nil {
 		tty, err := NewDevTty()
 		if err != nil {
diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen_unix.go b/vendor/github.com/gdamore/tcell/v3/tscreen_unix.go
similarity index 84%
rename from vendor/github.com/gdamore/tcell/v2/tscreen_unix.go
rename to vendor/github.com/gdamore/tcell/v3/tscreen_unix.go
index 27f4c8134..a1082e459 100644
--- a/vendor/github.com/gdamore/tcell/v2/tscreen_unix.go
+++ b/vendor/github.com/gdamore/tcell/v3/tscreen_unix.go
@@ -1,8 +1,8 @@
 // Copyright 2024 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -17,11 +17,6 @@
 
 package tcell
 
-import (
-	// import the stock terminals
-	_ "github.com/gdamore/tcell/v2/terminfo/base"
-)
-
 // initialize is used at application startup, and sets up the initial values
 // including file descriptors used for terminals and saving the initial state
 // so that it can be restored when the application terminates.
diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen_win.go b/vendor/github.com/gdamore/tcell/v3/tscreen_win.go
similarity index 78%
rename from vendor/github.com/gdamore/tcell/v2/tscreen_win.go
rename to vendor/github.com/gdamore/tcell/v3/tscreen_win.go
index f2f9e2431..c0248992c 100644
--- a/vendor/github.com/gdamore/tcell/v2/tscreen_win.go
+++ b/vendor/github.com/gdamore/tcell/v3/tscreen_win.go
@@ -1,8 +1,8 @@
 // Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -17,11 +17,6 @@
 
 package tcell
 
-import (
-	// import the stock terminals
-	_ "github.com/gdamore/tcell/v2/terminfo/base"
-)
-
 // initialize is used at application startup, and sets up the initial values
 // including file descriptors used for terminals and saving the initial state
 // so that it can be restored when the application terminates.
@@ -35,7 +30,3 @@ func (t *tScreen) initialize() error {
 	}
 	return nil
 }
-
-func init() {
-	defaultTerm = "xterm-truecolor"
-}
diff --git a/vendor/github.com/gdamore/tcell/v3/tty.go b/vendor/github.com/gdamore/tcell/v3/tty.go
new file mode 100644
index 000000000..15813ac41
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/tty.go
@@ -0,0 +1,34 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tcell
+
+import "github.com/gdamore/tcell/v3/tty"
+
+type Tty = tty.Tty
+
+// NewDevTty obtains a default tty from the console or TTY (e.g. /dev/tty) for the process.
+func NewDevTty() (Tty, error) {
+	return tty.NewDevTty()
+}
+
+// NewDevTtyFromDev obtains a tty from the given device path. Not supported on Windows.
+func NewDevTtyFromDev(dev string) (Tty, error) {
+	return tty.NewDevTtyFromDev(dev)
+}
+
+// NewStdIoTty obtains a tty from stdin and stdout.
+func NewStdIoTty() (Tty, error) {
+	return tty.NewStdIoTty()
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/nonblock_bsd.go b/vendor/github.com/gdamore/tcell/v3/tty/nonblock_bsd.go
similarity index 73%
rename from vendor/github.com/gdamore/tcell/v2/nonblock_bsd.go
rename to vendor/github.com/gdamore/tcell/v3/tty/nonblock_bsd.go
index 622888e31..48fd23a1c 100644
--- a/vendor/github.com/gdamore/tcell/v2/nonblock_bsd.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/nonblock_bsd.go
@@ -1,8 +1,8 @@
 // Copyright 2021 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,7 +15,7 @@
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
 // +build darwin dragonfly freebsd netbsd openbsd
 
-package tcell
+package tty
 
 import (
 	"syscall"
@@ -41,3 +41,10 @@ func tcSetBufParams(fd int, vMin uint8, vTime uint8) error {
 	}
 	return nil
 }
+
+// tcFlushInput discards any queued input before the caller starts reading from
+// the tty. This avoids stale bytes, such as delayed mouse reports, from being
+// delivered to the next foreground application.
+func tcFlushInput(fd int) error {
+	return unix.IoctlSetPointerInt(fd, unix.TIOCFLUSH, unix.TCIFLUSH)
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/nonblock_unix.go b/vendor/github.com/gdamore/tcell/v3/tty/nonblock_unix.go
similarity index 72%
rename from vendor/github.com/gdamore/tcell/v2/nonblock_unix.go
rename to vendor/github.com/gdamore/tcell/v3/tty/nonblock_unix.go
index 160a6419d..1dc1db2ef 100644
--- a/vendor/github.com/gdamore/tcell/v2/nonblock_unix.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/nonblock_unix.go
@@ -1,8 +1,8 @@
 // Copyright 2021 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,7 +15,7 @@
 //go:build linux || aix || zos || solaris
 // +build linux aix zos solaris
 
-package tcell
+package tty
 
 import (
 	"syscall"
@@ -39,3 +39,10 @@ func tcSetBufParams(fd int, vMin uint8, vTime uint8) error {
 	}
 	return nil
 }
+
+// tcFlushInput discards any queued input before the caller starts reading from
+// the tty. This avoids stale bytes, such as delayed mouse reports, from being
+// delivered to the next foreground application.
+func tcFlushInput(fd int) error {
+	return unix.IoctlSetInt(fd, unix.TCFLSH, unix.TCIFLUSH)
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/stdin_unix.go b/vendor/github.com/gdamore/tcell/v3/tty/stdin_unix.go
similarity index 63%
rename from vendor/github.com/gdamore/tcell/v2/stdin_unix.go
rename to vendor/github.com/gdamore/tcell/v3/tty/stdin_unix.go
index b478b8918..3a101af7f 100644
--- a/vendor/github.com/gdamore/tcell/v2/stdin_unix.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/stdin_unix.go
@@ -1,8 +1,8 @@
 // Copyright 2021 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,7 +15,7 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
 // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
-package tcell
+package tty
 
 import (
 	"errors"
@@ -23,7 +23,6 @@ import (
 	"os"
 	"os/signal"
 	"strconv"
-	"sync"
 	"syscall"
 	"time"
 
@@ -33,16 +32,12 @@ import (
 
 // stdIoTty is an implementation of the Tty API based upon stdin/stdout.
 type stdIoTty struct {
-	fd    int
-	in    *os.File
-	out   *os.File
-	saved *term.State
-	sig   chan os.Signal
-	cb    func()
-	stopQ chan struct{}
-	dev   string
-	wg    sync.WaitGroup
-	l     sync.Mutex
+	fd      int
+	in      *os.File
+	out     *os.File
+	saved   *term.State
+	sig     chan os.Signal
+	started bool
 }
 
 func (tty *stdIoTty) Read(b []byte) (int, error) {
@@ -58,18 +53,10 @@ func (tty *stdIoTty) Close() error {
 }
 
 func (tty *stdIoTty) Start() error {
-	tty.l.Lock()
-	defer tty.l.Unlock()
+	if tty.started {
+		return nil
+	}
 
-	// We open another copy of /dev/tty.  This is a workaround for unusual behavior
-	// observed in macOS, apparently caused when a sub-shell (for example) closes our
-	// own tty device (when it exits for example).  Getting a fresh new one seems to
-	// resolve the problem.  (We believe this is a bug in the macOS tty driver that
-	// fails to account for dup() references to the same file before applying close()
-	// related behaviors to the tty.)  We're also holding the original copy we opened
-	// since closing that might have deleterious effects as well.  The upshot is that
-	// we will have up to two separate file handles open on /dev/tty.  (Note that when
-	// using stdin/stdout instead of /dev/tty this problem is not observed.)
 	var err error
 	tty.in = os.Stdin
 	tty.out = os.Stdout
@@ -84,28 +71,13 @@ func (tty *stdIoTty) Start() error {
 	if err != nil {
 		return err
 	}
+	if err = tcFlushInput(tty.fd); err != nil {
+		_ = term.Restore(tty.fd, saved)
+		return err
+	}
 	tty.saved = saved
+	tty.started = true
 
-	tty.stopQ = make(chan struct{})
-	tty.wg.Add(1)
-	go func(stopQ chan struct{}) {
-		defer tty.wg.Done()
-		for {
-			select {
-			case <-tty.sig:
-				tty.l.Lock()
-				cb := tty.cb
-				tty.l.Unlock()
-				if cb != nil {
-					cb()
-				}
-			case <-stopQ:
-				return
-			}
-		}
-	}(tty.stopQ)
-
-	signal.Notify(tty.sig, syscall.SIGWINCH)
 	return nil
 }
 
@@ -118,18 +90,14 @@ func (tty *stdIoTty) Drain() error {
 }
 
 func (tty *stdIoTty) Stop() error {
-	tty.l.Lock()
 	if err := term.Restore(tty.fd, tty.saved); err != nil {
-		tty.l.Unlock()
 		return err
 	}
 	_ = tty.in.SetReadDeadline(time.Now())
 
-	signal.Stop(tty.sig)
-	close(tty.stopQ)
-	tty.l.Unlock()
+	tty.NotifyResize(nil)
 
-	tty.wg.Wait()
+	tty.started = false
 
 	return nil
 }
@@ -161,10 +129,33 @@ func (tty *stdIoTty) WindowSize() (WindowSize, error) {
 	return size, nil
 }
 
-func (tty *stdIoTty) NotifyResize(cb func()) {
-	tty.l.Lock()
-	tty.cb = cb
-	tty.l.Unlock()
+func (tty *stdIoTty) NotifyResize(resizeQ chan<- bool) {
+
+	sigQ := tty.sig
+	tty.sig = nil
+
+	if sigQ != nil {
+		signal.Stop(sigQ)
+		close(sigQ)
+	}
+
+	if resizeQ == nil {
+		return
+	}
+
+	sigQ = make(chan os.Signal, 1)
+	signal.Notify(sigQ, syscall.SIGWINCH)
+
+	tty.sig = sigQ
+
+	go func() {
+		for range sigQ {
+			select {
+			case resizeQ <- true:
+			default: // queue full, so nvm.
+			}
+		}
+	}()
 }
 
 // NewStdioTty opens a tty using standard input/output.
diff --git a/vendor/github.com/gdamore/tcell/v2/tty.go b/vendor/github.com/gdamore/tcell/v3/tty/tty.go
similarity index 64%
rename from vendor/github.com/gdamore/tcell/v2/tty.go
rename to vendor/github.com/gdamore/tcell/v3/tty/tty.go
index 8bb1ac506..1387739f0 100644
--- a/vendor/github.com/gdamore/tcell/v2/tty.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/tty.go
@@ -1,8 +1,8 @@
-// Copyright 2021 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tcell
+package tty
 
 import "io"
 
@@ -22,10 +22,18 @@ import "io"
 // with the terminfo-style based API.  It extends the io.ReadWriter API.  It is reasonable
 // that the implementation might choose to use different underlying files for the Reader
 // and Writer sides of this API, as part of it's internal implementation.
+//
+// Note that the consumer of these interfaces will provide mutual exclusion guarantees
+// for the methods. Implementations need only be concerned about locking for any
+// asynchronous functions that they use (e.g. signal handlers.) The exception to this
+// is that Read and Write may be called concurrently to each other (but only after
+// a successful Start), and Stop may be called while an outstanding Read or Write
+// call is pending. (Stop should interrupt any blocking read.)
 type Tty interface {
 	// Start is used to activate the Tty for use.  Upon return the terminal should be
 	// in raw mode, non-blocking, etc.  The implementation should take care of saving
 	// any state that is required so that it may be restored when Stop is called.
+	// Start must be idempotent.
 	Start() error
 
 	// Stop is used to stop using this Tty instance.  This may be a suspend, so that other
@@ -43,10 +51,15 @@ type Tty interface {
 	// emitted between the time this is called, and when Stop is called.
 	Drain() error
 
-	// NotifyResize is used register a callback when the tty thinks the dimensions have
-	// changed.  The standard UNIX implementation links this to a handler for SIGWINCH.
-	// If the supplied callback is nil, then any handler should be unregistered.
-	NotifyResize(cb func())
+	// NotifyResize is used to post a signal that will be written to (non-blocking) if the
+	// system detects that a resize event happened.  If the channel is null, then the caller
+	// does not desire such notifications (or no longer desires them.)
+	// The standard UNIX implementation links this to a handler for SIGWINCH.
+	//
+	// If window resize events are delivered inline as part of Read, then the implementation may stub this.
+	// If the caller determines that the underlying terminal can deliver notifications without OS support
+	// (i.e. the terminal supports in-band resize notifications), then it may not call this function at all.
+	NotifyResize(chan<- bool)
 
 	// WindowSize is called to determine the terminal dimensions.  This might be determined
 	// by an ioctl or other means.
diff --git a/vendor/github.com/gdamore/tcell/v2/tty_plan9.go b/vendor/github.com/gdamore/tcell/v3/tty/tty_plan9.go
similarity index 86%
rename from vendor/github.com/gdamore/tcell/v2/tty_plan9.go
rename to vendor/github.com/gdamore/tcell/v3/tty/tty_plan9.go
index 6c99ee6d3..9b72c6b11 100644
--- a/vendor/github.com/gdamore/tcell/v2/tty_plan9.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/tty_plan9.go
@@ -4,8 +4,8 @@
 // Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tcell
+package tty
 
 import (
 	"bufio"
@@ -40,22 +40,20 @@ import (
 // - vt(1): VT100 emulator typically used for TUI programs on Plan 9
 //
 // Limitations:
-// - We assume VT100-level capabilities (often no colors, no mouse).
-// - Window size is conservative: we return 80x24 unless overridden.
-//   Set LINES/COLUMNS (or TCELL_LINES/TCELL_COLS) to refine.
-// - Mouse and bracketed paste are not wired; terminfo/xterm queries
-//   are not attempted because vt(1) may not support them.
+//   - We assume VT100-level capabilities (often no colors, no mouse).
+//   - Window size is conservative: we return 80x24 unless overridden.
+//     Set LINES/COLUMNS (or TCELL_LINES/TCELL_COLS) to refine.
+//   - Mouse and bracketed paste are not wired; terminfo/xterm queries
+//     are not attempted because vt(1) may not support them.
 type p9Tty struct {
 	cons    *os.File // /dev/cons (read+write)
 	consctl *os.File // /dev/consctl (write "rawon"/"rawoff")
 	wctl    *os.File // /dev/wctl (resize notifications)
 
-	// protect close/stop; Read/Write are serialized by os.File
-	mu     sync.Mutex
-	closed atomic.Bool
+	closed  atomic.Bool
+	started bool
 
-	// resize callback
-	onResize atomic.Value // func()
+	onResize atomic.Value // resize channel
 	wg       sync.WaitGroup
 	stopCh   chan struct{}
 }
@@ -99,9 +97,10 @@ func newPlan9TTY() (Tty, error) {
 }
 
 func (t *p9Tty) Start() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
 
+	if t.started {
+		return nil
+	}
 	if t.closed.Load() {
 		return errors.New("tty closed")
 	}
@@ -127,6 +126,7 @@ func (t *p9Tty) Start() error {
 		t.wg.Add(1)
 		go t.watchResize()
 	}
+	t.started = true
 	return nil
 }
 
@@ -137,8 +137,6 @@ func (t *p9Tty) Drain() error {
 }
 
 func (t *p9Tty) Stop() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
 
 	// Signal watcher to stop (if not already).
 	if t.stopCh != nil && !isClosed(t.stopCh) {
@@ -156,12 +154,11 @@ func (t *p9Tty) Stop() error {
 
 	// Ensure watcher goroutine has exited before returning.
 	t.wg.Wait()
+	t.started = false
 	return nil
 }
 
 func (t *p9Tty) Close() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
 
 	if t.closed.Swap(true) {
 		return nil
@@ -191,12 +188,8 @@ func (t *p9Tty) Write(p []byte) (int, error) {
 	return t.cons.Write(p)
 }
 
-func (t *p9Tty) NotifyResize(cb func()) {
-	if cb == nil {
-		t.onResize.Store((func())(nil))
-		return
-	}
-	t.onResize.Store(cb)
+func (t *p9Tty) NotifyResize(resizeQ chan<- bool) {
+	t.onResize.Store(resizeQ)
 }
 
 func (t *p9Tty) WindowSize() (WindowSize, error) {
@@ -244,8 +237,11 @@ func (t *p9Tty) watchResize() {
 			}
 			// transient errors: continue
 		}
-		if cb, _ := t.onResize.Load().(func()); cb != nil {
-			cb()
+		if rq, ok := t.onResize.Load().(chan<- bool); ok && rq != nil {
+			select {
+			case rq <- true:
+			default:
+			}
 		}
 	}
 }
diff --git a/vendor/github.com/gdamore/tcell/v2/tty_unix.go b/vendor/github.com/gdamore/tcell/v3/tty/tty_unix.go
similarity index 58%
rename from vendor/github.com/gdamore/tcell/v2/tty_unix.go
rename to vendor/github.com/gdamore/tcell/v3/tty/tty_unix.go
index ca82d83d8..e2dc49363 100644
--- a/vendor/github.com/gdamore/tcell/v2/tty_unix.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/tty_unix.go
@@ -1,8 +1,8 @@
-// Copyright 2021 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,7 +15,7 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
 // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
 
-package tcell
+package tty
 
 import (
 	"errors"
@@ -23,7 +23,6 @@ import (
 	"os"
 	"os/signal"
 	"strconv"
-	"sync"
 	"syscall"
 	"time"
 
@@ -31,18 +30,17 @@ import (
 	"golang.org/x/term"
 )
 
+// Use -1 to differentiate from stdin (fd=0).
+const uninitializedTtyFd = -1
+
 // devTty is an implementation of the Tty API based upon /dev/tty.
 type devTty struct {
-	fd    int
-	f     *os.File
-	of    *os.File // the first open of /dev/tty
-	saved *term.State
-	sig   chan os.Signal
-	cb    func()
-	stopQ chan struct{}
-	dev   string
-	wg    sync.WaitGroup
-	l     sync.Mutex
+	fd      int
+	f       *os.File
+	saved   *term.State
+	sig     chan os.Signal
+	dev     string
+	started bool
 }
 
 func (tty *devTty) Read(b []byte) (int, error) {
@@ -58,54 +56,43 @@ func (tty *devTty) Close() error {
 }
 
 func (tty *devTty) Start() error {
-	tty.l.Lock()
-	defer tty.l.Unlock()
 
+	if tty.started {
+		return nil
+	}
 	// We open another copy of /dev/tty.  This is a workaround for unusual behavior
 	// observed in macOS, apparently caused when a subshell (for example) closes our
 	// own tty device (when it exits for example).  Getting a fresh new one seems to
 	// resolve the problem.  (We believe this is a bug in the macOS tty driver that
 	// fails to account for dup() references to the same file before applying close()
-	// related behaviors to the tty.)  We're also holding the original copy we opened
-	// since closing that might have deleterious effects as well.  The upshot is that
-	// we will have up to two separate file handles open on /dev/tty.  (Note that when
-	// using stdin/stdout instead of /dev/tty this problem is not observed.)
+	// related behaviors to the tty.)  (Note that when using stdin/stdout instead of
+	// /dev/tty this problem is not observed.)
 	var err error
 	if tty.f, err = os.OpenFile(tty.dev, os.O_RDWR, 0); err != nil {
 		return err
 	}
 
+	tty.fd = int(tty.f.Fd())
+
 	if !term.IsTerminal(tty.fd) {
+		tty.f.Close()
 		return errors.New("device is not a terminal")
 	}
 
 	_ = tty.f.SetReadDeadline(time.Time{})
 	saved, err := term.MakeRaw(tty.fd) // also sets vMin and vTime
 	if err != nil {
+		tty.f.Close()
+		return err
+	}
+	if err = tcFlushInput(tty.fd); err != nil {
+		_ = term.Restore(tty.fd, saved)
+		tty.f.Close()
 		return err
 	}
 	tty.saved = saved
+	tty.started = true
 
-	tty.stopQ = make(chan struct{})
-	tty.wg.Add(1)
-	go func(stopQ chan struct{}) {
-		defer tty.wg.Done()
-		for {
-			select {
-			case <-tty.sig:
-				tty.l.Lock()
-				cb := tty.cb
-				tty.l.Unlock()
-				if cb != nil {
-					cb()
-				}
-			case <-stopQ:
-				return
-			}
-		}
-	}(tty.stopQ)
-
-	signal.Notify(tty.sig, syscall.SIGWINCH)
 	return nil
 }
 
@@ -118,28 +105,40 @@ func (tty *devTty) Drain() error {
 }
 
 func (tty *devTty) Stop() error {
-	tty.l.Lock()
+	// unconditionally set this, because we cannot recover
+	// if we fail anyway, so this gives the best hope of
+	// picking up the pieces in such a circumstance
+	tty.started = false
+
 	if err := term.Restore(tty.fd, tty.saved); err != nil {
-		tty.l.Unlock()
 		return err
 	}
 	_ = tty.f.SetReadDeadline(time.Now())
 
-	signal.Stop(tty.sig)
-	close(tty.stopQ)
-	tty.l.Unlock()
-
-	tty.wg.Wait()
+	tty.NotifyResize(nil)
 
 	// close our tty device -- we'll get another one if we Start again later.
 	_ = tty.f.Close()
+	tty.fd = uninitializedTtyFd
 
 	return nil
 }
 
 func (tty *devTty) WindowSize() (WindowSize, error) {
 	size := WindowSize{}
-	ws, err := unix.IoctlGetWinsize(tty.fd, unix.TIOCGWINSZ)
+	fd := tty.fd
+	if tty.fd == uninitializedTtyFd {
+		// If WindowSize is called when the tty isn't yet running, the fd for /dev/tty won't be initialized,
+		// so open the file just long enough to retrieve the window size.
+		f, err := os.OpenFile(tty.dev, os.O_RDWR, 0)
+		if err != nil {
+			return size, err
+		}
+		defer func() { _ = f.Close() }()
+		fd = int(f.Fd())
+	}
+
+	ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
 	if err != nil {
 		return size, err
 	}
@@ -164,10 +163,33 @@ func (tty *devTty) WindowSize() (WindowSize, error) {
 	return size, nil
 }
 
-func (tty *devTty) NotifyResize(cb func()) {
-	tty.l.Lock()
-	tty.cb = cb
-	tty.l.Unlock()
+func (tty *devTty) NotifyResize(resizeQ chan<- bool) {
+
+	sigQ := tty.sig
+	tty.sig = nil
+
+	if sigQ != nil {
+		signal.Stop(sigQ)
+		close(sigQ)
+	}
+
+	if resizeQ == nil {
+		return
+	}
+
+	sigQ = make(chan os.Signal, 1)
+	signal.Notify(sigQ, syscall.SIGWINCH)
+
+	tty.sig = sigQ
+
+	go func() {
+		for range sigQ {
+			select {
+			case resizeQ <- true:
+			default: // queue full, so nvm.
+			}
+		}
+	}()
 }
 
 // NewDevTty opens a /dev/tty based Tty.
@@ -178,21 +200,24 @@ func NewDevTty() (Tty, error) {
 // NewDevTtyFromDev opens a tty device given a path.  This can be useful to bind to other nodes.
 func NewDevTtyFromDev(dev string) (Tty, error) {
 	tty := &devTty{
+		fd:  uninitializedTtyFd,
 		dev: dev,
 		sig: make(chan os.Signal),
 	}
-	var err error
-	if tty.of, err = os.OpenFile(dev, os.O_RDWR, 0); err != nil {
+	// Only open the file long enough to check that the device
+	// represents a TTY.  We will reopen it in start.  We do collect
+	// the terminal state so we can restore it later though.
+	if f, err := os.OpenFile(dev, os.O_RDWR, 0); err != nil {
 		return nil, err
-	}
-	tty.fd = int(tty.of.Fd())
-	if !term.IsTerminal(tty.fd) {
-		_ = tty.f.Close()
-		return nil, errors.New("not a terminal")
-	}
-	if tty.saved, err = term.GetState(tty.fd); err != nil {
-		_ = tty.f.Close()
-		return nil, fmt.Errorf("failed to get state: %w", err)
+	} else {
+		defer func() { _ = f.Close() }()
+		fd := int(f.Fd())
+		if !term.IsTerminal(fd) {
+			return nil, errors.New("not a terminal")
+		}
+		if tty.saved, err = term.GetState(fd); err != nil {
+			return nil, fmt.Errorf("failed to get state: %w", err)
+		}
 	}
 	return tty, nil
 }
diff --git a/vendor/github.com/gdamore/tcell/v3/tty/tty_wasm.go b/vendor/github.com/gdamore/tcell/v3/tty/tty_wasm.go
new file mode 100644
index 000000000..cf4ad6e7c
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/tty/tty_wasm.go
@@ -0,0 +1,21 @@
+//go:build wasm || js
+// +build wasm js
+
+package tty
+
+import "errors"
+
+// NewDevTty obtains a default tty from the console or TTY (e.g. /dev/tty) for the process.
+func NewDevTty() (Tty, error) {
+	return nil, errors.New("No tty device on wasm")
+}
+
+// NewDevTtyFromDev obtains a tty from the given device path. Not supported on Windows.
+func NewDevTtyFromDev(dev string) (Tty, error) {
+	return nil, errors.New("No tty device on wasm")
+}
+
+// NewStdIoTty obtains a tty from stdin and stdout.
+func NewStdIoTty() (Tty, error) {
+	return nil, errors.New("No tty device on wasm")
+}
diff --git a/vendor/github.com/gdamore/tcell/v2/tty_win.go b/vendor/github.com/gdamore/tcell/v3/tty/tty_win.go
similarity index 68%
rename from vendor/github.com/gdamore/tcell/v2/tty_win.go
rename to vendor/github.com/gdamore/tcell/v3/tty/tty_win.go
index 0a6d10bb3..e17cd7dab 100644
--- a/vendor/github.com/gdamore/tcell/v2/tty_win.go
+++ b/vendor/github.com/gdamore/tcell/v3/tty/tty_win.go
@@ -1,8 +1,8 @@
 // Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,11 +15,12 @@
 //go:build windows
 // +build windows
 
-package tcell
+package tty
 
 import (
 	"encoding/binary"
 	"errors"
+	"fmt"
 	"sync"
 	"syscall"
 	"time"
@@ -51,12 +52,85 @@ const (
 	focusEvent  uint16 = 16
 )
 
+const (
+	w32Infinite    = ^uintptr(0)
+	w32WaitObject0 = uintptr(0)
+)
+
+const (
+	// Input modes
+	modeExtendFlg = uint32(0x0080)
+	modeMouseEn   = uint32(0x0010)
+	modeResizeEn  = uint32(0x0008)
+	modeVtInput   = uint32(0x0200)
+	// modeCooked    = uint32(0x0001)
+
+	// Output modes
+	modeCookedOut = uint32(0x0001)
+	modeVtOutput  = uint32(0x0004)
+	modeNoAutoNL  = uint32(0x0008)
+	modeUnderline = uint32(0x0010) // ENABLE_LVB_GRID_WORLDWIDE, needed for underlines
+	// modeWrapEOL   = uint32(0x0002)
+)
+
+type coord struct {
+	x int16
+	y int16
+}
+
+type rect struct {
+	left   int16
+	top    int16
+	right  int16
+	bottom int16
+}
+
+type consoleInfo struct {
+	size  coord
+	pos   coord
+	attrs uint16
+	win   rect
+	maxsz coord
+}
+
 type inputRecord struct {
 	typ  uint16
 	_    uint16
 	data [16]byte
 }
 
+func encodeWinKeyRecord(data [16]byte, surrogate *rune) []byte {
+	keyDown := binary.LittleEndian.Uint32(data[0:]) != 0
+	repeat := binary.LittleEndian.Uint16(data[4:])
+	virtualKey := binary.LittleEndian.Uint16(data[6:])
+	scanCode := binary.LittleEndian.Uint16(data[8:])
+	// we normally only expect to see ascii, but paste data may come in as UTF-16.
+	wc := rune(binary.LittleEndian.Uint16(data[10:]))
+	controlState := binary.LittleEndian.Uint32(data[12:])
+
+	if virtualKey != 0 || scanCode != 0 {
+		kd := 0
+		if keyDown {
+			kd = 1
+		}
+		return fmt.Appendf(nil, "\x1b[%d;%d;%d;%d;%d;%d_",
+			virtualKey, scanCode, wc, kd, controlState, max(1, repeat))
+	}
+
+	if !keyDown {
+		return nil
+	}
+
+	var encoded []byte
+	decodedRunes := decodeUTF16Rune(surrogate, wc)
+	for range max(1, repeat) {
+		for _, decoded := range decodedRunes {
+			encoded = append(encoded, []byte(string(decoded))...)
+		}
+	}
+	return encoded
+}
+
 type winTty struct {
 	buf        chan byte
 	out        syscall.Handle
@@ -64,7 +138,7 @@ type winTty struct {
 	cancelFlag syscall.Handle
 	running    bool
 	stopQ      chan struct{}
-	resizeCb   func()
+	resizeQ    chan<- bool
 	cols       uint16
 	rows       uint16
 	pair       []uint16 // for surrogate pairs (UTF-16)
@@ -86,7 +160,6 @@ func (w *winTty) Read(b []byte) (int, error) {
 	case <-w.stopQ:
 		// stopping, so make sure we eat everything, which might require
 		// very short sleeps to ensure all buffered data is consumed.
-		break
 	}
 
 	// second character read is non-blocking
@@ -145,12 +218,15 @@ func (w *winTty) getConsoleInput() error {
 	case w32WaitObject0: // w.cancelFlag
 		return errors.New("cancelled")
 	case w32WaitObject0 + 1: // w.in
-		// rec := &inputRecord{}
 		var nrec int32
 		rv, _, er := procGetNumberOfConsoleInputEvents.Call(
 			uintptr(w.in),
 			uintptr(unsafe.Pointer(&nrec)))
-		rec := make([]inputRecord, nrec)
+		if rv == 0 {
+			return er
+		}
+
+		rec := make([]inputRecord, max(nrec, 1))
 		rv, _, er = procReadConsoleInput.Call(
 			uintptr(w.in),
 			uintptr(unsafe.Pointer(&rec[0])),
@@ -164,20 +240,7 @@ func (w *winTty) getConsoleInput() error {
 			ir := rec[i]
 			switch ir.typ {
 			case keyEvent:
-				// we normally only expect to see ascii, but paste data may come in as UTF-16.
-				wc := rune(binary.LittleEndian.Uint16(ir.data[10:]))
-				if wc >= 0xD800 && wc <= 0xDBFF {
-					// if it was a high surrogate, which happens for pasted UTF-16,
-					// then save it until we get the low and can decode it.
-					w.surrogate = wc
-					continue
-				} else if wc >= 0xDC00 && wc <= 0xDFFF {
-					wc = utf16.DecodeRune(w.surrogate, wc)
-				}
-				w.surrogate = 0
-				for _, chr := range []byte(string(wc)) {
-					// We normally expect only to see ASCII (win32-input-mode),
-					// but apparently pasted data can arrive in UTF-16 here.
+				for _, chr := range encodeWinKeyRecord(ir.data, &w.surrogate) {
 					select {
 					case w.buf <- chr:
 					case <-w.stopQ:
@@ -189,11 +252,13 @@ func (w *winTty) getConsoleInput() error {
 				w.Lock()
 				w.cols = binary.LittleEndian.Uint16(ir.data[0:])
 				w.rows = binary.LittleEndian.Uint16(ir.data[2:])
-				cb := w.resizeCb
-				w.Unlock()
-				if cb != nil {
-					cb()
+				if w.resizeQ != nil {
+					select {
+					case w.resizeQ <- true:
+					default:
+					}
 				}
+				w.Unlock()
 
 			default:
 			}
@@ -215,11 +280,8 @@ func (w *winTty) scanInput() {
 
 func (w *winTty) Start() error {
 
-	w.Lock()
-	defer w.Unlock()
-
 	if w.running {
-		return errors.New("already engaged")
+		return nil
 	}
 	_, _, _ = procFlushConsoleInputBuffer.Call(uintptr(w.in))
 	w.stopQ = make(chan struct{})
@@ -246,8 +308,6 @@ func (w *winTty) Start() error {
 
 func (w *winTty) Stop() error {
 	w.wg.Wait()
-	w.Lock()
-	defer w.Unlock()
 	_, _, _ = procSetConsoleMode.Call(uintptr(w.in), uintptr(w.oimode))
 	_, _, _ = procSetConsoleMode.Call(uintptr(w.out), uintptr(w.oomode))
 	_, _, _ = procFlushConsoleInputBuffer.Call(uintptr(w.in))
@@ -256,8 +316,10 @@ func (w *winTty) Stop() error {
 	return nil
 }
 
-func (w *winTty) NotifyResize(cb func()) {
-	w.resizeCb = cb
+func (tty *winTty) NotifyResize(resizeQ chan<- bool) {
+	tty.Lock()
+	tty.resizeQ = resizeQ
+	tty.Unlock()
 }
 
 func (w *winTty) WindowSize() (WindowSize, error) {
@@ -288,3 +350,26 @@ func NewDevTty() (Tty, error) {
 
 	return w, nil
 }
+
+func NewDevTtyFromDev(dev string) (Tty, error) {
+	return nil, errors.New("No tty device on Windows")
+}
+
+func NewStdIoTty() (Tty, error) {
+	w := &winTty{}
+	w.in = syscall.Stdin
+	w.out = syscall.Stdout
+	w.buf = make(chan byte, 128)
+
+	_, _, _ = procGetConsoleScreenBufferInfo.Call(uintptr(w.out), uintptr(unsafe.Pointer(&w.oscreen)))
+	if r, _, err := procGetConsoleMode.Call(uintptr(w.out), uintptr(unsafe.Pointer(&w.oomode))); r == 0 || err != nil {
+		return nil, errors.New("output is not a terminal")
+	}
+	if r, _, err := procGetConsoleMode.Call(uintptr(w.in), uintptr(unsafe.Pointer(&w.oimode))); r == 0 || err != nil {
+		return nil, errors.New("input is not a terminal")
+	}
+	w.rows = uint16(w.oscreen.size.y)
+	w.cols = uint16(w.oscreen.size.x)
+
+	return w, nil
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/tty/utf16.go b/vendor/github.com/gdamore/tcell/v3/tty/utf16.go
new file mode 100644
index 000000000..0932b3851
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/tty/utf16.go
@@ -0,0 +1,47 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tty
+
+import (
+	"unicode/utf16"
+	"unicode/utf8"
+)
+
+// decodeUTF16Rune decodes one UTF-16 code unit at a time while preserving
+// malformed input as replacement characters instead of silently discarding it.
+func decodeUTF16Rune(surrogate *rune, wc rune) []rune {
+	switch {
+	case wc >= 0xD800 && wc <= 0xDBFF:
+		if *surrogate != 0 {
+			*surrogate = wc
+			return []rune{utf8.RuneError}
+		}
+		*surrogate = wc
+		return nil
+	case wc >= 0xDC00 && wc <= 0xDFFF:
+		if *surrogate == 0 {
+			return []rune{utf8.RuneError}
+		}
+		decoded := utf16.DecodeRune(*surrogate, wc)
+		*surrogate = 0
+		return []rune{decoded}
+	default:
+		if *surrogate != 0 {
+			*surrogate = 0
+			return []rune{utf8.RuneError, wc}
+		}
+		return []rune{wc}
+	}
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/tty/winsize.go b/vendor/github.com/gdamore/tcell/v3/tty/winsize.go
new file mode 100644
index 000000000..7950055fd
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/tty/winsize.go
@@ -0,0 +1,31 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tty
+
+// WindowSize represents the dimensions of the window of a terminal.
+type WindowSize struct {
+	Width       int // Width in characters
+	Height      int // Height in characters
+	PixelWidth  int // Width in pixels (zero if not available or known)
+	PixelHeight int // Height in pixels (zero if not available or known)
+}
+
+// CellDimensions returns the dimensions of a single cell, in pixels
+func (ws WindowSize) CellDimensions() (int, int) {
+	if ws.PixelWidth == 0 || ws.PixelHeight == 0 {
+		return 0, 0
+	}
+	return (ws.PixelWidth / ws.Width), (ws.PixelHeight / ws.Height)
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/attr.go b/vendor/github.com/gdamore/tcell/v3/vt/attr.go
new file mode 100644
index 000000000..4d2ed2898
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/attr.go
@@ -0,0 +1,38 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package vt
+
+// Attr is a synthetic combination of display attributes for cells, apart
+// from color which is handled separately.
+type Attr uint16
+
+const (
+	Plain         = Attr(0)      // basic, plain style
+	Bold          = Attr(1 << 0) // maybe double strike, or just brighter
+	Blink         = Attr(1 << 1) // NB: many terminals do not support it
+	Reverse       = Attr(1 << 2) // foreground and background reversed
+	Dim           = Attr(1 << 3) // fainter, may also be lower alpha
+	Italic        = Attr(1 << 4) // italicized
+	StrikeThrough = Attr(1 << 5) // crossed-out
+	Underline     = Attr(1 << 6) // any underline style
+	Overline      = Attr(1 << 7) // rarely supported
+
+	// Underline styles, always mixed with underline, only one can be selected
+	PlainUnderline  = Underline
+	DoubleUnderline = Underline | 1<<13
+	CurlyUnderline  = Underline | 2<<13
+	DottedUnderline = Underline | 3<<13
+	DashedUnderline = Underline | 4<<13
+	UnderlineMask   = Underline | 7<<13 // bits 13, 14, 15
+)
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/backend.go b/vendor/github.com/gdamore/tcell/v3/vt/backend.go
new file mode 100644
index 000000000..f7f5624b6
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/backend.go
@@ -0,0 +1,138 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vt
+
+// Backend describes the backend of a terminal.
+// This can be used to create a real emulator, while allowing the processor
+// front end to handle the common details of parsing escape sequences, the state
+// machine, and so forth. Backends support a limited set of common functionality,
+// including a cursor. They only need to support writing at the cursor.
+type Backend interface {
+
+	// GetPrivateMode returns the status of a given private mode.
+	GetPrivateMode(PrivateMode) ModeStatus
+
+	// SetPrivateMode sets a private mode to the given status.
+	// If either value is invalid, this should simply ignore the operation.
+	SetPrivateMode(PrivateMode, ModeStatus) error
+
+	// GetSize returns the size of the terminal in characters.
+	// The X and Y are counts, so the bottom right cell should be at coordinate (X-1, Y-1).
+	GetSize() Coord
+
+	// Colors returns the number of colors this terminal can support.  For direct color,
+	// return 1<<24. The XTerm palette is assumed. Monochrome terminals should return 0.
+	Colors() int
+
+	// Put content at the given location. The string in the cell might be a grapheme cluster, and the width can be
+	// 0, 1, or 2.  The backend should try to optimize by keeping style and last coordinates if needed.
+	// A graphical backend could use this and be completely stateless.
+	Put(Coord, Cell)
+
+	// GetPosition returns the cursor position.
+	GetPosition() Coord
+
+	// SetPosition sets the cursor position. If the position is out of bounds,
+	// it should be clipped to the window size.
+	SetPosition(Coord)
+
+	// Reset resets the terminal to default state.
+	Reset()
+
+	// RaiseResize is called by the emulation layer when it has completed its own internal resizing.
+	// The backend is responsible for sending a signal (if needed) to child processes as part of this
+	// function.  (The emulation layer knows nothing of child processes.)
+	RaiseResize()
+
+	// Buffering is called by the emulator to indicate that the backend should buffer contents because
+	// multiple updates are taking place.  This should be treated in addition to mode 2026, if the backend
+	// supports it.  (Mode 2026 should only be supported by the backend if it actually supports true
+	// double buffering.)
+	Buffering(bool)
+
+	// SetCursor is used to set the current cursor style.  If the backend does not support changing
+	// the cursor shape, it should implement at least hidden, steady, and blinking (typically as a block).
+	SetCursor(CursorStyle)
+}
+
+// Beeper can be implemented by a backend to indicate it can ring the bell or beep.
+// This is typically done in response to a 0x07 bell.
+type Beeper interface {
+	Beep()
+}
+
+// Resizer adds notifications when the window size changes.
+type Resizer interface {
+	// NotifyResize registers a channel to be posted to if the window size changes.
+	NotifyResize(chan<- bool)
+}
+
+// Titler adds support for setting the window title. (Typically this is OSC 2.)
+// Note that for security reasons we only support setting this.
+// We don't bother with icon titles, since few terminal emulators support it, and it
+// would be hard for us to do this in any portable fashion.
+type Titler interface {
+	// SetWindowTitle only changes the window title.
+	SetWindowTitle(string)
+}
+
+// MouseReporting determines what mouse events the backend reports.
+type MouseReporting int
+
+const (
+	MouseDisabled = MouseReporting(iota) // No mouse reports at all.
+	MouseButtons                         // Report button events only.
+	MouseDrag                            // Report drag events.
+	MouseMotion                          // Report motion events (movement).
+)
+
+// Mouser adds support configuring mouse reporting.
+// We also assume that a mouse reporter can report focus events.
+type Mouser interface {
+	SetMouse(MouseReporting)
+}
+
+// Blitter implements a cell-level blit, where a rectangular range of cells is copied from one
+// location to another.  The source and destination may overlap.  The old locations will remain
+// unchanged except of course or cells overwritten by the blit. The content will also be clipped
+// to the visible dimensions.
+type Blitter interface {
+	Blit(src, dst, dim Coord)
+}
+
+// Clipboard implements a clipboard or copy buffer for copy/paste activity.
+// The backend may prevent sending clipboard data by returning an empty string
+// for the clipboard.  Frequently this is done for security reasons.
+type Clipboard interface {
+
+	// SetClipboard sets the contents of the clipboard.
+	SetClipboard([]byte)
+
+	// GetClipboard gets the contents of the clipboard.
+	// It will return nil if the operation is not supported.
+	// An empty clipboard will be []byte{}
+	GetClipboard() []byte
+}
+
+// AdvancedKeyboard provides raw keyboard events, which gives
+// access to key presses, and releases, physical keys, and so forth.
+// These keyboards should provide a mapping facility to obtain associated
+// Unicode text via a layout, as well.
+type AdvancedKeyboard interface {
+	// IsAdvancedKeyboard returns true if the emulator supports full keyboard
+	// reporting.  This must include key press and release events, and mapping
+	// of physical keys (thus permitting key disambiguation).
+	IsAdvancedKeyboard() bool
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/coord.go b/vendor/github.com/gdamore/tcell/v3/vt/coord.go
new file mode 100644
index 000000000..a9ff7eda3
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/coord.go
@@ -0,0 +1,31 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package vt
+
+// Separate Row and Col types are used to reduce the chance of mixing up the coordinate axes.
+// We use zero-based coordinates (although VT hardware underneath uses one-based in escape sequences).
+// The upper left corner of the screen is at coordinate (0, 0).
+
+// Row indicates a row number (y position). We use zero based indices, although the VT
+// standard mostly communicates using 1-based offsets.
+type Row int
+
+// Col indicates a column number (x position).  We use zero based indices.
+type Col int
+
+// Coord indicates a coordinate.  This can also be used for window sizes.
+type Coord struct {
+	X Col // Column number, or X position.
+	Y Row // Row number, or Y position.
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/cursor.go b/vendor/github.com/gdamore/tcell/v3/vt/cursor.go
new file mode 100644
index 000000000..442b83e3a
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/cursor.go
@@ -0,0 +1,54 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package vt
+
+// CursorStyle represents the style of cursor, and covers the shape, whether it
+// blinks, and whether it is visible.  Cursor color is handled separately, if at all.
+type CursorStyle byte
+
+const (
+	SteadyBlock = CursorStyle(iota) // The default
+	SteadyBar
+	SteadyUnderline
+	BlinkingBlock     = SteadyBlock | blinkingCursor
+	BlinkingBar       = SteadyBar | blinkingCursor
+	BlinkingUnderline = SteadyUnderline | blinkingCursor
+
+	hiddenCursor   = CursorStyle(1 << 7) // If set, cursor should be hidden
+	blinkingCursor = CursorStyle(1 << 6) // If set, cursor should blink
+)
+
+func (cs CursorStyle) IsVisible() bool {
+	return cs&hiddenCursor == 0
+}
+
+func (cs CursorStyle) IsBlinking() bool {
+	return cs&blinkingCursor != 0
+}
+
+func (cs CursorStyle) Hide() CursorStyle {
+	return cs | hiddenCursor
+}
+
+func (cs CursorStyle) Show() CursorStyle {
+	return cs &^ hiddenCursor
+}
+
+func (cs CursorStyle) Blink() CursorStyle {
+	return cs | blinkingCursor
+}
+
+func (cs CursorStyle) Steady() CursorStyle {
+	return cs &^ blinkingCursor
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/emulate.go b/vendor/github.com/gdamore/tcell/v3/vt/emulate.go
new file mode 100644
index 000000000..fbbb6d443
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/emulate.go
@@ -0,0 +1,2940 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vt
+
+import (
+	"bytes"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"slices"
+	"strconv"
+	"strings"
+	"sync"
+	"unicode"
+	"unicode/utf8"
+
+	"github.com/clipperhouse/uax29/v2/graphemes"
+	"github.com/gdamore/tcell/v3/color"
+)
+
+// Emulator is a terminal emulator API. It implements the state machinery
+// (escape parsing and so forth) associated with being a terminal emulator.
+// The backend handles rendering the content, and some low level details.
+//
+// NOTE: This is not a committed interface yet, its entirely a work in progress.
+type Emulator interface {
+	// SetId sets our identity.
+	SetId(name string, version string)
+
+	// SendRaw sends raw data to the consumer.  This bypasses the normal encoding,
+	// so it should be used with caution.
+	SendRaw([]byte)
+
+	// KeyEvent injects a keyboard event into the emulator, which will ultimately
+	// result in data being sent via SendRaw.
+	KeyEvent(ev KeyEvent)
+
+	// ResizeEvent is called by a backend when the terminal has resized
+	// This will send in-band resize notifications if the client has requested them.
+	ResizeEvent(Coord)
+
+	// MouseEvent is called by a backend to report mouse activity.
+	MouseEvent(ev MouseEvent)
+
+	// FocusEvent is called by a backend to report that focus is gained (true) or lost (false).
+	FocusEvent(bool)
+
+	// Drain waits until any queued but not processed input has finished processing.
+	// It also wakes the reader.
+	Drain() error
+
+	// Start starts processing.
+	Start() error
+
+	// Stop stops processing.
+	Stop() error
+
+	// Reader reads data from the emulator.  These are bytes that would be transmitted
+	// to a remote party.
+	io.Reader
+
+	// Writer writes data to the emulator.  These are commands that the emulator should process.
+	io.Writer
+}
+
+// Style represents the styling of a cell.
+// This is an interface to prevent direct modification.
+type Style interface {
+	Fg() color.Color              // Fg returns the foreground color.
+	Bg() color.Color              // Bg returns the background color.
+	Uc() color.Color              // Uc returns the underline color.k
+	Attr() Attr                   // Attr returns the associated attributes.
+	Url() (string, string)        // Url returns the URL and associated id if one was set.
+	WithFg(color.Color) Style     // WithFg creates a new style with the foreground
+	WithBg(color.Color) Style     // WithBg creates a new style with the background.
+	WithUc(color.Color) Style     // WithUc creates a new style with the underline color
+	WithAttr(Attr) Style          // WithAttr creates a new style with the attributes.
+	WithUrl(string, string) Style // WithLink creates a new style with the URL and id.
+	Equal(Style) bool             // Equal returns true if the styles are the same.
+}
+
+// styleStruct implements Style.  Note that it is possible to make this even more
+// compact, but we don't think further optimization here on size will justify the
+// complexity and runtime performance hit to do so.  We're also already only storing
+// a class reference to this per cell.
+type styleStruct struct {
+	fg   color.Color
+	bg   color.Color
+	uc   color.Color // underline color
+	attr Attr
+	url  string // URL
+	id   string // Id for link
+}
+
+var BaseStyle = &styleStruct{}
+
+var asciiRuneStrings = func() [utf8.RuneSelf]string {
+	var table [utf8.RuneSelf]string
+	for i := 0; i < utf8.RuneSelf; i++ {
+		table[i] = string(rune(i))
+	}
+	return table
+}()
+
+const (
+	runeStringCacheSize      = 32
+	clusterStringCacheSize   = 32
+	clusterStringCacheMaxLen = 128
+)
+
+type runeStringCache struct {
+	entries [runeStringCacheSize]runeStringCacheEntry
+	n       int
+}
+
+type runeStringCacheEntry struct {
+	r rune
+	s string
+}
+
+func (c *runeStringCache) stringFor(r rune) string {
+	for i := 0; i < c.n; i++ {
+		if c.entries[i].r == r {
+			return c.entries[i].s
+		}
+	}
+
+	s := string(r)
+	n := c.n
+	if n < len(c.entries) {
+		n++
+	}
+	copy(c.entries[1:n], c.entries[:n-1])
+	c.entries[0] = runeStringCacheEntry{r: r, s: s}
+	c.n = n
+	return s
+}
+
+type clusterStringCache struct {
+	entries [clusterStringCacheSize]clusterStringCacheEntry
+	n       int
+}
+
+type clusterStringCacheEntry struct {
+	n int
+	b [clusterStringCacheMaxLen]byte
+	s string
+}
+
+func (c *clusterStringCache) stringFor(cluster []byte) string {
+	if len(cluster) == 0 {
+		return ""
+	}
+	if len(cluster) > clusterStringCacheMaxLen {
+		return string(cluster)
+	}
+	for i := 0; i < c.n; i++ {
+		e := &c.entries[i]
+		if e.n == len(cluster) && bytes.Equal(e.b[:e.n], cluster) {
+			return e.s
+		}
+	}
+
+	s := string(cluster)
+	n := c.n
+	if n < len(c.entries) {
+		n++
+	}
+	copy(c.entries[1:n], c.entries[:n-1])
+	e := &c.entries[0]
+	e.n = len(cluster)
+	copy(e.b[:], cluster)
+	e.s = s
+	c.n = n
+	return s
+}
+
+func (ss *styleStruct) Fg() color.Color              { return ss.fg }
+func (ss *styleStruct) Bg() color.Color              { return ss.bg }
+func (ss *styleStruct) Uc() color.Color              { return ss.uc }
+func (ss *styleStruct) Attr() Attr                   { return ss.attr }
+func (ss *styleStruct) Url() (string, string)        { return ss.url, ss.id }
+func (ss *styleStruct) WithFg(fg color.Color) Style  { ns := *ss; ns.fg = fg; return &ns }
+func (ss *styleStruct) WithBg(bg color.Color) Style  { ns := *ss; ns.bg = bg; return &ns }
+func (ss *styleStruct) WithUc(uc color.Color) Style  { ns := *ss; ns.uc = uc; return &ns }
+func (ss *styleStruct) WithAttr(a Attr) Style        { ns := *ss; ns.attr = a; return &ns }
+func (ss *styleStruct) WithUrl(url, id string) Style { ns := *ss; ns.url = url; ns.id = id; return &ns }
+func (ss *styleStruct) Equal(other Style) bool {
+	if s2, ok := other.(*styleStruct); ok {
+		return *ss == *s2
+	}
+	// We have chosen not to support alternative implementations for this compare.
+	// We could delegate to the other style, but that could lead to a loop if they
+	// do the same.
+	return (false)
+}
+
+// Cell is a representation of a display cell. Most consumers will not need this.
+// Note, this is not the simplest possible representation, and a 256x256 cell
+// display is going to need about 3MB to store it all, but it's simple, and adequate
+// to retain pretty much all of what we need for Unicode.  We could save some memory
+// by using explicit struct pointers and by eliminating grapheme cluster support,
+// but modern users expect these features.
+type Cell struct {
+	C string // Content, it will be a grapheme cluster
+	S Style  // Style, a pointer is used efficiency
+	W int    // Display width (0, 1, or 2)
+}
+
+// EmulatorOpt configures an Emulator.
+type EmulatorOpt interface {
+	setEmulatorOpt(*emulator)
+}
+
+// EmulatorOpt8BitControls enables parsing of C1 controls, such as CSI and OSC,
+// when they are presented as raw 8-bit bytes or UTF-8 encoded C1 controls.
+// The default is to only accept the 7-bit ESC-prefixed forms.
+type EmulatorOpt8BitControls struct{}
+
+func (EmulatorOpt8BitControls) setEmulatorOpt(em *emulator) {
+	em.c1Allowed = true
+	em.c1Enabled = true
+}
+
+// NewEmulator creates an emulator instance on top of the given backend.
+// The input is relative to the emulator, so it receives data from the host,
+// whereas the emulator sends data to the application through the output.
+func NewEmulator(be Backend, opts ...EmulatorOpt) Emulator {
+	stopQ := make(chan bool)
+	defStyle := BaseStyle.WithFg(color.Silver).WithBg(color.Black)
+	em := &emulator{
+		be:           be,
+		inBuf:        &bytes.Buffer{},
+		writeQ:       make(chan any),
+		readQ:        make(chan any, 1024),
+		stopQ:        stopQ,
+		style:        defStyle,
+		defaultStyle: defStyle,
+		ansiModes: map[AnsiMode]ModeStatus{
+			AmNewLineMode: ModeOff,
+		},
+		localModes: map[PrivateMode]ModeStatus{
+			PmAppCursor:       ModeOff,
+			PmAutoMargin:      ModeOn,
+			PmAutoRepeat:      ModeOn,
+			PmVT52:            ModeOnLocked, // we never support VT52 mode (note ON means ANSI mode)
+			PmLeftRightMargin: ModeOff,
+			PmShowCursor:      ModeOn,
+			PmBlinkCursor:     ModeOn,
+			PmWin32Input:      ModeOff,
+		},
+		mouseReports: MouseDisabled,
+	}
+	for _, opt := range opts {
+		opt.setEmulatorOpt(em)
+	}
+	if _, ok := be.(Resizer); ok {
+		em.localModes[PmResizeReports] = ModeOff
+	}
+
+	// add mouse modes - we also add focus reporting mode
+	if _, ok := be.(Mouser); ok {
+		em.localModes[PmMouseX10] = ModeOff
+		em.localModes[PmMouseButton] = ModeOff
+		em.localModes[PmMouseDrag] = ModeOff
+		em.localModes[PmMouseMotion] = ModeOff
+		em.localModes[PmMouseSgr] = ModeOff
+		em.localModes[PmFocusReports] = ModeOff
+	}
+
+	if ak, ok := be.(AdvancedKeyboard); ok && ak.IsAdvancedKeyboard() {
+		em.localModes[PmWin32Input] = ModeOff
+	}
+
+	em.size = em.be.GetSize()
+	em.topMargin = 0
+	em.botMargin = em.size.Y - 1
+	em.ltMargin = 0
+	em.rtMargin = em.size.X - 1
+	em.cells = make([]Cell, int(em.size.X)*int(em.size.Y))
+	em.graphemeIter = *graphemes.FromBytes(nil)
+	close(stopQ)
+	em.inb = em.inbInit
+	em.cursor = BlinkingBlock
+	em.be.SetCursor(em.cursor)
+	return em
+}
+
+// emulator is an implementation of a terminal emulator built on top of
+// a Backend.  It implements the common escape sequence handling and high
+// level functionality that a real terminal emulator, or a mock, would need.
+type emulator struct {
+	stopQ          chan bool
+	writeQ         chan any // queues data from application to emulator
+	readQ          chan any // queues data from emulator to application
+	be             Backend
+	inBuf          *bytes.Buffer // buffer queued for input
+	inb            func(byte)    // input byte function (faster than state switch)
+	style          Style
+	defaultStyle   Style
+	utfLen         int
+	pos            Coord
+	buffering      uint         // reference count - number of (re-entrant) buffering calls
+	autoWrap       bool         // next character will wrap (auto margin, deferred until char emitted)
+	c1Allowed      bool         // allow C1 controls in raw 8-bit and UTF-8 encodings
+	c1Enabled      bool         // C1 controls are currently enabled
+	c1Prefix       bool         // string parser has seen the first byte of a UTF-8 encoded C1 control
+	appKeyPad      bool         // use application key pad keys?
+	name           string       // name of this emulator (used for extended attributes)
+	vers           string       // version string of this emulator (used for extended attributes)
+	saved          savedCursor  // data saved by save cursor (DECSC)
+	sendLock       sync.Mutex   // ensures that send data cannot be intermixed
+	modeLock       sync.RWMutex // protects localModes/ansiModes and related derived state
+	tabStops       []Col        // tab stops, ordered. if nil every 8th position is used
+	lastIndex      int          // index of last cell written + 1 (for grapheme clustering) (zero means none)
+	graphemeBuf    []byte       // scratch buffer for grapheme clustering checks
+	graphemeIter   graphemes.Iterator[[]byte]
+	runeStrings    runeStringCache
+	clusterStrings clusterStringCache
+	cells          []Cell         // content of cells, we have to maintain our own copy (backend might or might not)
+	mouseReports   MouseReporting // whether we have enabled mouse reports
+	size           Coord          // physical window size
+	topMargin      Row            // top margin, scrollable region includes this row
+	botMargin      Row            // bottom margin, scrollable region includes this row
+	ltMargin       Col            // left margin, scrollable region to the right
+	rtMargin       Col            // right margin, scrollable region to the left
+	cursor         CursorStyle    // current cursor style (visibility, blink, shape)
+
+	localModes map[PrivateMode]ModeStatus // some modes we handle locally
+	ansiModes  map[AnsiMode]ModeStatus    // some modes we handle locally
+}
+
+// savedCursor is the content we save when saving the cursor,
+// which is more than just the cursor location itself.
+type savedCursor struct {
+	pos      Coord
+	style    Style
+	autoWrap bool
+	// We should probably store OSC 8 data here, eventually.
+	// TODO: Character sets
+	// TODO: Origin mode (DEC Mode 6)
+}
+
+func (em *emulator) saveCursor() {
+	em.saved.pos = em.getPosition()
+	em.saved.style = em.style
+	em.saved.autoWrap = em.autoWrap
+}
+
+func (em *emulator) restoreCursor() {
+	em.setPosition(em.saved.pos)
+	em.autoWrap = em.saved.autoWrap
+	em.style = em.saved.style
+}
+
+func (em *emulator) bufferingStart() {
+	em.buffering++
+	if em.buffering == 1 {
+		em.be.Buffering(true)
+	}
+}
+
+func (em *emulator) bufferingEnd() {
+	em.buffering--
+	if em.buffering == 0 {
+		em.be.Buffering(false)
+	}
+}
+
+// inbInit processes bytes received in the "default" state. Most often these are just
+// text characters to display on screen, but if ESC is seen then additional processing will result.
+func (em *emulator) inbInit(b byte) {
+	em.inBuf.Reset()
+
+	// hot path - just doing ASCII directly.
+	if b >= ' ' && b < 0x7f {
+		// plain ascii
+		em.putRune(rune(b))
+		return
+	}
+
+	// For C1 controls, the raw 8-bit form is the same as ESC followed by
+	// (b - 0x40). This is disabled by default because modern protocols
+	// generally treat these forms as insecure.
+	if b >= 0x80 && b <= 0x9f {
+		if em.c1Enabled {
+			em.inbEsc(b - 0x40)
+		}
+		return
+	}
+
+	// TODO: To support non-UTF-8 locales, include a check here for > 0x7F.  Those locales
+	// might preclude 8-bit control sequences - 8859 character sets are fine, but e.g. KOI8,
+	// and ShiftJIS use values in those ranges.
+
+	switch b {
+	case 0x1b: // ESC (escape)
+		em.inb = em.inbEsc
+	case 0x07: // BEL (bell)
+		em.beep()
+	case 0x08: // BS (backspace)
+		em.moveLeft()
+	case 0x09: // horizontal tab
+		em.nextTab()
+	case 0x0a, 0x0b, 0x0c: // LF (line feed), VF, FF
+		em.processLineFeed()
+	case 0x0d: // CR (carriage return)
+		em.processCarriageReturn()
+	case 0x0e: // TODO: SO
+		em.lastIndex = 0
+	case 0x0f: // TODO: SI
+		em.lastIndex = 0
+	case 0x18: //TODO Cancel (reset parser)
+		em.lastIndex = 0
+	default:
+		// TODO: consider separating Unicode from other 8-bit character sets
+		if b&0xE0 == 0xC0 {
+			em.utfLen = 2
+			em.inb = em.inbUTF
+			em.inBuf.WriteByte(b)
+		} else if b&0xF0 == 0xE0 {
+			em.utfLen = 3
+			em.inb = em.inbUTF
+			em.inBuf.WriteByte(b)
+		} else if b&0xF8 == 0xF0 {
+			em.utfLen = 4
+			em.inb = em.inbUTF
+			em.inBuf.WriteByte(b)
+		} else {
+			em.lastIndex = 0
+			em.beep()
+		}
+	}
+}
+
+// inbEsc processes the next byte after an escape character is seen.
+func (em *emulator) inbEsc(b byte) {
+
+	// By default, reset to init state. Other states will be set explicitly as needed.
+	em.inb = em.inbInit
+	em.lastIndex = 0
+
+	switch b {
+	case '[':
+		em.inb = em.inbCSI
+	case ']':
+		em.inb = em.inbOSC
+	case ' ', '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/':
+		// 0x20 - 0x2F -- usually followed by just one terminating character, but could include others
+		em.inb = em.inbNF
+		em.inBuf.WriteByte(b)
+	case '^': // privacy message (PM)
+		em.inb = em.inbStr
+	case '_': // application program command (APC)
+		em.inb = em.inbStr
+	case '=':
+		em.appKeyPad = true
+	case '>':
+		em.appKeyPad = false
+	case 'D': // down one line (IND)
+		em.processIndex()
+	case 'E': // next line (NEL)
+		em.nextLine()
+	case 'H': // set tab stop (HTS) - VT52 is go home, but we do not support VT52
+		em.setTabStop(em.getPosition().X)
+	case 'M': // up one line (RI)
+		em.processReverseIndex()
+	case 'N': // single shift two (SS2) (TODO)
+	case 'O': // single shift three (SS3) (TODO)
+	case 'P':
+		em.inb = em.inbStr // device control string (DCS) (TODO)
+	case 'X': // start of string (SOS)
+		em.inb = em.inbStr
+	case 'Z': // DECID, obsolete form to get primary DA
+		em.sendDA()
+	case 'c': // RIS, soft reset
+		em.softReset()
+	case '6': // back index (DECBI, VT420, not widely supported)
+		em.moveLeft()
+	case '7': // save cursor (DECSC, VT100)
+		em.saveCursor()
+	case '8': // restore cursor (DECRC, VT100)
+		em.restoreCursor()
+	case '9': // forward index (DECFI, VT420, not widely supported)
+		em.moveRight()
+	default:
+		// ESC-V and ESC-W are for guarded area (TODO)
+		em.inb = em.inbInit
+	}
+}
+
+// inbNF processes bytes that are part of an "nF" sequence (see ECMA-48).
+func (em *emulator) inbNF(b byte) {
+	if b >= 0x20 && b <= 0x2F {
+		em.inBuf.WriteByte(b)
+		return
+	}
+	if b < 0x20 || b > 0x7E { // not a valid sequence
+		em.beep()
+		em.inb = em.inbInit
+		return
+	}
+	em.inBuf.WriteByte(b)
+	em.inb = em.inbInit
+	switch em.inBuf.String() {
+	case "#8": // DECALN - fill screen with 'E'
+		size := em.size
+		em.autoWrap = false
+		em.topMargin = 0
+		em.botMargin = em.size.Y - 1
+		em.ltMargin = 0
+		em.rtMargin = em.size.X - 1
+		em.setPosition(Coord{0, 0})
+		em.style = em.style.WithAttr(Plain)
+		// TODO: Reset DECOM (when we implement origin mode)
+		for row := range size.Y {
+			ix := em.index(Coord{X: 0, Y: row})
+			for col := range size.X {
+				em.cells[ix].S = em.style
+				em.cells[ix].C = "E"
+				em.cells[ix].W = 1
+				em.be.Put(Coord{X: col, Y: row}, em.cells[ix])
+				ix++
+			}
+		}
+		// most implementations leave the cursor at home for this
+		em.setPosition(Coord{0, 0})
+
+		// case "%@": // TODO: select 8859-1
+		// case "%G": // TODO: select UTF-8
+		// case "(A": // TODO: select G0 as UK
+		// case "(B": // TODO: select G0 as US
+		// case "(C", "(5": // TODO: select G0 as Finnish
+		// case "(H", "(7": // TODO: select G0 as Swedish
+		// case "(K": // TODO: select G0 as German
+		// case "(Q", "(9": // TODO: select G0 as French Canadian
+		// case "(R", "(f": // TODO: select G0 as French
+		// case "(Y": // TODO: select G0 as Italian
+	case " F": // S7C1T - send/use 7-bit C1 controls
+		em.c1Enabled = false
+	case " G": // S8C1T - send/use 8-bit C1 controls
+		if em.c1Allowed {
+			em.c1Enabled = true
+		}
+	}
+}
+
+// inbCSI handles bytes that are part of a CSI based sequence.
+func (em *emulator) inbCSI(b byte) {
+	if (b >= 0x30) && (b <= 0x3F) {
+		em.inBuf.WriteByte(b) // parameter bytes
+	} else if (b >= 0x20) && (b <= 0x2F) {
+		em.inBuf.WriteByte(b) // intermediate bytes
+	} else if b >= 0x40 && (b <= 0x7F) {
+		em.inb = em.inbInit
+		em.processCsi(b)
+	} else {
+		// error state
+		em.beep()
+		em.inb = em.inbInit
+	}
+}
+
+// inbOSC handles bytes that are part of on OSC sequences (operating system command).
+func (em *emulator) inbOSC(b byte) {
+	if em.inbStringC1(b, em.processOSC) {
+		return
+	}
+
+	switch b {
+	case 0x9c:
+		if em.c1Enabled {
+			em.inb = em.inbInit
+			em.processOSC()
+		}
+	case 0x07:
+		em.inb = em.inbInit
+		em.processOSC()
+	case '\\':
+		if buf := em.inBuf.Bytes(); len(buf) > 0 && buf[len(buf)-1] == 0x1b {
+			em.inb = em.inbInit
+			em.inBuf.Truncate(em.inBuf.Len() - 1)
+			em.processOSC()
+		} else {
+			em.inBuf.WriteByte(b)
+		}
+	default:
+		em.inBuf.WriteByte(b)
+	}
+}
+
+// inbStr handles PM, SOS, and any other string we want to consume and discard.
+func (em *emulator) inbStr(b byte) {
+	if em.inbStringC1(b, nil) {
+		return
+	}
+
+	switch b {
+	case 0x9c:
+		if em.c1Enabled {
+			em.inb = em.inbInit
+		}
+	case 0x07:
+		em.inb = em.inbInit
+	case '\\':
+		if buf := em.inBuf.Bytes(); len(buf) > 0 && buf[len(buf)-1] == 0x1b {
+			em.inb = em.inbInit
+			em.inBuf.Truncate(em.inBuf.Len() - 1)
+		} else {
+			em.inBuf.WriteByte(b)
+		}
+	default:
+		em.inBuf.WriteByte(b)
+	}
+}
+
+func (em *emulator) inbStringC1(b byte, done func()) bool {
+	if em.c1Prefix {
+		em.c1Prefix = false
+		if b >= 0x80 && b <= 0x9f {
+			if em.c1Enabled && b == 0x9c {
+				em.inb = em.inbInit
+				if done != nil {
+					done()
+				}
+			}
+			return true
+		}
+		em.inBuf.WriteByte(0xc2)
+	}
+	if b == 0xc2 {
+		em.c1Prefix = true
+		return true
+	}
+	return false
+}
+
+// inbUTF handles continuation bytes for UTF-8 sequences.
+func (em *emulator) inbUTF(b byte) {
+	if b&0xC0 == 0x80 {
+		// good continuation byte
+		em.inBuf.WriteByte(b)
+		if em.inBuf.Len() == em.utfLen {
+			em.inb = em.inbInit
+			r, _, err := em.inBuf.ReadRune()
+			if err != nil {
+				em.beep()
+			} else {
+				if r >= 0x80 && r <= 0x9f {
+					if em.c1Enabled {
+						em.inbEsc(byte(r) - 0x40)
+					}
+				} else {
+					em.putRune(r)
+				}
+			}
+		}
+	} else {
+		em.beep()
+		em.inb = em.inbInit
+	}
+}
+
+func (em *emulator) beep() {
+	if beeper, ok := em.be.(Beeper); ok {
+		beeper.Beep()
+	}
+}
+
+// numericParams splits the string consisting of numeric parameters into integers.
+// It ensures a minimum number are present (needed for some safety cases).
+// Empty strings default to zero.
+func numericParams(str string, minimumLen int) ([]int, error) {
+	ps := strings.Split(str, ";")
+	pi := make([]int, max(len(ps), minimumLen))
+	for i, str := range ps {
+		if str != "" {
+			if iv, err := strconv.Atoi(str); err != nil {
+				return nil, err
+			} else {
+				pi[i] = iv
+			}
+		}
+	}
+	return pi, nil
+}
+
+// parseSgrColor grabs either 2 arguments, or 4 arguments for palette or rgb values
+// used with SGR 38 and 48. The arguments must be numbers, and are returned as such.
+func (em *emulator) parseSgrColor(args []string, words []string) (color.Color, []string, error) {
+	if len(args) == 0 {
+		if len(words) == 0 {
+			return color.None, nil, errors.New("invalid color specification")
+		}
+
+		switch words[0] {
+		case "2": // RGB (direct)
+			if len(words) < 4 {
+				return color.None, nil, errors.New("invalid color specification")
+			}
+			args = words[:4]
+			words = words[4:]
+		case "5": // palette index
+			if len(words) < 2 {
+				return color.None, nil, errors.New("invalid color specification")
+			}
+			args = words[:2]
+			words = words[2:]
+		default:
+			return color.None, nil, errors.New("invalid color specification")
+		}
+	}
+
+	switch args[0] {
+	case "2": // RGB color
+		if len(args) < 4 || em.be.Colors() <= 256 {
+			return color.None, nil, errors.New("invalid color specification")
+		}
+		r, re := strconv.Atoi(args[1])
+		g, ge := strconv.Atoi(args[2])
+		b, be := strconv.Atoi(args[3])
+		if re != nil || ge != nil || be != nil || r > 255 || g > 255 || b > 255 || r < 0 || g < 0 || b < 0 {
+			return color.None, nil, errors.New("invalid color specification")
+		}
+		return color.NewRGBColor(int32(r), int32(g), int32(b)), words, nil
+	case "5": // palette index
+		if len(args) < 2 {
+			return color.None, nil, errors.New("invalid color specification")
+		}
+		p, e := strconv.Atoi(args[1])
+		if e != nil || p < 0 || p >= em.be.Colors() {
+			return color.None, nil, errors.New("invalid color specification")
+		}
+		return color.IsValid | color.Color(p&0xff), words, nil
+	}
+
+	return color.None, nil, errors.New("invalid color specification")
+}
+
+func (em *emulator) pickColor(c color.Color, def color.Color) (color.Color, bool) {
+	numColors := em.be.Colors()
+	if numColors == 0 {
+		return color.None, false
+	}
+	if c.Valid() {
+		if c.IsRGB() {
+			if numColors > 256 {
+				return c, true
+			}
+		}
+		if (int(c) & 255) < numColors {
+			return c, true
+		}
+	}
+	if c == color.Reset {
+		return def, true
+	}
+	return color.None, false
+}
+
+// processSgr processes SGR commands (things that change how characters are displayed).
+func (em *emulator) processSgr(str string) {
+	words := strings.Split(str, ";")
+
+	// technically parameters for 38 or 48 should be separated by colons, but due to historical
+	// accident it is more common to see semicolon separation.  Underline styles are also separated
+	// by a colon, if present.
+	if len(words) == 0 {
+		words = []string{"0"}
+	}
+	for len(words) > 0 {
+		// we do this instead of a range so we can lop off
+		// multiple words for SGR38 and 48.
+		word := words[0]
+		words = words[1:]
+
+		if word == "" {
+			word = "0"
+		}
+		args := []string(nil)
+		if strings.Contains(word, ":") {
+			args = strings.Split(word, ":")
+			word = args[0]
+			args = args[1:]
+		}
+
+		v, err := strconv.Atoi(word)
+		if err != nil {
+			// just swallow it for now
+			continue
+		}
+		switch v {
+		case 0:
+			em.style = em.defaultStyle
+		case 1:
+			em.style = em.style.WithAttr((em.style.Attr() &^ Dim) | Bold)
+		case 2:
+			em.style = em.style.WithAttr((em.style.Attr() &^ Bold) | Dim)
+		case 3:
+			em.style = em.style.WithAttr(em.style.Attr() | Italic)
+		case 4:
+			em.style = em.style.WithAttr((em.style.Attr() &^ UnderlineMask) | Underline)
+
+			if len(args) > 0 {
+				switch args[0] {
+				case "2":
+					em.style = em.style.WithAttr(em.style.Attr() | DoubleUnderline)
+				case "3":
+					em.style = em.style.WithAttr(em.style.Attr() | CurlyUnderline)
+				case "4":
+					em.style = em.style.WithAttr(em.style.Attr() | DottedUnderline)
+				case "5":
+					em.style = em.style.WithAttr(em.style.Attr() | DashedUnderline)
+				}
+			}
+		case 5, 6:
+			em.style = em.style.WithAttr(em.style.Attr() | Blink)
+		case 7:
+			em.style = em.style.WithAttr(em.style.Attr() | Reverse)
+		case 8: // ignore, its for invisible
+		case 9:
+			em.style = em.style.WithAttr(em.style.Attr() | StrikeThrough)
+		case 21: // Doubly underlined, per ECMA
+			em.style = em.style.WithAttr((em.style.Attr() &^ UnderlineMask) | DoubleUnderline)
+		case 22:
+			em.style = em.style.WithAttr(em.style.Attr() &^ (Bold | Dim))
+		case 23:
+			em.style = em.style.WithAttr(em.style.Attr() &^ Italic)
+		case 24:
+			em.style = em.style.WithAttr(em.style.Attr() &^ UnderlineMask)
+		case 25:
+			em.style = em.style.WithAttr(em.style.Attr() &^ Blink)
+		case 27:
+			em.style = em.style.WithAttr(em.style.Attr() &^ Reverse)
+		case 29:
+			em.style = em.style.WithAttr(em.style.Attr() &^ StrikeThrough)
+
+		case 30, 31, 32, 33, 34, 35, 36, 37: // simple foreground colors
+			if c, ok := em.pickColor(color.Black+color.Color(v-30), em.defaultStyle.Fg()); ok {
+				em.style = em.style.WithFg(c)
+			}
+		case 38:
+			if c, rest, err := em.parseSgrColor(args, words); err == nil {
+				words = rest
+				em.style = em.style.WithFg(c)
+			}
+		case 39:
+			if c, ok := em.pickColor(color.Reset, em.defaultStyle.Fg()); ok {
+				em.style = em.style.WithFg(c)
+			}
+		case 40, 41, 42, 43, 44, 45, 46, 47: // simple background colors
+			if c, ok := em.pickColor(color.Black+color.Color(v-40), em.defaultStyle.Bg()); ok {
+				em.style = em.style.WithBg(c)
+			}
+		case 48:
+			if c, rest, err := em.parseSgrColor(args, words); err == nil {
+				words = rest
+				em.style = em.style.WithBg(c)
+			}
+		case 49:
+			if c, ok := em.pickColor(color.Reset, em.defaultStyle.Bg()); ok {
+				em.style = em.style.WithBg(c)
+			}
+		case 53:
+			em.style = em.style.WithAttr(em.style.Attr() | Overline)
+		case 55:
+			em.style = em.style.WithAttr(em.style.Attr() &^ Overline)
+		case 58:
+			if c, rest, err := em.parseSgrColor(args, words); err == nil {
+				words = rest
+				em.style = em.style.WithUc(c)
+			}
+		}
+	}
+}
+
+// processCursorUp implements CUU.
+func (em *emulator) processCursorUp(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		em.moveUpN(Row(max(1, pi[0])))
+	}
+}
+
+// processCursorDown implements CUD.
+func (em *emulator) processCursorDown(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		em.moveDownN(Row(max(1, pi[0])))
+	}
+}
+
+// processCursorForward implements CUF.
+func (em *emulator) processCursorForward(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		em.moveRightN(Col(max(1, pi[0])))
+	}
+}
+
+// processCursorBackward implements CUB.
+func (em *emulator) processCursorBackward(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		em.moveLeftN(Col(max(1, pi[0])))
+	}
+}
+
+// processCursorNextLine implements CNL.
+func (em *emulator) processCursorNextLine(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		em.moveDownN(Row(max(1, pi[0])))
+		pos := em.getPosition()
+		pos.X = 0
+		em.setPosition(pos)
+	}
+}
+
+// processCursorPreviousLine implements CPL.
+func (em *emulator) processCursorPreviousLine(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		em.moveUpN(Row(max(1, pi[0])))
+		pos := em.getPosition()
+		pos.X = 0
+		em.setPosition(pos)
+	}
+}
+
+// processCursorColumn implements CHA.
+func (em *emulator) processCursorColumn(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		pos := em.getPosition()
+		// TODO: possibly clip to margins (origin mode)
+		pos.X = min(Col(max(1, pi[0])), em.size.X) - 1
+		em.setPosition(pos)
+	}
+}
+
+// processCursorPosition implements CUP, and also HVP.
+func (em *emulator) processCursorPosition(str string) {
+	if pi, err := numericParams(str, 2); err == nil {
+		em.autoWrap = false
+		pos := em.getPosition()
+		wsz := em.size
+		row := Row(max(1, pi[0]))
+		col := Col(max(1, pi[1]))
+		row = max(1, min(row, wsz.Y))
+		col = max(1, min(col, wsz.X))
+		pos.X = col - 1
+		pos.Y = row - 1
+		em.setPosition(pos)
+	}
+}
+
+// processCursorTab implements CHT.
+func (em *emulator) processCursorTab(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		// Note: tab does not clear this field.
+		for range max(1, pi[0]) {
+			em.nextTab()
+		}
+	}
+}
+
+// processCursorBackTab implements CBT.
+func (em *emulator) processCursorBackTab(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		for range max(1, pi[0]) {
+			em.prevTab()
+		}
+	}
+}
+
+// processEraseDisplay implements ED.
+func (em *emulator) processEraseDisplay(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.bufferingStart()
+		defer em.bufferingEnd()
+
+		switch pi[0] {
+		case 0: // erase below
+			em.eraseBelow()
+		case 1: // erase above
+			em.eraseAbove()
+		case 2: // erase all
+			em.eraseAll()
+			// others not supported (3 is erase saved lines)
+		}
+	}
+}
+
+// processEraseLine implements EL.
+func (em *emulator) processEraseLine(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.bufferingStart()
+		defer em.bufferingEnd()
+
+		switch pi[0] {
+		case 0:
+			em.eraseToLineEnd()
+		case 1:
+			em.eraseToLineStart()
+		case 2:
+			em.eraseLine()
+		}
+	}
+}
+
+// processEraseCharacter implements ECH.
+// This ignores the margin.
+func (em *emulator) processEraseCharacter(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		pos := em.pos
+		// TODO: delete wide character if we are splitting it at the start
+		em.bufferingStart()
+		defer em.bufferingEnd()
+		for range max(1, pi[0]) {
+
+			em.eraseCell(pos)
+			pos.X++
+			if pos.X >= em.size.X {
+				break
+			}
+		}
+	}
+}
+
+// processScrollUp implements SU (VT420.)
+func (em *emulator) processScrollUp(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.bufferingStart()
+		defer em.bufferingEnd()
+		for range max(pi[0], 1) {
+			// TODO: consider faster jump scroll.
+			// This should be something tunable as well.
+			em.scrollUp()
+		}
+	}
+}
+
+// processScrollDown implements SD (VT420.)
+func (em *emulator) processScrollDown(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.bufferingStart()
+		defer em.bufferingEnd()
+		for range max(pi[0], 1) {
+			// TODO: consider faster jump scroll.
+			// This should be something tunable as well.
+			em.scrollDown()
+		}
+	}
+}
+
+// processWindowOps handles CSI ... t window operations.
+func (em *emulator) processWindowOps(str string) {
+	if pi, err := numericParams(str, 3); err == nil {
+		switch pi[0] {
+		case 8: // Resize window: CSI 8 ; rows ; cols t
+			rows := pi[1]
+			cols := pi[2]
+			if rows < 1 || cols < 1 {
+				return
+			}
+			size := Coord{X: Col(cols), Y: Row(rows)}
+			if ws, ok := em.be.(interface{ SetSize(Coord) }); ok {
+				ws.SetSize(size)
+				em.applyResize(size)
+			}
+
+		case 18: // Report text area size: CSI 8 ; rows ; cols t
+			em.SendRaw(fmt.Appendf(nil, "\x1b[8;%d;%dt", em.size.Y, em.size.X))
+		}
+	}
+}
+
+// processVerticalMargins implements DECSTBM (set top and bottom margins, VT220.)
+func (em *emulator) processVerticalMargins(str string) {
+	if pi, err := numericParams(str, 2); err == nil {
+		pi[0] = max(1, pi[0])
+		if pi[1] == 0 {
+			pi[1] = int(em.size.Y)
+		}
+		pi[0]--
+		pi[1]--
+
+		top := min(Row(pi[0]), em.size.Y-1)
+		bot := min(Row(pi[1]), em.size.Y-1)
+
+		// no change if values are out of range
+		if bot > top {
+			em.topMargin = top
+			em.botMargin = bot
+			em.setPosition(Coord{X: 0, Y: 0})
+		}
+	}
+}
+
+// processHorizontalMargins implements DECSLRM (set left and right margins, VT400.)
+// It only works if Private Mode 69 (Left and Right margins)
+func (em *emulator) processHorizontalMargins(str string) {
+	if em.getPrivateMode(PmLeftRightMargin) != ModeOn {
+		// For compat with SCO and ANSI.SYS.
+		if str == "" {
+			em.saveCursor()
+		}
+		return
+	}
+	if pi, err := numericParams(str, 2); err == nil {
+		pi[0] = max(1, pi[0])
+		if pi[1] == 0 {
+			pi[1] = int(em.size.X)
+		}
+		pi[0]--
+		pi[1]--
+
+		lm := min(Col(pi[0]), em.size.X-1)
+		rm := min(Col(pi[1]), em.size.X-1)
+
+		// no change if values are out of range
+		if rm > lm {
+			em.rtMargin = rm
+			em.ltMargin = lm
+			em.setPosition(Coord{X: 0, Y: 0})
+		}
+	}
+}
+
+// processIndex moves down, unless already on the bottom margin, in which case it scrolls Up.
+func (em *emulator) processIndex() {
+	pos := em.getPosition()
+	em.autoWrap = false
+	if pos.Y == em.botMargin && em.ltMargin <= pos.X && pos.X <= em.rtMargin {
+		em.scrollUp()
+	} else {
+		em.processCursorDown("")
+	}
+}
+
+// processCarriageReturn handle CR.
+func (em *emulator) processCarriageReturn() {
+	em.lastIndex = 0
+	em.setPosition(Coord{0, em.getPosition().Y})
+}
+
+// processLineFeed is like IND, but if ANSI mode 20 is set, then a CR is appended as well.
+func (em *emulator) processLineFeed() {
+	em.lastIndex = 0
+	em.processIndex()
+	if em.getAnsiMode(AmNewLineMode) == ModeOn {
+		em.processCarriageReturn()
+	}
+}
+
+// processReverseIndex moves up, unless already on the top margin, in which case it scrolls down.
+func (em *emulator) processReverseIndex() {
+	pos := em.getPosition()
+	if pos.Y == em.topMargin {
+		em.scrollDown()
+	} else {
+		em.processCursorUp("")
+	}
+}
+
+// processCursorRow implements VPA (set vertical position absolute)
+func (em *emulator) processCursorRow(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		pos := em.getPosition()
+		pos.Y = min(Row(max(1, pi[0])), em.size.Y) - 1
+		em.setPosition(pos)
+	}
+}
+
+// processCursorRowAdvance implements VPR (vertical position relative).
+func (em *emulator) processCursorRowAdvance(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		pos := em.getPosition()
+		pos.Y = min(pos.Y+Row(max(1, pi[0])), em.size.Y-1)
+		em.setPosition(pos)
+	}
+}
+
+// processInsertLine implements IL.
+func (em *emulator) processInsertLine(str string) {
+	// insert line only takes effect within the scrolling region
+	if em.pos.X < em.ltMargin || em.pos.X > em.rtMargin ||
+		em.pos.Y < em.topMargin || em.pos.Y > em.botMargin {
+		return
+	}
+
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		num := Row(max(1, pi[0]))
+		num = min(num, em.botMargin-em.pos.Y+1)
+
+		// process as a scroll down at our position.
+		top := em.topMargin
+		em.topMargin = em.pos.Y
+		for range num {
+			em.scrollDown()
+		}
+		em.topMargin = top
+		em.pos.X = 0
+		em.setPosition(em.pos)
+	}
+}
+
+// processDeleteLine implements DL.
+func (em *emulator) processDeleteLine(str string) {
+	// delete line only takes effect within the scrolling region
+	if em.pos.X < em.ltMargin || em.pos.X > em.rtMargin ||
+		em.pos.Y < em.topMargin || em.pos.Y > em.botMargin {
+		return
+	}
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		num := Row(max(1, pi[0]))
+		num = min(num, em.botMargin-em.pos.Y+1)
+		if num < 1 {
+			return
+		}
+		// process as a scroll up at our position.
+		top := em.topMargin
+		em.topMargin = em.pos.Y
+		for range num {
+			em.scrollUp()
+		}
+		em.topMargin = top
+		em.pos.X = 0
+		em.setPosition(em.pos)
+	}
+}
+
+// processDeleteCharacter implements DCH.
+func (em *emulator) processDeleteCharacter(str string) {
+	// only takes effect within the scrolling region
+	if em.pos.X < em.ltMargin || em.pos.X > em.rtMargin ||
+		em.pos.Y < em.topMargin || em.pos.Y > em.botMargin {
+		return
+	}
+	em.bufferingStart()
+	defer em.bufferingEnd()
+
+	if pi, err := numericParams(str, 1); err == nil {
+		em.autoWrap = false
+		num := Col(max(1, pi[0]))
+		num = min(num, em.rtMargin-em.pos.X+1)
+		if num < 1 {
+			return
+		}
+		// this is essentially a one line scroll left
+		pos := em.pos
+
+		// if we are breaking a wide rune, delete it (but preserve style)
+		if em.pos.X > 0 {
+			if ix := em.index(em.pos); em.cells[ix-1].W > 1 {
+				em.cells[ix-1].C = ""
+				em.cells[ix-1].W = 0
+				em.be.Put(Coord{X: em.pos.X - 1, Y: em.pos.Y}, em.cells[ix-1])
+			}
+		}
+
+		for range num {
+			src := Coord{X: em.pos.X + 1, Y: em.pos.Y}
+			dst := Coord{X: em.pos.X, Y: em.pos.Y}
+			dim := Coord{X: em.rtMargin - em.pos.X, Y: 1}
+			em.blit(src, dst, dim)
+			em.eraseCell(Coord{X: em.rtMargin, Y: em.pos.Y})
+		}
+		em.pos = pos
+		em.setPosition(em.pos)
+	}
+}
+
+// processInsertCharacter implements ICH.
+func (em *emulator) processInsertCharacter(str string) {
+	em.autoWrap = false
+	// only takes effect within the scrolling region -- HOWEVER,
+	// ICH still resets auto-wrap in this case, unlike DCH.
+	if em.pos.X < em.ltMargin || em.pos.X > em.rtMargin ||
+		em.pos.Y < em.topMargin || em.pos.Y > em.botMargin {
+		return
+	}
+	em.bufferingStart()
+	defer em.bufferingEnd()
+	if pi, err := numericParams(str, 1); err == nil {
+		num := Col(max(1, pi[0]))
+		num = min(num, em.rtMargin-em.pos.X+1)
+		if num < 1 {
+			return
+		}
+
+		// this is essentially a one line scroll right
+		pos := em.pos
+
+		// if we are breaking a wide rune, delete it
+		if em.pos.X > 0 {
+			if ix := em.index(em.pos); em.cells[ix-1].W > 1 {
+				em.cells[ix-1].C = ""
+				em.cells[ix-1].W = 0
+				em.be.Put(Coord{X: em.pos.X - 1, Y: em.pos.Y}, em.cells[ix-1])
+			}
+		}
+
+		for range num {
+			src := Coord{X: em.pos.X, Y: em.pos.Y}
+			dst := Coord{X: em.pos.X + 1, Y: em.pos.Y}
+			dim := Coord{X: em.rtMargin - em.pos.X, Y: 1}
+			em.blit(src, dst, dim)
+			ix := em.index(Coord{X: em.pos.X, Y: em.pos.Y})
+			em.cells[ix].C = ""
+			em.cells[ix].W = 0
+			em.cells[ix].S = em.style
+			// NB: We don't use eraseCell, because we need to preserve attributes.
+			em.be.Put(Coord{X: em.pos.X, Y: em.pos.Y}, em.cells[ix])
+		}
+
+		// if we clipped off the end of a wide character, then delete it.
+		if ix := em.index(Coord{X: em.rtMargin, Y: em.pos.Y}); em.cells[ix].W > 1 {
+			em.cells[ix].C = ""
+			em.cells[ix].W = 0
+			em.be.Put(Coord{X: em.rtMargin, Y: em.pos.Y}, em.cells[ix])
+		}
+
+		em.pos = pos
+		em.setPosition(em.pos)
+	}
+}
+
+// processSetMode implements SM (set ANSI mode).
+func (em *emulator) processSetMode(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		for _, pm := range pi {
+			em.setAnsiMode(AnsiMode(pm), ModeOn)
+		}
+	}
+}
+
+// processResetMode implements RM (reset ANSI mode).
+func (em *emulator) processResetMode(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		for _, pm := range pi {
+			em.setAnsiMode(AnsiMode(pm), ModeOff)
+		}
+	}
+}
+
+// processRequestMode implements DECRQM for ANSI modes.
+// Only a single numeric parameter (mode number) can be supplied (VT300+)
+func (em *emulator) processRequestMode(str string) {
+	if m, err := strconv.Atoi(str); err == nil {
+		am := AnsiMode(m)
+		status := em.getAnsiMode(am)
+		em.SendRaw([]byte(am.Reply(status)))
+	}
+}
+
+// processSetPrivateMode implements DECSET (set private mode).
+func (em *emulator) processSetPrivateMode(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		for _, pm := range pi {
+			em.setPrivateMode(PrivateMode(pm), ModeOn)
+		}
+	}
+}
+
+// processResetPrivateMode implements DECRST (reset private mode).
+func (em *emulator) processResetPrivateMode(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		for _, pm := range pi {
+			em.setPrivateMode(PrivateMode(pm), ModeOff)
+		}
+	}
+}
+
+// processRequestPrivateMode implements DECRQM for private modes.
+// Only a single numeric parameter (mode number) can be supplied (VT300+)
+func (em *emulator) processRequestPrivateMode(str string) {
+	if m, err := strconv.Atoi(str); err == nil {
+		pm := PrivateMode(m)
+		status := em.getPrivateMode(pm)
+		em.SendRaw([]byte(pm.Reply(status)))
+	}
+}
+
+// processTabReset implements DECST8C (set tab stops to every 8 chars)
+func (em *emulator) processTabReset(str string) {
+	if pi, err := numericParams(str, 1); err == nil && pi[0] == 5 {
+		em.tabStops = nil
+	}
+}
+
+// processTabClear implements TBC (clear horizontal tab).
+func (em *emulator) processTabClear(str string) {
+	if pi, err := numericParams(str, 1); err == nil {
+		switch pi[0] {
+		case 0: // clear stop at current column
+			em.clrTabStop(em.getPosition().X)
+		case 3: // clear all columns
+			em.tabStops = []Col{} // this is distinct from nil
+		}
+	}
+}
+
+// processPrimaryAttributes implements send DA.
+func (em *emulator) processPrimaryAttributes(str string) {
+	if pi, err := numericParams(str, 1); err == nil && pi[0] == 0 {
+		em.sendDA()
+	}
+}
+
+// processExtendedAttributes implements XTVERSION (send terminal name and version).
+func (em *emulator) processExtendedAttributes(str string) {
+	if pi, err := numericParams(str, 1); err == nil && pi[0] == 0 && em.name != "" {
+		em.SendRaw(fmt.Appendf(nil, "\x1bP>|%s %s\x1b\\", em.name, em.vers))
+	}
+}
+
+// processCursorStyle implements DECSCUSR (set cursor style).
+func (em *emulator) processCursorStyle(str string) {
+	// get previous visibility state, as we don't change it with this call.
+	visible := em.cursor.IsVisible()
+	if pi, err := numericParams(str, 1); err == nil {
+		switch pi[0] {
+		case 0, 1:
+			em.cursor = BlinkingBlock
+		case 2:
+			em.cursor = SteadyBlock
+		case 3:
+			em.cursor = BlinkingUnderline
+		case 4:
+			em.cursor = SteadyUnderline
+		case 5:
+			em.cursor = BlinkingBar
+		case 6:
+			em.cursor = SteadyBar
+		}
+		if !visible {
+			em.cursor = em.cursor.Hide()
+		}
+		em.be.SetCursor(em.cursor)
+	}
+}
+
+// processCsi processes CSI sequences.
+func (em *emulator) processCsi(final byte) {
+
+	// CSI sequences are supported in several different possible ways:
+	// parameters may have a prefix character that is not numeric, typically
+	// indicating a whole different mode of operation than the final byte.
+	// There may also be intermediate bytes, but we only look for one, because
+	// the use cases we have this are that only a single intermediate byte is
+	// sometimes used to affect function.  (E.g. $ in some cases.)
+	cmd := ""
+	if em.inBuf.Len() > 0 {
+		if b := em.inBuf.Bytes()[0]; b > '9' && b <= '?' {
+			cmd += string(b)
+			em.inBuf.ReadByte()
+		}
+	}
+	if l := em.inBuf.Len(); l > 0 {
+		if b := em.inBuf.Bytes()[l-1]; b >= 0x20 && b <= 0x2F {
+			cmd += string(b)
+			em.inBuf.Truncate(l - 1)
+		}
+	}
+	cmd += string(final)
+
+	str := em.inBuf.String()
+	switch cmd {
+
+	case "@":
+		em.processInsertCharacter(str)
+	case "A":
+		em.processCursorUp(str)
+	case "B":
+		em.processCursorDown(str)
+	case "C":
+		em.processCursorForward(str)
+	case "D":
+		em.processCursorBackward(str)
+	case "E":
+		em.processCursorNextLine(str)
+	case "F":
+		em.processCursorPreviousLine(str)
+	case "G":
+		em.processCursorColumn(str)
+	case "H", "f":
+		em.processCursorPosition(str)
+	case "I":
+		em.processCursorTab(str)
+	case "J":
+		em.processEraseDisplay(str)
+	case "K":
+		em.processEraseLine(str)
+	case "L":
+		em.processInsertLine(str)
+	case "M":
+		em.processDeleteLine(str)
+	case "P":
+		em.processDeleteCharacter(str)
+	case "S":
+		em.processScrollUp(str)
+	case "T":
+		em.processScrollDown(str)
+	case "X":
+		em.processEraseCharacter(str)
+	case "Z":
+		em.processCursorBackTab(str)
+	case "c":
+		em.processPrimaryAttributes(str)
+	case "d":
+		em.processCursorRow(str)
+	case "e":
+		em.processCursorRowAdvance(str)
+	case "g":
+		em.processTabClear(str)
+	case "h":
+		em.processSetMode(str)
+	case "l":
+		em.processResetMode(str)
+	case "m":
+		em.processSgr(str)
+	case "n":
+		em.deviceReport(str)
+	case "r":
+		em.processVerticalMargins(str)
+	case "s":
+		em.processHorizontalMargins(str)
+	case "t":
+		em.processWindowOps(str)
+	case " q":
+		em.processCursorStyle(str)
+	case "?W":
+		em.processTabReset(str)
+	case "?h":
+		em.processSetPrivateMode(str)
+	case "?l":
+		em.processResetPrivateMode(str)
+	case "$p":
+		em.processRequestMode(str)
+	case "?$p":
+		em.processRequestPrivateMode(str)
+	case ">q":
+		em.processExtendedAttributes(str)
+	}
+}
+
+// processClipboard handles OSC 52 commands.
+func (em *emulator) processClipboard(str string) {
+	clipper, ok := em.be.(Clipboard)
+	if !ok {
+		return
+	}
+
+	// first parameter is the target.  We only have a single
+	// target, and alias all possibilities to the same.
+	parts := strings.SplitN(str, ";", 2)
+	if len(parts) != 2 {
+		return
+	}
+
+	if parts[1] == "?" {
+		// request for clipboard content
+		data := clipper.GetClipboard()
+		if data != nil {
+			em.SendRaw(fmt.Appendf(nil, "\x1b]52;c;%s\x1b\\", base64.StdEncoding.EncodeToString(data)))
+		}
+		return
+	}
+
+	buf := make([]byte, base64.StdEncoding.DecodedLen(len(parts[1])))
+	if n, err := base64.StdEncoding.Decode(buf, []byte(parts[1])); err == nil {
+		clipper.SetClipboard(buf[:n])
+		return
+	}
+
+	clipper.SetClipboard([]byte{})
+}
+
+// processHyperLink handles OSC 8 commands.
+func (em *emulator) processHyperLink(str string) {
+	// format is params;URI params are colon separated key value pairs.
+	// if the URI is absent, then the link is terminated.
+	parts := strings.SplitN(str, ";", 2)
+	if len(parts) == 2 {
+		if parts[1] == "" {
+			// No URI
+			em.style = em.style.WithUrl("", "")
+			return
+		}
+		url := parts[1]
+		id := ""
+		for pair := range strings.SplitSeq(parts[0], ":") {
+			if val, ok := strings.CutPrefix(pair, "id="); ok {
+				id = val
+			}
+		}
+		em.style = em.style.WithUrl(url, id)
+	}
+}
+
+// processOSC processes an operating system command.
+func (em *emulator) processOSC() {
+
+	// Every OSC we support has a number, semicolon, then string.
+	ns, str, ok := strings.Cut(em.inBuf.String(), ";")
+	if !ok {
+		return
+	}
+	if num, err := strconv.Atoi(ns); err != nil {
+		return
+	} else {
+		switch num {
+		case 2: // Set window title
+			if t, ok := em.be.(Titler); ok {
+				// TODO: possibly validate the UTF-8 content?
+				em.bufferingStart()
+				defer em.bufferingEnd()
+				t.SetWindowTitle(str)
+			}
+		case 8:
+			em.processHyperLink(str)
+		case 52:
+			em.processClipboard(str)
+		}
+	}
+}
+
+func (em *emulator) getPosition() Coord {
+	pos := em.be.GetPosition()
+	em.pos = pos
+	return em.pos
+}
+
+func (em *emulator) setPosition(pos Coord) {
+	em.pos = pos
+	em.be.SetPosition(pos)
+}
+
+func (em *emulator) deviceReport(s string) {
+	switch s {
+	case "5":
+		em.SendRaw([]byte("\x1b[0n"))
+	case "6":
+		pos := em.getPosition()
+		em.SendRaw(fmt.Appendf(nil, "\x1b[%d;%dR", pos.Y+1, pos.X+1))
+	default: // ignore
+	}
+}
+
+func (em *emulator) moveUpN(count Row) {
+	for range count {
+		em.moveUp()
+	}
+}
+
+func (em *emulator) moveDownN(count Row) {
+	for range count {
+		em.moveDown()
+	}
+}
+
+func (em *emulator) moveLeftN(count Col) {
+	for range count {
+		em.moveLeft()
+	}
+}
+
+func (em *emulator) moveRightN(count Col) {
+	for range count {
+		em.moveRight()
+	}
+}
+
+// moveDown moves down, to the limit of either bottom margin, or the bottom of the screen if outside the margin.
+func (em *emulator) moveDown() {
+	pos := em.getPosition()
+	win := em.size
+	if pos.Y == em.botMargin || pos.Y == win.Y-1 {
+		return
+	}
+	pos.Y++
+	em.setPosition(pos)
+}
+
+// moveUp moves up, to the limit of either top margin, or zero if outside the margin.
+func (em *emulator) moveUp() {
+	pos := em.getPosition()
+	if pos.Y == 0 || pos.Y == em.topMargin {
+		return
+	}
+	pos.Y--
+	em.setPosition(pos)
+}
+
+func (em *emulator) moveLeft() {
+	em.autoWrap = false
+	em.lastIndex = 0
+	pos := em.getPosition()
+	if pos.X > 0 {
+		pos.X--
+		em.setPosition(pos)
+	}
+}
+
+func (em *emulator) moveRight() {
+	pos := em.getPosition()
+	win := em.size
+	if pos.X < win.X-1 {
+		pos.X++
+		em.setPosition(pos)
+	}
+}
+
+// nextLine is like CNL with 1, but it optionally also scrolls.
+func (em *emulator) nextLine() {
+	em.autoWrap = false
+	if em.pos.Y == em.botMargin {
+		em.scrollUp()
+	}
+	em.moveDown()
+	em.pos.X = 0
+	em.setPosition(em.pos)
+}
+
+// blit performs a data move operation.  It does ignores margins.
+func (em *emulator) blit(src, dst, dim Coord) {
+
+	em.bufferingStart()
+	defer em.bufferingEnd()
+
+	// save the source and destination for the backend blit
+	bsrc := src
+	bdst := dst
+
+	lim := em.size
+
+	// clip to visible source
+	if dim.X+src.X > lim.X {
+		dim.X = lim.X - src.X
+	}
+	if dim.Y+src.Y > lim.Y {
+		dim.Y = lim.Y - src.Y
+	}
+	// and clip to final destination
+	if dim.X+dst.X > lim.X {
+		dim.X = lim.X - dst.X
+	}
+	if dim.Y+dst.Y > lim.Y {
+		dim.Y = lim.Y - dst.Y
+	}
+
+	// gap represents decrement when shifting to the next row --
+	// skipping over the irrelevant cells. (The increment in the
+	// index when going from last cell of row to first cell of next row,
+	// or vice versa.)
+	gap := int(lim.X - dim.X)
+
+	// the following logic is carefully constructed to avoid expensive
+	// operations in the loops (only addition or subtraction)
+	if em.index(src) > em.index(dst) { // source appears later, so we can forward copy
+		si := em.index(src)
+		di := em.index(dst)
+		for range dim.Y {
+			for range dim.X {
+				em.cells[di] = em.cells[si]
+				di++
+				si++
+			}
+			// advance to next row
+			si += gap
+			di += gap
+		}
+	} else { // source appears earlier, so we have to reverse copy
+		src.Y += dim.Y - 1
+		dst.Y += dim.Y - 1
+		src.X += dim.X - 1
+		dst.X += dim.X - 1
+		si := em.index(src)
+		di := em.index(dst)
+
+		for range dim.Y {
+			for range dim.X {
+				em.cells[di] = em.cells[si]
+				si--
+				di--
+			}
+			si -= gap
+			di -= gap
+		}
+	}
+
+	// Now we possibly blit underneath.  We'll use the underlying
+	// implementation's blit operation if it has one, else we'll
+	// just rewrite the cells in linear order.
+	if b, ok := em.be.(Blitter); ok {
+		// The backend implements what should be a fast blit.
+		b.Blit(bsrc, bdst, dim)
+	} else {
+		// This does math for each cell, so you're looking at a lot of multiplications
+		// for a bit display -- 100x100 means 10,000x2 multiplications.  This could be
+		// optimized, but this is really a fallback as every backend really *should* have
+		// an efficient blit operation. (The ones that don't probably don't keep their own
+		// state, such as a wrappers on top of TTYs.)  In these cases the cost of writing
+		// the content is probably substantially dominant anyway.
+		for row := range dim.Y {
+			for col := range dim.X {
+				pos := bdst
+				pos.X += col
+				pos.Y += row
+				cell := em.cells[em.index(pos)]
+				em.be.Put(pos, cell)
+			}
+		}
+	}
+}
+
+func (em *emulator) scrollUp() {
+	dim := Coord{X: em.rtMargin - em.ltMargin + 1, Y: em.botMargin - em.topMargin}
+	src := Coord{X: em.ltMargin, Y: em.topMargin + 1}
+	dst := Coord{X: em.ltMargin, Y: em.topMargin}
+
+	// TODO: deal with wide characters broken across the margin
+	pos := em.pos
+	em.blit(src, dst, dim)
+	bot := Coord{X: em.ltMargin, Y: em.botMargin}
+	for bot.X <= em.rtMargin {
+		em.eraseCell(bot)
+		bot.X++
+	}
+	em.setPosition(pos)
+}
+
+func (em *emulator) scrollDown() {
+	dim := Coord{X: em.rtMargin - em.ltMargin + 1, Y: em.botMargin - em.topMargin}
+	src := Coord{X: em.ltMargin, Y: em.topMargin}
+	dst := Coord{X: em.ltMargin, Y: em.topMargin + 1}
+
+	pos := em.pos
+	em.blit(src, dst, dim)
+	em.setPosition(Coord{X: em.ltMargin, Y: em.topMargin})
+	top := Coord{X: em.ltMargin, Y: em.topMargin}
+	for top.X <= em.rtMargin {
+		em.eraseCell(top)
+		top.X++
+	}
+	em.setPosition(pos)
+}
+
+// nextTab advances to the next tab stop, or the end of
+// the line if there is no further tab.
+func (em *emulator) nextTab() {
+	em.lastIndex = 0
+	maxX := em.size.X - 1
+	curX := em.getPosition().X
+	if curX == maxX { // already at end
+		return
+	}
+	nextX := maxX
+	if em.tabStops == nil {
+		// just advance to the next one
+		nextX = min((curX+8)&^7, maxX)
+	} else {
+		for _, p := range em.tabStops {
+			if p > curX {
+				nextX = p
+				break
+			}
+		}
+	}
+	em.setPosition(Coord{X: nextX, Y: em.pos.Y})
+}
+
+func (em *emulator) prevTab() {
+	curX := em.getPosition().X
+	if curX == 0 {
+		return
+	}
+	nextX := curX - 1
+	if em.tabStops == nil {
+		nextX &^= 7
+	} else if i, exist := slices.BinarySearch(em.tabStops, nextX); exist {
+		nextX = em.tabStops[i]
+	} else if i > 0 {
+		nextX = em.tabStops[i-1]
+	} else {
+		nextX = 0
+	}
+	em.setPosition(Coord{X: nextX, Y: em.pos.Y})
+}
+
+// initTabStops initializes the tab stops assuming every 8th column
+// is a tab stop.  This should only be called if the user is intentionally
+// changing the tab stops, because it will no longer support expanding
+// tab stops on resizing.
+func (em *emulator) initTabStops() {
+	if em.tabStops == nil {
+		// no tab stop at offset 0 since that would be pointless
+		em.tabStops = make([]Col, 0, int(em.size.X/8)+1)
+		for col := Col(8); col < em.size.X; col += 8 {
+			em.tabStops = append(em.tabStops, col)
+		}
+	}
+}
+
+// setTabStop sets a tab stop at the given location.
+// This calls  initTabStops - please see the description of that function for ramifications.
+func (em *emulator) setTabStop(ts Col) {
+	em.initTabStops()
+	if index, exist := slices.BinarySearch(em.tabStops, ts); !exist {
+		em.tabStops = slices.Insert(em.tabStops, index, ts)
+	}
+}
+
+// clrTabStop clears the tab stop at the given column.  This calls
+// initTabStops - please see the description of that function for ramifications.
+func (em *emulator) clrTabStop(ts Col) {
+	em.initTabStops()
+	em.tabStops = slices.DeleteFunc(em.tabStops, func(x Col) bool { return x == ts })
+}
+
+// index obtains the index in the cells slice for the given coordinates,
+// which must be within the bounds of the display size.
+func (em *emulator) index(c Coord) int {
+	return int(c.Y)*int(em.size.X) + int(c.X)
+}
+
+// putRune puts out a single rune.  This might be a subsequent part of a grapheme cluster, in
+// which case it will be emitted together with the preceding base character.
+func (em *emulator) putRune(r rune) {
+	dim := em.size
+
+	if lastIdx := em.lastIndex; lastIdx != 0 {
+		lastIdx--
+		if pm := em.getPrivateMode(PmGraphemeClusters); pm == ModeOn || pm == ModeOnLocked {
+			// ASCII-to-ASCII pairs cannot extend a grapheme cluster, except CRLF.
+			prev := em.cells[lastIdx].C
+			if len(prev) == 1 && prev[0] < utf8.RuneSelf && !shouldCheckGrapheme(prev[0], r) {
+				// fall through to the normal single-rune path
+			} else {
+				// maybe we need to update the last index
+				buf := em.graphemeBuf[:0]
+				need := len(prev) + utf8.UTFMax
+				if cap(buf) < need {
+					buf = make([]byte, 0, need)
+				}
+				buf = append(buf, prev...)
+				buf = utf8.AppendRune(buf, r)
+				em.graphemeIter.SetText(buf)
+				if em.graphemeIter.Next() && len(em.graphemeIter.Value()) == len(buf) {
+					// we are adding to a cluster
+					cluster := em.graphemeIter.Value()
+					width := em.cells[lastIdx].W
+					if w := textWidthOptions.Rune(r); w > width {
+						width = w
+					}
+					if isRegionalIndicator(r) && width < 2 {
+						width = 2
+					}
+					if r == '\uFE0F' && width < 2 {
+						width = 2
+					}
+					em.cells[lastIdx].C = em.clusterString(cluster)
+					em.cells[lastIdx].W = width
+					col := Col(lastIdx) % dim.X
+					row := Row(lastIdx / int(dim.X))
+					// we may have to move position if this switches to wide, so recalculate expected end
+					next := col + Col(width)
+					if em.getPrivateMode(PmAutoMargin) == ModeOn && next >= dim.X {
+						em.autoWrap = true
+					}
+					end := next
+					if end >= dim.X {
+						end = dim.X - 1
+					}
+					if width == 2 && col < dim.X-1 && em.cells[lastIdx+1].W != 0 {
+						// erase the next cell before putting down a character
+						em.cells[lastIdx+1].C = ""
+						em.cells[lastIdx+1].S = em.cells[lastIdx].S
+						em.cells[lastIdx+1].W = 0
+						em.be.Put(Coord{X: col + 1, Y: row}, em.cells[lastIdx+1])
+					}
+					// we leave the em.lastIndex for now, we might keep extending this cluster
+					em.be.Put(Coord{X: col, Y: row}, em.cells[lastIdx])
+					em.setPosition(Coord{X: end, Y: row})
+					em.graphemeBuf = buf[:0]
+					return
+				}
+				em.graphemeBuf = buf[:0]
+			}
+		}
+	}
+
+	if em.autoWrap {
+		em.nextLine()
+	}
+
+	autoMargin := em.getPrivateMode(PmAutoMargin) == ModeOn
+
+	pos := em.getPosition()
+	w := textWidthOptions.Rune(r)
+	if autoMargin && pos.X+Col(w) >= dim.X {
+		em.autoWrap = true
+	}
+	index := em.index(pos)
+	em.cells[index].C = em.runeString(r)
+	em.cells[index].S = em.style
+	em.cells[index].W = w
+	em.be.Put(em.pos, em.cells[index])
+	em.lastIndex = index + 1
+
+	if w == 2 && pos.X < dim.X-1 {
+		index++
+		em.cells[index].C = ""
+		em.cells[index].S = em.style
+		em.cells[index].W = 0
+	}
+	// Advance the cursor. This will stop at the margin.
+	// Note that if auto margin is enabled, we will have set
+	// autoWrap above if we were at the margin already.
+	em.moveRightN(Col(w))
+}
+
+func (em *emulator) runeString(r rune) string {
+	if r < utf8.RuneSelf {
+		return asciiRuneStrings[r]
+	}
+	return em.runeStrings.stringFor(r)
+}
+
+func (em *emulator) clusterString(cluster []byte) string {
+	return em.clusterStrings.stringFor(cluster)
+}
+
+func shouldCheckGrapheme(prev byte, r rune) bool {
+	if r < utf8.RuneSelf {
+		return prev == '\r' && r == '\n'
+	}
+
+	if unicode.Is(unicode.M, r) {
+		return true
+	}
+	if r == '\u200d' {
+		return true
+	}
+	if r >= 0xFE00 && r <= 0xFE0F {
+		return true
+	}
+	if r >= 0xE0100 && r <= 0xE01EF {
+		return true
+	}
+
+	return false
+}
+
+func isRegionalIndicator(r rune) bool {
+	return r >= 0x1F1E6 && r <= 0x1F1FF
+}
+
+// eraseCell erases a single cell at the given offset.
+// It clears attributes, but leaves the colors intact.
+func (em *emulator) eraseCell(c Coord) {
+	s := em.style.WithAttr(Plain)
+	index := em.index(c)
+	em.cells[index].C = ""
+	em.cells[index].S = s
+	em.cells[index].W = 0
+	em.be.Put(c, em.cells[index])
+}
+
+// eraseBelow erases from (and including) the current cursor position to the end of the window.
+func (em *emulator) eraseBelow() {
+	size := em.size
+	pos := em.getPosition()
+	for x := pos.X; x < size.X; x++ {
+		em.eraseCell(Coord{X: x, Y: pos.Y})
+	}
+	for y := pos.Y + 1; y < size.Y; y++ {
+		for x := Col(0); x < size.X; x++ {
+			em.eraseCell(Coord{X: x, Y: y})
+		}
+	}
+	em.setPosition(pos)
+}
+
+// eraseAbove erases from the origin to (and including) the current cursor position.
+func (em *emulator) eraseAbove() {
+	size := em.size
+	pos := em.getPosition()
+	for y := Row(0); y < pos.Y; y++ {
+		for x := Col(0); x < size.X; x++ {
+			em.eraseCell(Coord{X: x, Y: y})
+		}
+	}
+	for x := Col(0); x <= pos.X; x++ {
+		em.eraseCell(Coord{X: x, Y: pos.Y})
+	}
+	em.setPosition(pos)
+}
+
+// eraseAll erases the entire screen. It uses the color, but resets all other attributes.
+func (em *emulator) eraseAll() {
+	size := em.size
+	pos := em.getPosition()
+	for y := Row(0); y < size.Y; y++ {
+		for x := Col(0); x < size.X; x++ {
+			em.eraseCell(Coord{X: x, Y: y})
+		}
+	}
+	em.setPosition(pos)
+}
+
+// eraseToLineEnd erases to the end of the line, including the cursor position.
+func (em *emulator) eraseToLineEnd() {
+	size := em.size
+	pos := em.getPosition()
+	for x := pos.X; x < size.X; x++ {
+		em.eraseCell(Coord{x, pos.Y})
+	}
+	em.setPosition(pos)
+}
+
+// eraseToLineStart erases to the start of the line, including the cursor position.
+func (em *emulator) eraseToLineStart() {
+	pos := em.getPosition()
+	for x := Col(0); x <= pos.X; x++ {
+		em.eraseCell(Coord{x, pos.Y})
+	}
+	em.setPosition(pos)
+}
+
+// eraseLine erases the entire line.
+func (em *emulator) eraseLine() {
+	size := em.size
+	pos := em.getPosition()
+	for x := range size.X {
+		em.eraseCell(Coord{x, pos.Y})
+	}
+	em.setPosition(pos)
+}
+
+// softReset performs a soft reset.
+func (em *emulator) softReset() {
+	// TODO:
+	// Select default character sets
+	em.tabStops = nil
+	em.autoWrap = false
+	em.style = em.defaultStyle
+	em.saved = savedCursor{style: em.defaultStyle}
+	em.topMargin = 0
+	em.botMargin = em.size.Y - 1
+	em.ltMargin = 0
+	em.rtMargin = em.size.X - 1
+	em.appKeyPad = false
+	em.be.Reset()
+	// start by resetting all modes
+	for _, am := range em.ansiModeKeys() {
+		em.setAnsiMode(am, ModeOff) // NB: No effect for non-changeable modes
+	}
+	for _, pm := range em.privateModeKeys() {
+		em.setPrivateMode(pm, ModeOff) // NB: No effect for non-changeable modes
+	}
+	// and set any that should reset on (auto-margin)
+	em.setPrivateMode(PmAutoMargin, ModeOn)
+	em.setPrivateMode(PmAutoRepeat, ModeOn)
+	em.setPrivateMode(PmShowCursor, ModeOn)
+	em.setPrivateMode(PmBlinkCursor, ModeOn)
+	// set default cursor - matches VT defaults
+	em.cursor = BlinkingBlock
+	em.be.SetCursor(em.cursor)
+	em.setPosition(Coord{0, 0})
+	em.eraseAll()
+}
+
+func (em *emulator) ansiModeKeys() []AnsiMode {
+	em.modeLock.RLock()
+	defer em.modeLock.RUnlock()
+
+	keys := make([]AnsiMode, 0, len(em.ansiModes))
+	for am := range em.ansiModes {
+		keys = append(keys, am)
+	}
+	return keys
+}
+
+func (em *emulator) privateModeKeys() []PrivateMode {
+	em.modeLock.RLock()
+	defer em.modeLock.RUnlock()
+
+	keys := make([]PrivateMode, 0, len(em.localModes))
+	for pm := range em.localModes {
+		keys = append(keys, pm)
+	}
+	return keys
+}
+
+// sendDA ends the primary device attributes.
+func (em *emulator) sendDA() {
+	buf := &bytes.Buffer{}
+	_, _ = fmt.Fprintf(buf, "\x1b[?63")
+	if em.be.Colors() > 0 {
+		_, _ = fmt.Fprintf(buf, ";22")
+	}
+	if _, ok := em.be.(Clipboard); ok {
+		_, _ = fmt.Fprintf(buf, ";52")
+	}
+	// 9 for NRC?
+	// 15 for graphics?
+	buf.WriteRune('c')
+	em.SendRaw(buf.Bytes())
+}
+
+// setAnsiMode sets the ANSI mode.
+func (em *emulator) setAnsiMode(mode AnsiMode, ms ModeStatus) {
+	if !ms.Changeable() {
+		return
+	}
+	em.modeLock.Lock()
+	defer em.modeLock.Unlock()
+	if old, ok := em.ansiModes[mode]; ok && old.Changeable() {
+		em.ansiModes[mode] = ms
+	}
+}
+
+func (em *emulator) getAnsiMode(mode AnsiMode) ModeStatus {
+	em.modeLock.RLock()
+	defer em.modeLock.RUnlock()
+	return em.ansiModes[mode]
+}
+
+// getPrivateMode returns the value of a DEC private mode.
+func (em *emulator) getPrivateMode(pm PrivateMode) ModeStatus {
+	em.modeLock.RLock()
+	if ms, ok := em.localModes[pm]; ok {
+		em.modeLock.RUnlock()
+		return ms
+	}
+	em.modeLock.RUnlock()
+	return em.be.GetPrivateMode(pm)
+}
+
+func (em *emulator) updateMouseReporting() {
+	mi, ok := em.be.(Mouser)
+	if !ok {
+		return
+	}
+	em.modeLock.RLock()
+	report := em.mouseReportingLocked()
+	em.modeLock.RUnlock()
+	mi.SetMouse(report)
+}
+
+// setPrivateMode sets the DEC private mode.
+func (em *emulator) setPrivateMode(pm PrivateMode, ms ModeStatus) {
+	if !ms.Changeable() {
+		return
+	}
+	em.modeLock.Lock()
+	old, ok := em.localModes[pm]
+	if ok && old.Changeable() {
+		em.localModes[pm] = ms
+
+		var (
+			setMouse  bool
+			report    MouseReporting
+			setCursor bool
+			cursor    CursorStyle
+		)
+
+		switch pm {
+		case PmMouseButton, PmMouseDrag, PmMouseMotion, PmMouseSgr, PmMouseSgrPixel, PmMouseX10:
+			report = em.mouseReportingLocked()
+			setMouse = true
+		case PmShowCursor:
+			if ms == ModeOn {
+				em.cursor = em.cursor.Show()
+			} else {
+				em.cursor = em.cursor.Hide()
+			}
+			cursor = em.cursor
+			setCursor = true
+		case PmBlinkCursor:
+			if ms == ModeOn {
+				em.cursor = em.cursor.Blink()
+			} else {
+				em.cursor = em.cursor.Steady()
+
+			}
+			cursor = em.cursor
+			setCursor = true
+		}
+		em.modeLock.Unlock()
+
+		if setMouse {
+			if mi, ok := em.be.(Mouser); ok {
+				mi.SetMouse(report)
+			}
+		}
+		if setCursor {
+			em.be.SetCursor(cursor)
+		}
+		return
+	}
+	em.modeLock.Unlock()
+
+	if em.be.GetPrivateMode(pm).Changeable() {
+		_ = em.be.SetPrivateMode(pm, ms)
+	}
+}
+
+func (em *emulator) mouseReportingLocked() MouseReporting {
+	switch {
+	case em.localModes[PmMouseButton] == ModeOn:
+		em.mouseReports = MouseButtons
+		if em.localModes[PmMouseMotion] == ModeOn {
+			em.mouseReports = MouseMotion
+		} else if em.localModes[PmMouseDrag] == ModeOn {
+			em.mouseReports = MouseDrag
+		}
+	case em.localModes[PmMouseX10] == ModeOn:
+		em.mouseReports = MouseButtons
+	default:
+		em.mouseReports = MouseDisabled
+	}
+	return em.mouseReports
+}
+
+// SendRaw allows raw data to be sent to the application.
+// This is done in a thread-safe way, so that content is not intermingled.
+func (em *emulator) SendRaw(b []byte) {
+	em.sendLock.Lock()
+	defer em.sendLock.Unlock()
+
+	// Do not attempt to send *anything* if we are stopped.
+	select {
+	case <-em.stopQ:
+		return
+	default:
+	}
+
+	// Try to write to the readQ, but if we cannot, then wait until
+	// either we can, or the stopQ is fired.  This ensures that we avoid
+	// breaking up content if at all possible.
+	for _, ch := range b {
+		select {
+		case em.readQ <- ch:
+		default:
+			select {
+			case em.readQ <- ch:
+			case <-em.stopQ:
+				return
+			}
+		}
+	}
+}
+
+// KeyEvent injects a keyboard event into the emulator
+func (em *emulator) KeyEvent(ev KeyEvent) {
+
+	if em.getPrivateMode(PmWin32Input) == ModeOn {
+		em.keyWin32IM(ev)
+	} else {
+		// eliminate "control" keys (which keyboard maps provide) from consideration.
+		// (We handle control keys explicitly.)
+		if ev.Utf != "" && ev.Utf[0] < ' ' {
+			ev.Utf = ""
+		}
+		// TODO: more add support for kitty, and maybe modify other keys
+		em.keyLegacy(ev)
+	}
+}
+
+// ResizeEvent is called by the backend when a resize occurs.  A real backend with a child
+// process (essentially a "real emulator") should probably also fire SIGWINCH if appropriate.
+// That would be the job of something other than this code.
+func (em *emulator) ResizeEvent(size Coord) {
+	select {
+	case em.writeQ <- size:
+	case <-em.stopQ:
+	}
+}
+
+func (em *emulator) applyResize(size Coord) {
+	// resize clobbers our content, until it is redrawn
+	em.size = size
+	em.tabStops = slices.DeleteFunc(em.tabStops, func(x Col) bool { return x >= em.size.X })
+	// resizing resets the margins
+	em.topMargin = 0
+	em.botMargin = em.size.Y - 1
+	em.ltMargin = 0
+	em.rtMargin = em.size.X - 1
+	em.cells = make([]Cell, int(em.size.X)*int(em.size.Y))
+	for i := range em.cells {
+		em.cells[i].S = em.defaultStyle
+	}
+
+	em.pos = em.getPosition()
+	if em.getPrivateMode(PmResizeReports) == ModeOn { // NB: we never support "ModeOnLocked"
+		// NB: for now we do not support pixel sizes
+		em.SendRaw(fmt.Appendf(nil, "\x1b[48;%d;%d;0;0t", em.size.Y, em.size.X))
+	}
+
+	// Send a SIGWINCH or similar.
+	em.be.RaiseResize()
+}
+
+var legacyKeys = map[Key]struct {
+	K  string // unmodified key
+	A  string // unmodified in application cursor mode (smkx)
+	S  string // with shift (if empty use regular modifier)
+	C  string // with control (if empty use regular modifier)
+	CS string // with ctrl-shift
+}{
+	KeyF1:        {K: "\x1bOP"}, // SS3 P
+	KeyF2:        {K: "\x1bOQ"}, // SS3 Q
+	KeyF3:        {K: "\x1bOR"}, // SS3 R
+	KeyF4:        {K: "\x1bOS"}, // SS3 S
+	KeyF5:        {K: "\x1b[15~"},
+	KeyF6:        {K: "\x1b[17~"},
+	KeyF7:        {K: "\x1b[18~"},
+	KeyF8:        {K: "\x1b[19~"},
+	KeyF9:        {K: "\x1b[20~"},
+	KeyF10:       {K: "\x1b[21~"},
+	KeyF11:       {K: "\x1b[23~"},
+	KeyF12:       {K: "\x1b[24~"},
+	KeyF13:       {K: "\x1b[25~"},
+	KeyF14:       {K: "\x1b[26~"},
+	KeyF15:       {K: "\x1b[28~"},
+	KeyF16:       {K: "\x1b[29~"},
+	KeyF17:       {K: "\x1b[31~"},
+	KeyF18:       {K: "\x1b[32~"},
+	KeyF19:       {K: "\x1b[33~"},
+	KeyF20:       {K: "\x1b[34~"},
+	KeyUp:        {K: "\x1b[A", A: "\x1bOA"},
+	KeyDown:      {K: "\x1b[B", A: "\x1bOB"},
+	KeyRight:     {K: "\x1b[C", A: "\x1bOC"},
+	KeyLeft:      {K: "\x1b[D", A: "\x1bOD"},
+	KeyHome:      {K: "\x1b[H", A: "\x1bOH"},
+	KeyEnd:       {K: "\x1b[F", A: "\x1bOF"},
+	KeyPgUp:      {K: "\x1b[5~"},
+	KeyPgDn:      {K: "\x1b[6~"},
+	KeyDelete:    {K: "\x1b[3~"},
+	KeyInsert:    {K: "\x1b[2~"},
+	KeyMenu:      {K: "\x1b[29~"}, // also F16
+	KeyTab:       {K: "\t", S: "\x1b[Z", CS: "\x1b[Z"},
+	KeyBackspace: {K: "\x7f", S: "\x7f", C: "\x08", CS: "\x08"},
+	KeySpace:     {K: " ", S: " ", C: "\x00", CS: "\x00"},
+	KeyEnter:     {K: "\r", S: "\r", CS: "\r"}, // NB: consider using kitty encoding here
+	KeyPadEnter:  {K: "\r", S: "\r", CS: "\r"}, // NB: consider using kitty encoding here
+	KeyEsc:       {K: "\x1b", S: "\x1b", C: "\x1b"},
+}
+
+var legacyControls = map[Key]string{
+	// These ones are weird legacy control sequences that we mostly
+	// do not care about.  We don't include shifted variants.
+	Key2:      "\x00",
+	Key3:      "\x1b",
+	Key4:      "\x1c",
+	Key5:      "\x1d",
+	Key6:      "\x1e",
+	Key7:      "\x1f",
+	Key8:      "\x7f",
+	KeyLBrace: "\x1b",
+	KeySlash:  "\x1c",
+	KeyRBrace: "\x1d",
+}
+
+// legacyPadKeys are keys that are on the keypad, when not in numeric keypad mode.
+// Note that num lock overrides this.
+var legacyPadKeys = map[Key]struct {
+	app string
+	num string
+}{
+	KeyPadEnter: {"\x1bOM", "\r"},
+	KeyPadMul:   {"\x1bOj", "*"},
+	KeyPadAdd:   {"\x1bOk", "+"},
+	KeyPadSub:   {"\x1bOm", "-"},
+	KeyPadDiv:   {"\x1bOo", "/"},
+	KeyPadDec:   {"\x1b[3~", "."}, // Del
+	KeyPad0:     {"\x1b[2~", "0"}, // Ins
+	KeyPad1:     {"\x1bOF", "1"},  // End
+	KeyPad2:     {"\x1b[B", "2"},  // Down
+	KeyPad3:     {"\x1b[6~", "3"}, // PgDn
+	KeyPad4:     {"\x1b[D", "4"},  // Left
+	KeyPad5:     {"\x1b[E", "5"},  // Clear/Begin
+	KeyPad6:     {"\x1b[C", "6"},  // Right
+	KeyPad7:     {"\x1bOH", "7"},  // Home
+	KeyPad8:     {"\x1b[A", "8"},  // Up
+	KeyPad9:     {"\x1b[5~", "9"}, // PgUp
+	KeyPadEqual: {"\x1bOX", "="},
+}
+
+// repeatRaw is called to provide key repeat.  We limit key repeating to just 40,
+// and we ensure that at least one is included.  We only repeat if key repeat is enabled.
+func (em *emulator) repeatRaw(ev KeyEvent, data []byte) {
+	if pm := em.getPrivateMode(PmAutoRepeat); pm == ModeOn || pm == ModeOnLocked {
+		for range min(max(1, ev.Repeat), 40) {
+			em.SendRaw(data)
+		}
+	} else {
+		if ev.Repeat == 0 {
+			em.SendRaw(data)
+		}
+	}
+}
+
+// noRepeatRaw is used to send a key that should never repeat.
+// It will only send if the repeat count is zero.
+func (em *emulator) noRepeatRaw(ev KeyEvent, data []byte) {
+	if ev.Repeat == 0 {
+		em.SendRaw(data)
+	}
+}
+
+// keyLegacy handles a keyboard event when in legacy vt220 style mode.
+func (em *emulator) keyLegacy(ev KeyEvent) {
+	if !ev.Down { // legacy protocol does not support key release
+		return
+	}
+	if ev.Mod.IsMeta() || ev.Mod.IsHyper() { // legacy protocol does not support these
+		return
+	}
+
+	// Shift-Ctrl keys are never sent in the legacy protocol.  We do have to ensure
+	// that if we are sending other Utf (for example with AltGr), then we still might
+	// send it, but this is only an issue for non-ASCII runes. Also, this filter only
+	// applies for "regular" keys (i.e. not function keys, cursor keys, etc.)
+	if ev.Mod.IsShift() && ev.Mod.IsCtrl() && (ev.Utf == "" || ev.Utf[0] < 0x80) {
+		if base := ev.Key.KittyBase(); base >= ' ' && base < 0x80 {
+			return
+		}
+	}
+
+	// keypad sequences
+	if v, ok := legacyPadKeys[ev.Key]; ok {
+		if ev.Mod&ModNumLock == 0 {
+			if em.appKeyPad {
+				em.repeatRaw(ev, []byte(v.app))
+			} else {
+				em.repeatRaw(ev, []byte(v.num))
+			}
+			return
+		} else {
+			ev.Utf = v.num
+		}
+	}
+
+	// For control keys (e.g. control-J) we never emit a rune directly -- but we might later
+	// add after decoding the key accordingly.
+	if ev.Utf != "" && (ev.Mod == ModLCtrl || ev.Mod == ModRCtrl || ev.Utf[0] < ' ') {
+		ev.Utf = ""
+	}
+
+	if ev.Utf != "" {
+		if ev.Utf[0] < 0x80 && ev.Mod.IsAlt() { // ASCII might get alt
+			em.noRepeatRaw(ev, fmt.Appendf(nil, "\x1b%s", ev.Utf))
+		} else { // otherwise send the UTF as-is
+			em.repeatRaw(ev, []byte(ev.Utf))
+		}
+		return
+	}
+
+	// some weird number control sequences - legacy compatibility
+	// We do not repeat these.
+	if v, ok := legacyControls[ev.Key]; ok && (ev.Mod == ModLCtrl || ev.Mod == ModRCtrl) {
+		em.noRepeatRaw(ev, []byte(v))
+		return
+	}
+
+	if v, ok := legacyKeys[ev.Key]; ok {
+		str := ""
+		match := false
+		if !ev.Mod.IsShift() && !ev.Mod.IsCtrl() {
+			if em.getPrivateMode(PmAppCursor) == ModeOn && v.A != "" {
+				str = v.A
+			} else {
+				str = v.K
+			}
+			// AnsiMode 20 sends newline, but only in legacy mode.
+			if str == "\r" && em.getAnsiMode(AmNewLineMode) == ModeOn {
+				str = "\r\n"
+			}
+			match = true
+		} else if ev.Mod.IsShift() && !ev.Mod.IsCtrl() {
+			if str = v.S; str != "" {
+				match = true
+			}
+		} else if ev.Mod.IsCtrl() && !ev.Mod.IsShift() {
+			if str = v.C; str != "" {
+				match = true
+			}
+		} else { // IsCtrl & IsShift
+			if str = v.CS; str != "" {
+				match = true
+			}
+		}
+		if !match {
+			// No specific modifiers present, lets add them. There are two cases,
+			// one for SS3 based keys and another for CSI based keys.  SS3 based
+			// keys are converted to CSI - 1 ; mod ; final
+			// Note: legacy encoding does not use modifiers for alt or super - alt will be
+			// determined by sending an escape prefix.
+			mod := 0
+			if ev.Mod.IsShift() {
+				mod |= 1
+			}
+			if ev.Mod.IsCtrl() {
+				mod |= 4
+			}
+			if strings.HasPrefix(v.K, "\x1bO") {
+				str = fmt.Sprintf("\x1b[1;%d%c", mod+1, v.K[len(v.K)-1])
+			} else {
+				str = fmt.Sprintf("%s;%d%c", v.K[:len(v.K)-1], mod+1, v.K[len(v.K)-1])
+			}
+		}
+		if ev.Mod.IsAlt() {
+			// no repeating ALT sequences
+			em.noRepeatRaw(ev, append([]byte{'\x1b'}, []byte(str)...)) // alt sends leading escape
+		} else if ev.Mod.IsCtrl() {
+			// no repeating CTRL sequences
+			em.noRepeatRaw(ev, []byte(str))
+		} else {
+			// but other sequences (should just be shifted or unmodified)
+			// are fine.  (E.g. we want to allow repeats of cursor keys)
+			em.repeatRaw(ev, []byte(str))
+		}
+		return
+	}
+
+	// fallback control key handling
+	if ev.Key >= KeyA && ev.Key <= KeyZ && ev.Mod.IsCtrl() {
+		b := byte(ev.Key-KeyA) + 1 /* ctrl-A */
+		if ev.Mod.IsAlt() {
+			em.noRepeatRaw(ev, []byte{'\x1b', b})
+		} else {
+			em.noRepeatRaw(ev, []byte{b})
+		}
+		return
+	}
+}
+
+var win32NoRepeat = map[Key]bool{
+	KeyLShift:   true,
+	KeyRShift:   true,
+	KeyLCtrl:    true,
+	KeyRCtrl:    true,
+	KeyLAlt:     true,
+	KeyRAlt:     true,
+	KeyLMeta:    true,
+	KeyRMeta:    true,
+	KeyCapsLock: true,
+	KeyNumLock:  true,
+	KeyEnter:    true,
+	KeyScrLock:  true,
+	KeyPause:    true,
+	KeyPrtScr:   true,
+}
+
+// keyWin32IM generates the sequence for a key event when in Win32 input mode.
+// Win32 input mode is ESC [ Vk ; Sc ; Uc ; Kd ; Cs ; Rc _
+// Note that we specifically do NOT doubly encode non-keyboard events -- those
+// are already unambiguously handled within the protocol.  (Windows Terminal behaves
+// the same way, but most 3rd party terminals do doubly encode.)
+func (em *emulator) keyWin32IM(ev KeyEvent) {
+	// Some keys that never repeat
+	if pm := em.getPrivateMode(PmAutoRepeat); pm == ModeOff || pm == ModeOffLocked {
+		if ev.Repeat != 0 {
+			return
+		}
+	}
+	r := rune(0)
+	if ev.Utf != "" {
+		runes := []rune(ev.Utf)
+		if len(runes) == 1 {
+			r = runes[0]
+		}
+	}
+	kd := 0
+	if ev.Down {
+		kd = 1
+	}
+	cs := 0
+	// Modifiers
+	if ev.Mod&ModRAlt != 0 {
+		cs |= 0x01
+	}
+	if ev.Mod&ModLAlt != 0 {
+		cs |= 0x02
+	}
+	if ev.Mod&ModRCtrl != 0 {
+		cs |= 0x04
+	}
+	if ev.Mod&ModLCtrl != 0 {
+		cs |= 0x08
+	}
+	if ev.Mod.IsShift() {
+		cs |= 0x10
+	}
+	if ev.Mod.IsNumLock() {
+		cs |= 0x20
+	}
+	// NB: 0x40 is for scroll lock, we don't support it for now
+	if ev.Mod.IsCapsLock() {
+		cs |= 0x80
+	}
+	switch ev.Key {
+	case KeyPadEnter:
+	case KeyPadDiv:
+	case KeyInsert:
+	case KeyDelete:
+	case KeyHome:
+	case KeyEnd:
+	case KeyPgUp:
+	case KeyPgDn:
+		cs |= 0x100 // enhanced
+	}
+	if win32NoRepeat[ev.Key] {
+		if ev.Repeat > 0 {
+			return
+		}
+		ev.Repeat = 1
+	}
+	em.SendRaw(fmt.Appendf(nil, "\x1b[%d;%d;%d;%d;%d;%d_", ev.VK, ev.SC, r, kd, cs, max(1, ev.Repeat)))
+}
+
+func (em *emulator) MouseEvent(ev MouseEvent) {
+	if pm := em.getPrivateMode(PmMouseButton); pm == ModeOn {
+
+		if em.getPrivateMode(PmMouseDrag) != ModeOn && em.getPrivateMode(PmMouseMotion) != ModeOn {
+			// suppress motion events if the user didn't request
+			if ev.Button == NoButton {
+				return // if entire event was just motion, bail
+			}
+			ev.Motion = false
+		}
+
+		if pm = em.getPrivateMode(PmMouseSgr); pm == ModeOn {
+			btn := ev.encodeButton()
+			if ev.Down {
+				em.SendRaw(fmt.Appendf(nil, "\x1b[<%d;%d;%dM", btn, ev.Position.X+1, ev.Position.Y+1))
+			} else {
+				em.SendRaw(fmt.Appendf(nil, "\x1b[<%d;%d;%dm", btn, ev.Position.X+1, ev.Position.Y+1))
+			}
+		} else {
+			// Old style reporting (via 1000h).
+			// Limitations of legacy VT200 reporting are that the coordinates must be between
+			// 1 and 223 inclusive, and that once any release occurs all buttons are assumed
+			// to be released.  (Please use SGR mode if at all possible.)
+			// Further, this mode is not CSI compliant as the encoded values that arrive ahead of
+			// the final character may be within the range of technically legal CSI final bytes.
+			if !ev.Down {
+				ev.Button = NoButton
+			}
+			btn := ev.encodeButton()
+			data := append([]byte{'\x1b', '[', 'M', btn + 32},
+				byte(min(ev.Position.X+1, 223)+32),
+				byte(min(ev.Position.Y+1, 223)+32))
+			em.SendRaw(data)
+		}
+
+	} else if pm := em.getPrivateMode(PmMouseX10); pm == ModeOn && ev.Down {
+		// legacy X10 reporting only
+		x := byte(min(ev.Position.X+1, 223)) + 32
+		y := byte(min(ev.Position.Y+1, 223)) + 32
+		// NB: we intentionally reverse buttons 2 & 3 (for xterm compatibility)
+		switch ev.Button {
+		case Button1:
+			em.SendRaw([]byte{'\x1b', '[', 'M', ' ', x, y})
+		case Button2:
+			em.SendRaw([]byte{'\x1b', '[', 'M', '"', x, y})
+		case Button3:
+			em.SendRaw([]byte{'\x1b', '[', 'M', '!', x, y})
+		}
+	}
+}
+
+func (em *emulator) FocusEvent(focused bool) {
+	if pm := em.getPrivateMode(PmFocusReports); pm == ModeOn {
+		if focused {
+			em.SendRaw([]byte{'\x1b', '[', 'I'})
+		} else {
+			em.SendRaw([]byte{'\x1b', '[', 'O'})
+		}
+	}
+}
+
+// SetId sets the terminal name and version.
+func (em *emulator) SetId(name string, version string) {
+	em.name = name
+	em.vers = version
+}
+
+// Start the terminal emulator.
+func (em *emulator) Start() error {
+	select {
+	case <-em.stopQ:
+	default:
+		// already running
+		return errors.New("terminal already started")
+	}
+	stopQ := make(chan bool)
+	em.stopQ = stopQ
+	go em.run(stopQ)
+	return nil
+}
+
+// Stop the terminal emulator.  This also wakes any blocked
+// Read or Write calls, which will return an error.
+func (em *emulator) Stop() error {
+	select {
+	case <-em.stopQ:
+	default:
+		close(em.stopQ)
+	}
+	return nil
+}
+
+// Drain pending output to the terminal emulator.
+func (em *emulator) Drain() error {
+	q := make(chan bool)
+	select {
+	case em.writeQ <- q:
+	case <-em.stopQ:
+	}
+	select {
+	case <-q:
+	case <-em.stopQ:
+	}
+	// make sure to wake the reader
+	select {
+	case em.readQ <- true:
+	default:
+	}
+	return nil
+}
+
+// Write data to the emulator (commands).
+func (em *emulator) Write(data []byte) (n int, err error) {
+	stopQ := em.stopQ
+	writeQ := em.writeQ
+	drainQ := make(chan bool)
+	select {
+	case writeQ <- data:
+		// we add the drainQ for synchronization, so that we only
+		// return after the the emulator has processed this.
+		select {
+		case <-stopQ:
+			return 0, errors.New("terminal emulator stopped")
+		case writeQ <- drainQ:
+		}
+		select {
+		case <-stopQ:
+			return 0, errors.New("terminal emulator stopped")
+		case <-drainQ:
+			return len(data), nil
+		}
+	case <-stopQ:
+		return 0, errors.New("terminal emulator stopped")
+	}
+}
+
+// Read data (key events, etc.) from the emulator.
+func (em *emulator) Read(data []byte) (n int, err error) {
+	stopQ := em.stopQ
+	readQ := em.readQ
+
+	n = 0
+	if len(data) < 1 {
+		return 0, nil
+	}
+	select {
+	case <-stopQ:
+		return 0, errors.New("terminal emulator stopped")
+	case v := <-readQ:
+		// The data arriving in the channel may be a byte, or it might be a bool
+		// trying to force a wake up.  Note that the bool may be intermingled with other
+		// bytes, so we check it. Also data may have arrived since the bool was posted,
+		// so make sure we don't terminate until we have collected all the relevant data
+		// that we can (up to the limit of what was requested.)
+		if ch, ok := v.(byte); ok {
+			data[n] = ch
+			n++
+		}
+		for n < len(data) {
+			select {
+			case v = <-readQ:
+				if ch, ok := v.(byte); ok {
+					data[n] = ch
+					n++
+				}
+			default:
+				return n, nil
+			}
+		}
+		return n, nil
+	}
+}
+
+func (em *emulator) run(stopQ <-chan bool) {
+	for {
+		select {
+		case item := <-em.writeQ:
+			switch d := item.(type) {
+			case byte:
+				em.inb(d)
+			case []byte:
+				for _, ch := range d {
+					em.inb(ch)
+				}
+			case chan bool:
+				close(d)
+
+			case Coord: // resize notification
+				em.applyResize(d)
+			}
+		case <-stopQ:
+			return
+		}
+	}
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/event.go b/vendor/github.com/gdamore/tcell/v3/vt/event.go
new file mode 100644
index 000000000..bdab43593
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/event.go
@@ -0,0 +1,133 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vt
+
+// KeyEvent is a key event.
+type KeyEvent struct {
+	Down   bool     // true if event is for key down event
+	Repeat int      // if > 1, a repeat count
+	Key    Key      // Key symbol.
+	Base   BaseKey  // base key code (physical key, e.g 'a'), may be zero if same as code
+	VK     WinVK    // Windows virtual key. 0 for none, or if not known.
+	SC     ScanCode // Windows scan code. 0 for none, or if not known.
+	Mod    Modifier // modifiers
+	Utf    string   // if non-empty, the unicode content for this
+}
+
+type Modifier int
+
+const (
+	ModNone   = Modifier(0)
+	ModLShift = Modifier(1 << iota)
+	ModRShift
+	ModLCtrl
+	ModRCtrl
+	ModLAlt
+	ModRAlt
+	ModLMeta
+	ModRMeta
+	ModLHyper
+	ModRHyper
+	ModCapsLock
+	ModNumLock
+)
+
+func (m Modifier) IsShift() bool    { return (m & (ModLShift | ModRShift)) != 0 }
+func (m Modifier) IsCtrl() bool     { return (m & (ModLCtrl | ModRCtrl)) != 0 }
+func (m Modifier) IsAlt() bool      { return (m & (ModLAlt | ModRAlt)) != 0 }
+func (m Modifier) IsMeta() bool     { return (m & (ModLMeta | ModRMeta)) != 0 }
+func (m Modifier) IsHyper() bool    { return (m & (ModLHyper | ModRHyper)) != 0 }
+func (m Modifier) IsNumLock() bool  { return m&ModNumLock != 0 }
+func (m Modifier) IsCapsLock() bool { return m&ModCapsLock != 0 }
+func (m Modifier) IsCapitals() bool { return m.IsCapsLock() != m.IsShift() }
+func (m Modifier) IsAltGr() bool    { return m.IsCtrl() && m.IsAlt() }
+
+// Button is the mouse button pressed or released.
+type Button int
+
+const (
+	NoButton = Button(0)         // No buttons are pressed.
+	Button1  = Button(1 << iota) // Usually left most button.
+	Button2                      // Usually right most button.
+	Button3                      // Usually middle button.
+	Button4
+	Button5
+	Button6
+	Button7
+	Button8
+	WheelUp    // Wheel motion up/away from user.
+	WheelDown  // Wheel motion down/towards user.
+	WheelLeft  // Wheel motion to left.
+	WheelRight // Wheel motion to right.
+)
+
+// MouseEvent reports a single mouse event.  Only a single button
+// may be reported for a given event.  The application will have
+// to keep state.  As buttons are never pressed exactly simultaneously,
+// the backend will send chords as a series of presses followed by a series
+// of releases.
+type MouseEvent struct {
+	Position Coord    // Location of pointer.
+	Button   Button   // Buttons pressed.
+	Down     bool     // True on press, false on release.
+	Motion   bool     // True if mouse moved at least once cell.
+	Mod      Modifier // Modifiers (for modified click).
+}
+
+// encodeButton just encodes the XTerm style button details into a byte
+func (ev MouseEvent) encodeButton() byte {
+	var btn byte
+	switch ev.Button {
+	case NoButton:
+		btn = 3
+	case Button1:
+		btn = 0
+	case Button2: // intentionally reversed with button 3
+		btn = 2
+	case Button3:
+		btn = 1
+	case WheelUp:
+		btn = 0x40
+	case WheelDown:
+		btn = 0x41
+	case WheelLeft:
+		btn = 0x42
+	case WheelRight:
+		btn = 0x43
+	case Button4:
+		btn = 0x80
+	case Button5:
+		btn = 0x81
+	case Button6:
+		btn = 0x82
+	case Button7:
+		btn = 0x83
+	default:
+		btn = 3
+	}
+	if ev.Motion {
+		btn += 0x20
+	}
+	if ev.Mod.IsShift() {
+		btn += 4
+	}
+	if ev.Mod.IsAlt() || ev.Mod.IsMeta() {
+		btn += 8
+	}
+	if ev.Mod.IsCtrl() {
+		btn += 16
+	}
+	return btn
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/key.go b/vendor/github.com/gdamore/tcell/v3/vt/key.go
new file mode 100644
index 000000000..edbd158e7
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/key.go
@@ -0,0 +1,630 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vt
+
+// BaseKey is the Kitty protocol base key. These are kitty's representation of a scan code.
+// As the Kitty protocol is likely the extended keyboard protocol we care most about, we use
+// this as the primary reporting mechanism. (It also helps that this may provide an easier
+// fallback for implementations that don't have raw scan codes and are willing to assume an
+// ANSI layout.)
+type BaseKey rune
+
+var shiftedBaseKeys map[BaseKey]rune
+
+func (bk BaseKey) Shifted() rune {
+
+	if s, ok := shiftedBaseKeys[bk]; ok {
+		return s
+	}
+	if bk >= 'a' && bk <= 'z' {
+		return rune(bk - 32)
+	}
+	return rune(bk)
+}
+
+// ScanCode is the scan code used by Windows for a key. These are physical key locations,
+// and every physical should have a exactly one mapping here.
+type ScanCode uint16
+
+// Key represents the key code for a key. These are largely taken from the HID specification page 0x07,
+// although there are gaps and some inconsistencies.  We chose this specification because it covers all
+// keyboards we are likely to see in practice. Note that the zero value is reserved and will never be
+// assigned a valid key.  A number of keys are from UNIX keyboards (e.g. Sun type 6 keyboards), and we do not
+// explicitly support these because none of the common reporting protocols have a way to report them.
+// Instead these should probably be mapped higher functions (F13 and up), if you're facing this.
+// These are key locations on a US keyboard.  For example on AZERTY layout KeyQ corresponds to a key
+// that has a printed "A", but is in the upper left position (below the digits.)
+type Key uint16
+
+const (
+	KeyUTF          = Key(0x01) // virtual UTF-8 content
+	KeyA            = Key(0x04)
+	KeyB            = Key(0x05)
+	KeyC            = Key(0x06)
+	KeyD            = Key(0x07)
+	KeyE            = Key(0x08)
+	KeyF            = Key(0x09)
+	KeyG            = Key(0x0A)
+	KeyH            = Key(0x0B)
+	KeyI            = Key(0x0C)
+	KeyJ            = Key(0x0D)
+	KeyK            = Key(0x0E)
+	KeyL            = Key(0x0F)
+	KeyM            = Key(0x10)
+	KeyN            = Key(0x11)
+	KeyO            = Key(0x12)
+	KeyP            = Key(0x13)
+	KeyQ            = Key(0x14)
+	KeyR            = Key(0x15)
+	KeyS            = Key(0x16)
+	KeyT            = Key(0x17)
+	KeyU            = Key(0x18)
+	KeyV            = Key(0x19)
+	KeyW            = Key(0x1A)
+	KeyX            = Key(0x1B)
+	KeyY            = Key(0x1C)
+	KeyZ            = Key(0x1D)
+	Key1            = Key(0x1E)
+	Key2            = Key(0x1F)
+	Key3            = Key(0x20)
+	Key4            = Key(0x21)
+	Key5            = Key(0x22)
+	Key6            = Key(0x23)
+	Key7            = Key(0x24)
+	Key8            = Key(0x25)
+	Key9            = Key(0x26)
+	Key0            = Key(0x27)
+	KeyEnter        = Key(0x28)
+	KeyEsc          = Key(0x29)
+	KeyBackspace    = Key(0x2a) // sometimes called delete
+	KeyTab          = Key(0x2b)
+	KeySpace        = Key(0x2c)
+	KeyMinus        = Key(0x2d) // - and _
+	KeyEqual        = Key(0x2e) // = and +
+	KeyLBrace       = Key(0x2f) // [ and {
+	KeyRBrace       = Key(0x30) // ] and }
+	KeyBackslash    = Key(0x31) // \
+	KeyIsoHash      = Key(0x32) // international only
+	KeySemi         = Key(0x33) // ;
+	KeyQuote        = Key(0x34) // ' and " aka apostrophe
+	KeyGrave        = Key(0x35) // ` and ~
+	KeyComma        = Key(0x36) // , and <
+	KeyPeriod       = Key(0x37) // . and >
+	KeySlash        = Key(0x38) // / and ?
+	KeyCapsLock     = Key(0x39)
+	KeyF1           = Key(0x3a)
+	KeyF2           = Key(0x3b)
+	KeyF3           = Key(0x3c)
+	KeyF4           = Key(0x3d)
+	KeyF5           = Key(0x3e)
+	KeyF6           = Key(0x3f)
+	KeyF7           = Key(0x40)
+	KeyF8           = Key(0x41)
+	KeyF9           = Key(0x42)
+	KeyF10          = Key(0x43)
+	KeyF11          = Key(0x44)
+	KeyF12          = Key(0x45)
+	KeyPrtScr       = Key(0x46)
+	KeyScrLock      = Key(0x47)
+	KeyPause        = Key(0x48)
+	KeyInsert       = Key(0x49)
+	KeyHome         = Key(0x4a)
+	KeyPgUp         = Key(0x4b)
+	KeyDelete       = Key(0x4c) // forward delete (DEL)
+	KeyEnd          = Key(0x4d)
+	KeyPgDn         = Key(0x4e)
+	KeyRight        = Key(0x4f)
+	KeyLeft         = Key(0x50)
+	KeyDown         = Key(0x51)
+	KeyUp           = Key(0x52)
+	KeyNumLock      = Key(0x53) // also clear
+	KeyPadDiv       = Key(0x54)
+	KeyPadMul       = Key(0x55)
+	KeyPadSub       = Key(0x56)
+	KeyPadAdd       = Key(0x57)
+	KeyPadEnter     = Key(0x58)
+	KeyPad1         = Key(0x59) // also pad end
+	KeyPad2         = Key(0x5a) // also pad down
+	KeyPad3         = Key(0x5b) // also pad page down
+	KeyPad4         = Key(0x5c) // also pad left
+	KeyPad5         = Key(0x5d)
+	KeyPad6         = Key(0x5e) // also pad right
+	KeyPad7         = Key(0x5f) // also pad home
+	KeyPad8         = Key(0x60) // also pad up
+	KeyPad9         = Key(0x61) // also pad page up
+	KeyPad0         = Key(0x62) // also pad insert
+	KeyPadDec       = Key(0x63) // also pad delete
+	KeyIsoBackSlash = Key(0x64) // international keyboards only
+	KeyPadEqual     = Key(0x67)
+	KeyF13          = Key(0x68)
+	KeyF14          = Key(0x69)
+	KeyF15          = Key(0x6a)
+	KeyF16          = Key(0x6b)
+	KeyF17          = Key(0x6c)
+	KeyF18          = Key(0x6d)
+	KeyF19          = Key(0x6e)
+	KeyF20          = Key(0x6f)
+	KeyF21          = Key(0x70)
+	KeyF22          = Key(0x71)
+	KeyF23          = Key(0x72)
+	KeyF24          = Key(0x73)
+	KeyMenu         = Key(0x76) // might also be 0x65, KeyApplication
+	KeyPadComma     = Key(0x85)
+	KeyPadEqSign    = Key(0x86)
+	KeyIsoSlash     = Key(0x87) // also International 1
+	KeyHiragana     = Key(0x88) // also International 2
+	KeyYen          = Key(0x89) // found on JIS keyboards
+	KeyConvert      = Key(0x8a)
+	KeyNonConvert   = Key(0x8b)
+	KeyAltErase     = Key(0x99) // e.g split space-erase bar
+	KeySysReq       = Key(0x9a)
+	KeyCancel       = Key(0x9b)
+	KeyLCtrl        = Key(0xe0)
+	KeyLShift       = Key(0xe1)
+	KeyLAlt         = Key(0xe2)
+	KeyLMeta        = Key(0xe3)
+	KeyRCtrl        = Key(0xe4)
+	KeyRShift       = Key(0xe5)
+	KeyRAlt         = Key(0xe6)
+	KeyRMeta        = Key(0xe7)
+	KeyLHyper       = Key(0xff01) // software only, in reserved space
+	KeyRHyper       = Key(0xff02) // software only, in reserved space
+)
+
+// scanCodes is a list of Windows scan codes for physical keys.
+var scanCodes map[Key]ScanCode
+
+// ScanCode returns the corresponding Windows Scan Code (not a VK!)
+// for the given key. (Virtual keys should be determined by the
+// host OS using the current keyboard layout.)
+func (k Key) ScanCode() ScanCode {
+
+	if w, ok := scanCodes[k]; ok {
+		return w
+	}
+	return 0
+}
+
+// WinVK represents a windows virtual key code.
+// These are similar to base keys, but multiple scanned key codes
+// may result in the same virtual key.  This can also be sensitive to
+// the keyboard layout.
+type WinVK rune
+
+const (
+	VkBack       = WinVK(0x08) // backspace
+	VkTab        = WinVK(0x09)
+	VkClear      = WinVK(0x0c)
+	VkReturn     = WinVK(0x0d)
+	VkShift      = WinVK(0x10)
+	VkControl    = WinVK(0x11)
+	VkMenu       = WinVK(0x12)
+	VkPause      = WinVK(0x13)
+	VkCapital    = WinVK(0x14) // caps lock
+	VkKana       = WinVK(0x15)
+	VkHangul     = WinVK(0x15)
+	VkImeOn      = WinVK(0x16)
+	VkJunja      = WinVK(0x17)
+	VkFinal      = WinVK(0x18)
+	VkKanji      = WinVK(0x19)
+	VkImeOff     = WinVK(0x1a)
+	VkEscape     = WinVK(0x1b)
+	VkConvert    = WinVK(0x1c)
+	VkNonConvert = WinVK(0x1d)
+	VkAccept     = WinVK(0x1e)
+	VkModeChange = WinVK(0x1f)
+	VkSpace      = WinVK(0x20)
+	VkPrior      = WinVK(0x21) // page up
+	VkNext       = WinVK(0x22) // page down
+	VkEnd        = WinVK(0x23)
+	VkHome       = WinVK(0x24)
+	VkLeft       = WinVK(0x25)
+	VkUp         = WinVK(0x26)
+	VkRight      = WinVK(0x27)
+	VkDown       = WinVK(0x28)
+	VkSelect     = WinVK(0x29)
+	VkPrint      = WinVK(0x2a)
+	VkExecute    = WinVK(0x2b)
+	VkSnapshot   = WinVK(0x2c) // print screen
+	VkInsert     = WinVK(0x2D)
+	VkDelete     = WinVK(0x2E)
+	VkHelp       = WinVK(0x2F)
+	Vk0          = WinVK(0x30)
+	Vk1          = WinVK(0x31)
+	Vk2          = WinVK(0x32)
+	Vk3          = WinVK(0x33)
+	Vk4          = WinVK(0x34)
+	Vk5          = WinVK(0x35)
+	Vk6          = WinVK(0x36)
+	Vk7          = WinVK(0x37)
+	Vk8          = WinVK(0x38)
+	Vk9          = WinVK(0x39)
+	VkA          = WinVK(0x41)
+	VkB          = WinVK(0x42)
+	VkC          = WinVK(0x43)
+	VkD          = WinVK(0x44)
+	VkE          = WinVK(0x45)
+	VkF          = WinVK(0x46)
+	VkG          = WinVK(0x47)
+	VkH          = WinVK(0x48)
+	VkI          = WinVK(0x49)
+	VkJ          = WinVK(0x4a)
+	VkK          = WinVK(0x4b)
+	VkL          = WinVK(0x4c)
+	VkM          = WinVK(0x4d)
+	VkN          = WinVK(0x4e)
+	VkO          = WinVK(0x4f)
+	VkP          = WinVK(0x50)
+	VkQ          = WinVK(0x51)
+	VkR          = WinVK(0x52)
+	VkS          = WinVK(0x53)
+	VkT          = WinVK(0x54)
+	VkU          = WinVK(0x55)
+	VkV          = WinVK(0x56)
+	VkW          = WinVK(0x57)
+	VkX          = WinVK(0x58)
+	VkY          = WinVK(0x59)
+	VkZ          = WinVK(0x5a)
+	VkLWin       = WinVK(0x5b) // left meta
+	VkRWin       = WinVK(0x5c) // right meta
+	VkApps       = WinVK(0x5d) // menu key
+	VkNumPad0    = WinVK(0x60)
+	VkNumPad1    = WinVK(0x61)
+	VkNumPad2    = WinVK(0x62)
+	VkNumPad3    = WinVK(0x63)
+	VkNumPad4    = WinVK(0x64)
+	VkNumPad5    = WinVK(0x65)
+	VkNumPad6    = WinVK(0x66)
+	VkNumPad7    = WinVK(0x67)
+	VkNumPad8    = WinVK(0x68)
+	VkNumPad9    = WinVK(0x69)
+	VkMultiply   = WinVK(0x6a) // pad multiply
+	VkAdd        = WinVK(0x6b) // pad add
+	VkSeparator  = WinVK(0x6c) // separator
+	VkSubtract   = WinVK(0x6d) // pad subtract
+	VkDecimal    = WinVK(0x6e) // pad decimal point
+	VkDivide     = WinVK(0x6f) // pad divide
+	VkF1         = WinVK(0x70)
+	VkF2         = WinVK(0x71)
+	VkF3         = WinVK(0x72)
+	VkF4         = WinVK(0x73)
+	VkF5         = WinVK(0x74)
+	VkF6         = WinVK(0x75)
+	VkF7         = WinVK(0x76)
+	VkF8         = WinVK(0x77)
+	VkF9         = WinVK(0x78)
+	VkF10        = WinVK(0x79)
+	VkF11        = WinVK(0x7a)
+	VkF12        = WinVK(0x7b)
+	VkF13        = WinVK(0x7c)
+	VkF14        = WinVK(0x7d)
+	VkF15        = WinVK(0x7e)
+	VkF16        = WinVK(0x7f)
+	VkF17        = WinVK(0x80)
+	VkF18        = WinVK(0x81)
+	VkF19        = WinVK(0x82)
+	VkF20        = WinVK(0x83)
+	VkF21        = WinVK(0x84)
+	VkF22        = WinVK(0x85)
+	VkF23        = WinVK(0x86)
+	VkF24        = WinVK(0x87)
+	VkNumLock    = WinVK(0x90)
+	VkScroll     = WinVK(0x91) // scroll lock
+	VkLShift     = WinVK(0xa0)
+	VkRShift     = WinVK(0xa1)
+	VkLControl   = WinVK(0xa2)
+	VkRControl   = WinVK(0xa3)
+	VkLMenu      = WinVK(0xa4) // left alt
+	VkRMenu      = WinVK(0xa5) // right alt
+	VkOem1       = WinVK(0xba) // ; and :
+	VkOemPlus    = WinVK(0xbb) // = and +
+	VkOemComma   = WinVK(0xbc) // , and <
+	VkOemMinus   = WinVK(0xbd) // - and _
+	VkOemPeriod  = WinVK(0xbe) // . and >
+	VkOem2       = WinVK(0xbf) // / and ?
+	VkOem3       = WinVK(0xc0) // ` and ~
+	VkOem4       = WinVK(0xdb) // [ and {
+	VkOem5       = WinVK(0xdc) // \ and |
+	VkOem6       = WinVK(0xdd) // ] and }
+	VkOem7       = WinVK(0xde) // ' and "
+	VkOem8       = WinVK(0xdf) // right control for Canadian CSA
+	VkOem102     = WinVK(0xe2) // ISO backslash
+	VkPacket     = WinVK(0xe7)
+)
+
+var baseKeys map[Key]BaseKey
+
+// KittyBase returns the corresponding Kitty "base" key for the given USB code.
+// If no corresponding value can be found, then zero is returned.  Note that
+// some keys (such as F1) are valid, and recognized by Kitty, but do not use the
+// base key encoding because they use another reporting format.
+func (k Key) KittyBase() BaseKey {
+	if w, ok := baseKeys[k]; ok {
+		return w
+	}
+	return 0
+}
+
+func init() {
+	// we place them in init to avoid incorrect processing in coverage checks.
+
+	baseKeys = map[Key]BaseKey{
+		KeyA:            'a',
+		KeyB:            'b',
+		KeyC:            'c',
+		KeyD:            'd',
+		KeyE:            'e',
+		KeyF:            'f',
+		KeyG:            'g',
+		KeyH:            'h',
+		KeyI:            'i',
+		KeyJ:            'j',
+		KeyK:            'k',
+		KeyL:            'l',
+		KeyM:            'm',
+		KeyN:            'n',
+		KeyO:            'o',
+		KeyP:            'p',
+		KeyQ:            'q',
+		KeyR:            'r',
+		KeyS:            's',
+		KeyT:            't',
+		KeyU:            'u',
+		KeyV:            'v',
+		KeyW:            'w',
+		KeyX:            'x',
+		KeyY:            'y',
+		KeyZ:            'z',
+		Key1:            '1',
+		Key2:            '2',
+		Key3:            '3',
+		Key4:            '4',
+		Key5:            '5',
+		Key6:            '6',
+		Key7:            '7',
+		Key8:            '8',
+		Key9:            '9',
+		Key0:            '0',
+		KeyEnter:        '\r',
+		KeyEsc:          '\x1b',
+		KeyBackspace:    '\x7f',
+		KeyTab:          '\t',
+		KeySpace:        ' ',
+		KeyMinus:        '-',
+		KeyEqual:        '=',
+		KeyLBrace:       '[',
+		KeyRBrace:       ']',
+		KeyBackslash:    '\\',
+		KeyIsoHash:      '#',
+		KeySemi:         ';',
+		KeyQuote:        '\'',
+		KeyGrave:        '`',
+		KeyComma:        ',',
+		KeyPeriod:       '.',
+		KeySlash:        '/',
+		KeyCapsLock:     57357,
+		KeyPrtScr:       57361,
+		KeyScrLock:      57359,
+		KeyPause:        57362,
+		KeyNumLock:      57360,
+		KeyPadDiv:       57410,
+		KeyPadMul:       57411,
+		KeyPadSub:       57412,
+		KeyPadAdd:       57413,
+		KeyPadEnter:     57414,
+		KeyPad1:         57400,
+		KeyPad2:         57401,
+		KeyPad3:         57402,
+		KeyPad4:         57403,
+		KeyPad5:         57404,
+		KeyPad6:         57405,
+		KeyPad7:         57406,
+		KeyPad8:         57407,
+		KeyPad9:         57408,
+		KeyPad0:         57399,
+		KeyPadDec:       57409,
+		KeyIsoBackSlash: '\\', // TODO: does kitty have another mapping for this?
+		KeyMenu:         57363,
+		KeyPadEqual:     57415,
+		KeyF13:          57376,
+		KeyF14:          57377,
+		KeyF15:          57378,
+		KeyF16:          57379,
+		KeyF17:          57380,
+		KeyF18:          57381,
+		KeyF19:          57382,
+		KeyF20:          57383,
+		KeyF21:          57384,
+		KeyF22:          57385,
+		KeyF23:          57386,
+		KeyF24:          57387, // NB: F25 up through 35 are notionally supported by Kitty, but not by us
+		KeyPadComma:     57416,
+		KeyIsoSlash:     '/', // Kitty cannot discriminate?
+		KeyYen:          '¥',
+		KeyLCtrl:        57442,
+		KeyLShift:       57441,
+		KeyLAlt:         57443,
+		KeyLMeta:        57444,
+		KeyRCtrl:        57448,
+		KeyRShift:       57447,
+		KeyRAlt:         57449,
+		KeyRMeta:        57450,
+
+		// KeyHiragana:   0, // Later
+		// KeyConvert:    0, // Later
+		// KeyNonConvert: 0, // Later
+
+		// Windows uses a bunch of HID usages from
+		// the consumer page (0x0c) for media playback, and
+		// other applications. We just ignore them.
+	}
+
+	// Scan codes used by Windows.
+	scanCodes = map[Key]ScanCode{
+		KeyA:            0x1e,
+		KeyB:            0x30,
+		KeyC:            0x2e,
+		KeyD:            0x20,
+		KeyE:            0x12,
+		KeyF:            0x21,
+		KeyG:            0x22,
+		KeyH:            0x23,
+		KeyI:            0x17,
+		KeyJ:            0x24,
+		KeyK:            0x25,
+		KeyL:            0x26,
+		KeyM:            0x32,
+		KeyN:            0x31,
+		KeyO:            0x18,
+		KeyP:            0x19,
+		KeyQ:            0x10,
+		KeyR:            0x13,
+		KeyS:            0x1f,
+		KeyT:            0x14,
+		KeyU:            0x16,
+		KeyV:            0x2f,
+		KeyW:            0x11,
+		KeyX:            0x2d,
+		KeyY:            0x15,
+		KeyZ:            0x2c,
+		Key1:            0x02,
+		Key2:            0x03,
+		Key3:            0x04,
+		Key4:            0x05,
+		Key5:            0x06,
+		Key6:            0x07,
+		Key7:            0x08,
+		Key8:            0x09,
+		Key9:            0x0a,
+		Key0:            0x0b,
+		KeyEnter:        0x1c,
+		KeyEsc:          0x01,
+		KeyBackspace:    0x0e,
+		KeyTab:          0x0f,
+		KeySpace:        0x39,
+		KeyMinus:        0x0c,
+		KeyEqual:        0x0d,
+		KeyLBrace:       0x1a,
+		KeyRBrace:       0x1b,
+		KeyBackslash:    0x2b,
+		KeySemi:         0x27,
+		KeyQuote:        0x28,
+		KeyGrave:        0x29,
+		KeyComma:        0x33,
+		KeyPeriod:       0x34,
+		KeySlash:        0x35,
+		KeyCapsLock:     0x3a,
+		KeyF1:           0x3b,
+		KeyF2:           0x3c,
+		KeyF3:           0x3d,
+		KeyF4:           0x3e,
+		KeyF5:           0x3f,
+		KeyF6:           0x40,
+		KeyF7:           0x41,
+		KeyF8:           0x42,
+		KeyF9:           0x43,
+		KeyF10:          0x44,
+		KeyF11:          0x57,
+		KeyF12:          0x58,
+		KeyPrtScr:       0x54,
+		KeyScrLock:      0x46,
+		KeyPause:        0xe046,
+		KeyInsert:       0xe052,
+		KeyHome:         0xe047,
+		KeyPgUp:         0xe049,
+		KeyDelete:       0xe053,
+		KeyEnd:          0xe04f,
+		KeyPgDn:         0xe051,
+		KeyRight:        0xe04d,
+		KeyLeft:         0xe04b,
+		KeyDown:         0xe050,
+		KeyUp:           0xe048,
+		KeyNumLock:      0x45,
+		KeyPadDiv:       0xe035,
+		KeyPadMul:       0x37,
+		KeyPadSub:       0x4a,
+		KeyPadAdd:       0x4e,
+		KeyPadEnter:     0xe01c,
+		KeyPad1:         0x4f,
+		KeyPad2:         0x50,
+		KeyPad3:         0x51,
+		KeyPad4:         0x4b,
+		KeyPad5:         0x4c,
+		KeyPad6:         0x4d,
+		KeyPad7:         0x47,
+		KeyPad8:         0x48,
+		KeyPad9:         0x49,
+		KeyPad0:         0x52,
+		KeyPadDec:       0x53,
+		KeyIsoBackSlash: 0x56,
+		KeyPadEqual:     0x59,
+		KeyF13:          0x64,
+		KeyF14:          0x65,
+		KeyF15:          0x66,
+		KeyF16:          0x67,
+		KeyF17:          0x68,
+		KeyF18:          0x69,
+		KeyF19:          0x6a,
+		KeyF20:          0x6b,
+		KeyF21:          0x6c,
+		KeyF22:          0x6d,
+		KeyF23:          0x6e,
+		KeyF24:          0x76,
+		KeyPadComma:     0x7e,
+		KeyIsoSlash:     0x73,
+		KeyHiragana:     0x70,
+		KeyYen:          0x7d,
+		KeyConvert:      0x79,
+		KeyNonConvert:   0x7b,
+		KeyLCtrl:        0x1d,
+		KeyLShift:       0x2a,
+		KeyLAlt:         0x38,
+		KeyLMeta:        0xe05b,
+		KeyRCtrl:        0xe01d,
+		KeyRShift:       0x36,
+		KeyRAlt:         0xe038,
+		KeyRMeta:        0xe05c,
+		KeyMenu:         0xe05d,
+
+		// Windows uses a bunch of HID usages from
+		// the consumer page (0x0c) for media playback, and
+		// other applications. We just ignore them.
+	}
+
+	shiftedBaseKeys = map[BaseKey]rune{
+		'`':  '~',
+		'1':  '!',
+		'2':  '@',
+		'3':  '#',
+		'4':  '$',
+		'5':  '%',
+		'6':  '^',
+		'7':  '&',
+		'8':  '*',
+		'9':  '(',
+		'0':  ')',
+		'-':  '_',
+		'=':  '+',
+		'¥':  '|',
+		'[':  '{',
+		']':  '}',
+		'\\': '|',
+		';':  ':',
+		'\'': '"',
+		',':  '<',
+		'.':  '>',
+		'/':  '?',
+	}
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/layout.go b/vendor/github.com/gdamore/tcell/v3/vt/layout.go
new file mode 100644
index 000000000..7e8deb585
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/layout.go
@@ -0,0 +1,713 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vt
+
+import (
+	"sort"
+	"sync"
+	"time"
+)
+
+// This file defines the layout mechanism for keyboards.
+// All keyboards are assumed to pass "codes" that are mapped to one of
+// the Key values (this is easy for USB because the codes are mostly the
+// same as USB already!), and then we look up values.  This can be done
+// using a simple map, and we allow inheritance so we don't have to redefine
+// too many things.  For complex scenarios you'll probably want to make use
+// of operating system facilities or supply your own tables (for example for
+// Japanese keyboards.)
+
+// ModifierMap is a map that represents keys that generate runes in various
+// shift states (modifier states). A layout may have many of these, and they
+// are searched until a match is fine.
+type ModifierMap struct {
+	When func(Modifier) bool // Map only applies if this returns true
+	Map  map[Key]rune        // Map is the mapping from Key to specific rune when this map matches.
+}
+
+// KeyboardState represents the current state of the keyboard.
+// A zero initialized value is ready for use.  Note that emulators that
+// get the associated events from their operating system do not need to
+// make use of this, but this structure makes it possible to build an emulator
+// with a keyboard layout that is not known to the operating system.
+//
+// The keyboard state is assumed to be "single threaded", meaning only a single
+// caller will operate on it at any given time.  Typically there is just a single
+// keyboard polling thread or goroutine.
+type KeyboardState struct {
+	deadKey        map[rune]DeadKey // current dead key state
+	mod            Modifier
+	layout         *Layout
+	lastKey        Key           // last key pressed
+	lastRune       rune          // last rune for last key
+	repeating      bool          // true if we are repeating
+	repeatStart    time.Time     // when we started repeating
+	repeatTime     time.Time     // last time we checked
+	repeatDelay    time.Duration // delay before starting repeat
+	repeatInterval time.Duration // duration between repeats
+	pressed        map[Key]bool
+	initialized    bool
+}
+
+// initialize the keyboard, lazily.
+func (ks *KeyboardState) initialize() {
+	if !ks.initialized {
+		ks.pressed = make(map[Key]bool)
+		if ks.layout == nil {
+			ks.layout = KeyboardANSI
+		}
+		ks.repeatDelay = time.Millisecond * 250
+		ks.repeatInterval = time.Millisecond * 30
+		ks.initialized = true
+	}
+}
+
+// reset the keyboard state.
+func (ks *KeyboardState) reset() {
+	ks.clearRepeat()
+	ks.mod = 0
+	ks.deadKey = nil
+	ks.pressed = make(map[Key]bool)
+}
+
+// clear repeat clears any repeating key.
+func (ks *KeyboardState) clearRepeat() {
+	ks.repeating = false
+	ks.repeatStart = time.Time{}
+	ks.repeatTime = time.Time{}
+	ks.lastRune = 0
+	ks.lastKey = 0
+}
+
+// SetRepeat sets the repeat parameters. Note that this will only have any meaningful
+// impact if the caller calls the Pressed function repeatedly (periodically) while
+// a key is depressed.
+//
+// The repeat starts after a key has been held for for delay, with a new repeat
+// added every interval.
+//
+// The caller should usually call this before processing keyboard events.  It must
+// not be called concurrently with either of the Pressed or Release functions.
+func (ks *KeyboardState) SetRepeat(delay time.Duration, interval time.Duration) {
+	ks.initialize()
+	ks.repeatDelay = delay
+	ks.repeatInterval = interval
+	ks.clearRepeat()
+}
+
+// SetLayout sets the layout this keyboard should use.
+// This also resets the keyboard state.
+func (ks *KeyboardState) SetLayout(km *Layout) {
+	ks.initialize()
+	ks.reset()
+	ks.layout = km
+}
+
+// Pressed should be called when a given key is depressed.
+func (ks *KeyboardState) Pressed(k Key) *KeyEvent {
+	ks.initialize()
+	event := &KeyEvent{
+		Down: true,
+		Key:  k,
+		SC:   k.ScanCode(),
+		Base: k.KittyBase(),
+		Mod:  ks.mod,
+	}
+	// if another key was pressed, then clear the repeat state
+	lastKey := ks.lastKey
+	if lastKey != k && ks.repeatInterval != 0 {
+		ks.clearRepeat()
+		ks.repeatStart = time.Now().Add(ks.repeatDelay)
+		ks.repeatTime = ks.repeatStart
+	}
+	wasPressed := ks.pressed[k]
+	ks.pressed[k] = true
+	ks.lastKey = k
+
+	l := ks.layout
+	event.VK = l.Virtual[k]
+	if mod, ok := l.Locking[k]; ok {
+		// locking modifiers never repeat
+		if wasPressed {
+			return nil
+		}
+		if ks.mod&mod == 0 {
+			ks.mod |= mod
+		} else {
+			ks.mod &^= mod
+		}
+		ks.pressed[k] = true
+		event.Mod = ks.mod
+		return event
+	}
+	if mod, ok := l.Modifiers[k]; ok {
+		if wasPressed {
+			return nil
+		}
+		ks.mod |= mod
+		event.Mod = ks.mod
+		return event
+	}
+
+	// attempt to look up the rune for this
+	r := l.KeyToUTF(k, ks.mod)
+	if ks.deadKey == nil && l.DeadKeys != nil && r != 0 {
+		if dk, ok := l.DeadKeys[r]; ok {
+			ks.deadKey = dk.Next
+			return event
+		}
+	}
+
+	if dk := ks.deadKey; dk != nil {
+		if n, ok := dk[r]; ok {
+			if n.U != 0 {
+				event.Utf = string(n.U)
+				ks.lastRune = n.U
+				ks.deadKey = nil
+			} else {
+				ks.deadKey = n.Next
+			}
+			return event
+		}
+		// failed lookup - ignore it
+		ks.deadKey = nil
+	}
+
+	if r != 0 {
+		event.Utf = string(r)
+	}
+
+	if lastKey == k && wasPressed && ks.repeatInterval > 0 {
+		ks.repeating = true
+		if time.Now().After(ks.repeatStart) {
+			deltaT := time.Since(ks.repeatTime).Truncate(ks.repeatInterval)
+			event.Repeat = int(deltaT / ks.repeatInterval)
+			if ks.repeatTime == ks.repeatStart {
+				// fence post - count the first one!
+				event.Repeat++
+			}
+			ks.repeatTime = ks.repeatTime.Add(deltaT)
+			// if we polled before the repeat interval then report nothing
+			if event.Repeat == 0 {
+				return nil
+			}
+		}
+	}
+
+	return event
+}
+
+// Released should be called when a given key is Released.
+func (ks *KeyboardState) Released(k Key) *KeyEvent {
+	ks.initialize()
+	event := &KeyEvent{
+		Down: false,
+		Key:  k,
+		SC:   k.ScanCode(),
+		Base: k.KittyBase(),
+		Mod:  ks.mod,
+	}
+	if ks.lastKey == k {
+		ks.clearRepeat()
+	}
+	wasPressed := ks.pressed[k]
+	delete(ks.pressed, k)
+
+	l := ks.layout
+	event.VK = l.Virtual[k]
+
+	if mod, ok := ks.layout.Modifiers[k]; ok {
+		if !wasPressed {
+			// something weird
+			return nil
+		}
+		ks.mod &^= mod
+
+		event.Mod = ks.mod
+		return event
+	}
+
+	if _, ok := ks.layout.Locking[k]; !ok {
+		if r := l.KeyToUTF(k, ks.mod); r != 0 {
+			event.Utf = string(r)
+		}
+	}
+
+	// no real point in looking up UTF for key release, so we don't
+
+	return event
+}
+
+// DeadKey is what happens when a dead key is pressed.  Either it starts an unresolved sequence,
+// (in which case Next will be non-nil), or it resolves to a final rune (in which case U will be non-zero)
+// This is also sometimes called a composed key sequence.
+type DeadKey struct {
+	Next map[rune]DeadKey // Next corresponds to the next key in the sequence for dead keys
+	U    rune             // U is the rune that should be emitted on completion of the sequence.
+}
+
+// DeadRune is used internally to create a rune to represent a dead key.
+// While any numbers can be used from this point on, the expectation is
+// that this will be added to a smaller rune (such as an ASCII character)
+// This rune value a bit inside the supplementary private use area B,
+// in an attempt to minimize the chance of any conflicting use (for
+// example nerd fonts.)
+const DeadRune = 0x101000
+
+// Layout is a structure that represents a keyboard layout.
+// Applications or users may implement their own layouts by
+// registering an instance of this.
+type Layout struct {
+	// Name is the name of the keyboard layout.
+	// We prefer to use the same names that Microsoft uses for keyboard layouts.
+	Name string
+
+	// Base is a base keyboard layout, so that we can simplify by only
+	// overriding keys we are are handling differently.
+	Base *Layout
+
+	// DeadKeys maps specific starting keys, to an emitted rune.
+	// The keys should a rune value starting with DeadRune.
+	DeadKeys map[rune]DeadKey
+
+	// Locking are modifiers that toggle a locked state like NumLock or CapsLock.
+	Locking map[Key]Modifier
+
+	// Modifiers toggle a state, but only while the key is depressed.
+	Modifiers map[Key]Modifier
+
+	// Virtual maps keys to virtual keys.
+	Virtual map[Key]WinVK
+
+	// Maps is the list of key maps by modifier and mask.
+	// Use more specific masks first - for example NumLock
+	// mask might contain only the masks for the number keypad,
+	// and that should be listed before the maps for the rest
+	// of the keyboard.  The algorithm searches for the first
+	// match, not the best match.
+	Maps []ModifierMap
+}
+
+func (km *Layout) KeyToUTF(k Key, m Modifier) rune {
+	for _, mm := range km.Maps {
+		if mm.When != nil && !mm.When(m) {
+			continue
+		}
+		if u, ok := mm.Map[k]; ok {
+			return u
+		}
+	}
+	if km.Base != nil {
+		return km.Base.KeyToUTF(k, m)
+	}
+	return 0
+}
+
+// KeysUsLower is a list of lower case key maps.
+var KeysUsLower = map[Key]rune{
+	KeyA: 'a',
+	KeyB: 'b',
+	KeyC: 'c',
+	KeyD: 'd',
+	KeyE: 'e',
+	KeyF: 'f',
+	KeyG: 'g',
+	KeyH: 'h',
+	KeyI: 'i',
+	KeyJ: 'j',
+	KeyK: 'k',
+	KeyL: 'l',
+	KeyM: 'm',
+	KeyN: 'n',
+	KeyO: 'o',
+	KeyP: 'p',
+	KeyQ: 'q',
+	KeyR: 'r',
+	KeyS: 's',
+	KeyT: 't',
+	KeyU: 'u',
+	KeyV: 'v',
+	KeyW: 'w',
+	KeyX: 'x',
+	KeyY: 'y',
+	KeyZ: 'z',
+}
+
+// KeysUsUpper is a list of upper case key maps.
+var KeysUsUpper = map[Key]rune{
+	KeyA: 'A',
+	KeyB: 'B',
+	KeyC: 'C',
+	KeyD: 'D',
+	KeyE: 'E',
+	KeyF: 'F',
+	KeyG: 'G',
+	KeyH: 'H',
+	KeyI: 'I',
+	KeyJ: 'J',
+	KeyK: 'K',
+	KeyL: 'L',
+	KeyM: 'M',
+	KeyN: 'N',
+	KeyO: 'O',
+	KeyP: 'P',
+	KeyQ: 'Q',
+	KeyR: 'R',
+	KeyS: 'S',
+	KeyT: 'T',
+	KeyU: 'U',
+	KeyV: 'V',
+	KeyW: 'W',
+	KeyX: 'X',
+	KeyY: 'Y',
+	KeyZ: 'Z',
+}
+
+// KeysDigits is a map of number keys to corresponding digits.
+var KeysDigits = map[Key]rune{
+	Key1: '1',
+	Key2: '2',
+	Key3: '3',
+	Key4: '4',
+	Key5: '5',
+	Key6: '6',
+	Key7: '7',
+	Key8: '8',
+	Key9: '9',
+	Key0: '0',
+}
+
+// KeysPadDigits is a map of the digits on the numeric keypad,
+// when num lock is engaged.
+var KeysPadDigits = map[Key]rune{
+	KeyPad0:   '0',
+	KeyPad1:   '1',
+	KeyPad2:   '2',
+	KeyPad3:   '3',
+	KeyPad4:   '4',
+	KeyPad5:   '5',
+	KeyPad6:   '6',
+	KeyPad7:   '7',
+	KeyPad8:   '8',
+	KeyPad9:   '9',
+	KeyPadDec: '.',
+}
+
+var KeysPadOps = map[Key]rune{
+	KeyPadMul: '*',
+	KeyPadAdd: '+',
+	KeyPadSub: '-',
+	KeyPadDiv: '/',
+}
+
+// KeyboardANSI is the base PC keyboard used in ANSI (US) systems.
+var KeyboardANSI = &Layout{
+	Name: "US",
+
+	Base: nil,
+
+	// Virtual maps physical keys to virtual keys.
+	Virtual: map[Key]WinVK{
+		KeyEsc:          VkEscape,
+		KeyF1:           VkF1,
+		KeyF2:           VkF2,
+		KeyF3:           VkF3,
+		KeyF4:           VkF4,
+		KeyF5:           VkF5,
+		KeyF6:           VkF6,
+		KeyF7:           VkF7,
+		KeyF8:           VkF8,
+		KeyF9:           VkF9,
+		KeyF10:          VkF10,
+		KeyF11:          VkF11,
+		KeyF12:          VkF12,
+		KeyF13:          VkF13,
+		KeyF14:          VkF14,
+		KeyF15:          VkF15,
+		KeyF16:          VkF16,
+		KeyF17:          VkF17,
+		KeyF18:          VkF18,
+		KeyF19:          VkF19,
+		KeyF20:          VkF20,
+		KeyF21:          VkF21,
+		KeyF22:          VkF22,
+		KeyF23:          VkF23,
+		KeyF24:          VkF24,
+		KeyPrtScr:       VkSnapshot,
+		KeyScrLock:      VkScroll,
+		KeyPause:        VkPause,
+		KeyInsert:       VkInsert,
+		KeyDelete:       VkDelete,
+		KeyHome:         VkHome,
+		KeyEnd:          VkEnd,
+		KeyPgUp:         VkPrior,
+		KeyPgDn:         VkNext,
+		KeyLeft:         VkLeft,
+		KeyRight:        VkRight,
+		KeyUp:           VkUp,
+		KeyDown:         VkDown,
+		KeyNumLock:      VkNumLock,
+		KeyCapsLock:     VkCapital,
+		KeyLShift:       VkLShift,
+		KeyLCtrl:        VkLControl,
+		KeyLMeta:        VkLWin,
+		KeyLAlt:         VkLMenu,
+		KeyRShift:       VkRShift,
+		KeyRCtrl:        VkRControl,
+		KeyRMeta:        VkRWin,
+		KeyRAlt:         VkRMenu,
+		KeyMenu:         VkApps,
+		KeyConvert:      VkConvert,
+		KeyNonConvert:   VkNonConvert,
+		KeyBackspace:    VkBack,
+		KeyEnter:        VkReturn,
+		KeySpace:        VkSpace,
+		KeyTab:          VkTab,
+		Key1:            Vk1,
+		Key2:            Vk2,
+		Key3:            Vk3,
+		Key4:            Vk4,
+		Key5:            Vk5,
+		Key6:            Vk6,
+		Key7:            Vk7,
+		Key8:            Vk8,
+		Key9:            Vk9,
+		Key0:            Vk0,
+		KeyA:            VkA,
+		KeyB:            VkB,
+		KeyC:            VkC,
+		KeyD:            VkD,
+		KeyE:            VkE,
+		KeyF:            VkF,
+		KeyG:            VkG,
+		KeyH:            VkH,
+		KeyI:            VkI,
+		KeyJ:            VkJ,
+		KeyK:            VkK,
+		KeyL:            VkL,
+		KeyM:            VkM,
+		KeyN:            VkN,
+		KeyO:            VkO,
+		KeyP:            VkP,
+		KeyQ:            VkQ,
+		KeyR:            VkR,
+		KeyS:            VkS,
+		KeyT:            VkT,
+		KeyU:            VkU,
+		KeyV:            VkV,
+		KeyW:            VkW,
+		KeyX:            VkX,
+		KeyY:            VkY,
+		KeyZ:            VkZ,
+		KeyPadMul:       VkMultiply,
+		KeyPadAdd:       VkAdd,
+		KeyPadSub:       VkSubtract,
+		KeyPadDiv:       VkDivide,
+		KeyEqual:        VkOemPlus,
+		KeyComma:        VkOemComma,
+		KeyMinus:        VkOemMinus,
+		KeyPeriod:       VkOemPeriod,
+		KeySlash:        VkOem2,
+		KeyGrave:        VkOem3,
+		KeyLBrace:       VkOem4,
+		KeyBackslash:    VkOem5,
+		KeyRBrace:       VkOem6,
+		KeyQuote:        VkOem7,
+		KeyIsoBackSlash: VkOem102,
+		KeyPad0:         VkInsert,
+		KeyPad1:         VkEnd,
+		KeyPad2:         VkDown,
+		KeyPad3:         VkNext,
+		KeyPad4:         VkLeft,
+		KeyPad5:         VkClear,
+		KeyPad6:         VkRight,
+		KeyPad7:         VkHome,
+		KeyPad8:         VkUp,
+		KeyPad9:         VkPrior,
+		KeyPadDec:       VkDelete,
+	},
+	Maps: []ModifierMap{
+		// Specials - without control
+		{
+			When: func(m Modifier) bool { return !m.IsCtrl() },
+			Map: map[Key]rune{
+				KeyTab:       '\t',
+				KeyEnter:     '\r',
+				KeyBackspace: '\b',
+				KeyEsc:       '\x1b',
+				KeySpace:     ' ',
+				KeyPadEnter:  '\r',
+			},
+		},
+		// Specials - with control (but without shift)
+		{
+			When: func(m Modifier) bool { return m.IsCtrl() && !m.IsShift() },
+			Map: map[Key]rune{
+				KeyTab:       '\t',
+				KeyEnter:     '\n',
+				KeyBackspace: '\x7f',
+				KeyEsc:       '\x1b',
+				KeySpace:     ' ',
+				KeyPadEnter:  '\n',
+			},
+		},
+		// Key pad operators
+		{
+			When: func(m Modifier) bool { return !m.IsAlt() },
+			Map:  KeysPadOps,
+		},
+		// Numeric keypad when num lock is engaged
+		{
+			When: func(m Modifier) bool { return m.IsNumLock() },
+			Map:  KeysPadDigits,
+		},
+		// Numbers - without shift
+		{
+			When: func(m Modifier) bool { return !m.IsShift() && !m.IsCtrl() },
+			Map:  KeysDigits,
+		},
+		// Numbers - with shift - this is locale sensitive usually
+		{
+			When: func(m Modifier) bool { return m.IsShift() && !m.IsCtrl() },
+			Map: map[Key]rune{
+				Key1: '!',
+				Key2: '@',
+				Key3: '#',
+				Key4: '$',
+				Key5: '%',
+				Key6: '^',
+				Key7: '&',
+				Key8: '*',
+				Key9: '(',
+				Key0: ')',
+			},
+		},
+		// Special shift-control cases
+		{
+			When: func(m Modifier) bool { return m.IsCtrl() && m.IsShift() },
+			Map: map[Key]rune{
+				Key2:     0,
+				Key6:     '\x1e',
+				KeyMinus: '\x1f',
+			},
+		},
+		// Letters - base (lower case)
+		{
+			When: func(m Modifier) bool { return !m.IsCtrl() && !m.IsCapitals() },
+			Map:  KeysUsLower,
+		},
+		// Letters - capitals (either caps lock or shift, but not both)
+		{
+			When: func(m Modifier) bool { return !m.IsCtrl() && m.IsCapitals() },
+			Map:  KeysUsUpper,
+		},
+		// OEM keys - base
+		{
+			When: func(m Modifier) bool { return !m.IsShift() && !m.IsCtrl() },
+			Map: map[Key]rune{
+				KeySemi:         ';',
+				KeyEqual:        '=',
+				KeyComma:        ',',
+				KeyMinus:        '-',
+				KeyPeriod:       '.',
+				KeySlash:        '/',
+				KeyGrave:        '`',
+				KeyLBrace:       '[',
+				KeyBackslash:    '\\',
+				KeyRBrace:       ']',
+				KeyQuote:        '\'',
+				KeyIsoBackSlash: '\\',
+			},
+		},
+		// OEM keys - shift
+		{
+			When: func(m Modifier) bool { return m.IsShift() && !m.IsCtrl() },
+			Map: map[Key]rune{
+				KeySemi:         ':',
+				KeyEqual:        '+',
+				KeyComma:        '<',
+				KeyMinus:        '_',
+				KeyPeriod:       '>',
+				KeySlash:        '?',
+				KeyGrave:        '~',
+				KeyLBrace:       '{',
+				KeyBackslash:    '|',
+				KeyRBrace:       '}',
+				KeyQuote:        '"',
+				KeyIsoBackSlash: '|',
+			},
+		},
+		// OEM keys - control (odd balls)
+		{
+			When: func(m Modifier) bool { return m.IsCtrl() && !m.IsShift() },
+			Map: map[Key]rune{
+				KeyLBrace:       '\x1b',
+				KeyBackslash:    '\x1c',
+				KeyRBrace:       '\x1d',
+				KeyIsoBackSlash: '\x1c',
+			},
+		},
+	},
+	Modifiers: map[Key]Modifier{
+		KeyLShift: ModLShift,
+		KeyRShift: ModRShift,
+		KeyLCtrl:  ModLCtrl,
+		KeyRCtrl:  ModRCtrl,
+		KeyLAlt:   ModLAlt,
+		KeyRAlt:   ModRAlt,
+		KeyRMeta:  ModRMeta,
+		KeyLMeta:  ModLMeta,
+		KeyRHyper: ModRHyper,
+		KeyLHyper: ModLHyper,
+	},
+	Locking: map[Key]Modifier{
+		KeyNumLock:  ModNumLock,
+		KeyCapsLock: ModCapsLock,
+	},
+}
+
+var allLayouts = map[string]*Layout{
+	KeyboardANSI.Name: KeyboardANSI,
+}
+
+var layoutsLock sync.Mutex
+
+// RegisterLayout registers the given layout.
+func RegisterLayout(km *Layout) {
+	layoutsLock.Lock()
+	allLayouts[km.Name] = km
+	layoutsLock.Unlock()
+}
+
+// GetLayout returns a keyboard layout for the given name.
+// The layout must have been previously registered with RegisterLayout.
+// (Builtin layouts do this as a consequence of importing the layout.)
+func GetLayout(name string) *Layout {
+	layoutsLock.Lock()
+	defer layoutsLock.Unlock()
+	return allLayouts[name]
+}
+
+// Layouts returns a list of all known layout names.
+func Layouts() []string {
+	layoutsLock.Lock()
+	defer layoutsLock.Unlock()
+	res := make([]string, 0, len(allLayouts))
+	for k := range allLayouts {
+		res = append(res, k)
+	}
+	sort.Strings(res)
+	return res
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/mock.go b/vendor/github.com/gdamore/tcell/v3/vt/mock.go
new file mode 100644
index 000000000..71b88ed57
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/mock.go
@@ -0,0 +1,685 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vt
+
+import (
+	"slices"
+	"sync"
+	"time"
+
+	"github.com/gdamore/tcell/v3/color"
+	"github.com/gdamore/tcell/v3/tty"
+)
+
+// mockTerm implements MockTerm.
+type mockTerm struct {
+	mb MockBackend
+	em Emulator
+	ks *KeyboardState
+}
+
+// Stop the terminal.
+func (mt *mockTerm) Stop() error {
+	return mt.em.Stop()
+}
+
+// Start the terminal.
+func (mt *mockTerm) Start() error {
+	return mt.em.Start()
+}
+
+// Drain all output from the terminal, ensuring
+// any queued commands are processed.
+func (mt *mockTerm) Drain() error {
+	return mt.em.Drain()
+}
+
+// Read data from the terminal. This is called by a terminal
+// application (e.g. via tcell Tty.)  Read data will include
+// key strokes, mouse events, and responses to terminal queries.
+func (mt *mockTerm) Read(data []byte) (int, error) {
+	return mt.em.Read(data)
+}
+
+// Write data to the terminal, typically either commands or data
+// that should be displayed on the virtual screen.
+func (mt *mockTerm) Write(b []byte) (n int, err error) {
+	return mt.em.Write(b)
+}
+
+// WindowSize obtains the dimensions of the window.
+func (mt *mockTerm) WindowSize() (tty.WindowSize, error) {
+	sz := mt.mb.GetSize()
+	// No pixel sizes for now
+	return tty.WindowSize{Width: int(sz.X), Height: int(sz.Y)}, nil
+}
+
+// NotifyResize registers a channel to be signaled when a resize has occurred.
+// In real terminal emulators this would be posted (non-blocking) by a signal handler.
+func (mt *mockTerm) NotifyResize(resizeq chan<- bool) {
+	if rs, ok := mt.mb.(Resizer); ok {
+		rs.NotifyResize(resizeq)
+	}
+}
+
+// Close closes the terminal, after which it should no longer be used. Stop is implied.
+func (mt *mockTerm) Close() error {
+	return mt.Stop()
+}
+
+// Pos returns the cursor position.
+func (mt *mockTerm) Pos() Coord {
+	return mt.mb.GetPosition()
+}
+
+// GetCell returns the contents of the cell at the given coordinates, or a zero value
+// if the coordinates are out of range.
+func (mt *mockTerm) GetCell(pos Coord) Cell {
+	return mt.mb.GetCell(pos)
+}
+
+// Bells counts the number of times the bell has rung.
+func (mt *mockTerm) Bells() int {
+	return mt.mb.Bells()
+}
+
+// KeyEvent is used to inject a key event.  Call this to inject
+// a synthetic, fully specified key event.  Most uses should just use
+// the KeyPress, KeyRelease, or even simpler KeyTap APIs.
+func (mt *mockTerm) KeyEvent(ev KeyEvent) {
+	mt.em.KeyEvent(ev)
+	if ev.Key == KeyEsc {
+		// Inject a delay to simulate human typing.
+		// Necessary to disambiguate Escape from other sequences.
+		time.Sleep(time.Millisecond * 150)
+	}
+}
+
+// KeyPress implements MockTerm.KeyPress.
+func (mt *mockTerm) KeyPress(k Key) {
+	if event := mt.ks.Pressed(k); event != nil {
+		mt.KeyEvent(*event)
+	}
+}
+
+// KeyRelease implements MockTerm.KeyRelease.
+func (mt *mockTerm) KeyRelease(k Key) {
+	if event := mt.ks.Released(k); event != nil {
+		mt.KeyEvent(*event)
+	}
+}
+
+// KeyTap implements MockTerm.KeyTap.
+func (mt *mockTerm) KeyTap(keys ...Key) {
+	for _, k := range keys {
+		mt.KeyPress(k)
+	}
+	for _, k := range slices.Backward(keys) {
+		mt.KeyRelease(k)
+	}
+}
+
+// SetRepeat sets the repeat interval for the keyboard.
+// Set the interval to zero to disable repeat.
+func (mt *mockTerm) SetRepeat(delay, interval time.Duration) {
+	mt.ks.SetRepeat(delay, interval)
+}
+
+// MouseEvent implements MockTerm.MouseEvent.
+func (mt *mockTerm) MouseEvent(ev MouseEvent) {
+	mt.em.MouseEvent(ev)
+}
+
+// FocusEvent implements MockTerm.FocusEvent.
+func (mt *mockTerm) FocusEvent(focused bool) {
+	mt.em.FocusEvent(focused)
+}
+
+// GetTitle returns the current window title.
+func (mt *mockTerm) GetTitle() string {
+	return mt.mb.GetTitle()
+}
+
+// SetSize is used to change the terminal size.
+func (mt *mockTerm) SetSize(size Coord) {
+	mt.mb.SetSize(size)
+	mt.em.ResizeEvent(size)
+}
+
+// Backend returns the backend for testing.
+func (mt *mockTerm) Backend() MockBackend {
+	return mt.mb
+}
+
+// SendRaw is used to inject raw bytes to the read stream of the app.
+// Use this for fuzz testing.
+func (mt *mockTerm) SendRaw(data []byte) {
+	mt.em.SendRaw(data)
+}
+
+// SetLayout sets the keyboard layout.
+func (mt *mockTerm) SetLayout(km *Layout) {
+	mt.ks.SetLayout(km)
+}
+
+// MockTerm is a mock terminal (emulator).  It can be used to
+// test the emulator itself, or to test applications (or tcell) that
+// uses the terminal.  It also implements the Tty interface used
+// by tcell itself.
+type MockTerm interface {
+	tty.Tty
+
+	// Pos reports the current cursor position.
+	Pos() Coord
+
+	// GetCell returns the cell at the given coordinates.
+	// The coordinates must be valid.
+	GetCell(Coord) Cell
+
+	// Bells returns the number of times the bell has been rung.
+	Bells() int
+
+	// Inject a keyboard event - this is a full event, and bypasses
+	// the layout and keyboard state processor.
+	KeyEvent(KeyEvent)
+
+	// Inject a key press.
+	KeyPress(Key)
+
+	// Inject a key release.
+	KeyRelease(Key)
+
+	// SetRepeat configures keyboard repeating. Repeat keystrokes
+	// will be assumed after the key has been held for at least delay,
+	// with new keys added each interval.
+	SetRepeat(delay, interval time.Duration)
+
+	// Inject one or more key press and releases.
+	// The keys are pressed in the order, and released in reverse order.
+	// Thus modifiers should be listed first.  This should not be used
+	// to simulate typing a sequence (e.g. a word), but if you wanted to
+	// test say N-Key rollover you could do that here.
+	KeyTap(...Key)
+
+	// Inject a mouse event.
+	MouseEvent(MouseEvent)
+
+	// Inject a focus event.
+	FocusEvent(bool)
+
+	// GetTitle obtains the current window title.
+	GetTitle() string
+
+	// SetSize is used to resize the terminal.
+	SetSize(Coord)
+
+	// SendRaw is used to send raw data to the application.
+	// This is mostly intended to facilitate fuzz testing the application.
+	SendRaw([]byte)
+
+	// Backend returns the backend (used for testing).
+	Backend() MockBackend
+
+	// SetLayout sets the keyboard layout to use.
+	// If not specified, a US standard ANSI keyboard will be assumed.
+	SetLayout(*Layout)
+}
+
+type noMockBlit struct {
+	MockBackend
+	Blit struct{} // prevents use as Blitter
+}
+
+// NewMockTerm gives a mock terminal emulator.
+func NewMockTerm(opts ...MockOpt) MockTerm {
+	mt := &mockTerm{}
+	mt.mb = NewMockBackend(opts...)
+	var be MockBackend = mt.mb
+	emOpts := []EmulatorOpt{}
+	for _, o := range opts {
+		switch o.(type) {
+		case MockOptNoBlit:
+			be = &noMockBlit{be, struct{}{}}
+		case MockOpt8BitControls:
+			emOpts = append(emOpts, EmulatorOpt8BitControls{})
+		}
+	}
+	mt.em = NewEmulator(be, emOpts...)
+	mt.em.SetId("TCellMock", "1.0")
+	mt.ks = &KeyboardState{}
+	return mt
+}
+
+// MockBackend provides additional mock-specific capabilities on top of Backend.
+// This is meant to facilitate test cases
+type MockBackend interface {
+	Backend
+
+	// GetCell returns the cell at the given position, or an empty cell if the
+	// position is out of the bounds of the window.
+	GetCell(Coord) Cell
+
+	// Bells counts the number of bells rung.
+	Bells() int
+
+	// GetTitle gets the current window title.
+	GetTitle() string
+
+	// SetSize is used to resize the window.
+	// Newly added cells are empty, and content in old cells that out of range is lost.
+	SetSize(Coord)
+
+	// GetCursor is used to obtain the current cursor style.
+	GetCursor() CursorStyle
+
+	// SetClipboard sets the clipboard contents (copy buffer).
+	SetClipboard([]byte)
+
+	// GetClipboard returns the clipboard (copy buffer).
+	GetClipboard() []byte
+
+	// IsAdvancedKeyboard returns true, as we always support the full keyboard protocol.
+	IsAdvancedKeyboard() bool
+}
+
+// mockBackend is a mock of a backend device for use with the emulator.
+// It implements the following interfaces:
+// vt.Backend, vt.Beeper, vt.Colorer, vt.Titler, vt.Resizer, vt.Blitter
+type mockBackend struct {
+	cells        []Cell // Content of cells
+	size         Coord
+	pos          Coord
+	colors       int
+	style        Style
+	defaultStyle Style
+	notifyQ      chan<- bool
+	resized      bool
+	newSize      Coord
+	modes        map[PrivateMode]ModeStatus
+	bells        int
+	errs         int
+	title        string
+	clipboard    []byte
+	cursor       CursorStyle
+	lock         sync.Mutex
+}
+
+func (mb *mockBackend) GetSize() Coord {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	mb.checkSize()
+	return mb.size
+}
+
+func (mb *mockBackend) Beep() {
+	mb.lock.Lock()
+	mb.bells++
+	mb.lock.Unlock()
+}
+
+func (mb *mockBackend) SetMouse(MouseReporting) {}
+
+func (mb *mockBackend) GetPrivateMode(pm PrivateMode) ModeStatus {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	// note default (zero) value is ModeNA
+	return mb.modes[pm]
+}
+
+func (mb *mockBackend) SetPrivateMode(pm PrivateMode, status ModeStatus) error {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	if old := mb.modes[pm]; old == ModeOn || old == ModeOff {
+		if status == ModeOn || status == ModeOff {
+			mb.modes[pm] = status
+		} else {
+			mb.errs++
+		}
+	} else {
+		mb.errs++
+	}
+	return nil
+}
+
+func (mb *mockBackend) Put(pos Coord, cell Cell) { // grapheme string, width int, style Style) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	mb.checkSize()
+
+	if index := mb.index(pos); index >= 0 {
+		mb.cells[index] = cell
+
+		// writing to a cell right after a wide
+		// character clears that wide character (but leaves style/attributes)
+		if cell.W > 0 && pos.X > 0 && mb.cells[index-1].W > 1 {
+			mb.cells[index-1].C = ""
+			mb.cells[index-1].W = 0
+		}
+
+		// wide characters delete the next cell
+		if cell.W == 2 && pos.X < mb.size.X-1 {
+			mb.cells[index+1].C = ""
+			mb.cells[index+1].W = 0
+			mb.cells[index+1].S = cell.S
+		}
+	} else {
+		mb.errs++
+	}
+}
+
+func (mb *mockBackend) isPositionValid(pos Coord) bool {
+	mb.checkSize()
+
+	return pos.X < mb.size.X && pos.Y < mb.size.Y && pos.X >= 0 && pos.Y >= 0
+}
+
+// index calculates the index in the cells array.  If the coordinates are invalid,
+// -1 will be returned.
+func (mb *mockBackend) index(pos Coord) int {
+	mb.checkSize()
+
+	if !mb.isPositionValid(pos) {
+		return -1
+	}
+	return int(pos.X) + int(pos.Y)*int(mb.size.X)
+}
+
+func (mb *mockBackend) GetCell(pos Coord) Cell {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	if index := mb.index(pos); index >= 0 {
+		return mb.cells[index]
+	}
+	return Cell{S: BaseStyle}
+}
+
+func (mb *mockBackend) Bells() int {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	return mb.bells
+}
+
+func (mb *mockBackend) GetPosition() Coord {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	mb.checkSize()
+	return mb.pos
+}
+
+func (mb *mockBackend) SetPosition(pos Coord) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	mb.checkSize()
+	pos.X = min(mb.size.X-1, max(0, pos.X))
+	pos.Y = min(mb.size.Y-1, max(0, pos.Y))
+	mb.pos = pos
+}
+
+func (mb *mockBackend) Colors() int {
+	return mb.colors
+}
+
+func (mb *mockBackend) SetStyle(style Style) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	mb.style = style
+}
+
+// SetWindowTitle implements the Titler interface.
+func (mb *mockBackend) SetWindowTitle(title string) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	mb.title = title
+}
+
+// GetTitle allows test code to observe what was set with SetWindowTitle.
+func (mb *mockBackend) GetTitle() string {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	return mb.title
+}
+
+// NotifyResize registers a channel to be written to (non-blocking) if the
+// backend changes size.
+func (mb *mockBackend) NotifyResize(rq chan<- bool) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	mb.notifyQ = rq
+}
+
+// checkSize performs a possible terminal resize. Cells that are
+// added are treated as empty, while cells that are removed are just lost.
+// (Note that at least one other emulator erases content on a resize.  There is no
+// standard for what to do here.) This is done inline when calculating the index.
+// The caller is expected to hold mb.lock.
+func (mb *mockBackend) checkSize() {
+	if !mb.resized {
+		return
+	}
+	size := mb.newSize
+	old := mb.cells
+	ox := int(mb.size.X)
+	oy := int(mb.size.Y)
+	nx := int(size.X)
+	ny := int(size.Y)
+	cells := make([]Cell, int(size.Y)*int(size.X))
+	for i := range cells {
+		cells[i].S = BaseStyle
+	}
+	for y := range min(ny, oy) {
+		for x := range min(nx, ox) {
+			cells[y*nx+x] = old[y*ox+x]
+		}
+	}
+	mb.cells = cells
+	mb.size = size
+	mb.pos.X = min(mb.pos.X, size.X-1)
+	mb.pos.Y = min(mb.pos.Y, size.Y-1)
+	mb.resized = false
+}
+
+func (mb *mockBackend) RaiseResize() {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	if rq := mb.notifyQ; rq != nil {
+		select {
+		case rq <- true:
+		default:
+		}
+	}
+}
+
+// SetSize is used to change the size of the virtual terminal.
+func (mb *mockBackend) SetSize(size Coord) {
+	mb.lock.Lock()
+	mb.resized = true
+	mb.newSize = size
+	mb.lock.Unlock()
+}
+
+// Reset the terminal to startup defaults.
+func (mb *mockBackend) Reset() {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	mb.style = mb.defaultStyle
+
+	mb.title = ""
+	mb.errs = 0
+	mb.bells = 0
+	mb.pos = Coord{X: 0, Y: 0}
+	mb.modes[PmShowCursor] = ModeOn
+	mb.modes[PmBlinkCursor] = ModeOn
+	mb.modes[PmGraphemeClusters] = ModeOff
+}
+
+func (mb *mockBackend) Blit(src, dst, dim Coord) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+
+	mb.checkSize()
+
+	// clip to visible source
+	if dim.X+src.X > mb.size.X {
+		dim.X = mb.size.X - src.X
+	}
+	if dim.Y+src.Y > mb.size.Y {
+		dim.Y = mb.size.Y - src.Y
+	}
+	// and clip to final destination
+	if dim.X+dst.X > mb.size.X {
+		dim.X = mb.size.X - dst.X
+	}
+	if dim.Y+dst.Y > mb.size.Y {
+		dim.Y = mb.size.Y - dst.Y
+	}
+
+	// gap represents decrement when shifting to the next row --
+	// skipping over the irrelevant cells. (The increment in the
+	// index when going from last cell of row to first cell of next row,
+	// or vice versa.)
+	gap := int(mb.size.X - dim.X)
+
+	// the following logic is carefully constructed to avoid expensive
+	// operations in the loops (only addition or subtraction)
+	if mb.index(src) > mb.index(dst) { // source appears later, so we can forward copy
+		si := mb.index(src)
+		di := mb.index(dst)
+		for range dim.Y {
+			for range dim.X {
+				mb.cells[di] = mb.cells[si]
+				di++
+				si++
+			}
+			// advance to next row
+			si += gap
+			di += gap
+		}
+	} else { // source appears earlier, so we have to reverse copy
+		src.Y += dim.Y - 1
+		dst.Y += dim.Y - 1
+		src.X += dim.X - 1
+		dst.X += dim.X - 1
+		si := mb.index(src)
+		di := mb.index(dst)
+
+		for range dim.Y {
+			for range dim.X {
+				mb.cells[di] = mb.cells[si]
+				si--
+				di--
+			}
+			si -= gap
+			di -= gap
+		}
+	}
+}
+
+// Buffering is not supported by the mockBackend, and there is little point in it.
+func (mb *mockBackend) Buffering(bool) {}
+
+// SetCursor is used to set how the cursor is displayed.
+func (mb *mockBackend) SetCursor(cs CursorStyle) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	mb.cursor = cs
+}
+
+// GetCursor returns the current cursor style.
+func (mb *mockBackend) GetCursor() CursorStyle {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	return mb.cursor
+}
+
+// SetClipboard sets the current clipboard contents.
+func (mb *mockBackend) SetClipboard(data []byte) {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	mb.clipboard = data
+}
+
+// GetClipboard gets the current clipboard contents.
+func (mb *mockBackend) GetClipboard() []byte {
+	mb.lock.Lock()
+	defer mb.lock.Unlock()
+	return mb.clipboard
+}
+
+// IsAdvancedKeyboard returns true - we always implement
+// the raw keyboard protocol.
+func (mb *mockBackend) IsAdvancedKeyboard() bool { return true }
+
+// MockOpt is an interface by which options can change the behavior of the mocked terminal.
+// This is intended to permit easier testing.
+type MockOpt interface{ SetMockOpt(mb *mockBackend) }
+
+// MockOptSize changes the default terminal size, which is normally 80x24.
+type MockOptSize Coord
+
+func (o MockOptSize) SetMockOpt(mb *mockBackend) { mb.size = Coord(o) }
+
+// MockOptColors changes the number of colors the terminal supports.
+type MockOptColors int
+
+func (o MockOptColors) SetMockOpt(mb *mockBackend) { mb.colors = int(o) }
+
+// MockOptNoBlit suppresses the blitter interface.
+type MockOptNoBlit struct{}
+
+func (MockOptNoBlit) SetMockOpt(mb *mockBackend) {}
+
+// MockOpt8BitControls enables raw 8-bit and UTF-8 encoded C1 controls in the
+// emulator. The default is to accept only 7-bit ESC-prefixed controls.
+type MockOpt8BitControls struct{}
+
+func (MockOpt8BitControls) SetMockOpt(mb *mockBackend) {}
+
+// NewMockBackend returns a MockBackend modified by the given options.
+// The default is a fully featured 256-color backend with initial size 80x24.
+func NewMockBackend(options ...MockOpt) MockBackend {
+	mb := &mockBackend{
+		size:         Coord{X: 80, Y: 24},
+		colors:       256,
+		style:        BaseStyle,
+		defaultStyle: BaseStyle.WithFg(color.Silver).WithBg(color.Black),
+		cursor:       BlinkingBlock,
+	}
+
+	for _, opt := range options {
+		opt.SetMockOpt(mb)
+	}
+
+	if mb.colors > 0 {
+		mb.style = mb.defaultStyle
+	}
+	mb.cells = make([]Cell, int(mb.size.X)*int(mb.size.Y))
+	for i := range mb.cells {
+		mb.cells[i].S = BaseStyle
+	}
+
+	mb.modes = make(map[PrivateMode]ModeStatus)
+	mb.modes[PmShowCursor] = ModeOn
+	mb.modes[PmBlinkCursor] = ModeOn
+	mb.modes[PmGraphemeClusters] = ModeOff
+	mb.modes[PmSyncOutput] = ModeOff
+	return mb
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/mode.go b/vendor/github.com/gdamore/tcell/v3/vt/mode.go
new file mode 100644
index 000000000..9d143fec4
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/mode.go
@@ -0,0 +1,120 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package vt provides common definitions for VT derived terminals and applications.
+// This includes the venerable VT100, XTerm, and newer emulators such as Kitty and
+// the Windows Terminal.
+package vt
+
+import "fmt"
+
+// PrivateMode describes a DEC Private Mode.
+type PrivateMode int
+
+const (
+	PmAppCursor        PrivateMode = 1    // Application cursor keys.
+	PmVT52             PrivateMode = 2    // Clear to enable VT52 compatibility (not supported).
+	PmColumns          PrivateMode = 3    // Set to enable 132 columns, reset for 80 columns.
+	PmScrolling        PrivateMode = 4    // Smooth scrolling (jump by default).
+	PmScreen           PrivateMode = 5    // Set to reverse dark and light on screen.
+	PmOrigin           PrivateMode = 6    // Coordinates are relative to margins.
+	PmAutoMargin       PrivateMode = 7    // Automatically wrap at margin.
+	PmAutoRepeat       PrivateMode = 8    // Enable automatic key repeat.
+	PmMouseX10         PrivateMode = 9    // Legacy (X10) mouse reporting.
+	PmBlinkCursor      PrivateMode = 12   // Blinking (on) or steady (off) cursor.
+	PmPrintFF          PrivateMode = 18   // Print form feed after printing screen.
+	PmPrintExtent      PrivateMode = 19   // Print full screen (on) or scrolling region (off).
+	PmShowCursor       PrivateMode = 25   // Show the cursor (default on).
+	PmCharSet          PrivateMode = 42   // Enable national (on) or multinational (off) character sets.
+	PmLeftRightMargin  PrivateMode = 69   // Enable left and right margins
+	PmMouseButton      PrivateMode = 1000 // Report mouse button events.
+	PmMouseDrag        PrivateMode = 1002 // Report mouse motion events when button depressed, requires PmMouseButton.
+	PmMouseMotion      PrivateMode = 1003 // Report mouse motion events, requires PmMouseButton.
+	PmFocusReports     PrivateMode = 1004 // Send focus gained or lost reports.
+	PmMouseSgr         PrivateMode = 1006 // Use SGR sequences for mouse reports.
+	PmMouseSgrPixel    PrivateMode = 1016 // Use SGR sequences for mouse reports, using pixel-level coordinates.
+	PmAltScreen        PrivateMode = 1049 // 47 and 1047 are alternates, but we use 1049
+	PmBracketedPaste   PrivateMode = 2004 // Bracket pasted text with bracketed paste escape sequences.
+	PmSyncOutput       PrivateMode = 2026 // Buffer output when enabled, updating screen when reset.
+	PmGraphemeClusters PrivateMode = 2027 // Support for grapheme cluster handling.
+	PmResizeReports    PrivateMode = 2048 // Send in-band resize reports.
+	PmWin32Input       PrivateMode = 9001 // Use Win32-Input-Mode for keyboard reports
+)
+
+// Enable returns the string used to enable this private mode.
+func (pm PrivateMode) Enable() string {
+	return fmt.Sprintf("\x1b[?%dh", pm)
+}
+
+// Disable returns the string used to disable this private mode.
+func (pm PrivateMode) Disable() string {
+	return fmt.Sprintf("\x1b[?%dl", pm)
+}
+
+// Query returns the string used to query the state of this private mode.
+func (pm PrivateMode) Query() string {
+	return fmt.Sprintf("\x1b[?%d$p", pm)
+}
+
+// Reply returns a string representing a query reply for the given mode and status.
+func (pm PrivateMode) Reply(status ModeStatus) string {
+	return fmt.Sprintf("\x1b[?%d;%d$y", pm, status)
+}
+
+// ModeStatus represents the status of the mode.
+type ModeStatus int
+
+// AnsiMode are modes standardized in ECMA-48.
+// They use CSI-h and CSI-l (no question mark).
+type AnsiMode int
+
+// Enable returns the string used to enable this ANSI mode.
+func (pm AnsiMode) Enable() string {
+	return fmt.Sprintf("\x1b[%dh", pm)
+}
+
+// Disable returns the string used to disable this ANSI mode.
+func (pm AnsiMode) Disable() string {
+	return fmt.Sprintf("\x1b[%dl", pm)
+}
+
+// Query returns the string used to query the state of this ANSI mode.
+func (pm AnsiMode) Query() string {
+	return fmt.Sprintf("\x1b[%d$p", pm)
+}
+
+// Reply returns a string representing a query reply for the given mode and status.
+func (pm AnsiMode) Reply(status ModeStatus) string {
+	return fmt.Sprintf("\x1b[%d;%d$y", pm, status)
+}
+
+const (
+	AmKeyboardAction AnsiMode = 2  // Lock the keyboard.
+	AmInsertReplace  AnsiMode = 4  // Insert or replace characters when a new character is added.
+	AmSendReceive    AnsiMode = 12 // XON or XOFF.
+	AmNewLineMode    AnsiMode = 20 // If true, LF emits CR as well, and Return sends both CR and LF.
+)
+
+const (
+	ModeNA        ModeStatus = 0 // Mode is not supported (or unknown)
+	ModeOn        ModeStatus = 1 // Mode is on (e.g. via CSI-h)
+	ModeOff       ModeStatus = 2 // Mode is off (e.g. via CSI-l)
+	ModeOnLocked  ModeStatus = 3 // Mode is hardwired on
+	ModeOffLocked ModeStatus = 4 // Mode is hardwired off
+)
+
+// Changeable indicates that the mode may be changed.
+func (ms ModeStatus) Changeable() bool {
+	return ms == ModeOn || ms == ModeOff
+}
diff --git a/vendor/github.com/gdamore/tcell/v3/vt/vt.go b/vendor/github.com/gdamore/tcell/v3/vt/vt.go
new file mode 100644
index 000000000..838a02bdb
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/vt/vt.go
@@ -0,0 +1,21 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package vt provides common definitions for VT derived terminals and applications.
+// This includes the venerable VT100, XTerm, and newer emulators such as Kitty and
+// the Windows Terminal.
+//
+// This package is still under development and direct access to any of the interfaces
+// here is not guaranteed to be stable yet.  Caveat emptor.
+package vt
diff --git a/vendor/github.com/gdamore/tcell/v2/terms_default.go b/vendor/github.com/gdamore/tcell/v3/vt/width.go
similarity index 55%
rename from vendor/github.com/gdamore/tcell/v2/terms_default.go
rename to vendor/github.com/gdamore/tcell/v3/vt/width.go
index fefcf8938..5097b1ef7 100644
--- a/vendor/github.com/gdamore/tcell/v2/terms_default.go
+++ b/vendor/github.com/gdamore/tcell/v3/vt/width.go
@@ -1,11 +1,8 @@
-//go:build !tcell_minimal
-// +build !tcell_minimal
-
-// Copyright 2019 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -15,10 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tcell
+package vt
 
-import (
-	// This imports the default terminal entries.  To disable, use the
-	// tcell_minimal build tag.
-	_ "github.com/gdamore/tcell/v2/terminfo/extended"
-)
+import "github.com/gdamore/tcell/v3/internal/widthutil"
+
+var textWidthOptions = widthutil.Options()
diff --git a/vendor/github.com/gdamore/tcell/v3/wscreen.go b/vendor/github.com/gdamore/tcell/v3/wscreen.go
new file mode 100644
index 000000000..d4fb6ba62
--- /dev/null
+++ b/vendor/github.com/gdamore/tcell/v3/wscreen.go
@@ -0,0 +1,224 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build js && wasm
+// +build js,wasm
+
+package tcell
+
+import (
+	"errors"
+	"io"
+	"sync"
+	"syscall/js"
+
+	"github.com/gdamore/tcell/v3/tty"
+)
+
+// initialize installs the browser-backed TTY used by tScreen on js/wasm.
+func (t *tScreen) initialize() error {
+	if t.tty == nil {
+		t.tty = newBrowserTty()
+	}
+	if t.term == "" {
+		t.term = "ghostty-truecolor"
+	}
+	return nil
+}
+
+func getCharset() string {
+	return "UTF-8"
+}
+
+type browserTty struct {
+	mu      sync.Mutex
+	cond    *sync.Cond
+	started bool
+	drained bool
+	closed  bool
+	input   []byte
+	resizeQ chan<- bool
+
+	writeFunc  js.Value
+	sizeFunc   js.Value
+	closeFuncs []js.Func
+}
+
+func newBrowserTty() *browserTty {
+	t := &browserTty{}
+	t.cond = sync.NewCond(&t.mu)
+	return t
+}
+
+func (t *browserTty) Start() error {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
+	if t.started {
+		return nil
+	}
+	global := js.Global()
+	t.writeFunc = global.Get("tcellWrite")
+	t.sizeFunc = global.Get("tcellWindowSize")
+	if t.writeFunc.Type() != js.TypeFunction || t.sizeFunc.Type() != js.TypeFunction {
+		return errors.New("tcell wasm terminal host is not installed")
+	}
+
+	onData := js.FuncOf(func(this js.Value, args []js.Value) any {
+		if len(args) == 0 {
+			return nil
+		}
+		if args[0].InstanceOf(global.Get("Uint8Array")) {
+			data := make([]byte, args[0].Get("byteLength").Int())
+			js.CopyBytesToGo(data, args[0])
+			t.enqueue(data)
+		} else {
+			t.enqueue([]byte(args[0].String()))
+		}
+		return nil
+	})
+	onResize := js.FuncOf(func(this js.Value, args []js.Value) any {
+		t.mu.Lock()
+		resizeQ := t.resizeQ
+		t.mu.Unlock()
+		if resizeQ != nil {
+			select {
+			case resizeQ <- true:
+			default:
+			}
+		}
+		return nil
+	})
+	t.closeFuncs = []js.Func{onData, onResize}
+	global.Set("tcellRead", onData)
+	global.Set("tcellResize", onResize)
+
+	t.started = true
+	t.drained = false
+	t.closed = false
+	return nil
+}
+
+func (t *browserTty) Stop() error {
+	t.mu.Lock()
+	t.started = false
+	t.drained = false
+	funcs := t.closeFuncs
+	t.closeFuncs = nil
+	t.cond.Broadcast()
+	t.mu.Unlock()
+
+	js.Global().Set("tcellRead", js.Undefined())
+	js.Global().Set("tcellResize", js.Undefined())
+	for _, fn := range funcs {
+		fn.Release()
+	}
+	return nil
+}
+
+func (t *browserTty) Drain() error {
+	t.mu.Lock()
+	t.input = nil
+	t.drained = true
+	t.cond.Broadcast()
+	t.mu.Unlock()
+	return nil
+}
+
+func (t *browserTty) NotifyResize(resizeQ chan<- bool) {
+	t.mu.Lock()
+	t.resizeQ = resizeQ
+	t.mu.Unlock()
+}
+
+func (t *browserTty) WindowSize() (tty.WindowSize, error) {
+	var ws tty.WindowSize
+	t.mu.Lock()
+	sizeFunc := t.sizeFunc
+	t.mu.Unlock()
+	if sizeFunc.Type() != js.TypeFunction {
+		ws.Width = 80
+		ws.Height = 24
+		return ws, nil
+	}
+	size := sizeFunc.Invoke()
+	ws.Width = size.Get("cols").Int()
+	ws.Height = size.Get("rows").Int()
+	ws.PixelWidth = size.Get("pixelWidth").Int()
+	ws.PixelHeight = size.Get("pixelHeight").Int()
+	if ws.Width == 0 {
+		ws.Width = 80
+	}
+	if ws.Height == 0 {
+		ws.Height = 24
+	}
+	return ws, nil
+}
+
+func (t *browserTty) Read(b []byte) (int, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
+	for len(t.input) == 0 && t.started && !t.drained && !t.closed {
+		t.cond.Wait()
+	}
+	if t.closed {
+		return 0, io.EOF
+	}
+	if (!t.started || t.drained) && len(t.input) == 0 {
+		return 0, io.EOF
+	}
+	n := copy(b, t.input)
+	t.input = t.input[n:]
+	return n, nil
+}
+
+func (t *browserTty) Write(b []byte) (int, error) {
+	t.mu.Lock()
+	writeFunc := t.writeFunc
+	started := t.started
+	t.mu.Unlock()
+	if !started || writeFunc.Type() != js.TypeFunction {
+		return 0, io.ErrClosedPipe
+	}
+
+	data := js.Global().Get("Uint8Array").New(len(b))
+	js.CopyBytesToJS(data, b)
+	writeFunc.Invoke(data)
+	return len(b), nil
+}
+
+func (t *browserTty) Close() error {
+	t.mu.Lock()
+	if t.closed {
+		t.mu.Unlock()
+		return nil
+	}
+	t.closed = true
+	t.started = false
+	t.drained = false
+	t.cond.Broadcast()
+	t.mu.Unlock()
+
+	return t.Stop()
+}
+
+func (t *browserTty) enqueue(data []byte) {
+	t.mu.Lock()
+	if t.started && !t.closed {
+		t.input = append(t.input, data...)
+		t.cond.Broadcast()
+	}
+	t.mu.Unlock()
+}
diff --git a/vendor/github.com/go-git/gcfg/.gitignore b/vendor/github.com/go-git/gcfg/.gitignore
deleted file mode 100644
index 2d830686d..000000000
--- a/vendor/github.com/go-git/gcfg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-coverage.out
diff --git a/vendor/github.com/go-git/gcfg/Makefile b/vendor/github.com/go-git/gcfg/Makefile
deleted file mode 100644
index 73604da6b..000000000
--- a/vendor/github.com/go-git/gcfg/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# General
-WORKDIR = $(PWD)
-
-# Go parameters
-GOCMD = go
-GOTEST = $(GOCMD) test
-
-# Coverage
-COVERAGE_REPORT = coverage.out
-COVERAGE_MODE = count
-
-test:
-	$(GOTEST) ./...
-
-test-coverage:
-	echo "" > $(COVERAGE_REPORT); \
-	$(GOTEST) -coverprofile=$(COVERAGE_REPORT) -coverpkg=./... -covermode=$(COVERAGE_MODE) ./...
diff --git a/vendor/github.com/go-git/gcfg/README b/vendor/github.com/go-git/gcfg/README
deleted file mode 100644
index 1ff233a52..000000000
--- a/vendor/github.com/go-git/gcfg/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Gcfg reads INI-style configuration files into Go structs;
-supports user-defined types and subsections.
-
-Package docs: https://godoc.org/gopkg.in/gcfg.v1
diff --git a/vendor/github.com/go-git/gcfg/doc.go b/vendor/github.com/go-git/gcfg/doc.go
deleted file mode 100644
index 7bdefbf02..000000000
--- a/vendor/github.com/go-git/gcfg/doc.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Package gcfg reads "INI-style" text-based configuration files with
-// "name=value" pairs grouped into sections (gcfg files).
-//
-// This package is still a work in progress; see the sections below for planned
-// changes.
-//
-// Syntax
-//
-// The syntax is based on that used by git config:
-// http://git-scm.com/docs/git-config#_syntax .
-// There are some (planned) differences compared to the git config format:
-//  - improve data portability:
-//    - must be encoded in UTF-8 (for now) and must not contain the 0 byte
-//    - include and "path" type is not supported
-//      (path type may be implementable as a user-defined type)
-//  - internationalization
-//    - section and variable names can contain unicode letters, unicode digits
-//      (as defined in http://golang.org/ref/spec#Characters ) and hyphens
-//      (U+002D), starting with a unicode letter
-//  - disallow potentially ambiguous or misleading definitions:
-//    - `[sec.sub]` format is not allowed (deprecated in gitconfig)
-//    - `[sec ""]` is not allowed
-//      - use `[sec]` for section name "sec" and empty subsection name
-//    - (planned) within a single file, definitions must be contiguous for each:
-//      - section: '[secA]' -> '[secB]' -> '[secA]' is an error
-//      - subsection: '[sec "A"]' -> '[sec "B"]' -> '[sec "A"]' is an error
-//      - multivalued variable: 'multi=a' -> 'other=x' -> 'multi=b' is an error
-//
-// Data structure
-//
-// The functions in this package read values into a user-defined struct.
-// Each section corresponds to a struct field in the config struct, and each
-// variable in a section corresponds to a data field in the section struct.
-// The mapping of each section or variable name to fields is done either based
-// on the "gcfg" struct tag or by matching the name of the section or variable,
-// ignoring case. In the latter case, hyphens '-' in section and variable names
-// correspond to underscores '_' in field names.
-// Fields must be exported; to use a section or variable name starting with a
-// letter that is neither upper- or lower-case, prefix the field name with 'X'.
-// (See https://code.google.com/p/go/issues/detail?id=5763#c4 .)
-//
-// For sections with subsections, the corresponding field in config must be a
-// map, rather than a struct, with string keys and pointer-to-struct values.
-// Values for subsection variables are stored in the map with the subsection
-// name used as the map key.
-// (Note that unlike section and variable names, subsection names are case
-// sensitive.)
-// When using a map, and there is a section with the same section name but
-// without a subsection name, its values are stored with the empty string used
-// as the key.
-// It is possible to provide default values for subsections in the section
-// "default-" (or by setting values in the corresponding struct
-// field "Default_").
-//
-// The functions in this package panic if config is not a pointer to a struct,
-// or when a field is not of a suitable type (either a struct or a map with
-// string keys and pointer-to-struct values).
-//
-// Parsing of values
-//
-// The section structs in the config struct may contain single-valued or
-// multi-valued variables. Variables of unnamed slice type (that is, a type
-// starting with `[]`) are treated as multi-value; all others (including named
-// slice types) are treated as single-valued variables.
-//
-// Single-valued variables are handled based on the type as follows.
-// Unnamed pointer types (that is, types starting with `*`) are dereferenced,
-// and if necessary, a new instance is allocated.
-//
-// For types implementing the encoding.TextUnmarshaler interface, the
-// UnmarshalText method is used to set the value. Implementing this method is
-// the recommended way for parsing user-defined types.
-//
-// For fields of string kind, the value string is assigned to the field, after
-// unquoting and unescaping as needed.
-// For fields of bool kind, the field is set to true if the value is "true",
-// "yes", "on" or "1", and set to false if the value is "false", "no", "off" or
-// "0", ignoring case. In addition, single-valued bool fields can be specified
-// with a "blank" value (variable name without equals sign and value); in such
-// case the value is set to true.
-//
-// Predefined integer types [u]int(|8|16|32|64) and big.Int are parsed as
-// decimal or hexadecimal (if having '0x' prefix). (This is to prevent
-// unintuitively handling zero-padded numbers as octal.) Other types having
-// [u]int* as the underlying type, such as os.FileMode and uintptr allow
-// decimal, hexadecimal, or octal values.
-// Parsing mode for integer types can be overridden using the struct tag option
-// ",int=mode" where mode is a combination of the 'd', 'h', and 'o' characters
-// (each standing for decimal, hexadecimal, and octal, respectively.)
-//
-// All other types are parsed using fmt.Sscanf with the "%v" verb.
-//
-// For multi-valued variables, each individual value is parsed as above and
-// appended to the slice. If the first value is specified as a "blank" value
-// (variable name without equals sign and value), a new slice is allocated;
-// that is any values previously set in the slice will be ignored.
-//
-// The types subpackage for provides helpers for parsing "enum-like" and integer
-// types.
-//
-// Error handling
-//
-// There are 3 types of errors:
-//
-//  - programmer errors / panics:
-//    - invalid configuration structure
-//  - data errors:
-//    - fatal errors:
-//      - invalid configuration syntax
-//    - warnings:
-//      - data that doesn't belong to any part of the config structure
-//
-// Programmer errors trigger panics. These are should be fixed by the programmer
-// before releasing code that uses gcfg.
-//
-// Data errors cause gcfg to return a non-nil error value. This includes the
-// case when there are extra unknown key-value definitions in the configuration
-// data (extra data).
-// However, in some occasions it is desirable to be able to proceed in
-// situations when the only data error is that of extra data.
-// These errors are handled at a different (warning) priority and can be
-// filtered out programmatically. To ignore extra data warnings, wrap the
-// gcfg.Read*Into invocation into a call to gcfg.FatalOnly.
-//
-// TODO
-//
-// The following is a list of changes under consideration:
-//  - documentation
-//    - self-contained syntax documentation
-//    - more practical examples
-//    - move TODOs to issue tracker (eventually)
-//  - syntax
-//    - reconsider valid escape sequences
-//      (gitconfig doesn't support \r in value, \t in subsection name, etc.)
-//  - reading / parsing gcfg files
-//    - define internal representation structure
-//    - support multiple inputs (readers, strings, files)
-//    - support declaring encoding (?)
-//    - support varying fields sets for subsections (?)
-//  - writing gcfg files
-//  - error handling
-//    - make error context accessible programmatically?
-//    - limit input size?
-//
-package gcfg // import "github.com/go-git/gcfg"
diff --git a/vendor/github.com/go-git/gcfg/errors.go b/vendor/github.com/go-git/gcfg/errors.go
deleted file mode 100644
index 853c76021..000000000
--- a/vendor/github.com/go-git/gcfg/errors.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package gcfg
-
-import (
-	"gopkg.in/warnings.v0"
-)
-
-// FatalOnly filters the results of a Read*Into invocation and returns only
-// fatal errors. That is, errors (warnings) indicating data for unknown
-// sections / variables is ignored. Example invocation:
-//
-//  err := gcfg.FatalOnly(gcfg.ReadFileInto(&cfg, configFile))
-//  if err != nil {
-//      ...
-//
-func FatalOnly(err error) error {
-	return warnings.FatalOnly(err)
-}
-
-func isFatal(err error) bool {
-	_, ok := err.(extraData)
-	return !ok
-}
-
-type extraData struct {
-	section    string
-	subsection *string
-	variable   *string
-}
-
-func (e extraData) Error() string {
-	s := "can't store data at section \"" + e.section + "\""
-	if e.subsection != nil {
-		s += ", subsection \"" + *e.subsection + "\""
-	}
-	if e.variable != nil {
-		s += ", variable \"" + *e.variable + "\""
-	}
-	return s
-}
-
-var _ error = extraData{}
diff --git a/vendor/github.com/go-git/gcfg/read.go b/vendor/github.com/go-git/gcfg/read.go
deleted file mode 100644
index ea5d2edd0..000000000
--- a/vendor/github.com/go-git/gcfg/read.go
+++ /dev/null
@@ -1,273 +0,0 @@
-package gcfg
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"gopkg.in/warnings.v0"
-
-	"github.com/go-git/gcfg/scanner"
-	"github.com/go-git/gcfg/token"
-)
-
-var unescape = map[rune]rune{'\\': '\\', '"': '"', 'n': '\n', 't': '\t', 'b': '\b', '\n': '\n'}
-
-// no error: invalid literals should be caught by scanner
-func unquote(s string) string {
-	u, q, esc := make([]rune, 0, len(s)), false, false
-	for _, c := range s {
-		if esc {
-			uc, ok := unescape[c]
-			switch {
-			case ok:
-				u = append(u, uc)
-				fallthrough
-			case !q && c == '\n':
-				esc = false
-				continue
-			}
-			panic("invalid escape sequence")
-		}
-		switch c {
-		case '"':
-			q = !q
-		case '\\':
-			esc = true
-		default:
-			u = append(u, c)
-		}
-	}
-	if q {
-		panic("missing end quote")
-	}
-	if esc {
-		panic("invalid escape sequence")
-	}
-	return string(u)
-}
-
-func read(c *warnings.Collector, callback func(string, string, string, string, bool) error,
-	fset *token.FileSet, file *token.File, src []byte) error {
-	//
-	var s scanner.Scanner
-	var errs scanner.ErrorList
-	s.Init(file, src, func(p token.Position, m string) { errs.Add(p, m) }, 0)
-	sect, sectsub := "", ""
-	pos, tok, lit := s.Scan()
-	errfn := func(msg string) error {
-		return fmt.Errorf("%s: %s", fset.Position(pos), msg)
-	}
-	for {
-		if errs.Len() > 0 {
-			if err := c.Collect(errs.Err()); err != nil {
-				return err
-			}
-		}
-		switch tok {
-		case token.EOF:
-			return nil
-		case token.EOL, token.COMMENT:
-			pos, tok, lit = s.Scan()
-		case token.LBRACK:
-			pos, tok, lit = s.Scan()
-			if errs.Len() > 0 {
-				if err := c.Collect(errs.Err()); err != nil {
-					return err
-				}
-			}
-			if tok != token.IDENT {
-				if err := c.Collect(errfn("expected section name")); err != nil {
-					return err
-				}
-			}
-			sect, sectsub = lit, ""
-			pos, tok, lit = s.Scan()
-			if errs.Len() > 0 {
-				if err := c.Collect(errs.Err()); err != nil {
-					return err
-				}
-			}
-			if tok == token.STRING {
-				sectsub = unquote(lit)
-				if sectsub == "" {
-					if err := c.Collect(errfn("empty subsection name")); err != nil {
-						return err
-					}
-				}
-				pos, tok, lit = s.Scan()
-				if errs.Len() > 0 {
-					if err := c.Collect(errs.Err()); err != nil {
-						return err
-					}
-				}
-			}
-			if tok != token.RBRACK {
-				if sectsub == "" {
-					if err := c.Collect(errfn("expected subsection name or right bracket")); err != nil {
-						return err
-					}
-				}
-				if err := c.Collect(errfn("expected right bracket")); err != nil {
-					return err
-				}
-			}
-			pos, tok, lit = s.Scan()
-			if tok != token.EOL && tok != token.EOF && tok != token.COMMENT {
-				if err := c.Collect(errfn("expected EOL, EOF, or comment")); err != nil {
-					return err
-				}
-			}
-			// If a section/subsection header was found, ensure a
-			// container object is created, even if there are no
-			// variables further down.
-			err := c.Collect(callback(sect, sectsub, "", "", true))
-			if err != nil {
-				return err
-			}
-		case token.IDENT:
-			if sect == "" {
-				if err := c.Collect(errfn("expected section header")); err != nil {
-					return err
-				}
-			}
-			n := lit
-			pos, tok, lit = s.Scan()
-			if errs.Len() > 0 {
-				return errs.Err()
-			}
-			blank, v := tok == token.EOF || tok == token.EOL || tok == token.COMMENT, ""
-			if !blank {
-				if tok != token.ASSIGN {
-					if err := c.Collect(errfn("expected '='")); err != nil {
-						return err
-					}
-				}
-				pos, tok, lit = s.Scan()
-				if errs.Len() > 0 {
-					if err := c.Collect(errs.Err()); err != nil {
-						return err
-					}
-				}
-				if tok != token.STRING {
-					if err := c.Collect(errfn("expected value")); err != nil {
-						return err
-					}
-				}
-				v = unquote(lit)
-				pos, tok, lit = s.Scan()
-				if errs.Len() > 0 {
-					if err := c.Collect(errs.Err()); err != nil {
-						return err
-					}
-				}
-				if tok != token.EOL && tok != token.EOF && tok != token.COMMENT {
-					if err := c.Collect(errfn("expected EOL, EOF, or comment")); err != nil {
-						return err
-					}
-				}
-			}
-			err := c.Collect(callback(sect, sectsub, n, v, blank))
-			if err != nil {
-				return err
-			}
-		default:
-			if sect == "" {
-				if err := c.Collect(errfn("expected section header")); err != nil {
-					return err
-				}
-			}
-			if err := c.Collect(errfn("expected section header or variable declaration")); err != nil {
-				return err
-			}
-		}
-	}
-	panic("never reached")
-}
-
-func readInto(config interface{}, fset *token.FileSet, file *token.File,
-	src []byte) error {
-	//
-	c := warnings.NewCollector(isFatal)
-	firstPassCallback := func(s string, ss string, k string, v string, bv bool) error {
-		return set(c, config, s, ss, k, v, bv, false)
-	}
-	err := read(c, firstPassCallback, fset, file, src)
-	if err != nil {
-		return err
-	}
-	secondPassCallback := func(s string, ss string, k string, v string, bv bool) error {
-		return set(c, config, s, ss, k, v, bv, true)
-	}
-	err = read(c, secondPassCallback, fset, file, src)
-	if err != nil {
-		return err
-	}
-	return c.Done()
-}
-
-// ReadWithCallback reads gcfg formatted data from reader and calls
-// callback with each section and option found.
-//
-// Callback is called with section, subsection, option key, option value
-// and blank value flag as arguments.
-//
-// When a section is found, callback is called with nil subsection, option key
-// and option value.
-//
-// When a subsection is found, callback is called with nil option key and
-// option value.
-//
-// If blank value flag is true, it means that the value was not set for an option
-// (as opposed to set to empty string).
-//
-// If callback returns an error, ReadWithCallback terminates with an error too.
-func ReadWithCallback(reader io.Reader, callback func(string, string, string, string, bool) error) error {
-	src, err := io.ReadAll(reader)
-	if err != nil {
-		return err
-	}
-
-	fset := token.NewFileSet()
-	file := fset.AddFile("", fset.Base(), len(src))
-	c := warnings.NewCollector(isFatal)
-
-	return read(c, callback, fset, file, src)
-}
-
-// ReadInto reads gcfg formatted data from reader and sets the values into the
-// corresponding fields in config.
-func ReadInto(config interface{}, reader io.Reader) error {
-	src, err := io.ReadAll(reader)
-	if err != nil {
-		return err
-	}
-	fset := token.NewFileSet()
-	file := fset.AddFile("", fset.Base(), len(src))
-	return readInto(config, fset, file, src)
-}
-
-// ReadStringInto reads gcfg formatted data from str and sets the values into
-// the corresponding fields in config.
-func ReadStringInto(config interface{}, str string) error {
-	r := strings.NewReader(str)
-	return ReadInto(config, r)
-}
-
-// ReadFileInto reads gcfg formatted data from the file filename and sets the
-// values into the corresponding fields in config.
-func ReadFileInto(config interface{}, filename string) error {
-	f, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	src, err := io.ReadAll(f)
-	if err != nil {
-		return err
-	}
-	fset := token.NewFileSet()
-	file := fset.AddFile(filename, fset.Base(), len(src))
-	return readInto(config, fset, file, src)
-}
diff --git a/vendor/github.com/go-git/gcfg/scanner/errors.go b/vendor/github.com/go-git/gcfg/scanner/errors.go
deleted file mode 100644
index a6e00f5c6..000000000
--- a/vendor/github.com/go-git/gcfg/scanner/errors.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package scanner
-
-import (
-	"fmt"
-	"io"
-	"sort"
-)
-
-import (
-	"github.com/go-git/gcfg/token"
-)
-
-// In an ErrorList, an error is represented by an *Error.
-// The position Pos, if valid, points to the beginning of
-// the offending token, and the error condition is described
-// by Msg.
-//
-type Error struct {
-	Pos token.Position
-	Msg string
-}
-
-// Error implements the error interface.
-func (e Error) Error() string {
-	if e.Pos.Filename != "" || e.Pos.IsValid() {
-		// don't print ""
-		// TODO(gri) reconsider the semantics of Position.IsValid
-		return e.Pos.String() + ": " + e.Msg
-	}
-	return e.Msg
-}
-
-// ErrorList is a list of *Errors.
-// The zero value for an ErrorList is an empty ErrorList ready to use.
-//
-type ErrorList []*Error
-
-// Add adds an Error with given position and error message to an ErrorList.
-func (p *ErrorList) Add(pos token.Position, msg string) {
-	*p = append(*p, &Error{pos, msg})
-}
-
-// Reset resets an ErrorList to no errors.
-func (p *ErrorList) Reset() { *p = (*p)[0:0] }
-
-// ErrorList implements the sort Interface.
-func (p ErrorList) Len() int      { return len(p) }
-func (p ErrorList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
-
-func (p ErrorList) Less(i, j int) bool {
-	e := &p[i].Pos
-	f := &p[j].Pos
-	if e.Filename < f.Filename {
-		return true
-	}
-	if e.Filename == f.Filename {
-		return e.Offset < f.Offset
-	}
-	return false
-}
-
-// Sort sorts an ErrorList. *Error entries are sorted by position,
-// other errors are sorted by error message, and before any *Error
-// entry.
-//
-func (p ErrorList) Sort() {
-	sort.Sort(p)
-}
-
-// RemoveMultiples sorts an ErrorList and removes all but the first error per line.
-func (p *ErrorList) RemoveMultiples() {
-	sort.Sort(p)
-	var last token.Position // initial last.Line is != any legal error line
-	i := 0
-	for _, e := range *p {
-		if e.Pos.Filename != last.Filename || e.Pos.Line != last.Line {
-			last = e.Pos
-			(*p)[i] = e
-			i++
-		}
-	}
-	(*p) = (*p)[0:i]
-}
-
-// An ErrorList implements the error interface.
-func (p ErrorList) Error() string {
-	switch len(p) {
-	case 0:
-		return "no errors"
-	case 1:
-		return p[0].Error()
-	}
-	return fmt.Sprintf("%s (and %d more errors)", p[0], len(p)-1)
-}
-
-// Err returns an error equivalent to this error list.
-// If the list is empty, Err returns nil.
-func (p ErrorList) Err() error {
-	if len(p) == 0 {
-		return nil
-	}
-	return p
-}
-
-// PrintError is a utility function that prints a list of errors to w,
-// one error per line, if the err parameter is an ErrorList. Otherwise
-// it prints the err string.
-//
-func PrintError(w io.Writer, err error) {
-	if list, ok := err.(ErrorList); ok {
-		for _, e := range list {
-			fmt.Fprintf(w, "%s\n", e)
-		}
-	} else if err != nil {
-		fmt.Fprintf(w, "%s\n", err)
-	}
-}
diff --git a/vendor/github.com/go-git/gcfg/scanner/scanner.go b/vendor/github.com/go-git/gcfg/scanner/scanner.go
deleted file mode 100644
index b3da03d0e..000000000
--- a/vendor/github.com/go-git/gcfg/scanner/scanner.go
+++ /dev/null
@@ -1,334 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package scanner implements a scanner for gcfg configuration text.
-// It takes a []byte as source which can then be tokenized
-// through repeated calls to the Scan method.
-//
-// Note that the API for the scanner package may change to accommodate new
-// features or implementation changes in gcfg.
-package scanner
-
-import (
-	"fmt"
-	"path/filepath"
-	"unicode"
-	"unicode/utf8"
-
-	"github.com/go-git/gcfg/token"
-)
-
-// An ErrorHandler may be provided to Scanner.Init. If a syntax error is
-// encountered and a handler was installed, the handler is called with a
-// position and an error message. The position points to the beginning of
-// the offending token.
-type ErrorHandler func(pos token.Position, msg string)
-
-// A Scanner holds the scanner's internal state while processing
-// a given text.  It can be allocated as part of another data
-// structure but must be initialized via Init before use.
-type Scanner struct {
-	// immutable state
-	file *token.File  // source file handle
-	dir  string       // directory portion of file.Name()
-	src  []byte       // source
-	err  ErrorHandler // error reporting; or nil
-	mode Mode         // scanning mode
-
-	// scanning state
-	ch         rune // current character
-	offset     int  // character offset
-	rdOffset   int  // reading offset (position after current character)
-	lineOffset int  // current line offset
-	nextVal    bool // next token is expected to be a value
-
-	// public state - ok to modify
-	ErrorCount int // number of errors encountered
-}
-
-// Read the next Unicode char into s.ch.
-// s.ch < 0 means end-of-file.
-func (s *Scanner) next() {
-	if s.rdOffset < len(s.src) {
-		s.offset = s.rdOffset
-		if s.ch == '\n' {
-			s.lineOffset = s.offset
-			s.file.AddLine(s.offset)
-		}
-		r, w := rune(s.src[s.rdOffset]), 1
-		switch {
-		case r == 0:
-			s.error(s.offset, "illegal character NUL")
-		case r >= 0x80:
-			// not ASCII
-			r, w = utf8.DecodeRune(s.src[s.rdOffset:])
-			if r == utf8.RuneError && w == 1 {
-				s.error(s.offset, "illegal UTF-8 encoding")
-			}
-		}
-		s.rdOffset += w
-		s.ch = r
-	} else {
-		s.offset = len(s.src)
-		if s.ch == '\n' {
-			s.lineOffset = s.offset
-			s.file.AddLine(s.offset)
-		}
-		s.ch = -1 // eof
-	}
-}
-
-// A mode value is a set of flags (or 0).
-// They control scanner behavior.
-type Mode uint
-
-const (
-	ScanComments Mode = 1 << iota // return comments as COMMENT tokens
-)
-
-// Init prepares the scanner s to tokenize the text src by setting the
-// scanner at the beginning of src. The scanner uses the file set file
-// for position information and it adds line information for each line.
-// It is ok to re-use the same file when re-scanning the same file as
-// line information which is already present is ignored. Init causes a
-// panic if the file size does not match the src size.
-//
-// Calls to Scan will invoke the error handler err if they encounter a
-// syntax error and err is not nil. Also, for each error encountered,
-// the Scanner field ErrorCount is incremented by one. The mode parameter
-// determines how comments are handled.
-//
-// Note that Init may call err if there is an error in the first character
-// of the file.
-func (s *Scanner) Init(file *token.File, src []byte, err ErrorHandler, mode Mode) {
-	// Explicitly initialize all fields since a scanner may be reused.
-	if file.Size() != len(src) {
-		panic(fmt.Sprintf("file size (%d) does not match src len (%d)", file.Size(), len(src)))
-	}
-	s.file = file
-	s.dir, _ = filepath.Split(file.Name())
-	s.src = src
-	s.err = err
-	s.mode = mode
-
-	s.ch = ' '
-	s.offset = 0
-	s.rdOffset = 0
-	s.lineOffset = 0
-	s.ErrorCount = 0
-	s.nextVal = false
-
-	s.next()
-}
-
-func (s *Scanner) error(offs int, msg string) {
-	if s.err != nil {
-		s.err(s.file.Position(s.file.Pos(offs)), msg)
-	}
-	s.ErrorCount++
-}
-
-func (s *Scanner) scanComment() string {
-	// initial [;#] already consumed
-	offs := s.offset - 1 // position of initial [;#]
-
-	for s.ch != '\n' && s.ch >= 0 {
-		s.next()
-	}
-	return string(s.src[offs:s.offset])
-}
-
-func isLetter(ch rune) bool {
-	return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch >= 0x80 && unicode.IsLetter(ch)
-}
-
-func isDigit(ch rune) bool {
-	return '0' <= ch && ch <= '9' || ch >= 0x80 && unicode.IsDigit(ch)
-}
-
-func (s *Scanner) scanIdentifier() string {
-	offs := s.offset
-	for isLetter(s.ch) || isDigit(s.ch) || s.ch == '-' {
-		s.next()
-	}
-	return string(s.src[offs:s.offset])
-}
-
-// val indicate if we are scanning a value (vs a header)
-func (s *Scanner) scanEscape(val bool) {
-	offs := s.offset
-	ch := s.ch
-	s.next() // always make progress
-	switch ch {
-	case '\\', '"', '\n':
-		// ok
-	case 'n', 't', 'b':
-		if val {
-			break // ok
-		}
-		fallthrough
-	default:
-		s.error(offs, "unknown escape sequence")
-	}
-}
-
-func (s *Scanner) scanString() string {
-	// '"' opening already consumed
-	offs := s.offset - 1
-
-	for s.ch != '"' {
-		ch := s.ch
-		s.next()
-		if ch == '\n' || ch < 0 {
-			s.error(offs, "string not terminated")
-			break
-		}
-		if ch == '\\' {
-			s.scanEscape(false)
-		}
-	}
-
-	s.next()
-
-	return string(s.src[offs:s.offset])
-}
-
-func stripCR(b []byte) []byte {
-	c := make([]byte, len(b))
-	i := 0
-	for _, ch := range b {
-		if ch != '\r' {
-			c[i] = ch
-			i++
-		}
-	}
-	return c[:i]
-}
-
-func (s *Scanner) scanValString() string {
-	offs := s.offset
-
-	hasCR := false
-	end := offs
-	inQuote := false
-loop:
-	for inQuote || s.ch >= 0 && s.ch != '\n' && s.ch != ';' && s.ch != '#' {
-		ch := s.ch
-		s.next()
-		switch {
-		case inQuote && ch == '\\':
-			s.scanEscape(true)
-		case !inQuote && ch == '\\':
-			if s.ch == '\r' {
-				hasCR = true
-				s.next()
-			}
-			if s.ch != '\n' {
-				s.scanEscape(true)
-			} else {
-				s.next()
-			}
-		case ch == '"':
-			inQuote = !inQuote
-		case ch == '\r':
-			hasCR = true
-		case ch < 0 || inQuote && ch == '\n':
-			s.error(offs, "string not terminated")
-			break loop
-		}
-		if inQuote || !isWhiteSpace(ch) {
-			end = s.offset
-		}
-	}
-
-	lit := s.src[offs:end]
-	if hasCR {
-		lit = stripCR(lit)
-	}
-
-	return string(lit)
-}
-
-func isWhiteSpace(ch rune) bool {
-	return ch == ' ' || ch == '\t' || ch == '\r'
-}
-
-func (s *Scanner) skipWhitespace() {
-	for isWhiteSpace(s.ch) {
-		s.next()
-	}
-}
-
-// Scan scans the next token and returns the token position, the token,
-// and its literal string if applicable. The source end is indicated by
-// token.EOF.
-//
-// If the returned token is a literal (token.IDENT, token.STRING) or
-// token.COMMENT, the literal string has the corresponding value.
-//
-// If the returned token is token.ILLEGAL, the literal string is the
-// offending character.
-//
-// In all other cases, Scan returns an empty literal string.
-//
-// For more tolerant parsing, Scan will return a valid token if
-// possible even if a syntax error was encountered. Thus, even
-// if the resulting token sequence contains no illegal tokens,
-// a client may not assume that no error occurred. Instead it
-// must check the scanner's ErrorCount or the number of calls
-// of the error handler, if there was one installed.
-//
-// Scan adds line information to the file added to the file
-// set with Init. Token positions are relative to that file
-// and thus relative to the file set.
-func (s *Scanner) Scan() (pos token.Pos, tok token.Token, lit string) {
-scanAgain:
-	s.skipWhitespace()
-
-	// current token start
-	pos = s.file.Pos(s.offset)
-
-	// determine token value
-	switch ch := s.ch; {
-	case s.nextVal:
-		lit = s.scanValString()
-		tok = token.STRING
-		s.nextVal = false
-	case isLetter(ch):
-		lit = s.scanIdentifier()
-		tok = token.IDENT
-	default:
-		s.next() // always make progress
-		switch ch {
-		case -1:
-			tok = token.EOF
-		case '\n':
-			tok = token.EOL
-		case '"':
-			tok = token.STRING
-			lit = s.scanString()
-		case '[':
-			tok = token.LBRACK
-		case ']':
-			tok = token.RBRACK
-		case ';', '#':
-			// comment
-			lit = s.scanComment()
-			if s.mode&ScanComments == 0 {
-				// skip comment
-				goto scanAgain
-			}
-			tok = token.COMMENT
-		case '=':
-			tok = token.ASSIGN
-			s.nextVal = true
-		default:
-			s.error(s.file.Offset(pos), fmt.Sprintf("illegal character %#U", ch))
-			tok = token.ILLEGAL
-			lit = string(ch)
-		}
-	}
-
-	return
-}
diff --git a/vendor/github.com/go-git/gcfg/set.go b/vendor/github.com/go-git/gcfg/set.go
deleted file mode 100644
index dc9795dbd..000000000
--- a/vendor/github.com/go-git/gcfg/set.go
+++ /dev/null
@@ -1,334 +0,0 @@
-package gcfg
-
-import (
-	"bytes"
-	"encoding"
-	"encoding/gob"
-	"fmt"
-	"math/big"
-	"reflect"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	"gopkg.in/warnings.v0"
-
-	"github.com/go-git/gcfg/types"
-)
-
-type tag struct {
-	ident   string
-	intMode string
-}
-
-func newTag(ts string) tag {
-	t := tag{}
-	s := strings.Split(ts, ",")
-	t.ident = s[0]
-	for _, tse := range s[1:] {
-		if strings.HasPrefix(tse, "int=") {
-			t.intMode = tse[len("int="):]
-		}
-	}
-	return t
-}
-
-func fieldFold(v reflect.Value, name string) (reflect.Value, tag) {
-	var n string
-	r0, _ := utf8.DecodeRuneInString(name)
-	if unicode.IsLetter(r0) && !unicode.IsLower(r0) && !unicode.IsUpper(r0) {
-		n = "X"
-	}
-	n += strings.Replace(name, "-", "_", -1)
-	f, ok := v.Type().FieldByNameFunc(func(fieldName string) bool {
-		if !v.FieldByName(fieldName).CanSet() {
-			return false
-		}
-		f, _ := v.Type().FieldByName(fieldName)
-		t := newTag(f.Tag.Get("gcfg"))
-		if t.ident != "" {
-			return strings.EqualFold(t.ident, name)
-		}
-		return strings.EqualFold(n, fieldName)
-	})
-	if !ok {
-		return reflect.Value{}, tag{}
-	}
-	return v.FieldByName(f.Name), newTag(f.Tag.Get("gcfg"))
-}
-
-type setter func(destp interface{}, blank bool, val string, t tag) error
-
-var errUnsupportedType = fmt.Errorf("unsupported type")
-var errBlankUnsupported = fmt.Errorf("blank value not supported for type")
-
-var setters = []setter{
-	typeSetter, textUnmarshalerSetter, kindSetter, scanSetter,
-}
-
-func textUnmarshalerSetter(d interface{}, blank bool, val string, t tag) error {
-	dtu, ok := d.(encoding.TextUnmarshaler)
-	if !ok {
-		return errUnsupportedType
-	}
-	if blank {
-		return errBlankUnsupported
-	}
-	return dtu.UnmarshalText([]byte(val))
-}
-
-func boolSetter(d interface{}, blank bool, val string, t tag) error {
-	if blank {
-		reflect.ValueOf(d).Elem().Set(reflect.ValueOf(true))
-		return nil
-	}
-	b, err := types.ParseBool(val)
-	if err == nil {
-		reflect.ValueOf(d).Elem().Set(reflect.ValueOf(b))
-	}
-	return err
-}
-
-func intMode(mode string) types.IntMode {
-	var m types.IntMode
-	if strings.ContainsAny(mode, "dD") {
-		m |= types.Dec
-	}
-	if strings.ContainsAny(mode, "hH") {
-		m |= types.Hex
-	}
-	if strings.ContainsAny(mode, "oO") {
-		m |= types.Oct
-	}
-	return m
-}
-
-var typeModes = map[reflect.Type]types.IntMode{
-	reflect.TypeOf(int(0)):    types.Dec | types.Hex,
-	reflect.TypeOf(int8(0)):   types.Dec | types.Hex,
-	reflect.TypeOf(int16(0)):  types.Dec | types.Hex,
-	reflect.TypeOf(int32(0)):  types.Dec | types.Hex,
-	reflect.TypeOf(int64(0)):  types.Dec | types.Hex,
-	reflect.TypeOf(uint(0)):   types.Dec | types.Hex,
-	reflect.TypeOf(uint8(0)):  types.Dec | types.Hex,
-	reflect.TypeOf(uint16(0)): types.Dec | types.Hex,
-	reflect.TypeOf(uint32(0)): types.Dec | types.Hex,
-	reflect.TypeOf(uint64(0)): types.Dec | types.Hex,
-	// use default mode (allow dec/hex/oct) for uintptr type
-	reflect.TypeOf(big.Int{}): types.Dec | types.Hex,
-}
-
-func intModeDefault(t reflect.Type) types.IntMode {
-	m, ok := typeModes[t]
-	if !ok {
-		m = types.Dec | types.Hex | types.Oct
-	}
-	return m
-}
-
-func intSetter(d interface{}, blank bool, val string, t tag) error {
-	if blank {
-		return errBlankUnsupported
-	}
-	mode := intMode(t.intMode)
-	if mode == 0 {
-		mode = intModeDefault(reflect.TypeOf(d).Elem())
-	}
-	return types.ParseInt(d, val, mode)
-}
-
-func stringSetter(d interface{}, blank bool, val string, t tag) error {
-	if blank {
-		return errBlankUnsupported
-	}
-	dsp, ok := d.(*string)
-	if !ok {
-		return errUnsupportedType
-	}
-	*dsp = val
-	return nil
-}
-
-var kindSetters = map[reflect.Kind]setter{
-	reflect.String:  stringSetter,
-	reflect.Bool:    boolSetter,
-	reflect.Int:     intSetter,
-	reflect.Int8:    intSetter,
-	reflect.Int16:   intSetter,
-	reflect.Int32:   intSetter,
-	reflect.Int64:   intSetter,
-	reflect.Uint:    intSetter,
-	reflect.Uint8:   intSetter,
-	reflect.Uint16:  intSetter,
-	reflect.Uint32:  intSetter,
-	reflect.Uint64:  intSetter,
-	reflect.Uintptr: intSetter,
-}
-
-var typeSetters = map[reflect.Type]setter{
-	reflect.TypeOf(big.Int{}): intSetter,
-}
-
-func typeSetter(d interface{}, blank bool, val string, tt tag) error {
-	t := reflect.ValueOf(d).Type().Elem()
-	setter, ok := typeSetters[t]
-	if !ok {
-		return errUnsupportedType
-	}
-	return setter(d, blank, val, tt)
-}
-
-func kindSetter(d interface{}, blank bool, val string, tt tag) error {
-	k := reflect.ValueOf(d).Type().Elem().Kind()
-	setter, ok := kindSetters[k]
-	if !ok {
-		return errUnsupportedType
-	}
-	return setter(d, blank, val, tt)
-}
-
-func scanSetter(d interface{}, blank bool, val string, tt tag) error {
-	if blank {
-		return errBlankUnsupported
-	}
-	return types.ScanFully(d, val, 'v')
-}
-
-func newValue(c *warnings.Collector, sect string, vCfg reflect.Value,
-	vType reflect.Type) (reflect.Value, error) {
-	//
-	pv := reflect.New(vType)
-	dfltName := "default-" + sect
-	dfltField, _ := fieldFold(vCfg, dfltName)
-	var err error
-	if dfltField.IsValid() {
-		b := bytes.NewBuffer(nil)
-		ge := gob.NewEncoder(b)
-		if err = c.Collect(ge.EncodeValue(dfltField)); err != nil {
-			return pv, err
-		}
-		gd := gob.NewDecoder(bytes.NewReader(b.Bytes()))
-		if err = c.Collect(gd.DecodeValue(pv.Elem())); err != nil {
-			return pv, err
-		}
-	}
-	return pv, nil
-}
-
-func set(c *warnings.Collector, cfg interface{}, sect, sub, name string,
-	 value string, blankValue bool, subsectPass bool) error {
-	//
-	vPCfg := reflect.ValueOf(cfg)
-	if vPCfg.Kind() != reflect.Ptr || vPCfg.Elem().Kind() != reflect.Struct {
-		panic(fmt.Errorf("config must be a pointer to a struct"))
-	}
-	vCfg := vPCfg.Elem()
-	vSect, _ := fieldFold(vCfg, sect)
-	if !vSect.IsValid() {
-		err := extraData{section: sect}
-		return c.Collect(err)
-	}
-	isSubsect := vSect.Kind() == reflect.Map
-	if subsectPass != isSubsect {
-		return nil
-	}
-	if isSubsect {
-		vst := vSect.Type()
-		if vst.Key().Kind() != reflect.String ||
-			vst.Elem().Kind() != reflect.Ptr ||
-			vst.Elem().Elem().Kind() != reflect.Struct {
-			panic(fmt.Errorf("map field for section must have string keys and "+
-				" pointer-to-struct values: section %q", sect))
-		}
-		if vSect.IsNil() {
-			vSect.Set(reflect.MakeMap(vst))
-		}
-		k := reflect.ValueOf(sub)
-		pv := vSect.MapIndex(k)
-		if !pv.IsValid() {
-			vType := vSect.Type().Elem().Elem()
-			var err error
-			if pv, err = newValue(c, sect, vCfg, vType); err != nil {
-				return err
-			}
-			vSect.SetMapIndex(k, pv)
-		}
-		vSect = pv.Elem()
-	} else if vSect.Kind() != reflect.Struct {
-		panic(fmt.Errorf("field for section must be a map or a struct: "+
-			"section %q", sect))
-	} else if sub != "" {
-		err := extraData{section: sect, subsection: &sub}
-		return c.Collect(err)
-	}
-	// Empty name is a special value, meaning that only the
-	// section/subsection object is to be created, with no values set.
-	if name == "" {
-		return nil
-	}
-	vVar, t := fieldFold(vSect, name)
-	if !vVar.IsValid() {
-		var err error
-		if isSubsect {
-			err = extraData{section: sect, subsection: &sub, variable: &name}
-		} else {
-			err = extraData{section: sect, variable: &name}
-		}
-		return c.Collect(err)
-	}
-	// vVal is either single-valued var, or newly allocated value within multi-valued var
-	var vVal reflect.Value
-	// multi-value if unnamed slice type
-	isMulti := vVar.Type().Name() == "" && vVar.Kind() == reflect.Slice ||
-		vVar.Type().Name() == "" && vVar.Kind() == reflect.Ptr && vVar.Type().Elem().Name() == "" && vVar.Type().Elem().Kind() == reflect.Slice
-	if isMulti && vVar.Kind() == reflect.Ptr {
-		if vVar.IsNil() {
-			vVar.Set(reflect.New(vVar.Type().Elem()))
-		}
-		vVar = vVar.Elem()
-	}
-	if isMulti && blankValue {
-		vVar.Set(reflect.Zero(vVar.Type()))
-		return nil
-	}
-	if isMulti {
-		vVal = reflect.New(vVar.Type().Elem()).Elem()
-	} else {
-		vVal = vVar
-	}
-	isDeref := vVal.Type().Name() == "" && vVal.Type().Kind() == reflect.Ptr
-	isNew := isDeref && vVal.IsNil()
-	// vAddr is address of value to set (dereferenced & allocated as needed)
-	var vAddr reflect.Value
-	switch {
-	case isNew:
-		vAddr = reflect.New(vVal.Type().Elem())
-	case isDeref && !isNew:
-		vAddr = vVal
-	default:
-		vAddr = vVal.Addr()
-	}
-	vAddrI := vAddr.Interface()
-	err, ok := error(nil), false
-	for _, s := range setters {
-		err = s(vAddrI, blankValue, value, t)
-		if err == nil {
-			ok = true
-			break
-		}
-		if err != errUnsupportedType {
-			return err
-		}
-	}
-	if !ok {
-		// in case all setters returned errUnsupportedType
-		return err
-	}
-	if isNew { // set reference if it was dereferenced and newly allocated
-		vVal.Set(vAddr)
-	}
-	if isMulti { // append if multi-valued
-		vVar.Set(reflect.Append(vVar, vVal))
-	}
-	return nil
-}
diff --git a/vendor/github.com/go-git/gcfg/token/position.go b/vendor/github.com/go-git/gcfg/token/position.go
deleted file mode 100644
index fc45c1e76..000000000
--- a/vendor/github.com/go-git/gcfg/token/position.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO(gri) consider making this a separate package outside the go directory.
-
-package token
-
-import (
-	"fmt"
-	"sort"
-	"sync"
-)
-
-// -----------------------------------------------------------------------------
-// Positions
-
-// Position describes an arbitrary source position
-// including the file, line, and column location.
-// A Position is valid if the line number is > 0.
-//
-type Position struct {
-	Filename string // filename, if any
-	Offset   int    // offset, starting at 0
-	Line     int    // line number, starting at 1
-	Column   int    // column number, starting at 1 (character count)
-}
-
-// IsValid returns true if the position is valid.
-func (pos *Position) IsValid() bool { return pos.Line > 0 }
-
-// String returns a string in one of several forms:
-//
-//	file:line:column    valid position with file name
-//	line:column         valid position without file name
-//	file                invalid position with file name
-//	-                   invalid position without file name
-//
-func (pos Position) String() string {
-	s := pos.Filename
-	if pos.IsValid() {
-		if s != "" {
-			s += ":"
-		}
-		s += fmt.Sprintf("%d:%d", pos.Line, pos.Column)
-	}
-	if s == "" {
-		s = "-"
-	}
-	return s
-}
-
-// Pos is a compact encoding of a source position within a file set.
-// It can be converted into a Position for a more convenient, but much
-// larger, representation.
-//
-// The Pos value for a given file is a number in the range [base, base+size],
-// where base and size are specified when adding the file to the file set via
-// AddFile.
-//
-// To create the Pos value for a specific source offset, first add
-// the respective file to the current file set (via FileSet.AddFile)
-// and then call File.Pos(offset) for that file. Given a Pos value p
-// for a specific file set fset, the corresponding Position value is
-// obtained by calling fset.Position(p).
-//
-// Pos values can be compared directly with the usual comparison operators:
-// If two Pos values p and q are in the same file, comparing p and q is
-// equivalent to comparing the respective source file offsets. If p and q
-// are in different files, p < q is true if the file implied by p was added
-// to the respective file set before the file implied by q.
-//
-type Pos int
-
-// The zero value for Pos is NoPos; there is no file and line information
-// associated with it, and NoPos().IsValid() is false. NoPos is always
-// smaller than any other Pos value. The corresponding Position value
-// for NoPos is the zero value for Position.
-//
-const NoPos Pos = 0
-
-// IsValid returns true if the position is valid.
-func (p Pos) IsValid() bool {
-	return p != NoPos
-}
-
-// -----------------------------------------------------------------------------
-// File
-
-// A File is a handle for a file belonging to a FileSet.
-// A File has a name, size, and line offset table.
-//
-type File struct {
-	set  *FileSet
-	name string // file name as provided to AddFile
-	base int    // Pos value range for this file is [base...base+size]
-	size int    // file size as provided to AddFile
-
-	// lines and infos are protected by set.mutex
-	lines []int
-	infos []lineInfo
-}
-
-// Name returns the file name of file f as registered with AddFile.
-func (f *File) Name() string {
-	return f.name
-}
-
-// Base returns the base offset of file f as registered with AddFile.
-func (f *File) Base() int {
-	return f.base
-}
-
-// Size returns the size of file f as registered with AddFile.
-func (f *File) Size() int {
-	return f.size
-}
-
-// LineCount returns the number of lines in file f.
-func (f *File) LineCount() int {
-	f.set.mutex.RLock()
-	n := len(f.lines)
-	f.set.mutex.RUnlock()
-	return n
-}
-
-// AddLine adds the line offset for a new line.
-// The line offset must be larger than the offset for the previous line
-// and smaller than the file size; otherwise the line offset is ignored.
-//
-func (f *File) AddLine(offset int) {
-	f.set.mutex.Lock()
-	if i := len(f.lines); (i == 0 || f.lines[i-1] < offset) && offset < f.size {
-		f.lines = append(f.lines, offset)
-	}
-	f.set.mutex.Unlock()
-}
-
-// SetLines sets the line offsets for a file and returns true if successful.
-// The line offsets are the offsets of the first character of each line;
-// for instance for the content "ab\nc\n" the line offsets are {0, 3}.
-// An empty file has an empty line offset table.
-// Each line offset must be larger than the offset for the previous line
-// and smaller than the file size; otherwise SetLines fails and returns
-// false.
-//
-func (f *File) SetLines(lines []int) bool {
-	// verify validity of lines table
-	size := f.size
-	for i, offset := range lines {
-		if i > 0 && offset <= lines[i-1] || size <= offset {
-			return false
-		}
-	}
-
-	// set lines table
-	f.set.mutex.Lock()
-	f.lines = lines
-	f.set.mutex.Unlock()
-	return true
-}
-
-// SetLinesForContent sets the line offsets for the given file content.
-func (f *File) SetLinesForContent(content []byte) {
-	var lines []int
-	line := 0
-	for offset, b := range content {
-		if line >= 0 {
-			lines = append(lines, line)
-		}
-		line = -1
-		if b == '\n' {
-			line = offset + 1
-		}
-	}
-
-	// set lines table
-	f.set.mutex.Lock()
-	f.lines = lines
-	f.set.mutex.Unlock()
-}
-
-// A lineInfo object describes alternative file and line number
-// information (such as provided via a //line comment in a .go
-// file) for a given file offset.
-type lineInfo struct {
-	// fields are exported to make them accessible to gob
-	Offset   int
-	Filename string
-	Line     int
-}
-
-// AddLineInfo adds alternative file and line number information for
-// a given file offset. The offset must be larger than the offset for
-// the previously added alternative line info and smaller than the
-// file size; otherwise the information is ignored.
-//
-// AddLineInfo is typically used to register alternative position
-// information for //line filename:line comments in source files.
-//
-func (f *File) AddLineInfo(offset int, filename string, line int) {
-	f.set.mutex.Lock()
-	if i := len(f.infos); i == 0 || f.infos[i-1].Offset < offset && offset < f.size {
-		f.infos = append(f.infos, lineInfo{offset, filename, line})
-	}
-	f.set.mutex.Unlock()
-}
-
-// Pos returns the Pos value for the given file offset;
-// the offset must be <= f.Size().
-// f.Pos(f.Offset(p)) == p.
-//
-func (f *File) Pos(offset int) Pos {
-	if offset > f.size {
-		panic("illegal file offset")
-	}
-	return Pos(f.base + offset)
-}
-
-// Offset returns the offset for the given file position p;
-// p must be a valid Pos value in that file.
-// f.Offset(f.Pos(offset)) == offset.
-//
-func (f *File) Offset(p Pos) int {
-	if int(p) < f.base || int(p) > f.base+f.size {
-		panic("illegal Pos value")
-	}
-	return int(p) - f.base
-}
-
-// Line returns the line number for the given file position p;
-// p must be a Pos value in that file or NoPos.
-//
-func (f *File) Line(p Pos) int {
-	// TODO(gri) this can be implemented much more efficiently
-	return f.Position(p).Line
-}
-
-func searchLineInfos(a []lineInfo, x int) int {
-	return sort.Search(len(a), func(i int) bool { return a[i].Offset > x }) - 1
-}
-
-// info returns the file name, line, and column number for a file offset.
-func (f *File) info(offset int) (filename string, line, column int) {
-	filename = f.name
-	if i := searchInts(f.lines, offset); i >= 0 {
-		line, column = i+1, offset-f.lines[i]+1
-	}
-	if len(f.infos) > 0 {
-		// almost no files have extra line infos
-		if i := searchLineInfos(f.infos, offset); i >= 0 {
-			alt := &f.infos[i]
-			filename = alt.Filename
-			if i := searchInts(f.lines, alt.Offset); i >= 0 {
-				line += alt.Line - i - 1
-			}
-		}
-	}
-	return
-}
-
-func (f *File) position(p Pos) (pos Position) {
-	offset := int(p) - f.base
-	pos.Offset = offset
-	pos.Filename, pos.Line, pos.Column = f.info(offset)
-	return
-}
-
-// Position returns the Position value for the given file position p;
-// p must be a Pos value in that file or NoPos.
-//
-func (f *File) Position(p Pos) (pos Position) {
-	if p != NoPos {
-		if int(p) < f.base || int(p) > f.base+f.size {
-			panic("illegal Pos value")
-		}
-		pos = f.position(p)
-	}
-	return
-}
-
-// -----------------------------------------------------------------------------
-// FileSet
-
-// A FileSet represents a set of source files.
-// Methods of file sets are synchronized; multiple goroutines
-// may invoke them concurrently.
-//
-type FileSet struct {
-	mutex sync.RWMutex // protects the file set
-	base  int          // base offset for the next file
-	files []*File      // list of files in the order added to the set
-	last  *File        // cache of last file looked up
-}
-
-// NewFileSet creates a new file set.
-func NewFileSet() *FileSet {
-	s := new(FileSet)
-	s.base = 1 // 0 == NoPos
-	return s
-}
-
-// Base returns the minimum base offset that must be provided to
-// AddFile when adding the next file.
-//
-func (s *FileSet) Base() int {
-	s.mutex.RLock()
-	b := s.base
-	s.mutex.RUnlock()
-	return b
-
-}
-
-// AddFile adds a new file with a given filename, base offset, and file size
-// to the file set s and returns the file. Multiple files may have the same
-// name. The base offset must not be smaller than the FileSet's Base(), and
-// size must not be negative.
-//
-// Adding the file will set the file set's Base() value to base + size + 1
-// as the minimum base value for the next file. The following relationship
-// exists between a Pos value p for a given file offset offs:
-//
-//	int(p) = base + offs
-//
-// with offs in the range [0, size] and thus p in the range [base, base+size].
-// For convenience, File.Pos may be used to create file-specific position
-// values from a file offset.
-//
-func (s *FileSet) AddFile(filename string, base, size int) *File {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	if base < s.base || size < 0 {
-		panic("illegal base or size")
-	}
-	// base >= s.base && size >= 0
-	f := &File{s, filename, base, size, []int{0}, nil}
-	base += size + 1 // +1 because EOF also has a position
-	if base < 0 {
-		panic("token.Pos offset overflow (> 2G of source code in file set)")
-	}
-	// add the file to the file set
-	s.base = base
-	s.files = append(s.files, f)
-	s.last = f
-	return f
-}
-
-// Iterate calls f for the files in the file set in the order they were added
-// until f returns false.
-//
-func (s *FileSet) Iterate(f func(*File) bool) {
-	for i := 0; ; i++ {
-		var file *File
-		s.mutex.RLock()
-		if i < len(s.files) {
-			file = s.files[i]
-		}
-		s.mutex.RUnlock()
-		if file == nil || !f(file) {
-			break
-		}
-	}
-}
-
-func searchFiles(a []*File, x int) int {
-	return sort.Search(len(a), func(i int) bool { return a[i].base > x }) - 1
-}
-
-func (s *FileSet) file(p Pos) *File {
-	// common case: p is in last file
-	if f := s.last; f != nil && f.base <= int(p) && int(p) <= f.base+f.size {
-		return f
-	}
-	// p is not in last file - search all files
-	if i := searchFiles(s.files, int(p)); i >= 0 {
-		f := s.files[i]
-		// f.base <= int(p) by definition of searchFiles
-		if int(p) <= f.base+f.size {
-			s.last = f
-			return f
-		}
-	}
-	return nil
-}
-
-// File returns the file that contains the position p.
-// If no such file is found (for instance for p == NoPos),
-// the result is nil.
-//
-func (s *FileSet) File(p Pos) (f *File) {
-	if p != NoPos {
-		s.mutex.RLock()
-		f = s.file(p)
-		s.mutex.RUnlock()
-	}
-	return
-}
-
-// Position converts a Pos in the fileset into a general Position.
-func (s *FileSet) Position(p Pos) (pos Position) {
-	if p != NoPos {
-		s.mutex.RLock()
-		if f := s.file(p); f != nil {
-			pos = f.position(p)
-		}
-		s.mutex.RUnlock()
-	}
-	return
-}
-
-// -----------------------------------------------------------------------------
-// Helper functions
-
-func searchInts(a []int, x int) int {
-	// This function body is a manually inlined version of:
-	//
-	//   return sort.Search(len(a), func(i int) bool { return a[i] > x }) - 1
-	//
-	// With better compiler optimizations, this may not be needed in the
-	// future, but at the moment this change improves the go/printer
-	// benchmark performance by ~30%. This has a direct impact on the
-	// speed of gofmt and thus seems worthwhile (2011-04-29).
-	// TODO(gri): Remove this when compilers have caught up.
-	i, j := 0, len(a)
-	for i < j {
-		h := i + (j-i)/2 // avoid overflow when computing h
-		// i ≤ h < j
-		if a[h] <= x {
-			i = h + 1
-		} else {
-			j = h
-		}
-	}
-	return i - 1
-}
diff --git a/vendor/github.com/go-git/gcfg/token/serialize.go b/vendor/github.com/go-git/gcfg/token/serialize.go
deleted file mode 100644
index 4adc8f9e3..000000000
--- a/vendor/github.com/go-git/gcfg/token/serialize.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package token
-
-type serializedFile struct {
-	// fields correspond 1:1 to fields with same (lower-case) name in File
-	Name  string
-	Base  int
-	Size  int
-	Lines []int
-	Infos []lineInfo
-}
-
-type serializedFileSet struct {
-	Base  int
-	Files []serializedFile
-}
-
-// Read calls decode to deserialize a file set into s; s must not be nil.
-func (s *FileSet) Read(decode func(interface{}) error) error {
-	var ss serializedFileSet
-	if err := decode(&ss); err != nil {
-		return err
-	}
-
-	s.mutex.Lock()
-	s.base = ss.Base
-	files := make([]*File, len(ss.Files))
-	for i := 0; i < len(ss.Files); i++ {
-		f := &ss.Files[i]
-		files[i] = &File{s, f.Name, f.Base, f.Size, f.Lines, f.Infos}
-	}
-	s.files = files
-	s.last = nil
-	s.mutex.Unlock()
-
-	return nil
-}
-
-// Write calls encode to serialize the file set s.
-func (s *FileSet) Write(encode func(interface{}) error) error {
-	var ss serializedFileSet
-
-	s.mutex.Lock()
-	ss.Base = s.base
-	files := make([]serializedFile, len(s.files))
-	for i, f := range s.files {
-		files[i] = serializedFile{f.name, f.base, f.size, f.lines, f.infos}
-	}
-	ss.Files = files
-	s.mutex.Unlock()
-
-	return encode(ss)
-}
diff --git a/vendor/github.com/go-git/gcfg/token/token.go b/vendor/github.com/go-git/gcfg/token/token.go
deleted file mode 100644
index b3c7c83fa..000000000
--- a/vendor/github.com/go-git/gcfg/token/token.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package token defines constants representing the lexical tokens of the gcfg
-// configuration syntax and basic operations on tokens (printing, predicates).
-//
-// Note that the API for the token package may change to accommodate new
-// features or implementation changes in gcfg.
-//
-package token
-
-import "strconv"
-
-// Token is the set of lexical tokens of the gcfg configuration syntax.
-type Token int
-
-// The list of tokens.
-const (
-	// Special tokens
-	ILLEGAL Token = iota
-	EOF
-	COMMENT
-
-	literal_beg
-	// Identifiers and basic type literals
-	// (these tokens stand for classes of literals)
-	IDENT  // section-name, variable-name
-	STRING // "subsection-name", variable value
-	literal_end
-
-	operator_beg
-	// Operators and delimiters
-	ASSIGN // =
-	LBRACK // [
-	RBRACK // ]
-	EOL    // \n
-	operator_end
-)
-
-var tokens = [...]string{
-	ILLEGAL: "ILLEGAL",
-
-	EOF:     "EOF",
-	COMMENT: "COMMENT",
-
-	IDENT:  "IDENT",
-	STRING: "STRING",
-
-	ASSIGN: "=",
-	LBRACK: "[",
-	RBRACK: "]",
-	EOL:    "\n",
-}
-
-// String returns the string corresponding to the token tok.
-// For operators and delimiters, the string is the actual token character
-// sequence (e.g., for the token ASSIGN, the string is "="). For all other
-// tokens the string corresponds to the token constant name (e.g. for the
-// token IDENT, the string is "IDENT").
-//
-func (tok Token) String() string {
-	s := ""
-	if 0 <= tok && tok < Token(len(tokens)) {
-		s = tokens[tok]
-	}
-	if s == "" {
-		s = "token(" + strconv.Itoa(int(tok)) + ")"
-	}
-	return s
-}
-
-// Predicates
-
-// IsLiteral returns true for tokens corresponding to identifiers
-// and basic type literals; it returns false otherwise.
-//
-func (tok Token) IsLiteral() bool { return literal_beg < tok && tok < literal_end }
-
-// IsOperator returns true for tokens corresponding to operators and
-// delimiters; it returns false otherwise.
-//
-func (tok Token) IsOperator() bool { return operator_beg < tok && tok < operator_end }
diff --git a/vendor/github.com/go-git/gcfg/types/bool.go b/vendor/github.com/go-git/gcfg/types/bool.go
deleted file mode 100644
index 8dcae0d8c..000000000
--- a/vendor/github.com/go-git/gcfg/types/bool.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package types
-
-// BoolValues defines the name and value mappings for ParseBool.
-var BoolValues = map[string]interface{}{
-	"true": true, "yes": true, "on": true, "1": true,
-	"false": false, "no": false, "off": false, "0": false,
-}
-
-var boolParser = func() *EnumParser {
-	ep := &EnumParser{}
-	ep.AddVals(BoolValues)
-	return ep
-}()
-
-// ParseBool parses bool values according to the definitions in BoolValues.
-// Parsing is case-insensitive.
-func ParseBool(s string) (bool, error) {
-	v, err := boolParser.Parse(s)
-	if err != nil {
-		return false, err
-	}
-	return v.(bool), nil
-}
diff --git a/vendor/github.com/go-git/gcfg/types/doc.go b/vendor/github.com/go-git/gcfg/types/doc.go
deleted file mode 100644
index 9f9c345f6..000000000
--- a/vendor/github.com/go-git/gcfg/types/doc.go
+++ /dev/null
@@ -1,4 +0,0 @@
-// Package types defines helpers for type conversions.
-//
-// The API for this package is not finalized yet.
-package types
diff --git a/vendor/github.com/go-git/gcfg/types/enum.go b/vendor/github.com/go-git/gcfg/types/enum.go
deleted file mode 100644
index 1a0c7ef45..000000000
--- a/vendor/github.com/go-git/gcfg/types/enum.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package types
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// EnumParser parses "enum" values; i.e. a predefined set of strings to
-// predefined values.
-type EnumParser struct {
-	Type      string // type name; if not set, use type of first value added
-	CaseMatch bool   // if true, matching of strings is case-sensitive
-	// PrefixMatch bool
-	vals map[string]interface{}
-}
-
-// AddVals adds strings and values to an EnumParser.
-func (ep *EnumParser) AddVals(vals map[string]interface{}) {
-	if ep.vals == nil {
-		ep.vals = make(map[string]interface{})
-	}
-	for k, v := range vals {
-		if ep.Type == "" {
-			ep.Type = reflect.TypeOf(v).Name()
-		}
-		if !ep.CaseMatch {
-			k = strings.ToLower(k)
-		}
-		ep.vals[k] = v
-	}
-}
-
-// Parse parses the string and returns the value or an error.
-func (ep EnumParser) Parse(s string) (interface{}, error) {
-	if !ep.CaseMatch {
-		s = strings.ToLower(s)
-	}
-	v, ok := ep.vals[s]
-	if !ok {
-		return false, fmt.Errorf("failed to parse %s %#q", ep.Type, s)
-	}
-	return v, nil
-}
diff --git a/vendor/github.com/go-git/gcfg/types/int.go b/vendor/github.com/go-git/gcfg/types/int.go
deleted file mode 100644
index af7e75c12..000000000
--- a/vendor/github.com/go-git/gcfg/types/int.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package types
-
-import (
-	"fmt"
-	"strings"
-)
-
-// An IntMode is a mode for parsing integer values, representing a set of
-// accepted bases.
-type IntMode uint8
-
-// IntMode values for ParseInt; can be combined using binary or.
-const (
-	Dec IntMode = 1 << iota
-	Hex
-	Oct
-)
-
-// String returns a string representation of IntMode; e.g. `IntMode(Dec|Hex)`.
-func (m IntMode) String() string {
-	var modes []string
-	if m&Dec != 0 {
-		modes = append(modes, "Dec")
-	}
-	if m&Hex != 0 {
-		modes = append(modes, "Hex")
-	}
-	if m&Oct != 0 {
-		modes = append(modes, "Oct")
-	}
-	return "IntMode(" + strings.Join(modes, "|") + ")"
-}
-
-var errIntAmbig = fmt.Errorf("ambiguous integer value; must include '0' prefix")
-
-func prefix0(val string) bool {
-	return strings.HasPrefix(val, "0") || strings.HasPrefix(val, "-0")
-}
-
-func prefix0x(val string) bool {
-	return strings.HasPrefix(val, "0x") || strings.HasPrefix(val, "-0x")
-}
-
-// ParseInt parses val using mode into intptr, which must be a pointer to an
-// integer kind type. Non-decimal value require prefix `0` or `0x` in the cases
-// when mode permits ambiguity of base; otherwise the prefix can be omitted.
-func ParseInt(intptr interface{}, val string, mode IntMode) error {
-	val = strings.TrimSpace(val)
-	verb := byte(0)
-	switch mode {
-	case Dec:
-		verb = 'd'
-	case Dec + Hex:
-		if prefix0x(val) {
-			verb = 'v'
-		} else {
-			verb = 'd'
-		}
-	case Dec + Oct:
-		if prefix0(val) && !prefix0x(val) {
-			verb = 'v'
-		} else {
-			verb = 'd'
-		}
-	case Dec + Hex + Oct:
-		verb = 'v'
-	case Hex:
-		if prefix0x(val) {
-			verb = 'v'
-		} else {
-			verb = 'x'
-		}
-	case Oct:
-		verb = 'o'
-	case Hex + Oct:
-		if prefix0(val) {
-			verb = 'v'
-		} else {
-			return errIntAmbig
-		}
-	}
-	if verb == 0 {
-		panic("unsupported mode")
-	}
-	return ScanFully(intptr, val, verb)
-}
diff --git a/vendor/github.com/go-git/gcfg/types/scan.go b/vendor/github.com/go-git/gcfg/types/scan.go
deleted file mode 100644
index db2f6ed3c..000000000
--- a/vendor/github.com/go-git/gcfg/types/scan.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package types
-
-import (
-	"fmt"
-	"io"
-	"reflect"
-)
-
-// ScanFully uses fmt.Sscanf with verb to fully scan val into ptr.
-func ScanFully(ptr interface{}, val string, verb byte) error {
-	t := reflect.ValueOf(ptr).Elem().Type()
-	// attempt to read extra bytes to make sure the value is consumed
-	var b []byte
-	n, err := fmt.Sscanf(val, "%"+string(verb)+"%s", ptr, &b)
-	switch {
-	case n < 1 || n == 1 && err != io.EOF:
-		return fmt.Errorf("failed to parse %q as %v: %v", val, t, err)
-	case n > 1:
-		return fmt.Errorf("failed to parse %q as %v: extra characters %q", val, t, string(b))
-	}
-	// n == 1 && err == io.EOF
-	return nil
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/.gitignore b/vendor/github.com/go-git/go-billy/v5/.gitignore
deleted file mode 100644
index 7aeb46699..000000000
--- a/vendor/github.com/go-git/go-billy/v5/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/coverage.txt
-/vendor
-Gopkg.lock
-Gopkg.toml
diff --git a/vendor/github.com/go-git/go-billy/v5/LICENSE b/vendor/github.com/go-git/go-billy/v5/LICENSE
deleted file mode 100644
index 9d6075689..000000000
--- a/vendor/github.com/go-git/go-billy/v5/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2017 Sourced Technologies S.L.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/go-git/go-billy/v5/Makefile b/vendor/github.com/go-git/go-billy/v5/Makefile
deleted file mode 100644
index 3c95ddeaa..000000000
--- a/vendor/github.com/go-git/go-billy/v5/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Go parameters
-GOCMD = go
-GOTEST = $(GOCMD) test 
-WASIRUN_WRAPPER := $(CURDIR)/scripts/wasirun-wrapper
-
-.PHONY: test
-test:
-	$(GOTEST) -race ./...
-
-test-coverage:
-	echo "" > $(COVERAGE_REPORT); \
-	$(GOTEST) -coverprofile=$(COVERAGE_REPORT) -coverpkg=./... -covermode=$(COVERAGE_MODE) ./...
-
-.PHONY: wasitest
-wasitest: export GOARCH=wasm
-wasitest: export GOOS=wasip1
-wasitest:
-	$(GOTEST) -exec $(WASIRUN_WRAPPER) ./...
diff --git a/vendor/github.com/go-git/go-billy/v5/README.md b/vendor/github.com/go-git/go-billy/v5/README.md
deleted file mode 100644
index da5c07478..000000000
--- a/vendor/github.com/go-git/go-billy/v5/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# go-billy [![GoDoc](https://godoc.org/gopkg.in/go-git/go-billy.v5?status.svg)](https://pkg.go.dev/github.com/go-git/go-billy/v5) [![Test](https://github.com/go-git/go-billy/workflows/Test/badge.svg)](https://github.com/go-git/go-billy/actions?query=workflow%3ATest)
-
-The missing interface filesystem abstraction for Go.
-Billy implements an interface based on the `os` standard library, allowing to develop applications without dependency on the underlying storage. Makes it virtually free to implement mocks and testing over filesystem operations.
-
-Billy was born as part of [go-git/go-git](https://github.com/go-git/go-git) project.
-
-## Installation
-
-```go
-import "github.com/go-git/go-billy/v5" // with go modules enabled (GO111MODULE=on or outside GOPATH)
-import "github.com/go-git/go-billy" // with go modules disabled
-```
-
-## Usage
-
-Billy exposes filesystems using the
-[`Filesystem` interface](https://pkg.go.dev/github.com/go-git/go-billy/v5?tab=doc#Filesystem).
-Each filesystem implementation gives you a `New` method, whose arguments depend on
-the implementation itself, that returns a new `Filesystem`.
-
-The following example caches in memory all readable files in a directory from any
-billy's filesystem implementation.
-
-```go
-func LoadToMemory(origin billy.Filesystem, path string) (*memory.Memory, error) {
-	memory := memory.New()
-
-	files, err := origin.ReadDir("/")
-	if err != nil {
-		return nil, err
-	}
-
-	for _, file := range files {
-		if file.IsDir() {
-			continue
-		}
-
-		src, err := origin.Open(file.Name())
-		if err != nil {
-			return nil, err
-		}
-
-		dst, err := memory.Create(file.Name())
-		if err != nil {
-			return nil, err
-		}
-
-		if _, err = io.Copy(dst, src); err != nil {
-			return nil, err
-		}
-
-		if err := dst.Close(); err != nil {
-			return nil, err
-		}
-
-		if err := src.Close(); err != nil {
-			return nil, err
-		}
-	}
-
-	return memory, nil
-}
-```
-
-## Why billy?
-
-The library billy deals with storage systems and Billy is the name of a well-known, IKEA
-bookcase. That's it.
-
-## License
-
-Apache License Version 2.0, see [LICENSE](LICENSE)
diff --git a/vendor/github.com/go-git/go-billy/v5/fs.go b/vendor/github.com/go-git/go-billy/v5/fs.go
deleted file mode 100644
index d86f9d823..000000000
--- a/vendor/github.com/go-git/go-billy/v5/fs.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package billy
-
-import (
-	"errors"
-	"io"
-	"os"
-	"time"
-)
-
-var (
-	ErrReadOnly        = errors.New("read-only filesystem")
-	ErrNotSupported    = errors.New("feature not supported")
-	ErrCrossedBoundary = errors.New("chroot boundary crossed")
-)
-
-// Capability holds the supported features of a billy filesystem. This does
-// not mean that the capability has to be supported by the underlying storage.
-// For example, a billy filesystem may support WriteCapability but the
-// storage be mounted in read only mode.
-type Capability uint64
-
-const (
-	// WriteCapability means that the fs is writable.
-	WriteCapability Capability = 1 << iota
-	// ReadCapability means that the fs is readable.
-	ReadCapability
-	// ReadAndWriteCapability is the ability to open a file in read and write mode.
-	ReadAndWriteCapability
-	// SeekCapability means it is able to move position inside the file.
-	SeekCapability
-	// TruncateCapability means that a file can be truncated.
-	TruncateCapability
-	// LockCapability is the ability to lock a file.
-	LockCapability
-
-	// DefaultCapabilities lists all capable features supported by filesystems
-	// without Capability interface. This list should not be changed until a
-	// major version is released.
-	DefaultCapabilities Capability = WriteCapability | ReadCapability |
-		ReadAndWriteCapability | SeekCapability | TruncateCapability |
-		LockCapability
-
-	// AllCapabilities lists all capable features.
-	AllCapabilities Capability = WriteCapability | ReadCapability |
-		ReadAndWriteCapability | SeekCapability | TruncateCapability |
-		LockCapability
-)
-
-// Filesystem abstract the operations in a storage-agnostic interface.
-// Each method implementation mimics the behavior of the equivalent functions
-// at the os package from the standard library.
-type Filesystem interface {
-	Basic
-	TempFile
-	Dir
-	Symlink
-	Chroot
-}
-
-// Basic abstract the basic operations in a storage-agnostic interface as
-// an extension to the Basic interface.
-type Basic interface {
-	// Create creates the named file with mode 0666 (before umask), truncating
-	// it if it already exists. If successful, methods on the returned File can
-	// be used for I/O; the associated file descriptor has mode O_RDWR.
-	Create(filename string) (File, error)
-	// Open opens the named file for reading. If successful, methods on the
-	// returned file can be used for reading; the associated file descriptor has
-	// mode O_RDONLY.
-	Open(filename string) (File, error)
-	// OpenFile is the generalized open call; most users will use Open or Create
-	// instead. It opens the named file with specified flag (O_RDONLY etc.) and
-	// perm, (0666 etc.) if applicable. If successful, methods on the returned
-	// File can be used for I/O.
-	OpenFile(filename string, flag int, perm os.FileMode) (File, error)
-	// Stat returns a FileInfo describing the named file.
-	Stat(filename string) (os.FileInfo, error)
-	// Rename renames (moves) oldpath to newpath. If newpath already exists and
-	// is not a directory, Rename replaces it. OS-specific restrictions may
-	// apply when oldpath and newpath are in different directories.
-	Rename(oldpath, newpath string) error
-	// Remove removes the named file or directory.
-	Remove(filename string) error
-	// Join joins any number of path elements into a single path, adding a
-	// Separator if necessary. Join calls filepath.Clean on the result; in
-	// particular, all empty strings are ignored. On Windows, the result is a
-	// UNC path if and only if the first path element is a UNC path.
-	Join(elem ...string) string
-}
-
-type TempFile interface {
-	// TempFile creates a new temporary file in the directory dir with a name
-	// beginning with prefix, opens the file for reading and writing, and
-	// returns the resulting *os.File. If dir is the empty string, TempFile
-	// uses the default directory for temporary files (see os.TempDir).
-	// Multiple programs calling TempFile simultaneously will not choose the
-	// same file. The caller can use f.Name() to find the pathname of the file.
-	// It is the caller's responsibility to remove the file when no longer
-	// needed.
-	TempFile(dir, prefix string) (File, error)
-}
-
-// Dir abstract the dir related operations in a storage-agnostic interface as
-// an extension to the Basic interface.
-type Dir interface {
-	// ReadDir reads the directory named by dirname and returns a list of
-	// directory entries sorted by filename.
-	ReadDir(path string) ([]os.FileInfo, error)
-	// MkdirAll creates a directory named path, along with any necessary
-	// parents, and returns nil, or else returns an error. The permission bits
-	// perm are used for all directories that MkdirAll creates. If path is/
-	// already a directory, MkdirAll does nothing and returns nil.
-	MkdirAll(filename string, perm os.FileMode) error
-}
-
-// Symlink abstract the symlink related operations in a storage-agnostic
-// interface as an extension to the Basic interface.
-type Symlink interface {
-	// Lstat returns a FileInfo describing the named file. If the file is a
-	// symbolic link, the returned FileInfo describes the symbolic link. Lstat
-	// makes no attempt to follow the link.
-	Lstat(filename string) (os.FileInfo, error)
-	// Symlink creates a symbolic-link from link to target. target may be an
-	// absolute or relative path, and need not refer to an existing node.
-	// Parent directories of link are created as necessary.
-	Symlink(target, link string) error
-	// Readlink returns the target path of link.
-	Readlink(link string) (string, error)
-}
-
-// Change abstract the FileInfo change related operations in a storage-agnostic
-// interface as an extension to the Basic interface
-type Change interface {
-	// Chmod changes the mode of the named file to mode. If the file is a
-	// symbolic link, it changes the mode of the link's target.
-	Chmod(name string, mode os.FileMode) error
-	// Lchown changes the numeric uid and gid of the named file. If the file is
-	// a symbolic link, it changes the uid and gid of the link itself.
-	Lchown(name string, uid, gid int) error
-	// Chown changes the numeric uid and gid of the named file. If the file is a
-	// symbolic link, it changes the uid and gid of the link's target.
-	Chown(name string, uid, gid int) error
-	// Chtimes changes the access and modification times of the named file,
-	// similar to the Unix utime() or utimes() functions.
-	//
-	// The underlying filesystem may truncate or round the values to a less
-	// precise time unit.
-	Chtimes(name string, atime time.Time, mtime time.Time) error
-}
-
-// Chroot abstract the chroot related operations in a storage-agnostic interface
-// as an extension to the Basic interface.
-type Chroot interface {
-	// Chroot returns a new filesystem from the same type where the new root is
-	// the given path. Files outside of the designated directory tree cannot be
-	// accessed.
-	Chroot(path string) (Filesystem, error)
-	// Root returns the root path of the filesystem.
-	Root() string
-}
-
-// File represent a file, being a subset of the os.File
-type File interface {
-	// Name returns the name of the file as presented to Open.
-	Name() string
-	io.Writer
-	// TODO: Add io.WriterAt for v6  
-	// io.WriterAt
-	io.Reader
-	io.ReaderAt
-	io.Seeker
-	io.Closer
-	// Lock locks the file like e.g. flock. It protects against access from
-	// other processes.
-	Lock() error
-	// Unlock unlocks the file.
-	Unlock() error
-	// Truncate the file.
-	Truncate(size int64) error
-}
-
-// Capable interface can return the available features of a filesystem.
-type Capable interface {
-	// Capabilities returns the capabilities of a filesystem in bit flags.
-	Capabilities() Capability
-}
-
-// Capabilities returns the features supported by a filesystem. If the FS
-// does not implement Capable interface it returns all features.
-func Capabilities(fs Basic) Capability {
-	capable, ok := fs.(Capable)
-	if !ok {
-		return DefaultCapabilities
-	}
-
-	return capable.Capabilities()
-}
-
-// CapabilityCheck tests the filesystem for the provided capabilities and
-// returns true in case it supports all of them.
-func CapabilityCheck(fs Basic, capabilities Capability) bool {
-	fsCaps := Capabilities(fs)
-	return fsCaps&capabilities == capabilities
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/helper/chroot/chroot.go b/vendor/github.com/go-git/go-billy/v5/helper/chroot/chroot.go
deleted file mode 100644
index 8b44e784b..000000000
--- a/vendor/github.com/go-git/go-billy/v5/helper/chroot/chroot.go
+++ /dev/null
@@ -1,242 +0,0 @@
-package chroot
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/polyfill"
-)
-
-// ChrootHelper is a helper to implement billy.Chroot.
-type ChrootHelper struct {
-	underlying billy.Filesystem
-	base       string
-}
-
-// New creates a new filesystem wrapping up the given 'fs'.
-// The created filesystem has its base in the given ChrootHelperectory of the
-// underlying filesystem.
-func New(fs billy.Basic, base string) billy.Filesystem {
-	return &ChrootHelper{
-		underlying: polyfill.New(fs),
-		base:       base,
-	}
-}
-
-func (fs *ChrootHelper) underlyingPath(filename string) (string, error) {
-	if isCrossBoundaries(filename) {
-		return "", billy.ErrCrossedBoundary
-	}
-
-	return fs.Join(fs.Root(), filename), nil
-}
-
-func isCrossBoundaries(path string) bool {
-	path = filepath.ToSlash(path)
-	path = filepath.Clean(path)
-
-	return strings.HasPrefix(path, ".."+string(filepath.Separator))
-}
-
-func (fs *ChrootHelper) Create(filename string) (billy.File, error) {
-	fullpath, err := fs.underlyingPath(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := fs.underlying.Create(fullpath)
-	if err != nil {
-		return nil, err
-	}
-
-	return newFile(fs, f, filename), nil
-}
-
-func (fs *ChrootHelper) Open(filename string) (billy.File, error) {
-	fullpath, err := fs.underlyingPath(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := fs.underlying.Open(fullpath)
-	if err != nil {
-		return nil, err
-	}
-
-	return newFile(fs, f, filename), nil
-}
-
-func (fs *ChrootHelper) OpenFile(filename string, flag int, mode os.FileMode) (billy.File, error) {
-	fullpath, err := fs.underlyingPath(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := fs.underlying.OpenFile(fullpath, flag, mode)
-	if err != nil {
-		return nil, err
-	}
-
-	return newFile(fs, f, filename), nil
-}
-
-func (fs *ChrootHelper) Stat(filename string) (os.FileInfo, error) {
-	fullpath, err := fs.underlyingPath(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	return fs.underlying.Stat(fullpath)
-}
-
-func (fs *ChrootHelper) Rename(from, to string) error {
-	var err error
-	from, err = fs.underlyingPath(from)
-	if err != nil {
-		return err
-	}
-
-	to, err = fs.underlyingPath(to)
-	if err != nil {
-		return err
-	}
-
-	return fs.underlying.Rename(from, to)
-}
-
-func (fs *ChrootHelper) Remove(path string) error {
-	fullpath, err := fs.underlyingPath(path)
-	if err != nil {
-		return err
-	}
-
-	return fs.underlying.Remove(fullpath)
-}
-
-func (fs *ChrootHelper) Join(elem ...string) string {
-	return fs.underlying.Join(elem...)
-}
-
-func (fs *ChrootHelper) TempFile(dir, prefix string) (billy.File, error) {
-	fullpath, err := fs.underlyingPath(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := fs.underlying.(billy.TempFile).TempFile(fullpath, prefix)
-	if err != nil {
-		return nil, err
-	}
-
-	return newFile(fs, f, fs.Join(dir, filepath.Base(f.Name()))), nil
-}
-
-func (fs *ChrootHelper) ReadDir(path string) ([]os.FileInfo, error) {
-	fullpath, err := fs.underlyingPath(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return fs.underlying.(billy.Dir).ReadDir(fullpath)
-}
-
-func (fs *ChrootHelper) MkdirAll(filename string, perm os.FileMode) error {
-	fullpath, err := fs.underlyingPath(filename)
-	if err != nil {
-		return err
-	}
-
-	return fs.underlying.(billy.Dir).MkdirAll(fullpath, perm)
-}
-
-func (fs *ChrootHelper) Lstat(filename string) (os.FileInfo, error) {
-	fullpath, err := fs.underlyingPath(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	return fs.underlying.(billy.Symlink).Lstat(fullpath)
-}
-
-func (fs *ChrootHelper) Symlink(target, link string) error {
-	target = filepath.FromSlash(target)
-
-	// only rewrite target if it's already absolute
-	if filepath.IsAbs(target) || strings.HasPrefix(target, string(filepath.Separator)) {
-		target = fs.Join(fs.Root(), target)
-		target = filepath.Clean(filepath.FromSlash(target))
-	}
-
-	link, err := fs.underlyingPath(link)
-	if err != nil {
-		return err
-	}
-
-	return fs.underlying.(billy.Symlink).Symlink(target, link)
-}
-
-func (fs *ChrootHelper) Readlink(link string) (string, error) {
-	fullpath, err := fs.underlyingPath(link)
-	if err != nil {
-		return "", err
-	}
-
-	target, err := fs.underlying.(billy.Symlink).Readlink(fullpath)
-	if err != nil {
-		return "", err
-	}
-
-	if !filepath.IsAbs(target) && !strings.HasPrefix(target, string(filepath.Separator)) {
-		return target, nil
-	}
-
-	target, err = filepath.Rel(fs.base, target)
-	if err != nil {
-		return "", err
-	}
-
-	return string(os.PathSeparator) + target, nil
-}
-
-func (fs *ChrootHelper) Chroot(path string) (billy.Filesystem, error) {
-	fullpath, err := fs.underlyingPath(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return New(fs.underlying, fullpath), nil
-}
-
-func (fs *ChrootHelper) Root() string {
-	return fs.base
-}
-
-func (fs *ChrootHelper) Underlying() billy.Basic {
-	return fs.underlying
-}
-
-// Capabilities implements the Capable interface.
-func (fs *ChrootHelper) Capabilities() billy.Capability {
-	return billy.Capabilities(fs.underlying)
-}
-
-type file struct {
-	billy.File
-	name string
-}
-
-func newFile(fs billy.Filesystem, f billy.File, filename string) billy.File {
-	filename = fs.Join(fs.Root(), filename)
-	filename, _ = filepath.Rel(fs.Root(), filename)
-
-	return &file{
-		File: f,
-		name: filename,
-	}
-}
-
-func (f *file) Name() string {
-	return f.name
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/helper/polyfill/polyfill.go b/vendor/github.com/go-git/go-billy/v5/helper/polyfill/polyfill.go
deleted file mode 100644
index 1efce0e7b..000000000
--- a/vendor/github.com/go-git/go-billy/v5/helper/polyfill/polyfill.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package polyfill
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// Polyfill is a helper that implements all missing method from billy.Filesystem.
-type Polyfill struct {
-	billy.Basic
-	c capabilities
-}
-
-type capabilities struct{ tempfile, dir, symlink, chroot bool }
-
-// New creates a new filesystem wrapping up 'fs' the intercepts all the calls
-// made and errors if fs doesn't implement any of the billy interfaces.
-func New(fs billy.Basic) billy.Filesystem {
-	if original, ok := fs.(billy.Filesystem); ok {
-		return original
-	}
-
-	h := &Polyfill{Basic: fs}
-
-	_, h.c.tempfile = h.Basic.(billy.TempFile)
-	_, h.c.dir = h.Basic.(billy.Dir)
-	_, h.c.symlink = h.Basic.(billy.Symlink)
-	_, h.c.chroot = h.Basic.(billy.Chroot)
-	return h
-}
-
-func (h *Polyfill) TempFile(dir, prefix string) (billy.File, error) {
-	if !h.c.tempfile {
-		return nil, billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.TempFile).TempFile(dir, prefix)
-}
-
-func (h *Polyfill) ReadDir(path string) ([]os.FileInfo, error) {
-	if !h.c.dir {
-		return nil, billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.Dir).ReadDir(path)
-}
-
-func (h *Polyfill) MkdirAll(filename string, perm os.FileMode) error {
-	if !h.c.dir {
-		return billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.Dir).MkdirAll(filename, perm)
-}
-
-func (h *Polyfill) Symlink(target, link string) error {
-	if !h.c.symlink {
-		return billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.Symlink).Symlink(target, link)
-}
-
-func (h *Polyfill) Readlink(link string) (string, error) {
-	if !h.c.symlink {
-		return "", billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.Symlink).Readlink(link)
-}
-
-func (h *Polyfill) Lstat(path string) (os.FileInfo, error) {
-	if !h.c.symlink {
-		return nil, billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.Symlink).Lstat(path)
-}
-
-func (h *Polyfill) Chroot(path string) (billy.Filesystem, error) {
-	if !h.c.chroot {
-		return nil, billy.ErrNotSupported
-	}
-
-	return h.Basic.(billy.Chroot).Chroot(path)
-}
-
-func (h *Polyfill) Root() string {
-	if !h.c.chroot {
-		return string(filepath.Separator)
-	}
-
-	return h.Basic.(billy.Chroot).Root()
-}
-
-func (h *Polyfill) Underlying() billy.Basic {
-	return h.Basic
-}
-
-// Capabilities implements the Capable interface.
-func (h *Polyfill) Capabilities() billy.Capability {
-	return billy.Capabilities(h.Basic)
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/memfs/memory.go b/vendor/github.com/go-git/go-billy/v5/memfs/memory.go
deleted file mode 100644
index 6cbd7d08c..000000000
--- a/vendor/github.com/go-git/go-billy/v5/memfs/memory.go
+++ /dev/null
@@ -1,424 +0,0 @@
-// Package memfs provides a billy filesystem base on memory.
-package memfs // import "github.com/go-git/go-billy/v5/memfs"
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/chroot"
-	"github.com/go-git/go-billy/v5/util"
-)
-
-const separator = filepath.Separator
-
-var errNotLink = errors.New("not a link")
-
-// Memory a very convenient filesystem based on memory files.
-type Memory struct {
-	s *storage
-
-	tempCount int
-}
-
-// New returns a new Memory filesystem.
-func New() billy.Filesystem {
-	fs := &Memory{s: newStorage()}
-	fs.s.New("/", 0755|os.ModeDir, 0)
-	return chroot.New(fs, string(separator))
-}
-
-func (fs *Memory) Create(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-}
-
-func (fs *Memory) Open(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDONLY, 0)
-}
-
-func (fs *Memory) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
-	f, has := fs.s.Get(filename)
-	if !has {
-		if !isCreate(flag) {
-			return nil, os.ErrNotExist
-		}
-
-		var err error
-		f, err = fs.s.New(filename, perm, flag)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		if isExclusive(flag) {
-			return nil, os.ErrExist
-		}
-
-		if target, isLink := fs.resolveLink(filename, f); isLink {
-			if target != filename {
-				return fs.OpenFile(target, flag, perm)
-			}
-		}
-	}
-
-	if f.mode.IsDir() {
-		return nil, fmt.Errorf("cannot open directory: %s", filename)
-	}
-
-	return f.Duplicate(filename, perm, flag), nil
-}
-
-func (fs *Memory) resolveLink(fullpath string, f *file) (target string, isLink bool) {
-	if !isSymlink(f.mode) {
-		return fullpath, false
-	}
-
-	target = string(f.content.bytes)
-	if !isAbs(target) {
-		target = fs.Join(filepath.Dir(fullpath), target)
-	}
-
-	return target, true
-}
-
-// On Windows OS, IsAbs validates if a path is valid based on if stars with a
-// unit (eg.: `C:\`)  to assert that is absolute, but in this mem implementation
-// any path starting by `separator` is also considered absolute.
-func isAbs(path string) bool {
-	return filepath.IsAbs(path) || strings.HasPrefix(path, string(separator))
-}
-
-func (fs *Memory) Stat(filename string) (os.FileInfo, error) {
-	f, has := fs.s.Get(filename)
-	if !has {
-		return nil, os.ErrNotExist
-	}
-
-	fi, _ := f.Stat()
-
-	var err error
-	if target, isLink := fs.resolveLink(filename, f); isLink {
-		fi, err = fs.Stat(target)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// the name of the file should always the name of the stated file, so we
-	// overwrite the Stat returned from the storage with it, since the
-	// filename may belong to a link.
-	fi.(*fileInfo).name = filepath.Base(filename)
-	return fi, nil
-}
-
-func (fs *Memory) Lstat(filename string) (os.FileInfo, error) {
-	f, has := fs.s.Get(filename)
-	if !has {
-		return nil, os.ErrNotExist
-	}
-
-	return f.Stat()
-}
-
-type ByName []os.FileInfo
-
-func (a ByName) Len() int           { return len(a) }
-func (a ByName) Less(i, j int) bool { return a[i].Name() < a[j].Name() }
-func (a ByName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-func (fs *Memory) ReadDir(path string) ([]os.FileInfo, error) {
-	if f, has := fs.s.Get(path); has {
-		if target, isLink := fs.resolveLink(path, f); isLink {
-			if target != path {
-				return fs.ReadDir(target)
-			}
-		}
-	} else {
-		return nil, &os.PathError{Op: "open", Path: path, Err: syscall.ENOENT}
-	}
-
-	var entries []os.FileInfo
-	for _, f := range fs.s.Children(path) {
-		fi, _ := f.Stat()
-		entries = append(entries, fi)
-	}
-
-	sort.Sort(ByName(entries))
-
-	return entries, nil
-}
-
-func (fs *Memory) MkdirAll(path string, perm os.FileMode) error {
-	_, err := fs.s.New(path, perm|os.ModeDir, 0)
-	return err
-}
-
-func (fs *Memory) TempFile(dir, prefix string) (billy.File, error) {
-	return util.TempFile(fs, dir, prefix)
-}
-
-func (fs *Memory) getTempFilename(dir, prefix string) string {
-	fs.tempCount++
-	filename := fmt.Sprintf("%s_%d_%d", prefix, fs.tempCount, time.Now().UnixNano())
-	return fs.Join(dir, filename)
-}
-
-func (fs *Memory) Rename(from, to string) error {
-	return fs.s.Rename(from, to)
-}
-
-func (fs *Memory) Remove(filename string) error {
-	return fs.s.Remove(filename)
-}
-
-// Falls back to Go's filepath.Join, which works differently depending on the
-// OS where the code is being executed.
-func (fs *Memory) Join(elem ...string) string {
-	return filepath.Join(elem...)
-}
-
-func (fs *Memory) Symlink(target, link string) error {
-	_, err := fs.Lstat(link)
-	if err == nil {
-		return os.ErrExist
-	}
-
-	if !errors.Is(err, os.ErrNotExist) {
-		return err
-	}
-
-	return util.WriteFile(fs, link, []byte(target), 0777|os.ModeSymlink)
-}
-
-func (fs *Memory) Readlink(link string) (string, error) {
-	f, has := fs.s.Get(link)
-	if !has {
-		return "", os.ErrNotExist
-	}
-
-	if !isSymlink(f.mode) {
-		return "", &os.PathError{
-			Op:   "readlink",
-			Path: link,
-			Err:  fmt.Errorf("not a symlink"),
-		}
-	}
-
-	return string(f.content.bytes), nil
-}
-
-// Capabilities implements the Capable interface.
-func (fs *Memory) Capabilities() billy.Capability {
-	return billy.WriteCapability |
-		billy.ReadCapability |
-		billy.ReadAndWriteCapability |
-		billy.SeekCapability |
-		billy.TruncateCapability
-}
-
-type file struct {
-	name     string
-	content  *content
-	position int64
-	flag     int
-	mode     os.FileMode
-
-	isClosed bool
-}
-
-func (f *file) Name() string {
-	return f.name
-}
-
-func (f *file) Read(b []byte) (int, error) {
-	n, err := f.ReadAt(b, f.position)
-	f.position += int64(n)
-
-	if errors.Is(err, io.EOF) && n != 0 {
-		err = nil
-	}
-
-	return n, err
-}
-
-func (f *file) ReadAt(b []byte, off int64) (int, error) {
-	if f.isClosed {
-		return 0, os.ErrClosed
-	}
-
-	if !isReadAndWrite(f.flag) && !isReadOnly(f.flag) {
-		return 0, errors.New("read not supported")
-	}
-
-	n, err := f.content.ReadAt(b, off)
-
-	return n, err
-}
-
-func (f *file) Seek(offset int64, whence int) (int64, error) {
-	if f.isClosed {
-		return 0, os.ErrClosed
-	}
-
-	switch whence {
-	case io.SeekCurrent:
-		f.position += offset
-	case io.SeekStart:
-		f.position = offset
-	case io.SeekEnd:
-		f.position = int64(f.content.Len()) + offset
-	}
-
-	return f.position, nil
-}
-
-func (f *file) Write(p []byte) (int, error) {
-	return f.WriteAt(p, f.position)
-}
-
-func (f *file) WriteAt(p []byte, off int64) (int, error) {
-	if f.isClosed {
-		return 0, os.ErrClosed
-	}
-
-	if !isReadAndWrite(f.flag) && !isWriteOnly(f.flag) {
-		return 0, errors.New("write not supported")
-	}
-
-	n, err := f.content.WriteAt(p, off)
-	f.position = off + int64(n)
-
-	return n, err
-}
-
-func (f *file) Close() error {
-	if f.isClosed {
-		return os.ErrClosed
-	}
-
-	f.isClosed = true
-	return nil
-}
-
-func (f *file) Truncate(size int64) error {
-	if size < int64(len(f.content.bytes)) {
-		f.content.bytes = f.content.bytes[:size]
-	} else if more := int(size) - len(f.content.bytes); more > 0 {
-		f.content.bytes = append(f.content.bytes, make([]byte, more)...)
-	}
-
-	return nil
-}
-
-func (f *file) Duplicate(filename string, mode os.FileMode, flag int) billy.File {
-	new := &file{
-		name:    filename,
-		content: f.content,
-		mode:    mode,
-		flag:    flag,
-	}
-
-	if isTruncate(flag) {
-		new.content.Truncate()
-	}
-
-	if isAppend(flag) {
-		new.position = int64(new.content.Len())
-	}
-
-	return new
-}
-
-func (f *file) Stat() (os.FileInfo, error) {
-	return &fileInfo{
-		name: f.Name(),
-		mode: f.mode,
-		size: f.content.Len(),
-	}, nil
-}
-
-// Lock is a no-op in memfs.
-func (f *file) Lock() error {
-	return nil
-}
-
-// Unlock is a no-op in memfs.
-func (f *file) Unlock() error {
-	return nil
-}
-
-type fileInfo struct {
-	name string
-	size int
-	mode os.FileMode
-}
-
-func (fi *fileInfo) Name() string {
-	return fi.name
-}
-
-func (fi *fileInfo) Size() int64 {
-	return int64(fi.size)
-}
-
-func (fi *fileInfo) Mode() os.FileMode {
-	return fi.mode
-}
-
-func (*fileInfo) ModTime() time.Time {
-	return time.Now()
-}
-
-func (fi *fileInfo) IsDir() bool {
-	return fi.mode.IsDir()
-}
-
-func (*fileInfo) Sys() interface{} {
-	return nil
-}
-
-func (c *content) Truncate() {
-	c.bytes = make([]byte, 0)
-}
-
-func (c *content) Len() int {
-	return len(c.bytes)
-}
-
-func isCreate(flag int) bool {
-	return flag&os.O_CREATE != 0
-}
-
-func isExclusive(flag int) bool {
-	return flag&os.O_EXCL != 0
-}
-
-func isAppend(flag int) bool {
-	return flag&os.O_APPEND != 0
-}
-
-func isTruncate(flag int) bool {
-	return flag&os.O_TRUNC != 0
-}
-
-func isReadAndWrite(flag int) bool {
-	return flag&os.O_RDWR != 0
-}
-
-func isReadOnly(flag int) bool {
-	return flag == os.O_RDONLY
-}
-
-func isWriteOnly(flag int) bool {
-	return flag&os.O_WRONLY != 0
-}
-
-func isSymlink(m os.FileMode) bool {
-	return m&os.ModeSymlink != 0
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/memfs/storage.go b/vendor/github.com/go-git/go-billy/v5/memfs/storage.go
deleted file mode 100644
index 16b48ce00..000000000
--- a/vendor/github.com/go-git/go-billy/v5/memfs/storage.go
+++ /dev/null
@@ -1,239 +0,0 @@
-package memfs
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-)
-
-type storage struct {
-	files    map[string]*file
-	children map[string]map[string]*file
-}
-
-func newStorage() *storage {
-	return &storage{
-		files:    make(map[string]*file, 0),
-		children: make(map[string]map[string]*file, 0),
-	}
-}
-
-func (s *storage) Has(path string) bool {
-	path = clean(path)
-
-	_, ok := s.files[path]
-	return ok
-}
-
-func (s *storage) New(path string, mode os.FileMode, flag int) (*file, error) {
-	path = clean(path)
-	if s.Has(path) {
-		if !s.MustGet(path).mode.IsDir() {
-			return nil, fmt.Errorf("file already exists %q", path)
-		}
-
-		return nil, nil
-	}
-
-	name := filepath.Base(path)
-
-	f := &file{
-		name:    name,
-		content: &content{name: name},
-		mode:    mode,
-		flag:    flag,
-	}
-
-	s.files[path] = f
-	s.createParent(path, mode, f)
-	return f, nil
-}
-
-func (s *storage) createParent(path string, mode os.FileMode, f *file) error {
-	base := filepath.Dir(path)
-	base = clean(base)
-	if f.Name() == string(separator) {
-		return nil
-	}
-
-	if _, err := s.New(base, mode.Perm()|os.ModeDir, 0); err != nil {
-		return err
-	}
-
-	if _, ok := s.children[base]; !ok {
-		s.children[base] = make(map[string]*file, 0)
-	}
-
-	s.children[base][f.Name()] = f
-	return nil
-}
-
-func (s *storage) Children(path string) []*file {
-	path = clean(path)
-
-	l := make([]*file, 0)
-	for _, f := range s.children[path] {
-		l = append(l, f)
-	}
-
-	return l
-}
-
-func (s *storage) MustGet(path string) *file {
-	f, ok := s.Get(path)
-	if !ok {
-		panic(fmt.Errorf("couldn't find %q", path))
-	}
-
-	return f
-}
-
-func (s *storage) Get(path string) (*file, bool) {
-	path = clean(path)
-	if !s.Has(path) {
-		return nil, false
-	}
-
-	file, ok := s.files[path]
-	return file, ok
-}
-
-func (s *storage) Rename(from, to string) error {
-	from = clean(from)
-	to = clean(to)
-
-	if !s.Has(from) {
-		return os.ErrNotExist
-	}
-
-	move := [][2]string{{from, to}}
-
-	for pathFrom := range s.files {
-		if pathFrom == from || !strings.HasPrefix(pathFrom, from) {
-			continue
-		}
-
-		rel, _ := filepath.Rel(from, pathFrom)
-		pathTo := filepath.Join(to, rel)
-
-		move = append(move, [2]string{pathFrom, pathTo})
-	}
-
-	for _, ops := range move {
-		from := ops[0]
-		to := ops[1]
-
-		if err := s.move(from, to); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (s *storage) move(from, to string) error {
-	s.files[to] = s.files[from]
-	s.files[to].name = filepath.Base(to)
-	s.children[to] = s.children[from]
-
-	defer func() {
-		delete(s.children, from)
-		delete(s.files, from)
-		delete(s.children[filepath.Dir(from)], filepath.Base(from))
-	}()
-
-	return s.createParent(to, 0644, s.files[to])
-}
-
-func (s *storage) Remove(path string) error {
-	path = clean(path)
-
-	f, has := s.Get(path)
-	if !has {
-		return os.ErrNotExist
-	}
-
-	if f.mode.IsDir() && len(s.children[path]) != 0 {
-		return fmt.Errorf("dir: %s contains files", path)
-	}
-
-	base, file := filepath.Split(path)
-	base = filepath.Clean(base)
-
-	delete(s.children[base], file)
-	delete(s.files, path)
-	return nil
-}
-
-func clean(path string) string {
-	return filepath.Clean(filepath.FromSlash(path))
-}
-
-type content struct {
-	name  string
-	bytes []byte
-
-	m sync.RWMutex
-}
-
-func (c *content) WriteAt(p []byte, off int64) (int, error) {
-	if off < 0 {
-		return 0, &os.PathError{
-			Op:   "writeat",
-			Path: c.name,
-			Err:  errors.New("negative offset"),
-		}
-	}
-
-	c.m.Lock()
-	prev := len(c.bytes)
-
-	diff := int(off) - prev
-	if diff > 0 {
-		c.bytes = append(c.bytes, make([]byte, diff)...)
-	}
-
-	c.bytes = append(c.bytes[:off], p...)
-	if len(c.bytes) < prev {
-		c.bytes = c.bytes[:prev]
-	}
-	c.m.Unlock()
-
-	return len(p), nil
-}
-
-func (c *content) ReadAt(b []byte, off int64) (n int, err error) {
-	if off < 0 {
-		return 0, &os.PathError{
-			Op:   "readat",
-			Path: c.name,
-			Err:  errors.New("negative offset"),
-		}
-	}
-
-	c.m.RLock()
-	size := int64(len(c.bytes))
-	if off >= size {
-		c.m.RUnlock()
-		return 0, io.EOF
-	}
-
-	l := int64(len(b))
-	if off+l > size {
-		l = size - off
-	}
-
-	btr := c.bytes[off : off+l]
-	n = copy(b, btr)
-
-	if len(btr) < len(b) {
-		err = io.EOF
-	}
-	c.m.RUnlock()
-
-	return
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os.go b/vendor/github.com/go-git/go-billy/v5/osfs/os.go
deleted file mode 100644
index a7fe79f2f..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os.go
+++ /dev/null
@@ -1,127 +0,0 @@
-//go:build !js
-// +build !js
-
-// Package osfs provides a billy filesystem for the OS.
-package osfs
-
-import (
-	"fmt"
-	"io/fs"
-	"os"
-	"sync"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-const (
-	defaultDirectoryMode = 0o755
-	defaultCreateMode    = 0o666
-)
-
-// Default Filesystem representing the root of the os filesystem.
-var Default = &ChrootOS{}
-
-// New returns a new OS filesystem.
-// By default paths are deduplicated, but still enforced
-// under baseDir. For more info refer to WithDeduplicatePath.
-func New(baseDir string, opts ...Option) billy.Filesystem {
-	o := &options{
-		deduplicatePath: true,
-	}
-	for _, opt := range opts {
-		opt(o)
-	}
-
-	if o.Type == BoundOSFS {
-		return newBoundOS(baseDir, o.deduplicatePath)
-	}
-
-	return newChrootOS(baseDir)
-}
-
-// WithBoundOS returns the option of using a Bound filesystem OS.
-func WithBoundOS() Option {
-	return func(o *options) {
-		o.Type = BoundOSFS
-	}
-}
-
-// WithChrootOS returns the option of using a Chroot filesystem OS.
-func WithChrootOS() Option {
-	return func(o *options) {
-		o.Type = ChrootOSFS
-	}
-}
-
-// WithDeduplicatePath toggles the deduplication of the base dir in the path.
-// This occurs when absolute links are being used.
-// Assuming base dir /base/dir and an absolute symlink /base/dir/target:
-//
-// With DeduplicatePath (default): /base/dir/target
-// Without DeduplicatePath: /base/dir/base/dir/target
-//
-// This option is only used by the BoundOS OS type.
-func WithDeduplicatePath(enabled bool) Option {
-	return func(o *options) {
-		o.deduplicatePath = enabled
-	}
-}
-
-type options struct {
-	Type
-	deduplicatePath bool
-}
-
-type Type int
-
-const (
-	ChrootOSFS Type = iota
-	BoundOSFS
-)
-
-func readDir(dir string) ([]os.FileInfo, error) {
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		return nil, err
-	}
-	infos := make([]fs.FileInfo, 0, len(entries))
-	for _, entry := range entries {
-		fi, err := entry.Info()
-		if err != nil {
-			return nil, err
-		}
-		infos = append(infos, fi)
-	}
-	return infos, nil
-}
-
-func tempFile(dir, prefix string) (billy.File, error) {
-	f, err := os.CreateTemp(dir, prefix)
-	if err != nil {
-		return nil, err
-	}
-	return &file{File: f}, nil
-}
-
-func openFile(fn string, flag int, perm os.FileMode, createDir func(string) error) (billy.File, error) {
-	if flag&os.O_CREATE != 0 {
-		if createDir == nil {
-			return nil, fmt.Errorf("createDir func cannot be nil if file needs to be opened in create mode")
-		}
-		if err := createDir(fn); err != nil {
-			return nil, err
-		}
-	}
-
-	f, err := os.OpenFile(fn, flag, perm)
-	if err != nil {
-		return nil, err
-	}
-	return &file{File: f}, err
-}
-
-// file is a wrapper for an os.File which adds support for file locking.
-type file struct {
-	*os.File
-	m sync.Mutex
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_bound.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_bound.go
deleted file mode 100644
index c0a610990..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_bound.go
+++ /dev/null
@@ -1,265 +0,0 @@
-//go:build !js
-// +build !js
-
-/*
-   Copyright 2022 The Flux authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package osfs
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	securejoin "github.com/cyphar/filepath-securejoin"
-	"github.com/go-git/go-billy/v5"
-)
-
-// BoundOS is a fs implementation based on the OS filesystem which is bound to
-// a base dir.
-// Prefer this fs implementation over ChrootOS.
-//
-// Behaviours of note:
-//  1. Read and write operations can only be directed to files which descends
-//     from the base dir.
-//  2. Symlinks don't have their targets modified, and therefore can point
-//     to locations outside the base dir or to non-existent paths.
-//  3. Readlink and Lstat ensures that the link file is located within the base
-//     dir, evaluating any symlinks that file or base dir may contain.
-type BoundOS struct {
-	baseDir         string
-	deduplicatePath bool
-}
-
-func newBoundOS(d string, deduplicatePath bool) billy.Filesystem {
-	return &BoundOS{baseDir: d, deduplicatePath: deduplicatePath}
-}
-
-func (fs *BoundOS) Create(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, defaultCreateMode)
-}
-
-func (fs *BoundOS) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
-	fn, err := fs.abs(filename)
-	if err != nil {
-		return nil, err
-	}
-	return openFile(fn, flag, perm, fs.createDir)
-}
-
-func (fs *BoundOS) ReadDir(path string) ([]os.FileInfo, error) {
-	dir, err := fs.abs(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return readDir(dir)
-}
-
-func (fs *BoundOS) Rename(from, to string) error {
-	f, err := fs.abs(from)
-	if err != nil {
-		return err
-	}
-	t, err := fs.abs(to)
-	if err != nil {
-		return err
-	}
-
-	// MkdirAll for target name.
-	if err := fs.createDir(t); err != nil {
-		return err
-	}
-
-	return os.Rename(f, t)
-}
-
-func (fs *BoundOS) MkdirAll(path string, perm os.FileMode) error {
-	dir, err := fs.abs(path)
-	if err != nil {
-		return err
-	}
-	return os.MkdirAll(dir, perm)
-}
-
-func (fs *BoundOS) Open(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDONLY, 0)
-}
-
-func (fs *BoundOS) Stat(filename string) (os.FileInfo, error) {
-	filename, err := fs.abs(filename)
-	if err != nil {
-		return nil, err
-	}
-	return os.Stat(filename)
-}
-
-func (fs *BoundOS) Remove(filename string) error {
-	fn, err := fs.abs(filename)
-	if err != nil {
-		return err
-	}
-	return os.Remove(fn)
-}
-
-// TempFile creates a temporary file. If dir is empty, the file
-// will be created within the OS Temporary dir. If dir is provided
-// it must descend from the current base dir.
-func (fs *BoundOS) TempFile(dir, prefix string) (billy.File, error) {
-	if dir != "" {
-		var err error
-		dir, err = fs.abs(dir)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return tempFile(dir, prefix)
-}
-
-func (fs *BoundOS) Join(elem ...string) string {
-	return filepath.Join(elem...)
-}
-
-func (fs *BoundOS) RemoveAll(path string) error {
-	dir, err := fs.abs(path)
-	if err != nil {
-		return err
-	}
-	return os.RemoveAll(dir)
-}
-
-func (fs *BoundOS) Symlink(target, link string) error {
-	ln, err := fs.abs(link)
-	if err != nil {
-		return err
-	}
-	// MkdirAll for containing dir.
-	if err := fs.createDir(ln); err != nil {
-		return err
-	}
-	return os.Symlink(target, ln)
-}
-
-func (fs *BoundOS) Lstat(filename string) (os.FileInfo, error) {
-	filename = filepath.Clean(filename)
-	if !filepath.IsAbs(filename) {
-		filename = filepath.Join(fs.baseDir, filename)
-	}
-	if ok, err := fs.insideBaseDirEval(filename); !ok {
-		return nil, err
-	}
-	return os.Lstat(filename)
-}
-
-func (fs *BoundOS) Readlink(link string) (string, error) {
-	if !filepath.IsAbs(link) {
-		link = filepath.Clean(filepath.Join(fs.baseDir, link))
-	}
-	if ok, err := fs.insideBaseDirEval(link); !ok {
-		return "", err
-	}
-	return os.Readlink(link)
-}
-
-// Chroot returns a new OS filesystem, with the base dir set to the
-// result of joining the provided path with the underlying base dir.
-func (fs *BoundOS) Chroot(path string) (billy.Filesystem, error) {
-	joined, err := securejoin.SecureJoin(fs.baseDir, path)
-	if err != nil {
-		return nil, err
-	}
-	return New(joined), nil
-}
-
-// Root returns the current base dir of the billy.Filesystem.
-// This is required in order for this implementation to be a drop-in
-// replacement for other upstream implementations (e.g. memory and osfs).
-func (fs *BoundOS) Root() string {
-	return fs.baseDir
-}
-
-func (fs *BoundOS) createDir(fullpath string) error {
-	dir := filepath.Dir(fullpath)
-	if dir != "." {
-		if err := os.MkdirAll(dir, defaultDirectoryMode); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// abs transforms filename to an absolute path, taking into account the base dir.
-// Relative paths won't be allowed to ascend the base dir, so `../file` will become
-// `/working-dir/file`.
-//
-// Note that if filename is a symlink, the returned address will be the target of the
-// symlink.
-func (fs *BoundOS) abs(filename string) (string, error) {
-	if filename == fs.baseDir {
-		filename = string(filepath.Separator)
-	}
-
-	path, err := securejoin.SecureJoin(fs.baseDir, filename)
-	if err != nil {
-		return "", nil
-	}
-
-	if fs.deduplicatePath {
-		vol := filepath.VolumeName(fs.baseDir)
-		dup := filepath.Join(fs.baseDir, fs.baseDir[len(vol):])
-		if strings.HasPrefix(path, dup+string(filepath.Separator)) {
-			return fs.abs(path[len(dup):])
-		}
-	}
-	return path, nil
-}
-
-// insideBaseDir checks whether filename is located within
-// the fs.baseDir.
-func (fs *BoundOS) insideBaseDir(filename string) (bool, error) {
-	if filename == fs.baseDir {
-		return true, nil
-	}
-	if !strings.HasPrefix(filename, fs.baseDir+string(filepath.Separator)) {
-		return false, fmt.Errorf("path outside base dir")
-	}
-	return true, nil
-}
-
-// insideBaseDirEval checks whether filename is contained within
-// a dir that is within the fs.baseDir, by first evaluating any symlinks
-// that either filename or fs.baseDir may contain.
-func (fs *BoundOS) insideBaseDirEval(filename string) (bool, error) {
-	// "/" contains all others.
-	if fs.baseDir == "/" {
-		return true, nil
-	}
-	dir, err := filepath.EvalSymlinks(filepath.Dir(filename))
-	if dir == "" || os.IsNotExist(err) {
-		dir = filepath.Dir(filename)
-	}
-	wd, err := filepath.EvalSymlinks(fs.baseDir)
-	if wd == "" || os.IsNotExist(err) {
-		wd = fs.baseDir
-	}
-	if filename != wd && dir != wd && !strings.HasPrefix(dir, wd+string(filepath.Separator)) {
-		return false, fmt.Errorf("%q: path outside base dir %q: %w", filename, fs.baseDir, os.ErrNotExist)
-	}
-	return true, nil
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_chroot.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_chroot.go
deleted file mode 100644
index fd65e773c..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_chroot.go
+++ /dev/null
@@ -1,112 +0,0 @@
-//go:build !js
-// +build !js
-
-package osfs
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/chroot"
-)
-
-// ChrootOS is a legacy filesystem based on a "soft chroot" of the os filesystem.
-// Although this is still the default os filesystem, consider using BoundOS instead.
-//
-// Behaviours of note:
-//  1. A "soft chroot" translates the base dir to "/" for the purposes of the
-//     fs abstraction.
-//  2. Symlinks targets may be modified to be kept within the chroot bounds.
-//  3. Some file modes does not pass-through the fs abstraction.
-//  4. The combination of 1 and 2 may cause go-git to think that a Git repository
-//     is dirty, when in fact it isn't.
-type ChrootOS struct{}
-
-func newChrootOS(baseDir string) billy.Filesystem {
-	return chroot.New(&ChrootOS{}, baseDir)
-}
-
-func (fs *ChrootOS) Create(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, defaultCreateMode)
-}
-
-func (fs *ChrootOS) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
-	return openFile(filename, flag, perm, fs.createDir)
-}
-
-func (fs *ChrootOS) createDir(fullpath string) error {
-	dir := filepath.Dir(fullpath)
-	if dir != "." {
-		if err := os.MkdirAll(dir, defaultDirectoryMode); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (fs *ChrootOS) ReadDir(dir string) ([]os.FileInfo, error) {
-	return readDir(dir)
-}
-
-func (fs *ChrootOS) Rename(from, to string) error {
-	if err := fs.createDir(to); err != nil {
-		return err
-	}
-
-	return rename(from, to)
-}
-
-func (fs *ChrootOS) MkdirAll(path string, perm os.FileMode) error {
-	return os.MkdirAll(path, defaultDirectoryMode)
-}
-
-func (fs *ChrootOS) Open(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDONLY, 0)
-}
-
-func (fs *ChrootOS) Stat(filename string) (os.FileInfo, error) {
-	return os.Stat(filename)
-}
-
-func (fs *ChrootOS) Remove(filename string) error {
-	return os.Remove(filename)
-}
-
-func (fs *ChrootOS) TempFile(dir, prefix string) (billy.File, error) {
-	if err := fs.createDir(dir + string(os.PathSeparator)); err != nil {
-		return nil, err
-	}
-
-	return tempFile(dir, prefix)
-}
-
-func (fs *ChrootOS) Join(elem ...string) string {
-	return filepath.Join(elem...)
-}
-
-func (fs *ChrootOS) RemoveAll(path string) error {
-	return os.RemoveAll(filepath.Clean(path))
-}
-
-func (fs *ChrootOS) Lstat(filename string) (os.FileInfo, error) {
-	return os.Lstat(filepath.Clean(filename))
-}
-
-func (fs *ChrootOS) Symlink(target, link string) error {
-	if err := fs.createDir(link); err != nil {
-		return err
-	}
-
-	return os.Symlink(target, link)
-}
-
-func (fs *ChrootOS) Readlink(link string) (string, error) {
-	return os.Readlink(link)
-}
-
-// Capabilities implements the Capable interface.
-func (fs *ChrootOS) Capabilities() billy.Capability {
-	return billy.DefaultCapabilities
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_js.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_js.go
deleted file mode 100644
index 2e58aa5c6..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_js.go
+++ /dev/null
@@ -1,25 +0,0 @@
-//go:build js
-// +build js
-
-package osfs
-
-import (
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/chroot"
-	"github.com/go-git/go-billy/v5/memfs"
-)
-
-// globalMemFs is the global memory fs
-var globalMemFs = memfs.New()
-
-// Default Filesystem representing the root of in-memory filesystem for a
-// js/wasm environment.
-var Default = memfs.New()
-
-// New returns a new OS filesystem.
-func New(baseDir string, _ ...Option) billy.Filesystem {
-	return chroot.New(Default, Default.Join("/", baseDir))
-}
-
-type options struct {
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_options.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_options.go
deleted file mode 100644
index 2f235c6dd..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_options.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package osfs
-
-type Option func(*options)
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_plan9.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_plan9.go
deleted file mode 100644
index 84020b52f..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_plan9.go
+++ /dev/null
@@ -1,91 +0,0 @@
-//go:build plan9
-// +build plan9
-
-package osfs
-
-import (
-	"io"
-	"os"
-	"path/filepath"
-	"syscall"
-)
-
-func (f *file) Lock() error {
-	// Plan 9 uses a mode bit instead of explicit lock/unlock syscalls.
-	//
-	// Per http://man.cat-v.org/plan_9/5/stat: “Exclusive use files may be open
-	// for I/O by only one fid at a time across all clients of the server. If a
-	// second open is attempted, it draws an error.”
-	//
-	// There is no obvious way to implement this function using the exclusive use bit.
-	// See https://golang.org/src/cmd/go/internal/lockedfile/lockedfile_plan9.go
-	// for how file locking is done by the go tool on Plan 9.
-	return nil
-}
-
-func (f *file) Unlock() error {
-	return nil
-}
-
-func rename(from, to string) error {
-	// If from and to are in different directories, copy the file
-	// since Plan 9 does not support cross-directory rename.
-	if filepath.Dir(from) != filepath.Dir(to) {
-		fi, err := os.Stat(from)
-		if err != nil {
-			return &os.LinkError{"rename", from, to, err}
-		}
-		if fi.Mode().IsDir() {
-			return &os.LinkError{"rename", from, to, syscall.EISDIR}
-		}
-		fromFile, err := os.Open(from)
-		if err != nil {
-			return &os.LinkError{"rename", from, to, err}
-		}
-		toFile, err := os.OpenFile(to, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
-		if err != nil {
-			return &os.LinkError{"rename", from, to, err}
-		}
-		_, err = io.Copy(toFile, fromFile)
-		if err != nil {
-			return &os.LinkError{"rename", from, to, err}
-		}
-
-		// Copy mtime and mode from original file.
-		// We need only one syscall if we avoid os.Chmod and os.Chtimes.
-		dir := fi.Sys().(*syscall.Dir)
-		var d syscall.Dir
-		d.Null()
-		d.Mtime = dir.Mtime
-		d.Mode = dir.Mode
-		if err = dirwstat(to, &d); err != nil {
-			return &os.LinkError{"rename", from, to, err}
-		}
-
-		// Remove original file.
-		err = os.Remove(from)
-		if err != nil {
-			return &os.LinkError{"rename", from, to, err}
-		}
-		return nil
-	}
-	return os.Rename(from, to)
-}
-
-func dirwstat(name string, d *syscall.Dir) error {
-	var buf [syscall.STATFIXLEN]byte
-
-	n, err := d.Marshal(buf[:])
-	if err != nil {
-		return &os.PathError{"dirwstat", name, err}
-	}
-	if err = syscall.Wstat(name, buf[:n]); err != nil {
-		return &os.PathError{"dirwstat", name, err}
-	}
-	return nil
-}
-
-func umask(new int) func() {
-	return func() {
-	}
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_posix.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_posix.go
deleted file mode 100644
index 6fb8273f1..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_posix.go
+++ /dev/null
@@ -1,38 +0,0 @@
-//go:build !plan9 && !windows && !wasm
-// +build !plan9,!windows,!wasm
-
-package osfs
-
-import (
-	"os"
-	"syscall"
-
-	"golang.org/x/sys/unix"
-)
-
-func (f *file) Lock() error {
-	f.m.Lock()
-	defer f.m.Unlock()
-
-	return unix.Flock(int(f.File.Fd()), unix.LOCK_EX)
-}
-
-func (f *file) Unlock() error {
-	f.m.Lock()
-	defer f.m.Unlock()
-
-	return unix.Flock(int(f.File.Fd()), unix.LOCK_UN)
-}
-
-func rename(from, to string) error {
-	return os.Rename(from, to)
-}
-
-// umask sets umask to a new value, and returns a func which allows the
-// caller to reset it back to what it was originally.
-func umask(new int) func() {
-	old := syscall.Umask(new)
-	return func() {
-		syscall.Umask(old)
-	}
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_wasip1.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_wasip1.go
deleted file mode 100644
index 79e6e3319..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_wasip1.go
+++ /dev/null
@@ -1,34 +0,0 @@
-//go:build wasip1
-// +build wasip1
-
-package osfs
-
-import (
-	"os"
-	"syscall"
-)
-
-func (f *file) Lock() error {
-	f.m.Lock()
-	defer f.m.Unlock()
-	return nil
-}
-
-func (f *file) Unlock() error {
-	f.m.Lock()
-	defer f.m.Unlock()
-	return nil
-}
-
-func rename(from, to string) error {
-	return os.Rename(from, to)
-}
-
-// umask sets umask to a new value, and returns a func which allows the
-// caller to reset it back to what it was originally.
-func umask(new int) func() {
-	old := syscall.Umask(new)
-	return func() {
-		syscall.Umask(old)
-	}
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/osfs/os_windows.go b/vendor/github.com/go-git/go-billy/v5/osfs/os_windows.go
deleted file mode 100644
index e54df748e..000000000
--- a/vendor/github.com/go-git/go-billy/v5/osfs/os_windows.go
+++ /dev/null
@@ -1,58 +0,0 @@
-//go:build windows
-// +build windows
-
-package osfs
-
-import (
-	"os"
-	"runtime"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	kernel32DLL    = windows.NewLazySystemDLL("kernel32.dll")
-	lockFileExProc = kernel32DLL.NewProc("LockFileEx")
-	unlockFileProc = kernel32DLL.NewProc("UnlockFile")
-)
-
-const (
-	lockfileExclusiveLock = 0x2
-)
-
-func (f *file) Lock() error {
-	f.m.Lock()
-	defer f.m.Unlock()
-
-	var overlapped windows.Overlapped
-	// err is always non-nil as per sys/windows semantics.
-	ret, _, err := lockFileExProc.Call(f.File.Fd(), lockfileExclusiveLock, 0, 0xFFFFFFFF, 0,
-		uintptr(unsafe.Pointer(&overlapped)))
-	runtime.KeepAlive(&overlapped)
-	if ret == 0 {
-		return err
-	}
-	return nil
-}
-
-func (f *file) Unlock() error {
-	f.m.Lock()
-	defer f.m.Unlock()
-
-	// err is always non-nil as per sys/windows semantics.
-	ret, _, err := unlockFileProc.Call(f.File.Fd(), 0, 0, 0xFFFFFFFF, 0)
-	if ret == 0 {
-		return err
-	}
-	return nil
-}
-
-func rename(from, to string) error {
-	return os.Rename(from, to)
-}
-
-func umask(new int) func() {
-	return func() {
-	}
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/util/glob.go b/vendor/github.com/go-git/go-billy/v5/util/glob.go
deleted file mode 100644
index f7cb1de89..000000000
--- a/vendor/github.com/go-git/go-billy/v5/util/glob.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package util
-
-import (
-	"path/filepath"
-	"sort"
-	"strings"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// Glob returns the names of all files matching pattern or nil
-// if there is no matching file. The syntax of patterns is the same
-// as in Match. The pattern may describe hierarchical names such as
-// /usr/*/bin/ed (assuming the Separator is '/').
-//
-// Glob ignores file system errors such as I/O errors reading directories.
-// The only possible returned error is ErrBadPattern, when pattern
-// is malformed.
-//
-// Function originally from https://golang.org/src/path/filepath/match_test.go
-func Glob(fs billy.Filesystem, pattern string) (matches []string, err error) {
-	if !hasMeta(pattern) {
-		if _, err = fs.Lstat(pattern); err != nil {
-			return nil, nil
-		}
-		return []string{pattern}, nil
-	}
-
-	dir, file := filepath.Split(pattern)
-	// Prevent infinite recursion. See issue 15879.
-	if dir == pattern {
-		return nil, filepath.ErrBadPattern
-	}
-
-	var m []string
-	m, err = Glob(fs, cleanGlobPath(dir))
-	if err != nil {
-		return
-	}
-	for _, d := range m {
-		matches, err = glob(fs, d, file, matches)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// cleanGlobPath prepares path for glob matching.
-func cleanGlobPath(path string) string {
-	switch path {
-	case "":
-		return "."
-	case string(filepath.Separator):
-		// do nothing to the path
-		return path
-	default:
-		return path[0 : len(path)-1] // chop off trailing separator
-	}
-}
-
-// glob searches for files matching pattern in the directory dir
-// and appends them to matches. If the directory cannot be
-// opened, it returns the existing matches. New matches are
-// added in lexicographical order.
-func glob(fs billy.Filesystem, dir, pattern string, matches []string) (m []string, e error) {
-	m = matches
-	fi, err := fs.Stat(dir)
-	if err != nil {
-		return
-	}
-
-	if !fi.IsDir() {
-		return
-	}
-
-	names, _ := readdirnames(fs, dir)
-	sort.Strings(names)
-
-	for _, n := range names {
-		matched, err := filepath.Match(pattern, n)
-		if err != nil {
-			return m, err
-		}
-		if matched {
-			m = append(m, filepath.Join(dir, n))
-		}
-	}
-	return
-}
-
-// hasMeta reports whether path contains any of the magic characters
-// recognized by Match.
-func hasMeta(path string) bool {
-	// TODO(niemeyer): Should other magic characters be added here?
-	return strings.ContainsAny(path, "*?[")
-}
-
-func readdirnames(fs billy.Filesystem, dir string) ([]string, error) {
-	files, err := fs.ReadDir(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	var names []string
-	for _, file := range files {
-		names = append(names, file.Name())
-	}
-
-	return names, nil
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/util/util.go b/vendor/github.com/go-git/go-billy/v5/util/util.go
deleted file mode 100644
index 2cdd832c7..000000000
--- a/vendor/github.com/go-git/go-billy/v5/util/util.go
+++ /dev/null
@@ -1,287 +0,0 @@
-package util
-
-import (
-	"errors"
-	"io"
-	"os"
-	"path/filepath"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// RemoveAll removes path and any children it contains. It removes everything it
-// can but returns the first error it encounters. If the path does not exist,
-// RemoveAll returns nil (no error).
-func RemoveAll(fs billy.Basic, path string) error {
-	fs, path = getUnderlyingAndPath(fs, path)
-
-	if r, ok := fs.(removerAll); ok {
-		return r.RemoveAll(path)
-	}
-
-	return removeAll(fs, path)
-}
-
-type removerAll interface {
-	RemoveAll(string) error
-}
-
-func removeAll(fs billy.Basic, path string) error {
-	// This implementation is adapted from os.RemoveAll.
-
-	// Simple case: if Remove works, we're done.
-	err := fs.Remove(path)
-	if err == nil || errors.Is(err, os.ErrNotExist) {
-		return nil
-	}
-
-	// Otherwise, is this a directory we need to recurse into?
-	dir, serr := fs.Stat(path)
-	if serr != nil {
-		if errors.Is(serr, os.ErrNotExist) {
-			return nil
-		}
-
-		return serr
-	}
-
-	if !dir.IsDir() {
-		// Not a directory; return the error from Remove.
-		return err
-	}
-
-	dirfs, ok := fs.(billy.Dir)
-	if !ok {
-		return billy.ErrNotSupported
-	}
-
-	// Directory.
-	fis, err := dirfs.ReadDir(path)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			// Race. It was deleted between the Lstat and Open.
-			// Return nil per RemoveAll's docs.
-			return nil
-		}
-
-		return err
-	}
-
-	// Remove contents & return first error.
-	err = nil
-	for _, fi := range fis {
-		cpath := fs.Join(path, fi.Name())
-		err1 := removeAll(fs, cpath)
-		if err == nil {
-			err = err1
-		}
-	}
-
-	// Remove directory.
-	err1 := fs.Remove(path)
-	if err1 == nil || errors.Is(err1, os.ErrNotExist) {
-		return nil
-	}
-
-	if err == nil {
-		err = err1
-	}
-
-	return err
-
-}
-
-// WriteFile writes data to a file named by filename in the given filesystem.
-// If the file does not exist, WriteFile creates it with permissions perm;
-// otherwise WriteFile truncates it before writing.
-func WriteFile(fs billy.Basic, filename string, data []byte, perm os.FileMode) (err error) {
-	f, err := fs.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if f != nil {
-			err1 := f.Close()
-			if err == nil {
-				err = err1
-			}
-		}
-	}()
-
-	n, err := f.Write(data)
-	if err == nil && n < len(data) {
-		err = io.ErrShortWrite
-	}
-
-	return nil
-}
-
-// Random number state.
-// We generate random temporary file names so that there's a good
-// chance the file doesn't exist yet - keeps the number of tries in
-// TempFile to a minimum.
-var rand uint32
-var randmu sync.Mutex
-
-func reseed() uint32 {
-	return uint32(time.Now().UnixNano() + int64(os.Getpid()))
-}
-
-func nextSuffix() string {
-	randmu.Lock()
-	r := rand
-	if r == 0 {
-		r = reseed()
-	}
-	r = r*1664525 + 1013904223 // constants from Numerical Recipes
-	rand = r
-	randmu.Unlock()
-	return strconv.Itoa(int(1e9 + r%1e9))[1:]
-}
-
-// TempFile creates a new temporary file in the directory dir with a name
-// beginning with prefix, opens the file for reading and writing, and returns
-// the resulting *os.File. If dir is the empty string, TempFile uses the default
-// directory for temporary files (see os.TempDir). Multiple programs calling
-// TempFile simultaneously will not choose the same file. The caller can use
-// f.Name() to find the pathname of the file. It is the caller's responsibility
-// to remove the file when no longer needed.
-func TempFile(fs billy.Basic, dir, prefix string) (f billy.File, err error) {
-	// This implementation is based on stdlib ioutil.TempFile.
-	if dir == "" {
-		dir = getTempDir(fs)
-	}
-
-	nconflict := 0
-	for i := 0; i < 10000; i++ {
-		name := filepath.Join(dir, prefix+nextSuffix())
-		f, err = fs.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
-		if errors.Is(err, os.ErrExist) {
-			if nconflict++; nconflict > 10 {
-				randmu.Lock()
-				rand = reseed()
-				randmu.Unlock()
-			}
-			continue
-		}
-		break
-	}
-	return
-}
-
-// TempDir creates a new temporary directory in the directory dir
-// with a name beginning with prefix and returns the path of the
-// new directory. If dir is the empty string, TempDir uses the
-// default directory for temporary files (see os.TempDir).
-// Multiple programs calling TempDir simultaneously
-// will not choose the same directory. It is the caller's responsibility
-// to remove the directory when no longer needed.
-func TempDir(fs billy.Dir, dir, prefix string) (name string, err error) {
-	// This implementation is based on stdlib ioutil.TempDir
-
-	if dir == "" {
-		dir = getTempDir(fs.(billy.Basic))
-	}
-
-	nconflict := 0
-	for i := 0; i < 10000; i++ {
-		try := filepath.Join(dir, prefix+nextSuffix())
-		err = fs.MkdirAll(try, 0700)
-		if errors.Is(err, os.ErrExist) {
-			if nconflict++; nconflict > 10 {
-				randmu.Lock()
-				rand = reseed()
-				randmu.Unlock()
-			}
-			continue
-		}
-		if errors.Is(err, os.ErrNotExist) {
-			if _, err := os.Stat(dir); errors.Is(err, os.ErrNotExist) {
-				return "", err
-			}
-		}
-		if err == nil {
-			name = try
-		}
-		break
-	}
-	return
-}
-
-func getTempDir(fs billy.Basic) string {
-	ch, ok := fs.(billy.Chroot)
-	if !ok || ch.Root() == "" || ch.Root() == "/" || ch.Root() == string(filepath.Separator) {
-		return os.TempDir()
-	}
-
-	return ".tmp"
-}
-
-type underlying interface {
-	Underlying() billy.Basic
-}
-
-func getUnderlyingAndPath(fs billy.Basic, path string) (billy.Basic, string) {
-	u, ok := fs.(underlying)
-	if !ok {
-		return fs, path
-	}
-	if ch, ok := fs.(billy.Chroot); ok {
-		path = fs.Join(ch.Root(), path)
-	}
-
-	return u.Underlying(), path
-}
-
-// ReadFile reads the named file and returns the contents from the given filesystem.
-// A successful call returns err == nil, not err == EOF.
-// Because ReadFile reads the whole file, it does not treat an EOF from Read
-// as an error to be reported.
-func ReadFile(fs billy.Basic, name string) ([]byte, error) {
-	f, err := fs.Open(name)
-	if err != nil {
-		return nil, err
-	}
-
-	defer f.Close()
-
-	var size int
-	if info, err := fs.Stat(name); err == nil {
-		size64 := info.Size()
-		if int64(int(size64)) == size64 {
-			size = int(size64)
-		}
-	}
-
-	size++ // one byte for final read at EOF
-	// If a file claims a small size, read at least 512 bytes.
-	// In particular, files in Linux's /proc claim size 0 but
-	// then do not work right if read in small pieces,
-	// so an initial read of 1 byte would not work correctly.
-
-	if size < 512 {
-		size = 512
-	}
-
-	data := make([]byte, 0, size)
-	for {
-		if len(data) >= cap(data) {
-			d := append(data[:cap(data)], 0)
-			data = d[:len(data)]
-		}
-
-		n, err := f.Read(data[len(data):cap(data)])
-		data = data[:len(data)+n]
-
-		if err != nil {
-			if errors.Is(err, io.EOF) {
-				err = nil
-			}
-
-			return data, err
-		}
-	}
-}
diff --git a/vendor/github.com/go-git/go-billy/v5/util/walk.go b/vendor/github.com/go-git/go-billy/v5/util/walk.go
deleted file mode 100644
index 1531bcaaa..000000000
--- a/vendor/github.com/go-git/go-billy/v5/util/walk.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package util
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// walk recursively descends path, calling walkFn
-// adapted from https://golang.org/src/path/filepath/path.go
-func walk(fs billy.Filesystem, path string, info os.FileInfo, walkFn filepath.WalkFunc) error {
-	if !info.IsDir() {
-		return walkFn(path, info, nil)
-	}
-
-	names, err := readdirnames(fs, path)
-	err1 := walkFn(path, info, err)
-	// If err != nil, walk can't walk into this directory.
-	// err1 != nil means walkFn want walk to skip this directory or stop walking.
-	// Therefore, if one of err and err1 isn't nil, walk will return.
-	if err != nil || err1 != nil {
-		// The caller's behavior is controlled by the return value, which is decided
-		// by walkFn. walkFn may ignore err and return nil.
-		// If walkFn returns SkipDir, it will be handled by the caller.
-		// So walk should return whatever walkFn returns.
-		return err1
-	}
-
-	for _, name := range names {
-		filename := filepath.Join(path, name)
-		fileInfo, err := fs.Lstat(filename)
-		if err != nil {
-			if err := walkFn(filename, fileInfo, err); err != nil && err != filepath.SkipDir {
-				return err
-			}
-		} else {
-			err = walk(fs, filename, fileInfo, walkFn)
-			if err != nil {
-				if !fileInfo.IsDir() || err != filepath.SkipDir {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// Walk walks the file tree rooted at root, calling fn for each file or 
-// directory in the tree, including root. All errors that arise visiting files
-// and directories are filtered by fn: see the WalkFunc documentation for
-// details.
-//
-// The files are walked in lexical order, which makes the output deterministic
-// but requires Walk to read an entire directory into memory before proceeding
-// to walk that directory. Walk does not follow symbolic links.
-// 
-// Function adapted from https://github.com/golang/go/blob/3b770f2ccb1fa6fecc22ea822a19447b10b70c5c/src/path/filepath/path.go#L500
-func Walk(fs billy.Filesystem, root string, walkFn filepath.WalkFunc) error {
-	info, err := fs.Lstat(root)
-	if err != nil {
-		err = walkFn(root, nil, err)
-	} else {
-		err = walk(fs, root, info, walkFn)
-	}
-	
-	if err == filepath.SkipDir {
-		return nil
-	}
-	
-	return err
-}
diff --git a/vendor/github.com/golang/groupcache/LICENSE b/vendor/github.com/golang/groupcache/LICENSE
deleted file mode 100644
index 37ec93a14..000000000
--- a/vendor/github.com/golang/groupcache/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/golang/groupcache/lru/lru.go b/vendor/github.com/golang/groupcache/lru/lru.go
deleted file mode 100644
index eac1c7664..000000000
--- a/vendor/github.com/golang/groupcache/lru/lru.go
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-Copyright 2013 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package lru implements an LRU cache.
-package lru
-
-import "container/list"
-
-// Cache is an LRU cache. It is not safe for concurrent access.
-type Cache struct {
-	// MaxEntries is the maximum number of cache entries before
-	// an item is evicted. Zero means no limit.
-	MaxEntries int
-
-	// OnEvicted optionally specifies a callback function to be
-	// executed when an entry is purged from the cache.
-	OnEvicted func(key Key, value interface{})
-
-	ll    *list.List
-	cache map[interface{}]*list.Element
-}
-
-// A Key may be any value that is comparable. See http://golang.org/ref/spec#Comparison_operators
-type Key interface{}
-
-type entry struct {
-	key   Key
-	value interface{}
-}
-
-// New creates a new Cache.
-// If maxEntries is zero, the cache has no limit and it's assumed
-// that eviction is done by the caller.
-func New(maxEntries int) *Cache {
-	return &Cache{
-		MaxEntries: maxEntries,
-		ll:         list.New(),
-		cache:      make(map[interface{}]*list.Element),
-	}
-}
-
-// Add adds a value to the cache.
-func (c *Cache) Add(key Key, value interface{}) {
-	if c.cache == nil {
-		c.cache = make(map[interface{}]*list.Element)
-		c.ll = list.New()
-	}
-	if ee, ok := c.cache[key]; ok {
-		c.ll.MoveToFront(ee)
-		ee.Value.(*entry).value = value
-		return
-	}
-	ele := c.ll.PushFront(&entry{key, value})
-	c.cache[key] = ele
-	if c.MaxEntries != 0 && c.ll.Len() > c.MaxEntries {
-		c.RemoveOldest()
-	}
-}
-
-// Get looks up a key's value from the cache.
-func (c *Cache) Get(key Key) (value interface{}, ok bool) {
-	if c.cache == nil {
-		return
-	}
-	if ele, hit := c.cache[key]; hit {
-		c.ll.MoveToFront(ele)
-		return ele.Value.(*entry).value, true
-	}
-	return
-}
-
-// Remove removes the provided key from the cache.
-func (c *Cache) Remove(key Key) {
-	if c.cache == nil {
-		return
-	}
-	if ele, hit := c.cache[key]; hit {
-		c.removeElement(ele)
-	}
-}
-
-// RemoveOldest removes the oldest item from the cache.
-func (c *Cache) RemoveOldest() {
-	if c.cache == nil {
-		return
-	}
-	ele := c.ll.Back()
-	if ele != nil {
-		c.removeElement(ele)
-	}
-}
-
-func (c *Cache) removeElement(e *list.Element) {
-	c.ll.Remove(e)
-	kv := e.Value.(*entry)
-	delete(c.cache, kv.key)
-	if c.OnEvicted != nil {
-		c.OnEvicted(kv.key, kv.value)
-	}
-}
-
-// Len returns the number of items in the cache.
-func (c *Cache) Len() int {
-	if c.cache == nil {
-		return 0
-	}
-	return c.ll.Len()
-}
-
-// Clear purges all stored items from the cache.
-func (c *Cache) Clear() {
-	if c.OnEvicted != nil {
-		for _, e := range c.cache {
-			kv := e.Value.(*entry)
-			c.OnEvicted(kv.key, kv.value)
-		}
-	}
-	c.ll = nil
-	c.cache = nil
-}
diff --git a/vendor/github.com/gookit/color/.gitignore b/vendor/github.com/gookit/color/.gitignore
index 5efa5e3f0..e726419b9 100644
--- a/vendor/github.com/gookit/color/.gitignore
+++ b/vendor/github.com/gookit/color/.gitignore
@@ -15,6 +15,8 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+*.cov
 .DS_Store
 app
 demo
+.xenv.toml
\ No newline at end of file
diff --git a/vendor/github.com/kevinburke/ssh_config/.gitignore b/vendor/github.com/gookit/color/.nojekyll
similarity index 100%
rename from vendor/github.com/kevinburke/ssh_config/.gitignore
rename to vendor/github.com/gookit/color/.nojekyll
diff --git a/vendor/github.com/gookit/color/README.md b/vendor/github.com/gookit/color/README.md
index 134181dc6..916ef080f 100644
--- a/vendor/github.com/gookit/color/README.md
+++ b/vendor/github.com/gookit/color/README.md
@@ -2,14 +2,13 @@
 
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/gookit/color?style=flat-square)
 [![Actions Status](https://github.com/gookit/color/workflows/action-tests/badge.svg)](https://github.com/gookit/color/actions)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/51b28c5f7ffe4cc2b0f12ecf25ed247f)](https://app.codacy.com/app/inhere/color)
-[![GoDoc](https://godoc.org/github.com/gookit/color?status.svg)](https://pkg.go.dev/github.com/gookit/color?tab=overview)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/7fef8d74c1d64afc99ce0f2c6d3f8af1)](https://www.codacy.com/gh/gookit/color/dashboard?utm_source=github.com&utm_medium=referral&utm_content=gookit/color&utm_campaign=Badge_Grade)
+[![GoDoc](https://pkg.go.dev/badge/github.com/gookit/color.svg)](https://pkg.go.dev/github.com/gookit/color?tab=overview)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gookit/color)](https://github.com/gookit/color)
-[![Build Status](https://travis-ci.org/gookit/color.svg?branch=master)](https://travis-ci.org/gookit/color)
 [![Coverage Status](https://coveralls.io/repos/github/gookit/color/badge.svg?branch=master)](https://coveralls.io/github/gookit/color?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gookit/color)](https://goreportcard.com/report/github.com/gookit/color)
 
-A command-line color library with true color support, universal API methods and Windows support.
+A command-line color library with 16/256/True color support, universal API methods and Windows support.
 
 > **[中文说明](README.zh-CN.md)**
 
@@ -28,8 +27,9 @@ Now, 256 colors and RGB colors have also been supported to work in Windows CMD a
     - 16-color output is the most commonly used and most widely supported, working on any Windows version
     - Since `v1.2.4` **the 256-color (8-bit), true color (24-bit) support windows CMD and PowerShell**
     - See [this gist](https://gist.github.com/XVilka/8346728) for information on true color support
+  - Support converts `HEX` `HSL` value to RGB color
   - Generic API methods: `Print`, `Printf`, `Println`, `Sprint`, `Sprintf`
-  - Supports HTML tag-style color rendering, such as `message`.
+  - Supports HTML tag-style color rendering, such as `message text`.
     - In addition to using built-in tags, it also supports custom color attributes
     - Custom color attributes support the use of 16 color names, 256 color values, rgb color values and hex color values
     - Support working on Windows `cmd` and `powerShell` terminal
@@ -40,8 +40,7 @@ Now, 256 colors and RGB colors have also been supported to work in Windows CMD a
 
 ## GoDoc
 
-  - [godoc for gopkg](https://pkg.go.dev/gopkg.in/gookit/color.v1)
-  - [godoc for github](https://pkg.go.dev/github.com/gookit/color)
+See [godoc for github](https://pkg.go.dev/github.com/gookit/color)
 
 ## Install
 
@@ -120,11 +119,6 @@ Supported on any Windows version. Provide generic API methods: `Print`, `Printf`
 
 ```go
 color.Bold.Println("bold message")
-color.Black.Println("bold message")
-color.White.Println("bold message")
-color.Gray.Println("bold message")
-color.Red.Println("yellow message")
-color.Blue.Println("yellow message")
 color.Cyan.Println("yellow message")
 color.Yellow.Println("yellow message")
 color.Magenta.Println("yellow message")
@@ -171,15 +165,9 @@ print message use defined style:
 
 ```go
 color.Info.Println("Info message")
-color.Note.Println("Note message")
 color.Notice.Println("Notice message")
 color.Error.Println("Error message")
-color.Danger.Println("Danger message")
-color.Warn.Println("Warn message")
-color.Debug.Println("Debug message")
-color.Primary.Println("Primary message")
-color.Question.Println("Question message")
-color.Secondary.Println("Secondary message")
+// ...
 ```
 
 Run demo: `go run ./_examples/theme_basic.go`
@@ -190,14 +178,8 @@ Run demo: `go run ./_examples/theme_basic.go`
 
 ```go
 color.Info.Tips("Info tips message")
-color.Note.Tips("Note tips message")
 color.Notice.Tips("Notice tips message")
 color.Error.Tips("Error tips message")
-color.Danger.Tips("Danger tips message")
-color.Warn.Tips("Warn tips message")
-color.Debug.Tips("Debug tips message")
-color.Primary.Tips("Primary tips message")
-color.Question.Tips("Question tips message")
 color.Secondary.Tips("Secondary tips message")
 ```
 
@@ -209,15 +191,9 @@ Run demo: `go run ./_examples/theme_tips.go`
 
 ```go
 color.Info.Prompt("Info prompt message")
-color.Note.Prompt("Note prompt message")
 color.Notice.Prompt("Notice prompt message")
 color.Error.Prompt("Error prompt message")
-color.Danger.Prompt("Danger prompt message")
-color.Warn.Prompt("Warn prompt message")
-color.Debug.Prompt("Debug prompt message")
-color.Primary.Prompt("Primary prompt message")
-color.Question.Prompt("Question prompt message")
-color.Secondary.Prompt("Secondary prompt message")
+// ...
 ```
 
 Run demo: `go run ./_examples/theme_prompt.go`
@@ -227,16 +203,9 @@ Run demo: `go run ./_examples/theme_prompt.go`
 **Block Style**
 
 ```go
-color.Info.Block("Info block message")
-color.Note.Block("Note block message")
-color.Notice.Block("Notice block message")
-color.Error.Block("Error block message")
 color.Danger.Block("Danger block message")
 color.Warn.Block("Warn block message")
-color.Debug.Block("Debug block message")
-color.Primary.Block("Primary block message")
-color.Question.Block("Question block message")
-color.Secondary.Block("Secondary block message")
+// ...
 ```
 
 Run demo: `go run ./_examples/theme_block.go`
@@ -371,7 +340,32 @@ s.Printf("style with %s\n", "options")
 
 ## HTML-like tag usage
 
-**Supported** on Windows `cmd.exe` `PowerShell` .
+`Print,Printf,Println` functions support auto parse and render color tags.
+
+```go
+	text := `
+  gookit/color:
+     A command-line 
+     color library with 256-color
+     and True-color support,
+     universal API methods
+     and Windows support.
+`
+	color.Print(text)
+```
+
+Preview, code please see [_examples/demo_tag.go](_examples/demo_tag.go):
+
+![demo_tag](_examples/images/demo_tag.png)
+
+**Tag formats:**
+
+- Use built in tags: `CONTENT` e.g: `message`
+- Custom tag attributes: `CONTENT` e.g: `wel`
+
+> **Supported** on Windows `cmd.exe` `PowerShell`.
+
+Examples:
 
 ```go
 // use style tag
@@ -386,8 +380,55 @@ color.Print("hello, welcome\n")
 // Custom label attr: Supports the use of 16 color names, 256 color values, rgb color values and hex color values
 color.Println("hello, welcome")
 ```
+ 
+### Tag attributes
 
-- `color.Tag`
+tag attributes format:
+
+```text
+attr format:
+ // VALUE please see var: FgColors, BgColors, AllOptions
+ "fg=VALUE;bg=VALUE;op=VALUE"
+
+16 color:
+ "fg=yellow"
+ "bg=red"
+ "op=bold,underscore" // option is allow multi value
+ "fg=white;bg=blue;op=bold"
+ "fg=white;op=bold,underscore"
+
+256 color:
+ "fg=167"
+ "fg=167;bg=23"
+ "fg=167;bg=23;op=bold"
+ 
+True color:
+ // hex
+ "fg=fc1cac"
+ "fg=fc1cac;bg=c2c3c4"
+ // r,g,b
+ "fg=23,45,214"
+ "fg=23,45,214;bg=109,99,88"
+```
+
+> tag attributes parse please see `func ParseCodeFromAttr()`
+
+### Built-in tags
+
+Built-in tags please see var `colorTags` in [color_tag.go](color_tag.go)
+
+```go
+// use style tag
+color.Print("hello, welcome")
+color.Println("hello")
+color.Println("hello")
+```
+
+Run demo: `go run ./_examples/color_tag.go`
+
+![color-tags](_examples/images/color-tags.png)
+
+**Use `color.Tag` build message**:
 
 ```go
 // set a style tag
@@ -396,10 +437,6 @@ color.Tag("info").Printf("%s style text", "info")
 color.Tag("info").Println("info style text")
 ```
 
-Run demo: `go run ./_examples/color_tag.go`
-
-![color-tags](_examples/images/color-tags.png)
-
 ## Color convert
 
 Supports conversion between Rgb, 256, 16 colors, `Rgb <=> 256 <=> 16`
@@ -417,7 +454,49 @@ rgb.Println("rgb color")
 rgb.C256().Println("256 color")
 ```
 
-## Func refer
+### Convert utils
+
+`color` has many built-in color conversion utility functions.
+
+```go
+func Basic2hex(val uint8) string
+
+func Bg2Fg(val uint8) uint8
+func Fg2Bg(val uint8) uint8
+
+func C256ToRgb(val uint8) (rgb []uint8)
+func C256ToRgbV1(val uint8) (rgb []uint8)
+
+func Hex2basic(hex string, asBg ...bool) uint8
+func Hex2rgb(hex string) []int
+func HexToRGB(hex string) []int
+func HexToRgb(hex string) (rgb []int)
+
+func HslIntToRgb(h, s, l int) (rgb []uint8)
+func HslToRgb(h, s, l float64) (rgb []uint8)
+func HsvToRgb(h, s, v int) (rgb []uint8)
+
+func Rgb2ansi(r, g, b uint8, isBg bool) uint8
+func Rgb2basic(r, g, b uint8, isBg bool) uint8
+func Rgb2hex(rgb []int) string
+func Rgb2short(r, g, b uint8) uint8
+func RgbTo256(r, g, b uint8) uint8
+func RgbTo256Table() map[string]uint8
+func RgbToAnsi(r, g, b uint8, isBg bool) uint8
+func RgbToHex(rgb []int) string
+func RgbToHsl(r, g, b uint8) []float64
+func RgbToHslInt(r, g, b uint8) []int
+```
+
+**Convert to `RGBColor`**:
+
+- `func RGBFromSlice(rgb []uint8, isBg ...bool) RGBColor`
+- `func RGBFromString(rgb string, isBg ...bool) RGBColor`
+- `func HEX(hex string, isBg ...bool) RGBColor`
+- `func HSL(h, s, l float64, isBg ...bool) RGBColor`
+- `func HSLInt(h, s, l int, isBg ...bool) RGBColor`
+
+## Util functions
 
 There are some useful functions reference
 
@@ -428,15 +507,45 @@ There are some useful functions reference
 - `ClearCode(str string) string` Use for clear color codes
 - `ClearTag(s string) string` clear all color html-tag for a string
 - `IsConsole(w io.Writer)` Determine whether w is one of stderr, stdout, stdin
-- `HexToRgb(hex string) (rgb []int)` Convert hex color string to RGB numbers
-- `RgbToHex(rgb []int) string` Convert RGB to hex code
-- More useful func please see https://pkg.go.dev/github.com/gookit/color
 
-## Project use
+> More useful func please see https://pkg.go.dev/github.com/gookit/color
+
+### Detect color level
+
+`color` automatically checks the color levels supported by the current environment.
+
+```go
+// Level is the color level supported by a terminal.
+type Level = terminfo.ColorLevel
+
+// terminal color available level alias of the terminfo.ColorLevel*
+const (
+	LevelNo  = terminfo.ColorLevelNone     // not support color.
+	Level16  = terminfo.ColorLevelBasic    // basic - 3/4 bit color supported
+	Level256 = terminfo.ColorLevelHundreds // hundreds - 8-bit color supported
+	LevelRgb = terminfo.ColorLevelMillions // millions - (24 bit)true color supported
+)
+```
+
+- `func SupportColor() bool` Whether the current environment supports color output
+- `func Support256Color() bool` Whether the current environment supports 256-color output
+- `func SupportTrueColor() bool` Whether the current environment supports (RGB)True-color output
+- `func TermColorLevel() Level` Get the currently supported color level
+
+
+## Projects using color
 
 Check out these projects, which use https://github.com/gookit/color :
 
 - https://github.com/Delta456/box-cli-maker Make Highly Customized Boxes for your CLI
+- https://github.com/flipped-aurora/gin-vue-admin 基于gin+vue搭建的（中）后台系统框架
+- https://github.com/JanDeDobbeleer/oh-my-posh A prompt theme engine for any shell.
+- https://github.com/jesseduffield/lazygit Simple terminal UI for git commands
+- https://github.com/olivia-ai/olivia 💁‍♀️Your new best friend powered by an artificial neural network  
+- https://github.com/pterm/pterm PTerm is a modern Go module to beautify console output. Featuring charts, progressbars, tables, trees, etc.
+- https://github.com/securego/gosec Golang security checker
+- https://github.com/TNK-Studio/lazykube ⎈ The lazier way to manage kubernetes.
+- [+ See More](https://pkg.go.dev/github.com/gookit/color?tab=importedby)
 
 ## Gookit packages
 
@@ -459,6 +568,7 @@ Check out these projects, which use https://github.com/gookit/color :
   - [xo/terminfo](https://github.com/xo/terminfo)
   - [beego/bee](https://github.com/beego/bee)
   - [issue9/term](https://github.com/issue9/term)
+  - [muesli/termenv](https://github.com/muesli/termenv)
   - [ANSI escape code](https://en.wikipedia.org/wiki/ANSI_escape_code)
   - [Standard ANSI color map](https://conemu.github.io/en/AnsiEscapeCodes.html#Standard_ANSI_color_map)
   - [Terminal Colors](https://gist.github.com/XVilka/8346728)
diff --git a/vendor/github.com/gookit/color/README.zh-CN.md b/vendor/github.com/gookit/color/README.zh-CN.md
index dee1458b0..6abd5cfe8 100644
--- a/vendor/github.com/gookit/color/README.zh-CN.md
+++ b/vendor/github.com/gookit/color/README.zh-CN.md
@@ -2,14 +2,13 @@
 
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/gookit/color?style=flat-square)
 [![Actions Status](https://github.com/gookit/color/workflows/action-tests/badge.svg)](https://github.com/gookit/color/actions)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/51b28c5f7ffe4cc2b0f12ecf25ed247f)](https://app.codacy.com/app/inhere/color)
-[![GoDoc](https://godoc.org/github.com/gookit/color?status.svg)](https://pkg.go.dev/github.com/gookit/color?tab=overview)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/7fef8d74c1d64afc99ce0f2c6d3f8af1)](https://www.codacy.com/gh/gookit/color/dashboard?utm_source=github.com&utm_medium=referral&utm_content=gookit/color&utm_campaign=Badge_Grade)
+[![GoDoc](https://pkg.go.dev/badge/github.com/gookit/color.svg)](https://pkg.go.dev/github.com/gookit/color?tab=overview)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gookit/color)](https://github.com/gookit/color)
-[![Build Status](https://travis-ci.org/gookit/color.svg?branch=master)](https://travis-ci.org/gookit/color)
 [![Coverage Status](https://coveralls.io/repos/github/gookit/color/badge.svg?branch=master)](https://coveralls.io/github/gookit/color?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gookit/color)](https://goreportcard.com/report/github.com/gookit/color)
 
-Golang下的命令行色彩使用库, 拥有丰富的色彩渲染输出，通用的API方法，兼容Windows系统
+Golang下的命令行色彩使用库, 拥有丰富的色彩(16/256/True)渲染输出，通用的API方法，兼容Windows系统
 
 > **[EN README](README.md)**
 
@@ -28,9 +27,10 @@ Golang下的命令行色彩使用库, 拥有丰富的色彩渲染输出，通用
     - 16色(4bit)是最常用和支持最广的，支持Windows `cmd.exe`
     - 自 `v1.2.4` 起 **256色(8bit)，RGB色彩(24bit)均支持Windows CMD和PowerShell终端**
     - 请查看 [this gist](https://gist.github.com/XVilka/8346728) 了解支持RGB色彩的终端
+  - 支持转换 `HEX` `HSL` 等为RGB色彩
   - 提供通用的API方法：`Print` `Printf` `Println` `Sprint` `Sprintf`
   - 同时支持html标签式的颜色渲染，除了使用内置标签，同时支持自定义颜色属性
-    - 例如: `this an message` 标签内部的文本将会渲染为绿色字体
+    - 例如: `this an message text` 标签内部文本将会渲染对应色彩
     - 自定义颜色属性: 支持使用16色彩名称，256色彩值，rgb色彩值以及hex色彩值
   - 基础色彩: `Bold` `Black` `White` `Gray` `Red` `Green` `Yellow` `Blue` `Magenta` `Cyan`
   - 扩展风格: `Info` `Note` `Light` `Error` `Danger` `Notice` `Success` `Comment` `Primary` `Warning` `Question` `Secondary`
@@ -40,8 +40,7 @@ Golang下的命令行色彩使用库, 拥有丰富的色彩渲染输出，通用
 
 ## GoDoc
 
-  - [godoc for gopkg](https://pkg.go.dev/gopkg.in/gookit/color.v1)
-  - [godoc for github](https://pkg.go.dev/github.com/gookit/color)
+[godoc for github](https://pkg.go.dev/github.com/gookit/color)
 
 ## 安装
 
@@ -124,12 +123,7 @@ func main() {
 color.Bold.Println("bold message")
 color.Black.Println("bold message")
 color.White.Println("bold message")
-color.Gray.Println("bold message")
-color.Red.Println("yellow message")
-color.Blue.Println("yellow message")
-color.Cyan.Println("yellow message")
-color.Yellow.Println("yellow message")
-color.Magenta.Println("yellow message")
+// ...
 
 // Only use foreground color
 color.FgCyan.Printf("Simple to use %s\n", "color")
@@ -185,13 +179,7 @@ color.Reset()
 color.Info.Println("Info message")
 color.Note.Println("Note message")
 color.Notice.Println("Notice message")
-color.Error.Println("Error message")
-color.Danger.Println("Danger message")
-color.Warn.Println("Warn message")
-color.Debug.Println("Debug message")
-color.Primary.Println("Primary message")
-color.Question.Println("Question message")
-color.Secondary.Println("Secondary message")
+// ...
 ```
 
 Run demo: `go run ./_examples/theme_basic.go`
@@ -202,15 +190,9 @@ Run demo: `go run ./_examples/theme_basic.go`
 
 ```go
 color.Info.Tips("Info tips message")
-color.Note.Tips("Note tips message")
 color.Notice.Tips("Notice tips message")
 color.Error.Tips("Error tips message")
-color.Danger.Tips("Danger tips message")
-color.Warn.Tips("Warn tips message")
-color.Debug.Tips("Debug tips message")
-color.Primary.Tips("Primary tips message")
-color.Question.Tips("Question tips message")
-color.Secondary.Tips("Secondary tips message")
+// ...
 ```
 
 Run demo: `go run ./_examples/theme_tips.go`
@@ -221,8 +203,6 @@ Run demo: `go run ./_examples/theme_tips.go`
 
 ```go
 color.Info.Prompt("Info prompt message")
-color.Note.Prompt("Note prompt message")
-color.Notice.Prompt("Notice prompt message")
 color.Error.Prompt("Error prompt message")
 color.Danger.Prompt("Danger prompt message")
 ```
@@ -236,9 +216,7 @@ Run demo: `go run ./_examples/theme_prompt.go`
 ```go
 color.Warn.Block("Warn block message")
 color.Debug.Block("Debug block message")
-color.Primary.Block("Primary block message")
 color.Question.Block("Question block message")
-color.Secondary.Block("Secondary block message")
 ```
 
 Run demo: `go run ./_examples/theme_block.go`
@@ -251,7 +229,7 @@ Run demo: `go run ./_examples/theme_block.go`
 
 ### 使用前景或后景色
  
-  - `color.C256(val uint8, isBg ...bool) Color256`
+- `color.C256(val uint8, isBg ...bool) Color256`
 
 ```go
 c := color.C256(132) // fg color
@@ -339,7 +317,7 @@ c.Printf("format %s", "message")
 
 ### 使用RGB风格
 
-> 可同时设置前景和背景色
+> TIP: 可同时设置前景和背景色
 
 - `color.NewRGBStyle(fg RGBColor, bg ...RGBColor) *RGBStyle`
 
@@ -369,8 +347,33 @@ s.Printf("style with %s\n", "options")
 
 ## 使用颜色标签
 
+`Print,Printf,Println` 等方法支持自动解析并渲染 HTML 风格的颜色标签
+
 > **支持** 在windows `cmd.exe` `PowerShell` 使用
 
+简单示例:
+
+```go
+	text := `
+  gookit/color:
+     A command-line 
+     color library with 256-color
+     and True-color support,
+     universal API methods
+     and Windows support.
+`
+	color.Print(text)
+```
+
+输出效果, 示例代码请看 [_examples/demo_tag.go](_examples/demo_tag.go):
+
+![demo_tag](_examples/images/demo_tag.png)
+
+**颜色标签格式:**
+
+- 直接使用内置风格标签: `CONTENT` e.g: `message`
+- 自定义标签属性: `CONTENT` e.g: `wel`
+
 使用内置的颜色标签，可以非常方便简单的构建自己需要的任何格式
 
 > 同时支持自定义颜色属性: 支持使用16色彩名称，256色彩值，rgb色彩值以及hex色彩值
@@ -389,9 +392,56 @@ color.Print("hello, welcome\n")
 color.Println("hello, welcome")
 ```
 
-- 使用 `color.Tag`
+### 自定义标签属性
 
-给后面输出的文本信息加上给定的颜色风格标签
+标签属性格式:
+
+```text
+attr format:
+ // VALUE please see var: FgColors, BgColors, AllOptions
+ "fg=VALUE;bg=VALUE;op=VALUE"
+
+16 color:
+ "fg=yellow"
+ "bg=red"
+ "op=bold,underscore" // option is allow multi value
+ "fg=white;bg=blue;op=bold"
+ "fg=white;op=bold,underscore"
+
+256 color:
+ "fg=167"
+ "fg=167;bg=23"
+ "fg=167;bg=23;op=bold"
+ 
+True color:
+ // hex
+ "fg=fc1cac"
+ "fg=fc1cac;bg=c2c3c4"
+ // r,g,b
+ "fg=23,45,214"
+ "fg=23,45,214;bg=109,99,88"
+```
+
+> tag attributes parse please see `func ParseCodeFromAttr()`
+
+### 内置标签
+
+内置标签请参见变量 `colorTags` 定义, 源文件 [color_tag.go](color_tag.go)
+
+```go
+// use style tag
+color.Print("hello, welcome")
+color.Println("hello")
+color.Println("hello")
+```
+
+> 运行 demo: `go run ./_examples/color_tag.go`
+
+![color-tags](_examples/images/color-tags.png)
+
+**使用 `color.Tag` 包装标签**:
+
+可以使用通用的输出API方法,给后面输出的文本信息加上给定的颜色风格标签
 
 ```go
 // set a style tag
@@ -400,10 +450,6 @@ color.Tag("info").Printf("%s style text", "info")
 color.Tag("info").Println("info style text")
 ```
 
-> 运行 demo: `go run ./_examples/color_tag.go`
-
-![color-tags](_examples/images/color-tags.png)
-
 ## 颜色转换
 
 支持 Rgb, 256, 16 色彩之间的互相转换 `Rgb <=> 256 <=> 16`
@@ -421,26 +467,96 @@ rgb.Println("rgb color")
 rgb.C256().Println("256 color")
 ```
 
-## 方法参考
+### 颜色转换方法
+
+`color` 内置了许多颜色转换工具方法
+
+```go
+func Basic2hex(val uint8) string
+
+func Bg2Fg(val uint8) uint8
+func Fg2Bg(val uint8) uint8
+
+func C256ToRgb(val uint8) (rgb []uint8)
+func C256ToRgbV1(val uint8) (rgb []uint8)
+
+func Hex2basic(hex string, asBg ...bool) uint8
+func Hex2rgb(hex string) []int
+func HexToRGB(hex string) []int
+func HexToRgb(hex string) (rgb []int)
+
+func HslIntToRgb(h, s, l int) (rgb []uint8)
+func HslToRgb(h, s, l float64) (rgb []uint8)
+func HsvToRgb(h, s, v int) (rgb []uint8)
+
+func Rgb2ansi(r, g, b uint8, isBg bool) uint8
+func Rgb2basic(r, g, b uint8, isBg bool) uint8
+func Rgb2hex(rgb []int) string
+func Rgb2short(r, g, b uint8) uint8
+func RgbTo256(r, g, b uint8) uint8
+func RgbTo256Table() map[string]uint8
+func RgbToAnsi(r, g, b uint8, isBg bool) uint8
+func RgbToHex(rgb []int) string
+func RgbToHsl(r, g, b uint8) []float64
+func RgbToHslInt(r, g, b uint8) []int
+```
+
+**转换为 `RGBColor`**:
+
+- `func RGBFromSlice(rgb []uint8, isBg ...bool) RGBColor`
+- `func RGBFromString(rgb string, isBg ...bool) RGBColor`
+- `func HEX(hex string, isBg ...bool) RGBColor`
+- `func HSL(h, s, l float64, isBg ...bool) RGBColor`
+- `func HSLInt(h, s, l int, isBg ...bool) RGBColor`
+
+## 工具方法参考
 
 一些有用的工具方法参考
 
-- `Disable()` disable color render
-- `SetOutput(io.Writer)` custom set the colored text output writer
-- `ForceOpenColor()` force open color render
+- `Disable()` 禁用颜色渲染输出
+- `SetOutput(io.Writer)` 自定义设置渲染后的彩色文本输出位置
+- `ForceOpenColor()` 强制开启颜色渲染
 - `ClearCode(str string) string` Use for clear color codes
 - `Colors2code(colors ...Color) string` Convert colors to code. return like "32;45;3"
 - `ClearTag(s string) string` clear all color html-tag for a string
 - `IsConsole(w io.Writer)` Determine whether w is one of stderr, stdout, stdin
-- `HexToRgb(hex string) (rgb []int)` Convert hex color string to RGB numbers
-- `RgbToHex(rgb []int) string` Convert RGB to hex code
 - 更多请查看文档 https://pkg.go.dev/github.com/gookit/color
 
-## 使用color的项目
+### 检测支持的颜色级别
+
+`color` 会自动检查当前环境支持的颜色级别
+
+```go
+// Level is the color level supported by a terminal.
+type Level = terminfo.ColorLevel
+
+// terminal color available level alias of the terminfo.ColorLevel*
+const (
+	LevelNo  = terminfo.ColorLevelNone     // not support color.
+	Level16  = terminfo.ColorLevelBasic    // basic - 3/4 bit color supported
+	Level256 = terminfo.ColorLevelHundreds // hundreds - 8-bit color supported
+	LevelRgb = terminfo.ColorLevelMillions // millions - (24 bit)true color supported
+)
+```
+
+- `func SupportColor() bool` 当前环境是否支持色彩输出
+- `func Support256Color() bool` 当前环境是否支持256色彩输出
+- `func SupportTrueColor() bool` 当前环境是否支持(RGB)True色彩输出
+- `func TermColorLevel() Level` 获取当前支持的颜色级别
+
+## 使用Color的项目
 
 看看这些使用了 https://github.com/gookit/color 的项目:
 
 - https://github.com/Delta456/box-cli-maker Make Highly Customized Boxes for your CLI
+- https://github.com/flipped-aurora/gin-vue-admin 基于gin+vue搭建的（中）后台系统框架
+- https://github.com/JanDeDobbeleer/oh-my-posh A prompt theme engine for any shell.
+- https://github.com/jesseduffield/lazygit Simple terminal UI for git commands
+- https://github.com/olivia-ai/olivia 💁‍♀️Your new best friend powered by an artificial neural network
+- https://github.com/pterm/pterm PTerm is a modern Go module to beautify console output. Featuring charts, progressbars, tables, trees, etc.
+- https://github.com/securego/gosec Golang security checker
+- https://github.com/TNK-Studio/lazykube ⎈ The lazier way to manage kubernetes.
+- [+ See More](https://pkg.go.dev/github.com/gookit/color?tab=importedby)
 
 ## Gookit 工具包
 
@@ -460,6 +576,7 @@ rgb.C256().Println("256 color")
 ## 参考项目
 
   - [inhere/console](https://github.com/inhere/php-console)
+  - [muesli/termenv](https://github.com/muesli/termenv)
   - [xo/terminfo](https://github.com/xo/terminfo)
   - [beego/bee](https://github.com/beego/bee)
   - [issue9/term](https://github.com/issue9/term)
diff --git a/vendor/github.com/gookit/color/color.go b/vendor/github.com/gookit/color/color.go
index edb2a5d7b..a51bde09d 100644
--- a/vendor/github.com/gookit/color/color.go
+++ b/vendor/github.com/gookit/color/color.go
@@ -1,12 +1,12 @@
 /*
-Package color is Command line color library.
+Package color is command line color library.
 Support rich color rendering output, universal API method, compatible with Windows system
 
 Source code and other details for the project are available at GitHub:
 
 	https://github.com/gookit/color
 
-More usage please see README and tests.
+For more usage, please see README and tests.
 */
 package color
 
@@ -15,29 +15,27 @@ import (
 	"io"
 	"os"
 	"regexp"
-
-	"github.com/xo/terminfo"
-)
-
-// terminal color available level alias of the terminfo.ColorLevel*
-const (
-	LevelNo  = terminfo.ColorLevelNone     // not support color.
-	Level16  = terminfo.ColorLevelBasic    // 3/4 bit color supported
-	Level256 = terminfo.ColorLevelHundreds // 8 bit color supported
-	LevelRgb = terminfo.ColorLevelMillions // (24 bit)true color supported
+	"strings"
 )
 
 // color render templates
+//
 // ESC 操作的表示:
-// 	"\033"(Octal 8进制) = "\x1b"(Hexadecimal 16进制) = 27 (10进制)
+//
+//	"\033"(Octal 8进制) = "\x1b"(Hexadecimal 16进制) = 27 (10进制)
 const (
-	SettingTpl   = "\x1b[%sm"
+	// StartSet chars
+	StartSet = "\x1b["
+	// ResetSet close all properties.
+	ResetSet = "\x1b[0m"
+	// SettingTpl string.
+	SettingTpl = "\x1b[%sm"
+	// FullColorTpl for build color code
 	FullColorTpl = "\x1b[%sm%s\x1b[0m"
+	// CodeSuffix string for color code.
+	CodeSuffix = "[0m"
 )
 
-// ResetSet Close all properties.
-const ResetSet = "\x1b[0m"
-
 // CodeExpr regex to clear color codes eg "\033[1;36mText\x1b[0m"
 const CodeExpr = `\033\[[\d;?]+m`
 
@@ -49,6 +47,9 @@ var (
 	Enable = os.Getenv("NO_COLOR") == ""
 	// RenderTag render HTML tag on call color.Xprint, color.PrintX
 	RenderTag = true
+)
+
+var (
 	// debug mode for development.
 	//
 	// set env:
@@ -60,49 +61,30 @@ var (
 	innerErrs []error
 	// output the default io.Writer message print
 	output io.Writer = os.Stdout
-	// mark current env, It's like in `cmd.exe`
-	// if not in windows, it's always is False.
-	isLikeInCmd bool
 	// the color support level for current terminal
-	// needVTP - need enable VTP, only for windows OS
+	// needVTP - need enable VTP, only for Windows OS
 	colorLevel, needVTP = detectTermColorLevel()
 	// match color codes
 	codeRegex = regexp.MustCompile(CodeExpr)
-	// mark current env is support color.
-	// Always: isLikeInCmd != supportColor
-	// supportColor = IsSupportColor()
 )
 
-// TermColorLevel value on current ENV
-func TermColorLevel() terminfo.ColorLevel {
-	return colorLevel
-}
+// TermColorLevel Get the currently supported color level
+func TermColorLevel() Level { return colorLevel }
 
-// SupportColor on the current ENV
-func SupportColor() bool {
-	return colorLevel > terminfo.ColorLevelNone
-}
+// SupportColor Whether the current environment supports color output
+func SupportColor() bool { return colorLevel > LevelNo }
 
-// Support16Color on the current ENV
-// func Support16Color() bool {
-// 	return colorLevel > terminfo.ColorLevelNone
-// }
+// Support256Color Whether the current environment supports 256-color output
+func Support256Color() bool { return colorLevel > Level16 }
 
-// Support256Color on the current ENV
-func Support256Color() bool {
-	return colorLevel > terminfo.ColorLevelBasic
-}
-
-// SupportTrueColor on the current ENV
-func SupportTrueColor() bool {
-	return colorLevel > terminfo.ColorLevelHundreds
-}
+// SupportTrueColor Whether the current environment supports (RGB)True-color output
+func SupportTrueColor() bool { return colorLevel > Level256 }
 
 /*************************************************************
  * global settings
  *************************************************************/
 
-// Set set console color attributes
+// Set console color attributes
 func Set(colors ...Color) (int, error) {
 	code := Colors2code(colors...)
 	err := SetTerminal(code)
@@ -123,19 +105,13 @@ func Disable() bool {
 }
 
 // NotRenderTag on call color.Xprint, color.PrintX
-func NotRenderTag() {
-	RenderTag = false
-}
+func NotRenderTag() { RenderTag = false }
 
 // SetOutput set default colored text output
-func SetOutput(w io.Writer) {
-	output = w
-}
+func SetOutput(w io.Writer) { output = w }
 
 // ResetOutput reset output
-func ResetOutput() {
-	output = os.Stdout
-}
+func ResetOutput() { output = os.Stdout }
 
 // ResetOptions reset all package option setting
 func ResetOptions() {
@@ -144,49 +120,69 @@ func ResetOptions() {
 	output = os.Stdout
 }
 
-// ForceColor force open color render
-func ForceSetColorLevel(level terminfo.ColorLevel) terminfo.ColorLevel {
+// ForceSetColorLevel force open color render
+func ForceSetColorLevel(level Level) Level {
 	oldLevelVal := colorLevel
 	colorLevel = level
 	return oldLevelVal
 }
 
 // ForceColor force open color render
-func ForceColor() terminfo.ColorLevel {
-	return ForceOpenColor()
-}
+func ForceColor() Level { return ForceOpenColor() }
 
 // ForceOpenColor force open color render
-func ForceOpenColor() terminfo.ColorLevel {
+func ForceOpenColor() Level {
 	// TODO should set level to ?
-	return ForceSetColorLevel(terminfo.ColorLevelMillions)
+	return ForceSetColorLevel(LevelRgb)
 }
 
-// IsLikeInCmd check result
-// Deprecated
-func IsLikeInCmd() bool {
-	return isLikeInCmd
-}
+// EnableDebug enable debug mode
+func EnableDebug() { debugMode = true }
+
+// ResetDebug reset debug mode
+func ResetDebug() { debugMode = false }
 
 // InnerErrs info
-func InnerErrs() []error {
-	return innerErrs
-}
+func InnerErrs() []error { return innerErrs }
 
 /*************************************************************
  * render color code
  *************************************************************/
 
 // RenderCode render message by color code.
+//
 // Usage:
-// 	msg := RenderCode("3;32;45", "some", "message")
-func RenderCode(code string, args ...interface{}) string {
+//
+//	msg := RenderCode("3;32;45", "some", "message")
+func RenderCode(code string, args ...any) string {
 	var message string
-	if ln := len(args); ln == 0 {
+
+	// Fast path optimizations
+	if ln := len(args); ln == 1 {
+		// Single argument - avoid fmt.Sprint overhead
+		if str, ok := args[0].(string); ok {
+			message = str
+		} else {
+			message = fmt.Sprint(args[0])
+		}
+	} else if ln == 2 {
+		// Two arguments - common case, try to optimize if both are strings
+		if str1, ok1 := args[0].(string); ok1 {
+			if str2, ok2 := args[1].(string); ok2 {
+				message = str1 + str2
+			} else {
+				message = fmt.Sprint(args...)
+			}
+		} else {
+			message = fmt.Sprint(args...)
+		}
+	} else if ln == 0 {
 		return ""
+	} else {
+		// Multiple arguments - use fmt.Sprint for safety
+		message = fmt.Sprint(args...)
 	}
 
-	message = fmt.Sprint(args...)
 	if len(code) == 0 {
 		return message
 	}
@@ -196,28 +192,31 @@ func RenderCode(code string, args ...interface{}) string {
 		return ClearCode(message)
 	}
 
-	return fmt.Sprintf(FullColorTpl, code, message)
+	// return fmt.Sprintf(FullColorTpl, code, message)
+	return StartSet + code + "m" + message + ResetSet
 }
 
 // RenderWithSpaces Render code with spaces.
 // If the number of args is > 1, a space will be added between the args
-func RenderWithSpaces(code string, args ...interface{}) string {
-	message := formatArgsForPrintln(args)
+func RenderWithSpaces(code string, args ...any) string {
+	msg := formatLikePrintln(args)
 	if len(code) == 0 {
-		return message
+		return msg
 	}
 
 	// disabled OR not support color
 	if !Enable || !SupportColor() {
-		return ClearCode(message)
+		return ClearCode(msg)
 	}
 
-	return fmt.Sprintf(FullColorTpl, code, message)
+	return StartSet + code + "m" + msg + ResetSet
 }
 
 // RenderString render a string with color code.
+//
 // Usage:
-// 	msg := RenderString("3;32;45", "a message")
+//
+//	msg := RenderString("3;32;45", "a message")
 func RenderString(code string, str string) string {
 	if len(code) == 0 || str == "" {
 		return str
@@ -228,11 +227,23 @@ func RenderString(code string, str string) string {
 		return ClearCode(str)
 	}
 
-	return fmt.Sprintf(FullColorTpl, code, str)
+	open := StartSet + code + "m"
+	// If the string contains reset sequences, re-apply our color after each
+	// reset so that nested colored args don't break the outer color.
+	if strings.Contains(str, ResetSet) {
+		str = strings.ReplaceAll(str, ResetSet, ResetSet+open)
+	}
+	return open + str + ResetSet
 }
 
 // ClearCode clear color codes.
-// eg: "\033[36;1mText\x1b[0m" -> "Text"
+//
+// eg:
+//
+//	"\033[36;1mText\x1b[0m" -> "Text"
 func ClearCode(str string) string {
+	if !strings.Contains(str, CodeSuffix) {
+		return str
+	}
 	return codeRegex.ReplaceAllString(str, "")
 }
diff --git a/vendor/github.com/gookit/color/color_16.go b/vendor/github.com/gookit/color/color_16.go
index 28e1048e0..c6bc6faae 100644
--- a/vendor/github.com/gookit/color/color_16.go
+++ b/vendor/github.com/gookit/color/color_16.go
@@ -41,13 +41,27 @@ func (o Opts) String() string {
  * Basic 16 color definition
  *************************************************************/
 
-// Base value for foreground/background color
+const (
+	// OptMax max option value. range: 0 - 9
+	OptMax = 10
+	// DiffFgBg diff foreground and background color
+	DiffFgBg = 10
+)
+
+// Boundary value for foreground/background color 16
+//
+//   - base: fg 30~37, bg 40~47
+//   - light: fg 90~97, bg 100~107
 const (
 	FgBase uint8 = 30
+	FgMax  uint8 = 37
 	BgBase uint8 = 40
-	// hi color base code
+	BgMax  uint8 = 47
+
 	HiFgBase uint8 = 90
+	HiFgMax  uint8 = 97
 	HiBgBase uint8 = 100
+	HiBgMax  uint8 = 107
 )
 
 // Foreground colors. basic foreground colors 30 - 37
@@ -92,7 +106,7 @@ const (
 	BgDefault Color = 49
 )
 
-// Extra background color 100 - 107(非标准)
+// Extra background color 100 - 107 (non-standard)
 const (
 	BgDarkGray Color = iota + 100
 	BgLightRed
@@ -106,7 +120,7 @@ const (
 	BgGray Color = 100
 )
 
-// Option settings
+// Option settings. range: 0 - 9
 const (
 	OpReset         Color = iota // 0 重置所有设置
 	OpBold                       // 1 加粗
@@ -114,7 +128,7 @@ const (
 	OpItalic                     // 3 斜体(不是所有的终端仿真器都支持)
 	OpUnderscore                 // 4 下划线
 	OpBlink                      // 5 闪烁
-	OpFastBlink                  // 5 快速闪烁(未广泛支持)
+	OpFastBlink                  // 6 快速闪烁(未广泛支持)
 	OpReverse                    // 7 颠倒的 交换背景色与前景色
 	OpConcealed                  // 8 隐匿的
 	OpStrikethrough              // 9 删除的，删除线(未广泛支持)
@@ -164,10 +178,8 @@ const (
 	BgHiMagenta = BgLightMagenta
 )
 
-// Bit4 an method for create Color
-func Bit4(code uint8) Color {
-	return Color(code)
-}
+// Bit4 a method for create Color
+func Bit4(code uint8) Color { return Color(code) }
 
 /*************************************************************
  * Color render methods
@@ -183,70 +195,74 @@ func (c Color) Name() string {
 }
 
 // Text render a text message
-func (c Color) Text(message string) string {
-	return RenderString(c.String(), message)
-}
+func (c Color) Text(message string) string { return RenderString(c.String(), message) }
 
 // Render messages by color setting
+//
 // Usage:
-// 		green := color.FgGreen.Render
-// 		fmt.Println(green("message"))
-func (c Color) Render(a ...interface{}) string {
-	return RenderCode(c.String(), a...)
-}
+//
+//	green := color.FgGreen.Render
+//	fmt.Println(green("message"))
+func (c Color) Render(a ...any) string { return RenderCode(c.String(), a...) }
 
 // Renderln messages by color setting.
 // like Println, will add spaces for each argument
+//
 // Usage:
-// 		green := color.FgGreen.Renderln
-// 		fmt.Println(green("message"))
-func (c Color) Renderln(a ...interface{}) string {
-	return RenderWithSpaces(c.String(), a...)
-}
+//
+//	green := color.FgGreen.Renderln
+//	fmt.Println(green("message"))
+func (c Color) Renderln(a ...any) string { return RenderWithSpaces(c.String(), a...) }
 
 // Sprint render messages by color setting. is alias of the Render()
-func (c Color) Sprint(a ...interface{}) string {
-	return RenderCode(c.String(), a...)
-}
+func (c Color) Sprint(a ...any) string { return RenderCode(c.String(), a...) }
 
 // Sprintf format and render message.
+//
 // Usage:
+//
 // 	green := color.Green.Sprintf
-//  colored := green("message")
-func (c Color) Sprintf(format string, args ...interface{}) string {
+// 	colored := green("message")
+func (c Color) Sprintf(format string, args ...any) string {
 	return RenderString(c.String(), fmt.Sprintf(format, args...))
 }
 
 // Print messages.
+//
 // Usage:
-// 		color.Green.Print("message")
+//
+//	color.Green.Print("message")
+//
 // OR:
-// 		green := color.FgGreen.Print
-// 		green("message")
-func (c Color) Print(args ...interface{}) {
+//
+//	green := color.FgGreen.Print
+//	green("message")
+func (c Color) Print(args ...any) {
 	doPrintV2(c.Code(), fmt.Sprint(args...))
 }
 
 // Printf format and print messages.
+//
 // Usage:
-// 		color.Cyan.Printf("string %s", "arg0")
-func (c Color) Printf(format string, a ...interface{}) {
+//
+//	color.Cyan.Printf("string %s", "arg0")
+func (c Color) Printf(format string, a ...any) {
 	doPrintV2(c.Code(), fmt.Sprintf(format, a...))
 }
 
 // Println messages with new line
-func (c Color) Println(a ...interface{}) {
-	doPrintlnV2(c.String(), a)
-}
+func (c Color) Println(a ...any) { doPrintlnV2(c.String(), a) }
 
 // Light current color. eg: 36(FgCyan) -> 96(FgLightCyan).
+//
 // Usage:
-// 	lightCyan := Cyan.Light()
-// 	lightCyan.Print("message")
+//
+//	lightCyan := Cyan.Light()
+//	lightCyan.Print("message")
 func (c Color) Light() Color {
-	val := int(c)
+	val := uint8(c)
 	if val >= 30 && val <= 47 {
-		return Color(uint8(c) + 60)
+		return Color(val + 60)
 	}
 
 	// don't change
@@ -254,13 +270,15 @@ func (c Color) Light() Color {
 }
 
 // Darken current color. eg. 96(FgLightCyan) -> 36(FgCyan)
+//
 // Usage:
-// 	cyan := LightCyan.Darken()
-// 	cyan.Print("message")
+//
+//	cyan := LightCyan.Darken()
+//	cyan.Print("message")
 func (c Color) Darken() Color {
-	val := int(c)
+	val := uint8(c)
 	if val >= 90 && val <= 107 {
-		return Color(uint8(c) - 60)
+		return Color(val - 60)
 	}
 
 	// don't change
@@ -291,6 +309,26 @@ func (c Color) C256() Color256 {
 	return Color256{val}
 }
 
+// ToFg always convert fg
+func (c Color) ToFg() Color {
+	val := uint8(c)
+	// option code, don't change
+	if val < 10 {
+		return c
+	}
+	return Color(Bg2Fg(val))
+}
+
+// ToBg always convert bg
+func (c Color) ToBg() Color {
+	val := uint8(c)
+	// option code, don't change
+	if val < 10 {
+		return c
+	}
+	return Color(Fg2Bg(val))
+}
+
 // RGB convert 16 color to 256-color code.
 func (c Color) RGB() RGBColor {
 	val := uint8(c)
@@ -298,26 +336,33 @@ func (c Color) RGB() RGBColor {
 		return emptyRGBColor
 	}
 
-	return HEX(Basic2hex(val))
+	return HEX(Basic2hex(val), c.IsBg())
 }
 
 // Code convert to code string. eg "35"
-func (c Color) Code() string {
-	// return fmt.Sprintf("%d", c)
-	return strconv.Itoa(int(c))
-}
+func (c Color) Code() string { return strconv.FormatInt(int64(c), 10) }
 
 // String convert to code string. eg "35"
-func (c Color) String() string {
-	// return fmt.Sprintf("%d", c)
-	return strconv.Itoa(int(c))
+func (c Color) String() string { return strconv.FormatInt(int64(c), 10) }
+
+// IsBg check is background color
+func (c Color) IsBg() bool {
+	val := uint8(c)
+	return val >= BgBase && val <= BgMax || val >= HiBgBase && val <= HiBgMax
 }
 
-// IsValid color value
-func (c Color) IsValid() bool {
-	return c < 107
+// IsFg check is foreground color
+func (c Color) IsFg() bool {
+	val := uint8(c)
+	return val >= FgBase && val <= FgMax || val >= HiFgBase && val <= HiFgMax
 }
 
+// IsOption check is option code: 0-9
+func (c Color) IsOption() bool { return uint8(c) < OptMax }
+
+// IsValid color value
+func (c Color) IsValid() bool { return uint8(c) < HiBgMax }
+
 /*************************************************************
  * basic color maps
  *************************************************************/
@@ -373,8 +418,8 @@ var ExBgColors = map[string]Color{
 }
 
 // Options color options map
-// Deprecated
-// NOTICE: please use AllOptions instead.
+//
+// Deprecated: please use AllOptions instead.
 var Options = AllOptions
 
 // AllOptions color options map
@@ -392,9 +437,10 @@ var AllOptions = map[string]Color{
 var (
 	// TODO basic name alias
 	// basicNameAlias = map[string]string{}
-
+	// optionWithAlias = buildOpWithAlias()
 	// basic color name to code
-	name2basicMap = initName2basicMap()
+	// name2basicMap = initName2basicMap()
+
 	// basic2nameMap basic color code to name
 	basic2nameMap = map[uint8]string{
 		30: "black",
@@ -426,15 +472,36 @@ var (
 	}
 )
 
-// Basic2nameMap data
-func Basic2nameMap() map[uint8]string {
-	return basic2nameMap
+// Bg2Fg bg color value to fg value
+func Bg2Fg(val uint8) uint8 {
+	if val >= BgBase && val <= 47 { // is bg
+		val = val - 10
+	} else if val >= HiBgBase && val <= 107 { // is hi bg
+		val = val - 10
+	}
+	return val
 }
 
-func initName2basicMap() map[string]uint8 {
-	n2b := make(map[string]uint8, len(basic2nameMap))
-	for u, s := range basic2nameMap {
-		n2b[s] = u
+// Fg2Bg fg color value to bg value
+func Fg2Bg(val uint8) uint8 {
+	if val >= FgBase && val <= 37 { // is fg
+		val = val + 10
+	} else if val >= HiFgBase && val <= 97 { // is hi fg
+		val = val + 10
 	}
-	return n2b
+	return val
 }
+
+// Basic2nameMap data
+func Basic2nameMap() map[uint8]string { return basic2nameMap }
+
+// func initName2basicMap() map[string]uint8 {
+// 	n2b := make(map[string]uint8, len(basic2nameMap))
+// 	for u, s := range basic2nameMap {
+// 		n2b[s] = u
+// 	}
+// 	return n2b
+// }
+
+// func buildOpWithAlias() map[string]uint8 {
+// }
diff --git a/vendor/github.com/gookit/color/color_256.go b/vendor/github.com/gookit/color/color_256.go
index efd6dca30..1c71b2def 100644
--- a/vendor/github.com/gookit/color/color_256.go
+++ b/vendor/github.com/gookit/color/color_256.go
@@ -19,16 +19,19 @@ from wikipedia, 256 color:
 // tpl for 8 bit 256 color(`2^8`)
 //
 // format:
-// 	ESC[ … 38;5; … m // 选择前景色
-//  ESC[ … 48;5; … m // 选择背景色
+//
+//		ESC[ … 38;5; … m // 选择前景色
+//	 ESC[ … 48;5; … m // 选择背景色
 //
 // example:
-//  fg "\x1b[38;5;242m"
-//  bg "\x1b[48;5;208m"
-//  both "\x1b[38;5;242;48;5;208m"
+//
+//	fg "\x1b[38;5;242m"
+//	bg "\x1b[48;5;208m"
+//	both "\x1b[38;5;242;48;5;208m"
 //
 // links:
-// 	https://zh.wikipedia.org/wiki/ANSI%E8%BD%AC%E4%B9%89%E5%BA%8F%E5%88%97#8位
+//
+//	https://zh.wikipedia.org/wiki/ANSI%E8%BD%AC%E4%B9%89%E5%BA%8F%E5%88%97#8位
 const (
 	TplFg256 = "38;5;%d"
 	TplBg256 = "48;5;%d"
@@ -40,19 +43,21 @@ const (
  * 8bit(256) Color: Bit8Color Color256
  *************************************************************/
 
-// Color256 256 color (8 bit), uint8 range at 0 - 255
+// Color256 256 color (8 bit), uint8 range at 0 - 255.
+// Support 256 color on windows CMD, PowerShell
 //
 // 颜色值使用10进制和16进制都可 0x98 = 152
 //
 // The color consists of two uint8:
-// 	0: color value
-// 	1: color type; Fg=0, Bg=1, >1: unset value
+//
+//	0: color value
+//	1: color type; Fg=0, Bg=1, >1: unset value
 //
 // example:
-// 	fg color: [152, 0]
-//  bg color: [152, 1]
 //
-// NOTICE: now support 256 color on windows CMD, PowerShell
+//	fg color: [152, 0]
+//	bg color: [152, 1]
+//
 // lint warn - Name starts with package name
 type Color256 [2]uint8
 type Bit8Color = Color256 // alias
@@ -60,9 +65,7 @@ type Bit8Color = Color256 // alias
 var emptyC256 = Color256{1: 99}
 
 // Bit8 create a color256
-func Bit8(val uint8, isBg ...bool) Color256 {
-	return C256(val, isBg...)
-}
+func Bit8(val uint8, isBg ...bool) Color256 { return C256(val, isBg...) }
 
 // C256 create a color256
 func C256(val uint8, isBg ...bool) Color256 {
@@ -77,49 +80,39 @@ func C256(val uint8, isBg ...bool) Color256 {
 }
 
 // Set terminal by 256 color code
-func (c Color256) Set() error {
-	return SetTerminal(c.String())
-}
+func (c Color256) Set() error { return SetTerminal(c.String()) }
 
 // Reset terminal. alias of the ResetTerminal()
-func (c Color256) Reset() error {
-	return ResetTerminal()
-}
+func (c Color256) Reset() error { return ResetTerminal() }
 
 // Print print message
-func (c Color256) Print(a ...interface{}) {
+func (c Color256) Print(a ...any) {
 	doPrintV2(c.String(), fmt.Sprint(a...))
 }
 
 // Printf format and print message
-func (c Color256) Printf(format string, a ...interface{}) {
+func (c Color256) Printf(format string, a ...any) {
 	doPrintV2(c.String(), fmt.Sprintf(format, a...))
 }
 
 // Println print message with newline
-func (c Color256) Println(a ...interface{}) {
+func (c Color256) Println(a ...any) {
 	doPrintlnV2(c.String(), a)
 }
 
 // Sprint returns rendered message
-func (c Color256) Sprint(a ...interface{}) string {
-	return RenderCode(c.String(), a...)
-}
+func (c Color256) Sprint(a ...any) string { return RenderCode(c.String(), a...) }
 
 // Sprintf returns format and rendered message
-func (c Color256) Sprintf(format string, a ...interface{}) string {
+func (c Color256) Sprintf(format string, a ...any) string {
 	return RenderString(c.String(), fmt.Sprintf(format, a...))
 }
 
 // C16 convert color-256 to 16 color.
-func (c Color256) C16() Color {
-	return c.Basic()
-}
+func (c Color256) C16() Color { return c.Basic() }
 
 // Basic convert color-256 to basic 16 color.
-func (c Color256) Basic() Color {
-	return Color(c[0]) // TODO
-}
+func (c Color256) Basic() Color { return Color(c[0]) /* TODO */ }
 
 // RGB convert color-256 to RGB color.
 func (c Color256) RGB() RGBColor {
@@ -127,44 +120,31 @@ func (c Color256) RGB() RGBColor {
 }
 
 // RGBColor convert color-256 to RGB color.
-func (c Color256) RGBColor() RGBColor {
-	return c.RGB()
-}
+func (c Color256) RGBColor() RGBColor { return c.RGB() }
 
 // Value return color value
-func (c Color256) Value() uint8 {
-	return c[0]
-}
+func (c Color256) Value() uint8 { return c[0] }
 
 // Code convert to color code string. eg: "12"
-func (c Color256) Code() string {
-	return strconv.Itoa(int(c[0]))
-}
+func (c Color256) Code() string { return strconv.Itoa(int(c[0])) }
 
 // FullCode convert to color code string with prefix. eg: "38;5;12"
-func (c Color256) FullCode() string {
-	return c.String()
-}
+func (c Color256) FullCode() string { return c.String() }
 
 // String convert to color code string with prefix. eg: "38;5;12"
 func (c Color256) String() string {
 	if c[1] == AsFg { // 0 is Fg
-		// return fmt.Sprintf(TplFg256, c[0])
 		return Fg256Pfx + strconv.Itoa(int(c[0]))
 	}
 
 	if c[1] == AsBg { // 1 is Bg
-		// return fmt.Sprintf(TplBg256, c[0])
 		return Bg256Pfx + strconv.Itoa(int(c[0]))
 	}
-
 	return "" // empty
 }
 
 // IsFg color
-func (c Color256) IsFg() bool {
-	return c[1] == AsFg
-}
+func (c Color256) IsFg() bool { return c[1] == AsFg }
 
 // ToFg 256 color
 func (c Color256) ToFg() Color256 {
@@ -173,9 +153,7 @@ func (c Color256) ToFg() Color256 {
 }
 
 // IsBg color
-func (c Color256) IsBg() bool {
-	return c[1] == AsBg
-}
+func (c Color256) IsBg() bool { return c[1] == AsBg }
 
 // ToBg 256 color
 func (c Color256) ToBg() Color256 {
@@ -184,9 +162,7 @@ func (c Color256) ToBg() Color256 {
 }
 
 // IsEmpty value
-func (c Color256) IsEmpty() bool {
-	return c[1] > 1
-}
+func (c Color256) IsEmpty() bool { return c[1] > 1 }
 
 /*************************************************************
  * 8bit(256) Style
@@ -198,8 +174,6 @@ func (c Color256) IsEmpty() bool {
 // 都是由两位uint8组成, 第一位是色彩值；
 // 第二位与 Bit8Color 不一样的是，在这里表示是否设置了值 0 未设置 !=0 已设置
 type Style256 struct {
-	// p Printer
-
 	// Name of the style
 	Name string
 	// color options of the style
@@ -209,10 +183,12 @@ type Style256 struct {
 }
 
 // S256 create a color256 style
+//
 // Usage:
-// 	s := color.S256()
-// 	s := color.S256(132) // fg
-// 	s := color.S256(132, 203) // fg and bg
+//
+//	s := color.S256()
+//	s := color.S256(132) // fg
+//	s := color.S256(132, 203) // fg and bg
 func S256(fgAndBg ...uint8) *Style256 {
 	s := &Style256{}
 	vl := len(fgAndBg)
@@ -260,49 +236,44 @@ func (s *Style256) AddOpts(opts ...Color) *Style256 {
 }
 
 // Print message
-func (s *Style256) Print(a ...interface{}) {
+func (s *Style256) Print(a ...any) {
 	doPrintV2(s.String(), fmt.Sprint(a...))
 }
 
 // Printf format and print message
-func (s *Style256) Printf(format string, a ...interface{}) {
+func (s *Style256) Printf(format string, a ...any) {
 	doPrintV2(s.String(), fmt.Sprintf(format, a...))
 }
 
 // Println print message with newline
-func (s *Style256) Println(a ...interface{}) {
+func (s *Style256) Println(a ...any) {
 	doPrintlnV2(s.String(), a)
 }
 
 // Sprint returns rendered message
-func (s *Style256) Sprint(a ...interface{}) string {
-	return RenderCode(s.Code(), a...)
-}
+func (s *Style256) Sprint(a ...any) string { return RenderCode(s.Code(), a...) }
 
 // Sprintf returns format and rendered message
-func (s *Style256) Sprintf(format string, a ...interface{}) string {
+func (s *Style256) Sprintf(format string, a ...any) string {
 	return RenderString(s.Code(), fmt.Sprintf(format, a...))
 }
 
 // Code convert to color code string
-func (s *Style256) Code() string {
-	return s.String()
-}
+func (s *Style256) Code() string { return s.String() }
 
 // String convert to color code string
 func (s *Style256) String() string {
 	var ss []string
 	if s.fg[1] > 0 {
-		ss = append(ss, fmt.Sprintf(TplFg256, s.fg[0]))
+		ss = append(ss, Fg256Pfx+strconv.FormatInt(int64(s.fg[0]), 10))
 	}
 
 	if s.bg[1] > 0 {
-		ss = append(ss, fmt.Sprintf(TplBg256, s.bg[0]))
+		ss = append(ss, Bg256Pfx+strconv.FormatInt(int64(s.bg[0]), 10))
 	}
 
 	if s.opts.IsValid() {
 		ss = append(ss, s.opts.String())
 	}
-
 	return strings.Join(ss, ";")
 }
diff --git a/vendor/github.com/gookit/color/color_rgb.go b/vendor/github.com/gookit/color/color_rgb.go
index a7ede1853..4547408ff 100644
--- a/vendor/github.com/gookit/color/color_rgb.go
+++ b/vendor/github.com/gookit/color/color_rgb.go
@@ -8,20 +8,24 @@ import (
 
 // 24 bit RGB color
 // RGB:
-// 	R 0-255 G 0-255 B 0-255
-// 	R 00-FF G 00-FF B 00-FF (16进制)
+//
+//	R 0-255 G 0-255 B 0-255
+//	R 00-FF G 00-FF B 00-FF (16进制)
 //
 // Format:
-// 	ESC[ … 38;2;;; … m // Select RGB foreground color
-// 	ESC[ … 48;2;;; … m // Choose RGB background color
+//
+//	ESC[ … 38;2;;; … m // Select RGB foreground color
+//	ESC[ … 48;2;;; … m // Choose RGB background color
 //
 // links:
-// 	https://zh.wikipedia.org/wiki/ANSI%E8%BD%AC%E4%B9%89%E5%BA%8F%E5%88%97#24位
+//
+//	https://zh.wikipedia.org/wiki/ANSI%E8%BD%AC%E4%B9%89%E5%BA%8F%E5%88%97#24位
 //
 // example:
-// 	fg: \x1b[38;2;30;144;255mMESSAGE\x1b[0m
-// 	bg: \x1b[48;2;30;144;255mMESSAGE\x1b[0m
-// 	both: \x1b[38;2;233;90;203;48;2;30;144;255mMESSAGE\x1b[0m
+//
+//	fg: \x1b[38;2;30;144;255mMESSAGE\x1b[0m
+//	bg: \x1b[48;2;30;144;255mMESSAGE\x1b[0m
+//	both: \x1b[38;2;233;90;203;48;2;30;144;255mMESSAGE\x1b[0m
 const (
 	TplFgRGB = "38;2;%d;%d;%d"
 	TplBgRGB = "48;2;%d;%d;%d"
@@ -35,53 +39,34 @@ const (
 	AsBg
 )
 
-// values from https://github.com/go-terminfo/terminfo
-// var (
-// RgbaBlack    = image_color.RGBA{0, 0, 0, 255}
-// Red       = color.RGBA{205, 0, 0, 255}
-// Green     = color.RGBA{0, 205, 0, 255}
-// Orange    = color.RGBA{205, 205, 0, 255}
-// Blue      = color.RGBA{0, 0, 238, 255}
-// Magenta   = color.RGBA{205, 0, 205, 255}
-// Cyan      = color.RGBA{0, 205, 205, 255}
-// LightGrey = color.RGBA{229, 229, 229, 255}
-//
-// DarkGrey     = color.RGBA{127, 127, 127, 255}
-// LightRed     = color.RGBA{255, 0, 0, 255}
-// LightGreen   = color.RGBA{0, 255, 0, 255}
-// Yellow       = color.RGBA{255, 255, 0, 255}
-// LightBlue    = color.RGBA{92, 92, 255, 255}
-// LightMagenta = color.RGBA{255, 0, 255, 255}
-// LightCyan    = color.RGBA{0, 255, 255, 255}
-// White        = color.RGBA{255, 255, 255, 255}
-// )
-
 /*************************************************************
  * RGB Color(Bit24Color, TrueColor)
  *************************************************************/
 
 // RGBColor definition.
+// Support RGB color on Windows CMD, PowerShell
 //
 // The first to third digits represent the color value.
 // The last digit represents the foreground(0), background(1), >1 is unset value
 //
 // Usage:
-// 	// 0, 1, 2 is R,G,B.
-// 	// 3rd: Fg=0, Bg=1, >1: unset value
-// 	RGBColor{30,144,255, 0}
-// 	RGBColor{30,144,255, 1}
 //
-// NOTICE: now support RGB color on windows CMD, PowerShell
+//	// 0, 1, 2 is R,G,B.
+//	// 3rd: Fg=0, Bg=1, >1: unset value
+//	RGBColor{30,144,255, 0}
+//	RGBColor{30,144,255, 1}
 type RGBColor [4]uint8
 
-// create a empty RGBColor
+// create an empty RGBColor
 var emptyRGBColor = RGBColor{3: 99}
 
 // RGB color create.
+//
 // Usage:
-// 	c := RGB(30,144,255)
-// 	c := RGB(30,144,255, true)
-// 	c.Print("message")
+//
+//	c := RGB(30,144,255)
+//	c := RGB(30,144,255, true)
+//	c.Print("message")
 func RGB(r, g, b uint8, isBg ...bool) RGBColor {
 	rgb := RGBColor{r, g, b}
 	if len(isBg) > 0 && isBg[0] {
@@ -97,18 +82,23 @@ func Rgb(r, g, b uint8, isBg ...bool) RGBColor { return RGB(r, g, b, isBg...) }
 // Bit24 alias of the RGB()
 func Bit24(r, g, b uint8, isBg ...bool) RGBColor { return RGB(r, g, b, isBg...) }
 
-// RGBFromSlice quick RGBColor from slice
-func RGBFromSlice(rgb []uint8, isBg ...bool) RGBColor {
-	return RGB(rgb[0], rgb[1], rgb[2], isBg...)
+// RgbFromInt create instance from int r,g,b value
+func RgbFromInt(r, g, b int, isBg ...bool) RGBColor { return RGB(uint8(r), uint8(g), uint8(b), isBg...) }
+
+// RgbFromInts create instance from []int r,g,b value
+func RgbFromInts(rgb []int, isBg ...bool) RGBColor {
+	return RGB(uint8(rgb[0]), uint8(rgb[1]), uint8(rgb[2]), isBg...)
 }
 
 // HEX create RGB color from a HEX color string.
+//
 // Usage:
-// 	c := HEX("ccc") // rgb: [204 204 204]
-// 	c := HEX("aabbcc") // rgb: [170 187 204]
-// 	c := HEX("#aabbcc")
-// 	c := HEX("0xaabbcc")
-// 	c.Print("message")
+//
+//	c := HEX("ccc") // rgb: [204 204 204]
+//	c := HEX("aabbcc") // rgb: [170 187 204]
+//	c := HEX("#aabbcc")
+//	c := HEX("0xaabbcc")
+//	c.Print("message")
 func HEX(hex string, isBg ...bool) RGBColor {
 	if rgb := HexToRgb(hex); len(rgb) > 0 {
 		return RGB(uint8(rgb[0]), uint8(rgb[1]), uint8(rgb[2]), isBg...)
@@ -121,61 +111,93 @@ func HEX(hex string, isBg ...bool) RGBColor {
 // Hex alias of the HEX()
 func Hex(hex string, isBg ...bool) RGBColor { return HEX(hex, isBg...) }
 
+// RGBFromHEX quick RGBColor from hex string, alias of HEX()
+func RGBFromHEX(hex string, isBg ...bool) RGBColor { return HEX(hex, isBg...) }
+
+// HSL create RGB color from a hsl value.
+// more see HslToRgb()
+func HSL(h, s, l float64, isBg ...bool) RGBColor {
+	rgb := HslToRgb(h, s, l)
+	return RGB(rgb[0], rgb[1], rgb[2], isBg...)
+}
+
+// Hsl alias of the HSL()
+func Hsl(h, s, l float64, isBg ...bool) RGBColor { return HSL(h, s, l, isBg...) }
+
+// HSLInt create RGB color from a hsl int value.
+// more see HslIntToRgb()
+func HSLInt(h, s, l int, isBg ...bool) RGBColor {
+	rgb := HslIntToRgb(h, s, l)
+	return RGB(rgb[0], rgb[1], rgb[2], isBg...)
+}
+
+// HslInt alias of the HSLInt()
+func HslInt(h, s, l int, isBg ...bool) RGBColor { return HSLInt(h, s, l, isBg...) }
+
+// RGBFromSlice quick RGBColor from slice[3]
+func RGBFromSlice(rgb []uint8, isBg ...bool) RGBColor { return RGB(rgb[0], rgb[1], rgb[2], isBg...) }
+
 // RGBFromString create RGB color from a string.
+// Support use color name in the {namedRgbMap}
+//
 // Usage:
-// 	c := RGBFromString("170,187,204")
-// 	c.Print("message")
+//
+//	c := RGBFromString("170,187,204")
+//	c.Print("message")
+//
+//	c := RGBFromString("brown")
+//	c.Print("message with color brown")
 func RGBFromString(rgb string, isBg ...bool) RGBColor {
+	// use color name in the {namedRgbMap}
+	if rgbVal, ok := namedRgbMap[rgb]; ok {
+		rgb = rgbVal
+	}
+
+	// use rgb string.
 	ss := stringToArr(rgb, ",")
 	if len(ss) != 3 {
 		return emptyRGBColor
 	}
 
-	var ar [3]int
+	var ar [3]uint8
 	for i, val := range ss {
 		iv, err := strconv.Atoi(val)
-		if err != nil {
+		if err != nil || !isValidUint8(iv) {
 			return emptyRGBColor
 		}
 
-		ar[i] = iv
+		ar[i] = uint8(iv)
 	}
 
-	return RGB(uint8(ar[0]), uint8(ar[1]), uint8(ar[2]), isBg...)
+	return RGB(ar[0], ar[1], ar[2], isBg...)
 }
 
 // Set terminal by rgb/true color code
-func (c RGBColor) Set() error {
-	return SetTerminal(c.String())
-}
+func (c RGBColor) Set() error { return SetTerminal(c.String()) }
 
 // Reset terminal. alias of the ResetTerminal()
-func (c RGBColor) Reset() error {
-	return ResetTerminal()
-}
+func (c RGBColor) Reset() error { return ResetTerminal() }
 
 // Print print message
-func (c RGBColor) Print(a ...interface{}) {
+func (c RGBColor) Print(a ...any) {
 	doPrintV2(c.String(), fmt.Sprint(a...))
 }
 
 // Printf format and print message
-func (c RGBColor) Printf(format string, a ...interface{}) {
+func (c RGBColor) Printf(format string, a ...any) {
 	doPrintV2(c.String(), fmt.Sprintf(format, a...))
 }
 
 // Println print message with newline
-func (c RGBColor) Println(a ...interface{}) {
+func (c RGBColor) Println(a ...any) {
 	doPrintlnV2(c.String(), a)
 }
 
 // Sprint returns rendered message
-func (c RGBColor) Sprint(a ...interface{}) string {
-	return RenderCode(c.String(), a...)
-}
+func (c RGBColor) Sprint(a ...any) string { return RenderCode(c.String(), a...) }
 
 // Sprintf returns format and rendered message
-func (c RGBColor) Sprintf(format string, a ...interface{}) string {
+func (c RGBColor) Sprintf(format string, a ...any) string {
 	return RenderString(c.String(), fmt.Sprintf(format, a...))
 }
 
@@ -185,19 +207,18 @@ func (c RGBColor) Values() []int {
 }
 
 // Code to color code string without prefix. eg: "204;123;56"
-func (c RGBColor) Code() string {
-	return fmt.Sprintf("%d;%d;%d", c[0], c[1], c[2])
-}
+func (c RGBColor) Code() string { return fmt.Sprintf("%d;%d;%d", c[0], c[1], c[2]) }
 
 // Hex color rgb to hex string. as in "ff0080".
-func (c RGBColor) Hex() string {
-	return fmt.Sprintf("%02x%02x%02x", c[0], c[1], c[2])
+func (c RGBColor) Hex() string { return fmt.Sprintf("%02x%02x%02x", c[0], c[1], c[2]) }
+
+// RgbString to color code string without prefix. eg: "204,123,56"
+func (c RGBColor) RgbString() string {
+	return fmt.Sprintf("%d,%d,%d", c[0], c[1], c[2])
 }
 
 // FullCode to color code string with prefix
-func (c RGBColor) FullCode() string {
-	return c.String()
-}
+func (c RGBColor) FullCode() string { return c.String() }
 
 // String to color code string with prefix. eg: "38;2;204;123;56"
 func (c RGBColor) String() string {
@@ -213,11 +234,21 @@ func (c RGBColor) String() string {
 	return ""
 }
 
-// IsEmpty value
-func (c RGBColor) IsEmpty() bool {
-	return c[3] > AsBg
+// ToBg convert to background color
+func (c RGBColor) ToBg() RGBColor {
+	c[3] = AsBg
+	return c
 }
 
+// ToFg convert to foreground color
+func (c RGBColor) ToFg() RGBColor {
+	c[3] = AsFg
+	return c
+}
+
+// IsEmpty value
+func (c RGBColor) IsEmpty() bool { return c[3] > AsBg }
+
 // IsValid value
 // func (c RGBColor) IsValid() bool {
 // 	return c[3] <= AsBg
@@ -244,13 +275,13 @@ func (c RGBColor) C16() Color { return c.Basic() }
  * RGB Style
  *************************************************************/
 
-// RGBStyle definition.
+// RGBStyle supports set foreground and background color
 //
-// Foreground/Background color
 // All are composed of 4 digits uint8, the first three digits are the color value;
 // The last bit is different from RGBColor, here it indicates whether the value is set.
-// - 1  Has been set
-// - ^1 Not set
+//
+//	1    Has been set
+//	^1   Not set
 type RGBStyle struct {
 	// Name of the style
 	Name string
@@ -271,9 +302,11 @@ func NewRGBStyle(fg RGBColor, bg ...RGBColor) *RGBStyle {
 }
 
 // HEXStyle create a RGBStyle from HEX color string.
+//
 // Usage:
-// 	s := HEXStyle("aabbcc", "eee")
-// 	s.Print("message")
+//
+//	s := HEXStyle("aabbcc", "eee")
+//	s.Print("message")
 func HEXStyle(fg string, bg ...string) *RGBStyle {
 	s := &RGBStyle{}
 	if len(bg) > 0 {
@@ -283,14 +316,15 @@ func HEXStyle(fg string, bg ...string) *RGBStyle {
 	if len(fg) > 0 {
 		s.SetFg(HEX(fg))
 	}
-
 	return s
 }
 
 // RGBStyleFromString create a RGBStyle from color value string.
+//
 // Usage:
-// 	s := RGBStyleFromString("170,187,204", "70,87,4")
-// 	s.Print("message")
+//
+//	s := RGBStyleFromString("170,187,204", "70,87,4")
+//	s.Print("message")
 func RGBStyleFromString(fg string, bg ...string) *RGBStyle {
 	s := &RGBStyle{}
 	if len(bg) > 0 {
@@ -332,39 +366,33 @@ func (s *RGBStyle) AddOpts(opts ...Color) *RGBStyle {
 }
 
 // Print print message
-func (s *RGBStyle) Print(a ...interface{}) {
+func (s *RGBStyle) Print(a ...any) {
 	doPrintV2(s.String(), fmt.Sprint(a...))
 }
 
 // Printf format and print message
-func (s *RGBStyle) Printf(format string, a ...interface{}) {
+func (s *RGBStyle) Printf(format string, a ...any) {
 	doPrintV2(s.String(), fmt.Sprintf(format, a...))
 }
 
 // Println print message with newline
-func (s *RGBStyle) Println(a ...interface{}) {
+func (s *RGBStyle) Println(a ...any) {
 	doPrintlnV2(s.String(), a)
 }
 
 // Sprint returns rendered message
-func (s *RGBStyle) Sprint(a ...interface{}) string {
-	return RenderCode(s.String(), a...)
-}
+func (s *RGBStyle) Sprint(a ...any) string { return RenderCode(s.String(), a...) }
 
 // Sprintf returns format and rendered message
-func (s *RGBStyle) Sprintf(format string, a ...interface{}) string {
+func (s *RGBStyle) Sprintf(format string, a ...any) string {
 	return RenderString(s.String(), fmt.Sprintf(format, a...))
 }
 
 // Code convert to color code string
-func (s *RGBStyle) Code() string {
-	return s.String()
-}
+func (s *RGBStyle) Code() string { return s.String() }
 
 // FullCode convert to color code string
-func (s *RGBStyle) FullCode() string {
-	return s.String()
-}
+func (s *RGBStyle) FullCode() string { return s.String() }
 
 // String convert to color code string
 func (s *RGBStyle) String() string {
@@ -386,6 +414,4 @@ func (s *RGBStyle) String() string {
 }
 
 // IsEmpty style
-func (s *RGBStyle) IsEmpty() bool {
-	return s.fg[3] != 1 && s.bg[3] != 1
-}
+func (s *RGBStyle) IsEmpty() bool { return s.fg[3] != 1 && s.bg[3] != 1 }
diff --git a/vendor/github.com/gookit/color/color_tag.go b/vendor/github.com/gookit/color/color_tag.go
index 051ba84fe..f78214373 100644
--- a/vendor/github.com/gookit/color/color_tag.go
+++ b/vendor/github.com/gookit/color/color_tag.go
@@ -38,8 +38,12 @@ var (
  * internal defined color tags
  *************************************************************/
 
-// There are internal defined color tags
-// Usage: content text
+// There are internal defined fg color tags
+//
+// Usage:
+//
+//	content text
+//
 // @notice 加 0 在前面是为了防止之前的影响到现在的设置
 var colorTags = map[string]string{
 	// basic tags
@@ -72,7 +76,9 @@ var colorTags = map[string]string{
 	"magenta":  "0;35",
 	"mga":      "0;35", // short name
 	"magentaB": "1;35", // with bold
+	"magenta1": "1;35",
 	"mgb":      "1;35",
+	"mga1":     "1;35",
 	"mgaB":     "1;35",
 
 	// light/hi tags
@@ -90,7 +96,7 @@ var colorTags = map[string]string{
 	"light_magenta": "0;95",
 	"hiMagenta":     "0;95",
 	"hi_magenta":    "0;95",
-	"lightMagentaB": "1;95", // with bold
+	"lightMagenta1": "1;95", // with bold
 	"hiMagentaB":    "1;95", // with bold
 	"hi_magenta_b":  "1;95",
 	"lightRed":      "0;91",
@@ -127,9 +133,14 @@ var colorTags = map[string]string{
 	// option
 	"bold":       "1",
 	"b":          "1",
+	"italic":     "3",
+	"i":          "3", // italic
 	"underscore": "4",
 	"us":         "4", // short name for 'underscore'
+	"blink":      "5",
+	"fb":         "6", // fast blink
 	"reverse":    "7",
+	"st":         "9", // strikethrough
 
 	// alert tags, like bootstrap's alert
 	"suc":     "1;32", // same "green" and "bold"
@@ -146,12 +157,141 @@ var colorTags = map[string]string{
 	"error":   "97;41", // fg light white; bg red
 }
 
+/*************************************************************
+ * internal defined tag attributes
+ *************************************************************/
+
+// built-in attributes for fg,bg 16-colors and op codes.
+var (
+	attrFgs = map[string]string{
+		// basic colors
+
+		"black":   FgBlack.Code(),
+		"red":     "31",
+		"green":   "32",
+		"brown":   "33", // #A52A2A
+		"yellow":  "33",
+		"ylw":     "33",
+		"blue":    "34",
+		"cyan":    "36",
+		"magenta": "35",
+		"mga":     "35",
+		"white":   FgWhite.Code(),
+		"default": "39", // no color
+		"normal":  "39", // no color
+
+		// light/hi colors
+
+		"darkGray":      FgDarkGray.Code(),
+		"dark_gray":     "90",
+		"gray":          "90",
+		"lightYellow":   "93",
+		"light_yellow":  "93",
+		"hiYellow":      "93",
+		"hi_yellow":     "93",
+		"lightMagenta":  "95",
+		"light_magenta": "95",
+		"hiMagenta":     "95",
+		"hi_magenta":    "95",
+		"hi_mga":        "95",
+		"lightRed":      "91",
+		"light_red":     "91",
+		"hiRed":         "91",
+		"hi_red":        "91",
+		"lightGreen":    "92",
+		"light_green":   "92",
+		"hiGreen":       "92",
+		"hi_green":      "92",
+		"lightBlue":     "94",
+		"light_blue":    "94",
+		"hiBlue":        "94",
+		"hi_blue":       "94",
+		"lightCyan":     "96",
+		"light_cyan":    "96",
+		"hiCyan":        "96",
+		"hi_cyan":       "96",
+		"lightWhite":    "97",
+		"light_white":   "97",
+	}
+
+	attrBgs = map[string]string{
+		// basic colors
+
+		"black":   BgBlack.Code(),
+		"red":     "41",
+		"green":   "42",
+		"brown":   "43", // #A52A2A
+		"yellow":  "43",
+		"ylw":     "43",
+		"blue":    "44",
+		"cyan":    "46",
+		"magenta": "45",
+		"mga":     "45",
+		"white":   FgWhite.Code(),
+		"default": "49", // no color
+		"normal":  "49", // no color
+
+		// light/hi colors
+
+		"darkGray":      BgDarkGray.Code(),
+		"dark_gray":     "100",
+		"gray":          "100",
+		"lightYellow":   "103",
+		"light_yellow":  "103",
+		"hiYellow":      "103",
+		"hi_yellow":     "103",
+		"lightMagenta":  "105",
+		"light_magenta": "105",
+		"hiMagenta":     "105",
+		"hi_magenta":    "105",
+		"hi_mga":        "105",
+		"lightRed":      "101",
+		"light_red":     "101",
+		"hiRed":         "101",
+		"hi_red":        "101",
+		"lightGreen":    "102",
+		"light_green":   "102",
+		"hiGreen":       "102",
+		"hi_green":      "102",
+		"lightBlue":     "104",
+		"light_blue":    "104",
+		"hiBlue":        "104",
+		"hi_blue":       "104",
+		"lightCyan":     "106",
+		"light_cyan":    "106",
+		"hiCyan":        "106",
+		"hi_cyan":       "106",
+		"lightWhite":    BgLightWhite.Code(),
+		"light_white":   "107",
+	}
+
+	attrOpts = map[string]string{
+		"reset":         OpReset.Code(),
+		"bold":          OpBold.Code(),
+		"b":             OpBold.Code(),
+		"fuzzy":         OpFuzzy.Code(),
+		"italic":        OpItalic.Code(),
+		"i":             OpItalic.Code(),
+		"underscore":    OpUnderscore.Code(),
+		"us":            OpUnderscore.Code(),
+		"u":             OpUnderscore.Code(),
+		"blink":         OpBlink.Code(),
+		"fastblink":     OpFastBlink.Code(),
+		"fb":            OpFastBlink.Code(),
+		"reverse":       OpReverse.Code(),
+		"concealed":     OpConcealed.Code(),
+		"strikethrough": OpStrikethrough.Code(),
+		"st":            OpStrikethrough.Code(),
+	}
+)
+
 /*************************************************************
  * parse color tags
  *************************************************************/
 
 var (
 	tagParser = TagParser{}
+	// regex for match color 256 code
 	rxNumStr  = regexp.MustCompile("^[0-9]{1,3}$")
 	rxHexCode = regexp.MustCompile("^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$")
 )
@@ -182,11 +322,20 @@ func (tp *TagParser) ParseByEnv(str string) string {
 	if !Enable || !SupportColor() {
 		return ClearTag(str)
 	}
-
 	return tp.Parse(str)
 }
 
-// Parse parse given string, replace color tag and return rendered string
+// Parse given string, replace color tag and return rendered string
+//
+// Use built in tags:
+//
+//	CONTENT
+//	// e.g: `message`
+//
+// Custom tag attributes:
+//
+//	`CONTENT`
+//	// e.g: `wel`
 func (tp *TagParser) Parse(str string) string {
 	// not contains color tag
 	if !strings.Contains(str, "") {
@@ -198,14 +347,15 @@ func (tp *TagParser) Parse(str string) string {
 
 	// item: 0 full text 1 tag name 2 tag content
 	for _, item := range matched {
-		full, tag, content := item[0], item[1], item[2]
+		full, tag, body := repairMatchedTag(item[0], item[1], item[2])
 
-		// use defined tag name: "content" -> tag: "info"
+		// use defined color tag name: "content" -> tag: "info"
 		if !strings.ContainsRune(tag, '=') {
-			code := colorTags[tag]
-			if len(code) > 0 {
-				now := RenderString(code, content)
-				// old := WrapTag(content, tag) is equals to var 'full'
+			if code := colorTags[tag]; len(code) > 0 {
+				str = strings.Replace(str, full, RenderString(code, body), 1)
+			} else if code, ok := namedRgbMap[tag]; ok {
+				code = strings.Replace(code, ",", ";", -1)
+				now := RenderString(FgRGBPfx+code, body)
 				str = strings.Replace(str, full, now, 1)
 			}
 			continue
@@ -214,17 +364,25 @@ func (tp *TagParser) Parse(str string) string {
 		// custom color in tag
 		// - basic: "fg=white;bg=blue;op=bold"
 		if code := ParseCodeFromAttr(tag); len(code) > 0 {
-			now := RenderString(code, content)
-			str = strings.Replace(str, full, now, 1)
+			str = strings.Replace(str, full, RenderString(code, body), 1)
 		}
 	}
 
 	return str
 }
 
-// func (tp *TagParser) ParseAttr(attr string) (code string) {
-// 	return
-// }
+func repairMatchedTag(full, tag, body string) (string, string, string) {
+	if len(colorTags[tag]) == 0 && len(namedRgbMap[tag]) == 0 && len(ParseCodeFromAttr(tag)) == 0 {
+		if matched := matchRegex.FindAllStringSubmatch(strings.TrimPrefix(full, "<"+tag+">"), -1); len(matched) > 0 {
+			full = matched[0][0]
+			tag = matched[0][1]
+			body = matched[0][2]
+			return repairMatchedTag(full, tag, body)
+		}
+	}
+
+	return full, tag, body
+}
 
 // ReplaceTag parse string, replace color tag and return rendered string
 func ReplaceTag(str string) string {
@@ -234,23 +392,30 @@ func ReplaceTag(str string) string {
 // ParseCodeFromAttr parse color attributes.
 //
 // attr format:
-// 	// VALUE please see var: FgColors, BgColors, AllOptions
-// 	"fg=VALUE;bg=VALUE;op=VALUE"
+//
+//	// VALUE please see var: FgColors, BgColors, AllOptions
+//	"fg=VALUE;bg=VALUE;op=VALUE"
+//
 // 16 color:
-// 	"fg=yellow"
-// 	"bg=red"
-// 	"op=bold,underscore" option is allow multi value
-// 	"fg=white;bg=blue;op=bold"
-// 	"fg=white;op=bold,underscore"
+//
+//	"fg=yellow"
+//	"bg=red"
+//	"op=bold,underscore" // option is allow multi value
+//	"fg=white;bg=blue;op=bold"
+//	"fg=white;op=bold,underscore"
+//
 // 256 color:
+//
 //	"fg=167"
 //	"fg=167;bg=23"
 //	"fg=167;bg=23;op=bold"
-// true color:
-// 	// hex
+//
+// True color:
+//
+//	// hex
 //	"fg=fc1cac"
 //	"fg=fc1cac;bg=c2c3c4"
-// 	// r,g,b
+//	// r,g,b
 //	"fg=23,45,214"
 //	"fg=23,45,214;bg=109,99,88"
 func ParseCodeFromAttr(attr string) (code string) {
@@ -270,18 +435,14 @@ func ParseCodeFromAttr(attr string) (code string) {
 		pos, val := item[1], item[2]
 		switch pos {
 		case "fg":
-			if c, ok := FgColors[val]; ok { // basic
-				codes = append(codes, c.String())
-			} else if c, ok := ExFgColors[val]; ok { // extra
-				codes = append(codes, c.String())
+			if code, ok := attrFgs[val]; ok { // attr fg
+				codes = append(codes, code)
 			} else if code := rgbHex256toCode(val, false); code != "" {
 				codes = append(codes, code)
 			}
 		case "bg":
-			if c, ok := BgColors[val]; ok { // basic bg
-				codes = append(codes, c.String())
-			} else if c, ok := ExBgColors[val]; ok { // extra bg
-				codes = append(codes, c.String())
+			if code, ok := attrBgs[val]; ok { // attr bg
+				codes = append(codes, code)
 			} else if code := rgbHex256toCode(val, true); code != "" {
 				codes = append(codes, code)
 			}
@@ -289,12 +450,12 @@ func ParseCodeFromAttr(attr string) (code string) {
 			if strings.Contains(val, ",") {
 				ns := strings.Split(val, ",")
 				for _, n := range ns {
-					if c, ok := AllOptions[n]; ok {
-						codes = append(codes, c.String())
+					if code, ok := attrOpts[n]; ok { // attr ops
+						codes = append(codes, code)
 					}
 				}
-			} else if c, ok := AllOptions[val]; ok {
-				codes = append(codes, c.String())
+			} else if code, ok := attrOpts[val]; ok {
+				codes = append(codes, code)
 			}
 		}
 	}
@@ -327,7 +488,6 @@ func ClearTag(s string) string {
 	if !strings.Contains(s, "") {
 		return s
 	}
-
 	return stripRegex.ReplaceAllString(s, "")
 }
 
@@ -336,12 +496,10 @@ func ClearTag(s string) string {
  *************************************************************/
 
 // GetTagCode get color code by tag name
-func GetTagCode(name string) string {
-	return colorTags[name]
-}
+func GetTagCode(name string) string { return colorTags[name] }
 
 // ApplyTag for messages
-func ApplyTag(tag string, a ...interface{}) string {
+func ApplyTag(tag string, a ...any) string {
 	return RenderCode(GetTagCode(tag), a...)
 }
 
@@ -350,7 +508,6 @@ func WrapTag(s string, tag string) string {
 	if s == "" || tag == "" {
 		return s
 	}
-
 	return fmt.Sprintf("<%s>%s", tag, s)
 }
 
@@ -371,11 +528,12 @@ func IsDefinedTag(name string) bool {
 
 // Tag value is a defined style name
 // Usage:
-// 	Tag("info").Println("message")
+//
+//	Tag("info").Println("message")
 type Tag string
 
 // Print messages
-func (tg Tag) Print(a ...interface{}) {
+func (tg Tag) Print(a ...any) {
 	name := string(tg)
 	str := fmt.Sprint(a...)
 
@@ -387,7 +545,7 @@ func (tg Tag) Print(a ...interface{}) {
 }
 
 // Printf format and print messages
-func (tg Tag) Printf(format string, a ...interface{}) {
+func (tg Tag) Printf(format string, a ...any) {
 	name := string(tg)
 	str := fmt.Sprintf(format, a...)
 
@@ -399,7 +557,7 @@ func (tg Tag) Printf(format string, a ...interface{}) {
 }
 
 // Println messages line
-func (tg Tag) Println(a ...interface{}) {
+func (tg Tag) Println(a ...any) {
 	name := string(tg)
 	if stl := GetStyle(name); !stl.IsEmpty() {
 		stl.Println(a...)
@@ -409,17 +567,12 @@ func (tg Tag) Println(a ...interface{}) {
 }
 
 // Sprint render messages
-func (tg Tag) Sprint(a ...interface{}) string {
-	name := string(tg)
-	// if stl := GetStyle(name); !stl.IsEmpty() {
-	// 	return stl.Render(args...)
-	// }
-
-	return RenderCode(GetTagCode(name), a...)
+func (tg Tag) Sprint(a ...any) string {
+	return RenderCode(GetTagCode(string(tg)), a...)
 }
 
 // Sprintf format and render messages
-func (tg Tag) Sprintf(format string, a ...interface{}) string {
+func (tg Tag) Sprintf(format string, a ...any) string {
 	tag := string(tg)
 	str := fmt.Sprintf(format, a...)
 
diff --git a/vendor/github.com/gookit/color/convert.go b/vendor/github.com/gookit/color/convert.go
index d641fb767..21344e70a 100644
--- a/vendor/github.com/gookit/color/convert.go
+++ b/vendor/github.com/gookit/color/convert.go
@@ -3,10 +3,32 @@ package color
 import (
 	"fmt"
 	"math"
+	"sort"
 	"strconv"
 	"strings"
 )
 
+// values from https://github.com/go-terminfo/terminfo
+// var (
+// RgbaBlack    = image_color.RGBA{0, 0, 0, 255}
+// Red       = color.RGBA{205, 0, 0, 255}
+// Green     = color.RGBA{0, 205, 0, 255}
+// Orange    = color.RGBA{205, 205, 0, 255}
+// Blue      = color.RGBA{0, 0, 238, 255}
+// Magenta   = color.RGBA{205, 0, 205, 255}
+// Cyan      = color.RGBA{0, 205, 205, 255}
+// LightGrey = color.RGBA{229, 229, 229, 255}
+//
+// DarkGrey     = color.RGBA{127, 127, 127, 255}
+// LightRed     = color.RGBA{255, 0, 0, 255}
+// LightGreen   = color.RGBA{0, 255, 0, 255}
+// Yellow       = color.RGBA{255, 255, 0, 255}
+// LightBlue    = color.RGBA{92, 92, 255, 255}
+// LightMagenta = color.RGBA{255, 0, 255, 255}
+// LightCyan    = color.RGBA{0, 255, 255, 255}
+// White        = color.RGBA{255, 255, 255, 255}
+// )
+
 var (
 	// ---------- basic(16) <=> 256 color convert ----------
 	basicTo256Map = map[uint8]uint8{
@@ -30,6 +52,7 @@ var (
 
 	// ---------- basic(16) <=> RGB color convert ----------
 	// refer from Hyper app
+	// Tip: only keep foreground color, background color need convert to foreground color for convert to RGB
 	basic2hexMap = map[uint8]string{
 		30: "000000", // black
 		31: "c51e14", // red
@@ -39,6 +62,15 @@ var (
 		35: "c839c5", // magenta
 		36: "20c5c6", // cyan
 		37: "c7c7c7", // white
+		// - don't add bg color, convert to fg color for convert to RGB
+		// 40:  "000000", // black
+		// 41:  "c51e14", // red
+		// 42:  "1dc121", // green
+		// 43:  "c7c329", // yellow
+		// 44:  "0a2fc4", // blue
+		// 45:  "c839c5", // magenta
+		// 46:  "20c5c6", // cyan
+		// 47:  "c7c7c7", // white
 		90: "686868", // lightBlack/darkGray
 		91: "fd6f6b", // lightRed
 		92: "67f86f", // lightGreen
@@ -47,6 +79,15 @@ var (
 		95: "fd7cfc", // lightMagenta
 		96: "68fdfe", // lightCyan
 		97: "ffffff", // lightWhite
+		// - don't add bg color
+		// 100: "686868", // lightBlack/darkGray
+		// 101: "fd6f6b", // lightRed
+		// 102: "67f86f", // lightGreen
+		// 103: "fffa72", // lightYellow
+		// 104: "6a76fb", // lightBlue
+		// 105: "fd7cfc", // lightMagenta
+		// 106: "68fdfe", // lightCyan
+		// 107: "ffffff", // lightWhite
 	}
 	// will convert data from basic2hexMap
 	hex2basicMap = initHex2basicMap()
@@ -376,6 +417,7 @@ func Colors2code(colors ...Color) string {
 }
 
 /*************************************************************
+ * region HEX <=> RGB
  * HEX code <=> RGB/True color code
  *************************************************************/
 
@@ -388,10 +430,11 @@ func HexToRGB(hex string) []int { return HexToRgb(hex) }
 // HexToRgb convert hex color string to RGB numbers
 //
 // Usage:
-// 	rgb := HexToRgb("ccc") // rgb: [204 204 204]
-// 	rgb := HexToRgb("aabbcc") // rgb: [170 187 204]
-// 	rgb := HexToRgb("#aabbcc") // rgb: [170 187 204]
-// 	rgb := HexToRgb("0xad99c0") // rgb: [170 187 204]
+//
+//	rgb := HexToRgb("ccc") // rgb: [204 204 204]
+//	rgb := HexToRgb("aabbcc") // rgb: [170 187 204]
+//	rgb := HexToRgb("#aabbcc") // rgb: [170 187 204]
+//	rgb := HexToRgb("0xad99c0") // rgb: [170 187 204]
 func HexToRgb(hex string) (rgb []int) {
 	hex = strings.TrimSpace(hex)
 	if hex == "" {
@@ -434,9 +477,10 @@ func Rgb2hex(rgb []int) string { return RgbToHex(rgb) }
 // RgbToHex convert RGB-code to hex-code
 //
 // Usage:
+//
 //	hex := RgbToHex([]int{170, 187, 204}) // hex: "aabbcc"
 func RgbToHex(rgb []int) string {
-	hexNodes := make([]string, len(rgb))
+	hexNodes := make([]string, 0, len(rgb))
 
 	for _, v := range rgb {
 		hexNodes = append(hexNodes, strconv.FormatInt(int64(v), 16))
@@ -445,17 +489,29 @@ func RgbToHex(rgb []int) string {
 }
 
 /*************************************************************
+ * region 4bit(16) <=> RGB
  * 4bit(16) color <=> RGB/True color
  *************************************************************/
 
-// Basic2hex convert basic color to hex string.
-func Basic2hex(val uint8) string {
+// BasicToHex convert basic color to hex string.
+func BasicToHex(val uint8) string {
+	val = Bg2Fg(val)
 	return basic2hexMap[val]
 }
 
+// Basic2hex convert basic color to hex string.
+func Basic2hex(val uint8) string {
+	return BasicToHex(val)
+}
+
 // Hex2basic convert hex string to basic color code.
-func Hex2basic(hex string) uint8 {
-	return hex2basicMap[hex]
+func Hex2basic(hex string, asBg ...bool) uint8 {
+	val := hex2basicMap[hex]
+
+	if len(asBg) > 0 && asBg[0] {
+		return Fg2Bg(val)
+	}
+	return val
 }
 
 // Rgb2basic alias of the RgbToAnsi()
@@ -472,7 +528,7 @@ func Rgb2basic(r, g, b uint8, isBg bool) uint8 {
 	return RgbToAnsi(r, g, b, isBg)
 }
 
-// Rgb2ansi alias of the RgbToAnsi()
+// Rgb2ansi convert RGB-code to 16-code, alias of the RgbToAnsi()
 func Rgb2ansi(r, g, b uint8, isBg bool) uint8 {
 	return RgbToAnsi(r, g, b, isBg)
 }
@@ -591,3 +647,508 @@ func C256ToRgbV1(val uint8) (rgb []uint8) {
 
 	return []uint8{r, g, b}
 }
+
+/**************************************************************
+ * region HSL <=> RGB color
+ ************************************************************
+ * h,s,l = Hue, Saturation, Lightness 色相、饱和度、亮度
+ *
+ * refers
+ *  http://en.wikipedia.org/wiki/HSL_color_space
+ *  https://www.w3.org/TR/css-color-3/#hsl-color
+ *  https://stackoverflow.com/questions/2353211/hsl-to-rgb-color-conversion
+ *	https://github.com/less/less.js/blob/master/packages/less/src/less/functions/color.js
+ *  https://github.com/d3/d3-color/blob/v3.0.1/README.md#hsl
+ *
+ * examples:
+ *  color: hsl(0, 100%, 50%)   // red
+ *  color: hsl(120, 100%, 50%) // lime
+ *  color: hsl(120, 100%, 25%) // dark green
+ *  color: hsl(120, 100%, 75%) // light green
+ *  color: hsl(120, 75%, 75%)  // pastel green, and so on
+ */
+
+// HslIntToRgb Converts an HSL color value to RGB
+// Assumes h: 0-360, s: 0-100%, l: 0-100%
+// returns r, g, and b in the set [0, 255].
+//
+// Usage:
+//
+//	HslIntToRgb(0, 100, 50) // red
+//	HslIntToRgb(120, 100, 50) // lime
+//	HslIntToRgb(120, 100, 25) // dark green
+//	HslIntToRgb(120, 100, 75) // light green
+func HslIntToRgb(h, s, l int) (rgb []uint8) {
+	return HslToRgb(float64(h)/360, float64(s)/100, float64(l)/100)
+}
+
+// HslToRgb Converts an HSL color value to RGB. Conversion formula
+// adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+// Assumes h, s, and l are contained in the set [0, 1]
+// returns r, g, and b in the set [0, 255].
+//
+// Usage:
+//
+//	rgbVals := HslToRgb(0, 1, 0.5) // red
+func HslToRgb(h, s, l float64) (rgb []uint8) {
+	var r, g, b float64
+
+	if s == 0 { // achromatic
+		r, g, b = l, l, l
+	} else {
+		// q = l < 0.5 ? l * (1 + s) : l + s - l*s
+		var q float64
+		if l < 0.5 {
+			q = l * (1.0 + s)
+		} else {
+			q = l + s - l*s
+		}
+
+		var p = 2.0*l - q
+
+		r = hue2rgb(p, q, h+1.0/3.0)
+		g = hue2rgb(p, q, h)
+		b = hue2rgb(p, q, h-1.0/3.0)
+	}
+
+	// return []uint8{uint8(r * 255), uint8(g * 255), uint8(b * 255)}
+	return []uint8{
+		uint8(math.Round(r * 255)),
+		uint8(math.Round(g * 255)),
+		uint8(math.Round(b * 255)),
+	}
+}
+
+var hue2rgb = func(p, q, t float64) float64 {
+	if t < 0.0 {
+		t += 1
+	}
+	if t > 1.0 {
+		t -= 1
+	}
+
+	if t < 1.0/6.0 {
+		return p + (q-p)*6.0*t
+	}
+
+	if t < 1.0/2.0 {
+		return q
+	}
+
+	if t < 2.0/3.0 {
+		return p + (q-p)*(2.0/3.0-t)*6.0
+	}
+	return p
+}
+
+// RgbStrToHslInts convert rgb(r,g,b) string to HSL int values.
+func RgbStrToHslInts(rgbStr string) []int {
+	f64s := RgbStrToHsl(rgbStr)
+	if f64s == nil {
+		return nil
+	}
+
+	return []int{
+		int(math.Round(f64s[0] * 360)),
+		int(math.Round(f64s[1] * 100)),
+		int(math.Round(f64s[2] * 100)),
+	}
+}
+
+// RgbStrToHsl convert rgb(r,g,b) string to HSL
+func RgbStrToHsl(rgbStr string) []float64 {
+	if pos := strings.IndexByte(rgbStr, '('); pos > 0 {
+		rgbStr = strings.TrimRight(rgbStr[pos+1:], "()")
+	}
+
+	rgbVals := strings.Split(rgbStr, ",")
+	if len(rgbVals) != 3 {
+		return nil
+	}
+
+	r, e1 := strconv.ParseInt(strings.TrimSpace(rgbVals[0]), 10, 0)
+	if e1 != nil || r < 0 || r > 255 {
+		return nil
+	}
+	g, e2 := strconv.ParseInt(strings.TrimSpace(rgbVals[1]), 10, 0)
+	if e2 != nil || g < 0 || g > 255 {
+		return nil
+	}
+	b, e3 := strconv.ParseInt(strings.TrimSpace(rgbVals[2]), 10, 0)
+	if e3 != nil || b < 0 || b > 255 {
+		return nil
+	}
+	return RgbToHsl(uint8(r), uint8(g), uint8(b))
+}
+
+// RgbToHslInt Converts an RGB color value to HSL. Conversion formula
+// Assumes r, g, and b are contained in the set [0, 255] and
+// returns [h,s,l] h: 0-360, s: 0-100%, l: 0-100%.
+func RgbToHslInt(r, g, b uint8) []int {
+	f64s := RgbToHsl(r, g, b)
+	return []int{
+		int(math.Round(f64s[0] * 360)),
+		int(math.Round(f64s[1] * 100)),
+		int(math.Round(f64s[2] * 100)),
+	}
+}
+
+// RgbToHsl Converts an RGB color value to HSL. Conversion formula
+//
+// adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+//
+// e.g: rgb(59, 130, 246) = hsl(217, 91%, 60%)
+//
+// Assumes r, g, and b are contained in the set [0, 255] and
+// returns h, s, and l in the set [0, 1].
+func RgbToHsl(r, g, b uint8) []float64 {
+	// to float64
+	fr, fg, fb := float64(r), float64(g), float64(b)
+	// percentage
+	pr, pg, pb := fr/255.0, fg/255.0, fb/255.0
+
+	ps := []float64{pr, pg, pb}
+	sort.Float64s(ps)
+
+	min1, max1 := ps[0], ps[2]
+	// max := math.Max(math.Max(pr, pg), pb)
+	// min := math.Min(math.Min(pr, pg), pb)
+	mid := (max1 + min1) / 2.0 // call Lightness
+
+	h, s, l := mid, mid, mid
+	// calc Saturation
+	if max1 == min1 {
+		h, s = 0, 0 // achromatic
+	} else {
+		var d = max1 - min1 // 计算色差
+		// s = l > 0.5 ? d / (2 - max1 - min1) : d / (max1 + min1)
+		s = compareF64(l > 0.5, d/(2.0-max1-min1), d/(max1+min1))
+
+		// calc Hue
+		switch max1 {
+		case pr:
+			// h = (g - b) / d + (g < b ? 6 : 0)
+			h = (pg - pb) / d
+			h += compareF64(g < b, 6, 0)
+		case pg:
+			h = (pb-pr)/d + 2
+		case pb:
+			h = (pr-pg)/d + 4
+		}
+
+		h /= 6
+	}
+
+	return []float64{h, s, l}
+}
+
+/**************************************************************
+ * region HSV/HSB <=> RGB color
+ ************************************************************
+ * h,s,v/b = Hue, Saturation, Value(Brightness) 色相、饱和度、值（亮度）
+ *
+ * refers
+ *  https://stackoverflow.com/questions/2353211/hsl-to-rgb-color-conversion
+ *	https://github.com/less/less.js/blob/master/packages/less/src/less/functions/color.js
+ *  https://github.com/d3/d3-color/blob/v3.0.1/README.md#hsl
+ */
+
+// function aliases
+var (
+	HsvToRgb = HSVToRGB
+	// HsvIntToRgbInts alias for HSVIntToRGBInts
+	HsvIntToRgbInts = HSVIntToRGBInts
+)
+
+// HSVIntToRGBInts Converts an HSL color value to RGB slice. Conversion formula
+// adapted from https://en.wikipedia.org/wiki/HSL_and_HSV#HSV_to_RGB
+//
+//  Assumes h: 0-360, s: 0-100, l: 0-100
+//  returns r, g, and b in the set [0, 255].
+func HSVIntToRGBInts(h, s, v int) []uint8 {
+	r, g, b := HSVToRGB(float64(h), float64(s)/100, float64(v)/100)
+	return []uint8{r, g, b}
+}
+
+// HSVToRGB Convert HSV values to RGB values
+//   - inputs: h (0-360), s (0-1.0), v (0-1.0)
+//   - returns: r, g, b (0-255)
+func HSVToRGB(h, s, v float64) (r, g, b uint8) {
+	// 1. 处理特殊情况：饱和度为0（灰色）
+	if s == 0 {
+		gray := uint8(v * 255)
+		return gray, gray, gray
+	}
+
+	// 2. 确保h在0-360范围内
+	h = math.Mod(h, 360)
+	if h < 0 {
+		h += 360
+	}
+
+	// 3. 将h转换为0-6范围
+	hSector := float64(h) / 60.0
+	fraction := hSector - math.Floor(hSector)
+	sector := int(math.Floor(hSector))
+
+	// 4. 计算中间值
+	p := v * (1 - s)
+	q := v * (1 - fraction*s)
+	t := v * (1 - (1-fraction)*s)
+
+	// 5. 根据色相扇区计算RGB
+	switch sector {
+	case 0:
+		r = uint8(v * 255)
+		g = uint8(t * 255)
+		b = uint8(p * 255)
+	case 1:
+		r = uint8(q * 255)
+		g = uint8(v * 255)
+		b = uint8(p * 255)
+	case 2:
+		r = uint8(p * 255)
+		g = uint8(v * 255)
+		b = uint8(t * 255)
+	case 3:
+		r = uint8(p * 255)
+		g = uint8(q * 255)
+		b = uint8(v * 255)
+	case 4:
+		r = uint8(t * 255)
+		g = uint8(p * 255)
+		b = uint8(v * 255)
+	case 5:
+		r = uint8(v * 255)
+		g = uint8(p * 255)
+		b = uint8(q * 255)
+	}
+
+	return r, g, b
+}
+
+// function aliases
+var (
+	RgbToHsv      = RGBToHSV
+	RgbToHsvInts  = RGBToHSVInts
+	RgbToHsvSlice = RGBToHSVSlice
+)
+
+// RGBToHSVInts convert RGB to HSV int values.
+//
+//	r, g, b: [0, 255]  => h (0-360), s (0-100), v (0-100)
+func RGBToHSVInts(r, g, b uint8) []int {
+	h, s, v := RGBToHSV(r, g, b)
+	return []int{int(h), int(math.Round(s * 100)), int(math.Round(v * 100))}
+}
+
+// RGBToHSVSlice Convert RGB values to HSV values slice.
+//
+//	r, g, b (0-255)  => h (0-360), s (0-1.0), v (0-1.0)
+func RGBToHSVSlice(r, g, b uint8) []float64 {
+	h, s, v := RGBToHSV(r, g, b)
+	return []float64{h, s, v}
+}
+
+// RGBToHSV Convert RGB values to HSV values
+//   - inputs: r, g, b (0-255)
+//   - returns: h (0-360), s (0-1.0), v (0-1.0)
+func RGBToHSV(r, g, b uint8) (h, s, v float64) {
+	// 1. 将RGB值归一化到 [0, 1] 范围
+	rNorm := float64(r) / 255.0
+	gNorm := float64(g) / 255.0
+	bNorm := float64(b) / 255.0
+
+	// 2. 找出最大值和最小值
+	max1 := math.Max(math.Max(rNorm, gNorm), bNorm)
+	min1 := math.Min(math.Min(rNorm, gNorm), bNorm)
+	delta := max1 - min1
+
+	// 3. 计算明度 (Value)
+	v = max1
+
+	// 4. 计算饱和度 (Saturation)
+	if max1 == 0 {
+		// 黑色情况，饱和度为0
+		s = 0
+	} else {
+		s = delta / max1
+	}
+
+	// 5. 计算色相 (Hue)
+	if delta == 0 {
+		// 灰色情况，色相为0
+		h = 0
+	} else {
+		switch max1 {
+		case rNorm:
+			h = (gNorm - bNorm) / delta
+			if gNorm < bNorm {
+				h += 6
+			}
+		case gNorm:
+			h = (bNorm-rNorm)/delta + 2
+		case bNorm:
+			h = (rNorm-gNorm)/delta + 4
+		}
+		h *= 60 // 转换为角度 (0-360度)
+	}
+
+	return h, s, v
+}
+
+//
+// region Named RGB color
+//
+
+// Named rgb colors
+// https://www.w3.org/TR/css-color-3/#svg-color
+var namedRgbMap = map[string]string{
+	"aliceblue":            "240,248,255", // #F0F8FF
+	"antiquewhite":         "250,235,215", // #FAEBD7
+	"aqua":                 "0,255,255",   // #00FFFF
+	"aquamarine":           "127,255,212", // #7FFFD4
+	"azure":                "240,255,255", // #F0FFFF
+	"beige":                "245,245,220", // #F5F5DC
+	"bisque":               "255,228,196", // #FFE4C4
+	"black":                "0,0,0",       // #000000
+	"blanchedalmond":       "255,235,205", // #FFEBCD
+	"blue":                 "0,0,255",     // #0000FF
+	"blueviolet":           "138,43,226",  // #8A2BE2
+	"brown":                "165,42,42",   // #A52A2A
+	"burlywood":            "222,184,135", // #DEB887
+	"cadetblue":            "95,158,160",  // #5F9EA0
+	"chartreuse":           "127,255,0",   // #7FFF00
+	"chocolate":            "210,105,30",  // #D2691E
+	"coral":                "255,127,80",  // #FF7F50
+	"cornflowerblue":       "100,149,237", // #6495ED
+	"cornsilk":             "255,248,220", // #FFF8DC
+	"crimson":              "220,20,60",   // #DC143C
+	"cyan":                 "0,255,255",   // #00FFFF
+	"darkblue":             "0,0,139",     // #00008B
+	"darkcyan":             "0,139,139",   // #008B8B
+	"darkgoldenrod":        "184,134,11",  // #B8860B
+	"darkgray":             "169,169,169", // #A9A9A9
+	"darkgreen":            "0,100,0",     // #006400
+	"darkgrey":             "169,169,169", // #A9A9A9
+	"darkkhaki":            "189,183,107", // #BDB76B
+	"darkmagenta":          "139,0,139",   // #8B008B
+	"darkolivegreen":       "85,107,47",   // #556B2F
+	"darkorange":           "255,140,0",   // #FF8C00
+	"darkorchid":           "153,50,204",  // #9932CC
+	"darkred":              "139,0,0",     // #8B0000
+	"darksalmon":           "233,150,122", // #E9967A
+	"darkseagreen":         "143,188,143", // #8FBC8F
+	"darkslateblue":        "72,61,139",   // #483D8B
+	"darkslategray":        "47,79,79",    // #2F4F4F
+	"darkslategrey":        "47,79,79",    // #2F4F4F
+	"darkturquoise":        "0,206,209",   // #00CED1
+	"darkviolet":           "148,0,211",   // #9400D3
+	"deeppink":             "255,20,147",  // #FF1493
+	"deepskyblue":          "0,191,255",   // #00BFFF
+	"dimgray":              "105,105,105", // #696969
+	"dimgrey":              "105,105,105", // #696969
+	"dodgerblue":           "30,144,255",  // #1E90FF
+	"firebrick":            "178,34,34",   // #B22222
+	"floralwhite":          "255,250,240", // #FFFAF0
+	"forestgreen":          "34,139,34",   // #228B22
+	"fuchsia":              "255,0,255",   // #FF00FF
+	"gainsboro":            "220,220,220", // #DCDCDC
+	"ghostwhite":           "248,248,255", // #F8F8FF
+	"gold":                 "255,215,0",   // #FFD700
+	"goldenrod":            "218,165,32",  // #DAA520
+	"gray":                 "128,128,128", // #808080
+	"green":                "0,128,0",     // #008000
+	"greenyellow":          "173,255,47",  // #ADFF2F
+	"grey":                 "128,128,128", // #808080
+	"honeydew":             "240,255,240", // #F0FFF0
+	"hotpink":              "255,105,180", // #FF69B4
+	"indianred":            "205,92,92",   // #CD5C5C
+	"indigo":               "75,0,130",    // #4B0082
+	"ivory":                "255,255,240", // #FFFFF0
+	"khaki":                "240,230,140", // #F0E68C
+	"lavender":             "230,230,250", // #E6E6FA
+	"lavenderblush":        "255,240,245", // #FFF0F5
+	"lawngreen":            "124,252,0",   // #7CFC00
+	"lemonchiffon":         "255,250,205", // #FFFACD
+	"lightblue":            "173,216,230", // #ADD8E6
+	"lightcoral":           "240,128,128", // #F08080
+	"lightcyan":            "224,255,255", // #E0FFFF
+	"lightgoldenrodyellow": "250,250,210", // #FAFAD2
+	"lightgray":            "211,211,211", // #D3D3D3
+	"lightgreen":           "144,238,144", // #90EE90
+	"lightgrey":            "211,211,211", // #D3D3D3
+	"lightpink":            "255,182,193", // #FFB6C1
+	"lightsalmon":          "255,160,122", // #FFA07A
+	"lightseagreen":        "32,178,170",  // #20B2AA
+	"lightskyblue":         "135,206,250", // #87CEFA
+	"lightslategray":       "119,136,153", // #778899
+	"lightslategrey":       "119,136,153", // #778899
+	"lightsteelblue":       "176,196,222", // #B0C4DE
+	"lightyellow":          "255,255,224", // #FFFFE0
+	"lime":                 "0,255,0",     // #00FF00
+	"limegreen":            "50,205,50",   // #32CD32
+	"linen":                "250,240,230", // #FAF0E6
+	"magenta":              "255,0,255",   // #FF00FF
+	"maroon":               "128,0,0",     // #800000
+	"mediumaquamarine":     "102,205,170", // #66CDAA
+	"mediumblue":           "0,0,205",     // #0000CD
+	"mediumorchid":         "186,85,211",  // #BA55D3
+	"mediumpurple":         "147,112,219", // #9370DB
+	"mediumseagreen":       "60,179,113",  // #3CB371
+	"mediumslateblue":      "123,104,238", // #7B68EE
+	"mediumspringgreen":    "0,250,154",   // #00FA9A
+	"mediumturquoise":      "72,209,204",  // #48D1CC
+	"mediumvioletred":      "199,21,133",  // #C71585
+	"midnightblue":         "25,25,112",   // #191970
+	"mintcream":            "245,255,250", // #F5FFFA
+	"mistyrose":            "255,228,225", // #FFE4E1
+	"moccasin":             "255,228,181", // #FFE4B5
+	"navajowhite":          "255,222,173", // #FFDEAD
+	"navy":                 "0,0,128",     // #000080
+	"oldlace":              "253,245,230", // #FDF5E6
+	"olive":                "128,128,0",   // #808000
+	"olivedrab":            "107,142,35",  // #6B8E23
+	"orange":               "255,165,0",   // #FFA500
+	"orangered":            "255,69,0",    // #FF4500
+	"orchid":               "218,112,214", // #DA70D6
+	"palegoldenrod":        "238,232,170", // #EEE8AA
+	"palegreen":            "152,251,152", // #98FB98
+	"paleturquoise":        "175,238,238", // #AFEEEE
+	"palevioletred":        "219,112,147", // #DB7093
+	"papayawhip":           "255,239,213", // #FFEFD5
+	"peachpuff":            "255,218,185", // #FFDAB9
+	"peru":                 "205,133,63",  // #CD853F
+	"pink":                 "255,192,203", // #FFC0CB
+	"plum":                 "221,160,221", // #DDA0DD
+	"powderblue":           "176,224,230", // #B0E0E6
+	"purple":               "128,0,128",   // #800080
+	"red":                  "255,0,0",     // #FF0000
+	"rosybrown":            "188,143,143", // #BC8F8F
+	"royalblue":            "65,105,225",  // #4169E1
+	"saddlebrown":          "139,69,19",   // #8B4513
+	"salmon":               "250,128,114", // #FA8072
+	"sandybrown":           "244,164,96",  // #F4A460
+	"seagreen":             "46,139,87",   // #2E8B57
+	"seashell":             "255,245,238", // #FFF5EE
+	"sienna":               "160,82,45",   // #A0522D
+	"silver":               "192,192,192", // #C0C0C0
+	"skyblue":              "135,206,235", // #87CEEB
+	"slateblue":            "106,90,205",  // #6A5ACD
+	"slategray":            "112,128,144", // #708090
+	"slategrey":            "112,128,144", // #708090
+	"snow":                 "255,250,250", // #FFFAFA
+	"springgreen":          "0,255,127",   // #00FF7F
+	"steelblue":            "70,130,180",  // #4682B4
+	"tan":                  "210,180,140", // #D2B48C
+	"teal":                 "0,128,128",   // #008080
+	"thistle":              "216,191,216", // #D8BFD8
+	"tomato":               "255,99,71",   // #FF6347
+	"turquoise":            "64,224,208",  // #40E0D0
+	"violet":               "238,130,238", // #EE82EE
+	"wheat":                "245,222,179", // #F5DEB3
+	"white":                "255,255,255", // #FFFFFF
+	"whitesmoke":           "245,245,245", // #F5F5F5
+	"yellow":               "255,255,0",   // #FFFF00
+	"yellowgreen":          "154,205,50",  // #9ACD32
+}
diff --git a/vendor/github.com/gookit/color/detect_env.go b/vendor/github.com/gookit/color/detect_env.go
index f5dde8fda..503492815 100644
--- a/vendor/github.com/gookit/color/detect_env.go
+++ b/vendor/github.com/gookit/color/detect_env.go
@@ -2,7 +2,6 @@ package color
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"runtime"
 	"strconv"
@@ -12,6 +11,17 @@ import (
 	"github.com/xo/terminfo"
 )
 
+// Level is the color level supported by a terminal.
+type Level = terminfo.ColorLevel
+
+// terminal color available level alias of the terminfo.ColorLevel*
+const (
+	LevelNo  = terminfo.ColorLevelNone     // not support color.
+	Level16  = terminfo.ColorLevelBasic    // basic - 3/4 bit color supported
+	Level256 = terminfo.ColorLevelHundreds // hundreds - 8-bit color supported
+	LevelRgb = terminfo.ColorLevelMillions // millions - (24 bit)true color supported
+)
+
 /*************************************************************
  * helper methods for detect color supports
  *************************************************************/
@@ -19,8 +29,9 @@ import (
 // DetectColorLevel for current env
 //
 // NOTICE: The method will detect terminal info each times,
-// 	if only want get current color level, please direct call SupportColor() or TermColorLevel()
-func DetectColorLevel() terminfo.ColorLevel {
+//
+//	if only want to get current color level, please direct call SupportColor() or TermColorLevel()
+func DetectColorLevel() Level {
 	level, _ := detectTermColorLevel()
 	return level
 }
@@ -28,7 +39,7 @@ func DetectColorLevel() terminfo.ColorLevel {
 // detect terminal color support level
 //
 // refer https://github.com/Delta456/box-cli-maker
-func detectTermColorLevel() (level terminfo.ColorLevel, needVTP bool) {
+func detectTermColorLevel() (level Level, needVTP bool) {
 	// on windows WSL:
 	// - runtime.GOOS == "Linux"
 	// - support true-color
@@ -38,7 +49,7 @@ func detectTermColorLevel() (level terminfo.ColorLevel, needVTP bool) {
 		// detect WSL as it has True Color support
 		if detectWSL() {
 			debugf("True Color support on WSL environment")
-			return terminfo.ColorLevelMillions, false
+			return LevelRgb, false
 		}
 	}
 
@@ -54,7 +65,7 @@ func detectTermColorLevel() (level terminfo.ColorLevel, needVTP bool) {
 		val := os.Getenv("TERMINAL_EMULATOR")
 		if val == "JetBrains-JediTerm" {
 			debugf("True Color support on JetBrains-JediTerm, is win: %v", isWin)
-			return terminfo.ColorLevelMillions, isWin
+			return LevelRgb, isWin
 		}
 	}
 
@@ -63,7 +74,7 @@ func detectTermColorLevel() (level terminfo.ColorLevel, needVTP bool) {
 	debugf("color level by detectColorLevelFromEnv: %s", level.String())
 
 	// fallback: simple detect by TERM value string.
-	if level == terminfo.ColorLevelNone {
+	if level == LevelNo {
 		debugf("level none - fallback check special term color support")
 		// on Windows: enable VTP as it has True Color support
 		level, needVTP = detectSpecialTermColor(termVal)
@@ -76,29 +87,27 @@ func detectTermColorLevel() (level terminfo.ColorLevel, needVTP bool) {
 //
 // refer the terminfo.ColorLevelFromEnv()
 // https://en.wikipedia.org/wiki/Terminfo
-func detectColorLevelFromEnv(termVal string, isWin bool) terminfo.ColorLevel {
+func detectColorLevelFromEnv(termVal string, isWin bool) Level {
+	// on TERM=screen: not support true-color
+	if termVal == "screen" {
+		return Level256
+	}
+
 	// check for overriding environment variables
 	colorTerm, termProg, forceColor := os.Getenv("COLORTERM"), os.Getenv("TERM_PROGRAM"), os.Getenv("FORCE_COLOR")
 	switch {
 	case strings.Contains(colorTerm, "truecolor") || strings.Contains(colorTerm, "24bit"):
-		if termVal == "screen" { // on TERM=screen: not support true-color
-			return terminfo.ColorLevelHundreds
-		}
-		return terminfo.ColorLevelMillions
+		return LevelRgb
 	case colorTerm != "" || forceColor != "":
-		return terminfo.ColorLevelBasic
+		if strings.Contains(termVal, "256color") {
+			return Level256
+		}
+		return Level16
 	case termProg == "Apple_Terminal":
-		return terminfo.ColorLevelHundreds
+		return Level256
 	case termProg == "Terminus" || termProg == "Hyper":
-		if termVal == "screen" { // on TERM=screen: not support true-color
-			return terminfo.ColorLevelHundreds
-		}
-		return terminfo.ColorLevelMillions
+		return LevelRgb
 	case termProg == "iTerm.app":
-		if termVal == "screen" { // on TERM=screen: not support true-color
-			return terminfo.ColorLevelHundreds
-		}
-
 		// check iTerm version
 		ver := os.Getenv("TERM_PROGRAM_VERSION")
 		if ver != "" {
@@ -106,13 +115,13 @@ func detectColorLevelFromEnv(termVal string, isWin bool) terminfo.ColorLevel {
 			if err != nil {
 				saveInternalError(terminfo.ErrInvalidTermProgramVersion)
 				// return terminfo.ColorLevelNone
-				return terminfo.ColorLevelHundreds
+				return Level256
 			}
 			if i == 3 {
-				return terminfo.ColorLevelMillions
+				return LevelRgb
 			}
 		}
-		return terminfo.ColorLevelHundreds
+		return Level256
 	}
 
 	// otherwise determine from TERM's max_colors capability
@@ -121,22 +130,22 @@ func detectColorLevelFromEnv(termVal string, isWin bool) terminfo.ColorLevel {
 		ti, err := terminfo.Load(termVal)
 		if err != nil {
 			saveInternalError(err)
-			return terminfo.ColorLevelNone
+			return LevelNo
 		}
 
 		debugf("the loaded term info file is: %s", ti.File)
 		v, ok := ti.Nums[terminfo.MaxColors]
 		switch {
 		case !ok || v <= 16:
-			return terminfo.ColorLevelNone
+			return LevelNo
 		case ok && v >= 256:
-			return terminfo.ColorLevelHundreds
+			return Level256
 		}
-		return terminfo.ColorLevelBasic
+		return Level16
 	}
 
 	// no TERM env value. default return none level
-	return terminfo.ColorLevelNone
+	return LevelNo
 	// return terminfo.ColorLevelBasic
 }
 
@@ -146,13 +155,15 @@ var wslContents string
 // https://github.com/Microsoft/WSL/issues/423#issuecomment-221627364
 func detectWSL() bool {
 	if !detectedWSL {
+		detectedWSL = true
+
 		b := make([]byte, 1024)
 		// `cat /proc/version`
-		// on mac:
-		// 	!not the file!
+		// on Mac, Windows cmd/pwsh:
+		// 	!NOT THE FILE!
 		// on linux(debian,ubuntu,alpine):
 		//	Linux version 4.19.121-linuxkit (root@18b3f92ade35) (gcc version 9.2.0 (Alpine 9.2.0)) #1 SMP Thu Jan 21 15:36:34 UTC 2021
-		// on win git bash, conEmu:
+		// on Win git bash, conEmu:
 		// 	MINGW64_NT-10.0-19042 version 3.1.7-340.x86_64 (@WIN-N0G619FD3UK) (gcc version 9.3.0 (GCC) ) 2020-10-23 13:08 UTC
 		// on WSL:
 		//  Linux version 4.4.0-19041-Microsoft (Microsoft@Microsoft.com) (gcc version 5.4.0 (GCC) ) #488-Microsoft Mon Sep 01 13:43:00 PST 2020
@@ -164,12 +175,13 @@ func detectWSL() bool {
 			}
 
 			wslContents = string(b)
+			return strings.Contains(wslContents, "Microsoft")
 		}
-		detectedWSL = true
 	}
-	return strings.Contains(wslContents, "Microsoft")
+	return false
 }
 
+/*
 // refer
 //  https://github.com/Delta456/box-cli-maker/blob/7b5a1ad8a016ce181e7d8b05e24b54ff60b4b38a/detect_unix.go#L27-L45
 // detect WSL as it has True Color support
@@ -196,19 +208,18 @@ func isWSL() bool {
 	}
 
 	// it gives "Microsoft" for WSL and "microsoft" for WSL 2
-	// it support True-color
+	// it supports True-color
 	content := strings.ToLower(string(wsl))
 	return strings.Contains(content, "microsoft")
 }
+*/
 
 /*************************************************************
  * helper methods for check env
  *************************************************************/
 
 // IsWindows OS env
-func IsWindows() bool {
-	return runtime.GOOS == "windows"
-}
+func IsWindows() bool { return runtime.GOOS == "windows" }
 
 // IsConsole Determine whether w is one of stderr, stdout, stdin
 func IsConsole(w io.Writer) bool {
@@ -224,58 +235,52 @@ func IsConsole(w io.Writer) bool {
 }
 
 // IsMSys msys(MINGW64) environment, does not necessarily support color
-func IsMSys() bool {
-	// like "MSYSTEM=MINGW64"
-	if len(os.Getenv("MSYSTEM")) > 0 {
-		return true
-	}
-
-	return false
-}
+func IsMSys() bool { /* like "MSYSTEM=MINGW64" */ return len(os.Getenv("MSYSTEM")) > 0 }
 
 // IsSupportColor check current console is support color.
 //
 // NOTICE: The method will detect terminal info each times,
-// 	if only want get current color level, please direct call SupportColor() or TermColorLevel()
-func IsSupportColor() bool {
-	return IsSupport16Color()
-}
+//
+//	if only want to get current color level, please direct call SupportColor() or TermColorLevel()
+func IsSupportColor() bool { return IsSupport16Color() }
 
-// IsSupportColor check current console is support color.
+// IsSupport16Color check current console is support color.
 //
 // NOTICE: The method will detect terminal info each times,
-// 	if only want get current color level, please direct call SupportColor() or TermColorLevel()
+//
+//	if only want to get current color level, please direct call SupportColor() or TermColorLevel()
 func IsSupport16Color() bool {
 	level, _ := detectTermColorLevel()
-	return level > terminfo.ColorLevelNone
+	return level > LevelNo
 }
 
 // IsSupport256Color render check
 //
 // NOTICE: The method will detect terminal info each times,
-// 	if only want get current color level, please direct call SupportColor() or TermColorLevel()
+//
+//	if only want to get current color level, please direct call SupportColor() or TermColorLevel()
 func IsSupport256Color() bool {
 	level, _ := detectTermColorLevel()
-	return level > terminfo.ColorLevelBasic
+	return level > Level16
 }
 
 // IsSupportRGBColor check. alias of the IsSupportTrueColor()
 //
 // NOTICE: The method will detect terminal info each times,
-// 	if only want get current color level, please direct call SupportColor() or TermColorLevel()
-func IsSupportRGBColor() bool {
-	return IsSupportTrueColor()
-}
+//
+//	if only want to get current color level, please direct call SupportColor() or TermColorLevel()
+func IsSupportRGBColor() bool { return IsSupportTrueColor() }
 
 // IsSupportTrueColor render check.
 //
 // NOTICE: The method will detect terminal info each times,
-// 	if only want get current color level, please direct call SupportColor() or TermColorLevel()
+//
+//	if only want get current color level, please direct call SupportColor() or TermColorLevel()
 //
 // ENV:
 // "COLORTERM=truecolor"
 // "COLORTERM=24bit"
 func IsSupportTrueColor() bool {
 	level, _ := detectTermColorLevel()
-	return level > terminfo.ColorLevelHundreds
+	return level > Level256
 }
diff --git a/vendor/github.com/gookit/color/detect_nonwin.go b/vendor/github.com/gookit/color/detect_nonwin.go
index 75c7202f0..b169145bd 100644
--- a/vendor/github.com/gookit/color/detect_nonwin.go
+++ b/vendor/github.com/gookit/color/detect_nonwin.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // The method in the file has no effect
@@ -8,14 +9,12 @@ package color
 import (
 	"strings"
 	"syscall"
-
-	"github.com/xo/terminfo"
 )
 
 // detect special term color support
-func detectSpecialTermColor(termVal string) (terminfo.ColorLevel, bool) {
+func detectSpecialTermColor(termVal string) (Level, bool) {
 	if termVal == "" {
-		return terminfo.ColorLevelNone, false
+		return LevelNo, false
 	}
 
 	debugf("terminfo check fail - fallback detect color by check TERM value")
@@ -23,26 +22,27 @@ func detectSpecialTermColor(termVal string) (terminfo.ColorLevel, bool) {
 	// on TERM=screen:
 	// - support 256, not support true-color. test on macOS
 	if termVal == "screen" {
-		return terminfo.ColorLevelHundreds, false
+		return Level256, false
 	}
 
 	if strings.Contains(termVal, "256color") {
-		return terminfo.ColorLevelHundreds, false
+		return Level256, false
 	}
 
 	if strings.Contains(termVal, "xterm") {
-		return terminfo.ColorLevelHundreds, false
+		return Level256, false
 		// return terminfo.ColorLevelBasic, false
 	}
 
-	// return terminfo.ColorLevelNone, nil
-	return terminfo.ColorLevelBasic, false
+	// return LevelNo, nil
+	return Level16, false
 }
 
 // IsTerminal returns true if the given file descriptor is a terminal.
 //
 // Usage:
-// 	IsTerminal(os.Stdout.Fd())
+//
+//	IsTerminal(os.Stdout.Fd())
 func IsTerminal(fd uintptr) bool {
 	return fd == uintptr(syscall.Stdout) || fd == uintptr(syscall.Stdin) || fd == uintptr(syscall.Stderr)
 }
diff --git a/vendor/github.com/gookit/color/detect_windows.go b/vendor/github.com/gookit/color/detect_windows.go
index 7707d9ca2..16b58b9c0 100644
--- a/vendor/github.com/gookit/color/detect_windows.go
+++ b/vendor/github.com/gookit/color/detect_windows.go
@@ -1,18 +1,20 @@
+//go:build windows
 // +build windows
 
-// Display color on windows
-// refer:
-//  golang.org/x/sys/windows
-// 	golang.org/x/crypto/ssh/terminal
-// 	https://docs.microsoft.com/en-us/windows/console
 package color
 
+// Display color on Windows
+//
+// refer:
+//
+//	golang.org/x/sys/windows
+//	golang.org/x/crypto/ssh/terminal
+//	https://docs.microsoft.com/en-us/windows/console
 import (
 	"os"
 	"syscall"
 	"unsafe"
 
-	"github.com/xo/terminfo"
 	"golang.org/x/sys/windows"
 )
 
@@ -28,17 +30,12 @@ var (
 )
 
 func init() {
-	if !SupportColor() {
-		isLikeInCmd = true
+	// needVTP=false OR Enable=false: Don't need to enable virtual process
+	if !needVTP || !Enable {
 		return
 	}
 
-	// if disabled.
-	if !Enable {
-		return
-	}
-
-	// if at windows's ConEmu, Cmder, putty ... terminals not need VTP
+	// if at Windows's ConEmu, Cmder, putty ... terminals not need VTP
 
 	// -------- try force enable colors on windows terminal -------
 	tryEnableVTP(needVTP)
@@ -47,7 +44,7 @@ func init() {
 	// err := getConsoleScreenBufferInfo(uintptr(syscall.Stdout), &defScreenInfo)
 }
 
-// try force enable colors on windows terminal
+// try force enable colors on Windows terminal
 func tryEnableVTP(enable bool) bool {
 	if !enable {
 		return false
@@ -57,7 +54,7 @@ func tryEnableVTP(enable bool) bool {
 
 	initKernel32Proc()
 
-	// enable colors on windows terminal
+	// enable colors on Windows terminal
 	if tryEnableOnCONOUT() {
 		return true
 	}
@@ -70,7 +67,7 @@ func initKernel32Proc() {
 		return
 	}
 
-	// load related windows dll
+	// load related Windows dll
 	// https://docs.microsoft.com/en-us/windows/console/setconsolemode
 	kernel32 = syscall.NewLazyDLL("kernel32.dll")
 
@@ -106,15 +103,15 @@ func tryEnableOnStdout() bool {
 }
 
 // Get the Windows Version and Build Number
-var (
-	winVersion, _, buildNumber = windows.RtlGetNtVersionNumbers()
-)
+var winVersion, _, buildNumber = windows.RtlGetNtVersionNumbers()
 
 // refer
-//  https://github.com/Delta456/box-cli-maker/blob/7b5a1ad8a016ce181e7d8b05e24b54ff60b4b38a/detect_windows.go#L30-L57
-//  https://github.com/gookit/color/issues/25#issuecomment-738727917
-// detects the Color Level Supported on windows: cmd, powerShell
-func detectSpecialTermColor(termVal string) (tl terminfo.ColorLevel, needVTP bool) {
+//
+//	https://github.com/Delta456/box-cli-maker/blob/7b5a1ad8a016ce181e7d8b05e24b54ff60b4b38a/detect_windows.go#L30-L57
+//	https://github.com/gookit/color/issues/25#issuecomment-738727917
+//
+// detects the color level supported on Windows: cmd, powerShell
+func detectSpecialTermColor(termVal string) (tl Level, needVTP bool) {
 	if os.Getenv("ConEmuANSI") == "ON" {
 		debugf("support True Color by ConEmuANSI=ON")
 		// ConEmuANSI is "ON" for generic ANSI support
@@ -122,7 +119,7 @@ func detectSpecialTermColor(termVal string) (tl terminfo.ColorLevel, needVTP boo
 		// I am just assuming that people wouldn't have disabled it
 		// Even if it is not enabled then ConEmu will auto round off
 		// accordingly
-		return terminfo.ColorLevelMillions, false
+		return LevelRgb, false
 	}
 
 	// Before Windows 10 Build Number 10586, console never supported ANSI Colors
@@ -130,33 +127,33 @@ func detectSpecialTermColor(termVal string) (tl terminfo.ColorLevel, needVTP boo
 		// Detect if using ANSICON on older systems
 		if os.Getenv("ANSICON") != "" {
 			conVersion := os.Getenv("ANSICON_VER")
-			// 8 bit Colors were only supported after v1.81 release
+			// 8-bit Colors were only supported after v1.81 release
 			if conVersion >= "181" {
-				return terminfo.ColorLevelHundreds, false
+				return Level256, false
 			}
-			return terminfo.ColorLevelBasic, false
+			return Level16, false
 		}
 
-		return terminfo.ColorLevelNone, false
+		return LevelNo, false
 	}
 
-	// True Color is not available before build 14931 so fallback to 8 bit color.
+	// True Color is not available before build 14931 so fallback to 8-bit color.
 	if buildNumber < 14931 {
-		return terminfo.ColorLevelHundreds, true
+		return Level256, true
 	}
 
 	// Windows 10 build 14931 is the first release that supports 16m/TrueColor
-	debugf("support True Color on windows version is >= build 14931")
-	return terminfo.ColorLevelMillions, true
+	debugf("support True Color on windows version >= 14931, needVTP=true")
+	return LevelRgb, true
 }
 
 /*************************************************************
- * render full color code on windows(8,16,24bit color)
+ * render full color code on Windows(8,16,24bit color)
  *************************************************************/
 
 // docs https://docs.microsoft.com/zh-cn/windows/console/getconsolemode#parameters
 const (
-	// equals to docs page's ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+	// EnableVirtualTerminalProcessingMode equals to docs page's ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
 	EnableVirtualTerminalProcessingMode uint32 = 0x4
 )
 
@@ -166,9 +163,10 @@ const (
 // doc https://docs.microsoft.com/zh-cn/windows/console/console-virtual-terminal-sequences#samples
 //
 // Usage:
-// 	err := EnableVirtualTerminalProcessing(syscall.Stdout, true)
-// 	// support print color text
-// 	err = EnableVirtualTerminalProcessing(syscall.Stdout, false)
+//
+//	err := EnableVirtualTerminalProcessing(syscall.Stdout, true)
+//	// support print color text
+//	err = EnableVirtualTerminalProcessing(syscall.Stdout, false)
 func EnableVirtualTerminalProcessing(stream syscall.Handle, enable bool) error {
 	var mode uint32
 	// Check if it is currently in the terminal
@@ -216,7 +214,7 @@ func EnableVirtualTerminalProcessing(stream syscall.Handle, enable bool) error {
 // }
 
 /*************************************************************
- * render simple color code on windows
+ * render simple color code on Windows
  *************************************************************/
 
 // IsTty returns true if the given file descriptor is a terminal.
@@ -224,20 +222,21 @@ func IsTty(fd uintptr) bool {
 	initKernel32Proc()
 
 	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
+	r, _, e := syscall.SyscallN(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
 	return r != 0 && e == 0
 }
 
 // IsTerminal returns true if the given file descriptor is a terminal.
 //
 // Usage:
-// 	fd := os.Stdout.Fd()
-// 	fd := uintptr(syscall.Stdout) // for windows
-// 	IsTerminal(fd)
+//
+//	fd := os.Stdout.Fd()
+//	fd := uintptr(syscall.Stdout) // for Windows
+//	IsTerminal(fd)
 func IsTerminal(fd uintptr) bool {
 	initKernel32Proc()
 
 	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
+	r, _, e := syscall.SyscallN(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
 	return r != 0 && e == 0
 }
diff --git a/vendor/github.com/gookit/color/index.html b/vendor/github.com/gookit/color/index.html
new file mode 100644
index 000000000..19e8e9a50
--- /dev/null
+++ b/vendor/github.com/gookit/color/index.html
@@ -0,0 +1,25 @@
+
+
+
+    
+    
+    
+    
+    Color - A command-line color library with true color support, universal API methods and Windows support.
+
+
+

+
+
+
+
diff --git a/vendor/github.com/gookit/color/printer.go b/vendor/github.com/gookit/color/printer.go
deleted file mode 100644
index 326aabc0b..000000000
--- a/vendor/github.com/gookit/color/printer.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package color
-
-import "fmt"
-
-/*************************************************************
- * colored message Printer
- *************************************************************/
-
-// PrinterFace interface
-type PrinterFace interface {
-	fmt.Stringer
-	Sprint(a ...interface{}) string
-	Sprintf(format string, a ...interface{}) string
-	Print(a ...interface{})
-	Printf(format string, a ...interface{})
-	Println(a ...interface{})
-}
-
-// Printer a generic color message printer.
-//
-// Usage:
-// 	p := &Printer{Code: "32;45;3"}
-// 	p.Print("message")
-type Printer struct {
-	// NoColor disable color.
-	NoColor bool
-	// Code color code string. eg "32;45;3"
-	Code string
-}
-
-// NewPrinter instance
-func NewPrinter(colorCode string) *Printer {
-	return &Printer{Code: colorCode}
-}
-
-// String returns color code string. eg: "32;45;3"
-func (p *Printer) String() string {
-	// panic("implement me")
-	return p.Code
-}
-
-// Sprint returns rendering colored messages
-func (p *Printer) Sprint(a ...interface{}) string {
-	return RenderCode(p.String(), a...)
-}
-
-// Sprintf returns format and rendering colored messages
-func (p *Printer) Sprintf(format string, a ...interface{}) string {
-	return RenderString(p.String(), fmt.Sprintf(format, a...))
-}
-
-// Print rendering colored messages
-func (p *Printer) Print(a ...interface{}) {
-	doPrintV2(p.String(), fmt.Sprint(a...))
-}
-
-// Printf format and rendering colored messages
-func (p *Printer) Printf(format string, a ...interface{}) {
-	doPrintV2(p.String(), fmt.Sprintf(format, a...))
-}
-
-// Println rendering colored messages with newline
-func (p *Printer) Println(a ...interface{}) {
-	doPrintlnV2(p.Code, a)
-}
-
-// IsEmpty color code
-func (p *Printer) IsEmpty() bool {
-	return p.Code == ""
-}
-
-/*************************************************************
- * SimplePrinter struct
- *************************************************************/
-
-// SimplePrinter use for quick use color print on inject to struct
-type SimplePrinter struct{}
-
-// Print message
-func (s *SimplePrinter) Print(v ...interface{}) {
-	Print(v...)
-}
-
-// Printf message
-func (s *SimplePrinter) Printf(format string, v ...interface{}) {
-	Printf(format, v...)
-}
-
-// Println message
-func (s *SimplePrinter) Println(v ...interface{}) {
-	Println(v...)
-}
-
-// Infof message
-func (s *SimplePrinter) Infof(format string, a ...interface{}) {
-	Info.Printf(format, a...)
-}
-
-// Infoln message
-func (s *SimplePrinter) Infoln(a ...interface{}) {
-	Info.Println(a...)
-}
-
-// Warnf message
-func (s *SimplePrinter) Warnf(format string, a ...interface{}) {
-	Warn.Printf(format, a...)
-}
-
-// Warnln message
-func (s *SimplePrinter) Warnln(a ...interface{}) {
-	Warn.Println(a...)
-}
-
-// Errorf message
-func (s *SimplePrinter) Errorf(format string, a ...interface{}) {
-	Error.Printf(format, a...)
-}
-
-// Errorln message
-func (s *SimplePrinter) Errorln(a ...interface{}) {
-	Error.Println(a...)
-}
diff --git a/vendor/github.com/gookit/color/quickstart.go b/vendor/github.com/gookit/color/quickstart.go
index 3cc3b77fa..b7217d9fd 100644
--- a/vendor/github.com/gookit/color/quickstart.go
+++ b/vendor/github.com/gookit/color/quickstart.go
@@ -1,109 +1,226 @@
 package color
 
+import "fmt"
+
 /*************************************************************
- * quick use color print message
+ * region Message Printer
+ *************************************************************/
+
+// PrinterFace interface
+type PrinterFace interface {
+	fmt.Stringer
+	Sprint(a ...any) string
+	Sprintf(format string, a ...any) string
+	Print(a ...any)
+	Printf(format string, a ...any)
+	Println(a ...any)
+}
+
+// Printer a generic color message printer.
+//
+// Usage:
+//
+//	p := &Printer{Code: "32;45;3"}
+//	p.Print("message")
+type Printer struct {
+	// NoColor disable color.
+	NoColor bool
+	// Code color code string. eg "32;45;3"
+	Code string
+}
+
+// NewPrinter instance
+func NewPrinter(colorCode string) *Printer {
+	return &Printer{Code: colorCode}
+}
+
+// String returns color code string. eg: "32;45;3"
+func (p *Printer) String() string {
+	// panic("implement me")
+	return p.Code
+}
+
+// Sprint returns rendering colored messages
+func (p *Printer) Sprint(a ...any) string {
+	return RenderCode(p.String(), a...)
+}
+
+// Sprintf returns format and rendering colored messages
+func (p *Printer) Sprintf(format string, a ...any) string {
+	return RenderString(p.String(), fmt.Sprintf(format, a...))
+}
+
+// Print rendering colored messages
+func (p *Printer) Print(a ...any) {
+	doPrintV2(p.String(), fmt.Sprint(a...))
+}
+
+// Printf format and rendering colored messages
+func (p *Printer) Printf(format string, a ...any) {
+	doPrintV2(p.String(), fmt.Sprintf(format, a...))
+}
+
+// Println rendering colored messages with newline
+func (p *Printer) Println(a ...any) {
+	doPrintlnV2(p.Code, a)
+}
+
+// IsEmpty color code
+func (p *Printer) IsEmpty() bool {
+	return p.Code == ""
+}
+
+/*************************************************************
+ * region SimplePrinter
+ *************************************************************/
+
+// SimplePrinter use for quick use color print on inject to struct
+type SimplePrinter struct{}
+
+// Print message
+func (s *SimplePrinter) Print(v ...any) { Print(v...) }
+
+// Printf message
+func (s *SimplePrinter) Printf(format string, v ...any) { Printf(format, v...) }
+
+// Println message
+func (s *SimplePrinter) Println(v ...any) {
+	Println(v...)
+}
+
+// Successf message
+func (s *SimplePrinter) Successf(format string, a ...any) { Success.Printf(format, a...) }
+
+// Successln message
+func (s *SimplePrinter) Successln(a ...any) { Success.Println(a...) }
+
+// Infof message
+func (s *SimplePrinter) Infof(format string, a ...any) {
+	Info.Printf(format, a...)
+}
+
+// Infoln message
+func (s *SimplePrinter) Infoln(a ...any) { Info.Println(a...) }
+
+// Warnf message
+func (s *SimplePrinter) Warnf(format string, a ...any) {
+	Warn.Printf(format, a...)
+}
+
+// Warnln message
+func (s *SimplePrinter) Warnln(a ...any) { Warn.Println(a...) }
+
+// Errorf message
+func (s *SimplePrinter) Errorf(format string, a ...any) {
+	Error.Printf(format, a...)
+}
+
+// Errorln message
+func (s *SimplePrinter) Errorln(a ...any) { Error.Println(a...) }
+
+/*************************************************************
+ * region quick start
  *************************************************************/
 
 // Redp print message with Red color
-func Redp(a ...interface{}) {
-	Red.Print(a...)
-}
+func Redp(a ...any) { Red.Print(a...) }
+
+// Redf print message with Red color
+func Redf(format string, a ...any) { Red.Printf(format, a...) }
 
 // Redln print message line with Red color
-func Redln(a ...interface{}) {
-	Red.Println(a...)
-}
+func Redln(a ...any) { Red.Println(a...) }
 
 // Bluep print message with Blue color
-func Bluep(a ...interface{}) {
-	Blue.Print(a...)
-}
+func Bluep(a ...any) { Blue.Print(a...) }
+
+// Bluef print message with Blue color
+func Bluef(format string, a ...any) { Blue.Printf(format, a...) }
 
 // Blueln print message line with Blue color
-func Blueln(a ...interface{}) {
-	Blue.Println(a...)
-}
+func Blueln(a ...any) { Blue.Println(a...) }
 
 // Cyanp print message with Cyan color
-func Cyanp(a ...interface{}) {
-	Cyan.Print(a...)
-}
+func Cyanp(a ...any) { Cyan.Print(a...) }
+
+// Cyanf print message with Cyan color
+func Cyanf(format string, a ...any) { Cyan.Printf(format, a...) }
 
 // Cyanln print message line with Cyan color
-func Cyanln(a ...interface{}) {
-	Cyan.Println(a...)
-}
+func Cyanln(a ...any) { Cyan.Println(a...) }
 
 // Grayp print message with Gray color
-func Grayp(a ...interface{}) {
-	Gray.Print(a...)
-}
+func Grayp(a ...any) { Gray.Print(a...) }
+
+// Grayf print message with Gray color
+func Grayf(format string, a ...any) { Gray.Printf(format, a...) }
 
 // Grayln print message line with Gray color
-func Grayln(a ...interface{}) {
-	Gray.Println(a...)
-}
+func Grayln(a ...any) { Gray.Println(a...) }
 
 // Greenp print message with Green color
-func Greenp(a ...interface{}) {
-	Green.Print(a...)
-}
+func Greenp(a ...any) { Green.Print(a...) }
+
+// Greenf print message with Green color
+func Greenf(format string, a ...any) { Green.Printf(format, a...) }
 
 // Greenln print message line with Green color
-func Greenln(a ...interface{}) {
-	Green.Println(a...)
-}
+func Greenln(a ...any) { Green.Println(a...) }
 
 // Yellowp print message with Yellow color
-func Yellowp(a ...interface{}) {
-	Yellow.Print(a...)
-}
+func Yellowp(a ...any) { Yellow.Print(a...) }
+
+// Yellowf print message with Yellow color
+func Yellowf(format string, a ...any) { Yellow.Printf(format, a...) }
 
 // Yellowln print message line with Yellow color
-func Yellowln(a ...interface{}) {
-	Yellow.Println(a...)
-}
+func Yellowln(a ...any) { Yellow.Println(a...) }
 
 // Magentap print message with Magenta color
-func Magentap(a ...interface{}) {
-	Magenta.Print(a...)
-}
+func Magentap(a ...any) { Magenta.Print(a...) }
+
+// Magentaf print message with Magenta color
+func Magentaf(format string, a ...any) { Magenta.Printf(format, a...) }
 
 // Magentaln print message line with Magenta color
-func Magentaln(a ...interface{}) {
-	Magenta.Println(a...)
-}
+func Magentaln(a ...any) { Magenta.Println(a...) }
 
 /*************************************************************
  * quick use style print message
  *************************************************************/
 
+// Infop print message with Info color
+func Infop(a ...any) { Info.Print(a...) }
+
 // Infof print message with Info style
-func Infof(format string, a ...interface{}) {
-	Info.Printf(format, a...)
-}
+func Infof(format string, a ...any) { Info.Printf(format, a...) }
 
 // Infoln print message with Info style
-func Infoln(a ...interface{}) {
-	Info.Println(a...)
-}
+func Infoln(a ...any) { Info.Println(a...) }
+
+// Successp print message with success color
+func Successp(a ...any) { Success.Print(a...) }
+
+// Successf print message with success style
+func Successf(format string, a ...any) { Success.Printf(format, a...) }
+
+// Successln print message with success style
+func Successln(a ...any) { Success.Println(a...) }
+
+// Errorp print message with Error color
+func Errorp(a ...any) { Error.Print(a...) }
 
 // Errorf print message with Error style
-func Errorf(format string, a ...interface{}) {
-	Error.Printf(format, a...)
-}
+func Errorf(format string, a ...any) { Error.Printf(format, a...) }
 
 // Errorln print message with Error style
-func Errorln(a ...interface{}) {
-	Error.Println(a...)
-}
+func Errorln(a ...any) { Error.Println(a...) }
+
+// Warnp print message with Warn color
+func Warnp(a ...any) { Warn.Print(a...) }
 
 // Warnf print message with Warn style
-func Warnf(format string, a ...interface{}) {
-	Warn.Printf(format, a...)
-}
+func Warnf(format string, a ...any) { Warn.Printf(format, a...) }
 
 // Warnln print message with Warn style
-func Warnln(a ...interface{}) {
-	Warn.Println(a...)
-}
+func Warnln(a ...any) { Warn.Println(a...) }
diff --git a/vendor/github.com/gookit/color/style.go b/vendor/github.com/gookit/color/style.go
index fad76fb33..9e71eeac4 100644
--- a/vendor/github.com/gookit/color/style.go
+++ b/vendor/github.com/gookit/color/style.go
@@ -12,85 +12,75 @@ import (
 // Style a 16 color style. can add: fg color, bg color, color options
 //
 // Example:
-// 	color.Style{color.FgGreen}.Print("message")
+//
+//	color.Style{color.FgGreen}.Print("message")
 type Style []Color
 
 // New create a custom style
 //
 // Usage:
+//
 //	color.New(color.FgGreen).Print("message")
 //	equals to:
 //	color.Style{color.FgGreen}.Print("message")
-func New(colors ...Color) Style {
-	return colors
-}
+func New(colors ...Color) Style { return colors }
 
 // Save to global styles map
-func (s Style) Save(name string) {
-	AddStyle(name, s)
-}
+func (s Style) Save(name string) { AddStyle(name, s) }
 
 // Add to global styles map
 func (s *Style) Add(cs ...Color) {
 	*s = append(*s, cs...)
 }
 
-// Render render text
+// Render colored text
+//
 // Usage:
-//  color.New(color.FgGreen).Render("text")
-//  color.New(color.FgGreen, color.BgBlack, color.OpBold).Render("text")
-func (s Style) Render(a ...interface{}) string {
-	return RenderCode(s.String(), a...)
-}
+//
+//	color.New(color.FgGreen).Render("text")
+//	color.New(color.FgGreen, color.BgBlack, color.OpBold).Render("text")
+func (s Style) Render(a ...any) string { return RenderCode(s.String(), a...) }
 
-// Renderln render text line.
+// Renderln render text with newline.
 // like Println, will add spaces for each argument
+//
 // Usage:
-//  color.New(color.FgGreen).Renderln("text", "more")
-//  color.New(color.FgGreen, color.BgBlack, color.OpBold).Render("text", "more")
-func (s Style) Renderln(a ...interface{}) string {
-	return RenderWithSpaces(s.String(), a...)
-}
+//
+//	color.New(color.FgGreen).Renderln("text", "more")
+//	color.New(color.FgGreen, color.BgBlack, color.OpBold).Render("text", "more")
+func (s Style) Renderln(a ...any) string { return RenderWithSpaces(s.String(), a...) }
 
 // Sprint is alias of the 'Render'
-func (s Style) Sprint(a ...interface{}) string {
-	return RenderCode(s.String(), a...)
-}
+func (s Style) Sprint(a ...any) string { return RenderCode(s.String(), a...) }
 
 // Sprintf format and render message.
-func (s Style) Sprintf(format string, a ...interface{}) string {
+func (s Style) Sprintf(format string, a ...any) string {
 	return RenderString(s.String(), fmt.Sprintf(format, a...))
 }
 
 // Print render and Print text
-func (s Style) Print(a ...interface{}) {
+func (s Style) Print(a ...any) {
 	doPrintV2(s.String(), fmt.Sprint(a...))
 }
 
 // Printf render and print text
-func (s Style) Printf(format string, a ...interface{}) {
+func (s Style) Printf(format string, a ...any) {
 	doPrintV2(s.Code(), fmt.Sprintf(format, a...))
 }
 
 // Println render and print text line
-func (s Style) Println(a ...interface{}) {
+func (s Style) Println(a ...any) {
 	doPrintlnV2(s.String(), a)
 }
 
 // Code convert to code string. returns like "32;45;3"
-func (s Style) Code() string {
-	return s.String()
-}
+func (s Style) Code() string { return s.String() }
 
 // String convert to code string. returns like "32;45;3"
-func (s Style) String() string {
-	return Colors2code(s...)
-}
+func (s Style) String() string { return Colors2code(s...) }
 
 // IsEmpty style
-func (s Style) IsEmpty() bool {
-	return len(s) == 0
-}
+func (s Style) IsEmpty() bool { return len(s) == 0 }
 
 /*************************************************************
  * Theme(extended Style)
@@ -110,27 +100,24 @@ func NewTheme(name string, style Style) *Theme {
 }
 
 // Save to themes map
-func (t *Theme) Save() {
-	AddTheme(t.Name, t.Style)
-}
+func (t *Theme) Save() { AddTheme(t.Name, t.Style) }
 
 // Tips use name as title, only apply style for name
-func (t *Theme) Tips(format string, a ...interface{}) {
+func (t *Theme) Tips(format string, a ...any) {
 	// only apply style for name
-	t.Print(strings.ToUpper(t.Name) + ": ")
-	Printf(format+"\n", a...)
+	prefix := RenderString(t.Code(), strings.ToUpper(t.Name)+": ")
+	Printf(prefix+format+"\n", a...)
 }
 
 // Prompt use name as title, and apply style for message
-func (t *Theme) Prompt(format string, a ...interface{}) {
+func (t *Theme) Prompt(format string, a ...any) {
 	title := strings.ToUpper(t.Name) + ":"
 	t.Println(title, fmt.Sprintf(format, a...))
 }
 
 // Block like Prompt, but will wrap a empty line
-func (t *Theme) Block(format string, a ...interface{}) {
+func (t *Theme) Block(format string, a ...any) {
 	title := strings.ToUpper(t.Name) + ":\n"
-
 	t.Println(title, fmt.Sprintf(format, a...))
 }
 
@@ -140,10 +127,11 @@ func (t *Theme) Block(format string, a ...interface{}) {
 
 // internal themes(like bootstrap style)
 // Usage:
-// 	color.Info.Print("message")
-// 	color.Info.Printf("a %s message", "test")
-// 	color.Warn.Println("message")
-// 	color.Error.Println("message")
+//
+//	color.Info.Print("message")
+//	color.Info.Printf("a %s message", "test")
+//	color.Warn.Println("message")
+//	color.Error.Println("message")
 var (
 	// Info color style
 	Info = &Theme{"info", Style{OpReset, FgGreen}}
@@ -175,7 +163,8 @@ var (
 
 // Themes internal defined themes.
 // Usage:
-// 	color.Themes["info"].Println("message")
+//
+//	color.Themes["info"].Println("message")
 var Themes = map[string]*Theme{
 	"info":  Info,
 	"note":  Note,
@@ -201,9 +190,7 @@ func AddTheme(name string, style Style) {
 }
 
 // GetTheme get defined theme by name
-func GetTheme(name string) *Theme {
-	return Themes[name]
-}
+func GetTheme(name string) *Theme { return Themes[name] }
 
 /*************************************************************
  * internal styles
@@ -211,7 +198,8 @@ func GetTheme(name string) *Theme {
 
 // Styles internal defined styles, like bootstrap styles.
 // Usage:
-// 	color.Styles["info"].Println("message")
+//
+//	color.Styles["info"].Println("message")
 var Styles = map[string]Style{
 	"info":  {OpReset, FgGreen},
 	"note":  {OpBold, FgLightCyan},
@@ -237,9 +225,7 @@ var styleAliases = map[string]string{
 }
 
 // AddStyle add a style
-func AddStyle(name string, s Style) {
-	Styles[name] = s
-}
+func AddStyle(name string, s Style) { Styles[name] = s }
 
 // GetStyle get defined style by name
 func GetStyle(name string) Style {
@@ -270,7 +256,7 @@ func NewScheme(name string, styles map[string]Style) *Scheme {
 	return &Scheme{Name: name, Styles: styles}
 }
 
-// NewDefaultScheme create an defuault color Scheme
+// NewDefaultScheme create a default color Scheme
 func NewDefaultScheme(name string) *Scheme {
 	return NewScheme(name, map[string]Style{
 		"info":  {OpReset, FgGreen},
@@ -280,36 +266,34 @@ func NewDefaultScheme(name string) *Scheme {
 }
 
 // Style get by name
-func (s *Scheme) Style(name string) Style {
-	return s.Styles[name]
-}
+func (s *Scheme) Style(name string) Style { return s.Styles[name] }
 
 // Infof message print
-func (s *Scheme) Infof(format string, a ...interface{}) {
+func (s *Scheme) Infof(format string, a ...any) {
 	s.Styles["info"].Printf(format, a...)
 }
 
 // Infoln message print
-func (s *Scheme) Infoln(v ...interface{}) {
+func (s *Scheme) Infoln(v ...any) {
 	s.Styles["info"].Println(v...)
 }
 
 // Warnf message print
-func (s *Scheme) Warnf(format string, a ...interface{}) {
+func (s *Scheme) Warnf(format string, a ...any) {
 	s.Styles["warn"].Printf(format, a...)
 }
 
 // Warnln message print
-func (s *Scheme) Warnln(v ...interface{}) {
+func (s *Scheme) Warnln(v ...any) {
 	s.Styles["warn"].Println(v...)
 }
 
 // Errorf message print
-func (s *Scheme) Errorf(format string, a ...interface{}) {
+func (s *Scheme) Errorf(format string, a ...any) {
 	s.Styles["error"].Printf(format, a...)
 }
 
 // Errorln message print
-func (s *Scheme) Errorln(v ...interface{}) {
+func (s *Scheme) Errorln(v ...any) {
 	s.Styles["error"].Println(v...)
 }
diff --git a/vendor/github.com/gookit/color/utils.go b/vendor/github.com/gookit/color/utils.go
index dedf9f2df..3322a3659 100644
--- a/vendor/github.com/gookit/color/utils.go
+++ b/vendor/github.com/gookit/color/utils.go
@@ -32,38 +32,31 @@ func ResetTerminal() error {
  *************************************************************/
 
 // Print render color tag and print messages
-func Print(a ...interface{}) {
+func Print(a ...any) {
 	Fprint(output, a...)
 }
 
 // Printf format and print messages
-func Printf(format string, a ...interface{}) {
+func Printf(format string, a ...any) {
 	Fprintf(output, format, a...)
 }
 
 // Println messages with new line
-func Println(a ...interface{}) {
+func Println(a ...any) {
 	Fprintln(output, a...)
 }
 
 // Fprint print rendered messages to writer
+//
 // Notice: will ignore print error
-func Fprint(w io.Writer, a ...interface{}) {
+func Fprint(w io.Writer, a ...any) {
 	_, err := fmt.Fprint(w, Render(a...))
 	saveInternalError(err)
-
-	// if isLikeInCmd {
-	// 	renderColorCodeOnCmd(func() {
-	// 		_, _ = fmt.Fprint(w, Render(a...))
-	// 	})
-	// } else {
-	// 	_, _ = fmt.Fprint(w, Render(a...))
-	// }
 }
 
 // Fprintf print format and rendered messages to writer.
 // Notice: will ignore print error
-func Fprintf(w io.Writer, format string, a ...interface{}) {
+func Fprintf(w io.Writer, format string, a ...any) {
 	str := fmt.Sprintf(format, a...)
 	_, err := fmt.Fprint(w, ReplaceTag(str))
 	saveInternalError(err)
@@ -71,53 +64,58 @@ func Fprintf(w io.Writer, format string, a ...interface{}) {
 
 // Fprintln print rendered messages line to writer
 // Notice: will ignore print error
-func Fprintln(w io.Writer, a ...interface{}) {
-	str := formatArgsForPrintln(a)
+func Fprintln(w io.Writer, a ...any) {
+	str := formatLikePrintln(a)
 	_, err := fmt.Fprintln(w, ReplaceTag(str))
 	saveInternalError(err)
 }
 
 // Lprint passes colored messages to a log.Logger for printing.
 // Notice: should be goroutine safe
-func Lprint(l *log.Logger, a ...interface{}) {
+func Lprint(l *log.Logger, a ...any) {
 	l.Print(Render(a...))
 }
 
 // Render parse color tags, return rendered string.
+//
 // Usage:
+//
 //	text := Render("hello world!")
 //	fmt.Println(text)
-func Render(a ...interface{}) string {
+func Render(a ...any) string {
 	if len(a) == 0 {
 		return ""
 	}
-
 	return ReplaceTag(fmt.Sprint(a...))
 }
 
 // Sprint parse color tags, return rendered string
-func Sprint(a ...interface{}) string {
+func Sprint(a ...any) string {
 	if len(a) == 0 {
 		return ""
 	}
-
 	return ReplaceTag(fmt.Sprint(a...))
 }
 
 // Sprintf format and return rendered string
-func Sprintf(format string, a ...interface{}) string {
+func Sprintf(format string, a ...any) string {
 	return ReplaceTag(fmt.Sprintf(format, a...))
 }
 
 // String alias of the ReplaceTag
-func String(s string) string {
-	return ReplaceTag(s)
-}
+func String(s string) string { return ReplaceTag(s) }
 
 // Text alias of the ReplaceTag
-func Text(s string) string {
-	return ReplaceTag(s)
-}
+func Text(s string) string { return ReplaceTag(s) }
+
+// Uint8sToInts convert []uint8 to []int
+// func Uint8sToInts(u8s []uint8 ) []int {
+// 	ints := make([]int, len(u8s))
+// 	for i, u8 := range u8s {
+// 		ints[i] = int(u8)
+// 	}
+// 	return ints
+// }
 
 /*************************************************************
  * helper methods for print
@@ -127,29 +125,26 @@ func Text(s string) string {
 func doPrintV2(code, str string) {
 	_, err := fmt.Fprint(output, RenderString(code, str))
 	saveInternalError(err)
-
-	// if isLikeInCmd {
-	// 	renderColorCodeOnCmd(func() {
-	// 		_, _ = fmt.Fprint(output, RenderString(code, str))
-	// 	})
-	// } else {
-	// 	_, _ = fmt.Fprint(output, RenderString(code, str))
-	// }
 }
 
 // new implementation, support render full color code on pwsh.exe, cmd.exe
-func doPrintlnV2(code string, args []interface{}) {
-	str := formatArgsForPrintln(args)
+func doPrintlnV2(code string, args []any) {
+	str := formatLikePrintln(args)
 	_, err := fmt.Fprintln(output, RenderString(code, str))
 	saveInternalError(err)
 }
 
-// if use Println, will add spaces for each arg
-func formatArgsForPrintln(args []interface{}) (message string) {
+// use Println, will add spaces for each arg
+func formatLikePrintln(args []any) (message string) {
 	if ln := len(args); ln == 0 {
 		message = ""
 	} else if ln == 1 {
-		message = fmt.Sprint(args[0])
+		// Single argument - avoid fmt.Sprint overhead
+		if str, ok := args[0].(string); ok {
+			message = str
+		} else {
+			message = fmt.Sprint(args[0])
+		}
 	} else {
 		message = fmt.Sprintln(args...)
 		// clear last "\n"
@@ -167,14 +162,17 @@ func formatArgsForPrintln(args []interface{}) (message string) {
 // 	return debugMode == "on"
 // }
 
-func debugf(f string, v ...interface{}) {
+func debugf(f string, v ...any) {
 	if debugMode {
-		fmt.Print("COLOR_DEBUG: ")
-		fmt.Printf(f, v...)
-		fmt.Println()
+		fmt.Printf("COLOR_DEBUG: "+f+"\n", v...)
 	}
 }
 
+// equals: return ok ? val1 : val2
+func isValidUint8(val int) bool {
+	return val >= 0 && val < 256
+}
+
 // equals: return ok ? val1 : val2
 func compareVal(ok bool, val1, val2 uint8) uint8 {
 	if ok {
@@ -183,6 +181,14 @@ func compareVal(ok bool, val1, val2 uint8) uint8 {
 	return val2
 }
 
+// equals: return ok ? val1 : val2
+func compareF64(ok bool, val1, val2 float64) float64 {
+	if ok {
+		return val1
+	}
+	return val2
+}
+
 func saveInternalError(err error) {
 	if err != nil {
 		debugf("inner error: %s", err.Error())
diff --git a/vendor/github.com/integrii/flaggy/AGENTS.md b/vendor/github.com/integrii/flaggy/AGENTS.md
new file mode 100644
index 000000000..e521055e8
--- /dev/null
+++ b/vendor/github.com/integrii/flaggy/AGENTS.md
@@ -0,0 +1,23 @@
+# Flaggy Contribution Guidelines for Agents
+
+This repository provides a zero-dependency command-line parsing library that must always rely exclusively on the Go standard library for runtime and test code. The core principles that follow preserve the project's lightweight nature and its focus on easily understandable, flat code.
+
+## Core Principles
+- Keep the codebase dependency-free beyond the Go standard library. Adding third-party modules for any purpose, including testing, is not permitted.
+- Prefer flat, straightforward control flow. Avoid `else` statements when possible and limit indentation depth so examples remain approachable for beginners.
+- Optimize every change for readability. Favor descriptive names, small logical blocks, and explanatory comments that teach users how the parser behaves.
+
+## Documentation Expectations
+- Maintain clear, beginner-friendly explanations throughout the codebase. Add comments to **every** function and test describing what they do and why they matter to the overall library.
+- Annotate each stanza of code with concise comments, even when the logic appears self-explanatory.
+- Keep primary documentation accurate. Update `README.md` and `CONTRIBUTING.md` whenever your modifications alter usage instructions, contribution workflows, or observable behavior.
+
+## Tooling Requirements
+- Always run `go fmt`, `go vet`, and `goimports` over affected packages before committing.
+- Favor consistent formatting and import organization that highlight the minimal surface area of each example.
+
+## Testing Guidance
+- When writing tests, ensure the accompanying comment explains exactly what is being verified.
+- Leave benchmarks and examples with clarifying comments so readers immediately understand the intent and scope of each scenario.
+
+Following these guidelines keeps Flaggy's codebase welcoming to newcomers and aligned with its lightweight philosophy.
diff --git a/vendor/github.com/integrii/flaggy/CONTRIBUTING.md b/vendor/github.com/integrii/flaggy/CONTRIBUTING.md
new file mode 100644
index 000000000..6d60d64f2
--- /dev/null
+++ b/vendor/github.com/integrii/flaggy/CONTRIBUTING.md
@@ -0,0 +1,17 @@
+# Contributing to Flaggy
+
+Thanks for your interest in improving Flaggy! The following guide outlines the standard workflow for proposing and landing a change. Following these steps helps maintainers review contributions efficiently and keeps the project healthy.
+
+* **Getting Started**
+  - **Open an issue** describing the problem you want to fix or the feature you plan to add. This gives us a chance to discuss the proposal before you start coding.
+  - **Fork the repository** to your own GitHub account so you can develop the change independently of the main project.
+* **Implementing Your Change**
+  - Make your modifications in your fork (create a topic branch if that helps keep things organized).
+  - Add or update tests so your change is well covered.
+  - Run the full test suite locally and ensure everything passes (`go test ./...`).
+* **Opening a Pull Request**
+  - Push your updates to your fork.
+  - Open a pull request against the main repository, referencing the issue created earlier. Include context about what the change does and any testing performed.
+  - Participate in the review process and incorporate any requested changes. Keep your branch up to date with the main branch as needed.
+
+We appreciate your contributions and look forward to collaborating with you!
diff --git a/vendor/github.com/integrii/flaggy/LICENSE b/vendor/github.com/integrii/flaggy/LICENSE
index cf1ab25da..fdddb29aa 100644
--- a/vendor/github.com/integrii/flaggy/LICENSE
+++ b/vendor/github.com/integrii/flaggy/LICENSE
@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to 
+For more information, please refer to 
diff --git a/vendor/github.com/integrii/flaggy/README.md b/vendor/github.com/integrii/flaggy/README.md
index 740811fc7..8afbedfb7 100644
--- a/vendor/github.com/integrii/flaggy/README.md
+++ b/vendor/github.com/integrii/flaggy/README.md
@@ -1,18 +1,18 @@
 

 
-
+
 

 
-
-
+ 
 
-
 
+
+
 

 
 Sensible and _fast_ command-line flag parsing with excellent support for **subcommands** and **positional values**. Flags can be at any position. Flaggy has no required project or package layout like [Cobra requires](https://github.com/spf13/cobra/issues/641), and **no external dependencies**!
 
-Check out the [godoc](http://godoc.org/github.com/integrii/flaggy), [examples directory](https://github.com/integrii/flaggy/tree/master/examples), and [examples in this readme](https://github.com/integrii/flaggy#super-simple-example) to get started quickly. You can also read the Flaggy introduction post with helpful examples [on my weblog](https://ericgreer.info/post/a-better-flags-package-for-go/).
+Check out the [go doc](http://pkg.go.dev/github.com/integrii/flaggy), [examples directory](https://github.com/integrii/flaggy/tree/master/examples), and [examples in this readme](https://github.com/integrii/flaggy#super-simple-example) to get started quickly. You can also read the Flaggy introduction post with helpful examples [on my weblog](https://ericgreer.info/post/a-better-flags-package-for-go/).
 
 # Installation
 
@@ -38,10 +38,11 @@ Check out the [godoc](http://godoc.org/github.com/integrii/flaggy), [examples di
 - Flags can use a single dash or double dash (`--flag`, `-flag`, `-f`, `--f`)
 - Flags can have `=` assignment operators, or use a space (`--flag=value`, `--flag value`)
 - Flags support single quote globs with spaces (`--flag 'this is all one value'`)
-- Flags of slice types can be passed multiple times (`-f one -f two -f three`)
+- Flags of slice types can be passed multiple times (`-f one -f two -f three`).
 - Optional but default version output with `--version`
 - Optional but default help output with `-h` or `--help`
 - Optional but default help output when any invalid or unknown parameter is passed
+- bash, zsh, fish, PowerShell, and Nushell shell completion generation by default
 - It's _fast_. All flag and subcommand parsing takes less than `1ms` in most programs.
 
 # Example Help Output
@@ -153,24 +154,40 @@ print(flaggy.TrailingArguments[0])
 
 # Supported Flag Types
 
-Flaggy has specific flag types for all basic types included in go as well as a slice of any of those types.  This includes all of the following types:
+Flaggy has specific flag types for all basic Go types as well as slice variants, plus a selection of helpful standard library structures. You can target any of the following assignments when defining a flag:
 
-- string and []string
-- bool and []bool
-- all int types and all []int types
-- all float types and all []float types
-- all uint types and all []uint types
+- Text and truthy values: `string`, `[]string`, `bool`, `[]bool`
+- Signed integers: `int`, `int64`, `int32`, `int16`, `int8`, and a slice form for each type
+- Unsigned integers: `uint`, `uint64`, `uint32`, `uint16`, `uint8` (aka `byte`), and slice forms for each type
+- Floating point numbers: `float64`, `float32`, and slices of both precisions
+- Time utilities: `time.Duration`, `[]time.Duration`, `time.Time`, `time.Location`, `time.Month`, `time.Weekday`
+- Network primitives: `net.IP`, `[]net.IP`, `net.HardwareAddr`, `[]net.HardwareAddr`, `net.IPMask`, `[]net.IPMask`, `net.IPNet`, `net.TCPAddr`, `net.UDPAddr`
+- Modern IP types: `netip.Addr`, `netip.Prefix`, `netip.AddrPort`
+- URLs and filesystem helpers: `url.URL`, `os.FileMode`
+- Pattern and math types: `regexp.Regexp`, `big.Int`, `big.Rat`
+- Encoded byte helpers: `Base64Bytes` (a base64-decoded `[]byte`)
 
-Other more specific types can also be used as flag types.  They will be automatically parsed using the standard parsing functions included with those types in those packages.  This includes:
+# Shell Completion
 
-- net.IP
-- []net.IP
-- net.HardwareAddr
-- []net.HardwareAddr
-- net.IPMask
-- []net.IPMask
-- time.Duration
-- []time.Duration
+Flaggy generates `bash`, `zsh`, `fish`, `PowerShell`, and `Nushell` completion scripts automatically.
+
+```bash
+# Bash
+source <(./app completion bash)
+
+# Zsh
+source <(./app completion zsh)
+
+# Fish
+./app completion fish | source
+
+# PowerShell
+./app completion powershell | Out-String | Invoke-Expression
+
+# Nushell
+./app completion nushell | save --force ~/.cache/app-completions.nu
+source ~/.cache/app-completions.nu
+```
 
 # An Example Program
 
diff --git a/vendor/github.com/integrii/flaggy/byte_types.go b/vendor/github.com/integrii/flaggy/byte_types.go
new file mode 100644
index 000000000..6acb7f07b
--- /dev/null
+++ b/vendor/github.com/integrii/flaggy/byte_types.go
@@ -0,0 +1,4 @@
+package flaggy
+
+// Base64Bytes is a []byte interpreted as base64 when parsed from flags.
+type Base64Bytes []byte
diff --git a/vendor/github.com/integrii/flaggy/completion.go b/vendor/github.com/integrii/flaggy/completion.go
new file mode 100644
index 000000000..de40a277e
--- /dev/null
+++ b/vendor/github.com/integrii/flaggy/completion.go
@@ -0,0 +1,390 @@
+package flaggy
+
+import (
+	"fmt"
+	"strings"
+)
+
+// EnableCompletion enables shell autocomplete outputs to be generated.
+func EnableCompletion() {
+	DefaultParser.ShowCompletion = true
+}
+
+// DisableCompletion disallows shell autocomplete outputs to be generated.
+func DisableCompletion() {
+	DefaultParser.ShowCompletion = false
+}
+
+// GenerateBashCompletion returns a bash completion script for the parser.
+func GenerateBashCompletion(p *Parser) string {
+	var b strings.Builder
+	funcName := "_" + sanitizeName(p.Name) + "_complete"
+	b.WriteString("# bash completion for " + p.Name + "\n")
+	b.WriteString(funcName + "() {\n")
+	b.WriteString("    local cur prev\n")
+	b.WriteString("    COMPREPLY=()\n")
+	b.WriteString("    cur=\"${COMP_WORDS[COMP_CWORD]}\"\n")
+	b.WriteString("    prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n")
+	b.WriteString("    case \"$prev\" in\n")
+	bashCaseEntries(&p.Subcommand, &b)
+	rootOpts := collectOptions(&p.Subcommand)
+	b.WriteString("        *)\n            COMPREPLY=( $(compgen -W \"" + rootOpts + "\" -- \"$cur\") )\n            return 0\n            ;;\n    esac\n}\n")
+	b.WriteString("complete -F " + funcName + " " + p.Name + "\n")
+	return b.String()
+}
+
+// GenerateZshCompletion returns a zsh completion script for the parser.
+func GenerateZshCompletion(p *Parser) string {
+	var b strings.Builder
+	funcName := "_" + sanitizeName(p.Name)
+	b.WriteString("#compdef " + p.Name + "\n\n")
+	b.WriteString(funcName + "() {\n")
+	b.WriteString("    local cur prev\n")
+	b.WriteString("    cur=${words[CURRENT]}\n")
+	b.WriteString("    prev=${words[CURRENT-1]}\n")
+	b.WriteString("    case \"$prev\" in\n")
+	zshCaseEntries(&p.Subcommand, &b)
+	rootOpts := collectOptions(&p.Subcommand)
+	b.WriteString("        *)\n            compadd -- " + rootOpts + "\n            ;;\n    esac\n}\n")
+	b.WriteString("compdef " + funcName + " " + p.Name + "\n")
+	return b.String()
+}
+
+// GenerateFishCompletion returns a fish completion script for the parser.
+func GenerateFishCompletion(p *Parser) string {
+	var b strings.Builder
+	b.WriteString("# fish completion for " + p.Name + "\n")
+	writeFishEntries(&p.Subcommand, &b, p.Name, nil)
+	return b.String()
+}
+
+// GeneratePowerShellCompletion returns a PowerShell completion script for the parser.
+func GeneratePowerShellCompletion(p *Parser) string {
+	var b strings.Builder
+	b.WriteString("# PowerShell completion for " + p.Name + "\n")
+	b.WriteString("Register-ArgumentCompleter -CommandName '" + p.Name + "' -ScriptBlock {\n")
+	b.WriteString("    param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParameters)\n")
+	b.WriteString("    $completions = @(\n")
+	writePowerShellEntries(&p.Subcommand, &b)
+	b.WriteString("    )\n")
+	b.WriteString("    $completions | Where-Object { $_.CompletionText -like \"$wordToComplete*\" }\n")
+	b.WriteString("}\n")
+	return b.String()
+}
+
+// GenerateNushellCompletion returns a Nushell completion script for the parser.
+func GenerateNushellCompletion(p *Parser) string {
+	var b strings.Builder
+	command := p.Name
+	funcName := "nu-complete " + command
+	b.WriteString("# nushell completion for " + command + "\n")
+	b.WriteString("def \"" + funcName + "\" [] {\n")
+	b.WriteString("    [\n")
+	writeNushellEntries(&p.Subcommand, &b)
+	b.WriteString("    ]\n")
+	b.WriteString("}\n\n")
+	b.WriteString("extern \"" + command + "\" [\n")
+	writeNushellFlagSignature(&p.Subcommand, &b)
+	b.WriteString("    command?: string@\"" + funcName + "\"\n")
+	b.WriteString("]\n")
+	return b.String()
+}
+
+// collectOptions builds a space-delimited list of flags, subcommands, and positional values
+// for the provided subcommand.
+func collectOptions(sc *Subcommand) string {
+	var opts []string
+	for _, f := range sc.Flags {
+		if len(f.ShortName) > 0 {
+			opts = append(opts, "-"+f.ShortName)
+		}
+		if len(f.LongName) > 0 {
+			opts = append(opts, "--"+f.LongName)
+		}
+	}
+	for _, p := range sc.PositionalFlags {
+		if p.Name != "" {
+			opts = append(opts, p.Name)
+		}
+	}
+	for _, s := range sc.Subcommands {
+		if s.Hidden {
+			continue
+		}
+		if s.Name != "" {
+			opts = append(opts, s.Name)
+		}
+		if s.ShortName != "" {
+			opts = append(opts, s.ShortName)
+		}
+	}
+	return strings.Join(opts, " ")
+}
+
+func bashCaseEntries(sc *Subcommand, b *strings.Builder) {
+	for _, s := range sc.Subcommands {
+		if s.Hidden {
+			continue
+		}
+		opts := collectOptions(s)
+		b.WriteString("        " + s.Name + ")\n            COMPREPLY=( $(compgen -W \"" + opts + "\" -- \"$cur\") )\n            return 0\n            ;;\n")
+		if s.ShortName != "" {
+			b.WriteString("        " + s.ShortName + ")\n            COMPREPLY=( $(compgen -W \"" + opts + "\" -- \"$cur\") )\n            return 0\n            ;;\n")
+		}
+		bashCaseEntries(s, b)
+	}
+}
+
+func zshCaseEntries(sc *Subcommand, b *strings.Builder) {
+	for _, s := range sc.Subcommands {
+		if s.Hidden {
+			continue
+		}
+		opts := collectOptions(s)
+		b.WriteString("        " + s.Name + ")\n            compadd -- " + opts + "\n            return\n            ;;\n")
+		if s.ShortName != "" {
+			b.WriteString("        " + s.ShortName + ")\n            compadd -- " + opts + "\n            return\n            ;;\n")
+		}
+		zshCaseEntries(s, b)
+	}
+}
+
+func sanitizeName(n string) string {
+	return strings.ReplaceAll(n, "-", "_")
+}
+
+// writeFishEntries builds the fish completion statements for the provided subcommand path so
+// the generated script mirrors Flaggy's flag and subcommand hierarchy for interactive use.
+func writeFishEntries(sc *Subcommand, b *strings.Builder, command string, path []string) {
+	condition := fishConditionForFlags(path)
+	for _, f := range sc.Flags {
+		if f.Hidden {
+			continue
+		}
+		line := "complete -c " + command
+		if condition != "" {
+			line += " -n '" + condition + "'"
+		}
+		if f.ShortName != "" {
+			line += " -s " + f.ShortName
+		}
+		if f.LongName != "" {
+			line += " -l " + f.LongName
+		}
+		if f.Description != "" {
+			line += " -d '" + escapeSingleQuotes(f.Description) + "'"
+		}
+		line += "\n"
+		b.WriteString(line)
+	}
+	for _, p := range sc.PositionalFlags {
+		if p.Hidden {
+			continue
+		}
+		if p.Name == "" {
+			continue
+		}
+		line := "complete -c " + command
+		if condition != "" {
+			line += " -n '" + condition + "'"
+		}
+		line += " -a '" + escapeSingleQuotes(p.Name) + "'"
+		if p.Description != "" {
+			line += " -d '" + escapeSingleQuotes(p.Description) + "'"
+		}
+		line += "\n"
+		b.WriteString(line)
+	}
+	subCondition := fishConditionForSubcommands(path)
+	for _, sub := range sc.Subcommands {
+		if sub.Hidden {
+			continue
+		}
+		line := "complete -c " + command
+		if subCondition != "" {
+			line += " -n '" + subCondition + "'"
+		}
+		line += " -a '" + escapeSingleQuotes(sub.Name) + "'"
+		if sub.Description != "" {
+			line += " -d '" + escapeSingleQuotes(sub.Description) + "'"
+		}
+		line += "\n"
+		b.WriteString(line)
+		if sub.ShortName != "" {
+			aliasLine := "complete -c " + command
+			if subCondition != "" {
+				aliasLine += " -n '" + subCondition + "'"
+			}
+			aliasLine += " -a '" + escapeSingleQuotes(sub.ShortName) + "'"
+			if sub.Description != "" {
+				aliasLine += " -d '" + escapeSingleQuotes(sub.Description) + "'"
+			}
+			aliasLine += "\n"
+			b.WriteString(aliasLine)
+		}
+		nextPath := appendPath(path, sub.Name)
+		writeFishEntries(sub, b, command, nextPath)
+	}
+}
+
+// fishConditionForFlags returns the fish condition needed to scope flag suggestions to the
+// current subcommand path while leaving root flags globally available.
+func fishConditionForFlags(path []string) string {
+	if len(path) == 0 {
+		return ""
+	}
+	return "__fish_seen_subcommand_from " + path[len(path)-1]
+}
+
+// fishConditionForSubcommands returns the fish condition that ensures subcommand suggestions
+// appear only after their parent command token has been entered.
+func fishConditionForSubcommands(path []string) string {
+	if len(path) == 0 {
+		return "__fish_use_subcommand"
+	}
+	return "__fish_seen_subcommand_from " + path[len(path)-1]
+}
+
+// appendPath creates a new slice with the next subcommand name appended so recursive
+// completion builders can keep the traversal stack immutable.
+func appendPath(path []string, value string) []string {
+	next := make([]string, len(path)+1)
+	copy(next, path)
+	next[len(path)] = value
+	return next
+}
+
+// escapeSingleQuotes prepares text for inclusion in single-quoted shell strings so flag
+// descriptions render safely in the generated scripts.
+func escapeSingleQuotes(s string) string {
+	return strings.ReplaceAll(s, "'", "\\'")
+}
+
+// escapeDoubleQuotes prepares text for inclusion in double-quoted shell strings which is
+// required for PowerShell and Nushell emission.
+func escapeDoubleQuotes(s string) string {
+	return strings.ReplaceAll(s, "\"", "\\\"")
+}
+
+// writePowerShellEntries walks the parser tree and emits CompletionResult entries so the
+// PowerShell script can surface flags, positionals, and subcommands interactively.
+func writePowerShellEntries(sc *Subcommand, b *strings.Builder) {
+	for _, f := range sc.Flags {
+		if f.Hidden {
+			continue
+		}
+		if f.LongName != "" {
+			writePowerShellLine("--"+f.LongName, f.Description, "ParameterName", b)
+		}
+		if f.ShortName != "" {
+			writePowerShellLine("-"+f.ShortName, f.Description, "ParameterName", b)
+		}
+	}
+	for _, p := range sc.PositionalFlags {
+		if p.Hidden {
+			continue
+		}
+		if p.Name == "" {
+			continue
+		}
+		writePowerShellLine(p.Name, p.Description, "ParameterValue", b)
+	}
+	for _, sub := range sc.Subcommands {
+		if sub.Hidden {
+			continue
+		}
+		writePowerShellLine(sub.Name, sub.Description, "Command", b)
+		if sub.ShortName != "" {
+			writePowerShellLine(sub.ShortName, sub.Description, "Command", b)
+		}
+		writePowerShellEntries(sub, b)
+	}
+}
+
+// writePowerShellLine emits a single CompletionResult definition with the supplied tooltip and
+// completion type for consumption by Register-ArgumentCompleter.
+func writePowerShellLine(value, description, kind string, b *strings.Builder) {
+	tooltip := description
+	if tooltip == "" {
+		tooltip = value
+	}
+	line := fmt.Sprintf("        [System.Management.Automation.CompletionResult]::new(\"%s\", \"%s\", \"%s\", \"%s\")\n", escapeDoubleQuotes(value), escapeDoubleQuotes(value), kind, escapeDoubleQuotes(tooltip))
+	b.WriteString(line)
+}
+
+// writeNushellEntries collects all completion values into Nushell's structured format so
+// external commands can expose their interactive help inside the shell.
+func writeNushellEntries(sc *Subcommand, b *strings.Builder) {
+	for _, f := range sc.Flags {
+		if f.Hidden {
+			continue
+		}
+		if f.LongName != "" {
+			writeNushellLine("--"+f.LongName, f.Description, b)
+		}
+		if f.ShortName != "" {
+			writeNushellLine("-"+f.ShortName, f.Description, b)
+		}
+	}
+	for _, p := range sc.PositionalFlags {
+		if p.Hidden {
+			continue
+		}
+		if p.Name == "" {
+			continue
+		}
+		writeNushellLine(p.Name, p.Description, b)
+	}
+	for _, sub := range sc.Subcommands {
+		if sub.Hidden {
+			continue
+		}
+		writeNushellLine(sub.Name, sub.Description, b)
+		if sub.ShortName != "" {
+			writeNushellLine(sub.ShortName, sub.Description, b)
+		}
+		writeNushellEntries(sub, b)
+	}
+}
+
+// writeNushellLine emits a single structured completion item for Nushell with a value and
+// friendly description.
+func writeNushellLine(value, description string, b *strings.Builder) {
+	tooltip := description
+	if tooltip == "" {
+		tooltip = value
+	}
+	line := fmt.Sprintf("        { value: \"%s\", description: \"%s\" }\n", escapeDoubleQuotes(value), escapeDoubleQuotes(tooltip))
+	b.WriteString(line)
+}
+
+// writeNushellFlagSignature appends flag signature stubs so Nushell understands which
+// switches are available when invoking the external command.
+func writeNushellFlagSignature(sc *Subcommand, b *strings.Builder) {
+	for _, f := range sc.Flags {
+		if f.Hidden {
+			continue
+		}
+		if f.LongName != "" || f.ShortName != "" {
+			line := "    "
+			if f.LongName != "" {
+				line += "--" + f.LongName
+			}
+			if f.ShortName != "" {
+				if f.LongName != "" {
+					line += "(-" + f.ShortName + ")"
+				} else {
+					line += "-" + f.ShortName
+				}
+			}
+			line += "\n"
+			b.WriteString(line)
+		}
+	}
+	for _, sub := range sc.Subcommands {
+		if sub.Hidden {
+			continue
+		}
+		writeNushellFlagSignature(sub, b)
+	}
+}
diff --git a/vendor/github.com/integrii/flaggy/flag.go b/vendor/github.com/integrii/flaggy/flag.go
index 409ddf94d..c1a33006d 100644
--- a/vendor/github.com/integrii/flaggy/flag.go
+++ b/vendor/github.com/integrii/flaggy/flag.go
@@ -1,10 +1,16 @@
 package flaggy
 
 import (
+	"encoding/base64"
 	"errors"
 	"fmt"
+	"math/big"
 	"net"
+	netip "net/netip"
+	"net/url"
+	"os"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -62,8 +68,7 @@ func (f *Flag) identifyAndAssignValue(value string) error {
 		*v = value
 	case *[]string:
 		v := f.AssignmentVar.(*[]string)
-		splitString := strings.Split(value, ",")
-		new := append(*v, splitString...)
+		new := append(*v, value)
 		*v = new
 	case *bool:
 		v, err := strconv.ParseBool(value)
@@ -327,6 +332,164 @@ func (f *Flag) identifyAndAssignValue(value string) error {
 		existing := f.AssignmentVar.(*[]net.IPMask)
 		new := append(*existing, v)
 		*existing = new
+	case *time.Time:
+		// Support unix seconds if numeric, else try common layouts
+		if isAllDigits(value) {
+			sec, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			t := time.Unix(sec, 0).UTC()
+			a := f.AssignmentVar.(*time.Time)
+			*a = t
+			return nil
+		}
+		var parsed time.Time
+		var err error
+		layouts := []string{time.RFC3339Nano, time.RFC3339, time.RFC1123Z, time.RFC1123}
+		for _, layout := range layouts {
+			parsed, err = time.Parse(layout, value)
+			if err == nil {
+				a := f.AssignmentVar.(*time.Time)
+				*a = parsed
+				return nil
+			}
+		}
+		return err
+	case *url.URL:
+		u, err := url.Parse(value)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*url.URL)
+		*a = *u
+	case *net.IPNet:
+		_, ipnet, err := net.ParseCIDR(value)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*net.IPNet)
+		*a = *ipnet
+	case *net.TCPAddr:
+		host, portStr, err := net.SplitHostPort(value)
+		if err != nil {
+			return err
+		}
+		port, err := strconv.Atoi(portStr)
+		if err != nil {
+			return err
+		}
+		var ip net.IP
+		if len(host) > 0 {
+			ip = net.ParseIP(host)
+		}
+		addr := net.TCPAddr{IP: ip, Port: port}
+		a := f.AssignmentVar.(*net.TCPAddr)
+		*a = addr
+	case *net.UDPAddr:
+		host, portStr, err := net.SplitHostPort(value)
+		if err != nil {
+			return err
+		}
+		port, err := strconv.Atoi(portStr)
+		if err != nil {
+			return err
+		}
+		var ip net.IP
+		if len(host) > 0 {
+			ip = net.ParseIP(host)
+		}
+		addr := net.UDPAddr{IP: ip, Port: port}
+		a := f.AssignmentVar.(*net.UDPAddr)
+		*a = addr
+	case *os.FileMode:
+		v, err := strconv.ParseUint(value, 0, 32)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*os.FileMode)
+		*a = os.FileMode(v)
+	case *regexp.Regexp:
+		r, err := regexp.Compile(value)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*regexp.Regexp)
+		*a = *r
+	case *time.Location:
+		// Try IANA name, with fallback to UTC offset like +02:00 or -0700
+		if loc, err := time.LoadLocation(value); err == nil {
+			a := f.AssignmentVar.(*time.Location)
+			*a = *loc
+			return nil
+		}
+		if off, ok := parseUTCOffset(value); ok {
+			name := offsetName(off)
+			loc := time.FixedZone(name, off)
+			a := f.AssignmentVar.(*time.Location)
+			*a = *loc
+			return nil
+		}
+		return fmt.Errorf("invalid time.Location: %s", value)
+	case *time.Month:
+		if m, ok := parseMonth(value); ok {
+			a := f.AssignmentVar.(*time.Month)
+			*a = m
+			return nil
+		}
+		return fmt.Errorf("invalid time.Month: %s", value)
+	case *time.Weekday:
+		if d, ok := parseWeekday(value); ok {
+			a := f.AssignmentVar.(*time.Weekday)
+			*a = d
+			return nil
+		}
+		return fmt.Errorf("invalid time.Weekday: %s", value)
+	case *big.Int:
+		bi := f.AssignmentVar.(*big.Int)
+		if _, ok := bi.SetString(value, 0); !ok {
+			return fmt.Errorf("invalid big.Int: %s", value)
+		}
+	case *big.Rat:
+		br := f.AssignmentVar.(*big.Rat)
+		if _, ok := br.SetString(value); !ok {
+			return fmt.Errorf("invalid big.Rat: %s", value)
+		}
+	case *Base64Bytes:
+		// Try standard then URL encoding
+		decoded, err := base64.StdEncoding.DecodeString(value)
+		if err == nil {
+			a := f.AssignmentVar.(*Base64Bytes)
+			*a = Base64Bytes(decoded)
+			return nil
+		}
+		if decodedURL, errURL := base64.URLEncoding.DecodeString(value); errURL == nil {
+			a := f.AssignmentVar.(*Base64Bytes)
+			*a = Base64Bytes(decodedURL)
+			return nil
+		}
+		return err
+	case *netip.Addr:
+		addr, err := netip.ParseAddr(value)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*netip.Addr)
+		*a = addr
+	case *netip.Prefix:
+		pfx, err := netip.ParsePrefix(value)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*netip.Prefix)
+		*a = pfx
+	case *netip.AddrPort:
+		ap, err := netip.ParseAddrPort(value)
+		if err != nil {
+			return err
+		}
+		a := f.AssignmentVar.(*netip.AddrPort)
+		*a = ap
 	default:
 		return errors.New("Unknown flag assignmentVar supplied in flag " + f.LongName + " " + f.ShortName)
 	}
@@ -398,8 +561,9 @@ func parseArgWithValue(arg string) (key string, value string) {
 }
 
 // parseFlagToName parses a flag with space value down to a key name:
-//     --path -> path
-//     -p -> p
+//
+//	--path -> path
+//	-p -> p
 func parseFlagToName(arg string) string {
 	// remove minus from start
 	arg = strings.TrimLeft(arg, "-")
@@ -407,10 +571,32 @@ func parseFlagToName(arg string) string {
 	return arg
 }
 
+// collectAllNestedFlags recurses through the command tree to get all
+//
+//	flags specified on a subcommand and its descending subcommands
+func collectAllNestedFlags(sc *Subcommand) []*Flag {
+	fullList := sc.Flags
+	for _, sc := range sc.Subcommands {
+		fullList = append(fullList, sc.Flags...)
+		fullList = append(fullList, collectAllNestedFlags(sc)...)
+	}
+	return fullList
+}
+
 // flagIsBool determines if the flag is a bool within the specified parser
 // and subcommand's context
 func flagIsBool(sc *Subcommand, p *Parser, key string) bool {
-	for _, f := range append(sc.Flags, p.Flags...) {
+	for _, f := range sc.Flags {
+		if f.HasName(key) {
+			_, isBool := f.AssignmentVar.(*bool)
+			_, isBoolSlice := f.AssignmentVar.(*[]bool)
+			if isBool || isBoolSlice {
+				return true
+			}
+		}
+	}
+
+	for _, f := range p.Flags {
 		if f.HasName(key) {
 			_, isBool := f.AssignmentVar.(*bool)
 			_, isBoolSlice := f.AssignmentVar.(*[]bool)
@@ -424,6 +610,24 @@ func flagIsBool(sc *Subcommand, p *Parser, key string) bool {
 	return false
 }
 
+// flagIsDefined reports whether a flag with the provided key is registered on
+// the supplied subcommand or parser.
+func flagIsDefined(sc *Subcommand, p *Parser, key string) bool {
+	for _, f := range sc.Flags {
+		if f.HasName(key) {
+			return true
+		}
+	}
+
+	for _, f := range p.Flags {
+		if f.HasName(key) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // returnAssignmentVarValueAsString returns the value of the flag's
 // assignment variable as a string.  This is used to display the
 // default value of flags before they are assigned (like when help is output).
@@ -616,7 +820,171 @@ func (f *Flag) returnAssignmentVarValueAsString() (string, error) {
 			strSlice = append(strSlice, m.String())
 		}
 		return strings.Join(strSlice, ","), err
+	case *time.Time:
+		v := f.AssignmentVar.(*time.Time)
+		if v.IsZero() {
+			return "", err
+		}
+		return v.UTC().Format(time.RFC3339Nano), err
+	case *url.URL:
+		v := f.AssignmentVar.(*url.URL)
+		return v.String(), err
+	case *net.IPNet:
+		v := f.AssignmentVar.(*net.IPNet)
+		return v.String(), err
+	case *net.TCPAddr:
+		v := f.AssignmentVar.(*net.TCPAddr)
+		return v.String(), err
+	case *net.UDPAddr:
+		v := f.AssignmentVar.(*net.UDPAddr)
+		return v.String(), err
+	case *os.FileMode:
+		v := f.AssignmentVar.(*os.FileMode)
+		return fmt.Sprintf("%#o", *v), err
+	case *regexp.Regexp:
+		v := f.AssignmentVar.(*regexp.Regexp)
+		return v.String(), err
+	case *time.Location:
+		v := f.AssignmentVar.(*time.Location)
+		return v.String(), err
+	case *time.Month:
+		v := f.AssignmentVar.(*time.Month)
+		if *v == 0 {
+			return "", err
+		}
+		return v.String(), err
+	case *time.Weekday:
+		v := f.AssignmentVar.(*time.Weekday)
+		return v.String(), err
+	case *big.Int:
+		v := f.AssignmentVar.(*big.Int)
+		return v.String(), err
+	case *big.Rat:
+		v := f.AssignmentVar.(*big.Rat)
+		return v.RatString(), err
+	case *Base64Bytes:
+		v := f.AssignmentVar.(*Base64Bytes)
+		if v == nil || len(*v) == 0 {
+			return "", err
+		}
+		return base64.StdEncoding.EncodeToString([]byte(*v)), err
+	case *netip.Addr:
+		v := f.AssignmentVar.(*netip.Addr)
+		return v.String(), err
+	case *netip.Prefix:
+		v := f.AssignmentVar.(*netip.Prefix)
+		return v.String(), err
+	case *netip.AddrPort:
+		v := f.AssignmentVar.(*netip.AddrPort)
+		return v.String(), err
 	default:
 		return "", errors.New("Unknown flag assignmentVar found in flag " + f.LongName + " " + f.ShortName + ". Type not supported: " + reflect.TypeOf(f.AssignmentVar).String())
 	}
 }
+
+// helpers
+func isAllDigits(s string) bool {
+	if len(s) == 0 {
+		return false
+	}
+	for _, r := range s {
+		if r < '0' || r > '9' {
+			return false
+		}
+	}
+	return true
+}
+
+func parseUTCOffset(s string) (int, bool) {
+	// Supports formats: +HH, -HH, +HHMM, -HHMM, +HH:MM, -HH:MM, Z
+	if s == "Z" || s == "z" || strings.EqualFold(s, "UTC") {
+		return 0, true
+	}
+	if len(s) < 2 {
+		return 0, false
+	}
+	sign := 1
+	switch s[0] {
+	case '+':
+		sign = 1
+	case '-':
+		sign = -1
+	default:
+		return 0, false
+	}
+	rest := s[1:]
+	rest = strings.ReplaceAll(rest, ":", "")
+	if len(rest) != 2 && len(rest) != 4 {
+		return 0, false
+	}
+	hh, err := strconv.Atoi(rest[:2])
+	if err != nil {
+		return 0, false
+	}
+	mm := 0
+	if len(rest) == 4 {
+		mm, err = strconv.Atoi(rest[2:])
+		if err != nil {
+			return 0, false
+		}
+	}
+	if hh < 0 || hh > 23 || mm < 0 || mm > 59 {
+		return 0, false
+	}
+	return sign * (hh*3600 + mm*60), true
+}
+
+func offsetName(offset int) string {
+	if offset == 0 {
+		return "UTC"
+	}
+	sign := "+"
+	if offset < 0 {
+		sign = "-"
+		offset = -offset
+	}
+	hh := offset / 3600
+	mm := (offset % 3600) / 60
+	return fmt.Sprintf("UTC%s%02d:%02d", sign, hh, mm)
+}
+
+func parseMonth(s string) (time.Month, bool) {
+	// Try name
+	names := map[string]time.Month{
+		"january": time.January, "february": time.February, "march": time.March, "april": time.April,
+		"may": time.May, "june": time.June, "july": time.July, "august": time.August,
+		"september": time.September, "october": time.October, "november": time.November, "december": time.December,
+	}
+	if m, ok := names[strings.ToLower(s)]; ok {
+		return m, true
+	}
+	// Try number 1-12
+	n, err := strconv.Atoi(s)
+	if err == nil && n >= 1 && n <= 12 {
+		return time.Month(n), true
+	}
+	return 0, false
+}
+
+func parseWeekday(s string) (time.Weekday, bool) {
+	names := map[string]time.Weekday{
+		"sunday": time.Sunday, "monday": time.Monday, "tuesday": time.Tuesday, "wednesday": time.Wednesday,
+		"thursday": time.Thursday, "friday": time.Friday, "saturday": time.Saturday,
+	}
+	if d, ok := names[strings.ToLower(s)]; ok {
+		return d, true
+	}
+	n, err := strconv.Atoi(s)
+	if err == nil {
+		// Accept 0-6 as Sunday-Saturday
+		if n >= 0 && n <= 6 {
+			return time.Weekday(n), true
+		}
+		// Also accept 1-7 as Monday-Sunday
+		if n >= 1 && n <= 7 {
+			v := (n % 7) // 7->0
+			return time.Weekday(v), true
+		}
+	}
+	return 0, false
+}
diff --git a/vendor/github.com/integrii/flaggy/main.go b/vendor/github.com/integrii/flaggy/flaggy.go
similarity index 75%
rename from vendor/github.com/integrii/flaggy/main.go
rename to vendor/github.com/integrii/flaggy/flaggy.go
index b242cb61d..72ddd49bd 100644
--- a/vendor/github.com/integrii/flaggy/main.go
+++ b/vendor/github.com/integrii/flaggy/flaggy.go
@@ -9,8 +9,12 @@ package flaggy // import "github.com/integrii/flaggy"
 import (
 	"fmt"
 	"log"
+	"math/big"
 	"net"
+	netip "net/netip"
+	"net/url"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -52,12 +56,25 @@ func ResetParser() {
 	if len(os.Args) > 0 {
 		chunks := strings.Split(os.Args[0], "/")
 		DefaultParser = NewParser(chunks[len(chunks)-1])
-	} else {
-		DefaultParser = NewParser("default")
+		return
 	}
+	DefaultParser = NewParser("default")
 }
 
-// Parse parses flags as requested in the default package parser
+// SortFlagsByLongName enables alphabetical sorting of flags by long name
+// in help output on the default parser.
+func SortFlagsByLongName() {
+	DefaultParser.SortFlagsByLongName()
+}
+
+// SortFlagsByLongNameReversed enables reverse alphabetical sorting of flags
+// by long name in help output on the default parser.
+func SortFlagsByLongNameReversed() {
+	DefaultParser.SortFlagsByLongNameReversed()
+}
+
+// Parse parses flags as requested in the default package parser.  All trailing arguments
+// that result from parsing are placed in the global TrailingArguments variable.
 func Parse() {
 	err := DefaultParser.Parse()
 	TrailingArguments = DefaultParser.TrailingArguments
@@ -67,7 +84,8 @@ func Parse() {
 }
 
 // ParseArgs parses the passed args as if they were the arguments to the
-// running binary.  Targets the default main parser for the package.
+// running binary.  Targets the default main parser for the package.  All trailing
+// arguments are set in the global TrailingArguments variable.
 func ParseArgs(args []string) {
 	err := DefaultParser.ParseArgs(args)
 	TrailingArguments = DefaultParser.TrailingArguments
@@ -104,6 +122,11 @@ func ByteSlice(assignmentVar *[]byte, shortName string, longName string, descrip
 	DefaultParser.add(assignmentVar, shortName, longName, description)
 }
 
+// BytesBase64 adds a new []byte flag parsed from base64 input.
+func BytesBase64(assignmentVar *Base64Bytes, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
 // Duration adds a new time.Duration flag.
 // Input format is described in time.ParseDuration().
 // Example values: 1h, 1h50m, 32s
@@ -284,6 +307,81 @@ func IPMaskSlice(assignmentVar *[]net.IPMask, shortName string, longName string,
 	DefaultParser.add(assignmentVar, shortName, longName, description)
 }
 
+// Time adds a new time.Time flag. Supports RFC3339/RFC3339Nano, RFC1123, and unix seconds.
+func Time(assignmentVar *time.Time, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// URL adds a new url.URL flag.
+func URL(assignmentVar *url.URL, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// IPNet adds a new net.IPNet flag parsed from CIDR.
+func IPNet(assignmentVar *net.IPNet, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// TCPAddr adds a new net.TCPAddr flag parsed from host:port.
+func TCPAddr(assignmentVar *net.TCPAddr, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// UDPAddr adds a new net.UDPAddr flag parsed from host:port.
+func UDPAddr(assignmentVar *net.UDPAddr, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// FileMode adds a new os.FileMode flag parsed from octal/decimal (base auto-detected).
+func FileMode(assignmentVar *os.FileMode, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// Regexp adds a new regexp.Regexp flag.
+func Regexp(assignmentVar *regexp.Regexp, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// Location adds a new time.Location flag.
+func Location(assignmentVar *time.Location, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// Month adds a new time.Month flag.
+func Month(assignmentVar *time.Month, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// Weekday adds a new time.Weekday flag.
+func Weekday(assignmentVar *time.Weekday, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// BigInt adds a new big.Int flag.
+func BigInt(assignmentVar *big.Int, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// BigRat adds a new big.Rat flag.
+func BigRat(assignmentVar *big.Rat, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// NetipAddr adds a new netip.Addr flag.
+func NetipAddr(assignmentVar *netip.Addr, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// NetipPrefix adds a new netip.Prefix flag.
+func NetipPrefix(assignmentVar *netip.Prefix, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
+// NetipAddrPort adds a new netip.AddrPort flag.
+func NetipAddrPort(assignmentVar *netip.AddrPort, shortName string, longName string, description string) {
+	DefaultParser.add(assignmentVar, shortName, longName, description)
+}
+
 // AttachSubcommand adds a subcommand for parsing
 func AttachSubcommand(subcommand *Subcommand, relativePosition int) {
 	DefaultParser.AttachSubcommand(subcommand, relativePosition)
diff --git a/vendor/github.com/integrii/flaggy/help.go b/vendor/github.com/integrii/flaggy/help.go
index 353be7d4f..19d042ff3 100644
--- a/vendor/github.com/integrii/flaggy/help.go
+++ b/vendor/github.com/integrii/flaggy/help.go
@@ -3,21 +3,5 @@ package flaggy
 // defaultHelpTemplate is the help template used by default
 // {{if (or (or (gt (len .StringFlags) 0) (gt (len .IntFlags) 0)) (gt (len .BoolFlags) 0))}}
 // {{if (or (gt (len .StringFlags) 0) (gt (len .BoolFlags) 0))}}
-const defaultHelpTemplate = `{{.CommandName}}{{if .Description}} - {{.Description}}{{end}}{{if .PrependMessage}}
-{{.PrependMessage}}{{end}}
-{{if .UsageString}}
-  Usage:
-    {{.UsageString}}{{end}}{{if .Positionals}}
-
-  Positional Variables: {{range .Positionals}}
-    {{.Name}}  {{.Spacer}}{{if .Description}} {{.Description}}{{end}}{{if .DefaultValue}} (default: {{.DefaultValue}}){{else}}{{if .Required}} (Required){{end}}{{end}}{{end}}{{end}}{{if .Subcommands}}
-
-  Subcommands: {{range .Subcommands}}
-    {{.LongName}}{{if .ShortName}} ({{.ShortName}}){{end}}{{if .Position}}{{if gt .Position 1}}  (position {{.Position}}){{end}}{{end}}{{if .Description}}   {{.Spacer}}{{.Description}}{{end}}{{end}}
-{{end}}{{if (gt (len .Flags) 0)}}
-  Flags: {{if .Flags}}{{range .Flags}}
-    {{if .ShortName}}-{{.ShortName}} {{else}}   {{end}}{{if .LongName}}--{{.LongName}}{{end}}{{if .Description}}   {{.Spacer}}{{.Description}}{{if .DefaultValue}} (default: {{.DefaultValue}}){{end}}{{end}}{{end}}{{end}}
-{{end}}{{if .AppendMessage}}{{.AppendMessage}}
-{{end}}{{if .Message}}
-{{.Message}}{{end}}
-`
+const defaultHelpTemplate = `{{range $idx, $line := .Lines}}{{if gt $idx 0}}
+{{end}}{{$line}}{{end}}`
diff --git a/vendor/github.com/integrii/flaggy/helpValues.go b/vendor/github.com/integrii/flaggy/helpValues.go
index df2f679e9..28d5cbb27 100644
--- a/vendor/github.com/integrii/flaggy/helpValues.go
+++ b/vendor/github.com/integrii/flaggy/helpValues.go
@@ -3,6 +3,8 @@ package flaggy
 import (
 	"log"
 	"reflect"
+	"sort"
+	"strconv"
 	"strings"
 	"unicode/utf8"
 )
@@ -12,12 +14,15 @@ type Help struct {
 	Subcommands    []HelpSubcommand
 	Positionals    []HelpPositional
 	Flags          []HelpFlag
+	GlobalFlags    []HelpFlag
 	UsageString    string
 	CommandName    string
 	PrependMessage string
 	AppendMessage  string
+	ShowCompletion bool
 	Message        string
 	Description    string
+	Lines          []string
 }
 
 // HelpSubcommand is used to template subcommand Help output
@@ -45,31 +50,47 @@ type HelpFlag struct {
 	LongName     string
 	Description  string
 	DefaultValue string
-	Spacer       string
+	ShortDisplay string
+	LongDisplay  string
 }
 
 // ExtractValues extracts Help template values from a subcommand and its parent
 // parser. The parser is required in order to detect default flag settings
 // for help and version output.
 func (h *Help) ExtractValues(p *Parser, message string) {
-
 	// accept message string for output
 	h.Message = message
 
+	ctx := p.subcommandContext
+	if ctx == nil || ctx == p.initialSubcommandContext {
+		ctx = &p.Subcommand
+	}
+	isRootContext := ctx == &p.Subcommand
+
 	// extract Help values from the current subcommand in context
 	// prependMessage string
-	h.PrependMessage = p.subcommandContext.AdditionalHelpPrepend
+	h.PrependMessage = ctx.AdditionalHelpPrepend
 	// appendMessage  string
-	h.AppendMessage = p.subcommandContext.AdditionalHelpAppend
+	h.AppendMessage = ctx.AdditionalHelpAppend
 	// command name
-	h.CommandName = p.subcommandContext.Name
+	h.CommandName = ctx.Name
 	// description
-	h.Description = p.subcommandContext.Description
+	h.Description = ctx.Description
+	// shell completion
+	showCompletion := p.ShowCompletion && p.isTopLevelHelpContext()
+	h.ShowCompletion = showCompletion
 
-	maxLength := getLongestNameLength(p.subcommandContext.Subcommands, 0)
+	// determine the max length of subcommand names for spacer calculation.
+	maxLength := getLongestNameLength(ctx.Subcommands, 0)
+	// include the synthetic completion subcommand in spacer calculation
+	if showCompletion {
+		if l := len("completion"); l > maxLength {
+			maxLength = l
+		}
+	}
 
 	// subcommands    []HelpSubcommand
-	for _, cmd := range p.subcommandContext.Subcommands {
+	for _, cmd := range ctx.Subcommands {
 		if cmd.Hidden {
 			continue
 		}
@@ -83,10 +104,23 @@ func (h *Help) ExtractValues(p *Parser, message string) {
 		h.Subcommands = append(h.Subcommands, newHelpSubcommand)
 	}
 
-	maxLength = getLongestNameLength(p.subcommandContext.PositionalFlags, 0)
+	// Append a synthetic completion subcommand at the end when enabled.
+	// This shows users the correct invocation: "./appName completion [bash|zsh]".
+	if showCompletion {
+		completionHelp := HelpSubcommand{
+			ShortName:   "",
+			LongName:    "completion",
+			Description: "Generate shell completion script for bash or zsh.",
+			Position:    0,
+			Spacer:      makeSpacer("completion", maxLength),
+		}
+		h.Subcommands = append(h.Subcommands, completionHelp)
+	}
+
+	maxLength = getLongestNameLength(ctx.PositionalFlags, 0)
 
 	// parse positional flags into help output structs
-	for _, pos := range p.subcommandContext.PositionalFlags {
+	for _, pos := range ctx.PositionalFlags {
 		if pos.Hidden {
 			continue
 		}
@@ -101,23 +135,19 @@ func (h *Help) ExtractValues(p *Parser, message string) {
 		h.Positionals = append(h.Positionals, newHelpPositional)
 	}
 
-	maxLength = len(versionFlagLongName)
-	if len(helpFlagLongName) > maxLength {
-		maxLength = len(helpFlagLongName)
-	}
-	maxLength = getLongestNameLength(p.subcommandContext.Flags, maxLength)
-	maxLength = getLongestNameLength(p.Flags, maxLength)
-
-	// if the built-in version flag is enabled, then add it as a help flag
+	// if the built-in version flag is enabled, then add it to the appropriate help collection
 	if p.ShowVersionWithVersionFlag {
 		defaultVersionFlag := HelpFlag{
 			ShortName:    "",
 			LongName:     versionFlagLongName,
 			Description:  "Displays the program version string.",
 			DefaultValue: "",
-			Spacer:       makeSpacer(versionFlagLongName, maxLength),
 		}
-		h.Flags = append(h.Flags, defaultVersionFlag)
+		if isRootContext {
+			h.addFlagToSlice(&h.Flags, defaultVersionFlag)
+		} else {
+			h.addFlagToSlice(&h.GlobalFlags, defaultVersionFlag)
+		}
 	}
 
 	// if the built-in help flag exists, then add it as a help flag
@@ -127,21 +157,64 @@ func (h *Help) ExtractValues(p *Parser, message string) {
 			LongName:     helpFlagLongName,
 			Description:  "Displays help with available flag, subcommand, and positional value parameters.",
 			DefaultValue: "",
-			Spacer:       makeSpacer(helpFlagLongName, maxLength),
 		}
-		h.Flags = append(h.Flags, defaultHelpFlag)
+		if isRootContext {
+			h.addFlagToSlice(&h.Flags, defaultHelpFlag)
+		} else {
+			h.addFlagToSlice(&h.GlobalFlags, defaultHelpFlag)
+		}
 	}
 
 	// go through every flag in the subcommand and add it to help output
-	h.parseFlagsToHelpFlags(p.subcommandContext.Flags, maxLength)
+	h.parseFlagsToHelpFlags(ctx.Flags, &h.Flags)
 
 	// go through every flag in the parent parser and add it to help output
-	h.parseFlagsToHelpFlags(p.Flags, maxLength)
+	if isRootContext {
+		h.parseFlagsToHelpFlags(p.Flags, &h.Flags)
+	} else {
+		h.parseFlagsToHelpFlags(p.Flags, &h.GlobalFlags)
+	}
+
+	// Optionally sort flags alphabetically by long name (fallback to short name)
+	if p.SortFlags {
+		sort.SliceStable(h.Flags, func(i, j int) bool {
+			a := h.Flags[i]
+			b := h.Flags[j]
+			aName := strings.ToLower(strings.TrimSpace(a.LongName))
+			bName := strings.ToLower(strings.TrimSpace(b.LongName))
+			if aName == "" {
+				aName = strings.ToLower(strings.TrimSpace(a.ShortName))
+			}
+			if bName == "" {
+				bName = strings.ToLower(strings.TrimSpace(b.ShortName))
+			}
+			if p.SortFlagsReverse {
+				return aName > bName
+			}
+			return aName < bName
+		})
+		sort.SliceStable(h.GlobalFlags, func(i, j int) bool {
+			a := h.GlobalFlags[i]
+			b := h.GlobalFlags[j]
+			aName := strings.ToLower(strings.TrimSpace(a.LongName))
+			bName := strings.ToLower(strings.TrimSpace(b.LongName))
+			if aName == "" {
+				aName = strings.ToLower(strings.TrimSpace(a.ShortName))
+			}
+			if bName == "" {
+				bName = strings.ToLower(strings.TrimSpace(b.ShortName))
+			}
+			if p.SortFlagsReverse {
+				return aName > bName
+			}
+			return aName < bName
+		})
+	}
 
 	// formulate the usage string
 	// first, we capture all the command and positional names by position
 	commandsByPosition := make(map[int]string)
-	for _, pos := range p.subcommandContext.PositionalFlags {
+	for _, pos := range ctx.PositionalFlags {
 		if pos.Hidden {
 			continue
 		}
@@ -151,7 +224,7 @@ func (h *Help) ExtractValues(p *Parser, message string) {
 			commandsByPosition[pos.Position] = pos.Name
 		}
 	}
-	for _, cmd := range p.subcommandContext.Subcommands {
+	for _, cmd := range ctx.Subcommands {
 		if cmd.Hidden {
 			continue
 		}
@@ -174,7 +247,7 @@ func (h *Help) ExtractValues(p *Parser, message string) {
 	var usageString string
 	if highestPosition > 0 {
 		// find each positional value and make our final string
-		usageString = p.subcommandContext.Name
+		usageString = ctx.Name
 		for i := 1; i <= highestPosition; i++ {
 			if len(commandsByPosition[i]) > 0 {
 				usageString = usageString + " [" + commandsByPosition[i] + "]"
@@ -188,12 +261,14 @@ func (h *Help) ExtractValues(p *Parser, message string) {
 
 	h.UsageString = usageString
 
+	alignHelpFlags(h.Flags)
+	alignHelpFlags(h.GlobalFlags)
+	h.composeLines()
 }
 
 // parseFlagsToHelpFlags parses the specified slice of flags into
 // help flags on the the calling help command
-func (h *Help) parseFlagsToHelpFlags(flags []*Flag, maxLength int) {
-
+func (h *Help) parseFlagsToHelpFlags(flags []*Flag, dest *[]HelpFlag) {
 	for _, f := range flags {
 		if f.Hidden {
 			continue
@@ -218,7 +293,7 @@ func (h *Help) parseFlagsToHelpFlags(flags []*Flag, maxLength int) {
 		_, isBool := f.AssignmentVar.(*bool)
 		if isBool {
 			b := f.AssignmentVar.(*bool)
-			if *b == false {
+			if !*b {
 				defaultValue = ""
 			}
 		}
@@ -228,15 +303,14 @@ func (h *Help) parseFlagsToHelpFlags(flags []*Flag, maxLength int) {
 			LongName:     f.LongName,
 			Description:  f.Description,
 			DefaultValue: defaultValue,
-			Spacer:       makeSpacer(f.LongName, maxLength),
 		}
-		h.AddFlagToHelp(newHelpFlag)
+		h.addFlagToSlice(dest, newHelpFlag)
 	}
 }
 
-// AddFlagToHelp adds a flag to help output if it does not exist
-func (h *Help) AddFlagToHelp(f HelpFlag) {
-	for _, existingFlag := range h.Flags {
+// addFlagToSlice adds a flag to the provided slice if it does not exist already.
+func (h *Help) addFlagToSlice(dest *[]HelpFlag, f HelpFlag) {
+	for _, existingFlag := range *dest {
 		if len(existingFlag.ShortName) > 0 && existingFlag.ShortName == f.ShortName {
 			return
 		}
@@ -244,7 +318,7 @@ func (h *Help) AddFlagToHelp(f HelpFlag) {
 			return
 		}
 	}
-	h.Flags = append(h.Flags, f)
+	*dest = append(*dest, f)
 }
 
 // getLongestNameLength takes a slice of any supported flag and returns the length of the longest of their names
@@ -253,7 +327,7 @@ func getLongestNameLength(slice interface{}, min int) int {
 
 	s := reflect.ValueOf(slice)
 	if s.Kind() != reflect.Slice {
-		log.Panicf("Paremeter given to getLongestNameLength() is of type %s. Expected slice", s.Kind())
+		log.Panicf("Parameter given to getLongestNameLength() is of type %s. Expected slice", s.Kind())
 	}
 
 	for i := 0; i < s.Len(); i++ {
@@ -287,3 +361,214 @@ func makeSpacer(name string, maxLength int) string {
 	}
 	return strings.Repeat(" ", length)
 }
+
+func alignHelpFlags(flags []HelpFlag) {
+	if len(flags) == 0 {
+		return
+	}
+
+	shortWidth := 0
+	longWidth := 0
+
+	for _, flag := range flags {
+		shortCol := flagShortColumn(flag.ShortName)
+		longCol := flagLongColumn(flag.LongName)
+		if l := utf8.RuneCountInString(shortCol); l > shortWidth {
+			shortWidth = l
+		}
+		if l := utf8.RuneCountInString(longCol); l > longWidth {
+			longWidth = l
+		}
+	}
+
+	const shortGap = "  "
+	const descGap = "   "
+
+	for i := range flags {
+		shortCol := flagShortColumn(flags[i].ShortName)
+		longCol := flagLongColumn(flags[i].LongName)
+
+		if shortWidth > 0 {
+			flags[i].ShortDisplay = padRight(shortCol, shortWidth) + shortGap
+		} else {
+			flags[i].ShortDisplay = shortGap
+		}
+
+		if longWidth > 0 {
+			flags[i].LongDisplay = padRight(longCol, longWidth) + descGap
+		} else {
+			flags[i].LongDisplay = descGap
+		}
+	}
+}
+
+func flagShortColumn(shortName string) string {
+	if shortName == "" {
+		return ""
+	}
+	return "-" + shortName
+}
+
+func flagLongColumn(longName string) string {
+	if longName == "" {
+		return ""
+	}
+	return "--" + longName
+}
+
+func padRight(input string, width int) string {
+	delta := width - utf8.RuneCountInString(input)
+	if delta <= 0 {
+		return input
+	}
+	return input + strings.Repeat(" ", delta)
+}
+
+func (h *Help) composeLines() {
+	lines := make([]string, 0, 16)
+
+	appendBlank := func() {
+		if len(lines) > 0 && lines[len(lines)-1] != "" {
+			lines = append(lines, "")
+		}
+	}
+
+	if h.CommandName != "" || h.Description != "" {
+		header := h.CommandName
+		if h.Description != "" {
+			if header != "" {
+				header += " - "
+			}
+			header += h.Description
+		}
+		lines = append(lines, header)
+	}
+
+	if h.PrependMessage != "" {
+		lines = append(lines, splitLines(h.PrependMessage)...)
+	}
+
+	appendSection := func(section []string) {
+		if len(section) == 0 {
+			return
+		}
+		appendBlank()
+		lines = append(lines, section...)
+	}
+
+	if h.UsageString != "" {
+		section := []string{
+			"  Usage:",
+			"    " + h.UsageString,
+		}
+		appendSection(section)
+	}
+
+	if len(h.Positionals) > 0 {
+		section := []string{"  Positional Variables:"}
+		for _, pos := range h.Positionals {
+			line := "    " + pos.Name + "  " + pos.Spacer
+			if pos.Description != "" {
+				line += " " + pos.Description
+			}
+			if pos.DefaultValue != "" {
+				line += " (default: " + pos.DefaultValue + ")"
+			} else if pos.Required {
+				line += " (Required)"
+			}
+			section = append(section, line)
+		}
+		appendSection(section)
+	}
+
+	if len(h.Subcommands) > 0 {
+		section := []string{"  Subcommands:"}
+		for _, sub := range h.Subcommands {
+			line := "    " + sub.LongName
+			if sub.ShortName != "" {
+				line += " (" + sub.ShortName + ")"
+			}
+			if sub.Position > 1 {
+				line += "  (position " + strconv.Itoa(sub.Position) + ")"
+			}
+			if sub.Description != "" {
+				line += "   " + sub.Spacer + sub.Description
+			}
+			section = append(section, line)
+		}
+		appendSection(section)
+	}
+
+	if len(h.Flags) > 0 {
+		section := []string{"  Flags:"}
+		for _, flag := range h.Flags {
+			line := "    " + flag.ShortDisplay + flag.LongDisplay
+			descAdded := false
+			if flag.Description != "" {
+				line += flag.Description
+				descAdded = true
+			}
+			if flag.DefaultValue != "" {
+				if descAdded {
+					line += " (default: " + flag.DefaultValue + ")"
+				} else {
+					line += "(default: " + flag.DefaultValue + ")"
+				}
+			}
+			section = append(section, line)
+		}
+		appendSection(section)
+	}
+
+	if len(h.GlobalFlags) > 0 {
+		section := []string{"  Global Flags:"}
+		for _, flag := range h.GlobalFlags {
+			line := "    " + flag.ShortDisplay + flag.LongDisplay
+			descAdded := false
+			if flag.Description != "" {
+				line += flag.Description
+				descAdded = true
+			}
+			if flag.DefaultValue != "" {
+				if descAdded {
+					line += " (default: " + flag.DefaultValue + ")"
+				} else {
+					line += "(default: " + flag.DefaultValue + ")"
+				}
+			}
+			section = append(section, line)
+		}
+		appendSection(section)
+	}
+
+	appendText := func(text string) {
+		if text == "" {
+			return
+		}
+		appendBlank()
+		lines = append(lines, splitLines(text)...)
+	}
+
+	appendText(h.AppendMessage)
+	appendText(h.Message)
+
+	if len(lines) == 0 {
+		lines = append(lines, "")
+	} else {
+		if lines[0] != "" {
+			lines = append([]string{""}, lines...)
+		}
+		if lines[len(lines)-1] != "" {
+			lines = append(lines, "")
+		}
+	}
+
+	h.Lines = lines
+}
+
+func splitLines(input string) []string {
+	if input == "" {
+		return nil
+	}
+	return strings.Split(input, "\n")
+}
diff --git a/vendor/github.com/integrii/flaggy/logo.png b/vendor/github.com/integrii/flaggy/logo.png
deleted file mode 100644
index d5ebabfb7..000000000
Binary files a/vendor/github.com/integrii/flaggy/logo.png and /dev/null differ
diff --git a/vendor/github.com/integrii/flaggy/parsedValue.go b/vendor/github.com/integrii/flaggy/parsedValue.go
index 04ada324a..a6cf024e5 100644
--- a/vendor/github.com/integrii/flaggy/parsedValue.go
+++ b/vendor/github.com/integrii/flaggy/parsedValue.go
@@ -1,23 +1,25 @@
 package flaggy
 
-// parsedValue represents a flag or subcommand that was parsed.  Primairily used
+// parsedValue represents a flag or subcommand that was parsed.  Primarily used
 // to account for all parsed values in order to determine if unknown values were
 // passed to the root parser after all subcommands have been parsed.
 type parsedValue struct {
 	Key          string
 	Value        string
 	IsPositional bool // indicates that this value was positional and not a key/value
+	ConsumesNext bool // indicates that parsing this value consumed the following CLI token
 }
 
 // newParsedValue creates and returns a new parsedValue struct with the
 // supplied values set
-func newParsedValue(key string, value string, isPositional bool) parsedValue {
+func newParsedValue(key string, value string, isPositional bool, consumesNext bool) parsedValue {
 	if len(key) == 0 && len(value) == 0 {
-		panic("cant add parsed value with no key or value")
+		panic("can't add parsed value with no key or value")
 	}
 	return parsedValue{
 		Key:          key,
 		Value:        value,
 		IsPositional: isPositional,
+		ConsumesNext: consumesNext,
 	}
 }
diff --git a/vendor/github.com/integrii/flaggy/parser.go b/vendor/github.com/integrii/flaggy/parser.go
index 41ab76e60..b26538a24 100644
--- a/vendor/github.com/integrii/flaggy/parser.go
+++ b/vendor/github.com/integrii/flaggy/parser.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 
 	"text/template"
 )
@@ -23,6 +24,33 @@ type Parser struct {
 	trailingArgumentsExtracted bool               // indicates that trailing args have been parsed and should not be appended again
 	parsed                     bool               // indicates this parser has parsed
 	subcommandContext          *Subcommand        // points to the most specific subcommand being used
+	initialSubcommandContext   *Subcommand        // points to the initial help context prior to parsing
+	ShowCompletion             bool               // indicates that bash and zsh completion output is possible
+	SortFlags                  bool               // when true, help output flags are sorted alphabetically
+	SortFlagsReverse           bool               // when true with SortFlags, sort order is reversed (Z..A)
+}
+
+// supportedCompletionShells lists every shell that can receive generated completion output.
+var supportedCompletionShells = []string{"bash", "zsh", "fish", "powershell", "nushell"}
+
+// completionShellList joins the supported completion shell names into a space separated string.
+func completionShellList() string {
+	return strings.Join(supportedCompletionShells, " ")
+}
+
+// isSupportedCompletionShell reports whether the provided shell is eligible for generated completions.
+func isSupportedCompletionShell(shell string) bool {
+	for _, supported := range supportedCompletionShells {
+		if shell == supported {
+			return true
+		}
+	}
+	return false
+}
+
+// TrailingSubcommand returns the last and most specific subcommand invoked.
+func (p *Parser) TrailingSubcommand() *Subcommand {
+	return p.subcommandContext
 }
 
 // NewParser creates a new ArgumentParser ready to parse inputs
@@ -34,11 +62,45 @@ func NewParser(name string) *Parser {
 	p.ShowHelpOnUnexpected = true
 	p.ShowHelpWithHFlag = true
 	p.ShowVersionWithVersionFlag = true
+	p.ShowCompletion = true
+	p.SortFlags = false
+	p.SortFlagsReverse = false
 	p.SetHelpTemplate(DefaultHelpTemplate)
-	p.subcommandContext = &Subcommand{}
+	initialContext := &Subcommand{}
+	p.subcommandContext = initialContext
+	p.initialSubcommandContext = initialContext
 	return p
 }
 
+// isTopLevelHelpContext returns true when help output should be shown for the top
+// level parser instead of a specific subcommand.
+func (p *Parser) isTopLevelHelpContext() bool {
+	if p.subcommandContext == nil {
+		return true
+	}
+	if p.subcommandContext == &p.Subcommand {
+		return true
+	}
+	if p.initialSubcommandContext != nil && p.subcommandContext == p.initialSubcommandContext {
+		return true
+	}
+	return false
+}
+
+// SortFlagsByLongName enables alphabetical sorting by long flag name
+// (case-insensitive) for help output on this parser.
+func (p *Parser) SortFlagsByLongName() {
+	p.SortFlags = true
+	p.SortFlagsReverse = false
+}
+
+// SortFlagsByLongNameReversed enables reverse alphabetical sorting by
+// long flag name (case-insensitive) for help output on this parser.
+func (p *Parser) SortFlagsByLongNameReversed() {
+	p.SortFlags = true
+	p.SortFlagsReverse = true
+}
+
 // ParseArgs parses as if the passed args were the os.Args, but without the
 // binary at the 0 position in the array.  An error is returned if there
 // is a low level issue converting flags to their proper type.  No error
@@ -49,13 +111,32 @@ func (p *Parser) ParseArgs(args []string) error {
 	}
 	p.parsed = true
 
+	// Handle shell completion before any parsing to avoid unknown-argument exits.
+	if p.ShowCompletion {
+		if len(args) >= 1 && strings.EqualFold(args[0], "completion") {
+			// no shell provided
+			if len(args) < 2 {
+				fmt.Fprintf(os.Stderr, "Please specify a shell for completion. Supported shells: %s\n", completionShellList())
+				exitOrPanic(2)
+			}
+
+			shell := strings.ToLower(args[1])
+			if isSupportedCompletionShell(shell) {
+				p.Completion(shell)
+				exitOrPanic(0)
+			}
+			fmt.Fprintf(os.Stderr, "Unsupported shell specified for completion: %s\nSupported shells: %s\n", args[1], completionShellList())
+			exitOrPanic(2)
+		}
+	}
+
 	debugPrint("Kicking off parsing with args:", args)
-	err := p.parse(p, args, 0)
+	err := p.parse(p, args)
 	if err != nil {
 		return err
 	}
 
-	// if we are set to crash on unexpected args, look for those here TODO
+	// if we are set to exit on unexpected args, look for those here
 	if p.ShowHelpOnUnexpected {
 		parsedValues := p.findAllParsedValues()
 		debugPrint("parsedValues:", parsedValues)
@@ -73,13 +154,39 @@ func (p *Parser) ParseArgs(args []string) error {
 	return nil
 }
 
+// Completion takes in a shell type and outputs the completion script for
+// that shell.
+func (p *Parser) Completion(completionType string) {
+	switch strings.ToLower(completionType) {
+	case "bash":
+		fmt.Print(GenerateBashCompletion(p))
+	case "zsh":
+		fmt.Print(GenerateZshCompletion(p))
+	case "fish":
+		fmt.Print(GenerateFishCompletion(p))
+	case "powershell":
+		fmt.Print(GeneratePowerShellCompletion(p))
+	case "nushell":
+		fmt.Print(GenerateNushellCompletion(p))
+	default:
+		fmt.Fprintf(os.Stderr, "Unsupported shell specified for completion: %s\nSupported shells: %s\n", completionType, completionShellList())
+	}
+}
+
 // findArgsNotInParsedValues finds arguments not used in parsed values.  The
 // incoming args should be in the order supplied by the user and should not
 // include the invoked binary, which is normally the first thing in os.Args.
 func findArgsNotInParsedValues(args []string, parsedValues []parsedValue) []string {
+	// DebugMode = true
+	// defer func() {
+	// 	DebugMode = false
+	// }()
+
 	var argsNotUsed []string
 	var skipNext bool
-	for _, a := range args {
+
+	for i := 0; i < len(args); i++ {
+		a := args[i]
 
 		// if the final argument (--) is seen, then we stop checking because all
 		// further values are trailing arguments.
@@ -93,33 +200,72 @@ func findArgsNotInParsedValues(args []string, parsedValues []parsedValue) []stri
 			continue
 		}
 
-		// strip flag slashes from incoming arguments so they match up with the
-		// keys from parsedValues.
+		// Determine token type and normalized key/value
 		arg := parseFlagToName(a)
+		isFlagToken := strings.HasPrefix(a, "-")
+
+		// skip args that start with 'test.' because they are injected with go test
+		debugPrint("flagsNotParsed: checking arg for test prefix:", arg)
+		if strings.HasPrefix(arg, "test.") {
+			debugPrint("skipping test. prefixed arg has test prefix:", arg)
+			continue
+		}
+		debugPrint("flagsNotParsed: flag is not a test. flag:", arg)
 
 		// indicates that we found this arg used in one of the parsed values. Used
 		// to indicate which values should be added to argsNotUsed.
 		var foundArgUsed bool
 
-		// search all args for a corresponding parsed value
-		for _, pv := range parsedValues {
-			// this argumenet was a key
-			// debugPrint(pv.Key, "==", arg)
-			debugPrint(pv.Key + "==" + arg + " || (" + strconv.FormatBool(pv.IsPositional) + " && " + pv.Value + " == " + arg + ")")
-			if pv.Key == arg || (pv.IsPositional && pv.Value == arg) {
-				debugPrint("Found matching parsed arg for " + pv.Key)
-				foundArgUsed = true // the arg was used in this parsedValues set
-				// if the value is not a positional value and the parsed value had a
-				// value that was not blank, we skip the next value in the argument list
-				if !pv.IsPositional && len(pv.Value) > 0 {
-					skipNext = true
+		// For flag tokens, only allow non-positional (flag) matches.
+		if isFlagToken {
+			for _, pv := range parsedValues {
+				debugPrint(pv.Key + "==" + arg + " || (" + strconv.FormatBool(pv.IsPositional) + " && " + pv.Value + " == " + arg + ")")
+				if !pv.IsPositional && pv.Key == arg {
+					debugPrint("Found matching parsed flag for " + pv.Key)
+					foundArgUsed = true
+					if pv.ConsumesNext {
+						skipNext = true
+					} else if i+1 < len(args) && pv.Value == args[i+1] {
+						skipNext = true
+					}
 					break
 				}
 			}
-			// this prevents excessive parsed values from being checked after we find
-			// the arg used for the first time
 			if foundArgUsed {
-				break
+				continue
+			}
+		}
+
+		// For non-flag tokens, prefer positional matches first.
+		if !isFlagToken {
+			for _, pv := range parsedValues {
+				debugPrint(pv.Key + "==" + arg + " || (" + strconv.FormatBool(pv.IsPositional) + " && " + pv.Value + " == " + arg + ")")
+				if pv.IsPositional && pv.Value == arg {
+					debugPrint("Found matching parsed positional for " + pv.Value)
+					foundArgUsed = true
+					break
+				}
+			}
+			if foundArgUsed {
+				continue
+			}
+
+			// Fallback for non-flag tokens: allow matching a non-positional flag by bare name.
+			for _, pv := range parsedValues {
+				debugPrint(pv.Key + "==" + arg + " || (" + strconv.FormatBool(pv.IsPositional) + " && " + pv.Value + " == " + arg + ")")
+				if !pv.IsPositional && pv.Key == arg {
+					debugPrint("Found matching parsed flag for " + pv.Key)
+					foundArgUsed = true
+					if pv.ConsumesNext {
+						skipNext = true
+					} else if i+1 < len(args) && pv.Value == args[i+1] {
+						skipNext = true
+					}
+					break
+				}
+			}
+			if foundArgUsed {
+				continue
 			}
 		}
 
@@ -153,13 +299,7 @@ func (p *Parser) SetHelpTemplate(tmpl string) error {
 
 // Parse calculates all flags and subcommands
 func (p *Parser) Parse() error {
-
-	err := p.ParseArgs(os.Args[1:])
-	if err != nil {
-		return err
-	}
-	return nil
-
+	return p.ParseArgs(os.Args[1:])
 }
 
 // ShowHelp shows Help without an error message
diff --git a/vendor/github.com/integrii/flaggy/scan_result.go b/vendor/github.com/integrii/flaggy/scan_result.go
new file mode 100644
index 000000000..485fb6c6e
--- /dev/null
+++ b/vendor/github.com/integrii/flaggy/scan_result.go
@@ -0,0 +1,39 @@
+package flaggy
+
+// flagScanResult summarizes the outcome of scanning arguments for a parser.
+type flagScanResult struct {
+	// Positionals lists positional tokens (subcommands or positional args) in
+	// the order they were encountered, along with their indexes in the source
+	// argument slice.
+	Positionals []positionalToken
+	// ForwardArgs contains arguments that were intentionally left untouched so
+	// that downstream parsers can process them. These tokens maintain their
+	// original order.
+	ForwardArgs []string
+	// HelpRequested reports whether a help flag (-h/--help) was encountered
+	// while scanning this parser.
+	HelpRequested bool
+	// Subcommand holds the first subcommand encountered while scanning. When
+	// non-nil, scanning stops and the remaining arguments are handed off to the
+	// referenced parser.
+	Subcommand *subcommandMatch
+}
+
+// positionalToken tracks a positional argument's value and the index it was
+// read from in the source slice.
+type positionalToken struct {
+	Value string
+	Index int
+}
+
+// subcommandMatch captures the metadata necessary to hand control over to a
+// downstream subcommand parser.
+type subcommandMatch struct {
+	// Command references the subcommand that matched the positional token.
+	Command *Subcommand
+	// Token points to the positional token that triggered the match.
+	Token positionalToken
+	// RelativeDepth tracks the positional depth (1-based) where the match was
+	// found. This mirrors how subcommand positions are configured.
+	RelativeDepth int
+}
diff --git a/vendor/github.com/integrii/flaggy/subCommand.go b/vendor/github.com/integrii/flaggy/subCommand.go
index 7f99e3e8a..9bae18fc9 100644
--- a/vendor/github.com/integrii/flaggy/subCommand.go
+++ b/vendor/github.com/integrii/flaggy/subCommand.go
@@ -3,8 +3,12 @@ package flaggy
 import (
 	"fmt"
 	"log"
+	"math/big"
 	"net"
+	netip "net/netip"
+	"net/url"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -47,154 +51,142 @@ func NewSubcommand(name string) *Subcommand {
 // out of the supplied args and returns the resulting positional items in order,
 // all the flag names found (without values), a bool to indicate if help was
 // requested, and any errors found during parsing
-func (sc *Subcommand) parseAllFlagsFromArgs(p *Parser, args []string) ([]string, bool, error) {
+func (sc *Subcommand) parseAllFlagsFromArgs(p *Parser, args []string) (flagScanResult, error) {
 
-	var positionalOnlyArguments []string
-	var helpRequested bool // indicates the user has supplied -h and we
-	// should render help if we are the last subcommand
+	result := flagScanResult{}
+	positionalCount := 0
 
-	// indicates we should skip the next argument, like when parsing a flag
-	// that separates key and value by space
-	var skipNext bool
-
-	// endArgfound indicates that a -- was found and everything
-	// remaining should be added to the trailing arguments slices
-	var endArgFound bool
-
-	// find all the normal flags (not positional) and parse them out
-	for i, a := range args {
+	for i := 0; i < len(args); i++ {
+		a := args[i]
 
 		debugPrint("parsing arg:", a)
 
-		// evaluate if there is a following arg to avoid panics
-		var nextArgExists bool
-		var nextArg string
-		if len(args)-1 >= i+1 {
-			nextArgExists = true
-			nextArg = args[i+1]
-		}
-
-		// if end arg -- has been found, just add everything to TrailingArguments
-		if endArgFound {
-			if !p.trailingArgumentsExtracted {
-				p.TrailingArguments = append(p.TrailingArguments, a)
-			}
-			continue
-		}
-
-		// skip this run if specified
-		if skipNext {
-			skipNext = false
-			debugPrint("skipping flag because it is an arg:", a)
-			continue
-		}
-
-		// parse the flag into its name for consideration without dashes
-		flagName := parseFlagToName(a)
-
-		// if the flag being passed is version or v and the option to display
-		// version with version flags, then display version
-		if p.ShowVersionWithVersionFlag {
-			if flagName == versionFlagLongName {
-				p.ShowVersionAndExit()
-			}
-		}
-
-		// if the show Help on h flag option is set, then show Help when h or Help
-		// is passed as an option
-		if p.ShowHelpWithHFlag {
-			if flagName == helpFlagShortName || flagName == helpFlagLongName {
-				// Ensure this is the last subcommand passed so we give the correct
-				// help output
-				helpRequested = true
-				continue
-			}
-		}
-
-		// determine what kind of flag this is
 		argType := determineArgType(a)
 
-		// strip flags from arg
-		// debugPrint("Parsing flag named", a, "of type", argType)
+		if argType == argIsFinal {
+			if !p.trailingArgumentsExtracted {
+				p.TrailingArguments = append(p.TrailingArguments, args[i+1:]...)
+			}
+			break
+		}
+
+		flagName := parseFlagToName(a)
+
+		if p.ShowVersionWithVersionFlag && flagName == versionFlagLongName {
+			p.ShowVersionAndExit()
+		}
+
+		if p.ShowHelpWithHFlag && (flagName == helpFlagShortName || flagName == helpFlagLongName) {
+			result.HelpRequested = true
+			continue
+		}
+
+		debugPrint("Parsing flag named", a, "of type", argType)
 
-		// depending on the flag type, parse the key and value out, then apply it
 		switch argType {
-		case argIsFinal:
-			// debugPrint("Arg", i, "is final:", a)
-			endArgFound = true
 		case argIsPositional:
-			// debugPrint("Arg is positional or subcommand:", a)
-			// this positional argument into a slice of their own, so that
-			// we can determine if its a subcommand or positional value later
-			positionalOnlyArguments = append(positionalOnlyArguments, a)
-			// track this as a parsed value with the subcommand
+			positionalCount++
+			token := positionalToken{Value: a, Index: i}
+			result.Positionals = append(result.Positionals, token)
 			sc.addParsedPositionalValue(a)
-		case argIsFlagWithSpace: // a flag with a space. ex) -k v or --key value
-			a = parseFlagToName(a)
 
-			// debugPrint("Arg", i, "is flag with space:", a)
-			// parse next arg as value to this flag and apply to subcommand flags
-			// if the flag is a bool flag, then we check for a following positional
-			// and skip it if necessary
-			if flagIsBool(sc, p, a) {
-				debugPrint(sc.Name, "bool flag", a, "next var is:", nextArg)
-				// set the value in this subcommand and its root parser
-				valueSet, err := setValueForParsers(a, "true", p, sc)
+			// Detect subcommands early so we avoid parsing child flags at this level.
+			var matched *Subcommand
+			for _, cmd := range sc.Subcommands {
+				if a == cmd.Name || a == cmd.ShortName {
+					// Prefer an exact positional match when available.
+					if cmd.Position == positionalCount {
+						matched = cmd
+						break
+					}
+					if matched == nil {
+						matched = cmd
+					}
+				}
+			}
+			if matched != nil {
+				// Ignore the tentative match when a positional value is already defined at this depth.
+				if matched.Position != positionalCount && hasPositionalAtDepth(sc, positionalCount) {
+					matched = nil
+				}
+			}
+			if matched != nil {
+				// Drop the provisional positional bookkeeping because the token actually belongs to the child.
+				if len(result.Positionals) > 0 {
+					result.Positionals = result.Positionals[:len(result.Positionals)-1]
+				}
+				if len(sc.ParsedValues) > 0 {
+					lastIdx := len(sc.ParsedValues) - 1
+					if sc.ParsedValues[lastIdx].IsPositional {
+						sc.ParsedValues = sc.ParsedValues[:lastIdx]
+					}
+				}
+				// Record which subcommand will own the remainder of the arguments.
+				result.Subcommand = &subcommandMatch{
+					Command:       matched,
+					Token:         token,
+					RelativeDepth: matched.Position,
+				}
+				// Stop scanning so the child can handle the remainder.
+				return result, nil
+			}
+		case argIsFlagWithSpace:
+			key := flagName
 
-				// if an error occurs, just return it and quit parsing
+			if flagIsBool(sc, p, key) {
+				valueSet, err := setValueForParsers(key, "true", p, sc)
 				if err != nil {
-					return []string{}, false, err
+					return result, err
 				}
-
-				// log all values parsed by this subcommand.  We leave the value blank
-				// because the bool value had no explicit true or false supplied
 				if valueSet {
-					sc.addParsedFlag(a, "")
+					sc.addParsedFlag(key, "", false)
 				}
-
-				// we've found and set a standalone bool flag, so we move on to the next
-				// argument in the list of arguments
 				continue
 			}
 
-			skipNext = true
-			// debugPrint(sc.Name, "NOT bool flag", a)
+			if !flagIsDefined(sc, p, key) {
+				result.ForwardArgs = append(result.ForwardArgs, args[i])
+				if i+1 < len(args) && shouldReserveNextArgForChild(sc, positionalCount, args[i+1]) {
+					result.ForwardArgs = append(result.ForwardArgs, args[i+1])
+					i++
+				}
+				continue
+			}
 
-			// if the next arg was not found, then show a Help message
-			if !nextArgExists {
-				p.ShowHelpWithMessage("Expected a following arg for flag " + a + ", but it did not exist.")
+			if i+1 >= len(args) {
+				p.ShowHelpWithMessage("Expected a following arg for flag " + key + ", but it did not exist.")
 				exitOrPanic(2)
 			}
-			valueSet, err := setValueForParsers(a, nextArg, p, sc)
+
+			nextArg := args[i+1]
+			valueSet, err := setValueForParsers(key, nextArg, p, sc)
 			if err != nil {
-				return []string{}, false, err
+				return result, err
 			}
-
-			// log all parsed values in the subcommand
 			if valueSet {
-				sc.addParsedFlag(a, nextArg)
+				sc.addParsedFlag(key, nextArg, true)
 			}
-		case argIsFlagWithValue: // a flag with an equals sign. ex) -k=v or --key=value
-			// debugPrint("Arg", i, "is flag with value:", a)
-			a = parseFlagToName(a)
+			i++
+		case argIsFlagWithValue:
+			keyWithValue := flagName
+			key, val := parseArgWithValue(keyWithValue)
 
-			// parse flag into key and value and apply to subcommand flags
-			key, val := parseArgWithValue(a)
+			if !flagIsDefined(sc, p, key) {
+				result.ForwardArgs = append(result.ForwardArgs, args[i])
+				continue
+			}
 
-			// set the value in this subcommand and its root parser
 			valueSet, err := setValueForParsers(key, val, p, sc)
 			if err != nil {
-				return []string{}, false, err
+				return result, err
 			}
-
-			// log all values parsed by the subcommand
 			if valueSet {
-				sc.addParsedFlag(a, val)
+				sc.addParsedFlag(keyWithValue, val, false)
 			}
 		}
 	}
 
-	return positionalOnlyArguments, helpRequested, nil
+	return result, nil
 }
 
 // findAllParsedValues finds all values parsed by all subcommands and this
@@ -211,13 +203,46 @@ func (sc *Subcommand) findAllParsedValues() []parsedValue {
 	return parsedValues
 }
 
-// parse causes the argument parser to parse based on the supplied []string.
-// depth specifies the non-flag subcommand positional depth.  A slice of flags
-// and subcommands parsed is returned so that the parser can ultimately decide
-// if there were any unexpected values supplied by the user
-func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {
+// shouldReserveNextArgForChild determines if the following argument should be
+// left untouched so that a downstream subcommand can parse it as its own flag
+// or positional value.
+func shouldReserveNextArgForChild(sc *Subcommand, positionalCount int, nextArg string) bool {
+	if determineArgType(nextArg) == argIsFinal {
+		return false
+	}
 
-	debugPrint("- Parsing subcommand", sc.Name, "with depth of", depth, "and args", args)
+	position := positionalCount + 1
+	for _, cmd := range sc.Subcommands {
+		if cmd.Position == position && (cmd.Name == nextArg || cmd.ShortName == nextArg) {
+			return false
+		}
+	}
+
+	for _, pos := range sc.PositionalFlags {
+		if pos.Position == position {
+			return false
+		}
+	}
+
+	return true
+}
+
+func hasPositionalAtDepth(sc *Subcommand, depth int) bool {
+	for _, pos := range sc.PositionalFlags {
+		if pos.Position == depth {
+			return true
+		}
+	}
+	return false
+}
+
+// parse causes the argument parser to parse based on the supplied []string.
+// The args slice should contain only values that have not already been
+// consumed by parent parsers. The parser records any values it parses so that
+// the root parser can detect unexpected arguments after parsing is complete.
+func (sc *Subcommand) parse(p *Parser, args []string) error {
+
+	debugPrint("- Parsing subcommand", sc.Name, "with args", args)
 
 	// if a command is parsed, its used
 	sc.Used = true
@@ -242,103 +267,79 @@ func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {
 		sc.ensureNoConflictWithBuiltinVersion()
 	}
 
-	// Parse the normal flags out of the argument list and return the positionals
-	// (subcommands and positional values), along with the flags used.
-	// Then the flag values are applied to the parent parser and the current
-	// subcommand being parsed.
-	positionalOnlyArguments, helpRequested, err := sc.parseAllFlagsFromArgs(p, args)
+	scan, err := sc.parseAllFlagsFromArgs(p, args)
 	if err != nil {
 		return err
 	}
 
-	// indicate that trailing arguments have been extracted, so that they aren't
-	// appended a second time
-	p.trailingArgumentsExtracted = true
+	for idx, token := range scan.Positionals {
+		relativeDepth := idx + 1
+		value := token.Value
 
-	// loop over positional values and look for their matching positional
-	// parameter, or their positional command.  If neither are found, then
-	// we throw an error
-	var parsedArgCount int
-	for pos, v := range positionalOnlyArguments {
-
-		// the first relative positional argument will be human natural at position 1
-		// but offset for the depth of relative commands being parsed for currently.
-		relativeDepth := pos - depth + 1
-		// debugPrint("Parsing positional only position", relativeDepth, "with value", v)
-
-		if relativeDepth < 1 {
-			// debugPrint(sc.Name, "skipped value:", v)
-			continue
-		}
-		parsedArgCount++
-
-		// determine subcommands and parse them by positional value and name
-		for _, cmd := range sc.Subcommands {
-			// debugPrint("Subcommand being compared", relativeDepth, "==", cmd.Position, "and", v, "==", cmd.Name, "==", cmd.ShortName)
-			if relativeDepth == cmd.Position && (v == cmd.Name || v == cmd.ShortName) {
-				debugPrint("Decending into positional subcommand", cmd.Name, "at relativeDepth", relativeDepth, "and absolute depth", depth+1)
-				return cmd.parse(p, args, depth+parsedArgCount) // continue recursive positional parsing
-			}
+		if scan.Subcommand != nil && token.Index == scan.Subcommand.Token.Index {
+			debugPrint("Descending into positional subcommand", scan.Subcommand.Command.Name, "at relativeDepth", scan.Subcommand.RelativeDepth)
+			childArgs := append([]string{}, scan.ForwardArgs...)
+			childArgs = append(childArgs, args[token.Index+1:]...)
+			return scan.Subcommand.Command.parse(p, childArgs)
 		}
 
-		// determine positional args and parse them by positional value and name
 		var foundPositional bool
 		for _, val := range sc.PositionalFlags {
 			if relativeDepth == val.Position {
-				debugPrint("Found a positional value at relativePos:", relativeDepth, "value:", v)
+				debugPrint("Found a positional value at relativePos:", relativeDepth, "value:", value)
 
-				// set original value for help output
 				val.defaultValue = *val.AssignmentVar
-
-				// defrerence the struct pointer, then set the pointer property within it
-				*val.AssignmentVar = v
-				// debugPrint("set positional to value", *val.AssignmentVar)
+				*val.AssignmentVar = value
 				foundPositional = true
 				val.Found = true
 				break
 			}
 		}
 
-		// if there aren't any positional flags but there are subcommands that
-		// were not used, display a useful message with subcommand options.
-		if !foundPositional && p.ShowHelpOnUnexpected {
-			debugPrint("No positional at position", relativeDepth)
-			var foundSubcommandAtDepth bool
-			for _, cmd := range sc.Subcommands {
-				if cmd.Position == relativeDepth {
-					foundSubcommandAtDepth = true
-				}
-			}
-
-			// if there is a subcommand here but it was not specified, display them all
-			// as a suggestion to the user before exiting.
-			if foundSubcommandAtDepth {
-				// determine which name to use in upcoming help output
-				fmt.Fprintln(os.Stderr, sc.Name+":", "No subcommand or positional value found at position", strconv.Itoa(relativeDepth)+".")
-				var output string
+		if !foundPositional {
+			if p.ShowHelpOnUnexpected {
+				debugPrint("No positional at position", relativeDepth)
+				var foundSubcommandAtDepth bool
 				for _, cmd := range sc.Subcommands {
-					if cmd.Hidden {
-						continue
+					if cmd.Position == relativeDepth {
+						foundSubcommandAtDepth = true
 					}
-					output = output + " " + cmd.Name
 				}
-				// if there are available subcommands, let the user know
-				if len(output) > 0 {
-					output = strings.TrimLeft(output, " ")
-					fmt.Println("Available subcommands:", output)
-				}
-				exitOrPanic(2)
-			}
 
-			// if there were not any flags or subcommands at this position at all, then
-			// throw an error (display Help if necessary)
-			p.ShowHelpWithMessage("Unexpected argument: " + v)
-			exitOrPanic(2)
+				if foundSubcommandAtDepth {
+					fmt.Fprintln(os.Stderr, sc.Name+":", "No subcommand or positional value found at position", strconv.Itoa(relativeDepth)+".")
+					var output string
+					for _, cmd := range sc.Subcommands {
+						if cmd.Hidden {
+							continue
+						}
+						output = output + " " + cmd.Name
+					}
+					if len(output) > 0 {
+						output = strings.TrimLeft(output, " ")
+						fmt.Println("Available subcommands:", output)
+					}
+					exitOrPanic(2)
+				}
+
+				p.ShowHelpWithMessage("Unexpected argument: " + value)
+				exitOrPanic(2)
+			} else {
+				p.TrailingArguments = append(p.TrailingArguments, value)
+			}
 		}
 	}
 
-	// if help was requested and we should show help when h is passed,
-	if helpRequested && p.ShowHelpWithHFlag {
+	if scan.Subcommand != nil {
+		// If we recorded a subcommand but didn't descend, ensure the remaining
+		// arguments are handed off now.
+		debugPrint("Descending into positional subcommand", scan.Subcommand.Command.Name, "at relativeDepth", scan.Subcommand.RelativeDepth)
+		childArgs := append([]string{}, scan.ForwardArgs...)
+		childArgs = append(childArgs, args[scan.Subcommand.Token.Index+1:]...)
+		return scan.Subcommand.Command.parse(p, childArgs)
+	}
+
+	if scan.HelpRequested && p.ShowHelpWithHFlag {
 		p.ShowHelp()
 		exitOrPanic(0)
 	}
@@ -358,18 +359,22 @@ func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {
 		}
 	}
 
+	// indicate that trailing arguments have been extracted, so that they aren't
+	// appended a second time by parent parsers.
+	p.trailingArgumentsExtracted = true
+
 	return nil
 }
 
 // addParsedFlag makes it easy to append flag values parsed by the subcommand
-func (sc *Subcommand) addParsedFlag(key string, value string) {
-	sc.ParsedValues = append(sc.ParsedValues, newParsedValue(key, value, false))
+func (sc *Subcommand) addParsedFlag(key string, value string, consumesNext bool) {
+	sc.ParsedValues = append(sc.ParsedValues, newParsedValue(key, value, false, consumesNext))
 }
 
 // addParsedPositionalValue makes it easy to append positionals parsed by the
 // subcommand
 func (sc *Subcommand) addParsedPositionalValue(value string) {
-	sc.ParsedValues = append(sc.ParsedValues, newParsedValue("", value, true))
+	sc.ParsedValues = append(sc.ParsedValues, newParsedValue("", value, true, false))
 }
 
 // FlagExists lets you know if the flag name exists as either a short or long
@@ -469,6 +474,11 @@ func (sc *Subcommand) ByteSlice(assignmentVar *[]byte, shortName string, longNam
 	sc.add(assignmentVar, shortName, longName, description)
 }
 
+// BytesBase64 adds a new []byte flag parsed from base64 input.
+func (sc *Subcommand) BytesBase64(assignmentVar *Base64Bytes, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
 // Duration adds a new time.Duration flag.
 // Input format is described in time.ParseDuration().
 // Example values: 1h, 1h50m, 32s
@@ -649,6 +659,81 @@ func (sc *Subcommand) IPMaskSlice(assignmentVar *[]net.IPMask, shortName string,
 	sc.add(assignmentVar, shortName, longName, description)
 }
 
+// Time adds a new time.Time flag. Supports RFC3339/RFC3339Nano, RFC1123, and unix seconds.
+func (sc *Subcommand) Time(assignmentVar *time.Time, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// URL adds a new url.URL flag.
+func (sc *Subcommand) URL(assignmentVar *url.URL, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// IPNet adds a new net.IPNet flag parsed from CIDR.
+func (sc *Subcommand) IPNet(assignmentVar *net.IPNet, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// TCPAddr adds a new net.TCPAddr flag parsed from host:port.
+func (sc *Subcommand) TCPAddr(assignmentVar *net.TCPAddr, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// UDPAddr adds a new net.UDPAddr flag parsed from host:port.
+func (sc *Subcommand) UDPAddr(assignmentVar *net.UDPAddr, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// FileMode adds a new os.FileMode flag parsed from octal/decimal (base auto-detected).
+func (sc *Subcommand) FileMode(assignmentVar *os.FileMode, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// Regexp adds a new regexp.Regexp flag.
+func (sc *Subcommand) Regexp(assignmentVar *regexp.Regexp, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// Location adds a new time.Location flag.
+func (sc *Subcommand) Location(assignmentVar *time.Location, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// Month adds a new time.Month flag.
+func (sc *Subcommand) Month(assignmentVar *time.Month, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// Weekday adds a new time.Weekday flag.
+func (sc *Subcommand) Weekday(assignmentVar *time.Weekday, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// BigInt adds a new big.Int flag.
+func (sc *Subcommand) BigInt(assignmentVar *big.Int, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// BigRat adds a new big.Rat flag.
+func (sc *Subcommand) BigRat(assignmentVar *big.Rat, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// NetipAddr adds a new netip.Addr flag.
+func (sc *Subcommand) NetipAddr(assignmentVar *netip.Addr, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// NetipPrefix adds a new netip.Prefix flag.
+func (sc *Subcommand) NetipPrefix(assignmentVar *netip.Prefix, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
+// NetipAddrPort adds a new netip.AddrPort flag.
+func (sc *Subcommand) NetipAddrPort(assignmentVar *netip.AddrPort, shortName string, longName string, description string) {
+	sc.add(assignmentVar, shortName, longName, description)
+}
+
 // AddPositionalValue adds a positional value to the subcommand.  the
 // relativePosition starts at 1 and is relative to the subcommand it belongs to
 func (sc *Subcommand) AddPositionalValue(assignmentVar *string, name string, relativePosition int, required bool, description string) {
@@ -656,14 +741,14 @@ func (sc *Subcommand) AddPositionalValue(assignmentVar *string, name string, rel
 	// ensure no other positionals are at this depth
 	for _, other := range sc.PositionalFlags {
 		if relativePosition == other.Position {
-			log.Panicln("Unable to add positional value because one already exists at position: " + strconv.Itoa(relativePosition))
+			log.Panicln("Unable to add positional value " + name + " because " + other.Name + " already exists at position: " + strconv.Itoa(relativePosition))
 		}
 	}
 
 	// ensure no subcommands at this depth
 	for _, other := range sc.Subcommands {
 		if relativePosition == other.Position {
-			log.Panicln("Unable to add positional value a subcommand already exists at position: " + strconv.Itoa(relativePosition))
+			log.Panicln("Unable to add positional value " + name + "because a subcommand, " + other.Name + ", already exists at position: " + strconv.Itoa(relativePosition))
 		}
 	}
 
@@ -689,7 +774,9 @@ func (sc *Subcommand) SetValueForKey(key string, value string) (bool, error) {
 		// debugPrint("Evaluating string flag", f.ShortName, "==", key, "||", f.LongName, "==", key)
 		if f.ShortName == key || f.LongName == key {
 			// debugPrint("Setting string value for", key, "to", value)
-			f.identifyAndAssignValue(value)
+			if err := f.identifyAndAssignValue(value); err != nil {
+				return false, err
+			}
 			return true, nil
 		}
 	}
diff --git a/vendor/github.com/jbenet/go-context/io/ctxio.go b/vendor/github.com/jbenet/go-context/io/ctxio.go
deleted file mode 100644
index b4f245423..000000000
--- a/vendor/github.com/jbenet/go-context/io/ctxio.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Package ctxio provides io.Reader and io.Writer wrappers that
-// respect context.Contexts. Use these at the interface between
-// your context code and your io.
-//
-// WARNING: read the code. see how writes and reads will continue
-// until you cancel the io. Maybe this package should provide
-// versions of io.ReadCloser and io.WriteCloser that automatically
-// call .Close when the context expires. But for now -- since in my
-// use cases I have long-lived connections with ephemeral io wrappers
-// -- this has yet to be a need.
-package ctxio
-
-import (
-	"io"
-
-	context "golang.org/x/net/context"
-)
-
-type ioret struct {
-	n   int
-	err error
-}
-
-type Writer interface {
-	io.Writer
-}
-
-type ctxWriter struct {
-	w   io.Writer
-	ctx context.Context
-}
-
-// NewWriter wraps a writer to make it respect given Context.
-// If there is a blocking write, the returned Writer will return
-// whenever the context is cancelled (the return values are n=0
-// and err=ctx.Err().)
-//
-// Note well: this wrapper DOES NOT ACTUALLY cancel the underlying
-// write-- there is no way to do that with the standard go io
-// interface. So the read and write _will_ happen or hang. So, use
-// this sparingly, make sure to cancel the read or write as necesary
-// (e.g. closing a connection whose context is up, etc.)
-//
-// Furthermore, in order to protect your memory from being read
-// _after_ you've cancelled the context, this io.Writer will
-// first make a **copy** of the buffer.
-func NewWriter(ctx context.Context, w io.Writer) *ctxWriter {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	return &ctxWriter{ctx: ctx, w: w}
-}
-
-func (w *ctxWriter) Write(buf []byte) (int, error) {
-	buf2 := make([]byte, len(buf))
-	copy(buf2, buf)
-
-	c := make(chan ioret, 1)
-
-	go func() {
-		n, err := w.w.Write(buf2)
-		c <- ioret{n, err}
-		close(c)
-	}()
-
-	select {
-	case r := <-c:
-		return r.n, r.err
-	case <-w.ctx.Done():
-		return 0, w.ctx.Err()
-	}
-}
-
-type Reader interface {
-	io.Reader
-}
-
-type ctxReader struct {
-	r   io.Reader
-	ctx context.Context
-}
-
-// NewReader wraps a reader to make it respect given Context.
-// If there is a blocking read, the returned Reader will return
-// whenever the context is cancelled (the return values are n=0
-// and err=ctx.Err().)
-//
-// Note well: this wrapper DOES NOT ACTUALLY cancel the underlying
-// write-- there is no way to do that with the standard go io
-// interface. So the read and write _will_ happen or hang. So, use
-// this sparingly, make sure to cancel the read or write as necesary
-// (e.g. closing a connection whose context is up, etc.)
-//
-// Furthermore, in order to protect your memory from being read
-// _before_ you've cancelled the context, this io.Reader will
-// allocate a buffer of the same size, and **copy** into the client's
-// if the read succeeds in time.
-func NewReader(ctx context.Context, r io.Reader) *ctxReader {
-	return &ctxReader{ctx: ctx, r: r}
-}
-
-func (r *ctxReader) Read(buf []byte) (int, error) {
-	buf2 := make([]byte, len(buf))
-
-	c := make(chan ioret, 1)
-
-	go func() {
-		n, err := r.r.Read(buf2)
-		c <- ioret{n, err}
-		close(c)
-	}()
-
-	select {
-	case ret := <-c:
-		copy(buf, buf2)
-		return ret.n, ret.err
-	case <-r.ctx.Done():
-		return 0, r.ctx.Err()
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/.gitignore b/vendor/github.com/jesseduffield/go-git/v5/.gitignore
deleted file mode 100644
index b7f2c5807..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-coverage.out
-*~
-coverage.txt
-profile.out
-.tmp/
-.git-dist/
-.vscode
diff --git a/vendor/github.com/jesseduffield/go-git/v5/CODE_OF_CONDUCT.md b/vendor/github.com/jesseduffield/go-git/v5/CODE_OF_CONDUCT.md
deleted file mode 100644
index a689fa3c3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## 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, 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 team at conduct@sourced.tech. All
-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
-
diff --git a/vendor/github.com/jesseduffield/go-git/v5/COMPATIBILITY.md b/vendor/github.com/jesseduffield/go-git/v5/COMPATIBILITY.md
deleted file mode 100644
index ba1fb90ac..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/COMPATIBILITY.md
+++ /dev/null
@@ -1,234 +0,0 @@
-# Supported Features
-
-Here is a non-comprehensive table of git commands and features and their
-compatibility status with go-git.
-
-## Getting and creating repositories
-
-| Feature | Sub-feature                                                                                                        | Status | Notes | Examples                                                                                                                                                                                                            |
-| ------- | ------------------------------------------------------------------------------------------------------------------ | ------ | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `init`  |                                                                                                                    | ✅     |       |                                                                                                                                                                                                                     |
-| `init`  | `--bare`                                                                                                           | ✅     |       |                                                                                                                                                                                                                     |
-| `init`  | `--template` 
 `--separate-git-dir` 
 `--shared`                                                           | ❌     |       |                                                                                                                                                                                                                     |
-| `clone` |                                                                                                                    | ✅     |       | - [PlainClone](_examples/clone/main.go)                                                                                                                                                                             |
-| `clone` | Authentication: 
 - none 
 - access token 
 - username + password 
 - ssh                          | ✅     |       | - [clone ssh (private_key)](_examples/clone/auth/ssh/private_key/main.go) 
 - [clone ssh (ssh_agent)](_examples/clone/auth/ssh/ssh_agent/main.go) 
 - [clone access token](_examples/clone/auth/basic/access_token/main.go) 
 - [clone user + password](_examples/clone/auth/basic/username_password/main.go) |
-| `clone` | `--progress` 
 `--single-branch` 
 `--depth` 
 `--origin` 
 `--recurse-submodules` 
`--shared` | ✅     |       | - [recurse submodules](_examples/clone/main.go) 
 - [progress](_examples/progress/main.go)                                                                                                                      |
-
-## Basic snapshotting
-
-| Feature  | Sub-feature | Status | Notes                                                    | Examples                             |
-| -------- | ----------- | ------ | -------------------------------------------------------- | ------------------------------------ |
-| `add`    |             | ✅     | Plain add is supported. Any other flags aren't supported |                                      |
-| `status` |             | ✅     |                                                          |                                      |
-| `commit` |             | ✅     |                                                          | - [commit](_examples/commit/main.go) |
-| `reset`  |             | ✅     |                                                          |                                      |
-| `rm`     |             | ✅     |                                                          |                                      |
-| `mv`     |             | ✅     |                                                          |                                      |
-
-## Branching and merging
-
-| Feature     | Sub-feature | Status       | Notes                                   | Examples                                                                                        |
-| ----------- | ----------- | ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------- |
-| `branch`    |             | ✅           |                                         | - [branch](_examples/branch/main.go)                                                            |
-| `checkout`  |             | ✅           | Basic usages of checkout are supported. | - [checkout](_examples/checkout/main.go)                                                        |
-| `merge`     |             | ⚠️ (partial) | Fast-forward only                       |                                                                                                 |
-| `mergetool` |             | ❌           |                                         |                                                                                                 |
-| `stash`     |             | ❌           |                                         |                                                                                                 |
-| `sparse-checkout`     |             | ✅           |                                         | - [sparse-checkout](_examples/sparse-checkout/main.go)                                                                                               |
-| `tag`       |             | ✅           |                                         | - [tag](_examples/tag/main.go) 
 - [tag create and push](_examples/tag-create-push/main.go) |
-
-## Sharing and updating projects
-
-| Feature     | Sub-feature | Status | Notes                                                                   | Examples                                   |
-| ----------- | ----------- | ------ | ----------------------------------------------------------------------- | ------------------------------------------ |
-| `fetch`     |             | ✅     |                                                                         |                                            |
-| `pull`      |             | ✅     | Only supports merges where the merge can be resolved as a fast-forward. | - [pull](_examples/pull/main.go)           |
-| `push`      |             | ✅     |                                                                         | - [push](_examples/push/main.go)           |
-| `remote`    |             | ✅     |                                                                         | - [remotes](_examples/remotes/main.go)     |
-| `submodule` |             | ✅     |                                                                         | - [submodule](_examples/submodule/main.go) |
-| `submodule` | deinit      | ❌     |                                                                         |                                            |
-
-## Inspection and comparison
-
-| Feature    | Sub-feature | Status    | Notes | Examples                       |
-| ---------- | ----------- | --------- | ----- | ------------------------------ |
-| `show`     |             | ✅        |       |                                |
-| `log`      |             | ✅        |       | - [log](_examples/log/main.go) |
-| `shortlog` |             | (see log) |       |                                |
-| `describe` |             | ❌        |       |                                |
-
-## Patching
-
-| Feature       | Sub-feature | Status | Notes                                                | Examples |
-| ------------- | ----------- | ------ | ---------------------------------------------------- | -------- |
-| `apply`       |             | ❌     |                                                      |          |
-| `cherry-pick` |             | ❌     |                                                      |          |
-| `diff`        |             | ✅     | Patch object with UnifiedDiff output representation. |          |
-| `rebase`      |             | ❌     |                                                      |          |
-| `revert`      |             | ❌     |                                                      |          |
-
-## Debugging
-
-| Feature  | Sub-feature | Status | Notes | Examples                           |
-| -------- | ----------- | ------ | ----- | ---------------------------------- |
-| `bisect` |             | ❌     |       |                                    |
-| `blame`  |             | ✅     |       | - [blame](_examples/blame/main.go) |
-| `grep`   |             | ✅     |       |                                    |
-
-## Email
-
-| Feature        | Sub-feature | Status | Notes | Examples |
-| -------------- | ----------- | ------ | ----- | -------- |
-| `am`           |             | ❌     |       |          |
-| `apply`        |             | ❌     |       |          |
-| `format-patch` |             | ❌     |       |          |
-| `send-email`   |             | ❌     |       |          |
-| `request-pull` |             | ❌     |       |          |
-
-## External systems
-
-| Feature       | Sub-feature | Status | Notes | Examples |
-| ------------- | ----------- | ------ | ----- | -------- |
-| `svn`         |             | ❌     |       |          |
-| `fast-import` |             | ❌     |       |          |
-| `lfs`         |             | ❌     |       |          |
-
-## Administration
-
-| Feature         | Sub-feature | Status | Notes | Examples |
-| --------------- | ----------- | ------ | ----- | -------- |
-| `clean`         |             | ✅     |       |          |
-| `gc`            |             | ❌     |       |          |
-| `fsck`          |             | ❌     |       |          |
-| `reflog`        |             | ❌     |       |          |
-| `filter-branch` |             | ❌     |       |          |
-| `instaweb`      |             | ❌     |       |          |
-| `archive`       |             | ❌     |       |          |
-| `bundle`        |             | ❌     |       |          |
-| `prune`         |             | ❌     |       |          |
-| `repack`        |             | ❌     |       |          |
-
-## Server admin
-
-| Feature              | Sub-feature | Status | Notes | Examples                                  |
-| -------------------- | ----------- | ------ | ----- | ----------------------------------------- |
-| `daemon`             |             | ❌     |       |                                           |
-| `update-server-info` |             | ✅     |       | [cli](./cli/go-git/update_server_info.go) |
-
-## Advanced
-
-| Feature    | Sub-feature | Status      | Notes | Examples |
-| ---------- | ----------- | ----------- | ----- | -------- |
-| `notes`    |             | ❌          |       |          |
-| `replace`  |             | ❌          |       |          |
-| `worktree` |             | ❌          |       |          |
-| `annotate` |             | (see blame) |       |          |
-
-## GPG
-
-| Feature             | Sub-feature | Status | Notes | Examples |
-| ------------------- | ----------- | ------ | ----- | -------- |
-| `git-verify-commit` |             | ✅     |       |          |
-| `git-verify-tag`    |             | ✅     |       |          |
-
-## Plumbing commands
-
-| Feature         | Sub-feature                           | Status       | Notes                                               | Examples                                     |
-| --------------- | ------------------------------------- | ------------ | --------------------------------------------------- | -------------------------------------------- |
-| `cat-file`      |                                       | ✅           |                                                     |                                              |
-| `check-ignore`  |                                       | ❌           |                                                     |                                              |
-| `commit-tree`   |                                       | ❌           |                                                     |                                              |
-| `count-objects` |                                       | ❌           |                                                     |                                              |
-| `diff-index`    |                                       | ❌           |                                                     |                                              |
-| `for-each-ref`  |                                       | ✅           |                                                     |                                              |
-| `hash-object`   |                                       | ✅           |                                                     |                                              |
-| `ls-files`      |                                       | ✅           |                                                     |                                              |
-| `ls-remote`     |                                       | ✅           |                                                     | - [ls-remote](_examples/ls-remote/main.go)   |
-| `merge-base`    | `--independent` 
 `--is-ancestor` | ⚠️ (partial) | Calculates the merge-base only between two commits. | - [merge-base](_examples/merge_base/main.go) |
-| `merge-base`    | `--fork-point` 
 `--octopus`      | ❌           |                                                     |                                              |
-| `read-tree`     |                                       | ❌           |                                                     |                                              |
-| `rev-list`      |                                       | ✅           |                                                     |                                              |
-| `rev-parse`     |                                       | ❌           |                                                     |                                              |
-| `show-ref`      |                                       | ✅           |                                                     |                                              |
-| `symbolic-ref`  |                                       | ✅           |                                                     |                                              |
-| `update-index`  |                                       | ❌           |                                                     |                                              |
-| `update-ref`    |                                       | ❌           |                                                     |                                              |
-| `verify-pack`   |                                       | ❌           |                                                     |                                              |
-| `write-tree`    |                                       | ❌           |                                                     |                                              |
-
-## Indexes and Git Protocols
-
-| Feature              | Version                                                                         | Status | Notes |
-| -------------------- | ------------------------------------------------------------------------------- | ------ | ----- |
-| index                | [v1](https://github.com/git/git/blob/master/Documentation/gitformat-index.txt)  | ❌     |       |
-| index                | [v2](https://github.com/git/git/blob/master/Documentation/gitformat-index.txt)  | ✅     |       |
-| index                | [v3](https://github.com/git/git/blob/master/Documentation/gitformat-index.txt)  | ❌     |       |
-| pack-protocol        | [v1](https://github.com/git/git/blob/master/Documentation/gitprotocol-pack.txt) | ✅     |       |
-| pack-protocol        | [v2](https://github.com/git/git/blob/master/Documentation/gitprotocol-v2.txt)   | ❌     |       |
-| multi-pack-index     | [v1](https://github.com/git/git/blob/master/Documentation/gitformat-pack.txt)   | ❌     |       |
-| pack-\*.rev files    | [v1](https://github.com/git/git/blob/master/Documentation/gitformat-pack.txt)   | ❌     |       |
-| pack-\*.mtimes files | [v1](https://github.com/git/git/blob/master/Documentation/gitformat-pack.txt)   | ❌     |       |
-| cruft packs          |                                                                                 | ❌     |       |
-
-## Capabilities
-
-| Feature                        | Status       | Notes |
-| ------------------------------ | ------------ | ----- |
-| `multi_ack`                    | ❌           |       |
-| `multi_ack_detailed`           | ❌           |       |
-| `no-done`                      | ❌           |       |
-| `thin-pack`                    | ❌           |       |
-| `side-band`                    | ⚠️ (partial) |       |
-| `side-band-64k`                | ⚠️ (partial) |       |
-| `ofs-delta`                    | ✅           |       |
-| `agent`                        | ✅           |       |
-| `object-format`                | ❌           |       |
-| `symref`                       | ✅           |       |
-| `shallow`                      | ✅           |       |
-| `deepen-since`                 | ✅           |       |
-| `deepen-not`                   | ❌           |       |
-| `deepen-relative`              | ❌           |       |
-| `no-progress`                  | ✅           |       |
-| `include-tag`                  | ✅           |       |
-| `report-status`                | ✅           |       |
-| `report-status-v2`             | ❌           |       |
-| `delete-refs`                  | ✅           |       |
-| `quiet`                        | ❌           |       |
-| `atomic`                       | ✅           |       |
-| `push-options`                 | ✅           |       |
-| `allow-tip-sha1-in-want`       | ✅           |       |
-| `allow-reachable-sha1-in-want` | ❌           |       |
-| `push-cert=`            | ❌           |       |
-| `filter`                       | ❌           |       |
-| `session-id=`      | ❌           |       |
-
-## Transport Schemes
-
-| Scheme               | Status       | Notes                                                                  | Examples                                       |
-| -------------------- | ------------ | ---------------------------------------------------------------------- | ---------------------------------------------- |
-| `http(s)://` (dumb)  | ❌           |                                                                        |                                                |
-| `http(s)://` (smart) | ✅           |                                                                        |                                                |
-| `git://`             | ✅           |                                                                        |                                                |
-| `ssh://`             | ✅           |                                                                        |                                                |
-| `file://`            | ⚠️ (partial) | Warning: this is not pure Golang. This shells out to the `git` binary. |                                                |
-| Custom               | ✅           | All existing schemes can be replaced by custom implementations.        | - [custom_http](_examples/custom_http/main.go) |
-
-## SHA256
-
-| Feature  | Sub-feature | Status | Notes                              | Examples                             |
-| -------- | ----------- | ------ | ---------------------------------- | ------------------------------------ |
-| `init`   |             | ✅     | Requires building with tag sha256. | - [init](_examples/sha256/main.go)   |
-| `commit` |             | ✅     | Requires building with tag sha256. | - [commit](_examples/sha256/main.go) |
-| `pull`   |             | ❌     |                                    |                                      |
-| `fetch`  |             | ❌     |                                    |                                      |
-| `push`   |             | ❌     |                                    |                                      |
-
-## Other features
-
-| Feature         | Sub-feature                 | Status | Notes                                          | Examples |
-| --------------- | --------------------------- | ------ | ---------------------------------------------- | -------- |
-| `config`        | `--local`                   | ✅     | Read and write per-repository (`.git/config`). |          |
-| `config`        | `--global` 
 `--system` | ✅     | Read-only.                                     |          |
-| `gitignore`     |                             | ✅     |                                                |          |
-| `gitattributes` |                             | ✅     |                                                |          |
-| `git-worktree`  |                             | ❌     | Multiple worktrees are not supported.          |          |
diff --git a/vendor/github.com/jesseduffield/go-git/v5/CONTRIBUTING.md b/vendor/github.com/jesseduffield/go-git/v5/CONTRIBUTING.md
deleted file mode 100644
index a5b01823b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/CONTRIBUTING.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributing Guidelines
-
-source{d} go-git project is [Apache 2.0 licensed](LICENSE) and accepts
-contributions via GitHub pull requests.  This document outlines some of the
-conventions on development workflow, commit message formatting, contact points,
-and other resources to make it easier to get your contribution accepted.
-
-## Support Channels
-
-The official support channels, for both users and contributors, are:
-
-- [StackOverflow go-git tag](https://stackoverflow.com/questions/tagged/go-git) for user questions.
-- GitHub [Issues](https://github.com/src-d/go-git/issues)* for bug reports and feature requests.
-
-*Before opening a new issue or submitting a new pull request, it's helpful to
-search the project - it's likely that another user has already reported the
-issue you're facing, or it's a known issue that we're already aware of.
-
-
-## How to Contribute
-
-Pull Requests (PRs) are the main and exclusive way to contribute to the official go-git project.
-In order for a PR to be accepted it needs to pass a list of requirements:
-
-- You should be able to run the same query using `git`. We don't accept features that are not implemented in the official git implementation.
-- The expected behavior must match the [official git implementation](https://github.com/git/git).
-- The actual behavior must be correctly explained with natural language and providing a minimum working example in Go that reproduces it.
-- All PRs must be written in idiomatic Go, formatted according to [gofmt](https://golang.org/cmd/gofmt/), and without any warnings from [go lint](https://github.com/golang/lint) nor [go vet](https://golang.org/cmd/vet/).
-- They should in general include tests, and those shall pass.
-- If the PR is a bug fix, it has to include a suite of unit tests for the new functionality.
-- If the PR is a new feature, it has to come with a suite of unit tests, that tests the new functionality.
-- In any case, all the PRs have to pass the personal evaluation of at least one of the maintainers of go-git.
-
-### Branches
-
-The `master` branch is currently used for maintaining the `v5` major release only. The accepted changes would
-be dependency bumps, bug fixes and small changes that aren't needed for `v6`. New development should target the
-`v6-exp` branch, and if agreed with at least one go-git maintainer, it can be back ported to `v5` by creating 
-a new PR that targets `master`.
-
-### Format of the commit message
-
-Every commit message should describe what was changed, under which context and, if applicable, the GitHub issue it relates to:
-
-```
-plumbing: packp, Skip argument validations for unknown capabilities. Fixes #623
-```
-
-The format can be described more formally as follows:
-
-```
-: , . [Fixes #]
-```
diff --git a/vendor/github.com/jesseduffield/go-git/v5/EXTENDING.md b/vendor/github.com/jesseduffield/go-git/v5/EXTENDING.md
deleted file mode 100644
index a2778e34a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/EXTENDING.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Extending go-git
-
-`go-git` was built in a highly extensible manner, which enables some of its functionalities to be changed or extended without the need of changing its codebase. Here are the key extensibility features:
-
-## Dot Git Storers
-
-Dot git storers are the components responsible for storing the Git internal files, including objects and references.
-
-The built-in storer implementations include [memory](storage/memory) and [filesystem](storage/filesystem). The `memory` storer stores all the data in memory, and its use look like this:
-
-```go
-	r, err := git.Init(memory.NewStorage(), nil)
-```
-
-The `filesystem` storer stores the data in the OS filesystem, and can be used as follows:
-
-```go
-    r, err := git.Init(filesystem.NewStorage(osfs.New("/tmp/foo")), nil)
-```
-
-New implementations can be created by implementing the [storage.Storer interface](storage/storer.go#L16).
-
-## Filesystem
-
-Git repository worktrees are managed using a filesystem abstraction based on [go-billy](https://github.com/go-git/go-billy). The Git operations will take place against the specific filesystem implementation. Initialising a repository in Memory can be done as follows:
-
-```go
-	fs := memfs.New()
-	r, err := git.Init(memory.NewStorage(), fs)
-```
-
-The same operation can be done against the OS filesystem:
-
-```go
-    fs := osfs.New("/tmp/foo")
-    r, err := git.Init(memory.NewStorage(), fs)
-```
-
-New filesystems (e.g. cloud based storage) could be created by implementing `go-billy`'s [Filesystem interface](https://github.com/go-git/go-billy/blob/326c59f064021b821a55371d57794fbfb86d4cb3/fs.go#L52).
-
-## Transport Schemes
-
-Git supports various transport schemes, including `http`, `https`, `ssh`, `git`, `file`. `go-git` defines the [transport.Transport interface](plumbing/transport/common.go#L48) to represent them.
-
-The built-in implementations can be replaced by calling `client.InstallProtocol`.
-
-An example of changing the built-in `https` implementation to skip TLS could look like this:
-
-```go
-	customClient := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-	}
-
-	client.InstallProtocol("https", githttp.NewClient(customClient))
-```
-
-Some internal implementations enables code reuse amongst the different transport implementations. Some of these may be made public in the future (e.g. `plumbing/transport/internal/common`).
-
-## Cache
-
-Several different operations across `go-git` lean on caching of objects in order to achieve optimal performance. The caching functionality is defined by the [cache.Object interface](plumbing/cache/common.go#L17).
-
-Two built-in implementations are `cache.ObjectLRU` and `cache.BufferLRU`. However, the caching functionality can be customized by implementing the interface `cache.Object` interface.
-
-## Hash
-
-`go-git` uses the `crypto.Hash` interface to represent hash functions. The built-in implementations are `github.com/pjbgf/sha1cd` for SHA1 and Go's `crypto/SHA256`.
-
-The default hash functions can be changed by calling `hash.RegisterHash`.
-```go
-    func init() {
-        hash.RegisterHash(crypto.SHA1, sha1.New)
-    }
-```
-
-New `SHA1` or `SHA256` hash functions that implement the `hash.RegisterHash` interface can be registered by calling `RegisterHash`.
diff --git a/vendor/github.com/jesseduffield/go-git/v5/LICENSE b/vendor/github.com/jesseduffield/go-git/v5/LICENSE
deleted file mode 100644
index 8aa3d854c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2018 Sourced Technologies, S.L.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/jesseduffield/go-git/v5/Makefile b/vendor/github.com/jesseduffield/go-git/v5/Makefile
deleted file mode 100644
index 3d5b54f7e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# General
-WORKDIR = $(PWD)
-
-# Go parameters
-GOCMD = go
-GOTEST = $(GOCMD) test 
-
-# Git config
-GIT_VERSION ?=
-GIT_DIST_PATH ?= $(PWD)/.git-dist
-GIT_REPOSITORY = http://github.com/git/git.git
-
-# Coverage
-COVERAGE_REPORT = coverage.out
-COVERAGE_MODE = count
-
-build-git:
-	@if [ -f $(GIT_DIST_PATH)/git ]; then \
-		echo "nothing to do, using cache $(GIT_DIST_PATH)"; \
-	else \
-		git clone $(GIT_REPOSITORY) -b $(GIT_VERSION) --depth 1 --single-branch $(GIT_DIST_PATH); \
-		cd $(GIT_DIST_PATH); \
-		make configure; \
-		./configure; \
-		make all; \
-	fi
-
-test:
-	@echo "running against `git version`"; \
-	$(GOTEST) -race ./...
-	$(GOTEST) -v _examples/common_test.go _examples/common.go --examples
-
-TEMP_REPO := $(shell mktemp)
-test-sha256:
-	$(GOCMD) run -tags sha256 _examples/sha256/main.go $(TEMP_REPO)
-	cd $(TEMP_REPO) && git fsck
-	rm -rf $(TEMP_REPO)
-
-test-coverage:
-	@echo "running against `git version`"; \
-	echo "" > $(COVERAGE_REPORT); \
-	$(GOTEST) -coverprofile=$(COVERAGE_REPORT) -coverpkg=./... -covermode=$(COVERAGE_MODE) ./...
-
-clean:
-	rm -rf $(GIT_DIST_PATH)
-
-fuzz:
-	@go test -fuzz=FuzzParser				$(PWD)/internal/revision
-	@go test -fuzz=FuzzDecoder				$(PWD)/plumbing/format/config
-	@go test -fuzz=FuzzPatchDelta			$(PWD)/plumbing/format/packfile
-	@go test -fuzz=FuzzParseSignedBytes		$(PWD)/plumbing/object
-	@go test -fuzz=FuzzDecode				$(PWD)/plumbing/object
-	@go test -fuzz=FuzzDecoder				$(PWD)/plumbing/protocol/packp
-	@go test -fuzz=FuzzNewEndpoint			$(PWD)/plumbing/transport
diff --git a/vendor/github.com/jesseduffield/go-git/v5/README.md b/vendor/github.com/jesseduffield/go-git/v5/README.md
deleted file mode 100644
index ff0c9b72b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-![go-git logo](https://cdn.rawgit.com/src-d/artwork/02036484/go-git/files/go-git-github-readme-header.png)
-[![GoDoc](https://godoc.org/github.com/go-git/go-git/v5?status.svg)](https://pkg.go.dev/github.com/go-git/go-git/v5) [![Build Status](https://github.com/go-git/go-git/workflows/Test/badge.svg)](https://github.com/go-git/go-git/actions) [![Go Report Card](https://goreportcard.com/badge/github.com/go-git/go-git)](https://goreportcard.com/report/github.com/go-git/go-git)
-
-*go-git* is a highly extensible git implementation library written in **pure Go**.
-
-It can be used to manipulate git repositories at low level *(plumbing)* or high level *(porcelain)*, through an idiomatic Go API. It also supports several types of storage, such as in-memory filesystems, or custom implementations, thanks to the [`Storer`](https://pkg.go.dev/github.com/go-git/go-git/v5/plumbing/storer) interface.
-
-It's being actively developed since 2015 and is being used extensively by [Keybase](https://keybase.io/blog/encrypted-git-for-everyone), [Gitea](https://gitea.io/en-us/) or [Pulumi](https://github.com/search?q=org%3Apulumi+go-git&type=Code), and by many other libraries and tools.
-
-Project Status
---------------
-
-After the legal issues with the [`src-d`](https://github.com/src-d) organization, the lack of update for four months and the requirement to make a hard fork, the project is **now back to normality**.
-
-The project is currently actively maintained by individual contributors, including several of the original authors, but also backed by a new company, [gitsight](https://github.com/gitsight), where `go-git` is a critical component used at scale.
-
-
-Comparison with git
--------------------
-
-*go-git* aims to be fully compatible with [git](https://github.com/git/git), all the *porcelain* operations are implemented to work exactly as *git* does.
-
-*git* is a humongous project with years of development by thousands of contributors, making it challenging for *go-git* to implement all the features. You can find a comparison of *go-git* vs *git* in the [compatibility documentation](COMPATIBILITY.md).
-
-
-Installation
-------------
-
-The recommended way to install *go-git* is:
-
-```go
-import "github.com/go-git/go-git/v5" // with go modules enabled (GO111MODULE=on or outside GOPATH)
-import "github.com/go-git/go-git" // with go modules disabled
-```
-
-
-Examples
---------
-
-> Please note that the `CheckIfError` and `Info` functions  used in the examples are from the [examples package](https://github.com/go-git/go-git/blob/master/_examples/common.go#L19) just to be used in the examples.
-
-
-### Basic example
-
-A basic example that mimics the standard `git clone` command
-
-```go
-// Clone the given repository to the given directory
-Info("git clone https://github.com/go-git/go-git")
-
-_, err := git.PlainClone("/tmp/foo", false, &git.CloneOptions{
-    URL:      "https://github.com/go-git/go-git",
-    Progress: os.Stdout,
-})
-
-CheckIfError(err)
-```
-
-Outputs:
-```
-Counting objects: 4924, done.
-Compressing objects: 100% (1333/1333), done.
-Total 4924 (delta 530), reused 6 (delta 6), pack-reused 3533
-```
-
-### In-memory example
-
-Cloning a repository into memory and printing the history of HEAD, just like `git log` does
-
-
-```go
-// Clones the given repository in memory, creating the remote, the local
-// branches and fetching the objects, exactly as:
-Info("git clone https://github.com/go-git/go-billy")
-
-r, err := git.Clone(memory.NewStorage(), nil, &git.CloneOptions{
-    URL: "https://github.com/go-git/go-billy",
-})
-
-CheckIfError(err)
-
-// Gets the HEAD history from HEAD, just like this command:
-Info("git log")
-
-// ... retrieves the branch pointed by HEAD
-ref, err := r.Head()
-CheckIfError(err)
-
-
-// ... retrieves the commit history
-cIter, err := r.Log(&git.LogOptions{From: ref.Hash()})
-CheckIfError(err)
-
-// ... just iterates over the commits, printing it
-err = cIter.ForEach(func(c *object.Commit) error {
-	fmt.Println(c)
-	return nil
-})
-CheckIfError(err)
-```
-
-Outputs:
-```
-commit ded8054fd0c3994453e9c8aacaf48d118d42991e
-Author: Santiago M. Mola 
-Date:   Sat Nov 12 21:18:41 2016 +0100
-
-    index: ReadFrom/WriteTo returns IndexReadError/IndexWriteError. (#9)
-
-commit df707095626f384ce2dc1a83b30f9a21d69b9dfc
-Author: Santiago M. Mola 
-Date:   Fri Nov 11 13:23:22 2016 +0100
-
-    readwriter: fix bug when writing index. (#10)
-
-    When using ReadWriter on an existing siva file, absolute offset for
-    index entries was not being calculated correctly.
-...
-```
-
-You can find this [example](_examples/log/main.go) and many others in the [examples](_examples) folder.
-
-Contribute
-----------
-
-[Contributions](https://github.com/go-git/go-git/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) are more than welcome, if you are interested please take a look to
-our [Contributing Guidelines](CONTRIBUTING.md).
-
-License
--------
-Apache License Version 2.0, see [LICENSE](LICENSE)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/SECURITY.md b/vendor/github.com/jesseduffield/go-git/v5/SECURITY.md
deleted file mode 100644
index 0d2f8d038..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/SECURITY.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# go-git Security Policy
-
-The purpose of this security policy is to outline `go-git`'s process
-for reporting, handling and disclosing security sensitive information.
-
-## Supported Versions
-
-The project follows a version support policy where only the latest minor
-release is actively supported. Therefore, only issues that impact the latest
-minor release will be fixed. Users are encouraged to upgrade to the latest
-minor/patch release to benefit from the most up-to-date features, bug fixes,
-and security enhancements.​
-
-The supported versions policy applies to both the `go-git` library and its
-associated repositories within the `go-git` org.
-
-## Reporting Security Issues
-
-Please report any security vulnerabilities or potential weaknesses in `go-git`
-privately via go-git-security@googlegroups.com. Do not publicly disclose the
-details of the vulnerability until a fix has been implemented and released.
-
-During the process the project maintainers will investigate the report, so please
-provide detailed information, including steps to reproduce, affected versions, and any mitigations if known.
-
-The project maintainers will acknowledge the receipt of the report and work with
-the reporter to validate and address the issue.
-
-Please note that `go-git` does not have any bounty programs, and therefore do
-not provide financial compensation for disclosures.
-
-## Security Disclosure Process
-
-The project maintainers will make every effort to promptly address security issues.
-
-Once a security vulnerability is fixed, a security advisory will be published to notify users and provide appropriate mitigation measures.
-
-All `go-git` advisories can be found at https://github.com/go-git/go-git/security/advisories.
diff --git a/vendor/github.com/jesseduffield/go-git/v5/blame.go b/vendor/github.com/jesseduffield/go-git/v5/blame.go
deleted file mode 100644
index 2f1c910a8..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/blame.go
+++ /dev/null
@@ -1,587 +0,0 @@
-package git
-
-import (
-	"bytes"
-	"container/heap"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-	"unicode/utf8"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/utils/diff"
-	"github.com/sergi/go-diff/diffmatchpatch"
-)
-
-// BlameResult represents the result of a Blame operation.
-type BlameResult struct {
-	// Path is the path of the File that we're blaming.
-	Path string
-	// Rev (Revision) is the hash of the specified Commit used to generate this result.
-	Rev plumbing.Hash
-	// Lines contains every line with its authorship.
-	Lines []*Line
-}
-
-// Blame returns a BlameResult with the information about the last author of
-// each line from file `path` at commit `c`.
-func Blame(c *object.Commit, path string) (*BlameResult, error) {
-	// The file to blame is identified by the input arguments:
-	// commit and path. commit is a Commit object obtained from a Repository. Path
-	// represents a path to a specific file contained in the repository.
-	//
-	// Blaming a file is done by walking the tree in reverse order trying to find where each line was last modified.
-	//
-	// When a diff is found it cannot immediately assume it came from that commit, as it may have come from 1 of its
-	// parents, so it will first try to resolve those diffs from its parents, if it couldn't find the change in its
-	// parents then it will assign the change to itself.
-	//
-	// When encountering 2 parents that have made the same change to a file it will choose the parent that was merged
-	// into the current branch first (this is determined by the order of the parents inside the commit).
-	//
-	// This currently works on a line by line basis, if performance becomes an issue it could be changed to work with
-	// hunks rather than lines. Then when encountering diff hunks it would need to split them where necessary.
-
-	b := new(blame)
-	b.fRev = c
-	b.path = path
-	b.q = new(priorityQueue)
-
-	file, err := b.fRev.File(path)
-	if err != nil {
-		return nil, err
-	}
-	finalLines, err := file.Lines()
-	if err != nil {
-		return nil, err
-	}
-	finalLength := len(finalLines)
-
-	needsMap := make([]lineMap, finalLength)
-	for i := range needsMap {
-		needsMap[i] = lineMap{i, i, nil, -1}
-	}
-	contents, err := file.Contents()
-	if err != nil {
-		return nil, err
-	}
-	b.q.Push(&queueItem{
-		nil,
-		nil,
-		c,
-		path,
-		contents,
-		needsMap,
-		0,
-		false,
-		0,
-	})
-	items := make([]*queueItem, 0)
-	for {
-		items = items[:0]
-		for {
-			if b.q.Len() == 0 {
-				return nil, errors.New("invalid state: no items left on the blame queue")
-			}
-			item := b.q.Pop()
-			items = append(items, item)
-			next := b.q.Peek()
-			if next == nil || next.Hash != item.Commit.Hash {
-				break
-			}
-		}
-		finished, err := b.addBlames(items)
-		if err != nil {
-			return nil, err
-		}
-		if finished {
-			break
-		}
-	}
-
-	b.lineToCommit = make([]*object.Commit, finalLength)
-	for i := range needsMap {
-		b.lineToCommit[i] = needsMap[i].Commit
-	}
-
-	lines, err := newLines(finalLines, b.lineToCommit)
-	if err != nil {
-		return nil, err
-	}
-
-	return &BlameResult{
-		Path:  path,
-		Rev:   c.Hash,
-		Lines: lines,
-	}, nil
-}
-
-// Line values represent the contents and author of a line in BlamedResult values.
-type Line struct {
-	// Author is the email address of the last author that modified the line.
-	Author string
-	// AuthorName is the name of the last author that modified the line.
-	AuthorName string
-	// Text is the original text of the line.
-	Text string
-	// Date is when the original text of the line was introduced
-	Date time.Time
-	// Hash is the commit hash that introduced the original line
-	Hash plumbing.Hash
-}
-
-func newLine(author, authorName, text string, date time.Time, hash plumbing.Hash) *Line {
-	return &Line{
-		Author:     author,
-		AuthorName: authorName,
-		Text:       text,
-		Hash:       hash,
-		Date:       date,
-	}
-}
-
-func newLines(contents []string, commits []*object.Commit) ([]*Line, error) {
-	result := make([]*Line, 0, len(contents))
-	for i := range contents {
-		result = append(result, newLine(
-			commits[i].Author.Email, commits[i].Author.Name, contents[i],
-			commits[i].Author.When, commits[i].Hash,
-		))
-	}
-
-	return result, nil
-}
-
-// this struct is internally used by the blame function to hold its
-// inputs, outputs and state.
-type blame struct {
-	// the path of the file to blame
-	path string
-	// the commit of the final revision of the file to blame
-	fRev *object.Commit
-	// resolved lines
-	lineToCommit []*object.Commit
-	// queue of commits that need resolving
-	q *priorityQueue
-}
-
-type lineMap struct {
-	Orig, Cur    int
-	Commit       *object.Commit
-	FromParentNo int
-}
-
-func (b *blame) addBlames(curItems []*queueItem) (bool, error) {
-	curItem := curItems[0]
-
-	// Simple optimisation to merge paths, there is potential to go a bit further here and check for any duplicates
-	// not only if they are all the same.
-	if len(curItems) == 1 {
-		curItems = nil
-	} else if curItem.IdenticalToChild {
-		allSame := true
-		lenCurItems := len(curItems)
-		lowestParentNo := curItem.ParentNo
-		for i := 1; i < lenCurItems; i++ {
-			if !curItems[i].IdenticalToChild || curItem.Child != curItems[i].Child {
-				allSame = false
-				break
-			}
-			lowestParentNo = min(lowestParentNo, curItems[i].ParentNo)
-		}
-		if allSame {
-			curItem.Child.numParentsNeedResolving = curItem.Child.numParentsNeedResolving - lenCurItems + 1
-			curItems = nil // free the memory
-			curItem.ParentNo = lowestParentNo
-
-			// Now check if we can remove the parent completely
-			for curItem.Child.IdenticalToChild && curItem.Child.MergedChildren == nil && curItem.Child.numParentsNeedResolving == 1 {
-				oldChild := curItem.Child
-				curItem.Child = oldChild.Child
-				curItem.ParentNo = oldChild.ParentNo
-			}
-		}
-	}
-
-	// if we have more than 1 item for this commit, create a single needsMap
-	if len(curItems) > 1 {
-		curItem.MergedChildren = make([]childToNeedsMap, len(curItems))
-		for i, c := range curItems {
-			curItem.MergedChildren[i] = childToNeedsMap{c.Child, c.NeedsMap, c.IdenticalToChild, c.ParentNo}
-		}
-		newNeedsMap := make([]lineMap, 0, len(curItem.NeedsMap))
-		newNeedsMap = append(newNeedsMap, curItems[0].NeedsMap...)
-
-		for i := 1; i < len(curItems); i++ {
-			cur := curItems[i].NeedsMap
-			n := 0 // position in newNeedsMap
-			c := 0 // position in current list
-			for c < len(cur) {
-				if n == len(newNeedsMap) {
-					newNeedsMap = append(newNeedsMap, cur[c:]...)
-					break
-				} else if newNeedsMap[n].Cur == cur[c].Cur {
-					n++
-					c++
-				} else if newNeedsMap[n].Cur < cur[c].Cur {
-					n++
-				} else {
-					newNeedsMap = append(newNeedsMap, cur[c])
-					newPos := len(newNeedsMap) - 1
-					for newPos > n {
-						newNeedsMap[newPos-1], newNeedsMap[newPos] = newNeedsMap[newPos], newNeedsMap[newPos-1]
-						newPos--
-					}
-				}
-			}
-		}
-		curItem.NeedsMap = newNeedsMap
-		curItem.IdenticalToChild = false
-		curItem.Child = nil
-		curItems = nil // free the memory
-	}
-
-	parents, err := parentsContainingPath(curItem.path, curItem.Commit)
-	if err != nil {
-		return false, err
-	}
-
-	anyPushed := false
-	for parnetNo, prev := range parents {
-		currentHash, err := blobHash(curItem.path, curItem.Commit)
-		if err != nil {
-			return false, err
-		}
-		prevHash, err := blobHash(prev.Path, prev.Commit)
-		if err != nil {
-			return false, err
-		}
-		if currentHash == prevHash {
-			if len(parents) == 1 && curItem.MergedChildren == nil && curItem.IdenticalToChild {
-				// commit that has 1 parent and 1 child and is the same as both, bypass it completely
-				b.q.Push(&queueItem{
-					Child:            curItem.Child,
-					Commit:           prev.Commit,
-					path:             prev.Path,
-					Contents:         curItem.Contents,
-					NeedsMap:         curItem.NeedsMap, // reuse the NeedsMap as we are throwing away this item
-					IdenticalToChild: true,
-					ParentNo:         curItem.ParentNo,
-				})
-			} else {
-				b.q.Push(&queueItem{
-					Child:            curItem,
-					Commit:           prev.Commit,
-					path:             prev.Path,
-					Contents:         curItem.Contents,
-					NeedsMap:         append([]lineMap(nil), curItem.NeedsMap...), // create new slice and copy
-					IdenticalToChild: true,
-					ParentNo:         parnetNo,
-				})
-				curItem.numParentsNeedResolving++
-			}
-			anyPushed = true
-			continue
-		}
-
-		// get the contents of the file
-		file, err := prev.Commit.File(prev.Path)
-		if err != nil {
-			return false, err
-		}
-		prevContents, err := file.Contents()
-		if err != nil {
-			return false, err
-		}
-
-		hunks := diff.Do(prevContents, curItem.Contents)
-		prevl := -1
-		curl := -1
-		need := 0
-		getFromParent := make([]lineMap, 0)
-	out:
-		for h := range hunks {
-			hLines := countLines(hunks[h].Text)
-			for hl := 0; hl < hLines; hl++ {
-				switch hunks[h].Type {
-				case diffmatchpatch.DiffEqual:
-					prevl++
-					curl++
-					if curl == curItem.NeedsMap[need].Cur {
-						// add to needs
-						getFromParent = append(getFromParent, lineMap{curl, prevl, nil, -1})
-						// move to next need
-						need++
-						if need >= len(curItem.NeedsMap) {
-							break out
-						}
-					}
-				case diffmatchpatch.DiffInsert:
-					curl++
-					if curl == curItem.NeedsMap[need].Cur {
-						// the line we want is added, it may have been added here (or by another parent), skip it for now
-						need++
-						if need >= len(curItem.NeedsMap) {
-							break out
-						}
-					}
-				case diffmatchpatch.DiffDelete:
-					prevl += hLines
-					continue out
-				default:
-					return false, errors.New("invalid state: invalid hunk Type")
-				}
-			}
-		}
-
-		if len(getFromParent) > 0 {
-			b.q.Push(&queueItem{
-				curItem,
-				nil,
-				prev.Commit,
-				prev.Path,
-				prevContents,
-				getFromParent,
-				0,
-				false,
-				parnetNo,
-			})
-			curItem.numParentsNeedResolving++
-			anyPushed = true
-		}
-	}
-
-	curItem.Contents = "" // no longer need, free the memory
-
-	if !anyPushed {
-		return finishNeeds(curItem)
-	}
-
-	return false, nil
-}
-
-func finishNeeds(curItem *queueItem) (bool, error) {
-	// any needs left in the needsMap must have come from this revision
-	for i := range curItem.NeedsMap {
-		if curItem.NeedsMap[i].Commit == nil {
-			curItem.NeedsMap[i].Commit = curItem.Commit
-			curItem.NeedsMap[i].FromParentNo = -1
-		}
-	}
-
-	if curItem.Child == nil && curItem.MergedChildren == nil {
-		return true, nil
-	}
-
-	if curItem.MergedChildren == nil {
-		return applyNeeds(curItem.Child, curItem.NeedsMap, curItem.IdenticalToChild, curItem.ParentNo)
-	}
-
-	for _, ctn := range curItem.MergedChildren {
-		m := 0 // position in merged needs map
-		p := 0 // position in parent needs map
-		for p < len(ctn.NeedsMap) {
-			if ctn.NeedsMap[p].Cur == curItem.NeedsMap[m].Cur {
-				ctn.NeedsMap[p].Commit = curItem.NeedsMap[m].Commit
-				m++
-				p++
-			} else if ctn.NeedsMap[p].Cur < curItem.NeedsMap[m].Cur {
-				p++
-			} else {
-				m++
-			}
-		}
-		finished, err := applyNeeds(ctn.Child, ctn.NeedsMap, ctn.IdenticalToChild, ctn.ParentNo)
-		if finished || err != nil {
-			return finished, err
-		}
-	}
-
-	return false, nil
-}
-
-func applyNeeds(child *queueItem, needsMap []lineMap, identicalToChild bool, parentNo int) (bool, error) {
-	if identicalToChild {
-		for i := range child.NeedsMap {
-			l := &child.NeedsMap[i]
-			if l.Cur != needsMap[i].Cur || l.Orig != needsMap[i].Orig {
-				return false, errors.New("needsMap isn't the same? Why not??")
-			}
-			if l.Commit == nil || parentNo < l.FromParentNo {
-				l.Commit = needsMap[i].Commit
-				l.FromParentNo = parentNo
-			}
-		}
-	} else {
-		i := 0
-	out:
-		for j := range child.NeedsMap {
-			l := &child.NeedsMap[j]
-			for needsMap[i].Orig < l.Cur {
-				i++
-				if i == len(needsMap) {
-					break out
-				}
-			}
-			if l.Cur == needsMap[i].Orig {
-				if l.Commit == nil || parentNo < l.FromParentNo {
-					l.Commit = needsMap[i].Commit
-					l.FromParentNo = parentNo
-				}
-			}
-		}
-	}
-	child.numParentsNeedResolving--
-	if child.numParentsNeedResolving == 0 {
-		finished, err := finishNeeds(child)
-		if finished || err != nil {
-			return finished, err
-		}
-	}
-
-	return false, nil
-}
-
-// String prints the results of a Blame using git-blame's style.
-func (b BlameResult) String() string {
-	var buf bytes.Buffer
-
-	// max line number length
-	mlnl := len(strconv.Itoa(len(b.Lines)))
-	// max author length
-	mal := b.maxAuthorLength()
-	format := fmt.Sprintf("%%s (%%-%ds %%s %%%dd) %%s\n", mal, mlnl)
-
-	for ln := range b.Lines {
-		_, _ = fmt.Fprintf(&buf, format, b.Lines[ln].Hash.String()[:8],
-			b.Lines[ln].AuthorName, b.Lines[ln].Date.Format("2006-01-02 15:04:05 -0700"), ln+1, b.Lines[ln].Text)
-	}
-	return buf.String()
-}
-
-// utility function to calculate the number of runes needed
-// to print the longest author name in the blame of a file.
-func (b BlameResult) maxAuthorLength() int {
-	m := 0
-	for ln := range b.Lines {
-		m = max(m, utf8.RuneCountInString(b.Lines[ln].AuthorName))
-	}
-	return m
-}
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-type childToNeedsMap struct {
-	Child            *queueItem
-	NeedsMap         []lineMap
-	IdenticalToChild bool
-	ParentNo         int
-}
-
-type queueItem struct {
-	Child                   *queueItem
-	MergedChildren          []childToNeedsMap
-	Commit                  *object.Commit
-	path                    string
-	Contents                string
-	NeedsMap                []lineMap
-	numParentsNeedResolving int
-	IdenticalToChild        bool
-	ParentNo                int
-}
-
-type priorityQueueImp []*queueItem
-
-func (pq *priorityQueueImp) Len() int { return len(*pq) }
-func (pq *priorityQueueImp) Less(i, j int) bool {
-	return !(*pq)[i].Commit.Less((*pq)[j].Commit)
-}
-func (pq *priorityQueueImp) Swap(i, j int) { (*pq)[i], (*pq)[j] = (*pq)[j], (*pq)[i] }
-func (pq *priorityQueueImp) Push(x any)    { *pq = append(*pq, x.(*queueItem)) }
-func (pq *priorityQueueImp) Pop() any {
-	n := len(*pq)
-	ret := (*pq)[n-1]
-	(*pq)[n-1] = nil // ovoid memory leak
-	*pq = (*pq)[0 : n-1]
-
-	return ret
-}
-func (pq *priorityQueueImp) Peek() *object.Commit {
-	if len(*pq) == 0 {
-		return nil
-	}
-	return (*pq)[0].Commit
-}
-
-type priorityQueue priorityQueueImp
-
-func (pq *priorityQueue) Init()    { heap.Init((*priorityQueueImp)(pq)) }
-func (pq *priorityQueue) Len() int { return (*priorityQueueImp)(pq).Len() }
-func (pq *priorityQueue) Push(c *queueItem) {
-	heap.Push((*priorityQueueImp)(pq), c)
-}
-func (pq *priorityQueue) Pop() *queueItem {
-	return heap.Pop((*priorityQueueImp)(pq)).(*queueItem)
-}
-func (pq *priorityQueue) Peek() *object.Commit { return (*priorityQueueImp)(pq).Peek() }
-
-type parentCommit struct {
-	Commit *object.Commit
-	Path   string
-}
-
-func parentsContainingPath(path string, c *object.Commit) ([]parentCommit, error) {
-	// TODO: benchmark this method making git.object.Commit.parent public instead of using
-	// an iterator
-	var result []parentCommit
-	iter := c.Parents()
-	for {
-		parent, err := iter.Next()
-		if err == io.EOF {
-			return result, nil
-		}
-		if err != nil {
-			return nil, err
-		}
-		if _, err := parent.File(path); err == nil {
-			result = append(result, parentCommit{parent, path})
-		} else {
-			// look for renames
-			patch, err := parent.Patch(c)
-			if err != nil {
-				return nil, err
-			} else if patch != nil {
-				for _, fp := range patch.FilePatches() {
-					from, to := fp.Files()
-					if from != nil && to != nil && to.Path() == path {
-						result = append(result, parentCommit{parent, from.Path()})
-						break
-					}
-				}
-			}
-		}
-	}
-}
-
-func blobHash(path string, commit *object.Commit) (plumbing.Hash, error) {
-	file, err := commit.File(path)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-	return file.Hash, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/common.go b/vendor/github.com/jesseduffield/go-git/v5/common.go
deleted file mode 100644
index 6174339a8..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/common.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package git
-
-import "strings"
-
-// countLines returns the number of lines in a string à la git, this is
-// The newline character is assumed to be '\n'.  The empty string
-// contains 0 lines.  If the last line of the string doesn't end with a
-// newline, it will still be considered a line.
-func countLines(s string) int {
-	if s == "" {
-		return 0
-	}
-
-	nEOL := strings.Count(s, "\n")
-	if strings.HasSuffix(s, "\n") {
-		return nEOL
-	}
-
-	return nEOL + 1
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/config/branch.go b/vendor/github.com/jesseduffield/go-git/v5/config/branch.go
deleted file mode 100644
index f70957250..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/config/branch.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package config
-
-import (
-	"errors"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	format "github.com/jesseduffield/go-git/v5/plumbing/format/config"
-)
-
-var (
-	errBranchEmptyName     = errors.New("branch config: empty name")
-	errBranchInvalidMerge  = errors.New("branch config: invalid merge")
-	errBranchInvalidRebase = errors.New("branch config: rebase must be one of 'true' or 'interactive'")
-)
-
-// Branch contains information on the
-// local branches and which remote to track
-type Branch struct {
-	// Name of branch
-	Name string
-	// Remote name of remote to track
-	Remote string
-	// Merge is the local refspec for the branch
-	Merge plumbing.ReferenceName
-	// Rebase instead of merge when pulling. Valid values are
-	// "true" and "interactive".  "false" is undocumented and
-	// typically represented by the non-existence of this field
-	Rebase string
-	// Description explains what the branch is for.
-	// Multi-line explanations may be used.
-	//
-	// Original git command to edit:
-	//	git branch --edit-description
-	Description string
-
-	raw *format.Subsection
-}
-
-// Validate validates fields of branch
-func (b *Branch) Validate() error {
-	if b.Name == "" {
-		return errBranchEmptyName
-	}
-
-	if b.Merge != "" && !b.Merge.IsBranch() {
-		return errBranchInvalidMerge
-	}
-
-	if b.Rebase != "" &&
-		b.Rebase != "true" &&
-		b.Rebase != "interactive" &&
-		b.Rebase != "false" {
-		return errBranchInvalidRebase
-	}
-
-	return plumbing.NewBranchReferenceName(b.Name).Validate()
-}
-
-func (b *Branch) marshal() *format.Subsection {
-	if b.raw == nil {
-		b.raw = &format.Subsection{}
-	}
-
-	b.raw.Name = b.Name
-
-	if b.Remote == "" {
-		b.raw.RemoveOption(remoteSection)
-	} else {
-		b.raw.SetOption(remoteSection, b.Remote)
-	}
-
-	if b.Merge == "" {
-		b.raw.RemoveOption(mergeKey)
-	} else {
-		b.raw.SetOption(mergeKey, string(b.Merge))
-	}
-
-	if b.Rebase == "" {
-		b.raw.RemoveOption(rebaseKey)
-	} else {
-		b.raw.SetOption(rebaseKey, b.Rebase)
-	}
-
-	if b.Description == "" {
-		b.raw.RemoveOption(descriptionKey)
-	} else {
-		desc := quoteDescription(b.Description)
-		b.raw.SetOption(descriptionKey, desc)
-	}
-
-	return b.raw
-}
-
-// hack to trigger conditional quoting in the
-// plumbing/format/config/Encoder.encodeOptions
-//
-// Current Encoder implementation uses Go %q format if value contains a backslash character,
-// which is not consistent with reference git implementation.
-// git just replaces newline characters with \n, while Encoder prints them directly.
-// Until value quoting fix, we should escape description value by replacing newline characters with \n.
-func quoteDescription(desc string) string {
-	return strings.ReplaceAll(desc, "\n", `\n`)
-}
-
-func (b *Branch) unmarshal(s *format.Subsection) error {
-	b.raw = s
-
-	b.Name = b.raw.Name
-	b.Remote = b.raw.Options.Get(remoteSection)
-	b.Merge = plumbing.ReferenceName(b.raw.Options.Get(mergeKey))
-	b.Rebase = b.raw.Options.Get(rebaseKey)
-	b.Description = unquoteDescription(b.raw.Options.Get(descriptionKey))
-
-	return nil
-}
-
-// hack to enable conditional quoting in the
-// plumbing/format/config/Encoder.encodeOptions
-// goto quoteDescription for details.
-func unquoteDescription(desc string) string {
-	return strings.ReplaceAll(desc, `\n`, "\n")
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/config/config.go b/vendor/github.com/jesseduffield/go-git/v5/config/config.go
deleted file mode 100644
index 083c0813e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/config/config.go
+++ /dev/null
@@ -1,698 +0,0 @@
-// Package config contains the abstraction of multiple config files
-package config
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-
-	"github.com/go-git/go-billy/v5/osfs"
-	"github.com/jesseduffield/go-git/v5/internal/url"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	format "github.com/jesseduffield/go-git/v5/plumbing/format/config"
-)
-
-const (
-	// DefaultFetchRefSpec is the default refspec used for fetch.
-	DefaultFetchRefSpec = "+refs/heads/*:refs/remotes/%s/*"
-	// DefaultPushRefSpec is the default refspec used for push.
-	DefaultPushRefSpec = "refs/heads/*:refs/heads/*"
-)
-
-// ConfigStorer generic storage of Config object
-type ConfigStorer interface {
-	Config() (*Config, error)
-	SetConfig(*Config) error
-}
-
-var (
-	ErrInvalid               = errors.New("config invalid key in remote or branch")
-	ErrRemoteConfigNotFound  = errors.New("remote config not found")
-	ErrRemoteConfigEmptyURL  = errors.New("remote config: empty URL")
-	ErrRemoteConfigEmptyName = errors.New("remote config: empty name")
-)
-
-// Scope defines the scope of a config file, such as local, global or system.
-type Scope int
-
-// Available ConfigScope's
-const (
-	LocalScope Scope = iota
-	GlobalScope
-	SystemScope
-)
-
-// Config contains the repository configuration
-// https://www.kernel.org/pub/software/scm/git/docs/git-config.html#FILES
-type Config struct {
-	Core struct {
-		// IsBare if true this repository is assumed to be bare and has no
-		// working directory associated with it.
-		IsBare bool
-		// Worktree is the path to the root of the working tree.
-		Worktree string
-		// CommentChar is the character indicating the start of a
-		// comment for commands like commit and tag
-		CommentChar string
-		// RepositoryFormatVersion identifies the repository format and layout version.
-		RepositoryFormatVersion format.RepositoryFormatVersion
-	}
-
-	User struct {
-		// Name is the personal name of the author and the committer of a commit.
-		Name string
-		// Email is the email of the author and the committer of a commit.
-		Email string
-	}
-
-	Author struct {
-		// Name is the personal name of the author of a commit.
-		Name string
-		// Email is the email of the author of a commit.
-		Email string
-	}
-
-	Committer struct {
-		// Name is the personal name of the committer of a commit.
-		Name string
-		// Email is the email of the committer of a commit.
-		Email string
-	}
-
-	Pack struct {
-		// Window controls the size of the sliding window for delta
-		// compression.  The default is 10.  A value of 0 turns off
-		// delta compression entirely.
-		Window uint
-	}
-
-	Init struct {
-		// DefaultBranch Allows overriding the default branch name
-		// e.g. when initializing a new repository or when cloning
-		// an empty repository.
-		DefaultBranch string
-	}
-
-	Extensions struct {
-		// ObjectFormat specifies the hash algorithm to use. The
-		// acceptable values are sha1 and sha256. If not specified,
-		// sha1 is assumed. It is an error to specify this key unless
-		// core.repositoryFormatVersion is 1.
-		//
-		// This setting must not be changed after repository initialization
-		// (e.g. clone or init).
-		ObjectFormat format.ObjectFormat
-	}
-
-	// Remotes list of repository remotes, the key of the map is the name
-	// of the remote, should equal to RemoteConfig.Name.
-	Remotes map[string]*RemoteConfig
-	// Submodules list of repository submodules, the key of the map is the name
-	// of the submodule, should equal to Submodule.Name.
-	Submodules map[string]*Submodule
-	// Branches list of branches, the key is the branch name and should
-	// equal Branch.Name
-	Branches map[string]*Branch
-	// URLs list of url rewrite rules, if repo url starts with URL.InsteadOf value, it will be replaced with the
-	// key instead.
-	URLs map[string]*URL
-	// Raw contains the raw information of a config file. The main goal is
-	// preserve the parsed information from the original format, to avoid
-	// dropping unsupported fields.
-	Raw *format.Config
-}
-
-// NewConfig returns a new empty Config.
-func NewConfig() *Config {
-	config := &Config{
-		Remotes:    make(map[string]*RemoteConfig),
-		Submodules: make(map[string]*Submodule),
-		Branches:   make(map[string]*Branch),
-		URLs:       make(map[string]*URL),
-		Raw:        format.New(),
-	}
-
-	config.Pack.Window = DefaultPackWindow
-
-	return config
-}
-
-// ReadConfig reads a config file from a io.Reader.
-func ReadConfig(r io.Reader) (*Config, error) {
-	b, err := io.ReadAll(r)
-	if err != nil {
-		return nil, err
-	}
-
-	cfg := NewConfig()
-	if err = cfg.Unmarshal(b); err != nil {
-		return nil, err
-	}
-
-	return cfg, nil
-}
-
-// LoadConfig loads a config file from a given scope. The returned Config,
-// contains exclusively information from the given scope. If it couldn't find a
-// config file to the given scope, an empty one is returned.
-func LoadConfig(scope Scope) (*Config, error) {
-	if scope == LocalScope {
-		return nil, fmt.Errorf("LocalScope should be read from the a ConfigStorer")
-	}
-
-	files, err := Paths(scope)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, file := range files {
-		f, err := osfs.Default.Open(file)
-		if err != nil {
-			if os.IsNotExist(err) {
-				continue
-			}
-
-			return nil, err
-		}
-
-		defer f.Close()
-		return ReadConfig(f)
-	}
-
-	return NewConfig(), nil
-}
-
-// Paths returns the config file location for a given scope.
-func Paths(scope Scope) ([]string, error) {
-	var files []string
-	switch scope {
-	case GlobalScope:
-		xdg := os.Getenv("XDG_CONFIG_HOME")
-		if xdg != "" {
-			files = append(files, filepath.Join(xdg, "git/config"))
-		}
-
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return nil, err
-		}
-
-		files = append(files,
-			filepath.Join(home, ".gitconfig"),
-			filepath.Join(home, ".config/git/config"),
-		)
-	case SystemScope:
-		files = append(files, "/etc/gitconfig")
-	}
-
-	return files, nil
-}
-
-// Validate validates the fields and sets the default values.
-func (c *Config) Validate() error {
-	for name, r := range c.Remotes {
-		if r.Name != name {
-			return ErrInvalid
-		}
-
-		if err := r.Validate(); err != nil {
-			return err
-		}
-	}
-
-	for name, b := range c.Branches {
-		if b.Name != name {
-			return ErrInvalid
-		}
-
-		if err := b.Validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-const (
-	remoteSection              = "remote"
-	submoduleSection           = "submodule"
-	branchSection              = "branch"
-	coreSection                = "core"
-	packSection                = "pack"
-	userSection                = "user"
-	authorSection              = "author"
-	committerSection           = "committer"
-	initSection                = "init"
-	urlSection                 = "url"
-	extensionsSection          = "extensions"
-	fetchKey                   = "fetch"
-	urlKey                     = "url"
-	pushurlKey                 = "pushurl"
-	bareKey                    = "bare"
-	worktreeKey                = "worktree"
-	commentCharKey             = "commentChar"
-	windowKey                  = "window"
-	mergeKey                   = "merge"
-	rebaseKey                  = "rebase"
-	nameKey                    = "name"
-	emailKey                   = "email"
-	descriptionKey             = "description"
-	defaultBranchKey           = "defaultBranch"
-	repositoryFormatVersionKey = "repositoryformatversion"
-	objectFormat               = "objectformat"
-	mirrorKey                  = "mirror"
-
-	// DefaultPackWindow holds the number of previous objects used to
-	// generate deltas. The value 10 is the same used by git command.
-	DefaultPackWindow = uint(10)
-)
-
-// Unmarshal parses a git-config file and stores it.
-func (c *Config) Unmarshal(b []byte) error {
-	r := bytes.NewBuffer(b)
-	d := format.NewDecoder(r)
-
-	c.Raw = format.New()
-	if err := d.Decode(c.Raw); err != nil {
-		return err
-	}
-
-	c.unmarshalCore()
-	c.unmarshalUser()
-	c.unmarshalInit()
-	if err := c.unmarshalPack(); err != nil {
-		return err
-	}
-	unmarshalSubmodules(c.Raw, c.Submodules)
-
-	if err := c.unmarshalBranches(); err != nil {
-		return err
-	}
-
-	if err := c.unmarshalURLs(); err != nil {
-		return err
-	}
-
-	return c.unmarshalRemotes()
-}
-
-func (c *Config) unmarshalCore() {
-	s := c.Raw.Section(coreSection)
-	if s.Options.Get(bareKey) == "true" {
-		c.Core.IsBare = true
-	}
-
-	c.Core.Worktree = s.Options.Get(worktreeKey)
-	c.Core.CommentChar = s.Options.Get(commentCharKey)
-}
-
-func (c *Config) unmarshalUser() {
-	s := c.Raw.Section(userSection)
-	c.User.Name = s.Options.Get(nameKey)
-	c.User.Email = s.Options.Get(emailKey)
-
-	s = c.Raw.Section(authorSection)
-	c.Author.Name = s.Options.Get(nameKey)
-	c.Author.Email = s.Options.Get(emailKey)
-
-	s = c.Raw.Section(committerSection)
-	c.Committer.Name = s.Options.Get(nameKey)
-	c.Committer.Email = s.Options.Get(emailKey)
-}
-
-func (c *Config) unmarshalPack() error {
-	s := c.Raw.Section(packSection)
-	window := s.Options.Get(windowKey)
-	if window == "" {
-		c.Pack.Window = DefaultPackWindow
-	} else {
-		winUint, err := strconv.ParseUint(window, 10, 32)
-		if err != nil {
-			return err
-		}
-		c.Pack.Window = uint(winUint)
-	}
-	return nil
-}
-
-func (c *Config) unmarshalRemotes() error {
-	s := c.Raw.Section(remoteSection)
-	for _, sub := range s.Subsections {
-		r := &RemoteConfig{}
-		if err := r.unmarshal(sub); err != nil {
-			return err
-		}
-
-		c.Remotes[r.Name] = r
-	}
-
-	// Apply insteadOf url rules
-	for _, r := range c.Remotes {
-		r.applyURLRules(c.URLs)
-	}
-
-	return nil
-}
-
-func (c *Config) unmarshalURLs() error {
-	s := c.Raw.Section(urlSection)
-	for _, sub := range s.Subsections {
-		r := &URL{}
-		if err := r.unmarshal(sub); err != nil {
-			return err
-		}
-
-		c.URLs[r.Name] = r
-	}
-
-	return nil
-}
-
-func unmarshalSubmodules(fc *format.Config, submodules map[string]*Submodule) {
-	s := fc.Section(submoduleSection)
-	for _, sub := range s.Subsections {
-		m := &Submodule{}
-		m.unmarshal(sub)
-
-		if m.Validate() == ErrModuleBadPath {
-			continue
-		}
-
-		submodules[m.Name] = m
-	}
-}
-
-func (c *Config) unmarshalBranches() error {
-	bs := c.Raw.Section(branchSection)
-	for _, sub := range bs.Subsections {
-		b := &Branch{}
-
-		if err := b.unmarshal(sub); err != nil {
-			return err
-		}
-
-		c.Branches[b.Name] = b
-	}
-	return nil
-}
-
-func (c *Config) unmarshalInit() {
-	s := c.Raw.Section(initSection)
-	c.Init.DefaultBranch = s.Options.Get(defaultBranchKey)
-}
-
-// Marshal returns Config encoded as a git-config file.
-func (c *Config) Marshal() ([]byte, error) {
-	c.marshalCore()
-	c.marshalExtensions()
-	c.marshalUser()
-	c.marshalPack()
-	c.marshalRemotes()
-	c.marshalSubmodules()
-	c.marshalBranches()
-	c.marshalURLs()
-	c.marshalInit()
-
-	buf := bytes.NewBuffer(nil)
-	if err := format.NewEncoder(buf).Encode(c.Raw); err != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-func (c *Config) marshalCore() {
-	s := c.Raw.Section(coreSection)
-	s.SetOption(bareKey, fmt.Sprintf("%t", c.Core.IsBare))
-	if string(c.Core.RepositoryFormatVersion) != "" {
-		s.SetOption(repositoryFormatVersionKey, string(c.Core.RepositoryFormatVersion))
-	}
-
-	if c.Core.Worktree != "" {
-		s.SetOption(worktreeKey, c.Core.Worktree)
-	}
-}
-
-func (c *Config) marshalExtensions() {
-	// Extensions are only supported on Version 1, therefore
-	// ignore them otherwise.
-	if c.Core.RepositoryFormatVersion == format.Version_1 {
-		s := c.Raw.Section(extensionsSection)
-		s.SetOption(objectFormat, string(c.Extensions.ObjectFormat))
-	}
-}
-
-func (c *Config) marshalUser() {
-	s := c.Raw.Section(userSection)
-	if c.User.Name != "" {
-		s.SetOption(nameKey, c.User.Name)
-	}
-
-	if c.User.Email != "" {
-		s.SetOption(emailKey, c.User.Email)
-	}
-
-	s = c.Raw.Section(authorSection)
-	if c.Author.Name != "" {
-		s.SetOption(nameKey, c.Author.Name)
-	}
-
-	if c.Author.Email != "" {
-		s.SetOption(emailKey, c.Author.Email)
-	}
-
-	s = c.Raw.Section(committerSection)
-	if c.Committer.Name != "" {
-		s.SetOption(nameKey, c.Committer.Name)
-	}
-
-	if c.Committer.Email != "" {
-		s.SetOption(emailKey, c.Committer.Email)
-	}
-}
-
-func (c *Config) marshalPack() {
-	s := c.Raw.Section(packSection)
-	if c.Pack.Window != DefaultPackWindow {
-		s.SetOption(windowKey, fmt.Sprintf("%d", c.Pack.Window))
-	}
-}
-
-func (c *Config) marshalRemotes() {
-	s := c.Raw.Section(remoteSection)
-	newSubsections := make(format.Subsections, 0, len(c.Remotes))
-	added := make(map[string]bool)
-	for _, subsection := range s.Subsections {
-		if remote, ok := c.Remotes[subsection.Name]; ok {
-			newSubsections = append(newSubsections, remote.marshal())
-			added[subsection.Name] = true
-		}
-	}
-
-	remoteNames := make([]string, 0, len(c.Remotes))
-	for name := range c.Remotes {
-		remoteNames = append(remoteNames, name)
-	}
-
-	sort.Strings(remoteNames)
-
-	for _, name := range remoteNames {
-		if !added[name] {
-			newSubsections = append(newSubsections, c.Remotes[name].marshal())
-		}
-	}
-
-	s.Subsections = newSubsections
-}
-
-func (c *Config) marshalSubmodules() {
-	s := c.Raw.Section(submoduleSection)
-	s.Subsections = make(format.Subsections, len(c.Submodules))
-
-	var i int
-	for _, r := range c.Submodules {
-		section := r.marshal()
-		// the submodule section at config is a subset of the .gitmodule file
-		// we should remove the non-valid options for the config file.
-		section.RemoveOption(pathKey)
-		s.Subsections[i] = section
-		i++
-	}
-}
-
-func (c *Config) marshalBranches() {
-	s := c.Raw.Section(branchSection)
-	newSubsections := make(format.Subsections, 0, len(c.Branches))
-	added := make(map[string]bool)
-	for _, subsection := range s.Subsections {
-		if branch, ok := c.Branches[subsection.Name]; ok {
-			newSubsections = append(newSubsections, branch.marshal())
-			added[subsection.Name] = true
-		}
-	}
-
-	branchNames := make([]string, 0, len(c.Branches))
-	for name := range c.Branches {
-		branchNames = append(branchNames, name)
-	}
-
-	sort.Strings(branchNames)
-
-	for _, name := range branchNames {
-		if !added[name] {
-			newSubsections = append(newSubsections, c.Branches[name].marshal())
-		}
-	}
-
-	s.Subsections = newSubsections
-}
-
-func (c *Config) marshalURLs() {
-	s := c.Raw.Section(urlSection)
-	s.Subsections = make(format.Subsections, len(c.URLs))
-
-	var i int
-	for _, r := range c.URLs {
-		section := r.marshal()
-		// the submodule section at config is a subset of the .gitmodule file
-		// we should remove the non-valid options for the config file.
-		s.Subsections[i] = section
-		i++
-	}
-}
-
-func (c *Config) marshalInit() {
-	s := c.Raw.Section(initSection)
-	if c.Init.DefaultBranch != "" {
-		s.SetOption(defaultBranchKey, c.Init.DefaultBranch)
-	}
-}
-
-// RemoteConfig contains the configuration for a given remote repository.
-type RemoteConfig struct {
-	// Name of the remote
-	Name string
-	// URLs the URLs of a remote repository. It must be non-empty. Fetch will
-	// always use the first URL, while push will use all of them.
-	URLs []string
-	// Mirror indicates that the repository is a mirror of remote.
-	Mirror bool
-
-	// insteadOfRulesApplied have urls been modified
-	insteadOfRulesApplied bool
-	// originalURLs are the urls before applying insteadOf rules
-	originalURLs []string
-
-	// Fetch the default set of "refspec" for fetch operation
-	Fetch []RefSpec
-
-	// raw representation of the subsection, filled by marshal or unmarshal are
-	// called
-	raw *format.Subsection
-}
-
-// Validate validates the fields and sets the default values.
-func (c *RemoteConfig) Validate() error {
-	if c.Name == "" {
-		return ErrRemoteConfigEmptyName
-	}
-
-	if len(c.URLs) == 0 {
-		return ErrRemoteConfigEmptyURL
-	}
-
-	for _, r := range c.Fetch {
-		if err := r.Validate(); err != nil {
-			return err
-		}
-	}
-
-	if len(c.Fetch) == 0 {
-		c.Fetch = []RefSpec{RefSpec(fmt.Sprintf(DefaultFetchRefSpec, c.Name))}
-	}
-
-	return plumbing.NewRemoteHEADReferenceName(c.Name).Validate()
-}
-
-func (c *RemoteConfig) unmarshal(s *format.Subsection) error {
-	c.raw = s
-
-	fetch := []RefSpec{}
-	for _, f := range c.raw.Options.GetAll(fetchKey) {
-		rs := RefSpec(f)
-		if err := rs.Validate(); err != nil {
-			return err
-		}
-
-		fetch = append(fetch, rs)
-	}
-
-	c.Name = c.raw.Name
-	c.URLs = append([]string(nil), c.raw.Options.GetAll(urlKey)...)
-	c.URLs = append(c.URLs, c.raw.Options.GetAll(pushurlKey)...)
-	c.Fetch = fetch
-	c.Mirror = c.raw.Options.Get(mirrorKey) == "true"
-
-	return nil
-}
-
-func (c *RemoteConfig) marshal() *format.Subsection {
-	if c.raw == nil {
-		c.raw = &format.Subsection{}
-	}
-
-	c.raw.Name = c.Name
-	if len(c.URLs) == 0 {
-		c.raw.RemoveOption(urlKey)
-	} else {
-		urls := c.URLs
-		if c.insteadOfRulesApplied {
-			urls = c.originalURLs
-		}
-
-		c.raw.SetOption(urlKey, urls...)
-	}
-
-	if len(c.Fetch) == 0 {
-		c.raw.RemoveOption(fetchKey)
-	} else {
-		var values []string
-		for _, rs := range c.Fetch {
-			values = append(values, rs.String())
-		}
-
-		c.raw.SetOption(fetchKey, values...)
-	}
-
-	if c.Mirror {
-		c.raw.SetOption(mirrorKey, strconv.FormatBool(c.Mirror))
-	}
-
-	return c.raw
-}
-
-func (c *RemoteConfig) IsFirstURLLocal() bool {
-	return url.IsLocalEndpoint(c.URLs[0])
-}
-
-func (c *RemoteConfig) applyURLRules(urlRules map[string]*URL) {
-	// save original urls
-	originalURLs := make([]string, len(c.URLs))
-	copy(originalURLs, c.URLs)
-
-	for i, url := range c.URLs {
-		if matchingURLRule := findLongestInsteadOfMatch(url, urlRules); matchingURLRule != nil {
-			c.URLs[i] = matchingURLRule.ApplyInsteadOf(c.URLs[i])
-			c.insteadOfRulesApplied = true
-		}
-	}
-
-	if c.insteadOfRulesApplied {
-		c.originalURLs = originalURLs
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/config/modules.go b/vendor/github.com/jesseduffield/go-git/v5/config/modules.go
deleted file mode 100644
index 898e2d9ec..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/config/modules.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package config
-
-import (
-	"bytes"
-	"errors"
-	"regexp"
-
-	format "github.com/jesseduffield/go-git/v5/plumbing/format/config"
-)
-
-var (
-	ErrModuleEmptyURL  = errors.New("module config: empty URL")
-	ErrModuleEmptyPath = errors.New("module config: empty path")
-	ErrModuleBadPath   = errors.New("submodule has an invalid path")
-)
-
-var (
-	// Matches module paths with dotdot ".." components.
-	dotdotPath = regexp.MustCompile(`(^|[/\\])\.\.([/\\]|$)`)
-)
-
-// Modules defines the submodules properties, represents a .gitmodules file
-// https://www.kernel.org/pub/software/scm/git/docs/gitmodules.html
-type Modules struct {
-	// Submodules is a map of submodules being the key the name of the submodule.
-	Submodules map[string]*Submodule
-
-	raw *format.Config
-}
-
-// NewModules returns a new empty Modules
-func NewModules() *Modules {
-	return &Modules{
-		Submodules: make(map[string]*Submodule),
-		raw:        format.New(),
-	}
-}
-
-const (
-	pathKey   = "path"
-	branchKey = "branch"
-)
-
-// Unmarshal parses a git-config file and stores it.
-func (m *Modules) Unmarshal(b []byte) error {
-	r := bytes.NewBuffer(b)
-	d := format.NewDecoder(r)
-
-	m.raw = format.New()
-	if err := d.Decode(m.raw); err != nil {
-		return err
-	}
-
-	unmarshalSubmodules(m.raw, m.Submodules)
-	return nil
-}
-
-// Marshal returns Modules encoded as a git-config file.
-func (m *Modules) Marshal() ([]byte, error) {
-	s := m.raw.Section(submoduleSection)
-	s.Subsections = make(format.Subsections, len(m.Submodules))
-
-	var i int
-	for _, r := range m.Submodules {
-		s.Subsections[i] = r.marshal()
-		i++
-	}
-
-	buf := bytes.NewBuffer(nil)
-	if err := format.NewEncoder(buf).Encode(m.raw); err != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-// Submodule defines a submodule.
-type Submodule struct {
-	// Name module name
-	Name string
-	// Path defines the path, relative to the top-level directory of the Git
-	// working tree.
-	Path string
-	// URL defines a URL from which the submodule repository can be cloned.
-	URL string
-	// Branch is a remote branch name for tracking updates in the upstream
-	// submodule. Optional value.
-	Branch string
-
-	// raw representation of the subsection, filled by marshal or unmarshal are
-	// called.
-	raw *format.Subsection
-}
-
-// Validate validates the fields and sets the default values.
-func (m *Submodule) Validate() error {
-	if m.Path == "" {
-		return ErrModuleEmptyPath
-	}
-
-	if m.URL == "" {
-		return ErrModuleEmptyURL
-	}
-
-	if dotdotPath.MatchString(m.Path) {
-		return ErrModuleBadPath
-	}
-
-	return nil
-}
-
-func (m *Submodule) unmarshal(s *format.Subsection) {
-	m.raw = s
-
-	m.Name = m.raw.Name
-	m.Path = m.raw.Option(pathKey)
-	m.URL = m.raw.Option(urlKey)
-	m.Branch = m.raw.Option(branchKey)
-}
-
-func (m *Submodule) marshal() *format.Subsection {
-	if m.raw == nil {
-		m.raw = &format.Subsection{}
-	}
-
-	m.raw.Name = m.Name
-	if m.raw.Name == "" {
-		m.raw.Name = m.Path
-	}
-
-	m.raw.SetOption(pathKey, m.Path)
-	m.raw.SetOption(urlKey, m.URL)
-
-	if m.Branch != "" {
-		m.raw.SetOption(branchKey, m.Branch)
-	}
-
-	return m.raw
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/config/refspec.go b/vendor/github.com/jesseduffield/go-git/v5/config/refspec.go
deleted file mode 100644
index 9df1b9fd0..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/config/refspec.go
+++ /dev/null
@@ -1,180 +0,0 @@
-package config
-
-import (
-	"errors"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-const (
-	refSpecWildcard  = "*"
-	refSpecForce     = "+"
-	refSpecSeparator = ":"
-	refSpecNegative  = "^"
-)
-
-var (
-	ErrRefSpecMalformedSeparator = errors.New("malformed refspec, separators are wrong")
-	ErrRefSpecMalformedWildcard  = errors.New("malformed refspec, mismatched number of wildcards")
-	ErrRefSpecMalformedNegative  = errors.New("malformed negative refspec, one ^ and no separators allowed")
-)
-
-// RefSpec is a mapping from local branches to remote references.
-// The format of the refspec is an optional +, followed by :, where
-//  is the pattern for references on the remote side and  is where
-// those references will be written locally. The + tells Git to update the
-// reference even if it isn’t a fast-forward.
-// eg.: "+refs/heads/*:refs/remotes/origin/*"
-//
-// https://git-scm.com/book/en/v2/Git-Internals-The-Refspec
-type RefSpec string
-
-// Validate validates the RefSpec
-func (s RefSpec) Validate() error {
-	spec := string(s)
-
-	if strings.Index(spec, refSpecNegative) == 0 {
-		// This is a negative refspec
-		if strings.Count(spec, refSpecNegative) != 1 {
-			return ErrRefSpecMalformedNegative
-		}
-
-		if strings.Count(spec, refSpecSeparator) != 0 {
-			return ErrRefSpecMalformedNegative
-		}
-
-		if strings.Count(spec, refSpecWildcard) > 1 {
-			return ErrRefSpecMalformedWildcard
-		}
-
-		return nil
-	}
-
-	if strings.Count(spec, refSpecSeparator) != 1 {
-		return ErrRefSpecMalformedSeparator
-	}
-
-	sep := strings.Index(spec, refSpecSeparator)
-	if sep == len(spec)-1 {
-		return ErrRefSpecMalformedSeparator
-	}
-
-	ws := strings.Count(spec[0:sep], refSpecWildcard)
-	wd := strings.Count(spec[sep+1:], refSpecWildcard)
-	if ws == wd && ws < 2 && wd < 2 {
-		return nil
-	}
-
-	return ErrRefSpecMalformedWildcard
-}
-
-// IsForceUpdate returns if update is allowed in non fast-forward merges.
-func (s RefSpec) IsForceUpdate() bool {
-	return s[0] == refSpecForce[0]
-}
-
-// IsDelete returns true if the refspec indicates a delete (empty src).
-func (s RefSpec) IsDelete() bool {
-	return s[0] == refSpecSeparator[0]
-}
-
-// IsExactSHA1 returns true if the source is a SHA1 hash.
-func (s RefSpec) IsExactSHA1() bool {
-	return plumbing.IsHash(s.Src())
-}
-
-// IsNegative returns if the refspec is a negative one
-func (s RefSpec) IsNegative() bool {
-	return s[0] == refSpecNegative[0]
-}
-
-// Src returns the src side.
-func (s RefSpec) Src() string {
-	spec := string(s)
-
-	var start int
-	if s.IsForceUpdate() || s.IsNegative() {
-		start = 1
-	} else {
-		start = 0
-	}
-
-	end := strings.Index(spec, refSpecSeparator)
-	return spec[start:end]
-}
-
-// Match match the given plumbing.ReferenceName against the source.
-func (s RefSpec) Match(n plumbing.ReferenceName) bool {
-	if !s.IsWildcard() {
-		return s.matchExact(n)
-	}
-
-	return s.matchGlob(n)
-}
-
-// IsWildcard returns true if the RefSpec contains a wildcard.
-func (s RefSpec) IsWildcard() bool {
-	return strings.Contains(string(s), refSpecWildcard)
-}
-
-func (s RefSpec) matchExact(n plumbing.ReferenceName) bool {
-	return s.Src() == n.String()
-}
-
-func (s RefSpec) matchGlob(n plumbing.ReferenceName) bool {
-	src := s.Src()
-	name := n.String()
-	wildcard := strings.Index(src, refSpecWildcard)
-
-	var prefix, suffix string
-	prefix = src[0:wildcard]
-	if len(src) > wildcard+1 {
-		suffix = src[wildcard+1:]
-	}
-
-	return len(name) >= len(prefix)+len(suffix) &&
-		strings.HasPrefix(name, prefix) &&
-		strings.HasSuffix(name, suffix)
-}
-
-// Dst returns the destination for the given remote reference.
-func (s RefSpec) Dst(n plumbing.ReferenceName) plumbing.ReferenceName {
-	spec := string(s)
-	start := strings.Index(spec, refSpecSeparator) + 1
-	dst := spec[start:]
-	src := s.Src()
-
-	if !s.IsWildcard() {
-		return plumbing.ReferenceName(dst)
-	}
-
-	name := n.String()
-	ws := strings.Index(src, refSpecWildcard)
-	wd := strings.Index(dst, refSpecWildcard)
-	match := name[ws : len(name)-(len(src)-(ws+1))]
-
-	return plumbing.ReferenceName(dst[0:wd] + match + dst[wd+1:])
-}
-
-func (s RefSpec) Reverse() RefSpec {
-	spec := string(s)
-	separator := strings.Index(spec, refSpecSeparator)
-
-	return RefSpec(spec[separator+1:] + refSpecSeparator + spec[:separator])
-}
-
-func (s RefSpec) String() string {
-	return string(s)
-}
-
-// MatchAny returns true if any of the RefSpec match with the given ReferenceName.
-func MatchAny(l []RefSpec, n plumbing.ReferenceName) bool {
-	for _, r := range l {
-		if r.Match(n) {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/config/url.go b/vendor/github.com/jesseduffield/go-git/v5/config/url.go
deleted file mode 100644
index 3cefe2f27..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/config/url.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package config
-
-import (
-	"errors"
-	"strings"
-
-	format "github.com/jesseduffield/go-git/v5/plumbing/format/config"
-)
-
-var (
-	errURLEmptyInsteadOf = errors.New("url config: empty insteadOf")
-)
-
-// Url defines Url rewrite rules
-type URL struct {
-	// Name new base url
-	Name string
-	// Any URL that starts with this value will be rewritten to start, instead, with .
-	// When more than one insteadOf strings match a given URL, the longest match is used.
-	InsteadOf string
-
-	// raw representation of the subsection, filled by marshal or unmarshal are
-	// called.
-	raw *format.Subsection
-}
-
-// Validate validates fields of branch
-func (b *URL) Validate() error {
-	if b.InsteadOf == "" {
-		return errURLEmptyInsteadOf
-	}
-
-	return nil
-}
-
-const (
-	insteadOfKey = "insteadOf"
-)
-
-func (u *URL) unmarshal(s *format.Subsection) error {
-	u.raw = s
-
-	u.Name = s.Name
-	u.InsteadOf = u.raw.Option(insteadOfKey)
-	return nil
-}
-
-func (u *URL) marshal() *format.Subsection {
-	if u.raw == nil {
-		u.raw = &format.Subsection{}
-	}
-
-	u.raw.Name = u.Name
-	u.raw.SetOption(insteadOfKey, u.InsteadOf)
-
-	return u.raw
-}
-
-func findLongestInsteadOfMatch(remoteURL string, urls map[string]*URL) *URL {
-	var longestMatch *URL
-	for _, u := range urls {
-		if !strings.HasPrefix(remoteURL, u.InsteadOf) {
-			continue
-		}
-
-		// according to spec if there is more than one match, take the logest
-		if longestMatch == nil || len(longestMatch.InsteadOf) < len(u.InsteadOf) {
-			longestMatch = u
-		}
-	}
-
-	return longestMatch
-}
-
-func (u *URL) ApplyInsteadOf(url string) string {
-	if !strings.HasPrefix(url, u.InsteadOf) {
-		return url
-	}
-
-	return u.Name + url[len(u.InsteadOf):]
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/doc.go b/vendor/github.com/jesseduffield/go-git/v5/doc.go
deleted file mode 100644
index 3d817fe9c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/doc.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// A highly extensible git implementation in pure Go.
-//
-// go-git aims to reach the completeness of libgit2 or jgit, nowadays covers the
-// majority of the plumbing read operations and some of the main write
-// operations, but lacks the main porcelain operations such as merges.
-//
-// It is highly extensible, we have been following the open/close principle in
-// its design to facilitate extensions, mainly focusing the efforts on the
-// persistence of the objects.
-package git
diff --git a/vendor/github.com/jesseduffield/go-git/v5/internal/path_util/path_util.go b/vendor/github.com/jesseduffield/go-git/v5/internal/path_util/path_util.go
deleted file mode 100644
index 48e4a3d0e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/internal/path_util/path_util.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package path_util
-
-import (
-	"os"
-	"os/user"
-	"strings"
-)
-
-func ReplaceTildeWithHome(path string) (string, error) {
-	if strings.HasPrefix(path, "~") {
-		firstSlash := strings.Index(path, "/")
-		if firstSlash == 1 {
-			home, err := os.UserHomeDir()
-			if err != nil {
-				return path, err
-			}
-			return strings.Replace(path, "~", home, 1), nil
-		} else if firstSlash > 1 {
-			username := path[1:firstSlash]
-			userAccount, err := user.Lookup(username)
-			if err != nil {
-				return path, err
-			}
-			return strings.Replace(path, path[:firstSlash], userAccount.HomeDir, 1), nil
-		}
-	}
-
-	return path, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/internal/revision/parser.go b/vendor/github.com/jesseduffield/go-git/v5/internal/revision/parser.go
deleted file mode 100644
index 8a2a7190e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/internal/revision/parser.go
+++ /dev/null
@@ -1,626 +0,0 @@
-// Package revision extracts git revision from string
-// More information about revision : https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
-package revision
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"regexp"
-	"strconv"
-	"time"
-)
-
-// ErrInvalidRevision is emitted if string doesn't match valid revision
-type ErrInvalidRevision struct {
-	s string
-}
-
-func (e *ErrInvalidRevision) Error() string {
-	return "Revision invalid : " + e.s
-}
-
-// Revisioner represents a revision component.
-// A revision is made of multiple revision components
-// obtained after parsing a revision string,
-// for instance revision "master~" will be converted in
-// two revision components Ref and TildePath
-type Revisioner interface {
-}
-
-// Ref represents a reference name : HEAD, master, 
-type Ref string
-
-// TildePath represents ~, ~{n}
-type TildePath struct {
-	Depth int
-}
-
-// CaretPath represents ^, ^{n}
-type CaretPath struct {
-	Depth int
-}
-
-// CaretReg represents ^{/foo bar}
-type CaretReg struct {
-	Regexp *regexp.Regexp
-	Negate bool
-}
-
-// CaretType represents ^{commit}
-type CaretType struct {
-	ObjectType string
-}
-
-// AtReflog represents @{n}
-type AtReflog struct {
-	Depth int
-}
-
-// AtCheckout represents @{-n}
-type AtCheckout struct {
-	Depth int
-}
-
-// AtUpstream represents @{upstream}, @{u}
-type AtUpstream struct {
-	BranchName string
-}
-
-// AtPush represents @{push}
-type AtPush struct {
-	BranchName string
-}
-
-// AtDate represents @{"2006-01-02T15:04:05Z"}
-type AtDate struct {
-	Date time.Time
-}
-
-// ColonReg represents :/foo bar
-type ColonReg struct {
-	Regexp *regexp.Regexp
-	Negate bool
-}
-
-// ColonPath represents :./ :
-type ColonPath struct {
-	Path string
-}
-
-// ColonStagePath represents ::/
-type ColonStagePath struct {
-	Path  string
-	Stage int
-}
-
-// Parser represents a parser
-// use to tokenize and transform to revisioner chunks
-// a given string
-type Parser struct {
-	s                 *scanner
-	currentParsedChar struct {
-		tok token
-		lit string
-	}
-	unreadLastChar bool
-}
-
-// NewParserFromString returns a new instance of parser from a string.
-func NewParserFromString(s string) *Parser {
-	return NewParser(bytes.NewBufferString(s))
-}
-
-// NewParser returns a new instance of parser.
-func NewParser(r io.Reader) *Parser {
-	return &Parser{s: newScanner(r)}
-}
-
-// scan returns the next token from the underlying scanner
-// or the last scanned token if an unscan was requested
-func (p *Parser) scan() (token, string, error) {
-	if p.unreadLastChar {
-		p.unreadLastChar = false
-		return p.currentParsedChar.tok, p.currentParsedChar.lit, nil
-	}
-
-	tok, lit, err := p.s.scan()
-
-	p.currentParsedChar.tok, p.currentParsedChar.lit = tok, lit
-
-	return tok, lit, err
-}
-
-// unscan pushes the previously read token back onto the buffer.
-func (p *Parser) unscan() { p.unreadLastChar = true }
-
-// Parse explode a revision string into revisioner chunks
-func (p *Parser) Parse() ([]Revisioner, error) {
-	var rev Revisioner
-	var revs []Revisioner
-	var tok token
-	var err error
-
-	for {
-		tok, _, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		switch tok {
-		case at:
-			rev, err = p.parseAt()
-		case tilde:
-			rev, err = p.parseTilde()
-		case caret:
-			rev, err = p.parseCaret()
-		case colon:
-			rev, err = p.parseColon()
-		case eof:
-			err = p.validateFullRevision(&revs)
-
-			if err != nil {
-				return []Revisioner{}, err
-			}
-
-			return revs, nil
-		default:
-			p.unscan()
-			rev, err = p.parseRef()
-		}
-
-		if err != nil {
-			return []Revisioner{}, err
-		}
-
-		revs = append(revs, rev)
-	}
-}
-
-// validateFullRevision ensures all revisioner chunks make a valid revision
-func (p *Parser) validateFullRevision(chunks *[]Revisioner) error {
-	var hasReference bool
-
-	for i, chunk := range *chunks {
-		switch chunk.(type) {
-		case Ref:
-			if i == 0 {
-				hasReference = true
-			} else {
-				return &ErrInvalidRevision{`reference must be defined once at the beginning`}
-			}
-		case AtDate:
-			if len(*chunks) == 1 || hasReference && len(*chunks) == 2 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`"@" statement is not valid, could be : @{}, @{}`}
-		case AtReflog:
-			if len(*chunks) == 1 || hasReference && len(*chunks) == 2 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`"@" statement is not valid, could be : @{}, @{}`}
-		case AtCheckout:
-			if len(*chunks) == 1 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`"@" statement is not valid, could be : @{-}`}
-		case AtUpstream:
-			if len(*chunks) == 1 || hasReference && len(*chunks) == 2 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`"@" statement is not valid, could be : @{upstream}, @{upstream}, @{u}, @{u}`}
-		case AtPush:
-			if len(*chunks) == 1 || hasReference && len(*chunks) == 2 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`"@" statement is not valid, could be : @{push}, @{push}`}
-		case TildePath, CaretPath, CaretReg:
-			if !hasReference {
-				return &ErrInvalidRevision{`"~" or "^" statement must have a reference defined at the beginning`}
-			}
-		case ColonReg:
-			if len(*chunks) == 1 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`":" statement is not valid, could be : :/`}
-		case ColonPath:
-			if i == len(*chunks)-1 && hasReference || len(*chunks) == 1 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`":" statement is not valid, could be : :`}
-		case ColonStagePath:
-			if len(*chunks) == 1 {
-				return nil
-			}
-
-			return &ErrInvalidRevision{`":" statement is not valid, could be : ::`}
-		}
-	}
-
-	return nil
-}
-
-// parseAt extract @ statements
-func (p *Parser) parseAt() (Revisioner, error) {
-	var tok, nextTok token
-	var lit, nextLit string
-	var err error
-
-	tok, _, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	if tok != obrace {
-		p.unscan()
-
-		return Ref("HEAD"), nil
-	}
-
-	tok, lit, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	nextTok, nextLit, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	switch {
-	case tok == word && (lit == "u" || lit == "upstream") && nextTok == cbrace:
-		return AtUpstream{}, nil
-	case tok == word && lit == "push" && nextTok == cbrace:
-		return AtPush{}, nil
-	case tok == number && nextTok == cbrace:
-		n, _ := strconv.Atoi(lit)
-
-		return AtReflog{n}, nil
-	case tok == minus && nextTok == number:
-		n, _ := strconv.Atoi(nextLit)
-
-		t, _, err := p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		if t != cbrace {
-			return nil, &ErrInvalidRevision{s: `missing "}" in @{-n} structure`}
-		}
-
-		return AtCheckout{n}, nil
-	default:
-		p.unscan()
-
-		date := lit
-
-		for {
-			tok, lit, err = p.scan()
-
-			if err != nil {
-				return nil, err
-			}
-
-			switch {
-			case tok == cbrace:
-				t, err := time.Parse("2006-01-02T15:04:05Z", date)
-
-				if err != nil {
-					return nil, &ErrInvalidRevision{fmt.Sprintf(`wrong date "%s" must fit ISO-8601 format : 2006-01-02T15:04:05Z`, date)}
-				}
-
-				return AtDate{t}, nil
-			case tok == eof:
-				return nil, &ErrInvalidRevision{s: `missing "}" in @{} structure`}
-			default:
-				date += lit
-			}
-		}
-	}
-}
-
-// parseTilde extract ~ statements
-func (p *Parser) parseTilde() (Revisioner, error) {
-	var tok token
-	var lit string
-	var err error
-
-	tok, lit, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	switch {
-	case tok == number:
-		n, _ := strconv.Atoi(lit)
-
-		return TildePath{n}, nil
-	default:
-		p.unscan()
-		return TildePath{1}, nil
-	}
-}
-
-// parseCaret extract ^ statements
-func (p *Parser) parseCaret() (Revisioner, error) {
-	var tok token
-	var lit string
-	var err error
-
-	tok, lit, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	switch {
-	case tok == obrace:
-		r, err := p.parseCaretBraces()
-
-		if err != nil {
-			return nil, err
-		}
-
-		return r, nil
-	case tok == number:
-		n, _ := strconv.Atoi(lit)
-
-		if n > 2 {
-			return nil, &ErrInvalidRevision{fmt.Sprintf(`"%s" found must be 0, 1 or 2 after "^"`, lit)}
-		}
-
-		return CaretPath{n}, nil
-	default:
-		p.unscan()
-		return CaretPath{1}, nil
-	}
-}
-
-// parseCaretBraces extract ^{} statements
-func (p *Parser) parseCaretBraces() (Revisioner, error) {
-	var tok, nextTok token
-	var lit, _ string
-	start := true
-	var re string
-	var negate bool
-	var err error
-
-	for {
-		tok, lit, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		nextTok, _, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		switch {
-		case tok == word && nextTok == cbrace && (lit == "commit" || lit == "tree" || lit == "blob" || lit == "tag" || lit == "object"):
-			return CaretType{lit}, nil
-		case re == "" && tok == cbrace:
-			return CaretType{"tag"}, nil
-		case re == "" && tok == emark && nextTok == emark:
-			re += lit
-		case re == "" && tok == emark && nextTok == minus:
-			negate = true
-		case re == "" && tok == emark:
-			return nil, &ErrInvalidRevision{s: `revision suffix brace component sequences starting with "/!" others than those defined are reserved`}
-		case re == "" && tok == slash:
-			p.unscan()
-		case tok != slash && start:
-			return nil, &ErrInvalidRevision{fmt.Sprintf(`"%s" is not a valid revision suffix brace component`, lit)}
-		case tok == eof:
-			return nil, &ErrInvalidRevision{s: `missing "}" in ^{} structure`}
-		case tok != cbrace:
-			p.unscan()
-			re += lit
-		case tok == cbrace:
-			p.unscan()
-
-			reg, err := regexp.Compile(re)
-
-			if err != nil {
-				return CaretReg{}, &ErrInvalidRevision{fmt.Sprintf(`revision suffix brace component, %s`, err.Error())}
-			}
-
-			return CaretReg{reg, negate}, nil
-		}
-
-		start = false
-	}
-}
-
-// parseColon extract : statements
-func (p *Parser) parseColon() (Revisioner, error) {
-	var tok token
-	var err error
-
-	tok, _, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	switch tok {
-	case slash:
-		return p.parseColonSlash()
-	default:
-		p.unscan()
-		return p.parseColonDefault()
-	}
-}
-
-// parseColonSlash extract :/ statements
-func (p *Parser) parseColonSlash() (Revisioner, error) {
-	var tok, nextTok token
-	var lit string
-	var re string
-	var negate bool
-	var err error
-
-	for {
-		tok, lit, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		nextTok, _, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		switch {
-		case tok == emark && nextTok == emark:
-			re += lit
-		case re == "" && tok == emark && nextTok == minus:
-			negate = true
-		case re == "" && tok == emark:
-			return nil, &ErrInvalidRevision{s: `revision suffix brace component sequences starting with "/!" others than those defined are reserved`}
-		case tok == eof:
-			p.unscan()
-			reg, err := regexp.Compile(re)
-
-			if err != nil {
-				return ColonReg{}, &ErrInvalidRevision{fmt.Sprintf(`revision suffix brace component, %s`, err.Error())}
-			}
-
-			return ColonReg{reg, negate}, nil
-		default:
-			p.unscan()
-			re += lit
-		}
-	}
-}
-
-// parseColonDefault extract : statements
-func (p *Parser) parseColonDefault() (Revisioner, error) {
-	var tok token
-	var lit string
-	var path string
-	var stage int
-	var err error
-	var n = -1
-
-	tok, lit, err = p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	nextTok, _, err := p.scan()
-
-	if err != nil {
-		return nil, err
-	}
-
-	if tok == number && nextTok == colon {
-		n, _ = strconv.Atoi(lit)
-	}
-
-	switch n {
-	case 0, 1, 2, 3:
-		stage = n
-	default:
-		path += lit
-		p.unscan()
-	}
-
-	for {
-		tok, lit, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		switch {
-		case tok == eof && n == -1:
-			return ColonPath{path}, nil
-		case tok == eof:
-			return ColonStagePath{path, stage}, nil
-		default:
-			path += lit
-		}
-	}
-}
-
-// parseRef extract reference name
-func (p *Parser) parseRef() (Revisioner, error) {
-	var tok, prevTok token
-	var lit, buf string
-	var endOfRef bool
-	var err error
-
-	for {
-		tok, lit, err = p.scan()
-
-		if err != nil {
-			return nil, err
-		}
-
-		switch tok {
-		case eof, at, colon, tilde, caret:
-			endOfRef = true
-		}
-
-		err := p.checkRefFormat(tok, lit, prevTok, buf, endOfRef)
-
-		if err != nil {
-			return "", err
-		}
-
-		if endOfRef {
-			p.unscan()
-			return Ref(buf), nil
-		}
-
-		buf += lit
-		prevTok = tok
-	}
-}
-
-// checkRefFormat ensure reference name follow rules defined here :
-// https://git-scm.com/docs/git-check-ref-format
-func (p *Parser) checkRefFormat(token token, literal string, previousToken token, buffer string, endOfRef bool) error {
-	switch token {
-	case aslash, space, control, qmark, asterisk, obracket:
-		return &ErrInvalidRevision{fmt.Sprintf(`must not contains "%s"`, literal)}
-	}
-
-	switch {
-	case (token == dot || token == slash) && buffer == "":
-		return &ErrInvalidRevision{fmt.Sprintf(`must not start with "%s"`, literal)}
-	case previousToken == slash && endOfRef:
-		return &ErrInvalidRevision{`must not end with "/"`}
-	case previousToken == dot && endOfRef:
-		return &ErrInvalidRevision{`must not end with "."`}
-	case token == dot && previousToken == slash:
-		return &ErrInvalidRevision{`must not contains "/."`}
-	case previousToken == dot && token == dot:
-		return &ErrInvalidRevision{`must not contains ".."`}
-	case previousToken == slash && token == slash:
-		return &ErrInvalidRevision{`must not contains consecutively "/"`}
-	case (token == slash || endOfRef) && len(buffer) > 4 && buffer[len(buffer)-5:] == ".lock":
-		return &ErrInvalidRevision{"cannot end with .lock"}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/internal/revision/scanner.go b/vendor/github.com/jesseduffield/go-git/v5/internal/revision/scanner.go
deleted file mode 100644
index 2444f33ec..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/internal/revision/scanner.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package revision
-
-import (
-	"bufio"
-	"io"
-	"unicode"
-)
-
-// runeCategoryValidator takes a rune as input and
-// validates it belongs to a rune category
-type runeCategoryValidator func(r rune) bool
-
-// tokenizeExpression aggregates a series of runes matching check predicate into a single
-// string and provides given tokenType as token type
-func tokenizeExpression(ch rune, tokenType token, check runeCategoryValidator, r *bufio.Reader) (token, string, error) {
-	var data []rune
-	data = append(data, ch)
-
-	for {
-		c, _, err := r.ReadRune()
-
-		if c == zeroRune {
-			break
-		}
-
-		if err != nil {
-			return tokenError, "", err
-		}
-
-		if check(c) {
-			data = append(data, c)
-		} else {
-			err := r.UnreadRune()
-
-			if err != nil {
-				return tokenError, "", err
-			}
-
-			return tokenType, string(data), nil
-		}
-	}
-
-	return tokenType, string(data), nil
-}
-
-// maxRevisionLength holds the maximum length that will be parsed for a
-// revision. Git itself doesn't enforce a max length, but rather leans on
-// the OS to enforce it via its ARG_MAX.
-const maxRevisionLength = 128 * 1024 // 128kb
-
-var zeroRune = rune(0)
-
-// scanner represents a lexical scanner.
-type scanner struct {
-	r *bufio.Reader
-}
-
-// newScanner returns a new instance of scanner.
-func newScanner(r io.Reader) *scanner {
-	return &scanner{r: bufio.NewReader(io.LimitReader(r, maxRevisionLength))}
-}
-
-// Scan extracts tokens and their strings counterpart
-// from the reader
-func (s *scanner) scan() (token, string, error) {
-	ch, _, err := s.r.ReadRune()
-
-	if err != nil && err != io.EOF {
-		return tokenError, "", err
-	}
-
-	switch ch {
-	case zeroRune:
-		return eof, "", nil
-	case ':':
-		return colon, string(ch), nil
-	case '~':
-		return tilde, string(ch), nil
-	case '^':
-		return caret, string(ch), nil
-	case '.':
-		return dot, string(ch), nil
-	case '/':
-		return slash, string(ch), nil
-	case '{':
-		return obrace, string(ch), nil
-	case '}':
-		return cbrace, string(ch), nil
-	case '-':
-		return minus, string(ch), nil
-	case '@':
-		return at, string(ch), nil
-	case '\\':
-		return aslash, string(ch), nil
-	case '?':
-		return qmark, string(ch), nil
-	case '*':
-		return asterisk, string(ch), nil
-	case '[':
-		return obracket, string(ch), nil
-	case '!':
-		return emark, string(ch), nil
-	}
-
-	if unicode.IsSpace(ch) {
-		return space, string(ch), nil
-	}
-
-	if unicode.IsControl(ch) {
-		return control, string(ch), nil
-	}
-
-	if unicode.IsLetter(ch) {
-		return tokenizeExpression(ch, word, unicode.IsLetter, s.r)
-	}
-
-	if unicode.IsNumber(ch) {
-		return tokenizeExpression(ch, number, unicode.IsNumber, s.r)
-	}
-
-	return tokenError, string(ch), nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/internal/revision/token.go b/vendor/github.com/jesseduffield/go-git/v5/internal/revision/token.go
deleted file mode 100644
index abc404886..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/internal/revision/token.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package revision
-
-// token represents a entity extracted from string parsing
-type token int
-
-const (
-	eof token = iota
-
-	aslash
-	asterisk
-	at
-	caret
-	cbrace
-	colon
-	control
-	dot
-	emark
-	minus
-	number
-	obrace
-	obracket
-	qmark
-	slash
-	space
-	tilde
-	tokenError
-	word
-)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/internal/url/url.go b/vendor/github.com/jesseduffield/go-git/v5/internal/url/url.go
deleted file mode 100644
index 266244869..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/internal/url/url.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package url
-
-import (
-	"regexp"
-)
-
-var (
-	isSchemeRegExp = regexp.MustCompile(`^[^:]+://`)
-
-	// Ref: https://github.com/git/git/blob/master/Documentation/urls.txt#L37
-	scpLikeUrlRegExp = regexp.MustCompile(`^(?:(?P[^@]+)@)?(?P[^:\s]+):(?:(?P[0-9]{1,5}):)?(?P[^\\].*)$`)
-)
-
-// MatchesScheme returns true if the given string matches a URL-like
-// format scheme.
-func MatchesScheme(url string) bool {
-	return isSchemeRegExp.MatchString(url)
-}
-
-// MatchesScpLike returns true if the given string matches an SCP-like
-// format scheme.
-func MatchesScpLike(url string) bool {
-	return scpLikeUrlRegExp.MatchString(url)
-}
-
-// FindScpLikeComponents returns the user, host, port and path of the
-// given SCP-like URL.
-func FindScpLikeComponents(url string) (user, host, port, path string) {
-	m := scpLikeUrlRegExp.FindStringSubmatch(url)
-	return m[1], m[2], m[3], m[4]
-}
-
-// IsLocalEndpoint returns true if the given URL string specifies a
-// local file endpoint.  For example, on a Linux machine,
-// `/home/user/src/go-git` would match as a local endpoint, but
-// `https://github.com/src-d/go-git` would not.
-func IsLocalEndpoint(url string) bool {
-	return !MatchesScheme(url) && !MatchesScpLike(url)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/object_walker.go b/vendor/github.com/jesseduffield/go-git/v5/object_walker.go
deleted file mode 100644
index 2f390267a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/object_walker.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package git
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/storage"
-)
-
-type objectWalker struct {
-	Storer storage.Storer
-	// seen is the set of objects seen in the repo.
-	// seen map can become huge if walking over large
-	// repos. Thus using struct{} as the value type.
-	seen map[plumbing.Hash]struct{}
-}
-
-func newObjectWalker(s storage.Storer) *objectWalker {
-	return &objectWalker{s, map[plumbing.Hash]struct{}{}}
-}
-
-// walkAllRefs walks all (hash) references from the repo.
-func (p *objectWalker) walkAllRefs() error {
-	// Walk over all the references in the repo.
-	it, err := p.Storer.IterReferences()
-	if err != nil {
-		return err
-	}
-	defer it.Close()
-	err = it.ForEach(func(ref *plumbing.Reference) error {
-		// Exit this iteration early for non-hash references.
-		if ref.Type() != plumbing.HashReference {
-			return nil
-		}
-		return p.walkObjectTree(ref.Hash())
-	})
-	return err
-}
-
-func (p *objectWalker) isSeen(hash plumbing.Hash) bool {
-	_, seen := p.seen[hash]
-	return seen
-}
-
-func (p *objectWalker) add(hash plumbing.Hash) {
-	p.seen[hash] = struct{}{}
-}
-
-// walkObjectTree walks over all objects and remembers references
-// to them in the objectWalker. This is used instead of the revlist
-// walks because memory usage is tight with huge repos.
-func (p *objectWalker) walkObjectTree(hash plumbing.Hash) error {
-	// Check if we have already seen, and mark this object
-	if p.isSeen(hash) {
-		return nil
-	}
-	p.add(hash)
-	// Fetch the object.
-	obj, err := object.GetObject(p.Storer, hash)
-	if err != nil {
-		return fmt.Errorf("getting object %s failed: %v", hash, err)
-	}
-	// Walk all children depending on object type.
-	switch obj := obj.(type) {
-	case *object.Commit:
-		err = p.walkObjectTree(obj.TreeHash)
-		if err != nil {
-			return err
-		}
-		for _, h := range obj.ParentHashes {
-			err = p.walkObjectTree(h)
-			if err != nil {
-				return err
-			}
-		}
-	case *object.Tree:
-		for i := range obj.Entries {
-			// Shortcut for blob objects:
-			// 'or' the lower bits of a mode and check that it
-			// it matches a filemode.Executable. The type information
-			// is in the higher bits, but this is the cleanest way
-			// to handle plain files with different modes.
-			// Other non-tree objects are somewhat rare, so they
-			// are not special-cased.
-			if obj.Entries[i].Mode|0755 == filemode.Executable {
-				p.add(obj.Entries[i].Hash)
-				continue
-			}
-			// Normal walk for sub-trees (and symlinks etc).
-			err = p.walkObjectTree(obj.Entries[i].Hash)
-			if err != nil {
-				return err
-			}
-		}
-	case *object.Tag:
-		return p.walkObjectTree(obj.Target)
-	default:
-		// Error out on unhandled object types.
-		return fmt.Errorf("unknown object %X %s %T", obj.ID(), obj.Type(), obj)
-	}
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/options.go b/vendor/github.com/jesseduffield/go-git/v5/options.go
deleted file mode 100644
index 101c1418a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/options.go
+++ /dev/null
@@ -1,818 +0,0 @@
-package git
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	formatcfg "github.com/jesseduffield/go-git/v5/plumbing/format/config"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-)
-
-// SubmoduleRescursivity defines how depth will affect any submodule recursive
-// operation.
-type SubmoduleRescursivity uint
-
-const (
-	// DefaultRemoteName name of the default Remote, just like git command.
-	DefaultRemoteName = "origin"
-
-	// NoRecurseSubmodules disables the recursion for a submodule operation.
-	NoRecurseSubmodules SubmoduleRescursivity = 0
-	// DefaultSubmoduleRecursionDepth allow recursion in a submodule operation.
-	DefaultSubmoduleRecursionDepth SubmoduleRescursivity = 10
-)
-
-var (
-	ErrMissingURL = errors.New("URL field is required")
-)
-
-// CloneOptions describes how a clone should be performed.
-type CloneOptions struct {
-	// The (possibly remote) repository URL to clone from.
-	URL string
-	// Auth credentials, if required, to use with the remote repository.
-	Auth transport.AuthMethod
-	// Name of the remote to be added, by default `origin`.
-	RemoteName string
-	// Remote branch to clone.
-	ReferenceName plumbing.ReferenceName
-	// Fetch only ReferenceName if true.
-	SingleBranch bool
-	// Mirror clones the repository as a mirror.
-	//
-	// Compared to a bare clone, mirror not only maps local branches of the
-	// source to local branches of the target, it maps all refs (including
-	// remote-tracking branches, notes etc.) and sets up a refspec configuration
-	// such that all these refs are overwritten by a git remote update in the
-	// target repository.
-	Mirror bool
-	// No checkout of HEAD after clone if true.
-	NoCheckout bool
-	// Limit fetching to the specified number of commits.
-	Depth int
-	// RecurseSubmodules after the clone is created, initialize all submodules
-	// within, using their default settings. This option is ignored if the
-	// cloned repository does not have a worktree.
-	RecurseSubmodules SubmoduleRescursivity
-	// ShallowSubmodules limit cloning submodules to the 1 level of depth.
-	// It matches the git command --shallow-submodules.
-	ShallowSubmodules bool
-	// Progress is where the human readable information sent by the server is
-	// stored, if nil nothing is stored and the capability (if supported)
-	// no-progress, is sent to the server to avoid send this information.
-	Progress sideband.Progress
-	// Tags describe how the tags will be fetched from the remote repository,
-	// by default is AllTags.
-	Tags TagMode
-	// InsecureSkipTLS skips ssl verify if protocol is https
-	InsecureSkipTLS bool
-	// CABundle specify additional ca bundle with system cert pool
-	CABundle []byte
-	// ProxyOptions provides info required for connecting to a proxy.
-	ProxyOptions transport.ProxyOptions
-	// When the repository to clone is on the local machine, instead of
-	// using hard links, automatically setup .git/objects/info/alternates
-	// to share the objects with the source repository.
-	// The resulting repository starts out without any object of its own.
-	// NOTE: this is a possibly dangerous operation; do not use it unless
-	// you understand what it does.
-	//
-	// [Reference]: https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---shared
-	Shared bool
-}
-
-// MergeOptions describes how a merge should be performed.
-type MergeOptions struct {
-	// Strategy defines the merge strategy to be used.
-	Strategy MergeStrategy
-}
-
-// MergeStrategy represents the different types of merge strategies.
-type MergeStrategy int8
-
-const (
-	// FastForwardMerge represents a Git merge strategy where the current
-	// branch can be simply updated to point to the HEAD of the branch being
-	// merged. This is only possible if the history of the branch being merged
-	// is a linear descendant of the current branch, with no conflicting commits.
-	//
-	// This is the default option.
-	FastForwardMerge MergeStrategy = iota
-)
-
-// Validate validates the fields and sets the default values.
-func (o *CloneOptions) Validate() error {
-	if o.URL == "" {
-		return ErrMissingURL
-	}
-
-	if o.RemoteName == "" {
-		o.RemoteName = DefaultRemoteName
-	}
-
-	if o.ReferenceName == "" {
-		o.ReferenceName = plumbing.HEAD
-	}
-
-	if o.Tags == InvalidTagMode {
-		o.Tags = AllTags
-	}
-
-	return nil
-}
-
-// PullOptions describes how a pull should be performed.
-type PullOptions struct {
-	// Name of the remote to be pulled. If empty, uses the default.
-	RemoteName string
-	// RemoteURL overrides the remote repo address with a custom URL
-	RemoteURL string
-	// Remote branch to clone. If empty, uses HEAD.
-	ReferenceName plumbing.ReferenceName
-	// Fetch only ReferenceName if true.
-	SingleBranch bool
-	// Limit fetching to the specified number of commits.
-	Depth int
-	// Auth credentials, if required, to use with the remote repository.
-	Auth transport.AuthMethod
-	// RecurseSubmodules controls if new commits of all populated submodules
-	// should be fetched too.
-	RecurseSubmodules SubmoduleRescursivity
-	// Progress is where the human readable information sent by the server is
-	// stored, if nil nothing is stored and the capability (if supported)
-	// no-progress, is sent to the server to avoid send this information.
-	Progress sideband.Progress
-	// Force allows the pull to update a local branch even when the remote
-	// branch does not descend from it.
-	Force bool
-	// InsecureSkipTLS skips ssl verify if protocol is https
-	InsecureSkipTLS bool
-	// CABundle specify additional ca bundle with system cert pool
-	CABundle []byte
-	// ProxyOptions provides info required for connecting to a proxy.
-	ProxyOptions transport.ProxyOptions
-}
-
-// Validate validates the fields and sets the default values.
-func (o *PullOptions) Validate() error {
-	if o.RemoteName == "" {
-		o.RemoteName = DefaultRemoteName
-	}
-
-	if o.ReferenceName == "" {
-		o.ReferenceName = plumbing.HEAD
-	}
-
-	return nil
-}
-
-type TagMode int
-
-const (
-	InvalidTagMode TagMode = iota
-	// TagFollowing any tag that points into the histories being fetched is also
-	// fetched. TagFollowing requires a server with `include-tag` capability
-	// in order to fetch the annotated tags objects.
-	TagFollowing
-	// AllTags fetch all tags from the remote (i.e., fetch remote tags
-	// refs/tags/* into local tags with the same name)
-	AllTags
-	// NoTags fetch no tags from the remote at all
-	NoTags
-)
-
-// FetchOptions describes how a fetch should be performed
-type FetchOptions struct {
-	// Name of the remote to fetch from. Defaults to origin.
-	RemoteName string
-	// RemoteURL overrides the remote repo address with a custom URL
-	RemoteURL string
-	RefSpecs  []config.RefSpec
-	// Depth limit fetching to the specified number of commits from the tip of
-	// each remote branch history.
-	Depth int
-	// Auth credentials, if required, to use with the remote repository.
-	Auth transport.AuthMethod
-	// Progress is where the human readable information sent by the server is
-	// stored, if nil nothing is stored and the capability (if supported)
-	// no-progress, is sent to the server to avoid send this information.
-	Progress sideband.Progress
-	// Tags describe how the tags will be fetched from the remote repository,
-	// by default is TagFollowing.
-	Tags TagMode
-	// Force allows the fetch to update a local branch even when the remote
-	// branch does not descend from it.
-	Force bool
-	// InsecureSkipTLS skips ssl verify if protocol is https
-	InsecureSkipTLS bool
-	// CABundle specify additional ca bundle with system cert pool
-	CABundle []byte
-	// ProxyOptions provides info required for connecting to a proxy.
-	ProxyOptions transport.ProxyOptions
-	// Prune specify that local refs that match given RefSpecs and that do
-	// not exist remotely will be removed.
-	Prune bool
-}
-
-// Validate validates the fields and sets the default values.
-func (o *FetchOptions) Validate() error {
-	if o.RemoteName == "" {
-		o.RemoteName = DefaultRemoteName
-	}
-
-	if o.Tags == InvalidTagMode {
-		o.Tags = TagFollowing
-	}
-
-	for _, r := range o.RefSpecs {
-		if err := r.Validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// PushOptions describes how a push should be performed.
-type PushOptions struct {
-	// RemoteName is the name of the remote to be pushed to.
-	RemoteName string
-	// RemoteURL overrides the remote repo address with a custom URL
-	RemoteURL string
-	// RefSpecs specify what destination ref to update with what source object.
-	//
-	// The format of a  parameter is an optional plus +, followed by
-	//  the source object , followed by a colon :, followed by the destination ref .
-	// The  is often the name of the branch you would want to push, but it can be a SHA-1.
-	// The  tells which ref on the remote side is updated with this push.
-	//
-	// A refspec with empty src can be used to delete a reference.
-	RefSpecs []config.RefSpec
-	// Auth credentials, if required, to use with the remote repository.
-	Auth transport.AuthMethod
-	// Progress is where the human readable information sent by the server is
-	// stored, if nil nothing is stored.
-	Progress sideband.Progress
-	// Prune specify that remote refs that match given RefSpecs and that do
-	// not exist locally will be removed.
-	Prune bool
-	// Force allows the push to update a remote branch even when the local
-	// branch does not descend from it.
-	Force bool
-	// InsecureSkipTLS skips ssl verify if protocol is https
-	InsecureSkipTLS bool
-	// CABundle specify additional ca bundle with system cert pool
-	CABundle []byte
-	// RequireRemoteRefs only allows a remote ref to be updated if its current
-	// value is the one specified here.
-	RequireRemoteRefs []config.RefSpec
-	// FollowTags will send any annotated tags with a commit target reachable from
-	// the refs already being pushed
-	FollowTags bool
-	// ForceWithLease allows a force push as long as the remote ref adheres to a "lease"
-	ForceWithLease *ForceWithLease
-	// PushOptions sets options to be transferred to the server during push.
-	Options map[string]string
-	// Atomic sets option to be an atomic push
-	Atomic bool
-	// ProxyOptions provides info required for connecting to a proxy.
-	ProxyOptions transport.ProxyOptions
-}
-
-// ForceWithLease sets fields on the lease
-// If neither RefName nor Hash are set, ForceWithLease protects
-// all refs in the refspec by ensuring the ref of the remote in the local repsitory
-// matches the one in the ref advertisement.
-type ForceWithLease struct {
-	// RefName, when set will protect the ref by ensuring it matches the
-	// hash in the ref advertisement.
-	RefName plumbing.ReferenceName
-	// Hash is the expected object id of RefName. The push will be rejected unless this
-	// matches the corresponding object id of RefName in the refs advertisement.
-	Hash plumbing.Hash
-}
-
-// Validate validates the fields and sets the default values.
-func (o *PushOptions) Validate() error {
-	if o.RemoteName == "" {
-		o.RemoteName = DefaultRemoteName
-	}
-
-	if len(o.RefSpecs) == 0 {
-		o.RefSpecs = []config.RefSpec{
-			config.RefSpec(config.DefaultPushRefSpec),
-		}
-	}
-
-	for _, r := range o.RefSpecs {
-		if err := r.Validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// SubmoduleUpdateOptions describes how a submodule update should be performed.
-type SubmoduleUpdateOptions struct {
-	// Init, if true initializes the submodules recorded in the index.
-	Init bool
-	// NoFetch tell to the update command to not fetch new objects from the
-	// remote site.
-	NoFetch bool
-	// RecurseSubmodules the update is performed not only in the submodules of
-	// the current repository but also in any nested submodules inside those
-	// submodules (and so on). Until the SubmoduleRescursivity is reached.
-	RecurseSubmodules SubmoduleRescursivity
-	// Auth credentials, if required, to use with the remote repository.
-	Auth transport.AuthMethod
-	// Depth limit fetching to the specified number of commits from the tip of
-	// each remote branch history.
-	Depth int
-}
-
-var (
-	ErrBranchHashExclusive  = errors.New("Branch and Hash are mutually exclusive")
-	ErrCreateRequiresBranch = errors.New("Branch is mandatory when Create is used")
-)
-
-// CheckoutOptions describes how a checkout operation should be performed.
-type CheckoutOptions struct {
-	// Hash is the hash of a commit or tag to be checked out. If used, HEAD
-	// will be in detached mode. If Create is not used, Branch and Hash are
-	// mutually exclusive.
-	Hash plumbing.Hash
-	// Branch to be checked out, if Branch and Hash are empty is set to `master`.
-	Branch plumbing.ReferenceName
-	// Create a new branch named Branch and start it at Hash.
-	Create bool
-	// Force, if true when switching branches, proceed even if the index or the
-	// working tree differs from HEAD. This is used to throw away local changes
-	Force bool
-	// Keep, if true when switching branches, local changes (the index or the
-	// working tree changes) will be kept so that they can be committed to the
-	// target branch. Force and Keep are mutually exclusive, should not be both
-	// set to true.
-	Keep bool
-	// SparseCheckoutDirectories
-	SparseCheckoutDirectories []string
-}
-
-// Validate validates the fields and sets the default values.
-func (o *CheckoutOptions) Validate() error {
-	if !o.Create && !o.Hash.IsZero() && o.Branch != "" {
-		return ErrBranchHashExclusive
-	}
-
-	if o.Create && o.Branch == "" {
-		return ErrCreateRequiresBranch
-	}
-
-	if o.Branch == "" {
-		o.Branch = plumbing.Master
-	}
-
-	return nil
-}
-
-// ResetMode defines the mode of a reset operation.
-type ResetMode int8
-
-const (
-	// MixedReset resets the index but not the working tree (i.e., the changed
-	// files are preserved but not marked for commit) and reports what has not
-	// been updated. This is the default action.
-	MixedReset ResetMode = iota
-	// HardReset resets the index and working tree. Any changes to tracked files
-	// in the working tree are discarded.
-	HardReset
-	// MergeReset resets the index and updates the files in the working tree
-	// that are different between Commit and HEAD, but keeps those which are
-	// different between the index and working tree (i.e. which have changes
-	// which have not been added).
-	//
-	// If a file that is different between Commit and the index has unstaged
-	// changes, reset is aborted.
-	MergeReset
-	// SoftReset does not touch the index file or the working tree at all (but
-	// resets the head to , just like all modes do). This leaves all
-	// your changed files "Changes to be committed", as git status would put it.
-	SoftReset
-)
-
-// ResetOptions describes how a reset operation should be performed.
-type ResetOptions struct {
-	// Commit, if commit is present set the current branch head (HEAD) to it.
-	Commit plumbing.Hash
-	// Mode, form resets the current branch head to Commit and possibly updates
-	// the index (resetting it to the tree of Commit) and the working tree
-	// depending on Mode. If empty MixedReset is used.
-	Mode ResetMode
-	// Files, if not empty will constrain the reseting the index to only files
-	// specified in this list.
-	Files []string
-}
-
-// Validate validates the fields and sets the default values.
-func (o *ResetOptions) Validate(r *Repository) error {
-	if o.Commit == plumbing.ZeroHash {
-		ref, err := r.Head()
-		if err != nil {
-			return err
-		}
-
-		o.Commit = ref.Hash()
-	} else {
-		_, err := r.CommitObject(o.Commit)
-		if err != nil {
-			return fmt.Errorf("invalid reset option: %w", err)
-		}
-	}
-
-	return nil
-}
-
-type LogOrder int8
-
-const (
-	LogOrderDefault LogOrder = iota
-	LogOrderDFS
-	LogOrderDFSPost
-	LogOrderBSF
-	LogOrderCommitterTime
-)
-
-// LogOptions describes how a log action should be performed.
-type LogOptions struct {
-	// When the From option is set the log will only contain commits
-	// reachable from it. If this option is not set, HEAD will be used as
-	// the default From.
-	From plumbing.Hash
-
-	// The default traversal algorithm is Depth-first search
-	// set Order=LogOrderCommitterTime for ordering by committer time (more compatible with `git log`)
-	// set Order=LogOrderBSF for Breadth-first search
-	Order LogOrder
-
-	// Show only those commits in which the specified file was inserted/updated.
-	// It is equivalent to running `git log -- `.
-	// this field is kept for compatibility, it can be replaced with PathFilter
-	FileName *string
-
-	// Filter commits based on the path of files that are updated
-	// takes file path as argument and should return true if the file is desired
-	// It can be used to implement `git log -- `
-	// either  is a file path, or directory path, or a regexp of file/directory path
-	PathFilter func(string) bool
-
-	// Pretend as if all the refs in refs/, along with HEAD, are listed on the command line as .
-	// It is equivalent to running `git log --all`.
-	// If set on true, the From option will be ignored.
-	All bool
-
-	// Show commits more recent than a specific date.
-	// It is equivalent to running `git log --since ` or `git log --after `.
-	Since *time.Time
-
-	// Show commits older than a specific date.
-	// It is equivalent to running `git log --until ` or `git log --before `.
-	Until *time.Time
-}
-
-var (
-	ErrMissingAuthor = errors.New("author field is required")
-)
-
-// AddOptions describes how an `add` operation should be performed
-type AddOptions struct {
-	// All equivalent to `git add -A`, update the index not only where the
-	// working tree has a file matching `Path` but also where the index already
-	// has an entry. This adds, modifies, and removes index entries to match the
-	// working tree.  If no `Path` nor `Glob` is given when `All` option is
-	// used, all files in the entire working tree are updated.
-	All bool
-	// Path is the exact filepath to the file or directory to be added.
-	Path string
-	// Glob adds all paths, matching pattern, to the index. If pattern matches a
-	// directory path, all directory contents are added to the index recursively.
-	Glob string
-	// SkipStatus adds the path with no status check. This option is relevant only
-	// when the `Path` option is specified and does not apply when the `All` option is used.
-	// Notice that when passing an ignored path it will be added anyway.
-	// When true it can speed up adding files to the worktree in very large repositories.
-	SkipStatus bool
-}
-
-// Validate validates the fields and sets the default values.
-func (o *AddOptions) Validate(r *Repository) error {
-	if o.Path != "" && o.Glob != "" {
-		return fmt.Errorf("fields Path and Glob are mutual exclusive")
-	}
-
-	return nil
-}
-
-// CommitOptions describes how a commit operation should be performed.
-type CommitOptions struct {
-	// All automatically stage files that have been modified and deleted, but
-	// new files you have not told Git about are not affected.
-	All bool
-	// AllowEmptyCommits enable empty commits to be created. An empty commit
-	// is when no changes to the tree were made, but a new commit message is
-	// provided. The default behavior is false, which results in ErrEmptyCommit.
-	AllowEmptyCommits bool
-	// Author is the author's signature of the commit. If Author is empty the
-	// Name and Email is read from the config, and time.Now it's used as When.
-	Author *object.Signature
-	// Committer is the committer's signature of the commit. If Committer is
-	// nil the Author signature is used.
-	Committer *object.Signature
-	// Parents are the parents commits for the new commit, by default when
-	// len(Parents) is zero, the hash of HEAD reference is used.
-	Parents []plumbing.Hash
-	// SignKey denotes a key to sign the commit with. A nil value here means the
-	// commit will not be signed. The private key must be present and already
-	// decrypted.
-	SignKey *openpgp.Entity
-	// Signer denotes a cryptographic signer to sign the commit with.
-	// A nil value here means the commit will not be signed.
-	// Takes precedence over SignKey.
-	Signer Signer
-	// Amend will create a new commit object and replace the commit that HEAD currently
-	// points to. Cannot be used with All nor Parents.
-	Amend bool
-}
-
-// Validate validates the fields and sets the default values.
-func (o *CommitOptions) Validate(r *Repository) error {
-	if o.All && o.Amend {
-		return errors.New("all and amend cannot be used together")
-	}
-
-	if o.Amend && len(o.Parents) > 0 {
-		return errors.New("parents cannot be used with amend")
-	}
-
-	if o.Author == nil {
-		if err := o.loadConfigAuthorAndCommitter(r); err != nil {
-			return err
-		}
-	}
-
-	if o.Committer == nil {
-		o.Committer = o.Author
-	}
-
-	if len(o.Parents) == 0 {
-		head, err := r.Head()
-		if err != nil && err != plumbing.ErrReferenceNotFound {
-			return err
-		}
-
-		if head != nil {
-			o.Parents = []plumbing.Hash{head.Hash()}
-		}
-	}
-
-	return nil
-}
-
-func (o *CommitOptions) loadConfigAuthorAndCommitter(r *Repository) error {
-	cfg, err := r.ConfigScoped(config.SystemScope)
-	if err != nil {
-		return err
-	}
-
-	if o.Author == nil && cfg.Author.Email != "" && cfg.Author.Name != "" {
-		o.Author = &object.Signature{
-			Name:  cfg.Author.Name,
-			Email: cfg.Author.Email,
-			When:  time.Now(),
-		}
-	}
-
-	if o.Committer == nil && cfg.Committer.Email != "" && cfg.Committer.Name != "" {
-		o.Committer = &object.Signature{
-			Name:  cfg.Committer.Name,
-			Email: cfg.Committer.Email,
-			When:  time.Now(),
-		}
-	}
-
-	if o.Author == nil && cfg.User.Email != "" && cfg.User.Name != "" {
-		o.Author = &object.Signature{
-			Name:  cfg.User.Name,
-			Email: cfg.User.Email,
-			When:  time.Now(),
-		}
-	}
-
-	if o.Author == nil {
-		return ErrMissingAuthor
-	}
-
-	return nil
-}
-
-var (
-	ErrMissingName    = errors.New("name field is required")
-	ErrMissingTagger  = errors.New("tagger field is required")
-	ErrMissingMessage = errors.New("message field is required")
-)
-
-// CreateTagOptions describes how a tag object should be created.
-type CreateTagOptions struct {
-	// Tagger defines the signature of the tag creator. If Tagger is empty the
-	// Name and Email is read from the config, and time.Now it's used as When.
-	Tagger *object.Signature
-	// Message defines the annotation of the tag. It is canonicalized during
-	// validation into the format expected by git - no leading whitespace and
-	// ending in a newline.
-	Message string
-	// SignKey denotes a key to sign the tag with. A nil value here means the tag
-	// will not be signed. The private key must be present and already decrypted.
-	SignKey *openpgp.Entity
-}
-
-// Validate validates the fields and sets the default values.
-func (o *CreateTagOptions) Validate(r *Repository, hash plumbing.Hash) error {
-	if o.Tagger == nil {
-		if err := o.loadConfigTagger(r); err != nil {
-			return err
-		}
-	}
-
-	if o.Message == "" {
-		return ErrMissingMessage
-	}
-
-	// Canonicalize the message into the expected message format.
-	o.Message = strings.TrimSpace(o.Message) + "\n"
-
-	return nil
-}
-
-func (o *CreateTagOptions) loadConfigTagger(r *Repository) error {
-	cfg, err := r.ConfigScoped(config.SystemScope)
-	if err != nil {
-		return err
-	}
-
-	if o.Tagger == nil && cfg.Author.Email != "" && cfg.Author.Name != "" {
-		o.Tagger = &object.Signature{
-			Name:  cfg.Author.Name,
-			Email: cfg.Author.Email,
-			When:  time.Now(),
-		}
-	}
-
-	if o.Tagger == nil && cfg.User.Email != "" && cfg.User.Name != "" {
-		o.Tagger = &object.Signature{
-			Name:  cfg.User.Name,
-			Email: cfg.User.Email,
-			When:  time.Now(),
-		}
-	}
-
-	if o.Tagger == nil {
-		return ErrMissingTagger
-	}
-
-	return nil
-}
-
-// ListOptions describes how a remote list should be performed.
-type ListOptions struct {
-	// Auth credentials, if required, to use with the remote repository.
-	Auth transport.AuthMethod
-	// InsecureSkipTLS skips ssl verify if protocol is https
-	InsecureSkipTLS bool
-	// CABundle specify additional ca bundle with system cert pool
-	CABundle []byte
-	// PeelingOption defines how peeled objects are handled during a
-	// remote list.
-	PeelingOption PeelingOption
-	// ProxyOptions provides info required for connecting to a proxy.
-	ProxyOptions transport.ProxyOptions
-	// Timeout specifies the timeout in seconds for list operations
-	Timeout int
-}
-
-// PeelingOption represents the different ways to handle peeled references.
-//
-// Peeled references represent the underlying object of an annotated
-// (or signed) tag. Refer to upstream documentation for more info:
-// https://github.com/git/git/blob/master/Documentation/technical/reftable.txt
-type PeelingOption uint8
-
-const (
-	// IgnorePeeled ignores all peeled reference names. This is the default behavior.
-	IgnorePeeled PeelingOption = 0
-	// OnlyPeeled returns only peeled reference names.
-	OnlyPeeled PeelingOption = 1
-	// AppendPeeled appends peeled reference names to the reference list.
-	AppendPeeled PeelingOption = 2
-)
-
-// CleanOptions describes how a clean should be performed.
-type CleanOptions struct {
-	Dir bool
-}
-
-// GrepOptions describes how a grep should be performed.
-type GrepOptions struct {
-	// Patterns are compiled Regexp objects to be matched.
-	Patterns []*regexp.Regexp
-	// InvertMatch selects non-matching lines.
-	InvertMatch bool
-	// CommitHash is the hash of the commit from which worktree should be derived.
-	CommitHash plumbing.Hash
-	// ReferenceName is the branch or tag name from which worktree should be derived.
-	ReferenceName plumbing.ReferenceName
-	// PathSpecs are compiled Regexp objects of pathspec to use in the matching.
-	PathSpecs []*regexp.Regexp
-}
-
-var (
-	ErrHashOrReference = errors.New("ambiguous options, only one of CommitHash or ReferenceName can be passed")
-)
-
-// Validate validates the fields and sets the default values.
-//
-// TODO: deprecate in favor of Validate(r *Repository) in v6.
-func (o *GrepOptions) Validate(w *Worktree) error {
-	return o.validate(w.r)
-}
-
-func (o *GrepOptions) validate(r *Repository) error {
-	if !o.CommitHash.IsZero() && o.ReferenceName != "" {
-		return ErrHashOrReference
-	}
-
-	// If none of CommitHash and ReferenceName are provided, set commit hash of
-	// the repository's head.
-	if o.CommitHash.IsZero() && o.ReferenceName == "" {
-		ref, err := r.Head()
-		if err != nil {
-			return err
-		}
-		o.CommitHash = ref.Hash()
-	}
-
-	return nil
-}
-
-// PlainOpenOptions describes how opening a plain repository should be
-// performed.
-type PlainOpenOptions struct {
-	// DetectDotGit defines whether parent directories should be
-	// walked until a .git directory or file is found.
-	DetectDotGit bool
-	// Enable .git/commondir support (see https://git-scm.com/docs/gitrepository-layout#Documentation/gitrepository-layout.txt).
-	// NOTE: This option will only work with the filesystem storage.
-	EnableDotGitCommonDir bool
-}
-
-// Validate validates the fields and sets the default values.
-func (o *PlainOpenOptions) Validate() error { return nil }
-
-type PlainInitOptions struct {
-	InitOptions
-	// Determines if the repository will have a worktree (non-bare) or not (bare).
-	Bare         bool
-	ObjectFormat formatcfg.ObjectFormat
-}
-
-// Validate validates the fields and sets the default values.
-func (o *PlainInitOptions) Validate() error { return nil }
-
-var (
-	ErrNoRestorePaths = errors.New("you must specify path(s) to restore")
-)
-
-// RestoreOptions describes how a restore should be performed.
-type RestoreOptions struct {
-	// Marks to restore the content in the index
-	Staged bool
-	// Marks to restore the content of the working tree
-	Worktree bool
-	// List of file paths that will be restored
-	Files []string
-}
-
-// Validate validates the fields and sets the default values.
-func (o *RestoreOptions) Validate() error {
-	if len(o.Files) == 0 {
-		return ErrNoRestorePaths
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/oss-fuzz.sh b/vendor/github.com/jesseduffield/go-git/v5/oss-fuzz.sh
deleted file mode 100644
index 885548f40..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/oss-fuzz.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -eu
-# Copyright 2023 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-
-go mod download
-go get github.com/AdamKorcz/go-118-fuzz-build/testing
-
-if [ "$SANITIZER" != "coverage" ]; then
-    sed -i '/func (s \*DecoderSuite) TestDecode(/,/^}/ s/^/\/\//' plumbing/format/config/decoder_test.go
-    sed -n '35,$p' plumbing/format/packfile/common_test.go >> plumbing/format/packfile/delta_test.go
-    sed -n '20,53p' plumbing/object/object_test.go >> plumbing/object/tree_test.go
-    sed -i 's|func Test|// func Test|' plumbing/transport/common_test.go
-fi
-
-compile_native_go_fuzzer $(pwd)/internal/revision                       FuzzParser              fuzz_parser
-compile_native_go_fuzzer $(pwd)/plumbing/format/config                  FuzzDecoder             fuzz_decoder_config
-compile_native_go_fuzzer $(pwd)/plumbing/format/packfile                FuzzPatchDelta          fuzz_patch_delta
-compile_native_go_fuzzer $(pwd)/plumbing/object                         FuzzParseSignedBytes    fuzz_parse_signed_bytes
-compile_native_go_fuzzer $(pwd)/plumbing/object                         FuzzDecode              fuzz_decode
-compile_native_go_fuzzer $(pwd)/plumbing/protocol/packp                 FuzzDecoder             fuzz_decoder_packp
-compile_native_go_fuzzer $(pwd)/plumbing/transport                      FuzzNewEndpoint         fuzz_new_endpoint
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/buffer_lru.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/buffer_lru.go
deleted file mode 100644
index acaf19520..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/buffer_lru.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package cache
-
-import (
-	"container/list"
-	"sync"
-)
-
-// BufferLRU implements an object cache with an LRU eviction policy and a
-// maximum size (measured in object size).
-type BufferLRU struct {
-	MaxSize FileSize
-
-	actualSize FileSize
-	ll         *list.List
-	cache      map[int64]*list.Element
-	mut        sync.Mutex
-}
-
-// NewBufferLRU creates a new BufferLRU with the given maximum size. The maximum
-// size will never be exceeded.
-func NewBufferLRU(maxSize FileSize) *BufferLRU {
-	return &BufferLRU{MaxSize: maxSize}
-}
-
-// NewBufferLRUDefault creates a new BufferLRU with the default cache size.
-func NewBufferLRUDefault() *BufferLRU {
-	return &BufferLRU{MaxSize: DefaultMaxSize}
-}
-
-type buffer struct {
-	Key   int64
-	Slice []byte
-}
-
-// Put puts a buffer into the cache. If the buffer is already in the cache, it
-// will be marked as used. Otherwise, it will be inserted. A buffers might
-// be evicted to make room for the new one.
-func (c *BufferLRU) Put(key int64, slice []byte) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-
-	if c.cache == nil {
-		c.actualSize = 0
-		c.cache = make(map[int64]*list.Element, 1000)
-		c.ll = list.New()
-	}
-
-	bufSize := FileSize(len(slice))
-	if ee, ok := c.cache[key]; ok {
-		oldBuf := ee.Value.(buffer)
-		// in this case bufSize is a delta: new size - old size
-		bufSize -= FileSize(len(oldBuf.Slice))
-		c.ll.MoveToFront(ee)
-		ee.Value = buffer{key, slice}
-	} else {
-		if bufSize > c.MaxSize {
-			return
-		}
-		ee := c.ll.PushFront(buffer{key, slice})
-		c.cache[key] = ee
-	}
-
-	c.actualSize += bufSize
-	for c.actualSize > c.MaxSize {
-		last := c.ll.Back()
-		lastObj := last.Value.(buffer)
-		lastSize := FileSize(len(lastObj.Slice))
-
-		c.ll.Remove(last)
-		delete(c.cache, lastObj.Key)
-		c.actualSize -= lastSize
-	}
-}
-
-// Get returns a buffer by its key. It marks the buffer as used. If the buffer
-// is not in the cache, (nil, false) will be returned.
-func (c *BufferLRU) Get(key int64) ([]byte, bool) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-
-	ee, ok := c.cache[key]
-	if !ok {
-		return nil, false
-	}
-
-	c.ll.MoveToFront(ee)
-	return ee.Value.(buffer).Slice, true
-}
-
-// Clear the content of this buffer cache.
-func (c *BufferLRU) Clear() {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-
-	c.ll = nil
-	c.cache = nil
-	c.actualSize = 0
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/common.go
deleted file mode 100644
index 7856df3d3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/common.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package cache
-
-import "github.com/jesseduffield/go-git/v5/plumbing"
-
-const (
-	Byte FileSize = 1 << (iota * 10)
-	KiByte
-	MiByte
-	GiByte
-)
-
-type FileSize int64
-
-const DefaultMaxSize FileSize = 96 * MiByte
-
-// Object is an interface to a object cache.
-type Object interface {
-	// Put puts the given object into the cache. Whether this object will
-	// actually be put into the cache or not is implementation specific.
-	Put(o plumbing.EncodedObject)
-	// Get gets an object from the cache given its hash. The second return value
-	// is true if the object was returned, and false otherwise.
-	Get(k plumbing.Hash) (plumbing.EncodedObject, bool)
-	// Clear clears every object from the cache.
-	Clear()
-}
-
-// Buffer is an interface to a buffer cache.
-type Buffer interface {
-	// Put puts a buffer into the cache. If the buffer is already in the cache,
-	// it will be marked as used. Otherwise, it will be inserted. Buffer might
-	// be evicted to make room for the new one.
-	Put(key int64, slice []byte)
-	// Get returns a buffer by its key. It marks the buffer as used. If the
-	// buffer is not in the cache, (nil, false) will be returned.
-	Get(key int64) ([]byte, bool)
-	// Clear clears every object from the cache.
-	Clear()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/object_lru.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/object_lru.go
deleted file mode 100644
index 75b2b72b0..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/cache/object_lru.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package cache
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-// ObjectLRU implements an object cache with an LRU eviction policy and a
-// maximum size (measured in object size).
-type ObjectLRU struct {
-	MaxSize FileSize
-
-	actualSize FileSize
-	ll         *list.List
-	cache      map[interface{}]*list.Element
-	mut        sync.Mutex
-}
-
-// NewObjectLRU creates a new ObjectLRU with the given maximum size. The maximum
-// size will never be exceeded.
-func NewObjectLRU(maxSize FileSize) *ObjectLRU {
-	return &ObjectLRU{MaxSize: maxSize}
-}
-
-// NewObjectLRUDefault creates a new ObjectLRU with the default cache size.
-func NewObjectLRUDefault() *ObjectLRU {
-	return &ObjectLRU{MaxSize: DefaultMaxSize}
-}
-
-// Put puts an object into the cache. If the object is already in the cache, it
-// will be marked as used. Otherwise, it will be inserted. A single object might
-// be evicted to make room for the new object.
-func (c *ObjectLRU) Put(obj plumbing.EncodedObject) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-
-	if c.cache == nil {
-		c.actualSize = 0
-		c.cache = make(map[interface{}]*list.Element, 1000)
-		c.ll = list.New()
-	}
-
-	objSize := FileSize(obj.Size())
-	key := obj.Hash()
-	if ee, ok := c.cache[key]; ok {
-		oldObj := ee.Value.(plumbing.EncodedObject)
-		// in this case objSize is a delta: new size - old size
-		objSize -= FileSize(oldObj.Size())
-		c.ll.MoveToFront(ee)
-		ee.Value = obj
-	} else {
-		if objSize > c.MaxSize {
-			return
-		}
-		ee := c.ll.PushFront(obj)
-		c.cache[key] = ee
-	}
-
-	c.actualSize += objSize
-	for c.actualSize > c.MaxSize {
-		last := c.ll.Back()
-		if last == nil {
-			c.actualSize = 0
-			break
-		}
-
-		lastObj := last.Value.(plumbing.EncodedObject)
-		lastSize := FileSize(lastObj.Size())
-
-		c.ll.Remove(last)
-		delete(c.cache, lastObj.Hash())
-		c.actualSize -= lastSize
-	}
-}
-
-// Get returns an object by its hash. It marks the object as used. If the object
-// is not in the cache, (nil, false) will be returned.
-func (c *ObjectLRU) Get(k plumbing.Hash) (plumbing.EncodedObject, bool) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-
-	ee, ok := c.cache[k]
-	if !ok {
-		return nil, false
-	}
-
-	c.ll.MoveToFront(ee)
-	return ee.Value.(plumbing.EncodedObject), true
-}
-
-// Clear the content of this object cache.
-func (c *ObjectLRU) Clear() {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-
-	c.ll = nil
-	c.cache = nil
-	c.actualSize = 0
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/color/color.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/color/color.go
deleted file mode 100644
index 2cd74bdc1..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/color/color.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package color
-
-// TODO read colors from a github.com/go-git/go-git/plumbing/format/config.Config struct
-// TODO implement color parsing, see https://github.com/git/git/blob/v2.26.2/color.c
-
-// Colors. See https://github.com/git/git/blob/v2.26.2/color.h#L24-L53.
-const (
-	Normal       = ""
-	Reset        = "\033[m"
-	Bold         = "\033[1m"
-	Red          = "\033[31m"
-	Green        = "\033[32m"
-	Yellow       = "\033[33m"
-	Blue         = "\033[34m"
-	Magenta      = "\033[35m"
-	Cyan         = "\033[36m"
-	BoldRed      = "\033[1;31m"
-	BoldGreen    = "\033[1;32m"
-	BoldYellow   = "\033[1;33m"
-	BoldBlue     = "\033[1;34m"
-	BoldMagenta  = "\033[1;35m"
-	BoldCyan     = "\033[1;36m"
-	FaintRed     = "\033[2;31m"
-	FaintGreen   = "\033[2;32m"
-	FaintYellow  = "\033[2;33m"
-	FaintBlue    = "\033[2;34m"
-	FaintMagenta = "\033[2;35m"
-	FaintCyan    = "\033[2;36m"
-	BgRed        = "\033[41m"
-	BgGreen      = "\033[42m"
-	BgYellow     = "\033[43m"
-	BgBlue       = "\033[44m"
-	BgMagenta    = "\033[45m"
-	BgCyan       = "\033[46m"
-	Faint        = "\033[2m"
-	FaintItalic  = "\033[2;3m"
-	Reverse      = "\033[7m"
-)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/error.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/error.go
deleted file mode 100644
index a3ebed3f6..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/error.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package plumbing
-
-import "fmt"
-
-type PermanentError struct {
-	Err error
-}
-
-func NewPermanentError(err error) *PermanentError {
-	if err == nil {
-		return nil
-	}
-
-	return &PermanentError{Err: err}
-}
-
-func (e *PermanentError) Error() string {
-	return fmt.Sprintf("permanent client error: %s", e.Err.Error())
-}
-
-type UnexpectedError struct {
-	Err error
-}
-
-func NewUnexpectedError(err error) *UnexpectedError {
-	if err == nil {
-		return nil
-	}
-
-	return &UnexpectedError{Err: err}
-}
-
-func (e *UnexpectedError) Error() string {
-	return fmt.Sprintf("unexpected client error: %s", e.Err.Error())
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/filemode/filemode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/filemode/filemode.go
deleted file mode 100644
index ea1a45755..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/filemode/filemode.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package filemode
-
-import (
-	"encoding/binary"
-	"fmt"
-	"os"
-	"strconv"
-)
-
-// A FileMode represents the kind of tree entries used by git. It
-// resembles regular file systems modes, although FileModes are
-// considerably simpler (there are not so many), and there are some,
-// like Submodule that has no file system equivalent.
-type FileMode uint32
-
-const (
-	// Empty is used as the FileMode of tree elements when comparing
-	// trees in the following situations:
-	//
-	// - the mode of tree elements before their creation.  - the mode of
-	// tree elements after their deletion.  - the mode of unmerged
-	// elements when checking the index.
-	//
-	// Empty has no file system equivalent.  As Empty is the zero value
-	// of FileMode, it is also returned by New and
-	// NewFromOsNewFromOSFileMode along with an error, when they fail.
-	Empty FileMode = 0
-	// Dir represent a Directory.
-	Dir FileMode = 0040000
-	// Regular represent non-executable files.  Please note this is not
-	// the same as golang regular files, which include executable files.
-	Regular FileMode = 0100644
-	// Deprecated represent non-executable files with the group writable
-	// bit set.  This mode was supported by the first versions of git,
-	// but it has been deprecated nowadays.  This library uses them
-	// internally, so you can read old packfiles, but will treat them as
-	// Regulars when interfacing with the outside world.  This is the
-	// standard git behaviour.
-	Deprecated FileMode = 0100664
-	// Executable represents executable files.
-	Executable FileMode = 0100755
-	// Symlink represents symbolic links to files.
-	Symlink FileMode = 0120000
-	// Submodule represents git submodules.  This mode has no file system
-	// equivalent.
-	Submodule FileMode = 0160000
-)
-
-// New takes the octal string representation of a FileMode and returns
-// the FileMode and a nil error.  If the string can not be parsed to a
-// 32 bit unsigned octal number, it returns Empty and the parsing error.
-//
-// Example: "40000" means Dir, "100644" means Regular.
-//
-// Please note this function does not check if the returned FileMode
-// is valid in git or if it is malformed.  For instance, "1" will
-// return the malformed FileMode(1) and a nil error.
-func New(s string) (FileMode, error) {
-	n, err := strconv.ParseUint(s, 8, 32)
-	if err != nil {
-		return Empty, err
-	}
-
-	return FileMode(n), nil
-}
-
-// NewFromOSFileMode returns the FileMode used by git to represent
-// the provided file system modes and a nil error on success.  If the
-// file system mode cannot be mapped to any valid git mode (as with
-// sockets or named pipes), it will return Empty and an error.
-//
-// Note that some git modes cannot be generated from os.FileModes, like
-// Deprecated and Submodule; while Empty will be returned, along with an
-// error, only when the method fails.
-func NewFromOSFileMode(m os.FileMode) (FileMode, error) {
-	if m.IsRegular() {
-		if isSetTemporary(m) {
-			return Empty, fmt.Errorf("no equivalent git mode for %s", m)
-		}
-		if isSetCharDevice(m) {
-			return Empty, fmt.Errorf("no equivalent git mode for %s", m)
-		}
-		if isSetUserExecutable(m) {
-			return Executable, nil
-		}
-		return Regular, nil
-	}
-
-	if m.IsDir() {
-		return Dir, nil
-	}
-
-	if isSetSymLink(m) {
-		return Symlink, nil
-	}
-
-	return Empty, fmt.Errorf("no equivalent git mode for %s", m)
-}
-
-func isSetCharDevice(m os.FileMode) bool {
-	return m&os.ModeCharDevice != 0
-}
-
-func isSetTemporary(m os.FileMode) bool {
-	return m&os.ModeTemporary != 0
-}
-
-func isSetUserExecutable(m os.FileMode) bool {
-	return m&0100 != 0
-}
-
-func isSetSymLink(m os.FileMode) bool {
-	return m&os.ModeSymlink != 0
-}
-
-// Bytes return a slice of 4 bytes with the mode in little endian
-// encoding.
-func (m FileMode) Bytes() []byte {
-	ret := make([]byte, 4)
-	binary.LittleEndian.PutUint32(ret, uint32(m))
-	return ret
-}
-
-// IsMalformed returns if the FileMode should not appear in a git packfile,
-// this is: Empty and any other mode not mentioned as a constant in this
-// package.
-func (m FileMode) IsMalformed() bool {
-	return m != Dir &&
-		m != Regular &&
-		m != Deprecated &&
-		m != Executable &&
-		m != Symlink &&
-		m != Submodule
-}
-
-// String returns the FileMode as a string in the standard git format,
-// this is, an octal number padded with ceros to 7 digits.  Malformed
-// modes are printed in that same format, for easier debugging.
-//
-// Example: Regular is "0100644", Empty is "0000000".
-func (m FileMode) String() string {
-	return fmt.Sprintf("%07o", uint32(m))
-}
-
-// IsRegular returns if the FileMode represents that of a regular file,
-// this is, either Regular or Deprecated.  Please note that Executable
-// are not regular even though in the UNIX tradition, they usually are:
-// See the IsFile method.
-func (m FileMode) IsRegular() bool {
-	return m == Regular ||
-		m == Deprecated
-}
-
-// IsFile returns if the FileMode represents that of a file, this is,
-// Regular, Deprecated, Executable or Link.
-func (m FileMode) IsFile() bool {
-	return m == Regular ||
-		m == Deprecated ||
-		m == Executable ||
-		m == Symlink
-}
-
-// ToOSFileMode returns the os.FileMode to be used when creating file
-// system elements with the given git mode and a nil error on success.
-//
-// When the provided mode cannot be mapped to a valid file system mode
-// (e.g.  Submodule) it returns os.FileMode(0) and an error.
-//
-// The returned file mode does not take into account the umask.
-func (m FileMode) ToOSFileMode() (os.FileMode, error) {
-	switch m {
-	case Dir:
-		return os.ModePerm | os.ModeDir, nil
-	case Submodule:
-		return os.ModePerm | os.ModeDir, nil
-	case Regular:
-		return os.FileMode(0644), nil
-	// Deprecated is no longer allowed: treated as a Regular instead
-	case Deprecated:
-		return os.FileMode(0644), nil
-	case Executable:
-		return os.FileMode(0755), nil
-	case Symlink:
-		return os.ModePerm | os.ModeSymlink, nil
-	}
-
-	return os.FileMode(0), fmt.Errorf("malformed mode (%s)", m)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/common.go
deleted file mode 100644
index 6d689ea1e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/common.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package config
-
-// New creates a new config instance.
-func New() *Config {
-	return &Config{}
-}
-
-// Config contains all the sections, comments and includes from a config file.
-type Config struct {
-	Comment  *Comment
-	Sections Sections
-	Includes Includes
-}
-
-// Includes is a list of Includes in a config file.
-type Includes []*Include
-
-// Include is a reference to an included config file.
-type Include struct {
-	Path   string
-	Config *Config
-}
-
-// Comment string without the prefix '#' or ';'.
-type Comment string
-
-const (
-	// NoSubsection token is passed to Config.Section and Config.SetSection to
-	// represent the absence of a section.
-	NoSubsection = ""
-)
-
-// Section returns a existing section with the given name or creates a new one.
-func (c *Config) Section(name string) *Section {
-	for i := len(c.Sections) - 1; i >= 0; i-- {
-		s := c.Sections[i]
-		if s.IsName(name) {
-			return s
-		}
-	}
-
-	s := &Section{Name: name}
-	c.Sections = append(c.Sections, s)
-	return s
-}
-
-// HasSection checks if the Config has a section with the specified name.
-func (c *Config) HasSection(name string) bool {
-	for _, s := range c.Sections {
-		if s.IsName(name) {
-			return true
-		}
-	}
-	return false
-}
-
-// RemoveSection removes a section from a config file.
-func (c *Config) RemoveSection(name string) *Config {
-	result := Sections{}
-	for _, s := range c.Sections {
-		if !s.IsName(name) {
-			result = append(result, s)
-		}
-	}
-
-	c.Sections = result
-	return c
-}
-
-// RemoveSubsection remove a subsection from a config file.
-func (c *Config) RemoveSubsection(section string, subsection string) *Config {
-	for _, s := range c.Sections {
-		if s.IsName(section) {
-			result := Subsections{}
-			for _, ss := range s.Subsections {
-				if !ss.IsName(subsection) {
-					result = append(result, ss)
-				}
-			}
-			s.Subsections = result
-		}
-	}
-
-	return c
-}
-
-// AddOption adds an option to a given section and subsection. Use the
-// NoSubsection constant for the subsection argument if no subsection is wanted.
-func (c *Config) AddOption(section string, subsection string, key string, value string) *Config {
-	if subsection == "" {
-		c.Section(section).AddOption(key, value)
-	} else {
-		c.Section(section).Subsection(subsection).AddOption(key, value)
-	}
-
-	return c
-}
-
-// SetOption sets an option to a given section and subsection. Use the
-// NoSubsection constant for the subsection argument if no subsection is wanted.
-func (c *Config) SetOption(section string, subsection string, key string, value string) *Config {
-	if subsection == "" {
-		c.Section(section).SetOption(key, value)
-	} else {
-		c.Section(section).Subsection(subsection).SetOption(key, value)
-	}
-
-	return c
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/decoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/decoder.go
deleted file mode 100644
index 8e52d57f3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/decoder.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package config
-
-import (
-	"io"
-
-	"github.com/go-git/gcfg"
-)
-
-// A Decoder reads and decodes config files from an input stream.
-type Decoder struct {
-	io.Reader
-}
-
-// NewDecoder returns a new decoder that reads from r.
-func NewDecoder(r io.Reader) *Decoder {
-	return &Decoder{r}
-}
-
-// Decode reads the whole config from its input and stores it in the
-// value pointed to by config.
-func (d *Decoder) Decode(config *Config) error {
-	cb := func(s string, ss string, k string, v string, bv bool) error {
-		if ss == "" && k == "" {
-			config.Section(s)
-			return nil
-		}
-
-		if ss != "" && k == "" {
-			config.Section(s).Subsection(ss)
-			return nil
-		}
-
-		config.AddOption(s, ss, k, v)
-		return nil
-	}
-	return gcfg.ReadWithCallback(d, cb)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/doc.go
deleted file mode 100644
index 3986c8365..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/doc.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Package config implements encoding and decoding of git config files.
-//
-// 	Configuration File
-// 	------------------
-//
-// 	The Git configuration file contains a number of variables that affect
-// 	the Git commands' behavior. The `.git/config` file in each repository
-// 	is used to store the configuration for that repository, and
-// 	`$HOME/.gitconfig` is used to store a per-user configuration as
-// 	fallback values for the `.git/config` file. The file `/etc/gitconfig`
-// 	can be used to store a system-wide default configuration.
-//
-// 	The configuration variables are used by both the Git plumbing
-// 	and the porcelains. The variables are divided into sections, wherein
-// 	the fully qualified variable name of the variable itself is the last
-// 	dot-separated segment and the section name is everything before the last
-// 	dot. The variable names are case-insensitive, allow only alphanumeric
-// 	characters and `-`, and must start with an alphabetic character.  Some
-// 	variables may appear multiple times; we say then that the variable is
-// 	multivalued.
-//
-// 	Syntax
-// 	~~~~~~
-//
-// 	The syntax is fairly flexible and permissive; whitespaces are mostly
-// 	ignored.  The '#' and ';' characters begin comments to the end of line,
-// 	blank lines are ignored.
-//
-// 	The file consists of sections and variables.  A section begins with
-// 	the name of the section in square brackets and continues until the next
-// 	section begins.  Section names are case-insensitive.  Only alphanumeric
-// 	characters, `-` and `.` are allowed in section names.  Each variable
-// 	must belong to some section, which means that there must be a section
-// 	header before the first setting of a variable.
-//
-// 	Sections can be further divided into subsections.  To begin a subsection
-// 	put its name in double quotes, separated by space from the section name,
-// 	in the section header, like in the example below:
-//
-// 	--------
-// 		[section "subsection"]
-//
-// 	--------
-//
-// 	Subsection names are case sensitive and can contain any characters except
-// 	newline (doublequote `"` and backslash can be included by escaping them
-// 	as `\"` and `\\`, respectively).  Section headers cannot span multiple
-// 	lines.  Variables may belong directly to a section or to a given subsection.
-// 	You can have `[section]` if you have `[section "subsection"]`, but you
-// 	don't need to.
-//
-// 	There is also a deprecated `[section.subsection]` syntax. With this
-// 	syntax, the subsection name is converted to lower-case and is also
-// 	compared case sensitively. These subsection names follow the same
-// 	restrictions as section names.
-//
-// 	All the other lines (and the remainder of the line after the section
-// 	header) are recognized as setting variables, in the form
-// 	'name = value' (or just 'name', which is a short-hand to say that
-// 	the variable is the boolean "true").
-// 	The variable names are case-insensitive, allow only alphanumeric characters
-// 	and `-`, and must start with an alphabetic character.
-//
-// 	A line that defines a value can be continued to the next line by
-// 	ending it with a `\`; the backquote and the end-of-line are
-// 	stripped.  Leading whitespaces after 'name =', the remainder of the
-// 	line after the first comment character '#' or ';', and trailing
-// 	whitespaces of the line are discarded unless they are enclosed in
-// 	double quotes.  Internal whitespaces within the value are retained
-// 	verbatim.
-//
-// 	Inside double quotes, double quote `"` and backslash `\` characters
-// 	must be escaped: use `\"` for `"` and `\\` for `\`.
-//
-// 	The following escape sequences (beside `\"` and `\\`) are recognized:
-// 	`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
-// 	and `\b` for backspace (BS).  Other char escape sequences (including octal
-// 	escape sequences) are invalid.
-//
-// 	Includes
-// 	~~~~~~~~
-//
-// 	You can include one config file from another by setting the special
-// 	`include.path` variable to the name of the file to be included. The
-// 	variable takes a pathname as its value, and is subject to tilde
-// 	expansion.
-//
-// 	The included file is expanded immediately, as if its contents had been
-// 	found at the location of the include directive. If the value of the
-// 	`include.path` variable is a relative path, the path is considered to be
-// 	relative to the configuration file in which the include directive was
-// 	found.  See below for examples.
-//
-//
-// 	Example
-// 	~~~~~~~
-//
-// 		# Core variables
-// 		[core]
-// 			; Don't trust file modes
-// 			filemode = false
-//
-// 		# Our diff algorithm
-// 		[diff]
-// 			external = /usr/local/bin/diff-wrapper
-// 			renames = true
-//
-// 		[branch "devel"]
-// 			remote = origin
-// 			merge = refs/heads/devel
-//
-// 		# Proxy settings
-// 		[core]
-// 			gitProxy="ssh" for "kernel.org"
-// 			gitProxy=default-proxy ; for the rest
-//
-// 		[include]
-// 			path = /path/to/foo.inc ; include by absolute path
-// 			path = foo ; expand "foo" relative to the current file
-// 			path = ~/foo ; expand "foo" in your `$HOME` directory
-//
-package config
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/encoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/encoder.go
deleted file mode 100644
index de069aed5..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/encoder.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"io"
-	"strings"
-)
-
-// An Encoder writes config files to an output stream.
-type Encoder struct {
-	w io.Writer
-}
-
-var (
-	subsectionReplacer = strings.NewReplacer(`"`, `\"`, `\`, `\\`)
-	valueReplacer = strings.NewReplacer(`"`, `\"`, `\`, `\\`, "\n", `\n`, "\t", `\t`, "\b", `\b`)
-)
-// NewEncoder returns a new encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	return &Encoder{w}
-}
-
-// Encode writes the config in git config format to the stream of the encoder.
-func (e *Encoder) Encode(cfg *Config) error {
-	for _, s := range cfg.Sections {
-		if err := e.encodeSection(s); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (e *Encoder) encodeSection(s *Section) error {
-	if len(s.Options) > 0 {
-		if err := e.printf("[%s]\n", s.Name); err != nil {
-			return err
-		}
-
-		if err := e.encodeOptions(s.Options); err != nil {
-			return err
-		}
-	}
-
-	for _, ss := range s.Subsections {
-		if err := e.encodeSubsection(s.Name, ss); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (e *Encoder) encodeSubsection(sectionName string, s *Subsection) error {
-	if err := e.printf("[%s \"%s\"]\n", sectionName, subsectionReplacer.Replace(s.Name)); err != nil {
-		return err
-	}
-
-	return e.encodeOptions(s.Options)
-}
-
-func (e *Encoder) encodeOptions(opts Options) error {
-	for _, o := range opts {
-		var value string
-		if strings.ContainsAny(o.Value, "#;\"\t\n\\") || strings.HasPrefix(o.Value, " ") || strings.HasSuffix(o.Value, " ") {
-			value = `"`+valueReplacer.Replace(o.Value)+`"`
-		} else {
-			value = o.Value
-		}
-
-		if err := e.printf("\t%s = %s\n", o.Key, value); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (e *Encoder) printf(msg string, args ...interface{}) error {
-	_, err := fmt.Fprintf(e.w, msg, args...)
-	return err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/format.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/format.go
deleted file mode 100644
index 4873ea925..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/format.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package config
-
-// RepositoryFormatVersion represents the repository format version,
-// as per defined at:
-//
-//	https://git-scm.com/docs/repository-version
-type RepositoryFormatVersion string
-
-const (
-	// Version_0 is the format defined by the initial version of git,
-	// including but not limited to the format of the repository
-	// directory, the repository configuration file, and the object
-	// and ref storage.
-	//
-	// Specifying the complete behavior of git is beyond the scope
-	// of this document.
-	Version_0 = "0"
-
-	// Version_1 is identical to version 0, with the following exceptions:
-	//
-	//   1. When reading the core.repositoryformatversion variable, a git
-	//		implementation which supports version 1 MUST also read any
-	//		configuration keys found in the extensions section of the
-	//		configuration file.
-	//
-	//	 2. If a version-1 repository specifies any extensions.* keys that
-	//		the running git has not implemented, the operation MUST NOT proceed.
-	//		Similarly, if the value of any known key is not understood by the
-	//		implementation, the operation MUST NOT proceed.
-	//
-	// Note that if no extensions are specified in the config file, then
-	// core.repositoryformatversion SHOULD be set to 0 (setting it to 1 provides
-	// no benefit, and makes the repository incompatible with older
-	// implementations of git).
-	Version_1 = "1"
-
-	// DefaultRepositoryFormatVersion holds the default repository format version.
-	DefaultRepositoryFormatVersion = Version_0
-)
-
-// ObjectFormat defines the object format.
-type ObjectFormat string
-
-const (
-	// SHA1 represents the object format used for SHA1.
-	SHA1 ObjectFormat = "sha1"
-
-	// SHA256 represents the object format used for SHA256.
-	SHA256 ObjectFormat = "sha256"
-
-	// DefaultObjectFormat holds the default object format.
-	DefaultObjectFormat = SHA1
-)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/option.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/option.go
deleted file mode 100644
index cad394810..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/option.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"strings"
-)
-
-// Option defines a key/value entity in a config file.
-type Option struct {
-	// Key preserving original caseness.
-	// Use IsKey instead to compare key regardless of caseness.
-	Key string
-	// Original value as string, could be not normalized.
-	Value string
-}
-
-type Options []*Option
-
-// IsKey returns true if the given key matches
-// this option's key in a case-insensitive comparison.
-func (o *Option) IsKey(key string) bool {
-	return strings.EqualFold(o.Key, key)
-}
-
-func (opts Options) GoString() string {
-	var strs []string
-	for _, opt := range opts {
-		strs = append(strs, fmt.Sprintf("%#v", opt))
-	}
-
-	return strings.Join(strs, ", ")
-}
-
-// Get gets the value for the given key if set,
-// otherwise it returns the empty string.
-//
-// Note that there is no difference
-//
-// This matches git behaviour since git v1.8.1-rc1,
-// if there are multiple definitions of a key, the
-// last one wins.
-//
-// See: http://article.gmane.org/gmane.linux.kernel/1407184
-//
-// In order to get all possible values for the same key,
-// use GetAll.
-func (opts Options) Get(key string) string {
-	for i := len(opts) - 1; i >= 0; i-- {
-		o := opts[i]
-		if o.IsKey(key) {
-			return o.Value
-		}
-	}
-	return ""
-}
-
-// Has checks if an Option exist with the given key.
-func (opts Options) Has(key string) bool {
-	for _, o := range opts {
-		if o.IsKey(key) {
-			return true
-		}
-	}
-	return false
-}
-
-// GetAll returns all possible values for the same key.
-func (opts Options) GetAll(key string) []string {
-	result := []string{}
-	for _, o := range opts {
-		if o.IsKey(key) {
-			result = append(result, o.Value)
-		}
-	}
-	return result
-}
-
-func (opts Options) withoutOption(key string) Options {
-	result := Options{}
-	for _, o := range opts {
-		if !o.IsKey(key) {
-			result = append(result, o)
-		}
-	}
-	return result
-}
-
-func (opts Options) withAddedOption(key string, value string) Options {
-	return append(opts, &Option{key, value})
-}
-
-func (opts Options) withSettedOption(key string, values ...string) Options {
-	var result Options
-	var added []string
-	for _, o := range opts {
-		if !o.IsKey(key) {
-			result = append(result, o)
-			continue
-		}
-
-		if contains(values, o.Value) {
-			added = append(added, o.Value)
-			result = append(result, o)
-			continue
-		}
-	}
-
-	for _, value := range values {
-		if contains(added, value) {
-			continue
-		}
-
-		result = result.withAddedOption(key, value)
-	}
-
-	return result
-}
-
-func contains(haystack []string, needle string) bool {
-	for _, s := range haystack {
-		if s == needle {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/section.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/section.go
deleted file mode 100644
index 4625ac583..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/config/section.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"strings"
-)
-
-// Section is the representation of a section inside git configuration files.
-// Each Section contains Options that are used by both the Git plumbing
-// and the porcelains.
-// Sections can be further divided into subsections. To begin a subsection
-// put its name in double quotes, separated by space from the section name,
-// in the section header, like in the example below:
-//
-//     [section "subsection"]
-//
-// All the other lines (and the remainder of the line after the section header)
-// are recognized as option variables, in the form "name = value" (or just name,
-// which is a short-hand to say that the variable is the boolean "true").
-// The variable names are case-insensitive, allow only alphanumeric characters
-// and -, and must start with an alphabetic character:
-//
-//     [section "subsection1"]
-//         option1 = value1
-//         option2
-//     [section "subsection2"]
-//         option3 = value2
-//
-type Section struct {
-	Name        string
-	Options     Options
-	Subsections Subsections
-}
-
-type Subsection struct {
-	Name    string
-	Options Options
-}
-
-type Sections []*Section
-
-func (s Sections) GoString() string {
-	var strs []string
-	for _, ss := range s {
-		strs = append(strs, fmt.Sprintf("%#v", ss))
-	}
-
-	return strings.Join(strs, ", ")
-}
-
-type Subsections []*Subsection
-
-func (s Subsections) GoString() string {
-	var strs []string
-	for _, ss := range s {
-		strs = append(strs, fmt.Sprintf("%#v", ss))
-	}
-
-	return strings.Join(strs, ", ")
-}
-
-// IsName checks if the name provided is equals to the Section name, case insensitive.
-func (s *Section) IsName(name string) bool {
-	return strings.EqualFold(s.Name, name)
-}
-
-// Subsection returns a Subsection from the specified Section. If the
-// Subsection does not exists, new one is created and added to Section.
-func (s *Section) Subsection(name string) *Subsection {
-	for i := len(s.Subsections) - 1; i >= 0; i-- {
-		ss := s.Subsections[i]
-		if ss.IsName(name) {
-			return ss
-		}
-	}
-
-	ss := &Subsection{Name: name}
-	s.Subsections = append(s.Subsections, ss)
-	return ss
-}
-
-// HasSubsection checks if the Section has a Subsection with the specified name.
-func (s *Section) HasSubsection(name string) bool {
-	for _, ss := range s.Subsections {
-		if ss.IsName(name) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// RemoveSubsection removes a subsection from a Section.
-func (s *Section) RemoveSubsection(name string) *Section {
-	result := Subsections{}
-	for _, s := range s.Subsections {
-		if !s.IsName(name) {
-			result = append(result, s)
-		}
-	}
-
-	s.Subsections = result
-	return s
-}
-
-// Option returns the value for the specified key. Empty string is returned if
-// key does not exists.
-func (s *Section) Option(key string) string {
-	return s.Options.Get(key)
-}
-
-// OptionAll returns all possible values for an option with the specified key.
-// If the option does not exists, an empty slice will be returned.
-func (s *Section) OptionAll(key string) []string {
-	return s.Options.GetAll(key)
-}
-
-// HasOption checks if the Section has an Option with the given key.
-func (s *Section) HasOption(key string) bool {
-	return s.Options.Has(key)
-}
-
-// AddOption adds a new Option to the Section. The updated Section is returned.
-func (s *Section) AddOption(key string, value string) *Section {
-	s.Options = s.Options.withAddedOption(key, value)
-	return s
-}
-
-// SetOption adds a new Option to the Section. If the option already exists, is replaced.
-// The updated Section is returned.
-func (s *Section) SetOption(key string, value string) *Section {
-	s.Options = s.Options.withSettedOption(key, value)
-	return s
-}
-
-// Remove an option with the specified key. The updated Section is returned.
-func (s *Section) RemoveOption(key string) *Section {
-	s.Options = s.Options.withoutOption(key)
-	return s
-}
-
-// IsName checks if the name of the subsection is exactly the specified name.
-func (s *Subsection) IsName(name string) bool {
-	return s.Name == name
-}
-
-// Option returns an option with the specified key. If the option does not exists,
-// empty spring will be returned.
-func (s *Subsection) Option(key string) string {
-	return s.Options.Get(key)
-}
-
-// OptionAll returns all possible values for an option with the specified key.
-// If the option does not exists, an empty slice will be returned.
-func (s *Subsection) OptionAll(key string) []string {
-	return s.Options.GetAll(key)
-}
-
-// HasOption checks if the Subsection has an Option with the given key.
-func (s *Subsection) HasOption(key string) bool {
-	return s.Options.Has(key)
-}
-
-// AddOption adds a new Option to the Subsection. The updated Subsection is returned.
-func (s *Subsection) AddOption(key string, value string) *Subsection {
-	s.Options = s.Options.withAddedOption(key, value)
-	return s
-}
-
-// SetOption adds a new Option to the Subsection. If the option already exists, is replaced.
-// The updated Subsection is returned.
-func (s *Subsection) SetOption(key string, value ...string) *Subsection {
-	s.Options = s.Options.withSettedOption(key, value...)
-	return s
-}
-
-// RemoveOption removes the option with the specified key. The updated Subsection is returned.
-func (s *Subsection) RemoveOption(key string) *Subsection {
-	s.Options = s.Options.withoutOption(key)
-	return s
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/colorconfig.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/colorconfig.go
deleted file mode 100644
index 212401be7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/colorconfig.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package diff
-
-import "github.com/jesseduffield/go-git/v5/plumbing/color"
-
-// A ColorKey is a key into a ColorConfig map and also equal to the key in the
-// diff.color subsection of the config. See
-// https://github.com/git/git/blob/v2.26.2/diff.c#L83-L106.
-type ColorKey string
-
-// ColorKeys.
-const (
-	Context                   ColorKey = "context"
-	Meta                      ColorKey = "meta"
-	Frag                      ColorKey = "frag"
-	Old                       ColorKey = "old"
-	New                       ColorKey = "new"
-	Commit                    ColorKey = "commit"
-	Whitespace                ColorKey = "whitespace"
-	Func                      ColorKey = "func"
-	OldMoved                  ColorKey = "oldMoved"
-	OldMovedAlternative       ColorKey = "oldMovedAlternative"
-	OldMovedDimmed            ColorKey = "oldMovedDimmed"
-	OldMovedAlternativeDimmed ColorKey = "oldMovedAlternativeDimmed"
-	NewMoved                  ColorKey = "newMoved"
-	NewMovedAlternative       ColorKey = "newMovedAlternative"
-	NewMovedDimmed            ColorKey = "newMovedDimmed"
-	NewMovedAlternativeDimmed ColorKey = "newMovedAlternativeDimmed"
-	ContextDimmed             ColorKey = "contextDimmed"
-	OldDimmed                 ColorKey = "oldDimmed"
-	NewDimmed                 ColorKey = "newDimmed"
-	ContextBold               ColorKey = "contextBold"
-	OldBold                   ColorKey = "oldBold"
-	NewBold                   ColorKey = "newBold"
-)
-
-// A ColorConfig is a color configuration. A nil or empty ColorConfig
-// corresponds to no color.
-type ColorConfig map[ColorKey]string
-
-// A ColorConfigOption sets an option on a ColorConfig.
-type ColorConfigOption func(ColorConfig)
-
-// WithColor sets the color for key.
-func WithColor(key ColorKey, color string) ColorConfigOption {
-	return func(cc ColorConfig) {
-		cc[key] = color
-	}
-}
-
-// defaultColorConfig is the default color configuration. See
-// https://github.com/git/git/blob/v2.26.2/diff.c#L57-L81.
-var defaultColorConfig = ColorConfig{
-	Context:                   color.Normal,
-	Meta:                      color.Bold,
-	Frag:                      color.Cyan,
-	Old:                       color.Red,
-	New:                       color.Green,
-	Commit:                    color.Yellow,
-	Whitespace:                color.BgRed,
-	Func:                      color.Normal,
-	OldMoved:                  color.BoldMagenta,
-	OldMovedAlternative:       color.BoldBlue,
-	OldMovedDimmed:            color.Faint,
-	OldMovedAlternativeDimmed: color.FaintItalic,
-	NewMoved:                  color.BoldCyan,
-	NewMovedAlternative:       color.BoldYellow,
-	NewMovedDimmed:            color.Faint,
-	NewMovedAlternativeDimmed: color.FaintItalic,
-	ContextDimmed:             color.Faint,
-	OldDimmed:                 color.FaintRed,
-	NewDimmed:                 color.FaintGreen,
-	ContextBold:               color.Bold,
-	OldBold:                   color.BoldRed,
-	NewBold:                   color.BoldGreen,
-}
-
-// NewColorConfig returns a new ColorConfig.
-func NewColorConfig(options ...ColorConfigOption) ColorConfig {
-	cc := make(ColorConfig)
-	for key, value := range defaultColorConfig {
-		cc[key] = value
-	}
-	for _, option := range options {
-		option(cc)
-	}
-	return cc
-}
-
-// Reset returns the ANSI escape sequence to reset the color with key set from
-// cc. If no color was set then no reset is needed so it returns the empty
-// string.
-func (cc ColorConfig) Reset(key ColorKey) string {
-	if cc[key] == "" {
-		return ""
-	}
-	return color.Reset
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/patch.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/patch.go
deleted file mode 100644
index 330f5dc1f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/patch.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package diff
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-)
-
-// Operation defines the operation of a diff item.
-type Operation int
-
-const (
-	// Equal item represents an equals diff.
-	Equal Operation = iota
-	// Add item represents an insert diff.
-	Add
-	// Delete item represents a delete diff.
-	Delete
-)
-
-// Patch represents a collection of steps to transform several files.
-type Patch interface {
-	// FilePatches returns a slice of patches per file.
-	FilePatches() []FilePatch
-	// Message returns an optional message that can be at the top of the
-	// Patch representation.
-	Message() string
-}
-
-// FilePatch represents the necessary steps to transform one file into another.
-type FilePatch interface {
-	// IsBinary returns true if this patch is representing a binary file.
-	IsBinary() bool
-	// Files returns the from and to Files, with all the necessary metadata
-	// about them. If the patch creates a new file, "from" will be nil.
-	// If the patch deletes a file, "to" will be nil.
-	Files() (from, to File)
-	// Chunks returns a slice of ordered changes to transform "from" File into
-	// "to" File. If the file is a binary one, Chunks will be empty.
-	Chunks() []Chunk
-}
-
-// File contains all the file metadata necessary to print some patch formats.
-type File interface {
-	// Hash returns the File Hash.
-	Hash() plumbing.Hash
-	// Mode returns the FileMode.
-	Mode() filemode.FileMode
-	// Path returns the complete Path to the file, including the filename.
-	Path() string
-}
-
-// Chunk represents a portion of a file transformation into another.
-type Chunk interface {
-	// Content contains the portion of the file.
-	Content() string
-	// Type contains the Operation to do with this Chunk.
-	Type() Operation
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/unified_encoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/unified_encoder.go
deleted file mode 100644
index 7c811c078..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/diff/unified_encoder.go
+++ /dev/null
@@ -1,395 +0,0 @@
-package diff
-
-import (
-	"fmt"
-	"io"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-// DefaultContextLines is the default number of context lines.
-const DefaultContextLines = 3
-
-var (
-	splitLinesRegexp = regexp.MustCompile(`[^\n]*(\n|$)`)
-
-	operationChar = map[Operation]byte{
-		Add:    '+',
-		Delete: '-',
-		Equal:  ' ',
-	}
-
-	operationColorKey = map[Operation]ColorKey{
-		Add:    New,
-		Delete: Old,
-		Equal:  Context,
-	}
-)
-
-// UnifiedEncoder encodes an unified diff into the provided Writer. It does not
-// support similarity index for renames or sorting hash representations.
-type UnifiedEncoder struct {
-	io.Writer
-
-	// contextLines is the count of unchanged lines that will appear surrounding
-	// a change.
-	contextLines int
-
-	// srcPrefix and dstPrefix are prepended to file paths when encoding a diff.
-	srcPrefix string
-	dstPrefix string
-
-	// colorConfig is the color configuration. The default is no color.
-	color ColorConfig
-}
-
-// NewUnifiedEncoder returns a new UnifiedEncoder that writes to w.
-func NewUnifiedEncoder(w io.Writer, contextLines int) *UnifiedEncoder {
-	return &UnifiedEncoder{
-		Writer:       w,
-		srcPrefix:    "a/",
-		dstPrefix:    "b/",
-		contextLines: contextLines,
-	}
-}
-
-// SetColor sets e's color configuration and returns e.
-func (e *UnifiedEncoder) SetColor(colorConfig ColorConfig) *UnifiedEncoder {
-	e.color = colorConfig
-	return e
-}
-
-// SetSrcPrefix sets e's srcPrefix and returns e.
-func (e *UnifiedEncoder) SetSrcPrefix(prefix string) *UnifiedEncoder {
-	e.srcPrefix = prefix
-	return e
-}
-
-// SetDstPrefix sets e's dstPrefix and returns e.
-func (e *UnifiedEncoder) SetDstPrefix(prefix string) *UnifiedEncoder {
-	e.dstPrefix = prefix
-	return e
-}
-
-// Encode encodes patch.
-func (e *UnifiedEncoder) Encode(patch Patch) error {
-	sb := &strings.Builder{}
-
-	if message := patch.Message(); message != "" {
-		sb.WriteString(message)
-		if !strings.HasSuffix(message, "\n") {
-			sb.WriteByte('\n')
-		}
-	}
-
-	for _, filePatch := range patch.FilePatches() {
-		e.writeFilePatchHeader(sb, filePatch)
-		g := newHunksGenerator(filePatch.Chunks(), e.contextLines)
-		for _, hunk := range g.Generate() {
-			hunk.writeTo(sb, e.color)
-		}
-	}
-
-	_, err := e.Write([]byte(sb.String()))
-	return err
-}
-
-func (e *UnifiedEncoder) writeFilePatchHeader(sb *strings.Builder, filePatch FilePatch) {
-	from, to := filePatch.Files()
-	if from == nil && to == nil {
-		return
-	}
-	isBinary := filePatch.IsBinary()
-
-	var lines []string
-	switch {
-	case from != nil && to != nil:
-		hashEquals := from.Hash() == to.Hash()
-		lines = append(lines,
-			fmt.Sprintf("diff --git %s%s %s%s",
-				e.srcPrefix, from.Path(), e.dstPrefix, to.Path()),
-		)
-		if from.Mode() != to.Mode() {
-			lines = append(lines,
-				fmt.Sprintf("old mode %o", from.Mode()),
-				fmt.Sprintf("new mode %o", to.Mode()),
-			)
-		}
-		if from.Path() != to.Path() {
-			lines = append(lines,
-				fmt.Sprintf("rename from %s", from.Path()),
-				fmt.Sprintf("rename to %s", to.Path()),
-			)
-		}
-		if from.Mode() != to.Mode() && !hashEquals {
-			lines = append(lines,
-				fmt.Sprintf("index %s..%s", from.Hash(), to.Hash()),
-			)
-		} else if !hashEquals {
-			lines = append(lines,
-				fmt.Sprintf("index %s..%s %o", from.Hash(), to.Hash(), from.Mode()),
-			)
-		}
-		if !hashEquals {
-			lines = e.appendPathLines(lines, e.srcPrefix+from.Path(), e.dstPrefix+to.Path(), isBinary)
-		}
-	case from == nil:
-		lines = append(lines,
-			fmt.Sprintf("diff --git %s %s", e.srcPrefix+to.Path(), e.dstPrefix+to.Path()),
-			fmt.Sprintf("new file mode %o", to.Mode()),
-			fmt.Sprintf("index %s..%s", plumbing.ZeroHash, to.Hash()),
-		)
-		lines = e.appendPathLines(lines, "/dev/null", e.dstPrefix+to.Path(), isBinary)
-	case to == nil:
-		lines = append(lines,
-			fmt.Sprintf("diff --git %s %s", e.srcPrefix+from.Path(), e.dstPrefix+from.Path()),
-			fmt.Sprintf("deleted file mode %o", from.Mode()),
-			fmt.Sprintf("index %s..%s", from.Hash(), plumbing.ZeroHash),
-		)
-		lines = e.appendPathLines(lines, e.srcPrefix+from.Path(), "/dev/null", isBinary)
-	}
-
-	sb.WriteString(e.color[Meta])
-	sb.WriteString(lines[0])
-	for _, line := range lines[1:] {
-		sb.WriteByte('\n')
-		sb.WriteString(line)
-	}
-	sb.WriteString(e.color.Reset(Meta))
-	sb.WriteByte('\n')
-}
-
-func (e *UnifiedEncoder) appendPathLines(lines []string, fromPath, toPath string, isBinary bool) []string {
-	if isBinary {
-		return append(lines,
-			fmt.Sprintf("Binary files %s and %s differ", fromPath, toPath),
-		)
-	}
-	return append(lines,
-		fmt.Sprintf("--- %s", fromPath),
-		fmt.Sprintf("+++ %s", toPath),
-	)
-}
-
-type hunksGenerator struct {
-	fromLine, toLine            int
-	ctxLines                    int
-	chunks                      []Chunk
-	current                     *hunk
-	hunks                       []*hunk
-	beforeContext, afterContext []string
-}
-
-func newHunksGenerator(chunks []Chunk, ctxLines int) *hunksGenerator {
-	return &hunksGenerator{
-		chunks:   chunks,
-		ctxLines: ctxLines,
-	}
-}
-
-func (g *hunksGenerator) Generate() []*hunk {
-	for i, chunk := range g.chunks {
-		lines := splitLines(chunk.Content())
-		nLines := len(lines)
-
-		switch chunk.Type() {
-		case Equal:
-			g.fromLine += nLines
-			g.toLine += nLines
-			g.processEqualsLines(lines, i)
-		case Delete:
-			if nLines != 0 {
-				g.fromLine++
-			}
-
-			g.processHunk(i, chunk.Type())
-			g.fromLine += nLines - 1
-			g.current.AddOp(chunk.Type(), lines...)
-		case Add:
-			if nLines != 0 {
-				g.toLine++
-			}
-			g.processHunk(i, chunk.Type())
-			g.toLine += nLines - 1
-			g.current.AddOp(chunk.Type(), lines...)
-		}
-
-		if i == len(g.chunks)-1 && g.current != nil {
-			g.hunks = append(g.hunks, g.current)
-		}
-	}
-
-	return g.hunks
-}
-
-func (g *hunksGenerator) processHunk(i int, op Operation) {
-	if g.current != nil {
-		return
-	}
-
-	var ctxPrefix string
-	linesBefore := len(g.beforeContext)
-	if linesBefore > g.ctxLines {
-		ctxPrefix = g.beforeContext[linesBefore-g.ctxLines-1]
-		g.beforeContext = g.beforeContext[linesBefore-g.ctxLines:]
-		linesBefore = g.ctxLines
-	}
-
-	g.current = &hunk{ctxPrefix: strings.TrimSuffix(ctxPrefix, "\n")}
-	g.current.AddOp(Equal, g.beforeContext...)
-
-	switch op {
-	case Delete:
-		g.current.fromLine, g.current.toLine =
-			g.addLineNumbers(g.fromLine, g.toLine, linesBefore, i, Add)
-	case Add:
-		g.current.toLine, g.current.fromLine =
-			g.addLineNumbers(g.toLine, g.fromLine, linesBefore, i, Delete)
-	}
-
-	g.beforeContext = nil
-}
-
-// addLineNumbers obtains the line numbers in a new chunk.
-func (g *hunksGenerator) addLineNumbers(la, lb int, linesBefore int, i int, op Operation) (cla, clb int) {
-	cla = la - linesBefore
-	// we need to search for a reference for the next diff
-	switch {
-	case linesBefore != 0 && g.ctxLines != 0:
-		if lb > g.ctxLines {
-			clb = lb - g.ctxLines + 1
-		} else {
-			clb = 1
-		}
-	case g.ctxLines == 0:
-		clb = lb
-	case i != len(g.chunks)-1:
-		next := g.chunks[i+1]
-		if next.Type() == op || next.Type() == Equal {
-			// this diff will be into this chunk
-			clb = lb + 1
-		}
-	}
-
-	return
-}
-
-func (g *hunksGenerator) processEqualsLines(ls []string, i int) {
-	if g.current == nil {
-		g.beforeContext = append(g.beforeContext, ls...)
-		return
-	}
-
-	g.afterContext = append(g.afterContext, ls...)
-	if len(g.afterContext) <= g.ctxLines*2 && i != len(g.chunks)-1 {
-		g.current.AddOp(Equal, g.afterContext...)
-		g.afterContext = nil
-	} else {
-		ctxLines := g.ctxLines
-		if ctxLines > len(g.afterContext) {
-			ctxLines = len(g.afterContext)
-		}
-		g.current.AddOp(Equal, g.afterContext[:ctxLines]...)
-		g.hunks = append(g.hunks, g.current)
-
-		g.current = nil
-		g.beforeContext = g.afterContext[ctxLines:]
-		g.afterContext = nil
-	}
-}
-
-func splitLines(s string) []string {
-	out := splitLinesRegexp.FindAllString(s, -1)
-	if out[len(out)-1] == "" {
-		out = out[:len(out)-1]
-	}
-	return out
-}
-
-type hunk struct {
-	fromLine int
-	toLine   int
-
-	fromCount int
-	toCount   int
-
-	ctxPrefix string
-	ops       []*op
-}
-
-func (h *hunk) writeTo(sb *strings.Builder, color ColorConfig) {
-	sb.WriteString(color[Frag])
-	sb.WriteString("@@ -")
-
-	if h.fromCount == 1 {
-		sb.WriteString(strconv.Itoa(h.fromLine))
-	} else {
-		sb.WriteString(strconv.Itoa(h.fromLine))
-		sb.WriteByte(',')
-		sb.WriteString(strconv.Itoa(h.fromCount))
-	}
-
-	sb.WriteString(" +")
-
-	if h.toCount == 1 {
-		sb.WriteString(strconv.Itoa(h.toLine))
-	} else {
-		sb.WriteString(strconv.Itoa(h.toLine))
-		sb.WriteByte(',')
-		sb.WriteString(strconv.Itoa(h.toCount))
-	}
-
-	sb.WriteString(" @@")
-	sb.WriteString(color.Reset(Frag))
-
-	if h.ctxPrefix != "" {
-		sb.WriteByte(' ')
-		sb.WriteString(color[Func])
-		sb.WriteString(h.ctxPrefix)
-		sb.WriteString(color.Reset(Func))
-	}
-
-	sb.WriteByte('\n')
-
-	for _, op := range h.ops {
-		op.writeTo(sb, color)
-	}
-}
-
-func (h *hunk) AddOp(t Operation, ss ...string) {
-	n := len(ss)
-	switch t {
-	case Add:
-		h.toCount += n
-	case Delete:
-		h.fromCount += n
-	case Equal:
-		h.toCount += n
-		h.fromCount += n
-	}
-
-	for _, s := range ss {
-		h.ops = append(h.ops, &op{s, t})
-	}
-}
-
-type op struct {
-	text string
-	t    Operation
-}
-
-func (o *op) writeTo(sb *strings.Builder, color ColorConfig) {
-	colorKey := operationColorKey[o.t]
-	sb.WriteString(color[colorKey])
-	sb.WriteByte(operationChar[o.t])
-	if strings.HasSuffix(o.text, "\n") {
-		sb.WriteString(strings.TrimSuffix(o.text, "\n"))
-	} else {
-		sb.WriteString(o.text + "\n\\ No newline at end of file")
-	}
-	sb.WriteString(color.Reset(colorKey))
-	sb.WriteByte('\n')
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/dir.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/dir.go
deleted file mode 100644
index af511d12f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/dir.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package gitignore
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/jesseduffield/go-git/v5/internal/path_util"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/config"
-	gioutil "github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-const (
-	commentPrefix   = "#"
-	coreSection     = "core"
-	excludesfile    = "excludesfile"
-	gitDir          = ".git"
-	gitignoreFile   = ".gitignore"
-	gitconfigFile   = ".gitconfig"
-	systemFile      = "/etc/gitconfig"
-	infoExcludeFile = gitDir + "/info/exclude"
-)
-
-// readIgnoreFile reads a specific git ignore file.
-func readIgnoreFile(fs billy.Filesystem, path []string, ignoreFile string) (ps []Pattern, err error) {
-
-	ignoreFile, _ = path_util.ReplaceTildeWithHome(ignoreFile)
-
-	f, err := fs.Open(fs.Join(append(path, ignoreFile)...))
-	if err == nil {
-		defer f.Close()
-
-		scanner := bufio.NewScanner(f)
-		for scanner.Scan() {
-			s := scanner.Text()
-			if !strings.HasPrefix(s, commentPrefix) && len(strings.TrimSpace(s)) > 0 {
-				ps = append(ps, ParsePattern(s, path))
-			}
-		}
-	} else if !os.IsNotExist(err) {
-		return nil, err
-	}
-
-	return
-}
-
-// ReadPatterns reads the .git/info/exclude and then the gitignore patterns
-// recursively traversing through the directory structure. The result is in
-// the ascending order of priority (last higher).
-func ReadPatterns(fs billy.Filesystem, path []string) (ps []Pattern, err error) {
-	ps, _ = readIgnoreFile(fs, path, infoExcludeFile)
-
-	subps, _ := readIgnoreFile(fs, path, gitignoreFile)
-	ps = append(ps, subps...)
-
-	var fis []os.FileInfo
-	fis, err = fs.ReadDir(fs.Join(path...))
-	if err != nil {
-		return
-	}
-
-	for _, fi := range fis {
-		if fi.IsDir() && fi.Name() != gitDir {
-			if NewMatcher(ps).Match(append(path, fi.Name()), true) {
-				continue
-			}
-
-			var subps []Pattern
-			subps, err = ReadPatterns(fs, append(path, fi.Name()))
-			if err != nil {
-				return
-			}
-
-			if len(subps) > 0 {
-				ps = append(ps, subps...)
-			}
-		}
-	}
-
-	return
-}
-
-func loadPatterns(fs billy.Filesystem, path string) (ps []Pattern, err error) {
-	f, err := fs.Open(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, nil
-		}
-		return nil, err
-	}
-
-	defer gioutil.CheckClose(f, &err)
-
-	b, err := io.ReadAll(f)
-	if err != nil {
-		return
-	}
-
-	d := config.NewDecoder(bytes.NewBuffer(b))
-
-	raw := config.New()
-	if err = d.Decode(raw); err != nil {
-		return
-	}
-
-	s := raw.Section(coreSection)
-	efo := s.Options.Get(excludesfile)
-	if efo == "" {
-		return nil, nil
-	}
-
-	ps, err = readIgnoreFile(fs, nil, efo)
-	if os.IsNotExist(err) {
-		return nil, nil
-	}
-
-	return
-}
-
-// LoadGlobalPatterns loads gitignore patterns from the gitignore file
-// declared in a user's ~/.gitconfig file.  If the ~/.gitconfig file does not
-// exist the function will return nil.  If the core.excludesfile property
-// is not declared, the function will return nil.  If the file pointed to by
-// the core.excludesfile property does not exist, the function will return nil.
-//
-// The function assumes fs is rooted at the root filesystem.
-func LoadGlobalPatterns(fs billy.Filesystem) (ps []Pattern, err error) {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return
-	}
-
-	return loadPatterns(fs, fs.Join(home, gitconfigFile))
-}
-
-// LoadSystemPatterns loads gitignore patterns from the gitignore file
-// declared in a system's /etc/gitconfig file.  If the /etc/gitconfig file does
-// not exist the function will return nil.  If the core.excludesfile property
-// is not declared, the function will return nil.  If the file pointed to by
-// the core.excludesfile property does not exist, the function will return nil.
-//
-// The function assumes fs is rooted at the root filesystem.
-func LoadSystemPatterns(fs billy.Filesystem) (ps []Pattern, err error) {
-	return loadPatterns(fs, systemFile)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/doc.go
deleted file mode 100644
index eecd4bacc..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/doc.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Package gitignore implements matching file system paths to gitignore patterns that
-// can be automatically read from a git repository tree in the order of definition
-// priorities. It support all pattern formats as specified in the original gitignore
-// documentation, copied below:
-//
-//   Pattern format
-//   ==============
-//
-//		- A blank line matches no files, so it can serve as a separator for readability.
-//
-//		- A line starting with # serves as a comment. Put a backslash ("\") in front of
-//		  the first hash for patterns that begin with a hash.
-//
-//		- Trailing spaces are ignored unless they are quoted with backslash ("\").
-//
-//		- An optional prefix "!" which negates the pattern; any matching file excluded
-//		  by a previous pattern will become included again. It is not possible to
-//		  re-include a file if a parent directory of that file is excluded.
-//		  Git doesn’t list excluded directories for performance reasons, so
-//		  any patterns on contained files have no effect, no matter where they are
-//		  defined. Put a backslash ("\") in front of the first "!" for patterns
-//		  that begin with a literal "!", for example, "\!important!.txt".
-//
-//		- If the pattern ends with a slash, it is removed for the purpose of the
-//		  following description, but it would only find a match with a directory.
-//		  In other words, foo/ will match a directory foo and paths underneath it,
-//		  but will not match a regular file or a symbolic link foo (this is consistent
-//		  with the way how pathspec works in general in Git).
-//
-//		- If the pattern does not contain a slash /, Git treats it as a shell glob
-//		  pattern and checks for a match against the pathname relative to the location
-//		  of the .gitignore file (relative to the toplevel of the work tree if not
-//		  from a .gitignore file).
-//
-//		- Otherwise, Git treats the pattern as a shell glob suitable for consumption
-//		  by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will
-//		  not match a / in the pathname. For example, "Documentation/*.html" matches
-//		  "Documentation/git.html" but not "Documentation/ppc/ppc.html" or
-//		  "tools/perf/Documentation/perf.html".
-//
-//		- A leading slash matches the beginning of the pathname. For example,
-//		  "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".
-//
-//		Two consecutive asterisks ("**") in patterns matched against full pathname
-//		may have special meaning:
-//
-//		- A leading "**" followed by a slash means match in all directories.
-//		  For example, "**/foo" matches file or directory "foo" anywhere, the same as
-//		  pattern "foo". "**/foo/bar" matches file or directory "bar"
-//		  anywhere that is directly under directory "foo".
-//
-//		- A trailing "/**" matches everything inside. For example, "abc/**" matches
-//		  all files inside directory "abc", relative to the location of the
-//		  .gitignore file, with infinite depth.
-//
-//		- A slash followed by two consecutive asterisks then a slash matches
-//		  zero or more directories. For example, "a/**/b" matches "a/b", "a/x/b",
-//		  "a/x/y/b" and so on.
-//
-//		- Other consecutive asterisks are considered invalid.
-//
-//   Copyright and license
-//   =====================
-//
-//		Copyright (c) Oleg Sklyar, Silvertern and source{d}
-//
-//		The package code was donated to source{d} to include, modify and develop
-//		further as a part of the `go-git` project, release it on the license of
-//		the whole project or delete it from the project.
-package gitignore
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/matcher.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/matcher.go
deleted file mode 100644
index bd1e9e2d4..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/matcher.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package gitignore
-
-// Matcher defines a global multi-pattern matcher for gitignore patterns
-type Matcher interface {
-	// Match matches patterns in the order of priorities. As soon as an inclusion or
-	// exclusion is found, not further matching is performed.
-	Match(path []string, isDir bool) bool
-}
-
-// NewMatcher constructs a new global matcher. Patterns must be given in the order of
-// increasing priority. That is most generic settings files first, then the content of
-// the repo .gitignore, then content of .gitignore down the path or the repo and then
-// the content command line arguments.
-func NewMatcher(ps []Pattern) Matcher {
-	return &matcher{ps}
-}
-
-type matcher struct {
-	patterns []Pattern
-}
-
-func (m *matcher) Match(path []string, isDir bool) bool {
-	n := len(m.patterns)
-	for i := n - 1; i >= 0; i-- {
-		if match := m.patterns[i].Match(path, isDir); match > NoMatch {
-			return match == Exclude
-		}
-	}
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/pattern.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/pattern.go
deleted file mode 100644
index 450b3cdf7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/gitignore/pattern.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package gitignore
-
-import (
-	"path/filepath"
-	"strings"
-)
-
-// MatchResult defines outcomes of a match, no match, exclusion or inclusion.
-type MatchResult int
-
-const (
-	// NoMatch defines the no match outcome of a match check
-	NoMatch MatchResult = iota
-	// Exclude defines an exclusion of a file as a result of a match check
-	Exclude
-	// Include defines an explicit inclusion of a file as a result of a match check
-	Include
-)
-
-const (
-	inclusionPrefix = "!"
-	zeroToManyDirs  = "**"
-	patternDirSep   = "/"
-)
-
-// Pattern defines a single gitignore pattern.
-type Pattern interface {
-	// Match matches the given path to the pattern.
-	Match(path []string, isDir bool) MatchResult
-}
-
-type pattern struct {
-	domain    []string
-	pattern   []string
-	inclusion bool
-	dirOnly   bool
-	isGlob    bool
-}
-
-// ParsePattern parses a gitignore pattern string into the Pattern structure.
-func ParsePattern(p string, domain []string) Pattern {
-	// storing domain, copy it to ensure it isn't changed externally
-	domain = append([]string(nil), domain...)
-	res := pattern{domain: domain}
-
-	if strings.HasPrefix(p, inclusionPrefix) {
-		res.inclusion = true
-		p = p[1:]
-	}
-
-	if !strings.HasSuffix(p, "\\ ") {
-		p = strings.TrimRight(p, " ")
-	}
-
-	if strings.HasSuffix(p, patternDirSep) {
-		res.dirOnly = true
-		p = p[:len(p)-1]
-	}
-
-	if strings.Contains(p, patternDirSep) {
-		res.isGlob = true
-	}
-
-	res.pattern = strings.Split(p, patternDirSep)
-	return &res
-}
-
-func (p *pattern) Match(path []string, isDir bool) MatchResult {
-	if len(path) <= len(p.domain) {
-		return NoMatch
-	}
-	for i, e := range p.domain {
-		if path[i] != e {
-			return NoMatch
-		}
-	}
-
-	path = path[len(p.domain):]
-	if p.isGlob && !p.globMatch(path, isDir) {
-		return NoMatch
-	} else if !p.isGlob && !p.simpleNameMatch(path, isDir) {
-		return NoMatch
-	}
-
-	if p.inclusion {
-		return Include
-	} else {
-		return Exclude
-	}
-}
-
-func (p *pattern) simpleNameMatch(path []string, isDir bool) bool {
-	for i, name := range path {
-		if match, err := filepath.Match(p.pattern[0], name); err != nil {
-			return false
-		} else if !match {
-			continue
-		}
-		if p.dirOnly && !isDir && i == len(path)-1 {
-			return false
-		}
-		return true
-	}
-	return false
-}
-
-func (p *pattern) globMatch(path []string, isDir bool) bool {
-	matched := false
-	canTraverse := false
-	for i, pattern := range p.pattern {
-		if pattern == "" {
-			canTraverse = false
-			continue
-		}
-		if pattern == zeroToManyDirs {
-			if i == len(p.pattern)-1 {
-				break
-			}
-			canTraverse = true
-			continue
-		}
-		if strings.Contains(pattern, zeroToManyDirs) {
-			return false
-		}
-		if len(path) == 0 {
-			return false
-		}
-		if canTraverse {
-			canTraverse = false
-			for len(path) > 0 {
-				e := path[0]
-				path = path[1:]
-				if match, err := filepath.Match(pattern, e); err != nil {
-					return false
-				} else if match {
-					matched = true
-					break
-				} else if len(path) == 0 {
-					// if nothing left then fail
-					matched = false
-				}
-			}
-		} else {
-			if match, err := filepath.Match(pattern, path[0]); err != nil || !match {
-				return false
-			}
-			matched = true
-			path = path[1:]
-		}
-	}
-	if matched && p.dirOnly && !isDir && len(path) == 0 {
-		matched = false
-	}
-	return matched
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/decoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/decoder.go
deleted file mode 100644
index d38df328d..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/decoder.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package idxfile
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-)
-
-var (
-	// ErrUnsupportedVersion is returned by Decode when the idx file version
-	// is not supported.
-	ErrUnsupportedVersion = errors.New("unsupported version")
-	// ErrMalformedIdxFile is returned by Decode when the idx file is corrupted.
-	ErrMalformedIdxFile = errors.New("malformed IDX file")
-)
-
-const (
-	fanout         = 256
-	objectIDLength = hash.Size
-)
-
-// Decoder reads and decodes idx files from an input stream.
-type Decoder struct {
-	*bufio.Reader
-}
-
-// NewDecoder builds a new idx stream decoder, that reads from r.
-func NewDecoder(r io.Reader) *Decoder {
-	return &Decoder{bufio.NewReader(r)}
-}
-
-// Decode reads from the stream and decode the content into the MemoryIndex struct.
-func (d *Decoder) Decode(idx *MemoryIndex) error {
-	if err := validateHeader(d); err != nil {
-		return err
-	}
-
-	flow := []func(*MemoryIndex, io.Reader) error{
-		readVersion,
-		readFanout,
-		readObjectNames,
-		readCRC32,
-		readOffsets,
-		readChecksums,
-	}
-
-	for _, f := range flow {
-		if err := f(idx, d); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func validateHeader(r io.Reader) error {
-	var h = make([]byte, 4)
-	if _, err := io.ReadFull(r, h); err != nil {
-		return err
-	}
-
-	if !bytes.Equal(h, idxHeader) {
-		return ErrMalformedIdxFile
-	}
-
-	return nil
-}
-
-func readVersion(idx *MemoryIndex, r io.Reader) error {
-	v, err := binary.ReadUint32(r)
-	if err != nil {
-		return err
-	}
-
-	if v > VersionSupported {
-		return ErrUnsupportedVersion
-	}
-
-	idx.Version = v
-	return nil
-}
-
-func readFanout(idx *MemoryIndex, r io.Reader) error {
-	for k := 0; k < fanout; k++ {
-		n, err := binary.ReadUint32(r)
-		if err != nil {
-			return err
-		}
-
-		idx.Fanout[k] = n
-		idx.FanoutMapping[k] = noMapping
-	}
-
-	return nil
-}
-
-func readObjectNames(idx *MemoryIndex, r io.Reader) error {
-	for k := 0; k < fanout; k++ {
-		var buckets uint32
-		if k == 0 {
-			buckets = idx.Fanout[k]
-		} else {
-			buckets = idx.Fanout[k] - idx.Fanout[k-1]
-		}
-
-		if buckets == 0 {
-			continue
-		}
-
-		idx.FanoutMapping[k] = len(idx.Names)
-
-		nameLen := int(buckets * objectIDLength)
-		bin := make([]byte, nameLen)
-		if _, err := io.ReadFull(r, bin); err != nil {
-			return err
-		}
-
-		idx.Names = append(idx.Names, bin)
-		idx.Offset32 = append(idx.Offset32, make([]byte, buckets*4))
-		idx.CRC32 = append(idx.CRC32, make([]byte, buckets*4))
-	}
-
-	return nil
-}
-
-func readCRC32(idx *MemoryIndex, r io.Reader) error {
-	for k := 0; k < fanout; k++ {
-		if pos := idx.FanoutMapping[k]; pos != noMapping {
-			if _, err := io.ReadFull(r, idx.CRC32[pos]); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func readOffsets(idx *MemoryIndex, r io.Reader) error {
-	var o64cnt int
-	for k := 0; k < fanout; k++ {
-		if pos := idx.FanoutMapping[k]; pos != noMapping {
-			if _, err := io.ReadFull(r, idx.Offset32[pos]); err != nil {
-				return err
-			}
-
-			for p := 0; p < len(idx.Offset32[pos]); p += 4 {
-				if idx.Offset32[pos][p]&(byte(1)<<7) > 0 {
-					o64cnt++
-				}
-			}
-		}
-	}
-
-	if o64cnt > 0 {
-		idx.Offset64 = make([]byte, o64cnt*8)
-		if _, err := io.ReadFull(r, idx.Offset64); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func readChecksums(idx *MemoryIndex, r io.Reader) error {
-	if _, err := io.ReadFull(r, idx.PackfileChecksum[:]); err != nil {
-		return err
-	}
-
-	if _, err := io.ReadFull(r, idx.IdxChecksum[:]); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/doc.go
deleted file mode 100644
index 1e628ab4a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/doc.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Package idxfile implements encoding and decoding of packfile idx files.
-//
-//  == Original (version 1) pack-*.idx files have the following format:
-//
-//    - The header consists of 256 4-byte network byte order
-//      integers.  N-th entry of this table records the number of
-//      objects in the corresponding pack, the first byte of whose
-//      object name is less than or equal to N.  This is called the
-//      'first-level fan-out' table.
-//
-//    - The header is followed by sorted 24-byte entries, one entry
-//      per object in the pack.  Each entry is:
-//
-//     4-byte network byte order integer, recording where the
-//     object is stored in the packfile as the offset from the
-//     beginning.
-//
-//     20-byte object name.
-//
-//   - The file is concluded with a trailer:
-//
-//     A copy of the 20-byte SHA1 checksum at the end of
-//     corresponding packfile.
-//
-//     20-byte SHA1-checksum of all of the above.
-//
-//   Pack Idx file:
-//
-//        --  +--------------------------------+
-//   fanout   | fanout[0] = 2 (for example)    |-.
-//   table    +--------------------------------+ |
-//            | fanout[1]                      | |
-//            +--------------------------------+ |
-//            | fanout[2]                      | |
-//            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
-//            | fanout[255] = total objects    |---.
-//        --  +--------------------------------+ | |
-//   main     | offset                         | | |
-//   index    | object name 00XXXXXXXXXXXXXXXX | | |
-//   tab      +--------------------------------+ | |
-//            | offset                         | | |
-//            | object name 00XXXXXXXXXXXXXXXX | | |
-//            +--------------------------------+<+ |
-//          .-| offset                         |   |
-//          | | object name 01XXXXXXXXXXXXXXXX |   |
-//          | +--------------------------------+   |
-//          | | offset                         |   |
-//          | | object name 01XXXXXXXXXXXXXXXX |   |
-//          | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   |
-//          | | offset                         |   |
-//          | | object name FFXXXXXXXXXXXXXXXX |   |
-//        --| +--------------------------------+<--+
-//  trailer | | packfile checksum              |
-//          | +--------------------------------+
-//          | | idxfile checksum               |
-//          | +--------------------------------+
-//          .---------.
-//                    |
-//  Pack file entry: <+
-//
-//     packed object header:
-//     1-byte size extension bit (MSB)
-//           type (next 3 bit)
-//           size0 (lower 4-bit)
-//         n-byte sizeN (as long as MSB is set, each 7-bit)
-//         size0..sizeN form 4+7+7+..+7 bit integer, size0
-//         is the least significant part, and sizeN is the
-//         most significant part.
-//     packed object data:
-//         If it is not DELTA, then deflated bytes (the size above
-//         is the size before compression).
-//     If it is REF_DELTA, then
-//       20-byte base object name SHA1 (the size above is the
-//         size of the delta data that follows).
-//           delta data, deflated.
-//     If it is OFS_DELTA, then
-//       n-byte offset (see below) interpreted as a negative
-//         offset from the type-byte of the header of the
-//         ofs-delta entry (the size above is the size of
-//         the delta data that follows).
-//       delta data, deflated.
-//
-//     offset encoding:
-//       n bytes with MSB set in all but the last one.
-//       The offset is then the number constructed by
-//       concatenating the lower 7 bit of each byte, and
-//       for n >= 2 adding 2^7 + 2^14 + ... + 2^(7*(n-1))
-//       to the result.
-//
-//   == Version 2 pack-*.idx files support packs larger than 4 GiB, and
-//      have some other reorganizations.  They have the format:
-//
-//     - A 4-byte magic number '\377tOc' which is an unreasonable
-//       fanout[0] value.
-//
-//     - A 4-byte version number (= 2)
-//
-//     - A 256-entry fan-out table just like v1.
-//
-//     - A table of sorted 20-byte SHA1 object names.  These are
-//       packed together without offset values to reduce the cache
-//       footprint of the binary search for a specific object name.
-//
-//     - A table of 4-byte CRC32 values of the packed object data.
-//       This is new in v2 so compressed data can be copied directly
-//       from pack to pack during repacking without undetected
-//       data corruption.
-//
-//     - A table of 4-byte offset values (in network byte order).
-//       These are usually 31-bit pack file offsets, but large
-//       offsets are encoded as an index into the next table with
-//       the msbit set.
-//
-//     - A table of 8-byte offset entries (empty for pack files less
-//       than 2 GiB).  Pack files are organized with heavily used
-//       objects toward the front, so most object references should
-//       not need to refer to this table.
-//
-//     - The same trailer as a v1 pack file:
-//
-//       A copy of the 20-byte SHA1 checksum at the end of
-//       corresponding packfile.
-//
-//       20-byte SHA1-checksum of all of the above.
-//
-// Source:
-// https://www.kernel.org/pub/software/scm/git/docs/v1.7.5/technical/pack-format.txt
-package idxfile
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/encoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/encoder.go
deleted file mode 100644
index 9e293488e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/encoder.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package idxfile
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-)
-
-// Encoder writes MemoryIndex structs to an output stream.
-type Encoder struct {
-	io.Writer
-	hash hash.Hash
-}
-
-// NewEncoder returns a new stream encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	h := hash.New(hash.CryptoType)
-	mw := io.MultiWriter(w, h)
-	return &Encoder{mw, h}
-}
-
-// Encode encodes an MemoryIndex to the encoder writer.
-func (e *Encoder) Encode(idx *MemoryIndex) (int, error) {
-	flow := []func(*MemoryIndex) (int, error){
-		e.encodeHeader,
-		e.encodeFanout,
-		e.encodeHashes,
-		e.encodeCRC32,
-		e.encodeOffsets,
-		e.encodeChecksums,
-	}
-
-	sz := 0
-	for _, f := range flow {
-		i, err := f(idx)
-		sz += i
-
-		if err != nil {
-			return sz, err
-		}
-	}
-
-	return sz, nil
-}
-
-func (e *Encoder) encodeHeader(idx *MemoryIndex) (int, error) {
-	c, err := e.Write(idxHeader)
-	if err != nil {
-		return c, err
-	}
-
-	return c + 4, binary.WriteUint32(e, idx.Version)
-}
-
-func (e *Encoder) encodeFanout(idx *MemoryIndex) (int, error) {
-	for _, c := range idx.Fanout {
-		if err := binary.WriteUint32(e, c); err != nil {
-			return 0, err
-		}
-	}
-
-	return fanout * 4, nil
-}
-
-func (e *Encoder) encodeHashes(idx *MemoryIndex) (int, error) {
-	var size int
-	for k := 0; k < fanout; k++ {
-		pos := idx.FanoutMapping[k]
-		if pos == noMapping {
-			continue
-		}
-
-		n, err := e.Write(idx.Names[pos])
-		if err != nil {
-			return size, err
-		}
-		size += n
-	}
-	return size, nil
-}
-
-func (e *Encoder) encodeCRC32(idx *MemoryIndex) (int, error) {
-	var size int
-	for k := 0; k < fanout; k++ {
-		pos := idx.FanoutMapping[k]
-		if pos == noMapping {
-			continue
-		}
-
-		n, err := e.Write(idx.CRC32[pos])
-		if err != nil {
-			return size, err
-		}
-
-		size += n
-	}
-
-	return size, nil
-}
-
-func (e *Encoder) encodeOffsets(idx *MemoryIndex) (int, error) {
-	var size int
-	for k := 0; k < fanout; k++ {
-		pos := idx.FanoutMapping[k]
-		if pos == noMapping {
-			continue
-		}
-
-		n, err := e.Write(idx.Offset32[pos])
-		if err != nil {
-			return size, err
-		}
-
-		size += n
-	}
-
-	if len(idx.Offset64) > 0 {
-		n, err := e.Write(idx.Offset64)
-		if err != nil {
-			return size, err
-		}
-
-		size += n
-	}
-
-	return size, nil
-}
-
-func (e *Encoder) encodeChecksums(idx *MemoryIndex) (int, error) {
-	if _, err := e.Write(idx.PackfileChecksum[:]); err != nil {
-		return 0, err
-	}
-
-	copy(idx.IdxChecksum[:], e.hash.Sum(nil)[:hash.Size])
-	if _, err := e.Write(idx.IdxChecksum[:]); err != nil {
-		return 0, err
-	}
-
-	return hash.HexSize, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/idxfile.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/idxfile.go
deleted file mode 100644
index 99ea8dd75..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/idxfile.go
+++ /dev/null
@@ -1,347 +0,0 @@
-package idxfile
-
-import (
-	"bytes"
-	"io"
-	"sort"
-
-	encbin "encoding/binary"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-)
-
-const (
-	// VersionSupported is the only idx version supported.
-	VersionSupported = 2
-
-	noMapping = -1
-)
-
-var (
-	idxHeader = []byte{255, 't', 'O', 'c'}
-)
-
-// Index represents an index of a packfile.
-type Index interface {
-	// Contains checks whether the given hash is in the index.
-	Contains(h plumbing.Hash) (bool, error)
-	// FindOffset finds the offset in the packfile for the object with
-	// the given hash.
-	FindOffset(h plumbing.Hash) (int64, error)
-	// FindCRC32 finds the CRC32 of the object with the given hash.
-	FindCRC32(h plumbing.Hash) (uint32, error)
-	// FindHash finds the hash for the object with the given offset.
-	FindHash(o int64) (plumbing.Hash, error)
-	// Count returns the number of entries in the index.
-	Count() (int64, error)
-	// Entries returns an iterator to retrieve all index entries.
-	Entries() (EntryIter, error)
-	// EntriesByOffset returns an iterator to retrieve all index entries ordered
-	// by offset.
-	EntriesByOffset() (EntryIter, error)
-}
-
-// MemoryIndex is the in memory representation of an idx file.
-type MemoryIndex struct {
-	Version uint32
-	Fanout  [256]uint32
-	// FanoutMapping maps the position in the fanout table to the position
-	// in the Names, Offset32 and CRC32 slices. This improves the memory
-	// usage by not needing an array with unnecessary empty slots.
-	FanoutMapping    [256]int
-	Names            [][]byte
-	Offset32         [][]byte
-	CRC32            [][]byte
-	Offset64         []byte
-	PackfileChecksum [hash.Size]byte
-	IdxChecksum      [hash.Size]byte
-
-	offsetHash       map[int64]plumbing.Hash
-	offsetHashIsFull bool
-}
-
-var _ Index = (*MemoryIndex)(nil)
-
-// NewMemoryIndex returns an instance of a new MemoryIndex.
-func NewMemoryIndex() *MemoryIndex {
-	return &MemoryIndex{}
-}
-
-func (idx *MemoryIndex) findHashIndex(h plumbing.Hash) (int, bool) {
-	k := idx.FanoutMapping[h[0]]
-	if k == noMapping {
-		return 0, false
-	}
-
-	if len(idx.Names) <= k {
-		return 0, false
-	}
-
-	data := idx.Names[k]
-	high := uint64(len(idx.Offset32[k])) >> 2
-	if high == 0 {
-		return 0, false
-	}
-
-	low := uint64(0)
-	for {
-		mid := (low + high) >> 1
-		offset := mid * objectIDLength
-
-		cmp := bytes.Compare(h[:], data[offset:offset+objectIDLength])
-		if cmp < 0 {
-			high = mid
-		} else if cmp == 0 {
-			return int(mid), true
-		} else {
-			low = mid + 1
-		}
-
-		if low >= high {
-			break
-		}
-	}
-
-	return 0, false
-}
-
-// Contains implements the Index interface.
-func (idx *MemoryIndex) Contains(h plumbing.Hash) (bool, error) {
-	_, ok := idx.findHashIndex(h)
-	return ok, nil
-}
-
-// FindOffset implements the Index interface.
-func (idx *MemoryIndex) FindOffset(h plumbing.Hash) (int64, error) {
-	if len(idx.FanoutMapping) <= int(h[0]) {
-		return 0, plumbing.ErrObjectNotFound
-	}
-
-	k := idx.FanoutMapping[h[0]]
-	i, ok := idx.findHashIndex(h)
-	if !ok {
-		return 0, plumbing.ErrObjectNotFound
-	}
-
-	offset := idx.getOffset(k, i)
-
-	if !idx.offsetHashIsFull {
-		// Save the offset for reverse lookup
-		if idx.offsetHash == nil {
-			idx.offsetHash = make(map[int64]plumbing.Hash)
-		}
-		idx.offsetHash[int64(offset)] = h
-	}
-
-	return int64(offset), nil
-}
-
-const isO64Mask = uint64(1) << 31
-
-func (idx *MemoryIndex) getOffset(firstLevel, secondLevel int) uint64 {
-	offset := secondLevel << 2
-	ofs := encbin.BigEndian.Uint32(idx.Offset32[firstLevel][offset : offset+4])
-
-	if (uint64(ofs) & isO64Mask) != 0 {
-		offset := 8 * (uint64(ofs) & ^isO64Mask)
-		n := encbin.BigEndian.Uint64(idx.Offset64[offset : offset+8])
-		return n
-	}
-
-	return uint64(ofs)
-}
-
-// FindCRC32 implements the Index interface.
-func (idx *MemoryIndex) FindCRC32(h plumbing.Hash) (uint32, error) {
-	k := idx.FanoutMapping[h[0]]
-	i, ok := idx.findHashIndex(h)
-	if !ok {
-		return 0, plumbing.ErrObjectNotFound
-	}
-
-	return idx.getCRC32(k, i), nil
-}
-
-func (idx *MemoryIndex) getCRC32(firstLevel, secondLevel int) uint32 {
-	offset := secondLevel << 2
-	return encbin.BigEndian.Uint32(idx.CRC32[firstLevel][offset : offset+4])
-}
-
-// FindHash implements the Index interface.
-func (idx *MemoryIndex) FindHash(o int64) (plumbing.Hash, error) {
-	var hash plumbing.Hash
-	var ok bool
-
-	if idx.offsetHash != nil {
-		if hash, ok = idx.offsetHash[o]; ok {
-			return hash, nil
-		}
-	}
-
-	// Lazily generate the reverse offset/hash map if required.
-	if !idx.offsetHashIsFull || idx.offsetHash == nil {
-		if err := idx.genOffsetHash(); err != nil {
-			return plumbing.ZeroHash, err
-		}
-
-		hash, ok = idx.offsetHash[o]
-	}
-
-	if !ok {
-		return plumbing.ZeroHash, plumbing.ErrObjectNotFound
-	}
-
-	return hash, nil
-}
-
-// genOffsetHash generates the offset/hash mapping for reverse search.
-func (idx *MemoryIndex) genOffsetHash() error {
-	count, err := idx.Count()
-	if err != nil {
-		return err
-	}
-
-	idx.offsetHash = make(map[int64]plumbing.Hash, count)
-	idx.offsetHashIsFull = true
-
-	var hash plumbing.Hash
-	i := uint32(0)
-	for firstLevel, fanoutValue := range idx.Fanout {
-		mappedFirstLevel := idx.FanoutMapping[firstLevel]
-		for secondLevel := uint32(0); i < fanoutValue; i++ {
-			copy(hash[:], idx.Names[mappedFirstLevel][secondLevel*objectIDLength:])
-			offset := int64(idx.getOffset(mappedFirstLevel, int(secondLevel)))
-			idx.offsetHash[offset] = hash
-			secondLevel++
-		}
-	}
-
-	return nil
-}
-
-// Count implements the Index interface.
-func (idx *MemoryIndex) Count() (int64, error) {
-	return int64(idx.Fanout[fanout-1]), nil
-}
-
-// Entries implements the Index interface.
-func (idx *MemoryIndex) Entries() (EntryIter, error) {
-	return &idxfileEntryIter{idx, 0, 0, 0}, nil
-}
-
-// EntriesByOffset implements the Index interface.
-func (idx *MemoryIndex) EntriesByOffset() (EntryIter, error) {
-	count, err := idx.Count()
-	if err != nil {
-		return nil, err
-	}
-
-	iter := &idxfileEntryOffsetIter{
-		entries: make(entriesByOffset, count),
-	}
-
-	entries, err := idx.Entries()
-	if err != nil {
-		return nil, err
-	}
-
-	for pos := 0; int64(pos) < count; pos++ {
-		entry, err := entries.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		iter.entries[pos] = entry
-	}
-
-	sort.Sort(iter.entries)
-
-	return iter, nil
-}
-
-// EntryIter is an iterator that will return the entries in a packfile index.
-type EntryIter interface {
-	// Next returns the next entry in the packfile index.
-	Next() (*Entry, error)
-	// Close closes the iterator.
-	Close() error
-}
-
-type idxfileEntryIter struct {
-	idx                     *MemoryIndex
-	total                   int
-	firstLevel, secondLevel int
-}
-
-func (i *idxfileEntryIter) Next() (*Entry, error) {
-	for {
-		if i.firstLevel >= fanout {
-			return nil, io.EOF
-		}
-
-		if i.total >= int(i.idx.Fanout[i.firstLevel]) {
-			i.firstLevel++
-			i.secondLevel = 0
-			continue
-		}
-
-		mappedFirstLevel := i.idx.FanoutMapping[i.firstLevel]
-		entry := new(Entry)
-		copy(entry.Hash[:], i.idx.Names[mappedFirstLevel][i.secondLevel*objectIDLength:])
-		entry.Offset = i.idx.getOffset(mappedFirstLevel, i.secondLevel)
-		entry.CRC32 = i.idx.getCRC32(mappedFirstLevel, i.secondLevel)
-
-		i.secondLevel++
-		i.total++
-
-		return entry, nil
-	}
-}
-
-func (i *idxfileEntryIter) Close() error {
-	i.firstLevel = fanout
-	return nil
-}
-
-// Entry is the in memory representation of an object entry in the idx file.
-type Entry struct {
-	Hash   plumbing.Hash
-	CRC32  uint32
-	Offset uint64
-}
-
-type idxfileEntryOffsetIter struct {
-	entries entriesByOffset
-	pos     int
-}
-
-func (i *idxfileEntryOffsetIter) Next() (*Entry, error) {
-	if i.pos >= len(i.entries) {
-		return nil, io.EOF
-	}
-
-	entry := i.entries[i.pos]
-	i.pos++
-
-	return entry, nil
-}
-
-func (i *idxfileEntryOffsetIter) Close() error {
-	i.pos = len(i.entries) + 1
-	return nil
-}
-
-type entriesByOffset []*Entry
-
-func (o entriesByOffset) Len() int {
-	return len(o)
-}
-
-func (o entriesByOffset) Less(i int, j int) bool {
-	return o[i].Offset < o[j].Offset
-}
-
-func (o entriesByOffset) Swap(i int, j int) {
-	o[i], o[j] = o[j], o[i]
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/writer.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/writer.go
deleted file mode 100644
index baa2ac37a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/idxfile/writer.go
+++ /dev/null
@@ -1,193 +0,0 @@
-package idxfile
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"sort"
-	"sync"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-)
-
-// objects implements sort.Interface and uses hash as sorting key.
-type objects []Entry
-
-// Writer implements a packfile Observer interface and is used to generate
-// indexes.
-type Writer struct {
-	m sync.Mutex
-
-	count    uint32
-	checksum plumbing.Hash
-	objects  objects
-	offset64 uint32
-	finished bool
-	index    *MemoryIndex
-	added    map[plumbing.Hash]struct{}
-}
-
-// Index returns a previously created MemoryIndex or creates a new one if
-// needed.
-func (w *Writer) Index() (*MemoryIndex, error) {
-	w.m.Lock()
-	defer w.m.Unlock()
-
-	if w.index == nil {
-		return w.createIndex()
-	}
-
-	return w.index, nil
-}
-
-// Add appends new object data.
-func (w *Writer) Add(h plumbing.Hash, pos uint64, crc uint32) {
-	w.m.Lock()
-	defer w.m.Unlock()
-
-	if w.added == nil {
-		w.added = make(map[plumbing.Hash]struct{})
-	}
-
-	if _, ok := w.added[h]; !ok {
-		w.added[h] = struct{}{}
-		w.objects = append(w.objects, Entry{h, crc, pos})
-	}
-
-}
-
-func (w *Writer) Finished() bool {
-	return w.finished
-}
-
-// OnHeader implements packfile.Observer interface.
-func (w *Writer) OnHeader(count uint32) error {
-	w.count = count
-	w.objects = make(objects, 0, count)
-	return nil
-}
-
-// OnInflatedObjectHeader implements packfile.Observer interface.
-func (w *Writer) OnInflatedObjectHeader(t plumbing.ObjectType, objSize int64, pos int64) error {
-	return nil
-}
-
-// OnInflatedObjectContent implements packfile.Observer interface.
-func (w *Writer) OnInflatedObjectContent(h plumbing.Hash, pos int64, crc uint32, _ []byte) error {
-	w.Add(h, uint64(pos), crc)
-	return nil
-}
-
-// OnFooter implements packfile.Observer interface.
-func (w *Writer) OnFooter(h plumbing.Hash) error {
-	w.checksum = h
-	w.finished = true
-	_, err := w.createIndex()
-
-	return err
-}
-
-// creatIndex returns a filled MemoryIndex with the information filled by
-// the observer callbacks.
-func (w *Writer) createIndex() (*MemoryIndex, error) {
-	if !w.finished {
-		return nil, fmt.Errorf("the index still hasn't finished building")
-	}
-
-	idx := new(MemoryIndex)
-	w.index = idx
-
-	sort.Sort(w.objects)
-
-	// unmap all fans by default
-	for i := range idx.FanoutMapping {
-		idx.FanoutMapping[i] = noMapping
-	}
-
-	buf := new(bytes.Buffer)
-
-	last := -1
-	bucket := -1
-	for i, o := range w.objects {
-		fan := o.Hash[0]
-
-		// fill the gaps between fans
-		for j := last + 1; j < int(fan); j++ {
-			idx.Fanout[j] = uint32(i)
-		}
-
-		// update the number of objects for this position
-		idx.Fanout[fan] = uint32(i + 1)
-
-		// we move from one bucket to another, update counters and allocate
-		// memory
-		if last != int(fan) {
-			bucket++
-			idx.FanoutMapping[fan] = bucket
-			last = int(fan)
-
-			idx.Names = append(idx.Names, make([]byte, 0))
-			idx.Offset32 = append(idx.Offset32, make([]byte, 0))
-			idx.CRC32 = append(idx.CRC32, make([]byte, 0))
-		}
-
-		idx.Names[bucket] = append(idx.Names[bucket], o.Hash[:]...)
-
-		offset := o.Offset
-		if offset > math.MaxInt32 {
-			var err error
-			offset, err = w.addOffset64(offset)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		buf.Truncate(0)
-		if err := binary.WriteUint32(buf, uint32(offset)); err != nil {
-			return nil, err
-		}
-		idx.Offset32[bucket] = append(idx.Offset32[bucket], buf.Bytes()...)
-
-		buf.Truncate(0)
-		if err := binary.WriteUint32(buf, o.CRC32); err != nil {
-			return nil, err
-		}
-		idx.CRC32[bucket] = append(idx.CRC32[bucket], buf.Bytes()...)
-	}
-
-	for j := last + 1; j < 256; j++ {
-		idx.Fanout[j] = uint32(len(w.objects))
-	}
-
-	idx.Version = VersionSupported
-	idx.PackfileChecksum = w.checksum
-
-	return idx, nil
-}
-
-func (w *Writer) addOffset64(pos uint64) (uint64, error) {
-	buf := new(bytes.Buffer)
-	if err := binary.WriteUint64(buf, pos); err != nil {
-		return 0, err
-	}
-
-	w.index.Offset64 = append(w.index.Offset64, buf.Bytes()...)
-	index := uint64(w.offset64 | (1 << 31))
-	w.offset64++
-
-	return index, nil
-}
-
-func (o objects) Len() int {
-	return len(o)
-}
-
-func (o objects) Less(i int, j int) bool {
-	cmp := bytes.Compare(o[i].Hash[:], o[j].Hash[:])
-	return cmp < 0
-}
-
-func (o objects) Swap(i int, j int) {
-	o[i], o[j] = o[j], o[i]
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/decoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/decoder.go
deleted file mode 100644
index 6bd26206d..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/decoder.go
+++ /dev/null
@@ -1,503 +0,0 @@
-package index
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"io"
-
-	"strconv"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-)
-
-var (
-	// DecodeVersionSupported is the range of supported index versions
-	DecodeVersionSupported = struct{ Min, Max uint32 }{Min: 2, Max: 4}
-
-	// ErrMalformedSignature is returned by Decode when the index header file is
-	// malformed
-	ErrMalformedSignature = errors.New("malformed index signature file")
-	// ErrInvalidChecksum is returned by Decode if the SHA1 hash mismatch with
-	// the read content
-	ErrInvalidChecksum = errors.New("invalid checksum")
-	// ErrUnknownExtension is returned when an index extension is encountered that is considered mandatory
-	ErrUnknownExtension = errors.New("unknown extension")
-)
-
-const (
-	entryHeaderLength = 62
-	entryExtended     = 0x4000
-	entryValid        = 0x8000
-	nameMask          = 0xfff
-	intentToAddMask   = 1 << 13
-	skipWorkTreeMask  = 1 << 14
-)
-
-// A Decoder reads and decodes index files from an input stream.
-type Decoder struct {
-	buf       *bufio.Reader
-	r         io.Reader
-	hash      hash.Hash
-	lastEntry *Entry
-
-	extReader *bufio.Reader
-}
-
-// NewDecoder returns a new decoder that reads from r.
-func NewDecoder(r io.Reader) *Decoder {
-	h := hash.New(hash.CryptoType)
-	buf := bufio.NewReader(r)
-	return &Decoder{
-		buf:       buf,
-		r:         io.TeeReader(buf, h),
-		hash:      h,
-		extReader: bufio.NewReader(nil),
-	}
-}
-
-// Decode reads the whole index object from its input and stores it in the
-// value pointed to by idx.
-func (d *Decoder) Decode(idx *Index) error {
-	var err error
-	idx.Version, err = validateHeader(d.r)
-	if err != nil {
-		return err
-	}
-
-	entryCount, err := binary.ReadUint32(d.r)
-	if err != nil {
-		return err
-	}
-
-	if err := d.readEntries(idx, int(entryCount)); err != nil {
-		return err
-	}
-
-	return d.readExtensions(idx)
-}
-
-func (d *Decoder) readEntries(idx *Index, count int) error {
-	for i := 0; i < count; i++ {
-		e, err := d.readEntry(idx)
-		if err != nil {
-			return err
-		}
-
-		d.lastEntry = e
-		idx.Entries = append(idx.Entries, e)
-	}
-
-	return nil
-}
-
-func (d *Decoder) readEntry(idx *Index) (*Entry, error) {
-	e := &Entry{}
-
-	var msec, mnsec, sec, nsec uint32
-	var flags uint16
-
-	flow := []interface{}{
-		&sec, &nsec,
-		&msec, &mnsec,
-		&e.Dev,
-		&e.Inode,
-		&e.Mode,
-		&e.UID,
-		&e.GID,
-		&e.Size,
-		&e.Hash,
-		&flags,
-	}
-
-	if err := binary.Read(d.r, flow...); err != nil {
-		return nil, err
-	}
-
-	read := entryHeaderLength
-
-	if sec != 0 || nsec != 0 {
-		e.CreatedAt = time.Unix(int64(sec), int64(nsec))
-	}
-
-	if msec != 0 || mnsec != 0 {
-		e.ModifiedAt = time.Unix(int64(msec), int64(mnsec))
-	}
-
-	e.Stage = Stage(flags>>12) & 0x3
-
-	if flags&entryExtended != 0 {
-		extended, err := binary.ReadUint16(d.r)
-		if err != nil {
-			return nil, err
-		}
-
-		read += 2
-		e.IntentToAdd = extended&intentToAddMask != 0
-		e.SkipWorktree = extended&skipWorkTreeMask != 0
-	}
-
-	if err := d.readEntryName(idx, e, flags); err != nil {
-		return nil, err
-	}
-
-	return e, d.padEntry(idx, e, read)
-}
-
-func (d *Decoder) readEntryName(idx *Index, e *Entry, flags uint16) error {
-	var name string
-	var err error
-
-	switch idx.Version {
-	case 2, 3:
-		len := flags & nameMask
-		name, err = d.doReadEntryName(len)
-	case 4:
-		name, err = d.doReadEntryNameV4()
-	default:
-		return ErrUnsupportedVersion
-	}
-
-	if err != nil {
-		return err
-	}
-
-	e.Name = name
-	return nil
-}
-
-func (d *Decoder) doReadEntryNameV4() (string, error) {
-	l, err := binary.ReadVariableWidthInt(d.r)
-	if err != nil {
-		return "", err
-	}
-
-	var base string
-	if d.lastEntry != nil {
-		base = d.lastEntry.Name[:len(d.lastEntry.Name)-int(l)]
-	}
-
-	name, err := binary.ReadUntil(d.r, '\x00')
-	if err != nil {
-		return "", err
-	}
-
-	return base + string(name), nil
-}
-
-func (d *Decoder) doReadEntryName(len uint16) (string, error) {
-	name := make([]byte, len)
-	_, err := io.ReadFull(d.r, name)
-
-	return string(name), err
-}
-
-// Index entries are padded out to the next 8 byte alignment
-// for historical reasons related to how C Git read the files.
-func (d *Decoder) padEntry(idx *Index, e *Entry, read int) error {
-	if idx.Version == 4 {
-		return nil
-	}
-
-	entrySize := read + len(e.Name)
-	padLen := 8 - entrySize%8
-	_, err := io.CopyN(io.Discard, d.r, int64(padLen))
-	return err
-}
-
-func (d *Decoder) readExtensions(idx *Index) error {
-	// TODO: support 'Split index' and 'Untracked cache' extensions, take in
-	// count that they are not supported by jgit or libgit
-
-	var expected []byte
-	var peeked []byte
-	var err error
-
-	// we should always be able to peek for 4 bytes (header) + 4 bytes (extlen) + final hash
-	// if this fails, we know that we're at the end of the index
-	peekLen := 4 + 4 + d.hash.Size()
-
-	for {
-		expected = d.hash.Sum(nil)
-		peeked, err = d.buf.Peek(peekLen)
-		if len(peeked) < peekLen {
-			// there can't be an extension at this point, so let's bail out
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = d.readExtension(idx)
-		if err != nil {
-			return err
-		}
-	}
-
-	return d.readChecksum(expected)
-}
-
-func (d *Decoder) readExtension(idx *Index) error {
-	var header [4]byte
-
-	if _, err := io.ReadFull(d.r, header[:]); err != nil {
-		return err
-	}
-
-	r, err := d.getExtensionReader()
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case bytes.Equal(header[:], treeExtSignature):
-		idx.Cache = &Tree{}
-		d := &treeExtensionDecoder{r}
-		if err := d.Decode(idx.Cache); err != nil {
-			return err
-		}
-	case bytes.Equal(header[:], resolveUndoExtSignature):
-		idx.ResolveUndo = &ResolveUndo{}
-		d := &resolveUndoDecoder{r}
-		if err := d.Decode(idx.ResolveUndo); err != nil {
-			return err
-		}
-	case bytes.Equal(header[:], endOfIndexEntryExtSignature):
-		idx.EndOfIndexEntry = &EndOfIndexEntry{}
-		d := &endOfIndexEntryDecoder{r}
-		if err := d.Decode(idx.EndOfIndexEntry); err != nil {
-			return err
-		}
-	default:
-		// See https://git-scm.com/docs/index-format, which says:
-		// If the first byte is 'A'..'Z' the extension is optional and can be ignored.
-		if header[0] < 'A' || header[0] > 'Z' {
-			return ErrUnknownExtension
-		}
-
-		d := &unknownExtensionDecoder{r}
-		if err := d.Decode(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (d *Decoder) getExtensionReader() (*bufio.Reader, error) {
-	len, err := binary.ReadUint32(d.r)
-	if err != nil {
-		return nil, err
-	}
-
-	d.extReader.Reset(&io.LimitedReader{R: d.r, N: int64(len)})
-	return d.extReader, nil
-}
-
-func (d *Decoder) readChecksum(expected []byte) error {
-	var h plumbing.Hash
-
-	if _, err := io.ReadFull(d.r, h[:]); err != nil {
-		return err
-	}
-
-	if !bytes.Equal(h[:], expected) {
-		return ErrInvalidChecksum
-	}
-
-	return nil
-}
-
-func validateHeader(r io.Reader) (version uint32, err error) {
-	var s = make([]byte, 4)
-	if _, err := io.ReadFull(r, s); err != nil {
-		return 0, err
-	}
-
-	if !bytes.Equal(s, indexSignature) {
-		return 0, ErrMalformedSignature
-	}
-
-	version, err = binary.ReadUint32(r)
-	if err != nil {
-		return 0, err
-	}
-
-	if version < DecodeVersionSupported.Min || version > DecodeVersionSupported.Max {
-		return 0, ErrUnsupportedVersion
-	}
-
-	return
-}
-
-type treeExtensionDecoder struct {
-	r *bufio.Reader
-}
-
-func (d *treeExtensionDecoder) Decode(t *Tree) error {
-	for {
-		e, err := d.readEntry()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return err
-		}
-
-		if e == nil {
-			continue
-		}
-
-		t.Entries = append(t.Entries, *e)
-	}
-}
-
-func (d *treeExtensionDecoder) readEntry() (*TreeEntry, error) {
-	e := &TreeEntry{}
-
-	path, err := binary.ReadUntil(d.r, '\x00')
-	if err != nil {
-		return nil, err
-	}
-
-	e.Path = string(path)
-
-	count, err := binary.ReadUntil(d.r, ' ')
-	if err != nil {
-		return nil, err
-	}
-
-	i, err := strconv.Atoi(string(count))
-	if err != nil {
-		return nil, err
-	}
-
-	// An entry can be in an invalidated state and is represented by having a
-	// negative number in the entry_count field.
-	if i == -1 {
-		return nil, nil
-	}
-
-	e.Entries = i
-	trees, err := binary.ReadUntil(d.r, '\n')
-	if err != nil {
-		return nil, err
-	}
-
-	i, err = strconv.Atoi(string(trees))
-	if err != nil {
-		return nil, err
-	}
-
-	e.Trees = i
-	_, err = io.ReadFull(d.r, e.Hash[:])
-	if err != nil {
-		return nil, err
-	}
-	return e, nil
-}
-
-type resolveUndoDecoder struct {
-	r *bufio.Reader
-}
-
-func (d *resolveUndoDecoder) Decode(ru *ResolveUndo) error {
-	for {
-		e, err := d.readEntry()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return err
-		}
-
-		ru.Entries = append(ru.Entries, *e)
-	}
-}
-
-func (d *resolveUndoDecoder) readEntry() (*ResolveUndoEntry, error) {
-	e := &ResolveUndoEntry{
-		Stages: make(map[Stage]plumbing.Hash),
-	}
-
-	path, err := binary.ReadUntil(d.r, '\x00')
-	if err != nil {
-		return nil, err
-	}
-
-	e.Path = string(path)
-
-	for i := 0; i < 3; i++ {
-		if err := d.readStage(e, Stage(i+1)); err != nil {
-			return nil, err
-		}
-	}
-
-	for s := range e.Stages {
-		var hash plumbing.Hash
-		if _, err := io.ReadFull(d.r, hash[:]); err != nil {
-			return nil, err
-		}
-
-		e.Stages[s] = hash
-	}
-
-	return e, nil
-}
-
-func (d *resolveUndoDecoder) readStage(e *ResolveUndoEntry, s Stage) error {
-	ascii, err := binary.ReadUntil(d.r, '\x00')
-	if err != nil {
-		return err
-	}
-
-	stage, err := strconv.ParseInt(string(ascii), 8, 64)
-	if err != nil {
-		return err
-	}
-
-	if stage != 0 {
-		e.Stages[s] = plumbing.ZeroHash
-	}
-
-	return nil
-}
-
-type endOfIndexEntryDecoder struct {
-	r *bufio.Reader
-}
-
-func (d *endOfIndexEntryDecoder) Decode(e *EndOfIndexEntry) error {
-	var err error
-	e.Offset, err = binary.ReadUint32(d.r)
-	if err != nil {
-		return err
-	}
-
-	_, err = io.ReadFull(d.r, e.Hash[:])
-	return err
-}
-
-type unknownExtensionDecoder struct {
-	r *bufio.Reader
-}
-
-func (d *unknownExtensionDecoder) Decode() error {
-	var buf [1024]byte
-
-	for {
-		_, err := d.r.Read(buf[:])
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/doc.go
deleted file mode 100644
index 39ae6ad5f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/doc.go
+++ /dev/null
@@ -1,360 +0,0 @@
-// Package index implements encoding and decoding of index format files.
-//
-//    Git index format
-//    ================
-//
-//    == The Git index file has the following format
-//
-//      All binary numbers are in network byte order. Version 2 is described
-//      here unless stated otherwise.
-//
-//      - A 12-byte header consisting of
-//
-//        4-byte signature:
-//          The signature is { 'D', 'I', 'R', 'C' } (stands for "dircache")
-//
-//        4-byte version number:
-//          The current supported versions are 2, 3 and 4.
-//
-//        32-bit number of index entries.
-//
-//      - A number of sorted index entries (see below).
-//
-//      - Extensions
-//
-//        Extensions are identified by signature. Optional extensions can
-//        be ignored if Git does not understand them.
-//
-//        Git currently supports cached tree and resolve undo extensions.
-//
-//        4-byte extension signature. If the first byte is 'A'..'Z' the
-//        extension is optional and can be ignored.
-//
-//        32-bit size of the extension
-//
-//        Extension data
-//
-//      - 160-bit SHA-1 over the content of the index file before this
-//        checksum.
-//
-//    == Index entry
-//
-//      Index entries are sorted in ascending order on the name field,
-//      interpreted as a string of unsigned bytes (i.e. memcmp() order, no
-//      localization, no special casing of directory separator '/'). Entries
-//      with the same name are sorted by their stage field.
-//
-//      32-bit ctime seconds, the last time a file's metadata changed
-//        this is stat(2) data
-//
-//      32-bit ctime nanosecond fractions
-//        this is stat(2) data
-//
-//      32-bit mtime seconds, the last time a file's data changed
-//        this is stat(2) data
-//
-//      32-bit mtime nanosecond fractions
-//        this is stat(2) data
-//
-//      32-bit dev
-//        this is stat(2) data
-//
-//      32-bit ino
-//        this is stat(2) data
-//
-//      32-bit mode, split into (high to low bits)
-//
-//        4-bit object type
-//          valid values in binary are 1000 (regular file), 1010 (symbolic link)
-//          and 1110 (gitlink)
-//
-//        3-bit unused
-//
-//        9-bit unix permission. Only 0755 and 0644 are valid for regular files.
-//        Symbolic links and gitlinks have value 0 in this field.
-//
-//      32-bit uid
-//        this is stat(2) data
-//
-//      32-bit gid
-//        this is stat(2) data
-//
-//      32-bit file size
-//        This is the on-disk size from stat(2), truncated to 32-bit.
-//
-//      160-bit SHA-1 for the represented object
-//
-//      A 16-bit 'flags' field split into (high to low bits)
-//
-//        1-bit assume-valid flag
-//
-//        1-bit extended flag (must be zero in version 2)
-//
-//        2-bit stage (during merge)
-//
-//        12-bit name length if the length is less than 0xFFF; otherwise 0xFFF
-//        is stored in this field.
-//
-//      (Version 3 or later) A 16-bit field, only applicable if the
-//      "extended flag" above is 1, split into (high to low bits).
-//
-//        1-bit reserved for future
-//
-//        1-bit skip-worktree flag (used by sparse checkout)
-//
-//        1-bit intent-to-add flag (used by "git add -N")
-//
-//        13-bit unused, must be zero
-//
-//      Entry path name (variable length) relative to top level directory
-//        (without leading slash). '/' is used as path separator. The special
-//        path components ".", ".." and ".git" (without quotes) are disallowed.
-//        Trailing slash is also disallowed.
-//
-//        The exact encoding is undefined, but the '.' and '/' characters
-//        are encoded in 7-bit ASCII and the encoding cannot contain a NUL
-//        byte (iow, this is a UNIX pathname).
-//
-//      (Version 4) In version 4, the entry path name is prefix-compressed
-//        relative to the path name for the previous entry (the very first
-//        entry is encoded as if the path name for the previous entry is an
-//        empty string).  At the beginning of an entry, an integer N in the
-//        variable width encoding (the same encoding as the offset is encoded
-//        for OFS_DELTA pack entries; see pack-format.txt) is stored, followed
-//        by a NUL-terminated string S.  Removing N bytes from the end of the
-//        path name for the previous entry, and replacing it with the string S
-//        yields the path name for this entry.
-//
-//      1-8 nul bytes as necessary to pad the entry to a multiple of eight bytes
-//      while keeping the name NUL-terminated.
-//
-//      (Version 4) In version 4, the padding after the pathname does not
-//      exist.
-//
-//      Interpretation of index entries in split index mode is completely
-//      different. See below for details.
-//
-//    == Extensions
-//
-//    === Cached tree
-//
-//      Cached tree extension contains pre-computed hashes for trees that can
-//      be derived from the index. It helps speed up tree object generation
-//      from index for a new commit.
-//
-//      When a path is updated in index, the path must be invalidated and
-//      removed from tree cache.
-//
-//      The signature for this extension is { 'T', 'R', 'E', 'E' }.
-//
-//      A series of entries fill the entire extension; each of which
-//      consists of:
-//
-//      - NUL-terminated path component (relative to its parent directory);
-//
-//      - ASCII decimal number of entries in the index that is covered by the
-//        tree this entry represents (entry_count);
-//
-//      - A space (ASCII 32);
-//
-//      - ASCII decimal number that represents the number of subtrees this
-//        tree has;
-//
-//      - A newline (ASCII 10); and
-//
-//      - 160-bit object name for the object that would result from writing
-//        this span of index as a tree.
-//
-//      An entry can be in an invalidated state and is represented by having
-//      a negative number in the entry_count field. In this case, there is no
-//      object name and the next entry starts immediately after the newline.
-//      When writing an invalid entry, -1 should always be used as entry_count.
-//
-//      The entries are written out in the top-down, depth-first order.  The
-//      first entry represents the root level of the repository, followed by the
-//      first subtree--let's call this A--of the root level (with its name
-//      relative to the root level), followed by the first subtree of A (with
-//      its name relative to A), ...
-//
-//    === Resolve undo
-//
-//      A conflict is represented in the index as a set of higher stage entries.
-//      When a conflict is resolved (e.g. with "git add path"), these higher
-//      stage entries will be removed and a stage-0 entry with proper resolution
-//      is added.
-//
-//      When these higher stage entries are removed, they are saved in the
-//      resolve undo extension, so that conflicts can be recreated (e.g. with
-//      "git checkout -m"), in case users want to redo a conflict resolution
-//      from scratch.
-//
-//      The signature for this extension is { 'R', 'E', 'U', 'C' }.
-//
-//      A series of entries fill the entire extension; each of which
-//      consists of:
-//
-//      - NUL-terminated pathname the entry describes (relative to the root of
-//        the repository, i.e. full pathname);
-//
-//      - Three NUL-terminated ASCII octal numbers, entry mode of entries in
-//        stage 1 to 3 (a missing stage is represented by "0" in this field);
-//        and
-//
-//      - At most three 160-bit object names of the entry in stages from 1 to 3
-//        (nothing is written for a missing stage).
-//
-//    === Split index
-//
-//      In split index mode, the majority of index entries could be stored
-//      in a separate file. This extension records the changes to be made on
-//      top of that to produce the final index.
-//
-//      The signature for this extension is { 'l', 'i', 'n', 'k' }.
-//
-//      The extension consists of:
-//
-//      - 160-bit SHA-1 of the shared index file. The shared index file path
-//        is $GIT_DIR/sharedindex.. If all 160 bits are zero, the
-//        index does not require a shared index file.
-//
-//      - An ewah-encoded delete bitmap, each bit represents an entry in the
-//        shared index. If a bit is set, its corresponding entry in the
-//        shared index will be removed from the final index.  Note, because
-//        a delete operation changes index entry positions, but we do need
-//        original positions in replace phase, it's best to just mark
-//        entries for removal, then do a mass deletion after replacement.
-//
-//      - An ewah-encoded replace bitmap, each bit represents an entry in
-//        the shared index. If a bit is set, its corresponding entry in the
-//        shared index will be replaced with an entry in this index
-//        file. All replaced entries are stored in sorted order in this
-//        index. The first "1" bit in the replace bitmap corresponds to the
-//        first index entry, the second "1" bit to the second entry and so
-//        on. Replaced entries may have empty path names to save space.
-//
-//      The remaining index entries after replaced ones will be added to the
-//      final index. These added entries are also sorted by entry name then
-//      stage.
-//
-//    == Untracked cache
-//
-//      Untracked cache saves the untracked file list and necessary data to
-//      verify the cache. The signature for this extension is { 'U', 'N',
-//      'T', 'R' }.
-//
-//      The extension starts with
-//
-//      - A sequence of NUL-terminated strings, preceded by the size of the
-//        sequence in variable width encoding. Each string describes the
-//        environment where the cache can be used.
-//
-//      - Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
-//        ctime field until "file size".
-//
-//      - Stat data of plumbing.excludesfile
-//
-//      - 32-bit dir_flags (see struct dir_struct)
-//
-//      - 160-bit SHA-1 of $GIT_DIR/info/exclude. Null SHA-1 means the file
-//        does not exist.
-//
-//      - 160-bit SHA-1 of plumbing.excludesfile. Null SHA-1 means the file does
-//        not exist.
-//
-//      - NUL-terminated string of per-dir exclude file name. This usually
-//        is ".gitignore".
-//
-//      - The number of following directory blocks, variable width
-//        encoding. If this number is zero, the extension ends here with a
-//        following NUL.
-//
-//      - A number of directory blocks in depth-first-search order, each
-//        consists of
-//
-//        - The number of untracked entries, variable width encoding.
-//
-//        - The number of sub-directory blocks, variable width encoding.
-//
-//        - The directory name terminated by NUL.
-//
-//        - A number of untracked file/dir names terminated by NUL.
-//
-//    The remaining data of each directory block is grouped by type:
-//
-//      - An ewah bitmap, the n-th bit marks whether the n-th directory has
-//        valid untracked cache entries.
-//
-//      - An ewah bitmap, the n-th bit records "check-only" bit of
-//        read_directory_recursive() for the n-th directory.
-//
-//      - An ewah bitmap, the n-th bit indicates whether SHA-1 and stat data
-//        is valid for the n-th directory and exists in the next data.
-//
-//      - An array of stat data. The n-th data corresponds with the n-th
-//        "one" bit in the previous ewah bitmap.
-//
-//      - An array of SHA-1. The n-th SHA-1 corresponds with the n-th "one" bit
-//        in the previous ewah bitmap.
-//
-//      - One NUL.
-//
-//   == File System Monitor cache
-//
-//     The file system monitor cache tracks files for which the core.fsmonitor
-//     hook has told us about changes.  The signature for this extension is
-//     { 'F', 'S', 'M', 'N' }.
-//
-//     The extension starts with
-//
-//     - 32-bit version number: the current supported version is 1.
-//
-//     - 64-bit time: the extension data reflects all changes through the given
-//       time which is stored as the nanoseconds elapsed since midnight,
-//       January 1, 1970.
-//
-//    - 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.
-//
-//    - An ewah bitmap, the n-th bit indicates whether the n-th index entry
-//      is not CE_FSMONITOR_VALID.
-//
-//  == End of Index Entry
-//
-//    The End of Index Entry (EOIE) is used to locate the end of the variable
-//    length index entries and the beginning of the extensions. Code can take
-//    advantage of this to quickly locate the index extensions without having
-//    to parse through all of the index entries.
-//
-//    Because it must be able to be loaded before the variable length cache
-//    entries and other index extensions, this extension must be written last.
-//    The signature for this extension is { 'E', 'O', 'I', 'E' }.
-//
-//    The extension consists of:
-//
-//    - 32-bit offset to the end of the index entries
-//
-//    - 160-bit SHA-1 over the extension types and their sizes (but not
-//      their contents).  E.g. if we have "TREE" extension that is N-bytes
-//      long, "REUC" extension that is M-bytes long, followed by "EOIE",
-//      then the hash would be:
-//
-//      SHA-1("TREE" +  +
-//        "REUC" + )
-//
-//  == Index Entry Offset Table
-//
-//    The Index Entry Offset Table (IEOT) is used to help address the CPU
-//    cost of loading the index by enabling multi-threading the process of
-//    converting cache entries from the on-disk format to the in-memory format.
-//    The signature for this extension is { 'I', 'E', 'O', 'T' }.
-//
-//    The extension consists of:
-//
-//    - 32-bit version (currently 1)
-//
-//    - A number of index offset entries each consisting of:
-//
-//    - 32-bit offset from the beginning of the file to the first cache entry
-//      in this block of entries.
-//
-//    - 32-bit count of cache entries in this blockpackage index
-package index
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/encoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/encoder.go
deleted file mode 100644
index 9543c32b2..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/encoder.go
+++ /dev/null
@@ -1,239 +0,0 @@
-package index
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"path"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-)
-
-var (
-	// EncodeVersionSupported is the range of supported index versions
-	EncodeVersionSupported uint32 = 4
-
-	// ErrInvalidTimestamp is returned by Encode if a Index with a Entry with
-	// negative timestamp values
-	ErrInvalidTimestamp = errors.New("negative timestamps are not allowed")
-)
-
-// An Encoder writes an Index to an output stream.
-type Encoder struct {
-	w         io.Writer
-	hash      hash.Hash
-	lastEntry *Entry
-}
-
-// NewEncoder returns a new encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	h := hash.New(hash.CryptoType)
-	mw := io.MultiWriter(w, h)
-	return &Encoder{mw, h, nil}
-}
-
-// Encode writes the Index to the stream of the encoder.
-func (e *Encoder) Encode(idx *Index) error {
-	return e.encode(idx, true)
-}
-
-func (e *Encoder) encode(idx *Index, footer bool) error {
-
-	// TODO: support extensions
-	if idx.Version > EncodeVersionSupported {
-		return ErrUnsupportedVersion
-	}
-
-	if err := e.encodeHeader(idx); err != nil {
-		return err
-	}
-
-	if err := e.encodeEntries(idx); err != nil {
-		return err
-	}
-
-	if footer {
-		return e.encodeFooter()
-	}
-	return nil
-}
-
-func (e *Encoder) encodeHeader(idx *Index) error {
-	return binary.Write(e.w,
-		indexSignature,
-		idx.Version,
-		uint32(len(idx.Entries)),
-	)
-}
-
-func (e *Encoder) encodeEntries(idx *Index) error {
-	sort.Sort(byName(idx.Entries))
-
-	for _, entry := range idx.Entries {
-		if err := e.encodeEntry(idx, entry); err != nil {
-			return err
-		}
-		entryLength := entryHeaderLength
-		if entry.IntentToAdd || entry.SkipWorktree {
-			entryLength += 2
-		}
-
-		wrote := entryLength + len(entry.Name)
-		if err := e.padEntry(idx, wrote); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (e *Encoder) encodeEntry(idx *Index, entry *Entry) error {
-	sec, nsec, err := e.timeToUint32(&entry.CreatedAt)
-	if err != nil {
-		return err
-	}
-
-	msec, mnsec, err := e.timeToUint32(&entry.ModifiedAt)
-	if err != nil {
-		return err
-	}
-
-	flags := uint16(entry.Stage&0x3) << 12
-	if l := len(entry.Name); l < nameMask {
-		flags |= uint16(l)
-	} else {
-		flags |= nameMask
-	}
-
-	flow := []interface{}{
-		sec, nsec,
-		msec, mnsec,
-		entry.Dev,
-		entry.Inode,
-		entry.Mode,
-		entry.UID,
-		entry.GID,
-		entry.Size,
-		entry.Hash[:],
-	}
-
-	flagsFlow := []interface{}{flags}
-
-	if entry.IntentToAdd || entry.SkipWorktree {
-		var extendedFlags uint16
-
-		if entry.IntentToAdd {
-			extendedFlags |= intentToAddMask
-		}
-		if entry.SkipWorktree {
-			extendedFlags |= skipWorkTreeMask
-		}
-
-		flagsFlow = []interface{}{flags | entryExtended, extendedFlags}
-	}
-
-	flow = append(flow, flagsFlow...)
-
-	if err := binary.Write(e.w, flow...); err != nil {
-		return err
-	}
-
-	switch idx.Version {
-	case 2, 3:
-		err = e.encodeEntryName(entry)
-	case 4:
-		err = e.encodeEntryNameV4(entry)
-	default:
-		err = ErrUnsupportedVersion
-	}
-
-	return err
-}
-
-func (e *Encoder) encodeEntryName(entry *Entry) error {
-	return binary.Write(e.w, []byte(entry.Name))
-}
-
-func (e *Encoder) encodeEntryNameV4(entry *Entry) error {
-	name := entry.Name
-	l := 0
-	if e.lastEntry != nil {
-		dir := path.Dir(e.lastEntry.Name) + "/"
-		if strings.HasPrefix(entry.Name, dir) {
-			l = len(e.lastEntry.Name) - len(dir)
-			name = strings.TrimPrefix(entry.Name, dir)
-		} else {
-			l = len(e.lastEntry.Name)
-		}
-	}
-
-	e.lastEntry = entry
-
-	err := binary.WriteVariableWidthInt(e.w, int64(l))
-	if err != nil {
-		return err
-	}
-
-	return binary.Write(e.w, []byte(name+string('\x00')))
-}
-
-func (e *Encoder) encodeRawExtension(signature string, data []byte) error {
-	if len(signature) != 4 {
-		return fmt.Errorf("invalid signature length")
-	}
-
-	_, err := e.w.Write([]byte(signature))
-	if err != nil {
-		return err
-	}
-
-	err = binary.WriteUint32(e.w, uint32(len(data)))
-	if err != nil {
-		return err
-	}
-
-	_, err = e.w.Write(data)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Encoder) timeToUint32(t *time.Time) (uint32, uint32, error) {
-	if t.IsZero() {
-		return 0, 0, nil
-	}
-
-	if t.Unix() < 0 || t.UnixNano() < 0 {
-		return 0, 0, ErrInvalidTimestamp
-	}
-
-	return uint32(t.Unix()), uint32(t.Nanosecond()), nil
-}
-
-func (e *Encoder) padEntry(idx *Index, wrote int) error {
-	if idx.Version == 4 {
-		return nil
-	}
-
-	padLen := 8 - wrote%8
-
-	_, err := e.w.Write(bytes.Repeat([]byte{'\x00'}, padLen))
-	return err
-}
-
-func (e *Encoder) encodeFooter() error {
-	return binary.Write(e.w, e.hash.Sum(nil))
-}
-
-type byName []*Entry
-
-func (l byName) Len() int           { return len(l) }
-func (l byName) Swap(i, j int)      { l[i], l[j] = l[j], l[i] }
-func (l byName) Less(i, j int) bool { return l[i].Name < l[j].Name }
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/index.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/index.go
deleted file mode 100644
index 2f68ae978..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/index.go
+++ /dev/null
@@ -1,231 +0,0 @@
-package index
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-)
-
-var (
-	// ErrUnsupportedVersion is returned by Decode when the index file version
-	// is not supported.
-	ErrUnsupportedVersion = errors.New("unsupported version")
-	// ErrEntryNotFound is returned by Index.Entry, if an entry is not found.
-	ErrEntryNotFound = errors.New("entry not found")
-
-	indexSignature              = []byte{'D', 'I', 'R', 'C'}
-	treeExtSignature            = []byte{'T', 'R', 'E', 'E'}
-	resolveUndoExtSignature     = []byte{'R', 'E', 'U', 'C'}
-	endOfIndexEntryExtSignature = []byte{'E', 'O', 'I', 'E'}
-)
-
-// Stage during merge
-type Stage int
-
-const (
-	// Merged is the default stage, fully merged
-	Merged Stage = 1
-	// AncestorMode is the base revision
-	AncestorMode Stage = 1
-	// OurMode is the first tree revision, ours
-	OurMode Stage = 2
-	// TheirMode is the second tree revision, theirs
-	TheirMode Stage = 3
-)
-
-// Index contains the information about which objects are currently checked out
-// in the worktree, having information about the working files. Changes in
-// worktree are detected using this Index. The Index is also used during merges
-type Index struct {
-	// Version is index version
-	Version uint32
-	// Entries collection of entries represented by this Index. The order of
-	// this collection is not guaranteed
-	Entries []*Entry
-	// Cache represents the 'Cached tree' extension
-	Cache *Tree
-	// ResolveUndo represents the 'Resolve undo' extension
-	ResolveUndo *ResolveUndo
-	// EndOfIndexEntry represents the 'End of Index Entry' extension
-	EndOfIndexEntry *EndOfIndexEntry
-}
-
-// Add creates a new Entry and returns it. The caller should first check that
-// another entry with the same path does not exist.
-func (i *Index) Add(path string) *Entry {
-	e := &Entry{
-		Name: filepath.ToSlash(path),
-	}
-
-	i.Entries = append(i.Entries, e)
-	return e
-}
-
-// Entry returns the entry that match the given path, if any.
-func (i *Index) Entry(path string) (*Entry, error) {
-	path = filepath.ToSlash(path)
-	for _, e := range i.Entries {
-		if e.Name == path {
-			return e, nil
-		}
-	}
-
-	return nil, ErrEntryNotFound
-}
-
-// Remove remove the entry that match the give path and returns deleted entry.
-func (i *Index) Remove(path string) (*Entry, error) {
-	path = filepath.ToSlash(path)
-	for index, e := range i.Entries {
-		if e.Name == path {
-			i.Entries = append(i.Entries[:index], i.Entries[index+1:]...)
-			return e, nil
-		}
-	}
-
-	return nil, ErrEntryNotFound
-}
-
-// Glob returns the all entries matching pattern or nil if there is no matching
-// entry. The syntax of patterns is the same as in filepath.Glob.
-func (i *Index) Glob(pattern string) (matches []*Entry, err error) {
-	pattern = filepath.ToSlash(pattern)
-	for _, e := range i.Entries {
-		m, err := match(pattern, e.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		if m {
-			matches = append(matches, e)
-		}
-	}
-
-	return
-}
-
-// String is equivalent to `git ls-files --stage --debug`
-func (i *Index) String() string {
-	buf := bytes.NewBuffer(nil)
-	for _, e := range i.Entries {
-		buf.WriteString(e.String())
-	}
-
-	return buf.String()
-}
-
-// Entry represents a single file (or stage of a file) in the cache. An entry
-// represents exactly one stage of a file. If a file path is unmerged then
-// multiple Entry instances may appear for the same path name.
-type Entry struct {
-	// Hash is the SHA1 of the represented file
-	Hash plumbing.Hash
-	// Name is the  Entry path name relative to top level directory
-	Name string
-	// CreatedAt time when the tracked path was created
-	CreatedAt time.Time
-	// ModifiedAt time when the tracked path was changed
-	ModifiedAt time.Time
-	// Dev and Inode of the tracked path
-	Dev, Inode uint32
-	// Mode of the path
-	Mode filemode.FileMode
-	// UID and GID, userid and group id of the owner
-	UID, GID uint32
-	// Size is the length in bytes for regular files
-	Size uint32
-	// Stage on a merge is defines what stage is representing this entry
-	// https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
-	Stage Stage
-	// SkipWorktree used in sparse checkouts
-	// https://git-scm.com/docs/git-read-tree#_sparse_checkout
-	SkipWorktree bool
-	// IntentToAdd record only the fact that the path will be added later
-	// https://git-scm.com/docs/git-add ("git add -N")
-	IntentToAdd bool
-}
-
-func (e Entry) String() string {
-	buf := bytes.NewBuffer(nil)
-
-	fmt.Fprintf(buf, "%06o %s %d\t%s\n", e.Mode, e.Hash, e.Stage, e.Name)
-	fmt.Fprintf(buf, "  ctime: %d:%d\n", e.CreatedAt.Unix(), e.CreatedAt.Nanosecond())
-	fmt.Fprintf(buf, "  mtime: %d:%d\n", e.ModifiedAt.Unix(), e.ModifiedAt.Nanosecond())
-	fmt.Fprintf(buf, "  dev: %d\tino: %d\n", e.Dev, e.Inode)
-	fmt.Fprintf(buf, "  uid: %d\tgid: %d\n", e.UID, e.GID)
-	fmt.Fprintf(buf, "  size: %d\tflags: %x\n", e.Size, 0)
-
-	return buf.String()
-}
-
-// Tree contains pre-computed hashes for trees that can be derived from the
-// index. It helps speed up tree object generation from index for a new commit.
-type Tree struct {
-	Entries []TreeEntry
-}
-
-// TreeEntry entry of a cached Tree
-type TreeEntry struct {
-	// Path component (relative to its parent directory)
-	Path string
-	// Entries is the number of entries in the index that is covered by the tree
-	// this entry represents.
-	Entries int
-	// Trees is the number that represents the number of subtrees this tree has
-	Trees int
-	// Hash object name for the object that would result from writing this span
-	// of index as a tree.
-	Hash plumbing.Hash
-}
-
-// ResolveUndo is used when a conflict is resolved (e.g. with "git add path"),
-// these higher stage entries are removed and a stage-0 entry with proper
-// resolution is added. When these higher stage entries are removed, they are
-// saved in the resolve undo extension.
-type ResolveUndo struct {
-	Entries []ResolveUndoEntry
-}
-
-// ResolveUndoEntry contains the information about a conflict when is resolved
-type ResolveUndoEntry struct {
-	Path   string
-	Stages map[Stage]plumbing.Hash
-}
-
-// EndOfIndexEntry is the End of Index Entry (EOIE) is used to locate the end of
-// the variable length index entries and the beginning of the extensions. Code
-// can take advantage of this to quickly locate the index extensions without
-// having to parse through all of the index entries.
-//
-//  Because it must be able to be loaded before the variable length cache
-//  entries and other index extensions, this extension must be written last.
-type EndOfIndexEntry struct {
-	// Offset to the end of the index entries
-	Offset uint32
-	// Hash is a SHA-1 over the extension types and their sizes (but not
-	//	their contents).
-	Hash plumbing.Hash
-}
-
-// SkipUnless applies patterns in the form of A, A/B, A/B/C
-// to the index to prevent the files from being checked out
-func (i *Index) SkipUnless(patterns []string) {
-	for _, e := range i.Entries {
-		var include bool
-		for _, pattern := range patterns {
-			if strings.HasPrefix(e.Name, pattern) {
-				include = true
-				break
-			}
-		}
-		if !include {
-			e.SkipWorktree = true
-		}
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/match.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/match.go
deleted file mode 100644
index 2891d7d34..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/index/match.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package index
-
-import (
-	"path/filepath"
-	"runtime"
-	"unicode/utf8"
-)
-
-// match is filepath.Match with support to match fullpath and not only filenames
-// code from:
-// https://github.com/golang/go/blob/39852bf4cce6927e01d0136c7843f65a801738cb/src/path/filepath/match.go#L44-L224
-func match(pattern, name string) (matched bool, err error) {
-Pattern:
-	for len(pattern) > 0 {
-		var star bool
-		var chunk string
-		star, chunk, pattern = scanChunk(pattern)
-
-		// Look for match at current position.
-		t, ok, err := matchChunk(chunk, name)
-		// if we're the last chunk, make sure we've exhausted the name
-		// otherwise we'll give a false result even if we could still match
-		// using the star
-		if ok && (len(t) == 0 || len(pattern) > 0) {
-			name = t
-			continue
-		}
-		if err != nil {
-			return false, err
-		}
-		if star {
-			// Look for match skipping i+1 bytes.
-			// Cannot skip /.
-			for i := 0; i < len(name); i++ {
-				t, ok, err := matchChunk(chunk, name[i+1:])
-				if ok {
-					// if we're the last chunk, make sure we exhausted the name
-					if len(pattern) == 0 && len(t) > 0 {
-						continue
-					}
-					name = t
-					continue Pattern
-				}
-				if err != nil {
-					return false, err
-				}
-			}
-		}
-		return false, nil
-	}
-	return len(name) == 0, nil
-}
-
-// scanChunk gets the next segment of pattern, which is a non-star string
-// possibly preceded by a star.
-func scanChunk(pattern string) (star bool, chunk, rest string) {
-	for len(pattern) > 0 && pattern[0] == '*' {
-		pattern = pattern[1:]
-		star = true
-	}
-	inrange := false
-	var i int
-Scan:
-	for i = 0; i < len(pattern); i++ {
-		switch pattern[i] {
-		case '\\':
-			if runtime.GOOS != "windows" {
-				// error check handled in matchChunk: bad pattern.
-				if i+1 < len(pattern) {
-					i++
-				}
-			}
-		case '[':
-			inrange = true
-		case ']':
-			inrange = false
-		case '*':
-			if !inrange {
-				break Scan
-			}
-		}
-	}
-	return star, pattern[0:i], pattern[i:]
-}
-
-// matchChunk checks whether chunk matches the beginning of s.
-// If so, it returns the remainder of s (after the match).
-// Chunk is all single-character operators: literals, char classes, and ?.
-func matchChunk(chunk, s string) (rest string, ok bool, err error) {
-	for len(chunk) > 0 {
-		if len(s) == 0 {
-			return
-		}
-		switch chunk[0] {
-		case '[':
-			// character class
-			r, n := utf8.DecodeRuneInString(s)
-			s = s[n:]
-			chunk = chunk[1:]
-			// We can't end right after '[', we're expecting at least
-			// a closing bracket and possibly a caret.
-			if len(chunk) == 0 {
-				err = filepath.ErrBadPattern
-				return
-			}
-			// possibly negated
-			negated := chunk[0] == '^'
-			if negated {
-				chunk = chunk[1:]
-			}
-			// parse all ranges
-			match := false
-			nrange := 0
-			for {
-				if len(chunk) > 0 && chunk[0] == ']' && nrange > 0 {
-					chunk = chunk[1:]
-					break
-				}
-				var lo, hi rune
-				if lo, chunk, err = getEsc(chunk); err != nil {
-					return
-				}
-				hi = lo
-				if chunk[0] == '-' {
-					if hi, chunk, err = getEsc(chunk[1:]); err != nil {
-						return
-					}
-				}
-				if lo <= r && r <= hi {
-					match = true
-				}
-				nrange++
-			}
-			if match == negated {
-				return
-			}
-
-		case '?':
-			_, n := utf8.DecodeRuneInString(s)
-			s = s[n:]
-			chunk = chunk[1:]
-
-		case '\\':
-			if runtime.GOOS != "windows" {
-				chunk = chunk[1:]
-				if len(chunk) == 0 {
-					err = filepath.ErrBadPattern
-					return
-				}
-			}
-			fallthrough
-
-		default:
-			if chunk[0] != s[0] {
-				return
-			}
-			s = s[1:]
-			chunk = chunk[1:]
-		}
-	}
-	return s, true, nil
-}
-
-// getEsc gets a possibly-escaped character from chunk, for a character class.
-func getEsc(chunk string) (r rune, nchunk string, err error) {
-	if len(chunk) == 0 || chunk[0] == '-' || chunk[0] == ']' {
-		err = filepath.ErrBadPattern
-		return
-	}
-	if chunk[0] == '\\' && runtime.GOOS != "windows" {
-		chunk = chunk[1:]
-		if len(chunk) == 0 {
-			err = filepath.ErrBadPattern
-			return
-		}
-	}
-	r, n := utf8.DecodeRuneInString(chunk)
-	if r == utf8.RuneError && n == 1 {
-		err = filepath.ErrBadPattern
-	}
-	nchunk = chunk[n:]
-	if len(nchunk) == 0 {
-		err = filepath.ErrBadPattern
-	}
-	return
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/doc.go
deleted file mode 100644
index a7145160a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package objfile implements encoding and decoding of object files.
-package objfile
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/reader.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/reader.go
deleted file mode 100644
index 433942805..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/reader.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package objfile
-
-import (
-	"errors"
-	"io"
-	"strconv"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/packfile"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-var (
-	ErrClosed       = errors.New("objfile: already closed")
-	ErrHeader       = errors.New("objfile: invalid header")
-	ErrNegativeSize = errors.New("objfile: negative object size")
-)
-
-// Reader reads and decodes compressed objfile data from a provided io.Reader.
-// Reader implements io.ReadCloser. Close should be called when finished with
-// the Reader. Close will not close the underlying io.Reader.
-type Reader struct {
-	multi   io.Reader
-	zlib    io.Reader
-	zlibref sync.ZLibReader
-	hasher  plumbing.Hasher
-}
-
-// NewReader returns a new Reader reading from r.
-func NewReader(r io.Reader) (*Reader, error) {
-	zlib, err := sync.GetZlibReader(r)
-	if err != nil {
-		return nil, packfile.ErrZLib.AddDetails(err.Error())
-	}
-
-	return &Reader{
-		zlib:    zlib.Reader,
-		zlibref: zlib,
-	}, nil
-}
-
-// Header reads the type and the size of object, and prepares the reader for read
-func (r *Reader) Header() (t plumbing.ObjectType, size int64, err error) {
-	var raw []byte
-	raw, err = r.readUntil(' ')
-	if err != nil {
-		return
-	}
-
-	t, err = plumbing.ParseObjectType(string(raw))
-	if err != nil {
-		return
-	}
-
-	raw, err = r.readUntil(0)
-	if err != nil {
-		return
-	}
-
-	size, err = strconv.ParseInt(string(raw), 10, 64)
-	if err != nil {
-		err = ErrHeader
-		return
-	}
-
-	defer r.prepareForRead(t, size)
-	return
-}
-
-// readSlice reads one byte at a time from r until it encounters delim or an
-// error.
-func (r *Reader) readUntil(delim byte) ([]byte, error) {
-	var buf [1]byte
-	value := make([]byte, 0, 16)
-	for {
-		if n, err := r.zlib.Read(buf[:]); err != nil && (err != io.EOF || n == 0) {
-			if err == io.EOF {
-				return nil, ErrHeader
-			}
-			return nil, err
-		}
-
-		if buf[0] == delim {
-			return value, nil
-		}
-
-		value = append(value, buf[0])
-	}
-}
-
-func (r *Reader) prepareForRead(t plumbing.ObjectType, size int64) {
-	r.hasher = plumbing.NewHasher(t, size)
-	r.multi = io.TeeReader(r.zlib, r.hasher)
-}
-
-// Read reads len(p) bytes into p from the object data stream. It returns
-// the number of bytes read (0 <= n <= len(p)) and any error encountered. Even
-// if Read returns n < len(p), it may use all of p as scratch space during the
-// call.
-//
-// If Read encounters the end of the data stream it will return err == io.EOF,
-// either in the current call if n > 0 or in a subsequent call.
-func (r *Reader) Read(p []byte) (n int, err error) {
-	return r.multi.Read(p)
-}
-
-// Hash returns the hash of the object data stream that has been read so far.
-func (r *Reader) Hash() plumbing.Hash {
-	return r.hasher.Sum()
-}
-
-// Close releases any resources consumed by the Reader. Calling Close does not
-// close the wrapped io.Reader originally passed to NewReader.
-func (r *Reader) Close() error {
-	sync.PutZlibReader(r.zlibref)
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/writer.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/writer.go
deleted file mode 100644
index 0d9fae321..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/objfile/writer.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package objfile
-
-import (
-	"compress/zlib"
-	"errors"
-	"io"
-	"strconv"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-var (
-	ErrOverflow = errors.New("objfile: declared data length exceeded (overflow)")
-)
-
-// Writer writes and encodes data in compressed objfile format to a provided
-// io.Writer. Close should be called when finished with the Writer. Close will
-// not close the underlying io.Writer.
-type Writer struct {
-	raw    io.Writer
-	hasher plumbing.Hasher
-	multi  io.Writer
-	zlib   *zlib.Writer
-
-	closed  bool
-	pending int64 // number of unwritten bytes
-}
-
-// NewWriter returns a new Writer writing to w.
-//
-// The returned Writer implements io.WriteCloser. Close should be called when
-// finished with the Writer. Close will not close the underlying io.Writer.
-func NewWriter(w io.Writer) *Writer {
-	zlib := sync.GetZlibWriter(w)
-	return &Writer{
-		raw:  w,
-		zlib: zlib,
-	}
-}
-
-// WriteHeader writes the type and the size and prepares to accept the object's
-// contents. If an invalid t is provided, plumbing.ErrInvalidType is returned. If a
-// negative size is provided, ErrNegativeSize is returned.
-func (w *Writer) WriteHeader(t plumbing.ObjectType, size int64) error {
-	if !t.Valid() {
-		return plumbing.ErrInvalidType
-	}
-	if size < 0 {
-		return ErrNegativeSize
-	}
-
-	b := t.Bytes()
-	b = append(b, ' ')
-	b = append(b, []byte(strconv.FormatInt(size, 10))...)
-	b = append(b, 0)
-
-	defer w.prepareForWrite(t, size)
-	_, err := w.zlib.Write(b)
-
-	return err
-}
-
-func (w *Writer) prepareForWrite(t plumbing.ObjectType, size int64) {
-	w.pending = size
-
-	w.hasher = plumbing.NewHasher(t, size)
-	w.multi = io.MultiWriter(w.zlib, w.hasher)
-}
-
-// Write writes the object's contents. Write returns the error ErrOverflow if
-// more than size bytes are written after WriteHeader.
-func (w *Writer) Write(p []byte) (n int, err error) {
-	if w.closed {
-		return 0, ErrClosed
-	}
-
-	overwrite := false
-	if int64(len(p)) > w.pending {
-		p = p[0:w.pending]
-		overwrite = true
-	}
-
-	n, err = w.multi.Write(p)
-	w.pending -= int64(n)
-	if err == nil && overwrite {
-		err = ErrOverflow
-		return
-	}
-
-	return
-}
-
-// Hash returns the hash of the object data stream that has been written so far.
-// It can be called before or after Close.
-func (w *Writer) Hash() plumbing.Hash {
-	return w.hasher.Sum() // Not yet closed, return hash of data written so far
-}
-
-// Close releases any resources consumed by the Writer.
-//
-// Calling Close does not close the wrapped io.Writer originally passed to
-// NewWriter.
-func (w *Writer) Close() error {
-	defer sync.PutZlibWriter(w.zlib)
-	if err := w.zlib.Close(); err != nil {
-		return err
-	}
-
-	w.closed = true
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/common.go
deleted file mode 100644
index 926ac2ebb..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/common.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package packfile
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-var signature = []byte{'P', 'A', 'C', 'K'}
-
-const (
-	// VersionSupported is the packfile version supported by this package
-	VersionSupported uint32 = 2
-
-	firstLengthBits = uint8(4)   // the first byte into object header has 4 bits to store the length
-	lengthBits      = uint8(7)   // subsequent bytes has 7 bits to store the length
-	maskFirstLength = 15         // 0000 1111
-	maskContinue    = 0x80       // 1000 0000
-	maskLength      = uint8(127) // 0111 1111
-	maskType        = uint8(112) // 0111 0000
-)
-
-// UpdateObjectStorage updates the storer with the objects in the given
-// packfile.
-func UpdateObjectStorage(s storer.Storer, packfile io.Reader) error {
-	if pw, ok := s.(storer.PackfileWriter); ok {
-		return WritePackfileToObjectStorage(pw, packfile)
-	}
-
-	p, err := NewParserWithStorage(NewScanner(packfile), s)
-	if err != nil {
-		return err
-	}
-
-	_, err = p.Parse()
-	return err
-}
-
-// WritePackfileToObjectStorage writes all the packfile objects into the given
-// object storage.
-func WritePackfileToObjectStorage(
-	sw storer.PackfileWriter,
-	packfile io.Reader,
-) (err error) {
-	w, err := sw.PackfileWriter()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	var n int64
-	n, err = io.Copy(w, packfile)
-	if err == nil && n == 0 {
-		return ErrEmptyPackfile
-	}
-
-	return err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/delta_index.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/delta_index.go
deleted file mode 100644
index a60ec0b24..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/delta_index.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package packfile
-
-const blksz = 16
-const maxChainLength = 64
-
-// deltaIndex is a modified version of JGit's DeltaIndex adapted to our current
-// design.
-type deltaIndex struct {
-	table   []int
-	entries []int
-	mask    int
-}
-
-func (idx *deltaIndex) init(buf []byte) {
-	scanner := newDeltaIndexScanner(buf, len(buf))
-	idx.mask = scanner.mask
-	idx.table = scanner.table
-	idx.entries = make([]int, countEntries(scanner)+1)
-	idx.copyEntries(scanner)
-}
-
-// findMatch returns the offset of src where the block starting at tgtOffset
-// is and the length of the match. A length of 0 means there was no match. A
-// length of -1 means the src length is lower than the blksz and whatever
-// other positive length is the length of the match in bytes.
-func (idx *deltaIndex) findMatch(src, tgt []byte, tgtOffset int) (srcOffset, l int) {
-	if len(tgt) < tgtOffset+s {
-		return 0, len(tgt) - tgtOffset
-	}
-
-	if len(src) < blksz {
-		return 0, -1
-	}
-
-	h := hashBlock(tgt, tgtOffset)
-	tIdx := h & idx.mask
-	eIdx := idx.table[tIdx]
-	if eIdx == 0 {
-		return
-	}
-
-	srcOffset = idx.entries[eIdx]
-
-	l = matchLength(src, tgt, tgtOffset, srcOffset)
-
-	return
-}
-
-func matchLength(src, tgt []byte, otgt, osrc int) (l int) {
-	lensrc := len(src)
-	lentgt := len(tgt)
-	for (osrc < lensrc && otgt < lentgt) && src[osrc] == tgt[otgt] {
-		l++
-		osrc++
-		otgt++
-	}
-	return
-}
-
-func countEntries(scan *deltaIndexScanner) (cnt int) {
-	// Figure out exactly how many entries we need. As we do the
-	// enumeration truncate any delta chains longer than what we
-	// are willing to scan during encode. This keeps the encode
-	// logic linear in the size of the input rather than quadratic.
-	for i := 0; i < len(scan.table); i++ {
-		h := scan.table[i]
-		if h == 0 {
-			continue
-		}
-
-		size := 0
-		for {
-			size++
-			if size == maxChainLength {
-				scan.next[h] = 0
-				break
-			}
-			h = scan.next[h]
-
-			if h == 0 {
-				break
-			}
-		}
-		cnt += size
-	}
-
-	return
-}
-
-func (idx *deltaIndex) copyEntries(scanner *deltaIndexScanner) {
-	// Rebuild the entries list from the scanner, positioning all
-	// blocks in the same hash chain next to each other. We can
-	// then later discard the next list, along with the scanner.
-	//
-	next := 1
-	for i := 0; i < len(idx.table); i++ {
-		h := idx.table[i]
-		if h == 0 {
-			continue
-		}
-
-		idx.table[i] = next
-		for {
-			idx.entries[next] = scanner.entries[h]
-			next++
-			h = scanner.next[h]
-
-			if h == 0 {
-				break
-			}
-		}
-	}
-}
-
-type deltaIndexScanner struct {
-	table   []int
-	entries []int
-	next    []int
-	mask    int
-	count   int
-}
-
-func newDeltaIndexScanner(buf []byte, size int) *deltaIndexScanner {
-	size -= size % blksz
-	worstCaseBlockCnt := size / blksz
-	if worstCaseBlockCnt < 1 {
-		return new(deltaIndexScanner)
-	}
-
-	tableSize := tableSize(worstCaseBlockCnt)
-	scanner := &deltaIndexScanner{
-		table:   make([]int, tableSize),
-		mask:    tableSize - 1,
-		entries: make([]int, worstCaseBlockCnt+1),
-		next:    make([]int, worstCaseBlockCnt+1),
-	}
-
-	scanner.scan(buf, size)
-	return scanner
-}
-
-// slightly modified version of JGit's DeltaIndexScanner. We store the offset on the entries
-// instead of the entries and the key, so we avoid operations to retrieve the offset later, as
-// we don't use the key.
-// See: https://github.com/eclipse/jgit/blob/005e5feb4ecd08c4e4d141a38b9e7942accb3212/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaIndexScanner.java
-func (s *deltaIndexScanner) scan(buf []byte, end int) {
-	lastHash := 0
-	ptr := end - blksz
-
-	for {
-		key := hashBlock(buf, ptr)
-		tIdx := key & s.mask
-		head := s.table[tIdx]
-		if head != 0 && lastHash == key {
-			s.entries[head] = ptr
-		} else {
-			s.count++
-			eIdx := s.count
-			s.entries[eIdx] = ptr
-			s.next[eIdx] = head
-			s.table[tIdx] = eIdx
-		}
-
-		lastHash = key
-		ptr -= blksz
-
-		if 0 > ptr {
-			break
-		}
-	}
-}
-
-func tableSize(worstCaseBlockCnt int) int {
-	shift := 32 - leadingZeros(uint32(worstCaseBlockCnt))
-	sz := 1 << uint(shift-1)
-	if sz < worstCaseBlockCnt {
-		sz <<= 1
-	}
-	return sz
-}
-
-// use https://golang.org/pkg/math/bits/#LeadingZeros32 in the future
-func leadingZeros(x uint32) (n int) {
-	if x >= 1<<16 {
-		x >>= 16
-		n = 16
-	}
-	if x >= 1<<8 {
-		x >>= 8
-		n += 8
-	}
-	n += int(len8tab[x])
-	return 32 - n
-}
-
-var len8tab = [256]uint8{
-	0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-}
-
-func hashBlock(raw []byte, ptr int) int {
-	// The first 4 steps collapse out into a 4 byte big-endian decode,
-	// with a larger right shift as we combined shift lefts together.
-	//
-	hash := ((uint32(raw[ptr]) & 0xff) << 24) |
-		((uint32(raw[ptr+1]) & 0xff) << 16) |
-		((uint32(raw[ptr+2]) & 0xff) << 8) |
-		(uint32(raw[ptr+3]) & 0xff)
-	hash ^= T[hash>>31]
-
-	hash = ((hash << 8) | (uint32(raw[ptr+4]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+5]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+6]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+7]) & 0xff)) ^ T[hash>>23]
-
-	hash = ((hash << 8) | (uint32(raw[ptr+8]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+9]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+10]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+11]) & 0xff)) ^ T[hash>>23]
-
-	hash = ((hash << 8) | (uint32(raw[ptr+12]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+13]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+14]) & 0xff)) ^ T[hash>>23]
-	hash = ((hash << 8) | (uint32(raw[ptr+15]) & 0xff)) ^ T[hash>>23]
-
-	return int(hash)
-}
-
-var T = []uint32{0x00000000, 0xd4c6b32d, 0x7d4bd577,
-	0xa98d665a, 0x2e5119c3, 0xfa97aaee, 0x531accb4, 0x87dc7f99,
-	0x5ca23386, 0x886480ab, 0x21e9e6f1, 0xf52f55dc, 0x72f32a45,
-	0xa6359968, 0x0fb8ff32, 0xdb7e4c1f, 0x6d82d421, 0xb944670c,
-	0x10c90156, 0xc40fb27b, 0x43d3cde2, 0x97157ecf, 0x3e981895,
-	0xea5eabb8, 0x3120e7a7, 0xe5e6548a, 0x4c6b32d0, 0x98ad81fd,
-	0x1f71fe64, 0xcbb74d49, 0x623a2b13, 0xb6fc983e, 0x0fc31b6f,
-	0xdb05a842, 0x7288ce18, 0xa64e7d35, 0x219202ac, 0xf554b181,
-	0x5cd9d7db, 0x881f64f6, 0x536128e9, 0x87a79bc4, 0x2e2afd9e,
-	0xfaec4eb3, 0x7d30312a, 0xa9f68207, 0x007be45d, 0xd4bd5770,
-	0x6241cf4e, 0xb6877c63, 0x1f0a1a39, 0xcbcca914, 0x4c10d68d,
-	0x98d665a0, 0x315b03fa, 0xe59db0d7, 0x3ee3fcc8, 0xea254fe5,
-	0x43a829bf, 0x976e9a92, 0x10b2e50b, 0xc4745626, 0x6df9307c,
-	0xb93f8351, 0x1f8636de, 0xcb4085f3, 0x62cde3a9, 0xb60b5084,
-	0x31d72f1d, 0xe5119c30, 0x4c9cfa6a, 0x985a4947, 0x43240558,
-	0x97e2b675, 0x3e6fd02f, 0xeaa96302, 0x6d751c9b, 0xb9b3afb6,
-	0x103ec9ec, 0xc4f87ac1, 0x7204e2ff, 0xa6c251d2, 0x0f4f3788,
-	0xdb8984a5, 0x5c55fb3c, 0x88934811, 0x211e2e4b, 0xf5d89d66,
-	0x2ea6d179, 0xfa606254, 0x53ed040e, 0x872bb723, 0x00f7c8ba,
-	0xd4317b97, 0x7dbc1dcd, 0xa97aaee0, 0x10452db1, 0xc4839e9c,
-	0x6d0ef8c6, 0xb9c84beb, 0x3e143472, 0xead2875f, 0x435fe105,
-	0x97995228, 0x4ce71e37, 0x9821ad1a, 0x31accb40, 0xe56a786d,
-	0x62b607f4, 0xb670b4d9, 0x1ffdd283, 0xcb3b61ae, 0x7dc7f990,
-	0xa9014abd, 0x008c2ce7, 0xd44a9fca, 0x5396e053, 0x8750537e,
-	0x2edd3524, 0xfa1b8609, 0x2165ca16, 0xf5a3793b, 0x5c2e1f61,
-	0x88e8ac4c, 0x0f34d3d5, 0xdbf260f8, 0x727f06a2, 0xa6b9b58f,
-	0x3f0c6dbc, 0xebcade91, 0x4247b8cb, 0x96810be6, 0x115d747f,
-	0xc59bc752, 0x6c16a108, 0xb8d01225, 0x63ae5e3a, 0xb768ed17,
-	0x1ee58b4d, 0xca233860, 0x4dff47f9, 0x9939f4d4, 0x30b4928e,
-	0xe47221a3, 0x528eb99d, 0x86480ab0, 0x2fc56cea, 0xfb03dfc7,
-	0x7cdfa05e, 0xa8191373, 0x01947529, 0xd552c604, 0x0e2c8a1b,
-	0xdaea3936, 0x73675f6c, 0xa7a1ec41, 0x207d93d8, 0xf4bb20f5,
-	0x5d3646af, 0x89f0f582, 0x30cf76d3, 0xe409c5fe, 0x4d84a3a4,
-	0x99421089, 0x1e9e6f10, 0xca58dc3d, 0x63d5ba67, 0xb713094a,
-	0x6c6d4555, 0xb8abf678, 0x11269022, 0xc5e0230f, 0x423c5c96,
-	0x96faefbb, 0x3f7789e1, 0xebb13acc, 0x5d4da2f2, 0x898b11df,
-	0x20067785, 0xf4c0c4a8, 0x731cbb31, 0xa7da081c, 0x0e576e46,
-	0xda91dd6b, 0x01ef9174, 0xd5292259, 0x7ca44403, 0xa862f72e,
-	0x2fbe88b7, 0xfb783b9a, 0x52f55dc0, 0x8633eeed, 0x208a5b62,
-	0xf44ce84f, 0x5dc18e15, 0x89073d38, 0x0edb42a1, 0xda1df18c,
-	0x739097d6, 0xa75624fb, 0x7c2868e4, 0xa8eedbc9, 0x0163bd93,
-	0xd5a50ebe, 0x52797127, 0x86bfc20a, 0x2f32a450, 0xfbf4177d,
-	0x4d088f43, 0x99ce3c6e, 0x30435a34, 0xe485e919, 0x63599680,
-	0xb79f25ad, 0x1e1243f7, 0xcad4f0da, 0x11aabcc5, 0xc56c0fe8,
-	0x6ce169b2, 0xb827da9f, 0x3ffba506, 0xeb3d162b, 0x42b07071,
-	0x9676c35c, 0x2f49400d, 0xfb8ff320, 0x5202957a, 0x86c42657,
-	0x011859ce, 0xd5deeae3, 0x7c538cb9, 0xa8953f94, 0x73eb738b,
-	0xa72dc0a6, 0x0ea0a6fc, 0xda6615d1, 0x5dba6a48, 0x897cd965,
-	0x20f1bf3f, 0xf4370c12, 0x42cb942c, 0x960d2701, 0x3f80415b,
-	0xeb46f276, 0x6c9a8def, 0xb85c3ec2, 0x11d15898, 0xc517ebb5,
-	0x1e69a7aa, 0xcaaf1487, 0x632272dd, 0xb7e4c1f0, 0x3038be69,
-	0xe4fe0d44, 0x4d736b1e, 0x99b5d833,
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/delta_selector.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/delta_selector.go
deleted file mode 100644
index 1741fbd22..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/delta_selector.go
+++ /dev/null
@@ -1,369 +0,0 @@
-package packfile
-
-import (
-	"sort"
-	"sync"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-const (
-	// deltas based on deltas, how many steps we can do.
-	// 50 is the default value used in JGit
-	maxDepth = int64(50)
-)
-
-// applyDelta is the set of object types that we should apply deltas
-var applyDelta = map[plumbing.ObjectType]bool{
-	plumbing.BlobObject: true,
-	plumbing.TreeObject: true,
-}
-
-type deltaSelector struct {
-	storer storer.EncodedObjectStorer
-}
-
-func newDeltaSelector(s storer.EncodedObjectStorer) *deltaSelector {
-	return &deltaSelector{s}
-}
-
-// ObjectsToPack creates a list of ObjectToPack from the hashes
-// provided, creating deltas if it's suitable, using an specific
-// internal logic.  `packWindow` specifies the size of the sliding
-// window used to compare objects for delta compression; 0 turns off
-// delta compression entirely.
-func (dw *deltaSelector) ObjectsToPack(
-	hashes []plumbing.Hash,
-	packWindow uint,
-) ([]*ObjectToPack, error) {
-	otp, err := dw.objectsToPack(hashes, packWindow)
-	if err != nil {
-		return nil, err
-	}
-
-	if packWindow == 0 {
-		return otp, nil
-	}
-
-	dw.sort(otp)
-
-	var objectGroups [][]*ObjectToPack
-	var prev *ObjectToPack
-	i := -1
-	for _, obj := range otp {
-		if prev == nil || prev.Type() != obj.Type() {
-			objectGroups = append(objectGroups, []*ObjectToPack{obj})
-			i++
-			prev = obj
-		} else {
-			objectGroups[i] = append(objectGroups[i], obj)
-		}
-	}
-
-	var wg sync.WaitGroup
-	var once sync.Once
-	for _, objs := range objectGroups {
-		objs := objs
-		wg.Add(1)
-		go func() {
-			if walkErr := dw.walk(objs, packWindow); walkErr != nil {
-				once.Do(func() {
-					err = walkErr
-				})
-			}
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	if err != nil {
-		return nil, err
-	}
-
-	return otp, nil
-}
-
-func (dw *deltaSelector) objectsToPack(
-	hashes []plumbing.Hash,
-	packWindow uint,
-) ([]*ObjectToPack, error) {
-	var objectsToPack []*ObjectToPack
-	for _, h := range hashes {
-		var o plumbing.EncodedObject
-		var err error
-		if packWindow == 0 {
-			o, err = dw.encodedObject(h)
-		} else {
-			o, err = dw.encodedDeltaObject(h)
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		otp := newObjectToPack(o)
-		if _, ok := o.(plumbing.DeltaObject); ok {
-			otp.CleanOriginal()
-		}
-
-		objectsToPack = append(objectsToPack, otp)
-	}
-
-	if packWindow == 0 {
-		return objectsToPack, nil
-	}
-
-	if err := dw.fixAndBreakChains(objectsToPack); err != nil {
-		return nil, err
-	}
-
-	return objectsToPack, nil
-}
-
-func (dw *deltaSelector) encodedDeltaObject(h plumbing.Hash) (plumbing.EncodedObject, error) {
-	edos, ok := dw.storer.(storer.DeltaObjectStorer)
-	if !ok {
-		return dw.encodedObject(h)
-	}
-
-	return edos.DeltaObject(plumbing.AnyObject, h)
-}
-
-func (dw *deltaSelector) encodedObject(h plumbing.Hash) (plumbing.EncodedObject, error) {
-	return dw.storer.EncodedObject(plumbing.AnyObject, h)
-}
-
-func (dw *deltaSelector) fixAndBreakChains(objectsToPack []*ObjectToPack) error {
-	m := make(map[plumbing.Hash]*ObjectToPack, len(objectsToPack))
-	for _, otp := range objectsToPack {
-		m[otp.Hash()] = otp
-	}
-
-	for _, otp := range objectsToPack {
-		if err := dw.fixAndBreakChainsOne(m, otp); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (dw *deltaSelector) fixAndBreakChainsOne(objectsToPack map[plumbing.Hash]*ObjectToPack, otp *ObjectToPack) error {
-	if !otp.Object.Type().IsDelta() {
-		return nil
-	}
-
-	// Initial ObjectToPack instances might have a delta assigned to Object
-	// but no actual base initially. Once Base is assigned to a delta, it means
-	// we already fixed it.
-	if otp.Base != nil {
-		return nil
-	}
-
-	do, ok := otp.Object.(plumbing.DeltaObject)
-	if !ok {
-		// if this is not a DeltaObject, then we cannot retrieve its base,
-		// so we have to break the delta chain here.
-		return dw.undeltify(otp)
-	}
-
-	base, ok := objectsToPack[do.BaseHash()]
-	if !ok {
-		// The base of the delta is not in our list of objects to pack, so
-		// we break the chain.
-		return dw.undeltify(otp)
-	}
-
-	if err := dw.fixAndBreakChainsOne(objectsToPack, base); err != nil {
-		return err
-	}
-
-	otp.SetDelta(base, otp.Object)
-	return nil
-}
-
-func (dw *deltaSelector) restoreOriginal(otp *ObjectToPack) error {
-	if otp.Original != nil {
-		return nil
-	}
-
-	if !otp.Object.Type().IsDelta() {
-		return nil
-	}
-
-	obj, err := dw.encodedObject(otp.Hash())
-	if err != nil {
-		return err
-	}
-
-	otp.SetOriginal(obj)
-
-	return nil
-}
-
-// undeltify undeltifies an *ObjectToPack by retrieving the original object from
-// the storer and resetting it.
-func (dw *deltaSelector) undeltify(otp *ObjectToPack) error {
-	if err := dw.restoreOriginal(otp); err != nil {
-		return err
-	}
-
-	otp.Object = otp.Original
-	otp.Depth = 0
-	return nil
-}
-
-func (dw *deltaSelector) sort(objectsToPack []*ObjectToPack) {
-	sort.Sort(byTypeAndSize(objectsToPack))
-}
-
-func (dw *deltaSelector) walk(
-	objectsToPack []*ObjectToPack,
-	packWindow uint,
-) error {
-	indexMap := make(map[plumbing.Hash]*deltaIndex)
-	for i := 0; i < len(objectsToPack); i++ {
-		// Clean up the index map and reconstructed delta objects for anything
-		// outside our pack window, to save memory.
-		if i > int(packWindow) {
-			obj := objectsToPack[i-int(packWindow)]
-
-			delete(indexMap, obj.Hash())
-
-			if obj.IsDelta() {
-				obj.SaveOriginalMetadata()
-				obj.CleanOriginal()
-			}
-		}
-
-		target := objectsToPack[i]
-
-		// If we already have a delta, we don't try to find a new one for this
-		// object. This happens when a delta is set to be reused from an existing
-		// packfile.
-		if target.IsDelta() {
-			continue
-		}
-
-		// We only want to create deltas from specific types.
-		if !applyDelta[target.Type()] {
-			continue
-		}
-
-		for j := i - 1; j >= 0 && i-j < int(packWindow); j-- {
-			base := objectsToPack[j]
-			// Objects must use only the same type as their delta base.
-			// Since objectsToPack is sorted by type and size, once we find
-			// a different type, we know we won't find more of them.
-			if base.Type() != target.Type() {
-				break
-			}
-
-			if err := dw.tryToDeltify(indexMap, base, target); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (dw *deltaSelector) tryToDeltify(indexMap map[plumbing.Hash]*deltaIndex, base, target *ObjectToPack) error {
-	// Original object might not be present if we're reusing a delta, so we
-	// ensure it is restored.
-	if err := dw.restoreOriginal(target); err != nil {
-		return err
-	}
-
-	if err := dw.restoreOriginal(base); err != nil {
-		return err
-	}
-
-	// If the sizes are radically different, this is a bad pairing.
-	if target.Size() < base.Size()>>4 {
-		return nil
-	}
-
-	msz := dw.deltaSizeLimit(
-		target.Object.Size(),
-		base.Depth,
-		target.Depth,
-		target.IsDelta(),
-	)
-
-	// Nearly impossible to fit useful delta.
-	if msz <= 8 {
-		return nil
-	}
-
-	// If we have to insert a lot to make this work, find another.
-	if base.Size()-target.Size() > msz {
-		return nil
-	}
-
-	if _, ok := indexMap[base.Hash()]; !ok {
-		indexMap[base.Hash()] = new(deltaIndex)
-	}
-
-	// Now we can generate the delta using originals
-	delta, err := getDelta(indexMap[base.Hash()], base.Original, target.Original)
-	if err != nil {
-		return err
-	}
-
-	// if delta better than target
-	if delta.Size() < msz {
-		target.SetDelta(base, delta)
-	}
-
-	return nil
-}
-
-func (dw *deltaSelector) deltaSizeLimit(targetSize int64, baseDepth int,
-	targetDepth int, targetDelta bool) int64 {
-	if !targetDelta {
-		// Any delta should be no more than 50% of the original size
-		// (for text files deflate of whole form should shrink 50%).
-		n := targetSize >> 1
-
-		// Evenly distribute delta size limits over allowed depth.
-		// If src is non-delta (depth = 0), delta <= 50% of original.
-		// If src is almost at limit (9/10), delta <= 10% of original.
-		return n * (maxDepth - int64(baseDepth)) / maxDepth
-	}
-
-	// With a delta base chosen any new delta must be "better".
-	// Retain the distribution described above.
-	d := int64(targetDepth)
-	n := targetSize
-
-	// If target depth is bigger than maxDepth, this delta is not suitable to be used.
-	if d >= maxDepth {
-		return 0
-	}
-
-	// If src is whole (depth=0) and base is near limit (depth=9/10)
-	// any delta using src can be 10x larger and still be better.
-	//
-	// If src is near limit (depth=9/10) and base is whole (depth=0)
-	// a new delta dependent on src must be 1/10th the size.
-	return n * (maxDepth - int64(baseDepth)) / (maxDepth - d)
-}
-
-type byTypeAndSize []*ObjectToPack
-
-func (a byTypeAndSize) Len() int { return len(a) }
-
-func (a byTypeAndSize) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-
-func (a byTypeAndSize) Less(i, j int) bool {
-	if a[i].Type() < a[j].Type() {
-		return false
-	}
-
-	if a[i].Type() > a[j].Type() {
-		return true
-	}
-
-	return a[i].Size() > a[j].Size()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/diff_delta.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/diff_delta.go
deleted file mode 100644
index bbb36cf26..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/diff_delta.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package packfile
-
-import (
-	"bytes"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-// See https://github.com/jelmer/dulwich/blob/master/dulwich/pack.py and
-// https://github.com/tarruda/node-git-core/blob/master/src/js/delta.js
-// for more info
-
-const (
-	// Standard chunk size used to generate fingerprints
-	s = 16
-
-	// https://github.com/git/git/blob/f7466e94375b3be27f229c78873f0acf8301c0a5/diff-delta.c#L428
-	// Max size of a copy operation (64KB).
-	maxCopySize = 64 * 1024
-
-	// Min size of a copy operation.
-	minCopySize = 4
-)
-
-// GetDelta returns an EncodedObject of type OFSDeltaObject. Base and Target object,
-// will be loaded into memory to be able to create the delta object.
-// To generate target again, you will need the obtained object and "base" one.
-// Error will be returned if base or target object cannot be read.
-func GetDelta(base, target plumbing.EncodedObject) (plumbing.EncodedObject, error) {
-	return getDelta(new(deltaIndex), base, target)
-}
-
-func getDelta(index *deltaIndex, base, target plumbing.EncodedObject) (o plumbing.EncodedObject, err error) {
-	br, err := base.Reader()
-	if err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(br, &err)
-
-	tr, err := target.Reader()
-	if err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(tr, &err)
-
-	bb := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(bb)
-
-	_, err = bb.ReadFrom(br)
-	if err != nil {
-		return nil, err
-	}
-
-	tb := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(tb)
-
-	_, err = tb.ReadFrom(tr)
-	if err != nil {
-		return nil, err
-	}
-
-	db := diffDelta(index, bb.Bytes(), tb.Bytes())
-	delta := &plumbing.MemoryObject{}
-	_, err = delta.Write(db)
-	if err != nil {
-		return nil, err
-	}
-
-	delta.SetSize(int64(len(db)))
-	delta.SetType(plumbing.OFSDeltaObject)
-
-	return delta, nil
-}
-
-// DiffDelta returns the delta that transforms src into tgt.
-func DiffDelta(src, tgt []byte) []byte {
-	return diffDelta(new(deltaIndex), src, tgt)
-}
-
-func diffDelta(index *deltaIndex, src []byte, tgt []byte) []byte {
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-	buf.Write(deltaEncodeSize(len(src)))
-	buf.Write(deltaEncodeSize(len(tgt)))
-
-	if len(index.entries) == 0 {
-		index.init(src)
-	}
-
-	ibuf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(ibuf)
-	for i := 0; i < len(tgt); i++ {
-		offset, l := index.findMatch(src, tgt, i)
-
-		if l == 0 {
-			// couldn't find a match, just write the current byte and continue
-			ibuf.WriteByte(tgt[i])
-		} else if l < 0 {
-			// src is less than blksz, copy the rest of the target to avoid
-			// calls to findMatch
-			for ; i < len(tgt); i++ {
-				ibuf.WriteByte(tgt[i])
-			}
-		} else if l < s {
-			// remaining target is less than blksz, copy what's left of it
-			// and avoid calls to findMatch
-			for j := i; j < i+l; j++ {
-				ibuf.WriteByte(tgt[j])
-			}
-			i += l - 1
-		} else {
-			encodeInsertOperation(ibuf, buf)
-
-			rl := l
-			aOffset := offset
-			for rl > 0 {
-				if rl < maxCopySize {
-					buf.Write(encodeCopyOperation(aOffset, rl))
-					break
-				}
-
-				buf.Write(encodeCopyOperation(aOffset, maxCopySize))
-				rl -= maxCopySize
-				aOffset += maxCopySize
-			}
-
-			i += l - 1
-		}
-	}
-
-	encodeInsertOperation(ibuf, buf)
-
-	// buf.Bytes() is only valid until the next modifying operation on the buffer. Copy it.
-	return append([]byte{}, buf.Bytes()...)
-}
-
-func encodeInsertOperation(ibuf, buf *bytes.Buffer) {
-	if ibuf.Len() == 0 {
-		return
-	}
-
-	b := ibuf.Bytes()
-	s := ibuf.Len()
-	o := 0
-	for {
-		if s <= 127 {
-			break
-		}
-		buf.WriteByte(byte(127))
-		buf.Write(b[o : o+127])
-		s -= 127
-		o += 127
-	}
-	buf.WriteByte(byte(s))
-	buf.Write(b[o : o+s])
-
-	ibuf.Reset()
-}
-
-func deltaEncodeSize(size int) []byte {
-	var ret []byte
-	c := size & 0x7f
-	size >>= 7
-	for {
-		if size == 0 {
-			break
-		}
-
-		ret = append(ret, byte(c|0x80))
-		c = size & 0x7f
-		size >>= 7
-	}
-	ret = append(ret, byte(c))
-
-	return ret
-}
-
-func encodeCopyOperation(offset, length int) []byte {
-	code := 0x80
-	var opcodes []byte
-
-	var i uint
-	for i = 0; i < 4; i++ {
-		f := 0xff << (i * 8)
-		if offset&f != 0 {
-			opcodes = append(opcodes, byte(offset&f>>(i*8)))
-			code |= 0x01 << i
-		}
-	}
-
-	for i = 0; i < 3; i++ {
-		f := 0xff << (i * 8)
-		if length&f != 0 {
-			opcodes = append(opcodes, byte(length&f>>(i*8)))
-			code |= 0x10 << i
-		}
-	}
-
-	return append([]byte{byte(code)}, opcodes...)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/doc.go
deleted file mode 100644
index 2882a7f37..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/doc.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Package packfile implements encoding and decoding of packfile format.
-//
-//  == pack-*.pack files have the following format:
-//
-//    - A header appears at the beginning and consists of the following:
-//
-//      4-byte signature:
-//          The signature is: {'P', 'A', 'C', 'K'}
-//
-//      4-byte version number (network byte order):
-//          GIT currently accepts version number 2 or 3 but
-//          generates version 2 only.
-//
-//      4-byte number of objects contained in the pack (network byte order)
-//
-//      Observation: we cannot have more than 4G versions ;-) and
-//      more than 4G objects in a pack.
-//
-//    - The header is followed by number of object entries, each of
-//      which looks like this:
-//
-//      (undeltified representation)
-//      n-byte type and length (3-bit type, (n-1)*7+4-bit length)
-//      compressed data
-//
-//      (deltified representation)
-//      n-byte type and length (3-bit type, (n-1)*7+4-bit length)
-//      20-byte base object name
-//      compressed delta data
-//
-//      Observation: length of each object is encoded in a variable
-//      length format and is not constrained to 32-bit or anything.
-//
-//   - The trailer records 20-byte SHA1 checksum of all of the above.
-//
-//
-// Source:
-// https://www.kernel.org/pub/software/scm/git/docs/v1.7.5/technical/pack-protocol.txt
-package packfile
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/encoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/encoder.go
deleted file mode 100644
index 1d228b5c0..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/encoder.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package packfile
-
-import (
-	"compress/zlib"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// Encoder gets the data from the storage and write it into the writer in PACK
-// format
-type Encoder struct {
-	selector *deltaSelector
-	w        *offsetWriter
-	zw       *zlib.Writer
-	hasher   plumbing.Hasher
-
-	useRefDeltas bool
-}
-
-// NewEncoder creates a new packfile encoder using a specific Writer and
-// EncodedObjectStorer. By default deltas used to generate the packfile will be
-// OFSDeltaObject. To use Reference deltas, set useRefDeltas to true.
-func NewEncoder(w io.Writer, s storer.EncodedObjectStorer, useRefDeltas bool) *Encoder {
-	h := plumbing.Hasher{
-		Hash: hash.New(hash.CryptoType),
-	}
-	mw := io.MultiWriter(w, h)
-	ow := newOffsetWriter(mw)
-	zw := zlib.NewWriter(mw)
-	return &Encoder{
-		selector:     newDeltaSelector(s),
-		w:            ow,
-		zw:           zw,
-		hasher:       h,
-		useRefDeltas: useRefDeltas,
-	}
-}
-
-// Encode creates a packfile containing all the objects referenced in
-// hashes and writes it to the writer in the Encoder.  `packWindow`
-// specifies the size of the sliding window used to compare objects
-// for delta compression; 0 turns off delta compression entirely.
-func (e *Encoder) Encode(
-	hashes []plumbing.Hash,
-	packWindow uint,
-) (plumbing.Hash, error) {
-	objects, err := e.selector.ObjectsToPack(hashes, packWindow)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return e.encode(objects)
-}
-
-func (e *Encoder) encode(objects []*ObjectToPack) (plumbing.Hash, error) {
-	if err := e.head(len(objects)); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	for _, o := range objects {
-		if err := e.entry(o); err != nil {
-			return plumbing.ZeroHash, err
-		}
-	}
-
-	return e.footer()
-}
-
-func (e *Encoder) head(numEntries int) error {
-	return binary.Write(
-		e.w,
-		signature,
-		int32(VersionSupported),
-		int32(numEntries),
-	)
-}
-
-func (e *Encoder) entry(o *ObjectToPack) (err error) {
-	if o.WantWrite() {
-		// A cycle exists in this delta chain. This should only occur if a
-		// selected object representation disappeared during writing
-		// (for example due to a concurrent repack) and a different base
-		// was chosen, forcing a cycle. Select something other than a
-		// delta, and write this object.
-		e.selector.restoreOriginal(o)
-		o.BackToOriginal()
-	}
-
-	if o.IsWritten() {
-		return nil
-	}
-
-	o.MarkWantWrite()
-
-	if err := e.writeBaseIfDelta(o); err != nil {
-		return err
-	}
-
-	// We need to check if we already write that object due a cyclic delta chain
-	if o.IsWritten() {
-		return nil
-	}
-
-	o.Offset = e.w.Offset()
-
-	if o.IsDelta() {
-		if err := e.writeDeltaHeader(o); err != nil {
-			return err
-		}
-	} else {
-		if err := e.entryHead(o.Type(), o.Size()); err != nil {
-			return err
-		}
-	}
-
-	e.zw.Reset(e.w)
-
-	defer ioutil.CheckClose(e.zw, &err)
-
-	or, err := o.Object.Reader()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(or, &err)
-
-	_, err = io.Copy(e.zw, or)
-	return err
-}
-
-func (e *Encoder) writeBaseIfDelta(o *ObjectToPack) error {
-	if o.IsDelta() && !o.Base.IsWritten() {
-		// We must write base first
-		return e.entry(o.Base)
-	}
-
-	return nil
-}
-
-func (e *Encoder) writeDeltaHeader(o *ObjectToPack) error {
-	// Write offset deltas by default
-	t := plumbing.OFSDeltaObject
-	if e.useRefDeltas {
-		t = plumbing.REFDeltaObject
-	}
-
-	if err := e.entryHead(t, o.Object.Size()); err != nil {
-		return err
-	}
-
-	if e.useRefDeltas {
-		return e.writeRefDeltaHeader(o.Base.Hash())
-	} else {
-		return e.writeOfsDeltaHeader(o)
-	}
-}
-
-func (e *Encoder) writeRefDeltaHeader(base plumbing.Hash) error {
-	return binary.Write(e.w, base)
-}
-
-func (e *Encoder) writeOfsDeltaHeader(o *ObjectToPack) error {
-	// for OFS_DELTA, offset of the base is interpreted as negative offset
-	// relative to the type-byte of the header of the ofs-delta entry.
-	relativeOffset := o.Offset - o.Base.Offset
-	if relativeOffset <= 0 {
-		return fmt.Errorf("bad offset for OFS_DELTA entry: %d", relativeOffset)
-	}
-
-	return binary.WriteVariableWidthInt(e.w, relativeOffset)
-}
-
-func (e *Encoder) entryHead(typeNum plumbing.ObjectType, size int64) error {
-	t := int64(typeNum)
-	header := []byte{}
-	c := (t << firstLengthBits) | (size & maskFirstLength)
-	size >>= firstLengthBits
-	for {
-		if size == 0 {
-			break
-		}
-		header = append(header, byte(c|maskContinue))
-		c = size & int64(maskLength)
-		size >>= lengthBits
-	}
-
-	header = append(header, byte(c))
-	_, err := e.w.Write(header)
-
-	return err
-}
-
-func (e *Encoder) footer() (plumbing.Hash, error) {
-	h := e.hasher.Sum()
-	return h, binary.Write(e.w, h)
-}
-
-type offsetWriter struct {
-	w      io.Writer
-	offset int64
-}
-
-func newOffsetWriter(w io.Writer) *offsetWriter {
-	return &offsetWriter{w: w}
-}
-
-func (ow *offsetWriter) Write(p []byte) (n int, err error) {
-	n, err = ow.w.Write(p)
-	ow.offset += int64(n)
-	return n, err
-}
-
-func (ow *offsetWriter) Offset() int64 {
-	return ow.offset
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/error.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/error.go
deleted file mode 100644
index c0b916331..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/error.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package packfile
-
-import "fmt"
-
-// Error specifies errors returned during packfile parsing.
-type Error struct {
-	reason, details string
-}
-
-// NewError returns a new error.
-func NewError(reason string) *Error {
-	return &Error{reason: reason}
-}
-
-// Error returns a text representation of the error.
-func (e *Error) Error() string {
-	if e.details == "" {
-		return e.reason
-	}
-
-	return fmt.Sprintf("%s: %s", e.reason, e.details)
-}
-
-// AddDetails adds details to an error, with additional text.
-func (e *Error) AddDetails(format string, args ...interface{}) *Error {
-	return &Error{
-		reason:  e.reason,
-		details: fmt.Sprintf(format, args...),
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/fsobject.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/fsobject.go
deleted file mode 100644
index 64db4aa5c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/fsobject.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package packfile
-
-import (
-	"io"
-
-	billy "github.com/go-git/go-billy/v5"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/idxfile"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// FSObject is an object from the packfile on the filesystem.
-type FSObject struct {
-	hash                 plumbing.Hash
-	offset               int64
-	size                 int64
-	typ                  plumbing.ObjectType
-	index                idxfile.Index
-	fs                   billy.Filesystem
-	path                 string
-	cache                cache.Object
-	largeObjectThreshold int64
-}
-
-// NewFSObject creates a new filesystem object.
-func NewFSObject(
-	hash plumbing.Hash,
-	finalType plumbing.ObjectType,
-	offset int64,
-	contentSize int64,
-	index idxfile.Index,
-	fs billy.Filesystem,
-	path string,
-	cache cache.Object,
-	largeObjectThreshold int64,
-) *FSObject {
-	return &FSObject{
-		hash:                 hash,
-		offset:               offset,
-		size:                 contentSize,
-		typ:                  finalType,
-		index:                index,
-		fs:                   fs,
-		path:                 path,
-		cache:                cache,
-		largeObjectThreshold: largeObjectThreshold,
-	}
-}
-
-// Reader implements the plumbing.EncodedObject interface.
-func (o *FSObject) Reader() (io.ReadCloser, error) {
-	obj, ok := o.cache.Get(o.hash)
-	if ok && obj != o {
-		reader, err := obj.Reader()
-		if err != nil {
-			return nil, err
-		}
-
-		return reader, nil
-	}
-
-	f, err := o.fs.Open(o.path)
-	if err != nil {
-		return nil, err
-	}
-
-	p := NewPackfileWithCache(o.index, nil, f, o.cache, o.largeObjectThreshold)
-	if o.largeObjectThreshold > 0 && o.size > o.largeObjectThreshold {
-		// We have a big object
-		h, err := p.objectHeaderAtOffset(o.offset)
-		if err != nil {
-			return nil, err
-		}
-
-		r, err := p.getReaderDirect(h)
-		if err != nil {
-			_ = f.Close()
-			return nil, err
-		}
-		return ioutil.NewReadCloserWithCloser(r, f.Close), nil
-	}
-	r, err := p.getObjectContent(o.offset)
-	if err != nil {
-		_ = f.Close()
-		return nil, err
-	}
-
-	if err := f.Close(); err != nil {
-		return nil, err
-	}
-
-	return r, nil
-}
-
-// SetSize implements the plumbing.EncodedObject interface. This method
-// is a noop.
-func (o *FSObject) SetSize(int64) {}
-
-// SetType implements the plumbing.EncodedObject interface. This method is
-// a noop.
-func (o *FSObject) SetType(plumbing.ObjectType) {}
-
-// Hash implements the plumbing.EncodedObject interface.
-func (o *FSObject) Hash() plumbing.Hash { return o.hash }
-
-// Size implements the plumbing.EncodedObject interface.
-func (o *FSObject) Size() int64 { return o.size }
-
-// Type implements the plumbing.EncodedObject interface.
-func (o *FSObject) Type() plumbing.ObjectType {
-	return o.typ
-}
-
-// Writer implements the plumbing.EncodedObject interface. This method always
-// returns a nil writer.
-func (o *FSObject) Writer() (io.WriteCloser, error) {
-	return nil, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/object_pack.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/object_pack.go
deleted file mode 100644
index 484946dc3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/object_pack.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package packfile
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-// ObjectToPack is a representation of an object that is going to be into a
-// pack file.
-type ObjectToPack struct {
-	// The main object to pack, it could be any object, including deltas
-	Object plumbing.EncodedObject
-	// Base is the object that a delta is based on (it could be also another delta).
-	// If the main object is not a delta, Base will be null
-	Base *ObjectToPack
-	// Original is the object that we can generate applying the delta to
-	// Base, or the same object as Object in the case of a non-delta
-	// object.
-	Original plumbing.EncodedObject
-	// Depth is the amount of deltas needed to resolve to obtain Original
-	// (delta based on delta based on ...)
-	Depth int
-
-	// offset in pack when object has been already written, or 0 if it
-	// has not been written yet
-	Offset int64
-
-	// Information from the original object
-	resolvedOriginal bool
-	originalType     plumbing.ObjectType
-	originalSize     int64
-	originalHash     plumbing.Hash
-}
-
-// newObjectToPack creates a correct ObjectToPack based on a non-delta object
-func newObjectToPack(o plumbing.EncodedObject) *ObjectToPack {
-	return &ObjectToPack{
-		Object:   o,
-		Original: o,
-	}
-}
-
-// newDeltaObjectToPack creates a correct ObjectToPack for a delta object, based on
-// his base (could be another delta), the delta target (in this case called original),
-// and the delta Object itself
-func newDeltaObjectToPack(base *ObjectToPack, original, delta plumbing.EncodedObject) *ObjectToPack {
-	return &ObjectToPack{
-		Object:   delta,
-		Base:     base,
-		Original: original,
-		Depth:    base.Depth + 1,
-	}
-}
-
-// BackToOriginal converts that ObjectToPack to a non-deltified object if it was one
-func (o *ObjectToPack) BackToOriginal() {
-	if o.IsDelta() && o.Original != nil {
-		o.Object = o.Original
-		o.Base = nil
-		o.Depth = 0
-	}
-}
-
-// IsWritten returns if that ObjectToPack was
-// already written into the packfile or not
-func (o *ObjectToPack) IsWritten() bool {
-	return o.Offset > 1
-}
-
-// MarkWantWrite marks this ObjectToPack as WantWrite
-// to avoid delta chain loops
-func (o *ObjectToPack) MarkWantWrite() {
-	o.Offset = 1
-}
-
-// WantWrite checks if this ObjectToPack was marked as WantWrite before
-func (o *ObjectToPack) WantWrite() bool {
-	return o.Offset == 1
-}
-
-// SetOriginal sets both Original and saves size, type and hash. If object
-// is nil Original is set but previous resolved values are kept
-func (o *ObjectToPack) SetOriginal(obj plumbing.EncodedObject) {
-	o.Original = obj
-	o.SaveOriginalMetadata()
-}
-
-// SaveOriginalMetadata saves size, type and hash of Original object
-func (o *ObjectToPack) SaveOriginalMetadata() {
-	if o.Original != nil {
-		o.originalSize = o.Original.Size()
-		o.originalType = o.Original.Type()
-		o.originalHash = o.Original.Hash()
-		o.resolvedOriginal = true
-	}
-}
-
-// CleanOriginal sets Original to nil
-func (o *ObjectToPack) CleanOriginal() {
-	o.Original = nil
-}
-
-func (o *ObjectToPack) Type() plumbing.ObjectType {
-	if o.Original != nil {
-		return o.Original.Type()
-	}
-
-	if o.resolvedOriginal {
-		return o.originalType
-	}
-
-	if o.Base != nil {
-		return o.Base.Type()
-	}
-
-	if o.Object != nil {
-		return o.Object.Type()
-	}
-
-	panic("cannot get type")
-}
-
-func (o *ObjectToPack) Hash() plumbing.Hash {
-	if o.Original != nil {
-		return o.Original.Hash()
-	}
-
-	if o.resolvedOriginal {
-		return o.originalHash
-	}
-
-	do, ok := o.Object.(plumbing.DeltaObject)
-	if ok {
-		return do.ActualHash()
-	}
-
-	panic("cannot get hash")
-}
-
-func (o *ObjectToPack) Size() int64 {
-	if o.Original != nil {
-		return o.Original.Size()
-	}
-
-	if o.resolvedOriginal {
-		return o.originalSize
-	}
-
-	do, ok := o.Object.(plumbing.DeltaObject)
-	if ok {
-		return do.ActualSize()
-	}
-
-	panic("cannot get ObjectToPack size")
-}
-
-func (o *ObjectToPack) IsDelta() bool {
-	return o.Base != nil
-}
-
-func (o *ObjectToPack) SetDelta(base *ObjectToPack, delta plumbing.EncodedObject) {
-	o.Object = delta
-	o.Base = base
-	o.Depth = base.Depth + 1
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/packfile.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/packfile.go
deleted file mode 100644
index d7d622117..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/packfile.go
+++ /dev/null
@@ -1,641 +0,0 @@
-package packfile
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-
-	billy "github.com/go-git/go-billy/v5"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/idxfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-var (
-	// ErrInvalidObject is returned by Decode when an invalid object is
-	// found in the packfile.
-	ErrInvalidObject = NewError("invalid git object")
-	// ErrZLib is returned by Decode when there was an error unzipping
-	// the packfile contents.
-	ErrZLib = NewError("zlib reading error")
-)
-
-// When reading small objects from packfile it is beneficial to do so at
-// once to exploit the buffered I/O. In many cases the objects are so small
-// that they were already loaded to memory when the object header was
-// loaded from the packfile. Wrapping in FSObject would cause this buffered
-// data to be thrown away and then re-read later, with the additional
-// seeking causing reloads from disk. Objects smaller than this threshold
-// are now always read into memory and stored in cache instead of being
-// wrapped in FSObject.
-const smallObjectThreshold = 16 * 1024
-
-// Packfile allows retrieving information from inside a packfile.
-type Packfile struct {
-	idxfile.Index
-	fs                   billy.Filesystem
-	file                 billy.File
-	s                    *Scanner
-	deltaBaseCache       cache.Object
-	offsetToType         map[int64]plumbing.ObjectType
-	largeObjectThreshold int64
-}
-
-// NewPackfileWithCache creates a new Packfile with the given object cache.
-// If the filesystem is provided, the packfile will return FSObjects, otherwise
-// it will return MemoryObjects.
-func NewPackfileWithCache(
-	index idxfile.Index,
-	fs billy.Filesystem,
-	file billy.File,
-	cache cache.Object,
-	largeObjectThreshold int64,
-) *Packfile {
-	s := NewScanner(file)
-	return &Packfile{
-		index,
-		fs,
-		file,
-		s,
-		cache,
-		make(map[int64]plumbing.ObjectType),
-		largeObjectThreshold,
-	}
-}
-
-// NewPackfile returns a packfile representation for the given packfile file
-// and packfile idx.
-// If the filesystem is provided, the packfile will return FSObjects, otherwise
-// it will return MemoryObjects.
-func NewPackfile(index idxfile.Index, fs billy.Filesystem, file billy.File, largeObjectThreshold int64) *Packfile {
-	return NewPackfileWithCache(index, fs, file, cache.NewObjectLRUDefault(), largeObjectThreshold)
-}
-
-// Get retrieves the encoded object in the packfile with the given hash.
-func (p *Packfile) Get(h plumbing.Hash) (plumbing.EncodedObject, error) {
-	offset, err := p.FindOffset(h)
-	if err != nil {
-		return nil, err
-	}
-
-	return p.objectAtOffset(offset, h)
-}
-
-// GetByOffset retrieves the encoded object from the packfile at the given
-// offset.
-func (p *Packfile) GetByOffset(o int64) (plumbing.EncodedObject, error) {
-	hash, err := p.FindHash(o)
-	if err != nil {
-		return nil, err
-	}
-
-	return p.objectAtOffset(o, hash)
-}
-
-// GetSizeByOffset retrieves the size of the encoded object from the
-// packfile with the given offset.
-func (p *Packfile) GetSizeByOffset(o int64) (size int64, err error) {
-	if _, err := p.s.SeekFromStart(o); err != nil {
-		if err == io.EOF || isInvalid(err) {
-			return 0, plumbing.ErrObjectNotFound
-		}
-
-		return 0, err
-	}
-
-	h, err := p.nextObjectHeader()
-	if err != nil {
-		return 0, err
-	}
-	return p.getObjectSize(h)
-}
-
-func (p *Packfile) objectHeaderAtOffset(offset int64) (*ObjectHeader, error) {
-	h, err := p.s.SeekObjectHeader(offset)
-	p.s.pendingObject = nil
-	return h, err
-}
-
-func (p *Packfile) nextObjectHeader() (*ObjectHeader, error) {
-	h, err := p.s.NextObjectHeader()
-	p.s.pendingObject = nil
-	return h, err
-}
-
-func (p *Packfile) getDeltaObjectSize(buf *bytes.Buffer) int64 {
-	delta := buf.Bytes()
-	_, delta = decodeLEB128(delta) // skip src size
-	sz, _ := decodeLEB128(delta)
-	return int64(sz)
-}
-
-func (p *Packfile) getObjectSize(h *ObjectHeader) (int64, error) {
-	switch h.Type {
-	case plumbing.CommitObject, plumbing.TreeObject, plumbing.BlobObject, plumbing.TagObject:
-		return h.Length, nil
-	case plumbing.REFDeltaObject, plumbing.OFSDeltaObject:
-		buf := sync.GetBytesBuffer()
-		defer sync.PutBytesBuffer(buf)
-
-		if _, _, err := p.s.NextObject(buf); err != nil {
-			return 0, err
-		}
-
-		return p.getDeltaObjectSize(buf), nil
-	default:
-		return 0, ErrInvalidObject.AddDetails("type %q", h.Type)
-	}
-}
-
-func (p *Packfile) getObjectType(h *ObjectHeader) (typ plumbing.ObjectType, err error) {
-	switch h.Type {
-	case plumbing.CommitObject, plumbing.TreeObject, plumbing.BlobObject, plumbing.TagObject:
-		return h.Type, nil
-	case plumbing.REFDeltaObject, plumbing.OFSDeltaObject:
-		var offset int64
-		if h.Type == plumbing.REFDeltaObject {
-			offset, err = p.FindOffset(h.Reference)
-			if err != nil {
-				return
-			}
-		} else {
-			offset = h.OffsetReference
-		}
-
-		if baseType, ok := p.offsetToType[offset]; ok {
-			typ = baseType
-		} else {
-			h, err = p.objectHeaderAtOffset(offset)
-			if err != nil {
-				return
-			}
-
-			typ, err = p.getObjectType(h)
-			if err != nil {
-				return
-			}
-		}
-	default:
-		err = ErrInvalidObject.AddDetails("type %q", h.Type)
-	}
-
-	p.offsetToType[h.Offset] = typ
-
-	return
-}
-
-func (p *Packfile) objectAtOffset(offset int64, hash plumbing.Hash) (plumbing.EncodedObject, error) {
-	if obj, ok := p.cacheGet(hash); ok {
-		return obj, nil
-	}
-
-	h, err := p.objectHeaderAtOffset(offset)
-	if err != nil {
-		if err == io.EOF || isInvalid(err) {
-			return nil, plumbing.ErrObjectNotFound
-		}
-		return nil, err
-	}
-
-	return p.getNextObject(h, hash)
-}
-
-func (p *Packfile) getNextObject(h *ObjectHeader, hash plumbing.Hash) (plumbing.EncodedObject, error) {
-	var err error
-
-	// If we have no filesystem, we will return a MemoryObject instead
-	// of an FSObject.
-	if p.fs == nil {
-		return p.getNextMemoryObject(h)
-	}
-
-	// If the object is small enough then read it completely into memory now since
-	// it is already read from disk into buffer anyway. For delta objects we want
-	// to perform the optimization too, but we have to be careful about applying
-	// small deltas on big objects.
-	var size int64
-	if h.Length <= smallObjectThreshold {
-		if h.Type != plumbing.OFSDeltaObject && h.Type != plumbing.REFDeltaObject {
-			return p.getNextMemoryObject(h)
-		}
-
-		// For delta objects we read the delta data and apply the small object
-		// optimization only if the expanded version of the object still meets
-		// the small object threshold condition.
-		buf := sync.GetBytesBuffer()
-		defer sync.PutBytesBuffer(buf)
-
-		if _, _, err := p.s.NextObject(buf); err != nil {
-			return nil, err
-		}
-
-		size = p.getDeltaObjectSize(buf)
-		if size <= smallObjectThreshold {
-			var obj = new(plumbing.MemoryObject)
-			obj.SetSize(size)
-			if h.Type == plumbing.REFDeltaObject {
-				err = p.fillREFDeltaObjectContentWithBuffer(obj, h.Reference, buf)
-			} else {
-				err = p.fillOFSDeltaObjectContentWithBuffer(obj, h.OffsetReference, buf)
-			}
-			return obj, err
-		}
-	} else {
-		size, err = p.getObjectSize(h)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	typ, err := p.getObjectType(h)
-	if err != nil {
-		return nil, err
-	}
-
-	p.offsetToType[h.Offset] = typ
-
-	return NewFSObject(
-		hash,
-		typ,
-		h.Offset,
-		size,
-		p.Index,
-		p.fs,
-		p.file.Name(),
-		p.deltaBaseCache,
-		p.largeObjectThreshold,
-	), nil
-}
-
-func (p *Packfile) getObjectContent(offset int64) (io.ReadCloser, error) {
-	h, err := p.objectHeaderAtOffset(offset)
-	if err != nil {
-		return nil, err
-	}
-
-	// getObjectContent is called from FSObject, so we have to explicitly
-	// get memory object here to avoid recursive cycle
-	obj, err := p.getNextMemoryObject(h)
-	if err != nil {
-		return nil, err
-	}
-
-	return obj.Reader()
-}
-
-func asyncReader(p *Packfile) (io.ReadCloser, error) {
-	reader := ioutil.NewReaderUsingReaderAt(p.file, p.s.r.offset)
-	zr, err := sync.GetZlibReader(reader)
-	if err != nil {
-		return nil, fmt.Errorf("zlib reset error: %s", err)
-	}
-
-	return ioutil.NewReadCloserWithCloser(zr.Reader, func() error {
-		sync.PutZlibReader(zr)
-		return nil
-	}), nil
-
-}
-
-func (p *Packfile) getReaderDirect(h *ObjectHeader) (io.ReadCloser, error) {
-	switch h.Type {
-	case plumbing.CommitObject, plumbing.TreeObject, plumbing.BlobObject, plumbing.TagObject:
-		return asyncReader(p)
-	case plumbing.REFDeltaObject:
-		deltaRc, err := asyncReader(p)
-		if err != nil {
-			return nil, err
-		}
-		r, err := p.readREFDeltaObjectContent(h, deltaRc)
-		if err != nil {
-			return nil, err
-		}
-		return r, nil
-	case plumbing.OFSDeltaObject:
-		deltaRc, err := asyncReader(p)
-		if err != nil {
-			return nil, err
-		}
-		r, err := p.readOFSDeltaObjectContent(h, deltaRc)
-		if err != nil {
-			return nil, err
-		}
-		return r, nil
-	default:
-		return nil, ErrInvalidObject.AddDetails("type %q", h.Type)
-	}
-}
-
-func (p *Packfile) getNextMemoryObject(h *ObjectHeader) (plumbing.EncodedObject, error) {
-	var obj = new(plumbing.MemoryObject)
-	obj.SetSize(h.Length)
-	obj.SetType(h.Type)
-
-	var err error
-	switch h.Type {
-	case plumbing.CommitObject, plumbing.TreeObject, plumbing.BlobObject, plumbing.TagObject:
-		err = p.fillRegularObjectContent(obj)
-	case plumbing.REFDeltaObject:
-		err = p.fillREFDeltaObjectContent(obj, h.Reference)
-	case plumbing.OFSDeltaObject:
-		err = p.fillOFSDeltaObjectContent(obj, h.OffsetReference)
-	default:
-		err = ErrInvalidObject.AddDetails("type %q", h.Type)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	p.offsetToType[h.Offset] = obj.Type()
-
-	return obj, nil
-}
-
-func (p *Packfile) fillRegularObjectContent(obj plumbing.EncodedObject) (err error) {
-	w, err := obj.Writer()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	_, _, err = p.s.NextObject(w)
-	p.cachePut(obj)
-
-	return err
-}
-
-func (p *Packfile) fillREFDeltaObjectContent(obj plumbing.EncodedObject, ref plumbing.Hash) error {
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-
-	_, _, err := p.s.NextObject(buf)
-	if err != nil {
-		return err
-	}
-
-	return p.fillREFDeltaObjectContentWithBuffer(obj, ref, buf)
-}
-
-func (p *Packfile) readREFDeltaObjectContent(h *ObjectHeader, deltaRC io.Reader) (io.ReadCloser, error) {
-	var err error
-
-	base, ok := p.cacheGet(h.Reference)
-	if !ok {
-		base, err = p.Get(h.Reference)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return ReaderFromDelta(base, deltaRC)
-}
-
-func (p *Packfile) fillREFDeltaObjectContentWithBuffer(obj plumbing.EncodedObject, ref plumbing.Hash, buf *bytes.Buffer) error {
-	var err error
-
-	base, ok := p.cacheGet(ref)
-	if !ok {
-		base, err = p.Get(ref)
-		if err != nil {
-			return err
-		}
-	}
-
-	obj.SetType(base.Type())
-	err = ApplyDelta(obj, base, buf.Bytes())
-	p.cachePut(obj)
-
-	return err
-}
-
-func (p *Packfile) fillOFSDeltaObjectContent(obj plumbing.EncodedObject, offset int64) error {
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-
-	_, _, err := p.s.NextObject(buf)
-	if err != nil {
-		return err
-	}
-
-	return p.fillOFSDeltaObjectContentWithBuffer(obj, offset, buf)
-}
-
-func (p *Packfile) readOFSDeltaObjectContent(h *ObjectHeader, deltaRC io.Reader) (io.ReadCloser, error) {
-	hash, err := p.FindHash(h.OffsetReference)
-	if err != nil {
-		return nil, err
-	}
-
-	base, err := p.objectAtOffset(h.OffsetReference, hash)
-	if err != nil {
-		return nil, err
-	}
-
-	return ReaderFromDelta(base, deltaRC)
-}
-
-func (p *Packfile) fillOFSDeltaObjectContentWithBuffer(obj plumbing.EncodedObject, offset int64, buf *bytes.Buffer) error {
-	hash, err := p.FindHash(offset)
-	if err != nil {
-		return err
-	}
-
-	base, err := p.objectAtOffset(offset, hash)
-	if err != nil {
-		return err
-	}
-
-	obj.SetType(base.Type())
-	err = ApplyDelta(obj, base, buf.Bytes())
-	p.cachePut(obj)
-
-	return err
-}
-
-func (p *Packfile) cacheGet(h plumbing.Hash) (plumbing.EncodedObject, bool) {
-	if p.deltaBaseCache == nil {
-		return nil, false
-	}
-
-	return p.deltaBaseCache.Get(h)
-}
-
-func (p *Packfile) cachePut(obj plumbing.EncodedObject) {
-	if p.deltaBaseCache == nil {
-		return
-	}
-
-	p.deltaBaseCache.Put(obj)
-}
-
-// GetAll returns an iterator with all encoded objects in the packfile.
-// The iterator returned is not thread-safe, it should be used in the same
-// thread as the Packfile instance.
-func (p *Packfile) GetAll() (storer.EncodedObjectIter, error) {
-	return p.GetByType(plumbing.AnyObject)
-}
-
-// GetByType returns all the objects of the given type.
-func (p *Packfile) GetByType(typ plumbing.ObjectType) (storer.EncodedObjectIter, error) {
-	switch typ {
-	case plumbing.AnyObject,
-		plumbing.BlobObject,
-		plumbing.TreeObject,
-		plumbing.CommitObject,
-		plumbing.TagObject:
-		entries, err := p.EntriesByOffset()
-		if err != nil {
-			return nil, err
-		}
-
-		return &objectIter{
-			// Easiest way to provide an object decoder is just to pass a Packfile
-			// instance. To not mess with the seeks, it's a new instance with a
-			// different scanner but the same cache and offset to hash map for
-			// reusing as much cache as possible.
-			p:    p,
-			iter: entries,
-			typ:  typ,
-		}, nil
-	default:
-		return nil, plumbing.ErrInvalidType
-	}
-}
-
-// ID returns the ID of the packfile, which is the checksum at the end of it.
-func (p *Packfile) ID() (plumbing.Hash, error) {
-	prev, err := p.file.Seek(-20, io.SeekEnd)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	var hash plumbing.Hash
-	if _, err := io.ReadFull(p.file, hash[:]); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if _, err := p.file.Seek(prev, io.SeekStart); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return hash, nil
-}
-
-// Scanner returns the packfile's Scanner
-func (p *Packfile) Scanner() *Scanner {
-	return p.s
-}
-
-// Close the packfile and its resources.
-func (p *Packfile) Close() error {
-	closer, ok := p.file.(io.Closer)
-	if !ok {
-		return nil
-	}
-
-	return closer.Close()
-}
-
-type objectIter struct {
-	p    *Packfile
-	typ  plumbing.ObjectType
-	iter idxfile.EntryIter
-}
-
-func (i *objectIter) Next() (plumbing.EncodedObject, error) {
-	for {
-		e, err := i.iter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if i.typ != plumbing.AnyObject {
-			if typ, ok := i.p.offsetToType[int64(e.Offset)]; ok {
-				if typ != i.typ {
-					continue
-				}
-			} else if obj, ok := i.p.cacheGet(e.Hash); ok {
-				if obj.Type() != i.typ {
-					i.p.offsetToType[int64(e.Offset)] = obj.Type()
-					continue
-				}
-				return obj, nil
-			} else {
-				h, err := i.p.objectHeaderAtOffset(int64(e.Offset))
-				if err != nil {
-					return nil, err
-				}
-
-				if h.Type == plumbing.REFDeltaObject || h.Type == plumbing.OFSDeltaObject {
-					typ, err := i.p.getObjectType(h)
-					if err != nil {
-						return nil, err
-					}
-					if typ != i.typ {
-						i.p.offsetToType[int64(e.Offset)] = typ
-						continue
-					}
-					// getObjectType will seek in the file so we cannot use getNextObject safely
-					return i.p.objectAtOffset(int64(e.Offset), e.Hash)
-				} else {
-					if h.Type != i.typ {
-						i.p.offsetToType[int64(e.Offset)] = h.Type
-						continue
-					}
-					return i.p.getNextObject(h, e.Hash)
-				}
-			}
-		}
-
-		obj, err := i.p.objectAtOffset(int64(e.Offset), e.Hash)
-		if err != nil {
-			return nil, err
-		}
-
-		return obj, nil
-	}
-}
-
-func (i *objectIter) ForEach(f func(plumbing.EncodedObject) error) error {
-	for {
-		o, err := i.Next()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-			return err
-		}
-
-		if err := f(o); err != nil {
-			return err
-		}
-	}
-}
-
-func (i *objectIter) Close() {
-	i.iter.Close()
-}
-
-// isInvalid checks whether an error is an os.PathError with an os.ErrInvalid
-// error inside. It also checks for the windows error, which is different from
-// os.ErrInvalid.
-func isInvalid(err error) bool {
-	pe, ok := err.(*os.PathError)
-	if !ok {
-		return false
-	}
-
-	errstr := pe.Err.Error()
-	return errstr == errInvalidUnix || errstr == errInvalidWindows
-}
-
-// errInvalidWindows is the Windows equivalent to os.ErrInvalid
-const errInvalidWindows = "The parameter is incorrect."
-
-var errInvalidUnix = os.ErrInvalid.Error()
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/parser.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/parser.go
deleted file mode 100644
index 3bdfbe197..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/parser.go
+++ /dev/null
@@ -1,611 +0,0 @@
-package packfile
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-var (
-	// ErrReferenceDeltaNotFound is returned when the reference delta is not
-	// found.
-	ErrReferenceDeltaNotFound = errors.New("reference delta not found")
-
-	// ErrNotSeekableSource is returned when the source for the parser is not
-	// seekable and a storage was not provided, so it can't be parsed.
-	ErrNotSeekableSource = errors.New("parser source is not seekable and storage was not provided")
-
-	// ErrDeltaNotCached is returned when the delta could not be found in cache.
-	ErrDeltaNotCached = errors.New("delta could not be found in cache")
-)
-
-// Observer interface is implemented by index encoders.
-type Observer interface {
-	// OnHeader is called when a new packfile is opened.
-	OnHeader(count uint32) error
-	// OnInflatedObjectHeader is called for each object header read.
-	OnInflatedObjectHeader(t plumbing.ObjectType, objSize int64, pos int64) error
-	// OnInflatedObjectContent is called for each decoded object.
-	OnInflatedObjectContent(h plumbing.Hash, pos int64, crc uint32, content []byte) error
-	// OnFooter is called when decoding is done.
-	OnFooter(h plumbing.Hash) error
-}
-
-// Parser decodes a packfile and calls any observer associated to it. Is used
-// to generate indexes.
-type Parser struct {
-	storage    storer.EncodedObjectStorer
-	scanner    *Scanner
-	count      uint32
-	oi         []*objectInfo
-	oiByHash   map[plumbing.Hash]*objectInfo
-	oiByOffset map[int64]*objectInfo
-	checksum   plumbing.Hash
-
-	cache *cache.BufferLRU
-	// delta content by offset, only used if source is not seekable
-	deltas map[int64][]byte
-
-	ob []Observer
-}
-
-// NewParser creates a new Parser. The Scanner source must be seekable.
-// If it's not, NewParserWithStorage should be used instead.
-func NewParser(scanner *Scanner, ob ...Observer) (*Parser, error) {
-	return NewParserWithStorage(scanner, nil, ob...)
-}
-
-// NewParserWithStorage creates a new Parser. The scanner source must either
-// be seekable or a storage must be provided.
-func NewParserWithStorage(
-	scanner *Scanner,
-	storage storer.EncodedObjectStorer,
-	ob ...Observer,
-) (*Parser, error) {
-	if !scanner.IsSeekable && storage == nil {
-		return nil, ErrNotSeekableSource
-	}
-
-	var deltas map[int64][]byte
-	if !scanner.IsSeekable {
-		deltas = make(map[int64][]byte)
-	}
-
-	return &Parser{
-		storage: storage,
-		scanner: scanner,
-		ob:      ob,
-		count:   0,
-		cache:   cache.NewBufferLRUDefault(),
-		deltas:  deltas,
-	}, nil
-}
-
-func (p *Parser) forEachObserver(f func(o Observer) error) error {
-	for _, o := range p.ob {
-		if err := f(o); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (p *Parser) onHeader(count uint32) error {
-	return p.forEachObserver(func(o Observer) error {
-		return o.OnHeader(count)
-	})
-}
-
-func (p *Parser) onInflatedObjectHeader(
-	t plumbing.ObjectType,
-	objSize int64,
-	pos int64,
-) error {
-	return p.forEachObserver(func(o Observer) error {
-		return o.OnInflatedObjectHeader(t, objSize, pos)
-	})
-}
-
-func (p *Parser) onInflatedObjectContent(
-	h plumbing.Hash,
-	pos int64,
-	crc uint32,
-	content []byte,
-) error {
-	return p.forEachObserver(func(o Observer) error {
-		return o.OnInflatedObjectContent(h, pos, crc, content)
-	})
-}
-
-func (p *Parser) onFooter(h plumbing.Hash) error {
-	return p.forEachObserver(func(o Observer) error {
-		return o.OnFooter(h)
-	})
-}
-
-// Parse start decoding phase of the packfile.
-func (p *Parser) Parse() (plumbing.Hash, error) {
-	if err := p.init(); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if err := p.indexObjects(); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	var err error
-	p.checksum, err = p.scanner.Checksum()
-	if err != nil && err != io.EOF {
-		return plumbing.ZeroHash, err
-	}
-
-	if err := p.resolveDeltas(); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if err := p.onFooter(p.checksum); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return p.checksum, nil
-}
-
-func (p *Parser) init() error {
-	_, c, err := p.scanner.Header()
-	if err != nil {
-		return err
-	}
-
-	if err := p.onHeader(c); err != nil {
-		return err
-	}
-
-	p.count = c
-	p.oiByHash = make(map[plumbing.Hash]*objectInfo, p.count)
-	p.oiByOffset = make(map[int64]*objectInfo, p.count)
-	p.oi = make([]*objectInfo, p.count)
-
-	return nil
-}
-
-type objectHeaderWriter func(typ plumbing.ObjectType, sz int64) error
-
-type lazyObjectWriter interface {
-	// LazyWriter enables an object to be lazily written.
-	// It returns:
-	// - w: a writer to receive the object's content.
-	// - lwh: a func to write the object header.
-	// - err: any error from the initial writer creation process.
-	//
-	// Note that if the object header is not written BEFORE the writer
-	// is used, this will result in an invalid object.
-	LazyWriter() (w io.WriteCloser, lwh objectHeaderWriter, err error)
-}
-
-func (p *Parser) indexObjects() error {
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-
-	for i := uint32(0); i < p.count; i++ {
-		oh, err := p.scanner.NextObjectHeader()
-		if err != nil {
-			return err
-		}
-
-		delta := false
-		var ota *objectInfo
-		switch t := oh.Type; t {
-		case plumbing.OFSDeltaObject:
-			delta = true
-
-			parent, ok := p.oiByOffset[oh.OffsetReference]
-			if !ok {
-				return plumbing.ErrObjectNotFound
-			}
-
-			ota = newDeltaObject(oh.Offset, oh.Length, t, parent)
-			parent.Children = append(parent.Children, ota)
-		case plumbing.REFDeltaObject:
-			delta = true
-			parent, ok := p.oiByHash[oh.Reference]
-			if !ok {
-				// can't find referenced object in this pack file
-				// this must be a "thin" pack.
-				parent = &objectInfo{ //Placeholder parent
-					SHA1:        oh.Reference,
-					ExternalRef: true, // mark as an external reference that must be resolved
-					Type:        plumbing.AnyObject,
-					DiskType:    plumbing.AnyObject,
-				}
-				p.oiByHash[oh.Reference] = parent
-			}
-			ota = newDeltaObject(oh.Offset, oh.Length, t, parent)
-			parent.Children = append(parent.Children, ota)
-
-		default:
-			ota = newBaseObject(oh.Offset, oh.Length, t)
-		}
-
-		hasher := plumbing.NewHasher(oh.Type, oh.Length)
-		writers := []io.Writer{hasher}
-		var obj *plumbing.MemoryObject
-
-		// Lazy writing is only available for non-delta objects.
-		if p.storage != nil && !delta {
-			// When a storage is set and supports lazy writing,
-			// use that instead of creating a memory object.
-			if low, ok := p.storage.(lazyObjectWriter); ok {
-				ow, lwh, err := low.LazyWriter()
-				if err != nil {
-					return err
-				}
-
-				if err = lwh(oh.Type, oh.Length); err != nil {
-					return err
-				}
-
-				defer ow.Close()
-				writers = append(writers, ow)
-			} else {
-				obj = new(plumbing.MemoryObject)
-				obj.SetSize(oh.Length)
-				obj.SetType(oh.Type)
-
-				writers = append(writers, obj)
-			}
-		}
-		if delta && !p.scanner.IsSeekable {
-			buf.Reset()
-			buf.Grow(int(oh.Length))
-			writers = append(writers, buf)
-		}
-
-		mw := io.MultiWriter(writers...)
-
-		_, crc, err := p.scanner.NextObject(mw)
-		if err != nil {
-			return err
-		}
-
-		// Non delta objects needs to be added into the storage. This
-		// is only required when lazy writing is not supported.
-		if obj != nil {
-			if _, err := p.storage.SetEncodedObject(obj); err != nil {
-				return err
-			}
-		}
-
-		ota.Crc32 = crc
-		ota.Length = oh.Length
-
-		if !delta {
-			sha1 := hasher.Sum()
-
-			// Move children of placeholder parent into actual parent, in case this
-			// was a non-external delta reference.
-			if placeholder, ok := p.oiByHash[sha1]; ok {
-				ota.Children = placeholder.Children
-				for _, c := range ota.Children {
-					c.Parent = ota
-				}
-			}
-
-			ota.SHA1 = sha1
-			p.oiByHash[ota.SHA1] = ota
-		}
-
-		if delta && !p.scanner.IsSeekable {
-			data := buf.Bytes()
-			p.deltas[oh.Offset] = make([]byte, len(data))
-			copy(p.deltas[oh.Offset], data)
-		}
-
-		p.oiByOffset[oh.Offset] = ota
-		p.oi[i] = ota
-	}
-
-	return nil
-}
-
-func (p *Parser) resolveDeltas() error {
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-
-	for _, obj := range p.oi {
-		buf.Reset()
-		buf.Grow(int(obj.Length))
-		err := p.get(obj, buf)
-		if err != nil {
-			return err
-		}
-
-		if err := p.onInflatedObjectHeader(obj.Type, obj.Length, obj.Offset); err != nil {
-			return err
-		}
-
-		if err := p.onInflatedObjectContent(obj.SHA1, obj.Offset, obj.Crc32, nil); err != nil {
-			return err
-		}
-
-		if !obj.IsDelta() && len(obj.Children) > 0 {
-			// Dealing with an io.ReaderAt object, means we can
-			// create it once and reuse across all children.
-			r := bytes.NewReader(buf.Bytes())
-			for _, child := range obj.Children {
-				// Even though we are discarding the output, we still need to read it to
-				// so that the scanner can advance to the next object, and the SHA1 can be
-				// calculated.
-				if err := p.resolveObject(io.Discard, child, r); err != nil {
-					return err
-				}
-				p.resolveExternalRef(child)
-			}
-
-			// Remove the delta from the cache.
-			if obj.DiskType.IsDelta() && !p.scanner.IsSeekable {
-				delete(p.deltas, obj.Offset)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (p *Parser) resolveExternalRef(o *objectInfo) {
-	if ref, ok := p.oiByHash[o.SHA1]; ok && ref.ExternalRef {
-		p.oiByHash[o.SHA1] = o
-		o.Children = ref.Children
-		for _, c := range o.Children {
-			c.Parent = o
-		}
-	}
-}
-
-func (p *Parser) get(o *objectInfo, buf *bytes.Buffer) (err error) {
-	if !o.ExternalRef { // skip cache check for placeholder parents
-		b, ok := p.cache.Get(o.Offset)
-		if ok {
-			_, err := buf.Write(b)
-			return err
-		}
-	}
-
-	// If it's not on the cache and is not a delta we can try to find it in the
-	// storage, if there's one. External refs must enter here.
-	if p.storage != nil && !o.Type.IsDelta() {
-		var e plumbing.EncodedObject
-		e, err = p.storage.EncodedObject(plumbing.AnyObject, o.SHA1)
-		if err != nil {
-			return err
-		}
-		o.Type = e.Type()
-
-		var r io.ReadCloser
-		r, err = e.Reader()
-		if err != nil {
-			return err
-		}
-
-		defer ioutil.CheckClose(r, &err)
-
-		_, err = buf.ReadFrom(io.LimitReader(r, e.Size()))
-		return err
-	}
-
-	if o.ExternalRef {
-		// we were not able to resolve a ref in a thin pack
-		return ErrReferenceDeltaNotFound
-	}
-
-	if o.DiskType.IsDelta() {
-		b := sync.GetBytesBuffer()
-		defer sync.PutBytesBuffer(b)
-		buf.Grow(int(o.Length))
-		err := p.get(o.Parent, b)
-		if err != nil {
-			return err
-		}
-
-		err = p.resolveObject(buf, o, bytes.NewReader(b.Bytes()))
-		if err != nil {
-			return err
-		}
-	} else {
-		err := p.readData(buf, o)
-		if err != nil {
-			return err
-		}
-	}
-
-	// If the scanner is seekable, caching this data into
-	// memory by offset seems wasteful.
-	// There is a trade-off to be considered here in terms
-	// of execution time vs memory consumption.
-	//
-	// TODO: improve seekable execution time, so that we can
-	// skip this cache.
-	if len(o.Children) > 0 {
-		data := make([]byte, buf.Len())
-		copy(data, buf.Bytes())
-		p.cache.Put(o.Offset, data)
-	}
-	return nil
-}
-
-// resolveObject resolves an object from base, using information
-// provided by o.
-//
-// This call has the side-effect of changing field values
-// from the object info o:
-//   - Type: OFSDeltaObject may become the target type (e.g. Blob).
-//   - Size: The size may be update with the target size.
-//   - Hash: Zero hashes will be calculated as part of the object
-//     resolution. Hence why this process can't be avoided even when w
-//     is an io.Discard.
-//
-// base must be an io.ReaderAt, which is a requirement from
-// patchDeltaStream. The main reason being that reversing an
-// delta object may lead to going backs and forths within base,
-// which is not supported by io.Reader.
-func (p *Parser) resolveObject(
-	w io.Writer,
-	o *objectInfo,
-	base io.ReaderAt,
-) error {
-	if !o.DiskType.IsDelta() {
-		return nil
-	}
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-	err := p.readData(buf, o)
-	if err != nil {
-		return err
-	}
-
-	writers := []io.Writer{w}
-	var obj *plumbing.MemoryObject
-	var lwh objectHeaderWriter
-
-	if p.storage != nil {
-		if low, ok := p.storage.(lazyObjectWriter); ok {
-			ow, wh, err := low.LazyWriter()
-			if err != nil {
-				return err
-			}
-			lwh = wh
-
-			defer ow.Close()
-			writers = append(writers, ow)
-		} else {
-			obj = new(plumbing.MemoryObject)
-			ow, err := obj.Writer()
-			if err != nil {
-				return err
-			}
-
-			writers = append(writers, ow)
-		}
-	}
-
-	mw := io.MultiWriter(writers...)
-
-	err = applyPatchBase(o, base, buf, mw, lwh)
-	if err != nil {
-		return err
-	}
-
-	if obj != nil {
-		obj.SetType(o.Type)
-		obj.SetSize(o.Size()) // Size here is correct as it was populated by applyPatchBase.
-		if _, err := p.storage.SetEncodedObject(obj); err != nil {
-			return err
-		}
-	}
-	return err
-}
-
-func (p *Parser) readData(w io.Writer, o *objectInfo) error {
-	if !p.scanner.IsSeekable && o.DiskType.IsDelta() {
-		data, ok := p.deltas[o.Offset]
-		if !ok {
-			return ErrDeltaNotCached
-		}
-		_, err := w.Write(data)
-		return err
-	}
-
-	if _, err := p.scanner.SeekObjectHeader(o.Offset); err != nil {
-		return err
-	}
-
-	if _, _, err := p.scanner.NextObject(w); err != nil {
-		return err
-	}
-	return nil
-}
-
-// applyPatchBase applies the patch to target.
-//
-// Note that ota will be updated based on the description in resolveObject.
-func applyPatchBase(ota *objectInfo, base io.ReaderAt, delta io.Reader, target io.Writer, wh objectHeaderWriter) error {
-	if target == nil {
-		return fmt.Errorf("cannot apply patch against nil target")
-	}
-
-	typ := ota.Type
-	if ota.SHA1 == plumbing.ZeroHash {
-		typ = ota.Parent.Type
-	}
-
-	sz, h, err := patchDeltaWriter(target, base, delta, typ, wh)
-	if err != nil {
-		return err
-	}
-
-	if ota.SHA1 == plumbing.ZeroHash {
-		ota.Type = typ
-		ota.Length = int64(sz)
-		ota.SHA1 = h
-	}
-
-	return nil
-}
-
-func getSHA1(t plumbing.ObjectType, data []byte) (plumbing.Hash, error) {
-	hasher := plumbing.NewHasher(t, int64(len(data)))
-	if _, err := hasher.Write(data); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return hasher.Sum(), nil
-}
-
-type objectInfo struct {
-	Offset      int64
-	Length      int64
-	Type        plumbing.ObjectType
-	DiskType    plumbing.ObjectType
-	ExternalRef bool // indicates this is an external reference in a thin pack file
-
-	Crc32 uint32
-
-	Parent   *objectInfo
-	Children []*objectInfo
-	SHA1     plumbing.Hash
-}
-
-func newBaseObject(offset, length int64, t plumbing.ObjectType) *objectInfo {
-	return newDeltaObject(offset, length, t, nil)
-}
-
-func newDeltaObject(
-	offset, length int64,
-	t plumbing.ObjectType,
-	parent *objectInfo,
-) *objectInfo {
-	obj := &objectInfo{
-		Offset:   offset,
-		Length:   length,
-		Type:     t,
-		DiskType: t,
-		Crc32:    0,
-		Parent:   parent,
-	}
-
-	return obj
-}
-
-func (o *objectInfo) IsDelta() bool {
-	return o.Type.IsDelta()
-}
-
-func (o *objectInfo) Size() int64 {
-	return o.Length
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/patch_delta.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/patch_delta.go
deleted file mode 100644
index 54d9b08b2..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/patch_delta.go
+++ /dev/null
@@ -1,543 +0,0 @@
-package packfile
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-// See https://github.com/git/git/blob/49fa3dc76179e04b0833542fa52d0f287a4955ac/delta.h
-// https://github.com/git/git/blob/c2c5f6b1e479f2c38e0e01345350620944e3527f/patch-delta.c,
-// and https://github.com/tarruda/node-git-core/blob/master/src/js/delta.js
-// for details about the delta format.
-
-var (
-	ErrInvalidDelta = errors.New("invalid delta")
-	ErrDeltaCmd     = errors.New("wrong delta command")
-)
-
-const (
-	payload      = 0x7f // 0111 1111
-	continuation = 0x80 // 1000 0000
-
-	// maxPatchPreemptionSize defines what is the max size of bytes to be
-	// premptively made available for a patch operation.
-	maxPatchPreemptionSize uint = 65536
-
-	// minDeltaSize defines the smallest size for a delta.
-	minDeltaSize = 4
-)
-
-type offset struct {
-	mask  byte
-	shift uint
-}
-
-var offsets = []offset{
-	{mask: 0x01, shift: 0},
-	{mask: 0x02, shift: 8},
-	{mask: 0x04, shift: 16},
-	{mask: 0x08, shift: 24},
-}
-
-var sizes = []offset{
-	{mask: 0x10, shift: 0},
-	{mask: 0x20, shift: 8},
-	{mask: 0x40, shift: 16},
-}
-
-// ApplyDelta writes to target the result of applying the modification deltas in delta to base.
-func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) (err error) {
-	r, err := base.Reader()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(r, &err)
-
-	w, err := target.Writer()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	buf := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(buf)
-	_, err = buf.ReadFrom(r)
-	if err != nil {
-		return err
-	}
-	src := buf.Bytes()
-
-	dst := sync.GetBytesBuffer()
-	defer sync.PutBytesBuffer(dst)
-	err = patchDelta(dst, src, delta)
-	if err != nil {
-		return err
-	}
-
-	target.SetSize(int64(dst.Len()))
-
-	b := sync.GetByteSlice()
-	_, err = io.CopyBuffer(w, dst, *b)
-	sync.PutByteSlice(b)
-	return err
-}
-
-// PatchDelta returns the result of applying the modification deltas in delta to src.
-// An error will be returned if delta is corrupted (ErrInvalidDelta) or an action command
-// is not copy from source or copy from delta (ErrDeltaCmd).
-func PatchDelta(src, delta []byte) ([]byte, error) {
-	if len(src) == 0 || len(delta) < minDeltaSize {
-		return nil, ErrInvalidDelta
-	}
-
-	b := &bytes.Buffer{}
-	if err := patchDelta(b, src, delta); err != nil {
-		return nil, err
-	}
-	return b.Bytes(), nil
-}
-
-func ReaderFromDelta(base plumbing.EncodedObject, deltaRC io.Reader) (io.ReadCloser, error) {
-	deltaBuf := bufio.NewReaderSize(deltaRC, 1024)
-	srcSz, err := decodeLEB128ByteReader(deltaBuf)
-	if err != nil {
-		if err == io.EOF {
-			return nil, ErrInvalidDelta
-		}
-		return nil, err
-	}
-	if srcSz != uint(base.Size()) {
-		return nil, ErrInvalidDelta
-	}
-
-	targetSz, err := decodeLEB128ByteReader(deltaBuf)
-	if err != nil {
-		if err == io.EOF {
-			return nil, ErrInvalidDelta
-		}
-		return nil, err
-	}
-	remainingTargetSz := targetSz
-
-	dstRd, dstWr := io.Pipe()
-
-	go func() {
-		baseRd, err := base.Reader()
-		if err != nil {
-			_ = dstWr.CloseWithError(ErrInvalidDelta)
-			return
-		}
-		defer baseRd.Close()
-
-		baseBuf := bufio.NewReader(baseRd)
-		basePos := uint(0)
-
-		for {
-			cmd, err := deltaBuf.ReadByte()
-			if err == io.EOF {
-				_ = dstWr.CloseWithError(ErrInvalidDelta)
-				return
-			}
-			if err != nil {
-				_ = dstWr.CloseWithError(err)
-				return
-			}
-
-			switch {
-			case isCopyFromSrc(cmd):
-				offset, err := decodeOffsetByteReader(cmd, deltaBuf)
-				if err != nil {
-					_ = dstWr.CloseWithError(err)
-					return
-				}
-				sz, err := decodeSizeByteReader(cmd, deltaBuf)
-				if err != nil {
-					_ = dstWr.CloseWithError(err)
-					return
-				}
-
-				if invalidSize(sz, targetSz) ||
-					invalidOffsetSize(offset, sz, srcSz) {
-					_ = dstWr.Close()
-					return
-				}
-
-				discard := offset - basePos
-				if basePos > offset {
-					_ = baseRd.Close()
-					baseRd, err = base.Reader()
-					if err != nil {
-						_ = dstWr.CloseWithError(ErrInvalidDelta)
-						return
-					}
-					baseBuf.Reset(baseRd)
-					discard = offset
-				}
-				for discard > math.MaxInt32 {
-					n, err := baseBuf.Discard(math.MaxInt32)
-					if err != nil {
-						_ = dstWr.CloseWithError(err)
-						return
-					}
-					basePos += uint(n)
-					discard -= uint(n)
-				}
-				for discard > 0 {
-					n, err := baseBuf.Discard(int(discard))
-					if err != nil {
-						_ = dstWr.CloseWithError(err)
-						return
-					}
-					basePos += uint(n)
-					discard -= uint(n)
-				}
-				if _, err := io.Copy(dstWr, io.LimitReader(baseBuf, int64(sz))); err != nil {
-					_ = dstWr.CloseWithError(err)
-					return
-				}
-				remainingTargetSz -= sz
-				basePos += sz
-
-			case isCopyFromDelta(cmd):
-				sz := uint(cmd) // cmd is the size itself
-				if invalidSize(sz, targetSz) {
-					_ = dstWr.CloseWithError(ErrInvalidDelta)
-					return
-				}
-				if _, err := io.Copy(dstWr, io.LimitReader(deltaBuf, int64(sz))); err != nil {
-					_ = dstWr.CloseWithError(err)
-					return
-				}
-
-				remainingTargetSz -= sz
-
-			default:
-				_ = dstWr.CloseWithError(ErrDeltaCmd)
-				return
-			}
-
-			if remainingTargetSz <= 0 {
-				_ = dstWr.Close()
-				return
-			}
-		}
-	}()
-
-	return dstRd, nil
-}
-
-func patchDelta(dst *bytes.Buffer, src, delta []byte) error {
-	if len(delta) < minCopySize {
-		return ErrInvalidDelta
-	}
-
-	srcSz, delta := decodeLEB128(delta)
-	if srcSz != uint(len(src)) {
-		return ErrInvalidDelta
-	}
-
-	targetSz, delta := decodeLEB128(delta)
-	remainingTargetSz := targetSz
-
-	var cmd byte
-
-	growSz := min(targetSz, maxPatchPreemptionSize)
-	dst.Grow(int(growSz))
-	for {
-		if len(delta) == 0 {
-			return ErrInvalidDelta
-		}
-
-		cmd = delta[0]
-		delta = delta[1:]
-
-		switch {
-		case isCopyFromSrc(cmd):
-			var offset, sz uint
-			var err error
-			offset, delta, err = decodeOffset(cmd, delta)
-			if err != nil {
-				return err
-			}
-
-			sz, delta, err = decodeSize(cmd, delta)
-			if err != nil {
-				return err
-			}
-
-			if invalidSize(sz, targetSz) ||
-				invalidOffsetSize(offset, sz, srcSz) {
-				break
-			}
-			dst.Write(src[offset : offset+sz])
-			remainingTargetSz -= sz
-
-		case isCopyFromDelta(cmd):
-			sz := uint(cmd) // cmd is the size itself
-			if invalidSize(sz, targetSz) {
-				return ErrInvalidDelta
-			}
-
-			if uint(len(delta)) < sz {
-				return ErrInvalidDelta
-			}
-
-			dst.Write(delta[0:sz])
-			remainingTargetSz -= sz
-			delta = delta[sz:]
-
-		default:
-			return ErrDeltaCmd
-		}
-
-		if remainingTargetSz <= 0 {
-			break
-		}
-	}
-
-	return nil
-}
-
-func patchDeltaWriter(dst io.Writer, base io.ReaderAt, delta io.Reader,
-	typ plumbing.ObjectType, writeHeader objectHeaderWriter) (uint, plumbing.Hash, error) {
-	deltaBuf := bufio.NewReaderSize(delta, 1024)
-	srcSz, err := decodeLEB128ByteReader(deltaBuf)
-	if err != nil {
-		if err == io.EOF {
-			return 0, plumbing.ZeroHash, ErrInvalidDelta
-		}
-		return 0, plumbing.ZeroHash, err
-	}
-
-	if r, ok := base.(*bytes.Reader); ok && srcSz != uint(r.Size()) {
-		return 0, plumbing.ZeroHash, ErrInvalidDelta
-	}
-
-	targetSz, err := decodeLEB128ByteReader(deltaBuf)
-	if err != nil {
-		if err == io.EOF {
-			return 0, plumbing.ZeroHash, ErrInvalidDelta
-		}
-		return 0, plumbing.ZeroHash, err
-	}
-
-	// If header still needs to be written, caller will provide
-	// a LazyObjectWriterHeader. This seems to be the case when
-	// dealing with thin-packs.
-	if writeHeader != nil {
-		err = writeHeader(typ, int64(targetSz))
-		if err != nil {
-			return 0, plumbing.ZeroHash, fmt.Errorf("could not lazy write header: %w", err)
-		}
-	}
-
-	remainingTargetSz := targetSz
-
-	hasher := plumbing.NewHasher(typ, int64(targetSz))
-	mw := io.MultiWriter(dst, hasher)
-
-	bufp := sync.GetByteSlice()
-	defer sync.PutByteSlice(bufp)
-
-	sr := io.NewSectionReader(base, int64(0), int64(srcSz))
-	// Keep both the io.LimitedReader types, so we can reset N.
-	baselr := io.LimitReader(sr, 0).(*io.LimitedReader)
-	deltalr := io.LimitReader(deltaBuf, 0).(*io.LimitedReader)
-
-	for {
-		buf := *bufp
-		cmd, err := deltaBuf.ReadByte()
-		if err == io.EOF {
-			return 0, plumbing.ZeroHash, ErrInvalidDelta
-		}
-		if err != nil {
-			return 0, plumbing.ZeroHash, err
-		}
-
-		if isCopyFromSrc(cmd) {
-			offset, err := decodeOffsetByteReader(cmd, deltaBuf)
-			if err != nil {
-				return 0, plumbing.ZeroHash, err
-			}
-			sz, err := decodeSizeByteReader(cmd, deltaBuf)
-			if err != nil {
-				return 0, plumbing.ZeroHash, err
-			}
-
-			if invalidSize(sz, targetSz) ||
-				invalidOffsetSize(offset, sz, srcSz) {
-				return 0, plumbing.ZeroHash, err
-			}
-
-			if _, err := sr.Seek(int64(offset), io.SeekStart); err != nil {
-				return 0, plumbing.ZeroHash, err
-			}
-			baselr.N = int64(sz)
-			if _, err := io.CopyBuffer(mw, baselr, buf); err != nil {
-				return 0, plumbing.ZeroHash, err
-			}
-			remainingTargetSz -= sz
-		} else if isCopyFromDelta(cmd) {
-			sz := uint(cmd) // cmd is the size itself
-			if invalidSize(sz, targetSz) {
-				return 0, plumbing.ZeroHash, ErrInvalidDelta
-			}
-			deltalr.N = int64(sz)
-			if _, err := io.CopyBuffer(mw, deltalr, buf); err != nil {
-				return 0, plumbing.ZeroHash, err
-			}
-
-			remainingTargetSz -= sz
-		} else {
-			return 0, plumbing.ZeroHash, err
-		}
-		if remainingTargetSz <= 0 {
-			break
-		}
-	}
-
-	return targetSz, hasher.Sum(), nil
-}
-
-// Decodes a number encoded as an unsigned LEB128 at the start of some
-// binary data and returns the decoded number and the rest of the
-// stream.
-//
-// This must be called twice on the delta data buffer, first to get the
-// expected source buffer size, and again to get the target buffer size.
-func decodeLEB128(input []byte) (uint, []byte) {
-	if len(input) == 0 {
-		return 0, input
-	}
-
-	var num, sz uint
-	var b byte
-	for {
-		b = input[sz]
-		num |= (uint(b) & payload) << (sz * 7) // concats 7 bits chunks
-		sz++
-
-		if uint(b)&continuation == 0 || sz == uint(len(input)) {
-			break
-		}
-	}
-
-	return num, input[sz:]
-}
-
-func decodeLEB128ByteReader(input io.ByteReader) (uint, error) {
-	var num, sz uint
-	for {
-		b, err := input.ReadByte()
-		if err != nil {
-			return 0, err
-		}
-
-		num |= (uint(b) & payload) << (sz * 7) // concats 7 bits chunks
-		sz++
-
-		if uint(b)&continuation == 0 {
-			break
-		}
-	}
-
-	return num, nil
-}
-
-func isCopyFromSrc(cmd byte) bool {
-	return (cmd & continuation) != 0
-}
-
-func isCopyFromDelta(cmd byte) bool {
-	return (cmd&continuation) == 0 && cmd != 0
-}
-
-func decodeOffsetByteReader(cmd byte, delta io.ByteReader) (uint, error) {
-	var offset uint
-	for _, o := range offsets {
-		if (cmd & o.mask) != 0 {
-			next, err := delta.ReadByte()
-			if err != nil {
-				return 0, err
-			}
-			offset |= uint(next) << o.shift
-		}
-	}
-
-	return offset, nil
-}
-
-func decodeOffset(cmd byte, delta []byte) (uint, []byte, error) {
-	var offset uint
-	for _, o := range offsets {
-		if (cmd & o.mask) != 0 {
-			if len(delta) == 0 {
-				return 0, nil, ErrInvalidDelta
-			}
-			offset |= uint(delta[0]) << o.shift
-			delta = delta[1:]
-		}
-	}
-
-	return offset, delta, nil
-}
-
-func decodeSizeByteReader(cmd byte, delta io.ByteReader) (uint, error) {
-	var sz uint
-	for _, s := range sizes {
-		if (cmd & s.mask) != 0 {
-			next, err := delta.ReadByte()
-			if err != nil {
-				return 0, err
-			}
-			sz |= uint(next) << s.shift
-		}
-	}
-
-	if sz == 0 {
-		sz = maxCopySize
-	}
-
-	return sz, nil
-}
-
-func decodeSize(cmd byte, delta []byte) (uint, []byte, error) {
-	var sz uint
-	for _, s := range sizes {
-		if (cmd & s.mask) != 0 {
-			if len(delta) == 0 {
-				return 0, nil, ErrInvalidDelta
-			}
-			sz |= uint(delta[0]) << s.shift
-			delta = delta[1:]
-		}
-	}
-	if sz == 0 {
-		sz = maxCopySize
-	}
-
-	return sz, delta, nil
-}
-
-func invalidSize(sz, targetSz uint) bool {
-	return sz > targetSz
-}
-
-func invalidOffsetSize(offset, sz, srcSz uint) bool {
-	return sumOverflows(offset, sz) ||
-		offset+sz > srcSz
-}
-
-func sumOverflows(a, b uint) bool {
-	return a+b < a
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/scanner.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/scanner.go
deleted file mode 100644
index 47b7df3e4..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/packfile/scanner.go
+++ /dev/null
@@ -1,474 +0,0 @@
-package packfile
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"hash"
-	"hash/crc32"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-var (
-	// ErrEmptyPackfile is returned by ReadHeader when no data is found in the packfile
-	ErrEmptyPackfile = NewError("empty packfile")
-	// ErrBadSignature is returned by ReadHeader when the signature in the packfile is incorrect.
-	ErrBadSignature = NewError("malformed pack file signature")
-	// ErrUnsupportedVersion is returned by ReadHeader when the packfile version is
-	// different than VersionSupported.
-	ErrUnsupportedVersion = NewError("unsupported packfile version")
-	// ErrSeekNotSupported returned if seek is not support
-	ErrSeekNotSupported = NewError("not seek support")
-)
-
-// ObjectHeader contains the information related to the object, this information
-// is collected from the previous bytes to the content of the object.
-type ObjectHeader struct {
-	Type            plumbing.ObjectType
-	Offset          int64
-	Length          int64
-	Reference       plumbing.Hash
-	OffsetReference int64
-}
-
-type Scanner struct {
-	r   *scannerReader
-	crc hash.Hash32
-
-	// pendingObject is used to detect if an object has been read, or still
-	// is waiting to be read
-	pendingObject    *ObjectHeader
-	version, objects uint32
-
-	// lsSeekable says if this scanner can do Seek or not, to have a Scanner
-	// seekable a r implementing io.Seeker is required
-	IsSeekable bool
-}
-
-// NewScanner returns a new Scanner based on a reader, if the given reader
-// implements io.ReadSeeker the Scanner will be also Seekable
-func NewScanner(r io.Reader) *Scanner {
-	_, ok := r.(io.ReadSeeker)
-
-	crc := crc32.NewIEEE()
-	return &Scanner{
-		r:          newScannerReader(r, crc),
-		crc:        crc,
-		IsSeekable: ok,
-	}
-}
-
-func (s *Scanner) Reset(r io.Reader) {
-	_, ok := r.(io.ReadSeeker)
-
-	s.r.Reset(r)
-	s.crc.Reset()
-	s.IsSeekable = ok
-	s.pendingObject = nil
-	s.version = 0
-	s.objects = 0
-}
-
-// Header reads the whole packfile header (signature, version and object count).
-// It returns the version and the object count and performs checks on the
-// validity of the signature and the version fields.
-func (s *Scanner) Header() (version, objects uint32, err error) {
-	if s.version != 0 {
-		return s.version, s.objects, nil
-	}
-
-	sig, err := s.readSignature()
-	if err != nil {
-		if err == io.EOF {
-			err = ErrEmptyPackfile
-		}
-
-		return
-	}
-
-	if !s.isValidSignature(sig) {
-		err = ErrBadSignature
-		return
-	}
-
-	version, err = s.readVersion()
-	s.version = version
-	if err != nil {
-		return
-	}
-
-	if !s.isSupportedVersion(version) {
-		err = ErrUnsupportedVersion.AddDetails("%d", version)
-		return
-	}
-
-	objects, err = s.readCount()
-	s.objects = objects
-	return
-}
-
-// readSignature reads a returns the signature field in the packfile.
-func (s *Scanner) readSignature() ([]byte, error) {
-	var sig = make([]byte, 4)
-	if _, err := io.ReadFull(s.r, sig); err != nil {
-		return []byte{}, err
-	}
-
-	return sig, nil
-}
-
-// isValidSignature returns if sig is a valid packfile signature.
-func (s *Scanner) isValidSignature(sig []byte) bool {
-	return bytes.Equal(sig, signature)
-}
-
-// readVersion reads and returns the version field of a packfile.
-func (s *Scanner) readVersion() (uint32, error) {
-	return binary.ReadUint32(s.r)
-}
-
-// isSupportedVersion returns whether version v is supported by the parser.
-// The current supported version is VersionSupported, defined above.
-func (s *Scanner) isSupportedVersion(v uint32) bool {
-	return v == VersionSupported
-}
-
-// readCount reads and returns the count of objects field of a packfile.
-func (s *Scanner) readCount() (uint32, error) {
-	return binary.ReadUint32(s.r)
-}
-
-// SeekObjectHeader seeks to specified offset and returns the ObjectHeader
-// for the next object in the reader
-func (s *Scanner) SeekObjectHeader(offset int64) (*ObjectHeader, error) {
-	// if seeking we assume that you are not interested in the header
-	if s.version == 0 {
-		s.version = VersionSupported
-	}
-
-	if _, err := s.r.Seek(offset, io.SeekStart); err != nil {
-		return nil, err
-	}
-
-	h, err := s.nextObjectHeader()
-	if err != nil {
-		return nil, err
-	}
-
-	h.Offset = offset
-	return h, nil
-}
-
-// NextObjectHeader returns the ObjectHeader for the next object in the reader
-func (s *Scanner) NextObjectHeader() (*ObjectHeader, error) {
-	if err := s.doPending(); err != nil {
-		return nil, err
-	}
-
-	offset, err := s.r.Seek(0, io.SeekCurrent)
-	if err != nil {
-		return nil, err
-	}
-
-	h, err := s.nextObjectHeader()
-	if err != nil {
-		return nil, err
-	}
-
-	h.Offset = offset
-	return h, nil
-}
-
-// nextObjectHeader returns the ObjectHeader for the next object in the reader
-// without the Offset field
-func (s *Scanner) nextObjectHeader() (*ObjectHeader, error) {
-	s.r.Flush()
-	s.crc.Reset()
-
-	h := &ObjectHeader{}
-	s.pendingObject = h
-
-	var err error
-	h.Offset, err = s.r.Seek(0, io.SeekCurrent)
-	if err != nil {
-		return nil, err
-	}
-
-	h.Type, h.Length, err = s.readObjectTypeAndLength()
-	if err != nil {
-		return nil, err
-	}
-
-	switch h.Type {
-	case plumbing.OFSDeltaObject:
-		no, err := binary.ReadVariableWidthInt(s.r)
-		if err != nil {
-			return nil, err
-		}
-
-		h.OffsetReference = h.Offset - no
-	case plumbing.REFDeltaObject:
-		var err error
-		h.Reference, err = binary.ReadHash(s.r)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return h, nil
-}
-
-func (s *Scanner) doPending() error {
-	if s.version == 0 {
-		var err error
-		s.version, s.objects, err = s.Header()
-		if err != nil {
-			return err
-		}
-	}
-
-	return s.discardObjectIfNeeded()
-}
-
-func (s *Scanner) discardObjectIfNeeded() error {
-	if s.pendingObject == nil {
-		return nil
-	}
-
-	h := s.pendingObject
-	n, _, err := s.NextObject(io.Discard)
-	if err != nil {
-		return err
-	}
-
-	if n != h.Length {
-		return fmt.Errorf(
-			"error discarding object, discarded %d, expected %d",
-			n, h.Length,
-		)
-	}
-
-	return nil
-}
-
-// ReadObjectTypeAndLength reads and returns the object type and the
-// length field from an object entry in a packfile.
-func (s *Scanner) readObjectTypeAndLength() (plumbing.ObjectType, int64, error) {
-	t, c, err := s.readType()
-	if err != nil {
-		return t, 0, err
-	}
-
-	l, err := s.readLength(c)
-
-	return t, l, err
-}
-
-func (s *Scanner) readType() (plumbing.ObjectType, byte, error) {
-	var c byte
-	var err error
-	if c, err = s.r.ReadByte(); err != nil {
-		return plumbing.ObjectType(0), 0, err
-	}
-
-	typ := parseType(c)
-
-	return typ, c, nil
-}
-
-func parseType(b byte) plumbing.ObjectType {
-	return plumbing.ObjectType((b & maskType) >> firstLengthBits)
-}
-
-// the length is codified in the last 4 bits of the first byte and in
-// the last 7 bits of subsequent bytes.  Last byte has a 0 MSB.
-func (s *Scanner) readLength(first byte) (int64, error) {
-	length := int64(first & maskFirstLength)
-
-	c := first
-	shift := firstLengthBits
-	var err error
-	for c&maskContinue > 0 {
-		if c, err = s.r.ReadByte(); err != nil {
-			return 0, err
-		}
-
-		length += int64(c&maskLength) << shift
-		shift += lengthBits
-	}
-
-	return length, nil
-}
-
-// NextObject writes the content of the next object into the reader, returns
-// the number of bytes written, the CRC32 of the content and an error, if any
-func (s *Scanner) NextObject(w io.Writer) (written int64, crc32 uint32, err error) {
-	s.pendingObject = nil
-	written, err = s.copyObject(w)
-
-	s.r.Flush()
-	crc32 = s.crc.Sum32()
-	s.crc.Reset()
-
-	return
-}
-
-// ReadObject returns a reader for the object content and an error
-func (s *Scanner) ReadObject() (io.ReadCloser, error) {
-	s.pendingObject = nil
-	zr, err := sync.GetZlibReader(s.r)
-
-	if err != nil {
-		return nil, fmt.Errorf("zlib reset error: %s", err)
-	}
-
-	return ioutil.NewReadCloserWithCloser(zr.Reader, func() error {
-		sync.PutZlibReader(zr)
-		return nil
-	}), nil
-}
-
-// ReadRegularObject reads and write a non-deltified object
-// from it zlib stream in an object entry in the packfile.
-func (s *Scanner) copyObject(w io.Writer) (n int64, err error) {
-	zr, err := sync.GetZlibReader(s.r)
-	defer sync.PutZlibReader(zr)
-
-	if err != nil {
-		return 0, fmt.Errorf("zlib reset error: %s", err)
-	}
-
-	defer ioutil.CheckClose(zr.Reader, &err)
-	buf := sync.GetByteSlice()
-	n, err = io.CopyBuffer(w, zr.Reader, *buf)
-	sync.PutByteSlice(buf)
-	return
-}
-
-// SeekFromStart sets a new offset from start, returns the old position before
-// the change.
-func (s *Scanner) SeekFromStart(offset int64) (previous int64, err error) {
-	// if seeking we assume that you are not interested in the header
-	if s.version == 0 {
-		s.version = VersionSupported
-	}
-
-	previous, err = s.r.Seek(0, io.SeekCurrent)
-	if err != nil {
-		return -1, err
-	}
-
-	_, err = s.r.Seek(offset, io.SeekStart)
-	return previous, err
-}
-
-// Checksum returns the checksum of the packfile
-func (s *Scanner) Checksum() (plumbing.Hash, error) {
-	err := s.discardObjectIfNeeded()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return binary.ReadHash(s.r)
-}
-
-// Close reads the reader until io.EOF
-func (s *Scanner) Close() error {
-	buf := sync.GetByteSlice()
-	_, err := io.CopyBuffer(io.Discard, s.r, *buf)
-	sync.PutByteSlice(buf)
-
-	return err
-}
-
-// Flush is a no-op (deprecated)
-func (s *Scanner) Flush() error {
-	return nil
-}
-
-// scannerReader has the following characteristics:
-//   - Provides an io.SeekReader impl for bufio.Reader, when the underlying
-//     reader supports it.
-//   - Keeps track of the current read position, for when the underlying reader
-//     isn't an io.SeekReader, but we still want to know the current offset.
-//   - Writes to the hash writer what it reads, with the aid of a smaller buffer.
-//     The buffer helps avoid a performance penalty for performing small writes
-//     to the crc32 hash writer.
-type scannerReader struct {
-	reader io.Reader
-	crc    io.Writer
-	rbuf   *bufio.Reader
-	wbuf   *bufio.Writer
-	offset int64
-}
-
-func newScannerReader(r io.Reader, h io.Writer) *scannerReader {
-	sr := &scannerReader{
-		rbuf: bufio.NewReader(nil),
-		wbuf: bufio.NewWriterSize(nil, 64),
-		crc:  h,
-	}
-	sr.Reset(r)
-
-	return sr
-}
-
-func (r *scannerReader) Reset(reader io.Reader) {
-	r.reader = reader
-	r.rbuf.Reset(r.reader)
-	r.wbuf.Reset(r.crc)
-
-	r.offset = 0
-	if seeker, ok := r.reader.(io.ReadSeeker); ok {
-		r.offset, _ = seeker.Seek(0, io.SeekCurrent)
-	}
-}
-
-func (r *scannerReader) Read(p []byte) (n int, err error) {
-	n, err = r.rbuf.Read(p)
-
-	r.offset += int64(n)
-	if _, err := r.wbuf.Write(p[:n]); err != nil {
-		return n, err
-	}
-	return
-}
-
-func (r *scannerReader) ReadByte() (b byte, err error) {
-	b, err = r.rbuf.ReadByte()
-	if err == nil {
-		r.offset++
-		return b, r.wbuf.WriteByte(b)
-	}
-	return
-}
-
-func (r *scannerReader) Flush() error {
-	return r.wbuf.Flush()
-}
-
-// Seek seeks to a location. If the underlying reader is not an io.ReadSeeker,
-// then only whence=io.SeekCurrent is supported, any other operation fails.
-func (r *scannerReader) Seek(offset int64, whence int) (int64, error) {
-	var err error
-
-	if seeker, ok := r.reader.(io.ReadSeeker); !ok {
-		if whence != io.SeekCurrent || offset != 0 {
-			return -1, ErrSeekNotSupported
-		}
-	} else {
-		if whence == io.SeekCurrent && offset == 0 {
-			return r.offset, nil
-		}
-
-		r.offset, err = seeker.Seek(offset, whence)
-		r.rbuf.Reset(r.reader)
-	}
-
-	return r.offset, err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/encoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/encoder.go
deleted file mode 100644
index 59934ac06..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/encoder.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Package pktline implements reading payloads form pkt-lines and encoding
-// pkt-lines from payloads.
-package pktline
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/utils/trace"
-)
-
-// An Encoder writes pkt-lines to an output stream.
-type Encoder struct {
-	w io.Writer
-}
-
-const (
-	// MaxPayloadSize is the maximum payload size of a pkt-line in bytes.
-	MaxPayloadSize = 65516
-
-	// For compatibility with canonical Git implementation, accept longer pkt-lines
-	OversizePayloadMax = 65520
-)
-
-var (
-	// FlushPkt are the contents of a flush-pkt pkt-line.
-	FlushPkt = []byte{'0', '0', '0', '0'}
-	// Flush is the payload to use with the Encode method to encode a flush-pkt.
-	Flush = []byte{}
-	// FlushString is the payload to use with the EncodeString method to encode a flush-pkt.
-	FlushString = ""
-	// ErrPayloadTooLong is returned by the Encode methods when any of the
-	// provided payloads is bigger than MaxPayloadSize.
-	ErrPayloadTooLong = errors.New("payload is too long")
-)
-
-// NewEncoder returns a new encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	return &Encoder{
-		w: w,
-	}
-}
-
-// Flush encodes a flush-pkt to the output stream.
-func (e *Encoder) Flush() error {
-	defer trace.Packet.Print("packet: > 0000")
-	_, err := e.w.Write(FlushPkt)
-	return err
-}
-
-// Encode encodes a pkt-line with the payload specified and write it to
-// the output stream.  If several payloads are specified, each of them
-// will get streamed in their own pkt-lines.
-func (e *Encoder) Encode(payloads ...[]byte) error {
-	for _, p := range payloads {
-		if err := e.encodeLine(p); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (e *Encoder) encodeLine(p []byte) error {
-	if len(p) > MaxPayloadSize {
-		return ErrPayloadTooLong
-	}
-
-	if bytes.Equal(p, Flush) {
-		return e.Flush()
-	}
-
-	n := len(p) + 4
-	defer trace.Packet.Printf("packet: > %04x %s", n, p)
-	if _, err := e.w.Write(asciiHex16(n)); err != nil {
-		return err
-	}
-	_, err := e.w.Write(p)
-	return err
-}
-
-// Returns the hexadecimal ascii representation of the 16 less
-// significant bits of n.  The length of the returned slice will always
-// be 4.  Example: if n is 1234 (0x4d2), the return value will be
-// []byte{'0', '4', 'd', '2'}.
-func asciiHex16(n int) []byte {
-	var ret [4]byte
-	ret[0] = byteToASCIIHex(byte(n & 0xf000 >> 12))
-	ret[1] = byteToASCIIHex(byte(n & 0x0f00 >> 8))
-	ret[2] = byteToASCIIHex(byte(n & 0x00f0 >> 4))
-	ret[3] = byteToASCIIHex(byte(n & 0x000f))
-
-	return ret[:]
-}
-
-// turns a byte into its hexadecimal ascii representation.  Example:
-// from 11 (0xb) to 'b'.
-func byteToASCIIHex(n byte) byte {
-	if n < 10 {
-		return '0' + n
-	}
-
-	return 'a' - 10 + n
-}
-
-// EncodeString works similarly as Encode but payloads are specified as strings.
-func (e *Encoder) EncodeString(payloads ...string) error {
-	for _, p := range payloads {
-		if err := e.Encode([]byte(p)); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Encodef encodes a single pkt-line with the payload formatted as
-// the format specifier. The rest of the arguments will be used in
-// the format string.
-func (e *Encoder) Encodef(format string, a ...interface{}) error {
-	return e.EncodeString(
-		fmt.Sprintf(format, a...),
-	)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/error.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/error.go
deleted file mode 100644
index 2c0e5a72a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/error.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package pktline
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strings"
-)
-
-var (
-	// ErrInvalidErrorLine is returned by Decode when the packet line is not an
-	// error line.
-	ErrInvalidErrorLine = errors.New("expected an error-line")
-
-	errPrefix = []byte("ERR ")
-)
-
-// ErrorLine is a packet line that contains an error message.
-// Once this packet is sent by client or server, the data transfer process is
-// terminated.
-// See https://git-scm.com/docs/pack-protocol#_pkt_line_format
-type ErrorLine struct {
-	Text string
-}
-
-// Error implements the error interface.
-func (e *ErrorLine) Error() string {
-	return e.Text
-}
-
-// Encode encodes the ErrorLine into a packet line.
-func (e *ErrorLine) Encode(w io.Writer) error {
-	p := NewEncoder(w)
-	return p.Encodef("%s%s\n", string(errPrefix), e.Text)
-}
-
-// Decode decodes a packet line into an ErrorLine.
-func (e *ErrorLine) Decode(r io.Reader) error {
-	s := NewScanner(r)
-	if !s.Scan() {
-		return s.Err()
-	}
-
-	line := s.Bytes()
-	if !bytes.HasPrefix(line, errPrefix) {
-		return ErrInvalidErrorLine
-	}
-
-	e.Text = strings.TrimSpace(string(line[4:]))
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/scanner.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/scanner.go
deleted file mode 100644
index a88362b7b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/format/pktline/scanner.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package pktline
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/utils/trace"
-)
-
-const (
-	lenSize = 4
-)
-
-// ErrInvalidPktLen is returned by Err() when an invalid pkt-len is found.
-var ErrInvalidPktLen = errors.New("invalid pkt-len found")
-
-// Scanner provides a convenient interface for reading the payloads of a
-// series of pkt-lines.  It takes an io.Reader providing the source,
-// which then can be tokenized through repeated calls to the Scan
-// method.
-//
-// After each Scan call, the Bytes method will return the payload of the
-// corresponding pkt-line on a shared buffer, which will be 65516 bytes
-// or smaller.  Flush pkt-lines are represented by empty byte slices.
-//
-// Scanning stops at EOF or the first I/O error.
-type Scanner struct {
-	r       io.Reader     // The reader provided by the client
-	err     error         // Sticky error
-	payload []byte        // Last pkt-payload
-	len     [lenSize]byte // Last pkt-len
-}
-
-// NewScanner returns a new Scanner to read from r.
-func NewScanner(r io.Reader) *Scanner {
-	return &Scanner{
-		r: r,
-	}
-}
-
-// Err returns the first error encountered by the Scanner.
-func (s *Scanner) Err() error {
-	return s.err
-}
-
-// Scan advances the Scanner to the next pkt-line, whose payload will
-// then be available through the Bytes method.  Scanning stops at EOF
-// or the first I/O error.  After Scan returns false, the Err method
-// will return any error that occurred during scanning, except that if
-// it was io.EOF, Err will return nil.
-func (s *Scanner) Scan() bool {
-	var l int
-	l, s.err = s.readPayloadLen()
-	if s.err == io.EOF {
-		s.err = nil
-		return false
-	}
-	if s.err != nil {
-		return false
-	}
-
-	if cap(s.payload) < l {
-		s.payload = make([]byte, 0, l)
-	}
-
-	if _, s.err = io.ReadFull(s.r, s.payload[:l]); s.err != nil {
-		return false
-	}
-	s.payload = s.payload[:l]
-	trace.Packet.Printf("packet: < %04x %s", l, s.payload)
-
-	if bytes.HasPrefix(s.payload, errPrefix) {
-		s.err = &ErrorLine{
-			Text: strings.TrimSpace(string(s.payload[4:])),
-		}
-		return false
-	}
-
-	return true
-}
-
-// Bytes returns the most recent payload generated by a call to Scan.
-// The underlying array may point to data that will be overwritten by a
-// subsequent call to Scan. It does no allocation.
-func (s *Scanner) Bytes() []byte {
-	return s.payload
-}
-
-// Method readPayloadLen returns the payload length by reading the
-// pkt-len and subtracting the pkt-len size.
-func (s *Scanner) readPayloadLen() (int, error) {
-	if _, err := io.ReadFull(s.r, s.len[:]); err != nil {
-		if err == io.ErrUnexpectedEOF {
-			return 0, ErrInvalidPktLen
-		}
-
-		return 0, err
-	}
-
-	n, err := hexDecode(s.len)
-	if err != nil {
-		return 0, err
-	}
-
-	switch {
-	case n == 0:
-		return 0, nil
-	case n <= lenSize:
-		return 0, ErrInvalidPktLen
-	case n > OversizePayloadMax+lenSize:
-		return 0, ErrInvalidPktLen
-	default:
-		return n - lenSize, nil
-	}
-}
-
-// Turns the hexadecimal representation of a number in a byte slice into
-// a number. This function substitute strconv.ParseUint(string(buf), 16,
-// 16) and/or hex.Decode, to avoid generating new strings, thus helping the
-// GC.
-func hexDecode(buf [lenSize]byte) (int, error) {
-	var ret int
-	for i := 0; i < lenSize; i++ {
-		n, err := asciiHexToByte(buf[i])
-		if err != nil {
-			return 0, ErrInvalidPktLen
-		}
-		ret = 16*ret + int(n)
-	}
-	return ret, nil
-}
-
-// turns the hexadecimal ascii representation of a byte into its
-// numerical value.  Example: from 'b' to 11 (0xb).
-func asciiHexToByte(b byte) (byte, error) {
-	switch {
-	case b >= '0' && b <= '9':
-		return b - '0', nil
-	case b >= 'a' && b <= 'f':
-		return b - 'a' + 10, nil
-	case b >= 'A' && b <= 'F':
-		return b - 'A' + 10, nil
-	default:
-		return 0, ErrInvalidPktLen
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash.go
deleted file mode 100644
index 0532cec93..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package plumbing
-
-import (
-	"bytes"
-	"encoding/hex"
-	"sort"
-	"strconv"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-)
-
-// Hash SHA1 hashed content
-type Hash [hash.Size]byte
-
-// ZeroHash is Hash with value zero
-var ZeroHash Hash
-
-// ComputeHash compute the hash for a given ObjectType and content
-func ComputeHash(t ObjectType, content []byte) Hash {
-	h := NewHasher(t, int64(len(content)))
-	h.Write(content)
-	return h.Sum()
-}
-
-// NewHash return a new Hash from a hexadecimal hash representation
-func NewHash(s string) Hash {
-	b, _ := hex.DecodeString(s)
-
-	var h Hash
-	copy(h[:], b)
-
-	return h
-}
-
-func (h Hash) IsZero() bool {
-	var empty Hash
-	return h == empty
-}
-
-func (h Hash) String() string {
-	return hex.EncodeToString(h[:])
-}
-
-type Hasher struct {
-	hash.Hash
-}
-
-func NewHasher(t ObjectType, size int64) Hasher {
-	h := Hasher{hash.New(hash.CryptoType)}
-	h.Write(t.Bytes())
-	h.Write([]byte(" "))
-	h.Write([]byte(strconv.FormatInt(size, 10)))
-	h.Write([]byte{0})
-	return h
-}
-
-func (h Hasher) Sum() (hash Hash) {
-	copy(hash[:], h.Hash.Sum(nil))
-	return
-}
-
-// HashesSort sorts a slice of Hashes in increasing order.
-func HashesSort(a []Hash) {
-	sort.Sort(HashSlice(a))
-}
-
-// HashSlice attaches the methods of sort.Interface to []Hash, sorting in
-// increasing order.
-type HashSlice []Hash
-
-func (p HashSlice) Len() int           { return len(p) }
-func (p HashSlice) Less(i, j int) bool { return bytes.Compare(p[i][:], p[j][:]) < 0 }
-func (p HashSlice) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-
-// IsHash returns true if the given string is a valid hash.
-func IsHash(s string) bool {
-	switch len(s) {
-	case hash.HexSize:
-		_, err := hex.DecodeString(s)
-		return err == nil
-	default:
-		return false
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash.go
deleted file mode 100644
index 8609848f6..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// package hash provides a way for managing the
-// underlying hash implementations used across go-git.
-package hash
-
-import (
-	"crypto"
-	"fmt"
-	"hash"
-
-	"github.com/pjbgf/sha1cd"
-)
-
-// algos is a map of hash algorithms.
-var algos = map[crypto.Hash]func() hash.Hash{}
-
-func init() {
-	reset()
-}
-
-// reset resets the default algos value. Can be used after running tests
-// that registers new algorithms to avoid side effects.
-func reset() {
-	algos[crypto.SHA1] = sha1cd.New
-	algos[crypto.SHA256] = crypto.SHA256.New
-}
-
-// RegisterHash allows for the hash algorithm used to be overridden.
-// This ensures the hash selection for go-git must be explicit, when
-// overriding the default value.
-func RegisterHash(h crypto.Hash, f func() hash.Hash) error {
-	if f == nil {
-		return fmt.Errorf("cannot register hash: f is nil")
-	}
-
-	switch h {
-	case crypto.SHA1:
-		algos[h] = f
-	case crypto.SHA256:
-		algos[h] = f
-	default:
-		return fmt.Errorf("unsupported hash function: %v", h)
-	}
-	return nil
-}
-
-// Hash is the same as hash.Hash. This allows consumers
-// to not having to import this package alongside "hash".
-type Hash interface {
-	hash.Hash
-}
-
-// New returns a new Hash for the given hash function.
-// It panics if the hash function is not registered.
-func New(h crypto.Hash) Hash {
-	hh, ok := algos[h]
-	if !ok {
-		panic(fmt.Sprintf("hash algorithm not registered: %v", h))
-	}
-	return hh()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash_sha1.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash_sha1.go
deleted file mode 100644
index e3cb60fec..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash_sha1.go
+++ /dev/null
@@ -1,15 +0,0 @@
-//go:build !sha256
-// +build !sha256
-
-package hash
-
-import "crypto"
-
-const (
-	// CryptoType defines what hash algorithm is being used.
-	CryptoType = crypto.SHA1
-	// Size defines the amount of bytes the hash yields.
-	Size = 20
-	// HexSize defines the strings size of the hash when represented in hexadecimal.
-	HexSize = 40
-)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash_sha256.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash_sha256.go
deleted file mode 100644
index 1c52b8975..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/hash/hash_sha256.go
+++ /dev/null
@@ -1,15 +0,0 @@
-//go:build sha256
-// +build sha256
-
-package hash
-
-import "crypto"
-
-const (
-	// CryptoType defines what hash algorithm is being used.
-	CryptoType = crypto.SHA256
-	// Size defines the amount of bytes the hash yields.
-	Size = 32
-	// HexSize defines the strings size of the hash when represented in hexadecimal.
-	HexSize = 64
-)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/memory.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/memory.go
deleted file mode 100644
index 6d11271dd..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/memory.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package plumbing
-
-import (
-	"bytes"
-	"io"
-)
-
-// MemoryObject on memory Object implementation
-type MemoryObject struct {
-	t    ObjectType
-	h    Hash
-	cont []byte
-	sz   int64
-}
-
-// Hash returns the object Hash, the hash is calculated on-the-fly the first
-// time it's called, in all subsequent calls the same Hash is returned even
-// if the type or the content have changed. The Hash is only generated if the
-// size of the content is exactly the object size.
-func (o *MemoryObject) Hash() Hash {
-	if o.h == ZeroHash && int64(len(o.cont)) == o.sz {
-		o.h = ComputeHash(o.t, o.cont)
-	}
-
-	return o.h
-}
-
-// Type returns the ObjectType
-func (o *MemoryObject) Type() ObjectType { return o.t }
-
-// SetType sets the ObjectType
-func (o *MemoryObject) SetType(t ObjectType) { o.t = t }
-
-// Size returns the size of the object
-func (o *MemoryObject) Size() int64 { return o.sz }
-
-// SetSize set the object size, a content of the given size should be written
-// afterwards
-func (o *MemoryObject) SetSize(s int64) { o.sz = s }
-
-// Reader returns an io.ReadCloser used to read the object's content.
-//
-// For a MemoryObject, this reader is seekable.
-func (o *MemoryObject) Reader() (io.ReadCloser, error) {
-	return nopCloser{bytes.NewReader(o.cont)}, nil
-}
-
-// Writer returns a ObjectWriter used to write the object's content.
-func (o *MemoryObject) Writer() (io.WriteCloser, error) {
-	return o, nil
-}
-
-func (o *MemoryObject) Write(p []byte) (n int, err error) {
-	o.cont = append(o.cont, p...)
-	o.sz = int64(len(o.cont))
-
-	return len(p), nil
-}
-
-// Close releases any resources consumed by the object when it is acting as a
-// ObjectWriter.
-func (o *MemoryObject) Close() error { return nil }
-
-// nopCloser exposes the extra methods of bytes.Reader while nopping Close().
-//
-// This allows clients to attempt seeking in a cached Blob's Reader.
-type nopCloser struct {
-	*bytes.Reader
-}
-
-// Close does nothing.
-func (nc nopCloser) Close() error { return nil }
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object.go
deleted file mode 100644
index 3ee9de9f3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// package plumbing implement the core interfaces and structs used by go-git
-package plumbing
-
-import (
-	"errors"
-	"io"
-)
-
-var (
-	ErrObjectNotFound = errors.New("object not found")
-	// ErrInvalidType is returned when an invalid object type is provided.
-	ErrInvalidType = errors.New("invalid object type")
-)
-
-// Object is a generic representation of any git object
-type EncodedObject interface {
-	Hash() Hash
-	Type() ObjectType
-	SetType(ObjectType)
-	Size() int64
-	SetSize(int64)
-	Reader() (io.ReadCloser, error)
-	Writer() (io.WriteCloser, error)
-}
-
-// DeltaObject is an EncodedObject representing a delta.
-type DeltaObject interface {
-	EncodedObject
-	// BaseHash returns the hash of the object used as base for this delta.
-	BaseHash() Hash
-	// ActualHash returns the hash of the object after applying the delta.
-	ActualHash() Hash
-	// Size returns the size of the object after applying the delta.
-	ActualSize() int64
-}
-
-// ObjectType internal object type
-// Integer values from 0 to 7 map to those exposed by git.
-// AnyObject is used to represent any from 0 to 7.
-type ObjectType int8
-
-const (
-	InvalidObject ObjectType = 0
-	CommitObject  ObjectType = 1
-	TreeObject    ObjectType = 2
-	BlobObject    ObjectType = 3
-	TagObject     ObjectType = 4
-	// 5 reserved for future expansion
-	OFSDeltaObject ObjectType = 6
-	REFDeltaObject ObjectType = 7
-
-	AnyObject ObjectType = -127
-)
-
-func (t ObjectType) String() string {
-	switch t {
-	case CommitObject:
-		return "commit"
-	case TreeObject:
-		return "tree"
-	case BlobObject:
-		return "blob"
-	case TagObject:
-		return "tag"
-	case OFSDeltaObject:
-		return "ofs-delta"
-	case REFDeltaObject:
-		return "ref-delta"
-	case AnyObject:
-		return "any"
-	default:
-		return "unknown"
-	}
-}
-
-func (t ObjectType) Bytes() []byte {
-	return []byte(t.String())
-}
-
-// Valid returns true if t is a valid ObjectType.
-func (t ObjectType) Valid() bool {
-	return t >= CommitObject && t <= REFDeltaObject
-}
-
-// IsDelta returns true for any ObjectType that represents a delta (i.e.
-// REFDeltaObject or OFSDeltaObject).
-func (t ObjectType) IsDelta() bool {
-	return t == REFDeltaObject || t == OFSDeltaObject
-}
-
-// ParseObjectType parses a string representation of ObjectType. It returns an
-// error on parse failure.
-func ParseObjectType(value string) (typ ObjectType, err error) {
-	switch value {
-	case "commit":
-		typ = CommitObject
-	case "tree":
-		typ = TreeObject
-	case "blob":
-		typ = BlobObject
-	case "tag":
-		typ = TagObject
-	case "ofs-delta":
-		typ = OFSDeltaObject
-	case "ref-delta":
-		typ = REFDeltaObject
-	default:
-		err = ErrInvalidType
-	}
-	return
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/blob.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/blob.go
deleted file mode 100644
index 7bce28e80..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/blob.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package object
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// Blob is used to store arbitrary data - it is generally a file.
-type Blob struct {
-	// Hash of the blob.
-	Hash plumbing.Hash
-	// Size of the (uncompressed) blob.
-	Size int64
-
-	obj plumbing.EncodedObject
-}
-
-// GetBlob gets a blob from an object storer and decodes it.
-func GetBlob(s storer.EncodedObjectStorer, h plumbing.Hash) (*Blob, error) {
-	o, err := s.EncodedObject(plumbing.BlobObject, h)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeBlob(o)
-}
-
-// DecodeObject decodes an encoded object into a *Blob.
-func DecodeBlob(o plumbing.EncodedObject) (*Blob, error) {
-	b := &Blob{}
-	if err := b.Decode(o); err != nil {
-		return nil, err
-	}
-
-	return b, nil
-}
-
-// ID returns the object ID of the blob. The returned value will always match
-// the current value of Blob.Hash.
-//
-// ID is present to fulfill the Object interface.
-func (b *Blob) ID() plumbing.Hash {
-	return b.Hash
-}
-
-// Type returns the type of object. It always returns plumbing.BlobObject.
-//
-// Type is present to fulfill the Object interface.
-func (b *Blob) Type() plumbing.ObjectType {
-	return plumbing.BlobObject
-}
-
-// Decode transforms a plumbing.EncodedObject into a Blob struct.
-func (b *Blob) Decode(o plumbing.EncodedObject) error {
-	if o.Type() != plumbing.BlobObject {
-		return ErrUnsupportedObject
-	}
-
-	b.Hash = o.Hash()
-	b.Size = o.Size()
-	b.obj = o
-
-	return nil
-}
-
-// Encode transforms a Blob into a plumbing.EncodedObject.
-func (b *Blob) Encode(o plumbing.EncodedObject) (err error) {
-	o.SetType(plumbing.BlobObject)
-
-	w, err := o.Writer()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	r, err := b.Reader()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(r, &err)
-
-	_, err = io.Copy(w, r)
-	return err
-}
-
-// Reader returns a reader allow the access to the content of the blob
-func (b *Blob) Reader() (io.ReadCloser, error) {
-	return b.obj.Reader()
-}
-
-// BlobIter provides an iterator for a set of blobs.
-type BlobIter struct {
-	storer.EncodedObjectIter
-	s storer.EncodedObjectStorer
-}
-
-// NewBlobIter takes a storer.EncodedObjectStorer and a
-// storer.EncodedObjectIter and returns a *BlobIter that iterates over all
-// blobs contained in the storer.EncodedObjectIter.
-//
-// Any non-blob object returned by the storer.EncodedObjectIter is skipped.
-func NewBlobIter(s storer.EncodedObjectStorer, iter storer.EncodedObjectIter) *BlobIter {
-	return &BlobIter{iter, s}
-}
-
-// Next moves the iterator to the next blob and returns a pointer to it. If
-// there are no more blobs, it returns io.EOF.
-func (iter *BlobIter) Next() (*Blob, error) {
-	for {
-		obj, err := iter.EncodedObjectIter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if obj.Type() != plumbing.BlobObject {
-			continue
-		}
-
-		return DecodeBlob(obj)
-	}
-}
-
-// ForEach call the cb function for each blob contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *BlobIter) ForEach(cb func(*Blob) error) error {
-	return iter.EncodedObjectIter.ForEach(func(obj plumbing.EncodedObject) error {
-		if obj.Type() != plumbing.BlobObject {
-			return nil
-		}
-
-		b, err := DecodeBlob(obj)
-		if err != nil {
-			return err
-		}
-
-		return cb(b)
-	})
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/change.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/change.go
deleted file mode 100644
index 5d33eda12..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/change.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package object
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie"
-)
-
-// Change values represent a detected change between two git trees.  For
-// modifications, From is the original status of the node and To is its
-// final status.  For insertions, From is the zero value and for
-// deletions To is the zero value.
-type Change struct {
-	From ChangeEntry
-	To   ChangeEntry
-}
-
-var empty ChangeEntry
-
-// Action returns the kind of action represented by the change, an
-// insertion, a deletion or a modification.
-func (c *Change) Action() (merkletrie.Action, error) {
-	if c.From == empty && c.To == empty {
-		return merkletrie.Action(0),
-			fmt.Errorf("malformed change: empty from and to")
-	}
-
-	if c.From == empty {
-		return merkletrie.Insert, nil
-	}
-
-	if c.To == empty {
-		return merkletrie.Delete, nil
-	}
-
-	return merkletrie.Modify, nil
-}
-
-// Files returns the files before and after a change.
-// For insertions from will be nil. For deletions to will be nil.
-func (c *Change) Files() (from, to *File, err error) {
-	action, err := c.Action()
-	if err != nil {
-		return
-	}
-
-	if action == merkletrie.Insert || action == merkletrie.Modify {
-		to, err = c.To.Tree.TreeEntryFile(&c.To.TreeEntry)
-		if !c.To.TreeEntry.Mode.IsFile() {
-			return nil, nil, nil
-		}
-
-		if err != nil {
-			return
-		}
-	}
-
-	if action == merkletrie.Delete || action == merkletrie.Modify {
-		from, err = c.From.Tree.TreeEntryFile(&c.From.TreeEntry)
-		if !c.From.TreeEntry.Mode.IsFile() {
-			return nil, nil, nil
-		}
-
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-func (c *Change) String() string {
-	action, err := c.Action()
-	if err != nil {
-		return "malformed change"
-	}
-
-	return fmt.Sprintf("", action, c.name())
-}
-
-// Patch returns a Patch with all the file changes in chunks. This
-// representation can be used to create several diff outputs.
-func (c *Change) Patch() (*Patch, error) {
-	return c.PatchContext(context.Background())
-}
-
-// Patch returns a Patch with all the file changes in chunks. This
-// representation can be used to create several diff outputs.
-// If context expires, an non-nil error will be returned
-// Provided context must be non-nil
-func (c *Change) PatchContext(ctx context.Context) (*Patch, error) {
-	return getPatchContext(ctx, "", c)
-}
-
-func (c *Change) name() string {
-	if c.From != empty {
-		return c.From.Name
-	}
-
-	return c.To.Name
-}
-
-// ChangeEntry values represent a node that has suffered a change.
-type ChangeEntry struct {
-	// Full path of the node using "/" as separator.
-	Name string
-	// Parent tree of the node that has changed.
-	Tree *Tree
-	// The entry of the node.
-	TreeEntry TreeEntry
-}
-
-// Changes represents a collection of changes between two git trees.
-// Implements sort.Interface lexicographically over the path of the
-// changed files.
-type Changes []*Change
-
-func (c Changes) Len() int {
-	return len(c)
-}
-
-func (c Changes) Swap(i, j int) {
-	c[i], c[j] = c[j], c[i]
-}
-
-func (c Changes) Less(i, j int) bool {
-	return strings.Compare(c[i].name(), c[j].name()) < 0
-}
-
-func (c Changes) String() string {
-	var buffer bytes.Buffer
-	buffer.WriteString("[")
-	comma := ""
-	for _, v := range c {
-		buffer.WriteString(comma)
-		buffer.WriteString(v.String())
-		comma = ", "
-	}
-	buffer.WriteString("]")
-
-	return buffer.String()
-}
-
-// Patch returns a Patch with all the changes in chunks. This
-// representation can be used to create several diff outputs.
-func (c Changes) Patch() (*Patch, error) {
-	return c.PatchContext(context.Background())
-}
-
-// Patch returns a Patch with all the changes in chunks. This
-// representation can be used to create several diff outputs.
-// If context expires, an non-nil error will be returned
-// Provided context must be non-nil
-func (c Changes) PatchContext(ctx context.Context) (*Patch, error) {
-	return getPatchContext(ctx, "", c...)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/change_adaptor.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/change_adaptor.go
deleted file mode 100644
index c47894994..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/change_adaptor.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package object
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// The following functions transform changes types form the merkletrie
-// package to changes types from this package.
-
-func newChange(c merkletrie.Change) (*Change, error) {
-	ret := &Change{}
-
-	var err error
-	if ret.From, err = newChangeEntry(c.From); err != nil {
-		return nil, fmt.Errorf("from field: %s", err)
-	}
-
-	if ret.To, err = newChangeEntry(c.To); err != nil {
-		return nil, fmt.Errorf("to field: %s", err)
-	}
-
-	return ret, nil
-}
-
-func newChangeEntry(p noder.Path) (ChangeEntry, error) {
-	if p == nil {
-		return empty, nil
-	}
-
-	asTreeNoder, ok := p.Last().(*treeNoder)
-	if !ok {
-		return ChangeEntry{}, errors.New("cannot transform non-TreeNoders")
-	}
-
-	return ChangeEntry{
-		Name: p.String(),
-		Tree: asTreeNoder.parent,
-		TreeEntry: TreeEntry{
-			Name: asTreeNoder.name,
-			Mode: asTreeNoder.mode,
-			Hash: asTreeNoder.hash,
-		},
-	}, nil
-}
-
-func newChanges(src merkletrie.Changes) (Changes, error) {
-	ret := make(Changes, len(src))
-	var err error
-	for i, e := range src {
-		ret[i], err = newChange(e)
-		if err != nil {
-			return nil, fmt.Errorf("change #%d: %s", i, err)
-		}
-	}
-
-	return ret, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit.go
deleted file mode 100644
index f6392c99a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit.go
+++ /dev/null
@@ -1,507 +0,0 @@
-package object
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-const (
-	beginpgp       string = "-----BEGIN PGP SIGNATURE-----"
-	endpgp         string = "-----END PGP SIGNATURE-----"
-	headerpgp      string = "gpgsig"
-	headerencoding string = "encoding"
-
-	// https://github.com/git/git/blob/bcb6cae2966cc407ca1afc77413b3ef11103c175/Documentation/gitformat-signature.txt#L153
-	// When a merge commit is created from a signed tag, the tag is embedded in
-	// the commit with the "mergetag" header.
-	headermergetag string = "mergetag"
-
-	defaultUtf8CommitMessageEncoding MessageEncoding = "UTF-8"
-)
-
-// Hash represents the hash of an object
-type Hash plumbing.Hash
-
-// MessageEncoding represents the encoding of a commit
-type MessageEncoding string
-
-// Commit points to a single tree, marking it as what the project looked like
-// at a certain point in time. It contains meta-information about that point
-// in time, such as a timestamp, the author of the changes since the last
-// commit, a pointer to the previous commit(s), etc.
-// http://shafiulazam.com/gitbook/1_the_git_object_model.html
-type Commit struct {
-	// Hash of the commit object.
-	Hash plumbing.Hash
-	// Author is the original author of the commit.
-	Author Signature
-	// Committer is the one performing the commit, might be different from
-	// Author.
-	Committer Signature
-	// MergeTag is the embedded tag object when a merge commit is created by
-	// merging a signed tag.
-	MergeTag string
-	// PGPSignature is the PGP signature of the commit.
-	PGPSignature string
-	// Message is the commit message, contains arbitrary text.
-	Message string
-	// TreeHash is the hash of the root tree of the commit.
-	TreeHash plumbing.Hash
-	// ParentHashes are the hashes of the parent commits of the commit.
-	ParentHashes []plumbing.Hash
-	// Encoding is the encoding of the commit.
-	Encoding MessageEncoding
-
-	s storer.EncodedObjectStorer
-}
-
-// GetCommit gets a commit from an object storer and decodes it.
-func GetCommit(s storer.EncodedObjectStorer, h plumbing.Hash) (*Commit, error) {
-	o, err := s.EncodedObject(plumbing.CommitObject, h)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeCommit(s, o)
-}
-
-// DecodeCommit decodes an encoded object into a *Commit and associates it to
-// the given object storer.
-func DecodeCommit(s storer.EncodedObjectStorer, o plumbing.EncodedObject) (*Commit, error) {
-	c := &Commit{s: s}
-	if err := c.Decode(o); err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-// Tree returns the Tree from the commit.
-func (c *Commit) Tree() (*Tree, error) {
-	return GetTree(c.s, c.TreeHash)
-}
-
-// PatchContext returns the Patch between the actual commit and the provided one.
-// Error will be return if context expires. Provided context must be non-nil.
-//
-// NOTE: Since version 5.1.0 the renames are correctly handled, the settings
-// used are the recommended options DefaultDiffTreeOptions.
-func (c *Commit) PatchContext(ctx context.Context, to *Commit) (*Patch, error) {
-	fromTree, err := c.Tree()
-	if err != nil {
-		return nil, err
-	}
-
-	var toTree *Tree
-	if to != nil {
-		toTree, err = to.Tree()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return fromTree.PatchContext(ctx, toTree)
-}
-
-// Patch returns the Patch between the actual commit and the provided one.
-//
-// NOTE: Since version 5.1.0 the renames are correctly handled, the settings
-// used are the recommended options DefaultDiffTreeOptions.
-func (c *Commit) Patch(to *Commit) (*Patch, error) {
-	return c.PatchContext(context.Background(), to)
-}
-
-// Parents return a CommitIter to the parent Commits.
-func (c *Commit) Parents() CommitIter {
-	return NewCommitIter(c.s,
-		storer.NewEncodedObjectLookupIter(c.s, plumbing.CommitObject, c.ParentHashes),
-	)
-}
-
-// NumParents returns the number of parents in a commit.
-func (c *Commit) NumParents() int {
-	return len(c.ParentHashes)
-}
-
-var ErrParentNotFound = errors.New("commit parent not found")
-
-// Parent returns the ith parent of a commit.
-func (c *Commit) Parent(i int) (*Commit, error) {
-	if len(c.ParentHashes) == 0 || i > len(c.ParentHashes)-1 {
-		return nil, ErrParentNotFound
-	}
-
-	return GetCommit(c.s, c.ParentHashes[i])
-}
-
-// File returns the file with the specified "path" in the commit and a
-// nil error if the file exists. If the file does not exist, it returns
-// a nil file and the ErrFileNotFound error.
-func (c *Commit) File(path string) (*File, error) {
-	tree, err := c.Tree()
-	if err != nil {
-		return nil, err
-	}
-
-	return tree.File(path)
-}
-
-// Files returns a FileIter allowing to iterate over the Tree
-func (c *Commit) Files() (*FileIter, error) {
-	tree, err := c.Tree()
-	if err != nil {
-		return nil, err
-	}
-
-	return tree.Files(), nil
-}
-
-// ID returns the object ID of the commit. The returned value will always match
-// the current value of Commit.Hash.
-//
-// ID is present to fulfill the Object interface.
-func (c *Commit) ID() plumbing.Hash {
-	return c.Hash
-}
-
-// Type returns the type of object. It always returns plumbing.CommitObject.
-//
-// Type is present to fulfill the Object interface.
-func (c *Commit) Type() plumbing.ObjectType {
-	return plumbing.CommitObject
-}
-
-// Decode transforms a plumbing.EncodedObject into a Commit struct.
-func (c *Commit) Decode(o plumbing.EncodedObject) (err error) {
-	if o.Type() != plumbing.CommitObject {
-		return ErrUnsupportedObject
-	}
-
-	c.Hash = o.Hash()
-	c.Encoding = defaultUtf8CommitMessageEncoding
-
-	reader, err := o.Reader()
-	if err != nil {
-		return err
-	}
-	defer ioutil.CheckClose(reader, &err)
-
-	r := sync.GetBufioReader(reader)
-	defer sync.PutBufioReader(r)
-
-	var message bool
-	var mergetag bool
-	var pgpsig bool
-	var msgbuf bytes.Buffer
-	for {
-		line, err := r.ReadBytes('\n')
-		if err != nil && err != io.EOF {
-			return err
-		}
-
-		if mergetag {
-			if len(line) > 0 && line[0] == ' ' {
-				line = bytes.TrimLeft(line, " ")
-				c.MergeTag += string(line)
-				continue
-			} else {
-				mergetag = false
-			}
-		}
-
-		if pgpsig {
-			if len(line) > 0 && line[0] == ' ' {
-				line = bytes.TrimLeft(line, " ")
-				c.PGPSignature += string(line)
-				continue
-			} else {
-				pgpsig = false
-			}
-		}
-
-		if !message {
-			line = bytes.TrimSpace(line)
-			if len(line) == 0 {
-				message = true
-				continue
-			}
-
-			split := bytes.SplitN(line, []byte{' '}, 2)
-
-			var data []byte
-			if len(split) == 2 {
-				data = split[1]
-			}
-
-			switch string(split[0]) {
-			case "tree":
-				c.TreeHash = plumbing.NewHash(string(data))
-			case "parent":
-				c.ParentHashes = append(c.ParentHashes, plumbing.NewHash(string(data)))
-			case "author":
-				c.Author.Decode(data)
-			case "committer":
-				c.Committer.Decode(data)
-			case headermergetag:
-				c.MergeTag += string(data) + "\n"
-				mergetag = true
-			case headerencoding:
-				c.Encoding = MessageEncoding(data)
-			case headerpgp:
-				c.PGPSignature += string(data) + "\n"
-				pgpsig = true
-			}
-		} else {
-			msgbuf.Write(line)
-		}
-
-		if err == io.EOF {
-			break
-		}
-	}
-	c.Message = msgbuf.String()
-	return nil
-}
-
-// Encode transforms a Commit into a plumbing.EncodedObject.
-func (c *Commit) Encode(o plumbing.EncodedObject) error {
-	return c.encode(o, true)
-}
-
-// EncodeWithoutSignature export a Commit into a plumbing.EncodedObject without the signature (correspond to the payload of the PGP signature).
-func (c *Commit) EncodeWithoutSignature(o plumbing.EncodedObject) error {
-	return c.encode(o, false)
-}
-
-func (c *Commit) encode(o plumbing.EncodedObject, includeSig bool) (err error) {
-	o.SetType(plumbing.CommitObject)
-	w, err := o.Writer()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	if _, err = fmt.Fprintf(w, "tree %s\n", c.TreeHash.String()); err != nil {
-		return err
-	}
-
-	for _, parent := range c.ParentHashes {
-		if _, err = fmt.Fprintf(w, "parent %s\n", parent.String()); err != nil {
-			return err
-		}
-	}
-
-	if _, err = fmt.Fprint(w, "author "); err != nil {
-		return err
-	}
-
-	if err = c.Author.Encode(w); err != nil {
-		return err
-	}
-
-	if _, err = fmt.Fprint(w, "\ncommitter "); err != nil {
-		return err
-	}
-
-	if err = c.Committer.Encode(w); err != nil {
-		return err
-	}
-
-	if c.MergeTag != "" {
-		if _, err = fmt.Fprint(w, "\n"+headermergetag+" "); err != nil {
-			return err
-		}
-
-		// Split tag information lines and re-write with a left padding and
-		// newline. Use join for this so it's clear that a newline should not be
-		// added after this section. The newline will be added either as part of
-		// the PGP signature or the commit message.
-		mergetag := strings.TrimSuffix(c.MergeTag, "\n")
-		lines := strings.Split(mergetag, "\n")
-		if _, err = fmt.Fprint(w, strings.Join(lines, "\n ")); err != nil {
-			return err
-		}
-	}
-
-	if string(c.Encoding) != "" && c.Encoding != defaultUtf8CommitMessageEncoding {
-		if _, err = fmt.Fprintf(w, "\n%s %s", headerencoding, c.Encoding); err != nil {
-			return err
-		}
-	}
-
-	if c.PGPSignature != "" && includeSig {
-		if _, err = fmt.Fprint(w, "\n"+headerpgp+" "); err != nil {
-			return err
-		}
-
-		// Split all the signature lines and re-write with a left padding and
-		// newline. Use join for this so it's clear that a newline should not be
-		// added after this section, as it will be added when the message is
-		// printed.
-		signature := strings.TrimSuffix(c.PGPSignature, "\n")
-		lines := strings.Split(signature, "\n")
-		if _, err = fmt.Fprint(w, strings.Join(lines, "\n ")); err != nil {
-			return err
-		}
-	}
-
-	if _, err = fmt.Fprintf(w, "\n\n%s", c.Message); err != nil {
-		return err
-	}
-
-	return err
-}
-
-// Stats returns the stats of a commit.
-func (c *Commit) Stats() (FileStats, error) {
-	return c.StatsContext(context.Background())
-}
-
-// StatsContext returns the stats of a commit. Error will be return if context
-// expires. Provided context must be non-nil.
-func (c *Commit) StatsContext(ctx context.Context) (FileStats, error) {
-	fromTree, err := c.Tree()
-	if err != nil {
-		return nil, err
-	}
-
-	toTree := &Tree{}
-	if c.NumParents() != 0 {
-		firstParent, err := c.Parents().Next()
-		if err != nil {
-			return nil, err
-		}
-
-		toTree, err = firstParent.Tree()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	patch, err := toTree.PatchContext(ctx, fromTree)
-	if err != nil {
-		return nil, err
-	}
-
-	return getFileStatsFromFilePatches(patch.FilePatches()), nil
-}
-
-func (c *Commit) String() string {
-	return fmt.Sprintf(
-		"%s %s\nAuthor: %s\nDate:   %s\n\n%s\n",
-		plumbing.CommitObject, c.Hash, c.Author.String(),
-		c.Author.When.Format(DateFormat), indent(c.Message),
-	)
-}
-
-// Verify performs PGP verification of the commit with a provided armored
-// keyring and returns openpgp.Entity associated with verifying key on success.
-func (c *Commit) Verify(armoredKeyRing string) (*openpgp.Entity, error) {
-	keyRingReader := strings.NewReader(armoredKeyRing)
-	keyring, err := openpgp.ReadArmoredKeyRing(keyRingReader)
-	if err != nil {
-		return nil, err
-	}
-
-	// Extract signature.
-	signature := strings.NewReader(c.PGPSignature)
-
-	encoded := &plumbing.MemoryObject{}
-	// Encode commit components, excluding signature and get a reader object.
-	if err := c.EncodeWithoutSignature(encoded); err != nil {
-		return nil, err
-	}
-	er, err := encoded.Reader()
-	if err != nil {
-		return nil, err
-	}
-
-	return openpgp.CheckArmoredDetachedSignature(keyring, er, signature, nil)
-}
-
-// Less defines a compare function to determine which commit is 'earlier' by:
-// - First use Committer.When
-// - If Committer.When are equal then use Author.When
-// - If Author.When also equal then compare the string value of the hash
-func (c *Commit) Less(rhs *Commit) bool {
-	return c.Committer.When.Before(rhs.Committer.When) ||
-		(c.Committer.When.Equal(rhs.Committer.When) &&
-			(c.Author.When.Before(rhs.Author.When) ||
-				(c.Author.When.Equal(rhs.Author.When) && bytes.Compare(c.Hash[:], rhs.Hash[:]) < 0)))
-}
-
-func indent(t string) string {
-	var output []string
-	for _, line := range strings.Split(t, "\n") {
-		if len(line) != 0 {
-			line = "    " + line
-		}
-
-		output = append(output, line)
-	}
-
-	return strings.Join(output, "\n")
-}
-
-// CommitIter is a generic closable interface for iterating over commits.
-type CommitIter interface {
-	Next() (*Commit, error)
-	ForEach(func(*Commit) error) error
-	Close()
-}
-
-// storerCommitIter provides an iterator from commits in an EncodedObjectStorer.
-type storerCommitIter struct {
-	storer.EncodedObjectIter
-	s storer.EncodedObjectStorer
-}
-
-// NewCommitIter takes a storer.EncodedObjectStorer and a
-// storer.EncodedObjectIter and returns a CommitIter that iterates over all
-// commits contained in the storer.EncodedObjectIter.
-//
-// Any non-commit object returned by the storer.EncodedObjectIter is skipped.
-func NewCommitIter(s storer.EncodedObjectStorer, iter storer.EncodedObjectIter) CommitIter {
-	return &storerCommitIter{iter, s}
-}
-
-// Next moves the iterator to the next commit and returns a pointer to it. If
-// there are no more commits, it returns io.EOF.
-func (iter *storerCommitIter) Next() (*Commit, error) {
-	obj, err := iter.EncodedObjectIter.Next()
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeCommit(iter.s, obj)
-}
-
-// ForEach call the cb function for each commit contained on this iter until
-// an error appends or the end of the iter is reached. If ErrStop is sent
-// the iteration is stopped but no error is returned. The iterator is closed.
-func (iter *storerCommitIter) ForEach(cb func(*Commit) error) error {
-	return iter.EncodedObjectIter.ForEach(func(obj plumbing.EncodedObject) error {
-		c, err := DecodeCommit(iter.s, obj)
-		if err != nil {
-			return err
-		}
-
-		return cb(c)
-	})
-}
-
-func (iter *storerCommitIter) Close() {
-	iter.EncodedObjectIter.Close()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker.go
deleted file mode 100644
index 60da75cad..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker.go
+++ /dev/null
@@ -1,327 +0,0 @@
-package object
-
-import (
-	"container/list"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/storage"
-)
-
-type commitPreIterator struct {
-	seenExternal map[plumbing.Hash]bool
-	seen         map[plumbing.Hash]bool
-	stack        []CommitIter
-	start        *Commit
-}
-
-// NewCommitPreorderIter returns a CommitIter that walks the commit history,
-// starting at the given commit and visiting its parents in pre-order.
-// The given callback will be called for each visited commit. Each commit will
-// be visited only once. If the callback returns an error, walking will stop
-// and will return the error. Other errors might be returned if the history
-// cannot be traversed (e.g. missing objects). Ignore allows to skip some
-// commits from being iterated.
-func NewCommitPreorderIter(
-	c *Commit,
-	seenExternal map[plumbing.Hash]bool,
-	ignore []plumbing.Hash,
-) CommitIter {
-	seen := make(map[plumbing.Hash]bool)
-	for _, h := range ignore {
-		seen[h] = true
-	}
-
-	return &commitPreIterator{
-		seenExternal: seenExternal,
-		seen:         seen,
-		stack:        make([]CommitIter, 0),
-		start:        c,
-	}
-}
-
-func (w *commitPreIterator) Next() (*Commit, error) {
-	var c *Commit
-	for {
-		if w.start != nil {
-			c = w.start
-			w.start = nil
-		} else {
-			current := len(w.stack) - 1
-			if current < 0 {
-				return nil, io.EOF
-			}
-
-			var err error
-			c, err = w.stack[current].Next()
-			if err == io.EOF {
-				w.stack = w.stack[:current]
-				continue
-			}
-
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		if w.seen[c.Hash] || w.seenExternal[c.Hash] {
-			continue
-		}
-
-		w.seen[c.Hash] = true
-
-		if c.NumParents() > 0 {
-			w.stack = append(w.stack, filteredParentIter(c, w.seen))
-		}
-
-		return c, nil
-	}
-}
-
-func filteredParentIter(c *Commit, seen map[plumbing.Hash]bool) CommitIter {
-	var hashes []plumbing.Hash
-	for _, h := range c.ParentHashes {
-		if !seen[h] {
-			hashes = append(hashes, h)
-		}
-	}
-
-	return NewCommitIter(c.s,
-		storer.NewEncodedObjectLookupIter(c.s, plumbing.CommitObject, hashes),
-	)
-}
-
-func (w *commitPreIterator) ForEach(cb func(*Commit) error) error {
-	for {
-		c, err := w.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = cb(c)
-		if err == storer.ErrStop {
-			break
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (w *commitPreIterator) Close() {}
-
-type commitPostIterator struct {
-	stack []*Commit
-	seen  map[plumbing.Hash]bool
-}
-
-// NewCommitPostorderIter returns a CommitIter that walks the commit
-// history like WalkCommitHistory but in post-order. This means that after
-// walking a merge commit, the merged commit will be walked before the base
-// it was merged on. This can be useful if you wish to see the history in
-// chronological order. Ignore allows to skip some commits from being iterated.
-func NewCommitPostorderIter(c *Commit, ignore []plumbing.Hash) CommitIter {
-	seen := make(map[plumbing.Hash]bool)
-	for _, h := range ignore {
-		seen[h] = true
-	}
-
-	return &commitPostIterator{
-		stack: []*Commit{c},
-		seen:  seen,
-	}
-}
-
-func (w *commitPostIterator) Next() (*Commit, error) {
-	for {
-		if len(w.stack) == 0 {
-			return nil, io.EOF
-		}
-
-		c := w.stack[len(w.stack)-1]
-		w.stack = w.stack[:len(w.stack)-1]
-
-		if w.seen[c.Hash] {
-			continue
-		}
-
-		w.seen[c.Hash] = true
-
-		return c, c.Parents().ForEach(func(p *Commit) error {
-			w.stack = append(w.stack, p)
-			return nil
-		})
-	}
-}
-
-func (w *commitPostIterator) ForEach(cb func(*Commit) error) error {
-	for {
-		c, err := w.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = cb(c)
-		if err == storer.ErrStop {
-			break
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (w *commitPostIterator) Close() {}
-
-// commitAllIterator stands for commit iterator for all refs.
-type commitAllIterator struct {
-	// currCommit points to the current commit.
-	currCommit *list.Element
-}
-
-// NewCommitAllIter returns a new commit iterator for all refs.
-// repoStorer is a repo Storer used to get commits and references.
-// commitIterFunc is a commit iterator function, used to iterate through ref commits in chosen order
-func NewCommitAllIter(repoStorer storage.Storer, commitIterFunc func(*Commit) CommitIter) (CommitIter, error) {
-	commitsPath := list.New()
-	commitsLookup := make(map[plumbing.Hash]*list.Element)
-	head, err := storer.ResolveReference(repoStorer, plumbing.HEAD)
-	if err == nil {
-		err = addReference(repoStorer, commitIterFunc, head, commitsPath, commitsLookup)
-	}
-
-	if err != nil && err != plumbing.ErrReferenceNotFound {
-		return nil, err
-	}
-
-	// add all references along with the HEAD
-	refIter, err := repoStorer.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-	defer refIter.Close()
-
-	for {
-		ref, err := refIter.Next()
-		if err == io.EOF {
-			break
-		}
-
-		if err == plumbing.ErrReferenceNotFound {
-			continue
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		if err = addReference(repoStorer, commitIterFunc, ref, commitsPath, commitsLookup); err != nil {
-			return nil, err
-		}
-	}
-
-	return &commitAllIterator{commitsPath.Front()}, nil
-}
-
-func addReference(
-	repoStorer storage.Storer,
-	commitIterFunc func(*Commit) CommitIter,
-	ref *plumbing.Reference,
-	commitsPath *list.List,
-	commitsLookup map[plumbing.Hash]*list.Element) error {
-
-	_, exists := commitsLookup[ref.Hash()]
-	if exists {
-		// we already have it - skip the reference.
-		return nil
-	}
-
-	refCommit, _ := GetCommit(repoStorer, ref.Hash())
-	if refCommit == nil {
-		// if it's not a commit - skip it.
-		return nil
-	}
-
-	var (
-		refCommits []*Commit
-		parent     *list.Element
-	)
-	// collect all ref commits to add
-	commitIter := commitIterFunc(refCommit)
-	for c, e := commitIter.Next(); e == nil; {
-		parent, exists = commitsLookup[c.Hash]
-		if exists {
-			break
-		}
-		refCommits = append(refCommits, c)
-		c, e = commitIter.Next()
-	}
-	commitIter.Close()
-
-	if parent == nil {
-		// common parent - not found
-		// add all commits to the path from this ref (maybe it's a HEAD and we don't have anything, yet)
-		for _, c := range refCommits {
-			parent = commitsPath.PushBack(c)
-			commitsLookup[c.Hash] = parent
-		}
-	} else {
-		// add ref's commits to the path in reverse order (from the latest)
-		for i := len(refCommits) - 1; i >= 0; i-- {
-			c := refCommits[i]
-			// insert before found common parent
-			parent = commitsPath.InsertBefore(c, parent)
-			commitsLookup[c.Hash] = parent
-		}
-	}
-
-	return nil
-}
-
-func (it *commitAllIterator) Next() (*Commit, error) {
-	if it.currCommit == nil {
-		return nil, io.EOF
-	}
-
-	c := it.currCommit.Value.(*Commit)
-	it.currCommit = it.currCommit.Next()
-
-	return c, nil
-}
-
-func (it *commitAllIterator) ForEach(cb func(*Commit) error) error {
-	for {
-		c, err := it.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = cb(c)
-		if err == storer.ErrStop {
-			break
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (it *commitAllIterator) Close() {
-	it.currCommit = nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_bfs.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_bfs.go
deleted file mode 100644
index c9c744d6c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_bfs.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package object
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-type bfsCommitIterator struct {
-	seenExternal map[plumbing.Hash]bool
-	seen         map[plumbing.Hash]bool
-	queue        []*Commit
-}
-
-// NewCommitIterBSF returns a CommitIter that walks the commit history,
-// starting at the given commit and visiting its parents in pre-order.
-// The given callback will be called for each visited commit. Each commit will
-// be visited only once. If the callback returns an error, walking will stop
-// and will return the error. Other errors might be returned if the history
-// cannot be traversed (e.g. missing objects). Ignore allows to skip some
-// commits from being iterated.
-func NewCommitIterBSF(
-	c *Commit,
-	seenExternal map[plumbing.Hash]bool,
-	ignore []plumbing.Hash,
-) CommitIter {
-	seen := make(map[plumbing.Hash]bool)
-	for _, h := range ignore {
-		seen[h] = true
-	}
-
-	return &bfsCommitIterator{
-		seenExternal: seenExternal,
-		seen:         seen,
-		queue:        []*Commit{c},
-	}
-}
-
-func (w *bfsCommitIterator) appendHash(store storer.EncodedObjectStorer, h plumbing.Hash) error {
-	if w.seen[h] || w.seenExternal[h] {
-		return nil
-	}
-	c, err := GetCommit(store, h)
-	if err != nil {
-		return err
-	}
-	w.queue = append(w.queue, c)
-	return nil
-}
-
-func (w *bfsCommitIterator) Next() (*Commit, error) {
-	var c *Commit
-	for {
-		if len(w.queue) == 0 {
-			return nil, io.EOF
-		}
-		c = w.queue[0]
-		w.queue = w.queue[1:]
-
-		if w.seen[c.Hash] || w.seenExternal[c.Hash] {
-			continue
-		}
-
-		w.seen[c.Hash] = true
-
-		for _, h := range c.ParentHashes {
-			err := w.appendHash(c.s, h)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		return c, nil
-	}
-}
-
-func (w *bfsCommitIterator) ForEach(cb func(*Commit) error) error {
-	for {
-		c, err := w.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = cb(c)
-		if err == storer.ErrStop {
-			break
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (w *bfsCommitIterator) Close() {}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_bfs_filtered.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_bfs_filtered.go
deleted file mode 100644
index 72343a64b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_bfs_filtered.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package object
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-// NewFilterCommitIter returns a CommitIter that walks the commit history,
-// starting at the passed commit and visiting its parents in Breadth-first order.
-// The commits returned by the CommitIter will validate the passed CommitFilter.
-// The history won't be transversed beyond a commit if isLimit is true for it.
-// Each commit will be visited only once.
-// If the commit history can not be traversed, or the Close() method is called,
-// the CommitIter won't return more commits.
-// If no isValid is passed, all ancestors of from commit will be valid.
-// If no isLimit is limit, all ancestors of all commits will be visited.
-func NewFilterCommitIter(
-	from *Commit,
-	isValid *CommitFilter,
-	isLimit *CommitFilter,
-) CommitIter {
-	var validFilter CommitFilter
-	if isValid == nil {
-		validFilter = func(_ *Commit) bool {
-			return true
-		}
-	} else {
-		validFilter = *isValid
-	}
-
-	var limitFilter CommitFilter
-	if isLimit == nil {
-		limitFilter = func(_ *Commit) bool {
-			return false
-		}
-	} else {
-		limitFilter = *isLimit
-	}
-
-	return &filterCommitIter{
-		isValid: validFilter,
-		isLimit: limitFilter,
-		visited: map[plumbing.Hash]struct{}{},
-		queue:   []*Commit{from},
-	}
-}
-
-// CommitFilter returns a boolean for the passed Commit
-type CommitFilter func(*Commit) bool
-
-// filterCommitIter implements CommitIter
-type filterCommitIter struct {
-	isValid CommitFilter
-	isLimit CommitFilter
-	visited map[plumbing.Hash]struct{}
-	queue   []*Commit
-	lastErr error
-}
-
-// Next returns the next commit of the CommitIter.
-// It will return io.EOF if there are no more commits to visit,
-// or an error if the history could not be traversed.
-func (w *filterCommitIter) Next() (*Commit, error) {
-	var commit *Commit
-	var err error
-	for {
-		commit, err = w.popNewFromQueue()
-		if err != nil {
-			return nil, w.close(err)
-		}
-
-		w.visited[commit.Hash] = struct{}{}
-
-		if !w.isLimit(commit) {
-			err = w.addToQueue(commit.s, commit.ParentHashes...)
-			if err != nil {
-				return nil, w.close(err)
-			}
-		}
-
-		if w.isValid(commit) {
-			return commit, nil
-		}
-	}
-}
-
-// ForEach runs the passed callback over each Commit returned by the CommitIter
-// until the callback returns an error or there is no more commits to traverse.
-func (w *filterCommitIter) ForEach(cb func(*Commit) error) error {
-	for {
-		commit, err := w.Next()
-		if err == io.EOF {
-			break
-		}
-
-		if err != nil {
-			return err
-		}
-
-		if err := cb(commit); err == storer.ErrStop {
-			break
-		} else if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Error returns the error that caused that the CommitIter is no longer returning commits
-func (w *filterCommitIter) Error() error {
-	return w.lastErr
-}
-
-// Close closes the CommitIter
-func (w *filterCommitIter) Close() {
-	w.visited = map[plumbing.Hash]struct{}{}
-	w.queue = []*Commit{}
-	w.isLimit = nil
-	w.isValid = nil
-}
-
-// close closes the CommitIter with an error
-func (w *filterCommitIter) close(err error) error {
-	w.Close()
-	w.lastErr = err
-	return err
-}
-
-// popNewFromQueue returns the first new commit from the internal fifo queue,
-// or an io.EOF error if the queue is empty
-func (w *filterCommitIter) popNewFromQueue() (*Commit, error) {
-	var first *Commit
-	for {
-		if len(w.queue) == 0 {
-			if w.lastErr != nil {
-				return nil, w.lastErr
-			}
-
-			return nil, io.EOF
-		}
-
-		first = w.queue[0]
-		w.queue = w.queue[1:]
-		if _, ok := w.visited[first.Hash]; ok {
-			continue
-		}
-
-		return first, nil
-	}
-}
-
-// addToQueue adds the passed commits to the internal fifo queue if they weren't seen
-// or returns an error if the passed hashes could not be used to get valid commits
-func (w *filterCommitIter) addToQueue(
-	store storer.EncodedObjectStorer,
-	hashes ...plumbing.Hash,
-) error {
-	for _, hash := range hashes {
-		if _, ok := w.visited[hash]; ok {
-			continue
-		}
-
-		commit, err := GetCommit(store, hash)
-		if err != nil {
-			return err
-		}
-
-		w.queue = append(w.queue, commit)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_ctime.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_ctime.go
deleted file mode 100644
index 69ac2aa35..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_ctime.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package object
-
-import (
-	"io"
-
-	"github.com/emirpasic/gods/trees/binaryheap"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-type commitIteratorByCTime struct {
-	seenExternal map[plumbing.Hash]bool
-	seen         map[plumbing.Hash]bool
-	heap         *binaryheap.Heap
-}
-
-// NewCommitIterCTime returns a CommitIter that walks the commit history,
-// starting at the given commit and visiting its parents while preserving Committer Time order.
-// this appears to be the closest order to `git log`
-// The given callback will be called for each visited commit. Each commit will
-// be visited only once. If the callback returns an error, walking will stop
-// and will return the error. Other errors might be returned if the history
-// cannot be traversed (e.g. missing objects). Ignore allows to skip some
-// commits from being iterated.
-func NewCommitIterCTime(
-	c *Commit,
-	seenExternal map[plumbing.Hash]bool,
-	ignore []plumbing.Hash,
-) CommitIter {
-	seen := make(map[plumbing.Hash]bool)
-	for _, h := range ignore {
-		seen[h] = true
-	}
-
-	heap := binaryheap.NewWith(func(a, b interface{}) int {
-		if a.(*Commit).Committer.When.Before(b.(*Commit).Committer.When) {
-			return 1
-		}
-		return -1
-	})
-	heap.Push(c)
-
-	return &commitIteratorByCTime{
-		seenExternal: seenExternal,
-		seen:         seen,
-		heap:         heap,
-	}
-}
-
-func (w *commitIteratorByCTime) Next() (*Commit, error) {
-	var c *Commit
-	for {
-		cIn, ok := w.heap.Pop()
-		if !ok {
-			return nil, io.EOF
-		}
-		c = cIn.(*Commit)
-
-		if w.seen[c.Hash] || w.seenExternal[c.Hash] {
-			continue
-		}
-
-		w.seen[c.Hash] = true
-
-		for _, h := range c.ParentHashes {
-			if w.seen[h] || w.seenExternal[h] {
-				continue
-			}
-			pc, err := GetCommit(c.s, h)
-			if err != nil {
-				return nil, err
-			}
-			w.heap.Push(pc)
-		}
-
-		return c, nil
-	}
-}
-
-func (w *commitIteratorByCTime) ForEach(cb func(*Commit) error) error {
-	for {
-		c, err := w.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = cb(c)
-		if err == storer.ErrStop {
-			break
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (w *commitIteratorByCTime) Close() {}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_limit.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_limit.go
deleted file mode 100644
index 24677a872..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_limit.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package object
-
-import (
-	"io"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-type commitLimitIter struct {
-	sourceIter   CommitIter
-	limitOptions LogLimitOptions
-}
-
-type LogLimitOptions struct {
-	Since *time.Time
-	Until *time.Time
-}
-
-func NewCommitLimitIterFromIter(commitIter CommitIter, limitOptions LogLimitOptions) CommitIter {
-	iterator := new(commitLimitIter)
-	iterator.sourceIter = commitIter
-	iterator.limitOptions = limitOptions
-	return iterator
-}
-
-func (c *commitLimitIter) Next() (*Commit, error) {
-	for {
-		commit, err := c.sourceIter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if c.limitOptions.Since != nil && commit.Committer.When.Before(*c.limitOptions.Since) {
-			continue
-		}
-		if c.limitOptions.Until != nil && commit.Committer.When.After(*c.limitOptions.Until) {
-			continue
-		}
-		return commit, nil
-	}
-}
-
-func (c *commitLimitIter) ForEach(cb func(*Commit) error) error {
-	for {
-		commit, nextErr := c.Next()
-		if nextErr == io.EOF {
-			break
-		}
-		if nextErr != nil {
-			return nextErr
-		}
-		err := cb(commit)
-		if err == storer.ErrStop {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c *commitLimitIter) Close() {
-	c.sourceIter.Close()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_path.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_path.go
deleted file mode 100644
index b54b7e1d2..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/commit_walker_path.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package object
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-type commitPathIter struct {
-	pathFilter    func(string) bool
-	sourceIter    CommitIter
-	currentCommit *Commit
-	checkParent   bool
-}
-
-// NewCommitPathIterFromIter returns a commit iterator which performs diffTree between
-// successive trees returned from the commit iterator from the argument. The purpose of this is
-// to find the commits that explain how the files that match the path came to be.
-// If checkParent is true then the function double checks if potential parent (next commit in a path)
-// is one of the parents in the tree (it's used by `git log --all`).
-// pathFilter is a function that takes path of file as argument and returns true if we want it
-func NewCommitPathIterFromIter(pathFilter func(string) bool, commitIter CommitIter, checkParent bool) CommitIter {
-	iterator := new(commitPathIter)
-	iterator.sourceIter = commitIter
-	iterator.pathFilter = pathFilter
-	iterator.checkParent = checkParent
-	return iterator
-}
-
-// NewCommitFileIterFromIter is kept for compatibility, can be replaced with NewCommitPathIterFromIter
-func NewCommitFileIterFromIter(fileName string, commitIter CommitIter, checkParent bool) CommitIter {
-	return NewCommitPathIterFromIter(
-		func(path string) bool {
-			return path == fileName
-		},
-		commitIter,
-		checkParent,
-	)
-}
-
-func (c *commitPathIter) Next() (*Commit, error) {
-	if c.currentCommit == nil {
-		var err error
-		c.currentCommit, err = c.sourceIter.Next()
-		if err != nil {
-			return nil, err
-		}
-	}
-	commit, commitErr := c.getNextFileCommit()
-
-	// Setting current-commit to nil to prevent unwanted states when errors are raised
-	if commitErr != nil {
-		c.currentCommit = nil
-	}
-	return commit, commitErr
-}
-
-func (c *commitPathIter) getNextFileCommit() (*Commit, error) {
-	var parentTree, currentTree *Tree
-
-	for {
-		// Parent-commit can be nil if the current-commit is the initial commit
-		parentCommit, parentCommitErr := c.sourceIter.Next()
-		if parentCommitErr != nil {
-			// If the parent-commit is beyond the initial commit, keep it nil
-			if parentCommitErr != io.EOF {
-				return nil, parentCommitErr
-			}
-			parentCommit = nil
-		}
-
-		if parentTree == nil {
-			var currTreeErr error
-			currentTree, currTreeErr = c.currentCommit.Tree()
-			if currTreeErr != nil {
-				return nil, currTreeErr
-			}
-		} else {
-			currentTree = parentTree
-			parentTree = nil
-		}
-
-		if parentCommit != nil {
-			var parentTreeErr error
-			parentTree, parentTreeErr = parentCommit.Tree()
-			if parentTreeErr != nil {
-				return nil, parentTreeErr
-			}
-		}
-
-		// Find diff between current and parent trees
-		changes, diffErr := DiffTree(currentTree, parentTree)
-		if diffErr != nil {
-			return nil, diffErr
-		}
-
-		found := c.hasFileChange(changes, parentCommit)
-
-		// Storing the current-commit in-case a change is found, and
-		// Updating the current-commit for the next-iteration
-		prevCommit := c.currentCommit
-		c.currentCommit = parentCommit
-
-		if found {
-			return prevCommit, nil
-		}
-
-		// If not matches found and if parent-commit is beyond the initial commit, then return with EOF
-		if parentCommit == nil {
-			return nil, io.EOF
-		}
-	}
-}
-
-func (c *commitPathIter) hasFileChange(changes Changes, parent *Commit) bool {
-	for _, change := range changes {
-		if !c.pathFilter(change.name()) {
-			continue
-		}
-
-		// filename matches, now check if source iterator contains all commits (from all refs)
-		if c.checkParent {
-			// Check if parent is beyond the initial commit
-			if parent == nil || isParentHash(parent.Hash, c.currentCommit) {
-				return true
-			}
-			continue
-		}
-
-		return true
-	}
-
-	return false
-}
-
-func isParentHash(hash plumbing.Hash, commit *Commit) bool {
-	for _, h := range commit.ParentHashes {
-		if h == hash {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *commitPathIter) ForEach(cb func(*Commit) error) error {
-	for {
-		commit, nextErr := c.Next()
-		if nextErr == io.EOF {
-			break
-		}
-		if nextErr != nil {
-			return nextErr
-		}
-		err := cb(commit)
-		if err == storer.ErrStop {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c *commitPathIter) Close() {
-	c.sourceIter.Close()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/difftree.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/difftree.go
deleted file mode 100644
index a2dd582be..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/difftree.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package object
-
-import (
-	"bytes"
-	"context"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// DiffTree compares the content and mode of the blobs found via two
-// tree objects.
-// DiffTree does not perform rename detection, use DiffTreeWithOptions
-// instead to detect renames.
-func DiffTree(a, b *Tree) (Changes, error) {
-	return DiffTreeContext(context.Background(), a, b)
-}
-
-// DiffTreeContext compares the content and mode of the blobs found via two
-// tree objects. Provided context must be non-nil.
-// An error will be returned if context expires.
-func DiffTreeContext(ctx context.Context, a, b *Tree) (Changes, error) {
-	return DiffTreeWithOptions(ctx, a, b, nil)
-}
-
-// DiffTreeOptions are the configurable options when performing a diff tree.
-type DiffTreeOptions struct {
-	// DetectRenames is whether the diff tree will use rename detection.
-	DetectRenames bool
-	// RenameScore is the threshold to of similarity between files to consider
-	// that a pair of delete and insert are a rename. The number must be
-	// exactly between 0 and 100.
-	RenameScore uint
-	// RenameLimit is the maximum amount of files that can be compared when
-	// detecting renames. The number of comparisons that have to be performed
-	// is equal to the number of deleted files * the number of added files.
-	// That means, that if 100 files were deleted and 50 files were added, 5000
-	// file comparisons may be needed. So, if the rename limit is 50, the number
-	// of both deleted and added needs to be equal or less than 50.
-	// A value of 0 means no limit.
-	RenameLimit uint
-	// OnlyExactRenames performs only detection of exact renames and will not perform
-	// any detection of renames based on file similarity.
-	OnlyExactRenames bool
-}
-
-// DefaultDiffTreeOptions are the default and recommended options for the
-// diff tree.
-var DefaultDiffTreeOptions = &DiffTreeOptions{
-	DetectRenames:    true,
-	RenameScore:      60,
-	RenameLimit:      0,
-	OnlyExactRenames: false,
-}
-
-// DiffTreeWithOptions compares the content and mode of the blobs found
-// via two tree objects with the given options. The provided context
-// must be non-nil.
-// If no options are passed, no rename detection will be performed. The
-// recommended options are DefaultDiffTreeOptions.
-// An error will be returned if the context expires.
-// This function will be deprecated and removed in v6 so the default
-// behaviour of DiffTree is to detect renames.
-func DiffTreeWithOptions(
-	ctx context.Context,
-	a, b *Tree,
-	opts *DiffTreeOptions,
-) (Changes, error) {
-	from := NewTreeRootNode(a)
-	to := NewTreeRootNode(b)
-
-	hashEqual := func(a, b noder.Hasher) bool {
-		return bytes.Equal(a.Hash(), b.Hash())
-	}
-
-	merkletrieChanges, err := merkletrie.DiffTreeContext(ctx, from, to, hashEqual)
-	if err != nil {
-		if err == merkletrie.ErrCanceled {
-			return nil, ErrCanceled
-		}
-		return nil, err
-	}
-
-	changes, err := newChanges(merkletrieChanges)
-	if err != nil {
-		return nil, err
-	}
-
-	if opts == nil {
-		opts = new(DiffTreeOptions)
-	}
-
-	if opts.DetectRenames {
-		return DetectRenames(changes, opts)
-	}
-
-	return changes, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/file.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/file.go
deleted file mode 100644
index 755f87859..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/file.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package object
-
-import (
-	"bytes"
-	"io"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/binary"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// File represents git file objects.
-type File struct {
-	// Name is the path of the file. It might be relative to a tree,
-	// depending of the function that generates it.
-	Name string
-	// Mode is the file mode.
-	Mode filemode.FileMode
-	// Blob with the contents of the file.
-	Blob
-}
-
-// NewFile returns a File based on the given blob object
-func NewFile(name string, m filemode.FileMode, b *Blob) *File {
-	return &File{Name: name, Mode: m, Blob: *b}
-}
-
-// Contents returns the contents of a file as a string.
-func (f *File) Contents() (content string, err error) {
-	reader, err := f.Reader()
-	if err != nil {
-		return "", err
-	}
-	defer ioutil.CheckClose(reader, &err)
-
-	buf := new(bytes.Buffer)
-	if _, err := buf.ReadFrom(reader); err != nil {
-		return "", err
-	}
-
-	return buf.String(), nil
-}
-
-// IsBinary returns if the file is binary or not
-func (f *File) IsBinary() (bin bool, err error) {
-	reader, err := f.Reader()
-	if err != nil {
-		return false, err
-	}
-	defer ioutil.CheckClose(reader, &err)
-
-	return binary.IsBinary(reader)
-}
-
-// Lines returns a slice of lines from the contents of a file, stripping
-// all end of line characters. If the last line is empty (does not end
-// in an end of line), it is also stripped.
-func (f *File) Lines() ([]string, error) {
-	content, err := f.Contents()
-	if err != nil {
-		return nil, err
-	}
-
-	splits := strings.Split(content, "\n")
-	// remove the last line if it is empty
-	if splits[len(splits)-1] == "" {
-		return splits[:len(splits)-1], nil
-	}
-
-	return splits, nil
-}
-
-// FileIter provides an iterator for the files in a tree.
-type FileIter struct {
-	s storer.EncodedObjectStorer
-	w TreeWalker
-}
-
-// NewFileIter takes a storer.EncodedObjectStorer and a Tree and returns a
-// *FileIter that iterates over all files contained in the tree, recursively.
-func NewFileIter(s storer.EncodedObjectStorer, t *Tree) *FileIter {
-	return &FileIter{s: s, w: *NewTreeWalker(t, true, nil)}
-}
-
-// Next moves the iterator to the next file and returns a pointer to it. If
-// there are no more files, it returns io.EOF.
-func (iter *FileIter) Next() (*File, error) {
-	for {
-		name, entry, err := iter.w.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if entry.Mode == filemode.Dir || entry.Mode == filemode.Submodule {
-			continue
-		}
-
-		blob, err := GetBlob(iter.s, entry.Hash)
-		if err != nil {
-			return nil, err
-		}
-
-		return NewFile(name, entry.Mode, blob), nil
-	}
-}
-
-// ForEach call the cb function for each file contained in this iter until
-// an error happens or the end of the iter is reached. If plumbing.ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *FileIter) ForEach(cb func(*File) error) error {
-	defer iter.Close()
-
-	for {
-		f, err := iter.Next()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return err
-		}
-
-		if err := cb(f); err != nil {
-			if err == storer.ErrStop {
-				return nil
-			}
-
-			return err
-		}
-	}
-}
-
-func (iter *FileIter) Close() {
-	iter.w.Close()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/merge_base.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/merge_base.go
deleted file mode 100644
index 33eb5d8b0..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/merge_base.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package object
-
-import (
-	"fmt"
-	"sort"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-// errIsReachable is thrown when first commit is an ancestor of the second
-var errIsReachable = fmt.Errorf("first is reachable from second")
-
-// MergeBase mimics the behavior of `git merge-base actual other`, returning the
-// best common ancestor between the actual and the passed one.
-// The best common ancestors can not be reached from other common ancestors.
-func (c *Commit) MergeBase(other *Commit) ([]*Commit, error) {
-	// use sortedByCommitDateDesc strategy
-	sorted := sortByCommitDateDesc(c, other)
-	newer := sorted[0]
-	older := sorted[1]
-
-	newerHistory, err := ancestorsIndex(older, newer)
-	if err == errIsReachable {
-		return []*Commit{older}, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	var res []*Commit
-	inNewerHistory := isInIndexCommitFilter(newerHistory)
-	resIter := NewFilterCommitIter(older, &inNewerHistory, &inNewerHistory)
-	_ = resIter.ForEach(func(commit *Commit) error {
-		res = append(res, commit)
-		return nil
-	})
-
-	return Independents(res)
-}
-
-// IsAncestor returns true if the actual commit is ancestor of the passed one.
-// It returns an error if the history is not transversable
-// It mimics the behavior of `git merge --is-ancestor actual other`
-func (c *Commit) IsAncestor(other *Commit) (bool, error) {
-	found := false
-	iter := NewCommitPreorderIter(other, nil, nil)
-	err := iter.ForEach(func(comm *Commit) error {
-		if comm.Hash != c.Hash {
-			return nil
-		}
-
-		found = true
-		return storer.ErrStop
-	})
-
-	return found, err
-}
-
-// ancestorsIndex returns a map with the ancestors of the starting commit if the
-// excluded one is not one of them. It returns errIsReachable if the excluded commit
-// is ancestor of the starting, or another error if the history is not traversable.
-func ancestorsIndex(excluded, starting *Commit) (map[plumbing.Hash]struct{}, error) {
-	if excluded.Hash.String() == starting.Hash.String() {
-		return nil, errIsReachable
-	}
-
-	startingHistory := map[plumbing.Hash]struct{}{}
-	startingIter := NewCommitIterBSF(starting, nil, nil)
-	err := startingIter.ForEach(func(commit *Commit) error {
-		if commit.Hash == excluded.Hash {
-			return errIsReachable
-		}
-
-		startingHistory[commit.Hash] = struct{}{}
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return startingHistory, nil
-}
-
-// Independents returns a subset of the passed commits, that are not reachable the others
-// It mimics the behavior of `git merge-base --independent commit...`.
-func Independents(commits []*Commit) ([]*Commit, error) {
-	// use sortedByCommitDateDesc strategy
-	candidates := sortByCommitDateDesc(commits...)
-	candidates = removeDuplicated(candidates)
-
-	seen := map[plumbing.Hash]struct{}{}
-	var isLimit CommitFilter = func(commit *Commit) bool {
-		_, ok := seen[commit.Hash]
-		return ok
-	}
-
-	if len(candidates) < 2 {
-		return candidates, nil
-	}
-
-	pos := 0
-	for {
-		from := candidates[pos]
-		others := remove(candidates, from)
-		fromHistoryIter := NewFilterCommitIter(from, nil, &isLimit)
-		err := fromHistoryIter.ForEach(func(fromAncestor *Commit) error {
-			for _, other := range others {
-				if fromAncestor.Hash == other.Hash {
-					candidates = remove(candidates, other)
-					others = remove(others, other)
-				}
-			}
-
-			if len(candidates) == 1 {
-				return storer.ErrStop
-			}
-
-			seen[fromAncestor.Hash] = struct{}{}
-			return nil
-		})
-
-		if err != nil {
-			return nil, err
-		}
-
-		nextPos := indexOf(candidates, from) + 1
-		if nextPos >= len(candidates) {
-			break
-		}
-
-		pos = nextPos
-	}
-
-	return candidates, nil
-}
-
-// sortByCommitDateDesc returns the passed commits, sorted by `committer.When desc`
-//
-// Following this strategy, it is tried to reduce the time needed when walking
-// the history from one commit to reach the others. It is assumed that ancestors
-// use to be committed before its descendant;
-// That way `Independents(A^, A)` will be processed as being `Independents(A, A^)`;
-// so starting by `A` it will be reached `A^` way sooner than walking from `A^`
-// to the initial commit, and then from `A` to `A^`.
-func sortByCommitDateDesc(commits ...*Commit) []*Commit {
-	sorted := make([]*Commit, len(commits))
-	copy(sorted, commits)
-	sort.Slice(sorted, func(i, j int) bool {
-		return sorted[i].Committer.When.After(sorted[j].Committer.When)
-	})
-
-	return sorted
-}
-
-// indexOf returns the first position where target was found in the passed commits
-func indexOf(commits []*Commit, target *Commit) int {
-	for i, commit := range commits {
-		if target.Hash == commit.Hash {
-			return i
-		}
-	}
-
-	return -1
-}
-
-// remove returns the passed commits excluding the commit toDelete
-func remove(commits []*Commit, toDelete *Commit) []*Commit {
-	res := make([]*Commit, len(commits))
-	j := 0
-	for _, commit := range commits {
-		if commit.Hash == toDelete.Hash {
-			continue
-		}
-
-		res[j] = commit
-		j++
-	}
-
-	return res[:j]
-}
-
-// removeDuplicated removes duplicated commits from the passed slice of commits
-func removeDuplicated(commits []*Commit) []*Commit {
-	seen := make(map[plumbing.Hash]struct{}, len(commits))
-	res := make([]*Commit, len(commits))
-	j := 0
-	for _, commit := range commits {
-		if _, ok := seen[commit.Hash]; ok {
-			continue
-		}
-
-		seen[commit.Hash] = struct{}{}
-		res[j] = commit
-		j++
-	}
-
-	return res[:j]
-}
-
-// isInIndexCommitFilter returns a commitFilter that returns true
-// if the commit is in the passed index.
-func isInIndexCommitFilter(index map[plumbing.Hash]struct{}) CommitFilter {
-	return func(c *Commit) bool {
-		_, ok := index[c.Hash]
-		return ok
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/object.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/object.go
deleted file mode 100644
index d77b358e3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/object.go
+++ /dev/null
@@ -1,239 +0,0 @@
-// Package object contains implementations of all Git objects and utility
-// functions to work with them.
-package object
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-// ErrUnsupportedObject trigger when a non-supported object is being decoded.
-var ErrUnsupportedObject = errors.New("unsupported object type")
-
-// Object is a generic representation of any git object. It is implemented by
-// Commit, Tree, Blob, and Tag, and includes the functions that are common to
-// them.
-//
-// Object is returned when an object can be of any type. It is frequently used
-// with a type cast to acquire the specific type of object:
-//
-//   func process(obj Object) {
-//   	switch o := obj.(type) {
-//   	case *Commit:
-//   		// o is a Commit
-//   	case *Tree:
-//   		// o is a Tree
-//   	case *Blob:
-//   		// o is a Blob
-//   	case *Tag:
-//   		// o is a Tag
-//   	}
-//   }
-//
-// This interface is intentionally different from plumbing.EncodedObject, which
-// is a lower level interface used by storage implementations to read and write
-// objects in its encoded form.
-type Object interface {
-	ID() plumbing.Hash
-	Type() plumbing.ObjectType
-	Decode(plumbing.EncodedObject) error
-	Encode(plumbing.EncodedObject) error
-}
-
-// GetObject gets an object from an object storer and decodes it.
-func GetObject(s storer.EncodedObjectStorer, h plumbing.Hash) (Object, error) {
-	o, err := s.EncodedObject(plumbing.AnyObject, h)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeObject(s, o)
-}
-
-// DecodeObject decodes an encoded object into an Object and associates it to
-// the given object storer.
-func DecodeObject(s storer.EncodedObjectStorer, o plumbing.EncodedObject) (Object, error) {
-	switch o.Type() {
-	case plumbing.CommitObject:
-		return DecodeCommit(s, o)
-	case plumbing.TreeObject:
-		return DecodeTree(s, o)
-	case plumbing.BlobObject:
-		return DecodeBlob(o)
-	case plumbing.TagObject:
-		return DecodeTag(s, o)
-	default:
-		return nil, plumbing.ErrInvalidType
-	}
-}
-
-// DateFormat is the format being used in the original git implementation
-const DateFormat = "Mon Jan 02 15:04:05 2006 -0700"
-
-// Signature is used to identify who and when created a commit or tag.
-type Signature struct {
-	// Name represents a person name. It is an arbitrary string.
-	Name string
-	// Email is an email, but it cannot be assumed to be well-formed.
-	Email string
-	// When is the timestamp of the signature.
-	When time.Time
-}
-
-// Decode decodes a byte slice into a signature
-func (s *Signature) Decode(b []byte) {
-	open := bytes.LastIndexByte(b, '<')
-	close := bytes.LastIndexByte(b, '>')
-	if open == -1 || close == -1 {
-		return
-	}
-
-	if close < open {
-		return
-	}
-
-	s.Name = string(bytes.Trim(b[:open], " "))
-	s.Email = string(b[open+1 : close])
-
-	hasTime := close+2 < len(b)
-	if hasTime {
-		s.decodeTimeAndTimeZone(b[close+2:])
-	}
-}
-
-// Encode encodes a Signature into a writer.
-func (s *Signature) Encode(w io.Writer) error {
-	if _, err := fmt.Fprintf(w, "%s <%s> ", s.Name, s.Email); err != nil {
-		return err
-	}
-	if err := s.encodeTimeAndTimeZone(w); err != nil {
-		return err
-	}
-	return nil
-}
-
-var timeZoneLength = 5
-
-func (s *Signature) decodeTimeAndTimeZone(b []byte) {
-	space := bytes.IndexByte(b, ' ')
-	if space == -1 {
-		space = len(b)
-	}
-
-	ts, err := strconv.ParseInt(string(b[:space]), 10, 64)
-	if err != nil {
-		return
-	}
-
-	s.When = time.Unix(ts, 0).In(time.UTC)
-	var tzStart = space + 1
-	if tzStart >= len(b) || tzStart+timeZoneLength > len(b) {
-		return
-	}
-
-	timezone := string(b[tzStart : tzStart+timeZoneLength])
-	tzhours, err1 := strconv.ParseInt(timezone[0:3], 10, 64)
-	tzmins, err2 := strconv.ParseInt(timezone[3:], 10, 64)
-	if err1 != nil || err2 != nil {
-		return
-	}
-	if tzhours < 0 {
-		tzmins *= -1
-	}
-
-	tz := time.FixedZone("", int(tzhours*60*60+tzmins*60))
-
-	s.When = s.When.In(tz)
-}
-
-func (s *Signature) encodeTimeAndTimeZone(w io.Writer) error {
-	u := s.When.Unix()
-	if u < 0 {
-		u = 0
-	}
-	_, err := fmt.Fprintf(w, "%d %s", u, s.When.Format("-0700"))
-	return err
-}
-
-func (s *Signature) String() string {
-	return fmt.Sprintf("%s <%s>", s.Name, s.Email)
-}
-
-// ObjectIter provides an iterator for a set of objects.
-type ObjectIter struct {
-	storer.EncodedObjectIter
-	s storer.EncodedObjectStorer
-}
-
-// NewObjectIter takes a storer.EncodedObjectStorer and a
-// storer.EncodedObjectIter and returns an *ObjectIter that iterates over all
-// objects contained in the storer.EncodedObjectIter.
-func NewObjectIter(s storer.EncodedObjectStorer, iter storer.EncodedObjectIter) *ObjectIter {
-	return &ObjectIter{iter, s}
-}
-
-// Next moves the iterator to the next object and returns a pointer to it. If
-// there are no more objects, it returns io.EOF.
-func (iter *ObjectIter) Next() (Object, error) {
-	for {
-		obj, err := iter.EncodedObjectIter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		o, err := iter.toObject(obj)
-		if err == plumbing.ErrInvalidType {
-			continue
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		return o, nil
-	}
-}
-
-// ForEach call the cb function for each object contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *ObjectIter) ForEach(cb func(Object) error) error {
-	return iter.EncodedObjectIter.ForEach(func(obj plumbing.EncodedObject) error {
-		o, err := iter.toObject(obj)
-		if err == plumbing.ErrInvalidType {
-			return nil
-		}
-
-		if err != nil {
-			return err
-		}
-
-		return cb(o)
-	})
-}
-
-func (iter *ObjectIter) toObject(obj plumbing.EncodedObject) (Object, error) {
-	switch obj.Type() {
-	case plumbing.BlobObject:
-		blob := &Blob{}
-		return blob, blob.Decode(obj)
-	case plumbing.TreeObject:
-		tree := &Tree{s: iter.s}
-		return tree, tree.Decode(obj)
-	case plumbing.CommitObject:
-		commit := &Commit{}
-		return commit, commit.Decode(obj)
-	case plumbing.TagObject:
-		tag := &Tag{}
-		return tag, tag.Decode(obj)
-	default:
-		return nil, plumbing.ErrInvalidType
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/patch.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/patch.go
deleted file mode 100644
index 7a35b07ec..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/patch.go
+++ /dev/null
@@ -1,337 +0,0 @@
-package object
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	fdiff "github.com/jesseduffield/go-git/v5/plumbing/format/diff"
-	"github.com/jesseduffield/go-git/v5/utils/diff"
-
-	dmp "github.com/sergi/go-diff/diffmatchpatch"
-)
-
-var (
-	ErrCanceled = errors.New("operation canceled")
-)
-
-func getPatch(message string, changes ...*Change) (*Patch, error) {
-	ctx := context.Background()
-	return getPatchContext(ctx, message, changes...)
-}
-
-func getPatchContext(ctx context.Context, message string, changes ...*Change) (*Patch, error) {
-	var filePatches []fdiff.FilePatch
-	for _, c := range changes {
-		select {
-		case <-ctx.Done():
-			return nil, ErrCanceled
-		default:
-		}
-
-		fp, err := filePatchWithContext(ctx, c)
-		if err != nil {
-			return nil, err
-		}
-
-		filePatches = append(filePatches, fp)
-	}
-
-	return &Patch{message, filePatches}, nil
-}
-
-func filePatchWithContext(ctx context.Context, c *Change) (fdiff.FilePatch, error) {
-	from, to, err := c.Files()
-	if err != nil {
-		return nil, err
-	}
-	fromContent, fIsBinary, err := fileContent(from)
-	if err != nil {
-		return nil, err
-	}
-
-	toContent, tIsBinary, err := fileContent(to)
-	if err != nil {
-		return nil, err
-	}
-
-	if fIsBinary || tIsBinary {
-		return &textFilePatch{from: c.From, to: c.To}, nil
-	}
-
-	diffs := diff.Do(fromContent, toContent)
-
-	var chunks []fdiff.Chunk
-	for _, d := range diffs {
-		select {
-		case <-ctx.Done():
-			return nil, ErrCanceled
-		default:
-		}
-
-		var op fdiff.Operation
-		switch d.Type {
-		case dmp.DiffEqual:
-			op = fdiff.Equal
-		case dmp.DiffDelete:
-			op = fdiff.Delete
-		case dmp.DiffInsert:
-			op = fdiff.Add
-		}
-
-		chunks = append(chunks, &textChunk{d.Text, op})
-	}
-
-	return &textFilePatch{
-		chunks: chunks,
-		from:   c.From,
-		to:     c.To,
-	}, nil
-
-}
-
-func fileContent(f *File) (content string, isBinary bool, err error) {
-	if f == nil {
-		return
-	}
-
-	isBinary, err = f.IsBinary()
-	if err != nil || isBinary {
-		return
-	}
-
-	content, err = f.Contents()
-
-	return
-}
-
-// Patch is an implementation of fdiff.Patch interface
-type Patch struct {
-	message     string
-	filePatches []fdiff.FilePatch
-}
-
-func (p *Patch) FilePatches() []fdiff.FilePatch {
-	return p.filePatches
-}
-
-func (p *Patch) Message() string {
-	return p.message
-}
-
-func (p *Patch) Encode(w io.Writer) error {
-	ue := fdiff.NewUnifiedEncoder(w, fdiff.DefaultContextLines)
-
-	return ue.Encode(p)
-}
-
-func (p *Patch) Stats() FileStats {
-	return getFileStatsFromFilePatches(p.FilePatches())
-}
-
-func (p *Patch) String() string {
-	buf := bytes.NewBuffer(nil)
-	err := p.Encode(buf)
-	if err != nil {
-		return fmt.Sprintf("malformed patch: %s", err.Error())
-	}
-
-	return buf.String()
-}
-
-// changeEntryWrapper is an implementation of fdiff.File interface
-type changeEntryWrapper struct {
-	ce ChangeEntry
-}
-
-func (f *changeEntryWrapper) Hash() plumbing.Hash {
-	if !f.ce.TreeEntry.Mode.IsFile() {
-		return plumbing.ZeroHash
-	}
-
-	return f.ce.TreeEntry.Hash
-}
-
-func (f *changeEntryWrapper) Mode() filemode.FileMode {
-	return f.ce.TreeEntry.Mode
-}
-func (f *changeEntryWrapper) Path() string {
-	if !f.ce.TreeEntry.Mode.IsFile() {
-		return ""
-	}
-
-	return f.ce.Name
-}
-
-func (f *changeEntryWrapper) Empty() bool {
-	return !f.ce.TreeEntry.Mode.IsFile()
-}
-
-// textFilePatch is an implementation of fdiff.FilePatch interface
-type textFilePatch struct {
-	chunks   []fdiff.Chunk
-	from, to ChangeEntry
-}
-
-func (tf *textFilePatch) Files() (from fdiff.File, to fdiff.File) {
-	f := &changeEntryWrapper{tf.from}
-	t := &changeEntryWrapper{tf.to}
-
-	if !f.Empty() {
-		from = f
-	}
-
-	if !t.Empty() {
-		to = t
-	}
-
-	return
-}
-
-func (tf *textFilePatch) IsBinary() bool {
-	return len(tf.chunks) == 0
-}
-
-func (tf *textFilePatch) Chunks() []fdiff.Chunk {
-	return tf.chunks
-}
-
-// textChunk is an implementation of fdiff.Chunk interface
-type textChunk struct {
-	content string
-	op      fdiff.Operation
-}
-
-func (t *textChunk) Content() string {
-	return t.content
-}
-
-func (t *textChunk) Type() fdiff.Operation {
-	return t.op
-}
-
-// FileStat stores the status of changes in content of a file.
-type FileStat struct {
-	Name     string
-	Addition int
-	Deletion int
-}
-
-func (fs FileStat) String() string {
-	return printStat([]FileStat{fs})
-}
-
-// FileStats is a collection of FileStat.
-type FileStats []FileStat
-
-func (fileStats FileStats) String() string {
-	return printStat(fileStats)
-}
-
-// printStat prints the stats of changes in content of files.
-// Original implementation: https://github.com/git/git/blob/1a87c842ece327d03d08096395969aca5e0a6996/diff.c#L2615
-// Parts of the output:
-// |<+++/--->
-// example: " main.go | 10 +++++++--- "
-func printStat(fileStats []FileStat) string {
-	maxGraphWidth := uint(53)
-	maxNameLen := 0
-	maxChangeLen := 0
-
-	scaleLinear := func(it, width, max uint) uint {
-		if it == 0 || max == 0 {
-			return 0
-		}
-
-		return 1 + (it * (width - 1) / max)
-	}
-
-	for _, fs := range fileStats {
-		if len(fs.Name) > maxNameLen {
-			maxNameLen = len(fs.Name)
-		}
-
-		changes := strconv.Itoa(fs.Addition + fs.Deletion)
-		if len(changes) > maxChangeLen {
-			maxChangeLen = len(changes)
-		}
-	}
-
-	result := ""
-	for _, fs := range fileStats {
-		add := uint(fs.Addition)
-		del := uint(fs.Deletion)
-		np := maxNameLen - len(fs.Name)
-		cp := maxChangeLen - len(strconv.Itoa(fs.Addition+fs.Deletion))
-
-		total := add + del
-		if total > maxGraphWidth {
-			add = scaleLinear(add, maxGraphWidth, total)
-			del = scaleLinear(del, maxGraphWidth, total)
-		}
-
-		adds := strings.Repeat("+", int(add))
-		dels := strings.Repeat("-", int(del))
-		namePad := strings.Repeat(" ", np)
-		changePad := strings.Repeat(" ", cp)
-
-		result += fmt.Sprintf(" %s%s | %s%d %s%s\n", fs.Name, namePad, changePad, total, adds, dels)
-	}
-	return result
-}
-
-func getFileStatsFromFilePatches(filePatches []fdiff.FilePatch) FileStats {
-	var fileStats FileStats
-
-	for _, fp := range filePatches {
-		// ignore empty patches (binary files, submodule refs updates)
-		if len(fp.Chunks()) == 0 {
-			continue
-		}
-
-		cs := FileStat{}
-		from, to := fp.Files()
-		if from == nil {
-			// New File is created.
-			cs.Name = to.Path()
-		} else if to == nil {
-			// File is deleted.
-			cs.Name = from.Path()
-		} else if from.Path() != to.Path() {
-			// File is renamed.
-			cs.Name = fmt.Sprintf("%s => %s", from.Path(), to.Path())
-		} else {
-			cs.Name = from.Path()
-		}
-
-		for _, chunk := range fp.Chunks() {
-			s := chunk.Content()
-			if len(s) == 0 {
-				continue
-			}
-
-			switch chunk.Type() {
-			case fdiff.Add:
-				cs.Addition += strings.Count(s, "\n")
-				if s[len(s)-1] != '\n' {
-					cs.Addition++
-				}
-			case fdiff.Delete:
-				cs.Deletion += strings.Count(s, "\n")
-				if s[len(s)-1] != '\n' {
-					cs.Deletion++
-				}
-			}
-		}
-
-		fileStats = append(fileStats, cs)
-	}
-
-	return fileStats
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/rename.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/rename.go
deleted file mode 100644
index 9d27dd1c3..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/rename.go
+++ /dev/null
@@ -1,816 +0,0 @@
-package object
-
-import (
-	"errors"
-	"io"
-	"sort"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie"
-)
-
-// DetectRenames detects the renames in the given changes on two trees with
-// the given options. It will return the given changes grouping additions and
-// deletions into modifications when possible.
-// If options is nil, the default diff tree options will be used.
-func DetectRenames(
-	changes Changes,
-	opts *DiffTreeOptions,
-) (Changes, error) {
-	if opts == nil {
-		opts = DefaultDiffTreeOptions
-	}
-
-	detector := &renameDetector{
-		renameScore: int(opts.RenameScore),
-		renameLimit: int(opts.RenameLimit),
-		onlyExact:   opts.OnlyExactRenames,
-	}
-
-	for _, c := range changes {
-		action, err := c.Action()
-		if err != nil {
-			return nil, err
-		}
-
-		switch action {
-		case merkletrie.Insert:
-			detector.added = append(detector.added, c)
-		case merkletrie.Delete:
-			detector.deleted = append(detector.deleted, c)
-		default:
-			detector.modified = append(detector.modified, c)
-		}
-	}
-
-	return detector.detect()
-}
-
-// renameDetector will detect and resolve renames in a set of changes.
-// see: https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
-type renameDetector struct {
-	added    []*Change
-	deleted  []*Change
-	modified []*Change
-
-	renameScore int
-	renameLimit int
-	onlyExact   bool
-}
-
-// detectExactRenames detects matches files that were deleted with files that
-// were added where the hash is the same on both. If there are multiple targets
-// the one with the most similar path will be chosen as the rename and the
-// rest as either deletions or additions.
-func (d *renameDetector) detectExactRenames() {
-	added := groupChangesByHash(d.added)
-	deletes := groupChangesByHash(d.deleted)
-	var uniqueAdds []*Change
-	var nonUniqueAdds [][]*Change
-	var addedLeft []*Change
-
-	for _, cs := range added {
-		if len(cs) == 1 {
-			uniqueAdds = append(uniqueAdds, cs[0])
-		} else {
-			nonUniqueAdds = append(nonUniqueAdds, cs)
-		}
-	}
-
-	for _, c := range uniqueAdds {
-		hash := changeHash(c)
-		deleted := deletes[hash]
-
-		if len(deleted) == 1 {
-			if sameMode(c, deleted[0]) {
-				d.modified = append(d.modified, &Change{From: deleted[0].From, To: c.To})
-				delete(deletes, hash)
-			} else {
-				addedLeft = append(addedLeft, c)
-			}
-		} else if len(deleted) > 1 {
-			bestMatch := bestNameMatch(c, deleted)
-			if bestMatch != nil && sameMode(c, bestMatch) {
-				d.modified = append(d.modified, &Change{From: bestMatch.From, To: c.To})
-				delete(deletes, hash)
-
-				var newDeletes = make([]*Change, 0, len(deleted)-1)
-				for _, d := range deleted {
-					if d != bestMatch {
-						newDeletes = append(newDeletes, d)
-					}
-				}
-				deletes[hash] = newDeletes
-			}
-		} else {
-			addedLeft = append(addedLeft, c)
-		}
-	}
-
-	for _, added := range nonUniqueAdds {
-		hash := changeHash(added[0])
-		deleted := deletes[hash]
-
-		if len(deleted) == 1 {
-			deleted := deleted[0]
-			bestMatch := bestNameMatch(deleted, added)
-			if bestMatch != nil && sameMode(deleted, bestMatch) {
-				d.modified = append(d.modified, &Change{From: deleted.From, To: bestMatch.To})
-				delete(deletes, hash)
-
-				for _, c := range added {
-					if c != bestMatch {
-						addedLeft = append(addedLeft, c)
-					}
-				}
-			} else {
-				addedLeft = append(addedLeft, added...)
-			}
-		} else if len(deleted) > 1 {
-			maxSize := len(deleted) * len(added)
-			if d.renameLimit > 0 && d.renameLimit < maxSize {
-				maxSize = d.renameLimit
-			}
-
-			matrix := make(similarityMatrix, 0, maxSize)
-
-			for delIdx, del := range deleted {
-				deletedName := changeName(del)
-
-				for addIdx, add := range added {
-					addedName := changeName(add)
-
-					score := nameSimilarityScore(addedName, deletedName)
-					matrix = append(matrix, similarityPair{added: addIdx, deleted: delIdx, score: score})
-
-					if len(matrix) >= maxSize {
-						break
-					}
-				}
-
-				if len(matrix) >= maxSize {
-					break
-				}
-			}
-
-			sort.Stable(matrix)
-
-			usedAdds := make(map[*Change]struct{})
-			usedDeletes := make(map[*Change]struct{})
-			for i := len(matrix) - 1; i >= 0; i-- {
-				del := deleted[matrix[i].deleted]
-				add := added[matrix[i].added]
-
-				if add == nil || del == nil {
-					// it was already matched
-					continue
-				}
-
-				usedAdds[add] = struct{}{}
-				usedDeletes[del] = struct{}{}
-				d.modified = append(d.modified, &Change{From: del.From, To: add.To})
-				added[matrix[i].added] = nil
-				deleted[matrix[i].deleted] = nil
-			}
-
-			for _, c := range added {
-				if _, ok := usedAdds[c]; !ok && c != nil {
-					addedLeft = append(addedLeft, c)
-				}
-			}
-
-			var newDeletes = make([]*Change, 0, len(deleted)-len(usedDeletes))
-			for _, c := range deleted {
-				if _, ok := usedDeletes[c]; !ok && c != nil {
-					newDeletes = append(newDeletes, c)
-				}
-			}
-			deletes[hash] = newDeletes
-		} else {
-			addedLeft = append(addedLeft, added...)
-		}
-	}
-
-	d.added = addedLeft
-	d.deleted = nil
-	for _, dels := range deletes {
-		d.deleted = append(d.deleted, dels...)
-	}
-}
-
-// detectContentRenames detects renames based on the similarity of the content
-// in the files by building a matrix of pairs between sources and destinations
-// and matching by the highest score.
-// see: https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java
-func (d *renameDetector) detectContentRenames() error {
-	cnt := max(len(d.added), len(d.deleted))
-	if d.renameLimit > 0 && cnt > d.renameLimit {
-		return nil
-	}
-
-	srcs, dsts := d.deleted, d.added
-	matrix, err := buildSimilarityMatrix(srcs, dsts, d.renameScore)
-	if err != nil {
-		return err
-	}
-	renames := make([]*Change, 0, min(len(matrix), len(dsts)))
-
-	// Match rename pairs on a first come, first serve basis until
-	// we have looked at everything that is above the minimum score.
-	for i := len(matrix) - 1; i >= 0; i-- {
-		pair := matrix[i]
-		src := srcs[pair.deleted]
-		dst := dsts[pair.added]
-
-		if dst == nil || src == nil {
-			// It was already matched before
-			continue
-		}
-
-		renames = append(renames, &Change{From: src.From, To: dst.To})
-
-		// Claim destination and source as matched
-		dsts[pair.added] = nil
-		srcs[pair.deleted] = nil
-	}
-
-	d.modified = append(d.modified, renames...)
-	d.added = compactChanges(dsts)
-	d.deleted = compactChanges(srcs)
-
-	return nil
-}
-
-func (d *renameDetector) detect() (Changes, error) {
-	if len(d.added) > 0 && len(d.deleted) > 0 {
-		d.detectExactRenames()
-
-		if !d.onlyExact {
-			if err := d.detectContentRenames(); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	result := make(Changes, 0, len(d.added)+len(d.deleted)+len(d.modified))
-	result = append(result, d.added...)
-	result = append(result, d.deleted...)
-	result = append(result, d.modified...)
-
-	sort.Stable(result)
-
-	return result, nil
-}
-
-func bestNameMatch(change *Change, changes []*Change) *Change {
-	var best *Change
-	var bestScore int
-
-	cname := changeName(change)
-
-	for _, c := range changes {
-		score := nameSimilarityScore(cname, changeName(c))
-		if score > bestScore {
-			bestScore = score
-			best = c
-		}
-	}
-
-	return best
-}
-
-func nameSimilarityScore(a, b string) int {
-	aDirLen := strings.LastIndexByte(a, '/') + 1
-	bDirLen := strings.LastIndexByte(b, '/') + 1
-
-	dirMin := min(aDirLen, bDirLen)
-	dirMax := max(aDirLen, bDirLen)
-
-	var dirScoreLtr, dirScoreRtl int
-	if dirMax == 0 {
-		dirScoreLtr = 100
-		dirScoreRtl = 100
-	} else {
-		var dirSim int
-
-		for ; dirSim < dirMin; dirSim++ {
-			if a[dirSim] != b[dirSim] {
-				break
-			}
-		}
-
-		dirScoreLtr = dirSim * 100 / dirMax
-
-		if dirScoreLtr == 100 {
-			dirScoreRtl = 100
-		} else {
-			for dirSim = 0; dirSim < dirMin; dirSim++ {
-				if a[aDirLen-1-dirSim] != b[bDirLen-1-dirSim] {
-					break
-				}
-			}
-			dirScoreRtl = dirSim * 100 / dirMax
-		}
-	}
-
-	fileMin := min(len(a)-aDirLen, len(b)-bDirLen)
-	fileMax := max(len(a)-aDirLen, len(b)-bDirLen)
-
-	fileSim := 0
-	for ; fileSim < fileMin; fileSim++ {
-		if a[len(a)-1-fileSim] != b[len(b)-1-fileSim] {
-			break
-		}
-	}
-	fileScore := fileSim * 100 / fileMax
-
-	return (((dirScoreLtr + dirScoreRtl) * 25) + (fileScore * 50)) / 100
-}
-
-func changeName(c *Change) string {
-	if c.To != empty {
-		return c.To.Name
-	}
-	return c.From.Name
-}
-
-func changeHash(c *Change) plumbing.Hash {
-	if c.To != empty {
-		return c.To.TreeEntry.Hash
-	}
-
-	return c.From.TreeEntry.Hash
-}
-
-func changeMode(c *Change) filemode.FileMode {
-	if c.To != empty {
-		return c.To.TreeEntry.Mode
-	}
-
-	return c.From.TreeEntry.Mode
-}
-
-func sameMode(a, b *Change) bool {
-	return changeMode(a) == changeMode(b)
-}
-
-func groupChangesByHash(changes []*Change) map[plumbing.Hash][]*Change {
-	var result = make(map[plumbing.Hash][]*Change)
-	for _, c := range changes {
-		hash := changeHash(c)
-		result[hash] = append(result[hash], c)
-	}
-	return result
-}
-
-type similarityMatrix []similarityPair
-
-func (m similarityMatrix) Len() int      { return len(m) }
-func (m similarityMatrix) Swap(i, j int) { m[i], m[j] = m[j], m[i] }
-func (m similarityMatrix) Less(i, j int) bool {
-	if m[i].score == m[j].score {
-		if m[i].added == m[j].added {
-			return m[i].deleted < m[j].deleted
-		}
-		return m[i].added < m[j].added
-	}
-	return m[i].score < m[j].score
-}
-
-type similarityPair struct {
-	// index of the added file
-	added int
-	// index of the deleted file
-	deleted int
-	// similarity score
-	score int
-}
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-const maxMatrixSize = 10000
-
-func buildSimilarityMatrix(srcs, dsts []*Change, renameScore int) (similarityMatrix, error) {
-	// Allocate for the worst-case scenario where every pair has a score
-	// that we need to consider. We might not need that many.
-	matrixSize := len(srcs) * len(dsts)
-	if matrixSize > maxMatrixSize {
-		matrixSize = maxMatrixSize
-	}
-	matrix := make(similarityMatrix, 0, matrixSize)
-	srcSizes := make([]int64, len(srcs))
-	dstSizes := make([]int64, len(dsts))
-	dstTooLarge := make(map[int]bool)
-
-	// Consider each pair of files, if the score is above the minimum
-	// threshold we need to record that scoring in the matrix so we can
-	// later find the best matches.
-outerLoop:
-	for srcIdx, src := range srcs {
-		if changeMode(src) != filemode.Regular {
-			continue
-		}
-
-		// Declare the from file and the similarity index here to be able to
-		// reuse it inside the inner loop. The reason to not initialize them
-		// here is so we can skip the initialization in case they happen to
-		// not be needed later. They will be initialized inside the inner
-		// loop if and only if they're needed and reused in subsequent passes.
-		var from *File
-		var s *similarityIndex
-		var err error
-		for dstIdx, dst := range dsts {
-			if changeMode(dst) != filemode.Regular {
-				continue
-			}
-
-			if dstTooLarge[dstIdx] {
-				continue
-			}
-
-			var to *File
-			srcSize := srcSizes[srcIdx]
-			if srcSize == 0 {
-				from, _, err = src.Files()
-				if err != nil {
-					return nil, err
-				}
-				srcSize = from.Size + 1
-				srcSizes[srcIdx] = srcSize
-			}
-
-			dstSize := dstSizes[dstIdx]
-			if dstSize == 0 {
-				_, to, err = dst.Files()
-				if err != nil {
-					return nil, err
-				}
-				dstSize = to.Size + 1
-				dstSizes[dstIdx] = dstSize
-			}
-
-			min, max := srcSize, dstSize
-			if dstSize < srcSize {
-				min = dstSize
-				max = srcSize
-			}
-
-			if int(min*100/max) < renameScore {
-				// File sizes are too different to be a match
-				continue
-			}
-
-			if s == nil {
-				s, err = fileSimilarityIndex(from)
-				if err != nil {
-					if err == errIndexFull {
-						continue outerLoop
-					}
-					return nil, err
-				}
-			}
-
-			if to == nil {
-				_, to, err = dst.Files()
-				if err != nil {
-					return nil, err
-				}
-			}
-
-			di, err := fileSimilarityIndex(to)
-			if err != nil {
-				if err == errIndexFull {
-					dstTooLarge[dstIdx] = true
-				}
-
-				return nil, err
-			}
-
-			contentScore := s.score(di, 10000)
-			// The name score returns a value between 0 and 100, so we need to
-			// convert it to the same range as the content score.
-			nameScore := nameSimilarityScore(src.From.Name, dst.To.Name) * 100
-			score := (contentScore*99 + nameScore*1) / 10000
-
-			if score < renameScore {
-				continue
-			}
-
-			matrix = append(matrix, similarityPair{added: dstIdx, deleted: srcIdx, score: score})
-		}
-	}
-
-	sort.Stable(matrix)
-
-	return matrix, nil
-}
-
-func compactChanges(changes []*Change) []*Change {
-	var result []*Change
-	for _, c := range changes {
-		if c != nil {
-			result = append(result, c)
-		}
-	}
-	return result
-}
-
-const (
-	keyShift      = 32
-	maxCountValue = (1 << keyShift) - 1
-)
-
-var errIndexFull = errors.New("index is full")
-
-// similarityIndex is an index structure of lines/blocks in one file.
-// This structure can be used to compute an approximation of the similarity
-// between two files.
-// To save space in memory, this index uses a space efficient encoding which
-// will not exceed 1MiB per instance. The index starts out at a smaller size
-// (closer to 2KiB), but may grow as more distinct blocks within the scanned
-// file are discovered.
-// see: https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java
-type similarityIndex struct {
-	hashed uint64
-	// number of non-zero entries in hashes
-	numHashes int
-	growAt    int
-	hashes    []keyCountPair
-	hashBits  int
-}
-
-func fileSimilarityIndex(f *File) (*similarityIndex, error) {
-	idx := newSimilarityIndex()
-	if err := idx.hash(f); err != nil {
-		return nil, err
-	}
-
-	sort.Stable(keyCountPairs(idx.hashes))
-
-	return idx, nil
-}
-
-func newSimilarityIndex() *similarityIndex {
-	return &similarityIndex{
-		hashBits: 8,
-		hashes:   make([]keyCountPair, 1<<8),
-		growAt:   shouldGrowAt(8),
-	}
-}
-
-func (i *similarityIndex) hash(f *File) error {
-	isBin, err := f.IsBinary()
-	if err != nil {
-		return err
-	}
-
-	r, err := f.Reader()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(r, &err)
-
-	return i.hashContent(r, f.Size, isBin)
-}
-
-func (i *similarityIndex) hashContent(r io.Reader, size int64, isBin bool) error {
-	var buf = make([]byte, 4096)
-	var ptr, cnt int
-	remaining := size
-
-	for 0 < remaining {
-		hash := 5381
-		var blockHashedCnt uint64
-
-		// Hash one line or block, whatever happens first
-		n := int64(0)
-		for {
-			if ptr == cnt {
-				ptr = 0
-				var err error
-				cnt, err = io.ReadFull(r, buf)
-				if err != nil && err != io.ErrUnexpectedEOF {
-					return err
-				}
-
-				if cnt == 0 {
-					return io.EOF
-				}
-			}
-			n++
-			c := buf[ptr] & 0xff
-			ptr++
-
-			// Ignore CR in CRLF sequence if it's text
-			if !isBin && c == '\r' && ptr < cnt && buf[ptr] == '\n' {
-				continue
-			}
-			blockHashedCnt++
-
-			if c == '\n' {
-				break
-			}
-
-			hash = (hash << 5) + hash + int(c)
-
-			if n >= 64 || n >= remaining {
-				break
-			}
-		}
-		i.hashed += blockHashedCnt
-		if err := i.add(hash, blockHashedCnt); err != nil {
-			return err
-		}
-		remaining -= n
-	}
-
-	return nil
-}
-
-// score computes the similarity score between this index and another one.
-// A region of a file is defined as a line in a text file or a fixed-size
-// block in a binary file. To prepare an index, each region in the file is
-// hashed; the values and counts of hashes are retained in a sorted table.
-// Define the similarity fraction F as the count of matching regions between
-// the two files divided between the maximum count of regions in either file.
-// The similarity score is F multiplied by the maxScore constant, yielding a
-// range [0, maxScore]. It is defined as maxScore for the degenerate case of
-// two empty files.
-// The similarity score is symmetrical; i.e. a.score(b) == b.score(a).
-func (i *similarityIndex) score(other *similarityIndex, maxScore int) int {
-	var maxHashed = i.hashed
-	if maxHashed < other.hashed {
-		maxHashed = other.hashed
-	}
-	if maxHashed == 0 {
-		return maxScore
-	}
-
-	return int(i.common(other) * uint64(maxScore) / maxHashed)
-}
-
-func (i *similarityIndex) common(dst *similarityIndex) uint64 {
-	srcIdx, dstIdx := 0, 0
-	if i.numHashes == 0 || dst.numHashes == 0 {
-		return 0
-	}
-
-	var common uint64
-	srcKey, dstKey := i.hashes[srcIdx].key(), dst.hashes[dstIdx].key()
-
-	for {
-		if srcKey == dstKey {
-			srcCnt, dstCnt := i.hashes[srcIdx].count(), dst.hashes[dstIdx].count()
-			if srcCnt < dstCnt {
-				common += srcCnt
-			} else {
-				common += dstCnt
-			}
-
-			srcIdx++
-			if srcIdx == len(i.hashes) {
-				break
-			}
-			srcKey = i.hashes[srcIdx].key()
-
-			dstIdx++
-			if dstIdx == len(dst.hashes) {
-				break
-			}
-			dstKey = dst.hashes[dstIdx].key()
-		} else if srcKey < dstKey {
-			// Region of src that is not in dst
-			srcIdx++
-			if srcIdx == len(i.hashes) {
-				break
-			}
-			srcKey = i.hashes[srcIdx].key()
-		} else {
-			// Region of dst that is not in src
-			dstIdx++
-			if dstIdx == len(dst.hashes) {
-				break
-			}
-			dstKey = dst.hashes[dstIdx].key()
-		}
-	}
-
-	return common
-}
-
-func (i *similarityIndex) add(key int, cnt uint64) error {
-	key = int(uint32(key) * 0x9e370001 >> 1)
-
-	j := i.slot(key)
-	for {
-		v := i.hashes[j]
-		if v == 0 {
-			// It's an empty slot, so we can store it here.
-			if i.growAt <= i.numHashes {
-				if err := i.grow(); err != nil {
-					return err
-				}
-				j = i.slot(key)
-				continue
-			}
-
-			var err error
-			i.hashes[j], err = newKeyCountPair(key, cnt)
-			if err != nil {
-				return err
-			}
-			i.numHashes++
-			return nil
-		} else if v.key() == key {
-			// It's the same key, so increment the counter.
-			var err error
-			i.hashes[j], err = newKeyCountPair(key, v.count()+cnt)
-			return err
-		} else if j+1 >= len(i.hashes) {
-			j = 0
-		} else {
-			j++
-		}
-	}
-}
-
-type keyCountPair uint64
-
-func newKeyCountPair(key int, cnt uint64) (keyCountPair, error) {
-	if cnt > maxCountValue {
-		return 0, errIndexFull
-	}
-
-	return keyCountPair((uint64(key) << keyShift) | cnt), nil
-}
-
-func (p keyCountPair) key() int {
-	return int(p >> keyShift)
-}
-
-func (p keyCountPair) count() uint64 {
-	return uint64(p) & maxCountValue
-}
-
-func (i *similarityIndex) slot(key int) int {
-	// We use 31 - hashBits because the upper bit was already forced
-	// to be 0 and we want the remaining high bits to be used as the
-	// table slot.
-	return int(uint32(key) >> uint(31-i.hashBits))
-}
-
-func shouldGrowAt(hashBits int) int {
-	return (1 << uint(hashBits)) * (hashBits - 3) / hashBits
-}
-
-func (i *similarityIndex) grow() error {
-	if i.hashBits == 30 {
-		return errIndexFull
-	}
-
-	old := i.hashes
-
-	i.hashBits++
-	i.growAt = shouldGrowAt(i.hashBits)
-
-	// TODO(erizocosmico): find a way to check if it will OOM and return
-	// errIndexFull instead.
-	i.hashes = make([]keyCountPair, 1<= len(i.hashes) {
-					j = 0
-				}
-			}
-			i.hashes[j] = v
-		}
-	}
-
-	return nil
-}
-
-type keyCountPairs []keyCountPair
-
-func (p keyCountPairs) Len() int           { return len(p) }
-func (p keyCountPairs) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-func (p keyCountPairs) Less(i, j int) bool { return p[i] < p[j] }
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/signature.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/signature.go
deleted file mode 100644
index f9c3d306b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/signature.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package object
-
-import "bytes"
-
-const (
-	signatureTypeUnknown signatureType = iota
-	signatureTypeOpenPGP
-	signatureTypeX509
-	signatureTypeSSH
-)
-
-var (
-	// openPGPSignatureFormat is the format of an OpenPGP signature.
-	openPGPSignatureFormat = signatureFormat{
-		[]byte("-----BEGIN PGP SIGNATURE-----"),
-		[]byte("-----BEGIN PGP MESSAGE-----"),
-	}
-	// x509SignatureFormat is the format of an X509 signature, which is
-	// a PKCS#7 (S/MIME) signature.
-	x509SignatureFormat = signatureFormat{
-		[]byte("-----BEGIN CERTIFICATE-----"),
-		[]byte("-----BEGIN SIGNED MESSAGE-----"),
-	}
-
-	// sshSignatureFormat is the format of an SSH signature.
-	sshSignatureFormat = signatureFormat{
-		[]byte("-----BEGIN SSH SIGNATURE-----"),
-	}
-)
-
-var (
-	// knownSignatureFormats is a map of known signature formats, indexed by
-	// their signatureType.
-	knownSignatureFormats = map[signatureType]signatureFormat{
-		signatureTypeOpenPGP: openPGPSignatureFormat,
-		signatureTypeX509:    x509SignatureFormat,
-		signatureTypeSSH:     sshSignatureFormat,
-	}
-)
-
-// signatureType represents the type of the signature.
-type signatureType int8
-
-// signatureFormat represents the beginning of a signature.
-type signatureFormat [][]byte
-
-// typeForSignature returns the type of the signature based on its format.
-func typeForSignature(b []byte) signatureType {
-	for t, i := range knownSignatureFormats {
-		for _, begin := range i {
-			if bytes.HasPrefix(b, begin) {
-				return t
-			}
-		}
-	}
-	return signatureTypeUnknown
-}
-
-// parseSignedBytes returns the position of the last signature block found in
-// the given bytes. If no signature block is found, it returns -1.
-//
-// When multiple signature blocks are found, the position of the last one is
-// returned. Any tailing bytes after this signature block start should be
-// considered part of the signature.
-//
-// Given this, it would be safe to use the returned position to split the bytes
-// into two parts: the first part containing the message, the second part
-// containing the signature.
-//
-// Example:
-//
-//	message := []byte(`Message with signature
-//
-//	-----BEGIN SSH SIGNATURE-----
-//	...`)
-//
-//	var signature string
-//	if pos, _ := parseSignedBytes(message); pos != -1 {
-//		signature = string(message[pos:])
-//		message = message[:pos]
-//	}
-//
-// This logic is on par with git's gpg-interface.c:parse_signed_buffer().
-// https://github.com/git/git/blob/7c2ef319c52c4997256f5807564523dfd4acdfc7/gpg-interface.c#L668
-func parseSignedBytes(b []byte) (int, signatureType) {
-	var n, match = 0, -1
-	var t signatureType
-	for n < len(b) {
-		var i = b[n:]
-		if st := typeForSignature(i); st != signatureTypeUnknown {
-			match = n
-			t = st
-		}
-		if eol := bytes.IndexByte(i, '\n'); eol >= 0 {
-			n += eol + 1
-			continue
-		}
-		// If we reach this point, we've reached the end.
-		break
-	}
-	return match, t
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/tag.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/tag.go
deleted file mode 100644
index 6e303af4c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/tag.go
+++ /dev/null
@@ -1,330 +0,0 @@
-package object
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-// Tag represents an annotated tag object. It points to a single git object of
-// any type, but tags typically are applied to commit or blob objects. It
-// provides a reference that associates the target with a tag name. It also
-// contains meta-information about the tag, including the tagger, tag date and
-// message.
-//
-// Note that this is not used for lightweight tags.
-//
-// https://git-scm.com/book/en/v2/Git-Internals-Git-References#Tags
-type Tag struct {
-	// Hash of the tag.
-	Hash plumbing.Hash
-	// Name of the tag.
-	Name string
-	// Tagger is the one who created the tag.
-	Tagger Signature
-	// Message is an arbitrary text message.
-	Message string
-	// PGPSignature is the PGP signature of the tag.
-	PGPSignature string
-	// TargetType is the object type of the target.
-	TargetType plumbing.ObjectType
-	// Target is the hash of the target object.
-	Target plumbing.Hash
-
-	s storer.EncodedObjectStorer
-}
-
-// GetTag gets a tag from an object storer and decodes it.
-func GetTag(s storer.EncodedObjectStorer, h plumbing.Hash) (*Tag, error) {
-	o, err := s.EncodedObject(plumbing.TagObject, h)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeTag(s, o)
-}
-
-// DecodeTag decodes an encoded object into a *Commit and associates it to the
-// given object storer.
-func DecodeTag(s storer.EncodedObjectStorer, o plumbing.EncodedObject) (*Tag, error) {
-	t := &Tag{s: s}
-	if err := t.Decode(o); err != nil {
-		return nil, err
-	}
-
-	return t, nil
-}
-
-// ID returns the object ID of the tag, not the object that the tag references.
-// The returned value will always match the current value of Tag.Hash.
-//
-// ID is present to fulfill the Object interface.
-func (t *Tag) ID() plumbing.Hash {
-	return t.Hash
-}
-
-// Type returns the type of object. It always returns plumbing.TagObject.
-//
-// Type is present to fulfill the Object interface.
-func (t *Tag) Type() plumbing.ObjectType {
-	return plumbing.TagObject
-}
-
-// Decode transforms a plumbing.EncodedObject into a Tag struct.
-func (t *Tag) Decode(o plumbing.EncodedObject) (err error) {
-	if o.Type() != plumbing.TagObject {
-		return ErrUnsupportedObject
-	}
-
-	t.Hash = o.Hash()
-
-	reader, err := o.Reader()
-	if err != nil {
-		return err
-	}
-	defer ioutil.CheckClose(reader, &err)
-
-	r := sync.GetBufioReader(reader)
-	defer sync.PutBufioReader(r)
-
-	for {
-		var line []byte
-		line, err = r.ReadBytes('\n')
-		if err != nil && err != io.EOF {
-			return err
-		}
-
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 {
-			break // Start of message
-		}
-
-		split := bytes.SplitN(line, []byte{' '}, 2)
-		switch string(split[0]) {
-		case "object":
-			t.Target = plumbing.NewHash(string(split[1]))
-		case "type":
-			t.TargetType, err = plumbing.ParseObjectType(string(split[1]))
-			if err != nil {
-				return err
-			}
-		case "tag":
-			t.Name = string(split[1])
-		case "tagger":
-			t.Tagger.Decode(split[1])
-		}
-
-		if err == io.EOF {
-			return nil
-		}
-	}
-
-	data, err := io.ReadAll(r)
-	if err != nil {
-		return err
-	}
-	if sm, _ := parseSignedBytes(data); sm >= 0 {
-		t.PGPSignature = string(data[sm:])
-		data = data[:sm]
-	}
-	t.Message = string(data)
-
-	return nil
-}
-
-// Encode transforms a Tag into a plumbing.EncodedObject.
-func (t *Tag) Encode(o plumbing.EncodedObject) error {
-	return t.encode(o, true)
-}
-
-// EncodeWithoutSignature export a Tag into a plumbing.EncodedObject without the signature (correspond to the payload of the PGP signature).
-func (t *Tag) EncodeWithoutSignature(o plumbing.EncodedObject) error {
-	return t.encode(o, false)
-}
-
-func (t *Tag) encode(o plumbing.EncodedObject, includeSig bool) (err error) {
-	o.SetType(plumbing.TagObject)
-	w, err := o.Writer()
-	if err != nil {
-		return err
-	}
-	defer ioutil.CheckClose(w, &err)
-
-	if _, err = fmt.Fprintf(w,
-		"object %s\ntype %s\ntag %s\ntagger ",
-		t.Target.String(), t.TargetType.Bytes(), t.Name); err != nil {
-		return err
-	}
-
-	if err = t.Tagger.Encode(w); err != nil {
-		return err
-	}
-
-	if _, err = fmt.Fprint(w, "\n\n"); err != nil {
-		return err
-	}
-
-	if _, err = fmt.Fprint(w, t.Message); err != nil {
-		return err
-	}
-
-	// Note that this is highly sensitive to what it sent along in the message.
-	// Message *always* needs to end with a newline, or else the message and the
-	// signature will be concatenated into a corrupt object. Since this is a
-	// lower-level method, we assume you know what you are doing and have already
-	// done the needful on the message in the caller.
-	if includeSig {
-		if _, err = fmt.Fprint(w, t.PGPSignature); err != nil {
-			return err
-		}
-	}
-
-	return err
-}
-
-// Commit returns the commit pointed to by the tag. If the tag points to a
-// different type of object ErrUnsupportedObject will be returned.
-func (t *Tag) Commit() (*Commit, error) {
-	if t.TargetType != plumbing.CommitObject {
-		return nil, ErrUnsupportedObject
-	}
-
-	o, err := t.s.EncodedObject(plumbing.CommitObject, t.Target)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeCommit(t.s, o)
-}
-
-// Tree returns the tree pointed to by the tag. If the tag points to a commit
-// object the tree of that commit will be returned. If the tag does not point
-// to a commit or tree object ErrUnsupportedObject will be returned.
-func (t *Tag) Tree() (*Tree, error) {
-	switch t.TargetType {
-	case plumbing.CommitObject:
-		c, err := t.Commit()
-		if err != nil {
-			return nil, err
-		}
-
-		return c.Tree()
-	case plumbing.TreeObject:
-		return GetTree(t.s, t.Target)
-	default:
-		return nil, ErrUnsupportedObject
-	}
-}
-
-// Blob returns the blob pointed to by the tag. If the tag points to a
-// different type of object ErrUnsupportedObject will be returned.
-func (t *Tag) Blob() (*Blob, error) {
-	if t.TargetType != plumbing.BlobObject {
-		return nil, ErrUnsupportedObject
-	}
-
-	return GetBlob(t.s, t.Target)
-}
-
-// Object returns the object pointed to by the tag.
-func (t *Tag) Object() (Object, error) {
-	o, err := t.s.EncodedObject(t.TargetType, t.Target)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeObject(t.s, o)
-}
-
-// String returns the meta information contained in the tag as a formatted
-// string.
-func (t *Tag) String() string {
-	obj, _ := t.Object()
-
-	return fmt.Sprintf(
-		"%s %s\nTagger: %s\nDate:   %s\n\n%s\n%s",
-		plumbing.TagObject, t.Name, t.Tagger.String(), t.Tagger.When.Format(DateFormat),
-		t.Message, objectAsString(obj),
-	)
-}
-
-// Verify performs PGP verification of the tag with a provided armored
-// keyring and returns openpgp.Entity associated with verifying key on success.
-func (t *Tag) Verify(armoredKeyRing string) (*openpgp.Entity, error) {
-	keyRingReader := strings.NewReader(armoredKeyRing)
-	keyring, err := openpgp.ReadArmoredKeyRing(keyRingReader)
-	if err != nil {
-		return nil, err
-	}
-
-	// Extract signature.
-	signature := strings.NewReader(t.PGPSignature)
-
-	encoded := &plumbing.MemoryObject{}
-	// Encode tag components, excluding signature and get a reader object.
-	if err := t.EncodeWithoutSignature(encoded); err != nil {
-		return nil, err
-	}
-	er, err := encoded.Reader()
-	if err != nil {
-		return nil, err
-	}
-
-	return openpgp.CheckArmoredDetachedSignature(keyring, er, signature, nil)
-}
-
-// TagIter provides an iterator for a set of tags.
-type TagIter struct {
-	storer.EncodedObjectIter
-	s storer.EncodedObjectStorer
-}
-
-// NewTagIter takes a storer.EncodedObjectStorer and a
-// storer.EncodedObjectIter and returns a *TagIter that iterates over all
-// tags contained in the storer.EncodedObjectIter.
-//
-// Any non-tag object returned by the storer.EncodedObjectIter is skipped.
-func NewTagIter(s storer.EncodedObjectStorer, iter storer.EncodedObjectIter) *TagIter {
-	return &TagIter{iter, s}
-}
-
-// Next moves the iterator to the next tag and returns a pointer to it. If
-// there are no more tags, it returns io.EOF.
-func (iter *TagIter) Next() (*Tag, error) {
-	obj, err := iter.EncodedObjectIter.Next()
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeTag(iter.s, obj)
-}
-
-// ForEach call the cb function for each tag contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *TagIter) ForEach(cb func(*Tag) error) error {
-	return iter.EncodedObjectIter.ForEach(func(obj plumbing.EncodedObject) error {
-		t, err := DecodeTag(iter.s, obj)
-		if err != nil {
-			return err
-		}
-
-		return cb(t)
-	})
-}
-
-func objectAsString(obj Object) string {
-	switch o := obj.(type) {
-	case *Commit:
-		return o.String()
-	default:
-		return ""
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/tree.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/tree.go
deleted file mode 100644
index 35a30958a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/tree.go
+++ /dev/null
@@ -1,558 +0,0 @@
-package object
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"path"
-	"path/filepath"
-	"sort"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-const (
-	maxTreeDepth      = 1024
-	startingStackSize = 8
-)
-
-// New errors defined by this package.
-var (
-	ErrMaxTreeDepth      = errors.New("maximum tree depth exceeded")
-	ErrFileNotFound      = errors.New("file not found")
-	ErrDirectoryNotFound = errors.New("directory not found")
-	ErrEntryNotFound     = errors.New("entry not found")
-	ErrEntriesNotSorted  = errors.New("entries in tree are not sorted")
-)
-
-// Tree is basically like a directory - it references a bunch of other trees
-// and/or blobs (i.e. files and sub-directories)
-type Tree struct {
-	Entries []TreeEntry
-	Hash    plumbing.Hash
-
-	s storer.EncodedObjectStorer
-	m map[string]*TreeEntry
-	t map[string]*Tree // tree path cache
-}
-
-// GetTree gets a tree from an object storer and decodes it.
-func GetTree(s storer.EncodedObjectStorer, h plumbing.Hash) (*Tree, error) {
-	o, err := s.EncodedObject(plumbing.TreeObject, h)
-	if err != nil {
-		return nil, err
-	}
-
-	return DecodeTree(s, o)
-}
-
-// DecodeTree decodes an encoded object into a *Tree and associates it to the
-// given object storer.
-func DecodeTree(s storer.EncodedObjectStorer, o plumbing.EncodedObject) (*Tree, error) {
-	t := &Tree{s: s}
-	if err := t.Decode(o); err != nil {
-		return nil, err
-	}
-
-	return t, nil
-}
-
-// TreeEntry represents a file
-type TreeEntry struct {
-	Name string
-	Mode filemode.FileMode
-	Hash plumbing.Hash
-}
-
-// File returns the hash of the file identified by the `path` argument.
-// The path is interpreted as relative to the tree receiver.
-func (t *Tree) File(path string) (*File, error) {
-	e, err := t.FindEntry(path)
-	if err != nil {
-		return nil, ErrFileNotFound
-	}
-
-	blob, err := GetBlob(t.s, e.Hash)
-	if err != nil {
-		if err == plumbing.ErrObjectNotFound {
-			return nil, ErrFileNotFound
-		}
-		return nil, err
-	}
-
-	return NewFile(path, e.Mode, blob), nil
-}
-
-// Size returns the plaintext size of an object, without reading it
-// into memory.
-func (t *Tree) Size(path string) (int64, error) {
-	e, err := t.FindEntry(path)
-	if err != nil {
-		return 0, ErrEntryNotFound
-	}
-
-	return t.s.EncodedObjectSize(e.Hash)
-}
-
-// Tree returns the tree identified by the `path` argument.
-// The path is interpreted as relative to the tree receiver.
-func (t *Tree) Tree(path string) (*Tree, error) {
-	e, err := t.FindEntry(path)
-	if err != nil {
-		return nil, ErrDirectoryNotFound
-	}
-
-	tree, err := GetTree(t.s, e.Hash)
-	if err == plumbing.ErrObjectNotFound {
-		return nil, ErrDirectoryNotFound
-	}
-
-	return tree, err
-}
-
-// TreeEntryFile returns the *File for a given *TreeEntry.
-func (t *Tree) TreeEntryFile(e *TreeEntry) (*File, error) {
-	blob, err := GetBlob(t.s, e.Hash)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewFile(e.Name, e.Mode, blob), nil
-}
-
-// FindEntry search a TreeEntry in this tree or any subtree.
-func (t *Tree) FindEntry(path string) (*TreeEntry, error) {
-	if t.t == nil {
-		t.t = make(map[string]*Tree)
-	}
-
-	pathParts := strings.Split(path, "/")
-	startingTree := t
-	pathCurrent := ""
-
-	// search for the longest path in the tree path cache
-	for i := len(pathParts) - 1; i > 1; i-- {
-		path := filepath.Join(pathParts[:i]...)
-
-		tree, ok := t.t[path]
-		if ok {
-			startingTree = tree
-			pathParts = pathParts[i:]
-			pathCurrent = path
-
-			break
-		}
-	}
-
-	var tree *Tree
-	var err error
-	for tree = startingTree; len(pathParts) > 1; pathParts = pathParts[1:] {
-		if tree, err = tree.dir(pathParts[0]); err != nil {
-			return nil, err
-		}
-
-		pathCurrent = filepath.Join(pathCurrent, pathParts[0])
-		t.t[pathCurrent] = tree
-	}
-
-	return tree.entry(pathParts[0])
-}
-
-func (t *Tree) dir(baseName string) (*Tree, error) {
-	entry, err := t.entry(baseName)
-	if err != nil {
-		return nil, ErrDirectoryNotFound
-	}
-
-	obj, err := t.s.EncodedObject(plumbing.TreeObject, entry.Hash)
-	if err != nil {
-		return nil, err
-	}
-
-	tree := &Tree{s: t.s}
-	err = tree.Decode(obj)
-
-	return tree, err
-}
-
-func (t *Tree) entry(baseName string) (*TreeEntry, error) {
-	if t.m == nil {
-		t.buildMap()
-	}
-
-	entry, ok := t.m[baseName]
-	if !ok {
-		return nil, ErrEntryNotFound
-	}
-
-	return entry, nil
-}
-
-// Files returns a FileIter allowing to iterate over the Tree
-func (t *Tree) Files() *FileIter {
-	return NewFileIter(t.s, t)
-}
-
-// ID returns the object ID of the tree. The returned value will always match
-// the current value of Tree.Hash.
-//
-// ID is present to fulfill the Object interface.
-func (t *Tree) ID() plumbing.Hash {
-	return t.Hash
-}
-
-// Type returns the type of object. It always returns plumbing.TreeObject.
-func (t *Tree) Type() plumbing.ObjectType {
-	return plumbing.TreeObject
-}
-
-// Decode transform an plumbing.EncodedObject into a Tree struct
-func (t *Tree) Decode(o plumbing.EncodedObject) (err error) {
-	if o.Type() != plumbing.TreeObject {
-		return ErrUnsupportedObject
-	}
-
-	t.Hash = o.Hash()
-	if o.Size() == 0 {
-		return nil
-	}
-
-	t.Entries = nil
-	t.m = nil
-
-	reader, err := o.Reader()
-	if err != nil {
-		return err
-	}
-	defer ioutil.CheckClose(reader, &err)
-
-	r := sync.GetBufioReader(reader)
-	defer sync.PutBufioReader(r)
-
-	for {
-		str, err := r.ReadString(' ')
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-
-			return err
-		}
-		str = str[:len(str)-1] // strip last byte (' ')
-
-		mode, err := filemode.New(str)
-		if err != nil {
-			return err
-		}
-
-		name, err := r.ReadString(0)
-		if err != nil && err != io.EOF {
-			return err
-		}
-
-		var hash plumbing.Hash
-		if _, err = io.ReadFull(r, hash[:]); err != nil {
-			return err
-		}
-
-		baseName := name[:len(name)-1]
-		t.Entries = append(t.Entries, TreeEntry{
-			Hash: hash,
-			Mode: mode,
-			Name: baseName,
-		})
-	}
-
-	return nil
-}
-
-type TreeEntrySorter []TreeEntry
-
-func (s TreeEntrySorter) Len() int {
-	return len(s)
-}
-
-func (s TreeEntrySorter) Less(i, j int) bool {
-	name1 := s[i].Name
-	name2 := s[j].Name
-	if s[i].Mode == filemode.Dir {
-		name1 += "/"
-	}
-	if s[j].Mode == filemode.Dir {
-		name2 += "/"
-	}
-	return name1 < name2
-}
-
-func (s TreeEntrySorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-// Encode transforms a Tree into a plumbing.EncodedObject.
-// The tree entries must be sorted by name.
-func (t *Tree) Encode(o plumbing.EncodedObject) (err error) {
-	o.SetType(plumbing.TreeObject)
-	w, err := o.Writer()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	if !sort.IsSorted(TreeEntrySorter(t.Entries)) {
-		return ErrEntriesNotSorted
-	}
-
-	for _, entry := range t.Entries {
-		if strings.IndexByte(entry.Name, 0) != -1 {
-			return fmt.Errorf("malformed filename %q", entry.Name)
-		}
-		if _, err = fmt.Fprintf(w, "%o %s", entry.Mode, entry.Name); err != nil {
-			return err
-		}
-
-		if _, err = w.Write([]byte{0x00}); err != nil {
-			return err
-		}
-
-		if _, err = w.Write(entry.Hash[:]); err != nil {
-			return err
-		}
-	}
-
-	return err
-}
-
-func (t *Tree) buildMap() {
-	t.m = make(map[string]*TreeEntry)
-	for i := 0; i < len(t.Entries); i++ {
-		t.m[t.Entries[i].Name] = &t.Entries[i]
-	}
-}
-
-// Diff returns a list of changes between this tree and the provided one
-func (t *Tree) Diff(to *Tree) (Changes, error) {
-	return t.DiffContext(context.Background(), to)
-}
-
-// DiffContext returns a list of changes between this tree and the provided one
-// Error will be returned if context expires. Provided context must be non nil.
-//
-// NOTE: Since version 5.1.0 the renames are correctly handled, the settings
-// used are the recommended options DefaultDiffTreeOptions.
-func (t *Tree) DiffContext(ctx context.Context, to *Tree) (Changes, error) {
-	return DiffTreeWithOptions(ctx, t, to, DefaultDiffTreeOptions)
-}
-
-// Patch returns a slice of Patch objects with all the changes between trees
-// in chunks. This representation can be used to create several diff outputs.
-func (t *Tree) Patch(to *Tree) (*Patch, error) {
-	return t.PatchContext(context.Background(), to)
-}
-
-// PatchContext returns a slice of Patch objects with all the changes between
-// trees in chunks. This representation can be used to create several diff
-// outputs. If context expires, an error will be returned. Provided context must
-// be non-nil.
-//
-// NOTE: Since version 5.1.0 the renames are correctly handled, the settings
-// used are the recommended options DefaultDiffTreeOptions.
-func (t *Tree) PatchContext(ctx context.Context, to *Tree) (*Patch, error) {
-	changes, err := t.DiffContext(ctx, to)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes.PatchContext(ctx)
-}
-
-// treeEntryIter facilitates iterating through the TreeEntry objects in a Tree.
-type treeEntryIter struct {
-	t   *Tree
-	pos int
-}
-
-func (iter *treeEntryIter) Next() (TreeEntry, error) {
-	if iter.pos >= len(iter.t.Entries) {
-		return TreeEntry{}, io.EOF
-	}
-	iter.pos++
-	return iter.t.Entries[iter.pos-1], nil
-}
-
-// TreeWalker provides a means of walking through all of the entries in a Tree.
-type TreeWalker struct {
-	stack     []*treeEntryIter
-	base      string
-	recursive bool
-	seen      map[plumbing.Hash]bool
-
-	s storer.EncodedObjectStorer
-	t *Tree
-}
-
-// NewTreeWalker returns a new TreeWalker for the given tree.
-//
-// It is the caller's responsibility to call Close() when finished with the
-// tree walker.
-func NewTreeWalker(t *Tree, recursive bool, seen map[plumbing.Hash]bool) *TreeWalker {
-	stack := make([]*treeEntryIter, 0, startingStackSize)
-	stack = append(stack, &treeEntryIter{t, 0})
-
-	return &TreeWalker{
-		stack:     stack,
-		recursive: recursive,
-		seen:      seen,
-
-		s: t.s,
-		t: t,
-	}
-}
-
-// Next returns the next object from the tree. Objects are returned in order
-// and subtrees are included. After the last object has been returned further
-// calls to Next() will return io.EOF.
-//
-// In the current implementation any objects which cannot be found in the
-// underlying repository will be skipped automatically. It is possible that this
-// may change in future versions.
-func (w *TreeWalker) Next() (name string, entry TreeEntry, err error) {
-	var obj *Tree
-	for {
-		current := len(w.stack) - 1
-		if current < 0 {
-			// Nothing left on the stack so we're finished
-			err = io.EOF
-			return
-		}
-
-		if current > maxTreeDepth {
-			// We're probably following bad data or some self-referencing tree
-			err = ErrMaxTreeDepth
-			return
-		}
-
-		entry, err = w.stack[current].Next()
-		if err == io.EOF {
-			// Finished with the current tree, move back up to the parent
-			w.stack = w.stack[:current]
-			w.base, _ = path.Split(w.base)
-			w.base = strings.TrimSuffix(w.base, "/")
-			continue
-		}
-
-		if err != nil {
-			return
-		}
-
-		if w.seen[entry.Hash] {
-			continue
-		}
-
-		if entry.Mode == filemode.Dir {
-			obj, err = GetTree(w.s, entry.Hash)
-		}
-
-		name = simpleJoin(w.base, entry.Name)
-
-		if err != nil {
-			err = io.EOF
-			return
-		}
-
-		break
-	}
-
-	if !w.recursive {
-		return
-	}
-
-	if obj != nil {
-		w.stack = append(w.stack, &treeEntryIter{obj, 0})
-		w.base = simpleJoin(w.base, entry.Name)
-	}
-
-	return
-}
-
-// Tree returns the tree that the tree walker most recently operated on.
-func (w *TreeWalker) Tree() *Tree {
-	current := len(w.stack) - 1
-	if w.stack[current].pos == 0 {
-		current--
-	}
-
-	if current < 0 {
-		return nil
-	}
-
-	return w.stack[current].t
-}
-
-// Close releases any resources used by the TreeWalker.
-func (w *TreeWalker) Close() {
-	w.stack = nil
-}
-
-// TreeIter provides an iterator for a set of trees.
-type TreeIter struct {
-	storer.EncodedObjectIter
-	s storer.EncodedObjectStorer
-}
-
-// NewTreeIter takes a storer.EncodedObjectStorer and a
-// storer.EncodedObjectIter and returns a *TreeIter that iterates over all
-// tree contained in the storer.EncodedObjectIter.
-//
-// Any non-tree object returned by the storer.EncodedObjectIter is skipped.
-func NewTreeIter(s storer.EncodedObjectStorer, iter storer.EncodedObjectIter) *TreeIter {
-	return &TreeIter{iter, s}
-}
-
-// Next moves the iterator to the next tree and returns a pointer to it. If
-// there are no more trees, it returns io.EOF.
-func (iter *TreeIter) Next() (*Tree, error) {
-	for {
-		obj, err := iter.EncodedObjectIter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if obj.Type() != plumbing.TreeObject {
-			continue
-		}
-
-		return DecodeTree(iter.s, obj)
-	}
-}
-
-// ForEach call the cb function for each tree contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *TreeIter) ForEach(cb func(*Tree) error) error {
-	return iter.EncodedObjectIter.ForEach(func(obj plumbing.EncodedObject) error {
-		if obj.Type() != plumbing.TreeObject {
-			return nil
-		}
-
-		t, err := DecodeTree(iter.s, obj)
-		if err != nil {
-			return err
-		}
-
-		return cb(t)
-	})
-}
-
-func simpleJoin(parent, child string) string {
-	if len(parent) > 0 {
-		return parent + "/" + child
-	}
-	return child
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/treenoder.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/treenoder.go
deleted file mode 100644
index ae281b0f0..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/object/treenoder.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package object
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// A treenoder is a helper type that wraps git trees into merkletrie
-// noders.
-//
-// As a merkletrie noder doesn't understand the concept of modes (e.g.
-// file permissions), the treenoder includes the mode of the git tree in
-// the hash, so changes in the modes will be detected as modifications
-// to the file contents by the merkletrie difftree algorithm.  This is
-// consistent with how the "git diff-tree" command works.
-type treeNoder struct {
-	parent   *Tree  // the root node is its own parent
-	name     string // empty string for the root node
-	mode     filemode.FileMode
-	hash     plumbing.Hash
-	children []noder.Noder // memoized
-}
-
-// NewTreeRootNode returns the root node of a Tree
-func NewTreeRootNode(t *Tree) noder.Noder {
-	if t == nil {
-		return &treeNoder{}
-	}
-
-	return &treeNoder{
-		parent: t,
-		name:   "",
-		mode:   filemode.Dir,
-		hash:   t.Hash,
-	}
-}
-
-func (t *treeNoder) Skip() bool {
-	return false
-}
-
-func (t *treeNoder) isRoot() bool {
-	return t.name == ""
-}
-
-func (t *treeNoder) String() string {
-	return "treeNoder <" + t.name + ">"
-}
-
-func (t *treeNoder) Hash() []byte {
-	if t.mode == filemode.Deprecated {
-		return append(t.hash[:], filemode.Regular.Bytes()...)
-	}
-	return append(t.hash[:], t.mode.Bytes()...)
-}
-
-func (t *treeNoder) Name() string {
-	return t.name
-}
-
-func (t *treeNoder) IsDir() bool {
-	return t.mode == filemode.Dir
-}
-
-// Children will return the children of a treenoder as treenoders,
-// building them from the children of the wrapped git tree.
-func (t *treeNoder) Children() ([]noder.Noder, error) {
-	if t.mode != filemode.Dir {
-		return noder.NoChildren, nil
-	}
-
-	// children are memoized for efficiency
-	if t.children != nil {
-		return t.children, nil
-	}
-
-	// the parent of the returned children will be ourself as a tree if
-	// we are a not the root treenoder.  The root is special as it
-	// is is own parent.
-	parent := t.parent
-	if !t.isRoot() {
-		var err error
-		if parent, err = t.parent.Tree(t.name); err != nil {
-			return nil, err
-		}
-	}
-
-	var err error
-	t.children, err = transformChildren(parent)
-	return t.children, err
-}
-
-// Returns the children of a tree as treenoders.
-// Efficiency is key here.
-func transformChildren(t *Tree) ([]noder.Noder, error) {
-	var err error
-	var e TreeEntry
-
-	// there will be more tree entries than children in the tree,
-	// due to submodules and empty directories, but I think it is still
-	// worth it to pre-allocate the whole array now, even if sometimes
-	// is bigger than needed.
-	ret := make([]noder.Noder, 0, len(t.Entries))
-
-	walker := NewTreeWalker(t, false, nil) // don't recurse
-	// don't defer walker.Close() for efficiency reasons.
-	for {
-		_, e, err = walker.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			walker.Close()
-			return nil, err
-		}
-
-		ret = append(ret, &treeNoder{
-			parent: t,
-			name:   e.Name,
-			mode:   e.Mode,
-			hash:   e.Hash,
-		})
-	}
-	walker.Close()
-
-	return ret, nil
-}
-
-// len(t.tree.Entries) != the number of elements walked by treewalker
-// for some reason because of empty directories, submodules, etc, so we
-// have to walk here.
-func (t *treeNoder) NumChildren() (int, error) {
-	children, err := t.Children()
-	if err != nil {
-		return 0, err
-	}
-
-	return len(children), nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs.go
deleted file mode 100644
index 7bc053dc5..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs.go
+++ /dev/null
@@ -1,211 +0,0 @@
-package packp
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/storage/memory"
-)
-
-// AdvRefs values represent the information transmitted on an
-// advertised-refs message.  Values from this type are not zero-value
-// safe, use the New function instead.
-type AdvRefs struct {
-	// Prefix stores prefix payloads.
-	//
-	// When using this message over (smart) HTTP, you have to add a pktline
-	// before the whole thing with the following payload:
-	//
-	// '# service=$servicename" LF
-	//
-	// Moreover, some (all) git HTTP smart servers will send a flush-pkt
-	// just after the first pkt-line.
-	//
-	// To accommodate both situations, the Prefix field allow you to store
-	// any data you want to send before the actual pktlines.  It will also
-	// be filled up with whatever is found on the line.
-	Prefix [][]byte
-	// Head stores the resolved HEAD reference if present.
-	// This can be present with git-upload-pack, not with git-receive-pack.
-	Head *plumbing.Hash
-	// Capabilities are the capabilities.
-	Capabilities *capability.List
-	// References are the hash references.
-	References map[string]plumbing.Hash
-	// Peeled are the peeled hash references.
-	Peeled map[string]plumbing.Hash
-	// Shallows are the shallow object ids.
-	Shallows []plumbing.Hash
-}
-
-// NewAdvRefs returns a pointer to a new AdvRefs value, ready to be used.
-func NewAdvRefs() *AdvRefs {
-	return &AdvRefs{
-		Prefix:       [][]byte{},
-		Capabilities: capability.NewList(),
-		References:   make(map[string]plumbing.Hash),
-		Peeled:       make(map[string]plumbing.Hash),
-		Shallows:     []plumbing.Hash{},
-	}
-}
-
-func (a *AdvRefs) AddReference(r *plumbing.Reference) error {
-	switch r.Type() {
-	case plumbing.SymbolicReference:
-		v := fmt.Sprintf("%s:%s", r.Name().String(), r.Target().String())
-		return a.Capabilities.Add(capability.SymRef, v)
-	case plumbing.HashReference:
-		a.References[r.Name().String()] = r.Hash()
-	default:
-		return plumbing.ErrInvalidType
-	}
-
-	return nil
-}
-
-func (a *AdvRefs) AllReferences() (memory.ReferenceStorage, error) {
-	s := memory.ReferenceStorage{}
-	if err := a.addRefs(s); err != nil {
-		return s, plumbing.NewUnexpectedError(err)
-	}
-
-	return s, nil
-}
-
-func (a *AdvRefs) addRefs(s storer.ReferenceStorer) error {
-	for name, hash := range a.References {
-		ref := plumbing.NewReferenceFromStrings(name, hash.String())
-		if err := s.SetReference(ref); err != nil {
-			return err
-		}
-	}
-
-	if a.supportSymrefs() {
-		return a.addSymbolicRefs(s)
-	}
-
-	return a.resolveHead(s)
-}
-
-// If the server does not support symrefs capability,
-// we need to guess the reference where HEAD is pointing to.
-//
-// Git versions prior to 1.8.4.3 has an special procedure to get
-// the reference where is pointing to HEAD:
-//   - Check if a reference called master exists. If exists and it
-//     has the same hash as HEAD hash, we can say that HEAD is pointing to master
-//   - If master does not exists or does not have the same hash as HEAD,
-//     order references and check in that order if that reference has the same
-//     hash than HEAD. If yes, set HEAD pointing to that branch hash
-//   - If no reference is found, throw an error
-func (a *AdvRefs) resolveHead(s storer.ReferenceStorer) error {
-	if a.Head == nil {
-		return nil
-	}
-
-	ref, err := s.Reference(plumbing.Master)
-
-	// check first if HEAD is pointing to master
-	if err == nil {
-		ok, err := a.createHeadIfCorrectReference(ref, s)
-		if err != nil {
-			return err
-		}
-
-		if ok {
-			return nil
-		}
-	}
-
-	if err != nil && err != plumbing.ErrReferenceNotFound {
-		return err
-	}
-
-	// From here we are trying to guess the branch that HEAD is pointing
-	refIter, err := s.IterReferences()
-	if err != nil {
-		return err
-	}
-
-	var refNames []string
-	err = refIter.ForEach(func(r *plumbing.Reference) error {
-		refNames = append(refNames, string(r.Name()))
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	sort.Strings(refNames)
-
-	var headSet bool
-	for _, refName := range refNames {
-		ref, err := s.Reference(plumbing.ReferenceName(refName))
-		if err != nil {
-			return err
-		}
-		ok, err := a.createHeadIfCorrectReference(ref, s)
-		if err != nil {
-			return err
-		}
-		if ok {
-			headSet = true
-			break
-		}
-	}
-
-	if !headSet {
-		return plumbing.ErrReferenceNotFound
-	}
-
-	return nil
-}
-
-func (a *AdvRefs) createHeadIfCorrectReference(
-	reference *plumbing.Reference,
-	s storer.ReferenceStorer) (bool, error) {
-	if reference.Hash() == *a.Head {
-		headRef := plumbing.NewSymbolicReference(plumbing.HEAD, reference.Name())
-		if err := s.SetReference(headRef); err != nil {
-			return false, err
-		}
-
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (a *AdvRefs) addSymbolicRefs(s storer.ReferenceStorer) error {
-	for _, symref := range a.Capabilities.Get(capability.SymRef) {
-		chunks := strings.Split(symref, ":")
-		if len(chunks) != 2 {
-			err := fmt.Errorf("bad number of `:` in symref value (%q)", symref)
-			return plumbing.NewUnexpectedError(err)
-		}
-		name := plumbing.ReferenceName(chunks[0])
-		target := plumbing.ReferenceName(chunks[1])
-		ref := plumbing.NewSymbolicReference(name, target)
-		if err := s.SetReference(ref); err != nil {
-			return nil
-		}
-	}
-
-	return nil
-}
-
-func (a *AdvRefs) supportSymrefs() bool {
-	return a.Capabilities.Supports(capability.SymRef)
-}
-
-// IsEmpty returns true if doesn't contain any reference.
-func (a *AdvRefs) IsEmpty() bool {
-	return a.Head == nil &&
-		len(a.References) == 0 &&
-		len(a.Peeled) == 0 &&
-		len(a.Shallows) == 0
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs_decode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs_decode.go
deleted file mode 100644
index d596547f5..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs_decode.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-// Decode reads the next advertised-refs message form its input and
-// stores it in the AdvRefs.
-func (a *AdvRefs) Decode(r io.Reader) error {
-	d := newAdvRefsDecoder(r)
-	return d.Decode(a)
-}
-
-type advRefsDecoder struct {
-	s     *pktline.Scanner // a pkt-line scanner from the input stream
-	line  []byte           // current pkt-line contents, use parser.nextLine() to make it advance
-	nLine int              // current pkt-line number for debugging, begins at 1
-	hash  plumbing.Hash    // last hash read
-	err   error            // sticky error, use the parser.error() method to fill this out
-	data  *AdvRefs         // parsed data is stored here
-}
-
-var (
-	// ErrEmptyAdvRefs is returned by Decode if it gets an empty advertised
-	// references message.
-	ErrEmptyAdvRefs = errors.New("empty advertised-ref message")
-	// ErrEmptyInput is returned by Decode if the input is empty.
-	ErrEmptyInput = errors.New("empty input")
-)
-
-func newAdvRefsDecoder(r io.Reader) *advRefsDecoder {
-	return &advRefsDecoder{
-		s: pktline.NewScanner(r),
-	}
-}
-
-func (d *advRefsDecoder) Decode(v *AdvRefs) error {
-	d.data = v
-
-	for state := decodePrefix; state != nil; {
-		state = state(d)
-	}
-
-	return d.err
-}
-
-type decoderStateFn func(*advRefsDecoder) decoderStateFn
-
-// fills out the parser sticky error
-func (d *advRefsDecoder) error(format string, a ...interface{}) {
-	msg := fmt.Sprintf(
-		"pkt-line %d: %s", d.nLine,
-		fmt.Sprintf(format, a...),
-	)
-
-	d.err = NewErrUnexpectedData(msg, d.line)
-}
-
-// Reads a new pkt-line from the scanner, makes its payload available as
-// p.line and increments p.nLine.  A successful invocation returns true,
-// otherwise, false is returned and the sticky error is filled out
-// accordingly.  Trims eols at the end of the payloads.
-func (d *advRefsDecoder) nextLine() bool {
-	d.nLine++
-
-	if !d.s.Scan() {
-		if d.err = d.s.Err(); d.err != nil {
-			return false
-		}
-
-		if d.nLine == 1 {
-			d.err = ErrEmptyInput
-			return false
-		}
-
-		d.error("EOF")
-		return false
-	}
-
-	d.line = d.s.Bytes()
-	d.line = bytes.TrimSuffix(d.line, eol)
-
-	return true
-}
-
-// The HTTP smart prefix is often followed by a flush-pkt.
-func decodePrefix(d *advRefsDecoder) decoderStateFn {
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	if !isPrefix(d.line) {
-		return decodeFirstHash
-	}
-
-	tmp := make([]byte, len(d.line))
-	copy(tmp, d.line)
-	d.data.Prefix = append(d.data.Prefix, tmp)
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	if !isFlush(d.line) {
-		return decodeFirstHash
-	}
-
-	d.data.Prefix = append(d.data.Prefix, pktline.Flush)
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	return decodeFirstHash
-}
-
-func isPrefix(payload []byte) bool {
-	return len(payload) > 0 && payload[0] == '#'
-}
-
-// If the first hash is zero, then a no-refs is coming. Otherwise, a
-// list-of-refs is coming, and the hash will be followed by the first
-// advertised ref.
-func decodeFirstHash(p *advRefsDecoder) decoderStateFn {
-	// If the repository is empty, we receive a flush here (HTTP).
-	if isFlush(p.line) {
-		p.err = ErrEmptyAdvRefs
-		return nil
-	}
-
-	// TODO: Use object-format (when available) for hash size. Git 2.41+
-	if len(p.line) < hashSize {
-		p.error("cannot read hash, pkt-line too short")
-		return nil
-	}
-
-	if _, err := hex.Decode(p.hash[:], p.line[:hashSize]); err != nil {
-		p.error("invalid hash text: %s", err)
-		return nil
-	}
-
-	p.line = p.line[hashSize:]
-
-	if p.hash.IsZero() {
-		return decodeSkipNoRefs
-	}
-
-	return decodeFirstRef
-}
-
-// Skips SP "capabilities^{}" NUL
-func decodeSkipNoRefs(p *advRefsDecoder) decoderStateFn {
-	if len(p.line) < len(noHeadMark) {
-		p.error("too short zero-id ref")
-		return nil
-	}
-
-	if !bytes.HasPrefix(p.line, noHeadMark) {
-		p.error("malformed zero-id ref")
-		return nil
-	}
-
-	p.line = p.line[len(noHeadMark):]
-
-	return decodeCaps
-}
-
-// decode the refname, expects SP refname NULL
-func decodeFirstRef(l *advRefsDecoder) decoderStateFn {
-	if len(l.line) < 3 {
-		l.error("line too short after hash")
-		return nil
-	}
-
-	if !bytes.HasPrefix(l.line, sp) {
-		l.error("no space after hash")
-		return nil
-	}
-	l.line = l.line[1:]
-
-	chunks := bytes.SplitN(l.line, null, 2)
-	if len(chunks) < 2 {
-		l.error("NULL not found")
-		return nil
-	}
-	ref := chunks[0]
-	l.line = chunks[1]
-
-	if bytes.Equal(ref, []byte(head)) {
-		l.data.Head = &l.hash
-	} else {
-		l.data.References[string(ref)] = l.hash
-	}
-
-	return decodeCaps
-}
-
-func decodeCaps(p *advRefsDecoder) decoderStateFn {
-	if err := p.data.Capabilities.Decode(p.line); err != nil {
-		p.error("invalid capabilities: %s", err)
-		return nil
-	}
-
-	return decodeOtherRefs
-}
-
-// The refs are either tips (obj-id SP refname) or a peeled (obj-id SP refname^{}).
-// If there are no refs, then there might be a shallow or flush-ptk.
-func decodeOtherRefs(p *advRefsDecoder) decoderStateFn {
-	if ok := p.nextLine(); !ok {
-		return nil
-	}
-
-	if bytes.HasPrefix(p.line, shallow) {
-		return decodeShallow
-	}
-
-	if len(p.line) == 0 {
-		return nil
-	}
-
-	saveTo := p.data.References
-	if bytes.HasSuffix(p.line, peeled) {
-		p.line = bytes.TrimSuffix(p.line, peeled)
-		saveTo = p.data.Peeled
-	}
-
-	ref, hash, err := readRef(p.line)
-	if err != nil {
-		p.error("%s", err)
-		return nil
-	}
-	saveTo[ref] = hash
-
-	return decodeOtherRefs
-}
-
-// Reads a ref-name
-func readRef(data []byte) (string, plumbing.Hash, error) {
-	chunks := bytes.Split(data, sp)
-	switch {
-	case len(chunks) == 1:
-		return "", plumbing.ZeroHash, fmt.Errorf("malformed ref data: no space was found")
-	case len(chunks) > 2:
-		return "", plumbing.ZeroHash, fmt.Errorf("malformed ref data: more than one space found")
-	default:
-		return string(chunks[1]), plumbing.NewHash(string(chunks[0])), nil
-	}
-}
-
-// Keeps reading shallows until a flush-pkt is found
-func decodeShallow(p *advRefsDecoder) decoderStateFn {
-	if !bytes.HasPrefix(p.line, shallow) {
-		p.error("malformed shallow prefix, found %q... instead", p.line[:len(shallow)])
-		return nil
-	}
-	p.line = bytes.TrimPrefix(p.line, shallow)
-
-	if len(p.line) != hashSize {
-		p.error(fmt.Sprintf(
-			"malformed shallow hash: wrong length, expected 40 bytes, read %d bytes",
-			len(p.line)))
-		return nil
-	}
-
-	text := p.line[:hashSize]
-	var h plumbing.Hash
-	if _, err := hex.Decode(h[:], text); err != nil {
-		p.error("invalid hash text: %s", err)
-		return nil
-	}
-
-	p.data.Shallows = append(p.data.Shallows, h)
-
-	if ok := p.nextLine(); !ok {
-		return nil
-	}
-
-	if len(p.line) == 0 {
-		return nil // successful parse of the advertised-refs message
-	}
-
-	return decodeShallow
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs_encode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs_encode.go
deleted file mode 100644
index 9de6f8e05..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/advrefs_encode.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"sort"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-)
-
-// Encode writes the AdvRefs encoding to a writer.
-//
-// All the payloads will end with a newline character. Capabilities,
-// references and shallows are written in alphabetical order, except for
-// peeled references that always follow their corresponding references.
-func (a *AdvRefs) Encode(w io.Writer) error {
-	e := newAdvRefsEncoder(w)
-	return e.Encode(a)
-}
-
-type advRefsEncoder struct {
-	data         *AdvRefs         // data to encode
-	pe           *pktline.Encoder // where to write the encoded data
-	firstRefName string           // reference name to encode in the first pkt-line (HEAD if present)
-	firstRefHash plumbing.Hash    // hash referenced to encode in the first pkt-line (HEAD if present)
-	sortedRefs   []string         // hash references to encode ordered by increasing order
-	err          error            // sticky error
-
-}
-
-func newAdvRefsEncoder(w io.Writer) *advRefsEncoder {
-	return &advRefsEncoder{
-		pe: pktline.NewEncoder(w),
-	}
-}
-
-func (e *advRefsEncoder) Encode(v *AdvRefs) error {
-	e.data = v
-	e.sortRefs()
-	e.setFirstRef()
-
-	for state := encodePrefix; state != nil; {
-		state = state(e)
-	}
-
-	return e.err
-}
-
-func (e *advRefsEncoder) sortRefs() {
-	if len(e.data.References) > 0 {
-		refs := make([]string, 0, len(e.data.References))
-		for refName := range e.data.References {
-			refs = append(refs, refName)
-		}
-
-		sort.Strings(refs)
-		e.sortedRefs = refs
-	}
-}
-
-func (e *advRefsEncoder) setFirstRef() {
-	if e.data.Head != nil {
-		e.firstRefName = head
-		e.firstRefHash = *e.data.Head
-		return
-	}
-
-	if len(e.sortedRefs) > 0 {
-		refName := e.sortedRefs[0]
-		e.firstRefName = refName
-		e.firstRefHash = e.data.References[refName]
-	}
-}
-
-type encoderStateFn func(*advRefsEncoder) encoderStateFn
-
-func encodePrefix(e *advRefsEncoder) encoderStateFn {
-	for _, p := range e.data.Prefix {
-		if bytes.Equal(p, pktline.Flush) {
-			if e.err = e.pe.Flush(); e.err != nil {
-				return nil
-			}
-			continue
-		}
-		if e.err = e.pe.Encodef("%s\n", string(p)); e.err != nil {
-			return nil
-		}
-	}
-
-	return encodeFirstLine
-}
-
-// Adds the first pkt-line payload: head hash, head ref and capabilities.
-// If HEAD ref is not found, the first reference ordered in increasing order will be used.
-// If there aren't HEAD neither refs, the first line will be "PKT-LINE(zero-id SP "capabilities^{}" NUL capability-list)".
-// See: https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt
-// See: https://github.com/git/git/blob/master/Documentation/technical/protocol-common.txt
-func encodeFirstLine(e *advRefsEncoder) encoderStateFn {
-	const formatFirstLine = "%s %s\x00%s\n"
-	var firstLine string
-	capabilities := formatCaps(e.data.Capabilities)
-
-	if e.firstRefName == "" {
-		firstLine = fmt.Sprintf(formatFirstLine, plumbing.ZeroHash.String(), "capabilities^{}", capabilities)
-	} else {
-		firstLine = fmt.Sprintf(formatFirstLine, e.firstRefHash.String(), e.firstRefName, capabilities)
-
-	}
-
-	if e.err = e.pe.EncodeString(firstLine); e.err != nil {
-		return nil
-	}
-
-	return encodeRefs
-}
-
-func formatCaps(c *capability.List) string {
-	if c == nil {
-		return ""
-	}
-
-	return c.String()
-}
-
-// Adds the (sorted) refs: hash SP refname EOL
-// and their peeled refs if any.
-func encodeRefs(e *advRefsEncoder) encoderStateFn {
-	for _, r := range e.sortedRefs {
-		if r == e.firstRefName {
-			continue
-		}
-
-		hash := e.data.References[r]
-		if e.err = e.pe.Encodef("%s %s\n", hash.String(), r); e.err != nil {
-			return nil
-		}
-
-		if hash, ok := e.data.Peeled[r]; ok {
-			if e.err = e.pe.Encodef("%s %s^{}\n", hash.String(), r); e.err != nil {
-				return nil
-			}
-		}
-	}
-
-	return encodeShallow
-}
-
-// Adds the (sorted) shallows: "shallow" SP hash EOL
-func encodeShallow(e *advRefsEncoder) encoderStateFn {
-	sorted := sortShallows(e.data.Shallows)
-	for _, hash := range sorted {
-		if e.err = e.pe.Encodef("shallow %s\n", hash); e.err != nil {
-			return nil
-		}
-	}
-
-	return encodeFlush
-}
-
-func sortShallows(c []plumbing.Hash) []string {
-	ret := []string{}
-	for _, h := range c {
-		ret = append(ret, h.String())
-	}
-	sort.Strings(ret)
-
-	return ret
-}
-
-func encodeFlush(e *advRefsEncoder) encoderStateFn {
-	e.err = e.pe.Flush()
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability/capability.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability/capability.go
deleted file mode 100644
index b52e8a49d..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability/capability.go
+++ /dev/null
@@ -1,272 +0,0 @@
-// Package capability defines the server and client capabilities.
-package capability
-
-import (
-	"fmt"
-	"os"
-)
-
-// Capability describes a server or client capability.
-type Capability string
-
-func (n Capability) String() string {
-	return string(n)
-}
-
-const (
-	// MultiACK capability allows the server to return "ACK obj-id continue" as
-	// soon as it finds a commit that it can use as a common base, between the
-	// client's wants and the client's have set.
-	//
-	// By sending this early, the server can potentially head off the client
-	// from walking any further down that particular branch of the client's
-	// repository history.  The client may still need to walk down other
-	// branches, sending have lines for those, until the server has a
-	// complete cut across the DAG, or the client has said "done".
-	//
-	// Without multi_ack, a client sends have lines in --date-order until
-	// the server has found a common base.  That means the client will send
-	// have lines that are already known by the server to be common, because
-	// they overlap in time with another branch that the server hasn't found
-	// a common base on yet.
-	//
-	// For example suppose the client has commits in caps that the server
-	// doesn't and the server has commits in lower case that the client
-	// doesn't, as in the following diagram:
-	//
-	//        +---- u ---------------------- x
-	//       /              +----- y
-	//      /              /
-	//     a -- b -- c -- d -- E -- F
-	//        \
-	// 	+--- Q -- R -- S
-	//
-	// If the client wants x,y and starts out by saying have F,S, the server
-	// doesn't know what F,S is.  Eventually the client says "have d" and
-	// the server sends "ACK d continue" to let the client know to stop
-	// walking down that line (so don't send c-b-a), but it's not done yet,
-	// it needs a base for x. The client keeps going with S-R-Q, until a
-	// gets reached, at which point the server has a clear base and it all
-	// ends.
-	//
-	// Without multi_ack the client would have sent that c-b-a chain anyway,
-	// interleaved with S-R-Q.
-	MultiACK Capability = "multi_ack"
-	// MultiACKDetailed is an extension of multi_ack that permits client to
-	// better understand the server's in-memory state.
-	MultiACKDetailed Capability = "multi_ack_detailed"
-	// NoDone should only be used with the smart HTTP protocol. If
-	// multi_ack_detailed and no-done are both present, then the sender is
-	// free to immediately send a pack following its first "ACK obj-id ready"
-	// message.
-	//
-	// Without no-done in the smart HTTP protocol, the server session would
-	// end and the client has to make another trip to send "done" before
-	// the server can send the pack. no-done removes the last round and
-	// thus slightly reduces latency.
-	NoDone Capability = "no-done"
-	// ThinPack is one with deltas which reference base objects not
-	// contained within the pack (but are known to exist at the receiving
-	// end). This can reduce the network traffic significantly, but it
-	// requires the receiving end to know how to "thicken" these packs by
-	// adding the missing bases to the pack.
-	//
-	// The upload-pack server advertises 'thin-pack' when it can generate
-	// and send a thin pack. A client requests the 'thin-pack' capability
-	// when it understands how to "thicken" it, notifying the server that
-	// it can receive such a pack. A client MUST NOT request the
-	// 'thin-pack' capability if it cannot turn a thin pack into a
-	// self-contained pack.
-	//
-	// Receive-pack, on the other hand, is assumed by default to be able to
-	// handle thin packs, but can ask the client not to use the feature by
-	// advertising the 'no-thin' capability. A client MUST NOT send a thin
-	// pack if the server advertises the 'no-thin' capability.
-	//
-	// The reasons for this asymmetry are historical. The receive-pack
-	// program did not exist until after the invention of thin packs, so
-	// historically the reference implementation of receive-pack always
-	// understood thin packs. Adding 'no-thin' later allowed receive-pack
-	// to disable the feature in a backwards-compatible manner.
-	ThinPack Capability = "thin-pack"
-	// Sideband means that server can send, and client understand multiplexed
-	// progress reports and error info interleaved with the packfile itself.
-	//
-	// These two options are mutually exclusive. A modern client always
-	// favors Sideband64k.
-	//
-	// Either mode indicates that the packfile data will be streamed broken
-	// up into packets of up to either 1000 bytes in the case of 'side_band',
-	// or 65520 bytes in the case of 'side_band_64k'. Each packet is made up
-	// of a leading 4-byte pkt-line length of how much data is in the packet,
-	// followed by a 1-byte stream code, followed by the actual data.
-	//
-	// The stream code can be one of:
-	//
-	//  1 - pack data
-	//  2 - progress messages
-	//  3 - fatal error message just before stream aborts
-	//
-	// The "side-band-64k" capability came about as a way for newer clients
-	// that can handle much larger packets to request packets that are
-	// actually crammed nearly full, while maintaining backward compatibility
-	// for the older clients.
-	//
-	// Further, with side-band and its up to 1000-byte messages, it's actually
-	// 999 bytes of payload and 1 byte for the stream code. With side-band-64k,
-	// same deal, you have up to 65519 bytes of data and 1 byte for the stream
-	// code.
-	//
-	// The client MUST send only maximum of one of "side-band" and "side-
-	// band-64k".  Server MUST diagnose it as an error if client requests
-	// both.
-	Sideband    Capability = "side-band"
-	Sideband64k Capability = "side-band-64k"
-	// OFSDelta server can send, and client understand PACKv2 with delta
-	// referring to its base by position in pack rather than by an obj-id. That
-	// is, they can send/read OBJ_OFS_DELTA (aka type 6) in a packfile.
-	OFSDelta Capability = "ofs-delta"
-	// Agent the server may optionally send this capability to notify the client
-	// that the server is running version `X`. The client may optionally return
-	// its own agent string by responding with an `agent=Y` capability (but it
-	// MUST NOT do so if the server did not mention the agent capability). The
-	// `X` and `Y` strings may contain any printable ASCII characters except
-	// space (i.e., the byte range 32 < x < 127), and are typically of the form
-	// "package/version" (e.g., "git/1.8.3.1"). The agent strings are purely
-	// informative for statistics and debugging purposes, and MUST NOT be used
-	// to programmatically assume the presence or absence of particular features.
-	Agent Capability = "agent"
-	// Shallow capability adds "deepen", "shallow" and "unshallow" commands to
-	// the  fetch-pack/upload-pack protocol so clients can request shallow
-	// clones.
-	Shallow Capability = "shallow"
-	// DeepenSince adds "deepen-since" command to fetch-pack/upload-pack
-	// protocol so the client can request shallow clones that are cut at a
-	// specific time, instead of depth. Internally it's equivalent of doing
-	// "rev-list --max-age=" on the server side. "deepen-since"
-	// cannot be used with "deepen".
-	DeepenSince Capability = "deepen-since"
-	// DeepenNot adds "deepen-not" command to fetch-pack/upload-pack
-	// protocol so the client can request shallow clones that are cut at a
-	// specific revision, instead of depth. Internally it's equivalent of
-	// doing "rev-list --not " on the server side. "deepen-not"
-	// cannot be used with "deepen", but can be used with "deepen-since".
-	DeepenNot Capability = "deepen-not"
-	// DeepenRelative if this capability is requested by the client, the
-	// semantics of "deepen" command is changed. The "depth" argument is the
-	// depth from the current shallow boundary, instead of the depth from
-	// remote refs.
-	DeepenRelative Capability = "deepen-relative"
-	// NoProgress the client was started with "git clone -q" or something, and
-	// doesn't want that side band 2. Basically the client just says "I do not
-	// wish to receive stream 2 on sideband, so do not send it to me, and if
-	// you did, I will drop it on the floor anyway".  However, the sideband
-	// channel 3 is still used for error responses.
-	NoProgress Capability = "no-progress"
-	// IncludeTag capability is about sending annotated tags if we are
-	// sending objects they point to.  If we pack an object to the client, and
-	// a tag object points exactly at that object, we pack the tag object too.
-	// In general this allows a client to get all new annotated tags when it
-	// fetches a branch, in a single network connection.
-	//
-	// Clients MAY always send include-tag, hardcoding it into a request when
-	// the server advertises this capability. The decision for a client to
-	// request include-tag only has to do with the client's desires for tag
-	// data, whether or not a server had advertised objects in the
-	// refs/tags/* namespace.
-	//
-	// Servers MUST pack the tags if their referrant is packed and the client
-	// has requested include-tags.
-	//
-	// Clients MUST be prepared for the case where a server has ignored
-	// include-tag and has not actually sent tags in the pack.  In such
-	// cases the client SHOULD issue a subsequent fetch to acquire the tags
-	// that include-tag would have otherwise given the client.
-	//
-	// The server SHOULD send include-tag, if it supports it, regardless
-	// of whether or not there are tags available.
-	IncludeTag Capability = "include-tag"
-	// ReportStatus the receive-pack process can receive a 'report-status'
-	// capability, which tells it that the client wants a report of what
-	// happened after a packfile upload and reference update. If the pushing
-	// client requests this capability, after unpacking and updating references
-	// the server will respond with whether the packfile unpacked successfully
-	// and if each reference was updated successfully. If any of those were not
-	// successful, it will send back an error message.  See pack-protocol.txt
-	// for example messages.
-	ReportStatus Capability = "report-status"
-	// DeleteRefs If the server sends back this capability, it means that
-	// it is capable of accepting a zero-id value as the target
-	// value of a reference update.  It is not sent back by the client, it
-	// simply informs the client that it can be sent zero-id values
-	// to delete references
-	DeleteRefs Capability = "delete-refs"
-	// Quiet If the receive-pack server advertises this capability, it is
-	// capable of silencing human-readable progress output which otherwise may
-	// be shown when processing the received pack. A send-pack client should
-	// respond with the 'quiet' capability to suppress server-side progress
-	// reporting if the local progress reporting is also being suppressed
-	// (e.g., via `push -q`, or if stderr does not go to a tty).
-	Quiet Capability = "quiet"
-	// Atomic If the server sends this capability it is capable of accepting
-	// atomic pushes. If the pushing client requests this capability, the server
-	// will update the refs in one atomic transaction. Either all refs are
-	// updated or none.
-	Atomic Capability = "atomic"
-	// PushOptions If the server sends this capability it is able to accept
-	// push options after the update commands have been sent, but before the
-	// packfile is streamed. If the pushing client requests this capability,
-	// the server will pass the options to the pre- and post- receive hooks
-	// that process this push request.
-	PushOptions Capability = "push-options"
-	// AllowTipSHA1InWant if the upload-pack server advertises this capability,
-	// fetch-pack may send "want" lines with SHA-1s that exist at the server but
-	// are not advertised by upload-pack.
-	AllowTipSHA1InWant Capability = "allow-tip-sha1-in-want"
-	// AllowReachableSHA1InWant if the upload-pack server advertises this
-	// capability, fetch-pack may send "want" lines with SHA-1s that exist at
-	// the server but are not advertised by upload-pack.
-	AllowReachableSHA1InWant Capability = "allow-reachable-sha1-in-want"
-	// PushCert the receive-pack server that advertises this capability is
-	// willing to accept a signed push certificate, and asks the  to be
-	// included in the push certificate.  A send-pack client MUST NOT
-	// send a push-cert packet unless the receive-pack server advertises
-	// this capability.
-	PushCert Capability = "push-cert"
-	// SymRef symbolic reference support for better negotiation.
-	SymRef Capability = "symref"
-	// ObjectFormat takes a hash algorithm as an argument, indicates that the
-	// server supports the given hash algorithms.
-	ObjectFormat Capability = "object-format"
-	// Filter if present, fetch-pack may send "filter" commands to request a
-	// partial clone or partial fetch and request that the server omit various objects from the packfile
-	Filter Capability = "filter"
-)
-
-const userAgent = "go-git/5.x"
-
-// DefaultAgent provides the user agent string.
-func DefaultAgent() string {
-	if envUserAgent, ok := os.LookupEnv("GO_GIT_USER_AGENT_EXTRA"); ok {
-		return fmt.Sprintf("%s %s", userAgent, envUserAgent)
-	}
-	return userAgent
-}
-
-var known = map[Capability]bool{
-	MultiACK: true, MultiACKDetailed: true, NoDone: true, ThinPack: true,
-	Sideband: true, Sideband64k: true, OFSDelta: true, Agent: true,
-	Shallow: true, DeepenSince: true, DeepenNot: true, DeepenRelative: true,
-	NoProgress: true, IncludeTag: true, ReportStatus: true, DeleteRefs: true,
-	Quiet: true, Atomic: true, PushOptions: true, AllowTipSHA1InWant: true,
-	AllowReachableSHA1InWant: true, PushCert: true, SymRef: true,
-	ObjectFormat: true, Filter: true,
-}
-
-var requiresArgument = map[Capability]bool{
-	Agent: true, PushCert: true, SymRef: true, ObjectFormat: true,
-}
-
-var multipleArgument = map[Capability]bool{
-	SymRef: true,
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability/list.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability/list.go
deleted file mode 100644
index 553d81cbe..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability/list.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package capability
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strings"
-)
-
-var (
-	// ErrArgumentsRequired is returned if no arguments are giving with a
-	// capability that requires arguments
-	ErrArgumentsRequired = errors.New("arguments required")
-	// ErrArguments is returned if arguments are given with a capabilities that
-	// not supports arguments
-	ErrArguments = errors.New("arguments not allowed")
-	// ErrEmptyArgument is returned when an empty value is given
-	ErrEmptyArgument = errors.New("empty argument")
-	// ErrMultipleArguments multiple argument given to a capabilities that not
-	// support it
-	ErrMultipleArguments = errors.New("multiple arguments not allowed")
-)
-
-// List represents a list of capabilities
-type List struct {
-	m    map[Capability]*entry
-	sort []string
-}
-
-type entry struct {
-	Name   Capability
-	Values []string
-}
-
-// NewList returns a new List of capabilities
-func NewList() *List {
-	return &List{
-		m: make(map[Capability]*entry),
-	}
-}
-
-// IsEmpty returns true if the List is empty
-func (l *List) IsEmpty() bool {
-	return len(l.sort) == 0
-}
-
-// Decode decodes list of capabilities from raw into the list
-func (l *List) Decode(raw []byte) error {
-	// git 1.x receive pack used to send a leading space on its
-	// git-receive-pack capabilities announcement. We just trim space to be
-	// tolerant to space changes in different versions.
-	raw = bytes.TrimSpace(raw)
-
-	if len(raw) == 0 {
-		return nil
-	}
-
-	for _, data := range bytes.Split(raw, []byte{' '}) {
-		pair := bytes.SplitN(data, []byte{'='}, 2)
-
-		c := Capability(pair[0])
-		if len(pair) == 1 {
-			if err := l.Add(c); err != nil {
-				return err
-			}
-
-			continue
-		}
-
-		if err := l.Add(c, string(pair[1])); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Get returns the values for a capability
-func (l *List) Get(capability Capability) []string {
-	if _, ok := l.m[capability]; !ok {
-		return nil
-	}
-
-	return l.m[capability].Values
-}
-
-// Set sets a capability removing the previous values
-func (l *List) Set(capability Capability, values ...string) error {
-	if _, ok := l.m[capability]; ok {
-		l.m[capability].Values = l.m[capability].Values[:0]
-	}
-	return l.Add(capability, values...)
-}
-
-// Add adds a capability, values are optional
-func (l *List) Add(c Capability, values ...string) error {
-	if err := l.validate(c, values); err != nil {
-		return err
-	}
-
-	if !l.Supports(c) {
-		l.m[c] = &entry{Name: c}
-		l.sort = append(l.sort, c.String())
-	}
-
-	if len(values) == 0 {
-		return nil
-	}
-
-	if known[c] && !multipleArgument[c] && len(l.m[c].Values) > 0 {
-		return ErrMultipleArguments
-	}
-
-	l.m[c].Values = append(l.m[c].Values, values...)
-	return nil
-}
-
-func (l *List) validateNoEmptyArgs(values []string) error {
-	for _, v := range values {
-		if v == "" {
-			return ErrEmptyArgument
-		}
-	}
-	return nil
-}
-
-func (l *List) validate(c Capability, values []string) error {
-	if !known[c] {
-		return l.validateNoEmptyArgs(values)
-	}
-	if requiresArgument[c] && len(values) == 0 {
-		return ErrArgumentsRequired
-	}
-
-	if !requiresArgument[c] && len(values) != 0 {
-		return ErrArguments
-	}
-
-	if !multipleArgument[c] && len(values) > 1 {
-		return ErrMultipleArguments
-	}
-	return l.validateNoEmptyArgs(values)
-}
-
-// Supports returns true if capability is present
-func (l *List) Supports(capability Capability) bool {
-	_, ok := l.m[capability]
-	return ok
-}
-
-// Delete deletes a capability from the List
-func (l *List) Delete(capability Capability) {
-	if !l.Supports(capability) {
-		return
-	}
-
-	delete(l.m, capability)
-	for i, c := range l.sort {
-		if c != string(capability) {
-			continue
-		}
-
-		l.sort = append(l.sort[:i], l.sort[i+1:]...)
-		return
-	}
-}
-
-// All returns a slice with all defined capabilities.
-func (l *List) All() []Capability {
-	var cs []Capability
-	for _, key := range l.sort {
-		cs = append(cs, Capability(key))
-	}
-
-	return cs
-}
-
-// String generates the capabilities strings, the capabilities are sorted in
-// insertion order
-func (l *List) String() string {
-	var o []string
-	for _, key := range l.sort {
-		cap := l.m[Capability(key)]
-		if len(cap.Values) == 0 {
-			o = append(o, key)
-			continue
-		}
-
-		for _, value := range cap.Values {
-			o = append(o, fmt.Sprintf("%s=%s", key, value))
-		}
-	}
-
-	return strings.Join(o, " ")
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/common.go
deleted file mode 100644
index a858323e7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/common.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package packp
-
-import (
-	"fmt"
-)
-
-type stateFn func() stateFn
-
-const (
-	// common
-	hashSize = 40
-
-	// advrefs
-	head   = "HEAD"
-	noHead = "capabilities^{}"
-)
-
-var (
-	// common
-	sp  = []byte(" ")
-	eol = []byte("\n")
-
-	// advertised-refs
-	null       = []byte("\x00")
-	peeled     = []byte("^{}")
-	noHeadMark = []byte(" capabilities^{}\x00")
-
-	// upload-request
-	want            = []byte("want ")
-	shallow         = []byte("shallow ")
-	deepen          = []byte("deepen")
-	deepenCommits   = []byte("deepen ")
-	deepenSince     = []byte("deepen-since ")
-	deepenReference = []byte("deepen-not ")
-
-	// shallow-update
-	unshallow = []byte("unshallow ")
-
-	// server-response
-	ack = []byte("ACK")
-	nak = []byte("NAK")
-
-	// updreq
-	shallowNoSp = []byte("shallow")
-)
-
-func isFlush(payload []byte) bool {
-	return len(payload) == 0
-}
-
-var (
-	// ErrNilWriter is returned when a nil writer is passed to the encoder.
-	ErrNilWriter = fmt.Errorf("nil writer")
-)
-
-// ErrUnexpectedData represents an unexpected data decoding a message
-type ErrUnexpectedData struct {
-	Msg  string
-	Data []byte
-}
-
-// NewErrUnexpectedData returns a new ErrUnexpectedData containing the data and
-// the message given
-func NewErrUnexpectedData(msg string, data []byte) error {
-	return &ErrUnexpectedData{Msg: msg, Data: data}
-}
-
-func (err *ErrUnexpectedData) Error() string {
-	if len(err.Data) == 0 {
-		return err.Msg
-	}
-
-	return fmt.Sprintf("%s (%s)", err.Msg, err.Data)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/doc.go
deleted file mode 100644
index 4950d1d66..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/doc.go
+++ /dev/null
@@ -1,724 +0,0 @@
-package packp
-
-/*
-
-A nice way to trace the real data transmitted and received by git, use:
-
-GIT_TRACE_PACKET=true git ls-remote http://github.com/src-d/go-git
-GIT_TRACE_PACKET=true git clone http://github.com/src-d/go-git
-
-Here follows a copy of the current protocol specification at the time of
-this writing.
-
-(Please notice that most http git servers will add a flush-pkt after the
-first pkt-line when using HTTP smart.)
-
-
-Documentation Common to Pack and Http Protocols
-===============================================
-
-ABNF Notation
--------------
-
-ABNF notation as described by RFC 5234 is used within the protocol documents,
-except the following replacement core rules are used:
-----
-  HEXDIG    =  DIGIT / "a" / "b" / "c" / "d" / "e" / "f"
-----
-
-We also define the following common rules:
-----
-  NUL       =  %x00
-  zero-id   =  40*"0"
-  obj-id    =  40*(HEXDIGIT)
-
-  refname  =  "HEAD"
-  refname /=  "refs/" 
-----
-
-A refname is a hierarchical octet string beginning with "refs/" and
-not violating the 'git-check-ref-format' command's validation rules.
-More specifically, they:
-
-. They can include slash `/` for hierarchical (directory)
-  grouping, but no slash-separated component can begin with a
-  dot `.`.
-
-. They must contain at least one `/`. This enforces the presence of a
-  category like `heads/`, `tags/` etc. but the actual names are not
-  restricted.
-
-. They cannot have two consecutive dots `..` anywhere.
-
-. They cannot have ASCII control characters (i.e. bytes whose
-  values are lower than \040, or \177 `DEL`), space, tilde `~`,
-  caret `^`, colon `:`, question-mark `?`, asterisk `*`,
-  or open bracket `[` anywhere.
-
-. They cannot end with a slash `/` or a dot `.`.
-
-. They cannot end with the sequence `.lock`.
-
-. They cannot contain a sequence `@{`.
-
-. They cannot contain a `\\`.
-
-
-pkt-line Format
----------------
-
-Much (but not all) of the payload is described around pkt-lines.
-
-A pkt-line is a variable length binary string.  The first four bytes
-of the line, the pkt-len, indicates the total length of the line,
-in hexadecimal.  The pkt-len includes the 4 bytes used to contain
-the length's hexadecimal representation.
-
-A pkt-line MAY contain binary data, so implementors MUST ensure
-pkt-line parsing/formatting routines are 8-bit clean.
-
-A non-binary line SHOULD BE terminated by an LF, which if present
-MUST be included in the total length. Receivers MUST treat pkt-lines
-with non-binary data the same whether or not they contain the trailing
-LF (stripping the LF if present, and not complaining when it is
-missing).
-
-The maximum length of a pkt-line's data component is 65516 bytes.
-Implementations MUST NOT send pkt-line whose length exceeds 65520
-(65516 bytes of payload + 4 bytes of length data).
-
-Implementations SHOULD NOT send an empty pkt-line ("0004").
-
-A pkt-line with a length field of 0 ("0000"), called a flush-pkt,
-is a special case and MUST be handled differently than an empty
-pkt-line ("0004").
-
-----
-  pkt-line     =  data-pkt / flush-pkt
-
-  data-pkt     =  pkt-len pkt-payload
-  pkt-len      =  4*(HEXDIG)
-  pkt-payload  =  (pkt-len - 4)*(OCTET)
-
-  flush-pkt    = "0000"
-----
-
-Examples (as C-style strings):
-
-----
-  pkt-line          actual value
-  ---------------------------------
-  "0006a\n"         "a\n"
-  "0005a"           "a"
-  "000bfoobar\n"    "foobar\n"
-  "0004"            ""
-----
-
-Packfile transfer protocols
-===========================
-
-Git supports transferring data in packfiles over the ssh://, git://, http:// and
-file:// transports.  There exist two sets of protocols, one for pushing
-data from a client to a server and another for fetching data from a
-server to a client.  The three transports (ssh, git, file) use the same
-protocol to transfer data. http is documented in http-protocol.txt.
-
-The processes invoked in the canonical Git implementation are 'upload-pack'
-on the server side and 'fetch-pack' on the client side for fetching data;
-then 'receive-pack' on the server and 'send-pack' on the client for pushing
-data.  The protocol functions to have a server tell a client what is
-currently on the server, then for the two to negotiate the smallest amount
-of data to send in order to fully update one or the other.
-
-pkt-line Format
----------------
-
-The descriptions below build on the pkt-line format described in
-protocol-common.txt. When the grammar indicate `PKT-LINE(...)`, unless
-otherwise noted the usual pkt-line LF rules apply: the sender SHOULD
-include a LF, but the receiver MUST NOT complain if it is not present.
-
-Transports
-----------
-There are three transports over which the packfile protocol is
-initiated.  The Git transport is a simple, unauthenticated server that
-takes the command (almost always 'upload-pack', though Git
-servers can be configured to be globally writable, in which 'receive-
-pack' initiation is also allowed) with which the client wishes to
-communicate and executes it and connects it to the requesting
-process.
-
-In the SSH transport, the client just runs the 'upload-pack'
-or 'receive-pack' process on the server over the SSH protocol and then
-communicates with that invoked process over the SSH connection.
-
-The file:// transport runs the 'upload-pack' or 'receive-pack'
-process locally and communicates with it over a pipe.
-
-Git Transport
--------------
-
-The Git transport starts off by sending the command and repository
-on the wire using the pkt-line format, followed by a NUL byte and a
-hostname parameter, terminated by a NUL byte.
-
-   0032git-upload-pack /project.git\0host=myserver.com\0
-
---
-   git-proto-request = request-command SP pathname NUL [ host-parameter NUL ]
-   request-command   = "git-upload-pack" / "git-receive-pack" /
-		       "git-upload-archive"   ; case sensitive
-   pathname          = *( %x01-ff ) ; exclude NUL
-   host-parameter    = "host=" hostname [ ":" port ]
---
-
-Only host-parameter is allowed in the git-proto-request. Clients
-MUST NOT attempt to send additional parameters. It is used for the
-git-daemon name based virtual hosting.  See --interpolated-path
-option to git daemon, with the %H/%CH format characters.
-
-Basically what the Git client is doing to connect to an 'upload-pack'
-process on the server side over the Git protocol is this:
-
-   $ echo -e -n \
-     "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
-     nc -v example.com 9418
-
-If the server refuses the request for some reasons, it could abort
-gracefully with an error message.
-
-----
-  error-line     =  PKT-LINE("ERR" SP explanation-text)
-----
-
-
-SSH Transport
--------------
-
-Initiating the upload-pack or receive-pack processes over SSH is
-executing the binary on the server via SSH remote execution.
-It is basically equivalent to running this:
-
-   $ ssh git.example.com "git-upload-pack '/project.git'"
-
-For a server to support Git pushing and pulling for a given user over
-SSH, that user needs to be able to execute one or both of those
-commands via the SSH shell that they are provided on login.  On some
-systems, that shell access is limited to only being able to run those
-two commands, or even just one of them.
-
-In an ssh:// format URI, it's absolute in the URI, so the '/' after
-the host name (or port number) is sent as an argument, which is then
-read by the remote git-upload-pack exactly as is, so it's effectively
-an absolute path in the remote filesystem.
-
-       git clone ssh://user@example.com/project.git
-		    |
-		    v
-    ssh user@example.com "git-upload-pack '/project.git'"
-
-In a "user@host:path" format URI, its relative to the user's home
-directory, because the Git client will run:
-
-     git clone user@example.com:project.git
-		    |
-		    v
-  ssh user@example.com "git-upload-pack 'project.git'"
-
-The exception is if a '~' is used, in which case
-we execute it without the leading '/'.
-
-      ssh://user@example.com/~alice/project.git,
-		     |
-		     v
-   ssh user@example.com "git-upload-pack '~alice/project.git'"
-
-A few things to remember here:
-
-- The "command name" is spelled with dash (e.g. git-upload-pack), but
-  this can be overridden by the client;
-
-- The repository path is always quoted with single quotes.
-
-Fetching Data From a Server
----------------------------
-
-When one Git repository wants to get data that a second repository
-has, the first can 'fetch' from the second.  This operation determines
-what data the server has that the client does not then streams that
-data down to the client in packfile format.
-
-
-Reference Discovery
--------------------
-
-When the client initially connects the server will immediately respond
-with a listing of each reference it has (all branches and tags) along
-with the object name that each reference currently points to.
-
-   $ echo -e -n "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
-      nc -v example.com 9418
-   00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack thin-pack
-		side-band side-band-64k ofs-delta shallow no-progress include-tag
-   00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration
-   003f7217a7c7e582c46cec22a130adf4b9d7d950fba0 refs/heads/master
-   003cb88d2441cac0977faf98efc80305012112238d9d refs/tags/v0.9
-   003c525128480b96c89e6418b1e40909bf6c5b2d580f refs/tags/v1.0
-   003fe92df48743b7bc7d26bcaabfddde0a1e20cae47c refs/tags/v1.0^{}
-   0000
-
-The returned response is a pkt-line stream describing each ref and
-its current value.  The stream MUST be sorted by name according to
-the C locale ordering.
-
-If HEAD is a valid ref, HEAD MUST appear as the first advertised
-ref.  If HEAD is not a valid ref, HEAD MUST NOT appear in the
-advertisement list at all, but other refs may still appear.
-
-The stream MUST include capability declarations behind a NUL on the
-first ref. The peeled value of a ref (that is "ref^{}") MUST be
-immediately after the ref itself, if presented. A conforming server
-MUST peel the ref if it's an annotated tag.
-
-----
-  advertised-refs  =  (no-refs / list-of-refs)
-		      *shallow
-		      flush-pkt
-
-  no-refs          =  PKT-LINE(zero-id SP "capabilities^{}"
-		      NUL capability-list)
-
-  list-of-refs     =  first-ref *other-ref
-  first-ref        =  PKT-LINE(obj-id SP refname
-		      NUL capability-list)
-
-  other-ref        =  PKT-LINE(other-tip / other-peeled)
-  other-tip        =  obj-id SP refname
-  other-peeled     =  obj-id SP refname "^{}"
-
-  shallow          =  PKT-LINE("shallow" SP obj-id)
-
-  capability-list  =  capability *(SP capability)
-  capability       =  1*(LC_ALPHA / DIGIT / "-" / "_")
-  LC_ALPHA         =  %x61-7A
-----
-
-Server and client MUST use lowercase for obj-id, both MUST treat obj-id
-as case-insensitive.
-
-See protocol-capabilities.txt for a list of allowed server capabilities
-and descriptions.
-
-Packfile Negotiation
---------------------
-After reference and capabilities discovery, the client can decide to
-terminate the connection by sending a flush-pkt, telling the server it can
-now gracefully terminate, and disconnect, when it does not need any pack
-data. This can happen with the ls-remote command, and also can happen when
-the client already is up-to-date.
-
-Otherwise, it enters the negotiation phase, where the client and
-server determine what the minimal packfile necessary for transport is,
-by telling the server what objects it wants, its shallow objects
-(if any), and the maximum commit depth it wants (if any).  The client
-will also send a list of the capabilities it wants to be in effect,
-out of what the server said it could do with the first 'want' line.
-
-----
-  upload-request    =  want-list
-		       *shallow-line
-		       *1depth-request
-		       flush-pkt
-
-  want-list         =  first-want
-		       *additional-want
-
-  shallow-line      =  PKT-LINE("shallow" SP obj-id)
-
-  depth-request     =  PKT-LINE("deepen" SP depth) /
-		       PKT-LINE("deepen-since" SP timestamp) /
-		       PKT-LINE("deepen-not" SP ref)
-
-  first-want        =  PKT-LINE("want" SP obj-id SP capability-list)
-  additional-want   =  PKT-LINE("want" SP obj-id)
-
-  depth             =  1*DIGIT
-----
-
-Clients MUST send all the obj-ids it wants from the reference
-discovery phase as 'want' lines. Clients MUST send at least one
-'want' command in the request body. Clients MUST NOT mention an
-obj-id in a 'want' command which did not appear in the response
-obtained through ref discovery.
-
-The client MUST write all obj-ids which it only has shallow copies
-of (meaning that it does not have the parents of a commit) as
-'shallow' lines so that the server is aware of the limitations of
-the client's history.
-
-The client now sends the maximum commit history depth it wants for
-this transaction, which is the number of commits it wants from the
-tip of the history, if any, as a 'deepen' line.  A depth of 0 is the
-same as not making a depth request. The client does not want to receive
-any commits beyond this depth, nor does it want objects needed only to
-complete those commits. Commits whose parents are not received as a
-result are defined as shallow and marked as such in the server. This
-information is sent back to the client in the next step.
-
-Once all the 'want's and 'shallow's (and optional 'deepen') are
-transferred, clients MUST send a flush-pkt, to tell the server side
-that it is done sending the list.
-
-Otherwise, if the client sent a positive depth request, the server
-will determine which commits will and will not be shallow and
-send this information to the client. If the client did not request
-a positive depth, this step is skipped.
-
-----
-  shallow-update   =  *shallow-line
-		      *unshallow-line
-		      flush-pkt
-
-  shallow-line     =  PKT-LINE("shallow" SP obj-id)
-
-  unshallow-line   =  PKT-LINE("unshallow" SP obj-id)
-----
-
-If the client has requested a positive depth, the server will compute
-the set of commits which are no deeper than the desired depth. The set
-of commits start at the client's wants.
-
-The server writes 'shallow' lines for each
-commit whose parents will not be sent as a result. The server writes
-an 'unshallow' line for each commit which the client has indicated is
-shallow, but is no longer shallow at the currently requested depth
-(that is, its parents will now be sent). The server MUST NOT mark
-as unshallow anything which the client has not indicated was shallow.
-
-Now the client will send a list of the obj-ids it has using 'have'
-lines, so the server can make a packfile that only contains the objects
-that the client needs. In multi_ack mode, the canonical implementation
-will send up to 32 of these at a time, then will send a flush-pkt. The
-canonical implementation will skip ahead and send the next 32 immediately,
-so that there is always a block of 32 "in-flight on the wire" at a time.
-
-----
-  upload-haves      =  have-list
-		       compute-end
-
-  have-list         =  *have-line
-  have-line         =  PKT-LINE("have" SP obj-id)
-  compute-end       =  flush-pkt / PKT-LINE("done")
-----
-
-If the server reads 'have' lines, it then will respond by ACKing any
-of the obj-ids the client said it had that the server also has. The
-server will ACK obj-ids differently depending on which ack mode is
-chosen by the client.
-
-In multi_ack mode:
-
-  * the server will respond with 'ACK obj-id continue' for any common
-    commits.
-
-  * once the server has found an acceptable common base commit and is
-    ready to make a packfile, it will blindly ACK all 'have' obj-ids
-    back to the client.
-
-  * the server will then send a 'NAK' and then wait for another response
-    from the client - either a 'done' or another list of 'have' lines.
-
-In multi_ack_detailed mode:
-
-  * the server will differentiate the ACKs where it is signaling
-    that it is ready to send data with 'ACK obj-id ready' lines, and
-    signals the identified common commits with 'ACK obj-id common' lines.
-
-Without either multi_ack or multi_ack_detailed:
-
- * upload-pack sends "ACK obj-id" on the first common object it finds.
-   After that it says nothing until the client gives it a "done".
-
- * upload-pack sends "NAK" on a flush-pkt if no common object
-   has been found yet.  If one has been found, and thus an ACK
-   was already sent, it's silent on the flush-pkt.
-
-After the client has gotten enough ACK responses that it can determine
-that the server has enough information to send an efficient packfile
-(in the canonical implementation, this is determined when it has received
-enough ACKs that it can color everything left in the --date-order queue
-as common with the server, or the --date-order queue is empty), or the
-client determines that it wants to give up (in the canonical implementation,
-this is determined when the client sends 256 'have' lines without getting
-any of them ACKed by the server - meaning there is nothing in common and
-the server should just send all of its objects), then the client will send
-a 'done' command.  The 'done' command signals to the server that the client
-is ready to receive its packfile data.
-
-However, the 256 limit *only* turns on in the canonical client
-implementation if we have received at least one "ACK %s continue"
-during a prior round.  This helps to ensure that at least one common
-ancestor is found before we give up entirely.
-
-Once the 'done' line is read from the client, the server will either
-send a final 'ACK obj-id' or it will send a 'NAK'. 'obj-id' is the object
-name of the last commit determined to be common. The server only sends
-ACK after 'done' if there is at least one common base and multi_ack or
-multi_ack_detailed is enabled. The server always sends NAK after 'done'
-if there is no common base found.
-
-Then the server will start sending its packfile data.
-
-----
-  server-response = *ack_multi ack / nak
-  ack_multi       = PKT-LINE("ACK" SP obj-id ack_status)
-  ack_status      = "continue" / "common" / "ready"
-  ack             = PKT-LINE("ACK" SP obj-id)
-  nak             = PKT-LINE("NAK")
-----
-
-A simple clone may look like this (with no 'have' lines):
-
-----
-   C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d multi_ack \
-     side-band-64k ofs-delta\n
-   C: 0032want 7d1665144a3a975c05f1f43902ddaf084e784dbe\n
-   C: 0032want 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a\n
-   C: 0032want 7e47fe2bd8d01d481f44d7af0531bd93d3b21c01\n
-   C: 0032want 74730d410fcb6603ace96f1dc55ea6196122532d\n
-   C: 0000
-   C: 0009done\n
-
-   S: 0008NAK\n
-   S: [PACKFILE]
-----
-
-An incremental update (fetch) response might look like this:
-
-----
-   C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d multi_ack \
-     side-band-64k ofs-delta\n
-   C: 0032want 7d1665144a3a975c05f1f43902ddaf084e784dbe\n
-   C: 0032want 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a\n
-   C: 0000
-   C: 0032have 7e47fe2bd8d01d481f44d7af0531bd93d3b21c01\n
-   C: [30 more have lines]
-   C: 0032have 74730d410fcb6603ace96f1dc55ea6196122532d\n
-   C: 0000
-
-   S: 003aACK 7e47fe2bd8d01d481f44d7af0531bd93d3b21c01 continue\n
-   S: 003aACK 74730d410fcb6603ace96f1dc55ea6196122532d continue\n
-   S: 0008NAK\n
-
-   C: 0009done\n
-
-   S: 0031ACK 74730d410fcb6603ace96f1dc55ea6196122532d\n
-   S: [PACKFILE]
-----
-
-
-Packfile Data
--------------
-
-Now that the client and server have finished negotiation about what
-the minimal amount of data that needs to be sent to the client is, the server
-will construct and send the required data in packfile format.
-
-See pack-format.txt for what the packfile itself actually looks like.
-
-If 'side-band' or 'side-band-64k' capabilities have been specified by
-the client, the server will send the packfile data multiplexed.
-
-Each packet starting with the packet-line length of the amount of data
-that follows, followed by a single byte specifying the sideband the
-following data is coming in on.
-
-In 'side-band' mode, it will send up to 999 data bytes plus 1 control
-code, for a total of up to 1000 bytes in a pkt-line.  In 'side-band-64k'
-mode it will send up to 65519 data bytes plus 1 control code, for a
-total of up to 65520 bytes in a pkt-line.
-
-The sideband byte will be a '1', '2' or a '3'. Sideband '1' will contain
-packfile data, sideband '2' will be used for progress information that the
-client will generally print to stderr and sideband '3' is used for error
-information.
-
-If no 'side-band' capability was specified, the server will stream the
-entire packfile without multiplexing.
-
-
-Pushing Data To a Server
-------------------------
-
-Pushing data to a server will invoke the 'receive-pack' process on the
-server, which will allow the client to tell it which references it should
-update and then send all the data the server will need for those new
-references to be complete.  Once all the data is received and validated,
-the server will then update its references to what the client specified.
-
-Authentication
---------------
-
-The protocol itself contains no authentication mechanisms.  That is to be
-handled by the transport, such as SSH, before the 'receive-pack' process is
-invoked.  If 'receive-pack' is configured over the Git transport, those
-repositories will be writable by anyone who can access that port (9418) as
-that transport is unauthenticated.
-
-Reference Discovery
--------------------
-
-The reference discovery phase is done nearly the same way as it is in the
-fetching protocol. Each reference obj-id and name on the server is sent
-in packet-line format to the client, followed by a flush-pkt.  The only
-real difference is that the capability listing is different - the only
-possible values are 'report-status', 'delete-refs', 'ofs-delta' and
-'push-options'.
-
-Reference Update Request and Packfile Transfer
-----------------------------------------------
-
-Once the client knows what references the server is at, it can send a
-list of reference update requests.  For each reference on the server
-that it wants to update, it sends a line listing the obj-id currently on
-the server, the obj-id the client would like to update it to and the name
-of the reference.
-
-This list is followed by a flush-pkt. Then the push options are transmitted
-one per packet followed by another flush-pkt. After that the packfile that
-should contain all the objects that the server will need to complete the new
-references will be sent.
-
-----
-  update-request    =  *shallow ( command-list | push-cert ) [packfile]
-
-  shallow           =  PKT-LINE("shallow" SP obj-id)
-
-  command-list      =  PKT-LINE(command NUL capability-list)
-		       *PKT-LINE(command)
-		       flush-pkt
-
-  command           =  create / delete / update
-  create            =  zero-id SP new-id  SP name
-  delete            =  old-id  SP zero-id SP name
-  update            =  old-id  SP new-id  SP name
-
-  old-id            =  obj-id
-  new-id            =  obj-id
-
-  push-cert         = PKT-LINE("push-cert" NUL capability-list LF)
-		      PKT-LINE("certificate version 0.1" LF)
-		      PKT-LINE("pusher" SP ident LF)
-		      PKT-LINE("pushee" SP url LF)
-		      PKT-LINE("nonce" SP nonce LF)
-		      PKT-LINE(LF)
-		      *PKT-LINE(command LF)
-		      *PKT-LINE(gpg-signature-lines LF)
-		      PKT-LINE("push-cert-end" LF)
-
-  packfile          = "PACK" 28*(OCTET)
-----
-
-If the receiving end does not support delete-refs, the sending end MUST
-NOT ask for delete command.
-
-If the receiving end does not support push-cert, the sending end
-MUST NOT send a push-cert command.  When a push-cert command is
-sent, command-list MUST NOT be sent; the commands recorded in the
-push certificate is used instead.
-
-The packfile MUST NOT be sent if the only command used is 'delete'.
-
-A packfile MUST be sent if either create or update command is used,
-even if the server already has all the necessary objects.  In this
-case the client MUST send an empty packfile.   The only time this
-is likely to happen is if the client is creating
-a new branch or a tag that points to an existing obj-id.
-
-The server will receive the packfile, unpack it, then validate each
-reference that is being updated that it hasn't changed while the request
-was being processed (the obj-id is still the same as the old-id), and
-it will run any update hooks to make sure that the update is acceptable.
-If all of that is fine, the server will then update the references.
-
-Push Certificate
-----------------
-
-A push certificate begins with a set of header lines.  After the
-header and an empty line, the protocol commands follow, one per
-line. Note that the trailing LF in push-cert PKT-LINEs is _not_
-optional; it must be present.
-
-Currently, the following header fields are defined:
-
-`pusher` ident::
-	Identify the GPG key in "Human Readable Name "
-	format.
-
-`pushee` url::
-	The repository URL (anonymized, if the URL contains
-	authentication material) the user who ran `git push`
-	intended to push into.
-
-`nonce` nonce::
-	The 'nonce' string the receiving repository asked the
-	pushing user to include in the certificate, to prevent
-	replay attacks.
-
-The GPG signature lines are a detached signature for the contents
-recorded in the push certificate before the signature block begins.
-The detached signature is used to certify that the commands were
-given by the pusher, who must be the signer.
-
-Report Status
--------------
-
-After receiving the pack data from the sender, the receiver sends a
-report if 'report-status' capability is in effect.
-It is a short listing of what happened in that update.  It will first
-list the status of the packfile unpacking as either 'unpack ok' or
-'unpack [error]'.  Then it will list the status for each of the references
-that it tried to update.  Each line is either 'ok [refname]' if the
-update was successful, or 'ng [refname] [error]' if the update was not.
-
-----
-  report-status     = unpack-status
-		      1*(command-status)
-		      flush-pkt
-
-  unpack-status     = PKT-LINE("unpack" SP unpack-result)
-  unpack-result     = "ok" / error-msg
-
-  command-status    = command-ok / command-fail
-  command-ok        = PKT-LINE("ok" SP refname)
-  command-fail      = PKT-LINE("ng" SP refname SP error-msg)
-
-  error-msg         = 1*(OCTECT) ; where not "ok"
-----
-
-Updates can be unsuccessful for a number of reasons.  The reference can have
-changed since the reference discovery phase was originally sent, meaning
-someone pushed in the meantime.  The reference being pushed could be a
-non-fast-forward reference and the update hooks or configuration could be
-set to not allow that, etc.  Also, some references can be updated while others
-can be rejected.
-
-An example client/server communication might look like this:
-
-----
-   S: 007c74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/local\0report-status delete-refs ofs-delta\n
-   S: 003e7d1665144a3a975c05f1f43902ddaf084e784dbe refs/heads/debug\n
-   S: 003f74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/master\n
-   S: 003f74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/team\n
-   S: 0000
-
-   C: 003e7d1665144a3a975c05f1f43902ddaf084e784dbe 74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/debug\n
-   C: 003e74730d410fcb6603ace96f1dc55ea6196122532d 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a refs/heads/master\n
-   C: 0000
-   C: [PACKDATA]
-
-   S: 000eunpack ok\n
-   S: 0018ok refs/heads/debug\n
-   S: 002ang refs/heads/master non-fast-forward\n
-----
-*/
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/filter.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/filter.go
deleted file mode 100644
index 08932af11..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/filter.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package packp
-
-import (
-	"errors"
-	"fmt"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"net/url"
-	"strings"
-)
-
-var ErrUnsupportedObjectFilterType = errors.New("unsupported object filter type")
-
-// Filter values enable the partial clone capability which causes
-// the server to omit objects that match the filter.
-//
-// See [Git's documentation] for more details.
-//
-// [Git's documentation]: https://github.com/git/git/blob/e02ecfcc534e2021aae29077a958dd11c3897e4c/Documentation/rev-list-options.txt#L948
-type Filter string
-
-type BlobLimitPrefix string
-
-const (
-	BlobLimitPrefixNone BlobLimitPrefix = ""
-	BlobLimitPrefixKibi BlobLimitPrefix = "k"
-	BlobLimitPrefixMebi BlobLimitPrefix = "m"
-	BlobLimitPrefixGibi BlobLimitPrefix = "g"
-)
-
-// FilterBlobNone omits all blobs.
-func FilterBlobNone() Filter {
-	return "blob:none"
-}
-
-// FilterBlobLimit omits blobs of size at least n bytes (when prefix is
-// BlobLimitPrefixNone), n kibibytes (when prefix is BlobLimitPrefixKibi),
-// n mebibytes (when prefix is BlobLimitPrefixMebi) or n gibibytes (when
-// prefix is BlobLimitPrefixGibi). n can be zero, in which case all blobs
-// will be omitted.
-func FilterBlobLimit(n uint64, prefix BlobLimitPrefix) Filter {
-	return Filter(fmt.Sprintf("blob:limit=%d%s", n, prefix))
-}
-
-// FilterTreeDepth omits all blobs and trees whose depth from the root tree
-// is larger or equal to depth.
-func FilterTreeDepth(depth uint64) Filter {
-	return Filter(fmt.Sprintf("tree:%d", depth))
-}
-
-// FilterObjectType omits all objects which are not of the requested type t.
-// Supported types are TagObject, CommitObject, TreeObject and BlobObject.
-func FilterObjectType(t plumbing.ObjectType) (Filter, error) {
-	switch t {
-	case plumbing.TagObject:
-		fallthrough
-	case plumbing.CommitObject:
-		fallthrough
-	case plumbing.TreeObject:
-		fallthrough
-	case plumbing.BlobObject:
-		return Filter(fmt.Sprintf("object:type=%s", t.String())), nil
-	default:
-		return "", fmt.Errorf("%w: %s", ErrUnsupportedObjectFilterType, t.String())
-	}
-}
-
-// FilterCombine combines multiple Filter values together.
-func FilterCombine(filters ...Filter) Filter {
-	var escapedFilters []string
-
-	for _, filter := range filters {
-		escapedFilters = append(escapedFilters, url.QueryEscape(string(filter)))
-	}
-
-	return Filter(fmt.Sprintf("combine:%s", strings.Join(escapedFilters, "+")))
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/gitproto.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/gitproto.go
deleted file mode 100644
index cbb05a1d1..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/gitproto.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package packp
-
-import (
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-var (
-	// ErrInvalidGitProtoRequest is returned by Decode if the input is not a
-	// valid git protocol request.
-	ErrInvalidGitProtoRequest = fmt.Errorf("invalid git protocol request")
-)
-
-// GitProtoRequest is a command request for the git protocol.
-// It is used to send the command, endpoint, and extra parameters to the
-// remote.
-// See https://git-scm.com/docs/pack-protocol#_git_transport
-type GitProtoRequest struct {
-	RequestCommand string
-	Pathname       string
-
-	// Optional
-	Host string
-
-	// Optional
-	ExtraParams []string
-}
-
-// validate validates the request.
-func (g *GitProtoRequest) validate() error {
-	if g.RequestCommand == "" {
-		return fmt.Errorf("%w: empty request command", ErrInvalidGitProtoRequest)
-	}
-
-	if g.Pathname == "" {
-		return fmt.Errorf("%w: empty pathname", ErrInvalidGitProtoRequest)
-	}
-
-	return nil
-}
-
-// Encode encodes the request into the writer.
-func (g *GitProtoRequest) Encode(w io.Writer) error {
-	if w == nil {
-		return ErrNilWriter
-	}
-
-	if err := g.validate(); err != nil {
-		return err
-	}
-
-	p := pktline.NewEncoder(w)
-	req := fmt.Sprintf("%s %s\x00", g.RequestCommand, g.Pathname)
-	if host := g.Host; host != "" {
-		req += fmt.Sprintf("host=%s\x00", host)
-	}
-
-	if len(g.ExtraParams) > 0 {
-		req += "\x00"
-		for _, param := range g.ExtraParams {
-			req += param + "\x00"
-		}
-	}
-
-	if err := p.Encode([]byte(req)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Decode decodes the request from the reader.
-func (g *GitProtoRequest) Decode(r io.Reader) error {
-	s := pktline.NewScanner(r)
-	if !s.Scan() {
-		err := s.Err()
-		if err == nil {
-			return ErrInvalidGitProtoRequest
-		}
-		return err
-	}
-
-	line := string(s.Bytes())
-	if len(line) == 0 {
-		return io.EOF
-	}
-
-	if line[len(line)-1] != 0 {
-		return fmt.Errorf("%w: missing null terminator", ErrInvalidGitProtoRequest)
-	}
-
-	parts := strings.SplitN(line, " ", 2)
-	if len(parts) != 2 {
-		return fmt.Errorf("%w: short request", ErrInvalidGitProtoRequest)
-	}
-
-	g.RequestCommand = parts[0]
-	params := strings.Split(parts[1], string(null))
-	if len(params) < 1 {
-		return fmt.Errorf("%w: missing pathname", ErrInvalidGitProtoRequest)
-	}
-
-	g.Pathname = params[0]
-	if len(params) > 1 {
-		g.Host = strings.TrimPrefix(params[1], "host=")
-	}
-
-	if len(params) > 2 {
-		for _, param := range params[2:] {
-			if param != "" {
-				g.ExtraParams = append(g.ExtraParams, param)
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/report_status.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/report_status.go
deleted file mode 100644
index a96658ad1..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/report_status.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-const (
-	ok = "ok"
-)
-
-// ReportStatus is a report status message, as used in the git-receive-pack
-// process whenever the 'report-status' capability is negotiated.
-type ReportStatus struct {
-	UnpackStatus    string
-	CommandStatuses []*CommandStatus
-}
-
-// NewReportStatus creates a new ReportStatus message.
-func NewReportStatus() *ReportStatus {
-	return &ReportStatus{}
-}
-
-// Error returns the first error if any.
-func (s *ReportStatus) Error() error {
-	if s.UnpackStatus != ok {
-		return fmt.Errorf("unpack error: %s", s.UnpackStatus)
-	}
-
-	for _, s := range s.CommandStatuses {
-		if err := s.Error(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Encode writes the report status to a writer.
-func (s *ReportStatus) Encode(w io.Writer) error {
-	e := pktline.NewEncoder(w)
-	if err := e.Encodef("unpack %s\n", s.UnpackStatus); err != nil {
-		return err
-	}
-
-	for _, cs := range s.CommandStatuses {
-		if err := cs.encode(w); err != nil {
-			return err
-		}
-	}
-
-	return e.Flush()
-}
-
-// Decode reads from the given reader and decodes a report-status message. It
-// does not read more input than what is needed to fill the report status.
-func (s *ReportStatus) Decode(r io.Reader) error {
-	scan := pktline.NewScanner(r)
-	if err := s.scanFirstLine(scan); err != nil {
-		return err
-	}
-
-	if err := s.decodeReportStatus(scan.Bytes()); err != nil {
-		return err
-	}
-
-	flushed := false
-	for scan.Scan() {
-		b := scan.Bytes()
-		if isFlush(b) {
-			flushed = true
-			break
-		}
-
-		if err := s.decodeCommandStatus(b); err != nil {
-			return err
-		}
-	}
-
-	if !flushed {
-		return fmt.Errorf("missing flush")
-	}
-
-	return scan.Err()
-}
-
-func (s *ReportStatus) scanFirstLine(scan *pktline.Scanner) error {
-	if scan.Scan() {
-		return nil
-	}
-
-	if scan.Err() != nil {
-		return scan.Err()
-	}
-
-	return io.ErrUnexpectedEOF
-}
-
-func (s *ReportStatus) decodeReportStatus(b []byte) error {
-	if isFlush(b) {
-		return fmt.Errorf("premature flush")
-	}
-
-	b = bytes.TrimSuffix(b, eol)
-
-	line := string(b)
-	fields := strings.SplitN(line, " ", 2)
-	if len(fields) != 2 || fields[0] != "unpack" {
-		return fmt.Errorf("malformed unpack status: %s", line)
-	}
-
-	s.UnpackStatus = fields[1]
-	return nil
-}
-
-func (s *ReportStatus) decodeCommandStatus(b []byte) error {
-	b = bytes.TrimSuffix(b, eol)
-
-	line := string(b)
-	fields := strings.SplitN(line, " ", 3)
-	status := ok
-	if len(fields) == 3 && fields[0] == "ng" {
-		status = fields[2]
-	} else if len(fields) != 2 || fields[0] != "ok" {
-		return fmt.Errorf("malformed command status: %s", line)
-	}
-
-	cs := &CommandStatus{
-		ReferenceName: plumbing.ReferenceName(fields[1]),
-		Status:        status,
-	}
-	s.CommandStatuses = append(s.CommandStatuses, cs)
-	return nil
-}
-
-// CommandStatus is the status of a reference in a report status.
-// See ReportStatus struct.
-type CommandStatus struct {
-	ReferenceName plumbing.ReferenceName
-	Status        string
-}
-
-// Error returns the error, if any.
-func (s *CommandStatus) Error() error {
-	if s.Status == ok {
-		return nil
-	}
-
-	return fmt.Errorf("command error on %s: %s",
-		s.ReferenceName.String(), s.Status)
-}
-
-func (s *CommandStatus) encode(w io.Writer) error {
-	e := pktline.NewEncoder(w)
-	if s.Error() == nil {
-		return e.Encodef("ok %s\n", s.ReferenceName.String())
-	}
-
-	return e.Encodef("ng %s %s\n", s.ReferenceName.String(), s.Status)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/shallowupd.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/shallowupd.go
deleted file mode 100644
index af6ba69c7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/shallowupd.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-const (
-	shallowLineLen   = 48
-	unshallowLineLen = 50
-)
-
-type ShallowUpdate struct {
-	Shallows   []plumbing.Hash
-	Unshallows []plumbing.Hash
-}
-
-func (r *ShallowUpdate) Decode(reader io.Reader) error {
-	s := pktline.NewScanner(reader)
-
-	for s.Scan() {
-		line := s.Bytes()
-		line = bytes.TrimSpace(line)
-
-		var err error
-		switch {
-		case bytes.HasPrefix(line, shallow):
-			err = r.decodeShallowLine(line)
-		case bytes.HasPrefix(line, unshallow):
-			err = r.decodeUnshallowLine(line)
-		case bytes.Equal(line, pktline.Flush):
-			return nil
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return s.Err()
-}
-
-func (r *ShallowUpdate) decodeShallowLine(line []byte) error {
-	hash, err := r.decodeLine(line, shallow, shallowLineLen)
-	if err != nil {
-		return err
-	}
-
-	r.Shallows = append(r.Shallows, hash)
-	return nil
-}
-
-func (r *ShallowUpdate) decodeUnshallowLine(line []byte) error {
-	hash, err := r.decodeLine(line, unshallow, unshallowLineLen)
-	if err != nil {
-		return err
-	}
-
-	r.Unshallows = append(r.Unshallows, hash)
-	return nil
-}
-
-func (r *ShallowUpdate) decodeLine(line, prefix []byte, expLen int) (plumbing.Hash, error) {
-	if len(line) != expLen {
-		return plumbing.ZeroHash, fmt.Errorf("malformed %s%q", prefix, line)
-	}
-
-	raw := string(line[expLen-40 : expLen])
-	return plumbing.NewHash(raw), nil
-}
-
-func (r *ShallowUpdate) Encode(w io.Writer) error {
-	e := pktline.NewEncoder(w)
-
-	for _, h := range r.Shallows {
-		if err := e.Encodef("%s%s\n", shallow, h.String()); err != nil {
-			return err
-		}
-	}
-
-	for _, h := range r.Unshallows {
-		if err := e.Encodef("%s%s\n", unshallow, h.String()); err != nil {
-			return err
-		}
-	}
-
-	return e.Flush()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/common.go
deleted file mode 100644
index de5001281..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/common.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package sideband
-
-// Type sideband type "side-band" or "side-band-64k"
-type Type int8
-
-const (
-	// Sideband legacy sideband type up to 1000-byte messages
-	Sideband Type = iota
-	// Sideband64k sideband type up to 65519-byte messages
-	Sideband64k Type = iota
-
-	// MaxPackedSize for Sideband type
-	MaxPackedSize = 1000
-	// MaxPackedSize64k for Sideband64k type
-	MaxPackedSize64k = 65520
-)
-
-// Channel sideband channel
-type Channel byte
-
-// WithPayload encode the payload as a message
-func (ch Channel) WithPayload(payload []byte) []byte {
-	return append([]byte{byte(ch)}, payload...)
-}
-
-const (
-	// PackData packfile content
-	PackData Channel = 1
-	// ProgressMessage progress messages
-	ProgressMessage Channel = 2
-	// ErrorMessage fatal error message just before stream aborts
-	ErrorMessage Channel = 3
-)
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/demux.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/demux.go
deleted file mode 100644
index a8e3f7378..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/demux.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package sideband
-
-import (
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-// ErrMaxPackedExceeded returned by Read, if the maximum packed size is exceeded
-var ErrMaxPackedExceeded = errors.New("max. packed size exceeded")
-
-// Progress where the progress information is stored
-type Progress interface {
-	io.Writer
-}
-
-// Demuxer demultiplexes the progress reports and error info interleaved with the
-// packfile itself.
-//
-// A sideband has three different channels the main one, called PackData, contains
-// the packfile data; the ErrorMessage channel, that contains server errors; and
-// the last one, ProgressMessage channel, containing information about the ongoing
-// task happening in the server (optional, can be suppressed sending NoProgress
-// or Quiet capabilities to the server)
-//
-// In order to demultiplex the data stream, method `Read` should be called to
-// retrieve the PackData channel, the incoming data from the ProgressMessage is
-// written at `Progress` (if any), if any message is retrieved from the
-// ErrorMessage channel an error is returned and we can assume that the
-// connection has been closed.
-type Demuxer struct {
-	t Type
-	r io.Reader
-	s *pktline.Scanner
-
-	max     int
-	pending []byte
-
-	// Progress is where the progress messages are stored
-	Progress Progress
-}
-
-// NewDemuxer returns a new Demuxer for the given t and read from r
-func NewDemuxer(t Type, r io.Reader) *Demuxer {
-	max := MaxPackedSize64k
-	if t == Sideband {
-		max = MaxPackedSize
-	}
-
-	return &Demuxer{
-		t:   t,
-		r:   r,
-		max: max,
-		s:   pktline.NewScanner(r),
-	}
-}
-
-// Read reads up to len(p) bytes from the PackData channel into p, an error can
-// be return if an error happens when reading or if a message is sent in the
-// ErrorMessage channel.
-//
-// When a ProgressMessage is read, is not copy to b, instead of this is written
-// to the Progress
-func (d *Demuxer) Read(b []byte) (n int, err error) {
-	var read, req int
-
-	req = len(b)
-	for read < req {
-		n, err := d.doRead(b[read:req])
-		read += n
-
-		if err != nil {
-			return read, err
-		}
-	}
-
-	return read, nil
-}
-
-func (d *Demuxer) doRead(b []byte) (int, error) {
-	read, err := d.nextPackData()
-	size := len(read)
-	wanted := len(b)
-
-	if size > wanted {
-		d.pending = read[wanted:]
-	}
-
-	if wanted > size {
-		wanted = size
-	}
-
-	size = copy(b, read[:wanted])
-	return size, err
-}
-
-func (d *Demuxer) nextPackData() ([]byte, error) {
-	content := d.getPending()
-	if len(content) != 0 {
-		return content, nil
-	}
-
-	if !d.s.Scan() {
-		if err := d.s.Err(); err != nil {
-			return nil, err
-		}
-
-		return nil, io.EOF
-	}
-
-	content = d.s.Bytes()
-
-	size := len(content)
-	if size == 0 {
-		return nil, io.EOF
-	} else if size > d.max {
-		return nil, ErrMaxPackedExceeded
-	}
-
-	switch Channel(content[0]) {
-	case PackData:
-		return content[1:], nil
-	case ProgressMessage:
-		if d.Progress != nil {
-			_, err := d.Progress.Write(content[1:])
-			return nil, err
-		}
-	case ErrorMessage:
-		return nil, fmt.Errorf("unexpected error: %s", content[1:])
-	default:
-		return nil, fmt.Errorf("unknown channel %s", content)
-	}
-
-	return nil, nil
-}
-
-func (d *Demuxer) getPending() (b []byte) {
-	if len(d.pending) == 0 {
-		return nil
-	}
-
-	content := d.pending
-	d.pending = nil
-
-	return content
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/doc.go
deleted file mode 100644
index c5d242952..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/doc.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Package sideband implements a sideband mutiplex/demultiplexer
-package sideband
-
-// If 'side-band' or 'side-band-64k' capabilities have been specified by
-// the client, the server will send the packfile data multiplexed.
-//
-// Either mode indicates that the packfile data will be streamed broken
-// up into packets of up to either 1000 bytes in the case of 'side_band',
-// or 65520 bytes in the case of 'side_band_64k'. Each packet is made up
-// of a leading 4-byte pkt-line length of how much data is in the packet,
-// followed by a 1-byte stream code, followed by the actual data.
-//
-// The stream code can be one of:
-//
-//  1 - pack data
-//  2 - progress messages
-//  3 - fatal error message just before stream aborts
-//
-// The "side-band-64k" capability came about as a way for newer clients
-// that can handle much larger packets to request packets that are
-// actually crammed nearly full, while maintaining backward compatibility
-// for the older clients.
-//
-// Further, with side-band and its up to 1000-byte messages, it's actually
-// 999 bytes of payload and 1 byte for the stream code. With side-band-64k,
-// same deal, you have up to 65519 bytes of data and 1 byte for the stream
-// code.
-//
-// The client MUST send only maximum of one of "side-band" and "side-
-// band-64k".  Server MUST diagnose it as an error if client requests
-// both.
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/muxer.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/muxer.go
deleted file mode 100644
index 5c9f851b0..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband/muxer.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package sideband
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-// Muxer multiplex the packfile along with the progress messages and the error
-// information. The multiplex is perform using pktline format.
-type Muxer struct {
-	max int
-	e   *pktline.Encoder
-}
-
-const chLen = 1
-
-// NewMuxer returns a new Muxer for the given t that writes on w.
-//
-// If t is equal to `Sideband` the max pack size is set to MaxPackedSize, in any
-// other value is given, max pack is set to MaxPackedSize64k, that is the
-// maximum length of a line in pktline format.
-func NewMuxer(t Type, w io.Writer) *Muxer {
-	max := MaxPackedSize64k
-	if t == Sideband {
-		max = MaxPackedSize
-	}
-
-	return &Muxer{
-		max: max - chLen,
-		e:   pktline.NewEncoder(w),
-	}
-}
-
-// Write writes p in the PackData channel
-func (m *Muxer) Write(p []byte) (int, error) {
-	return m.WriteChannel(PackData, p)
-}
-
-// WriteChannel writes p in the given channel. This method can be used with any
-// channel, but is recommend use it only for the ProgressMessage and
-// ErrorMessage channels and use Write for the PackData channel
-func (m *Muxer) WriteChannel(t Channel, p []byte) (int, error) {
-	wrote := 0
-	size := len(p)
-	for wrote < size {
-		n, err := m.doWrite(t, p[wrote:])
-		wrote += n
-
-		if err != nil {
-			return wrote, err
-		}
-	}
-
-	return wrote, nil
-}
-
-func (m *Muxer) doWrite(ch Channel, p []byte) (int, error) {
-	sz := len(p)
-	if sz > m.max {
-		sz = m.max
-	}
-
-	return sz, m.e.Encode(ch.WithPayload(p[:sz]))
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/srvresp.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/srvresp.go
deleted file mode 100644
index e02f7c740..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/srvresp.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package packp
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-const ackLineLen = 44
-
-// ServerResponse object acknowledgement from upload-pack service
-type ServerResponse struct {
-	ACKs []plumbing.Hash
-}
-
-// Decode decodes the response into the struct, isMultiACK should be true, if
-// the request was done with multi_ack or multi_ack_detailed capabilities.
-func (r *ServerResponse) Decode(reader *bufio.Reader, isMultiACK bool) error {
-	s := pktline.NewScanner(reader)
-
-	for s.Scan() {
-		line := s.Bytes()
-
-		if err := r.decodeLine(line); err != nil {
-			return err
-		}
-
-		// we need to detect when the end of a response header and the beginning
-		// of a packfile header happened, some requests to the git daemon
-		// produces a duplicate ACK header even when multi_ack is not supported.
-		stop, err := r.stopReading(reader)
-		if err != nil {
-			return err
-		}
-
-		if stop {
-			break
-		}
-	}
-
-	// isMultiACK is true when the remote server advertises the related
-	// capabilities when they are not in transport.UnsupportedCapabilities.
-	//
-	// Users may decide to remove multi_ack and multi_ack_detailed from the
-	// unsupported capabilities list, which allows them to do initial clones
-	// from Azure DevOps.
-	//
-	// Follow-up fetches may error, therefore errors are wrapped with additional
-	// information highlighting that this capabilities are not supported by go-git.
-	//
-	// TODO: Implement support for multi_ack or multi_ack_detailed responses.
-	err := s.Err()
-	if err != nil && isMultiACK {
-		return fmt.Errorf("multi_ack and multi_ack_detailed are not supported: %w", err)
-	}
-
-	return err
-}
-
-// stopReading detects when a valid command such as ACK or NAK is found to be
-// read in the buffer without moving the read pointer.
-func (r *ServerResponse) stopReading(reader *bufio.Reader) (bool, error) {
-	ahead, err := reader.Peek(7)
-	if err == io.EOF {
-		return true, nil
-	}
-
-	if err != nil {
-		return false, err
-	}
-
-	if len(ahead) > 4 && r.isValidCommand(ahead[0:3]) {
-		return false, nil
-	}
-
-	if len(ahead) == 7 && r.isValidCommand(ahead[4:]) {
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func (r *ServerResponse) isValidCommand(b []byte) bool {
-	commands := [][]byte{ack, nak}
-	for _, c := range commands {
-		if bytes.Equal(b, c) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (r *ServerResponse) decodeLine(line []byte) error {
-	if len(line) == 0 {
-		return fmt.Errorf("unexpected flush")
-	}
-
-	if len(line) >= 3 {
-		if bytes.Equal(line[0:3], ack) {
-			return r.decodeACKLine(line)
-		}
-
-		if bytes.Equal(line[0:3], nak) {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("unexpected content %q", string(line))
-}
-
-func (r *ServerResponse) decodeACKLine(line []byte) error {
-	if len(line) < ackLineLen {
-		return fmt.Errorf("malformed ACK %q", line)
-	}
-
-	sp := bytes.Index(line, []byte(" "))
-	if sp+41 > len(line) {
-		return fmt.Errorf("malformed ACK %q", line)
-	}
-	h := plumbing.NewHash(string(line[sp+1 : sp+41]))
-	r.ACKs = append(r.ACKs, h)
-	return nil
-}
-
-// Encode encodes the ServerResponse into a writer.
-func (r *ServerResponse) Encode(w io.Writer, isMultiACK bool) error {
-	if len(r.ACKs) > 1 && !isMultiACK {
-		// For further information, refer to comments in the Decode func above.
-		return errors.New("multi_ack and multi_ack_detailed are not supported")
-	}
-
-	e := pktline.NewEncoder(w)
-	if len(r.ACKs) == 0 {
-		return e.Encodef("%s\n", nak)
-	}
-
-	return e.Encodef("%s %s\n", ack, r.ACKs[0].String())
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq.go
deleted file mode 100644
index 74297f769..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package packp
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-)
-
-// UploadRequest values represent the information transmitted on a
-// upload-request message.  Values from this type are not zero-value
-// safe, use the New function instead.
-// This is a low level type, use UploadPackRequest instead.
-type UploadRequest struct {
-	Capabilities *capability.List
-	Wants        []plumbing.Hash
-	Shallows     []plumbing.Hash
-	Depth        Depth
-	Filter       Filter
-}
-
-// Depth values stores the desired depth of the requested packfile: see
-// DepthCommit, DepthSince and DepthReference.
-type Depth interface {
-	isDepth()
-	IsZero() bool
-}
-
-// DepthCommits values stores the maximum number of requested commits in
-// the packfile.  Zero means infinite.  A negative value will have
-// undefined consequences.
-type DepthCommits int
-
-func (d DepthCommits) isDepth() {}
-
-func (d DepthCommits) IsZero() bool {
-	return d == 0
-}
-
-// DepthSince values requests only commits newer than the specified time.
-type DepthSince time.Time
-
-func (d DepthSince) isDepth() {}
-
-func (d DepthSince) IsZero() bool {
-	return time.Time(d).IsZero()
-}
-
-// DepthReference requests only commits not to found in the specified reference.
-type DepthReference string
-
-func (d DepthReference) isDepth() {}
-
-func (d DepthReference) IsZero() bool {
-	return string(d) == ""
-}
-
-// NewUploadRequest returns a pointer to a new UploadRequest value, ready to be
-// used. It has no capabilities, wants or shallows and an infinite depth. Please
-// note that to encode an upload-request it has to have at least one wanted hash.
-func NewUploadRequest() *UploadRequest {
-	return &UploadRequest{
-		Capabilities: capability.NewList(),
-		Wants:        []plumbing.Hash{},
-		Shallows:     []plumbing.Hash{},
-		Depth:        DepthCommits(0),
-	}
-}
-
-// NewUploadRequestFromCapabilities returns a pointer to a new UploadRequest
-// value, the request capabilities are filled with the most optimal ones, based
-// on the adv value (advertised capabilities), the UploadRequest generated it
-// has no wants or shallows and an infinite depth.
-func NewUploadRequestFromCapabilities(adv *capability.List) *UploadRequest {
-	r := NewUploadRequest()
-
-	if adv.Supports(capability.MultiACKDetailed) {
-		r.Capabilities.Set(capability.MultiACKDetailed)
-	} else if adv.Supports(capability.MultiACK) {
-		r.Capabilities.Set(capability.MultiACK)
-	}
-
-	if adv.Supports(capability.Sideband64k) {
-		r.Capabilities.Set(capability.Sideband64k)
-	} else if adv.Supports(capability.Sideband) {
-		r.Capabilities.Set(capability.Sideband)
-	}
-
-	if adv.Supports(capability.ThinPack) {
-		r.Capabilities.Set(capability.ThinPack)
-	}
-
-	if adv.Supports(capability.OFSDelta) {
-		r.Capabilities.Set(capability.OFSDelta)
-	}
-
-	if adv.Supports(capability.Agent) {
-		r.Capabilities.Set(capability.Agent, capability.DefaultAgent())
-	}
-
-	return r
-}
-
-// Validate validates the content of UploadRequest, following the next rules:
-//   - Wants MUST have at least one reference
-//   - capability.Shallow MUST be present if Shallows is not empty
-//   - is a non-zero DepthCommits is given capability.Shallow MUST be present
-//   - is a DepthSince is given capability.Shallow MUST be present
-//   - is a DepthReference is given capability.DeepenNot MUST be present
-//   - MUST contain only maximum of one of capability.Sideband and capability.Sideband64k
-//   - MUST contain only maximum of one of capability.MultiACK and capability.MultiACKDetailed
-func (req *UploadRequest) Validate() error {
-	if len(req.Wants) == 0 {
-		return fmt.Errorf("want can't be empty")
-	}
-
-	if err := req.validateRequiredCapabilities(); err != nil {
-		return err
-	}
-
-	if err := req.validateConflictCapabilities(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (req *UploadRequest) validateRequiredCapabilities() error {
-	msg := "missing capability %s"
-
-	if len(req.Shallows) != 0 && !req.Capabilities.Supports(capability.Shallow) {
-		return fmt.Errorf(msg, capability.Shallow)
-	}
-
-	switch req.Depth.(type) {
-	case DepthCommits:
-		if req.Depth != DepthCommits(0) {
-			if !req.Capabilities.Supports(capability.Shallow) {
-				return fmt.Errorf(msg, capability.Shallow)
-			}
-		}
-	case DepthSince:
-		if !req.Capabilities.Supports(capability.DeepenSince) {
-			return fmt.Errorf(msg, capability.DeepenSince)
-		}
-	case DepthReference:
-		if !req.Capabilities.Supports(capability.DeepenNot) {
-			return fmt.Errorf(msg, capability.DeepenNot)
-		}
-	}
-
-	return nil
-}
-
-func (req *UploadRequest) validateConflictCapabilities() error {
-	msg := "capabilities %s and %s are mutually exclusive"
-	if req.Capabilities.Supports(capability.Sideband) &&
-		req.Capabilities.Supports(capability.Sideband64k) {
-		return fmt.Errorf(msg, capability.Sideband, capability.Sideband64k)
-	}
-
-	if req.Capabilities.Supports(capability.MultiACK) &&
-		req.Capabilities.Supports(capability.MultiACKDetailed) {
-		return fmt.Errorf(msg, capability.MultiACK, capability.MultiACKDetailed)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq_decode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq_decode.go
deleted file mode 100644
index edadcaa60..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq_decode.go
+++ /dev/null
@@ -1,257 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-// Decode reads the next upload-request form its input and
-// stores it in the UploadRequest.
-func (req *UploadRequest) Decode(r io.Reader) error {
-	d := newUlReqDecoder(r)
-	return d.Decode(req)
-}
-
-type ulReqDecoder struct {
-	s     *pktline.Scanner // a pkt-line scanner from the input stream
-	line  []byte           // current pkt-line contents, use parser.nextLine() to make it advance
-	nLine int              // current pkt-line number for debugging, begins at 1
-	err   error            // sticky error, use the parser.error() method to fill this out
-	data  *UploadRequest   // parsed data is stored here
-}
-
-func newUlReqDecoder(r io.Reader) *ulReqDecoder {
-	return &ulReqDecoder{
-		s: pktline.NewScanner(r),
-	}
-}
-
-func (d *ulReqDecoder) Decode(v *UploadRequest) error {
-	d.data = v
-
-	for state := d.decodeFirstWant; state != nil; {
-		state = state()
-	}
-
-	return d.err
-}
-
-// fills out the parser sticky error
-func (d *ulReqDecoder) error(format string, a ...interface{}) {
-	msg := fmt.Sprintf(
-		"pkt-line %d: %s", d.nLine,
-		fmt.Sprintf(format, a...),
-	)
-
-	d.err = NewErrUnexpectedData(msg, d.line)
-}
-
-// Reads a new pkt-line from the scanner, makes its payload available as
-// p.line and increments p.nLine.  A successful invocation returns true,
-// otherwise, false is returned and the sticky error is filled out
-// accordingly.  Trims eols at the end of the payloads.
-func (d *ulReqDecoder) nextLine() bool {
-	d.nLine++
-
-	if !d.s.Scan() {
-		if d.err = d.s.Err(); d.err != nil {
-			return false
-		}
-
-		d.error("EOF")
-		return false
-	}
-
-	d.line = d.s.Bytes()
-	d.line = bytes.TrimSuffix(d.line, eol)
-
-	return true
-}
-
-// Expected format: want [ capabilities]
-func (d *ulReqDecoder) decodeFirstWant() stateFn {
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	if !bytes.HasPrefix(d.line, want) {
-		d.error("missing 'want ' prefix")
-		return nil
-	}
-	d.line = bytes.TrimPrefix(d.line, want)
-
-	hash, ok := d.readHash()
-	if !ok {
-		return nil
-	}
-	d.data.Wants = append(d.data.Wants, hash)
-
-	return d.decodeCaps
-}
-
-func (d *ulReqDecoder) readHash() (plumbing.Hash, bool) {
-	if len(d.line) < hashSize {
-		d.err = fmt.Errorf("malformed hash: %v", d.line)
-		return plumbing.ZeroHash, false
-	}
-
-	var hash plumbing.Hash
-	if _, err := hex.Decode(hash[:], d.line[:hashSize]); err != nil {
-		d.error("invalid hash text: %s", err)
-		return plumbing.ZeroHash, false
-	}
-	d.line = d.line[hashSize:]
-
-	return hash, true
-}
-
-// Expected format: sp cap1 sp cap2 sp cap3...
-func (d *ulReqDecoder) decodeCaps() stateFn {
-	d.line = bytes.TrimPrefix(d.line, sp)
-	if err := d.data.Capabilities.Decode(d.line); err != nil {
-		d.error("invalid capabilities: %s", err)
-	}
-
-	return d.decodeOtherWants
-}
-
-// Expected format: want 
-func (d *ulReqDecoder) decodeOtherWants() stateFn {
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	if bytes.HasPrefix(d.line, shallow) {
-		return d.decodeShallow
-	}
-
-	if bytes.HasPrefix(d.line, deepen) {
-		return d.decodeDeepen
-	}
-
-	if len(d.line) == 0 {
-		return nil
-	}
-
-	if !bytes.HasPrefix(d.line, want) {
-		d.error("unexpected payload while expecting a want: %q", d.line)
-		return nil
-	}
-	d.line = bytes.TrimPrefix(d.line, want)
-
-	hash, ok := d.readHash()
-	if !ok {
-		return nil
-	}
-	d.data.Wants = append(d.data.Wants, hash)
-
-	return d.decodeOtherWants
-}
-
-// Expected format: shallow 
-func (d *ulReqDecoder) decodeShallow() stateFn {
-	if bytes.HasPrefix(d.line, deepen) {
-		return d.decodeDeepen
-	}
-
-	if len(d.line) == 0 {
-		return nil
-	}
-
-	if !bytes.HasPrefix(d.line, shallow) {
-		d.error("unexpected payload while expecting a shallow: %q", d.line)
-		return nil
-	}
-	d.line = bytes.TrimPrefix(d.line, shallow)
-
-	hash, ok := d.readHash()
-	if !ok {
-		return nil
-	}
-	d.data.Shallows = append(d.data.Shallows, hash)
-
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	return d.decodeShallow
-}
-
-// Expected format: deepen  / deepen-since 
     / deepen-not 
-func (d *ulReqDecoder) decodeDeepen() stateFn {
-	if bytes.HasPrefix(d.line, deepenCommits) {
-		return d.decodeDeepenCommits
-	}
-
-	if bytes.HasPrefix(d.line, deepenSince) {
-		return d.decodeDeepenSince
-	}
-
-	if bytes.HasPrefix(d.line, deepenReference) {
-		return d.decodeDeepenReference
-	}
-
-	if len(d.line) == 0 {
-		return nil
-	}
-
-	d.error("unexpected deepen specification: %q", d.line)
-	return nil
-}
-
-func (d *ulReqDecoder) decodeDeepenCommits() stateFn {
-	d.line = bytes.TrimPrefix(d.line, deepenCommits)
-
-	var n int
-	if n, d.err = strconv.Atoi(string(d.line)); d.err != nil {
-		return nil
-	}
-	if n < 0 {
-		d.err = fmt.Errorf("negative depth")
-		return nil
-	}
-	d.data.Depth = DepthCommits(n)
-
-	return d.decodeFlush
-}
-
-func (d *ulReqDecoder) decodeDeepenSince() stateFn {
-	d.line = bytes.TrimPrefix(d.line, deepenSince)
-
-	var secs int64
-	secs, d.err = strconv.ParseInt(string(d.line), 10, 64)
-	if d.err != nil {
-		return nil
-	}
-	t := time.Unix(secs, 0).UTC()
-	d.data.Depth = DepthSince(t)
-
-	return d.decodeFlush
-}
-
-func (d *ulReqDecoder) decodeDeepenReference() stateFn {
-	d.line = bytes.TrimPrefix(d.line, deepenReference)
-
-	d.data.Depth = DepthReference(string(d.line))
-
-	return d.decodeFlush
-}
-
-func (d *ulReqDecoder) decodeFlush() stateFn {
-	if ok := d.nextLine(); !ok {
-		return nil
-	}
-
-	if len(d.line) != 0 {
-		d.err = fmt.Errorf("unexpected payload while expecting a flush-pkt: %q", d.line)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq_encode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq_encode.go
deleted file mode 100644
index 3507a23cd..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/ulreq_encode.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-// Encode writes the UlReq encoding of u to the stream.
-//
-// All the payloads will end with a newline character.  Wants and
-// shallows are sorted alphabetically.  A depth of 0 means no depth
-// request is sent.
-func (req *UploadRequest) Encode(w io.Writer) error {
-	e := newUlReqEncoder(w)
-	return e.Encode(req)
-}
-
-type ulReqEncoder struct {
-	pe   *pktline.Encoder // where to write the encoded data
-	data *UploadRequest   // the data to encode
-	err  error            // sticky error
-}
-
-func newUlReqEncoder(w io.Writer) *ulReqEncoder {
-	return &ulReqEncoder{
-		pe: pktline.NewEncoder(w),
-	}
-}
-
-func (e *ulReqEncoder) Encode(v *UploadRequest) error {
-	e.data = v
-
-	if len(v.Wants) == 0 {
-		return fmt.Errorf("empty wants provided")
-	}
-
-	plumbing.HashesSort(e.data.Wants)
-	for state := e.encodeFirstWant; state != nil; {
-		state = state()
-	}
-
-	return e.err
-}
-
-func (e *ulReqEncoder) encodeFirstWant() stateFn {
-	var err error
-	if e.data.Capabilities.IsEmpty() {
-		err = e.pe.Encodef("want %s\n", e.data.Wants[0])
-	} else {
-		err = e.pe.Encodef(
-			"want %s %s\n",
-			e.data.Wants[0],
-			e.data.Capabilities.String(),
-		)
-	}
-
-	if err != nil {
-		e.err = fmt.Errorf("encoding first want line: %s", err)
-		return nil
-	}
-
-	return e.encodeAdditionalWants
-}
-
-func (e *ulReqEncoder) encodeAdditionalWants() stateFn {
-	last := e.data.Wants[0]
-	for _, w := range e.data.Wants[1:] {
-		if bytes.Equal(last[:], w[:]) {
-			continue
-		}
-
-		if err := e.pe.Encodef("want %s\n", w); err != nil {
-			e.err = fmt.Errorf("encoding want %q: %s", w, err)
-			return nil
-		}
-
-		last = w
-	}
-
-	return e.encodeShallows
-}
-
-func (e *ulReqEncoder) encodeShallows() stateFn {
-	plumbing.HashesSort(e.data.Shallows)
-
-	var last plumbing.Hash
-	for _, s := range e.data.Shallows {
-		if bytes.Equal(last[:], s[:]) {
-			continue
-		}
-
-		if err := e.pe.Encodef("shallow %s\n", s); err != nil {
-			e.err = fmt.Errorf("encoding shallow %q: %s", s, err)
-			return nil
-		}
-
-		last = s
-	}
-
-	return e.encodeDepth
-}
-
-func (e *ulReqEncoder) encodeDepth() stateFn {
-	switch depth := e.data.Depth.(type) {
-	case DepthCommits:
-		if depth != 0 {
-			commits := int(depth)
-			if err := e.pe.Encodef("deepen %d\n", commits); err != nil {
-				e.err = fmt.Errorf("encoding depth %d: %s", depth, err)
-				return nil
-			}
-		}
-	case DepthSince:
-		when := time.Time(depth).UTC()
-		if err := e.pe.Encodef("deepen-since %d\n", when.Unix()); err != nil {
-			e.err = fmt.Errorf("encoding depth %s: %s", when, err)
-			return nil
-		}
-	case DepthReference:
-		reference := string(depth)
-		if err := e.pe.Encodef("deepen-not %s\n", reference); err != nil {
-			e.err = fmt.Errorf("encoding depth %s: %s", reference, err)
-			return nil
-		}
-	default:
-		e.err = fmt.Errorf("unsupported depth type")
-		return nil
-	}
-
-	return e.encodeFilter
-}
-
-func (e *ulReqEncoder) encodeFilter() stateFn {
-	if filter := e.data.Filter; filter != "" {
-		if err := e.pe.Encodef("filter %s\n", filter); err != nil {
-			e.err = fmt.Errorf("encoding filter %s: %s", filter, err)
-			return nil
-		}
-	}
-
-	return e.encodeFlush
-}
-
-func (e *ulReqEncoder) encodeFlush() stateFn {
-	if err := e.pe.Flush(); err != nil {
-		e.err = fmt.Errorf("encoding flush-pkt: %s", err)
-		return nil
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq.go
deleted file mode 100644
index cca6fcf0e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package packp
-
-import (
-	"errors"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband"
-)
-
-var (
-	ErrEmptyCommands    = errors.New("commands cannot be empty")
-	ErrMalformedCommand = errors.New("malformed command")
-)
-
-// ReferenceUpdateRequest values represent reference upload requests.
-// Values from this type are not zero-value safe, use the New function instead.
-type ReferenceUpdateRequest struct {
-	Capabilities *capability.List
-	Commands     []*Command
-	Options      []*Option
-	Shallow      *plumbing.Hash
-	// Packfile contains an optional packfile reader.
-	Packfile io.ReadCloser
-
-	// Progress receives sideband progress messages from the server
-	Progress sideband.Progress
-}
-
-// New returns a pointer to a new ReferenceUpdateRequest value.
-func NewReferenceUpdateRequest() *ReferenceUpdateRequest {
-	return &ReferenceUpdateRequest{
-		// TODO: Add support for push-cert
-		Capabilities: capability.NewList(),
-		Commands:     nil,
-	}
-}
-
-// NewReferenceUpdateRequestFromCapabilities returns a pointer to a new
-// ReferenceUpdateRequest value, the request capabilities are filled with the
-// most optimal ones, based on the adv value (advertised capabilities), the
-// ReferenceUpdateRequest contains no commands
-//
-// It does set the following capabilities:
-//   - agent
-//   - report-status
-//   - ofs-delta
-//   - ref-delta
-//   - delete-refs
-// It leaves up to the user to add the following capabilities later:
-//   - atomic
-//   - ofs-delta
-//   - side-band
-//   - side-band-64k
-//   - quiet
-//   - push-cert
-func NewReferenceUpdateRequestFromCapabilities(adv *capability.List) *ReferenceUpdateRequest {
-	r := NewReferenceUpdateRequest()
-
-	if adv.Supports(capability.Agent) {
-		r.Capabilities.Set(capability.Agent, capability.DefaultAgent())
-	}
-
-	if adv.Supports(capability.ReportStatus) {
-		r.Capabilities.Set(capability.ReportStatus)
-	}
-
-	return r
-}
-
-func (req *ReferenceUpdateRequest) validate() error {
-	if len(req.Commands) == 0 {
-		return ErrEmptyCommands
-	}
-
-	for _, c := range req.Commands {
-		if err := c.validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type Action string
-
-const (
-	Create  Action = "create"
-	Update  Action = "update"
-	Delete  Action = "delete"
-	Invalid Action = "invalid"
-)
-
-type Command struct {
-	Name plumbing.ReferenceName
-	Old  plumbing.Hash
-	New  plumbing.Hash
-}
-
-func (c *Command) Action() Action {
-	if c.Old == plumbing.ZeroHash && c.New == plumbing.ZeroHash {
-		return Invalid
-	}
-
-	if c.Old == plumbing.ZeroHash {
-		return Create
-	}
-
-	if c.New == plumbing.ZeroHash {
-		return Delete
-	}
-
-	return Update
-}
-
-func (c *Command) validate() error {
-	if c.Action() == Invalid {
-		return ErrMalformedCommand
-	}
-
-	return nil
-}
-
-type Option struct {
-	Key   string
-	Value string
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq_decode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq_decode.go
deleted file mode 100644
index ceff5298b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq_decode.go
+++ /dev/null
@@ -1,249 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-)
-
-var (
-	shallowLineLength       = len(shallow) + hashSize
-	minCommandLength        = hashSize*2 + 2 + 1
-	minCommandAndCapsLength = minCommandLength + 1
-)
-
-var (
-	ErrEmpty                        = errors.New("empty update-request message")
-	errNoCommands                   = errors.New("unexpected EOF before any command")
-	errMissingCapabilitiesDelimiter = errors.New("capabilities delimiter not found")
-)
-
-func errMalformedRequest(reason string) error {
-	return fmt.Errorf("malformed request: %s", reason)
-}
-
-func errInvalidHashSize(got int) error {
-	return fmt.Errorf("invalid hash size: expected %d, got %d",
-		hashSize, got)
-}
-
-func errInvalidHash(err error) error {
-	return fmt.Errorf("invalid hash: %s", err.Error())
-}
-
-func errInvalidShallowLineLength(got int) error {
-	return errMalformedRequest(fmt.Sprintf(
-		"invalid shallow line length: expected %d, got %d",
-		shallowLineLength, got))
-}
-
-func errInvalidCommandCapabilitiesLineLength(got int) error {
-	return errMalformedRequest(fmt.Sprintf(
-		"invalid command and capabilities line length: expected at least %d, got %d",
-		minCommandAndCapsLength, got))
-}
-
-func errInvalidCommandLineLength(got int) error {
-	return errMalformedRequest(fmt.Sprintf(
-		"invalid command line length: expected at least %d, got %d",
-		minCommandLength, got))
-}
-
-func errInvalidShallowObjId(err error) error {
-	return errMalformedRequest(
-		fmt.Sprintf("invalid shallow object id: %s", err.Error()))
-}
-
-func errInvalidOldObjId(err error) error {
-	return errMalformedRequest(
-		fmt.Sprintf("invalid old object id: %s", err.Error()))
-}
-
-func errInvalidNewObjId(err error) error {
-	return errMalformedRequest(
-		fmt.Sprintf("invalid new object id: %s", err.Error()))
-}
-
-func errMalformedCommand(err error) error {
-	return errMalformedRequest(fmt.Sprintf(
-		"malformed command: %s", err.Error()))
-}
-
-// Decode reads the next update-request message form the reader and wr
-func (req *ReferenceUpdateRequest) Decode(r io.Reader) error {
-	var rc io.ReadCloser
-	var ok bool
-	rc, ok = r.(io.ReadCloser)
-	if !ok {
-		rc = io.NopCloser(r)
-	}
-
-	d := &updReqDecoder{r: rc, s: pktline.NewScanner(r)}
-	return d.Decode(req)
-}
-
-type updReqDecoder struct {
-	r   io.ReadCloser
-	s   *pktline.Scanner
-	req *ReferenceUpdateRequest
-}
-
-func (d *updReqDecoder) Decode(req *ReferenceUpdateRequest) error {
-	d.req = req
-	funcs := []func() error{
-		d.scanLine,
-		d.decodeShallow,
-		d.decodeCommandAndCapabilities,
-		d.decodeCommands,
-		d.setPackfile,
-		req.validate,
-	}
-
-	for _, f := range funcs {
-		if err := f(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (d *updReqDecoder) scanLine() error {
-	if ok := d.s.Scan(); !ok {
-		return d.scanErrorOr(ErrEmpty)
-	}
-
-	return nil
-}
-
-func (d *updReqDecoder) decodeShallow() error {
-	b := d.s.Bytes()
-
-	if !bytes.HasPrefix(b, shallowNoSp) {
-		return nil
-	}
-
-	if len(b) != shallowLineLength {
-		return errInvalidShallowLineLength(len(b))
-	}
-
-	h, err := parseHash(string(b[len(shallow):]))
-	if err != nil {
-		return errInvalidShallowObjId(err)
-	}
-
-	if ok := d.s.Scan(); !ok {
-		return d.scanErrorOr(errNoCommands)
-	}
-
-	d.req.Shallow = &h
-
-	return nil
-}
-
-func (d *updReqDecoder) decodeCommands() error {
-	for {
-		b := d.s.Bytes()
-		if bytes.Equal(b, pktline.Flush) {
-			return nil
-		}
-
-		c, err := parseCommand(b)
-		if err != nil {
-			return err
-		}
-
-		d.req.Commands = append(d.req.Commands, c)
-
-		if ok := d.s.Scan(); !ok {
-			return d.s.Err()
-		}
-	}
-}
-
-func (d *updReqDecoder) decodeCommandAndCapabilities() error {
-	b := d.s.Bytes()
-	i := bytes.IndexByte(b, 0)
-	if i == -1 {
-		return errMissingCapabilitiesDelimiter
-	}
-
-	if len(b) < minCommandAndCapsLength {
-		return errInvalidCommandCapabilitiesLineLength(len(b))
-	}
-
-	cmd, err := parseCommand(b[:i])
-	if err != nil {
-		return err
-	}
-
-	d.req.Commands = append(d.req.Commands, cmd)
-
-	if err := d.req.Capabilities.Decode(b[i+1:]); err != nil {
-		return err
-	}
-
-	if err := d.scanLine(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *updReqDecoder) setPackfile() error {
-	d.req.Packfile = d.r
-
-	return nil
-}
-
-func parseCommand(b []byte) (*Command, error) {
-	if len(b) < minCommandLength {
-		return nil, errInvalidCommandLineLength(len(b))
-	}
-
-	var (
-		os, ns string
-		n      plumbing.ReferenceName
-	)
-	if _, err := fmt.Sscanf(string(b), "%s %s %s", &os, &ns, &n); err != nil {
-		return nil, errMalformedCommand(err)
-	}
-
-	oh, err := parseHash(os)
-	if err != nil {
-		return nil, errInvalidOldObjId(err)
-	}
-
-	nh, err := parseHash(ns)
-	if err != nil {
-		return nil, errInvalidNewObjId(err)
-	}
-
-	return &Command{Old: oh, New: nh, Name: n}, nil
-}
-
-func parseHash(s string) (plumbing.Hash, error) {
-	if len(s) != hashSize {
-		return plumbing.ZeroHash, errInvalidHashSize(len(s))
-	}
-
-	if _, err := hex.DecodeString(s); err != nil {
-		return plumbing.ZeroHash, errInvalidHash(err)
-	}
-
-	h := plumbing.NewHash(s)
-	return h, nil
-}
-
-func (d *updReqDecoder) scanErrorOr(origErr error) error {
-	if err := d.s.Err(); err != nil {
-		return err
-	}
-
-	return origErr
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq_encode.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq_encode.go
deleted file mode 100644
index a6d527a03..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/updreq_encode.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package packp
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-)
-
-// Encode writes the ReferenceUpdateRequest encoding to the stream.
-func (req *ReferenceUpdateRequest) Encode(w io.Writer) error {
-	if err := req.validate(); err != nil {
-		return err
-	}
-
-	e := pktline.NewEncoder(w)
-
-	if err := req.encodeShallow(e, req.Shallow); err != nil {
-		return err
-	}
-
-	if err := req.encodeCommands(e, req.Commands, req.Capabilities); err != nil {
-		return err
-	}
-
-	if req.Capabilities.Supports(capability.PushOptions) {
-		if err := req.encodeOptions(e, req.Options); err != nil {
-			return err
-		}
-	}
-
-	if req.Packfile != nil {
-		if _, err := io.Copy(w, req.Packfile); err != nil {
-			return err
-		}
-
-		return req.Packfile.Close()
-	}
-
-	return nil
-}
-
-func (req *ReferenceUpdateRequest) encodeShallow(e *pktline.Encoder,
-	h *plumbing.Hash) error {
-
-	if h == nil {
-		return nil
-	}
-
-	objId := []byte(h.String())
-	return e.Encodef("%s%s", shallow, objId)
-}
-
-func (req *ReferenceUpdateRequest) encodeCommands(e *pktline.Encoder,
-	cmds []*Command, cap *capability.List) error {
-
-	if err := e.Encodef("%s\x00%s",
-		formatCommand(cmds[0]), cap.String()); err != nil {
-		return err
-	}
-
-	for _, cmd := range cmds[1:] {
-		if err := e.Encodef(formatCommand(cmd)); err != nil {
-			return err
-		}
-	}
-
-	return e.Flush()
-}
-
-func formatCommand(cmd *Command) string {
-	o := cmd.Old.String()
-	n := cmd.New.String()
-	return fmt.Sprintf("%s %s %s", o, n, cmd.Name)
-}
-
-func (req *ReferenceUpdateRequest) encodeOptions(e *pktline.Encoder,
-	opts []*Option) error {
-
-	for _, opt := range opts {
-		if err := e.Encodef("%s=%s", opt.Key, opt.Value); err != nil {
-			return err
-		}
-	}
-
-	return e.Flush()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/uppackreq.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/uppackreq.go
deleted file mode 100644
index fca1fe9a8..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/uppackreq.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package packp
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-)
-
-// UploadPackRequest represents a upload-pack request.
-// Zero-value is not safe, use NewUploadPackRequest instead.
-type UploadPackRequest struct {
-	UploadRequest
-	UploadHaves
-}
-
-// NewUploadPackRequest creates a new UploadPackRequest and returns a pointer.
-func NewUploadPackRequest() *UploadPackRequest {
-	ur := NewUploadRequest()
-	return &UploadPackRequest{
-		UploadHaves:   UploadHaves{},
-		UploadRequest: *ur,
-	}
-}
-
-// NewUploadPackRequestFromCapabilities creates a new UploadPackRequest and
-// returns a pointer. The request capabilities are filled with the most optimal
-// ones, based on the adv value (advertised capabilities), the UploadPackRequest
-// it has no wants, haves or shallows and an infinite depth
-func NewUploadPackRequestFromCapabilities(adv *capability.List) *UploadPackRequest {
-	ur := NewUploadRequestFromCapabilities(adv)
-	return &UploadPackRequest{
-		UploadHaves:   UploadHaves{},
-		UploadRequest: *ur,
-	}
-}
-
-// IsEmpty returns whether a request is empty - it is empty if Haves are contained
-// in the Wants, or if Wants length is zero, and we don't have any shallows
-func (r *UploadPackRequest) IsEmpty() bool {
-	return isSubset(r.Wants, r.Haves) && len(r.Shallows) == 0
-}
-
-func isSubset(needle []plumbing.Hash, haystack []plumbing.Hash) bool {
-	for _, h := range needle {
-		found := false
-		for _, oh := range haystack {
-			if h == oh {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			return false
-		}
-	}
-
-	return true
-}
-
-// UploadHaves is a message to signal the references that a client has in a
-// upload-pack. Do not use this directly. Use UploadPackRequest request instead.
-type UploadHaves struct {
-	Haves []plumbing.Hash
-}
-
-// Encode encodes the UploadHaves into the Writer. If flush is true, a flush
-// command will be encoded at the end of the writer content.
-func (u *UploadHaves) Encode(w io.Writer, flush bool) error {
-	e := pktline.NewEncoder(w)
-
-	plumbing.HashesSort(u.Haves)
-
-	var last plumbing.Hash
-	for _, have := range u.Haves {
-		if bytes.Equal(last[:], have[:]) {
-			continue
-		}
-
-		if err := e.Encodef("have %s\n", have); err != nil {
-			return fmt.Errorf("sending haves for %q: %s", have, err)
-		}
-
-		last = have
-	}
-
-	if flush && len(u.Haves) != 0 {
-		if err := e.Flush(); err != nil {
-			return fmt.Errorf("sending flush-pkt after haves: %s", err)
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/uppackresp.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/uppackresp.go
deleted file mode 100644
index 4682e555f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/uppackresp.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package packp
-
-import (
-	"errors"
-	"io"
-
-	"bufio"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// ErrUploadPackResponseNotDecoded is returned if Read is called without
-// decoding first
-var ErrUploadPackResponseNotDecoded = errors.New("upload-pack-response should be decoded")
-
-// UploadPackResponse contains all the information responded by the upload-pack
-// service, the response implements io.ReadCloser that allows to read the
-// packfile directly from it.
-type UploadPackResponse struct {
-	ShallowUpdate
-	ServerResponse
-
-	r          io.ReadCloser
-	isShallow  bool
-	isMultiACK bool
-}
-
-// NewUploadPackResponse create a new UploadPackResponse instance, the request
-// being responded by the response is required.
-func NewUploadPackResponse(req *UploadPackRequest) *UploadPackResponse {
-	isShallow := !req.Depth.IsZero()
-	isMultiACK := req.Capabilities.Supports(capability.MultiACK) ||
-		req.Capabilities.Supports(capability.MultiACKDetailed)
-
-	return &UploadPackResponse{
-		isShallow:  isShallow,
-		isMultiACK: isMultiACK,
-	}
-}
-
-// NewUploadPackResponseWithPackfile creates a new UploadPackResponse instance,
-// and sets its packfile reader.
-func NewUploadPackResponseWithPackfile(req *UploadPackRequest,
-	pf io.ReadCloser) *UploadPackResponse {
-
-	r := NewUploadPackResponse(req)
-	r.r = pf
-	return r
-}
-
-// Decode decodes all the responses sent by upload-pack service into the struct
-// and prepares it to read the packfile using the Read method
-func (r *UploadPackResponse) Decode(reader io.ReadCloser) error {
-	buf := bufio.NewReader(reader)
-
-	if r.isShallow {
-		if err := r.ShallowUpdate.Decode(buf); err != nil {
-			return err
-		}
-	}
-
-	if err := r.ServerResponse.Decode(buf, r.isMultiACK); err != nil {
-		return err
-	}
-
-	// now the reader is ready to read the packfile content
-	r.r = ioutil.NewReadCloser(buf, reader)
-
-	return nil
-}
-
-// Encode encodes an UploadPackResponse.
-func (r *UploadPackResponse) Encode(w io.Writer) (err error) {
-	if r.isShallow {
-		if err := r.ShallowUpdate.Encode(w); err != nil {
-			return err
-		}
-	}
-
-	if err := r.ServerResponse.Encode(w, r.isMultiACK); err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(r.r, &err)
-	_, err = io.Copy(w, r.r)
-	return err
-}
-
-// Read reads the packfile data, if the request was done with any Sideband
-// capability the content read should be demultiplexed. If the methods wasn't
-// called before the ErrUploadPackResponseNotDecoded will be return
-func (r *UploadPackResponse) Read(p []byte) (int, error) {
-	if r.r == nil {
-		return 0, ErrUploadPackResponseNotDecoded
-	}
-
-	return r.r.Read(p)
-}
-
-// Close the underlying reader, if any
-func (r *UploadPackResponse) Close() error {
-	if r.r == nil {
-		return nil
-	}
-
-	return r.r.Close()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/reference.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/reference.go
deleted file mode 100644
index 4daa34164..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/reference.go
+++ /dev/null
@@ -1,315 +0,0 @@
-package plumbing
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-const (
-	refPrefix       = "refs/"
-	refHeadPrefix   = refPrefix + "heads/"
-	refTagPrefix    = refPrefix + "tags/"
-	refRemotePrefix = refPrefix + "remotes/"
-	refNotePrefix   = refPrefix + "notes/"
-	symrefPrefix    = "ref: "
-)
-
-// RefRevParseRules are a set of rules to parse references into short names, or expand into a full reference.
-// These are the same rules as used by git in shorten_unambiguous_ref and expand_ref.
-// See: https://github.com/git/git/blob/e0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7/refs.c#L417
-var RefRevParseRules = []string{
-	"%s",
-	"refs/%s",
-	"refs/tags/%s",
-	"refs/heads/%s",
-	"refs/remotes/%s",
-	"refs/remotes/%s/HEAD",
-}
-
-var (
-	ErrReferenceNotFound = errors.New("reference not found")
-
-	// ErrInvalidReferenceName is returned when a reference name is invalid.
-	ErrInvalidReferenceName = errors.New("invalid reference name")
-)
-
-// ReferenceType reference type's
-type ReferenceType int8
-
-const (
-	InvalidReference  ReferenceType = 0
-	HashReference     ReferenceType = 1
-	SymbolicReference ReferenceType = 2
-)
-
-func (r ReferenceType) String() string {
-	switch r {
-	case InvalidReference:
-		return "invalid-reference"
-	case HashReference:
-		return "hash-reference"
-	case SymbolicReference:
-		return "symbolic-reference"
-	}
-
-	return ""
-}
-
-// ReferenceName reference name's
-type ReferenceName string
-
-// NewBranchReferenceName returns a reference name describing a branch based on
-// his short name.
-func NewBranchReferenceName(name string) ReferenceName {
-	return ReferenceName(refHeadPrefix + name)
-}
-
-// NewNoteReferenceName returns a reference name describing a note based on his
-// short name.
-func NewNoteReferenceName(name string) ReferenceName {
-	return ReferenceName(refNotePrefix + name)
-}
-
-// NewRemoteReferenceName returns a reference name describing a remote branch
-// based on his short name and the remote name.
-func NewRemoteReferenceName(remote, name string) ReferenceName {
-	return ReferenceName(refRemotePrefix + fmt.Sprintf("%s/%s", remote, name))
-}
-
-// NewRemoteHEADReferenceName returns a reference name describing a the HEAD
-// branch of a remote.
-func NewRemoteHEADReferenceName(remote string) ReferenceName {
-	return ReferenceName(refRemotePrefix + fmt.Sprintf("%s/%s", remote, HEAD))
-}
-
-// NewTagReferenceName returns a reference name describing a tag based on short
-// his name.
-func NewTagReferenceName(name string) ReferenceName {
-	return ReferenceName(refTagPrefix + name)
-}
-
-// IsBranch check if a reference is a branch
-func (r ReferenceName) IsBranch() bool {
-	return strings.HasPrefix(string(r), refHeadPrefix)
-}
-
-// IsNote check if a reference is a note
-func (r ReferenceName) IsNote() bool {
-	return strings.HasPrefix(string(r), refNotePrefix)
-}
-
-// IsRemote check if a reference is a remote
-func (r ReferenceName) IsRemote() bool {
-	return strings.HasPrefix(string(r), refRemotePrefix)
-}
-
-// IsTag check if a reference is a tag
-func (r ReferenceName) IsTag() bool {
-	return strings.HasPrefix(string(r), refTagPrefix)
-}
-
-func (r ReferenceName) String() string {
-	return string(r)
-}
-
-// Short returns the short name of a ReferenceName
-func (r ReferenceName) Short() string {
-	s := string(r)
-	res := s
-	for _, format := range RefRevParseRules[1:] {
-		_, err := fmt.Sscanf(s, format, &res)
-		if err == nil {
-			continue
-		}
-	}
-
-	return res
-}
-
-var (
-	ctrlSeqs = regexp.MustCompile(`[\000-\037\177]`)
-)
-
-// Validate validates a reference name.
-// This follows the git-check-ref-format rules.
-// See https://git-scm.com/docs/git-check-ref-format
-//
-// It is important to note that this function does not check if the reference
-// exists in the repository.
-// It only checks if the reference name is valid.
-// This functions does not support the --refspec-pattern, --normalize, and
-// --allow-onelevel options.
-//
-// Git imposes the following rules on how references are named:
-//
-//  1. They can include slash / for hierarchical (directory) grouping, but no
-//     slash-separated component can begin with a dot . or end with the
-//     sequence .lock.
-//  2. They must contain at least one /. This enforces the presence of a
-//     category like heads/, tags/ etc. but the actual names are not
-//     restricted. If the --allow-onelevel option is used, this rule is
-//     waived.
-//  3. They cannot have two consecutive dots .. anywhere.
-//  4. They cannot have ASCII control characters (i.e. bytes whose values are
-//     lower than \040, or \177 DEL), space, tilde ~, caret ^, or colon :
-//     anywhere.
-//  5. They cannot have question-mark ?, asterisk *, or open bracket [
-//     anywhere. See the --refspec-pattern option below for an exception to this
-//     rule.
-//  6. They cannot begin or end with a slash / or contain multiple consecutive
-//     slashes (see the --normalize option below for an exception to this rule).
-//  7. They cannot end with a dot ..
-//  8. They cannot contain a sequence @{.
-//  9. They cannot be the single character @.
-//  10. They cannot contain a \.
-func (r ReferenceName) Validate() error {
-	s := string(r)
-	if len(s) == 0 {
-		return ErrInvalidReferenceName
-	}
-
-	// HEAD is a special case
-	if r == HEAD {
-		return nil
-	}
-
-	// rule 7
-	if strings.HasSuffix(s, ".") {
-		return ErrInvalidReferenceName
-	}
-
-	// rule 2
-	parts := strings.Split(s, "/")
-	if len(parts) < 2 {
-		return ErrInvalidReferenceName
-	}
-
-	isBranch := r.IsBranch()
-	isTag := r.IsTag()
-	for i, part := range parts {
-		// rule 6
-		if len(part) == 0 {
-			return ErrInvalidReferenceName
-		}
-
-		if strings.HasPrefix(part, ".") || // rule 1
-			strings.Contains(part, "..") || // rule 3
-			ctrlSeqs.MatchString(part) || // rule 4
-			strings.ContainsAny(part, "~^:?*[ \t\n") || // rule 4 & 5
-			strings.Contains(part, "@{") || // rule 8
-			part == "@" || // rule 9
-			strings.Contains(part, "\\") || // rule 10
-			strings.HasSuffix(part, ".lock") { // rule 1
-			return ErrInvalidReferenceName
-		}
-
-		if (isBranch || isTag) && strings.HasPrefix(part, "-") && (i == 2) { // branches & tags can't start with -
-			return ErrInvalidReferenceName
-		}
-	}
-
-	return nil
-}
-
-const (
-	HEAD   ReferenceName = "HEAD"
-	Master ReferenceName = "refs/heads/master"
-	Main   ReferenceName = "refs/heads/main"
-)
-
-// Reference is a representation of git reference
-type Reference struct {
-	t      ReferenceType
-	n      ReferenceName
-	h      Hash
-	target ReferenceName
-}
-
-// NewReferenceFromStrings creates a reference from name and target as string,
-// the resulting reference can be a SymbolicReference or a HashReference base
-// on the target provided
-func NewReferenceFromStrings(name, target string) *Reference {
-	n := ReferenceName(name)
-
-	if strings.HasPrefix(target, symrefPrefix) {
-		target := ReferenceName(target[len(symrefPrefix):])
-		return NewSymbolicReference(n, target)
-	}
-
-	return NewHashReference(n, NewHash(target))
-}
-
-// NewSymbolicReference creates a new SymbolicReference reference
-func NewSymbolicReference(n, target ReferenceName) *Reference {
-	return &Reference{
-		t:      SymbolicReference,
-		n:      n,
-		target: target,
-	}
-}
-
-// NewHashReference creates a new HashReference reference
-func NewHashReference(n ReferenceName, h Hash) *Reference {
-	return &Reference{
-		t: HashReference,
-		n: n,
-		h: h,
-	}
-}
-
-// Type returns the type of a reference
-func (r *Reference) Type() ReferenceType {
-	return r.t
-}
-
-// Name returns the name of a reference
-func (r *Reference) Name() ReferenceName {
-	return r.n
-}
-
-// Hash returns the hash of a hash reference
-func (r *Reference) Hash() Hash {
-	return r.h
-}
-
-// Target returns the target of a symbolic reference
-func (r *Reference) Target() ReferenceName {
-	return r.target
-}
-
-// Strings dump a reference as a [2]string
-func (r *Reference) Strings() [2]string {
-	var o [2]string
-	o[0] = r.Name().String()
-
-	switch r.Type() {
-	case HashReference:
-		o[1] = r.Hash().String()
-	case SymbolicReference:
-		o[1] = symrefPrefix + r.Target().String()
-	}
-
-	return o
-}
-
-func (r *Reference) String() string {
-	ref := ""
-	switch r.Type() {
-	case HashReference:
-		ref = r.Hash().String()
-	case SymbolicReference:
-		ref = symrefPrefix + r.Target().String()
-	default:
-		return ""
-	}
-
-	name := r.Name().String()
-	var v strings.Builder
-	v.Grow(len(ref) + len(name) + 1)
-	v.WriteString(ref)
-	v.WriteString(" ")
-	v.WriteString(name)
-	return v.String()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/revision.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/revision.go
deleted file mode 100644
index 5f053b200..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/revision.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package plumbing
-
-// Revision represents a git revision
-// to get more details about git revisions
-// please check git manual page :
-// https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
-type Revision string
-
-func (r Revision) String() string {
-	return string(r)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/revlist/revlist.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/revlist/revlist.go
deleted file mode 100644
index 99600f539..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/revlist/revlist.go
+++ /dev/null
@@ -1,230 +0,0 @@
-// Package revlist provides support to access the ancestors of commits, in a
-// similar way as the git-rev-list command.
-package revlist
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-// Objects applies a complementary set. It gets all the hashes from all
-// the reachable objects from the given objects. Ignore param are object hashes
-// that we want to ignore on the result. All that objects must be accessible
-// from the object storer.
-func Objects(
-	s storer.EncodedObjectStorer,
-	objs,
-	ignore []plumbing.Hash,
-) ([]plumbing.Hash, error) {
-	return ObjectsWithStorageForIgnores(s, s, objs, ignore)
-}
-
-// ObjectsWithStorageForIgnores is the same as Objects, but a
-// secondary storage layer can be provided, to be used to finding the
-// full set of objects to be ignored while finding the reachable
-// objects.  This is useful when the main `s` storage layer is slow
-// and/or remote, while the ignore list is available somewhere local.
-func ObjectsWithStorageForIgnores(
-	s, ignoreStore storer.EncodedObjectStorer,
-	objs,
-	ignore []plumbing.Hash,
-) ([]plumbing.Hash, error) {
-	ignore, err := objects(ignoreStore, ignore, nil, true)
-	if err != nil {
-		return nil, err
-	}
-
-	return objects(s, objs, ignore, false)
-}
-
-func objects(
-	s storer.EncodedObjectStorer,
-	objects,
-	ignore []plumbing.Hash,
-	allowMissingObjects bool,
-) ([]plumbing.Hash, error) {
-	seen := hashListToSet(ignore)
-	result := make(map[plumbing.Hash]bool)
-	visited := make(map[plumbing.Hash]bool)
-
-	walkerFunc := func(h plumbing.Hash) {
-		if !seen[h] {
-			result[h] = true
-			seen[h] = true
-		}
-	}
-
-	for _, h := range objects {
-		if err := processObject(s, h, seen, visited, ignore, walkerFunc); err != nil {
-			if allowMissingObjects && err == plumbing.ErrObjectNotFound {
-				continue
-			}
-
-			return nil, err
-		}
-	}
-
-	return hashSetToList(result), nil
-}
-
-// processObject obtains the object using the hash an process it depending of its type
-func processObject(
-	s storer.EncodedObjectStorer,
-	h plumbing.Hash,
-	seen map[plumbing.Hash]bool,
-	visited map[plumbing.Hash]bool,
-	ignore []plumbing.Hash,
-	walkerFunc func(h plumbing.Hash),
-) error {
-	if seen[h] {
-		return nil
-	}
-
-	o, err := s.EncodedObject(plumbing.AnyObject, h)
-	if err != nil {
-		return err
-	}
-
-	do, err := object.DecodeObject(s, o)
-	if err != nil {
-		return err
-	}
-
-	switch do := do.(type) {
-	case *object.Commit:
-		return reachableObjects(do, seen, visited, ignore, walkerFunc)
-	case *object.Tree:
-		return iterateCommitTrees(seen, do, walkerFunc)
-	case *object.Tag:
-		walkerFunc(do.Hash)
-		return processObject(s, do.Target, seen, visited, ignore, walkerFunc)
-	case *object.Blob:
-		walkerFunc(do.Hash)
-	default:
-		return fmt.Errorf("object type not valid: %s. "+
-			"Object reference: %s", o.Type(), o.Hash())
-	}
-
-	return nil
-}
-
-// reachableObjects returns, using the callback function, all the reachable
-// objects from the specified commit. To avoid to iterate over seen commits,
-// if a commit hash is into the 'seen' set, we will not iterate all his trees
-// and blobs objects.
-func reachableObjects(
-	commit *object.Commit,
-	seen map[plumbing.Hash]bool,
-	visited map[plumbing.Hash]bool,
-	ignore []plumbing.Hash,
-	cb func(h plumbing.Hash),
-) error {
-	i := object.NewCommitPreorderIter(commit, seen, ignore)
-	pending := make(map[plumbing.Hash]bool)
-	addPendingParents(pending, visited, commit)
-	for {
-		commit, err := i.Next()
-		if err == io.EOF {
-			break
-		}
-
-		if err != nil {
-			return err
-		}
-
-		if pending[commit.Hash] {
-			delete(pending, commit.Hash)
-		}
-
-		addPendingParents(pending, visited, commit)
-
-		if visited[commit.Hash] && len(pending) == 0 {
-			break
-		}
-
-		if seen[commit.Hash] {
-			continue
-		}
-
-		cb(commit.Hash)
-
-		tree, err := commit.Tree()
-		if err != nil {
-			return err
-		}
-
-		if err := iterateCommitTrees(seen, tree, cb); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func addPendingParents(pending, visited map[plumbing.Hash]bool, commit *object.Commit) {
-	for _, p := range commit.ParentHashes {
-		if !visited[p] {
-			pending[p] = true
-		}
-	}
-}
-
-// iterateCommitTrees iterate all reachable trees from the given commit
-func iterateCommitTrees(
-	seen map[plumbing.Hash]bool,
-	tree *object.Tree,
-	cb func(h plumbing.Hash),
-) error {
-	if seen[tree.Hash] {
-		return nil
-	}
-
-	cb(tree.Hash)
-
-	treeWalker := object.NewTreeWalker(tree, true, seen)
-
-	for {
-		_, e, err := treeWalker.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		if e.Mode == filemode.Submodule {
-			continue
-		}
-
-		if seen[e.Hash] {
-			continue
-		}
-
-		cb(e.Hash)
-	}
-
-	return nil
-}
-
-func hashSetToList(hashes map[plumbing.Hash]bool) []plumbing.Hash {
-	var result []plumbing.Hash
-	for key := range hashes {
-		result = append(result, key)
-	}
-
-	return result
-}
-
-func hashListToSet(hashes []plumbing.Hash) map[plumbing.Hash]bool {
-	result := make(map[plumbing.Hash]bool)
-	for _, h := range hashes {
-		result[h] = true
-	}
-
-	return result
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/doc.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/doc.go
deleted file mode 100644
index 4d4f179c6..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package storer defines the interfaces to store objects, references, etc.
-package storer
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/index.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/index.go
deleted file mode 100644
index 0cb5287d6..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/index.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package storer
-
-import "github.com/jesseduffield/go-git/v5/plumbing/format/index"
-
-// IndexStorer generic storage of index.Index
-type IndexStorer interface {
-	SetIndex(*index.Index) error
-	Index() (*index.Index, error)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/object.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/object.go
deleted file mode 100644
index 876a73d4a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/object.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package storer
-
-import (
-	"errors"
-	"io"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-var (
-	//ErrStop is used to stop a ForEach function in an Iter
-	ErrStop = errors.New("stop iter")
-)
-
-// EncodedObjectStorer generic storage of objects
-type EncodedObjectStorer interface {
-	// NewEncodedObject returns a new plumbing.EncodedObject, the real type
-	// of the object can be a custom implementation or the default one,
-	// plumbing.MemoryObject.
-	NewEncodedObject() plumbing.EncodedObject
-	// SetEncodedObject saves an object into the storage, the object should
-	// be create with the NewEncodedObject, method, and file if the type is
-	// not supported.
-	SetEncodedObject(plumbing.EncodedObject) (plumbing.Hash, error)
-	// EncodedObject gets an object by hash with the given
-	// plumbing.ObjectType. Implementors should return
-	// (nil, plumbing.ErrObjectNotFound) if an object doesn't exist with
-	// both the given hash and object type.
-	//
-	// Valid plumbing.ObjectType values are CommitObject, BlobObject, TagObject,
-	// TreeObject and AnyObject. If plumbing.AnyObject is given, the object must
-	// be looked up regardless of its type.
-	EncodedObject(plumbing.ObjectType, plumbing.Hash) (plumbing.EncodedObject, error)
-	// IterObjects returns a custom EncodedObjectStorer over all the object
-	// on the storage.
-	//
-	// Valid plumbing.ObjectType values are CommitObject, BlobObject, TagObject,
-	IterEncodedObjects(plumbing.ObjectType) (EncodedObjectIter, error)
-	// HasEncodedObject returns ErrObjNotFound if the object doesn't
-	// exist.  If the object does exist, it returns nil.
-	HasEncodedObject(plumbing.Hash) error
-	// EncodedObjectSize returns the plaintext size of the encoded object.
-	EncodedObjectSize(plumbing.Hash) (int64, error)
-	AddAlternate(remote string) error
-}
-
-// DeltaObjectStorer is an EncodedObjectStorer that can return delta
-// objects.
-type DeltaObjectStorer interface {
-	// DeltaObject is the same as EncodedObject but without resolving deltas.
-	// Deltas will be returned as plumbing.DeltaObject instances.
-	DeltaObject(plumbing.ObjectType, plumbing.Hash) (plumbing.EncodedObject, error)
-}
-
-// Transactioner is a optional method for ObjectStorer, it enables transactional read and write
-// operations.
-type Transactioner interface {
-	// Begin starts a transaction.
-	Begin() Transaction
-}
-
-// LooseObjectStorer is an optional interface for managing "loose"
-// objects, i.e. those not in packfiles.
-type LooseObjectStorer interface {
-	// ForEachObjectHash iterates over all the (loose) object hashes
-	// in the repository without necessarily having to read those objects.
-	// Objects only inside pack files may be omitted.
-	// If ErrStop is sent the iteration is stop but no error is returned.
-	ForEachObjectHash(func(plumbing.Hash) error) error
-	// LooseObjectTime looks up the (m)time associated with the
-	// loose object (that is not in a pack file). Some
-	// implementations (e.g. without loose objects)
-	// always return an error.
-	LooseObjectTime(plumbing.Hash) (time.Time, error)
-	// DeleteLooseObject deletes a loose object if it exists.
-	DeleteLooseObject(plumbing.Hash) error
-}
-
-// PackedObjectStorer is an optional interface for managing objects in
-// packfiles.
-type PackedObjectStorer interface {
-	// ObjectPacks returns hashes of object packs if the underlying
-	// implementation has pack files.
-	ObjectPacks() ([]plumbing.Hash, error)
-	// DeleteOldObjectPackAndIndex deletes an object pack and the corresponding index file if they exist.
-	// Deletion is only performed if the pack is older than the supplied time (or the time is zero).
-	DeleteOldObjectPackAndIndex(plumbing.Hash, time.Time) error
-}
-
-// PackfileWriter is an optional method for ObjectStorer, it enables directly writing
-// a packfile to storage.
-type PackfileWriter interface {
-	// PackfileWriter returns a writer for writing a packfile to the storage
-	//
-	// If the Storer not implements PackfileWriter the objects should be written
-	// using the Set method.
-	PackfileWriter() (io.WriteCloser, error)
-}
-
-// EncodedObjectIter is a generic closable interface for iterating over objects.
-type EncodedObjectIter interface {
-	Next() (plumbing.EncodedObject, error)
-	ForEach(func(plumbing.EncodedObject) error) error
-	Close()
-}
-
-// Transaction is an in-progress storage transaction. A transaction must end
-// with a call to Commit or Rollback.
-type Transaction interface {
-	SetEncodedObject(plumbing.EncodedObject) (plumbing.Hash, error)
-	EncodedObject(plumbing.ObjectType, plumbing.Hash) (plumbing.EncodedObject, error)
-	Commit() error
-	Rollback() error
-}
-
-// EncodedObjectLookupIter implements EncodedObjectIter. It iterates over a
-// series of object hashes and yields their associated objects by retrieving
-// each one from object storage. The retrievals are lazy and only occur when the
-// iterator moves forward with a call to Next().
-//
-// The EncodedObjectLookupIter must be closed with a call to Close() when it is
-// no longer needed.
-type EncodedObjectLookupIter struct {
-	storage EncodedObjectStorer
-	series  []plumbing.Hash
-	t       plumbing.ObjectType
-	pos     int
-}
-
-// NewEncodedObjectLookupIter returns an object iterator given an object storage
-// and a slice of object hashes.
-func NewEncodedObjectLookupIter(
-	storage EncodedObjectStorer, t plumbing.ObjectType, series []plumbing.Hash) *EncodedObjectLookupIter {
-	return &EncodedObjectLookupIter{
-		storage: storage,
-		series:  series,
-		t:       t,
-	}
-}
-
-// Next returns the next object from the iterator. If the iterator has reached
-// the end it will return io.EOF as an error. If the object can't be found in
-// the object storage, it will return plumbing.ErrObjectNotFound as an error.
-// If the object is retrieved successfully error will be nil.
-func (iter *EncodedObjectLookupIter) Next() (plumbing.EncodedObject, error) {
-	if iter.pos >= len(iter.series) {
-		return nil, io.EOF
-	}
-
-	hash := iter.series[iter.pos]
-	obj, err := iter.storage.EncodedObject(iter.t, hash)
-	if err == nil {
-		iter.pos++
-	}
-
-	return obj, err
-}
-
-// ForEach call the cb function for each object contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *EncodedObjectLookupIter) ForEach(cb func(plumbing.EncodedObject) error) error {
-	return ForEachIterator(iter, cb)
-}
-
-// Close releases any resources used by the iterator.
-func (iter *EncodedObjectLookupIter) Close() {
-	iter.pos = len(iter.series)
-}
-
-// EncodedObjectSliceIter implements EncodedObjectIter. It iterates over a
-// series of objects stored in a slice and yields each one in turn when Next()
-// is called.
-//
-// The EncodedObjectSliceIter must be closed with a call to Close() when it is
-// no longer needed.
-type EncodedObjectSliceIter struct {
-	series []plumbing.EncodedObject
-}
-
-// NewEncodedObjectSliceIter returns an object iterator for the given slice of
-// objects.
-func NewEncodedObjectSliceIter(series []plumbing.EncodedObject) *EncodedObjectSliceIter {
-	return &EncodedObjectSliceIter{
-		series: series,
-	}
-}
-
-// Next returns the next object from the iterator. If the iterator has reached
-// the end it will return io.EOF as an error. If the object is retrieved
-// successfully error will be nil.
-func (iter *EncodedObjectSliceIter) Next() (plumbing.EncodedObject, error) {
-	if len(iter.series) == 0 {
-		return nil, io.EOF
-	}
-
-	obj := iter.series[0]
-	iter.series = iter.series[1:]
-
-	return obj, nil
-}
-
-// ForEach call the cb function for each object contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *EncodedObjectSliceIter) ForEach(cb func(plumbing.EncodedObject) error) error {
-	return ForEachIterator(iter, cb)
-}
-
-// Close releases any resources used by the iterator.
-func (iter *EncodedObjectSliceIter) Close() {
-	iter.series = []plumbing.EncodedObject{}
-}
-
-// MultiEncodedObjectIter implements EncodedObjectIter. It iterates over several
-// EncodedObjectIter,
-//
-// The MultiObjectIter must be closed with a call to Close() when it is no
-// longer needed.
-type MultiEncodedObjectIter struct {
-	iters []EncodedObjectIter
-}
-
-// NewMultiEncodedObjectIter returns an object iterator for the given slice of
-// EncodedObjectIters.
-func NewMultiEncodedObjectIter(iters []EncodedObjectIter) EncodedObjectIter {
-	return &MultiEncodedObjectIter{iters: iters}
-}
-
-// Next returns the next object from the iterator, if one iterator reach io.EOF
-// is removed and the next one is used.
-func (iter *MultiEncodedObjectIter) Next() (plumbing.EncodedObject, error) {
-	if len(iter.iters) == 0 {
-		return nil, io.EOF
-	}
-
-	obj, err := iter.iters[0].Next()
-	if err == io.EOF {
-		iter.iters[0].Close()
-		iter.iters = iter.iters[1:]
-		return iter.Next()
-	}
-
-	return obj, err
-}
-
-// ForEach call the cb function for each object contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *MultiEncodedObjectIter) ForEach(cb func(plumbing.EncodedObject) error) error {
-	return ForEachIterator(iter, cb)
-}
-
-// Close releases any resources used by the iterator.
-func (iter *MultiEncodedObjectIter) Close() {
-	for _, i := range iter.iters {
-		i.Close()
-	}
-}
-
-type bareIterator interface {
-	Next() (plumbing.EncodedObject, error)
-	Close()
-}
-
-// ForEachIterator is a helper function to build iterators without need to
-// rewrite the same ForEach function each time.
-func ForEachIterator(iter bareIterator, cb func(plumbing.EncodedObject) error) error {
-	defer iter.Close()
-	for {
-		obj, err := iter.Next()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return err
-		}
-
-		if err := cb(obj); err != nil {
-			if err == ErrStop {
-				return nil
-			}
-
-			return err
-		}
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/reference.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/reference.go
deleted file mode 100644
index 3d0699d77..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/reference.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package storer
-
-import (
-	"errors"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-const MaxResolveRecursion = 1024
-
-// ErrMaxResolveRecursion is returned by ResolveReference is MaxResolveRecursion
-// is exceeded
-var ErrMaxResolveRecursion = errors.New("max. recursion level reached")
-
-// ReferenceStorer is a generic storage of references.
-type ReferenceStorer interface {
-	SetReference(*plumbing.Reference) error
-	// CheckAndSetReference sets the reference `new`, but if `old` is
-	// not `nil`, it first checks that the current stored value for
-	// `old.Name()` matches the given reference value in `old`.  If
-	// not, it returns an error and doesn't update `new`.
-	CheckAndSetReference(new, old *plumbing.Reference) error
-	Reference(plumbing.ReferenceName) (*plumbing.Reference, error)
-	IterReferences() (ReferenceIter, error)
-	RemoveReference(plumbing.ReferenceName) error
-	CountLooseRefs() (int, error)
-	PackRefs() error
-}
-
-// ReferenceIter is a generic closable interface for iterating over references.
-type ReferenceIter interface {
-	Next() (*plumbing.Reference, error)
-	ForEach(func(*plumbing.Reference) error) error
-	Close()
-}
-
-type referenceFilteredIter struct {
-	ff   func(r *plumbing.Reference) bool
-	iter ReferenceIter
-}
-
-// NewReferenceFilteredIter returns a reference iterator for the given reference
-// Iterator. This iterator will iterate only references that accomplish the
-// provided function.
-func NewReferenceFilteredIter(
-	ff func(r *plumbing.Reference) bool, iter ReferenceIter) ReferenceIter {
-	return &referenceFilteredIter{ff, iter}
-}
-
-// Next returns the next reference from the iterator. If the iterator has reached
-// the end it will return io.EOF as an error.
-func (iter *referenceFilteredIter) Next() (*plumbing.Reference, error) {
-	for {
-		r, err := iter.iter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if iter.ff(r) {
-			return r, nil
-		}
-
-		continue
-	}
-}
-
-// ForEach call the cb function for each reference contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stopped but no error is returned. The iterator is closed.
-func (iter *referenceFilteredIter) ForEach(cb func(*plumbing.Reference) error) error {
-	defer iter.Close()
-	for {
-		r, err := iter.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		if err := cb(r); err != nil {
-			if err == ErrStop {
-				break
-			}
-
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Close releases any resources used by the iterator.
-func (iter *referenceFilteredIter) Close() {
-	iter.iter.Close()
-}
-
-// ReferenceSliceIter implements ReferenceIter. It iterates over a series of
-// references stored in a slice and yields each one in turn when Next() is
-// called.
-//
-// The ReferenceSliceIter must be closed with a call to Close() when it is no
-// longer needed.
-type ReferenceSliceIter struct {
-	series []*plumbing.Reference
-	pos    int
-}
-
-// NewReferenceSliceIter returns a reference iterator for the given slice of
-// objects.
-func NewReferenceSliceIter(series []*plumbing.Reference) ReferenceIter {
-	return &ReferenceSliceIter{
-		series: series,
-	}
-}
-
-// Next returns the next reference from the iterator. If the iterator has
-// reached the end it will return io.EOF as an error.
-func (iter *ReferenceSliceIter) Next() (*plumbing.Reference, error) {
-	if iter.pos >= len(iter.series) {
-		return nil, io.EOF
-	}
-
-	obj := iter.series[iter.pos]
-	iter.pos++
-	return obj, nil
-}
-
-// ForEach call the cb function for each reference contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *ReferenceSliceIter) ForEach(cb func(*plumbing.Reference) error) error {
-	return forEachReferenceIter(iter, cb)
-}
-
-type bareReferenceIterator interface {
-	Next() (*plumbing.Reference, error)
-	Close()
-}
-
-func forEachReferenceIter(iter bareReferenceIterator, cb func(*plumbing.Reference) error) error {
-	defer iter.Close()
-	for {
-		obj, err := iter.Next()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return err
-		}
-
-		if err := cb(obj); err != nil {
-			if err == ErrStop {
-				return nil
-			}
-
-			return err
-		}
-	}
-}
-
-// Close releases any resources used by the iterator.
-func (iter *ReferenceSliceIter) Close() {
-	iter.pos = len(iter.series)
-}
-
-// MultiReferenceIter implements ReferenceIter. It iterates over several
-// ReferenceIter,
-//
-// The MultiReferenceIter must be closed with a call to Close() when it is no
-// longer needed.
-type MultiReferenceIter struct {
-	iters []ReferenceIter
-}
-
-// NewMultiReferenceIter returns an reference iterator for the given slice of
-// EncodedObjectIters.
-func NewMultiReferenceIter(iters []ReferenceIter) ReferenceIter {
-	return &MultiReferenceIter{iters: iters}
-}
-
-// Next returns the next reference from the iterator, if one iterator reach
-// io.EOF is removed and the next one is used.
-func (iter *MultiReferenceIter) Next() (*plumbing.Reference, error) {
-	if len(iter.iters) == 0 {
-		return nil, io.EOF
-	}
-
-	obj, err := iter.iters[0].Next()
-	if err == io.EOF {
-		iter.iters[0].Close()
-		iter.iters = iter.iters[1:]
-		return iter.Next()
-	}
-
-	return obj, err
-}
-
-// ForEach call the cb function for each reference contained on this iter until
-// an error happens or the end of the iter is reached. If ErrStop is sent
-// the iteration is stop but no error is returned. The iterator is closed.
-func (iter *MultiReferenceIter) ForEach(cb func(*plumbing.Reference) error) error {
-	return forEachReferenceIter(iter, cb)
-}
-
-// Close releases any resources used by the iterator.
-func (iter *MultiReferenceIter) Close() {
-	for _, i := range iter.iters {
-		i.Close()
-	}
-}
-
-// ResolveReference resolves a SymbolicReference to a HashReference.
-func ResolveReference(s ReferenceStorer, n plumbing.ReferenceName) (*plumbing.Reference, error) {
-	r, err := s.Reference(n)
-	if err != nil || r == nil {
-		return r, err
-	}
-	return resolveReference(s, r, 0)
-}
-
-func resolveReference(s ReferenceStorer, r *plumbing.Reference, recursion int) (*plumbing.Reference, error) {
-	if r.Type() != plumbing.SymbolicReference {
-		return r, nil
-	}
-
-	if recursion > MaxResolveRecursion {
-		return nil, ErrMaxResolveRecursion
-	}
-
-	t, err := s.Reference(r.Target())
-	if err != nil {
-		return nil, err
-	}
-
-	recursion++
-	return resolveReference(s, t, recursion)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/shallow.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/shallow.go
deleted file mode 100644
index 409ae4d62..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/shallow.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package storer
-
-import "github.com/jesseduffield/go-git/v5/plumbing"
-
-// ShallowStorer is a storage of references to shallow commits by hash,
-// meaning that these commits have missing parents because of a shallow fetch.
-type ShallowStorer interface {
-	SetShallow([]plumbing.Hash) error
-	Shallow() ([]plumbing.Hash, error)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/storer.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/storer.go
deleted file mode 100644
index c7bc65a0c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/storer/storer.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package storer
-
-// Storer is a basic storer for encoded objects and references.
-type Storer interface {
-	EncodedObjectStorer
-	ReferenceStorer
-}
-
-// Initializer should be implemented by storers that require to perform any
-// operation when creating a new repository (i.e. git init).
-type Initializer interface {
-	// Init performs initialization of the storer and returns the error, if
-	// any.
-	Init() error
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/client/client.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/client/client.go
deleted file mode 100644
index 12065d8b6..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/client/client.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Package client contains helper function to deal with the different client
-// protocols.
-package client
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/file"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/git"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/http"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/ssh"
-)
-
-// Protocols are the protocols supported by default.
-var Protocols = map[string]transport.Transport{
-	"http":  http.DefaultClient,
-	"https": http.DefaultClient,
-	"ssh":   ssh.DefaultClient,
-	"git":   git.DefaultClient,
-	"file":  file.DefaultClient,
-}
-
-// InstallProtocol adds or modifies an existing protocol.
-func InstallProtocol(scheme string, c transport.Transport) {
-	if c == nil {
-		delete(Protocols, scheme)
-		return
-	}
-
-	Protocols[scheme] = c
-}
-
-// NewClient returns the appropriate client among of the set of known protocols:
-// http://, https://, ssh:// and file://.
-// See `InstallProtocol` to add or modify protocols.
-func NewClient(endpoint *transport.Endpoint) (transport.Transport, error) {
-	return getTransport(endpoint)
-}
-
-func getTransport(endpoint *transport.Endpoint) (transport.Transport, error) {
-	f, ok := Protocols[endpoint.Protocol]
-	if !ok {
-		return nil, fmt.Errorf("unsupported scheme %q", endpoint.Protocol)
-	}
-
-	if f == nil {
-		return nil, fmt.Errorf("malformed client for scheme %q, client is defined as nil", endpoint.Protocol)
-	}
-	return f, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/common.go
deleted file mode 100644
index 900434f41..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/common.go
+++ /dev/null
@@ -1,325 +0,0 @@
-// Package transport includes the implementation for different transport
-// protocols.
-//
-// `Client` can be used to fetch and send packfiles to a git server.
-// The `client` package provides higher level functions to instantiate the
-// appropriate `Client` based on the repository URL.
-//
-// go-git supports HTTP and SSH (see `Protocols`), but you can also install
-// your own protocols (see the `client` package).
-//
-// Each protocol has its own implementation of `Client`, but you should
-// generally not use them directly, use `client.NewClient` instead.
-package transport
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	giturl "github.com/jesseduffield/go-git/v5/internal/url"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-)
-
-var (
-	ErrRepositoryNotFound     = errors.New("repository not found")
-	ErrEmptyRemoteRepository  = errors.New("remote repository is empty")
-	ErrAuthenticationRequired = errors.New("authentication required")
-	ErrAuthorizationFailed    = errors.New("authorization failed")
-	ErrEmptyUploadPackRequest = errors.New("empty git-upload-pack given")
-	ErrInvalidAuthMethod      = errors.New("invalid auth method")
-	ErrAlreadyConnected       = errors.New("session already established")
-)
-
-const (
-	UploadPackServiceName  = "git-upload-pack"
-	ReceivePackServiceName = "git-receive-pack"
-)
-
-// Transport can initiate git-upload-pack and git-receive-pack processes.
-// It is implemented both by the client and the server, making this a RPC.
-type Transport interface {
-	// NewUploadPackSession starts a git-upload-pack session for an endpoint.
-	NewUploadPackSession(*Endpoint, AuthMethod) (UploadPackSession, error)
-	// NewReceivePackSession starts a git-receive-pack session for an endpoint.
-	NewReceivePackSession(*Endpoint, AuthMethod) (ReceivePackSession, error)
-}
-
-type Session interface {
-	// AdvertisedReferences retrieves the advertised references for a
-	// repository.
-	// If the repository does not exist, returns ErrRepositoryNotFound.
-	// If the repository exists, but is empty, returns ErrEmptyRemoteRepository.
-	AdvertisedReferences() (*packp.AdvRefs, error)
-	// AdvertisedReferencesContext retrieves the advertised references for a
-	// repository.
-	// If the repository does not exist, returns ErrRepositoryNotFound.
-	// If the repository exists, but is empty, returns ErrEmptyRemoteRepository.
-	AdvertisedReferencesContext(context.Context) (*packp.AdvRefs, error)
-	io.Closer
-}
-
-type AuthMethod interface {
-	fmt.Stringer
-	Name() string
-}
-
-// UploadPackSession represents a git-upload-pack session.
-// A git-upload-pack session has two steps: reference discovery
-// (AdvertisedReferences) and uploading pack (UploadPack).
-type UploadPackSession interface {
-	Session
-	// UploadPack takes a git-upload-pack request and returns a response,
-	// including a packfile. Don't be confused by terminology, the client
-	// side of a git-upload-pack is called git-fetch-pack, although here
-	// the same interface is used to make it RPC-like.
-	UploadPack(context.Context, *packp.UploadPackRequest) (*packp.UploadPackResponse, error)
-}
-
-// ReceivePackSession represents a git-receive-pack session.
-// A git-receive-pack session has two steps: reference discovery
-// (AdvertisedReferences) and receiving pack (ReceivePack).
-// In that order.
-type ReceivePackSession interface {
-	Session
-	// ReceivePack sends an update references request and a packfile
-	// reader and returns a ReportStatus and error. Don't be confused by
-	// terminology, the client side of a git-receive-pack is called
-	// git-send-pack, although here the same interface is used to make it
-	// RPC-like.
-	ReceivePack(context.Context, *packp.ReferenceUpdateRequest) (*packp.ReportStatus, error)
-}
-
-// Endpoint represents a Git URL in any supported protocol.
-type Endpoint struct {
-	// Protocol is the protocol of the endpoint (e.g. git, https, file).
-	Protocol string
-	// User is the user.
-	User string
-	// Password is the password.
-	Password string
-	// Host is the host.
-	Host string
-	// Port is the port to connect, if 0 the default port for the given protocol
-	// will be used.
-	Port int
-	// Path is the repository path.
-	Path string
-	// InsecureSkipTLS skips ssl verify if protocol is https
-	InsecureSkipTLS bool
-	// CaBundle specify additional ca bundle with system cert pool
-	CaBundle []byte
-	// Proxy provides info required for connecting to a proxy.
-	Proxy ProxyOptions
-}
-
-type ProxyOptions struct {
-	URL      string
-	Username string
-	Password string
-}
-
-func (o *ProxyOptions) Validate() error {
-	if o.URL != "" {
-		_, err := url.Parse(o.URL)
-		return err
-	}
-	return nil
-}
-
-func (o *ProxyOptions) FullURL() (*url.URL, error) {
-	proxyURL, err := url.Parse(o.URL)
-	if err != nil {
-		return nil, err
-	}
-	if o.Username != "" {
-		if o.Password != "" {
-			proxyURL.User = url.UserPassword(o.Username, o.Password)
-		} else {
-			proxyURL.User = url.User(o.Username)
-		}
-	}
-	return proxyURL, nil
-}
-
-var defaultPorts = map[string]int{
-	"http":  80,
-	"https": 443,
-	"git":   9418,
-	"ssh":   22,
-}
-
-// String returns a string representation of the Git URL.
-func (u *Endpoint) String() string {
-	var buf bytes.Buffer
-	if u.Protocol != "" {
-		buf.WriteString(u.Protocol)
-		buf.WriteByte(':')
-	}
-
-	if u.Protocol != "" || u.Host != "" || u.User != "" || u.Password != "" {
-		buf.WriteString("//")
-
-		if u.User != "" || u.Password != "" {
-			buf.WriteString(url.PathEscape(u.User))
-			if u.Password != "" {
-				buf.WriteByte(':')
-				buf.WriteString(url.PathEscape(u.Password))
-			}
-
-			buf.WriteByte('@')
-		}
-
-		if u.Host != "" {
-			buf.WriteString(u.Host)
-
-			if u.Port != 0 {
-				port, ok := defaultPorts[strings.ToLower(u.Protocol)]
-				if !ok || ok && port != u.Port {
-					fmt.Fprintf(&buf, ":%d", u.Port)
-				}
-			}
-		}
-	}
-
-	if u.Path != "" && u.Path[0] != '/' && u.Host != "" {
-		buf.WriteByte('/')
-	}
-
-	buf.WriteString(u.Path)
-	return buf.String()
-}
-
-func NewEndpoint(endpoint string) (*Endpoint, error) {
-	if e, ok := parseSCPLike(endpoint); ok {
-		return e, nil
-	}
-
-	if e, ok := parseFile(endpoint); ok {
-		return e, nil
-	}
-
-	return parseURL(endpoint)
-}
-
-func parseURL(endpoint string) (*Endpoint, error) {
-	u, err := url.Parse(endpoint)
-	if err != nil {
-		return nil, err
-	}
-
-	if !u.IsAbs() {
-		return nil, plumbing.NewPermanentError(fmt.Errorf(
-			"invalid endpoint: %s", endpoint,
-		))
-	}
-
-	var user, pass string
-	if u.User != nil {
-		user = u.User.Username()
-		pass, _ = u.User.Password()
-	}
-
-	host := u.Hostname()
-	if strings.Contains(host, ":") {
-		// IPv6 address
-		host = "[" + host + "]"
-	}
-
-	return &Endpoint{
-		Protocol: u.Scheme,
-		User:     user,
-		Password: pass,
-		Host:     host,
-		Port:     getPort(u),
-		Path:     getPath(u),
-	}, nil
-}
-
-func getPort(u *url.URL) int {
-	p := u.Port()
-	if p == "" {
-		return 0
-	}
-
-	i, err := strconv.Atoi(p)
-	if err != nil {
-		return 0
-	}
-
-	return i
-}
-
-func getPath(u *url.URL) string {
-	var res string = u.Path
-	if u.RawQuery != "" {
-		res += "?" + u.RawQuery
-	}
-
-	if u.Fragment != "" {
-		res += "#" + u.Fragment
-	}
-
-	return res
-}
-
-func parseSCPLike(endpoint string) (*Endpoint, bool) {
-	if giturl.MatchesScheme(endpoint) || !giturl.MatchesScpLike(endpoint) {
-		return nil, false
-	}
-
-	user, host, portStr, path := giturl.FindScpLikeComponents(endpoint)
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		port = 22
-	}
-
-	return &Endpoint{
-		Protocol: "ssh",
-		User:     user,
-		Host:     host,
-		Port:     port,
-		Path:     path,
-	}, true
-}
-
-func parseFile(endpoint string) (*Endpoint, bool) {
-	if giturl.MatchesScheme(endpoint) {
-		return nil, false
-	}
-
-	path, err := filepath.Abs(endpoint)
-	if err != nil {
-		return nil, false
-	}
-
-	return &Endpoint{
-		Protocol: "file",
-		Path:     path,
-	}, true
-}
-
-// UnsupportedCapabilities are the capabilities not supported by any client
-// implementation
-var UnsupportedCapabilities = []capability.Capability{
-	capability.MultiACK,
-	capability.MultiACKDetailed,
-	capability.ThinPack,
-}
-
-// FilterUnsupportedCapabilities it filter out all the UnsupportedCapabilities
-// from a capability.List, the intended usage is on the client implementation
-// to filter the capabilities from an AdvRefs message.
-func FilterUnsupportedCapabilities(list *capability.List) {
-	for _, c := range UnsupportedCapabilities {
-		list.Delete(c)
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/file/client.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/file/client.go
deleted file mode 100644
index 1379132a6..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/file/client.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Package file implements the file transport protocol.
-package file
-
-import (
-	"bufio"
-	"errors"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common"
-	"golang.org/x/sys/execabs"
-)
-
-// DefaultClient is the default local client.
-var DefaultClient = NewClient(
-	transport.UploadPackServiceName,
-	transport.ReceivePackServiceName,
-)
-
-type runner struct {
-	UploadPackBin  string
-	ReceivePackBin string
-}
-
-// NewClient returns a new local client using the given git-upload-pack and
-// git-receive-pack binaries.
-func NewClient(uploadPackBin, receivePackBin string) transport.Transport {
-	return common.NewClient(&runner{
-		UploadPackBin:  uploadPackBin,
-		ReceivePackBin: receivePackBin,
-	})
-}
-
-func prefixExecPath(cmd string) (string, error) {
-	// Use `git --exec-path` to find the exec path.
-	execCmd := execabs.Command("git", "--exec-path")
-
-	stdout, err := execCmd.StdoutPipe()
-	if err != nil {
-		return "", err
-	}
-	stdoutBuf := bufio.NewReader(stdout)
-
-	err = execCmd.Start()
-	if err != nil {
-		return "", err
-	}
-
-	execPathBytes, isPrefix, err := stdoutBuf.ReadLine()
-	if err != nil {
-		return "", err
-	}
-	if isPrefix {
-		return "", errors.New("couldn't read exec-path line all at once")
-	}
-
-	err = execCmd.Wait()
-	if err != nil {
-		return "", err
-	}
-	execPath := string(execPathBytes)
-	execPath = strings.TrimSpace(execPath)
-	cmd = filepath.Join(execPath, cmd)
-
-	// Make sure it actually exists.
-	_, err = execabs.LookPath(cmd)
-	if err != nil {
-		return "", err
-	}
-	return cmd, nil
-}
-
-func (r *runner) Command(cmd string, ep *transport.Endpoint, auth transport.AuthMethod,
-) (common.Command, error) {
-
-	switch cmd {
-	case transport.UploadPackServiceName:
-		cmd = r.UploadPackBin
-	case transport.ReceivePackServiceName:
-		cmd = r.ReceivePackBin
-	}
-
-	_, err := execabs.LookPath(cmd)
-	if err != nil {
-		if e, ok := err.(*execabs.Error); ok && e.Err == execabs.ErrNotFound {
-			cmd, err = prefixExecPath(cmd)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			return nil, err
-		}
-	}
-
-	return &command{cmd: execabs.Command(cmd, adjustPathForWindows(ep.Path))}, nil
-}
-
-func isDriveLetter(c byte) bool {
-	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-}
-
-// On Windows, the path that results from a file: URL has a leading slash. This
-// has to be removed if there's a drive letter
-func adjustPathForWindows(p string) string {
-	if runtime.GOOS != "windows" {
-		return p
-	}
-	if len(p) >= 3 && p[0] == '/' && isDriveLetter(p[1]) && p[2] == ':' {
-		return p[1:]
-	}
-	return p
-}
-
-type command struct {
-	cmd          *execabs.Cmd
-	stderrCloser io.Closer
-	closed       bool
-}
-
-func (c *command) Start() error {
-	return c.cmd.Start()
-}
-
-func (c *command) StderrPipe() (io.Reader, error) {
-	// Pipe returned by Command.StderrPipe has a race with Read + Command.Wait.
-	// We use an io.Pipe and close it after the command finishes.
-	r, w := io.Pipe()
-	c.cmd.Stderr = w
-	c.stderrCloser = r
-	return r, nil
-}
-
-func (c *command) StdinPipe() (io.WriteCloser, error) {
-	return c.cmd.StdinPipe()
-}
-
-func (c *command) StdoutPipe() (io.Reader, error) {
-	return c.cmd.StdoutPipe()
-}
-
-func (c *command) Kill() error {
-	c.cmd.Process.Kill()
-	return c.Close()
-}
-
-// Close waits for the command to exit.
-func (c *command) Close() error {
-	if c.closed {
-		return nil
-	}
-
-	defer func() {
-		c.closed = true
-		_ = c.stderrCloser.Close()
-
-	}()
-
-	err := c.cmd.Wait()
-	if _, ok := err.(*os.PathError); ok {
-		return nil
-	}
-
-	// When a repository does not exist, the command exits with code 128.
-	if _, ok := err.(*execabs.ExitError); ok {
-		return nil
-	}
-
-	return err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/file/server.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/file/server.go
deleted file mode 100644
index 79ea016fb..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/file/server.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package file
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/server"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// ServeUploadPack serves a git-upload-pack request using standard output, input
-// and error. This is meant to be used when implementing a git-upload-pack
-// command.
-func ServeUploadPack(path string) error {
-	ep, err := transport.NewEndpoint(path)
-	if err != nil {
-		return err
-	}
-
-	// TODO: define and implement a server-side AuthMethod
-	s, err := server.DefaultServer.NewUploadPackSession(ep, nil)
-	if err != nil {
-		return fmt.Errorf("error creating session: %s", err)
-	}
-
-	return common.ServeUploadPack(srvCmd, s)
-}
-
-// ServeReceivePack serves a git-receive-pack request using standard output,
-// input and error. This is meant to be used when implementing a
-// git-receive-pack command.
-func ServeReceivePack(path string) error {
-	ep, err := transport.NewEndpoint(path)
-	if err != nil {
-		return err
-	}
-
-	// TODO: define and implement a server-side AuthMethod
-	s, err := server.DefaultServer.NewReceivePackSession(ep, nil)
-	if err != nil {
-		return fmt.Errorf("error creating session: %s", err)
-	}
-
-	return common.ServeReceivePack(srvCmd, s)
-}
-
-var srvCmd = common.ServerCommand{
-	Stdin:  os.Stdin,
-	Stdout: ioutil.WriteNopCloser(os.Stdout),
-	Stderr: os.Stderr,
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/git/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/git/common.go
deleted file mode 100644
index 8368f1f1d..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/git/common.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Package git implements the git transport protocol.
-package git
-
-import (
-	"io"
-	"net"
-	"strconv"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// DefaultClient is the default git client.
-var DefaultClient = common.NewClient(&runner{})
-
-const DefaultPort = 9418
-
-type runner struct{}
-
-// Command returns a new Command for the given cmd in the given Endpoint
-func (r *runner) Command(cmd string, ep *transport.Endpoint, auth transport.AuthMethod) (common.Command, error) {
-	// auth not allowed since git protocol doesn't support authentication
-	if auth != nil {
-		return nil, transport.ErrInvalidAuthMethod
-	}
-	c := &command{command: cmd, endpoint: ep}
-	if err := c.connect(); err != nil {
-		return nil, err
-	}
-	return c, nil
-}
-
-type command struct {
-	conn      net.Conn
-	connected bool
-	command   string
-	endpoint  *transport.Endpoint
-}
-
-// Start executes the command sending the required message to the TCP connection
-func (c *command) Start() error {
-	req := packp.GitProtoRequest{
-		RequestCommand: c.command,
-		Pathname:       c.endpoint.Path,
-	}
-	host := c.endpoint.Host
-	if c.endpoint.Port != DefaultPort {
-		host = net.JoinHostPort(c.endpoint.Host, strconv.Itoa(c.endpoint.Port))
-	}
-
-	req.Host = host
-
-	return req.Encode(c.conn)
-}
-
-func (c *command) connect() error {
-	if c.connected {
-		return transport.ErrAlreadyConnected
-	}
-
-	var err error
-	c.conn, err = net.Dial("tcp", c.getHostWithPort())
-	if err != nil {
-		return err
-	}
-
-	c.connected = true
-	return nil
-}
-
-func (c *command) getHostWithPort() string {
-	host := c.endpoint.Host
-	port := c.endpoint.Port
-	if port <= 0 {
-		port = DefaultPort
-	}
-
-	return net.JoinHostPort(host, strconv.Itoa(port))
-}
-
-// StderrPipe git protocol doesn't have any dedicated error channel
-func (c *command) StderrPipe() (io.Reader, error) {
-	return nil, nil
-}
-
-// StdinPipe returns the underlying connection as WriteCloser, wrapped to prevent
-// call to the Close function from the connection, a command execution in git
-// protocol can't be closed or killed
-func (c *command) StdinPipe() (io.WriteCloser, error) {
-	return ioutil.WriteNopCloser(c.conn), nil
-}
-
-// StdoutPipe returns the underlying connection as Reader
-func (c *command) StdoutPipe() (io.Reader, error) {
-	return c.conn, nil
-}
-
-// Close closes the TCP connection and connection.
-func (c *command) Close() error {
-	if !c.connected {
-		return nil
-	}
-
-	c.connected = false
-	return c.conn.Close()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/common.go
deleted file mode 100644
index 9495d176c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/common.go
+++ /dev/null
@@ -1,453 +0,0 @@
-// Package http implements the HTTP transport protocol.
-package http
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/golang/groupcache/lru"
-)
-
-// it requires a bytes.Buffer, because we need to know the length
-func applyHeadersToRequest(req *http.Request, content *bytes.Buffer, host string, requestType string) {
-	req.Header.Add("User-Agent", capability.DefaultAgent())
-	req.Header.Add("Host", host) // host:port
-
-	if content == nil {
-		req.Header.Add("Accept", "*/*")
-		return
-	}
-
-	req.Header.Add("Accept", fmt.Sprintf("application/x-%s-result", requestType))
-	req.Header.Add("Content-Type", fmt.Sprintf("application/x-%s-request", requestType))
-	req.Header.Add("Content-Length", strconv.Itoa(content.Len()))
-}
-
-const infoRefsPath = "/info/refs"
-
-func advertisedReferences(ctx context.Context, s *session, serviceName string) (ref *packp.AdvRefs, err error) {
-	url := fmt.Sprintf(
-		"%s%s?service=%s",
-		s.endpoint.String(), infoRefsPath, serviceName,
-	)
-
-	req, err := http.NewRequest(http.MethodGet, url, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	s.ApplyAuthToRequest(req)
-	applyHeadersToRequest(req, nil, s.endpoint.Host, serviceName)
-	res, err := s.client.Do(req.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	s.ModifyEndpointIfRedirect(res)
-	defer ioutil.CheckClose(res.Body, &err)
-
-	if err = NewErr(res); err != nil {
-		return nil, err
-	}
-
-	ar := packp.NewAdvRefs()
-	if err = ar.Decode(res.Body); err != nil {
-		if err == packp.ErrEmptyAdvRefs {
-			err = transport.ErrEmptyRemoteRepository
-		}
-
-		return nil, err
-	}
-
-	// Git 2.41+ returns a zero-id plus capabilities when an empty
-	// repository is being cloned. This skips the existing logic within
-	// advrefs_decode.decodeFirstHash, which expects a flush-pkt instead.
-	//
-	// This logic aligns with plumbing/transport/internal/common/common.go.
-	if ar.IsEmpty() &&
-		// Empty repositories are valid for git-receive-pack.
-		transport.ReceivePackServiceName != serviceName {
-		return nil, transport.ErrEmptyRemoteRepository
-	}
-
-	transport.FilterUnsupportedCapabilities(ar.Capabilities)
-	s.advRefs = ar
-
-	return ar, nil
-}
-
-type client struct {
-	client     *http.Client
-	transports *lru.Cache
-	mutex      sync.RWMutex
-}
-
-// ClientOptions holds user configurable options for the client.
-type ClientOptions struct {
-	// CacheMaxEntries is the max no. of entries that the transport objects
-	// cache will hold at any given point of time. It must be a positive integer.
-	// Calling `client.addTransport()` after the cache has reached the specified
-	// size, will result in the least recently used transport getting deleted
-	// before the provided transport is added to the cache.
-	CacheMaxEntries int
-}
-
-var (
-	// defaultTransportCacheSize is the default capacity of the transport objects cache.
-	// Its value is 0 because transport caching is turned off by default and is an
-	// opt-in feature.
-	defaultTransportCacheSize = 0
-
-	// DefaultClient is the default HTTP client, which uses a net/http client configured
-	// with http.DefaultTransport.
-	DefaultClient = NewClient(nil)
-)
-
-// NewClient creates a new client with a custom net/http client.
-// See `InstallProtocol` to install and override default http client.
-// If the net/http client is nil or empty, it will use a net/http client configured
-// with http.DefaultTransport.
-//
-// Note that for HTTP client cannot distinguish between private repositories and
-// unexistent repositories on GitHub. So it returns `ErrAuthorizationRequired`
-// for both.
-func NewClient(c *http.Client) transport.Transport {
-	if c == nil {
-		c = &http.Client{
-			Transport: http.DefaultTransport,
-		}
-	}
-	return NewClientWithOptions(c, &ClientOptions{
-		CacheMaxEntries: defaultTransportCacheSize,
-	})
-}
-
-// NewClientWithOptions returns a new client configured with the provided net/http client
-// and other custom options specific to the client.
-// If the net/http client is nil or empty, it will use a net/http client configured
-// with http.DefaultTransport.
-func NewClientWithOptions(c *http.Client, opts *ClientOptions) transport.Transport {
-	if c == nil {
-		c = &http.Client{
-			Transport: http.DefaultTransport,
-		}
-	}
-	cl := &client{
-		client: c,
-	}
-
-	if opts != nil {
-		if opts.CacheMaxEntries > 0 {
-			cl.transports = lru.New(opts.CacheMaxEntries)
-		}
-	}
-	return cl
-}
-
-func (c *client) NewUploadPackSession(ep *transport.Endpoint, auth transport.AuthMethod) (
-	transport.UploadPackSession, error) {
-
-	return newUploadPackSession(c, ep, auth)
-}
-
-func (c *client) NewReceivePackSession(ep *transport.Endpoint, auth transport.AuthMethod) (
-	transport.ReceivePackSession, error) {
-
-	return newReceivePackSession(c, ep, auth)
-}
-
-type session struct {
-	auth     AuthMethod
-	client   *http.Client
-	endpoint *transport.Endpoint
-	advRefs  *packp.AdvRefs
-}
-
-func transportWithInsecureTLS(transport *http.Transport) {
-	if transport.TLSClientConfig == nil {
-		transport.TLSClientConfig = &tls.Config{}
-	}
-	transport.TLSClientConfig.InsecureSkipVerify = true
-}
-
-func transportWithCABundle(transport *http.Transport, caBundle []byte) error {
-	rootCAs, err := x509.SystemCertPool()
-	if err != nil {
-		return err
-	}
-	if rootCAs == nil {
-		rootCAs = x509.NewCertPool()
-	}
-	rootCAs.AppendCertsFromPEM(caBundle)
-	if transport.TLSClientConfig == nil {
-		transport.TLSClientConfig = &tls.Config{}
-	}
-	transport.TLSClientConfig.RootCAs = rootCAs
-	return nil
-}
-
-func transportWithProxy(transport *http.Transport, proxyURL *url.URL) {
-	transport.Proxy = http.ProxyURL(proxyURL)
-}
-
-func configureTransport(transport *http.Transport, ep *transport.Endpoint) error {
-	if len(ep.CaBundle) > 0 {
-		if err := transportWithCABundle(transport, ep.CaBundle); err != nil {
-			return err
-		}
-	}
-	if ep.InsecureSkipTLS {
-		transportWithInsecureTLS(transport)
-	}
-
-	if ep.Proxy.URL != "" {
-		proxyURL, err := ep.Proxy.FullURL()
-		if err != nil {
-			return err
-		}
-		transportWithProxy(transport, proxyURL)
-	}
-	return nil
-}
-
-func newSession(c *client, ep *transport.Endpoint, auth transport.AuthMethod) (*session, error) {
-	var httpClient *http.Client
-
-	// We need to configure the http transport if there are transport specific
-	// options present in the endpoint.
-	if len(ep.CaBundle) > 0 || ep.InsecureSkipTLS || ep.Proxy.URL != "" {
-		var transport *http.Transport
-		// if the client wasn't configured to have a cache for transports then just configure
-		// the transport and use it directly, otherwise try to use the cache.
-		if c.transports == nil {
-			tr, ok := c.client.Transport.(*http.Transport)
-			if !ok {
-				return nil, fmt.Errorf("expected underlying client transport to be of type: %s; got: %s",
-					reflect.TypeOf(transport), reflect.TypeOf(c.client.Transport))
-			}
-
-			transport = tr.Clone()
-			configureTransport(transport, ep)
-		} else {
-			transportOpts := transportOptions{
-				caBundle:        string(ep.CaBundle),
-				insecureSkipTLS: ep.InsecureSkipTLS,
-			}
-			if ep.Proxy.URL != "" {
-				proxyURL, err := ep.Proxy.FullURL()
-				if err != nil {
-					return nil, err
-				}
-				transportOpts.proxyURL = *proxyURL
-			}
-			var found bool
-			transport, found = c.fetchTransport(transportOpts)
-
-			if !found {
-				transport = c.client.Transport.(*http.Transport).Clone()
-				configureTransport(transport, ep)
-				c.addTransport(transportOpts, transport)
-			}
-		}
-
-		httpClient = &http.Client{
-			Transport:     transport,
-			CheckRedirect: c.client.CheckRedirect,
-			Jar:           c.client.Jar,
-			Timeout:       c.client.Timeout,
-		}
-	} else {
-		httpClient = c.client
-	}
-
-	s := &session{
-		auth:     basicAuthFromEndpoint(ep),
-		client:   httpClient,
-		endpoint: ep,
-	}
-	if auth != nil {
-		a, ok := auth.(AuthMethod)
-		if !ok {
-			return nil, transport.ErrInvalidAuthMethod
-		}
-
-		s.auth = a
-	}
-
-	return s, nil
-}
-
-func (s *session) ApplyAuthToRequest(req *http.Request) {
-	if s.auth == nil {
-		return
-	}
-
-	s.auth.SetAuth(req)
-}
-
-func (s *session) ModifyEndpointIfRedirect(res *http.Response) {
-	if res.Request == nil {
-		return
-	}
-
-	r := res.Request
-	if !strings.HasSuffix(r.URL.Path, infoRefsPath) {
-		return
-	}
-
-	h, p, err := net.SplitHostPort(r.URL.Host)
-	if err != nil {
-		h = r.URL.Host
-	}
-	if p != "" {
-		port, err := strconv.Atoi(p)
-		if err == nil {
-			s.endpoint.Port = port
-		}
-	}
-	s.endpoint.Host = h
-
-	s.endpoint.Protocol = r.URL.Scheme
-	s.endpoint.Path = r.URL.Path[:len(r.URL.Path)-len(infoRefsPath)]
-}
-
-func (*session) Close() error {
-	return nil
-}
-
-// AuthMethod is concrete implementation of common.AuthMethod for HTTP services
-type AuthMethod interface {
-	transport.AuthMethod
-	SetAuth(r *http.Request)
-}
-
-func basicAuthFromEndpoint(ep *transport.Endpoint) *BasicAuth {
-	u := ep.User
-	if u == "" {
-		return nil
-	}
-
-	return &BasicAuth{u, ep.Password}
-}
-
-// BasicAuth represent a HTTP basic auth
-type BasicAuth struct {
-	Username, Password string
-}
-
-func (a *BasicAuth) SetAuth(r *http.Request) {
-	if a == nil {
-		return
-	}
-
-	r.SetBasicAuth(a.Username, a.Password)
-}
-
-// Name is name of the auth
-func (a *BasicAuth) Name() string {
-	return "http-basic-auth"
-}
-
-func (a *BasicAuth) String() string {
-	masked := "*******"
-	if a.Password == "" {
-		masked = ""
-	}
-
-	return fmt.Sprintf("%s - %s:%s", a.Name(), a.Username, masked)
-}
-
-// TokenAuth implements an http.AuthMethod that can be used with http transport
-// to authenticate with HTTP token authentication (also known as bearer
-// authentication).
-//
-// IMPORTANT: If you are looking to use OAuth tokens with popular servers (e.g.
-// GitHub, Bitbucket, GitLab) you should use BasicAuth instead. These servers
-// use basic HTTP authentication, with the OAuth token as user or password.
-// Check the documentation of your git server for details.
-type TokenAuth struct {
-	Token string
-}
-
-func (a *TokenAuth) SetAuth(r *http.Request) {
-	if a == nil {
-		return
-	}
-	r.Header.Add("Authorization", fmt.Sprintf("Bearer %s", a.Token))
-}
-
-// Name is name of the auth
-func (a *TokenAuth) Name() string {
-	return "http-token-auth"
-}
-
-func (a *TokenAuth) String() string {
-	masked := "*******"
-	if a.Token == "" {
-		masked = ""
-	}
-	return fmt.Sprintf("%s - %s", a.Name(), masked)
-}
-
-// Err is a dedicated error to return errors based on status code
-type Err struct {
-	Response *http.Response
-	Reason   string
-}
-
-// NewErr returns a new Err based on a http response and closes response body
-// if needed
-func NewErr(r *http.Response) error {
-	if r.StatusCode >= http.StatusOK && r.StatusCode < http.StatusMultipleChoices {
-		return nil
-	}
-
-	var reason string
-
-	// If a response message is present, add it to error
-	var messageBuffer bytes.Buffer
-	if r.Body != nil {
-		messageLength, _ := messageBuffer.ReadFrom(r.Body)
-		if messageLength > 0 {
-			reason = messageBuffer.String()
-		}
-		_ = r.Body.Close()
-	}
-
-	switch r.StatusCode {
-	case http.StatusUnauthorized:
-		return fmt.Errorf("%w: %s", transport.ErrAuthenticationRequired, reason)
-	case http.StatusForbidden:
-		return fmt.Errorf("%w: %s", transport.ErrAuthorizationFailed, reason)
-	case http.StatusNotFound:
-		return fmt.Errorf("%w: %s", transport.ErrRepositoryNotFound, reason)
-	}
-
-	return plumbing.NewUnexpectedError(&Err{r, reason})
-}
-
-// StatusCode returns the status code of the response
-func (e *Err) StatusCode() int {
-	return e.Response.StatusCode
-}
-
-func (e *Err) Error() string {
-	return fmt.Sprintf("unexpected requesting %q status code: %d",
-		e.Response.Request.URL, e.Response.StatusCode,
-	)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/receive_pack.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/receive_pack.go
deleted file mode 100644
index 5a7211cd7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/receive_pack.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package http
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-type rpSession struct {
-	*session
-}
-
-func newReceivePackSession(c *client, ep *transport.Endpoint, auth transport.AuthMethod) (transport.ReceivePackSession, error) {
-	s, err := newSession(c, ep, auth)
-	return &rpSession{s}, err
-}
-
-func (s *rpSession) AdvertisedReferences() (*packp.AdvRefs, error) {
-	return advertisedReferences(context.TODO(), s.session, transport.ReceivePackServiceName)
-}
-
-func (s *rpSession) AdvertisedReferencesContext(ctx context.Context) (*packp.AdvRefs, error) {
-	return advertisedReferences(ctx, s.session, transport.ReceivePackServiceName)
-}
-
-func (s *rpSession) ReceivePack(ctx context.Context, req *packp.ReferenceUpdateRequest) (
-	*packp.ReportStatus, error) {
-	url := fmt.Sprintf(
-		"%s/%s",
-		s.endpoint.String(), transport.ReceivePackServiceName,
-	)
-
-	buf := bytes.NewBuffer(nil)
-	if err := req.Encode(buf); err != nil {
-		return nil, err
-	}
-
-	res, err := s.doRequest(ctx, http.MethodPost, url, buf)
-	if err != nil {
-		return nil, err
-	}
-
-	r, err := ioutil.NonEmptyReader(res.Body)
-	if err == ioutil.ErrEmptyReader {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	var d *sideband.Demuxer
-	if req.Capabilities.Supports(capability.Sideband64k) {
-		d = sideband.NewDemuxer(sideband.Sideband64k, r)
-	} else if req.Capabilities.Supports(capability.Sideband) {
-		d = sideband.NewDemuxer(sideband.Sideband, r)
-	}
-	if d != nil {
-		d.Progress = req.Progress
-		r = d
-	}
-
-	rc := ioutil.NewReadCloser(r, res.Body)
-
-	report := packp.NewReportStatus()
-	if err := report.Decode(rc); err != nil {
-		return nil, err
-	}
-
-	return report, report.Error()
-}
-
-func (s *rpSession) doRequest(
-	ctx context.Context, method, url string, content *bytes.Buffer,
-) (*http.Response, error) {
-
-	var body io.Reader
-	if content != nil {
-		body = content
-	}
-
-	req, err := http.NewRequest(method, url, body)
-	if err != nil {
-		return nil, plumbing.NewPermanentError(err)
-	}
-
-	applyHeadersToRequest(req, content, s.endpoint.Host, transport.ReceivePackServiceName)
-	s.ApplyAuthToRequest(req)
-
-	res, err := s.client.Do(req.WithContext(ctx))
-	if err != nil {
-		return nil, plumbing.NewUnexpectedError(err)
-	}
-
-	if err := NewErr(res); err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/transport.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/transport.go
deleted file mode 100644
index c8db38920..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/transport.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package http
-
-import (
-	"net/http"
-	"net/url"
-)
-
-// transportOptions contains transport specific configuration.
-type transportOptions struct {
-	insecureSkipTLS bool
-	// []byte is not comparable.
-	caBundle string
-	proxyURL url.URL
-}
-
-func (c *client) addTransport(opts transportOptions, transport *http.Transport) {
-	c.mutex.Lock()
-	c.transports.Add(opts, transport)
-	c.mutex.Unlock()
-}
-
-func (c *client) removeTransport(opts transportOptions) {
-	c.mutex.Lock()
-	c.transports.Remove(opts)
-	c.mutex.Unlock()
-}
-
-func (c *client) fetchTransport(opts transportOptions) (*http.Transport, bool) {
-	c.mutex.RLock()
-	t, ok := c.transports.Get(opts)
-	c.mutex.RUnlock()
-	if !ok {
-		return nil, false
-	}
-	transport, ok := t.(*http.Transport)
-	if !ok {
-		return nil, false
-	}
-	return transport, true
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/upload_pack.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/upload_pack.go
deleted file mode 100644
index 954dc5187..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/http/upload_pack.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package http
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-type upSession struct {
-	*session
-}
-
-func newUploadPackSession(c *client, ep *transport.Endpoint, auth transport.AuthMethod) (transport.UploadPackSession, error) {
-	s, err := newSession(c, ep, auth)
-	return &upSession{s}, err
-}
-
-func (s *upSession) AdvertisedReferences() (*packp.AdvRefs, error) {
-	return advertisedReferences(context.TODO(), s.session, transport.UploadPackServiceName)
-}
-
-func (s *upSession) AdvertisedReferencesContext(ctx context.Context) (*packp.AdvRefs, error) {
-	return advertisedReferences(ctx, s.session, transport.UploadPackServiceName)
-}
-
-func (s *upSession) UploadPack(
-	ctx context.Context, req *packp.UploadPackRequest,
-) (*packp.UploadPackResponse, error) {
-
-	if req.IsEmpty() {
-		return nil, transport.ErrEmptyUploadPackRequest
-	}
-
-	if err := req.Validate(); err != nil {
-		return nil, err
-	}
-
-	url := fmt.Sprintf(
-		"%s/%s",
-		s.endpoint.String(), transport.UploadPackServiceName,
-	)
-
-	content, err := uploadPackRequestToReader(req)
-	if err != nil {
-		return nil, err
-	}
-
-	res, err := s.doRequest(ctx, http.MethodPost, url, content)
-	if err != nil {
-		return nil, err
-	}
-
-	r, err := ioutil.NonEmptyReader(res.Body)
-	if err != nil {
-		if err == ioutil.ErrEmptyReader || err == io.ErrUnexpectedEOF {
-			return nil, transport.ErrEmptyUploadPackRequest
-		}
-
-		return nil, err
-	}
-
-	rc := ioutil.NewReadCloser(r, res.Body)
-	return common.DecodeUploadPackResponse(rc, req)
-}
-
-// Close does nothing.
-func (s *upSession) Close() error {
-	return nil
-}
-
-func (s *upSession) doRequest(
-	ctx context.Context, method, url string, content *bytes.Buffer,
-) (*http.Response, error) {
-
-	var body io.Reader
-	if content != nil {
-		body = content
-	}
-
-	req, err := http.NewRequest(method, url, body)
-	if err != nil {
-		return nil, plumbing.NewPermanentError(err)
-	}
-
-	applyHeadersToRequest(req, content, s.endpoint.Host, transport.UploadPackServiceName)
-	s.ApplyAuthToRequest(req)
-
-	res, err := s.client.Do(req.WithContext(ctx))
-	if err != nil {
-		return nil, plumbing.NewUnexpectedError(err)
-	}
-
-	if err := NewErr(res); err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}
-
-func uploadPackRequestToReader(req *packp.UploadPackRequest) (*bytes.Buffer, error) {
-	buf := bytes.NewBuffer(nil)
-	e := pktline.NewEncoder(buf)
-
-	if err := req.UploadRequest.Encode(buf); err != nil {
-		return nil, fmt.Errorf("sending upload-req message: %s", err)
-	}
-
-	if err := req.UploadHaves.Encode(buf, false); err != nil {
-		return nil, fmt.Errorf("sending haves message: %s", err)
-	}
-
-	if err := e.EncodeString("done\n"); err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/common.go
deleted file mode 100644
index 6c770693a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/common.go
+++ /dev/null
@@ -1,492 +0,0 @@
-// Package common implements the git pack protocol with a pluggable transport.
-// This is a low-level package to implement new transports. Use a concrete
-// implementation instead (e.g. http, file, ssh).
-//
-// A simple example of usage can be found in the file package.
-package common
-
-import (
-	"bufio"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/pktline"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-const (
-	readErrorSecondsTimeout = 10
-)
-
-var (
-	ErrTimeoutExceeded = errors.New("timeout exceeded")
-	// stdErrSkipPattern is used for skipping lines from a command's stderr output.
-	// Any line matching this pattern will be skipped from further
-	// processing and not be returned to calling code.
-	stdErrSkipPattern = regexp.MustCompile("^remote:( =*){0,1}$")
-)
-
-// Commander creates Command instances. This is the main entry point for
-// transport implementations.
-type Commander interface {
-	// Command creates a new Command for the given git command and
-	// endpoint. cmd can be git-upload-pack or git-receive-pack. An
-	// error should be returned if the endpoint is not supported or the
-	// command cannot be created (e.g. binary does not exist, connection
-	// cannot be established).
-	Command(cmd string, ep *transport.Endpoint, auth transport.AuthMethod) (Command, error)
-}
-
-// Command is used for a single command execution.
-// This interface is modeled after exec.Cmd and ssh.Session in the standard
-// library.
-type Command interface {
-	// StderrPipe returns a pipe that will be connected to the command's
-	// standard error when the command starts. It should not be called after
-	// Start.
-	StderrPipe() (io.Reader, error)
-	// StdinPipe returns a pipe that will be connected to the command's
-	// standard input when the command starts. It should not be called after
-	// Start. The pipe should be closed when no more input is expected.
-	StdinPipe() (io.WriteCloser, error)
-	// StdoutPipe returns a pipe that will be connected to the command's
-	// standard output when the command starts. It should not be called after
-	// Start.
-	StdoutPipe() (io.Reader, error)
-	// Start starts the specified command. It does not wait for it to
-	// complete.
-	Start() error
-	// Close closes the command and releases any resources used by it. It
-	// will block until the command exits.
-	Close() error
-}
-
-// CommandKiller expands the Command interface, enabling it for being killed.
-type CommandKiller interface {
-	// Kill and close the session whatever the state it is. It will block until
-	// the command is terminated.
-	Kill() error
-}
-
-type client struct {
-	cmdr Commander
-}
-
-// NewClient creates a new client using the given Commander.
-func NewClient(runner Commander) transport.Transport {
-	return &client{runner}
-}
-
-// NewUploadPackSession creates a new UploadPackSession.
-func (c *client) NewUploadPackSession(ep *transport.Endpoint, auth transport.AuthMethod) (
-	transport.UploadPackSession, error) {
-
-	return c.newSession(transport.UploadPackServiceName, ep, auth)
-}
-
-// NewReceivePackSession creates a new ReceivePackSession.
-func (c *client) NewReceivePackSession(ep *transport.Endpoint, auth transport.AuthMethod) (
-	transport.ReceivePackSession, error) {
-
-	return c.newSession(transport.ReceivePackServiceName, ep, auth)
-}
-
-type session struct {
-	Stdin   io.WriteCloser
-	Stdout  io.Reader
-	Command Command
-
-	isReceivePack bool
-	advRefs       *packp.AdvRefs
-	packRun       bool
-	finished      bool
-	firstErrLine  chan string
-}
-
-func (c *client) newSession(s string, ep *transport.Endpoint, auth transport.AuthMethod) (*session, error) {
-	cmd, err := c.cmdr.Command(s, ep, auth)
-	if err != nil {
-		return nil, err
-	}
-
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	if err := cmd.Start(); err != nil {
-		return nil, err
-	}
-
-	return &session{
-		Stdin:         stdin,
-		Stdout:        stdout,
-		Command:       cmd,
-		firstErrLine:  c.listenFirstError(stderr),
-		isReceivePack: s == transport.ReceivePackServiceName,
-	}, nil
-}
-
-func (c *client) listenFirstError(r io.Reader) chan string {
-	if r == nil {
-		return nil
-	}
-
-	errLine := make(chan string, 1)
-	go func() {
-		s := bufio.NewScanner(r)
-		for {
-			if s.Scan() {
-				line := s.Text()
-				if !stdErrSkipPattern.MatchString(line) {
-					errLine <- line
-					break
-				}
-			} else {
-				close(errLine)
-				break
-			}
-		}
-
-		_, _ = io.Copy(io.Discard, r)
-	}()
-
-	return errLine
-}
-
-func (s *session) AdvertisedReferences() (*packp.AdvRefs, error) {
-	return s.AdvertisedReferencesContext(context.TODO())
-}
-
-// AdvertisedReferences retrieves the advertised references from the server.
-func (s *session) AdvertisedReferencesContext(ctx context.Context) (*packp.AdvRefs, error) {
-	if s.advRefs != nil {
-		return s.advRefs, nil
-	}
-
-	ar := packp.NewAdvRefs()
-	if err := ar.Decode(s.StdoutContext(ctx)); err != nil {
-		if err := s.handleAdvRefDecodeError(err); err != nil {
-			return nil, err
-		}
-	}
-
-	// Some servers like jGit, announce capabilities instead of returning an
-	// packp message with a flush. This verifies that we received a empty
-	// adv-refs, even it contains capabilities.
-	if !s.isReceivePack && ar.IsEmpty() {
-		return nil, transport.ErrEmptyRemoteRepository
-	}
-
-	transport.FilterUnsupportedCapabilities(ar.Capabilities)
-	s.advRefs = ar
-	return ar, nil
-}
-
-func (s *session) handleAdvRefDecodeError(err error) error {
-	var errLine *pktline.ErrorLine
-	if errors.As(err, &errLine) {
-		if isRepoNotFoundError(errLine.Text) {
-			return transport.ErrRepositoryNotFound
-		}
-
-		return errLine
-	}
-
-	// If repository is not found, we get empty stdout and server writes an
-	// error to stderr.
-	if errors.Is(err, packp.ErrEmptyInput) {
-		// TODO:(v6): handle this error in a better way.
-		// Instead of checking the stderr output for a specific error message,
-		// define an ExitError and embed the stderr output and exit (if one
-		// exists) in the error struct. Just like exec.ExitError.
-		s.finished = true
-		if err := s.checkNotFoundError(); err != nil {
-			return err
-		}
-
-		return io.ErrUnexpectedEOF
-	}
-
-	// For empty (but existing) repositories, we get empty advertised-references
-	// message. But valid. That is, it includes at least a flush.
-	if err == packp.ErrEmptyAdvRefs {
-		// Empty repositories are valid for git-receive-pack.
-		if s.isReceivePack {
-			return nil
-		}
-
-		if err := s.finish(); err != nil {
-			return err
-		}
-
-		return transport.ErrEmptyRemoteRepository
-	}
-
-	// Some server sends the errors as normal content (git protocol), so when
-	// we try to decode it fails, we need to check the content of it, to detect
-	// not found errors
-	if uerr, ok := err.(*packp.ErrUnexpectedData); ok {
-		if isRepoNotFoundError(string(uerr.Data)) {
-			return transport.ErrRepositoryNotFound
-		}
-	}
-
-	return err
-}
-
-// UploadPack performs a request to the server to fetch a packfile. A reader is
-// returned with the packfile content. The reader must be closed after reading.
-func (s *session) UploadPack(ctx context.Context, req *packp.UploadPackRequest) (*packp.UploadPackResponse, error) {
-	if req.IsEmpty() {
-		// XXX: IsEmpty means haves are a subset of wants, in that case we have
-		// everything we asked for. Close the connection and return nil.
-		if err := s.finish(); err != nil {
-			return nil, err
-		}
-		// TODO:(v6) return nil here
-		return nil, transport.ErrEmptyUploadPackRequest
-	}
-
-	if err := req.Validate(); err != nil {
-		return nil, err
-	}
-
-	if _, err := s.AdvertisedReferencesContext(ctx); err != nil {
-		return nil, err
-	}
-
-	s.packRun = true
-
-	in := s.StdinContext(ctx)
-	out := s.StdoutContext(ctx)
-
-	if err := uploadPack(in, out, req); err != nil {
-		return nil, err
-	}
-
-	r, err := ioutil.NonEmptyReader(out)
-	if err == ioutil.ErrEmptyReader {
-		if c, ok := s.Stdout.(io.Closer); ok {
-			_ = c.Close()
-		}
-
-		return nil, transport.ErrEmptyUploadPackRequest
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	rc := ioutil.NewReadCloser(r, s)
-	return DecodeUploadPackResponse(rc, req)
-}
-
-func (s *session) StdinContext(ctx context.Context) io.WriteCloser {
-	return ioutil.NewWriteCloserOnError(
-		ioutil.NewContextWriteCloser(ctx, s.Stdin),
-		s.onError,
-	)
-}
-
-func (s *session) StdoutContext(ctx context.Context) io.Reader {
-	return ioutil.NewReaderOnError(
-		ioutil.NewContextReader(ctx, s.Stdout),
-		s.onError,
-	)
-}
-
-func (s *session) onError(err error) {
-	if k, ok := s.Command.(CommandKiller); ok {
-		_ = k.Kill()
-	}
-
-	_ = s.Close()
-}
-
-func (s *session) ReceivePack(ctx context.Context, req *packp.ReferenceUpdateRequest) (*packp.ReportStatus, error) {
-	if _, err := s.AdvertisedReferences(); err != nil {
-		return nil, err
-	}
-
-	s.packRun = true
-
-	w := s.StdinContext(ctx)
-	if err := req.Encode(w); err != nil {
-		return nil, err
-	}
-
-	if err := w.Close(); err != nil {
-		return nil, err
-	}
-
-	if !req.Capabilities.Supports(capability.ReportStatus) {
-		// If we don't have report-status, we can only
-		// check return value error.
-		return nil, s.Command.Close()
-	}
-
-	r := s.StdoutContext(ctx)
-
-	var d *sideband.Demuxer
-	if req.Capabilities.Supports(capability.Sideband64k) {
-		d = sideband.NewDemuxer(sideband.Sideband64k, r)
-	} else if req.Capabilities.Supports(capability.Sideband) {
-		d = sideband.NewDemuxer(sideband.Sideband, r)
-	}
-	if d != nil {
-		d.Progress = req.Progress
-		r = d
-	}
-
-	report := packp.NewReportStatus()
-	if err := report.Decode(r); err != nil {
-		return nil, err
-	}
-
-	if err := report.Error(); err != nil {
-		defer s.Close()
-		return report, err
-	}
-
-	return report, s.Command.Close()
-}
-
-func (s *session) finish() error {
-	if s.finished {
-		return nil
-	}
-
-	s.finished = true
-
-	// If we did not run a upload/receive-pack, we close the connection
-	// gracefully by sending a flush packet to the server. If the server
-	// operates correctly, it will exit with status 0.
-	if !s.packRun {
-		_, err := s.Stdin.Write(pktline.FlushPkt)
-		return err
-	}
-
-	return nil
-}
-
-func (s *session) Close() (err error) {
-	err = s.finish()
-
-	defer ioutil.CheckClose(s.Command, &err)
-	return
-}
-
-func (s *session) checkNotFoundError() error {
-	t := time.NewTicker(time.Second * readErrorSecondsTimeout)
-	defer t.Stop()
-
-	select {
-	case <-t.C:
-		return ErrTimeoutExceeded
-	case line, ok := <-s.firstErrLine:
-		if !ok || len(line) == 0 {
-			return nil
-		}
-
-		if isRepoNotFoundError(line) {
-			return transport.ErrRepositoryNotFound
-		}
-
-		// TODO:(v6): return server error just as it is without a prefix
-		return fmt.Errorf("unknown error: %s", line)
-	}
-}
-
-const (
-	githubRepoNotFoundErr      = "Repository not found."
-	bitbucketRepoNotFoundErr   = "repository does not exist."
-	localRepoNotFoundErr       = "does not appear to be a git repository"
-	gitProtocolNotFoundErr     = "Repository not found."
-	gitProtocolNoSuchErr       = "no such repository"
-	gitProtocolAccessDeniedErr = "access denied"
-	gogsAccessDeniedErr        = "Repository does not exist or you do not have access"
-	gitlabRepoNotFoundErr      = "The project you were looking for could not be found"
-)
-
-func isRepoNotFoundError(s string) bool {
-	for _, err := range []string{
-		githubRepoNotFoundErr,
-		bitbucketRepoNotFoundErr,
-		localRepoNotFoundErr,
-		gitProtocolNotFoundErr,
-		gitProtocolNoSuchErr,
-		gitProtocolAccessDeniedErr,
-		gogsAccessDeniedErr,
-		gitlabRepoNotFoundErr,
-	} {
-		if strings.Contains(s, err) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// uploadPack implements the git-upload-pack protocol.
-func uploadPack(w io.WriteCloser, _ io.Reader, req *packp.UploadPackRequest) error {
-	// TODO support multi_ack mode
-	// TODO support multi_ack_detailed mode
-	// TODO support acks for common objects
-	// TODO build a proper state machine for all these processing options
-
-	if err := req.UploadRequest.Encode(w); err != nil {
-		return fmt.Errorf("sending upload-req message: %s", err)
-	}
-
-	if err := req.UploadHaves.Encode(w, true); err != nil {
-		return fmt.Errorf("sending haves message: %s", err)
-	}
-
-	if err := sendDone(w); err != nil {
-		return fmt.Errorf("sending done message: %s", err)
-	}
-
-	if err := w.Close(); err != nil {
-		return fmt.Errorf("closing input: %s", err)
-	}
-
-	return nil
-}
-
-func sendDone(w io.Writer) error {
-	e := pktline.NewEncoder(w)
-
-	return e.Encodef("done\n")
-}
-
-// DecodeUploadPackResponse decodes r into a new packp.UploadPackResponse
-func DecodeUploadPackResponse(r io.ReadCloser, req *packp.UploadPackRequest) (
-	*packp.UploadPackResponse, error,
-) {
-	res := packp.NewUploadPackResponse(req)
-	if err := res.Decode(r); err != nil {
-		return nil, fmt.Errorf("error decoding upload-pack response: %s", err)
-	}
-
-	return res, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/mocks.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/mocks.go
deleted file mode 100644
index 32a1415e1..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/mocks.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package common
-
-import (
-	"bytes"
-	"io"
-
-	gogitioutil "github.com/jesseduffield/go-git/v5/utils/ioutil"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-)
-
-type MockCommand struct {
-	stdin  bytes.Buffer
-	stdout bytes.Buffer
-	stderr bytes.Buffer
-}
-
-func (c MockCommand) StderrPipe() (io.Reader, error) {
-	return &c.stderr, nil
-}
-
-func (c MockCommand) StdinPipe() (io.WriteCloser, error) {
-	return gogitioutil.WriteNopCloser(&c.stdin), nil
-}
-
-func (c MockCommand) StdoutPipe() (io.Reader, error) {
-	return &c.stdout, nil
-}
-
-func (c MockCommand) Start() error {
-	return nil
-}
-
-func (c MockCommand) Close() error {
-	panic("not implemented")
-}
-
-type MockCommander struct {
-	stderr string
-}
-
-func (c MockCommander) Command(cmd string, ep *transport.Endpoint, auth transport.AuthMethod) (Command, error) {
-	return &MockCommand{
-		stderr: *bytes.NewBufferString(c.stderr),
-	}, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/server.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/server.go
deleted file mode 100644
index 1f8dd2404..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common/server.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package common
-
-import (
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// ServerCommand is used for a single server command execution.
-type ServerCommand struct {
-	Stderr io.Writer
-	Stdout io.WriteCloser
-	Stdin  io.Reader
-}
-
-func ServeUploadPack(cmd ServerCommand, s transport.UploadPackSession) (err error) {
-	ioutil.CheckClose(cmd.Stdout, &err)
-
-	ar, err := s.AdvertisedReferences()
-	if err != nil {
-		return err
-	}
-
-	if err := ar.Encode(cmd.Stdout); err != nil {
-		return err
-	}
-
-	req := packp.NewUploadPackRequest()
-	if err := req.Decode(cmd.Stdin); err != nil {
-		return err
-	}
-
-	var resp *packp.UploadPackResponse
-	resp, err = s.UploadPack(context.TODO(), req)
-	if err != nil {
-		return err
-	}
-
-	return resp.Encode(cmd.Stdout)
-}
-
-func ServeReceivePack(cmd ServerCommand, s transport.ReceivePackSession) error {
-	ar, err := s.AdvertisedReferences()
-	if err != nil {
-		return fmt.Errorf("internal error in advertised references: %s", err)
-	}
-
-	if err := ar.Encode(cmd.Stdout); err != nil {
-		return fmt.Errorf("error in advertised references encoding: %s", err)
-	}
-
-	req := packp.NewReferenceUpdateRequest()
-	if err := req.Decode(cmd.Stdin); err != nil {
-		return fmt.Errorf("error decoding: %s", err)
-	}
-
-	rs, err := s.ReceivePack(context.TODO(), req)
-	if rs != nil {
-		if err := rs.Encode(cmd.Stdout); err != nil {
-			return fmt.Errorf("error in encoding report status %s", err)
-		}
-	}
-
-	if err != nil {
-		return fmt.Errorf("error in receive pack: %s", err)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/server/loader.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/server/loader.go
deleted file mode 100644
index ded1cf1ae..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/server/loader.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package server
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/osfs"
-)
-
-// DefaultLoader is a filesystem loader ignoring host and resolving paths to /.
-var DefaultLoader = NewFilesystemLoader(osfs.New(""))
-
-// Loader loads repository's storer.Storer based on an optional host and a path.
-type Loader interface {
-	// Load loads a storer.Storer given a transport.Endpoint.
-	// Returns transport.ErrRepositoryNotFound if the repository does not
-	// exist.
-	Load(ep *transport.Endpoint) (storer.Storer, error)
-}
-
-type fsLoader struct {
-	base billy.Filesystem
-}
-
-// NewFilesystemLoader creates a Loader that ignores host and resolves paths
-// with a given base filesystem.
-func NewFilesystemLoader(base billy.Filesystem) Loader {
-	return &fsLoader{base}
-}
-
-// Load looks up the endpoint's path in the base file system and returns a
-// storer for it. Returns transport.ErrRepositoryNotFound if a repository does
-// not exist in the given path.
-func (l *fsLoader) Load(ep *transport.Endpoint) (storer.Storer, error) {
-	fs, err := l.base.Chroot(ep.Path)
-	if err != nil {
-		return nil, err
-	}
-
-	var bare bool
-	if _, err := fs.Stat("config"); err == nil {
-		bare = true
-	}
-
-	if !bare {
-		// do not use git.GitDirName due to import cycle
-		if _, err := fs.Stat(".git"); err != nil {
-			return nil, transport.ErrRepositoryNotFound
-		}
-	}
-
-	return filesystem.NewStorage(fs, cache.NewObjectLRUDefault()), nil
-}
-
-// MapLoader is a Loader that uses a lookup map of storer.Storer by
-// transport.Endpoint.
-type MapLoader map[string]storer.Storer
-
-// Load returns a storer.Storer for given a transport.Endpoint by looking it up
-// in the map. Returns transport.ErrRepositoryNotFound if the endpoint does not
-// exist.
-func (l MapLoader) Load(ep *transport.Endpoint) (storer.Storer, error) {
-	s, ok := l[ep.String()]
-	if !ok {
-		return nil, transport.ErrRepositoryNotFound
-	}
-
-	return s, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/server/server.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/server/server.go
deleted file mode 100644
index 2d730ad57..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/server/server.go
+++ /dev/null
@@ -1,432 +0,0 @@
-// Package server implements the git server protocol. For most use cases, the
-// transport-specific implementations should be used.
-package server
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/packfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/revlist"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-var DefaultServer = NewServer(DefaultLoader)
-
-type server struct {
-	loader  Loader
-	handler *handler
-}
-
-// NewServer returns a transport.Transport implementing a git server,
-// independent of transport. Each transport must wrap this.
-func NewServer(loader Loader) transport.Transport {
-	return &server{
-		loader,
-		&handler{asClient: false},
-	}
-}
-
-// NewClient returns a transport.Transport implementing a client with an
-// embedded server.
-func NewClient(loader Loader) transport.Transport {
-	return &server{
-		loader,
-		&handler{asClient: true},
-	}
-}
-
-func (s *server) NewUploadPackSession(ep *transport.Endpoint, auth transport.AuthMethod) (transport.UploadPackSession, error) {
-	sto, err := s.loader.Load(ep)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.handler.NewUploadPackSession(sto)
-}
-
-func (s *server) NewReceivePackSession(ep *transport.Endpoint, auth transport.AuthMethod) (transport.ReceivePackSession, error) {
-	sto, err := s.loader.Load(ep)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.handler.NewReceivePackSession(sto)
-}
-
-type handler struct {
-	asClient bool
-}
-
-func (h *handler) NewUploadPackSession(s storer.Storer) (transport.UploadPackSession, error) {
-	return &upSession{
-		session: session{storer: s, asClient: h.asClient},
-	}, nil
-}
-
-func (h *handler) NewReceivePackSession(s storer.Storer) (transport.ReceivePackSession, error) {
-	return &rpSession{
-		session:   session{storer: s, asClient: h.asClient},
-		cmdStatus: map[plumbing.ReferenceName]error{},
-	}, nil
-}
-
-type session struct {
-	storer   storer.Storer
-	caps     *capability.List
-	asClient bool
-}
-
-func (s *session) Close() error {
-	return nil
-}
-
-func (s *session) SetAuth(transport.AuthMethod) error {
-	//TODO: deprecate
-	return nil
-}
-
-func (s *session) checkSupportedCapabilities(cl *capability.List) error {
-	for _, c := range cl.All() {
-		if !s.caps.Supports(c) {
-			return fmt.Errorf("unsupported capability: %s", c)
-		}
-	}
-
-	return nil
-}
-
-type upSession struct {
-	session
-}
-
-func (s *upSession) AdvertisedReferences() (*packp.AdvRefs, error) {
-	return s.AdvertisedReferencesContext(context.TODO())
-}
-
-func (s *upSession) AdvertisedReferencesContext(ctx context.Context) (*packp.AdvRefs, error) {
-	ar := packp.NewAdvRefs()
-
-	if err := s.setSupportedCapabilities(ar.Capabilities); err != nil {
-		return nil, err
-	}
-
-	s.caps = ar.Capabilities
-
-	if err := setReferences(s.storer, ar); err != nil {
-		return nil, err
-	}
-
-	if err := setHEAD(s.storer, ar); err != nil {
-		return nil, err
-	}
-
-	if s.asClient && len(ar.References) == 0 {
-		return nil, transport.ErrEmptyRemoteRepository
-	}
-
-	return ar, nil
-}
-
-func (s *upSession) UploadPack(ctx context.Context, req *packp.UploadPackRequest) (*packp.UploadPackResponse, error) {
-	if req.IsEmpty() {
-		return nil, transport.ErrEmptyUploadPackRequest
-	}
-
-	if err := req.Validate(); err != nil {
-		return nil, err
-	}
-
-	if s.caps == nil {
-		s.caps = capability.NewList()
-		if err := s.setSupportedCapabilities(s.caps); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := s.checkSupportedCapabilities(req.Capabilities); err != nil {
-		return nil, err
-	}
-
-	s.caps = req.Capabilities
-
-	if len(req.Shallows) > 0 {
-		return nil, fmt.Errorf("shallow not supported")
-	}
-
-	objs, err := s.objectsToUpload(req)
-	if err != nil {
-		return nil, err
-	}
-
-	pr, pw := io.Pipe()
-	e := packfile.NewEncoder(pw, s.storer, false)
-	go func() {
-		// TODO: plumb through a pack window.
-		_, err := e.Encode(objs, 10)
-		pw.CloseWithError(err)
-	}()
-
-	return packp.NewUploadPackResponseWithPackfile(req,
-		ioutil.NewContextReadCloser(ctx, pr),
-	), nil
-}
-
-func (s *upSession) objectsToUpload(req *packp.UploadPackRequest) ([]plumbing.Hash, error) {
-	haves, err := revlist.Objects(s.storer, req.Haves, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return revlist.Objects(s.storer, req.Wants, haves)
-}
-
-func (*upSession) setSupportedCapabilities(c *capability.List) error {
-	if err := c.Set(capability.Agent, capability.DefaultAgent()); err != nil {
-		return err
-	}
-
-	if err := c.Set(capability.OFSDelta); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type rpSession struct {
-	session
-	cmdStatus map[plumbing.ReferenceName]error
-	firstErr  error
-	unpackErr error
-}
-
-func (s *rpSession) AdvertisedReferences() (*packp.AdvRefs, error) {
-	return s.AdvertisedReferencesContext(context.TODO())
-}
-
-func (s *rpSession) AdvertisedReferencesContext(ctx context.Context) (*packp.AdvRefs, error) {
-	ar := packp.NewAdvRefs()
-
-	if err := s.setSupportedCapabilities(ar.Capabilities); err != nil {
-		return nil, err
-	}
-
-	s.caps = ar.Capabilities
-
-	if err := setReferences(s.storer, ar); err != nil {
-		return nil, err
-	}
-
-	if err := setHEAD(s.storer, ar); err != nil {
-		return nil, err
-	}
-
-	return ar, nil
-}
-
-var (
-	ErrUpdateReference = errors.New("failed to update ref")
-)
-
-func (s *rpSession) ReceivePack(ctx context.Context, req *packp.ReferenceUpdateRequest) (*packp.ReportStatus, error) {
-	if s.caps == nil {
-		s.caps = capability.NewList()
-		if err := s.setSupportedCapabilities(s.caps); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := s.checkSupportedCapabilities(req.Capabilities); err != nil {
-		return nil, err
-	}
-
-	s.caps = req.Capabilities
-
-	//TODO: Implement 'atomic' update of references.
-
-	if req.Packfile != nil {
-		r := ioutil.NewContextReadCloser(ctx, req.Packfile)
-		if err := s.writePackfile(r); err != nil {
-			s.unpackErr = err
-			s.firstErr = err
-			return s.reportStatus(), err
-		}
-	}
-
-	s.updateReferences(req)
-	return s.reportStatus(), s.firstErr
-}
-
-func (s *rpSession) updateReferences(req *packp.ReferenceUpdateRequest) {
-	for _, cmd := range req.Commands {
-		exists, err := referenceExists(s.storer, cmd.Name)
-		if err != nil {
-			s.setStatus(cmd.Name, err)
-			continue
-		}
-
-		switch cmd.Action() {
-		case packp.Create:
-			if exists {
-				s.setStatus(cmd.Name, ErrUpdateReference)
-				continue
-			}
-
-			ref := plumbing.NewHashReference(cmd.Name, cmd.New)
-			err := s.storer.SetReference(ref)
-			s.setStatus(cmd.Name, err)
-		case packp.Delete:
-			if !exists {
-				s.setStatus(cmd.Name, ErrUpdateReference)
-				continue
-			}
-
-			err := s.storer.RemoveReference(cmd.Name)
-			s.setStatus(cmd.Name, err)
-		case packp.Update:
-			if !exists {
-				s.setStatus(cmd.Name, ErrUpdateReference)
-				continue
-			}
-
-			ref := plumbing.NewHashReference(cmd.Name, cmd.New)
-			err := s.storer.SetReference(ref)
-			s.setStatus(cmd.Name, err)
-		}
-	}
-}
-
-func (s *rpSession) writePackfile(r io.ReadCloser) error {
-	if r == nil {
-		return nil
-	}
-
-	if err := packfile.UpdateObjectStorage(s.storer, r); err != nil {
-		_ = r.Close()
-		return err
-	}
-
-	return r.Close()
-}
-
-func (s *rpSession) setStatus(ref plumbing.ReferenceName, err error) {
-	s.cmdStatus[ref] = err
-	if s.firstErr == nil && err != nil {
-		s.firstErr = err
-	}
-}
-
-func (s *rpSession) reportStatus() *packp.ReportStatus {
-	if !s.caps.Supports(capability.ReportStatus) {
-		return nil
-	}
-
-	rs := packp.NewReportStatus()
-	rs.UnpackStatus = "ok"
-
-	if s.unpackErr != nil {
-		rs.UnpackStatus = s.unpackErr.Error()
-	}
-
-	if s.cmdStatus == nil {
-		return rs
-	}
-
-	for ref, err := range s.cmdStatus {
-		msg := "ok"
-		if err != nil {
-			msg = err.Error()
-		}
-		status := &packp.CommandStatus{
-			ReferenceName: ref,
-			Status:        msg,
-		}
-		rs.CommandStatuses = append(rs.CommandStatuses, status)
-	}
-
-	return rs
-}
-
-func (*rpSession) setSupportedCapabilities(c *capability.List) error {
-	if err := c.Set(capability.Agent, capability.DefaultAgent()); err != nil {
-		return err
-	}
-
-	if err := c.Set(capability.OFSDelta); err != nil {
-		return err
-	}
-
-	if err := c.Set(capability.DeleteRefs); err != nil {
-		return err
-	}
-
-	return c.Set(capability.ReportStatus)
-}
-
-func setHEAD(s storer.Storer, ar *packp.AdvRefs) error {
-	ref, err := s.Reference(plumbing.HEAD)
-	if err == plumbing.ErrReferenceNotFound {
-		return nil
-	}
-
-	if err != nil {
-		return err
-	}
-
-	if ref.Type() == plumbing.SymbolicReference {
-		if err := ar.AddReference(ref); err != nil {
-			return nil
-		}
-
-		ref, err = storer.ResolveReference(s, ref.Target())
-		if err == plumbing.ErrReferenceNotFound {
-			return nil
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	if ref.Type() != plumbing.HashReference {
-		return plumbing.ErrInvalidType
-	}
-
-	h := ref.Hash()
-	ar.Head = &h
-
-	return nil
-}
-
-func setReferences(s storer.Storer, ar *packp.AdvRefs) error {
-	//TODO: add peeled references.
-	iter, err := s.IterReferences()
-	if err != nil {
-		return err
-	}
-
-	return iter.ForEach(func(ref *plumbing.Reference) error {
-		if ref.Type() != plumbing.HashReference {
-			return nil
-		}
-
-		ar.References[ref.Name().String()] = ref.Hash()
-		return nil
-	})
-}
-
-func referenceExists(s storer.ReferenceStorer, n plumbing.ReferenceName) (bool, error) {
-	_, err := s.Reference(n)
-	if err == plumbing.ErrReferenceNotFound {
-		return false, nil
-	}
-
-	return err == nil, err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/ssh/auth_method.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/ssh/auth_method.go
deleted file mode 100644
index 1fbe028b2..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/ssh/auth_method.go
+++ /dev/null
@@ -1,313 +0,0 @@
-package ssh
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"os/user"
-	"path/filepath"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-
-	"github.com/skeema/knownhosts"
-	sshagent "github.com/xanzy/ssh-agent"
-	"golang.org/x/crypto/ssh"
-)
-
-const DefaultUsername = "git"
-
-// AuthMethod is the interface all auth methods for the ssh client
-// must implement. The clientConfig method returns the ssh client
-// configuration needed to establish an ssh connection.
-type AuthMethod interface {
-	transport.AuthMethod
-	// ClientConfig should return a valid ssh.ClientConfig to be used to create
-	// a connection to the SSH server.
-	ClientConfig() (*ssh.ClientConfig, error)
-}
-
-// The names of the AuthMethod implementations. To be returned by the
-// Name() method. Most git servers only allow PublicKeysName and
-// PublicKeysCallbackName.
-const (
-	KeyboardInteractiveName = "ssh-keyboard-interactive"
-	PasswordName            = "ssh-password"
-	PasswordCallbackName    = "ssh-password-callback"
-	PublicKeysName          = "ssh-public-keys"
-	PublicKeysCallbackName  = "ssh-public-key-callback"
-)
-
-// KeyboardInteractive implements AuthMethod by using a
-// prompt/response sequence controlled by the server.
-type KeyboardInteractive struct {
-	User      string
-	Challenge ssh.KeyboardInteractiveChallenge
-	HostKeyCallbackHelper
-}
-
-func (a *KeyboardInteractive) Name() string {
-	return KeyboardInteractiveName
-}
-
-func (a *KeyboardInteractive) String() string {
-	return fmt.Sprintf("user: %s, name: %s", a.User, a.Name())
-}
-
-func (a *KeyboardInteractive) ClientConfig() (*ssh.ClientConfig, error) {
-	return a.SetHostKeyCallback(&ssh.ClientConfig{
-		User: a.User,
-		Auth: []ssh.AuthMethod{
-			a.Challenge,
-		},
-	})
-}
-
-// Password implements AuthMethod by using the given password.
-type Password struct {
-	User     string
-	Password string
-	HostKeyCallbackHelper
-}
-
-func (a *Password) Name() string {
-	return PasswordName
-}
-
-func (a *Password) String() string {
-	return fmt.Sprintf("user: %s, name: %s", a.User, a.Name())
-}
-
-func (a *Password) ClientConfig() (*ssh.ClientConfig, error) {
-	return a.SetHostKeyCallback(&ssh.ClientConfig{
-		User: a.User,
-		Auth: []ssh.AuthMethod{ssh.Password(a.Password)},
-	})
-}
-
-// PasswordCallback implements AuthMethod by using a callback
-// to fetch the password.
-type PasswordCallback struct {
-	User     string
-	Callback func() (pass string, err error)
-	HostKeyCallbackHelper
-}
-
-func (a *PasswordCallback) Name() string {
-	return PasswordCallbackName
-}
-
-func (a *PasswordCallback) String() string {
-	return fmt.Sprintf("user: %s, name: %s", a.User, a.Name())
-}
-
-func (a *PasswordCallback) ClientConfig() (*ssh.ClientConfig, error) {
-	return a.SetHostKeyCallback(&ssh.ClientConfig{
-		User: a.User,
-		Auth: []ssh.AuthMethod{ssh.PasswordCallback(a.Callback)},
-	})
-}
-
-// PublicKeys implements AuthMethod by using the given key pairs.
-type PublicKeys struct {
-	User   string
-	Signer ssh.Signer
-	HostKeyCallbackHelper
-}
-
-// NewPublicKeys returns a PublicKeys from a PEM encoded private key. An
-// encryption password should be given if the pemBytes contains a password
-// encrypted PEM block otherwise password should be empty. It supports RSA
-// (PKCS#1), PKCS#8, DSA (OpenSSL), and ECDSA private keys.
-func NewPublicKeys(user string, pemBytes []byte, password string) (*PublicKeys, error) {
-	signer, err := ssh.ParsePrivateKey(pemBytes)
-	if _, ok := err.(*ssh.PassphraseMissingError); ok {
-		signer, err = ssh.ParsePrivateKeyWithPassphrase(pemBytes, []byte(password))
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &PublicKeys{User: user, Signer: signer}, nil
-}
-
-// NewPublicKeysFromFile returns a PublicKeys from a file containing a PEM
-// encoded private key. An encryption password should be given if the pemBytes
-// contains a password encrypted PEM block otherwise password should be empty.
-func NewPublicKeysFromFile(user, pemFile, password string) (*PublicKeys, error) {
-	bytes, err := os.ReadFile(pemFile)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewPublicKeys(user, bytes, password)
-}
-
-func (a *PublicKeys) Name() string {
-	return PublicKeysName
-}
-
-func (a *PublicKeys) String() string {
-	return fmt.Sprintf("user: %s, name: %s", a.User, a.Name())
-}
-
-func (a *PublicKeys) ClientConfig() (*ssh.ClientConfig, error) {
-	return a.SetHostKeyCallback(&ssh.ClientConfig{
-		User: a.User,
-		Auth: []ssh.AuthMethod{ssh.PublicKeys(a.Signer)},
-	})
-}
-
-func username() (string, error) {
-	var username string
-	if user, err := user.Current(); err == nil {
-		username = user.Username
-	} else {
-		username = os.Getenv("USER")
-	}
-
-	if username == "" {
-		return "", errors.New("failed to get username")
-	}
-
-	return username, nil
-}
-
-// PublicKeysCallback implements AuthMethod by asking a
-// ssh.agent.Agent to act as a signer.
-type PublicKeysCallback struct {
-	User     string
-	Callback func() (signers []ssh.Signer, err error)
-	HostKeyCallbackHelper
-}
-
-// NewSSHAgentAuth returns a PublicKeysCallback based on a SSH agent, it opens
-// a pipe with the SSH agent and uses the pipe as the implementer of the public
-// key callback function.
-func NewSSHAgentAuth(u string) (*PublicKeysCallback, error) {
-	var err error
-	if u == "" {
-		u, err = username()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	a, _, err := sshagent.New()
-	if err != nil {
-		return nil, fmt.Errorf("error creating SSH agent: %q", err)
-	}
-
-	return &PublicKeysCallback{
-		User:     u,
-		Callback: a.Signers,
-	}, nil
-}
-
-func (a *PublicKeysCallback) Name() string {
-	return PublicKeysCallbackName
-}
-
-func (a *PublicKeysCallback) String() string {
-	return fmt.Sprintf("user: %s, name: %s", a.User, a.Name())
-}
-
-func (a *PublicKeysCallback) ClientConfig() (*ssh.ClientConfig, error) {
-	return a.SetHostKeyCallback(&ssh.ClientConfig{
-		User: a.User,
-		Auth: []ssh.AuthMethod{ssh.PublicKeysCallback(a.Callback)},
-	})
-}
-
-// NewKnownHostsCallback returns ssh.HostKeyCallback based on a file based on a
-// known_hosts file. http://man.openbsd.org/sshd#SSH_KNOWN_HOSTS_FILE_FORMAT
-//
-// If list of files is empty, then it will be read from the SSH_KNOWN_HOSTS
-// environment variable, example:
-//
-//	/home/foo/custom_known_hosts_file:/etc/custom_known/hosts_file
-//
-// If SSH_KNOWN_HOSTS is not set the following file locations will be used:
-//
-//	~/.ssh/known_hosts
-//	/etc/ssh/ssh_known_hosts
-func NewKnownHostsCallback(files ...string) (ssh.HostKeyCallback, error) {
-	kh, err := newKnownHosts(files...)
-	return ssh.HostKeyCallback(kh), err
-}
-
-func newKnownHosts(files ...string) (knownhosts.HostKeyCallback, error) {
-	var err error
-
-	if len(files) == 0 {
-		if files, err = getDefaultKnownHostsFiles(); err != nil {
-			return nil, err
-		}
-	}
-
-	if files, err = filterKnownHostsFiles(files...); err != nil {
-		return nil, err
-	}
-
-	return knownhosts.New(files...)
-}
-
-func getDefaultKnownHostsFiles() ([]string, error) {
-	files := filepath.SplitList(os.Getenv("SSH_KNOWN_HOSTS"))
-	if len(files) != 0 {
-		return files, nil
-	}
-
-	homeDirPath, err := os.UserHomeDir()
-	if err != nil {
-		return nil, err
-	}
-
-	return []string{
-		filepath.Join(homeDirPath, "/.ssh/known_hosts"),
-		"/etc/ssh/ssh_known_hosts",
-	}, nil
-}
-
-func filterKnownHostsFiles(files ...string) ([]string, error) {
-	var out []string
-	for _, file := range files {
-		_, err := os.Stat(file)
-		if err == nil {
-			out = append(out, file)
-			continue
-		}
-
-		if !os.IsNotExist(err) {
-			return nil, err
-		}
-	}
-
-	if len(out) == 0 {
-		return nil, fmt.Errorf("unable to find any valid known_hosts file, set SSH_KNOWN_HOSTS env variable")
-	}
-
-	return out, nil
-}
-
-// HostKeyCallbackHelper is a helper that provides common functionality to
-// configure HostKeyCallback into a ssh.ClientConfig.
-type HostKeyCallbackHelper struct {
-	// HostKeyCallback is the function type used for verifying server keys.
-	// If nil default callback will be create using NewKnownHostsCallback
-	// without argument.
-	HostKeyCallback ssh.HostKeyCallback
-}
-
-// SetHostKeyCallback sets the field HostKeyCallback in the given cfg. If
-// HostKeyCallback is empty a default callback is created using
-// NewKnownHostsCallback.
-func (m *HostKeyCallbackHelper) SetHostKeyCallback(cfg *ssh.ClientConfig) (*ssh.ClientConfig, error) {
-	var err error
-	if m.HostKeyCallback == nil {
-		if m.HostKeyCallback, err = NewKnownHostsCallback(); err != nil {
-			return cfg, err
-		}
-	}
-
-	cfg.HostKeyCallback = m.HostKeyCallback
-	return cfg, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/ssh/common.go b/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/ssh/common.go
deleted file mode 100644
index d668c9aee..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/plumbing/transport/ssh/common.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Package ssh implements the SSH transport protocol.
-package ssh
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common"
-	"github.com/skeema/knownhosts"
-
-	"github.com/kevinburke/ssh_config"
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/net/proxy"
-)
-
-// DefaultClient is the default SSH client.
-var DefaultClient = NewClient(nil)
-
-// DefaultSSHConfig is the reader used to access parameters stored in the
-// system's ssh_config files. If nil all the ssh_config are ignored.
-var DefaultSSHConfig sshConfig = ssh_config.DefaultUserSettings
-
-type sshConfig interface {
-	Get(alias, key string) string
-}
-
-// NewClient creates a new SSH client with an optional *ssh.ClientConfig.
-func NewClient(config *ssh.ClientConfig) transport.Transport {
-	return common.NewClient(&runner{config: config})
-}
-
-// DefaultAuthBuilder is the function used to create a default AuthMethod, when
-// the user doesn't provide any.
-var DefaultAuthBuilder = func(user string) (AuthMethod, error) {
-	return NewSSHAgentAuth(user)
-}
-
-const DefaultPort = 22
-
-type runner struct {
-	config *ssh.ClientConfig
-}
-
-func (r *runner) Command(cmd string, ep *transport.Endpoint, auth transport.AuthMethod) (common.Command, error) {
-	c := &command{command: cmd, endpoint: ep, config: r.config}
-	if auth != nil {
-		if err := c.setAuth(auth); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := c.connect(); err != nil {
-		return nil, err
-	}
-	return c, nil
-}
-
-type command struct {
-	*ssh.Session
-	connected bool
-	command   string
-	endpoint  *transport.Endpoint
-	client    *ssh.Client
-	auth      AuthMethod
-	config    *ssh.ClientConfig
-}
-
-func (c *command) setAuth(auth transport.AuthMethod) error {
-	a, ok := auth.(AuthMethod)
-	if !ok {
-		return transport.ErrInvalidAuthMethod
-	}
-
-	c.auth = a
-	return nil
-}
-
-func (c *command) Start() error {
-	return c.Session.Start(endpointToCommand(c.command, c.endpoint))
-}
-
-// Close closes the SSH session and connection.
-func (c *command) Close() error {
-	if !c.connected {
-		return nil
-	}
-
-	c.connected = false
-
-	//XXX: If did read the full packfile, then the session might be already
-	//     closed.
-	_ = c.Session.Close()
-	err := c.client.Close()
-
-	//XXX: in go1.16+ we can use errors.Is(err, net.ErrClosed)
-	if err != nil && strings.HasSuffix(err.Error(), "use of closed network connection") {
-		return nil
-	}
-
-	return err
-}
-
-// connect connects to the SSH server, unless a AuthMethod was set with
-// SetAuth method, by default uses an auth method based on PublicKeysCallback,
-// it connects to a SSH agent, using the address stored in the SSH_AUTH_SOCK
-// environment var.
-func (c *command) connect() error {
-	if c.connected {
-		return transport.ErrAlreadyConnected
-	}
-
-	if c.auth == nil {
-		if err := c.setAuthFromEndpoint(); err != nil {
-			return err
-		}
-	}
-
-	var err error
-	config, err := c.auth.ClientConfig()
-	if err != nil {
-		return err
-	}
-	hostWithPort := c.getHostWithPort()
-	if config.HostKeyCallback == nil {
-		kh, err := newKnownHosts()
-		if err != nil {
-			return err
-		}
-		config.HostKeyCallback = kh.HostKeyCallback()
-		config.HostKeyAlgorithms = kh.HostKeyAlgorithms(hostWithPort)
-	} else if len(config.HostKeyAlgorithms) == 0 {
-		// Set the HostKeyAlgorithms based on HostKeyCallback.
-		// For background see https://github.com/go-git/go-git/issues/411 as well as
-		// https://github.com/golang/go/issues/29286 for root cause.
-		config.HostKeyAlgorithms = knownhosts.HostKeyAlgorithms(config.HostKeyCallback, hostWithPort)
-	}
-
-	overrideConfig(c.config, config)
-
-	c.client, err = dial("tcp", hostWithPort, c.endpoint.Proxy, config)
-	if err != nil {
-		return err
-	}
-
-	c.Session, err = c.client.NewSession()
-	if err != nil {
-		_ = c.client.Close()
-		return err
-	}
-
-	c.connected = true
-	return nil
-}
-
-func dial(network, addr string, proxyOpts transport.ProxyOptions, config *ssh.ClientConfig) (*ssh.Client, error) {
-	var (
-		ctx    = context.Background()
-		cancel context.CancelFunc
-	)
-	if config.Timeout > 0 {
-		ctx, cancel = context.WithTimeout(ctx, config.Timeout)
-	} else {
-		ctx, cancel = context.WithCancel(ctx)
-	}
-	defer cancel()
-
-	var conn net.Conn
-	var dialErr error
-
-	if proxyOpts.URL != "" {
-		proxyUrl, err := proxyOpts.FullURL()
-		if err != nil {
-			return nil, err
-		}
-		dialer, err := proxy.FromURL(proxyUrl, proxy.Direct)
-		if err != nil {
-			return nil, err
-		}
-
-		// Try to use a ContextDialer, but fall back to a Dialer if that goes south.
-		ctxDialer, ok := dialer.(proxy.ContextDialer)
-		if !ok {
-			return nil, fmt.Errorf("expected ssh proxy dialer to be of type %s; got %s",
-				reflect.TypeOf(ctxDialer), reflect.TypeOf(dialer))
-		}
-		conn, dialErr = ctxDialer.DialContext(ctx, "tcp", addr)
-	} else {
-		conn, dialErr = proxy.Dial(ctx, network, addr)
-	}
-	if dialErr != nil {
-		return nil, dialErr
-	}
-
-	c, chans, reqs, err := ssh.NewClientConn(conn, addr, config)
-	if err != nil {
-		return nil, err
-	}
-	return ssh.NewClient(c, chans, reqs), nil
-}
-
-func (c *command) getHostWithPort() string {
-	if addr, found := c.doGetHostWithPortFromSSHConfig(); found {
-		return addr
-	}
-
-	host := c.endpoint.Host
-	port := c.endpoint.Port
-	if port <= 0 {
-		port = DefaultPort
-	}
-
-	return net.JoinHostPort(host, strconv.Itoa(port))
-}
-
-func (c *command) doGetHostWithPortFromSSHConfig() (addr string, found bool) {
-	if DefaultSSHConfig == nil {
-		return
-	}
-
-	host := c.endpoint.Host
-	port := c.endpoint.Port
-
-	configHost := DefaultSSHConfig.Get(c.endpoint.Host, "Hostname")
-	if configHost != "" {
-		host = configHost
-		found = true
-	}
-
-	if !found {
-		return
-	}
-
-	configPort := DefaultSSHConfig.Get(c.endpoint.Host, "Port")
-	if configPort != "" {
-		if i, err := strconv.Atoi(configPort); err == nil {
-			port = i
-		}
-	}
-
-	addr = net.JoinHostPort(host, strconv.Itoa(port))
-	return
-}
-
-func (c *command) setAuthFromEndpoint() error {
-	var err error
-	c.auth, err = DefaultAuthBuilder(c.endpoint.User)
-	return err
-}
-
-func endpointToCommand(cmd string, ep *transport.Endpoint) string {
-	return fmt.Sprintf("%s '%s'", cmd, ep.Path)
-}
-
-func overrideConfig(overrides *ssh.ClientConfig, c *ssh.ClientConfig) {
-	if overrides == nil {
-		return
-	}
-
-	t := reflect.TypeOf(*c)
-	vc := reflect.ValueOf(c).Elem()
-	vo := reflect.ValueOf(overrides).Elem()
-
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		vcf := vc.FieldByName(f.Name)
-		vof := vo.FieldByName(f.Name)
-		vcf.Set(vof)
-	}
-
-	*c = vc.Interface().(ssh.ClientConfig)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/prune.go b/vendor/github.com/jesseduffield/go-git/v5/prune.go
deleted file mode 100644
index d8772de6f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/prune.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package git
-
-import (
-	"errors"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-type PruneHandler func(unreferencedObjectHash plumbing.Hash) error
-type PruneOptions struct {
-	// OnlyObjectsOlderThan if set to non-zero value
-	// selects only objects older than the time provided.
-	OnlyObjectsOlderThan time.Time
-	// Handler is called on matching objects
-	Handler PruneHandler
-}
-
-var ErrLooseObjectsNotSupported = errors.New("loose objects not supported")
-
-// DeleteObject deletes an object from a repository.
-// The type conveniently matches PruneHandler.
-func (r *Repository) DeleteObject(hash plumbing.Hash) error {
-	los, ok := r.Storer.(storer.LooseObjectStorer)
-	if !ok {
-		return ErrLooseObjectsNotSupported
-	}
-
-	return los.DeleteLooseObject(hash)
-}
-
-func (r *Repository) Prune(opt PruneOptions) error {
-	los, ok := r.Storer.(storer.LooseObjectStorer)
-	if !ok {
-		return ErrLooseObjectsNotSupported
-	}
-
-	pw := newObjectWalker(r.Storer)
-	err := pw.walkAllRefs()
-	if err != nil {
-		return err
-	}
-	// Now walk all (loose) objects in storage.
-	return los.ForEachObjectHash(func(hash plumbing.Hash) error {
-		// Get out if we have seen this object.
-		if pw.isSeen(hash) {
-			return nil
-		}
-		// Otherwise it is a candidate for pruning.
-		// Check out for too new objects next.
-		if !opt.OnlyObjectsOlderThan.IsZero() {
-			// Errors here are non-fatal. The object may be e.g. packed.
-			// Or concurrently deleted. Skip such objects.
-			t, err := los.LooseObjectTime(hash)
-			if err != nil {
-				return nil
-			}
-			// Skip too new objects.
-			if !t.Before(opt.OnlyObjectsOlderThan) {
-				return nil
-			}
-		}
-		return opt.Handler(hash)
-	})
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/remote.go b/vendor/github.com/jesseduffield/go-git/v5/remote.go
deleted file mode 100644
index 5761089f4..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/remote.go
+++ /dev/null
@@ -1,1535 +0,0 @@
-package git
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/go-git/go-billy/v5/osfs"
-
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/internal/url"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/packfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability"
-	"github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband"
-	"github.com/jesseduffield/go-git/v5/plumbing/revlist"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport/client"
-	"github.com/jesseduffield/go-git/v5/storage"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem"
-	"github.com/jesseduffield/go-git/v5/storage/memory"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-var (
-	NoErrAlreadyUpToDate     = errors.New("already up-to-date")
-	ErrDeleteRefNotSupported = errors.New("server does not support delete-refs")
-	ErrForceNeeded           = errors.New("some refs were not updated")
-	ErrExactSHA1NotSupported = errors.New("server does not support exact SHA1 refspec")
-	ErrEmptyUrls             = errors.New("URLs cannot be empty")
-)
-
-type NoMatchingRefSpecError struct {
-	refSpec config.RefSpec
-}
-
-func (e NoMatchingRefSpecError) Error() string {
-	return fmt.Sprintf("couldn't find remote ref %q", e.refSpec.Src())
-}
-
-func (e NoMatchingRefSpecError) Is(target error) bool {
-	_, ok := target.(NoMatchingRefSpecError)
-	return ok
-}
-
-const (
-	// This describes the maximum number of commits to walk when
-	// computing the haves to send to a server, for each ref in the
-	// repo containing this remote, when not using the multi-ack
-	// protocol.  Setting this to 0 means there is no limit.
-	maxHavesToVisitPerRef = 100
-
-	// peeledSuffix is the suffix used to build peeled reference names.
-	peeledSuffix = "^{}"
-)
-
-// Remote represents a connection to a remote repository.
-type Remote struct {
-	c *config.RemoteConfig
-	s storage.Storer
-}
-
-// NewRemote creates a new Remote.
-// The intended purpose is to use the Remote for tasks such as listing remote references (like using git ls-remote).
-// Otherwise Remotes should be created via the use of a Repository.
-func NewRemote(s storage.Storer, c *config.RemoteConfig) *Remote {
-	return &Remote{s: s, c: c}
-}
-
-// Config returns the RemoteConfig object used to instantiate this Remote.
-func (r *Remote) Config() *config.RemoteConfig {
-	return r.c
-}
-
-func (r *Remote) String() string {
-	var fetch, push string
-	if len(r.c.URLs) > 0 {
-		fetch = r.c.URLs[0]
-		push = r.c.URLs[len(r.c.URLs)-1]
-	}
-
-	return fmt.Sprintf("%s\t%s (fetch)\n%[1]s\t%[3]s (push)", r.c.Name, fetch, push)
-}
-
-// Push performs a push to the remote. Returns NoErrAlreadyUpToDate if the
-// remote was already up-to-date.
-func (r *Remote) Push(o *PushOptions) error {
-	return r.PushContext(context.Background(), o)
-}
-
-// PushContext performs a push to the remote. Returns NoErrAlreadyUpToDate if
-// the remote was already up-to-date.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (r *Remote) PushContext(ctx context.Context, o *PushOptions) (err error) {
-	if err := o.Validate(); err != nil {
-		return err
-	}
-
-	if o.RemoteName != r.c.Name {
-		return fmt.Errorf("remote names don't match: %s != %s", o.RemoteName, r.c.Name)
-	}
-
-	if o.RemoteURL == "" && len(r.c.URLs) > 0 {
-		o.RemoteURL = r.c.URLs[len(r.c.URLs)-1]
-	}
-
-	s, err := newSendPackSession(o.RemoteURL, o.Auth, o.InsecureSkipTLS, o.CABundle, o.ProxyOptions)
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(s, &err)
-
-	ar, err := s.AdvertisedReferencesContext(ctx)
-	if err != nil {
-		return err
-	}
-
-	remoteRefs, err := ar.AllReferences()
-	if err != nil {
-		return err
-	}
-
-	if err := r.checkRequireRemoteRefs(o.RequireRemoteRefs, remoteRefs); err != nil {
-		return err
-	}
-
-	isDelete := false
-	allDelete := true
-	for _, rs := range o.RefSpecs {
-		if rs.IsDelete() {
-			isDelete = true
-		} else {
-			allDelete = false
-		}
-		if isDelete && !allDelete {
-			break
-		}
-	}
-
-	if isDelete && !ar.Capabilities.Supports(capability.DeleteRefs) {
-		return ErrDeleteRefNotSupported
-	}
-
-	if o.Force {
-		for i := 0; i < len(o.RefSpecs); i++ {
-			rs := &o.RefSpecs[i]
-			if !rs.IsForceUpdate() && !rs.IsDelete() {
-				o.RefSpecs[i] = config.RefSpec("+" + rs.String())
-			}
-		}
-	}
-
-	localRefs, err := r.references()
-	if err != nil {
-		return err
-	}
-
-	req, err := r.newReferenceUpdateRequest(o, localRefs, remoteRefs, ar)
-	if err != nil {
-		return err
-	}
-
-	if len(req.Commands) == 0 {
-		return NoErrAlreadyUpToDate
-	}
-
-	objects := objectsToPush(req.Commands)
-
-	haves, err := referencesToHashes(remoteRefs)
-	if err != nil {
-		return err
-	}
-
-	stop, err := r.s.Shallow()
-	if err != nil {
-		return err
-	}
-
-	// if we have shallow we should include this as part of the objects that
-	// we are aware.
-	haves = append(haves, stop...)
-
-	var hashesToPush []plumbing.Hash
-	// Avoid the expensive revlist operation if we're only doing deletes.
-	if !allDelete {
-		if url.IsLocalEndpoint(o.RemoteURL) {
-			// If we're are pushing to a local repo, it might be much
-			// faster to use a local storage layer to get the commits
-			// to ignore, when calculating the object revlist.
-			localStorer := filesystem.NewStorage(
-				osfs.New(o.RemoteURL), cache.NewObjectLRUDefault())
-			hashesToPush, err = revlist.ObjectsWithStorageForIgnores(
-				r.s, localStorer, objects, haves)
-		} else {
-			hashesToPush, err = revlist.Objects(r.s, objects, haves)
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	if len(hashesToPush) == 0 {
-		allDelete = true
-		for _, command := range req.Commands {
-			if command.Action() != packp.Delete {
-				allDelete = false
-				break
-			}
-		}
-	}
-
-	rs, err := pushHashes(ctx, s, r.s, req, hashesToPush, r.useRefDeltas(ar), allDelete)
-	if err != nil {
-		return err
-	}
-
-	if rs != nil {
-		if err = rs.Error(); err != nil {
-			return err
-		}
-	}
-
-	return r.updateRemoteReferenceStorage(req)
-}
-
-func (r *Remote) useRefDeltas(ar *packp.AdvRefs) bool {
-	return !ar.Capabilities.Supports(capability.OFSDelta)
-}
-
-func (r *Remote) addReachableTags(localRefs []*plumbing.Reference, remoteRefs storer.ReferenceStorer, req *packp.ReferenceUpdateRequest) error {
-	tags := make(map[plumbing.Reference]struct{})
-	// get a list of all tags locally
-	for _, ref := range localRefs {
-		if strings.HasPrefix(string(ref.Name()), "refs/tags") {
-			tags[*ref] = struct{}{}
-		}
-	}
-
-	remoteRefIter, err := remoteRefs.IterReferences()
-	if err != nil {
-		return err
-	}
-
-	// remove any that are already on the remote
-	if err := remoteRefIter.ForEach(func(reference *plumbing.Reference) error {
-		delete(tags, *reference)
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	for tag := range tags {
-		tagObject, err := object.GetObject(r.s, tag.Hash())
-		var tagCommit *object.Commit
-		if err != nil {
-			return fmt.Errorf("get tag object: %w", err)
-		}
-
-		if tagObject.Type() != plumbing.TagObject {
-			continue
-		}
-
-		annotatedTag, ok := tagObject.(*object.Tag)
-		if !ok {
-			return errors.New("could not get annotated tag object")
-		}
-
-		tagCommit, err = object.GetCommit(r.s, annotatedTag.Target)
-		if err != nil {
-			return fmt.Errorf("get annotated tag commit: %w", err)
-		}
-
-		// only include tags that are reachable from one of the refs
-		// already being pushed
-		for _, cmd := range req.Commands {
-			if tag.Name() == cmd.Name {
-				continue
-			}
-
-			if strings.HasPrefix(cmd.Name.String(), "refs/tags") {
-				continue
-			}
-
-			c, err := object.GetCommit(r.s, cmd.New)
-			if err != nil {
-				return fmt.Errorf("get commit %v: %w", cmd.Name, err)
-			}
-
-			if isAncestor, err := tagCommit.IsAncestor(c); err == nil && isAncestor {
-				req.Commands = append(req.Commands, &packp.Command{Name: tag.Name(), New: tag.Hash()})
-			}
-		}
-	}
-
-	return nil
-}
-
-func (r *Remote) newReferenceUpdateRequest(
-	o *PushOptions,
-	localRefs []*plumbing.Reference,
-	remoteRefs storer.ReferenceStorer,
-	ar *packp.AdvRefs,
-) (*packp.ReferenceUpdateRequest, error) {
-	req := packp.NewReferenceUpdateRequestFromCapabilities(ar.Capabilities)
-
-	if o.Progress != nil {
-		req.Progress = o.Progress
-		if ar.Capabilities.Supports(capability.Sideband64k) {
-			_ = req.Capabilities.Set(capability.Sideband64k)
-		} else if ar.Capabilities.Supports(capability.Sideband) {
-			_ = req.Capabilities.Set(capability.Sideband)
-		}
-	}
-
-	if ar.Capabilities.Supports(capability.PushOptions) {
-		_ = req.Capabilities.Set(capability.PushOptions)
-		for k, v := range o.Options {
-			req.Options = append(req.Options, &packp.Option{Key: k, Value: v})
-		}
-	}
-
-	if o.Atomic && ar.Capabilities.Supports(capability.Atomic) {
-		_ = req.Capabilities.Set(capability.Atomic)
-	}
-
-	if err := r.addReferencesToUpdate(o.RefSpecs, localRefs, remoteRefs, req, o.Prune, o.ForceWithLease); err != nil {
-
-		return nil, err
-	}
-
-	if o.FollowTags {
-		if err := r.addReachableTags(localRefs, remoteRefs, req); err != nil {
-			return nil, err
-		}
-	}
-
-	return req, nil
-}
-
-func (r *Remote) updateRemoteReferenceStorage(
-	req *packp.ReferenceUpdateRequest,
-) error {
-
-	for _, spec := range r.c.Fetch {
-		for _, c := range req.Commands {
-			if !spec.Match(c.Name) {
-				continue
-			}
-
-			local := spec.Dst(c.Name)
-			ref := plumbing.NewHashReference(local, c.New)
-			switch c.Action() {
-			case packp.Create, packp.Update:
-				if err := r.s.SetReference(ref); err != nil {
-					return err
-				}
-			case packp.Delete:
-				if err := r.s.RemoveReference(local); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-// FetchContext fetches references along with the objects necessary to complete
-// their histories.
-//
-// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
-// no changes to be fetched, or an error.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (r *Remote) FetchContext(ctx context.Context, o *FetchOptions) error {
-	_, err := r.fetch(ctx, o)
-	return err
-}
-
-// Fetch fetches references along with the objects necessary to complete their
-// histories.
-//
-// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
-// no changes to be fetched, or an error.
-func (r *Remote) Fetch(o *FetchOptions) error {
-	return r.FetchContext(context.Background(), o)
-}
-
-func (r *Remote) fetch(ctx context.Context, o *FetchOptions) (sto storer.ReferenceStorer, err error) {
-	if o.RemoteName == "" {
-		o.RemoteName = r.c.Name
-	}
-
-	if err = o.Validate(); err != nil {
-		return nil, err
-	}
-
-	if len(o.RefSpecs) == 0 {
-		o.RefSpecs = r.c.Fetch
-	}
-
-	if o.RemoteURL == "" {
-		o.RemoteURL = r.c.URLs[0]
-	}
-
-	s, err := newUploadPackSession(o.RemoteURL, o.Auth, o.InsecureSkipTLS, o.CABundle, o.ProxyOptions)
-	if err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(s, &err)
-
-	ar, err := s.AdvertisedReferencesContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := r.newUploadPackRequest(o, ar)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := r.isSupportedRefSpec(o.RefSpecs, ar); err != nil {
-		return nil, err
-	}
-
-	remoteRefs, err := ar.AllReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	localRefs, err := r.references()
-	if err != nil {
-		return nil, err
-	}
-
-	refs, specToRefs, err := calculateRefs(o.RefSpecs, remoteRefs, o.Tags)
-	if err != nil {
-		return nil, err
-	}
-
-	if !req.Depth.IsZero() {
-		req.Shallows, err = r.s.Shallow()
-		if err != nil {
-			return nil, fmt.Errorf("existing checkout is not shallow")
-		}
-	}
-
-	req.Wants, err = getWants(r.s, refs, o.Depth)
-	if len(req.Wants) > 0 {
-		req.Haves, err = getHaves(localRefs, remoteRefs, r.s, o.Depth)
-		if err != nil {
-			return nil, err
-		}
-
-		if err = r.fetchPack(ctx, o, s, req); err != nil {
-			return nil, err
-		}
-	}
-
-	var updatedPrune bool
-	if o.Prune {
-		updatedPrune, err = r.pruneRemotes(o.RefSpecs, localRefs, remoteRefs)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	updated, err := r.updateLocalReferenceStorage(o.RefSpecs, refs, remoteRefs, specToRefs, o.Tags, o.Force)
-	if err != nil {
-		return nil, err
-	}
-
-	if !updated {
-		updated, err = depthChanged(req.Shallows, r.s)
-		if err != nil {
-			return nil, fmt.Errorf("error checking depth change: %v", err)
-		}
-	}
-
-	if !updated && !updatedPrune {
-		// No references updated, but may have fetched new objects, check if we now have any of our wants
-		for _, hash := range req.Wants {
-			exists, _ := objectExists(r.s, hash)
-			if exists {
-				updated = true
-				break
-			}
-		}
-
-		if !updated {
-			return remoteRefs, NoErrAlreadyUpToDate
-		}
-	}
-
-	return remoteRefs, nil
-}
-
-func depthChanged(before []plumbing.Hash, s storage.Storer) (bool, error) {
-	after, err := s.Shallow()
-	if err != nil {
-		return false, err
-	}
-
-	if len(before) != len(after) {
-		return true, nil
-	}
-
-	bm := make(map[plumbing.Hash]bool, len(before))
-	for _, b := range before {
-		bm[b] = true
-	}
-	for _, a := range after {
-		if _, ok := bm[a]; !ok {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
-func newUploadPackSession(url string, auth transport.AuthMethod, insecure bool, cabundle []byte, proxyOpts transport.ProxyOptions) (transport.UploadPackSession, error) {
-	c, ep, err := newClient(url, insecure, cabundle, proxyOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.NewUploadPackSession(ep, auth)
-}
-
-func newSendPackSession(url string, auth transport.AuthMethod, insecure bool, cabundle []byte, proxyOpts transport.ProxyOptions) (transport.ReceivePackSession, error) {
-	c, ep, err := newClient(url, insecure, cabundle, proxyOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.NewReceivePackSession(ep, auth)
-}
-
-func newClient(url string, insecure bool, cabundle []byte, proxyOpts transport.ProxyOptions) (transport.Transport, *transport.Endpoint, error) {
-	ep, err := transport.NewEndpoint(url)
-	if err != nil {
-		return nil, nil, err
-	}
-	ep.InsecureSkipTLS = insecure
-	ep.CaBundle = cabundle
-	ep.Proxy = proxyOpts
-
-	c, err := client.NewClient(ep)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return c, ep, err
-}
-
-func (r *Remote) fetchPack(ctx context.Context, o *FetchOptions, s transport.UploadPackSession,
-	req *packp.UploadPackRequest) (err error) {
-
-	reader, err := s.UploadPack(ctx, req)
-	if err != nil {
-		if errors.Is(err, transport.ErrEmptyUploadPackRequest) {
-			// XXX: no packfile provided, everything is up-to-date.
-			return nil
-		}
-		return err
-	}
-
-	defer ioutil.CheckClose(reader, &err)
-
-	if err = r.updateShallow(o, reader); err != nil {
-		return err
-	}
-
-	if err = packfile.UpdateObjectStorage(r.s,
-		buildSidebandIfSupported(req.Capabilities, reader, o.Progress),
-	); err != nil {
-		return err
-	}
-
-	return err
-}
-
-func (r *Remote) pruneRemotes(specs []config.RefSpec, localRefs []*plumbing.Reference, remoteRefs memory.ReferenceStorage) (bool, error) {
-	var updatedPrune bool
-	for _, spec := range specs {
-		rev := spec.Reverse()
-		for _, ref := range localRefs {
-			if !rev.Match(ref.Name()) {
-				continue
-			}
-			_, err := remoteRefs.Reference(rev.Dst(ref.Name()))
-			if errors.Is(err, plumbing.ErrReferenceNotFound) {
-				updatedPrune = true
-				err := r.s.RemoveReference(ref.Name())
-				if err != nil {
-					return false, err
-				}
-			}
-		}
-	}
-	return updatedPrune, nil
-}
-
-func (r *Remote) addReferencesToUpdate(
-	refspecs []config.RefSpec,
-	localRefs []*plumbing.Reference,
-	remoteRefs storer.ReferenceStorer,
-	req *packp.ReferenceUpdateRequest,
-	prune bool,
-	forceWithLease *ForceWithLease,
-) error {
-	// This references dictionary will be used to search references by name.
-	refsDict := make(map[string]*plumbing.Reference)
-	for _, ref := range localRefs {
-		refsDict[ref.Name().String()] = ref
-	}
-
-	for _, rs := range refspecs {
-		if rs.IsDelete() {
-			if err := r.deleteReferences(rs, remoteRefs, refsDict, req, false); err != nil {
-				return err
-			}
-		} else {
-			err := r.addOrUpdateReferences(rs, localRefs, refsDict, remoteRefs, req, forceWithLease)
-			if err != nil {
-				return err
-			}
-
-			if prune {
-				if err := r.deleteReferences(rs, remoteRefs, refsDict, req, true); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (r *Remote) addOrUpdateReferences(
-	rs config.RefSpec,
-	localRefs []*plumbing.Reference,
-	refsDict map[string]*plumbing.Reference,
-	remoteRefs storer.ReferenceStorer,
-	req *packp.ReferenceUpdateRequest,
-	forceWithLease *ForceWithLease,
-) error {
-	// If it is not a wildcard refspec we can directly search for the reference
-	// in the references dictionary.
-	if !rs.IsWildcard() {
-		ref, ok := refsDict[rs.Src()]
-		if !ok {
-			commit, err := object.GetCommit(r.s, plumbing.NewHash(rs.Src()))
-			if err == nil {
-				return r.addCommit(rs, remoteRefs, commit.Hash, req)
-			}
-			return nil
-		}
-
-		return r.addReferenceIfRefSpecMatches(rs, remoteRefs, ref, req, forceWithLease)
-	}
-
-	for _, ref := range localRefs {
-		err := r.addReferenceIfRefSpecMatches(rs, remoteRefs, ref, req, forceWithLease)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (r *Remote) deleteReferences(rs config.RefSpec,
-	remoteRefs storer.ReferenceStorer,
-	refsDict map[string]*plumbing.Reference,
-	req *packp.ReferenceUpdateRequest,
-	prune bool) error {
-	iter, err := remoteRefs.IterReferences()
-	if err != nil {
-		return err
-	}
-
-	return iter.ForEach(func(ref *plumbing.Reference) error {
-		if ref.Type() != plumbing.HashReference {
-			return nil
-		}
-
-		if prune {
-			rs := rs.Reverse()
-			if !rs.Match(ref.Name()) {
-				return nil
-			}
-
-			if _, ok := refsDict[rs.Dst(ref.Name()).String()]; ok {
-				return nil
-			}
-		} else if rs.Dst("") != ref.Name() {
-			return nil
-		}
-
-		cmd := &packp.Command{
-			Name: ref.Name(),
-			Old:  ref.Hash(),
-			New:  plumbing.ZeroHash,
-		}
-		req.Commands = append(req.Commands, cmd)
-		return nil
-	})
-}
-
-func (r *Remote) addCommit(rs config.RefSpec,
-	remoteRefs storer.ReferenceStorer, localCommit plumbing.Hash,
-	req *packp.ReferenceUpdateRequest) error {
-
-	if rs.IsWildcard() {
-		return errors.New("can't use wildcard together with hash refspecs")
-	}
-
-	cmd := &packp.Command{
-		Name: rs.Dst(""),
-		Old:  plumbing.ZeroHash,
-		New:  localCommit,
-	}
-	remoteRef, err := remoteRefs.Reference(cmd.Name)
-	if err == nil {
-		if remoteRef.Type() != plumbing.HashReference {
-			// TODO: check actual git behavior here
-			return nil
-		}
-
-		cmd.Old = remoteRef.Hash()
-	} else if err != plumbing.ErrReferenceNotFound {
-		return err
-	}
-	if cmd.Old == cmd.New {
-		return nil
-	}
-	if !rs.IsForceUpdate() {
-		if err := checkFastForwardUpdate(r.s, remoteRefs, cmd); err != nil {
-			return err
-		}
-	}
-
-	req.Commands = append(req.Commands, cmd)
-	return nil
-}
-
-func (r *Remote) addReferenceIfRefSpecMatches(rs config.RefSpec,
-	remoteRefs storer.ReferenceStorer, localRef *plumbing.Reference,
-	req *packp.ReferenceUpdateRequest, forceWithLease *ForceWithLease) error {
-
-	if localRef.Type() != plumbing.HashReference {
-		return nil
-	}
-
-	if !rs.Match(localRef.Name()) {
-		return nil
-	}
-
-	cmd := &packp.Command{
-		Name: rs.Dst(localRef.Name()),
-		Old:  plumbing.ZeroHash,
-		New:  localRef.Hash(),
-	}
-
-	remoteRef, err := remoteRefs.Reference(cmd.Name)
-	if err == nil {
-		if remoteRef.Type() != plumbing.HashReference {
-			// TODO: check actual git behavior here
-			return nil
-		}
-
-		cmd.Old = remoteRef.Hash()
-	} else if err != plumbing.ErrReferenceNotFound {
-		return err
-	}
-
-	if cmd.Old == cmd.New {
-		return nil
-	}
-
-	if forceWithLease != nil {
-		if err = r.checkForceWithLease(localRef, cmd, forceWithLease); err != nil {
-			return err
-		}
-	} else if !rs.IsForceUpdate() {
-		if err := checkFastForwardUpdate(r.s, remoteRefs, cmd); err != nil {
-			return err
-		}
-	}
-
-	req.Commands = append(req.Commands, cmd)
-	return nil
-}
-
-func (r *Remote) checkForceWithLease(localRef *plumbing.Reference, cmd *packp.Command, forceWithLease *ForceWithLease) error {
-	remotePrefix := fmt.Sprintf("refs/remotes/%s/", r.Config().Name)
-
-	ref, err := storer.ResolveReference(
-		r.s,
-		plumbing.ReferenceName(remotePrefix+strings.Replace(localRef.Name().String(), "refs/heads/", "", -1)))
-	if err != nil {
-		return err
-	}
-
-	if forceWithLease.RefName.String() == "" || (forceWithLease.RefName == cmd.Name) {
-		expectedOID := ref.Hash()
-
-		if !forceWithLease.Hash.IsZero() {
-			expectedOID = forceWithLease.Hash
-		}
-
-		if cmd.Old != expectedOID {
-			return fmt.Errorf("non-fast-forward update: %s", cmd.Name.String())
-		}
-	}
-
-	return nil
-}
-
-func (r *Remote) references() ([]*plumbing.Reference, error) {
-	var localRefs []*plumbing.Reference
-
-	iter, err := r.s.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	for {
-		ref, err := iter.Next()
-		if err == io.EOF {
-			break
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		localRefs = append(localRefs, ref)
-	}
-
-	return localRefs, nil
-}
-
-func getRemoteRefsFromStorer(remoteRefStorer storer.ReferenceStorer) (
-	map[plumbing.Hash]bool, error) {
-	remoteRefs := map[plumbing.Hash]bool{}
-	iter, err := remoteRefStorer.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-	err = iter.ForEach(func(ref *plumbing.Reference) error {
-		if ref.Type() != plumbing.HashReference {
-			return nil
-		}
-		remoteRefs[ref.Hash()] = true
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return remoteRefs, nil
-}
-
-// getHavesFromRef populates the given `haves` map with the given
-// reference, and up to `maxHavesToVisitPerRef` ancestor commits.
-func getHavesFromRef(
-	ref *plumbing.Reference,
-	remoteRefs map[plumbing.Hash]bool,
-	s storage.Storer,
-	haves map[plumbing.Hash]bool,
-	depth int,
-) error {
-	h := ref.Hash()
-	if haves[h] {
-		return nil
-	}
-
-	commit, err := object.GetCommit(s, h)
-	if err != nil {
-		if !errors.Is(err, plumbing.ErrObjectNotFound) {
-			// Ignore the error if this isn't a commit.
-			haves[ref.Hash()] = true
-		}
-		return nil
-	}
-
-	// Until go-git supports proper commit negotiation during an
-	// upload pack request, include up to `maxHavesToVisitPerRef`
-	// commits from the history of each ref.
-	walker := object.NewCommitPreorderIter(commit, haves, nil)
-	toVisit := maxHavesToVisitPerRef
-	// But only need up to the requested depth
-	if depth > 0 && depth < maxHavesToVisitPerRef {
-		toVisit = depth
-	}
-	// It is safe to ignore any error here as we are just trying to find the references that we already have
-	// An example of a legitimate failure is we have a shallow clone and don't have the previous commit(s)
-	_ = walker.ForEach(func(c *object.Commit) error {
-		haves[c.Hash] = true
-		toVisit--
-		// If toVisit starts out at 0 (indicating there is no
-		// max), then it will be negative here and we won't stop
-		// early.
-		if toVisit == 0 || remoteRefs[c.Hash] {
-			return storer.ErrStop
-		}
-		return nil
-	})
-
-	return nil
-}
-
-func getHaves(
-	localRefs []*plumbing.Reference,
-	remoteRefStorer storer.ReferenceStorer,
-	s storage.Storer,
-	depth int,
-) ([]plumbing.Hash, error) {
-	haves := map[plumbing.Hash]bool{}
-
-	// Build a map of all the remote references, to avoid loading too
-	// many parent commits for references we know don't need to be
-	// transferred.
-	remoteRefs, err := getRemoteRefsFromStorer(remoteRefStorer)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, ref := range localRefs {
-		if haves[ref.Hash()] {
-			continue
-		}
-
-		if ref.Type() != plumbing.HashReference {
-			continue
-		}
-
-		err = getHavesFromRef(ref, remoteRefs, s, haves, depth)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	var result []plumbing.Hash
-	for h := range haves {
-		result = append(result, h)
-	}
-
-	return result, nil
-}
-
-const refspecAllTags = "+refs/tags/*:refs/tags/*"
-
-func calculateRefs(
-	spec []config.RefSpec,
-	remoteRefs storer.ReferenceStorer,
-	tagMode TagMode,
-) (memory.ReferenceStorage, [][]*plumbing.Reference, error) {
-	if tagMode == AllTags {
-		spec = append(spec, refspecAllTags)
-	}
-
-	refs := make(memory.ReferenceStorage)
-	// list of references matched for each spec
-	specToRefs := make([][]*plumbing.Reference, len(spec))
-	for i := range spec {
-		var err error
-		specToRefs[i], err = doCalculateRefs(spec[i], remoteRefs, refs)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	return refs, specToRefs, nil
-}
-
-func doCalculateRefs(
-	s config.RefSpec,
-	remoteRefs storer.ReferenceStorer,
-	refs memory.ReferenceStorage,
-) ([]*plumbing.Reference, error) {
-	var refList []*plumbing.Reference
-
-	if s.IsExactSHA1() {
-		ref := plumbing.NewHashReference(s.Dst(""), plumbing.NewHash(s.Src()))
-
-		refList = append(refList, ref)
-		return refList, refs.SetReference(ref)
-	}
-
-	var matched bool
-	onMatched := func(ref *plumbing.Reference) error {
-		if ref.Type() == plumbing.SymbolicReference {
-			target, err := storer.ResolveReference(remoteRefs, ref.Name())
-			if err != nil {
-				return err
-			}
-
-			ref = plumbing.NewHashReference(ref.Name(), target.Hash())
-		}
-
-		if ref.Type() != plumbing.HashReference {
-			return nil
-		}
-
-		matched = true
-		refList = append(refList, ref)
-		return refs.SetReference(ref)
-	}
-
-	var ret error
-	if s.IsWildcard() {
-		iter, err := remoteRefs.IterReferences()
-		if err != nil {
-			return nil, err
-		}
-		ret = iter.ForEach(func(ref *plumbing.Reference) error {
-			if !s.Match(ref.Name()) {
-				return nil
-			}
-
-			return onMatched(ref)
-		})
-	} else {
-		var resolvedRef *plumbing.Reference
-		src := s.Src()
-		resolvedRef, ret = expand_ref(remoteRefs, plumbing.ReferenceName(src))
-		if ret == nil {
-			ret = onMatched(resolvedRef)
-		}
-	}
-
-	if !matched && !s.IsWildcard() {
-		return nil, NoMatchingRefSpecError{refSpec: s}
-	}
-
-	return refList, ret
-}
-
-func getWants(localStorer storage.Storer, refs memory.ReferenceStorage, depth int) ([]plumbing.Hash, error) {
-	// If depth is anything other than 1 and the repo has shallow commits then just because we have the commit
-	// at the reference doesn't mean that we don't still need to fetch the parents
-	shallow := false
-	if depth != 1 {
-		if s, _ := localStorer.Shallow(); len(s) > 0 {
-			shallow = true
-		}
-	}
-
-	wants := map[plumbing.Hash]bool{}
-	for _, ref := range refs {
-		hash := ref.Hash()
-		exists, err := objectExists(localStorer, ref.Hash())
-		if err != nil {
-			return nil, err
-		}
-
-		if !exists || shallow {
-			wants[hash] = true
-		}
-	}
-
-	var result []plumbing.Hash
-	for h := range wants {
-		result = append(result, h)
-	}
-
-	return result, nil
-}
-
-func objectExists(s storer.EncodedObjectStorer, h plumbing.Hash) (bool, error) {
-	_, err := s.EncodedObject(plumbing.AnyObject, h)
-	if err == plumbing.ErrObjectNotFound {
-		return false, nil
-	}
-
-	return true, err
-}
-
-func checkFastForwardUpdate(s storer.EncodedObjectStorer, remoteRefs storer.ReferenceStorer, cmd *packp.Command) error {
-	if cmd.Old == plumbing.ZeroHash {
-		_, err := remoteRefs.Reference(cmd.Name)
-		if err == plumbing.ErrReferenceNotFound {
-			return nil
-		}
-
-		if err != nil {
-			return err
-		}
-
-		return fmt.Errorf("non-fast-forward update: %s", cmd.Name.String())
-	}
-
-	ff, err := isFastForward(s, cmd.Old, cmd.New, nil)
-	if err != nil {
-		return err
-	}
-
-	if !ff {
-		return fmt.Errorf("non-fast-forward update: %s", cmd.Name.String())
-	}
-
-	return nil
-}
-
-func isFastForward(s storer.EncodedObjectStorer, old, new plumbing.Hash, earliestShallow *plumbing.Hash) (bool, error) {
-	c, err := object.GetCommit(s, new)
-	if err != nil {
-		return false, err
-	}
-
-	parentsToIgnore := []plumbing.Hash{}
-	if earliestShallow != nil {
-		earliestCommit, err := object.GetCommit(s, *earliestShallow)
-		if err != nil {
-			return false, err
-		}
-
-		parentsToIgnore = earliestCommit.ParentHashes
-	}
-
-	found := false
-	// stop iterating at the earliest shallow commit, ignoring its parents
-	// note: when pull depth is smaller than the number of new changes on the remote, this fails due to missing parents.
-	//       as far as i can tell, without the commits in-between the shallow pull and the earliest shallow, there's no
-	//       real way of telling whether it will be a fast-forward merge.
-	iter := object.NewCommitPreorderIter(c, nil, parentsToIgnore)
-	err = iter.ForEach(func(c *object.Commit) error {
-		if c.Hash != old {
-			return nil
-		}
-
-		found = true
-		return storer.ErrStop
-	})
-	return found, err
-}
-
-func (r *Remote) newUploadPackRequest(o *FetchOptions,
-	ar *packp.AdvRefs) (*packp.UploadPackRequest, error) {
-
-	req := packp.NewUploadPackRequestFromCapabilities(ar.Capabilities)
-
-	if o.Depth != 0 {
-		req.Depth = packp.DepthCommits(o.Depth)
-		if err := req.Capabilities.Set(capability.Shallow); err != nil {
-			return nil, err
-		}
-	}
-
-	if o.Progress == nil && ar.Capabilities.Supports(capability.NoProgress) {
-		if err := req.Capabilities.Set(capability.NoProgress); err != nil {
-			return nil, err
-		}
-	}
-
-	isWildcard := true
-	for _, s := range o.RefSpecs {
-		if !s.IsWildcard() {
-			isWildcard = false
-			break
-		}
-	}
-
-	if isWildcard && o.Tags == TagFollowing && ar.Capabilities.Supports(capability.IncludeTag) {
-		if err := req.Capabilities.Set(capability.IncludeTag); err != nil {
-			return nil, err
-		}
-	}
-
-	return req, nil
-}
-
-func (r *Remote) isSupportedRefSpec(refs []config.RefSpec, ar *packp.AdvRefs) error {
-	var containsIsExact bool
-	for _, ref := range refs {
-		if ref.IsExactSHA1() {
-			containsIsExact = true
-		}
-	}
-
-	if !containsIsExact {
-		return nil
-	}
-
-	if ar.Capabilities.Supports(capability.AllowReachableSHA1InWant) ||
-		ar.Capabilities.Supports(capability.AllowTipSHA1InWant) {
-		return nil
-	}
-
-	return ErrExactSHA1NotSupported
-}
-
-func buildSidebandIfSupported(l *capability.List, reader io.Reader, p sideband.Progress) io.Reader {
-	var t sideband.Type
-
-	switch {
-	case l.Supports(capability.Sideband):
-		t = sideband.Sideband
-	case l.Supports(capability.Sideband64k):
-		t = sideband.Sideband64k
-	default:
-		return reader
-	}
-
-	d := sideband.NewDemuxer(t, reader)
-	d.Progress = p
-
-	return d
-}
-
-func (r *Remote) updateLocalReferenceStorage(
-	specs []config.RefSpec,
-	fetchedRefs, remoteRefs memory.ReferenceStorage,
-	specToRefs [][]*plumbing.Reference,
-	tagMode TagMode,
-	force bool,
-) (updated bool, err error) {
-	isWildcard := true
-	forceNeeded := false
-
-	for i, spec := range specs {
-		if !spec.IsWildcard() {
-			isWildcard = false
-		}
-
-		for _, ref := range specToRefs[i] {
-			if ref.Type() != plumbing.HashReference {
-				continue
-			}
-
-			localName := spec.Dst(ref.Name())
-			// If localName doesn't start with "refs/" then treat as a branch.
-			if !strings.HasPrefix(localName.String(), "refs/") {
-				localName = plumbing.NewBranchReferenceName(localName.String())
-			}
-			old, _ := storer.ResolveReference(r.s, localName)
-			new := plumbing.NewHashReference(localName, ref.Hash())
-
-			// If the ref exists locally as a non-tag and force is not
-			// specified, only update if the new ref is an ancestor of the old
-			if old != nil && !old.Name().IsTag() && !force && !spec.IsForceUpdate() {
-				ff, err := isFastForward(r.s, old.Hash(), new.Hash(), nil)
-				if err != nil {
-					return updated, err
-				}
-
-				if !ff {
-					forceNeeded = true
-					continue
-				}
-			}
-
-			refUpdated, err := checkAndUpdateReferenceStorerIfNeeded(r.s, new, old)
-			if err != nil {
-				return updated, err
-			}
-
-			if refUpdated {
-				updated = true
-			}
-		}
-	}
-
-	if tagMode == NoTags {
-		return updated, nil
-	}
-
-	tags := fetchedRefs
-	if isWildcard {
-		tags = remoteRefs
-	}
-	tagUpdated, err := r.buildFetchedTags(tags)
-	if err != nil {
-		return updated, err
-	}
-
-	if tagUpdated {
-		updated = true
-	}
-
-	if forceNeeded {
-		err = ErrForceNeeded
-	}
-
-	return
-}
-
-func (r *Remote) buildFetchedTags(refs memory.ReferenceStorage) (updated bool, err error) {
-	for _, ref := range refs {
-		if !ref.Name().IsTag() {
-			continue
-		}
-
-		_, err := r.s.EncodedObject(plumbing.AnyObject, ref.Hash())
-		if err == plumbing.ErrObjectNotFound {
-			continue
-		}
-
-		if err != nil {
-			return false, err
-		}
-
-		refUpdated, err := updateReferenceStorerIfNeeded(r.s, ref)
-		if err != nil {
-			return updated, err
-		}
-
-		if refUpdated {
-			updated = true
-		}
-	}
-
-	return
-}
-
-// List the references on the remote repository.
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects to the
-// transport operations.
-func (r *Remote) ListContext(ctx context.Context, o *ListOptions) (rfs []*plumbing.Reference, err error) {
-	return r.list(ctx, o)
-}
-
-func (r *Remote) List(o *ListOptions) (rfs []*plumbing.Reference, err error) {
-	timeout := o.Timeout
-	// Default to the old hardcoded 10s value if a timeout is not explicitly set.
-	if timeout == 0 {
-		timeout = 10
-	}
-	if timeout < 0 {
-		return nil, fmt.Errorf("invalid timeout: %d", timeout)
-	}
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
-	defer cancel()
-	return r.ListContext(ctx, o)
-}
-
-func (r *Remote) list(ctx context.Context, o *ListOptions) (rfs []*plumbing.Reference, err error) {
-	if r.c == nil || len(r.c.URLs) == 0 {
-		return nil, ErrEmptyUrls
-	}
-
-	s, err := newUploadPackSession(r.c.URLs[0], o.Auth, o.InsecureSkipTLS, o.CABundle, o.ProxyOptions)
-	if err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(s, &err)
-
-	ar, err := s.AdvertisedReferencesContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	allRefs, err := ar.AllReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	refs, err := allRefs.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	var resultRefs []*plumbing.Reference
-	if o.PeelingOption == AppendPeeled || o.PeelingOption == IgnorePeeled {
-		err = refs.ForEach(func(ref *plumbing.Reference) error {
-			resultRefs = append(resultRefs, ref)
-			return nil
-		})
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if o.PeelingOption == AppendPeeled || o.PeelingOption == OnlyPeeled {
-		for k, v := range ar.Peeled {
-			resultRefs = append(resultRefs, plumbing.NewReferenceFromStrings(k+"^{}", v.String()))
-		}
-	}
-
-	return resultRefs, nil
-}
-
-func objectsToPush(commands []*packp.Command) []plumbing.Hash {
-	objects := make([]plumbing.Hash, 0, len(commands))
-	for _, cmd := range commands {
-		if cmd.New == plumbing.ZeroHash {
-			continue
-		}
-		objects = append(objects, cmd.New)
-	}
-	return objects
-}
-
-func referencesToHashes(refs storer.ReferenceStorer) ([]plumbing.Hash, error) {
-	iter, err := refs.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	var hs []plumbing.Hash
-	err = iter.ForEach(func(ref *plumbing.Reference) error {
-		if ref.Type() != plumbing.HashReference {
-			return nil
-		}
-
-		hs = append(hs, ref.Hash())
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return hs, nil
-}
-
-func pushHashes(
-	ctx context.Context,
-	sess transport.ReceivePackSession,
-	s storage.Storer,
-	req *packp.ReferenceUpdateRequest,
-	hs []plumbing.Hash,
-	useRefDeltas bool,
-	allDelete bool,
-) (*packp.ReportStatus, error) {
-	rd, wr := io.Pipe()
-
-	config, err := s.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	// Set buffer size to 1 so the error message can be written when
-	// ReceivePack fails. Otherwise the goroutine will be blocked writing
-	// to the channel.
-	done := make(chan error, 1)
-
-	if !allDelete {
-		req.Packfile = rd
-		go func() {
-			e := packfile.NewEncoder(wr, s, useRefDeltas)
-			if _, err := e.Encode(hs, config.Pack.Window); err != nil {
-				done <- wr.CloseWithError(err)
-				return
-			}
-
-			done <- wr.Close()
-		}()
-	} else {
-		close(done)
-	}
-
-	rs, err := sess.ReceivePack(ctx, req)
-	if err != nil {
-		// close the pipe to unlock encode write
-		_ = rd.Close()
-		return nil, err
-	}
-
-	if err := <-done; err != nil {
-		return nil, err
-	}
-
-	return rs, nil
-}
-
-func (r *Remote) updateShallow(o *FetchOptions, resp *packp.UploadPackResponse) error {
-	if o.Depth == 0 || len(resp.Shallows) == 0 {
-		return nil
-	}
-
-	shallows, err := r.s.Shallow()
-	if err != nil {
-		return err
-	}
-
-outer:
-	for _, s := range resp.Shallows {
-		for _, oldS := range shallows {
-			if s == oldS {
-				continue outer
-			}
-		}
-		shallows = append(shallows, s)
-	}
-
-	return r.s.SetShallow(shallows)
-}
-
-func (r *Remote) checkRequireRemoteRefs(requires []config.RefSpec, remoteRefs storer.ReferenceStorer) error {
-	for _, require := range requires {
-		if require.IsWildcard() {
-			return fmt.Errorf("wildcards not supported in RequireRemoteRefs, got %s", require.String())
-		}
-
-		name := require.Dst("")
-		remote, err := remoteRefs.Reference(name)
-		if err != nil {
-			return fmt.Errorf("remote ref %s required to be %s but is absent", name.String(), require.Src())
-		}
-
-		var requireHash string
-		if require.IsExactSHA1() {
-			requireHash = require.Src()
-		} else {
-			target, err := storer.ResolveReference(remoteRefs, plumbing.ReferenceName(require.Src()))
-			if err != nil {
-				return fmt.Errorf("could not resolve ref %s in RequireRemoteRefs", require.Src())
-			}
-			requireHash = target.Hash().String()
-		}
-
-		if remote.Hash().String() != requireHash {
-			return fmt.Errorf("remote ref %s required to be %s but is %s", name.String(), requireHash, remote.Hash().String())
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/repository.go b/vendor/github.com/jesseduffield/go-git/v5/repository.go
deleted file mode 100644
index 92447ee70..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/repository.go
+++ /dev/null
@@ -1,1886 +0,0 @@
-package git
-
-import (
-	"bytes"
-	"context"
-	"crypto"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"dario.cat/mergo"
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/osfs"
-	"github.com/go-git/go-billy/v5/util"
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/internal/path_util"
-	"github.com/jesseduffield/go-git/v5/internal/revision"
-	"github.com/jesseduffield/go-git/v5/internal/url"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	formatcfg "github.com/jesseduffield/go-git/v5/plumbing/format/config"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/packfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/storage"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// GitDirName this is a special folder where all the git stuff is.
-const GitDirName = ".git"
-
-var (
-	// ErrBranchExists an error stating the specified branch already exists
-	ErrBranchExists = errors.New("branch already exists")
-	// ErrBranchNotFound an error stating the specified branch does not exist
-	ErrBranchNotFound = errors.New("branch not found")
-	// ErrTagExists an error stating the specified tag already exists
-	ErrTagExists = errors.New("tag already exists")
-	// ErrTagNotFound an error stating the specified tag does not exist
-	ErrTagNotFound = errors.New("tag not found")
-	// ErrFetching is returned when the packfile could not be downloaded
-	ErrFetching = errors.New("unable to fetch packfile")
-
-	ErrInvalidReference            = errors.New("invalid reference, should be a tag or a branch")
-	ErrRepositoryNotExists         = errors.New("repository does not exist")
-	ErrRepositoryIncomplete        = errors.New("repository's commondir path does not exist")
-	ErrRepositoryAlreadyExists     = errors.New("repository already exists")
-	ErrRemoteNotFound              = errors.New("remote not found")
-	ErrRemoteExists                = errors.New("remote already exists")
-	ErrAnonymousRemoteName         = errors.New("anonymous remote name must be 'anonymous'")
-	ErrWorktreeNotProvided         = errors.New("worktree should be provided")
-	ErrIsBareRepository            = errors.New("worktree not available in a bare repository")
-	ErrUnableToResolveCommit       = errors.New("unable to resolve commit")
-	ErrPackedObjectsNotSupported   = errors.New("packed objects not supported")
-	ErrSHA256NotSupported          = errors.New("go-git was not compiled with SHA256 support")
-	ErrAlternatePathNotSupported   = errors.New("alternate path must use the file scheme")
-	ErrUnsupportedMergeStrategy    = errors.New("unsupported merge strategy")
-	ErrFastForwardMergeNotPossible = errors.New("not possible to fast-forward merge changes")
-)
-
-// Repository represents a git repository
-type Repository struct {
-	Storer storage.Storer
-
-	r  map[string]*Remote
-	wt billy.Filesystem
-}
-
-type InitOptions struct {
-	// The default branch (e.g. "refs/heads/master")
-	DefaultBranch plumbing.ReferenceName
-}
-
-// Init creates an empty git repository, based on the given Storer and worktree.
-// The worktree Filesystem is optional, if nil a bare repository is created. If
-// the given storer is not empty ErrRepositoryAlreadyExists is returned
-func Init(s storage.Storer, worktree billy.Filesystem) (*Repository, error) {
-	options := InitOptions{
-		DefaultBranch: plumbing.Master,
-	}
-	return InitWithOptions(s, worktree, options)
-}
-
-func InitWithOptions(s storage.Storer, worktree billy.Filesystem, options InitOptions) (*Repository, error) {
-	if err := initStorer(s); err != nil {
-		return nil, err
-	}
-
-	if options.DefaultBranch == "" {
-		options.DefaultBranch = plumbing.Master
-	}
-
-	if err := options.DefaultBranch.Validate(); err != nil {
-		return nil, err
-	}
-
-	r := newRepository(s, worktree)
-	_, err := r.Reference(plumbing.HEAD, false)
-	switch err {
-	case plumbing.ErrReferenceNotFound:
-	case nil:
-		return nil, ErrRepositoryAlreadyExists
-	default:
-		return nil, err
-	}
-
-	h := plumbing.NewSymbolicReference(plumbing.HEAD, options.DefaultBranch)
-	if err := s.SetReference(h); err != nil {
-		return nil, err
-	}
-
-	if worktree == nil {
-		_ = r.setIsBare(true)
-		return r, nil
-	}
-
-	return r, setWorktreeAndStoragePaths(r, worktree)
-}
-
-func initStorer(s storer.Storer) error {
-	i, ok := s.(storer.Initializer)
-	if !ok {
-		return nil
-	}
-
-	return i.Init()
-}
-
-func setWorktreeAndStoragePaths(r *Repository, worktree billy.Filesystem) error {
-	type fsBased interface {
-		Filesystem() billy.Filesystem
-	}
-
-	// .git file is only created if the storage is file based and the file
-	// system is osfs.OS
-	fs, isFSBased := r.Storer.(fsBased)
-	if !isFSBased {
-		return nil
-	}
-
-	if err := createDotGitFile(worktree, fs.Filesystem()); err != nil {
-		return err
-	}
-
-	return setConfigWorktree(r, worktree, fs.Filesystem())
-}
-
-func createDotGitFile(worktree, storage billy.Filesystem) error {
-	path, err := filepath.Rel(worktree.Root(), storage.Root())
-	if err != nil {
-		path = storage.Root()
-	}
-
-	if path == GitDirName {
-		// not needed, since the folder is the default place
-		return nil
-	}
-
-	f, err := worktree.Create(GitDirName)
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-	_, err = fmt.Fprintf(f, "gitdir: %s\n", path)
-	return err
-}
-
-func setConfigWorktree(r *Repository, worktree, storage billy.Filesystem) error {
-	path, err := filepath.Rel(storage.Root(), worktree.Root())
-	if err != nil {
-		path = worktree.Root()
-	}
-
-	if path == ".." {
-		// not needed, since the folder is the default place
-		return nil
-	}
-
-	cfg, err := r.Config()
-	if err != nil {
-		return err
-	}
-
-	cfg.Core.Worktree = path
-	return r.Storer.SetConfig(cfg)
-}
-
-// Open opens a git repository using the given Storer and worktree filesystem,
-// if the given storer is complete empty ErrRepositoryNotExists is returned.
-// The worktree can be nil when the repository being opened is bare, if the
-// repository is a normal one (not bare) and worktree is nil the err
-// ErrWorktreeNotProvided is returned
-func Open(s storage.Storer, worktree billy.Filesystem) (*Repository, error) {
-	_, err := s.Reference(plumbing.HEAD)
-	if err == plumbing.ErrReferenceNotFound {
-		return nil, ErrRepositoryNotExists
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return newRepository(s, worktree), nil
-}
-
-// Clone a repository into the given Storer and worktree Filesystem with the
-// given options, if worktree is nil a bare repository is created. If the given
-// storer is not empty ErrRepositoryAlreadyExists is returned.
-func Clone(s storage.Storer, worktree billy.Filesystem, o *CloneOptions) (*Repository, error) {
-	return CloneContext(context.Background(), s, worktree, o)
-}
-
-// CloneContext a repository into the given Storer and worktree Filesystem with
-// the given options, if worktree is nil a bare repository is created. If the
-// given storer is not empty ErrRepositoryAlreadyExists is returned.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func CloneContext(
-	ctx context.Context, s storage.Storer, worktree billy.Filesystem, o *CloneOptions,
-) (*Repository, error) {
-	r, err := Init(s, worktree)
-	if err != nil {
-		return nil, err
-	}
-
-	return r, r.clone(ctx, o)
-}
-
-// PlainInit create an empty git repository at the given path. isBare defines
-// if the repository will have worktree (non-bare) or not (bare), if the path
-// is not empty ErrRepositoryAlreadyExists is returned.
-func PlainInit(path string, isBare bool) (*Repository, error) {
-	return PlainInitWithOptions(path, &PlainInitOptions{
-		Bare: isBare,
-	})
-}
-
-func PlainInitWithOptions(path string, opts *PlainInitOptions) (*Repository, error) {
-	if opts == nil {
-		opts = &PlainInitOptions{}
-	}
-
-	var wt, dot billy.Filesystem
-
-	if opts.Bare {
-		dot = osfs.New(path)
-	} else {
-		wt = osfs.New(path)
-		dot, _ = wt.Chroot(GitDirName)
-	}
-
-	s := filesystem.NewStorage(dot, cache.NewObjectLRUDefault())
-
-	r, err := InitWithOptions(s, wt, opts.InitOptions)
-	if err != nil {
-		return nil, err
-	}
-
-	cfg, err := r.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	if opts.ObjectFormat != "" {
-		if opts.ObjectFormat == formatcfg.SHA256 && hash.CryptoType != crypto.SHA256 {
-			return nil, ErrSHA256NotSupported
-		}
-
-		cfg.Core.RepositoryFormatVersion = formatcfg.Version_1
-		cfg.Extensions.ObjectFormat = opts.ObjectFormat
-	}
-
-	err = r.Storer.SetConfig(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return r, err
-}
-
-// PlainOpen opens a git repository from the given path. It detects if the
-// repository is bare or a normal one. If the path doesn't contain a valid
-// repository ErrRepositoryNotExists is returned
-func PlainOpen(path string) (*Repository, error) {
-	return PlainOpenWithOptions(path, &PlainOpenOptions{})
-}
-
-// PlainOpenWithOptions opens a git repository from the given path with specific
-// options. See PlainOpen for more info.
-func PlainOpenWithOptions(path string, o *PlainOpenOptions) (*Repository, error) {
-	dot, wt, err := dotGitToOSFilesystems(path, o.DetectDotGit)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err := dot.Stat(""); err != nil {
-		if os.IsNotExist(err) {
-			return nil, ErrRepositoryNotExists
-		}
-
-		return nil, err
-	}
-
-	var repositoryFs billy.Filesystem
-
-	if o.EnableDotGitCommonDir {
-		dotGitCommon, err := dotGitCommonDirectory(dot)
-		if err != nil {
-			return nil, err
-		}
-		repositoryFs = dotgit.NewRepositoryFilesystem(dot, dotGitCommon)
-	} else {
-		repositoryFs = dot
-	}
-
-	s := filesystem.NewStorage(repositoryFs, cache.NewObjectLRUDefault())
-
-	return Open(s, wt)
-}
-
-func dotGitToOSFilesystems(path string, detect bool) (dot, wt billy.Filesystem, err error) {
-	path, err = path_util.ReplaceTildeWithHome(path)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if path, err = filepath.Abs(path); err != nil {
-		return nil, nil, err
-	}
-
-	var fs billy.Filesystem
-	var fi os.FileInfo
-	for {
-		fs = osfs.New(path)
-
-		pathinfo, err := fs.Stat("/")
-		if !os.IsNotExist(err) {
-			if pathinfo == nil {
-				return nil, nil, err
-			}
-			if !pathinfo.IsDir() && detect {
-				fs = osfs.New(filepath.Dir(path))
-			}
-		}
-
-		fi, err = fs.Stat(GitDirName)
-		if err == nil {
-			// no error; stop
-			break
-		}
-		if !os.IsNotExist(err) {
-			// unknown error; stop
-			return nil, nil, err
-		}
-		if detect {
-			// try its parent as long as we haven't reached
-			// the root dir
-			if dir := filepath.Dir(path); dir != path {
-				path = dir
-				continue
-			}
-		}
-		// not detecting via parent dirs and the dir does not exist;
-		// stop
-		return fs, nil, nil
-	}
-
-	if fi.IsDir() {
-		dot, err = fs.Chroot(GitDirName)
-		return dot, fs, err
-	}
-
-	dot, err = dotGitFileToOSFilesystem(path, fs)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return dot, fs, nil
-}
-
-func dotGitFileToOSFilesystem(path string, fs billy.Filesystem) (bfs billy.Filesystem, err error) {
-	f, err := fs.Open(GitDirName)
-	if err != nil {
-		return nil, err
-	}
-	defer ioutil.CheckClose(f, &err)
-
-	b, err := io.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	line := string(b)
-	const prefix = "gitdir: "
-	if !strings.HasPrefix(line, prefix) {
-		return nil, fmt.Errorf(".git file has no %s prefix", prefix)
-	}
-
-	gitdir := strings.Split(line[len(prefix):], "\n")[0]
-	gitdir = strings.TrimSpace(gitdir)
-	if filepath.IsAbs(gitdir) {
-		return osfs.New(gitdir), nil
-	}
-
-	return osfs.New(fs.Join(path, gitdir)), nil
-}
-
-func dotGitCommonDirectory(fs billy.Filesystem) (commonDir billy.Filesystem, err error) {
-	f, err := fs.Open("commondir")
-	if os.IsNotExist(err) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	b, err := io.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-	if len(b) > 0 {
-		path := strings.TrimSpace(string(b))
-		if filepath.IsAbs(path) {
-			commonDir = osfs.New(path)
-		} else {
-			commonDir = osfs.New(filepath.Join(fs.Root(), path))
-		}
-		if _, err := commonDir.Stat(""); err != nil {
-			if os.IsNotExist(err) {
-				return nil, ErrRepositoryIncomplete
-			}
-
-			return nil, err
-		}
-	}
-
-	return commonDir, nil
-}
-
-// PlainClone a repository into the path with the given options, isBare defines
-// if the new repository will be bare or normal. If the path is not empty
-// ErrRepositoryAlreadyExists is returned.
-//
-// TODO(mcuadros): move isBare to CloneOptions in v5
-func PlainClone(path string, isBare bool, o *CloneOptions) (*Repository, error) {
-	return PlainCloneContext(context.Background(), path, isBare, o)
-}
-
-// PlainCloneContext a repository into the path with the given options, isBare
-// defines if the new repository will be bare or normal. If the path is not empty
-// ErrRepositoryAlreadyExists is returned.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-//
-// TODO(mcuadros): move isBare to CloneOptions in v5
-// TODO(smola): refuse upfront to clone on a non-empty directory in v5, see #1027
-func PlainCloneContext(ctx context.Context, path string, isBare bool, o *CloneOptions) (*Repository, error) {
-	cleanup, cleanupParent, err := checkIfCleanupIsNeeded(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if o.Mirror {
-		isBare = true
-	}
-	r, err := PlainInit(path, isBare)
-	if err != nil {
-		return nil, err
-	}
-
-	err = r.clone(ctx, o)
-	if err != nil && err != ErrRepositoryAlreadyExists {
-		if cleanup {
-			_ = cleanUpDir(path, cleanupParent)
-		}
-	}
-
-	return r, err
-}
-
-func newRepository(s storage.Storer, worktree billy.Filesystem) *Repository {
-	return &Repository{
-		Storer: s,
-		wt:     worktree,
-		r:      make(map[string]*Remote),
-	}
-}
-
-func checkIfCleanupIsNeeded(path string) (cleanup bool, cleanParent bool, err error) {
-	fi, err := osfs.Default.Stat(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return true, true, nil
-		}
-
-		return false, false, err
-	}
-
-	if !fi.IsDir() {
-		return false, false, fmt.Errorf("path is not a directory: %s", path)
-	}
-
-	files, err := osfs.Default.ReadDir(path)
-	if err != nil {
-		return false, false, err
-	}
-
-	if len(files) == 0 {
-		return true, false, nil
-	}
-
-	return false, false, nil
-}
-
-func cleanUpDir(path string, all bool) error {
-	if all {
-		return util.RemoveAll(osfs.Default, path)
-	}
-
-	files, err := osfs.Default.ReadDir(path)
-	if err != nil {
-		return err
-	}
-
-	for _, fi := range files {
-		if err := util.RemoveAll(osfs.Default, osfs.Default.Join(path, fi.Name())); err != nil {
-			return err
-		}
-	}
-
-	return err
-}
-
-// Config return the repository config. In a filesystem backed repository this
-// means read the `.git/config`.
-func (r *Repository) Config() (*config.Config, error) {
-	return r.Storer.Config()
-}
-
-// SetConfig marshall and writes the repository config. In a filesystem backed
-// repository this means write the `.git/config`. This function should be called
-// with the result of `Repository.Config` and never with the output of
-// `Repository.ConfigScoped`.
-func (r *Repository) SetConfig(cfg *config.Config) error {
-	return r.Storer.SetConfig(cfg)
-}
-
-// ConfigScoped returns the repository config, merged with requested scope and
-// lower. For example if, config.GlobalScope is given the local and global config
-// are returned merged in one config value.
-func (r *Repository) ConfigScoped(scope config.Scope) (*config.Config, error) {
-	// TODO(mcuadros): v6, add this as ConfigOptions.Scoped
-
-	var err error
-	system := config.NewConfig()
-	if scope >= config.SystemScope {
-		system, err = config.LoadConfig(config.SystemScope)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	global := config.NewConfig()
-	if scope >= config.GlobalScope {
-		global, err = config.LoadConfig(config.GlobalScope)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	local, err := r.Storer.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	_ = mergo.Merge(global, system)
-	_ = mergo.Merge(local, global)
-	return local, nil
-}
-
-// Remote return a remote if exists
-func (r *Repository) Remote(name string) (*Remote, error) {
-	cfg, err := r.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	c, ok := cfg.Remotes[name]
-	if !ok {
-		return nil, ErrRemoteNotFound
-	}
-
-	return NewRemote(r.Storer, c), nil
-}
-
-// Remotes returns a list with all the remotes
-func (r *Repository) Remotes() ([]*Remote, error) {
-	cfg, err := r.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	remotes := make([]*Remote, len(cfg.Remotes))
-
-	var i int
-	for _, c := range cfg.Remotes {
-		remotes[i] = NewRemote(r.Storer, c)
-		i++
-	}
-
-	return remotes, nil
-}
-
-// CreateRemote creates a new remote
-func (r *Repository) CreateRemote(c *config.RemoteConfig) (*Remote, error) {
-	if err := c.Validate(); err != nil {
-		return nil, err
-	}
-
-	remote := NewRemote(r.Storer, c)
-
-	cfg, err := r.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	if _, ok := cfg.Remotes[c.Name]; ok {
-		return nil, ErrRemoteExists
-	}
-
-	cfg.Remotes[c.Name] = c
-	return remote, r.Storer.SetConfig(cfg)
-}
-
-// CreateRemoteAnonymous creates a new anonymous remote. c.Name must be "anonymous".
-// It's used like 'git fetch git@github.com:src-d/go-git.git master:master'.
-func (r *Repository) CreateRemoteAnonymous(c *config.RemoteConfig) (*Remote, error) {
-	if err := c.Validate(); err != nil {
-		return nil, err
-	}
-
-	if c.Name != "anonymous" {
-		return nil, ErrAnonymousRemoteName
-	}
-
-	remote := NewRemote(r.Storer, c)
-
-	return remote, nil
-}
-
-// DeleteRemote delete a remote from the repository and delete the config
-func (r *Repository) DeleteRemote(name string) error {
-	cfg, err := r.Config()
-	if err != nil {
-		return err
-	}
-
-	if _, ok := cfg.Remotes[name]; !ok {
-		return ErrRemoteNotFound
-	}
-
-	delete(cfg.Remotes, name)
-	return r.Storer.SetConfig(cfg)
-}
-
-// Branch return a Branch if exists
-func (r *Repository) Branch(name string) (*config.Branch, error) {
-	cfg, err := r.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	b, ok := cfg.Branches[name]
-	if !ok {
-		return nil, ErrBranchNotFound
-	}
-
-	return b, nil
-}
-
-// CreateBranch creates a new Branch
-func (r *Repository) CreateBranch(c *config.Branch) error {
-	if err := c.Validate(); err != nil {
-		return err
-	}
-
-	cfg, err := r.Config()
-	if err != nil {
-		return err
-	}
-
-	if _, ok := cfg.Branches[c.Name]; ok {
-		return ErrBranchExists
-	}
-
-	cfg.Branches[c.Name] = c
-	return r.Storer.SetConfig(cfg)
-}
-
-// DeleteBranch delete a Branch from the repository and delete the config
-func (r *Repository) DeleteBranch(name string) error {
-	cfg, err := r.Config()
-	if err != nil {
-		return err
-	}
-
-	if _, ok := cfg.Branches[name]; !ok {
-		return ErrBranchNotFound
-	}
-
-	delete(cfg.Branches, name)
-	return r.Storer.SetConfig(cfg)
-}
-
-// CreateTag creates a tag. If opts is included, the tag is an annotated tag,
-// otherwise a lightweight tag is created.
-func (r *Repository) CreateTag(name string, hash plumbing.Hash, opts *CreateTagOptions) (*plumbing.Reference, error) {
-	rname := plumbing.NewTagReferenceName(name)
-	if err := rname.Validate(); err != nil {
-		return nil, err
-	}
-
-	_, err := r.Storer.Reference(rname)
-	switch err {
-	case nil:
-		// Tag exists, this is an error
-		return nil, ErrTagExists
-	case plumbing.ErrReferenceNotFound:
-		// Tag missing, available for creation, pass this
-	default:
-		// Some other error
-		return nil, err
-	}
-
-	var target plumbing.Hash
-	if opts != nil {
-		target, err = r.createTagObject(name, hash, opts)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		target = hash
-	}
-
-	ref := plumbing.NewHashReference(rname, target)
-	if err = r.Storer.SetReference(ref); err != nil {
-		return nil, err
-	}
-
-	return ref, nil
-}
-
-func (r *Repository) createTagObject(name string, hash plumbing.Hash, opts *CreateTagOptions) (plumbing.Hash, error) {
-	if err := opts.Validate(r, hash); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	rawobj, err := object.GetObject(r.Storer, hash)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	tag := &object.Tag{
-		Name:       name,
-		Tagger:     *opts.Tagger,
-		Message:    opts.Message,
-		TargetType: rawobj.Type(),
-		Target:     hash,
-	}
-
-	if opts.SignKey != nil {
-		sig, err := r.buildTagSignature(tag, opts.SignKey)
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-
-		tag.PGPSignature = sig
-	}
-
-	obj := r.Storer.NewEncodedObject()
-	if err := tag.Encode(obj); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return r.Storer.SetEncodedObject(obj)
-}
-
-func (r *Repository) buildTagSignature(tag *object.Tag, signKey *openpgp.Entity) (string, error) {
-	encoded := &plumbing.MemoryObject{}
-	if err := tag.Encode(encoded); err != nil {
-		return "", err
-	}
-
-	rdr, err := encoded.Reader()
-	if err != nil {
-		return "", err
-	}
-
-	var b bytes.Buffer
-	if err := openpgp.ArmoredDetachSign(&b, signKey, rdr, nil); err != nil {
-		return "", err
-	}
-
-	return b.String(), nil
-}
-
-// Tag returns a tag from the repository.
-//
-// If you want to check to see if the tag is an annotated tag, you can call
-// TagObject on the hash of the reference in ForEach:
-//
-//	ref, err := r.Tag("v0.1.0")
-//	if err != nil {
-//	  // Handle error
-//	}
-//
-//	obj, err := r.TagObject(ref.Hash())
-//	switch err {
-//	case nil:
-//	  // Tag object present
-//	case plumbing.ErrObjectNotFound:
-//	  // Not a tag object
-//	default:
-//	  // Some other error
-//	}
-func (r *Repository) Tag(name string) (*plumbing.Reference, error) {
-	ref, err := r.Reference(plumbing.ReferenceName(path.Join("refs", "tags", name)), false)
-	if err != nil {
-		if err == plumbing.ErrReferenceNotFound {
-			// Return a friendly error for this one, versus just ReferenceNotFound.
-			return nil, ErrTagNotFound
-		}
-
-		return nil, err
-	}
-
-	return ref, nil
-}
-
-// DeleteTag deletes a tag from the repository.
-func (r *Repository) DeleteTag(name string) error {
-	_, err := r.Tag(name)
-	if err != nil {
-		return err
-	}
-
-	return r.Storer.RemoveReference(plumbing.ReferenceName(path.Join("refs", "tags", name)))
-}
-
-func (r *Repository) resolveToCommitHash(h plumbing.Hash) (plumbing.Hash, error) {
-	obj, err := r.Storer.EncodedObject(plumbing.AnyObject, h)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-	switch obj.Type() {
-	case plumbing.TagObject:
-		t, err := object.DecodeTag(r.Storer, obj)
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-		return r.resolveToCommitHash(t.Target)
-	case plumbing.CommitObject:
-		return h, nil
-	default:
-		return plumbing.ZeroHash, ErrUnableToResolveCommit
-	}
-}
-
-// Clone clones a remote repository
-func (r *Repository) clone(ctx context.Context, o *CloneOptions) error {
-	if err := o.Validate(); err != nil {
-		return err
-	}
-
-	c := &config.RemoteConfig{
-		Name:   o.RemoteName,
-		URLs:   []string{o.URL},
-		Fetch:  r.cloneRefSpec(o),
-		Mirror: o.Mirror,
-	}
-
-	if _, err := r.CreateRemote(c); err != nil {
-		return err
-	}
-
-	// When the repository to clone is on the local machine,
-	// instead of using hard links, automatically setup .git/objects/info/alternates
-	// to share the objects with the source repository
-	if o.Shared {
-		if !url.IsLocalEndpoint(o.URL) {
-			return ErrAlternatePathNotSupported
-		}
-		altpath := o.URL
-		remoteRepo, err := PlainOpen(o.URL)
-		if err != nil {
-			return fmt.Errorf("failed to open remote repository: %w", err)
-		}
-		conf, err := remoteRepo.Config()
-		if err != nil {
-			return fmt.Errorf("failed to read remote repository configuration: %w", err)
-		}
-		if !conf.Core.IsBare {
-			altpath = path.Join(altpath, GitDirName)
-		}
-		if err := r.Storer.AddAlternate(altpath); err != nil {
-			return fmt.Errorf("failed to add alternate file to git objects dir: %w", err)
-		}
-	}
-
-	ref, err := r.fetchAndUpdateReferences(ctx, &FetchOptions{
-		RefSpecs:        c.Fetch,
-		Depth:           o.Depth,
-		Auth:            o.Auth,
-		Progress:        o.Progress,
-		Tags:            o.Tags,
-		RemoteName:      o.RemoteName,
-		InsecureSkipTLS: o.InsecureSkipTLS,
-		CABundle:        o.CABundle,
-		ProxyOptions:    o.ProxyOptions,
-	}, o.ReferenceName)
-	if err != nil {
-		return err
-	}
-
-	if r.wt != nil && !o.NoCheckout {
-		w, err := r.Worktree()
-		if err != nil {
-			return err
-		}
-
-		head, err := r.Head()
-		if err != nil {
-			return err
-		}
-
-		if err := w.Reset(&ResetOptions{
-			Mode:   MergeReset,
-			Commit: head.Hash(),
-		}); err != nil {
-			return err
-		}
-
-		if o.RecurseSubmodules != NoRecurseSubmodules {
-			if err := w.updateSubmodules(ctx, &SubmoduleUpdateOptions{
-				RecurseSubmodules: o.RecurseSubmodules,
-				Depth: func() int {
-					if o.ShallowSubmodules {
-						return 1
-					}
-					return 0
-				}(),
-				Auth: o.Auth,
-			}); err != nil {
-				return err
-			}
-		}
-	}
-
-	if err := r.updateRemoteConfigIfNeeded(o, c, ref); err != nil {
-		return err
-	}
-
-	if !o.Mirror && ref.Name().IsBranch() {
-		branchRef := ref.Name()
-		branchName := strings.Split(string(branchRef), "refs/heads/")[1]
-
-		b := &config.Branch{
-			Name:  branchName,
-			Merge: branchRef,
-		}
-
-		if o.RemoteName == "" {
-			b.Remote = "origin"
-		} else {
-			b.Remote = o.RemoteName
-		}
-
-		if err := r.CreateBranch(b); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-const (
-	refspecTag              = "+refs/tags/%s:refs/tags/%[1]s"
-	refspecSingleBranch     = "+refs/heads/%s:refs/remotes/%s/%[1]s"
-	refspecSingleBranchHEAD = "+HEAD:refs/remotes/%s/HEAD"
-)
-
-func (r *Repository) cloneRefSpec(o *CloneOptions) []config.RefSpec {
-	switch {
-	case o.Mirror:
-		return []config.RefSpec{"+refs/*:refs/*"}
-	case o.ReferenceName.IsTag():
-		return []config.RefSpec{
-			config.RefSpec(fmt.Sprintf(refspecTag, o.ReferenceName.Short())),
-		}
-	case o.SingleBranch && o.ReferenceName == plumbing.HEAD:
-		return []config.RefSpec{
-			config.RefSpec(fmt.Sprintf(refspecSingleBranchHEAD, o.RemoteName)),
-		}
-	case o.SingleBranch:
-		return []config.RefSpec{
-			config.RefSpec(fmt.Sprintf(refspecSingleBranch, o.ReferenceName.Short(), o.RemoteName)),
-		}
-	default:
-		return []config.RefSpec{
-			config.RefSpec(fmt.Sprintf(config.DefaultFetchRefSpec, o.RemoteName)),
-		}
-	}
-}
-
-func (r *Repository) setIsBare(isBare bool) error {
-	cfg, err := r.Config()
-	if err != nil {
-		return err
-	}
-
-	cfg.Core.IsBare = isBare
-	return r.Storer.SetConfig(cfg)
-}
-
-func (r *Repository) updateRemoteConfigIfNeeded(o *CloneOptions, c *config.RemoteConfig, _ *plumbing.Reference) error {
-	if !o.SingleBranch {
-		return nil
-	}
-
-	c.Fetch = r.cloneRefSpec(o)
-
-	cfg, err := r.Config()
-	if err != nil {
-		return err
-	}
-
-	cfg.Remotes[c.Name] = c
-	return r.Storer.SetConfig(cfg)
-}
-
-func (r *Repository) fetchAndUpdateReferences(
-	ctx context.Context, o *FetchOptions, ref plumbing.ReferenceName,
-) (*plumbing.Reference, error) {
-
-	if err := o.Validate(); err != nil {
-		return nil, err
-	}
-
-	remote, err := r.Remote(o.RemoteName)
-	if err != nil {
-		return nil, err
-	}
-
-	objsUpdated := true
-	remoteRefs, err := remote.fetch(ctx, o)
-	if err == NoErrAlreadyUpToDate {
-		objsUpdated = false
-	} else if err == packfile.ErrEmptyPackfile {
-		return nil, ErrFetching
-	} else if err != nil {
-		return nil, err
-	}
-
-	resolvedRef, err := expand_ref(remoteRefs, ref)
-	if err != nil {
-		return nil, err
-	}
-
-	refsUpdated, err := r.updateReferences(remote.c.Fetch, resolvedRef)
-	if err != nil {
-		return nil, err
-	}
-
-	if !objsUpdated && !refsUpdated {
-		return nil, NoErrAlreadyUpToDate
-	}
-
-	return resolvedRef, nil
-}
-
-func (r *Repository) updateReferences(spec []config.RefSpec,
-	resolvedRef *plumbing.Reference) (updated bool, err error) {
-
-	if !resolvedRef.Name().IsBranch() {
-		// Detached HEAD mode
-		h, err := r.resolveToCommitHash(resolvedRef.Hash())
-		if err != nil {
-			return false, err
-		}
-		head := plumbing.NewHashReference(plumbing.HEAD, h)
-		return updateReferenceStorerIfNeeded(r.Storer, head)
-	}
-
-	refs := []*plumbing.Reference{
-		// Create local reference for the resolved ref
-		resolvedRef,
-		// Create local symbolic HEAD
-		plumbing.NewSymbolicReference(plumbing.HEAD, resolvedRef.Name()),
-	}
-
-	refs = append(refs, r.calculateRemoteHeadReference(spec, resolvedRef)...)
-
-	for _, ref := range refs {
-		u, err := updateReferenceStorerIfNeeded(r.Storer, ref)
-		if err != nil {
-			return updated, err
-		}
-
-		if u {
-			updated = true
-		}
-	}
-
-	return
-}
-
-func (r *Repository) calculateRemoteHeadReference(spec []config.RefSpec,
-	resolvedHead *plumbing.Reference) []*plumbing.Reference {
-
-	var refs []*plumbing.Reference
-
-	// Create resolved HEAD reference with remote prefix if it does not
-	// exist. This is needed when using single branch and HEAD.
-	for _, rs := range spec {
-		name := resolvedHead.Name()
-		if !rs.Match(name) {
-			continue
-		}
-
-		name = rs.Dst(name)
-		_, err := r.Storer.Reference(name)
-		if err == plumbing.ErrReferenceNotFound {
-			refs = append(refs, plumbing.NewHashReference(name, resolvedHead.Hash()))
-		}
-	}
-
-	return refs
-}
-
-func checkAndUpdateReferenceStorerIfNeeded(
-	s storer.ReferenceStorer, r, old *plumbing.Reference) (
-	updated bool, err error) {
-	p, err := s.Reference(r.Name())
-	if err != nil && err != plumbing.ErrReferenceNotFound {
-		return false, err
-	}
-
-	// we use the string method to compare references, is the easiest way
-	if err == plumbing.ErrReferenceNotFound || r.String() != p.String() {
-		if err := s.CheckAndSetReference(r, old); err != nil {
-			return false, err
-		}
-
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func updateReferenceStorerIfNeeded(
-	s storer.ReferenceStorer, r *plumbing.Reference) (updated bool, err error) {
-	return checkAndUpdateReferenceStorerIfNeeded(s, r, nil)
-}
-
-// Fetch fetches references along with the objects necessary to complete
-// their histories, from the remote named as FetchOptions.RemoteName.
-//
-// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
-// no changes to be fetched, or an error.
-func (r *Repository) Fetch(o *FetchOptions) error {
-	return r.FetchContext(context.Background(), o)
-}
-
-// FetchContext fetches references along with the objects necessary to complete
-// their histories, from the remote named as FetchOptions.RemoteName.
-//
-// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
-// no changes to be fetched, or an error.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (r *Repository) FetchContext(ctx context.Context, o *FetchOptions) error {
-	if err := o.Validate(); err != nil {
-		return err
-	}
-
-	remote, err := r.Remote(o.RemoteName)
-	if err != nil {
-		return err
-	}
-
-	return remote.FetchContext(ctx, o)
-}
-
-// Push performs a push to the remote. Returns NoErrAlreadyUpToDate if
-// the remote was already up-to-date, from the remote named as
-// FetchOptions.RemoteName.
-func (r *Repository) Push(o *PushOptions) error {
-	return r.PushContext(context.Background(), o)
-}
-
-// PushContext performs a push to the remote. Returns NoErrAlreadyUpToDate if
-// the remote was already up-to-date, from the remote named as
-// FetchOptions.RemoteName.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (r *Repository) PushContext(ctx context.Context, o *PushOptions) error {
-	if err := o.Validate(); err != nil {
-		return err
-	}
-
-	remote, err := r.Remote(o.RemoteName)
-	if err != nil {
-		return err
-	}
-
-	return remote.PushContext(ctx, o)
-}
-
-// Log returns the commit history from the given LogOptions.
-func (r *Repository) Log(o *LogOptions) (object.CommitIter, error) {
-	fn := commitIterFunc(o.Order)
-	if fn == nil {
-		return nil, fmt.Errorf("invalid Order=%v", o.Order)
-	}
-
-	var (
-		it  object.CommitIter
-		err error
-	)
-	if o.All {
-		it, err = r.logAll(fn)
-	} else {
-		it, err = r.log(o.From, fn)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if o.FileName != nil {
-		// for `git log --all` also check parent (if the next commit comes from the real parent)
-		it = r.logWithFile(*o.FileName, it, o.All)
-	}
-	if o.PathFilter != nil {
-		it = r.logWithPathFilter(o.PathFilter, it, o.All)
-	}
-
-	if o.Since != nil || o.Until != nil {
-		limitOptions := object.LogLimitOptions{Since: o.Since, Until: o.Until}
-		it = r.logWithLimit(it, limitOptions)
-	}
-
-	return it, nil
-}
-
-func (r *Repository) log(from plumbing.Hash, commitIterFunc func(*object.Commit) object.CommitIter) (object.CommitIter, error) {
-	h := from
-	if from == plumbing.ZeroHash {
-		head, err := r.Head()
-		if err != nil {
-			return nil, err
-		}
-
-		h = head.Hash()
-	}
-
-	commit, err := r.CommitObject(h)
-	if err != nil {
-		return nil, err
-	}
-	return commitIterFunc(commit), nil
-}
-
-func (r *Repository) logAll(commitIterFunc func(*object.Commit) object.CommitIter) (object.CommitIter, error) {
-	return object.NewCommitAllIter(r.Storer, commitIterFunc)
-}
-
-func (*Repository) logWithFile(fileName string, commitIter object.CommitIter, checkParent bool) object.CommitIter {
-	return object.NewCommitPathIterFromIter(
-		func(path string) bool {
-			return path == fileName
-		},
-		commitIter,
-		checkParent,
-	)
-}
-
-func (*Repository) logWithPathFilter(pathFilter func(string) bool, commitIter object.CommitIter, checkParent bool) object.CommitIter {
-	return object.NewCommitPathIterFromIter(
-		pathFilter,
-		commitIter,
-		checkParent,
-	)
-}
-
-func (*Repository) logWithLimit(commitIter object.CommitIter, limitOptions object.LogLimitOptions) object.CommitIter {
-	return object.NewCommitLimitIterFromIter(commitIter, limitOptions)
-}
-
-func commitIterFunc(order LogOrder) func(c *object.Commit) object.CommitIter {
-	switch order {
-	case LogOrderDefault:
-		return func(c *object.Commit) object.CommitIter {
-			return object.NewCommitPreorderIter(c, nil, nil)
-		}
-	case LogOrderDFS:
-		return func(c *object.Commit) object.CommitIter {
-			return object.NewCommitPreorderIter(c, nil, nil)
-		}
-	case LogOrderDFSPost:
-		return func(c *object.Commit) object.CommitIter {
-			return object.NewCommitPostorderIter(c, nil)
-		}
-	case LogOrderBSF:
-		return func(c *object.Commit) object.CommitIter {
-			return object.NewCommitIterBSF(c, nil, nil)
-		}
-	case LogOrderCommitterTime:
-		return func(c *object.Commit) object.CommitIter {
-			return object.NewCommitIterCTime(c, nil, nil)
-		}
-	}
-	return nil
-}
-
-// Tags returns all the tag References in a repository.
-//
-// If you want to check to see if the tag is an annotated tag, you can call
-// TagObject on the hash Reference passed in through ForEach:
-//
-//	iter, err := r.Tags()
-//	if err != nil {
-//	  // Handle error
-//	}
-//
-//	if err := iter.ForEach(func (ref *plumbing.Reference) error {
-//	  obj, err := r.TagObject(ref.Hash())
-//	  switch err {
-//	  case nil:
-//	    // Tag object present
-//	  case plumbing.ErrObjectNotFound:
-//	    // Not a tag object
-//	  default:
-//	    // Some other error
-//	    return err
-//	  }
-//	}); err != nil {
-//	  // Handle outer iterator error
-//	}
-func (r *Repository) Tags() (storer.ReferenceIter, error) {
-	refIter, err := r.Storer.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	return storer.NewReferenceFilteredIter(
-		func(r *plumbing.Reference) bool {
-			return r.Name().IsTag()
-		}, refIter), nil
-}
-
-// Branches returns all the References that are Branches.
-func (r *Repository) Branches() (storer.ReferenceIter, error) {
-	refIter, err := r.Storer.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	return storer.NewReferenceFilteredIter(
-		func(r *plumbing.Reference) bool {
-			return r.Name().IsBranch()
-		}, refIter), nil
-}
-
-// Notes returns all the References that are notes. For more information:
-// https://git-scm.com/docs/git-notes
-func (r *Repository) Notes() (storer.ReferenceIter, error) {
-	refIter, err := r.Storer.IterReferences()
-	if err != nil {
-		return nil, err
-	}
-
-	return storer.NewReferenceFilteredIter(
-		func(r *plumbing.Reference) bool {
-			return r.Name().IsNote()
-		}, refIter), nil
-}
-
-// TreeObject return a Tree with the given hash. If not found
-// plumbing.ErrObjectNotFound is returned
-func (r *Repository) TreeObject(h plumbing.Hash) (*object.Tree, error) {
-	return object.GetTree(r.Storer, h)
-}
-
-// TreeObjects returns an unsorted TreeIter with all the trees in the repository
-func (r *Repository) TreeObjects() (*object.TreeIter, error) {
-	iter, err := r.Storer.IterEncodedObjects(plumbing.TreeObject)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.NewTreeIter(r.Storer, iter), nil
-}
-
-// CommitObject return a Commit with the given hash. If not found
-// plumbing.ErrObjectNotFound is returned.
-func (r *Repository) CommitObject(h plumbing.Hash) (*object.Commit, error) {
-	return object.GetCommit(r.Storer, h)
-}
-
-// CommitObjects returns an unsorted CommitIter with all the commits in the repository.
-func (r *Repository) CommitObjects() (object.CommitIter, error) {
-	iter, err := r.Storer.IterEncodedObjects(plumbing.CommitObject)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.NewCommitIter(r.Storer, iter), nil
-}
-
-// BlobObject returns a Blob with the given hash. If not found
-// plumbing.ErrObjectNotFound is returned.
-func (r *Repository) BlobObject(h plumbing.Hash) (*object.Blob, error) {
-	return object.GetBlob(r.Storer, h)
-}
-
-// BlobObjects returns an unsorted BlobIter with all the blobs in the repository.
-func (r *Repository) BlobObjects() (*object.BlobIter, error) {
-	iter, err := r.Storer.IterEncodedObjects(plumbing.BlobObject)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.NewBlobIter(r.Storer, iter), nil
-}
-
-// TagObject returns a Tag with the given hash. If not found
-// plumbing.ErrObjectNotFound is returned. This method only returns
-// annotated Tags, no lightweight Tags.
-func (r *Repository) TagObject(h plumbing.Hash) (*object.Tag, error) {
-	return object.GetTag(r.Storer, h)
-}
-
-// TagObjects returns a unsorted TagIter that can step through all of the annotated
-// tags in the repository.
-func (r *Repository) TagObjects() (*object.TagIter, error) {
-	iter, err := r.Storer.IterEncodedObjects(plumbing.TagObject)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.NewTagIter(r.Storer, iter), nil
-}
-
-// Object returns an Object with the given hash. If not found
-// plumbing.ErrObjectNotFound is returned.
-func (r *Repository) Object(t plumbing.ObjectType, h plumbing.Hash) (object.Object, error) {
-	obj, err := r.Storer.EncodedObject(t, h)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.DecodeObject(r.Storer, obj)
-}
-
-// Objects returns an unsorted ObjectIter with all the objects in the repository.
-func (r *Repository) Objects() (*object.ObjectIter, error) {
-	iter, err := r.Storer.IterEncodedObjects(plumbing.AnyObject)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.NewObjectIter(r.Storer, iter), nil
-}
-
-// Head returns the reference where HEAD is pointing to.
-func (r *Repository) Head() (*plumbing.Reference, error) {
-	return storer.ResolveReference(r.Storer, plumbing.HEAD)
-}
-
-// Reference returns the reference for a given reference name. If resolved is
-// true, any symbolic reference will be resolved.
-func (r *Repository) Reference(name plumbing.ReferenceName, resolved bool) (
-	*plumbing.Reference, error) {
-
-	if resolved {
-		return storer.ResolveReference(r.Storer, name)
-	}
-
-	return r.Storer.Reference(name)
-}
-
-// References returns an unsorted ReferenceIter for all references.
-func (r *Repository) References() (storer.ReferenceIter, error) {
-	return r.Storer.IterReferences()
-}
-
-// Worktree returns a worktree based on the given fs, if nil the default
-// worktree will be used.
-func (r *Repository) Worktree() (*Worktree, error) {
-	if r.wt == nil {
-		return nil, ErrIsBareRepository
-	}
-
-	return &Worktree{r: r, Filesystem: r.wt}, nil
-}
-
-func expand_ref(s storer.ReferenceStorer, ref plumbing.ReferenceName) (*plumbing.Reference, error) {
-	// For improving troubleshooting, this preserves the error for the provided `ref`,
-	// and returns the error for that specific ref in case all parse rules fails.
-	var ret error
-	for _, rule := range plumbing.RefRevParseRules {
-		resolvedRef, err := storer.ResolveReference(s, plumbing.ReferenceName(fmt.Sprintf(rule, ref)))
-
-		if err == nil {
-			return resolvedRef, nil
-		} else if ret == nil {
-			ret = err
-		}
-	}
-
-	return nil, ret
-}
-
-// ResolveRevision resolves revision to corresponding hash. It will always
-// resolve to a commit hash, not a tree or annotated tag.
-//
-// Implemented resolvers : HEAD, branch, tag, heads/branch, refs/heads/branch,
-// refs/tags/tag, refs/remotes/origin/branch, refs/remotes/origin/HEAD, tilde and caret (HEAD~1, master~^, tag~2, ref/heads/master~1, ...), selection by text (HEAD^{/fix nasty bug}), hash (prefix and full)
-func (r *Repository) ResolveRevision(in plumbing.Revision) (*plumbing.Hash, error) {
-	rev := in.String()
-	if rev == "" {
-		return &plumbing.ZeroHash, plumbing.ErrReferenceNotFound
-	}
-
-	p := revision.NewParserFromString(rev)
-	items, err := p.Parse()
-
-	if err != nil {
-		return nil, err
-	}
-
-	var commit *object.Commit
-
-	for _, item := range items {
-		switch item := item.(type) {
-		case revision.Ref:
-			revisionRef := item
-
-			var tryHashes []plumbing.Hash
-
-			tryHashes = append(tryHashes, r.resolveHashPrefix(string(revisionRef))...)
-
-			ref, err := expand_ref(r.Storer, plumbing.ReferenceName(revisionRef))
-			if err == nil {
-				tryHashes = append(tryHashes, ref.Hash())
-			}
-
-			// in ambiguous cases, `git rev-parse` will emit a warning, but
-			// will always return the oid in preference to a ref; we don't have
-			// the ability to emit a warning here, so (for speed purposes)
-			// don't bother to detect the ambiguity either, just return in the
-			// priority that git would.
-			gotOne := false
-			for _, hash := range tryHashes {
-				commitObj, err := r.CommitObject(hash)
-				if err == nil {
-					commit = commitObj
-					gotOne = true
-					break
-				}
-
-				tagObj, err := r.TagObject(hash)
-				if err == nil {
-					// If the tag target lookup fails here, this most likely
-					// represents some sort of repo corruption, so let the
-					// error bubble up.
-					tagCommit, err := tagObj.Commit()
-					if err != nil {
-						return &plumbing.ZeroHash, err
-					}
-					commit = tagCommit
-					gotOne = true
-					break
-				}
-			}
-
-			if !gotOne {
-				return &plumbing.ZeroHash, plumbing.ErrReferenceNotFound
-			}
-
-		case revision.CaretPath:
-			depth := item.Depth
-
-			if depth == 0 {
-				break
-			}
-
-			iter := commit.Parents()
-
-			c, err := iter.Next()
-
-			if err != nil {
-				return &plumbing.ZeroHash, err
-			}
-
-			if depth == 1 {
-				commit = c
-
-				break
-			}
-
-			c, err = iter.Next()
-
-			if err != nil {
-				return &plumbing.ZeroHash, err
-			}
-
-			commit = c
-		case revision.TildePath:
-			for i := 0; i < item.Depth; i++ {
-				c, err := commit.Parents().Next()
-
-				if err != nil {
-					return &plumbing.ZeroHash, err
-				}
-
-				commit = c
-			}
-		case revision.CaretReg:
-			history := object.NewCommitPreorderIter(commit, nil, nil)
-
-			re := item.Regexp
-			negate := item.Negate
-
-			var c *object.Commit
-
-			err := history.ForEach(func(hc *object.Commit) error {
-				if !negate && re.MatchString(hc.Message) {
-					c = hc
-					return storer.ErrStop
-				}
-
-				if negate && !re.MatchString(hc.Message) {
-					c = hc
-					return storer.ErrStop
-				}
-
-				return nil
-			})
-			if err != nil {
-				return &plumbing.ZeroHash, err
-			}
-
-			if c == nil {
-				return &plumbing.ZeroHash, fmt.Errorf("no commit message match regexp: %q", re.String())
-			}
-
-			commit = c
-		}
-	}
-
-	if commit == nil {
-		return &plumbing.ZeroHash, plumbing.ErrReferenceNotFound
-	}
-
-	return &commit.Hash, nil
-}
-
-// resolveHashPrefix returns a list of potential hashes that the given string
-// is a prefix of. It quietly swallows errors, returning nil.
-func (r *Repository) resolveHashPrefix(hashStr string) []plumbing.Hash {
-	// Handle complete and partial hashes.
-	// plumbing.NewHash forces args into a full 20 byte hash, which isn't suitable
-	// for partial hashes since they will become zero-filled.
-
-	if hashStr == "" {
-		return nil
-	}
-	if len(hashStr) == len(plumbing.ZeroHash)*2 {
-		// Only a full hash is possible.
-		hexb, err := hex.DecodeString(hashStr)
-		if err != nil {
-			return nil
-		}
-		var h plumbing.Hash
-		copy(h[:], hexb)
-		return []plumbing.Hash{h}
-	}
-
-	// Partial hash.
-	// hex.DecodeString only decodes to complete bytes, so only works with pairs of hex digits.
-	evenHex := hashStr[:len(hashStr)&^1]
-	hexb, err := hex.DecodeString(evenHex)
-	if err != nil {
-		return nil
-	}
-	candidates := expandPartialHash(r.Storer, hexb)
-	if len(evenHex) == len(hashStr) {
-		// The prefix was an exact number of bytes.
-		return candidates
-	}
-	// Do another prefix check to ensure the dangling nybble is correct.
-	var hashes []plumbing.Hash
-	for _, h := range candidates {
-		if strings.HasPrefix(h.String(), hashStr) {
-			hashes = append(hashes, h)
-		}
-	}
-	return hashes
-}
-
-type RepackConfig struct {
-	// UseRefDeltas configures whether packfile encoder will use reference deltas.
-	// By default OFSDeltaObject is used.
-	UseRefDeltas bool
-	// OnlyDeletePacksOlderThan if set to non-zero value
-	// selects only objects older than the time provided.
-	OnlyDeletePacksOlderThan time.Time
-}
-
-func (r *Repository) RepackObjects(cfg *RepackConfig) (err error) {
-	pos, ok := r.Storer.(storer.PackedObjectStorer)
-	if !ok {
-		return ErrPackedObjectsNotSupported
-	}
-
-	// Get the existing object packs.
-	hs, err := pos.ObjectPacks()
-	if err != nil {
-		return err
-	}
-
-	// Create a new pack.
-	nh, err := r.createNewObjectPack(cfg)
-	if err != nil {
-		return err
-	}
-
-	// Delete old packs.
-	for _, h := range hs {
-		// Skip if new hash is the same as an old one.
-		if h == nh {
-			continue
-		}
-		err = pos.DeleteOldObjectPackAndIndex(h, cfg.OnlyDeletePacksOlderThan)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Merge merges the reference branch into the current branch.
-//
-// If the merge is not possible (or supported) returns an error without changing
-// the HEAD for the current branch. Possible errors include:
-//   - The merge strategy is not supported.
-//   - The specific strategy cannot be used (e.g. using FastForwardMerge when one is not possible).
-func (r *Repository) Merge(ref plumbing.Reference, opts MergeOptions) error {
-	if opts.Strategy != FastForwardMerge {
-		return ErrUnsupportedMergeStrategy
-	}
-
-	// Ignore error as not having a shallow list is optional here.
-	shallowList, _ := r.Storer.Shallow()
-	var earliestShallow *plumbing.Hash
-	if len(shallowList) > 0 {
-		earliestShallow = &shallowList[0]
-	}
-
-	head, err := r.Head()
-	if err != nil {
-		return err
-	}
-
-	ff, err := isFastForward(r.Storer, head.Hash(), ref.Hash(), earliestShallow)
-	if err != nil {
-		return err
-	}
-
-	if !ff {
-		return ErrFastForwardMergeNotPossible
-	}
-
-	return r.Storer.SetReference(plumbing.NewHashReference(head.Name(), ref.Hash()))
-}
-
-// createNewObjectPack is a helper for RepackObjects taking care
-// of creating a new pack. It is used so the PackfileWriter
-// deferred close has the right scope.
-func (r *Repository) createNewObjectPack(cfg *RepackConfig) (h plumbing.Hash, err error) {
-	ow := newObjectWalker(r.Storer)
-	err = ow.walkAllRefs()
-	if err != nil {
-		return h, err
-	}
-	objs := make([]plumbing.Hash, 0, len(ow.seen))
-	for h := range ow.seen {
-		objs = append(objs, h)
-	}
-	pfw, ok := r.Storer.(storer.PackfileWriter)
-	if !ok {
-		return h, fmt.Errorf("Repository storer is not a storer.PackfileWriter")
-	}
-	wc, err := pfw.PackfileWriter()
-	if err != nil {
-		return h, err
-	}
-	defer ioutil.CheckClose(wc, &err)
-	scfg, err := r.Config()
-	if err != nil {
-		return h, err
-	}
-	enc := packfile.NewEncoder(wc, r.Storer, cfg.UseRefDeltas)
-	h, err = enc.Encode(objs, scfg.Pack.Window)
-	if err != nil {
-		return h, err
-	}
-
-	// Delete the packed, loose objects.
-	if los, ok := r.Storer.(storer.LooseObjectStorer); ok {
-		err = los.ForEachObjectHash(func(hash plumbing.Hash) error {
-			if ow.isSeen(hash) {
-				err = los.DeleteLooseObject(hash)
-				if err != nil {
-					return err
-				}
-			}
-			return nil
-		})
-		if err != nil {
-			return h, err
-		}
-	}
-
-	return h, err
-}
-
-func expandPartialHash(st storer.EncodedObjectStorer, prefix []byte) (hashes []plumbing.Hash) {
-	// The fast version is implemented by storage/filesystem.ObjectStorage.
-	type fastIter interface {
-		HashesWithPrefix(prefix []byte) ([]plumbing.Hash, error)
-	}
-	if fi, ok := st.(fastIter); ok {
-		h, err := fi.HashesWithPrefix(prefix)
-		if err != nil {
-			return nil
-		}
-		return h
-	}
-
-	// Slow path.
-	iter, err := st.IterEncodedObjects(plumbing.AnyObject)
-	if err != nil {
-		return nil
-	}
-	iter.ForEach(func(obj plumbing.EncodedObject) error {
-		h := obj.Hash()
-		if bytes.HasPrefix(h[:], prefix) {
-			hashes = append(hashes, h)
-		}
-		return nil
-	})
-	return
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/signer.go b/vendor/github.com/jesseduffield/go-git/v5/signer.go
deleted file mode 100644
index ccc4c6092..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/signer.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package git
-
-import (
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-// signableObject is an object which can be signed.
-type signableObject interface {
-	EncodeWithoutSignature(o plumbing.EncodedObject) error
-}
-
-// Signer is an interface for signing git objects.
-// message is a reader containing the encoded object to be signed.
-// Implementors should return the encoded signature and an error if any.
-// See https://git-scm.com/docs/gitformat-signature for more information.
-type Signer interface {
-	Sign(message io.Reader) ([]byte, error)
-}
-
-func signObject(signer Signer, obj signableObject) ([]byte, error) {
-	encoded := &plumbing.MemoryObject{}
-	if err := obj.EncodeWithoutSignature(encoded); err != nil {
-		return nil, err
-	}
-	r, err := encoded.Reader()
-	if err != nil {
-		return nil, err
-	}
-
-	return signer.Sign(r)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/status.go b/vendor/github.com/jesseduffield/go-git/v5/status.go
deleted file mode 100644
index 537d82148..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/status.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package git
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-
-	mindex "github.com/jesseduffield/go-git/v5/utils/merkletrie/index"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// Status represents the current status of a Worktree.
-// The key of the map is the path of the file.
-type Status map[string]*FileStatus
-
-// File returns the FileStatus for a given path, if the FileStatus doesn't
-// exists a new FileStatus is added to the map using the path as key.
-func (s Status) File(path string) *FileStatus {
-	if _, ok := (s)[path]; !ok {
-		s[path] = &FileStatus{Worktree: Untracked, Staging: Untracked}
-	}
-
-	return s[path]
-}
-
-// IsUntracked checks if file for given path is 'Untracked'
-func (s Status) IsUntracked(path string) bool {
-	stat, ok := (s)[filepath.ToSlash(path)]
-	return ok && stat.Worktree == Untracked
-}
-
-// IsClean returns true if all the files are in Unmodified status.
-func (s Status) IsClean() bool {
-	for _, status := range s {
-		if status.Worktree != Unmodified || status.Staging != Unmodified {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (s Status) String() string {
-	buf := bytes.NewBuffer(nil)
-	for path, status := range s {
-		if status.Staging == Unmodified && status.Worktree == Unmodified {
-			continue
-		}
-
-		if status.Staging == Renamed {
-			path = fmt.Sprintf("%s -> %s", path, status.Extra)
-		}
-
-		fmt.Fprintf(buf, "%c%c %s\n", status.Staging, status.Worktree, path)
-	}
-
-	return buf.String()
-}
-
-// FileStatus contains the status of a file in the worktree
-type FileStatus struct {
-	// Staging is the status of a file in the staging area
-	Staging StatusCode
-	// Worktree is the status of a file in the worktree
-	Worktree StatusCode
-	// Extra contains extra information, such as the previous name in a rename
-	Extra string
-}
-
-// StatusCode status code of a file in the Worktree
-type StatusCode byte
-
-const (
-	Unmodified         StatusCode = ' '
-	Untracked          StatusCode = '?'
-	Modified           StatusCode = 'M'
-	Added              StatusCode = 'A'
-	Deleted            StatusCode = 'D'
-	Renamed            StatusCode = 'R'
-	Copied             StatusCode = 'C'
-	UpdatedButUnmerged StatusCode = 'U'
-)
-
-// StatusStrategy defines the different types of strategies when processing
-// the worktree status.
-type StatusStrategy int
-
-const (
-	// TODO: (V6) Review the default status strategy.
-	// TODO: (V6) Review the type used to represent Status, to enable lazy
-	// processing of statuses going direct to the backing filesystem.
-	defaultStatusStrategy = Empty
-
-	// Empty starts its status map from empty. Missing entries for a given
-	// path means that the file is untracked. This causes a known issue (#119)
-	// whereby unmodified files can be incorrectly reported as untracked.
-	//
-	// This can be used when returning the changed state within a modified Worktree.
-	// For example, to check whether the current worktree is clean.
-	Empty StatusStrategy = 0
-	// Preload goes through all existing nodes from the index and add them to the
-	// status map as unmodified. This is currently the most reliable strategy
-	// although it comes at a performance cost in large repositories.
-	//
-	// This method is recommended when fetching the status of unmodified files.
-	// For example, to confirm the status of a specific file that is either
-	// untracked or unmodified.
-	Preload StatusStrategy = 1
-)
-
-func (s StatusStrategy) new(w *Worktree) (Status, error) {
-	switch s {
-	case Preload:
-		return preloadStatus(w)
-	case Empty:
-		return make(Status), nil
-	}
-	return nil, fmt.Errorf("%w: %+v", ErrUnsupportedStatusStrategy, s)
-}
-
-func preloadStatus(w *Worktree) (Status, error) {
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return nil, err
-	}
-
-	idxRoot := mindex.NewRootNode(idx)
-	nodes := []noder.Noder{idxRoot}
-
-	status := make(Status)
-	for len(nodes) > 0 {
-		var node noder.Noder
-		node, nodes = nodes[0], nodes[1:]
-		if node.IsDir() {
-			children, err := node.Children()
-			if err != nil {
-				return nil, err
-			}
-			nodes = append(nodes, children...)
-			continue
-		}
-		fs := status.File(node.Name())
-		fs.Worktree = Unmodified
-		fs.Staging = Unmodified
-	}
-
-	return status, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/config.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/config.go
deleted file mode 100644
index fa28d5af8..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/config.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package filesystem
-
-import (
-	"os"
-
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-type ConfigStorage struct {
-	dir *dotgit.DotGit
-}
-
-func (c *ConfigStorage) Config() (conf *config.Config, err error) {
-	f, err := c.dir.Config()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return config.NewConfig(), nil
-		}
-
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-	return config.ReadConfig(f)
-}
-
-func (c *ConfigStorage) SetConfig(cfg *config.Config) (err error) {
-	if err = cfg.Validate(); err != nil {
-		return err
-	}
-
-	f, err := c.dir.ConfigWriter()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-
-	b, err := cfg.Marshal()
-	if err != nil {
-		return err
-	}
-
-	_, err = f.Write(b)
-	return err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/deltaobject.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/deltaobject.go
deleted file mode 100644
index 65bf0d5e7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/deltaobject.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package filesystem
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-type deltaObject struct {
-	plumbing.EncodedObject
-	base plumbing.Hash
-	hash plumbing.Hash
-	size int64
-}
-
-func newDeltaObject(
-	obj plumbing.EncodedObject,
-	hash plumbing.Hash,
-	base plumbing.Hash,
-	size int64) plumbing.DeltaObject {
-	return &deltaObject{
-		EncodedObject: obj,
-		hash:          hash,
-		base:          base,
-		size:          size,
-	}
-}
-
-func (o *deltaObject) BaseHash() plumbing.Hash {
-	return o.base
-}
-
-func (o *deltaObject) ActualSize() int64 {
-	return o.size
-}
-
-func (o *deltaObject) ActualHash() plumbing.Hash {
-	return o.hash
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit.go
deleted file mode 100644
index 236dec6ed..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit.go
+++ /dev/null
@@ -1,1274 +0,0 @@
-// https://github.com/git/git/blob/master/Documentation/gitrepository-layout.txt
-package dotgit
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-	"github.com/jesseduffield/go-git/v5/storage"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/chroot"
-)
-
-const (
-	suffix         = ".git"
-	packedRefsPath = "packed-refs"
-	configPath     = "config"
-	indexPath      = "index"
-	shallowPath    = "shallow"
-	modulePath     = "modules"
-	objectsPath    = "objects"
-	packPath       = "pack"
-	refsPath       = "refs"
-	branchesPath   = "branches"
-	hooksPath      = "hooks"
-	infoPath       = "info"
-	remotesPath    = "remotes"
-	logsPath       = "logs"
-	worktreesPath  = "worktrees"
-	alternatesPath = "alternates"
-
-	tmpPackedRefsPrefix = "._packed-refs"
-
-	packPrefix = "pack-"
-	packExt    = ".pack"
-	idxExt     = ".idx"
-)
-
-var (
-	// ErrNotFound is returned by New when the path is not found.
-	ErrNotFound = errors.New("path not found")
-	// ErrIdxNotFound is returned by Idxfile when the idx file is not found
-	ErrIdxNotFound = errors.New("idx file not found")
-	// ErrPackfileNotFound is returned by Packfile when the packfile is not found
-	ErrPackfileNotFound = errors.New("packfile not found")
-	// ErrConfigNotFound is returned by Config when the config is not found
-	ErrConfigNotFound = errors.New("config file not found")
-	// ErrPackedRefsDuplicatedRef is returned when a duplicated reference is
-	// found in the packed-ref file. This is usually the case for corrupted git
-	// repositories.
-	ErrPackedRefsDuplicatedRef = errors.New("duplicated ref found in packed-ref file")
-	// ErrPackedRefsBadFormat is returned when the packed-ref file corrupt.
-	ErrPackedRefsBadFormat = errors.New("malformed packed-ref")
-	// ErrSymRefTargetNotFound is returned when a symbolic reference is
-	// targeting a non-existing object. This usually means the repository
-	// is corrupt.
-	ErrSymRefTargetNotFound = errors.New("symbolic reference target not found")
-	// ErrIsDir is returned when a reference file is attempting to be read,
-	// but the path specified is a directory.
-	ErrIsDir = errors.New("reference path is a directory")
-	// ErrEmptyRefFile is returned when a reference file is attempted to be read,
-	// but the file is empty
-	ErrEmptyRefFile = errors.New("ref file is empty")
-)
-
-// Options holds configuration for the storage.
-type Options struct {
-	// ExclusiveAccess means that the filesystem is not modified externally
-	// while the repo is open.
-	ExclusiveAccess bool
-	// KeepDescriptors makes the file descriptors to be reused but they will
-	// need to be manually closed calling Close().
-	KeepDescriptors bool
-	// AlternatesFS provides the billy filesystem to be used for Git Alternates.
-	// If none is provided, it falls back to using the underlying instance used for
-	// DotGit.
-	AlternatesFS billy.Filesystem
-}
-
-// The DotGit type represents a local git repository on disk. This
-// type is not zero-value-safe, use the New function to initialize it.
-type DotGit struct {
-	options Options
-	fs      billy.Filesystem
-
-	// incoming object directory information
-	incomingChecked bool
-	incomingDirName string
-
-	objectList []plumbing.Hash // sorted
-	objectMap  map[plumbing.Hash]struct{}
-	packList   []plumbing.Hash
-	packMap    map[plumbing.Hash]struct{}
-
-	files map[plumbing.Hash]billy.File
-}
-
-// New returns a DotGit value ready to be used. The path argument must
-// be the absolute path of a git repository directory (e.g.
-// "/foo/bar/.git").
-func New(fs billy.Filesystem) *DotGit {
-	return NewWithOptions(fs, Options{})
-}
-
-// NewWithOptions sets non default configuration options.
-// See New for complete help.
-func NewWithOptions(fs billy.Filesystem, o Options) *DotGit {
-	return &DotGit{
-		options: o,
-		fs:      fs,
-	}
-}
-
-// Initialize creates all the folder scaffolding.
-func (d *DotGit) Initialize() error {
-	mustExists := []string{
-		d.fs.Join("objects", "info"),
-		d.fs.Join("objects", "pack"),
-		d.fs.Join("refs", "heads"),
-		d.fs.Join("refs", "tags"),
-	}
-
-	for _, path := range mustExists {
-		_, err := d.fs.Stat(path)
-		if err == nil {
-			continue
-		}
-
-		if !os.IsNotExist(err) {
-			return err
-		}
-
-		if err := d.fs.MkdirAll(path, os.ModeDir|os.ModePerm); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Close closes all opened files.
-func (d *DotGit) Close() error {
-	var firstError error
-	if d.files != nil {
-		for _, f := range d.files {
-			err := f.Close()
-			if err != nil && firstError == nil {
-				firstError = err
-				continue
-			}
-		}
-
-		d.files = nil
-	}
-
-	if firstError != nil {
-		return firstError
-	}
-
-	return nil
-}
-
-// ConfigWriter returns a file pointer for write to the config file
-func (d *DotGit) ConfigWriter() (billy.File, error) {
-	return d.fs.Create(configPath)
-}
-
-// Config returns a file pointer for read to the config file
-func (d *DotGit) Config() (billy.File, error) {
-	return d.fs.Open(configPath)
-}
-
-// IndexWriter returns a file pointer for write to the index file
-func (d *DotGit) IndexWriter() (billy.File, error) {
-	return d.fs.Create(indexPath)
-}
-
-// Index returns a file pointer for read to the index file
-func (d *DotGit) Index() (billy.File, error) {
-	return d.fs.Open(indexPath)
-}
-
-// ShallowWriter returns a file pointer for write to the shallow file
-func (d *DotGit) ShallowWriter() (billy.File, error) {
-	return d.fs.Create(shallowPath)
-}
-
-// Shallow returns a file pointer for read to the shallow file
-func (d *DotGit) Shallow() (billy.File, error) {
-	f, err := d.fs.Open(shallowPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, nil
-		}
-
-		return nil, err
-	}
-
-	return f, nil
-}
-
-// NewObjectPack return a writer for a new packfile, it saves the packfile to
-// disk and also generates and save the index for the given packfile.
-func (d *DotGit) NewObjectPack() (*PackWriter, error) {
-	d.cleanPackList()
-	return newPackWrite(d.fs)
-}
-
-// ObjectPacks returns the list of availables packfiles
-func (d *DotGit) ObjectPacks() ([]plumbing.Hash, error) {
-	if !d.options.ExclusiveAccess {
-		return d.objectPacks()
-	}
-
-	err := d.genPackList()
-	if err != nil {
-		return nil, err
-	}
-
-	return d.packList, nil
-}
-
-func (d *DotGit) objectPacks() ([]plumbing.Hash, error) {
-	packDir := d.fs.Join(objectsPath, packPath)
-	files, err := d.fs.ReadDir(packDir)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, nil
-		}
-
-		return nil, err
-	}
-
-	var packs []plumbing.Hash
-	for _, f := range files {
-		n := f.Name()
-		if !strings.HasSuffix(n, packExt) || !strings.HasPrefix(n, packPrefix) {
-			continue
-		}
-
-		h := plumbing.NewHash(n[5 : len(n)-5]) // pack-(hash).pack
-		if h.IsZero() {
-			// Ignore files with badly-formatted names.
-			continue
-		}
-		packs = append(packs, h)
-	}
-
-	return packs, nil
-}
-
-func (d *DotGit) objectPackPath(hash plumbing.Hash, extension string) string {
-	return d.fs.Join(objectsPath, packPath, fmt.Sprintf("pack-%s.%s", hash.String(), extension))
-}
-
-func (d *DotGit) objectPackOpen(hash plumbing.Hash, extension string) (billy.File, error) {
-	if d.options.KeepDescriptors && extension == "pack" {
-		if d.files == nil {
-			d.files = make(map[plumbing.Hash]billy.File)
-		}
-
-		f, ok := d.files[hash]
-		if ok {
-			return f, nil
-		}
-	}
-
-	err := d.hasPack(hash)
-	if err != nil {
-		return nil, err
-	}
-
-	path := d.objectPackPath(hash, extension)
-	pack, err := d.fs.Open(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, ErrPackfileNotFound
-		}
-
-		return nil, err
-	}
-
-	if d.options.KeepDescriptors && extension == "pack" {
-		d.files[hash] = pack
-	}
-
-	return pack, nil
-}
-
-// ObjectPack returns a fs.File of the given packfile
-func (d *DotGit) ObjectPack(hash plumbing.Hash) (billy.File, error) {
-	err := d.hasPack(hash)
-	if err != nil {
-		return nil, err
-	}
-
-	return d.objectPackOpen(hash, `pack`)
-}
-
-// ObjectPackIdx returns a fs.File of the index file for a given packfile
-func (d *DotGit) ObjectPackIdx(hash plumbing.Hash) (billy.File, error) {
-	err := d.hasPack(hash)
-	if err != nil {
-		return nil, err
-	}
-
-	return d.objectPackOpen(hash, `idx`)
-}
-
-func (d *DotGit) DeleteOldObjectPackAndIndex(hash plumbing.Hash, t time.Time) error {
-	d.cleanPackList()
-
-	path := d.objectPackPath(hash, `pack`)
-	if !t.IsZero() {
-		fi, err := d.fs.Stat(path)
-		if err != nil {
-			return err
-		}
-		// too new, skip deletion.
-		if !fi.ModTime().Before(t) {
-			return nil
-		}
-	}
-	err := d.fs.Remove(path)
-	if err != nil {
-		return err
-	}
-	return d.fs.Remove(d.objectPackPath(hash, `idx`))
-}
-
-// NewObject return a writer for a new object file.
-func (d *DotGit) NewObject() (*ObjectWriter, error) {
-	d.cleanObjectList()
-
-	return newObjectWriter(d.fs)
-}
-
-// ObjectsWithPrefix returns the hashes of objects that have the given prefix.
-func (d *DotGit) ObjectsWithPrefix(prefix []byte) ([]plumbing.Hash, error) {
-	// Handle edge cases.
-	if len(prefix) < 1 {
-		return d.Objects()
-	} else if len(prefix) > len(plumbing.ZeroHash) {
-		return nil, nil
-	}
-
-	if d.options.ExclusiveAccess {
-		err := d.genObjectList()
-		if err != nil {
-			return nil, err
-		}
-
-		// Rely on d.objectList being sorted.
-		// Figure out the half-open interval defined by the prefix.
-		first := sort.Search(len(d.objectList), func(i int) bool {
-			// Same as plumbing.HashSlice.Less.
-			return bytes.Compare(d.objectList[i][:], prefix) >= 0
-		})
-		lim := len(d.objectList)
-		if limPrefix, overflow := incBytes(prefix); !overflow {
-			lim = sort.Search(len(d.objectList), func(i int) bool {
-				// Same as plumbing.HashSlice.Less.
-				return bytes.Compare(d.objectList[i][:], limPrefix) >= 0
-			})
-		}
-		return d.objectList[first:lim], nil
-	}
-
-	// This is the slow path.
-	var objects []plumbing.Hash
-	var n int
-	err := d.ForEachObjectHash(func(hash plumbing.Hash) error {
-		n++
-		if bytes.HasPrefix(hash[:], prefix) {
-			objects = append(objects, hash)
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return objects, nil
-}
-
-// Objects returns a slice with the hashes of objects found under the
-// .git/objects/ directory.
-func (d *DotGit) Objects() ([]plumbing.Hash, error) {
-	if d.options.ExclusiveAccess {
-		err := d.genObjectList()
-		if err != nil {
-			return nil, err
-		}
-
-		return d.objectList, nil
-	}
-
-	var objects []plumbing.Hash
-	err := d.ForEachObjectHash(func(hash plumbing.Hash) error {
-		objects = append(objects, hash)
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return objects, nil
-}
-
-// ForEachObjectHash iterates over the hashes of objects found under the
-// .git/objects/ directory and executes the provided function.
-func (d *DotGit) ForEachObjectHash(fun func(plumbing.Hash) error) error {
-	if !d.options.ExclusiveAccess {
-		return d.forEachObjectHash(fun)
-	}
-
-	err := d.genObjectList()
-	if err != nil {
-		return err
-	}
-
-	for _, h := range d.objectList {
-		err := fun(h)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (d *DotGit) forEachObjectHash(fun func(plumbing.Hash) error) error {
-	files, err := d.fs.ReadDir(objectsPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-
-		return err
-	}
-
-	for _, f := range files {
-		if f.IsDir() && len(f.Name()) == 2 && isHex(f.Name()) {
-			base := f.Name()
-			d, err := d.fs.ReadDir(d.fs.Join(objectsPath, base))
-			if err != nil {
-				return err
-			}
-
-			for _, o := range d {
-				h := plumbing.NewHash(base + o.Name())
-				if h.IsZero() {
-					// Ignore files with badly-formatted names.
-					continue
-				}
-				err = fun(h)
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (d *DotGit) cleanObjectList() {
-	d.objectMap = nil
-	d.objectList = nil
-}
-
-func (d *DotGit) genObjectList() error {
-	if d.objectMap != nil {
-		return nil
-	}
-
-	d.objectMap = make(map[plumbing.Hash]struct{})
-	populate := func(h plumbing.Hash) error {
-		d.objectList = append(d.objectList, h)
-		d.objectMap[h] = struct{}{}
-
-		return nil
-	}
-	if err := d.forEachObjectHash(populate); err != nil {
-		return err
-	}
-	plumbing.HashesSort(d.objectList)
-	return nil
-}
-
-func (d *DotGit) hasObject(h plumbing.Hash) error {
-	if !d.options.ExclusiveAccess {
-		return nil
-	}
-
-	err := d.genObjectList()
-	if err != nil {
-		return err
-	}
-
-	_, ok := d.objectMap[h]
-	if !ok {
-		return plumbing.ErrObjectNotFound
-	}
-
-	return nil
-}
-
-func (d *DotGit) cleanPackList() {
-	d.packMap = nil
-	d.packList = nil
-}
-
-func (d *DotGit) genPackList() error {
-	if d.packMap != nil {
-		return nil
-	}
-
-	op, err := d.objectPacks()
-	if err != nil {
-		return err
-	}
-
-	d.packMap = make(map[plumbing.Hash]struct{})
-	d.packList = nil
-
-	for _, h := range op {
-		d.packList = append(d.packList, h)
-		d.packMap[h] = struct{}{}
-	}
-
-	return nil
-}
-
-func (d *DotGit) hasPack(h plumbing.Hash) error {
-	if !d.options.ExclusiveAccess {
-		return nil
-	}
-
-	err := d.genPackList()
-	if err != nil {
-		return err
-	}
-
-	_, ok := d.packMap[h]
-	if !ok {
-		return ErrPackfileNotFound
-	}
-
-	return nil
-}
-
-func (d *DotGit) objectPath(h plumbing.Hash) string {
-	hex := h.String()
-	return d.fs.Join(objectsPath, hex[0:2], hex[2:hash.HexSize])
-}
-
-// incomingObjectPath is intended to add support for a git pre-receive hook
-// to be written it adds support for go-git to find objects in an "incoming"
-// directory, so that the library can be used to write a pre-receive hook
-// that deals with the incoming objects.
-//
-// More on git hooks found here : https://git-scm.com/docs/githooks
-// More on 'quarantine'/incoming directory here:
-//
-//	https://git-scm.com/docs/git-receive-pack
-func (d *DotGit) incomingObjectPath(h plumbing.Hash) string {
-	hString := h.String()
-
-	if d.incomingDirName == "" {
-		return d.fs.Join(objectsPath, hString[0:2], hString[2:hash.HexSize])
-	}
-
-	return d.fs.Join(objectsPath, d.incomingDirName, hString[0:2], hString[2:hash.HexSize])
-}
-
-// hasIncomingObjects searches for an incoming directory and keeps its name
-// so it doesn't have to be found each time an object is accessed.
-func (d *DotGit) hasIncomingObjects() bool {
-	if !d.incomingChecked {
-		directoryContents, err := d.fs.ReadDir(objectsPath)
-		if err == nil {
-			for _, file := range directoryContents {
-				if file.IsDir() && (strings.HasPrefix(file.Name(), "tmp_objdir-incoming-") ||
-					// Before Git 2.35 incoming commits directory had another prefix
-					strings.HasPrefix(file.Name(), "incoming-")) {
-					d.incomingDirName = file.Name()
-				}
-			}
-		}
-
-		d.incomingChecked = true
-	}
-
-	return d.incomingDirName != ""
-}
-
-// Object returns a fs.File pointing the object file, if exists
-func (d *DotGit) Object(h plumbing.Hash) (billy.File, error) {
-	err := d.hasObject(h)
-	if err != nil {
-		return nil, err
-	}
-
-	obj1, err1 := d.fs.Open(d.objectPath(h))
-	if os.IsNotExist(err1) && d.hasIncomingObjects() {
-		obj2, err2 := d.fs.Open(d.incomingObjectPath(h))
-		if err2 != nil {
-			return obj1, err1
-		}
-		return obj2, err2
-	}
-	return obj1, err1
-}
-
-// ObjectStat returns a os.FileInfo pointing the object file, if exists
-func (d *DotGit) ObjectStat(h plumbing.Hash) (os.FileInfo, error) {
-	err := d.hasObject(h)
-	if err != nil {
-		return nil, err
-	}
-
-	obj1, err1 := d.fs.Stat(d.objectPath(h))
-	if os.IsNotExist(err1) && d.hasIncomingObjects() {
-		obj2, err2 := d.fs.Stat(d.incomingObjectPath(h))
-		if err2 != nil {
-			return obj1, err1
-		}
-		return obj2, err2
-	}
-	return obj1, err1
-}
-
-// ObjectDelete removes the object file, if exists
-func (d *DotGit) ObjectDelete(h plumbing.Hash) error {
-	d.cleanObjectList()
-
-	err1 := d.fs.Remove(d.objectPath(h))
-	if os.IsNotExist(err1) && d.hasIncomingObjects() {
-		err2 := d.fs.Remove(d.incomingObjectPath(h))
-		if err2 != nil {
-			return err1
-		}
-		return err2
-	}
-	return err1
-}
-
-func (d *DotGit) readReferenceFrom(rd io.Reader, name string) (ref *plumbing.Reference, err error) {
-	b, err := io.ReadAll(rd)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(b) == 0 {
-		return nil, ErrEmptyRefFile
-	}
-
-	line := strings.TrimSpace(string(b))
-	return plumbing.NewReferenceFromStrings(name, line), nil
-}
-
-// checkReferenceAndTruncate reads the reference from the given file, or the `pack-refs` file if
-// the file was empty. Then it checks that the old reference matches the stored reference and
-// truncates the file.
-func (d *DotGit) checkReferenceAndTruncate(f billy.File, old *plumbing.Reference) error {
-	if old == nil {
-		return nil
-	}
-
-	ref, err := d.readReferenceFrom(f, old.Name().String())
-	if errors.Is(err, ErrEmptyRefFile) {
-		// This may happen if the reference is being read from a newly created file.
-		// In that case, try getting the reference from the packed refs file.
-		ref, err = d.packedRef(old.Name())
-	}
-
-	if err != nil {
-		return err
-	}
-
-	if ref.Hash() != old.Hash() {
-		return storage.ErrReferenceHasChanged
-	}
-	_, err = f.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	return f.Truncate(0)
-}
-
-func (d *DotGit) SetRef(r, old *plumbing.Reference) error {
-	var content string
-	switch r.Type() {
-	case plumbing.SymbolicReference:
-		content = fmt.Sprintf("ref: %s\n", r.Target())
-	case plumbing.HashReference:
-		content = fmt.Sprintln(r.Hash().String())
-	}
-
-	fileName := r.Name().String()
-
-	return d.setRef(fileName, content, old)
-}
-
-// Refs scans the git directory collecting references, which it returns.
-// Symbolic references are resolved and included in the output.
-func (d *DotGit) Refs() ([]*plumbing.Reference, error) {
-	var refs []*plumbing.Reference
-	seen := make(map[plumbing.ReferenceName]bool)
-	if err := d.addRefFromHEAD(&refs); err != nil {
-		return nil, err
-	}
-
-	if err := d.addRefsFromRefDir(&refs, seen); err != nil {
-		return nil, err
-	}
-
-	if err := d.addRefsFromPackedRefs(&refs, seen); err != nil {
-		return nil, err
-	}
-
-	return refs, nil
-}
-
-// Ref returns the reference for a given reference name.
-func (d *DotGit) Ref(name plumbing.ReferenceName) (*plumbing.Reference, error) {
-	ref, err := d.readReferenceFile(".", name.String())
-	if err == nil {
-		return ref, nil
-	}
-
-	return d.packedRef(name)
-}
-
-func (d *DotGit) findPackedRefsInFile(f billy.File, recv refsRecv) error {
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		ref, err := d.processLine(s.Text())
-		if err != nil {
-			return err
-		}
-
-		if !recv(ref) {
-			// skip parse
-			return nil
-		}
-	}
-	if err := s.Err(); err != nil {
-		return err
-	}
-	return nil
-}
-
-// refsRecv: returning true means that the reference continues to be resolved, otherwise it is stopped, which will speed up the lookup of a single reference.
-type refsRecv func(*plumbing.Reference) bool
-
-func (d *DotGit) findPackedRefs(recv refsRecv) error {
-	f, err := d.fs.Open(packedRefsPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-	return d.findPackedRefsInFile(f, recv)
-}
-
-func (d *DotGit) packedRef(name plumbing.ReferenceName) (*plumbing.Reference, error) {
-	var ref *plumbing.Reference
-	if err := d.findPackedRefs(func(r *plumbing.Reference) bool {
-		if r != nil && r.Name() == name {
-			ref = r
-			// ref found
-			return false
-		}
-		return true
-	}); err != nil {
-		return nil, err
-	}
-	if ref != nil {
-		return ref, nil
-	}
-	return nil, plumbing.ErrReferenceNotFound
-}
-
-// RemoveRef removes a reference by name.
-func (d *DotGit) RemoveRef(name plumbing.ReferenceName) error {
-	path := d.fs.Join(".", name.String())
-	_, err := d.fs.Stat(path)
-	if err == nil {
-		err = d.fs.Remove(path)
-		// Drop down to remove it from the packed refs file, too.
-	}
-
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	return d.rewritePackedRefsWithoutRef(name)
-}
-
-func refsRecvFunc(refs *[]*plumbing.Reference, seen map[plumbing.ReferenceName]bool) refsRecv {
-	return func(r *plumbing.Reference) bool {
-		if r != nil && !seen[r.Name()] {
-			*refs = append(*refs, r)
-			seen[r.Name()] = true
-		}
-		return true
-	}
-}
-
-func (d *DotGit) addRefsFromPackedRefs(refs *[]*plumbing.Reference, seen map[plumbing.ReferenceName]bool) (err error) {
-	return d.findPackedRefs(refsRecvFunc(refs, seen))
-}
-
-func (d *DotGit) addRefsFromPackedRefsFile(refs *[]*plumbing.Reference, f billy.File, seen map[plumbing.ReferenceName]bool) (err error) {
-	return d.findPackedRefsInFile(f, refsRecvFunc(refs, seen))
-}
-
-func (d *DotGit) openAndLockPackedRefs(doCreate bool) (
-	pr billy.File, err error,
-) {
-	var f billy.File
-	defer func() {
-		if err != nil && f != nil {
-			ioutil.CheckClose(f, &err)
-		}
-	}()
-
-	// File mode is retrieved from a constant defined in the target specific
-	// files (dotgit_rewrite_packed_refs_*). Some modes are not available
-	// in all filesystems.
-	openFlags := d.openAndLockPackedRefsMode()
-	if doCreate {
-		openFlags |= os.O_CREATE
-	}
-
-	// Keep trying to open and lock the file until we're sure the file
-	// didn't change between the open and the lock.
-	for {
-		f, err = d.fs.OpenFile(packedRefsPath, openFlags, 0600)
-		if err != nil {
-			if os.IsNotExist(err) && !doCreate {
-				return nil, nil
-			}
-
-			return nil, err
-		}
-		fi, err := d.fs.Stat(packedRefsPath)
-		if err != nil {
-			return nil, err
-		}
-		mtime := fi.ModTime()
-
-		err = f.Lock()
-		if err != nil {
-			return nil, err
-		}
-
-		fi, err = d.fs.Stat(packedRefsPath)
-		if err != nil {
-			return nil, err
-		}
-		if mtime.Equal(fi.ModTime()) {
-			break
-		}
-		// The file has changed since we opened it.  Close and retry.
-		err = f.Close()
-		if err != nil {
-			return nil, err
-		}
-	}
-	return f, nil
-}
-
-func (d *DotGit) rewritePackedRefsWithoutRef(name plumbing.ReferenceName) (err error) {
-	pr, err := d.openAndLockPackedRefs(false)
-	if err != nil {
-		return err
-	}
-	if pr == nil {
-		return nil
-	}
-	defer ioutil.CheckClose(pr, &err)
-
-	// Creating the temp file in the same directory as the target file
-	// improves our chances for rename operation to be atomic.
-	tmp, err := d.fs.TempFile("", tmpPackedRefsPrefix)
-	if err != nil {
-		return err
-	}
-	tmpName := tmp.Name()
-	defer func() {
-		ioutil.CheckClose(tmp, &err)
-		_ = d.fs.Remove(tmpName) // don't check err, we might have renamed it
-	}()
-
-	s := bufio.NewScanner(pr)
-	found := false
-	for s.Scan() {
-		line := s.Text()
-		ref, err := d.processLine(line)
-		if err != nil {
-			return err
-		}
-
-		if ref != nil && ref.Name() == name {
-			found = true
-			continue
-		}
-
-		if _, err := fmt.Fprintln(tmp, line); err != nil {
-			return err
-		}
-	}
-
-	if err := s.Err(); err != nil {
-		return err
-	}
-
-	if !found {
-		return nil
-	}
-
-	return d.rewritePackedRefsWhileLocked(tmp, pr)
-}
-
-// process lines from a packed-refs file
-func (d *DotGit) processLine(line string) (*plumbing.Reference, error) {
-	if len(line) == 0 {
-		return nil, nil
-	}
-
-	switch line[0] {
-	case '#': // comment - ignore
-		return nil, nil
-	case '^': // annotated tag commit of the previous line - ignore
-		return nil, nil
-	default:
-		ws := strings.Split(line, " ") // hash then ref
-		if len(ws) != 2 {
-			return nil, ErrPackedRefsBadFormat
-		}
-
-		return plumbing.NewReferenceFromStrings(ws[1], ws[0]), nil
-	}
-}
-
-func (d *DotGit) addRefsFromRefDir(refs *[]*plumbing.Reference, seen map[plumbing.ReferenceName]bool) error {
-	return d.walkReferencesTree(refs, []string{refsPath}, seen)
-}
-
-func (d *DotGit) walkReferencesTree(refs *[]*plumbing.Reference, relPath []string, seen map[plumbing.ReferenceName]bool) error {
-	files, err := d.fs.ReadDir(d.fs.Join(relPath...))
-	if err != nil {
-		if os.IsNotExist(err) {
-			// a race happened, and our directory is gone now
-			return nil
-		}
-
-		return err
-	}
-
-	for _, f := range files {
-		newRelPath := append(append([]string(nil), relPath...), f.Name())
-		if f.IsDir() {
-			if err = d.walkReferencesTree(refs, newRelPath, seen); err != nil {
-				return err
-			}
-
-			continue
-		}
-
-		ref, err := d.readReferenceFile(".", strings.Join(newRelPath, "/"))
-		if os.IsNotExist(err) {
-			// a race happened, and our file is gone now
-			continue
-		}
-		if err != nil {
-			return err
-		}
-
-		if ref != nil && !seen[ref.Name()] {
-			*refs = append(*refs, ref)
-			seen[ref.Name()] = true
-		}
-	}
-
-	return nil
-}
-
-func (d *DotGit) addRefFromHEAD(refs *[]*plumbing.Reference) error {
-	ref, err := d.readReferenceFile(".", "HEAD")
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-
-		return err
-	}
-
-	*refs = append(*refs, ref)
-	return nil
-}
-
-func (d *DotGit) readReferenceFile(path, name string) (ref *plumbing.Reference, err error) {
-	path = d.fs.Join(path, d.fs.Join(strings.Split(name, "/")...))
-	st, err := d.fs.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-	if st.IsDir() {
-		return nil, ErrIsDir
-	}
-
-	f, err := d.fs.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer ioutil.CheckClose(f, &err)
-
-	return d.readReferenceFrom(f, name)
-}
-
-func (d *DotGit) CountLooseRefs() (int, error) {
-	var refs []*plumbing.Reference
-	seen := make(map[plumbing.ReferenceName]bool)
-	if err := d.addRefsFromRefDir(&refs, seen); err != nil {
-		return 0, err
-	}
-
-	return len(refs), nil
-}
-
-// PackRefs packs all loose refs into the packed-refs file.
-//
-// This implementation only works under the assumption that the view
-// of the file system won't be updated during this operation.  This
-// strategy would not work on a general file system though, without
-// locking each loose reference and checking it again before deleting
-// the file, because otherwise an updated reference could sneak in and
-// then be deleted by the packed-refs process.  Alternatively, every
-// ref update could also lock packed-refs, so only one lock is
-// required during ref-packing.  But that would worsen performance in
-// the common case.
-//
-// TODO: add an "all" boolean like the `git pack-refs --all` flag.
-// When `all` is false, it would only pack refs that have already been
-// packed, plus all tags.
-func (d *DotGit) PackRefs() (err error) {
-	// Lock packed-refs, and create it if it doesn't exist yet.
-	f, err := d.openAndLockPackedRefs(true)
-	if err != nil {
-		return err
-	}
-	defer ioutil.CheckClose(f, &err)
-
-	// Gather all refs using addRefsFromRefDir and addRefsFromPackedRefs.
-	var refs []*plumbing.Reference
-	seen := make(map[plumbing.ReferenceName]bool)
-	if err = d.addRefsFromRefDir(&refs, seen); err != nil {
-		return err
-	}
-	if len(refs) == 0 {
-		// Nothing to do!
-		return nil
-	}
-	numLooseRefs := len(refs)
-	if err = d.addRefsFromPackedRefsFile(&refs, f, seen); err != nil {
-		return err
-	}
-
-	// Write them all to a new temp packed-refs file.
-	tmp, err := d.fs.TempFile("", tmpPackedRefsPrefix)
-	if err != nil {
-		return err
-	}
-	tmpName := tmp.Name()
-	defer func() {
-		ioutil.CheckClose(tmp, &err)
-		_ = d.fs.Remove(tmpName) // don't check err, we might have renamed it
-	}()
-
-	w := bufio.NewWriter(tmp)
-	for _, ref := range refs {
-		_, err = w.WriteString(ref.String() + "\n")
-		if err != nil {
-			return err
-		}
-	}
-	err = w.Flush()
-	if err != nil {
-		return err
-	}
-
-	// Rename the temp packed-refs file.
-	err = d.rewritePackedRefsWhileLocked(tmp, f)
-	if err != nil {
-		return err
-	}
-
-	// Delete all the loose refs, while still holding the packed-refs
-	// lock.
-	for _, ref := range refs[:numLooseRefs] {
-		path := d.fs.Join(".", ref.Name().String())
-		err = d.fs.Remove(path)
-		if err != nil && !os.IsNotExist(err) {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Module return a billy.Filesystem pointing to the module folder
-func (d *DotGit) Module(name string) (billy.Filesystem, error) {
-	return d.fs.Chroot(d.fs.Join(modulePath, name))
-}
-
-func (d *DotGit) AddAlternate(remote string) error {
-	altpath := d.fs.Join(objectsPath, infoPath, alternatesPath)
-
-	f, err := d.fs.OpenFile(altpath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0640)
-	if err != nil {
-		return fmt.Errorf("cannot open file: %w", err)
-	}
-	defer f.Close()
-
-	// locking in windows throws an error, based on comments
-	// https://github.com/go-git/go-git/pull/860#issuecomment-1751823044
-	// do not lock on windows platform.
-	if runtime.GOOS != "windows" {
-		if err = f.Lock(); err != nil {
-			return fmt.Errorf("cannot lock file: %w", err)
-		}
-		defer f.Unlock()
-	}
-
-	line := path.Join(remote, objectsPath) + "\n"
-	_, err = io.WriteString(f, line)
-	if err != nil {
-		return fmt.Errorf("error writing 'alternates' file: %w", err)
-	}
-
-	return nil
-}
-
-// Alternates returns DotGit(s) based off paths in objects/info/alternates if
-// available. This can be used to checks if it's a shared repository.
-func (d *DotGit) Alternates() ([]*DotGit, error) {
-	altpath := d.fs.Join(objectsPath, infoPath, alternatesPath)
-	f, err := d.fs.Open(altpath)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	fs := d.options.AlternatesFS
-	if fs == nil {
-		fs = d.fs
-	}
-
-	var alternates []*DotGit
-	seen := make(map[string]struct{})
-
-	// Read alternate paths line-by-line and create DotGit objects.
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		path := scanner.Text()
-
-		// Avoid creating multiple dotgits for the same alternative path.
-		if _, ok := seen[path]; ok {
-			continue
-		}
-
-		seen[path] = struct{}{}
-
-		if filepath.IsAbs(path) {
-			// Handling absolute paths should be straight-forward. However, the default osfs (Chroot)
-			// tries to concatenate an abs path with the root path in some operations (e.g. Stat),
-			// which leads to unexpected errors. Therefore, make the path relative to the current FS instead.
-			if reflect.TypeOf(fs) == reflect.TypeOf(&chroot.ChrootHelper{}) {
-				path, err = filepath.Rel(fs.Root(), path)
-				if err != nil {
-					return nil, fmt.Errorf("cannot make path %q relative: %w", path, err)
-				}
-			}
-		} else {
-			// By Git conventions, relative paths should be based on the object database (.git/objects/info)
-			// location as per: https://www.kernel.org/pub/software/scm/git/docs/gitrepository-layout.html
-			// However, due to the nature of go-git and its filesystem handling via Billy, paths cannot
-			// cross its "chroot boundaries". Therefore, ignore any "../" and treat the path from the
-			// fs root. If this is not correct based on the dotgit fs, set a different one via AlternatesFS.
-			abs := filepath.Join(string(filepath.Separator), filepath.ToSlash(path))
-			path = filepath.FromSlash(abs)
-		}
-
-		// Aligns with upstream behavior: exit if target path is not a valid directory.
-		if fi, err := fs.Stat(path); err != nil || !fi.IsDir() {
-			return nil, fmt.Errorf("invalid object directory %q: %w", path, err)
-		}
-		afs, err := fs.Chroot(filepath.Dir(path))
-		if err != nil {
-			return nil, fmt.Errorf("cannot chroot %q: %w", path, err)
-		}
-		alternates = append(alternates, New(afs))
-	}
-
-	if err = scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	return alternates, nil
-}
-
-// Fs returns the underlying filesystem of the DotGit folder.
-func (d *DotGit) Fs() billy.Filesystem {
-	return d.fs
-}
-
-func isHex(s string) bool {
-	for _, b := range []byte(s) {
-		if isNum(b) {
-			continue
-		}
-		if isHexAlpha(b) {
-			continue
-		}
-
-		return false
-	}
-
-	return true
-}
-
-func isNum(b byte) bool {
-	return b >= '0' && b <= '9'
-}
-
-func isHexAlpha(b byte) bool {
-	return b >= 'a' && b <= 'f' || b >= 'A' && b <= 'F'
-}
-
-// incBytes increments a byte slice, which involves incrementing the
-// right-most byte, and following carry leftward.
-// It makes a copy so that the provided slice's underlying array is not modified.
-// If the overall operation overflows (e.g. incBytes(0xff, 0xff)), the second return parameter indicates that.
-func incBytes(in []byte) (out []byte, overflow bool) {
-	out = make([]byte, len(in))
-	copy(out, in)
-	for i := len(out) - 1; i >= 0; i-- {
-		out[i]++
-		if out[i] != 0 {
-			return // Didn't overflow.
-		}
-	}
-	overflow = true
-	return
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go
deleted file mode 100644
index d0ee2f3d9..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package dotgit
-
-import (
-	"io"
-	"os"
-	"runtime"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-func (d *DotGit) openAndLockPackedRefsMode() int {
-	if billy.CapabilityCheck(d.fs, billy.ReadAndWriteCapability) {
-		return os.O_RDWR
-	}
-
-	return os.O_RDONLY
-}
-
-func (d *DotGit) rewritePackedRefsWhileLocked(
-	tmp billy.File, pr billy.File) error {
-	// Try plain rename. If we aren't using the bare Windows filesystem as the
-	// storage layer, we might be able to get away with a rename over a locked
-	// file.
-	err := d.fs.Rename(tmp.Name(), pr.Name())
-	if err == nil {
-		return nil
-	}
-
-	// If we are in a filesystem that does not support rename (e.g. sivafs)
-	// a full copy is done.
-	if err == billy.ErrNotSupported {
-		return d.copyNewFile(tmp, pr)
-	}
-
-	if runtime.GOOS != "windows" {
-		return err
-	}
-
-	// Otherwise, Windows doesn't let us rename over a locked file, so
-	// we have to do a straight copy.  Unfortunately this could result
-	// in a partially-written file if the process fails before the
-	// copy completes.
-	return d.copyToExistingFile(tmp, pr)
-}
-
-func (d *DotGit) copyToExistingFile(tmp, pr billy.File) error {
-	_, err := pr.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	err = pr.Truncate(0)
-	if err != nil {
-		return err
-	}
-	_, err = tmp.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	_, err = io.Copy(pr, tmp)
-
-	return err
-}
-
-func (d *DotGit) copyNewFile(tmp billy.File, pr billy.File) (err error) {
-	prWrite, err := d.fs.Create(pr.Name())
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(prWrite, &err)
-
-	_, err = tmp.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-
-	_, err = io.Copy(prWrite, tmp)
-
-	return err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit_setref.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit_setref.go
deleted file mode 100644
index 31a81dddb..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/dotgit_setref.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package dotgit
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-func (d *DotGit) setRef(fileName, content string, old *plumbing.Reference) (err error) {
-	if billy.CapabilityCheck(d.fs, billy.ReadAndWriteCapability) {
-		return d.setRefRwfs(fileName, content, old)
-	}
-
-	return d.setRefNorwfs(fileName, content, old)
-}
-
-func (d *DotGit) setRefRwfs(fileName, content string, old *plumbing.Reference) (err error) {
-	// If we are not checking an old ref, just truncate the file.
-	mode := os.O_RDWR | os.O_CREATE
-	if old == nil {
-		mode |= os.O_TRUNC
-	}
-
-	f, err := d.fs.OpenFile(fileName, mode, 0666)
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-
-	// Lock is unlocked by the deferred Close above. This is because Unlock
-	// does not imply a fsync and thus there would be a race between
-	// Unlock+Close and other concurrent writers. Adding Sync to go-billy
-	// could work, but this is better (and avoids superfluous syncs).
-	err = f.Lock()
-	if err != nil {
-		return err
-	}
-
-	// this is a no-op to call even when old is nil.
-	err = d.checkReferenceAndTruncate(f, old)
-	if err != nil {
-		return err
-	}
-
-	_, err = f.Write([]byte(content))
-	return err
-}
-
-// There are some filesystems that don't support opening files in RDWD mode.
-// In these filesystems the standard SetRef function can not be used as it
-// reads the reference file to check that it's not modified before updating it.
-//
-// This version of the function writes the reference without extra checks
-// making it compatible with these simple filesystems. This is usually not
-// a problem as they should be accessed by only one process at a time.
-func (d *DotGit) setRefNorwfs(fileName, content string, old *plumbing.Reference) error {
-	_, err := d.fs.Stat(fileName)
-	if err == nil && old != nil {
-		fRead, err := d.fs.Open(fileName)
-		if err != nil {
-			return err
-		}
-
-		ref, err := d.readReferenceFrom(fRead, old.Name().String())
-		fRead.Close()
-
-		if err != nil {
-			return err
-		}
-
-		if ref.Hash() != old.Hash() {
-			return fmt.Errorf("reference has changed concurrently")
-		}
-	}
-
-	f, err := d.fs.Create(fileName)
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-
-	_, err = f.Write([]byte(content))
-	return err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/reader.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/reader.go
deleted file mode 100644
index 28f3f1cf7..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/reader.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package dotgit
-
-import (
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/objfile"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-var _ (plumbing.EncodedObject) = &EncodedObject{}
-
-type EncodedObject struct {
-	dir *DotGit
-	h   plumbing.Hash
-	t   plumbing.ObjectType
-	sz  int64
-}
-
-func (e *EncodedObject) Hash() plumbing.Hash {
-	return e.h
-}
-
-func (e *EncodedObject) Reader() (io.ReadCloser, error) {
-	f, err := e.dir.Object(e.h)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, plumbing.ErrObjectNotFound
-		}
-
-		return nil, err
-	}
-	r, err := objfile.NewReader(f)
-	if err != nil {
-		return nil, err
-	}
-
-	t, size, err := r.Header()
-	if err != nil {
-		_ = r.Close()
-		return nil, err
-	}
-	if t != e.t {
-		_ = r.Close()
-		return nil, objfile.ErrHeader
-	}
-	if size != e.sz {
-		_ = r.Close()
-		return nil, objfile.ErrHeader
-	}
-	return ioutil.NewReadCloserWithCloser(r, f.Close), nil
-}
-
-func (e *EncodedObject) SetType(plumbing.ObjectType) {}
-
-func (e *EncodedObject) Type() plumbing.ObjectType {
-	return e.t
-}
-
-func (e *EncodedObject) Size() int64 {
-	return e.sz
-}
-
-func (e *EncodedObject) SetSize(int64) {}
-
-func (e *EncodedObject) Writer() (io.WriteCloser, error) {
-	return nil, fmt.Errorf("not supported")
-}
-
-func NewEncodedObject(dir *DotGit, h plumbing.Hash, t plumbing.ObjectType, size int64) *EncodedObject {
-	return &EncodedObject{
-		dir: dir,
-		h:   h,
-		t:   t,
-		sz:  size,
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/repository_filesystem.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/repository_filesystem.go
deleted file mode 100644
index 8d243efea..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/repository_filesystem.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package dotgit
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// RepositoryFilesystem is a billy.Filesystem compatible object wrapper
-// which handles dot-git filesystem operations and supports commondir according to git scm layout:
-// https://github.com/git/git/blob/master/Documentation/gitrepository-layout.txt
-type RepositoryFilesystem struct {
-	dotGitFs       billy.Filesystem
-	commonDotGitFs billy.Filesystem
-}
-
-func NewRepositoryFilesystem(dotGitFs, commonDotGitFs billy.Filesystem) *RepositoryFilesystem {
-	return &RepositoryFilesystem{
-		dotGitFs:       dotGitFs,
-		commonDotGitFs: commonDotGitFs,
-	}
-}
-
-func (fs *RepositoryFilesystem) mapToRepositoryFsByPath(path string) billy.Filesystem {
-	// Nothing to decide if commondir not defined
-	if fs.commonDotGitFs == nil {
-		return fs.dotGitFs
-	}
-
-	cleanPath := filepath.Clean(path)
-
-	// Check exceptions for commondir (https://git-scm.com/docs/gitrepository-layout#Documentation/gitrepository-layout.txt)
-	switch cleanPath {
-	case fs.dotGitFs.Join(logsPath, "HEAD"):
-		return fs.dotGitFs
-	case fs.dotGitFs.Join(refsPath, "bisect"), fs.dotGitFs.Join(refsPath, "rewritten"), fs.dotGitFs.Join(refsPath, "worktree"):
-		return fs.dotGitFs
-	}
-
-	// Determine dot-git root by first path element.
-	// There are some elements which should always use commondir when commondir defined.
-	// Usual dot-git root will be used for the rest of files.
-	switch strings.Split(cleanPath, string(filepath.Separator))[0] {
-	case objectsPath, refsPath, packedRefsPath, configPath, branchesPath, hooksPath, infoPath, remotesPath, logsPath, shallowPath, worktreesPath:
-		return fs.commonDotGitFs
-	default:
-		return fs.dotGitFs
-	}
-}
-
-func (fs *RepositoryFilesystem) Create(filename string) (billy.File, error) {
-	return fs.mapToRepositoryFsByPath(filename).Create(filename)
-}
-
-func (fs *RepositoryFilesystem) Open(filename string) (billy.File, error) {
-	return fs.mapToRepositoryFsByPath(filename).Open(filename)
-}
-
-func (fs *RepositoryFilesystem) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
-	return fs.mapToRepositoryFsByPath(filename).OpenFile(filename, flag, perm)
-}
-
-func (fs *RepositoryFilesystem) Stat(filename string) (os.FileInfo, error) {
-	return fs.mapToRepositoryFsByPath(filename).Stat(filename)
-}
-
-func (fs *RepositoryFilesystem) Rename(oldpath, newpath string) error {
-	return fs.mapToRepositoryFsByPath(oldpath).Rename(oldpath, newpath)
-}
-
-func (fs *RepositoryFilesystem) Remove(filename string) error {
-	return fs.mapToRepositoryFsByPath(filename).Remove(filename)
-}
-
-func (fs *RepositoryFilesystem) Join(elem ...string) string {
-	return fs.dotGitFs.Join(elem...)
-}
-
-func (fs *RepositoryFilesystem) TempFile(dir, prefix string) (billy.File, error) {
-	return fs.mapToRepositoryFsByPath(dir).TempFile(dir, prefix)
-}
-
-func (fs *RepositoryFilesystem) ReadDir(path string) ([]os.FileInfo, error) {
-	return fs.mapToRepositoryFsByPath(path).ReadDir(path)
-}
-
-func (fs *RepositoryFilesystem) MkdirAll(filename string, perm os.FileMode) error {
-	return fs.mapToRepositoryFsByPath(filename).MkdirAll(filename, perm)
-}
-
-func (fs *RepositoryFilesystem) Lstat(filename string) (os.FileInfo, error) {
-	return fs.mapToRepositoryFsByPath(filename).Lstat(filename)
-}
-
-func (fs *RepositoryFilesystem) Symlink(target, link string) error {
-	return fs.mapToRepositoryFsByPath(target).Symlink(target, link)
-}
-
-func (fs *RepositoryFilesystem) Readlink(link string) (string, error) {
-	return fs.mapToRepositoryFsByPath(link).Readlink(link)
-}
-
-func (fs *RepositoryFilesystem) Chroot(path string) (billy.Filesystem, error) {
-	return fs.mapToRepositoryFsByPath(path).Chroot(path)
-}
-
-func (fs *RepositoryFilesystem) Root() string {
-	return fs.dotGitFs.Root()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/writers.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/writers.go
deleted file mode 100644
index 6ef097d95..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit/writers.go
+++ /dev/null
@@ -1,285 +0,0 @@
-package dotgit
-
-import (
-	"fmt"
-	"io"
-	"sync/atomic"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/idxfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/objfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/packfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/hash"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// PackWriter is a io.Writer that generates the packfile index simultaneously,
-// a packfile.Decoder is used with a file reader to read the file being written
-// this operation is synchronized with the write operations.
-// The packfile is written in a temp file, when Close is called this file
-// is renamed/moved (depends on the Filesystem implementation) to the final
-// location, if the PackWriter is not used, nothing is written
-type PackWriter struct {
-	Notify func(plumbing.Hash, *idxfile.Writer)
-
-	fs       billy.Filesystem
-	fr, fw   billy.File
-	synced   *syncedReader
-	checksum plumbing.Hash
-	parser   *packfile.Parser
-	writer   *idxfile.Writer
-	result   chan error
-}
-
-func newPackWrite(fs billy.Filesystem) (*PackWriter, error) {
-	fw, err := fs.TempFile(fs.Join(objectsPath, packPath), "tmp_pack_")
-	if err != nil {
-		return nil, err
-	}
-
-	fr, err := fs.Open(fw.Name())
-	if err != nil {
-		return nil, err
-	}
-
-	writer := &PackWriter{
-		fs:     fs,
-		fw:     fw,
-		fr:     fr,
-		synced: newSyncedReader(fw, fr),
-		result: make(chan error),
-	}
-
-	go writer.buildIndex()
-	return writer, nil
-}
-
-func (w *PackWriter) buildIndex() {
-	s := packfile.NewScanner(w.synced)
-	w.writer = new(idxfile.Writer)
-	var err error
-	w.parser, err = packfile.NewParser(s, w.writer)
-	if err != nil {
-		w.result <- err
-		return
-	}
-
-	checksum, err := w.parser.Parse()
-	if err != nil {
-		w.result <- err
-		return
-	}
-
-	w.checksum = checksum
-	w.result <- err
-}
-
-// waitBuildIndex waits until buildIndex function finishes, this can terminate
-// with a packfile.ErrEmptyPackfile, this means that nothing was written so we
-// ignore the error
-func (w *PackWriter) waitBuildIndex() error {
-	err := <-w.result
-	if err == packfile.ErrEmptyPackfile {
-		return nil
-	}
-
-	return err
-}
-
-func (w *PackWriter) Write(p []byte) (int, error) {
-	return w.synced.Write(p)
-}
-
-// Close closes all the file descriptors and save the final packfile, if nothing
-// was written, the tempfiles are deleted without writing a packfile.
-func (w *PackWriter) Close() error {
-	defer func() {
-		if w.Notify != nil && w.writer != nil && w.writer.Finished() {
-			w.Notify(w.checksum, w.writer)
-		}
-
-		close(w.result)
-	}()
-
-	if err := w.synced.Close(); err != nil {
-		return err
-	}
-
-	if err := w.waitBuildIndex(); err != nil {
-		return err
-	}
-
-	if err := w.fr.Close(); err != nil {
-		return err
-	}
-
-	if err := w.fw.Close(); err != nil {
-		return err
-	}
-
-	if w.writer == nil || !w.writer.Finished() {
-		return w.clean()
-	}
-
-	return w.save()
-}
-
-func (w *PackWriter) clean() error {
-	return w.fs.Remove(w.fw.Name())
-}
-
-func (w *PackWriter) save() error {
-	base := w.fs.Join(objectsPath, packPath, fmt.Sprintf("pack-%s", w.checksum))
-	idx, err := w.fs.Create(fmt.Sprintf("%s.idx", base))
-	if err != nil {
-		return err
-	}
-
-	if err := w.encodeIdx(idx); err != nil {
-		return err
-	}
-
-	if err := idx.Close(); err != nil {
-		return err
-	}
-
-	return w.fs.Rename(w.fw.Name(), fmt.Sprintf("%s.pack", base))
-}
-
-func (w *PackWriter) encodeIdx(writer io.Writer) error {
-	idx, err := w.writer.Index()
-	if err != nil {
-		return err
-	}
-
-	e := idxfile.NewEncoder(writer)
-	_, err = e.Encode(idx)
-	return err
-}
-
-type syncedReader struct {
-	w io.Writer
-	r io.ReadSeeker
-
-	blocked, done uint32
-	written, read uint64
-	news          chan bool
-}
-
-func newSyncedReader(w io.Writer, r io.ReadSeeker) *syncedReader {
-	return &syncedReader{
-		w:    w,
-		r:    r,
-		news: make(chan bool),
-	}
-}
-
-func (s *syncedReader) Write(p []byte) (n int, err error) {
-	defer func() {
-		written := atomic.AddUint64(&s.written, uint64(n))
-		read := atomic.LoadUint64(&s.read)
-		if written > read {
-			s.wake()
-		}
-	}()
-
-	n, err = s.w.Write(p)
-	return
-}
-
-func (s *syncedReader) Read(p []byte) (n int, err error) {
-	defer func() { atomic.AddUint64(&s.read, uint64(n)) }()
-
-	for {
-		s.sleep()
-		n, err = s.r.Read(p)
-		if err == io.EOF && !s.isDone() && n == 0 {
-			continue
-		}
-
-		break
-	}
-
-	return
-}
-
-func (s *syncedReader) isDone() bool {
-	return atomic.LoadUint32(&s.done) == 1
-}
-
-func (s *syncedReader) isBlocked() bool {
-	return atomic.LoadUint32(&s.blocked) == 1
-}
-
-func (s *syncedReader) wake() {
-	if s.isBlocked() {
-		atomic.StoreUint32(&s.blocked, 0)
-		s.news <- true
-	}
-}
-
-func (s *syncedReader) sleep() {
-	read := atomic.LoadUint64(&s.read)
-	written := atomic.LoadUint64(&s.written)
-	if read >= written {
-		atomic.StoreUint32(&s.blocked, 1)
-		<-s.news
-	}
-
-}
-
-func (s *syncedReader) Seek(offset int64, whence int) (int64, error) {
-	if whence == io.SeekCurrent {
-		return s.r.Seek(offset, whence)
-	}
-
-	p, err := s.r.Seek(offset, whence)
-	atomic.StoreUint64(&s.read, uint64(p))
-
-	return p, err
-}
-
-func (s *syncedReader) Close() error {
-	atomic.StoreUint32(&s.done, 1)
-	close(s.news)
-	return nil
-}
-
-type ObjectWriter struct {
-	objfile.Writer
-	fs billy.Filesystem
-	f  billy.File
-}
-
-func newObjectWriter(fs billy.Filesystem) (*ObjectWriter, error) {
-	f, err := fs.TempFile(fs.Join(objectsPath, packPath), "tmp_obj_")
-	if err != nil {
-		return nil, err
-	}
-
-	return &ObjectWriter{
-		Writer: (*objfile.NewWriter(f)),
-		fs:     fs,
-		f:      f,
-	}, nil
-}
-
-func (w *ObjectWriter) Close() error {
-	if err := w.Writer.Close(); err != nil {
-		return err
-	}
-
-	if err := w.f.Close(); err != nil {
-		return err
-	}
-
-	return w.save()
-}
-
-func (w *ObjectWriter) save() error {
-	hex := w.Hash().String()
-	file := w.fs.Join(objectsPath, hex[0:2], hex[2:hash.HexSize])
-
-	return w.fs.Rename(w.f.Name(), file)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/index.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/index.go
deleted file mode 100644
index 8c10e4788..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/index.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package filesystem
-
-import (
-	"bufio"
-	"os"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-type IndexStorage struct {
-	dir *dotgit.DotGit
-}
-
-func (s *IndexStorage) SetIndex(idx *index.Index) (err error) {
-	f, err := s.dir.IndexWriter()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-	bw := bufio.NewWriter(f)
-	defer func() {
-		if e := bw.Flush(); err == nil && e != nil {
-			err = e
-		}
-	}()
-
-	e := index.NewEncoder(bw)
-	err = e.Encode(idx)
-	return err
-}
-
-func (s *IndexStorage) Index() (i *index.Index, err error) {
-	idx := &index.Index{
-		Version: 2,
-	}
-
-	f, err := s.dir.Index()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return idx, nil
-		}
-
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-
-	d := index.NewDecoder(f)
-	err = d.Decode(idx)
-	return idx, err
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/module.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/module.go
deleted file mode 100644
index 77de7dbab..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/module.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package filesystem
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/storage"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-)
-
-type ModuleStorage struct {
-	dir *dotgit.DotGit
-}
-
-func (s *ModuleStorage) Module(name string) (storage.Storer, error) {
-	fs, err := s.dir.Module(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewStorage(fs, cache.NewObjectLRUDefault()), nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/object.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/object.go
deleted file mode 100644
index 64e24496a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/object.go
+++ /dev/null
@@ -1,892 +0,0 @@
-package filesystem
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/idxfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/objfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/packfile"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-type ObjectStorage struct {
-	options Options
-
-	// objectCache is an object cache uses to cache delta's bases and also recently
-	// loaded loose objects
-	objectCache cache.Object
-
-	dir   *dotgit.DotGit
-	index map[plumbing.Hash]idxfile.Index
-
-	packList    []plumbing.Hash
-	packListIdx int
-	packfiles   map[plumbing.Hash]*packfile.Packfile
-}
-
-// NewObjectStorage creates a new ObjectStorage with the given .git directory and cache.
-func NewObjectStorage(dir *dotgit.DotGit, objectCache cache.Object) *ObjectStorage {
-	return NewObjectStorageWithOptions(dir, objectCache, Options{})
-}
-
-// NewObjectStorageWithOptions creates a new ObjectStorage with the given .git directory, cache and extra options
-func NewObjectStorageWithOptions(dir *dotgit.DotGit, objectCache cache.Object, ops Options) *ObjectStorage {
-	return &ObjectStorage{
-		options:     ops,
-		objectCache: objectCache,
-		dir:         dir,
-	}
-}
-
-func (s *ObjectStorage) requireIndex() error {
-	if s.index != nil {
-		return nil
-	}
-
-	s.index = make(map[plumbing.Hash]idxfile.Index)
-	packs, err := s.dir.ObjectPacks()
-	if err != nil {
-		return err
-	}
-
-	for _, h := range packs {
-		if err := s.loadIdxFile(h); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Reindex indexes again all packfiles. Useful if git changed packfiles externally
-func (s *ObjectStorage) Reindex() {
-	s.index = nil
-}
-
-func (s *ObjectStorage) loadIdxFile(h plumbing.Hash) (err error) {
-	f, err := s.dir.ObjectPackIdx(h)
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-
-	idxf := idxfile.NewMemoryIndex()
-	d := idxfile.NewDecoder(f)
-	if err = d.Decode(idxf); err != nil {
-		return err
-	}
-
-	s.index[h] = idxf
-	return err
-}
-
-func (s *ObjectStorage) NewEncodedObject() plumbing.EncodedObject {
-	return &plumbing.MemoryObject{}
-}
-
-func (s *ObjectStorage) PackfileWriter() (io.WriteCloser, error) {
-	if err := s.requireIndex(); err != nil {
-		return nil, err
-	}
-
-	w, err := s.dir.NewObjectPack()
-	if err != nil {
-		return nil, err
-	}
-
-	w.Notify = func(h plumbing.Hash, writer *idxfile.Writer) {
-		index, err := writer.Index()
-		if err == nil {
-			s.index[h] = index
-		}
-	}
-
-	return w, nil
-}
-
-// SetEncodedObject adds a new object to the storage.
-func (s *ObjectStorage) SetEncodedObject(o plumbing.EncodedObject) (h plumbing.Hash, err error) {
-	if o.Type() == plumbing.OFSDeltaObject || o.Type() == plumbing.REFDeltaObject {
-		return plumbing.ZeroHash, plumbing.ErrInvalidType
-	}
-
-	ow, err := s.dir.NewObject()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	defer ioutil.CheckClose(ow, &err)
-
-	or, err := o.Reader()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	defer ioutil.CheckClose(or, &err)
-
-	if err = ow.WriteHeader(o.Type(), o.Size()); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if _, err = io.Copy(ow, or); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return o.Hash(), err
-}
-
-// LazyWriter returns a lazy ObjectWriter that is bound to a DotGit file.
-// It first write the header passing on the object type and size, so
-// that the object contents can be written later, without the need to
-// create a MemoryObject and buffering its entire contents into memory.
-func (s *ObjectStorage) LazyWriter() (w io.WriteCloser, wh func(typ plumbing.ObjectType, sz int64) error, err error) {
-	ow, err := s.dir.NewObject()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return ow, ow.WriteHeader, nil
-}
-
-// HasEncodedObject returns nil if the object exists, without actually
-// reading the object data from storage.
-func (s *ObjectStorage) HasEncodedObject(h plumbing.Hash) (err error) {
-	// Check unpacked objects
-	f, err := s.dir.Object(h)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return err
-		}
-		// Fall through to check packed objects.
-	} else {
-		defer ioutil.CheckClose(f, &err)
-		return nil
-	}
-
-	// Check packed objects.
-	if err := s.requireIndex(); err != nil {
-		return err
-	}
-	_, _, offset := s.findObjectInPackfile(h)
-	if offset == -1 {
-		return plumbing.ErrObjectNotFound
-	}
-	return nil
-}
-
-func (s *ObjectStorage) encodedObjectSizeFromUnpacked(h plumbing.Hash) (
-	size int64, err error) {
-	f, err := s.dir.Object(h)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return 0, plumbing.ErrObjectNotFound
-		}
-
-		return 0, err
-	}
-
-	r, err := objfile.NewReader(f)
-	if err != nil {
-		return 0, err
-	}
-	defer ioutil.CheckClose(r, &err)
-
-	_, size, err = r.Header()
-	return size, err
-}
-
-func (s *ObjectStorage) packfile(idx idxfile.Index, pack plumbing.Hash) (*packfile.Packfile, error) {
-	if p := s.packfileFromCache(pack); p != nil {
-		return p, nil
-	}
-
-	f, err := s.dir.ObjectPack(pack)
-	if err != nil {
-		return nil, err
-	}
-
-	var p *packfile.Packfile
-	if s.objectCache != nil {
-		p = packfile.NewPackfileWithCache(idx, s.dir.Fs(), f, s.objectCache, s.options.LargeObjectThreshold)
-	} else {
-		p = packfile.NewPackfile(idx, s.dir.Fs(), f, s.options.LargeObjectThreshold)
-	}
-
-	return p, s.storePackfileInCache(pack, p)
-}
-
-func (s *ObjectStorage) packfileFromCache(hash plumbing.Hash) *packfile.Packfile {
-	if s.packfiles == nil {
-		if s.options.KeepDescriptors {
-			s.packfiles = make(map[plumbing.Hash]*packfile.Packfile)
-		} else if s.options.MaxOpenDescriptors > 0 {
-			s.packList = make([]plumbing.Hash, s.options.MaxOpenDescriptors)
-			s.packfiles = make(map[plumbing.Hash]*packfile.Packfile, s.options.MaxOpenDescriptors)
-		}
-	}
-
-	return s.packfiles[hash]
-}
-
-func (s *ObjectStorage) storePackfileInCache(hash plumbing.Hash, p *packfile.Packfile) error {
-	if s.options.KeepDescriptors {
-		s.packfiles[hash] = p
-		return nil
-	}
-
-	if s.options.MaxOpenDescriptors <= 0 {
-		return nil
-	}
-
-	// start over as the limit of packList is hit
-	if s.packListIdx >= len(s.packList) {
-		s.packListIdx = 0
-	}
-
-	// close the existing packfile if open
-	if next := s.packList[s.packListIdx]; !next.IsZero() {
-		open := s.packfiles[next]
-		delete(s.packfiles, next)
-		if open != nil {
-			if err := open.Close(); err != nil {
-				return err
-			}
-		}
-	}
-
-	// cache newly open packfile
-	s.packList[s.packListIdx] = hash
-	s.packfiles[hash] = p
-	s.packListIdx++
-
-	return nil
-}
-
-func (s *ObjectStorage) encodedObjectSizeFromPackfile(h plumbing.Hash) (
-	size int64, err error) {
-	if err := s.requireIndex(); err != nil {
-		return 0, err
-	}
-
-	pack, _, offset := s.findObjectInPackfile(h)
-	if offset == -1 {
-		return 0, plumbing.ErrObjectNotFound
-	}
-
-	idx := s.index[pack]
-	hash, err := idx.FindHash(offset)
-	if err == nil {
-		obj, ok := s.objectCache.Get(hash)
-		if ok {
-			return obj.Size(), nil
-		}
-	} else if err != nil && err != plumbing.ErrObjectNotFound {
-		return 0, err
-	}
-
-	p, err := s.packfile(idx, pack)
-	if err != nil {
-		return 0, err
-	}
-
-	if !s.options.KeepDescriptors && s.options.MaxOpenDescriptors == 0 {
-		defer ioutil.CheckClose(p, &err)
-	}
-
-	return p.GetSizeByOffset(offset)
-}
-
-// EncodedObjectSize returns the plaintext size of the given object,
-// without actually reading the full object data from storage.
-func (s *ObjectStorage) EncodedObjectSize(h plumbing.Hash) (
-	size int64, err error) {
-	size, err = s.encodedObjectSizeFromUnpacked(h)
-	if err != nil && err != plumbing.ErrObjectNotFound {
-		return 0, err
-	} else if err == nil {
-		return size, nil
-	}
-
-	return s.encodedObjectSizeFromPackfile(h)
-}
-
-// EncodedObject returns the object with the given hash, by searching for it in
-// the packfile and the git object directories.
-func (s *ObjectStorage) EncodedObject(t plumbing.ObjectType, h plumbing.Hash) (plumbing.EncodedObject, error) {
-	var obj plumbing.EncodedObject
-	var err error
-
-	if s.index != nil {
-		obj, err = s.getFromPackfile(h, false)
-		if err == plumbing.ErrObjectNotFound {
-			obj, err = s.getFromUnpacked(h)
-		}
-	} else {
-		obj, err = s.getFromUnpacked(h)
-		if err == plumbing.ErrObjectNotFound {
-			obj, err = s.getFromPackfile(h, false)
-		}
-	}
-
-	// If the error is still object not found, check if it's a shared object
-	// repository.
-	if err == plumbing.ErrObjectNotFound {
-		dotgits, e := s.dir.Alternates()
-		if e == nil {
-			// Create a new object storage with the DotGit(s) and check for the
-			// required hash object. Skip when not found.
-			for _, dg := range dotgits {
-				o := NewObjectStorage(dg, s.objectCache)
-				enobj, enerr := o.EncodedObject(t, h)
-				if enerr != nil {
-					continue
-				}
-				return enobj, nil
-			}
-		}
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if plumbing.AnyObject != t && obj.Type() != t {
-		return nil, plumbing.ErrObjectNotFound
-	}
-
-	return obj, nil
-}
-
-// DeltaObject returns the object with the given hash, by searching for
-// it in the packfile and the git object directories.
-func (s *ObjectStorage) DeltaObject(t plumbing.ObjectType,
-	h plumbing.Hash) (plumbing.EncodedObject, error) {
-	obj, err := s.getFromUnpacked(h)
-	if err == plumbing.ErrObjectNotFound {
-		obj, err = s.getFromPackfile(h, true)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if plumbing.AnyObject != t && obj.Type() != t {
-		return nil, plumbing.ErrObjectNotFound
-	}
-
-	return obj, nil
-}
-
-func (s *ObjectStorage) getFromUnpacked(h plumbing.Hash) (obj plumbing.EncodedObject, err error) {
-	f, err := s.dir.Object(h)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, plumbing.ErrObjectNotFound
-		}
-
-		return nil, err
-	}
-	defer ioutil.CheckClose(f, &err)
-
-	if cacheObj, found := s.objectCache.Get(h); found {
-		return cacheObj, nil
-	}
-
-	r, err := objfile.NewReader(f)
-	if err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(r, &err)
-
-	t, size, err := r.Header()
-	if err != nil {
-		return nil, err
-	}
-
-	if s.options.LargeObjectThreshold > 0 && size > s.options.LargeObjectThreshold {
-		obj = dotgit.NewEncodedObject(s.dir, h, t, size)
-		return obj, nil
-	}
-
-	obj = s.NewEncodedObject()
-
-	obj.SetType(t)
-	obj.SetSize(size)
-	w, err := obj.Writer()
-	if err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(w, &err)
-
-	bufp := copyBufferPool.Get().(*[]byte)
-	buf := *bufp
-	_, err = io.CopyBuffer(w, r, buf)
-	copyBufferPool.Put(bufp)
-
-	s.objectCache.Put(obj)
-
-	return obj, err
-}
-
-var copyBufferPool = sync.Pool{
-	New: func() interface{} {
-		b := make([]byte, 32*1024)
-		return &b
-	},
-}
-
-// Get returns the object with the given hash, by searching for it in
-// the packfile.
-func (s *ObjectStorage) getFromPackfile(h plumbing.Hash, canBeDelta bool) (
-	plumbing.EncodedObject, error) {
-
-	if err := s.requireIndex(); err != nil {
-		return nil, err
-	}
-
-	pack, hash, offset := s.findObjectInPackfile(h)
-	if offset == -1 {
-		return nil, plumbing.ErrObjectNotFound
-	}
-
-	idx := s.index[pack]
-	p, err := s.packfile(idx, pack)
-	if err != nil {
-		return nil, err
-	}
-
-	if !s.options.KeepDescriptors && s.options.MaxOpenDescriptors == 0 {
-		defer ioutil.CheckClose(p, &err)
-	}
-
-	if canBeDelta {
-		return s.decodeDeltaObjectAt(p, offset, hash)
-	}
-
-	return s.decodeObjectAt(p, offset)
-}
-
-func (s *ObjectStorage) decodeObjectAt(
-	p *packfile.Packfile,
-	offset int64,
-) (plumbing.EncodedObject, error) {
-	hash, err := p.FindHash(offset)
-	if err == nil {
-		obj, ok := s.objectCache.Get(hash)
-		if ok {
-			return obj, nil
-		}
-	}
-
-	if err != nil && err != plumbing.ErrObjectNotFound {
-		return nil, err
-	}
-
-	return p.GetByOffset(offset)
-}
-
-func (s *ObjectStorage) decodeDeltaObjectAt(
-	p *packfile.Packfile,
-	offset int64,
-	hash plumbing.Hash,
-) (plumbing.EncodedObject, error) {
-	scan := p.Scanner()
-	header, err := scan.SeekObjectHeader(offset)
-	if err != nil {
-		return nil, err
-	}
-
-	var (
-		base plumbing.Hash
-	)
-
-	switch header.Type {
-	case plumbing.REFDeltaObject:
-		base = header.Reference
-	case plumbing.OFSDeltaObject:
-		base, err = p.FindHash(header.OffsetReference)
-		if err != nil {
-			return nil, err
-		}
-	default:
-		return s.decodeObjectAt(p, offset)
-	}
-
-	obj := &plumbing.MemoryObject{}
-	obj.SetType(header.Type)
-	w, err := obj.Writer()
-	if err != nil {
-		return nil, err
-	}
-
-	if _, _, err := scan.NextObject(w); err != nil {
-		return nil, err
-	}
-
-	return newDeltaObject(obj, hash, base, header.Length), nil
-}
-
-func (s *ObjectStorage) findObjectInPackfile(h plumbing.Hash) (plumbing.Hash, plumbing.Hash, int64) {
-	for packfile, index := range s.index {
-		offset, err := index.FindOffset(h)
-		if err == nil {
-			return packfile, h, offset
-		}
-	}
-
-	return plumbing.ZeroHash, plumbing.ZeroHash, -1
-}
-
-// HashesWithPrefix returns all objects with a hash that starts with a prefix by searching for
-// them in the packfile and the git object directories.
-func (s *ObjectStorage) HashesWithPrefix(prefix []byte) ([]plumbing.Hash, error) {
-	hashes, err := s.dir.ObjectsWithPrefix(prefix)
-	if err != nil {
-		return nil, err
-	}
-
-	seen := hashListAsMap(hashes)
-
-	// TODO: This could be faster with some idxfile changes,
-	// or diving into the packfile.
-	if err := s.requireIndex(); err != nil {
-		return nil, err
-	}
-	for _, index := range s.index {
-		ei, err := index.Entries()
-		if err != nil {
-			return nil, err
-		}
-		for {
-			e, err := ei.Next()
-			if err == io.EOF {
-				break
-			} else if err != nil {
-				return nil, err
-			}
-			if bytes.HasPrefix(e.Hash[:], prefix) {
-				if _, ok := seen[e.Hash]; ok {
-					continue
-				}
-				hashes = append(hashes, e.Hash)
-			}
-		}
-		ei.Close()
-	}
-
-	return hashes, nil
-}
-
-// IterEncodedObjects returns an iterator for all the objects in the packfile
-// with the given type.
-func (s *ObjectStorage) IterEncodedObjects(t plumbing.ObjectType) (storer.EncodedObjectIter, error) {
-	objects, err := s.dir.Objects()
-	if err != nil {
-		return nil, err
-	}
-
-	seen := make(map[plumbing.Hash]struct{})
-	var iters []storer.EncodedObjectIter
-	if len(objects) != 0 {
-		iters = append(iters, &objectsIter{s: s, t: t, h: objects})
-		seen = hashListAsMap(objects)
-	}
-
-	packi, err := s.buildPackfileIters(t, seen)
-	if err != nil {
-		return nil, err
-	}
-
-	iters = append(iters, packi)
-	return storer.NewMultiEncodedObjectIter(iters), nil
-}
-
-func (s *ObjectStorage) buildPackfileIters(
-	t plumbing.ObjectType,
-	seen map[plumbing.Hash]struct{},
-) (storer.EncodedObjectIter, error) {
-	if err := s.requireIndex(); err != nil {
-		return nil, err
-	}
-
-	packs, err := s.dir.ObjectPacks()
-	if err != nil {
-		return nil, err
-	}
-	return &lazyPackfilesIter{
-		hashes: packs,
-		open: func(h plumbing.Hash) (storer.EncodedObjectIter, error) {
-			pack, err := s.dir.ObjectPack(h)
-			if err != nil {
-				return nil, err
-			}
-			return newPackfileIter(
-				s.dir.Fs(), pack, t, seen, s.index[h],
-				s.objectCache, s.options.KeepDescriptors,
-				s.options.LargeObjectThreshold,
-			)
-		},
-	}, nil
-}
-
-// Close closes all opened files.
-func (s *ObjectStorage) Close() error {
-	var firstError error
-	if s.options.KeepDescriptors || s.options.MaxOpenDescriptors > 0 {
-		for _, packfile := range s.packfiles {
-			err := packfile.Close()
-			if firstError == nil && err != nil {
-				firstError = err
-			}
-		}
-	}
-
-	s.packfiles = nil
-	s.dir.Close()
-
-	return firstError
-}
-
-type lazyPackfilesIter struct {
-	hashes []plumbing.Hash
-	open   func(h plumbing.Hash) (storer.EncodedObjectIter, error)
-	cur    storer.EncodedObjectIter
-}
-
-func (it *lazyPackfilesIter) Next() (plumbing.EncodedObject, error) {
-	for {
-		if it.cur == nil {
-			if len(it.hashes) == 0 {
-				return nil, io.EOF
-			}
-			h := it.hashes[0]
-			it.hashes = it.hashes[1:]
-
-			sub, err := it.open(h)
-			if err == io.EOF {
-				continue
-			} else if err != nil {
-				return nil, err
-			}
-			it.cur = sub
-		}
-		ob, err := it.cur.Next()
-		if err == io.EOF {
-			it.cur.Close()
-			it.cur = nil
-			continue
-		} else if err != nil {
-			return nil, err
-		}
-		return ob, nil
-	}
-}
-
-func (it *lazyPackfilesIter) ForEach(cb func(plumbing.EncodedObject) error) error {
-	return storer.ForEachIterator(it, cb)
-}
-
-func (it *lazyPackfilesIter) Close() {
-	if it.cur != nil {
-		it.cur.Close()
-		it.cur = nil
-	}
-	it.hashes = nil
-}
-
-type packfileIter struct {
-	pack billy.File
-	iter storer.EncodedObjectIter
-	seen map[plumbing.Hash]struct{}
-
-	// tells whether the pack file should be left open after iteration or not
-	keepPack bool
-}
-
-// NewPackfileIter returns a new EncodedObjectIter for the provided packfile
-// and object type. Packfile and index file will be closed after they're
-// used. If keepPack is true the packfile won't be closed after the iteration
-// finished.
-func NewPackfileIter(
-	fs billy.Filesystem,
-	f billy.File,
-	idxFile billy.File,
-	t plumbing.ObjectType,
-	keepPack bool,
-	largeObjectThreshold int64,
-) (storer.EncodedObjectIter, error) {
-	idx := idxfile.NewMemoryIndex()
-	if err := idxfile.NewDecoder(idxFile).Decode(idx); err != nil {
-		return nil, err
-	}
-
-	if err := idxFile.Close(); err != nil {
-		return nil, err
-	}
-
-	seen := make(map[plumbing.Hash]struct{})
-	return newPackfileIter(fs, f, t, seen, idx, nil, keepPack, largeObjectThreshold)
-}
-
-func newPackfileIter(
-	fs billy.Filesystem,
-	f billy.File,
-	t plumbing.ObjectType,
-	seen map[plumbing.Hash]struct{},
-	index idxfile.Index,
-	cache cache.Object,
-	keepPack bool,
-	largeObjectThreshold int64,
-) (storer.EncodedObjectIter, error) {
-	var p *packfile.Packfile
-	if cache != nil {
-		p = packfile.NewPackfileWithCache(index, fs, f, cache, largeObjectThreshold)
-	} else {
-		p = packfile.NewPackfile(index, fs, f, largeObjectThreshold)
-	}
-
-	iter, err := p.GetByType(t)
-	if err != nil {
-		return nil, err
-	}
-
-	return &packfileIter{
-		pack:     f,
-		iter:     iter,
-		seen:     seen,
-		keepPack: keepPack,
-	}, nil
-}
-
-func (iter *packfileIter) Next() (plumbing.EncodedObject, error) {
-	for {
-		obj, err := iter.iter.Next()
-		if err != nil {
-			return nil, err
-		}
-
-		if _, ok := iter.seen[obj.Hash()]; ok {
-			continue
-		}
-
-		return obj, nil
-	}
-}
-
-func (iter *packfileIter) ForEach(cb func(plumbing.EncodedObject) error) error {
-	for {
-		o, err := iter.Next()
-		if err != nil {
-			if err == io.EOF {
-				iter.Close()
-				return nil
-			}
-			return err
-		}
-
-		if err := cb(o); err != nil {
-			return err
-		}
-	}
-}
-
-func (iter *packfileIter) Close() {
-	iter.iter.Close()
-	if !iter.keepPack {
-		_ = iter.pack.Close()
-	}
-}
-
-type objectsIter struct {
-	s *ObjectStorage
-	t plumbing.ObjectType
-	h []plumbing.Hash
-}
-
-func (iter *objectsIter) Next() (plumbing.EncodedObject, error) {
-	if len(iter.h) == 0 {
-		return nil, io.EOF
-	}
-
-	obj, err := iter.s.getFromUnpacked(iter.h[0])
-	iter.h = iter.h[1:]
-
-	if err != nil {
-		return nil, err
-	}
-
-	if iter.t != plumbing.AnyObject && iter.t != obj.Type() {
-		return iter.Next()
-	}
-
-	return obj, err
-}
-
-func (iter *objectsIter) ForEach(cb func(plumbing.EncodedObject) error) error {
-	for {
-		o, err := iter.Next()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-			return err
-		}
-
-		if err := cb(o); err != nil {
-			return err
-		}
-	}
-}
-
-func (iter *objectsIter) Close() {
-	iter.h = []plumbing.Hash{}
-}
-
-func hashListAsMap(l []plumbing.Hash) map[plumbing.Hash]struct{} {
-	m := make(map[plumbing.Hash]struct{}, len(l))
-	for _, h := range l {
-		m[h] = struct{}{}
-	}
-	return m
-}
-
-func (s *ObjectStorage) ForEachObjectHash(fun func(plumbing.Hash) error) error {
-	err := s.dir.ForEachObjectHash(fun)
-	if err == storer.ErrStop {
-		return nil
-	}
-	return err
-}
-
-func (s *ObjectStorage) LooseObjectTime(hash plumbing.Hash) (time.Time, error) {
-	fi, err := s.dir.ObjectStat(hash)
-	if err != nil {
-		return time.Time{}, err
-	}
-	return fi.ModTime(), nil
-}
-
-func (s *ObjectStorage) DeleteLooseObject(hash plumbing.Hash) error {
-	return s.dir.ObjectDelete(hash)
-}
-
-func (s *ObjectStorage) ObjectPacks() ([]plumbing.Hash, error) {
-	return s.dir.ObjectPacks()
-}
-
-func (s *ObjectStorage) DeleteOldObjectPackAndIndex(h plumbing.Hash, t time.Time) error {
-	return s.dir.DeleteOldObjectPackAndIndex(h, t)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/reference.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/reference.go
deleted file mode 100644
index d6a79fce5..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/reference.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package filesystem
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-)
-
-type ReferenceStorage struct {
-	dir *dotgit.DotGit
-}
-
-func (r *ReferenceStorage) SetReference(ref *plumbing.Reference) error {
-	return r.dir.SetRef(ref, nil)
-}
-
-func (r *ReferenceStorage) CheckAndSetReference(ref, old *plumbing.Reference) error {
-	return r.dir.SetRef(ref, old)
-}
-
-func (r *ReferenceStorage) Reference(n plumbing.ReferenceName) (*plumbing.Reference, error) {
-	return r.dir.Ref(n)
-}
-
-func (r *ReferenceStorage) IterReferences() (storer.ReferenceIter, error) {
-	refs, err := r.dir.Refs()
-	if err != nil {
-		return nil, err
-	}
-
-	return storer.NewReferenceSliceIter(refs), nil
-}
-
-func (r *ReferenceStorage) RemoveReference(n plumbing.ReferenceName) error {
-	return r.dir.RemoveRef(n)
-}
-
-func (r *ReferenceStorage) CountLooseRefs() (int, error) {
-	return r.dir.CountLooseRefs()
-}
-
-func (r *ReferenceStorage) PackRefs() error {
-	return r.dir.PackRefs()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/shallow.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/shallow.go
deleted file mode 100644
index 5f898fc1c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/shallow.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package filesystem
-
-import (
-	"bufio"
-	"fmt"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-)
-
-// ShallowStorage where the shallow commits are stored, an internal to
-// manipulate the shallow file
-type ShallowStorage struct {
-	dir *dotgit.DotGit
-}
-
-// SetShallow save the shallows in the shallow file in the .git folder as one
-// commit per line represented by 40-byte hexadecimal object terminated by a
-// newline.
-func (s *ShallowStorage) SetShallow(commits []plumbing.Hash) error {
-	f, err := s.dir.ShallowWriter()
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-	for _, h := range commits {
-		if _, err := fmt.Fprintf(f, "%s\n", h); err != nil {
-			return err
-		}
-	}
-
-	return err
-}
-
-// Shallow returns the shallow commits reading from shallo file from .git
-func (s *ShallowStorage) Shallow() ([]plumbing.Hash, error) {
-	f, err := s.dir.Shallow()
-	if f == nil || err != nil {
-		return nil, err
-	}
-
-	defer ioutil.CheckClose(f, &err)
-
-	var hash []plumbing.Hash
-
-	scn := bufio.NewScanner(f)
-	for scn.Scan() {
-		hash = append(hash, plumbing.NewHash(scn.Text()))
-	}
-
-	return hash, scn.Err()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/storage.go b/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/storage.go
deleted file mode 100644
index 39633a675..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/filesystem/storage.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Package filesystem is a storage backend base on filesystems
-package filesystem
-
-import (
-	"github.com/jesseduffield/go-git/v5/plumbing/cache"
-	"github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-// Storage is an implementation of git.Storer that stores data on disk in the
-// standard git format (this is, the .git directory). Zero values of this type
-// are not safe to use, see the NewStorage function below.
-type Storage struct {
-	fs  billy.Filesystem
-	dir *dotgit.DotGit
-
-	ObjectStorage
-	ReferenceStorage
-	IndexStorage
-	ShallowStorage
-	ConfigStorage
-	ModuleStorage
-}
-
-// Options holds configuration for the storage.
-type Options struct {
-	// ExclusiveAccess means that the filesystem is not modified externally
-	// while the repo is open.
-	ExclusiveAccess bool
-	// KeepDescriptors makes the file descriptors to be reused but they will
-	// need to be manually closed calling Close().
-	KeepDescriptors bool
-	// MaxOpenDescriptors is the max number of file descriptors to keep
-	// open. If KeepDescriptors is true, all file descriptors will remain open.
-	MaxOpenDescriptors int
-	// LargeObjectThreshold maximum object size (in bytes) that will be read in to memory.
-	// If left unset or set to 0 there is no limit
-	LargeObjectThreshold int64
-	// AlternatesFS provides the billy filesystem to be used for Git Alternates.
-	// If none is provided, it falls back to using the underlying instance used for
-	// DotGit.
-	AlternatesFS billy.Filesystem
-}
-
-// NewStorage returns a new Storage backed by a given `fs.Filesystem` and cache.
-func NewStorage(fs billy.Filesystem, cache cache.Object) *Storage {
-	return NewStorageWithOptions(fs, cache, Options{})
-}
-
-// NewStorageWithOptions returns a new Storage with extra options,
-// backed by a given `fs.Filesystem` and cache.
-func NewStorageWithOptions(fs billy.Filesystem, cache cache.Object, ops Options) *Storage {
-	dirOps := dotgit.Options{
-		ExclusiveAccess: ops.ExclusiveAccess,
-		AlternatesFS:    ops.AlternatesFS,
-	}
-	dir := dotgit.NewWithOptions(fs, dirOps)
-
-	return &Storage{
-		fs:  fs,
-		dir: dir,
-
-		ObjectStorage:    *NewObjectStorageWithOptions(dir, cache, ops),
-		ReferenceStorage: ReferenceStorage{dir: dir},
-		IndexStorage:     IndexStorage{dir: dir},
-		ShallowStorage:   ShallowStorage{dir: dir},
-		ConfigStorage:    ConfigStorage{dir: dir},
-		ModuleStorage:    ModuleStorage{dir: dir},
-	}
-}
-
-// Filesystem returns the underlying filesystem
-func (s *Storage) Filesystem() billy.Filesystem {
-	return s.fs
-}
-
-// Init initializes .git directory
-func (s *Storage) Init() error {
-	return s.dir.Initialize()
-}
-
-func (s *Storage) AddAlternate(remote string) error {
-	return s.dir.AddAlternate(remote)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/memory/storage.go b/vendor/github.com/jesseduffield/go-git/v5/storage/memory/storage.go
deleted file mode 100644
index db30af597..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/memory/storage.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Package memory is a storage backend base on memory
-package memory
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/storage"
-)
-
-var ErrUnsupportedObjectType = fmt.Errorf("unsupported object type")
-
-// Storage is an implementation of git.Storer that stores data on memory, being
-// ephemeral. The use of this storage should be done in controlled environments,
-// since the representation in memory of some repository can fill the machine
-// memory. in the other hand this storage has the best performance.
-type Storage struct {
-	ConfigStorage
-	ObjectStorage
-	ShallowStorage
-	IndexStorage
-	ReferenceStorage
-	ModuleStorage
-}
-
-// NewStorage returns a new Storage base on memory
-func NewStorage() *Storage {
-	return &Storage{
-		ReferenceStorage: make(ReferenceStorage),
-		ConfigStorage:    ConfigStorage{},
-		ShallowStorage:   ShallowStorage{},
-		ObjectStorage: ObjectStorage{
-			Objects: make(map[plumbing.Hash]plumbing.EncodedObject),
-			Commits: make(map[plumbing.Hash]plumbing.EncodedObject),
-			Trees:   make(map[plumbing.Hash]plumbing.EncodedObject),
-			Blobs:   make(map[plumbing.Hash]plumbing.EncodedObject),
-			Tags:    make(map[plumbing.Hash]plumbing.EncodedObject),
-		},
-		ModuleStorage: make(ModuleStorage),
-	}
-}
-
-type ConfigStorage struct {
-	config *config.Config
-}
-
-func (c *ConfigStorage) SetConfig(cfg *config.Config) error {
-	if err := cfg.Validate(); err != nil {
-		return err
-	}
-
-	c.config = cfg
-	return nil
-}
-
-func (c *ConfigStorage) Config() (*config.Config, error) {
-	if c.config == nil {
-		c.config = config.NewConfig()
-	}
-
-	return c.config, nil
-}
-
-type IndexStorage struct {
-	index *index.Index
-}
-
-func (c *IndexStorage) SetIndex(idx *index.Index) error {
-	c.index = idx
-	return nil
-}
-
-func (c *IndexStorage) Index() (*index.Index, error) {
-	if c.index == nil {
-		c.index = &index.Index{Version: 2}
-	}
-
-	return c.index, nil
-}
-
-type ObjectStorage struct {
-	Objects map[plumbing.Hash]plumbing.EncodedObject
-	Commits map[plumbing.Hash]plumbing.EncodedObject
-	Trees   map[plumbing.Hash]plumbing.EncodedObject
-	Blobs   map[plumbing.Hash]plumbing.EncodedObject
-	Tags    map[plumbing.Hash]plumbing.EncodedObject
-}
-
-func (o *ObjectStorage) NewEncodedObject() plumbing.EncodedObject {
-	return &plumbing.MemoryObject{}
-}
-
-func (o *ObjectStorage) SetEncodedObject(obj plumbing.EncodedObject) (plumbing.Hash, error) {
-	h := obj.Hash()
-	o.Objects[h] = obj
-
-	switch obj.Type() {
-	case plumbing.CommitObject:
-		o.Commits[h] = o.Objects[h]
-	case plumbing.TreeObject:
-		o.Trees[h] = o.Objects[h]
-	case plumbing.BlobObject:
-		o.Blobs[h] = o.Objects[h]
-	case plumbing.TagObject:
-		o.Tags[h] = o.Objects[h]
-	default:
-		return h, ErrUnsupportedObjectType
-	}
-
-	return h, nil
-}
-
-func (o *ObjectStorage) HasEncodedObject(h plumbing.Hash) (err error) {
-	if _, ok := o.Objects[h]; !ok {
-		return plumbing.ErrObjectNotFound
-	}
-	return nil
-}
-
-func (o *ObjectStorage) EncodedObjectSize(h plumbing.Hash) (
-	size int64, err error) {
-	obj, ok := o.Objects[h]
-	if !ok {
-		return 0, plumbing.ErrObjectNotFound
-	}
-
-	return obj.Size(), nil
-}
-
-func (o *ObjectStorage) EncodedObject(t plumbing.ObjectType, h plumbing.Hash) (plumbing.EncodedObject, error) {
-	obj, ok := o.Objects[h]
-	if !ok || (plumbing.AnyObject != t && obj.Type() != t) {
-		return nil, plumbing.ErrObjectNotFound
-	}
-
-	return obj, nil
-}
-
-func (o *ObjectStorage) IterEncodedObjects(t plumbing.ObjectType) (storer.EncodedObjectIter, error) {
-	var series []plumbing.EncodedObject
-	switch t {
-	case plumbing.AnyObject:
-		series = flattenObjectMap(o.Objects)
-	case plumbing.CommitObject:
-		series = flattenObjectMap(o.Commits)
-	case plumbing.TreeObject:
-		series = flattenObjectMap(o.Trees)
-	case plumbing.BlobObject:
-		series = flattenObjectMap(o.Blobs)
-	case plumbing.TagObject:
-		series = flattenObjectMap(o.Tags)
-	}
-
-	return storer.NewEncodedObjectSliceIter(series), nil
-}
-
-func flattenObjectMap(m map[plumbing.Hash]plumbing.EncodedObject) []plumbing.EncodedObject {
-	objects := make([]plumbing.EncodedObject, 0, len(m))
-	for _, obj := range m {
-		objects = append(objects, obj)
-	}
-	return objects
-}
-
-func (o *ObjectStorage) Begin() storer.Transaction {
-	return &TxObjectStorage{
-		Storage: o,
-		Objects: make(map[plumbing.Hash]plumbing.EncodedObject),
-	}
-}
-
-func (o *ObjectStorage) ForEachObjectHash(fun func(plumbing.Hash) error) error {
-	for h := range o.Objects {
-		err := fun(h)
-		if err != nil {
-			if err == storer.ErrStop {
-				return nil
-			}
-			return err
-		}
-	}
-	return nil
-}
-
-func (o *ObjectStorage) ObjectPacks() ([]plumbing.Hash, error) {
-	return nil, nil
-}
-func (o *ObjectStorage) DeleteOldObjectPackAndIndex(plumbing.Hash, time.Time) error {
-	return nil
-}
-
-var errNotSupported = fmt.Errorf("not supported")
-
-func (o *ObjectStorage) LooseObjectTime(hash plumbing.Hash) (time.Time, error) {
-	return time.Time{}, errNotSupported
-}
-func (o *ObjectStorage) DeleteLooseObject(plumbing.Hash) error {
-	return errNotSupported
-}
-
-func (o *ObjectStorage) AddAlternate(remote string) error {
-	return errNotSupported
-}
-
-type TxObjectStorage struct {
-	Storage *ObjectStorage
-	Objects map[plumbing.Hash]plumbing.EncodedObject
-}
-
-func (tx *TxObjectStorage) SetEncodedObject(obj plumbing.EncodedObject) (plumbing.Hash, error) {
-	h := obj.Hash()
-	tx.Objects[h] = obj
-
-	return h, nil
-}
-
-func (tx *TxObjectStorage) EncodedObject(t plumbing.ObjectType, h plumbing.Hash) (plumbing.EncodedObject, error) {
-	obj, ok := tx.Objects[h]
-	if !ok || (plumbing.AnyObject != t && obj.Type() != t) {
-		return nil, plumbing.ErrObjectNotFound
-	}
-
-	return obj, nil
-}
-
-func (tx *TxObjectStorage) Commit() error {
-	for h, obj := range tx.Objects {
-		delete(tx.Objects, h)
-		if _, err := tx.Storage.SetEncodedObject(obj); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (tx *TxObjectStorage) Rollback() error {
-	tx.Objects = make(map[plumbing.Hash]plumbing.EncodedObject)
-	return nil
-}
-
-type ReferenceStorage map[plumbing.ReferenceName]*plumbing.Reference
-
-func (r ReferenceStorage) SetReference(ref *plumbing.Reference) error {
-	if ref != nil {
-		r[ref.Name()] = ref
-	}
-
-	return nil
-}
-
-func (r ReferenceStorage) CheckAndSetReference(ref, old *plumbing.Reference) error {
-	if ref == nil {
-		return nil
-	}
-
-	if old != nil {
-		tmp := r[ref.Name()]
-		if tmp != nil && tmp.Hash() != old.Hash() {
-			return storage.ErrReferenceHasChanged
-		}
-	}
-	r[ref.Name()] = ref
-	return nil
-}
-
-func (r ReferenceStorage) Reference(n plumbing.ReferenceName) (*plumbing.Reference, error) {
-	ref, ok := r[n]
-	if !ok {
-		return nil, plumbing.ErrReferenceNotFound
-	}
-
-	return ref, nil
-}
-
-func (r ReferenceStorage) IterReferences() (storer.ReferenceIter, error) {
-	var refs []*plumbing.Reference
-	for _, ref := range r {
-		refs = append(refs, ref)
-	}
-
-	return storer.NewReferenceSliceIter(refs), nil
-}
-
-func (r ReferenceStorage) CountLooseRefs() (int, error) {
-	return len(r), nil
-}
-
-func (r ReferenceStorage) PackRefs() error {
-	return nil
-}
-
-func (r ReferenceStorage) RemoveReference(n plumbing.ReferenceName) error {
-	delete(r, n)
-	return nil
-}
-
-type ShallowStorage []plumbing.Hash
-
-func (s *ShallowStorage) SetShallow(commits []plumbing.Hash) error {
-	*s = commits
-	return nil
-}
-
-func (s ShallowStorage) Shallow() ([]plumbing.Hash, error) {
-	return s, nil
-}
-
-type ModuleStorage map[string]*Storage
-
-func (s ModuleStorage) Module(name string) (storage.Storer, error) {
-	if m, ok := s[name]; ok {
-		return m, nil
-	}
-
-	m := NewStorage()
-	s[name] = m
-
-	return m, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/storage/storer.go b/vendor/github.com/jesseduffield/go-git/v5/storage/storer.go
deleted file mode 100644
index 643592e0c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/storage/storer.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package storage
-
-import (
-	"errors"
-
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-)
-
-var ErrReferenceHasChanged = errors.New("reference has changed concurrently")
-
-// Storer is a generic storage of objects, references and any information
-// related to a particular repository. The package github.com/jesseduffield/go-git/v5/storage
-// contains two implementation a filesystem base implementation (such as `.git`)
-// and a memory implementations being ephemeral
-type Storer interface {
-	storer.EncodedObjectStorer
-	storer.ReferenceStorer
-	storer.ShallowStorer
-	storer.IndexStorer
-	config.ConfigStorer
-	ModuleStorer
-}
-
-// ModuleStorer allows interact with the modules' Storers
-type ModuleStorer interface {
-	// Module returns a Storer representing a submodule, if not exists returns a
-	// new empty Storer is returned
-	Module(name string) (Storer, error)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/submodule.go b/vendor/github.com/jesseduffield/go-git/v5/submodule.go
deleted file mode 100644
index 8f16fef3c..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/submodule.go
+++ /dev/null
@@ -1,398 +0,0 @@
-package git
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"path"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/plumbing/transport"
-)
-
-var (
-	ErrSubmoduleAlreadyInitialized = errors.New("submodule already initialized")
-	ErrSubmoduleNotInitialized     = errors.New("submodule not initialized")
-)
-
-// Submodule a submodule allows you to keep another Git repository in a
-// subdirectory of your repository.
-type Submodule struct {
-	// initialized defines if a submodule was already initialized.
-	initialized bool
-
-	c *config.Submodule
-	w *Worktree
-}
-
-// Config returns the submodule config
-func (s *Submodule) Config() *config.Submodule {
-	return s.c
-}
-
-// Init initialize the submodule reading the recorded Entry in the index for
-// the given submodule
-func (s *Submodule) Init() error {
-	cfg, err := s.w.r.Config()
-	if err != nil {
-		return err
-	}
-
-	_, ok := cfg.Submodules[s.c.Name]
-	if ok {
-		return ErrSubmoduleAlreadyInitialized
-	}
-
-	s.initialized = true
-
-	cfg.Submodules[s.c.Name] = s.c
-	return s.w.r.Storer.SetConfig(cfg)
-}
-
-// Status returns the status of the submodule.
-func (s *Submodule) Status() (*SubmoduleStatus, error) {
-	idx, err := s.w.r.Storer.Index()
-	if err != nil {
-		return nil, err
-	}
-
-	return s.status(idx)
-}
-
-func (s *Submodule) status(idx *index.Index) (*SubmoduleStatus, error) {
-	status := &SubmoduleStatus{
-		Path: s.c.Path,
-	}
-
-	e, err := idx.Entry(s.c.Path)
-	if err != nil && err != index.ErrEntryNotFound {
-		return nil, err
-	}
-
-	if e != nil {
-		status.Expected = e.Hash
-	}
-
-	if !s.initialized {
-		return status, nil
-	}
-
-	r, err := s.Repository()
-	if err != nil {
-		return nil, err
-	}
-
-	head, err := r.Head()
-	if err == nil {
-		status.Current = head.Hash()
-	}
-
-	if err != nil && err == plumbing.ErrReferenceNotFound {
-		err = nil
-	}
-
-	return status, err
-}
-
-// Repository returns the Repository represented by this submodule
-func (s *Submodule) Repository() (*Repository, error) {
-	if !s.initialized {
-		return nil, ErrSubmoduleNotInitialized
-	}
-
-	storer, err := s.w.r.Storer.Module(s.c.Name)
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = storer.Reference(plumbing.HEAD)
-	if err != nil && err != plumbing.ErrReferenceNotFound {
-		return nil, err
-	}
-
-	var exists bool
-	if err == nil {
-		exists = true
-	}
-
-	var worktree billy.Filesystem
-	if worktree, err = s.w.Filesystem.Chroot(s.c.Path); err != nil {
-		return nil, err
-	}
-
-	if exists {
-		return Open(storer, worktree)
-	}
-
-	r, err := Init(storer, worktree)
-	if err != nil {
-		return nil, err
-	}
-
-	moduleEndpoint, err := transport.NewEndpoint(s.c.URL)
-	if err != nil {
-		return nil, err
-	}
-
-	if !path.IsAbs(moduleEndpoint.Path) && moduleEndpoint.Protocol == "file" {
-		remotes, err := s.w.r.Remotes()
-		if err != nil {
-			return nil, err
-		}
-
-		rootEndpoint, err := transport.NewEndpoint(remotes[0].c.URLs[0])
-		if err != nil {
-			return nil, err
-		}
-
-		rootEndpoint.Path = path.Join(rootEndpoint.Path, moduleEndpoint.Path)
-		*moduleEndpoint = *rootEndpoint
-	}
-
-	_, err = r.CreateRemote(&config.RemoteConfig{
-		Name: DefaultRemoteName,
-		URLs: []string{moduleEndpoint.String()},
-	})
-
-	return r, err
-}
-
-// Update the registered submodule to match what the superproject expects, the
-// submodule should be initialized first calling the Init method or setting in
-// the options SubmoduleUpdateOptions.Init equals true
-func (s *Submodule) Update(o *SubmoduleUpdateOptions) error {
-	return s.UpdateContext(context.Background(), o)
-}
-
-// UpdateContext the registered submodule to match what the superproject
-// expects, the submodule should be initialized first calling the Init method or
-// setting in the options SubmoduleUpdateOptions.Init equals true.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (s *Submodule) UpdateContext(ctx context.Context, o *SubmoduleUpdateOptions) error {
-	return s.update(ctx, o, plumbing.ZeroHash)
-}
-
-func (s *Submodule) update(ctx context.Context, o *SubmoduleUpdateOptions, forceHash plumbing.Hash) error {
-	if !s.initialized && !o.Init {
-		return ErrSubmoduleNotInitialized
-	}
-
-	if !s.initialized && o.Init {
-		if err := s.Init(); err != nil {
-			return err
-		}
-	}
-
-	idx, err := s.w.r.Storer.Index()
-	if err != nil {
-		return err
-	}
-
-	hash := forceHash
-	if hash.IsZero() {
-		e, err := idx.Entry(s.c.Path)
-		if err != nil {
-			return err
-		}
-
-		hash = e.Hash
-	}
-
-	r, err := s.Repository()
-	if err != nil {
-		return err
-	}
-
-	if err := s.fetchAndCheckout(ctx, r, o, hash); err != nil {
-		return err
-	}
-
-	return s.doRecursiveUpdate(ctx, r, o)
-}
-
-func (s *Submodule) doRecursiveUpdate(ctx context.Context, r *Repository, o *SubmoduleUpdateOptions) error {
-	if o.RecurseSubmodules == NoRecurseSubmodules {
-		return nil
-	}
-
-	w, err := r.Worktree()
-	if err != nil {
-		return err
-	}
-
-	l, err := w.Submodules()
-	if err != nil {
-		return err
-	}
-
-	new := &SubmoduleUpdateOptions{}
-	*new = *o
-
-	new.RecurseSubmodules--
-	return l.UpdateContext(ctx, new)
-}
-
-func (s *Submodule) fetchAndCheckout(
-	ctx context.Context, r *Repository, o *SubmoduleUpdateOptions, hash plumbing.Hash,
-) error {
-	if !o.NoFetch {
-		err := r.FetchContext(ctx, &FetchOptions{Auth: o.Auth, Depth: o.Depth})
-		if err != nil && err != NoErrAlreadyUpToDate {
-			return err
-		}
-	}
-
-	w, err := r.Worktree()
-	if err != nil {
-		return err
-	}
-
-	// Handle a case when submodule refers to an orphaned commit that's still reachable
-	// through Git server using a special protocol capability[1].
-	//
-	// [1]: https://git-scm.com/docs/protocol-capabilities#_allow_reachable_sha1_in_want
-	if !o.NoFetch {
-		if _, err := w.r.Object(plumbing.AnyObject, hash); err != nil {
-			refSpec := config.RefSpec("+" + hash.String() + ":" + hash.String())
-
-			err := r.FetchContext(ctx, &FetchOptions{
-				Auth:     o.Auth,
-				RefSpecs: []config.RefSpec{refSpec},
-				Depth:    o.Depth,
-			})
-			if err != nil && err != NoErrAlreadyUpToDate && err != ErrExactSHA1NotSupported {
-				return err
-			}
-		}
-	}
-
-	if err := w.Checkout(&CheckoutOptions{Hash: hash}); err != nil {
-		return err
-	}
-
-	head := plumbing.NewHashReference(plumbing.HEAD, hash)
-	return r.Storer.SetReference(head)
-}
-
-// Submodules list of several submodules from the same repository.
-type Submodules []*Submodule
-
-// Init initializes the submodules in this list.
-func (s Submodules) Init() error {
-	for _, sub := range s {
-		if err := sub.Init(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Update updates all the submodules in this list.
-func (s Submodules) Update(o *SubmoduleUpdateOptions) error {
-	return s.UpdateContext(context.Background(), o)
-}
-
-// UpdateContext updates all the submodules in this list.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (s Submodules) UpdateContext(ctx context.Context, o *SubmoduleUpdateOptions) error {
-	for _, sub := range s {
-		if err := sub.UpdateContext(ctx, o); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Status returns the status of the submodules.
-func (s Submodules) Status() (SubmodulesStatus, error) {
-	var list SubmodulesStatus
-
-	var r *Repository
-	for _, sub := range s {
-		if r == nil {
-			r = sub.w.r
-		}
-
-		idx, err := r.Storer.Index()
-		if err != nil {
-			return nil, err
-		}
-
-		status, err := sub.status(idx)
-		if err != nil {
-			return nil, err
-		}
-
-		list = append(list, status)
-	}
-
-	return list, nil
-}
-
-// SubmodulesStatus contains the status for all submodiles in the worktree
-type SubmodulesStatus []*SubmoduleStatus
-
-// String is equivalent to `git submodule status`
-func (s SubmodulesStatus) String() string {
-	buf := bytes.NewBuffer(nil)
-	for _, sub := range s {
-		fmt.Fprintln(buf, sub)
-	}
-
-	return buf.String()
-}
-
-// SubmoduleStatus contains the status for a submodule in the worktree
-type SubmoduleStatus struct {
-	Path     string
-	Current  plumbing.Hash
-	Expected plumbing.Hash
-	Branch   plumbing.ReferenceName
-}
-
-// IsClean is the HEAD of the submodule is equals to the expected commit
-func (s *SubmoduleStatus) IsClean() bool {
-	return s.Current == s.Expected
-}
-
-// String is equivalent to `git submodule status `
-//
-// This will print the SHA-1 of the currently checked out commit for a
-// submodule, along with the submodule path and the output of git describe fo
-// the SHA-1. Each SHA-1 will be prefixed with - if the submodule is not
-// initialized, + if the currently checked out submodule commit does not match
-// the SHA-1 found in the index of the containing repository.
-func (s *SubmoduleStatus) String() string {
-	var extra string
-	var status = ' '
-
-	if s.Current.IsZero() {
-		status = '-'
-	} else if !s.IsClean() {
-		status = '+'
-	}
-
-	if len(s.Branch) != 0 {
-		extra = string(s.Branch[5:])
-	} else if !s.Current.IsZero() {
-		extra = s.Current.String()[:7]
-	}
-
-	if extra != "" {
-		extra = fmt.Sprintf(" (%s)", extra)
-	}
-
-	return fmt.Sprintf("%c%s %s%s", status, s.Expected, s.Path, extra)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/binary/read.go b/vendor/github.com/jesseduffield/go-git/v5/utils/binary/read.go
deleted file mode 100644
index 66970df39..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/binary/read.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Package binary implements syntax-sugar functions on top of the standard
-// library binary package
-package binary
-
-import (
-	"bufio"
-	"encoding/binary"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-)
-
-// Read reads structured binary data from r into data. Bytes are read and
-// decoded in BigEndian order
-// https://golang.org/pkg/encoding/binary/#Read
-func Read(r io.Reader, data ...interface{}) error {
-	for _, v := range data {
-		if err := binary.Read(r, binary.BigEndian, v); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ReadUntil reads from r untin delim is found
-func ReadUntil(r io.Reader, delim byte) ([]byte, error) {
-	if bufr, ok := r.(*bufio.Reader); ok {
-		return ReadUntilFromBufioReader(bufr, delim)
-	}
-
-	var buf [1]byte
-	value := make([]byte, 0, 16)
-	for {
-		if _, err := io.ReadFull(r, buf[:]); err != nil {
-			if err == io.EOF {
-				return nil, err
-			}
-
-			return nil, err
-		}
-
-		if buf[0] == delim {
-			return value, nil
-		}
-
-		value = append(value, buf[0])
-	}
-}
-
-// ReadUntilFromBufioReader is like bufio.ReadBytes but drops the delimiter
-// from the result.
-func ReadUntilFromBufioReader(r *bufio.Reader, delim byte) ([]byte, error) {
-	value, err := r.ReadBytes(delim)
-	if err != nil || len(value) == 0 {
-		return nil, err
-	}
-
-	return value[:len(value)-1], nil
-}
-
-// ReadVariableWidthInt reads and returns an int in Git VLQ special format:
-//
-// Ordinary VLQ has some redundancies, example:  the number 358 can be
-// encoded as the 2-octet VLQ 0x8166 or the 3-octet VLQ 0x808166 or the
-// 4-octet VLQ 0x80808166 and so forth.
-//
-// To avoid these redundancies, the VLQ format used in Git removes this
-// prepending redundancy and extends the representable range of shorter
-// VLQs by adding an offset to VLQs of 2 or more octets in such a way
-// that the lowest possible value for such an (N+1)-octet VLQ becomes
-// exactly one more than the maximum possible value for an N-octet VLQ.
-// In particular, since a 1-octet VLQ can store a maximum value of 127,
-// the minimum 2-octet VLQ (0x8000) is assigned the value 128 instead of
-// 0. Conversely, the maximum value of such a 2-octet VLQ (0xff7f) is
-// 16511 instead of just 16383. Similarly, the minimum 3-octet VLQ
-// (0x808000) has a value of 16512 instead of zero, which means
-// that the maximum 3-octet VLQ (0xffff7f) is 2113663 instead of
-// just 2097151.  And so forth.
-//
-// This is how the offset is saved in C:
-//
-//     dheader[pos] = ofs & 127;
-//     while (ofs >>= 7)
-//         dheader[--pos] = 128 | (--ofs & 127);
-//
-func ReadVariableWidthInt(r io.Reader) (int64, error) {
-	var c byte
-	if err := Read(r, &c); err != nil {
-		return 0, err
-	}
-
-	var v = int64(c & maskLength)
-	for c&maskContinue > 0 {
-		v++
-		if err := Read(r, &c); err != nil {
-			return 0, err
-		}
-
-		v = (v << lengthBits) + int64(c&maskLength)
-	}
-
-	return v, nil
-}
-
-const (
-	maskContinue = uint8(128) // 1000 000
-	maskLength   = uint8(127) // 0111 1111
-	lengthBits   = uint8(7)   // subsequent bytes has 7 bits to store the length
-)
-
-// ReadUint64 reads 8 bytes and returns them as a BigEndian uint32
-func ReadUint64(r io.Reader) (uint64, error) {
-	var v uint64
-	if err := binary.Read(r, binary.BigEndian, &v); err != nil {
-		return 0, err
-	}
-
-	return v, nil
-}
-
-// ReadUint32 reads 4 bytes and returns them as a BigEndian uint32
-func ReadUint32(r io.Reader) (uint32, error) {
-	var v uint32
-	if err := binary.Read(r, binary.BigEndian, &v); err != nil {
-		return 0, err
-	}
-
-	return v, nil
-}
-
-// ReadUint16 reads 2 bytes and returns them as a BigEndian uint16
-func ReadUint16(r io.Reader) (uint16, error) {
-	var v uint16
-	if err := binary.Read(r, binary.BigEndian, &v); err != nil {
-		return 0, err
-	}
-
-	return v, nil
-}
-
-// ReadHash reads a plumbing.Hash from r
-func ReadHash(r io.Reader) (plumbing.Hash, error) {
-	var h plumbing.Hash
-	if err := binary.Read(r, binary.BigEndian, h[:]); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return h, nil
-}
-
-const sniffLen = 8000
-
-// IsBinary detects if data is a binary value based on:
-// http://git.kernel.org/cgit/git/git.git/tree/xdiff-interface.c?id=HEAD#n198
-func IsBinary(r io.Reader) (bool, error) {
-	reader := bufio.NewReader(r)
-	c := 0
-	for {
-		if c == sniffLen {
-			break
-		}
-
-		b, err := reader.ReadByte()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return false, err
-		}
-
-		if b == byte(0) {
-			return true, nil
-		}
-
-		c++
-	}
-
-	return false, nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/binary/write.go b/vendor/github.com/jesseduffield/go-git/v5/utils/binary/write.go
deleted file mode 100644
index c08c73a06..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/binary/write.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package binary
-
-import (
-	"encoding/binary"
-	"io"
-)
-
-// Write writes the binary representation of data into w, using BigEndian order
-// https://golang.org/pkg/encoding/binary/#Write
-func Write(w io.Writer, data ...interface{}) error {
-	for _, v := range data {
-		if err := binary.Write(w, binary.BigEndian, v); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func WriteVariableWidthInt(w io.Writer, n int64) error {
-	buf := []byte{byte(n & 0x7f)}
-	n >>= 7
-	for n != 0 {
-		n--
-		buf = append([]byte{0x80 | (byte(n & 0x7f))}, buf...)
-		n >>= 7
-	}
-
-	_, err := w.Write(buf)
-
-	return err
-}
-
-// WriteUint64 writes the binary representation of a uint64 into w, in BigEndian
-// order
-func WriteUint64(w io.Writer, value uint64) error {
-	return binary.Write(w, binary.BigEndian, value)
-}
-
-// WriteUint32 writes the binary representation of a uint32 into w, in BigEndian
-// order
-func WriteUint32(w io.Writer, value uint32) error {
-	return binary.Write(w, binary.BigEndian, value)
-}
-
-// WriteUint16 writes the binary representation of a uint16 into w, in BigEndian
-// order
-func WriteUint16(w io.Writer, value uint16) error {
-	return binary.Write(w, binary.BigEndian, value)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/diff/diff.go b/vendor/github.com/jesseduffield/go-git/v5/utils/diff/diff.go
deleted file mode 100644
index 70054949f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/diff/diff.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Package diff implements line oriented diffs, similar to the ancient
-// Unix diff command.
-//
-// The current implementation is just a wrapper around Sergi's
-// go-diff/diffmatchpatch library, which is a go port of Neil
-// Fraser's google-diff-match-patch code
-package diff
-
-import (
-	"bytes"
-	"time"
-
-	"github.com/sergi/go-diff/diffmatchpatch"
-)
-
-// Do computes the (line oriented) modifications needed to turn the src
-// string into the dst string. The underlying algorithm is Meyers,
-// its complexity is O(N*d) where N is min(lines(src), lines(dst)) and d
-// is the size of the diff.
-func Do(src, dst string) (diffs []diffmatchpatch.Diff) {
-	// the default timeout is time.Second which may be too small under heavy load
-	return DoWithTimeout(src, dst, time.Hour)
-}
-
-// DoWithTimeout computes the (line oriented) modifications needed to turn the src
-// string into the dst string. The `timeout` argument specifies the maximum
-// amount of time it is allowed to spend in this function. If the timeout
-// is exceeded, the parts of the strings which were not considered are turned into
-// a bulk delete+insert and the half-baked suboptimal result is returned at once.
-// The underlying algorithm is Meyers, its complexity is O(N*d) where N is
-// min(lines(src), lines(dst)) and d is the size of the diff.
-func DoWithTimeout(src, dst string, timeout time.Duration) (diffs []diffmatchpatch.Diff) {
-	dmp := diffmatchpatch.New()
-	dmp.DiffTimeout = timeout
-	wSrc, wDst, warray := dmp.DiffLinesToRunes(src, dst)
-	diffs = dmp.DiffMainRunes(wSrc, wDst, false)
-	diffs = dmp.DiffCharsToLines(diffs, warray)
-	return diffs
-}
-
-// Dst computes and returns the destination text.
-func Dst(diffs []diffmatchpatch.Diff) string {
-	var text bytes.Buffer
-	for _, d := range diffs {
-		if d.Type != diffmatchpatch.DiffDelete {
-			text.WriteString(d.Text)
-		}
-	}
-	return text.String()
-}
-
-// Src computes and returns the source text
-func Src(diffs []diffmatchpatch.Diff) string {
-	var text bytes.Buffer
-	for _, d := range diffs {
-		if d.Type != diffmatchpatch.DiffInsert {
-			text.WriteString(d.Text)
-		}
-	}
-	return text.String()
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/ioutil/common.go b/vendor/github.com/jesseduffield/go-git/v5/utils/ioutil/common.go
deleted file mode 100644
index 235af717b..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/ioutil/common.go
+++ /dev/null
@@ -1,210 +0,0 @@
-// Package ioutil implements some I/O utility functions.
-package ioutil
-
-import (
-	"bufio"
-	"context"
-	"errors"
-	"io"
-
-	ctxio "github.com/jbenet/go-context/io"
-)
-
-type readPeeker interface {
-	io.Reader
-	Peek(int) ([]byte, error)
-}
-
-var (
-	ErrEmptyReader = errors.New("reader is empty")
-)
-
-// NonEmptyReader takes a reader and returns it if it is not empty, or
-// `ErrEmptyReader` if it is empty. If there is an error when reading the first
-// byte of the given reader, it will be propagated.
-func NonEmptyReader(r io.Reader) (io.Reader, error) {
-	pr, ok := r.(readPeeker)
-	if !ok {
-		pr = bufio.NewReader(r)
-	}
-
-	_, err := pr.Peek(1)
-	if err == io.EOF {
-		return nil, ErrEmptyReader
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return pr, nil
-}
-
-type readCloser struct {
-	io.Reader
-	closer io.Closer
-}
-
-func (r *readCloser) Close() error {
-	return r.closer.Close()
-}
-
-// NewReadCloser creates an `io.ReadCloser` with the given `io.Reader` and
-// `io.Closer`.
-func NewReadCloser(r io.Reader, c io.Closer) io.ReadCloser {
-	return &readCloser{Reader: r, closer: c}
-}
-
-type readCloserCloser struct {
-	io.ReadCloser
-	closer func() error
-}
-
-func (r *readCloserCloser) Close() (err error) {
-	defer func() {
-		if err == nil {
-			err = r.closer()
-			return
-		}
-		_ = r.closer()
-	}()
-	return r.ReadCloser.Close()
-}
-
-// NewReadCloserWithCloser creates an `io.ReadCloser` with the given `io.ReaderCloser` and
-// `io.Closer` that ensures that the closer is closed on close
-func NewReadCloserWithCloser(r io.ReadCloser, c func() error) io.ReadCloser {
-	return &readCloserCloser{ReadCloser: r, closer: c}
-}
-
-type writeCloser struct {
-	io.Writer
-	closer io.Closer
-}
-
-func (r *writeCloser) Close() error {
-	return r.closer.Close()
-}
-
-// NewWriteCloser creates an `io.WriteCloser` with the given `io.Writer` and
-// `io.Closer`.
-func NewWriteCloser(w io.Writer, c io.Closer) io.WriteCloser {
-	return &writeCloser{Writer: w, closer: c}
-}
-
-type writeNopCloser struct {
-	io.Writer
-}
-
-func (writeNopCloser) Close() error { return nil }
-
-// WriteNopCloser returns a WriteCloser with a no-op Close method wrapping
-// the provided Writer w.
-func WriteNopCloser(w io.Writer) io.WriteCloser {
-	return writeNopCloser{w}
-}
-
-type readerAtAsReader struct {
-	io.ReaderAt
-	offset int64
-}
-
-func (r *readerAtAsReader) Read(bs []byte) (int, error) {
-	n, err := r.ReaderAt.ReadAt(bs, r.offset)
-	r.offset += int64(n)
-	return n, err
-}
-
-func NewReaderUsingReaderAt(r io.ReaderAt, offset int64) io.Reader {
-	return &readerAtAsReader{
-		ReaderAt: r,
-		offset:   offset,
-	}
-}
-
-// CheckClose calls Close on the given io.Closer. If the given *error points to
-// nil, it will be assigned the error returned by Close. Otherwise, any error
-// returned by Close will be ignored. CheckClose is usually called with defer.
-func CheckClose(c io.Closer, err *error) {
-	if cerr := c.Close(); cerr != nil && *err == nil {
-		*err = cerr
-	}
-}
-
-// NewContextWriter wraps a writer to make it respect given Context.
-// If there is a blocking write, the returned Writer will return whenever the
-// context is cancelled (the return values are n=0 and err=ctx.Err()).
-func NewContextWriter(ctx context.Context, w io.Writer) io.Writer {
-	return ctxio.NewWriter(ctx, w)
-}
-
-// NewContextReader wraps a reader to make it respect given Context.
-// If there is a blocking read, the returned Reader will return whenever the
-// context is cancelled (the return values are n=0 and err=ctx.Err()).
-func NewContextReader(ctx context.Context, r io.Reader) io.Reader {
-	return ctxio.NewReader(ctx, r)
-}
-
-// NewContextWriteCloser as NewContextWriter but with io.Closer interface.
-func NewContextWriteCloser(ctx context.Context, w io.WriteCloser) io.WriteCloser {
-	ctxw := ctxio.NewWriter(ctx, w)
-	return NewWriteCloser(ctxw, w)
-}
-
-// NewContextReadCloser as NewContextReader but with io.Closer interface.
-func NewContextReadCloser(ctx context.Context, r io.ReadCloser) io.ReadCloser {
-	ctxr := ctxio.NewReader(ctx, r)
-	return NewReadCloser(ctxr, r)
-}
-
-type readerOnError struct {
-	io.Reader
-	notify func(error)
-}
-
-// NewReaderOnError returns a io.Reader that call the notify function when an
-// unexpected (!io.EOF) error happens, after call Read function.
-func NewReaderOnError(r io.Reader, notify func(error)) io.Reader {
-	return &readerOnError{r, notify}
-}
-
-// NewReadCloserOnError returns a io.ReadCloser that call the notify function
-// when an unexpected (!io.EOF) error happens, after call Read function.
-func NewReadCloserOnError(r io.ReadCloser, notify func(error)) io.ReadCloser {
-	return NewReadCloser(NewReaderOnError(r, notify), r)
-}
-
-func (r *readerOnError) Read(buf []byte) (n int, err error) {
-	n, err = r.Reader.Read(buf)
-	if err != nil && err != io.EOF {
-		r.notify(err)
-	}
-
-	return
-}
-
-type writerOnError struct {
-	io.Writer
-	notify func(error)
-}
-
-// NewWriterOnError returns a io.Writer that call the notify function when an
-// unexpected (!io.EOF) error happens, after call Write function.
-func NewWriterOnError(w io.Writer, notify func(error)) io.Writer {
-	return &writerOnError{w, notify}
-}
-
-// NewWriteCloserOnError returns a io.WriteCloser that call the notify function
-// when an unexpected (!io.EOF) error happens, after call Write function.
-func NewWriteCloserOnError(w io.WriteCloser, notify func(error)) io.WriteCloser {
-	return NewWriteCloser(NewWriterOnError(w, notify), w)
-}
-
-func (r *writerOnError) Write(p []byte) (n int, err error) {
-	n, err = r.Writer.Write(p)
-	if err != nil && err != io.EOF {
-		r.notify(err)
-	}
-
-	return
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/change.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/change.go
deleted file mode 100644
index f408261fc..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/change.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package merkletrie
-
-import (
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-var (
-	ErrEmptyFileName = errors.New("empty filename in tree entry")
-)
-
-// Action values represent the kind of things a Change can represent:
-// insertion, deletions or modifications of files.
-type Action int
-
-// The set of possible actions in a change.
-const (
-	_ Action = iota
-	Insert
-	Delete
-	Modify
-)
-
-// String returns the action as a human readable text.
-func (a Action) String() string {
-	switch a {
-	case Insert:
-		return "Insert"
-	case Delete:
-		return "Delete"
-	case Modify:
-		return "Modify"
-	default:
-		panic(fmt.Sprintf("unsupported action: %d", a))
-	}
-}
-
-// A Change value represent how a noder has change between to merkletries.
-type Change struct {
-	// The noder before the change or nil if it was inserted.
-	From noder.Path
-	// The noder after the change or nil if it was deleted.
-	To noder.Path
-}
-
-// Action is convenience method that returns what Action c represents.
-func (c *Change) Action() (Action, error) {
-	if c.From == nil && c.To == nil {
-		return Action(0), fmt.Errorf("malformed change: nil from and to")
-	}
-	if c.From == nil {
-		return Insert, nil
-	}
-	if c.To == nil {
-		return Delete, nil
-	}
-
-	return Modify, nil
-}
-
-// NewInsert returns a new Change representing the insertion of n.
-func NewInsert(n noder.Path) Change { return Change{To: n} }
-
-// NewDelete returns a new Change representing the deletion of n.
-func NewDelete(n noder.Path) Change { return Change{From: n} }
-
-// NewModify returns a new Change representing that a has been modified and
-// it is now b.
-func NewModify(a, b noder.Path) Change {
-	return Change{
-		From: a,
-		To:   b,
-	}
-}
-
-// String returns a single change in human readable form, using the
-// format: '<' + action + space + path + '>'.  The contents of the file
-// before or after the change are not included in this format.
-//
-// Example: inserting a file at the path a/b/c.txt will return "".
-func (c Change) String() string {
-	action, err := c.Action()
-	if err != nil {
-		panic(err)
-	}
-
-	var path string
-	if action == Delete {
-		path = c.From.String()
-	} else {
-		path = c.To.String()
-	}
-
-	return fmt.Sprintf("<%s %s>", action, path)
-}
-
-// Changes is a list of changes between to merkletries.
-type Changes []Change
-
-// NewChanges returns an empty list of changes.
-func NewChanges() Changes {
-	return Changes{}
-}
-
-// Add adds the change c to the list of changes.
-func (l *Changes) Add(c Change) {
-	*l = append(*l, c)
-}
-
-// AddRecursiveInsert adds the required changes to insert all the
-// file-like noders found in root, recursively.
-func (l *Changes) AddRecursiveInsert(root noder.Path) error {
-	return l.addRecursive(root, NewInsert)
-}
-
-// AddRecursiveDelete adds the required changes to delete all the
-// file-like noders found in root, recursively.
-func (l *Changes) AddRecursiveDelete(root noder.Path) error {
-	return l.addRecursive(root, NewDelete)
-}
-
-type noderToChangeFn func(noder.Path) Change // NewInsert or NewDelete
-
-func (l *Changes) addRecursive(root noder.Path, ctor noderToChangeFn) error {
-	if root.String() == "" {
-		return ErrEmptyFileName
-	}
-
-	if !root.IsDir() {
-		l.Add(ctor(root))
-		return nil
-	}
-
-	i, err := NewIterFromPath(root)
-	if err != nil {
-		return err
-	}
-
-	var current noder.Path
-	for {
-		if current, err = i.Step(); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-		if current.IsDir() {
-			continue
-		}
-		l.Add(ctor(current))
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/difftree.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/difftree.go
deleted file mode 100644
index bd5805e4a..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/difftree.go
+++ /dev/null
@@ -1,453 +0,0 @@
-package merkletrie
-
-// The focus of this difftree implementation is to save time by
-// skipping whole directories if their hash is the same in both
-// trees.
-//
-// The diff algorithm implemented here is based on the doubleiter
-// type defined in this same package; we will iterate over both
-// trees at the same time, while comparing the current noders in
-// each iterator.  Depending on how they differ we will output the
-// corresponding changes and move the iterators further over both
-// trees.
-//
-// The table below shows all the possible comparison results, along
-// with what changes should we produce and how to advance the
-// iterators.
-//
-// The table is implemented by the switches in this function,
-// diffTwoNodes, diffTwoNodesSameName and diffTwoDirs.
-//
-// Many Bothans died to bring us this information, make sure you
-// understand the table before modifying this code.
-
-// # Cases
-//
-// When comparing noders in both trees you will find yourself in
-// one of 169 possible cases, but if we ignore moves, we can
-// simplify a lot the search space into the following table:
-//
-// - "-": nothing, no file or directory
-// - a<>: an empty file named "a".
-// - a<1>: a file named "a", with "1" as its contents.
-// - a<2>: a file named "a", with "2" as its contents.
-// - a(): an empty dir named "a".
-// - a(...): a dir named "a", with some files and/or dirs inside (possibly
-//   empty).
-// - a(;;;): a dir named "a", with some other files and/or dirs inside
-//   (possibly empty), which different from the ones in "a(...)".
-//
-//     \ to     -   a<>  a<1>  a<2>  a()  a(...)  a(;;;)
-// from \
-// -           00    01    02    03   04     05      06
-// a<>         10    11    12    13   14     15      16
-// a<1>        20    21    22    23   24     25      26
-// a<2>        30    31    32    33   34     35      36
-// a()         40    41    42    43   44     45      46
-// a(...)      50    51    52    53   54     55      56
-// a(;;;)      60    61    62    63   64     65      66
-//
-// Every (from, to) combination in the table is a special case, but
-// some of them can be merged into some more general cases, for
-// instance 11 and 22 can be merged into the general case: both
-// noders are equal.
-//
-// Here is a full list of all the cases that are similar and how to
-// merge them together into more general cases.  Each general case
-// is labeled with an uppercase letter for further reference, and it
-// is followed by the pseudocode of the checks you have to perform
-// on both noders to see if you are in such a case, the actions to
-// perform (i.e. what changes to output) and how to advance the
-// iterators of each tree to continue the comparison process.
-//
-// ## A. Impossible: 00
-//
-// ## B. Same thing on both sides: 11, 22, 33, 44, 55, 66
-//   - check: `SameName() && SameHash()`
-//   - action: do nothing.
-//   - advance: `FromNext(); ToNext()`
-//
-// ### C. To was created: 01, 02, 03, 04, 05, 06
-//   - check: `DifferentName() && ToBeforeFrom()`
-//   - action: insertRecursively(to)
-//   - advance: `ToNext()`
-//
-// ### D. From was deleted: 10, 20, 30, 40, 50, 60
-//   - check: `DifferentName() && FromBeforeTo()`
-//   - action: `DeleteRecursively(from)`
-//   - advance: `FromNext()`
-//
-// ### E. Empty file to file with contents: 12, 13
-//   - check: `SameName() && DifferentHash() && FromIsFile() &&
-//             ToIsFile() && FromIsEmpty()`
-//   - action: `modifyFile(from, to)`
-//   - advance: `FromNext()` or `FromStep()`
-//
-// ### E'. file with contents to empty file: 21, 31
-//   - check: `SameName() && DifferentHash() && FromIsFile() &&
-//             ToIsFile() && ToIsEmpty()`
-//   - action: `modifyFile(from, to)`
-//   - advance: `FromNext()` or `FromStep()`
-//
-// ### F. empty file to empty dir with the same name: 14
-//   - check: `SameName() && FromIsFile() && FromIsEmpty() &&
-//             ToIsDir() && ToIsEmpty()`
-//   - action: `DeleteFile(from); InsertEmptyDir(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### F'. empty dir to empty file of the same name: 41
-//   - check: `SameName() && FromIsDir() && FromIsEmpty &&
-//             ToIsFile() && ToIsEmpty()`
-//   - action: `DeleteEmptyDir(from); InsertFile(to)`
-//   - advance: `FromNext(); ToNext()` or step for any of them.
-//
-// ### G. empty file to non-empty dir of the same name: 15, 16
-//   - check: `SameName() && FromIsFile() && ToIsDir() &&
-//             FromIsEmpty() && ToIsNotEmpty()`
-//   - action: `DeleteFile(from); InsertDirRecursively(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### G'. non-empty dir to empty file of the same name: 51, 61
-//   - check: `SameName() && FromIsDir() && FromIsNotEmpty() &&
-//             ToIsFile() && FromIsEmpty()`
-//   - action: `DeleteDirRecursively(from); InsertFile(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### H. modify file contents: 23, 32
-//   - check: `SameName() && FromIsFile() && ToIsFile() &&
-//             FromIsNotEmpty() && ToIsNotEmpty()`
-//   - action: `ModifyFile(from, to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### I. file with contents to empty dir: 24, 34
-//   - check: `SameName() && DifferentHash() && FromIsFile() &&
-//             FromIsNotEmpty() && ToIsDir() && ToIsEmpty()`
-//   - action: `DeleteFile(from); InsertEmptyDir(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### I'. empty dir to file with contents: 42, 43
-//   - check: `SameName() && DifferentHash() && FromIsDir() &&
-//             FromIsEmpty() && ToIsFile() && ToIsEmpty()`
-//   - action: `DeleteDir(from); InsertFile(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### J. file with contents to dir with contents: 25, 26, 35, 36
-//   - check: `SameName() && DifferentHash() && FromIsFile() &&
-//             FromIsNotEmpty() && ToIsDir() && ToIsNotEmpty()`
-//   - action: `DeleteFile(from); InsertDirRecursively(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### J'. dir with contents to file with contents: 52, 62, 53, 63
-//   - check: `SameName() && DifferentHash() && FromIsDir() &&
-//             FromIsNotEmpty() && ToIsFile() && ToIsNotEmpty()`
-//   - action: `DeleteDirRecursively(from); InsertFile(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### K. empty dir to dir with contents: 45, 46
-//   - check: `SameName() && DifferentHash() && FromIsDir() &&
-//             FromIsEmpty() && ToIsDir() && ToIsNotEmpty()`
-//   - action: `InsertChildrenRecursively(to)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### K'. dir with contents to empty dir: 54, 64
-//   - check: `SameName() && DifferentHash() && FromIsDir() &&
-//             FromIsEmpty() && ToIsDir() && ToIsNotEmpty()`
-//   - action: `DeleteChildrenRecursively(from)`
-//   - advance: `FromNext(); ToNext()`
-//
-// ### L. dir with contents to dir with different contents: 56, 65
-//   - check: `SameName() && DifferentHash() && FromIsDir() &&
-//             FromIsNotEmpty() && ToIsDir() && ToIsNotEmpty()`
-//   - action: nothing
-//   - advance: `FromStep(); ToStep()`
-//
-//
-
-// All these cases can be further simplified by a truth table
-// reduction process, in which we gather similar checks together to
-// make the final code easier to read and understand.
-//
-// The first 6 columns are the outputs of the checks to perform on
-// both noders.  I have labeled them 1 to 6, this is what they mean:
-//
-// 1: SameName()
-// 2: SameHash()
-// 3: FromIsDir()
-// 4: ToIsDir()
-// 5: FromIsEmpty()
-// 6: ToIsEmpty()
-//
-// The from and to columns are a fsnoder example of the elements
-// that you will find on each tree under the specified comparison
-// results (columns 1 to 6).
-//
-// The type column identifies the case we are into, from the list above.
-//
-// The type' column identifies the new set of reduced cases, using
-// lowercase letters, and they are explained after the table.
-//
-// The last column is the set of actions and advances for each case.
-//
-// "---" means impossible except in case of hash collision.
-//
-// advance meaning:
-// - NN: from.Next(); to.Next()
-// - SS: from.Step(); to.Step()
-//
-// 1 2 3 4 5 6 | from   |  to    |type|type'|action ; advance
-// ------------+--------+--------+----+------------------------------------
-// 0 0 0 0 0 0 |        |        |    |     | if !SameName() {
-//     .       |        |        |    |     |    if FromBeforeTo() {
-//     .       |        |        | D  |  d  |       delete(from); from.Next()
-//     .       |        |        |    |     |    } else {
-//     .       |        |        | C  |  c  |       insert(to); to.Next()
-//     .       |        |        |    |     |    }
-// 0 1 1 1 1 1 |        |        |    |     | }
-// 1 0 0 0 0 0 |  a<1>  |  a<2>  | H  |  e  | modify(from, to); NN
-// 1 0 0 0 0 1 |  a<1>  |   a<>  | E' |  e  | modify(from, to); NN
-// 1 0 0 0 1 0 |   a<>  |  a<1>  | E  |  e  | modify(from, to); NN
-// 1 0 0 0 1 1 |  ----  |  ----  |    |  e  |
-// 1 0 0 1 0 0 |  a<1>  | a(...) | J  |  f  | delete(from); insert(to); NN
-// 1 0 0 1 0 1 |  a<1>  |    a() | I  |  f  | delete(from); insert(to); NN
-// 1 0 0 1 1 0 |   a<>  | a(...) | G  |  f  | delete(from); insert(to); NN
-// 1 0 0 1 1 1 |   a<>  |    a() | F  |  f  | delete(from); insert(to); NN
-// 1 0 1 0 0 0 | a(...) |  a<1>  | J' |  f  | delete(from); insert(to); NN
-// 1 0 1 0 0 1 | a(...) |   a<>  | G' |  f  | delete(from); insert(to); NN
-// 1 0 1 0 1 0 |    a() |  a<1>  | I' |  f  | delete(from); insert(to); NN
-// 1 0 1 0 1 1 |    a() |   a<>  | F' |  f  | delete(from); insert(to); NN
-// 1 0 1 1 0 0 | a(...) | a(;;;) | L  |  g  | nothing; SS
-// 1 0 1 1 0 1 | a(...) |    a() | K' |  h  | deleteChildren(from); NN
-// 1 0 1 1 1 0 |    a() | a(...) | K  |  i  | insertChildren(to); NN
-// 1 0 1 1 1 1 |  ----  |  ----  |    |     |
-// 1 1 0 0 0 0 |  a<1>  |  a<1>  | B  |  b  | nothing; NN
-// 1 1 0 0 0 1 |  ----  |  ----  |    |  b  |
-// 1 1 0 0 1 0 |  ----  |  ----  |    |  b  |
-// 1 1 0 0 1 1 |   a<>  |   a<>  | B  |  b  | nothing; NN
-// 1 1 0 1 0 0 |  ----  |  ----  |    |  b  |
-// 1 1 0 1 0 1 |  ----  |  ----  |    |  b  |
-// 1 1 0 1 1 0 |  ----  |  ----  |    |  b  |
-// 1 1 0 1 1 1 |  ----  |  ----  |    |  b  |
-// 1 1 1 0 0 0 |  ----  |  ----  |    |  b  |
-// 1 1 1 0 0 1 |  ----  |  ----  |    |  b  |
-// 1 1 1 0 1 0 |  ----  |  ----  |    |  b  |
-// 1 1 1 0 1 1 |  ----  |  ----  |    |  b  |
-// 1 1 1 1 0 0 | a(...) | a(...) | B  |  b  | nothing; NN
-// 1 1 1 1 0 1 |  ----  |  ----  |    |  b  |
-// 1 1 1 1 1 0 |  ----  |  ----  |    |  b  |
-// 1 1 1 1 1 1 |   a()  |   a()  | B  |  b  | nothing; NN
-//
-// c and d:
-//     if !SameName()
-//         d if FromBeforeTo()
-//         c else
-// b: SameName) && sameHash()
-// e: SameName() && !sameHash() && BothAreFiles()
-// f: SameName() && !sameHash() && FileAndDir()
-// g: SameName() && !sameHash() && BothAreDirs() && NoneIsEmpty
-// i: SameName() && !sameHash() && BothAreDirs() && FromIsEmpty
-// h: else of i
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-var (
-	// ErrCanceled is returned whenever the operation is canceled.
-	ErrCanceled = errors.New("operation canceled")
-)
-
-// DiffTree calculates the list of changes between two merkletries.  It
-// uses the provided hashEqual callback to compare noders.
-func DiffTree(
-	fromTree,
-	toTree noder.Noder,
-	hashEqual noder.Equal,
-) (Changes, error) {
-	return DiffTreeContext(context.Background(), fromTree, toTree, hashEqual)
-}
-
-// DiffTreeContext calculates the list of changes between two merkletries. It
-// uses the provided hashEqual callback to compare noders.
-// Error will be returned if context expires
-// Provided context must be non nil
-func DiffTreeContext(ctx context.Context, fromTree, toTree noder.Noder,
-	hashEqual noder.Equal) (Changes, error) {
-	ret := NewChanges()
-
-	ii, err := newDoubleIter(fromTree, toTree, hashEqual)
-	if err != nil {
-		return nil, err
-	}
-
-	for {
-		select {
-		case <-ctx.Done():
-			return nil, ErrCanceled
-		default:
-		}
-
-		from := ii.from.current
-		to := ii.to.current
-
-		switch r := ii.remaining(); r {
-		case noMoreNoders:
-			return ret, nil
-		case onlyFromRemains:
-			if err = ret.AddRecursiveDelete(from); err != nil {
-				return nil, err
-			}
-			if err = ii.nextFrom(); err != nil {
-				return nil, err
-			}
-		case onlyToRemains:
-			if to.Skip() {
-				if err = ret.AddRecursiveDelete(to); err != nil {
-					return nil, err
-				}
-			} else {
-				if err = ret.AddRecursiveInsert(to); err != nil {
-					return nil, err
-				}
-			}
-			if err = ii.nextTo(); err != nil {
-				return nil, err
-			}
-		case bothHaveNodes:
-			if from.Skip() {
-				if err = ret.AddRecursiveDelete(from); err != nil {
-					return nil, err
-				}
-				if err := ii.nextBoth(); err != nil {
-					return nil, err
-				}
-				break
-			}
-			if to.Skip() {
-				if err = ret.AddRecursiveDelete(to); err != nil {
-					return nil, err
-				}
-				if err := ii.nextBoth(); err != nil {
-					return nil, err
-				}
-				break
-			}
-
-			if err = diffNodes(&ret, ii); err != nil {
-				return nil, err
-			}
-		default:
-			panic(fmt.Sprintf("unknown remaining value: %d", r))
-		}
-	}
-}
-
-func diffNodes(changes *Changes, ii *doubleIter) error {
-	from := ii.from.current
-	to := ii.to.current
-	var err error
-
-	// compare their full paths as strings
-	switch from.Compare(to) {
-	case -1:
-		if err = changes.AddRecursiveDelete(from); err != nil {
-			return err
-		}
-		if err = ii.nextFrom(); err != nil {
-			return err
-		}
-	case 1:
-		if err = changes.AddRecursiveInsert(to); err != nil {
-			return err
-		}
-		if err = ii.nextTo(); err != nil {
-			return err
-		}
-	default:
-		if err := diffNodesSameName(changes, ii); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func diffNodesSameName(changes *Changes, ii *doubleIter) error {
-	from := ii.from.current
-	to := ii.to.current
-
-	status, err := ii.compare()
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case status.sameHash:
-		// do nothing
-		if err = ii.nextBoth(); err != nil {
-			return err
-		}
-	case status.bothAreFiles:
-		changes.Add(NewModify(from, to))
-		if err = ii.nextBoth(); err != nil {
-			return err
-		}
-	case status.fileAndDir:
-		if err = changes.AddRecursiveDelete(from); err != nil {
-			return err
-		}
-		if err = changes.AddRecursiveInsert(to); err != nil {
-			return err
-		}
-		if err = ii.nextBoth(); err != nil {
-			return err
-		}
-	case status.bothAreDirs:
-		if err = diffDirs(changes, ii); err != nil {
-			return err
-		}
-	default:
-		return fmt.Errorf("bad status from double iterator")
-	}
-
-	return nil
-}
-
-func diffDirs(changes *Changes, ii *doubleIter) error {
-	from := ii.from.current
-	to := ii.to.current
-
-	status, err := ii.compare()
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case status.fromIsEmptyDir:
-		if err = changes.AddRecursiveInsert(to); err != nil {
-			return err
-		}
-		if err = ii.nextBoth(); err != nil {
-			return err
-		}
-	case status.toIsEmptyDir:
-		if err = changes.AddRecursiveDelete(from); err != nil {
-			return err
-		}
-		if err = ii.nextBoth(); err != nil {
-			return err
-		}
-	case !status.fromIsEmptyDir && !status.toIsEmptyDir:
-		// do nothing
-		if err = ii.stepBoth(); err != nil {
-			return err
-		}
-	default:
-		return fmt.Errorf("both dirs are empty but has different hash")
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/doc.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/doc.go
deleted file mode 100644
index 5204024ad..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/doc.go
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Package merkletrie provides support for n-ary trees that are at the same
-time Merkle trees and Radix trees (tries).
-
-Git trees are Radix n-ary trees in virtue of the names of their
-tree entries.  At the same time, git trees are Merkle trees thanks to
-their hashes.
-
-This package defines Merkle tries as nodes that should have:
-
-- a hash: the Merkle part of the Merkle trie
-
-- a key: the Radix part of the Merkle trie
-
-The Merkle hash condition is not enforced by this package though.  This
-means that the hash of a node doesn't have to take into account the hashes of
-their children,  which is good for testing purposes.
-
-Nodes in the Merkle trie are abstracted by the Noder interface.  The
-intended use is that git trees implements this interface, either
-directly or using a simple wrapper.
-
-This package provides an iterator for merkletries that can skip whole
-directory-like noders and an efficient merkletrie comparison algorithm.
-
-When comparing git trees, the simple approach of alphabetically sorting
-their elements and comparing the resulting lists is too slow as it
-depends linearly on the number of files in the trees: When a directory
-has lots of files but none of them has been modified, this approach is
-very expensive.  We can do better by prunning whole directories that
-have not change, just by looking at their hashes.  This package provides
-the tools to do exactly that.
-*/
-package merkletrie
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/doubleiter.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/doubleiter.go
deleted file mode 100644
index 2a6e6843d..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/doubleiter.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package merkletrie
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// A doubleIter is a convenience type to keep track of the current
-// noders in two merkletries that are going to be iterated in parallel.
-// It has methods for:
-//
-// - iterating over the merkletries, both at the same time or
-// individually: nextFrom, nextTo, nextBoth, stepBoth
-//
-// - checking if there are noders left in one or both of them with the
-// remaining method and its associated returned type.
-//
-// - comparing the current noders of both merkletries in several ways,
-// with the compare method and its associated returned type.
-type doubleIter struct {
-	from struct {
-		iter    *Iter
-		current noder.Path // nil if no more nodes
-	}
-	to struct {
-		iter    *Iter
-		current noder.Path // nil if no more nodes
-	}
-	hashEqual noder.Equal
-}
-
-// NewdoubleIter returns a new doubleIter for the merkletries "from" and
-// "to".  The hashEqual callback function will be used by the doubleIter
-// to compare the hash of the noders in the merkletries.  The doubleIter
-// will be initialized to the first elements in each merkletrie if any.
-func newDoubleIter(from, to noder.Noder, hashEqual noder.Equal) (
-	*doubleIter, error) {
-	var ii doubleIter
-	var err error
-
-	if ii.from.iter, err = NewIter(from); err != nil {
-		return nil, fmt.Errorf("from: %s", err)
-	}
-	if ii.from.current, err = ii.from.iter.Next(); turnEOFIntoNil(err) != nil {
-		return nil, fmt.Errorf("from: %s", err)
-	}
-
-	if ii.to.iter, err = NewIter(to); err != nil {
-		return nil, fmt.Errorf("to: %s", err)
-	}
-	if ii.to.current, err = ii.to.iter.Next(); turnEOFIntoNil(err) != nil {
-		return nil, fmt.Errorf("to: %s", err)
-	}
-
-	ii.hashEqual = hashEqual
-
-	return &ii, nil
-}
-
-func turnEOFIntoNil(e error) error {
-	if e != nil && e != io.EOF {
-		return e
-	}
-	return nil
-}
-
-// NextBoth makes d advance to the next noder in both merkletries.  If
-// any of them is a directory, it skips its contents.
-func (d *doubleIter) nextBoth() error {
-	if err := d.nextFrom(); err != nil {
-		return err
-	}
-	if err := d.nextTo(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// NextFrom makes d advance to the next noder in the "from" merkletrie,
-// skipping its contents if it is a directory.
-func (d *doubleIter) nextFrom() (err error) {
-	d.from.current, err = d.from.iter.Next()
-	return turnEOFIntoNil(err)
-}
-
-// NextTo makes d advance to the next noder in the "to" merkletrie,
-// skipping its contents if it is a directory.
-func (d *doubleIter) nextTo() (err error) {
-	d.to.current, err = d.to.iter.Next()
-	return turnEOFIntoNil(err)
-}
-
-// StepBoth makes d advance to the next noder in both merkletries,
-// getting deeper into directories if that is the case.
-func (d *doubleIter) stepBoth() (err error) {
-	if d.from.current, err = d.from.iter.Step(); turnEOFIntoNil(err) != nil {
-		return err
-	}
-	if d.to.current, err = d.to.iter.Step(); turnEOFIntoNil(err) != nil {
-		return err
-	}
-	return nil
-}
-
-// Remaining returns if there are no more noders in the tree, if both
-// have noders or if one of them doesn't.
-func (d *doubleIter) remaining() remaining {
-	if d.from.current == nil && d.to.current == nil {
-		return noMoreNoders
-	}
-
-	if d.from.current == nil && d.to.current != nil {
-		return onlyToRemains
-	}
-
-	if d.from.current != nil && d.to.current == nil {
-		return onlyFromRemains
-	}
-
-	return bothHaveNodes
-}
-
-// Remaining values tells you whether both trees still have noders, or
-// only one of them or none of them.
-type remaining int
-
-const (
-	noMoreNoders remaining = iota
-	onlyToRemains
-	onlyFromRemains
-	bothHaveNodes
-)
-
-// Compare returns the comparison between the current elements in the
-// merkletries.
-func (d *doubleIter) compare() (s comparison, err error) {
-	s.sameHash = d.hashEqual(d.from.current, d.to.current)
-
-	fromIsDir := d.from.current.IsDir()
-	toIsDir := d.to.current.IsDir()
-
-	s.bothAreDirs = fromIsDir && toIsDir
-	s.bothAreFiles = !fromIsDir && !toIsDir
-	s.fileAndDir = !s.bothAreDirs && !s.bothAreFiles
-
-	fromNumChildren, err := d.from.current.NumChildren()
-	if err != nil {
-		return comparison{}, fmt.Errorf("from: %s", err)
-	}
-
-	toNumChildren, err := d.to.current.NumChildren()
-	if err != nil {
-		return comparison{}, fmt.Errorf("to: %s", err)
-	}
-
-	s.fromIsEmptyDir = fromIsDir && fromNumChildren == 0
-	s.toIsEmptyDir = toIsDir && toNumChildren == 0
-
-	return
-}
-
-// Answers to a lot of questions you can ask about how to noders are
-// equal or different.
-type comparison struct {
-	// the following are only valid if both nodes have the same name
-	// (i.e. nameComparison == 0)
-
-	// Do both nodes have the same hash?
-	sameHash bool
-	// Are both nodes files?
-	bothAreFiles bool
-
-	// the following are only valid if any of the noders are dirs,
-	// this is, if !bothAreFiles
-
-	// Is one a file and the other a dir?
-	fileAndDir bool
-	// Are both nodes dirs?
-	bothAreDirs bool
-	// Is the from node an empty dir?
-	fromIsEmptyDir bool
-	// Is the to Node an empty dir?
-	toIsEmptyDir bool
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem/node.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem/node.go
deleted file mode 100644
index a96f1e8f2..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem/node.go
+++ /dev/null
@@ -1,205 +0,0 @@
-package filesystem
-
-import (
-	"io"
-	"os"
-	"path"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-
-	"github.com/go-git/go-billy/v5"
-)
-
-var ignore = map[string]bool{
-	".git": true,
-}
-
-// The node represents a file or a directory in a billy.Filesystem. It
-// implements the interface noder.Noder of merkletrie package.
-//
-// This implementation implements a "standard" hash method being able to be
-// compared with any other noder.Noder implementation inside of go-git.
-type node struct {
-	fs         billy.Filesystem
-	submodules map[string]plumbing.Hash
-
-	path     string
-	hash     []byte
-	children []noder.Noder
-	isDir    bool
-	mode     os.FileMode
-	size     int64
-}
-
-// NewRootNode returns the root node based on a given billy.Filesystem.
-//
-// In order to provide the submodule hash status, a map[string]plumbing.Hash
-// should be provided where the key is the path of the submodule and the commit
-// of the submodule HEAD
-func NewRootNode(
-	fs billy.Filesystem,
-	submodules map[string]plumbing.Hash,
-) noder.Noder {
-	return &node{fs: fs, submodules: submodules, isDir: true}
-}
-
-// Hash the hash of a filesystem is the result of concatenating the computed
-// plumbing.Hash of the file as a Blob and its plumbing.FileMode; that way the
-// difftree algorithm will detect changes in the contents of files and also in
-// their mode.
-//
-// Please note that the hash is calculated on first invocation of Hash(),
-// meaning that it will not update when the underlying file changes
-// between invocations.
-//
-// The hash of a directory is always a 24-bytes slice of zero values
-func (n *node) Hash() []byte {
-	if n.hash == nil {
-		n.calculateHash()
-	}
-	return n.hash
-}
-
-func (n *node) Name() string {
-	return path.Base(n.path)
-}
-
-func (n *node) IsDir() bool {
-	return n.isDir
-}
-
-func (n *node) Skip() bool {
-	return false
-}
-
-func (n *node) Children() ([]noder.Noder, error) {
-	if err := n.calculateChildren(); err != nil {
-		return nil, err
-	}
-
-	return n.children, nil
-}
-
-func (n *node) NumChildren() (int, error) {
-	if err := n.calculateChildren(); err != nil {
-		return -1, err
-	}
-
-	return len(n.children), nil
-}
-
-func (n *node) calculateChildren() error {
-	if !n.IsDir() {
-		return nil
-	}
-
-	if len(n.children) != 0 {
-		return nil
-	}
-
-	files, err := n.fs.ReadDir(n.path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	for _, file := range files {
-		if _, ok := ignore[file.Name()]; ok {
-			continue
-		}
-
-		if file.Mode()&os.ModeSocket != 0 {
-			continue
-		}
-
-		c, err := n.newChildNode(file)
-		if err != nil {
-			return err
-		}
-
-		n.children = append(n.children, c)
-	}
-
-	return nil
-}
-
-func (n *node) newChildNode(file os.FileInfo) (*node, error) {
-	path := path.Join(n.path, file.Name())
-
-	node := &node{
-		fs:         n.fs,
-		submodules: n.submodules,
-
-		path:  path,
-		isDir: file.IsDir(),
-		size:  file.Size(),
-		mode:  file.Mode(),
-	}
-
-	if _, isSubmodule := n.submodules[path]; isSubmodule {
-		node.isDir = false
-	}
-
-	return node, nil
-}
-
-func (n *node) calculateHash() {
-	if n.isDir {
-		n.hash = make([]byte, 24)
-		return
-	}
-	mode, err := filemode.NewFromOSFileMode(n.mode)
-	if err != nil {
-		n.hash = plumbing.ZeroHash[:]
-		return
-	}
-	if submoduleHash, isSubmodule := n.submodules[n.path]; isSubmodule {
-		n.hash = append(submoduleHash[:], filemode.Submodule.Bytes()...)
-		return
-	}
-	var hash plumbing.Hash
-	if n.mode&os.ModeSymlink != 0 {
-		hash = n.doCalculateHashForSymlink()
-	} else {
-		hash = n.doCalculateHashForRegular()
-	}
-	n.hash = append(hash[:], mode.Bytes()...)
-}
-
-func (n *node) doCalculateHashForRegular() plumbing.Hash {
-	f, err := n.fs.Open(n.path)
-	if err != nil {
-		return plumbing.ZeroHash
-	}
-
-	defer f.Close()
-
-	h := plumbing.NewHasher(plumbing.BlobObject, n.size)
-	if _, err := io.Copy(h, f); err != nil {
-		return plumbing.ZeroHash
-	}
-
-	return h.Sum()
-}
-
-func (n *node) doCalculateHashForSymlink() plumbing.Hash {
-	target, err := n.fs.Readlink(n.path)
-	if err != nil {
-		return plumbing.ZeroHash
-	}
-
-	h := plumbing.NewHasher(plumbing.BlobObject, n.size)
-	if _, err := h.Write([]byte(target)); err != nil {
-		return plumbing.ZeroHash
-	}
-
-	return h.Sum()
-}
-
-func (n *node) String() string {
-	return n.path
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/index/node.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/index/node.go
deleted file mode 100644
index 59cd17f84..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/index/node.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package index
-
-import (
-	"path"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// The node represents a index.Entry or a directory inferred from the path
-// of all entries. It implements the interface noder.Noder of merkletrie
-// package.
-//
-// This implementation implements a "standard" hash method being able to be
-// compared with any other noder.Noder implementation inside of go-git
-type node struct {
-	path     string
-	entry    *index.Entry
-	children []noder.Noder
-	isDir    bool
-	skip     bool
-}
-
-// NewRootNode returns the root node of a computed tree from a index.Index,
-func NewRootNode(idx *index.Index) noder.Noder {
-	const rootNode = ""
-
-	m := map[string]*node{rootNode: {isDir: true}}
-
-	for _, e := range idx.Entries {
-		parts := strings.Split(e.Name, string("/"))
-
-		var fullpath string
-		for _, part := range parts {
-			parent := fullpath
-			fullpath = path.Join(fullpath, part)
-
-			if _, ok := m[fullpath]; ok {
-				continue
-			}
-
-			n := &node{path: fullpath, skip: e.SkipWorktree}
-			if fullpath == e.Name {
-				n.entry = e
-			} else {
-				n.isDir = true
-			}
-
-			m[n.path] = n
-			m[parent].children = append(m[parent].children, n)
-		}
-	}
-
-	return m[rootNode]
-}
-
-func (n *node) String() string {
-	return n.path
-}
-
-func (n *node) Skip() bool {
-	return n.skip
-}
-
-// Hash the hash of a filesystem is a 24-byte slice, is the result of
-// concatenating the computed plumbing.Hash of the file as a Blob and its
-// plumbing.FileMode; that way the difftree algorithm will detect changes in the
-// contents of files and also in their mode.
-//
-// If the node is computed and not based on a index.Entry the hash is equals
-// to a 24-bytes slices of zero values.
-func (n *node) Hash() []byte {
-	if n.entry == nil {
-		return make([]byte, 24)
-	}
-
-	return append(n.entry.Hash[:], n.entry.Mode.Bytes()...)
-}
-
-func (n *node) Name() string {
-	return path.Base(n.path)
-}
-
-func (n *node) IsDir() bool {
-	return n.isDir
-}
-
-func (n *node) Children() ([]noder.Noder, error) {
-	return n.children, nil
-}
-
-func (n *node) NumChildren() (int, error) {
-	return len(n.children), nil
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame/frame.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame/frame.go
deleted file mode 100644
index b24f97a55..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame/frame.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package frame
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// A Frame is a collection of siblings in a trie, sorted alphabetically
-// by name.
-type Frame struct {
-	// siblings, sorted in reverse alphabetical order by name
-	stack []noder.Noder
-}
-
-type byName []noder.Noder
-
-func (a byName) Len() int      { return len(a) }
-func (a byName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a byName) Less(i, j int) bool {
-	return strings.Compare(a[i].Name(), a[j].Name()) < 0
-}
-
-// New returns a frame with the children of the provided node.
-func New(n noder.Noder) (*Frame, error) {
-	children, err := n.Children()
-	if err != nil {
-		return nil, err
-	}
-
-	sort.Sort(sort.Reverse(byName(children)))
-	return &Frame{
-		stack: children,
-	}, nil
-}
-
-// String returns the quoted names of the noders in the frame sorted in
-// alphabetical order by name, surrounded by square brackets and
-// separated by comas.
-//
-// Examples:
-//     []
-//     ["a", "b"]
-func (f *Frame) String() string {
-	var buf bytes.Buffer
-	_ = buf.WriteByte('[')
-
-	sep := ""
-	for i := f.Len() - 1; i >= 0; i-- {
-		_, _ = buf.WriteString(sep)
-		sep = ", "
-		_, _ = buf.WriteString(fmt.Sprintf("%q", f.stack[i].Name()))
-	}
-
-	_ = buf.WriteByte(']')
-
-	return buf.String()
-}
-
-// First returns, but dont extract, the noder with the alphabetically
-// smaller name in the frame and true if the frame was not empty.
-// Otherwise it returns nil and false.
-func (f *Frame) First() (noder.Noder, bool) {
-	if f.Len() == 0 {
-		return nil, false
-	}
-
-	top := f.Len() - 1
-
-	return f.stack[top], true
-}
-
-// Drop extracts the noder with the alphabetically smaller name in the
-// frame or does nothing if the frame was empty.
-func (f *Frame) Drop() {
-	if f.Len() == 0 {
-		return
-	}
-
-	top := f.Len() - 1
-	f.stack[top] = nil
-	f.stack = f.stack[:top]
-}
-
-// Len returns the number of noders in the frame.
-func (f *Frame) Len() int {
-	return len(f.stack)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/iter.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/iter.go
deleted file mode 100644
index d8a4fbf39..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/iter.go
+++ /dev/null
@@ -1,216 +0,0 @@
-package merkletrie
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-// Iter is an iterator for merkletries (only the trie part of the
-// merkletrie is relevant here, it does not use the Hasher interface).
-//
-// The iteration is performed in depth-first pre-order.  Entries at each
-// depth are traversed in (case-sensitive) alphabetical order.
-//
-// This is the kind of traversal you will expect when listing ordinary
-// files and directories recursively, for example:
-//
-//          Trie           Traversal order
-//          ----           ---------------
-//           .
-//         / | \           c
-//        /  |  \          d/
-//       d   c   z   ===>  d/a
-//      / \                d/b
-//     b   a               z
-//
-//
-// This iterator is somewhat especial as you can chose to skip whole
-// "directories" when iterating:
-//
-// - The Step method will iterate normally.
-//
-// - the Next method will not descend deeper into the tree.
-//
-// For example, if the iterator is at `d/`, the Step method will return
-// `d/a` while the Next would have returned `z` instead (skipping `d/`
-// and its descendants).  The name of the these two methods are based on
-// the well known "next" and "step" operations, quite common in
-// debuggers, like gdb.
-//
-// The paths returned by the iterator will be relative, if the iterator
-// was created from a single node, or absolute, if the iterator was
-// created from the path to the node (the path will be prefixed to all
-// returned paths).
-type Iter struct {
-	// Tells if the iteration has started.
-	hasStarted bool
-	// The top of this stack has the current node and its siblings.  The
-	// rest of the stack keeps the ancestors of the current node and
-	// their corresponding siblings.  The current element is always the
-	// top element of the top frame.
-	//
-	// When "step"ping into a node, its children are pushed as a new
-	// frame.
-	//
-	// When "next"ing pass a node, the current element is dropped by
-	// popping the top frame.
-	frameStack []*frame.Frame
-	// The base path used to turn the relative paths used internally by
-	// the iterator into absolute paths used by external applications.
-	// For relative iterator this will be nil.
-	base noder.Path
-}
-
-// NewIter returns a new relative iterator using the provider noder as
-// its unnamed root.  When iterating, all returned paths will be
-// relative to node.
-func NewIter(n noder.Noder) (*Iter, error) {
-	return newIter(n, nil)
-}
-
-// NewIterFromPath returns a new absolute iterator from the noder at the
-// end of the path p.  When iterating, all returned paths will be
-// absolute, using the root of the path p as their root.
-func NewIterFromPath(p noder.Path) (*Iter, error) {
-	return newIter(p, p) // Path implements Noder
-}
-
-func newIter(root noder.Noder, base noder.Path) (*Iter, error) {
-	ret := &Iter{
-		base: base,
-	}
-
-	if root == nil {
-		return ret, nil
-	}
-
-	frame, err := frame.New(root)
-	if err != nil {
-		return nil, err
-	}
-	ret.push(frame)
-
-	return ret, nil
-}
-
-func (iter *Iter) top() (*frame.Frame, bool) {
-	if len(iter.frameStack) == 0 {
-		return nil, false
-	}
-	top := len(iter.frameStack) - 1
-
-	return iter.frameStack[top], true
-}
-
-func (iter *Iter) push(f *frame.Frame) {
-	iter.frameStack = append(iter.frameStack, f)
-}
-
-const (
-	doDescend   = true
-	dontDescend = false
-)
-
-// Next returns the path of the next node without descending deeper into
-// the trie and nil.  If there are no more entries in the trie it
-// returns nil and io.EOF.  In case of error, it will return nil and the
-// error.
-func (iter *Iter) Next() (noder.Path, error) {
-	return iter.advance(dontDescend)
-}
-
-// Step returns the path to the next node in the trie, descending deeper
-// into it if needed, and nil. If there are no more nodes in the trie,
-// it returns nil and io.EOF.  In case of error, it will return nil and
-// the error.
-func (iter *Iter) Step() (noder.Path, error) {
-	return iter.advance(doDescend)
-}
-
-// Advances the iterator in the desired direction: descend or
-// dontDescend.
-//
-// Returns the new current element and a nil error on success.  If there
-// are no more elements in the trie below the base, it returns nil, and
-// io.EOF.  Returns nil and an error in case of errors.
-func (iter *Iter) advance(wantDescend bool) (noder.Path, error) {
-	current, err := iter.current()
-	if err != nil {
-		return nil, err
-	}
-
-	// The first time we just return the current node.
-	if !iter.hasStarted {
-		iter.hasStarted = true
-		return current, nil
-	}
-
-	// Advances means getting a next current node, either its first child or
-	// its next sibling, depending if we must descend or not.
-	numChildren, err := current.NumChildren()
-	if err != nil {
-		return nil, err
-	}
-
-	mustDescend := numChildren != 0 && wantDescend
-	if mustDescend {
-		// descend: add a new frame with the current's children.
-		frame, err := frame.New(current)
-		if err != nil {
-			return nil, err
-		}
-		iter.push(frame)
-	} else {
-		// don't descend: just drop the current node
-		iter.drop()
-	}
-
-	return iter.current()
-}
-
-// Returns the path to the current node, adding the base if there was
-// one, and a nil error.  If there were no noders left, it returns nil
-// and io.EOF.  If an error occurred, it returns nil and the error.
-func (iter *Iter) current() (noder.Path, error) {
-	if topFrame, ok := iter.top(); !ok {
-		return nil, io.EOF
-	} else if _, ok := topFrame.First(); !ok {
-		return nil, io.EOF
-	}
-
-	ret := make(noder.Path, 0, len(iter.base)+len(iter.frameStack))
-
-	// concat the base...
-	ret = append(ret, iter.base...)
-	// ... and the current node and all its ancestors
-	for i, f := range iter.frameStack {
-		t, ok := f.First()
-		if !ok {
-			panic(fmt.Sprintf("frame %d is empty", i))
-		}
-		ret = append(ret, t)
-	}
-
-	return ret, nil
-}
-
-// removes the current node if any, and all the frames that become empty as a
-// consequence of this action.
-func (iter *Iter) drop() {
-	frame, ok := iter.top()
-	if !ok {
-		return
-	}
-
-	frame.Drop()
-	// if the frame is empty, remove it and its parent, recursively
-	if frame.Len() == 0 {
-		top := len(iter.frameStack) - 1
-		iter.frameStack[top] = nil
-		iter.frameStack = iter.frameStack[:top]
-		iter.drop()
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/noder/noder.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/noder/noder.go
deleted file mode 100644
index 6d22b8c14..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/noder/noder.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Package noder provide an interface for defining nodes in a
-// merkletrie, their hashes and their paths (a noders and its
-// ancestors).
-//
-// The hasher interface is easy to implement naively by elements that
-// already have a hash, like git blobs and trees.  More sophisticated
-// implementations can implement the Equal function in exotic ways
-// though: for instance, comparing the modification time of directories
-// in a filesystem.
-package noder
-
-import "fmt"
-
-// Hasher interface is implemented by types that can tell you
-// their hash.
-type Hasher interface {
-	Hash() []byte
-}
-
-// Equal functions take two hashers and return if they are equal.
-//
-// These functions are expected to be faster than reflect.Equal or
-// reflect.DeepEqual because they can compare just the hash of the
-// objects, instead of their contents, so they are expected to be O(1).
-type Equal func(a, b Hasher) bool
-
-// The Noder interface is implemented by the elements of a Merkle Trie.
-//
-// There are two types of elements in a Merkle Trie:
-//
-// - file-like nodes: they cannot have children.
-//
-// - directory-like nodes: they can have 0 or more children and their
-// hash is calculated by combining their children hashes.
-type Noder interface {
-	Hasher
-	fmt.Stringer // for testing purposes
-	// Name returns the name of an element (relative, not its full
-	// path).
-	Name() string
-	// IsDir returns true if the element is a directory-like node or
-	// false if it is a file-like node.
-	IsDir() bool
-	// Children returns the children of the element.  Note that empty
-	// directory-like noders and file-like noders will both return
-	// NoChildren.
-	Children() ([]Noder, error)
-	// NumChildren returns the number of children this element has.
-	//
-	// This method is an optimization: the number of children is easily
-	// calculated as the length of the value returned by the Children
-	// method (above); yet, some implementations will be able to
-	// implement NumChildren in O(1) while Children is usually more
-	// complex.
-	NumChildren() (int, error)
-	Skip()	bool
-}
-
-// NoChildren represents the children of a noder without children.
-var NoChildren = []Noder{}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/noder/path.go b/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/noder/path.go
deleted file mode 100644
index 6c1d36332..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/merkletrie/noder/path.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package noder
-
-import (
-	"bytes"
-	"strings"
-)
-
-// Path values represent a noder and its ancestors.  The root goes first
-// and the actual final noder the path is referring to will be the last.
-//
-// A path implements the Noder interface, redirecting all the interface
-// calls to its final noder.
-//
-// Paths build from an empty Noder slice are not valid paths and should
-// not be used.
-type Path []Noder
-
-func (p Path) Skip() bool {
-	if len(p) > 0 {
-		return p.Last().Skip()
-	}
-
-	return false
-}
-
-// String returns the full path of the final noder as a string, using
-// "/" as the separator.
-func (p Path) String() string {
-	var buf bytes.Buffer
-	sep := ""
-	for _, e := range p {
-		_, _ = buf.WriteString(sep)
-		sep = "/"
-		_, _ = buf.WriteString(e.Name())
-	}
-
-	return buf.String()
-}
-
-// Last returns the final noder in the path.
-func (p Path) Last() Noder {
-	return p[len(p)-1]
-}
-
-// Hash returns the hash of the final noder of the path.
-func (p Path) Hash() []byte {
-	return p.Last().Hash()
-}
-
-// Name returns the name of the final noder of the path.
-func (p Path) Name() string {
-	return p.Last().Name()
-}
-
-// IsDir returns if the final noder of the path is a directory-like
-// noder.
-func (p Path) IsDir() bool {
-	return p.Last().IsDir()
-}
-
-// Children returns the children of the final noder in the path.
-func (p Path) Children() ([]Noder, error) {
-	return p.Last().Children()
-}
-
-// NumChildren returns the number of children the final noder of the
-// path has.
-func (p Path) NumChildren() (int, error) {
-	return p.Last().NumChildren()
-}
-
-// Compare returns -1, 0 or 1 if the path p is smaller, equal or bigger
-// than other, in "directory order"; for example:
-//
-// "a" < "b"
-// "a/b/c/d/z" < "b"
-// "a/b/a" > "a/b"
-func (p Path) Compare(other Path) int {
-	i := 0
-	for {
-		switch {
-		case len(other) == len(p) && i == len(p):
-			return 0
-		case i == len(other):
-			return 1
-		case i == len(p):
-			return -1
-		default:
-			// We do *not* normalize Unicode here. CGit doesn't.
-			// https://github.com/src-d/go-git/issues/1057
-			cmp := strings.Compare(p[i].Name(), other[i].Name())
-			if cmp != 0 {
-				return cmp
-			}
-		}
-		i++
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/sync/bufio.go b/vendor/github.com/jesseduffield/go-git/v5/utils/sync/bufio.go
deleted file mode 100644
index 42f60f7ea..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/sync/bufio.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package sync
-
-import (
-	"bufio"
-	"io"
-	"sync"
-)
-
-var bufioReader = sync.Pool{
-	New: func() interface{} {
-		return bufio.NewReader(nil)
-	},
-}
-
-// GetBufioReader returns a *bufio.Reader that is managed by a sync.Pool.
-// Returns a bufio.Reader that is reset with reader and ready for use.
-//
-// After use, the *bufio.Reader should be put back into the sync.Pool
-// by calling PutBufioReader.
-func GetBufioReader(reader io.Reader) *bufio.Reader {
-	r := bufioReader.Get().(*bufio.Reader)
-	r.Reset(reader)
-	return r
-}
-
-// PutBufioReader puts reader back into its sync.Pool.
-func PutBufioReader(reader *bufio.Reader) {
-	bufioReader.Put(reader)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/sync/bytes.go b/vendor/github.com/jesseduffield/go-git/v5/utils/sync/bytes.go
deleted file mode 100644
index c67b97837..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/sync/bytes.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package sync
-
-import (
-	"bytes"
-	"sync"
-)
-
-var (
-	byteSlice = sync.Pool{
-		New: func() interface{} {
-			b := make([]byte, 16*1024)
-			return &b
-		},
-	}
-	bytesBuffer = sync.Pool{
-		New: func() interface{} {
-			return bytes.NewBuffer(nil)
-		},
-	}
-)
-
-// GetByteSlice returns a *[]byte that is managed by a sync.Pool.
-// The initial slice length will be 16384 (16kb).
-//
-// After use, the *[]byte should be put back into the sync.Pool
-// by calling PutByteSlice.
-func GetByteSlice() *[]byte {
-	buf := byteSlice.Get().(*[]byte)
-	return buf
-}
-
-// PutByteSlice puts buf back into its sync.Pool.
-func PutByteSlice(buf *[]byte) {
-	byteSlice.Put(buf)
-}
-
-// GetBytesBuffer returns a *bytes.Buffer that is managed by a sync.Pool.
-// Returns a buffer that is reset and ready for use.
-//
-// After use, the *bytes.Buffer should be put back into the sync.Pool
-// by calling PutBytesBuffer.
-func GetBytesBuffer() *bytes.Buffer {
-	buf := bytesBuffer.Get().(*bytes.Buffer)
-	buf.Reset()
-	return buf
-}
-
-// PutBytesBuffer puts buf back into its sync.Pool.
-func PutBytesBuffer(buf *bytes.Buffer) {
-	bytesBuffer.Put(buf)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/sync/zlib.go b/vendor/github.com/jesseduffield/go-git/v5/utils/sync/zlib.go
deleted file mode 100644
index edf674d85..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/sync/zlib.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package sync
-
-import (
-	"bytes"
-	"compress/zlib"
-	"io"
-	"sync"
-)
-
-var (
-	zlibInitBytes = []byte{0x78, 0x9c, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01}
-	zlibReader    = sync.Pool{
-		New: func() interface{} {
-			r, _ := zlib.NewReader(bytes.NewReader(zlibInitBytes))
-			return ZLibReader{
-				Reader: r.(zlibReadCloser),
-			}
-		},
-	}
-	zlibWriter = sync.Pool{
-		New: func() interface{} {
-			return zlib.NewWriter(nil)
-		},
-	}
-)
-
-type zlibReadCloser interface {
-	io.ReadCloser
-	zlib.Resetter
-}
-
-type ZLibReader struct {
-	dict   *[]byte
-	Reader zlibReadCloser
-}
-
-// GetZlibReader returns a ZLibReader that is managed by a sync.Pool.
-// Returns a ZLibReader that is reset using a dictionary that is
-// also managed by a sync.Pool.
-//
-// After use, the ZLibReader should be put back into the sync.Pool
-// by calling PutZlibReader.
-func GetZlibReader(r io.Reader) (ZLibReader, error) {
-	z := zlibReader.Get().(ZLibReader)
-	z.dict = GetByteSlice()
-
-	err := z.Reader.Reset(r, *z.dict)
-
-	return z, err
-}
-
-// PutZlibReader puts z back into its sync.Pool, first closing the reader.
-// The Byte slice dictionary is also put back into its sync.Pool.
-func PutZlibReader(z ZLibReader) {
-	z.Reader.Close()
-	PutByteSlice(z.dict)
-	zlibReader.Put(z)
-}
-
-// GetZlibWriter returns a *zlib.Writer that is managed by a sync.Pool.
-// Returns a writer that is reset with w and ready for use.
-//
-// After use, the *zlib.Writer should be put back into the sync.Pool
-// by calling PutZlibWriter.
-func GetZlibWriter(w io.Writer) *zlib.Writer {
-	z := zlibWriter.Get().(*zlib.Writer)
-	z.Reset(w)
-	return z
-}
-
-// PutZlibWriter puts w back into its sync.Pool.
-func PutZlibWriter(w *zlib.Writer) {
-	zlibWriter.Put(w)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/utils/trace/trace.go b/vendor/github.com/jesseduffield/go-git/v5/utils/trace/trace.go
deleted file mode 100644
index 3e15c5b9f..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/utils/trace/trace.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package trace
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"sync/atomic"
-)
-
-var (
-	// logger is the logger to use for tracing.
-	logger = newLogger()
-
-	// current is the targets that are enabled for tracing.
-	current atomic.Int32
-)
-
-func newLogger() *log.Logger {
-	return log.New(os.Stderr, "", log.Ltime|log.Lmicroseconds|log.Lshortfile)
-}
-
-// Target is a tracing target.
-type Target int32
-
-const (
-	// General traces general operations.
-	General Target = 1 << iota
-
-	// Packet traces git packets.
-	Packet
-)
-
-// SetTarget sets the tracing targets.
-func SetTarget(target Target) {
-	current.Store(int32(target))
-}
-
-// SetLogger sets the logger to use for tracing.
-func SetLogger(l *log.Logger) {
-	logger = l
-}
-
-// Print prints the given message only if the target is enabled.
-func (t Target) Print(args ...interface{}) {
-	if int32(t)¤t.Load() != 0 {
-		logger.Output(2, fmt.Sprint(args...)) // nolint: errcheck
-	}
-}
-
-// Printf prints the given message only if the target is enabled.
-func (t Target) Printf(format string, args ...interface{}) {
-	if int32(t)¤t.Load() != 0 {
-		logger.Output(2, fmt.Sprintf(format, args...)) // nolint: errcheck
-	}
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree.go b/vendor/github.com/jesseduffield/go-git/v5/worktree.go
deleted file mode 100644
index 304e90c98..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree.go
+++ /dev/null
@@ -1,1196 +0,0 @@
-package git
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/util"
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/gitignore"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/plumbing/storer"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie"
-	"github.com/jesseduffield/go-git/v5/utils/sync"
-)
-
-var (
-	ErrWorktreeNotClean                = errors.New("worktree is not clean")
-	ErrSubmoduleNotFound               = errors.New("submodule not found")
-	ErrUnstagedChanges                 = errors.New("worktree contains unstaged changes")
-	ErrGitModulesSymlink               = errors.New(gitmodulesFile + " is a symlink")
-	ErrNonFastForwardUpdate            = errors.New("non-fast-forward update")
-	ErrRestoreWorktreeOnlyNotSupported = errors.New("worktree only is not supported")
-)
-
-// Worktree represents a git worktree.
-type Worktree struct {
-	// Filesystem underlying filesystem.
-	Filesystem billy.Filesystem
-	// External excludes not found in the repository .gitignore
-	Excludes []gitignore.Pattern
-
-	r *Repository
-}
-
-// Pull incorporates changes from a remote repository into the current branch.
-// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
-// no changes to be fetched, or an error.
-//
-// Pull only supports merges where the can be resolved as a fast-forward.
-func (w *Worktree) Pull(o *PullOptions) error {
-	return w.PullContext(context.Background(), o)
-}
-
-// PullContext incorporates changes from a remote repository into the current
-// branch. Returns nil if the operation is successful, NoErrAlreadyUpToDate if
-// there are no changes to be fetched, or an error.
-//
-// Pull only supports merges where the can be resolved as a fast-forward.
-//
-// The provided Context must be non-nil. If the context expires before the
-// operation is complete, an error is returned. The context only affects the
-// transport operations.
-func (w *Worktree) PullContext(ctx context.Context, o *PullOptions) error {
-	if err := o.Validate(); err != nil {
-		return err
-	}
-
-	remote, err := w.r.Remote(o.RemoteName)
-	if err != nil {
-		return err
-	}
-
-	fetchHead, err := remote.fetch(ctx, &FetchOptions{
-		RemoteName:      o.RemoteName,
-		RemoteURL:       o.RemoteURL,
-		Depth:           o.Depth,
-		Auth:            o.Auth,
-		Progress:        o.Progress,
-		Force:           o.Force,
-		InsecureSkipTLS: o.InsecureSkipTLS,
-		CABundle:        o.CABundle,
-		ProxyOptions:    o.ProxyOptions,
-	})
-
-	updated := true
-	if err == NoErrAlreadyUpToDate {
-		updated = false
-	} else if err != nil {
-		return err
-	}
-
-	ref, err := storer.ResolveReference(fetchHead, o.ReferenceName)
-	if err != nil {
-		return err
-	}
-
-	head, err := w.r.Head()
-	if err == nil {
-		// if we don't have a shallows list, just ignore it
-		shallowList, _ := w.r.Storer.Shallow()
-
-		var earliestShallow *plumbing.Hash
-		if len(shallowList) > 0 {
-			earliestShallow = &shallowList[0]
-		}
-
-		headAheadOfRef, err := isFastForward(w.r.Storer, ref.Hash(), head.Hash(), earliestShallow)
-		if err != nil {
-			return err
-		}
-
-		if !updated && headAheadOfRef {
-			return NoErrAlreadyUpToDate
-		}
-
-		ff, err := isFastForward(w.r.Storer, head.Hash(), ref.Hash(), earliestShallow)
-		if err != nil {
-			return err
-		}
-
-		if !ff {
-			return ErrNonFastForwardUpdate
-		}
-	}
-
-	if err != nil && err != plumbing.ErrReferenceNotFound {
-		return err
-	}
-
-	if err := w.updateHEAD(ref.Hash()); err != nil {
-		return err
-	}
-
-	if err := w.Reset(&ResetOptions{
-		Mode:   MergeReset,
-		Commit: ref.Hash(),
-	}); err != nil {
-		return err
-	}
-
-	if o.RecurseSubmodules != NoRecurseSubmodules {
-		return w.updateSubmodules(ctx, &SubmoduleUpdateOptions{
-			RecurseSubmodules: o.RecurseSubmodules,
-			Auth:              o.Auth,
-		})
-	}
-
-	return nil
-}
-
-func (w *Worktree) updateSubmodules(ctx context.Context, o *SubmoduleUpdateOptions) error {
-	s, err := w.Submodules()
-	if err != nil {
-		return err
-	}
-	o.Init = true
-	return s.UpdateContext(ctx, o)
-}
-
-// Checkout switch branches or restore working tree files.
-func (w *Worktree) Checkout(opts *CheckoutOptions) error {
-	if err := opts.Validate(); err != nil {
-		return err
-	}
-
-	if opts.Create {
-		if err := w.createBranch(opts); err != nil {
-			return err
-		}
-	}
-
-	c, err := w.getCommitFromCheckoutOptions(opts)
-	if err != nil {
-		return err
-	}
-
-	ro := &ResetOptions{Commit: c, Mode: MergeReset}
-	if opts.Force {
-		ro.Mode = HardReset
-	} else if opts.Keep {
-		ro.Mode = SoftReset
-	}
-
-	if !opts.Hash.IsZero() && !opts.Create {
-		err = w.setHEADToCommit(opts.Hash)
-	} else {
-		err = w.setHEADToBranch(opts.Branch, c)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	if len(opts.SparseCheckoutDirectories) > 0 {
-		return w.ResetSparsely(ro, opts.SparseCheckoutDirectories)
-	}
-
-	return w.Reset(ro)
-}
-
-func (w *Worktree) createBranch(opts *CheckoutOptions) error {
-	if err := opts.Branch.Validate(); err != nil {
-		return err
-	}
-
-	_, err := w.r.Storer.Reference(opts.Branch)
-	if err == nil {
-		return fmt.Errorf("a branch named %q already exists", opts.Branch)
-	}
-
-	if err != plumbing.ErrReferenceNotFound {
-		return err
-	}
-
-	if opts.Hash.IsZero() {
-		ref, err := w.r.Head()
-		if err != nil {
-			return err
-		}
-
-		opts.Hash = ref.Hash()
-	}
-
-	return w.r.Storer.SetReference(
-		plumbing.NewHashReference(opts.Branch, opts.Hash),
-	)
-}
-
-func (w *Worktree) getCommitFromCheckoutOptions(opts *CheckoutOptions) (plumbing.Hash, error) {
-	hash := opts.Hash
-	if hash.IsZero() {
-		b, err := w.r.Reference(opts.Branch, true)
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-
-		hash = b.Hash()
-	}
-
-	o, err := w.r.Object(plumbing.AnyObject, hash)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	switch o := o.(type) {
-	case *object.Tag:
-		if o.TargetType != plumbing.CommitObject {
-			return plumbing.ZeroHash, fmt.Errorf("%w: tag target %q", object.ErrUnsupportedObject, o.TargetType)
-		}
-
-		return o.Target, nil
-	case *object.Commit:
-		return o.Hash, nil
-	}
-
-	return plumbing.ZeroHash, fmt.Errorf("%w: %q", object.ErrUnsupportedObject, o.Type())
-}
-
-func (w *Worktree) setHEADToCommit(commit plumbing.Hash) error {
-	head := plumbing.NewHashReference(plumbing.HEAD, commit)
-	return w.r.Storer.SetReference(head)
-}
-
-func (w *Worktree) setHEADToBranch(branch plumbing.ReferenceName, commit plumbing.Hash) error {
-	target, err := w.r.Storer.Reference(branch)
-	if err != nil {
-		return err
-	}
-
-	var head *plumbing.Reference
-	if target.Name().IsBranch() {
-		head = plumbing.NewSymbolicReference(plumbing.HEAD, target.Name())
-	} else {
-		head = plumbing.NewHashReference(plumbing.HEAD, commit)
-	}
-
-	return w.r.Storer.SetReference(head)
-}
-
-func (w *Worktree) ResetSparsely(opts *ResetOptions, dirs []string) error {
-	if err := opts.Validate(w.r); err != nil {
-		return err
-	}
-
-	if opts.Mode == MergeReset {
-		unstaged, err := w.containsUnstagedChanges()
-		if err != nil {
-			return err
-		}
-
-		if unstaged {
-			return ErrUnstagedChanges
-		}
-	}
-
-	if err := w.setHEADCommit(opts.Commit); err != nil {
-		return err
-	}
-
-	if opts.Mode == SoftReset {
-		return nil
-	}
-
-	t, err := w.r.getTreeFromCommitHash(opts.Commit)
-	if err != nil {
-		return err
-	}
-
-	if opts.Mode == MixedReset || opts.Mode == MergeReset || opts.Mode == HardReset {
-		if err := w.resetIndex(t, dirs, opts.Files); err != nil {
-			return err
-		}
-	}
-
-	if opts.Mode == MergeReset || opts.Mode == HardReset {
-		if err := w.resetWorktree(t, opts.Files); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Restore restores specified files in the working tree or stage with contents from
-// a restore source. If a path is tracked but does not exist in the restore,
-// source, it will be removed to match the source.
-//
-// If Staged and Worktree are true, then the restore source will be the index.
-// If only Staged is true, then the restore source will be HEAD.
-// If only Worktree is true or neither Staged nor Worktree are true, will
-// result in ErrRestoreWorktreeOnlyNotSupported because restoring the working
-// tree while leaving the stage untouched is not currently supported.
-//
-// Restore with no files specified will return ErrNoRestorePaths.
-func (w *Worktree) Restore(o *RestoreOptions) error {
-	if err := o.Validate(); err != nil {
-		return err
-	}
-
-	if o.Staged {
-		opts := &ResetOptions{
-			Files: o.Files,
-		}
-
-		if o.Worktree {
-			// If we are doing both Worktree and Staging then it is a hard reset
-			opts.Mode = HardReset
-		} else {
-			// If we are doing just staging then it is a mixed reset
-			opts.Mode = MixedReset
-		}
-
-		return w.Reset(opts)
-	}
-
-	return ErrRestoreWorktreeOnlyNotSupported
-}
-
-// Reset the worktree to a specified state.
-func (w *Worktree) Reset(opts *ResetOptions) error {
-	return w.ResetSparsely(opts, nil)
-}
-
-func (w *Worktree) resetIndex(t *object.Tree, dirs []string, files []string) error {
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return err
-	}
-
-	b := newIndexBuilder(idx)
-
-	changes, err := w.diffTreeWithStaging(t, true)
-	if err != nil {
-		return err
-	}
-
-	for _, ch := range changes {
-		a, err := ch.Action()
-		if err != nil {
-			return err
-		}
-
-		var name string
-		var e *object.TreeEntry
-
-		switch a {
-		case merkletrie.Modify, merkletrie.Insert:
-			name = ch.To.String()
-			e, err = t.FindEntry(name)
-			if err != nil {
-				return err
-			}
-		case merkletrie.Delete:
-			name = ch.From.String()
-		}
-
-		if len(files) > 0 {
-			contains := inFiles(files, name)
-			if !contains {
-				continue
-			}
-		}
-
-		b.Remove(name)
-		if e == nil {
-			continue
-		}
-
-		b.Add(&index.Entry{
-			Name: name,
-			Hash: e.Hash,
-			Mode: e.Mode,
-		})
-
-	}
-
-	b.Write(idx)
-
-	if len(dirs) > 0 {
-		idx.SkipUnless(dirs)
-	}
-
-	return w.r.Storer.SetIndex(idx)
-}
-
-func inFiles(files []string, v string) bool {
-	v = filepath.Clean(v)
-	for _, s := range files {
-		if filepath.Clean(s) == v {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (w *Worktree) resetWorktree(t *object.Tree, files []string) error {
-	changes, err := w.diffStagingWithWorktree(true, false)
-	if err != nil {
-		return err
-	}
-
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return err
-	}
-	b := newIndexBuilder(idx)
-
-	for _, ch := range changes {
-		if err := w.validChange(ch); err != nil {
-			return err
-		}
-
-		if len(files) > 0 {
-			file := ""
-			if ch.From != nil {
-				file = ch.From.String()
-			} else if ch.To != nil {
-				file = ch.To.String()
-			}
-
-			if file == "" {
-				continue
-			}
-
-			contains := inFiles(files, file)
-			if !contains {
-				continue
-			}
-		}
-
-		if err := w.checkoutChange(ch, t, b); err != nil {
-			return err
-		}
-	}
-
-	b.Write(idx)
-	return w.r.Storer.SetIndex(idx)
-}
-
-// worktreeDeny is a list of paths that are not allowed
-// to be used when resetting the worktree.
-var worktreeDeny = map[string]struct{}{
-	// .git
-	GitDirName: {},
-
-	// For other historical reasons, file names that do not conform to the 8.3
-	// format (up to eight characters for the basename, three for the file
-	// extension, certain characters not allowed such as `+`, etc) are associated
-	// with a so-called "short name", at least on the `C:` drive by default.
-	// Which means that `git~1/` is a valid way to refer to `.git/`.
-	"git~1": {},
-}
-
-// validPath checks whether paths are valid.
-// The rules around invalid paths could differ from upstream based on how
-// filesystems are managed within go-git, but they are largely the same.
-//
-// For upstream rules:
-// https://github.com/git/git/blob/564d0252ca632e0264ed670534a51d18a689ef5d/read-cache.c#L946
-// https://github.com/git/git/blob/564d0252ca632e0264ed670534a51d18a689ef5d/path.c#L1383
-func validPath(paths ...string) error {
-	for _, p := range paths {
-		parts := strings.FieldsFunc(p, func(r rune) bool { return (r == '\\' || r == '/') })
-		if len(parts) == 0 {
-			return fmt.Errorf("invalid path: %q", p)
-		}
-
-		if _, denied := worktreeDeny[strings.ToLower(parts[0])]; denied {
-			return fmt.Errorf("invalid path prefix: %q", p)
-		}
-
-		if runtime.GOOS == "windows" {
-			// Volume names are not supported, in both formats: \\ and :.
-			if vol := filepath.VolumeName(p); vol != "" {
-				return fmt.Errorf("invalid path: %q", p)
-			}
-
-			if !windowsValidPath(parts[0]) {
-				return fmt.Errorf("invalid path: %q", p)
-			}
-		}
-
-		for _, part := range parts {
-			if part == ".." {
-				return fmt.Errorf("invalid path %q: cannot use '..'", p)
-			}
-		}
-	}
-	return nil
-}
-
-// windowsPathReplacer defines the chars that need to be replaced
-// as part of windowsValidPath.
-var windowsPathReplacer *strings.Replacer
-
-func init() {
-	windowsPathReplacer = strings.NewReplacer(" ", "", ".", "")
-}
-
-func windowsValidPath(part string) bool {
-	if len(part) > 3 && strings.EqualFold(part[:4], GitDirName) {
-		// For historical reasons, file names that end in spaces or periods are
-		// automatically trimmed. Therefore, `.git . . ./` is a valid way to refer
-		// to `.git/`.
-		if windowsPathReplacer.Replace(part[4:]) == "" {
-			return false
-		}
-
-		// For yet other historical reasons, NTFS supports so-called "Alternate Data
-		// Streams", i.e. metadata associated with a given file, referred to via
-		// `::`. There exists a default stream
-		// type for directories, allowing `.git/` to be accessed via
-		// `.git::$INDEX_ALLOCATION/`.
-		//
-		// For performance reasons, _all_ Alternate Data Streams of `.git/` are
-		// forbidden, not just `::$INDEX_ALLOCATION`.
-		if len(part) > 4 && part[4:5] == ":" {
-			return false
-		}
-	}
-	return true
-}
-
-func (w *Worktree) validChange(ch merkletrie.Change) error {
-	action, err := ch.Action()
-	if err != nil {
-		return nil
-	}
-
-	switch action {
-	case merkletrie.Delete:
-		return validPath(ch.From.String())
-	case merkletrie.Insert:
-		return validPath(ch.To.String())
-	case merkletrie.Modify:
-		return validPath(ch.From.String(), ch.To.String())
-	}
-
-	return nil
-}
-
-func (w *Worktree) checkoutChange(ch merkletrie.Change, t *object.Tree, idx *indexBuilder) error {
-	a, err := ch.Action()
-	if err != nil {
-		return err
-	}
-
-	var e *object.TreeEntry
-	var name string
-	var isSubmodule bool
-
-	switch a {
-	case merkletrie.Modify, merkletrie.Insert:
-		name = ch.To.String()
-		e, err = t.FindEntry(name)
-		if err != nil {
-			return err
-		}
-
-		isSubmodule = e.Mode == filemode.Submodule
-	case merkletrie.Delete:
-		return rmFileAndDirsIfEmpty(w.Filesystem, ch.From.String())
-	}
-
-	if isSubmodule {
-		return w.checkoutChangeSubmodule(name, a, e, idx)
-	}
-
-	return w.checkoutChangeRegularFile(name, a, t, e, idx)
-}
-
-func (w *Worktree) containsUnstagedChanges() (bool, error) {
-	ch, err := w.diffStagingWithWorktree(false, true)
-	if err != nil {
-		return false, err
-	}
-
-	for _, c := range ch {
-		a, err := c.Action()
-		if err != nil {
-			return false, err
-		}
-
-		if a == merkletrie.Insert {
-			continue
-		}
-
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (w *Worktree) setHEADCommit(commit plumbing.Hash) error {
-	head, err := w.r.Reference(plumbing.HEAD, false)
-	if err != nil {
-		return err
-	}
-
-	if head.Type() == plumbing.HashReference {
-		head = plumbing.NewHashReference(plumbing.HEAD, commit)
-		return w.r.Storer.SetReference(head)
-	}
-
-	branch, err := w.r.Reference(head.Target(), false)
-	if err != nil {
-		return err
-	}
-
-	if !branch.Name().IsBranch() {
-		return fmt.Errorf("invalid HEAD target should be a branch, found %s", branch.Type())
-	}
-
-	branch = plumbing.NewHashReference(branch.Name(), commit)
-	return w.r.Storer.SetReference(branch)
-}
-
-func (w *Worktree) checkoutChangeSubmodule(name string,
-	a merkletrie.Action,
-	e *object.TreeEntry,
-	idx *indexBuilder,
-) error {
-	switch a {
-	case merkletrie.Modify:
-		sub, err := w.Submodule(name)
-		if err != nil {
-			return err
-		}
-
-		if !sub.initialized {
-			return nil
-		}
-
-		return w.addIndexFromTreeEntry(name, e, idx)
-	case merkletrie.Insert:
-		mode, err := e.Mode.ToOSFileMode()
-		if err != nil {
-			return err
-		}
-
-		if err := w.Filesystem.MkdirAll(name, mode); err != nil {
-			return err
-		}
-
-		return w.addIndexFromTreeEntry(name, e, idx)
-	}
-
-	return nil
-}
-
-func (w *Worktree) checkoutChangeRegularFile(name string,
-	a merkletrie.Action,
-	t *object.Tree,
-	e *object.TreeEntry,
-	idx *indexBuilder,
-) error {
-	switch a {
-	case merkletrie.Modify:
-		idx.Remove(name)
-
-		// to apply perm changes the file is deleted, billy doesn't implement
-		// chmod
-		if err := w.Filesystem.Remove(name); err != nil {
-			return err
-		}
-
-		fallthrough
-	case merkletrie.Insert:
-		f, err := t.File(name)
-		if err != nil {
-			return err
-		}
-
-		if err := w.checkoutFile(f); err != nil {
-			return err
-		}
-
-		return w.addIndexFromFile(name, e.Hash, f.Mode, idx)
-	}
-
-	return nil
-}
-
-func (w *Worktree) checkoutFile(f *object.File) (err error) {
-	mode, err := f.Mode.ToOSFileMode()
-	if err != nil {
-		return
-	}
-
-	if mode&os.ModeSymlink != 0 {
-		return w.checkoutFileSymlink(f)
-	}
-
-	from, err := f.Reader()
-	if err != nil {
-		return
-	}
-
-	defer ioutil.CheckClose(from, &err)
-
-	to, err := w.Filesystem.OpenFile(f.Name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode.Perm())
-	if err != nil {
-		return
-	}
-
-	defer ioutil.CheckClose(to, &err)
-	buf := sync.GetByteSlice()
-	_, err = io.CopyBuffer(to, from, *buf)
-	sync.PutByteSlice(buf)
-	return
-}
-
-func (w *Worktree) checkoutFileSymlink(f *object.File) (err error) {
-	// https://github.com/git/git/commit/10ecfa76491e4923988337b2e2243b05376b40de
-	if strings.EqualFold(f.Name, gitmodulesFile) {
-		return ErrGitModulesSymlink
-	}
-
-	from, err := f.Reader()
-	if err != nil {
-		return
-	}
-
-	defer ioutil.CheckClose(from, &err)
-
-	bytes, err := io.ReadAll(from)
-	if err != nil {
-		return
-	}
-
-	err = w.Filesystem.Symlink(string(bytes), f.Name)
-
-	// On windows, this might fail.
-	// Follow Git on Windows behavior by writing the link as it is.
-	if err != nil && isSymlinkWindowsNonAdmin(err) {
-		mode, _ := f.Mode.ToOSFileMode()
-
-		to, err := w.Filesystem.OpenFile(f.Name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode.Perm())
-		if err != nil {
-			return err
-		}
-
-		defer ioutil.CheckClose(to, &err)
-
-		_, err = to.Write(bytes)
-		return err
-	}
-	return
-}
-
-func (w *Worktree) addIndexFromTreeEntry(name string, f *object.TreeEntry, idx *indexBuilder) error {
-	idx.Remove(name)
-	idx.Add(&index.Entry{
-		Hash: f.Hash,
-		Name: name,
-		Mode: filemode.Submodule,
-	})
-	return nil
-}
-
-func (w *Worktree) addIndexFromFile(name string, h plumbing.Hash, mode filemode.FileMode, idx *indexBuilder) error {
-	idx.Remove(name)
-	fi, err := w.Filesystem.Lstat(name)
-	if err != nil {
-		return err
-	}
-
-	e := &index.Entry{
-		Hash:       h,
-		Name:       name,
-		Mode:       mode,
-		ModifiedAt: fi.ModTime(),
-		Size:       uint32(fi.Size()),
-	}
-
-	// if the FileInfo.Sys() comes from os the ctime, dev, inode, uid and gid
-	// can be retrieved, otherwise this doesn't apply
-	if fillSystemInfo != nil {
-		fillSystemInfo(e, fi.Sys())
-	}
-	idx.Add(e)
-	return nil
-}
-
-func (r *Repository) getTreeFromCommitHash(commit plumbing.Hash) (*object.Tree, error) {
-	c, err := r.CommitObject(commit)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.Tree()
-}
-
-var fillSystemInfo func(e *index.Entry, sys interface{})
-
-const gitmodulesFile = ".gitmodules"
-
-// Submodule returns the submodule with the given name
-func (w *Worktree) Submodule(name string) (*Submodule, error) {
-	l, err := w.Submodules()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, m := range l {
-		if m.Config().Name == name {
-			return m, nil
-		}
-	}
-
-	return nil, ErrSubmoduleNotFound
-}
-
-// Submodules returns all the available submodules
-func (w *Worktree) Submodules() (Submodules, error) {
-	l := make(Submodules, 0)
-	m, err := w.readGitmodulesFile()
-	if err != nil || m == nil {
-		return l, err
-	}
-
-	c, err := w.r.Config()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, s := range m.Submodules {
-		l = append(l, w.newSubmodule(s, c.Submodules[s.Name]))
-	}
-
-	return l, nil
-}
-
-func (w *Worktree) newSubmodule(fromModules, fromConfig *config.Submodule) *Submodule {
-	m := &Submodule{w: w}
-	m.initialized = fromConfig != nil
-
-	if !m.initialized {
-		m.c = fromModules
-		return m
-	}
-
-	m.c = fromConfig
-	m.c.Path = fromModules.Path
-	return m
-}
-
-func (w *Worktree) isSymlink(path string) bool {
-	if s, err := w.Filesystem.Lstat(path); err == nil {
-		return s.Mode()&os.ModeSymlink != 0
-	}
-	return false
-}
-
-func (w *Worktree) readGitmodulesFile() (*config.Modules, error) {
-	if w.isSymlink(gitmodulesFile) {
-		return nil, ErrGitModulesSymlink
-	}
-
-	f, err := w.Filesystem.Open(gitmodulesFile)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, nil
-		}
-
-		return nil, err
-	}
-
-	defer f.Close()
-	input, err := io.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	m := config.NewModules()
-	if err := m.Unmarshal(input); err != nil {
-		return m, err
-	}
-
-	return m, nil
-}
-
-// Clean the worktree by removing untracked files.
-// An empty dir could be removed - this is what  `git clean -f -d .` does.
-func (w *Worktree) Clean(opts *CleanOptions) error {
-	s, err := w.Status()
-	if err != nil {
-		return err
-	}
-
-	root := ""
-	files, err := w.Filesystem.ReadDir(root)
-	if err != nil {
-		return err
-	}
-	return w.doClean(s, opts, root, files)
-}
-
-func (w *Worktree) doClean(status Status, opts *CleanOptions, dir string, files []os.FileInfo) error {
-	for _, fi := range files {
-		if fi.Name() == GitDirName {
-			continue
-		}
-
-		// relative path under the root
-		path := filepath.Join(dir, fi.Name())
-		if fi.IsDir() {
-			if !opts.Dir {
-				continue
-			}
-
-			subfiles, err := w.Filesystem.ReadDir(path)
-			if err != nil {
-				return err
-			}
-			err = w.doClean(status, opts, path, subfiles)
-			if err != nil {
-				return err
-			}
-		} else {
-			if status.IsUntracked(path) {
-				if err := w.Filesystem.Remove(path); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	if opts.Dir && dir != "" {
-		_, err := removeDirIfEmpty(w.Filesystem, dir)
-		return err
-	}
-
-	return nil
-}
-
-// GrepResult is structure of a grep result.
-type GrepResult struct {
-	// FileName is the name of file which contains match.
-	FileName string
-	// LineNumber is the line number of a file at which a match was found.
-	LineNumber int
-	// Content is the content of the file at the matching line.
-	Content string
-	// TreeName is the name of the tree (reference name/commit hash) at
-	// which the match was performed.
-	TreeName string
-}
-
-func (gr GrepResult) String() string {
-	return fmt.Sprintf("%s:%s:%d:%s", gr.TreeName, gr.FileName, gr.LineNumber, gr.Content)
-}
-
-// Grep performs grep on a repository.
-func (r *Repository) Grep(opts *GrepOptions) ([]GrepResult, error) {
-	if err := opts.validate(r); err != nil {
-		return nil, err
-	}
-
-	// Obtain commit hash from options (CommitHash or ReferenceName).
-	var commitHash plumbing.Hash
-	// treeName contains the value of TreeName in GrepResult.
-	var treeName string
-
-	if opts.ReferenceName != "" {
-		ref, err := r.Reference(opts.ReferenceName, true)
-		if err != nil {
-			return nil, err
-		}
-		commitHash = ref.Hash()
-		treeName = opts.ReferenceName.String()
-	} else if !opts.CommitHash.IsZero() {
-		commitHash = opts.CommitHash
-		treeName = opts.CommitHash.String()
-	}
-
-	// Obtain a tree from the commit hash and get a tracked files iterator from
-	// the tree.
-	tree, err := r.getTreeFromCommitHash(commitHash)
-	if err != nil {
-		return nil, err
-	}
-	fileiter := tree.Files()
-
-	return findMatchInFiles(fileiter, treeName, opts)
-}
-
-// Grep performs grep on a worktree.
-func (w *Worktree) Grep(opts *GrepOptions) ([]GrepResult, error) {
-	return w.r.Grep(opts)
-}
-
-// findMatchInFiles takes a FileIter, worktree name and GrepOptions, and
-// returns a slice of GrepResult containing the result of regex pattern matching
-// in content of all the files.
-func findMatchInFiles(fileiter *object.FileIter, treeName string, opts *GrepOptions) ([]GrepResult, error) {
-	var results []GrepResult
-
-	err := fileiter.ForEach(func(file *object.File) error {
-		var fileInPathSpec bool
-
-		// When no pathspecs are provided, search all the files.
-		if len(opts.PathSpecs) == 0 {
-			fileInPathSpec = true
-		}
-
-		// Check if the file name matches with the pathspec. Break out of the
-		// loop once a match is found.
-		for _, pathSpec := range opts.PathSpecs {
-			if pathSpec != nil && pathSpec.MatchString(file.Name) {
-				fileInPathSpec = true
-				break
-			}
-		}
-
-		// If the file does not match with any of the pathspec, skip it.
-		if !fileInPathSpec {
-			return nil
-		}
-
-		grepResults, err := findMatchInFile(file, treeName, opts)
-		if err != nil {
-			return err
-		}
-		results = append(results, grepResults...)
-
-		return nil
-	})
-
-	return results, err
-}
-
-// findMatchInFile takes a single File, worktree name and GrepOptions,
-// and returns a slice of GrepResult containing the result of regex pattern
-// matching in the given file.
-func findMatchInFile(file *object.File, treeName string, opts *GrepOptions) ([]GrepResult, error) {
-	var grepResults []GrepResult
-
-	content, err := file.Contents()
-	if err != nil {
-		return grepResults, err
-	}
-
-	// Split the file content and parse line-by-line.
-	contentByLine := strings.Split(content, "\n")
-	for lineNum, cnt := range contentByLine {
-		addToResult := false
-
-		// Match the patterns and content. Break out of the loop once a
-		// match is found.
-		for _, pattern := range opts.Patterns {
-			if pattern != nil && pattern.MatchString(cnt) {
-				// Add to result only if invert match is not enabled.
-				if !opts.InvertMatch {
-					addToResult = true
-					break
-				}
-			} else if opts.InvertMatch {
-				// If matching fails, and invert match is enabled, add to
-				// results.
-				addToResult = true
-				break
-			}
-		}
-
-		if addToResult {
-			grepResults = append(grepResults, GrepResult{
-				FileName:   file.Name,
-				LineNumber: lineNum + 1,
-				Content:    cnt,
-				TreeName:   treeName,
-			})
-		}
-	}
-
-	return grepResults, nil
-}
-
-// will walk up the directory tree removing all encountered empty
-// directories, not just the one containing this file
-func rmFileAndDirsIfEmpty(fs billy.Filesystem, name string) error {
-	if err := util.RemoveAll(fs, name); err != nil {
-		return err
-	}
-
-	dir := filepath.Dir(name)
-	for {
-		removed, err := removeDirIfEmpty(fs, dir)
-		if err != nil && !os.IsNotExist(err) {
-			return err
-		}
-
-		if !removed {
-			// directory was not empty and not removed,
-			// stop checking parents
-			break
-		}
-
-		// move to parent directory
-		dir = filepath.Dir(dir)
-	}
-
-	return nil
-}
-
-// removeDirIfEmpty will remove the supplied directory `dir` if
-// `dir` is empty
-// returns true if the directory was removed
-func removeDirIfEmpty(fs billy.Filesystem, dir string) (bool, error) {
-	files, err := fs.ReadDir(dir)
-	if err != nil {
-		return false, err
-	}
-
-	if len(files) > 0 {
-		return false, nil
-	}
-
-	err = fs.Remove(dir)
-	if err != nil {
-		return false, err
-	}
-
-	return true, nil
-}
-
-type indexBuilder struct {
-	entries map[string]*index.Entry
-}
-
-func newIndexBuilder(idx *index.Index) *indexBuilder {
-	entries := make(map[string]*index.Entry, len(idx.Entries))
-	for _, e := range idx.Entries {
-		entries[e.Name] = e
-	}
-	return &indexBuilder{
-		entries: entries,
-	}
-}
-
-func (b *indexBuilder) Write(idx *index.Index) {
-	idx.Entries = idx.Entries[:0]
-	for _, e := range b.entries {
-		idx.Entries = append(idx.Entries, e)
-	}
-}
-
-func (b *indexBuilder) Add(e *index.Entry) {
-	b.entries[e.Name] = e
-}
-
-func (b *indexBuilder) Remove(name string) {
-	delete(b.entries, filepath.ToSlash(name))
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_bsd.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_bsd.go
deleted file mode 100644
index 562007874..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_bsd.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build darwin freebsd netbsd
-
-package git
-
-import (
-	"syscall"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-)
-
-func init() {
-	fillSystemInfo = func(e *index.Entry, sys interface{}) {
-		if os, ok := sys.(*syscall.Stat_t); ok {
-			e.CreatedAt = time.Unix(os.Atimespec.Unix())
-			e.Dev = uint32(os.Dev)
-			e.Inode = uint32(os.Ino)
-			e.GID = os.Gid
-			e.UID = os.Uid
-		}
-	}
-}
-
-func isSymlinkWindowsNonAdmin(err error) bool {
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_commit.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_commit.go
deleted file mode 100644
index 0be85d035..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_commit.go
+++ /dev/null
@@ -1,296 +0,0 @@
-package git
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"path"
-	"regexp"
-	"sort"
-	"strings"
-
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/storage"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
-	"github.com/go-git/go-billy/v5"
-)
-
-var (
-	// ErrEmptyCommit occurs when a commit is attempted using a clean
-	// working tree, with no changes to be committed.
-	ErrEmptyCommit = errors.New("cannot create empty commit: clean working tree")
-
-	// characters to be removed from user name and/or email before using them to build a commit object
-	// See https://git-scm.com/docs/git-commit#_commit_information
-	invalidCharactersRe = regexp.MustCompile(`[<>\n]`)
-)
-
-// Commit stores the current contents of the index in a new commit along with
-// a log message from the user describing the changes.
-func (w *Worktree) Commit(msg string, opts *CommitOptions) (plumbing.Hash, error) {
-	if err := opts.Validate(w.r); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if opts.All {
-		if err := w.autoAddModifiedAndDeleted(); err != nil {
-			return plumbing.ZeroHash, err
-		}
-	}
-
-	if opts.Amend {
-		head, err := w.r.Head()
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-		headCommit, err := w.r.CommitObject(head.Hash())
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-
-		opts.Parents = nil
-		if len(headCommit.ParentHashes) != 0 {
-			opts.Parents = []plumbing.Hash{headCommit.ParentHashes[0]}
-		}
-	}
-
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	// First handle the case of the first commit in the repository being empty.
-	if len(opts.Parents) == 0 && len(idx.Entries) == 0 && !opts.AllowEmptyCommits {
-		return plumbing.ZeroHash, ErrEmptyCommit
-	}
-
-	h := &buildTreeHelper{
-		fs: w.Filesystem,
-		s:  w.r.Storer,
-	}
-
-	treeHash, err := h.BuildTree(idx, opts)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	previousTree := plumbing.ZeroHash
-	if len(opts.Parents) > 0 {
-		parentCommit, err := w.r.CommitObject(opts.Parents[0])
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-		previousTree = parentCommit.TreeHash
-	}
-
-	if treeHash == previousTree && !opts.AllowEmptyCommits {
-		return plumbing.ZeroHash, ErrEmptyCommit
-	}
-
-	commit, err := w.buildCommitObject(msg, opts, treeHash)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return commit, w.updateHEAD(commit)
-}
-
-func (w *Worktree) autoAddModifiedAndDeleted() error {
-	s, err := w.Status()
-	if err != nil {
-		return err
-	}
-
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return err
-	}
-
-	for path, fs := range s {
-		if fs.Worktree != Modified && fs.Worktree != Deleted {
-			continue
-		}
-
-		if _, _, err := w.doAddFile(idx, s, path, nil); err != nil {
-			return err
-		}
-
-	}
-
-	return w.r.Storer.SetIndex(idx)
-}
-
-func (w *Worktree) updateHEAD(commit plumbing.Hash) error {
-	head, err := w.r.Storer.Reference(plumbing.HEAD)
-	if err != nil {
-		return err
-	}
-
-	name := plumbing.HEAD
-	if head.Type() != plumbing.HashReference {
-		name = head.Target()
-	}
-
-	ref := plumbing.NewHashReference(name, commit)
-	return w.r.Storer.SetReference(ref)
-}
-
-func (w *Worktree) buildCommitObject(msg string, opts *CommitOptions, tree plumbing.Hash) (plumbing.Hash, error) {
-	commit := &object.Commit{
-		Author:       w.sanitize(*opts.Author),
-		Committer:    w.sanitize(*opts.Committer),
-		Message:      msg,
-		TreeHash:     tree,
-		ParentHashes: opts.Parents,
-	}
-
-	// Convert SignKey into a Signer if set. Existing Signer should take priority.
-	signer := opts.Signer
-	if signer == nil && opts.SignKey != nil {
-		signer = &gpgSigner{key: opts.SignKey}
-	}
-	if signer != nil {
-		sig, err := signObject(signer, commit)
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-		commit.PGPSignature = string(sig)
-	}
-
-	obj := w.r.Storer.NewEncodedObject()
-	if err := commit.Encode(obj); err != nil {
-		return plumbing.ZeroHash, err
-	}
-	return w.r.Storer.SetEncodedObject(obj)
-}
-
-func (w *Worktree) sanitize(signature object.Signature) object.Signature {
-	return object.Signature{
-		Name:  invalidCharactersRe.ReplaceAllString(signature.Name, ""),
-		Email: invalidCharactersRe.ReplaceAllString(signature.Email, ""),
-		When:  signature.When,
-	}
-}
-
-type gpgSigner struct {
-	key *openpgp.Entity
-	cfg *packet.Config
-}
-
-func (s *gpgSigner) Sign(message io.Reader) ([]byte, error) {
-	var b bytes.Buffer
-	if err := openpgp.ArmoredDetachSign(&b, s.key, message, s.cfg); err != nil {
-		return nil, err
-	}
-	return b.Bytes(), nil
-}
-
-// buildTreeHelper converts a given index.Index file into multiple git objects
-// reading the blobs from the given filesystem and creating the trees from the
-// index structure. The created objects are pushed to a given Storer.
-type buildTreeHelper struct {
-	fs billy.Filesystem
-	s  storage.Storer
-
-	trees   map[string]*object.Tree
-	entries map[string]*object.TreeEntry
-}
-
-// BuildTree builds the tree objects and push its to the storer, the hash
-// of the root tree is returned.
-func (h *buildTreeHelper) BuildTree(idx *index.Index, opts *CommitOptions) (plumbing.Hash, error) {
-	const rootNode = ""
-	h.trees = map[string]*object.Tree{rootNode: {}}
-	h.entries = map[string]*object.TreeEntry{}
-
-	for _, e := range idx.Entries {
-		if err := h.commitIndexEntry(e); err != nil {
-			return plumbing.ZeroHash, err
-		}
-	}
-
-	return h.copyTreeToStorageRecursive(rootNode, h.trees[rootNode])
-}
-
-func (h *buildTreeHelper) commitIndexEntry(e *index.Entry) error {
-	parts := strings.Split(e.Name, "/")
-
-	var fullpath string
-	for _, part := range parts {
-		parent := fullpath
-		fullpath = path.Join(fullpath, part)
-
-		h.doBuildTree(e, parent, fullpath)
-	}
-
-	return nil
-}
-
-func (h *buildTreeHelper) doBuildTree(e *index.Entry, parent, fullpath string) {
-	if _, ok := h.trees[fullpath]; ok {
-		return
-	}
-
-	if _, ok := h.entries[fullpath]; ok {
-		return
-	}
-
-	te := object.TreeEntry{Name: path.Base(fullpath)}
-
-	if fullpath == e.Name {
-		te.Mode = e.Mode
-		te.Hash = e.Hash
-	} else {
-		te.Mode = filemode.Dir
-		h.trees[fullpath] = &object.Tree{}
-	}
-
-	h.trees[parent].Entries = append(h.trees[parent].Entries, te)
-}
-
-type sortableEntries []object.TreeEntry
-
-func (sortableEntries) sortName(te object.TreeEntry) string {
-	if te.Mode == filemode.Dir {
-		return te.Name + "/"
-	}
-	return te.Name
-}
-func (se sortableEntries) Len() int               { return len(se) }
-func (se sortableEntries) Less(i int, j int) bool { return se.sortName(se[i]) < se.sortName(se[j]) }
-func (se sortableEntries) Swap(i int, j int)      { se[i], se[j] = se[j], se[i] }
-
-func (h *buildTreeHelper) copyTreeToStorageRecursive(parent string, t *object.Tree) (plumbing.Hash, error) {
-	sort.Sort(sortableEntries(t.Entries))
-	for i, e := range t.Entries {
-		if e.Mode != filemode.Dir && !e.Hash.IsZero() {
-			continue
-		}
-
-		path := path.Join(parent, e.Name)
-
-		var err error
-		e.Hash, err = h.copyTreeToStorageRecursive(path, h.trees[path])
-		if err != nil {
-			return plumbing.ZeroHash, err
-		}
-
-		t.Entries[i] = e
-	}
-
-	o := h.s.NewEncodedObject()
-	if err := t.Encode(o); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	hash := o.Hash()
-	if h.s.HasEncodedObject(hash) == nil {
-		return hash, nil
-	}
-	return h.s.SetEncodedObject(o)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_js.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_js.go
deleted file mode 100644
index 7c4f6c325..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_js.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build js
-
-package git
-
-import (
-	"syscall"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-)
-
-func init() {
-	fillSystemInfo = func(e *index.Entry, sys interface{}) {
-		if os, ok := sys.(*syscall.Stat_t); ok {
-			e.CreatedAt = time.Unix(int64(os.Ctime), int64(os.CtimeNsec))
-			e.Dev = uint32(os.Dev)
-			e.Inode = uint32(os.Ino)
-			e.GID = os.Gid
-			e.UID = os.Uid
-		}
-	}
-}
-
-func isSymlinkWindowsNonAdmin(err error) bool {
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_linux.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_linux.go
deleted file mode 100644
index ee090a7b2..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-//go:build linux
-// +build linux
-
-package git
-
-import (
-	"syscall"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-)
-
-func init() {
-	fillSystemInfo = func(e *index.Entry, sys interface{}) {
-		if os, ok := sys.(*syscall.Stat_t); ok {
-			e.CreatedAt = time.Unix(os.Ctim.Unix())
-			e.Dev = uint32(os.Dev)
-			e.Inode = uint32(os.Ino)
-			e.GID = os.Gid
-			e.UID = os.Uid
-		}
-	}
-}
-
-func isSymlinkWindowsNonAdmin(_ error) bool {
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_plan9.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_plan9.go
deleted file mode 100644
index 7952a68e5..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_plan9.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package git
-
-import (
-	"syscall"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-)
-
-func init() {
-	fillSystemInfo = func(e *index.Entry, sys interface{}) {
-		if os, ok := sys.(*syscall.Dir); ok {
-			// Plan 9 doesn't have a CreatedAt field.
-			e.CreatedAt = time.Unix(int64(os.Mtime), 0)
-
-			e.Dev = uint32(os.Dev)
-
-			// Plan 9 has no Inode.
-			// ext2srv(4) appears to store Inode in Qid.Path.
-			e.Inode = uint32(os.Qid.Path)
-
-			// Plan 9 has string UID/GID
-			e.GID = 0
-			e.UID = 0
-		}
-	}
-}
-
-func isSymlinkWindowsNonAdmin(err error) bool {
-	return true
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_status.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_status.go
deleted file mode 100644
index 21c74c59e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_status.go
+++ /dev/null
@@ -1,733 +0,0 @@
-package git
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-git/go-billy/v5/util"
-	"github.com/jesseduffield/go-git/v5/plumbing"
-	"github.com/jesseduffield/go-git/v5/plumbing/filemode"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/gitignore"
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-	"github.com/jesseduffield/go-git/v5/plumbing/object"
-	"github.com/jesseduffield/go-git/v5/utils/ioutil"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem"
-	mindex "github.com/jesseduffield/go-git/v5/utils/merkletrie/index"
-	"github.com/jesseduffield/go-git/v5/utils/merkletrie/noder"
-)
-
-var (
-	// ErrDestinationExists in an Move operation means that the target exists on
-	// the worktree.
-	ErrDestinationExists = errors.New("destination exists")
-	// ErrGlobNoMatches in an AddGlob if the glob pattern does not match any
-	// files in the worktree.
-	ErrGlobNoMatches = errors.New("glob pattern did not match any files")
-	// ErrUnsupportedStatusStrategy occurs when an invalid StatusStrategy is used
-	// when processing the Worktree status.
-	ErrUnsupportedStatusStrategy = errors.New("unsupported status strategy")
-)
-
-// Status returns the working tree status.
-func (w *Worktree) Status() (Status, error) {
-	return w.StatusWithOptions(StatusOptions{Strategy: defaultStatusStrategy})
-}
-
-// StatusOptions defines the options for Worktree.StatusWithOptions().
-type StatusOptions struct {
-	Strategy StatusStrategy
-}
-
-// StatusWithOptions returns the working tree status.
-func (w *Worktree) StatusWithOptions(o StatusOptions) (Status, error) {
-	var hash plumbing.Hash
-
-	ref, err := w.r.Head()
-	if err != nil && err != plumbing.ErrReferenceNotFound {
-		return nil, err
-	}
-
-	if err == nil {
-		hash = ref.Hash()
-	}
-
-	return w.status(o.Strategy, hash)
-}
-
-func (w *Worktree) status(ss StatusStrategy, commit plumbing.Hash) (Status, error) {
-	s, err := ss.new(w)
-	if err != nil {
-		return nil, err
-	}
-
-	left, err := w.diffCommitWithStaging(commit, false)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, ch := range left {
-		a, err := ch.Action()
-		if err != nil {
-			return nil, err
-		}
-
-		fs := s.File(nameFromAction(&ch))
-		fs.Worktree = Unmodified
-
-		switch a {
-		case merkletrie.Delete:
-			s.File(ch.From.String()).Staging = Deleted
-		case merkletrie.Insert:
-			s.File(ch.To.String()).Staging = Added
-		case merkletrie.Modify:
-			s.File(ch.To.String()).Staging = Modified
-		}
-	}
-
-	right, err := w.diffStagingWithWorktree(false, true)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, ch := range right {
-		a, err := ch.Action()
-		if err != nil {
-			return nil, err
-		}
-
-		fs := s.File(nameFromAction(&ch))
-		if fs.Staging == Untracked {
-			fs.Staging = Unmodified
-		}
-
-		switch a {
-		case merkletrie.Delete:
-			fs.Worktree = Deleted
-		case merkletrie.Insert:
-			fs.Worktree = Untracked
-			fs.Staging = Untracked
-		case merkletrie.Modify:
-			fs.Worktree = Modified
-		}
-	}
-
-	return s, nil
-}
-
-func nameFromAction(ch *merkletrie.Change) string {
-	name := ch.To.String()
-	if name == "" {
-		return ch.From.String()
-	}
-
-	return name
-}
-
-func (w *Worktree) diffStagingWithWorktree(reverse, excludeIgnoredChanges bool) (merkletrie.Changes, error) {
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return nil, err
-	}
-
-	from := mindex.NewRootNode(idx)
-	submodules, err := w.getSubmodulesStatus()
-	if err != nil {
-		return nil, err
-	}
-
-	to := filesystem.NewRootNode(w.Filesystem, submodules)
-
-	var c merkletrie.Changes
-	if reverse {
-		c, err = merkletrie.DiffTree(to, from, diffTreeIsEquals)
-	} else {
-		c, err = merkletrie.DiffTree(from, to, diffTreeIsEquals)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if excludeIgnoredChanges {
-		return w.excludeIgnoredChanges(c), nil
-	}
-	return c, nil
-}
-
-func (w *Worktree) excludeIgnoredChanges(changes merkletrie.Changes) merkletrie.Changes {
-	patterns, err := gitignore.ReadPatterns(w.Filesystem, nil)
-	if err != nil {
-		return changes
-	}
-
-	patterns = append(patterns, w.Excludes...)
-
-	if len(patterns) == 0 {
-		return changes
-	}
-
-	m := gitignore.NewMatcher(patterns)
-
-	var res merkletrie.Changes
-	for _, ch := range changes {
-		var path []string
-		for _, n := range ch.To {
-			path = append(path, n.Name())
-		}
-		if len(path) == 0 {
-			for _, n := range ch.From {
-				path = append(path, n.Name())
-			}
-		}
-		if len(path) != 0 {
-			isDir := (len(ch.To) > 0 && ch.To.IsDir()) || (len(ch.From) > 0 && ch.From.IsDir())
-			if m.Match(path, isDir) {
-				if len(ch.From) == 0 {
-					continue
-				}
-			}
-		}
-		res = append(res, ch)
-	}
-	return res
-}
-
-func (w *Worktree) getSubmodulesStatus() (map[string]plumbing.Hash, error) {
-	o := map[string]plumbing.Hash{}
-
-	sub, err := w.Submodules()
-	if err != nil {
-		return nil, err
-	}
-
-	status, err := sub.Status()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, s := range status {
-		if s.Current.IsZero() {
-			o[s.Path] = s.Expected
-			continue
-		}
-
-		o[s.Path] = s.Current
-	}
-
-	return o, nil
-}
-
-func (w *Worktree) diffCommitWithStaging(commit plumbing.Hash, reverse bool) (merkletrie.Changes, error) {
-	var t *object.Tree
-	if !commit.IsZero() {
-		c, err := w.r.CommitObject(commit)
-		if err != nil {
-			return nil, err
-		}
-
-		t, err = c.Tree()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return w.diffTreeWithStaging(t, reverse)
-}
-
-func (w *Worktree) diffTreeWithStaging(t *object.Tree, reverse bool) (merkletrie.Changes, error) {
-	var from noder.Noder
-	if t != nil {
-		from = object.NewTreeRootNode(t)
-	}
-
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return nil, err
-	}
-
-	to := mindex.NewRootNode(idx)
-
-	if reverse {
-		return merkletrie.DiffTree(to, from, diffTreeIsEquals)
-	}
-
-	return merkletrie.DiffTree(from, to, diffTreeIsEquals)
-}
-
-var emptyNoderHash = make([]byte, 24)
-
-// diffTreeIsEquals is a implementation of noder.Equals, used to compare
-// noder.Noder, it compare the content and the length of the hashes.
-//
-// Since some of the noder.Noder implementations doesn't compute a hash for
-// some directories, if any of the hashes is a 24-byte slice of zero values
-// the comparison is not done and the hashes are take as different.
-func diffTreeIsEquals(a, b noder.Hasher) bool {
-	hashA := a.Hash()
-	hashB := b.Hash()
-
-	if bytes.Equal(hashA, emptyNoderHash) || bytes.Equal(hashB, emptyNoderHash) {
-		return false
-	}
-
-	return bytes.Equal(hashA, hashB)
-}
-
-// Add adds the file contents of a file in the worktree to the index. if the
-// file is already staged in the index no error is returned. If a file deleted
-// from the Workspace is given, the file is removed from the index. If a
-// directory given, adds the files and all his sub-directories recursively in
-// the worktree to the index. If any of the files is already staged in the index
-// no error is returned. When path is a file, the blob.Hash is returned.
-func (w *Worktree) Add(path string) (plumbing.Hash, error) {
-	// TODO(mcuadros): deprecate in favor of AddWithOption in v6.
-	return w.doAdd(path, make([]gitignore.Pattern, 0), false)
-}
-
-func (w *Worktree) doAddDirectory(idx *index.Index, s Status, directory string, ignorePattern []gitignore.Pattern) (added bool, err error) {
-	if len(ignorePattern) > 0 {
-		m := gitignore.NewMatcher(ignorePattern)
-		matchPath := strings.Split(directory, string(os.PathSeparator))
-		if m.Match(matchPath, true) {
-			// ignore
-			return false, nil
-		}
-	}
-
-	directory = filepath.ToSlash(filepath.Clean(directory))
-
-	for name := range s {
-		if !isPathInDirectory(name, directory) {
-			continue
-		}
-
-		var a bool
-		a, _, err = w.doAddFile(idx, s, name, ignorePattern)
-		if err != nil {
-			return
-		}
-
-		added = added || a
-	}
-
-	return
-}
-
-func isPathInDirectory(path, directory string) bool {
-	return directory == "." || strings.HasPrefix(path, directory+"/")
-}
-
-// AddWithOptions file contents to the index,  updates the index using the
-// current content found in the working tree, to prepare the content staged for
-// the next commit.
-//
-// It typically adds the current content of existing paths as a whole, but with
-// some options it can also be used to add content with only part of the changes
-// made to the working tree files applied, or remove paths that do not exist in
-// the working tree anymore.
-func (w *Worktree) AddWithOptions(opts *AddOptions) error {
-	if err := opts.Validate(w.r); err != nil {
-		return err
-	}
-
-	if opts.All {
-		_, err := w.doAdd(".", w.Excludes, false)
-		return err
-	}
-
-	if opts.Glob != "" {
-		return w.AddGlob(opts.Glob)
-	}
-
-	_, err := w.doAdd(opts.Path, make([]gitignore.Pattern, 0), opts.SkipStatus)
-	return err
-}
-
-func (w *Worktree) doAdd(path string, ignorePattern []gitignore.Pattern, skipStatus bool) (plumbing.Hash, error) {
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	var h plumbing.Hash
-	var added bool
-
-	fi, err := w.Filesystem.Lstat(path)
-
-	// status is required for doAddDirectory
-	var s Status
-	var err2 error
-	if !skipStatus || fi == nil || fi.IsDir() {
-		s, err2 = w.Status()
-		if err2 != nil {
-			return plumbing.ZeroHash, err2
-		}
-	}
-
-	path = filepath.Clean(path)
-
-	if err != nil || !fi.IsDir() {
-		added, h, err = w.doAddFile(idx, s, path, ignorePattern)
-	} else {
-		added, err = w.doAddDirectory(idx, s, path, ignorePattern)
-	}
-
-	if err != nil {
-		return h, err
-	}
-
-	if !added {
-		return h, nil
-	}
-
-	return h, w.r.Storer.SetIndex(idx)
-}
-
-// AddGlob adds all paths, matching pattern, to the index. If pattern matches a
-// directory path, all directory contents are added to the index recursively. No
-// error is returned if all matching paths are already staged in index.
-func (w *Worktree) AddGlob(pattern string) error {
-	// TODO(mcuadros): deprecate in favor of AddWithOption in v6.
-	files, err := util.Glob(w.Filesystem, pattern)
-	if err != nil {
-		return err
-	}
-
-	if len(files) == 0 {
-		return ErrGlobNoMatches
-	}
-
-	s, err := w.Status()
-	if err != nil {
-		return err
-	}
-
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return err
-	}
-
-	var saveIndex bool
-	for _, file := range files {
-		fi, err := w.Filesystem.Lstat(file)
-		if err != nil {
-			return err
-		}
-
-		var added bool
-		if fi.IsDir() {
-			added, err = w.doAddDirectory(idx, s, file, make([]gitignore.Pattern, 0))
-		} else {
-			added, _, err = w.doAddFile(idx, s, file, make([]gitignore.Pattern, 0))
-		}
-
-		if err != nil {
-			return err
-		}
-
-		if !saveIndex && added {
-			saveIndex = true
-		}
-	}
-
-	if saveIndex {
-		return w.r.Storer.SetIndex(idx)
-	}
-
-	return nil
-}
-
-// doAddFile create a new blob from path and update the index, added is true if
-// the file added is different from the index.
-// if s status is nil will skip the status check and update the index anyway
-func (w *Worktree) doAddFile(idx *index.Index, s Status, path string, ignorePattern []gitignore.Pattern) (added bool, h plumbing.Hash, err error) {
-	if s != nil && s.File(path).Worktree == Unmodified {
-		return false, h, nil
-	}
-	if len(ignorePattern) > 0 {
-		m := gitignore.NewMatcher(ignorePattern)
-		matchPath := strings.Split(path, string(os.PathSeparator))
-		if m.Match(matchPath, true) {
-			// ignore
-			return false, h, nil
-		}
-	}
-
-	h, err = w.copyFileToStorage(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			added = true
-			h, err = w.deleteFromIndex(idx, path)
-		}
-
-		return
-	}
-
-	if err := w.addOrUpdateFileToIndex(idx, path, h); err != nil {
-		return false, h, err
-	}
-
-	return true, h, err
-}
-
-func (w *Worktree) copyFileToStorage(path string) (hash plumbing.Hash, err error) {
-	fi, err := w.Filesystem.Lstat(path)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	obj := w.r.Storer.NewEncodedObject()
-	obj.SetType(plumbing.BlobObject)
-	obj.SetSize(fi.Size())
-
-	writer, err := obj.Writer()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	defer ioutil.CheckClose(writer, &err)
-
-	if fi.Mode()&os.ModeSymlink != 0 {
-		err = w.fillEncodedObjectFromSymlink(writer, path, fi)
-	} else {
-		err = w.fillEncodedObjectFromFile(writer, path, fi)
-	}
-
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return w.r.Storer.SetEncodedObject(obj)
-}
-
-func (w *Worktree) fillEncodedObjectFromFile(dst io.Writer, path string, _ os.FileInfo) (err error) {
-	src, err := w.Filesystem.Open(path)
-	if err != nil {
-		return err
-	}
-
-	defer ioutil.CheckClose(src, &err)
-
-	if _, err := io.Copy(dst, src); err != nil {
-		return err
-	}
-
-	return err
-}
-
-func (w *Worktree) fillEncodedObjectFromSymlink(dst io.Writer, path string, _ os.FileInfo) error {
-	target, err := w.Filesystem.Readlink(path)
-	if err != nil {
-		return err
-	}
-
-	_, err = dst.Write([]byte(target))
-	return err
-}
-
-func (w *Worktree) addOrUpdateFileToIndex(idx *index.Index, filename string, h plumbing.Hash) error {
-	e, err := idx.Entry(filename)
-	if err != nil && err != index.ErrEntryNotFound {
-		return err
-	}
-
-	if err == index.ErrEntryNotFound {
-		return w.doAddFileToIndex(idx, filename, h)
-	}
-
-	return w.doUpdateFileToIndex(e, filename, h)
-}
-
-func (w *Worktree) doAddFileToIndex(idx *index.Index, filename string, h plumbing.Hash) error {
-	return w.doUpdateFileToIndex(idx.Add(filename), filename, h)
-}
-
-func (w *Worktree) doUpdateFileToIndex(e *index.Entry, filename string, h plumbing.Hash) error {
-	info, err := w.Filesystem.Lstat(filename)
-	if err != nil {
-		return err
-	}
-
-	e.Hash = h
-	e.ModifiedAt = info.ModTime()
-	e.Mode, err = filemode.NewFromOSFileMode(info.Mode())
-	if err != nil {
-		return err
-	}
-
-	// The entry size must always reflect the current state, otherwise
-	// it will cause go-git's Worktree.Status() to divert from "git status".
-	// The size of a symlink is the length of the path to the target.
-	// The size of Regular and Executable files is the size of the files.
-	e.Size = uint32(info.Size())
-
-	fillSystemInfo(e, info.Sys())
-	return nil
-}
-
-// Remove removes files from the working tree and from the index.
-func (w *Worktree) Remove(path string) (plumbing.Hash, error) {
-	// TODO(mcuadros): remove plumbing.Hash from signature at v5.
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	var h plumbing.Hash
-
-	fi, err := w.Filesystem.Lstat(path)
-	if err != nil || !fi.IsDir() {
-		h, err = w.doRemoveFile(idx, path)
-	} else {
-		_, err = w.doRemoveDirectory(idx, path)
-	}
-	if err != nil {
-		return h, err
-	}
-
-	return h, w.r.Storer.SetIndex(idx)
-}
-
-func (w *Worktree) doRemoveDirectory(idx *index.Index, directory string) (removed bool, err error) {
-	files, err := w.Filesystem.ReadDir(directory)
-	if err != nil {
-		return false, err
-	}
-
-	for _, file := range files {
-		name := path.Join(directory, file.Name())
-
-		var r bool
-		if file.IsDir() {
-			r, err = w.doRemoveDirectory(idx, name)
-		} else {
-			_, err = w.doRemoveFile(idx, name)
-			if err == index.ErrEntryNotFound {
-				err = nil
-			}
-		}
-
-		if err != nil {
-			return
-		}
-
-		if !removed && r {
-			removed = true
-		}
-	}
-
-	err = w.removeEmptyDirectory(directory)
-	return
-}
-
-func (w *Worktree) removeEmptyDirectory(path string) error {
-	files, err := w.Filesystem.ReadDir(path)
-	if err != nil {
-		return err
-	}
-
-	if len(files) != 0 {
-		return nil
-	}
-
-	return w.Filesystem.Remove(path)
-}
-
-func (w *Worktree) doRemoveFile(idx *index.Index, path string) (plumbing.Hash, error) {
-	hash, err := w.deleteFromIndex(idx, path)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return hash, w.deleteFromFilesystem(path)
-}
-
-func (w *Worktree) deleteFromIndex(idx *index.Index, path string) (plumbing.Hash, error) {
-	e, err := idx.Remove(path)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	return e.Hash, nil
-}
-
-func (w *Worktree) deleteFromFilesystem(path string) error {
-	err := w.Filesystem.Remove(path)
-	if os.IsNotExist(err) {
-		return nil
-	}
-
-	return err
-}
-
-// RemoveGlob removes all paths, matching pattern, from the index. If pattern
-// matches a directory path, all directory contents are removed from the index
-// recursively.
-func (w *Worktree) RemoveGlob(pattern string) error {
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return err
-	}
-
-	entries, err := idx.Glob(pattern)
-	if err != nil {
-		return err
-	}
-
-	for _, e := range entries {
-		file := filepath.FromSlash(e.Name)
-		if _, err := w.Filesystem.Lstat(file); err != nil && !os.IsNotExist(err) {
-			return err
-		}
-
-		if _, err := w.doRemoveFile(idx, file); err != nil {
-			return err
-		}
-
-		dir, _ := filepath.Split(file)
-		if err := w.removeEmptyDirectory(dir); err != nil {
-			return err
-		}
-	}
-
-	return w.r.Storer.SetIndex(idx)
-}
-
-// Move moves or rename a file in the worktree and the index, directories are
-// not supported.
-func (w *Worktree) Move(from, to string) (plumbing.Hash, error) {
-	// TODO(mcuadros): support directories and/or implement support for glob
-	if _, err := w.Filesystem.Lstat(from); err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if _, err := w.Filesystem.Lstat(to); err == nil {
-		return plumbing.ZeroHash, ErrDestinationExists
-	}
-
-	idx, err := w.r.Storer.Index()
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	hash, err := w.deleteFromIndex(idx, from)
-	if err != nil {
-		return plumbing.ZeroHash, err
-	}
-
-	if err := w.Filesystem.Rename(from, to); err != nil {
-		return hash, err
-	}
-
-	if err := w.addOrUpdateFileToIndex(idx, to, hash); err != nil {
-		return hash, err
-	}
-
-	return hash, w.r.Storer.SetIndex(idx)
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_unix_other.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_unix_other.go
deleted file mode 100644
index cc89ef8d8..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_unix_other.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build openbsd dragonfly solaris
-
-package git
-
-import (
-	"syscall"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-)
-
-func init() {
-	fillSystemInfo = func(e *index.Entry, sys interface{}) {
-		if os, ok := sys.(*syscall.Stat_t); ok {
-			e.CreatedAt = time.Unix(os.Atim.Unix())
-			e.Dev = uint32(os.Dev)
-			e.Inode = uint32(os.Ino)
-			e.GID = os.Gid
-			e.UID = os.Uid
-		}
-	}
-}
-
-func isSymlinkWindowsNonAdmin(err error) bool {
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/go-git/v5/worktree_windows.go b/vendor/github.com/jesseduffield/go-git/v5/worktree_windows.go
deleted file mode 100644
index e98f0773e..000000000
--- a/vendor/github.com/jesseduffield/go-git/v5/worktree_windows.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build windows
-
-package git
-
-import (
-	"os"
-	"syscall"
-	"time"
-
-	"github.com/jesseduffield/go-git/v5/plumbing/format/index"
-)
-
-func init() {
-	fillSystemInfo = func(e *index.Entry, sys interface{}) {
-		if os, ok := sys.(*syscall.Win32FileAttributeData); ok {
-			seconds := os.CreationTime.Nanoseconds() / 1000000000
-			nanoseconds := os.CreationTime.Nanoseconds() - seconds*1000000000
-			e.CreatedAt = time.Unix(seconds, nanoseconds)
-		}
-	}
-}
-
-func isSymlinkWindowsNonAdmin(err error) bool {
-	const ERROR_PRIVILEGE_NOT_HELD syscall.Errno = 1314
-
-	if err != nil {
-		if errLink, ok := err.(*os.LinkError); ok {
-			if errNo, ok := errLink.Err.(syscall.Errno); ok {
-				return errNo == ERROR_PRIVILEGE_NOT_HELD
-			}
-		}
-	}
-
-	return false
-}
diff --git a/vendor/github.com/jesseduffield/gocui/.gitignore b/vendor/github.com/jesseduffield/gocui/.gitignore
deleted file mode 100644
index 1377554eb..000000000
--- a/vendor/github.com/jesseduffield/gocui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.swp
diff --git a/vendor/github.com/jesseduffield/gocui/edit.go b/vendor/github.com/jesseduffield/gocui/edit.go
deleted file mode 100644
index ac1827aea..000000000
--- a/vendor/github.com/jesseduffield/gocui/edit.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2014 The gocui Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gocui
-
-// Editor interface must be satisfied by gocui editors.
-type Editor interface {
-	Edit(v *View, key Key, ch rune, mod Modifier) bool
-}
-
-// The EditorFunc type is an adapter to allow the use of ordinary functions as
-// Editors. If f is a function with the appropriate signature, EditorFunc(f)
-// is an Editor object that calls f.
-type EditorFunc func(v *View, key Key, ch rune, mod Modifier) bool
-
-// Edit calls f(v, key, ch, mod)
-func (f EditorFunc) Edit(v *View, key Key, ch rune, mod Modifier) bool {
-	return f(v, key, ch, mod)
-}
-
-// DefaultEditor is the default editor.
-var DefaultEditor Editor = EditorFunc(SimpleEditor)
-
-// SimpleEditor is used as the default gocui editor.
-func SimpleEditor(v *View, key Key, ch rune, mod Modifier) bool {
-	switch {
-	case (key == KeyBackspace || key == KeyBackspace2) && (mod&ModAlt) != 0,
-		key == KeyCtrlW:
-		v.TextArea.BackSpaceWord()
-	case key == KeyBackspace || key == KeyBackspace2 || key == KeyCtrlH:
-		v.TextArea.BackSpaceChar()
-	case key == KeyCtrlD || key == KeyDelete:
-		v.TextArea.DeleteChar()
-	case key == KeyArrowDown:
-		v.TextArea.MoveCursorDown()
-	case key == KeyArrowUp:
-		v.TextArea.MoveCursorUp()
-	case (key == KeyArrowLeft || ch == 'b') && (mod&ModAlt) != 0:
-		v.TextArea.MoveLeftWord()
-	case key == KeyArrowLeft || key == KeyCtrlB:
-		v.TextArea.MoveCursorLeft()
-	case (key == KeyArrowRight || ch == 'f') && (mod&ModAlt) != 0:
-		v.TextArea.MoveRightWord()
-	case key == KeyArrowRight || key == KeyCtrlF:
-		v.TextArea.MoveCursorRight()
-	case key == KeyEnter:
-		v.TextArea.TypeCharacter("\n")
-	case key == KeySpace:
-		v.TextArea.TypeCharacter(" ")
-	case key == KeyInsert:
-		v.TextArea.ToggleOverwrite()
-	case key == KeyCtrlU:
-		v.TextArea.DeleteToStartOfLine()
-	case key == KeyCtrlK:
-		v.TextArea.DeleteToEndOfLine()
-	case key == KeyCtrlA || key == KeyHome:
-		v.TextArea.GoToStartOfLine()
-	case key == KeyCtrlE || key == KeyEnd:
-		v.TextArea.GoToEndOfLine()
-	case key == KeyCtrlW:
-		v.TextArea.BackSpaceWord()
-	case key == KeyCtrlY:
-		v.TextArea.Yank()
-	case ch != 0:
-		v.TextArea.TypeCharacter(string(ch))
-	default:
-		return false
-	}
-
-	v.RenderTextArea()
-
-	return true
-}
diff --git a/vendor/github.com/jesseduffield/gocui/escape.go b/vendor/github.com/jesseduffield/gocui/escape.go
deleted file mode 100644
index cb557f088..000000000
--- a/vendor/github.com/jesseduffield/gocui/escape.go
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright 2014 The gocui Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gocui
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/go-errors/errors"
-)
-
-type escapeInterpreter struct {
-	state                  escapeState
-	curch                  string
-	csiParam               []string
-	curFgColor, curBgColor Attribute
-	mode                   OutputMode
-	instruction            instruction
-	hyperlink              strings.Builder
-}
-
-type (
-	escapeState int
-	fontEffect  int
-)
-
-type instruction interface{ isInstruction() }
-
-type eraseInLineFromCursor struct{}
-
-func (self eraseInLineFromCursor) isInstruction() {}
-
-type noInstruction struct{}
-
-func (self noInstruction) isInstruction() {}
-
-const (
-	stateNone escapeState = iota
-	stateEscape
-	stateCharacterSetDesignation
-	stateCSI
-	stateParams
-	stateOSC
-	stateOSCWaitForParams
-	stateOSCParams
-	stateOSCHyperlink
-	stateOSCEndEscape
-	stateOSCSkipUnknown
-
-	bold      fontEffect = 1
-	faint     fontEffect = 2
-	italic    fontEffect = 3
-	underline fontEffect = 4
-	blink     fontEffect = 5
-	reverse   fontEffect = 7
-	strike    fontEffect = 9
-
-	setForegroundColor     int = 38
-	defaultForegroundColor int = 39
-	setBackgroundColor     int = 48
-	defaultBackgroundColor int = 49
-)
-
-var (
-	errNotCSI        = errors.New("Not a CSI escape sequence")
-	errCSIParseError = errors.New("CSI escape sequence parsing error")
-	errCSITooLong    = errors.New("CSI escape sequence is too long")
-	errOSCParseError = errors.New("OSC escape sequence parsing error")
-)
-
-// characters in case of error will output the non-parsed characters as a string.
-func (ei *escapeInterpreter) characters() []string {
-	switch ei.state {
-	case stateNone:
-		return []string{"\x1b"}
-	case stateEscape:
-		return []string{"\x1b", ei.curch}
-	case stateCSI:
-		return []string{"\x1b", "[", ei.curch}
-	case stateParams:
-		ret := []string{"\x1b", "["}
-		for _, s := range ei.csiParam {
-			ret = append(ret, s)
-			ret = append(ret, ";")
-		}
-		return append(ret, ei.curch)
-	default:
-	}
-	return nil
-}
-
-// newEscapeInterpreter returns an escapeInterpreter that will be able to parse
-// terminal escape sequences.
-func newEscapeInterpreter(mode OutputMode) *escapeInterpreter {
-	ei := &escapeInterpreter{
-		state:       stateNone,
-		curFgColor:  ColorDefault,
-		curBgColor:  ColorDefault,
-		mode:        mode,
-		instruction: noInstruction{},
-	}
-	return ei
-}
-
-// reset sets the escapeInterpreter in initial state.
-func (ei *escapeInterpreter) reset() {
-	ei.state = stateNone
-	ei.curFgColor = ColorDefault
-	ei.curBgColor = ColorDefault
-	ei.csiParam = nil
-}
-
-func (ei *escapeInterpreter) instructionRead() {
-	ei.instruction = noInstruction{}
-}
-
-// parseOne parses a character (grapheme cluster). If isEscape is true, it means that the character
-// is part of an escape sequence, and as such should not be printed verbatim. Otherwise, it's not an
-// escape sequence.
-func (ei *escapeInterpreter) parseOne(ch []byte) (isEscape bool, err error) {
-	// Sanity checks
-	if len(ei.csiParam) > 20 {
-		return false, errCSITooLong
-	}
-	if len(ei.csiParam) > 0 && len(ei.csiParam[len(ei.csiParam)-1]) > 255 {
-		return false, errCSITooLong
-	}
-
-	ei.curch = string(ch)
-
-	switch ei.state {
-	case stateNone:
-		if characterEquals(ch, 0x1b) {
-			ei.state = stateEscape
-			return true, nil
-		}
-		return false, nil
-	case stateEscape:
-		switch {
-		case characterEquals(ch, '['):
-			ei.state = stateCSI
-			return true, nil
-		case characterEquals(ch, ']'):
-			ei.state = stateOSC
-			return true, nil
-		case characterEquals(ch, '('),
-			characterEquals(ch, ')'),
-			characterEquals(ch, '*'),
-			characterEquals(ch, '+'):
-			ei.state = stateCharacterSetDesignation
-			return true, nil
-		default:
-			return false, errNotCSI
-		}
-	case stateCharacterSetDesignation:
-		// Not supported, so just skip it
-		ei.state = stateNone
-		return true, nil
-	case stateCSI:
-		switch {
-		case len(ch) == 1 && ch[0] >= '0' && ch[0] <= '9':
-			ei.csiParam = append(ei.csiParam, "")
-		case characterEquals(ch, 'm'):
-			ei.csiParam = append(ei.csiParam, "0")
-		case characterEquals(ch, 'K'):
-			// fall through
-		default:
-			return false, errCSIParseError
-		}
-		ei.state = stateParams
-		fallthrough
-	case stateParams:
-		switch {
-		case len(ch) == 1 && ch[0] >= '0' && ch[0] <= '9':
-			ei.csiParam[len(ei.csiParam)-1] += string(ch)
-			return true, nil
-		case characterEquals(ch, ';'):
-			ei.csiParam = append(ei.csiParam, "")
-			return true, nil
-		case characterEquals(ch, 'm'):
-			if err := ei.outputCSI(); err != nil {
-				return false, errCSIParseError
-			}
-
-			ei.state = stateNone
-			ei.csiParam = nil
-			return true, nil
-		case characterEquals(ch, 'K'):
-			p := 0
-			if len(ei.csiParam) != 0 && ei.csiParam[0] != "" {
-				p, err = strconv.Atoi(ei.csiParam[0])
-				if err != nil {
-					return false, errCSIParseError
-				}
-			}
-
-			if p == 0 {
-				ei.instruction = eraseInLineFromCursor{}
-			} else {
-				// non-zero values of P not supported
-				ei.instruction = noInstruction{}
-			}
-
-			ei.state = stateNone
-			ei.csiParam = nil
-			return true, nil
-		default:
-			return false, errCSIParseError
-		}
-	case stateOSC:
-		if characterEquals(ch, '8') {
-			ei.state = stateOSCWaitForParams
-			ei.hyperlink.Reset()
-			return true, nil
-		}
-
-		ei.state = stateOSCSkipUnknown
-		return true, nil
-	case stateOSCWaitForParams:
-		if !characterEquals(ch, ';') {
-			return true, errOSCParseError
-		}
-
-		ei.state = stateOSCParams
-		return true, nil
-	case stateOSCParams:
-		if characterEquals(ch, ';') {
-			ei.state = stateOSCHyperlink
-		}
-		return true, nil
-	case stateOSCHyperlink:
-		switch {
-		case characterEquals(ch, 0x07):
-			ei.state = stateNone
-		case characterEquals(ch, 0x1b):
-			ei.state = stateOSCEndEscape
-		default:
-			ei.hyperlink.Write(ch)
-		}
-		return true, nil
-	case stateOSCEndEscape:
-		ei.state = stateNone
-		return true, nil
-	case stateOSCSkipUnknown:
-		switch {
-		case characterEquals(ch, 0x07):
-			ei.state = stateNone
-		case characterEquals(ch, 0x1b):
-			ei.state = stateOSCEndEscape
-		}
-		return true, nil
-	}
-	return false, nil
-}
-
-func (ei *escapeInterpreter) outputCSI() error {
-	n := len(ei.csiParam)
-	for i := 0; i < n; {
-		p, err := strconv.Atoi(ei.csiParam[i])
-		if err != nil {
-			return errCSIParseError
-		}
-
-		skip := 1
-		switch {
-		case p == 0: // reset style and color
-			ei.curFgColor = ColorDefault
-			ei.curBgColor = ColorDefault
-		case p >= 1 && p <= 9: // set style
-			ei.curFgColor |= getFontEffect(p)
-		case p >= 21 && p <= 29: // reset style
-			ei.curFgColor &= ^getFontEffect(p - 20)
-		case p >= 30 && p <= 37: // set foreground color
-			ei.curFgColor &= AttrStyleBits
-			ei.curFgColor |= Get256Color(int32(p) - 30)
-		case p == setForegroundColor: // set foreground color (256-color or true color)
-			var color Attribute
-			var err error
-			color, skip, err = ei.csiColor(ei.csiParam[i:])
-			if err != nil {
-				return err
-			}
-			ei.curFgColor &= AttrStyleBits
-			ei.curFgColor |= color
-		case p == defaultForegroundColor: // reset foreground color
-			ei.curFgColor &= AttrStyleBits
-			ei.curFgColor |= ColorDefault
-		case p >= 40 && p <= 47: // set background color
-			ei.curBgColor &= AttrStyleBits
-			ei.curBgColor |= Get256Color(int32(p) - 40)
-		case p == setBackgroundColor: // set background color (256-color or true color)
-			var color Attribute
-			var err error
-			color, skip, err = ei.csiColor(ei.csiParam[i:])
-			if err != nil {
-				return err
-			}
-			ei.curBgColor &= AttrStyleBits
-			ei.curBgColor |= color
-		case p == defaultBackgroundColor: // reset background color
-			ei.curBgColor &= AttrStyleBits
-			ei.curBgColor |= ColorDefault
-		case p >= 90 && p <= 97: // set bright foreground color
-			ei.curFgColor &= AttrStyleBits
-			ei.curFgColor |= Get256Color(int32(p) - 90 + 8)
-		case p >= 100 && p <= 107: // set bright background color
-			ei.curBgColor &= AttrStyleBits
-			ei.curBgColor |= Get256Color(int32(p) - 100 + 8)
-		default:
-		}
-		i += skip
-	}
-
-	return nil
-}
-
-func (ei *escapeInterpreter) csiColor(param []string) (color Attribute, skip int, err error) {
-	if len(param) < 2 {
-		return 0, 0, errCSIParseError
-	}
-
-	switch param[1] {
-	case "2":
-		// 24-bit color
-		if ei.mode < OutputTrue {
-			return 0, 0, errCSIParseError
-		}
-		if len(param) < 5 {
-			return 0, 0, errCSIParseError
-		}
-		var red, green, blue int
-		red, err = strconv.Atoi(param[2])
-		if err != nil {
-			return 0, 0, errCSIParseError
-		}
-		green, err = strconv.Atoi(param[3])
-		if err != nil {
-			return 0, 0, errCSIParseError
-		}
-		blue, err = strconv.Atoi(param[4])
-		if err != nil {
-			return 0, 0, errCSIParseError
-		}
-		return NewRGBColor(int32(red), int32(green), int32(blue)), 5, nil
-	case "5":
-		// 8-bit color
-		if ei.mode < Output256 {
-			return 0, 0, errCSIParseError
-		}
-		if len(param) < 3 {
-			return 0, 0, errCSIParseError
-		}
-		var hex int
-		hex, err = strconv.Atoi(param[2])
-		if err != nil {
-			return 0, 0, errCSIParseError
-		}
-		return Get256Color(int32(hex)), 3, nil
-	default:
-		return 0, 0, errCSIParseError
-	}
-}
-
-func getFontEffect(f int) Attribute {
-	switch fontEffect(f) {
-	case bold:
-		return AttrBold
-	case faint:
-		return AttrDim
-	case italic:
-		return AttrItalic
-	case underline:
-		return AttrUnderline
-	case blink:
-		return AttrBlink
-	case reverse:
-		return AttrReverse
-	case strike:
-		return AttrStrikeThrough
-	}
-	return AttrNone
-}
diff --git a/vendor/github.com/jesseduffield/gocui/keybinding.go b/vendor/github.com/jesseduffield/gocui/keybinding.go
deleted file mode 100644
index 0ad5dbe5c..000000000
--- a/vendor/github.com/jesseduffield/gocui/keybinding.go
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright 2014 The gocui Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gocui
-
-import (
-	"strings"
-
-	"github.com/gdamore/tcell/v2"
-)
-
-// Key represents special keys or keys combinations.
-type Key tcell.Key
-
-// Modifier allows to define special keys combinations. They can be used
-// in combination with Keys or Runes when a new keybinding is defined.
-type Modifier tcell.ModMask
-
-// Keybidings are used to link a given key-press event with a handler.
-type keybinding struct {
-	viewName string
-	key      Key
-	ch       rune
-	mod      Modifier
-	handler  func(*Gui, *View) error
-}
-
-// Parse takes the input string and extracts the keybinding.
-// Returns a Key / rune, a Modifier and an error.
-func Parse(input string) (any, Modifier, error) {
-	if len(input) == 1 {
-		_, r, err := getKey(rune(input[0]))
-		if err != nil {
-			return nil, ModNone, err
-		}
-		return r, ModNone, nil
-	}
-
-	var modifier Modifier
-	cleaned := make([]string, 0)
-
-	tokens := strings.SplitSeq(input, "+")
-	for t := range tokens {
-		normalized := strings.Title(strings.ToLower(t))
-		if t == "Alt" {
-			modifier = ModAlt
-			continue
-		}
-		cleaned = append(cleaned, normalized)
-	}
-
-	key, exist := translate[strings.Join(cleaned, "")]
-	if !exist {
-		return nil, ModNone, ErrNoSuchKeybind
-	}
-
-	return key, modifier, nil
-}
-
-// ParseAll takes an array of strings and returns a map of all keybindings.
-func ParseAll(input []string) (map[any]Modifier, error) {
-	ret := make(map[any]Modifier)
-	for _, i := range input {
-		k, m, err := Parse(i)
-		if err != nil {
-			return ret, err
-		}
-		ret[k] = m
-	}
-	return ret, nil
-}
-
-// MustParse takes the input string and returns a Key / rune and a Modifier.
-// It will panic if any error occured.
-func MustParse(input string) (any, Modifier) {
-	k, m, err := Parse(input)
-	if err != nil {
-		panic(err)
-	}
-	return k, m
-}
-
-// MustParseAll takes an array of strings and returns a map of all keybindings.
-// It will panic if any error occured.
-func MustParseAll(input []string) map[any]Modifier {
-	result, err := ParseAll(input)
-	if err != nil {
-		panic(err)
-	}
-	return result
-}
-
-// newKeybinding returns a new Keybinding object.
-func newKeybinding(viewname string, key Key, ch rune, mod Modifier, handler func(*Gui, *View) error) (kb *keybinding) {
-	kb = &keybinding{
-		viewName: viewname,
-		key:      key,
-		ch:       ch,
-		mod:      mod,
-		handler:  handler,
-	}
-	return kb
-}
-
-func eventMatchesKey(ev *GocuiEvent, key any) bool {
-	// assuming ModNone for now
-	if ev.Mod != ModNone {
-		return false
-	}
-
-	k, ch, err := getKey(key)
-	if err != nil {
-		return false
-	}
-
-	return k == ev.Key && ch == ev.Ch
-}
-
-// matchKeypress returns if the keybinding matches the keypress.
-func (kb *keybinding) matchKeypress(key Key, ch rune, mod Modifier) bool {
-	return kb.key == key && kb.ch == ch && kb.mod == mod
-}
-
-// translations for strings to keys
-var translate = map[string]Key{
-	"F1":             KeyF1,
-	"F2":             KeyF2,
-	"F3":             KeyF3,
-	"F4":             KeyF4,
-	"F5":             KeyF5,
-	"F6":             KeyF6,
-	"F7":             KeyF7,
-	"F8":             KeyF8,
-	"F9":             KeyF9,
-	"F10":            KeyF10,
-	"F11":            KeyF11,
-	"F12":            KeyF12,
-	"Insert":         KeyInsert,
-	"Delete":         KeyDelete,
-	"Home":           KeyHome,
-	"End":            KeyEnd,
-	"Pgup":           KeyPgup,
-	"Pgdn":           KeyPgdn,
-	"ArrowUp":        KeyArrowUp,
-	"ShiftArrowUp":   KeyShiftArrowUp,
-	"ArrowDown":      KeyArrowDown,
-	"ShiftArrowDown": KeyShiftArrowDown,
-	"ArrowLeft":      KeyArrowLeft,
-	"ArrowRight":     KeyArrowRight,
-	"CtrlTilde":      KeyCtrlTilde,
-	"Ctrl2":          KeyCtrl2,
-	"CtrlSpace":      KeyCtrlSpace,
-	"CtrlA":          KeyCtrlA,
-	"CtrlB":          KeyCtrlB,
-	"CtrlC":          KeyCtrlC,
-	"CtrlD":          KeyCtrlD,
-	"CtrlE":          KeyCtrlE,
-	"CtrlF":          KeyCtrlF,
-	"CtrlG":          KeyCtrlG,
-	"Backspace":      KeyBackspace,
-	"CtrlH":          KeyCtrlH,
-	"Tab":            KeyTab,
-	"BackTab":        KeyBacktab,
-	"CtrlI":          KeyCtrlI,
-	"CtrlJ":          KeyCtrlJ,
-	"CtrlK":          KeyCtrlK,
-	"CtrlL":          KeyCtrlL,
-	"Enter":          KeyEnter,
-	"CtrlM":          KeyCtrlM,
-	"CtrlN":          KeyCtrlN,
-	"CtrlO":          KeyCtrlO,
-	"CtrlP":          KeyCtrlP,
-	"CtrlQ":          KeyCtrlQ,
-	"CtrlR":          KeyCtrlR,
-	"CtrlS":          KeyCtrlS,
-	"CtrlT":          KeyCtrlT,
-	"CtrlU":          KeyCtrlU,
-	"CtrlV":          KeyCtrlV,
-	"CtrlW":          KeyCtrlW,
-	"CtrlX":          KeyCtrlX,
-	"CtrlY":          KeyCtrlY,
-	"CtrlZ":          KeyCtrlZ,
-	"Esc":            KeyEsc,
-	"CtrlLsqBracket": KeyCtrlLsqBracket,
-	"Ctrl3":          KeyCtrl3,
-	"Ctrl4":          KeyCtrl4,
-	"CtrlBackslash":  KeyCtrlBackslash,
-	"Ctrl5":          KeyCtrl5,
-	"CtrlRsqBracket": KeyCtrlRsqBracket,
-	"Ctrl6":          KeyCtrl6,
-	"Ctrl7":          KeyCtrl7,
-	"CtrlSlash":      KeyCtrlSlash,
-	"CtrlUnderscore": KeyCtrlUnderscore,
-	"Space":          KeySpace,
-	"Backspace2":     KeyBackspace2,
-	"Ctrl8":          KeyCtrl8,
-	"Mouseleft":      MouseLeft,
-	"Mousemiddle":    MouseMiddle,
-	"Mouseright":     MouseRight,
-	"Mouserelease":   MouseRelease,
-	"MousewheelUp":   MouseWheelUp,
-	"MousewheelDown": MouseWheelDown,
-}
-
-// Special keys.
-const (
-	KeyF1             Key = Key(tcell.KeyF1)
-	KeyF2                 = Key(tcell.KeyF2)
-	KeyF3                 = Key(tcell.KeyF3)
-	KeyF4                 = Key(tcell.KeyF4)
-	KeyF5                 = Key(tcell.KeyF5)
-	KeyF6                 = Key(tcell.KeyF6)
-	KeyF7                 = Key(tcell.KeyF7)
-	KeyF8                 = Key(tcell.KeyF8)
-	KeyF9                 = Key(tcell.KeyF9)
-	KeyF10                = Key(tcell.KeyF10)
-	KeyF11                = Key(tcell.KeyF11)
-	KeyF12                = Key(tcell.KeyF12)
-	KeyInsert             = Key(tcell.KeyInsert)
-	KeyDelete             = Key(tcell.KeyDelete)
-	KeyHome               = Key(tcell.KeyHome)
-	KeyEnd                = Key(tcell.KeyEnd)
-	KeyPgdn               = Key(tcell.KeyPgDn)
-	KeyPgup               = Key(tcell.KeyPgUp)
-	KeyArrowUp            = Key(tcell.KeyUp)
-	KeyShiftArrowUp       = Key(tcell.KeyF62)
-	KeyArrowDown          = Key(tcell.KeyDown)
-	KeyShiftArrowDown     = Key(tcell.KeyF63)
-	KeyArrowLeft          = Key(tcell.KeyLeft)
-	KeyArrowRight         = Key(tcell.KeyRight)
-)
-
-// Keys combinations.
-const (
-	KeyCtrlTilde      = Key(tcell.KeyF64) // arbitrary assignment
-	KeyCtrlSpace      = Key(tcell.KeyCtrlSpace)
-	KeyCtrlA          = Key(tcell.KeyCtrlA)
-	KeyCtrlB          = Key(tcell.KeyCtrlB)
-	KeyCtrlC          = Key(tcell.KeyCtrlC)
-	KeyCtrlD          = Key(tcell.KeyCtrlD)
-	KeyCtrlE          = Key(tcell.KeyCtrlE)
-	KeyCtrlF          = Key(tcell.KeyCtrlF)
-	KeyCtrlG          = Key(tcell.KeyCtrlG)
-	KeyBackspace      = Key(tcell.KeyBackspace)
-	KeyCtrlH          = Key(tcell.KeyCtrlH)
-	KeyTab            = Key(tcell.KeyTab)
-	KeyBacktab        = Key(tcell.KeyBacktab)
-	KeyCtrlI          = Key(tcell.KeyCtrlI)
-	KeyCtrlJ          = Key(tcell.KeyCtrlJ)
-	KeyCtrlK          = Key(tcell.KeyCtrlK)
-	KeyCtrlL          = Key(tcell.KeyCtrlL)
-	KeyEnter          = Key(tcell.KeyEnter)
-	KeyCtrlM          = Key(tcell.KeyCtrlM)
-	KeyCtrlN          = Key(tcell.KeyCtrlN)
-	KeyCtrlO          = Key(tcell.KeyCtrlO)
-	KeyCtrlP          = Key(tcell.KeyCtrlP)
-	KeyCtrlQ          = Key(tcell.KeyCtrlQ)
-	KeyCtrlR          = Key(tcell.KeyCtrlR)
-	KeyCtrlS          = Key(tcell.KeyCtrlS)
-	KeyCtrlT          = Key(tcell.KeyCtrlT)
-	KeyCtrlU          = Key(tcell.KeyCtrlU)
-	KeyCtrlV          = Key(tcell.KeyCtrlV)
-	KeyCtrlW          = Key(tcell.KeyCtrlW)
-	KeyCtrlX          = Key(tcell.KeyCtrlX)
-	KeyCtrlY          = Key(tcell.KeyCtrlY)
-	KeyCtrlZ          = Key(tcell.KeyCtrlZ)
-	KeyEsc            = Key(tcell.KeyEscape)
-	KeyCtrlUnderscore = Key(tcell.KeyCtrlUnderscore)
-	KeySpace          = Key(32)
-	KeyBackspace2     = Key(tcell.KeyBackspace2)
-	KeyCtrl8          = Key(tcell.KeyBackspace2) // same key as in termbox-go
-
-	// The following assignments were used in termbox implementation.
-	// In tcell, these are not keys per se. But in gocui we have them
-	// mapped to the keys so we have to use placeholder keys.
-
-	KeyAltEnter       = Key(tcell.KeyF64) // arbitrary assignments
-	MouseLeft         = Key(tcell.KeyF63)
-	MouseRight        = Key(tcell.KeyF62)
-	MouseMiddle       = Key(tcell.KeyF61)
-	MouseRelease      = Key(tcell.KeyF60)
-	MouseWheelUp      = Key(tcell.KeyF59)
-	MouseWheelDown    = Key(tcell.KeyF58)
-	MouseWheelLeft    = Key(tcell.KeyF57)
-	MouseWheelRight   = Key(tcell.KeyF56)
-	KeyCtrl2          = Key(tcell.KeyNUL) // termbox defines theses
-	KeyCtrl3          = Key(tcell.KeyEscape)
-	KeyCtrl4          = Key(tcell.KeyCtrlBackslash)
-	KeyCtrl5          = Key(tcell.KeyCtrlRightSq)
-	KeyCtrl6          = Key(tcell.KeyCtrlCarat)
-	KeyCtrl7          = Key(tcell.KeyCtrlUnderscore)
-	KeyCtrlSlash      = Key(tcell.KeyCtrlUnderscore)
-	KeyCtrlRsqBracket = Key(tcell.KeyCtrlRightSq)
-	KeyCtrlBackslash  = Key(tcell.KeyCtrlBackslash)
-	KeyCtrlLsqBracket = Key(tcell.KeyCtrlLeftSq)
-)
-
-// Modifiers.
-const (
-	ModNone   Modifier = Modifier(0)
-	ModAlt             = Modifier(tcell.ModAlt)
-	ModMotion          = Modifier(2) // just picking an arbitrary number here that doesn't clash with tcell.ModAlt
-	// ModCtrl doesn't work with keyboard keys. Use CtrlKey in Key and ModNone. This is was for mouse clicks only (tcell.v1)
-	// ModCtrl = Modifier(tcell.ModCtrl)
-)
diff --git a/vendor/github.com/jesseduffield/gocui/loader.go b/vendor/github.com/jesseduffield/gocui/loader.go
deleted file mode 100644
index 5f76db7ba..000000000
--- a/vendor/github.com/jesseduffield/gocui/loader.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package gocui
-
-import "time"
-
-func (v *View) loaderLines() [][]cell {
-	duplicate := make([][]cell, len(v.lines))
-	for i := range v.lines {
-		if i < len(v.lines)-1 {
-			duplicate[i] = make([]cell, len(v.lines[i]))
-			copy(duplicate[i], v.lines[i])
-		} else {
-			duplicate[i] = make([]cell, len(v.lines[i])+2)
-			copy(duplicate[i], v.lines[i])
-			duplicate[i][len(duplicate[i])-2] = cell{chr: " "}
-			duplicate[i][len(duplicate[i])-1] = Loader()
-		}
-	}
-
-	return duplicate
-}
-
-// Loader can show a loading animation
-func Loader() cell {
-	frames := []string{"|", "/", "-", "\\"}
-	now := time.Now()
-	nanos := now.UnixNano()
-	index := nanos / 50000000 % int64(len(frames))
-	return cell{
-		chr: frames[index],
-	}
-}
diff --git a/vendor/github.com/jesseduffield/gocui/task_manager.go b/vendor/github.com/jesseduffield/gocui/task_manager.go
deleted file mode 100644
index e3c82b4d4..000000000
--- a/vendor/github.com/jesseduffield/gocui/task_manager.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package gocui
-
-import "sync"
-
-// Tracks whether the program is busy (i.e. either something is happening on
-// the main goroutine or a worker goroutine). Used by integration tests
-// to wait until the program is idle before progressing.
-type TaskManager struct {
-	// each of these listeners will be notified when the program goes from busy to idle
-	idleListeners []chan struct{}
-	tasks         map[int]Task
-	// auto-incrementing id for new tasks
-	nextId int
-
-	mutex sync.Mutex
-}
-
-func newTaskManager() *TaskManager {
-	return &TaskManager{
-		tasks:         make(map[int]Task),
-		idleListeners: []chan struct{}{},
-	}
-}
-
-func (self *TaskManager) NewTask() *TaskImpl {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	self.nextId++
-	taskId := self.nextId
-
-	onDone := func() { self.delete(taskId) }
-	task := &TaskImpl{id: taskId, busy: true, onDone: onDone, withMutex: self.withMutex}
-	self.tasks[taskId] = task
-
-	return task
-}
-
-func (self *TaskManager) addIdleListener(c chan struct{}) {
-	self.idleListeners = append(self.idleListeners, c)
-}
-
-func (self *TaskManager) withMutex(f func()) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	f()
-
-	// Check if all tasks are done
-	for _, task := range self.tasks {
-		if task.isBusy() {
-			return
-		}
-	}
-
-	// If we get here, all tasks are done, so
-	// notify listeners that the program is idle
-	for _, listener := range self.idleListeners {
-		listener <- struct{}{}
-	}
-}
-
-func (self *TaskManager) delete(taskId int) {
-	self.withMutex(func() {
-		delete(self.tasks, taskId)
-	})
-}
diff --git a/vendor/github.com/kevinburke/ssh_config/.gitattributes b/vendor/github.com/kevinburke/ssh_config/.gitattributes
deleted file mode 100644
index 44db58188..000000000
--- a/vendor/github.com/kevinburke/ssh_config/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-testdata/dos-lines eol=crlf
diff --git a/vendor/github.com/kevinburke/ssh_config/.mailmap b/vendor/github.com/kevinburke/ssh_config/.mailmap
deleted file mode 100644
index 253406b1c..000000000
--- a/vendor/github.com/kevinburke/ssh_config/.mailmap
+++ /dev/null
@@ -1 +0,0 @@
-Kevin Burke  Kevin Burke 
diff --git a/vendor/github.com/kevinburke/ssh_config/AUTHORS.txt b/vendor/github.com/kevinburke/ssh_config/AUTHORS.txt
deleted file mode 100644
index 311aeb1b4..000000000
--- a/vendor/github.com/kevinburke/ssh_config/AUTHORS.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Carlos A Becker 
-Dustin Spicuzza 
-Eugene Terentev 
-Kevin Burke 
-Mark Nevill 
-Scott Lessans 
-Sergey Lukjanov 
-Wayne Ashley Berry 
-santosh653 <70637961+santosh653@users.noreply.github.com>
diff --git a/vendor/github.com/kevinburke/ssh_config/CHANGELOG.md b/vendor/github.com/kevinburke/ssh_config/CHANGELOG.md
deleted file mode 100644
index d32a3f510..000000000
--- a/vendor/github.com/kevinburke/ssh_config/CHANGELOG.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Changes
-
-## Version 1.2
-
-Previously, if a Host declaration or a value had trailing whitespace, that
-whitespace would have been included as part of the value. This led to unexpected
-consequences. For example:
-
-```
-Host example       # A comment
-    HostName example.com      # Another comment
-```
-
-Prior to version 1.2, the value for Host would have been "example " and the
-value for HostName would have been "example.com      ". Both of these are
-unintuitive.
-
-Instead, we strip the trailing whitespace in the configuration, which leads to
-more intuitive behavior.
diff --git a/vendor/github.com/kevinburke/ssh_config/LICENSE b/vendor/github.com/kevinburke/ssh_config/LICENSE
deleted file mode 100644
index b9a770ac2..000000000
--- a/vendor/github.com/kevinburke/ssh_config/LICENSE
+++ /dev/null
@@ -1,49 +0,0 @@
-Copyright (c) 2017 Kevin Burke.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-===================
-
-The lexer and parser borrow heavily from github.com/pelletier/go-toml. The
-license for that project is copied below.
-
-The MIT License (MIT)
-
-Copyright (c) 2013 - 2017 Thomas Pelletier, Eric Anderton
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/kevinburke/ssh_config/Makefile b/vendor/github.com/kevinburke/ssh_config/Makefile
deleted file mode 100644
index df7ee728b..000000000
--- a/vendor/github.com/kevinburke/ssh_config/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-BUMP_VERSION := $(GOPATH)/bin/bump_version
-STATICCHECK := $(GOPATH)/bin/staticcheck
-WRITE_MAILMAP := $(GOPATH)/bin/write_mailmap
-
-$(STATICCHECK):
-	go get honnef.co/go/tools/cmd/staticcheck
-
-lint: $(STATICCHECK)
-	go vet ./...
-	$(STATICCHECK)
-
-test: lint
-	@# the timeout helps guard against infinite recursion
-	go test -timeout=250ms ./...
-
-race-test: lint
-	go test -timeout=500ms -race ./...
-
-$(BUMP_VERSION):
-	go get -u github.com/kevinburke/bump_version
-
-$(WRITE_MAILMAP):
-	go get -u github.com/kevinburke/write_mailmap
-
-release: test | $(BUMP_VERSION)
-	$(BUMP_VERSION) --tag-prefix=v minor config.go
-
-force: ;
-
-AUTHORS.txt: force | $(WRITE_MAILMAP)
-	$(WRITE_MAILMAP) > AUTHORS.txt
-
-authors: AUTHORS.txt
diff --git a/vendor/github.com/kevinburke/ssh_config/README.md b/vendor/github.com/kevinburke/ssh_config/README.md
deleted file mode 100644
index f14b2168f..000000000
--- a/vendor/github.com/kevinburke/ssh_config/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# ssh_config
-
-This is a Go parser for `ssh_config` files. Importantly, this parser attempts
-to preserve comments in a given file, so you can manipulate a `ssh_config` file
-from a program, if your heart desires.
-
-It's designed to be used with the excellent
-[x/crypto/ssh](https://golang.org/x/crypto/ssh) package, which handles SSH
-negotiation but isn't very easy to configure.
-
-The `ssh_config` `Get()` and `GetStrict()` functions will attempt to read values
-from `$HOME/.ssh/config` and fall back to `/etc/ssh/ssh_config`. The first
-argument is the host name to match on, and the second argument is the key you
-want to retrieve.
-
-```go
-port := ssh_config.Get("myhost", "Port")
-```
-
-Certain directives can occur multiple times for a host (such as `IdentityFile`),
-so you should use the `GetAll` or `GetAllStrict` directive to retrieve those
-instead.
-
-```go
-files := ssh_config.GetAll("myhost", "IdentityFile")
-```
-
-You can also load a config file and read values from it.
-
-```go
-var config = `
-Host *.test
-  Compression yes
-`
-
-cfg, err := ssh_config.Decode(strings.NewReader(config))
-fmt.Println(cfg.Get("example.test", "Port"))
-```
-
-Some SSH arguments have default values - for example, the default value for
-`KeyboardAuthentication` is `"yes"`. If you call Get(), and no value for the
-given Host/keyword pair exists in the config, we'll return a default for the
-keyword if one exists.
-
-### Manipulating SSH config files
-
-Here's how you can manipulate an SSH config file, and then write it back to
-disk.
-
-```go
-f, _ := os.Open(filepath.Join(os.Getenv("HOME"), ".ssh", "config"))
-cfg, _ := ssh_config.Decode(f)
-for _, host := range cfg.Hosts {
-    fmt.Println("patterns:", host.Patterns)
-    for _, node := range host.Nodes {
-        // Manipulate the nodes as you see fit, or use a type switch to
-        // distinguish between Empty, KV, and Include nodes.
-        fmt.Println(node.String())
-    }
-}
-
-// Print the config to stdout:
-fmt.Println(cfg.String())
-```
-
-## Spec compliance
-
-Wherever possible we try to implement the specification as documented in
-the `ssh_config` manpage. Unimplemented features should be present in the
-[issues][issues] list.
-
-Notably, the `Match` directive is currently unsupported.
-
-[issues]: https://github.com/kevinburke/ssh_config/issues
-
-## Errata
-
-This is the second [comment-preserving configuration parser][blog] I've written, after
-[an /etc/hosts parser][hostsfile]. Eventually, I will write one for every Linux
-file format.
-
-[blog]: https://kev.inburke.com/kevin/more-comment-preserving-configuration-parsers/
-[hostsfile]: https://github.com/kevinburke/hostsfile
-
-## Donating
-
-I don't get paid to maintain this project. Donations free up time to make
-improvements to the library, and respond to bug reports. You can send donations
-via Paypal's "Send Money" feature to kev@inburke.com. Donations are not tax
-deductible in the USA.
-
-You can also reach out about a consulting engagement: https://burke.services
diff --git a/vendor/github.com/kevinburke/ssh_config/config.go b/vendor/github.com/kevinburke/ssh_config/config.go
deleted file mode 100644
index 00d815c1a..000000000
--- a/vendor/github.com/kevinburke/ssh_config/config.go
+++ /dev/null
@@ -1,803 +0,0 @@
-// Package ssh_config provides tools for manipulating SSH config files.
-//
-// Importantly, this parser attempts to preserve comments in a given file, so
-// you can manipulate a `ssh_config` file from a program, if your heart desires.
-//
-// The Get() and GetStrict() functions will attempt to read values from
-// $HOME/.ssh/config, falling back to /etc/ssh/ssh_config. The first argument is
-// the host name to match on ("example.com"), and the second argument is the key
-// you want to retrieve ("Port"). The keywords are case insensitive.
-//
-// 		port := ssh_config.Get("myhost", "Port")
-//
-// You can also manipulate an SSH config file and then print it or write it back
-// to disk.
-//
-//	f, _ := os.Open(filepath.Join(os.Getenv("HOME"), ".ssh", "config"))
-//	cfg, _ := ssh_config.Decode(f)
-//	for _, host := range cfg.Hosts {
-//		fmt.Println("patterns:", host.Patterns)
-//		for _, node := range host.Nodes {
-//			fmt.Println(node.String())
-//		}
-//	}
-//
-//	// Write the cfg back to disk:
-//	fmt.Println(cfg.String())
-//
-// BUG: the Match directive is currently unsupported; parsing a config with
-// a Match directive will trigger an error.
-package ssh_config
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	osuser "os/user"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"sync"
-)
-
-const version = "1.2"
-
-var _ = version
-
-type configFinder func() string
-
-// UserSettings checks ~/.ssh and /etc/ssh for configuration files. The config
-// files are parsed and cached the first time Get() or GetStrict() is called.
-type UserSettings struct {
-	IgnoreErrors       bool
-	systemConfig       *Config
-	systemConfigFinder configFinder
-	userConfig         *Config
-	userConfigFinder   configFinder
-	loadConfigs        sync.Once
-	onceErr            error
-}
-
-func homedir() string {
-	user, err := osuser.Current()
-	if err == nil {
-		return user.HomeDir
-	} else {
-		return os.Getenv("HOME")
-	}
-}
-
-func userConfigFinder() string {
-	return filepath.Join(homedir(), ".ssh", "config")
-}
-
-// DefaultUserSettings is the default UserSettings and is used by Get and
-// GetStrict. It checks both $HOME/.ssh/config and /etc/ssh/ssh_config for keys,
-// and it will return parse errors (if any) instead of swallowing them.
-var DefaultUserSettings = &UserSettings{
-	IgnoreErrors:       false,
-	systemConfigFinder: systemConfigFinder,
-	userConfigFinder:   userConfigFinder,
-}
-
-func systemConfigFinder() string {
-	return filepath.Join("/", "etc", "ssh", "ssh_config")
-}
-
-func findVal(c *Config, alias, key string) (string, error) {
-	if c == nil {
-		return "", nil
-	}
-	val, err := c.Get(alias, key)
-	if err != nil || val == "" {
-		return "", err
-	}
-	if err := validate(key, val); err != nil {
-		return "", err
-	}
-	return val, nil
-}
-
-func findAll(c *Config, alias, key string) ([]string, error) {
-	if c == nil {
-		return nil, nil
-	}
-	return c.GetAll(alias, key)
-}
-
-// Get finds the first value for key within a declaration that matches the
-// alias. Get returns the empty string if no value was found, or if IgnoreErrors
-// is false and we could not parse the configuration file. Use GetStrict to
-// disambiguate the latter cases.
-//
-// The match for key is case insensitive.
-//
-// Get is a wrapper around DefaultUserSettings.Get.
-func Get(alias, key string) string {
-	return DefaultUserSettings.Get(alias, key)
-}
-
-// GetAll retrieves zero or more directives for key for the given alias. GetAll
-// returns nil if no value was found, or if IgnoreErrors is false and we could
-// not parse the configuration file. Use GetAllStrict to disambiguate the
-// latter cases.
-//
-// In most cases you want to use Get or GetStrict, which returns a single value.
-// However, a subset of ssh configuration values (IdentityFile, for example)
-// allow you to specify multiple directives.
-//
-// The match for key is case insensitive.
-//
-// GetAll is a wrapper around DefaultUserSettings.GetAll.
-func GetAll(alias, key string) []string {
-	return DefaultUserSettings.GetAll(alias, key)
-}
-
-// GetStrict finds the first value for key within a declaration that matches the
-// alias. If key has a default value and no matching configuration is found, the
-// default will be returned. For more information on default values and the way
-// patterns are matched, see the manpage for ssh_config.
-//
-// The returned error will be non-nil if and only if a user's configuration file
-// or the system configuration file could not be parsed, and u.IgnoreErrors is
-// false.
-//
-// GetStrict is a wrapper around DefaultUserSettings.GetStrict.
-func GetStrict(alias, key string) (string, error) {
-	return DefaultUserSettings.GetStrict(alias, key)
-}
-
-// GetAllStrict retrieves zero or more directives for key for the given alias.
-//
-// In most cases you want to use Get or GetStrict, which returns a single value.
-// However, a subset of ssh configuration values (IdentityFile, for example)
-// allow you to specify multiple directives.
-//
-// The returned error will be non-nil if and only if a user's configuration file
-// or the system configuration file could not be parsed, and u.IgnoreErrors is
-// false.
-//
-// GetAllStrict is a wrapper around DefaultUserSettings.GetAllStrict.
-func GetAllStrict(alias, key string) ([]string, error) {
-	return DefaultUserSettings.GetAllStrict(alias, key)
-}
-
-// Get finds the first value for key within a declaration that matches the
-// alias. Get returns the empty string if no value was found, or if IgnoreErrors
-// is false and we could not parse the configuration file. Use GetStrict to
-// disambiguate the latter cases.
-//
-// The match for key is case insensitive.
-func (u *UserSettings) Get(alias, key string) string {
-	val, err := u.GetStrict(alias, key)
-	if err != nil {
-		return ""
-	}
-	return val
-}
-
-// GetAll retrieves zero or more directives for key for the given alias. GetAll
-// returns nil if no value was found, or if IgnoreErrors is false and we could
-// not parse the configuration file. Use GetStrict to disambiguate the latter
-// cases.
-//
-// The match for key is case insensitive.
-func (u *UserSettings) GetAll(alias, key string) []string {
-	val, _ := u.GetAllStrict(alias, key)
-	return val
-}
-
-// GetStrict finds the first value for key within a declaration that matches the
-// alias. If key has a default value and no matching configuration is found, the
-// default will be returned. For more information on default values and the way
-// patterns are matched, see the manpage for ssh_config.
-//
-// error will be non-nil if and only if a user's configuration file or the
-// system configuration file could not be parsed, and u.IgnoreErrors is false.
-func (u *UserSettings) GetStrict(alias, key string) (string, error) {
-	u.doLoadConfigs()
-	//lint:ignore S1002 I prefer it this way
-	if u.onceErr != nil && u.IgnoreErrors == false {
-		return "", u.onceErr
-	}
-	val, err := findVal(u.userConfig, alias, key)
-	if err != nil || val != "" {
-		return val, err
-	}
-	val2, err2 := findVal(u.systemConfig, alias, key)
-	if err2 != nil || val2 != "" {
-		return val2, err2
-	}
-	return Default(key), nil
-}
-
-// GetAllStrict retrieves zero or more directives for key for the given alias.
-// If key has a default value and no matching configuration is found, the
-// default will be returned. For more information on default values and the way
-// patterns are matched, see the manpage for ssh_config.
-//
-// The returned error will be non-nil if and only if a user's configuration file
-// or the system configuration file could not be parsed, and u.IgnoreErrors is
-// false.
-func (u *UserSettings) GetAllStrict(alias, key string) ([]string, error) {
-	u.doLoadConfigs()
-	//lint:ignore S1002 I prefer it this way
-	if u.onceErr != nil && u.IgnoreErrors == false {
-		return nil, u.onceErr
-	}
-	val, err := findAll(u.userConfig, alias, key)
-	if err != nil || val != nil {
-		return val, err
-	}
-	val2, err2 := findAll(u.systemConfig, alias, key)
-	if err2 != nil || val2 != nil {
-		return val2, err2
-	}
-	// TODO: IdentityFile has multiple default values that we should return.
-	if def := Default(key); def != "" {
-		return []string{def}, nil
-	}
-	return []string{}, nil
-}
-
-func (u *UserSettings) doLoadConfigs() {
-	u.loadConfigs.Do(func() {
-		// can't parse user file, that's ok.
-		var filename string
-		if u.userConfigFinder == nil {
-			filename = userConfigFinder()
-		} else {
-			filename = u.userConfigFinder()
-		}
-		var err error
-		u.userConfig, err = parseFile(filename)
-		//lint:ignore S1002 I prefer it this way
-		if err != nil && os.IsNotExist(err) == false {
-			u.onceErr = err
-			return
-		}
-		if u.systemConfigFinder == nil {
-			filename = systemConfigFinder()
-		} else {
-			filename = u.systemConfigFinder()
-		}
-		u.systemConfig, err = parseFile(filename)
-		//lint:ignore S1002 I prefer it this way
-		if err != nil && os.IsNotExist(err) == false {
-			u.onceErr = err
-			return
-		}
-	})
-}
-
-func parseFile(filename string) (*Config, error) {
-	return parseWithDepth(filename, 0)
-}
-
-func parseWithDepth(filename string, depth uint8) (*Config, error) {
-	b, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-	return decodeBytes(b, isSystem(filename), depth)
-}
-
-func isSystem(filename string) bool {
-	// TODO: not sure this is the best way to detect a system repo
-	return strings.HasPrefix(filepath.Clean(filename), "/etc/ssh")
-}
-
-// Decode reads r into a Config, or returns an error if r could not be parsed as
-// an SSH config file.
-func Decode(r io.Reader) (*Config, error) {
-	b, err := io.ReadAll(r)
-	if err != nil {
-		return nil, err
-	}
-	return decodeBytes(b, false, 0)
-}
-
-// DecodeBytes reads b into a Config, or returns an error if r could not be
-// parsed as an SSH config file.
-func DecodeBytes(b []byte) (*Config, error) {
-	return decodeBytes(b, false, 0)
-}
-
-func decodeBytes(b []byte, system bool, depth uint8) (c *Config, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			if e, ok := r.(error); ok && e == ErrDepthExceeded {
-				err = e
-				return
-			}
-			err = errors.New(r.(string))
-		}
-	}()
-
-	c = parseSSH(lexSSH(b), system, depth)
-	return c, err
-}
-
-// Config represents an SSH config file.
-type Config struct {
-	// A list of hosts to match against. The file begins with an implicit
-	// "Host *" declaration matching all hosts.
-	Hosts    []*Host
-	depth    uint8
-	position Position
-}
-
-// Get finds the first value in the configuration that matches the alias and
-// contains key. Get returns the empty string if no value was found, or if the
-// Config contains an invalid conditional Include value.
-//
-// The match for key is case insensitive.
-func (c *Config) Get(alias, key string) (string, error) {
-	lowerKey := strings.ToLower(key)
-	for _, host := range c.Hosts {
-		if !host.Matches(alias) {
-			continue
-		}
-		for _, node := range host.Nodes {
-			switch t := node.(type) {
-			case *Empty:
-				continue
-			case *KV:
-				// "keys are case insensitive" per the spec
-				lkey := strings.ToLower(t.Key)
-				if lkey == "match" {
-					panic("can't handle Match directives")
-				}
-				if lkey == lowerKey {
-					return t.Value, nil
-				}
-			case *Include:
-				val := t.Get(alias, key)
-				if val != "" {
-					return val, nil
-				}
-			default:
-				return "", fmt.Errorf("unknown Node type %v", t)
-			}
-		}
-	}
-	return "", nil
-}
-
-// GetAll returns all values in the configuration that match the alias and
-// contains key, or nil if none are present.
-func (c *Config) GetAll(alias, key string) ([]string, error) {
-	lowerKey := strings.ToLower(key)
-	all := []string(nil)
-	for _, host := range c.Hosts {
-		if !host.Matches(alias) {
-			continue
-		}
-		for _, node := range host.Nodes {
-			switch t := node.(type) {
-			case *Empty:
-				continue
-			case *KV:
-				// "keys are case insensitive" per the spec
-				lkey := strings.ToLower(t.Key)
-				if lkey == "match" {
-					panic("can't handle Match directives")
-				}
-				if lkey == lowerKey {
-					all = append(all, t.Value)
-				}
-			case *Include:
-				val, _ := t.GetAll(alias, key)
-				if len(val) > 0 {
-					all = append(all, val...)
-				}
-			default:
-				return nil, fmt.Errorf("unknown Node type %v", t)
-			}
-		}
-	}
-
-	return all, nil
-}
-
-// String returns a string representation of the Config file.
-func (c Config) String() string {
-	return marshal(c).String()
-}
-
-func (c Config) MarshalText() ([]byte, error) {
-	return marshal(c).Bytes(), nil
-}
-
-func marshal(c Config) *bytes.Buffer {
-	var buf bytes.Buffer
-	for i := range c.Hosts {
-		buf.WriteString(c.Hosts[i].String())
-	}
-	return &buf
-}
-
-// Pattern is a pattern in a Host declaration. Patterns are read-only values;
-// create a new one with NewPattern().
-type Pattern struct {
-	str   string // Its appearance in the file, not the value that gets compiled.
-	regex *regexp.Regexp
-	not   bool // True if this is a negated match
-}
-
-// String prints the string representation of the pattern.
-func (p Pattern) String() string {
-	return p.str
-}
-
-// Copied from regexp.go with * and ? removed.
-var specialBytes = []byte(`\.+()|[]{}^$`)
-
-func special(b byte) bool {
-	return bytes.IndexByte(specialBytes, b) >= 0
-}
-
-// NewPattern creates a new Pattern for matching hosts. NewPattern("*") creates
-// a Pattern that matches all hosts.
-//
-// From the manpage, a pattern consists of zero or more non-whitespace
-// characters, `*' (a wildcard that matches zero or more characters), or `?' (a
-// wildcard that matches exactly one character). For example, to specify a set
-// of declarations for any host in the ".co.uk" set of domains, the following
-// pattern could be used:
-//
-//	Host *.co.uk
-//
-// The following pattern would match any host in the 192.168.0.[0-9] network range:
-//
-//	Host 192.168.0.?
-func NewPattern(s string) (*Pattern, error) {
-	if s == "" {
-		return nil, errors.New("ssh_config: empty pattern")
-	}
-	negated := false
-	if s[0] == '!' {
-		negated = true
-		s = s[1:]
-	}
-	var buf bytes.Buffer
-	buf.WriteByte('^')
-	for i := 0; i < len(s); i++ {
-		// A byte loop is correct because all metacharacters are ASCII.
-		switch b := s[i]; b {
-		case '*':
-			buf.WriteString(".*")
-		case '?':
-			buf.WriteString(".?")
-		default:
-			// borrowing from QuoteMeta here.
-			if special(b) {
-				buf.WriteByte('\\')
-			}
-			buf.WriteByte(b)
-		}
-	}
-	buf.WriteByte('$')
-	r, err := regexp.Compile(buf.String())
-	if err != nil {
-		return nil, err
-	}
-	return &Pattern{str: s, regex: r, not: negated}, nil
-}
-
-// Host describes a Host directive and the keywords that follow it.
-type Host struct {
-	// A list of host patterns that should match this host.
-	Patterns []*Pattern
-	// A Node is either a key/value pair or a comment line.
-	Nodes []Node
-	// EOLComment is the comment (if any) terminating the Host line.
-	EOLComment string
-	// Whitespace if any between the Host declaration and a trailing comment.
-	spaceBeforeComment string
-
-	hasEquals    bool
-	leadingSpace int // TODO: handle spaces vs tabs here.
-	// The file starts with an implicit "Host *" declaration.
-	implicit bool
-}
-
-// Matches returns true if the Host matches for the given alias. For
-// a description of the rules that provide a match, see the manpage for
-// ssh_config.
-func (h *Host) Matches(alias string) bool {
-	found := false
-	for i := range h.Patterns {
-		if h.Patterns[i].regex.MatchString(alias) {
-			if h.Patterns[i].not {
-				// Negated match. "A pattern entry may be negated by prefixing
-				// it with an exclamation mark (`!'). If a negated entry is
-				// matched, then the Host entry is ignored, regardless of
-				// whether any other patterns on the line match. Negated matches
-				// are therefore useful to provide exceptions for wildcard
-				// matches."
-				return false
-			}
-			found = true
-		}
-	}
-	return found
-}
-
-// String prints h as it would appear in a config file. Minor tweaks may be
-// present in the whitespace in the printed file.
-func (h *Host) String() string {
-	var buf strings.Builder
-	//lint:ignore S1002 I prefer to write it this way
-	if h.implicit == false {
-		buf.WriteString(strings.Repeat(" ", int(h.leadingSpace)))
-		buf.WriteString("Host")
-		if h.hasEquals {
-			buf.WriteString(" = ")
-		} else {
-			buf.WriteString(" ")
-		}
-		for i, pat := range h.Patterns {
-			buf.WriteString(pat.String())
-			if i < len(h.Patterns)-1 {
-				buf.WriteString(" ")
-			}
-		}
-		buf.WriteString(h.spaceBeforeComment)
-		if h.EOLComment != "" {
-			buf.WriteByte('#')
-			buf.WriteString(h.EOLComment)
-		}
-		buf.WriteByte('\n')
-	}
-	for i := range h.Nodes {
-		buf.WriteString(h.Nodes[i].String())
-		buf.WriteByte('\n')
-	}
-	return buf.String()
-}
-
-// Node represents a line in a Config.
-type Node interface {
-	Pos() Position
-	String() string
-}
-
-// KV is a line in the config file that contains a key, a value, and possibly
-// a comment.
-type KV struct {
-	Key   string
-	Value string
-	// Whitespace after the value but before any comment
-	spaceAfterValue string
-	Comment         string
-	hasEquals       bool
-	leadingSpace    int // Space before the key. TODO handle spaces vs tabs.
-	position        Position
-}
-
-// Pos returns k's Position.
-func (k *KV) Pos() Position {
-	return k.position
-}
-
-// String prints k as it was parsed in the config file.
-func (k *KV) String() string {
-	if k == nil {
-		return ""
-	}
-	equals := " "
-	if k.hasEquals {
-		equals = " = "
-	}
-	line := strings.Repeat(" ", int(k.leadingSpace)) + k.Key + equals + k.Value + k.spaceAfterValue
-	if k.Comment != "" {
-		line += "#" + k.Comment
-	}
-	return line
-}
-
-// Empty is a line in the config file that contains only whitespace or comments.
-type Empty struct {
-	Comment      string
-	leadingSpace int // TODO handle spaces vs tabs.
-	position     Position
-}
-
-// Pos returns e's Position.
-func (e *Empty) Pos() Position {
-	return e.position
-}
-
-// String prints e as it was parsed in the config file.
-func (e *Empty) String() string {
-	if e == nil {
-		return ""
-	}
-	if e.Comment == "" {
-		return ""
-	}
-	return fmt.Sprintf("%s#%s", strings.Repeat(" ", int(e.leadingSpace)), e.Comment)
-}
-
-// Include holds the result of an Include directive, including the config files
-// that have been parsed as part of that directive. At most 5 levels of Include
-// statements will be parsed.
-type Include struct {
-	// Comment is the contents of any comment at the end of the Include
-	// statement.
-	Comment string
-	// an include directive can include several different files, and wildcards
-	directives []string
-
-	mu sync.Mutex
-	// 1:1 mapping between matches and keys in files array; matches preserves
-	// ordering
-	matches []string
-	// actual filenames are listed here
-	files        map[string]*Config
-	leadingSpace int
-	position     Position
-	depth        uint8
-	hasEquals    bool
-}
-
-const maxRecurseDepth = 5
-
-// ErrDepthExceeded is returned if too many Include directives are parsed.
-// Usually this indicates a recursive loop (an Include directive pointing to the
-// file it contains).
-var ErrDepthExceeded = errors.New("ssh_config: max recurse depth exceeded")
-
-func removeDups(arr []string) []string {
-	// Use map to record duplicates as we find them.
-	encountered := make(map[string]bool, len(arr))
-	result := make([]string, 0)
-
-	for v := range arr {
-		//lint:ignore S1002 I prefer it this way
-		if encountered[arr[v]] == false {
-			encountered[arr[v]] = true
-			result = append(result, arr[v])
-		}
-	}
-	return result
-}
-
-// NewInclude creates a new Include with a list of file globs to include.
-// Configuration files are parsed greedily (e.g. as soon as this function runs).
-// Any error encountered while parsing nested configuration files will be
-// returned.
-func NewInclude(directives []string, hasEquals bool, pos Position, comment string, system bool, depth uint8) (*Include, error) {
-	if depth > maxRecurseDepth {
-		return nil, ErrDepthExceeded
-	}
-	inc := &Include{
-		Comment:      comment,
-		directives:   directives,
-		files:        make(map[string]*Config),
-		position:     pos,
-		leadingSpace: pos.Col - 1,
-		depth:        depth,
-		hasEquals:    hasEquals,
-	}
-	// no need for inc.mu.Lock() since nothing else can access this inc
-	matches := make([]string, 0)
-	for i := range directives {
-		var path string
-		if filepath.IsAbs(directives[i]) {
-			path = directives[i]
-		} else if system {
-			path = filepath.Join("/etc/ssh", directives[i])
-		} else {
-			path = filepath.Join(homedir(), ".ssh", directives[i])
-		}
-		theseMatches, err := filepath.Glob(path)
-		if err != nil {
-			return nil, err
-		}
-		matches = append(matches, theseMatches...)
-	}
-	matches = removeDups(matches)
-	inc.matches = matches
-	for i := range matches {
-		config, err := parseWithDepth(matches[i], depth)
-		if err != nil {
-			return nil, err
-		}
-		inc.files[matches[i]] = config
-	}
-	return inc, nil
-}
-
-// Pos returns the position of the Include directive in the larger file.
-func (i *Include) Pos() Position {
-	return i.position
-}
-
-// Get finds the first value in the Include statement matching the alias and the
-// given key.
-func (inc *Include) Get(alias, key string) string {
-	inc.mu.Lock()
-	defer inc.mu.Unlock()
-	// TODO: we search files in any order which is not correct
-	for i := range inc.matches {
-		cfg := inc.files[inc.matches[i]]
-		if cfg == nil {
-			panic("nil cfg")
-		}
-		val, err := cfg.Get(alias, key)
-		if err == nil && val != "" {
-			return val
-		}
-	}
-	return ""
-}
-
-// GetAll finds all values in the Include statement matching the alias and the
-// given key.
-func (inc *Include) GetAll(alias, key string) ([]string, error) {
-	inc.mu.Lock()
-	defer inc.mu.Unlock()
-	var vals []string
-
-	// TODO: we search files in any order which is not correct
-	for i := range inc.matches {
-		cfg := inc.files[inc.matches[i]]
-		if cfg == nil {
-			panic("nil cfg")
-		}
-		val, err := cfg.GetAll(alias, key)
-		if err == nil && len(val) != 0 {
-			// In theory if SupportsMultiple was false for this key we could
-			// stop looking here. But the caller has asked us to find all
-			// instances of the keyword (and could use Get() if they wanted) so
-			// let's keep looking.
-			vals = append(vals, val...)
-		}
-	}
-	return vals, nil
-}
-
-// String prints out a string representation of this Include directive. Note
-// included Config files are not printed as part of this representation.
-func (inc *Include) String() string {
-	equals := " "
-	if inc.hasEquals {
-		equals = " = "
-	}
-	line := fmt.Sprintf("%sInclude%s%s", strings.Repeat(" ", int(inc.leadingSpace)), equals, strings.Join(inc.directives, " "))
-	if inc.Comment != "" {
-		line += " #" + inc.Comment
-	}
-	return line
-}
-
-var matchAll *Pattern
-
-func init() {
-	var err error
-	matchAll, err = NewPattern("*")
-	if err != nil {
-		panic(err)
-	}
-}
-
-func newConfig() *Config {
-	return &Config{
-		Hosts: []*Host{
-			&Host{
-				implicit: true,
-				Patterns: []*Pattern{matchAll},
-				Nodes:    make([]Node, 0),
-			},
-		},
-		depth: 0,
-	}
-}
diff --git a/vendor/github.com/kevinburke/ssh_config/lexer.go b/vendor/github.com/kevinburke/ssh_config/lexer.go
deleted file mode 100644
index 11680b4c7..000000000
--- a/vendor/github.com/kevinburke/ssh_config/lexer.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package ssh_config
-
-import (
-	"bytes"
-)
-
-// Define state functions
-type sshLexStateFn func() sshLexStateFn
-
-type sshLexer struct {
-	inputIdx int
-	input    []rune // Textual source
-
-	buffer        []rune // Runes composing the current token
-	tokens        chan token
-	line          int
-	col           int
-	endbufferLine int
-	endbufferCol  int
-}
-
-func (s *sshLexer) lexComment(previousState sshLexStateFn) sshLexStateFn {
-	return func() sshLexStateFn {
-		growingString := ""
-		for next := s.peek(); next != '\n' && next != eof; next = s.peek() {
-			if next == '\r' && s.follow("\r\n") {
-				break
-			}
-			growingString += string(next)
-			s.next()
-		}
-		s.emitWithValue(tokenComment, growingString)
-		s.skip()
-		return previousState
-	}
-}
-
-// lex the space after an equals sign in a function
-func (s *sshLexer) lexRspace() sshLexStateFn {
-	for {
-		next := s.peek()
-		if !isSpace(next) {
-			break
-		}
-		s.skip()
-	}
-	return s.lexRvalue
-}
-
-func (s *sshLexer) lexEquals() sshLexStateFn {
-	for {
-		next := s.peek()
-		if next == '=' {
-			s.emit(tokenEquals)
-			s.skip()
-			return s.lexRspace
-		}
-		// TODO error handling here; newline eof etc.
-		if !isSpace(next) {
-			break
-		}
-		s.skip()
-	}
-	return s.lexRvalue
-}
-
-func (s *sshLexer) lexKey() sshLexStateFn {
-	growingString := ""
-
-	for r := s.peek(); isKeyChar(r); r = s.peek() {
-		// simplified a lot here
-		if isSpace(r) || r == '=' {
-			s.emitWithValue(tokenKey, growingString)
-			s.skip()
-			return s.lexEquals
-		}
-		growingString += string(r)
-		s.next()
-	}
-	s.emitWithValue(tokenKey, growingString)
-	return s.lexEquals
-}
-
-func (s *sshLexer) lexRvalue() sshLexStateFn {
-	growingString := ""
-	for {
-		next := s.peek()
-		switch next {
-		case '\r':
-			if s.follow("\r\n") {
-				s.emitWithValue(tokenString, growingString)
-				s.skip()
-				return s.lexVoid
-			}
-		case '\n':
-			s.emitWithValue(tokenString, growingString)
-			s.skip()
-			return s.lexVoid
-		case '#':
-			s.emitWithValue(tokenString, growingString)
-			s.skip()
-			return s.lexComment(s.lexVoid)
-		case eof:
-			s.next()
-		}
-		if next == eof {
-			break
-		}
-		growingString += string(next)
-		s.next()
-	}
-	s.emit(tokenEOF)
-	return nil
-}
-
-func (s *sshLexer) read() rune {
-	r := s.peek()
-	if r == '\n' {
-		s.endbufferLine++
-		s.endbufferCol = 1
-	} else {
-		s.endbufferCol++
-	}
-	s.inputIdx++
-	return r
-}
-
-func (s *sshLexer) next() rune {
-	r := s.read()
-
-	if r != eof {
-		s.buffer = append(s.buffer, r)
-	}
-	return r
-}
-
-func (s *sshLexer) lexVoid() sshLexStateFn {
-	for {
-		next := s.peek()
-		switch next {
-		case '#':
-			s.skip()
-			return s.lexComment(s.lexVoid)
-		case '\r':
-			fallthrough
-		case '\n':
-			s.emit(tokenEmptyLine)
-			s.skip()
-			continue
-		}
-
-		if isSpace(next) {
-			s.skip()
-		}
-
-		if isKeyStartChar(next) {
-			return s.lexKey
-		}
-
-		// removed IsKeyStartChar and lexKey. probably will need to readd
-
-		if next == eof {
-			s.next()
-			break
-		}
-	}
-
-	s.emit(tokenEOF)
-	return nil
-}
-
-func (s *sshLexer) ignore() {
-	s.buffer = make([]rune, 0)
-	s.line = s.endbufferLine
-	s.col = s.endbufferCol
-}
-
-func (s *sshLexer) skip() {
-	s.next()
-	s.ignore()
-}
-
-func (s *sshLexer) emit(t tokenType) {
-	s.emitWithValue(t, string(s.buffer))
-}
-
-func (s *sshLexer) emitWithValue(t tokenType, value string) {
-	tok := token{
-		Position: Position{s.line, s.col},
-		typ:      t,
-		val:      value,
-	}
-	s.tokens <- tok
-	s.ignore()
-}
-
-func (s *sshLexer) peek() rune {
-	if s.inputIdx >= len(s.input) {
-		return eof
-	}
-
-	r := s.input[s.inputIdx]
-	return r
-}
-
-func (s *sshLexer) follow(next string) bool {
-	inputIdx := s.inputIdx
-	for _, expectedRune := range next {
-		if inputIdx >= len(s.input) {
-			return false
-		}
-		r := s.input[inputIdx]
-		inputIdx++
-		if expectedRune != r {
-			return false
-		}
-	}
-	return true
-}
-
-func (s *sshLexer) run() {
-	for state := s.lexVoid; state != nil; {
-		state = state()
-	}
-	close(s.tokens)
-}
-
-func lexSSH(input []byte) chan token {
-	runes := bytes.Runes(input)
-	l := &sshLexer{
-		input:         runes,
-		tokens:        make(chan token),
-		line:          1,
-		col:           1,
-		endbufferLine: 1,
-		endbufferCol:  1,
-	}
-	go l.run()
-	return l.tokens
-}
diff --git a/vendor/github.com/kevinburke/ssh_config/parser.go b/vendor/github.com/kevinburke/ssh_config/parser.go
deleted file mode 100644
index 2b1e718cb..000000000
--- a/vendor/github.com/kevinburke/ssh_config/parser.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package ssh_config
-
-import (
-	"fmt"
-	"strings"
-	"unicode"
-)
-
-type sshParser struct {
-	flow          chan token
-	config        *Config
-	tokensBuffer  []token
-	currentTable  []string
-	seenTableKeys []string
-	// /etc/ssh parser or local parser - used to find the default for relative
-	// filepaths in the Include directive
-	system bool
-	depth  uint8
-}
-
-type sshParserStateFn func() sshParserStateFn
-
-// Formats and panics an error message based on a token
-func (p *sshParser) raiseErrorf(tok *token, msg string, args ...interface{}) {
-	// TODO this format is ugly
-	panic(tok.Position.String() + ": " + fmt.Sprintf(msg, args...))
-}
-
-func (p *sshParser) raiseError(tok *token, err error) {
-	if err == ErrDepthExceeded {
-		panic(err)
-	}
-	// TODO this format is ugly
-	panic(tok.Position.String() + ": " + err.Error())
-}
-
-func (p *sshParser) run() {
-	for state := p.parseStart; state != nil; {
-		state = state()
-	}
-}
-
-func (p *sshParser) peek() *token {
-	if len(p.tokensBuffer) != 0 {
-		return &(p.tokensBuffer[0])
-	}
-
-	tok, ok := <-p.flow
-	if !ok {
-		return nil
-	}
-	p.tokensBuffer = append(p.tokensBuffer, tok)
-	return &tok
-}
-
-func (p *sshParser) getToken() *token {
-	if len(p.tokensBuffer) != 0 {
-		tok := p.tokensBuffer[0]
-		p.tokensBuffer = p.tokensBuffer[1:]
-		return &tok
-	}
-	tok, ok := <-p.flow
-	if !ok {
-		return nil
-	}
-	return &tok
-}
-
-func (p *sshParser) parseStart() sshParserStateFn {
-	tok := p.peek()
-
-	// end of stream, parsing is finished
-	if tok == nil {
-		return nil
-	}
-
-	switch tok.typ {
-	case tokenComment, tokenEmptyLine:
-		return p.parseComment
-	case tokenKey:
-		return p.parseKV
-	case tokenEOF:
-		return nil
-	default:
-		p.raiseErrorf(tok, fmt.Sprintf("unexpected token %q\n", tok))
-	}
-	return nil
-}
-
-func (p *sshParser) parseKV() sshParserStateFn {
-	key := p.getToken()
-	hasEquals := false
-	val := p.getToken()
-	if val.typ == tokenEquals {
-		hasEquals = true
-		val = p.getToken()
-	}
-	comment := ""
-	tok := p.peek()
-	if tok == nil {
-		tok = &token{typ: tokenEOF}
-	}
-	if tok.typ == tokenComment && tok.Position.Line == val.Position.Line {
-		tok = p.getToken()
-		comment = tok.val
-	}
-	if strings.ToLower(key.val) == "match" {
-		// https://github.com/kevinburke/ssh_config/issues/6
-		p.raiseErrorf(val, "ssh_config: Match directive parsing is unsupported")
-		return nil
-	}
-	if strings.ToLower(key.val) == "host" {
-		strPatterns := strings.Split(val.val, " ")
-		patterns := make([]*Pattern, 0)
-		for i := range strPatterns {
-			if strPatterns[i] == "" {
-				continue
-			}
-			pat, err := NewPattern(strPatterns[i])
-			if err != nil {
-				p.raiseErrorf(val, "Invalid host pattern: %v", err)
-				return nil
-			}
-			patterns = append(patterns, pat)
-		}
-		// val.val at this point could be e.g. "example.com       "
-		hostval := strings.TrimRightFunc(val.val, unicode.IsSpace)
-		spaceBeforeComment := val.val[len(hostval):]
-		val.val = hostval
-		p.config.Hosts = append(p.config.Hosts, &Host{
-			Patterns:           patterns,
-			Nodes:              make([]Node, 0),
-			EOLComment:         comment,
-			spaceBeforeComment: spaceBeforeComment,
-			hasEquals:          hasEquals,
-		})
-		return p.parseStart
-	}
-	lastHost := p.config.Hosts[len(p.config.Hosts)-1]
-	if strings.ToLower(key.val) == "include" {
-		inc, err := NewInclude(strings.Split(val.val, " "), hasEquals, key.Position, comment, p.system, p.depth+1)
-		if err == ErrDepthExceeded {
-			p.raiseError(val, err)
-			return nil
-		}
-		if err != nil {
-			p.raiseErrorf(val, "Error parsing Include directive: %v", err)
-			return nil
-		}
-		lastHost.Nodes = append(lastHost.Nodes, inc)
-		return p.parseStart
-	}
-	shortval := strings.TrimRightFunc(val.val, unicode.IsSpace)
-	spaceAfterValue := val.val[len(shortval):]
-	kv := &KV{
-		Key:             key.val,
-		Value:           shortval,
-		spaceAfterValue: spaceAfterValue,
-		Comment:         comment,
-		hasEquals:       hasEquals,
-		leadingSpace:    key.Position.Col - 1,
-		position:        key.Position,
-	}
-	lastHost.Nodes = append(lastHost.Nodes, kv)
-	return p.parseStart
-}
-
-func (p *sshParser) parseComment() sshParserStateFn {
-	comment := p.getToken()
-	lastHost := p.config.Hosts[len(p.config.Hosts)-1]
-	lastHost.Nodes = append(lastHost.Nodes, &Empty{
-		Comment: comment.val,
-		// account for the "#" as well
-		leadingSpace: comment.Position.Col - 2,
-		position:     comment.Position,
-	})
-	return p.parseStart
-}
-
-func parseSSH(flow chan token, system bool, depth uint8) *Config {
-	// Ensure we consume tokens to completion even if parser exits early
-	defer func() {
-		for range flow {
-		}
-	}()
-
-	result := newConfig()
-	result.position = Position{1, 1}
-	parser := &sshParser{
-		flow:          flow,
-		config:        result,
-		tokensBuffer:  make([]token, 0),
-		currentTable:  make([]string, 0),
-		seenTableKeys: make([]string, 0),
-		system:        system,
-		depth:         depth,
-	}
-	parser.run()
-	return result
-}
diff --git a/vendor/github.com/kevinburke/ssh_config/position.go b/vendor/github.com/kevinburke/ssh_config/position.go
deleted file mode 100644
index e0b5e3fb3..000000000
--- a/vendor/github.com/kevinburke/ssh_config/position.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package ssh_config
-
-import "fmt"
-
-// Position of a document element within a SSH document.
-//
-// Line and Col are both 1-indexed positions for the element's line number and
-// column number, respectively.  Values of zero or less will cause Invalid(),
-// to return true.
-type Position struct {
-	Line int // line within the document
-	Col  int // column within the line
-}
-
-// String representation of the position.
-// Displays 1-indexed line and column numbers.
-func (p Position) String() string {
-	return fmt.Sprintf("(%d, %d)", p.Line, p.Col)
-}
-
-// Invalid returns whether or not the position is valid (i.e. with negative or
-// null values)
-func (p Position) Invalid() bool {
-	return p.Line <= 0 || p.Col <= 0
-}
diff --git a/vendor/github.com/kevinburke/ssh_config/token.go b/vendor/github.com/kevinburke/ssh_config/token.go
deleted file mode 100644
index a0ecbb2bb..000000000
--- a/vendor/github.com/kevinburke/ssh_config/token.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package ssh_config
-
-import "fmt"
-
-type token struct {
-	Position
-	typ tokenType
-	val string
-}
-
-func (t token) String() string {
-	switch t.typ {
-	case tokenEOF:
-		return "EOF"
-	}
-	return fmt.Sprintf("%q", t.val)
-}
-
-type tokenType int
-
-const (
-	eof = -(iota + 1)
-)
-
-const (
-	tokenError tokenType = iota
-	tokenEOF
-	tokenEmptyLine
-	tokenComment
-	tokenKey
-	tokenEquals
-	tokenString
-)
-
-func isSpace(r rune) bool {
-	return r == ' ' || r == '\t'
-}
-
-func isKeyStartChar(r rune) bool {
-	return !(isSpace(r) || r == '\r' || r == '\n' || r == eof)
-}
-
-// I'm not sure that this is correct
-func isKeyChar(r rune) bool {
-	// Keys start with the first character that isn't whitespace or [ and end
-	// with the last non-whitespace character before the equals sign. Keys
-	// cannot contain a # character."
-	return !(r == '\r' || r == '\n' || r == eof || r == '=')
-}
diff --git a/vendor/github.com/kevinburke/ssh_config/validators.go b/vendor/github.com/kevinburke/ssh_config/validators.go
deleted file mode 100644
index 5977f9096..000000000
--- a/vendor/github.com/kevinburke/ssh_config/validators.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package ssh_config
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// Default returns the default value for the given keyword, for example "22" if
-// the keyword is "Port". Default returns the empty string if the keyword has no
-// default, or if the keyword is unknown. Keyword matching is case-insensitive.
-//
-// Default values are provided by OpenSSH_7.4p1 on a Mac.
-func Default(keyword string) string {
-	return defaults[strings.ToLower(keyword)]
-}
-
-// Arguments where the value must be "yes" or "no" and *only* yes or no.
-var yesnos = map[string]bool{
-	strings.ToLower("BatchMode"):                        true,
-	strings.ToLower("CanonicalizeFallbackLocal"):        true,
-	strings.ToLower("ChallengeResponseAuthentication"):  true,
-	strings.ToLower("CheckHostIP"):                      true,
-	strings.ToLower("ClearAllForwardings"):              true,
-	strings.ToLower("Compression"):                      true,
-	strings.ToLower("EnableSSHKeysign"):                 true,
-	strings.ToLower("ExitOnForwardFailure"):             true,
-	strings.ToLower("ForwardAgent"):                     true,
-	strings.ToLower("ForwardX11"):                       true,
-	strings.ToLower("ForwardX11Trusted"):                true,
-	strings.ToLower("GatewayPorts"):                     true,
-	strings.ToLower("GSSAPIAuthentication"):             true,
-	strings.ToLower("GSSAPIDelegateCredentials"):        true,
-	strings.ToLower("HostbasedAuthentication"):          true,
-	strings.ToLower("IdentitiesOnly"):                   true,
-	strings.ToLower("KbdInteractiveAuthentication"):     true,
-	strings.ToLower("NoHostAuthenticationForLocalhost"): true,
-	strings.ToLower("PasswordAuthentication"):           true,
-	strings.ToLower("PermitLocalCommand"):               true,
-	strings.ToLower("PubkeyAuthentication"):             true,
-	strings.ToLower("RhostsRSAAuthentication"):          true,
-	strings.ToLower("RSAAuthentication"):                true,
-	strings.ToLower("StreamLocalBindUnlink"):            true,
-	strings.ToLower("TCPKeepAlive"):                     true,
-	strings.ToLower("UseKeychain"):                      true,
-	strings.ToLower("UsePrivilegedPort"):                true,
-	strings.ToLower("VisualHostKey"):                    true,
-}
-
-var uints = map[string]bool{
-	strings.ToLower("CanonicalizeMaxDots"):     true,
-	strings.ToLower("CompressionLevel"):        true, // 1 to 9
-	strings.ToLower("ConnectionAttempts"):      true,
-	strings.ToLower("ConnectTimeout"):          true,
-	strings.ToLower("NumberOfPasswordPrompts"): true,
-	strings.ToLower("Port"):                    true,
-	strings.ToLower("ServerAliveCountMax"):     true,
-	strings.ToLower("ServerAliveInterval"):     true,
-}
-
-func mustBeYesOrNo(lkey string) bool {
-	return yesnos[lkey]
-}
-
-func mustBeUint(lkey string) bool {
-	return uints[lkey]
-}
-
-func validate(key, val string) error {
-	lkey := strings.ToLower(key)
-	if mustBeYesOrNo(lkey) && (val != "yes" && val != "no") {
-		return fmt.Errorf("ssh_config: value for key %q must be 'yes' or 'no', got %q", key, val)
-	}
-	if mustBeUint(lkey) {
-		_, err := strconv.ParseUint(val, 10, 64)
-		if err != nil {
-			return fmt.Errorf("ssh_config: %v", err)
-		}
-	}
-	return nil
-}
-
-var defaults = map[string]string{
-	strings.ToLower("AddKeysToAgent"):                  "no",
-	strings.ToLower("AddressFamily"):                   "any",
-	strings.ToLower("BatchMode"):                       "no",
-	strings.ToLower("CanonicalizeFallbackLocal"):       "yes",
-	strings.ToLower("CanonicalizeHostname"):            "no",
-	strings.ToLower("CanonicalizeMaxDots"):             "1",
-	strings.ToLower("ChallengeResponseAuthentication"): "yes",
-	strings.ToLower("CheckHostIP"):                     "yes",
-	// TODO is this still the correct cipher
-	strings.ToLower("Cipher"):                    "3des",
-	strings.ToLower("Ciphers"):                   "chacha20-poly1305@openssh.com,aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,aes128-cbc,aes192-cbc,aes256-cbc",
-	strings.ToLower("ClearAllForwardings"):       "no",
-	strings.ToLower("Compression"):               "no",
-	strings.ToLower("CompressionLevel"):          "6",
-	strings.ToLower("ConnectionAttempts"):        "1",
-	strings.ToLower("ControlMaster"):             "no",
-	strings.ToLower("EnableSSHKeysign"):          "no",
-	strings.ToLower("EscapeChar"):                "~",
-	strings.ToLower("ExitOnForwardFailure"):      "no",
-	strings.ToLower("FingerprintHash"):           "sha256",
-	strings.ToLower("ForwardAgent"):              "no",
-	strings.ToLower("ForwardX11"):                "no",
-	strings.ToLower("ForwardX11Timeout"):         "20m",
-	strings.ToLower("ForwardX11Trusted"):         "no",
-	strings.ToLower("GatewayPorts"):              "no",
-	strings.ToLower("GlobalKnownHostsFile"):      "/etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2",
-	strings.ToLower("GSSAPIAuthentication"):      "no",
-	strings.ToLower("GSSAPIDelegateCredentials"): "no",
-	strings.ToLower("HashKnownHosts"):            "no",
-	strings.ToLower("HostbasedAuthentication"):   "no",
-
-	strings.ToLower("HostbasedKeyTypes"): "ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-ed25519,ssh-rsa",
-	strings.ToLower("HostKeyAlgorithms"): "ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-ed25519,ssh-rsa",
-	// HostName has a dynamic default (the value passed at the command line).
-
-	strings.ToLower("IdentitiesOnly"): "no",
-	strings.ToLower("IdentityFile"):   "~/.ssh/identity",
-
-	// IPQoS has a dynamic default based on interactive or non-interactive
-	// sessions.
-
-	strings.ToLower("KbdInteractiveAuthentication"): "yes",
-
-	strings.ToLower("KexAlgorithms"): "curve25519-sha256,curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1",
-	strings.ToLower("LogLevel"):      "INFO",
-	strings.ToLower("MACs"):          "umac-64-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,umac-64@openssh.com,umac-128@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1",
-
-	strings.ToLower("NoHostAuthenticationForLocalhost"): "no",
-	strings.ToLower("NumberOfPasswordPrompts"):          "3",
-	strings.ToLower("PasswordAuthentication"):           "yes",
-	strings.ToLower("PermitLocalCommand"):               "no",
-	strings.ToLower("Port"):                             "22",
-
-	strings.ToLower("PreferredAuthentications"): "gssapi-with-mic,hostbased,publickey,keyboard-interactive,password",
-	strings.ToLower("Protocol"):                 "2",
-	strings.ToLower("ProxyUseFdpass"):           "no",
-	strings.ToLower("PubkeyAcceptedKeyTypes"):   "ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-ed25519,ssh-rsa",
-	strings.ToLower("PubkeyAuthentication"):     "yes",
-	strings.ToLower("RekeyLimit"):               "default none",
-	strings.ToLower("RhostsRSAAuthentication"):  "no",
-	strings.ToLower("RSAAuthentication"):        "yes",
-
-	strings.ToLower("ServerAliveCountMax"):   "3",
-	strings.ToLower("ServerAliveInterval"):   "0",
-	strings.ToLower("StreamLocalBindMask"):   "0177",
-	strings.ToLower("StreamLocalBindUnlink"): "no",
-	strings.ToLower("StrictHostKeyChecking"): "ask",
-	strings.ToLower("TCPKeepAlive"):          "yes",
-	strings.ToLower("Tunnel"):                "no",
-	strings.ToLower("TunnelDevice"):          "any:any",
-	strings.ToLower("UpdateHostKeys"):        "no",
-	strings.ToLower("UseKeychain"):           "no",
-	strings.ToLower("UsePrivilegedPort"):     "no",
-
-	strings.ToLower("UserKnownHostsFile"): "~/.ssh/known_hosts ~/.ssh/known_hosts2",
-	strings.ToLower("VerifyHostKeyDNS"):   "no",
-	strings.ToLower("VisualHostKey"):      "no",
-	strings.ToLower("XAuthLocation"):      "/usr/X11R6/bin/xauth",
-}
-
-// these identities are used for SSH protocol 2
-var defaultProtocol2Identities = []string{
-	"~/.ssh/id_dsa",
-	"~/.ssh/id_ecdsa",
-	"~/.ssh/id_ed25519",
-	"~/.ssh/id_rsa",
-}
-
-// these directives support multiple items that can be collected
-// across multiple files
-var pluralDirectives = map[string]bool{
-	"CertificateFile": true,
-	"IdentityFile":    true,
-	"DynamicForward":  true,
-	"RemoteForward":   true,
-	"SendEnv":         true,
-	"SetEnv":          true,
-}
-
-// SupportsMultiple reports whether a directive can be specified multiple times.
-func SupportsMultiple(key string) bool {
-	return pluralDirectives[strings.ToLower(key)]
-}
diff --git a/vendor/github.com/kyokomi/emoji/v2/README.md b/vendor/github.com/kyokomi/emoji/v2/README.md
index e60459859..7cf9ba575 100644
--- a/vendor/github.com/kyokomi/emoji/v2/README.md
+++ b/vendor/github.com/kyokomi/emoji/v2/README.md
@@ -1,7 +1,7 @@
 # Emoji
 Emoji is a simple golang package.
 
-[![wercker status](https://app.wercker.com/status/7bef60de2c6d3e0e6c13d56b2393c5d8/s/master "wercker status")](https://app.wercker.com/project/byKey/7bef60de2c6d3e0e6c13d56b2393c5d8)
+![master workflow](https://github.com/kyokomi/emoji/actions/workflows/go.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/kyokomi/emoji/badge.png?branch=master)](https://coveralls.io/r/kyokomi/emoji?branch=master)
 [![GoDoc](https://pkg.go.dev/badge/github.com/kyokomi/emoji.svg)](https://pkg.go.dev/github.com/kyokomi/emoji/v2)
 
diff --git a/vendor/github.com/kyokomi/emoji/v2/emoji.go b/vendor/github.com/kyokomi/emoji/v2/emoji.go
index 6913a2ea4..e825ebd0b 100644
--- a/vendor/github.com/kyokomi/emoji/v2/emoji.go
+++ b/vendor/github.com/kyokomi/emoji/v2/emoji.go
@@ -49,7 +49,8 @@ func NormalizeShortCode(shortCode string) string {
 // regular expression that matches :flag-[countrycode]:
 var flagRegexp = regexp.MustCompile(":flag-([a-z]{2}):")
 
-func emojize(x string) string {
+// Emojize Converts the string passed as an argument to a emoji. For unsupported emoji, the string passed as an argument is returned as is.
+func Emojize(x string) string {
 	str, ok := emojiCode()[x]
 	if ok {
 		return str + ReplacePadding
@@ -65,17 +66,17 @@ func regionalIndicator(i byte) string {
 	return string('\U0001F1E6' + rune(i) - 'a')
 }
 
-func replaseEmoji(input *bytes.Buffer) string {
+func replaceEmoji(input *bytes.Buffer) string {
 	emoji := bytes.NewBufferString(":")
 	for {
 		i, _, err := input.ReadRune()
 		if err != nil {
-			// not replase
+			// not replace
 			return emoji.String()
 		}
 
 		if i == ':' && emoji.Len() == 1 {
-			return emoji.String() + replaseEmoji(input)
+			return emoji.String() + replaceEmoji(input)
 		}
 
 		emoji.WriteRune(i)
@@ -83,7 +84,7 @@ func replaseEmoji(input *bytes.Buffer) string {
 		case unicode.IsSpace(i):
 			return emoji.String()
 		case i == ':':
-			return emojize(emoji.String())
+			return Emojize(emoji.String())
 		}
 	}
 }
@@ -105,7 +106,7 @@ func compile(x string) string {
 		default:
 			output.WriteRune(i)
 		case ':':
-			output.WriteString(replaseEmoji(input))
+			output.WriteString(replaceEmoji(input))
 		}
 	}
 	return output.String()
diff --git a/vendor/github.com/kyokomi/emoji/v2/emoji_codemap.go b/vendor/github.com/kyokomi/emoji/v2/emoji_codemap.go
index 9a9d73b05..017a5c478 100644
--- a/vendor/github.com/kyokomi/emoji/v2/emoji_codemap.go
+++ b/vendor/github.com/kyokomi/emoji/v2/emoji_codemap.go
@@ -62,6 +62,7 @@ func emojiCode() map[string]string {
 			":Leo:":                                "\u264c",
 			":Libra:":                              "\u264e",
 			":Mrs._Claus:":                         "\U0001f936",
+			":Mx_Claus:":                           "\U0001f9d1\u200d\U0001f384",
 			":NEW_button:":                         "\U0001f195",
 			":NG_button:":                          "\U0001f196",
 			":OK_button:":                          "\U0001f197",
@@ -84,6 +85,7 @@ func emojiCode() map[string]string {
 			":UP!_button:":                         "\U0001f199",
 			":VS_button:":                          "\U0001f19a",
 			":Virgo:":                              "\u264d",
+			":ZZZ:":                                "\U0001f4a4",
 			":a:":                                  "\U0001f170\ufe0f",
 			":ab:":                                 "\U0001f18e",
 			":abacus:":                             "\U0001f9ee",
@@ -219,6 +221,7 @@ func emojiCode() map[string]string {
 			":bald_man:":                           "\U0001f468\u200d\U0001f9b2",
 			":bald_person:":                        "\U0001f9d1\u200d\U0001f9b2",
 			":bald_woman:":                         "\U0001f469\u200d\U0001f9b2",
+			":ballet_dancer:":                      "\U0001f9d1\u200d\U0001fa70",
 			":ballet_shoes:":                       "\U0001fa70",
 			":balloon:":                            "\U0001f388",
 			":ballot_box:":                         "\U0001f5f3",
@@ -253,6 +256,7 @@ func emojiCode() map[string]string {
 			":beach_umbrella:":                     "\u26f1",
 			":beach_with_umbrella:":                "\U0001f3d6\ufe0f",
 			":beaming_face_with_smiling_eyes:":     "\U0001f601",
+			":beans:":                              "\U0001fad8",
 			":bear:":                               "\U0001f43b",
 			":bearded_person:":                     "\U0001f9d4",
 			":bearded_person_tone1:":               "\U0001f9d4\U0001f3fb",
@@ -296,6 +300,8 @@ func emojiCode() map[string]string {
 			":birthday:":                           "\U0001f382",
 			":birthday_cake:":                      "\U0001f382",
 			":bison:":                              "\U0001f9ac",
+			":biting_lip:":                         "\U0001fae6",
+			":black_bird:":                         "\U0001f426\u200d\u2b1b",
 			":black_cat:":                          "\U0001f408\u200d\u2b1b",
 			":black_circle:":                       "\u26ab",
 			":black_circle_for_record:":            "\u23fa\ufe0f",
@@ -365,7 +371,7 @@ func emojiCode() map[string]string {
 			":bouncing_ball_woman:":                                    "\u26f9\ufe0f\u200d\u2640\ufe0f",
 			":bouquet:":                                                "\U0001f490",
 			":bouvet_island:":                                          "\U0001f1e7\U0001f1fb",
-			":bow:":                                                    "\U0001f647\u200d\u2642\ufe0f",
+			":bow:":                                                    "\U0001f647",
 			":bow_and_arrow:":                                          "\U0001f3f9",
 			":bowing_man:":                                             "\U0001f647\u200d\u2642\ufe0f",
 			":bowing_woman:":                                           "\U0001f647\u200d\u2640\ufe0f",
@@ -403,13 +409,16 @@ func emojiCode() map[string]string {
 			":british_indian_ocean_territory:":                         "\U0001f1ee\U0001f1f4",
 			":british_virgin_islands:":                                 "\U0001f1fb\U0001f1ec",
 			":broccoli:":                                               "\U0001f966",
+			":broken_chain:":                                           "\u26d3\ufe0f\u200d\U0001f4a5",
 			":broken_heart:":                                           "\U0001f494",
 			":broom:":                                                  "\U0001f9f9",
 			":brown_circle:":                                           "\U0001f7e4",
 			":brown_heart:":                                            "\U0001f90e",
+			":brown_mushroom:":                                         "\U0001f344\u200d\U0001f7eb",
 			":brown_square:":                                           "\U0001f7eb",
 			":brunei:":                                                 "\U0001f1e7\U0001f1f3",
 			":bubble_tea:":                                             "\U0001f9cb",
+			":bubbles:":                                                "\U0001fae7",
 			":bucket:":                                                 "\U0001faa3",
 			":bug:":                                                    "\U0001f41b",
 			":building_construction:":                                  "\U0001f3d7\ufe0f",
@@ -639,6 +648,7 @@ func emojiCode() map[string]string {
 			":cool:":                                                   "\U0001f192",
 			":cop:":                                                    "\U0001f46e\u200d\u2642\ufe0f",
 			":copyright:":                                              "\u00a9\ufe0f",
+			":coral:":                                                  "\U0001fab8",
 			":corn:":                                                   "\U0001f33d",
 			":costa_rica:":                                             "\U0001f1e8\U0001f1f7",
 			":cote_divoire:":                                           "\U0001f1e8\U0001f1ee",
@@ -647,12 +657,12 @@ func emojiCode() map[string]string {
 			":counterclockwise_arrows_button:":                         "\U0001f504",
 			":couple:":                                                 "\U0001f46b",
 			":couple_mm:":                                              "\U0001f468\u200d\u2764\ufe0f\u200d\U0001f468",
-			":couple_with_heart:":                                      "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f468",
+			":couple_with_heart:":                                      "\U0001f491",
 			":couple_with_heart_man_man:":                              "\U0001f468\u200d\u2764\ufe0f\u200d\U0001f468",
 			":couple_with_heart_woman_man:":                            "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f468",
 			":couple_with_heart_woman_woman:":                          "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f469",
 			":couple_ww:":                                              "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f469",
-			":couplekiss:":                                             "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468",
+			":couplekiss:":                                             "\U0001f48f",
 			":couplekiss_man_man:":                                     "\U0001f468\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468",
 			":couplekiss_man_woman:":                                   "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468",
 			":couplekiss_woman_woman:":                                 "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f469",
@@ -680,6 +690,7 @@ func emojiCode() map[string]string {
 			":crossed_swords:":                                         "\u2694\ufe0f",
 			":crown:":                                                  "\U0001f451",
 			":cruise_ship:":                                            "\U0001f6f3",
+			":crutch:":                                                 "\U0001fa7c",
 			":cry:":                                                    "\U0001f622",
 			":crying_cat:":                                             "\U0001f63f",
 			":crying_cat_face:":                                        "\U0001f63f",
@@ -755,6 +766,7 @@ func emojiCode() map[string]string {
 			":disappointed_face:":                                      "\U0001f61e",
 			":disappointed_relieved:":                                  "\U0001f625",
 			":disguised_face:":                                         "\U0001f978",
+			":distorted_face:":                                         "\U0001faea",
 			":divide:":                                                 "\u2797",
 			":dividers:":                                               "\U0001f5c2",
 			":diving_mask:":                                            "\U0001f93f",
@@ -774,7 +786,9 @@ func emojiCode() map[string]string {
 			":dolphin:":                                                "\U0001f42c",
 			":dominica:":                                               "\U0001f1e9\U0001f1f2",
 			":dominican_republic:":                                     "\U0001f1e9\U0001f1f4",
+			":donkey:":                                                 "\U0001facf",
 			":door:":                                                   "\U0001f6aa",
+			":dotted_line_face:":                                       "\U0001fae5",
 			":dotted_six-pointed_star:":                                "\U0001f52f",
 			":double_curly_loop:":                                      "\u27bf",
 			":double_exclamation_mark:":                                "\u203c",
@@ -841,8 +855,10 @@ func emojiCode() map[string]string {
 			":elf_tone5:":                                              "\U0001f9dd\U0001f3ff",
 			":elf_woman:":                                              "\U0001f9dd\u200d\u2640\ufe0f",
 			":email:":                                                  "\u2709\ufe0f",
+			":empty_nest:":                                             "\U0001fab9",
 			":end:":                                                    "\U0001f51a",
 			":england:":                                                "\U0001f3f4\U000e0067\U000e0062\U000e0065\U000e006e\U000e0067\U000e007f",
+			":enraged_face:":                                           "\U0001f621",
 			":envelope:":                                               "\u2709",
 			":envelope_with_arrow:":                                    "\U0001f4e9",
 			":equatorial_guinea:":                                      "\U0001f1ec\U0001f1f6",
@@ -871,630 +887,644 @@ func emojiCode() map[string]string {
 			":eyes:":                                                   "\U0001f440",
 			":face_blowing_a_kiss:":                                    "\U0001f618",
 			":face_exhaling:":                                          "\U0001f62e\u200d\U0001f4a8",
+			":face_holding_back_tears:":                                "\U0001f979",
 			":face_in_clouds:":                                         "\U0001f636\u200d\U0001f32b\ufe0f",
 			":face_palm:":                                              "\U0001f926",
 			":face_savoring_food:":                                     "\U0001f60b",
 			":face_screaming_in_fear:":                                 "\U0001f631",
 			":face_vomiting:":                                          "\U0001f92e",
+			":face_with_bags_under_eyes:":                              "\U0001fae9",
 			":face_with_cowboy_hat:":                                   "\U0001f920",
+			":face_with_crossed-out_eyes:":                             "\U0001f635",
+			":face_with_diagonal_mouth:":                               "\U0001fae4",
 			":face_with_hand_over_mouth:":                              "\U0001f92d",
 			":face_with_head-bandage:":                                 "\U0001f915",
 			":face_with_head_bandage:":                                 "\U0001f915",
 			":face_with_medical_mask:":                                 "\U0001f637",
 			":face_with_monocle:":                                      "\U0001f9d0",
-			":face_with_open_mouth:":                                   "\U0001f62e",
-			":face_with_raised_eyebrow:":                               "\U0001f928",
-			":face_with_rolling_eyes:":                                 "\U0001f644",
-			":face_with_spiral_eyes:":                                  "\U0001f635\u200d\U0001f4ab",
-			":face_with_steam_from_nose:":                              "\U0001f624",
-			":face_with_symbols_on_mouth:":                             "\U0001f92c",
-			":face_with_symbols_over_mouth:":                           "\U0001f92c",
-			":face_with_tears_of_joy:":                                 "\U0001f602",
-			":face_with_thermometer:":                                  "\U0001f912",
-			":face_with_tongue:":                                       "\U0001f61b",
-			":face_without_mouth:":                                     "\U0001f636",
-			":facepalm:":                                               "\U0001f926",
-			":facepunch:":                                              "\U0001f44a",
-			":factory:":                                                "\U0001f3ed",
-			":factory_worker:":                                         "\U0001f9d1\u200d\U0001f3ed",
-			":fairy:":                                                  "\U0001f9da\u200d\u2640\ufe0f",
-			":fairy_man:":                                              "\U0001f9da\u200d\u2642\ufe0f",
-			":fairy_tone1:":                                            "\U0001f9da\U0001f3fb",
-			":fairy_tone2:":                                            "\U0001f9da\U0001f3fc",
-			":fairy_tone3:":                                            "\U0001f9da\U0001f3fd",
-			":fairy_tone4:":                                            "\U0001f9da\U0001f3fe",
-			":fairy_tone5:":                                            "\U0001f9da\U0001f3ff",
-			":fairy_woman:":                                            "\U0001f9da\u200d\u2640\ufe0f",
-			":falafel:":                                                "\U0001f9c6",
-			":falkland_islands:":                                       "\U0001f1eb\U0001f1f0",
-			":fallen_leaf:":                                            "\U0001f342",
-			":family:":                                                 "\U0001f468\u200d\U0001f469\u200d\U0001f466",
-			":family_man_boy:":                                         "\U0001f468\u200d\U0001f466",
-			":family_man_boy_boy:":                                     "\U0001f468\u200d\U0001f466\u200d\U0001f466",
-			":family_man_girl:":                                        "\U0001f468\u200d\U0001f467",
-			":family_man_girl_boy:":                                    "\U0001f468\u200d\U0001f467\u200d\U0001f466",
-			":family_man_girl_girl:":                                   "\U0001f468\u200d\U0001f467\u200d\U0001f467",
-			":family_man_man_boy:":                                     "\U0001f468\u200d\U0001f468\u200d\U0001f466",
-			":family_man_man_boy_boy:":                                 "\U0001f468\u200d\U0001f468\u200d\U0001f466\u200d\U0001f466",
-			":family_man_man_girl:":                                    "\U0001f468\u200d\U0001f468\u200d\U0001f467",
-			":family_man_man_girl_boy:":                                "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f466",
-			":family_man_man_girl_girl:":                               "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f467",
-			":family_man_woman_boy:":                                   "\U0001f468\u200d\U0001f469\u200d\U0001f466",
-			":family_man_woman_boy_boy:":                               "\U0001f468\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":family_man_woman_girl:":                                  "\U0001f468\u200d\U0001f469\u200d\U0001f467",
-			":family_man_woman_girl_boy:":                              "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":family_man_woman_girl_girl:":                             "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":family_mmb:":                                             "\U0001f468\u200d\U0001f468\u200d\U0001f466",
-			":family_mmbb:":                                            "\U0001f468\u200d\U0001f468\u200d\U0001f466\u200d\U0001f466",
-			":family_mmg:":                                             "\U0001f468\u200d\U0001f468\u200d\U0001f467",
-			":family_mmgb:":                                            "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f466",
-			":family_mmgg:":                                            "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f467",
-			":family_mwbb:":                                            "\U0001f468\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":family_mwg:":                                             "\U0001f468\u200d\U0001f469\u200d\U0001f467",
-			":family_mwgb:":                                            "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":family_mwgg:":                                            "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":family_woman_boy:":                                       "\U0001f469\u200d\U0001f466",
-			":family_woman_boy_boy:":                                   "\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":family_woman_girl:":                                      "\U0001f469\u200d\U0001f467",
-			":family_woman_girl_boy:":                                  "\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":family_woman_girl_girl:":                                 "\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":family_woman_woman_boy:":                                 "\U0001f469\u200d\U0001f469\u200d\U0001f466",
-			":family_woman_woman_boy_boy:":                             "\U0001f469\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":family_woman_woman_girl:":                                "\U0001f469\u200d\U0001f469\u200d\U0001f467",
-			":family_woman_woman_girl_boy:":                            "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":family_woman_woman_girl_girl:":                           "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":family_wwb:":                                             "\U0001f469\u200d\U0001f469\u200d\U0001f466",
-			":family_wwbb:":                                            "\U0001f469\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":family_wwg:":                                             "\U0001f469\u200d\U0001f469\u200d\U0001f467",
-			":family_wwgb:":                                            "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":family_wwgg:":                                            "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":farmer:":                                                 "\U0001f9d1\u200d\U0001f33e",
-			":faroe_islands:":                                          "\U0001f1eb\U0001f1f4",
-			":fast-forward_button:":                                    "\u23e9",
-			":fast_down_button:":                                       "\u23ec",
-			":fast_forward:":                                           "\u23e9",
-			":fast_reverse_button:":                                    "\u23ea",
-			":fast_up_button:":                                         "\u23eb",
-			":fax:":                                                    "\U0001f4e0",
-			":fax_machine:":                                            "\U0001f4e0",
-			":fearful:":                                                "\U0001f628",
-			":fearful_face:":                                           "\U0001f628",
-			":feather:":                                                "\U0001fab6",
-			":feet:":                                                   "\U0001f43e",
-			":female-artist:":                                          "\U0001f469\u200d\U0001f3a8",
-			":female-astronaut:":                                       "\U0001f469\u200d\U0001f680",
-			":female-construction-worker:":                             "\U0001f477\u200d\u2640\ufe0f",
-			":female-cook:":                                            "\U0001f469\u200d\U0001f373",
-			":female-detective:":                                       "\U0001f575\ufe0f\u200d\u2640\ufe0f",
-			":female-doctor:":                                          "\U0001f469\u200d\u2695\ufe0f",
-			":female-factory-worker:":                                  "\U0001f469\u200d\U0001f3ed",
-			":female-farmer:":                                          "\U0001f469\u200d\U0001f33e",
-			":female-firefighter:":                                     "\U0001f469\u200d\U0001f692",
-			":female-guard:":                                           "\U0001f482\u200d\u2640\ufe0f",
-			":female-judge:":                                           "\U0001f469\u200d\u2696\ufe0f",
-			":female-mechanic:":                                        "\U0001f469\u200d\U0001f527",
-			":female-office-worker:":                                   "\U0001f469\u200d\U0001f4bc",
-			":female-pilot:":                                           "\U0001f469\u200d\u2708\ufe0f",
-			":female-police-officer:":                                  "\U0001f46e\u200d\u2640\ufe0f",
-			":female-scientist:":                                       "\U0001f469\u200d\U0001f52c",
-			":female-singer:":                                          "\U0001f469\u200d\U0001f3a4",
-			":female-student:":                                         "\U0001f469\u200d\U0001f393",
-			":female-teacher:":                                         "\U0001f469\u200d\U0001f3eb",
-			":female-technologist:":                                    "\U0001f469\u200d\U0001f4bb",
-			":female_detective:":                                       "\U0001f575\ufe0f\u200d\u2640\ufe0f",
-			":female_elf:":                                             "\U0001f9dd\u200d\u2640\ufe0f",
-			":female_fairy:":                                           "\U0001f9da\u200d\u2640\ufe0f",
-			":female_genie:":                                           "\U0001f9de\u200d\u2640\ufe0f",
-			":female_mage:":                                            "\U0001f9d9\u200d\u2640\ufe0f",
-			":female_sign:":                                            "\u2640\ufe0f",
-			":female_superhero:":                                       "\U0001f9b8\u200d\u2640\ufe0f",
-			":female_supervillain:":                                    "\U0001f9b9\u200d\u2640\ufe0f",
-			":female_vampire:":                                         "\U0001f9db\u200d\u2640\ufe0f",
-			":female_zombie:":                                          "\U0001f9df\u200d\u2640\ufe0f",
-			":fencer:":                                                 "\U0001f93a",
-			":ferris_wheel:":                                           "\U0001f3a1",
-			":ferry:":                                                  "\u26f4\ufe0f",
-			":field_hockey:":                                           "\U0001f3d1",
-			":field_hockey_stick_and_ball:":                            "\U0001f3d1",
-			":fiji:":                                                   "\U0001f1eb\U0001f1ef",
-			":file_cabinet:":                                           "\U0001f5c4\ufe0f",
-			":file_folder:":                                            "\U0001f4c1",
-			":film_frames:":                                            "\U0001f39e\ufe0f",
-			":film_projector:":                                         "\U0001f4fd\ufe0f",
-			":film_strip:":                                             "\U0001f39e\ufe0f",
-			":fingers_crossed:":                                        "\U0001f91e",
-			":fingers_crossed_tone1:":                                  "\U0001f91e\U0001f3fb",
-			":fingers_crossed_tone2:":                                  "\U0001f91e\U0001f3fc",
-			":fingers_crossed_tone3:":                                  "\U0001f91e\U0001f3fd",
-			":fingers_crossed_tone4:":                                  "\U0001f91e\U0001f3fe",
-			":fingers_crossed_tone5:":                                  "\U0001f91e\U0001f3ff",
-			":finland:":                                                "\U0001f1eb\U0001f1ee",
-			":fire:":                                                   "\U0001f525",
-			":fire_engine:":                                            "\U0001f692",
-			":fire_extinguisher:":                                      "\U0001f9ef",
-			":firecracker:":                                            "\U0001f9e8",
-			":firefighter:":                                            "\U0001f9d1\u200d\U0001f692",
-			":fireworks:":                                              "\U0001f386",
-			":first_place:":                                            "\U0001f947",
-			":first_place_medal:":                                      "\U0001f947",
-			":first_quarter_moon:":                                     "\U0001f313",
-			":first_quarter_moon_face:":                                "\U0001f31b",
-			":first_quarter_moon_with_face:":                           "\U0001f31b",
-			":fish:":                                                   "\U0001f41f",
-			":fish_cake:":                                              "\U0001f365",
-			":fish_cake_with_swirl:":                                   "\U0001f365",
-			":fishing_pole:":                                           "\U0001f3a3",
-			":fishing_pole_and_fish:":                                  "\U0001f3a3",
-			":fist:":                                                   "\u270a",
-			":fist_left:":                                              "\U0001f91b",
-			":fist_oncoming:":                                          "\U0001f44a",
-			":fist_raised:":                                            "\u270a",
-			":fist_right:":                                             "\U0001f91c",
-			":fist_tone1:":                                             "\u270a\U0001f3fb",
-			":fist_tone2:":                                             "\u270a\U0001f3fc",
-			":fist_tone3:":                                             "\u270a\U0001f3fd",
-			":fist_tone4:":                                             "\u270a\U0001f3fe",
-			":fist_tone5:":                                             "\u270a\U0001f3ff",
-			":five:":                                                   "5\ufe0f\u20e3",
-			":five-thirty:":                                            "\U0001f560",
-			":five_o’clock:":                                           "\U0001f554",
-			":flag-ac:":                                                "\U0001f1e6\U0001f1e8",
-			":flag-ad:":                                                "\U0001f1e6\U0001f1e9",
-			":flag-ae:":                                                "\U0001f1e6\U0001f1ea",
-			":flag-af:":                                                "\U0001f1e6\U0001f1eb",
-			":flag-ag:":                                                "\U0001f1e6\U0001f1ec",
-			":flag-ai:":                                                "\U0001f1e6\U0001f1ee",
-			":flag-al:":                                                "\U0001f1e6\U0001f1f1",
-			":flag-am:":                                                "\U0001f1e6\U0001f1f2",
-			":flag-ao:":                                                "\U0001f1e6\U0001f1f4",
-			":flag-aq:":                                                "\U0001f1e6\U0001f1f6",
-			":flag-ar:":                                                "\U0001f1e6\U0001f1f7",
-			":flag-as:":                                                "\U0001f1e6\U0001f1f8",
-			":flag-at:":                                                "\U0001f1e6\U0001f1f9",
-			":flag-au:":                                                "\U0001f1e6\U0001f1fa",
-			":flag-aw:":                                                "\U0001f1e6\U0001f1fc",
-			":flag-ax:":                                                "\U0001f1e6\U0001f1fd",
-			":flag-az:":                                                "\U0001f1e6\U0001f1ff",
-			":flag-ba:":                                                "\U0001f1e7\U0001f1e6",
-			":flag-bb:":                                                "\U0001f1e7\U0001f1e7",
-			":flag-bd:":                                                "\U0001f1e7\U0001f1e9",
-			":flag-be:":                                                "\U0001f1e7\U0001f1ea",
-			":flag-bf:":                                                "\U0001f1e7\U0001f1eb",
-			":flag-bg:":                                                "\U0001f1e7\U0001f1ec",
-			":flag-bh:":                                                "\U0001f1e7\U0001f1ed",
-			":flag-bi:":                                                "\U0001f1e7\U0001f1ee",
-			":flag-bj:":                                                "\U0001f1e7\U0001f1ef",
-			":flag-bl:":                                                "\U0001f1e7\U0001f1f1",
-			":flag-bm:":                                                "\U0001f1e7\U0001f1f2",
-			":flag-bn:":                                                "\U0001f1e7\U0001f1f3",
-			":flag-bo:":                                                "\U0001f1e7\U0001f1f4",
-			":flag-bq:":                                                "\U0001f1e7\U0001f1f6",
-			":flag-br:":                                                "\U0001f1e7\U0001f1f7",
-			":flag-bs:":                                                "\U0001f1e7\U0001f1f8",
-			":flag-bt:":                                                "\U0001f1e7\U0001f1f9",
-			":flag-bv:":                                                "\U0001f1e7\U0001f1fb",
-			":flag-bw:":                                                "\U0001f1e7\U0001f1fc",
-			":flag-by:":                                                "\U0001f1e7\U0001f1fe",
-			":flag-bz:":                                                "\U0001f1e7\U0001f1ff",
-			":flag-ca:":                                                "\U0001f1e8\U0001f1e6",
-			":flag-cc:":                                                "\U0001f1e8\U0001f1e8",
-			":flag-cd:":                                                "\U0001f1e8\U0001f1e9",
-			":flag-cf:":                                                "\U0001f1e8\U0001f1eb",
-			":flag-cg:":                                                "\U0001f1e8\U0001f1ec",
-			":flag-ch:":                                                "\U0001f1e8\U0001f1ed",
-			":flag-ci:":                                                "\U0001f1e8\U0001f1ee",
-			":flag-ck:":                                                "\U0001f1e8\U0001f1f0",
-			":flag-cl:":                                                "\U0001f1e8\U0001f1f1",
-			":flag-cm:":                                                "\U0001f1e8\U0001f1f2",
-			":flag-co:":                                                "\U0001f1e8\U0001f1f4",
-			":flag-cp:":                                                "\U0001f1e8\U0001f1f5",
-			":flag-cr:":                                                "\U0001f1e8\U0001f1f7",
-			":flag-cu:":                                                "\U0001f1e8\U0001f1fa",
-			":flag-cv:":                                                "\U0001f1e8\U0001f1fb",
-			":flag-cw:":                                                "\U0001f1e8\U0001f1fc",
-			":flag-cx:":                                                "\U0001f1e8\U0001f1fd",
-			":flag-cy:":                                                "\U0001f1e8\U0001f1fe",
-			":flag-cz:":                                                "\U0001f1e8\U0001f1ff",
-			":flag-dg:":                                                "\U0001f1e9\U0001f1ec",
-			":flag-dj:":                                                "\U0001f1e9\U0001f1ef",
-			":flag-dk:":                                                "\U0001f1e9\U0001f1f0",
-			":flag-dm:":                                                "\U0001f1e9\U0001f1f2",
-			":flag-do:":                                                "\U0001f1e9\U0001f1f4",
-			":flag-dz:":                                                "\U0001f1e9\U0001f1ff",
-			":flag-ea:":                                                "\U0001f1ea\U0001f1e6",
-			":flag-ec:":                                                "\U0001f1ea\U0001f1e8",
-			":flag-ee:":                                                "\U0001f1ea\U0001f1ea",
-			":flag-eg:":                                                "\U0001f1ea\U0001f1ec",
-			":flag-eh:":                                                "\U0001f1ea\U0001f1ed",
-			":flag-england:":                                           "\U0001f3f4\U000e0067\U000e0062\U000e0065\U000e006e\U000e0067\U000e007f",
-			":flag-er:":                                                "\U0001f1ea\U0001f1f7",
-			":flag-et:":                                                "\U0001f1ea\U0001f1f9",
-			":flag-eu:":                                                "\U0001f1ea\U0001f1fa",
-			":flag-fi:":                                                "\U0001f1eb\U0001f1ee",
-			":flag-fj:":                                                "\U0001f1eb\U0001f1ef",
-			":flag-fk:":                                                "\U0001f1eb\U0001f1f0",
-			":flag-fm:":                                                "\U0001f1eb\U0001f1f2",
-			":flag-fo:":                                                "\U0001f1eb\U0001f1f4",
-			":flag-ga:":                                                "\U0001f1ec\U0001f1e6",
-			":flag-gd:":                                                "\U0001f1ec\U0001f1e9",
-			":flag-ge:":                                                "\U0001f1ec\U0001f1ea",
-			":flag-gf:":                                                "\U0001f1ec\U0001f1eb",
-			":flag-gg:":                                                "\U0001f1ec\U0001f1ec",
-			":flag-gh:":                                                "\U0001f1ec\U0001f1ed",
-			":flag-gi:":                                                "\U0001f1ec\U0001f1ee",
-			":flag-gl:":                                                "\U0001f1ec\U0001f1f1",
-			":flag-gm:":                                                "\U0001f1ec\U0001f1f2",
-			":flag-gn:":                                                "\U0001f1ec\U0001f1f3",
-			":flag-gp:":                                                "\U0001f1ec\U0001f1f5",
-			":flag-gq:":                                                "\U0001f1ec\U0001f1f6",
-			":flag-gr:":                                                "\U0001f1ec\U0001f1f7",
-			":flag-gs:":                                                "\U0001f1ec\U0001f1f8",
-			":flag-gt:":                                                "\U0001f1ec\U0001f1f9",
-			":flag-gu:":                                                "\U0001f1ec\U0001f1fa",
-			":flag-gw:":                                                "\U0001f1ec\U0001f1fc",
-			":flag-gy:":                                                "\U0001f1ec\U0001f1fe",
-			":flag-hk:":                                                "\U0001f1ed\U0001f1f0",
-			":flag-hm:":                                                "\U0001f1ed\U0001f1f2",
-			":flag-hn:":                                                "\U0001f1ed\U0001f1f3",
-			":flag-hr:":                                                "\U0001f1ed\U0001f1f7",
-			":flag-ht:":                                                "\U0001f1ed\U0001f1f9",
-			":flag-hu:":                                                "\U0001f1ed\U0001f1fa",
-			":flag-ic:":                                                "\U0001f1ee\U0001f1e8",
-			":flag-id:":                                                "\U0001f1ee\U0001f1e9",
-			":flag-ie:":                                                "\U0001f1ee\U0001f1ea",
-			":flag-il:":                                                "\U0001f1ee\U0001f1f1",
-			":flag-im:":                                                "\U0001f1ee\U0001f1f2",
-			":flag-in:":                                                "\U0001f1ee\U0001f1f3",
-			":flag-io:":                                                "\U0001f1ee\U0001f1f4",
-			":flag-iq:":                                                "\U0001f1ee\U0001f1f6",
-			":flag-ir:":                                                "\U0001f1ee\U0001f1f7",
-			":flag-is:":                                                "\U0001f1ee\U0001f1f8",
-			":flag-je:":                                                "\U0001f1ef\U0001f1ea",
-			":flag-jm:":                                                "\U0001f1ef\U0001f1f2",
-			":flag-jo:":                                                "\U0001f1ef\U0001f1f4",
-			":flag-ke:":                                                "\U0001f1f0\U0001f1ea",
-			":flag-kg:":                                                "\U0001f1f0\U0001f1ec",
-			":flag-kh:":                                                "\U0001f1f0\U0001f1ed",
-			":flag-ki:":                                                "\U0001f1f0\U0001f1ee",
-			":flag-km:":                                                "\U0001f1f0\U0001f1f2",
-			":flag-kn:":                                                "\U0001f1f0\U0001f1f3",
-			":flag-kp:":                                                "\U0001f1f0\U0001f1f5",
-			":flag-kw:":                                                "\U0001f1f0\U0001f1fc",
-			":flag-ky:":                                                "\U0001f1f0\U0001f1fe",
-			":flag-kz:":                                                "\U0001f1f0\U0001f1ff",
-			":flag-la:":                                                "\U0001f1f1\U0001f1e6",
-			":flag-lb:":                                                "\U0001f1f1\U0001f1e7",
-			":flag-lc:":                                                "\U0001f1f1\U0001f1e8",
-			":flag-li:":                                                "\U0001f1f1\U0001f1ee",
-			":flag-lk:":                                                "\U0001f1f1\U0001f1f0",
-			":flag-lr:":                                                "\U0001f1f1\U0001f1f7",
-			":flag-ls:":                                                "\U0001f1f1\U0001f1f8",
-			":flag-lt:":                                                "\U0001f1f1\U0001f1f9",
-			":flag-lu:":                                                "\U0001f1f1\U0001f1fa",
-			":flag-lv:":                                                "\U0001f1f1\U0001f1fb",
-			":flag-ly:":                                                "\U0001f1f1\U0001f1fe",
-			":flag-ma:":                                                "\U0001f1f2\U0001f1e6",
-			":flag-mc:":                                                "\U0001f1f2\U0001f1e8",
-			":flag-md:":                                                "\U0001f1f2\U0001f1e9",
-			":flag-me:":                                                "\U0001f1f2\U0001f1ea",
-			":flag-mf:":                                                "\U0001f1f2\U0001f1eb",
-			":flag-mg:":                                                "\U0001f1f2\U0001f1ec",
-			":flag-mh:":                                                "\U0001f1f2\U0001f1ed",
-			":flag-mk:":                                                "\U0001f1f2\U0001f1f0",
-			":flag-ml:":                                                "\U0001f1f2\U0001f1f1",
-			":flag-mm:":                                                "\U0001f1f2\U0001f1f2",
-			":flag-mn:":                                                "\U0001f1f2\U0001f1f3",
-			":flag-mo:":                                                "\U0001f1f2\U0001f1f4",
-			":flag-mp:":                                                "\U0001f1f2\U0001f1f5",
-			":flag-mq:":                                                "\U0001f1f2\U0001f1f6",
-			":flag-mr:":                                                "\U0001f1f2\U0001f1f7",
-			":flag-ms:":                                                "\U0001f1f2\U0001f1f8",
-			":flag-mt:":                                                "\U0001f1f2\U0001f1f9",
-			":flag-mu:":                                                "\U0001f1f2\U0001f1fa",
-			":flag-mv:":                                                "\U0001f1f2\U0001f1fb",
-			":flag-mw:":                                                "\U0001f1f2\U0001f1fc",
-			":flag-mx:":                                                "\U0001f1f2\U0001f1fd",
-			":flag-my:":                                                "\U0001f1f2\U0001f1fe",
-			":flag-mz:":                                                "\U0001f1f2\U0001f1ff",
-			":flag-na:":                                                "\U0001f1f3\U0001f1e6",
-			":flag-nc:":                                                "\U0001f1f3\U0001f1e8",
-			":flag-ne:":                                                "\U0001f1f3\U0001f1ea",
-			":flag-nf:":                                                "\U0001f1f3\U0001f1eb",
-			":flag-ng:":                                                "\U0001f1f3\U0001f1ec",
-			":flag-ni:":                                                "\U0001f1f3\U0001f1ee",
-			":flag-nl:":                                                "\U0001f1f3\U0001f1f1",
-			":flag-no:":                                                "\U0001f1f3\U0001f1f4",
-			":flag-np:":                                                "\U0001f1f3\U0001f1f5",
-			":flag-nr:":                                                "\U0001f1f3\U0001f1f7",
-			":flag-nu:":                                                "\U0001f1f3\U0001f1fa",
-			":flag-nz:":                                                "\U0001f1f3\U0001f1ff",
-			":flag-om:":                                                "\U0001f1f4\U0001f1f2",
-			":flag-pa:":                                                "\U0001f1f5\U0001f1e6",
-			":flag-pe:":                                                "\U0001f1f5\U0001f1ea",
-			":flag-pf:":                                                "\U0001f1f5\U0001f1eb",
-			":flag-pg:":                                                "\U0001f1f5\U0001f1ec",
-			":flag-ph:":                                                "\U0001f1f5\U0001f1ed",
-			":flag-pk:":                                                "\U0001f1f5\U0001f1f0",
-			":flag-pl:":                                                "\U0001f1f5\U0001f1f1",
-			":flag-pm:":                                                "\U0001f1f5\U0001f1f2",
-			":flag-pn:":                                                "\U0001f1f5\U0001f1f3",
-			":flag-pr:":                                                "\U0001f1f5\U0001f1f7",
-			":flag-ps:":                                                "\U0001f1f5\U0001f1f8",
-			":flag-pt:":                                                "\U0001f1f5\U0001f1f9",
-			":flag-pw:":                                                "\U0001f1f5\U0001f1fc",
-			":flag-py:":                                                "\U0001f1f5\U0001f1fe",
-			":flag-qa:":                                                "\U0001f1f6\U0001f1e6",
-			":flag-re:":                                                "\U0001f1f7\U0001f1ea",
-			":flag-ro:":                                                "\U0001f1f7\U0001f1f4",
-			":flag-rs:":                                                "\U0001f1f7\U0001f1f8",
-			":flag-rw:":                                                "\U0001f1f7\U0001f1fc",
-			":flag-sa:":                                                "\U0001f1f8\U0001f1e6",
-			":flag-sb:":                                                "\U0001f1f8\U0001f1e7",
-			":flag-sc:":                                                "\U0001f1f8\U0001f1e8",
-			":flag-scotland:":                                          "\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f",
-			":flag-sd:":                                                "\U0001f1f8\U0001f1e9",
-			":flag-se:":                                                "\U0001f1f8\U0001f1ea",
-			":flag-sg:":                                                "\U0001f1f8\U0001f1ec",
-			":flag-sh:":                                                "\U0001f1f8\U0001f1ed",
-			":flag-si:":                                                "\U0001f1f8\U0001f1ee",
-			":flag-sj:":                                                "\U0001f1f8\U0001f1ef",
-			":flag-sk:":                                                "\U0001f1f8\U0001f1f0",
-			":flag-sl:":                                                "\U0001f1f8\U0001f1f1",
-			":flag-sm:":                                                "\U0001f1f8\U0001f1f2",
-			":flag-sn:":                                                "\U0001f1f8\U0001f1f3",
-			":flag-so:":                                                "\U0001f1f8\U0001f1f4",
-			":flag-sr:":                                                "\U0001f1f8\U0001f1f7",
-			":flag-ss:":                                                "\U0001f1f8\U0001f1f8",
-			":flag-st:":                                                "\U0001f1f8\U0001f1f9",
-			":flag-sv:":                                                "\U0001f1f8\U0001f1fb",
-			":flag-sx:":                                                "\U0001f1f8\U0001f1fd",
-			":flag-sy:":                                                "\U0001f1f8\U0001f1fe",
-			":flag-sz:":                                                "\U0001f1f8\U0001f1ff",
-			":flag-ta:":                                                "\U0001f1f9\U0001f1e6",
-			":flag-tc:":                                                "\U0001f1f9\U0001f1e8",
-			":flag-td:":                                                "\U0001f1f9\U0001f1e9",
-			":flag-tf:":                                                "\U0001f1f9\U0001f1eb",
-			":flag-tg:":                                                "\U0001f1f9\U0001f1ec",
-			":flag-th:":                                                "\U0001f1f9\U0001f1ed",
-			":flag-tj:":                                                "\U0001f1f9\U0001f1ef",
-			":flag-tk:":                                                "\U0001f1f9\U0001f1f0",
-			":flag-tl:":                                                "\U0001f1f9\U0001f1f1",
-			":flag-tm:":                                                "\U0001f1f9\U0001f1f2",
-			":flag-tn:":                                                "\U0001f1f9\U0001f1f3",
-			":flag-to:":                                                "\U0001f1f9\U0001f1f4",
-			":flag-tr:":                                                "\U0001f1f9\U0001f1f7",
-			":flag-tt:":                                                "\U0001f1f9\U0001f1f9",
-			":flag-tv:":                                                "\U0001f1f9\U0001f1fb",
-			":flag-tw:":                                                "\U0001f1f9\U0001f1fc",
-			":flag-tz:":                                                "\U0001f1f9\U0001f1ff",
-			":flag-ua:":                                                "\U0001f1fa\U0001f1e6",
-			":flag-ug:":                                                "\U0001f1fa\U0001f1ec",
-			":flag-um:":                                                "\U0001f1fa\U0001f1f2",
-			":flag-un:":                                                "\U0001f1fa\U0001f1f3",
-			":flag-uy:":                                                "\U0001f1fa\U0001f1fe",
-			":flag-uz:":                                                "\U0001f1fa\U0001f1ff",
-			":flag-va:":                                                "\U0001f1fb\U0001f1e6",
-			":flag-vc:":                                                "\U0001f1fb\U0001f1e8",
-			":flag-ve:":                                                "\U0001f1fb\U0001f1ea",
-			":flag-vg:":                                                "\U0001f1fb\U0001f1ec",
-			":flag-vi:":                                                "\U0001f1fb\U0001f1ee",
-			":flag-vn:":                                                "\U0001f1fb\U0001f1f3",
-			":flag-vu:":                                                "\U0001f1fb\U0001f1fa",
-			":flag-wales:":                                             "\U0001f3f4\U000e0067\U000e0062\U000e0077\U000e006c\U000e0073\U000e007f",
-			":flag-wf:":                                                "\U0001f1fc\U0001f1eb",
-			":flag-ws:":                                                "\U0001f1fc\U0001f1f8",
-			":flag-xk:":                                                "\U0001f1fd\U0001f1f0",
-			":flag-ye:":                                                "\U0001f1fe\U0001f1ea",
-			":flag-yt:":                                                "\U0001f1fe\U0001f1f9",
-			":flag-za:":                                                "\U0001f1ff\U0001f1e6",
-			":flag-zm:":                                                "\U0001f1ff\U0001f1f2",
-			":flag-zw:":                                                "\U0001f1ff\U0001f1fc",
-			":flag_Afghanistan:":                                       "\U0001f1e6\U0001f1eb",
-			":flag_Albania:":                                           "\U0001f1e6\U0001f1f1",
-			":flag_Algeria:":                                           "\U0001f1e9\U0001f1ff",
-			":flag_American_Samoa:":                                    "\U0001f1e6\U0001f1f8",
-			":flag_Andorra:":                                           "\U0001f1e6\U0001f1e9",
-			":flag_Angola:":                                            "\U0001f1e6\U0001f1f4",
-			":flag_Anguilla:":                                          "\U0001f1e6\U0001f1ee",
-			":flag_Antarctica:":                                        "\U0001f1e6\U0001f1f6",
-			":flag_Antigua_&_Barbuda:":                                 "\U0001f1e6\U0001f1ec",
-			":flag_Argentina:":                                         "\U0001f1e6\U0001f1f7",
-			":flag_Armenia:":                                           "\U0001f1e6\U0001f1f2",
-			":flag_Aruba:":                                             "\U0001f1e6\U0001f1fc",
-			":flag_Ascension_Island:":                                  "\U0001f1e6\U0001f1e8",
-			":flag_Australia:":                                         "\U0001f1e6\U0001f1fa",
-			":flag_Austria:":                                           "\U0001f1e6\U0001f1f9",
-			":flag_Azerbaijan:":                                        "\U0001f1e6\U0001f1ff",
-			":flag_Bahamas:":                                           "\U0001f1e7\U0001f1f8",
-			":flag_Bahrain:":                                           "\U0001f1e7\U0001f1ed",
-			":flag_Bangladesh:":                                        "\U0001f1e7\U0001f1e9",
-			":flag_Barbados:":                                          "\U0001f1e7\U0001f1e7",
-			":flag_Belarus:":                                           "\U0001f1e7\U0001f1fe",
-			":flag_Belgium:":                                           "\U0001f1e7\U0001f1ea",
-			":flag_Belize:":                                            "\U0001f1e7\U0001f1ff",
-			":flag_Benin:":                                             "\U0001f1e7\U0001f1ef",
-			":flag_Bermuda:":                                           "\U0001f1e7\U0001f1f2",
-			":flag_Bhutan:":                                            "\U0001f1e7\U0001f1f9",
-			":flag_Bolivia:":                                           "\U0001f1e7\U0001f1f4",
-			":flag_Bosnia_&_Herzegovina:":                              "\U0001f1e7\U0001f1e6",
-			":flag_Botswana:":                                          "\U0001f1e7\U0001f1fc",
-			":flag_Bouvet_Island:":                                     "\U0001f1e7\U0001f1fb",
-			":flag_Brazil:":                                            "\U0001f1e7\U0001f1f7",
-			":flag_British_Indian_Ocean_Territory:":                    "\U0001f1ee\U0001f1f4",
-			":flag_British_Virgin_Islands:":                            "\U0001f1fb\U0001f1ec",
-			":flag_Brunei:":                                            "\U0001f1e7\U0001f1f3",
-			":flag_Bulgaria:":                                          "\U0001f1e7\U0001f1ec",
-			":flag_Burkina_Faso:":                                      "\U0001f1e7\U0001f1eb",
-			":flag_Burundi:":                                           "\U0001f1e7\U0001f1ee",
-			":flag_Cambodia:":                                          "\U0001f1f0\U0001f1ed",
-			":flag_Cameroon:":                                          "\U0001f1e8\U0001f1f2",
-			":flag_Canada:":                                            "\U0001f1e8\U0001f1e6",
-			":flag_Canary_Islands:":                                    "\U0001f1ee\U0001f1e8",
-			":flag_Cape_Verde:":                                        "\U0001f1e8\U0001f1fb",
-			":flag_Caribbean_Netherlands:":                             "\U0001f1e7\U0001f1f6",
-			":flag_Cayman_Islands:":                                    "\U0001f1f0\U0001f1fe",
-			":flag_Central_African_Republic:":                          "\U0001f1e8\U0001f1eb",
-			":flag_Ceuta_&_Melilla:":                                   "\U0001f1ea\U0001f1e6",
-			":flag_Chad:":                                              "\U0001f1f9\U0001f1e9",
-			":flag_Chile:":                                             "\U0001f1e8\U0001f1f1",
-			":flag_China:":                                             "\U0001f1e8\U0001f1f3",
-			":flag_Christmas_Island:":                                  "\U0001f1e8\U0001f1fd",
-			":flag_Clipperton_Island:":                                 "\U0001f1e8\U0001f1f5",
-			":flag_Cocos_(Keeling)_Islands:":                           "\U0001f1e8\U0001f1e8",
-			":flag_Colombia:":                                          "\U0001f1e8\U0001f1f4",
-			":flag_Comoros:":                                           "\U0001f1f0\U0001f1f2",
-			":flag_Congo_-_Brazzaville:":                               "\U0001f1e8\U0001f1ec",
-			":flag_Congo_-_Kinshasa:":                                  "\U0001f1e8\U0001f1e9",
-			":flag_Cook_Islands:":                                      "\U0001f1e8\U0001f1f0",
-			":flag_Costa_Rica:":                                        "\U0001f1e8\U0001f1f7",
-			":flag_Croatia:":                                           "\U0001f1ed\U0001f1f7",
-			":flag_Cuba:":                                              "\U0001f1e8\U0001f1fa",
-			":flag_Curaçao:":                                           "\U0001f1e8\U0001f1fc",
-			":flag_Cyprus:":                                            "\U0001f1e8\U0001f1fe",
-			":flag_Czechia:":                                           "\U0001f1e8\U0001f1ff",
-			":flag_Côte_d’Ivoire:":                                     "\U0001f1e8\U0001f1ee",
-			":flag_Denmark:":                                           "\U0001f1e9\U0001f1f0",
-			":flag_Diego_Garcia:":                                      "\U0001f1e9\U0001f1ec",
-			":flag_Djibouti:":                                          "\U0001f1e9\U0001f1ef",
-			":flag_Dominica:":                                          "\U0001f1e9\U0001f1f2",
-			":flag_Dominican_Republic:":                                "\U0001f1e9\U0001f1f4",
-			":flag_Ecuador:":                                           "\U0001f1ea\U0001f1e8",
-			":flag_Egypt:":                                             "\U0001f1ea\U0001f1ec",
-			":flag_El_Salvador:":                                       "\U0001f1f8\U0001f1fb",
-			":flag_England:":                                           "\U0001f3f4\U000e0067\U000e0062\U000e0065\U000e006e\U000e0067\U000e007f",
-			":flag_Equatorial_Guinea:":                                 "\U0001f1ec\U0001f1f6",
-			":flag_Eritrea:":                                           "\U0001f1ea\U0001f1f7",
-			":flag_Estonia:":                                           "\U0001f1ea\U0001f1ea",
-			":flag_Eswatini:":                                          "\U0001f1f8\U0001f1ff",
-			":flag_Ethiopia:":                                          "\U0001f1ea\U0001f1f9",
-			":flag_European_Union:":                                    "\U0001f1ea\U0001f1fa",
-			":flag_Falkland_Islands:":                                  "\U0001f1eb\U0001f1f0",
-			":flag_Faroe_Islands:":                                     "\U0001f1eb\U0001f1f4",
-			":flag_Fiji:":                                              "\U0001f1eb\U0001f1ef",
-			":flag_Finland:":                                           "\U0001f1eb\U0001f1ee",
-			":flag_France:":                                            "\U0001f1eb\U0001f1f7",
-			":flag_French_Guiana:":                                     "\U0001f1ec\U0001f1eb",
-			":flag_French_Polynesia:":                                  "\U0001f1f5\U0001f1eb",
-			":flag_French_Southern_Territories:":                       "\U0001f1f9\U0001f1eb",
-			":flag_Gabon:":                                             "\U0001f1ec\U0001f1e6",
-			":flag_Gambia:":                                            "\U0001f1ec\U0001f1f2",
-			":flag_Georgia:":                                           "\U0001f1ec\U0001f1ea",
-			":flag_Germany:":                                           "\U0001f1e9\U0001f1ea",
-			":flag_Ghana:":                                             "\U0001f1ec\U0001f1ed",
-			":flag_Gibraltar:":                                         "\U0001f1ec\U0001f1ee",
-			":flag_Greece:":                                            "\U0001f1ec\U0001f1f7",
-			":flag_Greenland:":                                         "\U0001f1ec\U0001f1f1",
-			":flag_Grenada:":                                           "\U0001f1ec\U0001f1e9",
-			":flag_Guadeloupe:":                                        "\U0001f1ec\U0001f1f5",
-			":flag_Guam:":                                              "\U0001f1ec\U0001f1fa",
-			":flag_Guatemala:":                                         "\U0001f1ec\U0001f1f9",
-			":flag_Guernsey:":                                          "\U0001f1ec\U0001f1ec",
-			":flag_Guinea:":                                            "\U0001f1ec\U0001f1f3",
-			":flag_Guinea-Bissau:":                                     "\U0001f1ec\U0001f1fc",
-			":flag_Guyana:":                                            "\U0001f1ec\U0001f1fe",
-			":flag_Haiti:":                                             "\U0001f1ed\U0001f1f9",
-			":flag_Heard_&_McDonald_Islands:":                          "\U0001f1ed\U0001f1f2",
-			":flag_Honduras:":                                          "\U0001f1ed\U0001f1f3",
-			":flag_Hong_Kong_SAR_China:":                               "\U0001f1ed\U0001f1f0",
-			":flag_Hungary:":                                           "\U0001f1ed\U0001f1fa",
-			":flag_Iceland:":                                           "\U0001f1ee\U0001f1f8",
-			":flag_India:":                                             "\U0001f1ee\U0001f1f3",
-			":flag_Indonesia:":                                         "\U0001f1ee\U0001f1e9",
-			":flag_Iran:":                                              "\U0001f1ee\U0001f1f7",
-			":flag_Iraq:":                                              "\U0001f1ee\U0001f1f6",
-			":flag_Ireland:":                                           "\U0001f1ee\U0001f1ea",
-			":flag_Isle_of_Man:":                                       "\U0001f1ee\U0001f1f2",
-			":flag_Israel:":                                            "\U0001f1ee\U0001f1f1",
-			":flag_Italy:":                                             "\U0001f1ee\U0001f1f9",
-			":flag_Jamaica:":                                           "\U0001f1ef\U0001f1f2",
-			":flag_Japan:":                                             "\U0001f1ef\U0001f1f5",
-			":flag_Jersey:":                                            "\U0001f1ef\U0001f1ea",
-			":flag_Jordan:":                                            "\U0001f1ef\U0001f1f4",
-			":flag_Kazakhstan:":                                        "\U0001f1f0\U0001f1ff",
-			":flag_Kenya:":                                             "\U0001f1f0\U0001f1ea",
-			":flag_Kiribati:":                                          "\U0001f1f0\U0001f1ee",
-			":flag_Kosovo:":                                            "\U0001f1fd\U0001f1f0",
-			":flag_Kuwait:":                                            "\U0001f1f0\U0001f1fc",
-			":flag_Kyrgyzstan:":                                        "\U0001f1f0\U0001f1ec",
-			":flag_Laos:":                                              "\U0001f1f1\U0001f1e6",
-			":flag_Latvia:":                                            "\U0001f1f1\U0001f1fb",
-			":flag_Lebanon:":                                           "\U0001f1f1\U0001f1e7",
-			":flag_Lesotho:":                                           "\U0001f1f1\U0001f1f8",
-			":flag_Liberia:":                                           "\U0001f1f1\U0001f1f7",
-			":flag_Libya:":                                             "\U0001f1f1\U0001f1fe",
-			":flag_Liechtenstein:":                                     "\U0001f1f1\U0001f1ee",
-			":flag_Lithuania:":                                         "\U0001f1f1\U0001f1f9",
-			":flag_Luxembourg:":                                        "\U0001f1f1\U0001f1fa",
-			":flag_Macao_SAR_China:":                                   "\U0001f1f2\U0001f1f4",
-			":flag_Madagascar:":                                        "\U0001f1f2\U0001f1ec",
-			":flag_Malawi:":                                            "\U0001f1f2\U0001f1fc",
-			":flag_Malaysia:":                                          "\U0001f1f2\U0001f1fe",
-			":flag_Maldives:":                                          "\U0001f1f2\U0001f1fb",
-			":flag_Mali:":                                              "\U0001f1f2\U0001f1f1",
-			":flag_Malta:":                                             "\U0001f1f2\U0001f1f9",
-			":flag_Marshall_Islands:":                                  "\U0001f1f2\U0001f1ed",
-			":flag_Martinique:":                                        "\U0001f1f2\U0001f1f6",
-			":flag_Mauritania:":                                        "\U0001f1f2\U0001f1f7",
-			":flag_Mauritius:":                                         "\U0001f1f2\U0001f1fa",
-			":flag_Mayotte:":                                           "\U0001f1fe\U0001f1f9",
-			":flag_Mexico:":                                            "\U0001f1f2\U0001f1fd",
-			":flag_Micronesia:":                                        "\U0001f1eb\U0001f1f2",
-			":flag_Moldova:":                                           "\U0001f1f2\U0001f1e9",
-			":flag_Monaco:":                                            "\U0001f1f2\U0001f1e8",
-			":flag_Mongolia:":                                          "\U0001f1f2\U0001f1f3",
-			":flag_Montenegro:":                                        "\U0001f1f2\U0001f1ea",
-			":flag_Montserrat:":                                        "\U0001f1f2\U0001f1f8",
-			":flag_Morocco:":                                           "\U0001f1f2\U0001f1e6",
-			":flag_Mozambique:":                                        "\U0001f1f2\U0001f1ff",
-			":flag_Myanmar_(Burma):":                                   "\U0001f1f2\U0001f1f2",
-			":flag_Namibia:":                                           "\U0001f1f3\U0001f1e6",
-			":flag_Nauru:":                                             "\U0001f1f3\U0001f1f7",
-			":flag_Nepal:":                                             "\U0001f1f3\U0001f1f5",
-			":flag_Netherlands:":                                       "\U0001f1f3\U0001f1f1",
-			":flag_New_Caledonia:":                                     "\U0001f1f3\U0001f1e8",
-			":flag_New_Zealand:":                                       "\U0001f1f3\U0001f1ff",
-			":flag_Nicaragua:":                                         "\U0001f1f3\U0001f1ee",
-			":flag_Niger:":                                             "\U0001f1f3\U0001f1ea",
-			":flag_Nigeria:":                                           "\U0001f1f3\U0001f1ec",
-			":flag_Niue:":                                              "\U0001f1f3\U0001f1fa",
-			":flag_Norfolk_Island:":                                    "\U0001f1f3\U0001f1eb",
-			":flag_North_Korea:":                                       "\U0001f1f0\U0001f1f5",
-			":flag_North_Macedonia:":                                   "\U0001f1f2\U0001f1f0",
-			":flag_Northern_Mariana_Islands:":                          "\U0001f1f2\U0001f1f5",
-			":flag_Norway:":                                            "\U0001f1f3\U0001f1f4",
-			":flag_Oman:":                                              "\U0001f1f4\U0001f1f2",
-			":flag_Pakistan:":                                          "\U0001f1f5\U0001f1f0",
-			":flag_Palau:":                                             "\U0001f1f5\U0001f1fc",
-			":flag_Palestinian_Territories:":                           "\U0001f1f5\U0001f1f8",
-			":flag_Panama:":                                            "\U0001f1f5\U0001f1e6",
-			":flag_Papua_New_Guinea:":                                  "\U0001f1f5\U0001f1ec",
-			":flag_Paraguay:":                                          "\U0001f1f5\U0001f1fe",
-			":flag_Peru:":                                              "\U0001f1f5\U0001f1ea",
-			":flag_Philippines:":                                       "\U0001f1f5\U0001f1ed",
-			":flag_Pitcairn_Islands:":                                  "\U0001f1f5\U0001f1f3",
-			":flag_Poland:":                                            "\U0001f1f5\U0001f1f1",
-			":flag_Portugal:":                                          "\U0001f1f5\U0001f1f9",
-			":flag_Puerto_Rico:":                                       "\U0001f1f5\U0001f1f7",
-			":flag_Qatar:":                                             "\U0001f1f6\U0001f1e6",
-			":flag_Romania:":                                           "\U0001f1f7\U0001f1f4",
-			":flag_Russia:":                                            "\U0001f1f7\U0001f1fa",
-			":flag_Rwanda:":                                            "\U0001f1f7\U0001f1fc",
-			":flag_Réunion:":                                           "\U0001f1f7\U0001f1ea",
-			":flag_Samoa:":                                             "\U0001f1fc\U0001f1f8",
-			":flag_San_Marino:":                                        "\U0001f1f8\U0001f1f2",
-			":flag_Saudi_Arabia:":                                      "\U0001f1f8\U0001f1e6",
-			":flag_Scotland:":                                          "\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f",
-			":flag_Senegal:":                                           "\U0001f1f8\U0001f1f3",
-			":flag_Serbia:":                                            "\U0001f1f7\U0001f1f8",
-			":flag_Seychelles:":                                        "\U0001f1f8\U0001f1e8",
-			":flag_Sierra_Leone:":                                      "\U0001f1f8\U0001f1f1",
-			":flag_Singapore:":                                         "\U0001f1f8\U0001f1ec",
-			":flag_Sint_Maarten:":                                      "\U0001f1f8\U0001f1fd",
-			":flag_Slovakia:":                                          "\U0001f1f8\U0001f1f0",
-			":flag_Slovenia:":                                          "\U0001f1f8\U0001f1ee",
-			":flag_Solomon_Islands:":                                   "\U0001f1f8\U0001f1e7",
-			":flag_Somalia:":                                           "\U0001f1f8\U0001f1f4",
-			":flag_South_Africa:":                                      "\U0001f1ff\U0001f1e6",
+			":face_with_open_eyes_and_hand_over_mouth:": "\U0001fae2",
+			":face_with_open_mouth:":                    "\U0001f62e",
+			":face_with_peeking_eye:":                   "\U0001fae3",
+			":face_with_raised_eyebrow:":                "\U0001f928",
+			":face_with_rolling_eyes:":                  "\U0001f644",
+			":face_with_spiral_eyes:":                   "\U0001f635\u200d\U0001f4ab",
+			":face_with_steam_from_nose:":               "\U0001f624",
+			":face_with_symbols_on_mouth:":              "\U0001f92c",
+			":face_with_symbols_over_mouth:":            "\U0001f92c",
+			":face_with_tears_of_joy:":                  "\U0001f602",
+			":face_with_thermometer:":                   "\U0001f912",
+			":face_with_tongue:":                        "\U0001f61b",
+			":face_without_mouth:":                      "\U0001f636",
+			":facepalm:":                                "\U0001f926",
+			":facepunch:":                               "\U0001f44a",
+			":factory:":                                 "\U0001f3ed",
+			":factory_worker:":                          "\U0001f9d1\u200d\U0001f3ed",
+			":fairy:":                                   "\U0001f9da\u200d\u2640\ufe0f",
+			":fairy_man:":                               "\U0001f9da\u200d\u2642\ufe0f",
+			":fairy_tone1:":                             "\U0001f9da\U0001f3fb",
+			":fairy_tone2:":                             "\U0001f9da\U0001f3fc",
+			":fairy_tone3:":                             "\U0001f9da\U0001f3fd",
+			":fairy_tone4:":                             "\U0001f9da\U0001f3fe",
+			":fairy_tone5:":                             "\U0001f9da\U0001f3ff",
+			":fairy_woman:":                             "\U0001f9da\u200d\u2640\ufe0f",
+			":falafel:":                                 "\U0001f9c6",
+			":falkland_islands:":                        "\U0001f1eb\U0001f1f0",
+			":fallen_leaf:":                             "\U0001f342",
+			":family:":                                  "\U0001f468\u200d\U0001f469\u200d\U0001f466",
+			":family_adult_adult_child:":                "\U0001f9d1\u200d\U0001f9d1\u200d\U0001f9d2",
+			":family_adult_adult_child_child:":          "\U0001f9d1\u200d\U0001f9d1\u200d\U0001f9d2\u200d\U0001f9d2",
+			":family_adult_child:":                      "\U0001f9d1\u200d\U0001f9d2",
+			":family_adult_child_child:":                "\U0001f9d1\u200d\U0001f9d2\u200d\U0001f9d2",
+			":family_man_boy:":                          "\U0001f468\u200d\U0001f466",
+			":family_man_boy_boy:":                      "\U0001f468\u200d\U0001f466\u200d\U0001f466",
+			":family_man_girl:":                         "\U0001f468\u200d\U0001f467",
+			":family_man_girl_boy:":                     "\U0001f468\u200d\U0001f467\u200d\U0001f466",
+			":family_man_girl_girl:":                    "\U0001f468\u200d\U0001f467\u200d\U0001f467",
+			":family_man_man_boy:":                      "\U0001f468\u200d\U0001f468\u200d\U0001f466",
+			":family_man_man_boy_boy:":                  "\U0001f468\u200d\U0001f468\u200d\U0001f466\u200d\U0001f466",
+			":family_man_man_girl:":                     "\U0001f468\u200d\U0001f468\u200d\U0001f467",
+			":family_man_man_girl_boy:":                 "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f466",
+			":family_man_man_girl_girl:":                "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f467",
+			":family_man_woman_boy:":                    "\U0001f468\u200d\U0001f469\u200d\U0001f466",
+			":family_man_woman_boy_boy:":                "\U0001f468\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":family_man_woman_girl:":                   "\U0001f468\u200d\U0001f469\u200d\U0001f467",
+			":family_man_woman_girl_boy:":               "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":family_man_woman_girl_girl:":              "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":family_mmb:":                              "\U0001f468\u200d\U0001f468\u200d\U0001f466",
+			":family_mmbb:":                             "\U0001f468\u200d\U0001f468\u200d\U0001f466\u200d\U0001f466",
+			":family_mmg:":                              "\U0001f468\u200d\U0001f468\u200d\U0001f467",
+			":family_mmgb:":                             "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f466",
+			":family_mmgg:":                             "\U0001f468\u200d\U0001f468\u200d\U0001f467\u200d\U0001f467",
+			":family_mwbb:":                             "\U0001f468\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":family_mwg:":                              "\U0001f468\u200d\U0001f469\u200d\U0001f467",
+			":family_mwgb:":                             "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":family_mwgg:":                             "\U0001f468\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":family_woman_boy:":                        "\U0001f469\u200d\U0001f466",
+			":family_woman_boy_boy:":                    "\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":family_woman_girl:":                       "\U0001f469\u200d\U0001f467",
+			":family_woman_girl_boy:":                   "\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":family_woman_girl_girl:":                  "\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":family_woman_woman_boy:":                  "\U0001f469\u200d\U0001f469\u200d\U0001f466",
+			":family_woman_woman_boy_boy:":              "\U0001f469\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":family_woman_woman_girl:":                 "\U0001f469\u200d\U0001f469\u200d\U0001f467",
+			":family_woman_woman_girl_boy:":             "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":family_woman_woman_girl_girl:":            "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":family_wwb:":                              "\U0001f469\u200d\U0001f469\u200d\U0001f466",
+			":family_wwbb:":                             "\U0001f469\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":family_wwg:":                              "\U0001f469\u200d\U0001f469\u200d\U0001f467",
+			":family_wwgb:":                             "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":family_wwgg:":                             "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":farmer:":                                  "\U0001f9d1\u200d\U0001f33e",
+			":faroe_islands:":                           "\U0001f1eb\U0001f1f4",
+			":fast-forward_button:":                     "\u23e9",
+			":fast_down_button:":                        "\u23ec",
+			":fast_forward:":                            "\u23e9",
+			":fast_reverse_button:":                     "\u23ea",
+			":fast_up_button:":                          "\u23eb",
+			":fax:":                                     "\U0001f4e0",
+			":fax_machine:":                             "\U0001f4e0",
+			":fearful:":                                 "\U0001f628",
+			":fearful_face:":                            "\U0001f628",
+			":feather:":                                 "\U0001fab6",
+			":feet:":                                    "\U0001f43e",
+			":female-artist:":                           "\U0001f469\u200d\U0001f3a8",
+			":female-astronaut:":                        "\U0001f469\u200d\U0001f680",
+			":female-construction-worker:":              "\U0001f477\u200d\u2640\ufe0f",
+			":female-cook:":                             "\U0001f469\u200d\U0001f373",
+			":female-detective:":                        "\U0001f575\ufe0f\u200d\u2640\ufe0f",
+			":female-doctor:":                           "\U0001f469\u200d\u2695\ufe0f",
+			":female-factory-worker:":                   "\U0001f469\u200d\U0001f3ed",
+			":female-farmer:":                           "\U0001f469\u200d\U0001f33e",
+			":female-firefighter:":                      "\U0001f469\u200d\U0001f692",
+			":female-guard:":                            "\U0001f482\u200d\u2640\ufe0f",
+			":female-judge:":                            "\U0001f469\u200d\u2696\ufe0f",
+			":female-mechanic:":                         "\U0001f469\u200d\U0001f527",
+			":female-office-worker:":                    "\U0001f469\u200d\U0001f4bc",
+			":female-pilot:":                            "\U0001f469\u200d\u2708\ufe0f",
+			":female-police-officer:":                   "\U0001f46e\u200d\u2640\ufe0f",
+			":female-scientist:":                        "\U0001f469\u200d\U0001f52c",
+			":female-singer:":                           "\U0001f469\u200d\U0001f3a4",
+			":female-student:":                          "\U0001f469\u200d\U0001f393",
+			":female-teacher:":                          "\U0001f469\u200d\U0001f3eb",
+			":female-technologist:":                     "\U0001f469\u200d\U0001f4bb",
+			":female_detective:":                        "\U0001f575\ufe0f\u200d\u2640\ufe0f",
+			":female_elf:":                              "\U0001f9dd\u200d\u2640\ufe0f",
+			":female_fairy:":                            "\U0001f9da\u200d\u2640\ufe0f",
+			":female_genie:":                            "\U0001f9de\u200d\u2640\ufe0f",
+			":female_mage:":                             "\U0001f9d9\u200d\u2640\ufe0f",
+			":female_sign:":                             "\u2640\ufe0f",
+			":female_superhero:":                        "\U0001f9b8\u200d\u2640\ufe0f",
+			":female_supervillain:":                     "\U0001f9b9\u200d\u2640\ufe0f",
+			":female_vampire:":                          "\U0001f9db\u200d\u2640\ufe0f",
+			":female_zombie:":                           "\U0001f9df\u200d\u2640\ufe0f",
+			":fencer:":                                  "\U0001f93a",
+			":ferris_wheel:":                            "\U0001f3a1",
+			":ferry:":                                   "\u26f4\ufe0f",
+			":field_hockey:":                            "\U0001f3d1",
+			":field_hockey_stick_and_ball:":             "\U0001f3d1",
+			":fight_cloud:":                             "\U0001faef",
+			":fiji:":                                    "\U0001f1eb\U0001f1ef",
+			":file_cabinet:":                            "\U0001f5c4\ufe0f",
+			":file_folder:":                             "\U0001f4c1",
+			":film_frames:":                             "\U0001f39e\ufe0f",
+			":film_projector:":                          "\U0001f4fd\ufe0f",
+			":film_strip:":                              "\U0001f39e\ufe0f",
+			":fingerprint:":                             "\U0001fac6",
+			":fingers_crossed:":                         "\U0001f91e",
+			":fingers_crossed_tone1:":                   "\U0001f91e\U0001f3fb",
+			":fingers_crossed_tone2:":                   "\U0001f91e\U0001f3fc",
+			":fingers_crossed_tone3:":                   "\U0001f91e\U0001f3fd",
+			":fingers_crossed_tone4:":                   "\U0001f91e\U0001f3fe",
+			":fingers_crossed_tone5:":                   "\U0001f91e\U0001f3ff",
+			":finland:":                                 "\U0001f1eb\U0001f1ee",
+			":fire:":                                    "\U0001f525",
+			":fire_engine:":                             "\U0001f692",
+			":fire_extinguisher:":                       "\U0001f9ef",
+			":firecracker:":                             "\U0001f9e8",
+			":firefighter:":                             "\U0001f9d1\u200d\U0001f692",
+			":fireworks:":                               "\U0001f386",
+			":first_place:":                             "\U0001f947",
+			":first_place_medal:":                       "\U0001f947",
+			":first_quarter_moon:":                      "\U0001f313",
+			":first_quarter_moon_face:":                 "\U0001f31b",
+			":first_quarter_moon_with_face:":            "\U0001f31b",
+			":fish:":                                    "\U0001f41f",
+			":fish_cake:":                               "\U0001f365",
+			":fish_cake_with_swirl:":                    "\U0001f365",
+			":fishing_pole:":                            "\U0001f3a3",
+			":fishing_pole_and_fish:":                   "\U0001f3a3",
+			":fist:":                                    "\u270a",
+			":fist_left:":                               "\U0001f91b",
+			":fist_oncoming:":                           "\U0001f44a",
+			":fist_raised:":                             "\u270a",
+			":fist_right:":                              "\U0001f91c",
+			":fist_tone1:":                              "\u270a\U0001f3fb",
+			":fist_tone2:":                              "\u270a\U0001f3fc",
+			":fist_tone3:":                              "\u270a\U0001f3fd",
+			":fist_tone4:":                              "\u270a\U0001f3fe",
+			":fist_tone5:":                              "\u270a\U0001f3ff",
+			":five:":                                    "5\ufe0f\u20e3",
+			":five-thirty:":                             "\U0001f560",
+			":five_o’clock:":                            "\U0001f554",
+			":flag-ac:":                                 "\U0001f1e6\U0001f1e8",
+			":flag-ad:":                                 "\U0001f1e6\U0001f1e9",
+			":flag-ae:":                                 "\U0001f1e6\U0001f1ea",
+			":flag-af:":                                 "\U0001f1e6\U0001f1eb",
+			":flag-ag:":                                 "\U0001f1e6\U0001f1ec",
+			":flag-ai:":                                 "\U0001f1e6\U0001f1ee",
+			":flag-al:":                                 "\U0001f1e6\U0001f1f1",
+			":flag-am:":                                 "\U0001f1e6\U0001f1f2",
+			":flag-ao:":                                 "\U0001f1e6\U0001f1f4",
+			":flag-aq:":                                 "\U0001f1e6\U0001f1f6",
+			":flag-ar:":                                 "\U0001f1e6\U0001f1f7",
+			":flag-as:":                                 "\U0001f1e6\U0001f1f8",
+			":flag-at:":                                 "\U0001f1e6\U0001f1f9",
+			":flag-au:":                                 "\U0001f1e6\U0001f1fa",
+			":flag-aw:":                                 "\U0001f1e6\U0001f1fc",
+			":flag-ax:":                                 "\U0001f1e6\U0001f1fd",
+			":flag-az:":                                 "\U0001f1e6\U0001f1ff",
+			":flag-ba:":                                 "\U0001f1e7\U0001f1e6",
+			":flag-bb:":                                 "\U0001f1e7\U0001f1e7",
+			":flag-bd:":                                 "\U0001f1e7\U0001f1e9",
+			":flag-be:":                                 "\U0001f1e7\U0001f1ea",
+			":flag-bf:":                                 "\U0001f1e7\U0001f1eb",
+			":flag-bg:":                                 "\U0001f1e7\U0001f1ec",
+			":flag-bh:":                                 "\U0001f1e7\U0001f1ed",
+			":flag-bi:":                                 "\U0001f1e7\U0001f1ee",
+			":flag-bj:":                                 "\U0001f1e7\U0001f1ef",
+			":flag-bl:":                                 "\U0001f1e7\U0001f1f1",
+			":flag-bm:":                                 "\U0001f1e7\U0001f1f2",
+			":flag-bn:":                                 "\U0001f1e7\U0001f1f3",
+			":flag-bo:":                                 "\U0001f1e7\U0001f1f4",
+			":flag-bq:":                                 "\U0001f1e7\U0001f1f6",
+			":flag-br:":                                 "\U0001f1e7\U0001f1f7",
+			":flag-bs:":                                 "\U0001f1e7\U0001f1f8",
+			":flag-bt:":                                 "\U0001f1e7\U0001f1f9",
+			":flag-bv:":                                 "\U0001f1e7\U0001f1fb",
+			":flag-bw:":                                 "\U0001f1e7\U0001f1fc",
+			":flag-by:":                                 "\U0001f1e7\U0001f1fe",
+			":flag-bz:":                                 "\U0001f1e7\U0001f1ff",
+			":flag-ca:":                                 "\U0001f1e8\U0001f1e6",
+			":flag-cc:":                                 "\U0001f1e8\U0001f1e8",
+			":flag-cd:":                                 "\U0001f1e8\U0001f1e9",
+			":flag-cf:":                                 "\U0001f1e8\U0001f1eb",
+			":flag-cg:":                                 "\U0001f1e8\U0001f1ec",
+			":flag-ch:":                                 "\U0001f1e8\U0001f1ed",
+			":flag-ci:":                                 "\U0001f1e8\U0001f1ee",
+			":flag-ck:":                                 "\U0001f1e8\U0001f1f0",
+			":flag-cl:":                                 "\U0001f1e8\U0001f1f1",
+			":flag-cm:":                                 "\U0001f1e8\U0001f1f2",
+			":flag-co:":                                 "\U0001f1e8\U0001f1f4",
+			":flag-cp:":                                 "\U0001f1e8\U0001f1f5",
+			":flag-cr:":                                 "\U0001f1e8\U0001f1f7",
+			":flag-cu:":                                 "\U0001f1e8\U0001f1fa",
+			":flag-cv:":                                 "\U0001f1e8\U0001f1fb",
+			":flag-cw:":                                 "\U0001f1e8\U0001f1fc",
+			":flag-cx:":                                 "\U0001f1e8\U0001f1fd",
+			":flag-cy:":                                 "\U0001f1e8\U0001f1fe",
+			":flag-cz:":                                 "\U0001f1e8\U0001f1ff",
+			":flag-dg:":                                 "\U0001f1e9\U0001f1ec",
+			":flag-dj:":                                 "\U0001f1e9\U0001f1ef",
+			":flag-dk:":                                 "\U0001f1e9\U0001f1f0",
+			":flag-dm:":                                 "\U0001f1e9\U0001f1f2",
+			":flag-do:":                                 "\U0001f1e9\U0001f1f4",
+			":flag-dz:":                                 "\U0001f1e9\U0001f1ff",
+			":flag-ea:":                                 "\U0001f1ea\U0001f1e6",
+			":flag-ec:":                                 "\U0001f1ea\U0001f1e8",
+			":flag-ee:":                                 "\U0001f1ea\U0001f1ea",
+			":flag-eg:":                                 "\U0001f1ea\U0001f1ec",
+			":flag-eh:":                                 "\U0001f1ea\U0001f1ed",
+			":flag-england:":                            "\U0001f3f4\U000e0067\U000e0062\U000e0065\U000e006e\U000e0067\U000e007f",
+			":flag-er:":                                 "\U0001f1ea\U0001f1f7",
+			":flag-et:":                                 "\U0001f1ea\U0001f1f9",
+			":flag-eu:":                                 "\U0001f1ea\U0001f1fa",
+			":flag-fi:":                                 "\U0001f1eb\U0001f1ee",
+			":flag-fj:":                                 "\U0001f1eb\U0001f1ef",
+			":flag-fk:":                                 "\U0001f1eb\U0001f1f0",
+			":flag-fm:":                                 "\U0001f1eb\U0001f1f2",
+			":flag-fo:":                                 "\U0001f1eb\U0001f1f4",
+			":flag-ga:":                                 "\U0001f1ec\U0001f1e6",
+			":flag-gd:":                                 "\U0001f1ec\U0001f1e9",
+			":flag-ge:":                                 "\U0001f1ec\U0001f1ea",
+			":flag-gf:":                                 "\U0001f1ec\U0001f1eb",
+			":flag-gg:":                                 "\U0001f1ec\U0001f1ec",
+			":flag-gh:":                                 "\U0001f1ec\U0001f1ed",
+			":flag-gi:":                                 "\U0001f1ec\U0001f1ee",
+			":flag-gl:":                                 "\U0001f1ec\U0001f1f1",
+			":flag-gm:":                                 "\U0001f1ec\U0001f1f2",
+			":flag-gn:":                                 "\U0001f1ec\U0001f1f3",
+			":flag-gp:":                                 "\U0001f1ec\U0001f1f5",
+			":flag-gq:":                                 "\U0001f1ec\U0001f1f6",
+			":flag-gr:":                                 "\U0001f1ec\U0001f1f7",
+			":flag-gs:":                                 "\U0001f1ec\U0001f1f8",
+			":flag-gt:":                                 "\U0001f1ec\U0001f1f9",
+			":flag-gu:":                                 "\U0001f1ec\U0001f1fa",
+			":flag-gw:":                                 "\U0001f1ec\U0001f1fc",
+			":flag-gy:":                                 "\U0001f1ec\U0001f1fe",
+			":flag-hk:":                                 "\U0001f1ed\U0001f1f0",
+			":flag-hm:":                                 "\U0001f1ed\U0001f1f2",
+			":flag-hn:":                                 "\U0001f1ed\U0001f1f3",
+			":flag-hr:":                                 "\U0001f1ed\U0001f1f7",
+			":flag-ht:":                                 "\U0001f1ed\U0001f1f9",
+			":flag-hu:":                                 "\U0001f1ed\U0001f1fa",
+			":flag-ic:":                                 "\U0001f1ee\U0001f1e8",
+			":flag-id:":                                 "\U0001f1ee\U0001f1e9",
+			":flag-ie:":                                 "\U0001f1ee\U0001f1ea",
+			":flag-il:":                                 "\U0001f1ee\U0001f1f1",
+			":flag-im:":                                 "\U0001f1ee\U0001f1f2",
+			":flag-in:":                                 "\U0001f1ee\U0001f1f3",
+			":flag-io:":                                 "\U0001f1ee\U0001f1f4",
+			":flag-iq:":                                 "\U0001f1ee\U0001f1f6",
+			":flag-ir:":                                 "\U0001f1ee\U0001f1f7",
+			":flag-is:":                                 "\U0001f1ee\U0001f1f8",
+			":flag-je:":                                 "\U0001f1ef\U0001f1ea",
+			":flag-jm:":                                 "\U0001f1ef\U0001f1f2",
+			":flag-jo:":                                 "\U0001f1ef\U0001f1f4",
+			":flag-ke:":                                 "\U0001f1f0\U0001f1ea",
+			":flag-kg:":                                 "\U0001f1f0\U0001f1ec",
+			":flag-kh:":                                 "\U0001f1f0\U0001f1ed",
+			":flag-ki:":                                 "\U0001f1f0\U0001f1ee",
+			":flag-km:":                                 "\U0001f1f0\U0001f1f2",
+			":flag-kn:":                                 "\U0001f1f0\U0001f1f3",
+			":flag-kp:":                                 "\U0001f1f0\U0001f1f5",
+			":flag-kw:":                                 "\U0001f1f0\U0001f1fc",
+			":flag-ky:":                                 "\U0001f1f0\U0001f1fe",
+			":flag-kz:":                                 "\U0001f1f0\U0001f1ff",
+			":flag-la:":                                 "\U0001f1f1\U0001f1e6",
+			":flag-lb:":                                 "\U0001f1f1\U0001f1e7",
+			":flag-lc:":                                 "\U0001f1f1\U0001f1e8",
+			":flag-li:":                                 "\U0001f1f1\U0001f1ee",
+			":flag-lk:":                                 "\U0001f1f1\U0001f1f0",
+			":flag-lr:":                                 "\U0001f1f1\U0001f1f7",
+			":flag-ls:":                                 "\U0001f1f1\U0001f1f8",
+			":flag-lt:":                                 "\U0001f1f1\U0001f1f9",
+			":flag-lu:":                                 "\U0001f1f1\U0001f1fa",
+			":flag-lv:":                                 "\U0001f1f1\U0001f1fb",
+			":flag-ly:":                                 "\U0001f1f1\U0001f1fe",
+			":flag-ma:":                                 "\U0001f1f2\U0001f1e6",
+			":flag-mc:":                                 "\U0001f1f2\U0001f1e8",
+			":flag-md:":                                 "\U0001f1f2\U0001f1e9",
+			":flag-me:":                                 "\U0001f1f2\U0001f1ea",
+			":flag-mf:":                                 "\U0001f1f2\U0001f1eb",
+			":flag-mg:":                                 "\U0001f1f2\U0001f1ec",
+			":flag-mh:":                                 "\U0001f1f2\U0001f1ed",
+			":flag-mk:":                                 "\U0001f1f2\U0001f1f0",
+			":flag-ml:":                                 "\U0001f1f2\U0001f1f1",
+			":flag-mm:":                                 "\U0001f1f2\U0001f1f2",
+			":flag-mn:":                                 "\U0001f1f2\U0001f1f3",
+			":flag-mo:":                                 "\U0001f1f2\U0001f1f4",
+			":flag-mp:":                                 "\U0001f1f2\U0001f1f5",
+			":flag-mq:":                                 "\U0001f1f2\U0001f1f6",
+			":flag-mr:":                                 "\U0001f1f2\U0001f1f7",
+			":flag-ms:":                                 "\U0001f1f2\U0001f1f8",
+			":flag-mt:":                                 "\U0001f1f2\U0001f1f9",
+			":flag-mu:":                                 "\U0001f1f2\U0001f1fa",
+			":flag-mv:":                                 "\U0001f1f2\U0001f1fb",
+			":flag-mw:":                                 "\U0001f1f2\U0001f1fc",
+			":flag-mx:":                                 "\U0001f1f2\U0001f1fd",
+			":flag-my:":                                 "\U0001f1f2\U0001f1fe",
+			":flag-mz:":                                 "\U0001f1f2\U0001f1ff",
+			":flag-na:":                                 "\U0001f1f3\U0001f1e6",
+			":flag-nc:":                                 "\U0001f1f3\U0001f1e8",
+			":flag-ne:":                                 "\U0001f1f3\U0001f1ea",
+			":flag-nf:":                                 "\U0001f1f3\U0001f1eb",
+			":flag-ng:":                                 "\U0001f1f3\U0001f1ec",
+			":flag-ni:":                                 "\U0001f1f3\U0001f1ee",
+			":flag-nl:":                                 "\U0001f1f3\U0001f1f1",
+			":flag-no:":                                 "\U0001f1f3\U0001f1f4",
+			":flag-np:":                                 "\U0001f1f3\U0001f1f5",
+			":flag-nr:":                                 "\U0001f1f3\U0001f1f7",
+			":flag-nu:":                                 "\U0001f1f3\U0001f1fa",
+			":flag-nz:":                                 "\U0001f1f3\U0001f1ff",
+			":flag-om:":                                 "\U0001f1f4\U0001f1f2",
+			":flag-pa:":                                 "\U0001f1f5\U0001f1e6",
+			":flag-pe:":                                 "\U0001f1f5\U0001f1ea",
+			":flag-pf:":                                 "\U0001f1f5\U0001f1eb",
+			":flag-pg:":                                 "\U0001f1f5\U0001f1ec",
+			":flag-ph:":                                 "\U0001f1f5\U0001f1ed",
+			":flag-pk:":                                 "\U0001f1f5\U0001f1f0",
+			":flag-pl:":                                 "\U0001f1f5\U0001f1f1",
+			":flag-pm:":                                 "\U0001f1f5\U0001f1f2",
+			":flag-pn:":                                 "\U0001f1f5\U0001f1f3",
+			":flag-pr:":                                 "\U0001f1f5\U0001f1f7",
+			":flag-ps:":                                 "\U0001f1f5\U0001f1f8",
+			":flag-pt:":                                 "\U0001f1f5\U0001f1f9",
+			":flag-pw:":                                 "\U0001f1f5\U0001f1fc",
+			":flag-py:":                                 "\U0001f1f5\U0001f1fe",
+			":flag-qa:":                                 "\U0001f1f6\U0001f1e6",
+			":flag-re:":                                 "\U0001f1f7\U0001f1ea",
+			":flag-ro:":                                 "\U0001f1f7\U0001f1f4",
+			":flag-rs:":                                 "\U0001f1f7\U0001f1f8",
+			":flag-rw:":                                 "\U0001f1f7\U0001f1fc",
+			":flag-sa:":                                 "\U0001f1f8\U0001f1e6",
+			":flag-sark:":                               "\U0001f1e8\U0001f1f6",
+			":flag-sb:":                                 "\U0001f1f8\U0001f1e7",
+			":flag-sc:":                                 "\U0001f1f8\U0001f1e8",
+			":flag-scotland:":                           "\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f",
+			":flag-sd:":                                 "\U0001f1f8\U0001f1e9",
+			":flag-se:":                                 "\U0001f1f8\U0001f1ea",
+			":flag-sg:":                                 "\U0001f1f8\U0001f1ec",
+			":flag-sh:":                                 "\U0001f1f8\U0001f1ed",
+			":flag-si:":                                 "\U0001f1f8\U0001f1ee",
+			":flag-sj:":                                 "\U0001f1f8\U0001f1ef",
+			":flag-sk:":                                 "\U0001f1f8\U0001f1f0",
+			":flag-sl:":                                 "\U0001f1f8\U0001f1f1",
+			":flag-sm:":                                 "\U0001f1f8\U0001f1f2",
+			":flag-sn:":                                 "\U0001f1f8\U0001f1f3",
+			":flag-so:":                                 "\U0001f1f8\U0001f1f4",
+			":flag-sr:":                                 "\U0001f1f8\U0001f1f7",
+			":flag-ss:":                                 "\U0001f1f8\U0001f1f8",
+			":flag-st:":                                 "\U0001f1f8\U0001f1f9",
+			":flag-sv:":                                 "\U0001f1f8\U0001f1fb",
+			":flag-sx:":                                 "\U0001f1f8\U0001f1fd",
+			":flag-sy:":                                 "\U0001f1f8\U0001f1fe",
+			":flag-sz:":                                 "\U0001f1f8\U0001f1ff",
+			":flag-ta:":                                 "\U0001f1f9\U0001f1e6",
+			":flag-tc:":                                 "\U0001f1f9\U0001f1e8",
+			":flag-td:":                                 "\U0001f1f9\U0001f1e9",
+			":flag-tf:":                                 "\U0001f1f9\U0001f1eb",
+			":flag-tg:":                                 "\U0001f1f9\U0001f1ec",
+			":flag-th:":                                 "\U0001f1f9\U0001f1ed",
+			":flag-tj:":                                 "\U0001f1f9\U0001f1ef",
+			":flag-tk:":                                 "\U0001f1f9\U0001f1f0",
+			":flag-tl:":                                 "\U0001f1f9\U0001f1f1",
+			":flag-tm:":                                 "\U0001f1f9\U0001f1f2",
+			":flag-tn:":                                 "\U0001f1f9\U0001f1f3",
+			":flag-to:":                                 "\U0001f1f9\U0001f1f4",
+			":flag-tr:":                                 "\U0001f1f9\U0001f1f7",
+			":flag-tt:":                                 "\U0001f1f9\U0001f1f9",
+			":flag-tv:":                                 "\U0001f1f9\U0001f1fb",
+			":flag-tw:":                                 "\U0001f1f9\U0001f1fc",
+			":flag-tz:":                                 "\U0001f1f9\U0001f1ff",
+			":flag-ua:":                                 "\U0001f1fa\U0001f1e6",
+			":flag-ug:":                                 "\U0001f1fa\U0001f1ec",
+			":flag-um:":                                 "\U0001f1fa\U0001f1f2",
+			":flag-un:":                                 "\U0001f1fa\U0001f1f3",
+			":flag-uy:":                                 "\U0001f1fa\U0001f1fe",
+			":flag-uz:":                                 "\U0001f1fa\U0001f1ff",
+			":flag-va:":                                 "\U0001f1fb\U0001f1e6",
+			":flag-vc:":                                 "\U0001f1fb\U0001f1e8",
+			":flag-ve:":                                 "\U0001f1fb\U0001f1ea",
+			":flag-vg:":                                 "\U0001f1fb\U0001f1ec",
+			":flag-vi:":                                 "\U0001f1fb\U0001f1ee",
+			":flag-vn:":                                 "\U0001f1fb\U0001f1f3",
+			":flag-vu:":                                 "\U0001f1fb\U0001f1fa",
+			":flag-wales:":                              "\U0001f3f4\U000e0067\U000e0062\U000e0077\U000e006c\U000e0073\U000e007f",
+			":flag-wf:":                                 "\U0001f1fc\U0001f1eb",
+			":flag-ws:":                                 "\U0001f1fc\U0001f1f8",
+			":flag-xk:":                                 "\U0001f1fd\U0001f1f0",
+			":flag-ye:":                                 "\U0001f1fe\U0001f1ea",
+			":flag-yt:":                                 "\U0001f1fe\U0001f1f9",
+			":flag-za:":                                 "\U0001f1ff\U0001f1e6",
+			":flag-zm:":                                 "\U0001f1ff\U0001f1f2",
+			":flag-zw:":                                 "\U0001f1ff\U0001f1fc",
+			":flag_Afghanistan:":                        "\U0001f1e6\U0001f1eb",
+			":flag_Albania:":                            "\U0001f1e6\U0001f1f1",
+			":flag_Algeria:":                            "\U0001f1e9\U0001f1ff",
+			":flag_American_Samoa:":                     "\U0001f1e6\U0001f1f8",
+			":flag_Andorra:":                            "\U0001f1e6\U0001f1e9",
+			":flag_Angola:":                             "\U0001f1e6\U0001f1f4",
+			":flag_Anguilla:":                           "\U0001f1e6\U0001f1ee",
+			":flag_Antarctica:":                         "\U0001f1e6\U0001f1f6",
+			":flag_Antigua_&_Barbuda:":                  "\U0001f1e6\U0001f1ec",
+			":flag_Argentina:":                          "\U0001f1e6\U0001f1f7",
+			":flag_Armenia:":                            "\U0001f1e6\U0001f1f2",
+			":flag_Aruba:":                              "\U0001f1e6\U0001f1fc",
+			":flag_Ascension_Island:":                   "\U0001f1e6\U0001f1e8",
+			":flag_Australia:":                          "\U0001f1e6\U0001f1fa",
+			":flag_Austria:":                            "\U0001f1e6\U0001f1f9",
+			":flag_Azerbaijan:":                         "\U0001f1e6\U0001f1ff",
+			":flag_Bahamas:":                            "\U0001f1e7\U0001f1f8",
+			":flag_Bahrain:":                            "\U0001f1e7\U0001f1ed",
+			":flag_Bangladesh:":                         "\U0001f1e7\U0001f1e9",
+			":flag_Barbados:":                           "\U0001f1e7\U0001f1e7",
+			":flag_Belarus:":                            "\U0001f1e7\U0001f1fe",
+			":flag_Belgium:":                            "\U0001f1e7\U0001f1ea",
+			":flag_Belize:":                             "\U0001f1e7\U0001f1ff",
+			":flag_Benin:":                              "\U0001f1e7\U0001f1ef",
+			":flag_Bermuda:":                            "\U0001f1e7\U0001f1f2",
+			":flag_Bhutan:":                             "\U0001f1e7\U0001f1f9",
+			":flag_Bolivia:":                            "\U0001f1e7\U0001f1f4",
+			":flag_Bosnia_&_Herzegovina:":               "\U0001f1e7\U0001f1e6",
+			":flag_Botswana:":                           "\U0001f1e7\U0001f1fc",
+			":flag_Bouvet_Island:":                      "\U0001f1e7\U0001f1fb",
+			":flag_Brazil:":                             "\U0001f1e7\U0001f1f7",
+			":flag_British_Indian_Ocean_Territory:":     "\U0001f1ee\U0001f1f4",
+			":flag_British_Virgin_Islands:":             "\U0001f1fb\U0001f1ec",
+			":flag_Brunei:":                             "\U0001f1e7\U0001f1f3",
+			":flag_Bulgaria:":                           "\U0001f1e7\U0001f1ec",
+			":flag_Burkina_Faso:":                       "\U0001f1e7\U0001f1eb",
+			":flag_Burundi:":                            "\U0001f1e7\U0001f1ee",
+			":flag_Cambodia:":                           "\U0001f1f0\U0001f1ed",
+			":flag_Cameroon:":                           "\U0001f1e8\U0001f1f2",
+			":flag_Canada:":                             "\U0001f1e8\U0001f1e6",
+			":flag_Canary_Islands:":                     "\U0001f1ee\U0001f1e8",
+			":flag_Cape_Verde:":                         "\U0001f1e8\U0001f1fb",
+			":flag_Caribbean_Netherlands:":              "\U0001f1e7\U0001f1f6",
+			":flag_Cayman_Islands:":                     "\U0001f1f0\U0001f1fe",
+			":flag_Central_African_Republic:":           "\U0001f1e8\U0001f1eb",
+			":flag_Ceuta_&_Melilla:":                    "\U0001f1ea\U0001f1e6",
+			":flag_Chad:":                               "\U0001f1f9\U0001f1e9",
+			":flag_Chile:":                              "\U0001f1e8\U0001f1f1",
+			":flag_China:":                              "\U0001f1e8\U0001f1f3",
+			":flag_Christmas_Island:":                   "\U0001f1e8\U0001f1fd",
+			":flag_Clipperton_Island:":                  "\U0001f1e8\U0001f1f5",
+			":flag_Cocos_(Keeling)_Islands:":            "\U0001f1e8\U0001f1e8",
+			":flag_Colombia:":                           "\U0001f1e8\U0001f1f4",
+			":flag_Comoros:":                            "\U0001f1f0\U0001f1f2",
+			":flag_Congo_-_Brazzaville:":                "\U0001f1e8\U0001f1ec",
+			":flag_Congo_-_Kinshasa:":                   "\U0001f1e8\U0001f1e9",
+			":flag_Cook_Islands:":                       "\U0001f1e8\U0001f1f0",
+			":flag_Costa_Rica:":                         "\U0001f1e8\U0001f1f7",
+			":flag_Croatia:":                            "\U0001f1ed\U0001f1f7",
+			":flag_Cuba:":                               "\U0001f1e8\U0001f1fa",
+			":flag_Curaçao:":                            "\U0001f1e8\U0001f1fc",
+			":flag_Cyprus:":                             "\U0001f1e8\U0001f1fe",
+			":flag_Czechia:":                            "\U0001f1e8\U0001f1ff",
+			":flag_Côte_d’Ivoire:":                      "\U0001f1e8\U0001f1ee",
+			":flag_Denmark:":                            "\U0001f1e9\U0001f1f0",
+			":flag_Diego_Garcia:":                       "\U0001f1e9\U0001f1ec",
+			":flag_Djibouti:":                           "\U0001f1e9\U0001f1ef",
+			":flag_Dominica:":                           "\U0001f1e9\U0001f1f2",
+			":flag_Dominican_Republic:":                 "\U0001f1e9\U0001f1f4",
+			":flag_Ecuador:":                            "\U0001f1ea\U0001f1e8",
+			":flag_Egypt:":                              "\U0001f1ea\U0001f1ec",
+			":flag_El_Salvador:":                        "\U0001f1f8\U0001f1fb",
+			":flag_England:":                            "\U0001f3f4\U000e0067\U000e0062\U000e0065\U000e006e\U000e0067\U000e007f",
+			":flag_Equatorial_Guinea:":                  "\U0001f1ec\U0001f1f6",
+			":flag_Eritrea:":                            "\U0001f1ea\U0001f1f7",
+			":flag_Estonia:":                            "\U0001f1ea\U0001f1ea",
+			":flag_Eswatini:":                           "\U0001f1f8\U0001f1ff",
+			":flag_Ethiopia:":                           "\U0001f1ea\U0001f1f9",
+			":flag_European_Union:":                     "\U0001f1ea\U0001f1fa",
+			":flag_Falkland_Islands:":                   "\U0001f1eb\U0001f1f0",
+			":flag_Faroe_Islands:":                      "\U0001f1eb\U0001f1f4",
+			":flag_Fiji:":                               "\U0001f1eb\U0001f1ef",
+			":flag_Finland:":                            "\U0001f1eb\U0001f1ee",
+			":flag_France:":                             "\U0001f1eb\U0001f1f7",
+			":flag_French_Guiana:":                      "\U0001f1ec\U0001f1eb",
+			":flag_French_Polynesia:":                   "\U0001f1f5\U0001f1eb",
+			":flag_French_Southern_Territories:":        "\U0001f1f9\U0001f1eb",
+			":flag_Gabon:":                              "\U0001f1ec\U0001f1e6",
+			":flag_Gambia:":                             "\U0001f1ec\U0001f1f2",
+			":flag_Georgia:":                            "\U0001f1ec\U0001f1ea",
+			":flag_Germany:":                            "\U0001f1e9\U0001f1ea",
+			":flag_Ghana:":                              "\U0001f1ec\U0001f1ed",
+			":flag_Gibraltar:":                          "\U0001f1ec\U0001f1ee",
+			":flag_Greece:":                             "\U0001f1ec\U0001f1f7",
+			":flag_Greenland:":                          "\U0001f1ec\U0001f1f1",
+			":flag_Grenada:":                            "\U0001f1ec\U0001f1e9",
+			":flag_Guadeloupe:":                         "\U0001f1ec\U0001f1f5",
+			":flag_Guam:":                               "\U0001f1ec\U0001f1fa",
+			":flag_Guatemala:":                          "\U0001f1ec\U0001f1f9",
+			":flag_Guernsey:":                           "\U0001f1ec\U0001f1ec",
+			":flag_Guinea:":                             "\U0001f1ec\U0001f1f3",
+			":flag_Guinea-Bissau:":                      "\U0001f1ec\U0001f1fc",
+			":flag_Guyana:":                             "\U0001f1ec\U0001f1fe",
+			":flag_Haiti:":                              "\U0001f1ed\U0001f1f9",
+			":flag_Heard_&_McDonald_Islands:":           "\U0001f1ed\U0001f1f2",
+			":flag_Honduras:":                           "\U0001f1ed\U0001f1f3",
+			":flag_Hong_Kong_SAR_China:":                "\U0001f1ed\U0001f1f0",
+			":flag_Hungary:":                            "\U0001f1ed\U0001f1fa",
+			":flag_Iceland:":                            "\U0001f1ee\U0001f1f8",
+			":flag_India:":                              "\U0001f1ee\U0001f1f3",
+			":flag_Indonesia:":                          "\U0001f1ee\U0001f1e9",
+			":flag_Iran:":                               "\U0001f1ee\U0001f1f7",
+			":flag_Iraq:":                               "\U0001f1ee\U0001f1f6",
+			":flag_Ireland:":                            "\U0001f1ee\U0001f1ea",
+			":flag_Isle_of_Man:":                        "\U0001f1ee\U0001f1f2",
+			":flag_Israel:":                             "\U0001f1ee\U0001f1f1",
+			":flag_Italy:":                              "\U0001f1ee\U0001f1f9",
+			":flag_Jamaica:":                            "\U0001f1ef\U0001f1f2",
+			":flag_Japan:":                              "\U0001f1ef\U0001f1f5",
+			":flag_Jersey:":                             "\U0001f1ef\U0001f1ea",
+			":flag_Jordan:":                             "\U0001f1ef\U0001f1f4",
+			":flag_Kazakhstan:":                         "\U0001f1f0\U0001f1ff",
+			":flag_Kenya:":                              "\U0001f1f0\U0001f1ea",
+			":flag_Kiribati:":                           "\U0001f1f0\U0001f1ee",
+			":flag_Kosovo:":                             "\U0001f1fd\U0001f1f0",
+			":flag_Kuwait:":                             "\U0001f1f0\U0001f1fc",
+			":flag_Kyrgyzstan:":                         "\U0001f1f0\U0001f1ec",
+			":flag_Laos:":                               "\U0001f1f1\U0001f1e6",
+			":flag_Latvia:":                             "\U0001f1f1\U0001f1fb",
+			":flag_Lebanon:":                            "\U0001f1f1\U0001f1e7",
+			":flag_Lesotho:":                            "\U0001f1f1\U0001f1f8",
+			":flag_Liberia:":                            "\U0001f1f1\U0001f1f7",
+			":flag_Libya:":                              "\U0001f1f1\U0001f1fe",
+			":flag_Liechtenstein:":                      "\U0001f1f1\U0001f1ee",
+			":flag_Lithuania:":                          "\U0001f1f1\U0001f1f9",
+			":flag_Luxembourg:":                         "\U0001f1f1\U0001f1fa",
+			":flag_Macao_SAR_China:":                    "\U0001f1f2\U0001f1f4",
+			":flag_Madagascar:":                         "\U0001f1f2\U0001f1ec",
+			":flag_Malawi:":                             "\U0001f1f2\U0001f1fc",
+			":flag_Malaysia:":                           "\U0001f1f2\U0001f1fe",
+			":flag_Maldives:":                           "\U0001f1f2\U0001f1fb",
+			":flag_Mali:":                               "\U0001f1f2\U0001f1f1",
+			":flag_Malta:":                              "\U0001f1f2\U0001f1f9",
+			":flag_Marshall_Islands:":                   "\U0001f1f2\U0001f1ed",
+			":flag_Martinique:":                         "\U0001f1f2\U0001f1f6",
+			":flag_Mauritania:":                         "\U0001f1f2\U0001f1f7",
+			":flag_Mauritius:":                          "\U0001f1f2\U0001f1fa",
+			":flag_Mayotte:":                            "\U0001f1fe\U0001f1f9",
+			":flag_Mexico:":                             "\U0001f1f2\U0001f1fd",
+			":flag_Micronesia:":                         "\U0001f1eb\U0001f1f2",
+			":flag_Moldova:":                            "\U0001f1f2\U0001f1e9",
+			":flag_Monaco:":                             "\U0001f1f2\U0001f1e8",
+			":flag_Mongolia:":                           "\U0001f1f2\U0001f1f3",
+			":flag_Montenegro:":                         "\U0001f1f2\U0001f1ea",
+			":flag_Montserrat:":                         "\U0001f1f2\U0001f1f8",
+			":flag_Morocco:":                            "\U0001f1f2\U0001f1e6",
+			":flag_Mozambique:":                         "\U0001f1f2\U0001f1ff",
+			":flag_Myanmar_(Burma):":                    "\U0001f1f2\U0001f1f2",
+			":flag_Namibia:":                            "\U0001f1f3\U0001f1e6",
+			":flag_Nauru:":                              "\U0001f1f3\U0001f1f7",
+			":flag_Nepal:":                              "\U0001f1f3\U0001f1f5",
+			":flag_Netherlands:":                        "\U0001f1f3\U0001f1f1",
+			":flag_New_Caledonia:":                      "\U0001f1f3\U0001f1e8",
+			":flag_New_Zealand:":                        "\U0001f1f3\U0001f1ff",
+			":flag_Nicaragua:":                          "\U0001f1f3\U0001f1ee",
+			":flag_Niger:":                              "\U0001f1f3\U0001f1ea",
+			":flag_Nigeria:":                            "\U0001f1f3\U0001f1ec",
+			":flag_Niue:":                               "\U0001f1f3\U0001f1fa",
+			":flag_Norfolk_Island:":                     "\U0001f1f3\U0001f1eb",
+			":flag_North_Korea:":                        "\U0001f1f0\U0001f1f5",
+			":flag_North_Macedonia:":                    "\U0001f1f2\U0001f1f0",
+			":flag_Northern_Mariana_Islands:":           "\U0001f1f2\U0001f1f5",
+			":flag_Norway:":                             "\U0001f1f3\U0001f1f4",
+			":flag_Oman:":                               "\U0001f1f4\U0001f1f2",
+			":flag_Pakistan:":                           "\U0001f1f5\U0001f1f0",
+			":flag_Palau:":                              "\U0001f1f5\U0001f1fc",
+			":flag_Palestinian_Territories:":            "\U0001f1f5\U0001f1f8",
+			":flag_Panama:":                             "\U0001f1f5\U0001f1e6",
+			":flag_Papua_New_Guinea:":                   "\U0001f1f5\U0001f1ec",
+			":flag_Paraguay:":                           "\U0001f1f5\U0001f1fe",
+			":flag_Peru:":                               "\U0001f1f5\U0001f1ea",
+			":flag_Philippines:":                        "\U0001f1f5\U0001f1ed",
+			":flag_Pitcairn_Islands:":                   "\U0001f1f5\U0001f1f3",
+			":flag_Poland:":                             "\U0001f1f5\U0001f1f1",
+			":flag_Portugal:":                           "\U0001f1f5\U0001f1f9",
+			":flag_Puerto_Rico:":                        "\U0001f1f5\U0001f1f7",
+			":flag_Qatar:":                              "\U0001f1f6\U0001f1e6",
+			":flag_Romania:":                            "\U0001f1f7\U0001f1f4",
+			":flag_Russia:":                             "\U0001f1f7\U0001f1fa",
+			":flag_Rwanda:":                             "\U0001f1f7\U0001f1fc",
+			":flag_Réunion:":                            "\U0001f1f7\U0001f1ea",
+			":flag_Samoa:":                              "\U0001f1fc\U0001f1f8",
+			":flag_San_Marino:":                         "\U0001f1f8\U0001f1f2",
+			":flag_Sark:":                               "\U0001f1e8\U0001f1f6",
+			":flag_Saudi_Arabia:":                       "\U0001f1f8\U0001f1e6",
+			":flag_Scotland:":                           "\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f",
+			":flag_Senegal:":                            "\U0001f1f8\U0001f1f3",
+			":flag_Serbia:":                             "\U0001f1f7\U0001f1f8",
+			":flag_Seychelles:":                         "\U0001f1f8\U0001f1e8",
+			":flag_Sierra_Leone:":                       "\U0001f1f8\U0001f1f1",
+			":flag_Singapore:":                          "\U0001f1f8\U0001f1ec",
+			":flag_Sint_Maarten:":                       "\U0001f1f8\U0001f1fd",
+			":flag_Slovakia:":                           "\U0001f1f8\U0001f1f0",
+			":flag_Slovenia:":                           "\U0001f1f8\U0001f1ee",
+			":flag_Solomon_Islands:":                    "\U0001f1f8\U0001f1e7",
+			":flag_Somalia:":                            "\U0001f1f8\U0001f1f4",
+			":flag_South_Africa:":                       "\U0001f1ff\U0001f1e6",
 			":flag_South_Georgia_&_South_Sandwich_Islands:": "\U0001f1ec\U0001f1f8",
 			":flag_South_Korea:":                            "\U0001f1f0\U0001f1f7",
 			":flag_South_Sudan:":                            "\U0001f1f8\U0001f1f8",
@@ -1525,10 +1555,10 @@ func emojiCode() map[string]string {
 			":flag_Trinidad_&_Tobago:":                      "\U0001f1f9\U0001f1f9",
 			":flag_Tristan_da_Cunha:":                       "\U0001f1f9\U0001f1e6",
 			":flag_Tunisia:":                                "\U0001f1f9\U0001f1f3",
-			":flag_Turkey:":                                 "\U0001f1f9\U0001f1f7",
 			":flag_Turkmenistan:":                           "\U0001f1f9\U0001f1f2",
 			":flag_Turks_&_Caicos_Islands:":                 "\U0001f1f9\U0001f1e8",
 			":flag_Tuvalu:":                                 "\U0001f1f9\U0001f1fb",
+			":flag_Türkiye:":                                "\U0001f1f9\U0001f1f7",
 			":flag_U.S._Outlying_Islands:":                  "\U0001f1fa\U0001f1f2",
 			":flag_U.S._Virgin_Islands:":                    "\U0001f1fb\U0001f1ee",
 			":flag_Uganda:":                                 "\U0001f1fa\U0001f1ec",
@@ -1825,12 +1855,14 @@ func emojiCode() map[string]string {
 			":flower_playing_cards:":                        "\U0001f3b4",
 			":flushed:":                                     "\U0001f633",
 			":flushed_face:":                                "\U0001f633",
+			":flute:":                                       "\U0001fa88",
 			":fly:":                                         "\U0001fab0",
 			":flying_disc:":                                 "\U0001f94f",
 			":flying_saucer:":                               "\U0001f6f8",
 			":fog:":                                         "\U0001f32b\ufe0f",
 			":foggy:":                                       "\U0001f301",
 			":folded_hands:":                                "\U0001f64f",
+			":folding_hand_fan:":                            "\U0001faad",
 			":fondue:":                                      "\U0001fad5",
 			":foot:":                                        "\U0001f9b6",
 			":football:":                                    "\U0001f3c8",
@@ -1894,6 +1926,7 @@ func emojiCode() map[string]string {
 			":gibraltar:":                                   "\U0001f1ec\U0001f1ee",
 			":gift:":                                        "\U0001f381",
 			":gift_heart:":                                  "\U0001f49d",
+			":ginger_root:":                                 "\U0001fada",
 			":giraffe:":                                     "\U0001f992",
 			":giraffe_face:":                                "\U0001f992",
 			":girl:":                                        "\U0001f467",
@@ -1920,6 +1953,7 @@ func emojiCode() map[string]string {
 			":golfing:":                                     "\U0001f3cc\ufe0f",
 			":golfing_man:":                                 "\U0001f3cc\ufe0f\u200d\u2642\ufe0f",
 			":golfing_woman:":                               "\U0001f3cc\ufe0f\u200d\u2640\ufe0f",
+			":goose:":                                       "\U0001fabf",
 			":gorilla:":                                     "\U0001f98d",
 			":graduation_cap:":                              "\U0001f393",
 			":grapes:":                                      "\U0001f347",
@@ -1933,6 +1967,7 @@ func emojiCode() map[string]string {
 			":greenland:":                                   "\U0001f1ec\U0001f1f1",
 			":grenada:":                                     "\U0001f1ec\U0001f1e9",
 			":grey_exclamation:":                            "\u2755",
+			":grey_heart:":                                  "\U0001fa76",
 			":grey_question:":                               "\u2754",
 			":grimacing:":                                   "\U0001f62c",
 			":grimacing_face:":                              "\U0001f62c",
@@ -1964,15 +1999,18 @@ func emojiCode() map[string]string {
 			":guitar:":                                      "\U0001f3b8",
 			":gun:":                                         "\U0001f52b",
 			":guyana:":                                      "\U0001f1ec\U0001f1fe",
+			":hair_pick:":                                   "\U0001faae",
 			":haircut:":                                     "\U0001f487\u200d\u2640\ufe0f",
 			":haircut_man:":                                 "\U0001f487\u200d\u2642\ufe0f",
 			":haircut_woman:":                               "\U0001f487\u200d\u2640\ufe0f",
+			":hairy_creature:":                              "\U0001fac8",
 			":haiti:":                                       "\U0001f1ed\U0001f1f9",
 			":hamburger:":                                   "\U0001f354",
 			":hammer:":                                      "\U0001f528",
 			":hammer_and_pick:":                             "\u2692\ufe0f",
 			":hammer_and_wrench:":                           "\U0001f6e0\ufe0f",
 			":hammer_pick:":                                 "\u2692",
+			":hamsa:":                                       "\U0001faac",
 			":hamster:":                                     "\U0001f439",
 			":hand:":                                        "\u270b",
 			":hand_over_mouth:":                             "\U0001f92d",
@@ -1982,39 +2020,45 @@ func emojiCode() map[string]string {
 			":hand_splayed_tone4:":                          "\U0001f590\U0001f3fe",
 			":hand_splayed_tone5:":                          "\U0001f590\U0001f3ff",
 			":hand_with_fingers_splayed:":                   "\U0001f590",
-			":handbag:":                                     "\U0001f45c",
-			":handball:":                                    "\U0001f93e",
-			":handball_person:":                             "\U0001f93e",
-			":handshake:":                                   "\U0001f91d",
-			":hankey:":                                      "\U0001f4a9",
-			":hash:":                                        "#\ufe0f\u20e3",
-			":hatched_chick:":                               "\U0001f425",
-			":hatching_chick:":                              "\U0001f423",
-			":head_bandage:":                                "\U0001f915",
-			":headphone:":                                   "\U0001f3a7",
-			":headphones:":                                  "\U0001f3a7",
-			":headstone:":                                   "\U0001faa6",
-			":health_worker:":                               "\U0001f9d1\u200d\u2695\ufe0f",
-			":hear-no-evil_monkey:":                         "\U0001f649",
-			":hear_no_evil:":                                "\U0001f649",
-			":heard_mcdonald_islands:":                      "\U0001f1ed\U0001f1f2",
-			":heart:":                                       "\u2764\ufe0f",
-			":heart_decoration:":                            "\U0001f49f",
-			":heart_exclamation:":                           "\u2763",
-			":heart_eyes:":                                  "\U0001f60d",
-			":heart_eyes_cat:":                              "\U0001f63b",
-			":heart_on_fire:":                               "\u2764\ufe0f\u200d\U0001f525",
-			":heart_suit:":                                  "\u2665",
-			":heart_with_arrow:":                            "\U0001f498",
-			":heart_with_ribbon:":                           "\U0001f49d",
-			":heartbeat:":                                   "\U0001f493",
-			":heartpulse:":                                  "\U0001f497",
-			":hearts:":                                      "\u2665\ufe0f",
-			":heavy_check_mark:":                            "\u2714\ufe0f",
-			":heavy_division_sign:":                         "\u2797",
-			":heavy_dollar_sign:":                           "\U0001f4b2",
-			":heavy_exclamation_mark:":                      "\u2757",
-			":heavy_heart_exclamation:":                     "\u2763\ufe0f",
+			":hand_with_index_finger_and_thumb_crossed:": "\U0001faf0",
+			":handbag:":                   "\U0001f45c",
+			":handball:":                  "\U0001f93e",
+			":handball_person:":           "\U0001f93e",
+			":handshake:":                 "\U0001f91d",
+			":hankey:":                    "\U0001f4a9",
+			":harp:":                      "\U0001fa89",
+			":hash:":                      "#\ufe0f\u20e3",
+			":hatched_chick:":             "\U0001f425",
+			":hatching_chick:":            "\U0001f423",
+			":head_bandage:":              "\U0001f915",
+			":head_shaking_horizontally:": "\U0001f642\u200d\u2194\ufe0f",
+			":head_shaking_vertically:":   "\U0001f642\u200d\u2195\ufe0f",
+			":headphone:":                 "\U0001f3a7",
+			":headphones:":                "\U0001f3a7",
+			":headstone:":                 "\U0001faa6",
+			":health_worker:":             "\U0001f9d1\u200d\u2695\ufe0f",
+			":hear-no-evil_monkey:":       "\U0001f649",
+			":hear_no_evil:":              "\U0001f649",
+			":heard_mcdonald_islands:":    "\U0001f1ed\U0001f1f2",
+			":heart:":                     "\u2764\ufe0f",
+			":heart_decoration:":          "\U0001f49f",
+			":heart_exclamation:":         "\u2763",
+			":heart_eyes:":                "\U0001f60d",
+			":heart_eyes_cat:":            "\U0001f63b",
+			":heart_hands:":               "\U0001faf6",
+			":heart_on_fire:":             "\u2764\ufe0f\u200d\U0001f525",
+			":heart_suit:":                "\u2665",
+			":heart_with_arrow:":          "\U0001f498",
+			":heart_with_ribbon:":         "\U0001f49d",
+			":heartbeat:":                 "\U0001f493",
+			":heartpulse:":                "\U0001f497",
+			":hearts:":                    "\u2665\ufe0f",
+			":heavy_check_mark:":          "\u2714\ufe0f",
+			":heavy_division_sign:":       "\u2797",
+			":heavy_dollar_sign:":         "\U0001f4b2",
+			":heavy_equals_sign:":         "\U0001f7f0",
+			":heavy_exclamation_mark:":    "\u2757",
+			":heavy_heart_exclamation:":   "\u2763\ufe0f",
 			":heavy_heart_exclamation_mark_ornament:": "\u2763\ufe0f",
 			":heavy_minus_sign:":                      "\u2796",
 			":heavy_multiplication_x:":                "\u2716\ufe0f",
@@ -2078,6 +2122,7 @@ func emojiCode() map[string]string {
 			":hushed:":                                "\U0001f62f",
 			":hushed_face:":                           "\U0001f62f",
 			":hut:":                                   "\U0001f6d6",
+			":hyacinth:":                              "\U0001fabb",
 			":i_love_you_hand_sign:":                  "\U0001f91f",
 			":ice:":                                   "\U0001f9ca",
 			":ice_cream:":                             "\U0001f368",
@@ -2088,10 +2133,12 @@ func emojiCode() map[string]string {
 			":icecream:":                              "\U0001f366",
 			":iceland:":                               "\U0001f1ee\U0001f1f8",
 			":id:":                                    "\U0001f194",
+			":identification_card:":                   "\U0001faaa",
 			":ideograph_advantage:":                   "\U0001f250",
 			":imp:":                                   "\U0001f47f",
 			":inbox_tray:":                            "\U0001f4e5",
 			":incoming_envelope:":                     "\U0001f4e8",
+			":index_pointing_at_the_viewer:":          "\U0001faf5",
 			":index_pointing_up:":                     "\u261d",
 			":india:":                                 "\U0001f1ee\U0001f1f3",
 			":indonesia:":                             "\U0001f1ee\U0001f1e9",
@@ -2122,7 +2169,9 @@ func emojiCode() map[string]string {
 			":japanese_castle:":                       "\U0001f3ef",
 			":japanese_goblin:":                       "\U0001f47a",
 			":japanese_ogre:":                         "\U0001f479",
+			":jar:":                                   "\U0001fad9",
 			":jeans:":                                 "\U0001f456",
+			":jellyfish:":                             "\U0001fabc",
 			":jersey:":                                "\U0001f1ef\U0001f1ea",
 			":jigsaw:":                                "\U0001f9e9",
 			":joker:":                                 "\U0001f0cf",
@@ -2156,6 +2205,7 @@ func emojiCode() map[string]string {
 			":keycap_9:":                              "9\ufe0f\u20e3",
 			":keycap_star:":                           "*\ufe0f\u20e3",
 			":keycap_ten:":                            "\U0001f51f",
+			":khanda:":                                "\U0001faaf",
 			":kick_scooter:":                          "\U0001f6f4",
 			":kimono:":                                "\U0001f458",
 			":kiribati:":                              "\U0001f1f0\U0001f1ee",
@@ -2184,7 +2234,6 @@ func emojiCode() map[string]string {
 			":kneeling_woman:":                        "\U0001f9ce\u200d\u2640\ufe0f",
 			":knife:":                                 "\U0001f52a",
 			":knife_fork_plate:":                      "\U0001f37d\ufe0f",
-			":knocked-out_face:":                      "\U0001f635",
 			":knot:":                                  "\U0001faa2",
 			":koala:":                                 "\U0001f428",
 			":koko:":                                  "\U0001f201",
@@ -2198,6 +2247,7 @@ func emojiCode() map[string]string {
 			":ladder:":                                "\U0001fa9c",
 			":lady_beetle:":                           "\U0001f41e",
 			":ladybug:":                               "\U0001f41e",
+			":landslide:":                             "\U0001f6d8",
 			":lantern:":                               "\U0001f3ee",
 			":laos:":                                  "\U0001f1f1\U0001f1e6",
 			":laptop:":                                "\U0001f4bb",
@@ -2224,6 +2274,7 @@ func emojiCode() map[string]string {
 			":latvia:":                                "\U0001f1f1\U0001f1fb",
 			":laughing:":                              "\U0001f606",
 			":leaf_fluttering_in_wind:":               "\U0001f343",
+			":leafless_tree:":                         "\U0001fabe",
 			":leafy_green:":                           "\U0001f96c",
 			":leaves:":                                "\U0001f343",
 			":lebanon:":                               "\U0001f1f1\U0001f1e7",
@@ -2242,6 +2293,8 @@ func emojiCode() map[string]string {
 			":left_right_arrow:":                      "\u2194\ufe0f",
 			":left_speech_bubble:":                    "\U0001f5e8\ufe0f",
 			":leftwards_arrow_with_hook:":             "\u21a9\ufe0f",
+			":leftwards_hand:":                        "\U0001faf2",
+			":leftwards_pushing_hand:":                "\U0001faf7",
 			":leg:":                                   "\U0001f9b5",
 			":lemon:":                                 "\U0001f34b",
 			":leo:":                                   "\u264c",
@@ -2252,9 +2305,11 @@ func emojiCode() map[string]string {
 			":libra:":                                 "\u264e",
 			":libya:":                                 "\U0001f1f1\U0001f1fe",
 			":liechtenstein:":                         "\U0001f1f1\U0001f1ee",
+			":light_blue_heart:":                      "\U0001fa75",
 			":light_bulb:":                            "\U0001f4a1",
 			":light_rail:":                            "\U0001f688",
 			":lightning:":                             "\U0001f329\ufe0f",
+			":lime:":                                  "\U0001f34b\u200d\U0001f7e9",
 			":link:":                                  "\U0001f517",
 			":linked_paperclips:":                     "\U0001f587\ufe0f",
 			":lion:":                                  "\U0001f981",
@@ -2276,6 +2331,7 @@ func emojiCode() map[string]string {
 			":long_drum:":                             "\U0001fa98",
 			":loop:":                                  "\u27bf",
 			":lotion_bottle:":                         "\U0001f9f4",
+			":lotus:":                                 "\U0001fab7",
 			":lotus_position:":                        "\U0001f9d8",
 			":lotus_position_man:":                    "\U0001f9d8\u200d\u2642\ufe0f",
 			":lotus_position_woman:":                  "\U0001f9d8\u200d\u2640\ufe0f",
@@ -2291,6 +2347,7 @@ func emojiCode() map[string]string {
 			":love_you_gesture_tone3:":                "\U0001f91f\U0001f3fd",
 			":love_you_gesture_tone4:":                "\U0001f91f\U0001f3fe",
 			":love_you_gesture_tone5:":                "\U0001f91f\U0001f3ff",
+			":low_battery:":                           "\U0001faab",
 			":low_brightness:":                        "\U0001f505",
 			":lower_left_ballpoint_pen:":              "\U0001f58a\ufe0f",
 			":lower_left_crayon:":                     "\U0001f58d\ufe0f",
@@ -2399,7 +2456,6 @@ func emojiCode() map[string]string {
 			":man-tipping-hand:":                      "\U0001f481\u200d\u2642\ufe0f",
 			":man-walking:":                           "\U0001f6b6\u200d\u2642\ufe0f",
 			":man-wearing-turban:":                    "\U0001f473\u200d\u2642\ufe0f",
-			":man-with-bunny-ears-partying:":          "\U0001f46f\u200d\u2642\ufe0f",
 			":man-woman-boy:":                         "\U0001f468\u200d\U0001f469\u200d\U0001f466",
 			":man-woman-boy-boy:":                     "\U0001f468\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
 			":man-woman-girl:":                        "\U0001f468\u200d\U0001f469\u200d\U0001f467",
@@ -2579,2121 +2635,2175 @@ func emojiCode() map[string]string {
 			":man_in_lotus_position_tone4:":           "\U0001f9d8\U0001f3fe\u200d\u2642\ufe0f",
 			":man_in_lotus_position_tone5:":           "\U0001f9d8\U0001f3ff\u200d\u2642\ufe0f",
 			":man_in_manual_wheelchair:":              "\U0001f468\u200d\U0001f9bd",
+			":man_in_manual_wheelchair_facing_right:": "\U0001f468\u200d\U0001f9bd\u200d\u27a1\ufe0f",
 			":man_in_motorized_wheelchair:":           "\U0001f468\u200d\U0001f9bc",
-			":man_in_steamy_room:":                    "\U0001f9d6\u200d\u2642\ufe0f",
-			":man_in_steamy_room_tone1:":              "\U0001f9d6\U0001f3fb\u200d\u2642\ufe0f",
-			":man_in_steamy_room_tone2:":              "\U0001f9d6\U0001f3fc\u200d\u2642\ufe0f",
-			":man_in_steamy_room_tone3:":              "\U0001f9d6\U0001f3fd\u200d\u2642\ufe0f",
-			":man_in_steamy_room_tone4:":              "\U0001f9d6\U0001f3fe\u200d\u2642\ufe0f",
-			":man_in_steamy_room_tone5:":              "\U0001f9d6\U0001f3ff\u200d\u2642\ufe0f",
-			":man_in_tuxedo:":                         "\U0001f935\u200d\u2642\ufe0f",
-			":man_in_tuxedo_tone1:":                   "\U0001f935\U0001f3fb",
-			":man_in_tuxedo_tone2:":                   "\U0001f935\U0001f3fc",
-			":man_in_tuxedo_tone3:":                   "\U0001f935\U0001f3fd",
-			":man_in_tuxedo_tone4:":                   "\U0001f935\U0001f3fe",
-			":man_in_tuxedo_tone5:":                   "\U0001f935\U0001f3ff",
-			":man_judge:":                             "\U0001f468\u200d\u2696\ufe0f",
-			":man_judge_tone1:":                       "\U0001f468\U0001f3fb\u200d\u2696\ufe0f",
-			":man_judge_tone2:":                       "\U0001f468\U0001f3fc\u200d\u2696\ufe0f",
-			":man_judge_tone3:":                       "\U0001f468\U0001f3fd\u200d\u2696\ufe0f",
-			":man_judge_tone4:":                       "\U0001f468\U0001f3fe\u200d\u2696\ufe0f",
-			":man_judge_tone5:":                       "\U0001f468\U0001f3ff\u200d\u2696\ufe0f",
-			":man_juggling:":                          "\U0001f939\u200d\u2642\ufe0f",
-			":man_juggling_tone1:":                    "\U0001f939\U0001f3fb\u200d\u2642\ufe0f",
-			":man_juggling_tone2:":                    "\U0001f939\U0001f3fc\u200d\u2642\ufe0f",
-			":man_juggling_tone3:":                    "\U0001f939\U0001f3fd\u200d\u2642\ufe0f",
-			":man_juggling_tone4:":                    "\U0001f939\U0001f3fe\u200d\u2642\ufe0f",
-			":man_juggling_tone5:":                    "\U0001f939\U0001f3ff\u200d\u2642\ufe0f",
-			":man_kneeling:":                          "\U0001f9ce\u200d\u2642\ufe0f",
-			":man_lifting_weights:":                   "\U0001f3cb\ufe0f\u200d\u2642\ufe0f",
-			":man_lifting_weights_tone1:":             "\U0001f3cb\U0001f3fb\u200d\u2642\ufe0f",
-			":man_lifting_weights_tone2:":             "\U0001f3cb\U0001f3fc\u200d\u2642\ufe0f",
-			":man_lifting_weights_tone3:":             "\U0001f3cb\U0001f3fd\u200d\u2642\ufe0f",
-			":man_lifting_weights_tone4:":             "\U0001f3cb\U0001f3fe\u200d\u2642\ufe0f",
-			":man_lifting_weights_tone5:":             "\U0001f3cb\U0001f3ff\u200d\u2642\ufe0f",
-			":man_mage:":                              "\U0001f9d9\u200d\u2642\ufe0f",
-			":man_mage_tone1:":                        "\U0001f9d9\U0001f3fb\u200d\u2642\ufe0f",
-			":man_mage_tone2:":                        "\U0001f9d9\U0001f3fc\u200d\u2642\ufe0f",
-			":man_mage_tone3:":                        "\U0001f9d9\U0001f3fd\u200d\u2642\ufe0f",
-			":man_mage_tone4:":                        "\U0001f9d9\U0001f3fe\u200d\u2642\ufe0f",
-			":man_mage_tone5:":                        "\U0001f9d9\U0001f3ff\u200d\u2642\ufe0f",
-			":man_mechanic:":                          "\U0001f468\u200d\U0001f527",
-			":man_mechanic_tone1:":                    "\U0001f468\U0001f3fb\u200d\U0001f527",
-			":man_mechanic_tone2:":                    "\U0001f468\U0001f3fc\u200d\U0001f527",
-			":man_mechanic_tone3:":                    "\U0001f468\U0001f3fd\u200d\U0001f527",
-			":man_mechanic_tone4:":                    "\U0001f468\U0001f3fe\u200d\U0001f527",
-			":man_mechanic_tone5:":                    "\U0001f468\U0001f3ff\u200d\U0001f527",
-			":man_mountain_biking:":                   "\U0001f6b5\u200d\u2642\ufe0f",
-			":man_mountain_biking_tone1:":             "\U0001f6b5\U0001f3fb\u200d\u2642\ufe0f",
-			":man_mountain_biking_tone2:":             "\U0001f6b5\U0001f3fc\u200d\u2642\ufe0f",
-			":man_mountain_biking_tone3:":             "\U0001f6b5\U0001f3fd\u200d\u2642\ufe0f",
-			":man_mountain_biking_tone4:":             "\U0001f6b5\U0001f3fe\u200d\u2642\ufe0f",
-			":man_mountain_biking_tone5:":             "\U0001f6b5\U0001f3ff\u200d\u2642\ufe0f",
-			":man_office_worker:":                     "\U0001f468\u200d\U0001f4bc",
-			":man_office_worker_tone1:":               "\U0001f468\U0001f3fb\u200d\U0001f4bc",
-			":man_office_worker_tone2:":               "\U0001f468\U0001f3fc\u200d\U0001f4bc",
-			":man_office_worker_tone3:":               "\U0001f468\U0001f3fd\u200d\U0001f4bc",
-			":man_office_worker_tone4:":               "\U0001f468\U0001f3fe\u200d\U0001f4bc",
-			":man_office_worker_tone5:":               "\U0001f468\U0001f3ff\u200d\U0001f4bc",
-			":man_pilot:":                             "\U0001f468\u200d\u2708\ufe0f",
-			":man_pilot_tone1:":                       "\U0001f468\U0001f3fb\u200d\u2708\ufe0f",
-			":man_pilot_tone2:":                       "\U0001f468\U0001f3fc\u200d\u2708\ufe0f",
-			":man_pilot_tone3:":                       "\U0001f468\U0001f3fd\u200d\u2708\ufe0f",
-			":man_pilot_tone4:":                       "\U0001f468\U0001f3fe\u200d\u2708\ufe0f",
-			":man_pilot_tone5:":                       "\U0001f468\U0001f3ff\u200d\u2708\ufe0f",
-			":man_playing_handball:":                  "\U0001f93e\u200d\u2642\ufe0f",
-			":man_playing_handball_tone1:":            "\U0001f93e\U0001f3fb\u200d\u2642\ufe0f",
-			":man_playing_handball_tone2:":            "\U0001f93e\U0001f3fc\u200d\u2642\ufe0f",
-			":man_playing_handball_tone3:":            "\U0001f93e\U0001f3fd\u200d\u2642\ufe0f",
-			":man_playing_handball_tone4:":            "\U0001f93e\U0001f3fe\u200d\u2642\ufe0f",
-			":man_playing_handball_tone5:":            "\U0001f93e\U0001f3ff\u200d\u2642\ufe0f",
-			":man_playing_water_polo:":                "\U0001f93d\u200d\u2642\ufe0f",
-			":man_playing_water_polo_tone1:":          "\U0001f93d\U0001f3fb\u200d\u2642\ufe0f",
-			":man_playing_water_polo_tone2:":          "\U0001f93d\U0001f3fc\u200d\u2642\ufe0f",
-			":man_playing_water_polo_tone3:":          "\U0001f93d\U0001f3fd\u200d\u2642\ufe0f",
-			":man_playing_water_polo_tone4:":          "\U0001f93d\U0001f3fe\u200d\u2642\ufe0f",
-			":man_playing_water_polo_tone5:":          "\U0001f93d\U0001f3ff\u200d\u2642\ufe0f",
-			":man_police_officer:":                    "\U0001f46e\u200d\u2642\ufe0f",
-			":man_police_officer_tone1:":              "\U0001f46e\U0001f3fb\u200d\u2642\ufe0f",
-			":man_police_officer_tone2:":              "\U0001f46e\U0001f3fc\u200d\u2642\ufe0f",
-			":man_police_officer_tone3:":              "\U0001f46e\U0001f3fd\u200d\u2642\ufe0f",
-			":man_police_officer_tone4:":              "\U0001f46e\U0001f3fe\u200d\u2642\ufe0f",
-			":man_police_officer_tone5:":              "\U0001f46e\U0001f3ff\u200d\u2642\ufe0f",
-			":man_pouting:":                           "\U0001f64e\u200d\u2642\ufe0f",
-			":man_pouting_tone1:":                     "\U0001f64e\U0001f3fb\u200d\u2642\ufe0f",
-			":man_pouting_tone2:":                     "\U0001f64e\U0001f3fc\u200d\u2642\ufe0f",
-			":man_pouting_tone3:":                     "\U0001f64e\U0001f3fd\u200d\u2642\ufe0f",
-			":man_pouting_tone4:":                     "\U0001f64e\U0001f3fe\u200d\u2642\ufe0f",
-			":man_pouting_tone5:":                     "\U0001f64e\U0001f3ff\u200d\u2642\ufe0f",
-			":man_raising_hand:":                      "\U0001f64b\u200d\u2642\ufe0f",
-			":man_raising_hand_tone1:":                "\U0001f64b\U0001f3fb\u200d\u2642\ufe0f",
-			":man_raising_hand_tone2:":                "\U0001f64b\U0001f3fc\u200d\u2642\ufe0f",
-			":man_raising_hand_tone3:":                "\U0001f64b\U0001f3fd\u200d\u2642\ufe0f",
-			":man_raising_hand_tone4:":                "\U0001f64b\U0001f3fe\u200d\u2642\ufe0f",
-			":man_raising_hand_tone5:":                "\U0001f64b\U0001f3ff\u200d\u2642\ufe0f",
-			":man_red_hair:":                          "\U0001f468\u200d\U0001f9b0",
-			":man_rowing_boat:":                       "\U0001f6a3\u200d\u2642\ufe0f",
-			":man_rowing_boat_tone1:":                 "\U0001f6a3\U0001f3fb\u200d\u2642\ufe0f",
-			":man_rowing_boat_tone2:":                 "\U0001f6a3\U0001f3fc\u200d\u2642\ufe0f",
-			":man_rowing_boat_tone3:":                 "\U0001f6a3\U0001f3fd\u200d\u2642\ufe0f",
-			":man_rowing_boat_tone4:":                 "\U0001f6a3\U0001f3fe\u200d\u2642\ufe0f",
-			":man_rowing_boat_tone5:":                 "\U0001f6a3\U0001f3ff\u200d\u2642\ufe0f",
-			":man_running:":                           "\U0001f3c3\u200d\u2642\ufe0f",
-			":man_running_tone1:":                     "\U0001f3c3\U0001f3fb\u200d\u2642\ufe0f",
-			":man_running_tone2:":                     "\U0001f3c3\U0001f3fc\u200d\u2642\ufe0f",
-			":man_running_tone3:":                     "\U0001f3c3\U0001f3fd\u200d\u2642\ufe0f",
-			":man_running_tone4:":                     "\U0001f3c3\U0001f3fe\u200d\u2642\ufe0f",
-			":man_running_tone5:":                     "\U0001f3c3\U0001f3ff\u200d\u2642\ufe0f",
-			":man_scientist:":                         "\U0001f468\u200d\U0001f52c",
-			":man_scientist_tone1:":                   "\U0001f468\U0001f3fb\u200d\U0001f52c",
-			":man_scientist_tone2:":                   "\U0001f468\U0001f3fc\u200d\U0001f52c",
-			":man_scientist_tone3:":                   "\U0001f468\U0001f3fd\u200d\U0001f52c",
-			":man_scientist_tone4:":                   "\U0001f468\U0001f3fe\u200d\U0001f52c",
-			":man_scientist_tone5:":                   "\U0001f468\U0001f3ff\u200d\U0001f52c",
-			":man_shrugging:":                         "\U0001f937\u200d\u2642\ufe0f",
-			":man_shrugging_tone1:":                   "\U0001f937\U0001f3fb\u200d\u2642\ufe0f",
-			":man_shrugging_tone2:":                   "\U0001f937\U0001f3fc\u200d\u2642\ufe0f",
-			":man_shrugging_tone3:":                   "\U0001f937\U0001f3fd\u200d\u2642\ufe0f",
-			":man_shrugging_tone4:":                   "\U0001f937\U0001f3fe\u200d\u2642\ufe0f",
-			":man_shrugging_tone5:":                   "\U0001f937\U0001f3ff\u200d\u2642\ufe0f",
-			":man_singer:":                            "\U0001f468\u200d\U0001f3a4",
-			":man_singer_tone1:":                      "\U0001f468\U0001f3fb\u200d\U0001f3a4",
-			":man_singer_tone2:":                      "\U0001f468\U0001f3fc\u200d\U0001f3a4",
-			":man_singer_tone3:":                      "\U0001f468\U0001f3fd\u200d\U0001f3a4",
-			":man_singer_tone4:":                      "\U0001f468\U0001f3fe\u200d\U0001f3a4",
-			":man_singer_tone5:":                      "\U0001f468\U0001f3ff\u200d\U0001f3a4",
-			":man_standing:":                          "\U0001f9cd\u200d\u2642\ufe0f",
-			":man_student:":                           "\U0001f468\u200d\U0001f393",
-			":man_student_tone1:":                     "\U0001f468\U0001f3fb\u200d\U0001f393",
-			":man_student_tone2:":                     "\U0001f468\U0001f3fc\u200d\U0001f393",
-			":man_student_tone3:":                     "\U0001f468\U0001f3fd\u200d\U0001f393",
-			":man_student_tone4:":                     "\U0001f468\U0001f3fe\u200d\U0001f393",
-			":man_student_tone5:":                     "\U0001f468\U0001f3ff\u200d\U0001f393",
-			":man_superhero:":                         "\U0001f9b8\u200d\u2642\ufe0f",
-			":man_supervillain:":                      "\U0001f9b9\u200d\u2642\ufe0f",
-			":man_surfing:":                           "\U0001f3c4\u200d\u2642\ufe0f",
-			":man_surfing_tone1:":                     "\U0001f3c4\U0001f3fb\u200d\u2642\ufe0f",
-			":man_surfing_tone2:":                     "\U0001f3c4\U0001f3fc\u200d\u2642\ufe0f",
-			":man_surfing_tone3:":                     "\U0001f3c4\U0001f3fd\u200d\u2642\ufe0f",
-			":man_surfing_tone4:":                     "\U0001f3c4\U0001f3fe\u200d\u2642\ufe0f",
-			":man_surfing_tone5:":                     "\U0001f3c4\U0001f3ff\u200d\u2642\ufe0f",
-			":man_swimming:":                          "\U0001f3ca\u200d\u2642\ufe0f",
-			":man_swimming_tone1:":                    "\U0001f3ca\U0001f3fb\u200d\u2642\ufe0f",
-			":man_swimming_tone2:":                    "\U0001f3ca\U0001f3fc\u200d\u2642\ufe0f",
-			":man_swimming_tone3:":                    "\U0001f3ca\U0001f3fd\u200d\u2642\ufe0f",
-			":man_swimming_tone4:":                    "\U0001f3ca\U0001f3fe\u200d\u2642\ufe0f",
-			":man_swimming_tone5:":                    "\U0001f3ca\U0001f3ff\u200d\u2642\ufe0f",
-			":man_teacher:":                           "\U0001f468\u200d\U0001f3eb",
-			":man_teacher_tone1:":                     "\U0001f468\U0001f3fb\u200d\U0001f3eb",
-			":man_teacher_tone2:":                     "\U0001f468\U0001f3fc\u200d\U0001f3eb",
-			":man_teacher_tone3:":                     "\U0001f468\U0001f3fd\u200d\U0001f3eb",
-			":man_teacher_tone4:":                     "\U0001f468\U0001f3fe\u200d\U0001f3eb",
-			":man_teacher_tone5:":                     "\U0001f468\U0001f3ff\u200d\U0001f3eb",
-			":man_technologist:":                      "\U0001f468\u200d\U0001f4bb",
-			":man_technologist_tone1:":                "\U0001f468\U0001f3fb\u200d\U0001f4bb",
-			":man_technologist_tone2:":                "\U0001f468\U0001f3fc\u200d\U0001f4bb",
-			":man_technologist_tone3:":                "\U0001f468\U0001f3fd\u200d\U0001f4bb",
-			":man_technologist_tone4:":                "\U0001f468\U0001f3fe\u200d\U0001f4bb",
-			":man_technologist_tone5:":                "\U0001f468\U0001f3ff\u200d\U0001f4bb",
-			":man_tipping_hand:":                      "\U0001f481\u200d\u2642\ufe0f",
-			":man_tipping_hand_tone1:":                "\U0001f481\U0001f3fb\u200d\u2642\ufe0f",
-			":man_tipping_hand_tone2:":                "\U0001f481\U0001f3fc\u200d\u2642\ufe0f",
-			":man_tipping_hand_tone3:":                "\U0001f481\U0001f3fd\u200d\u2642\ufe0f",
-			":man_tipping_hand_tone4:":                "\U0001f481\U0001f3fe\u200d\u2642\ufe0f",
-			":man_tipping_hand_tone5:":                "\U0001f481\U0001f3ff\u200d\u2642\ufe0f",
-			":man_tone1:":                             "\U0001f468\U0001f3fb",
-			":man_tone2:":                             "\U0001f468\U0001f3fc",
-			":man_tone3:":                             "\U0001f468\U0001f3fd",
-			":man_tone4:":                             "\U0001f468\U0001f3fe",
-			":man_tone5:":                             "\U0001f468\U0001f3ff",
-			":man_vampire:":                           "\U0001f9db\u200d\u2642\ufe0f",
-			":man_vampire_tone1:":                     "\U0001f9db\U0001f3fb\u200d\u2642\ufe0f",
-			":man_vampire_tone2:":                     "\U0001f9db\U0001f3fc\u200d\u2642\ufe0f",
-			":man_vampire_tone3:":                     "\U0001f9db\U0001f3fd\u200d\u2642\ufe0f",
-			":man_vampire_tone4:":                     "\U0001f9db\U0001f3fe\u200d\u2642\ufe0f",
-			":man_vampire_tone5:":                     "\U0001f9db\U0001f3ff\u200d\u2642\ufe0f",
-			":man_walking:":                           "\U0001f6b6\u200d\u2642\ufe0f",
-			":man_walking_tone1:":                     "\U0001f6b6\U0001f3fb\u200d\u2642\ufe0f",
-			":man_walking_tone2:":                     "\U0001f6b6\U0001f3fc\u200d\u2642\ufe0f",
-			":man_walking_tone3:":                     "\U0001f6b6\U0001f3fd\u200d\u2642\ufe0f",
-			":man_walking_tone4:":                     "\U0001f6b6\U0001f3fe\u200d\u2642\ufe0f",
-			":man_walking_tone5:":                     "\U0001f6b6\U0001f3ff\u200d\u2642\ufe0f",
-			":man_wearing_turban:":                    "\U0001f473\u200d\u2642\ufe0f",
-			":man_wearing_turban_tone1:":              "\U0001f473\U0001f3fb\u200d\u2642\ufe0f",
-			":man_wearing_turban_tone2:":              "\U0001f473\U0001f3fc\u200d\u2642\ufe0f",
-			":man_wearing_turban_tone3:":              "\U0001f473\U0001f3fd\u200d\u2642\ufe0f",
-			":man_wearing_turban_tone4:":              "\U0001f473\U0001f3fe\u200d\u2642\ufe0f",
-			":man_wearing_turban_tone5:":              "\U0001f473\U0001f3ff\u200d\u2642\ufe0f",
-			":man_white_hair:":                        "\U0001f468\u200d\U0001f9b3",
-			":man_with_chinese_cap:":                  "\U0001f472",
-			":man_with_chinese_cap_tone1:":            "\U0001f472\U0001f3fb",
-			":man_with_chinese_cap_tone2:":            "\U0001f472\U0001f3fc",
-			":man_with_chinese_cap_tone3:":            "\U0001f472\U0001f3fd",
-			":man_with_chinese_cap_tone4:":            "\U0001f472\U0001f3fe",
-			":man_with_chinese_cap_tone5:":            "\U0001f472\U0001f3ff",
-			":man_with_gua_pi_mao:":                   "\U0001f472",
-			":man_with_probing_cane:":                 "\U0001f468\u200d\U0001f9af",
-			":man_with_turban:":                       "\U0001f473\u200d\u2642\ufe0f",
-			":man_with_veil:":                         "\U0001f470\u200d\u2642\ufe0f",
-			":man_with_white_cane:":                   "\U0001f468\u200d\U0001f9af",
-			":man_zombie:":                            "\U0001f9df\u200d\u2642\ufe0f",
-			":mandarin:":                              "\U0001f34a",
-			":mango:":                                 "\U0001f96d",
-			":mans_shoe:":                             "\U0001f45e",
-			":mantelpiece_clock:":                     "\U0001f570\ufe0f",
-			":manual_wheelchair:":                     "\U0001f9bd",
-			":man’s_shoe:":                            "\U0001f45e",
-			":map:":                                   "\U0001f5fa",
-			":map_of_Japan:":                          "\U0001f5fe",
-			":maple_leaf:":                            "\U0001f341",
-			":marshall_islands:":                      "\U0001f1f2\U0001f1ed",
-			":martial_arts_uniform:":                  "\U0001f94b",
-			":martinique:":                            "\U0001f1f2\U0001f1f6",
-			":mask:":                                  "\U0001f637",
-			":massage:":                               "\U0001f486\u200d\u2640\ufe0f",
-			":massage_man:":                           "\U0001f486\u200d\u2642\ufe0f",
-			":massage_woman:":                         "\U0001f486\u200d\u2640\ufe0f",
-			":mate:":                                  "\U0001f9c9",
-			":mate_drink:":                            "\U0001f9c9",
-			":mauritania:":                            "\U0001f1f2\U0001f1f7",
-			":mauritius:":                             "\U0001f1f2\U0001f1fa",
-			":mayotte:":                               "\U0001f1fe\U0001f1f9",
-			":meat_on_bone:":                          "\U0001f356",
-			":mechanic:":                              "\U0001f9d1\u200d\U0001f527",
-			":mechanical_arm:":                        "\U0001f9be",
-			":mechanical_leg:":                        "\U0001f9bf",
-			":medal:":                                 "\U0001f396\ufe0f",
-			":medal_military:":                        "\U0001f396\ufe0f",
-			":medal_sports:":                          "\U0001f3c5",
-			":medical_symbol:":                        "\u2695\ufe0f",
-			":mega:":                                  "\U0001f4e3",
-			":megaphone:":                             "\U0001f4e3",
-			":melon:":                                 "\U0001f348",
-			":memo:":                                  "\U0001f4dd",
-			":men_holding_hands:":                     "\U0001f46c",
-			":men_with_bunny_ears:":                   "\U0001f46f\u200d\u2642\ufe0f",
-			":men_with_bunny_ears_partying:":          "\U0001f46f\u200d\u2642\ufe0f",
-			":men_wrestling:":                         "\U0001f93c\u200d\u2642\ufe0f",
-			":mending_heart:":                         "\u2764\ufe0f\u200d\U0001fa79",
-			":menorah:":                               "\U0001f54e",
-			":menorah_with_nine_branches:":            "\U0001f54e",
-			":mens:":                                  "\U0001f6b9",
-			":men’s_room:":                            "\U0001f6b9",
-			":mermaid:":                               "\U0001f9dc\u200d\u2640\ufe0f",
-			":mermaid_tone1:":                         "\U0001f9dc\U0001f3fb\u200d\u2640\ufe0f",
-			":mermaid_tone2:":                         "\U0001f9dc\U0001f3fc\u200d\u2640\ufe0f",
-			":mermaid_tone3:":                         "\U0001f9dc\U0001f3fd\u200d\u2640\ufe0f",
-			":mermaid_tone4:":                         "\U0001f9dc\U0001f3fe\u200d\u2640\ufe0f",
-			":mermaid_tone5:":                         "\U0001f9dc\U0001f3ff\u200d\u2640\ufe0f",
-			":merman:":                                "\U0001f9dc\u200d\u2642\ufe0f",
-			":merman_tone1:":                          "\U0001f9dc\U0001f3fb\u200d\u2642\ufe0f",
-			":merman_tone2:":                          "\U0001f9dc\U0001f3fc\u200d\u2642\ufe0f",
-			":merman_tone3:":                          "\U0001f9dc\U0001f3fd\u200d\u2642\ufe0f",
-			":merman_tone4:":                          "\U0001f9dc\U0001f3fe\u200d\u2642\ufe0f",
-			":merman_tone5:":                          "\U0001f9dc\U0001f3ff\u200d\u2642\ufe0f",
-			":merperson:":                             "\U0001f9dc\u200d\u2642\ufe0f",
-			":merperson_tone1:":                       "\U0001f9dc\U0001f3fb",
-			":merperson_tone2:":                       "\U0001f9dc\U0001f3fc",
-			":merperson_tone3:":                       "\U0001f9dc\U0001f3fd",
-			":merperson_tone4:":                       "\U0001f9dc\U0001f3fe",
-			":merperson_tone5:":                       "\U0001f9dc\U0001f3ff",
-			":metal:":                                 "\U0001f918",
-			":metal_tone1:":                           "\U0001f918\U0001f3fb",
-			":metal_tone2:":                           "\U0001f918\U0001f3fc",
-			":metal_tone3:":                           "\U0001f918\U0001f3fd",
-			":metal_tone4:":                           "\U0001f918\U0001f3fe",
-			":metal_tone5:":                           "\U0001f918\U0001f3ff",
-			":metro:":                                 "\U0001f687",
-			":mexico:":                                "\U0001f1f2\U0001f1fd",
-			":microbe:":                               "\U0001f9a0",
-			":micronesia:":                            "\U0001f1eb\U0001f1f2",
-			":microphone:":                            "\U0001f3a4",
-			":microphone2:":                           "\U0001f399",
-			":microscope:":                            "\U0001f52c",
-			":middle_finger:":                         "\U0001f595",
-			":middle_finger_tone1:":                   "\U0001f595\U0001f3fb",
-			":middle_finger_tone2:":                   "\U0001f595\U0001f3fc",
-			":middle_finger_tone3:":                   "\U0001f595\U0001f3fd",
-			":middle_finger_tone4:":                   "\U0001f595\U0001f3fe",
-			":middle_finger_tone5:":                   "\U0001f595\U0001f3ff",
-			":military_helmet:":                       "\U0001fa96",
-			":military_medal:":                        "\U0001f396",
-			":milk:":                                  "\U0001f95b",
-			":milk_glass:":                            "\U0001f95b",
-			":milky_way:":                             "\U0001f30c",
-			":minibus:":                               "\U0001f690",
-			":minidisc:":                              "\U0001f4bd",
-			":minus:":                                 "\u2796",
-			":mirror:":                                "\U0001fa9e",
-			":moai:":                                  "\U0001f5ff",
-			":mobile_phone:":                          "\U0001f4f1",
-			":mobile_phone_off:":                      "\U0001f4f4",
-			":mobile_phone_with_arrow:":               "\U0001f4f2",
-			":moldova:":                               "\U0001f1f2\U0001f1e9",
-			":monaco:":                                "\U0001f1f2\U0001f1e8",
-			":money-mouth_face:":                      "\U0001f911",
-			":money_bag:":                             "\U0001f4b0",
-			":money_mouth:":                           "\U0001f911",
-			":money_mouth_face:":                      "\U0001f911",
-			":money_with_wings:":                      "\U0001f4b8",
-			":moneybag:":                              "\U0001f4b0",
-			":mongolia:":                              "\U0001f1f2\U0001f1f3",
-			":monkey:":                                "\U0001f412",
-			":monkey_face:":                           "\U0001f435",
-			":monocle_face:":                          "\U0001f9d0",
-			":monorail:":                              "\U0001f69d",
-			":montenegro:":                            "\U0001f1f2\U0001f1ea",
-			":montserrat:":                            "\U0001f1f2\U0001f1f8",
-			":moon:":                                  "\U0001f314",
-			":moon_cake:":                             "\U0001f96e",
-			":moon_viewing_ceremony:":                 "\U0001f391",
-			":morocco:":                               "\U0001f1f2\U0001f1e6",
-			":mortar_board:":                          "\U0001f393",
-			":mosque:":                                "\U0001f54c",
-			":mosquito:":                              "\U0001f99f",
-			":mostly_sunny:":                          "\U0001f324\ufe0f",
-			":motor_boat:":                            "\U0001f6e5\ufe0f",
-			":motor_scooter:":                         "\U0001f6f5",
-			":motorboat:":                             "\U0001f6e5",
-			":motorcycle:":                            "\U0001f3cd",
-			":motorized_wheelchair:":                  "\U0001f9bc",
-			":motorway:":                              "\U0001f6e3\ufe0f",
-			":mount_fuji:":                            "\U0001f5fb",
-			":mountain:":                              "\u26f0\ufe0f",
-			":mountain_bicyclist:":                    "\U0001f6b5\u200d\u2642\ufe0f",
-			":mountain_biking_man:":                   "\U0001f6b5\u200d\u2642\ufe0f",
-			":mountain_biking_woman:":                 "\U0001f6b5\u200d\u2640\ufe0f",
-			":mountain_cableway:":                     "\U0001f6a0",
-			":mountain_railway:":                      "\U0001f69e",
-			":mountain_snow:":                         "\U0001f3d4",
-			":mouse:":                                 "\U0001f42d",
-			":mouse2:":                                "\U0001f401",
-			":mouse_face:":                            "\U0001f42d",
-			":mouse_three_button:":                    "\U0001f5b1",
-			":mouse_trap:":                            "\U0001faa4",
-			":mouth:":                                 "\U0001f444",
-			":movie_camera:":                          "\U0001f3a5",
-			":moyai:":                                 "\U0001f5ff",
-			":mozambique:":                            "\U0001f1f2\U0001f1ff",
-			":mrs_claus:":                             "\U0001f936",
-			":mrs_claus_tone1:":                       "\U0001f936\U0001f3fb",
-			":mrs_claus_tone2:":                       "\U0001f936\U0001f3fc",
-			":mrs_claus_tone3:":                       "\U0001f936\U0001f3fd",
-			":mrs_claus_tone4:":                       "\U0001f936\U0001f3fe",
-			":mrs_claus_tone5:":                       "\U0001f936\U0001f3ff",
-			":multiply:":                              "\u2716",
-			":muscle:":                                "\U0001f4aa",
-			":muscle_tone1:":                          "\U0001f4aa\U0001f3fb",
-			":muscle_tone2:":                          "\U0001f4aa\U0001f3fc",
-			":muscle_tone3:":                          "\U0001f4aa\U0001f3fd",
-			":muscle_tone4:":                          "\U0001f4aa\U0001f3fe",
-			":muscle_tone5:":                          "\U0001f4aa\U0001f3ff",
-			":mushroom:":                              "\U0001f344",
-			":musical_keyboard:":                      "\U0001f3b9",
-			":musical_note:":                          "\U0001f3b5",
-			":musical_notes:":                         "\U0001f3b6",
-			":musical_score:":                         "\U0001f3bc",
-			":mute:":                                  "\U0001f507",
-			":muted_speaker:":                         "\U0001f507",
-			":mx_claus:":                              "\U0001f9d1\u200d\U0001f384",
-			":myanmar:":                               "\U0001f1f2\U0001f1f2",
-			":nail_care:":                             "\U0001f485",
-			":nail_care_tone1:":                       "\U0001f485\U0001f3fb",
-			":nail_care_tone2:":                       "\U0001f485\U0001f3fc",
-			":nail_care_tone3:":                       "\U0001f485\U0001f3fd",
-			":nail_care_tone4:":                       "\U0001f485\U0001f3fe",
-			":nail_care_tone5:":                       "\U0001f485\U0001f3ff",
-			":nail_polish:":                           "\U0001f485",
-			":name_badge:":                            "\U0001f4db",
-			":namibia:":                               "\U0001f1f3\U0001f1e6",
-			":national_park:":                         "\U0001f3de\ufe0f",
-			":nauru:":                                 "\U0001f1f3\U0001f1f7",
-			":nauseated_face:":                        "\U0001f922",
-			":nazar_amulet:":                          "\U0001f9ff",
-			":necktie:":                               "\U0001f454",
-			":negative_squared_cross_mark:":           "\u274e",
-			":nepal:":                                 "\U0001f1f3\U0001f1f5",
-			":nerd:":                                  "\U0001f913",
-			":nerd_face:":                             "\U0001f913",
-			":nesting_dolls:":                         "\U0001fa86",
-			":netherlands:":                           "\U0001f1f3\U0001f1f1",
-			":neutral_face:":                          "\U0001f610",
-			":new:":                                   "\U0001f195",
-			":new_caledonia:":                         "\U0001f1f3\U0001f1e8",
-			":new_moon:":                              "\U0001f311",
-			":new_moon_face:":                         "\U0001f31a",
-			":new_moon_with_face:":                    "\U0001f31a",
-			":new_zealand:":                           "\U0001f1f3\U0001f1ff",
-			":newspaper:":                             "\U0001f4f0",
-			":newspaper2:":                            "\U0001f5de",
-			":newspaper_roll:":                        "\U0001f5de\ufe0f",
-			":next_track_button:":                     "\u23ed",
-			":ng:":                                    "\U0001f196",
-			":ng_man:":                                "\U0001f645\u200d\u2642\ufe0f",
-			":ng_woman:":                              "\U0001f645\u200d\u2640\ufe0f",
-			":nicaragua:":                             "\U0001f1f3\U0001f1ee",
-			":niger:":                                 "\U0001f1f3\U0001f1ea",
-			":nigeria:":                               "\U0001f1f3\U0001f1ec",
-			":night_with_stars:":                      "\U0001f303",
-			":nine:":                                  "9\ufe0f\u20e3",
-			":nine-thirty:":                           "\U0001f564",
-			":nine_o’clock:":                          "\U0001f558",
-			":ninja:":                                 "\U0001f977",
-			":niue:":                                  "\U0001f1f3\U0001f1fa",
-			":no_bell:":                               "\U0001f515",
-			":no_bicycles:":                           "\U0001f6b3",
-			":no_entry:":                              "\u26d4",
-			":no_entry_sign:":                         "\U0001f6ab",
-			":no_good:":                               "\U0001f645\u200d\u2640\ufe0f",
-			":no_good_man:":                           "\U0001f645\u200d\u2642\ufe0f",
-			":no_good_woman:":                         "\U0001f645\u200d\u2640\ufe0f",
-			":no_littering:":                          "\U0001f6af",
-			":no_mobile_phones:":                      "\U0001f4f5",
-			":no_mouth:":                              "\U0001f636",
-			":no_one_under_eighteen:":                 "\U0001f51e",
-			":no_pedestrians:":                        "\U0001f6b7",
-			":no_smoking:":                            "\U0001f6ad",
-			":non-potable_water:":                     "\U0001f6b1",
-			":norfolk_island:":                        "\U0001f1f3\U0001f1eb",
-			":north_korea:":                           "\U0001f1f0\U0001f1f5",
-			":northern_mariana_islands:":              "\U0001f1f2\U0001f1f5",
-			":norway:":                                "\U0001f1f3\U0001f1f4",
-			":nose:":                                  "\U0001f443",
-			":nose_tone1:":                            "\U0001f443\U0001f3fb",
-			":nose_tone2:":                            "\U0001f443\U0001f3fc",
-			":nose_tone3:":                            "\U0001f443\U0001f3fd",
-			":nose_tone4:":                            "\U0001f443\U0001f3fe",
-			":nose_tone5:":                            "\U0001f443\U0001f3ff",
-			":notebook:":                              "\U0001f4d3",
-			":notebook_with_decorative_cover:":        "\U0001f4d4",
-			":notepad_spiral:":                        "\U0001f5d2",
-			":notes:":                                 "\U0001f3b6",
-			":nut_and_bolt:":                          "\U0001f529",
-			":o:":                                     "\u2b55",
-			":o2:":                                    "\U0001f17e\ufe0f",
-			":ocean:":                                 "\U0001f30a",
-			":octagonal_sign:":                        "\U0001f6d1",
-			":octopus:":                               "\U0001f419",
-			":oden:":                                  "\U0001f362",
-			":office:":                                "\U0001f3e2",
-			":office_building:":                       "\U0001f3e2",
-			":office_worker:":                         "\U0001f9d1\u200d\U0001f4bc",
-			":ogre:":                                  "\U0001f479",
-			":oil:":                                   "\U0001f6e2",
-			":oil_drum:":                              "\U0001f6e2\ufe0f",
-			":ok:":                                    "\U0001f197",
-			":ok_hand:":                               "\U0001f44c",
-			":ok_hand_tone1:":                         "\U0001f44c\U0001f3fb",
-			":ok_hand_tone2:":                         "\U0001f44c\U0001f3fc",
-			":ok_hand_tone3:":                         "\U0001f44c\U0001f3fd",
-			":ok_hand_tone4:":                         "\U0001f44c\U0001f3fe",
-			":ok_hand_tone5:":                         "\U0001f44c\U0001f3ff",
-			":ok_man:":                                "\U0001f646\u200d\u2642\ufe0f",
-			":ok_person:":                             "\U0001f646",
-			":ok_woman:":                              "\U0001f646\u200d\u2640\ufe0f",
-			":old_key:":                               "\U0001f5dd\ufe0f",
-			":old_man:":                               "\U0001f474",
-			":old_woman:":                             "\U0001f475",
-			":older_adult:":                           "\U0001f9d3",
-			":older_adult_tone1:":                     "\U0001f9d3\U0001f3fb",
-			":older_adult_tone2:":                     "\U0001f9d3\U0001f3fc",
-			":older_adult_tone3:":                     "\U0001f9d3\U0001f3fd",
-			":older_adult_tone4:":                     "\U0001f9d3\U0001f3fe",
-			":older_adult_tone5:":                     "\U0001f9d3\U0001f3ff",
-			":older_man:":                             "\U0001f474",
-			":older_man_tone1:":                       "\U0001f474\U0001f3fb",
-			":older_man_tone2:":                       "\U0001f474\U0001f3fc",
-			":older_man_tone3:":                       "\U0001f474\U0001f3fd",
-			":older_man_tone4:":                       "\U0001f474\U0001f3fe",
-			":older_man_tone5:":                       "\U0001f474\U0001f3ff",
-			":older_person:":                          "\U0001f9d3",
-			":older_woman:":                           "\U0001f475",
-			":older_woman_tone1:":                     "\U0001f475\U0001f3fb",
-			":older_woman_tone2:":                     "\U0001f475\U0001f3fc",
-			":older_woman_tone3:":                     "\U0001f475\U0001f3fd",
-			":older_woman_tone4:":                     "\U0001f475\U0001f3fe",
-			":older_woman_tone5:":                     "\U0001f475\U0001f3ff",
-			":olive:":                                 "\U0001fad2",
-			":om:":                                    "\U0001f549",
-			":om_symbol:":                             "\U0001f549\ufe0f",
-			":oman:":                                  "\U0001f1f4\U0001f1f2",
-			":on:":                                    "\U0001f51b",
-			":oncoming_automobile:":                   "\U0001f698",
-			":oncoming_bus:":                          "\U0001f68d",
-			":oncoming_fist:":                         "\U0001f44a",
-			":oncoming_police_car:":                   "\U0001f694",
-			":oncoming_taxi:":                         "\U0001f696",
-			":one:":                                   "1\ufe0f\u20e3",
-			":one-piece_swimsuit:":                    "\U0001fa71",
-			":one-thirty:":                            "\U0001f55c",
-			":one_o’clock:":                           "\U0001f550",
-			":one_piece_swimsuit:":                    "\U0001fa71",
-			":onion:":                                 "\U0001f9c5",
-			":open_book:":                             "\U0001f4d6",
-			":open_file_folder:":                      "\U0001f4c2",
-			":open_hands:":                            "\U0001f450",
-			":open_hands_tone1:":                      "\U0001f450\U0001f3fb",
-			":open_hands_tone2:":                      "\U0001f450\U0001f3fc",
-			":open_hands_tone3:":                      "\U0001f450\U0001f3fd",
-			":open_hands_tone4:":                      "\U0001f450\U0001f3fe",
-			":open_hands_tone5:":                      "\U0001f450\U0001f3ff",
-			":open_mailbox_with_lowered_flag:":        "\U0001f4ed",
-			":open_mailbox_with_raised_flag:":         "\U0001f4ec",
-			":open_mouth:":                            "\U0001f62e",
-			":open_umbrella:":                         "\u2602\ufe0f",
-			":ophiuchus:":                             "\u26ce",
-			":optical_disk:":                          "\U0001f4bf",
-			":orange:":                                "\U0001f34a",
-			":orange_book:":                           "\U0001f4d9",
-			":orange_circle:":                         "\U0001f7e0",
-			":orange_heart:":                          "\U0001f9e1",
-			":orange_square:":                         "\U0001f7e7",
-			":orangutan:":                             "\U0001f9a7",
-			":orthodox_cross:":                        "\u2626\ufe0f",
-			":otter:":                                 "\U0001f9a6",
-			":outbox_tray:":                           "\U0001f4e4",
-			":owl:":                                   "\U0001f989",
-			":ox:":                                    "\U0001f402",
-			":oyster:":                                "\U0001f9aa",
-			":package:":                               "\U0001f4e6",
-			":page_facing_up:":                        "\U0001f4c4",
-			":page_with_curl:":                        "\U0001f4c3",
-			":pager:":                                 "\U0001f4df",
-			":paintbrush:":                            "\U0001f58c",
-			":pakistan:":                              "\U0001f1f5\U0001f1f0",
-			":palau:":                                 "\U0001f1f5\U0001f1fc",
-			":palestinian_territories:":               "\U0001f1f5\U0001f1f8",
-			":palm_tree:":                             "\U0001f334",
-			":palms_up_together:":                     "\U0001f932",
-			":palms_up_together_tone1:":               "\U0001f932\U0001f3fb",
-			":palms_up_together_tone2:":               "\U0001f932\U0001f3fc",
-			":palms_up_together_tone3:":               "\U0001f932\U0001f3fd",
-			":palms_up_together_tone4:":               "\U0001f932\U0001f3fe",
-			":palms_up_together_tone5:":               "\U0001f932\U0001f3ff",
-			":panama:":                                "\U0001f1f5\U0001f1e6",
-			":pancakes:":                              "\U0001f95e",
-			":panda:":                                 "\U0001f43c",
-			":panda_face:":                            "\U0001f43c",
-			":paperclip:":                             "\U0001f4ce",
-			":paperclips:":                            "\U0001f587",
-			":papua_new_guinea:":                      "\U0001f1f5\U0001f1ec",
-			":parachute:":                             "\U0001fa82",
-			":paraguay:":                              "\U0001f1f5\U0001f1fe",
-			":parasol_on_ground:":                     "\u26f1\ufe0f",
-			":park:":                                  "\U0001f3de",
-			":parking:":                               "\U0001f17f\ufe0f",
-			":parrot:":                                "\U0001f99c",
-			":part_alternation_mark:":                 "\u303d\ufe0f",
-			":partly_sunny:":                          "\u26c5",
-			":partly_sunny_rain:":                     "\U0001f326\ufe0f",
-			":party_popper:":                          "\U0001f389",
-			":partying_face:":                         "\U0001f973",
-			":passenger_ship:":                        "\U0001f6f3\ufe0f",
-			":passport_control:":                      "\U0001f6c2",
-			":pause_button:":                          "\u23f8",
-			":paw_prints:":                            "\U0001f43e",
-			":peace:":                                 "\u262e",
-			":peace_symbol:":                          "\u262e\ufe0f",
-			":peach:":                                 "\U0001f351",
-			":peacock:":                               "\U0001f99a",
-			":peanuts:":                               "\U0001f95c",
-			":pear:":                                  "\U0001f350",
-			":pen:":                                   "\U0001f58a",
-			":pen_ballpoint:":                         "\U0001f58a",
-			":pen_fountain:":                          "\U0001f58b",
-			":pencil:":                                "\u270f",
-			":pencil2:":                               "\u270f\ufe0f",
-			":penguin:":                               "\U0001f427",
-			":pensive:":                               "\U0001f614",
-			":pensive_face:":                          "\U0001f614",
-			":people_holding_hands:":                  "\U0001f9d1\u200d\U0001f91d\u200d\U0001f9d1",
-			":people_hugging:":                        "\U0001fac2",
-			":people_with_bunny_ears:":                "\U0001f46f",
-			":people_with_bunny_ears_partying:":       "\U0001f46f",
-			":people_wrestling:":                      "\U0001f93c",
-			":performing_arts:":                       "\U0001f3ad",
-			":persevere:":                             "\U0001f623",
-			":persevering_face:":                      "\U0001f623",
-			":person:":                                "\U0001f9d1",
-			":person_bald:":                           "\U0001f9d1\u200d\U0001f9b2",
-			":person_beard:":                          "\U0001f9d4",
-			":person_biking:":                         "\U0001f6b4",
-			":person_biking_tone1:":                   "\U0001f6b4\U0001f3fb",
-			":person_biking_tone2:":                   "\U0001f6b4\U0001f3fc",
-			":person_biking_tone3:":                   "\U0001f6b4\U0001f3fd",
-			":person_biking_tone4:":                   "\U0001f6b4\U0001f3fe",
-			":person_biking_tone5:":                   "\U0001f6b4\U0001f3ff",
-			":person_blond_hair:":                     "\U0001f471",
-			":person_bouncing_ball:":                  "\u26f9",
-			":person_bouncing_ball_tone1:":            "\u26f9\U0001f3fb",
-			":person_bouncing_ball_tone2:":            "\u26f9\U0001f3fc",
-			":person_bouncing_ball_tone3:":            "\u26f9\U0001f3fd",
-			":person_bouncing_ball_tone4:":            "\u26f9\U0001f3fe",
-			":person_bouncing_ball_tone5:":            "\u26f9\U0001f3ff",
-			":person_bowing:":                         "\U0001f647",
-			":person_bowing_tone1:":                   "\U0001f647\U0001f3fb",
-			":person_bowing_tone2:":                   "\U0001f647\U0001f3fc",
-			":person_bowing_tone3:":                   "\U0001f647\U0001f3fd",
-			":person_bowing_tone4:":                   "\U0001f647\U0001f3fe",
-			":person_bowing_tone5:":                   "\U0001f647\U0001f3ff",
-			":person_cartwheeling:":                   "\U0001f938",
-			":person_climbing:":                       "\U0001f9d7\u200d\u2640\ufe0f",
-			":person_climbing_tone1:":                 "\U0001f9d7\U0001f3fb",
-			":person_climbing_tone2:":                 "\U0001f9d7\U0001f3fc",
-			":person_climbing_tone3:":                 "\U0001f9d7\U0001f3fd",
-			":person_climbing_tone4:":                 "\U0001f9d7\U0001f3fe",
-			":person_climbing_tone5:":                 "\U0001f9d7\U0001f3ff",
-			":person_curly_hair:":                     "\U0001f9d1\u200d\U0001f9b1",
-			":person_doing_cartwheel:":                "\U0001f938",
-			":person_doing_cartwheel_tone1:":          "\U0001f938\U0001f3fb",
-			":person_doing_cartwheel_tone2:":          "\U0001f938\U0001f3fc",
-			":person_doing_cartwheel_tone3:":          "\U0001f938\U0001f3fd",
-			":person_doing_cartwheel_tone4:":          "\U0001f938\U0001f3fe",
-			":person_doing_cartwheel_tone5:":          "\U0001f938\U0001f3ff",
-			":person_facepalming:":                    "\U0001f926",
-			":person_facepalming_tone1:":              "\U0001f926\U0001f3fb",
-			":person_facepalming_tone2:":              "\U0001f926\U0001f3fc",
-			":person_facepalming_tone3:":              "\U0001f926\U0001f3fd",
-			":person_facepalming_tone4:":              "\U0001f926\U0001f3fe",
-			":person_facepalming_tone5:":              "\U0001f926\U0001f3ff",
-			":person_feeding_baby:":                   "\U0001f9d1\u200d\U0001f37c",
-			":person_fencing:":                        "\U0001f93a",
-			":person_frowning:":                       "\U0001f64d\u200d\u2640\ufe0f",
-			":person_frowning_tone1:":                 "\U0001f64d\U0001f3fb",
-			":person_frowning_tone2:":                 "\U0001f64d\U0001f3fc",
-			":person_frowning_tone3:":                 "\U0001f64d\U0001f3fd",
-			":person_frowning_tone4:":                 "\U0001f64d\U0001f3fe",
-			":person_frowning_tone5:":                 "\U0001f64d\U0001f3ff",
-			":person_gesturing_NO:":                   "\U0001f645",
-			":person_gesturing_OK:":                   "\U0001f646",
-			":person_gesturing_no:":                   "\U0001f645",
-			":person_gesturing_no_tone1:":             "\U0001f645\U0001f3fb",
-			":person_gesturing_no_tone2:":             "\U0001f645\U0001f3fc",
-			":person_gesturing_no_tone3:":             "\U0001f645\U0001f3fd",
-			":person_gesturing_no_tone4:":             "\U0001f645\U0001f3fe",
-			":person_gesturing_no_tone5:":             "\U0001f645\U0001f3ff",
-			":person_gesturing_ok:":                   "\U0001f646",
-			":person_gesturing_ok_tone1:":             "\U0001f646\U0001f3fb",
-			":person_gesturing_ok_tone2:":             "\U0001f646\U0001f3fc",
-			":person_gesturing_ok_tone3:":             "\U0001f646\U0001f3fd",
-			":person_gesturing_ok_tone4:":             "\U0001f646\U0001f3fe",
-			":person_gesturing_ok_tone5:":             "\U0001f646\U0001f3ff",
-			":person_getting_haircut:":                "\U0001f487",
-			":person_getting_haircut_tone1:":          "\U0001f487\U0001f3fb",
-			":person_getting_haircut_tone2:":          "\U0001f487\U0001f3fc",
-			":person_getting_haircut_tone3:":          "\U0001f487\U0001f3fd",
-			":person_getting_haircut_tone4:":          "\U0001f487\U0001f3fe",
-			":person_getting_haircut_tone5:":          "\U0001f487\U0001f3ff",
-			":person_getting_massage:":                "\U0001f486",
-			":person_getting_massage_tone1:":          "\U0001f486\U0001f3fb",
-			":person_getting_massage_tone2:":          "\U0001f486\U0001f3fc",
-			":person_getting_massage_tone3:":          "\U0001f486\U0001f3fd",
-			":person_getting_massage_tone4:":          "\U0001f486\U0001f3fe",
-			":person_getting_massage_tone5:":          "\U0001f486\U0001f3ff",
-			":person_golfing:":                        "\U0001f3cc",
-			":person_golfing_tone1:":                  "\U0001f3cc\U0001f3fb",
-			":person_golfing_tone2:":                  "\U0001f3cc\U0001f3fc",
-			":person_golfing_tone3:":                  "\U0001f3cc\U0001f3fd",
-			":person_golfing_tone4:":                  "\U0001f3cc\U0001f3fe",
-			":person_golfing_tone5:":                  "\U0001f3cc\U0001f3ff",
-			":person_in_bed:":                         "\U0001f6cc",
-			":person_in_bed_tone1:":                   "\U0001f6cc\U0001f3fb",
-			":person_in_bed_tone2:":                   "\U0001f6cc\U0001f3fc",
-			":person_in_bed_tone3:":                   "\U0001f6cc\U0001f3fd",
-			":person_in_bed_tone4:":                   "\U0001f6cc\U0001f3fe",
-			":person_in_bed_tone5:":                   "\U0001f6cc\U0001f3ff",
-			":person_in_lotus_position:":              "\U0001f9d8\u200d\u2640\ufe0f",
-			":person_in_lotus_position_tone1:":        "\U0001f9d8\U0001f3fb",
-			":person_in_lotus_position_tone2:":        "\U0001f9d8\U0001f3fc",
-			":person_in_lotus_position_tone3:":        "\U0001f9d8\U0001f3fd",
-			":person_in_lotus_position_tone4:":        "\U0001f9d8\U0001f3fe",
-			":person_in_lotus_position_tone5:":        "\U0001f9d8\U0001f3ff",
-			":person_in_manual_wheelchair:":           "\U0001f9d1\u200d\U0001f9bd",
-			":person_in_motorized_wheelchair:":        "\U0001f9d1\u200d\U0001f9bc",
-			":person_in_steamy_room:":                 "\U0001f9d6\u200d\u2642\ufe0f",
-			":person_in_steamy_room_tone1:":           "\U0001f9d6\U0001f3fb",
-			":person_in_steamy_room_tone2:":           "\U0001f9d6\U0001f3fc",
-			":person_in_steamy_room_tone3:":           "\U0001f9d6\U0001f3fd",
-			":person_in_steamy_room_tone4:":           "\U0001f9d6\U0001f3fe",
-			":person_in_steamy_room_tone5:":           "\U0001f9d6\U0001f3ff",
-			":person_in_suit_levitating:":             "\U0001f574",
-			":person_in_tuxedo:":                      "\U0001f935",
-			":person_juggling:":                       "\U0001f939",
-			":person_juggling_tone1:":                 "\U0001f939\U0001f3fb",
-			":person_juggling_tone2:":                 "\U0001f939\U0001f3fc",
-			":person_juggling_tone3:":                 "\U0001f939\U0001f3fd",
-			":person_juggling_tone4:":                 "\U0001f939\U0001f3fe",
-			":person_juggling_tone5:":                 "\U0001f939\U0001f3ff",
-			":person_kneeling:":                       "\U0001f9ce",
-			":person_lifting_weights:":                "\U0001f3cb",
-			":person_lifting_weights_tone1:":          "\U0001f3cb\U0001f3fb",
-			":person_lifting_weights_tone2:":          "\U0001f3cb\U0001f3fc",
-			":person_lifting_weights_tone3:":          "\U0001f3cb\U0001f3fd",
-			":person_lifting_weights_tone4:":          "\U0001f3cb\U0001f3fe",
-			":person_lifting_weights_tone5:":          "\U0001f3cb\U0001f3ff",
-			":person_mountain_biking:":                "\U0001f6b5",
-			":person_mountain_biking_tone1:":          "\U0001f6b5\U0001f3fb",
-			":person_mountain_biking_tone2:":          "\U0001f6b5\U0001f3fc",
-			":person_mountain_biking_tone3:":          "\U0001f6b5\U0001f3fd",
-			":person_mountain_biking_tone4:":          "\U0001f6b5\U0001f3fe",
-			":person_mountain_biking_tone5:":          "\U0001f6b5\U0001f3ff",
-			":person_playing_handball:":               "\U0001f93e",
-			":person_playing_handball_tone1:":         "\U0001f93e\U0001f3fb",
-			":person_playing_handball_tone2:":         "\U0001f93e\U0001f3fc",
-			":person_playing_handball_tone3:":         "\U0001f93e\U0001f3fd",
-			":person_playing_handball_tone4:":         "\U0001f93e\U0001f3fe",
-			":person_playing_handball_tone5:":         "\U0001f93e\U0001f3ff",
-			":person_playing_water_polo:":             "\U0001f93d",
-			":person_playing_water_polo_tone1:":       "\U0001f93d\U0001f3fb",
-			":person_playing_water_polo_tone2:":       "\U0001f93d\U0001f3fc",
-			":person_playing_water_polo_tone3:":       "\U0001f93d\U0001f3fd",
-			":person_playing_water_polo_tone4:":       "\U0001f93d\U0001f3fe",
-			":person_playing_water_polo_tone5:":       "\U0001f93d\U0001f3ff",
-			":person_pouting:":                        "\U0001f64e",
-			":person_pouting_tone1:":                  "\U0001f64e\U0001f3fb",
-			":person_pouting_tone2:":                  "\U0001f64e\U0001f3fc",
-			":person_pouting_tone3:":                  "\U0001f64e\U0001f3fd",
-			":person_pouting_tone4:":                  "\U0001f64e\U0001f3fe",
-			":person_pouting_tone5:":                  "\U0001f64e\U0001f3ff",
-			":person_raising_hand:":                   "\U0001f64b",
-			":person_raising_hand_tone1:":             "\U0001f64b\U0001f3fb",
-			":person_raising_hand_tone2:":             "\U0001f64b\U0001f3fc",
-			":person_raising_hand_tone3:":             "\U0001f64b\U0001f3fd",
-			":person_raising_hand_tone4:":             "\U0001f64b\U0001f3fe",
-			":person_raising_hand_tone5:":             "\U0001f64b\U0001f3ff",
-			":person_red_hair:":                       "\U0001f9d1\u200d\U0001f9b0",
-			":person_rowing_boat:":                    "\U0001f6a3",
-			":person_rowing_boat_tone1:":              "\U0001f6a3\U0001f3fb",
-			":person_rowing_boat_tone2:":              "\U0001f6a3\U0001f3fc",
-			":person_rowing_boat_tone3:":              "\U0001f6a3\U0001f3fd",
-			":person_rowing_boat_tone4:":              "\U0001f6a3\U0001f3fe",
-			":person_rowing_boat_tone5:":              "\U0001f6a3\U0001f3ff",
-			":person_running:":                        "\U0001f3c3",
-			":person_running_tone1:":                  "\U0001f3c3\U0001f3fb",
-			":person_running_tone2:":                  "\U0001f3c3\U0001f3fc",
-			":person_running_tone3:":                  "\U0001f3c3\U0001f3fd",
-			":person_running_tone4:":                  "\U0001f3c3\U0001f3fe",
-			":person_running_tone5:":                  "\U0001f3c3\U0001f3ff",
-			":person_shrugging:":                      "\U0001f937",
-			":person_shrugging_tone1:":                "\U0001f937\U0001f3fb",
-			":person_shrugging_tone2:":                "\U0001f937\U0001f3fc",
-			":person_shrugging_tone3:":                "\U0001f937\U0001f3fd",
-			":person_shrugging_tone4:":                "\U0001f937\U0001f3fe",
-			":person_shrugging_tone5:":                "\U0001f937\U0001f3ff",
-			":person_standing:":                       "\U0001f9cd",
-			":person_surfing:":                        "\U0001f3c4",
-			":person_surfing_tone1:":                  "\U0001f3c4\U0001f3fb",
-			":person_surfing_tone2:":                  "\U0001f3c4\U0001f3fc",
-			":person_surfing_tone3:":                  "\U0001f3c4\U0001f3fd",
-			":person_surfing_tone4:":                  "\U0001f3c4\U0001f3fe",
-			":person_surfing_tone5:":                  "\U0001f3c4\U0001f3ff",
-			":person_swimming:":                       "\U0001f3ca",
-			":person_swimming_tone1:":                 "\U0001f3ca\U0001f3fb",
-			":person_swimming_tone2:":                 "\U0001f3ca\U0001f3fc",
-			":person_swimming_tone3:":                 "\U0001f3ca\U0001f3fd",
-			":person_swimming_tone4:":                 "\U0001f3ca\U0001f3fe",
-			":person_swimming_tone5:":                 "\U0001f3ca\U0001f3ff",
-			":person_taking_bath:":                    "\U0001f6c0",
-			":person_tipping_hand:":                   "\U0001f481",
-			":person_tipping_hand_tone1:":             "\U0001f481\U0001f3fb",
-			":person_tipping_hand_tone2:":             "\U0001f481\U0001f3fc",
-			":person_tipping_hand_tone3:":             "\U0001f481\U0001f3fd",
-			":person_tipping_hand_tone4:":             "\U0001f481\U0001f3fe",
-			":person_tipping_hand_tone5:":             "\U0001f481\U0001f3ff",
-			":person_walking:":                        "\U0001f6b6",
-			":person_walking_tone1:":                  "\U0001f6b6\U0001f3fb",
-			":person_walking_tone2:":                  "\U0001f6b6\U0001f3fc",
-			":person_walking_tone3:":                  "\U0001f6b6\U0001f3fd",
-			":person_walking_tone4:":                  "\U0001f6b6\U0001f3fe",
-			":person_walking_tone5:":                  "\U0001f6b6\U0001f3ff",
-			":person_wearing_turban:":                 "\U0001f473",
-			":person_wearing_turban_tone1:":           "\U0001f473\U0001f3fb",
-			":person_wearing_turban_tone2:":           "\U0001f473\U0001f3fc",
-			":person_wearing_turban_tone3:":           "\U0001f473\U0001f3fd",
-			":person_wearing_turban_tone4:":           "\U0001f473\U0001f3fe",
-			":person_wearing_turban_tone5:":           "\U0001f473\U0001f3ff",
-			":person_white_hair:":                     "\U0001f9d1\u200d\U0001f9b3",
-			":person_with_ball:":                      "\u26f9\ufe0f\u200d\u2642\ufe0f",
-			":person_with_blond_hair:":                "\U0001f471\u200d\u2642\ufe0f",
-			":person_with_headscarf:":                 "\U0001f9d5",
-			":person_with_pouting_face:":              "\U0001f64e\u200d\u2640\ufe0f",
-			":person_with_probing_cane:":              "\U0001f9d1\u200d\U0001f9af",
-			":person_with_skullcap:":                  "\U0001f472",
-			":person_with_turban:":                    "\U0001f473",
-			":person_with_veil:":                      "\U0001f470",
-			":person_with_white_cane:":                "\U0001f9d1\u200d\U0001f9af",
-			":peru:":                                  "\U0001f1f5\U0001f1ea",
-			":petri_dish:":                            "\U0001f9eb",
-			":philippines:":                           "\U0001f1f5\U0001f1ed",
-			":phone:":                                 "\u260e\ufe0f",
-			":pick:":                                  "\u26cf\ufe0f",
-			":pickup_truck:":                          "\U0001f6fb",
-			":pie:":                                   "\U0001f967",
-			":pig:":                                   "\U0001f437",
-			":pig2:":                                  "\U0001f416",
-			":pig_face:":                              "\U0001f437",
-			":pig_nose:":                              "\U0001f43d",
-			":pile_of_poo:":                           "\U0001f4a9",
-			":pill:":                                  "\U0001f48a",
-			":pilot:":                                 "\U0001f9d1\u200d\u2708\ufe0f",
-			":pinata:":                                "\U0001fa85",
-			":pinched_fingers:":                       "\U0001f90c",
-			":pinching_hand:":                         "\U0001f90f",
-			":pine_decoration:":                       "\U0001f38d",
-			":pineapple:":                             "\U0001f34d",
-			":ping_pong:":                             "\U0001f3d3",
-			":pirate_flag:":                           "\U0001f3f4\u200d\u2620\ufe0f",
-			":pisces:":                                "\u2653",
-			":pitcairn_islands:":                      "\U0001f1f5\U0001f1f3",
-			":pizza:":                                 "\U0001f355",
-			":piñata:":                                "\U0001fa85",
-			":placard:":                               "\U0001faa7",
-			":place_of_worship:":                      "\U0001f6d0",
-			":plate_with_cutlery:":                    "\U0001f37d\ufe0f",
-			":play_button:":                           "\u25b6",
-			":play_or_pause_button:":                  "\u23ef",
-			":play_pause:":                            "\u23ef",
-			":pleading_face:":                         "\U0001f97a",
-			":plunger:":                               "\U0001faa0",
-			":plus:":                                  "\u2795",
-			":point_down:":                            "\U0001f447",
-			":point_down_tone1:":                      "\U0001f447\U0001f3fb",
-			":point_down_tone2:":                      "\U0001f447\U0001f3fc",
-			":point_down_tone3:":                      "\U0001f447\U0001f3fd",
-			":point_down_tone4:":                      "\U0001f447\U0001f3fe",
-			":point_down_tone5:":                      "\U0001f447\U0001f3ff",
-			":point_left:":                            "\U0001f448",
-			":point_left_tone1:":                      "\U0001f448\U0001f3fb",
-			":point_left_tone2:":                      "\U0001f448\U0001f3fc",
-			":point_left_tone3:":                      "\U0001f448\U0001f3fd",
-			":point_left_tone4:":                      "\U0001f448\U0001f3fe",
-			":point_left_tone5:":                      "\U0001f448\U0001f3ff",
-			":point_right:":                           "\U0001f449",
-			":point_right_tone1:":                     "\U0001f449\U0001f3fb",
-			":point_right_tone2:":                     "\U0001f449\U0001f3fc",
-			":point_right_tone3:":                     "\U0001f449\U0001f3fd",
-			":point_right_tone4:":                     "\U0001f449\U0001f3fe",
-			":point_right_tone5:":                     "\U0001f449\U0001f3ff",
-			":point_up:":                              "\u261d\ufe0f",
-			":point_up_2:":                            "\U0001f446",
-			":point_up_2_tone1:":                      "\U0001f446\U0001f3fb",
-			":point_up_2_tone2:":                      "\U0001f446\U0001f3fc",
-			":point_up_2_tone3:":                      "\U0001f446\U0001f3fd",
-			":point_up_2_tone4:":                      "\U0001f446\U0001f3fe",
-			":point_up_2_tone5:":                      "\U0001f446\U0001f3ff",
-			":point_up_tone1:":                        "\u261d\U0001f3fb",
-			":point_up_tone2:":                        "\u261d\U0001f3fc",
-			":point_up_tone3:":                        "\u261d\U0001f3fd",
-			":point_up_tone4:":                        "\u261d\U0001f3fe",
-			":point_up_tone5:":                        "\u261d\U0001f3ff",
-			":poland:":                                "\U0001f1f5\U0001f1f1",
-			":polar_bear:":                            "\U0001f43b\u200d\u2744\ufe0f",
-			":police_car:":                            "\U0001f693",
-			":police_car_light:":                      "\U0001f6a8",
-			":police_officer:":                        "\U0001f46e",
-			":police_officer_tone1:":                  "\U0001f46e\U0001f3fb",
-			":police_officer_tone2:":                  "\U0001f46e\U0001f3fc",
-			":police_officer_tone3:":                  "\U0001f46e\U0001f3fd",
-			":police_officer_tone4:":                  "\U0001f46e\U0001f3fe",
-			":police_officer_tone5:":                  "\U0001f46e\U0001f3ff",
-			":policeman:":                             "\U0001f46e\u200d\u2642\ufe0f",
-			":policewoman:":                           "\U0001f46e\u200d\u2640\ufe0f",
-			":poodle:":                                "\U0001f429",
-			":pool_8_ball:":                           "\U0001f3b1",
-			":poop:":                                  "\U0001f4a9",
-			":popcorn:":                               "\U0001f37f",
-			":portugal:":                              "\U0001f1f5\U0001f1f9",
-			":post_office:":                           "\U0001f3e3",
-			":postal_horn:":                           "\U0001f4ef",
-			":postbox:":                               "\U0001f4ee",
-			":pot_of_food:":                           "\U0001f372",
-			":potable_water:":                         "\U0001f6b0",
-			":potato:":                                "\U0001f954",
-			":potted_plant:":                          "\U0001fab4",
-			":pouch:":                                 "\U0001f45d",
-			":poultry_leg:":                           "\U0001f357",
-			":pound:":                                 "\U0001f4b7",
-			":pound_banknote:":                        "\U0001f4b7",
-			":pout:":                                  "\U0001f621",
-			":pouting_cat:":                           "\U0001f63e",
-			":pouting_face:":                          "\U0001f621",
-			":pouting_man:":                           "\U0001f64e\u200d\u2642\ufe0f",
-			":pouting_woman:":                         "\U0001f64e\u200d\u2640\ufe0f",
-			":pray:":                                  "\U0001f64f",
-			":pray_tone1:":                            "\U0001f64f\U0001f3fb",
-			":pray_tone2:":                            "\U0001f64f\U0001f3fc",
-			":pray_tone3:":                            "\U0001f64f\U0001f3fd",
-			":pray_tone4:":                            "\U0001f64f\U0001f3fe",
-			":pray_tone5:":                            "\U0001f64f\U0001f3ff",
-			":prayer_beads:":                          "\U0001f4ff",
-			":pregnant_woman:":                        "\U0001f930",
-			":pregnant_woman_tone1:":                  "\U0001f930\U0001f3fb",
-			":pregnant_woman_tone2:":                  "\U0001f930\U0001f3fc",
-			":pregnant_woman_tone3:":                  "\U0001f930\U0001f3fd",
-			":pregnant_woman_tone4:":                  "\U0001f930\U0001f3fe",
-			":pregnant_woman_tone5:":                  "\U0001f930\U0001f3ff",
-			":pretzel:":                               "\U0001f968",
-			":previous_track_button:":                 "\u23ee\ufe0f",
-			":prince:":                                "\U0001f934",
-			":prince_tone1:":                          "\U0001f934\U0001f3fb",
-			":prince_tone2:":                          "\U0001f934\U0001f3fc",
-			":prince_tone3:":                          "\U0001f934\U0001f3fd",
-			":prince_tone4:":                          "\U0001f934\U0001f3fe",
-			":prince_tone5:":                          "\U0001f934\U0001f3ff",
-			":princess:":                              "\U0001f478",
-			":princess_tone1:":                        "\U0001f478\U0001f3fb",
-			":princess_tone2:":                        "\U0001f478\U0001f3fc",
-			":princess_tone3:":                        "\U0001f478\U0001f3fd",
-			":princess_tone4:":                        "\U0001f478\U0001f3fe",
-			":princess_tone5:":                        "\U0001f478\U0001f3ff",
-			":printer:":                               "\U0001f5a8\ufe0f",
-			":probing_cane:":                          "\U0001f9af",
-			":prohibited:":                            "\U0001f6ab",
-			":projector:":                             "\U0001f4fd",
-			":puerto_rico:":                           "\U0001f1f5\U0001f1f7",
-			":punch:":                                 "\U0001f44a",
-			":punch_tone1:":                           "\U0001f44a\U0001f3fb",
-			":punch_tone2:":                           "\U0001f44a\U0001f3fc",
-			":punch_tone3:":                           "\U0001f44a\U0001f3fd",
-			":punch_tone4:":                           "\U0001f44a\U0001f3fe",
-			":punch_tone5:":                           "\U0001f44a\U0001f3ff",
-			":purple_circle:":                         "\U0001f7e3",
-			":purple_heart:":                          "\U0001f49c",
-			":purple_square:":                         "\U0001f7ea",
-			":purse:":                                 "\U0001f45b",
-			":pushpin:":                               "\U0001f4cc",
-			":put_litter_in_its_place:":               "\U0001f6ae",
-			":puzzle_piece:":                          "\U0001f9e9",
-			":qatar:":                                 "\U0001f1f6\U0001f1e6",
-			":question:":                              "\u2753",
-			":rabbit:":                                "\U0001f430",
-			":rabbit2:":                               "\U0001f407",
-			":rabbit_face:":                           "\U0001f430",
-			":raccoon:":                               "\U0001f99d",
-			":race_car:":                              "\U0001f3ce",
-			":racehorse:":                             "\U0001f40e",
-			":racing_car:":                            "\U0001f3ce\ufe0f",
-			":racing_motorcycle:":                     "\U0001f3cd\ufe0f",
-			":radio:":                                 "\U0001f4fb",
-			":radio_button:":                          "\U0001f518",
-			":radioactive:":                           "\u2622",
-			":radioactive_sign:":                      "\u2622\ufe0f",
-			":rage:":                                  "\U0001f621",
-			":railway_car:":                           "\U0001f683",
-			":railway_track:":                         "\U0001f6e4\ufe0f",
-			":rain_cloud:":                            "\U0001f327\ufe0f",
-			":rainbow:":                               "\U0001f308",
-			":rainbow-flag:":                          "\U0001f3f3\ufe0f\u200d\U0001f308",
-			":rainbow_flag:":                          "\U0001f3f3\ufe0f\u200d\U0001f308",
-			":raised_back_of_hand:":                   "\U0001f91a",
-			":raised_back_of_hand_tone1:":             "\U0001f91a\U0001f3fb",
-			":raised_back_of_hand_tone2:":             "\U0001f91a\U0001f3fc",
-			":raised_back_of_hand_tone3:":             "\U0001f91a\U0001f3fd",
-			":raised_back_of_hand_tone4:":             "\U0001f91a\U0001f3fe",
-			":raised_back_of_hand_tone5:":             "\U0001f91a\U0001f3ff",
-			":raised_eyebrow:":                        "\U0001f928",
-			":raised_fist:":                           "\u270a",
-			":raised_hand:":                           "\u270b",
-			":raised_hand_tone1:":                     "\u270b\U0001f3fb",
-			":raised_hand_tone2:":                     "\u270b\U0001f3fc",
-			":raised_hand_tone3:":                     "\u270b\U0001f3fd",
-			":raised_hand_tone4:":                     "\u270b\U0001f3fe",
-			":raised_hand_tone5:":                     "\u270b\U0001f3ff",
-			":raised_hand_with_fingers_splayed:":      "\U0001f590\ufe0f",
-			":raised_hands:":                          "\U0001f64c",
-			":raised_hands_tone1:":                    "\U0001f64c\U0001f3fb",
-			":raised_hands_tone2:":                    "\U0001f64c\U0001f3fc",
-			":raised_hands_tone3:":                    "\U0001f64c\U0001f3fd",
-			":raised_hands_tone4:":                    "\U0001f64c\U0001f3fe",
-			":raised_hands_tone5:":                    "\U0001f64c\U0001f3ff",
-			":raising_hand:":                          "\U0001f64b\u200d\u2640\ufe0f",
-			":raising_hand_man:":                      "\U0001f64b\u200d\u2642\ufe0f",
-			":raising_hand_woman:":                    "\U0001f64b\u200d\u2640\ufe0f",
-			":raising_hands:":                         "\U0001f64c",
-			":ram:":                                   "\U0001f40f",
-			":ramen:":                                 "\U0001f35c",
-			":rat:":                                   "\U0001f400",
-			":razor:":                                 "\U0001fa92",
-			":receipt:":                               "\U0001f9fe",
-			":record_button:":                         "\u23fa",
-			":recycle:":                               "\u267b\ufe0f",
-			":recycling_symbol:":                      "\u267b",
-			":red_apple:":                             "\U0001f34e",
-			":red_car:":                               "\U0001f697",
-			":red_circle:":                            "\U0001f534",
-			":red_envelope:":                          "\U0001f9e7",
-			":red_exclamation_mark:":                  "\u2757",
-			":red_hair:":                              "\U0001f9b0",
-			":red_haired_man:":                        "\U0001f468\u200d\U0001f9b0",
-			":red_haired_person:":                     "\U0001f9d1\u200d\U0001f9b0",
-			":red_haired_woman:":                      "\U0001f469\u200d\U0001f9b0",
-			":red_heart:":                             "\u2764",
-			":red_paper_lantern:":                     "\U0001f3ee",
-			":red_question_mark:":                     "\u2753",
-			":red_square:":                            "\U0001f7e5",
-			":red_triangle_pointed_down:":             "\U0001f53b",
-			":red_triangle_pointed_up:":               "\U0001f53a",
-			":registered:":                            "\u00ae\ufe0f",
-			":relaxed:":                               "\u263a\ufe0f",
-			":relieved:":                              "\U0001f60c",
-			":relieved_face:":                         "\U0001f60c",
-			":reminder_ribbon:":                       "\U0001f397\ufe0f",
-			":repeat:":                                "\U0001f501",
-			":repeat_button:":                         "\U0001f501",
-			":repeat_one:":                            "\U0001f502",
-			":repeat_single_button:":                  "\U0001f502",
-			":rescue_worker_helmet:":                  "\u26d1\ufe0f",
-			":rescue_worker’s_helmet:":                "\u26d1",
-			":restroom:":                              "\U0001f6bb",
-			":reunion:":                               "\U0001f1f7\U0001f1ea",
-			":reverse_button:":                        "\u25c0",
-			":revolving_hearts:":                      "\U0001f49e",
-			":rewind:":                                "\u23ea",
-			":rhino:":                                 "\U0001f98f",
-			":rhinoceros:":                            "\U0001f98f",
-			":ribbon:":                                "\U0001f380",
-			":rice:":                                  "\U0001f35a",
-			":rice_ball:":                             "\U0001f359",
-			":rice_cracker:":                          "\U0001f358",
-			":rice_scene:":                            "\U0001f391",
-			":right-facing_fist:":                     "\U0001f91c",
-			":right_anger_bubble:":                    "\U0001f5ef\ufe0f",
-			":right_arrow:":                           "\u27a1",
-			":right_arrow_curving_down:":              "\u2935",
-			":right_arrow_curving_left:":              "\u21a9",
-			":right_arrow_curving_up:":                "\u2934",
-			":right_facing_fist:":                     "\U0001f91c",
-			":right_facing_fist_tone1:":               "\U0001f91c\U0001f3fb",
-			":right_facing_fist_tone2:":               "\U0001f91c\U0001f3fc",
-			":right_facing_fist_tone3:":               "\U0001f91c\U0001f3fd",
-			":right_facing_fist_tone4:":               "\U0001f91c\U0001f3fe",
-			":right_facing_fist_tone5:":               "\U0001f91c\U0001f3ff",
-			":ring:":                                  "\U0001f48d",
-			":ringed_planet:":                         "\U0001fa90",
-			":roasted_sweet_potato:":                  "\U0001f360",
-			":robot:":                                 "\U0001f916",
-			":robot_face:":                            "\U0001f916",
-			":rock:":                                  "\U0001faa8",
-			":rocket:":                                "\U0001f680",
-			":rofl:":                                  "\U0001f923",
-			":roll_eyes:":                             "\U0001f644",
-			":roll_of_paper:":                         "\U0001f9fb",
-			":rolled-up_newspaper:":                   "\U0001f5de",
-			":rolled_up_newspaper:":                   "\U0001f5de\ufe0f",
-			":roller_coaster:":                        "\U0001f3a2",
-			":roller_skate:":                          "\U0001f6fc",
-			":rolling_eyes:":                          "\U0001f644",
-			":rolling_on_the_floor_laughing:":         "\U0001f923",
-			":romania:":                               "\U0001f1f7\U0001f1f4",
-			":rooster:":                               "\U0001f413",
-			":rose:":                                  "\U0001f339",
-			":rosette:":                               "\U0001f3f5\ufe0f",
-			":rotating_light:":                        "\U0001f6a8",
-			":round_pushpin:":                         "\U0001f4cd",
-			":rowboat:":                               "\U0001f6a3\u200d\u2642\ufe0f",
-			":rowing_man:":                            "\U0001f6a3\u200d\u2642\ufe0f",
-			":rowing_woman:":                          "\U0001f6a3\u200d\u2640\ufe0f",
-			":ru:":                                    "\U0001f1f7\U0001f1fa",
-			":rugby_football:":                        "\U0001f3c9",
-			":runner:":                                "\U0001f3c3\u200d\u2642\ufe0f",
-			":running:":                               "\U0001f3c3",
-			":running_man:":                           "\U0001f3c3\u200d\u2642\ufe0f",
-			":running_shirt:":                         "\U0001f3bd",
-			":running_shirt_with_sash:":               "\U0001f3bd",
-			":running_shoe:":                          "\U0001f45f",
-			":running_woman:":                         "\U0001f3c3\u200d\u2640\ufe0f",
-			":rwanda:":                                "\U0001f1f7\U0001f1fc",
-			":sa:":                                    "\U0001f202\ufe0f",
-			":sad_but_relieved_face:":                 "\U0001f625",
-			":safety_pin:":                            "\U0001f9f7",
-			":safety_vest:":                           "\U0001f9ba",
-			":sagittarius:":                           "\u2650",
-			":sailboat:":                              "\u26f5",
-			":sake:":                                  "\U0001f376",
-			":salad:":                                 "\U0001f957",
-			":salt:":                                  "\U0001f9c2",
-			":samoa:":                                 "\U0001f1fc\U0001f1f8",
-			":san_marino:":                            "\U0001f1f8\U0001f1f2",
-			":sandal:":                                "\U0001f461",
-			":sandwich:":                              "\U0001f96a",
-			":santa:":                                 "\U0001f385",
-			":santa_tone1:":                           "\U0001f385\U0001f3fb",
-			":santa_tone2:":                           "\U0001f385\U0001f3fc",
-			":santa_tone3:":                           "\U0001f385\U0001f3fd",
-			":santa_tone4:":                           "\U0001f385\U0001f3fe",
-			":santa_tone5:":                           "\U0001f385\U0001f3ff",
-			":sao_tome_principe:":                     "\U0001f1f8\U0001f1f9",
-			":sari:":                                  "\U0001f97b",
-			":sassy_man:":                             "\U0001f481\u200d\u2642\ufe0f",
-			":sassy_woman:":                           "\U0001f481\u200d\u2640\ufe0f",
-			":satellite:":                             "\U0001f6f0\ufe0f",
-			":satellite_antenna:":                     "\U0001f4e1",
-			":satellite_orbital:":                     "\U0001f6f0",
-			":satisfied:":                             "\U0001f606",
-			":saudi_arabia:":                          "\U0001f1f8\U0001f1e6",
-			":sauna_man:":                             "\U0001f9d6\u200d\u2642\ufe0f",
-			":sauna_person:":                          "\U0001f9d6",
-			":sauna_woman:":                           "\U0001f9d6\u200d\u2640\ufe0f",
-			":sauropod:":                              "\U0001f995",
-			":saxophone:":                             "\U0001f3b7",
-			":scales:":                                "\u2696\ufe0f",
-			":scarf:":                                 "\U0001f9e3",
-			":school:":                                "\U0001f3eb",
-			":school_satchel:":                        "\U0001f392",
-			":scientist:":                             "\U0001f9d1\u200d\U0001f52c",
-			":scissors:":                              "\u2702\ufe0f",
-			":scooter:":                               "\U0001f6f4",
-			":scorpion:":                              "\U0001f982",
-			":scorpius:":                              "\u264f",
-			":scotland:":                              "\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f",
-			":scream:":                                "\U0001f631",
-			":scream_cat:":                            "\U0001f640",
-			":screwdriver:":                           "\U0001fa9b",
-			":scroll:":                                "\U0001f4dc",
-			":seal:":                                  "\U0001f9ad",
-			":seat:":                                  "\U0001f4ba",
-			":second_place:":                          "\U0001f948",
-			":second_place_medal:":                    "\U0001f948",
-			":secret:":                                "\u3299\ufe0f",
-			":see-no-evil_monkey:":                    "\U0001f648",
-			":see_no_evil:":                           "\U0001f648",
-			":seedling:":                              "\U0001f331",
-			":selfie:":                                "\U0001f933",
-			":selfie_tone1:":                          "\U0001f933\U0001f3fb",
-			":selfie_tone2:":                          "\U0001f933\U0001f3fc",
-			":selfie_tone3:":                          "\U0001f933\U0001f3fd",
-			":selfie_tone4:":                          "\U0001f933\U0001f3fe",
-			":selfie_tone5:":                          "\U0001f933\U0001f3ff",
-			":senegal:":                               "\U0001f1f8\U0001f1f3",
-			":serbia:":                                "\U0001f1f7\U0001f1f8",
-			":service_dog:":                           "\U0001f415\u200d\U0001f9ba",
-			":seven:":                                 "7\ufe0f\u20e3",
-			":seven-thirty:":                          "\U0001f562",
-			":seven_o’clock:":                         "\U0001f556",
-			":sewing_needle:":                         "\U0001faa1",
-			":seychelles:":                            "\U0001f1f8\U0001f1e8",
-			":shallow_pan_of_food:":                   "\U0001f958",
-			":shamrock:":                              "\u2618\ufe0f",
-			":shark:":                                 "\U0001f988",
-			":shaved_ice:":                            "\U0001f367",
-			":sheaf_of_rice:":                         "\U0001f33e",
-			":sheep:":                                 "\U0001f411",
-			":shell:":                                 "\U0001f41a",
-			":shield:":                                "\U0001f6e1\ufe0f",
-			":shinto_shrine:":                         "\u26e9\ufe0f",
-			":ship:":                                  "\U0001f6a2",
-			":shirt:":                                 "\U0001f455",
-			":shit:":                                  "\U0001f4a9",
-			":shoe:":                                  "\U0001f45e",
-			":shooting_star:":                         "\U0001f320",
-			":shopping:":                              "\U0001f6cd\ufe0f",
-			":shopping_bags:":                         "\U0001f6cd\ufe0f",
-			":shopping_cart:":                         "\U0001f6d2",
-			":shopping_trolley:":                      "\U0001f6d2",
-			":shortcake:":                             "\U0001f370",
-			":shorts:":                                "\U0001fa73",
-			":shower:":                                "\U0001f6bf",
-			":shrimp:":                                "\U0001f990",
-			":shrug:":                                 "\U0001f937",
-			":shuffle_tracks_button:":                 "\U0001f500",
-			":shushing_face:":                         "\U0001f92b",
-			":sierra_leone:":                          "\U0001f1f8\U0001f1f1",
-			":sign_of_the_horns:":                     "\U0001f918",
-			":signal_strength:":                       "\U0001f4f6",
-			":singapore:":                             "\U0001f1f8\U0001f1ec",
-			":singer:":                                "\U0001f9d1\u200d\U0001f3a4",
-			":sint_maarten:":                          "\U0001f1f8\U0001f1fd",
-			":six:":                                   "6\ufe0f\u20e3",
-			":six-thirty:":                            "\U0001f561",
-			":six_o’clock:":                           "\U0001f555",
-			":six_pointed_star:":                      "\U0001f52f",
-			":skateboard:":                            "\U0001f6f9",
-			":ski:":                                   "\U0001f3bf",
-			":skier:":                                 "\u26f7\ufe0f",
-			":skin-tone-2:":                           "\U0001f3fb",
-			":skin-tone-3:":                           "\U0001f3fc",
-			":skin-tone-4:":                           "\U0001f3fd",
-			":skin-tone-5:":                           "\U0001f3fe",
-			":skin-tone-6:":                           "\U0001f3ff",
-			":skis:":                                  "\U0001f3bf",
-			":skull:":                                 "\U0001f480",
-			":skull_and_crossbones:":                  "\u2620\ufe0f",
-			":skull_crossbones:":                      "\u2620",
-			":skunk:":                                 "\U0001f9a8",
-			":sled:":                                  "\U0001f6f7",
-			":sleeping:":                              "\U0001f634",
-			":sleeping_accommodation:":                "\U0001f6cc",
-			":sleeping_bed:":                          "\U0001f6cc",
-			":sleeping_face:":                         "\U0001f634",
-			":sleepy:":                                "\U0001f62a",
-			":sleepy_face:":                           "\U0001f62a",
-			":sleuth_or_spy:":                         "\U0001f575\ufe0f\u200d\u2642\ufe0f",
-			":slight_frown:":                          "\U0001f641",
-			":slight_smile:":                          "\U0001f642",
-			":slightly_frowning_face:":                "\U0001f641",
-			":slightly_smiling_face:":                 "\U0001f642",
-			":slot_machine:":                          "\U0001f3b0",
-			":sloth:":                                 "\U0001f9a5",
-			":slovakia:":                              "\U0001f1f8\U0001f1f0",
-			":slovenia:":                              "\U0001f1f8\U0001f1ee",
-			":small_airplane:":                        "\U0001f6e9\ufe0f",
-			":small_blue_diamond:":                    "\U0001f539",
-			":small_orange_diamond:":                  "\U0001f538",
-			":small_red_triangle:":                    "\U0001f53a",
-			":small_red_triangle_down:":               "\U0001f53b",
-			":smile:":                                 "\U0001f604",
-			":smile_cat:":                             "\U0001f638",
-			":smiley:":                                "\U0001f603",
-			":smiley_cat:":                            "\U0001f63a",
-			":smiling_cat_with_heart-eyes:":           "\U0001f63b",
-			":smiling_face:":                          "\u263a",
-			":smiling_face_with_3_hearts:":            "\U0001f970",
-			":smiling_face_with_halo:":                "\U0001f607",
-			":smiling_face_with_heart-eyes:":          "\U0001f60d",
-			":smiling_face_with_hearts:":              "\U0001f970",
-			":smiling_face_with_horns:":               "\U0001f608",
-			":smiling_face_with_smiling_eyes:":        "\U0001f60a",
-			":smiling_face_with_sunglasses:":          "\U0001f60e",
-			":smiling_face_with_tear:":                "\U0001f972",
-			":smiling_face_with_three_hearts:":        "\U0001f970",
-			":smiling_imp:":                           "\U0001f608",
-			":smirk:":                                 "\U0001f60f",
-			":smirk_cat:":                             "\U0001f63c",
-			":smirking_face:":                         "\U0001f60f",
-			":smoking:":                               "\U0001f6ac",
-			":snail:":                                 "\U0001f40c",
-			":snake:":                                 "\U0001f40d",
-			":sneezing_face:":                         "\U0001f927",
-			":snow-capped_mountain:":                  "\U0001f3d4",
-			":snow_capped_mountain:":                  "\U0001f3d4\ufe0f",
-			":snow_cloud:":                            "\U0001f328\ufe0f",
-			":snowboarder:":                           "\U0001f3c2",
-			":snowboarder_tone1:":                     "\U0001f3c2\U0001f3fb",
-			":snowboarder_tone2:":                     "\U0001f3c2\U0001f3fc",
-			":snowboarder_tone3:":                     "\U0001f3c2\U0001f3fd",
-			":snowboarder_tone4:":                     "\U0001f3c2\U0001f3fe",
-			":snowboarder_tone5:":                     "\U0001f3c2\U0001f3ff",
-			":snowflake:":                             "\u2744\ufe0f",
-			":snowman:":                               "\u2603\ufe0f",
-			":snowman2:":                              "\u2603",
-			":snowman_with_snow:":                     "\u2603\ufe0f",
-			":snowman_without_snow:":                  "\u26c4",
-			":soap:":                                  "\U0001f9fc",
-			":sob:":                                   "\U0001f62d",
-			":soccer:":                                "\u26bd",
-			":soccer_ball:":                           "\u26bd",
-			":socks:":                                 "\U0001f9e6",
-			":soft_ice_cream:":                        "\U0001f366",
-			":softball:":                              "\U0001f94e",
-			":solomon_islands:":                       "\U0001f1f8\U0001f1e7",
-			":somalia:":                               "\U0001f1f8\U0001f1f4",
-			":soon:":                                  "\U0001f51c",
-			":sos:":                                   "\U0001f198",
-			":sound:":                                 "\U0001f509",
-			":south_africa:":                          "\U0001f1ff\U0001f1e6",
-			":south_georgia_south_sandwich_islands:":  "\U0001f1ec\U0001f1f8",
-			":south_sudan:":                           "\U0001f1f8\U0001f1f8",
-			":space_invader:":                         "\U0001f47e",
-			":spade_suit:":                            "\u2660",
-			":spades:":                                "\u2660\ufe0f",
-			":spaghetti:":                             "\U0001f35d",
-			":sparkle:":                               "\u2747\ufe0f",
-			":sparkler:":                              "\U0001f387",
-			":sparkles:":                              "\u2728",
-			":sparkling_heart:":                       "\U0001f496",
-			":speak-no-evil_monkey:":                  "\U0001f64a",
-			":speak_no_evil:":                         "\U0001f64a",
-			":speaker:":                               "\U0001f508",
-			":speaker_high_volume:":                   "\U0001f50a",
-			":speaker_low_volume:":                    "\U0001f508",
-			":speaker_medium_volume:":                 "\U0001f509",
-			":speaking_head:":                         "\U0001f5e3",
-			":speaking_head_in_silhouette:":           "\U0001f5e3\ufe0f",
-			":speech_balloon:":                        "\U0001f4ac",
-			":speech_left:":                           "\U0001f5e8",
-			":speedboat:":                             "\U0001f6a4",
-			":spider:":                                "\U0001f577\ufe0f",
-			":spider_web:":                            "\U0001f578\ufe0f",
-			":spiral_calendar:":                       "\U0001f5d3",
-			":spiral_calendar_pad:":                   "\U0001f5d3\ufe0f",
-			":spiral_note_pad:":                       "\U0001f5d2\ufe0f",
-			":spiral_notepad:":                        "\U0001f5d2",
-			":spiral_shell:":                          "\U0001f41a",
-			":spock-hand:":                            "\U0001f596",
-			":sponge:":                                "\U0001f9fd",
-			":spoon:":                                 "\U0001f944",
-			":sport_utility_vehicle:":                 "\U0001f699",
-			":sports_medal:":                          "\U0001f3c5",
-			":spouting_whale:":                        "\U0001f433",
-			":squid:":                                 "\U0001f991",
-			":squinting_face_with_tongue:":            "\U0001f61d",
-			":sri_lanka:":                             "\U0001f1f1\U0001f1f0",
-			":st_barthelemy:":                         "\U0001f1e7\U0001f1f1",
-			":st_helena:":                             "\U0001f1f8\U0001f1ed",
-			":st_kitts_nevis:":                        "\U0001f1f0\U0001f1f3",
-			":st_lucia:":                              "\U0001f1f1\U0001f1e8",
-			":st_martin:":                             "\U0001f1f2\U0001f1eb",
-			":st_pierre_miquelon:":                    "\U0001f1f5\U0001f1f2",
-			":st_vincent_grenadines:":                 "\U0001f1fb\U0001f1e8",
-			":stadium:":                               "\U0001f3df\ufe0f",
-			":standing_man:":                          "\U0001f9cd\u200d\u2642\ufe0f",
-			":standing_person:":                       "\U0001f9cd",
-			":standing_woman:":                        "\U0001f9cd\u200d\u2640\ufe0f",
-			":star:":                                  "\u2b50",
-			":star-struck:":                           "\U0001f929",
-			":star2:":                                 "\U0001f31f",
-			":star_and_crescent:":                     "\u262a\ufe0f",
-			":star_of_David:":                         "\u2721",
-			":star_of_david:":                         "\u2721\ufe0f",
-			":star_struck:":                           "\U0001f929",
-			":stars:":                                 "\U0001f320",
-			":station:":                               "\U0001f689",
-			":statue_of_liberty:":                     "\U0001f5fd",
-			":steam_locomotive:":                      "\U0001f682",
-			":steaming_bowl:":                         "\U0001f35c",
-			":stethoscope:":                           "\U0001fa7a",
-			":stew:":                                  "\U0001f372",
-			":stop_button:":                           "\u23f9",
-			":stop_sign:":                             "\U0001f6d1",
-			":stopwatch:":                             "\u23f1\ufe0f",
-			":straight_ruler:":                        "\U0001f4cf",
-			":strawberry:":                            "\U0001f353",
-			":stuck_out_tongue:":                      "\U0001f61b",
-			":stuck_out_tongue_closed_eyes:":          "\U0001f61d",
-			":stuck_out_tongue_winking_eye:":          "\U0001f61c",
-			":student:":                               "\U0001f9d1\u200d\U0001f393",
-			":studio_microphone:":                     "\U0001f399\ufe0f",
-			":stuffed_flatbread:":                     "\U0001f959",
-			":sudan:":                                 "\U0001f1f8\U0001f1e9",
-			":sun:":                                   "\u2600",
-			":sun_behind_cloud:":                      "\u26c5",
-			":sun_behind_large_cloud:":                "\U0001f325",
-			":sun_behind_rain_cloud:":                 "\U0001f326",
-			":sun_behind_small_cloud:":                "\U0001f324",
-			":sun_with_face:":                         "\U0001f31e",
-			":sunflower:":                             "\U0001f33b",
-			":sunglasses:":                            "\U0001f60e",
-			":sunny:":                                 "\u2600\ufe0f",
-			":sunrise:":                               "\U0001f305",
-			":sunrise_over_mountains:":                "\U0001f304",
-			":sunset:":                                "\U0001f307",
-			":superhero:":                             "\U0001f9b8",
-			":superhero_man:":                         "\U0001f9b8\u200d\u2642\ufe0f",
-			":superhero_woman:":                       "\U0001f9b8\u200d\u2640\ufe0f",
-			":supervillain:":                          "\U0001f9b9",
-			":supervillain_man:":                      "\U0001f9b9\u200d\u2642\ufe0f",
-			":supervillain_woman:":                    "\U0001f9b9\u200d\u2640\ufe0f",
-			":surfer:":                                "\U0001f3c4\u200d\u2642\ufe0f",
-			":surfing_man:":                           "\U0001f3c4\u200d\u2642\ufe0f",
-			":surfing_woman:":                         "\U0001f3c4\u200d\u2640\ufe0f",
-			":suriname:":                              "\U0001f1f8\U0001f1f7",
-			":sushi:":                                 "\U0001f363",
-			":suspension_railway:":                    "\U0001f69f",
-			":svalbard_jan_mayen:":                    "\U0001f1f8\U0001f1ef",
-			":swan:":                                  "\U0001f9a2",
-			":swaziland:":                             "\U0001f1f8\U0001f1ff",
-			":sweat:":                                 "\U0001f613",
-			":sweat_droplets:":                        "\U0001f4a6",
-			":sweat_drops:":                           "\U0001f4a6",
-			":sweat_smile:":                           "\U0001f605",
-			":sweden:":                                "\U0001f1f8\U0001f1ea",
-			":sweet_potato:":                          "\U0001f360",
-			":swim_brief:":                            "\U0001fa72",
-			":swimmer:":                               "\U0001f3ca\u200d\u2642\ufe0f",
-			":swimming_man:":                          "\U0001f3ca\u200d\u2642\ufe0f",
-			":swimming_woman:":                        "\U0001f3ca\u200d\u2640\ufe0f",
-			":switzerland:":                           "\U0001f1e8\U0001f1ed",
-			":symbols:":                               "\U0001f523",
-			":synagogue:":                             "\U0001f54d",
-			":syria:":                                 "\U0001f1f8\U0001f1fe",
-			":syringe:":                               "\U0001f489",
-			":t-rex:":                                 "\U0001f996",
-			":t-shirt:":                               "\U0001f455",
-			":t_rex:":                                 "\U0001f996",
-			":table_tennis_paddle_and_ball:":          "\U0001f3d3",
-			":taco:":                                  "\U0001f32e",
-			":tada:":                                  "\U0001f389",
-			":taiwan:":                                "\U0001f1f9\U0001f1fc",
-			":tajikistan:":                            "\U0001f1f9\U0001f1ef",
-			":takeout_box:":                           "\U0001f961",
-			":tamale:":                                "\U0001fad4",
-			":tanabata_tree:":                         "\U0001f38b",
-			":tangerine:":                             "\U0001f34a",
-			":tanzania:":                              "\U0001f1f9\U0001f1ff",
-			":taurus:":                                "\u2649",
-			":taxi:":                                  "\U0001f695",
-			":tea:":                                   "\U0001f375",
-			":teacher:":                               "\U0001f9d1\u200d\U0001f3eb",
-			":teacup_without_handle:":                 "\U0001f375",
-			":teapot:":                                "\U0001fad6",
-			":tear-off_calendar:":                     "\U0001f4c6",
-			":technologist:":                          "\U0001f9d1\u200d\U0001f4bb",
-			":teddy_bear:":                            "\U0001f9f8",
-			":telephone:":                             "\u260e",
-			":telephone_receiver:":                    "\U0001f4de",
-			":telescope:":                             "\U0001f52d",
-			":television:":                            "\U0001f4fa",
-			":ten-thirty:":                            "\U0001f565",
-			":ten_o’clock:":                           "\U0001f559",
-			":tennis:":                                "\U0001f3be",
-			":tent:":                                  "\u26fa",
-			":test_tube:":                             "\U0001f9ea",
-			":thailand:":                              "\U0001f1f9\U0001f1ed",
-			":the_horns:":                             "\U0001f918",
-			":thermometer:":                           "\U0001f321\ufe0f",
-			":thermometer_face:":                      "\U0001f912",
-			":thinking:":                              "\U0001f914",
-			":thinking_face:":                         "\U0001f914",
-			":third_place:":                           "\U0001f949",
-			":third_place_medal:":                     "\U0001f949",
-			":thong_sandal:":                          "\U0001fa74",
-			":thought_balloon:":                       "\U0001f4ad",
-			":thread:":                                "\U0001f9f5",
-			":three:":                                 "3\ufe0f\u20e3",
-			":three-thirty:":                          "\U0001f55e",
-			":three_button_mouse:":                    "\U0001f5b1\ufe0f",
-			":three_o’clock:":                         "\U0001f552",
-			":thumbs_down:":                           "\U0001f44e",
-			":thumbs_up:":                             "\U0001f44d",
-			":thumbsdown:":                            "\U0001f44e",
-			":thumbsdown_tone1:":                      "\U0001f44e\U0001f3fb",
-			":thumbsdown_tone2:":                      "\U0001f44e\U0001f3fc",
-			":thumbsdown_tone3:":                      "\U0001f44e\U0001f3fd",
-			":thumbsdown_tone4:":                      "\U0001f44e\U0001f3fe",
-			":thumbsdown_tone5:":                      "\U0001f44e\U0001f3ff",
-			":thumbsup:":                              "\U0001f44d",
-			":thumbsup_tone1:":                        "\U0001f44d\U0001f3fb",
-			":thumbsup_tone2:":                        "\U0001f44d\U0001f3fc",
-			":thumbsup_tone3:":                        "\U0001f44d\U0001f3fd",
-			":thumbsup_tone4:":                        "\U0001f44d\U0001f3fe",
-			":thumbsup_tone5:":                        "\U0001f44d\U0001f3ff",
-			":thunder_cloud_and_rain:":                "\u26c8\ufe0f",
-			":thunder_cloud_rain:":                    "\u26c8",
-			":ticket:":                                "\U0001f3ab",
-			":tickets:":                               "\U0001f39f",
-			":tiger:":                                 "\U0001f42f",
-			":tiger2:":                                "\U0001f405",
-			":tiger_face:":                            "\U0001f42f",
-			":timer:":                                 "\u23f2",
-			":timer_clock:":                           "\u23f2\ufe0f",
-			":timor_leste:":                           "\U0001f1f9\U0001f1f1",
-			":tipping_hand_man:":                      "\U0001f481\u200d\u2642\ufe0f",
-			":tipping_hand_person:":                   "\U0001f481",
-			":tipping_hand_woman:":                    "\U0001f481\u200d\u2640\ufe0f",
-			":tired_face:":                            "\U0001f62b",
-			":tm:":                                    "\u2122\ufe0f",
-			":togo:":                                  "\U0001f1f9\U0001f1ec",
-			":toilet:":                                "\U0001f6bd",
-			":tokelau:":                               "\U0001f1f9\U0001f1f0",
-			":tokyo_tower:":                           "\U0001f5fc",
-			":tomato:":                                "\U0001f345",
-			":tonga:":                                 "\U0001f1f9\U0001f1f4",
-			":tongue:":                                "\U0001f445",
-			":toolbox:":                               "\U0001f9f0",
-			":tools:":                                 "\U0001f6e0",
-			":tooth:":                                 "\U0001f9b7",
-			":toothbrush:":                            "\U0001faa5",
-			":top:":                                   "\U0001f51d",
-			":top_hat:":                               "\U0001f3a9",
-			":tophat:":                                "\U0001f3a9",
-			":tornado:":                               "\U0001f32a\ufe0f",
-			":tr:":                                    "\U0001f1f9\U0001f1f7",
-			":track_next:":                            "\u23ed",
-			":track_previous:":                        "\u23ee",
-			":trackball:":                             "\U0001f5b2\ufe0f",
-			":tractor:":                               "\U0001f69c",
-			":trade_mark:":                            "\u2122",
-			":traffic_light:":                         "\U0001f6a5",
-			":train:":                                 "\U0001f68b",
-			":train2:":                                "\U0001f686",
-			":tram:":                                  "\U0001f68a",
-			":tram_car:":                              "\U0001f68b",
-			":transgender_flag:":                      "\U0001f3f3\ufe0f\u200d\u26a7\ufe0f",
-			":transgender_symbol:":                    "\u26a7\ufe0f",
-			":triangular_flag:":                       "\U0001f6a9",
-			":triangular_flag_on_post:":               "\U0001f6a9",
-			":triangular_ruler:":                      "\U0001f4d0",
-			":trident:":                               "\U0001f531",
-			":trident_emblem:":                        "\U0001f531",
-			":trinidad_tobago:":                       "\U0001f1f9\U0001f1f9",
-			":tristan_da_cunha:":                      "\U0001f1f9\U0001f1e6",
-			":triumph:":                               "\U0001f624",
-			":trolleybus:":                            "\U0001f68e",
-			":trophy:":                                "\U0001f3c6",
-			":tropical_drink:":                        "\U0001f379",
-			":tropical_fish:":                         "\U0001f420",
-			":truck:":                                 "\U0001f69a",
-			":trumpet:":                               "\U0001f3ba",
-			":tshirt:":                                "\U0001f455",
-			":tulip:":                                 "\U0001f337",
-			":tumbler_glass:":                         "\U0001f943",
-			":tunisia:":                               "\U0001f1f9\U0001f1f3",
-			":turkey:":                                "\U0001f983",
-			":turkmenistan:":                          "\U0001f1f9\U0001f1f2",
-			":turks_caicos_islands:":                  "\U0001f1f9\U0001f1e8",
-			":turtle:":                                "\U0001f422",
-			":tuvalu:":                                "\U0001f1f9\U0001f1fb",
-			":tv:":                                    "\U0001f4fa",
-			":twelve-thirty:":                         "\U0001f567",
-			":twelve_o’clock:":                        "\U0001f55b",
-			":twisted_rightwards_arrows:":             "\U0001f500",
-			":two:":                                   "2\ufe0f\u20e3",
-			":two-hump_camel:":                        "\U0001f42b",
-			":two-thirty:":                            "\U0001f55d",
-			":two_hearts:":                            "\U0001f495",
-			":two_men_holding_hands:":                 "\U0001f46c",
-			":two_o’clock:":                           "\U0001f551",
-			":two_women_holding_hands:":               "\U0001f46d",
-			":u5272:":                                 "\U0001f239",
-			":u5408:":                                 "\U0001f234",
-			":u55b6:":                                 "\U0001f23a",
-			":u6307:":                                 "\U0001f22f",
-			":u6708:":                                 "\U0001f237\ufe0f",
-			":u6709:":                                 "\U0001f236",
-			":u6e80:":                                 "\U0001f235",
-			":u7121:":                                 "\U0001f21a",
-			":u7533:":                                 "\U0001f238",
-			":u7981:":                                 "\U0001f232",
-			":u7a7a:":                                 "\U0001f233",
-			":uganda:":                                "\U0001f1fa\U0001f1ec",
-			":uk:":                                    "\U0001f1ec\U0001f1e7",
-			":ukraine:":                               "\U0001f1fa\U0001f1e6",
-			":umbrella:":                              "\u2602\ufe0f",
-			":umbrella2:":                             "\u2602",
-			":umbrella_on_ground:":                    "\u26f1\ufe0f",
-			":umbrella_with_rain_drops:":              "\u2614",
-			":unamused:":                              "\U0001f612",
-			":unamused_face:":                         "\U0001f612",
-			":underage:":                              "\U0001f51e",
-			":unicorn:":                               "\U0001f984",
-			":unicorn_face:":                          "\U0001f984",
-			":united_arab_emirates:":                  "\U0001f1e6\U0001f1ea",
-			":united_nations:":                        "\U0001f1fa\U0001f1f3",
-			":unlock:":                                "\U0001f513",
-			":unlocked:":                              "\U0001f513",
-			":up:":                                    "\U0001f199",
-			":up-down_arrow:":                         "\u2195",
-			":up-left_arrow:":                         "\u2196",
-			":up-right_arrow:":                        "\u2197",
-			":up_arrow:":                              "\u2b06",
-			":upside-down_face:":                      "\U0001f643",
-			":upside_down:":                           "\U0001f643",
-			":upside_down_face:":                      "\U0001f643",
-			":upwards_button:":                        "\U0001f53c",
-			":urn:":                                   "\u26b1",
-			":uruguay:":                               "\U0001f1fa\U0001f1fe",
-			":us:":                                    "\U0001f1fa\U0001f1f8",
-			":us_outlying_islands:":                   "\U0001f1fa\U0001f1f2",
-			":us_virgin_islands:":                     "\U0001f1fb\U0001f1ee",
-			":uzbekistan:":                            "\U0001f1fa\U0001f1ff",
-			":v:":                                     "\u270c\ufe0f",
-			":v_tone1:":                               "\u270c\U0001f3fb",
-			":v_tone2:":                               "\u270c\U0001f3fc",
-			":v_tone3:":                               "\u270c\U0001f3fd",
-			":v_tone4:":                               "\u270c\U0001f3fe",
-			":v_tone5:":                               "\u270c\U0001f3ff",
-			":vampire:":                               "\U0001f9db\u200d\u2640\ufe0f",
-			":vampire_man:":                           "\U0001f9db\u200d\u2642\ufe0f",
-			":vampire_tone1:":                         "\U0001f9db\U0001f3fb",
-			":vampire_tone2:":                         "\U0001f9db\U0001f3fc",
-			":vampire_tone3:":                         "\U0001f9db\U0001f3fd",
-			":vampire_tone4:":                         "\U0001f9db\U0001f3fe",
-			":vampire_tone5:":                         "\U0001f9db\U0001f3ff",
-			":vampire_woman:":                         "\U0001f9db\u200d\u2640\ufe0f",
-			":vanuatu:":                               "\U0001f1fb\U0001f1fa",
-			":vatican_city:":                          "\U0001f1fb\U0001f1e6",
-			":venezuela:":                             "\U0001f1fb\U0001f1ea",
-			":vertical_traffic_light:":                "\U0001f6a6",
-			":vhs:":                                   "\U0001f4fc",
-			":vibration_mode:":                        "\U0001f4f3",
-			":victory_hand:":                          "\u270c",
-			":video_camera:":                          "\U0001f4f9",
-			":video_game:":                            "\U0001f3ae",
-			":videocassette:":                         "\U0001f4fc",
-			":vietnam:":                               "\U0001f1fb\U0001f1f3",
-			":violin:":                                "\U0001f3bb",
-			":virgo:":                                 "\u264d",
-			":volcano:":                               "\U0001f30b",
-			":volleyball:":                            "\U0001f3d0",
-			":vomiting_face:":                         "\U0001f92e",
-			":vs:":                                    "\U0001f19a",
-			":vulcan:":                                "\U0001f596",
-			":vulcan_salute:":                         "\U0001f596",
-			":vulcan_tone1:":                          "\U0001f596\U0001f3fb",
-			":vulcan_tone2:":                          "\U0001f596\U0001f3fc",
-			":vulcan_tone3:":                          "\U0001f596\U0001f3fd",
-			":vulcan_tone4:":                          "\U0001f596\U0001f3fe",
-			":vulcan_tone5:":                          "\U0001f596\U0001f3ff",
-			":waffle:":                                "\U0001f9c7",
-			":wales:":                                 "\U0001f3f4\U000e0067\U000e0062\U000e0077\U000e006c\U000e0073\U000e007f",
-			":walking:":                               "\U0001f6b6\u200d\u2642\ufe0f",
-			":walking_man:":                           "\U0001f6b6\u200d\u2642\ufe0f",
-			":walking_woman:":                         "\U0001f6b6\u200d\u2640\ufe0f",
-			":wallis_futuna:":                         "\U0001f1fc\U0001f1eb",
-			":waning_crescent_moon:":                  "\U0001f318",
-			":waning_gibbous_moon:":                   "\U0001f316",
-			":warning:":                               "\u26a0\ufe0f",
-			":wastebasket:":                           "\U0001f5d1\ufe0f",
-			":watch:":                                 "\u231a",
-			":water_buffalo:":                         "\U0001f403",
-			":water_closet:":                          "\U0001f6be",
-			":water_pistol:":                          "\U0001f52b",
-			":water_polo:":                            "\U0001f93d",
-			":water_wave:":                            "\U0001f30a",
-			":watermelon:":                            "\U0001f349",
-			":wave:":                                  "\U0001f44b",
-			":wave_tone1:":                            "\U0001f44b\U0001f3fb",
-			":wave_tone2:":                            "\U0001f44b\U0001f3fc",
-			":wave_tone3:":                            "\U0001f44b\U0001f3fd",
-			":wave_tone4:":                            "\U0001f44b\U0001f3fe",
-			":wave_tone5:":                            "\U0001f44b\U0001f3ff",
-			":waving_black_flag:":                     "\U0001f3f4",
-			":waving_hand:":                           "\U0001f44b",
-			":waving_white_flag:":                     "\U0001f3f3\ufe0f",
-			":wavy_dash:":                             "\u3030\ufe0f",
-			":waxing_crescent_moon:":                  "\U0001f312",
-			":waxing_gibbous_moon:":                   "\U0001f314",
-			":wc:":                                    "\U0001f6be",
-			":weary:":                                 "\U0001f629",
-			":weary_cat:":                             "\U0001f640",
-			":weary_face:":                            "\U0001f629",
-			":wedding:":                               "\U0001f492",
-			":weight_lifter:":                         "\U0001f3cb\ufe0f\u200d\u2642\ufe0f",
-			":weight_lifting:":                        "\U0001f3cb\ufe0f",
-			":weight_lifting_man:":                    "\U0001f3cb\ufe0f\u200d\u2642\ufe0f",
-			":weight_lifting_woman:":                  "\U0001f3cb\ufe0f\u200d\u2640\ufe0f",
-			":western_sahara:":                        "\U0001f1ea\U0001f1ed",
-			":whale:":                                 "\U0001f433",
-			":whale2:":                                "\U0001f40b",
-			":wheel_of_dharma:":                       "\u2638\ufe0f",
-			":wheelchair:":                            "\u267f",
-			":wheelchair_symbol:":                     "\u267f",
-			":white_cane:":                            "\U0001f9af",
-			":white_check_mark:":                      "\u2705",
-			":white_circle:":                          "\u26aa",
-			":white_exclamation_mark:":                "\u2755",
-			":white_flag:":                            "\U0001f3f3",
-			":white_flower:":                          "\U0001f4ae",
-			":white_frowning_face:":                   "\u2639\ufe0f",
-			":white_hair:":                            "\U0001f9b3",
-			":white_haired_man:":                      "\U0001f468\u200d\U0001f9b3",
-			":white_haired_person:":                   "\U0001f9d1\u200d\U0001f9b3",
-			":white_haired_woman:":                    "\U0001f469\u200d\U0001f9b3",
-			":white_heart:":                           "\U0001f90d",
-			":white_large_square:":                    "\u2b1c",
-			":white_medium-small_square:":             "\u25fd",
-			":white_medium_small_square:":             "\u25fd",
-			":white_medium_square:":                   "\u25fb\ufe0f",
-			":white_question_mark:":                   "\u2754",
-			":white_small_square:":                    "\u25ab\ufe0f",
-			":white_square_button:":                   "\U0001f533",
-			":white_sun_cloud:":                       "\U0001f325",
-			":white_sun_rain_cloud:":                  "\U0001f326",
-			":white_sun_small_cloud:":                 "\U0001f324",
-			":wilted_flower:":                         "\U0001f940",
-			":wilted_rose:":                           "\U0001f940",
-			":wind_blowing_face:":                     "\U0001f32c\ufe0f",
-			":wind_chime:":                            "\U0001f390",
-			":wind_face:":                             "\U0001f32c",
-			":window:":                                "\U0001fa9f",
-			":wine_glass:":                            "\U0001f377",
-			":wink:":                                  "\U0001f609",
-			":winking_face:":                          "\U0001f609",
-			":winking_face_with_tongue:":              "\U0001f61c",
-			":wolf:":                                  "\U0001f43a",
-			":woman:":                                 "\U0001f469",
-			":woman-biking:":                          "\U0001f6b4\u200d\u2640\ufe0f",
-			":woman-bouncing-ball:":                   "\u26f9\ufe0f\u200d\u2640\ufe0f",
-			":woman-bowing:":                          "\U0001f647\u200d\u2640\ufe0f",
-			":woman-boy:":                             "\U0001f469\u200d\U0001f466",
-			":woman-boy-boy:":                         "\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":woman-cartwheeling:":                    "\U0001f938\u200d\u2640\ufe0f",
-			":woman-facepalming:":                     "\U0001f926\u200d\u2640\ufe0f",
-			":woman-frowning:":                        "\U0001f64d\u200d\u2640\ufe0f",
-			":woman-gesturing-no:":                    "\U0001f645\u200d\u2640\ufe0f",
-			":woman-gesturing-ok:":                    "\U0001f646\u200d\u2640\ufe0f",
-			":woman-getting-haircut:":                 "\U0001f487\u200d\u2640\ufe0f",
-			":woman-getting-massage:":                 "\U0001f486\u200d\u2640\ufe0f",
-			":woman-girl:":                            "\U0001f469\u200d\U0001f467",
-			":woman-girl-boy:":                        "\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":woman-girl-girl:":                       "\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":woman-golfing:":                         "\U0001f3cc\ufe0f\u200d\u2640\ufe0f",
-			":woman-heart-man:":                       "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f468",
-			":woman-heart-woman:":                     "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f469",
-			":woman-juggling:":                        "\U0001f939\u200d\u2640\ufe0f",
-			":woman-kiss-man:":                        "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468",
-			":woman-kiss-woman:":                      "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f469",
-			":woman-lifting-weights:":                 "\U0001f3cb\ufe0f\u200d\u2640\ufe0f",
-			":woman-mountain-biking:":                 "\U0001f6b5\u200d\u2640\ufe0f",
-			":woman-playing-handball:":                "\U0001f93e\u200d\u2640\ufe0f",
-			":woman-playing-water-polo:":              "\U0001f93d\u200d\u2640\ufe0f",
-			":woman-pouting:":                         "\U0001f64e\u200d\u2640\ufe0f",
-			":woman-raising-hand:":                    "\U0001f64b\u200d\u2640\ufe0f",
-			":woman-rowing-boat:":                     "\U0001f6a3\u200d\u2640\ufe0f",
-			":woman-running:":                         "\U0001f3c3\u200d\u2640\ufe0f",
-			":woman-shrugging:":                       "\U0001f937\u200d\u2640\ufe0f",
-			":woman-surfing:":                         "\U0001f3c4\u200d\u2640\ufe0f",
-			":woman-swimming:":                        "\U0001f3ca\u200d\u2640\ufe0f",
-			":woman-tipping-hand:":                    "\U0001f481\u200d\u2640\ufe0f",
-			":woman-walking:":                         "\U0001f6b6\u200d\u2640\ufe0f",
-			":woman-wearing-turban:":                  "\U0001f473\u200d\u2640\ufe0f",
-			":woman-with-bunny-ears-partying:":        "\U0001f46f\u200d\u2640\ufe0f",
-			":woman-woman-boy:":                       "\U0001f469\u200d\U0001f469\u200d\U0001f466",
-			":woman-woman-boy-boy:":                   "\U0001f469\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
-			":woman-woman-girl:":                      "\U0001f469\u200d\U0001f469\u200d\U0001f467",
-			":woman-woman-girl-boy:":                  "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
-			":woman-woman-girl-girl:":                 "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
-			":woman-wrestling:":                       "\U0001f93c\u200d\u2640\ufe0f",
-			":woman_and_man_holding_hands:":           "\U0001f46b",
-			":woman_artist:":                          "\U0001f469\u200d\U0001f3a8",
-			":woman_artist_tone1:":                    "\U0001f469\U0001f3fb\u200d\U0001f3a8",
-			":woman_artist_tone2:":                    "\U0001f469\U0001f3fc\u200d\U0001f3a8",
-			":woman_artist_tone3:":                    "\U0001f469\U0001f3fd\u200d\U0001f3a8",
-			":woman_artist_tone4:":                    "\U0001f469\U0001f3fe\u200d\U0001f3a8",
-			":woman_artist_tone5:":                    "\U0001f469\U0001f3ff\u200d\U0001f3a8",
-			":woman_astronaut:":                       "\U0001f469\u200d\U0001f680",
-			":woman_astronaut_tone1:":                 "\U0001f469\U0001f3fb\u200d\U0001f680",
-			":woman_astronaut_tone2:":                 "\U0001f469\U0001f3fc\u200d\U0001f680",
-			":woman_astronaut_tone3:":                 "\U0001f469\U0001f3fd\u200d\U0001f680",
-			":woman_astronaut_tone4:":                 "\U0001f469\U0001f3fe\u200d\U0001f680",
-			":woman_astronaut_tone5:":                 "\U0001f469\U0001f3ff\u200d\U0001f680",
-			":woman_bald:":                            "\U0001f469\u200d\U0001f9b2",
-			":woman_beard:":                           "\U0001f9d4\u200d\u2640\ufe0f",
-			":woman_biking:":                          "\U0001f6b4\u200d\u2640\ufe0f",
-			":woman_biking_tone1:":                    "\U0001f6b4\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_biking_tone2:":                    "\U0001f6b4\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_biking_tone3:":                    "\U0001f6b4\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_biking_tone4:":                    "\U0001f6b4\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_biking_tone5:":                    "\U0001f6b4\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_blond_hair:":                      "\U0001f471\u200d\u2640\ufe0f",
-			":woman_bouncing_ball:":                   "\u26f9\ufe0f\u200d\u2640\ufe0f",
-			":woman_bouncing_ball_tone1:":             "\u26f9\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_bouncing_ball_tone2:":             "\u26f9\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_bouncing_ball_tone3:":             "\u26f9\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_bouncing_ball_tone4:":             "\u26f9\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_bouncing_ball_tone5:":             "\u26f9\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_bowing:":                          "\U0001f647\u200d\u2640\ufe0f",
-			":woman_bowing_tone1:":                    "\U0001f647\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_bowing_tone2:":                    "\U0001f647\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_bowing_tone3:":                    "\U0001f647\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_bowing_tone4:":                    "\U0001f647\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_bowing_tone5:":                    "\U0001f647\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_cartwheeling:":                    "\U0001f938\u200d\u2640\ufe0f",
-			":woman_cartwheeling_tone1:":              "\U0001f938\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_cartwheeling_tone2:":              "\U0001f938\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_cartwheeling_tone3:":              "\U0001f938\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_cartwheeling_tone4:":              "\U0001f938\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_cartwheeling_tone5:":              "\U0001f938\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_climbing:":                        "\U0001f9d7\u200d\u2640\ufe0f",
-			":woman_climbing_tone1:":                  "\U0001f9d7\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_climbing_tone2:":                  "\U0001f9d7\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_climbing_tone3:":                  "\U0001f9d7\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_climbing_tone4:":                  "\U0001f9d7\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_climbing_tone5:":                  "\U0001f9d7\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_construction_worker:":             "\U0001f477\u200d\u2640\ufe0f",
-			":woman_construction_worker_tone1:":       "\U0001f477\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_construction_worker_tone2:":       "\U0001f477\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_construction_worker_tone3:":       "\U0001f477\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_construction_worker_tone4:":       "\U0001f477\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_construction_worker_tone5:":       "\U0001f477\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_cook:":                            "\U0001f469\u200d\U0001f373",
-			":woman_cook_tone1:":                      "\U0001f469\U0001f3fb\u200d\U0001f373",
-			":woman_cook_tone2:":                      "\U0001f469\U0001f3fc\u200d\U0001f373",
-			":woman_cook_tone3:":                      "\U0001f469\U0001f3fd\u200d\U0001f373",
-			":woman_cook_tone4:":                      "\U0001f469\U0001f3fe\u200d\U0001f373",
-			":woman_cook_tone5:":                      "\U0001f469\U0001f3ff\u200d\U0001f373",
-			":woman_curly_hair:":                      "\U0001f469\u200d\U0001f9b1",
-			":woman_dancing:":                         "\U0001f483",
-			":woman_detective:":                       "\U0001f575\ufe0f\u200d\u2640\ufe0f",
-			":woman_detective_tone1:":                 "\U0001f575\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_detective_tone2:":                 "\U0001f575\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_detective_tone3:":                 "\U0001f575\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_detective_tone4:":                 "\U0001f575\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_detective_tone5:":                 "\U0001f575\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_elf:":                             "\U0001f9dd\u200d\u2640\ufe0f",
-			":woman_elf_tone1:":                       "\U0001f9dd\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_elf_tone2:":                       "\U0001f9dd\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_elf_tone3:":                       "\U0001f9dd\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_elf_tone4:":                       "\U0001f9dd\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_elf_tone5:":                       "\U0001f9dd\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_facepalming:":                     "\U0001f926\u200d\u2640\ufe0f",
-			":woman_facepalming_tone1:":               "\U0001f926\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_facepalming_tone2:":               "\U0001f926\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_facepalming_tone3:":               "\U0001f926\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_facepalming_tone4:":               "\U0001f926\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_facepalming_tone5:":               "\U0001f926\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_factory_worker:":                  "\U0001f469\u200d\U0001f3ed",
-			":woman_factory_worker_tone1:":            "\U0001f469\U0001f3fb\u200d\U0001f3ed",
-			":woman_factory_worker_tone2:":            "\U0001f469\U0001f3fc\u200d\U0001f3ed",
-			":woman_factory_worker_tone3:":            "\U0001f469\U0001f3fd\u200d\U0001f3ed",
-			":woman_factory_worker_tone4:":            "\U0001f469\U0001f3fe\u200d\U0001f3ed",
-			":woman_factory_worker_tone5:":            "\U0001f469\U0001f3ff\u200d\U0001f3ed",
-			":woman_fairy:":                           "\U0001f9da\u200d\u2640\ufe0f",
-			":woman_fairy_tone1:":                     "\U0001f9da\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_fairy_tone2:":                     "\U0001f9da\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_fairy_tone3:":                     "\U0001f9da\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_fairy_tone4:":                     "\U0001f9da\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_fairy_tone5:":                     "\U0001f9da\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_farmer:":                          "\U0001f469\u200d\U0001f33e",
-			":woman_farmer_tone1:":                    "\U0001f469\U0001f3fb\u200d\U0001f33e",
-			":woman_farmer_tone2:":                    "\U0001f469\U0001f3fc\u200d\U0001f33e",
-			":woman_farmer_tone3:":                    "\U0001f469\U0001f3fd\u200d\U0001f33e",
-			":woman_farmer_tone4:":                    "\U0001f469\U0001f3fe\u200d\U0001f33e",
-			":woman_farmer_tone5:":                    "\U0001f469\U0001f3ff\u200d\U0001f33e",
-			":woman_feeding_baby:":                    "\U0001f469\u200d\U0001f37c",
-			":woman_firefighter:":                     "\U0001f469\u200d\U0001f692",
-			":woman_firefighter_tone1:":               "\U0001f469\U0001f3fb\u200d\U0001f692",
-			":woman_firefighter_tone2:":               "\U0001f469\U0001f3fc\u200d\U0001f692",
-			":woman_firefighter_tone3:":               "\U0001f469\U0001f3fd\u200d\U0001f692",
-			":woman_firefighter_tone4:":               "\U0001f469\U0001f3fe\u200d\U0001f692",
-			":woman_firefighter_tone5:":               "\U0001f469\U0001f3ff\u200d\U0001f692",
-			":woman_frowning:":                        "\U0001f64d\u200d\u2640\ufe0f",
-			":woman_frowning_tone1:":                  "\U0001f64d\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_frowning_tone2:":                  "\U0001f64d\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_frowning_tone3:":                  "\U0001f64d\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_frowning_tone4:":                  "\U0001f64d\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_frowning_tone5:":                  "\U0001f64d\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_genie:":                           "\U0001f9de\u200d\u2640\ufe0f",
-			":woman_gesturing_NO:":                    "\U0001f645\u200d\u2640\ufe0f",
-			":woman_gesturing_OK:":                    "\U0001f646\u200d\u2640\ufe0f",
-			":woman_gesturing_no:":                    "\U0001f645\u200d\u2640\ufe0f",
-			":woman_gesturing_no_tone1:":              "\U0001f645\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_gesturing_no_tone2:":              "\U0001f645\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_gesturing_no_tone3:":              "\U0001f645\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_gesturing_no_tone4:":              "\U0001f645\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_gesturing_no_tone5:":              "\U0001f645\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_gesturing_ok:":                    "\U0001f646\u200d\u2640\ufe0f",
-			":woman_gesturing_ok_tone1:":              "\U0001f646\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_gesturing_ok_tone2:":              "\U0001f646\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_gesturing_ok_tone3:":              "\U0001f646\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_gesturing_ok_tone4:":              "\U0001f646\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_gesturing_ok_tone5:":              "\U0001f646\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_getting_face_massage:":            "\U0001f486\u200d\u2640\ufe0f",
-			":woman_getting_face_massage_tone1:":      "\U0001f486\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_getting_face_massage_tone2:":      "\U0001f486\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_getting_face_massage_tone3:":      "\U0001f486\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_getting_face_massage_tone4:":      "\U0001f486\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_getting_face_massage_tone5:":      "\U0001f486\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_getting_haircut:":                 "\U0001f487\u200d\u2640\ufe0f",
-			":woman_getting_haircut_tone1:":           "\U0001f487\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_getting_haircut_tone2:":           "\U0001f487\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_getting_haircut_tone3:":           "\U0001f487\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_getting_haircut_tone4:":           "\U0001f487\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_getting_haircut_tone5:":           "\U0001f487\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_getting_massage:":                 "\U0001f486\u200d\u2640\ufe0f",
-			":woman_golfing:":                         "\U0001f3cc\ufe0f\u200d\u2640\ufe0f",
-			":woman_golfing_tone1:":                   "\U0001f3cc\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_golfing_tone2:":                   "\U0001f3cc\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_golfing_tone3:":                   "\U0001f3cc\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_golfing_tone4:":                   "\U0001f3cc\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_golfing_tone5:":                   "\U0001f3cc\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_guard:":                           "\U0001f482\u200d\u2640\ufe0f",
-			":woman_guard_tone1:":                     "\U0001f482\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_guard_tone2:":                     "\U0001f482\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_guard_tone3:":                     "\U0001f482\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_guard_tone4:":                     "\U0001f482\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_guard_tone5:":                     "\U0001f482\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_health_worker:":                   "\U0001f469\u200d\u2695\ufe0f",
-			":woman_health_worker_tone1:":             "\U0001f469\U0001f3fb\u200d\u2695\ufe0f",
-			":woman_health_worker_tone2:":             "\U0001f469\U0001f3fc\u200d\u2695\ufe0f",
-			":woman_health_worker_tone3:":             "\U0001f469\U0001f3fd\u200d\u2695\ufe0f",
-			":woman_health_worker_tone4:":             "\U0001f469\U0001f3fe\u200d\u2695\ufe0f",
-			":woman_health_worker_tone5:":             "\U0001f469\U0001f3ff\u200d\u2695\ufe0f",
-			":woman_in_lotus_position:":               "\U0001f9d8\u200d\u2640\ufe0f",
-			":woman_in_lotus_position_tone1:":         "\U0001f9d8\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_in_lotus_position_tone2:":         "\U0001f9d8\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_in_lotus_position_tone3:":         "\U0001f9d8\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_in_lotus_position_tone4:":         "\U0001f9d8\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_in_lotus_position_tone5:":         "\U0001f9d8\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_in_manual_wheelchair:":            "\U0001f469\u200d\U0001f9bd",
-			":woman_in_motorized_wheelchair:":         "\U0001f469\u200d\U0001f9bc",
-			":woman_in_steamy_room:":                  "\U0001f9d6\u200d\u2640\ufe0f",
-			":woman_in_steamy_room_tone1:":            "\U0001f9d6\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_in_steamy_room_tone2:":            "\U0001f9d6\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_in_steamy_room_tone3:":            "\U0001f9d6\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_in_steamy_room_tone4:":            "\U0001f9d6\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_in_steamy_room_tone5:":            "\U0001f9d6\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_in_tuxedo:":                       "\U0001f935\u200d\u2640\ufe0f",
-			":woman_judge:":                           "\U0001f469\u200d\u2696\ufe0f",
-			":woman_judge_tone1:":                     "\U0001f469\U0001f3fb\u200d\u2696\ufe0f",
-			":woman_judge_tone2:":                     "\U0001f469\U0001f3fc\u200d\u2696\ufe0f",
-			":woman_judge_tone3:":                     "\U0001f469\U0001f3fd\u200d\u2696\ufe0f",
-			":woman_judge_tone4:":                     "\U0001f469\U0001f3fe\u200d\u2696\ufe0f",
-			":woman_judge_tone5:":                     "\U0001f469\U0001f3ff\u200d\u2696\ufe0f",
-			":woman_juggling:":                        "\U0001f939\u200d\u2640\ufe0f",
-			":woman_juggling_tone1:":                  "\U0001f939\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_juggling_tone2:":                  "\U0001f939\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_juggling_tone3:":                  "\U0001f939\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_juggling_tone4:":                  "\U0001f939\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_juggling_tone5:":                  "\U0001f939\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_kneeling:":                        "\U0001f9ce\u200d\u2640\ufe0f",
-			":woman_lifting_weights:":                 "\U0001f3cb\ufe0f\u200d\u2640\ufe0f",
-			":woman_lifting_weights_tone1:":           "\U0001f3cb\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_lifting_weights_tone2:":           "\U0001f3cb\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_lifting_weights_tone3:":           "\U0001f3cb\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_lifting_weights_tone4:":           "\U0001f3cb\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_lifting_weights_tone5:":           "\U0001f3cb\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_mage:":                            "\U0001f9d9\u200d\u2640\ufe0f",
-			":woman_mage_tone1:":                      "\U0001f9d9\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_mage_tone2:":                      "\U0001f9d9\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_mage_tone3:":                      "\U0001f9d9\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_mage_tone4:":                      "\U0001f9d9\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_mage_tone5:":                      "\U0001f9d9\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_mechanic:":                        "\U0001f469\u200d\U0001f527",
-			":woman_mechanic_tone1:":                  "\U0001f469\U0001f3fb\u200d\U0001f527",
-			":woman_mechanic_tone2:":                  "\U0001f469\U0001f3fc\u200d\U0001f527",
-			":woman_mechanic_tone3:":                  "\U0001f469\U0001f3fd\u200d\U0001f527",
-			":woman_mechanic_tone4:":                  "\U0001f469\U0001f3fe\u200d\U0001f527",
-			":woman_mechanic_tone5:":                  "\U0001f469\U0001f3ff\u200d\U0001f527",
-			":woman_mountain_biking:":                 "\U0001f6b5\u200d\u2640\ufe0f",
-			":woman_mountain_biking_tone1:":           "\U0001f6b5\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_mountain_biking_tone2:":           "\U0001f6b5\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_mountain_biking_tone3:":           "\U0001f6b5\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_mountain_biking_tone4:":           "\U0001f6b5\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_mountain_biking_tone5:":           "\U0001f6b5\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_office_worker:":                   "\U0001f469\u200d\U0001f4bc",
-			":woman_office_worker_tone1:":             "\U0001f469\U0001f3fb\u200d\U0001f4bc",
-			":woman_office_worker_tone2:":             "\U0001f469\U0001f3fc\u200d\U0001f4bc",
-			":woman_office_worker_tone3:":             "\U0001f469\U0001f3fd\u200d\U0001f4bc",
-			":woman_office_worker_tone4:":             "\U0001f469\U0001f3fe\u200d\U0001f4bc",
-			":woman_office_worker_tone5:":             "\U0001f469\U0001f3ff\u200d\U0001f4bc",
-			":woman_pilot:":                           "\U0001f469\u200d\u2708\ufe0f",
-			":woman_pilot_tone1:":                     "\U0001f469\U0001f3fb\u200d\u2708\ufe0f",
-			":woman_pilot_tone2:":                     "\U0001f469\U0001f3fc\u200d\u2708\ufe0f",
-			":woman_pilot_tone3:":                     "\U0001f469\U0001f3fd\u200d\u2708\ufe0f",
-			":woman_pilot_tone4:":                     "\U0001f469\U0001f3fe\u200d\u2708\ufe0f",
-			":woman_pilot_tone5:":                     "\U0001f469\U0001f3ff\u200d\u2708\ufe0f",
-			":woman_playing_handball:":                "\U0001f93e\u200d\u2640\ufe0f",
-			":woman_playing_handball_tone1:":          "\U0001f93e\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_playing_handball_tone2:":          "\U0001f93e\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_playing_handball_tone3:":          "\U0001f93e\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_playing_handball_tone4:":          "\U0001f93e\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_playing_handball_tone5:":          "\U0001f93e\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_playing_water_polo:":              "\U0001f93d\u200d\u2640\ufe0f",
-			":woman_playing_water_polo_tone1:":        "\U0001f93d\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_playing_water_polo_tone2:":        "\U0001f93d\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_playing_water_polo_tone3:":        "\U0001f93d\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_playing_water_polo_tone4:":        "\U0001f93d\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_playing_water_polo_tone5:":        "\U0001f93d\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_police_officer:":                  "\U0001f46e\u200d\u2640\ufe0f",
-			":woman_police_officer_tone1:":            "\U0001f46e\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_police_officer_tone2:":            "\U0001f46e\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_police_officer_tone3:":            "\U0001f46e\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_police_officer_tone4:":            "\U0001f46e\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_police_officer_tone5:":            "\U0001f46e\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_pouting:":                         "\U0001f64e\u200d\u2640\ufe0f",
-			":woman_pouting_tone1:":                   "\U0001f64e\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_pouting_tone2:":                   "\U0001f64e\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_pouting_tone3:":                   "\U0001f64e\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_pouting_tone4:":                   "\U0001f64e\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_pouting_tone5:":                   "\U0001f64e\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_raising_hand:":                    "\U0001f64b\u200d\u2640\ufe0f",
-			":woman_raising_hand_tone1:":              "\U0001f64b\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_raising_hand_tone2:":              "\U0001f64b\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_raising_hand_tone3:":              "\U0001f64b\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_raising_hand_tone4:":              "\U0001f64b\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_raising_hand_tone5:":              "\U0001f64b\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_red_hair:":                        "\U0001f469\u200d\U0001f9b0",
-			":woman_rowing_boat:":                     "\U0001f6a3\u200d\u2640\ufe0f",
-			":woman_rowing_boat_tone1:":               "\U0001f6a3\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_rowing_boat_tone2:":               "\U0001f6a3\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_rowing_boat_tone3:":               "\U0001f6a3\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_rowing_boat_tone4:":               "\U0001f6a3\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_rowing_boat_tone5:":               "\U0001f6a3\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_running:":                         "\U0001f3c3\u200d\u2640\ufe0f",
-			":woman_running_tone1:":                   "\U0001f3c3\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_running_tone2:":                   "\U0001f3c3\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_running_tone3:":                   "\U0001f3c3\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_running_tone4:":                   "\U0001f3c3\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_running_tone5:":                   "\U0001f3c3\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_scientist:":                       "\U0001f469\u200d\U0001f52c",
-			":woman_scientist_tone1:":                 "\U0001f469\U0001f3fb\u200d\U0001f52c",
-			":woman_scientist_tone2:":                 "\U0001f469\U0001f3fc\u200d\U0001f52c",
-			":woman_scientist_tone3:":                 "\U0001f469\U0001f3fd\u200d\U0001f52c",
-			":woman_scientist_tone4:":                 "\U0001f469\U0001f3fe\u200d\U0001f52c",
-			":woman_scientist_tone5:":                 "\U0001f469\U0001f3ff\u200d\U0001f52c",
-			":woman_shrugging:":                       "\U0001f937\u200d\u2640\ufe0f",
-			":woman_shrugging_tone1:":                 "\U0001f937\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_shrugging_tone2:":                 "\U0001f937\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_shrugging_tone3:":                 "\U0001f937\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_shrugging_tone4:":                 "\U0001f937\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_shrugging_tone5:":                 "\U0001f937\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_singer:":                          "\U0001f469\u200d\U0001f3a4",
-			":woman_singer_tone1:":                    "\U0001f469\U0001f3fb\u200d\U0001f3a4",
-			":woman_singer_tone2:":                    "\U0001f469\U0001f3fc\u200d\U0001f3a4",
-			":woman_singer_tone3:":                    "\U0001f469\U0001f3fd\u200d\U0001f3a4",
-			":woman_singer_tone4:":                    "\U0001f469\U0001f3fe\u200d\U0001f3a4",
-			":woman_singer_tone5:":                    "\U0001f469\U0001f3ff\u200d\U0001f3a4",
-			":woman_standing:":                        "\U0001f9cd\u200d\u2640\ufe0f",
-			":woman_student:":                         "\U0001f469\u200d\U0001f393",
-			":woman_student_tone1:":                   "\U0001f469\U0001f3fb\u200d\U0001f393",
-			":woman_student_tone2:":                   "\U0001f469\U0001f3fc\u200d\U0001f393",
-			":woman_student_tone3:":                   "\U0001f469\U0001f3fd\u200d\U0001f393",
-			":woman_student_tone4:":                   "\U0001f469\U0001f3fe\u200d\U0001f393",
-			":woman_student_tone5:":                   "\U0001f469\U0001f3ff\u200d\U0001f393",
-			":woman_superhero:":                       "\U0001f9b8\u200d\u2640\ufe0f",
-			":woman_supervillain:":                    "\U0001f9b9\u200d\u2640\ufe0f",
-			":woman_surfing:":                         "\U0001f3c4\u200d\u2640\ufe0f",
-			":woman_surfing_tone1:":                   "\U0001f3c4\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_surfing_tone2:":                   "\U0001f3c4\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_surfing_tone3:":                   "\U0001f3c4\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_surfing_tone4:":                   "\U0001f3c4\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_surfing_tone5:":                   "\U0001f3c4\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_swimming:":                        "\U0001f3ca\u200d\u2640\ufe0f",
-			":woman_swimming_tone1:":                  "\U0001f3ca\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_swimming_tone2:":                  "\U0001f3ca\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_swimming_tone3:":                  "\U0001f3ca\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_swimming_tone4:":                  "\U0001f3ca\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_swimming_tone5:":                  "\U0001f3ca\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_teacher:":                         "\U0001f469\u200d\U0001f3eb",
-			":woman_teacher_tone1:":                   "\U0001f469\U0001f3fb\u200d\U0001f3eb",
-			":woman_teacher_tone2:":                   "\U0001f469\U0001f3fc\u200d\U0001f3eb",
-			":woman_teacher_tone3:":                   "\U0001f469\U0001f3fd\u200d\U0001f3eb",
-			":woman_teacher_tone4:":                   "\U0001f469\U0001f3fe\u200d\U0001f3eb",
-			":woman_teacher_tone5:":                   "\U0001f469\U0001f3ff\u200d\U0001f3eb",
-			":woman_technologist:":                    "\U0001f469\u200d\U0001f4bb",
-			":woman_technologist_tone1:":              "\U0001f469\U0001f3fb\u200d\U0001f4bb",
-			":woman_technologist_tone2:":              "\U0001f469\U0001f3fc\u200d\U0001f4bb",
-			":woman_technologist_tone3:":              "\U0001f469\U0001f3fd\u200d\U0001f4bb",
-			":woman_technologist_tone4:":              "\U0001f469\U0001f3fe\u200d\U0001f4bb",
-			":woman_technologist_tone5:":              "\U0001f469\U0001f3ff\u200d\U0001f4bb",
-			":woman_tipping_hand:":                    "\U0001f481\u200d\u2640\ufe0f",
-			":woman_tipping_hand_tone1:":              "\U0001f481\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_tipping_hand_tone2:":              "\U0001f481\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_tipping_hand_tone3:":              "\U0001f481\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_tipping_hand_tone4:":              "\U0001f481\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_tipping_hand_tone5:":              "\U0001f481\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_tone1:":                           "\U0001f469\U0001f3fb",
-			":woman_tone2:":                           "\U0001f469\U0001f3fc",
-			":woman_tone3:":                           "\U0001f469\U0001f3fd",
-			":woman_tone4:":                           "\U0001f469\U0001f3fe",
-			":woman_tone5:":                           "\U0001f469\U0001f3ff",
-			":woman_vampire:":                         "\U0001f9db\u200d\u2640\ufe0f",
-			":woman_vampire_tone1:":                   "\U0001f9db\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_vampire_tone2:":                   "\U0001f9db\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_vampire_tone3:":                   "\U0001f9db\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_vampire_tone4:":                   "\U0001f9db\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_vampire_tone5:":                   "\U0001f9db\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_walking:":                         "\U0001f6b6\u200d\u2640\ufe0f",
-			":woman_walking_tone1:":                   "\U0001f6b6\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_walking_tone2:":                   "\U0001f6b6\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_walking_tone3:":                   "\U0001f6b6\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_walking_tone4:":                   "\U0001f6b6\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_walking_tone5:":                   "\U0001f6b6\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_wearing_turban:":                  "\U0001f473\u200d\u2640\ufe0f",
-			":woman_wearing_turban_tone1:":            "\U0001f473\U0001f3fb\u200d\u2640\ufe0f",
-			":woman_wearing_turban_tone2:":            "\U0001f473\U0001f3fc\u200d\u2640\ufe0f",
-			":woman_wearing_turban_tone3:":            "\U0001f473\U0001f3fd\u200d\u2640\ufe0f",
-			":woman_wearing_turban_tone4:":            "\U0001f473\U0001f3fe\u200d\u2640\ufe0f",
-			":woman_wearing_turban_tone5:":            "\U0001f473\U0001f3ff\u200d\u2640\ufe0f",
-			":woman_white_hair:":                      "\U0001f469\u200d\U0001f9b3",
-			":woman_with_headscarf:":                  "\U0001f9d5",
-			":woman_with_headscarf_tone1:":            "\U0001f9d5\U0001f3fb",
-			":woman_with_headscarf_tone2:":            "\U0001f9d5\U0001f3fc",
-			":woman_with_headscarf_tone3:":            "\U0001f9d5\U0001f3fd",
-			":woman_with_headscarf_tone4:":            "\U0001f9d5\U0001f3fe",
-			":woman_with_headscarf_tone5:":            "\U0001f9d5\U0001f3ff",
-			":woman_with_probing_cane:":               "\U0001f469\u200d\U0001f9af",
-			":woman_with_turban:":                     "\U0001f473\u200d\u2640\ufe0f",
-			":woman_with_veil:":                       "\U0001f470\u200d\u2640\ufe0f",
-			":woman_with_white_cane:":                 "\U0001f469\u200d\U0001f9af",
-			":woman_zombie:":                          "\U0001f9df\u200d\u2640\ufe0f",
-			":womans_clothes:":                        "\U0001f45a",
-			":womans_flat_shoe:":                      "\U0001f97f",
-			":womans_hat:":                            "\U0001f452",
-			":woman’s_boot:":                          "\U0001f462",
-			":woman’s_clothes:":                       "\U0001f45a",
-			":woman’s_hat:":                           "\U0001f452",
-			":woman’s_sandal:":                        "\U0001f461",
-			":women_holding_hands:":                   "\U0001f46d",
-			":women_with_bunny_ears:":                 "\U0001f46f\u200d\u2640\ufe0f",
-			":women_with_bunny_ears_partying:":        "\U0001f46f\u200d\u2640\ufe0f",
-			":women_wrestling:":                       "\U0001f93c\u200d\u2640\ufe0f",
-			":womens:":                                "\U0001f6ba",
-			":women’s_room:":                          "\U0001f6ba",
-			":wood:":                                  "\U0001fab5",
-			":woozy_face:":                            "\U0001f974",
-			":world_map:":                             "\U0001f5fa\ufe0f",
-			":worm:":                                  "\U0001fab1",
-			":worried:":                               "\U0001f61f",
-			":worried_face:":                          "\U0001f61f",
-			":wrapped_gift:":                          "\U0001f381",
-			":wrench:":                                "\U0001f527",
-			":wrestlers:":                             "\U0001f93c",
-			":wrestling:":                             "\U0001f93c",
-			":writing_hand:":                          "\u270d\ufe0f",
-			":writing_hand_tone1:":                    "\u270d\U0001f3fb",
-			":writing_hand_tone2:":                    "\u270d\U0001f3fc",
-			":writing_hand_tone3:":                    "\u270d\U0001f3fd",
-			":writing_hand_tone4:":                    "\u270d\U0001f3fe",
-			":writing_hand_tone5:":                    "\u270d\U0001f3ff",
-			":x:":                                     "\u274c",
-			":yarn:":                                  "\U0001f9f6",
-			":yawning_face:":                          "\U0001f971",
-			":yellow_circle:":                         "\U0001f7e1",
-			":yellow_heart:":                          "\U0001f49b",
-			":yellow_square:":                         "\U0001f7e8",
-			":yemen:":                                 "\U0001f1fe\U0001f1ea",
-			":yen:":                                   "\U0001f4b4",
-			":yen_banknote:":                          "\U0001f4b4",
-			":yin_yang:":                              "\u262f\ufe0f",
-			":yo-yo:":                                 "\U0001fa80",
-			":yo_yo:":                                 "\U0001fa80",
-			":yum:":                                   "\U0001f60b",
-			":zambia:":                                "\U0001f1ff\U0001f1f2",
-			":zany_face:":                             "\U0001f92a",
-			":zap:":                                   "\u26a1",
-			":zebra:":                                 "\U0001f993",
-			":zebra_face:":                            "\U0001f993",
-			":zero:":                                  "0\ufe0f\u20e3",
-			":zimbabwe:":                              "\U0001f1ff\U0001f1fc",
-			":zipper-mouth_face:":                     "\U0001f910",
-			":zipper_mouth:":                          "\U0001f910",
-			":zipper_mouth_face:":                     "\U0001f910",
-			":zombie:":                                "\U0001f9df\u200d\u2642\ufe0f",
-			":zombie_man:":                            "\U0001f9df\u200d\u2642\ufe0f",
-			":zombie_woman:":                          "\U0001f9df\u200d\u2640\ufe0f",
-			":zzz:":                                   "\U0001f4a4",
+			":man_in_motorized_wheelchair_facing_right:": "\U0001f468\u200d\U0001f9bc\u200d\u27a1\ufe0f",
+			":man_in_steamy_room:":                       "\U0001f9d6\u200d\u2642\ufe0f",
+			":man_in_steamy_room_tone1:":                 "\U0001f9d6\U0001f3fb\u200d\u2642\ufe0f",
+			":man_in_steamy_room_tone2:":                 "\U0001f9d6\U0001f3fc\u200d\u2642\ufe0f",
+			":man_in_steamy_room_tone3:":                 "\U0001f9d6\U0001f3fd\u200d\u2642\ufe0f",
+			":man_in_steamy_room_tone4:":                 "\U0001f9d6\U0001f3fe\u200d\u2642\ufe0f",
+			":man_in_steamy_room_tone5:":                 "\U0001f9d6\U0001f3ff\u200d\u2642\ufe0f",
+			":man_in_tuxedo:":                            "\U0001f935\u200d\u2642\ufe0f",
+			":man_in_tuxedo_tone1:":                      "\U0001f935\U0001f3fb",
+			":man_in_tuxedo_tone2:":                      "\U0001f935\U0001f3fc",
+			":man_in_tuxedo_tone3:":                      "\U0001f935\U0001f3fd",
+			":man_in_tuxedo_tone4:":                      "\U0001f935\U0001f3fe",
+			":man_in_tuxedo_tone5:":                      "\U0001f935\U0001f3ff",
+			":man_judge:":                                "\U0001f468\u200d\u2696\ufe0f",
+			":man_judge_tone1:":                          "\U0001f468\U0001f3fb\u200d\u2696\ufe0f",
+			":man_judge_tone2:":                          "\U0001f468\U0001f3fc\u200d\u2696\ufe0f",
+			":man_judge_tone3:":                          "\U0001f468\U0001f3fd\u200d\u2696\ufe0f",
+			":man_judge_tone4:":                          "\U0001f468\U0001f3fe\u200d\u2696\ufe0f",
+			":man_judge_tone5:":                          "\U0001f468\U0001f3ff\u200d\u2696\ufe0f",
+			":man_juggling:":                             "\U0001f939\u200d\u2642\ufe0f",
+			":man_juggling_tone1:":                       "\U0001f939\U0001f3fb\u200d\u2642\ufe0f",
+			":man_juggling_tone2:":                       "\U0001f939\U0001f3fc\u200d\u2642\ufe0f",
+			":man_juggling_tone3:":                       "\U0001f939\U0001f3fd\u200d\u2642\ufe0f",
+			":man_juggling_tone4:":                       "\U0001f939\U0001f3fe\u200d\u2642\ufe0f",
+			":man_juggling_tone5:":                       "\U0001f939\U0001f3ff\u200d\u2642\ufe0f",
+			":man_kneeling:":                             "\U0001f9ce\u200d\u2642\ufe0f",
+			":man_kneeling_facing_right:":                "\U0001f9ce\u200d\u2642\ufe0f\u200d\u27a1\ufe0f",
+			":man_lifting_weights:":                      "\U0001f3cb\ufe0f\u200d\u2642\ufe0f",
+			":man_lifting_weights_tone1:":                "\U0001f3cb\U0001f3fb\u200d\u2642\ufe0f",
+			":man_lifting_weights_tone2:":                "\U0001f3cb\U0001f3fc\u200d\u2642\ufe0f",
+			":man_lifting_weights_tone3:":                "\U0001f3cb\U0001f3fd\u200d\u2642\ufe0f",
+			":man_lifting_weights_tone4:":                "\U0001f3cb\U0001f3fe\u200d\u2642\ufe0f",
+			":man_lifting_weights_tone5:":                "\U0001f3cb\U0001f3ff\u200d\u2642\ufe0f",
+			":man_mage:":                                 "\U0001f9d9\u200d\u2642\ufe0f",
+			":man_mage_tone1:":                           "\U0001f9d9\U0001f3fb\u200d\u2642\ufe0f",
+			":man_mage_tone2:":                           "\U0001f9d9\U0001f3fc\u200d\u2642\ufe0f",
+			":man_mage_tone3:":                           "\U0001f9d9\U0001f3fd\u200d\u2642\ufe0f",
+			":man_mage_tone4:":                           "\U0001f9d9\U0001f3fe\u200d\u2642\ufe0f",
+			":man_mage_tone5:":                           "\U0001f9d9\U0001f3ff\u200d\u2642\ufe0f",
+			":man_mechanic:":                             "\U0001f468\u200d\U0001f527",
+			":man_mechanic_tone1:":                       "\U0001f468\U0001f3fb\u200d\U0001f527",
+			":man_mechanic_tone2:":                       "\U0001f468\U0001f3fc\u200d\U0001f527",
+			":man_mechanic_tone3:":                       "\U0001f468\U0001f3fd\u200d\U0001f527",
+			":man_mechanic_tone4:":                       "\U0001f468\U0001f3fe\u200d\U0001f527",
+			":man_mechanic_tone5:":                       "\U0001f468\U0001f3ff\u200d\U0001f527",
+			":man_mountain_biking:":                      "\U0001f6b5\u200d\u2642\ufe0f",
+			":man_mountain_biking_tone1:":                "\U0001f6b5\U0001f3fb\u200d\u2642\ufe0f",
+			":man_mountain_biking_tone2:":                "\U0001f6b5\U0001f3fc\u200d\u2642\ufe0f",
+			":man_mountain_biking_tone3:":                "\U0001f6b5\U0001f3fd\u200d\u2642\ufe0f",
+			":man_mountain_biking_tone4:":                "\U0001f6b5\U0001f3fe\u200d\u2642\ufe0f",
+			":man_mountain_biking_tone5:":                "\U0001f6b5\U0001f3ff\u200d\u2642\ufe0f",
+			":man_office_worker:":                        "\U0001f468\u200d\U0001f4bc",
+			":man_office_worker_tone1:":                  "\U0001f468\U0001f3fb\u200d\U0001f4bc",
+			":man_office_worker_tone2:":                  "\U0001f468\U0001f3fc\u200d\U0001f4bc",
+			":man_office_worker_tone3:":                  "\U0001f468\U0001f3fd\u200d\U0001f4bc",
+			":man_office_worker_tone4:":                  "\U0001f468\U0001f3fe\u200d\U0001f4bc",
+			":man_office_worker_tone5:":                  "\U0001f468\U0001f3ff\u200d\U0001f4bc",
+			":man_pilot:":                                "\U0001f468\u200d\u2708\ufe0f",
+			":man_pilot_tone1:":                          "\U0001f468\U0001f3fb\u200d\u2708\ufe0f",
+			":man_pilot_tone2:":                          "\U0001f468\U0001f3fc\u200d\u2708\ufe0f",
+			":man_pilot_tone3:":                          "\U0001f468\U0001f3fd\u200d\u2708\ufe0f",
+			":man_pilot_tone4:":                          "\U0001f468\U0001f3fe\u200d\u2708\ufe0f",
+			":man_pilot_tone5:":                          "\U0001f468\U0001f3ff\u200d\u2708\ufe0f",
+			":man_playing_handball:":                     "\U0001f93e\u200d\u2642\ufe0f",
+			":man_playing_handball_tone1:":               "\U0001f93e\U0001f3fb\u200d\u2642\ufe0f",
+			":man_playing_handball_tone2:":               "\U0001f93e\U0001f3fc\u200d\u2642\ufe0f",
+			":man_playing_handball_tone3:":               "\U0001f93e\U0001f3fd\u200d\u2642\ufe0f",
+			":man_playing_handball_tone4:":               "\U0001f93e\U0001f3fe\u200d\u2642\ufe0f",
+			":man_playing_handball_tone5:":               "\U0001f93e\U0001f3ff\u200d\u2642\ufe0f",
+			":man_playing_water_polo:":                   "\U0001f93d\u200d\u2642\ufe0f",
+			":man_playing_water_polo_tone1:":             "\U0001f93d\U0001f3fb\u200d\u2642\ufe0f",
+			":man_playing_water_polo_tone2:":             "\U0001f93d\U0001f3fc\u200d\u2642\ufe0f",
+			":man_playing_water_polo_tone3:":             "\U0001f93d\U0001f3fd\u200d\u2642\ufe0f",
+			":man_playing_water_polo_tone4:":             "\U0001f93d\U0001f3fe\u200d\u2642\ufe0f",
+			":man_playing_water_polo_tone5:":             "\U0001f93d\U0001f3ff\u200d\u2642\ufe0f",
+			":man_police_officer:":                       "\U0001f46e\u200d\u2642\ufe0f",
+			":man_police_officer_tone1:":                 "\U0001f46e\U0001f3fb\u200d\u2642\ufe0f",
+			":man_police_officer_tone2:":                 "\U0001f46e\U0001f3fc\u200d\u2642\ufe0f",
+			":man_police_officer_tone3:":                 "\U0001f46e\U0001f3fd\u200d\u2642\ufe0f",
+			":man_police_officer_tone4:":                 "\U0001f46e\U0001f3fe\u200d\u2642\ufe0f",
+			":man_police_officer_tone5:":                 "\U0001f46e\U0001f3ff\u200d\u2642\ufe0f",
+			":man_pouting:":                              "\U0001f64e\u200d\u2642\ufe0f",
+			":man_pouting_tone1:":                        "\U0001f64e\U0001f3fb\u200d\u2642\ufe0f",
+			":man_pouting_tone2:":                        "\U0001f64e\U0001f3fc\u200d\u2642\ufe0f",
+			":man_pouting_tone3:":                        "\U0001f64e\U0001f3fd\u200d\u2642\ufe0f",
+			":man_pouting_tone4:":                        "\U0001f64e\U0001f3fe\u200d\u2642\ufe0f",
+			":man_pouting_tone5:":                        "\U0001f64e\U0001f3ff\u200d\u2642\ufe0f",
+			":man_raising_hand:":                         "\U0001f64b\u200d\u2642\ufe0f",
+			":man_raising_hand_tone1:":                   "\U0001f64b\U0001f3fb\u200d\u2642\ufe0f",
+			":man_raising_hand_tone2:":                   "\U0001f64b\U0001f3fc\u200d\u2642\ufe0f",
+			":man_raising_hand_tone3:":                   "\U0001f64b\U0001f3fd\u200d\u2642\ufe0f",
+			":man_raising_hand_tone4:":                   "\U0001f64b\U0001f3fe\u200d\u2642\ufe0f",
+			":man_raising_hand_tone5:":                   "\U0001f64b\U0001f3ff\u200d\u2642\ufe0f",
+			":man_red_hair:":                             "\U0001f468\u200d\U0001f9b0",
+			":man_rowing_boat:":                          "\U0001f6a3\u200d\u2642\ufe0f",
+			":man_rowing_boat_tone1:":                    "\U0001f6a3\U0001f3fb\u200d\u2642\ufe0f",
+			":man_rowing_boat_tone2:":                    "\U0001f6a3\U0001f3fc\u200d\u2642\ufe0f",
+			":man_rowing_boat_tone3:":                    "\U0001f6a3\U0001f3fd\u200d\u2642\ufe0f",
+			":man_rowing_boat_tone4:":                    "\U0001f6a3\U0001f3fe\u200d\u2642\ufe0f",
+			":man_rowing_boat_tone5:":                    "\U0001f6a3\U0001f3ff\u200d\u2642\ufe0f",
+			":man_running:":                              "\U0001f3c3\u200d\u2642\ufe0f",
+			":man_running_facing_right:":                 "\U0001f3c3\u200d\u2642\ufe0f\u200d\u27a1\ufe0f",
+			":man_running_tone1:":                        "\U0001f3c3\U0001f3fb\u200d\u2642\ufe0f",
+			":man_running_tone2:":                        "\U0001f3c3\U0001f3fc\u200d\u2642\ufe0f",
+			":man_running_tone3:":                        "\U0001f3c3\U0001f3fd\u200d\u2642\ufe0f",
+			":man_running_tone4:":                        "\U0001f3c3\U0001f3fe\u200d\u2642\ufe0f",
+			":man_running_tone5:":                        "\U0001f3c3\U0001f3ff\u200d\u2642\ufe0f",
+			":man_scientist:":                            "\U0001f468\u200d\U0001f52c",
+			":man_scientist_tone1:":                      "\U0001f468\U0001f3fb\u200d\U0001f52c",
+			":man_scientist_tone2:":                      "\U0001f468\U0001f3fc\u200d\U0001f52c",
+			":man_scientist_tone3:":                      "\U0001f468\U0001f3fd\u200d\U0001f52c",
+			":man_scientist_tone4:":                      "\U0001f468\U0001f3fe\u200d\U0001f52c",
+			":man_scientist_tone5:":                      "\U0001f468\U0001f3ff\u200d\U0001f52c",
+			":man_shrugging:":                            "\U0001f937\u200d\u2642\ufe0f",
+			":man_shrugging_tone1:":                      "\U0001f937\U0001f3fb\u200d\u2642\ufe0f",
+			":man_shrugging_tone2:":                      "\U0001f937\U0001f3fc\u200d\u2642\ufe0f",
+			":man_shrugging_tone3:":                      "\U0001f937\U0001f3fd\u200d\u2642\ufe0f",
+			":man_shrugging_tone4:":                      "\U0001f937\U0001f3fe\u200d\u2642\ufe0f",
+			":man_shrugging_tone5:":                      "\U0001f937\U0001f3ff\u200d\u2642\ufe0f",
+			":man_singer:":                               "\U0001f468\u200d\U0001f3a4",
+			":man_singer_tone1:":                         "\U0001f468\U0001f3fb\u200d\U0001f3a4",
+			":man_singer_tone2:":                         "\U0001f468\U0001f3fc\u200d\U0001f3a4",
+			":man_singer_tone3:":                         "\U0001f468\U0001f3fd\u200d\U0001f3a4",
+			":man_singer_tone4:":                         "\U0001f468\U0001f3fe\u200d\U0001f3a4",
+			":man_singer_tone5:":                         "\U0001f468\U0001f3ff\u200d\U0001f3a4",
+			":man_standing:":                             "\U0001f9cd\u200d\u2642\ufe0f",
+			":man_student:":                              "\U0001f468\u200d\U0001f393",
+			":man_student_tone1:":                        "\U0001f468\U0001f3fb\u200d\U0001f393",
+			":man_student_tone2:":                        "\U0001f468\U0001f3fc\u200d\U0001f393",
+			":man_student_tone3:":                        "\U0001f468\U0001f3fd\u200d\U0001f393",
+			":man_student_tone4:":                        "\U0001f468\U0001f3fe\u200d\U0001f393",
+			":man_student_tone5:":                        "\U0001f468\U0001f3ff\u200d\U0001f393",
+			":man_superhero:":                            "\U0001f9b8\u200d\u2642\ufe0f",
+			":man_supervillain:":                         "\U0001f9b9\u200d\u2642\ufe0f",
+			":man_surfing:":                              "\U0001f3c4\u200d\u2642\ufe0f",
+			":man_surfing_tone1:":                        "\U0001f3c4\U0001f3fb\u200d\u2642\ufe0f",
+			":man_surfing_tone2:":                        "\U0001f3c4\U0001f3fc\u200d\u2642\ufe0f",
+			":man_surfing_tone3:":                        "\U0001f3c4\U0001f3fd\u200d\u2642\ufe0f",
+			":man_surfing_tone4:":                        "\U0001f3c4\U0001f3fe\u200d\u2642\ufe0f",
+			":man_surfing_tone5:":                        "\U0001f3c4\U0001f3ff\u200d\u2642\ufe0f",
+			":man_swimming:":                             "\U0001f3ca\u200d\u2642\ufe0f",
+			":man_swimming_tone1:":                       "\U0001f3ca\U0001f3fb\u200d\u2642\ufe0f",
+			":man_swimming_tone2:":                       "\U0001f3ca\U0001f3fc\u200d\u2642\ufe0f",
+			":man_swimming_tone3:":                       "\U0001f3ca\U0001f3fd\u200d\u2642\ufe0f",
+			":man_swimming_tone4:":                       "\U0001f3ca\U0001f3fe\u200d\u2642\ufe0f",
+			":man_swimming_tone5:":                       "\U0001f3ca\U0001f3ff\u200d\u2642\ufe0f",
+			":man_teacher:":                              "\U0001f468\u200d\U0001f3eb",
+			":man_teacher_tone1:":                        "\U0001f468\U0001f3fb\u200d\U0001f3eb",
+			":man_teacher_tone2:":                        "\U0001f468\U0001f3fc\u200d\U0001f3eb",
+			":man_teacher_tone3:":                        "\U0001f468\U0001f3fd\u200d\U0001f3eb",
+			":man_teacher_tone4:":                        "\U0001f468\U0001f3fe\u200d\U0001f3eb",
+			":man_teacher_tone5:":                        "\U0001f468\U0001f3ff\u200d\U0001f3eb",
+			":man_technologist:":                         "\U0001f468\u200d\U0001f4bb",
+			":man_technologist_tone1:":                   "\U0001f468\U0001f3fb\u200d\U0001f4bb",
+			":man_technologist_tone2:":                   "\U0001f468\U0001f3fc\u200d\U0001f4bb",
+			":man_technologist_tone3:":                   "\U0001f468\U0001f3fd\u200d\U0001f4bb",
+			":man_technologist_tone4:":                   "\U0001f468\U0001f3fe\u200d\U0001f4bb",
+			":man_technologist_tone5:":                   "\U0001f468\U0001f3ff\u200d\U0001f4bb",
+			":man_tipping_hand:":                         "\U0001f481\u200d\u2642\ufe0f",
+			":man_tipping_hand_tone1:":                   "\U0001f481\U0001f3fb\u200d\u2642\ufe0f",
+			":man_tipping_hand_tone2:":                   "\U0001f481\U0001f3fc\u200d\u2642\ufe0f",
+			":man_tipping_hand_tone3:":                   "\U0001f481\U0001f3fd\u200d\u2642\ufe0f",
+			":man_tipping_hand_tone4:":                   "\U0001f481\U0001f3fe\u200d\u2642\ufe0f",
+			":man_tipping_hand_tone5:":                   "\U0001f481\U0001f3ff\u200d\u2642\ufe0f",
+			":man_tone1:":                                "\U0001f468\U0001f3fb",
+			":man_tone2:":                                "\U0001f468\U0001f3fc",
+			":man_tone3:":                                "\U0001f468\U0001f3fd",
+			":man_tone4:":                                "\U0001f468\U0001f3fe",
+			":man_tone5:":                                "\U0001f468\U0001f3ff",
+			":man_vampire:":                              "\U0001f9db\u200d\u2642\ufe0f",
+			":man_vampire_tone1:":                        "\U0001f9db\U0001f3fb\u200d\u2642\ufe0f",
+			":man_vampire_tone2:":                        "\U0001f9db\U0001f3fc\u200d\u2642\ufe0f",
+			":man_vampire_tone3:":                        "\U0001f9db\U0001f3fd\u200d\u2642\ufe0f",
+			":man_vampire_tone4:":                        "\U0001f9db\U0001f3fe\u200d\u2642\ufe0f",
+			":man_vampire_tone5:":                        "\U0001f9db\U0001f3ff\u200d\u2642\ufe0f",
+			":man_walking:":                              "\U0001f6b6\u200d\u2642\ufe0f",
+			":man_walking_facing_right:":                 "\U0001f6b6\u200d\u2642\ufe0f\u200d\u27a1\ufe0f",
+			":man_walking_tone1:":                        "\U0001f6b6\U0001f3fb\u200d\u2642\ufe0f",
+			":man_walking_tone2:":                        "\U0001f6b6\U0001f3fc\u200d\u2642\ufe0f",
+			":man_walking_tone3:":                        "\U0001f6b6\U0001f3fd\u200d\u2642\ufe0f",
+			":man_walking_tone4:":                        "\U0001f6b6\U0001f3fe\u200d\u2642\ufe0f",
+			":man_walking_tone5:":                        "\U0001f6b6\U0001f3ff\u200d\u2642\ufe0f",
+			":man_wearing_turban:":                       "\U0001f473\u200d\u2642\ufe0f",
+			":man_wearing_turban_tone1:":                 "\U0001f473\U0001f3fb\u200d\u2642\ufe0f",
+			":man_wearing_turban_tone2:":                 "\U0001f473\U0001f3fc\u200d\u2642\ufe0f",
+			":man_wearing_turban_tone3:":                 "\U0001f473\U0001f3fd\u200d\u2642\ufe0f",
+			":man_wearing_turban_tone4:":                 "\U0001f473\U0001f3fe\u200d\u2642\ufe0f",
+			":man_wearing_turban_tone5:":                 "\U0001f473\U0001f3ff\u200d\u2642\ufe0f",
+			":man_white_hair:":                           "\U0001f468\u200d\U0001f9b3",
+			":man_with_beard:":                           "\U0001f9d4\u200d\u2642\ufe0f",
+			":man_with_chinese_cap:":                     "\U0001f472",
+			":man_with_chinese_cap_tone1:":               "\U0001f472\U0001f3fb",
+			":man_with_chinese_cap_tone2:":               "\U0001f472\U0001f3fc",
+			":man_with_chinese_cap_tone3:":               "\U0001f472\U0001f3fd",
+			":man_with_chinese_cap_tone4:":               "\U0001f472\U0001f3fe",
+			":man_with_chinese_cap_tone5:":               "\U0001f472\U0001f3ff",
+			":man_with_gua_pi_mao:":                      "\U0001f472",
+			":man_with_probing_cane:":                    "\U0001f468\u200d\U0001f9af",
+			":man_with_turban:":                          "\U0001f473\u200d\u2642\ufe0f",
+			":man_with_veil:":                            "\U0001f470\u200d\u2642\ufe0f",
+			":man_with_white_cane:":                      "\U0001f468\u200d\U0001f9af",
+			":man_with_white_cane_facing_right:":         "\U0001f468\u200d\U0001f9af\u200d\u27a1\ufe0f",
+			":man_zombie:":                               "\U0001f9df\u200d\u2642\ufe0f",
+			":mandarin:":                                 "\U0001f34a",
+			":mango:":                                    "\U0001f96d",
+			":mans_shoe:":                                "\U0001f45e",
+			":mantelpiece_clock:":                        "\U0001f570\ufe0f",
+			":manual_wheelchair:":                        "\U0001f9bd",
+			":man’s_shoe:":                               "\U0001f45e",
+			":map:":                                      "\U0001f5fa",
+			":map_of_Japan:":                             "\U0001f5fe",
+			":maple_leaf:":                               "\U0001f341",
+			":maracas:":                                  "\U0001fa87",
+			":marshall_islands:":                         "\U0001f1f2\U0001f1ed",
+			":martial_arts_uniform:":                     "\U0001f94b",
+			":martinique:":                               "\U0001f1f2\U0001f1f6",
+			":mask:":                                     "\U0001f637",
+			":massage:":                                  "\U0001f486\u200d\u2640\ufe0f",
+			":massage_man:":                              "\U0001f486\u200d\u2642\ufe0f",
+			":massage_woman:":                            "\U0001f486\u200d\u2640\ufe0f",
+			":mate:":                                     "\U0001f9c9",
+			":mate_drink:":                               "\U0001f9c9",
+			":mauritania:":                               "\U0001f1f2\U0001f1f7",
+			":mauritius:":                                "\U0001f1f2\U0001f1fa",
+			":mayotte:":                                  "\U0001f1fe\U0001f1f9",
+			":meat_on_bone:":                             "\U0001f356",
+			":mechanic:":                                 "\U0001f9d1\u200d\U0001f527",
+			":mechanical_arm:":                           "\U0001f9be",
+			":mechanical_leg:":                           "\U0001f9bf",
+			":medal:":                                    "\U0001f396\ufe0f",
+			":medal_military:":                           "\U0001f396\ufe0f",
+			":medal_sports:":                             "\U0001f3c5",
+			":medical_symbol:":                           "\u2695\ufe0f",
+			":mega:":                                     "\U0001f4e3",
+			":megaphone:":                                "\U0001f4e3",
+			":melon:":                                    "\U0001f348",
+			":melting_face:":                             "\U0001fae0",
+			":memo:":                                     "\U0001f4dd",
+			":men-with-bunny-ears-partying:":             "\U0001f46f\u200d\u2642\ufe0f",
+			":men_holding_hands:":                        "\U0001f46c",
+			":men_with_bunny_ears:":                      "\U0001f46f\u200d\u2642\ufe0f",
+			":men_with_bunny_ears_partying:":             "\U0001f46f\u200d\u2642\ufe0f",
+			":men_wrestling:":                            "\U0001f93c\u200d\u2642\ufe0f",
+			":mending_heart:":                            "\u2764\ufe0f\u200d\U0001fa79",
+			":menorah:":                                  "\U0001f54e",
+			":menorah_with_nine_branches:":               "\U0001f54e",
+			":mens:":                                     "\U0001f6b9",
+			":men’s_room:":                               "\U0001f6b9",
+			":mermaid:":                                  "\U0001f9dc\u200d\u2640\ufe0f",
+			":mermaid_tone1:":                            "\U0001f9dc\U0001f3fb\u200d\u2640\ufe0f",
+			":mermaid_tone2:":                            "\U0001f9dc\U0001f3fc\u200d\u2640\ufe0f",
+			":mermaid_tone3:":                            "\U0001f9dc\U0001f3fd\u200d\u2640\ufe0f",
+			":mermaid_tone4:":                            "\U0001f9dc\U0001f3fe\u200d\u2640\ufe0f",
+			":mermaid_tone5:":                            "\U0001f9dc\U0001f3ff\u200d\u2640\ufe0f",
+			":merman:":                                   "\U0001f9dc\u200d\u2642\ufe0f",
+			":merman_tone1:":                             "\U0001f9dc\U0001f3fb\u200d\u2642\ufe0f",
+			":merman_tone2:":                             "\U0001f9dc\U0001f3fc\u200d\u2642\ufe0f",
+			":merman_tone3:":                             "\U0001f9dc\U0001f3fd\u200d\u2642\ufe0f",
+			":merman_tone4:":                             "\U0001f9dc\U0001f3fe\u200d\u2642\ufe0f",
+			":merman_tone5:":                             "\U0001f9dc\U0001f3ff\u200d\u2642\ufe0f",
+			":merperson:":                                "\U0001f9dc\u200d\u2642\ufe0f",
+			":merperson_tone1:":                          "\U0001f9dc\U0001f3fb",
+			":merperson_tone2:":                          "\U0001f9dc\U0001f3fc",
+			":merperson_tone3:":                          "\U0001f9dc\U0001f3fd",
+			":merperson_tone4:":                          "\U0001f9dc\U0001f3fe",
+			":merperson_tone5:":                          "\U0001f9dc\U0001f3ff",
+			":metal:":                                    "\U0001f918",
+			":metal_tone1:":                              "\U0001f918\U0001f3fb",
+			":metal_tone2:":                              "\U0001f918\U0001f3fc",
+			":metal_tone3:":                              "\U0001f918\U0001f3fd",
+			":metal_tone4:":                              "\U0001f918\U0001f3fe",
+			":metal_tone5:":                              "\U0001f918\U0001f3ff",
+			":metro:":                                    "\U0001f687",
+			":mexico:":                                   "\U0001f1f2\U0001f1fd",
+			":microbe:":                                  "\U0001f9a0",
+			":micronesia:":                               "\U0001f1eb\U0001f1f2",
+			":microphone:":                               "\U0001f3a4",
+			":microphone2:":                              "\U0001f399",
+			":microscope:":                               "\U0001f52c",
+			":middle_finger:":                            "\U0001f595",
+			":middle_finger_tone1:":                      "\U0001f595\U0001f3fb",
+			":middle_finger_tone2:":                      "\U0001f595\U0001f3fc",
+			":middle_finger_tone3:":                      "\U0001f595\U0001f3fd",
+			":middle_finger_tone4:":                      "\U0001f595\U0001f3fe",
+			":middle_finger_tone5:":                      "\U0001f595\U0001f3ff",
+			":military_helmet:":                          "\U0001fa96",
+			":military_medal:":                           "\U0001f396",
+			":milk:":                                     "\U0001f95b",
+			":milk_glass:":                               "\U0001f95b",
+			":milky_way:":                                "\U0001f30c",
+			":minibus:":                                  "\U0001f690",
+			":minidisc:":                                 "\U0001f4bd",
+			":minus:":                                    "\u2796",
+			":mirror:":                                   "\U0001fa9e",
+			":mirror_ball:":                              "\U0001faa9",
+			":moai:":                                     "\U0001f5ff",
+			":mobile_phone:":                             "\U0001f4f1",
+			":mobile_phone_off:":                         "\U0001f4f4",
+			":mobile_phone_with_arrow:":                  "\U0001f4f2",
+			":moldova:":                                  "\U0001f1f2\U0001f1e9",
+			":monaco:":                                   "\U0001f1f2\U0001f1e8",
+			":money-mouth_face:":                         "\U0001f911",
+			":money_bag:":                                "\U0001f4b0",
+			":money_mouth:":                              "\U0001f911",
+			":money_mouth_face:":                         "\U0001f911",
+			":money_with_wings:":                         "\U0001f4b8",
+			":moneybag:":                                 "\U0001f4b0",
+			":mongolia:":                                 "\U0001f1f2\U0001f1f3",
+			":monkey:":                                   "\U0001f412",
+			":monkey_face:":                              "\U0001f435",
+			":monocle_face:":                             "\U0001f9d0",
+			":monorail:":                                 "\U0001f69d",
+			":montenegro:":                               "\U0001f1f2\U0001f1ea",
+			":montserrat:":                               "\U0001f1f2\U0001f1f8",
+			":moon:":                                     "\U0001f314",
+			":moon_cake:":                                "\U0001f96e",
+			":moon_viewing_ceremony:":                    "\U0001f391",
+			":moose:":                                    "\U0001face",
+			":morocco:":                                  "\U0001f1f2\U0001f1e6",
+			":mortar_board:":                             "\U0001f393",
+			":mosque:":                                   "\U0001f54c",
+			":mosquito:":                                 "\U0001f99f",
+			":mostly_sunny:":                             "\U0001f324\ufe0f",
+			":motor_boat:":                               "\U0001f6e5\ufe0f",
+			":motor_scooter:":                            "\U0001f6f5",
+			":motorboat:":                                "\U0001f6e5",
+			":motorcycle:":                               "\U0001f3cd",
+			":motorized_wheelchair:":                     "\U0001f9bc",
+			":motorway:":                                 "\U0001f6e3\ufe0f",
+			":mount_fuji:":                               "\U0001f5fb",
+			":mountain:":                                 "\u26f0\ufe0f",
+			":mountain_bicyclist:":                       "\U0001f6b5\u200d\u2642\ufe0f",
+			":mountain_biking_man:":                      "\U0001f6b5\u200d\u2642\ufe0f",
+			":mountain_biking_woman:":                    "\U0001f6b5\u200d\u2640\ufe0f",
+			":mountain_cableway:":                        "\U0001f6a0",
+			":mountain_railway:":                         "\U0001f69e",
+			":mountain_snow:":                            "\U0001f3d4",
+			":mouse:":                                    "\U0001f42d",
+			":mouse2:":                                   "\U0001f401",
+			":mouse_face:":                               "\U0001f42d",
+			":mouse_three_button:":                       "\U0001f5b1",
+			":mouse_trap:":                               "\U0001faa4",
+			":mouth:":                                    "\U0001f444",
+			":movie_camera:":                             "\U0001f3a5",
+			":moyai:":                                    "\U0001f5ff",
+			":mozambique:":                               "\U0001f1f2\U0001f1ff",
+			":mrs_claus:":                                "\U0001f936",
+			":mrs_claus_tone1:":                          "\U0001f936\U0001f3fb",
+			":mrs_claus_tone2:":                          "\U0001f936\U0001f3fc",
+			":mrs_claus_tone3:":                          "\U0001f936\U0001f3fd",
+			":mrs_claus_tone4:":                          "\U0001f936\U0001f3fe",
+			":mrs_claus_tone5:":                          "\U0001f936\U0001f3ff",
+			":multiply:":                                 "\u2716",
+			":muscle:":                                   "\U0001f4aa",
+			":muscle_tone1:":                             "\U0001f4aa\U0001f3fb",
+			":muscle_tone2:":                             "\U0001f4aa\U0001f3fc",
+			":muscle_tone3:":                             "\U0001f4aa\U0001f3fd",
+			":muscle_tone4:":                             "\U0001f4aa\U0001f3fe",
+			":muscle_tone5:":                             "\U0001f4aa\U0001f3ff",
+			":mushroom:":                                 "\U0001f344",
+			":musical_keyboard:":                         "\U0001f3b9",
+			":musical_note:":                             "\U0001f3b5",
+			":musical_notes:":                            "\U0001f3b6",
+			":musical_score:":                            "\U0001f3bc",
+			":mute:":                                     "\U0001f507",
+			":muted_speaker:":                            "\U0001f507",
+			":mx_claus:":                                 "\U0001f9d1\u200d\U0001f384",
+			":myanmar:":                                  "\U0001f1f2\U0001f1f2",
+			":nail_care:":                                "\U0001f485",
+			":nail_care_tone1:":                          "\U0001f485\U0001f3fb",
+			":nail_care_tone2:":                          "\U0001f485\U0001f3fc",
+			":nail_care_tone3:":                          "\U0001f485\U0001f3fd",
+			":nail_care_tone4:":                          "\U0001f485\U0001f3fe",
+			":nail_care_tone5:":                          "\U0001f485\U0001f3ff",
+			":nail_polish:":                              "\U0001f485",
+			":name_badge:":                               "\U0001f4db",
+			":namibia:":                                  "\U0001f1f3\U0001f1e6",
+			":national_park:":                            "\U0001f3de\ufe0f",
+			":nauru:":                                    "\U0001f1f3\U0001f1f7",
+			":nauseated_face:":                           "\U0001f922",
+			":nazar_amulet:":                             "\U0001f9ff",
+			":necktie:":                                  "\U0001f454",
+			":negative_squared_cross_mark:":              "\u274e",
+			":nepal:":                                    "\U0001f1f3\U0001f1f5",
+			":nerd:":                                     "\U0001f913",
+			":nerd_face:":                                "\U0001f913",
+			":nest_with_eggs:":                           "\U0001faba",
+			":nesting_dolls:":                            "\U0001fa86",
+			":netherlands:":                              "\U0001f1f3\U0001f1f1",
+			":neutral_face:":                             "\U0001f610",
+			":new:":                                      "\U0001f195",
+			":new_caledonia:":                            "\U0001f1f3\U0001f1e8",
+			":new_moon:":                                 "\U0001f311",
+			":new_moon_face:":                            "\U0001f31a",
+			":new_moon_with_face:":                       "\U0001f31a",
+			":new_zealand:":                              "\U0001f1f3\U0001f1ff",
+			":newspaper:":                                "\U0001f4f0",
+			":newspaper2:":                               "\U0001f5de",
+			":newspaper_roll:":                           "\U0001f5de\ufe0f",
+			":next_track_button:":                        "\u23ed",
+			":ng:":                                       "\U0001f196",
+			":ng_man:":                                   "\U0001f645\u200d\u2642\ufe0f",
+			":ng_woman:":                                 "\U0001f645\u200d\u2640\ufe0f",
+			":nicaragua:":                                "\U0001f1f3\U0001f1ee",
+			":niger:":                                    "\U0001f1f3\U0001f1ea",
+			":nigeria:":                                  "\U0001f1f3\U0001f1ec",
+			":night_with_stars:":                         "\U0001f303",
+			":nine:":                                     "9\ufe0f\u20e3",
+			":nine-thirty:":                              "\U0001f564",
+			":nine_o’clock:":                             "\U0001f558",
+			":ninja:":                                    "\U0001f977",
+			":niue:":                                     "\U0001f1f3\U0001f1fa",
+			":no_bell:":                                  "\U0001f515",
+			":no_bicycles:":                              "\U0001f6b3",
+			":no_entry:":                                 "\u26d4",
+			":no_entry_sign:":                            "\U0001f6ab",
+			":no_good:":                                  "\U0001f645\u200d\u2640\ufe0f",
+			":no_good_man:":                              "\U0001f645\u200d\u2642\ufe0f",
+			":no_good_woman:":                            "\U0001f645\u200d\u2640\ufe0f",
+			":no_littering:":                             "\U0001f6af",
+			":no_mobile_phones:":                         "\U0001f4f5",
+			":no_mouth:":                                 "\U0001f636",
+			":no_one_under_eighteen:":                    "\U0001f51e",
+			":no_pedestrians:":                           "\U0001f6b7",
+			":no_smoking:":                               "\U0001f6ad",
+			":non-potable_water:":                        "\U0001f6b1",
+			":norfolk_island:":                           "\U0001f1f3\U0001f1eb",
+			":north_korea:":                              "\U0001f1f0\U0001f1f5",
+			":northern_mariana_islands:":                 "\U0001f1f2\U0001f1f5",
+			":norway:":                                   "\U0001f1f3\U0001f1f4",
+			":nose:":                                     "\U0001f443",
+			":nose_tone1:":                               "\U0001f443\U0001f3fb",
+			":nose_tone2:":                               "\U0001f443\U0001f3fc",
+			":nose_tone3:":                               "\U0001f443\U0001f3fd",
+			":nose_tone4:":                               "\U0001f443\U0001f3fe",
+			":nose_tone5:":                               "\U0001f443\U0001f3ff",
+			":notebook:":                                 "\U0001f4d3",
+			":notebook_with_decorative_cover:":           "\U0001f4d4",
+			":notepad_spiral:":                           "\U0001f5d2",
+			":notes:":                                    "\U0001f3b6",
+			":nut_and_bolt:":                             "\U0001f529",
+			":o:":                                        "\u2b55",
+			":o2:":                                       "\U0001f17e\ufe0f",
+			":ocean:":                                    "\U0001f30a",
+			":octagonal_sign:":                           "\U0001f6d1",
+			":octopus:":                                  "\U0001f419",
+			":oden:":                                     "\U0001f362",
+			":office:":                                   "\U0001f3e2",
+			":office_building:":                          "\U0001f3e2",
+			":office_worker:":                            "\U0001f9d1\u200d\U0001f4bc",
+			":ogre:":                                     "\U0001f479",
+			":oil:":                                      "\U0001f6e2",
+			":oil_drum:":                                 "\U0001f6e2\ufe0f",
+			":ok:":                                       "\U0001f197",
+			":ok_hand:":                                  "\U0001f44c",
+			":ok_hand_tone1:":                            "\U0001f44c\U0001f3fb",
+			":ok_hand_tone2:":                            "\U0001f44c\U0001f3fc",
+			":ok_hand_tone3:":                            "\U0001f44c\U0001f3fd",
+			":ok_hand_tone4:":                            "\U0001f44c\U0001f3fe",
+			":ok_hand_tone5:":                            "\U0001f44c\U0001f3ff",
+			":ok_man:":                                   "\U0001f646\u200d\u2642\ufe0f",
+			":ok_person:":                                "\U0001f646",
+			":ok_woman:":                                 "\U0001f646\u200d\u2640\ufe0f",
+			":old_key:":                                  "\U0001f5dd\ufe0f",
+			":old_man:":                                  "\U0001f474",
+			":old_woman:":                                "\U0001f475",
+			":older_adult:":                              "\U0001f9d3",
+			":older_adult_tone1:":                        "\U0001f9d3\U0001f3fb",
+			":older_adult_tone2:":                        "\U0001f9d3\U0001f3fc",
+			":older_adult_tone3:":                        "\U0001f9d3\U0001f3fd",
+			":older_adult_tone4:":                        "\U0001f9d3\U0001f3fe",
+			":older_adult_tone5:":                        "\U0001f9d3\U0001f3ff",
+			":older_man:":                                "\U0001f474",
+			":older_man_tone1:":                          "\U0001f474\U0001f3fb",
+			":older_man_tone2:":                          "\U0001f474\U0001f3fc",
+			":older_man_tone3:":                          "\U0001f474\U0001f3fd",
+			":older_man_tone4:":                          "\U0001f474\U0001f3fe",
+			":older_man_tone5:":                          "\U0001f474\U0001f3ff",
+			":older_person:":                             "\U0001f9d3",
+			":older_woman:":                              "\U0001f475",
+			":older_woman_tone1:":                        "\U0001f475\U0001f3fb",
+			":older_woman_tone2:":                        "\U0001f475\U0001f3fc",
+			":older_woman_tone3:":                        "\U0001f475\U0001f3fd",
+			":older_woman_tone4:":                        "\U0001f475\U0001f3fe",
+			":older_woman_tone5:":                        "\U0001f475\U0001f3ff",
+			":olive:":                                    "\U0001fad2",
+			":om:":                                       "\U0001f549",
+			":om_symbol:":                                "\U0001f549\ufe0f",
+			":oman:":                                     "\U0001f1f4\U0001f1f2",
+			":on:":                                       "\U0001f51b",
+			":oncoming_automobile:":                      "\U0001f698",
+			":oncoming_bus:":                             "\U0001f68d",
+			":oncoming_fist:":                            "\U0001f44a",
+			":oncoming_police_car:":                      "\U0001f694",
+			":oncoming_taxi:":                            "\U0001f696",
+			":one:":                                      "1\ufe0f\u20e3",
+			":one-piece_swimsuit:":                       "\U0001fa71",
+			":one-thirty:":                               "\U0001f55c",
+			":one_o’clock:":                              "\U0001f550",
+			":one_piece_swimsuit:":                       "\U0001fa71",
+			":onion:":                                    "\U0001f9c5",
+			":open_book:":                                "\U0001f4d6",
+			":open_file_folder:":                         "\U0001f4c2",
+			":open_hands:":                               "\U0001f450",
+			":open_hands_tone1:":                         "\U0001f450\U0001f3fb",
+			":open_hands_tone2:":                         "\U0001f450\U0001f3fc",
+			":open_hands_tone3:":                         "\U0001f450\U0001f3fd",
+			":open_hands_tone4:":                         "\U0001f450\U0001f3fe",
+			":open_hands_tone5:":                         "\U0001f450\U0001f3ff",
+			":open_mailbox_with_lowered_flag:":           "\U0001f4ed",
+			":open_mailbox_with_raised_flag:":            "\U0001f4ec",
+			":open_mouth:":                               "\U0001f62e",
+			":open_umbrella:":                            "\u2602\ufe0f",
+			":ophiuchus:":                                "\u26ce",
+			":optical_disk:":                             "\U0001f4bf",
+			":orange:":                                   "\U0001f34a",
+			":orange_book:":                              "\U0001f4d9",
+			":orange_circle:":                            "\U0001f7e0",
+			":orange_heart:":                             "\U0001f9e1",
+			":orange_square:":                            "\U0001f7e7",
+			":orangutan:":                                "\U0001f9a7",
+			":orca:":                                     "\U0001facd",
+			":orthodox_cross:":                           "\u2626\ufe0f",
+			":otter:":                                    "\U0001f9a6",
+			":outbox_tray:":                              "\U0001f4e4",
+			":owl:":                                      "\U0001f989",
+			":ox:":                                       "\U0001f402",
+			":oyster:":                                   "\U0001f9aa",
+			":package:":                                  "\U0001f4e6",
+			":page_facing_up:":                           "\U0001f4c4",
+			":page_with_curl:":                           "\U0001f4c3",
+			":pager:":                                    "\U0001f4df",
+			":paintbrush:":                               "\U0001f58c",
+			":pakistan:":                                 "\U0001f1f5\U0001f1f0",
+			":palau:":                                    "\U0001f1f5\U0001f1fc",
+			":palestinian_territories:":                  "\U0001f1f5\U0001f1f8",
+			":palm_down_hand:":                           "\U0001faf3",
+			":palm_tree:":                                "\U0001f334",
+			":palm_up_hand:":                             "\U0001faf4",
+			":palms_up_together:":                        "\U0001f932",
+			":palms_up_together_tone1:":                  "\U0001f932\U0001f3fb",
+			":palms_up_together_tone2:":                  "\U0001f932\U0001f3fc",
+			":palms_up_together_tone3:":                  "\U0001f932\U0001f3fd",
+			":palms_up_together_tone4:":                  "\U0001f932\U0001f3fe",
+			":palms_up_together_tone5:":                  "\U0001f932\U0001f3ff",
+			":panama:":                                   "\U0001f1f5\U0001f1e6",
+			":pancakes:":                                 "\U0001f95e",
+			":panda:":                                    "\U0001f43c",
+			":panda_face:":                               "\U0001f43c",
+			":paperclip:":                                "\U0001f4ce",
+			":paperclips:":                               "\U0001f587",
+			":papua_new_guinea:":                         "\U0001f1f5\U0001f1ec",
+			":parachute:":                                "\U0001fa82",
+			":paraguay:":                                 "\U0001f1f5\U0001f1fe",
+			":parasol_on_ground:":                        "\u26f1\ufe0f",
+			":park:":                                     "\U0001f3de",
+			":parking:":                                  "\U0001f17f\ufe0f",
+			":parrot:":                                   "\U0001f99c",
+			":part_alternation_mark:":                    "\u303d\ufe0f",
+			":partly_sunny:":                             "\u26c5",
+			":partly_sunny_rain:":                        "\U0001f326\ufe0f",
+			":party_popper:":                             "\U0001f389",
+			":partying_face:":                            "\U0001f973",
+			":passenger_ship:":                           "\U0001f6f3\ufe0f",
+			":passport_control:":                         "\U0001f6c2",
+			":pause_button:":                             "\u23f8",
+			":paw_prints:":                               "\U0001f43e",
+			":pea_pod:":                                  "\U0001fadb",
+			":peace:":                                    "\u262e",
+			":peace_symbol:":                             "\u262e\ufe0f",
+			":peach:":                                    "\U0001f351",
+			":peacock:":                                  "\U0001f99a",
+			":peanuts:":                                  "\U0001f95c",
+			":pear:":                                     "\U0001f350",
+			":pen:":                                      "\U0001f58a",
+			":pen_ballpoint:":                            "\U0001f58a",
+			":pen_fountain:":                             "\U0001f58b",
+			":pencil:":                                   "\u270f",
+			":pencil2:":                                  "\u270f\ufe0f",
+			":penguin:":                                  "\U0001f427",
+			":pensive:":                                  "\U0001f614",
+			":pensive_face:":                             "\U0001f614",
+			":people_holding_hands:":                     "\U0001f9d1\u200d\U0001f91d\u200d\U0001f9d1",
+			":people_hugging:":                           "\U0001fac2",
+			":people_with_bunny_ears:":                   "\U0001f46f",
+			":people_with_bunny_ears_partying:":          "\U0001f46f",
+			":people_wrestling:":                         "\U0001f93c",
+			":performing_arts:":                          "\U0001f3ad",
+			":persevere:":                                "\U0001f623",
+			":persevering_face:":                         "\U0001f623",
+			":person:":                                   "\U0001f9d1",
+			":person_bald:":                              "\U0001f9d1\u200d\U0001f9b2",
+			":person_beard:":                             "\U0001f9d4",
+			":person_biking:":                            "\U0001f6b4",
+			":person_biking_tone1:":                      "\U0001f6b4\U0001f3fb",
+			":person_biking_tone2:":                      "\U0001f6b4\U0001f3fc",
+			":person_biking_tone3:":                      "\U0001f6b4\U0001f3fd",
+			":person_biking_tone4:":                      "\U0001f6b4\U0001f3fe",
+			":person_biking_tone5:":                      "\U0001f6b4\U0001f3ff",
+			":person_blond_hair:":                        "\U0001f471",
+			":person_bouncing_ball:":                     "\u26f9",
+			":person_bouncing_ball_tone1:":               "\u26f9\U0001f3fb",
+			":person_bouncing_ball_tone2:":               "\u26f9\U0001f3fc",
+			":person_bouncing_ball_tone3:":               "\u26f9\U0001f3fd",
+			":person_bouncing_ball_tone4:":               "\u26f9\U0001f3fe",
+			":person_bouncing_ball_tone5:":               "\u26f9\U0001f3ff",
+			":person_bowing:":                            "\U0001f647",
+			":person_bowing_tone1:":                      "\U0001f647\U0001f3fb",
+			":person_bowing_tone2:":                      "\U0001f647\U0001f3fc",
+			":person_bowing_tone3:":                      "\U0001f647\U0001f3fd",
+			":person_bowing_tone4:":                      "\U0001f647\U0001f3fe",
+			":person_bowing_tone5:":                      "\U0001f647\U0001f3ff",
+			":person_cartwheeling:":                      "\U0001f938",
+			":person_climbing:":                          "\U0001f9d7\u200d\u2640\ufe0f",
+			":person_climbing_tone1:":                    "\U0001f9d7\U0001f3fb",
+			":person_climbing_tone2:":                    "\U0001f9d7\U0001f3fc",
+			":person_climbing_tone3:":                    "\U0001f9d7\U0001f3fd",
+			":person_climbing_tone4:":                    "\U0001f9d7\U0001f3fe",
+			":person_climbing_tone5:":                    "\U0001f9d7\U0001f3ff",
+			":person_curly_hair:":                        "\U0001f9d1\u200d\U0001f9b1",
+			":person_doing_cartwheel:":                   "\U0001f938",
+			":person_doing_cartwheel_tone1:":             "\U0001f938\U0001f3fb",
+			":person_doing_cartwheel_tone2:":             "\U0001f938\U0001f3fc",
+			":person_doing_cartwheel_tone3:":             "\U0001f938\U0001f3fd",
+			":person_doing_cartwheel_tone4:":             "\U0001f938\U0001f3fe",
+			":person_doing_cartwheel_tone5:":             "\U0001f938\U0001f3ff",
+			":person_facepalming:":                       "\U0001f926",
+			":person_facepalming_tone1:":                 "\U0001f926\U0001f3fb",
+			":person_facepalming_tone2:":                 "\U0001f926\U0001f3fc",
+			":person_facepalming_tone3:":                 "\U0001f926\U0001f3fd",
+			":person_facepalming_tone4:":                 "\U0001f926\U0001f3fe",
+			":person_facepalming_tone5:":                 "\U0001f926\U0001f3ff",
+			":person_feeding_baby:":                      "\U0001f9d1\u200d\U0001f37c",
+			":person_fencing:":                           "\U0001f93a",
+			":person_frowning:":                          "\U0001f64d\u200d\u2640\ufe0f",
+			":person_frowning_tone1:":                    "\U0001f64d\U0001f3fb",
+			":person_frowning_tone2:":                    "\U0001f64d\U0001f3fc",
+			":person_frowning_tone3:":                    "\U0001f64d\U0001f3fd",
+			":person_frowning_tone4:":                    "\U0001f64d\U0001f3fe",
+			":person_frowning_tone5:":                    "\U0001f64d\U0001f3ff",
+			":person_gesturing_NO:":                      "\U0001f645",
+			":person_gesturing_OK:":                      "\U0001f646",
+			":person_gesturing_no:":                      "\U0001f645",
+			":person_gesturing_no_tone1:":                "\U0001f645\U0001f3fb",
+			":person_gesturing_no_tone2:":                "\U0001f645\U0001f3fc",
+			":person_gesturing_no_tone3:":                "\U0001f645\U0001f3fd",
+			":person_gesturing_no_tone4:":                "\U0001f645\U0001f3fe",
+			":person_gesturing_no_tone5:":                "\U0001f645\U0001f3ff",
+			":person_gesturing_ok:":                      "\U0001f646",
+			":person_gesturing_ok_tone1:":                "\U0001f646\U0001f3fb",
+			":person_gesturing_ok_tone2:":                "\U0001f646\U0001f3fc",
+			":person_gesturing_ok_tone3:":                "\U0001f646\U0001f3fd",
+			":person_gesturing_ok_tone4:":                "\U0001f646\U0001f3fe",
+			":person_gesturing_ok_tone5:":                "\U0001f646\U0001f3ff",
+			":person_getting_haircut:":                   "\U0001f487",
+			":person_getting_haircut_tone1:":             "\U0001f487\U0001f3fb",
+			":person_getting_haircut_tone2:":             "\U0001f487\U0001f3fc",
+			":person_getting_haircut_tone3:":             "\U0001f487\U0001f3fd",
+			":person_getting_haircut_tone4:":             "\U0001f487\U0001f3fe",
+			":person_getting_haircut_tone5:":             "\U0001f487\U0001f3ff",
+			":person_getting_massage:":                   "\U0001f486",
+			":person_getting_massage_tone1:":             "\U0001f486\U0001f3fb",
+			":person_getting_massage_tone2:":             "\U0001f486\U0001f3fc",
+			":person_getting_massage_tone3:":             "\U0001f486\U0001f3fd",
+			":person_getting_massage_tone4:":             "\U0001f486\U0001f3fe",
+			":person_getting_massage_tone5:":             "\U0001f486\U0001f3ff",
+			":person_golfing:":                           "\U0001f3cc",
+			":person_golfing_tone1:":                     "\U0001f3cc\U0001f3fb",
+			":person_golfing_tone2:":                     "\U0001f3cc\U0001f3fc",
+			":person_golfing_tone3:":                     "\U0001f3cc\U0001f3fd",
+			":person_golfing_tone4:":                     "\U0001f3cc\U0001f3fe",
+			":person_golfing_tone5:":                     "\U0001f3cc\U0001f3ff",
+			":person_in_bed:":                            "\U0001f6cc",
+			":person_in_bed_tone1:":                      "\U0001f6cc\U0001f3fb",
+			":person_in_bed_tone2:":                      "\U0001f6cc\U0001f3fc",
+			":person_in_bed_tone3:":                      "\U0001f6cc\U0001f3fd",
+			":person_in_bed_tone4:":                      "\U0001f6cc\U0001f3fe",
+			":person_in_bed_tone5:":                      "\U0001f6cc\U0001f3ff",
+			":person_in_lotus_position:":                 "\U0001f9d8\u200d\u2640\ufe0f",
+			":person_in_lotus_position_tone1:":           "\U0001f9d8\U0001f3fb",
+			":person_in_lotus_position_tone2:":           "\U0001f9d8\U0001f3fc",
+			":person_in_lotus_position_tone3:":           "\U0001f9d8\U0001f3fd",
+			":person_in_lotus_position_tone4:":           "\U0001f9d8\U0001f3fe",
+			":person_in_lotus_position_tone5:":           "\U0001f9d8\U0001f3ff",
+			":person_in_manual_wheelchair:":              "\U0001f9d1\u200d\U0001f9bd",
+			":person_in_manual_wheelchair_facing_right:": "\U0001f9d1\u200d\U0001f9bd\u200d\u27a1\ufe0f",
+			":person_in_motorized_wheelchair:":           "\U0001f9d1\u200d\U0001f9bc",
+			":person_in_motorized_wheelchair_facing_right:": "\U0001f9d1\u200d\U0001f9bc\u200d\u27a1\ufe0f",
+			":person_in_steamy_room:":                       "\U0001f9d6\u200d\u2642\ufe0f",
+			":person_in_steamy_room_tone1:":                 "\U0001f9d6\U0001f3fb",
+			":person_in_steamy_room_tone2:":                 "\U0001f9d6\U0001f3fc",
+			":person_in_steamy_room_tone3:":                 "\U0001f9d6\U0001f3fd",
+			":person_in_steamy_room_tone4:":                 "\U0001f9d6\U0001f3fe",
+			":person_in_steamy_room_tone5:":                 "\U0001f9d6\U0001f3ff",
+			":person_in_suit_levitating:":                   "\U0001f574",
+			":person_in_tuxedo:":                            "\U0001f935",
+			":person_juggling:":                             "\U0001f939",
+			":person_juggling_tone1:":                       "\U0001f939\U0001f3fb",
+			":person_juggling_tone2:":                       "\U0001f939\U0001f3fc",
+			":person_juggling_tone3:":                       "\U0001f939\U0001f3fd",
+			":person_juggling_tone4:":                       "\U0001f939\U0001f3fe",
+			":person_juggling_tone5:":                       "\U0001f939\U0001f3ff",
+			":person_kneeling:":                             "\U0001f9ce",
+			":person_kneeling_facing_right:":                "\U0001f9ce\u200d\u27a1\ufe0f",
+			":person_lifting_weights:":                      "\U0001f3cb",
+			":person_lifting_weights_tone1:":                "\U0001f3cb\U0001f3fb",
+			":person_lifting_weights_tone2:":                "\U0001f3cb\U0001f3fc",
+			":person_lifting_weights_tone3:":                "\U0001f3cb\U0001f3fd",
+			":person_lifting_weights_tone4:":                "\U0001f3cb\U0001f3fe",
+			":person_lifting_weights_tone5:":                "\U0001f3cb\U0001f3ff",
+			":person_mountain_biking:":                      "\U0001f6b5",
+			":person_mountain_biking_tone1:":                "\U0001f6b5\U0001f3fb",
+			":person_mountain_biking_tone2:":                "\U0001f6b5\U0001f3fc",
+			":person_mountain_biking_tone3:":                "\U0001f6b5\U0001f3fd",
+			":person_mountain_biking_tone4:":                "\U0001f6b5\U0001f3fe",
+			":person_mountain_biking_tone5:":                "\U0001f6b5\U0001f3ff",
+			":person_playing_handball:":                     "\U0001f93e",
+			":person_playing_handball_tone1:":               "\U0001f93e\U0001f3fb",
+			":person_playing_handball_tone2:":               "\U0001f93e\U0001f3fc",
+			":person_playing_handball_tone3:":               "\U0001f93e\U0001f3fd",
+			":person_playing_handball_tone4:":               "\U0001f93e\U0001f3fe",
+			":person_playing_handball_tone5:":               "\U0001f93e\U0001f3ff",
+			":person_playing_water_polo:":                   "\U0001f93d",
+			":person_playing_water_polo_tone1:":             "\U0001f93d\U0001f3fb",
+			":person_playing_water_polo_tone2:":             "\U0001f93d\U0001f3fc",
+			":person_playing_water_polo_tone3:":             "\U0001f93d\U0001f3fd",
+			":person_playing_water_polo_tone4:":             "\U0001f93d\U0001f3fe",
+			":person_playing_water_polo_tone5:":             "\U0001f93d\U0001f3ff",
+			":person_pouting:":                              "\U0001f64e",
+			":person_pouting_tone1:":                        "\U0001f64e\U0001f3fb",
+			":person_pouting_tone2:":                        "\U0001f64e\U0001f3fc",
+			":person_pouting_tone3:":                        "\U0001f64e\U0001f3fd",
+			":person_pouting_tone4:":                        "\U0001f64e\U0001f3fe",
+			":person_pouting_tone5:":                        "\U0001f64e\U0001f3ff",
+			":person_raising_hand:":                         "\U0001f64b",
+			":person_raising_hand_tone1:":                   "\U0001f64b\U0001f3fb",
+			":person_raising_hand_tone2:":                   "\U0001f64b\U0001f3fc",
+			":person_raising_hand_tone3:":                   "\U0001f64b\U0001f3fd",
+			":person_raising_hand_tone4:":                   "\U0001f64b\U0001f3fe",
+			":person_raising_hand_tone5:":                   "\U0001f64b\U0001f3ff",
+			":person_red_hair:":                             "\U0001f9d1\u200d\U0001f9b0",
+			":person_rowing_boat:":                          "\U0001f6a3",
+			":person_rowing_boat_tone1:":                    "\U0001f6a3\U0001f3fb",
+			":person_rowing_boat_tone2:":                    "\U0001f6a3\U0001f3fc",
+			":person_rowing_boat_tone3:":                    "\U0001f6a3\U0001f3fd",
+			":person_rowing_boat_tone4:":                    "\U0001f6a3\U0001f3fe",
+			":person_rowing_boat_tone5:":                    "\U0001f6a3\U0001f3ff",
+			":person_running:":                              "\U0001f3c3",
+			":person_running_facing_right:":                 "\U0001f3c3\u200d\u27a1\ufe0f",
+			":person_running_tone1:":                        "\U0001f3c3\U0001f3fb",
+			":person_running_tone2:":                        "\U0001f3c3\U0001f3fc",
+			":person_running_tone3:":                        "\U0001f3c3\U0001f3fd",
+			":person_running_tone4:":                        "\U0001f3c3\U0001f3fe",
+			":person_running_tone5:":                        "\U0001f3c3\U0001f3ff",
+			":person_shrugging:":                            "\U0001f937",
+			":person_shrugging_tone1:":                      "\U0001f937\U0001f3fb",
+			":person_shrugging_tone2:":                      "\U0001f937\U0001f3fc",
+			":person_shrugging_tone3:":                      "\U0001f937\U0001f3fd",
+			":person_shrugging_tone4:":                      "\U0001f937\U0001f3fe",
+			":person_shrugging_tone5:":                      "\U0001f937\U0001f3ff",
+			":person_standing:":                             "\U0001f9cd",
+			":person_surfing:":                              "\U0001f3c4",
+			":person_surfing_tone1:":                        "\U0001f3c4\U0001f3fb",
+			":person_surfing_tone2:":                        "\U0001f3c4\U0001f3fc",
+			":person_surfing_tone3:":                        "\U0001f3c4\U0001f3fd",
+			":person_surfing_tone4:":                        "\U0001f3c4\U0001f3fe",
+			":person_surfing_tone5:":                        "\U0001f3c4\U0001f3ff",
+			":person_swimming:":                             "\U0001f3ca",
+			":person_swimming_tone1:":                       "\U0001f3ca\U0001f3fb",
+			":person_swimming_tone2:":                       "\U0001f3ca\U0001f3fc",
+			":person_swimming_tone3:":                       "\U0001f3ca\U0001f3fd",
+			":person_swimming_tone4:":                       "\U0001f3ca\U0001f3fe",
+			":person_swimming_tone5:":                       "\U0001f3ca\U0001f3ff",
+			":person_taking_bath:":                          "\U0001f6c0",
+			":person_tipping_hand:":                         "\U0001f481",
+			":person_tipping_hand_tone1:":                   "\U0001f481\U0001f3fb",
+			":person_tipping_hand_tone2:":                   "\U0001f481\U0001f3fc",
+			":person_tipping_hand_tone3:":                   "\U0001f481\U0001f3fd",
+			":person_tipping_hand_tone4:":                   "\U0001f481\U0001f3fe",
+			":person_tipping_hand_tone5:":                   "\U0001f481\U0001f3ff",
+			":person_walking:":                              "\U0001f6b6",
+			":person_walking_facing_right:":                 "\U0001f6b6\u200d\u27a1\ufe0f",
+			":person_walking_tone1:":                        "\U0001f6b6\U0001f3fb",
+			":person_walking_tone2:":                        "\U0001f6b6\U0001f3fc",
+			":person_walking_tone3:":                        "\U0001f6b6\U0001f3fd",
+			":person_walking_tone4:":                        "\U0001f6b6\U0001f3fe",
+			":person_walking_tone5:":                        "\U0001f6b6\U0001f3ff",
+			":person_wearing_turban:":                       "\U0001f473",
+			":person_wearing_turban_tone1:":                 "\U0001f473\U0001f3fb",
+			":person_wearing_turban_tone2:":                 "\U0001f473\U0001f3fc",
+			":person_wearing_turban_tone3:":                 "\U0001f473\U0001f3fd",
+			":person_wearing_turban_tone4:":                 "\U0001f473\U0001f3fe",
+			":person_wearing_turban_tone5:":                 "\U0001f473\U0001f3ff",
+			":person_white_hair:":                           "\U0001f9d1\u200d\U0001f9b3",
+			":person_with_ball:":                            "\u26f9\ufe0f\u200d\u2642\ufe0f",
+			":person_with_blond_hair:":                      "\U0001f471\u200d\u2642\ufe0f",
+			":person_with_crown:":                           "\U0001fac5",
+			":person_with_headscarf:":                       "\U0001f9d5",
+			":person_with_pouting_face:":                    "\U0001f64e\u200d\u2640\ufe0f",
+			":person_with_probing_cane:":                    "\U0001f9d1\u200d\U0001f9af",
+			":person_with_skullcap:":                        "\U0001f472",
+			":person_with_turban:":                          "\U0001f473",
+			":person_with_veil:":                            "\U0001f470",
+			":person_with_white_cane:":                      "\U0001f9d1\u200d\U0001f9af",
+			":person_with_white_cane_facing_right:":         "\U0001f9d1\u200d\U0001f9af\u200d\u27a1\ufe0f",
+			":peru:":                                        "\U0001f1f5\U0001f1ea",
+			":petri_dish:":                                  "\U0001f9eb",
+			":philippines:":                                 "\U0001f1f5\U0001f1ed",
+			":phoenix:":                                     "\U0001f426\u200d\U0001f525",
+			":phone:":                                       "\u260e\ufe0f",
+			":pick:":                                        "\u26cf\ufe0f",
+			":pickup_truck:":                                "\U0001f6fb",
+			":pie:":                                         "\U0001f967",
+			":pig:":                                         "\U0001f437",
+			":pig2:":                                        "\U0001f416",
+			":pig_face:":                                    "\U0001f437",
+			":pig_nose:":                                    "\U0001f43d",
+			":pile_of_poo:":                                 "\U0001f4a9",
+			":pill:":                                        "\U0001f48a",
+			":pilot:":                                       "\U0001f9d1\u200d\u2708\ufe0f",
+			":pinata:":                                      "\U0001fa85",
+			":pinched_fingers:":                             "\U0001f90c",
+			":pinching_hand:":                               "\U0001f90f",
+			":pine_decoration:":                             "\U0001f38d",
+			":pineapple:":                                   "\U0001f34d",
+			":ping_pong:":                                   "\U0001f3d3",
+			":pink_heart:":                                  "\U0001fa77",
+			":pirate_flag:":                                 "\U0001f3f4\u200d\u2620\ufe0f",
+			":pisces:":                                      "\u2653",
+			":pitcairn_islands:":                            "\U0001f1f5\U0001f1f3",
+			":pizza:":                                       "\U0001f355",
+			":piñata:":                                      "\U0001fa85",
+			":placard:":                                     "\U0001faa7",
+			":place_of_worship:":                            "\U0001f6d0",
+			":plate_with_cutlery:":                          "\U0001f37d\ufe0f",
+			":play_button:":                                 "\u25b6",
+			":play_or_pause_button:":                        "\u23ef",
+			":play_pause:":                                  "\u23ef",
+			":playground_slide:":                            "\U0001f6dd",
+			":pleading_face:":                               "\U0001f97a",
+			":plunger:":                                     "\U0001faa0",
+			":plus:":                                        "\u2795",
+			":point_down:":                                  "\U0001f447",
+			":point_down_tone1:":                            "\U0001f447\U0001f3fb",
+			":point_down_tone2:":                            "\U0001f447\U0001f3fc",
+			":point_down_tone3:":                            "\U0001f447\U0001f3fd",
+			":point_down_tone4:":                            "\U0001f447\U0001f3fe",
+			":point_down_tone5:":                            "\U0001f447\U0001f3ff",
+			":point_left:":                                  "\U0001f448",
+			":point_left_tone1:":                            "\U0001f448\U0001f3fb",
+			":point_left_tone2:":                            "\U0001f448\U0001f3fc",
+			":point_left_tone3:":                            "\U0001f448\U0001f3fd",
+			":point_left_tone4:":                            "\U0001f448\U0001f3fe",
+			":point_left_tone5:":                            "\U0001f448\U0001f3ff",
+			":point_right:":                                 "\U0001f449",
+			":point_right_tone1:":                           "\U0001f449\U0001f3fb",
+			":point_right_tone2:":                           "\U0001f449\U0001f3fc",
+			":point_right_tone3:":                           "\U0001f449\U0001f3fd",
+			":point_right_tone4:":                           "\U0001f449\U0001f3fe",
+			":point_right_tone5:":                           "\U0001f449\U0001f3ff",
+			":point_up:":                                    "\u261d\ufe0f",
+			":point_up_2:":                                  "\U0001f446",
+			":point_up_2_tone1:":                            "\U0001f446\U0001f3fb",
+			":point_up_2_tone2:":                            "\U0001f446\U0001f3fc",
+			":point_up_2_tone3:":                            "\U0001f446\U0001f3fd",
+			":point_up_2_tone4:":                            "\U0001f446\U0001f3fe",
+			":point_up_2_tone5:":                            "\U0001f446\U0001f3ff",
+			":point_up_tone1:":                              "\u261d\U0001f3fb",
+			":point_up_tone2:":                              "\u261d\U0001f3fc",
+			":point_up_tone3:":                              "\u261d\U0001f3fd",
+			":point_up_tone4:":                              "\u261d\U0001f3fe",
+			":point_up_tone5:":                              "\u261d\U0001f3ff",
+			":poland:":                                      "\U0001f1f5\U0001f1f1",
+			":polar_bear:":                                  "\U0001f43b\u200d\u2744\ufe0f",
+			":police_car:":                                  "\U0001f693",
+			":police_car_light:":                            "\U0001f6a8",
+			":police_officer:":                              "\U0001f46e",
+			":police_officer_tone1:":                        "\U0001f46e\U0001f3fb",
+			":police_officer_tone2:":                        "\U0001f46e\U0001f3fc",
+			":police_officer_tone3:":                        "\U0001f46e\U0001f3fd",
+			":police_officer_tone4:":                        "\U0001f46e\U0001f3fe",
+			":police_officer_tone5:":                        "\U0001f46e\U0001f3ff",
+			":policeman:":                                   "\U0001f46e\u200d\u2642\ufe0f",
+			":policewoman:":                                 "\U0001f46e\u200d\u2640\ufe0f",
+			":poodle:":                                      "\U0001f429",
+			":pool_8_ball:":                                 "\U0001f3b1",
+			":poop:":                                        "\U0001f4a9",
+			":popcorn:":                                     "\U0001f37f",
+			":portugal:":                                    "\U0001f1f5\U0001f1f9",
+			":post_office:":                                 "\U0001f3e3",
+			":postal_horn:":                                 "\U0001f4ef",
+			":postbox:":                                     "\U0001f4ee",
+			":pot_of_food:":                                 "\U0001f372",
+			":potable_water:":                               "\U0001f6b0",
+			":potato:":                                      "\U0001f954",
+			":potted_plant:":                                "\U0001fab4",
+			":pouch:":                                       "\U0001f45d",
+			":poultry_leg:":                                 "\U0001f357",
+			":pound:":                                       "\U0001f4b7",
+			":pound_banknote:":                              "\U0001f4b7",
+			":pouring_liquid:":                              "\U0001fad7",
+			":pout:":                                        "\U0001f621",
+			":pouting_cat:":                                 "\U0001f63e",
+			":pouting_face:":                                "\U0001f64e",
+			":pouting_man:":                                 "\U0001f64e\u200d\u2642\ufe0f",
+			":pouting_woman:":                               "\U0001f64e\u200d\u2640\ufe0f",
+			":pray:":                                        "\U0001f64f",
+			":pray_tone1:":                                  "\U0001f64f\U0001f3fb",
+			":pray_tone2:":                                  "\U0001f64f\U0001f3fc",
+			":pray_tone3:":                                  "\U0001f64f\U0001f3fd",
+			":pray_tone4:":                                  "\U0001f64f\U0001f3fe",
+			":pray_tone5:":                                  "\U0001f64f\U0001f3ff",
+			":prayer_beads:":                                "\U0001f4ff",
+			":pregnant_man:":                                "\U0001fac3",
+			":pregnant_person:":                             "\U0001fac4",
+			":pregnant_woman:":                              "\U0001f930",
+			":pregnant_woman_tone1:":                        "\U0001f930\U0001f3fb",
+			":pregnant_woman_tone2:":                        "\U0001f930\U0001f3fc",
+			":pregnant_woman_tone3:":                        "\U0001f930\U0001f3fd",
+			":pregnant_woman_tone4:":                        "\U0001f930\U0001f3fe",
+			":pregnant_woman_tone5:":                        "\U0001f930\U0001f3ff",
+			":pretzel:":                                     "\U0001f968",
+			":previous_track_button:":                       "\u23ee\ufe0f",
+			":prince:":                                      "\U0001f934",
+			":prince_tone1:":                                "\U0001f934\U0001f3fb",
+			":prince_tone2:":                                "\U0001f934\U0001f3fc",
+			":prince_tone3:":                                "\U0001f934\U0001f3fd",
+			":prince_tone4:":                                "\U0001f934\U0001f3fe",
+			":prince_tone5:":                                "\U0001f934\U0001f3ff",
+			":princess:":                                    "\U0001f478",
+			":princess_tone1:":                              "\U0001f478\U0001f3fb",
+			":princess_tone2:":                              "\U0001f478\U0001f3fc",
+			":princess_tone3:":                              "\U0001f478\U0001f3fd",
+			":princess_tone4:":                              "\U0001f478\U0001f3fe",
+			":princess_tone5:":                              "\U0001f478\U0001f3ff",
+			":printer:":                                     "\U0001f5a8\ufe0f",
+			":probing_cane:":                                "\U0001f9af",
+			":prohibited:":                                  "\U0001f6ab",
+			":projector:":                                   "\U0001f4fd",
+			":puerto_rico:":                                 "\U0001f1f5\U0001f1f7",
+			":punch:":                                       "\U0001f44a",
+			":punch_tone1:":                                 "\U0001f44a\U0001f3fb",
+			":punch_tone2:":                                 "\U0001f44a\U0001f3fc",
+			":punch_tone3:":                                 "\U0001f44a\U0001f3fd",
+			":punch_tone4:":                                 "\U0001f44a\U0001f3fe",
+			":punch_tone5:":                                 "\U0001f44a\U0001f3ff",
+			":purple_circle:":                               "\U0001f7e3",
+			":purple_heart:":                                "\U0001f49c",
+			":purple_square:":                               "\U0001f7ea",
+			":purse:":                                       "\U0001f45b",
+			":pushpin:":                                     "\U0001f4cc",
+			":put_litter_in_its_place:":                     "\U0001f6ae",
+			":puzzle_piece:":                                "\U0001f9e9",
+			":qatar:":                                       "\U0001f1f6\U0001f1e6",
+			":question:":                                    "\u2753",
+			":rabbit:":                                      "\U0001f430",
+			":rabbit2:":                                     "\U0001f407",
+			":rabbit_face:":                                 "\U0001f430",
+			":raccoon:":                                     "\U0001f99d",
+			":race_car:":                                    "\U0001f3ce",
+			":racehorse:":                                   "\U0001f40e",
+			":racing_car:":                                  "\U0001f3ce\ufe0f",
+			":racing_motorcycle:":                           "\U0001f3cd\ufe0f",
+			":radio:":                                       "\U0001f4fb",
+			":radio_button:":                                "\U0001f518",
+			":radioactive:":                                 "\u2622",
+			":radioactive_sign:":                            "\u2622\ufe0f",
+			":rage:":                                        "\U0001f621",
+			":railway_car:":                                 "\U0001f683",
+			":railway_track:":                               "\U0001f6e4\ufe0f",
+			":rain_cloud:":                                  "\U0001f327\ufe0f",
+			":rainbow:":                                     "\U0001f308",
+			":rainbow-flag:":                                "\U0001f3f3\ufe0f\u200d\U0001f308",
+			":rainbow_flag:":                                "\U0001f3f3\ufe0f\u200d\U0001f308",
+			":raised_back_of_hand:":                         "\U0001f91a",
+			":raised_back_of_hand_tone1:":                   "\U0001f91a\U0001f3fb",
+			":raised_back_of_hand_tone2:":                   "\U0001f91a\U0001f3fc",
+			":raised_back_of_hand_tone3:":                   "\U0001f91a\U0001f3fd",
+			":raised_back_of_hand_tone4:":                   "\U0001f91a\U0001f3fe",
+			":raised_back_of_hand_tone5:":                   "\U0001f91a\U0001f3ff",
+			":raised_eyebrow:":                              "\U0001f928",
+			":raised_fist:":                                 "\u270a",
+			":raised_hand:":                                 "\u270b",
+			":raised_hand_tone1:":                           "\u270b\U0001f3fb",
+			":raised_hand_tone2:":                           "\u270b\U0001f3fc",
+			":raised_hand_tone3:":                           "\u270b\U0001f3fd",
+			":raised_hand_tone4:":                           "\u270b\U0001f3fe",
+			":raised_hand_tone5:":                           "\u270b\U0001f3ff",
+			":raised_hand_with_fingers_splayed:":            "\U0001f590\ufe0f",
+			":raised_hands:":                                "\U0001f64c",
+			":raised_hands_tone1:":                          "\U0001f64c\U0001f3fb",
+			":raised_hands_tone2:":                          "\U0001f64c\U0001f3fc",
+			":raised_hands_tone3:":                          "\U0001f64c\U0001f3fd",
+			":raised_hands_tone4:":                          "\U0001f64c\U0001f3fe",
+			":raised_hands_tone5:":                          "\U0001f64c\U0001f3ff",
+			":raising_hand:":                                "\U0001f64b\u200d\u2640\ufe0f",
+			":raising_hand_man:":                            "\U0001f64b\u200d\u2642\ufe0f",
+			":raising_hand_woman:":                          "\U0001f64b\u200d\u2640\ufe0f",
+			":raising_hands:":                               "\U0001f64c",
+			":ram:":                                         "\U0001f40f",
+			":ramen:":                                       "\U0001f35c",
+			":rat:":                                         "\U0001f400",
+			":razor:":                                       "\U0001fa92",
+			":receipt:":                                     "\U0001f9fe",
+			":record_button:":                               "\u23fa",
+			":recycle:":                                     "\u267b\ufe0f",
+			":recycling_symbol:":                            "\u267b",
+			":red_apple:":                                   "\U0001f34e",
+			":red_car:":                                     "\U0001f697",
+			":red_circle:":                                  "\U0001f534",
+			":red_envelope:":                                "\U0001f9e7",
+			":red_exclamation_mark:":                        "\u2757",
+			":red_hair:":                                    "\U0001f9b0",
+			":red_haired_man:":                              "\U0001f468\u200d\U0001f9b0",
+			":red_haired_person:":                           "\U0001f9d1\u200d\U0001f9b0",
+			":red_haired_woman:":                            "\U0001f469\u200d\U0001f9b0",
+			":red_heart:":                                   "\u2764",
+			":red_paper_lantern:":                           "\U0001f3ee",
+			":red_question_mark:":                           "\u2753",
+			":red_square:":                                  "\U0001f7e5",
+			":red_triangle_pointed_down:":                   "\U0001f53b",
+			":red_triangle_pointed_up:":                     "\U0001f53a",
+			":registered:":                                  "\u00ae\ufe0f",
+			":relaxed:":                                     "\u263a\ufe0f",
+			":relieved:":                                    "\U0001f60c",
+			":relieved_face:":                               "\U0001f60c",
+			":reminder_ribbon:":                             "\U0001f397\ufe0f",
+			":repeat:":                                      "\U0001f501",
+			":repeat_button:":                               "\U0001f501",
+			":repeat_one:":                                  "\U0001f502",
+			":repeat_single_button:":                        "\U0001f502",
+			":rescue_worker_helmet:":                        "\u26d1\ufe0f",
+			":rescue_worker’s_helmet:":                      "\u26d1",
+			":restroom:":                                    "\U0001f6bb",
+			":reunion:":                                     "\U0001f1f7\U0001f1ea",
+			":reverse_button:":                              "\u25c0",
+			":revolving_hearts:":                            "\U0001f49e",
+			":rewind:":                                      "\u23ea",
+			":rhino:":                                       "\U0001f98f",
+			":rhinoceros:":                                  "\U0001f98f",
+			":ribbon:":                                      "\U0001f380",
+			":rice:":                                        "\U0001f35a",
+			":rice_ball:":                                   "\U0001f359",
+			":rice_cracker:":                                "\U0001f358",
+			":rice_scene:":                                  "\U0001f391",
+			":right-facing_fist:":                           "\U0001f91c",
+			":right_anger_bubble:":                          "\U0001f5ef\ufe0f",
+			":right_arrow:":                                 "\u27a1",
+			":right_arrow_curving_down:":                    "\u2935",
+			":right_arrow_curving_left:":                    "\u21a9",
+			":right_arrow_curving_up:":                      "\u2934",
+			":right_facing_fist:":                           "\U0001f91c",
+			":right_facing_fist_tone1:":                     "\U0001f91c\U0001f3fb",
+			":right_facing_fist_tone2:":                     "\U0001f91c\U0001f3fc",
+			":right_facing_fist_tone3:":                     "\U0001f91c\U0001f3fd",
+			":right_facing_fist_tone4:":                     "\U0001f91c\U0001f3fe",
+			":right_facing_fist_tone5:":                     "\U0001f91c\U0001f3ff",
+			":rightwards_hand:":                             "\U0001faf1",
+			":rightwards_pushing_hand:":                     "\U0001faf8",
+			":ring:":                                        "\U0001f48d",
+			":ring_buoy:":                                   "\U0001f6df",
+			":ringed_planet:":                               "\U0001fa90",
+			":roasted_sweet_potato:":                        "\U0001f360",
+			":robot:":                                       "\U0001f916",
+			":robot_face:":                                  "\U0001f916",
+			":rock:":                                        "\U0001faa8",
+			":rocket:":                                      "\U0001f680",
+			":rofl:":                                        "\U0001f923",
+			":roll_eyes:":                                   "\U0001f644",
+			":roll_of_paper:":                               "\U0001f9fb",
+			":rolled-up_newspaper:":                         "\U0001f5de",
+			":rolled_up_newspaper:":                         "\U0001f5de\ufe0f",
+			":roller_coaster:":                              "\U0001f3a2",
+			":roller_skate:":                                "\U0001f6fc",
+			":rolling_eyes:":                                "\U0001f644",
+			":rolling_on_the_floor_laughing:":               "\U0001f923",
+			":romania:":                                     "\U0001f1f7\U0001f1f4",
+			":rooster:":                                     "\U0001f413",
+			":root_vegetable:":                              "\U0001fadc",
+			":rose:":                                        "\U0001f339",
+			":rosette:":                                     "\U0001f3f5\ufe0f",
+			":rotating_light:":                              "\U0001f6a8",
+			":round_pushpin:":                               "\U0001f4cd",
+			":rowboat:":                                     "\U0001f6a3\u200d\u2642\ufe0f",
+			":rowing_man:":                                  "\U0001f6a3\u200d\u2642\ufe0f",
+			":rowing_woman:":                                "\U0001f6a3\u200d\u2640\ufe0f",
+			":ru:":                                          "\U0001f1f7\U0001f1fa",
+			":rugby_football:":                              "\U0001f3c9",
+			":runner:":                                      "\U0001f3c3\u200d\u2642\ufe0f",
+			":running:":                                     "\U0001f3c3",
+			":running_man:":                                 "\U0001f3c3\u200d\u2642\ufe0f",
+			":running_shirt:":                               "\U0001f3bd",
+			":running_shirt_with_sash:":                     "\U0001f3bd",
+			":running_shoe:":                                "\U0001f45f",
+			":running_woman:":                               "\U0001f3c3\u200d\u2640\ufe0f",
+			":rwanda:":                                      "\U0001f1f7\U0001f1fc",
+			":sa:":                                          "\U0001f202\ufe0f",
+			":sad_but_relieved_face:":                       "\U0001f625",
+			":safety_pin:":                                  "\U0001f9f7",
+			":safety_vest:":                                 "\U0001f9ba",
+			":sagittarius:":                                 "\u2650",
+			":sailboat:":                                    "\u26f5",
+			":sake:":                                        "\U0001f376",
+			":salad:":                                       "\U0001f957",
+			":salt:":                                        "\U0001f9c2",
+			":saluting_face:":                               "\U0001fae1",
+			":samoa:":                                       "\U0001f1fc\U0001f1f8",
+			":san_marino:":                                  "\U0001f1f8\U0001f1f2",
+			":sandal:":                                      "\U0001f461",
+			":sandwich:":                                    "\U0001f96a",
+			":santa:":                                       "\U0001f385",
+			":santa_tone1:":                                 "\U0001f385\U0001f3fb",
+			":santa_tone2:":                                 "\U0001f385\U0001f3fc",
+			":santa_tone3:":                                 "\U0001f385\U0001f3fd",
+			":santa_tone4:":                                 "\U0001f385\U0001f3fe",
+			":santa_tone5:":                                 "\U0001f385\U0001f3ff",
+			":sao_tome_principe:":                           "\U0001f1f8\U0001f1f9",
+			":sari:":                                        "\U0001f97b",
+			":sassy_man:":                                   "\U0001f481\u200d\u2642\ufe0f",
+			":sassy_woman:":                                 "\U0001f481\u200d\u2640\ufe0f",
+			":satellite:":                                   "\U0001f6f0\ufe0f",
+			":satellite_antenna:":                           "\U0001f4e1",
+			":satellite_orbital:":                           "\U0001f6f0",
+			":satisfied:":                                   "\U0001f606",
+			":saudi_arabia:":                                "\U0001f1f8\U0001f1e6",
+			":sauna_man:":                                   "\U0001f9d6\u200d\u2642\ufe0f",
+			":sauna_person:":                                "\U0001f9d6",
+			":sauna_woman:":                                 "\U0001f9d6\u200d\u2640\ufe0f",
+			":sauropod:":                                    "\U0001f995",
+			":saxophone:":                                   "\U0001f3b7",
+			":scales:":                                      "\u2696\ufe0f",
+			":scarf:":                                       "\U0001f9e3",
+			":school:":                                      "\U0001f3eb",
+			":school_satchel:":                              "\U0001f392",
+			":scientist:":                                   "\U0001f9d1\u200d\U0001f52c",
+			":scissors:":                                    "\u2702\ufe0f",
+			":scooter:":                                     "\U0001f6f4",
+			":scorpion:":                                    "\U0001f982",
+			":scorpius:":                                    "\u264f",
+			":scotland:":                                    "\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f",
+			":scream:":                                      "\U0001f631",
+			":scream_cat:":                                  "\U0001f640",
+			":screwdriver:":                                 "\U0001fa9b",
+			":scroll:":                                      "\U0001f4dc",
+			":seal:":                                        "\U0001f9ad",
+			":seat:":                                        "\U0001f4ba",
+			":second_place:":                                "\U0001f948",
+			":second_place_medal:":                          "\U0001f948",
+			":secret:":                                      "\u3299\ufe0f",
+			":see-no-evil_monkey:":                          "\U0001f648",
+			":see_no_evil:":                                 "\U0001f648",
+			":seedling:":                                    "\U0001f331",
+			":selfie:":                                      "\U0001f933",
+			":selfie_tone1:":                                "\U0001f933\U0001f3fb",
+			":selfie_tone2:":                                "\U0001f933\U0001f3fc",
+			":selfie_tone3:":                                "\U0001f933\U0001f3fd",
+			":selfie_tone4:":                                "\U0001f933\U0001f3fe",
+			":selfie_tone5:":                                "\U0001f933\U0001f3ff",
+			":senegal:":                                     "\U0001f1f8\U0001f1f3",
+			":serbia:":                                      "\U0001f1f7\U0001f1f8",
+			":service_dog:":                                 "\U0001f415\u200d\U0001f9ba",
+			":seven:":                                       "7\ufe0f\u20e3",
+			":seven-thirty:":                                "\U0001f562",
+			":seven_o’clock:":                               "\U0001f556",
+			":sewing_needle:":                               "\U0001faa1",
+			":seychelles:":                                  "\U0001f1f8\U0001f1e8",
+			":shaking_face:":                                "\U0001fae8",
+			":shallow_pan_of_food:":                         "\U0001f958",
+			":shamrock:":                                    "\u2618\ufe0f",
+			":shark:":                                       "\U0001f988",
+			":shaved_ice:":                                  "\U0001f367",
+			":sheaf_of_rice:":                               "\U0001f33e",
+			":sheep:":                                       "\U0001f411",
+			":shell:":                                       "\U0001f41a",
+			":shield:":                                      "\U0001f6e1\ufe0f",
+			":shinto_shrine:":                               "\u26e9\ufe0f",
+			":ship:":                                        "\U0001f6a2",
+			":shirt:":                                       "\U0001f455",
+			":shit:":                                        "\U0001f4a9",
+			":shoe:":                                        "\U0001f45e",
+			":shooting_star:":                               "\U0001f320",
+			":shopping:":                                    "\U0001f6cd\ufe0f",
+			":shopping_bags:":                               "\U0001f6cd\ufe0f",
+			":shopping_cart:":                               "\U0001f6d2",
+			":shopping_trolley:":                            "\U0001f6d2",
+			":shortcake:":                                   "\U0001f370",
+			":shorts:":                                      "\U0001fa73",
+			":shovel:":                                      "\U0001fa8f",
+			":shower:":                                      "\U0001f6bf",
+			":shrimp:":                                      "\U0001f990",
+			":shrug:":                                       "\U0001f937",
+			":shuffle_tracks_button:":                       "\U0001f500",
+			":shushing_face:":                               "\U0001f92b",
+			":sierra_leone:":                                "\U0001f1f8\U0001f1f1",
+			":sign_of_the_horns:":                           "\U0001f918",
+			":signal_strength:":                             "\U0001f4f6",
+			":singapore:":                                   "\U0001f1f8\U0001f1ec",
+			":singer:":                                      "\U0001f9d1\u200d\U0001f3a4",
+			":sint_maarten:":                                "\U0001f1f8\U0001f1fd",
+			":six:":                                         "6\ufe0f\u20e3",
+			":six-thirty:":                                  "\U0001f561",
+			":six_o’clock:":                                 "\U0001f555",
+			":six_pointed_star:":                            "\U0001f52f",
+			":skateboard:":                                  "\U0001f6f9",
+			":ski:":                                         "\U0001f3bf",
+			":skier:":                                       "\u26f7\ufe0f",
+			":skin-tone-2:":                                 "\U0001f3fb",
+			":skin-tone-3:":                                 "\U0001f3fc",
+			":skin-tone-4:":                                 "\U0001f3fd",
+			":skin-tone-5:":                                 "\U0001f3fe",
+			":skin-tone-6:":                                 "\U0001f3ff",
+			":skis:":                                        "\U0001f3bf",
+			":skull:":                                       "\U0001f480",
+			":skull_and_crossbones:":                        "\u2620\ufe0f",
+			":skull_crossbones:":                            "\u2620",
+			":skunk:":                                       "\U0001f9a8",
+			":sled:":                                        "\U0001f6f7",
+			":sleeping:":                                    "\U0001f634",
+			":sleeping_accommodation:":                      "\U0001f6cc",
+			":sleeping_bed:":                                "\U0001f6cc",
+			":sleeping_face:":                               "\U0001f634",
+			":sleepy:":                                      "\U0001f62a",
+			":sleepy_face:":                                 "\U0001f62a",
+			":sleuth_or_spy:":                               "\U0001f575\ufe0f\u200d\u2642\ufe0f",
+			":slight_frown:":                                "\U0001f641",
+			":slight_smile:":                                "\U0001f642",
+			":slightly_frowning_face:":                      "\U0001f641",
+			":slightly_smiling_face:":                       "\U0001f642",
+			":slot_machine:":                                "\U0001f3b0",
+			":sloth:":                                       "\U0001f9a5",
+			":slovakia:":                                    "\U0001f1f8\U0001f1f0",
+			":slovenia:":                                    "\U0001f1f8\U0001f1ee",
+			":small_airplane:":                              "\U0001f6e9\ufe0f",
+			":small_blue_diamond:":                          "\U0001f539",
+			":small_orange_diamond:":                        "\U0001f538",
+			":small_red_triangle:":                          "\U0001f53a",
+			":small_red_triangle_down:":                     "\U0001f53b",
+			":smile:":                                       "\U0001f604",
+			":smile_cat:":                                   "\U0001f638",
+			":smiley:":                                      "\U0001f603",
+			":smiley_cat:":                                  "\U0001f63a",
+			":smiling_cat_with_heart-eyes:":                 "\U0001f63b",
+			":smiling_face:":                                "\u263a",
+			":smiling_face_with_3_hearts:":                  "\U0001f970",
+			":smiling_face_with_halo:":                      "\U0001f607",
+			":smiling_face_with_heart-eyes:":                "\U0001f60d",
+			":smiling_face_with_hearts:":                    "\U0001f970",
+			":smiling_face_with_horns:":                     "\U0001f608",
+			":smiling_face_with_open_hands:":                "\U0001f917",
+			":smiling_face_with_smiling_eyes:":              "\U0001f60a",
+			":smiling_face_with_sunglasses:":                "\U0001f60e",
+			":smiling_face_with_tear:":                      "\U0001f972",
+			":smiling_face_with_three_hearts:":              "\U0001f970",
+			":smiling_imp:":                                 "\U0001f608",
+			":smirk:":                                       "\U0001f60f",
+			":smirk_cat:":                                   "\U0001f63c",
+			":smirking_face:":                               "\U0001f60f",
+			":smoking:":                                     "\U0001f6ac",
+			":snail:":                                       "\U0001f40c",
+			":snake:":                                       "\U0001f40d",
+			":sneezing_face:":                               "\U0001f927",
+			":snow-capped_mountain:":                        "\U0001f3d4",
+			":snow_capped_mountain:":                        "\U0001f3d4\ufe0f",
+			":snow_cloud:":                                  "\U0001f328\ufe0f",
+			":snowboarder:":                                 "\U0001f3c2",
+			":snowboarder_tone1:":                           "\U0001f3c2\U0001f3fb",
+			":snowboarder_tone2:":                           "\U0001f3c2\U0001f3fc",
+			":snowboarder_tone3:":                           "\U0001f3c2\U0001f3fd",
+			":snowboarder_tone4:":                           "\U0001f3c2\U0001f3fe",
+			":snowboarder_tone5:":                           "\U0001f3c2\U0001f3ff",
+			":snowflake:":                                   "\u2744\ufe0f",
+			":snowman:":                                     "\u2603\ufe0f",
+			":snowman2:":                                    "\u2603",
+			":snowman_with_snow:":                           "\u2603\ufe0f",
+			":snowman_without_snow:":                        "\u26c4",
+			":soap:":                                        "\U0001f9fc",
+			":sob:":                                         "\U0001f62d",
+			":soccer:":                                      "\u26bd",
+			":soccer_ball:":                                 "\u26bd",
+			":socks:":                                       "\U0001f9e6",
+			":soft_ice_cream:":                              "\U0001f366",
+			":softball:":                                    "\U0001f94e",
+			":solomon_islands:":                             "\U0001f1f8\U0001f1e7",
+			":somalia:":                                     "\U0001f1f8\U0001f1f4",
+			":soon:":                                        "\U0001f51c",
+			":sos:":                                         "\U0001f198",
+			":sound:":                                       "\U0001f509",
+			":south_africa:":                                "\U0001f1ff\U0001f1e6",
+			":south_georgia_south_sandwich_islands:":        "\U0001f1ec\U0001f1f8",
+			":south_sudan:":                                 "\U0001f1f8\U0001f1f8",
+			":space_invader:":                               "\U0001f47e",
+			":spade_suit:":                                  "\u2660",
+			":spades:":                                      "\u2660\ufe0f",
+			":spaghetti:":                                   "\U0001f35d",
+			":sparkle:":                                     "\u2747\ufe0f",
+			":sparkler:":                                    "\U0001f387",
+			":sparkles:":                                    "\u2728",
+			":sparkling_heart:":                             "\U0001f496",
+			":speak-no-evil_monkey:":                        "\U0001f64a",
+			":speak_no_evil:":                               "\U0001f64a",
+			":speaker:":                                     "\U0001f508",
+			":speaker_high_volume:":                         "\U0001f50a",
+			":speaker_low_volume:":                          "\U0001f508",
+			":speaker_medium_volume:":                       "\U0001f509",
+			":speaking_head:":                               "\U0001f5e3",
+			":speaking_head_in_silhouette:":                 "\U0001f5e3\ufe0f",
+			":speech_balloon:":                              "\U0001f4ac",
+			":speech_left:":                                 "\U0001f5e8",
+			":speedboat:":                                   "\U0001f6a4",
+			":spider:":                                      "\U0001f577\ufe0f",
+			":spider_web:":                                  "\U0001f578\ufe0f",
+			":spiral_calendar:":                             "\U0001f5d3",
+			":spiral_calendar_pad:":                         "\U0001f5d3\ufe0f",
+			":spiral_note_pad:":                             "\U0001f5d2\ufe0f",
+			":spiral_notepad:":                              "\U0001f5d2",
+			":spiral_shell:":                                "\U0001f41a",
+			":splatter:":                                    "\U0001fadf",
+			":spock-hand:":                                  "\U0001f596",
+			":sponge:":                                      "\U0001f9fd",
+			":spoon:":                                       "\U0001f944",
+			":sport_utility_vehicle:":                       "\U0001f699",
+			":sports_medal:":                                "\U0001f3c5",
+			":spouting_whale:":                              "\U0001f433",
+			":squid:":                                       "\U0001f991",
+			":squinting_face_with_tongue:":                  "\U0001f61d",
+			":sri_lanka:":                                   "\U0001f1f1\U0001f1f0",
+			":st_barthelemy:":                               "\U0001f1e7\U0001f1f1",
+			":st_helena:":                                   "\U0001f1f8\U0001f1ed",
+			":st_kitts_nevis:":                              "\U0001f1f0\U0001f1f3",
+			":st_lucia:":                                    "\U0001f1f1\U0001f1e8",
+			":st_martin:":                                   "\U0001f1f2\U0001f1eb",
+			":st_pierre_miquelon:":                          "\U0001f1f5\U0001f1f2",
+			":st_vincent_grenadines:":                       "\U0001f1fb\U0001f1e8",
+			":stadium:":                                     "\U0001f3df\ufe0f",
+			":standing_man:":                                "\U0001f9cd\u200d\u2642\ufe0f",
+			":standing_person:":                             "\U0001f9cd",
+			":standing_woman:":                              "\U0001f9cd\u200d\u2640\ufe0f",
+			":star:":                                        "\u2b50",
+			":star-struck:":                                 "\U0001f929",
+			":star2:":                                       "\U0001f31f",
+			":star_and_crescent:":                           "\u262a\ufe0f",
+			":star_of_David:":                               "\u2721",
+			":star_of_david:":                               "\u2721\ufe0f",
+			":star_struck:":                                 "\U0001f929",
+			":stars:":                                       "\U0001f320",
+			":station:":                                     "\U0001f689",
+			":statue_of_liberty:":                           "\U0001f5fd",
+			":steam_locomotive:":                            "\U0001f682",
+			":steaming_bowl:":                               "\U0001f35c",
+			":stethoscope:":                                 "\U0001fa7a",
+			":stew:":                                        "\U0001f372",
+			":stop_button:":                                 "\u23f9",
+			":stop_sign:":                                   "\U0001f6d1",
+			":stopwatch:":                                   "\u23f1\ufe0f",
+			":straight_ruler:":                              "\U0001f4cf",
+			":strawberry:":                                  "\U0001f353",
+			":stuck_out_tongue:":                            "\U0001f61b",
+			":stuck_out_tongue_closed_eyes:":                "\U0001f61d",
+			":stuck_out_tongue_winking_eye:":                "\U0001f61c",
+			":student:":                                     "\U0001f9d1\u200d\U0001f393",
+			":studio_microphone:":                           "\U0001f399\ufe0f",
+			":stuffed_flatbread:":                           "\U0001f959",
+			":sudan:":                                       "\U0001f1f8\U0001f1e9",
+			":sun:":                                         "\u2600",
+			":sun_behind_cloud:":                            "\u26c5",
+			":sun_behind_large_cloud:":                      "\U0001f325",
+			":sun_behind_rain_cloud:":                       "\U0001f326",
+			":sun_behind_small_cloud:":                      "\U0001f324",
+			":sun_with_face:":                               "\U0001f31e",
+			":sunflower:":                                   "\U0001f33b",
+			":sunglasses:":                                  "\U0001f60e",
+			":sunny:":                                       "\u2600\ufe0f",
+			":sunrise:":                                     "\U0001f305",
+			":sunrise_over_mountains:":                      "\U0001f304",
+			":sunset:":                                      "\U0001f307",
+			":superhero:":                                   "\U0001f9b8",
+			":superhero_man:":                               "\U0001f9b8\u200d\u2642\ufe0f",
+			":superhero_woman:":                             "\U0001f9b8\u200d\u2640\ufe0f",
+			":supervillain:":                                "\U0001f9b9",
+			":supervillain_man:":                            "\U0001f9b9\u200d\u2642\ufe0f",
+			":supervillain_woman:":                          "\U0001f9b9\u200d\u2640\ufe0f",
+			":surfer:":                                      "\U0001f3c4\u200d\u2642\ufe0f",
+			":surfing_man:":                                 "\U0001f3c4\u200d\u2642\ufe0f",
+			":surfing_woman:":                               "\U0001f3c4\u200d\u2640\ufe0f",
+			":suriname:":                                    "\U0001f1f8\U0001f1f7",
+			":sushi:":                                       "\U0001f363",
+			":suspension_railway:":                          "\U0001f69f",
+			":svalbard_jan_mayen:":                          "\U0001f1f8\U0001f1ef",
+			":swan:":                                        "\U0001f9a2",
+			":swaziland:":                                   "\U0001f1f8\U0001f1ff",
+			":sweat:":                                       "\U0001f613",
+			":sweat_droplets:":                              "\U0001f4a6",
+			":sweat_drops:":                                 "\U0001f4a6",
+			":sweat_smile:":                                 "\U0001f605",
+			":sweden:":                                      "\U0001f1f8\U0001f1ea",
+			":sweet_potato:":                                "\U0001f360",
+			":swim_brief:":                                  "\U0001fa72",
+			":swimmer:":                                     "\U0001f3ca\u200d\u2642\ufe0f",
+			":swimming_man:":                                "\U0001f3ca\u200d\u2642\ufe0f",
+			":swimming_woman:":                              "\U0001f3ca\u200d\u2640\ufe0f",
+			":switzerland:":                                 "\U0001f1e8\U0001f1ed",
+			":symbols:":                                     "\U0001f523",
+			":synagogue:":                                   "\U0001f54d",
+			":syria:":                                       "\U0001f1f8\U0001f1fe",
+			":syringe:":                                     "\U0001f489",
+			":t-rex:":                                       "\U0001f996",
+			":t-shirt:":                                     "\U0001f455",
+			":t_rex:":                                       "\U0001f996",
+			":table_tennis_paddle_and_ball:":                "\U0001f3d3",
+			":taco:":                                        "\U0001f32e",
+			":tada:":                                        "\U0001f389",
+			":taiwan:":                                      "\U0001f1f9\U0001f1fc",
+			":tajikistan:":                                  "\U0001f1f9\U0001f1ef",
+			":takeout_box:":                                 "\U0001f961",
+			":tamale:":                                      "\U0001fad4",
+			":tanabata_tree:":                               "\U0001f38b",
+			":tangerine:":                                   "\U0001f34a",
+			":tanzania:":                                    "\U0001f1f9\U0001f1ff",
+			":taurus:":                                      "\u2649",
+			":taxi:":                                        "\U0001f695",
+			":tea:":                                         "\U0001f375",
+			":teacher:":                                     "\U0001f9d1\u200d\U0001f3eb",
+			":teacup_without_handle:":                       "\U0001f375",
+			":teapot:":                                      "\U0001fad6",
+			":tear-off_calendar:":                           "\U0001f4c6",
+			":technologist:":                                "\U0001f9d1\u200d\U0001f4bb",
+			":teddy_bear:":                                  "\U0001f9f8",
+			":telephone:":                                   "\u260e",
+			":telephone_receiver:":                          "\U0001f4de",
+			":telescope:":                                   "\U0001f52d",
+			":television:":                                  "\U0001f4fa",
+			":ten-thirty:":                                  "\U0001f565",
+			":ten_o’clock:":                                 "\U0001f559",
+			":tennis:":                                      "\U0001f3be",
+			":tent:":                                        "\u26fa",
+			":test_tube:":                                   "\U0001f9ea",
+			":thailand:":                                    "\U0001f1f9\U0001f1ed",
+			":the_horns:":                                   "\U0001f918",
+			":thermometer:":                                 "\U0001f321\ufe0f",
+			":thermometer_face:":                            "\U0001f912",
+			":thinking:":                                    "\U0001f914",
+			":thinking_face:":                               "\U0001f914",
+			":third_place:":                                 "\U0001f949",
+			":third_place_medal:":                           "\U0001f949",
+			":thong_sandal:":                                "\U0001fa74",
+			":thought_balloon:":                             "\U0001f4ad",
+			":thread:":                                      "\U0001f9f5",
+			":three:":                                       "3\ufe0f\u20e3",
+			":three-thirty:":                                "\U0001f55e",
+			":three_button_mouse:":                          "\U0001f5b1\ufe0f",
+			":three_o’clock:":                               "\U0001f552",
+			":thumbs_down:":                                 "\U0001f44e",
+			":thumbs_up:":                                   "\U0001f44d",
+			":thumbsdown:":                                  "\U0001f44e",
+			":thumbsdown_tone1:":                            "\U0001f44e\U0001f3fb",
+			":thumbsdown_tone2:":                            "\U0001f44e\U0001f3fc",
+			":thumbsdown_tone3:":                            "\U0001f44e\U0001f3fd",
+			":thumbsdown_tone4:":                            "\U0001f44e\U0001f3fe",
+			":thumbsdown_tone5:":                            "\U0001f44e\U0001f3ff",
+			":thumbsup:":                                    "\U0001f44d",
+			":thumbsup_tone1:":                              "\U0001f44d\U0001f3fb",
+			":thumbsup_tone2:":                              "\U0001f44d\U0001f3fc",
+			":thumbsup_tone3:":                              "\U0001f44d\U0001f3fd",
+			":thumbsup_tone4:":                              "\U0001f44d\U0001f3fe",
+			":thumbsup_tone5:":                              "\U0001f44d\U0001f3ff",
+			":thunder_cloud_and_rain:":                      "\u26c8\ufe0f",
+			":thunder_cloud_rain:":                          "\u26c8",
+			":ticket:":                                      "\U0001f3ab",
+			":tickets:":                                     "\U0001f39f",
+			":tiger:":                                       "\U0001f42f",
+			":tiger2:":                                      "\U0001f405",
+			":tiger_face:":                                  "\U0001f42f",
+			":timer:":                                       "\u23f2",
+			":timer_clock:":                                 "\u23f2\ufe0f",
+			":timor_leste:":                                 "\U0001f1f9\U0001f1f1",
+			":tipping_hand_man:":                            "\U0001f481\u200d\u2642\ufe0f",
+			":tipping_hand_person:":                         "\U0001f481",
+			":tipping_hand_woman:":                          "\U0001f481\u200d\u2640\ufe0f",
+			":tired_face:":                                  "\U0001f62b",
+			":tm:":                                          "\u2122\ufe0f",
+			":togo:":                                        "\U0001f1f9\U0001f1ec",
+			":toilet:":                                      "\U0001f6bd",
+			":tokelau:":                                     "\U0001f1f9\U0001f1f0",
+			":tokyo_tower:":                                 "\U0001f5fc",
+			":tomato:":                                      "\U0001f345",
+			":tonga:":                                       "\U0001f1f9\U0001f1f4",
+			":tongue:":                                      "\U0001f445",
+			":toolbox:":                                     "\U0001f9f0",
+			":tools:":                                       "\U0001f6e0",
+			":tooth:":                                       "\U0001f9b7",
+			":toothbrush:":                                  "\U0001faa5",
+			":top:":                                         "\U0001f51d",
+			":top_hat:":                                     "\U0001f3a9",
+			":tophat:":                                      "\U0001f3a9",
+			":tornado:":                                     "\U0001f32a\ufe0f",
+			":tr:":                                          "\U0001f1f9\U0001f1f7",
+			":track_next:":                                  "\u23ed",
+			":track_previous:":                              "\u23ee",
+			":trackball:":                                   "\U0001f5b2\ufe0f",
+			":tractor:":                                     "\U0001f69c",
+			":trade_mark:":                                  "\u2122",
+			":traffic_light:":                               "\U0001f6a5",
+			":train:":                                       "\U0001f68b",
+			":train2:":                                      "\U0001f686",
+			":tram:":                                        "\U0001f68a",
+			":tram_car:":                                    "\U0001f68b",
+			":transgender_flag:":                            "\U0001f3f3\ufe0f\u200d\u26a7\ufe0f",
+			":transgender_symbol:":                          "\u26a7\ufe0f",
+			":treasure_chest:":                              "\U0001fa8e",
+			":triangular_flag:":                             "\U0001f6a9",
+			":triangular_flag_on_post:":                     "\U0001f6a9",
+			":triangular_ruler:":                            "\U0001f4d0",
+			":trident:":                                     "\U0001f531",
+			":trident_emblem:":                              "\U0001f531",
+			":trinidad_tobago:":                             "\U0001f1f9\U0001f1f9",
+			":tristan_da_cunha:":                            "\U0001f1f9\U0001f1e6",
+			":triumph:":                                     "\U0001f624",
+			":troll:":                                       "\U0001f9cc",
+			":trolleybus:":                                  "\U0001f68e",
+			":trombone:":                                    "\U0001fa8a",
+			":trophy:":                                      "\U0001f3c6",
+			":tropical_drink:":                              "\U0001f379",
+			":tropical_fish:":                               "\U0001f420",
+			":truck:":                                       "\U0001f69a",
+			":trumpet:":                                     "\U0001f3ba",
+			":tshirt:":                                      "\U0001f455",
+			":tulip:":                                       "\U0001f337",
+			":tumbler_glass:":                               "\U0001f943",
+			":tunisia:":                                     "\U0001f1f9\U0001f1f3",
+			":turkey:":                                      "\U0001f983",
+			":turkmenistan:":                                "\U0001f1f9\U0001f1f2",
+			":turks_caicos_islands:":                        "\U0001f1f9\U0001f1e8",
+			":turtle:":                                      "\U0001f422",
+			":tuvalu:":                                      "\U0001f1f9\U0001f1fb",
+			":tv:":                                          "\U0001f4fa",
+			":twelve-thirty:":                               "\U0001f567",
+			":twelve_o’clock:":                              "\U0001f55b",
+			":twisted_rightwards_arrows:":                   "\U0001f500",
+			":two:":                                         "2\ufe0f\u20e3",
+			":two-hump_camel:":                              "\U0001f42b",
+			":two-thirty:":                                  "\U0001f55d",
+			":two_hearts:":                                  "\U0001f495",
+			":two_men_holding_hands:":                       "\U0001f46c",
+			":two_o’clock:":                                 "\U0001f551",
+			":two_women_holding_hands:":                     "\U0001f46d",
+			":u5272:":                                       "\U0001f239",
+			":u5408:":                                       "\U0001f234",
+			":u55b6:":                                       "\U0001f23a",
+			":u6307:":                                       "\U0001f22f",
+			":u6708:":                                       "\U0001f237\ufe0f",
+			":u6709:":                                       "\U0001f236",
+			":u6e80:":                                       "\U0001f235",
+			":u7121:":                                       "\U0001f21a",
+			":u7533:":                                       "\U0001f238",
+			":u7981:":                                       "\U0001f232",
+			":u7a7a:":                                       "\U0001f233",
+			":uganda:":                                      "\U0001f1fa\U0001f1ec",
+			":uk:":                                          "\U0001f1ec\U0001f1e7",
+			":ukraine:":                                     "\U0001f1fa\U0001f1e6",
+			":umbrella:":                                    "\u2602\ufe0f",
+			":umbrella2:":                                   "\u2602",
+			":umbrella_on_ground:":                          "\u26f1\ufe0f",
+			":umbrella_with_rain_drops:":                    "\u2614",
+			":unamused:":                                    "\U0001f612",
+			":unamused_face:":                               "\U0001f612",
+			":underage:":                                    "\U0001f51e",
+			":unicorn:":                                     "\U0001f984",
+			":unicorn_face:":                                "\U0001f984",
+			":united_arab_emirates:":                        "\U0001f1e6\U0001f1ea",
+			":united_nations:":                              "\U0001f1fa\U0001f1f3",
+			":unlock:":                                      "\U0001f513",
+			":unlocked:":                                    "\U0001f513",
+			":up:":                                          "\U0001f199",
+			":up-down_arrow:":                               "\u2195",
+			":up-left_arrow:":                               "\u2196",
+			":up-right_arrow:":                              "\u2197",
+			":up_arrow:":                                    "\u2b06",
+			":upside-down_face:":                            "\U0001f643",
+			":upside_down:":                                 "\U0001f643",
+			":upside_down_face:":                            "\U0001f643",
+			":upwards_button:":                              "\U0001f53c",
+			":urn:":                                         "\u26b1",
+			":uruguay:":                                     "\U0001f1fa\U0001f1fe",
+			":us:":                                          "\U0001f1fa\U0001f1f8",
+			":us_outlying_islands:":                         "\U0001f1fa\U0001f1f2",
+			":us_virgin_islands:":                           "\U0001f1fb\U0001f1ee",
+			":uzbekistan:":                                  "\U0001f1fa\U0001f1ff",
+			":v:":                                           "\u270c\ufe0f",
+			":v_tone1:":                                     "\u270c\U0001f3fb",
+			":v_tone2:":                                     "\u270c\U0001f3fc",
+			":v_tone3:":                                     "\u270c\U0001f3fd",
+			":v_tone4:":                                     "\u270c\U0001f3fe",
+			":v_tone5:":                                     "\u270c\U0001f3ff",
+			":vampire:":                                     "\U0001f9db\u200d\u2640\ufe0f",
+			":vampire_man:":                                 "\U0001f9db\u200d\u2642\ufe0f",
+			":vampire_tone1:":                               "\U0001f9db\U0001f3fb",
+			":vampire_tone2:":                               "\U0001f9db\U0001f3fc",
+			":vampire_tone3:":                               "\U0001f9db\U0001f3fd",
+			":vampire_tone4:":                               "\U0001f9db\U0001f3fe",
+			":vampire_tone5:":                               "\U0001f9db\U0001f3ff",
+			":vampire_woman:":                               "\U0001f9db\u200d\u2640\ufe0f",
+			":vanuatu:":                                     "\U0001f1fb\U0001f1fa",
+			":vatican_city:":                                "\U0001f1fb\U0001f1e6",
+			":venezuela:":                                   "\U0001f1fb\U0001f1ea",
+			":vertical_traffic_light:":                      "\U0001f6a6",
+			":vhs:":                                         "\U0001f4fc",
+			":vibration_mode:":                              "\U0001f4f3",
+			":victory_hand:":                                "\u270c",
+			":video_camera:":                                "\U0001f4f9",
+			":video_game:":                                  "\U0001f3ae",
+			":videocassette:":                               "\U0001f4fc",
+			":vietnam:":                                     "\U0001f1fb\U0001f1f3",
+			":violin:":                                      "\U0001f3bb",
+			":virgo:":                                       "\u264d",
+			":volcano:":                                     "\U0001f30b",
+			":volleyball:":                                  "\U0001f3d0",
+			":vomiting_face:":                               "\U0001f92e",
+			":vs:":                                          "\U0001f19a",
+			":vulcan:":                                      "\U0001f596",
+			":vulcan_salute:":                               "\U0001f596",
+			":vulcan_tone1:":                                "\U0001f596\U0001f3fb",
+			":vulcan_tone2:":                                "\U0001f596\U0001f3fc",
+			":vulcan_tone3:":                                "\U0001f596\U0001f3fd",
+			":vulcan_tone4:":                                "\U0001f596\U0001f3fe",
+			":vulcan_tone5:":                                "\U0001f596\U0001f3ff",
+			":waffle:":                                      "\U0001f9c7",
+			":wales:":                                       "\U0001f3f4\U000e0067\U000e0062\U000e0077\U000e006c\U000e0073\U000e007f",
+			":walking:":                                     "\U0001f6b6\u200d\u2642\ufe0f",
+			":walking_man:":                                 "\U0001f6b6\u200d\u2642\ufe0f",
+			":walking_woman:":                               "\U0001f6b6\u200d\u2640\ufe0f",
+			":wallis_futuna:":                               "\U0001f1fc\U0001f1eb",
+			":waning_crescent_moon:":                        "\U0001f318",
+			":waning_gibbous_moon:":                         "\U0001f316",
+			":warning:":                                     "\u26a0\ufe0f",
+			":wastebasket:":                                 "\U0001f5d1\ufe0f",
+			":watch:":                                       "\u231a",
+			":water_buffalo:":                               "\U0001f403",
+			":water_closet:":                                "\U0001f6be",
+			":water_pistol:":                                "\U0001f52b",
+			":water_polo:":                                  "\U0001f93d",
+			":water_wave:":                                  "\U0001f30a",
+			":watermelon:":                                  "\U0001f349",
+			":wave:":                                        "\U0001f44b",
+			":wave_tone1:":                                  "\U0001f44b\U0001f3fb",
+			":wave_tone2:":                                  "\U0001f44b\U0001f3fc",
+			":wave_tone3:":                                  "\U0001f44b\U0001f3fd",
+			":wave_tone4:":                                  "\U0001f44b\U0001f3fe",
+			":wave_tone5:":                                  "\U0001f44b\U0001f3ff",
+			":waving_black_flag:":                           "\U0001f3f4",
+			":waving_hand:":                                 "\U0001f44b",
+			":waving_white_flag:":                           "\U0001f3f3\ufe0f",
+			":wavy_dash:":                                   "\u3030\ufe0f",
+			":waxing_crescent_moon:":                        "\U0001f312",
+			":waxing_gibbous_moon:":                         "\U0001f314",
+			":wc:":                                          "\U0001f6be",
+			":weary:":                                       "\U0001f629",
+			":weary_cat:":                                   "\U0001f640",
+			":weary_face:":                                  "\U0001f629",
+			":wedding:":                                     "\U0001f492",
+			":weight_lifter:":                               "\U0001f3cb\ufe0f\u200d\u2642\ufe0f",
+			":weight_lifting:":                              "\U0001f3cb\ufe0f",
+			":weight_lifting_man:":                          "\U0001f3cb\ufe0f\u200d\u2642\ufe0f",
+			":weight_lifting_woman:":                        "\U0001f3cb\ufe0f\u200d\u2640\ufe0f",
+			":western_sahara:":                              "\U0001f1ea\U0001f1ed",
+			":whale:":                                       "\U0001f433",
+			":whale2:":                                      "\U0001f40b",
+			":wheel:":                                       "\U0001f6de",
+			":wheel_of_dharma:":                             "\u2638\ufe0f",
+			":wheelchair:":                                  "\u267f",
+			":wheelchair_symbol:":                           "\u267f",
+			":white_cane:":                                  "\U0001f9af",
+			":white_check_mark:":                            "\u2705",
+			":white_circle:":                                "\u26aa",
+			":white_exclamation_mark:":                      "\u2755",
+			":white_flag:":                                  "\U0001f3f3",
+			":white_flower:":                                "\U0001f4ae",
+			":white_frowning_face:":                         "\u2639\ufe0f",
+			":white_hair:":                                  "\U0001f9b3",
+			":white_haired_man:":                            "\U0001f468\u200d\U0001f9b3",
+			":white_haired_person:":                         "\U0001f9d1\u200d\U0001f9b3",
+			":white_haired_woman:":                          "\U0001f469\u200d\U0001f9b3",
+			":white_heart:":                                 "\U0001f90d",
+			":white_large_square:":                          "\u2b1c",
+			":white_medium-small_square:":                   "\u25fd",
+			":white_medium_small_square:":                   "\u25fd",
+			":white_medium_square:":                         "\u25fb\ufe0f",
+			":white_question_mark:":                         "\u2754",
+			":white_small_square:":                          "\u25ab\ufe0f",
+			":white_square_button:":                         "\U0001f533",
+			":white_sun_cloud:":                             "\U0001f325",
+			":white_sun_rain_cloud:":                        "\U0001f326",
+			":white_sun_small_cloud:":                       "\U0001f324",
+			":wilted_flower:":                               "\U0001f940",
+			":wilted_rose:":                                 "\U0001f940",
+			":wind_blowing_face:":                           "\U0001f32c\ufe0f",
+			":wind_chime:":                                  "\U0001f390",
+			":wind_face:":                                   "\U0001f32c",
+			":window:":                                      "\U0001fa9f",
+			":wine_glass:":                                  "\U0001f377",
+			":wing:":                                        "\U0001fabd",
+			":wink:":                                        "\U0001f609",
+			":winking_face:":                                "\U0001f609",
+			":winking_face_with_tongue:":                    "\U0001f61c",
+			":wireless:":                                    "\U0001f6dc",
+			":wolf:":                                        "\U0001f43a",
+			":woman:":                                       "\U0001f469",
+			":woman-biking:":                                "\U0001f6b4\u200d\u2640\ufe0f",
+			":woman-bouncing-ball:":                         "\u26f9\ufe0f\u200d\u2640\ufe0f",
+			":woman-bowing:":                                "\U0001f647\u200d\u2640\ufe0f",
+			":woman-boy:":                                   "\U0001f469\u200d\U0001f466",
+			":woman-boy-boy:":                               "\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":woman-cartwheeling:":                          "\U0001f938\u200d\u2640\ufe0f",
+			":woman-facepalming:":                           "\U0001f926\u200d\u2640\ufe0f",
+			":woman-frowning:":                              "\U0001f64d\u200d\u2640\ufe0f",
+			":woman-gesturing-no:":                          "\U0001f645\u200d\u2640\ufe0f",
+			":woman-gesturing-ok:":                          "\U0001f646\u200d\u2640\ufe0f",
+			":woman-getting-haircut:":                       "\U0001f487\u200d\u2640\ufe0f",
+			":woman-getting-massage:":                       "\U0001f486\u200d\u2640\ufe0f",
+			":woman-girl:":                                  "\U0001f469\u200d\U0001f467",
+			":woman-girl-boy:":                              "\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":woman-girl-girl:":                             "\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":woman-golfing:":                               "\U0001f3cc\ufe0f\u200d\u2640\ufe0f",
+			":woman-heart-man:":                             "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f468",
+			":woman-heart-woman:":                           "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f469",
+			":woman-juggling:":                              "\U0001f939\u200d\u2640\ufe0f",
+			":woman-kiss-man:":                              "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468",
+			":woman-kiss-woman:":                            "\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f469",
+			":woman-lifting-weights:":                       "\U0001f3cb\ufe0f\u200d\u2640\ufe0f",
+			":woman-mountain-biking:":                       "\U0001f6b5\u200d\u2640\ufe0f",
+			":woman-playing-handball:":                      "\U0001f93e\u200d\u2640\ufe0f",
+			":woman-playing-water-polo:":                    "\U0001f93d\u200d\u2640\ufe0f",
+			":woman-pouting:":                               "\U0001f64e\u200d\u2640\ufe0f",
+			":woman-raising-hand:":                          "\U0001f64b\u200d\u2640\ufe0f",
+			":woman-rowing-boat:":                           "\U0001f6a3\u200d\u2640\ufe0f",
+			":woman-running:":                               "\U0001f3c3\u200d\u2640\ufe0f",
+			":woman-shrugging:":                             "\U0001f937\u200d\u2640\ufe0f",
+			":woman-surfing:":                               "\U0001f3c4\u200d\u2640\ufe0f",
+			":woman-swimming:":                              "\U0001f3ca\u200d\u2640\ufe0f",
+			":woman-tipping-hand:":                          "\U0001f481\u200d\u2640\ufe0f",
+			":woman-walking:":                               "\U0001f6b6\u200d\u2640\ufe0f",
+			":woman-wearing-turban:":                        "\U0001f473\u200d\u2640\ufe0f",
+			":woman-woman-boy:":                             "\U0001f469\u200d\U0001f469\u200d\U0001f466",
+			":woman-woman-boy-boy:":                         "\U0001f469\u200d\U0001f469\u200d\U0001f466\u200d\U0001f466",
+			":woman-woman-girl:":                            "\U0001f469\u200d\U0001f469\u200d\U0001f467",
+			":woman-woman-girl-boy:":                        "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f466",
+			":woman-woman-girl-girl:":                       "\U0001f469\u200d\U0001f469\u200d\U0001f467\u200d\U0001f467",
+			":woman-wrestling:":                             "\U0001f93c\u200d\u2640\ufe0f",
+			":woman_and_man_holding_hands:":                 "\U0001f46b",
+			":woman_artist:":                                "\U0001f469\u200d\U0001f3a8",
+			":woman_artist_tone1:":                          "\U0001f469\U0001f3fb\u200d\U0001f3a8",
+			":woman_artist_tone2:":                          "\U0001f469\U0001f3fc\u200d\U0001f3a8",
+			":woman_artist_tone3:":                          "\U0001f469\U0001f3fd\u200d\U0001f3a8",
+			":woman_artist_tone4:":                          "\U0001f469\U0001f3fe\u200d\U0001f3a8",
+			":woman_artist_tone5:":                          "\U0001f469\U0001f3ff\u200d\U0001f3a8",
+			":woman_astronaut:":                             "\U0001f469\u200d\U0001f680",
+			":woman_astronaut_tone1:":                       "\U0001f469\U0001f3fb\u200d\U0001f680",
+			":woman_astronaut_tone2:":                       "\U0001f469\U0001f3fc\u200d\U0001f680",
+			":woman_astronaut_tone3:":                       "\U0001f469\U0001f3fd\u200d\U0001f680",
+			":woman_astronaut_tone4:":                       "\U0001f469\U0001f3fe\u200d\U0001f680",
+			":woman_astronaut_tone5:":                       "\U0001f469\U0001f3ff\u200d\U0001f680",
+			":woman_bald:":                                  "\U0001f469\u200d\U0001f9b2",
+			":woman_beard:":                                 "\U0001f9d4\u200d\u2640\ufe0f",
+			":woman_biking:":                                "\U0001f6b4\u200d\u2640\ufe0f",
+			":woman_biking_tone1:":                          "\U0001f6b4\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_biking_tone2:":                          "\U0001f6b4\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_biking_tone3:":                          "\U0001f6b4\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_biking_tone4:":                          "\U0001f6b4\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_biking_tone5:":                          "\U0001f6b4\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_blond_hair:":                            "\U0001f471\u200d\u2640\ufe0f",
+			":woman_bouncing_ball:":                         "\u26f9\ufe0f\u200d\u2640\ufe0f",
+			":woman_bouncing_ball_tone1:":                   "\u26f9\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_bouncing_ball_tone2:":                   "\u26f9\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_bouncing_ball_tone3:":                   "\u26f9\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_bouncing_ball_tone4:":                   "\u26f9\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_bouncing_ball_tone5:":                   "\u26f9\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_bowing:":                                "\U0001f647\u200d\u2640\ufe0f",
+			":woman_bowing_tone1:":                          "\U0001f647\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_bowing_tone2:":                          "\U0001f647\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_bowing_tone3:":                          "\U0001f647\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_bowing_tone4:":                          "\U0001f647\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_bowing_tone5:":                          "\U0001f647\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_cartwheeling:":                          "\U0001f938\u200d\u2640\ufe0f",
+			":woman_cartwheeling_tone1:":                    "\U0001f938\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_cartwheeling_tone2:":                    "\U0001f938\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_cartwheeling_tone3:":                    "\U0001f938\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_cartwheeling_tone4:":                    "\U0001f938\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_cartwheeling_tone5:":                    "\U0001f938\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_climbing:":                              "\U0001f9d7\u200d\u2640\ufe0f",
+			":woman_climbing_tone1:":                        "\U0001f9d7\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_climbing_tone2:":                        "\U0001f9d7\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_climbing_tone3:":                        "\U0001f9d7\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_climbing_tone4:":                        "\U0001f9d7\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_climbing_tone5:":                        "\U0001f9d7\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_construction_worker:":                   "\U0001f477\u200d\u2640\ufe0f",
+			":woman_construction_worker_tone1:":             "\U0001f477\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_construction_worker_tone2:":             "\U0001f477\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_construction_worker_tone3:":             "\U0001f477\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_construction_worker_tone4:":             "\U0001f477\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_construction_worker_tone5:":             "\U0001f477\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_cook:":                                  "\U0001f469\u200d\U0001f373",
+			":woman_cook_tone1:":                            "\U0001f469\U0001f3fb\u200d\U0001f373",
+			":woman_cook_tone2:":                            "\U0001f469\U0001f3fc\u200d\U0001f373",
+			":woman_cook_tone3:":                            "\U0001f469\U0001f3fd\u200d\U0001f373",
+			":woman_cook_tone4:":                            "\U0001f469\U0001f3fe\u200d\U0001f373",
+			":woman_cook_tone5:":                            "\U0001f469\U0001f3ff\u200d\U0001f373",
+			":woman_curly_hair:":                            "\U0001f469\u200d\U0001f9b1",
+			":woman_dancing:":                               "\U0001f483",
+			":woman_detective:":                             "\U0001f575\ufe0f\u200d\u2640\ufe0f",
+			":woman_detective_tone1:":                       "\U0001f575\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_detective_tone2:":                       "\U0001f575\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_detective_tone3:":                       "\U0001f575\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_detective_tone4:":                       "\U0001f575\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_detective_tone5:":                       "\U0001f575\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_elf:":                                   "\U0001f9dd\u200d\u2640\ufe0f",
+			":woman_elf_tone1:":                             "\U0001f9dd\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_elf_tone2:":                             "\U0001f9dd\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_elf_tone3:":                             "\U0001f9dd\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_elf_tone4:":                             "\U0001f9dd\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_elf_tone5:":                             "\U0001f9dd\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_facepalming:":                           "\U0001f926\u200d\u2640\ufe0f",
+			":woman_facepalming_tone1:":                     "\U0001f926\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_facepalming_tone2:":                     "\U0001f926\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_facepalming_tone3:":                     "\U0001f926\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_facepalming_tone4:":                     "\U0001f926\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_facepalming_tone5:":                     "\U0001f926\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_factory_worker:":                        "\U0001f469\u200d\U0001f3ed",
+			":woman_factory_worker_tone1:":                  "\U0001f469\U0001f3fb\u200d\U0001f3ed",
+			":woman_factory_worker_tone2:":                  "\U0001f469\U0001f3fc\u200d\U0001f3ed",
+			":woman_factory_worker_tone3:":                  "\U0001f469\U0001f3fd\u200d\U0001f3ed",
+			":woman_factory_worker_tone4:":                  "\U0001f469\U0001f3fe\u200d\U0001f3ed",
+			":woman_factory_worker_tone5:":                  "\U0001f469\U0001f3ff\u200d\U0001f3ed",
+			":woman_fairy:":                                 "\U0001f9da\u200d\u2640\ufe0f",
+			":woman_fairy_tone1:":                           "\U0001f9da\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_fairy_tone2:":                           "\U0001f9da\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_fairy_tone3:":                           "\U0001f9da\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_fairy_tone4:":                           "\U0001f9da\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_fairy_tone5:":                           "\U0001f9da\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_farmer:":                                "\U0001f469\u200d\U0001f33e",
+			":woman_farmer_tone1:":                          "\U0001f469\U0001f3fb\u200d\U0001f33e",
+			":woman_farmer_tone2:":                          "\U0001f469\U0001f3fc\u200d\U0001f33e",
+			":woman_farmer_tone3:":                          "\U0001f469\U0001f3fd\u200d\U0001f33e",
+			":woman_farmer_tone4:":                          "\U0001f469\U0001f3fe\u200d\U0001f33e",
+			":woman_farmer_tone5:":                          "\U0001f469\U0001f3ff\u200d\U0001f33e",
+			":woman_feeding_baby:":                          "\U0001f469\u200d\U0001f37c",
+			":woman_firefighter:":                           "\U0001f469\u200d\U0001f692",
+			":woman_firefighter_tone1:":                     "\U0001f469\U0001f3fb\u200d\U0001f692",
+			":woman_firefighter_tone2:":                     "\U0001f469\U0001f3fc\u200d\U0001f692",
+			":woman_firefighter_tone3:":                     "\U0001f469\U0001f3fd\u200d\U0001f692",
+			":woman_firefighter_tone4:":                     "\U0001f469\U0001f3fe\u200d\U0001f692",
+			":woman_firefighter_tone5:":                     "\U0001f469\U0001f3ff\u200d\U0001f692",
+			":woman_frowning:":                              "\U0001f64d\u200d\u2640\ufe0f",
+			":woman_frowning_tone1:":                        "\U0001f64d\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_frowning_tone2:":                        "\U0001f64d\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_frowning_tone3:":                        "\U0001f64d\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_frowning_tone4:":                        "\U0001f64d\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_frowning_tone5:":                        "\U0001f64d\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_genie:":                                 "\U0001f9de\u200d\u2640\ufe0f",
+			":woman_gesturing_NO:":                          "\U0001f645\u200d\u2640\ufe0f",
+			":woman_gesturing_OK:":                          "\U0001f646\u200d\u2640\ufe0f",
+			":woman_gesturing_no:":                          "\U0001f645\u200d\u2640\ufe0f",
+			":woman_gesturing_no_tone1:":                    "\U0001f645\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_gesturing_no_tone2:":                    "\U0001f645\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_gesturing_no_tone3:":                    "\U0001f645\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_gesturing_no_tone4:":                    "\U0001f645\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_gesturing_no_tone5:":                    "\U0001f645\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_gesturing_ok:":                          "\U0001f646\u200d\u2640\ufe0f",
+			":woman_gesturing_ok_tone1:":                    "\U0001f646\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_gesturing_ok_tone2:":                    "\U0001f646\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_gesturing_ok_tone3:":                    "\U0001f646\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_gesturing_ok_tone4:":                    "\U0001f646\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_gesturing_ok_tone5:":                    "\U0001f646\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_getting_face_massage:":                  "\U0001f486\u200d\u2640\ufe0f",
+			":woman_getting_face_massage_tone1:":            "\U0001f486\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_getting_face_massage_tone2:":            "\U0001f486\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_getting_face_massage_tone3:":            "\U0001f486\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_getting_face_massage_tone4:":            "\U0001f486\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_getting_face_massage_tone5:":            "\U0001f486\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_getting_haircut:":                       "\U0001f487\u200d\u2640\ufe0f",
+			":woman_getting_haircut_tone1:":                 "\U0001f487\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_getting_haircut_tone2:":                 "\U0001f487\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_getting_haircut_tone3:":                 "\U0001f487\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_getting_haircut_tone4:":                 "\U0001f487\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_getting_haircut_tone5:":                 "\U0001f487\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_getting_massage:":                       "\U0001f486\u200d\u2640\ufe0f",
+			":woman_golfing:":                               "\U0001f3cc\ufe0f\u200d\u2640\ufe0f",
+			":woman_golfing_tone1:":                         "\U0001f3cc\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_golfing_tone2:":                         "\U0001f3cc\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_golfing_tone3:":                         "\U0001f3cc\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_golfing_tone4:":                         "\U0001f3cc\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_golfing_tone5:":                         "\U0001f3cc\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_guard:":                                 "\U0001f482\u200d\u2640\ufe0f",
+			":woman_guard_tone1:":                           "\U0001f482\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_guard_tone2:":                           "\U0001f482\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_guard_tone3:":                           "\U0001f482\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_guard_tone4:":                           "\U0001f482\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_guard_tone5:":                           "\U0001f482\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_health_worker:":                         "\U0001f469\u200d\u2695\ufe0f",
+			":woman_health_worker_tone1:":                   "\U0001f469\U0001f3fb\u200d\u2695\ufe0f",
+			":woman_health_worker_tone2:":                   "\U0001f469\U0001f3fc\u200d\u2695\ufe0f",
+			":woman_health_worker_tone3:":                   "\U0001f469\U0001f3fd\u200d\u2695\ufe0f",
+			":woman_health_worker_tone4:":                   "\U0001f469\U0001f3fe\u200d\u2695\ufe0f",
+			":woman_health_worker_tone5:":                   "\U0001f469\U0001f3ff\u200d\u2695\ufe0f",
+			":woman_in_lotus_position:":                     "\U0001f9d8\u200d\u2640\ufe0f",
+			":woman_in_lotus_position_tone1:":               "\U0001f9d8\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_in_lotus_position_tone2:":               "\U0001f9d8\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_in_lotus_position_tone3:":               "\U0001f9d8\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_in_lotus_position_tone4:":               "\U0001f9d8\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_in_lotus_position_tone5:":               "\U0001f9d8\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_in_manual_wheelchair:":                  "\U0001f469\u200d\U0001f9bd",
+			":woman_in_manual_wheelchair_facing_right:":    "\U0001f469\u200d\U0001f9bd\u200d\u27a1\ufe0f",
+			":woman_in_motorized_wheelchair:":              "\U0001f469\u200d\U0001f9bc",
+			":woman_in_motorized_wheelchair_facing_right:": "\U0001f469\u200d\U0001f9bc\u200d\u27a1\ufe0f",
+			":woman_in_steamy_room:":                       "\U0001f9d6\u200d\u2640\ufe0f",
+			":woman_in_steamy_room_tone1:":                 "\U0001f9d6\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_in_steamy_room_tone2:":                 "\U0001f9d6\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_in_steamy_room_tone3:":                 "\U0001f9d6\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_in_steamy_room_tone4:":                 "\U0001f9d6\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_in_steamy_room_tone5:":                 "\U0001f9d6\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_in_tuxedo:":                            "\U0001f935\u200d\u2640\ufe0f",
+			":woman_judge:":                                "\U0001f469\u200d\u2696\ufe0f",
+			":woman_judge_tone1:":                          "\U0001f469\U0001f3fb\u200d\u2696\ufe0f",
+			":woman_judge_tone2:":                          "\U0001f469\U0001f3fc\u200d\u2696\ufe0f",
+			":woman_judge_tone3:":                          "\U0001f469\U0001f3fd\u200d\u2696\ufe0f",
+			":woman_judge_tone4:":                          "\U0001f469\U0001f3fe\u200d\u2696\ufe0f",
+			":woman_judge_tone5:":                          "\U0001f469\U0001f3ff\u200d\u2696\ufe0f",
+			":woman_juggling:":                             "\U0001f939\u200d\u2640\ufe0f",
+			":woman_juggling_tone1:":                       "\U0001f939\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_juggling_tone2:":                       "\U0001f939\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_juggling_tone3:":                       "\U0001f939\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_juggling_tone4:":                       "\U0001f939\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_juggling_tone5:":                       "\U0001f939\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_kneeling:":                             "\U0001f9ce\u200d\u2640\ufe0f",
+			":woman_kneeling_facing_right:":                "\U0001f9ce\u200d\u2640\ufe0f\u200d\u27a1\ufe0f",
+			":woman_lifting_weights:":                      "\U0001f3cb\ufe0f\u200d\u2640\ufe0f",
+			":woman_lifting_weights_tone1:":                "\U0001f3cb\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_lifting_weights_tone2:":                "\U0001f3cb\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_lifting_weights_tone3:":                "\U0001f3cb\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_lifting_weights_tone4:":                "\U0001f3cb\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_lifting_weights_tone5:":                "\U0001f3cb\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_mage:":                                 "\U0001f9d9\u200d\u2640\ufe0f",
+			":woman_mage_tone1:":                           "\U0001f9d9\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_mage_tone2:":                           "\U0001f9d9\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_mage_tone3:":                           "\U0001f9d9\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_mage_tone4:":                           "\U0001f9d9\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_mage_tone5:":                           "\U0001f9d9\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_mechanic:":                             "\U0001f469\u200d\U0001f527",
+			":woman_mechanic_tone1:":                       "\U0001f469\U0001f3fb\u200d\U0001f527",
+			":woman_mechanic_tone2:":                       "\U0001f469\U0001f3fc\u200d\U0001f527",
+			":woman_mechanic_tone3:":                       "\U0001f469\U0001f3fd\u200d\U0001f527",
+			":woman_mechanic_tone4:":                       "\U0001f469\U0001f3fe\u200d\U0001f527",
+			":woman_mechanic_tone5:":                       "\U0001f469\U0001f3ff\u200d\U0001f527",
+			":woman_mountain_biking:":                      "\U0001f6b5\u200d\u2640\ufe0f",
+			":woman_mountain_biking_tone1:":                "\U0001f6b5\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_mountain_biking_tone2:":                "\U0001f6b5\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_mountain_biking_tone3:":                "\U0001f6b5\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_mountain_biking_tone4:":                "\U0001f6b5\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_mountain_biking_tone5:":                "\U0001f6b5\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_office_worker:":                        "\U0001f469\u200d\U0001f4bc",
+			":woman_office_worker_tone1:":                  "\U0001f469\U0001f3fb\u200d\U0001f4bc",
+			":woman_office_worker_tone2:":                  "\U0001f469\U0001f3fc\u200d\U0001f4bc",
+			":woman_office_worker_tone3:":                  "\U0001f469\U0001f3fd\u200d\U0001f4bc",
+			":woman_office_worker_tone4:":                  "\U0001f469\U0001f3fe\u200d\U0001f4bc",
+			":woman_office_worker_tone5:":                  "\U0001f469\U0001f3ff\u200d\U0001f4bc",
+			":woman_pilot:":                                "\U0001f469\u200d\u2708\ufe0f",
+			":woman_pilot_tone1:":                          "\U0001f469\U0001f3fb\u200d\u2708\ufe0f",
+			":woman_pilot_tone2:":                          "\U0001f469\U0001f3fc\u200d\u2708\ufe0f",
+			":woman_pilot_tone3:":                          "\U0001f469\U0001f3fd\u200d\u2708\ufe0f",
+			":woman_pilot_tone4:":                          "\U0001f469\U0001f3fe\u200d\u2708\ufe0f",
+			":woman_pilot_tone5:":                          "\U0001f469\U0001f3ff\u200d\u2708\ufe0f",
+			":woman_playing_handball:":                     "\U0001f93e\u200d\u2640\ufe0f",
+			":woman_playing_handball_tone1:":               "\U0001f93e\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_playing_handball_tone2:":               "\U0001f93e\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_playing_handball_tone3:":               "\U0001f93e\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_playing_handball_tone4:":               "\U0001f93e\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_playing_handball_tone5:":               "\U0001f93e\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_playing_water_polo:":                   "\U0001f93d\u200d\u2640\ufe0f",
+			":woman_playing_water_polo_tone1:":             "\U0001f93d\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_playing_water_polo_tone2:":             "\U0001f93d\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_playing_water_polo_tone3:":             "\U0001f93d\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_playing_water_polo_tone4:":             "\U0001f93d\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_playing_water_polo_tone5:":             "\U0001f93d\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_police_officer:":                       "\U0001f46e\u200d\u2640\ufe0f",
+			":woman_police_officer_tone1:":                 "\U0001f46e\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_police_officer_tone2:":                 "\U0001f46e\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_police_officer_tone3:":                 "\U0001f46e\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_police_officer_tone4:":                 "\U0001f46e\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_police_officer_tone5:":                 "\U0001f46e\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_pouting:":                              "\U0001f64e\u200d\u2640\ufe0f",
+			":woman_pouting_tone1:":                        "\U0001f64e\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_pouting_tone2:":                        "\U0001f64e\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_pouting_tone3:":                        "\U0001f64e\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_pouting_tone4:":                        "\U0001f64e\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_pouting_tone5:":                        "\U0001f64e\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_raising_hand:":                         "\U0001f64b\u200d\u2640\ufe0f",
+			":woman_raising_hand_tone1:":                   "\U0001f64b\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_raising_hand_tone2:":                   "\U0001f64b\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_raising_hand_tone3:":                   "\U0001f64b\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_raising_hand_tone4:":                   "\U0001f64b\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_raising_hand_tone5:":                   "\U0001f64b\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_red_hair:":                             "\U0001f469\u200d\U0001f9b0",
+			":woman_rowing_boat:":                          "\U0001f6a3\u200d\u2640\ufe0f",
+			":woman_rowing_boat_tone1:":                    "\U0001f6a3\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_rowing_boat_tone2:":                    "\U0001f6a3\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_rowing_boat_tone3:":                    "\U0001f6a3\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_rowing_boat_tone4:":                    "\U0001f6a3\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_rowing_boat_tone5:":                    "\U0001f6a3\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_running:":                              "\U0001f3c3\u200d\u2640\ufe0f",
+			":woman_running_facing_right:":                 "\U0001f3c3\u200d\u2640\ufe0f\u200d\u27a1\ufe0f",
+			":woman_running_tone1:":                        "\U0001f3c3\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_running_tone2:":                        "\U0001f3c3\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_running_tone3:":                        "\U0001f3c3\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_running_tone4:":                        "\U0001f3c3\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_running_tone5:":                        "\U0001f3c3\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_scientist:":                            "\U0001f469\u200d\U0001f52c",
+			":woman_scientist_tone1:":                      "\U0001f469\U0001f3fb\u200d\U0001f52c",
+			":woman_scientist_tone2:":                      "\U0001f469\U0001f3fc\u200d\U0001f52c",
+			":woman_scientist_tone3:":                      "\U0001f469\U0001f3fd\u200d\U0001f52c",
+			":woman_scientist_tone4:":                      "\U0001f469\U0001f3fe\u200d\U0001f52c",
+			":woman_scientist_tone5:":                      "\U0001f469\U0001f3ff\u200d\U0001f52c",
+			":woman_shrugging:":                            "\U0001f937\u200d\u2640\ufe0f",
+			":woman_shrugging_tone1:":                      "\U0001f937\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_shrugging_tone2:":                      "\U0001f937\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_shrugging_tone3:":                      "\U0001f937\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_shrugging_tone4:":                      "\U0001f937\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_shrugging_tone5:":                      "\U0001f937\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_singer:":                               "\U0001f469\u200d\U0001f3a4",
+			":woman_singer_tone1:":                         "\U0001f469\U0001f3fb\u200d\U0001f3a4",
+			":woman_singer_tone2:":                         "\U0001f469\U0001f3fc\u200d\U0001f3a4",
+			":woman_singer_tone3:":                         "\U0001f469\U0001f3fd\u200d\U0001f3a4",
+			":woman_singer_tone4:":                         "\U0001f469\U0001f3fe\u200d\U0001f3a4",
+			":woman_singer_tone5:":                         "\U0001f469\U0001f3ff\u200d\U0001f3a4",
+			":woman_standing:":                             "\U0001f9cd\u200d\u2640\ufe0f",
+			":woman_student:":                              "\U0001f469\u200d\U0001f393",
+			":woman_student_tone1:":                        "\U0001f469\U0001f3fb\u200d\U0001f393",
+			":woman_student_tone2:":                        "\U0001f469\U0001f3fc\u200d\U0001f393",
+			":woman_student_tone3:":                        "\U0001f469\U0001f3fd\u200d\U0001f393",
+			":woman_student_tone4:":                        "\U0001f469\U0001f3fe\u200d\U0001f393",
+			":woman_student_tone5:":                        "\U0001f469\U0001f3ff\u200d\U0001f393",
+			":woman_superhero:":                            "\U0001f9b8\u200d\u2640\ufe0f",
+			":woman_supervillain:":                         "\U0001f9b9\u200d\u2640\ufe0f",
+			":woman_surfing:":                              "\U0001f3c4\u200d\u2640\ufe0f",
+			":woman_surfing_tone1:":                        "\U0001f3c4\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_surfing_tone2:":                        "\U0001f3c4\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_surfing_tone3:":                        "\U0001f3c4\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_surfing_tone4:":                        "\U0001f3c4\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_surfing_tone5:":                        "\U0001f3c4\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_swimming:":                             "\U0001f3ca\u200d\u2640\ufe0f",
+			":woman_swimming_tone1:":                       "\U0001f3ca\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_swimming_tone2:":                       "\U0001f3ca\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_swimming_tone3:":                       "\U0001f3ca\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_swimming_tone4:":                       "\U0001f3ca\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_swimming_tone5:":                       "\U0001f3ca\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_teacher:":                              "\U0001f469\u200d\U0001f3eb",
+			":woman_teacher_tone1:":                        "\U0001f469\U0001f3fb\u200d\U0001f3eb",
+			":woman_teacher_tone2:":                        "\U0001f469\U0001f3fc\u200d\U0001f3eb",
+			":woman_teacher_tone3:":                        "\U0001f469\U0001f3fd\u200d\U0001f3eb",
+			":woman_teacher_tone4:":                        "\U0001f469\U0001f3fe\u200d\U0001f3eb",
+			":woman_teacher_tone5:":                        "\U0001f469\U0001f3ff\u200d\U0001f3eb",
+			":woman_technologist:":                         "\U0001f469\u200d\U0001f4bb",
+			":woman_technologist_tone1:":                   "\U0001f469\U0001f3fb\u200d\U0001f4bb",
+			":woman_technologist_tone2:":                   "\U0001f469\U0001f3fc\u200d\U0001f4bb",
+			":woman_technologist_tone3:":                   "\U0001f469\U0001f3fd\u200d\U0001f4bb",
+			":woman_technologist_tone4:":                   "\U0001f469\U0001f3fe\u200d\U0001f4bb",
+			":woman_technologist_tone5:":                   "\U0001f469\U0001f3ff\u200d\U0001f4bb",
+			":woman_tipping_hand:":                         "\U0001f481\u200d\u2640\ufe0f",
+			":woman_tipping_hand_tone1:":                   "\U0001f481\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_tipping_hand_tone2:":                   "\U0001f481\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_tipping_hand_tone3:":                   "\U0001f481\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_tipping_hand_tone4:":                   "\U0001f481\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_tipping_hand_tone5:":                   "\U0001f481\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_tone1:":                                "\U0001f469\U0001f3fb",
+			":woman_tone2:":                                "\U0001f469\U0001f3fc",
+			":woman_tone3:":                                "\U0001f469\U0001f3fd",
+			":woman_tone4:":                                "\U0001f469\U0001f3fe",
+			":woman_tone5:":                                "\U0001f469\U0001f3ff",
+			":woman_vampire:":                              "\U0001f9db\u200d\u2640\ufe0f",
+			":woman_vampire_tone1:":                        "\U0001f9db\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_vampire_tone2:":                        "\U0001f9db\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_vampire_tone3:":                        "\U0001f9db\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_vampire_tone4:":                        "\U0001f9db\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_vampire_tone5:":                        "\U0001f9db\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_walking:":                              "\U0001f6b6\u200d\u2640\ufe0f",
+			":woman_walking_facing_right:":                 "\U0001f6b6\u200d\u2640\ufe0f\u200d\u27a1\ufe0f",
+			":woman_walking_tone1:":                        "\U0001f6b6\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_walking_tone2:":                        "\U0001f6b6\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_walking_tone3:":                        "\U0001f6b6\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_walking_tone4:":                        "\U0001f6b6\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_walking_tone5:":                        "\U0001f6b6\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_wearing_turban:":                       "\U0001f473\u200d\u2640\ufe0f",
+			":woman_wearing_turban_tone1:":                 "\U0001f473\U0001f3fb\u200d\u2640\ufe0f",
+			":woman_wearing_turban_tone2:":                 "\U0001f473\U0001f3fc\u200d\u2640\ufe0f",
+			":woman_wearing_turban_tone3:":                 "\U0001f473\U0001f3fd\u200d\u2640\ufe0f",
+			":woman_wearing_turban_tone4:":                 "\U0001f473\U0001f3fe\u200d\u2640\ufe0f",
+			":woman_wearing_turban_tone5:":                 "\U0001f473\U0001f3ff\u200d\u2640\ufe0f",
+			":woman_white_hair:":                           "\U0001f469\u200d\U0001f9b3",
+			":woman_with_beard:":                           "\U0001f9d4\u200d\u2640\ufe0f",
+			":woman_with_headscarf:":                       "\U0001f9d5",
+			":woman_with_headscarf_tone1:":                 "\U0001f9d5\U0001f3fb",
+			":woman_with_headscarf_tone2:":                 "\U0001f9d5\U0001f3fc",
+			":woman_with_headscarf_tone3:":                 "\U0001f9d5\U0001f3fd",
+			":woman_with_headscarf_tone4:":                 "\U0001f9d5\U0001f3fe",
+			":woman_with_headscarf_tone5:":                 "\U0001f9d5\U0001f3ff",
+			":woman_with_probing_cane:":                    "\U0001f469\u200d\U0001f9af",
+			":woman_with_turban:":                          "\U0001f473\u200d\u2640\ufe0f",
+			":woman_with_veil:":                            "\U0001f470\u200d\u2640\ufe0f",
+			":woman_with_white_cane:":                      "\U0001f469\u200d\U0001f9af",
+			":woman_with_white_cane_facing_right:":         "\U0001f469\u200d\U0001f9af\u200d\u27a1\ufe0f",
+			":woman_zombie:":                               "\U0001f9df\u200d\u2640\ufe0f",
+			":womans_clothes:":                             "\U0001f45a",
+			":womans_flat_shoe:":                           "\U0001f97f",
+			":womans_hat:":                                 "\U0001f452",
+			":woman’s_boot:":                               "\U0001f462",
+			":woman’s_clothes:":                            "\U0001f45a",
+			":woman’s_hat:":                                "\U0001f452",
+			":woman’s_sandal:":                             "\U0001f461",
+			":women-with-bunny-ears-partying:":             "\U0001f46f\u200d\u2640\ufe0f",
+			":women_holding_hands:":                        "\U0001f46d",
+			":women_with_bunny_ears:":                      "\U0001f46f\u200d\u2640\ufe0f",
+			":women_with_bunny_ears_partying:":             "\U0001f46f\u200d\u2640\ufe0f",
+			":women_wrestling:":                            "\U0001f93c\u200d\u2640\ufe0f",
+			":womens:":                                     "\U0001f6ba",
+			":women’s_room:":                               "\U0001f6ba",
+			":wood:":                                       "\U0001fab5",
+			":woozy_face:":                                 "\U0001f974",
+			":world_map:":                                  "\U0001f5fa\ufe0f",
+			":worm:":                                       "\U0001fab1",
+			":worried:":                                    "\U0001f61f",
+			":worried_face:":                               "\U0001f61f",
+			":wrapped_gift:":                               "\U0001f381",
+			":wrench:":                                     "\U0001f527",
+			":wrestlers:":                                  "\U0001f93c",
+			":wrestling:":                                  "\U0001f93c",
+			":writing_hand:":                               "\u270d\ufe0f",
+			":writing_hand_tone1:":                         "\u270d\U0001f3fb",
+			":writing_hand_tone2:":                         "\u270d\U0001f3fc",
+			":writing_hand_tone3:":                         "\u270d\U0001f3fd",
+			":writing_hand_tone4:":                         "\u270d\U0001f3fe",
+			":writing_hand_tone5:":                         "\u270d\U0001f3ff",
+			":x:":                                          "\u274c",
+			":x-ray:":                                      "\U0001fa7b",
+			":x_ray:":                                      "\U0001fa7b",
+			":yarn:":                                       "\U0001f9f6",
+			":yawning_face:":                               "\U0001f971",
+			":yellow_circle:":                              "\U0001f7e1",
+			":yellow_heart:":                               "\U0001f49b",
+			":yellow_square:":                              "\U0001f7e8",
+			":yemen:":                                      "\U0001f1fe\U0001f1ea",
+			":yen:":                                        "\U0001f4b4",
+			":yen_banknote:":                               "\U0001f4b4",
+			":yin_yang:":                                   "\u262f\ufe0f",
+			":yo-yo:":                                      "\U0001fa80",
+			":yo_yo:":                                      "\U0001fa80",
+			":yum:":                                        "\U0001f60b",
+			":zambia:":                                     "\U0001f1ff\U0001f1f2",
+			":zany_face:":                                  "\U0001f92a",
+			":zap:":                                        "\u26a1",
+			":zebra:":                                      "\U0001f993",
+			":zebra_face:":                                 "\U0001f993",
+			":zero:":                                       "0\ufe0f\u20e3",
+			":zimbabwe:":                                   "\U0001f1ff\U0001f1fc",
+			":zipper-mouth_face:":                          "\U0001f910",
+			":zipper_mouth:":                               "\U0001f910",
+			":zipper_mouth_face:":                          "\U0001f910",
+			":zombie:":                                     "\U0001f9df\u200d\u2642\ufe0f",
+			":zombie_man:":                                 "\U0001f9df\u200d\u2642\ufe0f",
+			":zombie_woman:":                               "\U0001f9df\u200d\u2640\ufe0f",
+			":zzz:":                                        "\U0001f4a4",
 		}
 	})
 	return emojiCodeMap
@@ -4789,6 +4899,7 @@ func emojiRevCode() map[string][]string {
 			"\U0001f1e8\U0001f1f3":                   {":cn:", ":flag_cn:", ":flag_China:"},
 			"\U0001f1e8\U0001f1f4":                   {":flag-co:", ":flag_co:", ":colombia:", ":flag_Colombia:"},
 			"\U0001f1e8\U0001f1f5":                   {":flag-cp:", ":flag_cp:", ":clipperton_island:", ":flag_Clipperton_Island:"},
+			"\U0001f1e8\U0001f1f6":                   {":flag-sark:", ":flag_Sark:"},
 			"\U0001f1e8\U0001f1f7":                   {":flag-cr:", ":flag_cr:", ":costa_rica:", ":flag_Costa_Rica:"},
 			"\U0001f1e8\U0001f1fa":                   {":cuba:", ":flag-cu:", ":flag_cu:", ":flag_Cuba:"},
 			"\U0001f1e8\U0001f1fb":                   {":flag-cv:", ":flag_cv:", ":cape_verde:", ":flag_Cape_Verde:"},
@@ -4969,7 +5080,7 @@ func emojiRevCode() map[string][]string {
 			"\U0001f1f9\U0001f1f2":                   {":flag-tm:", ":flag_tm:", ":turkmenistan:", ":flag_Turkmenistan:"},
 			"\U0001f1f9\U0001f1f3":                   {":flag-tn:", ":flag_tn:", ":tunisia:", ":flag_Tunisia:"},
 			"\U0001f1f9\U0001f1f4":                   {":tonga:", ":flag-to:", ":flag_to:", ":flag_Tonga:"},
-			"\U0001f1f9\U0001f1f7":                   {":tr:", ":flag-tr:", ":flag_tr:", ":flag_Turkey:"},
+			"\U0001f1f9\U0001f1f7":                   {":tr:", ":flag-tr:", ":flag_tr:", ":flag_Türkiye:"},
 			"\U0001f1f9\U0001f1f9":                   {":flag-tt:", ":flag_tt:", ":trinidad_tobago:", ":flag_Trinidad_&_Tobago:"},
 			"\U0001f1f9\U0001f1fb":                   {":tuvalu:", ":flag-tv:", ":flag_tv:", ":flag_Tuvalu:"},
 			"\U0001f1f9\U0001f1fc":                   {":taiwan:", ":flag-tw:", ":flag_tw:", ":flag_Taiwan:"},
@@ -5088,6 +5199,7 @@ func emojiRevCode() map[string][]string {
 			"\U0001f342":                             {":fallen_leaf:"},
 			"\U0001f343":                             {":leaves:", ":leaf_fluttering_in_wind:"},
 			"\U0001f344":                             {":mushroom:"},
+			"\U0001f344\u200d\U0001f7eb":             {":brown_mushroom:"},
 			"\U0001f345":                             {":tomato:"},
 			"\U0001f346":                             {":eggplant:"},
 			"\U0001f347":                             {":grapes:"},
@@ -5095,6 +5207,7 @@ func emojiRevCode() map[string][]string {
 			"\U0001f349":                             {":watermelon:"},
 			"\U0001f34a":                             {":orange:", ":mandarin:", ":tangerine:"},
 			"\U0001f34b":                             {":lemon:"},
+			"\U0001f34b\u200d\U0001f7e9":             {":lime:"},
 			"\U0001f34c":                             {":banana:"},
 			"\U0001f34d":                             {":pineapple:"},
 			"\U0001f34e":                             {":apple:", ":red_apple:"},
@@ -5152,7 +5265,7 @@ func emojiRevCode() map[string][]string {
 			"\U0001f381":                             {":gift:", ":wrapped_gift:"},
 			"\U0001f382":                             {":birthday:", ":birthday_cake:"},
 			"\U0001f383":                             {":jack-o-lantern:", ":jack_o_lantern:"},
-			"\U0001f384":                             {":Christmas_tree:", ":christmas_tree:"},
+			"\U0001f384":                             {":christmas_tree:", ":Christmas_tree:"},
 			"\U0001f385":                             {":santa:", ":Santa_Claus:"},
 			"\U0001f385\U0001f3fb":                   {":santa_tone1:"},
 			"\U0001f385\U0001f3fc":                   {":santa_tone2:"},
@@ -5240,141 +5353,144 @@ func emojiRevCode() map[string][]string {
 			"\U0001f3c3\U0001f3ff\u200d\u2640\ufe0f": {":woman_running_tone5:"},
 			"\U0001f3c3\U0001f3ff\u200d\u2642\ufe0f": {":man_running_tone5:"},
 			"\U0001f3c3\u200d\u2640\ufe0f":           {":running_woman:", ":woman-running:", ":woman_running:"},
-			"\U0001f3c3\u200d\u2642\ufe0f":           {":runner:", ":man-running:", ":man_running:", ":running_man:"},
-			"\U0001f3c4":                             {":person_surfing:"},
-			"\U0001f3c4\U0001f3fb":                   {":person_surfing_tone1:"},
-			"\U0001f3c4\U0001f3fb\u200d\u2640\ufe0f": {":woman_surfing_tone1:"},
-			"\U0001f3c4\U0001f3fb\u200d\u2642\ufe0f": {":man_surfing_tone1:"},
-			"\U0001f3c4\U0001f3fc":                   {":person_surfing_tone2:"},
-			"\U0001f3c4\U0001f3fc\u200d\u2640\ufe0f": {":woman_surfing_tone2:"},
-			"\U0001f3c4\U0001f3fc\u200d\u2642\ufe0f": {":man_surfing_tone2:"},
-			"\U0001f3c4\U0001f3fd":                   {":person_surfing_tone3:"},
-			"\U0001f3c4\U0001f3fd\u200d\u2640\ufe0f": {":woman_surfing_tone3:"},
-			"\U0001f3c4\U0001f3fd\u200d\u2642\ufe0f": {":man_surfing_tone3:"},
-			"\U0001f3c4\U0001f3fe":                   {":person_surfing_tone4:"},
-			"\U0001f3c4\U0001f3fe\u200d\u2640\ufe0f": {":woman_surfing_tone4:"},
-			"\U0001f3c4\U0001f3fe\u200d\u2642\ufe0f": {":man_surfing_tone4:"},
-			"\U0001f3c4\U0001f3ff":                   {":person_surfing_tone5:"},
-			"\U0001f3c4\U0001f3ff\u200d\u2640\ufe0f": {":woman_surfing_tone5:"},
-			"\U0001f3c4\U0001f3ff\u200d\u2642\ufe0f": {":man_surfing_tone5:"},
-			"\U0001f3c4\u200d\u2640\ufe0f":           {":surfing_woman:", ":woman-surfing:", ":woman_surfing:"},
-			"\U0001f3c4\u200d\u2642\ufe0f":           {":surfer:", ":man-surfing:", ":man_surfing:", ":surfing_man:"},
-			"\U0001f3c5":                             {":medal_sports:", ":sports_medal:"},
-			"\U0001f3c6":                             {":trophy:"},
-			"\U0001f3c7":                             {":horse_racing:"},
-			"\U0001f3c7\U0001f3fb":                   {":horse_racing_tone1:"},
-			"\U0001f3c7\U0001f3fc":                   {":horse_racing_tone2:"},
-			"\U0001f3c7\U0001f3fd":                   {":horse_racing_tone3:"},
-			"\U0001f3c7\U0001f3fe":                   {":horse_racing_tone4:"},
-			"\U0001f3c7\U0001f3ff":                   {":horse_racing_tone5:"},
-			"\U0001f3c8":                             {":football:", ":american_football:"},
-			"\U0001f3c9":                             {":rugby_football:"},
-			"\U0001f3ca":                             {":person_swimming:"},
-			"\U0001f3ca\U0001f3fb":                   {":person_swimming_tone1:"},
-			"\U0001f3ca\U0001f3fb\u200d\u2640\ufe0f": {":woman_swimming_tone1:"},
-			"\U0001f3ca\U0001f3fb\u200d\u2642\ufe0f": {":man_swimming_tone1:"},
-			"\U0001f3ca\U0001f3fc":                   {":person_swimming_tone2:"},
-			"\U0001f3ca\U0001f3fc\u200d\u2640\ufe0f": {":woman_swimming_tone2:"},
-			"\U0001f3ca\U0001f3fc\u200d\u2642\ufe0f": {":man_swimming_tone2:"},
-			"\U0001f3ca\U0001f3fd":                   {":person_swimming_tone3:"},
-			"\U0001f3ca\U0001f3fd\u200d\u2640\ufe0f": {":woman_swimming_tone3:"},
-			"\U0001f3ca\U0001f3fd\u200d\u2642\ufe0f": {":man_swimming_tone3:"},
-			"\U0001f3ca\U0001f3fe":                   {":person_swimming_tone4:"},
-			"\U0001f3ca\U0001f3fe\u200d\u2640\ufe0f": {":woman_swimming_tone4:"},
-			"\U0001f3ca\U0001f3fe\u200d\u2642\ufe0f": {":man_swimming_tone4:"},
-			"\U0001f3ca\U0001f3ff":                   {":person_swimming_tone5:"},
-			"\U0001f3ca\U0001f3ff\u200d\u2640\ufe0f": {":woman_swimming_tone5:"},
-			"\U0001f3ca\U0001f3ff\u200d\u2642\ufe0f": {":man_swimming_tone5:"},
-			"\U0001f3ca\u200d\u2640\ufe0f":           {":swimming_woman:", ":woman-swimming:", ":woman_swimming:"},
-			"\U0001f3ca\u200d\u2642\ufe0f":           {":swimmer:", ":man-swimming:", ":man_swimming:", ":swimming_man:"},
-			"\U0001f3cb":                             {":person_lifting_weights:"},
-			"\U0001f3cb\U0001f3fb":                   {":person_lifting_weights_tone1:"},
-			"\U0001f3cb\U0001f3fb\u200d\u2640\ufe0f": {":woman_lifting_weights_tone1:"},
-			"\U0001f3cb\U0001f3fb\u200d\u2642\ufe0f": {":man_lifting_weights_tone1:"},
-			"\U0001f3cb\U0001f3fc":                   {":person_lifting_weights_tone2:"},
-			"\U0001f3cb\U0001f3fc\u200d\u2640\ufe0f": {":woman_lifting_weights_tone2:"},
-			"\U0001f3cb\U0001f3fc\u200d\u2642\ufe0f": {":man_lifting_weights_tone2:"},
-			"\U0001f3cb\U0001f3fd":                   {":person_lifting_weights_tone3:"},
-			"\U0001f3cb\U0001f3fd\u200d\u2640\ufe0f": {":woman_lifting_weights_tone3:"},
-			"\U0001f3cb\U0001f3fd\u200d\u2642\ufe0f": {":man_lifting_weights_tone3:"},
-			"\U0001f3cb\U0001f3fe":                   {":person_lifting_weights_tone4:"},
-			"\U0001f3cb\U0001f3fe\u200d\u2640\ufe0f": {":woman_lifting_weights_tone4:"},
-			"\U0001f3cb\U0001f3fe\u200d\u2642\ufe0f": {":man_lifting_weights_tone4:"},
-			"\U0001f3cb\U0001f3ff":                   {":person_lifting_weights_tone5:"},
-			"\U0001f3cb\U0001f3ff\u200d\u2640\ufe0f": {":woman_lifting_weights_tone5:"},
-			"\U0001f3cb\U0001f3ff\u200d\u2642\ufe0f": {":man_lifting_weights_tone5:"},
-			"\U0001f3cb\ufe0f":                       {":weight_lifting:"},
-			"\U0001f3cb\ufe0f\u200d\u2640\ufe0f":     {":weight_lifting_woman:", ":woman-lifting-weights:", ":woman_lifting_weights:"},
-			"\U0001f3cb\ufe0f\u200d\u2642\ufe0f":     {":weight_lifter:", ":weight_lifting_man:", ":man-lifting-weights:", ":man_lifting_weights:"},
-			"\U0001f3cc":                             {":person_golfing:"},
-			"\U0001f3cc\U0001f3fb":                   {":person_golfing_tone1:"},
-			"\U0001f3cc\U0001f3fb\u200d\u2640\ufe0f": {":woman_golfing_tone1:"},
-			"\U0001f3cc\U0001f3fb\u200d\u2642\ufe0f": {":man_golfing_tone1:"},
-			"\U0001f3cc\U0001f3fc":                   {":person_golfing_tone2:"},
-			"\U0001f3cc\U0001f3fc\u200d\u2640\ufe0f": {":woman_golfing_tone2:"},
-			"\U0001f3cc\U0001f3fc\u200d\u2642\ufe0f": {":man_golfing_tone2:"},
-			"\U0001f3cc\U0001f3fd":                   {":person_golfing_tone3:"},
-			"\U0001f3cc\U0001f3fd\u200d\u2640\ufe0f": {":woman_golfing_tone3:"},
-			"\U0001f3cc\U0001f3fd\u200d\u2642\ufe0f": {":man_golfing_tone3:"},
-			"\U0001f3cc\U0001f3fe":                   {":person_golfing_tone4:"},
-			"\U0001f3cc\U0001f3fe\u200d\u2640\ufe0f": {":woman_golfing_tone4:"},
-			"\U0001f3cc\U0001f3fe\u200d\u2642\ufe0f": {":man_golfing_tone4:"},
-			"\U0001f3cc\U0001f3ff":                   {":person_golfing_tone5:"},
-			"\U0001f3cc\U0001f3ff\u200d\u2640\ufe0f": {":woman_golfing_tone5:"},
-			"\U0001f3cc\U0001f3ff\u200d\u2642\ufe0f": {":man_golfing_tone5:"},
-			"\U0001f3cc\ufe0f":                       {":golfing:"},
-			"\U0001f3cc\ufe0f\u200d\u2640\ufe0f":     {":golfing_woman:", ":woman-golfing:", ":woman_golfing:"},
-			"\U0001f3cc\ufe0f\u200d\u2642\ufe0f":     {":golfer:", ":golfing_man:", ":man-golfing:", ":man_golfing:"},
-			"\U0001f3cd":                             {":motorcycle:"},
-			"\U0001f3cd\ufe0f":                       {":racing_motorcycle:"},
-			"\U0001f3ce":                             {":race_car:"},
-			"\U0001f3ce\ufe0f":                       {":racing_car:"},
-			"\U0001f3cf":                             {":cricket_game:", ":cricket_bat_and_ball:"},
-			"\U0001f3d0":                             {":volleyball:"},
-			"\U0001f3d1":                             {":field_hockey:", ":field_hockey_stick_and_ball:"},
-			"\U0001f3d2":                             {":hockey:", ":ice_hockey:", ":ice_hockey_stick_and_puck:"},
-			"\U0001f3d3":                             {":ping_pong:", ":table_tennis_paddle_and_ball:"},
-			"\U0001f3d4":                             {":mountain_snow:", ":snow-capped_mountain:"},
-			"\U0001f3d4\ufe0f":                       {":snow_capped_mountain:"},
-			"\U0001f3d5\ufe0f":                       {":camping:"},
-			"\U0001f3d6":                             {":beach:"},
-			"\U0001f3d6\ufe0f":                       {":beach_with_umbrella:"},
-			"\U0001f3d7":                             {":construction_site:"},
-			"\U0001f3d7\ufe0f":                       {":building_construction:"},
-			"\U0001f3d8":                             {":homes:", ":houses:"},
-			"\U0001f3d8\ufe0f":                       {":house_buildings:"},
-			"\U0001f3d9\ufe0f":                       {":cityscape:"},
-			"\U0001f3da":                             {":derelict_house:", ":house_abandoned:"},
-			"\U0001f3da\ufe0f":                       {":derelict_house_building:"},
-			"\U0001f3db\ufe0f":                       {":classical_building:"},
-			"\U0001f3dc\ufe0f":                       {":desert:"},
-			"\U0001f3dd":                             {":island:"},
-			"\U0001f3dd\ufe0f":                       {":desert_island:"},
-			"\U0001f3de":                             {":park:"},
-			"\U0001f3de\ufe0f":                       {":national_park:"},
-			"\U0001f3df\ufe0f":                       {":stadium:"},
-			"\U0001f3e0":                             {":house:"},
-			"\U0001f3e1":                             {":house_with_garden:"},
-			"\U0001f3e2":                             {":office:", ":office_building:"},
-			"\U0001f3e3":                             {":post_office:", ":Japanese_post_office:"},
-			"\U0001f3e4":                             {":european_post_office:"},
-			"\U0001f3e5":                             {":hospital:"},
-			"\U0001f3e6":                             {":bank:"},
-			"\U0001f3e7":                             {":atm:", ":ATM_sign:"},
-			"\U0001f3e8":                             {":hotel:"},
-			"\U0001f3e9":                             {":love_hotel:"},
-			"\U0001f3ea":                             {":convenience_store:"},
-			"\U0001f3eb":                             {":school:"},
-			"\U0001f3ec":                             {":department_store:"},
-			"\U0001f3ed":                             {":factory:"},
-			"\U0001f3ee":                             {":lantern:", ":izakaya_lantern:", ":red_paper_lantern:"},
-			"\U0001f3ef":                             {":Japanese_castle:", ":japanese_castle:"},
-			"\U0001f3f0":                             {":castle:", ":european_castle:"},
-			"\U0001f3f3":                             {":flag_white:", ":white_flag:"},
-			"\U0001f3f3\ufe0f":                       {":waving_white_flag:"},
-			"\U0001f3f3\ufe0f\u200d\U0001f308":       {":rainbow-flag:", ":rainbow_flag:"},
-			"\U0001f3f3\ufe0f\u200d\u26a7\ufe0f":     {":transgender_flag:"},
-			"\U0001f3f4":                             {":black_flag:", ":flag_black:", ":waving_black_flag:"},
+			"\U0001f3c3\u200d\u2640\ufe0f\u200d\u27a1\ufe0f": {":woman_running_facing_right:"},
+			"\U0001f3c3\u200d\u2642\ufe0f":                   {":runner:", ":man-running:", ":man_running:", ":running_man:"},
+			"\U0001f3c3\u200d\u2642\ufe0f\u200d\u27a1\ufe0f": {":man_running_facing_right:"},
+			"\U0001f3c3\u200d\u27a1\ufe0f":                   {":person_running_facing_right:"},
+			"\U0001f3c4":                                     {":person_surfing:"},
+			"\U0001f3c4\U0001f3fb":                           {":person_surfing_tone1:"},
+			"\U0001f3c4\U0001f3fb\u200d\u2640\ufe0f":         {":woman_surfing_tone1:"},
+			"\U0001f3c4\U0001f3fb\u200d\u2642\ufe0f":         {":man_surfing_tone1:"},
+			"\U0001f3c4\U0001f3fc":                           {":person_surfing_tone2:"},
+			"\U0001f3c4\U0001f3fc\u200d\u2640\ufe0f":         {":woman_surfing_tone2:"},
+			"\U0001f3c4\U0001f3fc\u200d\u2642\ufe0f":         {":man_surfing_tone2:"},
+			"\U0001f3c4\U0001f3fd":                           {":person_surfing_tone3:"},
+			"\U0001f3c4\U0001f3fd\u200d\u2640\ufe0f":         {":woman_surfing_tone3:"},
+			"\U0001f3c4\U0001f3fd\u200d\u2642\ufe0f":         {":man_surfing_tone3:"},
+			"\U0001f3c4\U0001f3fe":                           {":person_surfing_tone4:"},
+			"\U0001f3c4\U0001f3fe\u200d\u2640\ufe0f":         {":woman_surfing_tone4:"},
+			"\U0001f3c4\U0001f3fe\u200d\u2642\ufe0f":         {":man_surfing_tone4:"},
+			"\U0001f3c4\U0001f3ff":                           {":person_surfing_tone5:"},
+			"\U0001f3c4\U0001f3ff\u200d\u2640\ufe0f":         {":woman_surfing_tone5:"},
+			"\U0001f3c4\U0001f3ff\u200d\u2642\ufe0f":         {":man_surfing_tone5:"},
+			"\U0001f3c4\u200d\u2640\ufe0f":                   {":surfing_woman:", ":woman-surfing:", ":woman_surfing:"},
+			"\U0001f3c4\u200d\u2642\ufe0f":                   {":surfer:", ":man-surfing:", ":man_surfing:", ":surfing_man:"},
+			"\U0001f3c5":                                     {":medal_sports:", ":sports_medal:"},
+			"\U0001f3c6":                                     {":trophy:"},
+			"\U0001f3c7":                                     {":horse_racing:"},
+			"\U0001f3c7\U0001f3fb":                           {":horse_racing_tone1:"},
+			"\U0001f3c7\U0001f3fc":                           {":horse_racing_tone2:"},
+			"\U0001f3c7\U0001f3fd":                           {":horse_racing_tone3:"},
+			"\U0001f3c7\U0001f3fe":                           {":horse_racing_tone4:"},
+			"\U0001f3c7\U0001f3ff":                           {":horse_racing_tone5:"},
+			"\U0001f3c8":                                     {":football:", ":american_football:"},
+			"\U0001f3c9":                                     {":rugby_football:"},
+			"\U0001f3ca":                                     {":person_swimming:"},
+			"\U0001f3ca\U0001f3fb":                           {":person_swimming_tone1:"},
+			"\U0001f3ca\U0001f3fb\u200d\u2640\ufe0f":         {":woman_swimming_tone1:"},
+			"\U0001f3ca\U0001f3fb\u200d\u2642\ufe0f":         {":man_swimming_tone1:"},
+			"\U0001f3ca\U0001f3fc":                           {":person_swimming_tone2:"},
+			"\U0001f3ca\U0001f3fc\u200d\u2640\ufe0f":         {":woman_swimming_tone2:"},
+			"\U0001f3ca\U0001f3fc\u200d\u2642\ufe0f":         {":man_swimming_tone2:"},
+			"\U0001f3ca\U0001f3fd":                           {":person_swimming_tone3:"},
+			"\U0001f3ca\U0001f3fd\u200d\u2640\ufe0f":         {":woman_swimming_tone3:"},
+			"\U0001f3ca\U0001f3fd\u200d\u2642\ufe0f":         {":man_swimming_tone3:"},
+			"\U0001f3ca\U0001f3fe":                           {":person_swimming_tone4:"},
+			"\U0001f3ca\U0001f3fe\u200d\u2640\ufe0f":         {":woman_swimming_tone4:"},
+			"\U0001f3ca\U0001f3fe\u200d\u2642\ufe0f":         {":man_swimming_tone4:"},
+			"\U0001f3ca\U0001f3ff":                           {":person_swimming_tone5:"},
+			"\U0001f3ca\U0001f3ff\u200d\u2640\ufe0f":         {":woman_swimming_tone5:"},
+			"\U0001f3ca\U0001f3ff\u200d\u2642\ufe0f":         {":man_swimming_tone5:"},
+			"\U0001f3ca\u200d\u2640\ufe0f":                   {":swimming_woman:", ":woman-swimming:", ":woman_swimming:"},
+			"\U0001f3ca\u200d\u2642\ufe0f":                   {":swimmer:", ":man-swimming:", ":man_swimming:", ":swimming_man:"},
+			"\U0001f3cb":                                     {":person_lifting_weights:"},
+			"\U0001f3cb\U0001f3fb":                           {":person_lifting_weights_tone1:"},
+			"\U0001f3cb\U0001f3fb\u200d\u2640\ufe0f":         {":woman_lifting_weights_tone1:"},
+			"\U0001f3cb\U0001f3fb\u200d\u2642\ufe0f":         {":man_lifting_weights_tone1:"},
+			"\U0001f3cb\U0001f3fc":                           {":person_lifting_weights_tone2:"},
+			"\U0001f3cb\U0001f3fc\u200d\u2640\ufe0f":         {":woman_lifting_weights_tone2:"},
+			"\U0001f3cb\U0001f3fc\u200d\u2642\ufe0f":         {":man_lifting_weights_tone2:"},
+			"\U0001f3cb\U0001f3fd":                           {":person_lifting_weights_tone3:"},
+			"\U0001f3cb\U0001f3fd\u200d\u2640\ufe0f":         {":woman_lifting_weights_tone3:"},
+			"\U0001f3cb\U0001f3fd\u200d\u2642\ufe0f":         {":man_lifting_weights_tone3:"},
+			"\U0001f3cb\U0001f3fe":                           {":person_lifting_weights_tone4:"},
+			"\U0001f3cb\U0001f3fe\u200d\u2640\ufe0f":         {":woman_lifting_weights_tone4:"},
+			"\U0001f3cb\U0001f3fe\u200d\u2642\ufe0f":         {":man_lifting_weights_tone4:"},
+			"\U0001f3cb\U0001f3ff":                           {":person_lifting_weights_tone5:"},
+			"\U0001f3cb\U0001f3ff\u200d\u2640\ufe0f":         {":woman_lifting_weights_tone5:"},
+			"\U0001f3cb\U0001f3ff\u200d\u2642\ufe0f":         {":man_lifting_weights_tone5:"},
+			"\U0001f3cb\ufe0f":                               {":weight_lifting:"},
+			"\U0001f3cb\ufe0f\u200d\u2640\ufe0f":             {":weight_lifting_woman:", ":woman-lifting-weights:", ":woman_lifting_weights:"},
+			"\U0001f3cb\ufe0f\u200d\u2642\ufe0f":             {":weight_lifter:", ":weight_lifting_man:", ":man-lifting-weights:", ":man_lifting_weights:"},
+			"\U0001f3cc":                                     {":person_golfing:"},
+			"\U0001f3cc\U0001f3fb":                           {":person_golfing_tone1:"},
+			"\U0001f3cc\U0001f3fb\u200d\u2640\ufe0f":         {":woman_golfing_tone1:"},
+			"\U0001f3cc\U0001f3fb\u200d\u2642\ufe0f":         {":man_golfing_tone1:"},
+			"\U0001f3cc\U0001f3fc":                           {":person_golfing_tone2:"},
+			"\U0001f3cc\U0001f3fc\u200d\u2640\ufe0f":         {":woman_golfing_tone2:"},
+			"\U0001f3cc\U0001f3fc\u200d\u2642\ufe0f":         {":man_golfing_tone2:"},
+			"\U0001f3cc\U0001f3fd":                           {":person_golfing_tone3:"},
+			"\U0001f3cc\U0001f3fd\u200d\u2640\ufe0f":         {":woman_golfing_tone3:"},
+			"\U0001f3cc\U0001f3fd\u200d\u2642\ufe0f":         {":man_golfing_tone3:"},
+			"\U0001f3cc\U0001f3fe":                           {":person_golfing_tone4:"},
+			"\U0001f3cc\U0001f3fe\u200d\u2640\ufe0f":         {":woman_golfing_tone4:"},
+			"\U0001f3cc\U0001f3fe\u200d\u2642\ufe0f":         {":man_golfing_tone4:"},
+			"\U0001f3cc\U0001f3ff":                           {":person_golfing_tone5:"},
+			"\U0001f3cc\U0001f3ff\u200d\u2640\ufe0f":         {":woman_golfing_tone5:"},
+			"\U0001f3cc\U0001f3ff\u200d\u2642\ufe0f":         {":man_golfing_tone5:"},
+			"\U0001f3cc\ufe0f":                               {":golfing:"},
+			"\U0001f3cc\ufe0f\u200d\u2640\ufe0f":             {":golfing_woman:", ":woman-golfing:", ":woman_golfing:"},
+			"\U0001f3cc\ufe0f\u200d\u2642\ufe0f":             {":golfer:", ":golfing_man:", ":man-golfing:", ":man_golfing:"},
+			"\U0001f3cd":                                     {":motorcycle:"},
+			"\U0001f3cd\ufe0f":                               {":racing_motorcycle:"},
+			"\U0001f3ce":                                     {":race_car:"},
+			"\U0001f3ce\ufe0f":                               {":racing_car:"},
+			"\U0001f3cf":                                     {":cricket_game:", ":cricket_bat_and_ball:"},
+			"\U0001f3d0":                                     {":volleyball:"},
+			"\U0001f3d1":                                     {":field_hockey:", ":field_hockey_stick_and_ball:"},
+			"\U0001f3d2":                                     {":hockey:", ":ice_hockey:", ":ice_hockey_stick_and_puck:"},
+			"\U0001f3d3":                                     {":ping_pong:", ":table_tennis_paddle_and_ball:"},
+			"\U0001f3d4":                                     {":mountain_snow:", ":snow-capped_mountain:"},
+			"\U0001f3d4\ufe0f":                               {":snow_capped_mountain:"},
+			"\U0001f3d5\ufe0f":                               {":camping:"},
+			"\U0001f3d6":                                     {":beach:"},
+			"\U0001f3d6\ufe0f":                               {":beach_with_umbrella:"},
+			"\U0001f3d7":                                     {":construction_site:"},
+			"\U0001f3d7\ufe0f":                               {":building_construction:"},
+			"\U0001f3d8":                                     {":homes:", ":houses:"},
+			"\U0001f3d8\ufe0f":                               {":house_buildings:"},
+			"\U0001f3d9\ufe0f":                               {":cityscape:"},
+			"\U0001f3da":                                     {":derelict_house:", ":house_abandoned:"},
+			"\U0001f3da\ufe0f":                               {":derelict_house_building:"},
+			"\U0001f3db\ufe0f":                               {":classical_building:"},
+			"\U0001f3dc\ufe0f":                               {":desert:"},
+			"\U0001f3dd":                                     {":island:"},
+			"\U0001f3dd\ufe0f":                               {":desert_island:"},
+			"\U0001f3de":                                     {":park:"},
+			"\U0001f3de\ufe0f":                               {":national_park:"},
+			"\U0001f3df\ufe0f":                               {":stadium:"},
+			"\U0001f3e0":                                     {":house:"},
+			"\U0001f3e1":                                     {":house_with_garden:"},
+			"\U0001f3e2":                                     {":office:", ":office_building:"},
+			"\U0001f3e3":                                     {":post_office:", ":Japanese_post_office:"},
+			"\U0001f3e4":                                     {":european_post_office:"},
+			"\U0001f3e5":                                     {":hospital:"},
+			"\U0001f3e6":                                     {":bank:"},
+			"\U0001f3e7":                                     {":atm:", ":ATM_sign:"},
+			"\U0001f3e8":                                     {":hotel:"},
+			"\U0001f3e9":                                     {":love_hotel:"},
+			"\U0001f3ea":                                     {":convenience_store:"},
+			"\U0001f3eb":                                     {":school:"},
+			"\U0001f3ec":                                     {":department_store:"},
+			"\U0001f3ed":                                     {":factory:"},
+			"\U0001f3ee":                                     {":lantern:", ":izakaya_lantern:", ":red_paper_lantern:"},
+			"\U0001f3ef":                                     {":japanese_castle:", ":Japanese_castle:"},
+			"\U0001f3f0":                                     {":castle:", ":european_castle:"},
+			"\U0001f3f3":                                     {":flag_white:", ":white_flag:"},
+			"\U0001f3f3\ufe0f":                               {":waving_white_flag:"},
+			"\U0001f3f3\ufe0f\u200d\U0001f308":               {":rainbow-flag:", ":rainbow_flag:"},
+			"\U0001f3f3\ufe0f\u200d\u26a7\ufe0f":             {":transgender_flag:"},
+			"\U0001f3f4":                                     {":black_flag:", ":flag_black:", ":waving_black_flag:"},
 			"\U0001f3f4\U000e0067\U000e0062\U000e0065\U000e006e\U000e0067\U000e007f": {":england:", ":flag-england:", ":flag_England:"},
 			"\U0001f3f4\U000e0067\U000e0062\U000e0073\U000e0063\U000e0074\U000e007f": {":scotland:", ":flag-scotland:", ":flag_Scotland:"},
 			"\U0001f3f4\U000e0067\U000e0062\U000e0077\U000e006c\U000e0073\U000e007f": {":wales:", ":flag-wales:", ":flag_Wales:"},
@@ -5430,6 +5546,8 @@ func emojiRevCode() map[string][]string {
 			"\U0001f424":                                                             {":baby_chick:"},
 			"\U0001f425":                                                             {":hatched_chick:", ":front-facing_baby_chick:"},
 			"\U0001f426":                                                             {":bird:"},
+			"\U0001f426\u200d\U0001f525":                                             {":phoenix:"},
+			"\U0001f426\u200d\u2b1b":                                                 {":black_bird:"},
 			"\U0001f427":                                                             {":penguin:"},
 			"\U0001f428":                                                             {":koala:"},
 			"\U0001f429":                                                             {":poodle:"},
@@ -5509,7 +5627,7 @@ func emojiRevCode() map[string][]string {
 			"\U0001f44b\U0001f3fd":                                                   {":wave_tone3:"},
 			"\U0001f44b\U0001f3fe":                                                   {":wave_tone4:"},
 			"\U0001f44b\U0001f3ff":                                                   {":wave_tone5:"},
-			"\U0001f44c":                                                             {":OK_hand:", ":ok_hand:"},
+			"\U0001f44c":                                                             {":ok_hand:", ":OK_hand:"},
 			"\U0001f44c\U0001f3fb":                                                   {":ok_hand_tone1:"},
 			"\U0001f44c\U0001f3fc":                                                   {":ok_hand_tone2:"},
 			"\U0001f44c\U0001f3fd":                                                   {":ok_hand_tone3:"},
@@ -5688,12 +5806,15 @@ func emojiRevCode() map[string][]string {
 			"\U0001f468\u200d\U0001f680":                                   {":man_astronaut:", ":male-astronaut:"},
 			"\U0001f468\u200d\U0001f692":                                   {":man_firefighter:", ":male-firefighter:"},
 			"\U0001f468\u200d\U0001f9af":                                   {":man_with_white_cane:", ":man_with_probing_cane:"},
+			"\U0001f468\u200d\U0001f9af\u200d\u27a1\ufe0f":                 {":man_with_white_cane_facing_right:"},
 			"\U0001f468\u200d\U0001f9b0":                                   {":man_red_hair:", ":red_haired_man:"},
 			"\U0001f468\u200d\U0001f9b1":                                   {":man_curly_hair:", ":curly_haired_man:"},
 			"\U0001f468\u200d\U0001f9b2":                                   {":bald_man:", ":man_bald:"},
 			"\U0001f468\u200d\U0001f9b3":                                   {":man_white_hair:", ":white_haired_man:"},
 			"\U0001f468\u200d\U0001f9bc":                                   {":man_in_motorized_wheelchair:"},
+			"\U0001f468\u200d\U0001f9bc\u200d\u27a1\ufe0f":                 {":man_in_motorized_wheelchair_facing_right:"},
 			"\U0001f468\u200d\U0001f9bd":                                   {":man_in_manual_wheelchair:"},
+			"\U0001f468\u200d\U0001f9bd\u200d\u27a1\ufe0f":                 {":man_in_manual_wheelchair_facing_right:"},
 			"\U0001f468\u200d\u2695\ufe0f":                                 {":male-doctor:", ":man_health_worker:"},
 			"\U0001f468\u200d\u2696\ufe0f":                                 {":man_judge:", ":male-judge:"},
 			"\U0001f468\u200d\u2708\ufe0f":                                 {":man_pilot:", ":male-pilot:"},
@@ -5810,1905 +5931,1998 @@ func emojiRevCode() map[string][]string {
 			"\U0001f469\u200d\U0001f680":                                   {":woman_astronaut:", ":female-astronaut:"},
 			"\U0001f469\u200d\U0001f692":                                   {":woman_firefighter:", ":female-firefighter:"},
 			"\U0001f469\u200d\U0001f9af":                                   {":woman_with_white_cane:", ":woman_with_probing_cane:"},
+			"\U0001f469\u200d\U0001f9af\u200d\u27a1\ufe0f":                 {":woman_with_white_cane_facing_right:"},
 			"\U0001f469\u200d\U0001f9b0":                                   {":woman_red_hair:", ":red_haired_woman:"},
 			"\U0001f469\u200d\U0001f9b1":                                   {":woman_curly_hair:", ":curly_haired_woman:"},
 			"\U0001f469\u200d\U0001f9b2":                                   {":bald_woman:", ":woman_bald:"},
 			"\U0001f469\u200d\U0001f9b3":                                   {":woman_white_hair:", ":white_haired_woman:"},
 			"\U0001f469\u200d\U0001f9bc":                                   {":woman_in_motorized_wheelchair:"},
+			"\U0001f469\u200d\U0001f9bc\u200d\u27a1\ufe0f":                 {":woman_in_motorized_wheelchair_facing_right:"},
 			"\U0001f469\u200d\U0001f9bd":                                   {":woman_in_manual_wheelchair:"},
+			"\U0001f469\u200d\U0001f9bd\u200d\u27a1\ufe0f":                 {":woman_in_manual_wheelchair_facing_right:"},
 			"\U0001f469\u200d\u2695\ufe0f":                                 {":female-doctor:", ":woman_health_worker:"},
 			"\U0001f469\u200d\u2696\ufe0f":                                 {":woman_judge:", ":female-judge:"},
 			"\U0001f469\u200d\u2708\ufe0f":                                 {":woman_pilot:", ":female-pilot:"},
-			"\U0001f469\u200d\u2764\ufe0f\u200d\U0001f468":                 {":woman-heart-man:", ":couple_with_heart:", ":couple_with_heart_woman_man:"},
+			"\U0001f469\u200d\u2764\ufe0f\u200d\U0001f468":                 {":woman-heart-man:", ":couple_with_heart_woman_man:"},
 			"\U0001f469\u200d\u2764\ufe0f\u200d\U0001f469":                 {":couple_ww:", ":woman-heart-woman:", ":couple_with_heart_woman_woman:"},
-			"\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468": {":couplekiss:", ":kiss_woman_man:", ":woman-kiss-man:", ":couplekiss_man_woman:"},
+			"\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f468": {":kiss_woman_man:", ":woman-kiss-man:", ":couplekiss_man_woman:"},
 			"\U0001f469\u200d\u2764\ufe0f\u200d\U0001f48b\u200d\U0001f469": {":kiss_ww:", ":kiss_woman_woman:", ":woman-kiss-woman:", ":couplekiss_woman_woman:"},
-			"\U0001f46b":                                 {":couple:", ":man_and_woman_holding_hands:", ":woman_and_man_holding_hands:"},
-			"\U0001f46c":                                 {":men_holding_hands:", ":two_men_holding_hands:"},
-			"\U0001f46d":                                 {":women_holding_hands:", ":two_women_holding_hands:"},
-			"\U0001f46e":                                 {":police_officer:"},
-			"\U0001f46e\U0001f3fb":                       {":police_officer_tone1:"},
-			"\U0001f46e\U0001f3fb\u200d\u2640\ufe0f":     {":woman_police_officer_tone1:"},
-			"\U0001f46e\U0001f3fb\u200d\u2642\ufe0f":     {":man_police_officer_tone1:"},
-			"\U0001f46e\U0001f3fc":                       {":police_officer_tone2:"},
-			"\U0001f46e\U0001f3fc\u200d\u2640\ufe0f":     {":woman_police_officer_tone2:"},
-			"\U0001f46e\U0001f3fc\u200d\u2642\ufe0f":     {":man_police_officer_tone2:"},
-			"\U0001f46e\U0001f3fd":                       {":police_officer_tone3:"},
-			"\U0001f46e\U0001f3fd\u200d\u2640\ufe0f":     {":woman_police_officer_tone3:"},
-			"\U0001f46e\U0001f3fd\u200d\u2642\ufe0f":     {":man_police_officer_tone3:"},
-			"\U0001f46e\U0001f3fe":                       {":police_officer_tone4:"},
-			"\U0001f46e\U0001f3fe\u200d\u2640\ufe0f":     {":woman_police_officer_tone4:"},
-			"\U0001f46e\U0001f3fe\u200d\u2642\ufe0f":     {":man_police_officer_tone4:"},
-			"\U0001f46e\U0001f3ff":                       {":police_officer_tone5:"},
-			"\U0001f46e\U0001f3ff\u200d\u2640\ufe0f":     {":woman_police_officer_tone5:"},
-			"\U0001f46e\U0001f3ff\u200d\u2642\ufe0f":     {":man_police_officer_tone5:"},
-			"\U0001f46e\u200d\u2640\ufe0f":               {":policewoman:", ":woman_police_officer:", ":female-police-officer:"},
-			"\U0001f46e\u200d\u2642\ufe0f":               {":cop:", ":policeman:", ":man_police_officer:", ":male-police-officer:"},
-			"\U0001f46f":                                 {":people_with_bunny_ears:", ":people_with_bunny_ears_partying:"},
-			"\U0001f46f\u200d\u2640\ufe0f":               {":dancers:", ":dancing_women:", ":women_with_bunny_ears:", ":woman-with-bunny-ears-partying:", ":women_with_bunny_ears_partying:"},
-			"\U0001f46f\u200d\u2642\ufe0f":               {":dancing_men:", ":men_with_bunny_ears:", ":man-with-bunny-ears-partying:", ":men_with_bunny_ears_partying:"},
-			"\U0001f470":                                 {":bride_with_veil:", ":person_with_veil:"},
-			"\U0001f470\U0001f3fb":                       {":bride_with_veil_tone1:"},
-			"\U0001f470\U0001f3fc":                       {":bride_with_veil_tone2:"},
-			"\U0001f470\U0001f3fd":                       {":bride_with_veil_tone3:"},
-			"\U0001f470\U0001f3fe":                       {":bride_with_veil_tone4:"},
-			"\U0001f470\U0001f3ff":                       {":bride_with_veil_tone5:"},
-			"\U0001f470\u200d\u2640\ufe0f":               {":woman_with_veil:"},
-			"\U0001f470\u200d\u2642\ufe0f":               {":man_with_veil:"},
-			"\U0001f471":                                 {":person_blond_hair:", ":blond_haired_person:"},
-			"\U0001f471\U0001f3fb":                       {":blond_haired_person_tone1:"},
-			"\U0001f471\U0001f3fb\u200d\u2640\ufe0f":     {":blond-haired_woman_tone1:"},
-			"\U0001f471\U0001f3fb\u200d\u2642\ufe0f":     {":blond-haired_man_tone1:"},
-			"\U0001f471\U0001f3fc":                       {":blond_haired_person_tone2:"},
-			"\U0001f471\U0001f3fc\u200d\u2640\ufe0f":     {":blond-haired_woman_tone2:"},
-			"\U0001f471\U0001f3fc\u200d\u2642\ufe0f":     {":blond-haired_man_tone2:"},
-			"\U0001f471\U0001f3fd":                       {":blond_haired_person_tone3:"},
-			"\U0001f471\U0001f3fd\u200d\u2640\ufe0f":     {":blond-haired_woman_tone3:"},
-			"\U0001f471\U0001f3fd\u200d\u2642\ufe0f":     {":blond-haired_man_tone3:"},
-			"\U0001f471\U0001f3fe":                       {":blond_haired_person_tone4:"},
-			"\U0001f471\U0001f3fe\u200d\u2640\ufe0f":     {":blond-haired_woman_tone4:"},
-			"\U0001f471\U0001f3fe\u200d\u2642\ufe0f":     {":blond-haired_man_tone4:"},
-			"\U0001f471\U0001f3ff":                       {":blond_haired_person_tone5:"},
-			"\U0001f471\U0001f3ff\u200d\u2640\ufe0f":     {":blond-haired_woman_tone5:"},
-			"\U0001f471\U0001f3ff\u200d\u2642\ufe0f":     {":blond-haired_man_tone5:"},
-			"\U0001f471\u200d\u2640\ufe0f":               {":blonde_woman:", ":woman_blond_hair:", ":blond-haired-woman:", ":blond-haired_woman:", ":blond_haired_woman:"},
-			"\U0001f471\u200d\u2642\ufe0f":               {":man_blond_hair:", ":blond-haired-man:", ":blond-haired_man:", ":blond_haired_man:", ":person_with_blond_hair:"},
-			"\U0001f472":                                 {":man_with_gua_pi_mao:", ":man_with_chinese_cap:", ":person_with_skullcap:"},
-			"\U0001f472\U0001f3fb":                       {":man_with_chinese_cap_tone1:"},
-			"\U0001f472\U0001f3fc":                       {":man_with_chinese_cap_tone2:"},
-			"\U0001f472\U0001f3fd":                       {":man_with_chinese_cap_tone3:"},
-			"\U0001f472\U0001f3fe":                       {":man_with_chinese_cap_tone4:"},
-			"\U0001f472\U0001f3ff":                       {":man_with_chinese_cap_tone5:"},
-			"\U0001f473":                                 {":person_with_turban:", ":person_wearing_turban:"},
-			"\U0001f473\U0001f3fb":                       {":person_wearing_turban_tone1:"},
-			"\U0001f473\U0001f3fb\u200d\u2640\ufe0f":     {":woman_wearing_turban_tone1:"},
-			"\U0001f473\U0001f3fb\u200d\u2642\ufe0f":     {":man_wearing_turban_tone1:"},
-			"\U0001f473\U0001f3fc":                       {":person_wearing_turban_tone2:"},
-			"\U0001f473\U0001f3fc\u200d\u2640\ufe0f":     {":woman_wearing_turban_tone2:"},
-			"\U0001f473\U0001f3fc\u200d\u2642\ufe0f":     {":man_wearing_turban_tone2:"},
-			"\U0001f473\U0001f3fd":                       {":person_wearing_turban_tone3:"},
-			"\U0001f473\U0001f3fd\u200d\u2640\ufe0f":     {":woman_wearing_turban_tone3:"},
-			"\U0001f473\U0001f3fd\u200d\u2642\ufe0f":     {":man_wearing_turban_tone3:"},
-			"\U0001f473\U0001f3fe":                       {":person_wearing_turban_tone4:"},
-			"\U0001f473\U0001f3fe\u200d\u2640\ufe0f":     {":woman_wearing_turban_tone4:"},
-			"\U0001f473\U0001f3fe\u200d\u2642\ufe0f":     {":man_wearing_turban_tone4:"},
-			"\U0001f473\U0001f3ff":                       {":person_wearing_turban_tone5:"},
-			"\U0001f473\U0001f3ff\u200d\u2640\ufe0f":     {":woman_wearing_turban_tone5:"},
-			"\U0001f473\U0001f3ff\u200d\u2642\ufe0f":     {":man_wearing_turban_tone5:"},
-			"\U0001f473\u200d\u2640\ufe0f":               {":woman_with_turban:", ":woman-wearing-turban:", ":woman_wearing_turban:"},
-			"\U0001f473\u200d\u2642\ufe0f":               {":man_with_turban:", ":man-wearing-turban:", ":man_wearing_turban:"},
-			"\U0001f474":                                 {":old_man:", ":older_man:"},
-			"\U0001f474\U0001f3fb":                       {":older_man_tone1:"},
-			"\U0001f474\U0001f3fc":                       {":older_man_tone2:"},
-			"\U0001f474\U0001f3fd":                       {":older_man_tone3:"},
-			"\U0001f474\U0001f3fe":                       {":older_man_tone4:"},
-			"\U0001f474\U0001f3ff":                       {":older_man_tone5:"},
-			"\U0001f475":                                 {":old_woman:", ":older_woman:"},
-			"\U0001f475\U0001f3fb":                       {":older_woman_tone1:"},
-			"\U0001f475\U0001f3fc":                       {":older_woman_tone2:"},
-			"\U0001f475\U0001f3fd":                       {":older_woman_tone3:"},
-			"\U0001f475\U0001f3fe":                       {":older_woman_tone4:"},
-			"\U0001f475\U0001f3ff":                       {":older_woman_tone5:"},
-			"\U0001f476":                                 {":baby:"},
-			"\U0001f476\U0001f3fb":                       {":baby_tone1:"},
-			"\U0001f476\U0001f3fc":                       {":baby_tone2:"},
-			"\U0001f476\U0001f3fd":                       {":baby_tone3:"},
-			"\U0001f476\U0001f3fe":                       {":baby_tone4:"},
-			"\U0001f476\U0001f3ff":                       {":baby_tone5:"},
-			"\U0001f477\U0001f3fb":                       {":construction_worker_tone1:"},
-			"\U0001f477\U0001f3fb\u200d\u2640\ufe0f":     {":woman_construction_worker_tone1:"},
-			"\U0001f477\U0001f3fb\u200d\u2642\ufe0f":     {":man_construction_worker_tone1:"},
-			"\U0001f477\U0001f3fc":                       {":construction_worker_tone2:"},
-			"\U0001f477\U0001f3fc\u200d\u2640\ufe0f":     {":woman_construction_worker_tone2:"},
-			"\U0001f477\U0001f3fc\u200d\u2642\ufe0f":     {":man_construction_worker_tone2:"},
-			"\U0001f477\U0001f3fd":                       {":construction_worker_tone3:"},
-			"\U0001f477\U0001f3fd\u200d\u2640\ufe0f":     {":woman_construction_worker_tone3:"},
-			"\U0001f477\U0001f3fd\u200d\u2642\ufe0f":     {":man_construction_worker_tone3:"},
-			"\U0001f477\U0001f3fe":                       {":construction_worker_tone4:"},
-			"\U0001f477\U0001f3fe\u200d\u2640\ufe0f":     {":woman_construction_worker_tone4:"},
-			"\U0001f477\U0001f3fe\u200d\u2642\ufe0f":     {":man_construction_worker_tone4:"},
-			"\U0001f477\U0001f3ff":                       {":construction_worker_tone5:"},
-			"\U0001f477\U0001f3ff\u200d\u2640\ufe0f":     {":woman_construction_worker_tone5:"},
-			"\U0001f477\U0001f3ff\u200d\u2642\ufe0f":     {":man_construction_worker_tone5:"},
-			"\U0001f477\u200d\u2640\ufe0f":               {":construction_worker_woman:", ":woman_construction_worker:", ":female-construction-worker:"},
-			"\U0001f477\u200d\u2642\ufe0f":               {":construction_worker:", ":construction_worker_man:", ":man_construction_worker:", ":male-construction-worker:"},
-			"\U0001f478":                                 {":princess:"},
-			"\U0001f478\U0001f3fb":                       {":princess_tone1:"},
-			"\U0001f478\U0001f3fc":                       {":princess_tone2:"},
-			"\U0001f478\U0001f3fd":                       {":princess_tone3:"},
-			"\U0001f478\U0001f3fe":                       {":princess_tone4:"},
-			"\U0001f478\U0001f3ff":                       {":princess_tone5:"},
-			"\U0001f479":                                 {":ogre:", ":japanese_ogre:"},
-			"\U0001f47a":                                 {":goblin:", ":japanese_goblin:"},
-			"\U0001f47b":                                 {":ghost:"},
-			"\U0001f47c":                                 {":angel:", ":baby_angel:"},
-			"\U0001f47c\U0001f3fb":                       {":angel_tone1:"},
-			"\U0001f47c\U0001f3fc":                       {":angel_tone2:"},
-			"\U0001f47c\U0001f3fd":                       {":angel_tone3:"},
-			"\U0001f47c\U0001f3fe":                       {":angel_tone4:"},
-			"\U0001f47c\U0001f3ff":                       {":angel_tone5:"},
-			"\U0001f47d":                                 {":alien:"},
-			"\U0001f47e":                                 {":alien_monster:", ":space_invader:"},
-			"\U0001f47f":                                 {":imp:", ":angry_face_with_horns:"},
-			"\U0001f480":                                 {":skull:"},
-			"\U0001f481":                                 {":person_tipping_hand:", ":tipping_hand_person:"},
-			"\U0001f481\U0001f3fb":                       {":person_tipping_hand_tone1:"},
-			"\U0001f481\U0001f3fb\u200d\u2640\ufe0f":     {":woman_tipping_hand_tone1:"},
-			"\U0001f481\U0001f3fb\u200d\u2642\ufe0f":     {":man_tipping_hand_tone1:"},
-			"\U0001f481\U0001f3fc":                       {":person_tipping_hand_tone2:"},
-			"\U0001f481\U0001f3fc\u200d\u2640\ufe0f":     {":woman_tipping_hand_tone2:"},
-			"\U0001f481\U0001f3fc\u200d\u2642\ufe0f":     {":man_tipping_hand_tone2:"},
-			"\U0001f481\U0001f3fd":                       {":person_tipping_hand_tone3:"},
-			"\U0001f481\U0001f3fd\u200d\u2640\ufe0f":     {":woman_tipping_hand_tone3:"},
-			"\U0001f481\U0001f3fd\u200d\u2642\ufe0f":     {":man_tipping_hand_tone3:"},
-			"\U0001f481\U0001f3fe":                       {":person_tipping_hand_tone4:"},
-			"\U0001f481\U0001f3fe\u200d\u2640\ufe0f":     {":woman_tipping_hand_tone4:"},
-			"\U0001f481\U0001f3fe\u200d\u2642\ufe0f":     {":man_tipping_hand_tone4:"},
-			"\U0001f481\U0001f3ff":                       {":person_tipping_hand_tone5:"},
-			"\U0001f481\U0001f3ff\u200d\u2640\ufe0f":     {":woman_tipping_hand_tone5:"},
-			"\U0001f481\U0001f3ff\u200d\u2642\ufe0f":     {":man_tipping_hand_tone5:"},
-			"\U0001f481\u200d\u2640\ufe0f":               {":sassy_woman:", ":tipping_hand_woman:", ":woman-tipping-hand:", ":woman_tipping_hand:", ":information_desk_person:"},
-			"\U0001f481\u200d\u2642\ufe0f":               {":sassy_man:", ":man-tipping-hand:", ":man_tipping_hand:", ":tipping_hand_man:"},
-			"\U0001f482":                                 {":guard:"},
-			"\U0001f482\U0001f3fb":                       {":guard_tone1:"},
-			"\U0001f482\U0001f3fb\u200d\u2640\ufe0f":     {":woman_guard_tone1:"},
-			"\U0001f482\U0001f3fb\u200d\u2642\ufe0f":     {":man_guard_tone1:"},
-			"\U0001f482\U0001f3fc":                       {":guard_tone2:"},
-			"\U0001f482\U0001f3fc\u200d\u2640\ufe0f":     {":woman_guard_tone2:"},
-			"\U0001f482\U0001f3fc\u200d\u2642\ufe0f":     {":man_guard_tone2:"},
-			"\U0001f482\U0001f3fd":                       {":guard_tone3:"},
-			"\U0001f482\U0001f3fd\u200d\u2640\ufe0f":     {":woman_guard_tone3:"},
-			"\U0001f482\U0001f3fd\u200d\u2642\ufe0f":     {":man_guard_tone3:"},
-			"\U0001f482\U0001f3fe":                       {":guard_tone4:"},
-			"\U0001f482\U0001f3fe\u200d\u2640\ufe0f":     {":woman_guard_tone4:"},
-			"\U0001f482\U0001f3fe\u200d\u2642\ufe0f":     {":man_guard_tone4:"},
-			"\U0001f482\U0001f3ff":                       {":guard_tone5:"},
-			"\U0001f482\U0001f3ff\u200d\u2640\ufe0f":     {":woman_guard_tone5:"},
-			"\U0001f482\U0001f3ff\u200d\u2642\ufe0f":     {":man_guard_tone5:"},
-			"\U0001f482\u200d\u2640\ufe0f":               {":guardswoman:", ":woman_guard:", ":female-guard:"},
-			"\U0001f482\u200d\u2642\ufe0f":               {":guardsman:", ":man_guard:", ":male-guard:"},
-			"\U0001f483":                                 {":dancer:", ":woman_dancing:"},
-			"\U0001f483\U0001f3fb":                       {":dancer_tone1:"},
-			"\U0001f483\U0001f3fc":                       {":dancer_tone2:"},
-			"\U0001f483\U0001f3fd":                       {":dancer_tone3:"},
-			"\U0001f483\U0001f3fe":                       {":dancer_tone4:"},
-			"\U0001f483\U0001f3ff":                       {":dancer_tone5:"},
-			"\U0001f484":                                 {":lipstick:"},
-			"\U0001f485":                                 {":nail_care:", ":nail_polish:"},
-			"\U0001f485\U0001f3fb":                       {":nail_care_tone1:"},
-			"\U0001f485\U0001f3fc":                       {":nail_care_tone2:"},
-			"\U0001f485\U0001f3fd":                       {":nail_care_tone3:"},
-			"\U0001f485\U0001f3fe":                       {":nail_care_tone4:"},
-			"\U0001f485\U0001f3ff":                       {":nail_care_tone5:"},
-			"\U0001f486":                                 {":person_getting_massage:"},
-			"\U0001f486\U0001f3fb":                       {":person_getting_massage_tone1:"},
-			"\U0001f486\U0001f3fb\u200d\u2640\ufe0f":     {":woman_getting_face_massage_tone1:"},
-			"\U0001f486\U0001f3fb\u200d\u2642\ufe0f":     {":man_getting_face_massage_tone1:"},
-			"\U0001f486\U0001f3fc":                       {":person_getting_massage_tone2:"},
-			"\U0001f486\U0001f3fc\u200d\u2640\ufe0f":     {":woman_getting_face_massage_tone2:"},
-			"\U0001f486\U0001f3fc\u200d\u2642\ufe0f":     {":man_getting_face_massage_tone2:"},
-			"\U0001f486\U0001f3fd":                       {":person_getting_massage_tone3:"},
-			"\U0001f486\U0001f3fd\u200d\u2640\ufe0f":     {":woman_getting_face_massage_tone3:"},
-			"\U0001f486\U0001f3fd\u200d\u2642\ufe0f":     {":man_getting_face_massage_tone3:"},
-			"\U0001f486\U0001f3fe":                       {":person_getting_massage_tone4:"},
-			"\U0001f486\U0001f3fe\u200d\u2640\ufe0f":     {":woman_getting_face_massage_tone4:"},
-			"\U0001f486\U0001f3fe\u200d\u2642\ufe0f":     {":man_getting_face_massage_tone4:"},
-			"\U0001f486\U0001f3ff":                       {":person_getting_massage_tone5:"},
-			"\U0001f486\U0001f3ff\u200d\u2640\ufe0f":     {":woman_getting_face_massage_tone5:"},
-			"\U0001f486\U0001f3ff\u200d\u2642\ufe0f":     {":man_getting_face_massage_tone5:"},
-			"\U0001f486\u200d\u2640\ufe0f":               {":massage:", ":massage_woman:", ":woman-getting-massage:", ":woman_getting_massage:", ":woman_getting_face_massage:"},
-			"\U0001f486\u200d\u2642\ufe0f":               {":massage_man:", ":man-getting-massage:", ":man_getting_massage:", ":man_getting_face_massage:"},
-			"\U0001f487":                                 {":person_getting_haircut:"},
-			"\U0001f487\U0001f3fb":                       {":person_getting_haircut_tone1:"},
-			"\U0001f487\U0001f3fb\u200d\u2640\ufe0f":     {":woman_getting_haircut_tone1:"},
-			"\U0001f487\U0001f3fb\u200d\u2642\ufe0f":     {":man_getting_haircut_tone1:"},
-			"\U0001f487\U0001f3fc":                       {":person_getting_haircut_tone2:"},
-			"\U0001f487\U0001f3fc\u200d\u2640\ufe0f":     {":woman_getting_haircut_tone2:"},
-			"\U0001f487\U0001f3fc\u200d\u2642\ufe0f":     {":man_getting_haircut_tone2:"},
-			"\U0001f487\U0001f3fd":                       {":person_getting_haircut_tone3:"},
-			"\U0001f487\U0001f3fd\u200d\u2640\ufe0f":     {":woman_getting_haircut_tone3:"},
-			"\U0001f487\U0001f3fd\u200d\u2642\ufe0f":     {":man_getting_haircut_tone3:"},
-			"\U0001f487\U0001f3fe":                       {":person_getting_haircut_tone4:"},
-			"\U0001f487\U0001f3fe\u200d\u2640\ufe0f":     {":woman_getting_haircut_tone4:"},
-			"\U0001f487\U0001f3fe\u200d\u2642\ufe0f":     {":man_getting_haircut_tone4:"},
-			"\U0001f487\U0001f3ff":                       {":person_getting_haircut_tone5:"},
-			"\U0001f487\U0001f3ff\u200d\u2640\ufe0f":     {":woman_getting_haircut_tone5:"},
-			"\U0001f487\U0001f3ff\u200d\u2642\ufe0f":     {":man_getting_haircut_tone5:"},
-			"\U0001f487\u200d\u2640\ufe0f":               {":haircut:", ":haircut_woman:", ":woman-getting-haircut:", ":woman_getting_haircut:"},
-			"\U0001f487\u200d\u2642\ufe0f":               {":haircut_man:", ":man-getting-haircut:", ":man_getting_haircut:"},
-			"\U0001f488":                                 {":barber:", ":barber_pole:"},
-			"\U0001f489":                                 {":syringe:"},
-			"\U0001f48a":                                 {":pill:"},
-			"\U0001f48b":                                 {":kiss:", ":kiss_mark:"},
-			"\U0001f48c":                                 {":love_letter:"},
-			"\U0001f48d":                                 {":ring:"},
-			"\U0001f48e":                                 {":gem:", ":gem_stone:"},
-			"\U0001f490":                                 {":bouquet:"},
-			"\U0001f492":                                 {":wedding:"},
-			"\U0001f493":                                 {":heartbeat:", ":beating_heart:"},
-			"\U0001f494":                                 {":broken_heart:"},
-			"\U0001f495":                                 {":two_hearts:"},
-			"\U0001f496":                                 {":sparkling_heart:"},
-			"\U0001f497":                                 {":heartpulse:", ":growing_heart:"},
-			"\U0001f498":                                 {":cupid:", ":heart_with_arrow:"},
-			"\U0001f499":                                 {":blue_heart:"},
-			"\U0001f49a":                                 {":green_heart:"},
-			"\U0001f49b":                                 {":yellow_heart:"},
-			"\U0001f49c":                                 {":purple_heart:"},
-			"\U0001f49d":                                 {":gift_heart:", ":heart_with_ribbon:"},
-			"\U0001f49e":                                 {":revolving_hearts:"},
-			"\U0001f49f":                                 {":heart_decoration:"},
-			"\U0001f4a0":                                 {":diamond_with_a_dot:", ":diamond_shape_with_a_dot_inside:"},
-			"\U0001f4a1":                                 {":bulb:", ":light_bulb:"},
-			"\U0001f4a2":                                 {":anger:", ":anger_symbol:"},
-			"\U0001f4a3":                                 {":bomb:"},
-			"\U0001f4a4":                                 {":zzz:"},
-			"\U0001f4a5":                                 {":boom:", ":collision:"},
-			"\U0001f4a6":                                 {":sweat_drops:", ":sweat_droplets:"},
-			"\U0001f4a7":                                 {":droplet:"},
-			"\U0001f4a8":                                 {":dash:", ":dashing_away:"},
-			"\U0001f4a9":                                 {":poop:", ":shit:", ":hankey:", ":pile_of_poo:"},
-			"\U0001f4aa":                                 {":muscle:", ":flexed_biceps:"},
-			"\U0001f4aa\U0001f3fb":                       {":muscle_tone1:"},
-			"\U0001f4aa\U0001f3fc":                       {":muscle_tone2:"},
-			"\U0001f4aa\U0001f3fd":                       {":muscle_tone3:"},
-			"\U0001f4aa\U0001f3fe":                       {":muscle_tone4:"},
-			"\U0001f4aa\U0001f3ff":                       {":muscle_tone5:"},
-			"\U0001f4ab":                                 {":dizzy:"},
-			"\U0001f4ac":                                 {":speech_balloon:"},
-			"\U0001f4ad":                                 {":thought_balloon:"},
-			"\U0001f4ae":                                 {":white_flower:"},
-			"\U0001f4af":                                 {":100:", ":hundred_points:"},
-			"\U0001f4b0":                                 {":moneybag:", ":money_bag:"},
-			"\U0001f4b1":                                 {":currency_exchange:"},
-			"\U0001f4b2":                                 {":heavy_dollar_sign:"},
-			"\U0001f4b3":                                 {":credit_card:"},
-			"\U0001f4b4":                                 {":yen:", ":yen_banknote:"},
-			"\U0001f4b5":                                 {":dollar:", ":dollar_banknote:"},
-			"\U0001f4b6":                                 {":euro:", ":euro_banknote:"},
-			"\U0001f4b7":                                 {":pound:", ":pound_banknote:"},
-			"\U0001f4b8":                                 {":money_with_wings:"},
-			"\U0001f4b9":                                 {":chart:", ":chart_increasing_with_yen:"},
-			"\U0001f4ba":                                 {":seat:"},
-			"\U0001f4bb":                                 {":laptop:", ":computer:"},
-			"\U0001f4bc":                                 {":briefcase:"},
-			"\U0001f4bd":                                 {":minidisc:", ":computer_disk:"},
-			"\U0001f4be":                                 {":floppy_disk:"},
-			"\U0001f4bf":                                 {":cd:", ":optical_disk:"},
-			"\U0001f4c0":                                 {":dvd:"},
-			"\U0001f4c1":                                 {":file_folder:"},
-			"\U0001f4c2":                                 {":open_file_folder:"},
-			"\U0001f4c3":                                 {":page_with_curl:"},
-			"\U0001f4c4":                                 {":page_facing_up:"},
-			"\U0001f4c5":                                 {":date:"},
-			"\U0001f4c6":                                 {":calendar:", ":tear-off_calendar:"},
-			"\U0001f4c7":                                 {":card_index:"},
-			"\U0001f4c8":                                 {":chart_increasing:", ":chart_with_upwards_trend:"},
-			"\U0001f4c9":                                 {":chart_decreasing:", ":chart_with_downwards_trend:"},
-			"\U0001f4ca":                                 {":bar_chart:"},
-			"\U0001f4cb":                                 {":clipboard:"},
-			"\U0001f4cc":                                 {":pushpin:"},
-			"\U0001f4cd":                                 {":round_pushpin:"},
-			"\U0001f4ce":                                 {":paperclip:"},
-			"\U0001f4cf":                                 {":straight_ruler:"},
-			"\U0001f4d0":                                 {":triangular_ruler:"},
-			"\U0001f4d1":                                 {":bookmark_tabs:"},
-			"\U0001f4d2":                                 {":ledger:"},
-			"\U0001f4d3":                                 {":notebook:"},
-			"\U0001f4d4":                                 {":notebook_with_decorative_cover:"},
-			"\U0001f4d5":                                 {":closed_book:"},
-			"\U0001f4d6":                                 {":book:", ":open_book:"},
-			"\U0001f4d7":                                 {":green_book:"},
-			"\U0001f4d8":                                 {":blue_book:"},
-			"\U0001f4d9":                                 {":orange_book:"},
-			"\U0001f4da":                                 {":books:"},
-			"\U0001f4db":                                 {":name_badge:"},
-			"\U0001f4dc":                                 {":scroll:"},
-			"\U0001f4dd":                                 {":memo:"},
-			"\U0001f4de":                                 {":telephone_receiver:"},
-			"\U0001f4df":                                 {":pager:"},
-			"\U0001f4e0":                                 {":fax:", ":fax_machine:"},
-			"\U0001f4e1":                                 {":satellite_antenna:"},
-			"\U0001f4e2":                                 {":loudspeaker:"},
-			"\U0001f4e3":                                 {":mega:", ":megaphone:"},
-			"\U0001f4e4":                                 {":outbox_tray:"},
-			"\U0001f4e5":                                 {":inbox_tray:"},
-			"\U0001f4e6":                                 {":package:"},
-			"\U0001f4e7":                                 {":e-mail:"},
-			"\U0001f4e8":                                 {":incoming_envelope:"},
-			"\U0001f4e9":                                 {":envelope_with_arrow:"},
-			"\U0001f4ea":                                 {":mailbox_closed:", ":closed_mailbox_with_lowered_flag:"},
-			"\U0001f4eb":                                 {":mailbox:", ":closed_mailbox_with_raised_flag:"},
-			"\U0001f4ec":                                 {":mailbox_with_mail:", ":open_mailbox_with_raised_flag:"},
-			"\U0001f4ed":                                 {":mailbox_with_no_mail:", ":open_mailbox_with_lowered_flag:"},
-			"\U0001f4ee":                                 {":postbox:"},
-			"\U0001f4ef":                                 {":postal_horn:"},
-			"\U0001f4f0":                                 {":newspaper:"},
-			"\U0001f4f1":                                 {":iphone:", ":mobile_phone:"},
-			"\U0001f4f2":                                 {":calling:", ":mobile_phone_with_arrow:"},
-			"\U0001f4f3":                                 {":vibration_mode:"},
-			"\U0001f4f4":                                 {":mobile_phone_off:"},
-			"\U0001f4f5":                                 {":no_mobile_phones:"},
-			"\U0001f4f6":                                 {":antenna_bars:", ":signal_strength:"},
-			"\U0001f4f7":                                 {":camera:"},
-			"\U0001f4f8":                                 {":camera_flash:", ":camera_with_flash:"},
-			"\U0001f4f9":                                 {":video_camera:"},
-			"\U0001f4fa":                                 {":tv:", ":television:"},
-			"\U0001f4fb":                                 {":radio:"},
-			"\U0001f4fc":                                 {":vhs:", ":videocassette:"},
-			"\U0001f4fd":                                 {":projector:"},
-			"\U0001f4fd\ufe0f":                           {":film_projector:"},
-			"\U0001f4ff":                                 {":prayer_beads:"},
-			"\U0001f500":                                 {":shuffle_tracks_button:", ":twisted_rightwards_arrows:"},
-			"\U0001f501":                                 {":repeat:", ":repeat_button:"},
-			"\U0001f502":                                 {":repeat_one:", ":repeat_single_button:"},
-			"\U0001f503":                                 {":arrows_clockwise:", ":clockwise_vertical_arrows:"},
-			"\U0001f504":                                 {":arrows_counterclockwise:", ":counterclockwise_arrows_button:"},
-			"\U0001f505":                                 {":dim_button:", ":low_brightness:"},
-			"\U0001f506":                                 {":bright_button:", ":high_brightness:"},
-			"\U0001f507":                                 {":mute:", ":muted_speaker:"},
-			"\U0001f508":                                 {":speaker:", ":speaker_low_volume:"},
-			"\U0001f509":                                 {":sound:", ":speaker_medium_volume:"},
-			"\U0001f50a":                                 {":loud_sound:", ":speaker_high_volume:"},
-			"\U0001f50b":                                 {":battery:"},
-			"\U0001f50c":                                 {":electric_plug:"},
-			"\U0001f50d":                                 {":mag:", ":magnifying_glass_tilted_left:"},
-			"\U0001f50e":                                 {":mag_right:", ":magnifying_glass_tilted_right:"},
-			"\U0001f50f":                                 {":locked_with_pen:", ":lock_with_ink_pen:"},
-			"\U0001f510":                                 {":locked_with_key:", ":closed_lock_with_key:"},
-			"\U0001f511":                                 {":key:"},
-			"\U0001f512":                                 {":lock:", ":locked:"},
-			"\U0001f513":                                 {":unlock:", ":unlocked:"},
-			"\U0001f514":                                 {":bell:"},
-			"\U0001f515":                                 {":no_bell:", ":bell_with_slash:"},
-			"\U0001f516":                                 {":bookmark:"},
-			"\U0001f517":                                 {":link:"},
-			"\U0001f518":                                 {":radio_button:"},
-			"\U0001f519":                                 {":back:", ":BACK_arrow:"},
-			"\U0001f51a":                                 {":end:", ":END_arrow:"},
-			"\U0001f51b":                                 {":on:", ":ON!_arrow:"},
-			"\U0001f51c":                                 {":soon:", ":SOON_arrow:"},
-			"\U0001f51d":                                 {":top:", ":TOP_arrow:"},
-			"\U0001f51e":                                 {":underage:", ":no_one_under_eighteen:"},
-			"\U0001f51f":                                 {":keycap_10:", ":keycap_ten:"},
-			"\U0001f520":                                 {":capital_abcd:", ":input_latin_uppercase:"},
-			"\U0001f521":                                 {":abcd:", ":input_latin_lowercase:"},
-			"\U0001f522":                                 {":1234:", ":input_numbers:"},
-			"\U0001f523":                                 {":symbols:", ":input_symbols:"},
-			"\U0001f524":                                 {":abc:", ":input_latin_letters:"},
-			"\U0001f525":                                 {":fire:"},
-			"\U0001f526":                                 {":flashlight:"},
-			"\U0001f527":                                 {":wrench:"},
-			"\U0001f528":                                 {":hammer:"},
-			"\U0001f529":                                 {":nut_and_bolt:"},
-			"\U0001f52a":                                 {":hocho:", ":knife:", ":kitchen_knife:"},
-			"\U0001f52b":                                 {":gun:", ":water_pistol:"},
-			"\U0001f52c":                                 {":microscope:"},
-			"\U0001f52d":                                 {":telescope:"},
-			"\U0001f52e":                                 {":crystal_ball:"},
-			"\U0001f52f":                                 {":six_pointed_star:", ":dotted_six-pointed_star:"},
-			"\U0001f530":                                 {":beginner:", ":Japanese_symbol_for_beginner:"},
-			"\U0001f531":                                 {":trident:", ":trident_emblem:"},
-			"\U0001f532":                                 {":black_square_button:"},
-			"\U0001f533":                                 {":white_square_button:"},
-			"\U0001f534":                                 {":red_circle:"},
-			"\U0001f535":                                 {":blue_circle:", ":large_blue_circle:"},
-			"\U0001f536":                                 {":large_orange_diamond:"},
-			"\U0001f537":                                 {":large_blue_diamond:"},
-			"\U0001f538":                                 {":small_orange_diamond:"},
-			"\U0001f539":                                 {":small_blue_diamond:"},
-			"\U0001f53a":                                 {":small_red_triangle:", ":red_triangle_pointed_up:"},
-			"\U0001f53b":                                 {":small_red_triangle_down:", ":red_triangle_pointed_down:"},
-			"\U0001f53c":                                 {":arrow_up_small:", ":upwards_button:"},
-			"\U0001f53d":                                 {":arrow_down_small:", ":downwards_button:"},
-			"\U0001f549":                                 {":om:"},
-			"\U0001f549\ufe0f":                           {":om_symbol:"},
-			"\U0001f54a":                                 {":dove:"},
-			"\U0001f54a\ufe0f":                           {":dove_of_peace:"},
-			"\U0001f54b":                                 {":kaaba:"},
-			"\U0001f54c":                                 {":mosque:"},
-			"\U0001f54d":                                 {":synagogue:"},
-			"\U0001f54e":                                 {":menorah:", ":menorah_with_nine_branches:"},
-			"\U0001f550":                                 {":clock1:", ":one_o’clock:"},
-			"\U0001f551":                                 {":clock2:", ":two_o’clock:"},
-			"\U0001f552":                                 {":clock3:", ":three_o’clock:"},
-			"\U0001f553":                                 {":clock4:", ":four_o’clock:"},
-			"\U0001f554":                                 {":clock5:", ":five_o’clock:"},
-			"\U0001f555":                                 {":clock6:", ":six_o’clock:"},
-			"\U0001f556":                                 {":clock7:", ":seven_o’clock:"},
-			"\U0001f557":                                 {":clock8:", ":eight_o’clock:"},
-			"\U0001f558":                                 {":clock9:", ":nine_o’clock:"},
-			"\U0001f559":                                 {":clock10:", ":ten_o’clock:"},
-			"\U0001f55a":                                 {":clock11:", ":eleven_o’clock:"},
-			"\U0001f55b":                                 {":clock12:", ":twelve_o’clock:"},
-			"\U0001f55c":                                 {":clock130:", ":one-thirty:"},
-			"\U0001f55d":                                 {":clock230:", ":two-thirty:"},
-			"\U0001f55e":                                 {":clock330:", ":three-thirty:"},
-			"\U0001f55f":                                 {":clock430:", ":four-thirty:"},
-			"\U0001f560":                                 {":clock530:", ":five-thirty:"},
-			"\U0001f561":                                 {":clock630:", ":six-thirty:"},
-			"\U0001f562":                                 {":clock730:", ":seven-thirty:"},
-			"\U0001f563":                                 {":clock830:", ":eight-thirty:"},
-			"\U0001f564":                                 {":clock930:", ":nine-thirty:"},
-			"\U0001f565":                                 {":clock1030:", ":ten-thirty:"},
-			"\U0001f566":                                 {":clock1130:", ":eleven-thirty:"},
-			"\U0001f567":                                 {":clock1230:", ":twelve-thirty:"},
-			"\U0001f56f\ufe0f":                           {":candle:"},
-			"\U0001f570":                                 {":clock:"},
-			"\U0001f570\ufe0f":                           {":mantelpiece_clock:"},
-			"\U0001f573\ufe0f":                           {":hole:"},
-			"\U0001f574":                                 {":person_in_suit_levitating:"},
-			"\U0001f574\U0001f3fb":                       {":man_in_business_suit_levitating_tone1:"},
-			"\U0001f574\U0001f3fc":                       {":man_in_business_suit_levitating_tone2:"},
-			"\U0001f574\U0001f3fd":                       {":man_in_business_suit_levitating_tone3:"},
-			"\U0001f574\U0001f3fe":                       {":man_in_business_suit_levitating_tone4:"},
-			"\U0001f574\U0001f3ff":                       {":man_in_business_suit_levitating_tone5:"},
-			"\U0001f574\ufe0f":                           {":business_suit_levitating:", ":man_in_business_suit_levitating:"},
-			"\U0001f575":                                 {":detective:"},
-			"\U0001f575\U0001f3fb":                       {":detective_tone1:"},
-			"\U0001f575\U0001f3fb\u200d\u2640\ufe0f":     {":woman_detective_tone1:"},
-			"\U0001f575\U0001f3fb\u200d\u2642\ufe0f":     {":man_detective_tone1:"},
-			"\U0001f575\U0001f3fc":                       {":detective_tone2:"},
-			"\U0001f575\U0001f3fc\u200d\u2640\ufe0f":     {":woman_detective_tone2:"},
-			"\U0001f575\U0001f3fc\u200d\u2642\ufe0f":     {":man_detective_tone2:"},
-			"\U0001f575\U0001f3fd":                       {":detective_tone3:"},
-			"\U0001f575\U0001f3fd\u200d\u2640\ufe0f":     {":woman_detective_tone3:"},
-			"\U0001f575\U0001f3fd\u200d\u2642\ufe0f":     {":man_detective_tone3:"},
-			"\U0001f575\U0001f3fe":                       {":detective_tone4:"},
-			"\U0001f575\U0001f3fe\u200d\u2640\ufe0f":     {":woman_detective_tone4:"},
-			"\U0001f575\U0001f3fe\u200d\u2642\ufe0f":     {":man_detective_tone4:"},
-			"\U0001f575\U0001f3ff":                       {":detective_tone5:"},
-			"\U0001f575\U0001f3ff\u200d\u2640\ufe0f":     {":woman_detective_tone5:"},
-			"\U0001f575\U0001f3ff\u200d\u2642\ufe0f":     {":man_detective_tone5:"},
-			"\U0001f575\ufe0f\u200d\u2640\ufe0f":         {":woman_detective:", ":female-detective:", ":female_detective:"},
-			"\U0001f575\ufe0f\u200d\u2642\ufe0f":         {":man_detective:", ":sleuth_or_spy:", ":male-detective:", ":male_detective:"},
-			"\U0001f576\ufe0f":                           {":dark_sunglasses:"},
-			"\U0001f577\ufe0f":                           {":spider:"},
-			"\U0001f578\ufe0f":                           {":spider_web:"},
-			"\U0001f579\ufe0f":                           {":joystick:"},
-			"\U0001f57a":                                 {":man_dancing:"},
-			"\U0001f57a\U0001f3fb":                       {":man_dancing_tone1:"},
-			"\U0001f57a\U0001f3fc":                       {":man_dancing_tone2:"},
-			"\U0001f57a\U0001f3fd":                       {":man_dancing_tone3:"},
-			"\U0001f57a\U0001f3fe":                       {":man_dancing_tone4:"},
-			"\U0001f57a\U0001f3ff":                       {":man_dancing_tone5:"},
-			"\U0001f587":                                 {":paperclips:"},
-			"\U0001f587\ufe0f":                           {":linked_paperclips:"},
-			"\U0001f58a":                                 {":pen:", ":pen_ballpoint:"},
-			"\U0001f58a\ufe0f":                           {":lower_left_ballpoint_pen:"},
-			"\U0001f58b":                                 {":fountain_pen:", ":pen_fountain:"},
-			"\U0001f58b\ufe0f":                           {":lower_left_fountain_pen:"},
-			"\U0001f58c":                                 {":paintbrush:"},
-			"\U0001f58c\ufe0f":                           {":lower_left_paintbrush:"},
-			"\U0001f58d":                                 {":crayon:"},
-			"\U0001f58d\ufe0f":                           {":lower_left_crayon:"},
-			"\U0001f590":                                 {":hand_with_fingers_splayed:"},
-			"\U0001f590\U0001f3fb":                       {":hand_splayed_tone1:"},
-			"\U0001f590\U0001f3fc":                       {":hand_splayed_tone2:"},
-			"\U0001f590\U0001f3fd":                       {":hand_splayed_tone3:"},
-			"\U0001f590\U0001f3fe":                       {":hand_splayed_tone4:"},
-			"\U0001f590\U0001f3ff":                       {":hand_splayed_tone5:"},
-			"\U0001f590\ufe0f":                           {":raised_hand_with_fingers_splayed:"},
-			"\U0001f595":                                 {":fu:", ":middle_finger:"},
-			"\U0001f595\U0001f3fb":                       {":middle_finger_tone1:"},
-			"\U0001f595\U0001f3fc":                       {":middle_finger_tone2:"},
-			"\U0001f595\U0001f3fd":                       {":middle_finger_tone3:"},
-			"\U0001f595\U0001f3fe":                       {":middle_finger_tone4:"},
-			"\U0001f595\U0001f3ff":                       {":middle_finger_tone5:"},
-			"\U0001f596":                                 {":vulcan:", ":spock-hand:", ":vulcan_salute:"},
-			"\U0001f596\U0001f3fb":                       {":vulcan_tone1:"},
-			"\U0001f596\U0001f3fc":                       {":vulcan_tone2:"},
-			"\U0001f596\U0001f3fd":                       {":vulcan_tone3:"},
-			"\U0001f596\U0001f3fe":                       {":vulcan_tone4:"},
-			"\U0001f596\U0001f3ff":                       {":vulcan_tone5:"},
-			"\U0001f5a4":                                 {":black_heart:"},
-			"\U0001f5a5":                                 {":desktop:"},
-			"\U0001f5a5\ufe0f":                           {":desktop_computer:"},
-			"\U0001f5a8\ufe0f":                           {":printer:"},
-			"\U0001f5b1":                                 {":computer_mouse:", ":mouse_three_button:"},
-			"\U0001f5b1\ufe0f":                           {":three_button_mouse:"},
-			"\U0001f5b2\ufe0f":                           {":trackball:"},
-			"\U0001f5bc":                                 {":frame_photo:", ":framed_picture:"},
-			"\U0001f5bc\ufe0f":                           {":frame_with_picture:"},
-			"\U0001f5c2":                                 {":dividers:"},
-			"\U0001f5c2\ufe0f":                           {":card_index_dividers:"},
-			"\U0001f5c3":                                 {":card_box:"},
-			"\U0001f5c3\ufe0f":                           {":card_file_box:"},
-			"\U0001f5c4\ufe0f":                           {":file_cabinet:"},
-			"\U0001f5d1\ufe0f":                           {":wastebasket:"},
-			"\U0001f5d2":                                 {":notepad_spiral:", ":spiral_notepad:"},
-			"\U0001f5d2\ufe0f":                           {":spiral_note_pad:"},
-			"\U0001f5d3":                                 {":calendar_spiral:", ":spiral_calendar:"},
-			"\U0001f5d3\ufe0f":                           {":spiral_calendar_pad:"},
-			"\U0001f5dc":                                 {":clamp:"},
-			"\U0001f5dc\ufe0f":                           {":compression:"},
-			"\U0001f5dd":                                 {":key2:"},
-			"\U0001f5dd\ufe0f":                           {":old_key:"},
-			"\U0001f5de":                                 {":newspaper2:", ":rolled-up_newspaper:"},
-			"\U0001f5de\ufe0f":                           {":newspaper_roll:", ":rolled_up_newspaper:"},
-			"\U0001f5e1":                                 {":dagger:"},
-			"\U0001f5e1\ufe0f":                           {":dagger_knife:"},
-			"\U0001f5e3":                                 {":speaking_head:"},
-			"\U0001f5e3\ufe0f":                           {":speaking_head_in_silhouette:"},
-			"\U0001f5e8":                                 {":speech_left:"},
-			"\U0001f5e8\ufe0f":                           {":left_speech_bubble:"},
-			"\U0001f5ef":                                 {":anger_right:"},
-			"\U0001f5ef\ufe0f":                           {":right_anger_bubble:"},
-			"\U0001f5f3":                                 {":ballot_box:"},
-			"\U0001f5f3\ufe0f":                           {":ballot_box_with_ballot:"},
-			"\U0001f5fa":                                 {":map:"},
-			"\U0001f5fa\ufe0f":                           {":world_map:"},
-			"\U0001f5fb":                                 {":mount_fuji:"},
-			"\U0001f5fc":                                 {":Tokyo_tower:", ":tokyo_tower:"},
-			"\U0001f5fd":                                 {":Statue_of_Liberty:", ":statue_of_liberty:"},
-			"\U0001f5fe":                                 {":japan:", ":map_of_Japan:"},
-			"\U0001f5ff":                                 {":moai:", ":moyai:"},
-			"\U0001f600":                                 {":grinning:", ":grinning_face:"},
-			"\U0001f601":                                 {":grin:", ":beaming_face_with_smiling_eyes:"},
-			"\U0001f602":                                 {":joy:", ":face_with_tears_of_joy:"},
-			"\U0001f603":                                 {":smiley:", ":grinning_face_with_big_eyes:"},
-			"\U0001f604":                                 {":smile:", ":grinning_face_with_smiling_eyes:"},
-			"\U0001f605":                                 {":sweat_smile:", ":grinning_face_with_sweat:"},
-			"\U0001f606":                                 {":laughing:", ":satisfied:", ":grinning_squinting_face:"},
-			"\U0001f607":                                 {":innocent:", ":smiling_face_with_halo:"},
-			"\U0001f608":                                 {":smiling_imp:", ":smiling_face_with_horns:"},
-			"\U0001f609":                                 {":wink:", ":winking_face:"},
-			"\U0001f60a":                                 {":blush:", ":smiling_face_with_smiling_eyes:"},
-			"\U0001f60b":                                 {":yum:", ":face_savoring_food:"},
-			"\U0001f60c":                                 {":relieved:", ":relieved_face:"},
-			"\U0001f60d":                                 {":heart_eyes:", ":smiling_face_with_heart-eyes:"},
-			"\U0001f60e":                                 {":sunglasses:", ":smiling_face_with_sunglasses:"},
-			"\U0001f60f":                                 {":smirk:", ":smirking_face:"},
-			"\U0001f610":                                 {":neutral_face:"},
-			"\U0001f611":                                 {":expressionless:", ":expressionless_face:"},
-			"\U0001f612":                                 {":unamused:", ":unamused_face:"},
-			"\U0001f613":                                 {":sweat:", ":downcast_face_with_sweat:"},
-			"\U0001f614":                                 {":pensive:", ":pensive_face:"},
-			"\U0001f615":                                 {":confused:", ":confused_face:"},
-			"\U0001f616":                                 {":confounded:", ":confounded_face:"},
-			"\U0001f617":                                 {":kissing:", ":kissing_face:"},
-			"\U0001f618":                                 {":kissing_heart:", ":face_blowing_a_kiss:"},
-			"\U0001f619":                                 {":kissing_smiling_eyes:", ":kissing_face_with_smiling_eyes:"},
-			"\U0001f61a":                                 {":kissing_closed_eyes:", ":kissing_face_with_closed_eyes:"},
-			"\U0001f61b":                                 {":face_with_tongue:", ":stuck_out_tongue:"},
-			"\U0001f61c":                                 {":winking_face_with_tongue:", ":stuck_out_tongue_winking_eye:"},
-			"\U0001f61d":                                 {":squinting_face_with_tongue:", ":stuck_out_tongue_closed_eyes:"},
-			"\U0001f61e":                                 {":disappointed:", ":disappointed_face:"},
-			"\U0001f61f":                                 {":worried:", ":worried_face:"},
-			"\U0001f620":                                 {":angry:", ":angry_face:"},
-			"\U0001f621":                                 {":pout:", ":rage:", ":pouting_face:"},
-			"\U0001f622":                                 {":cry:", ":crying_face:"},
-			"\U0001f623":                                 {":persevere:", ":persevering_face:"},
-			"\U0001f624":                                 {":triumph:", ":face_with_steam_from_nose:"},
-			"\U0001f625":                                 {":disappointed_relieved:", ":sad_but_relieved_face:"},
-			"\U0001f626":                                 {":frowning:", ":frowning_face_with_open_mouth:"},
-			"\U0001f627":                                 {":anguished:", ":anguished_face:"},
-			"\U0001f628":                                 {":fearful:", ":fearful_face:"},
-			"\U0001f629":                                 {":weary:", ":weary_face:"},
-			"\U0001f62a":                                 {":sleepy:", ":sleepy_face:"},
-			"\U0001f62b":                                 {":tired_face:"},
-			"\U0001f62c":                                 {":grimacing:", ":grimacing_face:"},
-			"\U0001f62d":                                 {":sob:", ":loudly_crying_face:"},
-			"\U0001f62e":                                 {":open_mouth:", ":face_with_open_mouth:"},
-			"\U0001f62e\u200d\U0001f4a8":                 {":face_exhaling:"},
-			"\U0001f62f":                                 {":hushed:", ":hushed_face:"},
-			"\U0001f630":                                 {":cold_sweat:", ":anxious_face_with_sweat:"},
-			"\U0001f631":                                 {":scream:", ":face_screaming_in_fear:"},
-			"\U0001f632":                                 {":astonished:", ":astonished_face:"},
-			"\U0001f633":                                 {":flushed:", ":flushed_face:"},
-			"\U0001f634":                                 {":sleeping:", ":sleeping_face:"},
-			"\U0001f635":                                 {":dizzy_face:", ":knocked-out_face:"},
-			"\U0001f635\u200d\U0001f4ab":                 {":face_with_spiral_eyes:"},
-			"\U0001f636":                                 {":no_mouth:", ":face_without_mouth:"},
-			"\U0001f636\u200d\U0001f32b\ufe0f":           {":face_in_clouds:"},
-			"\U0001f637":                                 {":mask:", ":face_with_medical_mask:"},
-			"\U0001f638":                                 {":smile_cat:", ":grinning_cat_with_smiling_eyes:"},
-			"\U0001f639":                                 {":joy_cat:", ":cat_with_tears_of_joy:"},
-			"\U0001f63a":                                 {":smiley_cat:", ":grinning_cat:"},
-			"\U0001f63b":                                 {":heart_eyes_cat:", ":smiling_cat_with_heart-eyes:"},
-			"\U0001f63c":                                 {":smirk_cat:", ":cat_with_wry_smile:"},
-			"\U0001f63d":                                 {":kissing_cat:"},
-			"\U0001f63e":                                 {":pouting_cat:"},
-			"\U0001f63f":                                 {":crying_cat:", ":crying_cat_face:"},
-			"\U0001f640":                                 {":weary_cat:", ":scream_cat:"},
-			"\U0001f641":                                 {":slight_frown:", ":slightly_frowning_face:"},
-			"\U0001f642":                                 {":slight_smile:", ":slightly_smiling_face:"},
-			"\U0001f643":                                 {":upside_down:", ":upside-down_face:", ":upside_down_face:"},
-			"\U0001f644":                                 {":roll_eyes:", ":rolling_eyes:", ":face_with_rolling_eyes:"},
-			"\U0001f645":                                 {":person_gesturing_NO:", ":person_gesturing_no:"},
-			"\U0001f645\U0001f3fb":                       {":person_gesturing_no_tone1:"},
-			"\U0001f645\U0001f3fb\u200d\u2640\ufe0f":     {":woman_gesturing_no_tone1:"},
-			"\U0001f645\U0001f3fb\u200d\u2642\ufe0f":     {":man_gesturing_no_tone1:"},
-			"\U0001f645\U0001f3fc":                       {":person_gesturing_no_tone2:"},
-			"\U0001f645\U0001f3fc\u200d\u2640\ufe0f":     {":woman_gesturing_no_tone2:"},
-			"\U0001f645\U0001f3fc\u200d\u2642\ufe0f":     {":man_gesturing_no_tone2:"},
-			"\U0001f645\U0001f3fd":                       {":person_gesturing_no_tone3:"},
-			"\U0001f645\U0001f3fd\u200d\u2640\ufe0f":     {":woman_gesturing_no_tone3:"},
-			"\U0001f645\U0001f3fd\u200d\u2642\ufe0f":     {":man_gesturing_no_tone3:"},
-			"\U0001f645\U0001f3fe":                       {":person_gesturing_no_tone4:"},
-			"\U0001f645\U0001f3fe\u200d\u2640\ufe0f":     {":woman_gesturing_no_tone4:"},
-			"\U0001f645\U0001f3fe\u200d\u2642\ufe0f":     {":man_gesturing_no_tone4:"},
-			"\U0001f645\U0001f3ff":                       {":person_gesturing_no_tone5:"},
-			"\U0001f645\U0001f3ff\u200d\u2640\ufe0f":     {":woman_gesturing_no_tone5:"},
-			"\U0001f645\U0001f3ff\u200d\u2642\ufe0f":     {":man_gesturing_no_tone5:"},
-			"\U0001f645\u200d\u2640\ufe0f":               {":no_good:", ":ng_woman:", ":no_good_woman:", ":woman-gesturing-no:", ":woman_gesturing_NO:", ":woman_gesturing_no:"},
-			"\U0001f645\u200d\u2642\ufe0f":               {":ng_man:", ":no_good_man:", ":man-gesturing-no:", ":man_gesturing_NO:", ":man_gesturing_no:"},
-			"\U0001f646":                                 {":ok_person:", ":person_gesturing_OK:", ":person_gesturing_ok:"},
-			"\U0001f646\U0001f3fb":                       {":person_gesturing_ok_tone1:"},
-			"\U0001f646\U0001f3fb\u200d\u2640\ufe0f":     {":woman_gesturing_ok_tone1:"},
-			"\U0001f646\U0001f3fb\u200d\u2642\ufe0f":     {":man_gesturing_ok_tone1:"},
-			"\U0001f646\U0001f3fc":                       {":person_gesturing_ok_tone2:"},
-			"\U0001f646\U0001f3fc\u200d\u2640\ufe0f":     {":woman_gesturing_ok_tone2:"},
-			"\U0001f646\U0001f3fc\u200d\u2642\ufe0f":     {":man_gesturing_ok_tone2:"},
-			"\U0001f646\U0001f3fd":                       {":person_gesturing_ok_tone3:"},
-			"\U0001f646\U0001f3fd\u200d\u2640\ufe0f":     {":woman_gesturing_ok_tone3:"},
-			"\U0001f646\U0001f3fd\u200d\u2642\ufe0f":     {":man_gesturing_ok_tone3:"},
-			"\U0001f646\U0001f3fe":                       {":person_gesturing_ok_tone4:"},
-			"\U0001f646\U0001f3fe\u200d\u2640\ufe0f":     {":woman_gesturing_ok_tone4:"},
-			"\U0001f646\U0001f3fe\u200d\u2642\ufe0f":     {":man_gesturing_ok_tone4:"},
-			"\U0001f646\U0001f3ff":                       {":person_gesturing_ok_tone5:"},
-			"\U0001f646\U0001f3ff\u200d\u2640\ufe0f":     {":woman_gesturing_ok_tone5:"},
-			"\U0001f646\U0001f3ff\u200d\u2642\ufe0f":     {":man_gesturing_ok_tone5:"},
-			"\U0001f646\u200d\u2640\ufe0f":               {":ok_woman:", ":woman-gesturing-ok:", ":woman_gesturing_OK:", ":woman_gesturing_ok:"},
-			"\U0001f646\u200d\u2642\ufe0f":               {":ok_man:", ":man-gesturing-ok:", ":man_gesturing_OK:", ":man_gesturing_ok:"},
-			"\U0001f647":                                 {":person_bowing:"},
-			"\U0001f647\U0001f3fb":                       {":person_bowing_tone1:"},
-			"\U0001f647\U0001f3fb\u200d\u2640\ufe0f":     {":woman_bowing_tone1:"},
-			"\U0001f647\U0001f3fb\u200d\u2642\ufe0f":     {":man_bowing_tone1:"},
-			"\U0001f647\U0001f3fc":                       {":person_bowing_tone2:"},
-			"\U0001f647\U0001f3fc\u200d\u2640\ufe0f":     {":woman_bowing_tone2:"},
-			"\U0001f647\U0001f3fc\u200d\u2642\ufe0f":     {":man_bowing_tone2:"},
-			"\U0001f647\U0001f3fd":                       {":person_bowing_tone3:"},
-			"\U0001f647\U0001f3fd\u200d\u2640\ufe0f":     {":woman_bowing_tone3:"},
-			"\U0001f647\U0001f3fd\u200d\u2642\ufe0f":     {":man_bowing_tone3:"},
-			"\U0001f647\U0001f3fe":                       {":person_bowing_tone4:"},
-			"\U0001f647\U0001f3fe\u200d\u2640\ufe0f":     {":woman_bowing_tone4:"},
-			"\U0001f647\U0001f3fe\u200d\u2642\ufe0f":     {":man_bowing_tone4:"},
-			"\U0001f647\U0001f3ff":                       {":person_bowing_tone5:"},
-			"\U0001f647\U0001f3ff\u200d\u2640\ufe0f":     {":woman_bowing_tone5:"},
-			"\U0001f647\U0001f3ff\u200d\u2642\ufe0f":     {":man_bowing_tone5:"},
-			"\U0001f647\u200d\u2640\ufe0f":               {":bowing_woman:", ":woman-bowing:", ":woman_bowing:"},
-			"\U0001f647\u200d\u2642\ufe0f":               {":bow:", ":bowing_man:", ":man-bowing:", ":man_bowing:"},
-			"\U0001f648":                                 {":see_no_evil:", ":see-no-evil_monkey:"},
-			"\U0001f649":                                 {":hear_no_evil:", ":hear-no-evil_monkey:"},
-			"\U0001f64a":                                 {":speak_no_evil:", ":speak-no-evil_monkey:"},
-			"\U0001f64b":                                 {":person_raising_hand:"},
-			"\U0001f64b\U0001f3fb":                       {":person_raising_hand_tone1:"},
-			"\U0001f64b\U0001f3fb\u200d\u2640\ufe0f":     {":woman_raising_hand_tone1:"},
-			"\U0001f64b\U0001f3fb\u200d\u2642\ufe0f":     {":man_raising_hand_tone1:"},
-			"\U0001f64b\U0001f3fc":                       {":person_raising_hand_tone2:"},
-			"\U0001f64b\U0001f3fc\u200d\u2640\ufe0f":     {":woman_raising_hand_tone2:"},
-			"\U0001f64b\U0001f3fc\u200d\u2642\ufe0f":     {":man_raising_hand_tone2:"},
-			"\U0001f64b\U0001f3fd":                       {":person_raising_hand_tone3:"},
-			"\U0001f64b\U0001f3fd\u200d\u2640\ufe0f":     {":woman_raising_hand_tone3:"},
-			"\U0001f64b\U0001f3fd\u200d\u2642\ufe0f":     {":man_raising_hand_tone3:"},
-			"\U0001f64b\U0001f3fe":                       {":person_raising_hand_tone4:"},
-			"\U0001f64b\U0001f3fe\u200d\u2640\ufe0f":     {":woman_raising_hand_tone4:"},
-			"\U0001f64b\U0001f3fe\u200d\u2642\ufe0f":     {":man_raising_hand_tone4:"},
-			"\U0001f64b\U0001f3ff":                       {":person_raising_hand_tone5:"},
-			"\U0001f64b\U0001f3ff\u200d\u2640\ufe0f":     {":woman_raising_hand_tone5:"},
-			"\U0001f64b\U0001f3ff\u200d\u2642\ufe0f":     {":man_raising_hand_tone5:"},
-			"\U0001f64b\u200d\u2640\ufe0f":               {":raising_hand:", ":raising_hand_woman:", ":woman-raising-hand:", ":woman_raising_hand:"},
-			"\U0001f64b\u200d\u2642\ufe0f":               {":man-raising-hand:", ":man_raising_hand:", ":raising_hand_man:"},
-			"\U0001f64c":                                 {":raised_hands:", ":raising_hands:"},
-			"\U0001f64c\U0001f3fb":                       {":raised_hands_tone1:"},
-			"\U0001f64c\U0001f3fc":                       {":raised_hands_tone2:"},
-			"\U0001f64c\U0001f3fd":                       {":raised_hands_tone3:"},
-			"\U0001f64c\U0001f3fe":                       {":raised_hands_tone4:"},
-			"\U0001f64c\U0001f3ff":                       {":raised_hands_tone5:"},
-			"\U0001f64d":                                 {":frowning_person:"},
-			"\U0001f64d\U0001f3fb":                       {":person_frowning_tone1:"},
-			"\U0001f64d\U0001f3fb\u200d\u2640\ufe0f":     {":woman_frowning_tone1:"},
-			"\U0001f64d\U0001f3fb\u200d\u2642\ufe0f":     {":man_frowning_tone1:"},
-			"\U0001f64d\U0001f3fc":                       {":person_frowning_tone2:"},
-			"\U0001f64d\U0001f3fc\u200d\u2640\ufe0f":     {":woman_frowning_tone2:"},
-			"\U0001f64d\U0001f3fc\u200d\u2642\ufe0f":     {":man_frowning_tone2:"},
-			"\U0001f64d\U0001f3fd":                       {":person_frowning_tone3:"},
-			"\U0001f64d\U0001f3fd\u200d\u2640\ufe0f":     {":woman_frowning_tone3:"},
-			"\U0001f64d\U0001f3fd\u200d\u2642\ufe0f":     {":man_frowning_tone3:"},
-			"\U0001f64d\U0001f3fe":                       {":person_frowning_tone4:"},
-			"\U0001f64d\U0001f3fe\u200d\u2640\ufe0f":     {":woman_frowning_tone4:"},
-			"\U0001f64d\U0001f3fe\u200d\u2642\ufe0f":     {":man_frowning_tone4:"},
-			"\U0001f64d\U0001f3ff":                       {":person_frowning_tone5:"},
-			"\U0001f64d\U0001f3ff\u200d\u2640\ufe0f":     {":woman_frowning_tone5:"},
-			"\U0001f64d\U0001f3ff\u200d\u2642\ufe0f":     {":man_frowning_tone5:"},
-			"\U0001f64d\u200d\u2640\ufe0f":               {":frowning_woman:", ":woman-frowning:", ":woman_frowning:", ":person_frowning:"},
-			"\U0001f64d\u200d\u2642\ufe0f":               {":frowning_man:", ":man-frowning:", ":man_frowning:"},
-			"\U0001f64e":                                 {":person_pouting:"},
-			"\U0001f64e\U0001f3fb":                       {":person_pouting_tone1:"},
-			"\U0001f64e\U0001f3fb\u200d\u2640\ufe0f":     {":woman_pouting_tone1:"},
-			"\U0001f64e\U0001f3fb\u200d\u2642\ufe0f":     {":man_pouting_tone1:"},
-			"\U0001f64e\U0001f3fc":                       {":person_pouting_tone2:"},
-			"\U0001f64e\U0001f3fc\u200d\u2640\ufe0f":     {":woman_pouting_tone2:"},
-			"\U0001f64e\U0001f3fc\u200d\u2642\ufe0f":     {":man_pouting_tone2:"},
-			"\U0001f64e\U0001f3fd":                       {":person_pouting_tone3:"},
-			"\U0001f64e\U0001f3fd\u200d\u2640\ufe0f":     {":woman_pouting_tone3:"},
-			"\U0001f64e\U0001f3fd\u200d\u2642\ufe0f":     {":man_pouting_tone3:"},
-			"\U0001f64e\U0001f3fe":                       {":person_pouting_tone4:"},
-			"\U0001f64e\U0001f3fe\u200d\u2640\ufe0f":     {":woman_pouting_tone4:"},
-			"\U0001f64e\U0001f3fe\u200d\u2642\ufe0f":     {":man_pouting_tone4:"},
-			"\U0001f64e\U0001f3ff":                       {":person_pouting_tone5:"},
-			"\U0001f64e\U0001f3ff\u200d\u2640\ufe0f":     {":woman_pouting_tone5:"},
-			"\U0001f64e\U0001f3ff\u200d\u2642\ufe0f":     {":man_pouting_tone5:"},
-			"\U0001f64e\u200d\u2640\ufe0f":               {":pouting_woman:", ":woman-pouting:", ":woman_pouting:", ":person_with_pouting_face:"},
-			"\U0001f64e\u200d\u2642\ufe0f":               {":man-pouting:", ":man_pouting:", ":pouting_man:"},
-			"\U0001f64f":                                 {":pray:", ":folded_hands:"},
-			"\U0001f64f\U0001f3fb":                       {":pray_tone1:"},
-			"\U0001f64f\U0001f3fc":                       {":pray_tone2:"},
-			"\U0001f64f\U0001f3fd":                       {":pray_tone3:"},
-			"\U0001f64f\U0001f3fe":                       {":pray_tone4:"},
-			"\U0001f64f\U0001f3ff":                       {":pray_tone5:"},
-			"\U0001f680":                                 {":rocket:"},
-			"\U0001f681":                                 {":helicopter:"},
-			"\U0001f682":                                 {":locomotive:", ":steam_locomotive:"},
-			"\U0001f683":                                 {":railway_car:"},
-			"\U0001f684":                                 {":bullettrain_side:", ":high-speed_train:"},
-			"\U0001f685":                                 {":bullet_train:", ":bullettrain_front:"},
-			"\U0001f686":                                 {":train2:"},
-			"\U0001f687":                                 {":metro:"},
-			"\U0001f688":                                 {":light_rail:"},
-			"\U0001f689":                                 {":station:"},
-			"\U0001f68a":                                 {":tram:"},
-			"\U0001f68b":                                 {":train:", ":tram_car:"},
-			"\U0001f68c":                                 {":bus:"},
-			"\U0001f68d":                                 {":oncoming_bus:"},
-			"\U0001f68e":                                 {":trolleybus:"},
-			"\U0001f68f":                                 {":busstop:", ":bus_stop:"},
-			"\U0001f690":                                 {":minibus:"},
-			"\U0001f691":                                 {":ambulance:"},
-			"\U0001f692":                                 {":fire_engine:"},
-			"\U0001f693":                                 {":police_car:"},
-			"\U0001f694":                                 {":oncoming_police_car:"},
-			"\U0001f695":                                 {":taxi:"},
-			"\U0001f696":                                 {":oncoming_taxi:"},
-			"\U0001f697":                                 {":car:", ":red_car:", ":automobile:"},
-			"\U0001f698":                                 {":oncoming_automobile:"},
-			"\U0001f699":                                 {":blue_car:", ":sport_utility_vehicle:"},
-			"\U0001f69a":                                 {":truck:", ":delivery_truck:"},
-			"\U0001f69b":                                 {":articulated_lorry:"},
-			"\U0001f69c":                                 {":tractor:"},
-			"\U0001f69d":                                 {":monorail:"},
-			"\U0001f69e":                                 {":mountain_railway:"},
-			"\U0001f69f":                                 {":suspension_railway:"},
-			"\U0001f6a0":                                 {":mountain_cableway:"},
-			"\U0001f6a1":                                 {":aerial_tramway:"},
-			"\U0001f6a2":                                 {":ship:"},
-			"\U0001f6a3":                                 {":person_rowing_boat:"},
-			"\U0001f6a3\U0001f3fb":                       {":person_rowing_boat_tone1:"},
-			"\U0001f6a3\U0001f3fb\u200d\u2640\ufe0f":     {":woman_rowing_boat_tone1:"},
-			"\U0001f6a3\U0001f3fb\u200d\u2642\ufe0f":     {":man_rowing_boat_tone1:"},
-			"\U0001f6a3\U0001f3fc":                       {":person_rowing_boat_tone2:"},
-			"\U0001f6a3\U0001f3fc\u200d\u2640\ufe0f":     {":woman_rowing_boat_tone2:"},
-			"\U0001f6a3\U0001f3fc\u200d\u2642\ufe0f":     {":man_rowing_boat_tone2:"},
-			"\U0001f6a3\U0001f3fd":                       {":person_rowing_boat_tone3:"},
-			"\U0001f6a3\U0001f3fd\u200d\u2640\ufe0f":     {":woman_rowing_boat_tone3:"},
-			"\U0001f6a3\U0001f3fd\u200d\u2642\ufe0f":     {":man_rowing_boat_tone3:"},
-			"\U0001f6a3\U0001f3fe":                       {":person_rowing_boat_tone4:"},
-			"\U0001f6a3\U0001f3fe\u200d\u2640\ufe0f":     {":woman_rowing_boat_tone4:"},
-			"\U0001f6a3\U0001f3fe\u200d\u2642\ufe0f":     {":man_rowing_boat_tone4:"},
-			"\U0001f6a3\U0001f3ff":                       {":person_rowing_boat_tone5:"},
-			"\U0001f6a3\U0001f3ff\u200d\u2640\ufe0f":     {":woman_rowing_boat_tone5:"},
-			"\U0001f6a3\U0001f3ff\u200d\u2642\ufe0f":     {":man_rowing_boat_tone5:"},
-			"\U0001f6a3\u200d\u2640\ufe0f":               {":rowing_woman:", ":woman-rowing-boat:", ":woman_rowing_boat:"},
-			"\U0001f6a3\u200d\u2642\ufe0f":               {":rowboat:", ":rowing_man:", ":man-rowing-boat:", ":man_rowing_boat:"},
-			"\U0001f6a4":                                 {":speedboat:"},
-			"\U0001f6a5":                                 {":traffic_light:", ":horizontal_traffic_light:"},
-			"\U0001f6a6":                                 {":vertical_traffic_light:"},
-			"\U0001f6a7":                                 {":construction:"},
-			"\U0001f6a8":                                 {":rotating_light:", ":police_car_light:"},
-			"\U0001f6a9":                                 {":triangular_flag:", ":triangular_flag_on_post:"},
-			"\U0001f6aa":                                 {":door:"},
-			"\U0001f6ab":                                 {":prohibited:", ":no_entry_sign:"},
-			"\U0001f6ac":                                 {":smoking:", ":cigarette:"},
-			"\U0001f6ad":                                 {":no_smoking:"},
-			"\U0001f6ae":                                 {":litter_in_bin_sign:", ":put_litter_in_its_place:"},
-			"\U0001f6af":                                 {":no_littering:", ":do_not_litter:"},
-			"\U0001f6b0":                                 {":potable_water:"},
-			"\U0001f6b1":                                 {":non-potable_water:"},
-			"\U0001f6b2":                                 {":bike:", ":bicycle:"},
-			"\U0001f6b3":                                 {":no_bicycles:"},
-			"\U0001f6b4":                                 {":person_biking:"},
-			"\U0001f6b4\U0001f3fb":                       {":person_biking_tone1:"},
-			"\U0001f6b4\U0001f3fb\u200d\u2640\ufe0f":     {":woman_biking_tone1:"},
-			"\U0001f6b4\U0001f3fb\u200d\u2642\ufe0f":     {":man_biking_tone1:"},
-			"\U0001f6b4\U0001f3fc":                       {":person_biking_tone2:"},
-			"\U0001f6b4\U0001f3fc\u200d\u2640\ufe0f":     {":woman_biking_tone2:"},
-			"\U0001f6b4\U0001f3fc\u200d\u2642\ufe0f":     {":man_biking_tone2:"},
-			"\U0001f6b4\U0001f3fd":                       {":person_biking_tone3:"},
-			"\U0001f6b4\U0001f3fd\u200d\u2640\ufe0f":     {":woman_biking_tone3:"},
-			"\U0001f6b4\U0001f3fd\u200d\u2642\ufe0f":     {":man_biking_tone3:"},
-			"\U0001f6b4\U0001f3fe":                       {":person_biking_tone4:"},
-			"\U0001f6b4\U0001f3fe\u200d\u2640\ufe0f":     {":woman_biking_tone4:"},
-			"\U0001f6b4\U0001f3fe\u200d\u2642\ufe0f":     {":man_biking_tone4:"},
-			"\U0001f6b4\U0001f3ff":                       {":person_biking_tone5:"},
-			"\U0001f6b4\U0001f3ff\u200d\u2640\ufe0f":     {":woman_biking_tone5:"},
-			"\U0001f6b4\U0001f3ff\u200d\u2642\ufe0f":     {":man_biking_tone5:"},
-			"\U0001f6b4\u200d\u2640\ufe0f":               {":biking_woman:", ":woman-biking:", ":woman_biking:"},
-			"\U0001f6b4\u200d\u2642\ufe0f":               {":bicyclist:", ":biking_man:", ":man-biking:", ":man_biking:"},
-			"\U0001f6b5":                                 {":person_mountain_biking:"},
-			"\U0001f6b5\U0001f3fb":                       {":person_mountain_biking_tone1:"},
-			"\U0001f6b5\U0001f3fb\u200d\u2640\ufe0f":     {":woman_mountain_biking_tone1:"},
-			"\U0001f6b5\U0001f3fb\u200d\u2642\ufe0f":     {":man_mountain_biking_tone1:"},
-			"\U0001f6b5\U0001f3fc":                       {":person_mountain_biking_tone2:"},
-			"\U0001f6b5\U0001f3fc\u200d\u2640\ufe0f":     {":woman_mountain_biking_tone2:"},
-			"\U0001f6b5\U0001f3fc\u200d\u2642\ufe0f":     {":man_mountain_biking_tone2:"},
-			"\U0001f6b5\U0001f3fd":                       {":person_mountain_biking_tone3:"},
-			"\U0001f6b5\U0001f3fd\u200d\u2640\ufe0f":     {":woman_mountain_biking_tone3:"},
-			"\U0001f6b5\U0001f3fd\u200d\u2642\ufe0f":     {":man_mountain_biking_tone3:"},
-			"\U0001f6b5\U0001f3fe":                       {":person_mountain_biking_tone4:"},
-			"\U0001f6b5\U0001f3fe\u200d\u2640\ufe0f":     {":woman_mountain_biking_tone4:"},
-			"\U0001f6b5\U0001f3fe\u200d\u2642\ufe0f":     {":man_mountain_biking_tone4:"},
-			"\U0001f6b5\U0001f3ff":                       {":person_mountain_biking_tone5:"},
-			"\U0001f6b5\U0001f3ff\u200d\u2640\ufe0f":     {":woman_mountain_biking_tone5:"},
-			"\U0001f6b5\U0001f3ff\u200d\u2642\ufe0f":     {":man_mountain_biking_tone5:"},
-			"\U0001f6b5\u200d\u2640\ufe0f":               {":mountain_biking_woman:", ":woman-mountain-biking:", ":woman_mountain_biking:"},
-			"\U0001f6b5\u200d\u2642\ufe0f":               {":mountain_bicyclist:", ":man-mountain-biking:", ":man_mountain_biking:", ":mountain_biking_man:"},
-			"\U0001f6b6":                                 {":person_walking:"},
-			"\U0001f6b6\U0001f3fb":                       {":person_walking_tone1:"},
-			"\U0001f6b6\U0001f3fb\u200d\u2640\ufe0f":     {":woman_walking_tone1:"},
-			"\U0001f6b6\U0001f3fb\u200d\u2642\ufe0f":     {":man_walking_tone1:"},
-			"\U0001f6b6\U0001f3fc":                       {":person_walking_tone2:"},
-			"\U0001f6b6\U0001f3fc\u200d\u2640\ufe0f":     {":woman_walking_tone2:"},
-			"\U0001f6b6\U0001f3fc\u200d\u2642\ufe0f":     {":man_walking_tone2:"},
-			"\U0001f6b6\U0001f3fd":                       {":person_walking_tone3:"},
-			"\U0001f6b6\U0001f3fd\u200d\u2640\ufe0f":     {":woman_walking_tone3:"},
-			"\U0001f6b6\U0001f3fd\u200d\u2642\ufe0f":     {":man_walking_tone3:"},
-			"\U0001f6b6\U0001f3fe":                       {":person_walking_tone4:"},
-			"\U0001f6b6\U0001f3fe\u200d\u2640\ufe0f":     {":woman_walking_tone4:"},
-			"\U0001f6b6\U0001f3fe\u200d\u2642\ufe0f":     {":man_walking_tone4:"},
-			"\U0001f6b6\U0001f3ff":                       {":person_walking_tone5:"},
-			"\U0001f6b6\U0001f3ff\u200d\u2640\ufe0f":     {":woman_walking_tone5:"},
-			"\U0001f6b6\U0001f3ff\u200d\u2642\ufe0f":     {":man_walking_tone5:"},
-			"\U0001f6b6\u200d\u2640\ufe0f":               {":walking_woman:", ":woman-walking:", ":woman_walking:"},
-			"\U0001f6b6\u200d\u2642\ufe0f":               {":walking:", ":man-walking:", ":man_walking:", ":walking_man:"},
-			"\U0001f6b7":                                 {":no_pedestrians:"},
-			"\U0001f6b8":                                 {":children_crossing:"},
-			"\U0001f6b9":                                 {":mens:", ":men’s_room:"},
-			"\U0001f6ba":                                 {":womens:", ":women’s_room:"},
-			"\U0001f6bb":                                 {":restroom:"},
-			"\U0001f6bc":                                 {":baby_symbol:"},
-			"\U0001f6bd":                                 {":toilet:"},
-			"\U0001f6be":                                 {":wc:", ":water_closet:"},
-			"\U0001f6bf":                                 {":shower:"},
-			"\U0001f6c0":                                 {":bath:", ":person_taking_bath:"},
-			"\U0001f6c0\U0001f3fb":                       {":bath_tone1:"},
-			"\U0001f6c0\U0001f3fc":                       {":bath_tone2:"},
-			"\U0001f6c0\U0001f3fd":                       {":bath_tone3:"},
-			"\U0001f6c0\U0001f3fe":                       {":bath_tone4:"},
-			"\U0001f6c0\U0001f3ff":                       {":bath_tone5:"},
-			"\U0001f6c1":                                 {":bathtub:"},
-			"\U0001f6c2":                                 {":passport_control:"},
-			"\U0001f6c3":                                 {":customs:"},
-			"\U0001f6c4":                                 {":baggage_claim:"},
-			"\U0001f6c5":                                 {":left_luggage:"},
-			"\U0001f6cb":                                 {":couch:"},
-			"\U0001f6cb\ufe0f":                           {":couch_and_lamp:"},
-			"\U0001f6cc":                                 {":sleeping_bed:", ":person_in_bed:", ":sleeping_accommodation:"},
-			"\U0001f6cc\U0001f3fb":                       {":person_in_bed_tone1:"},
-			"\U0001f6cc\U0001f3fc":                       {":person_in_bed_tone2:"},
-			"\U0001f6cc\U0001f3fd":                       {":person_in_bed_tone3:"},
-			"\U0001f6cc\U0001f3fe":                       {":person_in_bed_tone4:"},
-			"\U0001f6cc\U0001f3ff":                       {":person_in_bed_tone5:"},
-			"\U0001f6cd\ufe0f":                           {":shopping:", ":shopping_bags:"},
-			"\U0001f6ce":                                 {":bellhop:"},
-			"\U0001f6ce\ufe0f":                           {":bellhop_bell:"},
-			"\U0001f6cf\ufe0f":                           {":bed:"},
-			"\U0001f6d0":                                 {":place_of_worship:"},
-			"\U0001f6d1":                                 {":stop_sign:", ":octagonal_sign:"},
-			"\U0001f6d2":                                 {":shopping_cart:", ":shopping_trolley:"},
-			"\U0001f6d5":                                 {":hindu_temple:"},
-			"\U0001f6d6":                                 {":hut:"},
-			"\U0001f6d7":                                 {":elevator:"},
-			"\U0001f6e0":                                 {":tools:"},
-			"\U0001f6e0\ufe0f":                           {":hammer_and_wrench:"},
-			"\U0001f6e1\ufe0f":                           {":shield:"},
-			"\U0001f6e2":                                 {":oil:"},
-			"\U0001f6e2\ufe0f":                           {":oil_drum:"},
-			"\U0001f6e3\ufe0f":                           {":motorway:"},
-			"\U0001f6e4\ufe0f":                           {":railway_track:"},
-			"\U0001f6e5":                                 {":motorboat:"},
-			"\U0001f6e5\ufe0f":                           {":motor_boat:"},
-			"\U0001f6e9":                                 {":airplane_small:"},
-			"\U0001f6e9\ufe0f":                           {":small_airplane:"},
-			"\U0001f6eb":                                 {":flight_departure:", ":airplane_departure:"},
-			"\U0001f6ec":                                 {":flight_arrival:", ":airplane_arrival:", ":airplane_arriving:"},
-			"\U0001f6f0":                                 {":satellite_orbital:"},
-			"\U0001f6f0\ufe0f":                           {":satellite:", ":artificial_satellite:"},
-			"\U0001f6f3":                                 {":cruise_ship:"},
-			"\U0001f6f3\ufe0f":                           {":passenger_ship:"},
-			"\U0001f6f4":                                 {":scooter:", ":kick_scooter:"},
-			"\U0001f6f5":                                 {":motor_scooter:"},
-			"\U0001f6f6":                                 {":canoe:"},
-			"\U0001f6f7":                                 {":sled:"},
-			"\U0001f6f8":                                 {":flying_saucer:"},
-			"\U0001f6f9":                                 {":skateboard:"},
-			"\U0001f6fa":                                 {":auto_rickshaw:"},
-			"\U0001f6fb":                                 {":pickup_truck:"},
-			"\U0001f6fc":                                 {":roller_skate:"},
-			"\U0001f7e0":                                 {":orange_circle:", ":large_orange_circle:"},
-			"\U0001f7e1":                                 {":yellow_circle:", ":large_yellow_circle:"},
-			"\U0001f7e2":                                 {":green_circle:", ":large_green_circle:"},
-			"\U0001f7e3":                                 {":purple_circle:", ":large_purple_circle:"},
-			"\U0001f7e4":                                 {":brown_circle:", ":large_brown_circle:"},
-			"\U0001f7e5":                                 {":red_square:", ":large_red_square:"},
-			"\U0001f7e6":                                 {":blue_square:", ":large_blue_square:"},
-			"\U0001f7e7":                                 {":orange_square:", ":large_orange_square:"},
-			"\U0001f7e8":                                 {":yellow_square:", ":large_yellow_square:"},
-			"\U0001f7e9":                                 {":green_square:", ":large_green_square:"},
-			"\U0001f7ea":                                 {":purple_square:", ":large_purple_square:"},
-			"\U0001f7eb":                                 {":brown_square:", ":large_brown_square:"},
-			"\U0001f90c":                                 {":pinched_fingers:"},
-			"\U0001f90d":                                 {":white_heart:"},
-			"\U0001f90e":                                 {":brown_heart:"},
-			"\U0001f90f":                                 {":pinching_hand:"},
-			"\U0001f910":                                 {":zipper_mouth:", ":zipper-mouth_face:", ":zipper_mouth_face:"},
-			"\U0001f911":                                 {":money_mouth:", ":money-mouth_face:", ":money_mouth_face:"},
-			"\U0001f912":                                 {":thermometer_face:", ":face_with_thermometer:"},
-			"\U0001f913":                                 {":nerd:", ":nerd_face:"},
-			"\U0001f914":                                 {":thinking:", ":thinking_face:"},
-			"\U0001f915":                                 {":head_bandage:", ":face_with_head-bandage:", ":face_with_head_bandage:"},
-			"\U0001f916":                                 {":robot:", ":robot_face:"},
-			"\U0001f917":                                 {":hugs:", ":hugging:", ":hugging_face:"},
-			"\U0001f918":                                 {":metal:", ":the_horns:", ":sign_of_the_horns:"},
-			"\U0001f918\U0001f3fb":                       {":metal_tone1:"},
-			"\U0001f918\U0001f3fc":                       {":metal_tone2:"},
-			"\U0001f918\U0001f3fd":                       {":metal_tone3:"},
-			"\U0001f918\U0001f3fe":                       {":metal_tone4:"},
-			"\U0001f918\U0001f3ff":                       {":metal_tone5:"},
-			"\U0001f919":                                 {":call_me:", ":call_me_hand:"},
-			"\U0001f919\U0001f3fb":                       {":call_me_tone1:"},
-			"\U0001f919\U0001f3fc":                       {":call_me_tone2:"},
-			"\U0001f919\U0001f3fd":                       {":call_me_tone3:"},
-			"\U0001f919\U0001f3fe":                       {":call_me_tone4:"},
-			"\U0001f919\U0001f3ff":                       {":call_me_tone5:"},
-			"\U0001f91a":                                 {":raised_back_of_hand:"},
-			"\U0001f91a\U0001f3fb":                       {":raised_back_of_hand_tone1:"},
-			"\U0001f91a\U0001f3fc":                       {":raised_back_of_hand_tone2:"},
-			"\U0001f91a\U0001f3fd":                       {":raised_back_of_hand_tone3:"},
-			"\U0001f91a\U0001f3fe":                       {":raised_back_of_hand_tone4:"},
-			"\U0001f91a\U0001f3ff":                       {":raised_back_of_hand_tone5:"},
-			"\U0001f91b":                                 {":fist_left:", ":left-facing_fist:", ":left_facing_fist:"},
-			"\U0001f91b\U0001f3fb":                       {":left_facing_fist_tone1:"},
-			"\U0001f91b\U0001f3fc":                       {":left_facing_fist_tone2:"},
-			"\U0001f91b\U0001f3fd":                       {":left_facing_fist_tone3:"},
-			"\U0001f91b\U0001f3fe":                       {":left_facing_fist_tone4:"},
-			"\U0001f91b\U0001f3ff":                       {":left_facing_fist_tone5:"},
-			"\U0001f91c":                                 {":fist_right:", ":right-facing_fist:", ":right_facing_fist:"},
-			"\U0001f91c\U0001f3fb":                       {":right_facing_fist_tone1:"},
-			"\U0001f91c\U0001f3fc":                       {":right_facing_fist_tone2:"},
-			"\U0001f91c\U0001f3fd":                       {":right_facing_fist_tone3:"},
-			"\U0001f91c\U0001f3fe":                       {":right_facing_fist_tone4:"},
-			"\U0001f91c\U0001f3ff":                       {":right_facing_fist_tone5:"},
-			"\U0001f91d":                                 {":handshake:"},
-			"\U0001f91e":                                 {":crossed_fingers:", ":fingers_crossed:"},
-			"\U0001f91e\U0001f3fb":                       {":fingers_crossed_tone1:"},
-			"\U0001f91e\U0001f3fc":                       {":fingers_crossed_tone2:"},
-			"\U0001f91e\U0001f3fd":                       {":fingers_crossed_tone3:"},
-			"\U0001f91e\U0001f3fe":                       {":fingers_crossed_tone4:"},
-			"\U0001f91e\U0001f3ff":                       {":fingers_crossed_tone5:"},
-			"\U0001f91f":                                 {":love-you_gesture:", ":love_you_gesture:", ":i_love_you_hand_sign:"},
-			"\U0001f91f\U0001f3fb":                       {":love_you_gesture_tone1:"},
-			"\U0001f91f\U0001f3fc":                       {":love_you_gesture_tone2:"},
-			"\U0001f91f\U0001f3fd":                       {":love_you_gesture_tone3:"},
-			"\U0001f91f\U0001f3fe":                       {":love_you_gesture_tone4:"},
-			"\U0001f91f\U0001f3ff":                       {":love_you_gesture_tone5:"},
-			"\U0001f920":                                 {":cowboy:", ":cowboy_hat_face:", ":face_with_cowboy_hat:"},
-			"\U0001f921":                                 {":clown:", ":clown_face:"},
-			"\U0001f922":                                 {":nauseated_face:"},
-			"\U0001f923":                                 {":rofl:", ":rolling_on_the_floor_laughing:"},
-			"\U0001f924":                                 {":drooling_face:"},
-			"\U0001f925":                                 {":lying_face:"},
-			"\U0001f926":                                 {":facepalm:", ":face_palm:", ":person_facepalming:"},
-			"\U0001f926\U0001f3fb":                       {":person_facepalming_tone1:"},
-			"\U0001f926\U0001f3fb\u200d\u2640\ufe0f":     {":woman_facepalming_tone1:"},
-			"\U0001f926\U0001f3fb\u200d\u2642\ufe0f":     {":man_facepalming_tone1:"},
-			"\U0001f926\U0001f3fc":                       {":person_facepalming_tone2:"},
-			"\U0001f926\U0001f3fc\u200d\u2640\ufe0f":     {":woman_facepalming_tone2:"},
-			"\U0001f926\U0001f3fc\u200d\u2642\ufe0f":     {":man_facepalming_tone2:"},
-			"\U0001f926\U0001f3fd":                       {":person_facepalming_tone3:"},
-			"\U0001f926\U0001f3fd\u200d\u2640\ufe0f":     {":woman_facepalming_tone3:"},
-			"\U0001f926\U0001f3fd\u200d\u2642\ufe0f":     {":man_facepalming_tone3:"},
-			"\U0001f926\U0001f3fe":                       {":person_facepalming_tone4:"},
-			"\U0001f926\U0001f3fe\u200d\u2640\ufe0f":     {":woman_facepalming_tone4:"},
-			"\U0001f926\U0001f3fe\u200d\u2642\ufe0f":     {":man_facepalming_tone4:"},
-			"\U0001f926\U0001f3ff":                       {":person_facepalming_tone5:"},
-			"\U0001f926\U0001f3ff\u200d\u2640\ufe0f":     {":woman_facepalming_tone5:"},
-			"\U0001f926\U0001f3ff\u200d\u2642\ufe0f":     {":man_facepalming_tone5:"},
-			"\U0001f926\u200d\u2640\ufe0f":               {":woman-facepalming:", ":woman_facepalming:"},
-			"\U0001f926\u200d\u2642\ufe0f":               {":man-facepalming:", ":man_facepalming:"},
-			"\U0001f927":                                 {":sneezing_face:"},
-			"\U0001f928":                                 {":raised_eyebrow:", ":face_with_raised_eyebrow:"},
-			"\U0001f929":                                 {":star-struck:", ":star_struck:"},
-			"\U0001f92a":                                 {":zany_face:", ":crazy_face:"},
-			"\U0001f92b":                                 {":shushing_face:"},
-			"\U0001f92c":                                 {":cursing_face:", ":face_with_symbols_on_mouth:", ":face_with_symbols_over_mouth:"},
-			"\U0001f92d":                                 {":hand_over_mouth:", ":face_with_hand_over_mouth:"},
-			"\U0001f92e":                                 {":face_vomiting:", ":vomiting_face:"},
-			"\U0001f92f":                                 {":exploding_head:"},
-			"\U0001f930":                                 {":pregnant_woman:"},
-			"\U0001f930\U0001f3fb":                       {":pregnant_woman_tone1:"},
-			"\U0001f930\U0001f3fc":                       {":pregnant_woman_tone2:"},
-			"\U0001f930\U0001f3fd":                       {":pregnant_woman_tone3:"},
-			"\U0001f930\U0001f3fe":                       {":pregnant_woman_tone4:"},
-			"\U0001f930\U0001f3ff":                       {":pregnant_woman_tone5:"},
-			"\U0001f931":                                 {":breast-feeding:", ":breast_feeding:"},
-			"\U0001f931\U0001f3fb":                       {":breast_feeding_tone1:"},
-			"\U0001f931\U0001f3fc":                       {":breast_feeding_tone2:"},
-			"\U0001f931\U0001f3fd":                       {":breast_feeding_tone3:"},
-			"\U0001f931\U0001f3fe":                       {":breast_feeding_tone4:"},
-			"\U0001f931\U0001f3ff":                       {":breast_feeding_tone5:"},
-			"\U0001f932":                                 {":palms_up_together:"},
-			"\U0001f932\U0001f3fb":                       {":palms_up_together_tone1:"},
-			"\U0001f932\U0001f3fc":                       {":palms_up_together_tone2:"},
-			"\U0001f932\U0001f3fd":                       {":palms_up_together_tone3:"},
-			"\U0001f932\U0001f3fe":                       {":palms_up_together_tone4:"},
-			"\U0001f932\U0001f3ff":                       {":palms_up_together_tone5:"},
-			"\U0001f933":                                 {":selfie:"},
-			"\U0001f933\U0001f3fb":                       {":selfie_tone1:"},
-			"\U0001f933\U0001f3fc":                       {":selfie_tone2:"},
-			"\U0001f933\U0001f3fd":                       {":selfie_tone3:"},
-			"\U0001f933\U0001f3fe":                       {":selfie_tone4:"},
-			"\U0001f933\U0001f3ff":                       {":selfie_tone5:"},
-			"\U0001f934":                                 {":prince:"},
-			"\U0001f934\U0001f3fb":                       {":prince_tone1:"},
-			"\U0001f934\U0001f3fc":                       {":prince_tone2:"},
-			"\U0001f934\U0001f3fd":                       {":prince_tone3:"},
-			"\U0001f934\U0001f3fe":                       {":prince_tone4:"},
-			"\U0001f934\U0001f3ff":                       {":prince_tone5:"},
-			"\U0001f935":                                 {":person_in_tuxedo:"},
-			"\U0001f935\U0001f3fb":                       {":man_in_tuxedo_tone1:"},
-			"\U0001f935\U0001f3fc":                       {":man_in_tuxedo_tone2:"},
-			"\U0001f935\U0001f3fd":                       {":man_in_tuxedo_tone3:"},
-			"\U0001f935\U0001f3fe":                       {":man_in_tuxedo_tone4:"},
-			"\U0001f935\U0001f3ff":                       {":man_in_tuxedo_tone5:"},
-			"\U0001f935\u200d\u2640\ufe0f":               {":woman_in_tuxedo:"},
-			"\U0001f935\u200d\u2642\ufe0f":               {":man_in_tuxedo:"},
-			"\U0001f936":                                 {":mrs_claus:", ":Mrs._Claus:"},
-			"\U0001f936\U0001f3fb":                       {":mrs_claus_tone1:"},
-			"\U0001f936\U0001f3fc":                       {":mrs_claus_tone2:"},
-			"\U0001f936\U0001f3fd":                       {":mrs_claus_tone3:"},
-			"\U0001f936\U0001f3fe":                       {":mrs_claus_tone4:"},
-			"\U0001f936\U0001f3ff":                       {":mrs_claus_tone5:"},
-			"\U0001f937":                                 {":shrug:", ":person_shrugging:"},
-			"\U0001f937\U0001f3fb":                       {":person_shrugging_tone1:"},
-			"\U0001f937\U0001f3fb\u200d\u2640\ufe0f":     {":woman_shrugging_tone1:"},
-			"\U0001f937\U0001f3fb\u200d\u2642\ufe0f":     {":man_shrugging_tone1:"},
-			"\U0001f937\U0001f3fc":                       {":person_shrugging_tone2:"},
-			"\U0001f937\U0001f3fc\u200d\u2640\ufe0f":     {":woman_shrugging_tone2:"},
-			"\U0001f937\U0001f3fc\u200d\u2642\ufe0f":     {":man_shrugging_tone2:"},
-			"\U0001f937\U0001f3fd":                       {":person_shrugging_tone3:"},
-			"\U0001f937\U0001f3fd\u200d\u2640\ufe0f":     {":woman_shrugging_tone3:"},
-			"\U0001f937\U0001f3fd\u200d\u2642\ufe0f":     {":man_shrugging_tone3:"},
-			"\U0001f937\U0001f3fe":                       {":person_shrugging_tone4:"},
-			"\U0001f937\U0001f3fe\u200d\u2640\ufe0f":     {":woman_shrugging_tone4:"},
-			"\U0001f937\U0001f3fe\u200d\u2642\ufe0f":     {":man_shrugging_tone4:"},
-			"\U0001f937\U0001f3ff":                       {":person_shrugging_tone5:"},
-			"\U0001f937\U0001f3ff\u200d\u2640\ufe0f":     {":woman_shrugging_tone5:"},
-			"\U0001f937\U0001f3ff\u200d\u2642\ufe0f":     {":man_shrugging_tone5:"},
-			"\U0001f937\u200d\u2640\ufe0f":               {":woman-shrugging:", ":woman_shrugging:"},
-			"\U0001f937\u200d\u2642\ufe0f":               {":man-shrugging:", ":man_shrugging:"},
-			"\U0001f938":                                 {":cartwheeling:", ":person_cartwheeling:", ":person_doing_cartwheel:"},
-			"\U0001f938\U0001f3fb":                       {":person_doing_cartwheel_tone1:"},
-			"\U0001f938\U0001f3fb\u200d\u2640\ufe0f":     {":woman_cartwheeling_tone1:"},
-			"\U0001f938\U0001f3fb\u200d\u2642\ufe0f":     {":man_cartwheeling_tone1:"},
-			"\U0001f938\U0001f3fc":                       {":person_doing_cartwheel_tone2:"},
-			"\U0001f938\U0001f3fc\u200d\u2640\ufe0f":     {":woman_cartwheeling_tone2:"},
-			"\U0001f938\U0001f3fc\u200d\u2642\ufe0f":     {":man_cartwheeling_tone2:"},
-			"\U0001f938\U0001f3fd":                       {":person_doing_cartwheel_tone3:"},
-			"\U0001f938\U0001f3fd\u200d\u2640\ufe0f":     {":woman_cartwheeling_tone3:"},
-			"\U0001f938\U0001f3fd\u200d\u2642\ufe0f":     {":man_cartwheeling_tone3:"},
-			"\U0001f938\U0001f3fe":                       {":person_doing_cartwheel_tone4:"},
-			"\U0001f938\U0001f3fe\u200d\u2640\ufe0f":     {":woman_cartwheeling_tone4:"},
-			"\U0001f938\U0001f3fe\u200d\u2642\ufe0f":     {":man_cartwheeling_tone4:"},
-			"\U0001f938\U0001f3ff":                       {":person_doing_cartwheel_tone5:"},
-			"\U0001f938\U0001f3ff\u200d\u2640\ufe0f":     {":woman_cartwheeling_tone5:"},
-			"\U0001f938\U0001f3ff\u200d\u2642\ufe0f":     {":man_cartwheeling_tone5:"},
-			"\U0001f938\u200d\u2640\ufe0f":               {":woman-cartwheeling:", ":woman_cartwheeling:"},
-			"\U0001f938\u200d\u2642\ufe0f":               {":man-cartwheeling:", ":man_cartwheeling:"},
-			"\U0001f939":                                 {":juggling:", ":juggling_person:", ":person_juggling:"},
-			"\U0001f939\U0001f3fb":                       {":person_juggling_tone1:"},
-			"\U0001f939\U0001f3fb\u200d\u2640\ufe0f":     {":woman_juggling_tone1:"},
-			"\U0001f939\U0001f3fb\u200d\u2642\ufe0f":     {":man_juggling_tone1:"},
-			"\U0001f939\U0001f3fc":                       {":person_juggling_tone2:"},
-			"\U0001f939\U0001f3fc\u200d\u2640\ufe0f":     {":woman_juggling_tone2:"},
-			"\U0001f939\U0001f3fc\u200d\u2642\ufe0f":     {":man_juggling_tone2:"},
-			"\U0001f939\U0001f3fd":                       {":person_juggling_tone3:"},
-			"\U0001f939\U0001f3fd\u200d\u2640\ufe0f":     {":woman_juggling_tone3:"},
-			"\U0001f939\U0001f3fd\u200d\u2642\ufe0f":     {":man_juggling_tone3:"},
-			"\U0001f939\U0001f3fe":                       {":person_juggling_tone4:"},
-			"\U0001f939\U0001f3fe\u200d\u2640\ufe0f":     {":woman_juggling_tone4:"},
-			"\U0001f939\U0001f3fe\u200d\u2642\ufe0f":     {":man_juggling_tone4:"},
-			"\U0001f939\U0001f3ff":                       {":person_juggling_tone5:"},
-			"\U0001f939\U0001f3ff\u200d\u2640\ufe0f":     {":woman_juggling_tone5:"},
-			"\U0001f939\U0001f3ff\u200d\u2642\ufe0f":     {":man_juggling_tone5:"},
-			"\U0001f939\u200d\u2640\ufe0f":               {":woman-juggling:", ":woman_juggling:"},
-			"\U0001f939\u200d\u2642\ufe0f":               {":man-juggling:", ":man_juggling:"},
-			"\U0001f93a":                                 {":fencer:", ":person_fencing:"},
-			"\U0001f93c":                                 {":wrestlers:", ":wrestling:", ":people_wrestling:"},
-			"\U0001f93c\u200d\u2640\ufe0f":               {":woman-wrestling:", ":women_wrestling:"},
-			"\U0001f93c\u200d\u2642\ufe0f":               {":man-wrestling:", ":men_wrestling:"},
-			"\U0001f93d":                                 {":water_polo:", ":person_playing_water_polo:"},
-			"\U0001f93d\U0001f3fb":                       {":person_playing_water_polo_tone1:"},
-			"\U0001f93d\U0001f3fb\u200d\u2640\ufe0f":     {":woman_playing_water_polo_tone1:"},
-			"\U0001f93d\U0001f3fb\u200d\u2642\ufe0f":     {":man_playing_water_polo_tone1:"},
-			"\U0001f93d\U0001f3fc":                       {":person_playing_water_polo_tone2:"},
-			"\U0001f93d\U0001f3fc\u200d\u2640\ufe0f":     {":woman_playing_water_polo_tone2:"},
-			"\U0001f93d\U0001f3fc\u200d\u2642\ufe0f":     {":man_playing_water_polo_tone2:"},
-			"\U0001f93d\U0001f3fd":                       {":person_playing_water_polo_tone3:"},
-			"\U0001f93d\U0001f3fd\u200d\u2640\ufe0f":     {":woman_playing_water_polo_tone3:"},
-			"\U0001f93d\U0001f3fd\u200d\u2642\ufe0f":     {":man_playing_water_polo_tone3:"},
-			"\U0001f93d\U0001f3fe":                       {":person_playing_water_polo_tone4:"},
-			"\U0001f93d\U0001f3fe\u200d\u2640\ufe0f":     {":woman_playing_water_polo_tone4:"},
-			"\U0001f93d\U0001f3fe\u200d\u2642\ufe0f":     {":man_playing_water_polo_tone4:"},
-			"\U0001f93d\U0001f3ff":                       {":person_playing_water_polo_tone5:"},
-			"\U0001f93d\U0001f3ff\u200d\u2640\ufe0f":     {":woman_playing_water_polo_tone5:"},
-			"\U0001f93d\U0001f3ff\u200d\u2642\ufe0f":     {":man_playing_water_polo_tone5:"},
-			"\U0001f93d\u200d\u2640\ufe0f":               {":woman-playing-water-polo:", ":woman_playing_water_polo:"},
-			"\U0001f93d\u200d\u2642\ufe0f":               {":man-playing-water-polo:", ":man_playing_water_polo:"},
-			"\U0001f93e":                                 {":handball:", ":handball_person:", ":person_playing_handball:"},
-			"\U0001f93e\U0001f3fb":                       {":person_playing_handball_tone1:"},
-			"\U0001f93e\U0001f3fb\u200d\u2640\ufe0f":     {":woman_playing_handball_tone1:"},
-			"\U0001f93e\U0001f3fb\u200d\u2642\ufe0f":     {":man_playing_handball_tone1:"},
-			"\U0001f93e\U0001f3fc":                       {":person_playing_handball_tone2:"},
-			"\U0001f93e\U0001f3fc\u200d\u2640\ufe0f":     {":woman_playing_handball_tone2:"},
-			"\U0001f93e\U0001f3fc\u200d\u2642\ufe0f":     {":man_playing_handball_tone2:"},
-			"\U0001f93e\U0001f3fd":                       {":person_playing_handball_tone3:"},
-			"\U0001f93e\U0001f3fd\u200d\u2640\ufe0f":     {":woman_playing_handball_tone3:"},
-			"\U0001f93e\U0001f3fd\u200d\u2642\ufe0f":     {":man_playing_handball_tone3:"},
-			"\U0001f93e\U0001f3fe":                       {":person_playing_handball_tone4:"},
-			"\U0001f93e\U0001f3fe\u200d\u2640\ufe0f":     {":woman_playing_handball_tone4:"},
-			"\U0001f93e\U0001f3fe\u200d\u2642\ufe0f":     {":man_playing_handball_tone4:"},
-			"\U0001f93e\U0001f3ff":                       {":person_playing_handball_tone5:"},
-			"\U0001f93e\U0001f3ff\u200d\u2640\ufe0f":     {":woman_playing_handball_tone5:"},
-			"\U0001f93e\U0001f3ff\u200d\u2642\ufe0f":     {":man_playing_handball_tone5:"},
-			"\U0001f93e\u200d\u2640\ufe0f":               {":woman-playing-handball:", ":woman_playing_handball:"},
-			"\U0001f93e\u200d\u2642\ufe0f":               {":man-playing-handball:", ":man_playing_handball:"},
-			"\U0001f93f":                                 {":diving_mask:"},
-			"\U0001f940":                                 {":wilted_rose:", ":wilted_flower:"},
-			"\U0001f941":                                 {":drum:", ":drum_with_drumsticks:"},
-			"\U0001f942":                                 {":champagne_glass:", ":clinking_glasses:"},
-			"\U0001f943":                                 {":tumbler_glass:"},
-			"\U0001f944":                                 {":spoon:"},
-			"\U0001f945":                                 {":goal:", ":goal_net:"},
-			"\U0001f947":                                 {":first_place:", ":1st_place_medal:", ":first_place_medal:"},
-			"\U0001f948":                                 {":second_place:", ":2nd_place_medal:", ":second_place_medal:"},
-			"\U0001f949":                                 {":third_place:", ":3rd_place_medal:", ":third_place_medal:"},
-			"\U0001f94a":                                 {":boxing_glove:"},
-			"\U0001f94b":                                 {":martial_arts_uniform:"},
-			"\U0001f94c":                                 {":curling_stone:"},
-			"\U0001f94d":                                 {":lacrosse:"},
-			"\U0001f94e":                                 {":softball:"},
-			"\U0001f94f":                                 {":flying_disc:"},
-			"\U0001f950":                                 {":croissant:"},
-			"\U0001f951":                                 {":avocado:"},
-			"\U0001f952":                                 {":cucumber:"},
-			"\U0001f953":                                 {":bacon:"},
-			"\U0001f954":                                 {":potato:"},
-			"\U0001f955":                                 {":carrot:"},
-			"\U0001f956":                                 {":french_bread:", ":baguette_bread:"},
-			"\U0001f957":                                 {":salad:", ":green_salad:"},
-			"\U0001f958":                                 {":shallow_pan_of_food:"},
-			"\U0001f959":                                 {":stuffed_flatbread:"},
-			"\U0001f95a":                                 {":egg:"},
-			"\U0001f95b":                                 {":milk:", ":milk_glass:", ":glass_of_milk:"},
-			"\U0001f95c":                                 {":peanuts:"},
-			"\U0001f95d":                                 {":kiwi:", ":kiwifruit:", ":kiwi_fruit:"},
-			"\U0001f95e":                                 {":pancakes:"},
-			"\U0001f95f":                                 {":dumpling:"},
-			"\U0001f960":                                 {":fortune_cookie:"},
-			"\U0001f961":                                 {":takeout_box:"},
-			"\U0001f962":                                 {":chopsticks:"},
-			"\U0001f963":                                 {":bowl_with_spoon:"},
-			"\U0001f964":                                 {":cup_with_straw:"},
-			"\U0001f965":                                 {":coconut:"},
-			"\U0001f966":                                 {":broccoli:"},
-			"\U0001f967":                                 {":pie:"},
-			"\U0001f968":                                 {":pretzel:"},
-			"\U0001f969":                                 {":cut_of_meat:"},
-			"\U0001f96a":                                 {":sandwich:"},
-			"\U0001f96b":                                 {":canned_food:"},
-			"\U0001f96c":                                 {":leafy_green:"},
-			"\U0001f96d":                                 {":mango:"},
-			"\U0001f96e":                                 {":moon_cake:"},
-			"\U0001f96f":                                 {":bagel:"},
-			"\U0001f970":                                 {":smiling_face_with_hearts:", ":smiling_face_with_3_hearts:", ":smiling_face_with_three_hearts:"},
-			"\U0001f971":                                 {":yawning_face:"},
-			"\U0001f972":                                 {":smiling_face_with_tear:"},
-			"\U0001f973":                                 {":partying_face:"},
-			"\U0001f974":                                 {":woozy_face:"},
-			"\U0001f975":                                 {":hot_face:"},
-			"\U0001f976":                                 {":cold_face:"},
-			"\U0001f977":                                 {":ninja:"},
-			"\U0001f978":                                 {":disguised_face:"},
-			"\U0001f97a":                                 {":pleading_face:"},
-			"\U0001f97b":                                 {":sari:"},
-			"\U0001f97c":                                 {":lab_coat:"},
-			"\U0001f97d":                                 {":goggles:"},
-			"\U0001f97e":                                 {":hiking_boot:"},
-			"\U0001f97f":                                 {":flat_shoe:", ":womans_flat_shoe:"},
-			"\U0001f980":                                 {":crab:"},
-			"\U0001f981":                                 {":lion:", ":lion_face:"},
-			"\U0001f982":                                 {":scorpion:"},
-			"\U0001f983":                                 {":turkey:"},
-			"\U0001f984":                                 {":unicorn:", ":unicorn_face:"},
-			"\U0001f985":                                 {":eagle:"},
-			"\U0001f986":                                 {":duck:"},
-			"\U0001f987":                                 {":bat:"},
-			"\U0001f988":                                 {":shark:"},
-			"\U0001f989":                                 {":owl:"},
-			"\U0001f98a":                                 {":fox:", ":fox_face:"},
-			"\U0001f98b":                                 {":butterfly:"},
-			"\U0001f98c":                                 {":deer:"},
-			"\U0001f98d":                                 {":gorilla:"},
-			"\U0001f98e":                                 {":lizard:"},
-			"\U0001f98f":                                 {":rhino:", ":rhinoceros:"},
-			"\U0001f990":                                 {":shrimp:"},
-			"\U0001f991":                                 {":squid:"},
-			"\U0001f992":                                 {":giraffe:", ":giraffe_face:"},
-			"\U0001f993":                                 {":zebra:", ":zebra_face:"},
-			"\U0001f994":                                 {":hedgehog:"},
-			"\U0001f995":                                 {":sauropod:"},
-			"\U0001f996":                                 {":T-Rex:", ":t-rex:", ":t_rex:"},
-			"\U0001f997":                                 {":cricket:"},
-			"\U0001f998":                                 {":kangaroo:"},
-			"\U0001f999":                                 {":llama:"},
-			"\U0001f99a":                                 {":peacock:"},
-			"\U0001f99b":                                 {":hippopotamus:"},
-			"\U0001f99c":                                 {":parrot:"},
-			"\U0001f99d":                                 {":raccoon:"},
-			"\U0001f99e":                                 {":lobster:"},
-			"\U0001f99f":                                 {":mosquito:"},
-			"\U0001f9a0":                                 {":microbe:"},
-			"\U0001f9a1":                                 {":badger:"},
-			"\U0001f9a2":                                 {":swan:"},
-			"\U0001f9a3":                                 {":mammoth:"},
-			"\U0001f9a4":                                 {":dodo:"},
-			"\U0001f9a5":                                 {":sloth:"},
-			"\U0001f9a6":                                 {":otter:"},
-			"\U0001f9a7":                                 {":orangutan:"},
-			"\U0001f9a8":                                 {":skunk:"},
-			"\U0001f9a9":                                 {":flamingo:"},
-			"\U0001f9aa":                                 {":oyster:"},
-			"\U0001f9ab":                                 {":beaver:"},
-			"\U0001f9ac":                                 {":bison:"},
-			"\U0001f9ad":                                 {":seal:"},
-			"\U0001f9ae":                                 {":guide_dog:"},
-			"\U0001f9af":                                 {":white_cane:", ":probing_cane:"},
-			"\U0001f9b0":                                 {":red_hair:"},
-			"\U0001f9b1":                                 {":curly_hair:"},
-			"\U0001f9b2":                                 {":bald:"},
-			"\U0001f9b3":                                 {":white_hair:"},
-			"\U0001f9b4":                                 {":bone:"},
-			"\U0001f9b5":                                 {":leg:"},
-			"\U0001f9b6":                                 {":foot:"},
-			"\U0001f9b7":                                 {":tooth:"},
-			"\U0001f9b8":                                 {":superhero:"},
-			"\U0001f9b8\u200d\u2640\ufe0f":               {":superhero_woman:", ":woman_superhero:", ":female_superhero:"},
-			"\U0001f9b8\u200d\u2642\ufe0f":               {":man_superhero:", ":superhero_man:", ":male_superhero:"},
-			"\U0001f9b9":                                 {":supervillain:"},
-			"\U0001f9b9\u200d\u2640\ufe0f":               {":supervillain_woman:", ":woman_supervillain:", ":female_supervillain:"},
-			"\U0001f9b9\u200d\u2642\ufe0f":               {":man_supervillain:", ":supervillain_man:", ":male_supervillain:"},
-			"\U0001f9ba":                                 {":safety_vest:"},
-			"\U0001f9bb":                                 {":ear_with_hearing_aid:"},
-			"\U0001f9bc":                                 {":motorized_wheelchair:"},
-			"\U0001f9bd":                                 {":manual_wheelchair:"},
-			"\U0001f9be":                                 {":mechanical_arm:"},
-			"\U0001f9bf":                                 {":mechanical_leg:"},
-			"\U0001f9c0":                                 {":cheese:", ":cheese_wedge:"},
-			"\U0001f9c1":                                 {":cupcake:"},
-			"\U0001f9c2":                                 {":salt:"},
-			"\U0001f9c3":                                 {":beverage_box:"},
-			"\U0001f9c4":                                 {":garlic:"},
-			"\U0001f9c5":                                 {":onion:"},
-			"\U0001f9c6":                                 {":falafel:"},
-			"\U0001f9c7":                                 {":waffle:"},
-			"\U0001f9c8":                                 {":butter:"},
-			"\U0001f9c9":                                 {":mate:", ":mate_drink:"},
-			"\U0001f9ca":                                 {":ice:", ":ice_cube:"},
-			"\U0001f9cb":                                 {":bubble_tea:"},
-			"\U0001f9cd":                                 {":person_standing:", ":standing_person:"},
-			"\U0001f9cd\u200d\u2640\ufe0f":               {":standing_woman:", ":woman_standing:"},
-			"\U0001f9cd\u200d\u2642\ufe0f":               {":man_standing:", ":standing_man:"},
-			"\U0001f9ce":                                 {":kneeling_person:", ":person_kneeling:"},
-			"\U0001f9ce\u200d\u2640\ufe0f":               {":kneeling_woman:", ":woman_kneeling:"},
-			"\U0001f9ce\u200d\u2642\ufe0f":               {":kneeling_man:", ":man_kneeling:"},
-			"\U0001f9cf":                                 {":deaf_person:"},
-			"\U0001f9cf\u200d\u2640\ufe0f":               {":deaf_woman:"},
-			"\U0001f9cf\u200d\u2642\ufe0f":               {":deaf_man:"},
-			"\U0001f9d0":                                 {":monocle_face:", ":face_with_monocle:"},
-			"\U0001f9d1":                                 {":adult:", ":person:"},
-			"\U0001f9d1\U0001f3fb":                       {":adult_tone1:"},
-			"\U0001f9d1\U0001f3fc":                       {":adult_tone2:"},
-			"\U0001f9d1\U0001f3fd":                       {":adult_tone3:"},
-			"\U0001f9d1\U0001f3fe":                       {":adult_tone4:"},
-			"\U0001f9d1\U0001f3ff":                       {":adult_tone5:"},
-			"\U0001f9d1\u200d\U0001f33e":                 {":farmer:"},
-			"\U0001f9d1\u200d\U0001f373":                 {":cook:"},
-			"\U0001f9d1\u200d\U0001f37c":                 {":person_feeding_baby:"},
-			"\U0001f9d1\u200d\U0001f384":                 {":mx_claus:"},
-			"\U0001f9d1\u200d\U0001f393":                 {":student:"},
-			"\U0001f9d1\u200d\U0001f3a4":                 {":singer:"},
-			"\U0001f9d1\u200d\U0001f3a8":                 {":artist:"},
-			"\U0001f9d1\u200d\U0001f3eb":                 {":teacher:"},
-			"\U0001f9d1\u200d\U0001f3ed":                 {":factory_worker:"},
-			"\U0001f9d1\u200d\U0001f4bb":                 {":technologist:"},
-			"\U0001f9d1\u200d\U0001f4bc":                 {":office_worker:"},
-			"\U0001f9d1\u200d\U0001f527":                 {":mechanic:"},
-			"\U0001f9d1\u200d\U0001f52c":                 {":scientist:"},
-			"\U0001f9d1\u200d\U0001f680":                 {":astronaut:"},
-			"\U0001f9d1\u200d\U0001f692":                 {":firefighter:"},
-			"\U0001f9d1\u200d\U0001f91d\u200d\U0001f9d1": {":people_holding_hands:"},
-			"\U0001f9d1\u200d\U0001f9af":                 {":person_with_white_cane:", ":person_with_probing_cane:"},
-			"\U0001f9d1\u200d\U0001f9b0":                 {":person_red_hair:", ":red_haired_person:"},
-			"\U0001f9d1\u200d\U0001f9b1":                 {":person_curly_hair:", ":curly_haired_person:"},
-			"\U0001f9d1\u200d\U0001f9b2":                 {":bald_person:", ":person_bald:"},
-			"\U0001f9d1\u200d\U0001f9b3":                 {":person_white_hair:", ":white_haired_person:"},
-			"\U0001f9d1\u200d\U0001f9bc":                 {":person_in_motorized_wheelchair:"},
-			"\U0001f9d1\u200d\U0001f9bd":                 {":person_in_manual_wheelchair:"},
-			"\U0001f9d1\u200d\u2695\ufe0f":               {":health_worker:"},
-			"\U0001f9d1\u200d\u2696\ufe0f":               {":judge:"},
-			"\U0001f9d1\u200d\u2708\ufe0f":               {":pilot:"},
-			"\U0001f9d2":                                 {":child:"},
-			"\U0001f9d2\U0001f3fb":                       {":child_tone1:"},
-			"\U0001f9d2\U0001f3fc":                       {":child_tone2:"},
-			"\U0001f9d2\U0001f3fd":                       {":child_tone3:"},
-			"\U0001f9d2\U0001f3fe":                       {":child_tone4:"},
-			"\U0001f9d2\U0001f3ff":                       {":child_tone5:"},
-			"\U0001f9d3":                                 {":older_adult:", ":older_person:"},
-			"\U0001f9d3\U0001f3fb":                       {":older_adult_tone1:"},
-			"\U0001f9d3\U0001f3fc":                       {":older_adult_tone2:"},
-			"\U0001f9d3\U0001f3fd":                       {":older_adult_tone3:"},
-			"\U0001f9d3\U0001f3fe":                       {":older_adult_tone4:"},
-			"\U0001f9d3\U0001f3ff":                       {":older_adult_tone5:"},
-			"\U0001f9d4":                                 {":person_beard:", ":bearded_person:"},
-			"\U0001f9d4\U0001f3fb":                       {":bearded_person_tone1:"},
-			"\U0001f9d4\U0001f3fc":                       {":bearded_person_tone2:"},
-			"\U0001f9d4\U0001f3fd":                       {":bearded_person_tone3:"},
-			"\U0001f9d4\U0001f3fe":                       {":bearded_person_tone4:"},
-			"\U0001f9d4\U0001f3ff":                       {":bearded_person_tone5:"},
-			"\U0001f9d4\u200d\u2640\ufe0f":               {":woman_beard:"},
-			"\U0001f9d4\u200d\u2642\ufe0f":               {":man_beard:"},
-			"\U0001f9d5":                                 {":woman_with_headscarf:", ":person_with_headscarf:"},
-			"\U0001f9d5\U0001f3fb":                       {":woman_with_headscarf_tone1:"},
-			"\U0001f9d5\U0001f3fc":                       {":woman_with_headscarf_tone2:"},
-			"\U0001f9d5\U0001f3fd":                       {":woman_with_headscarf_tone3:"},
-			"\U0001f9d5\U0001f3fe":                       {":woman_with_headscarf_tone4:"},
-			"\U0001f9d5\U0001f3ff":                       {":woman_with_headscarf_tone5:"},
-			"\U0001f9d6":                                 {":sauna_person:"},
-			"\U0001f9d6\U0001f3fb":                       {":person_in_steamy_room_tone1:"},
-			"\U0001f9d6\U0001f3fb\u200d\u2640\ufe0f":     {":woman_in_steamy_room_tone1:"},
-			"\U0001f9d6\U0001f3fb\u200d\u2642\ufe0f":     {":man_in_steamy_room_tone1:"},
-			"\U0001f9d6\U0001f3fc":                       {":person_in_steamy_room_tone2:"},
-			"\U0001f9d6\U0001f3fc\u200d\u2640\ufe0f":     {":woman_in_steamy_room_tone2:"},
-			"\U0001f9d6\U0001f3fc\u200d\u2642\ufe0f":     {":man_in_steamy_room_tone2:"},
-			"\U0001f9d6\U0001f3fd":                       {":person_in_steamy_room_tone3:"},
-			"\U0001f9d6\U0001f3fd\u200d\u2640\ufe0f":     {":woman_in_steamy_room_tone3:"},
-			"\U0001f9d6\U0001f3fd\u200d\u2642\ufe0f":     {":man_in_steamy_room_tone3:"},
-			"\U0001f9d6\U0001f3fe":                       {":person_in_steamy_room_tone4:"},
-			"\U0001f9d6\U0001f3fe\u200d\u2640\ufe0f":     {":woman_in_steamy_room_tone4:"},
-			"\U0001f9d6\U0001f3fe\u200d\u2642\ufe0f":     {":man_in_steamy_room_tone4:"},
-			"\U0001f9d6\U0001f3ff":                       {":person_in_steamy_room_tone5:"},
-			"\U0001f9d6\U0001f3ff\u200d\u2640\ufe0f":     {":woman_in_steamy_room_tone5:"},
-			"\U0001f9d6\U0001f3ff\u200d\u2642\ufe0f":     {":man_in_steamy_room_tone5:"},
-			"\U0001f9d6\u200d\u2640\ufe0f":               {":sauna_woman:", ":woman_in_steamy_room:"},
-			"\U0001f9d6\u200d\u2642\ufe0f":               {":sauna_man:", ":man_in_steamy_room:", ":person_in_steamy_room:"},
-			"\U0001f9d7":                                 {":climbing:"},
-			"\U0001f9d7\U0001f3fb":                       {":person_climbing_tone1:"},
-			"\U0001f9d7\U0001f3fb\u200d\u2640\ufe0f":     {":woman_climbing_tone1:"},
-			"\U0001f9d7\U0001f3fb\u200d\u2642\ufe0f":     {":man_climbing_tone1:"},
-			"\U0001f9d7\U0001f3fc":                       {":person_climbing_tone2:"},
-			"\U0001f9d7\U0001f3fc\u200d\u2640\ufe0f":     {":woman_climbing_tone2:"},
-			"\U0001f9d7\U0001f3fc\u200d\u2642\ufe0f":     {":man_climbing_tone2:"},
-			"\U0001f9d7\U0001f3fd":                       {":person_climbing_tone3:"},
-			"\U0001f9d7\U0001f3fd\u200d\u2640\ufe0f":     {":woman_climbing_tone3:"},
-			"\U0001f9d7\U0001f3fd\u200d\u2642\ufe0f":     {":man_climbing_tone3:"},
-			"\U0001f9d7\U0001f3fe":                       {":person_climbing_tone4:"},
-			"\U0001f9d7\U0001f3fe\u200d\u2640\ufe0f":     {":woman_climbing_tone4:"},
-			"\U0001f9d7\U0001f3fe\u200d\u2642\ufe0f":     {":man_climbing_tone4:"},
-			"\U0001f9d7\U0001f3ff":                       {":person_climbing_tone5:"},
-			"\U0001f9d7\U0001f3ff\u200d\u2640\ufe0f":     {":woman_climbing_tone5:"},
-			"\U0001f9d7\U0001f3ff\u200d\u2642\ufe0f":     {":man_climbing_tone5:"},
-			"\U0001f9d7\u200d\u2640\ufe0f":               {":climbing_woman:", ":woman_climbing:", ":person_climbing:"},
-			"\U0001f9d7\u200d\u2642\ufe0f":               {":climbing_man:", ":man_climbing:"},
-			"\U0001f9d8":                                 {":lotus_position:"},
-			"\U0001f9d8\U0001f3fb":                       {":person_in_lotus_position_tone1:"},
-			"\U0001f9d8\U0001f3fb\u200d\u2640\ufe0f":     {":woman_in_lotus_position_tone1:"},
-			"\U0001f9d8\U0001f3fb\u200d\u2642\ufe0f":     {":man_in_lotus_position_tone1:"},
-			"\U0001f9d8\U0001f3fc":                       {":person_in_lotus_position_tone2:"},
-			"\U0001f9d8\U0001f3fc\u200d\u2640\ufe0f":     {":woman_in_lotus_position_tone2:"},
-			"\U0001f9d8\U0001f3fc\u200d\u2642\ufe0f":     {":man_in_lotus_position_tone2:"},
-			"\U0001f9d8\U0001f3fd":                       {":person_in_lotus_position_tone3:"},
-			"\U0001f9d8\U0001f3fd\u200d\u2640\ufe0f":     {":woman_in_lotus_position_tone3:"},
-			"\U0001f9d8\U0001f3fd\u200d\u2642\ufe0f":     {":man_in_lotus_position_tone3:"},
-			"\U0001f9d8\U0001f3fe":                       {":person_in_lotus_position_tone4:"},
-			"\U0001f9d8\U0001f3fe\u200d\u2640\ufe0f":     {":woman_in_lotus_position_tone4:"},
-			"\U0001f9d8\U0001f3fe\u200d\u2642\ufe0f":     {":man_in_lotus_position_tone4:"},
-			"\U0001f9d8\U0001f3ff":                       {":person_in_lotus_position_tone5:"},
-			"\U0001f9d8\U0001f3ff\u200d\u2640\ufe0f":     {":woman_in_lotus_position_tone5:"},
-			"\U0001f9d8\U0001f3ff\u200d\u2642\ufe0f":     {":man_in_lotus_position_tone5:"},
-			"\U0001f9d8\u200d\u2640\ufe0f":               {":lotus_position_woman:", ":woman_in_lotus_position:", ":person_in_lotus_position:"},
-			"\U0001f9d8\u200d\u2642\ufe0f":               {":lotus_position_man:", ":man_in_lotus_position:"},
-			"\U0001f9d9\U0001f3fb":                       {":mage_tone1:"},
-			"\U0001f9d9\U0001f3fb\u200d\u2640\ufe0f":     {":woman_mage_tone1:"},
-			"\U0001f9d9\U0001f3fb\u200d\u2642\ufe0f":     {":man_mage_tone1:"},
-			"\U0001f9d9\U0001f3fc":                       {":mage_tone2:"},
-			"\U0001f9d9\U0001f3fc\u200d\u2640\ufe0f":     {":woman_mage_tone2:"},
-			"\U0001f9d9\U0001f3fc\u200d\u2642\ufe0f":     {":man_mage_tone2:"},
-			"\U0001f9d9\U0001f3fd":                       {":mage_tone3:"},
-			"\U0001f9d9\U0001f3fd\u200d\u2640\ufe0f":     {":woman_mage_tone3:"},
-			"\U0001f9d9\U0001f3fd\u200d\u2642\ufe0f":     {":man_mage_tone3:"},
-			"\U0001f9d9\U0001f3fe":                       {":mage_tone4:"},
-			"\U0001f9d9\U0001f3fe\u200d\u2640\ufe0f":     {":woman_mage_tone4:"},
-			"\U0001f9d9\U0001f3fe\u200d\u2642\ufe0f":     {":man_mage_tone4:"},
-			"\U0001f9d9\U0001f3ff":                       {":mage_tone5:"},
-			"\U0001f9d9\U0001f3ff\u200d\u2640\ufe0f":     {":woman_mage_tone5:"},
-			"\U0001f9d9\U0001f3ff\u200d\u2642\ufe0f":     {":man_mage_tone5:"},
-			"\U0001f9d9\u200d\u2640\ufe0f":               {":mage:", ":mage_woman:", ":woman_mage:", ":female_mage:"},
-			"\U0001f9d9\u200d\u2642\ufe0f":               {":mage_man:", ":man_mage:", ":male_mage:"},
-			"\U0001f9da\U0001f3fb":                       {":fairy_tone1:"},
-			"\U0001f9da\U0001f3fb\u200d\u2640\ufe0f":     {":woman_fairy_tone1:"},
-			"\U0001f9da\U0001f3fb\u200d\u2642\ufe0f":     {":man_fairy_tone1:"},
-			"\U0001f9da\U0001f3fc":                       {":fairy_tone2:"},
-			"\U0001f9da\U0001f3fc\u200d\u2640\ufe0f":     {":woman_fairy_tone2:"},
-			"\U0001f9da\U0001f3fc\u200d\u2642\ufe0f":     {":man_fairy_tone2:"},
-			"\U0001f9da\U0001f3fd":                       {":fairy_tone3:"},
-			"\U0001f9da\U0001f3fd\u200d\u2640\ufe0f":     {":woman_fairy_tone3:"},
-			"\U0001f9da\U0001f3fd\u200d\u2642\ufe0f":     {":man_fairy_tone3:"},
-			"\U0001f9da\U0001f3fe":                       {":fairy_tone4:"},
-			"\U0001f9da\U0001f3fe\u200d\u2640\ufe0f":     {":woman_fairy_tone4:"},
-			"\U0001f9da\U0001f3fe\u200d\u2642\ufe0f":     {":man_fairy_tone4:"},
-			"\U0001f9da\U0001f3ff":                       {":fairy_tone5:"},
-			"\U0001f9da\U0001f3ff\u200d\u2640\ufe0f":     {":woman_fairy_tone5:"},
-			"\U0001f9da\U0001f3ff\u200d\u2642\ufe0f":     {":man_fairy_tone5:"},
-			"\U0001f9da\u200d\u2640\ufe0f":               {":fairy:", ":fairy_woman:", ":woman_fairy:", ":female_fairy:"},
-			"\U0001f9da\u200d\u2642\ufe0f":               {":fairy_man:", ":man_fairy:", ":male_fairy:"},
-			"\U0001f9db\U0001f3fb":                       {":vampire_tone1:"},
-			"\U0001f9db\U0001f3fb\u200d\u2640\ufe0f":     {":woman_vampire_tone1:"},
-			"\U0001f9db\U0001f3fb\u200d\u2642\ufe0f":     {":man_vampire_tone1:"},
-			"\U0001f9db\U0001f3fc":                       {":vampire_tone2:"},
-			"\U0001f9db\U0001f3fc\u200d\u2640\ufe0f":     {":woman_vampire_tone2:"},
-			"\U0001f9db\U0001f3fc\u200d\u2642\ufe0f":     {":man_vampire_tone2:"},
-			"\U0001f9db\U0001f3fd":                       {":vampire_tone3:"},
-			"\U0001f9db\U0001f3fd\u200d\u2640\ufe0f":     {":woman_vampire_tone3:"},
-			"\U0001f9db\U0001f3fd\u200d\u2642\ufe0f":     {":man_vampire_tone3:"},
-			"\U0001f9db\U0001f3fe":                       {":vampire_tone4:"},
-			"\U0001f9db\U0001f3fe\u200d\u2640\ufe0f":     {":woman_vampire_tone4:"},
-			"\U0001f9db\U0001f3fe\u200d\u2642\ufe0f":     {":man_vampire_tone4:"},
-			"\U0001f9db\U0001f3ff":                       {":vampire_tone5:"},
-			"\U0001f9db\U0001f3ff\u200d\u2640\ufe0f":     {":woman_vampire_tone5:"},
-			"\U0001f9db\U0001f3ff\u200d\u2642\ufe0f":     {":man_vampire_tone5:"},
-			"\U0001f9db\u200d\u2640\ufe0f":               {":vampire:", ":vampire_woman:", ":woman_vampire:", ":female_vampire:"},
-			"\U0001f9db\u200d\u2642\ufe0f":               {":man_vampire:", ":vampire_man:", ":male_vampire:"},
-			"\U0001f9dc\U0001f3fb":                       {":merperson_tone1:"},
-			"\U0001f9dc\U0001f3fb\u200d\u2640\ufe0f":     {":mermaid_tone1:"},
-			"\U0001f9dc\U0001f3fb\u200d\u2642\ufe0f":     {":merman_tone1:"},
-			"\U0001f9dc\U0001f3fc":                       {":merperson_tone2:"},
-			"\U0001f9dc\U0001f3fc\u200d\u2640\ufe0f":     {":mermaid_tone2:"},
-			"\U0001f9dc\U0001f3fc\u200d\u2642\ufe0f":     {":merman_tone2:"},
-			"\U0001f9dc\U0001f3fd":                       {":merperson_tone3:"},
-			"\U0001f9dc\U0001f3fd\u200d\u2640\ufe0f":     {":mermaid_tone3:"},
-			"\U0001f9dc\U0001f3fd\u200d\u2642\ufe0f":     {":merman_tone3:"},
-			"\U0001f9dc\U0001f3fe":                       {":merperson_tone4:"},
-			"\U0001f9dc\U0001f3fe\u200d\u2640\ufe0f":     {":mermaid_tone4:"},
-			"\U0001f9dc\U0001f3fe\u200d\u2642\ufe0f":     {":merman_tone4:"},
-			"\U0001f9dc\U0001f3ff":                       {":merperson_tone5:"},
-			"\U0001f9dc\U0001f3ff\u200d\u2640\ufe0f":     {":mermaid_tone5:"},
-			"\U0001f9dc\U0001f3ff\u200d\u2642\ufe0f":     {":merman_tone5:"},
-			"\U0001f9dc\u200d\u2640\ufe0f":               {":mermaid:"},
-			"\U0001f9dc\u200d\u2642\ufe0f":               {":merman:", ":merperson:"},
-			"\U0001f9dd\U0001f3fb":                       {":elf_tone1:"},
-			"\U0001f9dd\U0001f3fb\u200d\u2640\ufe0f":     {":woman_elf_tone1:"},
-			"\U0001f9dd\U0001f3fb\u200d\u2642\ufe0f":     {":man_elf_tone1:"},
-			"\U0001f9dd\U0001f3fc":                       {":elf_tone2:"},
-			"\U0001f9dd\U0001f3fc\u200d\u2640\ufe0f":     {":woman_elf_tone2:"},
-			"\U0001f9dd\U0001f3fc\u200d\u2642\ufe0f":     {":man_elf_tone2:"},
-			"\U0001f9dd\U0001f3fd":                       {":elf_tone3:"},
-			"\U0001f9dd\U0001f3fd\u200d\u2640\ufe0f":     {":woman_elf_tone3:"},
-			"\U0001f9dd\U0001f3fd\u200d\u2642\ufe0f":     {":man_elf_tone3:"},
-			"\U0001f9dd\U0001f3fe":                       {":elf_tone4:"},
-			"\U0001f9dd\U0001f3fe\u200d\u2640\ufe0f":     {":woman_elf_tone4:"},
-			"\U0001f9dd\U0001f3fe\u200d\u2642\ufe0f":     {":man_elf_tone4:"},
-			"\U0001f9dd\U0001f3ff":                       {":elf_tone5:"},
-			"\U0001f9dd\U0001f3ff\u200d\u2640\ufe0f":     {":woman_elf_tone5:"},
-			"\U0001f9dd\U0001f3ff\u200d\u2642\ufe0f":     {":man_elf_tone5:"},
-			"\U0001f9dd\u200d\u2640\ufe0f":               {":elf_woman:", ":woman_elf:", ":female_elf:"},
-			"\U0001f9dd\u200d\u2642\ufe0f":               {":elf:", ":elf_man:", ":man_elf:", ":male_elf:"},
-			"\U0001f9de\u200d\u2640\ufe0f":               {":genie_woman:", ":woman_genie:", ":female_genie:"},
-			"\U0001f9de\u200d\u2642\ufe0f":               {":genie:", ":genie_man:", ":man_genie:", ":male_genie:"},
-			"\U0001f9df\u200d\u2640\ufe0f":               {":woman_zombie:", ":zombie_woman:", ":female_zombie:"},
-			"\U0001f9df\u200d\u2642\ufe0f":               {":zombie:", ":man_zombie:", ":zombie_man:", ":male_zombie:"},
-			"\U0001f9e0":                                 {":brain:"},
-			"\U0001f9e1":                                 {":orange_heart:"},
-			"\U0001f9e2":                                 {":billed_cap:"},
-			"\U0001f9e3":                                 {":scarf:"},
-			"\U0001f9e4":                                 {":gloves:"},
-			"\U0001f9e5":                                 {":coat:"},
-			"\U0001f9e6":                                 {":socks:"},
-			"\U0001f9e7":                                 {":red_envelope:"},
-			"\U0001f9e8":                                 {":firecracker:"},
-			"\U0001f9e9":                                 {":jigsaw:", ":puzzle_piece:"},
-			"\U0001f9ea":                                 {":test_tube:"},
-			"\U0001f9eb":                                 {":petri_dish:"},
-			"\U0001f9ec":                                 {":dna:"},
-			"\U0001f9ed":                                 {":compass:"},
-			"\U0001f9ee":                                 {":abacus:"},
-			"\U0001f9ef":                                 {":fire_extinguisher:"},
-			"\U0001f9f0":                                 {":toolbox:"},
-			"\U0001f9f1":                                 {":brick:", ":bricks:"},
-			"\U0001f9f2":                                 {":magnet:"},
-			"\U0001f9f3":                                 {":luggage:"},
-			"\U0001f9f4":                                 {":lotion_bottle:"},
-			"\U0001f9f5":                                 {":thread:"},
-			"\U0001f9f6":                                 {":yarn:"},
-			"\U0001f9f7":                                 {":safety_pin:"},
-			"\U0001f9f8":                                 {":teddy_bear:"},
-			"\U0001f9f9":                                 {":broom:"},
-			"\U0001f9fa":                                 {":basket:"},
-			"\U0001f9fb":                                 {":roll_of_paper:"},
-			"\U0001f9fc":                                 {":soap:"},
-			"\U0001f9fd":                                 {":sponge:"},
-			"\U0001f9fe":                                 {":receipt:"},
-			"\U0001f9ff":                                 {":nazar_amulet:"},
-			"\U0001fa70":                                 {":ballet_shoes:"},
-			"\U0001fa71":                                 {":one-piece_swimsuit:", ":one_piece_swimsuit:"},
-			"\U0001fa72":                                 {":briefs:", ":swim_brief:"},
-			"\U0001fa73":                                 {":shorts:"},
-			"\U0001fa74":                                 {":thong_sandal:"},
-			"\U0001fa78":                                 {":drop_of_blood:"},
-			"\U0001fa79":                                 {":adhesive_bandage:"},
-			"\U0001fa7a":                                 {":stethoscope:"},
-			"\U0001fa80":                                 {":yo-yo:", ":yo_yo:"},
-			"\U0001fa81":                                 {":kite:"},
-			"\U0001fa82":                                 {":parachute:"},
-			"\U0001fa83":                                 {":boomerang:"},
-			"\U0001fa84":                                 {":magic_wand:"},
-			"\U0001fa85":                                 {":pinata:", ":piñata:"},
-			"\U0001fa86":                                 {":nesting_dolls:"},
-			"\U0001fa90":                                 {":ringed_planet:"},
-			"\U0001fa91":                                 {":chair:"},
-			"\U0001fa92":                                 {":razor:"},
-			"\U0001fa93":                                 {":axe:"},
-			"\U0001fa94":                                 {":diya_lamp:"},
-			"\U0001fa95":                                 {":banjo:"},
-			"\U0001fa96":                                 {":military_helmet:"},
-			"\U0001fa97":                                 {":accordion:"},
-			"\U0001fa98":                                 {":long_drum:"},
-			"\U0001fa99":                                 {":coin:"},
-			"\U0001fa9a":                                 {":carpentry_saw:"},
-			"\U0001fa9b":                                 {":screwdriver:"},
-			"\U0001fa9c":                                 {":ladder:"},
-			"\U0001fa9d":                                 {":hook:"},
-			"\U0001fa9e":                                 {":mirror:"},
-			"\U0001fa9f":                                 {":window:"},
-			"\U0001faa0":                                 {":plunger:"},
-			"\U0001faa1":                                 {":sewing_needle:"},
-			"\U0001faa2":                                 {":knot:"},
-			"\U0001faa3":                                 {":bucket:"},
-			"\U0001faa4":                                 {":mouse_trap:"},
-			"\U0001faa5":                                 {":toothbrush:"},
-			"\U0001faa6":                                 {":headstone:"},
-			"\U0001faa7":                                 {":placard:"},
-			"\U0001faa8":                                 {":rock:"},
-			"\U0001fab0":                                 {":fly:"},
-			"\U0001fab1":                                 {":worm:"},
-			"\U0001fab2":                                 {":beetle:"},
-			"\U0001fab3":                                 {":cockroach:"},
-			"\U0001fab4":                                 {":potted_plant:"},
-			"\U0001fab5":                                 {":wood:"},
-			"\U0001fab6":                                 {":feather:"},
-			"\U0001fac0":                                 {":anatomical_heart:"},
-			"\U0001fac1":                                 {":lungs:"},
-			"\U0001fac2":                                 {":people_hugging:"},
-			"\U0001fad0":                                 {":blueberries:"},
-			"\U0001fad1":                                 {":bell_pepper:"},
-			"\U0001fad2":                                 {":olive:"},
-			"\U0001fad3":                                 {":flatbread:"},
-			"\U0001fad4":                                 {":tamale:"},
-			"\U0001fad5":                                 {":fondue:"},
-			"\U0001fad6":                                 {":teapot:"},
-			"\u00a9\ufe0f":                               {":copyright:"},
-			"\u00ae\ufe0f":                               {":registered:"},
-			"\u203c":                                     {":double_exclamation_mark:"},
-			"\u203c\ufe0f":                               {":bangbang:"},
-			"\u2049":                                     {":exclamation_question_mark:"},
-			"\u2049\ufe0f":                               {":interrobang:"},
-			"\u2122":                                     {":trade_mark:"},
-			"\u2122\ufe0f":                               {":tm:"},
-			"\u2139":                                     {":information:"},
-			"\u2139\ufe0f":                               {":information_source:"},
-			"\u2194":                                     {":left-right_arrow:"},
-			"\u2194\ufe0f":                               {":left_right_arrow:"},
-			"\u2195":                                     {":up-down_arrow:"},
-			"\u2195\ufe0f":                               {":arrow_up_down:"},
-			"\u2196":                                     {":up-left_arrow:"},
-			"\u2196\ufe0f":                               {":arrow_upper_left:"},
-			"\u2197":                                     {":up-right_arrow:"},
-			"\u2197\ufe0f":                               {":arrow_upper_right:"},
-			"\u2198":                                     {":down-right_arrow:"},
-			"\u2198\ufe0f":                               {":arrow_lower_right:"},
-			"\u2199":                                     {":down-left_arrow:"},
-			"\u2199\ufe0f":                               {":arrow_lower_left:"},
-			"\u21a9":                                     {":right_arrow_curving_left:"},
-			"\u21a9\ufe0f":                               {":leftwards_arrow_with_hook:"},
-			"\u21aa":                                     {":left_arrow_curving_right:"},
-			"\u21aa\ufe0f":                               {":arrow_right_hook:"},
-			"\u231a":                                     {":watch:"},
-			"\u231b":                                     {":hourglass:", ":hourglass_done:"},
-			"\u2328\ufe0f":                               {":keyboard:"},
-			"\u23cf":                                     {":eject_button:"},
-			"\u23cf\ufe0f":                               {":eject:"},
-			"\u23e9":                                     {":fast_forward:", ":fast-forward_button:"},
-			"\u23ea":                                     {":rewind:", ":fast_reverse_button:"},
-			"\u23eb":                                     {":fast_up_button:", ":arrow_double_up:"},
-			"\u23ec":                                     {":fast_down_button:", ":arrow_double_down:"},
-			"\u23ed":                                     {":track_next:", ":next_track_button:"},
-			"\u23ed\ufe0f":                               {":black_right_pointing_double_triangle_with_vertical_bar:"},
-			"\u23ee":                                     {":track_previous:", ":last_track_button:"},
-			"\u23ee\ufe0f":                               {":previous_track_button:", ":black_left_pointing_double_triangle_with_vertical_bar:"},
-			"\u23ef":                                     {":play_pause:", ":play_or_pause_button:"},
-			"\u23ef\ufe0f":                               {":black_right_pointing_triangle_with_double_vertical_bar:"},
-			"\u23f0":                                     {":alarm_clock:"},
-			"\u23f1\ufe0f":                               {":stopwatch:"},
-			"\u23f2":                                     {":timer:"},
-			"\u23f2\ufe0f":                               {":timer_clock:"},
-			"\u23f3":                                     {":hourglass_not_done:", ":hourglass_flowing_sand:"},
-			"\u23f8":                                     {":pause_button:"},
-			"\u23f8\ufe0f":                               {":double_vertical_bar:"},
-			"\u23f9":                                     {":stop_button:"},
-			"\u23f9\ufe0f":                               {":black_square_for_stop:"},
-			"\u23fa":                                     {":record_button:"},
-			"\u23fa\ufe0f":                               {":black_circle_for_record:"},
-			"\u24c2":                                     {":circled_M:"},
-			"\u24dc\ufe0f":                               {":m:"},
-			"\u25aa\ufe0f":                               {":black_small_square:"},
-			"\u25ab\ufe0f":                               {":white_small_square:"},
-			"\u25b6":                                     {":play_button:"},
-			"\u25b6\ufe0f":                               {":arrow_forward:"},
-			"\u25c0":                                     {":reverse_button:"},
-			"\u25c0\ufe0f":                               {":arrow_backward:"},
-			"\u25fb\ufe0f":                               {":white_medium_square:"},
-			"\u25fc\ufe0f":                               {":black_medium_square:"},
-			"\u25fd":                                     {":white_medium-small_square:", ":white_medium_small_square:"},
-			"\u25fe":                                     {":black_medium-small_square:", ":black_medium_small_square:"},
-			"\u2600":                                     {":sun:"},
-			"\u2600\ufe0f":                               {":sunny:"},
-			"\u2601\ufe0f":                               {":cloud:"},
-			"\u2602":                                     {":umbrella2:"},
-			"\u2602\ufe0f":                               {":umbrella:", ":open_umbrella:"},
-			"\u2603":                                     {":snowman2:"},
-			"\u2603\ufe0f":                               {":snowman:", ":snowman_with_snow:"},
-			"\u2604\ufe0f":                               {":comet:"},
-			"\u260e":                                     {":telephone:"},
-			"\u260e\ufe0f":                               {":phone:"},
-			"\u2611":                                     {":check_box_with_check:"},
-			"\u2611\ufe0f":                               {":ballot_box_with_check:"},
-			"\u2614":                                     {":umbrella_with_rain_drops:"},
-			"\u2615":                                     {":coffee:", ":hot_beverage:"},
-			"\u2618\ufe0f":                               {":shamrock:"},
-			"\u261d":                                     {":index_pointing_up:"},
-			"\u261d\U0001f3fb":                           {":point_up_tone1:"},
-			"\u261d\U0001f3fc":                           {":point_up_tone2:"},
-			"\u261d\U0001f3fd":                           {":point_up_tone3:"},
-			"\u261d\U0001f3fe":                           {":point_up_tone4:"},
-			"\u261d\U0001f3ff":                           {":point_up_tone5:"},
-			"\u261d\ufe0f":                               {":point_up:"},
-			"\u2620":                                     {":skull_crossbones:"},
-			"\u2620\ufe0f":                               {":skull_and_crossbones:"},
-			"\u2622":                                     {":radioactive:"},
-			"\u2622\ufe0f":                               {":radioactive_sign:"},
-			"\u2623":                                     {":biohazard:"},
-			"\u2623\ufe0f":                               {":biohazard_sign:"},
-			"\u2626\ufe0f":                               {":orthodox_cross:"},
-			"\u262a\ufe0f":                               {":star_and_crescent:"},
-			"\u262e":                                     {":peace:"},
-			"\u262e\ufe0f":                               {":peace_symbol:"},
-			"\u262f\ufe0f":                               {":yin_yang:"},
-			"\u2638\ufe0f":                               {":wheel_of_dharma:"},
-			"\u2639":                                     {":frowning2:", ":frowning_face:"},
-			"\u2639\ufe0f":                               {":white_frowning_face:"},
-			"\u263a":                                     {":smiling_face:"},
-			"\u263a\ufe0f":                               {":relaxed:"},
-			"\u2640\ufe0f":                               {":female_sign:"},
-			"\u2642\ufe0f":                               {":male_sign:"},
-			"\u2648":                                     {":Aries:", ":aries:"},
-			"\u2649":                                     {":Taurus:", ":taurus:"},
-			"\u264a":                                     {":Gemini:", ":gemini:"},
-			"\u264b":                                     {":Cancer:", ":cancer:"},
-			"\u264c":                                     {":Leo:", ":leo:"},
-			"\u264d":                                     {":Virgo:", ":virgo:"},
-			"\u264e":                                     {":Libra:", ":libra:"},
-			"\u264f":                                     {":Scorpio:", ":scorpius:"},
-			"\u2650":                                     {":Sagittarius:", ":sagittarius:"},
-			"\u2651":                                     {":Capricorn:", ":capricorn:"},
-			"\u2652":                                     {":Aquarius:", ":aquarius:"},
-			"\u2653":                                     {":Pisces:", ":pisces:"},
-			"\u265f\ufe0f":                               {":chess_pawn:"},
-			"\u2660":                                     {":spade_suit:"},
-			"\u2660\ufe0f":                               {":spades:"},
-			"\u2663":                                     {":club_suit:"},
-			"\u2663\ufe0f":                               {":clubs:"},
-			"\u2665":                                     {":heart_suit:"},
-			"\u2665\ufe0f":                               {":hearts:"},
-			"\u2666":                                     {":diamond_suit:"},
-			"\u2666\ufe0f":                               {":diamonds:"},
-			"\u2668":                                     {":hot_springs:"},
-			"\u2668\ufe0f":                               {":hotsprings:"},
-			"\u267b":                                     {":recycling_symbol:"},
-			"\u267b\ufe0f":                               {":recycle:"},
-			"\u267e\ufe0f":                               {":infinity:"},
-			"\u267f":                                     {":wheelchair:", ":wheelchair_symbol:"},
-			"\u2692":                                     {":hammer_pick:"},
-			"\u2692\ufe0f":                               {":hammer_and_pick:"},
-			"\u2693":                                     {":anchor:"},
-			"\u2694\ufe0f":                               {":crossed_swords:"},
-			"\u2695\ufe0f":                               {":medical_symbol:"},
-			"\u2696":                                     {":balance_scale:"},
-			"\u2696\ufe0f":                               {":scales:"},
-			"\u2697\ufe0f":                               {":alembic:"},
-			"\u2699\ufe0f":                               {":gear:"},
-			"\u269b":                                     {":atom:"},
-			"\u269b\ufe0f":                               {":atom_symbol:"},
-			"\u269c":                                     {":fleur-de-lis:"},
-			"\u269c\ufe0f":                               {":fleur_de_lis:"},
-			"\u26a0\ufe0f":                               {":warning:"},
-			"\u26a1":                                     {":zap:", ":high_voltage:"},
-			"\u26a7\ufe0f":                               {":transgender_symbol:"},
-			"\u26aa":                                     {":white_circle:"},
-			"\u26ab":                                     {":black_circle:"},
-			"\u26b0\ufe0f":                               {":coffin:"},
-			"\u26b1":                                     {":urn:"},
-			"\u26b1\ufe0f":                               {":funeral_urn:"},
-			"\u26bd":                                     {":soccer:", ":soccer_ball:"},
-			"\u26be":                                     {":baseball:"},
-			"\u26c4":                                     {":snowman_without_snow:"},
-			"\u26c5":                                     {":partly_sunny:", ":sun_behind_cloud:"},
-			"\u26c8":                                     {":thunder_cloud_rain:", ":cloud_with_lightning_and_rain:"},
-			"\u26c8\ufe0f":                               {":thunder_cloud_and_rain:"},
-			"\u26ce":                                     {":Ophiuchus:", ":ophiuchus:"},
-			"\u26cf\ufe0f":                               {":pick:"},
-			"\u26d1":                                     {":helmet_with_cross:", ":rescue_worker’s_helmet:"},
-			"\u26d1\ufe0f":                               {":rescue_worker_helmet:", ":helmet_with_white_cross:"},
-			"\u26d3\ufe0f":                               {":chains:"},
-			"\u26d4":                                     {":no_entry:"},
-			"\u26e9\ufe0f":                               {":shinto_shrine:"},
-			"\u26ea":                                     {":church:"},
-			"\u26f0\ufe0f":                               {":mountain:"},
-			"\u26f1":                                     {":beach_umbrella:"},
-			"\u26f1\ufe0f":                               {":parasol_on_ground:", ":umbrella_on_ground:"},
-			"\u26f2":                                     {":fountain:"},
-			"\u26f3":                                     {":golf:", ":flag_in_hole:"},
-			"\u26f4\ufe0f":                               {":ferry:"},
-			"\u26f5":                                     {":boat:", ":sailboat:"},
-			"\u26f7\ufe0f":                               {":skier:"},
-			"\u26f8\ufe0f":                               {":ice_skate:"},
-			"\u26f9":                                     {":person_bouncing_ball:"},
-			"\u26f9\U0001f3fb":                           {":person_bouncing_ball_tone1:"},
-			"\u26f9\U0001f3fb\u200d\u2640\ufe0f":         {":woman_bouncing_ball_tone1:"},
-			"\u26f9\U0001f3fb\u200d\u2642\ufe0f":         {":man_bouncing_ball_tone1:"},
-			"\u26f9\U0001f3fc":                           {":person_bouncing_ball_tone2:"},
-			"\u26f9\U0001f3fc\u200d\u2640\ufe0f":         {":woman_bouncing_ball_tone2:"},
-			"\u26f9\U0001f3fc\u200d\u2642\ufe0f":         {":man_bouncing_ball_tone2:"},
-			"\u26f9\U0001f3fd":                           {":person_bouncing_ball_tone3:"},
-			"\u26f9\U0001f3fd\u200d\u2640\ufe0f":         {":woman_bouncing_ball_tone3:"},
-			"\u26f9\U0001f3fd\u200d\u2642\ufe0f":         {":man_bouncing_ball_tone3:"},
-			"\u26f9\U0001f3fe":                           {":person_bouncing_ball_tone4:"},
-			"\u26f9\U0001f3fe\u200d\u2640\ufe0f":         {":woman_bouncing_ball_tone4:"},
-			"\u26f9\U0001f3fe\u200d\u2642\ufe0f":         {":man_bouncing_ball_tone4:"},
-			"\u26f9\U0001f3ff":                           {":person_bouncing_ball_tone5:"},
-			"\u26f9\U0001f3ff\u200d\u2640\ufe0f":         {":woman_bouncing_ball_tone5:"},
-			"\u26f9\U0001f3ff\u200d\u2642\ufe0f":         {":man_bouncing_ball_tone5:"},
-			"\u26f9\ufe0f":                               {":bouncing_ball_person:"},
-			"\u26f9\ufe0f\u200d\u2640\ufe0f":             {":basketball_woman:", ":bouncing_ball_woman:", ":woman-bouncing-ball:", ":woman_bouncing_ball:"},
-			"\u26f9\ufe0f\u200d\u2642\ufe0f":             {":basketball_man:", ":person_with_ball:", ":bouncing_ball_man:", ":man-bouncing-ball:", ":man_bouncing_ball:"},
-			"\u26fa":                                     {":tent:"},
-			"\u26fd":                                     {":fuelpump:", ":fuel_pump:"},
-			"\u2702\ufe0f":                               {":scissors:"},
-			"\u2705":                                     {":white_check_mark:", ":check_mark_button:"},
-			"\u2708\ufe0f":                               {":airplane:"},
-			"\u2709":                                     {":envelope:"},
-			"\u2709\ufe0f":                               {":email:"},
-			"\u270a":                                     {":fist:", ":fist_raised:", ":raised_fist:"},
-			"\u270a\U0001f3fb":                           {":fist_tone1:"},
-			"\u270a\U0001f3fc":                           {":fist_tone2:"},
-			"\u270a\U0001f3fd":                           {":fist_tone3:"},
-			"\u270a\U0001f3fe":                           {":fist_tone4:"},
-			"\u270a\U0001f3ff":                           {":fist_tone5:"},
-			"\u270b":                                     {":hand:", ":raised_hand:"},
-			"\u270b\U0001f3fb":                           {":raised_hand_tone1:"},
-			"\u270b\U0001f3fc":                           {":raised_hand_tone2:"},
-			"\u270b\U0001f3fd":                           {":raised_hand_tone3:"},
-			"\u270b\U0001f3fe":                           {":raised_hand_tone4:"},
-			"\u270b\U0001f3ff":                           {":raised_hand_tone5:"},
-			"\u270c":                                     {":victory_hand:"},
-			"\u270c\U0001f3fb":                           {":v_tone1:"},
-			"\u270c\U0001f3fc":                           {":v_tone2:"},
-			"\u270c\U0001f3fd":                           {":v_tone3:"},
-			"\u270c\U0001f3fe":                           {":v_tone4:"},
-			"\u270c\U0001f3ff":                           {":v_tone5:"},
-			"\u270c\ufe0f":                               {":v:"},
-			"\u270d\U0001f3fb":                           {":writing_hand_tone1:"},
-			"\u270d\U0001f3fc":                           {":writing_hand_tone2:"},
-			"\u270d\U0001f3fd":                           {":writing_hand_tone3:"},
-			"\u270d\U0001f3fe":                           {":writing_hand_tone4:"},
-			"\u270d\U0001f3ff":                           {":writing_hand_tone5:"},
-			"\u270d\ufe0f":                               {":writing_hand:"},
-			"\u270f":                                     {":pencil:"},
-			"\u270f\ufe0f":                               {":pencil2:"},
-			"\u2712\ufe0f":                               {":black_nib:"},
-			"\u2714":                                     {":check_mark:"},
-			"\u2714\ufe0f":                               {":heavy_check_mark:"},
-			"\u2716":                                     {":multiply:"},
-			"\u2716\ufe0f":                               {":heavy_multiplication_x:"},
-			"\u271d":                                     {":cross:"},
-			"\u271d\ufe0f":                               {":latin_cross:"},
-			"\u2721":                                     {":star_of_David:"},
-			"\u2721\ufe0f":                               {":star_of_david:"},
-			"\u2728":                                     {":sparkles:"},
-			"\u2733":                                     {":eight-spoked_asterisk:"},
-			"\u2733\ufe0f":                               {":eight_spoked_asterisk:"},
-			"\u2734":                                     {":eight-pointed_star:"},
-			"\u2734\ufe0f":                               {":eight_pointed_black_star:"},
-			"\u2744\ufe0f":                               {":snowflake:"},
-			"\u2747\ufe0f":                               {":sparkle:"},
-			"\u274c":                                     {":x:", ":cross_mark:"},
-			"\u274e":                                     {":cross_mark_button:", ":negative_squared_cross_mark:"},
-			"\u2753":                                     {":question:", ":red_question_mark:"},
-			"\u2754":                                     {":grey_question:", ":white_question_mark:"},
-			"\u2755":                                     {":grey_exclamation:", ":white_exclamation_mark:"},
-			"\u2757":                                     {":exclamation:", ":red_exclamation_mark:", ":heavy_exclamation_mark:"},
-			"\u2763":                                     {":heart_exclamation:"},
-			"\u2763\ufe0f":                               {":heavy_heart_exclamation:", ":heavy_heart_exclamation_mark_ornament:"},
-			"\u2764":                                     {":red_heart:"},
-			"\u2764\ufe0f":                               {":heart:"},
-			"\u2764\ufe0f\u200d\U0001f525":               {":heart_on_fire:"},
-			"\u2764\ufe0f\u200d\U0001fa79":               {":mending_heart:"},
-			"\u2795":                                     {":plus:", ":heavy_plus_sign:"},
-			"\u2796":                                     {":minus:", ":heavy_minus_sign:"},
-			"\u2797":                                     {":divide:", ":heavy_division_sign:"},
-			"\u27a1":                                     {":right_arrow:"},
-			"\u27a1\ufe0f":                               {":arrow_right:"},
-			"\u27b0":                                     {":curly_loop:"},
-			"\u27bf":                                     {":loop:", ":double_curly_loop:"},
-			"\u2934":                                     {":right_arrow_curving_up:"},
-			"\u2934\ufe0f":                               {":arrow_heading_up:"},
-			"\u2935":                                     {":right_arrow_curving_down:"},
-			"\u2935\ufe0f":                               {":arrow_heading_down:"},
-			"\u2b05":                                     {":left_arrow:"},
-			"\u2b05\ufe0f":                               {":arrow_left:"},
-			"\u2b06":                                     {":up_arrow:"},
-			"\u2b06\ufe0f":                               {":arrow_up:"},
-			"\u2b07":                                     {":down_arrow:"},
-			"\u2b07\ufe0f":                               {":arrow_down:"},
-			"\u2b1b":                                     {":black_large_square:"},
-			"\u2b1c":                                     {":white_large_square:"},
-			"\u2b50":                                     {":star:"},
-			"\u2b55":                                     {":o:", ":hollow_red_circle:"},
-			"\u3030\ufe0f":                               {":wavy_dash:"},
-			"\u303d\ufe0f":                               {":part_alternation_mark:"},
-			"\u3297":                                     {":Japanese_congratulations_button:"},
-			"\u3297\ufe0f":                               {":congratulations:"},
-			"\u3299":                                     {":Japanese_secret_button:"},
-			"\u3299\ufe0f":                               {":secret:"},
+			"\U0001f46b":                             {":couple:", ":man_and_woman_holding_hands:", ":woman_and_man_holding_hands:"},
+			"\U0001f46c":                             {":men_holding_hands:", ":two_men_holding_hands:"},
+			"\U0001f46d":                             {":women_holding_hands:", ":two_women_holding_hands:"},
+			"\U0001f46e":                             {":police_officer:"},
+			"\U0001f46e\U0001f3fb":                   {":police_officer_tone1:"},
+			"\U0001f46e\U0001f3fb\u200d\u2640\ufe0f": {":woman_police_officer_tone1:"},
+			"\U0001f46e\U0001f3fb\u200d\u2642\ufe0f": {":man_police_officer_tone1:"},
+			"\U0001f46e\U0001f3fc":                   {":police_officer_tone2:"},
+			"\U0001f46e\U0001f3fc\u200d\u2640\ufe0f": {":woman_police_officer_tone2:"},
+			"\U0001f46e\U0001f3fc\u200d\u2642\ufe0f": {":man_police_officer_tone2:"},
+			"\U0001f46e\U0001f3fd":                   {":police_officer_tone3:"},
+			"\U0001f46e\U0001f3fd\u200d\u2640\ufe0f": {":woman_police_officer_tone3:"},
+			"\U0001f46e\U0001f3fd\u200d\u2642\ufe0f": {":man_police_officer_tone3:"},
+			"\U0001f46e\U0001f3fe":                   {":police_officer_tone4:"},
+			"\U0001f46e\U0001f3fe\u200d\u2640\ufe0f": {":woman_police_officer_tone4:"},
+			"\U0001f46e\U0001f3fe\u200d\u2642\ufe0f": {":man_police_officer_tone4:"},
+			"\U0001f46e\U0001f3ff":                   {":police_officer_tone5:"},
+			"\U0001f46e\U0001f3ff\u200d\u2640\ufe0f": {":woman_police_officer_tone5:"},
+			"\U0001f46e\U0001f3ff\u200d\u2642\ufe0f": {":man_police_officer_tone5:"},
+			"\U0001f46e\u200d\u2640\ufe0f":           {":policewoman:", ":woman_police_officer:", ":female-police-officer:"},
+			"\U0001f46e\u200d\u2642\ufe0f":           {":cop:", ":policeman:", ":man_police_officer:", ":male-police-officer:"},
+			"\U0001f46f":                             {":people_with_bunny_ears:", ":people_with_bunny_ears_partying:"},
+			"\U0001f46f\u200d\u2640\ufe0f":           {":dancers:", ":dancing_women:", ":women_with_bunny_ears:", ":women-with-bunny-ears-partying:", ":women_with_bunny_ears_partying:"},
+			"\U0001f46f\u200d\u2642\ufe0f":           {":dancing_men:", ":men_with_bunny_ears:", ":men-with-bunny-ears-partying:", ":men_with_bunny_ears_partying:"},
+			"\U0001f470":                             {":bride_with_veil:", ":person_with_veil:"},
+			"\U0001f470\U0001f3fb":                   {":bride_with_veil_tone1:"},
+			"\U0001f470\U0001f3fc":                   {":bride_with_veil_tone2:"},
+			"\U0001f470\U0001f3fd":                   {":bride_with_veil_tone3:"},
+			"\U0001f470\U0001f3fe":                   {":bride_with_veil_tone4:"},
+			"\U0001f470\U0001f3ff":                   {":bride_with_veil_tone5:"},
+			"\U0001f470\u200d\u2640\ufe0f":           {":woman_with_veil:"},
+			"\U0001f470\u200d\u2642\ufe0f":           {":man_with_veil:"},
+			"\U0001f471":                             {":person_blond_hair:", ":blond_haired_person:"},
+			"\U0001f471\U0001f3fb":                   {":blond_haired_person_tone1:"},
+			"\U0001f471\U0001f3fb\u200d\u2640\ufe0f": {":blond-haired_woman_tone1:"},
+			"\U0001f471\U0001f3fb\u200d\u2642\ufe0f": {":blond-haired_man_tone1:"},
+			"\U0001f471\U0001f3fc":                   {":blond_haired_person_tone2:"},
+			"\U0001f471\U0001f3fc\u200d\u2640\ufe0f": {":blond-haired_woman_tone2:"},
+			"\U0001f471\U0001f3fc\u200d\u2642\ufe0f": {":blond-haired_man_tone2:"},
+			"\U0001f471\U0001f3fd":                   {":blond_haired_person_tone3:"},
+			"\U0001f471\U0001f3fd\u200d\u2640\ufe0f": {":blond-haired_woman_tone3:"},
+			"\U0001f471\U0001f3fd\u200d\u2642\ufe0f": {":blond-haired_man_tone3:"},
+			"\U0001f471\U0001f3fe":                   {":blond_haired_person_tone4:"},
+			"\U0001f471\U0001f3fe\u200d\u2640\ufe0f": {":blond-haired_woman_tone4:"},
+			"\U0001f471\U0001f3fe\u200d\u2642\ufe0f": {":blond-haired_man_tone4:"},
+			"\U0001f471\U0001f3ff":                   {":blond_haired_person_tone5:"},
+			"\U0001f471\U0001f3ff\u200d\u2640\ufe0f": {":blond-haired_woman_tone5:"},
+			"\U0001f471\U0001f3ff\u200d\u2642\ufe0f": {":blond-haired_man_tone5:"},
+			"\U0001f471\u200d\u2640\ufe0f":           {":blonde_woman:", ":woman_blond_hair:", ":blond-haired-woman:", ":blond-haired_woman:", ":blond_haired_woman:"},
+			"\U0001f471\u200d\u2642\ufe0f":           {":man_blond_hair:", ":blond-haired-man:", ":blond-haired_man:", ":blond_haired_man:", ":person_with_blond_hair:"},
+			"\U0001f472":                             {":man_with_gua_pi_mao:", ":man_with_chinese_cap:", ":person_with_skullcap:"},
+			"\U0001f472\U0001f3fb":                   {":man_with_chinese_cap_tone1:"},
+			"\U0001f472\U0001f3fc":                   {":man_with_chinese_cap_tone2:"},
+			"\U0001f472\U0001f3fd":                   {":man_with_chinese_cap_tone3:"},
+			"\U0001f472\U0001f3fe":                   {":man_with_chinese_cap_tone4:"},
+			"\U0001f472\U0001f3ff":                   {":man_with_chinese_cap_tone5:"},
+			"\U0001f473":                             {":person_with_turban:", ":person_wearing_turban:"},
+			"\U0001f473\U0001f3fb":                   {":person_wearing_turban_tone1:"},
+			"\U0001f473\U0001f3fb\u200d\u2640\ufe0f": {":woman_wearing_turban_tone1:"},
+			"\U0001f473\U0001f3fb\u200d\u2642\ufe0f": {":man_wearing_turban_tone1:"},
+			"\U0001f473\U0001f3fc":                   {":person_wearing_turban_tone2:"},
+			"\U0001f473\U0001f3fc\u200d\u2640\ufe0f": {":woman_wearing_turban_tone2:"},
+			"\U0001f473\U0001f3fc\u200d\u2642\ufe0f": {":man_wearing_turban_tone2:"},
+			"\U0001f473\U0001f3fd":                   {":person_wearing_turban_tone3:"},
+			"\U0001f473\U0001f3fd\u200d\u2640\ufe0f": {":woman_wearing_turban_tone3:"},
+			"\U0001f473\U0001f3fd\u200d\u2642\ufe0f": {":man_wearing_turban_tone3:"},
+			"\U0001f473\U0001f3fe":                   {":person_wearing_turban_tone4:"},
+			"\U0001f473\U0001f3fe\u200d\u2640\ufe0f": {":woman_wearing_turban_tone4:"},
+			"\U0001f473\U0001f3fe\u200d\u2642\ufe0f": {":man_wearing_turban_tone4:"},
+			"\U0001f473\U0001f3ff":                   {":person_wearing_turban_tone5:"},
+			"\U0001f473\U0001f3ff\u200d\u2640\ufe0f": {":woman_wearing_turban_tone5:"},
+			"\U0001f473\U0001f3ff\u200d\u2642\ufe0f": {":man_wearing_turban_tone5:"},
+			"\U0001f473\u200d\u2640\ufe0f":           {":woman_with_turban:", ":woman-wearing-turban:", ":woman_wearing_turban:"},
+			"\U0001f473\u200d\u2642\ufe0f":           {":man_with_turban:", ":man-wearing-turban:", ":man_wearing_turban:"},
+			"\U0001f474":                             {":old_man:", ":older_man:"},
+			"\U0001f474\U0001f3fb":                   {":older_man_tone1:"},
+			"\U0001f474\U0001f3fc":                   {":older_man_tone2:"},
+			"\U0001f474\U0001f3fd":                   {":older_man_tone3:"},
+			"\U0001f474\U0001f3fe":                   {":older_man_tone4:"},
+			"\U0001f474\U0001f3ff":                   {":older_man_tone5:"},
+			"\U0001f475":                             {":old_woman:", ":older_woman:"},
+			"\U0001f475\U0001f3fb":                   {":older_woman_tone1:"},
+			"\U0001f475\U0001f3fc":                   {":older_woman_tone2:"},
+			"\U0001f475\U0001f3fd":                   {":older_woman_tone3:"},
+			"\U0001f475\U0001f3fe":                   {":older_woman_tone4:"},
+			"\U0001f475\U0001f3ff":                   {":older_woman_tone5:"},
+			"\U0001f476":                             {":baby:"},
+			"\U0001f476\U0001f3fb":                   {":baby_tone1:"},
+			"\U0001f476\U0001f3fc":                   {":baby_tone2:"},
+			"\U0001f476\U0001f3fd":                   {":baby_tone3:"},
+			"\U0001f476\U0001f3fe":                   {":baby_tone4:"},
+			"\U0001f476\U0001f3ff":                   {":baby_tone5:"},
+			"\U0001f477\U0001f3fb":                   {":construction_worker_tone1:"},
+			"\U0001f477\U0001f3fb\u200d\u2640\ufe0f": {":woman_construction_worker_tone1:"},
+			"\U0001f477\U0001f3fb\u200d\u2642\ufe0f": {":man_construction_worker_tone1:"},
+			"\U0001f477\U0001f3fc":                   {":construction_worker_tone2:"},
+			"\U0001f477\U0001f3fc\u200d\u2640\ufe0f": {":woman_construction_worker_tone2:"},
+			"\U0001f477\U0001f3fc\u200d\u2642\ufe0f": {":man_construction_worker_tone2:"},
+			"\U0001f477\U0001f3fd":                   {":construction_worker_tone3:"},
+			"\U0001f477\U0001f3fd\u200d\u2640\ufe0f": {":woman_construction_worker_tone3:"},
+			"\U0001f477\U0001f3fd\u200d\u2642\ufe0f": {":man_construction_worker_tone3:"},
+			"\U0001f477\U0001f3fe":                   {":construction_worker_tone4:"},
+			"\U0001f477\U0001f3fe\u200d\u2640\ufe0f": {":woman_construction_worker_tone4:"},
+			"\U0001f477\U0001f3fe\u200d\u2642\ufe0f": {":man_construction_worker_tone4:"},
+			"\U0001f477\U0001f3ff":                   {":construction_worker_tone5:"},
+			"\U0001f477\U0001f3ff\u200d\u2640\ufe0f": {":woman_construction_worker_tone5:"},
+			"\U0001f477\U0001f3ff\u200d\u2642\ufe0f": {":man_construction_worker_tone5:"},
+			"\U0001f477\u200d\u2640\ufe0f":           {":construction_worker_woman:", ":woman_construction_worker:", ":female-construction-worker:"},
+			"\U0001f477\u200d\u2642\ufe0f":           {":construction_worker:", ":construction_worker_man:", ":man_construction_worker:", ":male-construction-worker:"},
+			"\U0001f478":                             {":princess:"},
+			"\U0001f478\U0001f3fb":                   {":princess_tone1:"},
+			"\U0001f478\U0001f3fc":                   {":princess_tone2:"},
+			"\U0001f478\U0001f3fd":                   {":princess_tone3:"},
+			"\U0001f478\U0001f3fe":                   {":princess_tone4:"},
+			"\U0001f478\U0001f3ff":                   {":princess_tone5:"},
+			"\U0001f479":                             {":ogre:", ":japanese_ogre:"},
+			"\U0001f47a":                             {":goblin:", ":japanese_goblin:"},
+			"\U0001f47b":                             {":ghost:"},
+			"\U0001f47c":                             {":angel:", ":baby_angel:"},
+			"\U0001f47c\U0001f3fb":                   {":angel_tone1:"},
+			"\U0001f47c\U0001f3fc":                   {":angel_tone2:"},
+			"\U0001f47c\U0001f3fd":                   {":angel_tone3:"},
+			"\U0001f47c\U0001f3fe":                   {":angel_tone4:"},
+			"\U0001f47c\U0001f3ff":                   {":angel_tone5:"},
+			"\U0001f47d":                             {":alien:"},
+			"\U0001f47e":                             {":alien_monster:", ":space_invader:"},
+			"\U0001f47f":                             {":imp:", ":angry_face_with_horns:"},
+			"\U0001f480":                             {":skull:"},
+			"\U0001f481":                             {":person_tipping_hand:", ":tipping_hand_person:"},
+			"\U0001f481\U0001f3fb":                   {":person_tipping_hand_tone1:"},
+			"\U0001f481\U0001f3fb\u200d\u2640\ufe0f": {":woman_tipping_hand_tone1:"},
+			"\U0001f481\U0001f3fb\u200d\u2642\ufe0f": {":man_tipping_hand_tone1:"},
+			"\U0001f481\U0001f3fc":                   {":person_tipping_hand_tone2:"},
+			"\U0001f481\U0001f3fc\u200d\u2640\ufe0f": {":woman_tipping_hand_tone2:"},
+			"\U0001f481\U0001f3fc\u200d\u2642\ufe0f": {":man_tipping_hand_tone2:"},
+			"\U0001f481\U0001f3fd":                   {":person_tipping_hand_tone3:"},
+			"\U0001f481\U0001f3fd\u200d\u2640\ufe0f": {":woman_tipping_hand_tone3:"},
+			"\U0001f481\U0001f3fd\u200d\u2642\ufe0f": {":man_tipping_hand_tone3:"},
+			"\U0001f481\U0001f3fe":                   {":person_tipping_hand_tone4:"},
+			"\U0001f481\U0001f3fe\u200d\u2640\ufe0f": {":woman_tipping_hand_tone4:"},
+			"\U0001f481\U0001f3fe\u200d\u2642\ufe0f": {":man_tipping_hand_tone4:"},
+			"\U0001f481\U0001f3ff":                   {":person_tipping_hand_tone5:"},
+			"\U0001f481\U0001f3ff\u200d\u2640\ufe0f": {":woman_tipping_hand_tone5:"},
+			"\U0001f481\U0001f3ff\u200d\u2642\ufe0f": {":man_tipping_hand_tone5:"},
+			"\U0001f481\u200d\u2640\ufe0f":           {":sassy_woman:", ":tipping_hand_woman:", ":woman-tipping-hand:", ":woman_tipping_hand:", ":information_desk_person:"},
+			"\U0001f481\u200d\u2642\ufe0f":           {":sassy_man:", ":man-tipping-hand:", ":man_tipping_hand:", ":tipping_hand_man:"},
+			"\U0001f482":                             {":guard:"},
+			"\U0001f482\U0001f3fb":                   {":guard_tone1:"},
+			"\U0001f482\U0001f3fb\u200d\u2640\ufe0f": {":woman_guard_tone1:"},
+			"\U0001f482\U0001f3fb\u200d\u2642\ufe0f": {":man_guard_tone1:"},
+			"\U0001f482\U0001f3fc":                   {":guard_tone2:"},
+			"\U0001f482\U0001f3fc\u200d\u2640\ufe0f": {":woman_guard_tone2:"},
+			"\U0001f482\U0001f3fc\u200d\u2642\ufe0f": {":man_guard_tone2:"},
+			"\U0001f482\U0001f3fd":                   {":guard_tone3:"},
+			"\U0001f482\U0001f3fd\u200d\u2640\ufe0f": {":woman_guard_tone3:"},
+			"\U0001f482\U0001f3fd\u200d\u2642\ufe0f": {":man_guard_tone3:"},
+			"\U0001f482\U0001f3fe":                   {":guard_tone4:"},
+			"\U0001f482\U0001f3fe\u200d\u2640\ufe0f": {":woman_guard_tone4:"},
+			"\U0001f482\U0001f3fe\u200d\u2642\ufe0f": {":man_guard_tone4:"},
+			"\U0001f482\U0001f3ff":                   {":guard_tone5:"},
+			"\U0001f482\U0001f3ff\u200d\u2640\ufe0f": {":woman_guard_tone5:"},
+			"\U0001f482\U0001f3ff\u200d\u2642\ufe0f": {":man_guard_tone5:"},
+			"\U0001f482\u200d\u2640\ufe0f":           {":guardswoman:", ":woman_guard:", ":female-guard:"},
+			"\U0001f482\u200d\u2642\ufe0f":           {":guardsman:", ":man_guard:", ":male-guard:"},
+			"\U0001f483":                             {":dancer:", ":woman_dancing:"},
+			"\U0001f483\U0001f3fb":                   {":dancer_tone1:"},
+			"\U0001f483\U0001f3fc":                   {":dancer_tone2:"},
+			"\U0001f483\U0001f3fd":                   {":dancer_tone3:"},
+			"\U0001f483\U0001f3fe":                   {":dancer_tone4:"},
+			"\U0001f483\U0001f3ff":                   {":dancer_tone5:"},
+			"\U0001f484":                             {":lipstick:"},
+			"\U0001f485":                             {":nail_care:", ":nail_polish:"},
+			"\U0001f485\U0001f3fb":                   {":nail_care_tone1:"},
+			"\U0001f485\U0001f3fc":                   {":nail_care_tone2:"},
+			"\U0001f485\U0001f3fd":                   {":nail_care_tone3:"},
+			"\U0001f485\U0001f3fe":                   {":nail_care_tone4:"},
+			"\U0001f485\U0001f3ff":                   {":nail_care_tone5:"},
+			"\U0001f486":                             {":person_getting_massage:"},
+			"\U0001f486\U0001f3fb":                   {":person_getting_massage_tone1:"},
+			"\U0001f486\U0001f3fb\u200d\u2640\ufe0f": {":woman_getting_face_massage_tone1:"},
+			"\U0001f486\U0001f3fb\u200d\u2642\ufe0f": {":man_getting_face_massage_tone1:"},
+			"\U0001f486\U0001f3fc":                   {":person_getting_massage_tone2:"},
+			"\U0001f486\U0001f3fc\u200d\u2640\ufe0f": {":woman_getting_face_massage_tone2:"},
+			"\U0001f486\U0001f3fc\u200d\u2642\ufe0f": {":man_getting_face_massage_tone2:"},
+			"\U0001f486\U0001f3fd":                   {":person_getting_massage_tone3:"},
+			"\U0001f486\U0001f3fd\u200d\u2640\ufe0f": {":woman_getting_face_massage_tone3:"},
+			"\U0001f486\U0001f3fd\u200d\u2642\ufe0f": {":man_getting_face_massage_tone3:"},
+			"\U0001f486\U0001f3fe":                   {":person_getting_massage_tone4:"},
+			"\U0001f486\U0001f3fe\u200d\u2640\ufe0f": {":woman_getting_face_massage_tone4:"},
+			"\U0001f486\U0001f3fe\u200d\u2642\ufe0f": {":man_getting_face_massage_tone4:"},
+			"\U0001f486\U0001f3ff":                   {":person_getting_massage_tone5:"},
+			"\U0001f486\U0001f3ff\u200d\u2640\ufe0f": {":woman_getting_face_massage_tone5:"},
+			"\U0001f486\U0001f3ff\u200d\u2642\ufe0f": {":man_getting_face_massage_tone5:"},
+			"\U0001f486\u200d\u2640\ufe0f":           {":massage:", ":massage_woman:", ":woman-getting-massage:", ":woman_getting_massage:", ":woman_getting_face_massage:"},
+			"\U0001f486\u200d\u2642\ufe0f":           {":massage_man:", ":man-getting-massage:", ":man_getting_massage:", ":man_getting_face_massage:"},
+			"\U0001f487":                             {":person_getting_haircut:"},
+			"\U0001f487\U0001f3fb":                   {":person_getting_haircut_tone1:"},
+			"\U0001f487\U0001f3fb\u200d\u2640\ufe0f": {":woman_getting_haircut_tone1:"},
+			"\U0001f487\U0001f3fb\u200d\u2642\ufe0f": {":man_getting_haircut_tone1:"},
+			"\U0001f487\U0001f3fc":                   {":person_getting_haircut_tone2:"},
+			"\U0001f487\U0001f3fc\u200d\u2640\ufe0f": {":woman_getting_haircut_tone2:"},
+			"\U0001f487\U0001f3fc\u200d\u2642\ufe0f": {":man_getting_haircut_tone2:"},
+			"\U0001f487\U0001f3fd":                   {":person_getting_haircut_tone3:"},
+			"\U0001f487\U0001f3fd\u200d\u2640\ufe0f": {":woman_getting_haircut_tone3:"},
+			"\U0001f487\U0001f3fd\u200d\u2642\ufe0f": {":man_getting_haircut_tone3:"},
+			"\U0001f487\U0001f3fe":                   {":person_getting_haircut_tone4:"},
+			"\U0001f487\U0001f3fe\u200d\u2640\ufe0f": {":woman_getting_haircut_tone4:"},
+			"\U0001f487\U0001f3fe\u200d\u2642\ufe0f": {":man_getting_haircut_tone4:"},
+			"\U0001f487\U0001f3ff":                   {":person_getting_haircut_tone5:"},
+			"\U0001f487\U0001f3ff\u200d\u2640\ufe0f": {":woman_getting_haircut_tone5:"},
+			"\U0001f487\U0001f3ff\u200d\u2642\ufe0f": {":man_getting_haircut_tone5:"},
+			"\U0001f487\u200d\u2640\ufe0f":           {":haircut:", ":haircut_woman:", ":woman-getting-haircut:", ":woman_getting_haircut:"},
+			"\U0001f487\u200d\u2642\ufe0f":           {":haircut_man:", ":man-getting-haircut:", ":man_getting_haircut:"},
+			"\U0001f488":                             {":barber:", ":barber_pole:"},
+			"\U0001f489":                             {":syringe:"},
+			"\U0001f48a":                             {":pill:"},
+			"\U0001f48b":                             {":kiss:", ":kiss_mark:"},
+			"\U0001f48c":                             {":love_letter:"},
+			"\U0001f48d":                             {":ring:"},
+			"\U0001f48e":                             {":gem:", ":gem_stone:"},
+			"\U0001f48f":                             {":couplekiss:"},
+			"\U0001f490":                             {":bouquet:"},
+			"\U0001f491":                             {":couple_with_heart:"},
+			"\U0001f492":                             {":wedding:"},
+			"\U0001f493":                             {":heartbeat:", ":beating_heart:"},
+			"\U0001f494":                             {":broken_heart:"},
+			"\U0001f495":                             {":two_hearts:"},
+			"\U0001f496":                             {":sparkling_heart:"},
+			"\U0001f497":                             {":heartpulse:", ":growing_heart:"},
+			"\U0001f498":                             {":cupid:", ":heart_with_arrow:"},
+			"\U0001f499":                             {":blue_heart:"},
+			"\U0001f49a":                             {":green_heart:"},
+			"\U0001f49b":                             {":yellow_heart:"},
+			"\U0001f49c":                             {":purple_heart:"},
+			"\U0001f49d":                             {":gift_heart:", ":heart_with_ribbon:"},
+			"\U0001f49e":                             {":revolving_hearts:"},
+			"\U0001f49f":                             {":heart_decoration:"},
+			"\U0001f4a0":                             {":diamond_with_a_dot:", ":diamond_shape_with_a_dot_inside:"},
+			"\U0001f4a1":                             {":bulb:", ":light_bulb:"},
+			"\U0001f4a2":                             {":anger:", ":anger_symbol:"},
+			"\U0001f4a3":                             {":bomb:"},
+			"\U0001f4a4":                             {":zzz:", ":ZZZ:"},
+			"\U0001f4a5":                             {":boom:", ":collision:"},
+			"\U0001f4a6":                             {":sweat_drops:", ":sweat_droplets:"},
+			"\U0001f4a7":                             {":droplet:"},
+			"\U0001f4a8":                             {":dash:", ":dashing_away:"},
+			"\U0001f4a9":                             {":poop:", ":shit:", ":hankey:", ":pile_of_poo:"},
+			"\U0001f4aa":                             {":muscle:", ":flexed_biceps:"},
+			"\U0001f4aa\U0001f3fb":                   {":muscle_tone1:"},
+			"\U0001f4aa\U0001f3fc":                   {":muscle_tone2:"},
+			"\U0001f4aa\U0001f3fd":                   {":muscle_tone3:"},
+			"\U0001f4aa\U0001f3fe":                   {":muscle_tone4:"},
+			"\U0001f4aa\U0001f3ff":                   {":muscle_tone5:"},
+			"\U0001f4ab":                             {":dizzy:"},
+			"\U0001f4ac":                             {":speech_balloon:"},
+			"\U0001f4ad":                             {":thought_balloon:"},
+			"\U0001f4ae":                             {":white_flower:"},
+			"\U0001f4af":                             {":100:", ":hundred_points:"},
+			"\U0001f4b0":                             {":moneybag:", ":money_bag:"},
+			"\U0001f4b1":                             {":currency_exchange:"},
+			"\U0001f4b2":                             {":heavy_dollar_sign:"},
+			"\U0001f4b3":                             {":credit_card:"},
+			"\U0001f4b4":                             {":yen:", ":yen_banknote:"},
+			"\U0001f4b5":                             {":dollar:", ":dollar_banknote:"},
+			"\U0001f4b6":                             {":euro:", ":euro_banknote:"},
+			"\U0001f4b7":                             {":pound:", ":pound_banknote:"},
+			"\U0001f4b8":                             {":money_with_wings:"},
+			"\U0001f4b9":                             {":chart:", ":chart_increasing_with_yen:"},
+			"\U0001f4ba":                             {":seat:"},
+			"\U0001f4bb":                             {":laptop:", ":computer:"},
+			"\U0001f4bc":                             {":briefcase:"},
+			"\U0001f4bd":                             {":minidisc:", ":computer_disk:"},
+			"\U0001f4be":                             {":floppy_disk:"},
+			"\U0001f4bf":                             {":cd:", ":optical_disk:"},
+			"\U0001f4c0":                             {":dvd:"},
+			"\U0001f4c1":                             {":file_folder:"},
+			"\U0001f4c2":                             {":open_file_folder:"},
+			"\U0001f4c3":                             {":page_with_curl:"},
+			"\U0001f4c4":                             {":page_facing_up:"},
+			"\U0001f4c5":                             {":date:"},
+			"\U0001f4c6":                             {":calendar:", ":tear-off_calendar:"},
+			"\U0001f4c7":                             {":card_index:"},
+			"\U0001f4c8":                             {":chart_increasing:", ":chart_with_upwards_trend:"},
+			"\U0001f4c9":                             {":chart_decreasing:", ":chart_with_downwards_trend:"},
+			"\U0001f4ca":                             {":bar_chart:"},
+			"\U0001f4cb":                             {":clipboard:"},
+			"\U0001f4cc":                             {":pushpin:"},
+			"\U0001f4cd":                             {":round_pushpin:"},
+			"\U0001f4ce":                             {":paperclip:"},
+			"\U0001f4cf":                             {":straight_ruler:"},
+			"\U0001f4d0":                             {":triangular_ruler:"},
+			"\U0001f4d1":                             {":bookmark_tabs:"},
+			"\U0001f4d2":                             {":ledger:"},
+			"\U0001f4d3":                             {":notebook:"},
+			"\U0001f4d4":                             {":notebook_with_decorative_cover:"},
+			"\U0001f4d5":                             {":closed_book:"},
+			"\U0001f4d6":                             {":book:", ":open_book:"},
+			"\U0001f4d7":                             {":green_book:"},
+			"\U0001f4d8":                             {":blue_book:"},
+			"\U0001f4d9":                             {":orange_book:"},
+			"\U0001f4da":                             {":books:"},
+			"\U0001f4db":                             {":name_badge:"},
+			"\U0001f4dc":                             {":scroll:"},
+			"\U0001f4dd":                             {":memo:"},
+			"\U0001f4de":                             {":telephone_receiver:"},
+			"\U0001f4df":                             {":pager:"},
+			"\U0001f4e0":                             {":fax:", ":fax_machine:"},
+			"\U0001f4e1":                             {":satellite_antenna:"},
+			"\U0001f4e2":                             {":loudspeaker:"},
+			"\U0001f4e3":                             {":mega:", ":megaphone:"},
+			"\U0001f4e4":                             {":outbox_tray:"},
+			"\U0001f4e5":                             {":inbox_tray:"},
+			"\U0001f4e6":                             {":package:"},
+			"\U0001f4e7":                             {":e-mail:"},
+			"\U0001f4e8":                             {":incoming_envelope:"},
+			"\U0001f4e9":                             {":envelope_with_arrow:"},
+			"\U0001f4ea":                             {":mailbox_closed:", ":closed_mailbox_with_lowered_flag:"},
+			"\U0001f4eb":                             {":mailbox:", ":closed_mailbox_with_raised_flag:"},
+			"\U0001f4ec":                             {":mailbox_with_mail:", ":open_mailbox_with_raised_flag:"},
+			"\U0001f4ed":                             {":mailbox_with_no_mail:", ":open_mailbox_with_lowered_flag:"},
+			"\U0001f4ee":                             {":postbox:"},
+			"\U0001f4ef":                             {":postal_horn:"},
+			"\U0001f4f0":                             {":newspaper:"},
+			"\U0001f4f1":                             {":iphone:", ":mobile_phone:"},
+			"\U0001f4f2":                             {":calling:", ":mobile_phone_with_arrow:"},
+			"\U0001f4f3":                             {":vibration_mode:"},
+			"\U0001f4f4":                             {":mobile_phone_off:"},
+			"\U0001f4f5":                             {":no_mobile_phones:"},
+			"\U0001f4f6":                             {":antenna_bars:", ":signal_strength:"},
+			"\U0001f4f7":                             {":camera:"},
+			"\U0001f4f8":                             {":camera_flash:", ":camera_with_flash:"},
+			"\U0001f4f9":                             {":video_camera:"},
+			"\U0001f4fa":                             {":tv:", ":television:"},
+			"\U0001f4fb":                             {":radio:"},
+			"\U0001f4fc":                             {":vhs:", ":videocassette:"},
+			"\U0001f4fd":                             {":projector:"},
+			"\U0001f4fd\ufe0f":                       {":film_projector:"},
+			"\U0001f4ff":                             {":prayer_beads:"},
+			"\U0001f500":                             {":shuffle_tracks_button:", ":twisted_rightwards_arrows:"},
+			"\U0001f501":                             {":repeat:", ":repeat_button:"},
+			"\U0001f502":                             {":repeat_one:", ":repeat_single_button:"},
+			"\U0001f503":                             {":arrows_clockwise:", ":clockwise_vertical_arrows:"},
+			"\U0001f504":                             {":arrows_counterclockwise:", ":counterclockwise_arrows_button:"},
+			"\U0001f505":                             {":dim_button:", ":low_brightness:"},
+			"\U0001f506":                             {":bright_button:", ":high_brightness:"},
+			"\U0001f507":                             {":mute:", ":muted_speaker:"},
+			"\U0001f508":                             {":speaker:", ":speaker_low_volume:"},
+			"\U0001f509":                             {":sound:", ":speaker_medium_volume:"},
+			"\U0001f50a":                             {":loud_sound:", ":speaker_high_volume:"},
+			"\U0001f50b":                             {":battery:"},
+			"\U0001f50c":                             {":electric_plug:"},
+			"\U0001f50d":                             {":mag:", ":magnifying_glass_tilted_left:"},
+			"\U0001f50e":                             {":mag_right:", ":magnifying_glass_tilted_right:"},
+			"\U0001f50f":                             {":locked_with_pen:", ":lock_with_ink_pen:"},
+			"\U0001f510":                             {":locked_with_key:", ":closed_lock_with_key:"},
+			"\U0001f511":                             {":key:"},
+			"\U0001f512":                             {":lock:", ":locked:"},
+			"\U0001f513":                             {":unlock:", ":unlocked:"},
+			"\U0001f514":                             {":bell:"},
+			"\U0001f515":                             {":no_bell:", ":bell_with_slash:"},
+			"\U0001f516":                             {":bookmark:"},
+			"\U0001f517":                             {":link:"},
+			"\U0001f518":                             {":radio_button:"},
+			"\U0001f519":                             {":back:", ":BACK_arrow:"},
+			"\U0001f51a":                             {":end:", ":END_arrow:"},
+			"\U0001f51b":                             {":on:", ":ON!_arrow:"},
+			"\U0001f51c":                             {":soon:", ":SOON_arrow:"},
+			"\U0001f51d":                             {":top:", ":TOP_arrow:"},
+			"\U0001f51e":                             {":underage:", ":no_one_under_eighteen:"},
+			"\U0001f51f":                             {":keycap_10:", ":keycap_ten:"},
+			"\U0001f520":                             {":capital_abcd:", ":input_latin_uppercase:"},
+			"\U0001f521":                             {":abcd:", ":input_latin_lowercase:"},
+			"\U0001f522":                             {":1234:", ":input_numbers:"},
+			"\U0001f523":                             {":symbols:", ":input_symbols:"},
+			"\U0001f524":                             {":abc:", ":input_latin_letters:"},
+			"\U0001f525":                             {":fire:"},
+			"\U0001f526":                             {":flashlight:"},
+			"\U0001f527":                             {":wrench:"},
+			"\U0001f528":                             {":hammer:"},
+			"\U0001f529":                             {":nut_and_bolt:"},
+			"\U0001f52a":                             {":hocho:", ":knife:", ":kitchen_knife:"},
+			"\U0001f52b":                             {":gun:", ":water_pistol:"},
+			"\U0001f52c":                             {":microscope:"},
+			"\U0001f52d":                             {":telescope:"},
+			"\U0001f52e":                             {":crystal_ball:"},
+			"\U0001f52f":                             {":six_pointed_star:", ":dotted_six-pointed_star:"},
+			"\U0001f530":                             {":beginner:", ":Japanese_symbol_for_beginner:"},
+			"\U0001f531":                             {":trident:", ":trident_emblem:"},
+			"\U0001f532":                             {":black_square_button:"},
+			"\U0001f533":                             {":white_square_button:"},
+			"\U0001f534":                             {":red_circle:"},
+			"\U0001f535":                             {":blue_circle:", ":large_blue_circle:"},
+			"\U0001f536":                             {":large_orange_diamond:"},
+			"\U0001f537":                             {":large_blue_diamond:"},
+			"\U0001f538":                             {":small_orange_diamond:"},
+			"\U0001f539":                             {":small_blue_diamond:"},
+			"\U0001f53a":                             {":small_red_triangle:", ":red_triangle_pointed_up:"},
+			"\U0001f53b":                             {":small_red_triangle_down:", ":red_triangle_pointed_down:"},
+			"\U0001f53c":                             {":arrow_up_small:", ":upwards_button:"},
+			"\U0001f53d":                             {":arrow_down_small:", ":downwards_button:"},
+			"\U0001f549":                             {":om:"},
+			"\U0001f549\ufe0f":                       {":om_symbol:"},
+			"\U0001f54a":                             {":dove:"},
+			"\U0001f54a\ufe0f":                       {":dove_of_peace:"},
+			"\U0001f54b":                             {":kaaba:"},
+			"\U0001f54c":                             {":mosque:"},
+			"\U0001f54d":                             {":synagogue:"},
+			"\U0001f54e":                             {":menorah:", ":menorah_with_nine_branches:"},
+			"\U0001f550":                             {":clock1:", ":one_o’clock:"},
+			"\U0001f551":                             {":clock2:", ":two_o’clock:"},
+			"\U0001f552":                             {":clock3:", ":three_o’clock:"},
+			"\U0001f553":                             {":clock4:", ":four_o’clock:"},
+			"\U0001f554":                             {":clock5:", ":five_o’clock:"},
+			"\U0001f555":                             {":clock6:", ":six_o’clock:"},
+			"\U0001f556":                             {":clock7:", ":seven_o’clock:"},
+			"\U0001f557":                             {":clock8:", ":eight_o’clock:"},
+			"\U0001f558":                             {":clock9:", ":nine_o’clock:"},
+			"\U0001f559":                             {":clock10:", ":ten_o’clock:"},
+			"\U0001f55a":                             {":clock11:", ":eleven_o’clock:"},
+			"\U0001f55b":                             {":clock12:", ":twelve_o’clock:"},
+			"\U0001f55c":                             {":clock130:", ":one-thirty:"},
+			"\U0001f55d":                             {":clock230:", ":two-thirty:"},
+			"\U0001f55e":                             {":clock330:", ":three-thirty:"},
+			"\U0001f55f":                             {":clock430:", ":four-thirty:"},
+			"\U0001f560":                             {":clock530:", ":five-thirty:"},
+			"\U0001f561":                             {":clock630:", ":six-thirty:"},
+			"\U0001f562":                             {":clock730:", ":seven-thirty:"},
+			"\U0001f563":                             {":clock830:", ":eight-thirty:"},
+			"\U0001f564":                             {":clock930:", ":nine-thirty:"},
+			"\U0001f565":                             {":clock1030:", ":ten-thirty:"},
+			"\U0001f566":                             {":clock1130:", ":eleven-thirty:"},
+			"\U0001f567":                             {":clock1230:", ":twelve-thirty:"},
+			"\U0001f56f\ufe0f":                       {":candle:"},
+			"\U0001f570":                             {":clock:"},
+			"\U0001f570\ufe0f":                       {":mantelpiece_clock:"},
+			"\U0001f573\ufe0f":                       {":hole:"},
+			"\U0001f574":                             {":person_in_suit_levitating:"},
+			"\U0001f574\U0001f3fb":                   {":man_in_business_suit_levitating_tone1:"},
+			"\U0001f574\U0001f3fc":                   {":man_in_business_suit_levitating_tone2:"},
+			"\U0001f574\U0001f3fd":                   {":man_in_business_suit_levitating_tone3:"},
+			"\U0001f574\U0001f3fe":                   {":man_in_business_suit_levitating_tone4:"},
+			"\U0001f574\U0001f3ff":                   {":man_in_business_suit_levitating_tone5:"},
+			"\U0001f574\ufe0f":                       {":business_suit_levitating:", ":man_in_business_suit_levitating:"},
+			"\U0001f575":                             {":detective:"},
+			"\U0001f575\U0001f3fb":                   {":detective_tone1:"},
+			"\U0001f575\U0001f3fb\u200d\u2640\ufe0f": {":woman_detective_tone1:"},
+			"\U0001f575\U0001f3fb\u200d\u2642\ufe0f": {":man_detective_tone1:"},
+			"\U0001f575\U0001f3fc":                   {":detective_tone2:"},
+			"\U0001f575\U0001f3fc\u200d\u2640\ufe0f": {":woman_detective_tone2:"},
+			"\U0001f575\U0001f3fc\u200d\u2642\ufe0f": {":man_detective_tone2:"},
+			"\U0001f575\U0001f3fd":                   {":detective_tone3:"},
+			"\U0001f575\U0001f3fd\u200d\u2640\ufe0f": {":woman_detective_tone3:"},
+			"\U0001f575\U0001f3fd\u200d\u2642\ufe0f": {":man_detective_tone3:"},
+			"\U0001f575\U0001f3fe":                   {":detective_tone4:"},
+			"\U0001f575\U0001f3fe\u200d\u2640\ufe0f": {":woman_detective_tone4:"},
+			"\U0001f575\U0001f3fe\u200d\u2642\ufe0f": {":man_detective_tone4:"},
+			"\U0001f575\U0001f3ff":                   {":detective_tone5:"},
+			"\U0001f575\U0001f3ff\u200d\u2640\ufe0f": {":woman_detective_tone5:"},
+			"\U0001f575\U0001f3ff\u200d\u2642\ufe0f": {":man_detective_tone5:"},
+			"\U0001f575\ufe0f\u200d\u2640\ufe0f":     {":woman_detective:", ":female-detective:", ":female_detective:"},
+			"\U0001f575\ufe0f\u200d\u2642\ufe0f":     {":man_detective:", ":sleuth_or_spy:", ":male-detective:", ":male_detective:"},
+			"\U0001f576\ufe0f":                       {":dark_sunglasses:"},
+			"\U0001f577\ufe0f":                       {":spider:"},
+			"\U0001f578\ufe0f":                       {":spider_web:"},
+			"\U0001f579\ufe0f":                       {":joystick:"},
+			"\U0001f57a":                             {":man_dancing:"},
+			"\U0001f57a\U0001f3fb":                   {":man_dancing_tone1:"},
+			"\U0001f57a\U0001f3fc":                   {":man_dancing_tone2:"},
+			"\U0001f57a\U0001f3fd":                   {":man_dancing_tone3:"},
+			"\U0001f57a\U0001f3fe":                   {":man_dancing_tone4:"},
+			"\U0001f57a\U0001f3ff":                   {":man_dancing_tone5:"},
+			"\U0001f587":                             {":paperclips:"},
+			"\U0001f587\ufe0f":                       {":linked_paperclips:"},
+			"\U0001f58a":                             {":pen:", ":pen_ballpoint:"},
+			"\U0001f58a\ufe0f":                       {":lower_left_ballpoint_pen:"},
+			"\U0001f58b":                             {":fountain_pen:", ":pen_fountain:"},
+			"\U0001f58b\ufe0f":                       {":lower_left_fountain_pen:"},
+			"\U0001f58c":                             {":paintbrush:"},
+			"\U0001f58c\ufe0f":                       {":lower_left_paintbrush:"},
+			"\U0001f58d":                             {":crayon:"},
+			"\U0001f58d\ufe0f":                       {":lower_left_crayon:"},
+			"\U0001f590":                             {":hand_with_fingers_splayed:"},
+			"\U0001f590\U0001f3fb":                   {":hand_splayed_tone1:"},
+			"\U0001f590\U0001f3fc":                   {":hand_splayed_tone2:"},
+			"\U0001f590\U0001f3fd":                   {":hand_splayed_tone3:"},
+			"\U0001f590\U0001f3fe":                   {":hand_splayed_tone4:"},
+			"\U0001f590\U0001f3ff":                   {":hand_splayed_tone5:"},
+			"\U0001f590\ufe0f":                       {":raised_hand_with_fingers_splayed:"},
+			"\U0001f595":                             {":fu:", ":middle_finger:"},
+			"\U0001f595\U0001f3fb":                   {":middle_finger_tone1:"},
+			"\U0001f595\U0001f3fc":                   {":middle_finger_tone2:"},
+			"\U0001f595\U0001f3fd":                   {":middle_finger_tone3:"},
+			"\U0001f595\U0001f3fe":                   {":middle_finger_tone4:"},
+			"\U0001f595\U0001f3ff":                   {":middle_finger_tone5:"},
+			"\U0001f596":                             {":vulcan:", ":spock-hand:", ":vulcan_salute:"},
+			"\U0001f596\U0001f3fb":                   {":vulcan_tone1:"},
+			"\U0001f596\U0001f3fc":                   {":vulcan_tone2:"},
+			"\U0001f596\U0001f3fd":                   {":vulcan_tone3:"},
+			"\U0001f596\U0001f3fe":                   {":vulcan_tone4:"},
+			"\U0001f596\U0001f3ff":                   {":vulcan_tone5:"},
+			"\U0001f5a4":                             {":black_heart:"},
+			"\U0001f5a5":                             {":desktop:"},
+			"\U0001f5a5\ufe0f":                       {":desktop_computer:"},
+			"\U0001f5a8\ufe0f":                       {":printer:"},
+			"\U0001f5b1":                             {":computer_mouse:", ":mouse_three_button:"},
+			"\U0001f5b1\ufe0f":                       {":three_button_mouse:"},
+			"\U0001f5b2\ufe0f":                       {":trackball:"},
+			"\U0001f5bc":                             {":frame_photo:", ":framed_picture:"},
+			"\U0001f5bc\ufe0f":                       {":frame_with_picture:"},
+			"\U0001f5c2":                             {":dividers:"},
+			"\U0001f5c2\ufe0f":                       {":card_index_dividers:"},
+			"\U0001f5c3":                             {":card_box:"},
+			"\U0001f5c3\ufe0f":                       {":card_file_box:"},
+			"\U0001f5c4\ufe0f":                       {":file_cabinet:"},
+			"\U0001f5d1\ufe0f":                       {":wastebasket:"},
+			"\U0001f5d2":                             {":notepad_spiral:", ":spiral_notepad:"},
+			"\U0001f5d2\ufe0f":                       {":spiral_note_pad:"},
+			"\U0001f5d3":                             {":calendar_spiral:", ":spiral_calendar:"},
+			"\U0001f5d3\ufe0f":                       {":spiral_calendar_pad:"},
+			"\U0001f5dc":                             {":clamp:"},
+			"\U0001f5dc\ufe0f":                       {":compression:"},
+			"\U0001f5dd":                             {":key2:"},
+			"\U0001f5dd\ufe0f":                       {":old_key:"},
+			"\U0001f5de":                             {":newspaper2:", ":rolled-up_newspaper:"},
+			"\U0001f5de\ufe0f":                       {":newspaper_roll:", ":rolled_up_newspaper:"},
+			"\U0001f5e1":                             {":dagger:"},
+			"\U0001f5e1\ufe0f":                       {":dagger_knife:"},
+			"\U0001f5e3":                             {":speaking_head:"},
+			"\U0001f5e3\ufe0f":                       {":speaking_head_in_silhouette:"},
+			"\U0001f5e8":                             {":speech_left:"},
+			"\U0001f5e8\ufe0f":                       {":left_speech_bubble:"},
+			"\U0001f5ef":                             {":anger_right:"},
+			"\U0001f5ef\ufe0f":                       {":right_anger_bubble:"},
+			"\U0001f5f3":                             {":ballot_box:"},
+			"\U0001f5f3\ufe0f":                       {":ballot_box_with_ballot:"},
+			"\U0001f5fa":                             {":map:"},
+			"\U0001f5fa\ufe0f":                       {":world_map:"},
+			"\U0001f5fb":                             {":mount_fuji:"},
+			"\U0001f5fc":                             {":tokyo_tower:", ":Tokyo_tower:"},
+			"\U0001f5fd":                             {":statue_of_liberty:", ":Statue_of_Liberty:"},
+			"\U0001f5fe":                             {":japan:", ":map_of_Japan:"},
+			"\U0001f5ff":                             {":moai:", ":moyai:"},
+			"\U0001f600":                             {":grinning:", ":grinning_face:"},
+			"\U0001f601":                             {":grin:", ":beaming_face_with_smiling_eyes:"},
+			"\U0001f602":                             {":joy:", ":face_with_tears_of_joy:"},
+			"\U0001f603":                             {":smiley:", ":grinning_face_with_big_eyes:"},
+			"\U0001f604":                             {":smile:", ":grinning_face_with_smiling_eyes:"},
+			"\U0001f605":                             {":sweat_smile:", ":grinning_face_with_sweat:"},
+			"\U0001f606":                             {":laughing:", ":satisfied:", ":grinning_squinting_face:"},
+			"\U0001f607":                             {":innocent:", ":smiling_face_with_halo:"},
+			"\U0001f608":                             {":smiling_imp:", ":smiling_face_with_horns:"},
+			"\U0001f609":                             {":wink:", ":winking_face:"},
+			"\U0001f60a":                             {":blush:", ":smiling_face_with_smiling_eyes:"},
+			"\U0001f60b":                             {":yum:", ":face_savoring_food:"},
+			"\U0001f60c":                             {":relieved:", ":relieved_face:"},
+			"\U0001f60d":                             {":heart_eyes:", ":smiling_face_with_heart-eyes:"},
+			"\U0001f60e":                             {":sunglasses:", ":smiling_face_with_sunglasses:"},
+			"\U0001f60f":                             {":smirk:", ":smirking_face:"},
+			"\U0001f610":                             {":neutral_face:"},
+			"\U0001f611":                             {":expressionless:", ":expressionless_face:"},
+			"\U0001f612":                             {":unamused:", ":unamused_face:"},
+			"\U0001f613":                             {":sweat:", ":downcast_face_with_sweat:"},
+			"\U0001f614":                             {":pensive:", ":pensive_face:"},
+			"\U0001f615":                             {":confused:", ":confused_face:"},
+			"\U0001f616":                             {":confounded:", ":confounded_face:"},
+			"\U0001f617":                             {":kissing:", ":kissing_face:"},
+			"\U0001f618":                             {":kissing_heart:", ":face_blowing_a_kiss:"},
+			"\U0001f619":                             {":kissing_smiling_eyes:", ":kissing_face_with_smiling_eyes:"},
+			"\U0001f61a":                             {":kissing_closed_eyes:", ":kissing_face_with_closed_eyes:"},
+			"\U0001f61b":                             {":face_with_tongue:", ":stuck_out_tongue:"},
+			"\U0001f61c":                             {":winking_face_with_tongue:", ":stuck_out_tongue_winking_eye:"},
+			"\U0001f61d":                             {":squinting_face_with_tongue:", ":stuck_out_tongue_closed_eyes:"},
+			"\U0001f61e":                             {":disappointed:", ":disappointed_face:"},
+			"\U0001f61f":                             {":worried:", ":worried_face:"},
+			"\U0001f620":                             {":angry:", ":angry_face:"},
+			"\U0001f621":                             {":pout:", ":rage:", ":enraged_face:"},
+			"\U0001f622":                             {":cry:", ":crying_face:"},
+			"\U0001f623":                             {":persevere:", ":persevering_face:"},
+			"\U0001f624":                             {":triumph:", ":face_with_steam_from_nose:"},
+			"\U0001f625":                             {":disappointed_relieved:", ":sad_but_relieved_face:"},
+			"\U0001f626":                             {":frowning:", ":frowning_face_with_open_mouth:"},
+			"\U0001f627":                             {":anguished:", ":anguished_face:"},
+			"\U0001f628":                             {":fearful:", ":fearful_face:"},
+			"\U0001f629":                             {":weary:", ":weary_face:"},
+			"\U0001f62a":                             {":sleepy:", ":sleepy_face:"},
+			"\U0001f62b":                             {":tired_face:"},
+			"\U0001f62c":                             {":grimacing:", ":grimacing_face:"},
+			"\U0001f62d":                             {":sob:", ":loudly_crying_face:"},
+			"\U0001f62e":                             {":open_mouth:", ":face_with_open_mouth:"},
+			"\U0001f62e\u200d\U0001f4a8":             {":face_exhaling:"},
+			"\U0001f62f":                             {":hushed:", ":hushed_face:"},
+			"\U0001f630":                             {":cold_sweat:", ":anxious_face_with_sweat:"},
+			"\U0001f631":                             {":scream:", ":face_screaming_in_fear:"},
+			"\U0001f632":                             {":astonished:", ":astonished_face:"},
+			"\U0001f633":                             {":flushed:", ":flushed_face:"},
+			"\U0001f634":                             {":sleeping:", ":sleeping_face:"},
+			"\U0001f635":                             {":dizzy_face:", ":face_with_crossed-out_eyes:"},
+			"\U0001f635\u200d\U0001f4ab":             {":face_with_spiral_eyes:"},
+			"\U0001f636":                             {":no_mouth:", ":face_without_mouth:"},
+			"\U0001f636\u200d\U0001f32b\ufe0f":       {":face_in_clouds:"},
+			"\U0001f637":                             {":mask:", ":face_with_medical_mask:"},
+			"\U0001f638":                             {":smile_cat:", ":grinning_cat_with_smiling_eyes:"},
+			"\U0001f639":                             {":joy_cat:", ":cat_with_tears_of_joy:"},
+			"\U0001f63a":                             {":smiley_cat:", ":grinning_cat:"},
+			"\U0001f63b":                             {":heart_eyes_cat:", ":smiling_cat_with_heart-eyes:"},
+			"\U0001f63c":                             {":smirk_cat:", ":cat_with_wry_smile:"},
+			"\U0001f63d":                             {":kissing_cat:"},
+			"\U0001f63e":                             {":pouting_cat:"},
+			"\U0001f63f":                             {":crying_cat:", ":crying_cat_face:"},
+			"\U0001f640":                             {":weary_cat:", ":scream_cat:"},
+			"\U0001f641":                             {":slight_frown:", ":slightly_frowning_face:"},
+			"\U0001f642":                             {":slight_smile:", ":slightly_smiling_face:"},
+			"\U0001f642\u200d\u2194\ufe0f":           {":head_shaking_horizontally:"},
+			"\U0001f642\u200d\u2195\ufe0f":           {":head_shaking_vertically:"},
+			"\U0001f643":                             {":upside_down:", ":upside-down_face:", ":upside_down_face:"},
+			"\U0001f644":                             {":roll_eyes:", ":rolling_eyes:", ":face_with_rolling_eyes:"},
+			"\U0001f645":                             {":person_gesturing_no:", ":person_gesturing_NO:"},
+			"\U0001f645\U0001f3fb":                   {":person_gesturing_no_tone1:"},
+			"\U0001f645\U0001f3fb\u200d\u2640\ufe0f": {":woman_gesturing_no_tone1:"},
+			"\U0001f645\U0001f3fb\u200d\u2642\ufe0f": {":man_gesturing_no_tone1:"},
+			"\U0001f645\U0001f3fc":                   {":person_gesturing_no_tone2:"},
+			"\U0001f645\U0001f3fc\u200d\u2640\ufe0f": {":woman_gesturing_no_tone2:"},
+			"\U0001f645\U0001f3fc\u200d\u2642\ufe0f": {":man_gesturing_no_tone2:"},
+			"\U0001f645\U0001f3fd":                   {":person_gesturing_no_tone3:"},
+			"\U0001f645\U0001f3fd\u200d\u2640\ufe0f": {":woman_gesturing_no_tone3:"},
+			"\U0001f645\U0001f3fd\u200d\u2642\ufe0f": {":man_gesturing_no_tone3:"},
+			"\U0001f645\U0001f3fe":                   {":person_gesturing_no_tone4:"},
+			"\U0001f645\U0001f3fe\u200d\u2640\ufe0f": {":woman_gesturing_no_tone4:"},
+			"\U0001f645\U0001f3fe\u200d\u2642\ufe0f": {":man_gesturing_no_tone4:"},
+			"\U0001f645\U0001f3ff":                   {":person_gesturing_no_tone5:"},
+			"\U0001f645\U0001f3ff\u200d\u2640\ufe0f": {":woman_gesturing_no_tone5:"},
+			"\U0001f645\U0001f3ff\u200d\u2642\ufe0f": {":man_gesturing_no_tone5:"},
+			"\U0001f645\u200d\u2640\ufe0f":           {":no_good:", ":ng_woman:", ":no_good_woman:", ":woman-gesturing-no:", ":woman_gesturing_no:", ":woman_gesturing_NO:"},
+			"\U0001f645\u200d\u2642\ufe0f":           {":ng_man:", ":no_good_man:", ":man-gesturing-no:", ":man_gesturing_no:", ":man_gesturing_NO:"},
+			"\U0001f646":                             {":ok_person:", ":person_gesturing_ok:", ":person_gesturing_OK:"},
+			"\U0001f646\U0001f3fb":                   {":person_gesturing_ok_tone1:"},
+			"\U0001f646\U0001f3fb\u200d\u2640\ufe0f": {":woman_gesturing_ok_tone1:"},
+			"\U0001f646\U0001f3fb\u200d\u2642\ufe0f": {":man_gesturing_ok_tone1:"},
+			"\U0001f646\U0001f3fc":                   {":person_gesturing_ok_tone2:"},
+			"\U0001f646\U0001f3fc\u200d\u2640\ufe0f": {":woman_gesturing_ok_tone2:"},
+			"\U0001f646\U0001f3fc\u200d\u2642\ufe0f": {":man_gesturing_ok_tone2:"},
+			"\U0001f646\U0001f3fd":                   {":person_gesturing_ok_tone3:"},
+			"\U0001f646\U0001f3fd\u200d\u2640\ufe0f": {":woman_gesturing_ok_tone3:"},
+			"\U0001f646\U0001f3fd\u200d\u2642\ufe0f": {":man_gesturing_ok_tone3:"},
+			"\U0001f646\U0001f3fe":                   {":person_gesturing_ok_tone4:"},
+			"\U0001f646\U0001f3fe\u200d\u2640\ufe0f": {":woman_gesturing_ok_tone4:"},
+			"\U0001f646\U0001f3fe\u200d\u2642\ufe0f": {":man_gesturing_ok_tone4:"},
+			"\U0001f646\U0001f3ff":                   {":person_gesturing_ok_tone5:"},
+			"\U0001f646\U0001f3ff\u200d\u2640\ufe0f": {":woman_gesturing_ok_tone5:"},
+			"\U0001f646\U0001f3ff\u200d\u2642\ufe0f": {":man_gesturing_ok_tone5:"},
+			"\U0001f646\u200d\u2640\ufe0f":           {":ok_woman:", ":woman-gesturing-ok:", ":woman_gesturing_ok:", ":woman_gesturing_OK:"},
+			"\U0001f646\u200d\u2642\ufe0f":           {":ok_man:", ":man-gesturing-ok:", ":man_gesturing_ok:", ":man_gesturing_OK:"},
+			"\U0001f647":                             {":bow:", ":person_bowing:"},
+			"\U0001f647\U0001f3fb":                   {":person_bowing_tone1:"},
+			"\U0001f647\U0001f3fb\u200d\u2640\ufe0f": {":woman_bowing_tone1:"},
+			"\U0001f647\U0001f3fb\u200d\u2642\ufe0f": {":man_bowing_tone1:"},
+			"\U0001f647\U0001f3fc":                   {":person_bowing_tone2:"},
+			"\U0001f647\U0001f3fc\u200d\u2640\ufe0f": {":woman_bowing_tone2:"},
+			"\U0001f647\U0001f3fc\u200d\u2642\ufe0f": {":man_bowing_tone2:"},
+			"\U0001f647\U0001f3fd":                   {":person_bowing_tone3:"},
+			"\U0001f647\U0001f3fd\u200d\u2640\ufe0f": {":woman_bowing_tone3:"},
+			"\U0001f647\U0001f3fd\u200d\u2642\ufe0f": {":man_bowing_tone3:"},
+			"\U0001f647\U0001f3fe":                   {":person_bowing_tone4:"},
+			"\U0001f647\U0001f3fe\u200d\u2640\ufe0f": {":woman_bowing_tone4:"},
+			"\U0001f647\U0001f3fe\u200d\u2642\ufe0f": {":man_bowing_tone4:"},
+			"\U0001f647\U0001f3ff":                   {":person_bowing_tone5:"},
+			"\U0001f647\U0001f3ff\u200d\u2640\ufe0f": {":woman_bowing_tone5:"},
+			"\U0001f647\U0001f3ff\u200d\u2642\ufe0f": {":man_bowing_tone5:"},
+			"\U0001f647\u200d\u2640\ufe0f":           {":bowing_woman:", ":woman-bowing:", ":woman_bowing:"},
+			"\U0001f647\u200d\u2642\ufe0f":           {":bowing_man:", ":man-bowing:", ":man_bowing:"},
+			"\U0001f648":                             {":see_no_evil:", ":see-no-evil_monkey:"},
+			"\U0001f649":                             {":hear_no_evil:", ":hear-no-evil_monkey:"},
+			"\U0001f64a":                             {":speak_no_evil:", ":speak-no-evil_monkey:"},
+			"\U0001f64b":                             {":person_raising_hand:"},
+			"\U0001f64b\U0001f3fb":                   {":person_raising_hand_tone1:"},
+			"\U0001f64b\U0001f3fb\u200d\u2640\ufe0f": {":woman_raising_hand_tone1:"},
+			"\U0001f64b\U0001f3fb\u200d\u2642\ufe0f": {":man_raising_hand_tone1:"},
+			"\U0001f64b\U0001f3fc":                   {":person_raising_hand_tone2:"},
+			"\U0001f64b\U0001f3fc\u200d\u2640\ufe0f": {":woman_raising_hand_tone2:"},
+			"\U0001f64b\U0001f3fc\u200d\u2642\ufe0f": {":man_raising_hand_tone2:"},
+			"\U0001f64b\U0001f3fd":                   {":person_raising_hand_tone3:"},
+			"\U0001f64b\U0001f3fd\u200d\u2640\ufe0f": {":woman_raising_hand_tone3:"},
+			"\U0001f64b\U0001f3fd\u200d\u2642\ufe0f": {":man_raising_hand_tone3:"},
+			"\U0001f64b\U0001f3fe":                   {":person_raising_hand_tone4:"},
+			"\U0001f64b\U0001f3fe\u200d\u2640\ufe0f": {":woman_raising_hand_tone4:"},
+			"\U0001f64b\U0001f3fe\u200d\u2642\ufe0f": {":man_raising_hand_tone4:"},
+			"\U0001f64b\U0001f3ff":                   {":person_raising_hand_tone5:"},
+			"\U0001f64b\U0001f3ff\u200d\u2640\ufe0f": {":woman_raising_hand_tone5:"},
+			"\U0001f64b\U0001f3ff\u200d\u2642\ufe0f": {":man_raising_hand_tone5:"},
+			"\U0001f64b\u200d\u2640\ufe0f":           {":raising_hand:", ":raising_hand_woman:", ":woman-raising-hand:", ":woman_raising_hand:"},
+			"\U0001f64b\u200d\u2642\ufe0f":           {":man-raising-hand:", ":man_raising_hand:", ":raising_hand_man:"},
+			"\U0001f64c":                             {":raised_hands:", ":raising_hands:"},
+			"\U0001f64c\U0001f3fb":                   {":raised_hands_tone1:"},
+			"\U0001f64c\U0001f3fc":                   {":raised_hands_tone2:"},
+			"\U0001f64c\U0001f3fd":                   {":raised_hands_tone3:"},
+			"\U0001f64c\U0001f3fe":                   {":raised_hands_tone4:"},
+			"\U0001f64c\U0001f3ff":                   {":raised_hands_tone5:"},
+			"\U0001f64d":                             {":frowning_person:"},
+			"\U0001f64d\U0001f3fb":                   {":person_frowning_tone1:"},
+			"\U0001f64d\U0001f3fb\u200d\u2640\ufe0f": {":woman_frowning_tone1:"},
+			"\U0001f64d\U0001f3fb\u200d\u2642\ufe0f": {":man_frowning_tone1:"},
+			"\U0001f64d\U0001f3fc":                   {":person_frowning_tone2:"},
+			"\U0001f64d\U0001f3fc\u200d\u2640\ufe0f": {":woman_frowning_tone2:"},
+			"\U0001f64d\U0001f3fc\u200d\u2642\ufe0f": {":man_frowning_tone2:"},
+			"\U0001f64d\U0001f3fd":                   {":person_frowning_tone3:"},
+			"\U0001f64d\U0001f3fd\u200d\u2640\ufe0f": {":woman_frowning_tone3:"},
+			"\U0001f64d\U0001f3fd\u200d\u2642\ufe0f": {":man_frowning_tone3:"},
+			"\U0001f64d\U0001f3fe":                   {":person_frowning_tone4:"},
+			"\U0001f64d\U0001f3fe\u200d\u2640\ufe0f": {":woman_frowning_tone4:"},
+			"\U0001f64d\U0001f3fe\u200d\u2642\ufe0f": {":man_frowning_tone4:"},
+			"\U0001f64d\U0001f3ff":                   {":person_frowning_tone5:"},
+			"\U0001f64d\U0001f3ff\u200d\u2640\ufe0f": {":woman_frowning_tone5:"},
+			"\U0001f64d\U0001f3ff\u200d\u2642\ufe0f": {":man_frowning_tone5:"},
+			"\U0001f64d\u200d\u2640\ufe0f":           {":frowning_woman:", ":woman-frowning:", ":woman_frowning:", ":person_frowning:"},
+			"\U0001f64d\u200d\u2642\ufe0f":           {":frowning_man:", ":man-frowning:", ":man_frowning:"},
+			"\U0001f64e":                             {":pouting_face:", ":person_pouting:"},
+			"\U0001f64e\U0001f3fb":                   {":person_pouting_tone1:"},
+			"\U0001f64e\U0001f3fb\u200d\u2640\ufe0f": {":woman_pouting_tone1:"},
+			"\U0001f64e\U0001f3fb\u200d\u2642\ufe0f": {":man_pouting_tone1:"},
+			"\U0001f64e\U0001f3fc":                   {":person_pouting_tone2:"},
+			"\U0001f64e\U0001f3fc\u200d\u2640\ufe0f": {":woman_pouting_tone2:"},
+			"\U0001f64e\U0001f3fc\u200d\u2642\ufe0f": {":man_pouting_tone2:"},
+			"\U0001f64e\U0001f3fd":                   {":person_pouting_tone3:"},
+			"\U0001f64e\U0001f3fd\u200d\u2640\ufe0f": {":woman_pouting_tone3:"},
+			"\U0001f64e\U0001f3fd\u200d\u2642\ufe0f": {":man_pouting_tone3:"},
+			"\U0001f64e\U0001f3fe":                   {":person_pouting_tone4:"},
+			"\U0001f64e\U0001f3fe\u200d\u2640\ufe0f": {":woman_pouting_tone4:"},
+			"\U0001f64e\U0001f3fe\u200d\u2642\ufe0f": {":man_pouting_tone4:"},
+			"\U0001f64e\U0001f3ff":                   {":person_pouting_tone5:"},
+			"\U0001f64e\U0001f3ff\u200d\u2640\ufe0f": {":woman_pouting_tone5:"},
+			"\U0001f64e\U0001f3ff\u200d\u2642\ufe0f": {":man_pouting_tone5:"},
+			"\U0001f64e\u200d\u2640\ufe0f":           {":pouting_woman:", ":woman-pouting:", ":woman_pouting:", ":person_with_pouting_face:"},
+			"\U0001f64e\u200d\u2642\ufe0f":           {":man-pouting:", ":man_pouting:", ":pouting_man:"},
+			"\U0001f64f":                             {":pray:", ":folded_hands:"},
+			"\U0001f64f\U0001f3fb":                   {":pray_tone1:"},
+			"\U0001f64f\U0001f3fc":                   {":pray_tone2:"},
+			"\U0001f64f\U0001f3fd":                   {":pray_tone3:"},
+			"\U0001f64f\U0001f3fe":                   {":pray_tone4:"},
+			"\U0001f64f\U0001f3ff":                   {":pray_tone5:"},
+			"\U0001f680":                             {":rocket:"},
+			"\U0001f681":                             {":helicopter:"},
+			"\U0001f682":                             {":locomotive:", ":steam_locomotive:"},
+			"\U0001f683":                             {":railway_car:"},
+			"\U0001f684":                             {":bullettrain_side:", ":high-speed_train:"},
+			"\U0001f685":                             {":bullet_train:", ":bullettrain_front:"},
+			"\U0001f686":                             {":train2:"},
+			"\U0001f687":                             {":metro:"},
+			"\U0001f688":                             {":light_rail:"},
+			"\U0001f689":                             {":station:"},
+			"\U0001f68a":                             {":tram:"},
+			"\U0001f68b":                             {":train:", ":tram_car:"},
+			"\U0001f68c":                             {":bus:"},
+			"\U0001f68d":                             {":oncoming_bus:"},
+			"\U0001f68e":                             {":trolleybus:"},
+			"\U0001f68f":                             {":busstop:", ":bus_stop:"},
+			"\U0001f690":                             {":minibus:"},
+			"\U0001f691":                             {":ambulance:"},
+			"\U0001f692":                             {":fire_engine:"},
+			"\U0001f693":                             {":police_car:"},
+			"\U0001f694":                             {":oncoming_police_car:"},
+			"\U0001f695":                             {":taxi:"},
+			"\U0001f696":                             {":oncoming_taxi:"},
+			"\U0001f697":                             {":car:", ":red_car:", ":automobile:"},
+			"\U0001f698":                             {":oncoming_automobile:"},
+			"\U0001f699":                             {":blue_car:", ":sport_utility_vehicle:"},
+			"\U0001f69a":                             {":truck:", ":delivery_truck:"},
+			"\U0001f69b":                             {":articulated_lorry:"},
+			"\U0001f69c":                             {":tractor:"},
+			"\U0001f69d":                             {":monorail:"},
+			"\U0001f69e":                             {":mountain_railway:"},
+			"\U0001f69f":                             {":suspension_railway:"},
+			"\U0001f6a0":                             {":mountain_cableway:"},
+			"\U0001f6a1":                             {":aerial_tramway:"},
+			"\U0001f6a2":                             {":ship:"},
+			"\U0001f6a3":                             {":person_rowing_boat:"},
+			"\U0001f6a3\U0001f3fb":                   {":person_rowing_boat_tone1:"},
+			"\U0001f6a3\U0001f3fb\u200d\u2640\ufe0f": {":woman_rowing_boat_tone1:"},
+			"\U0001f6a3\U0001f3fb\u200d\u2642\ufe0f": {":man_rowing_boat_tone1:"},
+			"\U0001f6a3\U0001f3fc":                   {":person_rowing_boat_tone2:"},
+			"\U0001f6a3\U0001f3fc\u200d\u2640\ufe0f": {":woman_rowing_boat_tone2:"},
+			"\U0001f6a3\U0001f3fc\u200d\u2642\ufe0f": {":man_rowing_boat_tone2:"},
+			"\U0001f6a3\U0001f3fd":                   {":person_rowing_boat_tone3:"},
+			"\U0001f6a3\U0001f3fd\u200d\u2640\ufe0f": {":woman_rowing_boat_tone3:"},
+			"\U0001f6a3\U0001f3fd\u200d\u2642\ufe0f": {":man_rowing_boat_tone3:"},
+			"\U0001f6a3\U0001f3fe":                   {":person_rowing_boat_tone4:"},
+			"\U0001f6a3\U0001f3fe\u200d\u2640\ufe0f": {":woman_rowing_boat_tone4:"},
+			"\U0001f6a3\U0001f3fe\u200d\u2642\ufe0f": {":man_rowing_boat_tone4:"},
+			"\U0001f6a3\U0001f3ff":                   {":person_rowing_boat_tone5:"},
+			"\U0001f6a3\U0001f3ff\u200d\u2640\ufe0f": {":woman_rowing_boat_tone5:"},
+			"\U0001f6a3\U0001f3ff\u200d\u2642\ufe0f": {":man_rowing_boat_tone5:"},
+			"\U0001f6a3\u200d\u2640\ufe0f":           {":rowing_woman:", ":woman-rowing-boat:", ":woman_rowing_boat:"},
+			"\U0001f6a3\u200d\u2642\ufe0f":           {":rowboat:", ":rowing_man:", ":man-rowing-boat:", ":man_rowing_boat:"},
+			"\U0001f6a4":                             {":speedboat:"},
+			"\U0001f6a5":                             {":traffic_light:", ":horizontal_traffic_light:"},
+			"\U0001f6a6":                             {":vertical_traffic_light:"},
+			"\U0001f6a7":                             {":construction:"},
+			"\U0001f6a8":                             {":rotating_light:", ":police_car_light:"},
+			"\U0001f6a9":                             {":triangular_flag:", ":triangular_flag_on_post:"},
+			"\U0001f6aa":                             {":door:"},
+			"\U0001f6ab":                             {":prohibited:", ":no_entry_sign:"},
+			"\U0001f6ac":                             {":smoking:", ":cigarette:"},
+			"\U0001f6ad":                             {":no_smoking:"},
+			"\U0001f6ae":                             {":litter_in_bin_sign:", ":put_litter_in_its_place:"},
+			"\U0001f6af":                             {":no_littering:", ":do_not_litter:"},
+			"\U0001f6b0":                             {":potable_water:"},
+			"\U0001f6b1":                             {":non-potable_water:"},
+			"\U0001f6b2":                             {":bike:", ":bicycle:"},
+			"\U0001f6b3":                             {":no_bicycles:"},
+			"\U0001f6b4":                             {":person_biking:"},
+			"\U0001f6b4\U0001f3fb":                   {":person_biking_tone1:"},
+			"\U0001f6b4\U0001f3fb\u200d\u2640\ufe0f": {":woman_biking_tone1:"},
+			"\U0001f6b4\U0001f3fb\u200d\u2642\ufe0f": {":man_biking_tone1:"},
+			"\U0001f6b4\U0001f3fc":                   {":person_biking_tone2:"},
+			"\U0001f6b4\U0001f3fc\u200d\u2640\ufe0f": {":woman_biking_tone2:"},
+			"\U0001f6b4\U0001f3fc\u200d\u2642\ufe0f": {":man_biking_tone2:"},
+			"\U0001f6b4\U0001f3fd":                   {":person_biking_tone3:"},
+			"\U0001f6b4\U0001f3fd\u200d\u2640\ufe0f": {":woman_biking_tone3:"},
+			"\U0001f6b4\U0001f3fd\u200d\u2642\ufe0f": {":man_biking_tone3:"},
+			"\U0001f6b4\U0001f3fe":                   {":person_biking_tone4:"},
+			"\U0001f6b4\U0001f3fe\u200d\u2640\ufe0f": {":woman_biking_tone4:"},
+			"\U0001f6b4\U0001f3fe\u200d\u2642\ufe0f": {":man_biking_tone4:"},
+			"\U0001f6b4\U0001f3ff":                   {":person_biking_tone5:"},
+			"\U0001f6b4\U0001f3ff\u200d\u2640\ufe0f": {":woman_biking_tone5:"},
+			"\U0001f6b4\U0001f3ff\u200d\u2642\ufe0f": {":man_biking_tone5:"},
+			"\U0001f6b4\u200d\u2640\ufe0f":           {":biking_woman:", ":woman-biking:", ":woman_biking:"},
+			"\U0001f6b4\u200d\u2642\ufe0f":           {":bicyclist:", ":biking_man:", ":man-biking:", ":man_biking:"},
+			"\U0001f6b5":                             {":person_mountain_biking:"},
+			"\U0001f6b5\U0001f3fb":                   {":person_mountain_biking_tone1:"},
+			"\U0001f6b5\U0001f3fb\u200d\u2640\ufe0f": {":woman_mountain_biking_tone1:"},
+			"\U0001f6b5\U0001f3fb\u200d\u2642\ufe0f": {":man_mountain_biking_tone1:"},
+			"\U0001f6b5\U0001f3fc":                   {":person_mountain_biking_tone2:"},
+			"\U0001f6b5\U0001f3fc\u200d\u2640\ufe0f": {":woman_mountain_biking_tone2:"},
+			"\U0001f6b5\U0001f3fc\u200d\u2642\ufe0f": {":man_mountain_biking_tone2:"},
+			"\U0001f6b5\U0001f3fd":                   {":person_mountain_biking_tone3:"},
+			"\U0001f6b5\U0001f3fd\u200d\u2640\ufe0f": {":woman_mountain_biking_tone3:"},
+			"\U0001f6b5\U0001f3fd\u200d\u2642\ufe0f": {":man_mountain_biking_tone3:"},
+			"\U0001f6b5\U0001f3fe":                   {":person_mountain_biking_tone4:"},
+			"\U0001f6b5\U0001f3fe\u200d\u2640\ufe0f": {":woman_mountain_biking_tone4:"},
+			"\U0001f6b5\U0001f3fe\u200d\u2642\ufe0f": {":man_mountain_biking_tone4:"},
+			"\U0001f6b5\U0001f3ff":                   {":person_mountain_biking_tone5:"},
+			"\U0001f6b5\U0001f3ff\u200d\u2640\ufe0f": {":woman_mountain_biking_tone5:"},
+			"\U0001f6b5\U0001f3ff\u200d\u2642\ufe0f": {":man_mountain_biking_tone5:"},
+			"\U0001f6b5\u200d\u2640\ufe0f":           {":mountain_biking_woman:", ":woman-mountain-biking:", ":woman_mountain_biking:"},
+			"\U0001f6b5\u200d\u2642\ufe0f":           {":mountain_bicyclist:", ":man-mountain-biking:", ":man_mountain_biking:", ":mountain_biking_man:"},
+			"\U0001f6b6":                             {":person_walking:"},
+			"\U0001f6b6\U0001f3fb":                   {":person_walking_tone1:"},
+			"\U0001f6b6\U0001f3fb\u200d\u2640\ufe0f": {":woman_walking_tone1:"},
+			"\U0001f6b6\U0001f3fb\u200d\u2642\ufe0f": {":man_walking_tone1:"},
+			"\U0001f6b6\U0001f3fc":                   {":person_walking_tone2:"},
+			"\U0001f6b6\U0001f3fc\u200d\u2640\ufe0f": {":woman_walking_tone2:"},
+			"\U0001f6b6\U0001f3fc\u200d\u2642\ufe0f": {":man_walking_tone2:"},
+			"\U0001f6b6\U0001f3fd":                   {":person_walking_tone3:"},
+			"\U0001f6b6\U0001f3fd\u200d\u2640\ufe0f": {":woman_walking_tone3:"},
+			"\U0001f6b6\U0001f3fd\u200d\u2642\ufe0f": {":man_walking_tone3:"},
+			"\U0001f6b6\U0001f3fe":                   {":person_walking_tone4:"},
+			"\U0001f6b6\U0001f3fe\u200d\u2640\ufe0f": {":woman_walking_tone4:"},
+			"\U0001f6b6\U0001f3fe\u200d\u2642\ufe0f": {":man_walking_tone4:"},
+			"\U0001f6b6\U0001f3ff":                   {":person_walking_tone5:"},
+			"\U0001f6b6\U0001f3ff\u200d\u2640\ufe0f": {":woman_walking_tone5:"},
+			"\U0001f6b6\U0001f3ff\u200d\u2642\ufe0f": {":man_walking_tone5:"},
+			"\U0001f6b6\u200d\u2640\ufe0f":           {":walking_woman:", ":woman-walking:", ":woman_walking:"},
+			"\U0001f6b6\u200d\u2640\ufe0f\u200d\u27a1\ufe0f": {":woman_walking_facing_right:"},
+			"\U0001f6b6\u200d\u2642\ufe0f":                   {":walking:", ":man-walking:", ":man_walking:", ":walking_man:"},
+			"\U0001f6b6\u200d\u2642\ufe0f\u200d\u27a1\ufe0f": {":man_walking_facing_right:"},
+			"\U0001f6b6\u200d\u27a1\ufe0f":                   {":person_walking_facing_right:"},
+			"\U0001f6b7":                                     {":no_pedestrians:"},
+			"\U0001f6b8":                                     {":children_crossing:"},
+			"\U0001f6b9":                                     {":mens:", ":men’s_room:"},
+			"\U0001f6ba":                                     {":womens:", ":women’s_room:"},
+			"\U0001f6bb":                                     {":restroom:"},
+			"\U0001f6bc":                                     {":baby_symbol:"},
+			"\U0001f6bd":                                     {":toilet:"},
+			"\U0001f6be":                                     {":wc:", ":water_closet:"},
+			"\U0001f6bf":                                     {":shower:"},
+			"\U0001f6c0":                                     {":bath:", ":person_taking_bath:"},
+			"\U0001f6c0\U0001f3fb":                           {":bath_tone1:"},
+			"\U0001f6c0\U0001f3fc":                           {":bath_tone2:"},
+			"\U0001f6c0\U0001f3fd":                           {":bath_tone3:"},
+			"\U0001f6c0\U0001f3fe":                           {":bath_tone4:"},
+			"\U0001f6c0\U0001f3ff":                           {":bath_tone5:"},
+			"\U0001f6c1":                                     {":bathtub:"},
+			"\U0001f6c2":                                     {":passport_control:"},
+			"\U0001f6c3":                                     {":customs:"},
+			"\U0001f6c4":                                     {":baggage_claim:"},
+			"\U0001f6c5":                                     {":left_luggage:"},
+			"\U0001f6cb":                                     {":couch:"},
+			"\U0001f6cb\ufe0f":                               {":couch_and_lamp:"},
+			"\U0001f6cc":                                     {":sleeping_bed:", ":person_in_bed:", ":sleeping_accommodation:"},
+			"\U0001f6cc\U0001f3fb":                           {":person_in_bed_tone1:"},
+			"\U0001f6cc\U0001f3fc":                           {":person_in_bed_tone2:"},
+			"\U0001f6cc\U0001f3fd":                           {":person_in_bed_tone3:"},
+			"\U0001f6cc\U0001f3fe":                           {":person_in_bed_tone4:"},
+			"\U0001f6cc\U0001f3ff":                           {":person_in_bed_tone5:"},
+			"\U0001f6cd\ufe0f":                               {":shopping:", ":shopping_bags:"},
+			"\U0001f6ce":                                     {":bellhop:"},
+			"\U0001f6ce\ufe0f":                               {":bellhop_bell:"},
+			"\U0001f6cf\ufe0f":                               {":bed:"},
+			"\U0001f6d0":                                     {":place_of_worship:"},
+			"\U0001f6d1":                                     {":stop_sign:", ":octagonal_sign:"},
+			"\U0001f6d2":                                     {":shopping_cart:", ":shopping_trolley:"},
+			"\U0001f6d5":                                     {":hindu_temple:"},
+			"\U0001f6d6":                                     {":hut:"},
+			"\U0001f6d7":                                     {":elevator:"},
+			"\U0001f6d8":                                     {":landslide:"},
+			"\U0001f6dc":                                     {":wireless:"},
+			"\U0001f6dd":                                     {":playground_slide:"},
+			"\U0001f6de":                                     {":wheel:"},
+			"\U0001f6df":                                     {":ring_buoy:"},
+			"\U0001f6e0":                                     {":tools:"},
+			"\U0001f6e0\ufe0f":                               {":hammer_and_wrench:"},
+			"\U0001f6e1\ufe0f":                               {":shield:"},
+			"\U0001f6e2":                                     {":oil:"},
+			"\U0001f6e2\ufe0f":                               {":oil_drum:"},
+			"\U0001f6e3\ufe0f":                               {":motorway:"},
+			"\U0001f6e4\ufe0f":                               {":railway_track:"},
+			"\U0001f6e5":                                     {":motorboat:"},
+			"\U0001f6e5\ufe0f":                               {":motor_boat:"},
+			"\U0001f6e9":                                     {":airplane_small:"},
+			"\U0001f6e9\ufe0f":                               {":small_airplane:"},
+			"\U0001f6eb":                                     {":flight_departure:", ":airplane_departure:"},
+			"\U0001f6ec":                                     {":flight_arrival:", ":airplane_arrival:", ":airplane_arriving:"},
+			"\U0001f6f0":                                     {":satellite_orbital:"},
+			"\U0001f6f0\ufe0f":                               {":satellite:", ":artificial_satellite:"},
+			"\U0001f6f3":                                     {":cruise_ship:"},
+			"\U0001f6f3\ufe0f":                               {":passenger_ship:"},
+			"\U0001f6f4":                                     {":scooter:", ":kick_scooter:"},
+			"\U0001f6f5":                                     {":motor_scooter:"},
+			"\U0001f6f6":                                     {":canoe:"},
+			"\U0001f6f7":                                     {":sled:"},
+			"\U0001f6f8":                                     {":flying_saucer:"},
+			"\U0001f6f9":                                     {":skateboard:"},
+			"\U0001f6fa":                                     {":auto_rickshaw:"},
+			"\U0001f6fb":                                     {":pickup_truck:"},
+			"\U0001f6fc":                                     {":roller_skate:"},
+			"\U0001f7e0":                                     {":orange_circle:", ":large_orange_circle:"},
+			"\U0001f7e1":                                     {":yellow_circle:", ":large_yellow_circle:"},
+			"\U0001f7e2":                                     {":green_circle:", ":large_green_circle:"},
+			"\U0001f7e3":                                     {":purple_circle:", ":large_purple_circle:"},
+			"\U0001f7e4":                                     {":brown_circle:", ":large_brown_circle:"},
+			"\U0001f7e5":                                     {":red_square:", ":large_red_square:"},
+			"\U0001f7e6":                                     {":blue_square:", ":large_blue_square:"},
+			"\U0001f7e7":                                     {":orange_square:", ":large_orange_square:"},
+			"\U0001f7e8":                                     {":yellow_square:", ":large_yellow_square:"},
+			"\U0001f7e9":                                     {":green_square:", ":large_green_square:"},
+			"\U0001f7ea":                                     {":purple_square:", ":large_purple_square:"},
+			"\U0001f7eb":                                     {":brown_square:", ":large_brown_square:"},
+			"\U0001f7f0":                                     {":heavy_equals_sign:"},
+			"\U0001f90c":                                     {":pinched_fingers:"},
+			"\U0001f90d":                                     {":white_heart:"},
+			"\U0001f90e":                                     {":brown_heart:"},
+			"\U0001f90f":                                     {":pinching_hand:"},
+			"\U0001f910":                                     {":zipper_mouth:", ":zipper-mouth_face:", ":zipper_mouth_face:"},
+			"\U0001f911":                                     {":money_mouth:", ":money-mouth_face:", ":money_mouth_face:"},
+			"\U0001f912":                                     {":thermometer_face:", ":face_with_thermometer:"},
+			"\U0001f913":                                     {":nerd:", ":nerd_face:"},
+			"\U0001f914":                                     {":thinking:", ":thinking_face:"},
+			"\U0001f915":                                     {":head_bandage:", ":face_with_head-bandage:", ":face_with_head_bandage:"},
+			"\U0001f916":                                     {":robot:", ":robot_face:"},
+			"\U0001f917":                                     {":hugs:", ":hugging:", ":hugging_face:", ":smiling_face_with_open_hands:"},
+			"\U0001f918":                                     {":metal:", ":the_horns:", ":sign_of_the_horns:"},
+			"\U0001f918\U0001f3fb":                           {":metal_tone1:"},
+			"\U0001f918\U0001f3fc":                           {":metal_tone2:"},
+			"\U0001f918\U0001f3fd":                           {":metal_tone3:"},
+			"\U0001f918\U0001f3fe":                           {":metal_tone4:"},
+			"\U0001f918\U0001f3ff":                           {":metal_tone5:"},
+			"\U0001f919":                                     {":call_me:", ":call_me_hand:"},
+			"\U0001f919\U0001f3fb":                           {":call_me_tone1:"},
+			"\U0001f919\U0001f3fc":                           {":call_me_tone2:"},
+			"\U0001f919\U0001f3fd":                           {":call_me_tone3:"},
+			"\U0001f919\U0001f3fe":                           {":call_me_tone4:"},
+			"\U0001f919\U0001f3ff":                           {":call_me_tone5:"},
+			"\U0001f91a":                                     {":raised_back_of_hand:"},
+			"\U0001f91a\U0001f3fb":                           {":raised_back_of_hand_tone1:"},
+			"\U0001f91a\U0001f3fc":                           {":raised_back_of_hand_tone2:"},
+			"\U0001f91a\U0001f3fd":                           {":raised_back_of_hand_tone3:"},
+			"\U0001f91a\U0001f3fe":                           {":raised_back_of_hand_tone4:"},
+			"\U0001f91a\U0001f3ff":                           {":raised_back_of_hand_tone5:"},
+			"\U0001f91b":                                     {":fist_left:", ":left-facing_fist:", ":left_facing_fist:"},
+			"\U0001f91b\U0001f3fb":                           {":left_facing_fist_tone1:"},
+			"\U0001f91b\U0001f3fc":                           {":left_facing_fist_tone2:"},
+			"\U0001f91b\U0001f3fd":                           {":left_facing_fist_tone3:"},
+			"\U0001f91b\U0001f3fe":                           {":left_facing_fist_tone4:"},
+			"\U0001f91b\U0001f3ff":                           {":left_facing_fist_tone5:"},
+			"\U0001f91c":                                     {":fist_right:", ":right-facing_fist:", ":right_facing_fist:"},
+			"\U0001f91c\U0001f3fb":                           {":right_facing_fist_tone1:"},
+			"\U0001f91c\U0001f3fc":                           {":right_facing_fist_tone2:"},
+			"\U0001f91c\U0001f3fd":                           {":right_facing_fist_tone3:"},
+			"\U0001f91c\U0001f3fe":                           {":right_facing_fist_tone4:"},
+			"\U0001f91c\U0001f3ff":                           {":right_facing_fist_tone5:"},
+			"\U0001f91d":                                     {":handshake:"},
+			"\U0001f91e":                                     {":crossed_fingers:", ":fingers_crossed:"},
+			"\U0001f91e\U0001f3fb":                           {":fingers_crossed_tone1:"},
+			"\U0001f91e\U0001f3fc":                           {":fingers_crossed_tone2:"},
+			"\U0001f91e\U0001f3fd":                           {":fingers_crossed_tone3:"},
+			"\U0001f91e\U0001f3fe":                           {":fingers_crossed_tone4:"},
+			"\U0001f91e\U0001f3ff":                           {":fingers_crossed_tone5:"},
+			"\U0001f91f":                                     {":love-you_gesture:", ":love_you_gesture:", ":i_love_you_hand_sign:"},
+			"\U0001f91f\U0001f3fb":                           {":love_you_gesture_tone1:"},
+			"\U0001f91f\U0001f3fc":                           {":love_you_gesture_tone2:"},
+			"\U0001f91f\U0001f3fd":                           {":love_you_gesture_tone3:"},
+			"\U0001f91f\U0001f3fe":                           {":love_you_gesture_tone4:"},
+			"\U0001f91f\U0001f3ff":                           {":love_you_gesture_tone5:"},
+			"\U0001f920":                                     {":cowboy:", ":cowboy_hat_face:", ":face_with_cowboy_hat:"},
+			"\U0001f921":                                     {":clown:", ":clown_face:"},
+			"\U0001f922":                                     {":nauseated_face:"},
+			"\U0001f923":                                     {":rofl:", ":rolling_on_the_floor_laughing:"},
+			"\U0001f924":                                     {":drooling_face:"},
+			"\U0001f925":                                     {":lying_face:"},
+			"\U0001f926":                                     {":facepalm:", ":face_palm:", ":person_facepalming:"},
+			"\U0001f926\U0001f3fb":                           {":person_facepalming_tone1:"},
+			"\U0001f926\U0001f3fb\u200d\u2640\ufe0f":         {":woman_facepalming_tone1:"},
+			"\U0001f926\U0001f3fb\u200d\u2642\ufe0f":         {":man_facepalming_tone1:"},
+			"\U0001f926\U0001f3fc":                           {":person_facepalming_tone2:"},
+			"\U0001f926\U0001f3fc\u200d\u2640\ufe0f":         {":woman_facepalming_tone2:"},
+			"\U0001f926\U0001f3fc\u200d\u2642\ufe0f":         {":man_facepalming_tone2:"},
+			"\U0001f926\U0001f3fd":                           {":person_facepalming_tone3:"},
+			"\U0001f926\U0001f3fd\u200d\u2640\ufe0f":         {":woman_facepalming_tone3:"},
+			"\U0001f926\U0001f3fd\u200d\u2642\ufe0f":         {":man_facepalming_tone3:"},
+			"\U0001f926\U0001f3fe":                           {":person_facepalming_tone4:"},
+			"\U0001f926\U0001f3fe\u200d\u2640\ufe0f":         {":woman_facepalming_tone4:"},
+			"\U0001f926\U0001f3fe\u200d\u2642\ufe0f":         {":man_facepalming_tone4:"},
+			"\U0001f926\U0001f3ff":                           {":person_facepalming_tone5:"},
+			"\U0001f926\U0001f3ff\u200d\u2640\ufe0f":         {":woman_facepalming_tone5:"},
+			"\U0001f926\U0001f3ff\u200d\u2642\ufe0f":         {":man_facepalming_tone5:"},
+			"\U0001f926\u200d\u2640\ufe0f":                   {":woman-facepalming:", ":woman_facepalming:"},
+			"\U0001f926\u200d\u2642\ufe0f":                   {":man-facepalming:", ":man_facepalming:"},
+			"\U0001f927":                                     {":sneezing_face:"},
+			"\U0001f928":                                     {":raised_eyebrow:", ":face_with_raised_eyebrow:"},
+			"\U0001f929":                                     {":star-struck:", ":star_struck:"},
+			"\U0001f92a":                                     {":zany_face:", ":crazy_face:"},
+			"\U0001f92b":                                     {":shushing_face:"},
+			"\U0001f92c":                                     {":cursing_face:", ":face_with_symbols_on_mouth:", ":face_with_symbols_over_mouth:"},
+			"\U0001f92d":                                     {":hand_over_mouth:", ":face_with_hand_over_mouth:"},
+			"\U0001f92e":                                     {":face_vomiting:", ":vomiting_face:"},
+			"\U0001f92f":                                     {":exploding_head:"},
+			"\U0001f930":                                     {":pregnant_woman:"},
+			"\U0001f930\U0001f3fb":                           {":pregnant_woman_tone1:"},
+			"\U0001f930\U0001f3fc":                           {":pregnant_woman_tone2:"},
+			"\U0001f930\U0001f3fd":                           {":pregnant_woman_tone3:"},
+			"\U0001f930\U0001f3fe":                           {":pregnant_woman_tone4:"},
+			"\U0001f930\U0001f3ff":                           {":pregnant_woman_tone5:"},
+			"\U0001f931":                                     {":breast-feeding:", ":breast_feeding:"},
+			"\U0001f931\U0001f3fb":                           {":breast_feeding_tone1:"},
+			"\U0001f931\U0001f3fc":                           {":breast_feeding_tone2:"},
+			"\U0001f931\U0001f3fd":                           {":breast_feeding_tone3:"},
+			"\U0001f931\U0001f3fe":                           {":breast_feeding_tone4:"},
+			"\U0001f931\U0001f3ff":                           {":breast_feeding_tone5:"},
+			"\U0001f932":                                     {":palms_up_together:"},
+			"\U0001f932\U0001f3fb":                           {":palms_up_together_tone1:"},
+			"\U0001f932\U0001f3fc":                           {":palms_up_together_tone2:"},
+			"\U0001f932\U0001f3fd":                           {":palms_up_together_tone3:"},
+			"\U0001f932\U0001f3fe":                           {":palms_up_together_tone4:"},
+			"\U0001f932\U0001f3ff":                           {":palms_up_together_tone5:"},
+			"\U0001f933":                                     {":selfie:"},
+			"\U0001f933\U0001f3fb":                           {":selfie_tone1:"},
+			"\U0001f933\U0001f3fc":                           {":selfie_tone2:"},
+			"\U0001f933\U0001f3fd":                           {":selfie_tone3:"},
+			"\U0001f933\U0001f3fe":                           {":selfie_tone4:"},
+			"\U0001f933\U0001f3ff":                           {":selfie_tone5:"},
+			"\U0001f934":                                     {":prince:"},
+			"\U0001f934\U0001f3fb":                           {":prince_tone1:"},
+			"\U0001f934\U0001f3fc":                           {":prince_tone2:"},
+			"\U0001f934\U0001f3fd":                           {":prince_tone3:"},
+			"\U0001f934\U0001f3fe":                           {":prince_tone4:"},
+			"\U0001f934\U0001f3ff":                           {":prince_tone5:"},
+			"\U0001f935":                                     {":person_in_tuxedo:"},
+			"\U0001f935\U0001f3fb":                           {":man_in_tuxedo_tone1:"},
+			"\U0001f935\U0001f3fc":                           {":man_in_tuxedo_tone2:"},
+			"\U0001f935\U0001f3fd":                           {":man_in_tuxedo_tone3:"},
+			"\U0001f935\U0001f3fe":                           {":man_in_tuxedo_tone4:"},
+			"\U0001f935\U0001f3ff":                           {":man_in_tuxedo_tone5:"},
+			"\U0001f935\u200d\u2640\ufe0f":                   {":woman_in_tuxedo:"},
+			"\U0001f935\u200d\u2642\ufe0f":                   {":man_in_tuxedo:"},
+			"\U0001f936":                                     {":mrs_claus:", ":Mrs._Claus:"},
+			"\U0001f936\U0001f3fb":                           {":mrs_claus_tone1:"},
+			"\U0001f936\U0001f3fc":                           {":mrs_claus_tone2:"},
+			"\U0001f936\U0001f3fd":                           {":mrs_claus_tone3:"},
+			"\U0001f936\U0001f3fe":                           {":mrs_claus_tone4:"},
+			"\U0001f936\U0001f3ff":                           {":mrs_claus_tone5:"},
+			"\U0001f937":                                     {":shrug:", ":person_shrugging:"},
+			"\U0001f937\U0001f3fb":                           {":person_shrugging_tone1:"},
+			"\U0001f937\U0001f3fb\u200d\u2640\ufe0f":         {":woman_shrugging_tone1:"},
+			"\U0001f937\U0001f3fb\u200d\u2642\ufe0f":         {":man_shrugging_tone1:"},
+			"\U0001f937\U0001f3fc":                           {":person_shrugging_tone2:"},
+			"\U0001f937\U0001f3fc\u200d\u2640\ufe0f":         {":woman_shrugging_tone2:"},
+			"\U0001f937\U0001f3fc\u200d\u2642\ufe0f":         {":man_shrugging_tone2:"},
+			"\U0001f937\U0001f3fd":                           {":person_shrugging_tone3:"},
+			"\U0001f937\U0001f3fd\u200d\u2640\ufe0f":         {":woman_shrugging_tone3:"},
+			"\U0001f937\U0001f3fd\u200d\u2642\ufe0f":         {":man_shrugging_tone3:"},
+			"\U0001f937\U0001f3fe":                           {":person_shrugging_tone4:"},
+			"\U0001f937\U0001f3fe\u200d\u2640\ufe0f":         {":woman_shrugging_tone4:"},
+			"\U0001f937\U0001f3fe\u200d\u2642\ufe0f":         {":man_shrugging_tone4:"},
+			"\U0001f937\U0001f3ff":                           {":person_shrugging_tone5:"},
+			"\U0001f937\U0001f3ff\u200d\u2640\ufe0f":         {":woman_shrugging_tone5:"},
+			"\U0001f937\U0001f3ff\u200d\u2642\ufe0f":         {":man_shrugging_tone5:"},
+			"\U0001f937\u200d\u2640\ufe0f":                   {":woman-shrugging:", ":woman_shrugging:"},
+			"\U0001f937\u200d\u2642\ufe0f":                   {":man-shrugging:", ":man_shrugging:"},
+			"\U0001f938":                                     {":cartwheeling:", ":person_cartwheeling:", ":person_doing_cartwheel:"},
+			"\U0001f938\U0001f3fb":                           {":person_doing_cartwheel_tone1:"},
+			"\U0001f938\U0001f3fb\u200d\u2640\ufe0f":         {":woman_cartwheeling_tone1:"},
+			"\U0001f938\U0001f3fb\u200d\u2642\ufe0f":         {":man_cartwheeling_tone1:"},
+			"\U0001f938\U0001f3fc":                           {":person_doing_cartwheel_tone2:"},
+			"\U0001f938\U0001f3fc\u200d\u2640\ufe0f":         {":woman_cartwheeling_tone2:"},
+			"\U0001f938\U0001f3fc\u200d\u2642\ufe0f":         {":man_cartwheeling_tone2:"},
+			"\U0001f938\U0001f3fd":                           {":person_doing_cartwheel_tone3:"},
+			"\U0001f938\U0001f3fd\u200d\u2640\ufe0f":         {":woman_cartwheeling_tone3:"},
+			"\U0001f938\U0001f3fd\u200d\u2642\ufe0f":         {":man_cartwheeling_tone3:"},
+			"\U0001f938\U0001f3fe":                           {":person_doing_cartwheel_tone4:"},
+			"\U0001f938\U0001f3fe\u200d\u2640\ufe0f":         {":woman_cartwheeling_tone4:"},
+			"\U0001f938\U0001f3fe\u200d\u2642\ufe0f":         {":man_cartwheeling_tone4:"},
+			"\U0001f938\U0001f3ff":                           {":person_doing_cartwheel_tone5:"},
+			"\U0001f938\U0001f3ff\u200d\u2640\ufe0f":         {":woman_cartwheeling_tone5:"},
+			"\U0001f938\U0001f3ff\u200d\u2642\ufe0f":         {":man_cartwheeling_tone5:"},
+			"\U0001f938\u200d\u2640\ufe0f":                   {":woman-cartwheeling:", ":woman_cartwheeling:"},
+			"\U0001f938\u200d\u2642\ufe0f":                   {":man-cartwheeling:", ":man_cartwheeling:"},
+			"\U0001f939":                                     {":juggling:", ":juggling_person:", ":person_juggling:"},
+			"\U0001f939\U0001f3fb":                           {":person_juggling_tone1:"},
+			"\U0001f939\U0001f3fb\u200d\u2640\ufe0f":         {":woman_juggling_tone1:"},
+			"\U0001f939\U0001f3fb\u200d\u2642\ufe0f":         {":man_juggling_tone1:"},
+			"\U0001f939\U0001f3fc":                           {":person_juggling_tone2:"},
+			"\U0001f939\U0001f3fc\u200d\u2640\ufe0f":         {":woman_juggling_tone2:"},
+			"\U0001f939\U0001f3fc\u200d\u2642\ufe0f":         {":man_juggling_tone2:"},
+			"\U0001f939\U0001f3fd":                           {":person_juggling_tone3:"},
+			"\U0001f939\U0001f3fd\u200d\u2640\ufe0f":         {":woman_juggling_tone3:"},
+			"\U0001f939\U0001f3fd\u200d\u2642\ufe0f":         {":man_juggling_tone3:"},
+			"\U0001f939\U0001f3fe":                           {":person_juggling_tone4:"},
+			"\U0001f939\U0001f3fe\u200d\u2640\ufe0f":         {":woman_juggling_tone4:"},
+			"\U0001f939\U0001f3fe\u200d\u2642\ufe0f":         {":man_juggling_tone4:"},
+			"\U0001f939\U0001f3ff":                           {":person_juggling_tone5:"},
+			"\U0001f939\U0001f3ff\u200d\u2640\ufe0f":         {":woman_juggling_tone5:"},
+			"\U0001f939\U0001f3ff\u200d\u2642\ufe0f":         {":man_juggling_tone5:"},
+			"\U0001f939\u200d\u2640\ufe0f":                   {":woman-juggling:", ":woman_juggling:"},
+			"\U0001f939\u200d\u2642\ufe0f":                   {":man-juggling:", ":man_juggling:"},
+			"\U0001f93a":                                     {":fencer:", ":person_fencing:"},
+			"\U0001f93c":                                     {":wrestlers:", ":wrestling:", ":people_wrestling:"},
+			"\U0001f93c\u200d\u2640\ufe0f":                   {":woman-wrestling:", ":women_wrestling:"},
+			"\U0001f93c\u200d\u2642\ufe0f":                   {":man-wrestling:", ":men_wrestling:"},
+			"\U0001f93d":                                     {":water_polo:", ":person_playing_water_polo:"},
+			"\U0001f93d\U0001f3fb":                           {":person_playing_water_polo_tone1:"},
+			"\U0001f93d\U0001f3fb\u200d\u2640\ufe0f":         {":woman_playing_water_polo_tone1:"},
+			"\U0001f93d\U0001f3fb\u200d\u2642\ufe0f":         {":man_playing_water_polo_tone1:"},
+			"\U0001f93d\U0001f3fc":                           {":person_playing_water_polo_tone2:"},
+			"\U0001f93d\U0001f3fc\u200d\u2640\ufe0f":         {":woman_playing_water_polo_tone2:"},
+			"\U0001f93d\U0001f3fc\u200d\u2642\ufe0f":         {":man_playing_water_polo_tone2:"},
+			"\U0001f93d\U0001f3fd":                           {":person_playing_water_polo_tone3:"},
+			"\U0001f93d\U0001f3fd\u200d\u2640\ufe0f":         {":woman_playing_water_polo_tone3:"},
+			"\U0001f93d\U0001f3fd\u200d\u2642\ufe0f":         {":man_playing_water_polo_tone3:"},
+			"\U0001f93d\U0001f3fe":                           {":person_playing_water_polo_tone4:"},
+			"\U0001f93d\U0001f3fe\u200d\u2640\ufe0f":         {":woman_playing_water_polo_tone4:"},
+			"\U0001f93d\U0001f3fe\u200d\u2642\ufe0f":         {":man_playing_water_polo_tone4:"},
+			"\U0001f93d\U0001f3ff":                           {":person_playing_water_polo_tone5:"},
+			"\U0001f93d\U0001f3ff\u200d\u2640\ufe0f":         {":woman_playing_water_polo_tone5:"},
+			"\U0001f93d\U0001f3ff\u200d\u2642\ufe0f":         {":man_playing_water_polo_tone5:"},
+			"\U0001f93d\u200d\u2640\ufe0f":                   {":woman-playing-water-polo:", ":woman_playing_water_polo:"},
+			"\U0001f93d\u200d\u2642\ufe0f":                   {":man-playing-water-polo:", ":man_playing_water_polo:"},
+			"\U0001f93e":                                     {":handball:", ":handball_person:", ":person_playing_handball:"},
+			"\U0001f93e\U0001f3fb":                           {":person_playing_handball_tone1:"},
+			"\U0001f93e\U0001f3fb\u200d\u2640\ufe0f":         {":woman_playing_handball_tone1:"},
+			"\U0001f93e\U0001f3fb\u200d\u2642\ufe0f":         {":man_playing_handball_tone1:"},
+			"\U0001f93e\U0001f3fc":                           {":person_playing_handball_tone2:"},
+			"\U0001f93e\U0001f3fc\u200d\u2640\ufe0f":         {":woman_playing_handball_tone2:"},
+			"\U0001f93e\U0001f3fc\u200d\u2642\ufe0f":         {":man_playing_handball_tone2:"},
+			"\U0001f93e\U0001f3fd":                           {":person_playing_handball_tone3:"},
+			"\U0001f93e\U0001f3fd\u200d\u2640\ufe0f":         {":woman_playing_handball_tone3:"},
+			"\U0001f93e\U0001f3fd\u200d\u2642\ufe0f":         {":man_playing_handball_tone3:"},
+			"\U0001f93e\U0001f3fe":                           {":person_playing_handball_tone4:"},
+			"\U0001f93e\U0001f3fe\u200d\u2640\ufe0f":         {":woman_playing_handball_tone4:"},
+			"\U0001f93e\U0001f3fe\u200d\u2642\ufe0f":         {":man_playing_handball_tone4:"},
+			"\U0001f93e\U0001f3ff":                           {":person_playing_handball_tone5:"},
+			"\U0001f93e\U0001f3ff\u200d\u2640\ufe0f":         {":woman_playing_handball_tone5:"},
+			"\U0001f93e\U0001f3ff\u200d\u2642\ufe0f":         {":man_playing_handball_tone5:"},
+			"\U0001f93e\u200d\u2640\ufe0f":                   {":woman-playing-handball:", ":woman_playing_handball:"},
+			"\U0001f93e\u200d\u2642\ufe0f":                   {":man-playing-handball:", ":man_playing_handball:"},
+			"\U0001f93f":                                     {":diving_mask:"},
+			"\U0001f940":                                     {":wilted_rose:", ":wilted_flower:"},
+			"\U0001f941":                                     {":drum:", ":drum_with_drumsticks:"},
+			"\U0001f942":                                     {":champagne_glass:", ":clinking_glasses:"},
+			"\U0001f943":                                     {":tumbler_glass:"},
+			"\U0001f944":                                     {":spoon:"},
+			"\U0001f945":                                     {":goal:", ":goal_net:"},
+			"\U0001f947":                                     {":first_place:", ":1st_place_medal:", ":first_place_medal:"},
+			"\U0001f948":                                     {":second_place:", ":2nd_place_medal:", ":second_place_medal:"},
+			"\U0001f949":                                     {":third_place:", ":3rd_place_medal:", ":third_place_medal:"},
+			"\U0001f94a":                                     {":boxing_glove:"},
+			"\U0001f94b":                                     {":martial_arts_uniform:"},
+			"\U0001f94c":                                     {":curling_stone:"},
+			"\U0001f94d":                                     {":lacrosse:"},
+			"\U0001f94e":                                     {":softball:"},
+			"\U0001f94f":                                     {":flying_disc:"},
+			"\U0001f950":                                     {":croissant:"},
+			"\U0001f951":                                     {":avocado:"},
+			"\U0001f952":                                     {":cucumber:"},
+			"\U0001f953":                                     {":bacon:"},
+			"\U0001f954":                                     {":potato:"},
+			"\U0001f955":                                     {":carrot:"},
+			"\U0001f956":                                     {":french_bread:", ":baguette_bread:"},
+			"\U0001f957":                                     {":salad:", ":green_salad:"},
+			"\U0001f958":                                     {":shallow_pan_of_food:"},
+			"\U0001f959":                                     {":stuffed_flatbread:"},
+			"\U0001f95a":                                     {":egg:"},
+			"\U0001f95b":                                     {":milk:", ":milk_glass:", ":glass_of_milk:"},
+			"\U0001f95c":                                     {":peanuts:"},
+			"\U0001f95d":                                     {":kiwi:", ":kiwifruit:", ":kiwi_fruit:"},
+			"\U0001f95e":                                     {":pancakes:"},
+			"\U0001f95f":                                     {":dumpling:"},
+			"\U0001f960":                                     {":fortune_cookie:"},
+			"\U0001f961":                                     {":takeout_box:"},
+			"\U0001f962":                                     {":chopsticks:"},
+			"\U0001f963":                                     {":bowl_with_spoon:"},
+			"\U0001f964":                                     {":cup_with_straw:"},
+			"\U0001f965":                                     {":coconut:"},
+			"\U0001f966":                                     {":broccoli:"},
+			"\U0001f967":                                     {":pie:"},
+			"\U0001f968":                                     {":pretzel:"},
+			"\U0001f969":                                     {":cut_of_meat:"},
+			"\U0001f96a":                                     {":sandwich:"},
+			"\U0001f96b":                                     {":canned_food:"},
+			"\U0001f96c":                                     {":leafy_green:"},
+			"\U0001f96d":                                     {":mango:"},
+			"\U0001f96e":                                     {":moon_cake:"},
+			"\U0001f96f":                                     {":bagel:"},
+			"\U0001f970":                                     {":smiling_face_with_hearts:", ":smiling_face_with_3_hearts:", ":smiling_face_with_three_hearts:"},
+			"\U0001f971":                                     {":yawning_face:"},
+			"\U0001f972":                                     {":smiling_face_with_tear:"},
+			"\U0001f973":                                     {":partying_face:"},
+			"\U0001f974":                                     {":woozy_face:"},
+			"\U0001f975":                                     {":hot_face:"},
+			"\U0001f976":                                     {":cold_face:"},
+			"\U0001f977":                                     {":ninja:"},
+			"\U0001f978":                                     {":disguised_face:"},
+			"\U0001f979":                                     {":face_holding_back_tears:"},
+			"\U0001f97a":                                     {":pleading_face:"},
+			"\U0001f97b":                                     {":sari:"},
+			"\U0001f97c":                                     {":lab_coat:"},
+			"\U0001f97d":                                     {":goggles:"},
+			"\U0001f97e":                                     {":hiking_boot:"},
+			"\U0001f97f":                                     {":flat_shoe:", ":womans_flat_shoe:"},
+			"\U0001f980":                                     {":crab:"},
+			"\U0001f981":                                     {":lion:", ":lion_face:"},
+			"\U0001f982":                                     {":scorpion:"},
+			"\U0001f983":                                     {":turkey:"},
+			"\U0001f984":                                     {":unicorn:", ":unicorn_face:"},
+			"\U0001f985":                                     {":eagle:"},
+			"\U0001f986":                                     {":duck:"},
+			"\U0001f987":                                     {":bat:"},
+			"\U0001f988":                                     {":shark:"},
+			"\U0001f989":                                     {":owl:"},
+			"\U0001f98a":                                     {":fox:", ":fox_face:"},
+			"\U0001f98b":                                     {":butterfly:"},
+			"\U0001f98c":                                     {":deer:"},
+			"\U0001f98d":                                     {":gorilla:"},
+			"\U0001f98e":                                     {":lizard:"},
+			"\U0001f98f":                                     {":rhino:", ":rhinoceros:"},
+			"\U0001f990":                                     {":shrimp:"},
+			"\U0001f991":                                     {":squid:"},
+			"\U0001f992":                                     {":giraffe:", ":giraffe_face:"},
+			"\U0001f993":                                     {":zebra:", ":zebra_face:"},
+			"\U0001f994":                                     {":hedgehog:"},
+			"\U0001f995":                                     {":sauropod:"},
+			"\U0001f996":                                     {":t-rex:", ":T-Rex:", ":t_rex:"},
+			"\U0001f997":                                     {":cricket:"},
+			"\U0001f998":                                     {":kangaroo:"},
+			"\U0001f999":                                     {":llama:"},
+			"\U0001f99a":                                     {":peacock:"},
+			"\U0001f99b":                                     {":hippopotamus:"},
+			"\U0001f99c":                                     {":parrot:"},
+			"\U0001f99d":                                     {":raccoon:"},
+			"\U0001f99e":                                     {":lobster:"},
+			"\U0001f99f":                                     {":mosquito:"},
+			"\U0001f9a0":                                     {":microbe:"},
+			"\U0001f9a1":                                     {":badger:"},
+			"\U0001f9a2":                                     {":swan:"},
+			"\U0001f9a3":                                     {":mammoth:"},
+			"\U0001f9a4":                                     {":dodo:"},
+			"\U0001f9a5":                                     {":sloth:"},
+			"\U0001f9a6":                                     {":otter:"},
+			"\U0001f9a7":                                     {":orangutan:"},
+			"\U0001f9a8":                                     {":skunk:"},
+			"\U0001f9a9":                                     {":flamingo:"},
+			"\U0001f9aa":                                     {":oyster:"},
+			"\U0001f9ab":                                     {":beaver:"},
+			"\U0001f9ac":                                     {":bison:"},
+			"\U0001f9ad":                                     {":seal:"},
+			"\U0001f9ae":                                     {":guide_dog:"},
+			"\U0001f9af":                                     {":white_cane:", ":probing_cane:"},
+			"\U0001f9b0":                                     {":red_hair:"},
+			"\U0001f9b1":                                     {":curly_hair:"},
+			"\U0001f9b2":                                     {":bald:"},
+			"\U0001f9b3":                                     {":white_hair:"},
+			"\U0001f9b4":                                     {":bone:"},
+			"\U0001f9b5":                                     {":leg:"},
+			"\U0001f9b6":                                     {":foot:"},
+			"\U0001f9b7":                                     {":tooth:"},
+			"\U0001f9b8":                                     {":superhero:"},
+			"\U0001f9b8\u200d\u2640\ufe0f":                   {":superhero_woman:", ":woman_superhero:", ":female_superhero:"},
+			"\U0001f9b8\u200d\u2642\ufe0f":                   {":man_superhero:", ":superhero_man:", ":male_superhero:"},
+			"\U0001f9b9":                                     {":supervillain:"},
+			"\U0001f9b9\u200d\u2640\ufe0f":                   {":supervillain_woman:", ":woman_supervillain:", ":female_supervillain:"},
+			"\U0001f9b9\u200d\u2642\ufe0f":                   {":man_supervillain:", ":supervillain_man:", ":male_supervillain:"},
+			"\U0001f9ba":                                     {":safety_vest:"},
+			"\U0001f9bb":                                     {":ear_with_hearing_aid:"},
+			"\U0001f9bc":                                     {":motorized_wheelchair:"},
+			"\U0001f9bd":                                     {":manual_wheelchair:"},
+			"\U0001f9be":                                     {":mechanical_arm:"},
+			"\U0001f9bf":                                     {":mechanical_leg:"},
+			"\U0001f9c0":                                     {":cheese:", ":cheese_wedge:"},
+			"\U0001f9c1":                                     {":cupcake:"},
+			"\U0001f9c2":                                     {":salt:"},
+			"\U0001f9c3":                                     {":beverage_box:"},
+			"\U0001f9c4":                                     {":garlic:"},
+			"\U0001f9c5":                                     {":onion:"},
+			"\U0001f9c6":                                     {":falafel:"},
+			"\U0001f9c7":                                     {":waffle:"},
+			"\U0001f9c8":                                     {":butter:"},
+			"\U0001f9c9":                                     {":mate:", ":mate_drink:"},
+			"\U0001f9ca":                                     {":ice:", ":ice_cube:"},
+			"\U0001f9cb":                                     {":bubble_tea:"},
+			"\U0001f9cc":                                     {":troll:"},
+			"\U0001f9cd":                                     {":person_standing:", ":standing_person:"},
+			"\U0001f9cd\u200d\u2640\ufe0f":                   {":standing_woman:", ":woman_standing:"},
+			"\U0001f9cd\u200d\u2642\ufe0f":                   {":man_standing:", ":standing_man:"},
+			"\U0001f9ce":                                     {":kneeling_person:", ":person_kneeling:"},
+			"\U0001f9ce\u200d\u2640\ufe0f":                   {":kneeling_woman:", ":woman_kneeling:"},
+			"\U0001f9ce\u200d\u2640\ufe0f\u200d\u27a1\ufe0f":             {":woman_kneeling_facing_right:"},
+			"\U0001f9ce\u200d\u2642\ufe0f":                               {":kneeling_man:", ":man_kneeling:"},
+			"\U0001f9ce\u200d\u2642\ufe0f\u200d\u27a1\ufe0f":             {":man_kneeling_facing_right:"},
+			"\U0001f9ce\u200d\u27a1\ufe0f":                               {":person_kneeling_facing_right:"},
+			"\U0001f9cf":                                                 {":deaf_person:"},
+			"\U0001f9cf\u200d\u2640\ufe0f":                               {":deaf_woman:"},
+			"\U0001f9cf\u200d\u2642\ufe0f":                               {":deaf_man:"},
+			"\U0001f9d0":                                                 {":monocle_face:", ":face_with_monocle:"},
+			"\U0001f9d1":                                                 {":adult:", ":person:"},
+			"\U0001f9d1\U0001f3fb":                                       {":adult_tone1:"},
+			"\U0001f9d1\U0001f3fc":                                       {":adult_tone2:"},
+			"\U0001f9d1\U0001f3fd":                                       {":adult_tone3:"},
+			"\U0001f9d1\U0001f3fe":                                       {":adult_tone4:"},
+			"\U0001f9d1\U0001f3ff":                                       {":adult_tone5:"},
+			"\U0001f9d1\u200d\U0001f33e":                                 {":farmer:"},
+			"\U0001f9d1\u200d\U0001f373":                                 {":cook:"},
+			"\U0001f9d1\u200d\U0001f37c":                                 {":person_feeding_baby:"},
+			"\U0001f9d1\u200d\U0001f384":                                 {":mx_claus:", ":Mx_Claus:"},
+			"\U0001f9d1\u200d\U0001f393":                                 {":student:"},
+			"\U0001f9d1\u200d\U0001f3a4":                                 {":singer:"},
+			"\U0001f9d1\u200d\U0001f3a8":                                 {":artist:"},
+			"\U0001f9d1\u200d\U0001f3eb":                                 {":teacher:"},
+			"\U0001f9d1\u200d\U0001f3ed":                                 {":factory_worker:"},
+			"\U0001f9d1\u200d\U0001f4bb":                                 {":technologist:"},
+			"\U0001f9d1\u200d\U0001f4bc":                                 {":office_worker:"},
+			"\U0001f9d1\u200d\U0001f527":                                 {":mechanic:"},
+			"\U0001f9d1\u200d\U0001f52c":                                 {":scientist:"},
+			"\U0001f9d1\u200d\U0001f680":                                 {":astronaut:"},
+			"\U0001f9d1\u200d\U0001f692":                                 {":firefighter:"},
+			"\U0001f9d1\u200d\U0001f91d\u200d\U0001f9d1":                 {":people_holding_hands:"},
+			"\U0001f9d1\u200d\U0001f9af":                                 {":person_with_white_cane:", ":person_with_probing_cane:"},
+			"\U0001f9d1\u200d\U0001f9af\u200d\u27a1\ufe0f":               {":person_with_white_cane_facing_right:"},
+			"\U0001f9d1\u200d\U0001f9b0":                                 {":person_red_hair:", ":red_haired_person:"},
+			"\U0001f9d1\u200d\U0001f9b1":                                 {":person_curly_hair:", ":curly_haired_person:"},
+			"\U0001f9d1\u200d\U0001f9b2":                                 {":bald_person:", ":person_bald:"},
+			"\U0001f9d1\u200d\U0001f9b3":                                 {":person_white_hair:", ":white_haired_person:"},
+			"\U0001f9d1\u200d\U0001f9bc":                                 {":person_in_motorized_wheelchair:"},
+			"\U0001f9d1\u200d\U0001f9bc\u200d\u27a1\ufe0f":               {":person_in_motorized_wheelchair_facing_right:"},
+			"\U0001f9d1\u200d\U0001f9bd":                                 {":person_in_manual_wheelchair:"},
+			"\U0001f9d1\u200d\U0001f9bd\u200d\u27a1\ufe0f":               {":person_in_manual_wheelchair_facing_right:"},
+			"\U0001f9d1\u200d\U0001f9d1\u200d\U0001f9d2":                 {":family_adult_adult_child:"},
+			"\U0001f9d1\u200d\U0001f9d1\u200d\U0001f9d2\u200d\U0001f9d2": {":family_adult_adult_child_child:"},
+			"\U0001f9d1\u200d\U0001f9d2":                                 {":family_adult_child:"},
+			"\U0001f9d1\u200d\U0001f9d2\u200d\U0001f9d2":                 {":family_adult_child_child:"},
+			"\U0001f9d1\u200d\U0001fa70":                                 {":ballet_dancer:"},
+			"\U0001f9d1\u200d\u2695\ufe0f":                               {":health_worker:"},
+			"\U0001f9d1\u200d\u2696\ufe0f":                               {":judge:"},
+			"\U0001f9d1\u200d\u2708\ufe0f":                               {":pilot:"},
+			"\U0001f9d2":                                                 {":child:"},
+			"\U0001f9d2\U0001f3fb":                                       {":child_tone1:"},
+			"\U0001f9d2\U0001f3fc":                                       {":child_tone2:"},
+			"\U0001f9d2\U0001f3fd":                                       {":child_tone3:"},
+			"\U0001f9d2\U0001f3fe":                                       {":child_tone4:"},
+			"\U0001f9d2\U0001f3ff":                                       {":child_tone5:"},
+			"\U0001f9d3":                                                 {":older_adult:", ":older_person:"},
+			"\U0001f9d3\U0001f3fb":                                       {":older_adult_tone1:"},
+			"\U0001f9d3\U0001f3fc":                                       {":older_adult_tone2:"},
+			"\U0001f9d3\U0001f3fd":                                       {":older_adult_tone3:"},
+			"\U0001f9d3\U0001f3fe":                                       {":older_adult_tone4:"},
+			"\U0001f9d3\U0001f3ff":                                       {":older_adult_tone5:"},
+			"\U0001f9d4":                                                 {":person_beard:", ":bearded_person:"},
+			"\U0001f9d4\U0001f3fb":                                       {":bearded_person_tone1:"},
+			"\U0001f9d4\U0001f3fc":                                       {":bearded_person_tone2:"},
+			"\U0001f9d4\U0001f3fd":                                       {":bearded_person_tone3:"},
+			"\U0001f9d4\U0001f3fe":                                       {":bearded_person_tone4:"},
+			"\U0001f9d4\U0001f3ff":                                       {":bearded_person_tone5:"},
+			"\U0001f9d4\u200d\u2640\ufe0f":                               {":woman_beard:", ":woman_with_beard:"},
+			"\U0001f9d4\u200d\u2642\ufe0f":                               {":man_beard:", ":man_with_beard:"},
+			"\U0001f9d5":                                                 {":woman_with_headscarf:", ":person_with_headscarf:"},
+			"\U0001f9d5\U0001f3fb":                                       {":woman_with_headscarf_tone1:"},
+			"\U0001f9d5\U0001f3fc":                                       {":woman_with_headscarf_tone2:"},
+			"\U0001f9d5\U0001f3fd":                                       {":woman_with_headscarf_tone3:"},
+			"\U0001f9d5\U0001f3fe":                                       {":woman_with_headscarf_tone4:"},
+			"\U0001f9d5\U0001f3ff":                                       {":woman_with_headscarf_tone5:"},
+			"\U0001f9d6":                                                 {":sauna_person:"},
+			"\U0001f9d6\U0001f3fb":                                       {":person_in_steamy_room_tone1:"},
+			"\U0001f9d6\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_in_steamy_room_tone1:"},
+			"\U0001f9d6\U0001f3fb\u200d\u2642\ufe0f":                     {":man_in_steamy_room_tone1:"},
+			"\U0001f9d6\U0001f3fc":                                       {":person_in_steamy_room_tone2:"},
+			"\U0001f9d6\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_in_steamy_room_tone2:"},
+			"\U0001f9d6\U0001f3fc\u200d\u2642\ufe0f":                     {":man_in_steamy_room_tone2:"},
+			"\U0001f9d6\U0001f3fd":                                       {":person_in_steamy_room_tone3:"},
+			"\U0001f9d6\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_in_steamy_room_tone3:"},
+			"\U0001f9d6\U0001f3fd\u200d\u2642\ufe0f":                     {":man_in_steamy_room_tone3:"},
+			"\U0001f9d6\U0001f3fe":                                       {":person_in_steamy_room_tone4:"},
+			"\U0001f9d6\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_in_steamy_room_tone4:"},
+			"\U0001f9d6\U0001f3fe\u200d\u2642\ufe0f":                     {":man_in_steamy_room_tone4:"},
+			"\U0001f9d6\U0001f3ff":                                       {":person_in_steamy_room_tone5:"},
+			"\U0001f9d6\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_in_steamy_room_tone5:"},
+			"\U0001f9d6\U0001f3ff\u200d\u2642\ufe0f":                     {":man_in_steamy_room_tone5:"},
+			"\U0001f9d6\u200d\u2640\ufe0f":                               {":sauna_woman:", ":woman_in_steamy_room:"},
+			"\U0001f9d6\u200d\u2642\ufe0f":                               {":sauna_man:", ":man_in_steamy_room:", ":person_in_steamy_room:"},
+			"\U0001f9d7":                                                 {":climbing:"},
+			"\U0001f9d7\U0001f3fb":                                       {":person_climbing_tone1:"},
+			"\U0001f9d7\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_climbing_tone1:"},
+			"\U0001f9d7\U0001f3fb\u200d\u2642\ufe0f":                     {":man_climbing_tone1:"},
+			"\U0001f9d7\U0001f3fc":                                       {":person_climbing_tone2:"},
+			"\U0001f9d7\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_climbing_tone2:"},
+			"\U0001f9d7\U0001f3fc\u200d\u2642\ufe0f":                     {":man_climbing_tone2:"},
+			"\U0001f9d7\U0001f3fd":                                       {":person_climbing_tone3:"},
+			"\U0001f9d7\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_climbing_tone3:"},
+			"\U0001f9d7\U0001f3fd\u200d\u2642\ufe0f":                     {":man_climbing_tone3:"},
+			"\U0001f9d7\U0001f3fe":                                       {":person_climbing_tone4:"},
+			"\U0001f9d7\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_climbing_tone4:"},
+			"\U0001f9d7\U0001f3fe\u200d\u2642\ufe0f":                     {":man_climbing_tone4:"},
+			"\U0001f9d7\U0001f3ff":                                       {":person_climbing_tone5:"},
+			"\U0001f9d7\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_climbing_tone5:"},
+			"\U0001f9d7\U0001f3ff\u200d\u2642\ufe0f":                     {":man_climbing_tone5:"},
+			"\U0001f9d7\u200d\u2640\ufe0f":                               {":climbing_woman:", ":woman_climbing:", ":person_climbing:"},
+			"\U0001f9d7\u200d\u2642\ufe0f":                               {":climbing_man:", ":man_climbing:"},
+			"\U0001f9d8":                                                 {":lotus_position:"},
+			"\U0001f9d8\U0001f3fb":                                       {":person_in_lotus_position_tone1:"},
+			"\U0001f9d8\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_in_lotus_position_tone1:"},
+			"\U0001f9d8\U0001f3fb\u200d\u2642\ufe0f":                     {":man_in_lotus_position_tone1:"},
+			"\U0001f9d8\U0001f3fc":                                       {":person_in_lotus_position_tone2:"},
+			"\U0001f9d8\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_in_lotus_position_tone2:"},
+			"\U0001f9d8\U0001f3fc\u200d\u2642\ufe0f":                     {":man_in_lotus_position_tone2:"},
+			"\U0001f9d8\U0001f3fd":                                       {":person_in_lotus_position_tone3:"},
+			"\U0001f9d8\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_in_lotus_position_tone3:"},
+			"\U0001f9d8\U0001f3fd\u200d\u2642\ufe0f":                     {":man_in_lotus_position_tone3:"},
+			"\U0001f9d8\U0001f3fe":                                       {":person_in_lotus_position_tone4:"},
+			"\U0001f9d8\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_in_lotus_position_tone4:"},
+			"\U0001f9d8\U0001f3fe\u200d\u2642\ufe0f":                     {":man_in_lotus_position_tone4:"},
+			"\U0001f9d8\U0001f3ff":                                       {":person_in_lotus_position_tone5:"},
+			"\U0001f9d8\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_in_lotus_position_tone5:"},
+			"\U0001f9d8\U0001f3ff\u200d\u2642\ufe0f":                     {":man_in_lotus_position_tone5:"},
+			"\U0001f9d8\u200d\u2640\ufe0f":                               {":lotus_position_woman:", ":woman_in_lotus_position:", ":person_in_lotus_position:"},
+			"\U0001f9d8\u200d\u2642\ufe0f":                               {":lotus_position_man:", ":man_in_lotus_position:"},
+			"\U0001f9d9\U0001f3fb":                                       {":mage_tone1:"},
+			"\U0001f9d9\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_mage_tone1:"},
+			"\U0001f9d9\U0001f3fb\u200d\u2642\ufe0f":                     {":man_mage_tone1:"},
+			"\U0001f9d9\U0001f3fc":                                       {":mage_tone2:"},
+			"\U0001f9d9\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_mage_tone2:"},
+			"\U0001f9d9\U0001f3fc\u200d\u2642\ufe0f":                     {":man_mage_tone2:"},
+			"\U0001f9d9\U0001f3fd":                                       {":mage_tone3:"},
+			"\U0001f9d9\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_mage_tone3:"},
+			"\U0001f9d9\U0001f3fd\u200d\u2642\ufe0f":                     {":man_mage_tone3:"},
+			"\U0001f9d9\U0001f3fe":                                       {":mage_tone4:"},
+			"\U0001f9d9\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_mage_tone4:"},
+			"\U0001f9d9\U0001f3fe\u200d\u2642\ufe0f":                     {":man_mage_tone4:"},
+			"\U0001f9d9\U0001f3ff":                                       {":mage_tone5:"},
+			"\U0001f9d9\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_mage_tone5:"},
+			"\U0001f9d9\U0001f3ff\u200d\u2642\ufe0f":                     {":man_mage_tone5:"},
+			"\U0001f9d9\u200d\u2640\ufe0f":                               {":mage:", ":mage_woman:", ":woman_mage:", ":female_mage:"},
+			"\U0001f9d9\u200d\u2642\ufe0f":                               {":mage_man:", ":man_mage:", ":male_mage:"},
+			"\U0001f9da\U0001f3fb":                                       {":fairy_tone1:"},
+			"\U0001f9da\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_fairy_tone1:"},
+			"\U0001f9da\U0001f3fb\u200d\u2642\ufe0f":                     {":man_fairy_tone1:"},
+			"\U0001f9da\U0001f3fc":                                       {":fairy_tone2:"},
+			"\U0001f9da\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_fairy_tone2:"},
+			"\U0001f9da\U0001f3fc\u200d\u2642\ufe0f":                     {":man_fairy_tone2:"},
+			"\U0001f9da\U0001f3fd":                                       {":fairy_tone3:"},
+			"\U0001f9da\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_fairy_tone3:"},
+			"\U0001f9da\U0001f3fd\u200d\u2642\ufe0f":                     {":man_fairy_tone3:"},
+			"\U0001f9da\U0001f3fe":                                       {":fairy_tone4:"},
+			"\U0001f9da\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_fairy_tone4:"},
+			"\U0001f9da\U0001f3fe\u200d\u2642\ufe0f":                     {":man_fairy_tone4:"},
+			"\U0001f9da\U0001f3ff":                                       {":fairy_tone5:"},
+			"\U0001f9da\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_fairy_tone5:"},
+			"\U0001f9da\U0001f3ff\u200d\u2642\ufe0f":                     {":man_fairy_tone5:"},
+			"\U0001f9da\u200d\u2640\ufe0f":                               {":fairy:", ":fairy_woman:", ":woman_fairy:", ":female_fairy:"},
+			"\U0001f9da\u200d\u2642\ufe0f":                               {":fairy_man:", ":man_fairy:", ":male_fairy:"},
+			"\U0001f9db\U0001f3fb":                                       {":vampire_tone1:"},
+			"\U0001f9db\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_vampire_tone1:"},
+			"\U0001f9db\U0001f3fb\u200d\u2642\ufe0f":                     {":man_vampire_tone1:"},
+			"\U0001f9db\U0001f3fc":                                       {":vampire_tone2:"},
+			"\U0001f9db\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_vampire_tone2:"},
+			"\U0001f9db\U0001f3fc\u200d\u2642\ufe0f":                     {":man_vampire_tone2:"},
+			"\U0001f9db\U0001f3fd":                                       {":vampire_tone3:"},
+			"\U0001f9db\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_vampire_tone3:"},
+			"\U0001f9db\U0001f3fd\u200d\u2642\ufe0f":                     {":man_vampire_tone3:"},
+			"\U0001f9db\U0001f3fe":                                       {":vampire_tone4:"},
+			"\U0001f9db\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_vampire_tone4:"},
+			"\U0001f9db\U0001f3fe\u200d\u2642\ufe0f":                     {":man_vampire_tone4:"},
+			"\U0001f9db\U0001f3ff":                                       {":vampire_tone5:"},
+			"\U0001f9db\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_vampire_tone5:"},
+			"\U0001f9db\U0001f3ff\u200d\u2642\ufe0f":                     {":man_vampire_tone5:"},
+			"\U0001f9db\u200d\u2640\ufe0f":                               {":vampire:", ":vampire_woman:", ":woman_vampire:", ":female_vampire:"},
+			"\U0001f9db\u200d\u2642\ufe0f":                               {":man_vampire:", ":vampire_man:", ":male_vampire:"},
+			"\U0001f9dc\U0001f3fb":                                       {":merperson_tone1:"},
+			"\U0001f9dc\U0001f3fb\u200d\u2640\ufe0f":                     {":mermaid_tone1:"},
+			"\U0001f9dc\U0001f3fb\u200d\u2642\ufe0f":                     {":merman_tone1:"},
+			"\U0001f9dc\U0001f3fc":                                       {":merperson_tone2:"},
+			"\U0001f9dc\U0001f3fc\u200d\u2640\ufe0f":                     {":mermaid_tone2:"},
+			"\U0001f9dc\U0001f3fc\u200d\u2642\ufe0f":                     {":merman_tone2:"},
+			"\U0001f9dc\U0001f3fd":                                       {":merperson_tone3:"},
+			"\U0001f9dc\U0001f3fd\u200d\u2640\ufe0f":                     {":mermaid_tone3:"},
+			"\U0001f9dc\U0001f3fd\u200d\u2642\ufe0f":                     {":merman_tone3:"},
+			"\U0001f9dc\U0001f3fe":                                       {":merperson_tone4:"},
+			"\U0001f9dc\U0001f3fe\u200d\u2640\ufe0f":                     {":mermaid_tone4:"},
+			"\U0001f9dc\U0001f3fe\u200d\u2642\ufe0f":                     {":merman_tone4:"},
+			"\U0001f9dc\U0001f3ff":                                       {":merperson_tone5:"},
+			"\U0001f9dc\U0001f3ff\u200d\u2640\ufe0f":                     {":mermaid_tone5:"},
+			"\U0001f9dc\U0001f3ff\u200d\u2642\ufe0f":                     {":merman_tone5:"},
+			"\U0001f9dc\u200d\u2640\ufe0f":                               {":mermaid:"},
+			"\U0001f9dc\u200d\u2642\ufe0f":                               {":merman:", ":merperson:"},
+			"\U0001f9dd\U0001f3fb":                                       {":elf_tone1:"},
+			"\U0001f9dd\U0001f3fb\u200d\u2640\ufe0f":                     {":woman_elf_tone1:"},
+			"\U0001f9dd\U0001f3fb\u200d\u2642\ufe0f":                     {":man_elf_tone1:"},
+			"\U0001f9dd\U0001f3fc":                                       {":elf_tone2:"},
+			"\U0001f9dd\U0001f3fc\u200d\u2640\ufe0f":                     {":woman_elf_tone2:"},
+			"\U0001f9dd\U0001f3fc\u200d\u2642\ufe0f":                     {":man_elf_tone2:"},
+			"\U0001f9dd\U0001f3fd":                                       {":elf_tone3:"},
+			"\U0001f9dd\U0001f3fd\u200d\u2640\ufe0f":                     {":woman_elf_tone3:"},
+			"\U0001f9dd\U0001f3fd\u200d\u2642\ufe0f":                     {":man_elf_tone3:"},
+			"\U0001f9dd\U0001f3fe":                                       {":elf_tone4:"},
+			"\U0001f9dd\U0001f3fe\u200d\u2640\ufe0f":                     {":woman_elf_tone4:"},
+			"\U0001f9dd\U0001f3fe\u200d\u2642\ufe0f":                     {":man_elf_tone4:"},
+			"\U0001f9dd\U0001f3ff":                                       {":elf_tone5:"},
+			"\U0001f9dd\U0001f3ff\u200d\u2640\ufe0f":                     {":woman_elf_tone5:"},
+			"\U0001f9dd\U0001f3ff\u200d\u2642\ufe0f":                     {":man_elf_tone5:"},
+			"\U0001f9dd\u200d\u2640\ufe0f":                               {":elf_woman:", ":woman_elf:", ":female_elf:"},
+			"\U0001f9dd\u200d\u2642\ufe0f":                               {":elf:", ":elf_man:", ":man_elf:", ":male_elf:"},
+			"\U0001f9de\u200d\u2640\ufe0f":                               {":genie_woman:", ":woman_genie:", ":female_genie:"},
+			"\U0001f9de\u200d\u2642\ufe0f":                               {":genie:", ":genie_man:", ":man_genie:", ":male_genie:"},
+			"\U0001f9df\u200d\u2640\ufe0f":                               {":woman_zombie:", ":zombie_woman:", ":female_zombie:"},
+			"\U0001f9df\u200d\u2642\ufe0f":                               {":zombie:", ":man_zombie:", ":zombie_man:", ":male_zombie:"},
+			"\U0001f9e0":                                                 {":brain:"},
+			"\U0001f9e1":                                                 {":orange_heart:"},
+			"\U0001f9e2":                                                 {":billed_cap:"},
+			"\U0001f9e3":                                                 {":scarf:"},
+			"\U0001f9e4":                                                 {":gloves:"},
+			"\U0001f9e5":                                                 {":coat:"},
+			"\U0001f9e6":                                                 {":socks:"},
+			"\U0001f9e7":                                                 {":red_envelope:"},
+			"\U0001f9e8":                                                 {":firecracker:"},
+			"\U0001f9e9":                                                 {":jigsaw:", ":puzzle_piece:"},
+			"\U0001f9ea":                                                 {":test_tube:"},
+			"\U0001f9eb":                                                 {":petri_dish:"},
+			"\U0001f9ec":                                                 {":dna:"},
+			"\U0001f9ed":                                                 {":compass:"},
+			"\U0001f9ee":                                                 {":abacus:"},
+			"\U0001f9ef":                                                 {":fire_extinguisher:"},
+			"\U0001f9f0":                                                 {":toolbox:"},
+			"\U0001f9f1":                                                 {":brick:", ":bricks:"},
+			"\U0001f9f2":                                                 {":magnet:"},
+			"\U0001f9f3":                                                 {":luggage:"},
+			"\U0001f9f4":                                                 {":lotion_bottle:"},
+			"\U0001f9f5":                                                 {":thread:"},
+			"\U0001f9f6":                                                 {":yarn:"},
+			"\U0001f9f7":                                                 {":safety_pin:"},
+			"\U0001f9f8":                                                 {":teddy_bear:"},
+			"\U0001f9f9":                                                 {":broom:"},
+			"\U0001f9fa":                                                 {":basket:"},
+			"\U0001f9fb":                                                 {":roll_of_paper:"},
+			"\U0001f9fc":                                                 {":soap:"},
+			"\U0001f9fd":                                                 {":sponge:"},
+			"\U0001f9fe":                                                 {":receipt:"},
+			"\U0001f9ff":                                                 {":nazar_amulet:"},
+			"\U0001fa70":                                                 {":ballet_shoes:"},
+			"\U0001fa71":                                                 {":one-piece_swimsuit:", ":one_piece_swimsuit:"},
+			"\U0001fa72":                                                 {":briefs:", ":swim_brief:"},
+			"\U0001fa73":                                                 {":shorts:"},
+			"\U0001fa74":                                                 {":thong_sandal:"},
+			"\U0001fa75":                                                 {":light_blue_heart:"},
+			"\U0001fa76":                                                 {":grey_heart:"},
+			"\U0001fa77":                                                 {":pink_heart:"},
+			"\U0001fa78":                                                 {":drop_of_blood:"},
+			"\U0001fa79":                                                 {":adhesive_bandage:"},
+			"\U0001fa7a":                                                 {":stethoscope:"},
+			"\U0001fa7b":                                                 {":x-ray:", ":x_ray:"},
+			"\U0001fa7c":                                                 {":crutch:"},
+			"\U0001fa80":                                                 {":yo-yo:", ":yo_yo:"},
+			"\U0001fa81":                                                 {":kite:"},
+			"\U0001fa82":                                                 {":parachute:"},
+			"\U0001fa83":                                                 {":boomerang:"},
+			"\U0001fa84":                                                 {":magic_wand:"},
+			"\U0001fa85":                                                 {":pinata:", ":piñata:"},
+			"\U0001fa86":                                                 {":nesting_dolls:"},
+			"\U0001fa87":                                                 {":maracas:"},
+			"\U0001fa88":                                                 {":flute:"},
+			"\U0001fa89":                                                 {":harp:"},
+			"\U0001fa8a":                                                 {":trombone:"},
+			"\U0001fa8e":                                                 {":treasure_chest:"},
+			"\U0001fa8f":                                                 {":shovel:"},
+			"\U0001fa90":                                                 {":ringed_planet:"},
+			"\U0001fa91":                                                 {":chair:"},
+			"\U0001fa92":                                                 {":razor:"},
+			"\U0001fa93":                                                 {":axe:"},
+			"\U0001fa94":                                                 {":diya_lamp:"},
+			"\U0001fa95":                                                 {":banjo:"},
+			"\U0001fa96":                                                 {":military_helmet:"},
+			"\U0001fa97":                                                 {":accordion:"},
+			"\U0001fa98":                                                 {":long_drum:"},
+			"\U0001fa99":                                                 {":coin:"},
+			"\U0001fa9a":                                                 {":carpentry_saw:"},
+			"\U0001fa9b":                                                 {":screwdriver:"},
+			"\U0001fa9c":                                                 {":ladder:"},
+			"\U0001fa9d":                                                 {":hook:"},
+			"\U0001fa9e":                                                 {":mirror:"},
+			"\U0001fa9f":                                                 {":window:"},
+			"\U0001faa0":                                                 {":plunger:"},
+			"\U0001faa1":                                                 {":sewing_needle:"},
+			"\U0001faa2":                                                 {":knot:"},
+			"\U0001faa3":                                                 {":bucket:"},
+			"\U0001faa4":                                                 {":mouse_trap:"},
+			"\U0001faa5":                                                 {":toothbrush:"},
+			"\U0001faa6":                                                 {":headstone:"},
+			"\U0001faa7":                                                 {":placard:"},
+			"\U0001faa8":                                                 {":rock:"},
+			"\U0001faa9":                                                 {":mirror_ball:"},
+			"\U0001faaa":                                                 {":identification_card:"},
+			"\U0001faab":                                                 {":low_battery:"},
+			"\U0001faac":                                                 {":hamsa:"},
+			"\U0001faad":                                                 {":folding_hand_fan:"},
+			"\U0001faae":                                                 {":hair_pick:"},
+			"\U0001faaf":                                                 {":khanda:"},
+			"\U0001fab0":                                                 {":fly:"},
+			"\U0001fab1":                                                 {":worm:"},
+			"\U0001fab2":                                                 {":beetle:"},
+			"\U0001fab3":                                                 {":cockroach:"},
+			"\U0001fab4":                                                 {":potted_plant:"},
+			"\U0001fab5":                                                 {":wood:"},
+			"\U0001fab6":                                                 {":feather:"},
+			"\U0001fab7":                                                 {":lotus:"},
+			"\U0001fab8":                                                 {":coral:"},
+			"\U0001fab9":                                                 {":empty_nest:"},
+			"\U0001faba":                                                 {":nest_with_eggs:"},
+			"\U0001fabb":                                                 {":hyacinth:"},
+			"\U0001fabc":                                                 {":jellyfish:"},
+			"\U0001fabd":                                                 {":wing:"},
+			"\U0001fabe":                                                 {":leafless_tree:"},
+			"\U0001fabf":                                                 {":goose:"},
+			"\U0001fac0":                                                 {":anatomical_heart:"},
+			"\U0001fac1":                                                 {":lungs:"},
+			"\U0001fac2":                                                 {":people_hugging:"},
+			"\U0001fac3":                                                 {":pregnant_man:"},
+			"\U0001fac4":                                                 {":pregnant_person:"},
+			"\U0001fac5":                                                 {":person_with_crown:"},
+			"\U0001fac6":                                                 {":fingerprint:"},
+			"\U0001fac8":                                                 {":hairy_creature:"},
+			"\U0001facd":                                                 {":orca:"},
+			"\U0001face":                                                 {":moose:"},
+			"\U0001facf":                                                 {":donkey:"},
+			"\U0001fad0":                                                 {":blueberries:"},
+			"\U0001fad1":                                                 {":bell_pepper:"},
+			"\U0001fad2":                                                 {":olive:"},
+			"\U0001fad3":                                                 {":flatbread:"},
+			"\U0001fad4":                                                 {":tamale:"},
+			"\U0001fad5":                                                 {":fondue:"},
+			"\U0001fad6":                                                 {":teapot:"},
+			"\U0001fad7":                                                 {":pouring_liquid:"},
+			"\U0001fad8":                                                 {":beans:"},
+			"\U0001fad9":                                                 {":jar:"},
+			"\U0001fada":                                                 {":ginger_root:"},
+			"\U0001fadb":                                                 {":pea_pod:"},
+			"\U0001fadc":                                                 {":root_vegetable:"},
+			"\U0001fadf":                                                 {":splatter:"},
+			"\U0001fae0":                                                 {":melting_face:"},
+			"\U0001fae1":                                                 {":saluting_face:"},
+			"\U0001fae2":                                                 {":face_with_open_eyes_and_hand_over_mouth:"},
+			"\U0001fae3":                                                 {":face_with_peeking_eye:"},
+			"\U0001fae4":                                                 {":face_with_diagonal_mouth:"},
+			"\U0001fae5":                                                 {":dotted_line_face:"},
+			"\U0001fae6":                                                 {":biting_lip:"},
+			"\U0001fae7":                                                 {":bubbles:"},
+			"\U0001fae8":                                                 {":shaking_face:"},
+			"\U0001fae9":                                                 {":face_with_bags_under_eyes:"},
+			"\U0001faea":                                                 {":distorted_face:"},
+			"\U0001faef":                                                 {":fight_cloud:"},
+			"\U0001faf0":                                                 {":hand_with_index_finger_and_thumb_crossed:"},
+			"\U0001faf1":                                                 {":rightwards_hand:"},
+			"\U0001faf2":                                                 {":leftwards_hand:"},
+			"\U0001faf3":                                                 {":palm_down_hand:"},
+			"\U0001faf4":                                                 {":palm_up_hand:"},
+			"\U0001faf5":                                                 {":index_pointing_at_the_viewer:"},
+			"\U0001faf6":                                                 {":heart_hands:"},
+			"\U0001faf7":                                                 {":leftwards_pushing_hand:"},
+			"\U0001faf8":                                                 {":rightwards_pushing_hand:"},
+			"\u00a9\ufe0f":                                               {":copyright:"},
+			"\u00ae\ufe0f":                                               {":registered:"},
+			"\u203c":                                                     {":double_exclamation_mark:"},
+			"\u203c\ufe0f":                                               {":bangbang:"},
+			"\u2049":                                                     {":exclamation_question_mark:"},
+			"\u2049\ufe0f":                                               {":interrobang:"},
+			"\u2122":                                                     {":trade_mark:"},
+			"\u2122\ufe0f":                                               {":tm:"},
+			"\u2139":                                                     {":information:"},
+			"\u2139\ufe0f":                                               {":information_source:"},
+			"\u2194":                                                     {":left-right_arrow:"},
+			"\u2194\ufe0f":                                               {":left_right_arrow:"},
+			"\u2195":                                                     {":up-down_arrow:"},
+			"\u2195\ufe0f":                                               {":arrow_up_down:"},
+			"\u2196":                                                     {":up-left_arrow:"},
+			"\u2196\ufe0f":                                               {":arrow_upper_left:"},
+			"\u2197":                                                     {":up-right_arrow:"},
+			"\u2197\ufe0f":                                               {":arrow_upper_right:"},
+			"\u2198":                                                     {":down-right_arrow:"},
+			"\u2198\ufe0f":                                               {":arrow_lower_right:"},
+			"\u2199":                                                     {":down-left_arrow:"},
+			"\u2199\ufe0f":                                               {":arrow_lower_left:"},
+			"\u21a9":                                                     {":right_arrow_curving_left:"},
+			"\u21a9\ufe0f":                                               {":leftwards_arrow_with_hook:"},
+			"\u21aa":                                                     {":left_arrow_curving_right:"},
+			"\u21aa\ufe0f":                                               {":arrow_right_hook:"},
+			"\u231a":                                                     {":watch:"},
+			"\u231b":                                                     {":hourglass:", ":hourglass_done:"},
+			"\u2328\ufe0f":                                               {":keyboard:"},
+			"\u23cf":                                                     {":eject_button:"},
+			"\u23cf\ufe0f":                                               {":eject:"},
+			"\u23e9":                                                     {":fast_forward:", ":fast-forward_button:"},
+			"\u23ea":                                                     {":rewind:", ":fast_reverse_button:"},
+			"\u23eb":                                                     {":fast_up_button:", ":arrow_double_up:"},
+			"\u23ec":                                                     {":fast_down_button:", ":arrow_double_down:"},
+			"\u23ed":                                                     {":track_next:", ":next_track_button:"},
+			"\u23ed\ufe0f":                                               {":black_right_pointing_double_triangle_with_vertical_bar:"},
+			"\u23ee":                                                     {":track_previous:", ":last_track_button:"},
+			"\u23ee\ufe0f":                                               {":previous_track_button:", ":black_left_pointing_double_triangle_with_vertical_bar:"},
+			"\u23ef":                                                     {":play_pause:", ":play_or_pause_button:"},
+			"\u23ef\ufe0f":                                               {":black_right_pointing_triangle_with_double_vertical_bar:"},
+			"\u23f0":                                                     {":alarm_clock:"},
+			"\u23f1\ufe0f":                                               {":stopwatch:"},
+			"\u23f2":                                                     {":timer:"},
+			"\u23f2\ufe0f":                                               {":timer_clock:"},
+			"\u23f3":                                                     {":hourglass_not_done:", ":hourglass_flowing_sand:"},
+			"\u23f8":                                                     {":pause_button:"},
+			"\u23f8\ufe0f":                                               {":double_vertical_bar:"},
+			"\u23f9":                                                     {":stop_button:"},
+			"\u23f9\ufe0f":                                               {":black_square_for_stop:"},
+			"\u23fa":                                                     {":record_button:"},
+			"\u23fa\ufe0f":                                               {":black_circle_for_record:"},
+			"\u24c2":                                                     {":circled_M:"},
+			"\u24dc\ufe0f":                                               {":m:"},
+			"\u25aa\ufe0f":                                               {":black_small_square:"},
+			"\u25ab\ufe0f":                                               {":white_small_square:"},
+			"\u25b6":                                                     {":play_button:"},
+			"\u25b6\ufe0f":                                               {":arrow_forward:"},
+			"\u25c0":                                                     {":reverse_button:"},
+			"\u25c0\ufe0f":                                               {":arrow_backward:"},
+			"\u25fb\ufe0f":                                               {":white_medium_square:"},
+			"\u25fc\ufe0f":                                               {":black_medium_square:"},
+			"\u25fd":                                                     {":white_medium-small_square:", ":white_medium_small_square:"},
+			"\u25fe":                                                     {":black_medium-small_square:", ":black_medium_small_square:"},
+			"\u2600":                                                     {":sun:"},
+			"\u2600\ufe0f":                                               {":sunny:"},
+			"\u2601\ufe0f":                                               {":cloud:"},
+			"\u2602":                                                     {":umbrella2:"},
+			"\u2602\ufe0f":                                               {":umbrella:", ":open_umbrella:"},
+			"\u2603":                                                     {":snowman2:"},
+			"\u2603\ufe0f":                                               {":snowman:", ":snowman_with_snow:"},
+			"\u2604\ufe0f":                                               {":comet:"},
+			"\u260e":                                                     {":telephone:"},
+			"\u260e\ufe0f":                                               {":phone:"},
+			"\u2611":                                                     {":check_box_with_check:"},
+			"\u2611\ufe0f":                                               {":ballot_box_with_check:"},
+			"\u2614":                                                     {":umbrella_with_rain_drops:"},
+			"\u2615":                                                     {":coffee:", ":hot_beverage:"},
+			"\u2618\ufe0f":                                               {":shamrock:"},
+			"\u261d":                                                     {":index_pointing_up:"},
+			"\u261d\U0001f3fb":                                           {":point_up_tone1:"},
+			"\u261d\U0001f3fc":                                           {":point_up_tone2:"},
+			"\u261d\U0001f3fd":                                           {":point_up_tone3:"},
+			"\u261d\U0001f3fe":                                           {":point_up_tone4:"},
+			"\u261d\U0001f3ff":                                           {":point_up_tone5:"},
+			"\u261d\ufe0f":                                               {":point_up:"},
+			"\u2620":                                                     {":skull_crossbones:"},
+			"\u2620\ufe0f":                                               {":skull_and_crossbones:"},
+			"\u2622":                                                     {":radioactive:"},
+			"\u2622\ufe0f":                                               {":radioactive_sign:"},
+			"\u2623":                                                     {":biohazard:"},
+			"\u2623\ufe0f":                                               {":biohazard_sign:"},
+			"\u2626\ufe0f":                                               {":orthodox_cross:"},
+			"\u262a\ufe0f":                                               {":star_and_crescent:"},
+			"\u262e":                                                     {":peace:"},
+			"\u262e\ufe0f":                                               {":peace_symbol:"},
+			"\u262f\ufe0f":                                               {":yin_yang:"},
+			"\u2638\ufe0f":                                               {":wheel_of_dharma:"},
+			"\u2639":                                                     {":frowning2:", ":frowning_face:"},
+			"\u2639\ufe0f":                                               {":white_frowning_face:"},
+			"\u263a":                                                     {":smiling_face:"},
+			"\u263a\ufe0f":                                               {":relaxed:"},
+			"\u2640\ufe0f":                                               {":female_sign:"},
+			"\u2642\ufe0f":                                               {":male_sign:"},
+			"\u2648":                                                     {":aries:", ":Aries:"},
+			"\u2649":                                                     {":taurus:", ":Taurus:"},
+			"\u264a":                                                     {":gemini:", ":Gemini:"},
+			"\u264b":                                                     {":cancer:", ":Cancer:"},
+			"\u264c":                                                     {":leo:", ":Leo:"},
+			"\u264d":                                                     {":virgo:", ":Virgo:"},
+			"\u264e":                                                     {":libra:", ":Libra:"},
+			"\u264f":                                                     {":Scorpio:", ":scorpius:"},
+			"\u2650":                                                     {":sagittarius:", ":Sagittarius:"},
+			"\u2651":                                                     {":capricorn:", ":Capricorn:"},
+			"\u2652":                                                     {":aquarius:", ":Aquarius:"},
+			"\u2653":                                                     {":pisces:", ":Pisces:"},
+			"\u265f\ufe0f":                                               {":chess_pawn:"},
+			"\u2660":                                                     {":spade_suit:"},
+			"\u2660\ufe0f":                                               {":spades:"},
+			"\u2663":                                                     {":club_suit:"},
+			"\u2663\ufe0f":                                               {":clubs:"},
+			"\u2665":                                                     {":heart_suit:"},
+			"\u2665\ufe0f":                                               {":hearts:"},
+			"\u2666":                                                     {":diamond_suit:"},
+			"\u2666\ufe0f":                                               {":diamonds:"},
+			"\u2668":                                                     {":hot_springs:"},
+			"\u2668\ufe0f":                                               {":hotsprings:"},
+			"\u267b":                                                     {":recycling_symbol:"},
+			"\u267b\ufe0f":                                               {":recycle:"},
+			"\u267e\ufe0f":                                               {":infinity:"},
+			"\u267f":                                                     {":wheelchair:", ":wheelchair_symbol:"},
+			"\u2692":                                                     {":hammer_pick:"},
+			"\u2692\ufe0f":                                               {":hammer_and_pick:"},
+			"\u2693":                                                     {":anchor:"},
+			"\u2694\ufe0f":                                               {":crossed_swords:"},
+			"\u2695\ufe0f":                                               {":medical_symbol:"},
+			"\u2696":                                                     {":balance_scale:"},
+			"\u2696\ufe0f":                                               {":scales:"},
+			"\u2697\ufe0f":                                               {":alembic:"},
+			"\u2699\ufe0f":                                               {":gear:"},
+			"\u269b":                                                     {":atom:"},
+			"\u269b\ufe0f":                                               {":atom_symbol:"},
+			"\u269c":                                                     {":fleur-de-lis:"},
+			"\u269c\ufe0f":                                               {":fleur_de_lis:"},
+			"\u26a0\ufe0f":                                               {":warning:"},
+			"\u26a1":                                                     {":zap:", ":high_voltage:"},
+			"\u26a7\ufe0f":                                               {":transgender_symbol:"},
+			"\u26aa":                                                     {":white_circle:"},
+			"\u26ab":                                                     {":black_circle:"},
+			"\u26b0\ufe0f":                                               {":coffin:"},
+			"\u26b1":                                                     {":urn:"},
+			"\u26b1\ufe0f":                                               {":funeral_urn:"},
+			"\u26bd":                                                     {":soccer:", ":soccer_ball:"},
+			"\u26be":                                                     {":baseball:"},
+			"\u26c4":                                                     {":snowman_without_snow:"},
+			"\u26c5":                                                     {":partly_sunny:", ":sun_behind_cloud:"},
+			"\u26c8":                                                     {":thunder_cloud_rain:", ":cloud_with_lightning_and_rain:"},
+			"\u26c8\ufe0f":                                               {":thunder_cloud_and_rain:"},
+			"\u26ce":                                                     {":ophiuchus:", ":Ophiuchus:"},
+			"\u26cf\ufe0f":                                               {":pick:"},
+			"\u26d1":                                                     {":helmet_with_cross:", ":rescue_worker’s_helmet:"},
+			"\u26d1\ufe0f":                                               {":rescue_worker_helmet:", ":helmet_with_white_cross:"},
+			"\u26d3\ufe0f":                                               {":chains:"},
+			"\u26d3\ufe0f\u200d\U0001f4a5":                               {":broken_chain:"},
+			"\u26d4":                                                     {":no_entry:"},
+			"\u26e9\ufe0f":                                               {":shinto_shrine:"},
+			"\u26ea":                                                     {":church:"},
+			"\u26f0\ufe0f":                                               {":mountain:"},
+			"\u26f1":                                                     {":beach_umbrella:"},
+			"\u26f1\ufe0f":                                               {":parasol_on_ground:", ":umbrella_on_ground:"},
+			"\u26f2":                                                     {":fountain:"},
+			"\u26f3":                                                     {":golf:", ":flag_in_hole:"},
+			"\u26f4\ufe0f":                                               {":ferry:"},
+			"\u26f5":                                                     {":boat:", ":sailboat:"},
+			"\u26f7\ufe0f":                                               {":skier:"},
+			"\u26f8\ufe0f":                                               {":ice_skate:"},
+			"\u26f9":                                                     {":person_bouncing_ball:"},
+			"\u26f9\U0001f3fb":                                           {":person_bouncing_ball_tone1:"},
+			"\u26f9\U0001f3fb\u200d\u2640\ufe0f":                         {":woman_bouncing_ball_tone1:"},
+			"\u26f9\U0001f3fb\u200d\u2642\ufe0f":                         {":man_bouncing_ball_tone1:"},
+			"\u26f9\U0001f3fc":                                           {":person_bouncing_ball_tone2:"},
+			"\u26f9\U0001f3fc\u200d\u2640\ufe0f":                         {":woman_bouncing_ball_tone2:"},
+			"\u26f9\U0001f3fc\u200d\u2642\ufe0f":                         {":man_bouncing_ball_tone2:"},
+			"\u26f9\U0001f3fd":                                           {":person_bouncing_ball_tone3:"},
+			"\u26f9\U0001f3fd\u200d\u2640\ufe0f":                         {":woman_bouncing_ball_tone3:"},
+			"\u26f9\U0001f3fd\u200d\u2642\ufe0f":                         {":man_bouncing_ball_tone3:"},
+			"\u26f9\U0001f3fe":                                           {":person_bouncing_ball_tone4:"},
+			"\u26f9\U0001f3fe\u200d\u2640\ufe0f":                         {":woman_bouncing_ball_tone4:"},
+			"\u26f9\U0001f3fe\u200d\u2642\ufe0f":                         {":man_bouncing_ball_tone4:"},
+			"\u26f9\U0001f3ff":                                           {":person_bouncing_ball_tone5:"},
+			"\u26f9\U0001f3ff\u200d\u2640\ufe0f":                         {":woman_bouncing_ball_tone5:"},
+			"\u26f9\U0001f3ff\u200d\u2642\ufe0f":                         {":man_bouncing_ball_tone5:"},
+			"\u26f9\ufe0f":                                               {":bouncing_ball_person:"},
+			"\u26f9\ufe0f\u200d\u2640\ufe0f":                             {":basketball_woman:", ":bouncing_ball_woman:", ":woman-bouncing-ball:", ":woman_bouncing_ball:"},
+			"\u26f9\ufe0f\u200d\u2642\ufe0f":                             {":basketball_man:", ":person_with_ball:", ":bouncing_ball_man:", ":man-bouncing-ball:", ":man_bouncing_ball:"},
+			"\u26fa":                                                     {":tent:"},
+			"\u26fd":                                                     {":fuelpump:", ":fuel_pump:"},
+			"\u2702\ufe0f":                                               {":scissors:"},
+			"\u2705":                                                     {":white_check_mark:", ":check_mark_button:"},
+			"\u2708\ufe0f":                                               {":airplane:"},
+			"\u2709":                                                     {":envelope:"},
+			"\u2709\ufe0f":                                               {":email:"},
+			"\u270a":                                                     {":fist:", ":fist_raised:", ":raised_fist:"},
+			"\u270a\U0001f3fb":                                           {":fist_tone1:"},
+			"\u270a\U0001f3fc":                                           {":fist_tone2:"},
+			"\u270a\U0001f3fd":                                           {":fist_tone3:"},
+			"\u270a\U0001f3fe":                                           {":fist_tone4:"},
+			"\u270a\U0001f3ff":                                           {":fist_tone5:"},
+			"\u270b":                                                     {":hand:", ":raised_hand:"},
+			"\u270b\U0001f3fb":                                           {":raised_hand_tone1:"},
+			"\u270b\U0001f3fc":                                           {":raised_hand_tone2:"},
+			"\u270b\U0001f3fd":                                           {":raised_hand_tone3:"},
+			"\u270b\U0001f3fe":                                           {":raised_hand_tone4:"},
+			"\u270b\U0001f3ff":                                           {":raised_hand_tone5:"},
+			"\u270c":                                                     {":victory_hand:"},
+			"\u270c\U0001f3fb":                                           {":v_tone1:"},
+			"\u270c\U0001f3fc":                                           {":v_tone2:"},
+			"\u270c\U0001f3fd":                                           {":v_tone3:"},
+			"\u270c\U0001f3fe":                                           {":v_tone4:"},
+			"\u270c\U0001f3ff":                                           {":v_tone5:"},
+			"\u270c\ufe0f":                                               {":v:"},
+			"\u270d\U0001f3fb":                                           {":writing_hand_tone1:"},
+			"\u270d\U0001f3fc":                                           {":writing_hand_tone2:"},
+			"\u270d\U0001f3fd":                                           {":writing_hand_tone3:"},
+			"\u270d\U0001f3fe":                                           {":writing_hand_tone4:"},
+			"\u270d\U0001f3ff":                                           {":writing_hand_tone5:"},
+			"\u270d\ufe0f":                                               {":writing_hand:"},
+			"\u270f":                                                     {":pencil:"},
+			"\u270f\ufe0f":                                               {":pencil2:"},
+			"\u2712\ufe0f":                                               {":black_nib:"},
+			"\u2714":                                                     {":check_mark:"},
+			"\u2714\ufe0f":                                               {":heavy_check_mark:"},
+			"\u2716":                                                     {":multiply:"},
+			"\u2716\ufe0f":                                               {":heavy_multiplication_x:"},
+			"\u271d":                                                     {":cross:"},
+			"\u271d\ufe0f":                                               {":latin_cross:"},
+			"\u2721":                                                     {":star_of_David:"},
+			"\u2721\ufe0f":                                               {":star_of_david:"},
+			"\u2728":                                                     {":sparkles:"},
+			"\u2733":                                                     {":eight-spoked_asterisk:"},
+			"\u2733\ufe0f":                                               {":eight_spoked_asterisk:"},
+			"\u2734":                                                     {":eight-pointed_star:"},
+			"\u2734\ufe0f":                                               {":eight_pointed_black_star:"},
+			"\u2744\ufe0f":                                               {":snowflake:"},
+			"\u2747\ufe0f":                                               {":sparkle:"},
+			"\u274c":                                                     {":x:", ":cross_mark:"},
+			"\u274e":                                                     {":cross_mark_button:", ":negative_squared_cross_mark:"},
+			"\u2753":                                                     {":question:", ":red_question_mark:"},
+			"\u2754":                                                     {":grey_question:", ":white_question_mark:"},
+			"\u2755":                                                     {":grey_exclamation:", ":white_exclamation_mark:"},
+			"\u2757":                                                     {":exclamation:", ":red_exclamation_mark:", ":heavy_exclamation_mark:"},
+			"\u2763":                                                     {":heart_exclamation:"},
+			"\u2763\ufe0f":                                               {":heavy_heart_exclamation:", ":heavy_heart_exclamation_mark_ornament:"},
+			"\u2764":                                                     {":red_heart:"},
+			"\u2764\ufe0f":                                               {":heart:"},
+			"\u2764\ufe0f\u200d\U0001f525":                               {":heart_on_fire:"},
+			"\u2764\ufe0f\u200d\U0001fa79":                               {":mending_heart:"},
+			"\u2795":                                                     {":plus:", ":heavy_plus_sign:"},
+			"\u2796":                                                     {":minus:", ":heavy_minus_sign:"},
+			"\u2797":                                                     {":divide:", ":heavy_division_sign:"},
+			"\u27a1":                                                     {":right_arrow:"},
+			"\u27a1\ufe0f":                                               {":arrow_right:"},
+			"\u27b0":                                                     {":curly_loop:"},
+			"\u27bf":                                                     {":loop:", ":double_curly_loop:"},
+			"\u2934":                                                     {":right_arrow_curving_up:"},
+			"\u2934\ufe0f":                                               {":arrow_heading_up:"},
+			"\u2935":                                                     {":right_arrow_curving_down:"},
+			"\u2935\ufe0f":                                               {":arrow_heading_down:"},
+			"\u2b05":                                                     {":left_arrow:"},
+			"\u2b05\ufe0f":                                               {":arrow_left:"},
+			"\u2b06":                                                     {":up_arrow:"},
+			"\u2b06\ufe0f":                                               {":arrow_up:"},
+			"\u2b07":                                                     {":down_arrow:"},
+			"\u2b07\ufe0f":                                               {":arrow_down:"},
+			"\u2b1b":                                                     {":black_large_square:"},
+			"\u2b1c":                                                     {":white_large_square:"},
+			"\u2b50":                                                     {":star:"},
+			"\u2b55":                                                     {":o:", ":hollow_red_circle:"},
+			"\u3030\ufe0f":                                               {":wavy_dash:"},
+			"\u303d\ufe0f":                                               {":part_alternation_mark:"},
+			"\u3297":                                                     {":Japanese_congratulations_button:"},
+			"\u3297\ufe0f":                                               {":congratulations:"},
+			"\u3299":                                                     {":Japanese_secret_button:"},
+			"\u3299\ufe0f":                                               {":secret:"},
 		}
 	})
 	return emojiRevCodeMap
diff --git a/vendor/github.com/kyokomi/emoji/v2/wercker.yml b/vendor/github.com/kyokomi/emoji/v2/wercker.yml
deleted file mode 100644
index 2c4a6930a..000000000
--- a/vendor/github.com/kyokomi/emoji/v2/wercker.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-box: golang
-build:
-  steps:
-    - setup-go-workspace
-    - script:
-        name: go version
-        code: go version
-    - script:
-        name: install tools
-        code: |
-          go get github.com/mattn/goveralls
-          GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint
-    - script:
-        name: go get
-        code: |
-          go get ./...
-    - script:
-        name: go build
-        code: |
-          go build ./...
-    - script:
-        name: golangci-lint
-        code: |
-          golangci-lint run
-    - script:
-        name: go test
-        code: |
-          go test ./...
-    - script:
-        name: coveralls
-        code: |
-          goveralls -v -service wercker.com -repotoken $COVERALLS_TOKEN
-
diff --git a/vendor/github.com/lucasb-eyer/go-colorful/CHANGELOG.md b/vendor/github.com/lucasb-eyer/go-colorful/CHANGELOG.md
index a10d3fc8d..f349b3357 100644
--- a/vendor/github.com/lucasb-eyer/go-colorful/CHANGELOG.md
+++ b/vendor/github.com/lucasb-eyer/go-colorful/CHANGELOG.md
@@ -8,6 +8,16 @@ but only releases after v1.0.3 properly adhere to it.
 
 ## [Unreleased]
 
+## [1.4.1] - 2026-08-02
+### Fixed
+- Corrected `D50ToD65` to use the CSS Color 4 matrix inverse of `D65ToD50` (#85).
+
+## [1.4.0] - 2026-03-28
+### Added
+- Constructors, decomposers, and blend functions for the CSS Color Level 4 wide-gamut RGB color spaces `DisplayP3`, `A98Rgb`, `ProPhotoRgb`, and `Rec2020` (#81)
+- `XyzD50`, `Color.XyzD50`, `D50ToD65`, and `D65ToD50` for working with D50-based color spaces (#81)
+- `HexColor` now implements `fmt.Stringer`
+
 ## [1.3.0] - 2025-09-08
 ### Added
 - `BlendLinearRgb` (#50)
@@ -19,7 +29,7 @@ but only releases after v1.0.3 properly adhere to it.
 - Functions BlendOkLab and BlendOkLch (#70)
 
 ## Changed
-- `Hex()` parsing is much faster (#78)
+- `Hex()` parsing is much faster (#78). However, it doesn't tolerate hex codes with alpha anymore (previously ignoring the alpha was unintentional).
 
 ### Fixed
 - Fix bug when doing HSV/HCL blending between a gray color and non-gray color (#60)
diff --git a/vendor/github.com/lucasb-eyer/go-colorful/README.md b/vendor/github.com/lucasb-eyer/go-colorful/README.md
index b3bb545cf..1da19f703 100644
--- a/vendor/github.com/lucasb-eyer/go-colorful/README.md
+++ b/vendor/github.com/lucasb-eyer/go-colorful/README.md
@@ -34,6 +34,8 @@ Go-Colorful stores colors in RGB and provides methods from converting these to v
 - **CIE LCh(uv):** Called `LuvLCh` in code, this is a cylindrical transformation of the CIE-L\*u\*v\* color space. Like HCL above: H° is in [0..360], C\* almost in [0..1] and L\* as in CIE-L\*u\*v\*.
 - **HSLuv:** The better alternative to HSL, see [here](https://www.hsluv.org/) and [here](https://www.kuon.ch/post/2020-03-08-hsluv/). Hue in [0..360], Saturation and Luminance in [0..1].
 - **HPLuv:** A variant of HSLuv. The color space is smoother, but only pastel colors can be included. Because the valid colors are limited, it's easy to get invalid Saturation values way above 1.0, indicating the color can't be represented in HPLuv because it's not pastel.
+- **Oklab:** A perceptual color space by Björn Ottosson that improves on CIE-L\*a\*b\* with better perceptual uniformity, especially for blue hues. L in [0..1], a and b roughly in [-0.5..0.5]. See [Oklab](https://bottosson.github.io/posts/oklab/).
+- **Oklch:** The cylindrical (polar) representation of Oklab, similar to HCL. L in [0..1], C roughly in [0..0.5], h° in [0..360].
 
 For the colorspaces where it makes sense (XYZ, Lab, Luv, HCl), the
 [D65](http://en.wikipedia.org/wiki/Illuminant_D65) is used as reference white
@@ -96,6 +98,8 @@ c = colorful.Xyy(0.219895, 0.221839, 0.190837)
 c = colorful.Lab(0.507850, 0.040585,-0.370945)
 c = colorful.Luv(0.507849,-0.194172,-0.567924)
 c = colorful.Hcl(276.2440, 0.373160, 0.507849)
+c = colorful.OkLab(0.577227, -0.021391, -0.104541)
+c = colorful.OkLch(0.577227, 0.106707, 258.435657)
 fmt.Printf("RGB values: %v, %v, %v", c.R, c.G, c.B)
 ```
 
@@ -109,6 +113,8 @@ x, y, Y := c.Xyy()
 l, a, b := c.Lab()
 l, u, v := c.Luv()
 h, c, l := c.Hcl()
+l, a, b = c.OkLab()
+l, c, h = c.OkLch()
 ```
 
 Note that, because of Go's unfortunate choice of requiring an initial uppercase,
@@ -190,7 +196,7 @@ it only if you really know what you're doing. It will eat your cat.
 Blending is highly connected to distance, since it basically "walks through" the
 colorspace thus, if the colorspace maps distances well, the walk is "smooth".
 
-Colorful comes with blending functions in RGB, HSV and any of the LAB spaces.
+Colorful comes with blending functions in RGB, HSV, Oklab, Oklch, and any of the CIE-LAB spaces.
 Of course, you'd rather want to use the blending functions of the LAB spaces since
 these spaces map distances well but, just in case, here is an example showing
 you how the blendings (`#fdffcc` to `#242a42`) are done in the various spaces:
@@ -472,11 +478,12 @@ section above.
 Who?
 ====
 
-This library was developed by Lucas Beyer with contributions from
-Bastien Dejean (@baskerville), Phil Kulak (@pkulak), Christian Muehlhaeuser (@muesli), and Scott Pakin (@spakin).
-
-It is now maintained by makeworld (@makew0rld).
+This library was originally developed by Lucas Beyer, with notable
+contributions from Bastien Dejean (@baskerville), Phil Kulak (@pkulak),
+Christian Muehlhaeuser (@muesli), Scott Pakin (@spakin), and many others.
+See the [contributors list](https://github.com/lucasb-eyer/go-colorful/graphs/contributors) for the full roster.
 
+It is currently maintained by makeworld (@makew0rld).
 
 ## License
 
diff --git a/vendor/github.com/lucasb-eyer/go-colorful/hexcolor.go b/vendor/github.com/lucasb-eyer/go-colorful/hexcolor.go
index ad8b06cc9..26f357304 100644
--- a/vendor/github.com/lucasb-eyer/go-colorful/hexcolor.go
+++ b/vendor/github.com/lucasb-eyer/go-colorful/hexcolor.go
@@ -34,6 +34,10 @@ func (hc *HexColor) Value() (driver.Value, error) {
 	return Color(*hc).Hex(), nil
 }
 
+func (hc HexColor) String() string {
+	return Color(hc).Hex()
+}
+
 func (e errUnsupportedType) Error() string {
 	return fmt.Sprintf("unsupported type: got %v, want a %s", e.got, e.want)
 }
diff --git a/vendor/github.com/lucasb-eyer/go-colorful/widegamut.go b/vendor/github.com/lucasb-eyer/go-colorful/widegamut.go
new file mode 100644
index 000000000..63c3e878e
--- /dev/null
+++ b/vendor/github.com/lucasb-eyer/go-colorful/widegamut.go
@@ -0,0 +1,290 @@
+package colorful
+
+import "math"
+
+// Wide-gamut RGB color spaces from CSS Color Level 4.
+// https://www.w3.org/TR/css-color-4/#color-conversion-code
+
+/// Bradford ///
+////////////////
+// Bradford chromatic adaptation between D50 and D65 illuminants.
+
+func D50ToD65(x, y, z float64) (xo, yo, zo float64) {
+	xo = 0.9554734527042182*x - 0.023098536874261423*y + 0.06325964552894382*z
+	yo = -0.028369706963208136*x + 1.0099954580058226*y + 0.021041398966943008*z
+	zo = 0.012314001688319899*x - 0.020507696433477912*y + 1.3303659366080753*z
+	return
+}
+
+func D65ToD50(x, y, z float64) (xo, yo, zo float64) {
+	xo = 1.0479298208405488*x + 0.022946793341019088*y - 0.05019222954313557*z
+	yo = 0.029627815688159344*x + 0.990434484573249*y - 0.01707382502938514*z
+	zo = -0.009243058152591178*x + 0.015055144896577895*y + 0.7518742899580008*z
+	return
+}
+
+/// XYZ D50 ///
+///////////////
+
+func XyzD50(x, y, z float64) Color {
+	return Xyz(D50ToD65(x, y, z))
+}
+
+func (col Color) XyzD50() (x, y, z float64) {
+	return D65ToD50(col.Xyz())
+}
+
+/// Display P3 ///
+//////////////////
+// Uses the sRGB transfer function with DCI-P3 primaries.
+
+func DisplayP3ToLinearRgb(r, g, b float64) (rl, gl, bl float64) {
+	rl = linearize(r)
+	gl = linearize(g)
+	bl = linearize(b)
+	return
+}
+
+func LinearDisplayP3ToXyz(r, g, b float64) (x, y, z float64) {
+	x = 0.4865709486482162*r + 0.26566769316909306*g + 0.1982172852343625*b
+	y = 0.2289745640697488*r + 0.6917385218365064*g + 0.079286914093745*b
+	z = 0.04511338185890264*g + 1.043944368900976*b
+	return
+}
+
+func XyzToLinearDisplayP3(x, y, z float64) (r, g, b float64) {
+	r = 2.493496911941425*x - 0.9313836179191239*y - 0.40271078445071684*z
+	g = -0.8294889695615747*x + 1.7626640603183463*y + 0.023624685841943577*z
+	b = 0.035845830243784335*x - 0.07617238926804182*y + 0.9568845240076872*z
+	return
+}
+
+func DisplayP3(r, g, b float64) Color {
+	rl, gl, bl := DisplayP3ToLinearRgb(r, g, b)
+	x, y, z := LinearDisplayP3ToXyz(rl, gl, bl)
+	return Xyz(x, y, z)
+}
+
+func (col Color) DisplayP3() (r, g, b float64) {
+	x, y, z := col.Xyz()
+	rl, gl, bl := XyzToLinearDisplayP3(x, y, z)
+	r = delinearize(rl)
+	g = delinearize(gl)
+	b = delinearize(bl)
+	return
+}
+
+// BlendDisplayP3 blends two colors in the Display P3 color-space.
+// t == 0 results in c1, t == 1 results in c2
+func (c1 Color) BlendDisplayP3(c2 Color, t float64) Color {
+	r1, g1, b1 := c1.DisplayP3()
+	r2, g2, b2 := c2.DisplayP3()
+	return DisplayP3(
+		r1+t*(r2-r1),
+		g1+t*(g2-g1),
+		b1+t*(b2-b1))
+}
+
+/// A98 RGB ///
+///////////////
+// Adobe RGB (1998) color space.
+
+func linearizeA98(v float64) float64 {
+	sign := 1.0
+	if v < 0 {
+		sign = -1.0
+		v = -v
+	}
+	return sign * math.Pow(v, 563.0/256.0)
+}
+
+func delinearizeA98(v float64) float64 {
+	sign := 1.0
+	if v < 0 {
+		sign = -1.0
+		v = -v
+	}
+	return sign * math.Pow(v, 256.0/563.0)
+}
+
+func A98RgbToLinearRgb(r, g, b float64) (rl, gl, bl float64) {
+	rl = linearizeA98(r)
+	gl = linearizeA98(g)
+	bl = linearizeA98(b)
+	return
+}
+
+func LinearA98RgbToXyz(r, g, b float64) (x, y, z float64) {
+	x = 0.5766690429101305*r + 0.1855582379065463*g + 0.1882286462349947*b
+	y = 0.29734497525053605*r + 0.6273635662554661*g + 0.07529145849399788*b
+	z = 0.02703136138641234*r + 0.07068885253582723*g + 0.9913375368376388*b
+	return
+}
+
+func XyzToLinearA98Rgb(x, y, z float64) (r, g, b float64) {
+	r = 2.0415879038107327*x - 0.5650069742788597*y - 0.34473135077832956*z
+	g = -0.9692436362808795*x + 1.8759675015077202*y + 0.04155505740717559*z
+	b = 0.013444280632031142*x - 0.11836239223101838*y + 1.0151749943912054*z
+	return
+}
+
+func A98Rgb(r, g, b float64) Color {
+	rl, gl, bl := A98RgbToLinearRgb(r, g, b)
+	x, y, z := LinearA98RgbToXyz(rl, gl, bl)
+	return Xyz(x, y, z)
+}
+
+func (col Color) A98Rgb() (r, g, b float64) {
+	x, y, z := col.Xyz()
+	rl, gl, bl := XyzToLinearA98Rgb(x, y, z)
+	r = delinearizeA98(rl)
+	g = delinearizeA98(gl)
+	b = delinearizeA98(bl)
+	return
+}
+
+// BlendA98Rgb blends two colors in the A98 RGB color-space.
+// t == 0 results in c1, t == 1 results in c2
+func (c1 Color) BlendA98Rgb(c2 Color, t float64) Color {
+	r1, g1, b1 := c1.A98Rgb()
+	r2, g2, b2 := c2.A98Rgb()
+	return A98Rgb(
+		r1+t*(r2-r1),
+		g1+t*(g2-g1),
+		b1+t*(b2-b1))
+}
+
+/// ProPhoto RGB ///
+////////////////////
+// ProPhoto RGB (ROMM RGB) uses D50 illuminant.
+
+func linearizeProPhoto(v float64) float64 {
+	if v <= 16.0/512.0 {
+		return v / 16.0
+	}
+	return math.Pow(v, 1.8)
+}
+
+func delinearizeProPhoto(v float64) float64 {
+	if v < 1.0/512.0 {
+		return 16.0 * v
+	}
+	return math.Pow(v, 1.0/1.8)
+}
+
+func ProPhotoRgbToLinearRgb(r, g, b float64) (rl, gl, bl float64) {
+	rl = linearizeProPhoto(r)
+	gl = linearizeProPhoto(g)
+	bl = linearizeProPhoto(b)
+	return
+}
+
+func LinearProPhotoRgbToXyzD50(r, g, b float64) (x, y, z float64) {
+	x = 0.7977604896723027*r + 0.13518583717574031*g + 0.0313493495815248*b
+	y = 0.2880711282292934*r + 0.7118432178101014*g + 0.00008565396060525902*b
+	z = 0.8251046025104602 * b
+	return
+}
+
+func XyzD50ToLinearProPhotoRgb(x, y, z float64) (r, g, b float64) {
+	r = 1.3457989731028281*x - 0.25558010007997534*y - 0.05110628506753401*z
+	g = -0.5446224939028347*x + 1.5082327413132781*y + 0.02053603239147973*z
+	b = 1.2119675456389454 * z
+	return
+}
+
+func ProPhotoRgb(r, g, b float64) Color {
+	rl, gl, bl := ProPhotoRgbToLinearRgb(r, g, b)
+	x, y, z := LinearProPhotoRgbToXyzD50(rl, gl, bl)
+	return XyzD50(x, y, z)
+}
+
+func (col Color) ProPhotoRgb() (r, g, b float64) {
+	x, y, z := col.XyzD50()
+	rl, gl, bl := XyzD50ToLinearProPhotoRgb(x, y, z)
+	r = delinearizeProPhoto(rl)
+	g = delinearizeProPhoto(gl)
+	b = delinearizeProPhoto(bl)
+	return
+}
+
+// BlendProPhotoRgb blends two colors in the ProPhoto RGB color-space.
+// t == 0 results in c1, t == 1 results in c2
+func (c1 Color) BlendProPhotoRgb(c2 Color, t float64) Color {
+	r1, g1, b1 := c1.ProPhotoRgb()
+	r2, g2, b2 := c2.ProPhotoRgb()
+	return ProPhotoRgb(
+		r1+t*(r2-r1),
+		g1+t*(g2-g1),
+		b1+t*(b2-b1))
+}
+
+/// Rec. 2020 ///
+/////////////////
+// ITU-R BT.2020 color space.
+
+const (
+	rec2020Alpha = 1.09929682680944
+	rec2020Beta  = 0.018053968510807
+)
+
+func linearizeRec2020(v float64) float64 {
+	if v < rec2020Beta*4.5 {
+		return v / 4.5
+	}
+	return math.Pow((v+rec2020Alpha-1)/rec2020Alpha, 1.0/0.45)
+}
+
+func delinearizeRec2020(v float64) float64 {
+	if v < rec2020Beta {
+		return 4.5 * v
+	}
+	return rec2020Alpha*math.Pow(v, 0.45) - (rec2020Alpha - 1)
+}
+
+func Rec2020ToLinearRgb(r, g, b float64) (rl, gl, bl float64) {
+	rl = linearizeRec2020(r)
+	gl = linearizeRec2020(g)
+	bl = linearizeRec2020(b)
+	return
+}
+
+func LinearRec2020ToXyz(r, g, b float64) (x, y, z float64) {
+	x = 0.6369580483012914*r + 0.14461690358620832*g + 0.1688809751641721*b
+	y = 0.2627002120112671*r + 0.6779980715188708*g + 0.05930171646986196*b
+	z = 0.028072693049087428*g + 1.0609850577107909*b
+	return
+}
+
+func XyzToLinearRec2020(x, y, z float64) (r, g, b float64) {
+	r = 1.7166511879712674*x - 0.35567078377639233*y - 0.25336628137365974*z
+	g = -0.666684351832489*x + 1.616481236634939*y + 0.0157685458139402*z
+	b = 0.017639857445310783*x - 0.042770613257808524*y + 0.9421031212354738*z
+	return
+}
+
+func Rec2020(r, g, b float64) Color {
+	rl, gl, bl := Rec2020ToLinearRgb(r, g, b)
+	x, y, z := LinearRec2020ToXyz(rl, gl, bl)
+	return Xyz(x, y, z)
+}
+
+func (col Color) Rec2020() (r, g, b float64) {
+	x, y, z := col.Xyz()
+	rl, gl, bl := XyzToLinearRec2020(x, y, z)
+	r = delinearizeRec2020(rl)
+	g = delinearizeRec2020(gl)
+	b = delinearizeRec2020(bl)
+	return
+}
+
+// BlendRec2020 blends two colors in the Rec. 2020 color-space.
+// t == 0 results in c1, t == 1 results in c2
+func (c1 Color) BlendRec2020(c2 Color, t float64) Color {
+	r1, g1, b1 := c1.Rec2020()
+	r2, g2, b2 := c2.Rec2020()
+	return Rec2020(
+		r1+t*(r2-r1),
+		g1+t*(g2-g1),
+		b1+t*(b2-b1))
+}
diff --git a/vendor/github.com/mattn/go-colorable/noncolorable.go b/vendor/github.com/mattn/go-colorable/noncolorable.go
index 3df68f360..05d6f74bf 100644
--- a/vendor/github.com/mattn/go-colorable/noncolorable.go
+++ b/vendor/github.com/mattn/go-colorable/noncolorable.go
@@ -42,7 +42,6 @@ loop:
 			continue
 		}
 
-		var buf bytes.Buffer
 		for {
 			c, err := er.ReadByte()
 			if err != nil {
@@ -51,7 +50,6 @@ loop:
 			if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
 				break
 			}
-			buf.Write([]byte(string(c)))
 		}
 	}
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
index 39bbcf00f..d0ea68f40 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_bsd.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
@@ -1,6 +1,7 @@
-//go:build (darwin || freebsd || openbsd || netbsd || dragonfly) && !appengine
-// +build darwin freebsd openbsd netbsd dragonfly
+//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) && !appengine && !tinygo
+// +build darwin freebsd openbsd netbsd dragonfly hurd
 // +build !appengine
+// +build !tinygo
 
 package isatty
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go
index 31503226f..7402e0618 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_others.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_others.go
@@ -1,5 +1,6 @@
-//go:build appengine || js || nacl || wasm
-// +build appengine js nacl wasm
+//go:build (appengine || js || nacl || tinygo || wasm) && !windows
+// +build appengine js nacl tinygo wasm
+// +build !windows
 
 package isatty
 
diff --git a/vendor/github.com/mattn/go-isatty/isatty_tcgets.go b/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
index 67787657f..0337d8cf6 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_tcgets.go
@@ -1,6 +1,7 @@
-//go:build (linux || aix || zos) && !appengine
+//go:build (linux || aix || zos) && !appengine && !tinygo
 // +build linux aix zos
 // +build !appengine
+// +build !tinygo
 
 package isatty
 
diff --git a/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm b/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm
deleted file mode 100644
index 4230fba01..000000000
--- a/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM golang:1.23@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37
-
-ENV GOOS=linux
-ENV GOARCH=arm
-ENV CGO_ENABLED=1
-ENV CC=arm-linux-gnueabihf-gcc
-ENV PATH="/go/bin/${GOOS}_${GOARCH}:${PATH}"
-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
-
-RUN dpkg --add-architecture armhf \
-    && apt update \
-    && apt install -y --no-install-recommends \
-        gcc-arm-linux-gnueabihf \
-        libc6-dev-armhf-cross \
-        pkg-config \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY . /src/workdir
-
-WORKDIR /src/workdir
-
-RUN go build ./...
diff --git a/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 b/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64
deleted file mode 100644
index 59928252a..000000000
--- a/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM golang:1.23@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37
-
-ENV GOOS=linux
-ENV GOARCH=arm64
-ENV CGO_ENABLED=1
-ENV CC=aarch64-linux-gnu-gcc
-ENV PATH="/go/bin/${GOOS}_${GOARCH}:${PATH}"
-ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
-
-# install build & runtime dependencies
-RUN dpkg --add-architecture arm64 \
-    && apt update \
-    && apt install -y --no-install-recommends \
-        gcc-aarch64-linux-gnu \
-        libc6-dev-arm64-cross \
-        pkg-config \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY . /src/workdir
-
-WORKDIR /src/workdir
-
-RUN go build ./...
diff --git a/vendor/github.com/pjbgf/sha1cd/LICENSE b/vendor/github.com/pjbgf/sha1cd/LICENSE
deleted file mode 100644
index c8ff622ff..000000000
--- a/vendor/github.com/pjbgf/sha1cd/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2023 pjbgf
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/pjbgf/sha1cd/Makefile b/vendor/github.com/pjbgf/sha1cd/Makefile
deleted file mode 100644
index 278a109d8..000000000
--- a/vendor/github.com/pjbgf/sha1cd/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-FUZZ_TIME ?= 1m
-
-export CGO_ENABLED := 1
-
-.PHONY: test
-test:
-	go test ./...
-
-.PHONY: bench
-bench:
-	go test -benchmem -run=^$$ -bench ^Benchmark ./...
-
-.PHONY: fuzz
-fuzz:
-	go test -tags gofuzz -fuzz=. -fuzztime=$(FUZZ_TIME) ./test/
-
-# Cross build project in arm/v7.
-build-arm:
-	docker build -t sha1cd-arm -f Dockerfile.arm .
-	docker run --rm sha1cd-arm
-
-# Cross build project in arm64.
-build-arm64:
-	docker build -t sha1cd-arm64 -f Dockerfile.arm64 .
-	docker run --rm sha1cd-arm64
-
-# Build with cgo disabled.
-build-nocgo:
-	CGO_ENABLED=0 go build ./cgo
-
-# Run cross-compilation to assure supported architectures.
-cross-build: build-arm build-arm64 build-nocgo
-
-generate:
-	go generate -x ./...
-
-verify: generate
-	git diff --exit-code
-	go vet ./...
diff --git a/vendor/github.com/pjbgf/sha1cd/README.md b/vendor/github.com/pjbgf/sha1cd/README.md
deleted file mode 100644
index 378cf78cf..000000000
--- a/vendor/github.com/pjbgf/sha1cd/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# sha1cd
-
-A Go implementation of SHA1 with counter-cryptanalysis, which detects
-collision attacks. 
-
-The `cgo/lib` code is a carbon copy of the [original code], based on
-the award winning [white paper] by Marc Stevens.
-
-The Go implementation is largely based off Go's generic sha1.
-At present no SIMD optimisations have been implemented.
-
-## Usage
-
-`sha1cd` can be used as a drop-in replacement for `crypto/sha1`:
-
-```golang
-import "github.com/pjbgf/sha1cd"
-
-func test(){
-	data := []byte("data to be sha1 hashed")
-	h := sha1cd.Sum(data)
-	fmt.Printf("hash: %q\n", hex.EncodeToString(h))
-}
-```
-
-To obtain information as to whether a collision was found, use the
-func `CollisionResistantSum`.
-
-```golang
-import "github.com/pjbgf/sha1cd"
-
-func test(){
-	data := []byte("data to be sha1 hashed")
-	h, col  := sha1cd.CollisionResistantSum(data)
-	if col {
-		fmt.Println("collision found!")
-	}
-	fmt.Printf("hash: %q", hex.EncodeToString(h))
-}
-```
-
-Note that the algorithm will automatically avoid collision, by 
-extending the SHA1 to 240-steps, instead of 80 when a collision
-attempt is detected. Therefore, inputs that contains the unavoidable
-bit conditions will yield a different hash from `sha1cd`, when compared
-with results using `crypto/sha1`. Valid inputs will have matching the outputs.
-
-## References
-- https://shattered.io/
-- https://github.com/cr-marcstevens/sha1collisiondetection
-- https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Secure-Hashing#shavs
-
-## Use of the Original Implementation
-- https://github.com/git/git/commit/28dc98e343ca4eb370a29ceec4c19beac9b5c01e
-- https://github.com/libgit2/libgit2/pull/4136
-
-[original code]: https://github.com/cr-marcstevens/sha1collisiondetection
-[white paper]: https://marc-stevens.nl/research/papers/C13-S.pdf
diff --git a/vendor/github.com/pjbgf/sha1cd/detection.go b/vendor/github.com/pjbgf/sha1cd/detection.go
deleted file mode 100644
index a1458748c..000000000
--- a/vendor/github.com/pjbgf/sha1cd/detection.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package sha1cd
-
-import "hash"
-
-type CollisionResistantHash interface {
-	// CollisionResistantSum extends on Sum by returning an additional boolean
-	// which indicates whether a collision was found during the hashing process.
-	CollisionResistantSum(b []byte) ([]byte, bool)
-
-	hash.Hash
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/internal/const.go b/vendor/github.com/pjbgf/sha1cd/internal/const.go
deleted file mode 100644
index 944a131d3..000000000
--- a/vendor/github.com/pjbgf/sha1cd/internal/const.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package shared
-
-const (
-	// Constants for the SHA-1 hash function.
-	K0 = 0x5A827999
-	K1 = 0x6ED9EBA1
-	K2 = 0x8F1BBCDC
-	K3 = 0xCA62C1D6
-
-	// Initial values for the buffer variables: h0, h1, h2, h3, h4.
-	Init0 = 0x67452301
-	Init1 = 0xEFCDAB89
-	Init2 = 0x98BADCFE
-	Init3 = 0x10325476
-	Init4 = 0xC3D2E1F0
-
-	// Initial values for the temporary variables (ihvtmp0, ihvtmp1, ihvtmp2, ihvtmp3, ihvtmp4) during the SHA recompression step.
-	InitTmp0 = 0xD5
-	InitTmp1 = 0x394
-	InitTmp2 = 0x8152A8
-	InitTmp3 = 0x0
-	InitTmp4 = 0xA7ECE0
-
-	// SHA1 contains 2 buffers, each based off 5 32-bit words.
-	WordBuffers = 5
-
-	// The output of SHA1 is 20 bytes (160 bits).
-	Size = 20
-
-	// Rounds represents the number of steps required to process each chunk.
-	Rounds = 80
-
-	// SHA1 processes the input data in chunks. Each chunk contains 64 bytes.
-	Chunk = 64
-
-	// The number of pre-step compression state to store.
-	// Currently there are 3 pre-step compression states required: 0, 58, 65.
-	PreStepState = 3
-
-	Magic         = "shacd\x01"
-	MarshaledSize = len(Magic) + 5*4 + Chunk + 8
-)
diff --git a/vendor/github.com/pjbgf/sha1cd/sha1cd.go b/vendor/github.com/pjbgf/sha1cd/sha1cd.go
deleted file mode 100644
index 509569f66..000000000
--- a/vendor/github.com/pjbgf/sha1cd/sha1cd.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package sha1cd implements collision detection based on the whitepaper
-// Counter-cryptanalysis from Marc Stevens. The original ubc implementation
-// was done by Marc Stevens and Dan Shumow, and can be found at:
-// https://github.com/cr-marcstevens/sha1collisiondetection
-package sha1cd
-
-// This SHA1 implementation is based on Go's generic SHA1.
-// Original: https://github.com/golang/go/blob/master/src/crypto/sha1/sha1.go
-
-import (
-	"crypto"
-	"encoding/binary"
-	"errors"
-	"hash"
-
-	shared "github.com/pjbgf/sha1cd/internal"
-)
-
-//go:generate go run -C asm . -out ../sha1cdblock_amd64.s -pkg $GOPACKAGE
-
-func init() {
-	crypto.RegisterHash(crypto.SHA1, New)
-}
-
-// The size of a SHA-1 checksum in bytes.
-const Size = shared.Size
-
-// The blocksize of SHA-1 in bytes.
-const BlockSize = shared.Chunk
-
-// digest represents the partial evaluation of a checksum.
-type digest struct {
-	h   [shared.WordBuffers]uint32
-	x   [shared.Chunk]byte
-	nx  int
-	len uint64
-
-	// col defines whether a collision has been found.
-	col       bool
-	blockFunc func(dig *digest, p []byte)
-}
-
-func (d *digest) MarshalBinary() ([]byte, error) {
-	b := make([]byte, 0, shared.MarshaledSize)
-	b = append(b, shared.Magic...)
-	b = appendUint32(b, d.h[0])
-	b = appendUint32(b, d.h[1])
-	b = appendUint32(b, d.h[2])
-	b = appendUint32(b, d.h[3])
-	b = appendUint32(b, d.h[4])
-	b = append(b, d.x[:d.nx]...)
-	b = b[:len(b)+len(d.x)-d.nx] // already zero
-	b = appendUint64(b, d.len)
-	return b, nil
-}
-
-func appendUint32(b []byte, v uint32) []byte {
-	return append(b,
-		byte(v>>24),
-		byte(v>>16),
-		byte(v>>8),
-		byte(v),
-	)
-}
-
-func appendUint64(b []byte, v uint64) []byte {
-	return append(b,
-		byte(v>>56),
-		byte(v>>48),
-		byte(v>>40),
-		byte(v>>32),
-		byte(v>>24),
-		byte(v>>16),
-		byte(v>>8),
-		byte(v),
-	)
-}
-
-func (d *digest) UnmarshalBinary(b []byte) error {
-	if len(b) < len(shared.Magic) || string(b[:len(shared.Magic)]) != shared.Magic {
-		return errors.New("crypto/sha1: invalid hash state identifier")
-	}
-	if len(b) != shared.MarshaledSize {
-		return errors.New("crypto/sha1: invalid hash state size")
-	}
-	b = b[len(shared.Magic):]
-	b, d.h[0] = consumeUint32(b)
-	b, d.h[1] = consumeUint32(b)
-	b, d.h[2] = consumeUint32(b)
-	b, d.h[3] = consumeUint32(b)
-	b, d.h[4] = consumeUint32(b)
-	b = b[copy(d.x[:], b):]
-	b, d.len = consumeUint64(b)
-	d.nx = int(d.len % shared.Chunk)
-	return nil
-}
-
-func consumeUint64(b []byte) ([]byte, uint64) {
-	_ = b[7]
-	x := uint64(b[7]) | uint64(b[6])<<8 | uint64(b[shared.WordBuffers])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-	return b[8:], x
-}
-
-func consumeUint32(b []byte) ([]byte, uint32) {
-	_ = b[3]
-	x := uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-	return b[4:], x
-}
-
-func (d *digest) Reset() {
-	d.h[0] = shared.Init0
-	d.h[1] = shared.Init1
-	d.h[2] = shared.Init2
-	d.h[3] = shared.Init3
-	d.h[4] = shared.Init4
-	d.nx = 0
-	d.len = 0
-
-	d.col = false
-}
-
-// New returns a new hash.Hash computing the SHA1 checksum. The Hash also
-// implements encoding.BinaryMarshaler and encoding.BinaryUnmarshaler to
-// marshal and unmarshal the internal state of the hash.
-func New() hash.Hash {
-	d := new(digest)
-
-	d.blockFunc = block
-	d.Reset()
-	return d
-}
-
-// NewGeneric is equivalent to New but uses the Go generic implementation,
-// avoiding any processor-specific optimizations.
-func NewGeneric() hash.Hash {
-	d := new(digest)
-
-	d.blockFunc = blockGeneric
-	d.Reset()
-	return d
-}
-
-func (d *digest) Size() int { return Size }
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Write(p []byte) (nn int, err error) {
-	if len(p) == 0 {
-		return
-	}
-
-	nn = len(p)
-	d.len += uint64(nn)
-	if d.nx > 0 {
-		n := copy(d.x[d.nx:], p)
-		d.nx += n
-		if d.nx == shared.Chunk {
-			d.blockFunc(d, d.x[:])
-			d.nx = 0
-		}
-		p = p[n:]
-	}
-	if len(p) >= shared.Chunk {
-		n := len(p) &^ (shared.Chunk - 1)
-		d.blockFunc(d, p[:n])
-		p = p[n:]
-	}
-	if len(p) > 0 {
-		d.nx = copy(d.x[:], p)
-	}
-	return
-}
-
-func (d *digest) Sum(in []byte) []byte {
-	// Make a copy of d so that caller can keep writing and summing.
-	d0 := *d
-	hash := d0.checkSum()
-	return append(in, hash[:]...)
-}
-
-func (d *digest) checkSum() [Size]byte {
-	len := d.len
-	// Padding.  Add a 1 bit and 0 bits until 56 bytes mod 64.
-	var tmp [64]byte
-	tmp[0] = 0x80
-	if len%64 < 56 {
-		d.Write(tmp[0 : 56-len%64])
-	} else {
-		d.Write(tmp[0 : 64+56-len%64])
-	}
-
-	// Length in bits.
-	len <<= 3
-	binary.BigEndian.PutUint64(tmp[:], len)
-	d.Write(tmp[0:8])
-
-	if d.nx != 0 {
-		panic("d.nx != 0")
-	}
-
-	var digest [Size]byte
-
-	binary.BigEndian.PutUint32(digest[0:], d.h[0])
-	binary.BigEndian.PutUint32(digest[4:], d.h[1])
-	binary.BigEndian.PutUint32(digest[8:], d.h[2])
-	binary.BigEndian.PutUint32(digest[12:], d.h[3])
-	binary.BigEndian.PutUint32(digest[16:], d.h[4])
-
-	return digest
-}
-
-// Sum returns the SHA-1 checksum of the data.
-func Sum(data []byte) ([Size]byte, bool) {
-	d := New().(*digest)
-	d.Write(data)
-	return d.checkSum(), d.col
-}
-
-func (d *digest) CollisionResistantSum(in []byte) ([]byte, bool) {
-	// Make a copy of d so that caller can keep writing and summing.
-	d0 := *d
-	hash := d0.checkSum()
-	return append(in, hash[:]...), d0.col
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_amd64.go b/vendor/github.com/pjbgf/sha1cd/sha1cdblock_amd64.go
deleted file mode 100644
index 95e083084..000000000
--- a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_amd64.go
+++ /dev/null
@@ -1,50 +0,0 @@
-//go:build !noasm && gc && amd64
-// +build !noasm,gc,amd64
-
-package sha1cd
-
-import (
-	"math"
-	"unsafe"
-
-	shared "github.com/pjbgf/sha1cd/internal"
-)
-
-type sliceHeader struct {
-	base uintptr
-	len  int
-	cap  int
-}
-
-// blockAMD64 hashes the message p into the current state in dig.
-// Both m1 and cs are used to store intermediate results which are used by the collision detection logic.
-//
-//go:noescape
-func blockAMD64(dig *digest, p sliceHeader, m1 []uint32, cs [][5]uint32)
-
-func block(dig *digest, p []byte) {
-	m1 := [shared.Rounds]uint32{}
-	cs := [shared.PreStepState][shared.WordBuffers]uint32{}
-
-	for len(p) >= shared.Chunk {
-		// Only send a block to be processed, as the collission detection
-		// works on a block by block basis.
-		ips := sliceHeader{
-			base: uintptr(unsafe.Pointer(&p[0])),
-			len:  int(math.Min(float64(len(p)), float64(shared.Chunk))),
-			cap:  shared.Chunk,
-		}
-
-		blockAMD64(dig, ips, m1[:], cs[:])
-
-		col := checkCollision(m1, cs, dig.h)
-		if col {
-			dig.col = true
-
-			blockAMD64(dig, ips, m1[:], cs[:])
-			blockAMD64(dig, ips, m1[:], cs[:])
-		}
-
-		p = p[shared.Chunk:]
-	}
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_amd64.s b/vendor/github.com/pjbgf/sha1cd/sha1cdblock_amd64.s
deleted file mode 100644
index e5e213a52..000000000
--- a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_amd64.s
+++ /dev/null
@@ -1,2273 +0,0 @@
-// Code generated by command: go run asm.go -out ../sha1cdblock_amd64.s -pkg sha1cd. DO NOT EDIT.
-
-//go:build !noasm && gc && amd64
-
-#include "textflag.h"
-
-// func blockAMD64(dig *digest, p []byte, m1 []uint32, cs [][5]uint32)
-TEXT ·blockAMD64(SB), NOSPLIT, $64-80
-	MOVQ dig+0(FP), R8
-	MOVQ p_base+8(FP), DI
-	MOVQ p_len+16(FP), DX
-	SHRQ $+6, DX
-	SHLQ $+6, DX
-	LEAQ (DI)(DX*1), SI
-
-	// Load h0, h1, h2, h3, h4.
-	MOVL (R8), AX
-	MOVL 4(R8), BX
-	MOVL 8(R8), CX
-	MOVL 12(R8), DX
-	MOVL 16(R8), BP
-
-	// len(p) >= chunk
-	CMPQ DI, SI
-	JEQ  end
-
-loop:
-	// Initialize registers a, b, c, d, e.
-	MOVL AX, R10
-	MOVL BX, R11
-	MOVL CX, R12
-	MOVL DX, R13
-	MOVL BP, R14
-
-	// ROUND1 (steps 0-15)
-	// Load cs
-	MOVQ cs_base+56(FP), R8
-	MOVL R10, (R8)
-	MOVL R11, 4(R8)
-	MOVL R12, 8(R8)
-	MOVL R13, 12(R8)
-	MOVL R14, 16(R8)
-
-	// ROUND1(0)
-	// LOAD
-	MOVL   (DI), R9
-	BSWAPL R9
-	MOVL   R9, (SP)
-
-	// FUNC1
-	MOVL R13, R15
-	XORL R12, R15
-	ANDL R11, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL (SP), R9
-	MOVL R9, (R8)
-
-	// ROUND1(1)
-	// LOAD
-	MOVL   4(DI), R9
-	BSWAPL R9
-	MOVL   R9, 4(SP)
-
-	// FUNC1
-	MOVL R12, R15
-	XORL R11, R15
-	ANDL R10, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 4(SP), R9
-	MOVL R9, 4(R8)
-
-	// ROUND1(2)
-	// LOAD
-	MOVL   8(DI), R9
-	BSWAPL R9
-	MOVL   R9, 8(SP)
-
-	// FUNC1
-	MOVL R11, R15
-	XORL R10, R15
-	ANDL R14, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 8(SP), R9
-	MOVL R9, 8(R8)
-
-	// ROUND1(3)
-	// LOAD
-	MOVL   12(DI), R9
-	BSWAPL R9
-	MOVL   R9, 12(SP)
-
-	// FUNC1
-	MOVL R10, R15
-	XORL R14, R15
-	ANDL R13, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 12(SP), R9
-	MOVL R9, 12(R8)
-
-	// ROUND1(4)
-	// LOAD
-	MOVL   16(DI), R9
-	BSWAPL R9
-	MOVL   R9, 16(SP)
-
-	// FUNC1
-	MOVL R14, R15
-	XORL R13, R15
-	ANDL R12, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 16(SP), R9
-	MOVL R9, 16(R8)
-
-	// ROUND1(5)
-	// LOAD
-	MOVL   20(DI), R9
-	BSWAPL R9
-	MOVL   R9, 20(SP)
-
-	// FUNC1
-	MOVL R13, R15
-	XORL R12, R15
-	ANDL R11, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 20(SP), R9
-	MOVL R9, 20(R8)
-
-	// ROUND1(6)
-	// LOAD
-	MOVL   24(DI), R9
-	BSWAPL R9
-	MOVL   R9, 24(SP)
-
-	// FUNC1
-	MOVL R12, R15
-	XORL R11, R15
-	ANDL R10, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 24(SP), R9
-	MOVL R9, 24(R8)
-
-	// ROUND1(7)
-	// LOAD
-	MOVL   28(DI), R9
-	BSWAPL R9
-	MOVL   R9, 28(SP)
-
-	// FUNC1
-	MOVL R11, R15
-	XORL R10, R15
-	ANDL R14, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 28(SP), R9
-	MOVL R9, 28(R8)
-
-	// ROUND1(8)
-	// LOAD
-	MOVL   32(DI), R9
-	BSWAPL R9
-	MOVL   R9, 32(SP)
-
-	// FUNC1
-	MOVL R10, R15
-	XORL R14, R15
-	ANDL R13, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 32(SP), R9
-	MOVL R9, 32(R8)
-
-	// ROUND1(9)
-	// LOAD
-	MOVL   36(DI), R9
-	BSWAPL R9
-	MOVL   R9, 36(SP)
-
-	// FUNC1
-	MOVL R14, R15
-	XORL R13, R15
-	ANDL R12, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 36(SP), R9
-	MOVL R9, 36(R8)
-
-	// ROUND1(10)
-	// LOAD
-	MOVL   40(DI), R9
-	BSWAPL R9
-	MOVL   R9, 40(SP)
-
-	// FUNC1
-	MOVL R13, R15
-	XORL R12, R15
-	ANDL R11, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 40(SP), R9
-	MOVL R9, 40(R8)
-
-	// ROUND1(11)
-	// LOAD
-	MOVL   44(DI), R9
-	BSWAPL R9
-	MOVL   R9, 44(SP)
-
-	// FUNC1
-	MOVL R12, R15
-	XORL R11, R15
-	ANDL R10, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 44(SP), R9
-	MOVL R9, 44(R8)
-
-	// ROUND1(12)
-	// LOAD
-	MOVL   48(DI), R9
-	BSWAPL R9
-	MOVL   R9, 48(SP)
-
-	// FUNC1
-	MOVL R11, R15
-	XORL R10, R15
-	ANDL R14, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 48(SP), R9
-	MOVL R9, 48(R8)
-
-	// ROUND1(13)
-	// LOAD
-	MOVL   52(DI), R9
-	BSWAPL R9
-	MOVL   R9, 52(SP)
-
-	// FUNC1
-	MOVL R10, R15
-	XORL R14, R15
-	ANDL R13, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 52(SP), R9
-	MOVL R9, 52(R8)
-
-	// ROUND1(14)
-	// LOAD
-	MOVL   56(DI), R9
-	BSWAPL R9
-	MOVL   R9, 56(SP)
-
-	// FUNC1
-	MOVL R14, R15
-	XORL R13, R15
-	ANDL R12, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 56(SP), R9
-	MOVL R9, 56(R8)
-
-	// ROUND1(15)
-	// LOAD
-	MOVL   60(DI), R9
-	BSWAPL R9
-	MOVL   R9, 60(SP)
-
-	// FUNC1
-	MOVL R13, R15
-	XORL R12, R15
-	ANDL R11, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 60(SP), R9
-	MOVL R9, 60(R8)
-
-	// ROUND1x (steps 16-19) - same as ROUND1 but with no data load.
-	// ROUND1x(16)
-	// SHUFFLE
-	MOVL (SP), R9
-	XORL 52(SP), R9
-	XORL 32(SP), R9
-	XORL 8(SP), R9
-	ROLL $+1, R9
-	MOVL R9, (SP)
-
-	// FUNC1
-	MOVL R12, R15
-	XORL R11, R15
-	ANDL R10, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL (SP), R9
-	MOVL R9, 64(R8)
-
-	// ROUND1x(17)
-	// SHUFFLE
-	MOVL 4(SP), R9
-	XORL 56(SP), R9
-	XORL 36(SP), R9
-	XORL 12(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 4(SP)
-
-	// FUNC1
-	MOVL R11, R15
-	XORL R10, R15
-	ANDL R14, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 4(SP), R9
-	MOVL R9, 68(R8)
-
-	// ROUND1x(18)
-	// SHUFFLE
-	MOVL 8(SP), R9
-	XORL 60(SP), R9
-	XORL 40(SP), R9
-	XORL 16(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 8(SP)
-
-	// FUNC1
-	MOVL R10, R15
-	XORL R14, R15
-	ANDL R13, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 8(SP), R9
-	MOVL R9, 72(R8)
-
-	// ROUND1x(19)
-	// SHUFFLE
-	MOVL 12(SP), R9
-	XORL (SP), R9
-	XORL 44(SP), R9
-	XORL 20(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 12(SP)
-
-	// FUNC1
-	MOVL R14, R15
-	XORL R13, R15
-	ANDL R12, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1518500249(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 12(SP), R9
-	MOVL R9, 76(R8)
-
-	// ROUND2 (steps 20-39)
-	// ROUND2(20)
-	// SHUFFLE
-	MOVL 16(SP), R9
-	XORL 4(SP), R9
-	XORL 48(SP), R9
-	XORL 24(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 16(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 16(SP), R9
-	MOVL R9, 80(R8)
-
-	// ROUND2(21)
-	// SHUFFLE
-	MOVL 20(SP), R9
-	XORL 8(SP), R9
-	XORL 52(SP), R9
-	XORL 28(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 20(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 20(SP), R9
-	MOVL R9, 84(R8)
-
-	// ROUND2(22)
-	// SHUFFLE
-	MOVL 24(SP), R9
-	XORL 12(SP), R9
-	XORL 56(SP), R9
-	XORL 32(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 24(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 24(SP), R9
-	MOVL R9, 88(R8)
-
-	// ROUND2(23)
-	// SHUFFLE
-	MOVL 28(SP), R9
-	XORL 16(SP), R9
-	XORL 60(SP), R9
-	XORL 36(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 28(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 28(SP), R9
-	MOVL R9, 92(R8)
-
-	// ROUND2(24)
-	// SHUFFLE
-	MOVL 32(SP), R9
-	XORL 20(SP), R9
-	XORL (SP), R9
-	XORL 40(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 32(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 32(SP), R9
-	MOVL R9, 96(R8)
-
-	// ROUND2(25)
-	// SHUFFLE
-	MOVL 36(SP), R9
-	XORL 24(SP), R9
-	XORL 4(SP), R9
-	XORL 44(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 36(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 36(SP), R9
-	MOVL R9, 100(R8)
-
-	// ROUND2(26)
-	// SHUFFLE
-	MOVL 40(SP), R9
-	XORL 28(SP), R9
-	XORL 8(SP), R9
-	XORL 48(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 40(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 40(SP), R9
-	MOVL R9, 104(R8)
-
-	// ROUND2(27)
-	// SHUFFLE
-	MOVL 44(SP), R9
-	XORL 32(SP), R9
-	XORL 12(SP), R9
-	XORL 52(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 44(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 44(SP), R9
-	MOVL R9, 108(R8)
-
-	// ROUND2(28)
-	// SHUFFLE
-	MOVL 48(SP), R9
-	XORL 36(SP), R9
-	XORL 16(SP), R9
-	XORL 56(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 48(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 48(SP), R9
-	MOVL R9, 112(R8)
-
-	// ROUND2(29)
-	// SHUFFLE
-	MOVL 52(SP), R9
-	XORL 40(SP), R9
-	XORL 20(SP), R9
-	XORL 60(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 52(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 52(SP), R9
-	MOVL R9, 116(R8)
-
-	// ROUND2(30)
-	// SHUFFLE
-	MOVL 56(SP), R9
-	XORL 44(SP), R9
-	XORL 24(SP), R9
-	XORL (SP), R9
-	ROLL $+1, R9
-	MOVL R9, 56(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 56(SP), R9
-	MOVL R9, 120(R8)
-
-	// ROUND2(31)
-	// SHUFFLE
-	MOVL 60(SP), R9
-	XORL 48(SP), R9
-	XORL 28(SP), R9
-	XORL 4(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 60(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 60(SP), R9
-	MOVL R9, 124(R8)
-
-	// ROUND2(32)
-	// SHUFFLE
-	MOVL (SP), R9
-	XORL 52(SP), R9
-	XORL 32(SP), R9
-	XORL 8(SP), R9
-	ROLL $+1, R9
-	MOVL R9, (SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL (SP), R9
-	MOVL R9, 128(R8)
-
-	// ROUND2(33)
-	// SHUFFLE
-	MOVL 4(SP), R9
-	XORL 56(SP), R9
-	XORL 36(SP), R9
-	XORL 12(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 4(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 4(SP), R9
-	MOVL R9, 132(R8)
-
-	// ROUND2(34)
-	// SHUFFLE
-	MOVL 8(SP), R9
-	XORL 60(SP), R9
-	XORL 40(SP), R9
-	XORL 16(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 8(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 8(SP), R9
-	MOVL R9, 136(R8)
-
-	// ROUND2(35)
-	// SHUFFLE
-	MOVL 12(SP), R9
-	XORL (SP), R9
-	XORL 44(SP), R9
-	XORL 20(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 12(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 12(SP), R9
-	MOVL R9, 140(R8)
-
-	// ROUND2(36)
-	// SHUFFLE
-	MOVL 16(SP), R9
-	XORL 4(SP), R9
-	XORL 48(SP), R9
-	XORL 24(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 16(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 16(SP), R9
-	MOVL R9, 144(R8)
-
-	// ROUND2(37)
-	// SHUFFLE
-	MOVL 20(SP), R9
-	XORL 8(SP), R9
-	XORL 52(SP), R9
-	XORL 28(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 20(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 20(SP), R9
-	MOVL R9, 148(R8)
-
-	// ROUND2(38)
-	// SHUFFLE
-	MOVL 24(SP), R9
-	XORL 12(SP), R9
-	XORL 56(SP), R9
-	XORL 32(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 24(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 24(SP), R9
-	MOVL R9, 152(R8)
-
-	// ROUND2(39)
-	// SHUFFLE
-	MOVL 28(SP), R9
-	XORL 16(SP), R9
-	XORL 60(SP), R9
-	XORL 36(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 28(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 1859775393(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 28(SP), R9
-	MOVL R9, 156(R8)
-
-	// ROUND3 (steps 40-59)
-	// ROUND3(40)
-	// SHUFFLE
-	MOVL 32(SP), R9
-	XORL 20(SP), R9
-	XORL (SP), R9
-	XORL 40(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 32(SP)
-
-	// FUNC3
-	MOVL R11, R8
-	ORL  R12, R8
-	ANDL R13, R8
-	MOVL R11, R15
-	ANDL R12, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 32(SP), R9
-	MOVL R9, 160(R8)
-
-	// ROUND3(41)
-	// SHUFFLE
-	MOVL 36(SP), R9
-	XORL 24(SP), R9
-	XORL 4(SP), R9
-	XORL 44(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 36(SP)
-
-	// FUNC3
-	MOVL R10, R8
-	ORL  R11, R8
-	ANDL R12, R8
-	MOVL R10, R15
-	ANDL R11, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 36(SP), R9
-	MOVL R9, 164(R8)
-
-	// ROUND3(42)
-	// SHUFFLE
-	MOVL 40(SP), R9
-	XORL 28(SP), R9
-	XORL 8(SP), R9
-	XORL 48(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 40(SP)
-
-	// FUNC3
-	MOVL R14, R8
-	ORL  R10, R8
-	ANDL R11, R8
-	MOVL R14, R15
-	ANDL R10, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 40(SP), R9
-	MOVL R9, 168(R8)
-
-	// ROUND3(43)
-	// SHUFFLE
-	MOVL 44(SP), R9
-	XORL 32(SP), R9
-	XORL 12(SP), R9
-	XORL 52(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 44(SP)
-
-	// FUNC3
-	MOVL R13, R8
-	ORL  R14, R8
-	ANDL R10, R8
-	MOVL R13, R15
-	ANDL R14, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 44(SP), R9
-	MOVL R9, 172(R8)
-
-	// ROUND3(44)
-	// SHUFFLE
-	MOVL 48(SP), R9
-	XORL 36(SP), R9
-	XORL 16(SP), R9
-	XORL 56(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 48(SP)
-
-	// FUNC3
-	MOVL R12, R8
-	ORL  R13, R8
-	ANDL R14, R8
-	MOVL R12, R15
-	ANDL R13, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 48(SP), R9
-	MOVL R9, 176(R8)
-
-	// ROUND3(45)
-	// SHUFFLE
-	MOVL 52(SP), R9
-	XORL 40(SP), R9
-	XORL 20(SP), R9
-	XORL 60(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 52(SP)
-
-	// FUNC3
-	MOVL R11, R8
-	ORL  R12, R8
-	ANDL R13, R8
-	MOVL R11, R15
-	ANDL R12, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 52(SP), R9
-	MOVL R9, 180(R8)
-
-	// ROUND3(46)
-	// SHUFFLE
-	MOVL 56(SP), R9
-	XORL 44(SP), R9
-	XORL 24(SP), R9
-	XORL (SP), R9
-	ROLL $+1, R9
-	MOVL R9, 56(SP)
-
-	// FUNC3
-	MOVL R10, R8
-	ORL  R11, R8
-	ANDL R12, R8
-	MOVL R10, R15
-	ANDL R11, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 56(SP), R9
-	MOVL R9, 184(R8)
-
-	// ROUND3(47)
-	// SHUFFLE
-	MOVL 60(SP), R9
-	XORL 48(SP), R9
-	XORL 28(SP), R9
-	XORL 4(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 60(SP)
-
-	// FUNC3
-	MOVL R14, R8
-	ORL  R10, R8
-	ANDL R11, R8
-	MOVL R14, R15
-	ANDL R10, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 60(SP), R9
-	MOVL R9, 188(R8)
-
-	// ROUND3(48)
-	// SHUFFLE
-	MOVL (SP), R9
-	XORL 52(SP), R9
-	XORL 32(SP), R9
-	XORL 8(SP), R9
-	ROLL $+1, R9
-	MOVL R9, (SP)
-
-	// FUNC3
-	MOVL R13, R8
-	ORL  R14, R8
-	ANDL R10, R8
-	MOVL R13, R15
-	ANDL R14, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL (SP), R9
-	MOVL R9, 192(R8)
-
-	// ROUND3(49)
-	// SHUFFLE
-	MOVL 4(SP), R9
-	XORL 56(SP), R9
-	XORL 36(SP), R9
-	XORL 12(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 4(SP)
-
-	// FUNC3
-	MOVL R12, R8
-	ORL  R13, R8
-	ANDL R14, R8
-	MOVL R12, R15
-	ANDL R13, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 4(SP), R9
-	MOVL R9, 196(R8)
-
-	// ROUND3(50)
-	// SHUFFLE
-	MOVL 8(SP), R9
-	XORL 60(SP), R9
-	XORL 40(SP), R9
-	XORL 16(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 8(SP)
-
-	// FUNC3
-	MOVL R11, R8
-	ORL  R12, R8
-	ANDL R13, R8
-	MOVL R11, R15
-	ANDL R12, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 8(SP), R9
-	MOVL R9, 200(R8)
-
-	// ROUND3(51)
-	// SHUFFLE
-	MOVL 12(SP), R9
-	XORL (SP), R9
-	XORL 44(SP), R9
-	XORL 20(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 12(SP)
-
-	// FUNC3
-	MOVL R10, R8
-	ORL  R11, R8
-	ANDL R12, R8
-	MOVL R10, R15
-	ANDL R11, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 12(SP), R9
-	MOVL R9, 204(R8)
-
-	// ROUND3(52)
-	// SHUFFLE
-	MOVL 16(SP), R9
-	XORL 4(SP), R9
-	XORL 48(SP), R9
-	XORL 24(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 16(SP)
-
-	// FUNC3
-	MOVL R14, R8
-	ORL  R10, R8
-	ANDL R11, R8
-	MOVL R14, R15
-	ANDL R10, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 16(SP), R9
-	MOVL R9, 208(R8)
-
-	// ROUND3(53)
-	// SHUFFLE
-	MOVL 20(SP), R9
-	XORL 8(SP), R9
-	XORL 52(SP), R9
-	XORL 28(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 20(SP)
-
-	// FUNC3
-	MOVL R13, R8
-	ORL  R14, R8
-	ANDL R10, R8
-	MOVL R13, R15
-	ANDL R14, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 20(SP), R9
-	MOVL R9, 212(R8)
-
-	// ROUND3(54)
-	// SHUFFLE
-	MOVL 24(SP), R9
-	XORL 12(SP), R9
-	XORL 56(SP), R9
-	XORL 32(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 24(SP)
-
-	// FUNC3
-	MOVL R12, R8
-	ORL  R13, R8
-	ANDL R14, R8
-	MOVL R12, R15
-	ANDL R13, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 24(SP), R9
-	MOVL R9, 216(R8)
-
-	// ROUND3(55)
-	// SHUFFLE
-	MOVL 28(SP), R9
-	XORL 16(SP), R9
-	XORL 60(SP), R9
-	XORL 36(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 28(SP)
-
-	// FUNC3
-	MOVL R11, R8
-	ORL  R12, R8
-	ANDL R13, R8
-	MOVL R11, R15
-	ANDL R12, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 28(SP), R9
-	MOVL R9, 220(R8)
-
-	// ROUND3(56)
-	// SHUFFLE
-	MOVL 32(SP), R9
-	XORL 20(SP), R9
-	XORL (SP), R9
-	XORL 40(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 32(SP)
-
-	// FUNC3
-	MOVL R10, R8
-	ORL  R11, R8
-	ANDL R12, R8
-	MOVL R10, R15
-	ANDL R11, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 32(SP), R9
-	MOVL R9, 224(R8)
-
-	// ROUND3(57)
-	// SHUFFLE
-	MOVL 36(SP), R9
-	XORL 24(SP), R9
-	XORL 4(SP), R9
-	XORL 44(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 36(SP)
-
-	// FUNC3
-	MOVL R14, R8
-	ORL  R10, R8
-	ANDL R11, R8
-	MOVL R14, R15
-	ANDL R10, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 36(SP), R9
-	MOVL R9, 228(R8)
-
-	// Load cs
-	MOVQ cs_base+56(FP), R8
-	MOVL R12, 20(R8)
-	MOVL R13, 24(R8)
-	MOVL R14, 28(R8)
-	MOVL R10, 32(R8)
-	MOVL R11, 36(R8)
-
-	// ROUND3(58)
-	// SHUFFLE
-	MOVL 40(SP), R9
-	XORL 28(SP), R9
-	XORL 8(SP), R9
-	XORL 48(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 40(SP)
-
-	// FUNC3
-	MOVL R13, R8
-	ORL  R14, R8
-	ANDL R10, R8
-	MOVL R13, R15
-	ANDL R14, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 40(SP), R9
-	MOVL R9, 232(R8)
-
-	// ROUND3(59)
-	// SHUFFLE
-	MOVL 44(SP), R9
-	XORL 32(SP), R9
-	XORL 12(SP), R9
-	XORL 52(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 44(SP)
-
-	// FUNC3
-	MOVL R12, R8
-	ORL  R13, R8
-	ANDL R14, R8
-	MOVL R12, R15
-	ANDL R13, R15
-	ORL  R8, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 2400959708(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 44(SP), R9
-	MOVL R9, 236(R8)
-
-	// ROUND4 (steps 60-79)
-	// ROUND4(60)
-	// SHUFFLE
-	MOVL 48(SP), R9
-	XORL 36(SP), R9
-	XORL 16(SP), R9
-	XORL 56(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 48(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 48(SP), R9
-	MOVL R9, 240(R8)
-
-	// ROUND4(61)
-	// SHUFFLE
-	MOVL 52(SP), R9
-	XORL 40(SP), R9
-	XORL 20(SP), R9
-	XORL 60(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 52(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 52(SP), R9
-	MOVL R9, 244(R8)
-
-	// ROUND4(62)
-	// SHUFFLE
-	MOVL 56(SP), R9
-	XORL 44(SP), R9
-	XORL 24(SP), R9
-	XORL (SP), R9
-	ROLL $+1, R9
-	MOVL R9, 56(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 56(SP), R9
-	MOVL R9, 248(R8)
-
-	// ROUND4(63)
-	// SHUFFLE
-	MOVL 60(SP), R9
-	XORL 48(SP), R9
-	XORL 28(SP), R9
-	XORL 4(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 60(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 60(SP), R9
-	MOVL R9, 252(R8)
-
-	// ROUND4(64)
-	// SHUFFLE
-	MOVL (SP), R9
-	XORL 52(SP), R9
-	XORL 32(SP), R9
-	XORL 8(SP), R9
-	ROLL $+1, R9
-	MOVL R9, (SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL (SP), R9
-	MOVL R9, 256(R8)
-
-	// Load cs
-	MOVQ cs_base+56(FP), R8
-	MOVL R10, 40(R8)
-	MOVL R11, 44(R8)
-	MOVL R12, 48(R8)
-	MOVL R13, 52(R8)
-	MOVL R14, 56(R8)
-
-	// ROUND4(65)
-	// SHUFFLE
-	MOVL 4(SP), R9
-	XORL 56(SP), R9
-	XORL 36(SP), R9
-	XORL 12(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 4(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 4(SP), R9
-	MOVL R9, 260(R8)
-
-	// ROUND4(66)
-	// SHUFFLE
-	MOVL 8(SP), R9
-	XORL 60(SP), R9
-	XORL 40(SP), R9
-	XORL 16(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 8(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 8(SP), R9
-	MOVL R9, 264(R8)
-
-	// ROUND4(67)
-	// SHUFFLE
-	MOVL 12(SP), R9
-	XORL (SP), R9
-	XORL 44(SP), R9
-	XORL 20(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 12(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 12(SP), R9
-	MOVL R9, 268(R8)
-
-	// ROUND4(68)
-	// SHUFFLE
-	MOVL 16(SP), R9
-	XORL 4(SP), R9
-	XORL 48(SP), R9
-	XORL 24(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 16(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 16(SP), R9
-	MOVL R9, 272(R8)
-
-	// ROUND4(69)
-	// SHUFFLE
-	MOVL 20(SP), R9
-	XORL 8(SP), R9
-	XORL 52(SP), R9
-	XORL 28(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 20(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 20(SP), R9
-	MOVL R9, 276(R8)
-
-	// ROUND4(70)
-	// SHUFFLE
-	MOVL 24(SP), R9
-	XORL 12(SP), R9
-	XORL 56(SP), R9
-	XORL 32(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 24(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 24(SP), R9
-	MOVL R9, 280(R8)
-
-	// ROUND4(71)
-	// SHUFFLE
-	MOVL 28(SP), R9
-	XORL 16(SP), R9
-	XORL 60(SP), R9
-	XORL 36(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 28(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 28(SP), R9
-	MOVL R9, 284(R8)
-
-	// ROUND4(72)
-	// SHUFFLE
-	MOVL 32(SP), R9
-	XORL 20(SP), R9
-	XORL (SP), R9
-	XORL 40(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 32(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 32(SP), R9
-	MOVL R9, 288(R8)
-
-	// ROUND4(73)
-	// SHUFFLE
-	MOVL 36(SP), R9
-	XORL 24(SP), R9
-	XORL 4(SP), R9
-	XORL 44(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 36(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 36(SP), R9
-	MOVL R9, 292(R8)
-
-	// ROUND4(74)
-	// SHUFFLE
-	MOVL 40(SP), R9
-	XORL 28(SP), R9
-	XORL 8(SP), R9
-	XORL 48(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 40(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 40(SP), R9
-	MOVL R9, 296(R8)
-
-	// ROUND4(75)
-	// SHUFFLE
-	MOVL 44(SP), R9
-	XORL 32(SP), R9
-	XORL 12(SP), R9
-	XORL 52(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 44(SP)
-
-	// FUNC2
-	MOVL R11, R15
-	XORL R12, R15
-	XORL R13, R15
-
-	// MIX
-	ROLL $+30, R11
-	ADDL R15, R14
-	MOVL R10, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R14)(R9*1), R14
-	ADDL R8, R14
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 44(SP), R9
-	MOVL R9, 300(R8)
-
-	// ROUND4(76)
-	// SHUFFLE
-	MOVL 48(SP), R9
-	XORL 36(SP), R9
-	XORL 16(SP), R9
-	XORL 56(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 48(SP)
-
-	// FUNC2
-	MOVL R10, R15
-	XORL R11, R15
-	XORL R12, R15
-
-	// MIX
-	ROLL $+30, R10
-	ADDL R15, R13
-	MOVL R14, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R13)(R9*1), R13
-	ADDL R8, R13
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 48(SP), R9
-	MOVL R9, 304(R8)
-
-	// ROUND4(77)
-	// SHUFFLE
-	MOVL 52(SP), R9
-	XORL 40(SP), R9
-	XORL 20(SP), R9
-	XORL 60(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 52(SP)
-
-	// FUNC2
-	MOVL R14, R15
-	XORL R10, R15
-	XORL R11, R15
-
-	// MIX
-	ROLL $+30, R14
-	ADDL R15, R12
-	MOVL R13, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R12)(R9*1), R12
-	ADDL R8, R12
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 52(SP), R9
-	MOVL R9, 308(R8)
-
-	// ROUND4(78)
-	// SHUFFLE
-	MOVL 56(SP), R9
-	XORL 44(SP), R9
-	XORL 24(SP), R9
-	XORL (SP), R9
-	ROLL $+1, R9
-	MOVL R9, 56(SP)
-
-	// FUNC2
-	MOVL R13, R15
-	XORL R14, R15
-	XORL R10, R15
-
-	// MIX
-	ROLL $+30, R13
-	ADDL R15, R11
-	MOVL R12, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R11)(R9*1), R11
-	ADDL R8, R11
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 56(SP), R9
-	MOVL R9, 312(R8)
-
-	// ROUND4(79)
-	// SHUFFLE
-	MOVL 60(SP), R9
-	XORL 48(SP), R9
-	XORL 28(SP), R9
-	XORL 4(SP), R9
-	ROLL $+1, R9
-	MOVL R9, 60(SP)
-
-	// FUNC2
-	MOVL R12, R15
-	XORL R13, R15
-	XORL R14, R15
-
-	// MIX
-	ROLL $+30, R12
-	ADDL R15, R10
-	MOVL R11, R8
-	ROLL $+5, R8
-	LEAL 3395469782(R10)(R9*1), R10
-	ADDL R8, R10
-
-	// Load m1
-	MOVQ m1_base+32(FP), R8
-	MOVL 60(SP), R9
-	MOVL R9, 316(R8)
-
-	// Add registers to temp hash.
-	ADDL R10, AX
-	ADDL R11, BX
-	ADDL R12, CX
-	ADDL R13, DX
-	ADDL R14, BP
-	ADDQ $+64, DI
-	CMPQ DI, SI
-	JB   loop
-
-end:
-	MOVQ dig+0(FP), SI
-	MOVL AX, (SI)
-	MOVL BX, 4(SI)
-	MOVL CX, 8(SI)
-	MOVL DX, 12(SI)
-	MOVL BP, 16(SI)
-	RET
diff --git a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_generic.go b/vendor/github.com/pjbgf/sha1cd/sha1cdblock_generic.go
deleted file mode 100644
index ba8b96e87..000000000
--- a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_generic.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Originally from: https://github.com/go/blob/master/src/crypto/sha1/sha1block.go
-// It has been modified to support collision detection.
-
-package sha1cd
-
-import (
-	"fmt"
-	"math/bits"
-
-	shared "github.com/pjbgf/sha1cd/internal"
-	"github.com/pjbgf/sha1cd/ubc"
-)
-
-// blockGeneric is a portable, pure Go version of the SHA-1 block step.
-// It's used by sha1block_generic.go and tests.
-func blockGeneric(dig *digest, p []byte) {
-	var w [16]uint32
-
-	// cs stores the pre-step compression state for only the steps required for the
-	// collision detection, which are 0, 58 and 65.
-	// Refer to ubc/const.go for more details.
-	cs := [shared.PreStepState][shared.WordBuffers]uint32{}
-
-	h0, h1, h2, h3, h4 := dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4]
-	for len(p) >= shared.Chunk {
-		m1 := [shared.Rounds]uint32{}
-		hi := 1
-
-		// Collision attacks are thwarted by hashing a detected near-collision block 3 times.
-		// Think of it as extending SHA-1 from 80-steps to 240-steps for such blocks:
-		// 		The best collision attacks against SHA-1 have complexity about 2^60,
-		// 		thus for 240-steps an immediate lower-bound for the best cryptanalytic attacks would be 2^180.
-		// 		An attacker would be better off using a generic birthday search of complexity 2^80.
-	rehash:
-		a, b, c, d, e := h0, h1, h2, h3, h4
-
-		// Each of the four 20-iteration rounds
-		// differs only in the computation of f and
-		// the choice of K (K0, K1, etc).
-		i := 0
-
-		// Store pre-step compression state for the collision detection.
-		cs[0] = [shared.WordBuffers]uint32{a, b, c, d, e}
-
-		for ; i < 16; i++ {
-			// load step
-			j := i * 4
-			w[i] = uint32(p[j])<<24 | uint32(p[j+1])<<16 | uint32(p[j+2])<<8 | uint32(p[j+3])
-
-			f := b&c | (^b)&d
-			t := bits.RotateLeft32(a, 5) + f + e + w[i&0xf] + shared.K0
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-
-			// Store compression state for the collision detection.
-			m1[i] = w[i&0xf]
-		}
-		for ; i < 20; i++ {
-			tmp := w[(i-3)&0xf] ^ w[(i-8)&0xf] ^ w[(i-14)&0xf] ^ w[(i)&0xf]
-			w[i&0xf] = tmp<<1 | tmp>>(32-1)
-
-			f := b&c | (^b)&d
-			t := bits.RotateLeft32(a, 5) + f + e + w[i&0xf] + shared.K0
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-
-			// Store compression state for the collision detection.
-			m1[i] = w[i&0xf]
-		}
-		for ; i < 40; i++ {
-			tmp := w[(i-3)&0xf] ^ w[(i-8)&0xf] ^ w[(i-14)&0xf] ^ w[(i)&0xf]
-			w[i&0xf] = tmp<<1 | tmp>>(32-1)
-
-			f := b ^ c ^ d
-			t := bits.RotateLeft32(a, 5) + f + e + w[i&0xf] + shared.K1
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-
-			// Store compression state for the collision detection.
-			m1[i] = w[i&0xf]
-		}
-		for ; i < 60; i++ {
-			if i == 58 {
-				// Store pre-step compression state for the collision detection.
-				cs[1] = [shared.WordBuffers]uint32{a, b, c, d, e}
-			}
-
-			tmp := w[(i-3)&0xf] ^ w[(i-8)&0xf] ^ w[(i-14)&0xf] ^ w[(i)&0xf]
-			w[i&0xf] = tmp<<1 | tmp>>(32-1)
-
-			f := ((b | c) & d) | (b & c)
-			t := bits.RotateLeft32(a, 5) + f + e + w[i&0xf] + shared.K2
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-
-			// Store compression state for the collision detection.
-			m1[i] = w[i&0xf]
-		}
-		for ; i < 80; i++ {
-			if i == 65 {
-				// Store pre-step compression state for the collision detection.
-				cs[2] = [shared.WordBuffers]uint32{a, b, c, d, e}
-			}
-
-			tmp := w[(i-3)&0xf] ^ w[(i-8)&0xf] ^ w[(i-14)&0xf] ^ w[(i)&0xf]
-			w[i&0xf] = tmp<<1 | tmp>>(32-1)
-
-			f := b ^ c ^ d
-			t := bits.RotateLeft32(a, 5) + f + e + w[i&0xf] + shared.K3
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-
-			// Store compression state for the collision detection.
-			m1[i] = w[i&0xf]
-		}
-
-		h0 += a
-		h1 += b
-		h2 += c
-		h3 += d
-		h4 += e
-
-		if hi == 2 {
-			hi++
-			goto rehash
-		}
-
-		if hi == 1 {
-			col := checkCollision(m1, cs, [shared.WordBuffers]uint32{h0, h1, h2, h3, h4})
-			if col {
-				dig.col = true
-				hi++
-				goto rehash
-			}
-		}
-
-		p = p[shared.Chunk:]
-	}
-
-	dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4] = h0, h1, h2, h3, h4
-}
-
-func checkCollision(
-	m1 [shared.Rounds]uint32,
-	cs [shared.PreStepState][shared.WordBuffers]uint32,
-	state [shared.WordBuffers]uint32) bool {
-
-	if mask := ubc.CalculateDvMask(m1); mask != 0 {
-		dvs := ubc.SHA1_dvs()
-
-		for i := 0; dvs[i].DvType != 0; i++ {
-			if (mask & ((uint32)(1) << uint32(dvs[i].MaskB))) != 0 {
-				var csState [shared.WordBuffers]uint32
-				switch dvs[i].TestT {
-				case 58:
-					csState = cs[1]
-				case 65:
-					csState = cs[2]
-				case 0:
-					csState = cs[0]
-				default:
-					panic(fmt.Sprintf("dvs data is trying to use a testT that isn't available: %d", dvs[i].TestT))
-				}
-
-				col := hasCollided(
-					dvs[i].TestT, // testT is the step number
-					// m2 is a secondary message created XORing with
-					// ubc's DM prior to the SHA recompression step.
-					m1, dvs[i].Dm,
-					csState,
-					state)
-
-				if col {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
-func hasCollided(step uint32, m1, dm [shared.Rounds]uint32,
-	state [shared.WordBuffers]uint32, h [shared.WordBuffers]uint32) bool {
-	// Intermediary Hash Value.
-	ihv := [shared.WordBuffers]uint32{}
-
-	a, b, c, d, e := state[0], state[1], state[2], state[3], state[4]
-
-	// Walk backwards from current step to undo previous compression.
-	// The existing collision detection does not have dvs higher than 65,
-	// start value of i accordingly.
-	for i := uint32(64); i >= 60; i-- {
-		a, b, c, d, e = b, c, d, e, a
-		if step > i {
-			b = bits.RotateLeft32(b, -30)
-			f := b ^ c ^ d
-			e -= bits.RotateLeft32(a, 5) + f + shared.K3 + (m1[i] ^ dm[i]) // m2 = m1 ^ dm.
-		}
-	}
-	for i := uint32(59); i >= 40; i-- {
-		a, b, c, d, e = b, c, d, e, a
-		if step > i {
-			b = bits.RotateLeft32(b, -30)
-			f := ((b | c) & d) | (b & c)
-			e -= bits.RotateLeft32(a, 5) + f + shared.K2 + (m1[i] ^ dm[i])
-		}
-	}
-	for i := uint32(39); i >= 20; i-- {
-		a, b, c, d, e = b, c, d, e, a
-		if step > i {
-			b = bits.RotateLeft32(b, -30)
-			f := b ^ c ^ d
-			e -= bits.RotateLeft32(a, 5) + f + shared.K1 + (m1[i] ^ dm[i])
-		}
-	}
-	for i := uint32(20); i > 0; i-- {
-		j := i - 1
-		a, b, c, d, e = b, c, d, e, a
-		if step > j {
-			b = bits.RotateLeft32(b, -30) // undo the rotate left
-			f := b&c | (^b)&d
-			// subtract from e
-			e -= bits.RotateLeft32(a, 5) + f + shared.K0 + (m1[j] ^ dm[j])
-		}
-	}
-
-	ihv[0] = a
-	ihv[1] = b
-	ihv[2] = c
-	ihv[3] = d
-	ihv[4] = e
-	a = state[0]
-	b = state[1]
-	c = state[2]
-	d = state[3]
-	e = state[4]
-
-	// Recompress blocks based on the current step.
-	// The existing collision detection does not have dvs below 58, so they have been removed
-	// from the source code. If new dvs are added which target rounds below 40, that logic
-	// will need to be readded here.
-	for i := uint32(40); i < 60; i++ {
-		if step <= i {
-			f := ((b | c) & d) | (b & c)
-			t := bits.RotateLeft32(a, 5) + f + e + shared.K2 + (m1[i] ^ dm[i])
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-		}
-	}
-	for i := uint32(60); i < 80; i++ {
-		if step <= i {
-			f := b ^ c ^ d
-			t := bits.RotateLeft32(a, 5) + f + e + shared.K3 + (m1[i] ^ dm[i])
-			a, b, c, d, e = t, a, bits.RotateLeft32(b, 30), c, d
-		}
-	}
-
-	ihv[0] += a
-	ihv[1] += b
-	ihv[2] += c
-	ihv[3] += d
-	ihv[4] += e
-
-	if ((ihv[0] ^ h[0]) | (ihv[1] ^ h[1]) |
-		(ihv[2] ^ h[2]) | (ihv[3] ^ h[3]) | (ihv[4] ^ h[4])) == 0 {
-		return true
-	}
-
-	return false
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_noasm.go b/vendor/github.com/pjbgf/sha1cd/sha1cdblock_noasm.go
deleted file mode 100644
index 15bae5a7e..000000000
--- a/vendor/github.com/pjbgf/sha1cd/sha1cdblock_noasm.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build !amd64 || noasm || !gc
-// +build !amd64 noasm !gc
-
-package sha1cd
-
-func block(dig *digest, p []byte) {
-	blockGeneric(dig, p)
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/ubc/const.go b/vendor/github.com/pjbgf/sha1cd/ubc/const.go
deleted file mode 100644
index eac14f466..000000000
--- a/vendor/github.com/pjbgf/sha1cd/ubc/const.go
+++ /dev/null
@@ -1,624 +0,0 @@
-// Based on the C implementation from Marc Stevens and Dan Shumow.
-// https://github.com/cr-marcstevens/sha1collisiondetection
-
-package ubc
-
-const (
-	CheckSize = 80
-
-	DV_I_43_0_bit  = (uint32)(1 << 0)
-	DV_I_44_0_bit  = (uint32)(1 << 1)
-	DV_I_45_0_bit  = (uint32)(1 << 2)
-	DV_I_46_0_bit  = (uint32)(1 << 3)
-	DV_I_46_2_bit  = (uint32)(1 << 4)
-	DV_I_47_0_bit  = (uint32)(1 << 5)
-	DV_I_47_2_bit  = (uint32)(1 << 6)
-	DV_I_48_0_bit  = (uint32)(1 << 7)
-	DV_I_48_2_bit  = (uint32)(1 << 8)
-	DV_I_49_0_bit  = (uint32)(1 << 9)
-	DV_I_49_2_bit  = (uint32)(1 << 10)
-	DV_I_50_0_bit  = (uint32)(1 << 11)
-	DV_I_50_2_bit  = (uint32)(1 << 12)
-	DV_I_51_0_bit  = (uint32)(1 << 13)
-	DV_I_51_2_bit  = (uint32)(1 << 14)
-	DV_I_52_0_bit  = (uint32)(1 << 15)
-	DV_II_45_0_bit = (uint32)(1 << 16)
-	DV_II_46_0_bit = (uint32)(1 << 17)
-	DV_II_46_2_bit = (uint32)(1 << 18)
-	DV_II_47_0_bit = (uint32)(1 << 19)
-	DV_II_48_0_bit = (uint32)(1 << 20)
-	DV_II_49_0_bit = (uint32)(1 << 21)
-	DV_II_49_2_bit = (uint32)(1 << 22)
-	DV_II_50_0_bit = (uint32)(1 << 23)
-	DV_II_50_2_bit = (uint32)(1 << 24)
-	DV_II_51_0_bit = (uint32)(1 << 25)
-	DV_II_51_2_bit = (uint32)(1 << 26)
-	DV_II_52_0_bit = (uint32)(1 << 27)
-	DV_II_53_0_bit = (uint32)(1 << 28)
-	DV_II_54_0_bit = (uint32)(1 << 29)
-	DV_II_55_0_bit = (uint32)(1 << 30)
-	DV_II_56_0_bit = (uint32)(1 << 31)
-)
-
-// sha1_dvs contains a list of SHA-1 Disturbance Vectors (DV) which defines the
-// unavoidable bit conditions when a collision attack is in progress.
-var sha1_dvs = []DvInfo{
-	{
-		DvType: 1, DvK: 43, DvB: 0, TestT: 58, MaskI: 0, MaskB: 0,
-		Dm: [CheckSize]uint32{
-			0x08000000, 0x9800000c, 0xd8000010, 0x08000010, 0xb8000010, 0x98000000, 0x60000000,
-			0x00000008, 0xc0000000, 0x90000014, 0x10000010, 0xb8000014, 0x28000000, 0x20000010,
-			0x48000000, 0x08000018, 0x60000000, 0x90000010, 0xf0000010, 0x90000008, 0xc0000000,
-			0x90000010, 0xf0000010, 0xb0000008, 0x40000000, 0x90000000, 0xf0000010, 0x90000018,
-			0x60000000, 0x90000010, 0x90000010, 0x90000000, 0x80000000, 0x00000010, 0xa0000000,
-			0x20000000, 0xa0000000, 0x20000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010,
-			0x20000000, 0x00000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000040,
-			0x40000002, 0x80000004, 0x80000080, 0x80000006, 0x00000049, 0x00000103, 0x80000009,
-			0x80000012, 0x80000202, 0x00000018, 0x00000164, 0x00000408, 0x800000e6, 0x8000004c,
-			0x00000803, 0x80000161, 0x80000599},
-	}, {
-		DvType: 1, DvK: 44, DvB: 0, TestT: 58, MaskI: 0, MaskB: 1,
-		Dm: [CheckSize]uint32{
-			0xb4000008, 0x08000000, 0x9800000c, 0xd8000010, 0x08000010, 0xb8000010, 0x98000000,
-			0x60000000, 0x00000008, 0xc0000000, 0x90000014, 0x10000010, 0xb8000014, 0x28000000,
-			0x20000010, 0x48000000, 0x08000018, 0x60000000, 0x90000010, 0xf0000010, 0x90000008,
-			0xc0000000, 0x90000010, 0xf0000010, 0xb0000008, 0x40000000, 0x90000000, 0xf0000010,
-			0x90000018, 0x60000000, 0x90000010, 0x90000010, 0x90000000, 0x80000000, 0x00000010,
-			0xa0000000, 0x20000000, 0xa0000000, 0x20000010, 0x00000000, 0x20000010, 0x20000000,
-			0x00000010, 0x20000000, 0x00000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002,
-			0x40000040, 0x40000002, 0x80000004, 0x80000080, 0x80000006, 0x00000049, 0x00000103,
-			0x80000009, 0x80000012, 0x80000202, 0x00000018, 0x00000164, 0x00000408, 0x800000e6,
-			0x8000004c, 0x00000803, 0x80000161},
-	},
-	{
-		DvType: 1, DvK: 45, DvB: 0, TestT: 58, MaskI: 0, MaskB: 2,
-		Dm: [CheckSize]uint32{
-			0xf4000014, 0xb4000008, 0x08000000, 0x9800000c, 0xd8000010, 0x08000010, 0xb8000010,
-			0x98000000, 0x60000000, 0x00000008, 0xc0000000, 0x90000014, 0x10000010, 0xb8000014,
-			0x28000000, 0x20000010, 0x48000000, 0x08000018, 0x60000000, 0x90000010, 0xf0000010,
-			0x90000008, 0xc0000000, 0x90000010, 0xf0000010, 0xb0000008, 0x40000000, 0x90000000,
-			0xf0000010, 0x90000018, 0x60000000, 0x90000010, 0x90000010, 0x90000000, 0x80000000,
-			0x00000010, 0xa0000000, 0x20000000, 0xa0000000, 0x20000010, 0x00000000, 0x20000010,
-			0x20000000, 0x00000010, 0x20000000, 0x00000010, 0xa0000000, 0x00000000, 0x20000000,
-			0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001,
-			0x40000002, 0x40000040, 0x40000002, 0x80000004, 0x80000080, 0x80000006, 0x00000049,
-			0x00000103, 0x80000009, 0x80000012, 0x80000202, 0x00000018, 0x00000164, 0x00000408,
-			0x800000e6, 0x8000004c, 0x00000803},
-	},
-	{
-		DvType: 1, DvK: 46, DvB: 0, TestT: 58, MaskI: 0, MaskB: 3,
-		Dm: [CheckSize]uint32{
-			0x2c000010, 0xf4000014, 0xb4000008, 0x08000000, 0x9800000c, 0xd8000010, 0x08000010,
-			0xb8000010, 0x98000000, 0x60000000, 0x00000008, 0xc0000000, 0x90000014, 0x10000010,
-			0xb8000014, 0x28000000, 0x20000010, 0x48000000, 0x08000018, 0x60000000, 0x90000010,
-			0xf0000010, 0x90000008, 0xc0000000, 0x90000010, 0xf0000010, 0xb0000008, 0x40000000,
-			0x90000000, 0xf0000010, 0x90000018, 0x60000000, 0x90000010, 0x90000010, 0x90000000,
-			0x80000000, 0x00000010, 0xa0000000, 0x20000000, 0xa0000000, 0x20000010, 0x00000000,
-			0x20000010, 0x20000000, 0x00000010, 0x20000000, 0x00000010, 0xa0000000, 0x00000000,
-			0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020,
-			0x00000001, 0x40000002, 0x40000040, 0x40000002, 0x80000004, 0x80000080, 0x80000006,
-			0x00000049, 0x00000103, 0x80000009, 0x80000012, 0x80000202, 0x00000018, 0x00000164,
-			0x00000408, 0x800000e6, 0x8000004c},
-	},
-	{
-		DvType: 1, DvK: 46, DvB: 2, TestT: 58, MaskI: 0, MaskB: 4,
-		Dm: [CheckSize]uint32{
-			0xb0000040, 0xd0000053, 0xd0000022, 0x20000000, 0x60000032, 0x60000043,
-			0x20000040, 0xe0000042, 0x60000002, 0x80000001, 0x00000020, 0x00000003,
-			0x40000052, 0x40000040, 0xe0000052, 0xa0000000, 0x80000040, 0x20000001,
-			0x20000060, 0x80000001, 0x40000042, 0xc0000043, 0x40000022, 0x00000003,
-			0x40000042, 0xc0000043, 0xc0000022, 0x00000001, 0x40000002, 0xc0000043,
-			0x40000062, 0x80000001, 0x40000042, 0x40000042, 0x40000002, 0x00000002,
-			0x00000040, 0x80000002, 0x80000000, 0x80000002, 0x80000040, 0x00000000,
-			0x80000040, 0x80000000, 0x00000040, 0x80000000, 0x00000040, 0x80000002,
-			0x00000000, 0x80000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000004, 0x00000080, 0x00000004, 0x00000009, 0x00000101,
-			0x00000009, 0x00000012, 0x00000202, 0x0000001a, 0x00000124, 0x0000040c,
-			0x00000026, 0x0000004a, 0x0000080a, 0x00000060, 0x00000590, 0x00001020,
-			0x0000039a, 0x00000132},
-	},
-	{
-		DvType: 1, DvK: 47, DvB: 0, TestT: 58, MaskI: 0, MaskB: 5,
-		Dm: [CheckSize]uint32{
-			0xc8000010, 0x2c000010, 0xf4000014, 0xb4000008, 0x08000000, 0x9800000c,
-			0xd8000010, 0x08000010, 0xb8000010, 0x98000000, 0x60000000, 0x00000008,
-			0xc0000000, 0x90000014, 0x10000010, 0xb8000014, 0x28000000, 0x20000010,
-			0x48000000, 0x08000018, 0x60000000, 0x90000010, 0xf0000010, 0x90000008,
-			0xc0000000, 0x90000010, 0xf0000010, 0xb0000008, 0x40000000, 0x90000000,
-			0xf0000010, 0x90000018, 0x60000000, 0x90000010, 0x90000010, 0x90000000,
-			0x80000000, 0x00000010, 0xa0000000, 0x20000000, 0xa0000000, 0x20000010,
-			0x00000000, 0x20000010, 0x20000000, 0x00000010, 0x20000000, 0x00000010,
-			0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002,
-			0x40000040, 0x40000002, 0x80000004, 0x80000080, 0x80000006, 0x00000049,
-			0x00000103, 0x80000009, 0x80000012, 0x80000202, 0x00000018, 0x00000164,
-			0x00000408, 0x800000e6},
-	},
-	{
-		DvType: 1, DvK: 47, DvB: 2, TestT: 58, MaskI: 0, MaskB: 6,
-		Dm: [CheckSize]uint32{
-			0x20000043, 0xb0000040, 0xd0000053, 0xd0000022, 0x20000000, 0x60000032,
-			0x60000043, 0x20000040, 0xe0000042, 0x60000002, 0x80000001, 0x00000020,
-			0x00000003, 0x40000052, 0x40000040, 0xe0000052, 0xa0000000, 0x80000040,
-			0x20000001, 0x20000060, 0x80000001, 0x40000042, 0xc0000043, 0x40000022,
-			0x00000003, 0x40000042, 0xc0000043, 0xc0000022, 0x00000001, 0x40000002,
-			0xc0000043, 0x40000062, 0x80000001, 0x40000042, 0x40000042, 0x40000002,
-			0x00000002, 0x00000040, 0x80000002, 0x80000000, 0x80000002, 0x80000040,
-			0x00000000, 0x80000040, 0x80000000, 0x00000040, 0x80000000, 0x00000040,
-			0x80000002, 0x00000000, 0x80000000, 0x80000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000004, 0x00000080, 0x00000004, 0x00000009,
-			0x00000101, 0x00000009, 0x00000012, 0x00000202, 0x0000001a, 0x00000124,
-			0x0000040c, 0x00000026, 0x0000004a, 0x0000080a, 0x00000060, 0x00000590,
-			0x00001020, 0x0000039a,
-		},
-	},
-	{
-		DvType: 1, DvK: 48, DvB: 0, TestT: 58, MaskI: 0, MaskB: 7,
-		Dm: [CheckSize]uint32{
-			0xb800000a, 0xc8000010, 0x2c000010, 0xf4000014, 0xb4000008, 0x08000000,
-			0x9800000c, 0xd8000010, 0x08000010, 0xb8000010, 0x98000000, 0x60000000,
-			0x00000008, 0xc0000000, 0x90000014, 0x10000010, 0xb8000014, 0x28000000,
-			0x20000010, 0x48000000, 0x08000018, 0x60000000, 0x90000010, 0xf0000010,
-			0x90000008, 0xc0000000, 0x90000010, 0xf0000010, 0xb0000008, 0x40000000,
-			0x90000000, 0xf0000010, 0x90000018, 0x60000000, 0x90000010, 0x90000010,
-			0x90000000, 0x80000000, 0x00000010, 0xa0000000, 0x20000000, 0xa0000000,
-			0x20000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010, 0x20000000,
-			0x00000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001,
-			0x40000002, 0x40000040, 0x40000002, 0x80000004, 0x80000080, 0x80000006,
-			0x00000049, 0x00000103, 0x80000009, 0x80000012, 0x80000202, 0x00000018,
-			0x00000164, 0x00000408,
-		},
-	},
-	{
-		DvType: 1, DvK: 48, DvB: 2, TestT: 58, MaskI: 0, MaskB: 8,
-		Dm: [CheckSize]uint32{
-			0xe000002a, 0x20000043, 0xb0000040, 0xd0000053, 0xd0000022, 0x20000000,
-			0x60000032, 0x60000043, 0x20000040, 0xe0000042, 0x60000002, 0x80000001,
-			0x00000020, 0x00000003, 0x40000052, 0x40000040, 0xe0000052, 0xa0000000,
-			0x80000040, 0x20000001, 0x20000060, 0x80000001, 0x40000042, 0xc0000043,
-			0x40000022, 0x00000003, 0x40000042, 0xc0000043, 0xc0000022, 0x00000001,
-			0x40000002, 0xc0000043, 0x40000062, 0x80000001, 0x40000042, 0x40000042,
-			0x40000002, 0x00000002, 0x00000040, 0x80000002, 0x80000000, 0x80000002,
-			0x80000040, 0x00000000, 0x80000040, 0x80000000, 0x00000040, 0x80000000,
-			0x00000040, 0x80000002, 0x00000000, 0x80000000, 0x80000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000080, 0x00000004,
-			0x00000009, 0x00000101, 0x00000009, 0x00000012, 0x00000202, 0x0000001a,
-			0x00000124, 0x0000040c, 0x00000026, 0x0000004a, 0x0000080a, 0x00000060,
-			0x00000590, 0x00001020},
-	},
-	{
-		DvType: 1, DvK: 49, DvB: 0, TestT: 58, MaskI: 0, MaskB: 9,
-		Dm: [CheckSize]uint32{
-			0x18000000, 0xb800000a, 0xc8000010, 0x2c000010, 0xf4000014, 0xb4000008,
-			0x08000000, 0x9800000c, 0xd8000010, 0x08000010, 0xb8000010, 0x98000000,
-			0x60000000, 0x00000008, 0xc0000000, 0x90000014, 0x10000010, 0xb8000014,
-			0x28000000, 0x20000010, 0x48000000, 0x08000018, 0x60000000, 0x90000010,
-			0xf0000010, 0x90000008, 0xc0000000, 0x90000010, 0xf0000010, 0xb0000008,
-			0x40000000, 0x90000000, 0xf0000010, 0x90000018, 0x60000000, 0x90000010,
-			0x90000010, 0x90000000, 0x80000000, 0x00000010, 0xa0000000, 0x20000000,
-			0xa0000000, 0x20000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010,
-			0x20000000, 0x00000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020,
-			0x00000001, 0x40000002, 0x40000040, 0x40000002, 0x80000004, 0x80000080,
-			0x80000006, 0x00000049, 0x00000103, 0x80000009, 0x80000012, 0x80000202,
-			0x00000018, 0x00000164},
-	},
-	{
-		DvType: 1, DvK: 49, DvB: 2, TestT: 58, MaskI: 0, MaskB: 10,
-		Dm: [CheckSize]uint32{
-			0x60000000, 0xe000002a, 0x20000043, 0xb0000040, 0xd0000053, 0xd0000022,
-			0x20000000, 0x60000032, 0x60000043, 0x20000040, 0xe0000042, 0x60000002,
-			0x80000001, 0x00000020, 0x00000003, 0x40000052, 0x40000040, 0xe0000052,
-			0xa0000000, 0x80000040, 0x20000001, 0x20000060, 0x80000001, 0x40000042,
-			0xc0000043, 0x40000022, 0x00000003, 0x40000042, 0xc0000043, 0xc0000022,
-			0x00000001, 0x40000002, 0xc0000043, 0x40000062, 0x80000001, 0x40000042,
-			0x40000042, 0x40000002, 0x00000002, 0x00000040, 0x80000002, 0x80000000,
-			0x80000002, 0x80000040, 0x00000000, 0x80000040, 0x80000000, 0x00000040,
-			0x80000000, 0x00000040, 0x80000002, 0x00000000, 0x80000000, 0x80000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000080,
-			0x00000004, 0x00000009, 0x00000101, 0x00000009, 0x00000012, 0x00000202,
-			0x0000001a, 0x00000124, 0x0000040c, 0x00000026, 0x0000004a, 0x0000080a,
-			0x00000060, 0x00000590},
-	},
-	{
-		DvType: 1, DvK: 50, DvB: 0, TestT: 65, MaskI: 0, MaskB: 11,
-		Dm: [CheckSize]uint32{
-			0x0800000c, 0x18000000, 0xb800000a, 0xc8000010, 0x2c000010, 0xf4000014,
-			0xb4000008, 0x08000000, 0x9800000c, 0xd8000010, 0x08000010, 0xb8000010,
-			0x98000000, 0x60000000, 0x00000008, 0xc0000000, 0x90000014, 0x10000010,
-			0xb8000014, 0x28000000, 0x20000010, 0x48000000, 0x08000018, 0x60000000,
-			0x90000010, 0xf0000010, 0x90000008, 0xc0000000, 0x90000010, 0xf0000010,
-			0xb0000008, 0x40000000, 0x90000000, 0xf0000010, 0x90000018, 0x60000000,
-			0x90000010, 0x90000010, 0x90000000, 0x80000000, 0x00000010, 0xa0000000,
-			0x20000000, 0xa0000000, 0x20000010, 0x00000000, 0x20000010, 0x20000000,
-			0x00000010, 0x20000000, 0x00000010, 0xa0000000, 0x00000000, 0x20000000,
-			0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
-			0x00000020, 0x00000001, 0x40000002, 0x40000040, 0x40000002, 0x80000004,
-			0x80000080, 0x80000006, 0x00000049, 0x00000103, 0x80000009, 0x80000012,
-			0x80000202, 0x00000018,
-		},
-	},
-	{
-		DvType: 1, DvK: 50, DvB: 2, TestT: 65, MaskI: 0, MaskB: 12,
-		Dm: [CheckSize]uint32{
-			0x20000030, 0x60000000, 0xe000002a, 0x20000043, 0xb0000040, 0xd0000053,
-			0xd0000022, 0x20000000, 0x60000032, 0x60000043, 0x20000040, 0xe0000042,
-			0x60000002, 0x80000001, 0x00000020, 0x00000003, 0x40000052, 0x40000040,
-			0xe0000052, 0xa0000000, 0x80000040, 0x20000001, 0x20000060, 0x80000001,
-			0x40000042, 0xc0000043, 0x40000022, 0x00000003, 0x40000042, 0xc0000043,
-			0xc0000022, 0x00000001, 0x40000002, 0xc0000043, 0x40000062, 0x80000001,
-			0x40000042, 0x40000042, 0x40000002, 0x00000002, 0x00000040, 0x80000002,
-			0x80000000, 0x80000002, 0x80000040, 0x00000000, 0x80000040, 0x80000000,
-			0x00000040, 0x80000000, 0x00000040, 0x80000002, 0x00000000, 0x80000000,
-			0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004,
-			0x00000080, 0x00000004, 0x00000009, 0x00000101, 0x00000009, 0x00000012,
-			0x00000202, 0x0000001a, 0x00000124, 0x0000040c, 0x00000026, 0x0000004a,
-			0x0000080a, 0x00000060},
-	},
-	{
-		DvType: 1, DvK: 51, DvB: 0, TestT: 65, MaskI: 0, MaskB: 13,
-		Dm: [CheckSize]uint32{
-			0xe8000000, 0x0800000c, 0x18000000, 0xb800000a, 0xc8000010, 0x2c000010,
-			0xf4000014, 0xb4000008, 0x08000000, 0x9800000c, 0xd8000010, 0x08000010,
-			0xb8000010, 0x98000000, 0x60000000, 0x00000008, 0xc0000000, 0x90000014,
-			0x10000010, 0xb8000014, 0x28000000, 0x20000010, 0x48000000, 0x08000018,
-			0x60000000, 0x90000010, 0xf0000010, 0x90000008, 0xc0000000, 0x90000010,
-			0xf0000010, 0xb0000008, 0x40000000, 0x90000000, 0xf0000010, 0x90000018,
-			0x60000000, 0x90000010, 0x90000010, 0x90000000, 0x80000000, 0x00000010,
-			0xa0000000, 0x20000000, 0xa0000000, 0x20000010, 0x00000000, 0x20000010,
-			0x20000000, 0x00000010, 0x20000000, 0x00000010, 0xa0000000, 0x00000000,
-			0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000040, 0x40000002,
-			0x80000004, 0x80000080, 0x80000006, 0x00000049, 0x00000103, 0x80000009,
-			0x80000012, 0x80000202},
-	},
-	{
-		DvType: 1, DvK: 51, DvB: 2, TestT: 65, MaskI: 0, MaskB: 14,
-		Dm: [CheckSize]uint32{
-			0xa0000003, 0x20000030, 0x60000000, 0xe000002a, 0x20000043, 0xb0000040,
-			0xd0000053, 0xd0000022, 0x20000000, 0x60000032, 0x60000043, 0x20000040,
-			0xe0000042, 0x60000002, 0x80000001, 0x00000020, 0x00000003, 0x40000052,
-			0x40000040, 0xe0000052, 0xa0000000, 0x80000040, 0x20000001, 0x20000060,
-			0x80000001, 0x40000042, 0xc0000043, 0x40000022, 0x00000003, 0x40000042,
-			0xc0000043, 0xc0000022, 0x00000001, 0x40000002, 0xc0000043, 0x40000062,
-			0x80000001, 0x40000042, 0x40000042, 0x40000002, 0x00000002, 0x00000040,
-			0x80000002, 0x80000000, 0x80000002, 0x80000040, 0x00000000, 0x80000040,
-			0x80000000, 0x00000040, 0x80000000, 0x00000040, 0x80000002, 0x00000000,
-			0x80000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000004, 0x00000080, 0x00000004, 0x00000009, 0x00000101, 0x00000009,
-			0x00000012, 0x00000202, 0x0000001a, 0x00000124, 0x0000040c, 0x00000026,
-			0x0000004a, 0x0000080a},
-	},
-	{
-		DvType: 1, DvK: 52, DvB: 0, TestT: 65, MaskI: 0, MaskB: 15,
-		Dm: [CheckSize]uint32{
-			0x04000010, 0xe8000000, 0x0800000c, 0x18000000, 0xb800000a, 0xc8000010,
-			0x2c000010, 0xf4000014, 0xb4000008, 0x08000000, 0x9800000c, 0xd8000010,
-			0x08000010, 0xb8000010, 0x98000000, 0x60000000, 0x00000008, 0xc0000000,
-			0x90000014, 0x10000010, 0xb8000014, 0x28000000, 0x20000010, 0x48000000,
-			0x08000018, 0x60000000, 0x90000010, 0xf0000010, 0x90000008, 0xc0000000,
-			0x90000010, 0xf0000010, 0xb0000008, 0x40000000, 0x90000000, 0xf0000010,
-			0x90000018, 0x60000000, 0x90000010, 0x90000010, 0x90000000, 0x80000000,
-			0x00000010, 0xa0000000, 0x20000000, 0xa0000000, 0x20000010, 0x00000000,
-			0x20000010, 0x20000000, 0x00000010, 0x20000000, 0x00000010, 0xa0000000,
-			0x00000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000040,
-			0x40000002, 0x80000004, 0x80000080, 0x80000006, 0x00000049, 0x00000103,
-			0x80000009, 0x80000012},
-	},
-	{
-		DvType: 2, DvK: 45, DvB: 0, TestT: 58, MaskI: 0, MaskB: 16,
-		Dm: [CheckSize]uint32{
-			0xec000014, 0x0c000002, 0xc0000010, 0xb400001c, 0x2c000004, 0xbc000018,
-			0xb0000010, 0x0000000c, 0xb8000010, 0x08000018, 0x78000010, 0x08000014,
-			0x70000010, 0xb800001c, 0xe8000000, 0xb0000004, 0x58000010, 0xb000000c,
-			0x48000000, 0xb0000000, 0xb8000010, 0x98000010, 0xa0000000, 0x00000000,
-			0x00000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010,
-			0x20000000, 0x00000010, 0x60000000, 0x00000018, 0xe0000000, 0x90000000,
-			0x30000010, 0xb0000000, 0x20000000, 0x20000000, 0xa0000000, 0x00000010,
-			0x80000000, 0x20000000, 0x20000000, 0x20000000, 0x80000000, 0x00000010,
-			0x00000000, 0x20000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000041, 0x40000022,
-			0x80000005, 0xc0000082, 0xc0000046, 0x4000004b, 0x80000107, 0x00000089,
-			0x00000014, 0x8000024b, 0x0000011b, 0x8000016d, 0x8000041a, 0x000002e4,
-			0x80000054, 0x00000967},
-	},
-	{
-		DvType: 2, DvK: 46, DvB: 0, TestT: 58, MaskI: 0, MaskB: 17,
-		Dm: [CheckSize]uint32{
-			0x2400001c, 0xec000014, 0x0c000002, 0xc0000010, 0xb400001c, 0x2c000004,
-			0xbc000018, 0xb0000010, 0x0000000c, 0xb8000010, 0x08000018, 0x78000010,
-			0x08000014, 0x70000010, 0xb800001c, 0xe8000000, 0xb0000004, 0x58000010,
-			0xb000000c, 0x48000000, 0xb0000000, 0xb8000010, 0x98000010, 0xa0000000,
-			0x00000000, 0x00000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000,
-			0x20000010, 0x20000000, 0x00000010, 0x60000000, 0x00000018, 0xe0000000,
-			0x90000000, 0x30000010, 0xb0000000, 0x20000000, 0x20000000, 0xa0000000,
-			0x00000010, 0x80000000, 0x20000000, 0x20000000, 0x20000000, 0x80000000,
-			0x00000010, 0x00000000, 0x20000010, 0xa0000000, 0x00000000, 0x20000000,
-			0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000041,
-			0x40000022, 0x80000005, 0xc0000082, 0xc0000046, 0x4000004b, 0x80000107,
-			0x00000089, 0x00000014, 0x8000024b, 0x0000011b, 0x8000016d, 0x8000041a,
-			0x000002e4, 0x80000054},
-	},
-	{
-		DvType: 2, DvK: 46, DvB: 2, TestT: 58, MaskI: 0, MaskB: 18,
-		Dm: [CheckSize]uint32{
-			0x90000070, 0xb0000053, 0x30000008, 0x00000043, 0xd0000072, 0xb0000010,
-			0xf0000062, 0xc0000042, 0x00000030, 0xe0000042, 0x20000060, 0xe0000041,
-			0x20000050, 0xc0000041, 0xe0000072, 0xa0000003, 0xc0000012, 0x60000041,
-			0xc0000032, 0x20000001, 0xc0000002, 0xe0000042, 0x60000042, 0x80000002,
-			0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000040, 0x00000000,
-			0x80000040, 0x80000000, 0x00000040, 0x80000001, 0x00000060, 0x80000003,
-			0x40000002, 0xc0000040, 0xc0000002, 0x80000000, 0x80000000, 0x80000002,
-			0x00000040, 0x00000002, 0x80000000, 0x80000000, 0x80000000, 0x00000002,
-			0x00000040, 0x00000000, 0x80000040, 0x80000002, 0x00000000, 0x80000000,
-			0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000004, 0x00000080, 0x00000004, 0x00000009, 0x00000105,
-			0x00000089, 0x00000016, 0x0000020b, 0x0000011b, 0x0000012d, 0x0000041e,
-			0x00000224, 0x00000050, 0x0000092e, 0x0000046c, 0x000005b6, 0x0000106a,
-			0x00000b90, 0x00000152},
-	},
-	{
-		DvType: 2, DvK: 47, DvB: 0, TestT: 58, MaskI: 0, MaskB: 19,
-		Dm: [CheckSize]uint32{
-			0x20000010, 0x2400001c, 0xec000014, 0x0c000002, 0xc0000010, 0xb400001c,
-			0x2c000004, 0xbc000018, 0xb0000010, 0x0000000c, 0xb8000010, 0x08000018,
-			0x78000010, 0x08000014, 0x70000010, 0xb800001c, 0xe8000000, 0xb0000004,
-			0x58000010, 0xb000000c, 0x48000000, 0xb0000000, 0xb8000010, 0x98000010,
-			0xa0000000, 0x00000000, 0x00000000, 0x20000000, 0x80000000, 0x00000010,
-			0x00000000, 0x20000010, 0x20000000, 0x00000010, 0x60000000, 0x00000018,
-			0xe0000000, 0x90000000, 0x30000010, 0xb0000000, 0x20000000, 0x20000000,
-			0xa0000000, 0x00000010, 0x80000000, 0x20000000, 0x20000000, 0x20000000,
-			0x80000000, 0x00000010, 0x00000000, 0x20000010, 0xa0000000, 0x00000000,
-			0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002,
-			0x40000041, 0x40000022, 0x80000005, 0xc0000082, 0xc0000046, 0x4000004b,
-			0x80000107, 0x00000089, 0x00000014, 0x8000024b, 0x0000011b, 0x8000016d,
-			0x8000041a, 0x000002e4},
-	},
-	{
-		DvType: 2, DvK: 48, DvB: 0, TestT: 58, MaskI: 0, MaskB: 20,
-		Dm: [CheckSize]uint32{
-			0xbc00001a, 0x20000010, 0x2400001c, 0xec000014, 0x0c000002, 0xc0000010,
-			0xb400001c, 0x2c000004, 0xbc000018, 0xb0000010, 0x0000000c, 0xb8000010,
-			0x08000018, 0x78000010, 0x08000014, 0x70000010, 0xb800001c, 0xe8000000,
-			0xb0000004, 0x58000010, 0xb000000c, 0x48000000, 0xb0000000, 0xb8000010,
-			0x98000010, 0xa0000000, 0x00000000, 0x00000000, 0x20000000, 0x80000000,
-			0x00000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010, 0x60000000,
-			0x00000018, 0xe0000000, 0x90000000, 0x30000010, 0xb0000000, 0x20000000,
-			0x20000000, 0xa0000000, 0x00000010, 0x80000000, 0x20000000, 0x20000000,
-			0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010, 0xa0000000,
-			0x00000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001,
-			0x40000002, 0x40000041, 0x40000022, 0x80000005, 0xc0000082, 0xc0000046,
-			0x4000004b, 0x80000107, 0x00000089, 0x00000014, 0x8000024b, 0x0000011b,
-			0x8000016d, 0x8000041a},
-	},
-	{
-		DvType: 2, DvK: 49, DvB: 0, TestT: 58, MaskI: 0, MaskB: 21,
-		Dm: [CheckSize]uint32{
-			0x3c000004, 0xbc00001a, 0x20000010, 0x2400001c, 0xec000014, 0x0c000002,
-			0xc0000010, 0xb400001c, 0x2c000004, 0xbc000018, 0xb0000010, 0x0000000c,
-			0xb8000010, 0x08000018, 0x78000010, 0x08000014, 0x70000010, 0xb800001c,
-			0xe8000000, 0xb0000004, 0x58000010, 0xb000000c, 0x48000000, 0xb0000000,
-			0xb8000010, 0x98000010, 0xa0000000, 0x00000000, 0x00000000, 0x20000000,
-			0x80000000, 0x00000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010,
-			0x60000000, 0x00000018, 0xe0000000, 0x90000000, 0x30000010, 0xb0000000,
-			0x20000000, 0x20000000, 0xa0000000, 0x00000010, 0x80000000, 0x20000000,
-			0x20000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010,
-			0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020,
-			0x00000001, 0x40000002, 0x40000041, 0x40000022, 0x80000005, 0xc0000082,
-			0xc0000046, 0x4000004b, 0x80000107, 0x00000089, 0x00000014, 0x8000024b,
-			0x0000011b, 0x8000016d},
-	},
-	{
-		DvType: 2, DvK: 49, DvB: 2, TestT: 58, MaskI: 0, MaskB: 22,
-		Dm: [CheckSize]uint32{
-			0xf0000010, 0xf000006a, 0x80000040, 0x90000070, 0xb0000053, 0x30000008,
-			0x00000043, 0xd0000072, 0xb0000010, 0xf0000062, 0xc0000042, 0x00000030,
-			0xe0000042, 0x20000060, 0xe0000041, 0x20000050, 0xc0000041, 0xe0000072,
-			0xa0000003, 0xc0000012, 0x60000041, 0xc0000032, 0x20000001, 0xc0000002,
-			0xe0000042, 0x60000042, 0x80000002, 0x00000000, 0x00000000, 0x80000000,
-			0x00000002, 0x00000040, 0x00000000, 0x80000040, 0x80000000, 0x00000040,
-			0x80000001, 0x00000060, 0x80000003, 0x40000002, 0xc0000040, 0xc0000002,
-			0x80000000, 0x80000000, 0x80000002, 0x00000040, 0x00000002, 0x80000000,
-			0x80000000, 0x80000000, 0x00000002, 0x00000040, 0x00000000, 0x80000040,
-			0x80000002, 0x00000000, 0x80000000, 0x80000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000080,
-			0x00000004, 0x00000009, 0x00000105, 0x00000089, 0x00000016, 0x0000020b,
-			0x0000011b, 0x0000012d, 0x0000041e, 0x00000224, 0x00000050, 0x0000092e,
-			0x0000046c, 0x000005b6},
-	},
-	{
-		DvType: 2, DvK: 50, DvB: 0, TestT: 65, MaskI: 0, MaskB: 23,
-		Dm: [CheckSize]uint32{
-			0xb400001c, 0x3c000004, 0xbc00001a, 0x20000010, 0x2400001c, 0xec000014,
-			0x0c000002, 0xc0000010, 0xb400001c, 0x2c000004, 0xbc000018, 0xb0000010,
-			0x0000000c, 0xb8000010, 0x08000018, 0x78000010, 0x08000014, 0x70000010,
-			0xb800001c, 0xe8000000, 0xb0000004, 0x58000010, 0xb000000c, 0x48000000,
-			0xb0000000, 0xb8000010, 0x98000010, 0xa0000000, 0x00000000, 0x00000000,
-			0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010, 0x20000000,
-			0x00000010, 0x60000000, 0x00000018, 0xe0000000, 0x90000000, 0x30000010,
-			0xb0000000, 0x20000000, 0x20000000, 0xa0000000, 0x00000010, 0x80000000,
-			0x20000000, 0x20000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000,
-			0x20000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
-			0x00000020, 0x00000001, 0x40000002, 0x40000041, 0x40000022, 0x80000005,
-			0xc0000082, 0xc0000046, 0x4000004b, 0x80000107, 0x00000089, 0x00000014,
-			0x8000024b, 0x0000011b},
-	},
-	{
-		DvType: 2, DvK: 50, DvB: 2, TestT: 65, MaskI: 0, MaskB: 24,
-		Dm: [CheckSize]uint32{
-			0xd0000072, 0xf0000010, 0xf000006a, 0x80000040, 0x90000070, 0xb0000053,
-			0x30000008, 0x00000043, 0xd0000072, 0xb0000010, 0xf0000062, 0xc0000042,
-			0x00000030, 0xe0000042, 0x20000060, 0xe0000041, 0x20000050, 0xc0000041,
-			0xe0000072, 0xa0000003, 0xc0000012, 0x60000041, 0xc0000032, 0x20000001,
-			0xc0000002, 0xe0000042, 0x60000042, 0x80000002, 0x00000000, 0x00000000,
-			0x80000000, 0x00000002, 0x00000040, 0x00000000, 0x80000040, 0x80000000,
-			0x00000040, 0x80000001, 0x00000060, 0x80000003, 0x40000002, 0xc0000040,
-			0xc0000002, 0x80000000, 0x80000000, 0x80000002, 0x00000040, 0x00000002,
-			0x80000000, 0x80000000, 0x80000000, 0x00000002, 0x00000040, 0x00000000,
-			0x80000040, 0x80000002, 0x00000000, 0x80000000, 0x80000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004,
-			0x00000080, 0x00000004, 0x00000009, 0x00000105, 0x00000089, 0x00000016,
-			0x0000020b, 0x0000011b, 0x0000012d, 0x0000041e, 0x00000224, 0x00000050,
-			0x0000092e, 0x0000046c},
-	},
-	{
-		DvType: 2, DvK: 51, DvB: 0, TestT: 65, MaskI: 0, MaskB: 25,
-		Dm: [CheckSize]uint32{
-			0xc0000010, 0xb400001c, 0x3c000004, 0xbc00001a, 0x20000010, 0x2400001c,
-			0xec000014, 0x0c000002, 0xc0000010, 0xb400001c, 0x2c000004, 0xbc000018,
-			0xb0000010, 0x0000000c, 0xb8000010, 0x08000018, 0x78000010, 0x08000014,
-			0x70000010, 0xb800001c, 0xe8000000, 0xb0000004, 0x58000010, 0xb000000c,
-			0x48000000, 0xb0000000, 0xb8000010, 0x98000010, 0xa0000000, 0x00000000,
-			0x00000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010,
-			0x20000000, 0x00000010, 0x60000000, 0x00000018, 0xe0000000, 0x90000000,
-			0x30000010, 0xb0000000, 0x20000000, 0x20000000, 0xa0000000, 0x00000010,
-			0x80000000, 0x20000000, 0x20000000, 0x20000000, 0x80000000, 0x00000010,
-			0x00000000, 0x20000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000041, 0x40000022,
-			0x80000005, 0xc0000082, 0xc0000046, 0x4000004b, 0x80000107, 0x00000089,
-			0x00000014, 0x8000024b},
-	},
-	{
-		DvType: 2, DvK: 51, DvB: 2, TestT: 65, MaskI: 0, MaskB: 26,
-		Dm: [CheckSize]uint32{
-			0x00000043, 0xd0000072, 0xf0000010, 0xf000006a, 0x80000040, 0x90000070,
-			0xb0000053, 0x30000008, 0x00000043, 0xd0000072, 0xb0000010, 0xf0000062,
-			0xc0000042, 0x00000030, 0xe0000042, 0x20000060, 0xe0000041, 0x20000050,
-			0xc0000041, 0xe0000072, 0xa0000003, 0xc0000012, 0x60000041, 0xc0000032,
-			0x20000001, 0xc0000002, 0xe0000042, 0x60000042, 0x80000002, 0x00000000,
-			0x00000000, 0x80000000, 0x00000002, 0x00000040, 0x00000000, 0x80000040,
-			0x80000000, 0x00000040, 0x80000001, 0x00000060, 0x80000003, 0x40000002,
-			0xc0000040, 0xc0000002, 0x80000000, 0x80000000, 0x80000002, 0x00000040,
-			0x00000002, 0x80000000, 0x80000000, 0x80000000, 0x00000002, 0x00000040,
-			0x00000000, 0x80000040, 0x80000002, 0x00000000, 0x80000000, 0x80000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000004, 0x00000080, 0x00000004, 0x00000009, 0x00000105, 0x00000089,
-			0x00000016, 0x0000020b, 0x0000011b, 0x0000012d, 0x0000041e, 0x00000224,
-			0x00000050, 0x0000092e},
-	},
-	{
-		DvType: 2, DvK: 52, DvB: 0, TestT: 65, MaskI: 0, MaskB: 27,
-		Dm: [CheckSize]uint32{
-			0x0c000002, 0xc0000010, 0xb400001c, 0x3c000004, 0xbc00001a, 0x20000010,
-			0x2400001c, 0xec000014, 0x0c000002, 0xc0000010, 0xb400001c, 0x2c000004,
-			0xbc000018, 0xb0000010, 0x0000000c, 0xb8000010, 0x08000018, 0x78000010,
-			0x08000014, 0x70000010, 0xb800001c, 0xe8000000, 0xb0000004, 0x58000010,
-			0xb000000c, 0x48000000, 0xb0000000, 0xb8000010, 0x98000010, 0xa0000000,
-			0x00000000, 0x00000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000,
-			0x20000010, 0x20000000, 0x00000010, 0x60000000, 0x00000018, 0xe0000000,
-			0x90000000, 0x30000010, 0xb0000000, 0x20000000, 0x20000000, 0xa0000000,
-			0x00000010, 0x80000000, 0x20000000, 0x20000000, 0x20000000, 0x80000000,
-			0x00000010, 0x00000000, 0x20000010, 0xa0000000, 0x00000000, 0x20000000,
-			0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002, 0x40000041,
-			0x40000022, 0x80000005, 0xc0000082, 0xc0000046, 0x4000004b, 0x80000107,
-			0x00000089, 0x00000014},
-	},
-	{
-		DvType: 2, DvK: 53, DvB: 0, TestT: 65, MaskI: 0, MaskB: 28,
-		Dm: [CheckSize]uint32{
-			0xcc000014, 0x0c000002, 0xc0000010, 0xb400001c, 0x3c000004, 0xbc00001a,
-			0x20000010, 0x2400001c, 0xec000014, 0x0c000002, 0xc0000010, 0xb400001c,
-			0x2c000004, 0xbc000018, 0xb0000010, 0x0000000c, 0xb8000010, 0x08000018,
-			0x78000010, 0x08000014, 0x70000010, 0xb800001c, 0xe8000000, 0xb0000004,
-			0x58000010, 0xb000000c, 0x48000000, 0xb0000000, 0xb8000010, 0x98000010,
-			0xa0000000, 0x00000000, 0x00000000, 0x20000000, 0x80000000, 0x00000010,
-			0x00000000, 0x20000010, 0x20000000, 0x00000010, 0x60000000, 0x00000018,
-			0xe0000000, 0x90000000, 0x30000010, 0xb0000000, 0x20000000, 0x20000000,
-			0xa0000000, 0x00000010, 0x80000000, 0x20000000, 0x20000000, 0x20000000,
-			0x80000000, 0x00000010, 0x00000000, 0x20000010, 0xa0000000, 0x00000000,
-			0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x40000002,
-			0x40000041, 0x40000022, 0x80000005, 0xc0000082, 0xc0000046, 0x4000004b,
-			0x80000107, 0x00000089},
-	},
-	{
-		DvType: 2, DvK: 54, DvB: 0, TestT: 65, MaskI: 0, MaskB: 29,
-		Dm: [CheckSize]uint32{
-			0x0400001c, 0xcc000014, 0x0c000002, 0xc0000010, 0xb400001c, 0x3c000004,
-			0xbc00001a, 0x20000010, 0x2400001c, 0xec000014, 0x0c000002, 0xc0000010,
-			0xb400001c, 0x2c000004, 0xbc000018, 0xb0000010, 0x0000000c, 0xb8000010,
-			0x08000018, 0x78000010, 0x08000014, 0x70000010, 0xb800001c, 0xe8000000,
-			0xb0000004, 0x58000010, 0xb000000c, 0x48000000, 0xb0000000, 0xb8000010,
-			0x98000010, 0xa0000000, 0x00000000, 0x00000000, 0x20000000, 0x80000000,
-			0x00000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010, 0x60000000,
-			0x00000018, 0xe0000000, 0x90000000, 0x30000010, 0xb0000000, 0x20000000,
-			0x20000000, 0xa0000000, 0x00000010, 0x80000000, 0x20000000, 0x20000000,
-			0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010, 0xa0000000,
-			0x00000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000001,
-			0x40000002, 0x40000041, 0x40000022, 0x80000005, 0xc0000082, 0xc0000046,
-			0x4000004b, 0x80000107},
-	},
-	{
-		DvType: 2, DvK: 55, DvB: 0, TestT: 65, MaskI: 0, MaskB: 30,
-		Dm: [CheckSize]uint32{
-			0x00000010, 0x0400001c, 0xcc000014, 0x0c000002, 0xc0000010, 0xb400001c,
-			0x3c000004, 0xbc00001a, 0x20000010, 0x2400001c, 0xec000014, 0x0c000002,
-			0xc0000010, 0xb400001c, 0x2c000004, 0xbc000018, 0xb0000010, 0x0000000c,
-			0xb8000010, 0x08000018, 0x78000010, 0x08000014, 0x70000010, 0xb800001c,
-			0xe8000000, 0xb0000004, 0x58000010, 0xb000000c, 0x48000000, 0xb0000000,
-			0xb8000010, 0x98000010, 0xa0000000, 0x00000000, 0x00000000, 0x20000000,
-			0x80000000, 0x00000010, 0x00000000, 0x20000010, 0x20000000, 0x00000010,
-			0x60000000, 0x00000018, 0xe0000000, 0x90000000, 0x30000010, 0xb0000000,
-			0x20000000, 0x20000000, 0xa0000000, 0x00000010, 0x80000000, 0x20000000,
-			0x20000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010,
-			0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020,
-			0x00000001, 0x40000002, 0x40000041, 0x40000022, 0x80000005, 0xc0000082,
-			0xc0000046, 0x4000004b},
-	},
-	{
-		DvType: 2, DvK: 56, DvB: 0, TestT: 65, MaskI: 0, MaskB: 31,
-		Dm: [CheckSize]uint32{
-			0x2600001a, 0x00000010, 0x0400001c, 0xcc000014, 0x0c000002, 0xc0000010,
-			0xb400001c, 0x3c000004, 0xbc00001a, 0x20000010, 0x2400001c, 0xec000014,
-			0x0c000002, 0xc0000010, 0xb400001c, 0x2c000004, 0xbc000018, 0xb0000010,
-			0x0000000c, 0xb8000010, 0x08000018, 0x78000010, 0x08000014, 0x70000010,
-			0xb800001c, 0xe8000000, 0xb0000004, 0x58000010, 0xb000000c, 0x48000000,
-			0xb0000000, 0xb8000010, 0x98000010, 0xa0000000, 0x00000000, 0x00000000,
-			0x20000000, 0x80000000, 0x00000010, 0x00000000, 0x20000010, 0x20000000,
-			0x00000010, 0x60000000, 0x00000018, 0xe0000000, 0x90000000, 0x30000010,
-			0xb0000000, 0x20000000, 0x20000000, 0xa0000000, 0x00000010, 0x80000000,
-			0x20000000, 0x20000000, 0x20000000, 0x80000000, 0x00000010, 0x00000000,
-			0x20000010, 0xa0000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000,
-			0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
-			0x00000020, 0x00000001, 0x40000002, 0x40000041, 0x40000022, 0x80000005,
-			0xc0000082, 0xc0000046},
-	},
-	{
-		DvType: 0, DvK: 0, DvB: 0, TestT: 0, MaskI: 0, MaskB: 0,
-		Dm: [CheckSize]uint32{
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0},
-	},
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/ubc/ubc.go b/vendor/github.com/pjbgf/sha1cd/ubc/ubc.go
deleted file mode 100644
index b0b4d76e3..000000000
--- a/vendor/github.com/pjbgf/sha1cd/ubc/ubc.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// ubc package provides ways for SHA1 blocks to be checked for
-// Unavoidable Bit Conditions that arise from crypto analysis attacks.
-package ubc
-
-//go:generate go run -C asm . -out ../ubc_amd64.s -pkg $GOPACKAGE
diff --git a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_amd64.go b/vendor/github.com/pjbgf/sha1cd/ubc/ubc_amd64.go
deleted file mode 100644
index 09159bb5b..000000000
--- a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_amd64.go
+++ /dev/null
@@ -1,14 +0,0 @@
-//go:build !noasm && gc && amd64
-// +build !noasm,gc,amd64
-
-package ubc
-
-func CalculateDvMaskAMD64(W [80]uint32) uint32
-
-// Check takes as input an expanded message block and verifies the unavoidable bitconditions
-// for all listed DVs. It returns a dvmask where each bit belonging to a DV is set if all
-// unavoidable bitconditions for that DV have been met.
-// Thus, one needs to do the recompression check for each DV that has its bit set.
-func CalculateDvMask(W [80]uint32) uint32 {
-	return CalculateDvMaskAMD64(W)
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_amd64.s b/vendor/github.com/pjbgf/sha1cd/ubc/ubc_amd64.s
deleted file mode 100644
index c77ea77ec..000000000
--- a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_amd64.s
+++ /dev/null
@@ -1,1897 +0,0 @@
-// Code generated by command: go run asm.go -out ../ubc_amd64.s -pkg ubc. DO NOT EDIT.
-
-//go:build !noasm && gc && amd64
-
-#include "textflag.h"
-
-// func CalculateDvMaskAMD64(W [80]uint32) uint32
-TEXT ·CalculateDvMaskAMD64(SB), NOSPLIT, $0-324
-	MOVL $0xffffffff, AX
-
-	// (((((W[44] ^ W[45]) >> 29) & 1) - 1) | ^(DV_I_48_0_bit | DV_I_51_0_bit | DV_I_52_0_bit | DV_II_45_0_bit | DV_II_46_0_bit | DV_II_50_0_bit | DV_II_51_0_bit))
-	MOVL W_44+176(FP), CX
-	MOVL W_45+180(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xfd7c5f7f, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[49] ^ W[50]) >> 29) & 1) - 1) | ^(DV_I_46_0_bit | DV_II_45_0_bit | DV_II_50_0_bit | DV_II_51_0_bit | DV_II_55_0_bit | DV_II_56_0_bit))
-	MOVL W_49+196(FP), CX
-	MOVL W_50+200(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x3d7efff7, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[48] ^ W[49]) >> 29) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_52_0_bit | DV_II_49_0_bit | DV_II_50_0_bit | DV_II_54_0_bit | DV_II_55_0_bit))
-	MOVL W_48+192(FP), CX
-	MOVL W_49+196(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x9f5f7ffb, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[47] ^ (W[50] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_51_0_bit | DV_II_56_0_bit))
-	MOVL W_47+188(FP), CX
-	MOVL W_50+200(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	SUBL $0x00000010, CX
-	ORL  $0x7dfedddf, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[47] ^ W[48]) >> 29) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_51_0_bit | DV_II_48_0_bit | DV_II_49_0_bit | DV_II_53_0_bit | DV_II_54_0_bit))
-	MOVL W_47+188(FP), CX
-	MOVL W_48+192(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xcfcfdffd, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[46] >> 4) ^ (W[49] >> 29)) & 1) - 1) | ^(DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit | DV_II_50_0_bit | DV_II_55_0_bit))
-	MOVL W_46+184(FP), CX
-	SHRL $0x04, CX
-	MOVL W_49+196(FP), DX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xbf7f7777, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[46] ^ W[47]) >> 29) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_50_0_bit | DV_II_47_0_bit | DV_II_48_0_bit | DV_II_52_0_bit | DV_II_53_0_bit))
-	MOVL W_46+184(FP), CX
-	MOVL W_47+188(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xe7e7f7fe, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[45] >> 4) ^ (W[48] >> 29)) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit | DV_II_49_0_bit | DV_II_54_0_bit))
-	MOVL W_45+180(FP), CX
-	SHRL $0x04, CX
-	MOVL W_48+192(FP), DX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xdfdfdddb, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[45] ^ W[46]) >> 29) & 1) - 1) | ^(DV_I_49_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_47_0_bit | DV_II_51_0_bit | DV_II_52_0_bit))
-	MOVL W_45+180(FP), CX
-	MOVL W_46+184(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xf5f57dff, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[44] >> 4) ^ (W[47] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit | DV_II_48_0_bit | DV_II_53_0_bit))
-	MOVL W_44+176(FP), CX
-	SHRL $0x04, CX
-	MOVL W_47+188(FP), DX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xefeff775, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[43] >> 4) ^ (W[46] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit | DV_II_47_0_bit | DV_II_52_0_bit))
-	MOVL W_43+172(FP), CX
-	SHRL $0x04, CX
-	MOVL W_46+184(FP), DX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xf7f7fdda, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[43] ^ W[44]) >> 29) & 1) - 1) | ^(DV_I_47_0_bit | DV_I_50_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_49_0_bit | DV_II_50_0_bit))
-	MOVL W_43+172(FP), CX
-	MOVL W_44+176(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xff5ed7df, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[42] >> 4) ^ (W[45] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_51_0_bit))
-	MOVL W_42+168(FP), CX
-	SHRL $0x04, CX
-	MOVL W_45+180(FP), DX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xfdfd7f75, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[41] >> 4) ^ (W[44] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_50_0_bit))
-	MOVL W_41+164(FP), CX
-	SHRL $0x04, CX
-	MOVL W_44+176(FP), DX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xff7edfda, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[40] ^ W[41]) >> 29) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_47_0_bit | DV_I_48_0_bit | DV_II_46_0_bit | DV_II_47_0_bit | DV_II_56_0_bit))
-	MOVL W_40+160(FP), CX
-	MOVL W_41+164(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x7ff5ff5d, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[54] ^ W[55]) >> 29) & 1) - 1) | ^(DV_I_51_0_bit | DV_II_47_0_bit | DV_II_50_0_bit | DV_II_55_0_bit | DV_II_56_0_bit))
-	MOVL W_54+216(FP), CX
-	MOVL W_55+220(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x3f77dfff, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[53] ^ W[54]) >> 29) & 1) - 1) | ^(DV_I_50_0_bit | DV_II_46_0_bit | DV_II_49_0_bit | DV_II_54_0_bit | DV_II_55_0_bit))
-	MOVL W_53+212(FP), CX
-	MOVL W_54+216(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x9fddf7ff, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[52] ^ W[53]) >> 29) & 1) - 1) | ^(DV_I_49_0_bit | DV_II_45_0_bit | DV_II_48_0_bit | DV_II_53_0_bit | DV_II_54_0_bit))
-	MOVL W_52+208(FP), CX
-	MOVL W_53+212(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xcfeefdff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[50] ^ (W[53] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_50_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_48_0_bit | DV_II_54_0_bit))
-	MOVL W_50+200(FP), CX
-	MOVL W_53+212(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	SUBL $0x00000010, CX
-	ORL  $0xdfed77ff, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[50] ^ W[51]) >> 29) & 1) - 1) | ^(DV_I_47_0_bit | DV_II_46_0_bit | DV_II_51_0_bit | DV_II_52_0_bit | DV_II_56_0_bit))
-	MOVL W_50+200(FP), CX
-	MOVL W_51+204(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x75fdffdf, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[49] ^ (W[52] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_47_0_bit | DV_II_53_0_bit))
-	MOVL W_49+196(FP), CX
-	MOVL W_52+208(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	SUBL $0x00000010, CX
-	ORL  $0xeff6ddff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[48] ^ (W[51] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_52_0_bit))
-	MOVL W_48+192(FP), CX
-	MOVL W_51+204(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	SUBL $0x00000010, CX
-	ORL  $0xf7fd777f, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[42] ^ W[43]) >> 29) & 1) - 1) | ^(DV_I_46_0_bit | DV_I_49_0_bit | DV_I_50_0_bit | DV_II_48_0_bit | DV_II_49_0_bit))
-	MOVL W_42+168(FP), CX
-	MOVL W_43+172(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xffcff5f7, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[41] ^ W[42]) >> 29) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_48_0_bit | DV_I_49_0_bit | DV_II_47_0_bit | DV_II_48_0_bit))
-	MOVL W_41+164(FP), CX
-	MOVL W_42+168(FP), DX
-	XORL DX, CX
-	SHRL $0x1d, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xffe7fd7b, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[40] >> 4) ^ (W[43] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_50_0_bit | DV_II_49_0_bit | DV_II_56_0_bit))
-	MOVL W_40+160(FP), CX
-	MOVL W_43+172(FP), DX
-	SHRL $0x04, CX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0x7fdff7f5, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[39] >> 4) ^ (W[42] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_49_0_bit | DV_II_48_0_bit | DV_II_55_0_bit))
-	MOVL W_39+156(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x04, CX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xbfeffdfa, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_44_0_bit | DV_I_48_0_bit | DV_II_47_0_bit | DV_II_54_0_bit | DV_II_56_0_bit)) != 0 {
-	//   mask &= (((((W[38] >> 4) ^ (W[41] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_48_0_bit | DV_II_47_0_bit | DV_II_54_0_bit | DV_II_56_0_bit))
-	// }
-	TESTL $0xa0080082, AX
-	JE    f1
-	MOVL  W_38+152(FP), CX
-	MOVL  W_41+164(FP), DX
-	SHRL  $0x04, CX
-	SHRL  $0x1d, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	DECL  CX
-	ORL   $0x5ff7ff7d, CX
-	ANDL  CX, AX
-
-f1:
-	// mask &= (((((W[37] >> 4) ^ (W[40] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_47_0_bit | DV_II_46_0_bit | DV_II_53_0_bit | DV_II_55_0_bit))
-	MOVL W_37+148(FP), CX
-	MOVL W_40+160(FP), DX
-	SHRL $0x04, CX
-	SHRL $0x1d, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xaffdffde, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_52_0_bit | DV_II_48_0_bit | DV_II_51_0_bit | DV_II_56_0_bit)) != 0 {
-	//   mask &= (((((W[55] ^ W[56]) >> 29) & 1) - 1) | ^(DV_I_52_0_bit | DV_II_48_0_bit | DV_II_51_0_bit | DV_II_56_0_bit))
-	// }
-	TESTL $0x82108000, AX
-	JE    f2
-	MOVL  W_55+220(FP), CX
-	MOVL  W_56+224(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	DECL  CX
-	ORL   $0x7def7fff, CX
-	ANDL  CX, AX
-
-f2:
-	// if (mask & (DV_I_52_0_bit | DV_II_48_0_bit | DV_II_50_0_bit | DV_II_56_0_bit)) != 0 {
-	//   mask &= ((((W[52] ^ (W[55] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_52_0_bit | DV_II_48_0_bit | DV_II_50_0_bit | DV_II_56_0_bit))
-	// }
-	TESTL $0x80908000, AX
-	JE    f3
-	MOVL  W_52+208(FP), CX
-	MOVL  W_55+220(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0x7f6f7fff, CX
-	ANDL  CX, AX
-
-f3:
-	// if (mask & (DV_I_51_0_bit | DV_II_47_0_bit | DV_II_49_0_bit | DV_II_55_0_bit)) != 0 {
-	//   mask &= ((((W[51] ^ (W[54] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_51_0_bit | DV_II_47_0_bit | DV_II_49_0_bit | DV_II_55_0_bit))
-	// }
-	TESTL $0x40282000, AX
-	JE    f4
-	MOVL  W_51+204(FP), CX
-	MOVL  W_54+216(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xbfd7dfff, CX
-	ANDL  CX, AX
-
-f4:
-	// if (mask & (DV_I_48_0_bit | DV_II_47_0_bit | DV_II_52_0_bit | DV_II_53_0_bit)) != 0 {
-	//   mask &= (((((W[51] ^ W[52]) >> 29) & 1) - 1) | ^(DV_I_48_0_bit | DV_II_47_0_bit | DV_II_52_0_bit | DV_II_53_0_bit))
-	// }
-	TESTL $0x18080080, AX
-	JE    f5
-	MOVL  W_51+204(FP), CX
-	MOVL  W_52+208(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	DECL  CX
-	ORL   $0xe7f7ff7f, CX
-	ANDL  CX, AX
-
-f5:
-	// if (mask & (DV_I_46_0_bit | DV_I_49_0_bit | DV_II_45_0_bit | DV_II_48_0_bit)) != 0 {
-	//   mask &= (((((W[36] >> 4) ^ (W[40] >> 29)) & 1) - 1) | ^(DV_I_46_0_bit | DV_I_49_0_bit | DV_II_45_0_bit | DV_II_48_0_bit))
-	// }
-	TESTL $0x00110208, AX
-	JE    f6
-	MOVL  W_36+144(FP), CX
-	SHRL  $0x04, CX
-	MOVL  W_40+160(FP), DX
-	SHRL  $0x1d, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	DECL  CX
-	ORL   $0xffeefdf7, CX
-	ANDL  CX, AX
-
-f6:
-	// if (mask & (DV_I_52_0_bit | DV_II_48_0_bit | DV_II_49_0_bit)) != 0 {
-	//   mask &= ((0 - (((W[53] ^ W[56]) >> 29) & 1)) | ^(DV_I_52_0_bit | DV_II_48_0_bit | DV_II_49_0_bit))
-	// }
-	TESTL $0x00308000, AX
-	JE    f7
-	MOVL  W_53+212(FP), CX
-	MOVL  W_56+224(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffcf7fff, CX
-	ANDL  CX, AX
-
-f7:
-	// if (mask & (DV_I_50_0_bit | DV_II_46_0_bit | DV_II_47_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[51] ^ W[54]) >> 29) & 1)) | ^(DV_I_50_0_bit | DV_II_46_0_bit | DV_II_47_0_bit))
-	// }
-	TESTL $0x000a0800, AX
-	JE    f8
-	MOVL  W_51+204(FP), CX
-	MOVL  W_54+216(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfff5f7ff, CX
-	ANDL  CX, AX
-
-f8:
-	// if (mask & (DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[50] ^ W[52]) >> 29) & 1)) | ^(DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit))
-	// }
-	TESTL $0x00012200, AX
-	JE    f9
-	MOVL  W_50+200(FP), CX
-	MOVL  W_52+208(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfffeddff, CX
-	ANDL  CX, AX
-
-f9:
-	// if (mask & (DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[49] ^ W[51]) >> 29) & 1)) | ^(DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit))
-	// }
-	TESTL $0x00008880, AX
-	JE    f10
-	MOVL  W_49+196(FP), CX
-	MOVL  W_51+204(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffff777f, CX
-	ANDL  CX, AX
-
-f10:
-	// if (mask & (DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[48] ^ W[50]) >> 29) & 1)) | ^(DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit))
-	// }
-	TESTL $0x00002220, AX
-	JE    f11
-	MOVL  W_48+192(FP), CX
-	MOVL  W_50+200(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffffdddf, CX
-	ANDL  CX, AX
-
-f11:
-	// if (mask & (DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[47] ^ W[49]) >> 29) & 1)) | ^(DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit))
-	// }
-	TESTL $0x00000888, AX
-	JE    f12
-	MOVL  W_47+188(FP), CX
-	MOVL  W_49+196(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfffff777, CX
-	ANDL  CX, AX
-
-f12:
-	// if (mask & (DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[46] ^ W[48]) >> 29) & 1)) | ^(DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit))
-	// }
-	TESTL $0x00000224, AX
-	JE    f13
-	MOVL  W_46+184(FP), CX
-	MOVL  W_48+192(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfffffddb, CX
-	ANDL  CX, AX
-
-f13:
-	// mask &= ((((W[45] ^ W[47]) & (1 << 6)) - (1 << 6)) | ^(DV_I_47_2_bit | DV_I_49_2_bit | DV_I_51_2_bit))
-	MOVL W_45+180(FP), CX
-	MOVL W_47+188(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	SUBL $0x00000040, CX
-	ORL  $0xffffbbbf, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[45] ^ W[47]) >> 29) & 1)) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit))
-	// }
-	TESTL $0x0000008a, AX
-	JE    f14
-	MOVL  W_45+180(FP), CX
-	MOVL  W_47+188(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffffff75, CX
-	ANDL  CX, AX
-
-f14:
-	// mask &= (((((W[44] ^ W[46]) >> 6) & 1) - 1) | ^(DV_I_46_2_bit | DV_I_48_2_bit | DV_I_50_2_bit))
-	MOVL W_44+176(FP), CX
-	MOVL W_46+184(FP), DX
-	XORL DX, CX
-	SHRL $0x06, CX
-	ANDL $0x00000001, CX
-	DECL CX
-	ORL  $0xffffeeef, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[44] ^ W[46]) >> 29) & 1)) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit))
-	// }
-	TESTL $0x00000025, AX
-	JE    f15
-	MOVL  W_44+176(FP), CX
-	MOVL  W_46+184(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffffffda, CX
-	ANDL  CX, AX
-
-f15:
-	// mask &= ((0 - ((W[41] ^ (W[42] >> 5)) & (1 << 1))) | ^(DV_I_48_2_bit | DV_II_46_2_bit | DV_II_51_2_bit))
-	MOVL W_41+164(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	ORL  $0xfbfbfeff, CX
-	ANDL CX, AX
-
-	// mask &= ((0 - ((W[40] ^ (W[41] >> 5)) & (1 << 1))) | ^(DV_I_47_2_bit | DV_I_51_2_bit | DV_II_50_2_bit))
-	MOVL W_40+160(FP), CX
-	MOVL W_41+164(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	ORL  $0xfeffbfbf, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_44_0_bit | DV_I_46_0_bit | DV_II_56_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[40] ^ W[42]) >> 4) & 1)) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_II_56_0_bit))
-	// }
-	TESTL $0x8000000a, AX
-	JE    f16
-	MOVL  W_40+160(FP), CX
-	MOVL  W_42+168(FP), DX
-	XORL  DX, CX
-	SHRL  $0x04, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0x7ffffff5, CX
-	ANDL  CX, AX
-
-f16:
-	// mask &= ((0 - ((W[39] ^ (W[40] >> 5)) & (1 << 1))) | ^(DV_I_46_2_bit | DV_I_50_2_bit | DV_II_49_2_bit))
-	MOVL W_39+156(FP), CX
-	MOVL W_40+160(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	ORL  $0xffbfefef, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_43_0_bit | DV_I_45_0_bit | DV_II_55_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[39] ^ W[41]) >> 4) & 1)) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_II_55_0_bit))
-	// }
-	TESTL $0x40000005, AX
-	JE    f17
-	MOVL  W_39+156(FP), CX
-	MOVL  W_41+164(FP), DX
-	XORL  DX, CX
-	SHRL  $0x04, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xbffffffa, CX
-	ANDL  CX, AX
-
-f17:
-	// if (mask & (DV_I_44_0_bit | DV_II_54_0_bit | DV_II_56_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[38] ^ W[40]) >> 4) & 1)) | ^(DV_I_44_0_bit | DV_II_54_0_bit | DV_II_56_0_bit))
-	// }
-	TESTL $0xa0000002, AX
-	JE    f18
-	MOVL  W_38+152(FP), CX
-	MOVL  W_40+160(FP), DX
-	XORL  DX, CX
-	SHRL  $0x04, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0x5ffffffd, CX
-	ANDL  CX, AX
-
-f18:
-	// if (mask & (DV_I_43_0_bit | DV_II_53_0_bit | DV_II_55_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[37] ^ W[39]) >> 4) & 1)) | ^(DV_I_43_0_bit | DV_II_53_0_bit | DV_II_55_0_bit))
-	// }
-	TESTL $0x50000001, AX
-	JE    f19
-	MOVL  W_37+148(FP), CX
-	MOVL  W_39+156(FP), DX
-	XORL  DX, CX
-	SHRL  $0x04, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xaffffffe, CX
-	ANDL  CX, AX
-
-f19:
-	// mask &= ((0 - ((W[36] ^ (W[37] >> 5)) & (1 << 1))) | ^(DV_I_47_2_bit | DV_I_50_2_bit | DV_II_46_2_bit))
-	MOVL W_36+144(FP), CX
-	MOVL W_37+148(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	ORL  $0xfffbefbf, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_45_0_bit | DV_I_48_0_bit | DV_II_47_0_bit)) != 0 {
-	// 	mask &= (((((W[35] >> 4) ^ (W[39] >> 29)) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_48_0_bit | DV_II_47_0_bit))
-	// }
-	TESTL $0x00080084, AX
-	JE    f20
-	MOVL  W_35+140(FP), CX
-	MOVL  W_39+156(FP), DX
-	SHRL  $0x04, CX
-	SHRL  $0x1d, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	SUBL  $0x00000001, CX
-	ORL   $0xfff7ff7b, CX
-	ANDL  CX, AX
-
-f20:
-	// if (mask & (DV_I_48_0_bit | DV_II_48_0_bit)) != 0 {
-	// 	mask &= ((0 - ((W[63] ^ (W[64] >> 5)) & (1 << 0))) | ^(DV_I_48_0_bit | DV_II_48_0_bit))
-	// }
-	TESTL $0x00100080, AX
-	JE    f21
-	MOVL  W_63+252(FP), CX
-	MOVL  W_64+256(FP), DX
-	SHRL  $0x05, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffefff7f, CX
-	ANDL  CX, AX
-
-f21:
-	// if (mask & (DV_I_45_0_bit | DV_II_45_0_bit)) != 0 {
-	// 	mask &= ((0 - ((W[63] ^ (W[64] >> 5)) & (1 << 1))) | ^(DV_I_45_0_bit | DV_II_45_0_bit))
-	// }
-	TESTL $0x00010004, AX
-	JE    f22
-	MOVL  W_63+252(FP), CX
-	MOVL  W_64+256(FP), DX
-	SHRL  $0x05, DX
-	XORL  DX, CX
-	ANDL  $0x00000002, CX
-	NEGL  CX
-	ORL   $0xfffefffb, CX
-	ANDL  CX, AX
-
-f22:
-	// if (mask & (DV_I_47_0_bit | DV_II_47_0_bit)) != 0 {
-	// 	mask &= ((0 - ((W[62] ^ (W[63] >> 5)) & (1 << 0))) | ^(DV_I_47_0_bit | DV_II_47_0_bit))
-	// }
-	TESTL $0x00080020, AX
-	JE    f23
-	MOVL  W_62+248(FP), CX
-	MOVL  W_63+252(FP), DX
-	SHRL  $0x05, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfff7ffdf, CX
-	ANDL  CX, AX
-
-f23:
-	// if (mask & (DV_I_46_0_bit | DV_II_46_0_bit)) != 0 {
-	// 	mask &= ((0 - ((W[61] ^ (W[62] >> 5)) & (1 << 0))) | ^(DV_I_46_0_bit | DV_II_46_0_bit))
-	// }
-	TESTL $0x00020008, AX
-	JE    f24
-	MOVL  W_61+244(FP), CX
-	MOVL  W_62+248(FP), DX
-	SHRL  $0x05, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfffdfff7, CX
-	ANDL  CX, AX
-
-f24:
-	// mask &= ((0 - ((W[61] ^ (W[62] >> 5)) & (1 << 2))) | ^(DV_I_46_2_bit | DV_II_46_2_bit))
-	MOVL W_61+244(FP), CX
-	MOVL W_62+248(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000004, CX
-	NEGL CX
-	ORL  $0xfffbffef, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_45_0_bit | DV_II_45_0_bit)) != 0 {
-	// 	mask &= ((0 - ((W[60] ^ (W[61] >> 5)) & (1 << 0))) | ^(DV_I_45_0_bit | DV_II_45_0_bit))
-	// }
-	TESTL $0x00010004, AX
-	JE    f25
-	MOVL  W_60+240(FP), CX
-	MOVL  W_61+244(FP), DX
-	SHRL  $0x05, DX
-	XORL  DX, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xfffefffb, CX
-	ANDL  CX, AX
-
-f25:
-	// if (mask & (DV_II_51_0_bit | DV_II_54_0_bit)) != 0 {
-	// 	mask &= (((((W[58] ^ W[59]) >> 29) & 1) - 1) | ^(DV_II_51_0_bit | DV_II_54_0_bit))
-	// }
-	TESTL $0x22000000, AX
-	JE    f26
-	MOVL  W_58+232(FP), CX
-	MOVL  W_59+236(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	SUBL  $0x00000001, CX
-	ORL   $0xddffffff, CX
-	ANDL  CX, AX
-
-f26:
-	// if (mask & (DV_II_50_0_bit | DV_II_53_0_bit)) != 0 {
-	// 	mask &= (((((W[57] ^ W[58]) >> 29) & 1) - 1) | ^(DV_II_50_0_bit | DV_II_53_0_bit))
-	// }
-	TESTL $0x10800000, AX
-	JE    f27
-	MOVL  W_57+228(FP), CX
-	MOVL  W_58+232(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	SUBL  $0x00000001, CX
-	ORL   $0xef7fffff, CX
-	ANDL  CX, AX
-
-f27:
-	// if (mask & (DV_II_52_0_bit | DV_II_54_0_bit)) != 0 {
-	// 	mask &= ((((W[56] ^ (W[59] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_52_0_bit | DV_II_54_0_bit))
-	// }
-	TESTL $0x28000000, AX
-	JE    f28
-	MOVL  W_56+224(FP), CX
-	MOVL  W_59+236(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xd7ffffff, CX
-	ANDL  CX, AX
-
-f28:
-	// if (mask & (DV_II_51_0_bit | DV_II_52_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[56] ^ W[59]) >> 29) & 1)) | ^(DV_II_51_0_bit | DV_II_52_0_bit))
-	// }
-	TESTL $0x0a000000, AX
-	JE    f29
-	MOVL  W_56+224(FP), CX
-	MOVL  W_59+236(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xf5ffffff, CX
-	ANDL  CX, AX
-
-f29:
-	// if (mask & (DV_II_49_0_bit | DV_II_52_0_bit)) != 0 {
-	// 	mask &= (((((W[56] ^ W[57]) >> 29) & 1) - 1) | ^(DV_II_49_0_bit | DV_II_52_0_bit))
-	// }
-	TESTL $0x08200000, AX
-	JE    f30
-	MOVL  W_56+224(FP), CX
-	MOVL  W_57+228(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	SUBL  $0x00000001, CX
-	ORL   $0xf7dfffff, CX
-	ANDL  CX, AX
-
-f30:
-	// if (mask & (DV_II_51_0_bit | DV_II_53_0_bit)) != 0 {
-	// 	mask &= ((((W[55] ^ (W[58] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_51_0_bit | DV_II_53_0_bit))
-	// }
-	TESTL $0x12000000, AX
-	JE    f31
-	MOVL  W_55+220(FP), CX
-	MOVL  W_58+232(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xedffffff, CX
-	ANDL  CX, AX
-
-f31:
-	// if (mask & (DV_II_50_0_bit | DV_II_52_0_bit)) != 0 {
-	// 	mask &= ((((W[54] ^ (W[57] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_50_0_bit | DV_II_52_0_bit))
-	// }
-	TESTL $0x08800000, AX
-	JE    f32
-	MOVL  W_54+216(FP), CX
-	MOVL  W_57+228(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xf77fffff, CX
-	ANDL  CX, AX
-
-f32:
-	// if (mask & (DV_II_49_0_bit | DV_II_51_0_bit)) != 0 {
-	// 	mask &= ((((W[53] ^ (W[56] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_49_0_bit | DV_II_51_0_bit))
-	// }
-	TESTL $0x02200000, AX
-	JE    f33
-	MOVL  W_53+212(FP), CX
-	MOVL  W_56+224(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xfddfffff, CX
-	ANDL  CX, AX
-
-f33:
-	// mask &= ((((W[51] ^ (W[50] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_50_2_bit | DV_II_46_2_bit))
-	MOVL W_51+204(FP), CX
-	MOVL W_50+200(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	SUBL $0x00000002, CX
-	ORL  $0xfffbefff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[48] ^ W[50]) & (1 << 6)) - (1 << 6)) | ^(DV_I_50_2_bit | DV_II_46_2_bit))
-	MOVL W_48+192(FP), CX
-	MOVL W_50+200(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	SUBL $0x00000040, CX
-	ORL  $0xfffbefff, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_51_0_bit | DV_I_52_0_bit)) != 0 {
-	// 	mask &= ((0 - (((W[48] ^ W[55]) >> 29) & 1)) | ^(DV_I_51_0_bit | DV_I_52_0_bit))
-	// }
-	TESTL $0x0000a000, AX
-	JE    f34
-	MOVL  W_48+192(FP), CX
-	MOVL  W_55+220(FP), DX
-	XORL  DX, CX
-	SHRL  $0x1d, CX
-	ANDL  $0x00000001, CX
-	NEGL  CX
-	ORL   $0xffff5fff, CX
-	ANDL  CX, AX
-
-f34:
-	// mask &= ((((W[47] ^ W[49]) & (1 << 6)) - (1 << 6)) | ^(DV_I_49_2_bit | DV_I_51_2_bit))
-	MOVL W_47+188(FP), CX
-	MOVL W_49+196(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	SUBL $0x00000040, CX
-	ORL  $0xffffbbff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[48] ^ (W[47] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_47_2_bit | DV_II_51_2_bit))
-	MOVL W_48+192(FP), CX
-	MOVL W_47+188(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	SUBL $0x00000002, CX
-	ORL  $0xfbffffbf, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[46] ^ W[48]) & (1 << 6)) - (1 << 6)) | ^(DV_I_48_2_bit | DV_I_50_2_bit))
-	MOVL W_46+184(FP), CX
-	MOVL W_48+192(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	SUBL $0x00000040, CX
-	ORL  $0xffffeeff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[47] ^ (W[46] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_46_2_bit | DV_II_50_2_bit))
-	MOVL W_47+188(FP), CX
-	MOVL W_46+184(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	SUBL $0x00000002, CX
-	ORL  $0xfeffffef, CX
-	ANDL CX, AX
-
-	// mask &= ((0 - ((W[44] ^ (W[45] >> 5)) & (1 << 1))) | ^(DV_I_51_2_bit | DV_II_49_2_bit))
-	MOVL W_44+176(FP), CX
-	MOVL W_45+180(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	ORL  $0xffbfbfff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[43] ^ W[45]) & (1 << 6)) - (1 << 6)) | ^(DV_I_47_2_bit | DV_I_49_2_bit))
-	MOVL W_43+172(FP), CX
-	MOVL W_45+180(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	SUBL $0x00000040, CX
-	ORL  $0xfffffbbf, CX
-	ANDL CX, AX
-
-	// mask &= (((((W[42] ^ W[44]) >> 6) & 1) - 1) | ^(DV_I_46_2_bit | DV_I_48_2_bit))
-	MOVL W_42+168(FP), CX
-	MOVL W_44+176(FP), DX
-	XORL DX, CX
-	SHRL $0x06, CX
-	ANDL $0x00000001, CX
-	SUBL $0x00000001, CX
-	ORL  $0xfffffeef, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[43] ^ (W[42] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_II_46_2_bit | DV_II_51_2_bit))
-	MOVL W_43+172(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	SUBL $0x00000002, CX
-	ORL  $0xfbfbffff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[42] ^ (W[41] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_51_2_bit | DV_II_50_2_bit))
-	MOVL W_42+168(FP), CX
-	MOVL W_41+164(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	SUBL $0x00000002, CX
-	ORL  $0xfeffbfff, CX
-	ANDL CX, AX
-
-	// mask &= ((((W[41] ^ (W[40] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_50_2_bit | DV_II_49_2_bit))
-	MOVL W_41+164(FP), CX
-	MOVL W_40+160(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	SUBL $0x00000002, CX
-	ORL  $0xffbfefff, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_52_0_bit | DV_II_51_0_bit)) != 0 {
-	// 	mask &= ((((W[39] ^ (W[43] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_52_0_bit | DV_II_51_0_bit))
-	// }
-	TESTL $0x02008000, AX
-	JE    f35
-	MOVL  W_39+156(FP), CX
-	MOVL  W_43+172(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xfdff7fff, CX
-	ANDL  CX, AX
-
-f35:
-	// if (mask & (DV_I_51_0_bit | DV_II_50_0_bit)) != 0 {
-	// 	mask &= ((((W[38] ^ (W[42] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_51_0_bit | DV_II_50_0_bit))
-	// }
-	TESTL $0x00802000, AX
-	JE    f36
-	MOVL  W_38+152(FP), CX
-	MOVL  W_42+168(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xff7fdfff, CX
-	ANDL  CX, AX
-
-f36:
-	// if (mask & (DV_I_48_2_bit | DV_I_51_2_bit)) != 0 {
-	// 	mask &= ((0 - ((W[37] ^ (W[38] >> 5)) & (1 << 1))) | ^(DV_I_48_2_bit | DV_I_51_2_bit))
-	// }
-	TESTL $0x00004100, AX
-	JE    f37
-	MOVL  W_37+148(FP), CX
-	MOVL  W_38+152(FP), DX
-	SHRL  $0x05, DX
-	XORL  DX, CX
-	ANDL  $0x00000002, CX
-	NEGL  CX
-	ORL   $0xffffbeff, CX
-	ANDL  CX, AX
-
-f37:
-	// if (mask & (DV_I_50_0_bit | DV_II_49_0_bit)) != 0 {
-	// 	mask &= ((((W[37] ^ (W[41] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_50_0_bit | DV_II_49_0_bit))
-	// }
-	TESTL $0x00200800, AX
-	JE    f38
-	MOVL  W_37+148(FP), CX
-	MOVL  W_41+164(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	SUBL  $0x00000010, CX
-	ORL   $0xffdff7ff, CX
-	ANDL  CX, AX
-
-f38:
-	// if (mask & (DV_II_52_0_bit | DV_II_54_0_bit)) != 0 {
-	// 	mask &= ((0 - ((W[36] ^ W[38]) & (1 << 4))) | ^(DV_II_52_0_bit | DV_II_54_0_bit))
-	// }
-	TESTL $0x28000000, AX
-	JE    f39
-	MOVL  W_36+144(FP), CX
-	MOVL  W_38+152(FP), DX
-	XORL  DX, CX
-	ANDL  $0x00000010, CX
-	NEGL  CX
-	ORL   $0xd7ffffff, CX
-	ANDL  CX, AX
-
-f39:
-	// mask &= ((0 - ((W[35] ^ (W[36] >> 5)) & (1 << 1))) | ^(DV_I_46_2_bit | DV_I_49_2_bit))
-	MOVL W_35+140(FP), CX
-	MOVL W_36+144(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	ORL  $0xfffffbef, CX
-	ANDL CX, AX
-
-	// if (mask & (DV_I_51_0_bit | DV_II_47_0_bit)) != 0 {
-	// 	mask &= ((((W[35] ^ (W[39] >> 25)) & (1 << 3)) - (1 << 3)) | ^(DV_I_51_0_bit | DV_II_47_0_bit))
-	// }
-	TESTL $0x00082000, AX
-	JE    f40
-	MOVL  W_35+140(FP), CX
-	MOVL  W_39+156(FP), DX
-	SHRL  $0x19, DX
-	XORL  DX, CX
-	ANDL  $0x00000008, CX
-	SUBL  $0x00000008, CX
-	ORL   $0xfff7dfff, CX
-	ANDL  CX, AX
-
-f40:
-	// if mask != 0
-	TESTL $0x00000000, AX
-	JNE   end
-
-	// if (mask & DV_I_43_0_bit) != 0 {
-	// 	if not((W[61]^(W[62]>>5))&(1<<1)) != 0 ||
-	// 		not(not((W[59]^(W[63]>>25))&(1<<5))) != 0 ||
-	// 		not((W[58]^(W[63]>>30))&(1<<0)) != 0 {
-	// 		mask &= ^DV_I_43_0_bit
-	// 	}
-	// }
-	BTL  $0x00, AX
-	JNC  f41_skip
-	MOVL W_61+244(FP), CX
-	MOVL W_62+248(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f41_in
-	MOVL W_59+236(FP), CX
-	MOVL W_63+252(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000020, CX
-	CMPL CX, $0x00000000
-	JNE  f41_in
-	MOVL W_58+232(FP), CX
-	MOVL W_63+252(FP), DX
-	SHRL $0x1e, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f41_in
-	JMP  f41_skip
-
-f41_in:
-	ANDL $0xfffffffe, AX
-
-f41_skip:
-	// if (mask & DV_I_44_0_bit) != 0 {
-	// 	if not((W[62]^(W[63]>>5))&(1<<1)) != 0 ||
-	// 		not(not((W[60]^(W[64]>>25))&(1<<5))) != 0 ||
-	// 		not((W[59]^(W[64]>>30))&(1<<0)) != 0 {
-	// 		mask &= ^DV_I_44_0_bit
-	// 	}
-	// }
-	BTL  $0x01, AX
-	JNC  f42_skip
-	MOVL W_62+248(FP), CX
-	MOVL W_63+252(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f42_in
-	MOVL W_60+240(FP), CX
-	MOVL W_64+256(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000020, CX
-	CMPL CX, $0x00000000
-	JNE  f42_in
-	MOVL W_59+236(FP), CX
-	MOVL W_64+256(FP), DX
-	SHRL $0x1e, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f42_in
-	JMP  f42_skip
-
-f42_in:
-	ANDL $0xfffffffd, AX
-
-f42_skip:
-	// if (mask & DV_I_46_2_bit) != 0 {
-	// 	mask &= ((^((W[40] ^ W[42]) >> 2)) | ^DV_I_46_2_bit)
-	// }
-	BTL  $0x04, AX
-	JNC  f43
-	MOVL W_40+160(FP), CX
-	MOVL W_42+168(FP), DX
-	XORL DX, CX
-	SHRL $0x02, CX
-	NOTL CX
-	ORL  $0xffffffef, CX
-	ANDL CX, AX
-
-f43:
-	// if (mask & DV_I_47_2_bit) != 0 {
-	// 	if not((W[62]^(W[63]>>5))&(1<<2)) != 0 ||
-	// 		not(not((W[41]^W[43])&(1<<6))) != 0 {
-	// 		mask &= ^DV_I_47_2_bit
-	// 	}
-	// }
-	BTL  $0x06, AX
-	JNC  f44_skip
-	MOVL W_62+248(FP), CX
-	MOVL W_63+252(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000004, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f44_in
-	MOVL W_41+164(FP), CX
-	MOVL W_43+172(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f44_in
-	JMP  f44_skip
-
-f44_in:
-	ANDL $0xffffffbf, AX
-
-f44_skip:
-	// if (mask & DV_I_48_2_bit) != 0 {
-	// 	if not((W[63]^(W[64]>>5))&(1<<2)) != 0 ||
-	// 		not(not((W[48]^(W[49]<<5))&(1<<6))) != 0 {
-	// 		mask &= ^DV_I_48_2_bit
-	// 	}
-	// }
-	BTL  $0x08, AX
-	JNC  f45_skip
-	MOVL W_63+252(FP), CX
-	MOVL W_64+256(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000004, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f45_in
-	MOVL W_48+192(FP), CX
-	MOVL W_49+196(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f45_in
-	JMP  f45_skip
-
-f45_in:
-	ANDL $0xfffffeff, AX
-
-f45_skip:
-	// if (mask & DV_I_49_2_bit) != 0 {
-	// 	if not(not((W[49]^(W[50]<<5))&(1<<6))) != 0 ||
-	// 		not((W[42]^W[50])&(1<<1)) != 0 ||
-	// 		not(not((W[39]^(W[40]<<5))&(1<<6))) != 0 ||
-	// 		not((W[38]^W[40])&(1<<1)) != 0 {
-	// 		mask &= ^DV_I_49_2_bit
-	// 	}
-	// }
-	BTL  $0x0a, AX
-	JNC  f46_skip
-	MOVL W_49+196(FP), CX
-	MOVL W_50+200(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f46_in
-	MOVL W_42+168(FP), CX
-	MOVL W_50+200(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	CMPL CX, $0x00000000
-	JE   f46_in
-	MOVL W_39+156(FP), CX
-	MOVL W_40+160(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f46_in
-	MOVL W_38+152(FP), CX
-	MOVL W_40+160(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	CMPL CX, $0x00000000
-	JE   f46_in
-	JMP  f46_skip
-
-f46_in:
-	ANDL $0xfffffbff, AX
-
-f46_skip:
-	// if (mask & DV_I_50_0_bit) != 0 {
-	// 	mask &= (((W[36] ^ W[37]) << 7) | ^DV_I_50_0_bit)
-	// }
-	BTL  $0x0b, AX
-	JNC  f47
-	MOVL W_36+144(FP), CX
-	MOVL W_37+148(FP), DX
-	XORL DX, CX
-	SHLL $0x07, CX
-	ORL  $0xfffff7ff, CX
-	ANDL CX, AX
-
-f47:
-	// if (mask & DV_I_50_2_bit) != 0 {
-	// 	mask &= (((W[43] ^ W[51]) << 11) | ^DV_I_50_2_bit)
-	// }
-	BTL  $0x0c, AX
-	JNC  f48
-	MOVL W_43+172(FP), CX
-	MOVL W_51+204(FP), DX
-	XORL DX, CX
-	SHLL $0x0b, CX
-	ORL  $0xffffefff, CX
-	ANDL CX, AX
-
-f48:
-	// if (mask & DV_I_51_0_bit) != 0 {
-	// 	mask &= (((W[37] ^ W[38]) << 9) | ^DV_I_51_0_bit)
-	// }
-	BTL  $0x0d, AX
-	JNC  f49
-	MOVL W_37+148(FP), CX
-	MOVL W_38+152(FP), DX
-	XORL DX, CX
-	SHLL $0x09, CX
-	ORL  $0xffffdfff, CX
-	ANDL CX, AX
-
-f49:
-	// if (mask & DV_I_51_2_bit) != 0 {
-	// 	if not(not((W[51]^(W[52]<<5))&(1<<6))) != 0 ||
-	// 		not(not((W[49]^W[51])&(1<<6))) != 0 ||
-	// 		not(not((W[37]^(W[37]>>5))&(1<<1))) != 0 ||
-	// 		not(not((W[35]^(W[39]>>25))&(1<<5))) != 0 {
-	// 		mask &= ^DV_I_51_2_bit
-	// 	}
-	// }
-	BTL  $0x0e, AX
-	JNC  f50_skip
-	MOVL W_51+204(FP), CX
-	MOVL W_52+208(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f50_in
-	MOVL W_49+196(FP), CX
-	MOVL W_51+204(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f50_in
-	MOVL W_37+148(FP), CX
-	MOVL W_37+148(FP), DX
-	SHRL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	CMPL CX, $0x00000000
-	JNE  f50_in
-	MOVL W_35+140(FP), CX
-	MOVL W_39+156(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000020, CX
-	CMPL CX, $0x00000000
-	JNE  f50_in
-	JMP  f50_skip
-
-f50_in:
-	ANDL $0xffffbfff, AX
-
-f50_skip:
-	// if (mask & DV_I_52_0_bit) != 0 {
-	// 	mask &= (((W[38] ^ W[39]) << 11) | ^DV_I_52_0_bit)
-	// }
-	BTL  $0x0f, AX
-	JNC  f51
-	MOVL W_38+152(FP), CX
-	MOVL W_39+156(FP), DX
-	XORL DX, CX
-	SHLL $0x0b, CX
-	ORL  $0xffff7fff, CX
-	ANDL CX, AX
-
-f51:
-	// if (mask & DV_II_46_2_bit) != 0 {
-	// 	mask &= (((W[47] ^ W[51]) << 17) | ^DV_II_46_2_bit)
-	// }
-	TESTL $0x00040000, AX
-	BTL   $0x12, AX
-	JNC   f52
-	MOVL  W_47+188(FP), CX
-	MOVL  W_51+204(FP), DX
-	XORL  DX, CX
-	SHLL  $0x11, CX
-	ORL   $0xfffbffff, CX
-	ANDL  CX, AX
-
-f52:
-	// if (mask & DV_II_48_0_bit) != 0 {
-	// 	if not(not((W[36]^(W[40]>>25))&(1<<3))) != 0 ||
-	// 		not((W[35]^(W[40]<<2))&(1<<30)) != 0 {
-	// 		mask &= ^DV_II_48_0_bit
-	// 	}
-	// }
-	BTL  $0x14, AX
-	JNC  f53_skip
-	MOVL W_36+144(FP), CX
-	MOVL W_40+160(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f53_in
-	MOVL W_35+140(FP), CX
-	MOVL W_40+160(FP), DX
-	SHLL $0x02, DX
-	XORL DX, CX
-	ANDL $0x40000000, CX
-	CMPL CX, $0x00000000
-	JNE  f53_in
-	JMP  f53_skip
-
-f53_in:
-	ANDL $0xffefffff, AX
-
-f53_skip:
-	// if (mask & DV_II_49_0_bit) != 0 {
-	// 	if not(not((W[37]^(W[41]>>25))&(1<<3))) != 0 ||
-	// 		not((W[36]^(W[41]<<2))&(1<<30)) != 0 {
-	// 		mask &= ^DV_II_49_0_bit
-	// 	}
-	// }
-	BTL  $0x15, AX
-	JNC  f54_skip
-	MOVL W_37+148(FP), CX
-	MOVL W_41+164(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f54_in
-	MOVL W_36+144(FP), CX
-	MOVL W_41+164(FP), DX
-	SHLL $0x02, DX
-	XORL DX, CX
-	ANDL $0x40000000, CX
-	CMPL CX, $0x00000000
-	JNE  f54_in
-	JMP  f54_skip
-
-f54_in:
-	ANDL $0xffdfffff, AX
-
-f54_skip:
-	// if (mask & DV_II_49_2_bit) != 0 {
-	// 	if not(not((W[53]^(W[54]<<5))&(1<<6))) != 0 ||
-	// 		not(not((W[51]^W[53])&(1<<6))) != 0 ||
-	// 		not((W[50]^W[54])&(1<<1)) != 0 ||
-	// 		not(not((W[45]^(W[46]<<5))&(1<<6))) != 0 ||
-	// 		not(not((W[37]^(W[41]>>25))&(1<<5))) != 0 ||
-	// 		not((W[36]^(W[41]>>30))&(1<<0)) != 0 {
-	// 		mask &= ^DV_II_49_2_bit
-	// 	}
-	// }
-	BTL  $0x16, AX
-	JNC  f55_skip
-	MOVL W_53+212(FP), CX
-	MOVL W_54+216(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f55_in
-	MOVL W_51+204(FP), CX
-	MOVL W_53+212(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f55_in
-	MOVL W_50+200(FP), CX
-	MOVL W_54+216(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f55_in
-	MOVL W_45+180(FP), CX
-	MOVL W_46+184(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f55_in
-	MOVL W_37+148(FP), CX
-	MOVL W_41+164(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000020, CX
-	CMPL CX, $0x00000000
-	JNE  f55_in
-	MOVL W_36+144(FP), CX
-	MOVL W_41+164(FP), DX
-	SHRL $0x1e, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f55_in
-	JMP  f55_skip
-
-f55_in:
-	ANDL $0xffbfffff, AX
-
-f55_skip:
-	// if (mask & DV_II_50_0_bit) != 0 {
-	// 	if not((W[55]^W[58])&(1<<29)) != 0 ||
-	// 		not(not((W[38]^(W[42]>>25))&(1<<3))) != 0 ||
-	// 		not((W[37]^(W[42]<<2))&(1<<30)) != 0 {
-	// 		mask &= ^DV_II_50_0_bit
-	// 	}
-	// }
-	BTL  $0x17, AX
-	JNC  f56_skip
-	MOVL W_55+220(FP), CX
-	MOVL W_58+232(FP), DX
-	XORL DX, CX
-	ANDL $0x20000000, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f56_in
-	MOVL W_38+152(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f56_in
-	MOVL W_37+148(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x02, DX
-	XORL DX, CX
-	ANDL $0x40000000, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f56_in
-	JMP  f56_skip
-
-f56_in:
-	ANDL $0xff7fffff, AX
-
-f56_skip:
-	// if (mask & DV_II_50_2_bit) != 0 {
-	// 	if not(not((W[54]^(W[55]<<5))&(1<<6))) != 0 ||
-	// 		not(not((W[52]^W[54])&(1<<6))) != 0 ||
-	// 		not((W[51]^W[55])&(1<<1)) != 0 ||
-	// 		not((W[45]^W[47])&(1<<1)) != 0 ||
-	// 		not(not((W[38]^(W[42]>>25))&(1<<5))) != 0 ||
-	// 		not((W[37]^(W[42]>>30))&(1<<0)) != 0 {
-	// 		mask &= ^DV_II_50_2_bit
-	// 	}
-	// }
-	BTL  $0x18, AX
-	JNC  f57_skip
-	MOVL W_54+216(FP), CX
-	MOVL W_55+220(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f57_in
-	MOVL W_52+208(FP), CX
-	MOVL W_54+216(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f57_in
-	MOVL W_51+204(FP), CX
-	MOVL W_55+220(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f57_in
-	MOVL W_45+180(FP), CX
-	MOVL W_47+188(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f57_in
-	MOVL W_38+152(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000020, CX
-	CMPL CX, $0x00000000
-	JNE  f57_in
-	MOVL W_37+148(FP), CX
-	MOVL W_42+168(FP), DX
-	SHRL $0x1e, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f57_in
-	JMP  f57_skip
-
-f57_in:
-	ANDL $0xfeffffff, AX
-
-f57_skip:
-	// if (mask & DV_II_51_0_bit) != 0 {
-	// 	if not(not((W[39]^(W[43]>>25))&(1<<3))) != 0 ||
-	// 		not((W[38]^(W[43]<<2))&(1<<30)) != 0 {
-	// 		mask &= ^DV_II_51_0_bit
-	// 	}
-	// }
-	BTL  $0x19, AX
-	JNC  f58_skip
-	MOVL W_39+156(FP), CX
-	MOVL W_43+172(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f58_in
-	MOVL W_38+152(FP), CX
-	MOVL W_43+172(FP), DX
-	SHLL $0x02, DX
-	XORL DX, CX
-	ANDL $0x40000000, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f58_in
-	JMP  f58_skip
-
-f58_in:
-	ANDL $0xfdffffff, AX
-
-f58_skip:
-	// if (mask & DV_II_51_2_bit) != 0 {
-	// 	if not(not((W[55]^(W[56]<<5))&(1<<6))) != 0 ||
-	// 		not(not((W[53]^W[55])&(1<<6))) != 0 ||
-	// 		not((W[52]^W[56])&(1<<1)) != 0 ||
-	// 		not((W[46]^W[48])&(1<<1)) != 0 ||
-	// 		not(not((W[39]^(W[43]>>25))&(1<<5))) != 0 ||
-	// 		not((W[38]^(W[43]>>30))&(1<<0)) != 0 {
-	// 		mask &= ^DV_II_51_2_bit
-	// 	}
-	// }
-	BTL  $0x1a, AX
-	JNC  f59_skip
-	MOVL W_55+220(FP), CX
-	MOVL W_56+224(FP), DX
-	SHLL $0x05, DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f59_in
-	MOVL W_53+212(FP), CX
-	MOVL W_55+220(FP), DX
-	XORL DX, CX
-	ANDL $0x00000040, CX
-	CMPL CX, $0x00000000
-	JNE  f59_in
-	MOVL W_52+208(FP), CX
-	MOVL W_56+224(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f59_in
-	MOVL W_46+184(FP), CX
-	MOVL W_48+192(FP), DX
-	XORL DX, CX
-	ANDL $0x00000002, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f59_in
-	MOVL W_39+156(FP), CX
-	MOVL W_43+172(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000020, CX
-	CMPL CX, $0x00000000
-	JNE  f59_in
-	MOVL W_38+152(FP), CX
-	MOVL W_43+172(FP), DX
-	SHRL $0x1e, DX
-	XORL DX, CX
-	ANDL $0x00000001, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f59_in
-	JMP  f59_skip
-
-f59_in:
-	ANDL $0xfbffffff, AX
-
-f59_skip:
-	// if (mask & DV_II_52_0_bit) != 0 {
-	// 	if not(not((W[59]^W[60])&(1<<29))) != 0 ||
-	// 		not(not((W[40]^(W[44]>>25))&(1<<3))) != 0 ||
-	// 		not(not((W[40]^(W[44]>>25))&(1<<4))) != 0 ||
-	// 		not((W[39]^(W[44]<<2))&(1<<30)) != 0 {
-	// 		mask &= ^DV_II_52_0_bit
-	// 	}
-	// }
-	BTL  $0x1b, AX
-	JNC  f60_skip
-	MOVL W_59+236(FP), CX
-	MOVL W_60+240(FP), DX
-	XORL DX, CX
-	ANDL $0x20000000, CX
-	CMPL CX, $0x00000000
-	JNE  f60_in
-	MOVL W_40+160(FP), CX
-	MOVL W_44+176(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f60_in
-	MOVL W_40+160(FP), CX
-	MOVL W_44+176(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f60_in
-	MOVL W_39+156(FP), CX
-	MOVL W_44+176(FP), DX
-	SHLL $0x02, DX
-	XORL DX, CX
-	ANDL $0x40000000, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f60_in
-	JMP  f60_skip
-
-f60_in:
-	ANDL $0xf7ffffff, AX
-
-f60_skip:
-	// if (mask & DV_II_53_0_bit) != 0 {
-	// 	if not((W[58]^W[61])&(1<<29)) != 0 ||
-	// 		not(not((W[57]^(W[61]>>25))&(1<<4))) != 0 ||
-	// 		not(not((W[41]^(W[45]>>25))&(1<<3))) != 0 ||
-	// 		not(not((W[41]^(W[45]>>25))&(1<<4))) != 0 {
-	// 		mask &= ^DV_II_53_0_bit
-	// 	}
-	// }
-	BTL  $0x1c, AX
-	JNC  f61_skip
-	MOVL W_58+232(FP), CX
-	MOVL W_61+244(FP), DX
-	XORL DX, CX
-	ANDL $0x20000000, CX
-	NEGL CX
-	CMPL CX, $0x00000000
-	JE   f61_in
-	MOVL W_57+228(FP), CX
-	MOVL W_61+244(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f61_in
-	MOVL W_41+164(FP), CX
-	MOVL W_45+180(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f61_in
-	MOVL W_41+164(FP), CX
-	MOVL W_45+180(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f61_in
-	JMP  f61_skip
-
-f61_in:
-	ANDL $0xefffffff, AX
-
-f61_skip:
-	// if (mask & DV_II_54_0_bit) != 0 {
-	// 	if not(not((W[58]^(W[62]>>25))&(1<<4))) != 0 ||
-	// 		not(not((W[42]^(W[46]>>25))&(1<<3))) != 0 ||
-	// 		not(not((W[42]^(W[46]>>25))&(1<<4))) != 0 {
-	// 		mask &= ^DV_II_54_0_bit
-	// 	}
-	// }
-	BTL  $0x1d, AX
-	JNC  f62_skip
-	MOVL W_58+232(FP), CX
-	MOVL W_62+248(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f62_in
-	MOVL W_42+168(FP), CX
-	MOVL W_46+184(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f62_in
-	MOVL W_42+168(FP), CX
-	MOVL W_46+184(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f62_in
-	JMP  f62_skip
-
-f62_in:
-	ANDL $0xdfffffff, AX
-
-f62_skip:
-	// if (mask & DV_II_55_0_bit) != 0 {
-	// 	if not(not((W[59]^(W[63]>>25))&(1<<4))) != 0 ||
-	// 		not(not((W[57]^(W[59]>>25))&(1<<4))) != 0 ||
-	// 		not(not((W[43]^(W[47]>>25))&(1<<3))) != 0 ||
-	// 		not(not((W[43]^(W[47]>>25))&(1<<4))) != 0 {
-	// 		mask &= ^DV_II_55_0_bit
-	// 	}
-	// }
-	BTL  $0x1e, AX
-	JNC  f63_skip
-	MOVL W_59+236(FP), CX
-	MOVL W_63+252(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f63_in
-	MOVL W_57+228(FP), CX
-	MOVL W_59+236(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f63_in
-	MOVL W_43+172(FP), CX
-	MOVL W_47+188(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f63_in
-	MOVL W_43+172(FP), CX
-	MOVL W_47+188(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f63_in
-	JMP  f63_skip
-
-f63_in:
-	ANDL $0xbfffffff, AX
-
-f63_skip:
-	// if (mask & DV_II_56_0_bit) != 0 {
-	// 	if not(not((W[60]^(W[64]>>25))&(1<<4))) != 0 ||
-	// 		not(not((W[44]^(W[48]>>25))&(1<<3))) != 0 ||
-	// 		not(not((W[44]^(W[48]>>25))&(1<<4))) != 0 {
-	// 		mask &= ^DV_II_56_0_bit
-	// 	}
-	// }
-	BTL  $0x1f, AX
-	JNC  f64_skip
-	MOVL W_60+240(FP), CX
-	MOVL W_64+256(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f64_in
-	MOVL W_44+176(FP), CX
-	MOVL W_48+192(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000008, CX
-	CMPL CX, $0x00000000
-	JNE  f64_in
-	MOVL W_44+176(FP), CX
-	MOVL W_48+192(FP), DX
-	SHRL $0x19, DX
-	XORL DX, CX
-	ANDL $0x00000010, CX
-	CMPL CX, $0x00000000
-	JNE  f64_in
-	JMP  f64_skip
-
-f64_in:
-	ANDL $0x7fffffff, AX
-
-f64_skip:
-end:
-	MOVL AX, ret+320(FP)
-	RET
diff --git a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_generic.go b/vendor/github.com/pjbgf/sha1cd/ubc/ubc_generic.go
deleted file mode 100644
index ee95bd52d..000000000
--- a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_generic.go
+++ /dev/null
@@ -1,368 +0,0 @@
-// Based on the C implementation from Marc Stevens and Dan Shumow.
-// https://github.com/cr-marcstevens/sha1collisiondetection
-
-package ubc
-
-type DvInfo struct {
-	// DvType, DvK and DvB define the DV: I(K,B) or II(K,B) (see the paper).
-	// https://marc-stevens.nl/research/papers/C13-S.pdf
-	DvType uint32
-	DvK    uint32
-	DvB    uint32
-
-	// TestT is the step to do the recompression from for collision detection.
-	TestT uint32
-
-	// MaskI and MaskB define the bit to check for each DV in the dvmask returned by ubc_check.
-	MaskI uint32
-	MaskB uint32
-
-	// Dm is the expanded message block XOR-difference defined by the DV.
-	Dm [80]uint32
-}
-
-// CalculateDvMask takes as input an expanded message block and verifies the unavoidable bitconditions
-// for all listed DVs. It returns a dvmask where each bit belonging to a DV is set if all
-// unavoidable bitconditions for that DV have been met.
-// Thus, one needs to do the recompression check for each DV that has its bit set.
-func CalculateDvMaskGeneric(W [80]uint32) uint32 {
-	mask := uint32(0xFFFFFFFF)
-	mask &= (((((W[44] ^ W[45]) >> 29) & 1) - 1) | ^(DV_I_48_0_bit | DV_I_51_0_bit | DV_I_52_0_bit | DV_II_45_0_bit | DV_II_46_0_bit | DV_II_50_0_bit | DV_II_51_0_bit))
-	mask &= (((((W[49] ^ W[50]) >> 29) & 1) - 1) | ^(DV_I_46_0_bit | DV_II_45_0_bit | DV_II_50_0_bit | DV_II_51_0_bit | DV_II_55_0_bit | DV_II_56_0_bit))
-	mask &= (((((W[48] ^ W[49]) >> 29) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_52_0_bit | DV_II_49_0_bit | DV_II_50_0_bit | DV_II_54_0_bit | DV_II_55_0_bit))
-	mask &= ((((W[47] ^ (W[50] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_51_0_bit | DV_II_56_0_bit))
-	mask &= (((((W[47] ^ W[48]) >> 29) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_51_0_bit | DV_II_48_0_bit | DV_II_49_0_bit | DV_II_53_0_bit | DV_II_54_0_bit))
-	mask &= (((((W[46] >> 4) ^ (W[49] >> 29)) & 1) - 1) | ^(DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit | DV_II_50_0_bit | DV_II_55_0_bit))
-	mask &= (((((W[46] ^ W[47]) >> 29) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_50_0_bit | DV_II_47_0_bit | DV_II_48_0_bit | DV_II_52_0_bit | DV_II_53_0_bit))
-	mask &= (((((W[45] >> 4) ^ (W[48] >> 29)) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit | DV_II_49_0_bit | DV_II_54_0_bit))
-	mask &= (((((W[45] ^ W[46]) >> 29) & 1) - 1) | ^(DV_I_49_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_47_0_bit | DV_II_51_0_bit | DV_II_52_0_bit))
-	mask &= (((((W[44] >> 4) ^ (W[47] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit | DV_II_48_0_bit | DV_II_53_0_bit))
-	mask &= (((((W[43] >> 4) ^ (W[46] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit | DV_II_47_0_bit | DV_II_52_0_bit))
-	mask &= (((((W[43] ^ W[44]) >> 29) & 1) - 1) | ^(DV_I_47_0_bit | DV_I_50_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_49_0_bit | DV_II_50_0_bit))
-	mask &= (((((W[42] >> 4) ^ (W[45] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_51_0_bit))
-	mask &= (((((W[41] >> 4) ^ (W[44] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_50_0_bit))
-	mask &= (((((W[40] ^ W[41]) >> 29) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_47_0_bit | DV_I_48_0_bit | DV_II_46_0_bit | DV_II_47_0_bit | DV_II_56_0_bit))
-	mask &= (((((W[54] ^ W[55]) >> 29) & 1) - 1) | ^(DV_I_51_0_bit | DV_II_47_0_bit | DV_II_50_0_bit | DV_II_55_0_bit | DV_II_56_0_bit))
-	mask &= (((((W[53] ^ W[54]) >> 29) & 1) - 1) | ^(DV_I_50_0_bit | DV_II_46_0_bit | DV_II_49_0_bit | DV_II_54_0_bit | DV_II_55_0_bit))
-	mask &= (((((W[52] ^ W[53]) >> 29) & 1) - 1) | ^(DV_I_49_0_bit | DV_II_45_0_bit | DV_II_48_0_bit | DV_II_53_0_bit | DV_II_54_0_bit))
-	mask &= ((((W[50] ^ (W[53] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_50_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_48_0_bit | DV_II_54_0_bit))
-	mask &= (((((W[50] ^ W[51]) >> 29) & 1) - 1) | ^(DV_I_47_0_bit | DV_II_46_0_bit | DV_II_51_0_bit | DV_II_52_0_bit | DV_II_56_0_bit))
-	mask &= ((((W[49] ^ (W[52] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit | DV_II_47_0_bit | DV_II_53_0_bit))
-	mask &= ((((W[48] ^ (W[51] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit | DV_II_46_0_bit | DV_II_52_0_bit))
-	mask &= (((((W[42] ^ W[43]) >> 29) & 1) - 1) | ^(DV_I_46_0_bit | DV_I_49_0_bit | DV_I_50_0_bit | DV_II_48_0_bit | DV_II_49_0_bit))
-	mask &= (((((W[41] ^ W[42]) >> 29) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_48_0_bit | DV_I_49_0_bit | DV_II_47_0_bit | DV_II_48_0_bit))
-	mask &= (((((W[40] >> 4) ^ (W[43] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_50_0_bit | DV_II_49_0_bit | DV_II_56_0_bit))
-	mask &= (((((W[39] >> 4) ^ (W[42] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_49_0_bit | DV_II_48_0_bit | DV_II_55_0_bit))
-
-	if (mask & (DV_I_44_0_bit | DV_I_48_0_bit | DV_II_47_0_bit | DV_II_54_0_bit | DV_II_56_0_bit)) != 0 {
-		mask &= (((((W[38] >> 4) ^ (W[41] >> 29)) & 1) - 1) | ^(DV_I_44_0_bit | DV_I_48_0_bit | DV_II_47_0_bit | DV_II_54_0_bit | DV_II_56_0_bit))
-	}
-	mask &= (((((W[37] >> 4) ^ (W[40] >> 29)) & 1) - 1) | ^(DV_I_43_0_bit | DV_I_47_0_bit | DV_II_46_0_bit | DV_II_53_0_bit | DV_II_55_0_bit))
-	if (mask & (DV_I_52_0_bit | DV_II_48_0_bit | DV_II_51_0_bit | DV_II_56_0_bit)) != 0 {
-		mask &= (((((W[55] ^ W[56]) >> 29) & 1) - 1) | ^(DV_I_52_0_bit | DV_II_48_0_bit | DV_II_51_0_bit | DV_II_56_0_bit))
-	}
-	if (mask & (DV_I_52_0_bit | DV_II_48_0_bit | DV_II_50_0_bit | DV_II_56_0_bit)) != 0 {
-		mask &= ((((W[52] ^ (W[55] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_52_0_bit | DV_II_48_0_bit | DV_II_50_0_bit | DV_II_56_0_bit))
-	}
-	if (mask & (DV_I_51_0_bit | DV_II_47_0_bit | DV_II_49_0_bit | DV_II_55_0_bit)) != 0 {
-		mask &= ((((W[51] ^ (W[54] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_51_0_bit | DV_II_47_0_bit | DV_II_49_0_bit | DV_II_55_0_bit))
-	}
-	if (mask & (DV_I_48_0_bit | DV_II_47_0_bit | DV_II_52_0_bit | DV_II_53_0_bit)) != 0 {
-		mask &= (((((W[51] ^ W[52]) >> 29) & 1) - 1) | ^(DV_I_48_0_bit | DV_II_47_0_bit | DV_II_52_0_bit | DV_II_53_0_bit))
-	}
-	if (mask & (DV_I_46_0_bit | DV_I_49_0_bit | DV_II_45_0_bit | DV_II_48_0_bit)) != 0 {
-		mask &= (((((W[36] >> 4) ^ (W[40] >> 29)) & 1) - 1) | ^(DV_I_46_0_bit | DV_I_49_0_bit | DV_II_45_0_bit | DV_II_48_0_bit))
-	}
-	if (mask & (DV_I_52_0_bit | DV_II_48_0_bit | DV_II_49_0_bit)) != 0 {
-		mask &= ((0 - (((W[53] ^ W[56]) >> 29) & 1)) | ^(DV_I_52_0_bit | DV_II_48_0_bit | DV_II_49_0_bit))
-	}
-	if (mask & (DV_I_50_0_bit | DV_II_46_0_bit | DV_II_47_0_bit)) != 0 {
-		mask &= ((0 - (((W[51] ^ W[54]) >> 29) & 1)) | ^(DV_I_50_0_bit | DV_II_46_0_bit | DV_II_47_0_bit))
-	}
-	if (mask & (DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit)) != 0 {
-		mask &= ((0 - (((W[50] ^ W[52]) >> 29) & 1)) | ^(DV_I_49_0_bit | DV_I_51_0_bit | DV_II_45_0_bit))
-	}
-	if (mask & (DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit)) != 0 {
-		mask &= ((0 - (((W[49] ^ W[51]) >> 29) & 1)) | ^(DV_I_48_0_bit | DV_I_50_0_bit | DV_I_52_0_bit))
-	}
-	if (mask & (DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit)) != 0 {
-		mask &= ((0 - (((W[48] ^ W[50]) >> 29) & 1)) | ^(DV_I_47_0_bit | DV_I_49_0_bit | DV_I_51_0_bit))
-	}
-	if (mask & (DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit)) != 0 {
-		mask &= ((0 - (((W[47] ^ W[49]) >> 29) & 1)) | ^(DV_I_46_0_bit | DV_I_48_0_bit | DV_I_50_0_bit))
-	}
-	if (mask & (DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit)) != 0 {
-		mask &= ((0 - (((W[46] ^ W[48]) >> 29) & 1)) | ^(DV_I_45_0_bit | DV_I_47_0_bit | DV_I_49_0_bit))
-	}
-	mask &= ((((W[45] ^ W[47]) & (1 << 6)) - (1 << 6)) | ^(DV_I_47_2_bit | DV_I_49_2_bit | DV_I_51_2_bit))
-	if (mask & (DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit)) != 0 {
-		mask &= ((0 - (((W[45] ^ W[47]) >> 29) & 1)) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_I_48_0_bit))
-	}
-	mask &= (((((W[44] ^ W[46]) >> 6) & 1) - 1) | ^(DV_I_46_2_bit | DV_I_48_2_bit | DV_I_50_2_bit))
-	if (mask & (DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit)) != 0 {
-		mask &= ((0 - (((W[44] ^ W[46]) >> 29) & 1)) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_I_47_0_bit))
-	}
-	mask &= ((0 - ((W[41] ^ (W[42] >> 5)) & (1 << 1))) | ^(DV_I_48_2_bit | DV_II_46_2_bit | DV_II_51_2_bit))
-	mask &= ((0 - ((W[40] ^ (W[41] >> 5)) & (1 << 1))) | ^(DV_I_47_2_bit | DV_I_51_2_bit | DV_II_50_2_bit))
-	if (mask & (DV_I_44_0_bit | DV_I_46_0_bit | DV_II_56_0_bit)) != 0 {
-		mask &= ((0 - (((W[40] ^ W[42]) >> 4) & 1)) | ^(DV_I_44_0_bit | DV_I_46_0_bit | DV_II_56_0_bit))
-	}
-	mask &= ((0 - ((W[39] ^ (W[40] >> 5)) & (1 << 1))) | ^(DV_I_46_2_bit | DV_I_50_2_bit | DV_II_49_2_bit))
-	if (mask & (DV_I_43_0_bit | DV_I_45_0_bit | DV_II_55_0_bit)) != 0 {
-		mask &= ((0 - (((W[39] ^ W[41]) >> 4) & 1)) | ^(DV_I_43_0_bit | DV_I_45_0_bit | DV_II_55_0_bit))
-	}
-	if (mask & (DV_I_44_0_bit | DV_II_54_0_bit | DV_II_56_0_bit)) != 0 {
-		mask &= ((0 - (((W[38] ^ W[40]) >> 4) & 1)) | ^(DV_I_44_0_bit | DV_II_54_0_bit | DV_II_56_0_bit))
-	}
-	if (mask & (DV_I_43_0_bit | DV_II_53_0_bit | DV_II_55_0_bit)) != 0 {
-		mask &= ((0 - (((W[37] ^ W[39]) >> 4) & 1)) | ^(DV_I_43_0_bit | DV_II_53_0_bit | DV_II_55_0_bit))
-	}
-	mask &= ((0 - ((W[36] ^ (W[37] >> 5)) & (1 << 1))) | ^(DV_I_47_2_bit | DV_I_50_2_bit | DV_II_46_2_bit))
-	if (mask & (DV_I_45_0_bit | DV_I_48_0_bit | DV_II_47_0_bit)) != 0 {
-		mask &= (((((W[35] >> 4) ^ (W[39] >> 29)) & 1) - 1) | ^(DV_I_45_0_bit | DV_I_48_0_bit | DV_II_47_0_bit))
-	}
-	if (mask & (DV_I_48_0_bit | DV_II_48_0_bit)) != 0 {
-		mask &= ((0 - ((W[63] ^ (W[64] >> 5)) & (1 << 0))) | ^(DV_I_48_0_bit | DV_II_48_0_bit))
-	}
-	if (mask & (DV_I_45_0_bit | DV_II_45_0_bit)) != 0 {
-		mask &= ((0 - ((W[63] ^ (W[64] >> 5)) & (1 << 1))) | ^(DV_I_45_0_bit | DV_II_45_0_bit))
-	}
-	if (mask & (DV_I_47_0_bit | DV_II_47_0_bit)) != 0 {
-		mask &= ((0 - ((W[62] ^ (W[63] >> 5)) & (1 << 0))) | ^(DV_I_47_0_bit | DV_II_47_0_bit))
-	}
-	if (mask & (DV_I_46_0_bit | DV_II_46_0_bit)) != 0 {
-		mask &= ((0 - ((W[61] ^ (W[62] >> 5)) & (1 << 0))) | ^(DV_I_46_0_bit | DV_II_46_0_bit))
-	}
-	mask &= ((0 - ((W[61] ^ (W[62] >> 5)) & (1 << 2))) | ^(DV_I_46_2_bit | DV_II_46_2_bit))
-	if (mask & (DV_I_45_0_bit | DV_II_45_0_bit)) != 0 {
-		mask &= ((0 - ((W[60] ^ (W[61] >> 5)) & (1 << 0))) | ^(DV_I_45_0_bit | DV_II_45_0_bit))
-	}
-	if (mask & (DV_II_51_0_bit | DV_II_54_0_bit)) != 0 {
-		mask &= (((((W[58] ^ W[59]) >> 29) & 1) - 1) | ^(DV_II_51_0_bit | DV_II_54_0_bit))
-	}
-	if (mask & (DV_II_50_0_bit | DV_II_53_0_bit)) != 0 {
-		mask &= (((((W[57] ^ W[58]) >> 29) & 1) - 1) | ^(DV_II_50_0_bit | DV_II_53_0_bit))
-	}
-	if (mask & (DV_II_52_0_bit | DV_II_54_0_bit)) != 0 {
-		mask &= ((((W[56] ^ (W[59] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_52_0_bit | DV_II_54_0_bit))
-	}
-	if (mask & (DV_II_51_0_bit | DV_II_52_0_bit)) != 0 {
-		mask &= ((0 - (((W[56] ^ W[59]) >> 29) & 1)) | ^(DV_II_51_0_bit | DV_II_52_0_bit))
-	}
-	if (mask & (DV_II_49_0_bit | DV_II_52_0_bit)) != 0 {
-		mask &= (((((W[56] ^ W[57]) >> 29) & 1) - 1) | ^(DV_II_49_0_bit | DV_II_52_0_bit))
-	}
-	if (mask & (DV_II_51_0_bit | DV_II_53_0_bit)) != 0 {
-		mask &= ((((W[55] ^ (W[58] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_51_0_bit | DV_II_53_0_bit))
-	}
-	if (mask & (DV_II_50_0_bit | DV_II_52_0_bit)) != 0 {
-		mask &= ((((W[54] ^ (W[57] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_50_0_bit | DV_II_52_0_bit))
-	}
-	if (mask & (DV_II_49_0_bit | DV_II_51_0_bit)) != 0 {
-		mask &= ((((W[53] ^ (W[56] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_II_49_0_bit | DV_II_51_0_bit))
-	}
-	mask &= ((((W[51] ^ (W[50] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_50_2_bit | DV_II_46_2_bit))
-	mask &= ((((W[48] ^ W[50]) & (1 << 6)) - (1 << 6)) | ^(DV_I_50_2_bit | DV_II_46_2_bit))
-	if (mask & (DV_I_51_0_bit | DV_I_52_0_bit)) != 0 {
-		mask &= ((0 - (((W[48] ^ W[55]) >> 29) & 1)) | ^(DV_I_51_0_bit | DV_I_52_0_bit))
-	}
-	mask &= ((((W[47] ^ W[49]) & (1 << 6)) - (1 << 6)) | ^(DV_I_49_2_bit | DV_I_51_2_bit))
-	mask &= ((((W[48] ^ (W[47] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_47_2_bit | DV_II_51_2_bit))
-	mask &= ((((W[46] ^ W[48]) & (1 << 6)) - (1 << 6)) | ^(DV_I_48_2_bit | DV_I_50_2_bit))
-	mask &= ((((W[47] ^ (W[46] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_46_2_bit | DV_II_50_2_bit))
-	mask &= ((0 - ((W[44] ^ (W[45] >> 5)) & (1 << 1))) | ^(DV_I_51_2_bit | DV_II_49_2_bit))
-	mask &= ((((W[43] ^ W[45]) & (1 << 6)) - (1 << 6)) | ^(DV_I_47_2_bit | DV_I_49_2_bit))
-	mask &= (((((W[42] ^ W[44]) >> 6) & 1) - 1) | ^(DV_I_46_2_bit | DV_I_48_2_bit))
-	mask &= ((((W[43] ^ (W[42] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_II_46_2_bit | DV_II_51_2_bit))
-	mask &= ((((W[42] ^ (W[41] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_51_2_bit | DV_II_50_2_bit))
-	mask &= ((((W[41] ^ (W[40] >> 5)) & (1 << 1)) - (1 << 1)) | ^(DV_I_50_2_bit | DV_II_49_2_bit))
-	if (mask & (DV_I_52_0_bit | DV_II_51_0_bit)) != 0 {
-		mask &= ((((W[39] ^ (W[43] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_52_0_bit | DV_II_51_0_bit))
-	}
-	if (mask & (DV_I_51_0_bit | DV_II_50_0_bit)) != 0 {
-		mask &= ((((W[38] ^ (W[42] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_51_0_bit | DV_II_50_0_bit))
-	}
-	if (mask & (DV_I_48_2_bit | DV_I_51_2_bit)) != 0 {
-		mask &= ((0 - ((W[37] ^ (W[38] >> 5)) & (1 << 1))) | ^(DV_I_48_2_bit | DV_I_51_2_bit))
-	}
-	if (mask & (DV_I_50_0_bit | DV_II_49_0_bit)) != 0 {
-		mask &= ((((W[37] ^ (W[41] >> 25)) & (1 << 4)) - (1 << 4)) | ^(DV_I_50_0_bit | DV_II_49_0_bit))
-	}
-	if (mask & (DV_II_52_0_bit | DV_II_54_0_bit)) != 0 {
-		mask &= ((0 - ((W[36] ^ W[38]) & (1 << 4))) | ^(DV_II_52_0_bit | DV_II_54_0_bit))
-	}
-	mask &= ((0 - ((W[35] ^ (W[36] >> 5)) & (1 << 1))) | ^(DV_I_46_2_bit | DV_I_49_2_bit))
-	if (mask & (DV_I_51_0_bit | DV_II_47_0_bit)) != 0 {
-		mask &= ((((W[35] ^ (W[39] >> 25)) & (1 << 3)) - (1 << 3)) | ^(DV_I_51_0_bit | DV_II_47_0_bit))
-	}
-
-	if mask != 0 {
-		if (mask & DV_I_43_0_bit) != 0 {
-			if not((W[61]^(W[62]>>5))&(1<<1)) != 0 ||
-				not(not((W[59]^(W[63]>>25))&(1<<5))) != 0 ||
-				not((W[58]^(W[63]>>30))&(1<<0)) != 0 {
-				mask &= ^DV_I_43_0_bit
-			}
-		}
-		if (mask & DV_I_44_0_bit) != 0 {
-			if not((W[62]^(W[63]>>5))&(1<<1)) != 0 ||
-				not(not((W[60]^(W[64]>>25))&(1<<5))) != 0 ||
-				not((W[59]^(W[64]>>30))&(1<<0)) != 0 {
-				mask &= ^DV_I_44_0_bit
-			}
-		}
-		if (mask & DV_I_46_2_bit) != 0 {
-			mask &= ((^((W[40] ^ W[42]) >> 2)) | ^DV_I_46_2_bit)
-		}
-		if (mask & DV_I_47_2_bit) != 0 {
-			if not((W[62]^(W[63]>>5))&(1<<2)) != 0 ||
-				not(not((W[41]^W[43])&(1<<6))) != 0 {
-				mask &= ^DV_I_47_2_bit
-			}
-		}
-		if (mask & DV_I_48_2_bit) != 0 {
-			if not((W[63]^(W[64]>>5))&(1<<2)) != 0 ||
-				not(not((W[48]^(W[49]<<5))&(1<<6))) != 0 {
-				mask &= ^DV_I_48_2_bit
-			}
-		}
-		if (mask & DV_I_49_2_bit) != 0 {
-			if not(not((W[49]^(W[50]<<5))&(1<<6))) != 0 ||
-				not((W[42]^W[50])&(1<<1)) != 0 ||
-				not(not((W[39]^(W[40]<<5))&(1<<6))) != 0 ||
-				not((W[38]^W[40])&(1<<1)) != 0 {
-				mask &= ^DV_I_49_2_bit
-			}
-		}
-		if (mask & DV_I_50_0_bit) != 0 {
-			mask &= (((W[36] ^ W[37]) << 7) | ^DV_I_50_0_bit)
-		}
-		if (mask & DV_I_50_2_bit) != 0 {
-			mask &= (((W[43] ^ W[51]) << 11) | ^DV_I_50_2_bit)
-		}
-		if (mask & DV_I_51_0_bit) != 0 {
-			mask &= (((W[37] ^ W[38]) << 9) | ^DV_I_51_0_bit)
-		}
-		if (mask & DV_I_51_2_bit) != 0 {
-			if not(not((W[51]^(W[52]<<5))&(1<<6))) != 0 ||
-				not(not((W[49]^W[51])&(1<<6))) != 0 ||
-				not(not((W[37]^(W[37]>>5))&(1<<1))) != 0 ||
-				not(not((W[35]^(W[39]>>25))&(1<<5))) != 0 {
-				mask &= ^DV_I_51_2_bit
-			}
-		}
-		if (mask & DV_I_52_0_bit) != 0 {
-			mask &= (((W[38] ^ W[39]) << 11) | ^DV_I_52_0_bit)
-		}
-		if (mask & DV_II_46_2_bit) != 0 {
-			mask &= (((W[47] ^ W[51]) << 17) | ^DV_II_46_2_bit)
-		}
-		if (mask & DV_II_48_0_bit) != 0 {
-			if not(not((W[36]^(W[40]>>25))&(1<<3))) != 0 ||
-				not((W[35]^(W[40]<<2))&(1<<30)) != 0 {
-				mask &= ^DV_II_48_0_bit
-			}
-		}
-		if (mask & DV_II_49_0_bit) != 0 {
-			if not(not((W[37]^(W[41]>>25))&(1<<3))) != 0 ||
-				not((W[36]^(W[41]<<2))&(1<<30)) != 0 {
-				mask &= ^DV_II_49_0_bit
-			}
-		}
-		if (mask & DV_II_49_2_bit) != 0 {
-			if not(not((W[53]^(W[54]<<5))&(1<<6))) != 0 ||
-				not(not((W[51]^W[53])&(1<<6))) != 0 ||
-				not((W[50]^W[54])&(1<<1)) != 0 ||
-				not(not((W[45]^(W[46]<<5))&(1<<6))) != 0 ||
-				not(not((W[37]^(W[41]>>25))&(1<<5))) != 0 ||
-				not((W[36]^(W[41]>>30))&(1<<0)) != 0 {
-				mask &= ^DV_II_49_2_bit
-			}
-		}
-		if (mask & DV_II_50_0_bit) != 0 {
-			if not((W[55]^W[58])&(1<<29)) != 0 ||
-				not(not((W[38]^(W[42]>>25))&(1<<3))) != 0 ||
-				not((W[37]^(W[42]<<2))&(1<<30)) != 0 {
-				mask &= ^DV_II_50_0_bit
-			}
-		}
-		if (mask & DV_II_50_2_bit) != 0 {
-			if not(not((W[54]^(W[55]<<5))&(1<<6))) != 0 ||
-				not(not((W[52]^W[54])&(1<<6))) != 0 ||
-				not((W[51]^W[55])&(1<<1)) != 0 ||
-				not((W[45]^W[47])&(1<<1)) != 0 ||
-				not(not((W[38]^(W[42]>>25))&(1<<5))) != 0 ||
-				not((W[37]^(W[42]>>30))&(1<<0)) != 0 {
-				mask &= ^DV_II_50_2_bit
-			}
-		}
-		if (mask & DV_II_51_0_bit) != 0 {
-			if not(not((W[39]^(W[43]>>25))&(1<<3))) != 0 ||
-				not((W[38]^(W[43]<<2))&(1<<30)) != 0 {
-				mask &= ^DV_II_51_0_bit
-			}
-		}
-		if (mask & DV_II_51_2_bit) != 0 {
-			if not(not((W[55]^(W[56]<<5))&(1<<6))) != 0 ||
-				not(not((W[53]^W[55])&(1<<6))) != 0 ||
-				not((W[52]^W[56])&(1<<1)) != 0 ||
-				not((W[46]^W[48])&(1<<1)) != 0 ||
-				not(not((W[39]^(W[43]>>25))&(1<<5))) != 0 ||
-				not((W[38]^(W[43]>>30))&(1<<0)) != 0 {
-				mask &= ^DV_II_51_2_bit
-			}
-		}
-		if (mask & DV_II_52_0_bit) != 0 {
-			if not(not((W[59]^W[60])&(1<<29))) != 0 ||
-				not(not((W[40]^(W[44]>>25))&(1<<3))) != 0 ||
-				not(not((W[40]^(W[44]>>25))&(1<<4))) != 0 ||
-				not((W[39]^(W[44]<<2))&(1<<30)) != 0 {
-				mask &= ^DV_II_52_0_bit
-			}
-		}
-		if (mask & DV_II_53_0_bit) != 0 {
-			if not((W[58]^W[61])&(1<<29)) != 0 ||
-				not(not((W[57]^(W[61]>>25))&(1<<4))) != 0 ||
-				not(not((W[41]^(W[45]>>25))&(1<<3))) != 0 ||
-				not(not((W[41]^(W[45]>>25))&(1<<4))) != 0 {
-				mask &= ^DV_II_53_0_bit
-			}
-		}
-		if (mask & DV_II_54_0_bit) != 0 {
-			if not(not((W[58]^(W[62]>>25))&(1<<4))) != 0 ||
-				not(not((W[42]^(W[46]>>25))&(1<<3))) != 0 ||
-				not(not((W[42]^(W[46]>>25))&(1<<4))) != 0 {
-				mask &= ^DV_II_54_0_bit
-			}
-		}
-		if (mask & DV_II_55_0_bit) != 0 {
-			if not(not((W[59]^(W[63]>>25))&(1<<4))) != 0 ||
-				not(not((W[57]^(W[59]>>25))&(1<<4))) != 0 ||
-				not(not((W[43]^(W[47]>>25))&(1<<3))) != 0 ||
-				not(not((W[43]^(W[47]>>25))&(1<<4))) != 0 {
-				mask &= ^DV_II_55_0_bit
-			}
-		}
-		if (mask & DV_II_56_0_bit) != 0 {
-			if not(not((W[60]^(W[64]>>25))&(1<<4))) != 0 ||
-				not(not((W[44]^(W[48]>>25))&(1<<3))) != 0 ||
-				not(not((W[44]^(W[48]>>25))&(1<<4))) != 0 {
-				mask &= ^DV_II_56_0_bit
-			}
-		}
-	}
-
-	return mask
-}
-
-func not(x uint32) uint32 {
-	if x == 0 {
-		return 1
-	}
-
-	return 0
-}
-
-func SHA1_dvs() []DvInfo {
-	return sha1_dvs
-}
diff --git a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_noasm.go b/vendor/github.com/pjbgf/sha1cd/ubc/ubc_noasm.go
deleted file mode 100644
index 48d6dff16..000000000
--- a/vendor/github.com/pjbgf/sha1cd/ubc/ubc_noasm.go
+++ /dev/null
@@ -1,12 +0,0 @@
-//go:build !amd64 || noasm || !gc
-// +build !amd64 noasm !gc
-
-package ubc
-
-// Check takes as input an expanded message block and verifies the unavoidable bitconditions
-// for all listed DVs. It returns a dvmask where each bit belonging to a DV is set if all
-// unavoidable bitconditions for that DV have been met.
-// Thus, one needs to do the recompression check for each DV that has its bit set.
-func CalculateDvMask(W [80]uint32) uint32 {
-	return CalculateDvMaskGeneric(W)
-}
diff --git a/vendor/github.com/sahilm/fuzzy/.travis.yml b/vendor/github.com/sahilm/fuzzy/.travis.yml
deleted file mode 100644
index 6756d8009..000000000
--- a/vendor/github.com/sahilm/fuzzy/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: go
-go:
-  - 1.x
-script:
-  - make
diff --git a/vendor/github.com/sahilm/fuzzy/Gopkg.lock b/vendor/github.com/sahilm/fuzzy/Gopkg.lock
deleted file mode 100644
index 6e3a7fe54..000000000
--- a/vendor/github.com/sahilm/fuzzy/Gopkg.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  digest = "1:ee97ec8a00b2424570c1ce53d7b410e96fbd4c241b29df134276ff6aa3750335"
-  name = "github.com/kylelemons/godebug"
-  packages = [
-    "diff",
-    "pretty",
-  ]
-  pruneopts = ""
-  revision = "d65d576e9348f5982d7f6d83682b694e731a45c6"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = ["github.com/kylelemons/godebug/pretty"]
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/vendor/github.com/sahilm/fuzzy/Gopkg.toml b/vendor/github.com/sahilm/fuzzy/Gopkg.toml
deleted file mode 100644
index 8f96b112e..000000000
--- a/vendor/github.com/sahilm/fuzzy/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test dependency
-[[constraint]]
-  branch = "master"
-  name = "github.com/kylelemons/godebug"
diff --git a/vendor/github.com/sahilm/fuzzy/Makefile b/vendor/github.com/sahilm/fuzzy/Makefile
index 7fa2be4ec..8d150cdd9 100644
--- a/vendor/github.com/sahilm/fuzzy/Makefile
+++ b/vendor/github.com/sahilm/fuzzy/Makefile
@@ -1,14 +1,10 @@
 .PHONY: all
 all: setup lint test
 
+PKGS := $(shell go list ./... | grep -v /vendor)
 .PHONY: test
 test: setup
-	go test -bench ./...
-
-.PHONY: cover
-cover: setup
-	mkdir -p coverage
-	gocov test ./... | gocov-html > coverage/coverage.html
+	go test $(PKGS)
 
 sources = $(shell find . -name '*.go' -not -path './vendor/*')
 .PHONY: goimports
@@ -17,41 +13,47 @@ goimports: setup
 
 .PHONY: lint
 lint: setup
-	gometalinter ./... --enable=goimports --disable=gocyclo --vendor -t
+	$(BIN_DIR)/golangci-lint run
+
+COVERAGE := $(CURDIR)/coverage
+COVER_PROFILE :=$(COVERAGE)/cover.out
+TMP_COVER_PROFILE :=$(COVERAGE)/cover.tmp
+.PHONY: cover
+cover: setup
+	rm -rf $(COVERAGE)
+	mkdir -p $(COVERAGE)
+	echo "mode: set" > $(COVER_PROFILE)
+	for pkg in $(PKGS); do \
+		go test -v -coverprofile=$(TMP_COVER_PROFILE) $$pkg; \
+		if [ -f $(TMP_COVER_PROFILE) ]; then \
+			grep -v 'mode: set' $(TMP_COVER_PROFILE) >> $(COVER_PROFILE); \
+			rm $(TMP_COVER_PROFILE); \
+		fi; \
+	done
+	go tool cover -html=$(COVER_PROFILE) -o $(COVERAGE)/index.html
+
+.PHONY: ci
+ci: setup lint test
 
 .PHONY: install
 install: setup
-	go install
+	go install $(PKGS)
 
+.PHONY: build
+build: setup
+	go build $(PKGS)
+
+GOPATH ?= $(HOME)/go
 BIN_DIR := $(GOPATH)/bin
 GOIMPORTS := $(BIN_DIR)/goimports
-GOMETALINTER := $(BIN_DIR)/gometalinter
-DEP := $(BIN_DIR)/dep
-GOCOV := $(BIN_DIR)/gocov
-GOCOV_HTML := $(BIN_DIR)/gocov-html
+GOLANG_CI_LINT := $(BIN_DIR)/golangci-lint
 
 $(GOIMPORTS):
 	go get -u golang.org/x/tools/cmd/goimports
 
-$(GOMETALINTER):
-	go get -u github.com/alecthomas/gometalinter
-	gometalinter --install &> /dev/null
+$(GOLANG_CI_LINT):
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(BIN_DIR) v2.12.2
 
-$(GOCOV):
-	go get -u github.com/axw/gocov/gocov
+tools: $(GOIMPORTS) $(GOLANG_CI_LINT)
 
-$(GOCOV_HTML):
-	go get -u gopkg.in/matm/v1/gocov-html
-
-$(DEP):
-	go get -u github.com/golang/dep/cmd/dep
-
-tools: $(GOIMPORTS) $(GOMETALINTER) $(GOCOV) $(GOCOV_HTML) $(DEP)
-
-vendor: $(DEP)
-	dep ensure
-
-setup: tools vendor
-
-updatedeps:
-	dep ensure -update
+setup: tools
diff --git a/vendor/github.com/sahilm/fuzzy/README.md b/vendor/github.com/sahilm/fuzzy/README.md
index c632da5d9..ea7bf22b2 100644
--- a/vendor/github.com/sahilm/fuzzy/README.md
+++ b/vendor/github.com/sahilm/fuzzy/README.md
@@ -17,7 +17,7 @@ VSCode, IntelliJ IDEA et al. This library is external dependency-free. It only d
 
 - Speed. Matches are returned in milliseconds. It's perfect for interactive search boxes.
 
-- The positions of matches is returned. Allows you to highlight matching characters.
+- The positions of matches are returned. Allows you to highlight matching characters.
 
 - Unicode aware.
 
@@ -76,7 +76,7 @@ func contains(needle int, haystack []int) bool {
 	return false
 }
 ``` 
-If the data you want to match isn't a slice of strings, you can use `FindFromSource` by implementing
+If the data you want to match isn't a slice of strings, you can use `FindFrom` by implementing
 the provided `Source` interface. Here's an example:
 
 ```go
@@ -119,7 +119,9 @@ func main() {
 		},
 	}
 	results := fuzzy.FindFrom("al", emps)
-	fmt.Println(results)
+	for _, r := range results {
+		fmt.Println(emps[r.Index])
+	}
 }
 ```
 
diff --git a/vendor/github.com/sahilm/fuzzy/fuzzy.go b/vendor/github.com/sahilm/fuzzy/fuzzy.go
index bd66ee66c..38853103a 100644
--- a/vendor/github.com/sahilm/fuzzy/fuzzy.go
+++ b/vendor/github.com/sahilm/fuzzy/fuzzy.go
@@ -6,7 +6,9 @@ VSCode, IntelliJ IDEA et al.
 package fuzzy
 
 import (
+	"iter"
 	"sort"
+	"strings"
 	"unicode"
 	"unicode/utf8"
 )
@@ -39,7 +41,7 @@ type Matches []Match
 
 func (a Matches) Len() int           { return len(a) }
 func (a Matches) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a Matches) Less(i, j int) bool { return a[i].Score >= a[j].Score }
+func (a Matches) Less(i, j int) bool { return a[i].Score > a[j].Score }
 
 // Source represents an abstract source of a list of strings. Source must be iterable type such as a slice.
 // The source will be iterated over till Len() with String(i) being called for each element where i is the
@@ -59,6 +61,16 @@ func (ss stringSource) String(i int) string {
 
 func (ss stringSource) Len() int { return len(ss) }
 
+func iterFromSource(s Source) iter.Seq[string] {
+	return func(yield func(string) bool) {
+		for i := 0; i < s.Len(); i++ {
+			if !yield(s.String(i)) {
+				return
+			}
+		}
+	}
+}
+
 /*
 Find looks up pattern in data and returns matches
 in descending order of match quality. Match quality
@@ -76,26 +88,73 @@ The following types of matches apply a bonus:
 
 Penalties are applied for every character in the search string that wasn't matched and all leading
 characters upto the first match.
+
+Results are sorted by best match.
 */
 func Find(pattern string, data []string) Matches {
 	return FindFrom(pattern, stringSource(data))
 }
 
+/*
+FindNoSort is an alternative Find implementation that does not sort
+the results in the end.
+*/
+func FindNoSort(pattern string, data []string) Matches {
+	return FindFromNoSort(pattern, stringSource(data))
+}
+
 /*
 FindFrom is an alternative implementation of Find using a Source
 instead of a list of strings.
 */
 func FindFrom(pattern string, data Source) Matches {
+	matches := FindFromNoSort(pattern, data)
+	sort.Stable(matches)
+	return matches
+}
+
+/*
+FindFromNoSort is an alternative FindFrom implementation that does
+not sort results in the end.
+*/
+func FindFromNoSort(pattern string, data Source) Matches {
+	return FindFromIterNoSort(pattern, iterFromSource(data))
+}
+
+/*
+FindFromIter is an alternative implementation of FindFrom that uses an iterator
+instead of Source.
+*/
+func FindFromIter(pattern string, it iter.Seq[string]) Matches {
+	matches := FindFromIterNoSort(pattern, it)
+	sort.Stable(matches)
+	return matches
+}
+
+/*
+FindFromIterNoSort is an alternative implementation of FindFromIter that does
+not sort results in the end.
+*/
+func FindFromIterNoSort(pattern string, it iter.Seq[string]) Matches {
 	if len(pattern) == 0 {
 		return nil
 	}
 	runes := []rune(pattern)
 	var matches Matches
 	var matchedIndexes []int
-	for i := 0; i < data.Len(); i++ {
+	var i int
+	for matchStr := range it {
 		var match Match
-		match.Str = data.String(i)
+		match.Str = matchStr
+		// Limit matching to the first NUL rune, if any. We could maybe replace it
+		// with whitespace, but this way doesn't allocate so much, and the presence
+		// of NULs is most often an error by the library user.
+		cleanMatchStr := matchStr
+		if nullI := strings.IndexRune(matchStr, 0); nullI > -1 {
+			cleanMatchStr = cleanMatchStr[:nullI]
+		}
 		match.Index = i
+		i++
 		if matchedIndexes != nil {
 			match.MatchedIndexes = matchedIndexes
 		} else {
@@ -108,10 +167,10 @@ func FindFrom(pattern string, data Source) Matches {
 		currAdjacentMatchBonus := 0
 		var last rune
 		var lastIndex int
-		nextc, nextSize := utf8.DecodeRuneInString(data.String(i))
+		nextc, nextSize := utf8.DecodeRuneInString(cleanMatchStr)
 		var candidate rune
 		var candidateSize int
-		for j := 0; j < len(data.String(i)); j += candidateSize {
+		for j := 0; j < len(cleanMatchStr); j += candidateSize {
 			candidate, candidateSize = nextc, nextSize
 			if equalFold(candidate, runes[patternIndex]) {
 				score = 0
@@ -141,11 +200,11 @@ func FindFrom(pattern string, data Source) Matches {
 			if patternIndex < len(runes)-1 {
 				nextp = runes[patternIndex+1]
 			}
-			if j+candidateSize < len(data.String(i)) {
-				if data.String(i)[j+candidateSize] < utf8.RuneSelf { // Fast path for ASCII
-					nextc, nextSize = rune(data.String(i)[j+candidateSize]), 1
+			if j+candidateSize < len(cleanMatchStr) {
+				if cleanMatchStr[j+candidateSize] < utf8.RuneSelf { // Fast path for ASCII
+					nextc, nextSize = rune(cleanMatchStr[j+candidateSize]), 1
 				} else {
-					nextc, nextSize = utf8.DecodeRuneInString(data.String(i)[j+candidateSize:])
+					nextc, nextSize = utf8.DecodeRuneInString(cleanMatchStr[j+candidateSize:])
 				}
 			} else {
 				nextc, nextSize = 0, 0
@@ -172,7 +231,7 @@ func FindFrom(pattern string, data Source) Matches {
 			last = candidate
 		}
 		// apply penalty for each unmatched character
-		penalty := len(match.MatchedIndexes) - len(data.String(i))
+		penalty := len(match.MatchedIndexes) - len(cleanMatchStr)
 		match.Score += penalty
 		if len(match.MatchedIndexes) == len(runes) {
 			matches = append(matches, match)
@@ -181,7 +240,6 @@ func FindFrom(pattern string, data Source) Matches {
 			matchedIndexes = match.MatchedIndexes[:0] // Recycle match index slice
 		}
 	}
-	sort.Stable(matches)
 	return matches
 }
 
diff --git a/vendor/github.com/samber/lo/.golangci.yml b/vendor/github.com/samber/lo/.golangci.yml
new file mode 100644
index 000000000..2f6c810ff
--- /dev/null
+++ b/vendor/github.com/samber/lo/.golangci.yml
@@ -0,0 +1,104 @@
+version: "2"
+run:
+  concurrency: 4
+  # also lint _test.go files
+  tests: true
+  timeout: 5m
+linters:
+  enable:
+    - govet
+    - staticcheck
+    - unused
+    - errcheck
+    - gocritic
+    - gocyclo
+    - revive
+    - ineffassign
+    - unconvert
+    - goconst
+    # - depguard
+    - prealloc
+    # - dupl
+    - misspell
+    - bodyclose
+    - sqlclosecheck
+    - nilerr
+    - nestif
+    - forcetypeassert
+    - exhaustive
+    - funlen
+    # - wsl_v5
+    - testifylint
+    - whitespace
+    - perfsprint
+    - nolintlint
+    - godot
+    - thelper
+    - tparallel
+    - paralleltest
+    - predeclared
+
+  # disable noisy/controversial ones which you might enable later
+  disable:
+    - lll          # line length — handled by gofmt/gofumpt
+
+  settings:
+    dupl:
+      threshold: 20  # lower => stricter (tokens)
+    errcheck:
+      check-type-assertions: true
+    funlen:
+      lines: 120
+      statements: 80
+    goconst:
+      min-len: 2
+      min-occurrences: 3
+    gocyclo:
+      min-complexity: 15 # strict; lower => stricter
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
+    testifylint:
+      disable:
+        - require-error
+        - float-compare
+
+  exclusions:
+    generated: lax
+    paths:
+      - examples$
+    rules:
+      - linters:
+          - revive
+        text: "^unused-parameter:"
+      - linters:
+          - revive
+        text: "^package-comments:"
+      - linters:
+          - errcheck
+        text: "Error return value of `.*\\.Body\\.Close` is not checked"
+      # linters disabled in tests
+      - linters:
+          - dupl
+          - goconst
+          - funlen
+        path: "_test\\.go$"
+
+issues:
+  max-issues-per-linter: 0  # 0 = unlimited (we want ALL issues)
+  max-same-issues: 100
+
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/vendor/github.com/samber/lo/.travis.yml b/vendor/github.com/samber/lo/.travis.yml
deleted file mode 100644
index f0de7f51c..000000000
--- a/vendor/github.com/samber/lo/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: go
-before_install:
-  - go mod download
-  - make tools
-go:
-  - "1.18"
-script: make test
diff --git a/vendor/github.com/samber/lo/CHANGELOG.md b/vendor/github.com/samber/lo/CHANGELOG.md
deleted file mode 100644
index 9ba32f1b6..000000000
--- a/vendor/github.com/samber/lo/CHANGELOG.md
+++ /dev/null
@@ -1,347 +0,0 @@
-# Changelog
-
-@samber: I sometimes forget to update this file. Ping me on [Twitter](https://twitter.com/samuelberthe) or open an issue in case of error. We need to keep a clear changelog for easier lib upgrade.
-
-## 1.31.0 (2022-10-06)
-
-Adding:
-
-- lo.SliceToChannel
-- lo.Generator
-- lo.Batch
-- lo.BatchWithTimeout
-
-## 1.30.1 (2022-10-06)
-
-Fix:
-
-- lo.Try1: remove generic type
-- lo.Validate: format error properly
-
-## 1.30.0 (2022-10-04)
-
-Adding:
-
-- lo.TernaryF
-- lo.Validate
-
-## 1.29.0 (2022-10-02)
-
-Adding:
-
-- lo.ErrorAs
-- lo.TryOr
-- lo.TryOrX
-
-## 1.28.0 (2022-09-05)
-
-Adding:
-
-- lo.ChannelDispatcher with 6 dispatching strategies:
-  - lo.DispatchingStrategyRoundRobin
-  - lo.DispatchingStrategyRandom
-  - lo.DispatchingStrategyWeightedRandom
-  - lo.DispatchingStrategyFirst
-  - lo.DispatchingStrategyLeast
-  - lo.DispatchingStrategyMost
-
-## 1.27.1 (2022-08-15)
-
-Bugfix:
-
-- Removed comparable constraint for lo.FindKeyBy
-
-## 1.27.0 (2022-07-29)
-
-Breaking:
-
-- Change of MapToSlice prototype: `MapToSlice[K comparable, V any, R any](in map[K]V, iteratee func(V, K) R) []R` -> `MapToSlice[K comparable, V any, R any](in map[K]V, iteratee func(K, V) R) []R`
-
-Added:
-
-- lo.ChunkString
-- lo.SliceToMap (alias to lo.Associate)
-
-## 1.26.0 (2022-07-24)
-
-Adding:
-
-- lo.Associate
-- lo.ReduceRight
-- lo.FromPtrOr
-- lo.MapToSlice
-- lo.IsSorted
-- lo.IsSortedByKey
-
-## 1.25.0 (2022-07-04)
-
-Adding:
-
-- lo.FindUniques
-- lo.FindUniquesBy
-- lo.FindDuplicates
-- lo.FindDuplicatesBy
-- lo.IsNotEmpty
-
-## 1.24.0 (2022-07-04)
-
-Adding:
-
-- lo.Without
-- lo.WithoutEmpty
-
-## 1.23.0 (2022-07-04)
-
-Adding:
-
-- lo.FindKey
-- lo.FindKeyBy
-
-## 1.22.0 (2022-07-04)
-
-Adding:
-
-- lo.Slice
-- lo.FromPtr
-- lo.IsEmpty
-- lo.Compact
-- lo.ToPairs: alias to lo.Entries
-- lo.FromPairs: alias to lo.FromEntries
-- lo.Partial
-
-Change:
-
-- lo.Must + lo.MustX: add context to panic message
-
-Fix:
-
-- lo.Nth: out of bound exception (#137)
-
-## 1.21.0 (2022-05-10)
-
-Adding:
-
-- lo.ToAnySlice
-- lo.FromAnySlice
-
-## 1.20.0 (2022-05-02)
-
-Adding:
-
-- lo.Synchronize
-- lo.SumBy
-
-Change:
-- Removed generic type definition for lo.Try0: `lo.Try0[T]()` -> `lo.Try0()`
-
-## 1.19.0 (2022-04-30)
-
-Adding:
-
-- lo.RepeatBy
-- lo.Subset
-- lo.Replace
-- lo.ReplaceAll
-- lo.Substring
-- lo.RuneLength
-
-## 1.18.0 (2022-04-28)
-
-Adding:
-
-- lo.SomeBy
-- lo.EveryBy
-- lo.None
-- lo.NoneBy
-
-## 1.17.0 (2022-04-27)
-
-Adding:
-
-- lo.Unpack2 -> lo.Unpack3
-- lo.Async0 -> lo.Async6
-
-## 1.16.0 (2022-04-26)
-
-Adding:
-
-- lo.AttemptWithDelay
-
-## 1.15.0 (2022-04-22)
-
-Improvement:
-
-- lo.Must: error or boolean value
-
-## 1.14.0 (2022-04-21)
-
-Adding:
-
-- lo.Coalesce
-
-## 1.13.0 (2022-04-14)
-
-Adding:
-
-- PickBy
-- PickByKeys
-- PickByValues
-- OmitBy
-- OmitByKeys
-- OmitByValues
-- Clamp
-- MapKeys
-- Invert
-- IfF + ElseIfF + ElseF
-- T0() + T1() + T2() + T3() + ...
-
-## 1.12.0 (2022-04-12)
-
-Adding:
-
-- Must
-- Must{0-6}
-- FindOrElse
-- Async
-- MinBy
-- MaxBy
-- Count
-- CountBy
-- FindIndexOf
-- FindLastIndexOf
-- FilterMap
-
-## 1.11.0 (2022-03-11)
-
-Adding:
-
-- Try
-- Try{0-6}
-- TryWitchValue
-- TryCatch
-- TryCatchWitchValue
-- Debounce
-- Reject
-
-## 1.10.0 (2022-03-11)
-
-Adding:
-
-- Range
-- RangeFrom
-- RangeWithSteps
-
-## 1.9.0 (2022-03-10)
-
-Added
-
-- Drop
-- DropRight
-- DropWhile
-- DropRightWhile
-
-## 1.8.0 (2022-03-10)
-
-Adding Union.
-
-## 1.7.0 (2022-03-09)
-
-Adding ContainBy
-
-Adding MapValues
-
-Adding FlatMap
-
-## 1.6.0 (2022-03-07)
-
-Fixed PartitionBy.
-
-Adding Sample
-
-Adding Samples
-
-## 1.5.0 (2022-03-07)
-
-Adding Times
-
-Adding Attempt
-
-Adding Repeat
-
-## 1.4.0 (2022-03-07)
-
-- adding tuple types (2->9)
-- adding Zip + Unzip
-- adding lo.PartitionBy + lop.PartitionBy
-- adding lop.GroupBy
-- fixing Nth
-
-## 1.3.0 (2022-03-03)
-
-Last and Nth return errors
-
-## 1.2.0 (2022-03-03)
-
-Adding `lop.Map` and `lop.ForEach`.
-
-## 1.1.0 (2022-03-03)
-
-Adding `i int` param to `lo.Map()`, `lo.Filter()`, `lo.ForEach()` and `lo.Reduce()` predicates.
-
-## 1.0.0 (2022-03-02)
-
-*Initial release*
-
-Supported helpers for slices:
-
-- Filter
-- Map
-- Reduce
-- ForEach
-- Uniq
-- UniqBy
-- GroupBy
-- Chunk
-- Flatten
-- Shuffle
-- Reverse
-- Fill
-- ToMap
-
-Supported helpers for maps:
-
-- Keys
-- Values
-- Entries
-- FromEntries
-- Assign (maps merge)
-
-Supported intersection helpers:
-
-- Contains
-- Every
-- Some
-- Intersect
-- Difference
-
-Supported search helpers:
-
-- IndexOf
-- LastIndexOf
-- Find
-- Min
-- Max
-- Last
-- Nth
-
-Other functional programming helpers:
-
-- Ternary (1 line if/else statement)
-- If / ElseIf / Else
-- Switch / Case / Default
-- ToPtr
-- ToSlicePtr
-
-Constraints:
-
-- Clonable
diff --git a/vendor/github.com/samber/lo/Dockerfile b/vendor/github.com/samber/lo/Dockerfile
index bd01bbbb4..5dbeb415b 100644
--- a/vendor/github.com/samber/lo/Dockerfile
+++ b/vendor/github.com/samber/lo/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM golang:1.18
+FROM golang:1.23.1
 
 WORKDIR /go/src/github.com/samber/lo
 
diff --git a/vendor/github.com/samber/lo/LICENSE b/vendor/github.com/samber/lo/LICENSE
index c3dc72d9a..2e3ebd5e8 100644
--- a/vendor/github.com/samber/lo/LICENSE
+++ b/vendor/github.com/samber/lo/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Samuel Berthe
+Copyright (c) 2022-2025 Samuel Berthe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/github.com/samber/lo/Makefile b/vendor/github.com/samber/lo/Makefile
index 57bb49159..ad9267ba6 100644
--- a/vendor/github.com/samber/lo/Makefile
+++ b/vendor/github.com/samber/lo/Makefile
@@ -1,44 +1,57 @@
-
-BIN=go
+# Only build/test/lint exp/simd when Go version is >= 1.26 (requires goexperiment.simd)
+GO_VERSION := $(shell go version 2>/dev/null | sed -n 's/.*go\([0-9]*\)\.\([0-9]*\).*/\1.\2/p')
+GO_SIMD_SUPPORT := $(shell ver="$(GO_VERSION)"; [ -n "$$ver" ] && [ "$$(printf '%s\n1.26\n' "$$ver" | sort -V | tail -1)" = "$$ver" ] && echo yes)
 
 build:
-	${BIN} build -v ./...
+	go build -v ./...
+	@if [ -n "$(GO_SIMD_SUPPORT)" ]; then cd ./exp/simd && GOEXPERIMENT=simd go build -v ./; fi
 
 test:
-	go test -race -v ./...
+	go test -race ./...
+	@if [ -n "$(GO_SIMD_SUPPORT)" ]; then cd ./exp/simd && GOEXPERIMENT=simd go test -race ./; fi
 watch-test:
-	reflex -t 50ms -s -- sh -c 'gotest -race -v ./...'
+	reflex -t 50ms -s -- sh -c 'gotest -race ./...'
 
 bench:
-	go test -benchmem -count 3 -bench ./...
+	go test -v -run=^Benchmark -benchmem -count 3 -bench ./...
 watch-bench:
-	reflex -t 50ms -s -- sh -c 'go test -benchmem -count 3 -bench ./...'
+	reflex -t 50ms -s -- sh -c 'go test -v -run=^Benchmark -benchmem -count 3 -bench ./...'
 
 coverage:
-	${BIN} test -v -coverprofile=cover.out -covermode=atomic .
-	${BIN} tool cover -html=cover.out -o cover.html
+	go test -v -coverprofile=cover.out -covermode=atomic ./...
+	go tool cover -html=cover.out -o cover.html
 
-# tools
 tools:
-	${BIN} install github.com/cespare/reflex@latest
-	${BIN} install github.com/rakyll/gotest@latest
-	${BIN} install github.com/psampaz/go-mod-outdated@latest
-	${BIN} install github.com/jondot/goweight@latest
-	${BIN} install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-	${BIN} get -t -u golang.org/x/tools/cmd/cover
-	${BIN} install github.com/sonatype-nexus-community/nancy@latest
+	go install github.com/cespare/reflex@latest
+	go install github.com/rakyll/gotest@latest
+	go install github.com/psampaz/go-mod-outdated@latest
+	go install github.com/jondot/goweight@latest
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+	go get -t -u golang.org/x/tools/cmd/cover
+	go install github.com/sonatype-nexus-community/nancy@latest
+	go install golang.org/x/perf/cmd/benchstat@latest
+	go install github.com/cespare/prettybench@latest
 	go mod tidy
 
+	# brew install hougesen/tap/mdsf
+
 lint:
 	golangci-lint run --timeout 60s --max-same-issues 50 ./...
+	@if [ -n "$(GO_SIMD_SUPPORT)" ]; then cd ./exp/simd && golangci-lint run --timeout 60s --max-same-issues 50 ./; fi
+	# mdsf verify --debug --log-level warn docs/
 lint-fix:
 	golangci-lint run --timeout 60s --max-same-issues 50 --fix ./...
+	@if [ -n "$(GO_SIMD_SUPPORT)" ]; then cd ./exp/simd && golangci-lint run --timeout 60s --max-same-issues 50 --fix ./; fi
+	# mdsf format --debug --log-level warn docs/
 
-audit: tools
-	${BIN} list -json -m all | nancy sleuth
+audit:
+	go list -json -m all | nancy sleuth
 
-outdated: tools
-	${BIN} list -u -m -json all | go-mod-outdated -update -direct
+outdated:
+	go list -u -m -json all | go-mod-outdated -update -direct
 
-weight: tools
+weight:
 	goweight
+
+doc:
+	cd docs && npm install && npm start
diff --git a/vendor/github.com/samber/lo/README.md b/vendor/github.com/samber/lo/README.md
index 49cbe49da..c9ad48344 100644
--- a/vendor/github.com/samber/lo/README.md
+++ b/vendor/github.com/samber/lo/README.md
@@ -1,27 +1,53 @@
-# lo
+
+# lo - Iterate over slices, maps, channels...
 
 [![tag](https://img.shields.io/github/tag/samber/lo.svg)](https://github.com/samber/lo/releases)
+![Go Version](https://img.shields.io/badge/Go-%3E%3D%201.18-%23007d9c)
 [![GoDoc](https://godoc.org/github.com/samber/lo?status.svg)](https://pkg.go.dev/github.com/samber/lo)
-![Build Status](https://github.com/samber/lo/actions/workflows/go.yml/badge.svg)
+![Build Status](https://github.com/samber/lo/actions/workflows/test.yml/badge.svg)
 [![Go report](https://goreportcard.com/badge/github.com/samber/lo)](https://goreportcard.com/report/github.com/samber/lo)
-[![codecov](https://codecov.io/gh/samber/lo/branch/master/graph/badge.svg)](https://codecov.io/gh/samber/lo)
+[![Coverage](https://img.shields.io/codecov/c/github/samber/lo)](https://codecov.io/gh/samber/lo)
+[![Contributors](https://img.shields.io/github/contributors/samber/lo)](https://github.com/samber/lo/graphs/contributors)
+[![License](https://img.shields.io/github/license/samber/lo)](./LICENSE)
 
 ✨ **`samber/lo` is a Lodash-style Go library based on Go 1.18+ Generics.**
 
-This project started as an experiment with the new generics implementation. It may look like [Lodash](https://github.com/lodash/lodash) in some aspects. I used to code with the fantastic ["go-funk"](https://github.com/thoas/go-funk) package, but "go-funk" uses reflection and therefore is not typesafe.
+A utility library based on Go 1.18+ generics that makes it easier to work with slices, maps, strings, channels, and functions. It provides dozens of handy methods to simplify common coding tasks and improve code readability. It may look like [Lodash](https://github.com/lodash/lodash) in some aspects.
 
-As expected, benchmarks demonstrate that generics will be much faster than implementations based on the "reflect" package. Benchmarks also show similar performance gains compared to pure `for` loops. [See below](#-benchmark).
-
-In the future, 5 to 10 helpers will overlap with those coming into the Go standard library (under package names `slices` and `maps`). I feel this library is legitimate and offers many more valuable abstractions.
+5 to 10 helpers may overlap with those from the Go standard library, in packages `slices` and `maps`. I feel this library is legitimate and offers many more valuable abstractions.
 
 **See also:**
 
+- [samber/ro](https://github.com/samber/ro): Reactive Programming for Go: declarative and composable API for event-driven applications
 - [samber/do](https://github.com/samber/do): A dependency injection toolkit based on Go 1.18+ Generics
 - [samber/mo](https://github.com/samber/mo): Monads based on Go 1.18+ Generics (Option, Result, Either...)
 
+What makes it different from **samber/ro**?
+- lo: synchronous helpers across finite sequences (maps, slices...)
+- ro: processing of infinite data streams for event-driven scenarios
+
+----
+
+
+
+----
+
 **Why this name?**
 
-I wanted a **short name**, similar to "Lodash" and no Go package currently uses this name.
+I wanted a **short name**, similar to "Lodash", and no Go package uses this name.
+
+![lo](docs/static/img/logo-full.png)
 
 ## 🚀 Install
 
@@ -31,7 +57,9 @@ go get github.com/samber/lo@v1
 
 This library is v1 and follows SemVer strictly.
 
-No breaking changes will be made to exported APIs before v2.0.0.
+No breaking changes will be made to exported APIs before v2.0.0, except for experimental packages under `exp/`.
+
+This library has no dependencies outside the Go standard library.
 
 ## 💡 Usage
 
@@ -41,64 +69,109 @@ You can import `lo` using:
 import (
     "github.com/samber/lo"
     lop "github.com/samber/lo/parallel"
+    lom "github.com/samber/lo/mutable"
+    loi "github.com/samber/lo/it"
 )
 ```
 
 Then use one of the helpers below:
 
 ```go
-names := lo.Uniq[string]([]string{"Samuel", "Marc", "Samuel"})
-// []string{"Samuel", "Marc"}
+names := lo.Uniq([]string{"Samuel", "John", "Samuel"})
+// []string{"Samuel", "John"}
 ```
 
-Most of the time, the compiler will be able to infer the type so that you can call: `lo.Uniq([]string{...})`.
+### Tips for lazy developers
+
+I cannot recommend it, but in case you are too lazy for repeating `lo.` everywhere, you can import the entire library into the namespace.
+
+```go
+import (
+    . "github.com/samber/lo"
+)
+```
+
+I take no responsibility for this junk. 😁 💩
 
 ## 🤠 Spec
 
-GoDoc: [https://godoc.org/github.com/samber/lo](https://godoc.org/github.com/samber/lo)
+GoDoc: [godoc.org/github.com/samber/lo](https://godoc.org/github.com/samber/lo)
+
+Documentation: [lo.samber.dev](https://lo.samber.dev/docs/about)
 
 Supported helpers for slices:
 
 - [Filter](#filter)
 - [Map](#map)
+- [UniqMap](#uniqmap)
 - [FilterMap](#filtermap)
 - [FlatMap](#flatmap)
 - [Reduce](#reduce)
 - [ReduceRight](#reduceright)
 - [ForEach](#foreach)
+- [ForEachWhile](#foreachwhile)
 - [Times](#times)
 - [Uniq](#uniq)
 - [UniqBy](#uniqby)
 - [GroupBy](#groupby)
+- [GroupByMap](#groupbymap)
 - [Chunk](#chunk)
+- [Window](#window)
+- [Sliding](#sliding)
 - [PartitionBy](#partitionby)
 - [Flatten](#flatten)
+- [Concat](#concat)
+- [Interleave](#interleave)
 - [Shuffle](#shuffle)
 - [Reverse](#reverse)
 - [Fill](#fill)
 - [Repeat](#repeat)
 - [RepeatBy](#repeatby)
 - [KeyBy](#keyby)
-- [Associate / SliceToMap](#associate-alias-slicetomap)
+- [SliceToMap / Associate](#slicetomap-alias-associate)
+- [FilterSliceToMap](#filterslicetomap)
+- [Keyify](#keyify)
+- [Take](#take)
+- [TakeWhile](#takewhile)
+- [TakeFilter](#takefilter)
 - [Drop](#drop)
 - [DropRight](#dropright)
 - [DropWhile](#dropwhile)
 - [DropRightWhile](#droprightwhile)
+- [DropByIndex](#DropByIndex)
 - [Reject](#reject)
+- [RejectMap](#rejectmap)
+- [FilterReject](#filterreject)
 - [Count](#count)
 - [CountBy](#countby)
+- [CountValues](#countvalues)
+- [CountValuesBy](#countvaluesby)
 - [Subset](#subset)
 - [Slice](#slice)
 - [Replace](#replace)
 - [ReplaceAll](#replaceall)
+- [Clone](#clone)
 - [Compact](#compact)
 - [IsSorted](#issorted)
-- [IsSortedByKey](#issortedbykey)
+- [IsSortedBy](#issortedby)
+- [Splice](#Splice)
+- [Cut](#Cut)
+- [CutPrefix](#CutPrefix)
+- [CutSuffix](#CutSuffix)
+- [Trim](#Trim)
+- [TrimLeft](#TrimLeft)
+- [TrimPrefix](#TrimPrefix)
+- [TrimRight](#TrimRight)
+- [TrimSuffix](#TrimSuffix)
 
 Supported helpers for maps:
 
 - [Keys](#keys)
+- [UniqKeys](#uniqkeys)
+- [HasKey](#haskey)
+- [ValueOr](#valueor)
 - [Values](#values)
+- [UniqValues](#uniqvalues)
 - [PickBy](#pickby)
 - [PickByKeys](#pickbykeys)
 - [PickByValues](#pickbyvalues)
@@ -109,36 +182,68 @@ Supported helpers for maps:
 - [FromEntries / FromPairs](#fromentries-alias-frompairs)
 - [Invert](#invert)
 - [Assign (merge of maps)](#assign)
+- [ChunkEntries](#chunkentries)
 - [MapKeys](#mapkeys)
 - [MapValues](#mapvalues)
+- [MapEntries](#mapentries)
 - [MapToSlice](#maptoslice)
+- [FilterMapToSlice](#FilterMapToSlice)
+- [FilterKeys](#FilterKeys)
+- [FilterValues](#FilterValues)
 
 Supported math helpers:
 
 - [Range / RangeFrom / RangeWithSteps](#range--rangefrom--rangewithsteps)
 - [Clamp](#clamp)
+- [Sum](#sum)
 - [SumBy](#sumby)
+- [Product](#product)
+- [ProductBy](#productby)
+- [Mean](#mean)
+- [MeanBy](#meanby)
+- [Mode](#mode)
 
 Supported helpers for strings:
 
+- [RandomString](#randomstring)
 - [Substring](#substring)
 - [ChunkString](#chunkstring)
 - [RuneLength](#runelength)
+- [PascalCase](#pascalcase)
+- [CamelCase](#camelcase)
+- [KebabCase](#kebabcase)
+- [SnakeCase](#snakecase)
+- [Words](#words)
+- [Capitalize](#capitalize)
+- [Ellipsis](#ellipsis)
 
 Supported helpers for tuples:
 
 - [T2 -> T9](#t2---t9)
 - [Unpack2 -> Unpack9](#unpack2---unpack9)
 - [Zip2 -> Zip9](#zip2---zip9)
+- [ZipBy2 -> ZipBy9](#zipby2---zipby9)
 - [Unzip2 -> Unzip9](#unzip2---unzip9)
+- [UnzipBy2 -> UnzipBy9](#unzipby2---unzipby9)
+- [CrossJoin2 -> CrossJoin2](#crossjoin2---crossjoin9)
+- [CrossJoinBy2 -> CrossJoinBy2](#crossjoinby2---crossjoinby9)
+
+Supported helpers for time and duration:
+
+- [Duration](#duration)
+- [Duration0 -> Duration10](#duration0---duration10)
 
 Supported helpers for channels:
 
 - [ChannelDispatcher](#channeldispatcher)
 - [SliceToChannel](#slicetochannel)
+- [ChannelToSlice](#channeltoslice)
 - [Generator](#generator)
-- [Batch](#batch)
-- [BatchWithTimeout](#batchwithtimeout)
+- [Buffer](#buffer)
+- [BufferWithContext](#bufferwithcontext)
+- [BufferWithTimeout](#bufferwithtimeout)
+- [FanIn](#fanin)
+- [FanOut](#fanout)
 
 Supported intersection helpers:
 
@@ -151,18 +256,26 @@ Supported intersection helpers:
 - [None](#none)
 - [NoneBy](#noneby)
 - [Intersect](#intersect)
+- [IntersectBy](#intersectby)
 - [Difference](#difference)
 - [Union](#union)
 - [Without](#without)
+- [WithoutBy](#withoutby)
 - [WithoutEmpty](#withoutempty)
+- [WithoutNth](#withoutnth)
+- [ElementsMatch](#ElementsMatch)
+- [ElementsMatchBy](#ElementsMatchBy)
 
 Supported search helpers:
 
 - [IndexOf](#indexof)
 - [LastIndexOf](#lastindexof)
+- [HasPrefix](#hasprefix)
+- [HasSuffix](#hassuffix)
 - [Find](#find)
 - [FindIndexOf](#findindexof)
 - [FindLastIndexOf](#findlastindexof)
+- [FindOrElse](#findorelse)
 - [FindKey](#findkey)
 - [FindKeyBy](#findkeyby)
 - [FindUniques](#finduniques)
@@ -170,13 +283,30 @@ Supported search helpers:
 - [FindDuplicates](#findduplicates)
 - [FindDuplicatesBy](#findduplicatesby)
 - [Min](#min)
+- [MinIndex](#minindex)
 - [MinBy](#minby)
+- [MinIndexBy](#minindexby)
+- [Earliest](#earliest)
+- [EarliestBy](#earliestby)
 - [Max](#max)
+- [MaxIndex](#maxindex)
 - [MaxBy](#maxby)
+- [MaxIndexBy](#maxindexby)
+- [Latest](#latest)
+- [LatestBy](#latestby)
+- [First](#first)
+- [FirstOrEmpty](#FirstOrEmpty)
+- [FirstOr](#FirstOr)
 - [Last](#last)
+- [LastOrEmpty](#LastOrEmpty)
+- [LastOr](#LastOr)
 - [Nth](#nth)
+- [NthOr](#nthor)
+- [NthOrEmpty](#nthorempty)
 - [Sample](#sample)
+- [SampleBy](#sampleby)
 - [Samples](#samples)
+- [SamplesBy](#samplesby)
 
 Conditional helpers:
 
@@ -187,28 +317,51 @@ Conditional helpers:
 
 Type manipulation helpers:
 
+- [IsNil](#isnil)
+- [IsNotNil](#isnotnil)
 - [ToPtr](#toptr)
+- [Nil](#nil)
+- [EmptyableToPtr](#emptyabletoptr)
 - [FromPtr](#fromptr)
 - [FromPtrOr](#fromptror)
 - [ToSlicePtr](#tosliceptr)
+- [FromSlicePtr](#fromsliceptr)
+- [FromSlicePtrOr](#fromsliceptror)
 - [ToAnySlice](#toanyslice)
 - [FromAnySlice](#fromanyslice)
 - [Empty](#empty)
 - [IsEmpty](#isempty)
 - [IsNotEmpty](#isnotempty)
 - [Coalesce](#coalesce)
+- [CoalesceOrEmpty](#coalesceorempty)
+- [CoalesceSlice](#coalesceslice)
+- [CoalesceSliceOrEmpty](#coalescesliceorempty)
+- [CoalesceMap](#coalescemap)
+- [CoalesceMapOrEmpty](#coalescemaporempty)
 
 Function helpers:
 
 - [Partial](#partial)
+- [Partial2 -> Partial5](#partial2---partial5)
 
 Concurrency helpers:
 
 - [Attempt](#attempt)
+- [AttemptWhile](#attemptwhile)
 - [AttemptWithDelay](#attemptwithdelay)
+- [AttemptWhileWithDelay](#attemptwhilewithdelay)
 - [Debounce](#debounce)
+- [DebounceBy](#debounceby)
+- [Throttle](#throttle)
+- [ThrottleWithCount](#throttle)
+- [ThrottleBy](#throttle)
+- [ThrottleByWithCount](#throttle)
 - [Synchronize](#synchronize)
 - [Async](#async)
+- [Async{0->6}](#async0-6)
+- [Transaction](#transaction)
+- [WaitFor](#waitfor)
+- [WaitForWithContext](#waitforwithcontext)
 
 Error handling:
 
@@ -222,6 +375,8 @@ Error handling:
 - [TryWithErrorValue](#trywitherrorvalue)
 - [TryCatchWithErrorValue](#trycatchwitherrorvalue)
 - [ErrorsAs](#errorsas)
+- [Assert](#assert)
+- [Assertf](#assertf)
 
 Constraints:
 
@@ -229,17 +384,45 @@ Constraints:
 
 ### Filter
 
-Iterates over a collection and returns an array of all the elements the predicate function returns `true` for.
+Iterates over a collection and returns a slice of all the elements the predicate function returns `true` for.
 
 ```go
-even := lo.Filter[int]([]int{1, 2, 3, 4}, func(x int, index int) bool {
+even := lo.Filter([]int{1, 2, 3, 4}, func(x int, index int) bool {
     return x%2 == 0
 })
 // []int{2, 4}
 ```
 
+```go
+// Use FilterErr when the predicate can return an error
+even, err := lo.FilterErr([]int{1, 2, 3, 4}, func(x int, _ int) (bool, error) {
+    if x == 3 {
+        return false, fmt.Errorf("number 3 is not allowed")
+    }
+    return x%2 == 0, nil
+})
+// []int(nil), error("number 3 is not allowed")
+```
+
 [[play](https://go.dev/play/p/Apjg3WeSi7K)]
 
+Mutable: like `lo.Filter()`, but the slice is updated in place.
+
+```go
+import lom "github.com/samber/lo/mutable"
+
+list := []int{1, 2, 3, 4}
+newList := lom.Filter(list, func(x int) bool {
+    return x%2 == 0
+})
+
+list
+// []int{2, 4, 3, 4}
+
+newList
+// []int{2, 4}
+```
+
 ### Map
 
 Manipulates a slice of one type and transforms it into a slice of another type:
@@ -247,33 +430,79 @@ Manipulates a slice of one type and transforms it into a slice of another type:
 ```go
 import "github.com/samber/lo"
 
-lo.Map[int64, string]([]int64{1, 2, 3, 4}, func(x int64, index int) string {
+lo.Map([]int64{1, 2, 3, 4}, func(x int64, index int) string {
     return strconv.FormatInt(x, 10)
 })
 // []string{"1", "2", "3", "4"}
 ```
 
+```go
+// Use MapErr when the transform function can return an error
+result, err := lo.MapErr([]int{1, 2, 3, 4}, func(x int, _ int) (string, error) {
+    if x == 3 {
+        return "", fmt.Errorf("number 3 is not allowed")
+    }
+    return strconv.Itoa(x), nil
+})
+// []string(nil), error("number 3 is not allowed")
+```
+
 [[play](https://go.dev/play/p/OkPcYAhBo0D)]
 
-Parallel processing: like `lo.Map()`, but the mapper function is called in a goroutine. Results are returned in the same order.
+Parallel processing: like `lo.Map()`, but the transform function is called in a goroutine. Results are returned in the same order.
 
 ```go
 import lop "github.com/samber/lo/parallel"
 
-lop.Map[int64, string]([]int64{1, 2, 3, 4}, func(x int64, _ int) string {
+lop.Map([]int64{1, 2, 3, 4}, func(x int64, _ int) string {
     return strconv.FormatInt(x, 10)
 })
 // []string{"1", "2", "3", "4"}
 ```
 
+[[play](https://go.dev/play/p/sCJaB3quRMC)]
+
+Mutable: like `lo.Map()`, but the slice is updated in place.
+
+```go
+import lom "github.com/samber/lo/mutable"
+
+list := []int{1, 2, 3, 4}
+lom.Map(list, func(x int) int {
+    return x*2
+})
+// []int{2, 4, 6, 8}
+```
+
+[[play](https://go.dev/play/p/0jY3Z0B7O_5)]
+
+### UniqMap
+
+Manipulates a slice and transforms it to a slice of another type with unique values.
+
+```go
+type User struct {
+    Name string
+    Age  int
+}
+users := []User{{Name: "Alex", Age: 10}, {Name: "Alex", Age: 12}, {Name: "Bob", Age: 11}, {Name: "Alice", Age: 20}}
+
+names := lo.UniqMap(users, func(u User, index int) string {
+    return u.Name
+})
+// []string{"Alex", "Bob", "Alice"}
+```
+
+[[play](https://go.dev/play/p/fygzLBhvUdB)]
+
 ### FilterMap
 
-Returns a slice which obtained after both filtering and mapping using the given callback function.
+Returns a slice obtained after both filtering and mapping using the given callback function.
 
 The callback function should return two values: the result of the mapping operation and whether the result element should be included or not.
 
 ```go
-matching := lo.FilterMap[string, string]([]string{"cpu", "gpu", "mouse", "keyboard"}, func(x string, _ int) (string, bool) {
+matching := lo.FilterMap([]string{"cpu", "gpu", "mouse", "keyboard"}, func(x string, _ int) (string, bool) {
     if strings.HasSuffix(x, "pu") {
         return "xpu", true
     }
@@ -286,18 +515,29 @@ matching := lo.FilterMap[string, string]([]string{"cpu", "gpu", "mouse", "keyboa
 
 ### FlatMap
 
-Manipulates a slice and transforms and flattens it to a slice of another type.
+Manipulates a slice and transforms and flattens it to a slice of another type. The transform function can either return a slice or a `nil`, and in the `nil` case no value is added to the final slice.
 
 ```go
-lo.FlatMap[int, string]([]int{0, 1, 2}, func(x int, _ int) []string {
-	return []string{
-		strconv.FormatInt(x, 10),
-		strconv.FormatInt(x, 10),
-	}
+lo.FlatMap([]int64{0, 1, 2}, func(x int64, _ int) []string {
+    return []string{
+        strconv.FormatInt(x, 10),
+        strconv.FormatInt(x, 10),
+    }
 })
 // []string{"0", "0", "1", "1", "2", "2"}
 ```
 
+```go
+// Use FlatMapErr when the transform function can return an error
+result, err := lo.FlatMapErr([]int64{0, 1, 2, 3}, func(x int64, _ int) ([]string, error) {
+    if x == 2 {
+        return nil, fmt.Errorf("number 2 is not allowed")
+    }
+    return []string{strconv.FormatInt(x, 10), strconv.FormatInt(x, 10)}, nil
+})
+// []string(nil), error("number 2 is not allowed")
+```
+
 [[play](https://go.dev/play/p/YSoYmQTA8-U)]
 
 ### Reduce
@@ -305,12 +545,23 @@ lo.FlatMap[int, string]([]int{0, 1, 2}, func(x int, _ int) []string {
 Reduces a collection to a single value. The value is calculated by accumulating the result of running each element in the collection through an accumulator function. Each successive invocation is supplied with the return value returned by the previous call.
 
 ```go
-sum := lo.Reduce[int, int]([]int{1, 2, 3, 4}, func(agg int, item int, _ int) int {
+sum := lo.Reduce([]int{1, 2, 3, 4}, func(agg int, item int, _ int) int {
     return agg + item
 }, 0)
 // 10
 ```
 
+```go
+// Use ReduceErr when the accumulator function can return an error
+result, err := lo.ReduceErr([]int{1, 2, 3, 4}, func(agg int, item int, _ int) (int, error) {
+    if item == 3 {
+        return 0, fmt.Errorf("number 3 is not allowed")
+    }
+    return agg + item, nil
+}, 0)
+// 0, error("number 3 is not allowed")
+```
+
 [[play](https://go.dev/play/p/R4UHXZNaaUG)]
 
 ### ReduceRight
@@ -318,12 +569,23 @@ sum := lo.Reduce[int, int]([]int{1, 2, 3, 4}, func(agg int, item int, _ int) int
 Like `lo.Reduce` except that it iterates over elements of collection from right to left.
 
 ```go
-result := lo.ReduceRight[[]int, []int]([][]int{{0, 1}, {2, 3}, {4, 5}}, func(agg []int, item []int, _ int) []int {
-	  return append(agg, item...)
+result := lo.ReduceRight([][]int{{0, 1}, {2, 3}, {4, 5}}, func(agg []int, item []int, _ int) []int {
+    return append(agg, item...)
 }, []int{})
 // []int{4, 5, 2, 3, 0, 1}
 ```
 
+```go
+// Use ReduceRightErr when the accumulator function can return an error
+result, err := lo.ReduceRightErr([]int{1, 2, 3, 4}, func(agg int, item int, _ int) (int, error) {
+    if item == 2 {
+        return 0, fmt.Errorf("number 2 is not allowed")
+    }
+    return agg + item, nil
+}, 0)
+// 0, error("number 2 is not allowed")
+```
+
 [[play](https://go.dev/play/p/Fq3W70l7wXF)]
 
 ### ForEach
@@ -333,7 +595,7 @@ Iterates over elements of a collection and invokes the function over each elemen
 ```go
 import "github.com/samber/lo"
 
-lo.ForEach[string]([]string{"hello", "world"}, func(x string, _ int) {
+lo.ForEach([]string{"hello", "world"}, func(x string, _ int) {
     println(x)
 })
 // prints "hello\nworld\n"
@@ -346,20 +608,40 @@ Parallel processing: like `lo.ForEach()`, but the callback is called as a gorout
 ```go
 import lop "github.com/samber/lo/parallel"
 
-lop.ForEach[string]([]string{"hello", "world"}, func(x string, _ int) {
+lop.ForEach([]string{"hello", "world"}, func(x string, _ int) {
     println(x)
 })
 // prints "hello\nworld\n" or "world\nhello\n"
 ```
 
+### ForEachWhile
+
+Iterates over collection elements and invokes iteratee for each element collection return value decide to continue or break, like do while().
+
+```go
+list := []int64{1, 2, -42, 4}
+
+lo.ForEachWhile(list, func(x int64, _ int) bool {
+	if x < 0 {
+		return false
+	}
+	fmt.Println(x)
+	return true
+})
+// 1
+// 2
+```
+
+[[play](https://go.dev/play/p/QnLGt35tnow)]
+
 ### Times
 
-Times invokes the iteratee n times, returning an array of the results of each invocation. The iteratee is invoked with index as argument.
+Times invokes the iteratee n times, returning a slice of the results of each invocation. The iteratee is invoked with index as argument.
 
 ```go
 import "github.com/samber/lo"
 
-lo.Times[string](3, func(i int) string {
+lo.Times(3, func(i int) string {
     return strconv.FormatInt(int64(i), 10)
 })
 // []string{"0", "1", "2"}
@@ -372,7 +654,7 @@ Parallel processing: like `lo.Times()`, but callback is called in goroutine.
 ```go
 import lop "github.com/samber/lo/parallel"
 
-lop.Times[string](3, func(i int) string {
+lop.Times(3, func(i int) string {
     return strconv.FormatInt(int64(i), 10)
 })
 // []string{"0", "1", "2"}
@@ -380,10 +662,10 @@ lop.Times[string](3, func(i int) string {
 
 ### Uniq
 
-Returns a duplicate-free version of an array, in which only the first occurrence of each element is kept. The order of result values is determined by the order they occur in the array.
+Returns a duplicate-free version of a slice, in which only the first occurrence of each element is kept. The order of result values is determined by the order they occur in the slice.
 
 ```go
-uniqValues := lo.Uniq[int]([]int{1, 2, 2, 1})
+uniqValues := lo.Uniq([]int{1, 2, 2, 1})
 // []int{1, 2}
 ```
 
@@ -391,15 +673,26 @@ uniqValues := lo.Uniq[int]([]int{1, 2, 2, 1})
 
 ### UniqBy
 
-Returns a duplicate-free version of an array, in which only the first occurrence of each element is kept. The order of result values is determined by the order they occur in the array. It accepts `iteratee` which is invoked for each element in array to generate the criterion by which uniqueness is computed.
+Returns a duplicate-free version of a slice, in which only the first occurrence of each element is kept. The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is invoked for each element in the slice to generate the criterion by which uniqueness is computed.
 
 ```go
-uniqValues := lo.UniqBy[int, int]([]int{0, 1, 2, 3, 4, 5}, func(i int) int {
+uniqValues := lo.UniqBy([]int{0, 1, 2, 3, 4, 5}, func(i int) int {
     return i%3
 })
 // []int{0, 1, 2}
 ```
 
+```go
+// Use UniqByErr when the iteratee function can return an error
+result, err := lo.UniqByErr([]int{0, 1, 2, 3, 4, 5}, func(i int) (int, error) {
+    if i == 3 {
+        return 0, fmt.Errorf("number 3 is not allowed")
+    }
+    return i % 3, nil
+})
+// []int(nil), error("number 3 is not allowed")
+```
+
 [[play](https://go.dev/play/p/g42Z3QSb53u)]
 
 ### GroupBy
@@ -409,12 +702,23 @@ Returns an object composed of keys generated from the results of running each el
 ```go
 import lo "github.com/samber/lo"
 
-groups := lo.GroupBy[int, int]([]int{0, 1, 2, 3, 4, 5}, func(i int) int {
+groups := lo.GroupBy([]int{0, 1, 2, 3, 4, 5}, func(i int) int {
     return i%3
 })
 // map[int][]int{0: []int{0, 3}, 1: []int{1, 4}, 2: []int{2, 5}}
 ```
 
+```go
+// Use GroupByErr when the iteratee function can return an error
+result, err := lo.GroupByErr([]int{0, 1, 2, 3, 4, 5}, func(i int) (int, error) {
+    if i == 3 {
+        return 0, fmt.Errorf("number 3 is not allowed")
+    }
+    return i % 3, nil
+})
+// map[int][]int(nil), error("number 3 is not allowed")
+```
+
 [[play](https://go.dev/play/p/XnQBd_v6brd)]
 
 Parallel processing: like `lo.GroupBy()`, but callback is called in goroutine.
@@ -422,40 +726,96 @@ Parallel processing: like `lo.GroupBy()`, but callback is called in goroutine.
 ```go
 import lop "github.com/samber/lo/parallel"
 
-lop.GroupBy[int, int]([]int{0, 1, 2, 3, 4, 5}, func(i int) int {
+lop.GroupBy([]int{0, 1, 2, 3, 4, 5}, func(i int) int {
     return i%3
 })
 // map[int][]int{0: []int{0, 3}, 1: []int{1, 4}, 2: []int{2, 5}}
 ```
 
-### Chunk
+### GroupByMap
 
-Returns an array of elements split into groups the length of size. If array can't be split evenly, the final chunk will be the remaining elements.
-
-```go
-lo.Chunk[int]([]int{0, 1, 2, 3, 4, 5}, 2)
-// [][]int{{0, 1}, {2, 3}, {4, 5}}
-
-lo.Chunk[int]([]int{0, 1, 2, 3, 4, 5, 6}, 2)
-// [][]int{{0, 1}, {2, 3}, {4, 5}, {6}}
-
-lo.Chunk[int]([]int{}, 2)
-// [][]int{}
-
-lo.Chunk[int]([]int{0}, 2)
-// [][]int{{0}}
-```
-
-[[play](https://go.dev/play/p/EeKl0AuTehH)]
-
-### PartitionBy
-
-Returns an array of elements split into groups. The order of grouped values is determined by the order they occur in collection. The grouping is generated from the results of running each element of collection through iteratee.
+Returns an object composed of keys generated from the results of running each element of collection through iteratee.
 
 ```go
 import lo "github.com/samber/lo"
 
-partitions := lo.PartitionBy[int, string]([]int{-2, -1, 0, 1, 2, 3, 4, 5}, func(x int) string {
+groups := lo.GroupByMap([]int{0, 1, 2, 3, 4, 5}, func(i int) (int, int) {
+    return i%3, i*2
+})
+// map[int][]int{0: []int{0, 6}, 1: []int{2, 8}, 2: []int{4, 10}}
+```
+
+```go
+// Use GroupByMapErr when the transform function can return an error
+result, err := lo.GroupByMapErr([]int{0, 1, 2, 3, 4, 5}, func(i int) (int, int, error) {
+    if i == 3 {
+        return 0, 0, fmt.Errorf("number 3 is not allowed")
+    }
+    return i % 3, i * 2, nil
+})
+// map[int][]int(nil), error("number 3 is not allowed")
+```
+
+[[play](https://go.dev/play/p/iMeruQ3_W80)]
+
+### Chunk
+
+Returns a slice of elements split into groups of length size. If the slice can't be split evenly, the final chunk will be the remaining elements.
+
+```go
+lo.Chunk([]int{0, 1, 2, 3, 4, 5}, 2)
+// [][]int{{0, 1}, {2, 3}, {4, 5}}
+
+lo.Chunk([]int{0, 1, 2, 3, 4, 5, 6}, 2)
+// [][]int{{0, 1}, {2, 3}, {4, 5}, {6}}
+
+lo.Chunk([]int{}, 2)
+// [][]int{}
+
+lo.Chunk([]int{0}, 2)
+// [][]int{{0}}
+```
+
+[[play](https://go.dev/play/p/kEMkFbdu85g)]
+
+### Window
+
+Creates a slice of sliding windows of a given size. Each window shares size-1 elements with the previous one. This is equivalent to `Sliding(collection, size, 1)`.
+
+```go
+lo.Window([]int{1, 2, 3, 4, 5}, 3)
+// [][]int{{1, 2, 3}, {2, 3, 4}, {3, 4, 5}}
+
+lo.Window([]float64{20, 22, 21, 23, 24}, 3)
+// [][]float64{{20, 22, 21}, {22, 21, 23}, {21, 23, 24}}
+```
+
+### Sliding
+
+Creates a slice of sliding windows of a given size with a given step. If step is equal to size, windows have no common elements (similar to Chunk). If step is less than size, windows share common elements.
+
+```go
+// Windows with shared elements (step < size)
+lo.Sliding([]int{1, 2, 3, 4, 5, 6}, 3, 1)
+// [][]int{{1, 2, 3}, {2, 3, 4}, {3, 4, 5}, {4, 5, 6}}
+
+// Windows with no shared elements (step == size, like Chunk)
+lo.Sliding([]int{1, 2, 3, 4, 5, 6}, 3, 3)
+// [][]int{{1, 2, 3}, {4, 5, 6}}
+
+// Step > size (skipping elements)
+lo.Sliding([]int{1, 2, 3, 4, 5, 6, 7, 8}, 2, 3)
+// [][]int{{1, 2}, {4, 5}, {7, 8}}
+```
+
+### PartitionBy
+
+Returns a slice of elements split into groups. The order of grouped values is determined by the order they occur in collection. The grouping is generated from the results of running each element of collection through iteratee.
+
+```go
+import lo "github.com/samber/lo"
+
+partitions := lo.PartitionBy([]int{-2, -1, 0, 1, 2, 3, 4, 5}, func(x int) string {
     if x < 0 {
         return "negative"
     } else if x%2 == 0 {
@@ -466,6 +826,22 @@ partitions := lo.PartitionBy[int, string]([]int{-2, -1, 0, 1, 2, 3, 4, 5}, func(
 // [][]int{{-2, -1}, {0, 2, 4}, {1, 3, 5}}
 ```
 
+```go
+// Use PartitionByErr when the iteratee function can return an error
+result, err := lo.PartitionByErr([]int{-2, -1, 0, 1, 2}, func(x int) (string, error) {
+    if x == 0 {
+        return "", fmt.Errorf("zero is not allowed")
+    }
+    if x < 0 {
+        return "negative", nil
+    } else if x%2 == 0 {
+        return "even", nil
+    }
+    return "odd", nil
+})
+// [][]int(nil), error("zero is not allowed")
+```
+
 [[play](https://go.dev/play/p/NfQ_nGjkgXW)]
 
 Parallel processing: like `lo.PartitionBy()`, but callback is called in goroutine. Results are returned in the same order.
@@ -473,7 +849,7 @@ Parallel processing: like `lo.PartitionBy()`, but callback is called in goroutin
 ```go
 import lop "github.com/samber/lo/parallel"
 
-partitions := lop.PartitionBy[int, string]([]int{-2, -1, 0, 1, 2, 3, 4, 5}, func(x int) string {
+partitions := lop.PartitionBy([]int{-2, -1, 0, 1, 2, 3, 4, 5}, func(x int) string {
     if x < 0 {
         return "negative"
     } else if x%2 == 0 {
@@ -486,51 +862,93 @@ partitions := lop.PartitionBy[int, string]([]int{-2, -1, 0, 1, 2, 3, 4, 5}, func
 
 ### Flatten
 
-Returns an array a single level deep.
+Returns a slice a single level deep.
 
 ```go
-flat := lo.Flatten[int]([][]int{{0, 1}, {2, 3, 4, 5}})
+flat := lo.Flatten([][]int{{0, 1}, {2, 3, 4, 5}})
 // []int{0, 1, 2, 3, 4, 5}
 ```
 
 [[play](https://go.dev/play/p/rbp9ORaMpjw)]
 
-### Shuffle
+### Concat
 
-Returns an array of shuffled values. Uses the Fisher-Yates shuffle algorithm.
+Returns a new slice containing all the elements in collections. Concat conserves the order of the elements.
 
 ```go
-randomOrder := lo.Shuffle[int]([]int{0, 1, 2, 3, 4, 5})
+slice := lo.Concat([]int{1, 2}, []int{3, 4})
+// []int{1, 2, 3, 4}
+
+slice := lo.Concat(nil, []int{1, 2}, nil, []int{3, 4}, nil)
+// []int{1, 2, 3, 4}
+
+slice := lo.Concat[int]()
+// []int{}
+```
+### Interleave
+
+Round-robin alternating input slices and sequentially appending value at index into result.
+
+```go
+interleaved := lo.Interleave([]int{1, 4, 7}, []int{2, 5, 8}, []int{3, 6, 9})
+// []int{1, 2, 3, 4, 5, 6, 7, 8, 9}
+
+interleaved := lo.Interleave([]int{1}, []int{2, 5, 8}, []int{3, 6}, []int{4, 7, 9, 10})
+// []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
+```
+
+[[play](https://go.dev/play/p/-RJkTLQEDVt)]
+
+### Shuffle
+
+Returns a slice of shuffled values. Uses the Fisher-Yates shuffle algorithm.
+
+⚠️ This helper is **mutable**.
+
+```go
+import lom "github.com/samber/lo/mutable"
+
+list := []int{0, 1, 2, 3, 4, 5}
+lom.Shuffle(list)
+
+list
 // []int{1, 4, 0, 3, 5, 2}
 ```
 
-[[play](https://go.dev/play/p/Qp73bnTDnc7)]
+[[play](https://go.dev/play/p/2xb3WdLjeSJ)]
 
 ### Reverse
 
-Reverses array so that the first element becomes the last, the second element becomes the second to last, and so on.
+Reverses a slice so that the first element becomes the last, the second element becomes the second to last, and so on.
+
+⚠️ This helper is **mutable**.
 
 ```go
-reverseOrder := lo.Reverse[int]([]int{0, 1, 2, 3, 4, 5})
+import lom "github.com/samber/lo/mutable"
+
+list := []int{0, 1, 2, 3, 4, 5}
+lom.Reverse(list)
+
+list
 // []int{5, 4, 3, 2, 1, 0}
 ```
 
-[[play](https://go.dev/play/p/fhUMLvZ7vS6)]
+[[play](https://go.dev/play/p/O-M5pmCRgzV)]
 
 ### Fill
 
-Fills elements of array with `initial` value.
+Fills elements of a slice with `initial` value.
 
 ```go
 type foo struct {
-	bar string
+  bar string
 }
 
 func (f foo) Clone() foo {
-	return foo{f.bar}
+  return foo{f.bar}
 }
 
-initializedSlice := lo.Fill[foo]([]foo{foo{"a"}, foo{"a"}}, foo{"b"})
+initializedSlice := lo.Fill([]foo{foo{"a"}, foo{"a"}}, foo{"b"})
 // []foo{foo{"b"}, foo{"b"}}
 ```
 
@@ -542,14 +960,14 @@ Builds a slice with N copies of initial value.
 
 ```go
 type foo struct {
-	bar string
+  bar string
 }
 
 func (f foo) Clone() foo {
-	return foo{f.bar}
+  return foo{f.bar}
 }
 
-slice := lo.Repeat[foo](2, foo{"a"})
+slice := lo.Repeat(2, foo{"a"})
 // []foo{foo{"a"}, foo{"a"}}
 ```
 
@@ -560,69 +978,167 @@ slice := lo.Repeat[foo](2, foo{"a"})
 Builds a slice with values returned by N calls of callback.
 
 ```go
-slice := lo.RepeatBy[string](0, func (i int) string {
+slice := lo.RepeatBy(0, func (i int) string {
     return strconv.FormatInt(int64(math.Pow(float64(i), 2)), 10)
 })
-// []int{}
+// []string{}
 
-slice := lo.RepeatBy[string](5, func(i int) string {
+slice := lo.RepeatBy(5, func(i int) string {
     return strconv.FormatInt(int64(math.Pow(float64(i), 2)), 10)
 })
-// []int{0, 1, 4, 9, 16}
+// []string{"0", "1", "4", "9", "16"}
 ```
 
 [[play](https://go.dev/play/p/ozZLCtX_hNU)]
 
-### KeyBy
-
-Transforms a slice or an array of structs to a map based on a pivot callback.
+With error handling:
 
 ```go
-m := lo.KeyBy[int, string]([]string{"a", "aa", "aaa"}, func(str string) int {
+slice, err := lo.RepeatByErr(5, func(i int) (string, error) {
+    if i == 3 {
+        return "", fmt.Errorf("index 3 is not allowed")
+    }
+    return fmt.Sprintf("item-%d", i), nil
+})
+// []string(nil), error("index 3 is not allowed")
+```
+
+### KeyBy
+
+Transforms a slice or a slice of structs to a map based on a pivot callback.
+
+```go
+m := lo.KeyBy([]string{"a", "aa", "aaa"}, func(str string) int {
     return len(str)
 })
 // map[int]string{1: "a", 2: "aa", 3: "aaa"}
 
 type Character struct {
-	dir  string
-	code int
+  dir  string
+  code int
 }
 characters := []Character{
     {dir: "left", code: 97},
     {dir: "right", code: 100},
 }
-result := lo.KeyBy[string, Character](characters, func(char Character) string {
+result := lo.KeyBy(characters, func(char Character) string {
     return string(rune(char.code))
 })
 //map[a:{dir:left code:97} d:{dir:right code:100}]
 ```
 
+```go
+result, err := lo.KeyByErr([]string{"a", "aa", "aaa", ""}, func(str string) (int, error) {
+    if str == "" {
+        return 0, fmt.Errorf("empty string not allowed")
+    }
+    return len(str), nil
+})
+// map[int]string(nil), error("empty string not allowed")
+```
+
 [[play](https://go.dev/play/p/mdaClUAT-zZ)]
 
-### Associate (alias: SliceToMap)
+### SliceToMap (alias: Associate)
 
 Returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
-If any of two pairs would have the same key the last one gets added to the map.
+If any of two pairs have the same key the last one gets added to the map.
 
-The order of keys in returned map is not specified and is not guaranteed to be the same from the original array.
+The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
 
 ```go
 in := []*foo{{baz: "apple", bar: 1}, {baz: "banana", bar: 2}}
 
-aMap := lo.Associate[*foo, string, int](in, func (f *foo) (string, int) {
-	return f.baz, f.bar
+aMap := lo.SliceToMap(in, func (f *foo) (string, int) {
+    return f.baz, f.bar
 })
 // map[string][int]{ "apple":1, "banana":2 }
 ```
 
 [[play](https://go.dev/play/p/WHa2CfMO3Lr)]
 
-### Drop
+### FilterSliceToMap
 
-Drops n elements from the beginning of a slice or array.
+Returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
+
+If any of two pairs have the same key the last one gets added to the map.
+
+The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
+
+The third return value of the transform function is a boolean that indicates whether the key-value pair should be included in the map.
 
 ```go
-l := lo.Drop[int]([]int{0, 1, 2, 3, 4, 5}, 2)
+list := []string{"a", "aa", "aaa"}
+
+result := lo.FilterSliceToMap(list, func(str string) (string, int, bool) {
+    return str, len(str), len(str) > 1
+})
+// map[string][int]{"aa":2 "aaa":3}
+```
+
+[[play](https://go.dev/play/p/2z0rDz2ZSGU)]
+
+### Keyify
+
+Returns a map with each unique element of the slice as a key.
+
+```go
+set := lo.Keyify([]int{1, 1, 2, 3, 4})
+// map[int]struct{}{1:{}, 2:{}, 3:{}, 4:{}}
+```
+
+[[play](https://go.dev/play/p/RYhhM_csqIG)]
+
+### Take
+
+Takes the first n elements from a slice.
+
+```go
+l := lo.Take([]int{0, 1, 2, 3, 4, 5}, 3)
+// []int{0, 1, 2}
+
+l := lo.Take([]int{0, 1, 2}, 5)
+// []int{0, 1, 2}
+```
+
+### TakeWhile
+
+Takes elements from the beginning while the predicate returns true.
+
+```go
+l := lo.TakeWhile([]int{0, 1, 2, 3, 4, 5}, func(val int) bool {
+    return val < 3
+})
+// []int{0, 1, 2}
+
+l := lo.TakeWhile([]string{"a", "aa", "aaa", "aa"}, func(val string) bool {
+    return len(val) <= 2
+})
+// []string{"a", "aa"}
+```
+
+### TakeFilter
+
+Filters elements and takes the first n elements that match the predicate. Equivalent to calling Take(Filter(...)), but more efficient as it stops after finding n matches.
+
+```go
+l := lo.TakeFilter([]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 3, func(val int, index int) bool {
+    return val%2 == 0
+})
+// []int{2, 4, 6}
+
+l := lo.TakeFilter([]string{"a", "aa", "aaa", "aaaa"}, 2, func(val string, index int) bool {
+    return len(val) > 1
+})
+// []string{"aa", "aaa"}
+```
+
+### Drop
+
+Drops n elements from the beginning of a slice.
+
+```go
+l := lo.Drop([]int{0, 1, 2, 3, 4, 5}, 2)
 // []int{2, 3, 4, 5}
 ```
 
@@ -630,10 +1146,10 @@ l := lo.Drop[int]([]int{0, 1, 2, 3, 4, 5}, 2)
 
 ### DropRight
 
-Drops n elements from the end of a slice or array.
+Drops n elements from the end of a slice.
 
 ```go
-l := lo.DropRight[int]([]int{0, 1, 2, 3, 4, 5}, 2)
+l := lo.DropRight([]int{0, 1, 2, 3, 4, 5}, 2)
 // []int{0, 1, 2, 3}
 ```
 
@@ -641,11 +1157,11 @@ l := lo.DropRight[int]([]int{0, 1, 2, 3, 4, 5}, 2)
 
 ### DropWhile
 
-Drop elements from the beginning of a slice or array while the predicate returns true.
+Drop elements from the beginning of a slice while the predicate returns true.
 
 ```go
-l := lo.DropWhile[string]([]string{"a", "aa", "aaa", "aa", "aa"}, func(val string) bool {
-	return len(val) <= 2
+l := lo.DropWhile([]string{"a", "aa", "aaa", "aa", "aa"}, func(val string) bool {
+    return len(val) <= 2
 })
 // []string{"aaa", "aa", "aa"}
 ```
@@ -654,36 +1170,86 @@ l := lo.DropWhile[string]([]string{"a", "aa", "aaa", "aa", "aa"}, func(val strin
 
 ### DropRightWhile
 
-Drop elements from the end of a slice or array while the predicate returns true.
+Drop elements from the end of a slice while the predicate returns true.
 
 ```go
-l := lo.DropRightWhile[string]([]string{"a", "aa", "aaa", "aa", "aa"}, func(val string) bool {
-	return len(val) <= 2
+l := lo.DropRightWhile([]string{"a", "aa", "aaa", "aa", "aa"}, func(val string) bool {
+    return len(val) <= 2
 })
 // []string{"a", "aa", "aaa"}
 ```
 
 [[play](https://go.dev/play/p/3-n71oEC0Hz)]
 
-### Reject
+### DropByIndex
 
-The opposite of Filter, this method returns the elements of collection that predicate does not return truthy for.
+Drops elements from a slice by the index. A negative index will drop elements from the end of the slice.
 
 ```go
-odd := lo.Reject[int]([]int{1, 2, 3, 4}, func(x int, _ int) bool {
+l := lo.DropByIndex([]int{0, 1, 2, 3, 4, 5}, 2, 4, -1)
+// []int{0, 1, 3}
+```
+
+[[play](https://go.dev/play/p/JswS7vXRJP2)]
+
+### Reject
+
+The opposite of Filter, this method returns the elements of collection that predicate does not return true for.
+
+```go
+odd := lo.Reject([]int{1, 2, 3, 4}, func(x int, _ int) bool {
     return x%2 == 0
 })
 // []int{1, 3}
 ```
 
+```go
+// Use RejectErr when the predicate can return an error
+odd, err := lo.RejectErr([]int{1, 2, 3, 4}, func(x int, _ int) (bool, error) {
+    if x == 3 {
+        return false, fmt.Errorf("number 3 is not allowed")
+    }
+    return x%2 == 0, nil
+})
+// []int(nil), error("number 3 is not allowed")
+```
+
 [[play](https://go.dev/play/p/YkLMODy1WEL)]
 
+### RejectMap
+
+The opposite of FilterMap, this method returns a slice obtained after both filtering and mapping using the given callback function.
+
+The callback function should return two values:
+
+- the result of the mapping operation and
+- whether the result element should be included or not.
+
+```go
+items := lo.RejectMap([]int{1, 2, 3, 4}, func(x int, _ int) (int, bool) {
+    return x*10, x%2 == 0
+})
+// []int{10, 30}
+```
+
+### FilterReject
+
+Mixes Filter and Reject, this method returns two slices, one for the elements of collection that predicate returns true for and one for the elements that predicate does not return true for.
+
+```go
+kept, rejected := lo.FilterReject([]int{1, 2, 3, 4}, func(x int, _ int) bool {
+    return x%2 == 0
+})
+// []int{2, 4}
+// []int{1, 3}
+```
+
 ### Count
 
-Counts the number of elements in the collection that compare equal to value.
+Counts the number of elements in the collection that equal value.
 
 ```go
-count := lo.Count[int]([]int{1, 5, 1}, 1)
+count := lo.Count([]int{1, 5, 1}, 1)
 // 2
 ```
 
@@ -694,14 +1260,79 @@ count := lo.Count[int]([]int{1, 5, 1}, 1)
 Counts the number of elements in the collection for which predicate is true.
 
 ```go
-count := lo.CountBy[int]([]int{1, 5, 1}, func(i int) bool {
+count := lo.CountBy([]int{1, 5, 1}, func(i int) bool {
     return i < 4
 })
 // 2
 ```
 
+```go
+// Use CountByErr when the predicate can return an error
+count, err := lo.CountByErr([]int{1, 5, 1}, func(i int) (bool, error) {
+    if i == 5 {
+        return false, fmt.Errorf("5 not allowed")
+    }
+    return i < 4, nil
+})
+// 0, error("5 not allowed")
+```
+
 [[play](https://go.dev/play/p/ByQbNYQQi4X)]
 
+### CountValues
+
+Counts the number of each element in the collection.
+
+```go
+lo.CountValues([]int{})
+// map[int]int{}
+
+lo.CountValues([]int{1, 2})
+// map[int]int{1: 1, 2: 1}
+
+lo.CountValues([]int{1, 2, 2})
+// map[int]int{1: 1, 2: 2}
+
+lo.CountValues([]string{"foo", "bar", ""})
+// map[string]int{"": 1, "foo": 1, "bar": 1}
+
+lo.CountValues([]string{"foo", "bar", "bar"})
+// map[string]int{"foo": 1, "bar": 2}
+```
+
+[[play](https://go.dev/play/p/-p-PyLT4dfy)]
+
+### CountValuesBy
+
+Counts the number of each element in the collection. It is equivalent to chaining lo.Map and lo.CountValues.
+
+```go
+isEven := func(v int) bool {
+    return v%2==0
+}
+
+lo.CountValuesBy([]int{}, isEven)
+// map[bool]int{}
+
+lo.CountValuesBy([]int{1, 2}, isEven)
+// map[bool]int{false: 1, true: 1}
+
+lo.CountValuesBy([]int{1, 2, 2}, isEven)
+// map[bool]int{false: 1, true: 2}
+
+length := func(v string) int {
+    return len(v)
+}
+
+lo.CountValuesBy([]string{"foo", "bar", ""}, length)
+// map[int]int{0: 1, 3: 2}
+
+lo.CountValuesBy([]string{"foo", "bar", "bar"}, length)
+// map[int]int{3: 3}
+```
+
+[[play](https://go.dev/play/p/2U0dG1SnOmS)]
+
 ### Subset
 
 Returns a copy of a slice from `offset` up to `length` elements. Like `slice[start:start+length]`, but does not panic on overflow.
@@ -781,6 +1412,20 @@ slice := lo.ReplaceAll(in, -1, 42)
 
 [[play](https://go.dev/play/p/a9xZFUHfYcV)]
 
+### Clone
+
+Returns a shallow copy of the collection.
+
+```go
+in := []int{1, 2, 3, 4, 5}
+cloned := lo.Clone(in)
+// Verify it's a different slice by checking that modifying one doesn't affect the other
+in[0] = 99
+// cloned is []int{1, 2, 3, 4, 5}
+```
+
+[[play](https://go.dev/play/p/hgHmoOIxmuH)]
+
 ### Compact
 
 Returns a slice of all non-zero elements.
@@ -788,7 +1433,7 @@ Returns a slice of all non-zero elements.
 ```go
 in := []string{"", "foo", "", "bar", ""}
 
-slice := lo.Compact[string](in)
+slice := lo.Compact(in)
 // []string{"foo", "bar"}
 ```
 
@@ -805,12 +1450,12 @@ slice := lo.IsSorted([]int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9})
 
 [[play](https://go.dev/play/p/mc3qR-t4mcx)]
 
-### IsSortedByKey
+### IsSortedBy
 
 Checks if a slice is sorted by iteratee.
 
 ```go
-slice := lo.IsSortedByKey([]string{"a", "bb", "ccc"}, func(s string) int {
+slice := lo.IsSortedBy([]string{"a", "bb", "ccc"}, func(s string) int {
     return len(s)
 })
 // true
@@ -818,39 +1463,277 @@ slice := lo.IsSortedByKey([]string{"a", "bb", "ccc"}, func(s string) int {
 
 [[play](https://go.dev/play/p/wiG6XyBBu49)]
 
-### Keys
+### Splice
 
-Creates an array of the map keys.
+Splice inserts multiple elements at index i. A negative index counts back from the end of the slice. The helper is protected against overflow errors.
 
 ```go
-keys := lo.Keys[string, int](map[string]int{"foo": 1, "bar": 2})
+result := lo.Splice([]string{"a", "b"}, 1, "1", "2")
+// []string{"a", "1", "2", "b"}
+
+// negative
+result = lo.Splice([]string{"a", "b"}, -1, "1", "2")
+// []string{"a", "1", "2", "b"}
+
+// overflow
+result = lo.Splice([]string{"a", "b"}, 42, "1", "2")
+// []string{"a", "b", "1", "2"}
+```
+
+[[play](https://go.dev/play/p/G5_GhkeSUBA)]
+
+### Cut
+
+Slices collection around the first instance of separator, returning the part of collection before and after separator. The found result reports whether separator appears in collection. If separator does not appear in s, cut returns collection, empty slice of []T, false.
+
+```go
+actualLeft, actualRight, result = lo.Cut([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"b", "c", "d"})
+// actualLeft: []string{"a"}
+// actualRight: []string{"e", "f", "g"}
+// result: true
+
+result = lo.Cut([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"z"})
+// actualLeft: []string{"a", "b", "c", "d", "e", "f", "g"}
+// actualRight: []string{}
+// result: false
+
+result = lo.Cut([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"a", "b"})
+// actualLeft: []string{}
+// actualRight: []string{"c", "d", "e", "f", "g"}
+// result: true
+```
+
+[[play](https://go.dev/play/p/GiL3qhpIP3f)]
+
+### CutPrefix
+
+Returns collection without the provided leading prefix []T and reports whether it found the prefix. If s doesn't start with prefix, CutPrefix returns collection, false. If prefix is the empty []T, CutPrefix returns collection, true.
+
+```go
+actualRight, result = lo.CutPrefix([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"a", "b", "c"})
+// actualRight: []string{"d", "e", "f", "g"}
+// result: true
+
+result = lo.CutPrefix([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"b"})
+// actualRight: []string{"a", "b", "c", "d", "e", "f", "g"}
+// result: false
+
+result = lo.CutPrefix([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{})
+// actualRight: []string{"a", "b", "c", "d", "e", "f", "g"}
+// result: true
+```
+
+[[play](https://go.dev/play/p/7Plak4a1ICl)]
+
+### CutSuffix
+
+Returns collection without the provided ending suffix []T and reports whether it found the suffix. If it doesn't end with suffix, CutSuffix returns collection, false. If suffix is the empty []T, CutSuffix returns collection, true.
+
+```go
+actualLeft, result = lo.CutSuffix([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"f", "g"})
+// actualLeft: []string{"a", "b", "c", "d", "e"}
+// result: true
+
+actualLeft, result = lo.CutSuffix([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{"b"})
+// actualLeft: []string{"a", "b", "c", "d", "e", "f", "g"}
+// result: false
+
+actualLeft, result = lo.CutSuffix([]string{"a", "b", "c", "d", "e", "f", "g"}, []string{})
+// actualLeft: []string{"a", "b", "c", "d", "e", "f", "g"}
+// result: true
+```
+
+[[play](https://go.dev/play/p/7FKfBFvPTaT)]
+
+### Trim
+
+Removes all the leading and trailing cutset from the collection.
+
+```go
+result := lo.Trim([]int{0, 1, 2, 0, 3, 0}, []int{1, 0})
+// []int{2, 0, 3}
+
+result := lo.Trim([]string{"hello", "world", " "}, []string{" ", ""})
+// []string{"hello", "world"}
+```
+
+[[play](https://go.dev/play/p/1an9mxLdRG5)]
+
+### TrimLeft
+
+Removes all the leading cutset from the collection.
+
+```go
+result := lo.TrimLeft([]int{0, 1, 2, 0, 3, 0}, []int{1, 0})
+// []int{2, 0, 3, 0}
+
+result := lo.TrimLeft([]string{"hello", "world", " "}, []string{" ", ""})
+// []string{"hello", "world", " "}
+```
+
+[[play](https://go.dev/play/p/74aqfAYLmyi)]
+
+### TrimPrefix
+
+Removes all the leading prefix from the collection.
+
+```go
+result := lo.TrimPrefix([]int{1, 2, 1, 2, 3, 1, 2, 4}, []int{1, 2})
+// []int{3, 1, 2, 4}
+
+result := lo.TrimPrefix([]string{"hello", "world", "hello", "test"}, []string{"hello"})
+// []string{"world", "hello", "test"}
+```
+
+[[play](https://go.dev/play/p/SHO6X-YegPg)]
+
+### TrimRight
+
+Removes all the trailing cutset from the collection.
+
+```go
+result := lo.TrimRight([]int{0, 1, 2, 0, 3, 0}, []int{0, 3})
+// []int{0, 1, 2}
+
+result := lo.TrimRight([]string{"hello", "world", "  "}, []string{" ", ""})
+// []string{"hello", "world", ""}
+```
+
+[[play](https://go.dev/play/p/MRpAfR6sf0g)]
+
+### TrimSuffix
+
+Removes all the trailing suffix from the collection.
+
+```go
+result := lo.TrimSuffix([]int{1, 2, 3, 1, 2, 4, 2, 4, 2, 4}, []int{2, 4})
+// []int{1, 2, 3, 1}
+
+result := lo.TrimSuffix([]string{"hello", "world", "hello", "test"}, []string{"test"})
+// []string{"hello", "world", "hello"}
+```
+
+[[play](https://go.dev/play/p/IjEUrV0iofq)]
+
+### Keys
+
+Creates a slice of the map keys.
+
+Use the UniqKeys variant to deduplicate common keys.
+
+```go
+keys := lo.Keys(map[string]int{"foo": 1, "bar": 2})
 // []string{"foo", "bar"}
+
+keys := lo.Keys(map[string]int{"foo": 1, "bar": 2}, map[string]int{"baz": 3})
+// []string{"foo", "bar", "baz"}
+
+keys := lo.Keys(map[string]int{"foo": 1, "bar": 2}, map[string]int{"bar": 3})
+// []string{"foo", "bar", "bar"}
 ```
 
 [[play](https://go.dev/play/p/Uu11fHASqrU)]
 
-### Values
+### UniqKeys
 
-Creates an array of the map values.
+Creates a slice of unique map keys.
 
 ```go
-values := lo.Values[string, int](map[string]int{"foo": 1, "bar": 2})
+keys := lo.UniqKeys(map[string]int{"foo": 1, "bar": 2}, map[string]int{"baz": 3})
+// []string{"foo", "bar", "baz"}
+
+keys := lo.UniqKeys(map[string]int{"foo": 1, "bar": 2}, map[string]int{"bar": 3})
+// []string{"foo", "bar"}
+```
+
+[[play](https://go.dev/play/p/TPKAb6ILdHk)]
+
+### HasKey
+
+Returns whether the given key exists.
+
+```go
+exists := lo.HasKey(map[string]int{"foo": 1, "bar": 2}, "foo")
+// true
+
+exists := lo.HasKey(map[string]int{"foo": 1, "bar": 2}, "baz")
+// false
+```
+
+[[play](https://go.dev/play/p/aVwubIvECqS)]
+
+### Values
+
+Creates a slice of the map values.
+
+Use the UniqValues variant to deduplicate common values.
+
+```go
+values := lo.Values(map[string]int{"foo": 1, "bar": 2})
 // []int{1, 2}
+
+values := lo.Values(map[string]int{"foo": 1, "bar": 2}, map[string]int{"baz": 3})
+// []int{1, 2, 3}
+
+values := lo.Values(map[string]int{"foo": 1, "bar": 2}, map[string]int{"bar": 2})
+// []int{1, 2, 2}
 ```
 
 [[play](https://go.dev/play/p/nnRTQkzQfF6)]
 
+### UniqValues
+
+Creates a slice of unique map values.
+
+```go
+values := lo.UniqValues(map[string]int{"foo": 1, "bar": 2})
+// []int{1, 2}
+
+values := lo.UniqValues(map[string]int{"foo": 1, "bar": 2}, map[string]int{"baz": 3})
+// []int{1, 2, 3}
+
+values := lo.UniqValues(map[string]int{"foo": 1, "bar": 2}, map[string]int{"bar": 2})
+// []int{1, 2}
+```
+
+[[play](https://go.dev/play/p/nf6bXMh7rM3)]
+
+### ValueOr
+
+Returns the value of the given key or the fallback value if the key is not present.
+
+```go
+value := lo.ValueOr(map[string]int{"foo": 1, "bar": 2}, "foo", 42)
+// 1
+
+value := lo.ValueOr(map[string]int{"foo": 1, "bar": 2}, "baz", 42)
+// 42
+```
+
+[[play](https://go.dev/play/p/bAq9mHErB4V)]
+
 ### PickBy
 
 Returns same map type filtered by given predicate.
 
 ```go
-m := lo.PickBy[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(key string, value int) bool {
+m := lo.PickBy(map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(key string, value int) bool {
     return value%2 == 1
 })
 // map[string]int{"foo": 1, "baz": 3}
 ```
 
+```go
+// Use PickByErr when the predicate can return an error
+m, err := lo.PickByErr(map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(key string, value int) (bool, error) {
+    if key == "bar" {
+        return false, fmt.Errorf("bar not allowed")
+    }
+    return value%2 == 1, nil
+})
+// map[string]int(nil), error("bar not allowed")
+```
+
 [[play](https://go.dev/play/p/kdg8GR_QMmf)]
 
 ### PickByKeys
@@ -858,7 +1741,7 @@ m := lo.PickBy[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(k
 Returns same map type filtered by given keys.
 
 ```go
-m := lo.PickByKeys[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, []string{"foo", "baz"})
+m := lo.PickByKeys(map[string]int{"foo": 1, "bar": 2, "baz": 3}, []string{"foo", "baz"})
 // map[string]int{"foo": 1, "baz": 3}
 ```
 
@@ -869,7 +1752,7 @@ m := lo.PickByKeys[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, []
 Returns same map type filtered by given values.
 
 ```go
-m := lo.PickByValues[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, []int{1, 3})
+m := lo.PickByValues(map[string]int{"foo": 1, "bar": 2, "baz": 3}, []int{1, 3})
 // map[string]int{"foo": 1, "baz": 3}
 ```
 
@@ -880,12 +1763,23 @@ m := lo.PickByValues[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3},
 Returns same map type filtered by given predicate.
 
 ```go
-m := lo.OmitBy[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(key string, value int) bool {
+m := lo.OmitBy(map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(key string, value int) bool {
     return value%2 == 1
 })
 // map[string]int{"bar": 2}
 ```
 
+```go
+// Use OmitByErr when the predicate can return an error
+m, err := lo.OmitByErr(map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(key string, value int) (bool, error) {
+    if key == "bar" {
+        return false, fmt.Errorf("bar not allowed")
+    }
+    return value%2 == 1, nil
+})
+// map[string]int(nil), error("bar not allowed")
+```
+
 [[play](https://go.dev/play/p/EtBsR43bdsd)]
 
 ### OmitByKeys
@@ -893,7 +1787,7 @@ m := lo.OmitBy[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(k
 Returns same map type filtered by given keys.
 
 ```go
-m := lo.OmitByKeys[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, []string{"foo", "baz"})
+m := lo.OmitByKeys(map[string]int{"foo": 1, "bar": 2, "baz": 3}, []string{"foo", "baz"})
 // map[string]int{"bar": 2}
 ```
 
@@ -904,7 +1798,7 @@ m := lo.OmitByKeys[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, []
 Returns same map type filtered by given values.
 
 ```go
-m := lo.OmitByValues[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3}, []int{1, 3})
+m := lo.OmitByValues(map[string]int{"foo": 1, "bar": 2, "baz": 3}, []int{1, 3})
 // map[string]int{"bar": 2}
 ```
 
@@ -912,10 +1806,10 @@ m := lo.OmitByValues[string, int](map[string]int{"foo": 1, "bar": 2, "baz": 3},
 
 ### Entries (alias: ToPairs)
 
-Transforms a map into array of key/value pairs.
+Transforms a map into a slice of key/value pairs.
 
 ```go
-entries := lo.Entries[string, int](map[string]int{"foo": 1, "bar": 2})
+entries := lo.Entries(map[string]int{"foo": 1, "bar": 2})
 // []lo.Entry[string, int]{
 //     {
 //         Key: "foo",
@@ -928,14 +1822,14 @@ entries := lo.Entries[string, int](map[string]int{"foo": 1, "bar": 2})
 // }
 ```
 
-[[play](https://go.dev/play/p/3Dhgx46gawJ)]
+[[play](https://go.dev/play/p/_t4Xe34-Nl5)]
 
 ### FromEntries (alias: FromPairs)
 
-Transforms an array of key/value pairs into a map.
+Transforms a slice of key/value pairs into a map.
 
 ```go
-m := lo.FromEntries[string, int]([]lo.Entry[string, int]{
+m := lo.FromEntries([]lo.Entry[string, int]{
     {
         Key: "foo",
         Value: 1,
@@ -955,10 +1849,10 @@ m := lo.FromEntries[string, int]([]lo.Entry[string, int]{
 Creates a map composed of the inverted keys and values. If map contains duplicate values, subsequent values overwrite property assignments of previous values.
 
 ```go
-m1 := lo.Invert[string, int](map[string]int{"a": 1, "b": 2})
+m1 := lo.Invert(map[string]int{"a": 1, "b": 2})
 // map[int]string{1: "a", 2: "b"}
 
-m2 := lo.Invert[string, int](map[string]int{"a": 1, "b": 2, "c": 1})
+m2 := lo.Invert(map[string]int{"a": 1, "b": 2, "c": 1})
 // map[int]string{1: "c", 2: "b"}
 ```
 
@@ -969,7 +1863,7 @@ m2 := lo.Invert[string, int](map[string]int{"a": 1, "b": 2, "c": 1})
 Merges multiple maps from left to right.
 
 ```go
-mergedMaps := lo.Assign[string, int](
+mergedMaps := lo.Assign(
     map[string]int{"a": 1, "b": 2},
     map[string]int{"b": 3, "c": 4},
 )
@@ -978,37 +1872,109 @@ mergedMaps := lo.Assign[string, int](
 
 [[play](https://go.dev/play/p/VhwfJOyxf5o)]
 
-### MapKeys
+### ChunkEntries
 
-Manipulates a map keys and transforms it to a map of another type.
+Splits a map into a slice of elements in groups of length equal to its size. If the map cannot be split evenly, the final chunk will contain the remaining elements.
 
 ```go
-m2 := lo.MapKeys[int, int, string](map[int]int{1: 1, 2: 2, 3: 3, 4: 4}, func(_ int, v int) string {
+maps := lo.ChunkEntries(
+    map[string]int{
+        "a": 1,
+        "b": 2,
+        "c": 3,
+        "d": 4,
+        "e": 5,
+    },
+    3,
+)
+// []map[string]int{
+//    {"a": 1, "b": 2, "c": 3},
+//    {"d": 4, "e": 5},
+// }
+```
+[[play](https://go.dev/play/p/X_YQL6mmoD-)]
+
+### MapKeys
+
+Manipulates map keys and transforms it to a map of another type.
+
+```go
+m2 := lo.MapKeys(map[int]int{1: 1, 2: 2, 3: 3, 4: 4}, func(_ int, v int) string {
     return strconv.FormatInt(int64(v), 10)
 })
 // map[string]int{"1": 1, "2": 2, "3": 3, "4": 4}
 ```
 
+```go
+// Use MapKeysErr when the iteratee can return an error
+m2, err := lo.MapKeysErr(map[int]int{1: 1, 2: 2, 3: 3}, func(_ int, v int) (string, error) {
+    if v == 2 {
+        return "", fmt.Errorf("even number not allowed")
+    }
+    return strconv.FormatInt(int64(v), 10), nil
+})
+// map[string]int(nil), error("even number not allowed")
+```
+
 [[play](https://go.dev/play/p/9_4WPIqOetJ)]
 
 ### MapValues
 
-Manipulates a map values and transforms it to a map of another type.
+Manipulates map values and transforms it to a map of another type.
 
 ```go
 m1 := map[int]int64{1: 1, 2: 2, 3: 3}
 
-m2 := lo.MapValues[int, int64, string](m1, func(x int64, _ int) string {
-	return strconv.FormatInt(x, 10)
+m2 := lo.MapValues(m1, func(x int64, _ int) string {
+    return strconv.FormatInt(x, 10)
 })
 // map[int]string{1: "1", 2: "2", 3: "3"}
 ```
 
+```go
+// Use MapValuesErr when the iteratee can return an error
+m1 := map[int]int64{1: 1, 2: 2, 3: 3}
+m2, err := lo.MapValuesErr(m1, func(x int64, _ int) (string, error) {
+    if x == 2 {
+        return "", fmt.Errorf("even number not allowed")
+    }
+    return strconv.FormatInt(x, 10), nil
+})
+// map[int]string(nil), error("even number not allowed")
+```
+
 [[play](https://go.dev/play/p/T_8xAfvcf0W)]
 
+### MapEntries
+
+Manipulates map entries and transforms it to a map of another type.
+
+```go
+in := map[string]int{"foo": 1, "bar": 2}
+
+out := lo.MapEntries(in, func(k string, v int) (int, string) {
+    return v,k
+})
+// map[int]string{1: "foo", 2: "bar"}
+```
+
+```go
+// Use MapEntriesErr when the iteratee can return an error
+in := map[string]int{"foo": 1, "bar": 2, "baz": 3}
+out, err := lo.MapEntriesErr(in, func(k string, v int) (int, string, error) {
+    if k == "bar" {
+        return 0, "", fmt.Errorf("bar not allowed")
+    }
+    return v, k, nil
+})
+// map[int]string(nil), error("bar not allowed")
+```
+
+[[play](https://go.dev/play/p/VuvNQzxKimT)]
+
 ### MapToSlice
 
-Transforms a map into a slice based on specific iteratee.
+Transforms a map into a slice based on specified iteratee.
 
 ```go
 m := map[int]int64{1: 4, 2: 5, 3: 6}
@@ -1019,35 +1985,126 @@ s := lo.MapToSlice(m, func(k int, v int64) string {
 // []string{"1_4", "2_5", "3_6"}
 ```
 
+```go
+// Use MapToSliceErr when the iteratee can return an error
+m := map[int]int64{1: 4, 2: 5, 3: 6}
+s, err := lo.MapToSliceErr(m, func(k int, v int64) (string, error) {
+    if k == 2 {
+        return "", fmt.Errorf("key 2 not allowed")
+    }
+    return fmt.Sprintf("%d_%d", k, v), nil
+})
+// []string(nil), error("key 2 not allowed")
+```
+
 [[play](https://go.dev/play/p/ZuiCZpDt6LD)]
 
+### FilterMapToSlice
+
+Transforms a map into a slice based on specified iteratee. The iteratee returns a value and a boolean. If the boolean is true, the value is added to the result slice.
+
+If the boolean is false, the value is not added to the result slice. The order of the keys in the input map is not specified and the order of the keys in the output slice is not guaranteed.
+
+```go
+kv := map[int]int64{1: 1, 2: 2, 3: 3, 4: 4}
+
+result := lo.FilterMapToSlice(kv, func(k int, v int64) (string, bool) {
+    return fmt.Sprintf("%d_%d", k, v), k%2 == 0
+})
+// []{"2_2", "4_4"}
+```
+
+```go
+kv := map[int]int64{1: 1, 2: 2, 3: 3, 4: 4}
+
+result, err := lo.FilterMapToSliceErr(kv, func(k int, v int64) (string, bool, error) {
+    if k == 3 {
+        return "", false, fmt.Errorf("key 3 not allowed")
+    }
+    return fmt.Sprintf("%d_%d", k, v), k%2 == 0, nil
+})
+// []string(nil), error("key 3 not allowed")
+```
+
+### FilterKeys
+
+Transforms a map into a slice based on predicate returns true for specific elements. It is a mix of `lo.Filter()` and `lo.Keys()`.
+
+```go
+kv := map[int]string{1: "foo", 2: "bar", 3: "baz"}
+
+result := FilterKeys(kv, func(k int, v string) bool {
+    return v == "foo"
+})
+// [1]
+```
+
+```go
+// Use FilterKeysErr when the predicate can return an error
+result, err := lo.FilterKeysErr(map[int]string{1: "foo", 2: "bar", 3: "baz"}, func(k int, v string) (bool, error) {
+    if k == 3 {
+        return false, fmt.Errorf("key 3 not allowed")
+    }
+    return v == "foo", nil
+})
+// []int(nil), error("key 3 not allowed")
+```
+
+[[play](https://go.dev/play/p/OFlKXlPrBAe)]
+
+### FilterValues
+
+Transforms a map into a slice based on predicate returns true for specific elements. It is a mix of `lo.Filter()` and `lo.Values()`.
+
+```go
+kv := map[int]string{1: "foo", 2: "bar", 3: "baz"}
+
+result := FilterValues(kv, func(k int, v string) bool {
+    return v == "foo"
+})
+// ["foo"]
+```
+
+```go
+// Use FilterValuesErr when the predicate can return an error
+result, err := lo.FilterValuesErr(map[int]string{1: "foo", 2: "bar", 3: "baz"}, func(k int, v string) (bool, error) {
+    if k == 3 {
+        return false, fmt.Errorf("key 3 not allowed")
+    }
+    return v == "foo", nil
+})
+// []string(nil), error("key 3 not allowed")
+```
+
+[[play](https://go.dev/play/p/YVD5r_h-LX-)]
+
 ### Range / RangeFrom / RangeWithSteps
 
-Creates an array of numbers (positive and/or negative) progressing from start up to, but not including end.
+Creates a slice of numbers (positive and/or negative) progressing from start up to, but not including end.
 
 ```go
-result := Range(4)
+result := lo.Range(4)
 // [0, 1, 2, 3]
 
-result := Range(-4)
+result := lo.Range(-4)
 // [0, -1, -2, -3]
 
-result := RangeFrom(1, 5)
+result := lo.RangeFrom(1, 5)
 // [1, 2, 3, 4, 5]
 
-result := RangeFrom[float64](1.0, 5)
+result := lo.RangeFrom[float64](1.0, 5)
 // [1.0, 2.0, 3.0, 4.0, 5.0]
 
-result := RangeWithSteps(0, 20, 5)
+result := lo.RangeWithSteps(0, 20, 5)
 // [0, 5, 10, 15]
 
-result := RangeWithSteps[float32](-1.0, -4.0, -1.0)
+result := lo.RangeWithSteps[float32](-1.0, -4.0, -1.0)
 // [-1.0, -2.0, -3.0]
 
-result := RangeWithSteps(1, 4, -1)
+result := lo.RangeWithSteps(1, 4, -1)
 // []
 
-result := Range(0)
+result := lo.Range(0)
 // []
 ```
 
@@ -1070,9 +2127,24 @@ r3 := lo.Clamp(42, -10, 10)
 
 [[play](https://go.dev/play/p/RU4lJNC2hlI)]
 
+### Sum
+
+Sums the values in a collection.
+
+If collection is empty 0 is returned.
+
+```go
+list := []int{1, 2, 3, 4, 5}
+sum := lo.Sum(list)
+// 15
+```
+
+[[play](https://go.dev/play/p/upfeJVqs4Bt)]
+
 ### SumBy
 
 Summarizes the values in a collection using the given return value from the iteration function.
+
 If collection is empty 0 is returned.
 
 ```go
@@ -1083,7 +2155,143 @@ sum := lo.SumBy(strings, func(item string) int {
 // 6
 ```
 
-[[play](https://go.dev/play/p/Dz_a_7jN_ca)]
+With error handling:
+
+```go
+strings := []string{"foo", "bar", "baz"}
+sum, err := lo.SumByErr(strings, func(item string) (int, error) {
+    if item == "bar" {
+        return 0, fmt.Errorf("invalid item: %s", item)
+    }
+    return len(item), nil
+})
+// sum: 3, err: invalid item: bar
+```
+
+### Product
+
+Calculates the product of the values in a collection.
+
+If collection is empty 0 is returned.
+
+```go
+list := []int{1, 2, 3, 4, 5}
+product := lo.Product(list)
+// 120
+```
+
+[[play](https://go.dev/play/p/2_kjM_smtAH)]
+
+### ProductBy
+
+Calculates the product of the values in a collection using the given return value from the iteration function.
+
+If collection is empty 0 is returned.
+
+```go
+strings := []string{"foo", "bar"}
+product := lo.ProductBy(strings, func(item string) int {
+    return len(item)
+})
+// 9
+```
+
+```go
+// Use ProductByErr when the transform function can return an error
+strings := []string{"foo", "bar", "baz"}
+product, err := lo.ProductByErr(strings, func(item string) (int, error) {
+    if item == "bar" {
+        return 0, fmt.Errorf("bar is not allowed")
+    }
+    return len(item), nil
+})
+// 3, error("bar is not allowed")
+```
+
+[[play](https://go.dev/play/p/wadzrWr9Aer)]
+
+### Mean
+
+Calculates the mean of a collection of numbers.
+
+If collection is empty 0 is returned.
+
+```go
+mean := lo.Mean([]int{2, 3, 4, 5})
+// 3
+
+mean := lo.Mean([]float64{2, 3, 4, 5})
+// 3.5
+
+mean := lo.Mean([]float64{})
+// 0
+```
+
+### MeanBy
+
+Calculates the mean of a collection of numbers using the given return value from the iteration function.
+
+If collection is empty 0 is returned.
+
+```go
+list := []string{"aa", "bbb", "cccc", "ddddd"}
+mapper := func(item string) float64 {
+    return float64(len(item))
+}
+
+mean := lo.MeanBy(list, mapper)
+// 3.5
+
+mean := lo.MeanBy([]float64{}, mapper)
+// 0
+```
+
+```go
+// Use MeanByErr when the transform function can return an error
+list := []string{"aa", "bbb", "cccc", "ddddd"}
+mean, err := lo.MeanByErr(list, func(item string) (float64, error) {
+    if item == "cccc" {
+        return 0, fmt.Errorf("cccc is not allowed")
+    }
+    return float64(len(item)), nil
+})
+// 0, error("cccc is not allowed")
+```
+
+[[play](https://go.dev/play/p/j7TsVwBOZ7P)]
+
+### Mode
+
+Calculates the mode (most frequent value) of a collection of numbers.
+
+If multiple values have the same highest frequency, then multiple values are returned.
+
+If the collection is empty, the zero value of `T[]` is returned.
+
+```go
+mode := lo.Mode([]int{2, 2, 3, 4})
+// [2]
+
+mode := lo.Mode([]float64{2, 2, 3, 3})
+// [2, 3]
+
+mode := lo.Mode([]float64{})
+// []
+
+mode := lo.Mode([]int{1, 2, 3, 4, 5, 6, 7, 8, 9})
+// [1, 2, 3, 4, 5, 6, 7, 8, 9]
+```
+
+### RandomString
+
+Returns a random string of the specified length and made of the specified charset.
+
+```go
+str := lo.RandomString(5, lo.LettersCharset)
+// example: "eIGbt"
+```
+
+[[play](https://go.dev/play/p/rRseOQVVum4)]
 
 ### Substring
 
@@ -1104,7 +2312,7 @@ sub := lo.Substring("hello", -2, math.MaxUint)
 
 ### ChunkString
 
-Returns an array of strings split into groups the length of size. If array can't be split evenly, the final chunk will be the remaining elements.
+Returns a slice of strings split into groups of length size. If the string can't be split evenly, the final chunk will be the remaining characters.
 
 ```go
 lo.ChunkString("123456", 2)
@@ -1120,6 +2328,8 @@ lo.ChunkString("1", 2)
 // []string{"1"}
 ```
 
+Note: `lo.ChunkString` and `lo.Chunk` functions behave inconsistently for empty input: `lo.ChunkString("", n)` returns `[""]` instead of `[]`. See [#788](https://github.com/samber/lo/issues/788).
+
 [[play](https://go.dev/play/p/__FLTuJVz54)]
 
 ### RuneLength
@@ -1136,6 +2346,95 @@ sub := len("hellô")
 
 [[play](https://go.dev/play/p/tuhgW_lWY8l)]
 
+### PascalCase
+
+Converts string to pascal case.
+
+```go
+str := lo.PascalCase("hello_world")
+// HelloWorld
+```
+
+[[play](https://go.dev/play/p/Dy_V_6DUYhe)]
+
+### CamelCase
+
+Converts string to camel case.
+
+```go
+str := lo.CamelCase("hello_world")
+// helloWorld
+```
+
+[[play](https://go.dev/play/p/Go6aKwUiq59)]
+
+### KebabCase
+
+Converts string to kebab case.
+
+```go
+str := lo.KebabCase("helloWorld")
+// hello-world
+```
+
+[[play](https://go.dev/play/p/96gT_WZnTVP)]
+
+### SnakeCase
+
+Converts string to snake case.
+
+```go
+str := lo.SnakeCase("HelloWorld")
+// hello_world
+```
+
+[[play](https://go.dev/play/p/ziB0V89IeVH)]
+
+### Words
+
+Splits string into a slice of its words.
+
+```go
+str := lo.Words("helloWorld")
+// []string{"hello", "world"}
+```
+
+[[play](https://go.dev/play/p/-f3VIQqiaVw)]
+
+### Capitalize
+
+Converts the first character of string to upper case and the remaining to lower case.
+
+```go
+str := lo.Capitalize("heLLO")
+// Hello
+```
+
+[[play](https://go.dev/play/p/uLTZZQXqnsa)]
+
+### Ellipsis
+
+Trims and truncates a string to a specified length in runes (Unicode code points) and appends an ellipsis if truncated. Multi-byte characters such as emoji or CJK ideographs are never split in the middle.
+
+```go
+str := lo.Ellipsis("  Lorem Ipsum  ", 5)
+// Lo...
+
+str := lo.Ellipsis("Lorem Ipsum", 100)
+// Lorem Ipsum
+
+str := lo.Ellipsis("Lorem Ipsum", 3)
+// ...
+
+str := lo.Ellipsis("hello 世界! 你好", 8)
+// hello...
+
+str := lo.Ellipsis("🏠🐶🐱🌟", 4)
+// 🏠🐶🐱🌟
+```
+
+[[play](https://go.dev/play/p/qE93rgqe1TW)]
+
 ### T2 -> T9
 
 Creates a tuple from a list of values.
@@ -1153,10 +2452,18 @@ tuple2 := lo.T2(example())
 
 ### Unpack2 -> Unpack9
 
-Returns values contained in tuple.
+Returns values contained in a tuple.
 
 ```go
-r1, r2 := lo.Unpack2[string, int](lo.Tuple2[string, int]{"a", 1})
+r1, r2 := lo.Unpack2(lo.Tuple2[string, int]{"a", 1})
+// "a", 1
+```
+
+Unpack is also available as a method of TupleX.
+
+```go
+tuple2 := lo.T2("a", 1)
+a, b := tuple2.Unpack()
 // "a", 1
 ```
 
@@ -1164,29 +2471,160 @@ r1, r2 := lo.Unpack2[string, int](lo.Tuple2[string, int]{"a", 1})
 
 ### Zip2 -> Zip9
 
-Zip creates a slice of grouped elements, the first of which contains the first elements of the given arrays, the second of which contains the second elements of the given arrays, and so on.
+Zip creates a slice of grouped elements, the first of which contains the first elements of the given slices, the second of which contains the second elements of the given slices, and so on.
 
-When collections have different size, the Tuple attributes are filled with zero value.
+When collections are different sizes, the Tuple attributes are filled with zero value.
 
 ```go
-tuples := lo.Zip2[string, int]([]string{"a", "b"}, []int{1, 2})
+tuples := lo.Zip2([]string{"a", "b"}, []int{1, 2})
 // []Tuple2[string, int]{{A: "a", B: 1}, {A: "b", B: 2}}
 ```
 
 [[play](https://go.dev/play/p/jujaA6GaJTp)]
 
-### Unzip2 -> Unzip9
+### ZipBy2 -> ZipBy9
 
-Unzip accepts an array of grouped elements and creates an array regrouping the elements to their pre-zip configuration.
+ZipBy creates a slice of transformed elements, the first of which contains the first elements of the given slices, the second of which contains the second elements of the given slices, and so on.
+
+When collections are different sizes, the Tuple attributes are filled with zero value.
 
 ```go
-a, b := lo.Unzip2[string, int]([]Tuple2[string, int]{{A: "a", B: 1}, {A: "b", B: 2}})
+items := lo.ZipBy2([]string{"a", "b"}, []int{1, 2}, func(a string, b int) string {
+    return fmt.Sprintf("%s-%d", a, b)
+})
+// []string{"a-1", "b-2"}
+```
+
+With error handling:
+
+```go
+items, err := lo.ZipByErr2([]string{"a", "b"}, []int{1, 2}, func(a string, b int) (string, error) {
+    if b == 2 {
+        return "", fmt.Errorf("number 2 is not allowed")
+    }
+    return fmt.Sprintf("%s-%d", a, b), nil
+})
+// []string(nil), error("number 2 is not allowed")
+```
+
+### Unzip2 -> Unzip9
+
+Unzip accepts a slice of grouped elements and creates a slice regrouping the elements to their pre-zip configuration.
+
+```go
+a, b := lo.Unzip2([]Tuple2[string, int]{{A: "a", B: 1}, {A: "b", B: 2}})
 // []string{"a", "b"}
 // []int{1, 2}
 ```
 
 [[play](https://go.dev/play/p/ciHugugvaAW)]
 
+### UnzipBy2 -> UnzipBy9
+
+UnzipBy2 iterates over a collection and creates a slice regrouping the elements to their pre-zip configuration.
+
+```go
+a, b := lo.UnzipBy2([]string{"hello", "john", "doe"}, func(str string) (string, int) {
+    return str, len(str)
+})
+// []string{"hello", "john", "doe"}
+// []int{5, 4, 3}
+```
+
+```go
+a, b, err := lo.UnzipByErr2([]string{"hello", "error", "world"}, func(str string) (string, int, error) {
+    if str == "error" {
+        return "", 0, fmt.Errorf("error string not allowed")
+    }
+    return str, len(str), nil
+})
+// []string{}
+// []int{}
+// error string not allowed
+```
+
+### CrossJoin2 -> CrossJoin9
+
+Combines every item from one list with every item from others. It is the cartesian product of lists received as arguments. Returns an empty list if a list is empty.
+
+```go
+result := lo.CrossJoin2([]string{"hello", "john", "doe"}, []int{1, 2})
+// lo.Tuple2{"hello", 1}
+// lo.Tuple2{"hello", 2}
+// lo.Tuple2{"john", 1}
+// lo.Tuple2{"john", 2}
+// lo.Tuple2{"doe", 1}
+// lo.Tuple2{"doe", 2}
+```
+
+### CrossJoinBy2 -> CrossJoinBy9
+
+Combines every item from one list with every item from others. It is the cartesian product of lists received as arguments. The transform function is used to create the output values. Returns an empty list if a list is empty.
+
+```go
+result := lo.CrossJoinBy2([]string{"hello", "john", "doe"}, []int{1, 2}, func(a A, b B) string {
+    return fmt.Sprintf("%s - %d", a, b)
+})
+// "hello - 1"
+// "hello - 2"
+// "john - 1"
+// "john - 2"
+// "doe - 1"
+// "doe - 2"
+```
+
+With error handling:
+
+```go
+result, err := lo.CrossJoinByErr2([]string{"hello", "john"}, []int{1, 2}, func(a string, b int) (string, error) {
+    if a == "john" {
+        return "", fmt.Errorf("john not allowed")
+    }
+    return fmt.Sprintf("%s - %d", a, b), nil
+})
+// []string(nil), error("john not allowed")
+```
+
+### Duration
+
+Returns the time taken to execute a function.
+
+```go
+duration := lo.Duration(func() {
+    // very long job
+})
+// 3s
+```
+
+[[play](https://go.dev/play/p/HQfbBbAXaFP)]
+
+### Duration0 -> Duration10
+
+Returns the time taken to execute a function.
+
+```go
+duration := lo.Duration0(func() {
+    // very long job
+})
+// 3s
+
+err, duration := lo.Duration1(func() error {
+    // very long job
+    return errors.New("an error")
+})
+// an error
+// 3s
+
+str, nbr, err, duration := lo.Duration3(func() (string, int, error) {
+    // very long job
+    return "hello", 42, nil
+})
+// hello
+// 42
+// nil
+// 3s
+```
+
 ### ChannelDispatcher
 
 Distributes messages from input channels into N child channels. Close events are propagated to children.
@@ -1207,6 +2645,7 @@ consumer := func(c <-chan int) {
         msg, ok := <-c
         if !ok {
             println("closed")
+
             break
         }
 
@@ -1219,6 +2658,8 @@ for i := range children {
 }
 ```
 
+[[play](https://go.dev/play/p/UZGu2wVg3J2)]
+
 Many distributions strategies are available:
 
 - [lo.DispatchingStrategyRoundRobin](./channel.go): Distributes messages in a rotating sequential manner.
@@ -1226,7 +2667,7 @@ Many distributions strategies are available:
 - [lo.DispatchingStrategyWeightedRandom](./channel.go): Distributes messages in a weighted manner.
 - [lo.DispatchingStrategyFirst](./channel.go): Distributes messages in the first non-full channel.
 - [lo.DispatchingStrategyLeast](./channel.go): Distributes messages in the emptiest channel.
-- [lo.DispatchingStrategyMost](./channel.go): Distributes to the fulliest channel.
+- [lo.DispatchingStrategyMost](./channel.go): Distributes to the fullest channel.
 
 Some strategies bring fallback, in order to favor non-blocking behaviors. See implementations.
 
@@ -1244,14 +2685,14 @@ type Message struct {
 }
 
 func hash(id uuid.UUID) int {
-	h := fnv.New32a()
-	h.Write([]byte(id.String()))
-	return int(h.Sum32())
+    h := fnv.New32a()
+    h.Write([]byte(id.String()))
+    return int(h.Sum32())
 }
 
 // Routes messages per TenantID.
-customStrategy := func(message pubsub.AMQPSubMessage, messageIndex uint64, channels []<-chan pubsub.AMQPSubMessage) int {
-    destination := hash(message.TenantID) % len(channels)
+customStrategy := func(message string, messageIndex uint64, channels []<-chan string) int {
+    destination := hash(message) % len(channels)
 
     // check if channel is full
     if len(channels[destination]) < cap(channels[destination]) {
@@ -1268,17 +2709,31 @@ children := lo.ChannelDispatcher(ch, 5, 10, customStrategy)
 
 ### SliceToChannel
 
-Returns a read-only channels of collection elements. Channel is closed after last element. Channel capacity can be customized.
+Returns a read-only channel of collection elements. Channel is closed after last element. Channel capacity can be customized.
 
 ```go
 list := []int{1, 2, 3, 4, 5}
 
 for v := range lo.SliceToChannel(2, list) {
-    println(v)		
+    println(v)
 }
 // prints 1, then 2, then 3, then 4, then 5
 ```
 
+[[play](https://go.dev/play/p/lIbSY3QmiEg)]
+
+### ChannelToSlice
+
+Returns a slice built from channel items. Blocks until channel closes.
+
+```go
+list := []int{1, 2, 3, 4, 5}
+ch := lo.SliceToChannel(2, list)
+
+items := ChannelToSlice(ch)
+// []int{1, 2, 3, 4, 5}
+```
+
 ### Generator
 
 Implements the generator design pattern. Channel is closed after last element. Channel capacity can be customized.
@@ -1296,16 +2751,16 @@ for v := range lo.Generator(2, generator) {
 // prints 1, then 2, then 3
 ```
 
-### Batch
+### Buffer
 
 Creates a slice of n elements from a channel. Returns the slice, the slice length, the read time and the channel status (opened/closed).
 
 ```go
 ch := lo.SliceToChannel(2, []int{1, 2, 3, 4, 5})
 
-items1, length1, duration1, ok1 := lo.Batch(ch, 3)
+items1, length1, duration1, ok1 := lo.Buffer(ch, 3)
 // []int{1, 2, 3}, 3, 0s, true
-items2, length2, duration2, ok2 := lo.Batch(ch, 3)
+items2, length2, duration2, ok2 := lo.Buffer(ch, 3)
 // []int{4, 5}, 2, 0s, false
 ```
 
@@ -1316,7 +2771,7 @@ ch := readFromQueue()
 
 for {
     // read 1k items
-    items, length, _, ok := lo.Batch(ch, 1000)
+    items, length, _, ok := lo.Buffer(ch, 1000)
 
     // do batching stuff
 
@@ -1326,7 +2781,33 @@ for {
 }
 ```
 
-### BatchWithTimeout
+### BufferWithContext
+
+Creates a slice of n elements from a channel, with timeout. Returns the slice, the slice length, the read time and the channel status (opened/closed).
+
+```go
+ctx, cancel := context.WithCancel(context.TODO())
+go func() {
+    ch <- 0
+    time.Sleep(10*time.Millisecond)
+    ch <- 1
+    time.Sleep(10*time.Millisecond)
+    ch <- 2
+    time.Sleep(10*time.Millisecond)
+    ch <- 3
+    time.Sleep(10*time.Millisecond)
+    ch <- 4
+    time.Sleep(10*time.Millisecond)
+    cancel()
+}()
+
+items1, length1, duration1, ok1 := lo.BufferWithContext(ctx, ch, 3)
+// []int{0, 1, 2}, 3, 20ms, true
+items2, length2, duration2, ok2 := lo.BufferWithContext(ctx, ch, 3)
+// []int{3, 4}, 2, 30ms, false
+```
+
+### BufferWithTimeout
 
 Creates a slice of n elements from a channel, with timeout. Returns the slice, the slice length, the read time and the channel status (opened/closed).
 
@@ -1340,11 +2821,11 @@ generator := func(yield func(int)) {
 
 ch := lo.Generator(0, generator)
 
-items1, length1, duration1, ok1 := lo.BatchWithTimeout(ch, 3, 100*time.Millisecond)
+items1, length1, duration1, ok1 := lo.BufferWithTimeout(ch, 3, 100*time.Millisecond)
 // []int{1, 2}, 2, 100ms, true
-items2, length2, duration2, ok2 := lo.BatchWithTimeout(ch, 3, 100*time.Millisecond)
+items2, length2, duration2, ok2 := lo.BufferWithTimeout(ch, 3, 100*time.Millisecond)
 // []int{3, 4, 5}, 3, 75ms, true
-items3, length3, duration2, ok3 := lo.BatchWithTimeout(ch, 3, 100*time.Millisecond)
+items3, length3, duration2, ok3 := lo.BufferWithTimeout(ch, 3, 100*time.Millisecond)
 // []int{}, 0, 10ms, false
 ```
 
@@ -1356,7 +2837,7 @@ ch := readFromQueue()
 for {
     // read 1k items
     // wait up to 1 second
-    items, length, _, ok := lo.BatchWithTimeout(ch, 1000, 1*time.Second)
+    items, length, _, ok := lo.BufferWithTimeout(ch, 1000, 1*time.Second)
 
     // do batching stuff
 
@@ -1373,13 +2854,13 @@ ch := readFromQueue()
 
 // 5 workers
 // prefetch 1k messages per worker
-children := lo.ChannelDispatcher(ch, 5, 1000, DispatchingStrategyFirst[int])
+children := lo.ChannelDispatcher(ch, 5, 1000, lo.DispatchingStrategyFirst[int])
 
 consumer := func(c <-chan int) {
     for {
         // read 1k items
         // wait up to 1 second
-        items, length, _, ok := lo.BatchWithTimeout(ch, 1000, 1*time.Second)
+        items, length, _, ok := lo.BufferWithTimeout(ch, 1000, 1*time.Second)
 
         // do batching stuff
 
@@ -1394,21 +2875,47 @@ for i := range children {
 }
 ```
 
+### FanIn
+
+Merge messages from multiple input channels into a single buffered channel. Output messages have no priority. When all upstream channels reach EOF, downstream channel closes.
+
+```go
+stream1 := make(chan int, 42)
+stream2 := make(chan int, 42)
+stream3 := make(chan int, 42)
+
+all := lo.FanIn(100, stream1, stream2, stream3)
+// <-chan int
+```
+
+### FanOut
+
+Broadcasts all the upstream messages to multiple downstream channels. When upstream channel reaches EOF, downstream channels close. If any downstream channels is full, broadcasting is paused.
+
+```go
+stream := make(chan int, 42)
+
+all := lo.FanOut(5, 100, stream)
+// [5]<-chan int
+```
+
 ### Contains
 
 Returns true if an element is present in a collection.
 
 ```go
-present := lo.Contains[int]([]int{0, 1, 2, 3, 4, 5}, 5)
+present := lo.Contains([]int{0, 1, 2, 3, 4, 5}, 5)
 // true
 ```
 
+[[play](https://go.dev/play/p/W1EvyqY6t9j)]
+
 ### ContainsBy
 
 Returns true if the predicate function returns `true`.
 
 ```go
-present := lo.ContainsBy[int]([]int{0, 1, 2, 3, 4, 5}, func(x int) bool {
+present := lo.ContainsBy([]int{0, 1, 2, 3, 4, 5}, func(x int) bool {
     return x == 3
 })
 // true
@@ -1416,37 +2923,42 @@ present := lo.ContainsBy[int]([]int{0, 1, 2, 3, 4, 5}, func(x int) bool {
 
 ### Every
 
-Returns true if all elements of a subset are contained into a collection or if the subset is empty.
+Returns true if all elements of a subset are contained in a collection or if the subset is empty.
 
 ```go
-ok := lo.Every[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
+ok := lo.Every([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
 // true
 
-ok := lo.Every[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 6})
+ok := lo.Every([]int{0, 1, 2, 3, 4, 5}, []int{0, 6})
 // false
 ```
 
 ### EveryBy
 
-Returns true if the predicate returns true for all of the elements in the collection or if the collection is empty.
+Returns true if the predicate returns true for all elements in the collection or if the collection is empty.
 
 ```go
-b := EveryBy[int]([]int{1, 2, 3, 4}, func(x int) bool {
+b := EveryBy([]int{1, 2, 3, 4}, func(x int) bool {
     return x < 5
 })
 // true
 ```
 
+[[play](https://go.dev/play/p/dn1-vhHsq9x)]
+
 ### Some
 
-Returns true if at least 1 element of a subset is contained into a collection.
+Returns true if at least 1 element of a subset is contained in a collection.
 If the subset is empty Some returns false.
 
 ```go
-ok := lo.Some[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
+ok := lo.Some([]int{0, 1, 2, 3, 4, 5}, []int{0, 6})
 // true
+```
 
-ok := lo.Some[int]([]int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
+[[play](https://go.dev/play/p/Lj4ceFkeT9V)]
+
+ok := lo.Some([]int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
 // false
 ```
 
@@ -1456,7 +2968,7 @@ Returns true if the predicate returns true for any of the elements in the collec
 If the collection is empty SomeBy returns false.
 
 ```go
-b := SomeBy[int]([]int{1, 2, 3, 4}, func(x int) bool {
+b := SomeBy([]int{1, 2, 3, 4}, func(x int) bool {
     return x < 3
 })
 // true
@@ -1464,158 +2976,355 @@ b := SomeBy[int]([]int{1, 2, 3, 4}, func(x int) bool {
 
 ### None
 
-Returns true if no element of a subset are contained into a collection or if the subset is empty.
+Returns true if no element of a subset is contained in a collection or if the subset is empty.
 
 ```go
-b := None[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
+b := None([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
 // false
-b := None[int]([]int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
+b := None([]int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
 // true
 ```
 
+[[play](https://go.dev/play/p/fye7JsmxzPV)]
+
 ### NoneBy
 
 Returns true if the predicate returns true for none of the elements in the collection or if the collection is empty.
 
 ```go
-b := NoneBy[int]([]int{1, 2, 3, 4}, func(x int) bool {
+b := NoneBy([]int{1, 2, 3, 4}, func(x int) bool {
     return x < 0
 })
 // true
 ```
 
+[[play](https://go.dev/play/p/O64WZ32H58S)]
+
 ### Intersect
 
-Returns the intersection between two collections.
+Returns the intersection between collections.
 
 ```go
-result1 := lo.Intersect[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
+result1 := lo.Intersect([]int{0, 1, 2, 3, 4, 5}, []int{0, 2})
 // []int{0, 2}
 
-result2 := lo.Intersect[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 6}
+result2 := lo.Intersect([]int{0, 1, 2, 3, 4, 5}, []int{0, 6})
 // []int{0}
 
-result3 := lo.Intersect[int]([]int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
+result3 := lo.Intersect([]int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
 // []int{}
+
+result4 := lo.Intersect([]int{0, 3, 5, 7}, []int{3, 5}, []int{0, 1, 2, 0, 3, 0})
+// []int{3}
+```
+
+### IntersectBy
+
+Returns the intersection between two collections using a custom key selector function.
+
+```go
+transform := func(v int) string {
+    return strconv.Itoa(v)
+}
+
+result1 := lo.IntersectBy(transform, []int{0, 1, 2, 3, 4, 5}, []int{0, 2})
+// []int{0, 2}
+
+result2 := lo.IntersectBy(transform, []int{0, 1, 2, 3, 4, 5}, []int{0, 6})
+// []int{0}
+
+result3 := lo.IntersectBy(transform, []int{0, 1, 2, 3, 4, 5}, []int{-1, 6})
+// []int{}
+
+result4 := lo.IntersectBy(transform, []int{0, 3, 5, 7}, []int{3, 5}, []int{0, 1, 2, 0, 3, 0})
+// []int{3}
 ```
 
 ### Difference
 
 Returns the difference between two collections.
 
-- The first value is the collection of element absent of list2.
-- The second value is the collection of element absent of list1.
+- The first value is the collection of elements absent from list2.
+- The second value is the collection of elements absent from list1.
 
 ```go
-left, right := lo.Difference[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 2, 6})
+left, right := lo.Difference([]int{0, 1, 2, 3, 4, 5}, []int{0, 2, 6})
 // []int{1, 3, 4, 5}, []int{6}
 
-left, right := lo.Difference[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 1, 2, 3, 4, 5})
+left, right := lo.Difference([]int{0, 1, 2, 3, 4, 5}, []int{0, 1, 2, 3, 4, 5})
 // []int{}, []int{}
 ```
 
+[[play](https://go.dev/play/p/pKE-JgzqRpz)]
+
 ### Union
 
-Returns all distinct elements from both collections. Result will not change the order of elements relatively.
+Returns all distinct elements from given collections. Result will not change the order of elements relatively.
 
 ```go
-union := lo.Union[int]([]int{0, 1, 2, 3, 4, 5}, []int{0, 2, 10})
+union := lo.Union([]int{0, 1, 2, 3, 4, 5}, []int{0, 2}, []int{0, 10})
 // []int{0, 1, 2, 3, 4, 5, 10}
 ```
 
 ### Without
 
-Returns slice excluding all given values.
+Returns a slice excluding all given values.
 
 ```go
-subset := lo.Without[int]([]int{0, 2, 10}, 2)
+subset := lo.Without([]int{0, 2, 10}, 2)
 // []int{0, 10}
 
-subset := lo.Without[int]([]int{0, 2, 10}, 0, 1, 2, 3, 4, 5)
+subset := lo.Without([]int{0, 2, 10}, 0, 1, 2, 3, 4, 5)
 // []int{10}
 ```
 
+### WithoutBy
+
+Filters a slice by excluding elements whose extracted keys match any in the exclude list.
+
+Returns a new slice containing only the elements whose keys are not in the exclude list.
+
+```go
+type User struct {
+    ID int
+    Name string
+}
+
+// original users
+users := []User{
+    {ID: 1, Name: "Alice"},
+    {ID: 2, Name: "Bob"},
+    {ID: 3, Name: "Charlie"},
+}
+
+// extract function to get the user ID
+getID := func(user User) int {
+    return user.ID
+}
+
+// exclude users with IDs 2 and 3
+excludedIDs := []int{2, 3}
+
+// filtering users
+filteredUsers := lo.WithoutBy(users, getID, excludedIDs...)
+// []User[{ID: 1, Name: "Alice"}]
+```
+
+```go
+// Use WithoutByErr when the iteratee can return an error
+type struct User {
+    ID int
+    Name string
+}
+
+users := []User{
+    {ID: 1, Name: "Alice"},
+    {ID: 2, Name: "Bob"},
+    {ID: 3, Name: "Charlie"},
+}
+
+getID := func(user User) (int, error) {
+    if user.ID == 2 {
+        return 0, fmt.Errorf("Bob not allowed")
+    }
+    return user.ID, nil
+}
+
+filteredUsers, err := lo.WithoutByErr(users, getID, 2, 3)
+// []User(nil), error("Bob not allowed")
+```
+
 ### WithoutEmpty
 
-Returns slice excluding empty values.
+Returns a slice excluding zero values.
 
 ```go
-subset := lo.WithoutEmpty[int]([]int{0, 2, 10})
+subset := lo.WithoutEmpty([]int{0, 2, 10})
 // []int{2, 10}
 ```
 
+### WithoutNth
+
+Returns a slice excluding the nth value.
+
+```go
+subset := lo.WithoutNth([]int{-2, -1, 0, 1, 2}, 3, -42, 1)
+// []int{-2, 0, 2}
+```
+
+### ElementsMatch
+
+Returns true if lists contain the same set of elements (including empty set).
+
+If there are duplicate elements, the number of occurrences in each list should match.
+
+The order of elements is not checked.
+
+```go
+b := lo.ElementsMatch([]int{1, 1, 2}, []int{2, 1, 1})
+// true
+```
+
+### ElementsMatchBy
+
+Returns true if lists contain the same set of elements' keys (including empty set).
+
+If there are duplicate keys, the number of occurrences in each list should match.
+
+The order of elements is not checked.
+
+```go
+b := lo.ElementsMatchBy(
+    []someType{a, b},
+    []someType{b, a},
+    func(item someType) string { return item.ID() },
+)
+// true
+```
+
 ### IndexOf
 
-Returns the index at which the first occurrence of a value is found in an array or return -1 if the value cannot be found.
+Returns the index at which the first occurrence of a value is found in a slice or -1 if the value cannot be found.
 
 ```go
-found := lo.IndexOf[int]([]int{0, 1, 2, 1, 2, 3}, 2)
+found := lo.IndexOf([]int{0, 1, 2, 1, 2, 3}, 2)
 // 2
 
-notFound := lo.IndexOf[int]([]int{0, 1, 2, 1, 2, 3}, 6)
+notFound := lo.IndexOf([]int{0, 1, 2, 1, 2, 3}, 6)
 // -1
 ```
 
+[[play](https://go.dev/play/p/Eo7W0lvKTky)]
+
 ### LastIndexOf
 
-Returns the index at which the last occurrence of a value is found in an array or return -1 if the value cannot be found.
+Returns the index at which the last occurrence of a value is found in a slice or -1 if the value cannot be found.
 
 ```go
-found := lo.LastIndexOf[int]([]int{0, 1, 2, 1, 2, 3}, 2)
+found := lo.LastIndexOf([]int{0, 1, 2, 1, 2, 3}, 2)
 // 4
 
-notFound := lo.LastIndexOf[int]([]int{0, 1, 2, 1, 2, 3}, 6)
+notFound := lo.LastIndexOf([]int{0, 1, 2, 1, 2, 3}, 6)
 // -1
 ```
 
-### Find
+### HasPrefix
 
-Search an element in a slice based on a predicate. It returns element and true if element was found.
+Returns true if the collection has the prefix.
 
 ```go
-str, ok := lo.Find[string]([]string{"a", "b", "c", "d"}, func(i string) bool {
+ok := lo.HasPrefix([]int{1, 2, 3, 4}, []int{42})
+// false
+
+ok := lo.HasPrefix([]int{1, 2, 3, 4}, []int{1, 2})
+// true
+```
+
+[[play](https://go.dev/play/p/SrljzVDpMQM)]
+
+### HasSuffix
+
+Returns true if the collection has the suffix.
+
+```go
+ok := lo.HasSuffix([]int{1, 2, 3, 4}, []int{42})
+// false
+
+ok := lo.HasSuffix([]int{1, 2, 3, 4}, []int{3, 4})
+// true
+```
+
+[[play](https://go.dev/play/p/bJeLetQNAON)]
+
+### Find
+
+Searches for an element in a slice based on a predicate. Returns element and true if element was found.
+
+```go
+str, ok := lo.Find([]string{"a", "b", "c", "d"}, func(i string) bool {
     return i == "b"
 })
 // "b", true
 
-str, ok := lo.Find[string]([]string{"foobar"}, func(i string) bool {
+str, ok := lo.Find([]string{"foobar"}, func(i string) bool {
     return i == "b"
 })
 // "", false
 ```
 
+```go
+// Use FindErr when the predicate can return an error
+str, err := lo.FindErr([]string{"a", "b", "c", "d"}, func(i string) (bool, error) {
+    if i == "c" {
+        return false, fmt.Errorf("c is not allowed")
+    }
+    return i == "b", nil
+})
+// "b", nil
+
+str, err = lo.FindErr([]string{"a", "b", "c"}, func(i string) (bool, error) {
+    if i == "b" {
+        return false, fmt.Errorf("b is not allowed")
+    }
+    return i == "b", nil
+})
+// "", error("b is not allowed")
+```
+
+[[play](https://go.dev/play/p/Eo7W0lvKTky)]
+
 ### FindIndexOf
 
-FindIndexOf searches an element in a slice based on a predicate and returns the index and true. It returns -1 and false if the element is not found.
+FindIndexOf searches for an element in a slice based on a predicate and returns the index and true. Returns -1 and false if the element is not found.
 
 ```go
-str, index, ok := lo.FindIndexOf[string]([]string{"a", "b", "a", "b"}, func(i string) bool {
+str, index, ok := lo.FindIndexOf([]string{"a", "b", "a", "b"}, func(i string) bool {
     return i == "b"
 })
 // "b", 1, true
 
-str, index, ok := lo.FindIndexOf[string]([]string{"foobar"}, func(i string) bool {
+str, index, ok := lo.FindIndexOf([]string{"foobar"}, func(i string) bool {
     return i == "b"
 })
 // "", -1, false
 ```
 
+[[play](https://go.dev/play/p/XWSEM4Ic_t0)]
+
 ### FindLastIndexOf
 
-FindLastIndexOf searches an element in a slice based on a predicate and returns the index and true. It returns -1 and false if the element is not found.
+FindLastIndexOf searches for the last element in a slice based on a predicate and returns the index and true. Returns -1 and false if the element is not found.
 
 ```go
-str, index, ok := lo.FindLastIndexOf[string]([]string{"a", "b", "a", "b"}, func(i string) bool {
+str, index, ok := lo.FindLastIndexOf([]string{"a", "b", "a", "b"}, func(i string) bool {
     return i == "b"
 })
 // "b", 4, true
 
-str, index, ok := lo.FindLastIndexOf[string]([]string{"foobar"}, func(i string) bool {
+str, index, ok := lo.FindLastIndexOf([]string{"foobar"}, func(i string) bool {
     return i == "b"
 })
 // "", -1, false
 ```
 
+[[play](https://go.dev/play/p/dPiMRtJ6cUx)]
+
+### FindOrElse
+
+Searches for an element in a slice based on a predicate. Returns the element if found or a given fallback value otherwise.
+
+```go
+str := lo.FindOrElse([]string{"a", "b", "c", "d"}, "x", func(i string) bool {
+    return i == "b"
+})
+// "b"
+
+str := lo.FindOrElse([]string{"foobar"}, "x", func(i string) bool {
+    return i == "b"
+})
+// "x"
+```
+
 ### FindKey
 
 Returns the key of the first value matching.
@@ -1636,7 +3345,7 @@ result3, ok3 := lo.FindKey(map[string]test{"foo": test{"foo"}, "bar": test{"bar"
 
 ### FindKeyBy
 
-Returns the key of the first element predicate returns truthy for.
+Returns the key of the first element predicate returns true for.
 
 ```go
 result1, ok1 := lo.FindKeyBy(map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(k string, v int) bool {
@@ -1652,19 +3361,19 @@ result2, ok2 := lo.FindKeyBy(map[string]int{"foo": 1, "bar": 2, "baz": 3}, func(
 
 ### FindUniques
 
-Returns a slice with all the unique elements of the collection. The order of result values is determined by the order they occur in the array.
+Returns a slice with all the elements that appear in the collection only once. The order of result values is determined by the order they occur in the slice.
 
 ```go
-uniqueValues := lo.FindUniques[int]([]int{1, 2, 2, 1, 2, 3})
+uniqueValues := lo.FindUniques([]int{1, 2, 2, 1, 2, 3})
 // []int{3}
 ```
 
 ### FindUniquesBy
 
-Returns a slice with all the unique elements of the collection. The order of result values is determined by the order they occur in the array. It accepts `iteratee` which is invoked for each element in array to generate the criterion by which uniqueness is computed.
+Returns a slice with all the elements that appear in the collection only once. The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is invoked for each element in the slice to generate the criterion by which uniqueness is computed.
 
 ```go
-uniqueValues := lo.FindUniquesBy[int, int]([]int{3, 4, 5, 6, 7}, func(i int) int {
+uniqueValues := lo.FindUniquesBy([]int{3, 4, 5, 6, 7}, func(i int) int {
     return i%3
 })
 // []int{5}
@@ -1672,89 +3381,383 @@ uniqueValues := lo.FindUniquesBy[int, int]([]int{3, 4, 5, 6, 7}, func(i int) int
 
 ### FindDuplicates
 
-Returns a slice with the first occurence of each duplicated elements of the collection. The order of result values is determined by the order they occur in the array.
+Returns a slice with the first occurrence of each duplicated element in the collection. The order of result values is determined by the order they occur in the slice.
 
 ```go
-duplicatedValues := lo.FindDuplicates[int]([]int{1, 2, 2, 1, 2, 3})
+duplicatedValues := lo.FindDuplicates([]int{1, 2, 2, 1, 2, 3})
 // []int{1, 2}
 ```
 
 ### FindDuplicatesBy
 
-Returns a slice with the first occurence of each duplicated elements of the collection. The order of result values is determined by the order they occur in the array. It accepts `iteratee` which is invoked for each element in array to generate the criterion by which uniqueness is computed.
+Returns a slice with the first occurrence of each duplicated element in the collection. The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is invoked for each element in the slice to generate the criterion by which uniqueness is computed.
 
 ```go
-duplicatedValues := lo.FindDuplicatesBy[int, int]([]int{3, 4, 5, 6, 7}, func(i int) int {
+duplicatedValues := lo.FindDuplicatesBy([]int{3, 4, 5, 6, 7}, func(i int) int {
     return i%3
 })
 // []int{3, 4}
 ```
 
+With error handling:
+
+```go
+duplicatedValues, err := lo.FindDuplicatesByErr([]int{3, 4, 5, 6, 7}, func(i int) (int, error) {
+    if i == 5 {
+        return 0, fmt.Errorf("number 5 is not allowed")
+    }
+    return i % 3, nil
+})
+// []int(nil), error("number 5 is not allowed")
+```
+
 ### Min
 
 Search the minimum value of a collection.
 
+Returns zero value when the collection is empty.
+
 ```go
-min := lo.Min[int]([]int{1, 2, 3})
+min := lo.Min([]int{1, 2, 3})
 // 1
 
-min := lo.Min[int]([]int{})
+min := lo.Min([]int{})
 // 0
+
+min := lo.Min([]time.Duration{time.Second, time.Hour})
+// 1s
+```
+
+[[play](https://go.dev/play/p/r6e-Z8JozS8)]
+
+### MinIndex
+
+Search the minimum value of a collection and the index of the minimum value.
+
+Returns (zero value, -1) when the collection is empty.
+
+```go
+min, index := lo.MinIndex([]int{1, 2, 3})
+// 1, 0
+
+min, index := lo.MinIndex([]int{})
+// 0, -1
+
+min, index := lo.MinIndex([]time.Duration{time.Second, time.Hour})
+// 1s, 0
 ```
 
 ### MinBy
 
 Search the minimum value of a collection using the given comparison function.
+
 If several values of the collection are equal to the smallest value, returns the first such value.
 
+Returns zero value when the collection is empty.
+
 ```go
-min := lo.MinBy[string]([]string{"s1", "string2", "s3"}, func(item string, min string) bool {
+min := lo.MinBy([]string{"s1", "string2", "s3"}, func(item string, min string) bool {
     return len(item) < len(min)
 })
 // "s1"
 
-min := lo.MinBy[string]([]string{}, func(item string, min string) bool {
+min := lo.MinBy([]string{}, func(item string, min string) bool {
     return len(item) < len(min)
 })
 // ""
 ```
 
+```go
+// Use MinByErr when the comparison function can return an error
+min, err := lo.MinByErr([]string{"s1", "string2", "s3"}, func(item string, min string) (bool, error) {
+    if item == "string2" {
+        return false, fmt.Errorf("string2 is not allowed")
+    }
+    return len(item) < len(min), nil
+})
+// "s1", error("string2 is not allowed")
+```
+
+### MinIndexBy
+
+Search the minimum value of a collection using the given comparison function and the index of the minimum value.
+
+If several values of the collection are equal to the smallest value, returns the first such value.
+
+Returns (zero value, -1) when the collection is empty.
+
+```go
+min, index := lo.MinIndexBy([]string{"s1", "string2", "s3"}, func(item string, min string) bool {
+    return len(item) < len(min)
+})
+// "s1", 0
+
+min, index := lo.MinIndexBy([]string{}, func(item string, min string) bool {
+    return len(item) < len(min)
+})
+// "", -1
+```
+
+```go
+min, index, err := lo.MinIndexByErr([]string{"s1", "string2", "s3"}, func(item string, min string) (bool, error) {
+    if item == "s2" {
+        return false, fmt.Errorf("s2 is not allowed")
+    }
+    return len(item) < len(min), nil
+})
+// "s1", 0, error("s2 is not allowed")
+```
+
+### Earliest
+
+Search the minimum time.Time of a collection.
+
+Returns zero value when the collection is empty.
+
+```go
+earliest := lo.Earliest(time.Now(), time.Time{})
+// 0001-01-01 00:00:00 +0000 UTC
+```
+
+### EarliestBy
+
+Search the minimum time.Time of a collection using the given iteratee function.
+
+Returns zero value when the collection is empty.
+
+```go
+type foo struct {
+    bar time.Time
+}
+
+earliest := lo.EarliestBy([]foo{{time.Now()}, {}}, func(i foo) time.Time {
+    return i.bar
+})
+// {bar:{2023-04-01 01:02:03 +0000 UTC}}
+```
+
+```go
+// Use EarliestByErr when the iteratee function can return an error
+earliest, err := lo.EarliestByErr([]foo{{time.Now()}, {}}, func(i foo) (time.Time, error) {
+    if i.bar.IsZero() {
+        return time.Time{}, fmt.Errorf("zero time not allowed")
+    }
+    return i.bar, nil
+})
+// {bar:{...}}, error("zero time not allowed")
+```
+
 ### Max
 
 Search the maximum value of a collection.
 
+Returns zero value when the collection is empty.
+
 ```go
-max := lo.Max[int]([]int{1, 2, 3})
+max := lo.Max([]int{1, 2, 3})
 // 3
 
-max := lo.Max[int]([]int{})
+max := lo.Max([]int{})
 // 0
+
+max := lo.Max([]time.Duration{time.Second, time.Hour})
+// 1h
+```
+
+### MaxIndex
+
+Search the maximum value of a collection and the index of the maximum value.
+
+Returns (zero value, -1) when the collection is empty.
+
+```go
+max, index := lo.MaxIndex([]int{1, 2, 3})
+// 3, 2
+
+max, index := lo.MaxIndex([]int{})
+// 0, -1
+
+max, index := lo.MaxIndex([]time.Duration{time.Second, time.Hour})
+// 1h, 1
 ```
 
 ### MaxBy
 
 Search the maximum value of a collection using the given comparison function.
+
 If several values of the collection are equal to the greatest value, returns the first such value.
 
+Returns zero value when the collection is empty.
+
 ```go
-max := lo.MaxBy[string]([]string{"string1", "s2", "string3"}, func(item string, max string) bool {
+max := lo.MaxBy([]string{"string1", "s2", "string3"}, func(item string, max string) bool {
     return len(item) > len(max)
 })
 // "string1"
 
-max := lo.MaxBy[string]([]string{}, func(item string, max string) bool {
+max := lo.MaxBy([]string{}, func(item string, max string) bool {
     return len(item) > len(max)
 })
 // ""
 ```
 
+```go
+// Use MaxByErr when the comparison function can return an error
+max, err := lo.MaxByErr([]string{"string1", "s2", "string3"}, func(item string, max string) (bool, error) {
+    if item == "s2" {
+        return false, fmt.Errorf("s2 is not allowed")
+    }
+    return len(item) > len(max), nil
+})
+// "string1", error("s2 is not allowed")
+```
+
+[[play](https://go.dev/play/p/JW1qu-ECwF7)]
+
+### MaxIndexBy
+
+Search the maximum value of a collection using the given comparison function and the index of the maximum value.
+
+If several values of the collection are equal to the greatest value, returns the first such value.
+
+Returns (zero value, -1) when the collection is empty.
+
+```go
+max, index := lo.MaxIndexBy([]string{"string1", "s2", "string3"}, func(item string, max string) bool {
+    return len(item) > len(max)
+})
+// "string1", 0
+
+max, index := lo.MaxIndexBy([]string{}, func(item string, max string) bool {
+    return len(item) > len(max)
+})
+// "", -1
+```
+
+```go
+// Use MaxIndexByErr when the comparison function can return an error
+max, index, err := lo.MaxIndexByErr([]string{"string1", "s2", "string3"}, func(item string, max string) (bool, error) {
+    if item == "s2" {
+        return false, fmt.Errorf("s2 is not allowed")
+    }
+    return len(item) > len(max), nil
+})
+// "string1", 0, error("s2 is not allowed")
+```
+
+[[play](https://go.dev/play/p/uaUszc-c9QK)]
+
+### Latest
+
+Search the maximum time.Time of a collection.
+
+Returns zero value when the collection is empty.
+
+```go
+latest := lo.Latest(time.Now(), time.Time{})
+// 2023-04-01 01:02:03 +0000 UTC
+```
+
+### LatestBy
+
+Search the maximum time.Time of a collection using the given iteratee function.
+
+Returns zero value when the collection is empty.
+
+```go
+type foo struct {
+    bar time.Time
+}
+
+latest := lo.LatestBy([]foo{{time.Now()}, {}}, func(i foo) time.Time {
+    return i.bar
+})
+// {bar:{2023-04-01 01:02:03 +0000 UTC}}
+```
+
+```go
+// Use LatestByErr when the iteratee function can return an error
+result, err := lo.LatestByErr([]foo{{time.Now()}, {}}, func(i foo) (time.Time, error) {
+    if i.bar.IsZero() {
+        return time.Time{}, fmt.Errorf("zero time not allowed")
+    }
+    return i.bar, nil
+})
+// foo{}, error("zero time not allowed")
+```
+
+### First
+
+Returns the first element of a collection and check for availability of the first element.
+
+```go
+first, ok := lo.First([]int{1, 2, 3})
+// 1, true
+
+first, ok := lo.First([]int{})
+// 0, false
+```
+
+### FirstOrEmpty
+
+Returns the first element of a collection or zero value if empty.
+
+```go
+first := lo.FirstOrEmpty([]int{1, 2, 3})
+// 1
+
+first := lo.FirstOrEmpty([]int{})
+// 0
+```
+
+### FirstOr
+
+Returns the first element of a collection or the fallback value if empty.
+
+```go
+first := lo.FirstOr([]int{1, 2, 3}, 245)
+// 1
+
+first := lo.FirstOr([]int{}, 31)
+// 31
+```
+
 ### Last
 
 Returns the last element of a collection or error if empty.
 
 ```go
-last, err := lo.Last[int]([]int{1, 2, 3})
+last, ok := lo.Last([]int{1, 2, 3})
 // 3
+// true
+
+last, ok := lo.Last([]int{})
+// 0
+// false
+```
+
+### LastOrEmpty
+
+Returns the last element of a collection or zero value if empty.
+
+```go
+last := lo.LastOrEmpty([]int{1, 2, 3})
+// 3
+
+last := lo.LastOrEmpty([]int{})
+// 0
+```
+
+### LastOr
+
+Returns the last element of a collection or the fallback value if empty.
+
+```go
+last := lo.LastOr([]int{1, 2, 3}, 245)
+// 3
+
+last := lo.LastOr([]int{}, 31)
+// 31
 ```
 
 ### Nth
@@ -1762,22 +3765,73 @@ last, err := lo.Last[int]([]int{1, 2, 3})
 Returns the element at index `nth` of collection. If `nth` is negative, the nth element from the end is returned. An error is returned when nth is out of slice bounds.
 
 ```go
-nth, err := lo.Nth[int]([]int{0, 1, 2, 3}, 2)
+nth, err := lo.Nth([]int{0, 1, 2, 3}, 2)
 // 2
 
-nth, err := lo.Nth[int]([]int{0, 1, 2, 3}, -2)
+nth, err := lo.Nth([]int{0, 1, 2, 3}, -2)
 // 2
 ```
 
+### NthOr
+
+Returns the element at index `nth` of the collection. If `nth` is negative, it returns the `nth` element from the end. If `nth` is out of slice bounds, it returns the provided fallback value
+```go
+nth := lo.NthOr([]int{10, 20, 30, 40, 50}, 2, -1)
+// 30
+
+nth := lo.NthOr([]int{10, 20, 30, 40, 50}, -1, -1)
+// 50
+
+nth := lo.NthOr([]int{10, 20, 30, 40, 50}, 5, -1)
+// -1 (fallback value)
+```
+
+### NthOrEmpty
+
+Returns the element at index `nth` of the collection. If `nth` is negative, it returns the `nth` element from the end. If `nth` is out of slice bounds, it returns the zero value for the element type (e.g., 0 for integers, "" for strings, etc).
+``` go
+nth := lo.NthOrEmpty([]int{10, 20, 30, 40, 50}, 2)
+// 30
+
+nth := lo.NthOrEmpty([]int{10, 20, 30, 40, 50}, -1)
+// 50
+
+nth := lo.NthOrEmpty([]int{10, 20, 30, 40, 50}, 5)
+// 0 (zero value for int)
+
+nth := lo.NthOrEmpty([]string{"apple", "banana", "cherry"}, 2)
+// "cherry"
+
+nth := lo.NthOrEmpty([]string{"apple", "banana", "cherry"}, 5)
+// "" (zero value for string)
+```
+
 ### Sample
 
 Returns a random item from collection.
 
 ```go
-lo.Sample[string]([]string{"a", "b", "c"})
+lo.Sample([]string{"a", "b", "c"})
 // a random string from []string{"a", "b", "c"}
 
-lo.Sample[string]([]string{})
+lo.Sample([]string{})
+// ""
+```
+
+[[play](https://go.dev/play/p/FYA45LcpfM2)]
+
+### SampleBy
+
+Returns a random item from collection, using a given random integer generator.
+
+```go
+import "math/rand"
+
+r := rand.New(rand.NewSource(42))
+lo.SampleBy([]string{"a", "b", "c"}, r.Intn)
+// a random string from []string{"a", "b", "c"}, using a seeded random generator
+
+lo.SampleBy([]string{}, r.Intn)
 // ""
 ```
 
@@ -1786,42 +3840,54 @@ lo.Sample[string]([]string{})
 Returns N random unique items from collection.
 
 ```go
-lo.Samples[string]([]string{"a", "b", "c"}, 3)
+lo.Samples([]string{"a", "b", "c"}, 3)
 // []string{"a", "b", "c"} in random order
 ```
 
+### SamplesBy
+
+Returns N random unique items from collection, using a given random integer generator.
+
+```go
+r := rand.New(rand.NewSource(42))
+lo.SamplesBy([]string{"a", "b", "c"}, 3, r.Intn)
+// []string{"a", "b", "c"} in random order, using a seeded random generator
+```
+
 ### Ternary
 
-A 1 line if/else statement.
+A single line if/else statement.
 
 ```go
-result := lo.Ternary[string](true, "a", "b")
+result := lo.Ternary(true, "a", "b")
 // "a"
 
-result := lo.Ternary[string](false, "a", "b")
+result := lo.Ternary(false, "a", "b")
 // "b"
 ```
 
+Take care to avoid dereferencing potentially nil pointers in your A/B expressions, because they are both evaluated. See TernaryF to avoid this problem.
+
 [[play](https://go.dev/play/p/t-D7WBL44h2)]
 
 ### TernaryF
 
-A 1 line if/else statement whose options are functions.
+A single line if/else statement whose options are functions.
 
 ```go
-result := lo.TernaryF[string](true, func() string { return "a" }, func() string { return "b" })
+result := lo.TernaryF(true, func() string { return "a" }, func() string { return "b" })
 // "a"
 
-result := lo.TernaryF[string](false, func() string { return "a" }, func() string { return "b" })
+result := lo.TernaryF(false, func() string { return "a" }, func() string { return "b" })
 // "b"
 ```
 
-Useful to avoid nil-pointer dereferencing in intializations, or avoid running unnecessary code
+Useful to avoid nil-pointer dereferencing in initializations, or avoid running unnecessary code
 
 ```go
 var s *string
 
-someStr := TernaryF[string](s == nil, func() string { return uuid.New().String() }, func() string { return *s })
+someStr := TernaryF(s == nil, func() string { return uuid.New().String() }, func() string { return *s })
 // ef782193-c30c-4e2e-a7ae-f8ab5e125e02
 ```
 
@@ -1830,17 +3896,17 @@ someStr := TernaryF[string](s == nil, func() string { return uuid.New().String()
 ### If / ElseIf / Else
 
 ```go
-result := lo.If[int](true, 1).
+result := lo.If(true, 1).
     ElseIf(false, 2).
     Else(3)
 // 1
 
-result := lo.If[int](false, 1).
+result := lo.If(false, 1).
     ElseIf(true, 2).
     Else(3)
 // 2
 
-result := lo.If[int](false, 1).
+result := lo.If(false, 1).
     ElseIf(false, 2).
     Else(3)
 // 3
@@ -1849,7 +3915,7 @@ result := lo.If[int](false, 1).
 Using callbacks:
 
 ```go
-result := lo.IfF[int](true, func () int {
+result := lo.IfF(true, func () int {
         return 1
     }).
     ElseIfF(false, func () int {
@@ -1864,7 +3930,7 @@ result := lo.IfF[int](true, func () int {
 Mixed:
 
 ```go
-result := lo.IfF[int](true, func () int {
+result := lo.IfF(true, func () int {
         return 1
     }).
     Else(42)
@@ -1876,19 +3942,19 @@ result := lo.IfF[int](true, func () int {
 ### Switch / Case / Default
 
 ```go
-result := lo.Switch[int, string](1).
+result := lo.Switch(1).
     Case(1, "1").
     Case(2, "2").
     Default("3")
 // "1"
 
-result := lo.Switch[int, string](2).
+result := lo.Switch(2).
     Case(1, "1").
     Case(2, "2").
     Default("3")
 // "2"
 
-result := lo.Switch[int, string](42).
+result := lo.Switch(42).
     Case(1, "1").
     Case(2, "2").
     Default("3")
@@ -1898,7 +3964,7 @@ result := lo.Switch[int, string](42).
 Using callbacks:
 
 ```go
-result := lo.Switch[int, string](1).
+result := lo.Switch(1).
     CaseF(1, func() string {
         return "1"
     }).
@@ -1914,7 +3980,7 @@ result := lo.Switch[int, string](1).
 Mixed:
 
 ```go
-result := lo.Switch[int, string](1).
+result := lo.Switch(1).
     CaseF(1, func() string {
         return "1"
     }).
@@ -1924,12 +3990,90 @@ result := lo.Switch[int, string](1).
 
 [[play](https://go.dev/play/p/TGbKUMAeRUd)]
 
-### ToPtr
+### IsNil
 
-Returns a pointer copy of value.
+Checks if a value is nil or if it's a reference type with a nil underlying value.
 
 ```go
-ptr := lo.ToPtr[string]("hello world")
+var x int
+lo.IsNil(x)
+// false
+
+var k struct{}
+lo.IsNil(k)
+// false
+
+var i *int
+lo.IsNil(i)
+// true
+
+var ifaceWithNilValue any = (*string)(nil)
+lo.IsNil(ifaceWithNilValue)
+// true
+ifaceWithNilValue == nil
+// false
+```
+
+### IsNotNil
+
+Checks if a value is not nil or if it's not a reference type with a nil underlying value.
+
+```go
+var x int
+lo.IsNotNil(x)
+// true
+
+var k struct{}
+lo.IsNotNil(k)
+// true
+
+var i *int
+lo.IsNotNil(i)
+// false
+
+var ifaceWithNilValue any = (*string)(nil)
+lo.IsNotNil(ifaceWithNilValue)
+// false
+ifaceWithNilValue == nil
+// true
+```
+
+### ToPtr
+
+Returns a pointer copy of the value.
+
+```go
+ptr := lo.ToPtr("hello world")
+// *string{"hello world"}
+```
+
+[[play](https://go.dev/play/p/P2sD0PMXw4F)]
+
+### Nil
+
+Returns a nil pointer of type.
+
+```go
+ptr := lo.Nil[float64]()
+// nil
+```
+
+### EmptyableToPtr
+
+Returns a pointer copy of value if it's nonzero.
+Otherwise, returns nil pointer.
+
+```go
+ptr := lo.EmptyableToPtr(nil)
+// nil
+
+ptr := lo.EmptyableToPtr("")
+// nil
+
+ptr := lo.EmptyableToPtr([]int{})
+// *[]int{}
+
+ptr := lo.EmptyableToPtr("hello world")
 // *string{"hello world"}
 ```
 
@@ -1939,10 +4083,10 @@ Returns the pointer value or empty.
 
 ```go
 str := "hello world"
-value := lo.FromPtr[string](&str)
+value := lo.FromPtr(&str)
 // "hello world"
 
-value := lo.FromPtr[string](nil)
+value := lo.FromPtr(nil)
 // ""
 ```
 
@@ -1952,46 +4096,78 @@ Returns the pointer value or the fallback value.
 
 ```go
 str := "hello world"
-value := lo.FromPtrOr[string](&str, "empty")
+value := lo.FromPtrOr(&str, "empty")
 // "hello world"
 
-value := lo.FromPtrOr[string](nil, "empty")
+value := lo.FromPtrOr(nil, "empty")
 // "empty"
 ```
 
 ### ToSlicePtr
 
-Returns a slice of pointer copy of value.
+Returns a slice of pointers to each value.
 
 ```go
-ptr := lo.ToSlicePtr[string]([]string{"hello", "world"})
+ptr := lo.ToSlicePtr([]string{"hello", "world"})
 // []*string{"hello", "world"}
 ```
 
+### FromSlicePtr
+
+Returns a slice with the pointer values.
+Returns a zero value in case of a nil pointer element.
+
+```go
+str1 := "hello"
+str2 := "world"
+
+ptr := lo.FromSlicePtr[string]([]*string{&str1, &str2, nil})
+// []string{"hello", "world", ""}
+
+ptr := lo.Compact(
+    lo.FromSlicePtr[string]([]*string{&str1, &str2, nil}),
+)
+// []string{"hello", "world"}
+```
+
+### FromSlicePtrOr
+
+Returns a slice with the pointer values or the fallback value.
+
+```go
+str1 := "hello"
+str2 := "world"
+
+ptr := lo.FromSlicePtrOr([]*string{&str1, nil, &str2}, "fallback value")
+// []string{"hello", "fallback value", "world"}
+```
+
+[[play](https://go.dev/play/p/CuXGVzo9G65)]
+
 ### ToAnySlice
 
 Returns a slice with all elements mapped to `any` type.
 
 ```go
-elements := lo.ToAnySlice[int]([]int{1, 5, 1})
+elements := lo.ToAnySlice([]int{1, 5, 1})
 // []any{1, 5, 1}
 ```
 
 ### FromAnySlice
 
-Returns an `any` slice with all elements mapped to a type. Returns false in case of type conversion failure.
+Returns a slice with all elements mapped to a type. Returns false in case of type conversion failure.
 
 ```go
-elements, ok := lo.FromAnySlice[string]([]any{"foobar", 42})
+elements, ok := lo.FromAnySlice([]any{"foobar", 42})
 // []string{}, false
 
-elements, ok := lo.FromAnySlice[string]([]any{"foobar", "42"})
+elements, ok := lo.FromAnySlice([]any{"foobar", "42"})
 // []string{"foobar", "42"}, true
 ```
 
 ### Empty
 
-Returns an empty value.
+Returns the [zero value](https://go.dev/ref/spec#The_zero_value).
 
 ```go
 lo.Empty[int]()
@@ -2007,23 +4183,23 @@ lo.Empty[bool]()
 Returns true if argument is a zero value.
 
 ```go
-lo.IsEmpty[int](0)
+lo.IsEmpty(0)
 // true
-lo.IsEmpty[int](42)
+lo.IsEmpty(42)
 // false
 
-lo.IsEmpty[string]("")
+lo.IsEmpty("")
 // true
-lo.IsEmpty[bool]("foobar")
+lo.IsEmpty("foobar")
 // false
 
 type test struct {
     foobar string
 }
 
-lo.IsEmpty[test](test{foobar: ""})
+lo.IsEmpty(test{foobar: ""})
 // true
-lo.IsEmpty[test](test{foobar: "foobar"})
+lo.IsEmpty(test{foobar: "foobar"})
 // false
 ```
 
@@ -2032,23 +4208,23 @@ lo.IsEmpty[test](test{foobar: "foobar"})
 Returns true if argument is a zero value.
 
 ```go
-lo.IsNotEmpty[int](0)
+lo.IsNotEmpty(0)
 // false
-lo.IsNotEmpty[int](42)
+lo.IsNotEmpty(42)
 // true
 
-lo.IsNotEmpty[string]("")
+lo.IsNotEmpty("")
 // false
-lo.IsNotEmpty[bool]("foobar")
+lo.IsNotEmpty("foobar")
 // true
 
 type test struct {
     foobar string
 }
 
-lo.IsNotEmpty[test](test{foobar: ""})
+lo.IsNotEmpty(test{foobar: ""})
 // false
-lo.IsNotEmpty[test](test{foobar: "foobar"})
+lo.IsNotEmpty(test{foobar: "foobar"})
 // true
 ```
 
@@ -2065,10 +4241,87 @@ result, ok := lo.Coalesce("")
 
 var nilStr *string
 str := "foobar"
-result, ok := lo.Coalesce[*string](nil, nilStr, &str)
+result, ok := lo.Coalesce(nil, nilStr, &str)
 // &"foobar" true
 ```
 
+### CoalesceOrEmpty
+
+Returns the first non-empty arguments. Arguments must be comparable.
+
+```go
+result := lo.CoalesceOrEmpty(0, 1, 2, 3)
+// 1
+
+result := lo.CoalesceOrEmpty("")
+// ""
+
+var nilStr *string
+str := "foobar"
+result := lo.CoalesceOrEmpty(nil, nilStr, &str)
+// &"foobar"
+```
+
+### CoalesceSlice
+
+Returns the first non-zero slice.
+
+```go
+result, ok := lo.CoalesceSlice([]int{1, 2, 3}, []int{4, 5, 6})
+// [1, 2, 3]
+// true
+
+result, ok := lo.CoalesceSlice(nil, []int{})
+// []
+// true
+
+result, ok := lo.CoalesceSlice([]int(nil))
+// []
+// false
+```
+
+### CoalesceSliceOrEmpty
+
+Returns the first non-zero slice.
+
+```go
+result := lo.CoalesceSliceOrEmpty([]int{1, 2, 3}, []int{4, 5, 6})
+// [1, 2, 3]
+
+result := lo.CoalesceSliceOrEmpty(nil, []int{})
+// []
+```
+
+### CoalesceMap
+
+Returns the first non-zero map.
+
+```go
+result, ok := lo.CoalesceMap(map[string]int{"1": 1, "2": 2, "3": 3}, map[string]int{"4": 4, "5": 5, "6": 6})
+// {"1": 1, "2": 2, "3": 3}
+// true
+
+result, ok := lo.CoalesceMap(nil, map[string]int{})
+// {}
+// true
+
+result, ok := lo.CoalesceMap(map[string]int(nil))
+// {}
+// false
+```
+
+### CoalesceMapOrEmpty
+
+Returns the first non-zero map.
+
+```go
+result := lo.CoalesceMapOrEmpty(map[string]int{"1": 1, "2": 2, "3": 3}, map[string]int{"4": 4, "5": 5, "6": 6})
+// {"1": 1, "2": 2, "3": 3}
+
+result := lo.CoalesceMapOrEmpty(nil, map[string]int{})
+// {}
+```
+
 ### Partial
 
 Returns new function that, when called, has its first argument set to the provided value.
@@ -2084,9 +4337,30 @@ f(42)
 // 47
 ```
 
+[[play](https://go.dev/play/p/Sy1gAQiQZ3v)]
+
+### Partial2 -> Partial5
+
+Returns new function that, when called, has its first argument set to the provided value.
+
+```go
+add := func(x, y, z int) int { return x + y + z }
+f := lo.Partial2(add, 42)
+
+f(10, 5)
+// 57
+
+f(42, -4)
+// 80
+```
+
+[[play](https://go.dev/play/p/-xiPjy4JChJ)]
+
 ### Attempt
 
-Invokes a function N times until it returns valid output. Returning either the caught error or nil. When first argument is less than `1`, the function runs until a successful response is returned.
+Invokes a function N times until it returns valid output. Returns either the caught error or nil.
+
+When the first argument is less than `1`, the function runs until a successful response is returned.
 
 ```go
 iter, err := lo.Attempt(42, func(i int) error {
@@ -2094,7 +4368,7 @@ iter, err := lo.Attempt(42, func(i int) error {
         return nil
     }
 
-    return fmt.Errorf("failed")
+    return errors.New("failed")
 })
 // 6
 // nil
@@ -2104,14 +4378,14 @@ iter, err := lo.Attempt(2, func(i int) error {
         return nil
     }
 
-    return fmt.Errorf("failed")
+    return errors.New("failed")
 })
 // 2
 // error "failed"
 
 iter, err := lo.Attempt(0, func(i int) error {
     if i < 42 {
-        return fmt.Errorf("failed")
+        return errors.New("failed")
     }
 
     return nil
@@ -2120,15 +4394,15 @@ iter, err := lo.Attempt(0, func(i int) error {
 // nil
 ```
 
-For more advanced retry strategies (delay, exponential backoff...), please take a look on [cenkalti/backoff](https://github.com/cenkalti/backoff).
+For more advanced retry strategies (delay, exponential backoff...), please take a look at [cenkalti/backoff](https://github.com/cenkalti/backoff).
 
 [[play](https://go.dev/play/p/3ggJZ2ZKcMj)]
 
 ### AttemptWithDelay
 
-Invokes a function N times until it returns valid output, with a pause between each call. Returning either the caught error or nil.
+Invokes a function N times until it returns valid output, with a pause between each call. Returns either the caught error or nil.
 
-When first argument is less than `1`, the function runs until a successful response is returned.
+When the first argument is less than `1`, the function runs until a successful response is returned.
 
 ```go
 iter, duration, err := lo.AttemptWithDelay(5, 2*time.Second, func(i int, duration time.Duration) error {
@@ -2136,17 +4410,67 @@ iter, duration, err := lo.AttemptWithDelay(5, 2*time.Second, func(i int, duratio
         return nil
     }
 
-    return fmt.Errorf("failed")
+    return errors.New("failed")
 })
 // 3
 // ~ 4 seconds
 // nil
 ```
 
-For more advanced retry strategies (delay, exponential backoff...), please take a look on [cenkalti/backoff](https://github.com/cenkalti/backoff).
+For more advanced retry strategies (delay, exponential backoff...), please take a look at [cenkalti/backoff](https://github.com/cenkalti/backoff).
 
 [[play](https://go.dev/play/p/tVs6CygC7m1)]
 
+### AttemptWhile
+
+Invokes a function N times until it returns valid output. Returns either the caught error or nil, along with a bool value to determine whether the function should be invoked again. It will terminate the invoke immediately if the second return value is false.
+
+When the first argument is less than `1`, the function runs until a successful response is returned.
+
+```go
+count1, err1 := lo.AttemptWhile(5, func(i int) (error, bool) {
+    err := doMockedHTTPRequest(i)
+    if err != nil {
+        if errors.Is(err, ErrBadRequest) { // let's assume ErrBadRequest is a critical error that needs to terminate the invoke
+            return err, false // flag the second return value as false to terminate the invoke
+        }
+
+        return err, true
+    }
+
+    return nil, false
+})
+```
+
+For more advanced retry strategies (delay, exponential backoff...), please take a look at [cenkalti/backoff](https://github.com/cenkalti/backoff).
+
+[[play](https://go.dev/play/p/1VS7HxlYMOG)]
+
+### AttemptWhileWithDelay
+
+Invokes a function N times until it returns valid output, with a pause between each call. Returns either the caught error or nil, along with a bool value to determine whether the function should be invoked again. It will terminate the invoke immediately if the second return value is false.
+
+When the first argument is less than `1`, the function runs until a successful response is returned.
+
+```go
+count1, time1, err1 := lo.AttemptWhileWithDelay(5, time.Millisecond, func(i int, d time.Duration) (error, bool) {
+    err := doMockedHTTPRequest(i)
+    if err != nil {
+        if errors.Is(err, ErrBadRequest) { // let's assume ErrBadRequest is a critical error that needs to terminate the invoke
+            return err, false // flag the second return value as false to terminate the invoke
+        }
+
+        return err, true
+    }
+
+    return nil, false
+})
+```
+
+For more advanced retry strategies (delay, exponential backoff...), please take a look at [cenkalti/backoff](https://github.com/cenkalti/backoff).
+
+[[play](https://go.dev/play/p/mhufUjJfLEF)]
+
 ### Debounce
 
 `NewDebounce` creates a debounced instance that delays invoking functions given until after wait milliseconds have elapsed, until `cancel` is called.
@@ -2167,6 +4491,86 @@ cancel()
 
 [[play](https://go.dev/play/p/mz32VMK2nqe)]
 
+### DebounceBy
+
+`NewDebounceBy` creates a debounced instance for each distinct key, that delays invoking functions given until after wait milliseconds have elapsed, until `cancel` is called.
+
+```go
+f := func(key string, count int) {
+    println(key + ": Called once after 100ms when debounce stopped invoking!")
+}
+
+debounce, cancel := lo.NewDebounceBy(100 * time.Millisecond, f)
+for j := 0; j < 10; j++ {
+    debounce("first key")
+    debounce("second key")
+}
+
+time.Sleep(1 * time.Second)
+cancel("first key")
+cancel("second key")
+```
+
+[[play](https://go.dev/play/p/d3Vpt6pxhY8)]
+
+### Throttle
+
+Creates a throttled instance that invokes given functions only once in every interval.
+
+This returns 2 functions, First one is throttled function and Second one is a function to reset interval.
+
+```go
+f := func() {
+	println("Called once in every 100ms")
+}
+
+throttle, reset := lo.NewThrottle(100 * time.Millisecond, f)
+
+for j := 0; j < 10; j++ {
+	throttle()
+	time.Sleep(30 * time.Millisecond)
+}
+
+reset()
+throttle()
+```
+
+`NewThrottleWithCount` is NewThrottle with count limit, throttled function will be invoked count times in every interval.
+
+```go
+f := func() {
+	println("Called three times in every 100ms")
+}
+
+throttle, reset := lo.NewThrottleWithCount(100 * time.Millisecond, f)
+
+for j := 0; j < 10; j++ {
+	throttle()
+	time.Sleep(30 * time.Millisecond)
+}
+
+reset()
+throttle()
+```
+
+`NewThrottleBy` and `NewThrottleByWithCount` are NewThrottle with sharding key, throttled function will be invoked count times in every interval.
+
+```go
+f := func(key string) {
+	println(key, "Called three times in every 100ms")
+}
+
+throttle, reset := lo.NewThrottleByWithCount(100 * time.Millisecond, f)
+
+for j := 0; j < 10; j++ {
+	throttle("foo")
+	time.Sleep(30 * time.Millisecond)
+}
+
+reset()
+throttle()
+```
+
 ### Synchronize
 
 Wraps the underlying callback in a mutex. It receives an optional mutex.
@@ -2206,8 +4610,8 @@ ch := lo.Async(func() error { time.Sleep(10 * time.Second); return nil })
 ### Async{0->6}
 
 Executes a function in a goroutine and returns the result in a channel.
-For function with multiple return values, the results will be returned as a tuple inside the channel.
-For function without return, struct{} will be returned in the channel.
+For functions with multiple return values, the results will be returned as a tuple inside the channel.
+For functions without return, struct{} will be returned in the channel.
 
 ```go
 ch := lo.Async0(func() { time.Sleep(10 * time.Second) })
@@ -2226,6 +4630,136 @@ ch := lo.Async2(func() (int, string) {
 // chan lo.Tuple2[int, string] ({42, "Hello"})
 ```
 
+### Transaction
+
+Implements a Saga pattern.
+
+```go
+transaction := NewTransaction().
+    Then(
+        func(state int) (int, error) {
+            fmt.Println("step 1")
+            return state + 10, nil
+        },
+        func(state int) int {
+            fmt.Println("rollback 1")
+            return state - 10
+        },
+    ).
+    Then(
+        func(state int) (int, error) {
+            fmt.Println("step 2")
+            return state + 15, nil
+        },
+        func(state int) int {
+            fmt.Println("rollback 2")
+            return state - 15
+        },
+    ).
+    Then(
+        func(state int) (int, error) {
+            fmt.Println("step 3")
+
+            if true {
+                return state, errors.New("error")
+            }
+
+            return state + 42, nil
+        },
+        func(state int) int {
+            fmt.Println("rollback 3")
+            return state - 42
+        },
+    )
+
+_, _ = transaction.Process(-5)
+
+// Output:
+// step 1
+// step 2
+// step 3
+// rollback 2
+// rollback 1
+```
+
+### WaitFor
+
+Runs periodically until a condition is validated.
+
+```go
+alwaysTrue := func(i int) bool { return true }
+alwaysFalse := func(i int) bool { return false }
+laterTrue := func(i int) bool {
+    return i > 5
+}
+
+iterations, duration, ok := lo.WaitFor(alwaysTrue, 10*time.Millisecond, 2 * time.Millisecond)
+// 1
+// 1ms
+// true
+
+iterations, duration, ok := lo.WaitFor(alwaysFalse, 10*time.Millisecond, time.Millisecond)
+// 10
+// 10ms
+// false
+
+iterations, duration, ok := lo.WaitFor(laterTrue, 10*time.Millisecond, time.Millisecond)
+// 7
+// 7ms
+// true
+
+iterations, duration, ok := lo.WaitFor(laterTrue, 10*time.Millisecond, 5*time.Millisecond)
+// 2
+// 10ms
+// false
+```
+
+[[play](https://go.dev/play/p/t_wTDmubbK3)]
+
+### WaitForWithContext
+
+Runs periodically until a condition is validated or context is invalid.
+
+The condition receives also the context, so it can invalidate the process in the condition checker
+
+```go
+ctx := context.Background()
+
+alwaysTrue := func(_ context.Context, i int) bool { return true }
+alwaysFalse := func(_ context.Context, i int) bool { return false }
+laterTrue := func(_ context.Context, i int) bool {
+    return i >= 5
+}
+
+iterations, duration, ok := lo.WaitForWithContext(ctx, alwaysTrue, 10*time.Millisecond, 2 * time.Millisecond)
+// 1
+// 1ms
+// true
+
+iterations, duration, ok := lo.WaitForWithContext(ctx, alwaysFalse, 10*time.Millisecond, time.Millisecond)
+// 10
+// 10ms
+// false
+
+iterations, duration, ok := lo.WaitForWithContext(ctx, laterTrue, 10*time.Millisecond, time.Millisecond)
+// 5
+// 5ms
+// true
+
+iterations, duration, ok := lo.WaitForWithContext(ctx, laterTrue, 10*time.Millisecond, 5*time.Millisecond)
+// 2
+// 10ms
+// false
+
+expiringCtx, cancel := context.WithTimeout(ctx, 5*time.Millisecond)
+iterations, duration, ok := lo.WaitForWithContext(expiringCtx, alwaysFalse, 100*time.Millisecond, time.Millisecond)
+// 5
+// 5.1ms
+// false
+```
+
+[[play](https://go.dev/play/p/t_wTDmubbK3)]
+
 ### Validate
 
 Helper function that creates an error when a condition is not met.
@@ -2244,7 +4778,7 @@ val := lo.Validate(len(slice) == 0, "Slice should be empty but contains %v", sli
 
 ### Must
 
-Wraps a function call to panics if second argument is `error` or `false`, returns the value otherwise.
+Wraps a function call and panics if second argument is `error` or `false`, returns the value otherwise.
 
 ```go
 val := lo.Must(time.Parse("2006-01-02", "2022-01-15"))
@@ -2258,7 +4792,7 @@ val := lo.Must(time.Parse("2006-01-02", "bad-value"))
 
 ### Must{0->6}
 
-Must\* has the same behavior than Must, but returns multiple values.
+Must\* has the same behavior as Must but returns multiple values.
 
 ```go
 func example0() (error)
@@ -2298,7 +4832,7 @@ lo.Must0(ok, "'%s' must always contain '%s'", myString, requiredChar)
 
 list := []int{0, 1, 2}
 item := 5
-lo.Must0(lo.Contains[int](list, item), "'%s' must always contain '%s'", list, item)
+lo.Must0(lo.Contains(list, item), "'%s' must always contain '%s'", list, item)
 ...
 ```
 
@@ -2306,7 +4840,7 @@ lo.Must0(lo.Contains[int](list, item), "'%s' must always contain '%s'", list, it
 
 ### Try
 
-Calls the function and return false in case of error and on panic.
+Calls the function and returns false in case of error and panic.
 
 ```go
 ok := lo.Try(func() error {
@@ -2321,7 +4855,7 @@ ok := lo.Try(func() error {
 // true
 
 ok := lo.Try(func() error {
-    return fmt.Errorf("error")
+    return errors.New("error")
 })
 // false
 ```
@@ -2330,7 +4864,7 @@ ok := lo.Try(func() error {
 
 ### Try{0->6}
 
-The same behavior than `Try`, but callback returns 2 variables.
+The same behavior as `Try`, but the callback returns 2 variables.
 
 ```go
 ok := lo.Try2(func() (string, error) {
@@ -2354,14 +4888,14 @@ str, ok := lo.TryOr(func() (string, error) {
 // world
 // false
 
-ok := lo.TryOr(func() error {
+str, ok := lo.TryOr(func() error {
     return "hello", nil
 }, "world")
 // hello
 // true
 
-ok := lo.TryOr(func() error {
-    return "hello", fmt.Errorf("error")
+str, ok := lo.TryOr(func() error {
+    return "hello", errors.New("error")
 }, "world")
 // world
 // false
@@ -2371,7 +4905,7 @@ ok := lo.TryOr(func() error {
 
 ### TryOr{0->6}
 
-The same behavior than `TryOr`, but callback returns 2 variables.
+The same behavior as `TryOr`, but the callback returns `X` variables.
 
 ```go
 str, nbr, ok := lo.TryOr2(func() (string, int, error) {
@@ -2387,7 +4921,7 @@ str, nbr, ok := lo.TryOr2(func() (string, int, error) {
 
 ### TryWithErrorValue
 
-The same behavior than `Try`, but also returns value passed to panic.
+The same behavior as `Try`, but also returns the value passed to panic.
 
 ```go
 err, ok := lo.TryWithErrorValue(func() error {
@@ -2401,7 +4935,7 @@ err, ok := lo.TryWithErrorValue(func() error {
 
 ### TryCatch
 
-The same behavior than `Try`, but calls the catch function in case of error.
+The same behavior as `Try`, but calls the catch function in case of error.
 
 ```go
 caught := false
@@ -2420,7 +4954,7 @@ ok := lo.TryCatch(func() error {
 
 ### TryCatchWithErrorValue
 
-The same behavior than `TryWithErrorValue`, but calls the catch function in case of error.
+The same behavior as `TryWithErrorValue`, but calls the catch function in case of error.
 
 ```go
 caught := false
@@ -2450,7 +4984,7 @@ if ok := errors.As(err, &rateLimitErr); ok {
 }
 ```
 
-1 line `lo` helper:
+single line `lo` helper:
 
 ```go
 err := doSomething()
@@ -2462,11 +4996,45 @@ if rateLimitErr, ok := lo.ErrorsAs[*RateLimitError](err); ok {
 
 [[play](https://go.dev/play/p/8wk5rH8UfrE)]
 
+### Assert
+
+Does nothing when the condition is `true`, otherwise it panics with an optional message.
+
+Think twice before using it, given that [Go intentionally omits assertions from its standard library](https://go.dev/doc/faq#assertions).
+
+```go
+age := getUserAge()
+
+lo.Assert(age >= 15)
+```
+
+```go
+age := getUserAge()
+
+lo.Assert(age >= 15, "user age must be >= 15")
+```
+
+[[play](https://go.dev/play/p/Xv8LLKBMNwI)]
+
+### Assertf
+
+Like `Assert`, but with `fmt.Printf`-like formatting.
+
+Think twice before using it, given that [Go intentionally omits assertions from its standard library](https://go.dev/doc/faq#assertions).
+
+```go
+age := getUserAge()
+
+lo.Assertf(age >= 15, "user age must be >= 15, got %d", age)
+```
+
+[[play](https://go.dev/play/p/TVPEmVcyrdY)]
+
 ## 🛩 Benchmark
 
-We executed a simple benchmark with the a dead-simple `lo.Map` loop:
+We executed a simple benchmark with a dead-simple `lo.Map` loop:
 
-See the full implementation [here](./benchmark_test.go).
+See the full implementation [here](./map_benchmark_test.go).
 
 ```go
 _ = lo.Map[int64](arr, func(x int64, i int) string {
@@ -2478,7 +5046,7 @@ _ = lo.Map[int64](arr, func(x int64, i int) string {
 
 Here is a comparison between `lo.Map`, `lop.Map`, `go-funk` library and a simple Go `for` loop.
 
-```
+```shell
 $ go test -benchmem -bench ./...
 goos: linux
 goarch: amd64
@@ -2494,26 +5062,20 @@ ok  	github.com/samber/lo	6.657s
 ```
 
 - `lo.Map` is way faster (x7) than `go-funk`, a reflection-based Map implementation.
-- `lo.Map` have the same allocation profile than `for`.
+- `lo.Map` has the same allocation profile as `for`.
 - `lo.Map` is 4% slower than `for`.
-- `lop.Map` is slower than `lo.Map` because it implies more memory allocation and locks. `lop.Map` will be useful for long-running callbacks, such as i/o bound processing.
+- `lop.Map` is slower than `lo.Map` because it implies more memory allocation and locks. `lop.Map` is useful for long-running callbacks, such as i/o bound processing.
 - `for` beats other implementations for memory and CPU.
 
 ## 🤝 Contributing
 
-- Ping me on twitter [@samuelberthe](https://twitter.com/samuelberthe) (DMs, mentions, whatever :))
+- Ping me on Twitter [@samuelberthe](https://twitter.com/samuelberthe) (DMs, mentions, whatever :))
 - Fork the [project](https://github.com/samber/lo)
 - Fix [open issues](https://github.com/samber/lo/issues) or request new features
 
 Don't hesitate ;)
 
-### With Docker
-
-```bash
-docker-compose run --rm dev
-```
-
-### Without Docker
+Helper naming: helpers must be self-explanatory and respect standards (other languages, libraries...). Feel free to suggest many names in your contributions.
 
 ```bash
 # Install some dev dependencies
@@ -2525,18 +5087,18 @@ make test
 make watch-test
 ```
 
-## 👤 Authors
+## 👤 Contributors
 
-- Samuel Berthe
+![Contributors](https://contrib.rocks/image?repo=samber/lo)
 
 ## 💫 Show your support
 
 Give a ⭐️ if this project helped you!
 
-[![support us](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/samber)
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/samber?style=for-the-badge)](https://github.com/sponsors/samber)
 
 ## 📝 License
 
 Copyright © 2022 [Samuel Berthe](https://github.com/samber).
 
-This project is [MIT](./LICENSE) licensed.
+This project is under [MIT](./LICENSE) license.
diff --git a/vendor/github.com/samber/lo/channel.go b/vendor/github.com/samber/lo/channel.go
index ccbd36028..5c7dd9ebd 100644
--- a/vendor/github.com/samber/lo/channel.go
+++ b/vendor/github.com/samber/lo/channel.go
@@ -1,16 +1,21 @@
 package lo
 
 import (
-	"math/rand"
+	"context"
+	"sync"
 	"time"
+
+	"github.com/samber/lo/internal/xrand"
 )
 
+// DispatchingStrategy is a function that distributes messages to channels.
 type DispatchingStrategy[T any] func(msg T, index uint64, channels []<-chan T) int
 
 // ChannelDispatcher distributes messages from input channels into N child channels.
 // Close events are propagated to children.
 // Underlying channels can have a fixed buffer capacity or be unbuffered when cap is 0.
-func ChannelDispatcher[T any](stream <-chan T, count int, channelBufferCap int, strategy DispatchingStrategy[T]) []<-chan T {
+// Play: https://go.dev/play/p/UZGu2wVg3J2
+func ChannelDispatcher[T any](stream <-chan T, count, channelBufferCap int, strategy DispatchingStrategy[T]) []<-chan T {
 	children := createChannels[T](count, channelBufferCap)
 
 	roChildren := channelsToReadOnly(children)
@@ -19,14 +24,9 @@ func ChannelDispatcher[T any](stream <-chan T, count int, channelBufferCap int,
 		// propagate channel closing to children
 		defer closeChannels(children)
 
-		var i uint64 = 0
-
-		for {
-			msg, ok := <-stream
-			if !ok {
-				return
-			}
+		var i uint64
 
+		for msg := range stream {
 			destination := strategy(msg, i, roChildren) % count
 			children[destination] <- msg
 
@@ -37,7 +37,7 @@ func ChannelDispatcher[T any](stream <-chan T, count int, channelBufferCap int,
 	return roChildren
 }
 
-func createChannels[T any](count int, channelBufferCap int) []chan T {
+func createChannels[T any](count, channelBufferCap int) []chan T {
 	children := make([]chan T, 0, count)
 
 	for i := 0; i < count; i++ {
@@ -69,6 +69,7 @@ func channelIsNotFull[T any](ch <-chan T) bool {
 
 // DispatchingStrategyRoundRobin distributes messages in a rotating sequential manner.
 // If the channel capacity is exceeded, the next channel will be selected and so on.
+// Play: https://go.dev/play/p/UZGu2wVg3J2
 func DispatchingStrategyRoundRobin[T any](msg T, index uint64, channels []<-chan T) int {
 	for {
 		i := int(index % uint64(len(channels)))
@@ -83,9 +84,10 @@ func DispatchingStrategyRoundRobin[T any](msg T, index uint64, channels []<-chan
 
 // DispatchingStrategyRandom distributes messages in a random manner.
 // If the channel capacity is exceeded, another random channel will be selected and so on.
+// Play: https://go.dev/play/p/GEyGn3TdGk4
 func DispatchingStrategyRandom[T any](msg T, index uint64, channels []<-chan T) int {
 	for {
-		i := rand.Intn(len(channels))
+		i := xrand.IntN(len(channels))
 		if channelIsNotFull(channels[i]) {
 			return i
 		}
@@ -94,20 +96,21 @@ func DispatchingStrategyRandom[T any](msg T, index uint64, channels []<-chan T)
 	}
 }
 
-// DispatchingStrategyRandom distributes messages in a weighted manner.
+// DispatchingStrategyWeightedRandom distributes messages in a weighted manner.
 // If the channel capacity is exceeded, another random channel will be selected and so on.
+// Play: https://go.dev/play/p/v0eMh8NZG2L
 func DispatchingStrategyWeightedRandom[T any](weights []int) DispatchingStrategy[T] {
 	seq := []int{}
 
-	for i := 0; i < len(weights); i++ {
-		for j := 0; j < weights[i]; j++ {
+	for i, weight := range weights {
+		for j := 0; j < weight; j++ {
 			seq = append(seq, i)
 		}
 	}
 
 	return func(msg T, index uint64, channels []<-chan T) int {
 		for {
-			i := seq[rand.Intn(len(seq))]
+			i := seq[xrand.IntN(len(seq))]
 			if channelIsNotFull(channels[i]) {
 				return i
 			}
@@ -119,6 +122,7 @@ func DispatchingStrategyWeightedRandom[T any](weights []int) DispatchingStrategy
 
 // DispatchingStrategyFirst distributes messages in the first non-full channel.
 // If the capacity of the first channel is exceeded, the second channel will be selected and so on.
+// Play: https://go.dev/play/p/OrJCvOmk42f
 func DispatchingStrategyFirst[T any](msg T, index uint64, channels []<-chan T) int {
 	for {
 		for i := range channels {
@@ -132,31 +136,34 @@ func DispatchingStrategyFirst[T any](msg T, index uint64, channels []<-chan T) i
 }
 
 // DispatchingStrategyLeast distributes messages in the emptiest channel.
+// Play: https://go.dev/play/p/ypy0jrRcEe7
 func DispatchingStrategyLeast[T any](msg T, index uint64, channels []<-chan T) int {
-	seq := Range(len(channels))
-
-	return MinBy(seq, func(item int, min int) bool {
-		return len(channels[item]) < len(channels[min])
+	_, i := MinIndexBy(channels, func(a, b <-chan T) bool {
+		return len(a) < len(b)
 	})
+
+	return i
 }
 
-// DispatchingStrategyMost distributes messages in the fulliest channel.
+// DispatchingStrategyMost distributes messages in the fullest channel.
 // If the channel capacity is exceeded, the next channel will be selected and so on.
+// Play: https://go.dev/play/p/erHHone7rF9
 func DispatchingStrategyMost[T any](msg T, index uint64, channels []<-chan T) int {
-	seq := Range(len(channels))
-
-	return MaxBy(seq, func(item int, max int) bool {
-		return len(channels[item]) > len(channels[max]) && channelIsNotFull(channels[item])
+	_, i := MaxIndexBy(channels, func(a, b <-chan T) bool {
+		return len(a) > len(b) && channelIsNotFull(a)
 	})
+
+	return i
 }
 
-// SliceToChannel returns a read-only channels of collection elements.
+// SliceToChannel returns a read-only channel of collection elements.
+// Play: https://go.dev/play/p/lIbSY3QmiEg
 func SliceToChannel[T any](bufferSize int, collection []T) <-chan T {
 	ch := make(chan T, bufferSize)
 
 	go func() {
-		for _, item := range collection {
-			ch <- item
+		for i := range collection {
+			ch <- collection[i]
 		}
 
 		close(ch)
@@ -165,7 +172,22 @@ func SliceToChannel[T any](bufferSize int, collection []T) <-chan T {
 	return ch
 }
 
+// ChannelToSlice returns a slice built from channel items. Blocks until channel closes.
+// Play: https://go.dev/play/p/lIbSY3QmiEg
+func ChannelToSlice[T any](ch <-chan T) []T {
+	collection := []T{}
+
+	for item := range ch {
+		collection = append(collection, item)
+	}
+
+	return collection
+}
+
 // Generator implements the generator design pattern.
+// Play: https://go.dev/play/p/lIbSY3QmiEg
+//
+// Deprecated: use "iter" package instead (Go >= 1.23).
 func Generator[T any](bufferSize int, generator func(yield func(T))) <-chan T {
 	ch := make(chan T, bufferSize)
 
@@ -181,14 +203,14 @@ func Generator[T any](bufferSize int, generator func(yield func(T))) <-chan T {
 	return ch
 }
 
-// Batch creates a slice of n elements from a channel. Returns the slice and the slice length.
-// @TODO: we should probaby provide an helper that reuse the same buffer.
-func Batch[T any](ch <-chan T, size int) (collection []T, length int, readTime time.Duration, ok bool) {
+// Buffer creates a slice of n elements from a channel. Returns the slice and the slice length.
+// @TODO: we should probably provide a helper that reuses the same buffer.
+// Play: https://go.dev/play/p/gPQ-6xmcKQI
+func Buffer[T any](ch <-chan T, size int) (collection []T, length int, readTime time.Duration, ok bool) {
 	buffer := make([]T, 0, size)
-	index := 0
 	now := time.Now()
 
-	for ; index < size; index++ {
+	for index := 0; index < size; index++ {
 		item, ok := <-ch
 		if !ok {
 			return buffer, index, time.Since(now), false
@@ -197,20 +219,17 @@ func Batch[T any](ch <-chan T, size int) (collection []T, length int, readTime t
 		buffer = append(buffer, item)
 	}
 
-	return buffer, index, time.Since(now), true
+	return buffer, size, time.Since(now), true
 }
 
-// BatchWithTimeout creates a slice of n elements from a channel, with timeout. Returns the slice and the slice length.
-// @TODO: we should probaby provide an helper that reuse the same buffer.
-func BatchWithTimeout[T any](ch <-chan T, size int, timeout time.Duration) (collection []T, length int, readTime time.Duration, ok bool) {
-	expire := time.NewTimer(timeout)
-	defer expire.Stop()
-
+// BufferWithContext creates a slice of n elements from a channel, with context. Returns the slice and the slice length.
+// @TODO: we should probably provide a helper that reuses the same buffer.
+// Play: https://go.dev/play/p/oRfOyJWK9YF
+func BufferWithContext[T any](ctx context.Context, ch <-chan T, size int) (collection []T, length int, readTime time.Duration, ok bool) {
 	buffer := make([]T, 0, size)
-	index := 0
 	now := time.Now()
 
-	for ; index < size; index++ {
+	for index := 0; index < size; index++ {
 		select {
 		case item, ok := <-ch:
 			if !ok {
@@ -219,10 +238,67 @@ func BatchWithTimeout[T any](ch <-chan T, size int, timeout time.Duration) (coll
 
 			buffer = append(buffer, item)
 
-		case <-expire.C:
+		case <-ctx.Done():
 			return buffer, index, time.Since(now), true
 		}
 	}
 
-	return buffer, index, time.Since(now), true
+	return buffer, size, time.Since(now), true
+}
+
+// BufferWithTimeout creates a slice of n elements from a channel, with timeout. Returns the slice and the slice length.
+// Play: https://go.dev/play/p/sxyEM3koo4n
+func BufferWithTimeout[T any](ch <-chan T, size int, timeout time.Duration) (collection []T, length int, readTime time.Duration, ok bool) {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+	return BufferWithContext(ctx, ch, size)
+}
+
+// FanIn collects messages from multiple input channels into a single buffered channel.
+// Output messages have no priority. When all upstream channels reach EOF, downstream channel closes.
+// Play: https://go.dev/play/p/FH8Wq-T04Jb
+func FanIn[T any](channelBufferCap int, upstreams ...<-chan T) <-chan T {
+	out := make(chan T, channelBufferCap)
+	var wg sync.WaitGroup
+
+	// Start an output goroutine for each input channel in upstreams.
+	wg.Add(len(upstreams))
+	for i := range upstreams {
+		go func(index int) {
+			for n := range upstreams[index] {
+				out <- n
+			}
+			wg.Done()
+		}(i)
+	}
+
+	// Start a goroutine to close out once all the output goroutines are done.
+	go func() {
+		wg.Wait()
+		close(out)
+	}()
+	return out
+}
+
+// FanOut broadcasts all the upstream messages to multiple downstream channels.
+// When upstream channel reaches EOF, downstream channels close. If any downstream
+// channels is full, broadcasting is paused.
+// Play: https://go.dev/play/p/2LHxcjKX23L
+func FanOut[T any](count, channelsBufferCap int, upstream <-chan T) []<-chan T {
+	downstreams := createChannels[T](count, channelsBufferCap)
+
+	go func() {
+		for msg := range upstream {
+			for i := range downstreams {
+				downstreams[i] <- msg
+			}
+		}
+
+		// Close out once all the output goroutines are done.
+		for i := range downstreams {
+			close(downstreams[i])
+		}
+	}()
+
+	return channelsToReadOnly(downstreams)
 }
diff --git a/vendor/github.com/samber/lo/concurrency.go b/vendor/github.com/samber/lo/concurrency.go
index 2d6fd871a..70871b286 100644
--- a/vendor/github.com/samber/lo/concurrency.go
+++ b/vendor/github.com/samber/lo/concurrency.go
@@ -1,21 +1,26 @@
 package lo
 
-import "sync"
+import (
+	"context"
+	"sync"
+	"time"
+)
 
 type synchronize struct {
 	locker sync.Locker
 }
 
-func (s *synchronize) Do(cb func()) {
+func (s *synchronize) Do(callback func()) {
 	s.locker.Lock()
-	Try0(cb)
+	Try0(callback)
 	s.locker.Unlock()
 }
 
 // Synchronize wraps the underlying callback in a mutex. It receives an optional mutex.
-func Synchronize(opt ...sync.Locker) *synchronize {
+// Play: https://go.dev/play/p/X3cqROSpQmu
+func Synchronize(opt ...sync.Locker) *synchronize { //nolint:revive
 	if len(opt) > 1 {
-		panic("unexpected arguments")
+		panic("lo.Synchronize: unexpected arguments")
 	} else if len(opt) == 0 {
 		opt = append(opt, &sync.Mutex{})
 	}
@@ -26,8 +31,9 @@ func Synchronize(opt ...sync.Locker) *synchronize {
 }
 
 // Async executes a function in a goroutine and returns the result in a channel.
-func Async[A any](f func() A) chan A {
-	ch := make(chan A)
+// Play: https://go.dev/play/p/uo35gosuTLw
+func Async[A any](f func() A) <-chan A {
+	ch := make(chan A, 1)
 	go func() {
 		ch <- f()
 	}()
@@ -35,8 +41,9 @@ func Async[A any](f func() A) chan A {
 }
 
 // Async0 executes a function in a goroutine and returns a channel set once the function finishes.
-func Async0(f func()) chan struct{} {
-	ch := make(chan struct{})
+// Play: https://go.dev/play/p/tNqf1cClG_o
+func Async0(f func()) <-chan struct{} {
+	ch := make(chan struct{}, 1)
 	go func() {
 		f()
 		ch <- struct{}{}
@@ -45,13 +52,15 @@ func Async0(f func()) chan struct{} {
 }
 
 // Async1 is an alias to Async.
-func Async1[A any](f func() A) chan A {
+// Play: https://go.dev/play/p/RBQWtIn4PsF
+func Async1[A any](f func() A) <-chan A {
 	return Async(f)
 }
 
 // Async2 has the same behavior as Async, but returns the 2 results as a tuple inside the channel.
-func Async2[A any, B any](f func() (A, B)) chan Tuple2[A, B] {
-	ch := make(chan Tuple2[A, B])
+// Play: https://go.dev/play/p/5SzzDjssXOH
+func Async2[A, B any](f func() (A, B)) <-chan Tuple2[A, B] {
+	ch := make(chan Tuple2[A, B], 1)
 	go func() {
 		ch <- T2(f())
 	}()
@@ -59,8 +68,9 @@ func Async2[A any, B any](f func() (A, B)) chan Tuple2[A, B] {
 }
 
 // Async3 has the same behavior as Async, but returns the 3 results as a tuple inside the channel.
-func Async3[A any, B any, C any](f func() (A, B, C)) chan Tuple3[A, B, C] {
-	ch := make(chan Tuple3[A, B, C])
+// Play: https://go.dev/play/p/cZpZsDXNmlx
+func Async3[A, B, C any](f func() (A, B, C)) <-chan Tuple3[A, B, C] {
+	ch := make(chan Tuple3[A, B, C], 1)
 	go func() {
 		ch <- T3(f())
 	}()
@@ -68,8 +78,9 @@ func Async3[A any, B any, C any](f func() (A, B, C)) chan Tuple3[A, B, C] {
 }
 
 // Async4 has the same behavior as Async, but returns the 4 results as a tuple inside the channel.
-func Async4[A any, B any, C any, D any](f func() (A, B, C, D)) chan Tuple4[A, B, C, D] {
-	ch := make(chan Tuple4[A, B, C, D])
+// Play: https://go.dev/play/p/9X5O2VrLzkR
+func Async4[A, B, C, D any](f func() (A, B, C, D)) <-chan Tuple4[A, B, C, D] {
+	ch := make(chan Tuple4[A, B, C, D], 1)
 	go func() {
 		ch <- T4(f())
 	}()
@@ -77,8 +88,9 @@ func Async4[A any, B any, C any, D any](f func() (A, B, C, D)) chan Tuple4[A, B,
 }
 
 // Async5 has the same behavior as Async, but returns the 5 results as a tuple inside the channel.
-func Async5[A any, B any, C any, D any, E any](f func() (A, B, C, D, E)) chan Tuple5[A, B, C, D, E] {
-	ch := make(chan Tuple5[A, B, C, D, E])
+// Play: https://go.dev/play/p/MqnUJpkmopA
+func Async5[A, B, C, D, E any](f func() (A, B, C, D, E)) <-chan Tuple5[A, B, C, D, E] {
+	ch := make(chan Tuple5[A, B, C, D, E], 1)
 	go func() {
 		ch <- T5(f())
 	}()
@@ -86,10 +98,50 @@ func Async5[A any, B any, C any, D any, E any](f func() (A, B, C, D, E)) chan Tu
 }
 
 // Async6 has the same behavior as Async, but returns the 6 results as a tuple inside the channel.
-func Async6[A any, B any, C any, D any, E any, F any](f func() (A, B, C, D, E, F)) chan Tuple6[A, B, C, D, E, F] {
-	ch := make(chan Tuple6[A, B, C, D, E, F])
+// Play: https://go.dev/play/p/kM1X67JPdSP
+func Async6[A, B, C, D, E, F any](f func() (A, B, C, D, E, F)) <-chan Tuple6[A, B, C, D, E, F] {
+	ch := make(chan Tuple6[A, B, C, D, E, F], 1)
 	go func() {
 		ch <- T6(f())
 	}()
 	return ch
 }
+
+// WaitFor runs periodically until a condition is validated.
+// Play: https://go.dev/play/p/t_wTDmubbK3
+func WaitFor(condition func(i int) bool, timeout, heartbeatDelay time.Duration) (totalIterations int, elapsed time.Duration, conditionFound bool) {
+	conditionWithContext := func(_ context.Context, currentIteration int) bool {
+		return condition(currentIteration)
+	}
+	return WaitForWithContext(context.Background(), conditionWithContext, timeout, heartbeatDelay)
+}
+
+// WaitForWithContext runs periodically until a condition is validated or context is canceled.
+// Play: https://go.dev/play/p/t_wTDmubbK3
+func WaitForWithContext(ctx context.Context, condition func(ctx context.Context, currentIteration int) bool, timeout, heartbeatDelay time.Duration) (totalIterations int, elapsed time.Duration, conditionFound bool) {
+	start := time.Now()
+
+	if ctx.Err() != nil {
+		return totalIterations, time.Since(start), false
+	}
+
+	ctx, cleanCtx := context.WithTimeout(ctx, timeout)
+	ticker := time.NewTicker(heartbeatDelay)
+
+	defer func() {
+		cleanCtx()
+		ticker.Stop()
+	}()
+
+	for {
+		select {
+		case <-ctx.Done():
+			return totalIterations, time.Since(start), false
+		case <-ticker.C:
+			totalIterations++
+			if condition(ctx, totalIterations-1) {
+				return totalIterations, time.Since(start), true
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/samber/lo/condition.go b/vendor/github.com/samber/lo/condition.go
index 1d4e75d25..92ed36b0d 100644
--- a/vendor/github.com/samber/lo/condition.go
+++ b/vendor/github.com/samber/lo/condition.go
@@ -1,8 +1,9 @@
 package lo
 
-// Ternary is a 1 line if/else statement.
+// Ternary is a single line if/else statement.
+// Take care to avoid dereferencing potentially nil pointers in your A/B expressions, because they are both evaluated. See TernaryF to avoid this problem.
 // Play: https://go.dev/play/p/t-D7WBL44h2
-func Ternary[T any](condition bool, ifOutput T, elseOutput T) T {
+func Ternary[T any](condition bool, ifOutput, elseOutput T) T {
 	if condition {
 		return ifOutput
 	}
@@ -10,9 +11,9 @@ func Ternary[T any](condition bool, ifOutput T, elseOutput T) T {
 	return elseOutput
 }
 
-// TernaryF is a 1 line if/else statement whose options are functions
+// TernaryF is a single line if/else statement whose options are functions.
 // Play: https://go.dev/play/p/AO4VW20JoqM
-func TernaryF[T any](condition bool, ifFunc func() T, elseFunc func() T) T {
+func TernaryF[T any](condition bool, ifFunc, elseFunc func() T) T {
 	if condition {
 		return ifFunc()
 	}
@@ -25,9 +26,9 @@ type ifElse[T any] struct {
 	done   bool
 }
 
-// If.
+// If is a single line if/else statement.
 // Play: https://go.dev/play/p/WSw3ApMxhyW
-func If[T any](condition bool, result T) *ifElse[T] {
+func If[T any](condition bool, result T) *ifElse[T] { //nolint:revive
 	if condition {
 		return &ifElse[T]{result, true}
 	}
@@ -36,9 +37,9 @@ func If[T any](condition bool, result T) *ifElse[T] {
 	return &ifElse[T]{t, false}
 }
 
-// IfF.
+// IfF is a single line if/else statement whose options are functions.
 // Play: https://go.dev/play/p/WSw3ApMxhyW
-func IfF[T any](condition bool, resultF func() T) *ifElse[T] {
+func IfF[T any](condition bool, resultF func() T) *ifElse[T] { //nolint:revive
 	if condition {
 		return &ifElse[T]{resultF(), true}
 	}
@@ -97,7 +98,7 @@ type switchCase[T comparable, R any] struct {
 
 // Switch is a pure functional switch/case/default statement.
 // Play: https://go.dev/play/p/TGbKUMAeRUd
-func Switch[T comparable, R any](predicate T) *switchCase[T, R] {
+func Switch[T comparable, R any](predicate T) *switchCase[T, R] { //nolint:revive
 	var result R
 
 	return &switchCase[T, R]{
@@ -120,9 +121,9 @@ func (s *switchCase[T, R]) Case(val T, result R) *switchCase[T, R] {
 
 // CaseF.
 // Play: https://go.dev/play/p/TGbKUMAeRUd
-func (s *switchCase[T, R]) CaseF(val T, cb func() R) *switchCase[T, R] {
+func (s *switchCase[T, R]) CaseF(val T, callback func() R) *switchCase[T, R] {
 	if !s.done && s.predicate == val {
-		s.result = cb()
+		s.result = callback()
 		s.done = true
 	}
 
@@ -141,9 +142,9 @@ func (s *switchCase[T, R]) Default(result R) R {
 
 // DefaultF.
 // Play: https://go.dev/play/p/TGbKUMAeRUd
-func (s *switchCase[T, R]) DefaultF(cb func() R) R {
+func (s *switchCase[T, R]) DefaultF(callback func() R) R {
 	if !s.done {
-		s.result = cb()
+		s.result = callback()
 	}
 
 	return s.result
diff --git a/vendor/github.com/samber/lo/docker-compose.yml b/vendor/github.com/samber/lo/docker-compose.yml
deleted file mode 100644
index 511e85fde..000000000
--- a/vendor/github.com/samber/lo/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3'
-
-services:
-  dev:
-    image: golang:1.18-bullseye
-    volumes:
-      - ./:/go/src/github.com/samber/lo
-    working_dir: /go/src/github.com/samber/lo
-    command: make watch-test
diff --git a/vendor/github.com/samber/lo/errors.go b/vendor/github.com/samber/lo/errors.go
index 0a4cb5b85..8313edd7a 100644
--- a/vendor/github.com/samber/lo/errors.go
+++ b/vendor/github.com/samber/lo/errors.go
@@ -6,16 +6,18 @@ import (
 	"reflect"
 )
 
+const defaultAssertionFailureMessage = "assertion failed"
+
 // Validate is a helper that creates an error when a condition is not met.
 // Play: https://go.dev/play/p/vPyh51XpCBt
 func Validate(ok bool, format string, args ...any) error {
 	if !ok {
-		return fmt.Errorf(fmt.Sprintf(format, args...))
+		return fmt.Errorf(format, args...)
 	}
 	return nil
 }
 
-func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
+func messageFromMsgAndArgs(msgAndArgs ...any) string {
 	if len(msgAndArgs) == 1 {
 		if msgAsStr, ok := msgAndArgs[0].(string); ok {
 			return msgAsStr
@@ -23,13 +25,13 @@ func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
 		return fmt.Sprintf("%+v", msgAndArgs[0])
 	}
 	if len(msgAndArgs) > 1 {
-		return fmt.Sprintf(msgAndArgs[0].(string), msgAndArgs[1:]...)
+		return fmt.Sprintf(msgAndArgs[0].(string), msgAndArgs[1:]...) //nolint:errcheck,forcetypeassert
 	}
 	return ""
 }
 
-// must panics if err is error or false.
-func must(err any, messageArgs ...interface{}) {
+// MustChecker panics if err is error or false.
+var MustChecker = func(err any, messageArgs ...any) {
 	if err == nil {
 		return
 	}
@@ -49,9 +51,8 @@ func must(err any, messageArgs ...interface{}) {
 		message := messageFromMsgAndArgs(messageArgs...)
 		if message != "" {
 			panic(message + ": " + e.Error())
-		} else {
-			panic(e.Error())
 		}
+		panic(e.Error())
 
 	default:
 		panic("must: invalid err type '" + reflect.TypeOf(err).Name() + "', should either be a bool or an error")
@@ -60,56 +61,56 @@ func must(err any, messageArgs ...interface{}) {
 
 // Must is a helper that wraps a call to a function returning a value and an error
 // and panics if err is error or false.
-// Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must[T any](val T, err any, messageArgs ...interface{}) T {
-	must(err, messageArgs...)
+// Play: https://go.dev/play/p/fOqtX5HudtN
+func Must[T any](val T, err any, messageArgs ...any) T {
+	MustChecker(err, messageArgs...)
 	return val
 }
 
-// Must0 has the same behavior than Must, but callback returns no variable.
+// Must0 has the same behavior as Must, but callback returns no variable.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must0(err any, messageArgs ...interface{}) {
-	must(err, messageArgs...)
+func Must0(err any, messageArgs ...any) {
+	MustChecker(err, messageArgs...)
 }
 
-// Must1 is an alias to Must
+// Must1 is an alias to Must.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must1[T any](val T, err any, messageArgs ...interface{}) T {
+func Must1[T any](val T, err any, messageArgs ...any) T {
 	return Must(val, err, messageArgs...)
 }
 
-// Must2 has the same behavior than Must, but callback returns 2 variables.
+// Must2 has the same behavior as Must, but callback returns 2 variables.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must2[T1 any, T2 any](val1 T1, val2 T2, err any, messageArgs ...interface{}) (T1, T2) {
-	must(err, messageArgs...)
+func Must2[T1, T2 any](val1 T1, val2 T2, err any, messageArgs ...any) (T1, T2) {
+	MustChecker(err, messageArgs...)
 	return val1, val2
 }
 
-// Must3 has the same behavior than Must, but callback returns 3 variables.
+// Must3 has the same behavior as Must, but callback returns 3 variables.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must3[T1 any, T2 any, T3 any](val1 T1, val2 T2, val3 T3, err any, messageArgs ...interface{}) (T1, T2, T3) {
-	must(err, messageArgs...)
+func Must3[T1, T2, T3 any](val1 T1, val2 T2, val3 T3, err any, messageArgs ...any) (T1, T2, T3) {
+	MustChecker(err, messageArgs...)
 	return val1, val2, val3
 }
 
-// Must4 has the same behavior than Must, but callback returns 4 variables.
+// Must4 has the same behavior as Must, but callback returns 4 variables.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must4[T1 any, T2 any, T3 any, T4 any](val1 T1, val2 T2, val3 T3, val4 T4, err any, messageArgs ...interface{}) (T1, T2, T3, T4) {
-	must(err, messageArgs...)
+func Must4[T1, T2, T3, T4 any](val1 T1, val2 T2, val3 T3, val4 T4, err any, messageArgs ...any) (T1, T2, T3, T4) {
+	MustChecker(err, messageArgs...)
 	return val1, val2, val3, val4
 }
 
-// Must5 has the same behavior than Must, but callback returns 5 variables.
+// Must5 has the same behavior as Must, but callback returns 5 variables.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must5[T1 any, T2 any, T3 any, T4 any, T5 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, err any, messageArgs ...interface{}) (T1, T2, T3, T4, T5) {
-	must(err, messageArgs...)
+func Must5[T1, T2, T3, T4, T5 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, err any, messageArgs ...any) (T1, T2, T3, T4, T5) {
+	MustChecker(err, messageArgs...)
 	return val1, val2, val3, val4, val5
 }
 
-// Must6 has the same behavior than Must, but callback returns 6 variables.
+// Must6 has the same behavior as Must, but callback returns 6 variables.
 // Play: https://go.dev/play/p/TMoWrRp3DyC
-func Must6[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, val6 T6, err any, messageArgs ...interface{}) (T1, T2, T3, T4, T5, T6) {
-	must(err, messageArgs...)
+func Must6[T1, T2, T3, T4, T5, T6 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, val6 T6, err any, messageArgs ...any) (T1, T2, T3, T4, T5, T6) {
+	MustChecker(err, messageArgs...)
 	return val1, val2, val3, val4, val5, val6
 }
 
@@ -128,10 +129,10 @@ func Try(callback func() error) (ok bool) {
 		ok = false
 	}
 
-	return
+	return ok
 }
 
-// Try0 has the same behavior than Try, but callback returns no variable.
+// Try0 has the same behavior as Try, but callback returns no variable.
 // Play: https://go.dev/play/p/mTyyWUvn9u4
 func Try0(callback func()) bool {
 	return Try(func() error {
@@ -146,7 +147,7 @@ func Try1(callback func() error) bool {
 	return Try(callback)
 }
 
-// Try2 has the same behavior than Try, but callback returns 2 variables.
+// Try2 has the same behavior as Try, but callback returns 2 variables.
 // Play: https://go.dev/play/p/mTyyWUvn9u4
 func Try2[T any](callback func() (T, error)) bool {
 	return Try(func() error {
@@ -155,7 +156,7 @@ func Try2[T any](callback func() (T, error)) bool {
 	})
 }
 
-// Try3 has the same behavior than Try, but callback returns 3 variables.
+// Try3 has the same behavior as Try, but callback returns 3 variables.
 // Play: https://go.dev/play/p/mTyyWUvn9u4
 func Try3[T, R any](callback func() (T, R, error)) bool {
 	return Try(func() error {
@@ -164,7 +165,7 @@ func Try3[T, R any](callback func() (T, R, error)) bool {
 	})
 }
 
-// Try4 has the same behavior than Try, but callback returns 4 variables.
+// Try4 has the same behavior as Try, but callback returns 4 variables.
 // Play: https://go.dev/play/p/mTyyWUvn9u4
 func Try4[T, R, S any](callback func() (T, R, S, error)) bool {
 	return Try(func() error {
@@ -173,7 +174,7 @@ func Try4[T, R, S any](callback func() (T, R, S, error)) bool {
 	})
 }
 
-// Try5 has the same behavior than Try, but callback returns 5 variables.
+// Try5 has the same behavior as Try, but callback returns 5 variables.
 // Play: https://go.dev/play/p/mTyyWUvn9u4
 func Try5[T, R, S, Q any](callback func() (T, R, S, Q, error)) bool {
 	return Try(func() error {
@@ -182,7 +183,7 @@ func Try5[T, R, S, Q any](callback func() (T, R, S, Q, error)) bool {
 	})
 }
 
-// Try6 has the same behavior than Try, but callback returns 6 variables.
+// Try6 has the same behavior as Try, but callback returns 6 variables.
 // Play: https://go.dev/play/p/mTyyWUvn9u4
 func Try6[T, R, S, Q, U any](callback func() (T, R, S, Q, U, error)) bool {
 	return Try(func() error {
@@ -191,13 +192,13 @@ func Try6[T, R, S, Q, U any](callback func() (T, R, S, Q, U, error)) bool {
 	})
 }
 
-// TryOr has the same behavior than Must, but returns a default value in case of error.
+// TryOr has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
 func TryOr[A any](callback func() (A, error), fallbackA A) (A, bool) {
 	return TryOr1(callback, fallbackA)
 }
 
-// TryOr1 has the same behavior than Must, but returns a default value in case of error.
+// TryOr1 has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
 func TryOr1[A any](callback func() (A, error), fallbackA A) (A, bool) {
 	ok := false
@@ -213,9 +214,9 @@ func TryOr1[A any](callback func() (A, error), fallbackA A) (A, bool) {
 	return fallbackA, ok
 }
 
-// TryOr2 has the same behavior than Must, but returns a default value in case of error.
+// TryOr2 has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
-func TryOr2[A any, B any](callback func() (A, B, error), fallbackA A, fallbackB B) (A, B, bool) {
+func TryOr2[A, B any](callback func() (A, B, error), fallbackA A, fallbackB B) (A, B, bool) {
 	ok := false
 
 	Try0(func() {
@@ -230,9 +231,9 @@ func TryOr2[A any, B any](callback func() (A, B, error), fallbackA A, fallbackB
 	return fallbackA, fallbackB, ok
 }
 
-// TryOr3 has the same behavior than Must, but returns a default value in case of error.
+// TryOr3 has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
-func TryOr3[A any, B any, C any](callback func() (A, B, C, error), fallbackA A, fallbackB B, fallbackC C) (A, B, C, bool) {
+func TryOr3[A, B, C any](callback func() (A, B, C, error), fallbackA A, fallbackB B, fallbackC C) (A, B, C, bool) {
 	ok := false
 
 	Try0(func() {
@@ -248,9 +249,9 @@ func TryOr3[A any, B any, C any](callback func() (A, B, C, error), fallbackA A,
 	return fallbackA, fallbackB, fallbackC, ok
 }
 
-// TryOr4 has the same behavior than Must, but returns a default value in case of error.
+// TryOr4 has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
-func TryOr4[A any, B any, C any, D any](callback func() (A, B, C, D, error), fallbackA A, fallbackB B, fallbackC C, fallbackD D) (A, B, C, D, bool) {
+func TryOr4[A, B, C, D any](callback func() (A, B, C, D, error), fallbackA A, fallbackB B, fallbackC C, fallbackD D) (A, B, C, D, bool) {
 	ok := false
 
 	Try0(func() {
@@ -267,9 +268,9 @@ func TryOr4[A any, B any, C any, D any](callback func() (A, B, C, D, error), fal
 	return fallbackA, fallbackB, fallbackC, fallbackD, ok
 }
 
-// TryOr5 has the same behavior than Must, but returns a default value in case of error.
+// TryOr5 has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
-func TryOr5[A any, B any, C any, D any, E any](callback func() (A, B, C, D, E, error), fallbackA A, fallbackB B, fallbackC C, fallbackD D, fallbackE E) (A, B, C, D, E, bool) {
+func TryOr5[A, B, C, D, E any](callback func() (A, B, C, D, E, error), fallbackA A, fallbackB B, fallbackC C, fallbackD D, fallbackE E) (A, B, C, D, E, bool) {
 	ok := false
 
 	Try0(func() {
@@ -287,9 +288,9 @@ func TryOr5[A any, B any, C any, D any, E any](callback func() (A, B, C, D, E, e
 	return fallbackA, fallbackB, fallbackC, fallbackD, fallbackE, ok
 }
 
-// TryOr6 has the same behavior than Must, but returns a default value in case of error.
+// TryOr6 has the same behavior as Must, but returns a default value in case of error.
 // Play: https://go.dev/play/p/B4F7Wg2Zh9X
-func TryOr6[A any, B any, C any, D any, E any, F any](callback func() (A, B, C, D, E, F, error), fallbackA A, fallbackB B, fallbackC C, fallbackD D, fallbackE E, fallbackF F) (A, B, C, D, E, F, bool) {
+func TryOr6[A, B, C, D, E, F any](callback func() (A, B, C, D, E, F, error), fallbackA A, fallbackB B, fallbackC C, fallbackD D, fallbackE E, fallbackF F) (A, B, C, D, E, F, bool) {
 	ok := false
 
 	Try0(func() {
@@ -308,7 +309,7 @@ func TryOr6[A any, B any, C any, D any, E any, F any](callback func() (A, B, C,
 	return fallbackA, fallbackB, fallbackC, fallbackD, fallbackE, fallbackF, ok
 }
 
-// TryWithErrorValue has the same behavior than Try, but also returns value passed to panic.
+// TryWithErrorValue has the same behavior as Try, but also returns value passed to panic.
 // Play: https://go.dev/play/p/Kc7afQIT2Fs
 func TryWithErrorValue(callback func() error) (errorValue any, ok bool) {
 	ok = true
@@ -326,10 +327,10 @@ func TryWithErrorValue(callback func() error) (errorValue any, ok bool) {
 		errorValue = err
 	}
 
-	return
+	return errorValue, ok
 }
 
-// TryCatch has the same behavior than Try, but calls the catch function in case of error.
+// TryCatch has the same behavior as Try, but calls the catch function in case of error.
 // Play: https://go.dev/play/p/PnOON-EqBiU
 func TryCatch(callback func() error, catch func()) {
 	if !Try(callback) {
@@ -337,7 +338,7 @@ func TryCatch(callback func() error, catch func()) {
 	}
 }
 
-// TryCatchWithErrorValue has the same behavior than TryWithErrorValue, but calls the catch function in case of error.
+// TryCatchWithErrorValue has the same behavior as TryWithErrorValue, but calls the catch function in case of error.
 // Play: https://go.dev/play/p/8Pc9gwX_GZO
 func TryCatchWithErrorValue(callback func() error, catch func(any)) {
 	if err, ok := TryWithErrorValue(callback); !ok {
@@ -352,3 +353,28 @@ func ErrorsAs[T error](err error) (T, bool) {
 	ok := errors.As(err, &t)
 	return t, ok
 }
+
+// Assert does nothing when the condition is true, otherwise it panics with an optional message.
+// Play: https://go.dev/play/p/Xv8LLKBMNwI
+var Assert = func(condition bool, message ...string) {
+	if condition {
+		return
+	}
+
+	panicMessage := defaultAssertionFailureMessage
+	if len(message) > 0 {
+		panicMessage = fmt.Sprintf("%s: %s", defaultAssertionFailureMessage, message[0])
+	}
+	panic(panicMessage)
+}
+
+// Assertf does nothing when the condition is true, otherwise it panics with a formatted message.
+// Play: https://go.dev/play/p/TVPEmVcyrdY
+var Assertf = func(condition bool, format string, args ...any) {
+	if condition {
+		return
+	}
+
+	panicMessage := fmt.Sprintf("%s: %s", defaultAssertionFailureMessage, fmt.Sprintf(format, args...))
+	panic(panicMessage)
+}
diff --git a/vendor/github.com/samber/lo/find.go b/vendor/github.com/samber/lo/find.go
index e40bfcc87..f5be8520c 100644
--- a/vendor/github.com/samber/lo/find.go
+++ b/vendor/github.com/samber/lo/find.go
@@ -1,19 +1,18 @@
 package lo
 
 import (
-	"fmt"
-	"math/rand"
+	"time"
 
-	"golang.org/x/exp/constraints"
+	"github.com/samber/lo/internal/constraints"
+	"github.com/samber/lo/internal/xrand"
 )
 
-// import "golang.org/x/exp/constraints"
-
-// IndexOf returns the index at which the first occurrence of a value is found in an array or return -1
+// IndexOf returns the index at which the first occurrence of a value is found in a slice or -1
 // if the value cannot be found.
+// Play: https://go.dev/play/p/Eo7W0lvKTky
 func IndexOf[T comparable](collection []T, element T) int {
-	for i, item := range collection {
-		if item == element {
+	for i := range collection {
+		if collection[i] == element {
 			return i
 		}
 	}
@@ -21,8 +20,9 @@ func IndexOf[T comparable](collection []T, element T) int {
 	return -1
 }
 
-// LastIndexOf returns the index at which the last occurrence of a value is found in an array or return -1
+// LastIndexOf returns the index at which the last occurrence of a value is found in a slice or -1
 // if the value cannot be found.
+// Play: https://go.dev/play/p/Eo7W0lvKTky
 func LastIndexOf[T comparable](collection []T, element T) int {
 	length := len(collection)
 
@@ -35,11 +35,44 @@ func LastIndexOf[T comparable](collection []T, element T) int {
 	return -1
 }
 
-// Find search an element in a slice based on a predicate. It returns element and true if element was found.
-func Find[T any](collection []T, predicate func(T) bool) (T, bool) {
-	for _, item := range collection {
-		if predicate(item) {
-			return item, true
+// HasPrefix returns true if the collection has the prefix.
+// Play: https://go.dev/play/p/SrljzVDpMQM
+func HasPrefix[T comparable](collection, prefix []T) bool {
+	if len(collection) < len(prefix) {
+		return false
+	}
+
+	for i := range prefix {
+		if collection[i] != prefix[i] {
+			return false
+		}
+	}
+
+	return true
+}
+
+// HasSuffix returns true if the collection has the suffix.
+// Play: https://go.dev/play/p/bJeLetQNAON
+func HasSuffix[T comparable](collection, suffix []T) bool {
+	if len(collection) < len(suffix) {
+		return false
+	}
+
+	for i := range suffix {
+		if collection[len(collection)-len(suffix)+i] != suffix[i] {
+			return false
+		}
+	}
+
+	return true
+}
+
+// Find searches for an element in a slice based on a predicate. Returns element and true if element was found.
+// Play: https://go.dev/play/p/Eo7W0lvKTky
+func Find[T any](collection []T, predicate func(item T) bool) (T, bool) {
+	for i := range collection {
+		if predicate(collection[i]) {
+			return collection[i], true
 		}
 	}
 
@@ -47,12 +80,33 @@ func Find[T any](collection []T, predicate func(T) bool) (T, bool) {
 	return result, false
 }
 
-// FindIndexOf searches an element in a slice based on a predicate and returns the index and true.
-// It returns -1 and false if the element is not found.
-func FindIndexOf[T any](collection []T, predicate func(T) bool) (T, int, bool) {
-	for i, item := range collection {
-		if predicate(item) {
-			return item, i, true
+// FindErr searches for an element in a slice based on a predicate that can return an error.
+// Returns the element and nil error if the element is found.
+// Returns zero value and nil error if the element is not found.
+// If the predicate returns an error, iteration stops immediately and returns zero value and the error.
+func FindErr[T any](collection []T, predicate func(item T) (bool, error)) (T, error) {
+	for i := range collection {
+		matches, err := predicate(collection[i])
+		if err != nil {
+			var result T
+			return result, err
+		}
+		if matches {
+			return collection[i], nil
+		}
+	}
+
+	var result T
+	return result, nil
+}
+
+// FindIndexOf searches for an element in a slice based on a predicate and returns the index and true.
+// Returns -1 and false if the element is not found.
+// Play: https://go.dev/play/p/XWSEM4Ic_t0
+func FindIndexOf[T any](collection []T, predicate func(item T) bool) (T, int, bool) {
+	for i := range collection {
+		if predicate(collection[i]) {
+			return collection[i], i, true
 		}
 	}
 
@@ -60,9 +114,10 @@ func FindIndexOf[T any](collection []T, predicate func(T) bool) (T, int, bool) {
 	return result, -1, false
 }
 
-// FindLastIndexOf searches last element in a slice based on a predicate and returns the index and true.
-// It returns -1 and false if the element is not found.
-func FindLastIndexOf[T any](collection []T, predicate func(T) bool) (T, int, bool) {
+// FindLastIndexOf searches for the last element in a slice based on a predicate and returns the index and true.
+// Returns -1 and false if the element is not found.
+// Play: https://go.dev/play/p/dPiMRtJ6cUx
+func FindLastIndexOf[T any](collection []T, predicate func(item T) bool) (T, int, bool) {
 	length := len(collection)
 
 	for i := length - 1; i >= 0; i-- {
@@ -75,11 +130,12 @@ func FindLastIndexOf[T any](collection []T, predicate func(T) bool) (T, int, boo
 	return result, -1, false
 }
 
-// FindOrElse search an element in a slice based on a predicate. It returns the element if found or a given fallback value otherwise.
-func FindOrElse[T any](collection []T, fallback T, predicate func(T) bool) T {
-	for _, item := range collection {
-		if predicate(item) {
-			return item
+// FindOrElse searches for an element in a slice based on a predicate. Returns the element if found or a given fallback value otherwise.
+// Play: https://go.dev/play/p/Eo7W0lvKTky
+func FindOrElse[T any](collection []T, fallback T, predicate func(item T) bool) T {
+	for i := range collection {
+		if predicate(collection[i]) {
+			return collection[i]
 		}
 	}
 
@@ -87,7 +143,8 @@ func FindOrElse[T any](collection []T, fallback T, predicate func(T) bool) T {
 }
 
 // FindKey returns the key of the first value matching.
-func FindKey[K comparable, V comparable](object map[K]V, value V) (K, bool) {
+// Play: https://go.dev/play/p/Bg0w1VDPYXx
+func FindKey[K, V comparable](object map[K]V, value V) (K, bool) {
 	for k, v := range object {
 		if v == value {
 			return k, true
@@ -97,8 +154,9 @@ func FindKey[K comparable, V comparable](object map[K]V, value V) (K, bool) {
 	return Empty[K](), false
 }
 
-// FindKeyBy returns the key of the first element predicate returns truthy for.
-func FindKeyBy[K comparable, V any](object map[K]V, predicate func(K, V) bool) (K, bool) {
+// FindKeyBy returns the key of the first element predicate returns true for.
+// Play: https://go.dev/play/p/9IbiPElcyo8
+func FindKeyBy[K comparable, V any](object map[K]V, predicate func(key K, value V) bool) (K, bool) {
 	for k, v := range object {
 		if predicate(k, v) {
 			return k, true
@@ -108,111 +166,127 @@ func FindKeyBy[K comparable, V any](object map[K]V, predicate func(K, V) bool) (
 	return Empty[K](), false
 }
 
-// FindUniques returns a slice with all the unique elements of the collection.
+// FindUniques returns a slice with all the elements that appear in the collection only once.
 // The order of result values is determined by the order they occur in the collection.
-func FindUniques[T comparable](collection []T) []T {
+func FindUniques[T comparable, Slice ~[]T](collection Slice) Slice {
 	isDupl := make(map[T]bool, len(collection))
 
-	for _, item := range collection {
-		duplicated, ok := isDupl[item]
-		if !ok {
-			isDupl[item] = false
-		} else if !duplicated {
-			isDupl[item] = true
+	duplicates := 0
+
+	for i := range collection {
+		duplicated, seen := isDupl[collection[i]]
+		if !duplicated {
+			isDupl[collection[i]] = seen
+
+			if seen {
+				duplicates++
+			}
 		}
 	}
 
-	result := make([]T, 0, len(collection)-len(isDupl))
+	result := make(Slice, 0, len(isDupl)-duplicates)
 
-	for _, item := range collection {
-		if duplicated := isDupl[item]; !duplicated {
-			result = append(result, item)
+	for i := range collection {
+		if duplicated := isDupl[collection[i]]; !duplicated {
+			result = append(result, collection[i])
 		}
 	}
 
 	return result
 }
 
-// FindUniquesBy returns a slice with all the unique elements of the collection.
-// The order of result values is determined by the order they occur in the array. It accepts `iteratee` which is
-// invoked for each element in array to generate the criterion by which uniqueness is computed.
-func FindUniquesBy[T any, U comparable](collection []T, iteratee func(T) U) []T {
+// FindUniquesBy returns a slice with all the elements that appear in the collection only once.
+// The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is
+// invoked for each element in the slice to generate the criterion by which uniqueness is computed.
+func FindUniquesBy[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) U) Slice {
 	isDupl := make(map[U]bool, len(collection))
 
-	for _, item := range collection {
-		key := iteratee(item)
+	duplicates := 0
 
-		duplicated, ok := isDupl[key]
-		if !ok {
-			isDupl[key] = false
-		} else if !duplicated {
-			isDupl[key] = true
+	for i := range collection {
+		key := iteratee(collection[i])
+
+		duplicated, seen := isDupl[key]
+		if !duplicated {
+			isDupl[key] = seen
+
+			if seen {
+				duplicates++
+			}
 		}
 	}
 
-	result := make([]T, 0, len(collection)-len(isDupl))
+	result := make(Slice, 0, len(isDupl)-duplicates)
 
-	for _, item := range collection {
-		key := iteratee(item)
+	for i := range collection {
+		key := iteratee(collection[i])
 
 		if duplicated := isDupl[key]; !duplicated {
-			result = append(result, item)
+			result = append(result, collection[i])
 		}
 	}
 
 	return result
 }
 
-// FindDuplicates returns a slice with the first occurence of each duplicated elements of the collection.
+// FindDuplicates returns a slice with the first occurrence of each duplicated element in the collection.
 // The order of result values is determined by the order they occur in the collection.
-func FindDuplicates[T comparable](collection []T) []T {
+func FindDuplicates[T comparable, Slice ~[]T](collection Slice) Slice {
 	isDupl := make(map[T]bool, len(collection))
 
-	for _, item := range collection {
-		duplicated, ok := isDupl[item]
-		if !ok {
-			isDupl[item] = false
-		} else if !duplicated {
-			isDupl[item] = true
+	duplicates := 0
+
+	for i := range collection {
+		duplicated, seen := isDupl[collection[i]]
+		if !duplicated {
+			isDupl[collection[i]] = seen
+
+			if seen {
+				duplicates++
+			}
 		}
 	}
 
-	result := make([]T, 0, len(collection)-len(isDupl))
+	result := make(Slice, 0, duplicates)
 
-	for _, item := range collection {
-		if duplicated := isDupl[item]; duplicated {
-			result = append(result, item)
-			isDupl[item] = false
+	for i := range collection {
+		if duplicated := isDupl[collection[i]]; duplicated {
+			result = append(result, collection[i])
+			isDupl[collection[i]] = false
 		}
 	}
 
 	return result
 }
 
-// FindDuplicatesBy returns a slice with the first occurence of each duplicated elements of the collection.
-// The order of result values is determined by the order they occur in the array. It accepts `iteratee` which is
-// invoked for each element in array to generate the criterion by which uniqueness is computed.
-func FindDuplicatesBy[T any, U comparable](collection []T, iteratee func(T) U) []T {
+// FindDuplicatesBy returns a slice with the first occurrence of each duplicated element in the collection.
+// The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is
+// invoked for each element in the slice to generate the criterion by which uniqueness is computed.
+func FindDuplicatesBy[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) U) Slice {
 	isDupl := make(map[U]bool, len(collection))
 
-	for _, item := range collection {
-		key := iteratee(item)
+	duplicates := 0
 
-		duplicated, ok := isDupl[key]
-		if !ok {
-			isDupl[key] = false
-		} else if !duplicated {
-			isDupl[key] = true
+	for i := range collection {
+		key := iteratee(collection[i])
+
+		duplicated, seen := isDupl[key]
+		if !duplicated {
+			isDupl[key] = seen
+
+			if seen {
+				duplicates++
+			}
 		}
 	}
 
-	result := make([]T, 0, len(collection)-len(isDupl))
+	result := make(Slice, 0, duplicates)
 
-	for _, item := range collection {
-		key := iteratee(item)
+	for i := range collection {
+		key := iteratee(collection[i])
 
 		if duplicated := isDupl[key]; duplicated {
-			result = append(result, item)
+			result = append(result, collection[i])
 			isDupl[key] = false
 		}
 	}
@@ -220,148 +294,701 @@ func FindDuplicatesBy[T any, U comparable](collection []T, iteratee func(T) U) [
 	return result
 }
 
+// FindDuplicatesByErr returns a slice with the first occurrence of each duplicated element in the collection.
+// The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is
+// invoked for each element in the slice to generate the criterion by which uniqueness is computed.
+// If the iteratee returns an error, iteration stops immediately and the error is returned with a nil slice.
+func FindDuplicatesByErr[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) (U, error)) (Slice, error) {
+	isDupl := make(map[U]bool, len(collection))
+
+	duplicates := 0
+
+	// First pass: identify duplicates
+	for i := range collection {
+		key, err := iteratee(collection[i])
+		if err != nil {
+			var result Slice
+			return result, err
+		}
+
+		duplicated, seen := isDupl[key]
+		if !duplicated {
+			isDupl[key] = seen
+
+			if seen {
+				duplicates++
+			}
+		}
+	}
+
+	result := make(Slice, 0, duplicates)
+
+	// Second pass: collect first occurrences of duplicates
+	for i := range collection {
+		key, err := iteratee(collection[i])
+		if err != nil {
+			var result Slice
+			return result, err
+		}
+
+		if duplicated := isDupl[key]; duplicated {
+			result = append(result, collection[i])
+			isDupl[key] = false
+		}
+	}
+
+	return result, nil
+}
+
 // Min search the minimum value of a collection.
+// Returns zero value when the collection is empty.
+// Play: https://go.dev/play/p/r6e-Z8JozS8
 func Min[T constraints.Ordered](collection []T) T {
-	var min T
+	var mIn T
 
 	if len(collection) == 0 {
-		return min
+		return mIn
 	}
 
-	min = collection[0]
+	mIn = collection[0]
 
 	for i := 1; i < len(collection); i++ {
 		item := collection[i]
 
-		if item < min {
-			min = item
+		if item < mIn {
+			mIn = item
 		}
 	}
 
-	return min
+	return mIn
+}
+
+// MinIndex search the minimum value of a collection and the index of the minimum value.
+// Returns (zero value, -1) when the collection is empty.
+func MinIndex[T constraints.Ordered](collection []T) (T, int) {
+	var (
+		mIn   T
+		index int
+	)
+
+	if len(collection) == 0 {
+		return mIn, -1
+	}
+
+	mIn = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		if item < mIn {
+			mIn = item
+			index = i
+		}
+	}
+
+	return mIn, index
 }
 
 // MinBy search the minimum value of a collection using the given comparison function.
 // If several values of the collection are equal to the smallest value, returns the first such value.
-func MinBy[T any](collection []T, comparison func(T, T) bool) T {
-	var min T
+// Returns zero value when the collection is empty.
+func MinBy[T any](collection []T, less func(a, b T) bool) T {
+	var mIn T
 
 	if len(collection) == 0 {
-		return min
+		return mIn
 	}
 
-	min = collection[0]
+	mIn = collection[0]
 
 	for i := 1; i < len(collection); i++ {
 		item := collection[i]
 
-		if comparison(item, min) {
-			min = item
+		if less(item, mIn) {
+			mIn = item
 		}
 	}
 
-	return min
+	return mIn
+}
+
+// MinByErr search the minimum value of a collection using the given comparison function.
+// If several values of the collection are equal to the smallest value, returns the first such value.
+// Returns zero value and nil error when the collection is empty.
+// If the comparison function returns an error, iteration stops and the error is returned.
+func MinByErr[T any](collection []T, less func(a, b T) (bool, error)) (T, error) {
+	var mIn T
+
+	if len(collection) == 0 {
+		return mIn, nil
+	}
+
+	mIn = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		isLess, err := less(item, mIn)
+		if err != nil {
+			var zero T
+			return zero, err
+		}
+		if isLess {
+			mIn = item
+		}
+	}
+
+	return mIn, nil
+}
+
+// MinIndexBy search the minimum value of a collection using the given comparison function and the index of the minimum value.
+// If several values of the collection are equal to the smallest value, returns the first such value.
+// Returns (zero value, -1) when the collection is empty.
+func MinIndexBy[T any](collection []T, less func(a, b T) bool) (T, int) {
+	var (
+		mIn   T
+		index int
+	)
+
+	if len(collection) == 0 {
+		return mIn, -1
+	}
+
+	mIn = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		if less(item, mIn) {
+			mIn = item
+			index = i
+		}
+	}
+
+	return mIn, index
+}
+
+// MinIndexByErr search the minimum value of a collection using the given comparison function and the index of the minimum value.
+// If several values of the collection are equal to the smallest value, returns the first such value.
+// Returns (zero value, -1) when the collection is empty.
+// Comparison function can return an error to stop iteration immediately.
+func MinIndexByErr[T any](collection []T, less func(a, b T) (bool, error)) (T, int, error) {
+	var (
+		mIn   T
+		index int
+	)
+
+	if len(collection) == 0 {
+		return mIn, -1, nil
+	}
+
+	mIn = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		isLess, err := less(item, mIn)
+		if err != nil {
+			var zero T
+			return zero, -1, err
+		}
+
+		if isLess {
+			mIn = item
+			index = i
+		}
+	}
+
+	return mIn, index, nil
+}
+
+// Earliest search the minimum time.Time of a collection.
+// Returns zero value when the collection is empty.
+func Earliest(times ...time.Time) time.Time {
+	var mIn time.Time
+
+	if len(times) == 0 {
+		return mIn
+	}
+
+	mIn = times[0]
+
+	for i := 1; i < len(times); i++ {
+		item := times[i]
+
+		if item.Before(mIn) {
+			mIn = item
+		}
+	}
+
+	return mIn
+}
+
+// EarliestBy search the minimum time.Time of a collection using the given iteratee function.
+// Returns zero value when the collection is empty.
+func EarliestBy[T any](collection []T, iteratee func(item T) time.Time) T {
+	var earliest T
+
+	if len(collection) == 0 {
+		return earliest
+	}
+
+	earliest = collection[0]
+	earliestTime := iteratee(collection[0])
+
+	for i := 1; i < len(collection); i++ {
+		itemTime := iteratee(collection[i])
+
+		if itemTime.Before(earliestTime) {
+			earliest = collection[i]
+			earliestTime = itemTime
+		}
+	}
+
+	return earliest
+}
+
+// EarliestByErr search the minimum time.Time of a collection using the given iteratee function.
+// Returns zero value and nil error when the collection is empty.
+// If the iteratee returns an error, iteration stops and the error is returned.
+func EarliestByErr[T any](collection []T, iteratee func(item T) (time.Time, error)) (T, error) {
+	var earliest T
+
+	if len(collection) == 0 {
+		return earliest, nil
+	}
+
+	earliestTime, err := iteratee(collection[0])
+	if err != nil {
+		return earliest, err
+	}
+	earliest = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		itemTime, err := iteratee(collection[i])
+		if err != nil {
+			return earliest, err
+		}
+
+		if itemTime.Before(earliestTime) {
+			earliest = collection[i]
+			earliestTime = itemTime
+		}
+	}
+
+	return earliest, nil
 }
 
 // Max searches the maximum value of a collection.
+// Returns zero value when the collection is empty.
+// Play: https://go.dev/play/p/r6e-Z8JozS8
 func Max[T constraints.Ordered](collection []T) T {
-	var max T
+	var mAx T
 
 	if len(collection) == 0 {
-		return max
+		return mAx
 	}
 
-	max = collection[0]
+	mAx = collection[0]
 
 	for i := 1; i < len(collection); i++ {
 		item := collection[i]
 
-		if item > max {
-			max = item
+		if item > mAx {
+			mAx = item
 		}
 	}
 
-	return max
+	return mAx
+}
+
+// MaxIndex searches the maximum value of a collection and the index of the maximum value.
+// Returns (zero value, -1) when the collection is empty.
+func MaxIndex[T constraints.Ordered](collection []T) (T, int) {
+	var (
+		mAx   T
+		index int
+	)
+
+	if len(collection) == 0 {
+		return mAx, -1
+	}
+
+	mAx = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		if item > mAx {
+			mAx = item
+			index = i
+		}
+	}
+
+	return mAx, index
 }
 
 // MaxBy search the maximum value of a collection using the given comparison function.
 // If several values of the collection are equal to the greatest value, returns the first such value.
-func MaxBy[T any](collection []T, comparison func(T, T) bool) T {
-	var max T
+// Returns zero value when the collection is empty.
+//
+// Note: the comparison function is inconsistent with most languages, since we use the opposite of the usual convention.
+// See https://github.com/samber/lo/issues/129
+//
+// Play: https://go.dev/play/p/JW1qu-ECwF7
+func MaxBy[T any](collection []T, greater func(a, b T) bool) T {
+	var mAx T
 
 	if len(collection) == 0 {
-		return max
+		return mAx
 	}
 
-	max = collection[0]
+	mAx = collection[0]
 
 	for i := 1; i < len(collection); i++ {
 		item := collection[i]
 
-		if comparison(item, max) {
-			max = item
+		if greater(item, mAx) {
+			mAx = item
 		}
 	}
 
-	return max
+	return mAx
 }
 
-// Last returns the last element of a collection or error if empty.
-func Last[T any](collection []T) (T, error) {
+// MaxByErr search the maximum value of a collection using the given comparison function.
+// If several values of the collection are equal to the greatest value, returns the first such value.
+// Returns zero value and nil error when the collection is empty.
+// If the comparison function returns an error, iteration stops and the error is returned.
+//
+// Note: the comparison function is inconsistent with most languages, since we use the opposite of the usual convention.
+// See https://github.com/samber/lo/issues/129
+func MaxByErr[T any](collection []T, greater func(a, b T) (bool, error)) (T, error) {
+	var mAx T
+
+	if len(collection) == 0 {
+		return mAx, nil
+	}
+
+	mAx = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		isGreater, err := greater(item, mAx)
+		if err != nil {
+			return mAx, err
+		}
+		if isGreater {
+			mAx = item
+		}
+	}
+
+	return mAx, nil
+}
+
+// MaxIndexBy search the maximum value of a collection using the given comparison function and the index of the maximum value.
+// If several values of the collection are equal to the greatest value, returns the first such value.
+// Returns (zero value, -1) when the collection is empty.
+//
+// Note: the comparison function is inconsistent with most languages, since we use the opposite of the usual convention.
+// See https://github.com/samber/lo/issues/129
+//
+// Play: https://go.dev/play/p/uaUszc-c9QK
+func MaxIndexBy[T any](collection []T, greater func(a, b T) bool) (T, int) {
+	var (
+		mAx   T
+		index int
+	)
+
+	if len(collection) == 0 {
+		return mAx, -1
+	}
+
+	mAx = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		if greater(item, mAx) {
+			mAx = item
+			index = i
+		}
+	}
+
+	return mAx, index
+}
+
+// MaxIndexByErr search the maximum value of a collection using the given comparison function and the index of the maximum value.
+// If several values of the collection are equal to the greatest value, returns the first such value.
+// Returns (zero value, -1, nil) when the collection is empty.
+// If the comparison function returns an error, iteration stops and the error is returned.
+//
+// Note: the comparison function is inconsistent with most languages, since we use the opposite of the usual convention.
+// See https://github.com/samber/lo/issues/129
+func MaxIndexByErr[T any](collection []T, greater func(a, b T) (bool, error)) (T, int, error) {
+	var (
+		mAx   T
+		index int
+	)
+
+	if len(collection) == 0 {
+		return mAx, -1, nil
+	}
+
+	mAx = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		item := collection[i]
+
+		isGreater, err := greater(item, mAx)
+		if err != nil {
+			var zero T
+			return zero, -1, err
+		}
+		if isGreater {
+			mAx = item
+			index = i
+		}
+	}
+
+	return mAx, index, nil
+}
+
+// Latest search the maximum time.Time of a collection.
+// Returns zero value when the collection is empty.
+func Latest(times ...time.Time) time.Time {
+	var mAx time.Time
+
+	if len(times) == 0 {
+		return mAx
+	}
+
+	mAx = times[0]
+
+	for i := 1; i < len(times); i++ {
+		item := times[i]
+
+		if item.After(mAx) {
+			mAx = item
+		}
+	}
+
+	return mAx
+}
+
+// LatestBy search the maximum time.Time of a collection using the given iteratee function.
+// Returns zero value when the collection is empty.
+func LatestBy[T any](collection []T, iteratee func(item T) time.Time) T {
+	var latest T
+
+	if len(collection) == 0 {
+		return latest
+	}
+
+	latest = collection[0]
+	latestTime := iteratee(collection[0])
+
+	for i := 1; i < len(collection); i++ {
+		itemTime := iteratee(collection[i])
+
+		if itemTime.After(latestTime) {
+			latest = collection[i]
+			latestTime = itemTime
+		}
+	}
+
+	return latest
+}
+
+// LatestByErr search the maximum time.Time of a collection using the given iteratee function.
+// Returns zero value and nil error when the collection is empty.
+// If the iteratee returns an error, iteration stops and the error is returned.
+func LatestByErr[T any](collection []T, iteratee func(item T) (time.Time, error)) (T, error) {
+	var latest T
+
+	if len(collection) == 0 {
+		return latest, nil
+	}
+
+	latestTime, err := iteratee(collection[0])
+	if err != nil {
+		return latest, err
+	}
+	latest = collection[0]
+
+	for i := 1; i < len(collection); i++ {
+		itemTime, err := iteratee(collection[i])
+		if err != nil {
+			return latest, err
+		}
+
+		if itemTime.After(latestTime) {
+			latest = collection[i]
+			latestTime = itemTime
+		}
+	}
+
+	return latest, nil
+}
+
+// First returns the first element of a collection and check for availability of the first element.
+// Play: https://go.dev/play/p/ul45Z0y2EFO
+func First[T any](collection []T) (T, bool) {
 	length := len(collection)
 
 	if length == 0 {
 		var t T
-		return t, fmt.Errorf("last: cannot extract the last element of an empty slice")
+		return t, false
 	}
 
-	return collection[length-1], nil
+	return collection[0], true
+}
+
+// FirstOrEmpty returns the first element of a collection or zero value if empty.
+// Play: https://go.dev/play/p/ul45Z0y2EFO
+func FirstOrEmpty[T any](collection []T) T {
+	i, _ := First(collection)
+	return i
+}
+
+// FirstOr returns the first element of a collection or the fallback value if empty.
+// Play: https://go.dev/play/p/ul45Z0y2EFO
+func FirstOr[T any](collection []T, fallback T) T {
+	i, ok := First(collection)
+	if !ok {
+		return fallback
+	}
+
+	return i
+}
+
+// Last returns the last element of a collection or error if empty.
+// Play: https://go.dev/play/p/ul45Z0y2EFO
+func Last[T any](collection []T) (T, bool) {
+	length := len(collection)
+
+	if length == 0 {
+		var t T
+		return t, false
+	}
+
+	return collection[length-1], true
+}
+
+// LastOrEmpty returns the last element of a collection or zero value if empty.
+// Play: https://go.dev/play/p/ul45Z0y2EFO
+func LastOrEmpty[T any](collection []T) T {
+	i, _ := Last(collection)
+	return i
+}
+
+// LastOr returns the last element of a collection or the fallback value if empty.
+// Play: https://go.dev/play/p/ul45Z0y2EFO
+func LastOr[T any](collection []T, fallback T) T {
+	i, ok := Last(collection)
+	if !ok {
+		return fallback
+	}
+
+	return i
 }
 
 // Nth returns the element at index `nth` of collection. If `nth` is negative, the nth element
 // from the end is returned. An error is returned when nth is out of slice bounds.
+// Play: https://go.dev/play/p/sHoh88KWt6B
 func Nth[T any, N constraints.Integer](collection []T, nth N) (T, error) {
+	value, ok := sliceNth(collection, nth)
+
+	return value, Validate(ok, "nth: %d out of slice bounds", nth)
+}
+
+func sliceNth[T any, N constraints.Integer](collection []T, nth N) (T, bool) {
 	n := int(nth)
 	l := len(collection)
 	if n >= l || -n > l {
-		var t T
-		return t, fmt.Errorf("nth: %d out of slice bounds", n)
+		return Empty[T](), false
 	}
 
 	if n >= 0 {
-		return collection[n], nil
+		return collection[n], true
 	}
-	return collection[l+n], nil
+	return collection[l+n], true
 }
 
+// NthOr returns the element at index `nth` of collection.
+// If `nth` is negative, it returns the nth element from the end.
+// If `nth` is out of slice bounds, it returns the fallback value instead of an error.
+// Play: https://go.dev/play/p/sHoh88KWt6B
+func NthOr[T any, N constraints.Integer](collection []T, nth N, fallback T) T {
+	value, ok := sliceNth(collection, nth)
+	if !ok {
+		return fallback
+	}
+	return value
+}
+
+// NthOrEmpty returns the element at index `nth` of collection.
+// If `nth` is negative, it returns the nth element from the end.
+// If `nth` is out of slice bounds, it returns the zero value (empty value) for that type.
+// Play: https://go.dev/play/p/sHoh88KWt6B
+func NthOrEmpty[T any, N constraints.Integer](collection []T, nth N) T {
+	value, _ := sliceNth(collection, nth)
+	return value
+}
+
+// randomIntGenerator is a function that should return a random integer in the range [0, n)
+// where n is the argument passed to the randomIntGenerator.
+type randomIntGenerator func(n int) int
+
 // Sample returns a random item from collection.
+// Play: https://go.dev/play/p/vCcSJbh5s6l
 func Sample[T any](collection []T) T {
+	return SampleBy(collection, xrand.IntN)
+}
+
+// SampleBy returns a random item from collection, using randomIntGenerator as the random index generator.
+// Play: https://go.dev/play/p/HDmKmMgq0XN
+func SampleBy[T any](collection []T, randomIntGenerator randomIntGenerator) T {
 	size := len(collection)
 	if size == 0 {
 		return Empty[T]()
 	}
-
-	return collection[rand.Intn(size)]
+	return collection[randomIntGenerator(size)]
 }
 
 // Samples returns N random unique items from collection.
-func Samples[T any](collection []T, count int) []T {
+// Play: https://go.dev/play/p/vCcSJbh5s6l
+func Samples[T any, Slice ~[]T](collection Slice, count int) Slice {
+	return SamplesBy(collection, count, xrand.IntN)
+}
+
+// SamplesBy returns N random unique items from collection, using randomIntGenerator as the random index generator.
+// Play: https://go.dev/play/p/HDmKmMgq0XN
+func SamplesBy[T any, Slice ~[]T](collection Slice, count int, randomIntGenerator randomIntGenerator) Slice {
+	if count <= 0 {
+		return Slice{}
+	}
+
 	size := len(collection)
 
-	cOpy := append([]T{}, collection...)
+	if size < count {
+		count = size
+	}
 
-	results := []T{}
+	indexes := Range(size)
+	results := make(Slice, count)
 
-	for i := 0; i < size && i < count; i++ {
-		copyLength := size - i
+	for i := range results {
+		n := len(indexes)
 
-		index := rand.Intn(size - i)
-		results = append(results, cOpy[index])
+		index := randomIntGenerator(n)
+		results[i] = collection[indexes[index]]
 
-		// Removes element.
+		// Removes index.
 		// It is faster to swap with last element and remove it.
-		cOpy[index] = cOpy[copyLength-1]
-		cOpy = cOpy[:copyLength-1]
+		indexes[index] = indexes[n-1]
+		indexes = indexes[:n-1]
 	}
 
 	return results
diff --git a/vendor/github.com/samber/lo/func.go b/vendor/github.com/samber/lo/func.go
index 90afc9ac2..c1e9c93bd 100644
--- a/vendor/github.com/samber/lo/func.go
+++ b/vendor/github.com/samber/lo/func.go
@@ -1,8 +1,47 @@
 package lo
 
 // Partial returns new function that, when called, has its first argument set to the provided value.
-func Partial[T1, T2, R any](f func(T1, T2) R, arg1 T1) func(T2) R {
+// Play: https://go.dev/play/p/Sy1gAQiQZ3v
+func Partial[T1, T2, R any](f func(a T1, b T2) R, arg1 T1) func(T2) R {
 	return func(t2 T2) R {
 		return f(arg1, t2)
 	}
 }
+
+// Partial1 returns new function that, when called, has its first argument set to the provided value.
+// Play: https://go.dev/play/p/D-ASTXCLBzw
+func Partial1[T1, T2, R any](f func(T1, T2) R, arg1 T1) func(T2) R {
+	return Partial(f, arg1)
+}
+
+// Partial2 returns new function that, when called, has its first argument set to the provided value.
+// Play: https://go.dev/play/p/-xiPjy4JChJ
+func Partial2[T1, T2, T3, R any](f func(T1, T2, T3) R, arg1 T1) func(T2, T3) R {
+	return func(t2 T2, t3 T3) R {
+		return f(arg1, t2, t3)
+	}
+}
+
+// Partial3 returns new function that, when called, has its first argument set to the provided value.
+// Play: https://go.dev/play/p/zWtSutpI26m
+func Partial3[T1, T2, T3, T4, R any](f func(T1, T2, T3, T4) R, arg1 T1) func(T2, T3, T4) R {
+	return func(t2 T2, t3 T3, t4 T4) R {
+		return f(arg1, t2, t3, t4)
+	}
+}
+
+// Partial4 returns new function that, when called, has its first argument set to the provided value.
+// Play: https://go.dev/play/p/kBrnnMTcJm0
+func Partial4[T1, T2, T3, T4, T5, R any](f func(T1, T2, T3, T4, T5) R, arg1 T1) func(T2, T3, T4, T5) R {
+	return func(t2 T2, t3 T3, t4 T4, t5 T5) R {
+		return f(arg1, t2, t3, t4, t5)
+	}
+}
+
+// Partial5 returns new function that, when called, has its first argument set to the provided value.
+// Play: https://go.dev/play/p/7Is7K2y_VC3
+func Partial5[T1, T2, T3, T4, T5, T6, R any](f func(T1, T2, T3, T4, T5, T6) R, arg1 T1) func(T2, T3, T4, T5, T6) R {
+	return func(t2 T2, t3 T3, t4 T4, t5 T5, t6 T6) R {
+		return f(arg1, t2, t3, t4, t5, t6)
+	}
+}
diff --git a/vendor/github.com/samber/lo/internal/constraints/README.md b/vendor/github.com/samber/lo/internal/constraints/README.md
new file mode 100644
index 000000000..27a3b1c49
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/constraints/README.md
@@ -0,0 +1,4 @@
+
+# Constraints
+
+This package is for Go 1.18 retrocompatiblity purpose.
diff --git a/vendor/github.com/samber/lo/internal/constraints/constraints.go b/vendor/github.com/samber/lo/internal/constraints/constraints.go
new file mode 100644
index 000000000..3eb1cda55
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/constraints/constraints.go
@@ -0,0 +1,42 @@
+// Copyright 2021 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package constraints defines a set of useful constraints to be used
+// with type parameters.
+package constraints
+
+// Signed is a constraint that permits any signed integer type.
+// If future releases of Go add new predeclared signed integer types,
+// this constraint will be modified to include them.
+type Signed interface {
+	~int | ~int8 | ~int16 | ~int32 | ~int64
+}
+
+// Unsigned is a constraint that permits any unsigned integer type.
+// If future releases of Go add new predeclared unsigned integer types,
+// this constraint will be modified to include them.
+type Unsigned interface {
+	~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr
+}
+
+// Integer is a constraint that permits any integer type.
+// If future releases of Go add new predeclared integer types,
+// this constraint will be modified to include them.
+type Integer interface {
+	Signed | Unsigned
+}
+
+// Float is a constraint that permits any floating-point type.
+// If future releases of Go add new predeclared floating-point types,
+// this constraint will be modified to include them.
+type Float interface {
+	~float32 | ~float64
+}
+
+// Complex is a constraint that permits any complex numeric type.
+// If future releases of Go add new predeclared complex numeric types,
+// this constraint will be modified to include them.
+type Complex interface {
+	~complex64 | ~complex128
+}
diff --git a/vendor/github.com/samber/lo/internal/constraints/ordered_go118.go b/vendor/github.com/samber/lo/internal/constraints/ordered_go118.go
new file mode 100644
index 000000000..a124366fd
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/constraints/ordered_go118.go
@@ -0,0 +1,11 @@
+//go:build !go1.21
+
+package constraints
+
+// Ordered is a constraint that permits any ordered type: any type
+// that supports the operators < <= >= >.
+// If future releases of Go add new ordered types,
+// this constraint will be modified to include them.
+type Ordered interface {
+	Integer | Float | ~string
+}
diff --git a/vendor/github.com/samber/lo/internal/constraints/ordered_go121.go b/vendor/github.com/samber/lo/internal/constraints/ordered_go121.go
new file mode 100644
index 000000000..085a74364
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/constraints/ordered_go121.go
@@ -0,0 +1,13 @@
+//go:build go1.21
+
+package constraints
+
+import (
+	"cmp"
+)
+
+// Ordered is a constraint that permits any ordered type: any type
+// that supports the operators < <= >= >.
+// If future releases of Go add new ordered types,
+// this constraint will be modified to include them.
+type Ordered = cmp.Ordered
diff --git a/vendor/github.com/samber/lo/internal/xrand/ordered_go118.go b/vendor/github.com/samber/lo/internal/xrand/ordered_go118.go
new file mode 100644
index 000000000..410a5f342
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xrand/ordered_go118.go
@@ -0,0 +1,32 @@
+//go:build !go1.22
+
+package xrand
+
+import "math/rand"
+
+// Shuffle returns a slice of shuffled values. Uses the Fisher-Yates shuffle algorithm.
+func Shuffle(n int, swap func(i, j int)) {
+	rand.Shuffle(n, swap)
+}
+
+// IntN returns, as an int, a pseudo-random number in the half-open interval [0,n)
+// from the default Source.
+// It panics if n <= 0.
+func IntN(n int) int {
+	// bearer:disable go_gosec_crypto_weak_random
+	return rand.Intn(n)
+}
+
+// Int64 returns a non-negative pseudo-random 63-bit integer as an int64
+// from the default Source.
+func Int64() int64 {
+	// bearer:disable go_gosec_crypto_weak_random
+	n := rand.Int63()
+
+	// bearer:disable go_gosec_crypto_weak_random
+	if rand.Intn(2) == 0 {
+		return -n
+	}
+
+	return n
+}
diff --git a/vendor/github.com/samber/lo/internal/xrand/ordered_go122.go b/vendor/github.com/samber/lo/internal/xrand/ordered_go122.go
new file mode 100644
index 000000000..6bca250e2
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xrand/ordered_go122.go
@@ -0,0 +1,23 @@
+//go:build go1.22
+
+package xrand
+
+import "math/rand/v2"
+
+// Shuffle returns a slice of shuffled values. Uses the Fisher-Yates shuffle algorithm.
+func Shuffle(n int, swap func(i, j int)) {
+	rand.Shuffle(n, swap)
+}
+
+// IntN returns, as an int, a pseudo-random number in the half-open interval [0,n)
+// from the default Source.
+// It panics if n <= 0.
+func IntN(n int) int {
+	return rand.IntN(n)
+}
+
+// Int64 returns a non-negative pseudo-random 63-bit integer as an int64
+// from the default Source.
+func Int64() int64 {
+	return rand.Int64()
+}
diff --git a/vendor/github.com/samber/lo/internal/xtime/README.md b/vendor/github.com/samber/lo/internal/xtime/README.md
new file mode 100644
index 000000000..73acd1e5f
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xtime/README.md
@@ -0,0 +1,6 @@
+
+# xtime
+
+Lightweight mock for time package.
+
+A dedicated package such as [jonboulle/clockwork](https://github.com/jonboulle/clockwork/) would be better, but I would rather limit dependencies for this package. `clockwork` does not support Go 1.18 anymore.
diff --git a/vendor/github.com/samber/lo/internal/xtime/fake.go b/vendor/github.com/samber/lo/internal/xtime/fake.go
new file mode 100644
index 000000000..380e238ac
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xtime/fake.go
@@ -0,0 +1,40 @@
+//nolint:revive
+package xtime
+
+import (
+	"time"
+)
+
+func NewFakeClock() *FakeClock {
+	return NewFakeClockAt(time.Now())
+}
+
+func NewFakeClockAt(t time.Time) *FakeClock {
+	return &FakeClock{
+		time: t,
+	}
+}
+
+type FakeClock struct {
+	_ noCopy
+
+	// Not protected by a mutex. If a warning is thrown in your tests,
+	// just disable parallel tests.
+	time time.Time
+}
+
+func (c *FakeClock) Now() time.Time {
+	return c.time
+}
+
+func (c *FakeClock) Since(t time.Time) time.Duration {
+	return c.time.Sub(t)
+}
+
+func (c *FakeClock) Until(t time.Time) time.Duration {
+	return t.Sub(c.time)
+}
+
+func (c *FakeClock) Sleep(d time.Duration) {
+	c.time = c.time.Add(d)
+}
diff --git a/vendor/github.com/samber/lo/internal/xtime/noCopy.go b/vendor/github.com/samber/lo/internal/xtime/noCopy.go
new file mode 100644
index 000000000..9d425adf7
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xtime/noCopy.go
@@ -0,0 +1,14 @@
+package xtime
+
+// noCopy may be added to structs which must not be copied
+// after the first use.
+//
+// See https://golang.org/issues/8005#issuecomment-190753527
+// for details.
+//
+// Note that it must not be embedded, due to the Lock and Unlock methods.
+type noCopy struct{}
+
+// Lock is a no-op used by -copylocks checker from `go vet`.
+func (*noCopy) Lock()   {}
+func (*noCopy) Unlock() {}
diff --git a/vendor/github.com/samber/lo/internal/xtime/real.go b/vendor/github.com/samber/lo/internal/xtime/real.go
new file mode 100644
index 000000000..df5a8dbde
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xtime/real.go
@@ -0,0 +1,30 @@
+//nolint:revive
+package xtime
+
+import (
+	"time"
+)
+
+func NewRealClock() *RealClock {
+	return &RealClock{}
+}
+
+type RealClock struct {
+	_ noCopy
+}
+
+func (c *RealClock) Now() time.Time {
+	return time.Now()
+}
+
+func (c *RealClock) Since(t time.Time) time.Duration {
+	return time.Since(t)
+}
+
+func (c *RealClock) Until(t time.Time) time.Duration {
+	return time.Until(t)
+}
+
+func (c *RealClock) Sleep(d time.Duration) {
+	time.Sleep(d)
+}
diff --git a/vendor/github.com/samber/lo/internal/xtime/time.go b/vendor/github.com/samber/lo/internal/xtime/time.go
new file mode 100644
index 000000000..093a959ec
--- /dev/null
+++ b/vendor/github.com/samber/lo/internal/xtime/time.go
@@ -0,0 +1,33 @@
+//nolint:revive
+package xtime
+
+import "time"
+
+var clock Clock = &RealClock{}
+
+func SetClock(c Clock) {
+	clock = c
+}
+
+func Now() time.Time {
+	return clock.Now()
+}
+
+func Since(t time.Time) time.Duration {
+	return clock.Since(t)
+}
+
+func Until(t time.Time) time.Duration {
+	return clock.Until(t)
+}
+
+func Sleep(d time.Duration) {
+	clock.Sleep(d)
+}
+
+type Clock interface {
+	Now() time.Time
+	Since(t time.Time) time.Duration
+	Until(t time.Time) time.Duration
+	Sleep(d time.Duration)
+}
diff --git a/vendor/github.com/samber/lo/intersect.go b/vendor/github.com/samber/lo/intersect.go
index 169cc2cf8..469cbbbf3 100644
--- a/vendor/github.com/samber/lo/intersect.go
+++ b/vendor/github.com/samber/lo/intersect.go
@@ -1,9 +1,10 @@
 package lo
 
 // Contains returns true if an element is present in a collection.
+// Play: https://go.dev/play/p/W1EvyqY6t9j
 func Contains[T comparable](collection []T, element T) bool {
-	for _, item := range collection {
-		if item == element {
+	for i := range collection {
+		if collection[i] == element {
 			return true
 		}
 	}
@@ -12,9 +13,10 @@ func Contains[T comparable](collection []T, element T) bool {
 }
 
 // ContainsBy returns true if predicate function return true.
-func ContainsBy[T any](collection []T, predicate func(T) bool) bool {
-	for _, item := range collection {
-		if predicate(item) {
+// Play: https://go.dev/play/p/W1EvyqY6t9j
+func ContainsBy[T any](collection []T, predicate func(item T) bool) bool {
+	for i := range collection {
+		if predicate(collection[i]) {
 			return true
 		}
 	}
@@ -22,10 +24,17 @@ func ContainsBy[T any](collection []T, predicate func(T) bool) bool {
 	return false
 }
 
-// Every returns true if all elements of a subset are contained into a collection or if the subset is empty.
-func Every[T comparable](collection []T, subset []T) bool {
-	for _, elem := range subset {
-		if !Contains(collection, elem) {
+// Every returns true if all elements of a subset are contained in a collection or if the subset is empty.
+// Play: https://go.dev/play/p/W1EvyqY6t9j
+func Every[T comparable](collection, subset []T) bool {
+	if len(subset) == 0 {
+		return true
+	}
+
+	seen := Keyify(collection)
+
+	for _, item := range subset {
+		if _, ok := seen[item]; !ok {
 			return false
 		}
 	}
@@ -33,10 +42,11 @@ func Every[T comparable](collection []T, subset []T) bool {
 	return true
 }
 
-// EveryBy returns true if the predicate returns true for all of the elements in the collection or if the collection is empty.
-func EveryBy[V any](collection []V, predicate func(V) bool) bool {
-	for _, v := range collection {
-		if !predicate(v) {
+// EveryBy returns true if the predicate returns true for all elements in the collection or if the collection is empty.
+// Play: https://go.dev/play/p/dn1-vhHsq9x
+func EveryBy[T any](collection []T, predicate func(item T) bool) bool {
+	for i := range collection {
+		if !predicate(collection[i]) {
 			return false
 		}
 	}
@@ -44,11 +54,17 @@ func EveryBy[V any](collection []V, predicate func(V) bool) bool {
 	return true
 }
 
-// Some returns true if at least 1 element of a subset is contained into a collection.
+// Some returns true if at least 1 element of a subset is contained in a collection.
 // If the subset is empty Some returns false.
-func Some[T comparable](collection []T, subset []T) bool {
-	for _, elem := range subset {
-		if Contains(collection, elem) {
+// Play: https://go.dev/play/p/Lj4ceFkeT9V
+func Some[T comparable](collection, subset []T) bool {
+	if len(subset) == 0 {
+		return false
+	}
+
+	seen := Keyify(subset)
+	for i := range collection {
+		if _, ok := seen[collection[i]]; ok {
 			return true
 		}
 	}
@@ -58,9 +74,10 @@ func Some[T comparable](collection []T, subset []T) bool {
 
 // SomeBy returns true if the predicate returns true for any of the elements in the collection.
 // If the collection is empty SomeBy returns false.
-func SomeBy[V any](collection []V, predicate func(V) bool) bool {
-	for _, v := range collection {
-		if predicate(v) {
+// Play: https://go.dev/play/p/DXF-TORBudx
+func SomeBy[T any](collection []T, predicate func(item T) bool) bool {
+	for i := range collection {
+		if predicate(collection[i]) {
 			return true
 		}
 	}
@@ -68,10 +85,16 @@ func SomeBy[V any](collection []V, predicate func(V) bool) bool {
 	return false
 }
 
-// None returns true if no element of a subset are contained into a collection or if the subset is empty.
-func None[V comparable](collection []V, subset []V) bool {
-	for _, elem := range subset {
-		if Contains(collection, elem) {
+// None returns true if no element of a subset is contained in a collection or if the subset is empty.
+// Play: https://go.dev/play/p/fye7JsmxzPV
+func None[T comparable](collection, subset []T) bool {
+	if len(subset) == 0 {
+		return true
+	}
+
+	seen := Keyify(subset)
+	for i := range collection {
+		if _, ok := seen[collection[i]]; ok {
 			return false
 		}
 	}
@@ -80,9 +103,10 @@ func None[V comparable](collection []V, subset []V) bool {
 }
 
 // NoneBy returns true if the predicate returns true for none of the elements in the collection or if the collection is empty.
-func NoneBy[V any](collection []V, predicate func(V) bool) bool {
-	for _, v := range collection {
-		if predicate(v) {
+// Play: https://go.dev/play/p/O64WZ32H58S
+func NoneBy[T any](collection []T, predicate func(item T) bool) bool {
+	for i := range collection {
+		if predicate(collection[i]) {
 			return false
 		}
 	}
@@ -90,18 +114,88 @@ func NoneBy[V any](collection []V, predicate func(V) bool) bool {
 	return true
 }
 
-// Intersect returns the intersection between two collections.
-func Intersect[T comparable](list1 []T, list2 []T) []T {
-	result := []T{}
-	seen := map[T]struct{}{}
-
-	for _, elem := range list1 {
-		seen[elem] = struct{}{}
+// Intersect returns the intersection between collections.
+// Play: https://go.dev/play/p/uuElL9X9e58
+func Intersect[T comparable, Slice ~[]T](lists ...Slice) Slice {
+	if len(lists) == 0 {
+		return Slice{}
 	}
 
-	for _, elem := range list2 {
-		if _, ok := seen[elem]; ok {
-			result = append(result, elem)
+	last := lists[len(lists)-1]
+
+	seen := make(map[T]bool, len(last))
+
+	for _, item := range last {
+		seen[item] = false
+	}
+
+	for i := len(lists) - 2; i > 0 && len(seen) != 0; i-- {
+		for _, item := range lists[i] {
+			if _, ok := seen[item]; ok {
+				seen[item] = true
+			}
+		}
+
+		for k, v := range seen {
+			if v {
+				seen[k] = false
+			} else {
+				delete(seen, k)
+			}
+		}
+	}
+
+	result := make(Slice, 0, len(seen))
+
+	for _, item := range lists[0] {
+		if _, ok := seen[item]; ok {
+			result = append(result, item)
+			delete(seen, item)
+		}
+	}
+
+	return result
+}
+
+// IntersectBy returns the intersection between two collections using a custom key selector function.
+func IntersectBy[T any, K comparable, Slice ~[]T](transform func(T) K, lists ...Slice) Slice {
+	if len(lists) == 0 {
+		return Slice{}
+	}
+
+	last := lists[len(lists)-1]
+
+	seen := make(map[K]bool, len(last))
+
+	for _, item := range last {
+		k := transform(item)
+		seen[k] = false
+	}
+
+	for i := len(lists) - 2; i > 0 && len(seen) != 0; i-- {
+		for _, item := range lists[i] {
+			k := transform(item)
+			if _, ok := seen[k]; ok {
+				seen[k] = true
+			}
+		}
+
+		for k, v := range seen {
+			if v {
+				seen[k] = false
+			} else {
+				delete(seen, k)
+			}
+		}
+	}
+
+	result := make(Slice, 0, len(seen))
+
+	for _, item := range lists[0] {
+		k := transform(item)
+		if _, ok := seen[k]; ok {
+			result = append(result, item)
+			delete(seen, k)
 		}
 	}
 
@@ -109,94 +203,161 @@ func Intersect[T comparable](list1 []T, list2 []T) []T {
 }
 
 // Difference returns the difference between two collections.
-// The first value is the collection of element absent of list2.
-// The second value is the collection of element absent of list1.
-func Difference[T comparable](list1 []T, list2 []T) ([]T, []T) {
-	left := []T{}
-	right := []T{}
+// The first value is the collection of elements absent from list2.
+// The second value is the collection of elements absent from list1.
+// Play: https://go.dev/play/p/pKE-JgzqRpz
+func Difference[T comparable, Slice ~[]T](list1, list2 Slice) (Slice, Slice) {
+	left := Slice{}
+	right := Slice{}
 
-	seenLeft := map[T]struct{}{}
-	seenRight := map[T]struct{}{}
+	seenLeft := Keyify(list1)
+	seenRight := Keyify(list2)
 
-	for _, elem := range list1 {
-		seenLeft[elem] = struct{}{}
-	}
-
-	for _, elem := range list2 {
-		seenRight[elem] = struct{}{}
-	}
-
-	for _, elem := range list1 {
-		if _, ok := seenRight[elem]; !ok {
-			left = append(left, elem)
+	for i := range list1 {
+		if _, ok := seenRight[list1[i]]; !ok {
+			left = append(left, list1[i])
 		}
 	}
 
-	for _, elem := range list2 {
-		if _, ok := seenLeft[elem]; !ok {
-			right = append(right, elem)
+	for i := range list2 {
+		if _, ok := seenLeft[list2[i]]; !ok {
+			right = append(right, list2[i])
 		}
 	}
 
 	return left, right
 }
 
-// Union returns all distinct elements from both collections.
+// Union returns all distinct elements from given collections.
 // result returns will not change the order of elements relatively.
-func Union[T comparable](list1 []T, list2 []T) []T {
-	result := []T{}
+// Play: https://go.dev/play/p/DI9RVEB_qMK
+func Union[T comparable, Slice ~[]T](lists ...Slice) Slice {
+	var capLen int
 
-	seen := map[T]struct{}{}
-	hasAdd := map[T]struct{}{}
-
-	for _, e := range list1 {
-		seen[e] = struct{}{}
+	for _, list := range lists {
+		capLen += len(list)
 	}
 
-	for _, e := range list2 {
-		seen[e] = struct{}{}
-	}
+	result := make(Slice, 0, capLen)
+	seen := make(map[T]struct{}, capLen)
 
-	for _, e := range list1 {
-		if _, ok := seen[e]; ok {
-			result = append(result, e)
-			hasAdd[e] = struct{}{}
-		}
-	}
-
-	for _, e := range list2 {
-		if _, ok := hasAdd[e]; ok {
-			continue
-		}
-		if _, ok := seen[e]; ok {
-			result = append(result, e)
+	for i := range lists {
+		for j := range lists[i] {
+			if _, ok := seen[lists[i][j]]; !ok {
+				seen[lists[i][j]] = struct{}{}
+				result = append(result, lists[i][j])
+			}
 		}
 	}
 
 	return result
 }
 
-// Without returns slice excluding all given values.
-func Without[T comparable](collection []T, exclude ...T) []T {
-	result := make([]T, 0, len(collection))
-	for _, e := range collection {
-		if !Contains(exclude, e) {
-			result = append(result, e)
+// Without returns a slice excluding all given values.
+// Play: https://go.dev/play/p/5j30Ux8TaD0
+func Without[T comparable, Slice ~[]T](collection Slice, exclude ...T) Slice {
+	excludeMap := Keyify(exclude)
+
+	result := make(Slice, 0, len(collection))
+	for i := range collection {
+		if _, ok := excludeMap[collection[i]]; !ok {
+			result = append(result, collection[i])
 		}
 	}
 	return result
 }
 
-// WithoutEmpty returns slice excluding empty values.
-func WithoutEmpty[T comparable](collection []T) []T {
-	var empty T
+// WithoutBy filters a slice by excluding elements whose extracted keys match any in the exclude list.
+// Returns a new slice containing only the elements whose keys are not in the exclude list.
+// Play: https://go.dev/play/p/VgWJOF01NbJ
+func WithoutBy[T any, K comparable, Slice ~[]T](collection Slice, iteratee func(item T) K, exclude ...K) Slice {
+	excludeMap := Keyify(exclude)
 
-	result := make([]T, 0, len(collection))
-	for _, e := range collection {
-		if e != empty {
-			result = append(result, e)
+	result := make(Slice, 0, len(collection))
+	for _, item := range collection {
+		if _, ok := excludeMap[iteratee(item)]; !ok {
+			result = append(result, item)
+		}
+	}
+	return result
+}
+
+// WithoutByErr filters a slice by excluding elements whose extracted keys match any in the exclude list.
+// It returns the first error returned by the iteratee.
+func WithoutByErr[T any, K comparable, Slice ~[]T](collection Slice, iteratee func(item T) (K, error), exclude ...K) (Slice, error) {
+	excludeMap := Keyify(exclude)
+
+	result := make(Slice, 0, len(collection))
+	for _, item := range collection {
+		key, err := iteratee(item)
+		if err != nil {
+			return nil, err
+		}
+		if _, ok := excludeMap[key]; !ok {
+			result = append(result, item)
+		}
+	}
+	return result, nil
+}
+
+// WithoutEmpty returns a slice excluding zero values.
+//
+// Deprecated: Use lo.Compact instead.
+func WithoutEmpty[T comparable, Slice ~[]T](collection Slice) Slice {
+	return Compact(collection)
+}
+
+// WithoutNth returns a slice excluding the nth value.
+// Play: https://go.dev/play/p/5g3F9R2H1xL
+func WithoutNth[T any, Slice ~[]T](collection Slice, nths ...int) Slice {
+	toRemove := Keyify(nths)
+
+	result := make(Slice, 0, len(collection))
+	for i := range collection {
+		if _, ok := toRemove[i]; !ok {
+			result = append(result, collection[i])
 		}
 	}
 
 	return result
 }
+
+// ElementsMatch returns true if lists contain the same set of elements (including empty set).
+// If there are duplicate elements, the number of occurrences in each list should match.
+// The order of elements is not checked.
+// Play: https://go.dev/play/p/XWSEM4Ic_t0
+func ElementsMatch[T comparable, Slice ~[]T](list1, list2 Slice) bool {
+	return ElementsMatchBy(list1, list2, func(item T) T { return item })
+}
+
+// ElementsMatchBy returns true if lists contain the same set of elements' keys (including empty set).
+// If there are duplicate keys, the number of occurrences in each list should match.
+// The order of elements is not checked.
+// Play: https://go.dev/play/p/XWSEM4Ic_t0
+func ElementsMatchBy[T any, K comparable](list1, list2 []T, iteratee func(item T) K) bool {
+	if len(list1) != len(list2) {
+		return false
+	}
+
+	if len(list1) == 0 {
+		return true
+	}
+
+	counters := make(map[K]int, len(list1))
+
+	for _, el := range list1 {
+		counters[iteratee(el)]++
+	}
+
+	for _, el := range list2 {
+		counters[iteratee(el)]--
+	}
+
+	for _, count := range counters {
+		if count != 0 {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/vendor/github.com/samber/lo/map.go b/vendor/github.com/samber/lo/map.go
index 7915e37c3..e5c90e69b 100644
--- a/vendor/github.com/samber/lo/map.go
+++ b/vendor/github.com/samber/lo/map.go
@@ -1,33 +1,109 @@
 package lo
 
-// Keys creates an array of the map keys.
+// Keys creates a slice of the map keys.
 // Play: https://go.dev/play/p/Uu11fHASqrU
-func Keys[K comparable, V any](in map[K]V) []K {
-	result := make([]K, 0, len(in))
+func Keys[K comparable, V any](in ...map[K]V) []K {
+	size := 0
+	for i := range in {
+		size += len(in[i])
+	}
+	result := make([]K, 0, size)
 
-	for k := range in {
-		result = append(result, k)
+	for i := range in {
+		for k := range in[i] {
+			result = append(result, k)
+		}
 	}
 
 	return result
 }
 
-// Values creates an array of the map values.
-// Play: https://go.dev/play/p/nnRTQkzQfF6
-func Values[K comparable, V any](in map[K]V) []V {
-	result := make([]V, 0, len(in))
+// UniqKeys creates a slice of unique keys in the map.
+// Play: https://go.dev/play/p/TPKAb6ILdHk
+func UniqKeys[K comparable, V any](in ...map[K]V) []K {
+	size := 0
+	for i := range in {
+		size += len(in[i])
+	}
 
-	for _, v := range in {
-		result = append(result, v)
+	seen := make(map[K]struct{}, size)
+	result := make([]K, 0)
+
+	for i := range in {
+		for k := range in[i] {
+			if _, exists := seen[k]; exists {
+				continue
+			}
+			seen[k] = struct{}{}
+			result = append(result, k)
+		}
 	}
 
 	return result
 }
 
+// HasKey returns whether the given key exists.
+// Play: https://go.dev/play/p/aVwubIvECqS
+func HasKey[K comparable, V any](in map[K]V, key K) bool {
+	_, ok := in[key]
+	return ok
+}
+
+// Values creates a slice of the map values.
+// Play: https://go.dev/play/p/nnRTQkzQfF6
+func Values[K comparable, V any](in ...map[K]V) []V {
+	size := 0
+	for i := range in {
+		size += len(in[i])
+	}
+	result := make([]V, 0, size)
+
+	for i := range in {
+		for _, v := range in[i] {
+			result = append(result, v)
+		}
+	}
+
+	return result
+}
+
+// UniqValues creates a slice of unique values in the map.
+// Play: https://go.dev/play/p/nf6bXMh7rM3
+func UniqValues[K, V comparable](in ...map[K]V) []V {
+	size := 0
+	for i := range in {
+		size += len(in[i])
+	}
+
+	seen := make(map[V]struct{}, size)
+	result := make([]V, 0)
+
+	for i := range in {
+		for _, v := range in[i] {
+			if _, exists := seen[v]; exists {
+				continue
+			}
+			seen[v] = struct{}{}
+			result = append(result, v)
+		}
+	}
+
+	return result
+}
+
+// ValueOr returns the value of the given key or the fallback value if the key is not present.
+// Play: https://go.dev/play/p/bAq9mHErB4V
+func ValueOr[K comparable, V any](in map[K]V, key K, fallback V) V {
+	if v, ok := in[key]; ok {
+		return v
+	}
+	return fallback
+}
+
 // PickBy returns same map type filtered by given predicate.
 // Play: https://go.dev/play/p/kdg8GR_QMmf
-func PickBy[K comparable, V any](in map[K]V, predicate func(K, V) bool) map[K]V {
-	r := map[K]V{}
+func PickBy[K comparable, V any, Map ~map[K]V](in Map, predicate func(key K, value V) bool) Map {
+	r := Map{}
 	for k, v := range in {
 		if predicate(k, v) {
 			r[k] = v
@@ -36,13 +112,29 @@ func PickBy[K comparable, V any](in map[K]V, predicate func(K, V) bool) map[K]V
 	return r
 }
 
+// PickByErr returns same map type filtered by given predicate.
+// It returns the first error returned by the predicate.
+func PickByErr[K comparable, V any, Map ~map[K]V](in Map, predicate func(key K, value V) (bool, error)) (Map, error) {
+	r := Map{}
+	for k, v := range in {
+		ok, err := predicate(k, v)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			r[k] = v
+		}
+	}
+	return r, nil
+}
+
 // PickByKeys returns same map type filtered by given keys.
 // Play: https://go.dev/play/p/R1imbuci9qU
-func PickByKeys[K comparable, V any](in map[K]V, keys []K) map[K]V {
-	r := map[K]V{}
-	for k, v := range in {
-		if Contains(keys, k) {
-			r[k] = v
+func PickByKeys[K comparable, V any, Map ~map[K]V](in Map, keys []K) Map {
+	r := Map{}
+	for i := range keys {
+		if v, ok := in[keys[i]]; ok {
+			r[keys[i]] = v
 		}
 	}
 	return r
@@ -50,10 +142,12 @@ func PickByKeys[K comparable, V any](in map[K]V, keys []K) map[K]V {
 
 // PickByValues returns same map type filtered by given values.
 // Play: https://go.dev/play/p/1zdzSvbfsJc
-func PickByValues[K comparable, V comparable](in map[K]V, values []V) map[K]V {
-	r := map[K]V{}
+func PickByValues[K, V comparable, Map ~map[K]V](in Map, values []V) Map {
+	r := Map{}
+
+	seen := Keyify(values)
 	for k, v := range in {
-		if Contains(values, v) {
+		if _, ok := seen[v]; ok {
 			r[k] = v
 		}
 	}
@@ -62,8 +156,8 @@ func PickByValues[K comparable, V comparable](in map[K]V, values []V) map[K]V {
 
 // OmitBy returns same map type filtered by given predicate.
 // Play: https://go.dev/play/p/EtBsR43bdsd
-func OmitBy[K comparable, V any](in map[K]V, predicate func(K, V) bool) map[K]V {
-	r := map[K]V{}
+func OmitBy[K comparable, V any, Map ~map[K]V](in Map, predicate func(key K, value V) bool) Map {
+	r := Map{}
 	for k, v := range in {
 		if !predicate(k, v) {
 			r[k] = v
@@ -72,32 +166,52 @@ func OmitBy[K comparable, V any](in map[K]V, predicate func(K, V) bool) map[K]V
 	return r
 }
 
-// OmitByKeys returns same map type filtered by given keys.
-// Play: https://go.dev/play/p/t1QjCrs-ysk
-func OmitByKeys[K comparable, V any](in map[K]V, keys []K) map[K]V {
-	r := map[K]V{}
+// OmitByErr returns same map type filtered by given predicate.
+// It returns the first error returned by the predicate.
+func OmitByErr[K comparable, V any, Map ~map[K]V](in Map, predicate func(key K, value V) (bool, error)) (Map, error) {
+	r := Map{}
 	for k, v := range in {
-		if !Contains(keys, k) {
+		ok, err := predicate(k, v)
+		if err != nil {
+			return nil, err
+		}
+		if !ok {
 			r[k] = v
 		}
 	}
+	return r, nil
+}
+
+// OmitByKeys returns same map type filtered by given keys.
+// Play: https://go.dev/play/p/t1QjCrs-ysk
+func OmitByKeys[K comparable, V any, Map ~map[K]V](in Map, keys []K) Map {
+	r := Map{}
+	for k, v := range in {
+		r[k] = v
+	}
+	for i := range keys {
+		delete(r, keys[i])
+	}
 	return r
 }
 
 // OmitByValues returns same map type filtered by given values.
 // Play: https://go.dev/play/p/9UYZi-hrs8j
-func OmitByValues[K comparable, V comparable](in map[K]V, values []V) map[K]V {
-	r := map[K]V{}
+func OmitByValues[K, V comparable, Map ~map[K]V](in Map, values []V) Map {
+	r := Map{}
+
+	seen := Keyify(values)
 	for k, v := range in {
-		if !Contains(values, v) {
+		if _, ok := seen[v]; !ok {
 			r[k] = v
 		}
 	}
+
 	return r
 }
 
-// Entries transforms a map into array of key/value pairs.
-// Play:
+// Entries transforms a map into a slice of key/value pairs.
+// Play: https://go.dev/play/p/_t4Xe34-Nl5
 func Entries[K comparable, V any](in map[K]V) []Entry[K, V] {
 	entries := make([]Entry[K, V], 0, len(in))
 
@@ -111,26 +225,26 @@ func Entries[K comparable, V any](in map[K]V) []Entry[K, V] {
 	return entries
 }
 
-// ToPairs transforms a map into array of key/value pairs.
+// ToPairs transforms a map into a slice of key/value pairs.
 // Alias of Entries().
 // Play: https://go.dev/play/p/3Dhgx46gawJ
 func ToPairs[K comparable, V any](in map[K]V) []Entry[K, V] {
 	return Entries(in)
 }
 
-// FromEntries transforms an array of key/value pairs into a map.
+// FromEntries transforms a slice of key/value pairs into a map.
 // Play: https://go.dev/play/p/oIr5KHFGCEN
 func FromEntries[K comparable, V any](entries []Entry[K, V]) map[K]V {
-	out := map[K]V{}
+	out := make(map[K]V, len(entries))
 
-	for _, v := range entries {
-		out[v.Key] = v.Value
+	for i := range entries {
+		out[entries[i].Key] = entries[i].Value
 	}
 
 	return out
 }
 
-// FromPairs transforms an array of key/value pairs into a map.
+// FromPairs transforms a slice of key/value pairs into a map.
 // Alias of FromEntries().
 // Play: https://go.dev/play/p/oIr5KHFGCEN
 func FromPairs[K comparable, V any](entries []Entry[K, V]) map[K]V {
@@ -141,8 +255,8 @@ func FromPairs[K comparable, V any](entries []Entry[K, V]) map[K]V {
 // contains duplicate values, subsequent values overwrite property assignments
 // of previous values.
 // Play: https://go.dev/play/p/rFQ4rak6iA1
-func Invert[K comparable, V comparable](in map[K]V) map[V]K {
-	out := map[V]K{}
+func Invert[K, V comparable](in map[K]V) map[V]K {
+	out := make(map[V]K, len(in))
 
 	for k, v := range in {
 		out[v] = k
@@ -153,11 +267,15 @@ func Invert[K comparable, V comparable](in map[K]V) map[V]K {
 
 // Assign merges multiple maps from left to right.
 // Play: https://go.dev/play/p/VhwfJOyxf5o
-func Assign[K comparable, V any](maps ...map[K]V) map[K]V {
-	out := map[K]V{}
+func Assign[K comparable, V any, Map ~map[K]V](maps ...Map) Map {
+	count := 0
+	for i := range maps {
+		count += len(maps[i])
+	}
 
-	for _, m := range maps {
-		for k, v := range m {
+	out := make(Map, count)
+	for i := range maps {
+		for k, v := range maps[i] {
 			out[k] = v
 		}
 	}
@@ -165,10 +283,36 @@ func Assign[K comparable, V any](maps ...map[K]V) map[K]V {
 	return out
 }
 
-// MapKeys manipulates a map keys and transforms it to a map of another type.
+// ChunkEntries splits a map into a slice of elements in groups of length equal to its size. If the map cannot be split evenly,
+// the final chunk will contain the remaining elements.
+// Play: https://go.dev/play/p/X_YQL6mmoD-
+func ChunkEntries[K comparable, V any](m map[K]V, size int) []map[K]V {
+	if size <= 0 {
+		panic("lo.ChunkEntries: size must be greater than 0")
+	}
+
+	count := len(m)
+	if count == 0 {
+		return []map[K]V{}
+	}
+
+	result := make([]map[K]V, 0, ((count-1)/size)+1)
+
+	for k, v := range m {
+		if len(result) == 0 || len(result[len(result)-1]) == size {
+			result = append(result, make(map[K]V, size))
+		}
+
+		result[len(result)-1][k] = v
+	}
+
+	return result
+}
+
+// MapKeys manipulates map keys and transforms it to a map of another type.
 // Play: https://go.dev/play/p/9_4WPIqOetJ
-func MapKeys[K comparable, V any, R comparable](in map[K]V, iteratee func(V, K) R) map[R]V {
-	result := map[R]V{}
+func MapKeys[K comparable, V any, R comparable](in map[K]V, iteratee func(value V, key K) R) map[R]V {
+	result := make(map[R]V, len(in))
 
 	for k, v := range in {
 		result[iteratee(v, k)] = v
@@ -177,10 +321,26 @@ func MapKeys[K comparable, V any, R comparable](in map[K]V, iteratee func(V, K)
 	return result
 }
 
-// MapValues manipulates a map values and transforms it to a map of another type.
+// MapKeysErr manipulates map keys and transforms it to a map of another type.
+// It returns the first error returned by the iteratee.
+func MapKeysErr[K comparable, V any, R comparable](in map[K]V, iteratee func(value V, key K) (R, error)) (map[R]V, error) {
+	result := make(map[R]V, len(in))
+
+	for k, v := range in {
+		r, err := iteratee(v, k)
+		if err != nil {
+			return nil, err
+		}
+		result[r] = v
+	}
+
+	return result, nil
+}
+
+// MapValues manipulates map values and transforms it to a map of another type.
 // Play: https://go.dev/play/p/T_8xAfvcf0W
-func MapValues[K comparable, V any, R any](in map[K]V, iteratee func(V, K) R) map[K]R {
-	result := map[K]R{}
+func MapValues[K comparable, V, R any](in map[K]V, iteratee func(value V, key K) R) map[K]R {
+	result := make(map[K]R, len(in))
 
 	for k, v := range in {
 		result[k] = iteratee(v, k)
@@ -189,9 +349,54 @@ func MapValues[K comparable, V any, R any](in map[K]V, iteratee func(V, K) R) ma
 	return result
 }
 
-// MapToSlice transforms a map into a slice based on specific iteratee
+// MapValuesErr manipulates map values and transforms it to a map of another type.
+// It returns the first error returned by the iteratee.
+func MapValuesErr[K comparable, V, R any](in map[K]V, iteratee func(value V, key K) (R, error)) (map[K]R, error) {
+	result := make(map[K]R, len(in))
+
+	for k, v := range in {
+		r, err := iteratee(v, k)
+		if err != nil {
+			return nil, err
+		}
+		result[k] = r
+	}
+
+	return result, nil
+}
+
+// MapEntries manipulates map entries and transforms it to a map of another type.
+// Play: https://go.dev/play/p/VuvNQzxKimT
+func MapEntries[K1 comparable, V1 any, K2 comparable, V2 any](in map[K1]V1, iteratee func(key K1, value V1) (K2, V2)) map[K2]V2 {
+	result := make(map[K2]V2, len(in))
+
+	for k1 := range in {
+		k2, v2 := iteratee(k1, in[k1])
+		result[k2] = v2
+	}
+
+	return result
+}
+
+// MapEntriesErr manipulates map entries and transforms it to a map of another type.
+// It returns the first error returned by the iteratee.
+func MapEntriesErr[K1 comparable, V1 any, K2 comparable, V2 any](in map[K1]V1, iteratee func(key K1, value V1) (K2, V2, error)) (map[K2]V2, error) {
+	result := make(map[K2]V2, len(in))
+
+	for k1 := range in {
+		k2, v2, err := iteratee(k1, in[k1])
+		if err != nil {
+			return nil, err
+		}
+		result[k2] = v2
+	}
+
+	return result, nil
+}
+
+// MapToSlice transforms a map into a slice based on specified iteratee.
 // Play: https://go.dev/play/p/ZuiCZpDt6LD
-func MapToSlice[K comparable, V any, R any](in map[K]V, iteratee func(K, V) R) []R {
+func MapToSlice[K comparable, V, R any](in map[K]V, iteratee func(key K, value V) R) []R {
 	result := make([]R, 0, len(in))
 
 	for k, v := range in {
@@ -200,3 +405,129 @@ func MapToSlice[K comparable, V any, R any](in map[K]V, iteratee func(K, V) R) [
 
 	return result
 }
+
+// MapToSliceErr transforms a map into a slice based on specified iteratee.
+// It returns the first error returned by the iteratee.
+func MapToSliceErr[K comparable, V, R any](in map[K]V, iteratee func(key K, value V) (R, error)) ([]R, error) {
+	result := make([]R, 0, len(in))
+
+	for k, v := range in {
+		r, err := iteratee(k, v)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, r)
+	}
+
+	return result, nil
+}
+
+// FilterMapToSlice transforms a map into a slice based on specified iteratee.
+// The iteratee returns a value and a boolean. If the boolean is true, the value is added to the result slice.
+// If the boolean is false, the value is not added to the result slice.
+// The order of the keys in the input map is not specified and the order of the keys in the output slice is not guaranteed.
+// Play: https://go.dev/play/p/jgsD_Kil9pV
+func FilterMapToSlice[K comparable, V, R any](in map[K]V, iteratee func(key K, value V) (R, bool)) []R {
+	result := make([]R, 0, len(in))
+
+	for k, v := range in {
+		if v, ok := iteratee(k, v); ok {
+			result = append(result, v)
+		}
+	}
+
+	return result
+}
+
+// FilterMapToSliceErr transforms a map into a slice based on specified iteratee.
+// The iteratee returns a value, a boolean, and an error. If the boolean is true, the value is added to the result slice.
+// If the boolean is false, the value is not added to the result slice.
+// If an error is returned, iteration stops immediately and returns the error.
+// The order of the keys in the input map is not specified and the order of the keys in the output slice is not guaranteed.
+func FilterMapToSliceErr[K comparable, V, R any](in map[K]V, iteratee func(key K, value V) (R, bool, error)) ([]R, error) {
+	result := make([]R, 0, len(in))
+
+	for k, v := range in {
+		r, ok, err := iteratee(k, v)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			result = append(result, r)
+		}
+	}
+
+	return result, nil
+}
+
+// FilterKeys transforms a map into a slice based on predicate returns true for specific elements.
+// It is a mix of lo.Filter() and lo.Keys().
+// Play: https://go.dev/play/p/OFlKXlPrBAe
+func FilterKeys[K comparable, V any](in map[K]V, predicate func(key K, value V) bool) []K {
+	result := make([]K, 0)
+
+	for k, v := range in {
+		if predicate(k, v) {
+			result = append(result, k)
+		}
+	}
+
+	return result
+}
+
+// FilterValues transforms a map into a slice based on predicate returns true for specific elements.
+// It is a mix of lo.Filter() and lo.Values().
+// Play: https://go.dev/play/p/YVD5r_h-LX-
+func FilterValues[K comparable, V any](in map[K]V, predicate func(key K, value V) bool) []V {
+	result := make([]V, 0)
+
+	for k, v := range in {
+		if predicate(k, v) {
+			result = append(result, v)
+		}
+	}
+
+	return result
+}
+
+// FilterKeysErr transforms a map into a slice of keys based on predicate that can return an error.
+// It is a mix of lo.Filter() and lo.Keys() with error handling.
+// If the predicate returns true, the key is added to the result slice.
+// If the predicate returns an error, iteration stops immediately and returns the error.
+// The order of the keys in the input map is not specified.
+func FilterKeysErr[K comparable, V any](in map[K]V, predicate func(key K, value V) (bool, error)) ([]K, error) {
+	result := make([]K, 0)
+
+	for k, v := range in {
+		ok, err := predicate(k, v)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			result = append(result, k)
+		}
+	}
+
+	return result, nil
+}
+
+// FilterValuesErr transforms a map into a slice of values based on predicate that can return an error.
+// It is a mix of lo.Filter() and lo.Values() with error handling.
+// If the predicate returns true, the value is added to the result slice.
+// If the predicate returns an error, iteration stops immediately and returns the error.
+// The order of the keys in the input map is not specified.
+func FilterValuesErr[K comparable, V any](in map[K]V, predicate func(key K, value V) (bool, error)) ([]V, error) {
+	result := make([]V, 0)
+
+	for k, v := range in {
+		ok, err := predicate(k, v)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			result = append(result, v)
+		}
+	}
+
+	return result, nil
+}
diff --git a/vendor/github.com/samber/lo/math.go b/vendor/github.com/samber/lo/math.go
index 30e7e9ef1..f08f22789 100644
--- a/vendor/github.com/samber/lo/math.go
+++ b/vendor/github.com/samber/lo/math.go
@@ -1,51 +1,65 @@
 package lo
 
-import "golang.org/x/exp/constraints"
+import (
+	"math"
 
-// Range creates an array of numbers (positive and/or negative) with given length.
+	"github.com/samber/lo/internal/constraints"
+)
+
+// Range creates a slice of numbers (positive and/or negative) with given length.
 // Play: https://go.dev/play/p/0r6VimXAi9H
 func Range(elementNum int) []int {
-	length := If(elementNum < 0, -elementNum).Else(elementNum)
+	step := Ternary(elementNum < 0, -1, 1)
+	length := elementNum * step
 	result := make([]int, length)
-	step := If(elementNum < 0, -1).Else(1)
 	for i, j := 0, 0; i < length; i, j = i+1, j+step {
 		result[i] = j
 	}
 	return result
 }
 
-// RangeFrom creates an array of numbers from start with specified length.
+// RangeFrom creates a slice of numbers from start with specified length.
 // Play: https://go.dev/play/p/0r6VimXAi9H
 func RangeFrom[T constraints.Integer | constraints.Float](start T, elementNum int) []T {
-	length := If(elementNum < 0, -elementNum).Else(elementNum)
+	step := Ternary(elementNum < 0, -1, 1)
+	length := elementNum * step
 	result := make([]T, length)
-	step := If(elementNum < 0, -1).Else(1)
 	for i, j := 0, start; i < length; i, j = i+1, j+T(step) {
 		result[i] = j
 	}
 	return result
 }
 
-// RangeWithSteps creates an array of numbers (positive and/or negative) progressing from start up to, but not including end.
-// step set to zero will return empty array.
+// RangeWithSteps creates a slice of numbers (positive and/or negative) progressing from start up to, but not including end.
+// step set to zero will return an empty slice.
 // Play: https://go.dev/play/p/0r6VimXAi9H
 func RangeWithSteps[T constraints.Integer | constraints.Float](start, end, step T) []T {
-	result := []T{}
 	if start == end || step == 0 {
-		return result
+		return []T{}
 	}
+
+	capacity := func(count, delta T) int {
+		// Use math.Ceil instead of (count-1)/delta+1 because integer division
+		// fails for floats (e.g., 5.5/2.5=2.2 → ceil=3, not 2).
+		return int(math.Ceil(float64(count) / float64(delta)))
+	}
+
 	if start < end {
 		if step < 0 {
-			return result
+			return []T{}
 		}
+
+		result := make([]T, 0, capacity(end-start, step))
 		for i := start; i < end; i += step {
 			result = append(result, i)
 		}
 		return result
 	}
 	if step > 0 {
-		return result
+		return []T{}
 	}
+
+	result := make([]T, 0, capacity(start-end, -step))
 	for i := start; i > end; i += step {
 		result = append(result, i)
 	}
@@ -54,21 +68,146 @@ func RangeWithSteps[T constraints.Integer | constraints.Float](start, end, step
 
 // Clamp clamps number within the inclusive lower and upper bounds.
 // Play: https://go.dev/play/p/RU4lJNC2hlI
-func Clamp[T constraints.Ordered](value T, min T, max T) T {
-	if value < min {
-		return min
-	} else if value > max {
-		return max
+func Clamp[T constraints.Ordered](value, mIn, mAx T) T {
+	if value < mIn {
+		return mIn
+	} else if value > mAx {
+		return mAx
 	}
 	return value
 }
 
-// SumBy summarizes the values in a collection using the given return value from the iteration function. If collection is empty 0 is returned.
-// Play: https://go.dev/play/p/Dz_a_7jN_ca
-func SumBy[T any, R constraints.Float | constraints.Integer](collection []T, iteratee func(T) R) R {
-	var sum R = 0
-	for _, item := range collection {
-		sum = sum + iteratee(item)
+// Sum sums the values in a collection. If collection is empty 0 is returned.
+// Play: https://go.dev/play/p/upfeJVqs4Bt
+func Sum[T constraints.Float | constraints.Integer | constraints.Complex](collection []T) T {
+	var sum T
+	for i := range collection {
+		sum += collection[i]
 	}
 	return sum
 }
+
+// SumBy summarizes the values in a collection using the given return value from the iteration function. If collection is empty 0 is returned.
+// Play: https://go.dev/play/p/Dz_a_7jN_ca
+func SumBy[T any, R constraints.Float | constraints.Integer | constraints.Complex](collection []T, iteratee func(item T) R) R {
+	var sum R
+	for i := range collection {
+		sum += iteratee(collection[i])
+	}
+	return sum
+}
+
+// SumByErr summarizes the values in a collection using the given return value from the iteration function.
+// If the iteratee returns an error, iteration stops and the error is returned.
+// If collection is empty 0 and nil error are returned.
+func SumByErr[T any, R constraints.Float | constraints.Integer | constraints.Complex](collection []T, iteratee func(item T) (R, error)) (R, error) {
+	var sum R
+	for i := range collection {
+		v, err := iteratee(collection[i])
+		if err != nil {
+			return sum, err
+		}
+		sum += v
+	}
+	return sum, nil
+}
+
+// Product gets the product of the values in a collection. If collection is empty 1 is returned.
+// Play: https://go.dev/play/p/2_kjM_smtAH
+func Product[T constraints.Float | constraints.Integer | constraints.Complex](collection []T) T {
+	var product T = 1
+	for i := range collection {
+		product *= collection[i]
+	}
+	return product
+}
+
+// ProductBy summarizes the values in a collection using the given return value from the iteration function. If collection is empty 1 is returned.
+// Play: https://go.dev/play/p/wadzrWr9Aer
+func ProductBy[T any, R constraints.Float | constraints.Integer | constraints.Complex](collection []T, iteratee func(item T) R) R {
+	var product R = 1
+	for i := range collection {
+		product *= iteratee(collection[i])
+	}
+	return product
+}
+
+// ProductByErr summarizes the values in a collection using the given return value from the iteration function.
+// If the iteratee returns an error, iteration stops and the error is returned.
+// If collection is empty 1 and nil error are returned.
+func ProductByErr[T any, R constraints.Float | constraints.Integer | constraints.Complex](collection []T, iteratee func(item T) (R, error)) (R, error) {
+	var product R = 1
+	for i := range collection {
+		v, err := iteratee(collection[i])
+		if err != nil {
+			return product, err
+		}
+		product *= v
+	}
+	return product, nil
+}
+
+// Mean calculates the mean of a collection of numbers.
+// Play: https://go.dev/play/p/tPURSuteUsP
+func Mean[T constraints.Float | constraints.Integer](collection []T) T {
+	length := T(len(collection))
+	if length == 0 {
+		return 0
+	}
+	sum := Sum(collection)
+	return sum / length
+}
+
+// MeanBy calculates the mean of a collection of numbers using the given return value from the iteration function.
+// Play: https://go.dev/play/p/j7TsVwBOZ7P
+func MeanBy[T any, R constraints.Float | constraints.Integer](collection []T, iteratee func(item T) R) R {
+	length := R(len(collection))
+	if length == 0 {
+		return 0
+	}
+	sum := SumBy(collection, iteratee)
+	return sum / length
+}
+
+// MeanByErr calculates the mean of a collection of numbers using the given return value from the iteration function.
+// If the iteratee returns an error, iteration stops and the error is returned.
+// If collection is empty 0 and nil error are returned.
+func MeanByErr[T any, R constraints.Float | constraints.Integer](collection []T, iteratee func(item T) (R, error)) (R, error) {
+	length := R(len(collection))
+	if length == 0 {
+		return 0, nil
+	}
+	sum, err := SumByErr(collection, iteratee)
+	if err != nil {
+		return 0, err
+	}
+	return sum / length, nil
+}
+
+// Mode returns the mode (most frequent value) of a collection.
+// If multiple values have the same highest frequency, then multiple values are returned.
+// If the collection is empty, then the zero value of T is returned.
+func Mode[T constraints.Integer | constraints.Float](collection []T) []T {
+	length := T(len(collection))
+	if length == 0 {
+		return []T{}
+	}
+
+	mode := make([]T, 0)
+	maxFreq := 0
+	frequency := make(map[T]int)
+
+	for _, item := range collection {
+		frequency[item]++
+		count := frequency[item]
+
+		if count > maxFreq {
+			maxFreq = count
+			mode = []T{item}
+		} else if count == maxFreq {
+			mode = append(mode, item)
+		}
+	}
+
+	return mode
+}
diff --git a/vendor/github.com/samber/lo/mutable/slice.go b/vendor/github.com/samber/lo/mutable/slice.go
new file mode 100644
index 000000000..4b8e916c4
--- /dev/null
+++ b/vendor/github.com/samber/lo/mutable/slice.go
@@ -0,0 +1,73 @@
+package mutable
+
+import "github.com/samber/lo/internal/xrand"
+
+// Filter is a generic function that modifies the input slice in-place to contain only the elements
+// that satisfy the provided predicate function. The predicate function takes an element of the slice and its index,
+// and should return true for elements that should be kept and false for elements that should be removed.
+// The function returns the modified slice, which may be shorter than the original if some elements were removed.
+// Note that the order of elements in the original slice is preserved in the output.
+// Play: https://go.dev/play/p/0jY3Z0B7O_5
+func Filter[T any, Slice ~[]T](collection Slice, predicate func(item T) bool) Slice {
+	j := 0
+	for i := range collection {
+		if predicate(collection[i]) {
+			collection[j] = collection[i]
+			j++
+		}
+	}
+	return collection[:j]
+}
+
+// FilterI is a generic function that modifies the input slice in-place to contain only the elements
+// that satisfy the provided predicate function. The predicate function takes an element of the slice and its index,
+// and should return true for elements that should be kept and false for elements that should be removed.
+// The function returns the modified slice, which may be shorter than the original if some elements were removed.
+// Note that the order of elements in the original slice is preserved in the output.
+func FilterI[T any, Slice ~[]T](collection Slice, predicate func(item T, index int) bool) Slice {
+	j := 0
+	for i := range collection {
+		if predicate(collection[i], i) {
+			collection[j] = collection[i]
+			j++
+		}
+	}
+	return collection[:j]
+}
+
+// Map is a generic function that modifies the input slice in-place to contain the result of applying the provided
+// function to each element of the slice. The function returns the modified slice, which has the same length as the original.
+// Play: https://go.dev/play/p/0jY3Z0B7O_5
+func Map[T any, Slice ~[]T](collection Slice, transform func(item T) T) {
+	for i := range collection {
+		collection[i] = transform(collection[i])
+	}
+}
+
+// MapI is a generic function that modifies the input slice in-place to contain the result of applying the provided
+// function to each element of the slice. The function returns the modified slice, which has the same length as the original.
+func MapI[T any, Slice ~[]T](collection Slice, transform func(item T, index int) T) {
+	for i := range collection {
+		collection[i] = transform(collection[i], i)
+	}
+}
+
+// Shuffle returns a slice of shuffled values. Uses the Fisher-Yates shuffle algorithm.
+// Play: https://go.dev/play/p/2xb3WdLjeSJ
+func Shuffle[T any, Slice ~[]T](collection Slice) {
+	xrand.Shuffle(len(collection), func(i, j int) {
+		collection[i], collection[j] = collection[j], collection[i]
+	})
+}
+
+// Reverse reverses a slice so that the first element becomes the last, the second element becomes the second to last, and so on.
+// Play: https://go.dev/play/p/O-M5pmCRgzV
+func Reverse[T any, Slice ~[]T](collection Slice) {
+	length := len(collection)
+	half := length / 2
+
+	for i := 0; i < half; i++ {
+		j := length - 1 - i
+		collection[i], collection[j] = collection[j], collection[i]
+	}
+}
diff --git a/vendor/github.com/samber/lo/retry.go b/vendor/github.com/samber/lo/retry.go
index b4a61efba..a4779f60f 100644
--- a/vendor/github.com/samber/lo/retry.go
+++ b/vendor/github.com/samber/lo/retry.go
@@ -3,6 +3,8 @@ package lo
 import (
 	"sync"
 	"time"
+
+	"github.com/samber/lo/internal/xtime"
 )
 
 type debounce struct {
@@ -13,12 +15,12 @@ type debounce struct {
 	callbacks []func()
 }
 
-func (d *debounce) reset() *debounce {
+func (d *debounce) reset() {
 	d.mu.Lock()
 	defer d.mu.Unlock()
 
 	if d.done {
-		return d
+		return
 	}
 
 	if d.timer != nil {
@@ -26,11 +28,15 @@ func (d *debounce) reset() *debounce {
 	}
 
 	d.timer = time.AfterFunc(d.after, func() {
-		for _, f := range d.callbacks {
-			f()
+		// We need to lock the mutex here to avoid race conditions with 2 concurrent calls to reset()
+		d.mu.Lock()
+		callbacks := append([]func(){}, d.callbacks...)
+		d.mu.Unlock()
+
+		for i := range callbacks {
+			callbacks[i]()
 		}
 	})
-	return d
 }
 
 func (d *debounce) cancel() {
@@ -61,9 +67,92 @@ func NewDebounce(duration time.Duration, f ...func()) (func(), func()) {
 	}, d.cancel
 }
 
-// Attempt invokes a function N times until it returns valid output. Returning either the caught error or nil. When first argument is less than `1`, the function runs until a successful response is returned.
+type debounceByItem struct {
+	mu    *sync.Mutex
+	timer *time.Timer
+	count int
+}
+
+type debounceBy[T comparable] struct {
+	after     time.Duration
+	mu        *sync.Mutex
+	items     map[T]*debounceByItem
+	callbacks []func(key T, count int)
+}
+
+func (d *debounceBy[T]) reset(key T) {
+	d.mu.Lock()
+	if _, ok := d.items[key]; !ok {
+		d.items[key] = &debounceByItem{
+			mu:    new(sync.Mutex),
+			timer: nil,
+		}
+	}
+
+	item := d.items[key]
+
+	d.mu.Unlock()
+
+	item.mu.Lock()
+	defer item.mu.Unlock()
+
+	item.count++
+
+	if item.timer != nil {
+		item.timer.Stop()
+	}
+
+	item.timer = time.AfterFunc(d.after, func() {
+		// We need to lock the mutex here to avoid race conditions with 2 concurrent calls to reset()
+		item.mu.Lock()
+		count := item.count
+		item.count = 0
+		callbacks := append([]func(key T, count int){}, d.callbacks...)
+		item.mu.Unlock()
+
+		for i := range callbacks {
+			callbacks[i](key, count)
+		}
+	})
+}
+
+func (d *debounceBy[T]) cancel(key T) {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	if item, ok := d.items[key]; ok {
+		item.mu.Lock()
+
+		if item.timer != nil {
+			item.timer.Stop()
+			item.timer = nil
+		}
+
+		item.mu.Unlock()
+
+		delete(d.items, key)
+	}
+}
+
+// NewDebounceBy creates a debounced instance for each distinct key, that delays invoking functions given until after wait milliseconds have elapsed.
+// Play: https://go.dev/play/p/d3Vpt6pxhY8
+func NewDebounceBy[T comparable](duration time.Duration, f ...func(key T, count int)) (func(key T), func(key T)) {
+	d := &debounceBy[T]{
+		after:     duration,
+		mu:        new(sync.Mutex),
+		items:     map[T]*debounceByItem{},
+		callbacks: f,
+	}
+
+	return func(key T) {
+		d.reset(key)
+	}, d.cancel
+}
+
+// Attempt invokes a function N times until it returns valid output. Returns either the caught error or nil.
+// When the first argument is less than `1`, the function runs until a successful response is returned.
 // Play: https://go.dev/play/p/3ggJZ2ZKcMj
-func Attempt(maxIteration int, f func(int) error) (int, error) {
+func Attempt(maxIteration int, f func(index int) error) (int, error) {
 	var err error
 
 	for i := 0; maxIteration <= 0 || i < maxIteration; i++ {
@@ -78,27 +167,222 @@ func Attempt(maxIteration int, f func(int) error) (int, error) {
 }
 
 // AttemptWithDelay invokes a function N times until it returns valid output,
-// with a pause between each call. Returning either the caught error or nil.
-// When first argument is less than `1`, the function runs until a successful
+// with a pause between each call. Returns either the caught error or nil.
+// When the first argument is less than `1`, the function runs until a successful
 // response is returned.
 // Play: https://go.dev/play/p/tVs6CygC7m1
-func AttemptWithDelay(maxIteration int, delay time.Duration, f func(int, time.Duration) error) (int, time.Duration, error) {
+func AttemptWithDelay(maxIteration int, delay time.Duration, f func(index int, duration time.Duration) error) (int, time.Duration, error) {
 	var err error
 
-	start := time.Now()
+	start := xtime.Now()
 
 	for i := 0; maxIteration <= 0 || i < maxIteration; i++ {
-		err = f(i, time.Since(start))
+		err = f(i, xtime.Since(start))
 		if err == nil {
-			return i + 1, time.Since(start), nil
+			return i + 1, xtime.Since(start), nil
 		}
 
 		if maxIteration <= 0 || i+1 < maxIteration {
-			time.Sleep(delay)
+			xtime.Sleep(delay)
 		}
 	}
 
-	return maxIteration, time.Since(start), err
+	return maxIteration, xtime.Since(start), err
 }
 
-// throttle ?
+// AttemptWhile invokes a function N times until it returns valid output.
+// Returns either the caught error or nil, along with a bool value to determine
+// whether the function should be invoked again. It will terminate the invoke
+// immediately if the second return value is false. When the first
+// argument is less than `1`, the function runs until a successful response is
+// returned.
+// Play: https://go.dev/play/p/1VS7HxlYMOG
+func AttemptWhile(maxIteration int, f func(int) (error, bool)) (int, error) {
+	var err error
+	var shouldContinueInvoke bool
+
+	for i := 0; maxIteration <= 0 || i < maxIteration; i++ {
+		// for retries >= 0 {
+		err, shouldContinueInvoke = f(i)
+		if !shouldContinueInvoke { // if shouldContinueInvoke is false, then return immediately
+			return i + 1, err
+		}
+		if err == nil {
+			return i + 1, nil
+		}
+	}
+
+	return maxIteration, err
+}
+
+// AttemptWhileWithDelay invokes a function N times until it returns valid output,
+// with a pause between each call. Returns either the caught error or nil, along
+// with a bool value to determine whether the function should be invoked again.
+// It will terminate the invoke immediately if the second return value is false.
+// When the first argument is less than `1`, the function runs until a successful
+// response is returned.
+// Play: https://go.dev/play/p/mhufUjJfLEF
+func AttemptWhileWithDelay(maxIteration int, delay time.Duration, f func(int, time.Duration) (error, bool)) (int, time.Duration, error) {
+	var err error
+	var shouldContinueInvoke bool
+
+	start := xtime.Now()
+
+	for i := 0; maxIteration <= 0 || i < maxIteration; i++ {
+		err, shouldContinueInvoke = f(i, xtime.Since(start))
+		if !shouldContinueInvoke { // if shouldContinueInvoke is false, then return immediately
+			return i + 1, xtime.Since(start), err
+		}
+		if err == nil {
+			return i + 1, xtime.Since(start), nil
+		}
+
+		if maxIteration <= 0 || i+1 < maxIteration {
+			xtime.Sleep(delay)
+		}
+	}
+
+	return maxIteration, xtime.Since(start), err
+}
+
+type transactionStep[T any] struct {
+	exec       func(T) (T, error)
+	onRollback func(T) T
+}
+
+// NewTransaction instantiate a new transaction.
+// Play: https://go.dev/play/p/Qxrd7MGQGh1
+func NewTransaction[T any]() *Transaction[T] {
+	return &Transaction[T]{
+		steps: []transactionStep[T]{},
+	}
+}
+
+// Transaction implements a Saga pattern.
+type Transaction[T any] struct {
+	steps []transactionStep[T]
+}
+
+// Then adds a step to the chain of callbacks. Returns the same Transaction.
+// Play: https://go.dev/play/p/Qxrd7MGQGh1 https://go.dev/play/p/xrHb2_kMvTY
+func (t *Transaction[T]) Then(exec func(T) (T, error), onRollback func(T) T) *Transaction[T] {
+	t.steps = append(t.steps, transactionStep[T]{
+		exec:       exec,
+		onRollback: onRollback,
+	})
+
+	return t
+}
+
+// Process runs the Transaction steps and rollbacks in case of errors.
+// Play: https://go.dev/play/p/Qxrd7MGQGh1 https://go.dev/play/p/xrHb2_kMvTY
+func (t *Transaction[T]) Process(state T) (T, error) {
+	var i int
+	var err error
+
+	for i < len(t.steps) {
+		state, err = t.steps[i].exec(state)
+		if err != nil {
+			break
+		}
+
+		i++
+	}
+
+	if err == nil {
+		return state, nil
+	}
+
+	for i > 0 {
+		i--
+		state = t.steps[i].onRollback(state)
+	}
+
+	return state, err
+}
+
+// @TODO: single mutex per key?
+type throttleBy[T comparable] struct {
+	mu         *sync.Mutex
+	timer      *time.Timer
+	interval   time.Duration
+	callbacks  []func(key T)
+	countLimit int
+	count      map[T]int
+}
+
+func (th *throttleBy[T]) throttledFunc(key T) {
+	th.mu.Lock()
+	defer th.mu.Unlock()
+
+	if th.count[key] < th.countLimit {
+		th.count[key]++
+
+		for _, f := range th.callbacks {
+			f(key)
+		}
+	}
+	if th.timer == nil {
+		th.timer = time.AfterFunc(th.interval, func() {
+			th.reset()
+		})
+	}
+}
+
+func (th *throttleBy[T]) reset() {
+	th.mu.Lock()
+	defer th.mu.Unlock()
+
+	if th.timer != nil {
+		th.timer.Stop()
+	}
+
+	th.count = map[T]int{}
+	th.timer = nil
+}
+
+// NewThrottle creates a throttled instance that invokes given functions only once in every interval.
+// This returns 2 functions, First one is throttled function and Second one is a function to reset interval.
+// Play: https://go.dev/play/p/qQn3fm8Z7jS
+func NewThrottle(interval time.Duration, f ...func()) (throttle, reset func()) {
+	return NewThrottleWithCount(interval, 1, f...)
+}
+
+// NewThrottleWithCount is NewThrottle with count limit, throttled function will be invoked count times in every interval.
+// Play: https://go.dev/play/p/w5nc0MgWtjC
+func NewThrottleWithCount(interval time.Duration, count int, f ...func()) (throttle, reset func()) {
+	callbacks := Map(f, func(item func(), _ int) func(struct{}) {
+		return func(struct{}) {
+			item()
+		}
+	})
+
+	throttleFn, reset := NewThrottleByWithCount(interval, count, callbacks...)
+	return func() {
+		throttleFn(struct{}{})
+	}, reset
+}
+
+// NewThrottleBy creates a throttled instance that invokes given functions only once in every interval.
+// This returns 2 functions, First one is throttled function and Second one is a function to reset interval.
+// Play: https://go.dev/play/p/0Wv6oX7dHdC
+func NewThrottleBy[T comparable](interval time.Duration, f ...func(key T)) (throttle func(key T), reset func()) {
+	return NewThrottleByWithCount(interval, 1, f...)
+}
+
+// NewThrottleByWithCount is NewThrottleBy with count limit, throttled function will be invoked count times in every interval.
+// Play: https://go.dev/play/p/vQk3ECH7_EW
+func NewThrottleByWithCount[T comparable](interval time.Duration, count int, f ...func(key T)) (throttle func(key T), reset func()) {
+	if count <= 0 {
+		count = 1
+	}
+
+	th := &throttleBy[T]{
+		mu:         new(sync.Mutex),
+		interval:   interval,
+		callbacks:  f,
+		countLimit: count,
+		count:      map[T]int{},
+	}
+	return th.throttledFunc, th.reset
+}
diff --git a/vendor/github.com/samber/lo/slice.go b/vendor/github.com/samber/lo/slice.go
index 516fc8b17..a53da54f8 100644
--- a/vendor/github.com/samber/lo/slice.go
+++ b/vendor/github.com/samber/lo/slice.go
@@ -1,48 +1,99 @@
 package lo
 
 import (
-	"math/rand"
+	"sort"
 
-	"golang.org/x/exp/constraints"
+	"github.com/samber/lo/internal/constraints"
+	"github.com/samber/lo/mutable"
 )
 
-// Filter iterates over elements of collection, returning an array of all elements predicate returns truthy for.
+// Filter iterates over elements of collection, returning a slice of all elements predicate returns true for.
 // Play: https://go.dev/play/p/Apjg3WeSi7K
-func Filter[V any](collection []V, predicate func(V, int) bool) []V {
-	result := []V{}
+func Filter[T any, Slice ~[]T](collection Slice, predicate func(item T, index int) bool) Slice {
+	result := make(Slice, 0, len(collection))
 
-	for i, item := range collection {
-		if predicate(item, i) {
-			result = append(result, item)
+	for i := range collection {
+		if predicate(collection[i], i) {
+			result = append(result, collection[i])
 		}
 	}
 
 	return result
 }
 
+// FilterErr iterates over elements of collection, returning a slice of all elements predicate returns true for.
+// If the predicate returns an error, iteration stops immediately and returns the error.
+// Play: https://go.dev/play/p/Apjg3WeSi7K
+func FilterErr[T any, Slice ~[]T](collection Slice, predicate func(item T, index int) (bool, error)) (Slice, error) {
+	result := make(Slice, 0, len(collection))
+
+	for i := range collection {
+		ok, err := predicate(collection[i], i)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			result = append(result, collection[i])
+		}
+	}
+
+	return result, nil
+}
+
 // Map manipulates a slice and transforms it to a slice of another type.
 // Play: https://go.dev/play/p/OkPcYAhBo0D
-func Map[T any, R any](collection []T, iteratee func(T, int) R) []R {
+func Map[T, R any](collection []T, transform func(item T, index int) R) []R {
 	result := make([]R, len(collection))
 
-	for i, item := range collection {
-		result[i] = iteratee(item, i)
+	for i := range collection {
+		result[i] = transform(collection[i], i)
 	}
 
 	return result
 }
 
-// FilterMap returns a slice which obtained after both filtering and mapping using the given callback function.
+// MapErr manipulates a slice and transforms it to a slice of another type.
+// It returns the first error returned by the transform function.
+func MapErr[T, R any](collection []T, transform func(item T, index int) (R, error)) ([]R, error) {
+	result := make([]R, len(collection))
+
+	for i := range collection {
+		r, err := transform(collection[i], i)
+		if err != nil {
+			return nil, err
+		}
+		result[i] = r
+	}
+
+	return result, nil
+}
+
+// UniqMap manipulates a slice and transforms it to a slice of another type with unique values.
+// Play: https://go.dev/play/p/fygzLBhvUdB
+func UniqMap[T any, R comparable](collection []T, transform func(item T, index int) R) []R {
+	seen := make(map[R]struct{}, len(collection))
+
+	for i := range collection {
+		r := transform(collection[i], i)
+		if _, ok := seen[r]; !ok {
+			seen[r] = struct{}{}
+		}
+	}
+
+	return Keys(seen)
+}
+
+// FilterMap returns a slice obtained after both filtering and mapping using the given callback function.
 // The callback function should return two values:
 //   - the result of the mapping operation and
 //   - whether the result element should be included or not.
 //
-// Play: https://go.dev/play/p/-AuYXfy7opz
-func FilterMap[T any, R any](collection []T, callback func(T, int) (R, bool)) []R {
-	result := []R{}
+// Play: https://go.dev/play/p/CgHYNUpOd1I
+func FilterMap[T, R any](collection []T, callback func(item T, index int) (R, bool)) []R {
+	result := make([]R, 0, len(collection))
 
-	for i, item := range collection {
-		if r, ok := callback(item, i); ok {
+	for i := range collection {
+		if r, ok := callback(collection[i], i); ok {
 			result = append(result, r)
 		}
 	}
@@ -51,31 +102,67 @@ func FilterMap[T any, R any](collection []T, callback func(T, int) (R, bool)) []
 }
 
 // FlatMap manipulates a slice and transforms and flattens it to a slice of another type.
-// Play: https://go.dev/play/p/YSoYmQTA8-U
-func FlatMap[T any, R any](collection []T, iteratee func(T, int) []R) []R {
-	result := []R{}
+// The transform function can either return a slice or a `nil`, and in the `nil` case
+// no value is added to the final slice.
+// Play: https://go.dev/play/p/pFCF5WVB225
+func FlatMap[T, R any](collection []T, transform func(item T, index int) []R) []R {
+	result := make([]R, 0, len(collection))
 
-	for i, item := range collection {
-		result = append(result, iteratee(item, i)...)
+	for i := range collection {
+		result = append(result, transform(collection[i], i)...)
 	}
 
 	return result
 }
 
+// FlatMapErr manipulates a slice and transforms and flattens it to a slice of another type.
+// The transform function can either return a slice or a `nil`, and in the `nil` case
+// no value is added to the final slice.
+// It returns the first error returned by the transform function.
+func FlatMapErr[T, R any](collection []T, transform func(item T, index int) ([]R, error)) ([]R, error) {
+	result := make([]R, 0, len(collection))
+
+	for i := range collection {
+		r, err := transform(collection[i], i)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, r...)
+	}
+
+	return result, nil
+}
+
 // Reduce reduces collection to a value which is the accumulated result of running each element in collection
 // through accumulator, where each successive invocation is supplied the return value of the previous.
-// Play: https://go.dev/play/p/R4UHXZNaaUG
-func Reduce[T any, R any](collection []T, accumulator func(R, T, int) R, initial R) R {
-	for i, item := range collection {
-		initial = accumulator(initial, item, i)
+// Play: https://go.dev/play/p/CgHYNUpOd1I
+func Reduce[T, R any](collection []T, accumulator func(agg R, item T, index int) R, initial R) R {
+	for i := range collection {
+		initial = accumulator(initial, collection[i], i)
 	}
 
 	return initial
 }
 
-// ReduceRight helper is like Reduce except that it iterates over elements of collection from right to left.
+// ReduceErr reduces collection to a value which is the accumulated result of running each element in collection
+// through accumulator, where each successive invocation is supplied the return value of the previous.
+// It returns the first error returned by the accumulator function.
+func ReduceErr[T, R any](collection []T, accumulator func(agg R, item T, index int) (R, error), initial R) (R, error) {
+	for i := range collection {
+		result, err := accumulator(initial, collection[i], i)
+		if err != nil {
+			var zero R
+			return zero, err
+		}
+		initial = result
+	}
+
+	return initial, nil
+}
+
+// ReduceRight is like Reduce except that it iterates over elements of collection from right to left.
 // Play: https://go.dev/play/p/Fq3W70l7wXF
-func ReduceRight[T any, R any](collection []T, accumulator func(R, T, int) R, initial R) R {
+func ReduceRight[T, R any](collection []T, accumulator func(agg R, item T, index int) R, initial R) R {
 	for i := len(collection) - 1; i >= 0; i-- {
 		initial = accumulator(initial, collection[i], i)
 	}
@@ -83,18 +170,44 @@ func ReduceRight[T any, R any](collection []T, accumulator func(R, T, int) R, in
 	return initial
 }
 
-// ForEach iterates over elements of collection and invokes iteratee for each element.
+// ReduceRightErr is like ReduceRight except that the accumulator function can return an error.
+// It returns the first error returned by the accumulator function.
+func ReduceRightErr[T, R any](collection []T, accumulator func(agg R, item T, index int) (R, error), initial R) (R, error) {
+	for i := len(collection) - 1; i >= 0; i-- {
+		result, err := accumulator(initial, collection[i], i)
+		if err != nil {
+			var zero R
+			return zero, err
+		}
+		initial = result
+	}
+
+	return initial, nil
+}
+
+// ForEach iterates over elements of collection and invokes callback for each element.
 // Play: https://go.dev/play/p/oofyiUPRf8t
-func ForEach[T any](collection []T, iteratee func(T, int)) {
-	for i, item := range collection {
-		iteratee(item, i)
+func ForEach[T any](collection []T, callback func(item T, index int)) {
+	for i := range collection {
+		callback(collection[i], i)
 	}
 }
 
-// Times invokes the iteratee n times, returning an array of the results of each invocation.
+// ForEachWhile iterates over elements of collection and invokes predicate for each element
+// collection return value decide to continue or break, like do while().
+// Play: https://go.dev/play/p/QnLGt35tnow
+func ForEachWhile[T any](collection []T, predicate func(item T, index int) bool) {
+	for i := range collection {
+		if !predicate(collection[i], i) {
+			break
+		}
+	}
+}
+
+// Times invokes the iteratee n times, returning a slice of the results of each invocation.
 // The iteratee is invoked with index as argument.
 // Play: https://go.dev/play/p/vgQj3Glr6lT
-func Times[T any](count int, iteratee func(int) T) []T {
+func Times[T any](count int, iteratee func(index int) T) []T {
 	result := make([]T, count)
 
 	for i := 0; i < count; i++ {
@@ -104,106 +217,182 @@ func Times[T any](count int, iteratee func(int) T) []T {
 	return result
 }
 
-// Uniq returns a duplicate-free version of an array, in which only the first occurrence of each element is kept.
-// The order of result values is determined by the order they occur in the array.
+// Uniq returns a duplicate-free version of a slice, in which only the first occurrence of each element is kept.
+// The order of result values is determined by the order they occur in the slice.
 // Play: https://go.dev/play/p/DTzbeXZ6iEN
-func Uniq[T comparable](collection []T) []T {
-	result := make([]T, 0, len(collection))
+func Uniq[T comparable, Slice ~[]T](collection Slice) Slice {
+	result := make(Slice, 0, len(collection))
 	seen := make(map[T]struct{}, len(collection))
 
-	for _, item := range collection {
-		if _, ok := seen[item]; ok {
+	for i := range collection {
+		if _, ok := seen[collection[i]]; ok {
 			continue
 		}
 
-		seen[item] = struct{}{}
-		result = append(result, item)
+		seen[collection[i]] = struct{}{}
+		result = append(result, collection[i])
 	}
 
 	return result
 }
 
-// UniqBy returns a duplicate-free version of an array, in which only the first occurrence of each element is kept.
-// The order of result values is determined by the order they occur in the array. It accepts `iteratee` which is
-// invoked for each element in array to generate the criterion by which uniqueness is computed.
+// UniqBy returns a duplicate-free version of a slice, in which only the first occurrence of each element is kept.
+// The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is
+// invoked for each element in the slice to generate the criterion by which uniqueness is computed.
 // Play: https://go.dev/play/p/g42Z3QSb53u
-func UniqBy[T any, U comparable](collection []T, iteratee func(T) U) []T {
-	result := make([]T, 0, len(collection))
+func UniqBy[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) U) Slice {
+	result := make(Slice, 0, len(collection))
 	seen := make(map[U]struct{}, len(collection))
 
-	for _, item := range collection {
-		key := iteratee(item)
+	for i := range collection {
+		key := iteratee(collection[i])
 
 		if _, ok := seen[key]; ok {
 			continue
 		}
 
 		seen[key] = struct{}{}
-		result = append(result, item)
+		result = append(result, collection[i])
 	}
 
 	return result
 }
 
+// UniqByErr returns a duplicate-free version of a slice, in which only the first occurrence of each element is kept.
+// The order of result values is determined by the order they occur in the slice. It accepts `iteratee` which is
+// invoked for each element in the slice to generate the criterion by which uniqueness is computed.
+// It returns the first error returned by the iteratee function.
+func UniqByErr[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) (U, error)) (Slice, error) {
+	result := make(Slice, 0, len(collection))
+	seen := make(map[U]struct{}, len(collection))
+
+	for i := range collection {
+		key, err := iteratee(collection[i])
+		if err != nil {
+			return nil, err
+		}
+
+		if _, ok := seen[key]; ok {
+			continue
+		}
+
+		seen[key] = struct{}{}
+		result = append(result, collection[i])
+	}
+
+	return result, nil
+}
+
 // GroupBy returns an object composed of keys generated from the results of running each element of collection through iteratee.
 // Play: https://go.dev/play/p/XnQBd_v6brd
-func GroupBy[T any, U comparable](collection []T, iteratee func(T) U) map[U][]T {
-	result := map[U][]T{}
+func GroupBy[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) U) map[U]Slice {
+	result := map[U]Slice{}
 
-	for _, item := range collection {
-		key := iteratee(item)
+	for i := range collection {
+		key := iteratee(collection[i])
 
-		result[key] = append(result[key], item)
+		result[key] = append(result[key], collection[i])
 	}
 
 	return result
 }
 
-// Chunk returns an array of elements split into groups the length of size. If array can't be split evenly,
+// GroupByErr returns an object composed of keys generated from the results of running each element of collection through iteratee.
+// It returns the first error returned by the iteratee function.
+func GroupByErr[T any, U comparable, Slice ~[]T](collection Slice, iteratee func(item T) (U, error)) (map[U]Slice, error) {
+	result := map[U]Slice{}
+
+	for i := range collection {
+		key, err := iteratee(collection[i])
+		if err != nil {
+			return nil, err
+		}
+
+		result[key] = append(result[key], collection[i])
+	}
+
+	return result, nil
+}
+
+// GroupByMap returns an object composed of keys generated from the results of running each element of collection through transform.
+// Play: https://go.dev/play/p/iMeruQ3_W80
+func GroupByMap[T any, K comparable, V any](collection []T, transform func(item T) (K, V)) map[K][]V {
+	result := map[K][]V{}
+
+	for i := range collection {
+		k, v := transform(collection[i])
+
+		result[k] = append(result[k], v)
+	}
+
+	return result
+}
+
+// GroupByMapErr returns an object composed of keys generated from the results of running each element of collection through transform.
+// It returns the first error returned by the transform function.
+func GroupByMapErr[T any, K comparable, V any](collection []T, transform func(item T) (K, V, error)) (map[K][]V, error) {
+	result := map[K][]V{}
+
+	for i := range collection {
+		k, v, err := transform(collection[i])
+		if err != nil {
+			return nil, err
+		}
+
+		result[k] = append(result[k], v)
+	}
+
+	return result, nil
+}
+
+// Chunk returns a slice of elements split into groups of length size. If the slice can't be split evenly,
 // the final chunk will be the remaining elements.
-// Play: https://go.dev/play/p/EeKl0AuTehH
-func Chunk[T any](collection []T, size int) [][]T {
+// Play: https://go.dev/play/p/kEMkFbdu85g
+func Chunk[T any, Slice ~[]T](collection Slice, size int) []Slice {
 	if size <= 0 {
-		panic("Second parameter must be greater than 0")
+		panic("lo.Chunk: size must be greater than 0")
 	}
 
 	chunksNum := len(collection) / size
 	if len(collection)%size != 0 {
-		chunksNum += 1
+		chunksNum++
 	}
 
-	result := make([][]T, 0, chunksNum)
+	result := make([]Slice, 0, chunksNum)
 
 	for i := 0; i < chunksNum; i++ {
 		last := (i + 1) * size
 		if last > len(collection) {
 			last = len(collection)
 		}
-		result = append(result, collection[i*size:last])
+
+		// Copy chunk in a new slice, to prevent memory leak and free memory from initial collection.
+		newSlice := make(Slice, last-i*size)
+		copy(newSlice, collection[i*size:last])
+		result = append(result, newSlice)
 	}
 
 	return result
 }
 
-// PartitionBy returns an array of elements split into groups. The order of grouped values is
+// PartitionBy returns a slice of elements split into groups. The order of grouped values is
 // determined by the order they occur in collection. The grouping is generated from the results
 // of running each element of collection through iteratee.
 // Play: https://go.dev/play/p/NfQ_nGjkgXW
-func PartitionBy[T any, K comparable](collection []T, iteratee func(x T) K) [][]T {
-	result := [][]T{}
+func PartitionBy[T any, K comparable, Slice ~[]T](collection Slice, iteratee func(item T) K) []Slice {
+	result := []Slice{}
 	seen := map[K]int{}
 
-	for _, item := range collection {
-		key := iteratee(item)
+	for i := range collection {
+		key := iteratee(collection[i])
 
 		resultIndex, ok := seen[key]
-		if !ok {
-			resultIndex = len(result)
-			seen[key] = resultIndex
-			result = append(result, []T{})
+		if ok {
+			result[resultIndex] = append(result[resultIndex], collection[i])
+		} else {
+			seen[key] = len(result)
+			result = append(result, Slice{collection[i]})
 		}
-
-		result[resultIndex] = append(result[resultIndex], item)
 	}
 
 	return result
@@ -213,15 +402,42 @@ func PartitionBy[T any, K comparable](collection []T, iteratee func(x T) K) [][]
 	// return Values[K, []T](groups)
 }
 
-// Flatten returns an array a single level deep.
+// PartitionByErr partitions a slice into groups determined by a key computed from each element.
+// The order of the partitions is determined by the order they occur in collection. The grouping
+// is generated from the results of running each element of collection through iteratee.
+// It returns the first error returned by the iteratee function.
+func PartitionByErr[T any, K comparable, Slice ~[]T](collection Slice, iteratee func(item T) (K, error)) ([]Slice, error) {
+	result := []Slice{}
+	seen := map[K]int{}
+
+	for i := range collection {
+		key, err := iteratee(collection[i])
+		if err != nil {
+			return nil, err
+		}
+
+		resultIndex, ok := seen[key]
+		if ok {
+			result[resultIndex] = append(result[resultIndex], collection[i])
+		} else {
+			seen[key] = len(result)
+			result = append(result, Slice{collection[i]})
+		}
+	}
+
+	return result, nil
+}
+
+// Flatten returns a slice a single level deep.
+// See also: Concat
 // Play: https://go.dev/play/p/rbp9ORaMpjw
-func Flatten[T any](collection [][]T) []T {
+func Flatten[T any, Slice ~[]T](collection []Slice) Slice {
 	totalLen := 0
 	for i := range collection {
 		totalLen += len(collection[i])
 	}
 
-	result := make([]T, 0, totalLen)
+	result := make(Slice, 0, totalLen)
 	for i := range collection {
 		result = append(result, collection[i]...)
 	}
@@ -229,34 +445,110 @@ func Flatten[T any](collection [][]T) []T {
 	return result
 }
 
-// Shuffle returns an array of shuffled values. Uses the Fisher-Yates shuffle algorithm.
-// Play: https://go.dev/play/p/Qp73bnTDnc7
-func Shuffle[T any](collection []T) []T {
-	rand.Shuffle(len(collection), func(i, j int) {
-		collection[i], collection[j] = collection[j], collection[i]
-	})
-
-	return collection
+// Concat returns a new slice containing all the elements in collections. Concat conserves the order of the elements.
+// See also: Flatten, Union.
+func Concat[T any, Slice ~[]T](collections ...Slice) Slice {
+	return Flatten(collections)
 }
 
-// Reverse reverses array so that the first element becomes the last, the second element becomes the second to last, and so on.
-// Play: https://go.dev/play/p/fhUMLvZ7vS6
-func Reverse[T any](collection []T) []T {
-	length := len(collection)
-	half := length / 2
+// Window creates a slice of sliding windows of a given size.
+// Each window overlaps with the previous one by size-1 elements.
+// This is equivalent to Sliding(collection, size, 1).
+func Window[T any, Slice ~[]T](collection Slice, size int) []Slice {
+	if size <= 0 {
+		panic("lo.Window: size must be greater than 0")
+	}
+	return Sliding(collection, size, 1)
+}
 
-	for i := 0; i < half; i = i + 1 {
-		j := length - 1 - i
-		collection[i], collection[j] = collection[j], collection[i]
+// Sliding creates a slice of sliding windows of a given size with a given step.
+// If step is equal to size, windows don't overlap (similar to Chunk).
+// If step is less than size, windows overlap.
+func Sliding[T any, Slice ~[]T](collection Slice, size, step int) []Slice {
+	if size <= 0 {
+		panic("lo.Sliding: size must be greater than 0")
 	}
 
+	if step <= 0 {
+		panic("lo.Sliding: step must be greater than 0")
+	}
+
+	n := len(collection) - size
+	if n < 0 {
+		return []Slice{}
+	}
+
+	result := make([]Slice, 0, n/step+1)
+
+	for i := 0; i <= n; i += step {
+		window := make(Slice, size)
+		copy(window, collection[i:i+size])
+		result = append(result, window)
+	}
+
+	return result
+}
+
+// Interleave round-robin alternating input slices and sequentially appending value at index into result.
+// Play: https://go.dev/play/p/-RJkTLQEDVt
+func Interleave[T any, Slice ~[]T](collections ...Slice) Slice {
+	if len(collections) == 0 {
+		return Slice{}
+	}
+
+	maxSize := 0
+	totalSize := 0
+	for i := range collections {
+		size := len(collections[i])
+		totalSize += size
+		if size > maxSize {
+			maxSize = size
+		}
+	}
+
+	if maxSize == 0 {
+		return Slice{}
+	}
+
+	result := make(Slice, totalSize)
+
+	resultIdx := 0
+	for i := 0; i < maxSize; i++ {
+		for j := range collections {
+			if len(collections[j])-1 < i {
+				continue
+			}
+
+			result[resultIdx] = collections[j][i]
+			resultIdx++
+		}
+	}
+
+	return result
+}
+
+// Shuffle returns a slice of shuffled values. Uses the Fisher-Yates shuffle algorithm.
+// Play: https://go.dev/play/p/ZTGG7OUCdnp
+//
+// Deprecated: use mutable.Shuffle() instead.
+func Shuffle[T any, Slice ~[]T](collection Slice) Slice {
+	mutable.Shuffle(collection)
 	return collection
 }
 
-// Fill fills elements of array with `initial` value.
+// Reverse reverses a slice so that the first element becomes the last, the second element becomes the second to last, and so on.
+// Play: https://go.dev/play/p/iv2e9jslfBM
+//
+// Deprecated: use mutable.Reverse() instead.
+func Reverse[T any, Slice ~[]T](collection Slice) Slice {
+	mutable.Reverse(collection)
+	return collection
+}
+
+// Fill fills elements of a slice with `initial` value.
 // Play: https://go.dev/play/p/VwR34GzqEub
-func Fill[T Clonable[T]](collection []T, initial T) []T {
-	result := make([]T, 0, len(collection))
+func Fill[T Clonable[T], Slice ~[]T](collection Slice, initial T) Slice {
+	result := make(Slice, 0, len(collection))
 
 	for range collection {
 		result = append(result, initial.Clone())
@@ -279,38 +571,81 @@ func Repeat[T Clonable[T]](count int, initial T) []T {
 
 // RepeatBy builds a slice with values returned by N calls of callback.
 // Play: https://go.dev/play/p/ozZLCtX_hNU
-func RepeatBy[T any](count int, predicate func(int) T) []T {
+func RepeatBy[T any](count int, callback func(index int) T) []T {
 	result := make([]T, 0, count)
 
 	for i := 0; i < count; i++ {
-		result = append(result, predicate(i))
+		result = append(result, callback(i))
 	}
 
 	return result
 }
 
-// KeyBy transforms a slice or an array of structs to a map based on a pivot callback.
-// Play: https://go.dev/play/p/mdaClUAT-zZ
-func KeyBy[K comparable, V any](collection []V, iteratee func(V) K) map[K]V {
+// RepeatByErr builds a slice with values returned by N calls of callback.
+// It returns the first error returned by the callback function.
+func RepeatByErr[T any](count int, callback func(index int) (T, error)) ([]T, error) {
+	result := make([]T, 0, count)
+
+	for i := 0; i < count; i++ {
+		r, err := callback(i)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, r)
+	}
+
+	return result, nil
+}
+
+// KeyBy transforms a slice or a slice of structs to a map based on a pivot callback.
+// Play: https://go.dev/play/p/ccUiUL_Lnel
+func KeyBy[K comparable, V any](collection []V, iteratee func(item V) K) map[K]V {
 	result := make(map[K]V, len(collection))
 
-	for _, v := range collection {
-		k := iteratee(v)
-		result[k] = v
+	for i := range collection {
+		k := iteratee(collection[i])
+		result[k] = collection[i]
 	}
 
 	return result
 }
 
+// KeyByErr transforms a slice or a slice of structs to a map based on a pivot callback to compute keys.
+// Iteratee can return an error to stop iteration immediately.
+// Play: https://go.dev/play/p/ccUiUL_Lnel
+func KeyByErr[K comparable, V any](collection []V, iteratee func(item V) (K, error)) (map[K]V, error) {
+	result := make(map[K]V, len(collection))
+
+	for i := range collection {
+		k, err := iteratee(collection[i])
+		if err != nil {
+			return nil, err
+		}
+		result[k] = collection[i]
+	}
+
+	return result, nil
+}
+
 // Associate returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
-// If any of two pairs would have the same key the last one gets added to the map.
-// The order of keys in returned map is not specified and is not guaranteed to be the same from the original array.
+// If any of two pairs have the same key the last one gets added to the map.
+// The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
 // Play: https://go.dev/play/p/WHa2CfMO3Lr
-func Associate[T any, K comparable, V any](collection []T, transform func(T) (K, V)) map[K]V {
-	result := make(map[K]V)
+func Associate[T any, K comparable, V any](collection []T, transform func(item T) (K, V)) map[K]V {
+	return AssociateI(collection, func(item T, _ int) (K, V) {
+		return transform(item)
+	})
+}
 
-	for _, t := range collection {
-		k, v := transform(t)
+// AssociateI returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
+// If any of two pairs have the same key the last one gets added to the map.
+// The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
+// Play: https://go.dev/play/p/Ugmz6S22rRO
+func AssociateI[T any, K comparable, V any](collection []T, transform func(item T, index int) (K, V)) map[K]V {
+	result := make(map[K]V, len(collection))
+
+	for index, item := range collection {
+		k, v := transform(item, index)
 		result[k] = v
 	}
 
@@ -318,40 +653,98 @@ func Associate[T any, K comparable, V any](collection []T, transform func(T) (K,
 }
 
 // SliceToMap returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
-// If any of two pairs would have the same key the last one gets added to the map.
-// The order of keys in returned map is not specified and is not guaranteed to be the same from the original array.
+// If any of two pairs have the same key the last one gets added to the map.
+// The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
 // Alias of Associate().
 // Play: https://go.dev/play/p/WHa2CfMO3Lr
-func SliceToMap[T any, K comparable, V any](collection []T, transform func(T) (K, V)) map[K]V {
+func SliceToMap[T any, K comparable, V any](collection []T, transform func(item T) (K, V)) map[K]V {
 	return Associate(collection, transform)
 }
 
-// Drop drops n elements from the beginning of a slice or array.
-// Play: https://go.dev/play/p/JswS7vXRJP2
-func Drop[T any](collection []T, n int) []T {
-	if len(collection) <= n {
-		return make([]T, 0)
+// SliceToMapI returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
+// If any of two pairs have the same key the last one gets added to the map.
+// The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
+// Alias of AssociateI().
+// Play: https://go.dev/play/p/mMBm5GV3_eq
+func SliceToMapI[T any, K comparable, V any](collection []T, transform func(item T, index int) (K, V)) map[K]V {
+	return AssociateI(collection, transform)
+}
+
+// FilterSliceToMap returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
+// If any of two pairs have the same key the last one gets added to the map.
+// The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
+// The third return value of the transform function is a boolean that indicates whether the key-value pair should be included in the map.
+// Play: https://go.dev/play/p/2z0rDz2ZSGU
+func FilterSliceToMap[T any, K comparable, V any](collection []T, transform func(item T) (K, V, bool)) map[K]V {
+	return FilterSliceToMapI(collection, func(item T, _ int) (K, V, bool) {
+		return transform(item)
+	})
+}
+
+// FilterSliceToMapI returns a map containing key-value pairs provided by transform function applied to elements of the given slice.
+// If any of two pairs have the same key the last one gets added to the map.
+// The order of keys in returned map is not specified and is not guaranteed to be the same from the original slice.
+// The third return value of the transform function is a boolean that indicates whether the key-value pair should be included in the map.
+// Play: https://go.dev/play/p/mSz_bUIk9aJ
+func FilterSliceToMapI[T any, K comparable, V any](collection []T, transform func(item T, index int) (K, V, bool)) map[K]V {
+	result := make(map[K]V, len(collection))
+
+	for index, item := range collection {
+		k, v, ok := transform(item, index)
+		if ok {
+			result[k] = v
+		}
 	}
 
-	result := make([]T, 0, len(collection)-n)
+	return result
+}
+
+// Keyify returns a map with each unique element of the slice as a key.
+// Play: https://go.dev/play/p/RYhhM_csqIG
+func Keyify[T comparable, Slice ~[]T](collection Slice) map[T]struct{} {
+	result := make(map[T]struct{}, len(collection))
+
+	for i := range collection {
+		result[collection[i]] = struct{}{}
+	}
+
+	return result
+}
+
+// Drop drops n elements from the beginning of a slice.
+// Play: https://go.dev/play/p/JswS7vXRJP2
+func Drop[T any, Slice ~[]T](collection Slice, n int) Slice {
+	if n < 0 {
+		panic("lo.Drop: n must not be negative")
+	}
+
+	if len(collection) <= n {
+		return make(Slice, 0)
+	}
+
+	result := make(Slice, 0, len(collection)-n)
 
 	return append(result, collection[n:]...)
 }
 
-// DropRight drops n elements from the end of a slice or array.
+// DropRight drops n elements from the end of a slice.
 // Play: https://go.dev/play/p/GG0nXkSJJa3
-func DropRight[T any](collection []T, n int) []T {
-	if len(collection) <= n {
-		return []T{}
+func DropRight[T any, Slice ~[]T](collection Slice, n int) Slice {
+	if n < 0 {
+		panic("lo.DropRight: n must not be negative")
 	}
 
-	result := make([]T, 0, len(collection)-n)
+	if len(collection) <= n {
+		return Slice{}
+	}
+
+	result := make(Slice, 0, len(collection)-n)
 	return append(result, collection[:len(collection)-n]...)
 }
 
-// DropWhile drops elements from the beginning of a slice or array while the predicate returns true.
+// DropWhile drops elements from the beginning of a slice while the predicate returns true.
 // Play: https://go.dev/play/p/7gBPYw2IK16
-func DropWhile[T any](collection []T, predicate func(T) bool) []T {
+func DropWhile[T any, Slice ~[]T](collection Slice, predicate func(item T) bool) Slice {
 	i := 0
 	for ; i < len(collection); i++ {
 		if !predicate(collection[i]) {
@@ -359,13 +752,13 @@ func DropWhile[T any](collection []T, predicate func(T) bool) []T {
 		}
 	}
 
-	result := make([]T, 0, len(collection)-i)
+	result := make(Slice, 0, len(collection)-i)
 	return append(result, collection[i:]...)
 }
 
-// DropRightWhile drops elements from the end of a slice or array while the predicate returns true.
+// DropRightWhile drops elements from the end of a slice while the predicate returns true.
 // Play: https://go.dev/play/p/3-n71oEC0Hz
-func DropRightWhile[T any](collection []T, predicate func(T) bool) []T {
+func DropRightWhile[T any, Slice ~[]T](collection Slice, predicate func(item T) bool) Slice {
 	i := len(collection) - 1
 	for ; i >= 0; i-- {
 		if !predicate(collection[i]) {
@@ -373,29 +766,193 @@ func DropRightWhile[T any](collection []T, predicate func(T) bool) []T {
 		}
 	}
 
-	result := make([]T, 0, i+1)
+	result := make(Slice, 0, i+1)
 	return append(result, collection[:i+1]...)
 }
 
-// Reject is the opposite of Filter, this method returns the elements of collection that predicate does not return truthy for.
-// Play: https://go.dev/play/p/YkLMODy1WEL
-func Reject[V any](collection []V, predicate func(V, int) bool) []V {
-	result := []V{}
+// Take takes the first n elements from a slice.
+func Take[T any, Slice ~[]T](collection Slice, n int) Slice {
+	if n < 0 {
+		panic("lo.Take: n must not be negative")
+	}
 
-	for i, item := range collection {
-		if !predicate(item, i) {
-			result = append(result, item)
+	if n == 0 {
+		return make(Slice, 0)
+	}
+
+	size := len(collection)
+	if size == 0 {
+		return make(Slice, 0)
+	}
+
+	if n >= size {
+		result := make(Slice, size)
+		copy(result, collection)
+		return result
+	}
+
+	result := make(Slice, n)
+	copy(result, collection)
+	return result
+}
+
+// TakeWhile takes elements from the beginning of a slice while the predicate returns true.
+func TakeWhile[T any, Slice ~[]T](collection Slice, predicate func(item T) bool) Slice {
+	i := 0
+	for ; i < len(collection); i++ {
+		if !predicate(collection[i]) {
+			break
+		}
+	}
+
+	result := make(Slice, i)
+	copy(result, collection[:i])
+	return result
+}
+
+// DropByIndex drops elements from a slice by the index.
+// A negative index will drop elements from the end of the slice.
+// Play: https://go.dev/play/p/bPIH4npZRxS
+func DropByIndex[T any, Slice ~[]T](collection Slice, indexes ...int) Slice {
+	initialSize := len(collection)
+	if initialSize == 0 {
+		return Slice{}
+	}
+
+	// do not change the input
+	indexes = append(make([]int, 0, len(indexes)), indexes...)
+
+	for i, index := range indexes {
+		if index < 0 {
+			indexes[i] += initialSize
+		}
+	}
+
+	sort.Ints(indexes)
+
+	prev := -1
+	indexes = mutable.Filter(indexes, func(index int) bool {
+		ok := index != prev && // uniq
+			uint(index) < uint(initialSize) // in range
+
+		prev = index
+		return ok
+	})
+
+	result := make(Slice, 0, initialSize-len(indexes))
+
+	i := 0
+	for _, index := range indexes {
+		result = append(result, collection[i:index]...)
+		i = index + 1
+	}
+
+	return append(result, collection[i:]...)
+}
+
+// TakeFilter filters elements and takes the first n elements that match the predicate.
+// Equivalent to calling Take(Filter(...)), but more efficient as it stops after finding n matches.
+func TakeFilter[T any, Slice ~[]T](collection Slice, n int, predicate func(item T, index int) bool) Slice {
+	if n < 0 {
+		panic("lo.TakeFilter: n must not be negative")
+	}
+
+	if n == 0 {
+		return make(Slice, 0)
+	}
+
+	result := make(Slice, 0, n)
+	count := 0
+
+	for i := range collection {
+		if predicate(collection[i], i) {
+			result = append(result, collection[i])
+			count++
+			if count >= n {
+				break
+			}
 		}
 	}
 
 	return result
 }
 
-// Count counts the number of elements in the collection that compare equal to value.
+// Reject is the opposite of Filter, this method returns the elements of collection that predicate does not return true for.
+// Play: https://go.dev/play/p/pFCF5WVB225
+func Reject[T any, Slice ~[]T](collection Slice, predicate func(item T, index int) bool) Slice {
+	result := Slice{}
+
+	for i := range collection {
+		if !predicate(collection[i], i) {
+			result = append(result, collection[i])
+		}
+	}
+
+	return result
+}
+
+// RejectErr is the opposite of FilterErr, this method returns the elements of collection that predicate does not return true for.
+// If the predicate returns an error, iteration stops immediately and returns the error.
+// Play: https://go.dev/play/p/pFCF5WVB225
+func RejectErr[T any, Slice ~[]T](collection Slice, predicate func(item T, index int) (bool, error)) (Slice, error) {
+	result := Slice{}
+
+	for i := range collection {
+		match, err := predicate(collection[i], i)
+		if err != nil {
+			return nil, err
+		}
+		if !match {
+			result = append(result, collection[i])
+		}
+	}
+
+	return result, nil
+}
+
+// RejectMap is the opposite of FilterMap, this method returns a slice obtained after both filtering and mapping using the given callback function.
+// The callback function should return two values:
+//   - the result of the mapping operation and
+//   - whether the result element should be included or not.
+//
+// Play: https://go.dev/play/p/W9Ug9r0QFkL
+func RejectMap[T, R any](collection []T, callback func(item T, index int) (R, bool)) []R {
+	result := []R{}
+
+	for i := range collection {
+		if r, ok := callback(collection[i], i); !ok {
+			result = append(result, r)
+		}
+	}
+
+	return result
+}
+
+// FilterReject mixes Filter and Reject, this method returns two slices, one for the elements of collection that
+// predicate returns true for and one for the elements that predicate does not return true for.
+// Play: https://go.dev/play/p/lHSEGSznJjB
+func FilterReject[T any, Slice ~[]T](collection Slice, predicate func(T, int) bool) (kept, rejected Slice) {
+	kept = make(Slice, 0, len(collection))
+	rejected = make(Slice, 0, len(collection))
+
+	for i := range collection {
+		if predicate(collection[i], i) {
+			kept = append(kept, collection[i])
+		} else {
+			rejected = append(rejected, collection[i])
+		}
+	}
+
+	return kept, rejected
+}
+
+// Count counts the number of elements in the collection that equal value.
 // Play: https://go.dev/play/p/Y3FlK54yveC
-func Count[T comparable](collection []T, value T) (count int) {
-	for _, item := range collection {
-		if item == value {
+func Count[T comparable](collection []T, value T) int {
+	var count int
+
+	for i := range collection {
+		if collection[i] == value {
 			count++
 		}
 	}
@@ -405,9 +962,11 @@ func Count[T comparable](collection []T, value T) (count int) {
 
 // CountBy counts the number of elements in the collection for which predicate is true.
 // Play: https://go.dev/play/p/ByQbNYQQi4X
-func CountBy[T any](collection []T, predicate func(T) bool) (count int) {
-	for _, item := range collection {
-		if predicate(item) {
+func CountBy[T any](collection []T, predicate func(item T) bool) int {
+	var count int
+
+	for i := range collection {
+		if predicate(collection[i]) {
 			count++
 		}
 	}
@@ -415,9 +974,52 @@ func CountBy[T any](collection []T, predicate func(T) bool) (count int) {
 	return count
 }
 
+// CountByErr counts the number of elements in the collection for which predicate is true.
+// It returns the first error returned by the predicate.
+func CountByErr[T any](collection []T, predicate func(item T) (bool, error)) (int, error) {
+	var count int
+
+	for i := range collection {
+		ok, err := predicate(collection[i])
+		if err != nil {
+			return 0, err
+		}
+		if ok {
+			count++
+		}
+	}
+
+	return count, nil
+}
+
+// CountValues counts the number of each element in the collection.
+// Play: https://go.dev/play/p/-p-PyLT4dfy
+func CountValues[T comparable](collection []T) map[T]int {
+	result := make(map[T]int)
+
+	for i := range collection {
+		result[collection[i]]++
+	}
+
+	return result
+}
+
+// CountValuesBy counts the number of each element returned from transform function.
+// Is equivalent to chaining lo.Map and lo.CountValues.
+// Play: https://go.dev/play/p/2U0dG1SnOmS
+func CountValuesBy[T any, U comparable](collection []T, transform func(item T) U) map[U]int {
+	result := make(map[U]int)
+
+	for i := range collection {
+		result[transform(collection[i])]++
+	}
+
+	return result
+}
+
 // Subset returns a copy of a slice from `offset` up to `length` elements. Like `slice[start:start+length]`, but does not panic on overflow.
 // Play: https://go.dev/play/p/tOQu1GhFcog
-func Subset[T any](collection []T, offset int, length uint) []T {
+func Subset[T any, Slice ~[]T](collection Slice, offset int, length uint) Slice {
 	size := len(collection)
 
 	if offset < 0 {
@@ -428,7 +1030,7 @@ func Subset[T any](collection []T, offset int, length uint) []T {
 	}
 
 	if offset > size {
-		return []T{}
+		return Slice{}
 	}
 
 	if length > uint(size)-uint(offset) {
@@ -438,20 +1040,23 @@ func Subset[T any](collection []T, offset int, length uint) []T {
 	return collection[offset : offset+int(length)]
 }
 
-// Slice returns a copy of a slice from `start` up to, but not including `end`. Like `slice[start:end]`, but does not panic on overflow.
+// Slice returns a slice from `start` up to, but not including `end`. Like `slice[start:end]`, but does not panic on overflow.
 // Play: https://go.dev/play/p/8XWYhfMMA1h
-func Slice[T any](collection []T, start int, end int) []T {
-	size := len(collection)
-
+func Slice[T any, Slice ~[]T](collection Slice, start, end int) Slice {
 	if start >= end {
-		return []T{}
+		return Slice{}
 	}
 
-	if start > size {
+	size := len(collection)
+	if start < 0 {
+		start = 0
+	} else if start > size {
 		start = size
 	}
 
-	if end > size {
+	if end < 0 {
+		end = 0
+	} else if end > size {
 		end = size
 	}
 
@@ -460,13 +1065,13 @@ func Slice[T any](collection []T, start int, end int) []T {
 
 // Replace returns a copy of the slice with the first n non-overlapping instances of old replaced by new.
 // Play: https://go.dev/play/p/XfPzmf9gql6
-func Replace[T comparable](collection []T, old T, new T, n int) []T {
-	result := make([]T, len(collection))
+func Replace[T comparable, Slice ~[]T](collection Slice, old, nEw T, n int) Slice {
+	result := make(Slice, len(collection))
 	copy(result, collection)
 
 	for i := range result {
 		if result[i] == old && n != 0 {
-			result[i] = new
+			result[i] = nEw
 			n--
 		}
 	}
@@ -476,20 +1081,34 @@ func Replace[T comparable](collection []T, old T, new T, n int) []T {
 
 // ReplaceAll returns a copy of the slice with all non-overlapping instances of old replaced by new.
 // Play: https://go.dev/play/p/a9xZFUHfYcV
-func ReplaceAll[T comparable](collection []T, old T, new T) []T {
-	return Replace(collection, old, new, -1)
+func ReplaceAll[T comparable, Slice ~[]T](collection Slice, old, nEw T) Slice {
+	return Replace(collection, old, nEw, -1)
+}
+
+// Clone returns a shallow copy of the collection.
+func Clone[T any, Slice ~[]T](collection Slice) Slice {
+	// backporting from slices.Clone in Go 1.21
+	// when we drop support for Go 1.20, this can be replaced with: return slices.Clone(collection)
+
+	// Preserve nilness in case it matters.
+	if collection == nil {
+		return nil
+	}
+	// Avoid s[:0:0] as it leads to unwanted liveness when cloning a
+	// zero-length slice of a large array; see https://go.dev/issue/68488.
+	return append(Slice{}, collection...)
 }
 
 // Compact returns a slice of all non-zero elements.
 // Play: https://go.dev/play/p/tXiy-iK6PAc
-func Compact[T comparable](collection []T) []T {
+func Compact[T comparable, Slice ~[]T](collection Slice) Slice {
 	var zero T
 
-	result := []T{}
+	result := make(Slice, 0, len(collection))
 
-	for _, item := range collection {
-		if item != zero {
-			result = append(result, item)
+	for i := range collection {
+		if collection[i] != zero {
+			result = append(result, collection[i])
 		}
 	}
 
@@ -508,9 +1127,8 @@ func IsSorted[T constraints.Ordered](collection []T) bool {
 	return true
 }
 
-// IsSortedByKey checks if a slice is sorted by iteratee.
-// Play: https://go.dev/play/p/wiG6XyBBu49
-func IsSortedByKey[T any, K constraints.Ordered](collection []T, iteratee func(T) K) bool {
+// IsSortedBy checks if a slice is sorted by iteratee.
+func IsSortedBy[T any, K constraints.Ordered](collection []T, iteratee func(item T) K) bool {
 	size := len(collection)
 
 	for i := 0; i < size-1; i++ {
@@ -521,3 +1139,160 @@ func IsSortedByKey[T any, K constraints.Ordered](collection []T, iteratee func(T
 
 	return true
 }
+
+// IsSortedByKey checks if a slice is sorted by iteratee.
+//
+// Deprecated: Use lo.IsSortedBy instead.
+func IsSortedByKey[T any, K constraints.Ordered](collection []T, iteratee func(item T) K) bool {
+	return IsSortedBy(collection, iteratee)
+}
+
+// Splice inserts multiple elements at index i. A negative index counts back
+// from the end of the slice. The helper is protected against overflow errors.
+// Play: https://go.dev/play/p/G5_GhkeSUBA
+func Splice[T any, Slice ~[]T](collection Slice, i int, elements ...T) Slice {
+	sizeCollection := len(collection)
+	sizeElements := len(elements)
+	output := make(Slice, 0, sizeCollection+sizeElements) // preallocate memory for the output slice
+
+	switch {
+	case sizeElements == 0:
+		return append(output, collection...) // simple copy
+	case i > sizeCollection:
+		// positive overflow
+		return append(append(output, collection...), elements...)
+	case i < -sizeCollection:
+		// negative overflow
+		return append(append(output, elements...), collection...)
+	case i < 0:
+		// backward
+		i = sizeCollection + i
+	}
+
+	return append(append(append(output, collection[:i]...), elements...), collection[i:]...)
+}
+
+// Cut slices collection around the first instance of separator, returning the part of collection
+// before and after separator. The found result reports whether separator appears in collection.
+// If separator does not appear in s, cut returns collection, empty slice of []T, false.
+// Play: https://go.dev/play/p/GiL3qhpIP3f
+func Cut[T comparable, Slice ~[]T](collection, separator Slice) (before, after Slice, found bool) {
+	if len(separator) == 0 {
+		return make(Slice, 0), collection, true
+	}
+
+	for i := 0; i+len(separator) <= len(collection); i++ {
+		match := true
+		for j := 0; j < len(separator); j++ {
+			if collection[i+j] != separator[j] {
+				match = false
+				break
+			}
+		}
+		if match {
+			return collection[:i], collection[i+len(separator):], true
+		}
+	}
+
+	return collection, make(Slice, 0), false
+}
+
+// CutPrefix returns collection without the provided leading prefix []T
+// and reports whether it found the prefix.
+// If s doesn't start with prefix, CutPrefix returns collection, false.
+// If prefix is the empty []T, CutPrefix returns collection, true.
+// Play: https://go.dev/play/p/7Plak4a1ICl
+func CutPrefix[T comparable, Slice ~[]T](collection, separator Slice) (after Slice, found bool) {
+	if HasPrefix(collection, separator) {
+		return collection[len(separator):], true
+	}
+	return collection, false
+}
+
+// CutSuffix returns collection without the provided ending suffix []T and reports
+// whether it found the suffix. If s doesn't end with suffix, CutSuffix returns collection, false.
+// If suffix is the empty []T, CutSuffix returns collection, true.
+// Play: https://go.dev/play/p/7FKfBFvPTaT
+func CutSuffix[T comparable, Slice ~[]T](collection, separator Slice) (before Slice, found bool) {
+	if HasSuffix(collection, separator) {
+		return collection[:len(collection)-len(separator)], true
+	}
+	return collection, false
+}
+
+// Trim removes all the leading and trailing cutset from the collection.
+// Play: https://go.dev/play/p/1an9mxLdRG5
+func Trim[T comparable, Slice ~[]T](collection, cutset Slice) Slice {
+	set := Keyify(cutset)
+
+	i := 0
+	for ; i < len(collection); i++ {
+		if _, ok := set[collection[i]]; !ok {
+			break
+		}
+	}
+
+	if i >= len(collection) {
+		return Slice{}
+	}
+
+	j := len(collection) - 1
+	for ; j >= 0; j-- {
+		if _, ok := set[collection[j]]; !ok {
+			break
+		}
+	}
+
+	result := make(Slice, 0, j+1-i)
+	return append(result, collection[i:j+1]...)
+}
+
+// TrimLeft removes all the leading cutset from the collection.
+// Play: https://go.dev/play/p/74aqfAYLmyi
+func TrimLeft[T comparable, Slice ~[]T](collection, cutset Slice) Slice {
+	set := Keyify(cutset)
+
+	return DropWhile(collection, func(item T) bool {
+		_, ok := set[item]
+		return ok
+	})
+}
+
+// TrimPrefix removes all the leading prefix from the collection.
+// Play: https://go.dev/play/p/SHO6X-YegPg
+func TrimPrefix[T comparable, Slice ~[]T](collection, prefix Slice) Slice {
+	if len(prefix) == 0 {
+		return collection
+	}
+
+	for HasPrefix(collection, prefix) {
+		collection = collection[len(prefix):]
+	}
+
+	return collection
+}
+
+// TrimRight removes all the trailing cutset from the collection.
+// Play: https://go.dev/play/p/MRpAfR6sf0g
+func TrimRight[T comparable, Slice ~[]T](collection, cutset Slice) Slice {
+	set := Keyify(cutset)
+
+	return DropRightWhile(collection, func(item T) bool {
+		_, ok := set[item]
+		return ok
+	})
+}
+
+// TrimSuffix removes all the trailing suffix from the collection.
+// Play: https://go.dev/play/p/IjEUrV0iofq
+func TrimSuffix[T comparable, Slice ~[]T](collection, suffix Slice) Slice {
+	if len(suffix) == 0 {
+		return collection
+	}
+
+	for HasSuffix(collection, suffix) {
+		collection = collection[:len(collection)-len(suffix)]
+	}
+
+	return collection
+}
diff --git a/vendor/github.com/samber/lo/string.go b/vendor/github.com/samber/lo/string.go
index a63167cb1..9b0fc6e95 100644
--- a/vendor/github.com/samber/lo/string.go
+++ b/vendor/github.com/samber/lo/string.go
@@ -1,49 +1,211 @@
 package lo
 
 import (
+	"math"
+	"regexp"
+	"strings"
+	"unicode"
 	"unicode/utf8"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+
+	"github.com/samber/lo/internal/xrand"
 )
 
-// Substring return part of a string.
-// Play: https://go.dev/play/p/TQlxQi82Lu1
-func Substring[T ~string](str T, offset int, length uint) T {
-	size := len(str)
+var (
+	//nolint:revive
+	LowerCaseLettersCharset = []rune("abcdefghijklmnopqrstuvwxyz")
+	UpperCaseLettersCharset = []rune("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+	LettersCharset          = append(LowerCaseLettersCharset, UpperCaseLettersCharset...)
+	NumbersCharset          = []rune("0123456789")
+	AlphanumericCharset     = append(LettersCharset, NumbersCharset...)
+	SpecialCharset          = []rune("!@#$%^&*()_+-=[]{}|;':\",./<>?")
+	AllCharset              = append(AlphanumericCharset, SpecialCharset...)
 
-	if offset < 0 {
-		offset = size + offset
-		if offset < 0 {
-			offset = 0
+	// bearer:disable go_lang_permissive_regex_validation
+	splitWordReg = regexp.MustCompile(`([a-z])([A-Z0-9])|([a-zA-Z])([0-9])|([0-9])([a-zA-Z])|([A-Z])([A-Z])([a-z])`)
+	// bearer:disable go_lang_permissive_regex_validation
+	splitNumberLetterReg = regexp.MustCompile(`([0-9])([a-zA-Z])`)
+	maximumCapacity      = math.MaxInt>>1 + 1
+)
+
+// RandomString return a random string.
+// Play: https://go.dev/play/p/rRseOQVVum4
+func RandomString(size int, charset []rune) string {
+	if size <= 0 {
+		panic("lo.RandomString: size must be greater than 0")
+	}
+	if len(charset) == 0 {
+		panic("lo.RandomString: charset must not be empty")
+	}
+
+	// see https://stackoverflow.com/questions/22892120/how-to-generate-a-random-string-of-a-fixed-length-in-go
+	var sb strings.Builder
+	sb.Grow(size)
+
+	if len(charset) == 1 {
+		// Edge case, because if the charset is a single character,
+		// it will panic below (divide by zero).
+		// -> https://github.com/samber/lo/issues/679
+		for i := 0; i < size; i++ {
+			sb.WriteRune(charset[0])
 		}
+		return sb.String()
 	}
 
-	if offset > size {
-		return Empty[T]()
+	// Calculate the number of bits required to represent the charset,
+	// e.g., for 62 characters, it would need 6 bits (since 62 -> 64 = 2^6)
+	letterIDBits := int(math.Log2(float64(nearestPowerOfTwo(len(charset)))))
+	// Determine the corresponding bitmask,
+	// e.g., for 62 characters, the bitmask would be 111111.
+	var letterIDMask int64 = 1<= 0; {
+		// Regenerate the random number if all available bits have been used
+		if remain == 0 {
+			cache, remain = xrand.Int64(), letterIDMax
+		}
+		// Select a character from the charset
+		if idx := int(cache & letterIDMask); idx < len(charset) {
+			sb.WriteRune(charset[idx])
+			i--
+		}
+		// Shift the bits to the right to prepare for the next character selection,
+		// e.g., for 62 characters, shift by 6 bits.
+		cache >>= letterIDBits
+		// Decrease the remaining number of uses for the current random number.
+		remain--
 	}
-
-	if length > uint(size)-uint(offset) {
-		length = uint(size - offset)
-	}
-
-	return str[offset : offset+int(length)]
+	return sb.String()
 }
 
-// ChunkString returns an array of strings split into groups the length of size. If array can't be split evenly,
-// the final chunk will be the remaining elements.
-// Play: https://go.dev/play/p/__FLTuJVz54
-func ChunkString[T ~string](str T, size int) []T {
-	if size <= 0 {
-		panic("lo.ChunkString: Size parameter must be greater than 0")
+// nearestPowerOfTwo returns the nearest power of two.
+func nearestPowerOfTwo(capacity int) int {
+	n := capacity - 1
+	n |= n >> 1
+	n |= n >> 2
+	n |= n >> 4
+	n |= n >> 8
+	n |= n >> 16
+	if n < 0 {
+		return 1
+	}
+	if n >= maximumCapacity {
+		return maximumCapacity
+	}
+	return n + 1
+}
+
+// Substring extracts a substring from a string with Unicode character (rune) awareness.
+// offset - starting position of the substring (can be positive, negative, or zero)
+// length - number of characters to extract
+// With positive offset, counting starts from the beginning of the string
+// With negative offset, counting starts from the end of the string
+// Play: https://go.dev/play/p/TQlxQi82Lu1
+func Substring[T ~string](str T, offset int, length uint) T {
+	str = substring(str, offset, length)
+
+	// Validate UTF-8 and fix invalid sequences
+	if !utf8.ValidString(string(str)) {
+		// Convert to []rune to replicate behavior with duplicated �
+		str = T([]rune(str))
 	}
 
-	if len(str) == 0 {
-		return []T{""}
+	// Remove null bytes from result
+	return T(strings.ReplaceAll(string(str), "\x00", ""))
+}
+
+func substring[T ~string](str T, offset int, length uint) T {
+	switch {
+	// Empty length or offset beyond string bounds - return empty string
+	case length == 0, offset >= len(str):
+		return ""
+
+	// Positive offset - count from the beginning
+	case offset > 0:
+		// Skip offset runes from the start
+		for i, r := range str {
+			if offset--; offset == 0 {
+				str = str[i+utf8.RuneLen(r):]
+				break
+			}
+		}
+
+		// If couldn't skip enough runes - string is shorter than offset
+		if offset != 0 {
+			return ""
+		}
+
+		// If remaining string is shorter than or equal to length - return it entirely
+		if uint(len(str)) <= length {
+			return str
+		}
+
+		// Otherwise proceed to trimming by length
+		fallthrough
+
+	// Zero offset or offset less than minus string length - start from beginning
+	case offset < -len(str), offset == 0:
+		// Count length runes from the start
+		for i := range str {
+			if length == 0 {
+				return str[:i]
+			}
+			length--
+		}
+
+		return str
+
+	// Negative offset - count from the end of string
+	default: // -len(str) < offset < 0
+		// Helper function to move backward through runes
+		backwardPos := func(end int, count uint) (start int) {
+			for {
+				_, i := utf8.DecodeLastRuneInString(string(str[:end]))
+				end -= i
+
+				if count--; count == 0 || end == 0 {
+					return end
+				}
+			}
+		}
+
+		offset := uint(-offset)
+
+		// If offset is less than or equal to length - take from position to end
+		if offset <= length {
+			start := backwardPos(len(str), offset)
+			return str[start:]
+		}
+
+		// Otherwise calculate start and end positions
+		end := backwardPos(len(str), offset-length)
+		start := backwardPos(end, length)
+
+		return str[start:end]
+	}
+}
+
+// ChunkString returns a slice of strings split into groups of length size. If the string can't be split evenly,
+// the final chunk will be the remaining characters.
+// Play: https://go.dev/play/p/__FLTuJVz54
+//
+// Note: lo.ChunkString and lo.Chunk functions behave inconsistently for empty input: lo.ChunkString("", n) returns [""] instead of [].
+// See https://github.com/samber/lo/issues/788
+func ChunkString[T ~string](str T, size int) []T {
+	if size <= 0 {
+		panic("lo.ChunkString: size must be greater than 0")
 	}
 
 	if size >= len(str) {
 		return []T{str}
 	}
 
-	var chunks []T = make([]T, 0, ((len(str)-1)/size)+1)
+	chunks := make([]T, 0, ((len(str)-1)/size)+1)
 	currentLen := 0
 	currentStart := 0
 	for i := range str {
@@ -63,3 +225,94 @@ func ChunkString[T ~string](str T, size int) []T {
 func RuneLength(str string) int {
 	return utf8.RuneCountInString(str)
 }
+
+// PascalCase converts string to pascal case.
+// Play: https://go.dev/play/p/Dy_V_6DUYhe
+func PascalCase(str string) string {
+	items := Words(str)
+	for i := range items {
+		items[i] = Capitalize(items[i])
+	}
+	return strings.Join(items, "")
+}
+
+// CamelCase converts string to camel case.
+// Play: https://go.dev/play/p/Go6aKwUiq59
+func CamelCase(str string) string {
+	items := Words(str)
+	for i, item := range items {
+		item = strings.ToLower(item)
+		if i > 0 {
+			item = Capitalize(item)
+		}
+		items[i] = item
+	}
+	return strings.Join(items, "")
+}
+
+// KebabCase converts string to kebab case.
+// Play: https://go.dev/play/p/96gT_WZnTVP
+func KebabCase(str string) string {
+	items := Words(str)
+	for i := range items {
+		items[i] = strings.ToLower(items[i])
+	}
+	return strings.Join(items, "-")
+}
+
+// SnakeCase converts string to snake case.
+// Play: https://go.dev/play/p/ziB0V89IeVH
+func SnakeCase(str string) string {
+	items := Words(str)
+	for i := range items {
+		items[i] = strings.ToLower(items[i])
+	}
+	return strings.Join(items, "_")
+}
+
+// Words splits string into a slice of its words.
+// Play: https://go.dev/play/p/-f3VIQqiaVw
+func Words(str string) []string {
+	str = splitWordReg.ReplaceAllString(str, `$1$3$5$7 $2$4$6$8$9`)
+	// example: Int8Value => Int 8Value => Int 8 Value
+	str = splitNumberLetterReg.ReplaceAllString(str, "$1 $2")
+	var result strings.Builder
+	result.Grow(len(str))
+	for _, r := range str {
+		if unicode.IsLetter(r) || unicode.IsDigit(r) {
+			result.WriteRune(r)
+		} else {
+			result.WriteRune(' ')
+		}
+	}
+	return strings.Fields(result.String())
+}
+
+// Capitalize converts the first character of string to upper case and the remaining to lower case.
+// Play: https://go.dev/play/p/uLTZZQXqnsa
+func Capitalize(str string) string {
+	return cases.Title(language.English).String(str)
+}
+
+// Ellipsis trims and truncates a string to a specified length in runes and appends an ellipsis
+// if truncated. The length parameter counts Unicode code points (runes), not bytes, so multi-byte
+// characters such as emoji or CJK ideographs are never split in the middle.
+// Play: https://go.dev/play/p/qE93rgqe1TW
+func Ellipsis(str string, length int) string {
+	str = strings.TrimSpace(str)
+
+	const ellipsis = "..."
+
+	cutPosition := 0
+	for i := range str {
+		if length == len(ellipsis) {
+			cutPosition = i
+		}
+
+		if length--; length < 0 {
+			return strings.TrimSpace(str[:cutPosition]) + ellipsis
+		}
+	}
+
+	return str
+}
diff --git a/vendor/github.com/samber/lo/test.go b/vendor/github.com/samber/lo/test.go
deleted file mode 100644
index 26db4c258..000000000
--- a/vendor/github.com/samber/lo/test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package lo
-
-import (
-	"os"
-	"testing"
-	"time"
-)
-
-// https://github.com/stretchr/testify/issues/1101
-func testWithTimeout(t *testing.T, timeout time.Duration) {
-	t.Helper()
-
-	testFinished := make(chan struct{})
-	t.Cleanup(func() { close(testFinished) })
-
-	go func() {
-		select {
-		case <-testFinished:
-		case <-time.After(timeout):
-			t.Errorf("test timed out after %s", timeout)
-			os.Exit(1)
-		}
-	}()
-}
-
-type foo struct {
-	bar string
-}
-
-func (f foo) Clone() foo {
-	return foo{f.bar}
-}
diff --git a/vendor/github.com/samber/lo/time.go b/vendor/github.com/samber/lo/time.go
new file mode 100644
index 000000000..a2b1c7e05
--- /dev/null
+++ b/vendor/github.com/samber/lo/time.go
@@ -0,0 +1,99 @@
+package lo
+
+import (
+	"time"
+)
+
+// Duration returns the time taken to execute a function.
+// Play: https://go.dev/play/p/HQfbBbAXaFP
+func Duration(callback func()) time.Duration {
+	return Duration0(callback)
+}
+
+// Duration0 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/HQfbBbAXaFP
+func Duration0(callback func()) time.Duration {
+	start := time.Now()
+	callback()
+	return time.Since(start)
+}
+
+// Duration1 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/HQfbBbAXaFP
+func Duration1[A any](callback func() A) (A, time.Duration) {
+	start := time.Now()
+	a := callback()
+	return a, time.Since(start)
+}
+
+// Duration2 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/HQfbBbAXaFP
+func Duration2[A, B any](callback func() (A, B)) (A, B, time.Duration) {
+	start := time.Now()
+	a, b := callback()
+	return a, b, time.Since(start)
+}
+
+// Duration3 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/xr863iwkAxQ
+func Duration3[A, B, C any](callback func() (A, B, C)) (A, B, C, time.Duration) {
+	start := time.Now()
+	a, b, c := callback()
+	return a, b, c, time.Since(start)
+}
+
+// Duration4 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/xr863iwkAxQ
+func Duration4[A, B, C, D any](callback func() (A, B, C, D)) (A, B, C, D, time.Duration) {
+	start := time.Now()
+	a, b, c, d := callback()
+	return a, b, c, d, time.Since(start)
+}
+
+// Duration5 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/xr863iwkAxQ
+func Duration5[A, B, C, D, E any](callback func() (A, B, C, D, E)) (A, B, C, D, E, time.Duration) {
+	start := time.Now()
+	a, b, c, d, e := callback()
+	return a, b, c, d, e, time.Since(start)
+}
+
+// Duration6 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/mR4bTQKO-Tf
+func Duration6[A, B, C, D, E, F any](callback func() (A, B, C, D, E, F)) (A, B, C, D, E, F, time.Duration) {
+	start := time.Now()
+	a, b, c, d, e, f := callback()
+	return a, b, c, d, e, f, time.Since(start)
+}
+
+// Duration7 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/jgIAcBWWInS
+func Duration7[A, B, C, D, E, F, G any](callback func() (A, B, C, D, E, F, G)) (A, B, C, D, E, F, G, time.Duration) {
+	start := time.Now()
+	a, b, c, d, e, f, g := callback()
+	return a, b, c, d, e, f, g, time.Since(start)
+}
+
+// Duration8 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/T8kxpG1c5Na
+func Duration8[A, B, C, D, E, F, G, H any](callback func() (A, B, C, D, E, F, G, H)) (A, B, C, D, E, F, G, H, time.Duration) {
+	start := time.Now()
+	a, b, c, d, e, f, g, h := callback()
+	return a, b, c, d, e, f, g, h, time.Since(start)
+}
+
+// Duration9 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/bg9ix2VrZ0j
+func Duration9[A, B, C, D, E, F, G, H, I any](callback func() (A, B, C, D, E, F, G, H, I)) (A, B, C, D, E, F, G, H, I, time.Duration) {
+	start := time.Now()
+	a, b, c, d, e, f, g, h, i := callback()
+	return a, b, c, d, e, f, g, h, i, time.Since(start)
+}
+
+// Duration10 returns the time taken to execute a function.
+// Play: https://go.dev/play/p/Y3n7oJXqJbk
+func Duration10[A, B, C, D, E, F, G, H, I, J any](callback func() (A, B, C, D, E, F, G, H, I, J)) (A, B, C, D, E, F, G, H, I, J, time.Duration) {
+	start := time.Now()
+	a, b, c, d, e, f, g, h, i, j := callback()
+	return a, b, c, d, e, f, g, h, i, j, time.Since(start)
+}
diff --git a/vendor/github.com/samber/lo/tuples.go b/vendor/github.com/samber/lo/tuples.go
index f8ea2f14b..1911f8db5 100644
--- a/vendor/github.com/samber/lo/tuples.go
+++ b/vendor/github.com/samber/lo/tuples.go
@@ -2,390 +2,706 @@ package lo
 
 // T2 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T2[A any, B any](a A, b B) Tuple2[A, B] {
+func T2[A, B any](a A, b B) Tuple2[A, B] {
 	return Tuple2[A, B]{A: a, B: b}
 }
 
 // T3 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T3[A any, B any, C any](a A, b B, c C) Tuple3[A, B, C] {
+func T3[A, B, C any](a A, b B, c C) Tuple3[A, B, C] {
 	return Tuple3[A, B, C]{A: a, B: b, C: c}
 }
 
 // T4 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T4[A any, B any, C any, D any](a A, b B, c C, d D) Tuple4[A, B, C, D] {
+func T4[A, B, C, D any](a A, b B, c C, d D) Tuple4[A, B, C, D] {
 	return Tuple4[A, B, C, D]{A: a, B: b, C: c, D: d}
 }
 
 // T5 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T5[A any, B any, C any, D any, E any](a A, b B, c C, d D, e E) Tuple5[A, B, C, D, E] {
+func T5[A, B, C, D, E any](a A, b B, c C, d D, e E) Tuple5[A, B, C, D, E] {
 	return Tuple5[A, B, C, D, E]{A: a, B: b, C: c, D: d, E: e}
 }
 
 // T6 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T6[A any, B any, C any, D any, E any, F any](a A, b B, c C, d D, e E, f F) Tuple6[A, B, C, D, E, F] {
+func T6[A, B, C, D, E, F any](a A, b B, c C, d D, e E, f F) Tuple6[A, B, C, D, E, F] {
 	return Tuple6[A, B, C, D, E, F]{A: a, B: b, C: c, D: d, E: e, F: f}
 }
 
 // T7 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T7[A any, B any, C any, D any, E any, F any, G any](a A, b B, c C, d D, e E, f F, g G) Tuple7[A, B, C, D, E, F, G] {
+func T7[A, B, C, D, E, F, G any](a A, b B, c C, d D, e E, f F, g G) Tuple7[A, B, C, D, E, F, G] {
 	return Tuple7[A, B, C, D, E, F, G]{A: a, B: b, C: c, D: d, E: e, F: f, G: g}
 }
 
 // T8 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T8[A any, B any, C any, D any, E any, F any, G any, H any](a A, b B, c C, d D, e E, f F, g G, h H) Tuple8[A, B, C, D, E, F, G, H] {
+func T8[A, B, C, D, E, F, G, H any](a A, b B, c C, d D, e E, f F, g G, h H) Tuple8[A, B, C, D, E, F, G, H] {
 	return Tuple8[A, B, C, D, E, F, G, H]{A: a, B: b, C: c, D: d, E: e, F: f, G: g, H: h}
 }
 
-// T8 creates a tuple from a list of values.
+// T9 creates a tuple from a list of values.
 // Play: https://go.dev/play/p/IllL3ZO4BQm
-func T9[A any, B any, C any, D any, E any, F any, G any, H any, I any](a A, b B, c C, d D, e E, f F, g G, h H, i I) Tuple9[A, B, C, D, E, F, G, H, I] {
+func T9[A, B, C, D, E, F, G, H, I any](a A, b B, c C, d D, e E, f F, g G, h H, i I) Tuple9[A, B, C, D, E, F, G, H, I] {
 	return Tuple9[A, B, C, D, E, F, G, H, I]{A: a, B: b, C: c, D: d, E: e, F: f, G: g, H: h, I: i}
 }
 
-// Unpack2 returns values contained in tuple.
+// Unpack2 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack2[A any, B any](tuple Tuple2[A, B]) (A, B) {
+func Unpack2[A, B any](tuple Tuple2[A, B]) (A, B) {
 	return tuple.A, tuple.B
 }
 
-// Unpack3 returns values contained in tuple.
+// Unpack3 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack3[A any, B any, C any](tuple Tuple3[A, B, C]) (A, B, C) {
+func Unpack3[A, B, C any](tuple Tuple3[A, B, C]) (A, B, C) {
 	return tuple.A, tuple.B, tuple.C
 }
 
-// Unpack4 returns values contained in tuple.
+// Unpack4 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack4[A any, B any, C any, D any](tuple Tuple4[A, B, C, D]) (A, B, C, D) {
+func Unpack4[A, B, C, D any](tuple Tuple4[A, B, C, D]) (A, B, C, D) {
 	return tuple.A, tuple.B, tuple.C, tuple.D
 }
 
-// Unpack5 returns values contained in tuple.
+// Unpack5 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack5[A any, B any, C any, D any, E any](tuple Tuple5[A, B, C, D, E]) (A, B, C, D, E) {
+func Unpack5[A, B, C, D, E any](tuple Tuple5[A, B, C, D, E]) (A, B, C, D, E) {
 	return tuple.A, tuple.B, tuple.C, tuple.D, tuple.E
 }
 
-// Unpack6 returns values contained in tuple.
+// Unpack6 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack6[A any, B any, C any, D any, E any, F any](tuple Tuple6[A, B, C, D, E, F]) (A, B, C, D, E, F) {
+func Unpack6[A, B, C, D, E, F any](tuple Tuple6[A, B, C, D, E, F]) (A, B, C, D, E, F) {
 	return tuple.A, tuple.B, tuple.C, tuple.D, tuple.E, tuple.F
 }
 
-// Unpack7 returns values contained in tuple.
+// Unpack7 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack7[A any, B any, C any, D any, E any, F any, G any](tuple Tuple7[A, B, C, D, E, F, G]) (A, B, C, D, E, F, G) {
+func Unpack7[A, B, C, D, E, F, G any](tuple Tuple7[A, B, C, D, E, F, G]) (A, B, C, D, E, F, G) {
 	return tuple.A, tuple.B, tuple.C, tuple.D, tuple.E, tuple.F, tuple.G
 }
 
-// Unpack8 returns values contained in tuple.
+// Unpack8 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack8[A any, B any, C any, D any, E any, F any, G any, H any](tuple Tuple8[A, B, C, D, E, F, G, H]) (A, B, C, D, E, F, G, H) {
+func Unpack8[A, B, C, D, E, F, G, H any](tuple Tuple8[A, B, C, D, E, F, G, H]) (A, B, C, D, E, F, G, H) {
 	return tuple.A, tuple.B, tuple.C, tuple.D, tuple.E, tuple.F, tuple.G, tuple.H
 }
 
-// Unpack9 returns values contained in tuple.
+// Unpack9 returns values contained in a tuple.
 // Play: https://go.dev/play/p/xVP_k0kJ96W
-func Unpack9[A any, B any, C any, D any, E any, F any, G any, H any, I any](tuple Tuple9[A, B, C, D, E, F, G, H, I]) (A, B, C, D, E, F, G, H, I) {
+func Unpack9[A, B, C, D, E, F, G, H, I any](tuple Tuple9[A, B, C, D, E, F, G, H, I]) (A, B, C, D, E, F, G, H, I) {
 	return tuple.A, tuple.B, tuple.C, tuple.D, tuple.E, tuple.F, tuple.G, tuple.H, tuple.I
 }
 
 // Zip2 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip2[A any, B any](a []A, b []B) []Tuple2[A, B] {
-	size := Max([]int{len(a), len(b)})
+func Zip2[A, B any](a []A, b []B) []Tuple2[A, B] {
+	size := uint(Max([]int{len(a), len(b)}))
 
-	result := make([]Tuple2[A, B], 0, size)
+	result := make([]Tuple2[A, B], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-
-		result = append(result, Tuple2[A, B]{
-			A: _a,
-			B: _b,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
 	}
 
 	return result
 }
 
 // Zip3 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip3[A any, B any, C any](a []A, b []B, c []C) []Tuple3[A, B, C] {
-	size := Max([]int{len(a), len(b), len(c)})
+func Zip3[A, B, C any](a []A, b []B, c []C) []Tuple3[A, B, C] {
+	size := uint(Max([]int{len(a), len(b), len(c)}))
 
-	result := make([]Tuple3[A, B, C], 0, size)
+	result := make([]Tuple3[A, B, C], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-
-		result = append(result, Tuple3[A, B, C]{
-			A: _a,
-			B: _b,
-			C: _c,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
 	}
 
 	return result
 }
 
 // Zip4 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip4[A any, B any, C any, D any](a []A, b []B, c []C, d []D) []Tuple4[A, B, C, D] {
-	size := Max([]int{len(a), len(b), len(c), len(d)})
+func Zip4[A, B, C, D any](a []A, b []B, c []C, d []D) []Tuple4[A, B, C, D] {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d)}))
 
-	result := make([]Tuple4[A, B, C, D], 0, size)
+	result := make([]Tuple4[A, B, C, D], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-		_d, _ := Nth(d, index)
-
-		result = append(result, Tuple4[A, B, C, D]{
-			A: _a,
-			B: _b,
-			C: _c,
-			D: _d,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
+		result[index].D = NthOrEmpty(d, index)
 	}
 
 	return result
 }
 
 // Zip5 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip5[A any, B any, C any, D any, E any](a []A, b []B, c []C, d []D, e []E) []Tuple5[A, B, C, D, E] {
-	size := Max([]int{len(a), len(b), len(c), len(d), len(e)})
+func Zip5[A, B, C, D, E any](a []A, b []B, c []C, d []D, e []E) []Tuple5[A, B, C, D, E] {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e)}))
 
-	result := make([]Tuple5[A, B, C, D, E], 0, size)
+	result := make([]Tuple5[A, B, C, D, E], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-		_d, _ := Nth(d, index)
-		_e, _ := Nth(e, index)
-
-		result = append(result, Tuple5[A, B, C, D, E]{
-			A: _a,
-			B: _b,
-			C: _c,
-			D: _d,
-			E: _e,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
+		result[index].D = NthOrEmpty(d, index)
+		result[index].E = NthOrEmpty(e, index)
 	}
 
 	return result
 }
 
 // Zip6 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip6[A any, B any, C any, D any, E any, F any](a []A, b []B, c []C, d []D, e []E, f []F) []Tuple6[A, B, C, D, E, F] {
-	size := Max([]int{len(a), len(b), len(c), len(d), len(e), len(f)})
+func Zip6[A, B, C, D, E, F any](a []A, b []B, c []C, d []D, e []E, f []F) []Tuple6[A, B, C, D, E, F] {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f)}))
 
-	result := make([]Tuple6[A, B, C, D, E, F], 0, size)
+	result := make([]Tuple6[A, B, C, D, E, F], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-		_d, _ := Nth(d, index)
-		_e, _ := Nth(e, index)
-		_f, _ := Nth(f, index)
-
-		result = append(result, Tuple6[A, B, C, D, E, F]{
-			A: _a,
-			B: _b,
-			C: _c,
-			D: _d,
-			E: _e,
-			F: _f,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
+		result[index].D = NthOrEmpty(d, index)
+		result[index].E = NthOrEmpty(e, index)
+		result[index].F = NthOrEmpty(f, index)
 	}
 
 	return result
 }
 
 // Zip7 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip7[A any, B any, C any, D any, E any, F any, G any](a []A, b []B, c []C, d []D, e []E, f []F, g []G) []Tuple7[A, B, C, D, E, F, G] {
-	size := Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g)})
+func Zip7[A, B, C, D, E, F, G any](a []A, b []B, c []C, d []D, e []E, f []F, g []G) []Tuple7[A, B, C, D, E, F, G] {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g)}))
 
-	result := make([]Tuple7[A, B, C, D, E, F, G], 0, size)
+	result := make([]Tuple7[A, B, C, D, E, F, G], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-		_d, _ := Nth(d, index)
-		_e, _ := Nth(e, index)
-		_f, _ := Nth(f, index)
-		_g, _ := Nth(g, index)
-
-		result = append(result, Tuple7[A, B, C, D, E, F, G]{
-			A: _a,
-			B: _b,
-			C: _c,
-			D: _d,
-			E: _e,
-			F: _f,
-			G: _g,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
+		result[index].D = NthOrEmpty(d, index)
+		result[index].E = NthOrEmpty(e, index)
+		result[index].F = NthOrEmpty(f, index)
+		result[index].G = NthOrEmpty(g, index)
 	}
 
 	return result
 }
 
 // Zip8 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip8[A any, B any, C any, D any, E any, F any, G any, H any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H) []Tuple8[A, B, C, D, E, F, G, H] {
-	size := Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h)})
+func Zip8[A, B, C, D, E, F, G, H any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H) []Tuple8[A, B, C, D, E, F, G, H] {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h)}))
 
-	result := make([]Tuple8[A, B, C, D, E, F, G, H], 0, size)
+	result := make([]Tuple8[A, B, C, D, E, F, G, H], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-		_d, _ := Nth(d, index)
-		_e, _ := Nth(e, index)
-		_f, _ := Nth(f, index)
-		_g, _ := Nth(g, index)
-		_h, _ := Nth(h, index)
-
-		result = append(result, Tuple8[A, B, C, D, E, F, G, H]{
-			A: _a,
-			B: _b,
-			C: _c,
-			D: _d,
-			E: _e,
-			F: _f,
-			G: _g,
-			H: _h,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
+		result[index].D = NthOrEmpty(d, index)
+		result[index].E = NthOrEmpty(e, index)
+		result[index].F = NthOrEmpty(f, index)
+		result[index].G = NthOrEmpty(g, index)
+		result[index].H = NthOrEmpty(h, index)
 	}
 
 	return result
 }
 
 // Zip9 creates a slice of grouped elements, the first of which contains the first elements
-// of the given arrays, the second of which contains the second elements of the given arrays, and so on.
-// When collections have different size, the Tuple attributes are filled with zero value.
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
 // Play: https://go.dev/play/p/jujaA6GaJTp
-func Zip9[A any, B any, C any, D any, E any, F any, G any, H any, I any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H, i []I) []Tuple9[A, B, C, D, E, F, G, H, I] {
-	size := Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h), len(i)})
+func Zip9[A, B, C, D, E, F, G, H, I any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H, i []I) []Tuple9[A, B, C, D, E, F, G, H, I] {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h), len(i)}))
 
-	result := make([]Tuple9[A, B, C, D, E, F, G, H, I], 0, size)
+	result := make([]Tuple9[A, B, C, D, E, F, G, H, I], size)
 
-	for index := 0; index < size; index++ {
-		_a, _ := Nth(a, index)
-		_b, _ := Nth(b, index)
-		_c, _ := Nth(c, index)
-		_d, _ := Nth(d, index)
-		_e, _ := Nth(e, index)
-		_f, _ := Nth(f, index)
-		_g, _ := Nth(g, index)
-		_h, _ := Nth(h, index)
-		_i, _ := Nth(i, index)
-
-		result = append(result, Tuple9[A, B, C, D, E, F, G, H, I]{
-			A: _a,
-			B: _b,
-			C: _c,
-			D: _d,
-			E: _e,
-			F: _f,
-			G: _g,
-			H: _h,
-			I: _i,
-		})
+	for index := uint(0); index < size; index++ {
+		result[index].A = NthOrEmpty(a, index)
+		result[index].B = NthOrEmpty(b, index)
+		result[index].C = NthOrEmpty(c, index)
+		result[index].D = NthOrEmpty(d, index)
+		result[index].E = NthOrEmpty(e, index)
+		result[index].F = NthOrEmpty(f, index)
+		result[index].G = NthOrEmpty(g, index)
+		result[index].H = NthOrEmpty(h, index)
+		result[index].I = NthOrEmpty(i, index)
 	}
 
 	return result
 }
 
-// Unzip2 accepts an array of grouped elements and creates an array regrouping the elements
+// ZipBy2 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/wlHur6yO8rR
+func ZipBy2[A, B, Out any](a []A, b []B, iteratee func(a A, b B) Out) []Out {
+	size := uint(Max([]int{len(a), len(b)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy3 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/j9maveOnSQX
+func ZipBy3[A, B, C, Out any](a []A, b []B, c []C, iteratee func(a A, b B, c C) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy4 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/Y1eF2Ke0Ayz
+func ZipBy4[A, B, C, D, Out any](a []A, b []B, c []C, d []D, iteratee func(a A, b B, c C, d D) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy5 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/SLynyalh5Oa
+func ZipBy5[A, B, C, D, E, Out any](a []A, b []B, c []C, d []D, e []E, iteratee func(a A, b B, c C, d D, e E) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy6 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/IK6KVgw9e-S
+func ZipBy6[A, B, C, D, E, F, Out any](a []A, b []B, c []C, d []D, e []E, f []F, iteratee func(a A, b B, c C, d D, e E, f F) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy7 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/4uW6a2vXh8w
+func ZipBy7[A, B, C, D, E, F, G, Out any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, iteratee func(a A, b B, c C, d D, e E, f F, g G) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+			NthOrEmpty(g, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy8 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/tk8xW7XzY4v
+func ZipBy8[A, B, C, D, E, F, G, H, Out any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H, iteratee func(a A, b B, c C, d D, e E, f F, g G, h H) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+			NthOrEmpty(g, index),
+			NthOrEmpty(h, index),
+		)
+	}
+
+	return result
+}
+
+// ZipBy9 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// Play: https://go.dev/play/p/VGqjDmQ9YqX
+func ZipBy9[A, B, C, D, E, F, G, H, I, Out any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H, i []I, iteratee func(a A, b B, c C, d D, e E, f F, g G, h H, i I) Out) []Out {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h), len(i)}))
+
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		result[index] = iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+			NthOrEmpty(g, index),
+			NthOrEmpty(h, index),
+			NthOrEmpty(i, index),
+		)
+	}
+
+	return result
+}
+
+// ZipByErr2 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr2[A, B, Out any](a []A, b []B, iteratee func(a A, b B) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr3 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr3[A, B, C, Out any](a []A, b []B, c []C, iteratee func(a A, b B, c C) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr4 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr4[A, B, C, D, Out any](a []A, b []B, c []C, d []D, iteratee func(a A, b B, c C, d D) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr5 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr5[A, B, C, D, E, Out any](a []A, b []B, c []C, d []D, e []E, iteratee func(a A, b B, c C, d D, e E) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr6 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr6[A, B, C, D, E, F, Out any](a []A, b []B, c []C, d []D, e []E, f []F, iteratee func(a A, b B, c C, d D, e E, f F) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr7 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr7[A, B, C, D, E, F, G, Out any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, iteratee func(a A, b B, c C, d D, e E, f F, g G) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+			NthOrEmpty(g, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr8 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr8[A, B, C, D, E, F, G, H, Out any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H, iteratee func(a A, b B, c C, d D, e E, f F, g G, h H) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+			NthOrEmpty(g, index),
+			NthOrEmpty(h, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// ZipByErr9 creates a slice of transformed elements, the first of which contains the first elements
+// of the given slices, the second of which contains the second elements of the given slices, and so on.
+// When collections are different sizes, the Tuple attributes are filled with zero value.
+// It returns the first error returned by the iteratee.
+func ZipByErr9[A, B, C, D, E, F, G, H, I, Out any](a []A, b []B, c []C, d []D, e []E, f []F, g []G, h []H, i []I, iteratee func(a A, b B, c C, d D, e E, f F, g G, h H, i I) (Out, error)) ([]Out, error) {
+	size := uint(Max([]int{len(a), len(b), len(c), len(d), len(e), len(f), len(g), len(h), len(i)}))
+	result := make([]Out, size)
+
+	for index := uint(0); index < size; index++ {
+		r, err := iteratee(
+			NthOrEmpty(a, index),
+			NthOrEmpty(b, index),
+			NthOrEmpty(c, index),
+			NthOrEmpty(d, index),
+			NthOrEmpty(e, index),
+			NthOrEmpty(f, index),
+			NthOrEmpty(g, index),
+			NthOrEmpty(h, index),
+			NthOrEmpty(i, index),
+		)
+		if err != nil {
+			return nil, err
+		}
+		result[index] = r
+	}
+
+	return result, nil
+}
+
+// Unzip2 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip2[A any, B any](tuples []Tuple2[A, B]) ([]A, []B) {
+func Unzip2[A, B any](tuples []Tuple2[A, B]) ([]A, []B) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
 	}
 
 	return r1, r2
 }
 
-// Unzip3 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip3 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip3[A any, B any, C any](tuples []Tuple3[A, B, C]) ([]A, []B, []C) {
+func Unzip3[A, B, C any](tuples []Tuple3[A, B, C]) ([]A, []B, []C) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
 	r3 := make([]C, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
 	}
 
 	return r1, r2, r3
 }
 
-// Unzip4 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip4 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip4[A any, B any, C any, D any](tuples []Tuple4[A, B, C, D]) ([]A, []B, []C, []D) {
+func Unzip4[A, B, C, D any](tuples []Tuple4[A, B, C, D]) ([]A, []B, []C, []D) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
 	r3 := make([]C, 0, size)
 	r4 := make([]D, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
-		r4 = append(r4, tuple.D)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
+		r4 = append(r4, tuples[i].D)
 	}
 
 	return r1, r2, r3, r4
 }
 
-// Unzip5 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip5 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip5[A any, B any, C any, D any, E any](tuples []Tuple5[A, B, C, D, E]) ([]A, []B, []C, []D, []E) {
+func Unzip5[A, B, C, D, E any](tuples []Tuple5[A, B, C, D, E]) ([]A, []B, []C, []D, []E) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
@@ -393,21 +709,21 @@ func Unzip5[A any, B any, C any, D any, E any](tuples []Tuple5[A, B, C, D, E]) (
 	r4 := make([]D, 0, size)
 	r5 := make([]E, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
-		r4 = append(r4, tuple.D)
-		r5 = append(r5, tuple.E)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
+		r4 = append(r4, tuples[i].D)
+		r5 = append(r5, tuples[i].E)
 	}
 
 	return r1, r2, r3, r4, r5
 }
 
-// Unzip6 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip6 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip6[A any, B any, C any, D any, E any, F any](tuples []Tuple6[A, B, C, D, E, F]) ([]A, []B, []C, []D, []E, []F) {
+func Unzip6[A, B, C, D, E, F any](tuples []Tuple6[A, B, C, D, E, F]) ([]A, []B, []C, []D, []E, []F) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
@@ -416,22 +732,22 @@ func Unzip6[A any, B any, C any, D any, E any, F any](tuples []Tuple6[A, B, C, D
 	r5 := make([]E, 0, size)
 	r6 := make([]F, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
-		r4 = append(r4, tuple.D)
-		r5 = append(r5, tuple.E)
-		r6 = append(r6, tuple.F)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
+		r4 = append(r4, tuples[i].D)
+		r5 = append(r5, tuples[i].E)
+		r6 = append(r6, tuples[i].F)
 	}
 
 	return r1, r2, r3, r4, r5, r6
 }
 
-// Unzip7 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip7 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip7[A any, B any, C any, D any, E any, F any, G any](tuples []Tuple7[A, B, C, D, E, F, G]) ([]A, []B, []C, []D, []E, []F, []G) {
+func Unzip7[A, B, C, D, E, F, G any](tuples []Tuple7[A, B, C, D, E, F, G]) ([]A, []B, []C, []D, []E, []F, []G) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
@@ -441,23 +757,23 @@ func Unzip7[A any, B any, C any, D any, E any, F any, G any](tuples []Tuple7[A,
 	r6 := make([]F, 0, size)
 	r7 := make([]G, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
-		r4 = append(r4, tuple.D)
-		r5 = append(r5, tuple.E)
-		r6 = append(r6, tuple.F)
-		r7 = append(r7, tuple.G)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
+		r4 = append(r4, tuples[i].D)
+		r5 = append(r5, tuples[i].E)
+		r6 = append(r6, tuples[i].F)
+		r7 = append(r7, tuples[i].G)
 	}
 
 	return r1, r2, r3, r4, r5, r6, r7
 }
 
-// Unzip8 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip8 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip8[A any, B any, C any, D any, E any, F any, G any, H any](tuples []Tuple8[A, B, C, D, E, F, G, H]) ([]A, []B, []C, []D, []E, []F, []G, []H) {
+func Unzip8[A, B, C, D, E, F, G, H any](tuples []Tuple8[A, B, C, D, E, F, G, H]) ([]A, []B, []C, []D, []E, []F, []G, []H) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
@@ -468,24 +784,24 @@ func Unzip8[A any, B any, C any, D any, E any, F any, G any, H any](tuples []Tup
 	r7 := make([]G, 0, size)
 	r8 := make([]H, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
-		r4 = append(r4, tuple.D)
-		r5 = append(r5, tuple.E)
-		r6 = append(r6, tuple.F)
-		r7 = append(r7, tuple.G)
-		r8 = append(r8, tuple.H)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
+		r4 = append(r4, tuples[i].D)
+		r5 = append(r5, tuples[i].E)
+		r6 = append(r6, tuples[i].F)
+		r7 = append(r7, tuples[i].G)
+		r8 = append(r8, tuples[i].H)
 	}
 
 	return r1, r2, r3, r4, r5, r6, r7, r8
 }
 
-// Unzip9 accepts an array of grouped elements and creates an array regrouping the elements
+// Unzip9 accepts a slice of grouped elements and creates a slice regrouping the elements
 // to their pre-zip configuration.
 // Play: https://go.dev/play/p/ciHugugvaAW
-func Unzip9[A any, B any, C any, D any, E any, F any, G any, H any, I any](tuples []Tuple9[A, B, C, D, E, F, G, H, I]) ([]A, []B, []C, []D, []E, []F, []G, []H, []I) {
+func Unzip9[A, B, C, D, E, F, G, H, I any](tuples []Tuple9[A, B, C, D, E, F, G, H, I]) ([]A, []B, []C, []D, []E, []F, []G, []H, []I) {
 	size := len(tuples)
 	r1 := make([]A, 0, size)
 	r2 := make([]B, 0, size)
@@ -497,17 +813,985 @@ func Unzip9[A any, B any, C any, D any, E any, F any, G any, H any, I any](tuple
 	r8 := make([]H, 0, size)
 	r9 := make([]I, 0, size)
 
-	for _, tuple := range tuples {
-		r1 = append(r1, tuple.A)
-		r2 = append(r2, tuple.B)
-		r3 = append(r3, tuple.C)
-		r4 = append(r4, tuple.D)
-		r5 = append(r5, tuple.E)
-		r6 = append(r6, tuple.F)
-		r7 = append(r7, tuple.G)
-		r8 = append(r8, tuple.H)
-		r9 = append(r9, tuple.I)
+	for i := range tuples {
+		r1 = append(r1, tuples[i].A)
+		r2 = append(r2, tuples[i].B)
+		r3 = append(r3, tuples[i].C)
+		r4 = append(r4, tuples[i].D)
+		r5 = append(r5, tuples[i].E)
+		r6 = append(r6, tuples[i].F)
+		r7 = append(r7, tuples[i].G)
+		r8 = append(r8, tuples[i].H)
+		r9 = append(r9, tuples[i].I)
 	}
 
 	return r1, r2, r3, r4, r5, r6, r7, r8, r9
 }
+
+// UnzipBy2 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/tN8yqaRZz0r
+func UnzipBy2[In, A, B any](items []In, iteratee func(In) (a A, b B)) ([]A, []B) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+
+	for i := range items {
+		a, b := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+	}
+
+	return r1, r2
+}
+
+// UnzipBy3 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/36ITO2DlQq1
+func UnzipBy3[In, A, B, C any](items []In, iteratee func(In) (a A, b B, c C)) ([]A, []B, []C) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+
+	for i := range items {
+		a, b, c := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+	}
+
+	return r1, r2, r3
+}
+
+// UnzipBy4 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/zJ6qY1dD1rL
+func UnzipBy4[In, A, B, C, D any](items []In, iteratee func(In) (a A, b B, c C, d D)) ([]A, []B, []C, []D) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+
+	for i := range items {
+		a, b, c, d := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+	}
+
+	return r1, r2, r3, r4
+}
+
+// UnzipBy5 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/3f7jKkV9xZt
+func UnzipBy5[In, A, B, C, D, E any](items []In, iteratee func(In) (a A, b B, c C, d D, e E)) ([]A, []B, []C, []D, []E) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+
+	for i := range items {
+		a, b, c, d, e := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+	}
+
+	return r1, r2, r3, r4, r5
+}
+
+// UnzipBy6 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/8Y1b7tKu2pL
+func UnzipBy6[In, A, B, C, D, E, F any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F)) ([]A, []B, []C, []D, []E, []F) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+	}
+
+	return r1, r2, r3, r4, r5, r6
+}
+
+// UnzipBy7 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/7j1kLmVn3pM
+func UnzipBy7[In, A, B, C, D, E, F, G any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, g G)) ([]A, []B, []C, []D, []E, []F, []G) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+	r7 := make([]G, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, g := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+		r7 = append(r7, g)
+	}
+
+	return r1, r2, r3, r4, r5, r6, r7
+}
+
+// UnzipBy8 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/1n2k3L4m5N6
+func UnzipBy8[In, A, B, C, D, E, F, G, H any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, g G, h H)) ([]A, []B, []C, []D, []E, []F, []G, []H) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+	r7 := make([]G, 0, size)
+	r8 := make([]H, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, g, h := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+		r7 = append(r7, g)
+		r8 = append(r8, h)
+	}
+
+	return r1, r2, r3, r4, r5, r6, r7, r8
+}
+
+// UnzipBy9 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// Play: https://go.dev/play/p/7o8p9q0r1s2
+func UnzipBy9[In, A, B, C, D, E, F, G, H, I any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, g G, h H, i I)) ([]A, []B, []C, []D, []E, []F, []G, []H, []I) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+	r7 := make([]G, 0, size)
+	r8 := make([]H, 0, size)
+	r9 := make([]I, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, g, h, i := iteratee(items[i])
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+		r7 = append(r7, g)
+		r8 = append(r8, h)
+		r9 = append(r9, i)
+	}
+
+	return r1, r2, r3, r4, r5, r6, r7, r8, r9
+}
+
+// UnzipByErr2 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr2[In, A, B any](items []In, iteratee func(In) (a A, b B, err error)) ([]A, []B, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+
+	for i := range items {
+		a, b, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+	}
+
+	return r1, r2, nil
+}
+
+// UnzipByErr3 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr3[In, A, B, C any](items []In, iteratee func(In) (a A, b B, c C, err error)) ([]A, []B, []C, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+
+	for i := range items {
+		a, b, c, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+	}
+
+	return r1, r2, r3, nil
+}
+
+// UnzipByErr4 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr4[In, A, B, C, D any](items []In, iteratee func(In) (a A, b B, c C, d D, err error)) ([]A, []B, []C, []D, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+
+	for i := range items {
+		a, b, c, d, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+	}
+
+	return r1, r2, r3, r4, nil
+}
+
+// UnzipByErr5 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr5[In, A, B, C, D, E any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, err error)) ([]A, []B, []C, []D, []E, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+	}
+
+	return r1, r2, r3, r4, r5, nil
+}
+
+// UnzipByErr6 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr6[In, A, B, C, D, E, F any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, err error)) ([]A, []B, []C, []D, []E, []F, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+	}
+
+	return r1, r2, r3, r4, r5, r6, nil
+}
+
+// UnzipByErr7 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr7[In, A, B, C, D, E, F, G any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, g G, err error)) ([]A, []B, []C, []D, []E, []F, []G, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+	r7 := make([]G, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, g, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, nil, nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+		r7 = append(r7, g)
+	}
+
+	return r1, r2, r3, r4, r5, r6, r7, nil
+}
+
+// UnzipByErr8 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr8[In, A, B, C, D, E, F, G, H any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, g G, h H, err error)) ([]A, []B, []C, []D, []E, []F, []G, []H, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+	r7 := make([]G, 0, size)
+	r8 := make([]H, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, g, h, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, nil, nil, nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+		r7 = append(r7, g)
+		r8 = append(r8, h)
+	}
+
+	return r1, r2, r3, r4, r5, r6, r7, r8, nil
+}
+
+// UnzipByErr9 iterates over a collection and creates a slice regrouping the elements
+// to their pre-zip configuration.
+// It returns the first error returned by the iteratee.
+func UnzipByErr9[In, A, B, C, D, E, F, G, H, I any](items []In, iteratee func(In) (a A, b B, c C, d D, e E, f F, g G, h H, i I, err error)) ([]A, []B, []C, []D, []E, []F, []G, []H, []I, error) {
+	size := len(items)
+	r1 := make([]A, 0, size)
+	r2 := make([]B, 0, size)
+	r3 := make([]C, 0, size)
+	r4 := make([]D, 0, size)
+	r5 := make([]E, 0, size)
+	r6 := make([]F, 0, size)
+	r7 := make([]G, 0, size)
+	r8 := make([]H, 0, size)
+	r9 := make([]I, 0, size)
+
+	for i := range items {
+		a, b, c, d, e, f, g, h, i, err := iteratee(items[i])
+		if err != nil {
+			return nil, nil, nil, nil, nil, nil, nil, nil, nil, err
+		}
+		r1 = append(r1, a)
+		r2 = append(r2, b)
+		r3 = append(r3, c)
+		r4 = append(r4, d)
+		r5 = append(r5, e)
+		r6 = append(r6, f)
+		r7 = append(r7, g)
+		r8 = append(r8, h)
+		r9 = append(r9, i)
+	}
+
+	return r1, r2, r3, r4, r5, r6, r7, r8, r9, nil
+}
+
+// CrossJoin2 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/3VFppyL9FDU
+func CrossJoin2[A, B any](listA []A, listB []B) []Tuple2[A, B] {
+	return CrossJoinBy2(listA, listB, T2[A, B])
+}
+
+// CrossJoin3 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/2WGeHyJj4fK
+func CrossJoin3[A, B, C any](listA []A, listB []B, listC []C) []Tuple3[A, B, C] {
+	return CrossJoinBy3(listA, listB, listC, T3[A, B, C])
+}
+
+// CrossJoin4 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/6XhKjLmMnNp
+func CrossJoin4[A, B, C, D any](listA []A, listB []B, listC []C, listD []D) []Tuple4[A, B, C, D] {
+	return CrossJoinBy4(listA, listB, listC, listD, T4[A, B, C, D])
+}
+
+// CrossJoin5 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/7oPqRsTuVwX
+func CrossJoin5[A, B, C, D, E any](listA []A, listB []B, listC []C, listD []D, listE []E) []Tuple5[A, B, C, D, E] {
+	return CrossJoinBy5(listA, listB, listC, listD, listE, T5[A, B, C, D, E])
+}
+
+// CrossJoin6 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/8yZ1aB2cD3e
+func CrossJoin6[A, B, C, D, E, F any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F) []Tuple6[A, B, C, D, E, F] {
+	return CrossJoinBy6(listA, listB, listC, listD, listE, listF, T6[A, B, C, D, E, F])
+}
+
+// CrossJoin7 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/9f4g5h6i7j8
+func CrossJoin7[A, B, C, D, E, F, G any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G) []Tuple7[A, B, C, D, E, F, G] {
+	return CrossJoinBy7(listA, listB, listC, listD, listE, listF, listG, T7[A, B, C, D, E, F, G])
+}
+
+// CrossJoin8 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/0k1l2m3n4o5
+func CrossJoin8[A, B, C, D, E, F, G, H any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, listH []H) []Tuple8[A, B, C, D, E, F, G, H] {
+	return CrossJoinBy8(listA, listB, listC, listD, listE, listF, listG, listH, T8[A, B, C, D, E, F, G, H])
+}
+
+// CrossJoin9 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/6p7q8r9s0t1
+func CrossJoin9[A, B, C, D, E, F, G, H, I any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, listH []H, listI []I) []Tuple9[A, B, C, D, E, F, G, H, I] {
+	return CrossJoinBy9(listA, listB, listC, listD, listE, listF, listG, listH, listI, T9[A, B, C, D, E, F, G, H, I])
+}
+
+// CrossJoinBy2 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/8Y7btpvuA-C
+func CrossJoinBy2[A, B, Out any](listA []A, listB []B, transform func(a A, b B) Out) []Out {
+	size := len(listA) * len(listB)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			result = append(result, transform(a, b))
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy3 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/3z4y5x6w7v8
+func CrossJoinBy3[A, B, C, Out any](listA []A, listB []B, listC []C, transform func(a A, b B, c C) Out) []Out {
+	size := len(listA) * len(listB) * len(listC)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				result = append(result, transform(a, b, c))
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy4 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/8b9c0d1e2f3
+func CrossJoinBy4[A, B, C, D, Out any](listA []A, listB []B, listC []C, listD []D, transform func(a A, b B, c C, d D) Out) []Out {
+	size := len(listA) * len(listB) * len(listC) * len(listD)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					result = append(result, transform(a, b, c, d))
+				}
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy5 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/4g5h6i7j8k9
+func CrossJoinBy5[A, B, C, D, E, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, transform func(a A, b B, c C, d D, e E) Out) []Out {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						result = append(result, transform(a, b, c, d, e))
+					}
+				}
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy6 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/1l2m3n4o5p6
+func CrossJoinBy6[A, B, C, D, E, F, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, transform func(a A, b B, c C, d D, e E, f F) Out) []Out {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							result = append(result, transform(a, b, c, d, e, f))
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy7 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/7q8r9s0t1u2
+func CrossJoinBy7[A, B, C, D, E, F, G, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, transform func(a A, b B, c C, d D, e E, f F, g G) Out) []Out {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF) * len(listG)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							for _, g := range listG {
+								result = append(result, transform(a, b, c, d, e, f, g))
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy8 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/3v4w5x6y7z8
+func CrossJoinBy8[A, B, C, D, E, F, G, H, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, listH []H, transform func(a A, b B, c C, d D, e E, f F, g G, h H) Out) []Out {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF) * len(listG) * len(listH)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							for _, g := range listG {
+								for _, h := range listH {
+									result = append(result, transform(a, b, c, d, e, f, g, h))
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinBy9 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// Play: https://go.dev/play/p/9a0b1c2d3e4
+func CrossJoinBy9[A, B, C, D, E, F, G, H, I, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, listH []H, listI []I, transform func(a A, b B, c C, d D, e E, f F, g G, h H, i I) Out) []Out {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF) * len(listG) * len(listH) * len(listI)
+	if size == 0 {
+		return []Out{}
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							for _, g := range listG {
+								for _, h := range listH {
+									for _, i := range listI {
+										result = append(result, transform(a, b, c, d, e, f, g, h, i))
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result
+}
+
+// CrossJoinByErr2 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr2[A, B, Out any](listA []A, listB []B, transform func(a A, b B) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			r, err := transform(a, b)
+			if err != nil {
+				return nil, err
+			}
+			result = append(result, r)
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr3 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr3[A, B, C, Out any](listA []A, listB []B, listC []C, transform func(a A, b B, c C) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				r, err := transform(a, b, c)
+				if err != nil {
+					return nil, err
+				}
+				result = append(result, r)
+			}
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr4 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr4[A, B, C, D, Out any](listA []A, listB []B, listC []C, listD []D, transform func(a A, b B, c C, d D) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC) * len(listD)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					r, err := transform(a, b, c, d)
+					if err != nil {
+						return nil, err
+					}
+					result = append(result, r)
+				}
+			}
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr5 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr5[A, B, C, D, E, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, transform func(a A, b B, c C, d D, e E) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						r, err := transform(a, b, c, d, e)
+						if err != nil {
+							return nil, err
+						}
+						result = append(result, r)
+					}
+				}
+			}
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr6 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr6[A, B, C, D, E, F, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, transform func(a A, b B, c C, d D, e E, f F) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							r, err := transform(a, b, c, d, e, f)
+							if err != nil {
+								return nil, err
+							}
+							result = append(result, r)
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr7 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr7[A, B, C, D, E, F, G, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, transform func(a A, b B, c C, d D, e E, f F, g G) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF) * len(listG)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							for _, g := range listG {
+								r, err := transform(a, b, c, d, e, f, g)
+								if err != nil {
+									return nil, err
+								}
+								result = append(result, r)
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr8 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr8[A, B, C, D, E, F, G, H, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, listH []H, transform func(a A, b B, c C, d D, e E, f F, g G, h H) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF) * len(listG) * len(listH)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							for _, g := range listG {
+								for _, h := range listH {
+									r, err := transform(a, b, c, d, e, f, g, h)
+									if err != nil {
+										return nil, err
+									}
+									result = append(result, r)
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result, nil
+}
+
+// CrossJoinByErr9 combines every item from one list with every item from others.
+// It is the cartesian product of lists received as arguments. The transform function
+// is used to create the output values.
+// Returns an empty list if a list is empty.
+// It returns the first error returned by the transform function.
+func CrossJoinByErr9[A, B, C, D, E, F, G, H, I, Out any](listA []A, listB []B, listC []C, listD []D, listE []E, listF []F, listG []G, listH []H, listI []I, transform func(a A, b B, c C, d D, e E, f F, g G, h H, i I) (Out, error)) ([]Out, error) {
+	size := len(listA) * len(listB) * len(listC) * len(listD) * len(listE) * len(listF) * len(listG) * len(listH) * len(listI)
+	if size == 0 {
+		return []Out{}, nil
+	}
+
+	result := make([]Out, 0, size)
+
+	for _, a := range listA {
+		for _, b := range listB {
+			for _, c := range listC {
+				for _, d := range listD {
+					for _, e := range listE {
+						for _, f := range listF {
+							for _, g := range listG {
+								for _, h := range listH {
+									for _, i := range listI {
+										r, err := transform(a, b, c, d, e, f, g, h, i)
+										if err != nil {
+											return nil, err
+										}
+										result = append(result, r)
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result, nil
+}
diff --git a/vendor/github.com/samber/lo/type_manipulation.go b/vendor/github.com/samber/lo/type_manipulation.go
index fe99ee1f0..c2f93d735 100644
--- a/vendor/github.com/samber/lo/type_manipulation.go
+++ b/vendor/github.com/samber/lo/type_manipulation.go
@@ -1,11 +1,55 @@
 package lo
 
+import "reflect"
+
+// IsNil checks if a value is nil or if it's a reference type with a nil underlying value.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
+func IsNil(x any) bool {
+	if x == nil {
+		return true
+	}
+	v := reflect.ValueOf(x)
+	switch v.Kind() { //nolint:exhaustive
+	case reflect.Chan, reflect.Func, reflect.Map, reflect.Pointer, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
+		return v.IsNil()
+	default:
+		return false
+	}
+}
+
+// IsNotNil checks if a value is not nil or if it's not a reference type with a nil underlying value.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
+func IsNotNil(x any) bool {
+	return !IsNil(x)
+}
+
 // ToPtr returns a pointer copy of value.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
 func ToPtr[T any](x T) *T {
 	return &x
 }
 
+// Nil returns a nil pointer of type.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
+func Nil[T any]() *T {
+	return nil
+}
+
+// EmptyableToPtr returns a pointer copy of value if it's nonzero.
+// Otherwise, returns nil pointer.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
+func EmptyableToPtr[T any](x T) *T {
+	// 🤮
+	isZero := reflect.ValueOf(&x).Elem().IsZero()
+	if isZero {
+		return nil
+	}
+
+	return &x
+}
+
 // FromPtr returns the pointer value or empty.
+// Play: https://go.dev/play/p/mhD9CwO3X0m
 func FromPtr[T any](x *T) T {
 	if x == nil {
 		return Empty[T]()
@@ -15,6 +59,7 @@ func FromPtr[T any](x *T) T {
 }
 
 // FromPtrOr returns the pointer value or the fallback value.
+// Play: https://go.dev/play/p/mhD9CwO3X0m
 func FromPtrOr[T any](x *T, fallback T) T {
 	if x == nil {
 		return fallback
@@ -23,66 +68,147 @@ func FromPtrOr[T any](x *T, fallback T) T {
 	return *x
 }
 
-// ToSlicePtr returns a slice of pointer copy of value.
+// ToSlicePtr returns a slice of pointers to each value.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
 func ToSlicePtr[T any](collection []T) []*T {
-	return Map(collection, func(x T, _ int) *T {
-		return &x
-	})
-}
+	result := make([]*T, len(collection))
 
-// ToAnySlice returns a slice with all elements mapped to `any` type
-func ToAnySlice[T any](collection []T) []any {
-	result := make([]any, len(collection))
-	for i, item := range collection {
-		result[i] = item
+	for i := range collection {
+		result[i] = &collection[i]
 	}
 	return result
 }
 
-// FromAnySlice returns an `any` slice with all elements mapped to a type.
-// Returns false in case of type conversion failure.
-func FromAnySlice[T any](in []any) (out []T, ok bool) {
-	defer func() {
-		if r := recover(); r != nil {
-			out = []T{}
-			ok = false
+// FromSlicePtr returns a slice with the pointer values.
+// Returns a zero value in case of a nil pointer element.
+// Play: https://go.dev/play/p/lbunFvzlUDX
+func FromSlicePtr[T any](collection []*T) []T {
+	return Map(collection, func(x *T, _ int) T {
+		if x == nil {
+			return Empty[T]()
 		}
-	}()
-
-	result := make([]T, len(in))
-	for i, item := range in {
-		result[i] = item.(T)
-	}
-	return result, true
+		return *x
+	})
 }
 
-// Empty returns an empty value.
+// FromSlicePtrOr returns a slice with the pointer values or the fallback value.
+// Play: https://go.dev/play/p/lbunFvzlUDX
+func FromSlicePtrOr[T any](collection []*T, fallback T) []T {
+	return Map(collection, func(x *T, _ int) T {
+		if x == nil {
+			return fallback
+		}
+		return *x
+	})
+}
+
+// ToAnySlice returns a slice with all elements mapped to `any` type.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
+func ToAnySlice[T any](collection []T) []any {
+	result := make([]any, len(collection))
+	for i := range collection {
+		result[i] = collection[i]
+	}
+	return result
+}
+
+// FromAnySlice returns a slice with all elements mapped to a type.
+// Returns false in case of type conversion failure.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
+func FromAnySlice[T any](in []any) ([]T, bool) {
+	out := make([]T, len(in))
+	for i := range in {
+		t, ok := in[i].(T)
+		if !ok {
+			return []T{}, false
+		}
+		out[i] = t
+	}
+	return out, true
+}
+
+// Empty returns the zero value (https://go.dev/ref/spec#The_zero_value).
+// Play: https://go.dev/play/p/P2sD0PMXw4F
 func Empty[T any]() T {
 	var zero T
 	return zero
 }
 
 // IsEmpty returns true if argument is a zero value.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
 func IsEmpty[T comparable](v T) bool {
 	var zero T
 	return zero == v
 }
 
 // IsNotEmpty returns true if argument is not a zero value.
+// Play: https://go.dev/play/p/P2sD0PMXw4F
 func IsNotEmpty[T comparable](v T) bool {
 	var zero T
 	return zero != v
 }
 
 // Coalesce returns the first non-empty arguments. Arguments must be comparable.
-func Coalesce[T comparable](v ...T) (result T, ok bool) {
-	for _, e := range v {
-		if e != result {
-			result = e
-			ok = true
-			return
+// Play: https://go.dev/play/p/Gyo9otyvFHH
+func Coalesce[T comparable](values ...T) (T, bool) {
+	var zero T
+
+	for i := range values {
+		if values[i] != zero {
+			return values[i], true
 		}
 	}
 
-	return
+	return zero, false
+}
+
+// CoalesceOrEmpty returns the first non-empty arguments. Arguments must be comparable.
+// Play: https://go.dev/play/p/Gyo9otyvFHH
+func CoalesceOrEmpty[T comparable](v ...T) T {
+	result, _ := Coalesce(v...)
+	return result
+}
+
+// CoalesceSlice returns the first non-zero slice.
+// Play: https://go.dev/play/p/Gyo9otyvFHH
+func CoalesceSlice[T any](v ...[]T) ([]T, bool) {
+	for i := range v {
+		if len(v[i]) > 0 {
+			return v[i], true
+		}
+	}
+	return []T{}, false
+}
+
+// CoalesceSliceOrEmpty returns the first non-zero slice.
+// Play: https://go.dev/play/p/Gyo9otyvFHH
+func CoalesceSliceOrEmpty[T any](v ...[]T) []T {
+	for i := range v {
+		if len(v[i]) > 0 {
+			return v[i]
+		}
+	}
+	return []T{}
+}
+
+// CoalesceMap returns the first non-zero map.
+// Play: https://go.dev/play/p/Gyo9otyvFHH
+func CoalesceMap[K comparable, V any](v ...map[K]V) (map[K]V, bool) {
+	for i := range v {
+		if len(v[i]) > 0 {
+			return v[i], true
+		}
+	}
+	return map[K]V{}, false
+}
+
+// CoalesceMapOrEmpty returns the first non-zero map.
+// Play: https://go.dev/play/p/Gyo9otyvFHH
+func CoalesceMapOrEmpty[K comparable, V any](v ...map[K]V) map[K]V {
+	for i := range v {
+		if len(v[i]) > 0 {
+			return v[i]
+		}
+	}
+	return map[K]V{}
 }
diff --git a/vendor/github.com/samber/lo/types.go b/vendor/github.com/samber/lo/types.go
index 5361a02a1..ccd3d07bc 100644
--- a/vendor/github.com/samber/lo/types.go
+++ b/vendor/github.com/samber/lo/types.go
@@ -7,28 +7,46 @@ type Entry[K comparable, V any] struct {
 }
 
 // Tuple2 is a group of 2 elements (pair).
-type Tuple2[A any, B any] struct {
+type Tuple2[A, B any] struct {
 	A A
 	B B
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/yrtn7QJTmL_E
+func (t Tuple2[A, B]) Unpack() (A, B) {
+	return t.A, t.B
+}
+
 // Tuple3 is a group of 3 elements.
-type Tuple3[A any, B any, C any] struct {
+type Tuple3[A, B, C any] struct {
 	A A
 	B B
 	C C
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/yrtn7QJTmL_E
+func (t Tuple3[A, B, C]) Unpack() (A, B, C) {
+	return t.A, t.B, t.C
+}
+
 // Tuple4 is a group of 4 elements.
-type Tuple4[A any, B any, C any, D any] struct {
+type Tuple4[A, B, C, D any] struct {
 	A A
 	B B
 	C C
 	D D
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/yrtn7QJTmL_E
+func (t Tuple4[A, B, C, D]) Unpack() (A, B, C, D) {
+	return t.A, t.B, t.C, t.D
+}
+
 // Tuple5 is a group of 5 elements.
-type Tuple5[A any, B any, C any, D any, E any] struct {
+type Tuple5[A, B, C, D, E any] struct {
 	A A
 	B B
 	C C
@@ -36,8 +54,14 @@ type Tuple5[A any, B any, C any, D any, E any] struct {
 	E E
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/7J4KrtgtK3M
+func (t Tuple5[A, B, C, D, E]) Unpack() (A, B, C, D, E) {
+	return t.A, t.B, t.C, t.D, t.E
+}
+
 // Tuple6 is a group of 6 elements.
-type Tuple6[A any, B any, C any, D any, E any, F any] struct {
+type Tuple6[A, B, C, D, E, F any] struct {
 	A A
 	B B
 	C C
@@ -46,8 +70,14 @@ type Tuple6[A any, B any, C any, D any, E any, F any] struct {
 	F F
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/7J4KrtgtK3M
+func (t Tuple6[A, B, C, D, E, F]) Unpack() (A, B, C, D, E, F) {
+	return t.A, t.B, t.C, t.D, t.E, t.F
+}
+
 // Tuple7 is a group of 7 elements.
-type Tuple7[A any, B any, C any, D any, E any, F any, G any] struct {
+type Tuple7[A, B, C, D, E, F, G any] struct {
 	A A
 	B B
 	C C
@@ -57,8 +87,14 @@ type Tuple7[A any, B any, C any, D any, E any, F any, G any] struct {
 	G G
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/Ow9Zgf_zeiA
+func (t Tuple7[A, B, C, D, E, F, G]) Unpack() (A, B, C, D, E, F, G) {
+	return t.A, t.B, t.C, t.D, t.E, t.F, t.G
+}
+
 // Tuple8 is a group of 8 elements.
-type Tuple8[A any, B any, C any, D any, E any, F any, G any, H any] struct {
+type Tuple8[A, B, C, D, E, F, G, H any] struct {
 	A A
 	B B
 	C C
@@ -69,8 +105,14 @@ type Tuple8[A any, B any, C any, D any, E any, F any, G any, H any] struct {
 	H H
 }
 
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/Ow9Zgf_zeiA
+func (t Tuple8[A, B, C, D, E, F, G, H]) Unpack() (A, B, C, D, E, F, G, H) {
+	return t.A, t.B, t.C, t.D, t.E, t.F, t.G, t.H
+}
+
 // Tuple9 is a group of 9 elements.
-type Tuple9[A any, B any, C any, D any, E any, F any, G any, H any, I any] struct {
+type Tuple9[A, B, C, D, E, F, G, H, I any] struct {
 	A A
 	B B
 	C C
@@ -81,3 +123,9 @@ type Tuple9[A any, B any, C any, D any, E any, F any, G any, H any, I any] struc
 	H H
 	I I
 }
+
+// Unpack returns values contained in a tuple.
+// Play: https://go.dev/play/p/Ow9Zgf_zeiA
+func (t Tuple9[A, B, C, D, E, F, G, H, I]) Unpack() (A, B, C, D, E, F, G, H, I) {
+	return t.A, t.B, t.C, t.D, t.E, t.F, t.G, t.H, t.I
+}
diff --git a/vendor/github.com/sanity-io/litter/.travis.yml b/vendor/github.com/sanity-io/litter/.travis.yml
deleted file mode 100644
index ec9381c95..000000000
--- a/vendor/github.com/sanity-io/litter/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-arch:
-- amd64
-- ppc64le
-
-language: go
-go:
-- 1.14.x
diff --git a/vendor/github.com/sanity-io/litter/dump.go b/vendor/github.com/sanity-io/litter/dump.go
index 3dfbb9dbd..d830c5e9d 100644
--- a/vendor/github.com/sanity-io/litter/dump.go
+++ b/vendor/github.com/sanity-io/litter/dump.go
@@ -11,6 +11,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 )
 
 var (
@@ -40,6 +41,9 @@ type Options struct {
 	// when it's safe. This is useful for diffing two structures, where pointer variables would cause
 	// false changes. However, circular graphs are still detected and elided to avoid infinite output.
 	DisablePointerReplacement bool
+
+	// FormatTime, if true, will format [time.Time] values.
+	FormatTime bool
 }
 
 // Config is the default config used when calling Dump
@@ -59,6 +63,7 @@ type dumpState struct {
 	parentPointers    ptrmap
 	currentPointer    *ptrinfo
 	homePackageRegexp *regexp.Regexp
+	timeFormatter     func(t time.Time) string
 }
 
 func (s *dumpState) write(b []byte) {
@@ -129,6 +134,14 @@ func (s *dumpState) dumpSlice(v reflect.Value) {
 }
 
 func (s *dumpState) dumpStruct(v reflect.Value) {
+	if v.CanInterface() {
+		val := v.Interface()
+		if t, ok := val.(time.Time); ok && s.timeFormatter != nil {
+			s.writeString(s.timeFormatter(t))
+			return
+		}
+	}
+
 	dumpPreamble := func() {
 		s.dumpType(v)
 		s.write([]byte("{"))
@@ -246,7 +259,6 @@ func (s *dumpState) dumpChan(v reflect.Value) {
 }
 
 func (s *dumpState) dumpCustom(v reflect.Value, buf *bytes.Buffer) {
-
 	// Dump the type
 	s.dumpType(v)
 
@@ -293,6 +305,8 @@ func (s *dumpState) dump(value interface{}) {
 	s.dumpVal(v)
 }
 
+var dumperType = reflect.TypeOf((*Dumper)(nil)).Elem()
+
 func (s *dumpState) descendIntoPossiblePointer(value reflect.Value, f func()) {
 	canonicalize := true
 	if isPointerValue(value) {
@@ -345,7 +359,6 @@ func (s *dumpState) dumpVal(value reflect.Value) {
 	}
 
 	// Handle custom dumpers
-	dumperType := reflect.TypeOf((*Dumper)(nil)).Elem()
 	if v.Type().Implements(dumperType) {
 		s.descendIntoPossiblePointer(v, func() {
 			// Run the custom dumper buffering the output
@@ -457,13 +470,23 @@ func (s *dumpState) pointerFor(v reflect.Value) (*ptrinfo, bool) {
 }
 
 // prepares a new state object for dumping the provided value
-func newDumpState(value interface{}, options *Options, writer io.Writer) *dumpState {
+func newDumpState(value reflect.Value, options *Options, writer io.Writer) *dumpState {
 	result := &dumpState{
 		config:   options,
-		pointers: mapReusedPointers(reflect.ValueOf(value)),
+		pointers: mapReusedPointers(value),
 		w:        writer,
 	}
 
+	if options.FormatTime {
+		result.timeFormatter = func(t time.Time) string {
+			t = t.In(time.UTC)
+			return fmt.Sprintf(
+				`time.Date(%d, %d, %d, %d, %d, %d, %d, time.UTC)`,
+				t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), t.Nanosecond(),
+			)
+		}
+	}
+
 	if options.HomePackage != "" {
 		result.homePackageRegexp = regexp.MustCompile(fmt.Sprintf("\\b%s\\.", options.HomePackage))
 	}
@@ -471,12 +494,17 @@ func newDumpState(value interface{}, options *Options, writer io.Writer) *dumpSt
 	return result
 }
 
-// Dump a value to stdout
+// Dump a value to stdout.
 func Dump(value ...interface{}) {
 	(&Config).Dump(value...)
 }
 
-// Sdump dumps a value to a string
+// D dumps a value to stdout, and is a shorthand for [Dump].
+func D(value ...interface{}) {
+	Dump(value...)
+}
+
+// Sdump dumps a value to a string.
 func Sdump(value ...interface{}) string {
 	return (&Config).Sdump(value...)
 }
@@ -484,7 +512,7 @@ func Sdump(value ...interface{}) string {
 // Dump a value to stdout according to the options
 func (o Options) Dump(values ...interface{}) {
 	for i, value := range values {
-		state := newDumpState(value, &o, os.Stdout)
+		state := newDumpState(reflect.ValueOf(value), &o, os.Stdout)
 		if i > 0 {
 			state.write([]byte(o.Separator))
 		}
@@ -500,7 +528,7 @@ func (o Options) Sdump(values ...interface{}) string {
 		if i > 0 {
 			_, _ = buf.Write([]byte(o.Separator))
 		}
-		state := newDumpState(value, &o, buf)
+		state := newDumpState(reflect.ValueOf(value), &o, buf)
 		state.dump(value)
 	}
 	return buf.String()
diff --git a/vendor/github.com/sanity-io/litter/pointers.go b/vendor/github.com/sanity-io/litter/pointers.go
index 2c57d79ae..74b9a0f54 100644
--- a/vendor/github.com/sanity-io/litter/pointers.go
+++ b/vendor/github.com/sanity-io/litter/pointers.go
@@ -118,8 +118,7 @@ func (pv *pointerVisitor) consider(v reflect.Value) {
 	// Now descend into any children of this value
 	switch v.Kind() {
 	case reflect.Slice, reflect.Array:
-		numEntries := v.Len()
-		for i := 0; i < numEntries; i++ {
+		for i := 0; i < v.Len(); i++ {
 			pv.consider(v.Index(i))
 		}
 
@@ -136,6 +135,7 @@ func (pv *pointerVisitor) consider(v reflect.Value) {
 			options: &Config,
 		})
 		for _, key := range keys {
+			pv.consider(key)
 			pv.consider(v.MapIndex(key))
 		}
 
diff --git a/vendor/github.com/sasha-s/go-deadlock/Readme.md b/vendor/github.com/sasha-s/go-deadlock/Readme.md
index a1eb793c0..0a12ea5cd 100644
--- a/vendor/github.com/sasha-s/go-deadlock/Readme.md
+++ b/vendor/github.com/sasha-s/go-deadlock/Readme.md
@@ -1,4 +1,4 @@
-# Online deadlock detection in go (golang). [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/hJc6QCZowxbNm9WW) [![Docs](https://godoc.org/github.com/sasha-s/go-deadlock?status.svg)](https://godoc.org/github.com/sasha-s/go-deadlock) [![codecov](https://codecov.io/gh/sasha-s/go-deadlock/branch/master/graph/badge.svg)](https://codecov.io/gh/sasha-s/go-deadlock) [![version](https://badge.fury.io/gh/sasha-s%2Fgo-deadlock.svg)](https://github.com/sasha-s/go-deadlock/releases)  [![Go Report Card](https://goreportcard.com/badge/github.com/sasha-s/go-deadlock)](https://goreportcard.com/report/github.com/sasha-s/go-deadlock) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
+# Online deadlock detection in go (golang). [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/hJc6QCZowxbNm9WW) [![Docs](https://godoc.org/github.com/sasha-s/go-deadlock?status.svg)](https://godoc.org/github.com/sasha-s/go-deadlock) [![codecov](https://codecov.io/gh/sasha-s/go-deadlock/branch/main/graph/badge.svg)](https://codecov.io/gh/sasha-s/go-deadlock) [![version](https://badge.fury.io/gh/sasha-s%2Fgo-deadlock.svg)](https://github.com/sasha-s/go-deadlock/releases)  [![Go Report Card](https://goreportcard.com/badge/github.com/sasha-s/go-deadlock)](https://goreportcard.com/report/github.com/sasha-s/go-deadlock) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ## Why
 Deadlocks happen and are painful to debug.
@@ -172,16 +172,45 @@ func main() {
 	rlockTwice()
 }
 ```
+## Build Tags and Compatibility Modes
+
+go-deadlock supports multiple build configurations for different use cases:
+
+* **Normal mode** (default): Full deadlock detection with timer pooling
+* **Synctest mode**: Compatible with Go's `testing/synctest` package - use either:
+  * `-tags=deadlock_synctest` (recommended for Go 1.25+)
+  * `-tags=goexperiment.synctest` (for experimental synctest)
+* **Disabled mode** (`-tags=deadlock_disable`): Zero overhead, no detection
+
+**Why synctest mode?** `sync.Mutex` is not durably blocking in synctest bubbles, but channels are. Synctest mode uses channel-based mutexes to ensure proper behavior with `testing/synctest`.
+
+### Quick Examples
+
+```bash
+# Normal development/testing
+go test ./...
+
+# Testing with synctest (Go 1.25+, recommended)
+GODEBUG=asynctimerchan=0 go test -tags=deadlock_synctest ./...
+
+# Testing with experimental synctest
+GODEBUG=asynctimerchan=0 go test -tags=goexperiment.synctest ./...
+
+# Production build with zero overhead
+go build -tags=deadlock_disable ./...
+```
+
 ## Configuring go-deadlock
 
 Have a look at [Opts](https://pkg.go.dev/github.com/sasha-s/go-deadlock#pkg-variables).
 
-* `Opts.Disable`: disables deadlock detection altogether
+* `Opts.Disable`: disables deadlock detection altogether (runtime option; see also `deadlock_disable` build tag)
 * `Opts.DisableLockOrderDetection`: disables lock order based deadlock detection.
 * `Opts.DeadlockTimeout`: blocking on mutex for longer than DeadlockTimeout is considered a deadlock. ignored if negative
 * `Opts.OnPotentialDeadlock`: callback for then deadlock is detected
 * `Opts.MaxMapSize`: size of happens before // happens after table
 * `Opts.PrintAllCurrentGoroutines`:  dump stacktraces of all goroutines when inconsistent locking is detected, verbose
 * `Opts.LogBuf`: where to write deadlock info/stacktraces
+* `Opts.TimerPool`: controls timer pooling behavior (auto-configured based on build tags)
+
 
-	
diff --git a/vendor/github.com/sasha-s/go-deadlock/beforeafter_go124.go b/vendor/github.com/sasha-s/go-deadlock/beforeafter_go124.go
new file mode 100644
index 000000000..6bb1e4e52
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/beforeafter_go124.go
@@ -0,0 +1,30 @@
+//go:build go1.24
+
+package deadlock
+
+import (
+	"unsafe"
+	"weak"
+)
+
+type beforeAfter struct {
+	before weak.Pointer[byte]
+	after  weak.Pointer[byte]
+}
+
+// ptrFromInterface extracts the data pointer from an interface{} value.
+// An interface (eface) is {type *_type, data unsafe.Pointer}; we grab the second word.
+func ptrFromInterface(i interface{}) *byte {
+	type eface struct {
+		_    uintptr
+		data unsafe.Pointer
+	}
+	return (*byte)((*eface)(unsafe.Pointer(&i)).data)
+}
+
+func newBeforeAfter(before, after interface{}) beforeAfter {
+	return beforeAfter{
+		before: weak.Make(ptrFromInterface(before)),
+		after:  weak.Make(ptrFromInterface(after)),
+	}
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/beforeafter_legacy.go b/vendor/github.com/sasha-s/go-deadlock/beforeafter_legacy.go
new file mode 100644
index 000000000..0b8912b82
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/beforeafter_legacy.go
@@ -0,0 +1,12 @@
+//go:build !go1.24
+
+package deadlock
+
+type beforeAfter struct {
+	before interface{}
+	after  interface{}
+}
+
+func newBeforeAfter(before, after interface{}) beforeAfter {
+	return beforeAfter{before: before, after: after}
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/deadlock.go b/vendor/github.com/sasha-s/go-deadlock/deadlock.go
index a285c751d..33766b8a4 100644
--- a/vendor/github.com/sasha-s/go-deadlock/deadlock.go
+++ b/vendor/github.com/sasha-s/go-deadlock/deadlock.go
@@ -7,11 +7,24 @@ import (
 	"io"
 	"os"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/petermattis/goid"
 )
 
+// TimerPoolMode controls timer pooling behavior
+type TimerPoolMode int
+
+const (
+	// TimerPoolDefault automatically chooses based on build environment
+	TimerPoolDefault TimerPoolMode = iota
+	// TimerPoolEnabled always uses timer pooling for performance
+	TimerPoolEnabled
+	// TimerPoolDisabled disables timer pooling (required for testing/synctest)
+	TimerPoolDisabled
+)
+
 // Opts control how deadlock detection behaves.
 // Options are supposed to be set once at a startup (say, when parsing flags).
 var Opts = struct {
@@ -31,7 +44,12 @@ var Opts = struct {
 	MaxMapSize int
 	// Will dump stacktraces of all goroutines when inconsistent locking is detected.
 	PrintAllCurrentGoroutines bool
-	mu                        *sync.Mutex // Protects the LogBuf.
+	// Controls timer pooling behavior.
+	// TimerPoolDefault: Automatically choose based on build environment
+	// TimerPoolEnabled: Always use timer pooling
+	// TimerPoolDisabled: Never use timer pooling
+	TimerPool TimerPoolMode
+	mu        *sync.Mutex // Protects the LogBuf.
 	// Will print deadlock info to log buffer.
 	LogBuf io.Writer
 }{
@@ -75,7 +93,7 @@ var NewCond = sync.NewCond
 // A Mutex is a drop-in replacement for sync.Mutex.
 // Performs deadlock detection unless disabled in Opts.
 type Mutex struct {
-	mu sync.Mutex
+	mu StandardMutex
 }
 
 // Lock locks the mutex.
@@ -104,7 +122,7 @@ func (m *Mutex) Unlock() {
 // An RWMutex is a drop-in replacement for sync.RWMutex.
 // Performs deadlock detection unless disabled in Opts.
 type RWMutex struct {
-	mu sync.RWMutex
+	mu StandardRWMutex
 }
 
 // Lock locks rw for writing.
@@ -155,15 +173,15 @@ func (m *RWMutex) RUnlock() {
 // RLocker returns a Locker interface that implements
 // the Lock and Unlock methods by calling RLock and RUnlock.
 func (m *RWMutex) RLocker() sync.Locker {
-	return (*rlocker)(m)
+	return m.mu.RLocker()
 }
 
 func preLock(stack []uintptr, p interface{}) {
 	lo.preLock(stack, p)
 }
 
-func postLock(stack []uintptr, p interface{}) {
-	lo.postLock(stack, p)
+func postLock(stack []uintptr, buf *[stackBufSize]uintptr, p interface{}) {
+	lo.postLock(stack, buf, p)
 }
 
 func postUnlock(p interface{}) {
@@ -175,104 +193,180 @@ func lock(lockFn func(), ptr interface{}) {
 		lockFn()
 		return
 	}
-	stack := callers(1)
+	stack, buf := callers(1)
+	// Cache timeout before preLock so all Opts reads complete before preLock
+	// may call OnPotentialDeadlock. If preLock detects a problem (recursive
+	// lock, order violation) the goroutine may block forever in lockFn below,
+	// and reading Opts after preLock would race with any later Opts write.
+	timeout := Opts.DeadlockTimeout
 	preLock(stack, ptr)
-	if Opts.DeadlockTimeout <= 0 {
+	if timeout <= 0 {
 		lockFn()
 	} else {
-		ch := make(chan struct{})
 		currentID := goid.Get()
-		go checkDeadlock(stack, ptr, currentID, ch)
+		e := dw.register(stack, ptr, currentID, timeout)
 		lockFn()
-		postLock(stack, ptr)
-		close(ch)
+		dw.deregister(e)
+		postLock(stack, buf, ptr)
 		return
 	}
-	postLock(stack, ptr)
+	postLock(stack, buf, ptr)
 }
 
-var timersPool sync.Pool
-
-func acquireTimer(d time.Duration) *time.Timer {
-	t, ok := timersPool.Get().(*time.Timer)
-	if ok {
-		_ = t.Reset(d)
-		return t
-	}
-	return time.NewTimer(Opts.DeadlockTimeout)
+// pendingEntry tracks a goroutine that is waiting to acquire a lock. Entries are
+// pooled to avoid per-lock heap allocations (goroutine stacks, channels, closures).
+//
+// Timer safety invariants:
+//   - checkFn is allocated once per entry and reused across pool cycles, so recycling
+//     an entry does not allocate a new closure.
+//   - The done flag synchronizes the callback with deregister: deregister sets done=1
+//     before calling Stop(), and the callback checks done before acting. Because both
+//     use atomic operations, the callback is guaranteed to observe done=1 if deregister
+//     has already run, even if the runtime already scheduled the callback.
+//   - An entry is only returned to the pool when timer.Stop() returns true, meaning
+//     the timer was successfully cancelled and the callback will never run. This prevents
+//     a recycled entry from being mutated by an in-flight callback.
+//   - When Stop() returns false (callback already firing or queued), the entry is
+//     intentionally leaked to GC. This only happens in the rare deadlock-timeout path.
+type pendingEntry struct {
+	stack   []uintptr
+	ptr     interface{}
+	gid     int64
+	done    int32 // atomic: 0=pending, 1=acquired
+	timer   *time.Timer
+	checkFn func()
 }
 
-func releaseTimer(t *time.Timer) {
-	if !t.Stop() {
-		<-t.C
-	}
-	timersPool.Put(t)
-}
-
-func checkDeadlock(stack []uintptr, ptr interface{}, currentID int64, ch <-chan struct{}) {
-	t := acquireTimer(Opts.DeadlockTimeout)
-	defer releaseTimer(t)
-	for {
-		select {
-		case <-t.C:
-			lo.mu.Lock()
-			prev, ok := lo.cur[ptr]
-			if !ok {
-				lo.mu.Unlock()
-				break // Nobody seems to be holding the lock, try again.
-			}
-			Opts.mu.Lock()
-			fmt.Fprintln(Opts.LogBuf, header)
-			fmt.Fprintln(Opts.LogBuf, "Previous place where the lock was grabbed")
-			fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", prev.gid, ptr)
-			printStack(Opts.LogBuf, prev.stack)
-			fmt.Fprintln(Opts.LogBuf, "Have been trying to lock it again for more than", Opts.DeadlockTimeout)
-			fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", currentID, ptr)
-			printStack(Opts.LogBuf, stack)
-			stacks := stacks()
-			grs := bytes.Split(stacks, []byte("\n\n"))
-			for _, g := range grs {
-				if goid.ExtractGID(g) == prev.gid {
-					fmt.Fprintln(Opts.LogBuf, "Here is what goroutine", prev.gid, "doing now")
-					Opts.LogBuf.Write(g)
-					fmt.Fprintln(Opts.LogBuf)
-				}
-			}
-			lo.other(ptr)
-			if Opts.PrintAllCurrentGoroutines {
-				fmt.Fprintln(Opts.LogBuf, "All current goroutines:")
-				Opts.LogBuf.Write(stacks)
-			}
-			fmt.Fprintln(Opts.LogBuf)
-			if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
-				buf.Flush()
-			}
-			Opts.mu.Unlock()
-			lo.mu.Unlock()
-			Opts.OnPotentialDeadlock()
-			<-ch
-			return
-		case <-ch:
+func newPendingEntry() *pendingEntry {
+	e := &pendingEntry{}
+	// Capture e by pointer so the closure is stable across pool reuse, no new
+	// closure allocation when the entry is recycled.
+	e.checkFn = func() {
+		// If the lock was acquired (done=1), the entry may already be back in the
+		// pool or being reused. Bail out unconditionally.
+		if atomic.LoadInt32(&e.done) != 0 {
 			return
 		}
-		t.Reset(Opts.DeadlockTimeout)
+		onDeadlockTimeout(e)
 	}
+	return e
+}
+
+var pendingPool = sync.Pool{
+	New: func() interface{} {
+		return newPendingEntry()
+	},
+}
+
+type deadlockWatcher struct{}
+
+var dw deadlockWatcher
+
+func (w *deadlockWatcher) register(stack []uintptr, ptr interface{}, gid int64, timeout time.Duration) *pendingEntry {
+	var e *pendingEntry
+	if shouldDisableTimerPool() {
+		e = newPendingEntry()
+	} else {
+		e = pendingPool.Get().(*pendingEntry)
+	}
+	e.stack = stack
+	e.ptr = ptr
+	e.gid = gid
+	atomic.StoreInt32(&e.done, 0)
+	if e.timer == nil {
+		// First use (freshly allocated entry): create the AfterFunc timer.
+		// AfterFunc avoids the channel-drain problems of channel-based timers,
+		// which are especially problematic under testing/synctest.
+		e.timer = time.AfterFunc(timeout, e.checkFn)
+	} else {
+		// Reused from pool: the timer was previously Stop()'d successfully
+		// (guaranteed by deregister), so Reset is safe here.
+		e.timer.Reset(timeout)
+	}
+	return e
+}
+
+// deregister marks the lock as acquired and cancels the deadlock timer.
+// Must be called exactly once per register call. The entry pointer is
+// stack-local in lock(), so concurrent or duplicate calls cannot occur.
+func (w *deadlockWatcher) deregister(e *pendingEntry) {
+	// Mark done BEFORE stopping the timer. The callback checks done with an
+	// atomic load, so even if the timer fires concurrently, the callback will
+	// see done=1 and return without acting.
+	atomic.StoreInt32(&e.done, 1)
+	stopped := e.timer.Stop()
+	// Only recycle the entry if Stop() confirmed the callback won't run.
+	// If Stop() returned false the callback is already executing or queued;
+	// recycling would race with the callback reading entry fields.
+	if stopped && !shouldDisableTimerPool() {
+		e.stack = nil
+		e.ptr = nil
+		e.gid = 0
+		pendingPool.Put(e)
+	}
+}
+
+func onDeadlockTimeout(e *pendingEntry) {
+	lo.mu.Lock()
+	holders, ok := lo.cur[e.ptr]
+	if !ok || len(holders) == 0 {
+		// Lock appears unheld (transient state, holder may have just released).
+		// Reschedule if the waiter is still pending. Note: this creates a new timer
+		// (e.timer is not updated), so if deregister runs later it will Stop() the
+		// original (already-fired) timer, get false, and skip pooling. The new timer's
+		// callback will then observe done=1 and no-op. This is safe but means the
+		// entry won't be recycled, acceptable since this is the rare timeout path.
+		lo.mu.Unlock()
+		if atomic.LoadInt32(&e.done) == 0 {
+			time.AfterFunc(Opts.DeadlockTimeout, e.checkFn)
+		}
+		return
+	}
+	Opts.mu.Lock()
+	fmt.Fprintln(Opts.LogBuf, header)
+	for _, prev := range holders {
+		fmt.Fprintln(Opts.LogBuf, "Previous place where the lock was grabbed")
+		fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", prev.gid, e.ptr)
+		printStack(Opts.LogBuf, prev.stack)
+	}
+	fmt.Fprintln(Opts.LogBuf, "Have been trying to lock it again for more than", Opts.DeadlockTimeout)
+	fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", e.gid, e.ptr)
+	printStack(Opts.LogBuf, e.stack)
+	stacks := stacks()
+	grs := bytes.Split(stacks, []byte("\n\n"))
+	for _, prev := range holders {
+		for _, g := range grs {
+			if goid.ExtractGID(g) == prev.gid {
+				fmt.Fprintln(Opts.LogBuf, "Here is what goroutine", prev.gid, "doing now")
+				Opts.LogBuf.Write(g)
+				fmt.Fprintln(Opts.LogBuf)
+			}
+		}
+	}
+	lo.other(e.ptr)
+	if Opts.PrintAllCurrentGoroutines {
+		fmt.Fprintln(Opts.LogBuf, "All current goroutines:")
+		Opts.LogBuf.Write(stacks)
+	}
+	fmt.Fprintln(Opts.LogBuf)
+	if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
+		buf.Flush()
+	}
+	Opts.mu.Unlock()
+	lo.mu.Unlock()
+	Opts.OnPotentialDeadlock()
 }
 
 type lockOrder struct {
 	mu    sync.Mutex
-	cur   map[interface{}]stackGID // stacktraces + gids for the locks currently taken.
-	order map[beforeAfter]ss       // expected order of locks.
+	cur   map[interface{}][]stackGID // stacktraces + gids for the locks currently taken.
+	order map[beforeAfter]ss         // expected order of locks.
 }
 
 type stackGID struct {
 	stack []uintptr
 	gid   int64
-}
-
-type beforeAfter struct {
-	before interface{}
-	after  interface{}
+	buf   *[stackBufSize]uintptr // pooled backing array; returned via releaseStackBuf in postUnlock
 }
 
 type ss struct {
@@ -284,15 +378,31 @@ var lo = newLockOrder()
 
 func newLockOrder() *lockOrder {
 	return &lockOrder{
-		cur:   map[interface{}]stackGID{},
+		cur:   map[interface{}][]stackGID{},
 		order: map[beforeAfter]ss{},
 	}
 }
 
-func (l *lockOrder) postLock(stack []uintptr, p interface{}) {
+// holdersPool recycles []stackGID slices used by lockOrder.cur to track which
+// goroutines currently hold each lock. Slices are returned to the pool in
+// postUnlock when a lock's holder count drops to zero, and reused in postLock
+// for the next lock acquisition, avoiding a new slice allocation per mutex.
+var holdersPool sync.Pool
+
+// postLock records the current goroutine as a holder of lock p. It tries to
+// reuse a pooled []stackGID slice before allocating, and stores the pooled
+// stack buffer in the entry so postUnlock can release it later.
+func (l *lockOrder) postLock(stack []uintptr, buf *[stackBufSize]uintptr, p interface{}) {
 	gid := goid.Get()
+	entry := stackGID{stack, gid, buf}
 	l.mu.Lock()
-	l.cur[p] = stackGID{stack, gid}
+	holders := l.cur[p]
+	if holders == nil {
+		if s, ok := holdersPool.Get().([]stackGID); ok {
+			holders = s[:0]
+		}
+	}
+	l.cur[p] = append(holders, entry)
 	l.mu.Unlock()
 }
 
@@ -302,84 +412,131 @@ func (l *lockOrder) preLock(stack []uintptr, p interface{}) {
 	}
 	gid := goid.Get()
 	l.mu.Lock()
-	for b, bs := range l.cur {
+	for b, holders := range l.cur {
 		if b == p {
-			if bs.gid == gid {
+			for _, bs := range holders {
+				if bs.gid == gid {
+					Opts.mu.Lock()
+					fmt.Fprintln(Opts.LogBuf, header, "Recursive locking:")
+					fmt.Fprintf(Opts.LogBuf, "current goroutine %d lock %p\n", gid, b)
+					printStack(Opts.LogBuf, stack)
+					fmt.Fprintln(Opts.LogBuf, "Previous place where the lock was grabbed (same goroutine)")
+					printStack(Opts.LogBuf, bs.stack)
+					l.other(p)
+					if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
+						buf.Flush()
+					}
+					Opts.mu.Unlock()
+					Opts.OnPotentialDeadlock()
+					break
+				}
+			}
+			continue
+		}
+		for _, bs := range holders {
+			if bs.gid != gid { // We want locks taken in the same goroutine only.
+				continue
+			}
+			if s, ok := l.order[newBeforeAfter(p, b)]; ok {
 				Opts.mu.Lock()
-				fmt.Fprintln(Opts.LogBuf, header, "Recursive locking:")
-				fmt.Fprintf(Opts.LogBuf, "current goroutine %d lock %p\n", gid, b)
-				printStack(Opts.LogBuf, stack)
-				fmt.Fprintln(Opts.LogBuf, "Previous place where the lock was grabbed (same goroutine)")
+				fmt.Fprintln(Opts.LogBuf, header, "Inconsistent locking. saw this ordering in one goroutine:")
+				fmt.Fprintln(Opts.LogBuf, "happened before")
+				printStack(Opts.LogBuf, s.before)
+				fmt.Fprintln(Opts.LogBuf, "happened after")
+				printStack(Opts.LogBuf, s.after)
+				fmt.Fprintln(Opts.LogBuf, "in another goroutine: happened before")
 				printStack(Opts.LogBuf, bs.stack)
+				fmt.Fprintln(Opts.LogBuf, "happened after")
+				printStack(Opts.LogBuf, stack)
 				l.other(p)
+				fmt.Fprintln(Opts.LogBuf)
 				if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
 					buf.Flush()
 				}
 				Opts.mu.Unlock()
 				Opts.OnPotentialDeadlock()
 			}
-			continue
-		}
-		if bs.gid != gid { // We want locks taken in the same goroutine only.
-			continue
-		}
-		if s, ok := l.order[beforeAfter{p, b}]; ok {
-			Opts.mu.Lock()
-			fmt.Fprintln(Opts.LogBuf, header, "Inconsistent locking. saw this ordering in one goroutine:")
-			fmt.Fprintln(Opts.LogBuf, "happened before")
-			printStack(Opts.LogBuf, s.before)
-			fmt.Fprintln(Opts.LogBuf, "happened after")
-			printStack(Opts.LogBuf, s.after)
-			fmt.Fprintln(Opts.LogBuf, "in another goroutine: happened before")
-			printStack(Opts.LogBuf, bs.stack)
-			fmt.Fprintln(Opts.LogBuf, "happened after")
-			printStack(Opts.LogBuf, stack)
-			l.other(p)
-			fmt.Fprintln(Opts.LogBuf)
-			if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
-				buf.Flush()
+			// Copy both stacks: they're backed by pooled buffers that will be
+			// recycled in postUnlock, but l.order entries persist until MaxMapSize.
+			l.order[newBeforeAfter(b, p)] = ss{copyStack(bs.stack), copyStack(stack)}
+			if len(l.order) == Opts.MaxMapSize { // Reset the map to keep memory footprint bounded.
+				l.order = map[beforeAfter]ss{}
 			}
-			Opts.mu.Unlock()
-			Opts.OnPotentialDeadlock()
-		}
-		l.order[beforeAfter{b, p}] = ss{bs.stack, stack}
-		if len(l.order) == Opts.MaxMapSize { // Reset the map to keep memory footprint bounded.
-			l.order = map[beforeAfter]ss{}
 		}
 	}
 	l.mu.Unlock()
 }
 
 func (l *lockOrder) postUnlock(p interface{}) {
+	gid := goid.Get()
 	l.mu.Lock()
-	delete(l.cur, p)
+	holders := l.cur[p]
+	idx := -1
+	for i, h := range holders {
+		if h.gid == gid {
+			idx = i
+			break
+		}
+	}
+	if idx >= 0 {
+		removedBuf := holders[idx].buf
+		holders[idx] = holders[len(holders)-1]
+		holders[len(holders)-1] = stackGID{}
+		holders = holders[:len(holders)-1]
+		releaseStackBuf(removedBuf)
+	} else if len(holders) > 0 {
+		// Cross-goroutine unlock: Go permits one goroutine to Lock and a different
+		// goroutine to Unlock, so the unlocking gid may not match any holder entry.
+		// This is a rare edge case in practice, the vast majority of code unlocks
+		// from the same goroutine that locked. We remove an arbitrary entry to keep
+		// the holder count consistent with the real lock state (the lock *was*
+		// released, so one entry must go). The trade-off: for RWMutex with multiple
+		// concurrent readers we may discard the wrong reader's stack trace, making a
+		// future deadlock report show a slightly misleading "previous lock site".
+		// Detection correctness is unaffected.
+		removedBuf := holders[len(holders)-1].buf
+		holders[len(holders)-1] = stackGID{}
+		holders = holders[:len(holders)-1]
+		releaseStackBuf(removedBuf)
+	}
+	if len(holders) == 0 {
+		// Delete the map key so the mutex pointer is not retained, allowing GC of
+		// the struct it's embedded in. Recycle the backing slice via pool so the
+		// next postLock on any mutex can reuse it instead of allocating.
+		if cap(holders) > 0 {
+			holdersPool.Put(holders[:0])
+		}
+		delete(l.cur, p)
+	} else {
+		l.cur[p] = holders
+	}
 	l.mu.Unlock()
 }
 
-type rlocker RWMutex
-
-func (r *rlocker) Lock()   { (*RWMutex)(r).RLock() }
-func (r *rlocker) Unlock() { (*RWMutex)(r).RUnlock() }
-
 // Under lo.mu Locked.
 func (l *lockOrder) other(ptr interface{}) {
 	empty := true
-	for k := range l.cur {
+	for k, holders := range l.cur {
 		if k == ptr {
 			continue
 		}
-		empty = false
+		if len(holders) > 0 {
+			empty = false
+			break
+		}
 	}
 	if empty {
 		return
 	}
 	fmt.Fprintln(Opts.LogBuf, "Other goroutines holding locks:")
-	for k, pp := range l.cur {
+	for k, holders := range l.cur {
 		if k == ptr {
 			continue
 		}
-		fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", pp.gid, k)
-		printStack(Opts.LogBuf, pp.stack)
+		for _, pp := range holders {
+			fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", pp.gid, k)
+			printStack(Opts.LogBuf, pp.stack)
+		}
 	}
 	fmt.Fprintln(Opts.LogBuf)
 }
diff --git a/vendor/github.com/sasha-s/go-deadlock/deadlock_map.go b/vendor/github.com/sasha-s/go-deadlock/deadlock_map.go
index ec66bdc0f..70277f2bc 100644
--- a/vendor/github.com/sasha-s/go-deadlock/deadlock_map.go
+++ b/vendor/github.com/sasha-s/go-deadlock/deadlock_map.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package deadlock
diff --git a/vendor/github.com/sasha-s/go-deadlock/mutex.go b/vendor/github.com/sasha-s/go-deadlock/mutex.go
new file mode 100644
index 000000000..a7d7f1c3d
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/mutex.go
@@ -0,0 +1,21 @@
+package deadlock
+
+import "sync"
+
+// MutexImpl defines the interface for mutex implementations
+type MutexImpl interface {
+	Lock()
+	Unlock()
+	TryLock() bool
+}
+
+// RWMutexImpl defines the interface for rwmutex implementations
+type RWMutexImpl interface {
+	Lock()
+	Unlock()
+	RLock()
+	RUnlock()
+	TryLock() bool
+	TryRLock() bool
+	RLocker() sync.Locker
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/stacktraces.go b/vendor/github.com/sasha-s/go-deadlock/stacktraces.go
index d93050fcd..fb5f308d8 100644
--- a/vendor/github.com/sasha-s/go-deadlock/stacktraces.go
+++ b/vendor/github.com/sasha-s/go-deadlock/stacktraces.go
@@ -13,9 +13,38 @@ import (
 	"sync"
 )
 
-func callers(skip int) []uintptr {
-	s := make([]uintptr, 50) // Most relevant context seem to appear near the top of the stack.
-	return s[:runtime.Callers(2+skip, s)]
+const stackBufSize = 50
+
+var stackBufPool = sync.Pool{
+	New: func() interface{} {
+		return new([stackBufSize]uintptr)
+	},
+}
+
+// callers returns a stack trace backed by a pooled buffer. The caller must
+// eventually return buf via releaseStackBuf — typically through the
+// postLock/postUnlock path which stores it in stackGID.buf.
+func callers(skip int) ([]uintptr, *[stackBufSize]uintptr) {
+	buf := stackBufPool.Get().(*[stackBufSize]uintptr)
+	n := runtime.Callers(2+skip, buf[:])
+	return buf[:n], buf
+}
+
+// releaseStackBuf returns a pooled stack buffer obtained from callers(). Safe to
+// call with nil (e.g. when the buffer was already handed off via stackGID.buf).
+func releaseStackBuf(buf *[stackBufSize]uintptr) {
+	if buf != nil {
+		stackBufPool.Put(buf)
+	}
+}
+
+// copyStack creates an independent copy of a stack trace. Required when storing
+// stacks in long-lived structures (e.g. l.order) because the originals are backed
+// by pooled buffers that will be recycled in postUnlock.
+func copyStack(s []uintptr) []uintptr {
+	c := make([]uintptr, len(s))
+	copy(c, s)
+	return c
 }
 
 func printStack(w io.Writer, stack []uintptr) {
diff --git a/vendor/github.com/sasha-s/go-deadlock/sync_disable.go b/vendor/github.com/sasha-s/go-deadlock/sync_disable.go
new file mode 100644
index 000000000..cd9778c50
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/sync_disable.go
@@ -0,0 +1,55 @@
+//go:build deadlock_disable && !go1.18
+
+package deadlock
+
+import "sync"
+
+// StandardMutex wraps sync.Mutex with no deadlock detection
+type StandardMutex struct {
+	mu sync.Mutex
+}
+
+func (m *StandardMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardMutex) TryLock() bool {
+	panic("TryLock requires Go 1.18 or later")
+}
+
+// StandardRWMutex wraps sync.RWMutex with no deadlock detection
+type StandardRWMutex struct {
+	mu sync.RWMutex
+}
+
+func (m *StandardRWMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardRWMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardRWMutex) RLock() {
+	m.mu.RLock()
+}
+
+func (m *StandardRWMutex) RUnlock() {
+	m.mu.RUnlock()
+}
+
+func (m *StandardRWMutex) TryLock() bool {
+	panic("TryLock requires Go 1.18 or later")
+}
+
+func (m *StandardRWMutex) TryRLock() bool {
+	panic("TryRLock requires Go 1.18 or later")
+}
+
+func (m *StandardRWMutex) RLocker() sync.Locker {
+	return m.mu.RLocker()
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/sync_disable_go118.go b/vendor/github.com/sasha-s/go-deadlock/sync_disable_go118.go
new file mode 100644
index 000000000..41c715585
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/sync_disable_go118.go
@@ -0,0 +1,55 @@
+//go:build deadlock_disable && go1.18
+
+package deadlock
+
+import "sync"
+
+// StandardMutex wraps sync.Mutex with no deadlock detection
+type StandardMutex struct {
+	mu sync.Mutex
+}
+
+func (m *StandardMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardMutex) TryLock() bool {
+	return m.mu.TryLock()
+}
+
+// StandardRWMutex wraps sync.RWMutex with no deadlock detection
+type StandardRWMutex struct {
+	mu sync.RWMutex
+}
+
+func (m *StandardRWMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardRWMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardRWMutex) RLock() {
+	m.mu.RLock()
+}
+
+func (m *StandardRWMutex) RUnlock() {
+	m.mu.RUnlock()
+}
+
+func (m *StandardRWMutex) TryLock() bool {
+	return m.mu.TryLock()
+}
+
+func (m *StandardRWMutex) TryRLock() bool {
+	return m.mu.TryRLock()
+}
+
+func (m *StandardRWMutex) RLocker() sync.Locker {
+	return m.mu.RLocker()
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/sync_mutex_go118.go b/vendor/github.com/sasha-s/go-deadlock/sync_mutex_go118.go
new file mode 100644
index 000000000..e934ba464
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/sync_mutex_go118.go
@@ -0,0 +1,65 @@
+//go:build !goexperiment.synctest && !deadlock_synctest && !deadlock_disable && go1.18
+// +build !goexperiment.synctest,!deadlock_synctest,!deadlock_disable,go1.18
+
+package deadlock
+
+import "sync"
+
+// StandardMutex wraps sync.Mutex
+type StandardMutex struct {
+	mu sync.Mutex
+}
+
+func (m *StandardMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardMutex) TryLock() bool {
+	return m.mu.TryLock()
+}
+
+// StandardRWMutex wraps sync.RWMutex
+type StandardRWMutex struct {
+	mu sync.RWMutex
+}
+
+func (m *StandardRWMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardRWMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardRWMutex) RLock() {
+	m.mu.RLock()
+}
+
+func (m *StandardRWMutex) RUnlock() {
+	m.mu.RUnlock()
+}
+
+func (m *StandardRWMutex) TryLock() bool {
+	return m.mu.TryLock()
+}
+
+func (m *StandardRWMutex) TryRLock() bool {
+	return m.mu.TryRLock()
+}
+
+func (m *StandardRWMutex) RLocker() sync.Locker {
+	return m.mu.RLocker()
+}
+
+// Default factory functions
+func newStandardMutex() MutexImpl {
+	return &StandardMutex{}
+}
+
+func newStandardRWMutex() RWMutexImpl {
+	return &StandardRWMutex{}
+}
\ No newline at end of file
diff --git a/vendor/github.com/sasha-s/go-deadlock/sync_mutex_legacy.go b/vendor/github.com/sasha-s/go-deadlock/sync_mutex_legacy.go
new file mode 100644
index 000000000..dd055bf72
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/sync_mutex_legacy.go
@@ -0,0 +1,68 @@
+//go:build !goexperiment.synctest && !deadlock_synctest && !deadlock_disable && !go1.18
+// +build !goexperiment.synctest,!deadlock_synctest,!deadlock_disable,!go1.18
+
+package deadlock
+
+import "sync"
+
+// StandardMutex wraps sync.Mutex
+type StandardMutex struct {
+	mu sync.Mutex
+}
+
+func (m *StandardMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardMutex) TryLock() bool {
+	// TryLock is not available before Go 1.18
+	panic("TryLock requires Go 1.18 or later")
+}
+
+// StandardRWMutex wraps sync.RWMutex
+type StandardRWMutex struct {
+	mu sync.RWMutex
+}
+
+func (m *StandardRWMutex) Lock() {
+	m.mu.Lock()
+}
+
+func (m *StandardRWMutex) Unlock() {
+	m.mu.Unlock()
+}
+
+func (m *StandardRWMutex) RLock() {
+	m.mu.RLock()
+}
+
+func (m *StandardRWMutex) RUnlock() {
+	m.mu.RUnlock()
+}
+
+func (m *StandardRWMutex) TryLock() bool {
+	// TryLock is not available before Go 1.18
+	panic("TryLock requires Go 1.18 or later")
+}
+
+func (m *StandardRWMutex) TryRLock() bool {
+	// TryRLock is not available before Go 1.18
+	panic("TryRLock requires Go 1.18 or later")
+}
+
+func (m *StandardRWMutex) RLocker() sync.Locker {
+	return m.mu.RLocker()
+}
+
+// Default factory functions
+func newStandardMutex() MutexImpl {
+	return &StandardMutex{}
+}
+
+func newStandardRWMutex() RWMutexImpl {
+	return &StandardRWMutex{}
+}
\ No newline at end of file
diff --git a/vendor/github.com/sasha-s/go-deadlock/synctest_mutex.go b/vendor/github.com/sasha-s/go-deadlock/synctest_mutex.go
new file mode 100644
index 000000000..de628794b
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/synctest_mutex.go
@@ -0,0 +1,234 @@
+//go:build (goexperiment.synctest || deadlock_synctest) && !deadlock_disable
+
+package deadlock
+
+import (
+	"sync"
+	"sync/atomic"
+)
+
+// ChannelMutex implements MutexImpl using channels for synctest compatibility
+type ChannelMutex struct {
+	ch     chan struct{}
+	locked int32 // atomic
+	once   sync.Once
+}
+
+func (m *ChannelMutex) init() {
+	m.once.Do(func() {
+		m.ch = make(chan struct{}, 1)
+	})
+}
+
+func (m *ChannelMutex) Lock() {
+	m.init()
+	m.ch <- struct{}{}
+	atomic.StoreInt32(&m.locked, 1)
+}
+
+func (m *ChannelMutex) Unlock() {
+	if atomic.LoadInt32(&m.locked) == 0 {
+		panic("unlock of unlocked mutex")
+	}
+	atomic.StoreInt32(&m.locked, 0)
+	<-m.ch
+}
+
+func (m *ChannelMutex) TryLock() bool {
+	m.init()
+	select {
+	case m.ch <- struct{}{}:
+		atomic.StoreInt32(&m.locked, 1)
+		return true
+	default:
+		return false
+	}
+}
+
+// ChannelRWMutex implements RWMutexImpl with writer priority using channels.
+// Implements writer-priority semantics using the "Third Readers-Writers Problem" solution.
+type ChannelRWMutex struct {
+	resource    chan struct{} // The actual resource being protected
+	readTry     chan struct{} // Gate that closes when writers waiting
+	rmutex      chan struct{} // Protects readCount modifications
+	wmutex      chan struct{} // Protects writeCount modifications
+	readCount   int32         // Number of active readers
+	writeCount  int32         // Number of waiting/active writers
+	once        sync.Once
+}
+
+func (m *ChannelRWMutex) init() {
+	m.once.Do(func() {
+		m.resource = make(chan struct{}, 1)
+		m.readTry = make(chan struct{}, 1)
+		m.rmutex = make(chan struct{}, 1)
+		m.wmutex = make(chan struct{}, 1)
+		// Initially, all semaphores are "released" (have a token)
+		m.resource <- struct{}{}
+		m.readTry <- struct{}{}
+		m.rmutex <- struct{}{}
+		m.wmutex <- struct{}{}
+	})
+}
+
+func (m *ChannelRWMutex) Lock() {
+	m.init()
+	// Protect writeCount modification
+	<-m.wmutex
+	count := atomic.AddInt32(&m.writeCount, 1)
+	if count == 1 {
+		// First writer: close the gate to block new readers
+		<-m.readTry
+	}
+	m.wmutex <- struct{}{} // Release wmutex
+
+	// Acquire the resource (wait for existing readers to finish)
+	<-m.resource
+}
+
+func (m *ChannelRWMutex) Unlock() {
+	// Release the resource
+	m.resource <- struct{}{}
+
+	// Protect writeCount modification
+	<-m.wmutex
+	count := atomic.AddInt32(&m.writeCount, -1)
+	if count == 0 {
+		// Last writer: reopen the gate for readers
+		m.readTry <- struct{}{}
+	}
+	m.wmutex <- struct{}{}
+}
+
+func (m *ChannelRWMutex) RLock() {
+	m.init()
+	// Wait at the gate (blocks if writers are waiting)
+	<-m.readTry
+
+	// Protect readCount modification
+	<-m.rmutex
+	count := atomic.AddInt32(&m.readCount, 1)
+	if count == 1 {
+		// First reader: acquire the resource to block writers
+		<-m.resource
+	}
+	m.rmutex <- struct{}{} // Release rmutex
+
+	// Release the gate so other readers can pass
+	m.readTry <- struct{}{}
+}
+
+func (m *ChannelRWMutex) RUnlock() {
+	<-m.rmutex
+	count := atomic.AddInt32(&m.readCount, -1)
+	if count < 0 {
+		m.rmutex <- struct{}{}
+		panic("RUnlock of unlocked RWMutex")
+	}
+	if count == 0 {
+		// Last reader: release the resource for writers
+		m.resource <- struct{}{}
+	}
+	m.rmutex <- struct{}{}
+}
+
+func (m *ChannelRWMutex) TryLock() bool {
+	m.init()
+	// Try to acquire wmutex
+	select {
+	case <-m.wmutex:
+	default:
+		return false
+	}
+
+	count := atomic.AddInt32(&m.writeCount, 1)
+	if count == 1 {
+		// First writer: try to close gate
+		select {
+		case <-m.readTry:
+		default:
+			// Failed, rollback
+			atomic.AddInt32(&m.writeCount, -1)
+			m.wmutex <- struct{}{}
+			return false
+		}
+	}
+	m.wmutex <- struct{}{}
+
+	// Try to acquire resource
+	select {
+	case <-m.resource:
+		return true
+	default:
+		// Failed, rollback writer count
+		<-m.wmutex
+		count = atomic.AddInt32(&m.writeCount, -1)
+		if count == 0 {
+			m.readTry <- struct{}{}
+		}
+		m.wmutex <- struct{}{}
+		return false
+	}
+}
+
+func (m *ChannelRWMutex) TryRLock() bool {
+	m.init()
+	// Try to pass through the gate
+	select {
+	case <-m.readTry:
+	default:
+		return false
+	}
+
+	// Try to acquire rmutex
+	select {
+	case <-m.rmutex:
+	default:
+		// Failed, release gate
+		m.readTry <- struct{}{}
+		return false
+	}
+
+	count := atomic.AddInt32(&m.readCount, 1)
+	if count == 1 {
+		// First reader: try to acquire resource
+		select {
+		case <-m.resource:
+		default:
+			// Failed, rollback
+			atomic.AddInt32(&m.readCount, -1)
+			m.rmutex <- struct{}{}
+			m.readTry <- struct{}{}
+			return false
+		}
+	}
+	m.rmutex <- struct{}{}
+	m.readTry <- struct{}{}
+	return true
+}
+
+func (m *ChannelRWMutex) RLocker() sync.Locker {
+	return (*channelRLocker)(m)
+}
+
+type channelRLocker ChannelRWMutex
+
+func (r *channelRLocker) Lock()   { (*ChannelRWMutex)(r).RLock() }
+func (r *channelRLocker) Unlock() { (*ChannelRWMutex)(r).RUnlock() }
+
+// Factory functions for synctest
+func newChannelMutex() MutexImpl {
+	return &ChannelMutex{
+		ch: make(chan struct{}, 1),
+	}
+}
+
+func newChannelRWMutex() RWMutexImpl {
+	m := &ChannelRWMutex{}
+	m.init()
+	return m
+}
+
+// Type aliases to override the standard mutex types for synctest
+type StandardMutex = ChannelMutex
+type StandardRWMutex = ChannelRWMutex
diff --git a/vendor/github.com/sasha-s/go-deadlock/timerpool_default.go b/vendor/github.com/sasha-s/go-deadlock/timerpool_default.go
new file mode 100644
index 000000000..199a52050
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/timerpool_default.go
@@ -0,0 +1,18 @@
+//go:build !goexperiment.synctest && !deadlock_synctest && !deadlock_disable && !go1.25
+
+package deadlock
+
+// shouldDisableTimerPool determines if timer pooling should be disabled
+// In normal builds, timer pooling is enabled by default for performance
+func shouldDisableTimerPool() bool {
+	switch Opts.TimerPool {
+	case TimerPoolDefault:
+		return false // Default: enable timer pooling for performance
+	case TimerPoolEnabled:
+		return false
+	case TimerPoolDisabled:
+		return true
+	default:
+		return false
+	}
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/timerpool_disable.go b/vendor/github.com/sasha-s/go-deadlock/timerpool_disable.go
new file mode 100644
index 000000000..c4dff21b0
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/timerpool_disable.go
@@ -0,0 +1,9 @@
+//go:build deadlock_disable
+
+package deadlock
+
+// shouldDisableTimerPool always returns true when deadlock detection is disabled
+// since there's no timer pool or deadlock detection happening anyway
+func shouldDisableTimerPool() bool {
+	return true
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/timerpool_go125.go b/vendor/github.com/sasha-s/go-deadlock/timerpool_go125.go
new file mode 100644
index 000000000..a35cd3f88
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/timerpool_go125.go
@@ -0,0 +1,18 @@
+//go:build !goexperiment.synctest && !deadlock_synctest && !deadlock_disable && go1.25
+
+package deadlock
+
+// shouldDisableTimerPool determines if timer/entry pooling should be disabled.
+// In Go 1.25, pooling is enabled by default for performance.
+func shouldDisableTimerPool() bool {
+	switch Opts.TimerPool {
+	case TimerPoolDefault:
+		return false // Default: enable timer pooling for performance
+	case TimerPoolEnabled:
+		return false
+	case TimerPoolDisabled:
+		return true
+	default:
+		return false
+	}
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/timerpool_synctest.go b/vendor/github.com/sasha-s/go-deadlock/timerpool_synctest.go
new file mode 100644
index 000000000..35e55ef78
--- /dev/null
+++ b/vendor/github.com/sasha-s/go-deadlock/timerpool_synctest.go
@@ -0,0 +1,18 @@
+//go:build (goexperiment.synctest || deadlock_synctest) && !deadlock_disable
+
+package deadlock
+
+// shouldDisableTimerPool determines if timer pooling should be disabled
+// In synctest builds, timer pooling is disabled by default to avoid cross-bubble issues
+func shouldDisableTimerPool() bool {
+	switch Opts.TimerPool {
+	case TimerPoolDefault:
+		return true // Default: disable timer pooling for synctest compatibility
+	case TimerPoolEnabled:
+		return false
+	case TimerPoolDisabled:
+		return true
+	default:
+		return true
+	}
+}
diff --git a/vendor/github.com/sasha-s/go-deadlock/trylock.go b/vendor/github.com/sasha-s/go-deadlock/trylock.go
index e8a6775b4..b29b263f1 100644
--- a/vendor/github.com/sasha-s/go-deadlock/trylock.go
+++ b/vendor/github.com/sasha-s/go-deadlock/trylock.go
@@ -1,3 +1,4 @@
+//go:build go1.18
 // +build go1.18
 
 package deadlock
@@ -27,13 +28,16 @@ func trylock(lockFn func() bool, ptr interface{}) bool {
 	if Opts.Disable {
 		return lockFn()
 	}
-	stack := callers(1)
+	stack, buf := callers(1)
 	preLock(stack, ptr)
 	ret := lockFn()
 	if ret {
-		postLock(stack, ptr)
+		postLock(stack, buf, ptr)
 	} else {
+		// TryLock failed: the stack won't be stored in stackGID.buf (postLock is
+		// skipped), so we must release the pooled buffer directly to avoid a leak.
+		releaseStackBuf(buf)
 		postUnlock(ptr)
-	}		
+	}
 	return ret
 }
diff --git a/vendor/github.com/sergi/go-diff/AUTHORS b/vendor/github.com/sergi/go-diff/AUTHORS
deleted file mode 100644
index 2d7bb2bf5..000000000
--- a/vendor/github.com/sergi/go-diff/AUTHORS
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is the official list of go-diff authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS files.
-# See the latter for an explanation.
-
-# Names should be added to this file as
-#	Name or Organization 
-# The email address is not required for organizations.
-
-# Please keep the list sorted.
-
-Danny Yoo 
-James Kolb 
-Jonathan Amsterdam 
-Markus Zimmermann   
-Matt Kovars 
-Örjan Persson 
-Osman Masood 
-Robert Carlsen 
-Rory Flynn 
-Sergi Mansilla 
-Shatrugna Sadhu 
-Shawn Smith 
-Stas Maksimov 
-Tor Arvid Lund 
-Zac Bergquist 
diff --git a/vendor/github.com/sergi/go-diff/CONTRIBUTORS b/vendor/github.com/sergi/go-diff/CONTRIBUTORS
deleted file mode 100644
index 369e3d551..000000000
--- a/vendor/github.com/sergi/go-diff/CONTRIBUTORS
+++ /dev/null
@@ -1,32 +0,0 @@
-# This is the official list of people who can contribute
-# (and typically have contributed) code to the go-diff
-# repository.
-#
-# The AUTHORS file lists the copyright holders; this file
-# lists people.  For example, ACME Inc. employees would be listed here
-# but not in AUTHORS, because ACME Inc. would hold the copyright.
-#
-# When adding J Random Contributor's name to this file,
-# either J's name or J's organization's name should be
-# added to the AUTHORS file.
-#
-# Names should be added to this file like so:
-#     Name 
-#
-# Please keep the list sorted.
-
-Danny Yoo 
-James Kolb 
-Jonathan Amsterdam 
-Markus Zimmermann   
-Matt Kovars 
-Örjan Persson 
-Osman Masood 
-Robert Carlsen 
-Rory Flynn 
-Sergi Mansilla 
-Shatrugna Sadhu 
-Shawn Smith 
-Stas Maksimov 
-Tor Arvid Lund 
-Zac Bergquist 
diff --git a/vendor/github.com/sergi/go-diff/LICENSE b/vendor/github.com/sergi/go-diff/LICENSE
deleted file mode 100644
index 937942c2b..000000000
--- a/vendor/github.com/sergi/go-diff/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2012-2016 The go-diff Authors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
diff --git a/vendor/github.com/sergi/go-diff/diffmatchpatch/diff.go b/vendor/github.com/sergi/go-diff/diffmatchpatch/diff.go
deleted file mode 100644
index 915d5090d..000000000
--- a/vendor/github.com/sergi/go-diff/diffmatchpatch/diff.go
+++ /dev/null
@@ -1,1347 +0,0 @@
-// Copyright (c) 2012-2016 The go-diff authors. All rights reserved.
-// https://github.com/sergi/go-diff
-// See the included LICENSE file for license details.
-//
-// go-diff is a Go implementation of Google's Diff, Match, and Patch library
-// Original library is Copyright (c) 2006 Google Inc.
-// http://code.google.com/p/google-diff-match-patch/
-
-package diffmatchpatch
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"html"
-	"math"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-	"unicode/utf8"
-)
-
-// Operation defines the operation of a diff item.
-type Operation int8
-
-//go:generate stringer -type=Operation -trimprefix=Diff
-
-const (
-	// DiffDelete item represents a delete diff.
-	DiffDelete Operation = -1
-	// DiffInsert item represents an insert diff.
-	DiffInsert Operation = 1
-	// DiffEqual item represents an equal diff.
-	DiffEqual Operation = 0
-)
-
-// Diff represents one diff operation
-type Diff struct {
-	Type Operation
-	Text string
-}
-
-// splice removes amount elements from slice at index index, replacing them with elements.
-func splice(slice []Diff, index int, amount int, elements ...Diff) []Diff {
-	if len(elements) == amount {
-		// Easy case: overwrite the relevant items.
-		copy(slice[index:], elements)
-		return slice
-	}
-	if len(elements) < amount {
-		// Fewer new items than old.
-		// Copy in the new items.
-		copy(slice[index:], elements)
-		// Shift the remaining items left.
-		copy(slice[index+len(elements):], slice[index+amount:])
-		// Calculate the new end of the slice.
-		end := len(slice) - amount + len(elements)
-		// Zero stranded elements at end so that they can be garbage collected.
-		tail := slice[end:]
-		for i := range tail {
-			tail[i] = Diff{}
-		}
-		return slice[:end]
-	}
-	// More new items than old.
-	// Make room in slice for new elements.
-	// There's probably an even more efficient way to do this,
-	// but this is simple and clear.
-	need := len(slice) - amount + len(elements)
-	for len(slice) < need {
-		slice = append(slice, Diff{})
-	}
-	// Shift slice elements right to make room for new elements.
-	copy(slice[index+len(elements):], slice[index+amount:])
-	// Copy in new elements.
-	copy(slice[index:], elements)
-	return slice
-}
-
-// DiffMain finds the differences between two texts.
-// If an invalid UTF-8 sequence is encountered, it will be replaced by the Unicode replacement character.
-func (dmp *DiffMatchPatch) DiffMain(text1, text2 string, checklines bool) []Diff {
-	return dmp.DiffMainRunes([]rune(text1), []rune(text2), checklines)
-}
-
-// DiffMainRunes finds the differences between two rune sequences.
-// If an invalid UTF-8 sequence is encountered, it will be replaced by the Unicode replacement character.
-func (dmp *DiffMatchPatch) DiffMainRunes(text1, text2 []rune, checklines bool) []Diff {
-	var deadline time.Time
-	if dmp.DiffTimeout > 0 {
-		deadline = time.Now().Add(dmp.DiffTimeout)
-	}
-	return dmp.diffMainRunes(text1, text2, checklines, deadline)
-}
-
-func (dmp *DiffMatchPatch) diffMainRunes(text1, text2 []rune, checklines bool, deadline time.Time) []Diff {
-	if runesEqual(text1, text2) {
-		var diffs []Diff
-		if len(text1) > 0 {
-			diffs = append(diffs, Diff{DiffEqual, string(text1)})
-		}
-		return diffs
-	}
-	// Trim off common prefix (speedup).
-	commonlength := commonPrefixLength(text1, text2)
-	commonprefix := text1[:commonlength]
-	text1 = text1[commonlength:]
-	text2 = text2[commonlength:]
-
-	// Trim off common suffix (speedup).
-	commonlength = commonSuffixLength(text1, text2)
-	commonsuffix := text1[len(text1)-commonlength:]
-	text1 = text1[:len(text1)-commonlength]
-	text2 = text2[:len(text2)-commonlength]
-
-	// Compute the diff on the middle block.
-	diffs := dmp.diffCompute(text1, text2, checklines, deadline)
-
-	// Restore the prefix and suffix.
-	if len(commonprefix) != 0 {
-		diffs = append([]Diff{{DiffEqual, string(commonprefix)}}, diffs...)
-	}
-	if len(commonsuffix) != 0 {
-		diffs = append(diffs, Diff{DiffEqual, string(commonsuffix)})
-	}
-
-	return dmp.DiffCleanupMerge(diffs)
-}
-
-// diffCompute finds the differences between two rune slices.  Assumes that the texts do not have any common prefix or suffix.
-func (dmp *DiffMatchPatch) diffCompute(text1, text2 []rune, checklines bool, deadline time.Time) []Diff {
-	diffs := []Diff{}
-	if len(text1) == 0 {
-		// Just add some text (speedup).
-		return append(diffs, Diff{DiffInsert, string(text2)})
-	} else if len(text2) == 0 {
-		// Just delete some text (speedup).
-		return append(diffs, Diff{DiffDelete, string(text1)})
-	}
-
-	var longtext, shorttext []rune
-	if len(text1) > len(text2) {
-		longtext = text1
-		shorttext = text2
-	} else {
-		longtext = text2
-		shorttext = text1
-	}
-
-	if i := runesIndex(longtext, shorttext); i != -1 {
-		op := DiffInsert
-		// Swap insertions for deletions if diff is reversed.
-		if len(text1) > len(text2) {
-			op = DiffDelete
-		}
-		// Shorter text is inside the longer text (speedup).
-		return []Diff{
-			Diff{op, string(longtext[:i])},
-			Diff{DiffEqual, string(shorttext)},
-			Diff{op, string(longtext[i+len(shorttext):])},
-		}
-	} else if len(shorttext) == 1 {
-		// Single character string.
-		// After the previous speedup, the character can't be an equality.
-		return []Diff{
-			{DiffDelete, string(text1)},
-			{DiffInsert, string(text2)},
-		}
-		// Check to see if the problem can be split in two.
-	} else if hm := dmp.diffHalfMatch(text1, text2); hm != nil {
-		// A half-match was found, sort out the return data.
-		text1A := hm[0]
-		text1B := hm[1]
-		text2A := hm[2]
-		text2B := hm[3]
-		midCommon := hm[4]
-		// Send both pairs off for separate processing.
-		diffsA := dmp.diffMainRunes(text1A, text2A, checklines, deadline)
-		diffsB := dmp.diffMainRunes(text1B, text2B, checklines, deadline)
-		// Merge the results.
-		diffs := diffsA
-		diffs = append(diffs, Diff{DiffEqual, string(midCommon)})
-		diffs = append(diffs, diffsB...)
-		return diffs
-	} else if checklines && len(text1) > 100 && len(text2) > 100 {
-		return dmp.diffLineMode(text1, text2, deadline)
-	}
-	return dmp.diffBisect(text1, text2, deadline)
-}
-
-// diffLineMode does a quick line-level diff on both []runes, then rediff the parts for greater accuracy. This speedup can produce non-minimal diffs.
-func (dmp *DiffMatchPatch) diffLineMode(text1, text2 []rune, deadline time.Time) []Diff {
-	// Scan the text on a line-by-line basis first.
-	text1, text2, linearray := dmp.DiffLinesToRunes(string(text1), string(text2))
-
-	diffs := dmp.diffMainRunes(text1, text2, false, deadline)
-
-	// Convert the diff back to original text.
-	diffs = dmp.DiffCharsToLines(diffs, linearray)
-	// Eliminate freak matches (e.g. blank lines)
-	diffs = dmp.DiffCleanupSemantic(diffs)
-
-	// Rediff any replacement blocks, this time character-by-character.
-	// Add a dummy entry at the end.
-	diffs = append(diffs, Diff{DiffEqual, ""})
-
-	pointer := 0
-	countDelete := 0
-	countInsert := 0
-
-	// NOTE: Rune slices are slower than using strings in this case.
-	textDelete := ""
-	textInsert := ""
-
-	for pointer < len(diffs) {
-		switch diffs[pointer].Type {
-		case DiffInsert:
-			countInsert++
-			textInsert += diffs[pointer].Text
-		case DiffDelete:
-			countDelete++
-			textDelete += diffs[pointer].Text
-		case DiffEqual:
-			// Upon reaching an equality, check for prior redundancies.
-			if countDelete >= 1 && countInsert >= 1 {
-				// Delete the offending records and add the merged ones.
-				diffs = splice(diffs, pointer-countDelete-countInsert,
-					countDelete+countInsert)
-
-				pointer = pointer - countDelete - countInsert
-				a := dmp.diffMainRunes([]rune(textDelete), []rune(textInsert), false, deadline)
-				for j := len(a) - 1; j >= 0; j-- {
-					diffs = splice(diffs, pointer, 0, a[j])
-				}
-				pointer = pointer + len(a)
-			}
-
-			countInsert = 0
-			countDelete = 0
-			textDelete = ""
-			textInsert = ""
-		}
-		pointer++
-	}
-
-	return diffs[:len(diffs)-1] // Remove the dummy entry at the end.
-}
-
-// DiffBisect finds the 'middle snake' of a diff, split the problem in two and return the recursively constructed diff.
-// If an invalid UTF-8 sequence is encountered, it will be replaced by the Unicode replacement character.
-// See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
-func (dmp *DiffMatchPatch) DiffBisect(text1, text2 string, deadline time.Time) []Diff {
-	// Unused in this code, but retained for interface compatibility.
-	return dmp.diffBisect([]rune(text1), []rune(text2), deadline)
-}
-
-// diffBisect finds the 'middle snake' of a diff, splits the problem in two and returns the recursively constructed diff.
-// See Myers's 1986 paper: An O(ND) Difference Algorithm and Its Variations.
-func (dmp *DiffMatchPatch) diffBisect(runes1, runes2 []rune, deadline time.Time) []Diff {
-	// Cache the text lengths to prevent multiple calls.
-	runes1Len, runes2Len := len(runes1), len(runes2)
-
-	maxD := (runes1Len + runes2Len + 1) / 2
-	vOffset := maxD
-	vLength := 2 * maxD
-
-	v1 := make([]int, vLength)
-	v2 := make([]int, vLength)
-	for i := range v1 {
-		v1[i] = -1
-		v2[i] = -1
-	}
-	v1[vOffset+1] = 0
-	v2[vOffset+1] = 0
-
-	delta := runes1Len - runes2Len
-	// If the total number of characters is odd, then the front path will collide with the reverse path.
-	front := (delta%2 != 0)
-	// Offsets for start and end of k loop. Prevents mapping of space beyond the grid.
-	k1start := 0
-	k1end := 0
-	k2start := 0
-	k2end := 0
-	for d := 0; d < maxD; d++ {
-		// Bail out if deadline is reached.
-		if !deadline.IsZero() && d%16 == 0 && time.Now().After(deadline) {
-			break
-		}
-
-		// Walk the front path one step.
-		for k1 := -d + k1start; k1 <= d-k1end; k1 += 2 {
-			k1Offset := vOffset + k1
-			var x1 int
-
-			if k1 == -d || (k1 != d && v1[k1Offset-1] < v1[k1Offset+1]) {
-				x1 = v1[k1Offset+1]
-			} else {
-				x1 = v1[k1Offset-1] + 1
-			}
-
-			y1 := x1 - k1
-			for x1 < runes1Len && y1 < runes2Len {
-				if runes1[x1] != runes2[y1] {
-					break
-				}
-				x1++
-				y1++
-			}
-			v1[k1Offset] = x1
-			if x1 > runes1Len {
-				// Ran off the right of the graph.
-				k1end += 2
-			} else if y1 > runes2Len {
-				// Ran off the bottom of the graph.
-				k1start += 2
-			} else if front {
-				k2Offset := vOffset + delta - k1
-				if k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] != -1 {
-					// Mirror x2 onto top-left coordinate system.
-					x2 := runes1Len - v2[k2Offset]
-					if x1 >= x2 {
-						// Overlap detected.
-						return dmp.diffBisectSplit(runes1, runes2, x1, y1, deadline)
-					}
-				}
-			}
-		}
-		// Walk the reverse path one step.
-		for k2 := -d + k2start; k2 <= d-k2end; k2 += 2 {
-			k2Offset := vOffset + k2
-			var x2 int
-			if k2 == -d || (k2 != d && v2[k2Offset-1] < v2[k2Offset+1]) {
-				x2 = v2[k2Offset+1]
-			} else {
-				x2 = v2[k2Offset-1] + 1
-			}
-			var y2 = x2 - k2
-			for x2 < runes1Len && y2 < runes2Len {
-				if runes1[runes1Len-x2-1] != runes2[runes2Len-y2-1] {
-					break
-				}
-				x2++
-				y2++
-			}
-			v2[k2Offset] = x2
-			if x2 > runes1Len {
-				// Ran off the left of the graph.
-				k2end += 2
-			} else if y2 > runes2Len {
-				// Ran off the top of the graph.
-				k2start += 2
-			} else if !front {
-				k1Offset := vOffset + delta - k2
-				if k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] != -1 {
-					x1 := v1[k1Offset]
-					y1 := vOffset + x1 - k1Offset
-					// Mirror x2 onto top-left coordinate system.
-					x2 = runes1Len - x2
-					if x1 >= x2 {
-						// Overlap detected.
-						return dmp.diffBisectSplit(runes1, runes2, x1, y1, deadline)
-					}
-				}
-			}
-		}
-	}
-	// Diff took too long and hit the deadline or number of diffs equals number of characters, no commonality at all.
-	return []Diff{
-		{DiffDelete, string(runes1)},
-		{DiffInsert, string(runes2)},
-	}
-}
-
-func (dmp *DiffMatchPatch) diffBisectSplit(runes1, runes2 []rune, x, y int,
-	deadline time.Time) []Diff {
-	runes1a := runes1[:x]
-	runes2a := runes2[:y]
-	runes1b := runes1[x:]
-	runes2b := runes2[y:]
-
-	// Compute both diffs serially.
-	diffs := dmp.diffMainRunes(runes1a, runes2a, false, deadline)
-	diffsb := dmp.diffMainRunes(runes1b, runes2b, false, deadline)
-
-	return append(diffs, diffsb...)
-}
-
-// DiffLinesToChars splits two texts into a list of strings, and educes the texts to a string of hashes where each Unicode character represents one line.
-// It's slightly faster to call DiffLinesToRunes first, followed by DiffMainRunes.
-func (dmp *DiffMatchPatch) DiffLinesToChars(text1, text2 string) (string, string, []string) {
-	chars1, chars2, lineArray := dmp.diffLinesToStrings(text1, text2)
-	return chars1, chars2, lineArray
-}
-
-// DiffLinesToRunes splits two texts into a list of runes.
-func (dmp *DiffMatchPatch) DiffLinesToRunes(text1, text2 string) ([]rune, []rune, []string) {
-	chars1, chars2, lineArray := dmp.diffLinesToStrings(text1, text2)
-	return []rune(chars1), []rune(chars2), lineArray
-}
-
-// DiffCharsToLines rehydrates the text in a diff from a string of line hashes to real lines of text.
-func (dmp *DiffMatchPatch) DiffCharsToLines(diffs []Diff, lineArray []string) []Diff {
-	hydrated := make([]Diff, 0, len(diffs))
-	for _, aDiff := range diffs {
-		runes := []rune(aDiff.Text)
-		text := make([]string, len(runes))
-
-		for i, r := range runes {
-			text[i] = lineArray[runeToInt(r)]
-		}
-
-		aDiff.Text = strings.Join(text, "")
-		hydrated = append(hydrated, aDiff)
-	}
-	return hydrated
-}
-
-// DiffCommonPrefix determines the common prefix length of two strings.
-func (dmp *DiffMatchPatch) DiffCommonPrefix(text1, text2 string) int {
-	// Unused in this code, but retained for interface compatibility.
-	return commonPrefixLength([]rune(text1), []rune(text2))
-}
-
-// DiffCommonSuffix determines the common suffix length of two strings.
-func (dmp *DiffMatchPatch) DiffCommonSuffix(text1, text2 string) int {
-	// Unused in this code, but retained for interface compatibility.
-	return commonSuffixLength([]rune(text1), []rune(text2))
-}
-
-// commonPrefixLength returns the length of the common prefix of two rune slices.
-func commonPrefixLength(text1, text2 []rune) int {
-	// Linear search. See comment in commonSuffixLength.
-	n := 0
-	for ; n < len(text1) && n < len(text2); n++ {
-		if text1[n] != text2[n] {
-			return n
-		}
-	}
-	return n
-}
-
-// commonSuffixLength returns the length of the common suffix of two rune slices.
-func commonSuffixLength(text1, text2 []rune) int {
-	// Use linear search rather than the binary search discussed at https://neil.fraser.name/news/2007/10/09/.
-	// See discussion at https://github.com/sergi/go-diff/issues/54.
-	i1 := len(text1)
-	i2 := len(text2)
-	for n := 0; ; n++ {
-		i1--
-		i2--
-		if i1 < 0 || i2 < 0 || text1[i1] != text2[i2] {
-			return n
-		}
-	}
-}
-
-// DiffCommonOverlap determines if the suffix of one string is the prefix of another.
-func (dmp *DiffMatchPatch) DiffCommonOverlap(text1 string, text2 string) int {
-	// Cache the text lengths to prevent multiple calls.
-	text1Length := len(text1)
-	text2Length := len(text2)
-	// Eliminate the null case.
-	if text1Length == 0 || text2Length == 0 {
-		return 0
-	}
-	// Truncate the longer string.
-	if text1Length > text2Length {
-		text1 = text1[text1Length-text2Length:]
-	} else if text1Length < text2Length {
-		text2 = text2[0:text1Length]
-	}
-	textLength := int(math.Min(float64(text1Length), float64(text2Length)))
-	// Quick check for the worst case.
-	if text1 == text2 {
-		return textLength
-	}
-
-	// Start by looking for a single character match and increase length until no match is found. Performance analysis: http://neil.fraser.name/news/2010/11/04/
-	best := 0
-	length := 1
-	for {
-		pattern := text1[textLength-length:]
-		found := strings.Index(text2, pattern)
-		if found == -1 {
-			break
-		}
-		length += found
-		if found == 0 || text1[textLength-length:] == text2[0:length] {
-			best = length
-			length++
-		}
-	}
-
-	return best
-}
-
-// DiffHalfMatch checks whether the two texts share a substring which is at least half the length of the longer text. This speedup can produce non-minimal diffs.
-func (dmp *DiffMatchPatch) DiffHalfMatch(text1, text2 string) []string {
-	// Unused in this code, but retained for interface compatibility.
-	runeSlices := dmp.diffHalfMatch([]rune(text1), []rune(text2))
-	if runeSlices == nil {
-		return nil
-	}
-
-	result := make([]string, len(runeSlices))
-	for i, r := range runeSlices {
-		result[i] = string(r)
-	}
-	return result
-}
-
-func (dmp *DiffMatchPatch) diffHalfMatch(text1, text2 []rune) [][]rune {
-	if dmp.DiffTimeout <= 0 {
-		// Don't risk returning a non-optimal diff if we have unlimited time.
-		return nil
-	}
-
-	var longtext, shorttext []rune
-	if len(text1) > len(text2) {
-		longtext = text1
-		shorttext = text2
-	} else {
-		longtext = text2
-		shorttext = text1
-	}
-
-	if len(longtext) < 4 || len(shorttext)*2 < len(longtext) {
-		return nil // Pointless.
-	}
-
-	// First check if the second quarter is the seed for a half-match.
-	hm1 := dmp.diffHalfMatchI(longtext, shorttext, int(float64(len(longtext)+3)/4))
-
-	// Check again based on the third quarter.
-	hm2 := dmp.diffHalfMatchI(longtext, shorttext, int(float64(len(longtext)+1)/2))
-
-	hm := [][]rune{}
-	if hm1 == nil && hm2 == nil {
-		return nil
-	} else if hm2 == nil {
-		hm = hm1
-	} else if hm1 == nil {
-		hm = hm2
-	} else {
-		// Both matched.  Select the longest.
-		if len(hm1[4]) > len(hm2[4]) {
-			hm = hm1
-		} else {
-			hm = hm2
-		}
-	}
-
-	// A half-match was found, sort out the return data.
-	if len(text1) > len(text2) {
-		return hm
-	}
-
-	return [][]rune{hm[2], hm[3], hm[0], hm[1], hm[4]}
-}
-
-// diffHalfMatchI checks if a substring of shorttext exist within longtext such that the substring is at least half the length of longtext?
-// Returns a slice containing the prefix of longtext, the suffix of longtext, the prefix of shorttext, the suffix of shorttext and the common middle, or null if there was no match.
-func (dmp *DiffMatchPatch) diffHalfMatchI(l, s []rune, i int) [][]rune {
-	var bestCommonA []rune
-	var bestCommonB []rune
-	var bestCommonLen int
-	var bestLongtextA []rune
-	var bestLongtextB []rune
-	var bestShorttextA []rune
-	var bestShorttextB []rune
-
-	// Start with a 1/4 length substring at position i as a seed.
-	seed := l[i : i+len(l)/4]
-
-	for j := runesIndexOf(s, seed, 0); j != -1; j = runesIndexOf(s, seed, j+1) {
-		prefixLength := commonPrefixLength(l[i:], s[j:])
-		suffixLength := commonSuffixLength(l[:i], s[:j])
-
-		if bestCommonLen < suffixLength+prefixLength {
-			bestCommonA = s[j-suffixLength : j]
-			bestCommonB = s[j : j+prefixLength]
-			bestCommonLen = len(bestCommonA) + len(bestCommonB)
-			bestLongtextA = l[:i-suffixLength]
-			bestLongtextB = l[i+prefixLength:]
-			bestShorttextA = s[:j-suffixLength]
-			bestShorttextB = s[j+prefixLength:]
-		}
-	}
-
-	if bestCommonLen*2 < len(l) {
-		return nil
-	}
-
-	return [][]rune{
-		bestLongtextA,
-		bestLongtextB,
-		bestShorttextA,
-		bestShorttextB,
-		append(bestCommonA, bestCommonB...),
-	}
-}
-
-// DiffCleanupSemantic reduces the number of edits by eliminating semantically trivial equalities.
-func (dmp *DiffMatchPatch) DiffCleanupSemantic(diffs []Diff) []Diff {
-	changes := false
-	// Stack of indices where equalities are found.
-	equalities := make([]int, 0, len(diffs))
-
-	var lastequality string
-	// Always equal to diffs[equalities[equalitiesLength - 1]][1]
-	var pointer int // Index of current position.
-	// Number of characters that changed prior to the equality.
-	var lengthInsertions1, lengthDeletions1 int
-	// Number of characters that changed after the equality.
-	var lengthInsertions2, lengthDeletions2 int
-
-	for pointer < len(diffs) {
-		if diffs[pointer].Type == DiffEqual {
-			// Equality found.
-			equalities = append(equalities, pointer)
-			lengthInsertions1 = lengthInsertions2
-			lengthDeletions1 = lengthDeletions2
-			lengthInsertions2 = 0
-			lengthDeletions2 = 0
-			lastequality = diffs[pointer].Text
-		} else {
-			// An insertion or deletion.
-
-			if diffs[pointer].Type == DiffInsert {
-				lengthInsertions2 += utf8.RuneCountInString(diffs[pointer].Text)
-			} else {
-				lengthDeletions2 += utf8.RuneCountInString(diffs[pointer].Text)
-			}
-			// Eliminate an equality that is smaller or equal to the edits on both sides of it.
-			difference1 := int(math.Max(float64(lengthInsertions1), float64(lengthDeletions1)))
-			difference2 := int(math.Max(float64(lengthInsertions2), float64(lengthDeletions2)))
-			if utf8.RuneCountInString(lastequality) > 0 &&
-				(utf8.RuneCountInString(lastequality) <= difference1) &&
-				(utf8.RuneCountInString(lastequality) <= difference2) {
-				// Duplicate record.
-				insPoint := equalities[len(equalities)-1]
-				diffs = splice(diffs, insPoint, 0, Diff{DiffDelete, lastequality})
-
-				// Change second copy to insert.
-				diffs[insPoint+1].Type = DiffInsert
-				// Throw away the equality we just deleted.
-				equalities = equalities[:len(equalities)-1]
-
-				if len(equalities) > 0 {
-					equalities = equalities[:len(equalities)-1]
-				}
-				pointer = -1
-				if len(equalities) > 0 {
-					pointer = equalities[len(equalities)-1]
-				}
-
-				lengthInsertions1 = 0 // Reset the counters.
-				lengthDeletions1 = 0
-				lengthInsertions2 = 0
-				lengthDeletions2 = 0
-				lastequality = ""
-				changes = true
-			}
-		}
-		pointer++
-	}
-
-	// Normalize the diff.
-	if changes {
-		diffs = dmp.DiffCleanupMerge(diffs)
-	}
-	diffs = dmp.DiffCleanupSemanticLossless(diffs)
-	// Find any overlaps between deletions and insertions.
-	// e.g: abcxxxxxxdef
-	//   -> abcxxxdef
-	// e.g: xxxabcdefxxx
-	//   -> defxxxabc
-	// Only extract an overlap if it is as big as the edit ahead or behind it.
-	pointer = 1
-	for pointer < len(diffs) {
-		if diffs[pointer-1].Type == DiffDelete &&
-			diffs[pointer].Type == DiffInsert {
-			deletion := diffs[pointer-1].Text
-			insertion := diffs[pointer].Text
-			overlapLength1 := dmp.DiffCommonOverlap(deletion, insertion)
-			overlapLength2 := dmp.DiffCommonOverlap(insertion, deletion)
-			if overlapLength1 >= overlapLength2 {
-				if float64(overlapLength1) >= float64(utf8.RuneCountInString(deletion))/2 ||
-					float64(overlapLength1) >= float64(utf8.RuneCountInString(insertion))/2 {
-
-					// Overlap found. Insert an equality and trim the surrounding edits.
-					diffs = splice(diffs, pointer, 0, Diff{DiffEqual, insertion[:overlapLength1]})
-					diffs[pointer-1].Text =
-						deletion[0 : len(deletion)-overlapLength1]
-					diffs[pointer+1].Text = insertion[overlapLength1:]
-					pointer++
-				}
-			} else {
-				if float64(overlapLength2) >= float64(utf8.RuneCountInString(deletion))/2 ||
-					float64(overlapLength2) >= float64(utf8.RuneCountInString(insertion))/2 {
-					// Reverse overlap found. Insert an equality and swap and trim the surrounding edits.
-					overlap := Diff{DiffEqual, deletion[:overlapLength2]}
-					diffs = splice(diffs, pointer, 0, overlap)
-					diffs[pointer-1].Type = DiffInsert
-					diffs[pointer-1].Text = insertion[0 : len(insertion)-overlapLength2]
-					diffs[pointer+1].Type = DiffDelete
-					diffs[pointer+1].Text = deletion[overlapLength2:]
-					pointer++
-				}
-			}
-			pointer++
-		}
-		pointer++
-	}
-
-	return diffs
-}
-
-// Define some regex patterns for matching boundaries.
-var (
-	nonAlphaNumericRegex = regexp.MustCompile(`[^a-zA-Z0-9]`)
-	whitespaceRegex      = regexp.MustCompile(`\s`)
-	linebreakRegex       = regexp.MustCompile(`[\r\n]`)
-	blanklineEndRegex    = regexp.MustCompile(`\n\r?\n$`)
-	blanklineStartRegex  = regexp.MustCompile(`^\r?\n\r?\n`)
-)
-
-// diffCleanupSemanticScore computes a score representing whether the internal boundary falls on logical boundaries.
-// Scores range from 6 (best) to 0 (worst). Closure, but does not reference any external variables.
-func diffCleanupSemanticScore(one, two string) int {
-	if len(one) == 0 || len(two) == 0 {
-		// Edges are the best.
-		return 6
-	}
-
-	// Each port of this function behaves slightly differently due to subtle differences in each language's definition of things like 'whitespace'.  Since this function's purpose is largely cosmetic, the choice has been made to use each language's native features rather than force total conformity.
-	rune1, _ := utf8.DecodeLastRuneInString(one)
-	rune2, _ := utf8.DecodeRuneInString(two)
-	char1 := string(rune1)
-	char2 := string(rune2)
-
-	nonAlphaNumeric1 := nonAlphaNumericRegex.MatchString(char1)
-	nonAlphaNumeric2 := nonAlphaNumericRegex.MatchString(char2)
-	whitespace1 := nonAlphaNumeric1 && whitespaceRegex.MatchString(char1)
-	whitespace2 := nonAlphaNumeric2 && whitespaceRegex.MatchString(char2)
-	lineBreak1 := whitespace1 && linebreakRegex.MatchString(char1)
-	lineBreak2 := whitespace2 && linebreakRegex.MatchString(char2)
-	blankLine1 := lineBreak1 && blanklineEndRegex.MatchString(one)
-	blankLine2 := lineBreak2 && blanklineEndRegex.MatchString(two)
-
-	if blankLine1 || blankLine2 {
-		// Five points for blank lines.
-		return 5
-	} else if lineBreak1 || lineBreak2 {
-		// Four points for line breaks.
-		return 4
-	} else if nonAlphaNumeric1 && !whitespace1 && whitespace2 {
-		// Three points for end of sentences.
-		return 3
-	} else if whitespace1 || whitespace2 {
-		// Two points for whitespace.
-		return 2
-	} else if nonAlphaNumeric1 || nonAlphaNumeric2 {
-		// One point for non-alphanumeric.
-		return 1
-	}
-	return 0
-}
-
-// DiffCleanupSemanticLossless looks for single edits surrounded on both sides by equalities which can be shifted sideways to align the edit to a word boundary.
-// E.g: The cat came. -> The cat came.
-func (dmp *DiffMatchPatch) DiffCleanupSemanticLossless(diffs []Diff) []Diff {
-	pointer := 1
-
-	// Intentionally ignore the first and last element (don't need checking).
-	for pointer < len(diffs)-1 {
-		if diffs[pointer-1].Type == DiffEqual &&
-			diffs[pointer+1].Type == DiffEqual {
-
-			// This is a single edit surrounded by equalities.
-			equality1 := diffs[pointer-1].Text
-			edit := diffs[pointer].Text
-			equality2 := diffs[pointer+1].Text
-
-			// First, shift the edit as far left as possible.
-			commonOffset := dmp.DiffCommonSuffix(equality1, edit)
-			if commonOffset > 0 {
-				commonString := edit[len(edit)-commonOffset:]
-				equality1 = equality1[0 : len(equality1)-commonOffset]
-				edit = commonString + edit[:len(edit)-commonOffset]
-				equality2 = commonString + equality2
-			}
-
-			// Second, step character by character right, looking for the best fit.
-			bestEquality1 := equality1
-			bestEdit := edit
-			bestEquality2 := equality2
-			bestScore := diffCleanupSemanticScore(equality1, edit) +
-				diffCleanupSemanticScore(edit, equality2)
-
-			for len(edit) != 0 && len(equality2) != 0 {
-				_, sz := utf8.DecodeRuneInString(edit)
-				if len(equality2) < sz || edit[:sz] != equality2[:sz] {
-					break
-				}
-				equality1 += edit[:sz]
-				edit = edit[sz:] + equality2[:sz]
-				equality2 = equality2[sz:]
-				score := diffCleanupSemanticScore(equality1, edit) +
-					diffCleanupSemanticScore(edit, equality2)
-				// The >= encourages trailing rather than leading whitespace on edits.
-				if score >= bestScore {
-					bestScore = score
-					bestEquality1 = equality1
-					bestEdit = edit
-					bestEquality2 = equality2
-				}
-			}
-
-			if diffs[pointer-1].Text != bestEquality1 {
-				// We have an improvement, save it back to the diff.
-				if len(bestEquality1) != 0 {
-					diffs[pointer-1].Text = bestEquality1
-				} else {
-					diffs = splice(diffs, pointer-1, 1)
-					pointer--
-				}
-
-				diffs[pointer].Text = bestEdit
-				if len(bestEquality2) != 0 {
-					diffs[pointer+1].Text = bestEquality2
-				} else {
-					diffs = append(diffs[:pointer+1], diffs[pointer+2:]...)
-					pointer--
-				}
-			}
-		}
-		pointer++
-	}
-
-	return diffs
-}
-
-// DiffCleanupEfficiency reduces the number of edits by eliminating operationally trivial equalities.
-func (dmp *DiffMatchPatch) DiffCleanupEfficiency(diffs []Diff) []Diff {
-	changes := false
-	// Stack of indices where equalities are found.
-	type equality struct {
-		data int
-		next *equality
-	}
-	var equalities *equality
-	// Always equal to equalities[equalitiesLength-1][1]
-	lastequality := ""
-	pointer := 0 // Index of current position.
-	// Is there an insertion operation before the last equality.
-	preIns := false
-	// Is there a deletion operation before the last equality.
-	preDel := false
-	// Is there an insertion operation after the last equality.
-	postIns := false
-	// Is there a deletion operation after the last equality.
-	postDel := false
-	for pointer < len(diffs) {
-		if diffs[pointer].Type == DiffEqual { // Equality found.
-			if len(diffs[pointer].Text) < dmp.DiffEditCost &&
-				(postIns || postDel) {
-				// Candidate found.
-				equalities = &equality{
-					data: pointer,
-					next: equalities,
-				}
-				preIns = postIns
-				preDel = postDel
-				lastequality = diffs[pointer].Text
-			} else {
-				// Not a candidate, and can never become one.
-				equalities = nil
-				lastequality = ""
-			}
-			postIns = false
-			postDel = false
-		} else { // An insertion or deletion.
-			if diffs[pointer].Type == DiffDelete {
-				postDel = true
-			} else {
-				postIns = true
-			}
-
-			// Five types to be split:
-			// ABXYCD
-			// AXCD
-			// ABXC
-			// AXCD
-			// ABXC
-			var sumPres int
-			if preIns {
-				sumPres++
-			}
-			if preDel {
-				sumPres++
-			}
-			if postIns {
-				sumPres++
-			}
-			if postDel {
-				sumPres++
-			}
-			if len(lastequality) > 0 &&
-				((preIns && preDel && postIns && postDel) ||
-					((len(lastequality) < dmp.DiffEditCost/2) && sumPres == 3)) {
-
-				insPoint := equalities.data
-
-				// Duplicate record.
-				diffs = splice(diffs, insPoint, 0, Diff{DiffDelete, lastequality})
-
-				// Change second copy to insert.
-				diffs[insPoint+1].Type = DiffInsert
-				// Throw away the equality we just deleted.
-				equalities = equalities.next
-				lastequality = ""
-
-				if preIns && preDel {
-					// No changes made which could affect previous entry, keep going.
-					postIns = true
-					postDel = true
-					equalities = nil
-				} else {
-					if equalities != nil {
-						equalities = equalities.next
-					}
-					if equalities != nil {
-						pointer = equalities.data
-					} else {
-						pointer = -1
-					}
-					postIns = false
-					postDel = false
-				}
-				changes = true
-			}
-		}
-		pointer++
-	}
-
-	if changes {
-		diffs = dmp.DiffCleanupMerge(diffs)
-	}
-
-	return diffs
-}
-
-// DiffCleanupMerge reorders and merges like edit sections. Merge equalities.
-// Any edit section can move as long as it doesn't cross an equality.
-func (dmp *DiffMatchPatch) DiffCleanupMerge(diffs []Diff) []Diff {
-	// Add a dummy entry at the end.
-	diffs = append(diffs, Diff{DiffEqual, ""})
-	pointer := 0
-	countDelete := 0
-	countInsert := 0
-	commonlength := 0
-	textDelete := []rune(nil)
-	textInsert := []rune(nil)
-
-	for pointer < len(diffs) {
-		switch diffs[pointer].Type {
-		case DiffInsert:
-			countInsert++
-			textInsert = append(textInsert, []rune(diffs[pointer].Text)...)
-			pointer++
-			break
-		case DiffDelete:
-			countDelete++
-			textDelete = append(textDelete, []rune(diffs[pointer].Text)...)
-			pointer++
-			break
-		case DiffEqual:
-			// Upon reaching an equality, check for prior redundancies.
-			if countDelete+countInsert > 1 {
-				if countDelete != 0 && countInsert != 0 {
-					// Factor out any common prefixies.
-					commonlength = commonPrefixLength(textInsert, textDelete)
-					if commonlength != 0 {
-						x := pointer - countDelete - countInsert
-						if x > 0 && diffs[x-1].Type == DiffEqual {
-							diffs[x-1].Text += string(textInsert[:commonlength])
-						} else {
-							diffs = append([]Diff{{DiffEqual, string(textInsert[:commonlength])}}, diffs...)
-							pointer++
-						}
-						textInsert = textInsert[commonlength:]
-						textDelete = textDelete[commonlength:]
-					}
-					// Factor out any common suffixies.
-					commonlength = commonSuffixLength(textInsert, textDelete)
-					if commonlength != 0 {
-						insertIndex := len(textInsert) - commonlength
-						deleteIndex := len(textDelete) - commonlength
-						diffs[pointer].Text = string(textInsert[insertIndex:]) + diffs[pointer].Text
-						textInsert = textInsert[:insertIndex]
-						textDelete = textDelete[:deleteIndex]
-					}
-				}
-				// Delete the offending records and add the merged ones.
-				if countDelete == 0 {
-					diffs = splice(diffs, pointer-countInsert,
-						countDelete+countInsert,
-						Diff{DiffInsert, string(textInsert)})
-				} else if countInsert == 0 {
-					diffs = splice(diffs, pointer-countDelete,
-						countDelete+countInsert,
-						Diff{DiffDelete, string(textDelete)})
-				} else {
-					diffs = splice(diffs, pointer-countDelete-countInsert,
-						countDelete+countInsert,
-						Diff{DiffDelete, string(textDelete)},
-						Diff{DiffInsert, string(textInsert)})
-				}
-
-				pointer = pointer - countDelete - countInsert + 1
-				if countDelete != 0 {
-					pointer++
-				}
-				if countInsert != 0 {
-					pointer++
-				}
-			} else if pointer != 0 && diffs[pointer-1].Type == DiffEqual {
-				// Merge this equality with the previous one.
-				diffs[pointer-1].Text += diffs[pointer].Text
-				diffs = append(diffs[:pointer], diffs[pointer+1:]...)
-			} else {
-				pointer++
-			}
-			countInsert = 0
-			countDelete = 0
-			textDelete = nil
-			textInsert = nil
-			break
-		}
-	}
-
-	if len(diffs[len(diffs)-1].Text) == 0 {
-		diffs = diffs[0 : len(diffs)-1] // Remove the dummy entry at the end.
-	}
-
-	// Second pass: look for single edits surrounded on both sides by equalities which can be shifted sideways to eliminate an equality. E.g: ABAC -> ABAC
-	changes := false
-	pointer = 1
-	// Intentionally ignore the first and last element (don't need checking).
-	for pointer < (len(diffs) - 1) {
-		if diffs[pointer-1].Type == DiffEqual &&
-			diffs[pointer+1].Type == DiffEqual {
-			// This is a single edit surrounded by equalities.
-			if strings.HasSuffix(diffs[pointer].Text, diffs[pointer-1].Text) {
-				// Shift the edit over the previous equality.
-				diffs[pointer].Text = diffs[pointer-1].Text +
-					diffs[pointer].Text[:len(diffs[pointer].Text)-len(diffs[pointer-1].Text)]
-				diffs[pointer+1].Text = diffs[pointer-1].Text + diffs[pointer+1].Text
-				diffs = splice(diffs, pointer-1, 1)
-				changes = true
-			} else if strings.HasPrefix(diffs[pointer].Text, diffs[pointer+1].Text) {
-				// Shift the edit over the next equality.
-				diffs[pointer-1].Text += diffs[pointer+1].Text
-				diffs[pointer].Text =
-					diffs[pointer].Text[len(diffs[pointer+1].Text):] + diffs[pointer+1].Text
-				diffs = splice(diffs, pointer+1, 1)
-				changes = true
-			}
-		}
-		pointer++
-	}
-
-	// If shifts were made, the diff needs reordering and another shift sweep.
-	if changes {
-		diffs = dmp.DiffCleanupMerge(diffs)
-	}
-
-	return diffs
-}
-
-// DiffXIndex returns the equivalent location in s2.
-func (dmp *DiffMatchPatch) DiffXIndex(diffs []Diff, loc int) int {
-	chars1 := 0
-	chars2 := 0
-	lastChars1 := 0
-	lastChars2 := 0
-	lastDiff := Diff{}
-	for i := 0; i < len(diffs); i++ {
-		aDiff := diffs[i]
-		if aDiff.Type != DiffInsert {
-			// Equality or deletion.
-			chars1 += len(aDiff.Text)
-		}
-		if aDiff.Type != DiffDelete {
-			// Equality or insertion.
-			chars2 += len(aDiff.Text)
-		}
-		if chars1 > loc {
-			// Overshot the location.
-			lastDiff = aDiff
-			break
-		}
-		lastChars1 = chars1
-		lastChars2 = chars2
-	}
-	if lastDiff.Type == DiffDelete {
-		// The location was deleted.
-		return lastChars2
-	}
-	// Add the remaining character length.
-	return lastChars2 + (loc - lastChars1)
-}
-
-// DiffPrettyHtml converts a []Diff into a pretty HTML report.
-// It is intended as an example from which to write one's own display functions.
-func (dmp *DiffMatchPatch) DiffPrettyHtml(diffs []Diff) string {
-	var buff bytes.Buffer
-	for _, diff := range diffs {
-		text := strings.Replace(html.EscapeString(diff.Text), "\n", "¶
    ", -1)
-		switch diff.Type {
-		case DiffInsert:
-			_, _ = buff.WriteString("")
-			_, _ = buff.WriteString(text)
-			_, _ = buff.WriteString("")
-		case DiffDelete:
-			_, _ = buff.WriteString("")
-			_, _ = buff.WriteString(text)
-			_, _ = buff.WriteString("")
-		case DiffEqual:
-			_, _ = buff.WriteString("")
-			_, _ = buff.WriteString(text)
-			_, _ = buff.WriteString("")
-		}
-	}
-	return buff.String()
-}
-
-// DiffPrettyText converts a []Diff into a colored text report.
-func (dmp *DiffMatchPatch) DiffPrettyText(diffs []Diff) string {
-	var buff bytes.Buffer
-	for _, diff := range diffs {
-		text := diff.Text
-
-		switch diff.Type {
-		case DiffInsert:
-			_, _ = buff.WriteString("\x1b[32m")
-			_, _ = buff.WriteString(text)
-			_, _ = buff.WriteString("\x1b[0m")
-		case DiffDelete:
-			_, _ = buff.WriteString("\x1b[31m")
-			_, _ = buff.WriteString(text)
-			_, _ = buff.WriteString("\x1b[0m")
-		case DiffEqual:
-			_, _ = buff.WriteString(text)
-		}
-	}
-
-	return buff.String()
-}
-
-// DiffText1 computes and returns the source text (all equalities and deletions).
-func (dmp *DiffMatchPatch) DiffText1(diffs []Diff) string {
-	//StringBuilder text = new StringBuilder()
-	var text bytes.Buffer
-
-	for _, aDiff := range diffs {
-		if aDiff.Type != DiffInsert {
-			_, _ = text.WriteString(aDiff.Text)
-		}
-	}
-	return text.String()
-}
-
-// DiffText2 computes and returns the destination text (all equalities and insertions).
-func (dmp *DiffMatchPatch) DiffText2(diffs []Diff) string {
-	var text bytes.Buffer
-
-	for _, aDiff := range diffs {
-		if aDiff.Type != DiffDelete {
-			_, _ = text.WriteString(aDiff.Text)
-		}
-	}
-	return text.String()
-}
-
-// DiffLevenshtein computes the Levenshtein distance that is the number of inserted, deleted or substituted characters.
-func (dmp *DiffMatchPatch) DiffLevenshtein(diffs []Diff) int {
-	levenshtein := 0
-	insertions := 0
-	deletions := 0
-
-	for _, aDiff := range diffs {
-		switch aDiff.Type {
-		case DiffInsert:
-			insertions += utf8.RuneCountInString(aDiff.Text)
-		case DiffDelete:
-			deletions += utf8.RuneCountInString(aDiff.Text)
-		case DiffEqual:
-			// A deletion and an insertion is one substitution.
-			levenshtein += max(insertions, deletions)
-			insertions = 0
-			deletions = 0
-		}
-	}
-
-	levenshtein += max(insertions, deletions)
-	return levenshtein
-}
-
-// DiffToDelta crushes the diff into an encoded string which describes the operations required to transform text1 into text2.
-// E.g. =3\t-2\t+ing  -> Keep 3 chars, delete 2 chars, insert 'ing'. Operations are tab-separated.  Inserted text is escaped using %xx notation.
-func (dmp *DiffMatchPatch) DiffToDelta(diffs []Diff) string {
-	var text bytes.Buffer
-	for _, aDiff := range diffs {
-		switch aDiff.Type {
-		case DiffInsert:
-			_, _ = text.WriteString("+")
-			_, _ = text.WriteString(strings.Replace(url.QueryEscape(aDiff.Text), "+", " ", -1))
-			_, _ = text.WriteString("\t")
-			break
-		case DiffDelete:
-			_, _ = text.WriteString("-")
-			_, _ = text.WriteString(strconv.Itoa(utf8.RuneCountInString(aDiff.Text)))
-			_, _ = text.WriteString("\t")
-			break
-		case DiffEqual:
-			_, _ = text.WriteString("=")
-			_, _ = text.WriteString(strconv.Itoa(utf8.RuneCountInString(aDiff.Text)))
-			_, _ = text.WriteString("\t")
-			break
-		}
-	}
-	delta := text.String()
-	if len(delta) != 0 {
-		// Strip off trailing tab character.
-		delta = delta[0 : utf8.RuneCountInString(delta)-1]
-		delta = unescaper.Replace(delta)
-	}
-	return delta
-}
-
-// DiffFromDelta given the original text1, and an encoded string which describes the operations required to transform text1 into text2, comAdde the full diff.
-func (dmp *DiffMatchPatch) DiffFromDelta(text1 string, delta string) (diffs []Diff, err error) {
-	i := 0
-	runes := []rune(text1)
-
-	for _, token := range strings.Split(delta, "\t") {
-		if len(token) == 0 {
-			// Blank tokens are ok (from a trailing \t).
-			continue
-		}
-
-		// Each token begins with a one character parameter which specifies the operation of this token (delete, insert, equality).
-		param := token[1:]
-
-		switch op := token[0]; op {
-		case '+':
-			// Decode would Diff all "+" to " "
-			param = strings.Replace(param, "+", "%2b", -1)
-			param, err = url.QueryUnescape(param)
-			if err != nil {
-				return nil, err
-			}
-			if !utf8.ValidString(param) {
-				return nil, fmt.Errorf("invalid UTF-8 token: %q", param)
-			}
-
-			diffs = append(diffs, Diff{DiffInsert, param})
-		case '=', '-':
-			n, err := strconv.ParseInt(param, 10, 0)
-			if err != nil {
-				return nil, err
-			} else if n < 0 {
-				return nil, errors.New("Negative number in DiffFromDelta: " + param)
-			}
-
-			i += int(n)
-			// Break out if we are out of bounds, go1.6 can't handle this very well
-			if i > len(runes) {
-				break
-			}
-			// Remember that string slicing is by byte - we want by rune here.
-			text := string(runes[i-int(n) : i])
-
-			if op == '=' {
-				diffs = append(diffs, Diff{DiffEqual, text})
-			} else {
-				diffs = append(diffs, Diff{DiffDelete, text})
-			}
-		default:
-			// Anything else is an error.
-			return nil, errors.New("Invalid diff operation in DiffFromDelta: " + string(token[0]))
-		}
-	}
-
-	if i != len(runes) {
-		return nil, fmt.Errorf("Delta length (%v) is different from source text length (%v)", i, len(text1))
-	}
-
-	return diffs, nil
-}
-
-// diffLinesToStrings splits two texts into a list of strings. Each string represents one line.
-func (dmp *DiffMatchPatch) diffLinesToStrings(text1, text2 string) (string, string, []string) {
-	// '\x00' is a valid character, but various debuggers don't like it. So we'll insert a junk entry to avoid generating a null character.
-	lineArray := []string{""} // e.g. lineArray[4] == 'Hello\n'
-
-	lineHash := make(map[string]int)
-	//Each string has the index of lineArray which it points to
-	strIndexArray1 := dmp.diffLinesToStringsMunge(text1, &lineArray, lineHash)
-	strIndexArray2 := dmp.diffLinesToStringsMunge(text2, &lineArray, lineHash)
-
-	return intArrayToString(strIndexArray1), intArrayToString(strIndexArray2), lineArray
-}
-
-// diffLinesToStringsMunge splits a text into an array of strings, and reduces the texts to a []string.
-func (dmp *DiffMatchPatch) diffLinesToStringsMunge(text string, lineArray *[]string, lineHash map[string]int) []uint32 {
-	// Walk the text, pulling out a substring for each line. text.split('\n') would would temporarily double our memory footprint. Modifying text would create many large strings to garbage collect.
-	lineStart := 0
-	lineEnd := -1
-	strs := []uint32{}
-
-	for lineEnd < len(text)-1 {
-		lineEnd = indexOf(text, "\n", lineStart)
-
-		if lineEnd == -1 {
-			lineEnd = len(text) - 1
-		}
-
-		line := text[lineStart : lineEnd+1]
-		lineStart = lineEnd + 1
-		lineValue, ok := lineHash[line]
-
-		if ok {
-			strs = append(strs, uint32(lineValue))
-		} else {
-			*lineArray = append(*lineArray, line)
-			lineHash[line] = len(*lineArray) - 1
-			strs = append(strs, uint32(len(*lineArray)-1))
-		}
-	}
-
-	return strs
-}
diff --git a/vendor/github.com/sergi/go-diff/diffmatchpatch/diffmatchpatch.go b/vendor/github.com/sergi/go-diff/diffmatchpatch/diffmatchpatch.go
deleted file mode 100644
index d3acc32ce..000000000
--- a/vendor/github.com/sergi/go-diff/diffmatchpatch/diffmatchpatch.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2012-2016 The go-diff authors. All rights reserved.
-// https://github.com/sergi/go-diff
-// See the included LICENSE file for license details.
-//
-// go-diff is a Go implementation of Google's Diff, Match, and Patch library
-// Original library is Copyright (c) 2006 Google Inc.
-// http://code.google.com/p/google-diff-match-patch/
-
-// Package diffmatchpatch offers robust algorithms to perform the operations required for synchronizing plain text.
-package diffmatchpatch
-
-import (
-	"time"
-)
-
-// DiffMatchPatch holds the configuration for diff-match-patch operations.
-type DiffMatchPatch struct {
-	// Number of seconds to map a diff before giving up (0 for infinity).
-	DiffTimeout time.Duration
-	// Cost of an empty edit operation in terms of edit characters.
-	DiffEditCost int
-	// How far to search for a match (0 = exact location, 1000+ = broad match). A match this many characters away from the expected location will add 1.0 to the score (0.0 is a perfect match).
-	MatchDistance int
-	// When deleting a large block of text (over ~64 characters), how close do the contents have to be to match the expected contents. (0.0 = perfection, 1.0 = very loose).  Note that MatchThreshold controls how closely the end points of a delete need to match.
-	PatchDeleteThreshold float64
-	// Chunk size for context length.
-	PatchMargin int
-	// The number of bits in an int.
-	MatchMaxBits int
-	// At what point is no match declared (0.0 = perfection, 1.0 = very loose).
-	MatchThreshold float64
-}
-
-// New creates a new DiffMatchPatch object with default parameters.
-func New() *DiffMatchPatch {
-	// Defaults.
-	return &DiffMatchPatch{
-		DiffTimeout:          time.Second,
-		DiffEditCost:         4,
-		MatchThreshold:       0.5,
-		MatchDistance:        1000,
-		PatchDeleteThreshold: 0.5,
-		PatchMargin:          4,
-		MatchMaxBits:         32,
-	}
-}
diff --git a/vendor/github.com/sergi/go-diff/diffmatchpatch/match.go b/vendor/github.com/sergi/go-diff/diffmatchpatch/match.go
deleted file mode 100644
index 17374e109..000000000
--- a/vendor/github.com/sergi/go-diff/diffmatchpatch/match.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) 2012-2016 The go-diff authors. All rights reserved.
-// https://github.com/sergi/go-diff
-// See the included LICENSE file for license details.
-//
-// go-diff is a Go implementation of Google's Diff, Match, and Patch library
-// Original library is Copyright (c) 2006 Google Inc.
-// http://code.google.com/p/google-diff-match-patch/
-
-package diffmatchpatch
-
-import (
-	"math"
-)
-
-// MatchMain locates the best instance of 'pattern' in 'text' near 'loc'.
-// Returns -1 if no match found.
-func (dmp *DiffMatchPatch) MatchMain(text, pattern string, loc int) int {
-	// Check for null inputs not needed since null can't be passed in C#.
-
-	loc = int(math.Max(0, math.Min(float64(loc), float64(len(text)))))
-	if text == pattern {
-		// Shortcut (potentially not guaranteed by the algorithm)
-		return 0
-	} else if len(text) == 0 {
-		// Nothing to match.
-		return -1
-	} else if loc+len(pattern) <= len(text) && text[loc:loc+len(pattern)] == pattern {
-		// Perfect match at the perfect spot!  (Includes case of null pattern)
-		return loc
-	}
-	// Do a fuzzy compare.
-	return dmp.MatchBitap(text, pattern, loc)
-}
-
-// MatchBitap locates the best instance of 'pattern' in 'text' near 'loc' using the Bitap algorithm.
-// Returns -1 if no match was found.
-func (dmp *DiffMatchPatch) MatchBitap(text, pattern string, loc int) int {
-	// Initialise the alphabet.
-	s := dmp.MatchAlphabet(pattern)
-
-	// Highest score beyond which we give up.
-	scoreThreshold := dmp.MatchThreshold
-	// Is there a nearby exact match? (speedup)
-	bestLoc := indexOf(text, pattern, loc)
-	if bestLoc != -1 {
-		scoreThreshold = math.Min(dmp.matchBitapScore(0, bestLoc, loc,
-			pattern), scoreThreshold)
-		// What about in the other direction? (speedup)
-		bestLoc = lastIndexOf(text, pattern, loc+len(pattern))
-		if bestLoc != -1 {
-			scoreThreshold = math.Min(dmp.matchBitapScore(0, bestLoc, loc,
-				pattern), scoreThreshold)
-		}
-	}
-
-	// Initialise the bit arrays.
-	matchmask := 1 << uint((len(pattern) - 1))
-	bestLoc = -1
-
-	var binMin, binMid int
-	binMax := len(pattern) + len(text)
-	lastRd := []int{}
-	for d := 0; d < len(pattern); d++ {
-		// Scan for the best match; each iteration allows for one more error. Run a binary search to determine how far from 'loc' we can stray at this error level.
-		binMin = 0
-		binMid = binMax
-		for binMin < binMid {
-			if dmp.matchBitapScore(d, loc+binMid, loc, pattern) <= scoreThreshold {
-				binMin = binMid
-			} else {
-				binMax = binMid
-			}
-			binMid = (binMax-binMin)/2 + binMin
-		}
-		// Use the result from this iteration as the maximum for the next.
-		binMax = binMid
-		start := int(math.Max(1, float64(loc-binMid+1)))
-		finish := int(math.Min(float64(loc+binMid), float64(len(text))) + float64(len(pattern)))
-
-		rd := make([]int, finish+2)
-		rd[finish+1] = (1 << uint(d)) - 1
-
-		for j := finish; j >= start; j-- {
-			var charMatch int
-			if len(text) <= j-1 {
-				// Out of range.
-				charMatch = 0
-			} else if _, ok := s[text[j-1]]; !ok {
-				charMatch = 0
-			} else {
-				charMatch = s[text[j-1]]
-			}
-
-			if d == 0 {
-				// First pass: exact match.
-				rd[j] = ((rd[j+1] << 1) | 1) & charMatch
-			} else {
-				// Subsequent passes: fuzzy match.
-				rd[j] = ((rd[j+1]<<1)|1)&charMatch | (((lastRd[j+1] | lastRd[j]) << 1) | 1) | lastRd[j+1]
-			}
-			if (rd[j] & matchmask) != 0 {
-				score := dmp.matchBitapScore(d, j-1, loc, pattern)
-				// This match will almost certainly be better than any existing match.  But check anyway.
-				if score <= scoreThreshold {
-					// Told you so.
-					scoreThreshold = score
-					bestLoc = j - 1
-					if bestLoc > loc {
-						// When passing loc, don't exceed our current distance from loc.
-						start = int(math.Max(1, float64(2*loc-bestLoc)))
-					} else {
-						// Already passed loc, downhill from here on in.
-						break
-					}
-				}
-			}
-		}
-		if dmp.matchBitapScore(d+1, loc, loc, pattern) > scoreThreshold {
-			// No hope for a (better) match at greater error levels.
-			break
-		}
-		lastRd = rd
-	}
-	return bestLoc
-}
-
-// matchBitapScore computes and returns the score for a match with e errors and x location.
-func (dmp *DiffMatchPatch) matchBitapScore(e, x, loc int, pattern string) float64 {
-	accuracy := float64(e) / float64(len(pattern))
-	proximity := math.Abs(float64(loc - x))
-	if dmp.MatchDistance == 0 {
-		// Dodge divide by zero error.
-		if proximity == 0 {
-			return accuracy
-		}
-
-		return 1.0
-	}
-	return accuracy + (proximity / float64(dmp.MatchDistance))
-}
-
-// MatchAlphabet initialises the alphabet for the Bitap algorithm.
-func (dmp *DiffMatchPatch) MatchAlphabet(pattern string) map[byte]int {
-	s := map[byte]int{}
-	charPattern := []byte(pattern)
-	for _, c := range charPattern {
-		_, ok := s[c]
-		if !ok {
-			s[c] = 0
-		}
-	}
-	i := 0
-
-	for _, c := range charPattern {
-		value := s[c] | int(uint(1)< y {
-		return x
-	}
-	return y
-}
diff --git a/vendor/github.com/sergi/go-diff/diffmatchpatch/operation_string.go b/vendor/github.com/sergi/go-diff/diffmatchpatch/operation_string.go
deleted file mode 100644
index 533ec0da7..000000000
--- a/vendor/github.com/sergi/go-diff/diffmatchpatch/operation_string.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Code generated by "stringer -type=Operation -trimprefix=Diff"; DO NOT EDIT.
-
-package diffmatchpatch
-
-import "fmt"
-
-const _Operation_name = "DeleteEqualInsert"
-
-var _Operation_index = [...]uint8{0, 6, 11, 17}
-
-func (i Operation) String() string {
-	i -= -1
-	if i < 0 || i >= Operation(len(_Operation_index)-1) {
-		return fmt.Sprintf("Operation(%d)", i+-1)
-	}
-	return _Operation_name[_Operation_index[i]:_Operation_index[i+1]]
-}
diff --git a/vendor/github.com/sergi/go-diff/diffmatchpatch/patch.go b/vendor/github.com/sergi/go-diff/diffmatchpatch/patch.go
deleted file mode 100644
index 0dbe3bdd7..000000000
--- a/vendor/github.com/sergi/go-diff/diffmatchpatch/patch.go
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright (c) 2012-2016 The go-diff authors. All rights reserved.
-// https://github.com/sergi/go-diff
-// See the included LICENSE file for license details.
-//
-// go-diff is a Go implementation of Google's Diff, Match, and Patch library
-// Original library is Copyright (c) 2006 Google Inc.
-// http://code.google.com/p/google-diff-match-patch/
-
-package diffmatchpatch
-
-import (
-	"bytes"
-	"errors"
-	"math"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// Patch represents one patch operation.
-type Patch struct {
-	diffs   []Diff
-	Start1  int
-	Start2  int
-	Length1 int
-	Length2 int
-}
-
-// String emulates GNU diff's format.
-// Header: @@ -382,8 +481,9 @@
-// Indices are printed as 1-based, not 0-based.
-func (p *Patch) String() string {
-	var coords1, coords2 string
-
-	if p.Length1 == 0 {
-		coords1 = strconv.Itoa(p.Start1) + ",0"
-	} else if p.Length1 == 1 {
-		coords1 = strconv.Itoa(p.Start1 + 1)
-	} else {
-		coords1 = strconv.Itoa(p.Start1+1) + "," + strconv.Itoa(p.Length1)
-	}
-
-	if p.Length2 == 0 {
-		coords2 = strconv.Itoa(p.Start2) + ",0"
-	} else if p.Length2 == 1 {
-		coords2 = strconv.Itoa(p.Start2 + 1)
-	} else {
-		coords2 = strconv.Itoa(p.Start2+1) + "," + strconv.Itoa(p.Length2)
-	}
-
-	var text bytes.Buffer
-	_, _ = text.WriteString("@@ -" + coords1 + " +" + coords2 + " @@\n")
-
-	// Escape the body of the patch with %xx notation.
-	for _, aDiff := range p.diffs {
-		switch aDiff.Type {
-		case DiffInsert:
-			_, _ = text.WriteString("+")
-		case DiffDelete:
-			_, _ = text.WriteString("-")
-		case DiffEqual:
-			_, _ = text.WriteString(" ")
-		}
-
-		_, _ = text.WriteString(strings.Replace(url.QueryEscape(aDiff.Text), "+", " ", -1))
-		_, _ = text.WriteString("\n")
-	}
-
-	return unescaper.Replace(text.String())
-}
-
-// PatchAddContext increases the context until it is unique, but doesn't let the pattern expand beyond MatchMaxBits.
-func (dmp *DiffMatchPatch) PatchAddContext(patch Patch, text string) Patch {
-	if len(text) == 0 {
-		return patch
-	}
-
-	pattern := text[patch.Start2 : patch.Start2+patch.Length1]
-	padding := 0
-
-	// Look for the first and last matches of pattern in text.  If two different matches are found, increase the pattern length.
-	for strings.Index(text, pattern) != strings.LastIndex(text, pattern) &&
-		len(pattern) < dmp.MatchMaxBits-2*dmp.PatchMargin {
-		padding += dmp.PatchMargin
-		maxStart := max(0, patch.Start2-padding)
-		minEnd := min(len(text), patch.Start2+patch.Length1+padding)
-		pattern = text[maxStart:minEnd]
-	}
-	// Add one chunk for good luck.
-	padding += dmp.PatchMargin
-
-	// Add the prefix.
-	prefix := text[max(0, patch.Start2-padding):patch.Start2]
-	if len(prefix) != 0 {
-		patch.diffs = append([]Diff{Diff{DiffEqual, prefix}}, patch.diffs...)
-	}
-	// Add the suffix.
-	suffix := text[patch.Start2+patch.Length1 : min(len(text), patch.Start2+patch.Length1+padding)]
-	if len(suffix) != 0 {
-		patch.diffs = append(patch.diffs, Diff{DiffEqual, suffix})
-	}
-
-	// Roll back the start points.
-	patch.Start1 -= len(prefix)
-	patch.Start2 -= len(prefix)
-	// Extend the lengths.
-	patch.Length1 += len(prefix) + len(suffix)
-	patch.Length2 += len(prefix) + len(suffix)
-
-	return patch
-}
-
-// PatchMake computes a list of patches.
-func (dmp *DiffMatchPatch) PatchMake(opt ...interface{}) []Patch {
-	if len(opt) == 1 {
-		diffs, _ := opt[0].([]Diff)
-		text1 := dmp.DiffText1(diffs)
-		return dmp.PatchMake(text1, diffs)
-	} else if len(opt) == 2 {
-		text1 := opt[0].(string)
-		switch t := opt[1].(type) {
-		case string:
-			diffs := dmp.DiffMain(text1, t, true)
-			if len(diffs) > 2 {
-				diffs = dmp.DiffCleanupSemantic(diffs)
-				diffs = dmp.DiffCleanupEfficiency(diffs)
-			}
-			return dmp.PatchMake(text1, diffs)
-		case []Diff:
-			return dmp.patchMake2(text1, t)
-		}
-	} else if len(opt) == 3 {
-		return dmp.PatchMake(opt[0], opt[2])
-	}
-	return []Patch{}
-}
-
-// patchMake2 computes a list of patches to turn text1 into text2.
-// text2 is not provided, diffs are the delta between text1 and text2.
-func (dmp *DiffMatchPatch) patchMake2(text1 string, diffs []Diff) []Patch {
-	// Check for null inputs not needed since null can't be passed in C#.
-	patches := []Patch{}
-	if len(diffs) == 0 {
-		return patches // Get rid of the null case.
-	}
-
-	patch := Patch{}
-	charCount1 := 0 // Number of characters into the text1 string.
-	charCount2 := 0 // Number of characters into the text2 string.
-	// Start with text1 (prepatchText) and apply the diffs until we arrive at text2 (postpatchText). We recreate the patches one by one to determine context info.
-	prepatchText := text1
-	postpatchText := text1
-
-	for i, aDiff := range diffs {
-		if len(patch.diffs) == 0 && aDiff.Type != DiffEqual {
-			// A new patch starts here.
-			patch.Start1 = charCount1
-			patch.Start2 = charCount2
-		}
-
-		switch aDiff.Type {
-		case DiffInsert:
-			patch.diffs = append(patch.diffs, aDiff)
-			patch.Length2 += len(aDiff.Text)
-			postpatchText = postpatchText[:charCount2] +
-				aDiff.Text + postpatchText[charCount2:]
-		case DiffDelete:
-			patch.Length1 += len(aDiff.Text)
-			patch.diffs = append(patch.diffs, aDiff)
-			postpatchText = postpatchText[:charCount2] + postpatchText[charCount2+len(aDiff.Text):]
-		case DiffEqual:
-			if len(aDiff.Text) <= 2*dmp.PatchMargin &&
-				len(patch.diffs) != 0 && i != len(diffs)-1 {
-				// Small equality inside a patch.
-				patch.diffs = append(patch.diffs, aDiff)
-				patch.Length1 += len(aDiff.Text)
-				patch.Length2 += len(aDiff.Text)
-			}
-			if len(aDiff.Text) >= 2*dmp.PatchMargin {
-				// Time for a new patch.
-				if len(patch.diffs) != 0 {
-					patch = dmp.PatchAddContext(patch, prepatchText)
-					patches = append(patches, patch)
-					patch = Patch{}
-					// Unlike Unidiff, our patch lists have a rolling context. http://code.google.com/p/google-diff-match-patch/wiki/Unidiff Update prepatch text & pos to reflect the application of the just completed patch.
-					prepatchText = postpatchText
-					charCount1 = charCount2
-				}
-			}
-		}
-
-		// Update the current character count.
-		if aDiff.Type != DiffInsert {
-			charCount1 += len(aDiff.Text)
-		}
-		if aDiff.Type != DiffDelete {
-			charCount2 += len(aDiff.Text)
-		}
-	}
-
-	// Pick up the leftover patch if not empty.
-	if len(patch.diffs) != 0 {
-		patch = dmp.PatchAddContext(patch, prepatchText)
-		patches = append(patches, patch)
-	}
-
-	return patches
-}
-
-// PatchDeepCopy returns an array that is identical to a given an array of patches.
-func (dmp *DiffMatchPatch) PatchDeepCopy(patches []Patch) []Patch {
-	patchesCopy := []Patch{}
-	for _, aPatch := range patches {
-		patchCopy := Patch{}
-		for _, aDiff := range aPatch.diffs {
-			patchCopy.diffs = append(patchCopy.diffs, Diff{
-				aDiff.Type,
-				aDiff.Text,
-			})
-		}
-		patchCopy.Start1 = aPatch.Start1
-		patchCopy.Start2 = aPatch.Start2
-		patchCopy.Length1 = aPatch.Length1
-		patchCopy.Length2 = aPatch.Length2
-		patchesCopy = append(patchesCopy, patchCopy)
-	}
-	return patchesCopy
-}
-
-// PatchApply merges a set of patches onto the text.  Returns a patched text, as well as an array of true/false values indicating which patches were applied.
-func (dmp *DiffMatchPatch) PatchApply(patches []Patch, text string) (string, []bool) {
-	if len(patches) == 0 {
-		return text, []bool{}
-	}
-
-	// Deep copy the patches so that no changes are made to originals.
-	patches = dmp.PatchDeepCopy(patches)
-
-	nullPadding := dmp.PatchAddPadding(patches)
-	text = nullPadding + text + nullPadding
-	patches = dmp.PatchSplitMax(patches)
-
-	x := 0
-	// delta keeps track of the offset between the expected and actual location of the previous patch.  If there are patches expected at positions 10 and 20, but the first patch was found at 12, delta is 2 and the second patch has an effective expected position of 22.
-	delta := 0
-	results := make([]bool, len(patches))
-	for _, aPatch := range patches {
-		expectedLoc := aPatch.Start2 + delta
-		text1 := dmp.DiffText1(aPatch.diffs)
-		var startLoc int
-		endLoc := -1
-		if len(text1) > dmp.MatchMaxBits {
-			// PatchSplitMax will only provide an oversized pattern in the case of a monster delete.
-			startLoc = dmp.MatchMain(text, text1[:dmp.MatchMaxBits], expectedLoc)
-			if startLoc != -1 {
-				endLoc = dmp.MatchMain(text,
-					text1[len(text1)-dmp.MatchMaxBits:], expectedLoc+len(text1)-dmp.MatchMaxBits)
-				if endLoc == -1 || startLoc >= endLoc {
-					// Can't find valid trailing context.  Drop this patch.
-					startLoc = -1
-				}
-			}
-		} else {
-			startLoc = dmp.MatchMain(text, text1, expectedLoc)
-		}
-		if startLoc == -1 {
-			// No match found.  :(
-			results[x] = false
-			// Subtract the delta for this failed patch from subsequent patches.
-			delta -= aPatch.Length2 - aPatch.Length1
-		} else {
-			// Found a match.  :)
-			results[x] = true
-			delta = startLoc - expectedLoc
-			var text2 string
-			if endLoc == -1 {
-				text2 = text[startLoc:int(math.Min(float64(startLoc+len(text1)), float64(len(text))))]
-			} else {
-				text2 = text[startLoc:int(math.Min(float64(endLoc+dmp.MatchMaxBits), float64(len(text))))]
-			}
-			if text1 == text2 {
-				// Perfect match, just shove the Replacement text in.
-				text = text[:startLoc] + dmp.DiffText2(aPatch.diffs) + text[startLoc+len(text1):]
-			} else {
-				// Imperfect match.  Run a diff to get a framework of equivalent indices.
-				diffs := dmp.DiffMain(text1, text2, false)
-				if len(text1) > dmp.MatchMaxBits && float64(dmp.DiffLevenshtein(diffs))/float64(len(text1)) > dmp.PatchDeleteThreshold {
-					// The end points match, but the content is unacceptably bad.
-					results[x] = false
-				} else {
-					diffs = dmp.DiffCleanupSemanticLossless(diffs)
-					index1 := 0
-					for _, aDiff := range aPatch.diffs {
-						if aDiff.Type != DiffEqual {
-							index2 := dmp.DiffXIndex(diffs, index1)
-							if aDiff.Type == DiffInsert {
-								// Insertion
-								text = text[:startLoc+index2] + aDiff.Text + text[startLoc+index2:]
-							} else if aDiff.Type == DiffDelete {
-								// Deletion
-								startIndex := startLoc + index2
-								text = text[:startIndex] +
-									text[startIndex+dmp.DiffXIndex(diffs, index1+len(aDiff.Text))-index2:]
-							}
-						}
-						if aDiff.Type != DiffDelete {
-							index1 += len(aDiff.Text)
-						}
-					}
-				}
-			}
-		}
-		x++
-	}
-	// Strip the padding off.
-	text = text[len(nullPadding) : len(nullPadding)+(len(text)-2*len(nullPadding))]
-	return text, results
-}
-
-// PatchAddPadding adds some padding on text start and end so that edges can match something.
-// Intended to be called only from within patchApply.
-func (dmp *DiffMatchPatch) PatchAddPadding(patches []Patch) string {
-	paddingLength := dmp.PatchMargin
-	nullPadding := ""
-	for x := 1; x <= paddingLength; x++ {
-		nullPadding += string(rune(x))
-	}
-
-	// Bump all the patches forward.
-	for i := range patches {
-		patches[i].Start1 += paddingLength
-		patches[i].Start2 += paddingLength
-	}
-
-	// Add some padding on start of first diff.
-	if len(patches[0].diffs) == 0 || patches[0].diffs[0].Type != DiffEqual {
-		// Add nullPadding equality.
-		patches[0].diffs = append([]Diff{Diff{DiffEqual, nullPadding}}, patches[0].diffs...)
-		patches[0].Start1 -= paddingLength // Should be 0.
-		patches[0].Start2 -= paddingLength // Should be 0.
-		patches[0].Length1 += paddingLength
-		patches[0].Length2 += paddingLength
-	} else if paddingLength > len(patches[0].diffs[0].Text) {
-		// Grow first equality.
-		extraLength := paddingLength - len(patches[0].diffs[0].Text)
-		patches[0].diffs[0].Text = nullPadding[len(patches[0].diffs[0].Text):] + patches[0].diffs[0].Text
-		patches[0].Start1 -= extraLength
-		patches[0].Start2 -= extraLength
-		patches[0].Length1 += extraLength
-		patches[0].Length2 += extraLength
-	}
-
-	// Add some padding on end of last diff.
-	last := len(patches) - 1
-	if len(patches[last].diffs) == 0 || patches[last].diffs[len(patches[last].diffs)-1].Type != DiffEqual {
-		// Add nullPadding equality.
-		patches[last].diffs = append(patches[last].diffs, Diff{DiffEqual, nullPadding})
-		patches[last].Length1 += paddingLength
-		patches[last].Length2 += paddingLength
-	} else if paddingLength > len(patches[last].diffs[len(patches[last].diffs)-1].Text) {
-		// Grow last equality.
-		lastDiff := patches[last].diffs[len(patches[last].diffs)-1]
-		extraLength := paddingLength - len(lastDiff.Text)
-		patches[last].diffs[len(patches[last].diffs)-1].Text += nullPadding[:extraLength]
-		patches[last].Length1 += extraLength
-		patches[last].Length2 += extraLength
-	}
-
-	return nullPadding
-}
-
-// PatchSplitMax looks through the patches and breaks up any which are longer than the maximum limit of the match algorithm.
-// Intended to be called only from within patchApply.
-func (dmp *DiffMatchPatch) PatchSplitMax(patches []Patch) []Patch {
-	patchSize := dmp.MatchMaxBits
-	for x := 0; x < len(patches); x++ {
-		if patches[x].Length1 <= patchSize {
-			continue
-		}
-		bigpatch := patches[x]
-		// Remove the big old patch.
-		patches = append(patches[:x], patches[x+1:]...)
-		x--
-
-		Start1 := bigpatch.Start1
-		Start2 := bigpatch.Start2
-		precontext := ""
-		for len(bigpatch.diffs) != 0 {
-			// Create one of several smaller patches.
-			patch := Patch{}
-			empty := true
-			patch.Start1 = Start1 - len(precontext)
-			patch.Start2 = Start2 - len(precontext)
-			if len(precontext) != 0 {
-				patch.Length1 = len(precontext)
-				patch.Length2 = len(precontext)
-				patch.diffs = append(patch.diffs, Diff{DiffEqual, precontext})
-			}
-			for len(bigpatch.diffs) != 0 && patch.Length1 < patchSize-dmp.PatchMargin {
-				diffType := bigpatch.diffs[0].Type
-				diffText := bigpatch.diffs[0].Text
-				if diffType == DiffInsert {
-					// Insertions are harmless.
-					patch.Length2 += len(diffText)
-					Start2 += len(diffText)
-					patch.diffs = append(patch.diffs, bigpatch.diffs[0])
-					bigpatch.diffs = bigpatch.diffs[1:]
-					empty = false
-				} else if diffType == DiffDelete && len(patch.diffs) == 1 && patch.diffs[0].Type == DiffEqual && len(diffText) > 2*patchSize {
-					// This is a large deletion.  Let it pass in one chunk.
-					patch.Length1 += len(diffText)
-					Start1 += len(diffText)
-					empty = false
-					patch.diffs = append(patch.diffs, Diff{diffType, diffText})
-					bigpatch.diffs = bigpatch.diffs[1:]
-				} else {
-					// Deletion or equality.  Only take as much as we can stomach.
-					diffText = diffText[:min(len(diffText), patchSize-patch.Length1-dmp.PatchMargin)]
-
-					patch.Length1 += len(diffText)
-					Start1 += len(diffText)
-					if diffType == DiffEqual {
-						patch.Length2 += len(diffText)
-						Start2 += len(diffText)
-					} else {
-						empty = false
-					}
-					patch.diffs = append(patch.diffs, Diff{diffType, diffText})
-					if diffText == bigpatch.diffs[0].Text {
-						bigpatch.diffs = bigpatch.diffs[1:]
-					} else {
-						bigpatch.diffs[0].Text =
-							bigpatch.diffs[0].Text[len(diffText):]
-					}
-				}
-			}
-			// Compute the head context for the next patch.
-			precontext = dmp.DiffText2(patch.diffs)
-			precontext = precontext[max(0, len(precontext)-dmp.PatchMargin):]
-
-			postcontext := ""
-			// Append the end context for this patch.
-			if len(dmp.DiffText1(bigpatch.diffs)) > dmp.PatchMargin {
-				postcontext = dmp.DiffText1(bigpatch.diffs)[:dmp.PatchMargin]
-			} else {
-				postcontext = dmp.DiffText1(bigpatch.diffs)
-			}
-
-			if len(postcontext) != 0 {
-				patch.Length1 += len(postcontext)
-				patch.Length2 += len(postcontext)
-				if len(patch.diffs) != 0 && patch.diffs[len(patch.diffs)-1].Type == DiffEqual {
-					patch.diffs[len(patch.diffs)-1].Text += postcontext
-				} else {
-					patch.diffs = append(patch.diffs, Diff{DiffEqual, postcontext})
-				}
-			}
-			if !empty {
-				x++
-				patches = append(patches[:x], append([]Patch{patch}, patches[x:]...)...)
-			}
-		}
-	}
-	return patches
-}
-
-// PatchToText takes a list of patches and returns a textual representation.
-func (dmp *DiffMatchPatch) PatchToText(patches []Patch) string {
-	var text bytes.Buffer
-	for _, aPatch := range patches {
-		_, _ = text.WriteString(aPatch.String())
-	}
-	return text.String()
-}
-
-// PatchFromText parses a textual representation of patches and returns a List of Patch objects.
-func (dmp *DiffMatchPatch) PatchFromText(textline string) ([]Patch, error) {
-	patches := []Patch{}
-	if len(textline) == 0 {
-		return patches, nil
-	}
-	text := strings.Split(textline, "\n")
-	textPointer := 0
-	patchHeader := regexp.MustCompile("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@$")
-
-	var patch Patch
-	var sign uint8
-	var line string
-	for textPointer < len(text) {
-
-		if !patchHeader.MatchString(text[textPointer]) {
-			return patches, errors.New("Invalid patch string: " + text[textPointer])
-		}
-
-		patch = Patch{}
-		m := patchHeader.FindStringSubmatch(text[textPointer])
-
-		patch.Start1, _ = strconv.Atoi(m[1])
-		if len(m[2]) == 0 {
-			patch.Start1--
-			patch.Length1 = 1
-		} else if m[2] == "0" {
-			patch.Length1 = 0
-		} else {
-			patch.Start1--
-			patch.Length1, _ = strconv.Atoi(m[2])
-		}
-
-		patch.Start2, _ = strconv.Atoi(m[3])
-
-		if len(m[4]) == 0 {
-			patch.Start2--
-			patch.Length2 = 1
-		} else if m[4] == "0" {
-			patch.Length2 = 0
-		} else {
-			patch.Start2--
-			patch.Length2, _ = strconv.Atoi(m[4])
-		}
-		textPointer++
-
-		for textPointer < len(text) {
-			if len(text[textPointer]) > 0 {
-				sign = text[textPointer][0]
-			} else {
-				textPointer++
-				continue
-			}
-
-			line = text[textPointer][1:]
-			line = strings.Replace(line, "+", "%2b", -1)
-			line, _ = url.QueryUnescape(line)
-			if sign == '-' {
-				// Deletion.
-				patch.diffs = append(patch.diffs, Diff{DiffDelete, line})
-			} else if sign == '+' {
-				// Insertion.
-				patch.diffs = append(patch.diffs, Diff{DiffInsert, line})
-			} else if sign == ' ' {
-				// Minor equality.
-				patch.diffs = append(patch.diffs, Diff{DiffEqual, line})
-			} else if sign == '@' {
-				// Start of next patch.
-				break
-			} else {
-				// WTF?
-				return patches, errors.New("Invalid patch mode '" + string(sign) + "' in: " + string(line))
-			}
-			textPointer++
-		}
-
-		patches = append(patches, patch)
-	}
-	return patches, nil
-}
diff --git a/vendor/github.com/sergi/go-diff/diffmatchpatch/stringutil.go b/vendor/github.com/sergi/go-diff/diffmatchpatch/stringutil.go
deleted file mode 100644
index eb727bb59..000000000
--- a/vendor/github.com/sergi/go-diff/diffmatchpatch/stringutil.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) 2012-2016 The go-diff authors. All rights reserved.
-// https://github.com/sergi/go-diff
-// See the included LICENSE file for license details.
-//
-// go-diff is a Go implementation of Google's Diff, Match, and Patch library
-// Original library is Copyright (c) 2006 Google Inc.
-// http://code.google.com/p/google-diff-match-patch/
-
-package diffmatchpatch
-
-import (
-	"fmt"
-	"strings"
-	"unicode/utf8"
-)
-
-const UNICODE_INVALID_RANGE_START = 0xD800
-const UNICODE_INVALID_RANGE_END = 0xDFFF
-const UNICODE_INVALID_RANGE_DELTA = UNICODE_INVALID_RANGE_END - UNICODE_INVALID_RANGE_START + 1
-const UNICODE_RANGE_MAX = 0x10FFFF
-
-// unescaper unescapes selected chars for compatibility with JavaScript's encodeURI.
-// In speed critical applications this could be dropped since the receiving application will certainly decode these fine. Note that this function is case-sensitive.  Thus "%3F" would not be unescaped.  But this is ok because it is only called with the output of HttpUtility.UrlEncode which returns lowercase hex. Example: "%3f" -> "?", "%24" -> "$", etc.
-var unescaper = strings.NewReplacer(
-	"%21", "!", "%7E", "~", "%27", "'",
-	"%28", "(", "%29", ")", "%3B", ";",
-	"%2F", "/", "%3F", "?", "%3A", ":",
-	"%40", "@", "%26", "&", "%3D", "=",
-	"%2B", "+", "%24", "$", "%2C", ",", "%23", "#", "%2A", "*")
-
-// indexOf returns the first index of pattern in str, starting at str[i].
-func indexOf(str string, pattern string, i int) int {
-	if i > len(str)-1 {
-		return -1
-	}
-	if i <= 0 {
-		return strings.Index(str, pattern)
-	}
-	ind := strings.Index(str[i:], pattern)
-	if ind == -1 {
-		return -1
-	}
-	return ind + i
-}
-
-// lastIndexOf returns the last index of pattern in str, starting at str[i].
-func lastIndexOf(str string, pattern string, i int) int {
-	if i < 0 {
-		return -1
-	}
-	if i >= len(str) {
-		return strings.LastIndex(str, pattern)
-	}
-	_, size := utf8.DecodeRuneInString(str[i:])
-	return strings.LastIndex(str[:i+size], pattern)
-}
-
-// runesIndexOf returns the index of pattern in target, starting at target[i].
-func runesIndexOf(target, pattern []rune, i int) int {
-	if i > len(target)-1 {
-		return -1
-	}
-	if i <= 0 {
-		return runesIndex(target, pattern)
-	}
-	ind := runesIndex(target[i:], pattern)
-	if ind == -1 {
-		return -1
-	}
-	return ind + i
-}
-
-func runesEqual(r1, r2 []rune) bool {
-	if len(r1) != len(r2) {
-		return false
-	}
-	for i, c := range r1 {
-		if c != r2[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// runesIndex is the equivalent of strings.Index for rune slices.
-func runesIndex(r1, r2 []rune) int {
-	last := len(r1) - len(r2)
-	for i := 0; i <= last; i++ {
-		if runesEqual(r1[i:i+len(r2)], r2) {
-			return i
-		}
-	}
-	return -1
-}
-
-func intArrayToString(ns []uint32) string {
-	if len(ns) == 0 {
-		return ""
-	}
-
-	b := []rune{}
-	for _, n := range ns {
-		b = append(b, intToRune(n))
-	}
-	return string(b)
-}
-
-// These constants define the number of bits representable
-// in 1,2,3,4 byte utf8 sequences, respectively.
-const ONE_BYTE_BITS = 7
-const TWO_BYTE_BITS = 11
-const THREE_BYTE_BITS = 16
-const FOUR_BYTE_BITS = 21
-
-// Helper for getting a sequence of bits from an integer.
-func getBits(i uint32, cnt byte, from byte) byte {
-	return byte((i >> from) & ((1 << cnt) - 1))
-}
-
-// Converts an integer in the range 0~1112060 into a rune.
-// Based on the ranges table in https://en.wikipedia.org/wiki/UTF-8
-func intToRune(i uint32) rune {
-	if i < (1 << ONE_BYTE_BITS) {
-		return rune(i)
-	}
-
-	if i < (1 << TWO_BYTE_BITS) {
-		r, size := utf8.DecodeRune([]byte{0b11000000 | getBits(i, 5, 6), 0b10000000 | getBits(i, 6, 0)})
-		if size != 2 || r == utf8.RuneError {
-			panic(fmt.Sprintf("Error encoding an int %d with size 2, got rune %v and size %d", size, r, i))
-		}
-		return r
-	}
-
-	// Last -3 here needed because for some reason 3rd to last codepoint 65533 in this range
-	// was returning utf8.RuneError during encoding.
-	if i < ((1 << THREE_BYTE_BITS) - UNICODE_INVALID_RANGE_DELTA - 3) {
-		if i >= UNICODE_INVALID_RANGE_START {
-			i += UNICODE_INVALID_RANGE_DELTA
-		}
-
-		r, size := utf8.DecodeRune([]byte{0b11100000 | getBits(i, 4, 12), 0b10000000 | getBits(i, 6, 6), 0b10000000 | getBits(i, 6, 0)})
-		if size != 3 || r == utf8.RuneError {
-			panic(fmt.Sprintf("Error encoding an int %d with size 3, got rune %v and size %d", size, r, i))
-		}
-		return r
-	}
-
-	if i < (1<= UNICODE_INVALID_RANGE_END {
-			return result - UNICODE_INVALID_RANGE_DELTA
-		}
-
-		return result
-	}
-
-	if size == 4 {
-		result := uint32(bytes[0]&0b111)<<18 | uint32(bytes[1]&0b111111)<<12 | uint32(bytes[2]&0b111111)<<6 | uint32(bytes[3]&0b111111)
-		return result - UNICODE_INVALID_RANGE_DELTA - 3
-	}
-
-	panic(fmt.Sprintf("Unexpected state decoding rune=%v size=%d", r, size))
-}
diff --git a/vendor/github.com/sirupsen/logrus/.golangci.yml b/vendor/github.com/sirupsen/logrus/.golangci.yml
index 65dc28503..c9a840e0d 100644
--- a/vendor/github.com/sirupsen/logrus/.golangci.yml
+++ b/vendor/github.com/sirupsen/logrus/.golangci.yml
@@ -1,40 +1,39 @@
-run:
-  # do not run on test files yet
-  tests: false
-
-# all available settings of specific linters
-linters-settings:
-  errcheck:
-    # report about not checking of errors in type assetions: `a := b.(MyStruct)`;
-    # default is false: such cases aren't reported by default.
-    check-type-assertions: false
-
-    # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
-    # default is false: such cases aren't reported by default.
-    check-blank: false
-
-  lll:
-    line-length: 100
-    tab-width: 4
-
-  prealloc:
-    simple: false
-    range-loops: false
-    for-loops: false
-
-  whitespace:
-    multi-if: false   # Enforces newlines (or comments) after every multi-line if statement
-    multi-func: false # Enforces newlines (or comments) after every multi-line function signature
-
+version: "2"
 linters:
   enable:
-    - megacheck
-    - govet
-  disable:
-    - maligned
-    - prealloc
-  disable-all: false
-  presets:
-    - bugs
-    - unused
-  fast: false
+    - asasalint
+    - asciicheck
+    - bidichk
+    - contextcheck
+    - durationcheck
+    - errchkjson
+    - errorlint
+    - exhaustive
+    - gocheckcompilerdirectives
+    - gochecksumtype
+    - gosec
+    - gosmopolitan
+    - loggercheck
+    - makezero
+    - musttag
+    - nilerr
+    - nilnesserr
+    - noctx
+    - reassign
+    - recvcheck
+    - testifylint
+    - unparam
+  exclusions:
+    presets:
+      - legacy
+      - std-error-handling
+    rules:
+      # Exclude some linters from running on tests files.
+      - path: _test\.go
+        linters:
+          - gosec
+          - musttag
+          - noctx # TODO: enable once we switch to Go 1.24+.
+      - linters: # TODO: remove once golangci-lint is updated with https://github.com/golangci/golangci-lint/pull/6584
+          - gocheckcompilerdirectives
+        text: 'compiler directive unrecognized: //go:fix'
diff --git a/vendor/github.com/sirupsen/logrus/.travis.yml b/vendor/github.com/sirupsen/logrus/.travis.yml
deleted file mode 100644
index c1dbd5a3a..000000000
--- a/vendor/github.com/sirupsen/logrus/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: go
-go_import_path: github.com/sirupsen/logrus
-git:
-  depth: 1
-env:
-  - GO111MODULE=on
-go: 1.15.x
-os: linux
-install:
-  - ./travis/install.sh
-script:
-  - cd ci
-  - go run mage.go -v -w ../ crossBuild
-  - go run mage.go -v -w ../ lint
-  - go run mage.go -v -w ../ test
diff --git a/vendor/github.com/sirupsen/logrus/CHANGELOG.md b/vendor/github.com/sirupsen/logrus/CHANGELOG.md
index 7567f6128..683cec908 100644
--- a/vendor/github.com/sirupsen/logrus/CHANGELOG.md
+++ b/vendor/github.com/sirupsen/logrus/CHANGELOG.md
@@ -1,90 +1,253 @@
-# 1.8.1
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## 1.10.2
+
+Changed:
+
+  * Update `github.com/stretchr/testify` to v1.12.1, removing the legacy
+    `gopkg.in/yaml.v3` dependency.
+
+## 1.10.1
+
+Fixes:
+
+  * Fix a regression introduced in v1.10.0 where `TextFormatter` could panic
+    when formatting nil or panicking `error` and `fmt.Stringer` values.
+  * Allow function-backed implementations of `error` as field values.
+
+## 1.10.0
+
+Fixes:
+
+  * Fix reentrant logging deadlocks in formatter paths.
+  * Fix race conditions in formatter and entry handling.
+  * Fix generic `Log`, `Logf`, `Logln`, and `LogFn` methods unexpectedly
+    panicking when called with `PanicLevel`. Use the corresponding `Panic`
+    methods when panic behavior is desired.
+  * Improve concurrency safety around formatter and hook access.
+
+Features:
+
+  * Add `slog` hook for forwarding Logrus entries to `log/slog`.
+  * Add `slog.Handler` for forwarding `log/slog` records to a Logrus logger,
+    including levels, fields, groups, context, time, and optional caller
+    reporting. The hook and handler can also be combined to help migrate
+    between Logrus and `log/slog`.
+  * Add minimal, composable logging interfaces for each log level. This enables
+    consumers to depend on narrower interfaces, making it easier to substitute
+    or adapt logging implementations.
+  * Allow `Entry.Caller` to be set explicitly and preserve it across derived
+    entries, enabling custom caller detection without Logrus overwriting
+    caller information when `ReportCaller` is enabled.
+
+Changed:
+
+  * Raise minimum supported Go version to 1.23.
+  * TextFormatter now renders `[]byte` values as raw/quoted strings instead of slice-of-ints.
+  * TextFormatter now uses distinct dimmed colors for debug and trace output.
+  * TextFormatter now automatically enables colors on Windows terminals with ANSI support,
+    matching the behavior on other platforms.
+  * `Entry.HasCaller` is now deprecated in favor of checking `Entry.Caller` directly.
+  * Deprecated `MutexWrap`, which was unintentionally exposed as public API.
+    It remains available as an alias for compatibility but should not be used
+    directly.
+
+Performance:
+
+  * Significantly improve TextFormatter performance and reduce allocations.
+  * Optimize common Entry and Logger hot paths.
+  * Reduce allocations in caller reporting.
+  * ~17% lower geomean runtime and ~27% higher formatter throughput overall.
+  * Common enabled logging paths are ~30–44% faster.
+  * TextFormatter paths are up to ~40% faster, with allocation counts reduced
+    by 25–74% across the measured formatter cases.
+
+
+## 1.9.4
+
+Fixes:
+
+  * Remove uses of deprecated `ioutil` package
+
+Features:
+
+  * Add GNU/Hurd support
+  * Add WASI wasip1 support
+
 Code quality:
+
+  * Update minimum supported Go version to 1.17
+  * Documentation updates
+
+
+## 1.9.3
+
+Fixes:
+
+  * Re-apply fix for potential denial of service in logrus.Writer() when logging >64KB single-line payloads without newlines (#1376)
+  * Fix panic in Writer
+
+
+## 1.9.2
+
+Fixes:
+
+  * Revert Writer DoS fix (#1376) due to regression
+
+
+## 1.9.1
+
+Fixes:
+
+  * Fix potential denial of service in logrus.Writer() when logging >64KB single-line payloads without newlines (#1376)
+
+
+## 1.9.0
+
+Fixes:
+
+  * Multiple concurrency and race condition fixes
+  * Improve Windows terminal and ANSI handling
+
+Code quality:
+
+  * Internal cleanups and modernization
+
+
+## 1.8.3
+
+Fixes:
+
+  * Fix potential denial of service in logrus.Writer() when logging >64KB single-line payloads without newlines (#1376)
+
+
+## 1.8.2
+
+Features:
+
+  * Add support for the logger private buffer pool (#1253)
+
+Fixes:
+
+  * Fix race condition for SetFormatter and SetReportCaller
+  * Fix data race in hooks test package
+
+## 1.8.1
+
+Code quality:
+
   * move magefile in its own subdir/submodule to remove magefile dependency on logrus consumer
   * improve timestamp format documentation
 
 Fixes:
+
   * fix race condition on logger hooks
 
 
-# 1.8.0
+## 1.8.0
 
 Correct versioning number replacing v1.7.1.
 
-# 1.7.1
+## 1.7.1
 
 Beware this release has introduced a new public API and its semver is therefore incorrect.
 
 Code quality:
+
   * use go 1.15 in travis
   * use magefile as task runner
 
 Fixes:
+
   * small fixes about new go 1.13 error formatting system
   * Fix for long time race condiction with mutating data hooks
 
 Features:
+
   * build support for zos
 
-# 1.7.0
+## 1.7.0
+
 Fixes:
+
   * the dependency toward a windows terminal library has been removed
 
 Features:
+
   * a new buffer pool management API has been added
   * a set of `Fn()` functions have been added
 
-# 1.6.0
+## 1.6.0
+
 Fixes:
+
   * end of line cleanup
-  * revert the entry concurrency bug fix whic leads to deadlock under some circumstances
+  * revert the entry concurrency bug fix which leads to deadlock under some circumstances
   * update dependency on go-windows-terminal-sequences to fix a crash with go 1.14
 
 Features:
+
   * add an option to the `TextFormatter` to completely disable fields quoting
 
-# 1.5.0
+## 1.5.0
+
 Code quality:
+
   * add golangci linter run on travis
 
 Fixes:
+
   * add mutex for hooks concurrent access on `Entry` data
   * caller function field for go1.14
   * fix build issue for gopherjs target
 
 Feature:
+
   * add an hooks/writer sub-package whose goal is to split output on different stream depending on the trace level
   * add a `DisableHTMLEscape` option in the `JSONFormatter`
   * add `ForceQuote` and `PadLevelText` options in the `TextFormatter`
 
-# 1.4.2
+## 1.4.2
+
   * Fixes build break for plan9, nacl, solaris
-# 1.4.1
+
+## 1.4.1
+
 This new release introduces:
+
   * Enhance TextFormatter to not print caller information when they are empty (#944)
   * Remove dependency on golang.org/x/crypto (#932, #943)
 
 Fixes:
+
   * Fix Entry.WithContext method to return a copy of the initial entry (#941)
 
-# 1.4.0
+## 1.4.0
+
 This new release introduces:
+
   * Add `DeferExitHandler`, similar to `RegisterExitHandler` but prepending the handler to the list of handlers (semantically like `defer`) (#848).
   * Add `CallerPrettyfier` to `JSONFormatter` and `TextFormatter` (#909, #911)
   * Add `Entry.WithContext()` and `Entry.Context`, to set a context on entries to be used e.g. in hooks (#919).
 
 Fixes:
+
   * Fix wrong method calls `Logger.Print` and `Logger.Warningln` (#893).
   * Update `Entry.Logf` to not do string formatting unless the log level is enabled (#903)
   * Fix infinite recursion on unknown `Level.String()` (#907)
   * Fix race condition in `getCaller` (#916).
 
 
-# 1.3.0
+## 1.3.0
+
 This new release introduces:
+
   * Log, Logf, Logln functions for Logger and Entry that take a Level
 
 Fixes:
+
   * Building prometheus node_exporter on AIX (#840)
   * Race condition in TextFormatter (#468)
   * Travis CI import path (#868)
@@ -92,20 +255,26 @@ Fixes:
   * Pointer to func as field in JSONFormatter (#870)
   * Properly marshal Levels (#873)
 
-# 1.2.0
+## 1.2.0
+
 This new release introduces:
+
   * A new method `SetReportCaller` in the `Logger` to enable the file, line and calling function from which the trace has been issued
   * A new trace level named `Trace` whose level is below `Debug`
   * A configurable exit function to be called upon a Fatal trace
   * The `Level` object now implements `encoding.TextUnmarshaler` interface
 
-# 1.1.1
+## 1.1.1
+
 This is a bug fix release.
+
   * fix the build break on Solaris
   * don't drop a whole trace in JSONFormatter when a field param is a function pointer which can not be serialized
 
-# 1.1.0
+## 1.1.0
+
 This new release introduces:
+
   * several fixes:
     * a fix for a race condition on entry formatting
     * proper cleanup of previously used entries before putting them back in the pool
@@ -122,83 +291,84 @@ This new release introduces:
   * the field sort function is now configurable for text formatter
   * the CLICOLOR and CLICOLOR\_FORCE environment variable support in text formater
 
-# 1.0.6
+## 1.0.6
 
 This new release introduces:
+
   * a new api WithTime which allows to easily force the time of the log entry
     which is mostly useful for logger wrapper
   * a fix reverting the immutability of the entry given as parameter to the hooks
     a new configuration field of the json formatter in order to put all the fields
-    in a nested dictionnary
+    in a nested dictionary
   * a new SetOutput method in the Logger
   * a new configuration of the textformatter to configure the name of the default keys
   * a new configuration of the text formatter to disable the level truncation
 
-# 1.0.5
+## 1.0.5
 
 * Fix hooks race (#707)
 * Fix panic deadlock (#695)
 
-# 1.0.4
+## 1.0.4
 
 * Fix race when adding hooks (#612)
 * Fix terminal check in AppEngine (#635)
 
-# 1.0.3
+## 1.0.3
 
 * Replace example files with testable examples
 
-# 1.0.2
+## 1.0.2
 
 * bug: quote non-string values in text formatter (#583)
 * Make (*Logger) SetLevel a public method
 
-# 1.0.1
+## 1.0.1
 
 * bug: fix escaping in text formatter (#575)
 
-# 1.0.0
+## 1.0.0
 
 * Officially changed name to lower-case
 * bug: colors on Windows 10 (#541)
 * bug: fix race in accessing level (#512)
 
-# 0.11.5
+## 0.11.5
 
 * feature: add writer and writerlevel to entry (#372)
 
-# 0.11.4
+## 0.11.4
 
 * bug: fix undefined variable on solaris (#493)
 
-# 0.11.3
+## 0.11.3
 
 * formatter: configure quoting of empty values (#484)
 * formatter: configure quoting character (default is `"`) (#484)
 * bug: fix not importing io correctly in non-linux environments (#481)
 
-# 0.11.2
+## 0.11.2
 
 * bug: fix windows terminal detection (#476)
 
-# 0.11.1
+## 0.11.1
 
 * bug: fix tty detection with custom out (#471)
 
-# 0.11.0
+## 0.11.0
 
 * performance: Use bufferpool to allocate (#370)
 * terminal: terminal detection for app-engine (#343)
 * feature: exit handler (#375)
 
-# 0.10.0
+## 0.10.0
 
 * feature: Add a test hook (#180)
 * feature: `ParseLevel` is now case-insensitive (#326)
 * feature: `FieldLogger` interface that generalizes `Logger` and `Entry` (#308)
 * performance: avoid re-allocations on `WithFields` (#335)
 
-# 0.9.0
+## 0.9.0
 
 * logrus/text_formatter: don't emit empty msg
 * logrus/hooks/airbrake: move out of main repository
@@ -210,25 +380,25 @@ This new release introduces:
 * logrus/core: support `WithError` on logger
 * logrus/core: Solaris support
 
-# 0.8.7
+## 0.8.7
 
 * logrus/core: fix possible race (#216)
 * logrus/doc: small typo fixes and doc improvements
 
 
-# 0.8.6
+## 0.8.6
 
 * hooks/raven: allow passing an initialized client
 
-# 0.8.5
+## 0.8.5
 
 * logrus/core: revert #208
 
-# 0.8.4
+## 0.8.4
 
 * formatter/text: fix data race (#218)
 
-# 0.8.3
+## 0.8.3
 
 * logrus/core: fix entry log level (#208)
 * logrus/core: improve performance of text formatter by 40%
@@ -236,24 +406,24 @@ This new release introduces:
 * logrus/core: add support for DragonflyBSD and NetBSD
 * formatter/text: print structs more verbosely
 
-# 0.8.2
+## 0.8.2
 
 * logrus: fix more Fatal family functions
 
-# 0.8.1
+## 0.8.1
 
 * logrus: fix not exiting on `Fatalf` and `Fatalln`
 
-# 0.8.0
+## 0.8.0
 
 * logrus: defaults to stderr instead of stdout
 * hooks/sentry: add special field for `*http.Request`
 * formatter/text: ignore Windows for colors
 
-# 0.7.3
+## 0.7.3
 
 * formatter/\*: allow configuration of timestamp layout
 
-# 0.7.2
+## 0.7.2
 
 * formatter/text: Add configuration option for time format (#158)
diff --git a/vendor/github.com/sirupsen/logrus/README.md b/vendor/github.com/sirupsen/logrus/README.md
index d1d4a85fd..b2ff7affc 100644
--- a/vendor/github.com/sirupsen/logrus/README.md
+++ b/vendor/github.com/sirupsen/logrus/README.md
@@ -1,15 +1,12 @@
-# Logrus :walrus: [![Build Status](https://github.com/sirupsen/logrus/workflows/CI/badge.svg)](https://github.com/sirupsen/logrus/actions?query=workflow%3ACI) [![Build Status](https://travis-ci.org/sirupsen/logrus.svg?branch=master)](https://travis-ci.org/sirupsen/logrus) [![Go Reference](https://pkg.go.dev/badge/github.com/sirupsen/logrus.svg)](https://pkg.go.dev/github.com/sirupsen/logrus)
+# Logrus :walrus: [![Build Status](https://github.com/sirupsen/logrus/workflows/CI/badge.svg)](https://github.com/sirupsen/logrus/actions?query=workflow%3ACI) [![Go Reference](https://pkg.go.dev/badge/github.com/sirupsen/logrus.svg)](https://pkg.go.dev/github.com/sirupsen/logrus)
 
 Logrus is a structured logger for Go (golang), completely API compatible with
 the standard library logger.
 
-**Logrus is in maintenance-mode.** We will not be introducing new features. It's
-simply too hard to do in a way that won't break many people's projects, which is
-the last thing you want from your Logging library (again...).
-
-This does not mean Logrus is dead. Logrus will continue to be maintained for
-security, (backwards compatible) bug fixes, and performance (where we are
-limited by the interface).
+**Logrus is in maintenance mode.** The project focuses on security, bug fixes,
+and performance improvements. New features are not planned, aside from changes
+required to provide interoperability with other logging ecosystems (e.g., Go's
+[log/slog](https://pkg.go.dev/log/slog)).
 
 I believe Logrus' biggest contribution is to have played a part in today's
 widespread use of structured logging in Golang. There doesn't seem to be a
@@ -23,93 +20,77 @@ about structured logging in Go today. Check out, for example,
 [zap]: https://github.com/uber-go/zap
 [apex]: https://github.com/apex/log
 
-**Seeing weird case-sensitive problems?** It's in the past been possible to
-import Logrus as both upper- and lower-case. Due to the Go package environment,
-this caused issues in the community and we needed a standard. Some environments
-experienced problems with the upper-case variant, so the lower-case was decided.
-Everything using `logrus` will need to use the lower-case:
-`github.com/sirupsen/logrus`. Any package that isn't, should be changed.
-
-To fix Glide, see [these
-comments](https://github.com/sirupsen/logrus/issues/553#issuecomment-306591437).
-For an in-depth explanation of the casing issue, see [this
-comment](https://github.com/sirupsen/logrus/issues/570#issuecomment-313933276).
-
 Nicely color-coded in development (when a TTY is attached, otherwise just
 plain text):
 
 ![Colored](http://i.imgur.com/PY7qMwd.png)
 
-With `log.SetFormatter(&log.JSONFormatter{})`, for easy parsing by logstash
+With `logrus.SetFormatter(&logrus.JSONFormatter{})`, for easy parsing by logstash
 or Splunk:
 
-```text
-{"animal":"walrus","level":"info","msg":"A group of walrus emerges from the
-ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
-
-{"level":"warning","msg":"The group's number increased tremendously!",
-"number":122,"omg":true,"time":"2014-03-10 19:57:38.562471297 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"A giant walrus appears!",
-"size":10,"time":"2014-03-10 19:57:38.562500591 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"Tremendously sized cow enters the ocean.",
-"size":9,"time":"2014-03-10 19:57:38.562527896 -0400 EDT"}
-
-{"level":"fatal","msg":"The ice breaks!","number":100,"omg":true,
-"time":"2014-03-10 19:57:38.562543128 -0400 EDT"}
+```json lines
+{"animal":"walrus","level":"info","msg":"A group of walrus emerges from the ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
+{"level":"warning","msg":"The group's number increased tremendously!","number":122,"omg":true,"time":"2014-03-10 19:57:38.562471297 -0400 EDT"}
+{"animal":"walrus","level":"info","msg":"A giant walrus appears!","size":10,"time":"2014-03-10 19:57:38.562500591 -0400 EDT"}
+{"animal":"walrus","level":"info","msg":"Tremendously sized cow enters the ocean.","size":9,"time":"2014-03-10 19:57:38.562527896 -0400 EDT"}
+{"level":"fatal","msg":"The ice breaks!","number":100,"omg":true,"time":"2014-03-10 19:57:38.562543128 -0400 EDT"}
 ```
 
-With the default `log.SetFormatter(&log.TextFormatter{})` when a TTY is not
+With the default `logrus.SetFormatter(&logrus.TextFormatter{})` when a TTY is not
 attached, the output is compatible with the
-[logfmt](http://godoc.org/github.com/kr/logfmt) format:
+[logfmt](https://pkg.go.dev/github.com/kr/logfmt) format:
 
-```text
+```bash
 time="2015-03-26T01:27:38-04:00" level=debug msg="Started observing beach" animal=walrus number=8
 time="2015-03-26T01:27:38-04:00" level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
 time="2015-03-26T01:27:38-04:00" level=warning msg="The group's number increased tremendously!" number=122 omg=true
 time="2015-03-26T01:27:38-04:00" level=debug msg="Temperature changes" temperature=-4
 time="2015-03-26T01:27:38-04:00" level=panic msg="It's over 9000!" animal=orca size=9009
-time="2015-03-26T01:27:38-04:00" level=fatal msg="The ice breaks!" err=&{0x2082280c0 map[animal:orca size:9009] 2015-03-26 01:27:38.441574009 -0400 EDT panic It's over 9000!} number=100 omg=true
+time="2015-03-26T01:27:38-04:00" level=fatal msg="The ice breaks!" animal=orca err="It's over 9000!" number=100 omg=true size=9009
 ```
+
 To ensure this behaviour even if a TTY is attached, set your formatter as follows:
 
 ```go
-	log.SetFormatter(&log.TextFormatter{
-		DisableColors: true,
-		FullTimestamp: true,
-	})
+logrus.SetFormatter(&logrus.TextFormatter{
+    DisableColors: true,
+    FullTimestamp: true,
+})
 ```
 
 #### Logging Method Name
 
 If you wish to add the calling method as a field, instruct the logger via:
+
 ```go
-log.SetReportCaller(true)
+logrus.SetReportCaller(true)
 ```
+
 This adds the caller as 'method' like so:
 
 ```json
-{"animal":"penguin","level":"fatal","method":"github.com/sirupsen/arcticcreatures.migrate","msg":"a penguin swims by",
-"time":"2014-03-10 19:57:38.562543129 -0400 EDT"}
+{"animal":"penguin","level":"fatal","method":"github.com/sirupsen/arcticcreatures.migrate","msg":"a penguin swims by","time":"2014-03-10 19:57:38.562543129 -0400 EDT"}
 ```
 
-```text
+```bash
 time="2015-03-26T01:27:38-04:00" level=fatal method=github.com/sirupsen/arcticcreatures.migrate msg="a penguin swims by" animal=penguin
 ```
+
 Note that this does add measurable overhead - the cost will depend on the version of Go, but is
 between 20 and 40% in recent tests with 1.6 and 1.7.  You can validate this in your
 environment via benchmarks:
-```
-go test -bench=.*CallerTracing
-```
 
+```bash
+go test -bench=ReportCaller
+```
 
 #### Case-sensitivity
 
-The organization's name was changed to lower-case--and this will not be changed
-back. If you are getting import conflicts due to case sensitivity, please use
-the lower-case import: `github.com/sirupsen/logrus`.
+The organization's name was [changed to lower-case][1]. If you are getting import
+conflicts due to case sensitivity, please use the lower-case import:
+`github.com/sirupsen/logrus`.
+
+[1]: https://github.com/sirupsen/logrus/issues/570#issuecomment-313933276
 
 #### Example
 
@@ -118,12 +99,10 @@ The simplest way to use Logrus is simply the package-level exported logger:
 ```go
 package main
 
-import (
-  log "github.com/sirupsen/logrus"
-)
+import "github.com/sirupsen/logrus"
 
 func main() {
-  log.WithFields(log.Fields{
+  logrus.WithFields(logrus.Fields{
     "animal": "walrus",
   }).Info("A walrus appears")
 }
@@ -139,6 +118,7 @@ package main
 
 import (
   "os"
+
   log "github.com/sirupsen/logrus"
 )
 
@@ -190,26 +170,27 @@ package main
 
 import (
   "os"
+
   "github.com/sirupsen/logrus"
 )
 
 // Create a new instance of the logger. You can have any number of instances.
-var log = logrus.New()
+var logger = logrus.New()
 
 func main() {
   // The API for setting attributes is a little different than the package level
-  // exported logger. See Godoc.
-  log.Out = os.Stdout
+  // exported logger. See Godoc. 
+  logger.Out = os.Stdout
 
   // You could set this to any `io.Writer` such as a file
   // file, err := os.OpenFile("logrus.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
   // if err == nil {
-  //  log.Out = file
+  //  logger.Out = file
   // } else {
-  //  log.Info("Failed to log to file, using default stderr")
+  //  logger.Info("Failed to log to file, using default stderr")
   // }
 
-  log.WithFields(logrus.Fields{
+  logger.WithFields(logrus.Fields{
     "animal": "walrus",
     "size":   10,
   }).Info("A group of walrus emerges from the ocean")
@@ -219,12 +200,12 @@ func main() {
 #### Fields
 
 Logrus encourages careful, structured logging through logging fields instead of
-long, unparseable error messages. For example, instead of: `log.Fatalf("Failed
+long, unparseable error messages. For example, instead of: `logrus.Fatalf("Failed
 to send event %s to topic %s with key %d")`, you should log the much more
 discoverable:
 
 ```go
-log.WithFields(log.Fields{
+logrus.WithFields(logrus.Fields{
   "event": event,
   "topic": topic,
   "key": key,
@@ -245,12 +226,12 @@ seen as a hint you should add a field, however, you can still use the
 Often it's helpful to have fields _always_ attached to log statements in an
 application or parts of one. For example, you may want to always log the
 `request_id` and `user_ip` in the context of a request. Instead of writing
-`log.WithFields(log.Fields{"request_id": request_id, "user_ip": user_ip})` on
+`logger.WithFields(logrus.Fields{"request_id": request_id, "user_ip": user_ip})` on
 every line, you can create a `logrus.Entry` to pass around instead:
 
 ```go
-requestLogger := log.WithFields(log.Fields{"request_id": request_id, "user_ip": user_ip})
-requestLogger.Info("something happened on that request") # will log request_id and user_ip
+requestLogger := logger.WithFields(logrus.Fields{"request_id": request_id, "user_ip": user_ip})
+requestLogger.Info("something happened on that request") // will log request_id and user_ip
 requestLogger.Warn("something not great happened")
 ```
 
@@ -264,28 +245,32 @@ Logrus comes with [built-in hooks](hooks/). Add those, or your custom hook, in
 `init`:
 
 ```go
+package main
+
 import (
-  log "github.com/sirupsen/logrus"
-  "gopkg.in/gemnasium/logrus-airbrake-hook.v2" // the package is named "airbrake"
-  logrus_syslog "github.com/sirupsen/logrus/hooks/syslog"
   "log/syslog"
+
+  "github.com/sirupsen/logrus"
+  airbrake "gopkg.in/gemnasium/logrus-airbrake-hook.v2"
+  logrus_syslog "github.com/sirupsen/logrus/hooks/syslog"
 )
 
 func init() {
 
   // Use the Airbrake hook to report errors that have Error severity or above to
   // an exception tracker. You can create custom hooks, see the Hooks section.
-  log.AddHook(airbrake.NewHook(123, "xyz", "production"))
+  logrus.AddHook(airbrake.NewHook(123, "xyz", "production"))
 
   hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
   if err != nil {
-    log.Error("Unable to connect to local syslog daemon")
+    logrus.Error("Unable to connect to local syslog daemon")
   } else {
-    log.AddHook(hook)
+    logrus.AddHook(hook)
   }
 }
 ```
-Note: Syslog hook also support connecting to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). For the detail, please check the [syslog hook README](hooks/syslog/README.md).
+
+Note: Syslog hooks also support connecting to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). For the detail, please check the [syslog hook README](hooks/syslog/README.md).
 
 A list of currently known service hooks can be found in this wiki [page](https://github.com/sirupsen/logrus/wiki/Hooks)
 
@@ -295,15 +280,15 @@ A list of currently known service hooks can be found in this wiki [page](https:/
 Logrus has seven logging levels: Trace, Debug, Info, Warning, Error, Fatal and Panic.
 
 ```go
-log.Trace("Something very low level.")
-log.Debug("Useful debugging information.")
-log.Info("Something noteworthy happened!")
-log.Warn("You should probably take a look at this.")
-log.Error("Something failed but I'm not quitting.")
+logrus.Trace("Something very low level.")
+logrus.Debug("Useful debugging information.")
+logrus.Info("Something noteworthy happened!")
+logrus.Warn("You should probably take a look at this.")
+logrus.Error("Something failed but I'm not quitting.")
 // Calls os.Exit(1) after logging
-log.Fatal("Bye.")
+logrus.Fatal("Bye.")
 // Calls panic() after logging
-log.Panic("I'm bailing.")
+logrus.Panic("I'm bailing.")
 ```
 
 You can set the logging level on a `Logger`, then it will only log entries with
@@ -311,13 +296,13 @@ that severity or anything above it:
 
 ```go
 // Will log anything that is info or above (warn, error, fatal, panic). Default.
-log.SetLevel(log.InfoLevel)
+logrus.SetLevel(logrus.InfoLevel)
 ```
 
-It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose
+It may be useful to set `logrus.Level = logrus.DebugLevel` in a debug or verbose
 environment if your application has that.
 
-Note: If you want different log levels for global (`log.SetLevel(...)`) and syslog logging, please check the [syslog hook README](hooks/syslog/README.md#different-log-levels-for-local-and-remote-logging).
+Note: If you want different log levels for global (`logrus.SetLevel(...)`) and syslog logging, please check the [syslog hook README](hooks/syslog/README.md#different-log-levels-for-local-and-remote-logging).
 
 #### Entries
 
@@ -340,17 +325,17 @@ could do:
 
 ```go
 import (
-  log "github.com/sirupsen/logrus"
+  "github.com/sirupsen/logrus"
 )
 
 func init() {
   // do something here to set environment depending on an environment variable
   // or command-line flag
   if Environment == "production" {
-    log.SetFormatter(&log.JSONFormatter{})
+    logrus.SetFormatter(&logrus.JSONFormatter{})
   } else {
     // The TextFormatter is default, you don't actually have to do this.
-    log.SetFormatter(&log.TextFormatter{})
+    logrus.SetFormatter(&logrus.TextFormatter{})
   }
 }
 ```
@@ -363,20 +348,23 @@ Splunk or Logstash.
 
 The built-in logging formatters are:
 
-* `logrus.TextFormatter`. Logs the event in colors if stdout is a tty, otherwise
-  without colors.
-  * *Note:* to force colored output when there is no TTY, set the `ForceColors`
+* [`logrus.TextFormatter`](https://pkg.go.dev/github.com/sirupsen/logrus#TextFormatter)
+  logs the event in colors if the logger output is a TTY, otherwise without colors.
+  * To force colored output when there is no TTY, set the `ForceColors`
     field to `true`.  To force no colored output even if there is a TTY  set the
-    `DisableColors` field to `true`. For Windows, see
-    [github.com/mattn/go-colorable](https://github.com/mattn/go-colorable).
+    `DisableColors` field to `true`.
+  * On modern Windows terminals with ANSI (Virtual Terminal) support, TextFormatter
+    automatically enables colored output.
+  * If your environment does not support ANSI escape sequences, wrap the logger output
+    using [github.com/mattn/go-colorable](https://github.com/mattn/go-colorable)
+    and set `ForceColors` (or `CLICOLOR_FORCE=1`) to enable colors through the wrapper.
   * When colors are enabled, levels are truncated to 4 characters by default. To disable
     truncation set the `DisableLevelTruncation` field to `true`.
   * When outputting to a TTY, it's often helpful to visually scan down a column where all the levels are the same width. Setting the `PadLevelText` field to `true` enables this behavior, by adding padding to the level text.
-  * All options are listed in the [generated docs](https://godoc.org/github.com/sirupsen/logrus#TextFormatter).
-* `logrus.JSONFormatter`. Logs fields as JSON.
-  * All options are listed in the [generated docs](https://godoc.org/github.com/sirupsen/logrus#JSONFormatter).
+* [`logrus.JSONFormatter`](https://pkg.go.dev/github.com/sirupsen/logrus#JSONFormatter)
+  logs fields as JSON.
 
-Third party logging formatters:
+Third-party logging formatters:
 
 * [`FluentdFormatter`](https://github.com/joonix/log). Formats entries that can be parsed by Kubernetes and Google Container Engine.
 * [`GELF`](https://github.com/fabienm/go-logrus-formatters). Formats entries so they comply to Graylog's [GELF 1.1 specification](http://docs.graylog.org/en/2.4/pages/gelf.html).
@@ -384,19 +372,20 @@ Third party logging formatters:
 * [`prefixed`](https://github.com/x-cray/logrus-prefixed-formatter). Displays log entry source along with alternative layout.
 * [`zalgo`](https://github.com/aybabtme/logzalgo). Invoking the Power of Zalgo.
 * [`nested-logrus-formatter`](https://github.com/antonfisher/nested-logrus-formatter). Converts logrus fields to a nested structure.
-* [`powerful-logrus-formatter`](https://github.com/zput/zxcTool). get fileName, log's line number and the latest function's name when print log; Sava log to files.
+* [`powerful-logrus-formatter`](https://github.com/zput/zxcTool). get fileName, log's line number and the latest function's name when print log; Save log to files.
 * [`caption-json-formatter`](https://github.com/nolleh/caption_json_formatter). logrus's message json formatter with human-readable caption added.
+* [`easy-logrus-formatter`](https://github.com/WeiZhixiong/easy-logrus-formatter). Provide a user-friendly formatter for logrus.
+* [`redactrus`](https://github.com/ibreakthecloud/redactrus). Redacts sensitive information like password, apikeys, email, etc. from logs.
 
 You can define your formatter by implementing the `Formatter` interface,
 requiring a `Format` method. `Format` takes an `*Entry`. `entry.Data` is a
-`Fields` type (`map[string]interface{}`) with all your fields as well as the
+`Fields` type (`map[string]any`) with all your fields as well as the
 default ones (see Entries section above):
 
 ```go
-type MyJSONFormatter struct {
-}
+type MyJSONFormatter struct{}
 
-log.SetFormatter(new(MyJSONFormatter))
+logrus.SetFormatter(new(MyJSONFormatter))
 
 func (f *MyJSONFormatter) Format(entry *Entry) ([]byte, error) {
   // Note this doesn't include Time, Level and Message which are available on
@@ -455,17 +444,18 @@ entries. It should not be a feature of the application-level logger.
 
 #### Testing
 
-Logrus has a built in facility for asserting the presence of log messages. This is implemented through the `test` hook and provides:
+Logrus has a built-in facility for asserting the presence of log messages. This is implemented through the `test` hook and provides:
 
 * decorators for existing logger (`test.NewLocal` and `test.NewGlobal`) which basically just adds the `test` hook
 * a test logger (`test.NewNullLogger`) that just records log messages (and does not output any):
 
 ```go
 import(
+  "testing"
+
   "github.com/sirupsen/logrus"
   "github.com/sirupsen/logrus/hooks/test"
   "github.com/stretchr/testify/assert"
-  "testing"
 )
 
 func TestSomething(t*testing.T){
@@ -486,15 +476,15 @@ func TestSomething(t*testing.T){
 Logrus can register one or more functions that will be called when any `fatal`
 level message is logged. The registered handlers will be executed before
 logrus performs an `os.Exit(1)`. This behavior may be helpful if callers need
-to gracefully shutdown. Unlike a `panic("Something went wrong...")` call which can be intercepted with a deferred `recover` a call to `os.Exit(1)` can not be intercepted.
+to gracefully shut down. Unlike a `panic("Something went wrong...")` call which can be intercepted with a deferred `recover` a call to `os.Exit(1)` can not be intercepted.
 
-```
-...
+```go
+// ...
 handler := func() {
-  // gracefully shutdown something...
+  // gracefully shut down something...
 }
 logrus.RegisterExitHandler(handler)
-...
+// ...
 ```
 
 #### Thread safety
@@ -502,7 +492,7 @@ logrus.RegisterExitHandler(handler)
 By default, Logger is protected by a mutex for concurrent writes. The mutex is held when calling hooks and writing logs.
 If you are sure such locking is not needed, you can call logger.SetNoLock() to disable the locking.
 
-Situation when locking is not needed includes:
+Situations when locking is not needed include:
 
 * You have no hooks registered, or hooks calling is already thread-safe.
 
@@ -512,4 +502,4 @@ Situation when locking is not needed includes:
 
   2) logger.Out is an os.File handler opened with `O_APPEND` flag, and every write is smaller than 4k. (This allows multi-thread/multi-process writing)
 
-     (Refer to http://www.notthewizard.com/2014/06/17/are-files-appends-really-atomic/)
+     (Refer to )
diff --git a/vendor/github.com/sirupsen/logrus/alt_exit.go b/vendor/github.com/sirupsen/logrus/alt_exit.go
index 8fd189e1c..1c35cf81c 100644
--- a/vendor/github.com/sirupsen/logrus/alt_exit.go
+++ b/vendor/github.com/sirupsen/logrus/alt_exit.go
@@ -57,7 +57,7 @@ func Exit(code int) {
 //
 // This method is useful when a caller wishes to use logrus to log a fatal
 // message but also needs to gracefully shutdown. An example usecase could be
-// closing database connections, or sending a alert that the application is
+// closing database connections, or sending an alert that the application is
 // closing.
 func RegisterExitHandler(handler func()) {
 	handlers = append(handlers, handler)
@@ -69,7 +69,7 @@ func RegisterExitHandler(handler func()) {
 //
 // This method is useful when a caller wishes to use logrus to log a fatal
 // message but also needs to gracefully shutdown. An example usecase could be
-// closing database connections, or sending a alert that the application is
+// closing database connections, or sending an alert that the application is
 // closing.
 func DeferExitHandler(handler func()) {
 	handlers = append([]func(){handler}, handlers...)
diff --git a/vendor/github.com/sirupsen/logrus/appveyor.yml b/vendor/github.com/sirupsen/logrus/appveyor.yml
index df9d65c3a..e90f09ea6 100644
--- a/vendor/github.com/sirupsen/logrus/appveyor.yml
+++ b/vendor/github.com/sirupsen/logrus/appveyor.yml
@@ -1,14 +1,12 @@
-version: "{build}"
+# Minimal stub to satisfy AppVeyor CI
+version: 1.0.{build}
 platform: x64
-clone_folder: c:\gopath\src\github.com\sirupsen\logrus
-environment:
-  GOPATH: c:\gopath
+shallow_clone: true
+
 branches:
   only:
     - master
-install:
-  - set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
-  - go version
+    - main
+
 build_script:
-  - go get -t
-  - go test
+  - echo "No-op build to satisfy AppVeyor CI"
diff --git a/vendor/github.com/sirupsen/logrus/buffer_pool.go b/vendor/github.com/sirupsen/logrus/buffer_pool.go
index c7787f77c..6b562d870 100644
--- a/vendor/github.com/sirupsen/logrus/buffer_pool.go
+++ b/vendor/github.com/sirupsen/logrus/buffer_pool.go
@@ -5,9 +5,13 @@ import (
 	"sync"
 )
 
-var (
-	bufferPool BufferPool
-)
+var bufferPool BufferPool = &defaultPool{
+	pool: &sync.Pool{
+		New: func() any {
+			return new(bytes.Buffer)
+		},
+	},
+}
 
 type BufferPool interface {
 	Put(*bytes.Buffer)
@@ -27,17 +31,7 @@ func (p *defaultPool) Get() *bytes.Buffer {
 }
 
 // SetBufferPool allows to replace the default logrus buffer pool
-// to better meets the specific needs of an application.
+// to better meet the specific needs of an application.
 func SetBufferPool(bp BufferPool) {
 	bufferPool = bp
 }
-
-func init() {
-	SetBufferPool(&defaultPool{
-		pool: &sync.Pool{
-			New: func() interface{} {
-				return new(bytes.Buffer)
-			},
-		},
-	})
-}
diff --git a/vendor/github.com/sirupsen/logrus/doc.go b/vendor/github.com/sirupsen/logrus/doc.go
index da67aba06..75186dc2d 100644
--- a/vendor/github.com/sirupsen/logrus/doc.go
+++ b/vendor/github.com/sirupsen/logrus/doc.go
@@ -1,25 +1,25 @@
 /*
 Package logrus is a structured logger for Go, completely API compatible with the standard library logger.
 
-
 The simplest way to use Logrus is simply the package-level exported logger:
 
-  package main
+	package main
 
-  import (
-    log "github.com/sirupsen/logrus"
-  )
+	import (
+		log "github.com/sirupsen/logrus"
+	)
 
-  func main() {
-    log.WithFields(log.Fields{
-      "animal": "walrus",
-      "number": 1,
-      "size":   10,
-    }).Info("A walrus appears")
-  }
+	func main() {
+		log.WithFields(log.Fields{
+			"animal": "walrus",
+			"number": 1,
+			"size":   10,
+		}).Info("A walrus appears")
+	}
 
 Output:
-  time="2015-09-07T08:48:33Z" level=info msg="A walrus appears" animal=walrus number=1 size=10
+
+	time="2015-09-07T08:48:33Z" level=info msg="A walrus appears" animal=walrus number=1 size=10
 
 For a full guide visit https://github.com/sirupsen/logrus
 */
diff --git a/vendor/github.com/sirupsen/logrus/entry.go b/vendor/github.com/sirupsen/logrus/entry.go
index 71cdbbc35..82de41f9f 100644
--- a/vendor/github.com/sirupsen/logrus/entry.go
+++ b/vendor/github.com/sirupsen/logrus/entry.go
@@ -4,9 +4,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"maps"
 	"os"
 	"reflect"
 	"runtime"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -17,8 +19,10 @@ var (
 	// qualified package name, cached at first use
 	logrusPackage string
 
-	// Positions in the call stack when tracing to report the calling method
-	minimumCallerDepth int
+	// Positions in the call stack when tracing to report the calling method.
+	//
+	// Start at the bottom of the stack before the package-name cache is primed.
+	minimumCallerDepth = 1
 
 	// Used for caller information initialisation
 	callerInitOnce sync.Once
@@ -29,69 +33,119 @@ const (
 	knownLogrusFrames  int = 4
 )
 
-func init() {
-	// start at the bottom of the stack before the package-name cache is primed
-	minimumCallerDepth = 1
-}
-
-// Defines the key when adding errors using WithError.
+// ErrorKey defines the key when adding errors using [WithError], [Logger.WithError].
 var ErrorKey = "error"
 
-// An entry is the final or intermediate Logrus logging entry. It contains all
-// the fields passed with WithField{,s}. It's finally logged when Trace, Debug,
-// Info, Warn, Error, Fatal or Panic is called on it. These objects can be
-// reused and passed around as much as you wish to avoid field duplication.
+// Entry represents a single log event. It may be either an intermediate
+// entry (created via WithField(s), WithContext, etc.) or a final entry
+// that is emitted when one of the level methods (Trace, Debug, Info,
+// Warn, Error, Fatal, Panic) is called.
+//
+// An Entry always belongs to a Logger. A nil Logger is invalid and will
+// cause a panic when the entry is logged. Use [NewEntry] or Logger methods
+// to construct entries.
+//
+// Entries are safe to reuse for adding fields and may be passed around
+// to avoid field duplication. Each log operation operates on a copy
+// of the Entry’s data to avoid mutation during formatting.
+//
+//nolint:recvcheck // Entry methods intentionally use both pointer and value receivers.
 type Entry struct {
+	// Logger is the Logger that owns this entry and is responsible for
+	// formatting, hooks, and output. It must not be nil. An Entry without
+	// a Logger is invalid and will panic when logged.
 	Logger *Logger
 
-	// Contains all the fields set by the user.
+	// Data contains all user-defined fields attached to this entry.
 	Data Fields
 
-	// Time at which the log entry was created
+	// Time is the timestamp for the log event. If zero when the entry is
+	// logged, it defaults to the current time.
 	Time time.Time
 
-	// Level the log entry was logged at: Trace, Debug, Info, Warn, Error, Fatal or Panic
-	// This field will be set on entry firing and the value will be equal to the one in Logger struct field.
+	// Level is the severity of the log entry. It is set when the entry
+	// is fired and reflects the level used for that log call.
 	Level Level
 
-	// Calling method, with package name
+	// Caller contains the calling method information.
+	//
+	// When [Logger.ReportCaller] is enabled, Caller is populated automatically at
+	// log time if it is nil. Hooks and formatters may inspect Caller.
+	//
+	// Applications generally should not modify Caller unless they intentionally
+	// want to provide custom caller information.
 	Caller *runtime.Frame
 
-	// Message passed to Trace, Debug, Info, Warn, Error, Fatal or Panic
+	// Message is the log message supplied to one of the logging methods
+	// (Trace, Debug, Info, Warn, Error, Fatal, or Panic). It is set when
+	// the entry is logged.
 	Message string
 
-	// When formatter is called in entry.log(), a Buffer may be set to entry
+	// Buffer is a reusable buffer provided to the formatter. It is set
+	// before formatting in the normal log path; when nil, formatters
+	// allocate their own.
 	Buffer *bytes.Buffer
 
-	// Contains the context set by the user. Useful for hook processing etc.
+	// Context carries user-provided context for hooks and formatters.
 	Context context.Context
 
-	// err may contain a field formatting error
+	// err contains internal field-formatting errors.
 	err string
 }
 
+// NewEntry creates a new [Entry] associated with the provided Logger.
+// The logger must not be nil. Passing a nil logger results in a
+// panic when a logging method (e.g., [Entry.Info], [Entry.Error], etc.)
+// is called.
 func NewEntry(logger *Logger) *Entry {
 	return &Entry{
 		Logger: logger,
-		// Default is three fields, plus one optional.  Give a little extra room.
-		Data: make(Fields, 6),
+		// Reserve default predefined fields and a little extra room.
+		Data: make(Fields, defaultFields+3),
 	}
 }
 
+// Dup creates a copy of the entry for further modification.
+//
+// Data is cloned to avoid mutating the original entry. Other fields
+// (Logger, Time, Context, etc.) are copied by value.
 func (entry *Entry) Dup() *Entry {
-	data := make(Fields, len(entry.Data))
-	for k, v := range entry.Data {
-		data[k] = v
+	dup := entry.dup()
+	dup.Data = maps.Clone(entry.Data)
+	return dup
+}
+
+// dup copies the entry fields shared by derived entries except Data, which
+// callers must copy or initialize as appropriate for their use.
+func (entry *Entry) dup() *Entry {
+	return &Entry{
+		Logger:  entry.Logger,
+		Time:    entry.Time,
+		Caller:  entry.Caller,
+		Context: entry.Context,
+		err:     entry.err,
 	}
-	return &Entry{Logger: entry.Logger, Data: data, Time: entry.Time, Context: entry.Context, err: entry.err}
 }
 
-// Returns the bytes representation of this entry from the formatter.
+// Bytes returns the bytes representation of this entry from the formatter.
 func (entry *Entry) Bytes() ([]byte, error) {
-	return entry.Logger.Formatter.Format(entry)
+	// Snapshot the formatter under the lock to protect against concurrent
+	// SetFormatter calls, then release the lock before formatting.
+	// This avoids a data race and prevents a deadlock if Format() triggers
+	// reentrant logging (e.g., a field's MarshalJSON calls logrus).
+	//
+	// See:
+	//
+	// - https://github.com/sirupsen/logrus/issues/1440
+	// - https://github.com/sirupsen/logrus/issues/1448
+	entry.Logger.mu.Lock()
+	formatter := entry.Logger.Formatter
+	entry.Logger.mu.Unlock()
+
+	return formatter.Format(entry)
 }
 
-// Returns the string representation from the reader and ultimately the
+// String returns the string representation from the reader and ultimately the
 // formatter.
 func (entry *Entry) String() (string, error) {
 	serialized, err := entry.Bytes()
@@ -102,65 +156,69 @@ func (entry *Entry) String() (string, error) {
 	return str, nil
 }
 
-// Add an error as single field (using the key defined in ErrorKey) to the Entry.
+// WithError adds an error as single field (using the key defined in [ErrorKey])
+// to the Entry.
 func (entry *Entry) WithError(err error) *Entry {
 	return entry.WithField(ErrorKey, err)
 }
 
-// Add a context to the Entry.
+// WithContext adds a context to the Entry.
 func (entry *Entry) WithContext(ctx context.Context) *Entry {
-	dataCopy := make(Fields, len(entry.Data))
-	for k, v := range entry.Data {
-		dataCopy[k] = v
-	}
-	return &Entry{Logger: entry.Logger, Data: dataCopy, Time: entry.Time, err: entry.err, Context: ctx}
+	dup := entry.dup()
+	dup.Data = maps.Clone(entry.Data)
+	dup.Context = ctx
+	return dup
 }
 
-// Add a single field to the Entry.
-func (entry *Entry) WithField(key string, value interface{}) *Entry {
-	return entry.WithFields(Fields{key: value})
+// WithField adds a single field to the Entry.
+func (entry *Entry) WithField(key string, value any) *Entry {
+	dup := entry.dup()
+	dup.Data = maps.Clone(entry.Data)
+	dup.addField(key, value)
+	return dup
 }
 
-// Add a map of fields to the Entry.
+// WithFields adds a map of fields to the Entry.
 func (entry *Entry) WithFields(fields Fields) *Entry {
-	data := make(Fields, len(entry.Data)+len(fields))
-	for k, v := range entry.Data {
-		data[k] = v
+	dup := entry.dup()
+	dup.Data = make(Fields, len(entry.Data)+len(fields))
+	maps.Copy(dup.Data, entry.Data)
+
+	for key, value := range fields {
+		dup.addField(key, value)
 	}
-	fieldErr := entry.err
-	for k, v := range fields {
-		isErrField := false
-		if t := reflect.TypeOf(v); t != nil {
-			switch {
-			case t.Kind() == reflect.Func, t.Kind() == reflect.Ptr && t.Elem().Kind() == reflect.Func:
-				isErrField = true
-			}
-		}
-		if isErrField {
-			tmp := fmt.Sprintf("can not add field %q", k)
-			if fieldErr != "" {
-				fieldErr = entry.err + ", " + tmp
-			} else {
-				fieldErr = tmp
-			}
-		} else {
-			data[k] = v
-		}
-	}
-	return &Entry{Logger: entry.Logger, Data: data, Time: entry.Time, err: fieldErr, Context: entry.Context}
+	return dup
 }
 
-// Overrides the time of the Entry.
+// WithTime overrides the time of the Entry.
 func (entry *Entry) WithTime(t time.Time) *Entry {
-	dataCopy := make(Fields, len(entry.Data))
-	for k, v := range entry.Data {
-		dataCopy[k] = v
+	dup := entry.dup()
+	dup.Data = maps.Clone(entry.Data)
+	dup.Time = t
+	return dup
+}
+
+func (entry *Entry) addField(key string, value any) {
+	if _, ok := value.(error); !ok {
+		t := reflect.TypeOf(value)
+		if t != nil && (t.Kind() == reflect.Func || t.Kind() == reflect.Pointer && t.Elem().Kind() == reflect.Func) {
+			if entry.err != "" {
+				entry.err += ", skipping unsupported field " + strconv.Quote(key)
+			} else {
+				entry.err = "skipping unsupported field " + strconv.Quote(key)
+			}
+			return
+		}
 	}
-	return &Entry{Logger: entry.Logger, Data: dataCopy, Time: t, err: entry.err, Context: entry.Context}
+
+	if entry.Data == nil {
+		entry.Data = make(Fields, 1)
+	}
+	entry.Data[key] = value
 }
 
 // getPackageName reduces a fully qualified function name to the package name
-// There really ought to be to be a better way...
+// There really ought to be a better way...
 func getPackageName(f string) string {
 	for {
 		lastPeriod := strings.LastIndex(f, ".")
@@ -183,7 +241,7 @@ func getCaller() *runtime.Frame {
 		_ = runtime.Callers(0, pcs)
 
 		// dynamic get the package name and the minimum caller depth
-		for i := 0; i < maximumCallerDepth; i++ {
+		for i := range maximumCallerDepth {
 			funcName := runtime.FuncForPC(pcs[i]).Name()
 			if strings.Contains(funcName, "getCaller") {
 				logrusPackage = getPackageName(funcName)
@@ -204,7 +262,7 @@ func getCaller() *runtime.Frame {
 
 		// If the caller isn't part of this package, we're done
 		if pkg != logrusPackage {
-			return &f //nolint:scopelint
+			return &f
 		}
 	}
 
@@ -212,16 +270,47 @@ func getCaller() *runtime.Frame {
 	return nil
 }
 
-func (entry Entry) HasCaller() (has bool) {
-	return entry.Logger != nil &&
-		entry.Logger.ReportCaller &&
-		entry.Caller != nil
+// HasCaller reports whether this Entry contains caller information.
+//
+// Caller may be set explicitly, or populated at log time when
+// [Logger.ReportCaller] is enabled.
+//
+// Deprecated: use [Entry.Caller] != nil instead.
+//
+//go:fix inline
+func (entry Entry) HasCaller() bool {
+	return entry.Caller != nil
 }
 
-func (entry *Entry) log(level Level, msg string) {
-	var buffer *bytes.Buffer
+func (entry *Entry) logArgs(level Level, panicAfter bool, args ...any) {
+	entry.log(level, panicAfter, sprint(args...))
+}
 
-	newEntry := entry.Dup()
+func (entry *Entry) logf(level Level, panicAfter bool, format string, args ...any) {
+	entry.log(level, panicAfter, fmt.Sprintf(format, args...))
+}
+
+// logln uses Sprintln for multiple arguments to preserve Println-style
+// spacing between args, then trims the trailing newline.
+func (entry *Entry) logln(level Level, panicAfter bool, args ...any) {
+	if len(args) <= 1 {
+		entry.log(level, panicAfter, sprint(args...))
+		return
+	}
+	msg := fmt.Sprintln(args...)
+	msg = msg[:len(msg)-1] // Trim the newline added by Sprintln; logging adds its own.
+	entry.log(level, panicAfter, msg)
+}
+
+// log writes msg at level. If panicAfter is true, it panics with the fully
+// populated entry after hooks and output have completed.
+//
+// The explicit flag keeps panic behavior limited to Panic, Panicf, and
+// Panicln while avoiding a return value used only as the panic value.
+// See #1283 and commits f96066e and 5f8c666.
+func (entry *Entry) log(level Level, panicAfter bool, msg string) {
+	newEntry := entry.dup()
+	newEntry.Data = maps.Clone(entry.Data)
 
 	if newEntry.Time.IsZero() {
 		newEntry.Time = time.Now()
@@ -230,17 +319,24 @@ func (entry *Entry) log(level Level, msg string) {
 	newEntry.Level = level
 	newEntry.Message = msg
 
-	newEntry.Logger.mu.Lock()
-	reportCaller := newEntry.Logger.ReportCaller
+	logger := newEntry.Logger
+	logger.mu.Lock()
+	reportCaller := logger.ReportCaller
 	bufPool := newEntry.getBufferPool()
-	newEntry.Logger.mu.Unlock()
+	logger.mu.Unlock()
 
-	if reportCaller {
+	// Preserve explicitly set caller information.
+	if reportCaller && newEntry.Caller == nil {
 		newEntry.Caller = getCaller()
 	}
 
-	newEntry.fireHooks()
-	buffer = bufPool.Get()
+	// Select hooks based on the level for this log call. Hooks receive the
+	// Entry and may mutate it, but that does not affect which hooks are
+	// fired for this event.
+	hooks := logger.hooksForLevel(level)
+	newEntry.fireHooks(hooks)
+
+	buffer := bufPool.Get()
 	defer func() {
 		newEntry.Buffer = nil
 		buffer.Reset()
@@ -248,15 +344,12 @@ func (entry *Entry) log(level Level, msg string) {
 	}()
 	buffer.Reset()
 	newEntry.Buffer = buffer
-
 	newEntry.write()
-
 	newEntry.Buffer = nil
 
-	// To avoid Entry#log() returning a value that only would make sense for
-	// panic() to use in Entry#Panic(), we avoid the allocation by checking
-	// directly here.
-	if level <= PanicLevel {
+	// Panic here so the panic value contains the fully populated entry without
+	// requiring log to return it to the caller.
+	if panicAfter {
 		panic(newEntry)
 	}
 }
@@ -268,175 +361,207 @@ func (entry *Entry) getBufferPool() (pool BufferPool) {
 	return bufferPool
 }
 
-func (entry *Entry) fireHooks() {
-	var tmpHooks LevelHooks
-	entry.Logger.mu.Lock()
-	tmpHooks = make(LevelHooks, len(entry.Logger.Hooks))
-	for k, v := range entry.Logger.Hooks {
-		tmpHooks[k] = v
-	}
-	entry.Logger.mu.Unlock()
-
-	err := tmpHooks.Fire(entry.Level, entry)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
+func (entry *Entry) fireHooks(hooks []Hook) {
+	for _, hook := range hooks {
+		if err := hook.Fire(entry); err != nil {
+			_, _ = fmt.Fprintln(os.Stderr, "Failed to fire hook:", err)
+			return
+		}
 	}
 }
 
 func (entry *Entry) write() {
+	// Snapshot the formatter under the lock to protect against concurrent
+	// SetFormatter calls, then release the lock before formatting.
+	// This avoids a deadlock when Format() triggers reentrant logging (e.g.,
+	// a field's MarshalJSON calls logrus). See #1448, #1440.
 	entry.Logger.mu.Lock()
-	defer entry.Logger.mu.Unlock()
-	serialized, err := entry.Logger.Formatter.Format(entry)
+	formatter := entry.Logger.Formatter
+	entry.Logger.mu.Unlock()
+
+	serialized, err := formatter.Format(entry)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
+		_, _ = fmt.Fprintln(os.Stderr, "Failed to format entry:", err)
 		return
 	}
+
+	// Re-acquire the lock to serialize writes to the underlying io.Writer.
+	entry.Logger.mu.Lock()
+	defer entry.Logger.mu.Unlock()
 	if _, err := entry.Logger.Out.Write(serialized); err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
+		_, _ = fmt.Fprintln(os.Stderr, "Failed to write to log:", err)
 	}
 }
 
-// Log will log a message at the level given as parameter.
-// Warning: using Log at Panic or Fatal level will not respectively Panic nor Exit.
-// For this behaviour Entry.Panic or Entry.Fatal should be used instead.
-func (entry *Entry) Log(level Level, args ...interface{}) {
+// Log logs a message at the specified level.
+//
+// Using Log with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. Log treats the level as logging severity only;
+// use [Entry.Panic] or [Entry.Fatal] when those side effects are desired.
+func (entry *Entry) Log(level Level, args ...any) {
+	const panicAfter = false
 	if entry.Logger.IsLevelEnabled(level) {
-		entry.log(level, fmt.Sprint(args...))
+		entry.logArgs(level, panicAfter, args...)
 	}
 }
 
-func (entry *Entry) Trace(args ...interface{}) {
+func (entry *Entry) Trace(args ...any) {
 	entry.Log(TraceLevel, args...)
 }
 
-func (entry *Entry) Debug(args ...interface{}) {
+func (entry *Entry) Debug(args ...any) {
 	entry.Log(DebugLevel, args...)
 }
 
-func (entry *Entry) Print(args ...interface{}) {
+func (entry *Entry) Print(args ...any) {
 	entry.Info(args...)
 }
 
-func (entry *Entry) Info(args ...interface{}) {
+func (entry *Entry) Info(args ...any) {
 	entry.Log(InfoLevel, args...)
 }
 
-func (entry *Entry) Warn(args ...interface{}) {
+func (entry *Entry) Warn(args ...any) {
 	entry.Log(WarnLevel, args...)
 }
 
-func (entry *Entry) Warning(args ...interface{}) {
+func (entry *Entry) Warning(args ...any) {
 	entry.Warn(args...)
 }
 
-func (entry *Entry) Error(args ...interface{}) {
+func (entry *Entry) Error(args ...any) {
 	entry.Log(ErrorLevel, args...)
 }
 
-func (entry *Entry) Fatal(args ...interface{}) {
+func (entry *Entry) Fatal(args ...any) {
 	entry.Log(FatalLevel, args...)
 	entry.Logger.Exit(1)
 }
 
-func (entry *Entry) Panic(args ...interface{}) {
-	entry.Log(PanicLevel, args...)
+func (entry *Entry) Panic(args ...any) {
+	const panicAfter = true
+	if entry.Logger.IsLevelEnabled(PanicLevel) {
+		entry.logArgs(PanicLevel, panicAfter, args...)
+	}
 }
 
 // Entry Printf family functions
 
-func (entry *Entry) Logf(level Level, format string, args ...interface{}) {
+// Logf logs a formatted message at the specified level.
+//
+// Using Logf with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. Logf treats the level as logging severity only;
+// use [Entry.Panicf] or [Entry.Fatalf] when those side effects are desired.
+func (entry *Entry) Logf(level Level, format string, args ...any) {
+	const panicAfter = false
 	if entry.Logger.IsLevelEnabled(level) {
-		entry.Log(level, fmt.Sprintf(format, args...))
+		entry.logf(level, panicAfter, format, args...)
 	}
 }
 
-func (entry *Entry) Tracef(format string, args ...interface{}) {
+func (entry *Entry) Tracef(format string, args ...any) {
 	entry.Logf(TraceLevel, format, args...)
 }
 
-func (entry *Entry) Debugf(format string, args ...interface{}) {
+func (entry *Entry) Debugf(format string, args ...any) {
 	entry.Logf(DebugLevel, format, args...)
 }
 
-func (entry *Entry) Infof(format string, args ...interface{}) {
+func (entry *Entry) Infof(format string, args ...any) {
 	entry.Logf(InfoLevel, format, args...)
 }
 
-func (entry *Entry) Printf(format string, args ...interface{}) {
+func (entry *Entry) Printf(format string, args ...any) {
 	entry.Infof(format, args...)
 }
 
-func (entry *Entry) Warnf(format string, args ...interface{}) {
+func (entry *Entry) Warnf(format string, args ...any) {
 	entry.Logf(WarnLevel, format, args...)
 }
 
-func (entry *Entry) Warningf(format string, args ...interface{}) {
+func (entry *Entry) Warningf(format string, args ...any) {
 	entry.Warnf(format, args...)
 }
 
-func (entry *Entry) Errorf(format string, args ...interface{}) {
+func (entry *Entry) Errorf(format string, args ...any) {
 	entry.Logf(ErrorLevel, format, args...)
 }
 
-func (entry *Entry) Fatalf(format string, args ...interface{}) {
+func (entry *Entry) Fatalf(format string, args ...any) {
 	entry.Logf(FatalLevel, format, args...)
 	entry.Logger.Exit(1)
 }
 
-func (entry *Entry) Panicf(format string, args ...interface{}) {
-	entry.Logf(PanicLevel, format, args...)
+func (entry *Entry) Panicf(format string, args ...any) {
+	const panicAfter = true
+	if entry.Logger.IsLevelEnabled(PanicLevel) {
+		entry.logf(PanicLevel, panicAfter, format, args...)
+	}
 }
 
 // Entry Println family functions
 
-func (entry *Entry) Logln(level Level, args ...interface{}) {
+// Logln logs a message at the specified level with Println-style spacing.
+//
+// Using Logln with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. Logln treats the level as logging severity only;
+// use [Entry.Panicln] or [Entry.Fatalln] when those side effects are desired.
+func (entry *Entry) Logln(level Level, args ...any) {
+	const panicAfter = false
 	if entry.Logger.IsLevelEnabled(level) {
-		entry.Log(level, entry.sprintlnn(args...))
+		entry.logln(level, panicAfter, args...)
 	}
 }
 
-func (entry *Entry) Traceln(args ...interface{}) {
+func (entry *Entry) Traceln(args ...any) {
 	entry.Logln(TraceLevel, args...)
 }
 
-func (entry *Entry) Debugln(args ...interface{}) {
+func (entry *Entry) Debugln(args ...any) {
 	entry.Logln(DebugLevel, args...)
 }
 
-func (entry *Entry) Infoln(args ...interface{}) {
+func (entry *Entry) Infoln(args ...any) {
 	entry.Logln(InfoLevel, args...)
 }
 
-func (entry *Entry) Println(args ...interface{}) {
+func (entry *Entry) Println(args ...any) {
 	entry.Infoln(args...)
 }
 
-func (entry *Entry) Warnln(args ...interface{}) {
+func (entry *Entry) Warnln(args ...any) {
 	entry.Logln(WarnLevel, args...)
 }
 
-func (entry *Entry) Warningln(args ...interface{}) {
+func (entry *Entry) Warningln(args ...any) {
 	entry.Warnln(args...)
 }
 
-func (entry *Entry) Errorln(args ...interface{}) {
+func (entry *Entry) Errorln(args ...any) {
 	entry.Logln(ErrorLevel, args...)
 }
 
-func (entry *Entry) Fatalln(args ...interface{}) {
+func (entry *Entry) Fatalln(args ...any) {
 	entry.Logln(FatalLevel, args...)
 	entry.Logger.Exit(1)
 }
 
-func (entry *Entry) Panicln(args ...interface{}) {
-	entry.Logln(PanicLevel, args...)
+func (entry *Entry) Panicln(args ...any) {
+	const panicAfter = true
+	if entry.Logger.IsLevelEnabled(PanicLevel) {
+		entry.logln(PanicLevel, panicAfter, args...)
+	}
 }
 
-// Sprintlnn => Sprint no newline. This is to get the behavior of how
-// fmt.Sprintln where spaces are always added between operands, regardless of
-// their type. Instead of vendoring the Sprintln implementation to spare a
-// string allocation, we do the simplest thing.
-func (entry *Entry) sprintlnn(args ...interface{}) string {
-	msg := fmt.Sprintln(args...)
-	return msg[:len(msg)-1]
+// sprint is fmt.Sprint with fast paths for zero or one string argument.
+func sprint(args ...any) string {
+	switch len(args) {
+	case 0:
+		return ""
+	case 1:
+		if msg, ok := args[0].(string); ok {
+			return msg
+		}
+	}
+	return fmt.Sprint(args...)
 }
diff --git a/vendor/github.com/sirupsen/logrus/exported.go b/vendor/github.com/sirupsen/logrus/exported.go
index 017c30ce6..8b261c124 100644
--- a/vendor/github.com/sirupsen/logrus/exported.go
+++ b/vendor/github.com/sirupsen/logrus/exported.go
@@ -6,11 +6,12 @@ import (
 	"time"
 )
 
-var (
-	// std is the name of the standard logger in stdlib `log`
-	std = New()
-)
+// std is the package-level standard logger, similar to the default logger
+// in the stdlib [log] package.
+var std = New()
 
+// StandardLogger returns the package-level standard logger used by
+// the top-level logging functions.
 func StandardLogger() *Logger {
 	return std
 }
@@ -41,7 +42,7 @@ func GetLevel() Level {
 	return std.GetLevel()
 }
 
-// IsLevelEnabled checks if the log level of the standard logger is greater than the level param
+// IsLevelEnabled checks if logging for the given level is enabled for the standard logger.
 func IsLevelEnabled(level Level) bool {
 	return std.IsLevelEnabled(level)
 }
@@ -51,9 +52,10 @@ func AddHook(hook Hook) {
 	std.AddHook(hook)
 }
 
-// WithError creates an entry from the standard logger and adds an error to it, using the value defined in ErrorKey as key.
+// WithError creates an entry from the standard logger and adds an error to it,
+// using the value defined in [ErrorKey] as key.
 func WithError(err error) *Entry {
-	return std.WithField(ErrorKey, err)
+	return std.WithError(err)
 }
 
 // WithContext creates an entry from the standard logger and adds a context to it.
@@ -61,210 +63,203 @@ func WithContext(ctx context.Context) *Entry {
 	return std.WithContext(ctx)
 }
 
-// WithField creates an entry from the standard logger and adds a field to
-// it. If you want multiple fields, use `WithFields`.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithField(key string, value interface{}) *Entry {
+// WithField creates an entry from the standard logger and adds a single field.
+// For multiple fields, prefer [WithFields] over chaining WithField calls.
+func WithField(key string, value any) *Entry {
 	return std.WithField(key, value)
 }
 
-// WithFields creates an entry from the standard logger and adds multiple
-// fields to it. This is simply a helper for `WithField`, invoking it
-// once for each field.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
+// WithFields creates an entry from the standard logger and adds the fields to it.
 func WithFields(fields Fields) *Entry {
 	return std.WithFields(fields)
 }
 
-// WithTime creates an entry from the standard logger and overrides the time of
-// logs generated with it.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
+// WithTime creates an entry from the standard logger and overrides the time
+// used for logs generated with it.
 func WithTime(t time.Time) *Entry {
 	return std.WithTime(t)
 }
 
-// Trace logs a message at level Trace on the standard logger.
-func Trace(args ...interface{}) {
+// Trace logs a message at level [TraceLevel] on the standard logger.
+func Trace(args ...any) {
 	std.Trace(args...)
 }
 
-// Debug logs a message at level Debug on the standard logger.
-func Debug(args ...interface{}) {
+// Debug logs a message at level [DebugLevel] on the standard logger.
+func Debug(args ...any) {
 	std.Debug(args...)
 }
 
-// Print logs a message at level Info on the standard logger.
-func Print(args ...interface{}) {
+// Print logs a message at level [InfoLevel] on the standard logger.
+func Print(args ...any) {
 	std.Print(args...)
 }
 
-// Info logs a message at level Info on the standard logger.
-func Info(args ...interface{}) {
+// Info logs a message at level [InfoLevel] on the standard logger.
+func Info(args ...any) {
 	std.Info(args...)
 }
 
-// Warn logs a message at level Warn on the standard logger.
-func Warn(args ...interface{}) {
+// Warn logs a message at level [WarnLevel] on the standard logger.
+func Warn(args ...any) {
 	std.Warn(args...)
 }
 
-// Warning logs a message at level Warn on the standard logger.
-func Warning(args ...interface{}) {
+// Warning logs a message at level [WarnLevel] on the standard logger.
+func Warning(args ...any) {
 	std.Warning(args...)
 }
 
-// Error logs a message at level Error on the standard logger.
-func Error(args ...interface{}) {
+// Error logs a message at level [ErrorLevel] on the standard logger.
+func Error(args ...any) {
 	std.Error(args...)
 }
 
-// Panic logs a message at level Panic on the standard logger.
-func Panic(args ...interface{}) {
+// Panic logs a message at level [PanicLevel] on the standard logger.
+func Panic(args ...any) {
 	std.Panic(args...)
 }
 
-// Fatal logs a message at level Fatal on the standard logger then the process will exit with status set to 1.
-func Fatal(args ...interface{}) {
+// Fatal logs a message at level [FatalLevel] on the standard logger,
+// then exits the process with status 1.
+func Fatal(args ...any) {
 	std.Fatal(args...)
 }
 
-// TraceFn logs a message from a func at level Trace on the standard logger.
+// TraceFn logs a message from a func at level [TraceLevel] on the standard logger.
 func TraceFn(fn LogFunction) {
 	std.TraceFn(fn)
 }
 
-// DebugFn logs a message from a func at level Debug on the standard logger.
+// DebugFn logs a message from a func at level [DebugLevel] on the standard logger.
 func DebugFn(fn LogFunction) {
 	std.DebugFn(fn)
 }
 
-// PrintFn logs a message from a func at level Info on the standard logger.
+// PrintFn logs a message from a func at level [InfoLevel] on the standard logger.
 func PrintFn(fn LogFunction) {
 	std.PrintFn(fn)
 }
 
-// InfoFn logs a message from a func at level Info on the standard logger.
+// InfoFn logs a message from a func at level [InfoLevel] on the standard logger.
 func InfoFn(fn LogFunction) {
 	std.InfoFn(fn)
 }
 
-// WarnFn logs a message from a func at level Warn on the standard logger.
+// WarnFn logs a message from a func at level [WarnLevel] on the standard logger.
 func WarnFn(fn LogFunction) {
 	std.WarnFn(fn)
 }
 
-// WarningFn logs a message from a func at level Warn on the standard logger.
+// WarningFn logs a message from a func at level [WarnLevel] on the standard logger.
 func WarningFn(fn LogFunction) {
 	std.WarningFn(fn)
 }
 
-// ErrorFn logs a message from a func at level Error on the standard logger.
+// ErrorFn logs a message from a func at level [ErrorLevel] on the standard logger.
 func ErrorFn(fn LogFunction) {
 	std.ErrorFn(fn)
 }
 
-// PanicFn logs a message from a func at level Panic on the standard logger.
+// PanicFn logs a message from a func at level [PanicLevel] on the standard logger.
 func PanicFn(fn LogFunction) {
 	std.PanicFn(fn)
 }
 
-// FatalFn logs a message from a func at level Fatal on the standard logger then the process will exit with status set to 1.
+// FatalFn logs a message from a func at level [FatalLevel] on the standard logger,
+// then exits the process with status 1.
 func FatalFn(fn LogFunction) {
 	std.FatalFn(fn)
 }
 
-// Tracef logs a message at level Trace on the standard logger.
-func Tracef(format string, args ...interface{}) {
+// Tracef logs a message at level [TraceLevel] on the standard logger.
+func Tracef(format string, args ...any) {
 	std.Tracef(format, args...)
 }
 
-// Debugf logs a message at level Debug on the standard logger.
-func Debugf(format string, args ...interface{}) {
+// Debugf logs a message at level [DebugLevel] on the standard logger.
+func Debugf(format string, args ...any) {
 	std.Debugf(format, args...)
 }
 
-// Printf logs a message at level Info on the standard logger.
-func Printf(format string, args ...interface{}) {
+// Printf logs a message at level [InfoLevel] on the standard logger.
+func Printf(format string, args ...any) {
 	std.Printf(format, args...)
 }
 
-// Infof logs a message at level Info on the standard logger.
-func Infof(format string, args ...interface{}) {
+// Infof logs a message at level [InfoLevel] on the standard logger.
+func Infof(format string, args ...any) {
 	std.Infof(format, args...)
 }
 
-// Warnf logs a message at level Warn on the standard logger.
-func Warnf(format string, args ...interface{}) {
+// Warnf logs a message at level [WarnLevel] on the standard logger.
+func Warnf(format string, args ...any) {
 	std.Warnf(format, args...)
 }
 
-// Warningf logs a message at level Warn on the standard logger.
-func Warningf(format string, args ...interface{}) {
+// Warningf logs a message at level [WarnLevel] on the standard logger.
+func Warningf(format string, args ...any) {
 	std.Warningf(format, args...)
 }
 
-// Errorf logs a message at level Error on the standard logger.
-func Errorf(format string, args ...interface{}) {
+// Errorf logs a message at level [ErrorLevel] on the standard logger.
+func Errorf(format string, args ...any) {
 	std.Errorf(format, args...)
 }
 
-// Panicf logs a message at level Panic on the standard logger.
-func Panicf(format string, args ...interface{}) {
+// Panicf logs a message at level [PanicLevel] on the standard logger.
+func Panicf(format string, args ...any) {
 	std.Panicf(format, args...)
 }
 
-// Fatalf logs a message at level Fatal on the standard logger then the process will exit with status set to 1.
-func Fatalf(format string, args ...interface{}) {
+// Fatalf logs a message at level [FatalLevel] on the standard logger,
+// then exits the process with status 1.
+func Fatalf(format string, args ...any) {
 	std.Fatalf(format, args...)
 }
 
-// Traceln logs a message at level Trace on the standard logger.
-func Traceln(args ...interface{}) {
+// Traceln logs a message at level [TraceLevel] on the standard logger.
+func Traceln(args ...any) {
 	std.Traceln(args...)
 }
 
-// Debugln logs a message at level Debug on the standard logger.
-func Debugln(args ...interface{}) {
+// Debugln logs a message at level [DebugLevel] on the standard logger.
+func Debugln(args ...any) {
 	std.Debugln(args...)
 }
 
-// Println logs a message at level Info on the standard logger.
-func Println(args ...interface{}) {
+// Println logs a message at level [InfoLevel] on the standard logger.
+func Println(args ...any) {
 	std.Println(args...)
 }
 
-// Infoln logs a message at level Info on the standard logger.
-func Infoln(args ...interface{}) {
+// Infoln logs a message at level [InfoLevel] on the standard logger.
+func Infoln(args ...any) {
 	std.Infoln(args...)
 }
 
-// Warnln logs a message at level Warn on the standard logger.
-func Warnln(args ...interface{}) {
+// Warnln logs a message at level [WarnLevel] on the standard logger.
+func Warnln(args ...any) {
 	std.Warnln(args...)
 }
 
-// Warningln logs a message at level Warn on the standard logger.
-func Warningln(args ...interface{}) {
+// Warningln logs a message at level [WarnLevel] on the standard logger.
+func Warningln(args ...any) {
 	std.Warningln(args...)
 }
 
-// Errorln logs a message at level Error on the standard logger.
-func Errorln(args ...interface{}) {
+// Errorln logs a message at level [ErrorLevel] on the standard logger.
+func Errorln(args ...any) {
 	std.Errorln(args...)
 }
 
-// Panicln logs a message at level Panic on the standard logger.
-func Panicln(args ...interface{}) {
+// Panicln logs a message at level [PanicLevel] on the standard logger.
+func Panicln(args ...any) {
 	std.Panicln(args...)
 }
 
-// Fatalln logs a message at level Fatal on the standard logger then the process will exit with status set to 1.
-func Fatalln(args ...interface{}) {
+// Fatalln logs a message at level [FatalLevel] on the standard logger,
+// then exits the process with status 1.
+func Fatalln(args ...any) {
 	std.Fatalln(args...)
 }
diff --git a/vendor/github.com/sirupsen/logrus/formatter.go b/vendor/github.com/sirupsen/logrus/formatter.go
index 408883773..16f2e0e0f 100644
--- a/vendor/github.com/sirupsen/logrus/formatter.go
+++ b/vendor/github.com/sirupsen/logrus/formatter.go
@@ -2,27 +2,40 @@ package logrus
 
 import "time"
 
-// Default key names for the default fields
 const (
+	// defaultTimestampFormat is the layout used to format entry timestamps
+	// when a formatter has not specified a custom TimestampFormat.
+	// It follows time.RFC3339 and is applied unless timestamps are disabled.
 	defaultTimestampFormat = time.RFC3339
-	FieldKeyMsg            = "msg"
-	FieldKeyLevel          = "level"
-	FieldKeyTime           = "time"
-	FieldKeyLogrusError    = "logrus_error"
-	FieldKeyFunc           = "func"
-	FieldKeyFile           = "file"
+
+	// defaultFields is the number of commonly included predefined log entry fields
+	// (msg, level, time). It is used as a capacity hint when constructing
+	// intermediate collections during formatting (for example, the fixed key list).
+	//
+	// It does not include the optional "logrus_error", "func", or "file" fields.
+	defaultFields = 3
 )
 
-// The Formatter interface is used to implement a custom Formatter. It takes an
-// `Entry`. It exposes all the fields, including the default ones:
+// Default key names for the default fields
+const (
+	FieldKeyMsg         = "msg"
+	FieldKeyLevel       = "level"
+	FieldKeyTime        = "time"
+	FieldKeyLogrusError = "logrus_error"
+	FieldKeyFunc        = "func"
+	FieldKeyFile        = "file"
+)
+
+// Formatter is implemented by types that format log entries. It receives an
+// [*Entry], which contains:
 //
-// * `entry.Data["msg"]`. The message passed from Info, Warn, Error ..
-// * `entry.Data["time"]`. The timestamp.
-// * `entry.Data["level"]. The level the entry was logged at.
+//   - entry.Message: the message passed to logging methods such as [Info], [Warn], [Error]
+//   - entry.Time: the timestamp
+//   - entry.Level: the log level
 //
-// Any additional fields added with `WithField` or `WithFields` are also in
-// `entry.Data`. Format is expected to return an array of bytes which are then
-// logged to `logger.Out`.
+// Additional fields added with [WithField] or [WithFields] are available in
+// [Entry.Data]. Format should return the formatted log entry as a byte slice,
+// which is written to [Logger.Out].
 type Formatter interface {
 	Format(*Entry) ([]byte, error)
 }
@@ -30,12 +43,12 @@ type Formatter interface {
 // This is to not silently overwrite `time`, `msg`, `func` and `level` fields when
 // dumping it. If this code wasn't there doing:
 //
-//  logrus.WithField("level", 1).Info("hello")
+//	logrus.WithField("level", 1).Info("hello")
 //
 // Would just silently drop the user provided level. Instead with this code
 // it'll logged as:
 //
-//  {"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
+//	{"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
 //
 // It's not exported because it's still using Data in an opinionated way. It's to
 // avoid code duplication between the two default formatters.
diff --git a/vendor/github.com/sirupsen/logrus/hooks.go b/vendor/github.com/sirupsen/logrus/hooks.go
index 3f151cdc3..9ab978a45 100644
--- a/vendor/github.com/sirupsen/logrus/hooks.go
+++ b/vendor/github.com/sirupsen/logrus/hooks.go
@@ -1,16 +1,16 @@
 package logrus
 
-// A hook to be fired when logging on the logging levels returned from
-// `Levels()` on your implementation of the interface. Note that this is not
+// Hook describes hooks to be fired when logging on the logging levels returned from
+// [Hook.Levels] on your implementation of the interface. Note that this is not
 // fired in a goroutine or a channel with workers, you should handle such
-// functionality yourself if your call is non-blocking and you don't wish for
+// functionality yourself if your call is non-blocking, and you don't wish for
 // the logging calls for levels returned from `Levels()` to block.
 type Hook interface {
 	Levels() []Level
 	Fire(*Entry) error
 }
 
-// Internal type for storing the hooks on a logger instance.
+// LevelHooks is an internal type for storing the hooks on a logger instance.
 type LevelHooks map[Level][]Hook
 
 // Add a hook to an instance of logger. This is called with
diff --git a/vendor/github.com/sirupsen/logrus/json_formatter.go b/vendor/github.com/sirupsen/logrus/json_formatter.go
index c96dc5636..fac7695e9 100644
--- a/vendor/github.com/sirupsen/logrus/json_formatter.go
+++ b/vendor/github.com/sirupsen/logrus/json_formatter.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"runtime"
+	"strconv"
 )
 
 type fieldKey string
@@ -20,7 +21,13 @@ func (f FieldMap) resolve(key fieldKey) string {
 	return string(key)
 }
 
-// JSONFormatter formats logs into parsable json
+// JSONFormatter formats logs into parsable JSON.
+//
+// Fields from [Entry.Data] are included in the JSON object together with the
+// standard fields derived from the entry. If a field conflicts with a standard
+// field, it is prefixed with "fields.". Standard field names can be customized
+// through FieldMap. When DataKey is set, fields from [Entry.Data] are nested
+// under that key instead.
 type JSONFormatter struct {
 	// TimestampFormat sets the format used for marshaling timestamps.
 	// The format to use is the same than for time.Format or time.Parse from the standard
@@ -61,7 +68,8 @@ type JSONFormatter struct {
 
 // Format renders a single log entry
 func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
-	data := make(Fields, len(entry.Data)+4)
+	caller := entry.Caller
+	data := make(Fields, len(entry.Data)+defaultFields)
 	for k, v := range entry.Data {
 		switch v := v.(type) {
 		case error:
@@ -73,13 +81,14 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 		}
 	}
 
-	if f.DataKey != "" {
-		newData := make(Fields, 4)
+	if f.DataKey != "" && len(entry.Data) > 0 {
+		newData := make(Fields, defaultFields+1)
 		newData[f.DataKey] = data
 		data = newData
 	}
 
-	prefixFieldClashes(data, f.FieldMap, entry.HasCaller())
+	hasCaller := caller != nil
+	prefixFieldClashes(data, f.FieldMap, hasCaller)
 
 	timestampFormat := f.TimestampFormat
 	if timestampFormat == "" {
@@ -94,11 +103,13 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 	}
 	data[f.FieldMap.resolve(FieldKeyMsg)] = entry.Message
 	data[f.FieldMap.resolve(FieldKeyLevel)] = entry.Level.String()
-	if entry.HasCaller() {
-		funcVal := entry.Caller.Function
-		fileVal := fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+	if caller != nil {
+		var funcVal, fileVal string
 		if f.CallerPrettyfier != nil {
-			funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+			funcVal, fileVal = f.CallerPrettyfier(caller)
+		} else {
+			funcVal = caller.Function
+			fileVal = caller.File + ":" + strconv.FormatInt(int64(caller.Line), 10)
 		}
 		if funcVal != "" {
 			data[f.FieldMap.resolve(FieldKeyFunc)] = funcVal
@@ -108,11 +119,9 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 		}
 	}
 
-	var b *bytes.Buffer
-	if entry.Buffer != nil {
-		b = entry.Buffer
-	} else {
-		b = &bytes.Buffer{}
+	b := entry.Buffer
+	if b == nil {
+		b = new(bytes.Buffer)
 	}
 
 	encoder := json.NewEncoder(b)
diff --git a/vendor/github.com/sirupsen/logrus/level.go b/vendor/github.com/sirupsen/logrus/level.go
new file mode 100644
index 000000000..7bd4255d3
--- /dev/null
+++ b/vendor/github.com/sirupsen/logrus/level.go
@@ -0,0 +1,101 @@
+package logrus
+
+import (
+	"strings"
+	"sync"
+)
+
+const (
+	ansiReset    = "\x1b[0m"    // reset attributes
+	ansiRed      = "\x1b[31m"   // red
+	ansiYellow   = "\x1b[33m"   // yellow
+	ansiCyan     = "\x1b[36m"   // cyan
+	ansiDimCyan  = "\x1b[2;36m" // dim cyan
+	ansiDimWhite = "\x1b[2;37m" // dim white (light gray)
+)
+
+type lvlPrefix struct {
+	full      string
+	truncated string
+	padded    string
+}
+
+func colorize(level Level, s string) string {
+	color := ansiCyan
+	switch level {
+	case TraceLevel:
+		color = ansiDimWhite
+	case DebugLevel:
+		color = ansiDimCyan
+	case WarnLevel:
+		color = ansiYellow
+	case ErrorLevel, FatalLevel, PanicLevel:
+		color = ansiRed
+	case InfoLevel:
+		color = ansiCyan
+	}
+	return color + s + ansiReset
+}
+
+func formatLevel(level Level, disableTrunc, pad bool, maxLen int) string {
+	upper := strings.ToUpper(level.String())
+
+	if pad && maxLen > len(upper) {
+		upper += strings.Repeat(" ", maxLen-len(upper))
+	}
+
+	if !pad && !disableTrunc && len(upper) > 4 {
+		upper = upper[:4]
+	}
+
+	return colorize(level, upper)
+}
+
+var levelPrefixOnce = sync.OnceValues(func() (map[Level]lvlPrefix, lvlPrefix) {
+	var maxLevel Level
+	maxLen := 0
+	for _, lvl := range AllLevels {
+		if lvl > maxLevel {
+			maxLevel = lvl
+		}
+		if l := len(lvl.String()); l > maxLen {
+			maxLen = l
+		}
+	}
+
+	prefix := make(map[Level]lvlPrefix, len(AllLevels))
+	for _, lvl := range AllLevels {
+		prefix[lvl] = lvlPrefix{
+			full:      formatLevel(lvl, true, false, maxLen),
+			truncated: formatLevel(lvl, false, false, maxLen),
+			padded:    formatLevel(lvl, true, true, maxLen),
+		}
+	}
+
+	unknownLevel := maxLevel + 1
+	unknown := lvlPrefix{
+		full:      formatLevel(unknownLevel, true, false, maxLen),
+		truncated: formatLevel(unknownLevel, false, false, maxLen),
+		padded:    formatLevel(unknownLevel, true, true, maxLen),
+	}
+
+	return prefix, unknown
+})
+
+func levelPrefix(level Level, disableTrunc, pad bool) string {
+	prefix, unknown := levelPrefixOnce()
+
+	p, ok := prefix[level]
+	if !ok {
+		p = unknown
+	}
+
+	switch {
+	case pad:
+		return p.padded
+	case !disableTrunc:
+		return p.truncated
+	default:
+		return p.full
+	}
+}
diff --git a/vendor/github.com/sirupsen/logrus/logger.go b/vendor/github.com/sirupsen/logrus/logger.go
index 5ff0aef6d..17a46e6a6 100644
--- a/vendor/github.com/sirupsen/logrus/logger.go
+++ b/vendor/github.com/sirupsen/logrus/logger.go
@@ -12,17 +12,19 @@ import (
 // LogFunction For big messages, it can be more efficient to pass a function
 // and only call it if the log level is actually enables rather than
 // generating the log message and then checking if the level is enabled
-type LogFunction func() []interface{}
+type LogFunction func() []any
 
 type Logger struct {
 	// The logs are `io.Copy`'d to this in a mutex. It's common to set this to a
 	// file, or leave it default which is `os.Stderr`. You can also set this to
 	// something more adventurous, such as logging to Kafka.
 	Out io.Writer
+
 	// Hooks for the logger instance. These allow firing events based on logging
 	// levels and log entries. For example, to send errors to an error tracking
 	// service, log to StatsD or dump the core on fatal errors.
 	Hooks LevelHooks
+
 	// All log entries pass through the formatter before logged to Out. The
 	// included formatters are `TextFormatter` and `JSONFormatter` for which
 	// TextFormatter is the default. In development (when a TTY is attached) it
@@ -38,50 +40,57 @@ type Logger struct {
 	// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
 	// logged.
 	Level Level
+
 	// Used to sync writing to the log. Locking is enabled by Default
-	mu MutexWrap
+	mu mutexWrap
+
 	// Reusable empty entry
 	entryPool sync.Pool
+
 	// Function to exit the application, defaults to `os.Exit()`
-	ExitFunc exitFunc
+	ExitFunc func(int)
+
 	// The buffer pool used to format the log. If it is nil, the default global
 	// buffer pool will be used.
 	BufferPool BufferPool
 }
 
-type exitFunc func(int)
+// MutexWrap is the mutex implementation used by [Logger].
+//
+// Deprecated: MutexWrap is an implementation detail of Logger and should not be used directly.
+type MutexWrap = mutexWrap
 
-type MutexWrap struct {
+type mutexWrap struct {
 	lock     sync.Mutex
 	disabled bool
 }
 
-func (mw *MutexWrap) Lock() {
+func (mw *mutexWrap) Lock() {
 	if !mw.disabled {
 		mw.lock.Lock()
 	}
 }
 
-func (mw *MutexWrap) Unlock() {
+func (mw *mutexWrap) Unlock() {
 	if !mw.disabled {
 		mw.lock.Unlock()
 	}
 }
 
-func (mw *MutexWrap) Disable() {
+func (mw *mutexWrap) Disable() {
 	mw.disabled = true
 }
 
-// Creates a new logger. Configuration should be set by changing `Formatter`,
-// `Out` and `Hooks` directly on the default logger instance. You can also just
+// New Creates a new logger. Configuration should be set by changing [Formatter],
+// Out and Hooks directly on the default Logger instance. You can also just
 // instantiate your own:
 //
-//    var log = &logrus.Logger{
-//      Out: os.Stderr,
-//      Formatter: new(logrus.TextFormatter),
-//      Hooks: make(logrus.LevelHooks),
-//      Level: logrus.DebugLevel,
-//    }
+//	var log = &logrus.Logger{
+//	  Out:       os.Stderr,
+//	  Formatter: new(logrus.TextFormatter),
+//	  Hooks:     make(logrus.LevelHooks),
+//	  Level:     logrus.DebugLevel,
+//	}
 //
 // It's recommended to make this a global instance called `log`.
 func New() *Logger {
@@ -104,7 +113,7 @@ func (logger *Logger) newEntry() *Entry {
 }
 
 func (logger *Logger) releaseEntry(entry *Entry) {
-	entry.Data = map[string]interface{}{}
+	entry.Data = map[string]any{}
 	logger.entryPool.Put(entry)
 }
 
@@ -112,43 +121,48 @@ func (logger *Logger) releaseEntry(entry *Entry) {
 // Debug, Print, Info, Warn, Error, Fatal or Panic must be then applied to
 // this new returned entry.
 // If you want multiple fields, use `WithFields`.
-func (logger *Logger) WithField(key string, value interface{}) *Entry {
+func (logger *Logger) WithField(key string, value any) *Entry {
 	entry := logger.newEntry()
 	defer logger.releaseEntry(entry)
 	return entry.WithField(key, value)
 }
 
-// Adds a struct of fields to the log entry. All it does is call `WithField` for
-// each `Field`.
+// WithFields adds a struct of fields to the log entry. It calls [Entry.WithField]
+// for each Field.
 func (logger *Logger) WithFields(fields Fields) *Entry {
 	entry := logger.newEntry()
 	defer logger.releaseEntry(entry)
 	return entry.WithFields(fields)
 }
 
-// Add an error as single field to the log entry.  All it does is call
-// `WithError` for the given `error`.
+// WithError adds an error as single field to the log entry.  It calls
+// [Entry.WithError] for the given error.
 func (logger *Logger) WithError(err error) *Entry {
 	entry := logger.newEntry()
 	defer logger.releaseEntry(entry)
 	return entry.WithError(err)
 }
 
-// Add a context to the log entry.
+// WithContext add a context to the log entry.
 func (logger *Logger) WithContext(ctx context.Context) *Entry {
 	entry := logger.newEntry()
 	defer logger.releaseEntry(entry)
 	return entry.WithContext(ctx)
 }
 
-// Overrides the time of the log entry.
+// WithTime overrides the time of the log entry.
 func (logger *Logger) WithTime(t time.Time) *Entry {
 	entry := logger.newEntry()
 	defer logger.releaseEntry(entry)
 	return entry.WithTime(t)
 }
 
-func (logger *Logger) Logf(level Level, format string, args ...interface{}) {
+// Logf logs a formatted message at the specified level.
+//
+// Using Logf with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. Logf treats the level as logging severity only;
+// use [Logger.Panicf] or [Logger.Fatalf] when those side effects are desired.
+func (logger *Logger) Logf(level Level, format string, args ...any) {
 	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
 		entry.Logf(level, format, args...)
@@ -156,49 +170,55 @@ func (logger *Logger) Logf(level Level, format string, args ...interface{}) {
 	}
 }
 
-func (logger *Logger) Tracef(format string, args ...interface{}) {
+func (logger *Logger) Tracef(format string, args ...any) {
 	logger.Logf(TraceLevel, format, args...)
 }
 
-func (logger *Logger) Debugf(format string, args ...interface{}) {
+func (logger *Logger) Debugf(format string, args ...any) {
 	logger.Logf(DebugLevel, format, args...)
 }
 
-func (logger *Logger) Infof(format string, args ...interface{}) {
+func (logger *Logger) Infof(format string, args ...any) {
 	logger.Logf(InfoLevel, format, args...)
 }
 
-func (logger *Logger) Printf(format string, args ...interface{}) {
+func (logger *Logger) Printf(format string, args ...any) {
 	entry := logger.newEntry()
 	entry.Printf(format, args...)
 	logger.releaseEntry(entry)
 }
 
-func (logger *Logger) Warnf(format string, args ...interface{}) {
+func (logger *Logger) Warnf(format string, args ...any) {
 	logger.Logf(WarnLevel, format, args...)
 }
 
-func (logger *Logger) Warningf(format string, args ...interface{}) {
+func (logger *Logger) Warningf(format string, args ...any) {
 	logger.Warnf(format, args...)
 }
 
-func (logger *Logger) Errorf(format string, args ...interface{}) {
+func (logger *Logger) Errorf(format string, args ...any) {
 	logger.Logf(ErrorLevel, format, args...)
 }
 
-func (logger *Logger) Fatalf(format string, args ...interface{}) {
+func (logger *Logger) Fatalf(format string, args ...any) {
 	logger.Logf(FatalLevel, format, args...)
 	logger.Exit(1)
 }
 
-func (logger *Logger) Panicf(format string, args ...interface{}) {
-	logger.Logf(PanicLevel, format, args...)
+func (logger *Logger) Panicf(format string, args ...any) {
+	if logger.IsLevelEnabled(PanicLevel) {
+		entry := logger.newEntry()
+		defer logger.releaseEntry(entry)
+		entry.Panicf(format, args...)
+	}
 }
 
-// Log will log a message at the level given as parameter.
-// Warning: using Log at Panic or Fatal level will not respectively Panic nor Exit.
-// For this behaviour Logger.Panic or Logger.Fatal should be used instead.
-func (logger *Logger) Log(level Level, args ...interface{}) {
+// Log logs a message at the specified level.
+//
+// Using Log with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. Log treats the level as logging severity only;
+// use [Logger.Panic] or [Logger.Fatal] when those side effects are desired.
+func (logger *Logger) Log(level Level, args ...any) {
 	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
 		entry.Log(level, args...)
@@ -206,6 +226,11 @@ func (logger *Logger) Log(level Level, args ...interface{}) {
 	}
 }
 
+// LogFn logs a message returned by fn at the specified level.
+//
+// Using LogFn with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. LogFn treats the level as logging severity only;
+// use [Logger.PanicFn] or [Logger.FatalFn] when those side effects are desired.
 func (logger *Logger) LogFn(level Level, fn LogFunction) {
 	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
@@ -214,43 +239,47 @@ func (logger *Logger) LogFn(level Level, fn LogFunction) {
 	}
 }
 
-func (logger *Logger) Trace(args ...interface{}) {
+func (logger *Logger) Trace(args ...any) {
 	logger.Log(TraceLevel, args...)
 }
 
-func (logger *Logger) Debug(args ...interface{}) {
+func (logger *Logger) Debug(args ...any) {
 	logger.Log(DebugLevel, args...)
 }
 
-func (logger *Logger) Info(args ...interface{}) {
+func (logger *Logger) Info(args ...any) {
 	logger.Log(InfoLevel, args...)
 }
 
-func (logger *Logger) Print(args ...interface{}) {
+func (logger *Logger) Print(args ...any) {
 	entry := logger.newEntry()
 	entry.Print(args...)
 	logger.releaseEntry(entry)
 }
 
-func (logger *Logger) Warn(args ...interface{}) {
+func (logger *Logger) Warn(args ...any) {
 	logger.Log(WarnLevel, args...)
 }
 
-func (logger *Logger) Warning(args ...interface{}) {
+func (logger *Logger) Warning(args ...any) {
 	logger.Warn(args...)
 }
 
-func (logger *Logger) Error(args ...interface{}) {
+func (logger *Logger) Error(args ...any) {
 	logger.Log(ErrorLevel, args...)
 }
 
-func (logger *Logger) Fatal(args ...interface{}) {
+func (logger *Logger) Fatal(args ...any) {
 	logger.Log(FatalLevel, args...)
 	logger.Exit(1)
 }
 
-func (logger *Logger) Panic(args ...interface{}) {
-	logger.Log(PanicLevel, args...)
+func (logger *Logger) Panic(args ...any) {
+	if logger.IsLevelEnabled(PanicLevel) {
+		entry := logger.newEntry()
+		defer logger.releaseEntry(entry)
+		entry.Panic(args...)
+	}
 }
 
 func (logger *Logger) TraceFn(fn LogFunction) {
@@ -289,10 +318,19 @@ func (logger *Logger) FatalFn(fn LogFunction) {
 }
 
 func (logger *Logger) PanicFn(fn LogFunction) {
-	logger.LogFn(PanicLevel, fn)
+	if logger.IsLevelEnabled(PanicLevel) {
+		entry := logger.newEntry()
+		defer logger.releaseEntry(entry)
+		entry.Panic(fn()...)
+	}
 }
 
-func (logger *Logger) Logln(level Level, args ...interface{}) {
+// Logln logs a message at the specified level with Println-style spacing.
+//
+// Using Logln with [PanicLevel] or [FatalLevel] intentionally does not
+// trigger a panic or exit. Logln treats the level as logging severity only;
+// use [Logger.Panicln] or [Logger.Fatalln] when those side effects are desired.
+func (logger *Logger) Logln(level Level, args ...any) {
 	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
 		entry.Logln(level, args...)
@@ -300,43 +338,47 @@ func (logger *Logger) Logln(level Level, args ...interface{}) {
 	}
 }
 
-func (logger *Logger) Traceln(args ...interface{}) {
+func (logger *Logger) Traceln(args ...any) {
 	logger.Logln(TraceLevel, args...)
 }
 
-func (logger *Logger) Debugln(args ...interface{}) {
+func (logger *Logger) Debugln(args ...any) {
 	logger.Logln(DebugLevel, args...)
 }
 
-func (logger *Logger) Infoln(args ...interface{}) {
+func (logger *Logger) Infoln(args ...any) {
 	logger.Logln(InfoLevel, args...)
 }
 
-func (logger *Logger) Println(args ...interface{}) {
+func (logger *Logger) Println(args ...any) {
 	entry := logger.newEntry()
 	entry.Println(args...)
 	logger.releaseEntry(entry)
 }
 
-func (logger *Logger) Warnln(args ...interface{}) {
+func (logger *Logger) Warnln(args ...any) {
 	logger.Logln(WarnLevel, args...)
 }
 
-func (logger *Logger) Warningln(args ...interface{}) {
+func (logger *Logger) Warningln(args ...any) {
 	logger.Warnln(args...)
 }
 
-func (logger *Logger) Errorln(args ...interface{}) {
+func (logger *Logger) Errorln(args ...any) {
 	logger.Logln(ErrorLevel, args...)
 }
 
-func (logger *Logger) Fatalln(args ...interface{}) {
+func (logger *Logger) Fatalln(args ...any) {
 	logger.Logln(FatalLevel, args...)
 	logger.Exit(1)
 }
 
-func (logger *Logger) Panicln(args ...interface{}) {
-	logger.Logln(PanicLevel, args...)
+func (logger *Logger) Panicln(args ...any) {
+	if logger.IsLevelEnabled(PanicLevel) {
+		entry := logger.newEntry()
+		defer logger.releaseEntry(entry)
+		entry.Panicln(args...)
+	}
 }
 
 func (logger *Logger) Exit(code int) {
@@ -347,9 +389,9 @@ func (logger *Logger) Exit(code int) {
 	logger.ExitFunc(code)
 }
 
-//When file is opened with appending mode, it's safe to
-//write concurrently to a file (within 4k message on Linux).
-//In these cases user can choose to disable the lock.
+// SetNoLock disables the lock for situations where a file is opened with
+// appending mode, and safe for concurrent writes to the file (within 4k
+// message on Linux). In these cases user can choose to disable the lock.
 func (logger *Logger) SetNoLock() {
 	logger.mu.Disable()
 }
@@ -375,7 +417,22 @@ func (logger *Logger) AddHook(hook Hook) {
 	logger.Hooks.Add(hook)
 }
 
-// IsLevelEnabled checks if the log level of the logger is greater than the level param
+// hooksForLevel returns a snapshot of the hooks registered for the given level.
+// The returned slice is a shallow copy and may be used without holding logger.mu.
+func (logger *Logger) hooksForLevel(level Level) []Hook {
+	logger.mu.Lock()
+	hooks := logger.Hooks[level]
+	if len(hooks) == 0 {
+		logger.mu.Unlock()
+		return nil
+	}
+	out := make([]Hook, len(hooks))
+	copy(out, hooks)
+	logger.mu.Unlock()
+	return out
+}
+
+// IsLevelEnabled checks if logging for the given level is enabled.
 func (logger *Logger) IsLevelEnabled(level Level) bool {
 	return logger.level() >= level
 }
@@ -394,6 +451,7 @@ func (logger *Logger) SetOutput(output io.Writer) {
 	logger.Out = output
 }
 
+// SetReportCaller sets whether the caller stack frame must be logged.
 func (logger *Logger) SetReportCaller(reportCaller bool) {
 	logger.mu.Lock()
 	defer logger.mu.Unlock()
@@ -403,9 +461,9 @@ func (logger *Logger) SetReportCaller(reportCaller bool) {
 // ReplaceHooks replaces the logger hooks and returns the old ones
 func (logger *Logger) ReplaceHooks(hooks LevelHooks) LevelHooks {
 	logger.mu.Lock()
+	defer logger.mu.Unlock()
 	oldHooks := logger.Hooks
 	logger.Hooks = hooks
-	logger.mu.Unlock()
 	return oldHooks
 }
 
diff --git a/vendor/github.com/sirupsen/logrus/logrus.go b/vendor/github.com/sirupsen/logrus/logrus.go
index 2f16224cb..d52b4ba73 100644
--- a/vendor/github.com/sirupsen/logrus/logrus.go
+++ b/vendor/github.com/sirupsen/logrus/logrus.go
@@ -1,52 +1,71 @@
 package logrus
 
 import (
+	"bytes"
 	"fmt"
 	"log"
-	"strings"
 )
 
-// Fields type, used to pass to `WithFields`.
-type Fields map[string]interface{}
+// Fields type, used to pass to [WithFields].
+type Fields map[string]any
 
 // Level type
+//
+//nolint:recvcheck // the methods of "Entry" use pointer receiver and non-pointer receiver.
 type Level uint32
 
-// Convert the Level to a string. E.g. PanicLevel becomes "panic".
+// Convert the Level to a string. E.g. [PanicLevel] becomes "panic".
 func (level Level) String() string {
-	if b, err := level.MarshalText(); err == nil {
-		return string(b)
-	} else {
+	switch level {
+	case TraceLevel:
+		return "trace"
+	case DebugLevel:
+		return "debug"
+	case InfoLevel:
+		return "info"
+	case WarnLevel:
+		return "warning"
+	case ErrorLevel:
+		return "error"
+	case FatalLevel:
+		return "fatal"
+	case PanicLevel:
+		return "panic"
+	default:
 		return "unknown"
 	}
 }
 
 // ParseLevel takes a string level and returns the Logrus log level constant.
 func ParseLevel(lvl string) (Level, error) {
-	switch strings.ToLower(lvl) {
-	case "panic":
-		return PanicLevel, nil
-	case "fatal":
-		return FatalLevel, nil
-	case "error":
-		return ErrorLevel, nil
-	case "warn", "warning":
-		return WarnLevel, nil
-	case "info":
-		return InfoLevel, nil
-	case "debug":
-		return DebugLevel, nil
-	case "trace":
-		return TraceLevel, nil
-	}
+	return parseLevel([]byte(lvl))
+}
 
-	var l Level
-	return l, fmt.Errorf("not a valid logrus Level: %q", lvl)
+func parseLevel(b []byte) (Level, error) {
+	switch {
+	case bytes.EqualFold(b, []byte("panic")):
+		return PanicLevel, nil
+	case bytes.EqualFold(b, []byte("fatal")):
+		return FatalLevel, nil
+	case bytes.EqualFold(b, []byte("error")):
+		return ErrorLevel, nil
+	case bytes.EqualFold(b, []byte("warn")),
+		bytes.EqualFold(b, []byte("warning")):
+		return WarnLevel, nil
+	case bytes.EqualFold(b, []byte("info")):
+		return InfoLevel, nil
+	case bytes.EqualFold(b, []byte("debug")):
+		return DebugLevel, nil
+	case bytes.EqualFold(b, []byte("trace")):
+		return TraceLevel, nil
+	default:
+		return 0, fmt.Errorf("not a valid logrus Level: %q", b)
+	}
 }
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (level *Level) UnmarshalText(text []byte) error {
-	l, err := ParseLevel(string(text))
+	l, err := parseLevel(text)
 	if err != nil {
 		return err
 	}
@@ -58,26 +77,14 @@ func (level *Level) UnmarshalText(text []byte) error {
 
 func (level Level) MarshalText() ([]byte, error) {
 	switch level {
-	case TraceLevel:
-		return []byte("trace"), nil
-	case DebugLevel:
-		return []byte("debug"), nil
-	case InfoLevel:
-		return []byte("info"), nil
-	case WarnLevel:
-		return []byte("warning"), nil
-	case ErrorLevel:
-		return []byte("error"), nil
-	case FatalLevel:
-		return []byte("fatal"), nil
-	case PanicLevel:
-		return []byte("panic"), nil
+	case TraceLevel, DebugLevel, InfoLevel, WarnLevel, ErrorLevel, FatalLevel, PanicLevel:
+		return []byte(level.String()), nil
+	default:
+		return nil, fmt.Errorf("not a valid logrus level %d", level)
 	}
-
-	return nil, fmt.Errorf("not a valid logrus level %d", level)
 }
 
-// A constant exposing all logging levels
+// AllLevels exposing all logging levels.
 var AllLevels = []Level{
 	PanicLevel,
 	FatalLevel,
@@ -89,7 +96,7 @@ var AllLevels = []Level{
 }
 
 // These are the different logging levels. You can set the logging level to log
-// on your instance of logger, obtained with `logrus.New()`.
+// on your instance of logger, obtained with [logrus.New].
 const (
 	// PanicLevel level, highest level of severity. Logs and then calls panic with the
 	// message passed to Debug, Info, ...
@@ -111,76 +118,110 @@ const (
 	TraceLevel
 )
 
-// Won't compile if StdLogger can't be realized by a log.Logger
+// Compile-time interface assertions.
 var (
-	_ StdLogger = &log.Logger{}
-	_ StdLogger = &Entry{}
-	_ StdLogger = &Logger{}
+	_ StdLogger = (*log.Logger)(nil)
+	_ StdLogger = (*Entry)(nil)
+	_ StdLogger = (*Logger)(nil)
+
+	_ FieldLogger = (*Logger)(nil)
+	_ FieldLogger = (*Entry)(nil)
+	_ FieldLogger = Ext1FieldLogger(nil)
+
+	_ DebugLogger = (*Logger)(nil)
+	_ InfoLogger  = (*Logger)(nil)
+	_ WarnLogger  = (*Logger)(nil)
+	_ ErrorLogger = (*Logger)(nil)
+	_ TraceLogger = (*Logger)(nil)
+
+	_ DebugLogger = (*Entry)(nil)
+	_ InfoLogger  = (*Entry)(nil)
+	_ WarnLogger  = (*Entry)(nil)
+	_ ErrorLogger = (*Entry)(nil)
+	_ TraceLogger = (*Entry)(nil)
+
+	_ Ext1FieldLogger = (*Logger)(nil)
+	_ Ext1FieldLogger = (*Entry)(nil)
 )
 
 // StdLogger is what your logrus-enabled library should take, that way
-// it'll accept a stdlib logger and a logrus logger. There's no standard
-// interface, this is the closest we get, unfortunately.
+// it'll accept a stdlib logger ([log.Logger]) and a logrus logger.
+// There's no standard interface, so this is the closest we get, unfortunately.
 type StdLogger interface {
-	Print(...interface{})
-	Printf(string, ...interface{})
-	Println(...interface{})
+	Print(args ...any)
+	Printf(format string, args ...any)
+	Println(args ...any)
 
-	Fatal(...interface{})
-	Fatalf(string, ...interface{})
-	Fatalln(...interface{})
+	Fatal(args ...any)
+	Fatalf(format string, args ...any)
+	Fatalln(args ...any)
 
-	Panic(...interface{})
-	Panicf(string, ...interface{})
-	Panicln(...interface{})
+	Panic(args ...any)
+	Panicf(format string, args ...any)
+	Panicln(args ...any)
 }
 
-// The FieldLogger interface generalizes the Entry and Logger types
+// FieldLogger extends the [StdLogger] interface, generalizing
+// the [Entry] and [Logger] types.
 type FieldLogger interface {
-	WithField(key string, value interface{}) *Entry
+	WithField(key string, value any) *Entry
 	WithFields(fields Fields) *Entry
 	WithError(err error) *Entry
 
-	Debugf(format string, args ...interface{})
-	Infof(format string, args ...interface{})
-	Printf(format string, args ...interface{})
-	Warnf(format string, args ...interface{})
-	Warningf(format string, args ...interface{})
-	Errorf(format string, args ...interface{})
-	Fatalf(format string, args ...interface{})
-	Panicf(format string, args ...interface{})
+	StdLogger
+	DebugLogger
+	InfoLogger
+	WarnLogger
+	ErrorLogger
 
-	Debug(args ...interface{})
-	Info(args ...interface{})
-	Print(args ...interface{})
-	Warn(args ...interface{})
-	Warning(args ...interface{})
-	Error(args ...interface{})
-	Fatal(args ...interface{})
-	Panic(args ...interface{})
+	// Legacy warning aliases. These are kept on FieldLogger for backwards
+	// compatibility, but are intentionally omitted from [WarnLogger].
 
-	Debugln(args ...interface{})
-	Infoln(args ...interface{})
-	Println(args ...interface{})
-	Warnln(args ...interface{})
-	Warningln(args ...interface{})
-	Errorln(args ...interface{})
-	Fatalln(args ...interface{})
-	Panicln(args ...interface{})
-
-	// IsDebugEnabled() bool
-	// IsInfoEnabled() bool
-	// IsWarnEnabled() bool
-	// IsErrorEnabled() bool
-	// IsFatalEnabled() bool
-	// IsPanicEnabled() bool
+	Warning(args ...any)
+	Warningf(format string, args ...any)
+	Warningln(args ...any)
 }
 
-// Ext1FieldLogger (the first extension to FieldLogger) is superfluous, it is
-// here for consistancy. Do not use. Use Logger or Entry instead.
+// DebugLogger provides convenience functions to log messages at level [DebugLevel].
+type DebugLogger interface {
+	Debug(args ...any)
+	Debugf(format string, args ...any)
+	Debugln(args ...any)
+}
+
+// InfoLogger provides convenience functions to log messages at level [InfoLevel].
+type InfoLogger interface {
+	Info(args ...any)
+	Infof(format string, args ...any)
+	Infoln(args ...any)
+}
+
+// WarnLogger provides convenience functions to log messages at level [WarnLevel].
+type WarnLogger interface {
+	Warn(args ...any)
+	Warnf(format string, args ...any)
+	Warnln(args ...any)
+}
+
+// ErrorLogger provides convenience functions to log messages at level [ErrorLevel].
+type ErrorLogger interface {
+	Error(args ...any)
+	Errorf(format string, args ...any)
+	Errorln(args ...any)
+}
+
+// TraceLogger provides convenience functions to log messages at level [TraceLevel].
+type TraceLogger interface {
+	Trace(args ...any)
+	Tracef(format string, args ...any)
+	Traceln(args ...any)
+}
+
+// Ext1FieldLogger is FieldLogger extended with Trace-level methods.
+//
+// New code should prefer the smallest applicable interface, such as
+// [FieldLogger] or [TraceLogger], or use [Logger] or [Entry] directly.
 type Ext1FieldLogger interface {
 	FieldLogger
-	Tracef(format string, args ...interface{})
-	Trace(args ...interface{})
-	Traceln(args ...interface{})
+	TraceLogger
 }
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_appengine.go b/vendor/github.com/sirupsen/logrus/terminal_check_appengine.go
index 2403de981..1c6202b8c 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_appengine.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_appengine.go
@@ -1,11 +1,7 @@
-// +build appengine
+//go:build appengine
 
 package logrus
 
-import (
-	"io"
-)
-
-func checkIfTerminal(w io.Writer) bool {
+func checkIfTerminal(_ any) bool {
 	return true
 }
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go b/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go
index 499789984..ff9531ac4 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go
@@ -1,5 +1,4 @@
-// +build darwin dragonfly freebsd netbsd openbsd
-// +build !js
+//go:build (darwin || dragonfly || freebsd || netbsd || openbsd || hurd) && !tinygo
 
 package logrus
 
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_js.go b/vendor/github.com/sirupsen/logrus/terminal_check_js.go
deleted file mode 100644
index ebdae3ec6..000000000
--- a/vendor/github.com/sirupsen/logrus/terminal_check_js.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build js
-
-package logrus
-
-func isTerminal(fd int) bool {
-	return false
-}
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_no_terminal.go b/vendor/github.com/sirupsen/logrus/terminal_check_no_terminal.go
index 97af92c68..17ae9f04f 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_no_terminal.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_no_terminal.go
@@ -1,11 +1,7 @@
-// +build js nacl plan9
+//go:build js || nacl || plan9 || wasi || wasip1 || tinygo
 
 package logrus
 
-import (
-	"io"
-)
-
-func checkIfTerminal(w io.Writer) bool {
+func checkIfTerminal(_ any) bool {
 	return false
 }
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go b/vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go
index 3293fb3ca..780a42a57 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go
@@ -1,4 +1,4 @@
-// +build !appengine,!js,!windows,!nacl,!plan9
+//go:build !appengine && !js && !windows && !nacl && !plan9 && !wasi && !wasip1 && !tinygo
 
 package logrus
 
@@ -10,7 +10,11 @@ import (
 func checkIfTerminal(w io.Writer) bool {
 	switch v := w.(type) {
 	case *os.File:
-		return isTerminal(int(v.Fd()))
+		fd := v.Fd()
+		if fd > uintptr(^uint(0)>>1) {
+			return false
+		}
+		return isTerminal(int(fd))
 	default:
 		return false
 	}
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_solaris.go b/vendor/github.com/sirupsen/logrus/terminal_check_solaris.go
index f6710b3bd..8d9b26fca 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_solaris.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_solaris.go
@@ -1,3 +1,5 @@
+//go:build solaris && !tinygo
+
 package logrus
 
 import (
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_unix.go b/vendor/github.com/sirupsen/logrus/terminal_check_unix.go
index 04748b851..b161506d3 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_unix.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_unix.go
@@ -1,5 +1,4 @@
-// +build linux aix zos
-// +build !js
+//go:build (linux || aix || zos) && !tinygo
 
 package logrus
 
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_windows.go b/vendor/github.com/sirupsen/logrus/terminal_check_windows.go
index 2879eb50e..5fd3c4313 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_windows.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_windows.go
@@ -1,4 +1,4 @@
-// +build !appengine,!js,windows
+//go:build windows && !appengine
 
 package logrus
 
diff --git a/vendor/github.com/sirupsen/logrus/text_formatter.go b/vendor/github.com/sirupsen/logrus/text_formatter.go
index be2c6efe5..82c1f3da2 100644
--- a/vendor/github.com/sirupsen/logrus/text_formatter.go
+++ b/vendor/github.com/sirupsen/logrus/text_formatter.go
@@ -3,30 +3,32 @@ package logrus
 import (
 	"bytes"
 	"fmt"
+	"maps"
 	"os"
+	"reflect"
 	"runtime"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-	"unicode/utf8"
 )
 
-const (
-	red    = 31
-	yellow = 33
-	blue   = 36
-	gray   = 37
-)
+var baseTimestamp = time.Now()
 
-var baseTimestamp time.Time
-
-func init() {
-	baseTimestamp = time.Now()
-}
-
-// TextFormatter formats logs into text
+// TextFormatter formats logs into text.
+//
+// Output is logfmt-like: key=value pairs separated by spaces. Fields from
+// [Entry.Data] are included together with the standard fields derived from the
+// entry. If a field conflicts with a standard field, it is prefixed with
+// "fields.". Standard field names can be customized through FieldMap.
+//
+// Field keys are written as-is (unquoted and unescaped) in the plain
+// (non-colored) format; only field values may be quoted depending on
+// DisableQuote, ForceQuote, QuoteEmptyFields, and the value content.
+//
+// When colors are enabled, ANSI escape sequences may be added for presentation.
+// For fully escaped structured output (including safe keys), use JSONFormatter.
 type TextFormatter struct {
 	// Set to true to bypass checking for a TTY before outputting colors.
 	ForceColors bool
@@ -64,7 +66,7 @@ type TextFormatter struct {
 	// be desired.
 	DisableSorting bool
 
-	// The keys sorting function, when uninitialized it uses sort.Strings.
+	// The keys sorting function, when uninitialized it uses slices.Sort.
 	SortingFunc func([]string)
 
 	// Disables the truncation of the level text to 4 characters.
@@ -77,16 +79,22 @@ type TextFormatter struct {
 	// QuoteEmptyFields will wrap empty fields in quotes if true
 	QuoteEmptyFields bool
 
-	// Whether the logger's out is to a terminal
-	isTerminal bool
+	// Whether the logger's out is to a terminal. Don't use this field
+	// directly; use TextFormatter.isTerminal instead.
+	terminal bool
 
 	// FieldMap allows users to customize the names of keys for default fields.
+	// Mapped keys are written as-is, so they should be safe for plain-text output.
+	//
 	// As an example:
+	//
 	// formatter := &TextFormatter{
-	//     FieldMap: FieldMap{
-	//         FieldKeyTime:  "@timestamp",
-	//         FieldKeyLevel: "@level",
-	//         FieldKeyMsg:   "@message"}}
+	// 	FieldMap: FieldMap{
+	// 		FieldKeyTime:  "@timestamp",
+	// 		FieldKeyLevel: "@level",
+	// 		FieldKeyMsg:   "@message",
+	// 	},
+	// }
 	FieldMap FieldMap
 
 	// CallerPrettyfier can be set by the user to modify the content
@@ -96,54 +104,78 @@ type TextFormatter struct {
 	CallerPrettyfier func(*runtime.Frame) (function string, file string)
 
 	terminalInitOnce sync.Once
-
-	// The max length of the level text, generated dynamically on init
-	levelTextMaxLength int
 }
 
-func (f *TextFormatter) init(entry *Entry) {
-	if entry.Logger != nil {
-		f.isTerminal = checkIfTerminal(entry.Logger.Out)
-	}
-	// Get the max length of the level text
-	for _, level := range AllLevels {
-		levelTextLength := utf8.RuneCount([]byte(level.String()))
-		if levelTextLength > f.levelTextMaxLength {
-			f.levelTextMaxLength = levelTextLength
-		}
+func (f *TextFormatter) isTerminal(entry *Entry) bool {
+	if entry == nil || entry.Logger == nil {
+		// Don't run the terminalInitOnce without a logger, otherwise we'd
+		// cache the default (false) forever even if a logger is attached
+		// later.
+		return false
 	}
+
+	f.terminalInitOnce.Do(func() {
+		entry.Logger.mu.Lock()
+		out := entry.Logger.Out
+		entry.Logger.mu.Unlock()
+
+		f.terminal = checkIfTerminal(out)
+	})
+
+	return f.terminal
 }
 
-func (f *TextFormatter) isColored() bool {
-	isColored := f.ForceColors || (f.isTerminal && (runtime.GOOS != "windows"))
-
-	if f.EnvironmentOverrideColors {
-		switch force, ok := os.LookupEnv("CLICOLOR_FORCE"); {
-		case ok && force != "0":
-			isColored = true
-		case ok && force == "0", os.Getenv("CLICOLOR") == "0":
-			isColored = false
-		}
+func (f *TextFormatter) isColored(isTerminal bool) bool {
+	if f.DisableColors {
+		return false
 	}
 
-	return isColored && !f.DisableColors
+	colored := f.ForceColors || isTerminal
+	if !f.EnvironmentOverrideColors {
+		return colored
+	}
+	if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok {
+		return force != "0"
+	}
+	if os.Getenv("CLICOLOR") == "0" {
+		return false
+	}
+	return colored
 }
 
 // Format renders a single log entry
 func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
-	data := make(Fields)
-	for k, v := range entry.Data {
-		data[k] = v
-	}
-	prefixFieldClashes(data, f.FieldMap, entry.HasCaller())
+	data := make(Fields, len(entry.Data))
+	maps.Copy(data, entry.Data)
+	isColored := f.isColored(f.isTerminal(entry))
+
+	caller := entry.Caller
+	hasCaller := caller != nil
+	prefixFieldClashes(data, f.FieldMap, hasCaller)
 	keys := make([]string, 0, len(data))
 	for k := range data {
 		keys = append(keys, k)
 	}
 
-	var funcVal, fileVal string
+	b := entry.Buffer
+	if b == nil {
+		b = new(bytes.Buffer)
+	}
 
-	fixedKeys := make([]string, 0, 4+len(data))
+	if isColored {
+		f.printColored(b, entry, keys, data)
+	} else {
+		f.printPlain(b, entry, keys, data)
+	}
+
+	return b.Bytes(), nil
+}
+
+func (f *TextFormatter) printPlain(b *bytes.Buffer, entry *Entry, keys []string, data Fields) {
+	caller := entry.Caller
+	hasCaller := caller != nil
+
+	fixedKeys := make([]string, 0, len(keys)+defaultFields)
 	if !f.DisableTimestamp {
 		fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyTime))
 	}
@@ -154,12 +186,14 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 	if entry.err != "" {
 		fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyLogrusError))
 	}
-	if entry.HasCaller() {
+
+	var funcVal, fileVal string
+	if caller != nil {
 		if f.CallerPrettyfier != nil {
-			funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+			funcVal, fileVal = f.CallerPrettyfier(caller)
 		} else {
-			funcVal = entry.Caller.Function
-			fileVal = fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+			funcVal = caller.Function
+			fileVal = caller.File + ":" + strconv.FormatInt(int64(caller.Line), 10)
 		}
 
 		if funcVal != "" {
@@ -172,151 +206,108 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 
 	if !f.DisableSorting {
 		if f.SortingFunc == nil {
-			sort.Strings(keys)
+			// Default sorting does not sort the "fixed keys";
+			// see https://github.com/sirupsen/logrus/commit/73bc94e60c753099e8bae902f81fbd6e7dd95f26
+			slices.Sort(keys)
 			fixedKeys = append(fixedKeys, keys...)
 		} else {
-			if !f.isColored() {
-				fixedKeys = append(fixedKeys, keys...)
-				f.SortingFunc(fixedKeys)
-			} else {
-				f.SortingFunc(keys)
-			}
+			fixedKeys = append(fixedKeys, keys...)
+			f.SortingFunc(fixedKeys)
 		}
 	} else {
 		fixedKeys = append(fixedKeys, keys...)
 	}
 
-	var b *bytes.Buffer
-	if entry.Buffer != nil {
-		b = entry.Buffer
-	} else {
-		b = &bytes.Buffer{}
-	}
-
-	f.terminalInitOnce.Do(func() { f.init(entry) })
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = defaultTimestampFormat
-	}
-	if f.isColored() {
-		f.printColored(b, entry, keys, data, timestampFormat)
-	} else {
-
-		for _, key := range fixedKeys {
-			var value interface{}
-			switch {
-			case key == f.FieldMap.resolve(FieldKeyTime):
-				value = entry.Time.Format(timestampFormat)
-			case key == f.FieldMap.resolve(FieldKeyLevel):
-				value = entry.Level.String()
-			case key == f.FieldMap.resolve(FieldKeyMsg):
-				value = entry.Message
-			case key == f.FieldMap.resolve(FieldKeyLogrusError):
-				value = entry.err
-			case key == f.FieldMap.resolve(FieldKeyFunc) && entry.HasCaller():
-				value = funcVal
-			case key == f.FieldMap.resolve(FieldKeyFile) && entry.HasCaller():
-				value = fileVal
-			default:
-				value = data[key]
+	for _, key := range fixedKeys {
+		var value any
+		switch {
+		case key == f.FieldMap.resolve(FieldKeyTime):
+			if f.TimestampFormat == "" {
+				value = entry.Time.Format(defaultTimestampFormat)
+			} else {
+				value = entry.Time.Format(f.TimestampFormat)
 			}
-			f.appendKeyValue(b, key, value)
+		case key == f.FieldMap.resolve(FieldKeyLevel):
+			value = entry.Level.String()
+		case key == f.FieldMap.resolve(FieldKeyMsg):
+			value = entry.Message
+		case key == f.FieldMap.resolve(FieldKeyLogrusError):
+			value = entry.err
+		case key == f.FieldMap.resolve(FieldKeyFunc) && hasCaller:
+			value = funcVal
+		case key == f.FieldMap.resolve(FieldKeyFile) && hasCaller:
+			value = fileVal
+		default:
+			value = data[key]
 		}
+		f.appendKeyValue(b, key, value)
 	}
 
 	b.WriteByte('\n')
-	return b.Bytes(), nil
 }
 
-func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []string, data Fields, timestampFormat string) {
-	var levelColor int
-	switch entry.Level {
-	case DebugLevel, TraceLevel:
-		levelColor = gray
-	case WarnLevel:
-		levelColor = yellow
-	case ErrorLevel, FatalLevel, PanicLevel:
-		levelColor = red
-	case InfoLevel:
-		levelColor = blue
-	default:
-		levelColor = blue
-	}
-
-	levelText := strings.ToUpper(entry.Level.String())
-	if !f.DisableLevelTruncation && !f.PadLevelText {
-		levelText = levelText[0:4]
-	}
-	if f.PadLevelText {
-		// Generates the format string used in the next line, for example "%-6s" or "%-7s".
-		// Based on the max level text length.
-		formatString := "%-" + strconv.Itoa(f.levelTextMaxLength) + "s"
-		// Formats the level text by appending spaces up to the max length, for example:
-		// 	- "INFO   "
-		//	- "WARNING"
-		levelText = fmt.Sprintf(formatString, levelText)
-	}
-
+func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []string, data Fields) {
 	// Remove a single newline if it already exists in the message to keep
 	// the behavior of logrus text_formatter the same as the stdlib log package
 	entry.Message = strings.TrimSuffix(entry.Message, "\n")
 
-	caller := ""
-	if entry.HasCaller() {
-		funcVal := fmt.Sprintf("%s()", entry.Caller.Function)
-		fileVal := fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
-
+	var callerText string
+	if caller := entry.Caller; caller != nil {
+		var funcVal, fileVal string
 		if f.CallerPrettyfier != nil {
-			funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+			funcVal, fileVal = f.CallerPrettyfier(caller)
+		} else {
+			if caller.Function != "" {
+				funcVal = caller.Function + "()"
+			}
+			fileVal = caller.File + ":" + strconv.FormatInt(int64(caller.Line), 10)
 		}
 
 		if fileVal == "" {
-			caller = funcVal
+			callerText = funcVal
 		} else if funcVal == "" {
-			caller = fileVal
+			callerText = fileVal
 		} else {
-			caller = fileVal + " " + funcVal
+			callerText = fileVal + " " + funcVal
 		}
 	}
 
+	levelText := levelPrefix(entry.Level, f.DisableLevelTruncation, f.PadLevelText)
 	switch {
 	case f.DisableTimestamp:
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m%s %-44s ", levelColor, levelText, caller, entry.Message)
+		_, _ = fmt.Fprintf(b, "%s%s %-44s ", levelText, callerText, entry.Message)
 	case !f.FullTimestamp:
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d]%s %-44s ", levelColor, levelText, int(entry.Time.Sub(baseTimestamp)/time.Second), caller, entry.Message)
+		_, _ = fmt.Fprintf(b, "%s[%04d]%s %-44s ", levelText, int(entry.Time.Sub(baseTimestamp)/time.Second), callerText, entry.Message)
 	default:
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s]%s %-44s ", levelColor, levelText, entry.Time.Format(timestampFormat), caller, entry.Message)
+		timestampFormat := f.TimestampFormat
+		if timestampFormat == "" {
+			timestampFormat = defaultTimestampFormat
+		}
+		_, _ = fmt.Fprintf(b, "%s[%s]%s %-44s ", levelText, entry.Time.Format(timestampFormat), callerText, entry.Message)
 	}
-	for _, k := range keys {
-		v := data[k]
-		fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=", levelColor, k)
-		f.appendValue(b, v)
-	}
-}
 
-func (f *TextFormatter) needsQuoting(text string) bool {
-	if f.ForceQuote {
-		return true
-	}
-	if f.QuoteEmptyFields && len(text) == 0 {
-		return true
-	}
-	if f.DisableQuote {
-		return false
-	}
-	for _, ch := range text {
-		if !((ch >= 'a' && ch <= 'z') ||
-			(ch >= 'A' && ch <= 'Z') ||
-			(ch >= '0' && ch <= '9') ||
-			ch == '-' || ch == '.' || ch == '_' || ch == '/' || ch == '@' || ch == '^' || ch == '+') {
-			return true
+	if !f.DisableSorting {
+		if f.SortingFunc == nil {
+			slices.Sort(keys)
+		} else {
+			f.SortingFunc(keys)
 		}
 	}
-	return false
+
+	// Keys use the same color as the level-prefix.
+	for _, k := range keys {
+		b.WriteByte(' ')
+		b.WriteString(colorize(entry.Level, k))
+		b.WriteByte('=')
+		f.appendValue(b, data[k])
+	}
+
+	b.WriteByte('\n')
 }
 
-func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interface{}) {
+// appendKeyValue writes key=value. Keys are written verbatim (unquoted/unescaped);
+// values are subject to quoting/escaping.
+func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value any) {
 	if b.Len() > 0 {
 		b.WriteByte(' ')
 	}
@@ -325,15 +316,168 @@ func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interf
 	f.appendValue(b, value)
 }
 
-func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) {
-	stringVal, ok := value.(string)
-	if !ok {
-		stringVal = fmt.Sprint(value)
+func (f *TextFormatter) appendValue(b *bytes.Buffer, value any) {
+	// Fast paths.
+	switch v := value.(type) {
+	case string:
+		f.appendString(b, v)
+		return
+	case []byte:
+		f.appendBytes(b, v)
+		return
+	case bool:
+		var raw [8]byte
+		f.appendBytes(b, strconv.AppendBool(raw[:0], v))
+		return
+	case error:
+		f.appendError(b, v)
+		return
+	case fmt.Stringer:
+		f.appendStringer(b, v)
+		return
 	}
 
-	if !f.needsQuoting(stringVal) {
-		b.WriteString(stringVal)
-	} else {
-		b.WriteString(fmt.Sprintf("%q", stringVal))
+	// Handle common primitives.
+	var raw [64]byte
+	var num []byte
+
+	switch v := value.(type) {
+	case int:
+		num = strconv.AppendInt(raw[:0], int64(v), 10)
+	case int8:
+		num = strconv.AppendInt(raw[:0], int64(v), 10)
+	case int16:
+		num = strconv.AppendInt(raw[:0], int64(v), 10)
+	case int32:
+		num = strconv.AppendInt(raw[:0], int64(v), 10)
+	case int64:
+		num = strconv.AppendInt(raw[:0], v, 10)
+
+	case uint:
+		num = strconv.AppendUint(raw[:0], uint64(v), 10)
+	case uint8:
+		num = strconv.AppendUint(raw[:0], uint64(v), 10)
+	case uint16:
+		num = strconv.AppendUint(raw[:0], uint64(v), 10)
+	case uint32:
+		num = strconv.AppendUint(raw[:0], uint64(v), 10)
+	case uint64:
+		num = strconv.AppendUint(raw[:0], v, 10)
+	case uintptr:
+		num = strconv.AppendUint(raw[:0], uint64(v), 10)
+
+	case float32:
+		num = strconv.AppendFloat(raw[:0], float64(v), 'g', -1, 32)
+	case float64:
+		num = strconv.AppendFloat(raw[:0], v, 'g', -1, 64)
+
+	default:
+		f.appendString(b, fmt.Sprint(value))
+		return
+	}
+
+	f.appendNumeric(b, num)
+}
+
+func (f *TextFormatter) appendString(b *bytes.Buffer, s string) {
+	quote := f.ForceQuote || (f.QuoteEmptyFields && len(s) == 0) || (!f.DisableQuote && needsQuoting(s))
+	if !quote {
+		b.WriteString(s)
+		return
+	}
+	if len(s) == 0 {
+		b.WriteString(`""`)
+		return
+	}
+
+	var tmp [128]byte
+	b.Write(strconv.AppendQuote(tmp[:0], s))
+}
+
+func (f *TextFormatter) appendBytes(b *bytes.Buffer, bs []byte) {
+	quote := f.ForceQuote || (f.QuoteEmptyFields && len(bs) == 0) || (!f.DisableQuote && needsQuotingBytes(bs))
+	if !quote {
+		b.Write(bs)
+		return
+	}
+	if len(bs) == 0 {
+		b.WriteString(`""`)
+		return
+	}
+
+	var tmp [128]byte
+	b.Write(strconv.AppendQuote(tmp[:0], string(bs)))
+}
+
+func (f *TextFormatter) appendNumeric(b *bytes.Buffer, out []byte) {
+	if f.ForceQuote {
+		var tmp [128]byte
+		b.Write(strconv.AppendQuote(tmp[:0], string(out)))
+		return
+	}
+	b.Write(out)
+}
+
+func (f *TextFormatter) appendError(b *bytes.Buffer, v error) {
+	defer f.recoverValue(b, v, "Error")
+
+	f.appendString(b, v.Error())
+}
+
+func (f *TextFormatter) appendStringer(b *bytes.Buffer, v fmt.Stringer) {
+	defer f.recoverValue(b, v, "String")
+
+	f.appendString(b, v.String())
+}
+
+func (f *TextFormatter) recoverValue(b *bytes.Buffer, v any, method string) {
+	if r := recover(); r != nil {
+		rv := reflect.ValueOf(v)
+		if rv.Kind() == reflect.Pointer && rv.IsNil() {
+			f.appendString(b, "")
+		} else {
+			f.appendString(b, fmt.Sprintf("%%!v(PANIC=%s method: %v)", method, r))
+		}
+	}
+}
+
+// needsQuoting returns true if the string contains any byte that
+// requires quoting. It returns false when every byte is "safe" according
+// to isSafeByte.
+func needsQuoting(s string) bool {
+	// use an index loop (avoid rune decoding).
+	for i := range len(s) {
+		c := s[i]
+		if !isSafeByte(c) {
+			return true
+		}
+	}
+	return false
+}
+
+// needsQuotingBytes returns true if the byte slice contains any byte that
+// requires quoting. It returns false when every byte is "safe" according
+// to isSafeByte.
+func needsQuotingBytes(bs []byte) bool {
+	for _, c := range bs {
+		if !isSafeByte(c) {
+			return true
+		}
+	}
+	return false
+}
+
+// isSafeByte returns true if the byte is allowed unquoted (ASCII and in the allowlist).
+// It purposely uses byte arithmetic (no runes) for performance.
+func isSafeByte(ch byte) bool {
+	ok := ch < 0x80 && ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9'))
+	if ok {
+		return true
+	}
+	switch ch {
+	case '-', '.', '_', '/', '@', '^', '+':
+		return true
+	default:
+		return false
 	}
 }
diff --git a/vendor/github.com/sirupsen/logrus/writer.go b/vendor/github.com/sirupsen/logrus/writer.go
index 074fd4b8b..30e34cda7 100644
--- a/vendor/github.com/sirupsen/logrus/writer.go
+++ b/vendor/github.com/sirupsen/logrus/writer.go
@@ -30,7 +30,7 @@ func (entry *Entry) Writer() *io.PipeWriter {
 func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
 	reader, writer := io.Pipe()
 
-	var printFunc func(args ...interface{})
+	printFunc := entry.Print
 
 	// Determine which log function to use based on the specified log level
 	switch level {
@@ -48,8 +48,6 @@ func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
 		printFunc = entry.Fatal
 	case PanicLevel:
 		printFunc = entry.Panic
-	default:
-		printFunc = entry.Print
 	}
 
 	// Start a new goroutine to scan the input and write it to the logger using the specified print function.
@@ -63,7 +61,7 @@ func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
 }
 
 // writerScanner scans the input from the reader and writes it to the logger
-func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
+func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...any)) {
 	scanner := bufio.NewScanner(reader)
 
 	// Set the buffer size to the maximum token size to avoid buffer overflows
diff --git a/vendor/github.com/skeema/knownhosts/CONTRIBUTING.md b/vendor/github.com/skeema/knownhosts/CONTRIBUTING.md
deleted file mode 100644
index 9624f8276..000000000
--- a/vendor/github.com/skeema/knownhosts/CONTRIBUTING.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributing to skeema/knownhosts
-
-Thank you for your interest in contributing! This document provides guidelines for submitting pull requests.
-
-### Link to an issue
-
-Before starting the pull request process, initial discussion should take place on a GitHub issue first. For bug reports, the issue should track the open bug and confirm it is reproducible. For feature requests, the issue should cover why the feature is necessary.
-
-In the issue comments, discuss your suggested approach for a fix/implementation, and please wait to get feedback before opening a pull request.
-
-### Test coverage
-
-In general, please provide reasonably thorough test coverage. Whenever possible, your PR should aim to match or improve the overall test coverage percentage of the package. You can run tests and check coverage locally using `go test -cover`. We also have CI automation in GitHub Actions which will comment on each pull request with a coverage percentage.
-
-That said, it is fine to submit an initial draft / work-in-progress PR without coverage, if you are waiting on implementation feedback before writing the tests.
-
-We intentionally avoid hard-coding SSH keys or known_hosts files into the test logic. Instead, the tests generate new keys and then use them to generate a known_hosts file, which is then cached/reused for that overall test run, in order to keep performance reasonable.
-
-### Documentation
-
-Exported types require doc comments. The linter CI step will catch this if missing.
-
-### Backwards compatibility
-
-Because this package is imported by [nearly 7000 repos on GitHub](https://github.com/skeema/knownhosts/network/dependents), we must be very strict about backwards compatibility of exported symbols and function signatures.
-
-Backwards compatibility can be very tricky in some situations. In this case, a maintainer may need to add additional commits to your branch to adjust the approach. Please do not take offense if this occurs; it is sometimes simply faster to implement a refactor on our end directly. When the PR/branch is merged, a merge commit will be used, to ensure your commits appear as-is in the repo history and are still properly credited to you.
-
-### Avoid rewriting core x/crypto/ssh/knownhosts logic
-
-skeema/knownhosts is intended to be a relatively thin *wrapper* around x/crypto/ssh/knownhosts, without duplicating or re-implementing the core known_hosts file parsing and host key handling logic. Importers of this package should be confident that it can be used as a nearly-drop-in replacement for x/crypto/ssh/knownhosts without introducing substantial risk, security flaws, parser differentials, or unexpected behavior changes.
-
-To solve shortcomings in x/crypto/ssh/knownhosts, we try to come up with workarounds that still utilize x/crypto/ssh/knownhosts functionality whenever possible.
-
-Some bugs in x/crypto/ssh/knownhosts do require re-reading the known_hosts file here to solve, but we make that *optional* by offering separate constructors/types with and without that behavior.
-
diff --git a/vendor/github.com/skeema/knownhosts/LICENSE b/vendor/github.com/skeema/knownhosts/LICENSE
deleted file mode 100644
index 8dada3eda..000000000
--- a/vendor/github.com/skeema/knownhosts/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/skeema/knownhosts/README.md b/vendor/github.com/skeema/knownhosts/README.md
deleted file mode 100644
index 170e04d14..000000000
--- a/vendor/github.com/skeema/knownhosts/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# knownhosts: enhanced Golang SSH known_hosts management
-
-[![build status](https://img.shields.io/github/actions/workflow/status/skeema/knownhosts/tests.yml?branch=main)](https://github.com/skeema/knownhosts/actions)
-[![code coverage](https://img.shields.io/coveralls/skeema/knownhosts.svg)](https://coveralls.io/r/skeema/knownhosts)
-[![godoc](https://img.shields.io/badge/godoc-reference-blue.svg)](https://pkg.go.dev/github.com/skeema/knownhosts)
-
-
-> This repo is brought to you by [Skeema](https://github.com/skeema/skeema), a
-> declarative pure-SQL schema management system for MySQL and MariaDB. Our
-> premium products include extensive [SSH tunnel](https://www.skeema.io/docs/features/ssh/)
-> functionality, which internally makes use of this package.
-
-Go provides excellent functionality for OpenSSH known_hosts files in its
-external package [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts). 
-However, that package is somewhat low-level, making it difficult to implement full known_hosts management similar to OpenSSH's command-line behavior. Additionally, [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) has several known issues in edge cases, some of which have remained open for multiple years.
-
-Package [github.com/skeema/knownhosts](https://github.com/skeema/knownhosts) provides a *thin wrapper* around [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts), adding the following improvements and fixes without duplicating its core logic:
-
-* Look up known_hosts public keys for any given host
-* Auto-populate ssh.ClientConfig.HostKeyAlgorithms easily based on known_hosts, providing a solution for [golang/go#29286](https://github.com/golang/go/issues/29286). (This also properly handles cert algorithms for hosts using CA keys when [using the NewDB constructor](#enhancements-requiring-extra-parsing) added in skeema/knownhosts v1.3.0.)
-* Properly match wildcard hostname known_hosts entries regardless of port number, providing a solution for [golang/go#52056](https://github.com/golang/go/issues/52056). (Added in v1.3.0; requires [using the NewDB constructor](#enhancements-requiring-extra-parsing))
-* Write new known_hosts entries to an io.Writer
-* Properly format/normalize new known_hosts entries containing ipv6 addresses, providing a solution for [golang/go#53463](https://github.com/golang/go/issues/53463)
-* Easily determine if an ssh.HostKeyCallback's error corresponds to a host whose key has changed (indicating potential MitM attack) vs a host that just isn't known yet
-
-## How host key lookup works
-
-Although [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) doesn't directly expose a way to query its known_host map, we use a subtle trick to do so: invoke the HostKeyCallback with a valid host but a bogus key. The resulting KeyError allows us to determine which public keys are actually present for that host.
-
-By using this technique, [github.com/skeema/knownhosts](https://github.com/skeema/knownhosts) doesn't need to duplicate any of the core known_hosts host-lookup logic from [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts).
-
-## Populating ssh.ClientConfig.HostKeyAlgorithms based on known_hosts
-
-Hosts often have multiple public keys, each of a different type (algorithm). This can be [problematic](https://github.com/golang/go/issues/29286) in [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts): if a host's first public key is *not* in known_hosts, but a key of a different type *is*, the HostKeyCallback returns an error. The solution is to populate `ssh.ClientConfig.HostKeyAlgorithms` based on the algorithms of the known_hosts entries for that host, but 
-[golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts)
-does not provide an obvious way to do so.
-
-This package uses its host key lookup trick in order to make ssh.ClientConfig.HostKeyAlgorithms easy to populate:
-
-```golang
-import (
-	"golang.org/x/crypto/ssh"
-	"github.com/skeema/knownhosts"
-)
-
-func sshConfigForHost(hostWithPort string) (*ssh.ClientConfig, error) {
-	kh, err := knownhosts.NewDB("/home/myuser/.ssh/known_hosts")
-	if err != nil {
-		return nil, err
-	}
-	config := &ssh.ClientConfig{
-		User:              "myuser",
-		Auth:              []ssh.AuthMethod{ /* ... */ },
-		HostKeyCallback:   kh.HostKeyCallback(),
-		HostKeyAlgorithms: kh.HostKeyAlgorithms(hostWithPort),
-	}
-	return config, nil
-}
-```
-
-## Enhancements requiring extra parsing
-
-Originally, this package did not re-read/re-parse the known_hosts files at all, relying entirely on [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) for all known_hosts file reading and processing. This package only offered a constructor called `New`, returning a host key callback, identical to the call pattern of [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) but with extra methods available on the callback type.
-
-However, a couple shortcomings in [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) cannot possibly be solved without re-reading the known_hosts file. Therefore, as of v1.3.0 of this package, we now offer an alternative constructor `NewDB`, which does an additional read of the known_hosts file (after the one from [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts)), in order to detect:
-
-* @cert-authority lines, so that we can correctly return cert key algorithms instead of normal host key algorithms when appropriate
-* host pattern wildcards, so that we can match OpenSSH's behavior for non-standard port numbers, unlike how [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) normally treats them
-
-Aside from *detecting* these special cases, this package otherwise still directly uses [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts) for host lookups and all other known_hosts file processing. We do **not** fork or re-implement those core behaviors of [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts).
-
-The performance impact of this extra known_hosts read should be minimal, as the file should typically be in the filesystem cache already from the original read by [golang.org/x/crypto/ssh/knownhosts](https://pkg.go.dev/golang.org/x/crypto/ssh/knownhosts). That said, users who wish to avoid the extra read can stay with the `New` constructor, which intentionally retains its pre-v1.3.0 behavior as-is. However, the extra fixes for @cert-authority and host pattern wildcards will not be enabled in that case.
-
-## Writing new known_hosts entries
-
-If you wish to mimic the behavior of OpenSSH's `StrictHostKeyChecking=no` or `StrictHostKeyChecking=ask`, this package provides a few functions to simplify this task. For example:
-
-```golang
-sshHost := "yourserver.com:22"
-khPath := "/home/myuser/.ssh/known_hosts"
-kh, err := knownhosts.NewDB(khPath)
-if err != nil {
-	log.Fatal("Failed to read known_hosts: ", err)
-}
-
-// Create a custom permissive hostkey callback which still errors on hosts
-// with changed keys, but allows unknown hosts and adds them to known_hosts
-cb := ssh.HostKeyCallback(func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-	innerCallback := kh.HostKeyCallback()
-	err := innerCallback(hostname, remote, key)
-	if knownhosts.IsHostKeyChanged(err) {
-		return fmt.Errorf("REMOTE HOST IDENTIFICATION HAS CHANGED for host %s! This may indicate a MitM attack.", hostname)
-	} else if knownhosts.IsHostUnknown(err) {
-		f, ferr := os.OpenFile(khPath, os.O_APPEND|os.O_WRONLY, 0600)
-		if ferr == nil {
-			defer f.Close()
-			ferr = knownhosts.WriteKnownHost(f, hostname, remote, key)
-		}
-		if ferr == nil {
-			log.Printf("Added host %s to known_hosts\n", hostname)
-		} else {
-			log.Printf("Failed to add host %s to known_hosts: %v\n", hostname, ferr)
-		}
-		return nil // permit previously-unknown hosts (warning: may be insecure)
-	}
-	return err
-})
-
-config := &ssh.ClientConfig{
-	User:              "myuser",
-	Auth:              []ssh.AuthMethod{ /* ... */ },
-	HostKeyCallback:   cb,
-	HostKeyAlgorithms: kh.HostKeyAlgorithms(sshHost),
-}
-```
-
-## License
-
-**Source code copyright 2025 Skeema LLC and the Skeema Knownhosts authors**
-
-```text
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```
diff --git a/vendor/github.com/skeema/knownhosts/knownhosts.go b/vendor/github.com/skeema/knownhosts/knownhosts.go
deleted file mode 100644
index 2b7536e0d..000000000
--- a/vendor/github.com/skeema/knownhosts/knownhosts.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// Package knownhosts is a thin wrapper around golang.org/x/crypto/ssh/knownhosts,
-// adding the ability to obtain the list of host key algorithms for a known host.
-package knownhosts
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"sort"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-	xknownhosts "golang.org/x/crypto/ssh/knownhosts"
-)
-
-// HostKeyDB wraps logic in golang.org/x/crypto/ssh/knownhosts with additional
-// behaviors, such as the ability to perform host key/algorithm lookups from
-// known_hosts entries.
-type HostKeyDB struct {
-	callback   ssh.HostKeyCallback
-	isCert     map[string]bool // keyed by "filename:line"
-	isWildcard map[string]bool // keyed by "filename:line"
-}
-
-// NewDB creates a HostKeyDB from the given OpenSSH known_hosts file(s). It
-// reads and parses the provided files one additional time (beyond logic in
-// golang.org/x/crypto/ssh/knownhosts) in order to:
-//
-//   - Handle CA lines properly and return ssh.CertAlgo* values when calling the
-//     HostKeyAlgorithms method, for use in ssh.ClientConfig.HostKeyAlgorithms
-//   - Allow * wildcards in hostnames to match on non-standard ports, providing
-//     a workaround for https://github.com/golang/go/issues/52056 in order to
-//     align with OpenSSH's wildcard behavior
-//
-// When supplying multiple files, their order does not matter.
-func NewDB(files ...string) (*HostKeyDB, error) {
-	cb, err := xknownhosts.New(files...)
-	if err != nil {
-		return nil, err
-	}
-	hkdb := &HostKeyDB{
-		callback:   cb,
-		isCert:     make(map[string]bool),
-		isWildcard: make(map[string]bool),
-	}
-
-	// Re-read each file a single time, looking for @cert-authority lines. The
-	// logic for reading the file is designed to mimic hostKeyDB.Read from
-	// golang.org/x/crypto/ssh/knownhosts
-	for _, filename := range files {
-		f, err := os.Open(filename)
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-		scanner := bufio.NewScanner(f)
-		lineNum := 0
-		for scanner.Scan() {
-			lineNum++
-			line := scanner.Bytes()
-			line = bytes.TrimSpace(line)
-			// Does the line start with "@cert-authority" followed by whitespace?
-			if len(line) > 15 && bytes.HasPrefix(line, []byte("@cert-authority")) && (line[15] == ' ' || line[15] == '\t') {
-				mapKey := fmt.Sprintf("%s:%d", filename, lineNum)
-				hkdb.isCert[mapKey] = true
-				line = bytes.TrimSpace(line[16:])
-			}
-			// truncate line to just the host pattern field
-			if i := bytes.IndexAny(line, "\t "); i >= 0 {
-				line = line[:i]
-			}
-			// Does the host pattern contain a * wildcard and no specific port?
-			if i := bytes.IndexRune(line, '*'); i >= 0 && !bytes.Contains(line[i:], []byte("]:")) {
-				mapKey := fmt.Sprintf("%s:%d", filename, lineNum)
-				hkdb.isWildcard[mapKey] = true
-			}
-		}
-		if err := scanner.Err(); err != nil {
-			return nil, fmt.Errorf("knownhosts: %s:%d: %w", filename, lineNum, err)
-		}
-	}
-	return hkdb, nil
-}
-
-// HostKeyCallback returns an ssh.HostKeyCallback. This can be used directly in
-// ssh.ClientConfig.HostKeyCallback, as shown in the example for NewDB.
-// Alternatively, you can wrap it with an outer callback to potentially handle
-// appending a new entry to the known_hosts file; see example in WriteKnownHost.
-func (hkdb *HostKeyDB) HostKeyCallback() ssh.HostKeyCallback {
-	// Either NewDB found no wildcard host patterns, or hkdb was created from
-	// HostKeyCallback.ToDB in which case we didn't scan known_hosts for them:
-	// return the callback (which came from x/crypto/ssh/knownhosts) as-is
-	if len(hkdb.isWildcard) == 0 {
-		return hkdb.callback
-	}
-
-	// If we scanned for wildcards and found at least one, return a wrapped
-	// callback with extra behavior: if the host lookup found no matches, and the
-	// host arg had a non-standard port, re-do the lookup on standard port 22. If
-	// that second call returns a *xknownhosts.KeyError, filter down any resulting
-	// Want keys to known wildcard entries.
-	f := func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-		callbackErr := hkdb.callback(hostname, remote, key)
-		if callbackErr == nil || IsHostKeyChanged(callbackErr) { // hostname has known_host entries as-is
-			return callbackErr
-		}
-		justHost, port, splitErr := net.SplitHostPort(hostname)
-		if splitErr != nil || port == "" || port == "22" { // hostname already using standard port
-			return callbackErr
-		}
-		// If we reach here, the port was non-standard and no known_host entries
-		// were found for the non-standard port. Try again with standard port.
-		if tcpAddr, ok := remote.(*net.TCPAddr); ok && tcpAddr.Port != 22 {
-			remote = &net.TCPAddr{
-				IP:   tcpAddr.IP,
-				Port: 22,
-				Zone: tcpAddr.Zone,
-			}
-		}
-		callbackErr = hkdb.callback(justHost+":22", remote, key)
-		var keyErr *xknownhosts.KeyError
-		if errors.As(callbackErr, &keyErr) && len(keyErr.Want) > 0 {
-			wildcardKeys := make([]xknownhosts.KnownKey, 0, len(keyErr.Want))
-			for _, wantKey := range keyErr.Want {
-				if hkdb.isWildcard[fmt.Sprintf("%s:%d", wantKey.Filename, wantKey.Line)] {
-					wildcardKeys = append(wildcardKeys, wantKey)
-				}
-			}
-			callbackErr = &xknownhosts.KeyError{
-				Want: wildcardKeys,
-			}
-		}
-		return callbackErr
-	}
-	return ssh.HostKeyCallback(f)
-}
-
-// PublicKey wraps ssh.PublicKey with an additional field, to identify
-// whether the key corresponds to a certificate authority.
-type PublicKey struct {
-	ssh.PublicKey
-	Cert bool
-}
-
-// HostKeys returns a slice of known host public keys for the supplied host:port
-// found in the known_hosts file(s), or an empty slice if the host is not
-// already known. For hosts that have multiple known_hosts entries (for
-// different key types), the result will be sorted by known_hosts filename and
-// line number.
-// If hkdb was originally created by calling NewDB, the Cert boolean field of
-// each result entry reports whether the key corresponded to a @cert-authority
-// line. If hkdb was NOT obtained from NewDB, then Cert will always be false.
-func (hkdb *HostKeyDB) HostKeys(hostWithPort string) (keys []PublicKey) {
-	var keyErr *xknownhosts.KeyError
-	placeholderAddr := &net.TCPAddr{IP: []byte{0, 0, 0, 0}}
-	placeholderPubKey := &fakePublicKey{}
-	var kkeys []xknownhosts.KnownKey
-	callback := hkdb.HostKeyCallback()
-	if hkcbErr := callback(hostWithPort, placeholderAddr, placeholderPubKey); errors.As(hkcbErr, &keyErr) {
-		kkeys = append(kkeys, keyErr.Want...)
-		knownKeyLess := func(i, j int) bool {
-			if kkeys[i].Filename < kkeys[j].Filename {
-				return true
-			}
-			return (kkeys[i].Filename == kkeys[j].Filename && kkeys[i].Line < kkeys[j].Line)
-		}
-		sort.Slice(kkeys, knownKeyLess)
-		keys = make([]PublicKey, len(kkeys))
-		for n := range kkeys {
-			keys[n] = PublicKey{
-				PublicKey: kkeys[n].Key,
-			}
-			if len(hkdb.isCert) > 0 {
-				keys[n].Cert = hkdb.isCert[fmt.Sprintf("%s:%d", kkeys[n].Filename, kkeys[n].Line)]
-			}
-		}
-	}
-	return keys
-}
-
-// HostKeyAlgorithms returns a slice of host key algorithms for the supplied
-// host:port found in the known_hosts file(s), or an empty slice if the host
-// is not already known. The result may be used in ssh.ClientConfig's
-// HostKeyAlgorithms field, either as-is or after filtering (if you wish to
-// ignore or prefer particular algorithms). For hosts that have multiple
-// known_hosts entries (of different key types), the result will be sorted by
-// known_hosts filename and line number.
-// If hkdb was originally created by calling NewDB, any @cert-authority lines
-// in the known_hosts file will properly be converted to the corresponding
-// ssh.CertAlgo* values.
-func (hkdb *HostKeyDB) HostKeyAlgorithms(hostWithPort string) (algos []string) {
-	// We ensure that algos never contains duplicates. This is done for robustness
-	// even though currently golang.org/x/crypto/ssh/knownhosts never exposes
-	// multiple keys of the same type. This way our behavior here is unaffected
-	// even if https://github.com/golang/go/issues/28870 is implemented, for
-	// example by https://github.com/golang/crypto/pull/254.
-	hostKeys := hkdb.HostKeys(hostWithPort)
-	seen := make(map[string]struct{}, len(hostKeys))
-	addAlgo := func(typ string, cert bool) {
-		if cert {
-			typ = keyTypeToCertAlgo(typ)
-		}
-		if _, already := seen[typ]; !already {
-			algos = append(algos, typ)
-			seen[typ] = struct{}{}
-		}
-	}
-	for _, key := range hostKeys {
-		typ := key.Type()
-		if typ == ssh.KeyAlgoRSA {
-			// KeyAlgoRSASHA256 and KeyAlgoRSASHA512 are only public key algorithms,
-			// not public key formats, so they can't appear as a PublicKey.Type.
-			// The corresponding PublicKey.Type is KeyAlgoRSA. See RFC 8332, Section 2.
-			addAlgo(ssh.KeyAlgoRSASHA512, key.Cert)
-			addAlgo(ssh.KeyAlgoRSASHA256, key.Cert)
-		}
-		addAlgo(typ, key.Cert)
-	}
-	return algos
-}
-
-func keyTypeToCertAlgo(keyType string) string {
-	switch keyType {
-	case ssh.KeyAlgoRSA:
-		return ssh.CertAlgoRSAv01
-	case ssh.KeyAlgoRSASHA256:
-		return ssh.CertAlgoRSASHA256v01
-	case ssh.KeyAlgoRSASHA512:
-		return ssh.CertAlgoRSASHA512v01
-	case ssh.KeyAlgoDSA:
-		return ssh.CertAlgoDSAv01
-	case ssh.KeyAlgoECDSA256:
-		return ssh.CertAlgoECDSA256v01
-	case ssh.KeyAlgoSKECDSA256:
-		return ssh.CertAlgoSKECDSA256v01
-	case ssh.KeyAlgoECDSA384:
-		return ssh.CertAlgoECDSA384v01
-	case ssh.KeyAlgoECDSA521:
-		return ssh.CertAlgoECDSA521v01
-	case ssh.KeyAlgoED25519:
-		return ssh.CertAlgoED25519v01
-	case ssh.KeyAlgoSKED25519:
-		return ssh.CertAlgoSKED25519v01
-	}
-	return ""
-}
-
-// HostKeyCallback wraps ssh.HostKeyCallback with additional methods to
-// perform host key and algorithm lookups from the known_hosts entries. It is
-// otherwise identical to ssh.HostKeyCallback, and does not introduce any file-
-// parsing behavior beyond what is in golang.org/x/crypto/ssh/knownhosts.
-//
-// In most situations, use HostKeyDB and its constructor NewDB instead of using
-// the HostKeyCallback type. The HostKeyCallback type is only provided for
-// backwards compatibility with older versions of this package, as well as for
-// very strict situations where any extra known_hosts file-parsing is
-// undesirable.
-//
-// Methods of HostKeyCallback do not provide any special treatment for
-// @cert-authority lines, which will (incorrectly) look like normal non-CA host
-// keys. Additionally, HostKeyCallback lacks the fix for applying * wildcard
-// known_host entries to all ports, like OpenSSH's behavior.
-type HostKeyCallback ssh.HostKeyCallback
-
-// New creates a HostKeyCallback from the given OpenSSH known_hosts file(s). The
-// returned value may be used in ssh.ClientConfig.HostKeyCallback by casting it
-// to ssh.HostKeyCallback, or using its HostKeyCallback method. Otherwise, it
-// operates the same as the New function in golang.org/x/crypto/ssh/knownhosts.
-// When supplying multiple files, their order does not matter.
-//
-// In most situations, you should avoid this function, as the returned value
-// lacks several enhanced behaviors. See doc comment for HostKeyCallback for
-// more information. Instead, most callers should use NewDB to create a
-// HostKeyDB, which includes these enhancements.
-func New(files ...string) (HostKeyCallback, error) {
-	cb, err := xknownhosts.New(files...)
-	return HostKeyCallback(cb), err
-}
-
-// HostKeyCallback simply casts the receiver back to ssh.HostKeyCallback, for
-// use in ssh.ClientConfig.HostKeyCallback.
-func (hkcb HostKeyCallback) HostKeyCallback() ssh.HostKeyCallback {
-	return ssh.HostKeyCallback(hkcb)
-}
-
-// ToDB converts the receiver into a HostKeyDB. However, the returned HostKeyDB
-// lacks the enhanced behaviors described in the doc comment for NewDB: proper
-// CA support, and wildcard matching on nonstandard ports.
-//
-// It is generally preferable to create a HostKeyDB by using NewDB. The ToDB
-// method is only provided for situations in which the calling code needs to
-// make the extra NewDB behaviors optional / user-configurable, perhaps for
-// reasons of performance or code trust (since NewDB reads the known_host file
-// an extra time, which may be undesirable in some strict situations). This way,
-// callers can conditionally create a non-enhanced HostKeyDB by using New and
-// ToDB. See code example.
-func (hkcb HostKeyCallback) ToDB() *HostKeyDB {
-	// This intentionally leaves the isCert and isWildcard map fields as nil, as
-	// there is no way to retroactively populate them from just a HostKeyCallback.
-	// Methods of HostKeyDB will skip any related enhanced behaviors accordingly.
-	return &HostKeyDB{callback: ssh.HostKeyCallback(hkcb)}
-}
-
-// HostKeys returns a slice of known host public keys for the supplied host:port
-// found in the known_hosts file(s), or an empty slice if the host is not
-// already known. For hosts that have multiple known_hosts entries (for
-// different key types), the result will be sorted by known_hosts filename and
-// line number.
-// In the returned values, there is no way to distinguish between CA keys
-// (known_hosts lines beginning with @cert-authority) and regular keys. To do
-// so, see NewDB and HostKeyDB.HostKeys instead.
-func (hkcb HostKeyCallback) HostKeys(hostWithPort string) []ssh.PublicKey {
-	annotatedKeys := hkcb.ToDB().HostKeys(hostWithPort)
-	rawKeys := make([]ssh.PublicKey, len(annotatedKeys))
-	for n, ak := range annotatedKeys {
-		rawKeys[n] = ak.PublicKey
-	}
-	return rawKeys
-}
-
-// HostKeyAlgorithms returns a slice of host key algorithms for the supplied
-// host:port found in the known_hosts file(s), or an empty slice if the host
-// is not already known. The result may be used in ssh.ClientConfig's
-// HostKeyAlgorithms field, either as-is or after filtering (if you wish to
-// ignore or prefer particular algorithms). For hosts that have multiple
-// known_hosts entries (for different key types), the result will be sorted by
-// known_hosts filename and line number.
-// The returned values will not include ssh.CertAlgo* values. If any
-// known_hosts lines had @cert-authority prefixes, their original key algo will
-// be returned instead. For proper CA support, see NewDB and
-// HostKeyDB.HostKeyAlgorithms instead.
-func (hkcb HostKeyCallback) HostKeyAlgorithms(hostWithPort string) (algos []string) {
-	return hkcb.ToDB().HostKeyAlgorithms(hostWithPort)
-}
-
-// HostKeyAlgorithms is a convenience function for performing host key algorithm
-// lookups on an ssh.HostKeyCallback directly. It is intended for use in code
-// paths that stay with the New method of golang.org/x/crypto/ssh/knownhosts
-// rather than this package's New or NewDB methods.
-// The returned values will not include ssh.CertAlgo* values. If any
-// known_hosts lines had @cert-authority prefixes, their original key algo will
-// be returned instead. For proper CA support, see NewDB and
-// HostKeyDB.HostKeyAlgorithms instead.
-func HostKeyAlgorithms(cb ssh.HostKeyCallback, hostWithPort string) []string {
-	return HostKeyCallback(cb).HostKeyAlgorithms(hostWithPort)
-}
-
-// IsHostKeyChanged returns a boolean indicating whether the error indicates
-// the host key has changed. It is intended to be called on the error returned
-// from invoking a host key callback, to check whether an SSH host is known.
-func IsHostKeyChanged(err error) bool {
-	var keyErr *xknownhosts.KeyError
-	return errors.As(err, &keyErr) && len(keyErr.Want) > 0
-}
-
-// IsHostUnknown returns a boolean indicating whether the error represents an
-// unknown host. It is intended to be called on the error returned from invoking
-// a host key callback to check whether an SSH host is known.
-func IsHostUnknown(err error) bool {
-	var keyErr *xknownhosts.KeyError
-	return errors.As(err, &keyErr) && len(keyErr.Want) == 0
-}
-
-// Normalize normalizes an address into the form used in known_hosts. This
-// implementation includes a fix for https://github.com/golang/go/issues/53463
-// and will omit brackets around ipv6 addresses on standard port 22.
-func Normalize(address string) string {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		host = address
-		port = "22"
-	}
-	entry := host
-	if port != "22" {
-		entry = "[" + entry + "]:" + port
-	} else if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
-		entry = entry[1 : len(entry)-1]
-	}
-	return entry
-}
-
-// Line returns a line to append to the known_hosts files. This implementation
-// uses the local patched implementation of Normalize in order to solve
-// https://github.com/golang/go/issues/53463.
-func Line(addresses []string, key ssh.PublicKey) string {
-	var trimmed []string
-	for _, a := range addresses {
-		trimmed = append(trimmed, Normalize(a))
-	}
-
-	return strings.Join([]string{
-		strings.Join(trimmed, ","),
-		key.Type(),
-		base64.StdEncoding.EncodeToString(key.Marshal()),
-	}, " ")
-}
-
-// WriteKnownHost writes a known_hosts line to w for the supplied hostname,
-// remote, and key. This is useful when writing a custom hostkey callback which
-// wraps a callback obtained from this package to provide additional known_hosts
-// management functionality. The hostname, remote, and key typically correspond
-// to the callback's args. This function does not support writing
-// @cert-authority lines.
-func WriteKnownHost(w io.Writer, hostname string, remote net.Addr, key ssh.PublicKey) error {
-	// Always include hostname; only also include remote if it isn't a zero value
-	// and doesn't normalize to the same string as hostname.
-	hostnameNormalized := Normalize(hostname)
-	if strings.ContainsAny(hostnameNormalized, "\t ") {
-		return fmt.Errorf("knownhosts: hostname '%s' contains spaces", hostnameNormalized)
-	}
-	addresses := []string{hostnameNormalized}
-	remoteStrNormalized := Normalize(remote.String())
-	if remoteStrNormalized != "[0.0.0.0]:0" && remoteStrNormalized != hostnameNormalized &&
-		!strings.ContainsAny(remoteStrNormalized, "\t ") {
-		addresses = append(addresses, remoteStrNormalized)
-	}
-	line := Line(addresses, key) + "\n"
-	_, err := w.Write([]byte(line))
-	return err
-}
-
-// WriteKnownHostCA writes a @cert-authority line to w for the supplied host
-// name/pattern and key.
-func WriteKnownHostCA(w io.Writer, hostPattern string, key ssh.PublicKey) error {
-	encodedKey := base64.StdEncoding.EncodeToString(key.Marshal())
-	_, err := fmt.Fprintf(w, "@cert-authority %s %s %s\n", hostPattern, key.Type(), encodedKey)
-	return err
-}
-
-// fakePublicKey is used as part of the work-around for
-// https://github.com/golang/go/issues/29286
-type fakePublicKey struct{}
-
-func (fakePublicKey) Type() string {
-	return "fake-public-key"
-}
-func (fakePublicKey) Marshal() []byte {
-	return []byte("fake public key")
-}
-func (fakePublicKey) Verify(_ []byte, _ *ssh.Signature) error {
-	return errors.New("Verify called on placeholder key")
-}
diff --git a/vendor/github.com/spf13/afero/.editorconfig b/vendor/github.com/spf13/afero/.editorconfig
new file mode 100644
index 000000000..a85749f19
--- /dev/null
+++ b/vendor/github.com/spf13/afero/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.go]
+indent_style = tab
+
+[{*.yml,*.yaml}]
+indent_size = 2
diff --git a/vendor/github.com/spf13/afero/.golangci.yaml b/vendor/github.com/spf13/afero/.golangci.yaml
new file mode 100644
index 000000000..4f359b81a
--- /dev/null
+++ b/vendor/github.com/spf13/afero/.golangci.yaml
@@ -0,0 +1,48 @@
+version: "2"
+
+run:
+  timeout: 10m
+
+linters:
+  enable:
+    - govet
+    - ineffassign
+    - misspell
+    - nolintlint
+    # - revive
+    - staticcheck
+    - unused
+
+  disable:
+    - errcheck
+    # - staticcheck
+
+  settings:
+    misspell:
+      locale: US
+    nolintlint:
+      allow-unused: false # report any unused nolint directives
+      require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+
+  exclusions:
+    paths:
+      - gcsfs/internal/stiface
+
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+    - golines
+
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - localmodule
+
+  exclusions:
+    paths:
+      - gcsfs/internal/stiface
diff --git a/vendor/github.com/spf13/afero/README.md b/vendor/github.com/spf13/afero/README.md
index 3bafbfdfc..ef67e9a77 100644
--- a/vendor/github.com/spf13/afero/README.md
+++ b/vendor/github.com/spf13/afero/README.md
@@ -1,442 +1,474 @@
-![afero logo-sm](https://cloud.githubusercontent.com/assets/173412/11490338/d50e16dc-97a5-11e5-8b12-019a300d0fcb.png)
-
-A FileSystem Abstraction System for Go
-
-[![Test](https://github.com/spf13/afero/actions/workflows/test.yml/badge.svg)](https://github.com/spf13/afero/actions/workflows/test.yml) [![GoDoc](https://godoc.org/github.com/spf13/afero?status.svg)](https://godoc.org/github.com/spf13/afero) [![Join the chat at https://gitter.im/spf13/afero](https://badges.gitter.im/Dev%20Chat.svg)](https://gitter.im/spf13/afero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-# Overview
-
-Afero is a filesystem framework providing a simple, uniform and universal API
-interacting with any filesystem, as an abstraction layer providing interfaces,
-types and methods. Afero has an exceptionally clean interface and simple design
-without needless constructors or initialization methods.
-
-Afero is also a library providing a base set of interoperable backend
-filesystems that make it easy to work with afero while retaining all the power
-and benefit of the os and ioutil packages.
-
-Afero provides significant improvements over using the os package alone, most
-notably the ability to create mock and testing filesystems without relying on the disk.
-
-It is suitable for use in any situation where you would consider using the OS
-package as it provides an additional abstraction that makes it easy to use a
-memory backed file system during testing. It also adds support for the http
-filesystem for full interoperability.
+afero logo-sm
 
 
-## Afero Features
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/spf13/afero/ci.yaml?branch=master&style=flat-square)](https://github.com/spf13/afero/actions?query=workflow%3ACI)
+[![GoDoc](https://pkg.go.dev/badge/mod/github.com/spf13/afero)](https://pkg.go.dev/mod/github.com/spf13/afero)
+[![Go Report Card](https://goreportcard.com/badge/github.com/spf13/afero)](https://goreportcard.com/report/github.com/spf13/afero)
+![Go Version](https://img.shields.io/badge/go%20version-%3E=1.23-61CFDD.svg?style=flat-square")
 
-* A single consistent API for accessing a variety of filesystems
-* Interoperation between a variety of file system types
-* A set of interfaces to encourage and enforce interoperability between backends
-* An atomic cross platform memory backed file system
-* Support for compositional (union) file systems by combining multiple file systems acting as one
-* Specialized backends which modify existing filesystems (Read Only, Regexp filtered)
-* A set of utility functions ported from io, ioutil & hugo to be afero aware
-* Wrapper for go 1.16 filesystem abstraction `io/fs.FS`
 
-# Using Afero
+# Afero: The Universal Filesystem Abstraction for Go
 
-Afero is easy to use and easier to adopt.
+Afero is a powerful and extensible filesystem abstraction system for Go. It provides a single, unified API for interacting with diverse filesystems—including the local disk, memory, archives, and network storage.
 
-A few different ways you could use Afero:
+Afero acts as a drop-in replacement for the standard `os` package, enabling you to write modular code that is agnostic to the underlying storage, dramatically simplifies testing, and allows for sophisticated architectural patterns through filesystem composition.
 
-* Use the interfaces alone to define your own file system.
-* Wrapper for the OS packages.
-* Define different filesystems for different parts of your application.
-* Use Afero for mock filesystems while testing
+## Why Afero?
 
-## Step 1: Install Afero
+Afero elevates filesystem interaction beyond simple file reading and writing, offering solutions for testability, flexibility, and advanced architecture.
 
-First use go get to install the latest version of the library.
+🔑 **Key Features:**
 
-    $ go get github.com/spf13/afero
+*   **Universal API:** Write your code once. Run it against the local OS, in-memory storage, ZIP/TAR archives, or remote systems (SFTP, GCS).
+*   **Ultimate Testability:** Utilize `MemMapFs`, a fully concurrent-safe, read/write in-memory filesystem. Write fast, isolated, and reliable unit tests without touching the physical disk or worrying about cleanup.
+*   **Powerful Composition:** Afero's hidden superpower. Layer filesystems on top of each other to create sophisticated behaviors:
+    *   **Sandboxing:** Use `CopyOnWriteFs` to create temporary scratch spaces that isolate changes from the base filesystem.
+    *   **Caching:** Use `CacheOnReadFs` to automatically layer a fast cache (like memory) over a slow backend (like a network drive).
+    *   **Security Jails:** Use `BasePathFs` to restrict application access to a specific subdirectory (chroot).
+*   **`os` Package Compatibility:** Afero mirrors the functions in the standard `os` package, making adoption and refactoring seamless.
+*   **`io/fs` Compatibility:** Fully compatible with the Go standard library's `io/fs` interfaces.
+
+## Installation
+
+```bash
+go get github.com/spf13/afero
+```
 
-Next include Afero in your application.
 ```go
 import "github.com/spf13/afero"
 ```
 
-## Step 2: Declare a backend
+## Quick Start: The Power of Abstraction
 
-First define a package variable and set it to a pointer to a filesystem.
-```go
-var AppFs = afero.NewMemMapFs()
+The core of Afero is the `afero.Fs` interface. By designing your functions to accept this interface rather than calling `os.*` functions directly, your code instantly becomes more flexible and testable.
 
-or
+### 1. Refactor Your Code
 
-var AppFs = afero.NewOsFs()
-```
-It is important to note that if you repeat the composite literal you
-will be using a completely new and isolated filesystem. In the case of
-OsFs it will still use the same underlying filesystem but will reduce
-the ability to drop in other filesystems as desired.
-
-## Step 3: Use it like you would the OS package
-
-Throughout your application use any function and method like you normally
-would.
-
-So if my application before had:
-```go
-os.Open("/tmp/foo")
-```
-We would replace it with:
-```go
-AppFs.Open("/tmp/foo")
-```
-
-`AppFs` being the variable we defined above.
-
-
-## List of all available functions
-
-File System Methods Available:
-```go
-Chmod(name string, mode os.FileMode) : error
-Chown(name string, uid, gid int) : error
-Chtimes(name string, atime time.Time, mtime time.Time) : error
-Create(name string) : File, error
-Mkdir(name string, perm os.FileMode) : error
-MkdirAll(path string, perm os.FileMode) : error
-Name() : string
-Open(name string) : File, error
-OpenFile(name string, flag int, perm os.FileMode) : File, error
-Remove(name string) : error
-RemoveAll(path string) : error
-Rename(oldname, newname string) : error
-Stat(name string) : os.FileInfo, error
-```
-File Interfaces and Methods Available:
-```go
-io.Closer
-io.Reader
-io.ReaderAt
-io.Seeker
-io.Writer
-io.WriterAt
-
-Name() : string
-Readdir(count int) : []os.FileInfo, error
-Readdirnames(n int) : []string, error
-Stat() : os.FileInfo, error
-Sync() : error
-Truncate(size int64) : error
-WriteString(s string) : ret int, err error
-```
-In some applications it may make sense to define a new package that
-simply exports the file system variable for easy access from anywhere.
-
-## Using Afero's utility functions
-
-Afero provides a set of functions to make it easier to use the underlying file systems.
-These functions have been primarily ported from io & ioutil with some developed for Hugo.
-
-The afero utilities support all afero compatible backends.
-
-The list of utilities includes:
+Change functions that rely on the `os` package to accept `afero.Fs`.
 
 ```go
-DirExists(path string) (bool, error)
-Exists(path string) (bool, error)
-FileContainsBytes(filename string, subslice []byte) (bool, error)
-GetTempDir(subPath string) string
-IsDir(path string) (bool, error)
-IsEmpty(path string) (bool, error)
-ReadDir(dirname string) ([]os.FileInfo, error)
-ReadFile(filename string) ([]byte, error)
-SafeWriteReader(path string, r io.Reader) (err error)
-TempDir(dir, prefix string) (name string, err error)
-TempFile(dir, prefix string) (f File, err error)
-Walk(root string, walkFn filepath.WalkFunc) error
-WriteFile(filename string, data []byte, perm os.FileMode) error
-WriteReader(path string, r io.Reader) (err error)
-```
-For a complete list see [Afero's GoDoc](https://godoc.org/github.com/spf13/afero)
+// Before: Coupled to the OS and difficult to test
+// func ProcessConfiguration(path string) error {
+//     data, err := os.ReadFile(path)
+//     ...
+// }
 
-They are available under two different approaches to use. You can either call
-them directly where the first parameter of each function will be the file
-system, or you can declare a new `Afero`, a custom type used to bind these
-functions as methods to a given filesystem.
+import "github.com/spf13/afero"
 
-### Calling utilities directly
-
-```go
-fs := new(afero.MemMapFs)
-f, err := afero.TempFile(fs,"", "ioutil-test")
-
-```
-
-### Calling via Afero
-
-```go
-fs := afero.NewMemMapFs()
-afs := &afero.Afero{Fs: fs}
-f, err := afs.TempFile("", "ioutil-test")
-```
-
-## Using Afero for Testing
-
-There is a large benefit to using a mock filesystem for testing. It has a
-completely blank state every time it is initialized and can be easily
-reproducible regardless of OS. You could create files to your heart’s content
-and the file access would be fast while also saving you from all the annoying
-issues with deleting temporary files, Windows file locking, etc. The MemMapFs
-backend is perfect for testing.
-
-* Much faster than performing I/O operations on disk
-* Avoid security issues and permissions
-* Far more control. 'rm -rf /' with confidence
-* Test setup is far more easier to do
-* No test cleanup needed
-
-One way to accomplish this is to define a variable as mentioned above.
-In your application this will be set to afero.NewOsFs() during testing you
-can set it to afero.NewMemMapFs().
-
-It wouldn't be uncommon to have each test initialize a blank slate memory
-backend. To do this I would define my `appFS = afero.NewOsFs()` somewhere
-appropriate in my application code. This approach ensures that Tests are order
-independent, with no test relying on the state left by an earlier test.
-
-Then in my tests I would initialize a new MemMapFs for each test:
-```go
-func TestExist(t *testing.T) {
-	appFS := afero.NewMemMapFs()
-	// create test files and directories
-	appFS.MkdirAll("src/a", 0755)
-	afero.WriteFile(appFS, "src/a/b", []byte("file b"), 0644)
-	afero.WriteFile(appFS, "src/c", []byte("file c"), 0644)
-	name := "src/c"
-	_, err := appFS.Stat(name)
-	if os.IsNotExist(err) {
-		t.Errorf("file \"%s\" does not exist.\n", name)
-	}
+// After: Decoupled, flexible, and testable
+func ProcessConfiguration(fs afero.Fs, path string) error {
+    // Use Afero utility functions which mirror os/ioutil
+    data, err := afero.ReadFile(fs, path)
+    // ... process the data
+    return err
 }
 ```
 
-# Available Backends
+### 2. Usage in Production
 
-## Operating System Native
-
-### OsFs
-
-The first is simply a wrapper around the native OS calls. This makes it
-very easy to use as all of the calls are the same as the existing OS
-calls. It also makes it trivial to have your code use the OS during
-operation and a mock filesystem during testing or as needed.
+In your production environment, inject the `OsFs` backend, which wraps the standard operating system calls.
 
 ```go
-appfs := afero.NewOsFs()
-appfs.MkdirAll("src/a", 0755)
+func main() {
+    // Use the real OS filesystem
+    AppFs := afero.NewOsFs()
+    ProcessConfiguration(AppFs, "/etc/myapp.conf")
+}
 ```
 
-## Memory Backed Storage
+### 3. Usage in Testing
 
-### MemMapFs
-
-Afero also provides a fully atomic memory backed filesystem perfect for use in
-mocking and to speed up unnecessary disk io when persistence isn’t
-necessary. It is fully concurrent and will work within go routines
-safely.
+In your tests, inject `MemMapFs`. This provides a blazing-fast, isolated, in-memory filesystem that requires no disk I/O and no cleanup.
 
 ```go
-mm := afero.NewMemMapFs()
-mm.MkdirAll("src/a", 0755)
+func TestProcessConfiguration(t *testing.T) {
+    // Use the in-memory filesystem
+    AppFs := afero.NewMemMapFs()
+    
+    // Pre-populate the memory filesystem for the test
+    configPath := "/test/config.json"
+    afero.WriteFile(AppFs, configPath, []byte(`{"feature": true}`), 0644)
+
+    // Run the test entirely in memory
+    err := ProcessConfiguration(AppFs, configPath)
+    if err != nil {
+        t.Fatal(err)
+    }
+}
 ```
 
-#### InMemoryFile
+## Afero's Superpower: Composition
 
-As part of MemMapFs, Afero also provides an atomic, fully concurrent memory
-backed file implementation. This can be used in other memory backed file
-systems with ease. Plans are to add a radix tree memory stored file
-system using InMemoryFile.
+Afero's most unique feature is its ability to combine filesystems. This allows you to build complex behaviors out of simple components, keeping your application logic clean.
 
-## Network Interfaces
+### Example 1: Sandboxing with Copy-on-Write
 
-### SftpFs
-
-Afero has experimental support for secure file transfer protocol (sftp). Which can
-be used to perform file operations over a encrypted channel.
-
-### GCSFs
-
-Afero has experimental support for Google Cloud Storage (GCS). You can either set the
-`GOOGLE_APPLICATION_CREDENTIALS_JSON` env variable to your JSON credentials or use `opts` in
-`NewGcsFS` to configure access to your GCS bucket.
-
-Some known limitations of the existing implementation:
-* No Chmod support - The GCS ACL could probably be mapped to *nix style permissions but that would add another level of complexity and is ignored in this version.
-* No Chtimes support - Could be simulated with attributes (gcs a/m-times are set implicitly) but that's is left for another version.
-* Not thread safe - Also assumes all file operations are done through the same instance of the GcsFs. File operations between different GcsFs instances are not guaranteed to be consistent.
-
-
-## Filtering Backends
-
-### BasePathFs
-
-The BasePathFs restricts all operations to a given path within an Fs.
-The given file name to the operations on this Fs will be prepended with
-the base path before calling the source Fs.
+Create a temporary environment where an application can "modify" system files without affecting the actual disk.
 
 ```go
-bp := afero.NewBasePathFs(afero.NewOsFs(), "/base/path")
+// 1. The base layer is the real OS, made read-only for safety.
+baseFs := afero.NewReadOnlyFs(afero.NewOsFs())
+
+// 2. The overlay layer is a temporary in-memory filesystem for changes.
+overlayFs := afero.NewMemMapFs()
+
+// 3. Combine them. Reads fall through to the base; writes only hit the overlay.
+sandboxFs := afero.NewCopyOnWriteFs(baseFs, overlayFs)
+
+// The application can now "modify" /etc/hosts, but the changes are isolated in memory.
+afero.WriteFile(sandboxFs, "/etc/hosts", []byte("127.0.0.1 sandboxed-app"), 0644)
+
+// The real /etc/hosts on disk is untouched.
 ```
 
-### ReadOnlyFs
+### Example 2: Caching a Slow Filesystem
 
-A thin wrapper around the source Fs providing a read only view.
+Improve performance by layering a fast cache (like memory) over a slow backend (like a network drive or cloud storage).
 
 ```go
-fs := afero.NewReadOnlyFs(afero.NewOsFs())
-_, err := fs.Create("/file.txt")
-// err = syscall.EPERM
+import "time"
+
+// Assume 'remoteFs' is a slow backend (e.g., SFTP or GCS)
+var remoteFs afero.Fs 
+
+// 'cacheFs' is a fast in-memory backend
+cacheFs := afero.NewMemMapFs()
+
+// Create the caching layer. Cache items for 5 minutes upon first read.
+cachedFs := afero.NewCacheOnReadFs(remoteFs, cacheFs, 5*time.Minute)
+
+// The first read is slow (fetches from remote, then caches)
+data1, _ := afero.ReadFile(cachedFs, "data.json")
+
+// The second read is instant (serves from memory cache)
+data2, _ := afero.ReadFile(cachedFs, "data.json")
 ```
 
-# RegexpFs
+### Example 3: Security Jails (chroot)
 
-A filtered view on file names, any file NOT matching
-the passed regexp will be treated as non-existing.
-Files not matching the regexp provided will not be created.
-Directories are not filtered.
+Restrict an application component's access to a specific subdirectory.
 
 ```go
-fs := afero.NewRegexpFs(afero.NewMemMapFs(), regexp.MustCompile(`\.txt$`))
-_, err := fs.Create("/file.html")
-// err = syscall.ENOENT
+osFs := afero.NewOsFs()
+
+// Create a filesystem rooted at /home/user/public
+// The application cannot access anything above this directory.
+jailedFs := afero.NewBasePathFs(osFs, "/home/user/public")
+
+// To the application, this is reading "/"
+// In reality, it's reading "/home/user/public/"
+dirInfo, err := afero.ReadDir(jailedFs, "/")
+
+// Attempts to access parent directories fail
+_, err = jailedFs.Open("../secrets.txt") // Returns an error
 ```
 
-### HttpFs
+## Real-World Use Cases
 
-Afero provides an http compatible backend which can wrap any of the existing
-backends.
+### Build Cloud-Agnostic Applications
 
-The Http package requires a slightly specific version of Open which
-returns an http.File type.
-
-Afero provides an httpFs file system which satisfies this requirement.
-Any Afero FileSystem can be used as an httpFs.
+Write applications that seamlessly work with different storage backends:
 
 ```go
-httpFs := afero.NewHttpFs()
-fileserver := http.FileServer(httpFs.Dir())
-http.Handle("/", fileserver)
+type DocumentProcessor struct {
+    fs afero.Fs
+}
+
+func NewDocumentProcessor(fs afero.Fs) *DocumentProcessor {
+    return &DocumentProcessor{fs: fs}
+}
+
+func (p *DocumentProcessor) Process(inputPath, outputPath string) error {
+    // This code works whether fs is local disk, cloud storage, or memory
+    content, err := afero.ReadFile(p.fs, inputPath)
+    if err != nil {
+        return err
+    }
+    
+    processed := processContent(content)
+    return afero.WriteFile(p.fs, outputPath, processed, 0644)
+}
+
+// Use with local filesystem
+processor := NewDocumentProcessor(afero.NewOsFs())
+
+// Use with Google Cloud Storage
+processor := NewDocumentProcessor(gcsFS)
+
+// Use with in-memory filesystem for testing
+processor := NewDocumentProcessor(afero.NewMemMapFs())
 ```
 
-## Composite Backends
+### Treating Archives as Filesystems
 
-Afero provides the ability have two filesystems (or more) act as a single
-file system.
-
-### CacheOnReadFs
-
-The CacheOnReadFs will lazily make copies of any accessed files from the base
-layer into the overlay. Subsequent reads will be pulled from the overlay
-directly permitting the request is within the cache duration of when it was
-created in the overlay.
-
-If the base filesystem is writeable, any changes to files will be
-done first to the base, then to the overlay layer. Write calls to open file
-handles like `Write()` or `Truncate()` to the overlay first.
-
-To writing files to the overlay only, you can use the overlay Fs directly (not
-via the union Fs).
-
-Cache files in the layer for the given time.Duration, a cache duration of 0
-means "forever" meaning the file will not be re-requested from the base ever.
-
-A read-only base will make the overlay also read-only but still copy files
-from the base to the overlay when they're not present (or outdated) in the
-caching layer.
+Read files directly from `.zip` or `.tar` archives without unpacking them to disk first.
 
 ```go
-base := afero.NewOsFs()
-layer := afero.NewMemMapFs()
-ufs := afero.NewCacheOnReadFs(base, layer, 100 * time.Second)
+import (
+    "archive/zip"
+    "github.com/spf13/afero/zipfs"
+)
+
+// Assume 'zipReader' is a *zip.Reader initialized from a file or memory
+var zipReader *zip.Reader 
+
+// Create a read-only ZipFs
+archiveFS := zipfs.New(zipReader)
+
+// Read a file from within the archive using the standard Afero API
+content, err := afero.ReadFile(archiveFS, "/docs/readme.md")
 ```
 
-### CopyOnWriteFs()
+### Serving Any Filesystem over HTTP
 
-The CopyOnWriteFs is a read only base file system with a potentially
-writeable layer on top.
-
-Read operations will first look in the overlay and if not found there, will
-serve the file from the base.
-
-Changes to the file system will only be made in the overlay.
-
-Any attempt to modify a file found only in the base will copy the file to the
-overlay layer before modification (including opening a file with a writable
-handle).
-
-Removing and Renaming files present only in the base layer is not currently
-permitted. If a file is present in the base layer and the overlay, only the
-overlay will be removed/renamed.
+Use `HttpFs` to expose any Afero filesystem—even one created dynamically in memory—through a standard Go web server.
 
 ```go
-	base := afero.NewOsFs()
-	roBase := afero.NewReadOnlyFs(base)
-	ufs := afero.NewCopyOnWriteFs(roBase, afero.NewMemMapFs())
+import (
+    "net/http"
+    "github.com/spf13/afero"
+)
 
-	fh, _ = ufs.Create("/home/test/file2.txt")
-	fh.WriteString("This is a test")
-	fh.Close()
+func main() {
+    memFS := afero.NewMemMapFs()
+    afero.WriteFile(memFS, "index.html", []byte("
    Hello from Memory!
    "), 0644)
+
+    // Wrap the memory filesystem to make it compatible with http.FileServer.
+    httpFS := afero.NewHttpFs(memFS)
+
+    http.Handle("/", http.FileServer(httpFS.Dir("/")))
+    http.ListenAndServe(":8080", nil)
+}
 ```
 
-In this example all write operations will only occur in memory (MemMapFs)
-leaving the base filesystem (OsFs) untouched.
+### Testing Made Simple
 
+One of Afero's greatest strengths is making filesystem-dependent code easily testable:
 
-## Desired/possible backends
+```go
+func SaveUserData(fs afero.Fs, userID string, data []byte) error {
+    filename := fmt.Sprintf("users/%s.json", userID)
+    return afero.WriteFile(fs, filename, data, 0644)
+}
 
-The following is a short list of possible backends we hope someone will
-implement:
+func TestSaveUserData(t *testing.T) {
+    // Create a clean, fast, in-memory filesystem for testing
+    testFS := afero.NewMemMapFs()
+    
+    userData := []byte(`{"name": "John", "email": "john@example.com"}`)
+    err := SaveUserData(testFS, "123", userData)
+    
+    if err != nil {
+        t.Fatalf("SaveUserData failed: %v", err)
+    }
+    
+    // Verify the file was saved correctly
+    saved, err := afero.ReadFile(testFS, "users/123.json")
+    if err != nil {
+        t.Fatalf("Failed to read saved file: %v", err)
+    }
+    
+    if string(saved) != string(userData) {
+        t.Errorf("Data mismatch: got %s, want %s", saved, userData)
+    }
+}
+```
 
-* SSH
-* S3
+**Benefits of testing with Afero:**
+- ⚡ **Fast** - No disk I/O, tests run in memory
+- 🔄 **Reliable** - Each test starts with a clean slate
+- 🧹 **No cleanup** - Memory is automatically freed
+- 🔒 **Safe** - Can't accidentally modify real files
+- 🏃 **Parallel** - Tests can run concurrently without conflicts
 
-# About the project
+## Backend Reference
 
-## What's in the name
+| Type | Backend | Constructor | Description | Status |
+| :--- | :--- | :--- | :--- | :--- |
+| **Core** | **OsFs** | `afero.NewOsFs()` | Interacts with the real operating system filesystem. Use in production. | ✅ Official |
+| | **MemMapFs** | `afero.NewMemMapFs()` | A fast, atomic, concurrent-safe, in-memory filesystem. Ideal for testing. | ✅ Official |
+| **Composition** | **CopyOnWriteFs**| `afero.NewCopyOnWriteFs(base, overlay)` | A read-only base with a writable overlay. Ideal for sandboxing. | ✅ Official |
+| | **CacheOnReadFs**| `afero.NewCacheOnReadFs(base, cache, ttl)` | Lazily caches files from a slow base into a fast layer on first read. | ✅ Official |
+| | **BasePathFs** | `afero.NewBasePathFs(source, path)` | Restricts operations to a subdirectory (chroot/jail). | ✅ Official |
+| | **ReadOnlyFs** | `afero.NewReadOnlyFs(source)` | Provides a read-only view, preventing any modifications. | ✅ Official |
+| | **RegexpFs** | `afero.NewRegexpFs(source, regexp)` | Filters a filesystem, only showing files that match a regex. | ✅ Official |
+| **Utility** | **HttpFs** | `afero.NewHttpFs(source)` | Wraps any Afero filesystem to be served via `http.FileServer`. | ✅ Official |
+| **Archives** | **ZipFs** | `zipfs.New(zipReader)` | Read-only access to files within a ZIP archive. | ✅ Official |
+| | **TarFs** | `tarfs.New(tarReader)` | Read-only access to files within a TAR archive. | ✅ Official |
+| **Network** | **GcsFs** | `gcsfs.NewGcsFs(...)` | Google Cloud Storage backend. | ⚡ Experimental |
+| | **SftpFs** | `sftpfs.New(...)` | SFTP backend. | ⚡ Experimental |
+| **3rd Party Cloud** | **S3Fs** | [`fclairamb/afero-s3`](https://github.com/fclairamb/afero-s3) | Production-ready S3 backend built on official AWS SDK. | 🔹 3rd Party |
+| | **MinioFs** | [`cpyun/afero-minio`](https://github.com/cpyun/afero-minio) | MinIO object storage backend with S3 compatibility. | 🔹 3rd Party |
+| | **DriveFs** | [`fclairamb/afero-gdrive`](https://github.com/fclairamb/afero-gdrive) | Google Drive backend with streaming support. | 🔹 3rd Party |
+| | **DropboxFs** | [`fclairamb/afero-dropbox`](https://github.com/fclairamb/afero-dropbox) | Dropbox backend with streaming support. | 🔹 3rd Party |
+| **3rd Party Specialized** | **GitFs** | [`tobiash/go-gitfs`](https://github.com/tobiash/go-gitfs) | Git repository filesystem (read-only, Afero compatible). | 🔹 3rd Party |
+| | **DockerFs** | [`unmango/aferox`](https://github.com/unmango/aferox) | Docker container filesystem access. | 🔹 3rd Party |
+| | **GitHubFs** | [`unmango/aferox`](https://github.com/unmango/aferox) | GitHub repository and releases filesystem. | 🔹 3rd Party |
+| | **FilterFs** | [`unmango/aferox`](https://github.com/unmango/aferox) | Filesystem filtering with predicates. | 🔹 3rd Party |
+| | **IgnoreFs** | [`unmango/aferox`](https://github.com/unmango/aferox) | .gitignore-aware filtering filesystem. | 🔹 3rd Party |
+| | **FUSEFs** | [`JakWai01/sile-fystem`](https://github.com/JakWai01/sile-fystem) | Generic FUSE implementation using any Afero backend. | 🔹 3rd Party |
 
-Afero comes from the latin roots Ad-Facere.
+## Afero vs. `io/fs` (Go 1.16+)
 
-**"Ad"** is a prefix meaning "to".
+Go 1.16 introduced the `io/fs` package, which provides a standard abstraction for **read-only** filesystems.
 
-**"Facere"** is a form of the root "faciō" making "make or do".
+Afero complements `io/fs` by focusing on different needs:
 
-The literal meaning of afero is "to make" or "to do" which seems very fitting
-for a library that allows one to make files and directories and do things with them.
+*   **Use `io/fs` when:** You only need to read files and want to conform strictly to the standard library interfaces.
+*   **Use Afero when:**
+    *   Your application needs to **create, write, modify, or delete** files.
+    *   You need to test complex read/write interactions (e.g., renaming, concurrent writes).
+    *   You need advanced compositional features (Copy-on-Write, Caching, etc.).
 
-The English word that shares the same roots as Afero is "affair". Affair shares
-the same concept but as a noun it means "something that is made or done" or "an
-object of a particular type".
+Afero is fully compatible with `io/fs`. You can wrap any Afero filesystem to satisfy the `fs.FS` interface using `afero.NewIOFS`:
 
-It's also nice that unlike some of my other libraries (hugo, cobra, viper) it
-Googles very well.
+```go
+import "io/fs"
 
-## Release Notes
+// Create an Afero filesystem (writable)
+var myAferoFs afero.Fs = afero.NewMemMapFs()
 
-See the [Releases Page](https://github.com/spf13/afero/releases).
+// Convert it to a standard library fs.FS (read-only view)
+var myIoFs fs.FS = afero.NewIOFS(myAferoFs)
+```
+
+## Third-Party Backends & Ecosystem
+
+The Afero community has developed numerous backends and tools that extend the library's capabilities. Below are curated, well-maintained options organized by maturity and reliability.
+
+### Featured Community Backends
+
+These are mature, reliable backends that we can confidently recommend for production use:
+
+#### **Amazon S3** - [`fclairamb/afero-s3`](https://github.com/fclairamb/afero-s3)
+Production-ready S3 backend built on the official AWS SDK for Go.
+
+```go
+import "github.com/fclairamb/afero-s3"
+
+s3fs := s3.NewFs(bucket, session)
+```
+
+#### **MinIO** - [`cpyun/afero-minio`](https://github.com/cpyun/afero-minio)
+MinIO object storage backend providing S3-compatible object storage with deduplication and optimization features.
+
+```go
+import "github.com/cpyun/afero-minio"
+
+minioFs := miniofs.NewMinioFs(ctx, "minio://endpoint/bucket")
+```
+
+### Community & Specialized Backends
+
+#### Cloud Storage
+
+- **Google Drive** - [`fclairamb/afero-gdrive`](https://github.com/fclairamb/afero-gdrive)  
+  Streaming support; no write-seeking or POSIX permissions; no files listing cache
+
+- **Dropbox** - [`fclairamb/afero-dropbox`](https://github.com/fclairamb/afero-dropbox)  
+  Streaming support; no write-seeking or POSIX permissions
+
+#### Version Control Systems
+
+- **Git Repositories** - [`tobiash/go-gitfs`](https://github.com/tobiash/go-gitfs)  
+  Read-only filesystem abstraction for Git repositories. Works with bare repositories and provides filesystem view of any git reference. Uses go-git for repository access.
+
+#### Container and Remote Systems
+
+- **Docker Containers** - [`unmango/aferox`](https://github.com/unmango/aferox)  
+  Access Docker container filesystems as if they were local filesystems
+
+- **GitHub API** - [`unmango/aferox`](https://github.com/unmango/aferox)  
+  Turn GitHub repositories, releases, and assets into browsable filesystems
+
+#### FUSE Integration
+
+- **Generic FUSE** - [`JakWai01/sile-fystem`](https://github.com/JakWai01/sile-fystem)  
+  Mount any Afero filesystem as a FUSE filesystem, allowing any Afero backend to be used as a real mounted filesystem
+
+#### Specialized Filesystems
+
+- **FAT32 Support** - [`aligator/GoFAT`](https://github.com/aligator/GoFAT)  
+  Pure Go FAT filesystem implementation (currently read-only)
+
+### Interface Adapters & Utilities
+
+**Cross-Interface Compatibility:**
+- [`jfontan/go-billy-desfacer`](https://github.com/jfontan/go-billy-desfacer) - Adapter between Afero and go-billy interfaces (for go-git compatibility)
+- [`Maldris/go-billy-afero`](https://github.com/Maldris/go-billy-afero) - Alternative wrapper for using Afero with go-billy
+- [`c4milo/afero2billy`](https://github.com/c4milo/afero2billy) - Another Afero to billy filesystem adapter
+
+**Working Directory Management:**
+- [`carolynvs/aferox`](https://github.com/carolynvs/aferox) - Working directory-aware filesystem wrapper
+
+**Advanced Filtering:**
+- [`unmango/aferox`](https://github.com/unmango/aferox) includes multiple specialized filesystems:
+  - **FilterFs** - Predicate-based file filtering
+  - **IgnoreFs** - .gitignore-aware filtering
+  - **WriterFs** - Dump writes to io.Writer for debugging
+
+#### Developer Tools & Utilities
+
+**nhatthm Utility Suite** - Essential tools for Afero development:
+- [`nhatthm/aferocopy`](https://github.com/nhatthm/aferocopy) - Copy files between any Afero filesystems
+- [`nhatthm/aferomock`](https://github.com/nhatthm/aferomock) - Mocking toolkit for testing
+- [`nhatthm/aferoassert`](https://github.com/nhatthm/aferoassert) - Assertion helpers for filesystem testing
+
+### Ecosystem Showcase
+
+**Windows Virtual Drives** - [`balazsgrill/potatodrive`](https://github.com/balazsgrill/potatodrive)  
+Mount any Afero filesystem as a Windows drive letter. Brilliant demonstration of Afero's power!
+
+### Modern Asset Embedding (Go 1.16+)
+
+Instead of third-party tools, use Go's native `//go:embed` with Afero:
+
+```go
+import (
+    "embed"
+    "github.com/spf13/afero"
+)
+
+//go:embed assets/*
+var assetsFS embed.FS
+
+func main() {
+    // Convert embedded files to Afero filesystem
+    fs := afero.FromIOFS(assetsFS)
+    
+    // Use like any other Afero filesystem
+    content, _ := afero.ReadFile(fs, "assets/config.json")
+}
+```
 
 ## Contributing
 
-1. Fork it
+We welcome contributions! The project is mature, but we are actively looking for contributors to help implement and stabilize network/cloud backends.
+
+* 🔥 **Microsoft Azure Blob Storage**  
+* 🔒 **Modern Encryption Backend** - Built on secure, contemporary crypto (not legacy EncFS)  
+* 🐙 **Canonical go-git Adapter** - Unified solution for Git integration  
+* 📡 **SSH/SCP Backend** - Secure remote file operations  
+*  Stabilization of existing experimental backends (GCS, SFTP)
+
+To contribute:
+1. Fork the repository
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create a new Pull Request
 
-## Contributors
+## 📄 License
 
-Names in no particular order:
+Afero is released under the Apache 2.0 license. See [LICENSE.txt](https://github.com/spf13/afero/blob/master/LICENSE.txt) for details.
 
-* [spf13](https://github.com/spf13)
-* [jaqx0r](https://github.com/jaqx0r)
-* [mbertschler](https://github.com/mbertschler)
-* [xor-gate](https://github.com/xor-gate)
+## 🔗 Additional Resources
 
-## License
+- [📖 Full API Documentation](https://pkg.go.dev/github.com/spf13/afero)
+- [🎯 Examples Repository](https://github.com/spf13/afero/tree/master/examples)
+- [📋 Release Notes](https://github.com/spf13/afero/releases)
+- [❓ GitHub Discussions](https://github.com/spf13/afero/discussions)
 
-Afero is released under the Apache 2.0 license. See
-[LICENSE.txt](https://github.com/spf13/afero/blob/master/LICENSE.txt)
+---
+
+*Afero comes from the Latin roots Ad-Facere, meaning "to make" or "to do" - fitting for a library that empowers you to make and do amazing things with filesystems.*
diff --git a/vendor/github.com/spf13/afero/const_bsds.go b/vendor/github.com/spf13/afero/const_bsds.go
index eed0f225f..30855de57 100644
--- a/vendor/github.com/spf13/afero/const_bsds.go
+++ b/vendor/github.com/spf13/afero/const_bsds.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build aix || darwin || openbsd || freebsd || netbsd || dragonfly
-// +build aix darwin openbsd freebsd netbsd dragonfly
+//go:build aix || darwin || openbsd || freebsd || netbsd || dragonfly || zos
+// +build aix darwin openbsd freebsd netbsd dragonfly zos
 
 package afero
 
diff --git a/vendor/github.com/spf13/afero/const_win_unix.go b/vendor/github.com/spf13/afero/const_win_unix.go
index 004d57e2f..12792d21e 100644
--- a/vendor/github.com/spf13/afero/const_win_unix.go
+++ b/vendor/github.com/spf13/afero/const_win_unix.go
@@ -10,8 +10,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//go:build !darwin && !openbsd && !freebsd && !dragonfly && !netbsd && !aix
-// +build !darwin,!openbsd,!freebsd,!dragonfly,!netbsd,!aix
+//go:build !darwin && !openbsd && !freebsd && !dragonfly && !netbsd && !aix && !zos
+// +build !darwin,!openbsd,!freebsd,!dragonfly,!netbsd,!aix,!zos
 
 package afero
 
diff --git a/vendor/github.com/spf13/afero/copyOnWriteFs.go b/vendor/github.com/spf13/afero/copyOnWriteFs.go
index 184d6dd70..aba2879eb 100644
--- a/vendor/github.com/spf13/afero/copyOnWriteFs.go
+++ b/vendor/github.com/spf13/afero/copyOnWriteFs.go
@@ -34,7 +34,8 @@ func (u *CopyOnWriteFs) isBaseFile(name string) (bool, error) {
 	_, err := u.base.Stat(name)
 	if err != nil {
 		if oerr, ok := err.(*os.PathError); ok {
-			if oerr.Err == os.ErrNotExist || oerr.Err == syscall.ENOENT || oerr.Err == syscall.ENOTDIR {
+			if oerr.Err == os.ErrNotExist || oerr.Err == syscall.ENOENT ||
+				oerr.Err == syscall.ENOTDIR {
 				return false, nil
 			}
 		}
@@ -237,7 +238,11 @@ func (u *CopyOnWriteFs) OpenFile(name string, flag int, perm os.FileMode) (File,
 			return u.layer.OpenFile(name, flag, perm)
 		}
 
-		return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOTDIR} // ...or os.ErrNotExist?
+		return nil, &os.PathError{
+			Op:   "open",
+			Path: name,
+			Err:  syscall.ENOTDIR,
+		} // ...or os.ErrNotExist?
 	}
 	if b {
 		return u.base.OpenFile(name, flag, perm)
diff --git a/vendor/github.com/spf13/afero/iofs.go b/vendor/github.com/spf13/afero/iofs.go
index 938b9316e..57ba5673e 100644
--- a/vendor/github.com/spf13/afero/iofs.go
+++ b/vendor/github.com/spf13/afero/iofs.go
@@ -137,7 +137,7 @@ type readDirFile struct {
 var _ fs.ReadDirFile = readDirFile{}
 
 func (r readDirFile) ReadDir(n int) ([]fs.DirEntry, error) {
-	items, err := r.File.Readdir(n)
+	items, err := r.Readdir(n)
 	if err != nil {
 		return nil, err
 	}
@@ -161,7 +161,12 @@ var _ Fs = FromIOFS{}
 
 func (f FromIOFS) Create(name string) (File, error) { return nil, notImplemented("create", name) }
 
-func (f FromIOFS) Mkdir(name string, perm os.FileMode) error { return notImplemented("mkdir", name) }
+func (f FromIOFS) Mkdir(
+	name string,
+	perm os.FileMode,
+) error {
+	return notImplemented("mkdir", name)
+}
 
 func (f FromIOFS) MkdirAll(path string, perm os.FileMode) error {
 	return notImplemented("mkdirall", path)
@@ -255,7 +260,6 @@ func (f fromIOFSFile) Readdir(count int) ([]os.FileInfo, error) {
 	ret := make([]os.FileInfo, len(entries))
 	for i := range entries {
 		ret[i], err = entries[i].Info()
-
 		if err != nil {
 			return nil, err
 		}
diff --git a/vendor/github.com/spf13/afero/lstater.go b/vendor/github.com/spf13/afero/lstater.go
index 89c1bfc0a..2dcbdb1f0 100644
--- a/vendor/github.com/spf13/afero/lstater.go
+++ b/vendor/github.com/spf13/afero/lstater.go
@@ -19,9 +19,9 @@ import (
 
 // Lstater is an optional interface in Afero. It is only implemented by the
 // filesystems saying so.
-// It will call Lstat if the filesystem iself is, or it delegates to, the os filesystem.
+// It will call Lstat if the filesystem itself is, or it delegates to, the os filesystem.
 // Else it will call Stat.
-// In addtion to the FileInfo, it will return a boolean telling whether Lstat was called or not.
+// In addition to the FileInfo, it will return a boolean telling whether Lstat was called or not.
 type Lstater interface {
 	LstatIfPossible(name string) (os.FileInfo, bool, error)
 }
diff --git a/vendor/github.com/spf13/afero/mem/file.go b/vendor/github.com/spf13/afero/mem/file.go
index 62fe4498e..c77fcd40e 100644
--- a/vendor/github.com/spf13/afero/mem/file.go
+++ b/vendor/github.com/spf13/afero/mem/file.go
@@ -150,7 +150,11 @@ func (f *File) Sync() error {
 
 func (f *File) Readdir(count int) (res []os.FileInfo, err error) {
 	if !f.fileData.dir {
-		return nil, &os.PathError{Op: "readdir", Path: f.fileData.name, Err: errors.New("not a dir")}
+		return nil, &os.PathError{
+			Op:   "readdir",
+			Path: f.fileData.name,
+			Err:  errors.New("not a dir"),
+		}
 	}
 	var outLength int64
 
@@ -236,7 +240,11 @@ func (f *File) Truncate(size int64) error {
 		return ErrFileClosed
 	}
 	if f.readOnly {
-		return &os.PathError{Op: "truncate", Path: f.fileData.name, Err: errors.New("file handle is read only")}
+		return &os.PathError{
+			Op:   "truncate",
+			Path: f.fileData.name,
+			Err:  errors.New("file handle is read only"),
+		}
 	}
 	if size < 0 {
 		return ErrOutOfRange
@@ -273,7 +281,11 @@ func (f *File) Write(b []byte) (n int, err error) {
 		return 0, ErrFileClosed
 	}
 	if f.readOnly {
-		return 0, &os.PathError{Op: "write", Path: f.fileData.name, Err: errors.New("file handle is read only")}
+		return 0, &os.PathError{
+			Op:   "write",
+			Path: f.fileData.name,
+			Err:  errors.New("file handle is read only"),
+		}
 	}
 	n = len(b)
 	cur := atomic.LoadInt64(&f.at)
@@ -285,7 +297,9 @@ func (f *File) Write(b []byte) (n int, err error) {
 		tail = f.fileData.data[n+int(cur):]
 	}
 	if diff > 0 {
-		f.fileData.data = append(f.fileData.data, append(bytes.Repeat([]byte{0o0}, int(diff)), b...)...)
+		f.fileData.data = append(
+			f.fileData.data,
+			append(bytes.Repeat([]byte{0o0}, int(diff)), b...)...)
 		f.fileData.data = append(f.fileData.data, tail...)
 	} else {
 		f.fileData.data = append(f.fileData.data[:cur], b...)
diff --git a/vendor/github.com/spf13/afero/memmap.go b/vendor/github.com/spf13/afero/memmap.go
index e6b7d70b9..ed92f5649 100644
--- a/vendor/github.com/spf13/afero/memmap.go
+++ b/vendor/github.com/spf13/afero/memmap.go
@@ -19,6 +19,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -88,6 +89,24 @@ func (m *MemMapFs) findParent(f *mem.FileData) *mem.FileData {
 	return pfile
 }
 
+func (m *MemMapFs) findDescendants(name string) []*mem.FileData {
+	fData := m.getData()
+	descendants := make([]*mem.FileData, 0, len(fData))
+	for p, dFile := range fData {
+		if strings.HasPrefix(p, name+FilePathSeparator) {
+			descendants = append(descendants, dFile)
+		}
+	}
+
+	sort.Slice(descendants, func(i, j int) bool {
+		cur := len(strings.Split(descendants[i].Name(), FilePathSeparator))
+		next := len(strings.Split(descendants[j].Name(), FilePathSeparator))
+		return cur < next
+	})
+
+	return descendants
+}
+
 func (m *MemMapFs) registerWithParent(f *mem.FileData, perm os.FileMode) {
 	if f == nil {
 		return
@@ -309,29 +328,51 @@ func (m *MemMapFs) Rename(oldname, newname string) error {
 	if _, ok := m.getData()[oldname]; ok {
 		m.mu.RUnlock()
 		m.mu.Lock()
-		m.unRegisterWithParent(oldname)
+		err := m.unRegisterWithParent(oldname)
+		if err != nil {
+			return err
+		}
+
 		fileData := m.getData()[oldname]
-		delete(m.getData(), oldname)
 		mem.ChangeFileName(fileData, newname)
 		m.getData()[newname] = fileData
+
+		err = m.renameDescendants(oldname, newname)
+		if err != nil {
+			return err
+		}
+
+		delete(m.getData(), oldname)
+
 		m.registerWithParent(fileData, 0)
 		m.mu.Unlock()
 		m.mu.RLock()
 	} else {
 		return &os.PathError{Op: "rename", Path: oldname, Err: ErrFileNotFound}
 	}
+	return nil
+}
 
-	for p, fileData := range m.getData() {
-		if strings.HasPrefix(p, oldname+FilePathSeparator) {
-			m.mu.RUnlock()
-			m.mu.Lock()
-			delete(m.getData(), p)
-			p := strings.Replace(p, oldname, newname, 1)
-			m.getData()[p] = fileData
-			m.mu.Unlock()
-			m.mu.RLock()
+func (m *MemMapFs) renameDescendants(oldname, newname string) error {
+	descendants := m.findDescendants(oldname)
+	removes := make([]string, 0, len(descendants))
+	for _, desc := range descendants {
+		descNewName := strings.Replace(desc.Name(), oldname, newname, 1)
+		err := m.unRegisterWithParent(desc.Name())
+		if err != nil {
+			return err
 		}
+
+		removes = append(removes, desc.Name())
+		mem.ChangeFileName(desc, descNewName)
+		m.getData()[descNewName] = desc
+
+		m.registerWithParent(desc, 0)
 	}
+	for _, r := range removes {
+		delete(m.getData(), r)
+	}
+
 	return nil
 }
 
diff --git a/vendor/github.com/spf13/afero/unionFile.go b/vendor/github.com/spf13/afero/unionFile.go
index 62dd6c93c..2e2253f55 100644
--- a/vendor/github.com/spf13/afero/unionFile.go
+++ b/vendor/github.com/spf13/afero/unionFile.go
@@ -92,7 +92,8 @@ func (f *UnionFile) Seek(o int64, w int) (pos int64, err error) {
 func (f *UnionFile) Write(s []byte) (n int, err error) {
 	if f.Layer != nil {
 		n, err = f.Layer.Write(s)
-		if err == nil && f.Base != nil { // hmm, do we have fixed size files where a write may hit the EOF mark?
+		if err == nil &&
+			f.Base != nil { // hmm, do we have fixed size files where a write may hit the EOF mark?
 			_, err = f.Base.Write(s)
 		}
 		return n, err
@@ -157,7 +158,7 @@ var defaultUnionMergeDirsFn = func(lofi, bofi []os.FileInfo) ([]os.FileInfo, err
 // return a single view of the overlayed directories.
 // At the end of the directory view, the error is io.EOF if c > 0.
 func (f *UnionFile) Readdir(c int) (ofi []os.FileInfo, err error) {
-	var merge DirsMerger = f.Merger
+	merge := f.Merger
 	if merge == nil {
 		merge = defaultUnionMergeDirsFn
 	}
diff --git a/vendor/github.com/spf13/afero/util.go b/vendor/github.com/spf13/afero/util.go
index 9e4cba274..231768838 100644
--- a/vendor/github.com/spf13/afero/util.go
+++ b/vendor/github.com/spf13/afero/util.go
@@ -113,11 +113,11 @@ func GetTempDir(fs Fs, subPath string) string {
 	if subPath != "" {
 		// preserve windows backslash :-(
 		if FilePathSeparator == "\\" {
-			subPath = strings.Replace(subPath, "\\", "____", -1)
+			subPath = strings.ReplaceAll(subPath, "\\", "____")
 		}
 		dir = dir + UnicodeSanitize((subPath))
 		if FilePathSeparator == "\\" {
-			dir = strings.Replace(dir, "____", "\\", -1)
+			dir = strings.ReplaceAll(dir, "____", "\\")
 		}
 
 		if exists, _ := Exists(fs, dir); exists {
diff --git a/vendor/github.com/spkg/bom/.gitignore b/vendor/github.com/spkg/bom/.gitignore
index 2d830686d..a39c54a92 100644
--- a/vendor/github.com/spkg/bom/.gitignore
+++ b/vendor/github.com/spkg/bom/.gitignore
@@ -1 +1,2 @@
 coverage.out
+.idea
diff --git a/vendor/github.com/spkg/bom/.travis.yml b/vendor/github.com/spkg/bom/.travis.yml
deleted file mode 100644
index 561da2ccf..000000000
--- a/vendor/github.com/spkg/bom/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: go
-go:
-  - 1.6
-  - 1.5
-  - 1.4
-  - 1.3
-
-install:
-  - go get github.com/stretchr/testify/assert
-  - go get golang.org/x/tools/cmd/cover
-  - go get github.com/mattn/goveralls
-
-script:
-  - go test -v -covermode=count -coverprofile=coverage.out
-  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/goveralls -coverprofile=coverage.out -service=travis-ci
-
diff --git a/vendor/github.com/spkg/bom/README.md b/vendor/github.com/spkg/bom/README.md
index 351830ac6..f2ddfc981 100644
--- a/vendor/github.com/spkg/bom/README.md
+++ b/vendor/github.com/spkg/bom/README.md
@@ -1,11 +1,8 @@
 # bom
 ## strip UTF-8 byte order marks
 
-[![GoDoc](https://godoc.org/github.com/spkg/bom?status.svg)](https://godoc.org/github.com/spkg/bom)
-[![Build Status (Linux)](https://travis-ci.org/spkg/bom.svg?branch=master)](https://travis-ci.org/spkg/bom)
-[![Build status (Windows)](https://ci.appveyor.com/api/projects/status/065x7yuc77xicv59?svg=true)](https://ci.appveyor.com/project/jjeffery/bom)
+[![GoDoc](https://pkg.go.dev/badge/github.com/spkg/bom)](https://godoc.org/github.com/spkg/bom)
 [![License](http://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/spkg/bom/master/LICENSE.md)
-[![Coverage Status](https://coveralls.io/repos/github/spkg/bom/badge.svg?branch=master)](https://coveralls.io/github/spkg/bom?branch=master)
 [![GoReportCard](https://goreportcard.com/badge/github.com/spkg/bom)](http://goreportcard.com/report/spkg/bom)
 
 
diff --git a/vendor/github.com/spkg/bom/bom.go b/vendor/github.com/spkg/bom/bom.go
index 93b811c6d..f81693c86 100644
--- a/vendor/github.com/spkg/bom/bom.go
+++ b/vendor/github.com/spkg/bom/bom.go
@@ -33,7 +33,7 @@ func NewReader(r io.Reader) io.Reader {
 		return buf
 	}
 	if b[0] == bom0 && b[1] == bom1 && b[2] == bom2 {
-		discardBytes(buf, 3)
+		_, _ = buf.Discard(3)
 	}
 	return buf
 }
diff --git a/vendor/github.com/spkg/bom/discard_go14.go b/vendor/github.com/spkg/bom/discard_go14.go
deleted file mode 100644
index 782cd0624..000000000
--- a/vendor/github.com/spkg/bom/discard_go14.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !go1.5
-
-package bom
-
-import "bufio"
-
-func discardBytes(buf *bufio.Reader, n int) {
-	// cannot use the buf.Discard method as it was introduced in Go 1.5
-	for i := 0; i < n; i++ {
-		buf.ReadByte()
-	}
-}
diff --git a/vendor/github.com/spkg/bom/discard_go15.go b/vendor/github.com/spkg/bom/discard_go15.go
deleted file mode 100644
index 2d17d5c5e..000000000
--- a/vendor/github.com/spkg/bom/discard_go15.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build go1.5
-
-package bom
-
-import "bufio"
-
-func discardBytes(buf *bufio.Reader, n int) {
-	// the Discard method was introduced in Go 1.5
-	buf.Discard(n)
-}
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_compare.go b/vendor/github.com/stretchr/testify/assert/assertion_compare.go
index 7e19eba09..ffb24e8e3 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_compare.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_compare.go
@@ -390,7 +390,8 @@ func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
-	return compareTwoValues(t, e1, e2, []compareResult{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs...)
+	failMessage := fmt.Sprintf("\"%v\" is not greater than \"%v\"", e1, e2)
+	return compareTwoValues(t, e1, e2, []compareResult{compareGreater}, failMessage, msgAndArgs...)
 }
 
 // GreaterOrEqual asserts that the first element is greater than or equal to the second
@@ -403,7 +404,8 @@ func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...in
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
-	return compareTwoValues(t, e1, e2, []compareResult{compareGreater, compareEqual}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs...)
+	failMessage := fmt.Sprintf("\"%v\" is not greater than or equal to \"%v\"", e1, e2)
+	return compareTwoValues(t, e1, e2, []compareResult{compareGreater, compareEqual}, failMessage, msgAndArgs...)
 }
 
 // Less asserts that the first element is less than the second
@@ -415,7 +417,8 @@ func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{})
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
-	return compareTwoValues(t, e1, e2, []compareResult{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs...)
+	failMessage := fmt.Sprintf("\"%v\" is not less than \"%v\"", e1, e2)
+	return compareTwoValues(t, e1, e2, []compareResult{compareLess}, failMessage, msgAndArgs...)
 }
 
 // LessOrEqual asserts that the first element is less than or equal to the second
@@ -428,7 +431,8 @@ func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...inter
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
-	return compareTwoValues(t, e1, e2, []compareResult{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs...)
+	failMessage := fmt.Sprintf("\"%v\" is not less than or equal to \"%v\"", e1, e2)
+	return compareTwoValues(t, e1, e2, []compareResult{compareLess, compareEqual}, failMessage, msgAndArgs...)
 }
 
 // Positive asserts that the specified element is positive
@@ -440,7 +444,8 @@ func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
 		h.Helper()
 	}
 	zero := reflect.Zero(reflect.TypeOf(e))
-	return compareTwoValues(t, e, zero.Interface(), []compareResult{compareGreater}, "\"%v\" is not positive", msgAndArgs...)
+	failMessage := fmt.Sprintf("\"%v\" is not positive", e)
+	return compareTwoValues(t, e, zero.Interface(), []compareResult{compareGreater}, failMessage, msgAndArgs...)
 }
 
 // Negative asserts that the specified element is negative
@@ -452,7 +457,8 @@ func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
 		h.Helper()
 	}
 	zero := reflect.Zero(reflect.TypeOf(e))
-	return compareTwoValues(t, e, zero.Interface(), []compareResult{compareLess}, "\"%v\" is not negative", msgAndArgs...)
+	failMessage := fmt.Sprintf("\"%v\" is not negative", e)
+	return compareTwoValues(t, e, zero.Interface(), []compareResult{compareLess}, failMessage, msgAndArgs...)
 }
 
 func compareTwoValues(t TestingT, e1 interface{}, e2 interface{}, allowedComparesResults []compareResult, failMessage string, msgAndArgs ...interface{}) bool {
@@ -468,11 +474,11 @@ func compareTwoValues(t TestingT, e1 interface{}, e2 interface{}, allowedCompare
 
 	compareResult, isComparable := compare(e1, e2, e1Kind)
 	if !isComparable {
-		return Fail(t, fmt.Sprintf("Can not compare type \"%s\"", reflect.TypeOf(e1)), msgAndArgs...)
+		return Fail(t, fmt.Sprintf(`Can not compare type "%T"`, e1), msgAndArgs...)
 	}
 
 	if !containsValue(allowedComparesResults, compareResult) {
-		return Fail(t, fmt.Sprintf(failMessage, e1, e2), msgAndArgs...)
+		return Fail(t, failMessage, msgAndArgs...)
 	}
 
 	return true
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_format.go b/vendor/github.com/stretchr/testify/assert/assertion_format.go
index 190634165..a19a89279 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_format.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_format.go
@@ -50,10 +50,19 @@ func ElementsMatchf(t TestingT, listA interface{}, listB interface{}, msg string
 	return ElementsMatch(t, listA, listB, append([]interface{}{msg}, args...)...)
 }
 
-// Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// Emptyf asserts that the given value is "empty".
+//
+// [Zero values] are "empty".
+//
+// Arrays are "empty" if every element is the zero value of the type (stricter than "empty").
+//
+// Slices, maps and channels with zero length are "empty".
+//
+// Pointer values are "empty" if the pointer is nil or if the pointed value is "empty".
 //
 //	assert.Emptyf(t, obj, "error message %s", "formatted")
+//
+// [Zero values]: https://go.dev/ref/spec#The_zero_value
 func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -75,7 +84,7 @@ func Equalf(t TestingT, expected interface{}, actual interface{}, msg string, ar
 	return Equal(t, expected, actual, append([]interface{}{msg}, args...)...)
 }
 
-// EqualErrorf asserts that a function returned an error (i.e. not `nil`)
+// EqualErrorf asserts that a function returned a non-nil error (i.e. an error)
 // and that it is equal to the provided error.
 //
 //	actualObj, err := SomeFunction()
@@ -115,12 +124,10 @@ func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg stri
 	return EqualValues(t, expected, actual, append([]interface{}{msg}, args...)...)
 }
 
-// Errorf asserts that a function returned an error (i.e. not `nil`).
+// Errorf asserts that a function returned a non-nil error (ie. an error).
 //
-//	  actualObj, err := SomeFunction()
-//	  if assert.Errorf(t, err, "error message %s", "formatted") {
-//		   assert.Equal(t, expectedErrorf, err)
-//	  }
+//	actualObj, err := SomeFunction()
+//	assert.Errorf(t, err, "error message %s", "formatted")
 func Errorf(t TestingT, err error, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -137,8 +144,8 @@ func ErrorAsf(t TestingT, err error, target interface{}, msg string, args ...int
 	return ErrorAs(t, err, target, append([]interface{}{msg}, args...)...)
 }
 
-// ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
-// and that the error contains the specified substring.
+// ErrorContainsf asserts that a function returned a non-nil error (i.e. an
+// error) and that the error contains the specified substring.
 //
 //	actualObj, err := SomeFunction()
 //	assert.ErrorContainsf(t, err,  expectedErrorSubString, "error message %s", "formatted")
@@ -183,10 +190,10 @@ func Eventuallyf(t TestingT, condition func() bool, waitFor time.Duration, tick
 //		time.Sleep(8*time.Second)
 //		externalValue = true
 //	}()
-//	assert.EventuallyWithTf(t, func(c *assert.CollectT, "error message %s", "formatted") {
+//	assert.EventuallyWithTf(t, func(c *assert.CollectT) {
 //		// add assertions as needed; any assertion failure will fail the current tick
 //		assert.True(c, externalValue, "expected 'externalValue' to be true")
-//	}, 10*time.Second, 1*time.Second, "external state has not changed to 'true'; still false")
+//	}, 10*time.Second, 1*time.Second, "error message %s", "formatted")
 func EventuallyWithTf(t TestingT, condition func(collect *CollectT), waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -438,7 +445,19 @@ func IsNonIncreasingf(t TestingT, object interface{}, msg string, args ...interf
 	return IsNonIncreasing(t, object, append([]interface{}{msg}, args...)...)
 }
 
+// IsNotTypef asserts that the specified objects are not of the same type.
+//
+//	assert.IsNotTypef(t, &NotMyStruct{}, &MyStruct{}, "error message %s", "formatted")
+func IsNotTypef(t TestingT, theType interface{}, object interface{}, msg string, args ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	return IsNotType(t, theType, object, append([]interface{}{msg}, args...)...)
+}
+
 // IsTypef asserts that the specified objects are of the same type.
+//
+//	assert.IsTypef(t, &MyStruct{}, &MyStruct{}, "error message %s", "formatted")
 func IsTypef(t TestingT, expectedType interface{}, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -533,7 +552,7 @@ func NoDirExistsf(t TestingT, path string, msg string, args ...interface{}) bool
 	return NoDirExists(t, path, append([]interface{}{msg}, args...)...)
 }
 
-// NoErrorf asserts that a function returned no error (i.e. `nil`).
+// NoErrorf asserts that a function returned a nil error (ie. no error).
 //
 //	  actualObj, err := SomeFunction()
 //	  if assert.NoErrorf(t, err, "error message %s", "formatted") {
@@ -585,8 +604,7 @@ func NotElementsMatchf(t TestingT, listA interface{}, listB interface{}, msg str
 	return NotElementsMatch(t, listA, listB, append([]interface{}{msg}, args...)...)
 }
 
-// NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// NotEmptyf asserts that the specified object is NOT [Empty].
 //
 //	if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
 //	  assert.Equal(t, "two", obj[1])
@@ -693,12 +711,15 @@ func NotSamef(t TestingT, expected interface{}, actual interface{}, msg string,
 	return NotSame(t, expected, actual, append([]interface{}{msg}, args...)...)
 }
 
-// NotSubsetf asserts that the specified list(array, slice...) or map does NOT
-// contain all elements given in the specified subset list(array, slice...) or
-// map.
+// NotSubsetf asserts that the list (array, slice, or map) does NOT contain all
+// elements given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	assert.NotSubsetf(t, [1, 3, 4], [1, 2], "error message %s", "formatted")
 //	assert.NotSubsetf(t, {"x": 1, "y": 2}, {"z": 3}, "error message %s", "formatted")
+//	assert.NotSubsetf(t, [1, 3, 4], {1: "one", 2: "two"}, "error message %s", "formatted")
+//	assert.NotSubsetf(t, {"x": 1, "y": 2}, ["z"], "error message %s", "formatted")
 func NotSubsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -782,11 +803,15 @@ func Samef(t TestingT, expected interface{}, actual interface{}, msg string, arg
 	return Same(t, expected, actual, append([]interface{}{msg}, args...)...)
 }
 
-// Subsetf asserts that the specified list(array, slice...) or map contains all
-// elements given in the specified subset list(array, slice...) or map.
+// Subsetf asserts that the list (array, slice, or map) contains all elements
+// given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	assert.Subsetf(t, [1, 2, 3], [1, 2], "error message %s", "formatted")
 //	assert.Subsetf(t, {"x": 1, "y": 2}, {"x": 1}, "error message %s", "formatted")
+//	assert.Subsetf(t, [1, 2, 3], {1: "one", 2: "two"}, "error message %s", "formatted")
+//	assert.Subsetf(t, {"x": 1, "y": 2}, ["x"], "error message %s", "formatted")
 func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -824,7 +849,19 @@ func WithinRangef(t TestingT, actual time.Time, start time.Time, end time.Time,
 	return WithinRange(t, actual, start, end, append([]interface{}{msg}, args...)...)
 }
 
-// YAMLEqf asserts that two YAML strings are equivalent.
+// YAMLEqf asserts that the first documents in the two YAML strings are equivalent.
+//
+//	expected := `---
+//	key: value
+//	---
+//	key: this is a second document, it is not evaluated
+//	`
+//	actual := `---
+//	key: value
+//	---
+//	key: this is a subsequent document, it is not evaluated
+//	`
+//	assert.YAMLEqf(t, expected, actual, "error message %s", "formatted")
 func YAMLEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_forward.go b/vendor/github.com/stretchr/testify/assert/assertion_forward.go
index 21629087b..cd2a86061 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_forward.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_forward.go
@@ -92,10 +92,19 @@ func (a *Assertions) ElementsMatchf(listA interface{}, listB interface{}, msg st
 	return ElementsMatchf(a.t, listA, listB, msg, args...)
 }
 
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// Empty asserts that the given value is "empty".
+//
+// [Zero values] are "empty".
+//
+// Arrays are "empty" if every element is the zero value of the type (stricter than "empty").
+//
+// Slices, maps and channels with zero length are "empty".
+//
+// Pointer values are "empty" if the pointer is nil or if the pointed value is "empty".
 //
 //	a.Empty(obj)
+//
+// [Zero values]: https://go.dev/ref/spec#The_zero_value
 func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -103,10 +112,19 @@ func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) bool {
 	return Empty(a.t, object, msgAndArgs...)
 }
 
-// Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// Emptyf asserts that the given value is "empty".
+//
+// [Zero values] are "empty".
+//
+// Arrays are "empty" if every element is the zero value of the type (stricter than "empty").
+//
+// Slices, maps and channels with zero length are "empty".
+//
+// Pointer values are "empty" if the pointer is nil or if the pointed value is "empty".
 //
 //	a.Emptyf(obj, "error message %s", "formatted")
+//
+// [Zero values]: https://go.dev/ref/spec#The_zero_value
 func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -128,7 +146,7 @@ func (a *Assertions) Equal(expected interface{}, actual interface{}, msgAndArgs
 	return Equal(a.t, expected, actual, msgAndArgs...)
 }
 
-// EqualError asserts that a function returned an error (i.e. not `nil`)
+// EqualError asserts that a function returned a non-nil error (i.e. an error)
 // and that it is equal to the provided error.
 //
 //	actualObj, err := SomeFunction()
@@ -140,7 +158,7 @@ func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...
 	return EqualError(a.t, theError, errString, msgAndArgs...)
 }
 
-// EqualErrorf asserts that a function returned an error (i.e. not `nil`)
+// EqualErrorf asserts that a function returned a non-nil error (i.e. an error)
 // and that it is equal to the provided error.
 //
 //	actualObj, err := SomeFunction()
@@ -222,12 +240,10 @@ func (a *Assertions) Equalf(expected interface{}, actual interface{}, msg string
 	return Equalf(a.t, expected, actual, msg, args...)
 }
 
-// Error asserts that a function returned an error (i.e. not `nil`).
+// Error asserts that a function returned a non-nil error (ie. an error).
 //
-//	  actualObj, err := SomeFunction()
-//	  if a.Error(err) {
-//		   assert.Equal(t, expectedError, err)
-//	  }
+//	actualObj, err := SomeFunction()
+//	a.Error(err)
 func (a *Assertions) Error(err error, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -253,8 +269,8 @@ func (a *Assertions) ErrorAsf(err error, target interface{}, msg string, args ..
 	return ErrorAsf(a.t, err, target, msg, args...)
 }
 
-// ErrorContains asserts that a function returned an error (i.e. not `nil`)
-// and that the error contains the specified substring.
+// ErrorContains asserts that a function returned a non-nil error (i.e. an
+// error) and that the error contains the specified substring.
 //
 //	actualObj, err := SomeFunction()
 //	a.ErrorContains(err,  expectedErrorSubString)
@@ -265,8 +281,8 @@ func (a *Assertions) ErrorContains(theError error, contains string, msgAndArgs .
 	return ErrorContains(a.t, theError, contains, msgAndArgs...)
 }
 
-// ErrorContainsf asserts that a function returned an error (i.e. not `nil`)
-// and that the error contains the specified substring.
+// ErrorContainsf asserts that a function returned a non-nil error (i.e. an
+// error) and that the error contains the specified substring.
 //
 //	actualObj, err := SomeFunction()
 //	a.ErrorContainsf(err,  expectedErrorSubString, "error message %s", "formatted")
@@ -295,12 +311,10 @@ func (a *Assertions) ErrorIsf(err error, target error, msg string, args ...inter
 	return ErrorIsf(a.t, err, target, msg, args...)
 }
 
-// Errorf asserts that a function returned an error (i.e. not `nil`).
+// Errorf asserts that a function returned a non-nil error (ie. an error).
 //
-//	  actualObj, err := SomeFunction()
-//	  if a.Errorf(err, "error message %s", "formatted") {
-//		   assert.Equal(t, expectedErrorf, err)
-//	  }
+//	actualObj, err := SomeFunction()
+//	a.Errorf(err, "error message %s", "formatted")
 func (a *Assertions) Errorf(err error, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -358,10 +372,10 @@ func (a *Assertions) EventuallyWithT(condition func(collect *CollectT), waitFor
 //		time.Sleep(8*time.Second)
 //		externalValue = true
 //	}()
-//	a.EventuallyWithTf(func(c *assert.CollectT, "error message %s", "formatted") {
+//	a.EventuallyWithTf(func(c *assert.CollectT) {
 //		// add assertions as needed; any assertion failure will fail the current tick
 //		assert.True(c, externalValue, "expected 'externalValue' to be true")
-//	}, 10*time.Second, 1*time.Second, "external state has not changed to 'true'; still false")
+//	}, 10*time.Second, 1*time.Second, "error message %s", "formatted")
 func (a *Assertions) EventuallyWithTf(condition func(collect *CollectT), waitFor time.Duration, tick time.Duration, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -868,7 +882,29 @@ func (a *Assertions) IsNonIncreasingf(object interface{}, msg string, args ...in
 	return IsNonIncreasingf(a.t, object, msg, args...)
 }
 
+// IsNotType asserts that the specified objects are not of the same type.
+//
+//	a.IsNotType(&NotMyStruct{}, &MyStruct{})
+func (a *Assertions) IsNotType(theType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	return IsNotType(a.t, theType, object, msgAndArgs...)
+}
+
+// IsNotTypef asserts that the specified objects are not of the same type.
+//
+//	a.IsNotTypef(&NotMyStruct{}, &MyStruct{}, "error message %s", "formatted")
+func (a *Assertions) IsNotTypef(theType interface{}, object interface{}, msg string, args ...interface{}) bool {
+	if h, ok := a.t.(tHelper); ok {
+		h.Helper()
+	}
+	return IsNotTypef(a.t, theType, object, msg, args...)
+}
+
 // IsType asserts that the specified objects are of the same type.
+//
+//	a.IsType(&MyStruct{}, &MyStruct{})
 func (a *Assertions) IsType(expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -877,6 +913,8 @@ func (a *Assertions) IsType(expectedType interface{}, object interface{}, msgAnd
 }
 
 // IsTypef asserts that the specified objects are of the same type.
+//
+//	a.IsTypef(&MyStruct{}, &MyStruct{}, "error message %s", "formatted")
 func (a *Assertions) IsTypef(expectedType interface{}, object interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1058,7 +1096,7 @@ func (a *Assertions) NoDirExistsf(path string, msg string, args ...interface{})
 	return NoDirExistsf(a.t, path, msg, args...)
 }
 
-// NoError asserts that a function returned no error (i.e. `nil`).
+// NoError asserts that a function returned a nil error (ie. no error).
 //
 //	  actualObj, err := SomeFunction()
 //	  if a.NoError(err) {
@@ -1071,7 +1109,7 @@ func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) bool {
 	return NoError(a.t, err, msgAndArgs...)
 }
 
-// NoErrorf asserts that a function returned no error (i.e. `nil`).
+// NoErrorf asserts that a function returned a nil error (ie. no error).
 //
 //	  actualObj, err := SomeFunction()
 //	  if a.NoErrorf(err, "error message %s", "formatted") {
@@ -1162,8 +1200,7 @@ func (a *Assertions) NotElementsMatchf(listA interface{}, listB interface{}, msg
 	return NotElementsMatchf(a.t, listA, listB, msg, args...)
 }
 
-// NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// NotEmpty asserts that the specified object is NOT [Empty].
 //
 //	if a.NotEmpty(obj) {
 //	  assert.Equal(t, "two", obj[1])
@@ -1175,8 +1212,7 @@ func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) boo
 	return NotEmpty(a.t, object, msgAndArgs...)
 }
 
-// NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// NotEmptyf asserts that the specified object is NOT [Empty].
 //
 //	if a.NotEmptyf(obj, "error message %s", "formatted") {
 //	  assert.Equal(t, "two", obj[1])
@@ -1378,12 +1414,15 @@ func (a *Assertions) NotSamef(expected interface{}, actual interface{}, msg stri
 	return NotSamef(a.t, expected, actual, msg, args...)
 }
 
-// NotSubset asserts that the specified list(array, slice...) or map does NOT
-// contain all elements given in the specified subset list(array, slice...) or
-// map.
+// NotSubset asserts that the list (array, slice, or map) does NOT contain all
+// elements given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	a.NotSubset([1, 3, 4], [1, 2])
 //	a.NotSubset({"x": 1, "y": 2}, {"z": 3})
+//	a.NotSubset([1, 3, 4], {1: "one", 2: "two"})
+//	a.NotSubset({"x": 1, "y": 2}, ["z"])
 func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1391,12 +1430,15 @@ func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs
 	return NotSubset(a.t, list, subset, msgAndArgs...)
 }
 
-// NotSubsetf asserts that the specified list(array, slice...) or map does NOT
-// contain all elements given in the specified subset list(array, slice...) or
-// map.
+// NotSubsetf asserts that the list (array, slice, or map) does NOT contain all
+// elements given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	a.NotSubsetf([1, 3, 4], [1, 2], "error message %s", "formatted")
 //	a.NotSubsetf({"x": 1, "y": 2}, {"z": 3}, "error message %s", "formatted")
+//	a.NotSubsetf([1, 3, 4], {1: "one", 2: "two"}, "error message %s", "formatted")
+//	a.NotSubsetf({"x": 1, "y": 2}, ["z"], "error message %s", "formatted")
 func (a *Assertions) NotSubsetf(list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1556,11 +1598,15 @@ func (a *Assertions) Samef(expected interface{}, actual interface{}, msg string,
 	return Samef(a.t, expected, actual, msg, args...)
 }
 
-// Subset asserts that the specified list(array, slice...) or map contains all
-// elements given in the specified subset list(array, slice...) or map.
+// Subset asserts that the list (array, slice, or map) contains all elements
+// given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	a.Subset([1, 2, 3], [1, 2])
 //	a.Subset({"x": 1, "y": 2}, {"x": 1})
+//	a.Subset([1, 2, 3], {1: "one", 2: "two"})
+//	a.Subset({"x": 1, "y": 2}, ["x"])
 func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1568,11 +1614,15 @@ func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...
 	return Subset(a.t, list, subset, msgAndArgs...)
 }
 
-// Subsetf asserts that the specified list(array, slice...) or map contains all
-// elements given in the specified subset list(array, slice...) or map.
+// Subsetf asserts that the list (array, slice, or map) contains all elements
+// given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	a.Subsetf([1, 2, 3], [1, 2], "error message %s", "formatted")
 //	a.Subsetf({"x": 1, "y": 2}, {"x": 1}, "error message %s", "formatted")
+//	a.Subsetf([1, 2, 3], {1: "one", 2: "two"}, "error message %s", "formatted")
+//	a.Subsetf({"x": 1, "y": 2}, ["x"], "error message %s", "formatted")
 func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1640,7 +1690,19 @@ func (a *Assertions) WithinRangef(actual time.Time, start time.Time, end time.Ti
 	return WithinRangef(a.t, actual, start, end, msg, args...)
 }
 
-// YAMLEq asserts that two YAML strings are equivalent.
+// YAMLEq asserts that the first documents in the two YAML strings are equivalent.
+//
+//	expected := `---
+//	key: value
+//	---
+//	key: this is a second document, it is not evaluated
+//	`
+//	actual := `---
+//	key: value
+//	---
+//	key: this is a subsequent document, it is not evaluated
+//	`
+//	a.YAMLEq(expected, actual)
 func (a *Assertions) YAMLEq(expected string, actual string, msgAndArgs ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
@@ -1648,7 +1710,19 @@ func (a *Assertions) YAMLEq(expected string, actual string, msgAndArgs ...interf
 	return YAMLEq(a.t, expected, actual, msgAndArgs...)
 }
 
-// YAMLEqf asserts that two YAML strings are equivalent.
+// YAMLEqf asserts that the first documents in the two YAML strings are equivalent.
+//
+//	expected := `---
+//	key: value
+//	---
+//	key: this is a second document, it is not evaluated
+//	`
+//	actual := `---
+//	key: value
+//	---
+//	key: this is a subsequent document, it is not evaluated
+//	`
+//	a.YAMLEqf(expected, actual, "error message %s", "formatted")
 func (a *Assertions) YAMLEqf(expected string, actual string, msg string, args ...interface{}) bool {
 	if h, ok := a.t.(tHelper); ok {
 		h.Helper()
diff --git a/vendor/github.com/stretchr/testify/assert/assertion_order.go b/vendor/github.com/stretchr/testify/assert/assertion_order.go
index 1d2f71824..a44b40ed3 100644
--- a/vendor/github.com/stretchr/testify/assert/assertion_order.go
+++ b/vendor/github.com/stretchr/testify/assert/assertion_order.go
@@ -9,7 +9,7 @@ import (
 func isOrdered(t TestingT, object interface{}, allowedComparesResults []compareResult, failMessage string, msgAndArgs ...interface{}) bool {
 	objKind := reflect.TypeOf(object).Kind()
 	if objKind != reflect.Slice && objKind != reflect.Array {
-		return false
+		return Fail(t, fmt.Sprintf("object %T is not an ordered collection", object), msgAndArgs...)
 	}
 
 	objValue := reflect.ValueOf(object)
@@ -33,7 +33,7 @@ func isOrdered(t TestingT, object interface{}, allowedComparesResults []compareR
 		compareResult, isComparable := compare(prevValueInterface, valueInterface, firstValueKind)
 
 		if !isComparable {
-			return Fail(t, fmt.Sprintf("Can not compare type \"%s\" and \"%s\"", reflect.TypeOf(value), reflect.TypeOf(prevValue)), msgAndArgs...)
+			return Fail(t, fmt.Sprintf(`Can not compare type "%T" and "%T"`, value, prevValue), msgAndArgs...)
 		}
 
 		if !containsValue(allowedComparesResults, compareResult) {
@@ -50,6 +50,9 @@ func isOrdered(t TestingT, object interface{}, allowedComparesResults []compareR
 //	assert.IsIncreasing(t, []float{1, 2})
 //	assert.IsIncreasing(t, []string{"a", "b"})
 func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
 	return isOrdered(t, object, []compareResult{compareLess}, "\"%v\" is not less than \"%v\"", msgAndArgs...)
 }
 
@@ -59,6 +62,9 @@ func IsIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) boo
 //	assert.IsNonIncreasing(t, []float{2, 1})
 //	assert.IsNonIncreasing(t, []string{"b", "a"})
 func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
 	return isOrdered(t, object, []compareResult{compareEqual, compareGreater}, "\"%v\" is not greater than or equal to \"%v\"", msgAndArgs...)
 }
 
@@ -68,6 +74,9 @@ func IsNonIncreasing(t TestingT, object interface{}, msgAndArgs ...interface{})
 //	assert.IsDecreasing(t, []float{2, 1})
 //	assert.IsDecreasing(t, []string{"b", "a"})
 func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
 	return isOrdered(t, object, []compareResult{compareGreater}, "\"%v\" is not greater than \"%v\"", msgAndArgs...)
 }
 
@@ -77,5 +86,8 @@ func IsDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) boo
 //	assert.IsNonDecreasing(t, []float{1, 2})
 //	assert.IsNonDecreasing(t, []string{"a", "b"})
 func IsNonDecreasing(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
 	return isOrdered(t, object, []compareResult{compareLess, compareEqual}, "\"%v\" is not less than or equal to \"%v\"", msgAndArgs...)
 }
diff --git a/vendor/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go
index 4e91332bb..166f63726 100644
--- a/vendor/github.com/stretchr/testify/assert/assertions.go
+++ b/vendor/github.com/stretchr/testify/assert/assertions.go
@@ -17,11 +17,10 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/davecgh/go-spew/spew"
-	"github.com/pmezard/go-difflib/difflib"
-
-	// Wrapper around gopkg.in/yaml.v3
+	// Wrapper around go.yaml.in/yaml/v3
 	"github.com/stretchr/testify/assert/yaml"
+	"github.com/stretchr/testify/internal/difflib"
+	"github.com/stretchr/testify/internal/spew"
 )
 
 //go:generate sh -c "cd ../_codegen && go build && cd - && ../_codegen/_codegen -output-package=assert -template=assertion_format.go.tmpl"
@@ -33,19 +32,19 @@ type TestingT interface {
 
 // ComparisonAssertionFunc is a common function prototype when comparing two values.  Can be useful
 // for table driven tests.
-type ComparisonAssertionFunc func(TestingT, interface{}, interface{}, ...interface{}) bool
+type ComparisonAssertionFunc = func(TestingT, interface{}, interface{}, ...interface{}) bool
 
 // ValueAssertionFunc is a common function prototype when validating a single value.  Can be useful
 // for table driven tests.
-type ValueAssertionFunc func(TestingT, interface{}, ...interface{}) bool
+type ValueAssertionFunc = func(TestingT, interface{}, ...interface{}) bool
 
 // BoolAssertionFunc is a common function prototype when validating a bool value.  Can be useful
 // for table driven tests.
-type BoolAssertionFunc func(TestingT, bool, ...interface{}) bool
+type BoolAssertionFunc = func(TestingT, bool, ...interface{}) bool
 
 // ErrorAssertionFunc is a common function prototype when validating an error value.  Can be useful
 // for table driven tests.
-type ErrorAssertionFunc func(TestingT, error, ...interface{}) bool
+type ErrorAssertionFunc = func(TestingT, error, ...interface{}) bool
 
 // PanicAssertionFunc is a common function prototype when validating a panic value.  Can be useful
 // for table driven tests.
@@ -210,59 +209,77 @@ the problem actually occurred in calling code.*/
 // of each stack frame leading from the current test to the assert call that
 // failed.
 func CallerInfo() []string {
-
 	var pc uintptr
-	var ok bool
 	var file string
 	var line int
 	var name string
 
+	const stackFrameBufferSize = 10
+	pcs := make([]uintptr, stackFrameBufferSize)
+
 	callers := []string{}
-	for i := 0; ; i++ {
-		pc, file, line, ok = runtime.Caller(i)
-		if !ok {
-			// The breaks below failed to terminate the loop, and we ran off the
-			// end of the call stack.
+	offset := 1
+
+	for {
+		n := runtime.Callers(offset, pcs)
+
+		if n == 0 {
 			break
 		}
 
-		// This is a huge edge case, but it will panic if this is the case, see #180
-		if file == "" {
-			break
-		}
+		frames := runtime.CallersFrames(pcs[:n])
 
-		f := runtime.FuncForPC(pc)
-		if f == nil {
-			break
-		}
-		name = f.Name()
+		for {
+			frame, more := frames.Next()
+			pc = frame.PC
+			file = frame.File
+			line = frame.Line
 
-		// testing.tRunner is the standard library function that calls
-		// tests. Subtests are called directly by tRunner, without going through
-		// the Test/Benchmark/Example function that contains the t.Run calls, so
-		// with subtests we should break when we hit tRunner, without adding it
-		// to the list of callers.
-		if name == "testing.tRunner" {
-			break
-		}
+			// This is a huge edge case, but it will panic if this is the case, see #180
+			if file == "" {
+				break
+			}
 
-		parts := strings.Split(file, "/")
-		if len(parts) > 1 {
-			filename := parts[len(parts)-1]
-			dir := parts[len(parts)-2]
-			if (dir != "assert" && dir != "mock" && dir != "require") || filename == "mock_test.go" {
-				callers = append(callers, fmt.Sprintf("%s:%d", file, line))
+			f := runtime.FuncForPC(pc)
+			if f == nil {
+				break
+			}
+			name = f.Name()
+
+			// testing.tRunner is the standard library function that calls
+			// tests. Subtests are called directly by tRunner, without going through
+			// the Test/Benchmark/Example function that contains the t.Run calls, so
+			// with subtests we should break when we hit tRunner, without adding it
+			// to the list of callers.
+			if name == "testing.tRunner" {
+				break
+			}
+
+			parts := strings.Split(file, "/")
+			if len(parts) > 1 {
+				filename := parts[len(parts)-1]
+				dir := parts[len(parts)-2]
+				if (dir != "assert" && dir != "mock" && dir != "require") || filename == "mock_test.go" {
+					callers = append(callers, fmt.Sprintf("%s:%d", file, line))
+				}
+			}
+
+			// Drop the package
+			dotPos := strings.LastIndexByte(name, '.')
+			name = name[dotPos+1:]
+			if isTest(name, "Test") ||
+				isTest(name, "Benchmark") ||
+				isTest(name, "Example") {
+				break
+			}
+
+			if !more {
+				break
 			}
 		}
 
-		// Drop the package
-		segments := strings.Split(name, ".")
-		name = segments[len(segments)-1]
-		if isTest(name, "Test") ||
-			isTest(name, "Benchmark") ||
-			isTest(name, "Example") {
-			break
-		}
+		// Next batch
+		offset += cap(pcs)
 	}
 
 	return callers
@@ -307,13 +324,15 @@ func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
 func indentMessageLines(message string, longestLabelLen int) string {
 	outBuf := new(bytes.Buffer)
 
-	for i, scanner := 0, bufio.NewScanner(strings.NewReader(message)); scanner.Scan(); i++ {
-		// no need to align first line because it starts at the correct location (after the label)
-		if i != 0 {
-			// append alignLen+1 spaces to align with "{{longestLabel}}:" before adding tab
-			outBuf.WriteString("\n\t" + strings.Repeat(" ", longestLabelLen+1) + "\t")
+	scanner := bufio.NewScanner(strings.NewReader(message))
+	for firstLine := true; scanner.Scan(); firstLine = false {
+		if !firstLine {
+			fmt.Fprint(outBuf, "\n\t"+strings.Repeat(" ", longestLabelLen+1)+"\t")
 		}
-		outBuf.WriteString(scanner.Text())
+		fmt.Fprint(outBuf, scanner.Text())
+	}
+	if err := scanner.Err(); err != nil {
+		return fmt.Sprintf("cannot display message: %s", err)
 	}
 
 	return outBuf.String()
@@ -437,17 +456,34 @@ func NotImplements(t TestingT, interfaceObject interface{}, object interface{},
 	return true
 }
 
+func isType(expectedType, object interface{}) bool {
+	return ObjectsAreEqual(reflect.TypeOf(object), reflect.TypeOf(expectedType))
+}
+
 // IsType asserts that the specified objects are of the same type.
-func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
+//
+//	assert.IsType(t, &MyStruct{}, &MyStruct{})
+func IsType(t TestingT, expectedType, object interface{}, msgAndArgs ...interface{}) bool {
+	if isType(expectedType, object) {
+		return true
+	}
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
+	return Fail(t, fmt.Sprintf("Object expected to be of type %T, but was %T", expectedType, object), msgAndArgs...)
+}
 
-	if !ObjectsAreEqual(reflect.TypeOf(object), reflect.TypeOf(expectedType)) {
-		return Fail(t, fmt.Sprintf("Object expected to be of type %v, but was %v", reflect.TypeOf(expectedType), reflect.TypeOf(object)), msgAndArgs...)
+// IsNotType asserts that the specified objects are not of the same type.
+//
+//	assert.IsNotType(t, &NotMyStruct{}, &MyStruct{})
+func IsNotType(t TestingT, theType, object interface{}, msgAndArgs ...interface{}) bool {
+	if !isType(theType, object) {
+		return true
 	}
-
-	return true
+	if h, ok := t.(tHelper); ok {
+		h.Helper()
+	}
+	return Fail(t, fmt.Sprintf("Object type expected to be different than %T", theType), msgAndArgs...)
 }
 
 // Equal asserts that two objects are equal.
@@ -475,7 +511,6 @@ func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{})
 	}
 
 	return true
-
 }
 
 // validateEqualArgs checks whether provided arguments can be safely used in the
@@ -510,8 +545,8 @@ func Same(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) b
 	if !same {
 		// both are pointers but not the same type & pointing to the same address
 		return Fail(t, fmt.Sprintf("Not same: \n"+
-			"expected: %p %#v\n"+
-			"actual  : %p %#v", expected, expected, actual, actual), msgAndArgs...)
+			"expected: %[2]s (%[1]T)(%[1]p)\n"+
+			"actual  : %[4]s (%[3]T)(%[3]p)", expected, truncatingFormat("%#v", expected), actual, truncatingFormat("%#v", actual)), msgAndArgs...)
 	}
 
 	return true
@@ -530,14 +565,14 @@ func NotSame(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}
 
 	same, ok := samePointers(expected, actual)
 	if !ok {
-		//fails when the arguments are not pointers
+		// fails when the arguments are not pointers
 		return !(Fail(t, "Both arguments must be pointers", msgAndArgs...))
 	}
 
 	if same {
 		return Fail(t, fmt.Sprintf(
-			"Expected and actual point to the same object: %p %#v",
-			expected, expected), msgAndArgs...)
+			"Expected and actual point to the same object: %p %s",
+			expected, truncatingFormat("%#v", expected)), msgAndArgs...)
 	}
 	return true
 }
@@ -549,7 +584,7 @@ func NotSame(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}
 func samePointers(first, second interface{}) (same bool, ok bool) {
 	firstPtr, secondPtr := reflect.ValueOf(first), reflect.ValueOf(second)
 	if firstPtr.Kind() != reflect.Ptr || secondPtr.Kind() != reflect.Ptr {
-		return false, false //not both are pointers
+		return false, false // not both are pointers
 	}
 
 	firstType, secondType := reflect.TypeOf(first), reflect.TypeOf(second)
@@ -569,25 +604,26 @@ func samePointers(first, second interface{}) (same bool, ok bool) {
 // to a type conversion in the Go grammar.
 func formatUnequalValues(expected, actual interface{}) (e string, a string) {
 	if reflect.TypeOf(expected) != reflect.TypeOf(actual) {
-		return fmt.Sprintf("%T(%s)", expected, truncatingFormat(expected)),
-			fmt.Sprintf("%T(%s)", actual, truncatingFormat(actual))
+		return fmt.Sprintf("%T(%s)", expected, truncatingFormat("%#v", expected)),
+			fmt.Sprintf("%T(%s)", actual, truncatingFormat("%#v", actual))
 	}
 	switch expected.(type) {
 	case time.Duration:
 		return fmt.Sprintf("%v", expected), fmt.Sprintf("%v", actual)
 	}
-	return truncatingFormat(expected), truncatingFormat(actual)
+	return truncatingFormat("%#v", expected), truncatingFormat("%#v", actual)
 }
 
 // truncatingFormat formats the data and truncates it if it's too long.
 //
 // This helps keep formatted error messages lines from exceeding the
 // bufio.MaxScanTokenSize max line length that the go testing framework imposes.
-func truncatingFormat(data interface{}) string {
-	value := fmt.Sprintf("%#v", data)
-	max := bufio.MaxScanTokenSize - 100 // Give us some space the type info too if needed.
-	if len(value) > max {
-		value = value[0:max] + "<... truncated>"
+func truncatingFormat(format string, data interface{}) string {
+	value := fmt.Sprintf(format, data)
+	// Give us space for two truncated objects and the surrounding sentence.
+	maxMessageSize := bufio.MaxScanTokenSize/2 - 100
+	if len(value) > maxMessageSize {
+		value = value[0:maxMessageSize] + "<... truncated>"
 	}
 	return value
 }
@@ -610,7 +646,6 @@ func EqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interfa
 	}
 
 	return true
-
 }
 
 // EqualExportedValues asserts that the types of two objects are equal and their public
@@ -665,7 +700,6 @@ func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}
 	}
 
 	return Equal(t, expected, actual, msgAndArgs...)
-
 }
 
 // NotNil asserts that the specified object is not nil.
@@ -710,57 +744,63 @@ func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
-	return Fail(t, fmt.Sprintf("Expected nil, but got: %#v", object), msgAndArgs...)
+	return Fail(t, fmt.Sprintf("Expected nil, but got: %s", truncatingFormat("%#v", object)), msgAndArgs...)
 }
 
 // isEmpty gets whether the specified object is considered empty or not.
 func isEmpty(object interface{}) bool {
-
 	// get nil case out of the way
 	if object == nil {
 		return true
 	}
 
-	objValue := reflect.ValueOf(object)
-
-	switch objValue.Kind() {
-	// collection types are empty when they have no element
-	case reflect.Chan, reflect.Map, reflect.Slice:
-		return objValue.Len() == 0
-	// pointers are empty if nil or if the value they point to is empty
-	case reflect.Ptr:
-		if objValue.IsNil() {
-			return true
-		}
-		deref := objValue.Elem().Interface()
-		return isEmpty(deref)
-	// for all other types, compare against the zero value
-	// array types are empty when they match their zero-initialized state
-	default:
-		zero := reflect.Zero(objValue.Type())
-		return reflect.DeepEqual(object, zero.Interface())
-	}
+	return isEmptyValue(reflect.ValueOf(object))
 }
 
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// isEmptyValue gets whether the specified reflect.Value is considered empty or not.
+func isEmptyValue(objValue reflect.Value) bool {
+	if objValue.IsZero() {
+		return true
+	}
+	// Special cases of non-zero values that we consider empty
+	switch objValue.Kind() {
+	// collection types are empty when they have no element
+	// Note: array types are empty when they match their zero-initialized state.
+	case reflect.Chan, reflect.Map, reflect.Slice:
+		return objValue.Len() == 0
+	// non-nil pointers are empty if the value they point to is empty
+	case reflect.Ptr:
+		return isEmptyValue(objValue.Elem())
+	}
+	return false
+}
+
+// Empty asserts that the given value is "empty".
+//
+// [Zero values] are "empty".
+//
+// Arrays are "empty" if every element is the zero value of the type (stricter than "empty").
+//
+// Slices, maps and channels with zero length are "empty".
+//
+// Pointer values are "empty" if the pointer is nil or if the pointed value is "empty".
 //
 //	assert.Empty(t, obj)
+//
+// [Zero values]: https://go.dev/ref/spec#The_zero_value
 func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	pass := isEmpty(object)
 	if !pass {
 		if h, ok := t.(tHelper); ok {
 			h.Helper()
 		}
-		Fail(t, fmt.Sprintf("Should be empty, but was %v", object), msgAndArgs...)
+		Fail(t, fmt.Sprintf("Should be empty, but was %s", truncatingFormat("%v", object)), msgAndArgs...)
 	}
 
 	return pass
-
 }
 
-// NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// a slice or a channel with len == 0.
+// NotEmpty asserts that the specified object is NOT [Empty].
 //
 //	if assert.NotEmpty(t, obj) {
 //	  assert.Equal(t, "two", obj[1])
@@ -775,7 +815,6 @@ func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	}
 
 	return pass
-
 }
 
 // getLen tries to get the length of an object.
@@ -798,11 +837,11 @@ func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{})
 	}
 	l, ok := getLen(object)
 	if !ok {
-		return Fail(t, fmt.Sprintf("\"%v\" could not be applied builtin len()", object), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%q could not be applied builtin len()", truncatingFormat("%v", object)), msgAndArgs...)
 	}
 
 	if l != length {
-		return Fail(t, fmt.Sprintf("\"%v\" should have %d item(s), but has %d", object, length, l), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%q should have %d item(s), but has %d", truncatingFormat("%v", object), length, l), msgAndArgs...)
 	}
 	return true
 }
@@ -819,7 +858,6 @@ func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 	}
 
 	return true
-
 }
 
 // False asserts that the specified value is false.
@@ -834,7 +872,6 @@ func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 	}
 
 	return true
-
 }
 
 // NotEqual asserts that the specified values are NOT equal.
@@ -853,11 +890,10 @@ func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{
 	}
 
 	if ObjectsAreEqual(expected, actual) {
-		return Fail(t, fmt.Sprintf("Should not be: %#v\n", actual), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Should not be: %s\n", truncatingFormat("%#v", actual)), msgAndArgs...)
 	}
 
 	return true
-
 }
 
 // NotEqualValues asserts that two objects are not equal even when converted to the same type
@@ -869,7 +905,7 @@ func NotEqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...inte
 	}
 
 	if ObjectsAreEqualValues(expected, actual) {
-		return Fail(t, fmt.Sprintf("Should not be: %#v\n", actual), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Should not be: %s\n", truncatingFormat("%#v", actual)), msgAndArgs...)
 	}
 
 	return true
@@ -880,7 +916,6 @@ func NotEqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...inte
 // return (true, false) if element was not found.
 // return (true, true) if element was found.
 func containsElement(list interface{}, element interface{}) (ok, found bool) {
-
 	listValue := reflect.ValueOf(list)
 	listType := reflect.TypeOf(list)
 	if listType == nil {
@@ -915,7 +950,6 @@ func containsElement(list interface{}, element interface{}) (ok, found bool) {
 		}
 	}
 	return true, false
-
 }
 
 // Contains asserts that the specified string, list(array, slice...) or map contains the
@@ -931,14 +965,13 @@ func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bo
 
 	ok, found := containsElement(s, contains)
 	if !ok {
-		return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", s), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%s could not be applied builtin len()", truncatingFormat("%#v", s)), msgAndArgs...)
 	}
 	if !found {
-		return Fail(t, fmt.Sprintf("%#v does not contain %#v", s, contains), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%s does not contain %#v", truncatingFormat("%#v", s), contains), msgAndArgs...)
 	}
 
 	return true
-
 }
 
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
@@ -954,21 +987,24 @@ func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{})
 
 	ok, found := containsElement(s, contains)
 	if !ok {
-		return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", s), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%s could not be applied builtin len()", truncatingFormat("%#v", s)), msgAndArgs...)
 	}
 	if found {
-		return Fail(t, fmt.Sprintf("%#v should not contain %#v", s, contains), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%s should not contain %#v", truncatingFormat("%#v", s), contains), msgAndArgs...)
 	}
 
 	return true
-
 }
 
-// Subset asserts that the specified list(array, slice...) or map contains all
-// elements given in the specified subset list(array, slice...) or map.
+// Subset asserts that the list (array, slice, or map) contains all elements
+// given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	assert.Subset(t, [1, 2, 3], [1, 2])
 //	assert.Subset(t, {"x": 1, "y": 2}, {"x": 1})
+//	assert.Subset(t, [1, 2, 3], {1: "one", 2: "two"})
+//	assert.Subset(t, {"x": 1, "y": 2}, ["x"])
 func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok bool) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -983,7 +1019,7 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
 	}
 
 	subsetKind := reflect.TypeOf(subset).Kind()
-	if subsetKind != reflect.Array && subsetKind != reflect.Slice && listKind != reflect.Map {
+	if subsetKind != reflect.Array && subsetKind != reflect.Slice && subsetKind != reflect.Map {
 		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", subset, subsetKind), msgAndArgs...)
 	}
 
@@ -996,10 +1032,10 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
 			av := actualMap.MapIndex(k)
 
 			if !av.IsValid() {
-				return Fail(t, fmt.Sprintf("%#v does not contain %#v", list, subset), msgAndArgs...)
+				return Fail(t, fmt.Sprintf("%s does not contain %s", truncatingFormat("%#v", list), truncatingFormat("%#v", subset)), msgAndArgs...)
 			}
 			if !ObjectsAreEqual(ev.Interface(), av.Interface()) {
-				return Fail(t, fmt.Sprintf("%#v does not contain %#v", list, subset), msgAndArgs...)
+				return Fail(t, fmt.Sprintf("%s does not contain %s", truncatingFormat("%#v", list), truncatingFormat("%#v", subset)), msgAndArgs...)
 			}
 		}
 
@@ -1007,6 +1043,13 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
 	}
 
 	subsetList := reflect.ValueOf(subset)
+	if subsetKind == reflect.Map {
+		keys := make([]interface{}, subsetList.Len())
+		for idx, key := range subsetList.MapKeys() {
+			keys[idx] = key.Interface()
+		}
+		subsetList = reflect.ValueOf(keys)
+	}
 	for i := 0; i < subsetList.Len(); i++ {
 		element := subsetList.Index(i).Interface()
 		ok, found := containsElement(list, element)
@@ -1014,19 +1057,22 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
 			return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", list), msgAndArgs...)
 		}
 		if !found {
-			return Fail(t, fmt.Sprintf("%#v does not contain %#v", list, element), msgAndArgs...)
+			return Fail(t, fmt.Sprintf("%s does not contain %#v", truncatingFormat("%#v", list), element), msgAndArgs...)
 		}
 	}
 
 	return true
 }
 
-// NotSubset asserts that the specified list(array, slice...) or map does NOT
-// contain all elements given in the specified subset list(array, slice...) or
-// map.
+// NotSubset asserts that the list (array, slice, or map) does NOT contain all
+// elements given in the subset (array, slice, or map).
+// Map elements are key-value pairs unless compared with an array or slice where
+// only the map key is evaluated.
 //
 //	assert.NotSubset(t, [1, 3, 4], [1, 2])
 //	assert.NotSubset(t, {"x": 1, "y": 2}, {"z": 3})
+//	assert.NotSubset(t, [1, 3, 4], {1: "one", 2: "two"})
+//	assert.NotSubset(t, {"x": 1, "y": 2}, ["z"])
 func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok bool) {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1037,12 +1083,12 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
 
 	listKind := reflect.TypeOf(list).Kind()
 	if listKind != reflect.Array && listKind != reflect.Slice && listKind != reflect.Map {
-		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", list, listKind), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%#v has an unsupported type %s", list, listKind), msgAndArgs...)
 	}
 
 	subsetKind := reflect.TypeOf(subset).Kind()
-	if subsetKind != reflect.Array && subsetKind != reflect.Slice && listKind != reflect.Map {
-		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", subset, subsetKind), msgAndArgs...)
+	if subsetKind != reflect.Array && subsetKind != reflect.Slice && subsetKind != reflect.Map {
+		return Fail(t, fmt.Sprintf("%#v has an unsupported type %s", subset, subsetKind), msgAndArgs...)
 	}
 
 	if subsetKind == reflect.Map && listKind == reflect.Map {
@@ -1061,22 +1107,29 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
 			}
 		}
 
-		return Fail(t, fmt.Sprintf("%q is a subset of %q", subset, list), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("%s is a subset of %s", truncatingFormat("%#v", subset), truncatingFormat("%#v", list)), msgAndArgs...)
 	}
 
 	subsetList := reflect.ValueOf(subset)
+	if subsetKind == reflect.Map {
+		keys := make([]interface{}, subsetList.Len())
+		for idx, key := range subsetList.MapKeys() {
+			keys[idx] = key.Interface()
+		}
+		subsetList = reflect.ValueOf(keys)
+	}
 	for i := 0; i < subsetList.Len(); i++ {
 		element := subsetList.Index(i).Interface()
 		ok, found := containsElement(list, element)
 		if !ok {
-			return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
+			return Fail(t, fmt.Sprintf("%#v could not be applied builtin len()", list), msgAndArgs...)
 		}
 		if !found {
 			return true
 		}
 	}
 
-	return Fail(t, fmt.Sprintf("%q is a subset of %q", subset, list), msgAndArgs...)
+	return Fail(t, fmt.Sprintf("%s is a subset of %s", truncatingFormat("%#v", subset), truncatingFormat("%#v", list)), msgAndArgs...)
 }
 
 // ElementsMatch asserts that the specified listA(array, slice...) is equal to specified
@@ -1291,9 +1344,15 @@ func PanicsWithError(t TestingT, errString string, f PanicTestFunc, msgAndArgs .
 	if !funcDidPanic {
 		return Fail(t, fmt.Sprintf("func %#v should panic\n\tPanic value:\t%#v", f, panicValue), msgAndArgs...)
 	}
-	panicErr, ok := panicValue.(error)
-	if !ok || panicErr.Error() != errString {
-		return Fail(t, fmt.Sprintf("func %#v should panic with error message:\t%#v\n\tPanic value:\t%#v\n\tPanic stack:\t%s", f, errString, panicValue, panickedStack), msgAndArgs...)
+	panicErr, isError := panicValue.(error)
+	if !isError || panicErr.Error() != errString {
+		msg := fmt.Sprintf("func %#v should panic with error message:\t%#v\n", f, errString)
+		if isError {
+			msg += fmt.Sprintf("\tError message:\t%#v\n", panicErr.Error())
+		}
+		msg += fmt.Sprintf("\tPanic value:\t%#v\n", panicValue)
+		msg += fmt.Sprintf("\tPanic stack:\t%s\n", panickedStack)
+		return Fail(t, msg, msgAndArgs...)
 	}
 
 	return true
@@ -1572,7 +1631,7 @@ func InEpsilonSlice(t TestingT, expected, actual interface{}, epsilon float64, m
 	Errors
 */
 
-// NoError asserts that a function returned no error (i.e. `nil`).
+// NoError asserts that a function returned a nil error (ie. no error).
 //
 //	  actualObj, err := SomeFunction()
 //	  if assert.NoError(t, err) {
@@ -1583,18 +1642,16 @@ func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
 		if h, ok := t.(tHelper); ok {
 			h.Helper()
 		}
-		return Fail(t, fmt.Sprintf("Received unexpected error:\n%+v", err), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Received unexpected error:\n%s", truncatingFormat("%+v", err)), msgAndArgs...)
 	}
 
 	return true
 }
 
-// Error asserts that a function returned an error (i.e. not `nil`).
+// Error asserts that a function returned a non-nil error (ie. an error).
 //
-//	  actualObj, err := SomeFunction()
-//	  if assert.Error(t, err) {
-//		   assert.Equal(t, expectedError, err)
-//	  }
+//	actualObj, err := SomeFunction()
+//	assert.Error(t, err)
 func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
 	if err == nil {
 		if h, ok := t.(tHelper); ok {
@@ -1606,7 +1663,7 @@ func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
 	return true
 }
 
-// EqualError asserts that a function returned an error (i.e. not `nil`)
+// EqualError asserts that a function returned a non-nil error (i.e. an error)
 // and that it is equal to the provided error.
 //
 //	actualObj, err := SomeFunction()
@@ -1624,13 +1681,13 @@ func EqualError(t TestingT, theError error, errString string, msgAndArgs ...inte
 	if expected != actual {
 		return Fail(t, fmt.Sprintf("Error message not equal:\n"+
 			"expected: %q\n"+
-			"actual  : %q", expected, actual), msgAndArgs...)
+			"actual  : %s", expected, truncatingFormat("%q", actual)), msgAndArgs...)
 	}
 	return true
 }
 
-// ErrorContains asserts that a function returned an error (i.e. not `nil`)
-// and that the error contains the specified substring.
+// ErrorContains asserts that a function returned a non-nil error (i.e. an
+// error) and that the error contains the specified substring.
 //
 //	actualObj, err := SomeFunction()
 //	assert.ErrorContains(t, err,  expectedErrorSubString)
@@ -1644,7 +1701,7 @@ func ErrorContains(t TestingT, theError error, contains string, msgAndArgs ...in
 
 	actual := theError.Error()
 	if !strings.Contains(actual, contains) {
-		return Fail(t, fmt.Sprintf("Error %#v does not contain %#v", actual, contains), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Error %s does not contain %#v", truncatingFormat("%#v", actual), contains), msgAndArgs...)
 	}
 
 	return true
@@ -1667,7 +1724,6 @@ func matchRegexp(rx interface{}, str interface{}) bool {
 	default:
 		return r.MatchString(fmt.Sprint(v))
 	}
-
 }
 
 // Regexp asserts that a specified regexp matches a string.
@@ -1703,7 +1759,6 @@ func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interf
 	}
 
 	return !match
-
 }
 
 // Zero asserts that i is the zero value for its type.
@@ -1712,7 +1767,7 @@ func Zero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool {
 		h.Helper()
 	}
 	if i != nil && !reflect.DeepEqual(i, reflect.Zero(reflect.TypeOf(i)).Interface()) {
-		return Fail(t, fmt.Sprintf("Should be zero, but was %v", i), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Should be zero, but was %s", truncatingFormat("%v", i)), msgAndArgs...)
 	}
 	return true
 }
@@ -1814,6 +1869,11 @@ func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{
 		return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid json.\nJSON parsing error: '%s'", expected, err.Error()), msgAndArgs...)
 	}
 
+	// Shortcut if same bytes
+	if actual == expected {
+		return true
+	}
+
 	if err := json.Unmarshal([]byte(actual), &actualJSONAsInterface); err != nil {
 		return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid json.\nJSON parsing error: '%s'", actual, err.Error()), msgAndArgs...)
 	}
@@ -1821,7 +1881,19 @@ func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{
 	return Equal(t, expectedJSONAsInterface, actualJSONAsInterface, msgAndArgs...)
 }
 
-// YAMLEq asserts that two YAML strings are equivalent.
+// YAMLEq asserts that the first documents in the two YAML strings are equivalent.
+//
+//	expected := `---
+//	key: value
+//	---
+//	key: this is a second document, it is not evaluated
+//	`
+//	actual := `---
+//	key: value
+//	---
+//	key: this is a subsequent document, it is not evaluated
+//	`
+//	assert.YAMLEq(t, expected, actual)
 func YAMLEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
@@ -1832,6 +1904,11 @@ func YAMLEq(t TestingT, expected string, actual string, msgAndArgs ...interface{
 		return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid yaml.\nYAML parsing error: '%s'", expected, err.Error()), msgAndArgs...)
 	}
 
+	// Shortcut if same bytes
+	if actual == expected {
+		return true
+	}
+
 	if err := yaml.Unmarshal([]byte(actual), &actualYAMLAsInterface); err != nil {
 		return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid yaml.\nYAML error: '%s'", actual, err.Error()), msgAndArgs...)
 	}
@@ -1933,6 +2010,7 @@ func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick t
 	}
 
 	ch := make(chan bool, 1)
+	checkCond := func() { ch <- condition() }
 
 	timer := time.NewTimer(waitFor)
 	defer timer.Stop()
@@ -1940,18 +2018,23 @@ func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick t
 	ticker := time.NewTicker(tick)
 	defer ticker.Stop()
 
-	for tick := ticker.C; ; {
+	var tickC <-chan time.Time
+
+	// Check the condition once first on the initial call.
+	go checkCond()
+
+	for {
 		select {
 		case <-timer.C:
 			return Fail(t, "Condition never satisfied", msgAndArgs...)
-		case <-tick:
-			tick = nil
-			go func() { ch <- condition() }()
+		case <-tickC:
+			tickC = nil
+			go checkCond()
 		case v := <-ch:
 			if v {
 				return true
 			}
-			tick = ticker.C
+			tickC = ticker.C
 		}
 	}
 }
@@ -1964,6 +2047,9 @@ type CollectT struct {
 	errors []error
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (CollectT) Helper() {}
+
 // Errorf collects the error.
 func (c *CollectT) Errorf(format string, args ...interface{}) {
 	c.errors = append(c.errors, fmt.Errorf(format, args...))
@@ -2021,35 +2107,42 @@ func EventuallyWithT(t TestingT, condition func(collect *CollectT), waitFor time
 	var lastFinishedTickErrs []error
 	ch := make(chan *CollectT, 1)
 
+	checkCond := func() {
+		collect := new(CollectT)
+		defer func() {
+			ch <- collect
+		}()
+		condition(collect)
+	}
+
 	timer := time.NewTimer(waitFor)
 	defer timer.Stop()
 
 	ticker := time.NewTicker(tick)
 	defer ticker.Stop()
 
-	for tick := ticker.C; ; {
+	var tickC <-chan time.Time
+
+	// Check the condition once first on the initial call.
+	go checkCond()
+
+	for {
 		select {
 		case <-timer.C:
 			for _, err := range lastFinishedTickErrs {
 				t.Errorf("%v", err)
 			}
 			return Fail(t, "Condition never satisfied", msgAndArgs...)
-		case <-tick:
-			tick = nil
-			go func() {
-				collect := new(CollectT)
-				defer func() {
-					ch <- collect
-				}()
-				condition(collect)
-			}()
+		case <-tickC:
+			tickC = nil
+			go checkCond()
 		case collect := <-ch:
 			if !collect.failed() {
 				return true
 			}
 			// Keep the errors from the last ended condition, so that they can be copied to t if timeout is reached.
 			lastFinishedTickErrs = collect.errors
-			tick = ticker.C
+			tickC = ticker.C
 		}
 	}
 }
@@ -2064,6 +2157,7 @@ func Never(t TestingT, condition func() bool, waitFor time.Duration, tick time.D
 	}
 
 	ch := make(chan bool, 1)
+	checkCond := func() { ch <- condition() }
 
 	timer := time.NewTimer(waitFor)
 	defer timer.Stop()
@@ -2071,18 +2165,23 @@ func Never(t TestingT, condition func() bool, waitFor time.Duration, tick time.D
 	ticker := time.NewTicker(tick)
 	defer ticker.Stop()
 
-	for tick := ticker.C; ; {
+	var tickC <-chan time.Time
+
+	// Check the condition once first on the initial call.
+	go checkCond()
+
+	for {
 		select {
 		case <-timer.C:
 			return true
-		case <-tick:
-			tick = nil
-			go func() { ch <- condition() }()
+		case <-tickC:
+			tickC = nil
+			go checkCond()
 		case v := <-ch:
 			if v {
 				return Fail(t, "Condition satisfied", msgAndArgs...)
 			}
-			tick = ticker.C
+			tickC = ticker.C
 		}
 	}
 }
@@ -2100,13 +2199,16 @@ func ErrorIs(t TestingT, err, target error, msgAndArgs ...interface{}) bool {
 	var expectedText string
 	if target != nil {
 		expectedText = target.Error()
+		if err == nil {
+			return Fail(t, fmt.Sprintf("Expected error with %q in chain but got nil.", expectedText), msgAndArgs...)
+		}
 	}
 
-	chain := buildErrorChainString(err)
+	chain := buildErrorChainString(err, false)
 
 	return Fail(t, fmt.Sprintf("Target error should be in err chain:\n"+
-		"expected: %q\n"+
-		"in chain: %s", expectedText, chain,
+		"expected: %s\n"+
+		"in chain: %s", truncatingFormat("%q", expectedText), truncatingFormat("%s", chain),
 	), msgAndArgs...)
 }
 
@@ -2125,11 +2227,11 @@ func NotErrorIs(t TestingT, err, target error, msgAndArgs ...interface{}) bool {
 		expectedText = target.Error()
 	}
 
-	chain := buildErrorChainString(err)
+	chain := buildErrorChainString(err, false)
 
 	return Fail(t, fmt.Sprintf("Target error should not be in err chain:\n"+
-		"found: %q\n"+
-		"in chain: %s", expectedText, chain,
+		"found: %s\n"+
+		"in chain: %s", truncatingFormat("%q", expectedText), truncatingFormat("%s", chain),
 	), msgAndArgs...)
 }
 
@@ -2143,11 +2245,17 @@ func ErrorAs(t TestingT, err error, target interface{}, msgAndArgs ...interface{
 		return true
 	}
 
-	chain := buildErrorChainString(err)
+	expectedType := reflect.TypeOf(target).Elem().String()
+	if err == nil {
+		return Fail(t, fmt.Sprintf("An error is expected but got nil.\n"+
+			"expected: %s", expectedType), msgAndArgs...)
+	}
+
+	chain := buildErrorChainString(err, true)
 
 	return Fail(t, fmt.Sprintf("Should be in error chain:\n"+
-		"expected: %q\n"+
-		"in chain: %s", target, chain,
+		"expected: %s\n"+
+		"in chain: %s", expectedType, truncatingFormat("%s", chain),
 	), msgAndArgs...)
 }
 
@@ -2161,24 +2269,46 @@ func NotErrorAs(t TestingT, err error, target interface{}, msgAndArgs ...interfa
 		return true
 	}
 
-	chain := buildErrorChainString(err)
+	chain := buildErrorChainString(err, true)
 
 	return Fail(t, fmt.Sprintf("Target error should not be in err chain:\n"+
-		"found: %q\n"+
-		"in chain: %s", target, chain,
+		"found: %s\n"+
+		"in chain: %s", reflect.TypeOf(target).Elem().String(), truncatingFormat("%s", chain),
 	), msgAndArgs...)
 }
 
-func buildErrorChainString(err error) string {
+func unwrapAll(err error) (errs []error) {
+	errs = append(errs, err)
+	switch x := err.(type) {
+	case interface{ Unwrap() error }:
+		err = x.Unwrap()
+		if err == nil {
+			return
+		}
+		errs = append(errs, unwrapAll(err)...)
+	case interface{ Unwrap() []error }:
+		for _, err := range x.Unwrap() {
+			errs = append(errs, unwrapAll(err)...)
+		}
+	}
+	return
+}
+
+func buildErrorChainString(err error, withType bool) string {
 	if err == nil {
 		return ""
 	}
 
-	e := errors.Unwrap(err)
-	chain := fmt.Sprintf("%q", err.Error())
-	for e != nil {
-		chain += fmt.Sprintf("\n\t%q", e.Error())
-		e = errors.Unwrap(e)
+	var chain string
+	errs := unwrapAll(err)
+	for i := range errs {
+		if i != 0 {
+			chain += "\n\t"
+		}
+		chain += fmt.Sprintf("%q", errs[i].Error())
+		if withType {
+			chain += fmt.Sprintf(" (%T)", errs[i])
+		}
 	}
 	return chain
 }
diff --git a/vendor/github.com/stretchr/testify/assert/doc.go b/vendor/github.com/stretchr/testify/assert/doc.go
index 4953981d3..c111589c7 100644
--- a/vendor/github.com/stretchr/testify/assert/doc.go
+++ b/vendor/github.com/stretchr/testify/assert/doc.go
@@ -1,5 +1,9 @@
 // Package assert provides a set of comprehensive testing tools for use with the normal Go testing system.
 //
+// # Note
+//
+// All functions in this package return a bool value indicating whether the assertion has passed.
+//
 // # Example Usage
 //
 // The following is a complete example using assert in a standard test function:
@@ -36,8 +40,8 @@
 //
 // # Assertions
 //
-// Assertions allow you to easily write test code, and are global funcs in the `assert` package.
-// All assertion functions take, as the first argument, the `*testing.T` object provided by the
+// Assertions allow you to easily write test code, and are global funcs in the assert package.
+// All assertion functions take, as the first argument, the [*testing.T] object provided by the
 // testing framework. This allows the assertion funcs to write the failings and other details to
 // the correct place.
 //
diff --git a/vendor/github.com/stretchr/testify/assert/http_assertions.go b/vendor/github.com/stretchr/testify/assert/http_assertions.go
index 861ed4b7c..5a6bb75f2 100644
--- a/vendor/github.com/stretchr/testify/assert/http_assertions.go
+++ b/vendor/github.com/stretchr/testify/assert/http_assertions.go
@@ -138,7 +138,7 @@ func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string,
 
 	contains := strings.Contains(body, fmt.Sprint(str))
 	if !contains {
-		Fail(t, fmt.Sprintf("Expected response body for \"%s\" to contain \"%s\" but found \"%s\"", url+"?"+values.Encode(), str, body), msgAndArgs...)
+		Fail(t, fmt.Sprintf("Expected response body for %q to contain %q but found %q", url+"?"+values.Encode(), str, body), msgAndArgs...)
 	}
 
 	return contains
@@ -158,7 +158,7 @@ func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method, url strin
 
 	contains := strings.Contains(body, fmt.Sprint(str))
 	if contains {
-		Fail(t, fmt.Sprintf("Expected response body for \"%s\" to NOT contain \"%s\" but found \"%s\"", url+"?"+values.Encode(), str, body), msgAndArgs...)
+		Fail(t, fmt.Sprintf("Expected response body for %q to NOT contain %q but found %q", url+"?"+values.Encode(), str, body), msgAndArgs...)
 	}
 
 	return !contains
diff --git a/vendor/github.com/stretchr/testify/assert/yaml/yaml_custom.go b/vendor/github.com/stretchr/testify/assert/yaml/yaml_custom.go
index baa0cc7d7..956227ca2 100644
--- a/vendor/github.com/stretchr/testify/assert/yaml/yaml_custom.go
+++ b/vendor/github.com/stretchr/testify/assert/yaml/yaml_custom.go
@@ -1,5 +1,4 @@
 //go:build testify_yaml_custom && !testify_yaml_fail && !testify_yaml_default
-// +build testify_yaml_custom,!testify_yaml_fail,!testify_yaml_default
 
 // Package yaml is an implementation of YAML functions that calls a pluggable implementation.
 //
@@ -8,7 +7,7 @@
 //	go test -tags testify_yaml_custom
 //
 // This implementation can be used at build time to replace the default implementation
-// to avoid linking with [gopkg.in/yaml.v3].
+// to avoid linking with [go.yaml.in/yaml/v3].
 //
 // In your test package:
 //
diff --git a/vendor/github.com/stretchr/testify/assert/yaml/yaml_default.go b/vendor/github.com/stretchr/testify/assert/yaml/yaml_default.go
index b83c6cf64..dd89ac03a 100644
--- a/vendor/github.com/stretchr/testify/assert/yaml/yaml_default.go
+++ b/vendor/github.com/stretchr/testify/assert/yaml/yaml_default.go
@@ -1,5 +1,4 @@
 //go:build !testify_yaml_fail && !testify_yaml_custom
-// +build !testify_yaml_fail,!testify_yaml_custom
 
 // Package yaml is just an indirection to handle YAML deserialization.
 //
@@ -7,7 +6,7 @@
 // indirection with an alternative implementation of this package that uses
 // another implementation of YAML deserialization. This allows to not either not
 // use YAML deserialization at all, or to use another implementation than
-// [gopkg.in/yaml.v3] (for example for license compatibility reasons, see [PR #1120]).
+// [go.yaml.in/yaml/v3] (for example for license compatibility reasons, see [PR #1120]).
 //
 // Alternative implementations are selected using build tags:
 //
@@ -29,9 +28,9 @@
 // [PR #1120]: https://github.com/stretchr/testify/pull/1120
 package yaml
 
-import goyaml "gopkg.in/yaml.v3"
+import goyaml "go.yaml.in/yaml/v3"
 
-// Unmarshal is just a wrapper of [gopkg.in/yaml.v3.Unmarshal].
+// Unmarshal is just a wrapper of [go.yaml.in/yaml/v3.Unmarshal].
 func Unmarshal(in []byte, out interface{}) error {
 	return goyaml.Unmarshal(in, out)
 }
diff --git a/vendor/github.com/stretchr/testify/assert/yaml/yaml_fail.go b/vendor/github.com/stretchr/testify/assert/yaml/yaml_fail.go
index e78f7dfe6..a51d27925 100644
--- a/vendor/github.com/stretchr/testify/assert/yaml/yaml_fail.go
+++ b/vendor/github.com/stretchr/testify/assert/yaml/yaml_fail.go
@@ -1,10 +1,9 @@
 //go:build testify_yaml_fail && !testify_yaml_custom && !testify_yaml_default
-// +build testify_yaml_fail,!testify_yaml_custom,!testify_yaml_default
 
 // Package yaml is an implementation of YAML functions that always fail.
 //
 // This implementation can be used at build time to replace the default implementation
-// to avoid linking with [gopkg.in/yaml.v3]:
+// to avoid linking with [go.yaml.in/yaml/v3]:
 //
 //	go test -tags testify_yaml_fail
 package yaml
diff --git a/vendor/github.com/pmezard/go-difflib/LICENSE b/vendor/github.com/stretchr/testify/internal/difflib/LICENSE
similarity index 95%
rename from vendor/github.com/pmezard/go-difflib/LICENSE
rename to vendor/github.com/stretchr/testify/internal/difflib/LICENSE
index c67dad612..485be13c6 100644
--- a/vendor/github.com/pmezard/go-difflib/LICENSE
+++ b/vendor/github.com/stretchr/testify/internal/difflib/LICENSE
@@ -24,4 +24,4 @@ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/vendor/github.com/pmezard/go-difflib/difflib/difflib.go b/vendor/github.com/stretchr/testify/internal/difflib/difflib.go
similarity index 77%
rename from vendor/github.com/pmezard/go-difflib/difflib/difflib.go
rename to vendor/github.com/stretchr/testify/internal/difflib/difflib.go
index 003e99fad..9984599b4 100644
--- a/vendor/github.com/pmezard/go-difflib/difflib/difflib.go
+++ b/vendor/github.com/stretchr/testify/internal/difflib/difflib.go
@@ -8,11 +8,14 @@
 //
 // - unified_diff
 //
-// - context_diff
-//
 // Getting unified diffs was the main goal of the port. Keep in mind this code
 // is mostly suitable to output text differences in a human friendly way, there
 // are no guarantees generated diffs are consumable by patch(1).
+//
+// This package was adopted from [github.com/pmezard/go-difflib] which
+// is no longer maintained.
+//
+// [github.com/pmezard/go-difflib]: https://github.com/pmezard/go-difflib
 package difflib
 
 import (
@@ -37,13 +40,6 @@ func max(a, b int) int {
 	return b
 }
 
-func calculateRatio(matches, length int) float64 {
-	if length > 0 {
-		return 2.0 * float64(matches) / float64(length)
-	}
-	return 1.0
-}
-
 type Match struct {
 	A    int
 	B    int
@@ -103,14 +99,6 @@ func NewMatcher(a, b []string) *SequenceMatcher {
 	return &m
 }
 
-func NewMatcherWithJunk(a, b []string, autoJunk bool,
-	isJunk func(string) bool) *SequenceMatcher {
-
-	m := SequenceMatcher{IsJunk: isJunk, autoJunk: autoJunk}
-	m.SetSeqs(a, b)
-	return &m
-}
-
 // Set two sequences to be compared.
 func (m *SequenceMatcher) SetSeqs(a, b []string) {
 	m.SetSeq1(a)
@@ -199,12 +187,15 @@ func (m *SequenceMatcher) isBJunk(s string) bool {
 // If IsJunk is not defined:
 //
 // Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
-//     alo <= i <= i+k <= ahi
-//     blo <= j <= j+k <= bhi
+//
+//	alo <= i <= i+k <= ahi
+//	blo <= j <= j+k <= bhi
+//
 // and for all (i',j',k') meeting those conditions,
-//     k >= k'
-//     i <= i'
-//     and if i == i', j <= j'
+//
+//	k >= k'
+//	i <= i'
+//	and if i == i', j <= j'
 //
 // In other words, of all maximal matching blocks, return one that
 // starts earliest in a, and of all those maximal matching blocks that
@@ -451,66 +442,6 @@ func (m *SequenceMatcher) GetGroupedOpCodes(n int) [][]OpCode {
 	return groups
 }
 
-// Return a measure of the sequences' similarity (float in [0,1]).
-//
-// Where T is the total number of elements in both sequences, and
-// M is the number of matches, this is 2.0*M / T.
-// Note that this is 1 if the sequences are identical, and 0 if
-// they have nothing in common.
-//
-// .Ratio() is expensive to compute if you haven't already computed
-// .GetMatchingBlocks() or .GetOpCodes(), in which case you may
-// want to try .QuickRatio() or .RealQuickRation() first to get an
-// upper bound.
-func (m *SequenceMatcher) Ratio() float64 {
-	matches := 0
-	for _, m := range m.GetMatchingBlocks() {
-		matches += m.Size
-	}
-	return calculateRatio(matches, len(m.a)+len(m.b))
-}
-
-// Return an upper bound on ratio() relatively quickly.
-//
-// This isn't defined beyond that it is an upper bound on .Ratio(), and
-// is faster to compute.
-func (m *SequenceMatcher) QuickRatio() float64 {
-	// viewing a and b as multisets, set matches to the cardinality
-	// of their intersection; this counts the number of matches
-	// without regard to order, so is clearly an upper bound
-	if m.fullBCount == nil {
-		m.fullBCount = map[string]int{}
-		for _, s := range m.b {
-			m.fullBCount[s] = m.fullBCount[s] + 1
-		}
-	}
-
-	// avail[x] is the number of times x appears in 'b' less the
-	// number of times we've seen it in 'a' so far ... kinda
-	avail := map[string]int{}
-	matches := 0
-	for _, s := range m.a {
-		n, ok := avail[s]
-		if !ok {
-			n = m.fullBCount[s]
-		}
-		avail[s] = n - 1
-		if n > 0 {
-			matches += 1
-		}
-	}
-	return calculateRatio(matches, len(m.a)+len(m.b))
-}
-
-// Return an upper bound on ratio() very quickly.
-//
-// This isn't defined beyond that it is an upper bound on .Ratio(), and
-// is faster to compute than either .Ratio() or .QuickRatio().
-func (m *SequenceMatcher) RealQuickRatio() float64 {
-	la, lb := len(m.a), len(m.b)
-	return calculateRatio(min(la, lb), la+lb)
-}
-
 // Convert range to the "ed" format
 func formatRangeUnified(start, stop int) string {
 	// Per the diff spec at http://www.unix.org/single_unix_specification/
@@ -652,117 +583,6 @@ func formatRangeContext(start, stop int) string {
 	return fmt.Sprintf("%d,%d", beginning, beginning+length-1)
 }
 
-type ContextDiff UnifiedDiff
-
-// Compare two sequences of lines; generate the delta as a context diff.
-//
-// Context diffs are a compact way of showing line changes and a few
-// lines of context. The number of context lines is set by diff.Context
-// which defaults to three.
-//
-// By default, the diff control lines (those with *** or ---) are
-// created with a trailing newline.
-//
-// For inputs that do not have trailing newlines, set the diff.Eol
-// argument to "" so that the output will be uniformly newline free.
-//
-// The context diff format normally has a header for filenames and
-// modification times.  Any or all of these may be specified using
-// strings for diff.FromFile, diff.ToFile, diff.FromDate, diff.ToDate.
-// The modification times are normally expressed in the ISO 8601 format.
-// If not specified, the strings default to blanks.
-func WriteContextDiff(writer io.Writer, diff ContextDiff) error {
-	buf := bufio.NewWriter(writer)
-	defer buf.Flush()
-	var diffErr error
-	wf := func(format string, args ...interface{}) {
-		_, err := buf.WriteString(fmt.Sprintf(format, args...))
-		if diffErr == nil && err != nil {
-			diffErr = err
-		}
-	}
-	ws := func(s string) {
-		_, err := buf.WriteString(s)
-		if diffErr == nil && err != nil {
-			diffErr = err
-		}
-	}
-
-	if len(diff.Eol) == 0 {
-		diff.Eol = "\n"
-	}
-
-	prefix := map[byte]string{
-		'i': "+ ",
-		'd': "- ",
-		'r': "! ",
-		'e': "  ",
-	}
-
-	started := false
-	m := NewMatcher(diff.A, diff.B)
-	for _, g := range m.GetGroupedOpCodes(diff.Context) {
-		if !started {
-			started = true
-			fromDate := ""
-			if len(diff.FromDate) > 0 {
-				fromDate = "\t" + diff.FromDate
-			}
-			toDate := ""
-			if len(diff.ToDate) > 0 {
-				toDate = "\t" + diff.ToDate
-			}
-			if diff.FromFile != "" || diff.ToFile != "" {
-				wf("*** %s%s%s", diff.FromFile, fromDate, diff.Eol)
-				wf("--- %s%s%s", diff.ToFile, toDate, diff.Eol)
-			}
-		}
-
-		first, last := g[0], g[len(g)-1]
-		ws("***************" + diff.Eol)
-
-		range1 := formatRangeContext(first.I1, last.I2)
-		wf("*** %s ****%s", range1, diff.Eol)
-		for _, c := range g {
-			if c.Tag == 'r' || c.Tag == 'd' {
-				for _, cc := range g {
-					if cc.Tag == 'i' {
-						continue
-					}
-					for _, line := range diff.A[cc.I1:cc.I2] {
-						ws(prefix[cc.Tag] + line)
-					}
-				}
-				break
-			}
-		}
-
-		range2 := formatRangeContext(first.J1, last.J2)
-		wf("--- %s ----%s", range2, diff.Eol)
-		for _, c := range g {
-			if c.Tag == 'r' || c.Tag == 'i' {
-				for _, cc := range g {
-					if cc.Tag == 'd' {
-						continue
-					}
-					for _, line := range diff.B[cc.J1:cc.J2] {
-						ws(prefix[cc.Tag] + line)
-					}
-				}
-				break
-			}
-		}
-	}
-	return diffErr
-}
-
-// Like WriteContextDiff but returns the diff a string.
-func GetContextDiffString(diff ContextDiff) (string, error) {
-	w := &bytes.Buffer{}
-	err := WriteContextDiff(w, diff)
-	return string(w.Bytes()), err
-}
-
 // Split a string on "\n" while preserving them. The output can be used
 // as input for UnifiedDiff and ContextDiff structures.
 func SplitLines(s string) []string {
diff --git a/vendor/github.com/davecgh/go-spew/LICENSE b/vendor/github.com/stretchr/testify/internal/spew/LICENSE
similarity index 100%
rename from vendor/github.com/davecgh/go-spew/LICENSE
rename to vendor/github.com/stretchr/testify/internal/spew/LICENSE
diff --git a/vendor/github.com/stretchr/testify/internal/spew/README.md b/vendor/github.com/stretchr/testify/internal/spew/README.md
new file mode 100644
index 000000000..51a909e2e
--- /dev/null
+++ b/vendor/github.com/stretchr/testify/internal/spew/README.md
@@ -0,0 +1,12 @@
+go-spew
+=======
+
+[![ISC License](http://img.shields.io/badge/license-ISC-blue.svg)](http://copyfree.org)
+
+Go-spew implements a deep pretty printer for Go data structures to aid in
+debugging.  A comprehensive suite of tests with 100% test coverage is provided
+to ensure proper functionality.
+
+## License
+
+Go-spew is licensed under the [copyfree](http://copyfree.org) ISC License.
diff --git a/vendor/github.com/davecgh/go-spew/spew/bypass.go b/vendor/github.com/stretchr/testify/internal/spew/bypass.go
similarity index 98%
rename from vendor/github.com/davecgh/go-spew/spew/bypass.go
rename to vendor/github.com/stretchr/testify/internal/spew/bypass.go
index 792994785..70ddeaad3 100644
--- a/vendor/github.com/davecgh/go-spew/spew/bypass.go
+++ b/vendor/github.com/stretchr/testify/internal/spew/bypass.go
@@ -18,6 +18,7 @@
 // tag is deprecated and thus should not be used.
 // Go versions prior to 1.4 are disabled because they use a different layout
 // for interfaces which make the implementation of unsafeReflectValue more complex.
+//go:build !js && !appengine && !safe && !disableunsafe && go1.4
 // +build !js,!appengine,!safe,!disableunsafe,go1.4
 
 package spew
diff --git a/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go b/vendor/github.com/stretchr/testify/internal/spew/bypasssafe.go
similarity index 96%
rename from vendor/github.com/davecgh/go-spew/spew/bypasssafe.go
rename to vendor/github.com/stretchr/testify/internal/spew/bypasssafe.go
index 205c28d68..5e2d890d6 100644
--- a/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go
+++ b/vendor/github.com/stretchr/testify/internal/spew/bypasssafe.go
@@ -16,6 +16,7 @@
 // when the code is running on Google App Engine, compiled by GopherJS, or
 // "-tags safe" is added to the go build command line.  The "disableunsafe"
 // tag is deprecated and thus should not be used.
+//go:build js || appengine || safe || disableunsafe || !go1.4
 // +build js appengine safe disableunsafe !go1.4
 
 package spew
diff --git a/vendor/github.com/davecgh/go-spew/spew/common.go b/vendor/github.com/stretchr/testify/internal/spew/common.go
similarity index 100%
rename from vendor/github.com/davecgh/go-spew/spew/common.go
rename to vendor/github.com/stretchr/testify/internal/spew/common.go
diff --git a/vendor/github.com/davecgh/go-spew/spew/config.go b/vendor/github.com/stretchr/testify/internal/spew/config.go
similarity index 95%
rename from vendor/github.com/davecgh/go-spew/spew/config.go
rename to vendor/github.com/stretchr/testify/internal/spew/config.go
index 2e3d22f31..161895fc6 100644
--- a/vendor/github.com/davecgh/go-spew/spew/config.go
+++ b/vendor/github.com/stretchr/testify/internal/spew/config.go
@@ -254,15 +254,15 @@ pointer addresses used to indirect to the final value.  It provides the
 following features over the built-in printing facilities provided by the fmt
 package:
 
-	* Pointers are dereferenced and followed
-	* Circular data structures are detected and handled properly
-	* Custom Stringer/error interfaces are optionally invoked, including
-	  on unexported types
-	* Custom types which only implement the Stringer/error interfaces via
-	  a pointer receiver are optionally invoked when passing non-pointer
-	  variables
-	* Byte arrays and slices are dumped like the hexdump -C command which
-	  includes offsets, byte values in hex, and ASCII output
+  - Pointers are dereferenced and followed
+  - Circular data structures are detected and handled properly
+  - Custom Stringer/error interfaces are optionally invoked, including
+    on unexported types
+  - Custom types which only implement the Stringer/error interfaces via
+    a pointer receiver are optionally invoked when passing non-pointer
+    variables
+  - Byte arrays and slices are dumped like the hexdump -C command which
+    includes offsets, byte values in hex, and ASCII output
 
 The configuration options are controlled by modifying the public members
 of c.  See ConfigState for options documentation.
@@ -295,12 +295,12 @@ func (c *ConfigState) convertArgs(args []interface{}) (formatters []interface{})
 
 // NewDefaultConfig returns a ConfigState with the following default settings.
 //
-// 	Indent: " "
-// 	MaxDepth: 0
-// 	DisableMethods: false
-// 	DisablePointerMethods: false
-// 	ContinueOnMethod: false
-// 	SortKeys: false
+//	Indent: " "
+//	MaxDepth: 0
+//	DisableMethods: false
+//	DisablePointerMethods: false
+//	ContinueOnMethod: false
+//	SortKeys: false
 func NewDefaultConfig() *ConfigState {
 	return &ConfigState{Indent: " "}
 }
diff --git a/vendor/github.com/davecgh/go-spew/spew/doc.go b/vendor/github.com/stretchr/testify/internal/spew/doc.go
similarity index 65%
rename from vendor/github.com/davecgh/go-spew/spew/doc.go
rename to vendor/github.com/stretchr/testify/internal/spew/doc.go
index aacaac6f1..722e9aa79 100644
--- a/vendor/github.com/davecgh/go-spew/spew/doc.go
+++ b/vendor/github.com/stretchr/testify/internal/spew/doc.go
@@ -21,35 +21,36 @@ debugging.
 A quick overview of the additional features spew provides over the built-in
 printing facilities for Go data types are as follows:
 
-	* Pointers are dereferenced and followed
-	* Circular data structures are detected and handled properly
-	* Custom Stringer/error interfaces are optionally invoked, including
-	  on unexported types
-	* Custom types which only implement the Stringer/error interfaces via
-	  a pointer receiver are optionally invoked when passing non-pointer
-	  variables
-	* Byte arrays and slices are dumped like the hexdump -C command which
-	  includes offsets, byte values in hex, and ASCII output (only when using
-	  Dump style)
+  - Pointers are dereferenced and followed
+  - Circular data structures are detected and handled properly
+  - Custom Stringer/error interfaces are optionally invoked, including
+    on unexported types
+  - Custom types which only implement the Stringer/error interfaces via
+    a pointer receiver are optionally invoked when passing non-pointer
+    variables
+  - Byte arrays and slices are dumped like the hexdump -C command which
+    includes offsets, byte values in hex, and ASCII output (only when using
+    Dump style)
 
 There are two different approaches spew allows for dumping Go data structures:
 
-	* Dump style which prints with newlines, customizable indentation,
-	  and additional debug information such as types and all pointer addresses
-	  used to indirect to the final value
-	* A custom Formatter interface that integrates cleanly with the standard fmt
-	  package and replaces %v, %+v, %#v, and %#+v to provide inline printing
-	  similar to the default %v while providing the additional functionality
-	  outlined above and passing unsupported format verbs such as %x and %q
-	  along to fmt
+  - Dump style which prints with newlines, customizable indentation,
+    and additional debug information such as types and all pointer addresses
+    used to indirect to the final value
+  - A custom Formatter interface that integrates cleanly with the standard fmt
+    package and replaces %v, %+v, %#v, and %#+v to provide inline printing
+    similar to the default %v while providing the additional functionality
+    outlined above and passing unsupported format verbs such as %x and %q
+    along to fmt
 
-Quick Start
+# Quick Start
 
 This section demonstrates how to quickly get started with spew.  See the
 sections below for further details on formatting and configuration options.
 
 To dump a variable with full newlines, indentation, type, and pointer
 information use Dump, Fdump, or Sdump:
+
 	spew.Dump(myVar1, myVar2, ...)
 	spew.Fdump(someWriter, myVar1, myVar2, ...)
 	str := spew.Sdump(myVar1, myVar2, ...)
@@ -58,12 +59,13 @@ Alternatively, if you would prefer to use format strings with a compacted inline
 printing style, use the convenience wrappers Printf, Fprintf, etc with
 %v (most compact), %+v (adds pointer addresses), %#v (adds types), or
 %#+v (adds types and pointer addresses):
+
 	spew.Printf("myVar1: %v -- myVar2: %+v", myVar1, myVar2)
 	spew.Printf("myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
 	spew.Fprintf(someWriter, "myVar1: %v -- myVar2: %+v", myVar1, myVar2)
 	spew.Fprintf(someWriter, "myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
 
-Configuration Options
+# Configuration Options
 
 Configuration of spew is handled by fields in the ConfigState type.  For
 convenience, all of the top-level functions use a global state available
@@ -74,51 +76,52 @@ equivalent to the top-level functions.  This allows concurrent configuration
 options.  See the ConfigState documentation for more details.
 
 The following configuration options are available:
-	* Indent
-		String to use for each indentation level for Dump functions.
-		It is a single space by default.  A popular alternative is "\t".
 
-	* MaxDepth
-		Maximum number of levels to descend into nested data structures.
-		There is no limit by default.
+  - Indent
+    String to use for each indentation level for Dump functions.
+    It is a single space by default.  A popular alternative is "\t".
 
-	* DisableMethods
-		Disables invocation of error and Stringer interface methods.
-		Method invocation is enabled by default.
+  - MaxDepth
+    Maximum number of levels to descend into nested data structures.
+    There is no limit by default.
 
-	* DisablePointerMethods
-		Disables invocation of error and Stringer interface methods on types
-		which only accept pointer receivers from non-pointer variables.
-		Pointer method invocation is enabled by default.
+  - DisableMethods
+    Disables invocation of error and Stringer interface methods.
+    Method invocation is enabled by default.
 
-	* DisablePointerAddresses
-		DisablePointerAddresses specifies whether to disable the printing of
-		pointer addresses. This is useful when diffing data structures in tests.
+  - DisablePointerMethods
+    Disables invocation of error and Stringer interface methods on types
+    which only accept pointer receivers from non-pointer variables.
+    Pointer method invocation is enabled by default.
 
-	* DisableCapacities
-		DisableCapacities specifies whether to disable the printing of
-		capacities for arrays, slices, maps and channels. This is useful when
-		diffing data structures in tests.
+  - DisablePointerAddresses
+    DisablePointerAddresses specifies whether to disable the printing of
+    pointer addresses. This is useful when diffing data structures in tests.
 
-	* ContinueOnMethod
-		Enables recursion into types after invoking error and Stringer interface
-		methods. Recursion after method invocation is disabled by default.
+  - DisableCapacities
+    DisableCapacities specifies whether to disable the printing of
+    capacities for arrays, slices, maps and channels. This is useful when
+    diffing data structures in tests.
 
-	* SortKeys
-		Specifies map keys should be sorted before being printed. Use
-		this to have a more deterministic, diffable output.  Note that
-		only native types (bool, int, uint, floats, uintptr and string)
-		and types which implement error or Stringer interfaces are
-		supported with other types sorted according to the
-		reflect.Value.String() output which guarantees display
-		stability.  Natural map order is used by default.
+  - ContinueOnMethod
+    Enables recursion into types after invoking error and Stringer interface
+    methods. Recursion after method invocation is disabled by default.
 
-	* SpewKeys
-		Specifies that, as a last resort attempt, map keys should be
-		spewed to strings and sorted by those strings.  This is only
-		considered if SortKeys is true.
+  - SortKeys
+    Specifies map keys should be sorted before being printed. Use
+    this to have a more deterministic, diffable output.  Note that
+    only native types (bool, int, uint, floats, uintptr and string)
+    and types which implement error or Stringer interfaces are
+    supported with other types sorted according to the
+    reflect.Value.String() output which guarantees display
+    stability.  Natural map order is used by default.
 
-Dump Usage
+  - SpewKeys
+    Specifies that, as a last resort attempt, map keys should be
+    spewed to strings and sorted by those strings.  This is only
+    considered if SortKeys is true.
+
+# Dump Usage
 
 Simply call spew.Dump with a list of variables you want to dump:
 
@@ -133,7 +136,7 @@ A third option is to call spew.Sdump to get the formatted output as a string:
 
 	str := spew.Sdump(myVar1, myVar2, ...)
 
-Sample Dump Output
+# Sample Dump Output
 
 See the Dump example for details on the setup of the types and variables being
 shown here.
@@ -150,13 +153,14 @@ shown here.
 
 Byte (and uint8) arrays and slices are displayed uniquely like the hexdump -C
 command as shown.
+
 	([]uint8) (len=32 cap=32) {
 	 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20  |............... |
 	 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30  |!"#$%&'()*+,-./0|
 	 00000020  31 32                                             |12|
 	}
 
-Custom Formatter
+# Custom Formatter
 
 Spew provides a custom formatter that implements the fmt.Formatter interface
 so that it integrates cleanly with standard fmt package printing functions. The
@@ -170,7 +174,7 @@ standard fmt package for formatting.  In addition, the custom formatter ignores
 the width and precision arguments (however they will still work on the format
 specifiers not handled by the custom formatter).
 
-Custom Formatter Usage
+# Custom Formatter Usage
 
 The simplest way to make use of the spew custom formatter is to call one of the
 convenience functions such as spew.Printf, spew.Println, or spew.Printf.  The
@@ -184,15 +188,17 @@ functions have syntax you are most likely already familiar with:
 
 See the Index for the full list convenience functions.
 
-Sample Formatter Output
+# Sample Formatter Output
 
 Double pointer to a uint8:
+
 	  %v: <**>5
 	 %+v: <**>(0xf8400420d0->0xf8400420c8)5
 	 %#v: (**uint8)5
 	%#+v: (**uint8)(0xf8400420d0->0xf8400420c8)5
 
 Pointer to circular struct with a uint8 field and a pointer to itself:
+
 	  %v: <*>{1 <*>}
 	 %+v: <*>(0xf84003e260){ui8:1 c:<*>(0xf84003e260)}
 	 %#v: (*main.circular){ui8:(uint8)1 c:(*main.circular)}
@@ -201,7 +207,7 @@ Pointer to circular struct with a uint8 field and a pointer to itself:
 See the Printf example for details on the setup of variables being shown
 here.
 
-Errors
+# Errors
 
 Since it is possible for custom Stringer/error interfaces to panic, spew
 detects them and handles them internally by printing the panic information
diff --git a/vendor/github.com/davecgh/go-spew/spew/dump.go b/vendor/github.com/stretchr/testify/internal/spew/dump.go
similarity index 96%
rename from vendor/github.com/davecgh/go-spew/spew/dump.go
rename to vendor/github.com/stretchr/testify/internal/spew/dump.go
index f78d89fc1..8323041a4 100644
--- a/vendor/github.com/davecgh/go-spew/spew/dump.go
+++ b/vendor/github.com/stretchr/testify/internal/spew/dump.go
@@ -488,15 +488,15 @@ pointer addresses used to indirect to the final value.  It provides the
 following features over the built-in printing facilities provided by the fmt
 package:
 
-	* Pointers are dereferenced and followed
-	* Circular data structures are detected and handled properly
-	* Custom Stringer/error interfaces are optionally invoked, including
-	  on unexported types
-	* Custom types which only implement the Stringer/error interfaces via
-	  a pointer receiver are optionally invoked when passing non-pointer
-	  variables
-	* Byte arrays and slices are dumped like the hexdump -C command which
-	  includes offsets, byte values in hex, and ASCII output
+  - Pointers are dereferenced and followed
+  - Circular data structures are detected and handled properly
+  - Custom Stringer/error interfaces are optionally invoked, including
+    on unexported types
+  - Custom types which only implement the Stringer/error interfaces via
+    a pointer receiver are optionally invoked when passing non-pointer
+    variables
+  - Byte arrays and slices are dumped like the hexdump -C command which
+    includes offsets, byte values in hex, and ASCII output
 
 The configuration options are controlled by an exported package global,
 spew.Config.  See ConfigState for options documentation.
diff --git a/vendor/github.com/davecgh/go-spew/spew/format.go b/vendor/github.com/stretchr/testify/internal/spew/format.go
similarity index 100%
rename from vendor/github.com/davecgh/go-spew/spew/format.go
rename to vendor/github.com/stretchr/testify/internal/spew/format.go
diff --git a/vendor/github.com/davecgh/go-spew/spew/spew.go b/vendor/github.com/stretchr/testify/internal/spew/spew.go
similarity index 100%
rename from vendor/github.com/davecgh/go-spew/spew/spew.go
rename to vendor/github.com/stretchr/testify/internal/spew/spew.go
diff --git a/vendor/github.com/xanzy/ssh-agent/.gitignore b/vendor/github.com/xanzy/ssh-agent/.gitignore
deleted file mode 100644
index daf913b1b..000000000
--- a/vendor/github.com/xanzy/ssh-agent/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/vendor/github.com/xanzy/ssh-agent/LICENSE b/vendor/github.com/xanzy/ssh-agent/LICENSE
deleted file mode 100644
index 8f71f43fe..000000000
--- a/vendor/github.com/xanzy/ssh-agent/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/vendor/github.com/xanzy/ssh-agent/README.md b/vendor/github.com/xanzy/ssh-agent/README.md
deleted file mode 100644
index e2dfcedca..000000000
--- a/vendor/github.com/xanzy/ssh-agent/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# ssh-agent
-
-Create a new [agent.Agent](https://godoc.org/golang.org/x/crypto/ssh/agent#Agent) on any type of OS (so including Windows) from any [Go](https://golang.org) application.
-
-## Limitations
-
-When compiled for Windows, it will only support [Pageant](http://the.earth.li/~sgtatham/putty/0.66/htmldoc/Chapter9.html#pageant) as the SSH authentication agent.
-
-## Credits
-
-Big thanks to [Давид Мзареулян (David Mzareulyan)](https://github.com/davidmz) for creating the [go-pageant](https://github.com/davidmz/go-pageant) package!
-
-## Issues
-
-If you have an issue: report it on the [issue tracker](https://github.com/xanzy/ssh-agent/issues)
-
-## Author
-
-Sander van Harmelen ()
-
-## License
-
-The files `pageant_windows.go` and `sshagent_windows.go` have their own license (see file headers). The rest of this package is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at 
diff --git a/vendor/github.com/xanzy/ssh-agent/pageant_windows.go b/vendor/github.com/xanzy/ssh-agent/pageant_windows.go
deleted file mode 100644
index 1608e54cc..000000000
--- a/vendor/github.com/xanzy/ssh-agent/pageant_windows.go
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2014 David Mzareulyan
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-// and associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-// BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-//go:build windows
-// +build windows
-
-package sshagent
-
-// see https://github.com/Yasushi/putty/blob/master/windows/winpgntc.c#L155
-// see https://github.com/paramiko/paramiko/blob/master/paramiko/win_pageant.py
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"sync"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-// Maximum size of message can be sent to pageant
-const MaxMessageLen = 8192
-
-var (
-	ErrPageantNotFound = errors.New("pageant process not found")
-	ErrSendMessage     = errors.New("error sending message")
-
-	ErrMessageTooLong       = errors.New("message too long")
-	ErrInvalidMessageFormat = errors.New("invalid message format")
-	ErrResponseTooLong      = errors.New("response too long")
-)
-
-const (
-	agentCopydataID = 0x804e50ba
-	wmCopydata      = 74
-)
-
-type copyData struct {
-	dwData uintptr
-	cbData uint32
-	lpData unsafe.Pointer
-}
-
-var (
-	lock sync.Mutex
-
-	user32dll      = windows.NewLazySystemDLL("user32.dll")
-	winFindWindow  = winAPI(user32dll, "FindWindowW")
-	winSendMessage = winAPI(user32dll, "SendMessageW")
-
-	kernel32dll           = windows.NewLazySystemDLL("kernel32.dll")
-	winGetCurrentThreadID = winAPI(kernel32dll, "GetCurrentThreadId")
-)
-
-func winAPI(dll *windows.LazyDLL, funcName string) func(...uintptr) (uintptr, uintptr, error) {
-	proc := dll.NewProc(funcName)
-	return func(a ...uintptr) (uintptr, uintptr, error) { return proc.Call(a...) }
-}
-
-// Query sends message msg to Pageant and returns response or error.
-// 'msg' is raw agent request with length prefix
-// Response is raw agent response with length prefix
-func query(msg []byte) ([]byte, error) {
-	if len(msg) > MaxMessageLen {
-		return nil, ErrMessageTooLong
-	}
-
-	msgLen := binary.BigEndian.Uint32(msg[:4])
-	if len(msg) != int(msgLen)+4 {
-		return nil, ErrInvalidMessageFormat
-	}
-
-	lock.Lock()
-	defer lock.Unlock()
-
-	paWin := pageantWindow()
-
-	if paWin == 0 {
-		return nil, ErrPageantNotFound
-	}
-
-	thID, _, _ := winGetCurrentThreadID()
-	mapName := fmt.Sprintf("PageantRequest%08x", thID)
-	pMapName, _ := syscall.UTF16PtrFromString(mapName)
-
-	mmap, err := syscall.CreateFileMapping(syscall.InvalidHandle, nil, syscall.PAGE_READWRITE, 0, MaxMessageLen+4, pMapName)
-	if err != nil {
-		return nil, err
-	}
-	defer syscall.CloseHandle(mmap)
-
-	ptr, err := syscall.MapViewOfFile(mmap, syscall.FILE_MAP_WRITE, 0, 0, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer syscall.UnmapViewOfFile(ptr)
-
-	mmSlice := (*(*[MaxMessageLen]byte)(unsafe.Pointer(ptr)))[:]
-
-	copy(mmSlice, msg)
-
-	mapNameBytesZ := append([]byte(mapName), 0)
-
-	cds := copyData{
-		dwData: agentCopydataID,
-		cbData: uint32(len(mapNameBytesZ)),
-		lpData: unsafe.Pointer(&(mapNameBytesZ[0])),
-	}
-
-	resp, _, _ := winSendMessage(paWin, wmCopydata, 0, uintptr(unsafe.Pointer(&cds)))
-
-	if resp == 0 {
-		return nil, ErrSendMessage
-	}
-
-	respLen := binary.BigEndian.Uint32(mmSlice[:4])
-	if respLen > MaxMessageLen-4 {
-		return nil, ErrResponseTooLong
-	}
-
-	respData := make([]byte, respLen+4)
-	copy(respData, mmSlice)
-
-	return respData, nil
-}
-
-func pageantWindow() uintptr {
-	nameP, _ := syscall.UTF16PtrFromString("Pageant")
-	h, _, _ := winFindWindow(uintptr(unsafe.Pointer(nameP)), uintptr(unsafe.Pointer(nameP)))
-	return h
-}
diff --git a/vendor/github.com/xanzy/ssh-agent/sshagent.go b/vendor/github.com/xanzy/ssh-agent/sshagent.go
deleted file mode 100644
index 4a4ee30c9..000000000
--- a/vendor/github.com/xanzy/ssh-agent/sshagent.go
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright 2015, Sander van Harmelen
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-//go:build !windows
-// +build !windows
-
-package sshagent
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"os"
-
-	"golang.org/x/crypto/ssh/agent"
-)
-
-// New returns a new agent.Agent that uses a unix socket
-func New() (agent.Agent, net.Conn, error) {
-	if !Available() {
-		return nil, nil, errors.New("SSH agent requested but SSH_AUTH_SOCK not-specified")
-	}
-
-	sshAuthSock := os.Getenv("SSH_AUTH_SOCK")
-
-	conn, err := net.Dial("unix", sshAuthSock)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error connecting to SSH_AUTH_SOCK: %v", err)
-	}
-
-	return agent.NewClient(conn), conn, nil
-}
-
-// Available returns true is a auth socket is defined
-func Available() bool {
-	return os.Getenv("SSH_AUTH_SOCK") != ""
-}
diff --git a/vendor/github.com/xanzy/ssh-agent/sshagent_windows.go b/vendor/github.com/xanzy/ssh-agent/sshagent_windows.go
deleted file mode 100644
index 175d1619d..000000000
--- a/vendor/github.com/xanzy/ssh-agent/sshagent_windows.go
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Copyright (c) 2014 David Mzareulyan
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-// and associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-// BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-//go:build windows
-// +build windows
-
-package sshagent
-
-import (
-	"errors"
-	"io"
-	"net"
-	"sync"
-
-	"github.com/Microsoft/go-winio"
-	"golang.org/x/crypto/ssh/agent"
-)
-
-const (
-	sshAgentPipe = `\\.\pipe\openssh-ssh-agent`
-)
-
-// Available returns true if Pageant is running
-func Available() bool {
-	if pageantWindow() != 0 {
-		return true
-	}
-	conn, err := winio.DialPipe(sshAgentPipe, nil)
-	if err != nil {
-		return false
-	}
-	conn.Close()
-	return true
-}
-
-// New returns a new agent.Agent and the (custom) connection it uses
-// to communicate with a running pagent.exe instance (see README.md)
-func New() (agent.Agent, net.Conn, error) {
-	if pageantWindow() != 0 {
-		return agent.NewClient(&conn{}), nil, nil
-	}
-	conn, err := winio.DialPipe(sshAgentPipe, nil)
-	if err != nil {
-		return nil, nil, errors.New(
-			"SSH agent requested, but could not detect Pageant or Windows native SSH agent",
-		)
-	}
-	return agent.NewClient(conn), nil, nil
-}
-
-type conn struct {
-	sync.Mutex
-	buf []byte
-}
-
-func (c *conn) Close() {
-	c.Lock()
-	defer c.Unlock()
-	c.buf = nil
-}
-
-func (c *conn) Write(p []byte) (int, error) {
-	c.Lock()
-	defer c.Unlock()
-
-	resp, err := query(p)
-	if err != nil {
-		return 0, err
-	}
-
-	c.buf = append(c.buf, resp...)
-
-	return len(p), nil
-}
-
-func (c *conn) Read(p []byte) (int, error) {
-	c.Lock()
-	defer c.Unlock()
-
-	if len(c.buf) == 0 {
-		return 0, io.EOF
-	}
-
-	n := copy(p, c.buf)
-	c.buf = c.buf[n:]
-
-	return n, nil
-}
diff --git a/vendor/github.com/xo/terminfo/caps.go b/vendor/github.com/xo/terminfo/caps.go
index 9674aaa7b..e5e1d41f1 100644
--- a/vendor/github.com/xo/terminfo/caps.go
+++ b/vendor/github.com/xo/terminfo/caps.go
@@ -1,7 +1,5 @@
 package terminfo
 
-//go:generate go run gen.go
-
 // BoolCapName returns the bool capability name.
 func BoolCapName(i int) string {
 	return boolCapNames[2*i]
diff --git a/vendor/github.com/xo/terminfo/capvals.go b/vendor/github.com/xo/terminfo/capvals.go
index 8528740ea..0c2274e3a 100644
--- a/vendor/github.com/xo/terminfo/capvals.go
+++ b/vendor/github.com/xo/terminfo/capvals.go
@@ -1,138 +1,94 @@
 package terminfo
 
 // Code generated by gen.go. DO NOT EDIT.
-
 // Bool capabilities.
 const (
 	// The AutoLeftMargin [auto_left_margin, bw] bool capability indicates cub1 wraps from column 0 to last column.
 	AutoLeftMargin = iota
-
 	// The AutoRightMargin [auto_right_margin, am] bool capability indicates terminal has automatic margins.
 	AutoRightMargin
-
 	// The NoEscCtlc [no_esc_ctlc, xsb] bool capability indicates beehive (f1=escape, f2=ctrl C).
 	NoEscCtlc
-
 	// The CeolStandoutGlitch [ceol_standout_glitch, xhp] bool capability indicates standout not erased by overwriting (hp).
 	CeolStandoutGlitch
-
 	// The EatNewlineGlitch [eat_newline_glitch, xenl] bool capability indicates newline ignored after 80 cols (concept).
 	EatNewlineGlitch
-
 	// The EraseOverstrike [erase_overstrike, eo] bool capability indicates can erase overstrikes with a blank.
 	EraseOverstrike
-
 	// The GenericType [generic_type, gn] bool capability indicates generic line type.
 	GenericType
-
 	// The HardCopy [hard_copy, hc] bool capability indicates hardcopy terminal.
 	HardCopy
-
 	// The HasMetaKey [has_meta_key, km] bool capability indicates Has a meta key (i.e., sets 8th-bit).
 	HasMetaKey
-
 	// The HasStatusLine [has_status_line, hs] bool capability indicates has extra status line.
 	HasStatusLine
-
 	// The InsertNullGlitch [insert_null_glitch, in] bool capability indicates insert mode distinguishes nulls.
 	InsertNullGlitch
-
 	// The MemoryAbove [memory_above, da] bool capability indicates display may be retained above the screen.
 	MemoryAbove
-
 	// The MemoryBelow [memory_below, db] bool capability indicates display may be retained below the screen.
 	MemoryBelow
-
 	// The MoveInsertMode [move_insert_mode, mir] bool capability indicates safe to move while in insert mode.
 	MoveInsertMode
-
 	// The MoveStandoutMode [move_standout_mode, msgr] bool capability indicates safe to move while in standout mode.
 	MoveStandoutMode
-
 	// The OverStrike [over_strike, os] bool capability indicates terminal can overstrike.
 	OverStrike
-
 	// The StatusLineEscOk [status_line_esc_ok, eslok] bool capability indicates escape can be used on the status line.
 	StatusLineEscOk
-
 	// The DestTabsMagicSmso [dest_tabs_magic_smso, xt] bool capability indicates tabs destructive, magic so char (t1061).
 	DestTabsMagicSmso
-
 	// The TildeGlitch [tilde_glitch, hz] bool capability indicates cannot print ~'s (Hazeltine).
 	TildeGlitch
-
 	// The TransparentUnderline [transparent_underline, ul] bool capability indicates underline character overstrikes.
 	TransparentUnderline
-
 	// The XonXoff [xon_xoff, xon] bool capability indicates terminal uses xon/xoff handshaking.
 	XonXoff
-
 	// The NeedsXonXoff [needs_xon_xoff, nxon] bool capability indicates padding will not work, xon/xoff required.
 	NeedsXonXoff
-
 	// The PrtrSilent [prtr_silent, mc5i] bool capability indicates printer will not echo on screen.
 	PrtrSilent
-
 	// The HardCursor [hard_cursor, chts] bool capability indicates cursor is hard to see.
 	HardCursor
-
 	// The NonRevRmcup [non_rev_rmcup, nrrmc] bool capability indicates smcup does not reverse rmcup.
 	NonRevRmcup
-
 	// The NoPadChar [no_pad_char, npc] bool capability indicates pad character does not exist.
 	NoPadChar
-
 	// The NonDestScrollRegion [non_dest_scroll_region, ndscr] bool capability indicates scrolling region is non-destructive.
 	NonDestScrollRegion
-
 	// The CanChange [can_change, ccc] bool capability indicates terminal can re-define existing colors.
 	CanChange
-
 	// The BackColorErase [back_color_erase, bce] bool capability indicates screen erased with background color.
 	BackColorErase
-
 	// The HueLightnessSaturation [hue_lightness_saturation, hls] bool capability indicates terminal uses only HLS color notation (Tektronix).
 	HueLightnessSaturation
-
 	// The ColAddrGlitch [col_addr_glitch, xhpa] bool capability indicates only positive motion for hpa/mhpa caps.
 	ColAddrGlitch
-
 	// The CrCancelsMicroMode [cr_cancels_micro_mode, crxm] bool capability indicates using cr turns off micro mode.
 	CrCancelsMicroMode
-
 	// The HasPrintWheel [has_print_wheel, daisy] bool capability indicates printer needs operator to change character set.
 	HasPrintWheel
-
 	// The RowAddrGlitch [row_addr_glitch, xvpa] bool capability indicates only positive motion for vpa/mvpa caps.
 	RowAddrGlitch
-
 	// The SemiAutoRightMargin [semi_auto_right_margin, sam] bool capability indicates printing in last column causes cr.
 	SemiAutoRightMargin
-
 	// The CpiChangesRes [cpi_changes_res, cpix] bool capability indicates changing character pitch changes resolution.
 	CpiChangesRes
-
 	// The LpiChangesRes [lpi_changes_res, lpix] bool capability indicates changing line pitch changes resolution.
 	LpiChangesRes
-
 	// The BackspacesWithBs [backspaces_with_bs, OTbs] bool capability indicates uses ^H to move left.
 	BackspacesWithBs
-
 	// The CrtNoScrolling [crt_no_scrolling, OTns] bool capability indicates crt cannot scroll.
 	CrtNoScrolling
-
 	// The NoCorrectlyWorkingCr [no_correctly_working_cr, OTnc] bool capability indicates no way to go to start of line.
 	NoCorrectlyWorkingCr
-
 	// The GnuHasMetaKey [gnu_has_meta_key, OTMT] bool capability indicates has meta key.
 	GnuHasMetaKey
-
 	// The LinefeedIsNewline [linefeed_is_newline, OTNL] bool capability indicates move down with \n.
 	LinefeedIsNewline
-
 	// The HasHardwareTabs [has_hardware_tabs, OTpt] bool capability indicates has 8-char tabs invoked with ^I.
 	HasHardwareTabs
-
 	// The ReturnDoesClrEol [return_does_clr_eol, OTxr] bool capability indicates return clears the line.
 	ReturnDoesClrEol
 )
@@ -141,118 +97,80 @@ const (
 const (
 	// The Columns [columns, cols] num capability is number of columns in a line.
 	Columns = iota
-
 	// The InitTabs [init_tabs, it] num capability is tabs initially every # spaces.
 	InitTabs
-
 	// The Lines [lines, lines] num capability is number of lines on screen or page.
 	Lines
-
 	// The LinesOfMemory [lines_of_memory, lm] num capability is lines of memory if > line. 0 means varies.
 	LinesOfMemory
-
 	// The MagicCookieGlitch [magic_cookie_glitch, xmc] num capability is number of blank characters left by smso or rmso.
 	MagicCookieGlitch
-
 	// The PaddingBaudRate [padding_baud_rate, pb] num capability is lowest baud rate where padding needed.
 	PaddingBaudRate
-
 	// The VirtualTerminal [virtual_terminal, vt] num capability is virtual terminal number (CB/unix).
 	VirtualTerminal
-
 	// The WidthStatusLine [width_status_line, wsl] num capability is number of columns in status line.
 	WidthStatusLine
-
 	// The NumLabels [num_labels, nlab] num capability is number of labels on screen.
 	NumLabels
-
 	// The LabelHeight [label_height, lh] num capability is rows in each label.
 	LabelHeight
-
 	// The LabelWidth [label_width, lw] num capability is columns in each label.
 	LabelWidth
-
 	// The MaxAttributes [max_attributes, ma] num capability is maximum combined attributes terminal can handle.
 	MaxAttributes
-
 	// The MaximumWindows [maximum_windows, wnum] num capability is maximum number of definable windows.
 	MaximumWindows
-
 	// The MaxColors [max_colors, colors] num capability is maximum number of colors on screen.
 	MaxColors
-
 	// The MaxPairs [max_pairs, pairs] num capability is maximum number of color-pairs on the screen.
 	MaxPairs
-
 	// The NoColorVideo [no_color_video, ncv] num capability is video attributes that cannot be used with colors.
 	NoColorVideo
-
 	// The BufferCapacity [buffer_capacity, bufsz] num capability is numbers of bytes buffered before printing.
 	BufferCapacity
-
 	// The DotVertSpacing [dot_vert_spacing, spinv] num capability is spacing of pins vertically in pins per inch.
 	DotVertSpacing
-
 	// The DotHorzSpacing [dot_horz_spacing, spinh] num capability is spacing of dots horizontally in dots per inch.
 	DotHorzSpacing
-
 	// The MaxMicroAddress [max_micro_address, maddr] num capability is maximum value in micro_..._address.
 	MaxMicroAddress
-
 	// The MaxMicroJump [max_micro_jump, mjump] num capability is maximum value in parm_..._micro.
 	MaxMicroJump
-
 	// The MicroColSize [micro_col_size, mcs] num capability is character step size when in micro mode.
 	MicroColSize
-
 	// The MicroLineSize [micro_line_size, mls] num capability is line step size when in micro mode.
 	MicroLineSize
-
 	// The NumberOfPins [number_of_pins, npins] num capability is numbers of pins in print-head.
 	NumberOfPins
-
 	// The OutputResChar [output_res_char, orc] num capability is horizontal resolution in units per line.
 	OutputResChar
-
 	// The OutputResLine [output_res_line, orl] num capability is vertical resolution in units per line.
 	OutputResLine
-
 	// The OutputResHorzInch [output_res_horz_inch, orhi] num capability is horizontal resolution in units per inch.
 	OutputResHorzInch
-
 	// The OutputResVertInch [output_res_vert_inch, orvi] num capability is vertical resolution in units per inch.
 	OutputResVertInch
-
 	// The PrintRate [print_rate, cps] num capability is print rate in characters per second.
 	PrintRate
-
 	// The WideCharSize [wide_char_size, widcs] num capability is character step size when in double wide mode.
 	WideCharSize
-
 	// The Buttons [buttons, btns] num capability is number of buttons on mouse.
 	Buttons
-
 	// The BitImageEntwining [bit_image_entwining, bitwin] num capability is number of passes for each bit-image row.
 	BitImageEntwining
-
 	// The BitImageType [bit_image_type, bitype] num capability is type of bit-image device.
 	BitImageType
-
 	// The MagicCookieGlitchUl [magic_cookie_glitch_ul, OTug] num capability is number of blanks left by ul.
 	MagicCookieGlitchUl
-
 	// The CarriageReturnDelay [carriage_return_delay, OTdC] num capability is pad needed for CR.
 	CarriageReturnDelay
-
 	// The NewLineDelay [new_line_delay, OTdN] num capability is pad needed for LF.
 	NewLineDelay
-
 	// The BackspaceDelay [backspace_delay, OTdB] num capability is padding required for ^H.
 	BackspaceDelay
-
 	// The HorizontalTabDelay [horizontal_tab_delay, OTdT] num capability is padding required for ^I.
 	HorizontalTabDelay
-
 	// The NumberOfFunctionKeys [number_of_function_keys, OTkn] num capability is count of function keys.
 	NumberOfFunctionKeys
 )
@@ -261,1254 +179,838 @@ const (
 const (
 	// The BackTab [back_tab, cbt] string capability is the back tab (P).
 	BackTab = iota
-
 	// The Bell [bell, bel] string capability is the audible signal (bell) (P).
 	Bell
-
 	// The CarriageReturn [carriage_return, cr] string capability is the carriage return (P*) (P*).
 	CarriageReturn
-
 	// The ChangeScrollRegion [change_scroll_region, csr] string capability is the change region to line #1 to line #2 (P).
 	ChangeScrollRegion
-
 	// The ClearAllTabs [clear_all_tabs, tbc] string capability is the clear all tab stops (P).
 	ClearAllTabs
-
 	// The ClearScreen [clear_screen, clear] string capability is the clear screen and home cursor (P*).
 	ClearScreen
-
 	// The ClrEol [clr_eol, el] string capability is the clear to end of line (P).
 	ClrEol
-
 	// The ClrEos [clr_eos, ed] string capability is the clear to end of screen (P*).
 	ClrEos
-
 	// The ColumnAddress [column_address, hpa] string capability is the horizontal position #1, absolute (P).
 	ColumnAddress
-
 	// The CommandCharacter [command_character, cmdch] string capability is the terminal settable cmd character in prototype !?.
 	CommandCharacter
-
 	// The CursorAddress [cursor_address, cup] string capability is the move to row #1 columns #2.
 	CursorAddress
-
 	// The CursorDown [cursor_down, cud1] string capability is the down one line.
 	CursorDown
-
 	// The CursorHome [cursor_home, home] string capability is the home cursor (if no cup).
 	CursorHome
-
 	// The CursorInvisible [cursor_invisible, civis] string capability is the make cursor invisible.
 	CursorInvisible
-
 	// The CursorLeft [cursor_left, cub1] string capability is the move left one space.
 	CursorLeft
-
 	// The CursorMemAddress [cursor_mem_address, mrcup] string capability is the memory relative cursor addressing, move to row #1 columns #2.
 	CursorMemAddress
-
 	// The CursorNormal [cursor_normal, cnorm] string capability is the make cursor appear normal (undo civis/cvvis).
 	CursorNormal
-
 	// The CursorRight [cursor_right, cuf1] string capability is the non-destructive space (move right one space).
 	CursorRight
-
 	// The CursorToLl [cursor_to_ll, ll] string capability is the last line, first column (if no cup).
 	CursorToLl
-
 	// The CursorUp [cursor_up, cuu1] string capability is the up one line.
 	CursorUp
-
 	// The CursorVisible [cursor_visible, cvvis] string capability is the make cursor very visible.
 	CursorVisible
-
 	// The DeleteCharacter [delete_character, dch1] string capability is the delete character (P*).
 	DeleteCharacter
-
 	// The DeleteLine [delete_line, dl1] string capability is the delete line (P*).
 	DeleteLine
-
 	// The DisStatusLine [dis_status_line, dsl] string capability is the disable status line.
 	DisStatusLine
-
 	// The DownHalfLine [down_half_line, hd] string capability is the half a line down.
 	DownHalfLine
-
 	// The EnterAltCharsetMode [enter_alt_charset_mode, smacs] string capability is the start alternate character set (P).
 	EnterAltCharsetMode
-
 	// The EnterBlinkMode [enter_blink_mode, blink] string capability is the turn on blinking.
 	EnterBlinkMode
-
 	// The EnterBoldMode [enter_bold_mode, bold] string capability is the turn on bold (extra bright) mode.
 	EnterBoldMode
-
 	// The EnterCaMode [enter_ca_mode, smcup] string capability is the string to start programs using cup.
 	EnterCaMode
-
 	// The EnterDeleteMode [enter_delete_mode, smdc] string capability is the enter delete mode.
 	EnterDeleteMode
-
 	// The EnterDimMode [enter_dim_mode, dim] string capability is the turn on half-bright mode.
 	EnterDimMode
-
 	// The EnterInsertMode [enter_insert_mode, smir] string capability is the enter insert mode.
 	EnterInsertMode
-
 	// The EnterSecureMode [enter_secure_mode, invis] string capability is the turn on blank mode (characters invisible).
 	EnterSecureMode
-
 	// The EnterProtectedMode [enter_protected_mode, prot] string capability is the turn on protected mode.
 	EnterProtectedMode
-
 	// The EnterReverseMode [enter_reverse_mode, rev] string capability is the turn on reverse video mode.
 	EnterReverseMode
-
 	// The EnterStandoutMode [enter_standout_mode, smso] string capability is the begin standout mode.
 	EnterStandoutMode
-
 	// The EnterUnderlineMode [enter_underline_mode, smul] string capability is the begin underline mode.
 	EnterUnderlineMode
-
 	// The EraseChars [erase_chars, ech] string capability is the erase #1 characters (P).
 	EraseChars
-
 	// The ExitAltCharsetMode [exit_alt_charset_mode, rmacs] string capability is the end alternate character set (P).
 	ExitAltCharsetMode
-
 	// The ExitAttributeMode [exit_attribute_mode, sgr0] string capability is the turn off all attributes.
 	ExitAttributeMode
-
 	// The ExitCaMode [exit_ca_mode, rmcup] string capability is the strings to end programs using cup.
 	ExitCaMode
-
 	// The ExitDeleteMode [exit_delete_mode, rmdc] string capability is the end delete mode.
 	ExitDeleteMode
-
 	// The ExitInsertMode [exit_insert_mode, rmir] string capability is the exit insert mode.
 	ExitInsertMode
-
 	// The ExitStandoutMode [exit_standout_mode, rmso] string capability is the exit standout mode.
 	ExitStandoutMode
-
 	// The ExitUnderlineMode [exit_underline_mode, rmul] string capability is the exit underline mode.
 	ExitUnderlineMode
-
 	// The FlashScreen [flash_screen, flash] string capability is the visible bell (may not move cursor).
 	FlashScreen
-
 	// The FormFeed [form_feed, ff] string capability is the hardcopy terminal page eject (P*).
 	FormFeed
-
 	// The FromStatusLine [from_status_line, fsl] string capability is the return from status line.
 	FromStatusLine
-
 	// The Init1string [init_1string, is1] string capability is the initialization string.
 	Init1string
-
 	// The Init2string [init_2string, is2] string capability is the initialization string.
 	Init2string
-
 	// The Init3string [init_3string, is3] string capability is the initialization string.
 	Init3string
-
 	// The InitFile [init_file, if] string capability is the name of initialization file.
 	InitFile
-
 	// The InsertCharacter [insert_character, ich1] string capability is the insert character (P).
 	InsertCharacter
-
 	// The InsertLine [insert_line, il1] string capability is the insert line (P*).
 	InsertLine
-
 	// The InsertPadding [insert_padding, ip] string capability is the insert padding after inserted character.
 	InsertPadding
-
 	// The KeyBackspace [key_backspace, kbs] string capability is the backspace key.
 	KeyBackspace
-
 	// The KeyCatab [key_catab, ktbc] string capability is the clear-all-tabs key.
 	KeyCatab
-
 	// The KeyClear [key_clear, kclr] string capability is the clear-screen or erase key.
 	KeyClear
-
 	// The KeyCtab [key_ctab, kctab] string capability is the clear-tab key.
 	KeyCtab
-
 	// The KeyDc [key_dc, kdch1] string capability is the delete-character key.
 	KeyDc
-
 	// The KeyDl [key_dl, kdl1] string capability is the delete-line key.
 	KeyDl
-
 	// The KeyDown [key_down, kcud1] string capability is the down-arrow key.
 	KeyDown
-
 	// The KeyEic [key_eic, krmir] string capability is the sent by rmir or smir in insert mode.
 	KeyEic
-
 	// The KeyEol [key_eol, kel] string capability is the clear-to-end-of-line key.
 	KeyEol
-
 	// The KeyEos [key_eos, ked] string capability is the clear-to-end-of-screen key.
 	KeyEos
-
 	// The KeyF0 [key_f0, kf0] string capability is the F0 function key.
 	KeyF0
-
 	// The KeyF1 [key_f1, kf1] string capability is the F1 function key.
 	KeyF1
-
 	// The KeyF10 [key_f10, kf10] string capability is the F10 function key.
 	KeyF10
-
 	// The KeyF2 [key_f2, kf2] string capability is the F2 function key.
 	KeyF2
-
 	// The KeyF3 [key_f3, kf3] string capability is the F3 function key.
 	KeyF3
-
 	// The KeyF4 [key_f4, kf4] string capability is the F4 function key.
 	KeyF4
-
 	// The KeyF5 [key_f5, kf5] string capability is the F5 function key.
 	KeyF5
-
 	// The KeyF6 [key_f6, kf6] string capability is the F6 function key.
 	KeyF6
-
 	// The KeyF7 [key_f7, kf7] string capability is the F7 function key.
 	KeyF7
-
 	// The KeyF8 [key_f8, kf8] string capability is the F8 function key.
 	KeyF8
-
 	// The KeyF9 [key_f9, kf9] string capability is the F9 function key.
 	KeyF9
-
 	// The KeyHome [key_home, khome] string capability is the home key.
 	KeyHome
-
 	// The KeyIc [key_ic, kich1] string capability is the insert-character key.
 	KeyIc
-
 	// The KeyIl [key_il, kil1] string capability is the insert-line key.
 	KeyIl
-
 	// The KeyLeft [key_left, kcub1] string capability is the left-arrow key.
 	KeyLeft
-
 	// The KeyLl [key_ll, kll] string capability is the lower-left key (home down).
 	KeyLl
-
 	// The KeyNpage [key_npage, knp] string capability is the next-page key.
 	KeyNpage
-
 	// The KeyPpage [key_ppage, kpp] string capability is the previous-page key.
 	KeyPpage
-
 	// The KeyRight [key_right, kcuf1] string capability is the right-arrow key.
 	KeyRight
-
 	// The KeySf [key_sf, kind] string capability is the scroll-forward key.
 	KeySf
-
 	// The KeySr [key_sr, kri] string capability is the scroll-backward key.
 	KeySr
-
 	// The KeyStab [key_stab, khts] string capability is the set-tab key.
 	KeyStab
-
 	// The KeyUp [key_up, kcuu1] string capability is the up-arrow key.
 	KeyUp
-
 	// The KeypadLocal [keypad_local, rmkx] string capability is the leave 'keyboard_transmit' mode.
 	KeypadLocal
-
 	// The KeypadXmit [keypad_xmit, smkx] string capability is the enter 'keyboard_transmit' mode.
 	KeypadXmit
-
 	// The LabF0 [lab_f0, lf0] string capability is the label on function key f0 if not f0.
 	LabF0
-
 	// The LabF1 [lab_f1, lf1] string capability is the label on function key f1 if not f1.
 	LabF1
-
 	// The LabF10 [lab_f10, lf10] string capability is the label on function key f10 if not f10.
 	LabF10
-
 	// The LabF2 [lab_f2, lf2] string capability is the label on function key f2 if not f2.
 	LabF2
-
 	// The LabF3 [lab_f3, lf3] string capability is the label on function key f3 if not f3.
 	LabF3
-
 	// The LabF4 [lab_f4, lf4] string capability is the label on function key f4 if not f4.
 	LabF4
-
 	// The LabF5 [lab_f5, lf5] string capability is the label on function key f5 if not f5.
 	LabF5
-
 	// The LabF6 [lab_f6, lf6] string capability is the label on function key f6 if not f6.
 	LabF6
-
 	// The LabF7 [lab_f7, lf7] string capability is the label on function key f7 if not f7.
 	LabF7
-
 	// The LabF8 [lab_f8, lf8] string capability is the label on function key f8 if not f8.
 	LabF8
-
 	// The LabF9 [lab_f9, lf9] string capability is the label on function key f9 if not f9.
 	LabF9
-
 	// The MetaOff [meta_off, rmm] string capability is the turn off meta mode.
 	MetaOff
-
 	// The MetaOn [meta_on, smm] string capability is the turn on meta mode (8th-bit on).
 	MetaOn
-
 	// The Newline [newline, nel] string capability is the newline (behave like cr followed by lf).
 	Newline
-
 	// The PadChar [pad_char, pad] string capability is the padding char (instead of null).
 	PadChar
-
 	// The ParmDch [parm_dch, dch] string capability is the delete #1 characters (P*).
 	ParmDch
-
 	// The ParmDeleteLine [parm_delete_line, dl] string capability is the delete #1 lines (P*).
 	ParmDeleteLine
-
 	// The ParmDownCursor [parm_down_cursor, cud] string capability is the down #1 lines (P*).
 	ParmDownCursor
-
 	// The ParmIch [parm_ich, ich] string capability is the insert #1 characters (P*).
 	ParmIch
-
 	// The ParmIndex [parm_index, indn] string capability is the scroll forward #1 lines (P).
 	ParmIndex
-
 	// The ParmInsertLine [parm_insert_line, il] string capability is the insert #1 lines (P*).
 	ParmInsertLine
-
 	// The ParmLeftCursor [parm_left_cursor, cub] string capability is the move #1 characters to the left (P).
 	ParmLeftCursor
-
 	// The ParmRightCursor [parm_right_cursor, cuf] string capability is the move #1 characters to the right (P*).
 	ParmRightCursor
-
 	// The ParmRindex [parm_rindex, rin] string capability is the scroll back #1 lines (P).
 	ParmRindex
-
 	// The ParmUpCursor [parm_up_cursor, cuu] string capability is the up #1 lines (P*).
 	ParmUpCursor
-
 	// The PkeyKey [pkey_key, pfkey] string capability is the program function key #1 to type string #2.
 	PkeyKey
-
 	// The PkeyLocal [pkey_local, pfloc] string capability is the program function key #1 to execute string #2.
 	PkeyLocal
-
 	// The PkeyXmit [pkey_xmit, pfx] string capability is the program function key #1 to transmit string #2.
 	PkeyXmit
-
 	// The PrintScreen [print_screen, mc0] string capability is the print contents of screen.
 	PrintScreen
-
 	// The PrtrOff [prtr_off, mc4] string capability is the turn off printer.
 	PrtrOff
-
 	// The PrtrOn [prtr_on, mc5] string capability is the turn on printer.
 	PrtrOn
-
 	// The RepeatChar [repeat_char, rep] string capability is the repeat char #1 #2 times (P*).
 	RepeatChar
-
 	// The Reset1string [reset_1string, rs1] string capability is the reset string.
 	Reset1string
-
 	// The Reset2string [reset_2string, rs2] string capability is the reset string.
 	Reset2string
-
 	// The Reset3string [reset_3string, rs3] string capability is the reset string.
 	Reset3string
-
 	// The ResetFile [reset_file, rf] string capability is the name of reset file.
 	ResetFile
-
 	// The RestoreCursor [restore_cursor, rc] string capability is the restore cursor to position of last save_cursor.
 	RestoreCursor
-
 	// The RowAddress [row_address, vpa] string capability is the vertical position #1 absolute (P).
 	RowAddress
-
 	// The SaveCursor [save_cursor, sc] string capability is the save current cursor position (P).
 	SaveCursor
-
 	// The ScrollForward [scroll_forward, ind] string capability is the scroll text up (P).
 	ScrollForward
-
 	// The ScrollReverse [scroll_reverse, ri] string capability is the scroll text down (P).
 	ScrollReverse
-
 	// The SetAttributes [set_attributes, sgr] string capability is the define video attributes #1-#9 (PG9).
 	SetAttributes
-
 	// The SetTab [set_tab, hts] string capability is the set a tab in every row, current columns.
 	SetTab
-
 	// The SetWindow [set_window, wind] string capability is the current window is lines #1-#2 cols #3-#4.
 	SetWindow
-
 	// The Tab [tab, ht] string capability is the tab to next 8-space hardware tab stop.
 	Tab
-
 	// The ToStatusLine [to_status_line, tsl] string capability is the move to status line, column #1.
 	ToStatusLine
-
 	// The UnderlineChar [underline_char, uc] string capability is the underline char and move past it.
 	UnderlineChar
-
 	// The UpHalfLine [up_half_line, hu] string capability is the half a line up.
 	UpHalfLine
-
 	// The InitProg [init_prog, iprog] string capability is the path name of program for initialization.
 	InitProg
-
 	// The KeyA1 [key_a1, ka1] string capability is the upper left of keypad.
 	KeyA1
-
 	// The KeyA3 [key_a3, ka3] string capability is the upper right of keypad.
 	KeyA3
-
 	// The KeyB2 [key_b2, kb2] string capability is the center of keypad.
 	KeyB2
-
 	// The KeyC1 [key_c1, kc1] string capability is the lower left of keypad.
 	KeyC1
-
 	// The KeyC3 [key_c3, kc3] string capability is the lower right of keypad.
 	KeyC3
-
 	// The PrtrNon [prtr_non, mc5p] string capability is the turn on printer for #1 bytes.
 	PrtrNon
-
 	// The CharPadding [char_padding, rmp] string capability is the like ip but when in insert mode.
 	CharPadding
-
 	// The AcsChars [acs_chars, acsc] string capability is the graphics charset pairs, based on vt100.
 	AcsChars
-
 	// The PlabNorm [plab_norm, pln] string capability is the program label #1 to show string #2.
 	PlabNorm
-
 	// The KeyBtab [key_btab, kcbt] string capability is the back-tab key.
 	KeyBtab
-
 	// The EnterXonMode [enter_xon_mode, smxon] string capability is the turn on xon/xoff handshaking.
 	EnterXonMode
-
 	// The ExitXonMode [exit_xon_mode, rmxon] string capability is the turn off xon/xoff handshaking.
 	ExitXonMode
-
 	// The EnterAmMode [enter_am_mode, smam] string capability is the turn on automatic margins.
 	EnterAmMode
-
 	// The ExitAmMode [exit_am_mode, rmam] string capability is the turn off automatic margins.
 	ExitAmMode
-
 	// The XonCharacter [xon_character, xonc] string capability is the XON character.
 	XonCharacter
-
 	// The XoffCharacter [xoff_character, xoffc] string capability is the XOFF character.
 	XoffCharacter
-
 	// The EnaAcs [ena_acs, enacs] string capability is the enable alternate char set.
 	EnaAcs
-
 	// The LabelOn [label_on, smln] string capability is the turn on soft labels.
 	LabelOn
-
 	// The LabelOff [label_off, rmln] string capability is the turn off soft labels.
 	LabelOff
-
 	// The KeyBeg [key_beg, kbeg] string capability is the begin key.
 	KeyBeg
-
 	// The KeyCancel [key_cancel, kcan] string capability is the cancel key.
 	KeyCancel
-
 	// The KeyClose [key_close, kclo] string capability is the close key.
 	KeyClose
-
 	// The KeyCommand [key_command, kcmd] string capability is the command key.
 	KeyCommand
-
 	// The KeyCopy [key_copy, kcpy] string capability is the copy key.
 	KeyCopy
-
 	// The KeyCreate [key_create, kcrt] string capability is the create key.
 	KeyCreate
-
 	// The KeyEnd [key_end, kend] string capability is the end key.
 	KeyEnd
-
 	// The KeyEnter [key_enter, kent] string capability is the enter/send key.
 	KeyEnter
-
 	// The KeyExit [key_exit, kext] string capability is the exit key.
 	KeyExit
-
 	// The KeyFind [key_find, kfnd] string capability is the find key.
 	KeyFind
-
 	// The KeyHelp [key_help, khlp] string capability is the help key.
 	KeyHelp
-
 	// The KeyMark [key_mark, kmrk] string capability is the mark key.
 	KeyMark
-
 	// The KeyMessage [key_message, kmsg] string capability is the message key.
 	KeyMessage
-
 	// The KeyMove [key_move, kmov] string capability is the move key.
 	KeyMove
-
 	// The KeyNext [key_next, knxt] string capability is the next key.
 	KeyNext
-
 	// The KeyOpen [key_open, kopn] string capability is the open key.
 	KeyOpen
-
 	// The KeyOptions [key_options, kopt] string capability is the options key.
 	KeyOptions
-
 	// The KeyPrevious [key_previous, kprv] string capability is the previous key.
 	KeyPrevious
-
 	// The KeyPrint [key_print, kprt] string capability is the print key.
 	KeyPrint
-
 	// The KeyRedo [key_redo, krdo] string capability is the redo key.
 	KeyRedo
-
 	// The KeyReference [key_reference, kref] string capability is the reference key.
 	KeyReference
-
 	// The KeyRefresh [key_refresh, krfr] string capability is the refresh key.
 	KeyRefresh
-
 	// The KeyReplace [key_replace, krpl] string capability is the replace key.
 	KeyReplace
-
 	// The KeyRestart [key_restart, krst] string capability is the restart key.
 	KeyRestart
-
 	// The KeyResume [key_resume, kres] string capability is the resume key.
 	KeyResume
-
 	// The KeySave [key_save, ksav] string capability is the save key.
 	KeySave
-
 	// The KeySuspend [key_suspend, kspd] string capability is the suspend key.
 	KeySuspend
-
 	// The KeyUndo [key_undo, kund] string capability is the undo key.
 	KeyUndo
-
 	// The KeySbeg [key_sbeg, kBEG] string capability is the shifted begin key.
 	KeySbeg
-
 	// The KeyScancel [key_scancel, kCAN] string capability is the shifted cancel key.
 	KeyScancel
-
 	// The KeyScommand [key_scommand, kCMD] string capability is the shifted command key.
 	KeyScommand
-
 	// The KeyScopy [key_scopy, kCPY] string capability is the shifted copy key.
 	KeyScopy
-
 	// The KeyScreate [key_screate, kCRT] string capability is the shifted create key.
 	KeyScreate
-
 	// The KeySdc [key_sdc, kDC] string capability is the shifted delete-character key.
 	KeySdc
-
 	// The KeySdl [key_sdl, kDL] string capability is the shifted delete-line key.
 	KeySdl
-
 	// The KeySelect [key_select, kslt] string capability is the select key.
 	KeySelect
-
 	// The KeySend [key_send, kEND] string capability is the shifted end key.
 	KeySend
-
 	// The KeySeol [key_seol, kEOL] string capability is the shifted clear-to-end-of-line key.
 	KeySeol
-
 	// The KeySexit [key_sexit, kEXT] string capability is the shifted exit key.
 	KeySexit
-
 	// The KeySfind [key_sfind, kFND] string capability is the shifted find key.
 	KeySfind
-
 	// The KeyShelp [key_shelp, kHLP] string capability is the shifted help key.
 	KeyShelp
-
 	// The KeyShome [key_shome, kHOM] string capability is the shifted home key.
 	KeyShome
-
 	// The KeySic [key_sic, kIC] string capability is the shifted insert-character key.
 	KeySic
-
 	// The KeySleft [key_sleft, kLFT] string capability is the shifted left-arrow key.
 	KeySleft
-
 	// The KeySmessage [key_smessage, kMSG] string capability is the shifted message key.
 	KeySmessage
-
 	// The KeySmove [key_smove, kMOV] string capability is the shifted move key.
 	KeySmove
-
 	// The KeySnext [key_snext, kNXT] string capability is the shifted next key.
 	KeySnext
-
 	// The KeySoptions [key_soptions, kOPT] string capability is the shifted options key.
 	KeySoptions
-
 	// The KeySprevious [key_sprevious, kPRV] string capability is the shifted previous key.
 	KeySprevious
-
 	// The KeySprint [key_sprint, kPRT] string capability is the shifted print key.
 	KeySprint
-
 	// The KeySredo [key_sredo, kRDO] string capability is the shifted redo key.
 	KeySredo
-
 	// The KeySreplace [key_sreplace, kRPL] string capability is the shifted replace key.
 	KeySreplace
-
 	// The KeySright [key_sright, kRIT] string capability is the shifted right-arrow key.
 	KeySright
-
 	// The KeySrsume [key_srsume, kRES] string capability is the shifted resume key.
 	KeySrsume
-
 	// The KeySsave [key_ssave, kSAV] string capability is the shifted save key.
 	KeySsave
-
 	// The KeySsuspend [key_ssuspend, kSPD] string capability is the shifted suspend key.
 	KeySsuspend
-
 	// The KeySundo [key_sundo, kUND] string capability is the shifted undo key.
 	KeySundo
-
 	// The ReqForInput [req_for_input, rfi] string capability is the send next input char (for ptys).
 	ReqForInput
-
 	// The KeyF11 [key_f11, kf11] string capability is the F11 function key.
 	KeyF11
-
 	// The KeyF12 [key_f12, kf12] string capability is the F12 function key.
 	KeyF12
-
 	// The KeyF13 [key_f13, kf13] string capability is the F13 function key.
 	KeyF13
-
 	// The KeyF14 [key_f14, kf14] string capability is the F14 function key.
 	KeyF14
-
 	// The KeyF15 [key_f15, kf15] string capability is the F15 function key.
 	KeyF15
-
 	// The KeyF16 [key_f16, kf16] string capability is the F16 function key.
 	KeyF16
-
 	// The KeyF17 [key_f17, kf17] string capability is the F17 function key.
 	KeyF17
-
 	// The KeyF18 [key_f18, kf18] string capability is the F18 function key.
 	KeyF18
-
 	// The KeyF19 [key_f19, kf19] string capability is the F19 function key.
 	KeyF19
-
 	// The KeyF20 [key_f20, kf20] string capability is the F20 function key.
 	KeyF20
-
 	// The KeyF21 [key_f21, kf21] string capability is the F21 function key.
 	KeyF21
-
 	// The KeyF22 [key_f22, kf22] string capability is the F22 function key.
 	KeyF22
-
 	// The KeyF23 [key_f23, kf23] string capability is the F23 function key.
 	KeyF23
-
 	// The KeyF24 [key_f24, kf24] string capability is the F24 function key.
 	KeyF24
-
 	// The KeyF25 [key_f25, kf25] string capability is the F25 function key.
 	KeyF25
-
 	// The KeyF26 [key_f26, kf26] string capability is the F26 function key.
 	KeyF26
-
 	// The KeyF27 [key_f27, kf27] string capability is the F27 function key.
 	KeyF27
-
 	// The KeyF28 [key_f28, kf28] string capability is the F28 function key.
 	KeyF28
-
 	// The KeyF29 [key_f29, kf29] string capability is the F29 function key.
 	KeyF29
-
 	// The KeyF30 [key_f30, kf30] string capability is the F30 function key.
 	KeyF30
-
 	// The KeyF31 [key_f31, kf31] string capability is the F31 function key.
 	KeyF31
-
 	// The KeyF32 [key_f32, kf32] string capability is the F32 function key.
 	KeyF32
-
 	// The KeyF33 [key_f33, kf33] string capability is the F33 function key.
 	KeyF33
-
 	// The KeyF34 [key_f34, kf34] string capability is the F34 function key.
 	KeyF34
-
 	// The KeyF35 [key_f35, kf35] string capability is the F35 function key.
 	KeyF35
-
 	// The KeyF36 [key_f36, kf36] string capability is the F36 function key.
 	KeyF36
-
 	// The KeyF37 [key_f37, kf37] string capability is the F37 function key.
 	KeyF37
-
 	// The KeyF38 [key_f38, kf38] string capability is the F38 function key.
 	KeyF38
-
 	// The KeyF39 [key_f39, kf39] string capability is the F39 function key.
 	KeyF39
-
 	// The KeyF40 [key_f40, kf40] string capability is the F40 function key.
 	KeyF40
-
 	// The KeyF41 [key_f41, kf41] string capability is the F41 function key.
 	KeyF41
-
 	// The KeyF42 [key_f42, kf42] string capability is the F42 function key.
 	KeyF42
-
 	// The KeyF43 [key_f43, kf43] string capability is the F43 function key.
 	KeyF43
-
 	// The KeyF44 [key_f44, kf44] string capability is the F44 function key.
 	KeyF44
-
 	// The KeyF45 [key_f45, kf45] string capability is the F45 function key.
 	KeyF45
-
 	// The KeyF46 [key_f46, kf46] string capability is the F46 function key.
 	KeyF46
-
 	// The KeyF47 [key_f47, kf47] string capability is the F47 function key.
 	KeyF47
-
 	// The KeyF48 [key_f48, kf48] string capability is the F48 function key.
 	KeyF48
-
 	// The KeyF49 [key_f49, kf49] string capability is the F49 function key.
 	KeyF49
-
 	// The KeyF50 [key_f50, kf50] string capability is the F50 function key.
 	KeyF50
-
 	// The KeyF51 [key_f51, kf51] string capability is the F51 function key.
 	KeyF51
-
 	// The KeyF52 [key_f52, kf52] string capability is the F52 function key.
 	KeyF52
-
 	// The KeyF53 [key_f53, kf53] string capability is the F53 function key.
 	KeyF53
-
 	// The KeyF54 [key_f54, kf54] string capability is the F54 function key.
 	KeyF54
-
 	// The KeyF55 [key_f55, kf55] string capability is the F55 function key.
 	KeyF55
-
 	// The KeyF56 [key_f56, kf56] string capability is the F56 function key.
 	KeyF56
-
 	// The KeyF57 [key_f57, kf57] string capability is the F57 function key.
 	KeyF57
-
 	// The KeyF58 [key_f58, kf58] string capability is the F58 function key.
 	KeyF58
-
 	// The KeyF59 [key_f59, kf59] string capability is the F59 function key.
 	KeyF59
-
 	// The KeyF60 [key_f60, kf60] string capability is the F60 function key.
 	KeyF60
-
 	// The KeyF61 [key_f61, kf61] string capability is the F61 function key.
 	KeyF61
-
 	// The KeyF62 [key_f62, kf62] string capability is the F62 function key.
 	KeyF62
-
 	// The KeyF63 [key_f63, kf63] string capability is the F63 function key.
 	KeyF63
-
 	// The ClrBol [clr_bol, el1] string capability is the Clear to beginning of line.
 	ClrBol
-
 	// The ClearMargins [clear_margins, mgc] string capability is the clear right and left soft margins.
 	ClearMargins
-
-	// The SetLeftMargin [set_left_margin, smgl] string capability is the set left soft margin at current column.	 See smgl. (ML is not in BSD termcap).
+	// The SetLeftMargin [set_left_margin, smgl] string capability is the set left soft margin at current column.	 (ML is not in BSD termcap).
 	SetLeftMargin
-
 	// The SetRightMargin [set_right_margin, smgr] string capability is the set right soft margin at current column.
 	SetRightMargin
-
 	// The LabelFormat [label_format, fln] string capability is the label format.
 	LabelFormat
-
 	// The SetClock [set_clock, sclk] string capability is the set clock, #1 hrs #2 mins #3 secs.
 	SetClock
-
 	// The DisplayClock [display_clock, dclk] string capability is the display clock.
 	DisplayClock
-
 	// The RemoveClock [remove_clock, rmclk] string capability is the remove clock.
 	RemoveClock
-
 	// The CreateWindow [create_window, cwin] string capability is the define a window #1 from #2,#3 to #4,#5.
 	CreateWindow
-
 	// The GotoWindow [goto_window, wingo] string capability is the go to window #1.
 	GotoWindow
-
 	// The Hangup [hangup, hup] string capability is the hang-up phone.
 	Hangup
-
 	// The DialPhone [dial_phone, dial] string capability is the dial number #1.
 	DialPhone
-
 	// The QuickDial [quick_dial, qdial] string capability is the dial number #1 without checking.
 	QuickDial
-
 	// The Tone [tone, tone] string capability is the select touch tone dialing.
 	Tone
-
 	// The Pulse [pulse, pulse] string capability is the select pulse dialing.
 	Pulse
-
 	// The FlashHook [flash_hook, hook] string capability is the flash switch hook.
 	FlashHook
-
 	// The FixedPause [fixed_pause, pause] string capability is the pause for 2-3 seconds.
 	FixedPause
-
 	// The WaitTone [wait_tone, wait] string capability is the wait for dial-tone.
 	WaitTone
-
 	// The User0 [user0, u0] string capability is the User string #0.
 	User0
-
 	// The User1 [user1, u1] string capability is the User string #1.
 	User1
-
 	// The User2 [user2, u2] string capability is the User string #2.
 	User2
-
 	// The User3 [user3, u3] string capability is the User string #3.
 	User3
-
 	// The User4 [user4, u4] string capability is the User string #4.
 	User4
-
 	// The User5 [user5, u5] string capability is the User string #5.
 	User5
-
 	// The User6 [user6, u6] string capability is the User string #6.
 	User6
-
 	// The User7 [user7, u7] string capability is the User string #7.
 	User7
-
 	// The User8 [user8, u8] string capability is the User string #8.
 	User8
-
 	// The User9 [user9, u9] string capability is the User string #9.
 	User9
-
 	// The OrigPair [orig_pair, op] string capability is the Set default pair to its original value.
 	OrigPair
-
 	// The OrigColors [orig_colors, oc] string capability is the Set all color pairs to the original ones.
 	OrigColors
-
 	// The InitializeColor [initialize_color, initc] string capability is the initialize color #1 to (#2,#3,#4).
 	InitializeColor
-
 	// The InitializePair [initialize_pair, initp] string capability is the Initialize color pair #1 to fg=(#2,#3,#4), bg=(#5,#6,#7).
 	InitializePair
-
 	// The SetColorPair [set_color_pair, scp] string capability is the Set current color pair to #1.
 	SetColorPair
-
 	// The SetForeground [set_foreground, setf] string capability is the Set foreground color #1.
 	SetForeground
-
 	// The SetBackground [set_background, setb] string capability is the Set background color #1.
 	SetBackground
-
 	// The ChangeCharPitch [change_char_pitch, cpi] string capability is the Change number of characters per inch to #1.
 	ChangeCharPitch
-
 	// The ChangeLinePitch [change_line_pitch, lpi] string capability is the Change number of lines per inch to #1.
 	ChangeLinePitch
-
 	// The ChangeResHorz [change_res_horz, chr] string capability is the Change horizontal resolution to #1.
 	ChangeResHorz
-
 	// The ChangeResVert [change_res_vert, cvr] string capability is the Change vertical resolution to #1.
 	ChangeResVert
-
 	// The DefineChar [define_char, defc] string capability is the Define a character #1, #2 dots wide, descender #3.
 	DefineChar
-
 	// The EnterDoublewideMode [enter_doublewide_mode, swidm] string capability is the Enter double-wide mode.
 	EnterDoublewideMode
-
 	// The EnterDraftQuality [enter_draft_quality, sdrfq] string capability is the Enter draft-quality mode.
 	EnterDraftQuality
-
 	// The EnterItalicsMode [enter_italics_mode, sitm] string capability is the Enter italic mode.
 	EnterItalicsMode
-
 	// The EnterLeftwardMode [enter_leftward_mode, slm] string capability is the Start leftward carriage motion.
 	EnterLeftwardMode
-
 	// The EnterMicroMode [enter_micro_mode, smicm] string capability is the Start micro-motion mode.
 	EnterMicroMode
-
 	// The EnterNearLetterQuality [enter_near_letter_quality, snlq] string capability is the Enter NLQ mode.
 	EnterNearLetterQuality
-
 	// The EnterNormalQuality [enter_normal_quality, snrmq] string capability is the Enter normal-quality mode.
 	EnterNormalQuality
-
 	// The EnterShadowMode [enter_shadow_mode, sshm] string capability is the Enter shadow-print mode.
 	EnterShadowMode
-
 	// The EnterSubscriptMode [enter_subscript_mode, ssubm] string capability is the Enter subscript mode.
 	EnterSubscriptMode
-
 	// The EnterSuperscriptMode [enter_superscript_mode, ssupm] string capability is the Enter superscript mode.
 	EnterSuperscriptMode
-
 	// The EnterUpwardMode [enter_upward_mode, sum] string capability is the Start upward carriage motion.
 	EnterUpwardMode
-
 	// The ExitDoublewideMode [exit_doublewide_mode, rwidm] string capability is the End double-wide mode.
 	ExitDoublewideMode
-
 	// The ExitItalicsMode [exit_italics_mode, ritm] string capability is the End italic mode.
 	ExitItalicsMode
-
 	// The ExitLeftwardMode [exit_leftward_mode, rlm] string capability is the End left-motion mode.
 	ExitLeftwardMode
-
 	// The ExitMicroMode [exit_micro_mode, rmicm] string capability is the End micro-motion mode.
 	ExitMicroMode
-
 	// The ExitShadowMode [exit_shadow_mode, rshm] string capability is the End shadow-print mode.
 	ExitShadowMode
-
 	// The ExitSubscriptMode [exit_subscript_mode, rsubm] string capability is the End subscript mode.
 	ExitSubscriptMode
-
 	// The ExitSuperscriptMode [exit_superscript_mode, rsupm] string capability is the End superscript mode.
 	ExitSuperscriptMode
-
 	// The ExitUpwardMode [exit_upward_mode, rum] string capability is the End reverse character motion.
 	ExitUpwardMode
-
 	// The MicroColumnAddress [micro_column_address, mhpa] string capability is the Like column_address in micro mode.
 	MicroColumnAddress
-
 	// The MicroDown [micro_down, mcud1] string capability is the Like cursor_down in micro mode.
 	MicroDown
-
 	// The MicroLeft [micro_left, mcub1] string capability is the Like cursor_left in micro mode.
 	MicroLeft
-
 	// The MicroRight [micro_right, mcuf1] string capability is the Like cursor_right in micro mode.
 	MicroRight
-
 	// The MicroRowAddress [micro_row_address, mvpa] string capability is the Like row_address #1 in micro mode.
 	MicroRowAddress
-
 	// The MicroUp [micro_up, mcuu1] string capability is the Like cursor_up in micro mode.
 	MicroUp
-
 	// The OrderOfPins [order_of_pins, porder] string capability is the Match software bits to print-head pins.
 	OrderOfPins
-
 	// The ParmDownMicro [parm_down_micro, mcud] string capability is the Like parm_down_cursor in micro mode.
 	ParmDownMicro
-
 	// The ParmLeftMicro [parm_left_micro, mcub] string capability is the Like parm_left_cursor in micro mode.
 	ParmLeftMicro
-
 	// The ParmRightMicro [parm_right_micro, mcuf] string capability is the Like parm_right_cursor in micro mode.
 	ParmRightMicro
-
 	// The ParmUpMicro [parm_up_micro, mcuu] string capability is the Like parm_up_cursor in micro mode.
 	ParmUpMicro
-
 	// The SelectCharSet [select_char_set, scs] string capability is the Select character set, #1.
 	SelectCharSet
-
 	// The SetBottomMargin [set_bottom_margin, smgb] string capability is the Set bottom margin at current line.
 	SetBottomMargin
-
 	// The SetBottomMarginParm [set_bottom_margin_parm, smgbp] string capability is the Set bottom margin at line #1 or (if smgtp is not given) #2 lines from bottom.
 	SetBottomMarginParm
-
 	// The SetLeftMarginParm [set_left_margin_parm, smglp] string capability is the Set left (right) margin at column #1.
 	SetLeftMarginParm
-
 	// The SetRightMarginParm [set_right_margin_parm, smgrp] string capability is the Set right margin at column #1.
 	SetRightMarginParm
-
 	// The SetTopMargin [set_top_margin, smgt] string capability is the Set top margin at current line.
 	SetTopMargin
-
 	// The SetTopMarginParm [set_top_margin_parm, smgtp] string capability is the Set top (bottom) margin at row #1.
 	SetTopMarginParm
-
 	// The StartBitImage [start_bit_image, sbim] string capability is the Start printing bit image graphics.
 	StartBitImage
-
 	// The StartCharSetDef [start_char_set_def, scsd] string capability is the Start character set definition #1, with #2 characters in the set.
 	StartCharSetDef
-
 	// The StopBitImage [stop_bit_image, rbim] string capability is the Stop printing bit image graphics.
 	StopBitImage
-
 	// The StopCharSetDef [stop_char_set_def, rcsd] string capability is the End definition of character set #1.
 	StopCharSetDef
-
 	// The SubscriptCharacters [subscript_characters, subcs] string capability is the List of subscriptable characters.
 	SubscriptCharacters
-
 	// The SuperscriptCharacters [superscript_characters, supcs] string capability is the List of superscriptable characters.
 	SuperscriptCharacters
-
 	// The TheseCauseCr [these_cause_cr, docr] string capability is the Printing any of these characters causes CR.
 	TheseCauseCr
-
 	// The ZeroMotion [zero_motion, zerom] string capability is the No motion for subsequent character.
 	ZeroMotion
-
 	// The CharSetNames [char_set_names, csnm] string capability is the Produce #1'th item from list of character set names.
 	CharSetNames
-
 	// The KeyMouse [key_mouse, kmous] string capability is the Mouse event has occurred.
 	KeyMouse
-
 	// The MouseInfo [mouse_info, minfo] string capability is the Mouse status information.
 	MouseInfo
-
 	// The ReqMousePos [req_mouse_pos, reqmp] string capability is the Request mouse position.
 	ReqMousePos
-
 	// The GetMouse [get_mouse, getm] string capability is the Curses should get button events, parameter #1 not documented.
 	GetMouse
-
 	// The SetAForeground [set_a_foreground, setaf] string capability is the Set foreground color to #1, using ANSI escape.
 	SetAForeground
-
 	// The SetABackground [set_a_background, setab] string capability is the Set background color to #1, using ANSI escape.
 	SetABackground
-
 	// The PkeyPlab [pkey_plab, pfxl] string capability is the Program function key #1 to type string #2 and show string #3.
 	PkeyPlab
-
 	// The DeviceType [device_type, devt] string capability is the Indicate language/codeset support.
 	DeviceType
-
 	// The CodeSetInit [code_set_init, csin] string capability is the Init sequence for multiple codesets.
 	CodeSetInit
-
 	// The Set0DesSeq [set0_des_seq, s0ds] string capability is the Shift to codeset 0 (EUC set 0, ASCII).
 	Set0DesSeq
-
 	// The Set1DesSeq [set1_des_seq, s1ds] string capability is the Shift to codeset 1.
 	Set1DesSeq
-
 	// The Set2DesSeq [set2_des_seq, s2ds] string capability is the Shift to codeset 2.
 	Set2DesSeq
-
 	// The Set3DesSeq [set3_des_seq, s3ds] string capability is the Shift to codeset 3.
 	Set3DesSeq
-
 	// The SetLrMargin [set_lr_margin, smglr] string capability is the Set both left and right margins to #1, #2.  (ML is not in BSD termcap).
 	SetLrMargin
-
 	// The SetTbMargin [set_tb_margin, smgtb] string capability is the Sets both top and bottom margins to #1, #2.
 	SetTbMargin
-
 	// The BitImageRepeat [bit_image_repeat, birep] string capability is the Repeat bit image cell #1 #2 times.
 	BitImageRepeat
-
 	// The BitImageNewline [bit_image_newline, binel] string capability is the Move to next row of the bit image.
 	BitImageNewline
-
 	// The BitImageCarriageReturn [bit_image_carriage_return, bicr] string capability is the Move to beginning of same row.
 	BitImageCarriageReturn
-
 	// The ColorNames [color_names, colornm] string capability is the Give name for color #1.
 	ColorNames
-
 	// The DefineBitImageRegion [define_bit_image_region, defbi] string capability is the Define rectangular bit image region.
 	DefineBitImageRegion
-
 	// The EndBitImageRegion [end_bit_image_region, endbi] string capability is the End a bit-image region.
 	EndBitImageRegion
-
 	// The SetColorBand [set_color_band, setcolor] string capability is the Change to ribbon color #1.
 	SetColorBand
-
 	// The SetPageLength [set_page_length, slines] string capability is the Set page length to #1 lines.
 	SetPageLength
-
 	// The DisplayPcChar [display_pc_char, dispc] string capability is the Display PC character #1.
 	DisplayPcChar
-
 	// The EnterPcCharsetMode [enter_pc_charset_mode, smpch] string capability is the Enter PC character display mode.
 	EnterPcCharsetMode
-
 	// The ExitPcCharsetMode [exit_pc_charset_mode, rmpch] string capability is the Exit PC character display mode.
 	ExitPcCharsetMode
-
 	// The EnterScancodeMode [enter_scancode_mode, smsc] string capability is the Enter PC scancode mode.
 	EnterScancodeMode
-
 	// The ExitScancodeMode [exit_scancode_mode, rmsc] string capability is the Exit PC scancode mode.
 	ExitScancodeMode
-
 	// The PcTermOptions [pc_term_options, pctrm] string capability is the PC terminal options.
 	PcTermOptions
-
 	// The ScancodeEscape [scancode_escape, scesc] string capability is the Escape for scancode emulation.
 	ScancodeEscape
-
 	// The AltScancodeEsc [alt_scancode_esc, scesa] string capability is the Alternate escape for scancode emulation.
 	AltScancodeEsc
-
 	// The EnterHorizontalHlMode [enter_horizontal_hl_mode, ehhlm] string capability is the Enter horizontal highlight mode.
 	EnterHorizontalHlMode
-
 	// The EnterLeftHlMode [enter_left_hl_mode, elhlm] string capability is the Enter left highlight mode.
 	EnterLeftHlMode
-
 	// The EnterLowHlMode [enter_low_hl_mode, elohlm] string capability is the Enter low highlight mode.
 	EnterLowHlMode
-
 	// The EnterRightHlMode [enter_right_hl_mode, erhlm] string capability is the Enter right highlight mode.
 	EnterRightHlMode
-
 	// The EnterTopHlMode [enter_top_hl_mode, ethlm] string capability is the Enter top highlight mode.
 	EnterTopHlMode
-
 	// The EnterVerticalHlMode [enter_vertical_hl_mode, evhlm] string capability is the Enter vertical highlight mode.
 	EnterVerticalHlMode
-
 	// The SetAAttributes [set_a_attributes, sgr1] string capability is the Define second set of video attributes #1-#6.
 	SetAAttributes
-
 	// The SetPglenInch [set_pglen_inch, slength] string capability is the Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
 	SetPglenInch
-
 	// The TermcapInit2 [termcap_init2, OTi2] string capability is the secondary initialization string.
 	TermcapInit2
-
 	// The TermcapReset [termcap_reset, OTrs] string capability is the terminal reset string.
 	TermcapReset
-
 	// The LinefeedIfNotLf [linefeed_if_not_lf, OTnl] string capability is the use to move down.
 	LinefeedIfNotLf
-
 	// The BackspaceIfNotBs [backspace_if_not_bs, OTbc] string capability is the move left, if not ^H.
 	BackspaceIfNotBs
-
 	// The OtherNonFunctionKeys [other_non_function_keys, OTko] string capability is the list of self-mapped keycaps.
 	OtherNonFunctionKeys
-
 	// The ArrowKeyMap [arrow_key_map, OTma] string capability is the map motion-keys for vi version 2.
 	ArrowKeyMap
-
 	// The AcsUlcorner [acs_ulcorner, OTG2] string capability is the single upper left.
 	AcsUlcorner
-
 	// The AcsLlcorner [acs_llcorner, OTG3] string capability is the single lower left.
 	AcsLlcorner
-
 	// The AcsUrcorner [acs_urcorner, OTG1] string capability is the single upper right.
 	AcsUrcorner
-
 	// The AcsLrcorner [acs_lrcorner, OTG4] string capability is the single lower right.
 	AcsLrcorner
-
 	// The AcsLtee [acs_ltee, OTGR] string capability is the tee pointing right.
 	AcsLtee
-
 	// The AcsRtee [acs_rtee, OTGL] string capability is the tee pointing left.
 	AcsRtee
-
 	// The AcsBtee [acs_btee, OTGU] string capability is the tee pointing up.
 	AcsBtee
-
 	// The AcsTtee [acs_ttee, OTGD] string capability is the tee pointing down.
 	AcsTtee
-
 	// The AcsHline [acs_hline, OTGH] string capability is the single horizontal line.
 	AcsHline
-
 	// The AcsVline [acs_vline, OTGV] string capability is the single vertical line.
 	AcsVline
-
 	// The AcsPlus [acs_plus, OTGC] string capability is the single intersection.
 	AcsPlus
-
 	// The MemoryLock [memory_lock, meml] string capability is the lock memory above cursor.
 	MemoryLock
-
 	// The MemoryUnlock [memory_unlock, memu] string capability is the unlock memory.
 	MemoryUnlock
-
 	// The BoxChars1 [box_chars_1, box1] string capability is the box characters primary set.
 	BoxChars1
 )
-
 const (
 	// CapCountBool is the count of bool capabilities.
 	CapCountBool = ReturnDoesClrEol + 1
-
 	// CapCountNum is the count of num capabilities.
 	CapCountNum = NumberOfFunctionKeys + 1
-
 	// CapCountString is the count of string capabilities.
 	CapCountString = BoxChars1 + 1
 )
diff --git a/vendor/github.com/xo/terminfo/color.go b/vendor/github.com/xo/terminfo/color.go
index 453c29c24..76c439fc9 100644
--- a/vendor/github.com/xo/terminfo/color.go
+++ b/vendor/github.com/xo/terminfo/color.go
@@ -70,14 +70,12 @@ func ColorLevelFromEnv() (ColorLevel, error) {
 		}
 		return ColorLevelHundreds, nil
 	}
-
 	// otherwise determine from TERM's max_colors capability
 	if term := os.Getenv("TERM"); term != "" {
 		ti, err := Load(term)
 		if err != nil {
 			return ColorLevelNone, err
 		}
-
 		v, ok := ti.Nums[MaxColors]
 		switch {
 		case !ok || v <= 16:
@@ -86,6 +84,5 @@ func ColorLevelFromEnv() (ColorLevel, error) {
 			return ColorLevelHundreds, nil
 		}
 	}
-
 	return ColorLevelBasic, nil
 }
diff --git a/vendor/github.com/xo/terminfo/util.go b/vendor/github.com/xo/terminfo/dec.go
similarity index 91%
rename from vendor/github.com/xo/terminfo/util.go
rename to vendor/github.com/xo/terminfo/dec.go
index 56f47e811..f650c2dd2 100644
--- a/vendor/github.com/xo/terminfo/util.go
+++ b/vendor/github.com/xo/terminfo/dec.go
@@ -6,13 +6,12 @@ import (
 
 const (
 	// maxFileLength is the max file length.
-	maxFileLength = 4096
-
+	maxFileLength = 32768
 	// magic is the file magic for terminfo files.
-	magic = 0432
-
-	// magicExtended is the file magic for terminfo files with the extended number format.
-	magicExtended = 01036
+	magic = 0o432
+	// magicExtended is the file magic for terminfo files with the extended
+	// number format.
+	magicExtended = 0o1036
 )
 
 // header fields.
@@ -99,12 +98,12 @@ func readStrings(idx []int, buf []byte, n int) (map[int][]byte, int, error) {
 type decoder struct {
 	buf []byte
 	pos int
-	len int
+	n   int
 }
 
 // readBytes reads the next n bytes of buf, incrementing pos by n.
 func (d *decoder) readBytes(n int) ([]byte, error) {
-	if d.len < d.pos+n {
+	if d.n < d.pos+n {
 		return nil, ErrUnexpectedFileEnd
 	}
 	n, d.pos = d.pos, d.pos+n
@@ -115,15 +114,12 @@ func (d *decoder) readBytes(n int) ([]byte, error) {
 func (d *decoder) readInts(n, w int) ([]int, error) {
 	w /= 8
 	l := n * w
-
 	buf, err := d.readBytes(l)
 	if err != nil {
 		return nil, err
 	}
-
 	// align
 	d.pos += d.pos % 2
-
 	z := make([]int, n)
 	for i, j := 0, 0; i < l; i, j = i+w, j+1 {
 		switch w {
@@ -135,7 +131,6 @@ func (d *decoder) readInts(n, w int) ([]int, error) {
 			z[j] = int(buf[i+3])<<24 | int(buf[i+2])<<16 | int(buf[i+1])<<8 | int(buf[i])
 		}
 	}
-
 	return z, nil
 }
 
@@ -145,7 +140,6 @@ func (d *decoder) readBools(n int) (map[int]bool, map[int]bool, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-
 	// process
 	bools, boolsM := make(map[int]bool), make(map[int]bool)
 	for i, b := range buf {
@@ -154,7 +148,6 @@ func (d *decoder) readBools(n int) (map[int]bool, map[int]bool, error) {
 			boolsM[i] = true
 		}
 	}
-
 	return bools, boolsM, nil
 }
 
@@ -164,7 +157,6 @@ func (d *decoder) readNums(n, w int) (map[int]int, map[int]bool, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-
 	// process
 	nums, numsM := make(map[int]int), make(map[int]bool)
 	for i := 0; i < n; i++ {
@@ -173,7 +165,6 @@ func (d *decoder) readNums(n, w int) (map[int]int, map[int]bool, error) {
 			numsM[i] = true
 		}
 	}
-
 	return nums, numsM, nil
 }
 
@@ -184,16 +175,13 @@ func (d *decoder) readStringTable(n, sz int) ([][]byte, []int, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-
 	// read string data table
 	data, err := d.readBytes(sz)
 	if err != nil {
 		return nil, nil, err
 	}
-
 	// align
 	d.pos += d.pos % 2
-
 	// process
 	s := make([][]byte, n)
 	var m []int
@@ -209,7 +197,6 @@ func (d *decoder) readStringTable(n, sz int) ([][]byte, []int, error) {
 			}
 		}
 	}
-
 	return s, m, nil
 }
 
@@ -220,7 +207,6 @@ func (d *decoder) readStrings(n, sz int) (map[int][]byte, map[int]bool, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-
 	strs := make(map[int][]byte)
 	for k, v := range s {
 		if k == AcsChars {
@@ -228,39 +214,32 @@ func (d *decoder) readStrings(n, sz int) (map[int][]byte, map[int]bool, error) {
 		}
 		strs[k] = v
 	}
-
 	strsM := make(map[int]bool, len(m))
 	for _, k := range m {
 		strsM[k] = true
 	}
-
 	return strs, strsM, nil
 }
 
 // canonicalizeAscChars reorders chars to be unique, in order.
 //
-// see repair_ascc in ncurses-6.0/progs/dump_entry.c
+// see repair_ascc in ncurses-6.3/progs/dump_entry.c
 func canonicalizeAscChars(z []byte) []byte {
-	var c chars
+	var c []byte
 	enc := make(map[byte]byte, len(z)/2)
 	for i := 0; i < len(z); i += 2 {
 		if _, ok := enc[z[i]]; !ok {
 			a, b := z[i], z[i+1]
-			//log.Printf(">>> a: %d %c, b: %d %c", a, a, b, b)
+			// log.Printf(">>> a: %d %c, b: %d %c", a, a, b, b)
 			c, enc[a] = append(c, b), b
 		}
 	}
-	sort.Sort(c)
-
+	sort.Slice(c, func(i, j int) bool {
+		return c[i] < c[j]
+	})
 	r := make([]byte, 2*len(c))
 	for i := 0; i < len(c); i++ {
 		r[i*2], r[i*2+1] = c[i], enc[c[i]]
 	}
 	return r
 }
-
-type chars []byte
-
-func (c chars) Len() int           { return len(c) }
-func (c chars) Swap(i, j int)      { c[i], c[j] = c[j], c[i] }
-func (c chars) Less(i, j int) bool { return c[i] < c[j] }
diff --git a/vendor/github.com/xo/terminfo/load.go b/vendor/github.com/xo/terminfo/load.go
index 9b0b94286..d7cd266cb 100644
--- a/vendor/github.com/xo/terminfo/load.go
+++ b/vendor/github.com/xo/terminfo/load.go
@@ -23,34 +23,27 @@ func Load(name string) (*Terminfo, error) {
 	if name == "" {
 		return nil, ErrEmptyTermName
 	}
-
 	termCache.RLock()
 	ti, ok := termCache.db[name]
 	termCache.RUnlock()
-
 	if ok {
 		return ti, nil
 	}
-
 	var checkDirs []string
-
 	// check $TERMINFO
 	if dir := os.Getenv("TERMINFO"); dir != "" {
 		checkDirs = append(checkDirs, dir)
 	}
-
 	// check $HOME/.terminfo
 	u, err := user.Current()
 	if err != nil {
 		return nil, err
 	}
 	checkDirs = append(checkDirs, path.Join(u.HomeDir, ".terminfo"))
-
 	// check $TERMINFO_DIRS
 	if dirs := os.Getenv("TERMINFO_DIRS"); dirs != "" {
 		checkDirs = append(checkDirs, strings.Split(dirs, ":")...)
 	}
-
 	// check fallback directories
 	checkDirs = append(checkDirs, "/etc/terminfo", "/lib/terminfo", "/usr/share/terminfo")
 	for _, dir := range checkDirs {
@@ -61,7 +54,6 @@ func Load(name string) (*Terminfo, error) {
 			return ti, nil
 		}
 	}
-
 	return nil, ErrDatabaseDirectoryNotFound
 }
 
diff --git a/vendor/github.com/xo/terminfo/param.go b/vendor/github.com/xo/terminfo/param.go
index e6b8a1bc0..ed4cb86b6 100644
--- a/vendor/github.com/xo/terminfo/param.go
+++ b/vendor/github.com/xo/terminfo/param.go
@@ -13,25 +13,18 @@ import (
 type parametizer struct {
 	// z is the string to parameterize
 	z []byte
-
 	// pos is the current position in s.
 	pos int
-
 	// nest is the current nest level.
 	nest int
-
 	// s is the variable stack.
 	s stack
-
 	// skipElse keeps the state of skipping else.
 	skipElse bool
-
 	// buf is the result buffer.
 	buf *bytes.Buffer
-
 	// params are the parameters to interpolate.
 	params [9]interface{}
-
 	// vars are dynamic variables.
 	vars [26]interface{}
 }
@@ -54,19 +47,15 @@ var parametizerPool = sync.Pool{
 func newParametizer(z []byte) *parametizer {
 	p := parametizerPool.Get().(*parametizer)
 	p.z = z
-
 	return p
 }
 
 // reset resets the parametizer.
 func (p *parametizer) reset() {
 	p.pos, p.nest = 0, 0
-
 	p.s.reset()
 	p.buf.Reset()
-
 	p.params, p.vars = [9]interface{}{}, [26]interface{}{}
-
 	parametizerPool.Put(p)
 }
 
@@ -106,13 +95,11 @@ func (p *parametizer) scanTextFn() stateFn {
 			p.writeFrom(ppos)
 			return nil
 		}
-
 		if ch == '%' {
 			p.writeFrom(ppos)
 			p.pos++
 			return p.scanCodeFn
 		}
-
 		p.pos++
 	}
 }
@@ -122,11 +109,9 @@ func (p *parametizer) scanCodeFn() stateFn {
 	if err != nil {
 		return nil
 	}
-
 	switch ch {
 	case '%':
 		p.buf.WriteByte('%')
-
 	case ':':
 		// this character is used to avoid interpreting "%-" and "%+" as operators.
 		// the next character is where the format really begins.
@@ -136,71 +121,52 @@ func (p *parametizer) scanCodeFn() stateFn {
 			return nil
 		}
 		return p.scanFormatFn
-
 	case '#', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.':
 		return p.scanFormatFn
-
 	case 'o':
 		p.buf.WriteString(strconv.FormatInt(int64(p.s.popInt()), 8))
-
 	case 'd':
 		p.buf.WriteString(strconv.Itoa(p.s.popInt()))
-
 	case 'x':
 		p.buf.WriteString(strconv.FormatInt(int64(p.s.popInt()), 16))
-
 	case 'X':
 		p.buf.WriteString(strings.ToUpper(strconv.FormatInt(int64(p.s.popInt()), 16)))
-
 	case 's':
 		p.buf.WriteString(p.s.popString())
-
 	case 'c':
 		p.buf.WriteByte(p.s.popByte())
-
 	case 'p':
 		p.pos++
 		return p.pushParamFn
-
 	case 'P':
 		p.pos++
 		return p.setDsVarFn
-
 	case 'g':
 		p.pos++
 		return p.getDsVarFn
-
 	case '\'':
 		p.pos++
 		ch, err = p.peek()
 		if err != nil {
 			return nil
 		}
-
 		p.s.push(ch)
-
 		// skip the '\''
 		p.pos++
-
 	case '{':
 		p.pos++
 		return p.pushIntfn
-
 	case 'l':
 		p.s.push(len(p.s.popString()))
-
 	case '+':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai + bi)
-
 	case '-':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai - bi)
-
 	case '*':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai * bi)
-
 	case '/':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		if bi != 0 {
@@ -208,7 +174,6 @@ func (p *parametizer) scanCodeFn() stateFn {
 		} else {
 			p.s.push(0)
 		}
-
 	case 'm':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		if bi != 0 {
@@ -216,101 +181,77 @@ func (p *parametizer) scanCodeFn() stateFn {
 		} else {
 			p.s.push(0)
 		}
-
 	case '&':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai & bi)
-
 	case '|':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai | bi)
-
 	case '^':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai ^ bi)
-
 	case '=':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai == bi)
-
 	case '>':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai > bi)
-
 	case '<':
 		bi, ai := p.s.popInt(), p.s.popInt()
 		p.s.push(ai < bi)
-
 	case 'A':
 		bi, ai := p.s.popBool(), p.s.popBool()
 		p.s.push(ai && bi)
-
 	case 'O':
 		bi, ai := p.s.popBool(), p.s.popBool()
 		p.s.push(ai || bi)
-
 	case '!':
 		p.s.push(!p.s.popBool())
-
 	case '~':
 		p.s.push(^p.s.popInt())
-
 	case 'i':
 		for i := range p.params[:2] {
 			if n, ok := p.params[i].(int); ok {
 				p.params[i] = n + 1
 			}
 		}
-
 	case '?', ';':
-
 	case 't':
 		return p.scanThenFn
-
 	case 'e':
 		p.skipElse = true
 		return p.skipTextFn
 	}
-
 	p.pos++
-
 	return p.scanTextFn
 }
 
 func (p *parametizer) scanFormatFn() stateFn {
 	// the character was already read, so no need to check the error.
 	ch, _ := p.peek()
-
 	// 6 should be the maximum length of a format string, for example "%:-9.9d".
 	f := []byte{'%', ch, 0, 0, 0, 0}
-
 	var err error
-
 	for {
 		p.pos++
 		ch, err = p.peek()
 		if err != nil {
 			return nil
 		}
-
 		f = append(f, ch)
 		switch ch {
 		case 'o', 'd', 'x', 'X':
 			fmt.Fprintf(p.buf, string(f), p.s.popInt())
 			break
-
 		case 's':
 			fmt.Fprintf(p.buf, string(f), p.s.popString())
 			break
-
 		case 'c':
 			fmt.Fprintf(p.buf, string(f), p.s.popByte())
 			break
 		}
 	}
-
 	p.pos++
-
 	return p.scanTextFn
 }
 
@@ -319,16 +260,13 @@ func (p *parametizer) pushParamFn() stateFn {
 	if err != nil {
 		return nil
 	}
-
 	if ai := int(ch - '1'); ai >= 0 && ai < len(p.params) {
 		p.s.push(p.params[ai])
 	} else {
 		p.s.push(0)
 	}
-
 	// skip the '}'
 	p.pos++
-
 	return p.scanTextFn
 }
 
@@ -337,7 +275,6 @@ func (p *parametizer) setDsVarFn() stateFn {
 	if err != nil {
 		return nil
 	}
-
 	if ch >= 'A' && ch <= 'Z' {
 		staticVars.Lock()
 		staticVars.vars[int(ch-'A')] = p.s.pop()
@@ -345,7 +282,6 @@ func (p *parametizer) setDsVarFn() stateFn {
 	} else if ch >= 'a' && ch <= 'z' {
 		p.vars[int(ch-'a')] = p.s.pop()
 	}
-
 	p.pos++
 	return p.scanTextFn
 }
@@ -355,20 +291,16 @@ func (p *parametizer) getDsVarFn() stateFn {
 	if err != nil {
 		return nil
 	}
-
 	var a byte
 	if ch >= 'A' && ch <= 'Z' {
 		a = 'A'
 	} else if ch >= 'a' && ch <= 'z' {
 		a = 'a'
 	}
-
 	staticVars.Lock()
 	p.s.push(staticVars.vars[int(ch-a)])
 	staticVars.Unlock()
-
 	p.pos++
-
 	return p.scanTextFn
 }
 
@@ -379,26 +311,21 @@ func (p *parametizer) pushIntfn() stateFn {
 		if err != nil {
 			return nil
 		}
-
 		p.pos++
 		if ch < '0' || ch > '9' {
 			p.s.push(ai)
 			return p.scanTextFn
 		}
-
 		ai = (ai * 10) + int(ch-'0')
 	}
 }
 
 func (p *parametizer) scanThenFn() stateFn {
 	p.pos++
-
 	if p.s.popBool() {
 		return p.scanTextFn
 	}
-
 	p.skipElse = false
-
 	return p.skipTextFn
 }
 
@@ -408,17 +335,14 @@ func (p *parametizer) skipTextFn() stateFn {
 		if err != nil {
 			return nil
 		}
-
 		p.pos++
 		if ch == '%' {
 			break
 		}
 	}
-
 	if p.skipElse {
 		return p.skipElseFn
 	}
-
 	return p.skipThenFn
 }
 
@@ -427,7 +351,6 @@ func (p *parametizer) skipThenFn() stateFn {
 	if err != nil {
 		return nil
 	}
-
 	p.pos++
 	switch ch {
 	case ';':
@@ -435,16 +358,13 @@ func (p *parametizer) skipThenFn() stateFn {
 			return p.scanTextFn
 		}
 		p.nest--
-
 	case '?':
 		p.nest++
-
 	case 'e':
 		if p.nest == 0 {
 			return p.scanTextFn
 		}
 	}
-
 	return p.skipTextFn
 }
 
@@ -453,7 +373,6 @@ func (p *parametizer) skipElseFn() stateFn {
 	if err != nil {
 		return nil
 	}
-
 	p.pos++
 	switch ch {
 	case ';':
@@ -461,11 +380,9 @@ func (p *parametizer) skipElseFn() stateFn {
 			return p.scanTextFn
 		}
 		p.nest--
-
 	case '?':
 		p.nest++
 	}
-
 	return p.skipTextFn
 }
 
@@ -473,13 +390,11 @@ func (p *parametizer) skipElseFn() stateFn {
 func Printf(z []byte, params ...interface{}) string {
 	p := newParametizer(z)
 	defer p.reset()
-
 	// make sure we always have 9 parameters -- makes it easier
 	// later to skip checks and its faster
 	for i := 0; i < len(p.params) && i < len(params); i++ {
 		p.params[i] = params[i]
 	}
-
 	return p.exec()
 }
 
diff --git a/vendor/github.com/xo/terminfo/terminfo.go b/vendor/github.com/xo/terminfo/terminfo.go
index 8ebbf9599..69e3b6064 100644
--- a/vendor/github.com/xo/terminfo/terminfo.go
+++ b/vendor/github.com/xo/terminfo/terminfo.go
@@ -1,6 +1,8 @@
 // Package terminfo implements reading terminfo files in pure go.
 package terminfo
 
+//go:generate go run gen.go
+
 import (
 	"io"
 	"io/ioutil"
@@ -20,34 +22,24 @@ func (err Error) Error() string {
 const (
 	// ErrInvalidFileSize is the invalid file size error.
 	ErrInvalidFileSize Error = "invalid file size"
-
 	// ErrUnexpectedFileEnd is the unexpected file end error.
 	ErrUnexpectedFileEnd Error = "unexpected file end"
-
 	// ErrInvalidStringTable is the invalid string table error.
 	ErrInvalidStringTable Error = "invalid string table"
-
 	// ErrInvalidMagic is the invalid magic error.
 	ErrInvalidMagic Error = "invalid magic"
-
 	// ErrInvalidHeader is the invalid header error.
 	ErrInvalidHeader Error = "invalid header"
-
 	// ErrInvalidNames is the invalid names error.
 	ErrInvalidNames Error = "invalid names"
-
 	// ErrInvalidExtendedHeader is the invalid extended header error.
 	ErrInvalidExtendedHeader Error = "invalid extended header"
-
 	// ErrEmptyTermName is the empty term name error.
 	ErrEmptyTermName Error = "empty term name"
-
 	// ErrDatabaseDirectoryNotFound is the database directory not found error.
 	ErrDatabaseDirectoryNotFound Error = "database directory not found"
-
 	// ErrFileNotFound is the file not found error.
 	ErrFileNotFound Error = "file not found"
-
 	// ErrInvalidTermProgramVersion is the invalid TERM_PROGRAM_VERSION error.
 	ErrInvalidTermProgramVersion Error = "invalid TERM_PROGRAM_VERSION"
 )
@@ -56,43 +48,30 @@ const (
 type Terminfo struct {
 	// File is the original source file.
 	File string
-
 	// Names are the provided cap names.
 	Names []string
-
 	// Bools are the bool capabilities.
 	Bools map[int]bool
-
 	// BoolsM are the missing bool capabilities.
 	BoolsM map[int]bool
-
 	// Nums are the num capabilities.
 	Nums map[int]int
-
 	// NumsM are the missing num capabilities.
 	NumsM map[int]bool
-
 	// Strings are the string capabilities.
 	Strings map[int][]byte
-
 	// StringsM are the missing string capabilities.
 	StringsM map[int]bool
-
 	// ExtBools are the extended bool capabilities.
 	ExtBools map[int]bool
-
 	// ExtBoolsNames is the map of extended bool capabilities to their index.
 	ExtBoolNames map[int][]byte
-
 	// ExtNums are the extended num capabilities.
 	ExtNums map[int]int
-
 	// ExtNumsNames is the map of extended num capabilities to their index.
 	ExtNumNames map[int][]byte
-
 	// ExtStrings are the extended string capabilities.
 	ExtStrings map[int][]byte
-
 	// ExtStringsNames is the map of extended string capabilities to their index.
 	ExtStringNames map[int][]byte
 }
@@ -100,75 +79,63 @@ type Terminfo struct {
 // Decode decodes the terminfo data contained in buf.
 func Decode(buf []byte) (*Terminfo, error) {
 	var err error
-
 	// check max file length
 	if len(buf) >= maxFileLength {
 		return nil, ErrInvalidFileSize
 	}
-
 	d := &decoder{
 		buf: buf,
-		len: len(buf),
+		n:   len(buf),
 	}
-
 	// read header
 	h, err := d.readInts(6, 16)
 	if err != nil {
 		return nil, err
 	}
-
 	var numWidth int
-
 	// check magic
-	if h[fieldMagic] == magic {
+	switch {
+	case h[fieldMagic] == magic:
 		numWidth = 16
-	} else if h[fieldMagic] == magicExtended {
+	case h[fieldMagic] == magicExtended:
 		numWidth = 32
-	} else {
+	default:
 		return nil, ErrInvalidMagic
 	}
-
 	// check header
 	if hasInvalidCaps(h) {
 		return nil, ErrInvalidHeader
 	}
-
 	// check remaining length
-	if d.len-d.pos < capLength(h) {
+	if d.n-d.pos < capLength(h) {
 		return nil, ErrUnexpectedFileEnd
 	}
-
 	// read names
 	names, err := d.readBytes(h[fieldNameSize])
 	if err != nil {
 		return nil, err
 	}
-
 	// check name is terminated properly
 	i := findNull(names, 0)
 	if i == -1 {
 		return nil, ErrInvalidNames
 	}
 	names = names[:i]
-
 	// read bool caps
 	bools, boolsM, err := d.readBools(h[fieldBoolCount])
 	if err != nil {
 		return nil, err
 	}
-
 	// read num caps
 	nums, numsM, err := d.readNums(h[fieldNumCount], numWidth)
 	if err != nil {
 		return nil, err
 	}
-
 	// read string caps
 	strs, strsM, err := d.readStrings(h[fieldStringCount], h[fieldTableSize])
 	if err != nil {
 		return nil, err
 	}
-
 	ti := &Terminfo{
 		Names:    strings.Split(string(names), "|"),
 		Bools:    bools,
@@ -178,57 +145,47 @@ func Decode(buf []byte) (*Terminfo, error) {
 		Strings:  strs,
 		StringsM: strsM,
 	}
-
 	// at the end of file, so no extended caps
-	if d.pos >= d.len {
+	if d.pos >= d.n {
 		return ti, nil
 	}
-
 	// decode extended header
 	eh, err := d.readInts(5, 16)
 	if err != nil {
 		return nil, err
 	}
-
 	// check extended offset field
 	if hasInvalidExtOffset(eh) {
 		return nil, ErrInvalidExtendedHeader
 	}
-
 	// check extended cap lengths
-	if d.len-d.pos != extCapLength(eh, numWidth) {
+	if d.n-d.pos != extCapLength(eh, numWidth) {
 		return nil, ErrInvalidExtendedHeader
 	}
-
 	// read extended bool caps
 	ti.ExtBools, _, err = d.readBools(eh[fieldExtBoolCount])
 	if err != nil {
 		return nil, err
 	}
-
 	// read extended num caps
 	ti.ExtNums, _, err = d.readNums(eh[fieldExtNumCount], numWidth)
 	if err != nil {
 		return nil, err
 	}
-
 	// read extended string data table indexes
 	extIndexes, err := d.readInts(eh[fieldExtOffsetCount], 16)
 	if err != nil {
 		return nil, err
 	}
-
 	// read string data table
 	extData, err := d.readBytes(eh[fieldExtTableSize])
 	if err != nil {
 		return nil, err
 	}
-
 	// precautionary check that exactly at end of file
-	if d.pos != d.len {
+	if d.pos != d.n {
 		return nil, ErrUnexpectedFileEnd
 	}
-
 	var last int
 	// read extended string caps
 	ti.ExtStrings, last, err = readStrings(extIndexes, extData, eh[fieldExtStringCount])
@@ -236,28 +193,24 @@ func Decode(buf []byte) (*Terminfo, error) {
 		return nil, err
 	}
 	extIndexes, extData = extIndexes[eh[fieldExtStringCount]:], extData[last:]
-
 	// read extended bool names
 	ti.ExtBoolNames, _, err = readStrings(extIndexes, extData, eh[fieldExtBoolCount])
 	if err != nil {
 		return nil, err
 	}
 	extIndexes = extIndexes[eh[fieldExtBoolCount]:]
-
 	// read extended num names
 	ti.ExtNumNames, _, err = readStrings(extIndexes, extData, eh[fieldExtNumCount])
 	if err != nil {
 		return nil, err
 	}
 	extIndexes = extIndexes[eh[fieldExtNumCount]:]
-
 	// read extended string names
 	ti.ExtStringNames, _, err = readStrings(extIndexes, extData, eh[fieldExtStringCount])
 	if err != nil {
 		return nil, err
 	}
-	//extIndexes = extIndexes[eh[fieldExtStringCount]:]
-
+	// extIndexes = extIndexes[eh[fieldExtStringCount]:]
 	return ti, nil
 }
 
@@ -279,23 +232,19 @@ func Open(dir, name string) (*Terminfo, error) {
 	if buf == nil {
 		return nil, ErrFileNotFound
 	}
-
 	// decode
 	ti, err := Decode(buf)
 	if err != nil {
 		return nil, err
 	}
-
 	// save original file name
 	ti.File = filename
-
 	// add to cache
 	termCache.Lock()
 	for _, n := range ti.Names {
 		termCache.db[n] = ti
 	}
 	termCache.Unlock()
-
 	return ti, nil
 }
 
@@ -441,7 +390,6 @@ func (ti *Terminfo) Fprintf(w io.Writer, i int, v ...interface{}) {
 // them for this terminal.
 func (ti *Terminfo) Colorf(fg, bg int, str string) string {
 	maxColors := int(ti.Nums[MaxColors])
-
 	// map bright colors to lower versions if the color table only holds 8.
 	if maxColors == 8 {
 		if fg > 7 && fg < 16 {
@@ -451,7 +399,6 @@ func (ti *Terminfo) Colorf(fg, bg int, str string) string {
 			bg -= 8
 		}
 	}
-
 	var s string
 	if maxColors > fg && fg >= 0 {
 		s += ti.Printf(SetAForeground, fg)
@@ -480,20 +427,17 @@ func (ti *Terminfo) Goto(row, col int) string {
 			// most strings don't need padding, which is good news!
 			return io.WriteString(w, s)
 		}
-
 		end := strings.Index(s, ">")
 		if end == -1 {
 			// unterminated... just emit bytes unadulterated.
 			return io.WriteString(w, "$<"+s)
 		}
-
 		var c int
 		c, err = io.WriteString(w, s[:start])
 		if err != nil {
 			return n + c, err
 		}
 		n += c
-
 		s = s[start+2:]
 		val := s[:end]
 		s = s[end+1:]
@@ -518,13 +462,11 @@ func (ti *Terminfo) Goto(row, col int) string {
 				break
 			}
 		}
-
 		z, pad := ((baud/8)/unit)*ms, ti.Strings[PadChar]
 		b := make([]byte, len(pad)*z)
 		for bp := copy(b, pad); bp < len(b); bp *= 2 {
 			copy(b[bp:], b[:bp])
 		}
-
 		if (!ti.Bools[XonXoff] && baud > int(ti.Nums[PaddingBaudRate])) || mandatory {
 			c, err = w.Write(b)
 			if err != nil {
@@ -533,6 +475,5 @@ func (ti *Terminfo) Goto(row, col int) string {
 			n += c
 		}
 	}
-
 	return n, nil
 }*/
diff --git a/vendor/go.yaml.in/yaml/v3/LICENSE b/vendor/go.yaml.in/yaml/v3/LICENSE
new file mode 100644
index 000000000..2683e4bb1
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/LICENSE
@@ -0,0 +1,50 @@
+
+This project is covered by two different licenses: MIT and Apache.
+
+#### MIT License ####
+
+The following files were ported to Go from C files of libyaml, and thus
+are still covered by their original MIT license, with the additional
+copyright staring in 2011 when the project was ported over:
+
+    apic.go emitterc.go parserc.go readerc.go scannerc.go
+    writerc.go yamlh.go yamlprivateh.go
+
+Copyright (c) 2006-2010 Kirill Simonov
+Copyright (c) 2006-2011 Kirill Simonov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+### Apache License ###
+
+All the remaining project files are covered by the Apache license:
+
+Copyright (c) 2011-2019 Canonical Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/github.com/skeema/knownhosts/NOTICE b/vendor/go.yaml.in/yaml/v3/NOTICE
similarity index 89%
rename from vendor/github.com/skeema/knownhosts/NOTICE
rename to vendor/go.yaml.in/yaml/v3/NOTICE
index 224b20248..866d74a7a 100644
--- a/vendor/github.com/skeema/knownhosts/NOTICE
+++ b/vendor/go.yaml.in/yaml/v3/NOTICE
@@ -1,4 +1,4 @@
-Copyright 2025 Skeema LLC and the Skeema Knownhosts authors
+Copyright 2011-2016 Canonical Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/go.yaml.in/yaml/v3/README.md b/vendor/go.yaml.in/yaml/v3/README.md
new file mode 100644
index 000000000..15a85a635
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/README.md
@@ -0,0 +1,171 @@
+go.yaml.in/yaml
+===============
+
+YAML Support for the Go Language
+
+
+## Introduction
+
+The `yaml` package enables [Go](https://go.dev/) programs to comfortably encode
+and decode [YAML](https://yaml.org/) values.
+
+It was originally developed within [Canonical](https://www.canonical.com) as
+part of the [juju](https://juju.ubuntu.com) project, and is based on a pure Go
+port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML) C library to
+parse and generate YAML data quickly and reliably.
+
+
+## Project Status
+
+This project started as a fork of the extremely popular [go-yaml](
+https://github.com/go-yaml/yaml/)
+project, and is being maintained by the official [YAML organization](
+https://github.com/yaml/).
+
+The YAML team took over ongoing maintenance and development of the project after
+discussion with go-yaml's author, @niemeyer, following his decision to
+[label the project repository as "unmaintained"](
+https://github.com/go-yaml/yaml/blob/944c86a7d2/README.md) in April 2025.
+
+We have put together a team of dedicated maintainers including representatives
+of go-yaml's most important downstream projects.
+
+We will strive to earn the trust of the various go-yaml forks to switch back to
+this repository as their upstream.
+
+Please [contact us](https://cloud-native.slack.com/archives/C08PPAT8PS7) if you
+would like to contribute or be involved.
+
+
+## Compatibility
+
+The `yaml` package supports most of YAML 1.2, but preserves some behavior from
+1.1 for backwards compatibility.
+
+Specifically, v3 of the `yaml` package:
+
+* Supports YAML 1.1 bools (`yes`/`no`, `on`/`off`) as long as they are being
+  decoded into a typed bool value.
+  Otherwise they behave as a string.
+  Booleans in YAML 1.2 are `true`/`false` only.
+* Supports octals encoded and decoded as `0777` per YAML 1.1, rather than
+  `0o777` as specified in YAML 1.2, because most parsers still use the old
+  format.
+  Octals in the `0o777` format are supported though, so new files work.
+* Does not support base-60 floats.
+  These are gone from YAML 1.2, and were actually never supported by this
+  package as it's clearly a poor choice.
+
+
+## Installation and Usage
+
+The import path for the package is *go.yaml.in/yaml/v3*.
+
+To install it, run:
+
+```bash
+go get go.yaml.in/yaml/v3
+```
+
+
+## API Documentation
+
+See: 
+
+
+## API Stability
+
+The package API for yaml v3 will remain stable as described in [gopkg.in](
+https://gopkg.in).
+
+
+## Example
+
+```go
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"go.yaml.in/yaml/v3"
+)
+
+var data = `
+a: Easy!
+b:
+  c: 2
+  d: [3, 4]
+`
+
+// Note: struct fields must be public in order for unmarshal to
+// correctly populate the data.
+type T struct {
+	A string
+	B struct {
+		RenamedC int   `yaml:"c"`
+		D	[]int `yaml:",flow"`
+	}
+}
+
+func main() {
+	t := T{}
+
+	err := yaml.Unmarshal([]byte(data), &t)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+	fmt.Printf("--- t:\n%v\n\n", t)
+
+	d, err := yaml.Marshal(&t)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+	fmt.Printf("--- t dump:\n%s\n\n", string(d))
+
+	m := make(map[interface{}]interface{})
+
+	err = yaml.Unmarshal([]byte(data), &m)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+	fmt.Printf("--- m:\n%v\n\n", m)
+
+	d, err = yaml.Marshal(&m)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+	fmt.Printf("--- m dump:\n%s\n\n", string(d))
+}
+```
+
+This example will generate the following output:
+
+```
+--- t:
+{Easy! {2 [3 4]}}
+
+--- t dump:
+a: Easy!
+b:
+  c: 2
+  d: [3, 4]
+
+
+--- m:
+map[a:Easy! b:map[c:2 d:[3 4]]]
+
+--- m dump:
+a: Easy!
+b:
+  c: 2
+  d:
+  - 3
+  - 4
+```
+
+
+## License
+
+The yaml package is licensed under the MIT and Apache License 2.0 licenses.
+Please see the LICENSE file for details.
diff --git a/vendor/go.yaml.in/yaml/v3/apic.go b/vendor/go.yaml.in/yaml/v3/apic.go
new file mode 100644
index 000000000..05fd305da
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/apic.go
@@ -0,0 +1,747 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+import (
+	"io"
+)
+
+func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) {
+	//fmt.Println("yaml_insert_token", "pos:", pos, "typ:", token.typ, "head:", parser.tokens_head, "len:", len(parser.tokens))
+
+	// Check if we can move the queue at the beginning of the buffer.
+	if parser.tokens_head > 0 && len(parser.tokens) == cap(parser.tokens) {
+		if parser.tokens_head != len(parser.tokens) {
+			copy(parser.tokens, parser.tokens[parser.tokens_head:])
+		}
+		parser.tokens = parser.tokens[:len(parser.tokens)-parser.tokens_head]
+		parser.tokens_head = 0
+	}
+	parser.tokens = append(parser.tokens, *token)
+	if pos < 0 {
+		return
+	}
+	copy(parser.tokens[parser.tokens_head+pos+1:], parser.tokens[parser.tokens_head+pos:])
+	parser.tokens[parser.tokens_head+pos] = *token
+}
+
+// Create a new parser object.
+func yaml_parser_initialize(parser *yaml_parser_t) bool {
+	*parser = yaml_parser_t{
+		raw_buffer: make([]byte, 0, input_raw_buffer_size),
+		buffer:     make([]byte, 0, input_buffer_size),
+	}
+	return true
+}
+
+// Destroy a parser object.
+func yaml_parser_delete(parser *yaml_parser_t) {
+	*parser = yaml_parser_t{}
+}
+
+// String read handler.
+func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
+	if parser.input_pos == len(parser.input) {
+		return 0, io.EOF
+	}
+	n = copy(buffer, parser.input[parser.input_pos:])
+	parser.input_pos += n
+	return n, nil
+}
+
+// Reader read handler.
+func yaml_reader_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
+	return parser.input_reader.Read(buffer)
+}
+
+// Set a string input.
+func yaml_parser_set_input_string(parser *yaml_parser_t, input []byte) {
+	if parser.read_handler != nil {
+		panic("must set the input source only once")
+	}
+	parser.read_handler = yaml_string_read_handler
+	parser.input = input
+	parser.input_pos = 0
+}
+
+// Set a file input.
+func yaml_parser_set_input_reader(parser *yaml_parser_t, r io.Reader) {
+	if parser.read_handler != nil {
+		panic("must set the input source only once")
+	}
+	parser.read_handler = yaml_reader_read_handler
+	parser.input_reader = r
+}
+
+// Set the source encoding.
+func yaml_parser_set_encoding(parser *yaml_parser_t, encoding yaml_encoding_t) {
+	if parser.encoding != yaml_ANY_ENCODING {
+		panic("must set the encoding only once")
+	}
+	parser.encoding = encoding
+}
+
+// Create a new emitter object.
+func yaml_emitter_initialize(emitter *yaml_emitter_t) {
+	*emitter = yaml_emitter_t{
+		buffer:     make([]byte, output_buffer_size),
+		raw_buffer: make([]byte, 0, output_raw_buffer_size),
+		states:     make([]yaml_emitter_state_t, 0, initial_stack_size),
+		events:     make([]yaml_event_t, 0, initial_queue_size),
+		best_width: -1,
+	}
+}
+
+// Destroy an emitter object.
+func yaml_emitter_delete(emitter *yaml_emitter_t) {
+	*emitter = yaml_emitter_t{}
+}
+
+// String write handler.
+func yaml_string_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
+	*emitter.output_buffer = append(*emitter.output_buffer, buffer...)
+	return nil
+}
+
+// yaml_writer_write_handler uses emitter.output_writer to write the
+// emitted text.
+func yaml_writer_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
+	_, err := emitter.output_writer.Write(buffer)
+	return err
+}
+
+// Set a string output.
+func yaml_emitter_set_output_string(emitter *yaml_emitter_t, output_buffer *[]byte) {
+	if emitter.write_handler != nil {
+		panic("must set the output target only once")
+	}
+	emitter.write_handler = yaml_string_write_handler
+	emitter.output_buffer = output_buffer
+}
+
+// Set a file output.
+func yaml_emitter_set_output_writer(emitter *yaml_emitter_t, w io.Writer) {
+	if emitter.write_handler != nil {
+		panic("must set the output target only once")
+	}
+	emitter.write_handler = yaml_writer_write_handler
+	emitter.output_writer = w
+}
+
+// Set the output encoding.
+func yaml_emitter_set_encoding(emitter *yaml_emitter_t, encoding yaml_encoding_t) {
+	if emitter.encoding != yaml_ANY_ENCODING {
+		panic("must set the output encoding only once")
+	}
+	emitter.encoding = encoding
+}
+
+// Set the canonical output style.
+func yaml_emitter_set_canonical(emitter *yaml_emitter_t, canonical bool) {
+	emitter.canonical = canonical
+}
+
+// Set the indentation increment.
+func yaml_emitter_set_indent(emitter *yaml_emitter_t, indent int) {
+	if indent < 2 || indent > 9 {
+		indent = 2
+	}
+	emitter.best_indent = indent
+}
+
+// Set the preferred line width.
+func yaml_emitter_set_width(emitter *yaml_emitter_t, width int) {
+	if width < 0 {
+		width = -1
+	}
+	emitter.best_width = width
+}
+
+// Set if unescaped non-ASCII characters are allowed.
+func yaml_emitter_set_unicode(emitter *yaml_emitter_t, unicode bool) {
+	emitter.unicode = unicode
+}
+
+// Set the preferred line break character.
+func yaml_emitter_set_break(emitter *yaml_emitter_t, line_break yaml_break_t) {
+	emitter.line_break = line_break
+}
+
+///*
+// * Destroy a token object.
+// */
+//
+//YAML_DECLARE(void)
+//yaml_token_delete(yaml_token_t *token)
+//{
+//    assert(token);  // Non-NULL token object expected.
+//
+//    switch (token.type)
+//    {
+//        case YAML_TAG_DIRECTIVE_TOKEN:
+//            yaml_free(token.data.tag_directive.handle);
+//            yaml_free(token.data.tag_directive.prefix);
+//            break;
+//
+//        case YAML_ALIAS_TOKEN:
+//            yaml_free(token.data.alias.value);
+//            break;
+//
+//        case YAML_ANCHOR_TOKEN:
+//            yaml_free(token.data.anchor.value);
+//            break;
+//
+//        case YAML_TAG_TOKEN:
+//            yaml_free(token.data.tag.handle);
+//            yaml_free(token.data.tag.suffix);
+//            break;
+//
+//        case YAML_SCALAR_TOKEN:
+//            yaml_free(token.data.scalar.value);
+//            break;
+//
+//        default:
+//            break;
+//    }
+//
+//    memset(token, 0, sizeof(yaml_token_t));
+//}
+//
+///*
+// * Check if a string is a valid UTF-8 sequence.
+// *
+// * Check 'reader.c' for more details on UTF-8 encoding.
+// */
+//
+//static int
+//yaml_check_utf8(yaml_char_t *start, size_t length)
+//{
+//    yaml_char_t *end = start+length;
+//    yaml_char_t *pointer = start;
+//
+//    while (pointer < end) {
+//        unsigned char octet;
+//        unsigned int width;
+//        unsigned int value;
+//        size_t k;
+//
+//        octet = pointer[0];
+//        width = (octet & 0x80) == 0x00 ? 1 :
+//                (octet & 0xE0) == 0xC0 ? 2 :
+//                (octet & 0xF0) == 0xE0 ? 3 :
+//                (octet & 0xF8) == 0xF0 ? 4 : 0;
+//        value = (octet & 0x80) == 0x00 ? octet & 0x7F :
+//                (octet & 0xE0) == 0xC0 ? octet & 0x1F :
+//                (octet & 0xF0) == 0xE0 ? octet & 0x0F :
+//                (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
+//        if (!width) return 0;
+//        if (pointer+width > end) return 0;
+//        for (k = 1; k < width; k ++) {
+//            octet = pointer[k];
+//            if ((octet & 0xC0) != 0x80) return 0;
+//            value = (value << 6) + (octet & 0x3F);
+//        }
+//        if (!((width == 1) ||
+//            (width == 2 && value >= 0x80) ||
+//            (width == 3 && value >= 0x800) ||
+//            (width == 4 && value >= 0x10000))) return 0;
+//
+//        pointer += width;
+//    }
+//
+//    return 1;
+//}
+//
+
+// Create STREAM-START.
+func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) {
+	*event = yaml_event_t{
+		typ:      yaml_STREAM_START_EVENT,
+		encoding: encoding,
+	}
+}
+
+// Create STREAM-END.
+func yaml_stream_end_event_initialize(event *yaml_event_t) {
+	*event = yaml_event_t{
+		typ: yaml_STREAM_END_EVENT,
+	}
+}
+
+// Create DOCUMENT-START.
+func yaml_document_start_event_initialize(
+	event *yaml_event_t,
+	version_directive *yaml_version_directive_t,
+	tag_directives []yaml_tag_directive_t,
+	implicit bool,
+) {
+	*event = yaml_event_t{
+		typ:               yaml_DOCUMENT_START_EVENT,
+		version_directive: version_directive,
+		tag_directives:    tag_directives,
+		implicit:          implicit,
+	}
+}
+
+// Create DOCUMENT-END.
+func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) {
+	*event = yaml_event_t{
+		typ:      yaml_DOCUMENT_END_EVENT,
+		implicit: implicit,
+	}
+}
+
+// Create ALIAS.
+func yaml_alias_event_initialize(event *yaml_event_t, anchor []byte) bool {
+	*event = yaml_event_t{
+		typ:    yaml_ALIAS_EVENT,
+		anchor: anchor,
+	}
+	return true
+}
+
+// Create SCALAR.
+func yaml_scalar_event_initialize(event *yaml_event_t, anchor, tag, value []byte, plain_implicit, quoted_implicit bool, style yaml_scalar_style_t) bool {
+	*event = yaml_event_t{
+		typ:             yaml_SCALAR_EVENT,
+		anchor:          anchor,
+		tag:             tag,
+		value:           value,
+		implicit:        plain_implicit,
+		quoted_implicit: quoted_implicit,
+		style:           yaml_style_t(style),
+	}
+	return true
+}
+
+// Create SEQUENCE-START.
+func yaml_sequence_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_sequence_style_t) bool {
+	*event = yaml_event_t{
+		typ:      yaml_SEQUENCE_START_EVENT,
+		anchor:   anchor,
+		tag:      tag,
+		implicit: implicit,
+		style:    yaml_style_t(style),
+	}
+	return true
+}
+
+// Create SEQUENCE-END.
+func yaml_sequence_end_event_initialize(event *yaml_event_t) bool {
+	*event = yaml_event_t{
+		typ: yaml_SEQUENCE_END_EVENT,
+	}
+	return true
+}
+
+// Create MAPPING-START.
+func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) {
+	*event = yaml_event_t{
+		typ:      yaml_MAPPING_START_EVENT,
+		anchor:   anchor,
+		tag:      tag,
+		implicit: implicit,
+		style:    yaml_style_t(style),
+	}
+}
+
+// Create MAPPING-END.
+func yaml_mapping_end_event_initialize(event *yaml_event_t) {
+	*event = yaml_event_t{
+		typ: yaml_MAPPING_END_EVENT,
+	}
+}
+
+// Destroy an event object.
+func yaml_event_delete(event *yaml_event_t) {
+	*event = yaml_event_t{}
+}
+
+///*
+// * Create a document object.
+// */
+//
+//YAML_DECLARE(int)
+//yaml_document_initialize(document *yaml_document_t,
+//        version_directive *yaml_version_directive_t,
+//        tag_directives_start *yaml_tag_directive_t,
+//        tag_directives_end *yaml_tag_directive_t,
+//        start_implicit int, end_implicit int)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//    struct {
+//        start *yaml_node_t
+//        end *yaml_node_t
+//        top *yaml_node_t
+//    } nodes = { NULL, NULL, NULL }
+//    version_directive_copy *yaml_version_directive_t = NULL
+//    struct {
+//        start *yaml_tag_directive_t
+//        end *yaml_tag_directive_t
+//        top *yaml_tag_directive_t
+//    } tag_directives_copy = { NULL, NULL, NULL }
+//    value yaml_tag_directive_t = { NULL, NULL }
+//    mark yaml_mark_t = { 0, 0, 0 }
+//
+//    assert(document) // Non-NULL document object is expected.
+//    assert((tag_directives_start && tag_directives_end) ||
+//            (tag_directives_start == tag_directives_end))
+//                            // Valid tag directives are expected.
+//
+//    if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error
+//
+//    if (version_directive) {
+//        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t))
+//        if (!version_directive_copy) goto error
+//        version_directive_copy.major = version_directive.major
+//        version_directive_copy.minor = version_directive.minor
+//    }
+//
+//    if (tag_directives_start != tag_directives_end) {
+//        tag_directive *yaml_tag_directive_t
+//        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
+//            goto error
+//        for (tag_directive = tag_directives_start
+//                tag_directive != tag_directives_end; tag_directive ++) {
+//            assert(tag_directive.handle)
+//            assert(tag_directive.prefix)
+//            if (!yaml_check_utf8(tag_directive.handle,
+//                        strlen((char *)tag_directive.handle)))
+//                goto error
+//            if (!yaml_check_utf8(tag_directive.prefix,
+//                        strlen((char *)tag_directive.prefix)))
+//                goto error
+//            value.handle = yaml_strdup(tag_directive.handle)
+//            value.prefix = yaml_strdup(tag_directive.prefix)
+//            if (!value.handle || !value.prefix) goto error
+//            if (!PUSH(&context, tag_directives_copy, value))
+//                goto error
+//            value.handle = NULL
+//            value.prefix = NULL
+//        }
+//    }
+//
+//    DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy,
+//            tag_directives_copy.start, tag_directives_copy.top,
+//            start_implicit, end_implicit, mark, mark)
+//
+//    return 1
+//
+//error:
+//    STACK_DEL(&context, nodes)
+//    yaml_free(version_directive_copy)
+//    while (!STACK_EMPTY(&context, tag_directives_copy)) {
+//        value yaml_tag_directive_t = POP(&context, tag_directives_copy)
+//        yaml_free(value.handle)
+//        yaml_free(value.prefix)
+//    }
+//    STACK_DEL(&context, tag_directives_copy)
+//    yaml_free(value.handle)
+//    yaml_free(value.prefix)
+//
+//    return 0
+//}
+//
+///*
+// * Destroy a document object.
+// */
+//
+//YAML_DECLARE(void)
+//yaml_document_delete(document *yaml_document_t)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//    tag_directive *yaml_tag_directive_t
+//
+//    context.error = YAML_NO_ERROR // Eliminate a compiler warning.
+//
+//    assert(document) // Non-NULL document object is expected.
+//
+//    while (!STACK_EMPTY(&context, document.nodes)) {
+//        node yaml_node_t = POP(&context, document.nodes)
+//        yaml_free(node.tag)
+//        switch (node.type) {
+//            case YAML_SCALAR_NODE:
+//                yaml_free(node.data.scalar.value)
+//                break
+//            case YAML_SEQUENCE_NODE:
+//                STACK_DEL(&context, node.data.sequence.items)
+//                break
+//            case YAML_MAPPING_NODE:
+//                STACK_DEL(&context, node.data.mapping.pairs)
+//                break
+//            default:
+//                assert(0) // Should not happen.
+//        }
+//    }
+//    STACK_DEL(&context, document.nodes)
+//
+//    yaml_free(document.version_directive)
+//    for (tag_directive = document.tag_directives.start
+//            tag_directive != document.tag_directives.end
+//            tag_directive++) {
+//        yaml_free(tag_directive.handle)
+//        yaml_free(tag_directive.prefix)
+//    }
+//    yaml_free(document.tag_directives.start)
+//
+//    memset(document, 0, sizeof(yaml_document_t))
+//}
+//
+///**
+// * Get a document node.
+// */
+//
+//YAML_DECLARE(yaml_node_t *)
+//yaml_document_get_node(document *yaml_document_t, index int)
+//{
+//    assert(document) // Non-NULL document object is expected.
+//
+//    if (index > 0 && document.nodes.start + index <= document.nodes.top) {
+//        return document.nodes.start + index - 1
+//    }
+//    return NULL
+//}
+//
+///**
+// * Get the root object.
+// */
+//
+//YAML_DECLARE(yaml_node_t *)
+//yaml_document_get_root_node(document *yaml_document_t)
+//{
+//    assert(document) // Non-NULL document object is expected.
+//
+//    if (document.nodes.top != document.nodes.start) {
+//        return document.nodes.start
+//    }
+//    return NULL
+//}
+//
+///*
+// * Add a scalar node to a document.
+// */
+//
+//YAML_DECLARE(int)
+//yaml_document_add_scalar(document *yaml_document_t,
+//        tag *yaml_char_t, value *yaml_char_t, length int,
+//        style yaml_scalar_style_t)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//    mark yaml_mark_t = { 0, 0, 0 }
+//    tag_copy *yaml_char_t = NULL
+//    value_copy *yaml_char_t = NULL
+//    node yaml_node_t
+//
+//    assert(document) // Non-NULL document object is expected.
+//    assert(value) // Non-NULL value is expected.
+//
+//    if (!tag) {
+//        tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG
+//    }
+//
+//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
+//    tag_copy = yaml_strdup(tag)
+//    if (!tag_copy) goto error
+//
+//    if (length < 0) {
+//        length = strlen((char *)value)
+//    }
+//
+//    if (!yaml_check_utf8(value, length)) goto error
+//    value_copy = yaml_malloc(length+1)
+//    if (!value_copy) goto error
+//    memcpy(value_copy, value, length)
+//    value_copy[length] = '\0'
+//
+//    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark)
+//    if (!PUSH(&context, document.nodes, node)) goto error
+//
+//    return document.nodes.top - document.nodes.start
+//
+//error:
+//    yaml_free(tag_copy)
+//    yaml_free(value_copy)
+//
+//    return 0
+//}
+//
+///*
+// * Add a sequence node to a document.
+// */
+//
+//YAML_DECLARE(int)
+//yaml_document_add_sequence(document *yaml_document_t,
+//        tag *yaml_char_t, style yaml_sequence_style_t)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//    mark yaml_mark_t = { 0, 0, 0 }
+//    tag_copy *yaml_char_t = NULL
+//    struct {
+//        start *yaml_node_item_t
+//        end *yaml_node_item_t
+//        top *yaml_node_item_t
+//    } items = { NULL, NULL, NULL }
+//    node yaml_node_t
+//
+//    assert(document) // Non-NULL document object is expected.
+//
+//    if (!tag) {
+//        tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG
+//    }
+//
+//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
+//    tag_copy = yaml_strdup(tag)
+//    if (!tag_copy) goto error
+//
+//    if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error
+//
+//    SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
+//            style, mark, mark)
+//    if (!PUSH(&context, document.nodes, node)) goto error
+//
+//    return document.nodes.top - document.nodes.start
+//
+//error:
+//    STACK_DEL(&context, items)
+//    yaml_free(tag_copy)
+//
+//    return 0
+//}
+//
+///*
+// * Add a mapping node to a document.
+// */
+//
+//YAML_DECLARE(int)
+//yaml_document_add_mapping(document *yaml_document_t,
+//        tag *yaml_char_t, style yaml_mapping_style_t)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//    mark yaml_mark_t = { 0, 0, 0 }
+//    tag_copy *yaml_char_t = NULL
+//    struct {
+//        start *yaml_node_pair_t
+//        end *yaml_node_pair_t
+//        top *yaml_node_pair_t
+//    } pairs = { NULL, NULL, NULL }
+//    node yaml_node_t
+//
+//    assert(document) // Non-NULL document object is expected.
+//
+//    if (!tag) {
+//        tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG
+//    }
+//
+//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
+//    tag_copy = yaml_strdup(tag)
+//    if (!tag_copy) goto error
+//
+//    if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error
+//
+//    MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
+//            style, mark, mark)
+//    if (!PUSH(&context, document.nodes, node)) goto error
+//
+//    return document.nodes.top - document.nodes.start
+//
+//error:
+//    STACK_DEL(&context, pairs)
+//    yaml_free(tag_copy)
+//
+//    return 0
+//}
+//
+///*
+// * Append an item to a sequence node.
+// */
+//
+//YAML_DECLARE(int)
+//yaml_document_append_sequence_item(document *yaml_document_t,
+//        sequence int, item int)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//
+//    assert(document) // Non-NULL document is required.
+//    assert(sequence > 0
+//            && document.nodes.start + sequence <= document.nodes.top)
+//                            // Valid sequence id is required.
+//    assert(document.nodes.start[sequence-1].type == YAML_SEQUENCE_NODE)
+//                            // A sequence node is required.
+//    assert(item > 0 && document.nodes.start + item <= document.nodes.top)
+//                            // Valid item id is required.
+//
+//    if (!PUSH(&context,
+//                document.nodes.start[sequence-1].data.sequence.items, item))
+//        return 0
+//
+//    return 1
+//}
+//
+///*
+// * Append a pair of a key and a value to a mapping node.
+// */
+//
+//YAML_DECLARE(int)
+//yaml_document_append_mapping_pair(document *yaml_document_t,
+//        mapping int, key int, value int)
+//{
+//    struct {
+//        error yaml_error_type_t
+//    } context
+//
+//    pair yaml_node_pair_t
+//
+//    assert(document) // Non-NULL document is required.
+//    assert(mapping > 0
+//            && document.nodes.start + mapping <= document.nodes.top)
+//                            // Valid mapping id is required.
+//    assert(document.nodes.start[mapping-1].type == YAML_MAPPING_NODE)
+//                            // A mapping node is required.
+//    assert(key > 0 && document.nodes.start + key <= document.nodes.top)
+//                            // Valid key id is required.
+//    assert(value > 0 && document.nodes.start + value <= document.nodes.top)
+//                            // Valid value id is required.
+//
+//    pair.key = key
+//    pair.value = value
+//
+//    if (!PUSH(&context,
+//                document.nodes.start[mapping-1].data.mapping.pairs, pair))
+//        return 0
+//
+//    return 1
+//}
+//
+//
diff --git a/vendor/go.yaml.in/yaml/v3/decode.go b/vendor/go.yaml.in/yaml/v3/decode.go
new file mode 100644
index 000000000..02e2b17bf
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/decode.go
@@ -0,0 +1,1018 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package yaml
+
+import (
+	"encoding"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"math"
+	"reflect"
+	"strconv"
+	"time"
+)
+
+// ----------------------------------------------------------------------------
+// Parser, produces a node tree out of a libyaml event stream.
+
+type parser struct {
+	parser   yaml_parser_t
+	event    yaml_event_t
+	doc      *Node
+	anchors  map[string]*Node
+	doneInit bool
+	textless bool
+}
+
+func newParser(b []byte) *parser {
+	p := parser{}
+	if !yaml_parser_initialize(&p.parser) {
+		panic("failed to initialize YAML emitter")
+	}
+	if len(b) == 0 {
+		b = []byte{'\n'}
+	}
+	yaml_parser_set_input_string(&p.parser, b)
+	return &p
+}
+
+func newParserFromReader(r io.Reader) *parser {
+	p := parser{}
+	if !yaml_parser_initialize(&p.parser) {
+		panic("failed to initialize YAML emitter")
+	}
+	yaml_parser_set_input_reader(&p.parser, r)
+	return &p
+}
+
+func (p *parser) init() {
+	if p.doneInit {
+		return
+	}
+	p.anchors = make(map[string]*Node)
+	p.expect(yaml_STREAM_START_EVENT)
+	p.doneInit = true
+}
+
+func (p *parser) destroy() {
+	if p.event.typ != yaml_NO_EVENT {
+		yaml_event_delete(&p.event)
+	}
+	yaml_parser_delete(&p.parser)
+}
+
+// expect consumes an event from the event stream and
+// checks that it's of the expected type.
+func (p *parser) expect(e yaml_event_type_t) {
+	if p.event.typ == yaml_NO_EVENT {
+		if !yaml_parser_parse(&p.parser, &p.event) {
+			p.fail()
+		}
+	}
+	if p.event.typ == yaml_STREAM_END_EVENT {
+		failf("attempted to go past the end of stream; corrupted value?")
+	}
+	if p.event.typ != e {
+		p.parser.problem = fmt.Sprintf("expected %s event but got %s", e, p.event.typ)
+		p.fail()
+	}
+	yaml_event_delete(&p.event)
+	p.event.typ = yaml_NO_EVENT
+}
+
+// peek peeks at the next event in the event stream,
+// puts the results into p.event and returns the event type.
+func (p *parser) peek() yaml_event_type_t {
+	if p.event.typ != yaml_NO_EVENT {
+		return p.event.typ
+	}
+	// It's curious choice from the underlying API to generally return a
+	// positive result on success, but on this case return true in an error
+	// scenario. This was the source of bugs in the past (issue #666).
+	if !yaml_parser_parse(&p.parser, &p.event) || p.parser.error != yaml_NO_ERROR {
+		p.fail()
+	}
+	return p.event.typ
+}
+
+func (p *parser) fail() {
+	var where string
+	var line int
+	if p.parser.context_mark.line != 0 {
+		line = p.parser.context_mark.line
+		// Scanner errors don't iterate line before returning error
+		if p.parser.error == yaml_SCANNER_ERROR {
+			line++
+		}
+	} else if p.parser.problem_mark.line != 0 {
+		line = p.parser.problem_mark.line
+		// Scanner errors don't iterate line before returning error
+		if p.parser.error == yaml_SCANNER_ERROR {
+			line++
+		}
+	}
+	if line != 0 {
+		where = "line " + strconv.Itoa(line) + ": "
+	}
+	var msg string
+	if len(p.parser.problem) > 0 {
+		msg = p.parser.problem
+	} else {
+		msg = "unknown problem parsing YAML content"
+	}
+	failf("%s%s", where, msg)
+}
+
+func (p *parser) anchor(n *Node, anchor []byte) {
+	if anchor != nil {
+		n.Anchor = string(anchor)
+		p.anchors[n.Anchor] = n
+	}
+}
+
+func (p *parser) parse() *Node {
+	p.init()
+	switch p.peek() {
+	case yaml_SCALAR_EVENT:
+		return p.scalar()
+	case yaml_ALIAS_EVENT:
+		return p.alias()
+	case yaml_MAPPING_START_EVENT:
+		return p.mapping()
+	case yaml_SEQUENCE_START_EVENT:
+		return p.sequence()
+	case yaml_DOCUMENT_START_EVENT:
+		return p.document()
+	case yaml_STREAM_END_EVENT:
+		// Happens when attempting to decode an empty buffer.
+		return nil
+	case yaml_TAIL_COMMENT_EVENT:
+		panic("internal error: unexpected tail comment event (please report)")
+	default:
+		panic("internal error: attempted to parse unknown event (please report): " + p.event.typ.String())
+	}
+}
+
+func (p *parser) node(kind Kind, defaultTag, tag, value string) *Node {
+	var style Style
+	if tag != "" && tag != "!" {
+		tag = shortTag(tag)
+		style = TaggedStyle
+	} else if defaultTag != "" {
+		tag = defaultTag
+	} else if kind == ScalarNode {
+		tag, _ = resolve("", value)
+	}
+	n := &Node{
+		Kind:  kind,
+		Tag:   tag,
+		Value: value,
+		Style: style,
+	}
+	if !p.textless {
+		n.Line = p.event.start_mark.line + 1
+		n.Column = p.event.start_mark.column + 1
+		n.HeadComment = string(p.event.head_comment)
+		n.LineComment = string(p.event.line_comment)
+		n.FootComment = string(p.event.foot_comment)
+	}
+	return n
+}
+
+func (p *parser) parseChild(parent *Node) *Node {
+	child := p.parse()
+	parent.Content = append(parent.Content, child)
+	return child
+}
+
+func (p *parser) document() *Node {
+	n := p.node(DocumentNode, "", "", "")
+	p.doc = n
+	p.expect(yaml_DOCUMENT_START_EVENT)
+	p.parseChild(n)
+	if p.peek() == yaml_DOCUMENT_END_EVENT {
+		n.FootComment = string(p.event.foot_comment)
+	}
+	p.expect(yaml_DOCUMENT_END_EVENT)
+	return n
+}
+
+func (p *parser) alias() *Node {
+	n := p.node(AliasNode, "", "", string(p.event.anchor))
+	n.Alias = p.anchors[n.Value]
+	if n.Alias == nil {
+		failf("unknown anchor '%s' referenced", n.Value)
+	}
+	p.expect(yaml_ALIAS_EVENT)
+	return n
+}
+
+func (p *parser) scalar() *Node {
+	var parsedStyle = p.event.scalar_style()
+	var nodeStyle Style
+	switch {
+	case parsedStyle&yaml_DOUBLE_QUOTED_SCALAR_STYLE != 0:
+		nodeStyle = DoubleQuotedStyle
+	case parsedStyle&yaml_SINGLE_QUOTED_SCALAR_STYLE != 0:
+		nodeStyle = SingleQuotedStyle
+	case parsedStyle&yaml_LITERAL_SCALAR_STYLE != 0:
+		nodeStyle = LiteralStyle
+	case parsedStyle&yaml_FOLDED_SCALAR_STYLE != 0:
+		nodeStyle = FoldedStyle
+	}
+	var nodeValue = string(p.event.value)
+	var nodeTag = string(p.event.tag)
+	var defaultTag string
+	if nodeStyle == 0 {
+		if nodeValue == "<<" {
+			defaultTag = mergeTag
+		}
+	} else {
+		defaultTag = strTag
+	}
+	n := p.node(ScalarNode, defaultTag, nodeTag, nodeValue)
+	n.Style |= nodeStyle
+	p.anchor(n, p.event.anchor)
+	p.expect(yaml_SCALAR_EVENT)
+	return n
+}
+
+func (p *parser) sequence() *Node {
+	n := p.node(SequenceNode, seqTag, string(p.event.tag), "")
+	if p.event.sequence_style()&yaml_FLOW_SEQUENCE_STYLE != 0 {
+		n.Style |= FlowStyle
+	}
+	p.anchor(n, p.event.anchor)
+	p.expect(yaml_SEQUENCE_START_EVENT)
+	for p.peek() != yaml_SEQUENCE_END_EVENT {
+		p.parseChild(n)
+	}
+	n.LineComment = string(p.event.line_comment)
+	n.FootComment = string(p.event.foot_comment)
+	p.expect(yaml_SEQUENCE_END_EVENT)
+	return n
+}
+
+func (p *parser) mapping() *Node {
+	n := p.node(MappingNode, mapTag, string(p.event.tag), "")
+	block := true
+	if p.event.mapping_style()&yaml_FLOW_MAPPING_STYLE != 0 {
+		block = false
+		n.Style |= FlowStyle
+	}
+	p.anchor(n, p.event.anchor)
+	p.expect(yaml_MAPPING_START_EVENT)
+	for p.peek() != yaml_MAPPING_END_EVENT {
+		k := p.parseChild(n)
+		if block && k.FootComment != "" {
+			// Must be a foot comment for the prior value when being dedented.
+			if len(n.Content) > 2 {
+				n.Content[len(n.Content)-3].FootComment = k.FootComment
+				k.FootComment = ""
+			}
+		}
+		v := p.parseChild(n)
+		if k.FootComment == "" && v.FootComment != "" {
+			k.FootComment = v.FootComment
+			v.FootComment = ""
+		}
+		if p.peek() == yaml_TAIL_COMMENT_EVENT {
+			if k.FootComment == "" {
+				k.FootComment = string(p.event.foot_comment)
+			}
+			p.expect(yaml_TAIL_COMMENT_EVENT)
+		}
+	}
+	n.LineComment = string(p.event.line_comment)
+	n.FootComment = string(p.event.foot_comment)
+	if n.Style&FlowStyle == 0 && n.FootComment != "" && len(n.Content) > 1 {
+		n.Content[len(n.Content)-2].FootComment = n.FootComment
+		n.FootComment = ""
+	}
+	p.expect(yaml_MAPPING_END_EVENT)
+	return n
+}
+
+// ----------------------------------------------------------------------------
+// Decoder, unmarshals a node into a provided value.
+
+type decoder struct {
+	doc     *Node
+	aliases map[*Node]bool
+	terrors []string
+
+	stringMapType  reflect.Type
+	generalMapType reflect.Type
+
+	knownFields bool
+	uniqueKeys  bool
+	decodeCount int
+	aliasCount  int
+	aliasDepth  int
+
+	mergedFields map[interface{}]bool
+}
+
+var (
+	nodeType       = reflect.TypeOf(Node{})
+	durationType   = reflect.TypeOf(time.Duration(0))
+	stringMapType  = reflect.TypeOf(map[string]interface{}{})
+	generalMapType = reflect.TypeOf(map[interface{}]interface{}{})
+	ifaceType      = generalMapType.Elem()
+	timeType       = reflect.TypeOf(time.Time{})
+	ptrTimeType    = reflect.TypeOf(&time.Time{})
+)
+
+func newDecoder() *decoder {
+	d := &decoder{
+		stringMapType:  stringMapType,
+		generalMapType: generalMapType,
+		uniqueKeys:     true,
+	}
+	d.aliases = make(map[*Node]bool)
+	return d
+}
+
+func (d *decoder) terror(n *Node, tag string, out reflect.Value) {
+	if n.Tag != "" {
+		tag = n.Tag
+	}
+	value := n.Value
+	if tag != seqTag && tag != mapTag {
+		if len(value) > 10 {
+			value = " `" + value[:7] + "...`"
+		} else {
+			value = " `" + value + "`"
+		}
+	}
+	d.terrors = append(d.terrors, fmt.Sprintf("line %d: cannot unmarshal %s%s into %s", n.Line, shortTag(tag), value, out.Type()))
+}
+
+func (d *decoder) callUnmarshaler(n *Node, u Unmarshaler) (good bool) {
+	err := u.UnmarshalYAML(n)
+	if e, ok := err.(*TypeError); ok {
+		d.terrors = append(d.terrors, e.Errors...)
+		return false
+	}
+	if err != nil {
+		fail(err)
+	}
+	return true
+}
+
+func (d *decoder) callObsoleteUnmarshaler(n *Node, u obsoleteUnmarshaler) (good bool) {
+	terrlen := len(d.terrors)
+	err := u.UnmarshalYAML(func(v interface{}) (err error) {
+		defer handleErr(&err)
+		d.unmarshal(n, reflect.ValueOf(v))
+		if len(d.terrors) > terrlen {
+			issues := d.terrors[terrlen:]
+			d.terrors = d.terrors[:terrlen]
+			return &TypeError{issues}
+		}
+		return nil
+	})
+	if e, ok := err.(*TypeError); ok {
+		d.terrors = append(d.terrors, e.Errors...)
+		return false
+	}
+	if err != nil {
+		fail(err)
+	}
+	return true
+}
+
+// d.prepare initializes and dereferences pointers and calls UnmarshalYAML
+// if a value is found to implement it.
+// It returns the initialized and dereferenced out value, whether
+// unmarshalling was already done by UnmarshalYAML, and if so whether
+// its types unmarshalled appropriately.
+//
+// If n holds a null value, prepare returns before doing anything.
+func (d *decoder) prepare(n *Node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) {
+	if n.ShortTag() == nullTag {
+		return out, false, false
+	}
+	again := true
+	for again {
+		again = false
+		if out.Kind() == reflect.Ptr {
+			if out.IsNil() {
+				out.Set(reflect.New(out.Type().Elem()))
+			}
+			out = out.Elem()
+			again = true
+		}
+		if out.CanAddr() {
+			outi := out.Addr().Interface()
+			if u, ok := outi.(Unmarshaler); ok {
+				good = d.callUnmarshaler(n, u)
+				return out, true, good
+			}
+			if u, ok := outi.(obsoleteUnmarshaler); ok {
+				good = d.callObsoleteUnmarshaler(n, u)
+				return out, true, good
+			}
+		}
+	}
+	return out, false, false
+}
+
+func (d *decoder) fieldByIndex(n *Node, v reflect.Value, index []int) (field reflect.Value) {
+	if n.ShortTag() == nullTag {
+		return reflect.Value{}
+	}
+	for _, num := range index {
+		for {
+			if v.Kind() == reflect.Ptr {
+				if v.IsNil() {
+					v.Set(reflect.New(v.Type().Elem()))
+				}
+				v = v.Elem()
+				continue
+			}
+			break
+		}
+		v = v.Field(num)
+	}
+	return v
+}
+
+const (
+	// 400,000 decode operations is ~500kb of dense object declarations, or
+	// ~5kb of dense object declarations with 10000% alias expansion
+	alias_ratio_range_low = 400000
+
+	// 4,000,000 decode operations is ~5MB of dense object declarations, or
+	// ~4.5MB of dense object declarations with 10% alias expansion
+	alias_ratio_range_high = 4000000
+
+	// alias_ratio_range is the range over which we scale allowed alias ratios
+	alias_ratio_range = float64(alias_ratio_range_high - alias_ratio_range_low)
+)
+
+func allowedAliasRatio(decodeCount int) float64 {
+	switch {
+	case decodeCount <= alias_ratio_range_low:
+		// allow 99% to come from alias expansion for small-to-medium documents
+		return 0.99
+	case decodeCount >= alias_ratio_range_high:
+		// allow 10% to come from alias expansion for very large documents
+		return 0.10
+	default:
+		// scale smoothly from 99% down to 10% over the range.
+		// this maps to 396,000 - 400,000 allowed alias-driven decodes over the range.
+		// 400,000 decode operations is ~100MB of allocations in worst-case scenarios (single-item maps).
+		return 0.99 - 0.89*(float64(decodeCount-alias_ratio_range_low)/alias_ratio_range)
+	}
+}
+
+func (d *decoder) unmarshal(n *Node, out reflect.Value) (good bool) {
+	d.decodeCount++
+	if d.aliasDepth > 0 {
+		d.aliasCount++
+	}
+	if d.aliasCount > 100 && d.decodeCount > 1000 && float64(d.aliasCount)/float64(d.decodeCount) > allowedAliasRatio(d.decodeCount) {
+		failf("document contains excessive aliasing")
+	}
+	if out.Type() == nodeType {
+		out.Set(reflect.ValueOf(n).Elem())
+		return true
+	}
+	switch n.Kind {
+	case DocumentNode:
+		return d.document(n, out)
+	case AliasNode:
+		return d.alias(n, out)
+	}
+	out, unmarshaled, good := d.prepare(n, out)
+	if unmarshaled {
+		return good
+	}
+	switch n.Kind {
+	case ScalarNode:
+		good = d.scalar(n, out)
+	case MappingNode:
+		good = d.mapping(n, out)
+	case SequenceNode:
+		good = d.sequence(n, out)
+	case 0:
+		if n.IsZero() {
+			return d.null(out)
+		}
+		fallthrough
+	default:
+		failf("cannot decode node with unknown kind %d", n.Kind)
+	}
+	return good
+}
+
+func (d *decoder) document(n *Node, out reflect.Value) (good bool) {
+	if len(n.Content) == 1 {
+		d.doc = n
+		d.unmarshal(n.Content[0], out)
+		return true
+	}
+	return false
+}
+
+func (d *decoder) alias(n *Node, out reflect.Value) (good bool) {
+	if d.aliases[n] {
+		// TODO this could actually be allowed in some circumstances.
+		failf("anchor '%s' value contains itself", n.Value)
+	}
+	d.aliases[n] = true
+	d.aliasDepth++
+	good = d.unmarshal(n.Alias, out)
+	d.aliasDepth--
+	delete(d.aliases, n)
+	return good
+}
+
+var zeroValue reflect.Value
+
+func resetMap(out reflect.Value) {
+	for _, k := range out.MapKeys() {
+		out.SetMapIndex(k, zeroValue)
+	}
+}
+
+func (d *decoder) null(out reflect.Value) bool {
+	if out.CanAddr() {
+		switch out.Kind() {
+		case reflect.Interface, reflect.Ptr, reflect.Map, reflect.Slice:
+			out.Set(reflect.Zero(out.Type()))
+			return true
+		}
+	}
+	return false
+}
+
+func (d *decoder) scalar(n *Node, out reflect.Value) bool {
+	var tag string
+	var resolved interface{}
+	if n.indicatedString() {
+		tag = strTag
+		resolved = n.Value
+	} else {
+		tag, resolved = resolve(n.Tag, n.Value)
+		if tag == binaryTag {
+			data, err := base64.StdEncoding.DecodeString(resolved.(string))
+			if err != nil {
+				failf("!!binary value contains invalid base64 data")
+			}
+			resolved = string(data)
+		}
+	}
+	if resolved == nil {
+		return d.null(out)
+	}
+	if resolvedv := reflect.ValueOf(resolved); out.Type() == resolvedv.Type() {
+		// We've resolved to exactly the type we want, so use that.
+		out.Set(resolvedv)
+		return true
+	}
+	// Perhaps we can use the value as a TextUnmarshaler to
+	// set its value.
+	if out.CanAddr() {
+		u, ok := out.Addr().Interface().(encoding.TextUnmarshaler)
+		if ok {
+			var text []byte
+			if tag == binaryTag {
+				text = []byte(resolved.(string))
+			} else {
+				// We let any value be unmarshaled into TextUnmarshaler.
+				// That might be more lax than we'd like, but the
+				// TextUnmarshaler itself should bowl out any dubious values.
+				text = []byte(n.Value)
+			}
+			err := u.UnmarshalText(text)
+			if err != nil {
+				fail(err)
+			}
+			return true
+		}
+	}
+	switch out.Kind() {
+	case reflect.String:
+		if tag == binaryTag {
+			out.SetString(resolved.(string))
+			return true
+		}
+		out.SetString(n.Value)
+		return true
+	case reflect.Interface:
+		out.Set(reflect.ValueOf(resolved))
+		return true
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		// This used to work in v2, but it's very unfriendly.
+		isDuration := out.Type() == durationType
+
+		switch resolved := resolved.(type) {
+		case int:
+			if !isDuration && !out.OverflowInt(int64(resolved)) {
+				out.SetInt(int64(resolved))
+				return true
+			}
+		case int64:
+			if !isDuration && !out.OverflowInt(resolved) {
+				out.SetInt(resolved)
+				return true
+			}
+		case uint64:
+			if !isDuration && resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
+				out.SetInt(int64(resolved))
+				return true
+			}
+		case float64:
+			if !isDuration && resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
+				out.SetInt(int64(resolved))
+				return true
+			}
+		case string:
+			if out.Type() == durationType {
+				d, err := time.ParseDuration(resolved)
+				if err == nil {
+					out.SetInt(int64(d))
+					return true
+				}
+			}
+		}
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		switch resolved := resolved.(type) {
+		case int:
+			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
+				out.SetUint(uint64(resolved))
+				return true
+			}
+		case int64:
+			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
+				out.SetUint(uint64(resolved))
+				return true
+			}
+		case uint64:
+			if !out.OverflowUint(uint64(resolved)) {
+				out.SetUint(uint64(resolved))
+				return true
+			}
+		case float64:
+			if resolved <= math.MaxUint64 && !out.OverflowUint(uint64(resolved)) {
+				out.SetUint(uint64(resolved))
+				return true
+			}
+		}
+	case reflect.Bool:
+		switch resolved := resolved.(type) {
+		case bool:
+			out.SetBool(resolved)
+			return true
+		case string:
+			// This offers some compatibility with the 1.1 spec (https://yaml.org/type/bool.html).
+			// It only works if explicitly attempting to unmarshal into a typed bool value.
+			switch resolved {
+			case "y", "Y", "yes", "Yes", "YES", "on", "On", "ON":
+				out.SetBool(true)
+				return true
+			case "n", "N", "no", "No", "NO", "off", "Off", "OFF":
+				out.SetBool(false)
+				return true
+			}
+		}
+	case reflect.Float32, reflect.Float64:
+		switch resolved := resolved.(type) {
+		case int:
+			out.SetFloat(float64(resolved))
+			return true
+		case int64:
+			out.SetFloat(float64(resolved))
+			return true
+		case uint64:
+			out.SetFloat(float64(resolved))
+			return true
+		case float64:
+			out.SetFloat(resolved)
+			return true
+		}
+	case reflect.Struct:
+		if resolvedv := reflect.ValueOf(resolved); out.Type() == resolvedv.Type() {
+			out.Set(resolvedv)
+			return true
+		}
+	case reflect.Ptr:
+		panic("yaml internal error: please report the issue")
+	}
+	d.terror(n, tag, out)
+	return false
+}
+
+func settableValueOf(i interface{}) reflect.Value {
+	v := reflect.ValueOf(i)
+	sv := reflect.New(v.Type()).Elem()
+	sv.Set(v)
+	return sv
+}
+
+func (d *decoder) sequence(n *Node, out reflect.Value) (good bool) {
+	l := len(n.Content)
+
+	var iface reflect.Value
+	switch out.Kind() {
+	case reflect.Slice:
+		out.Set(reflect.MakeSlice(out.Type(), l, l))
+	case reflect.Array:
+		if l != out.Len() {
+			failf("invalid array: want %d elements but got %d", out.Len(), l)
+		}
+	case reflect.Interface:
+		// No type hints. Will have to use a generic sequence.
+		iface = out
+		out = settableValueOf(make([]interface{}, l))
+	default:
+		d.terror(n, seqTag, out)
+		return false
+	}
+	et := out.Type().Elem()
+
+	j := 0
+	for i := 0; i < l; i++ {
+		e := reflect.New(et).Elem()
+		if ok := d.unmarshal(n.Content[i], e); ok {
+			out.Index(j).Set(e)
+			j++
+		}
+	}
+	if out.Kind() != reflect.Array {
+		out.Set(out.Slice(0, j))
+	}
+	if iface.IsValid() {
+		iface.Set(out)
+	}
+	return true
+}
+
+func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) {
+	l := len(n.Content)
+	if d.uniqueKeys {
+		nerrs := len(d.terrors)
+		for i := 0; i < l; i += 2 {
+			ni := n.Content[i]
+			for j := i + 2; j < l; j += 2 {
+				nj := n.Content[j]
+				if ni.Kind == nj.Kind && ni.Value == nj.Value {
+					d.terrors = append(d.terrors, fmt.Sprintf("line %d: mapping key %#v already defined at line %d", nj.Line, nj.Value, ni.Line))
+				}
+			}
+		}
+		if len(d.terrors) > nerrs {
+			return false
+		}
+	}
+	switch out.Kind() {
+	case reflect.Struct:
+		return d.mappingStruct(n, out)
+	case reflect.Map:
+		// okay
+	case reflect.Interface:
+		iface := out
+		if isStringMap(n) {
+			out = reflect.MakeMap(d.stringMapType)
+		} else {
+			out = reflect.MakeMap(d.generalMapType)
+		}
+		iface.Set(out)
+	default:
+		d.terror(n, mapTag, out)
+		return false
+	}
+
+	outt := out.Type()
+	kt := outt.Key()
+	et := outt.Elem()
+
+	stringMapType := d.stringMapType
+	generalMapType := d.generalMapType
+	if outt.Elem() == ifaceType {
+		if outt.Key().Kind() == reflect.String {
+			d.stringMapType = outt
+		} else if outt.Key() == ifaceType {
+			d.generalMapType = outt
+		}
+	}
+
+	mergedFields := d.mergedFields
+	d.mergedFields = nil
+
+	var mergeNode *Node
+
+	mapIsNew := false
+	if out.IsNil() {
+		out.Set(reflect.MakeMap(outt))
+		mapIsNew = true
+	}
+	for i := 0; i < l; i += 2 {
+		if isMerge(n.Content[i]) {
+			mergeNode = n.Content[i+1]
+			continue
+		}
+		k := reflect.New(kt).Elem()
+		if d.unmarshal(n.Content[i], k) {
+			if mergedFields != nil {
+				ki := k.Interface()
+				if d.getPossiblyUnhashableKey(mergedFields, ki) {
+					continue
+				}
+				d.setPossiblyUnhashableKey(mergedFields, ki, true)
+			}
+			kkind := k.Kind()
+			if kkind == reflect.Interface {
+				kkind = k.Elem().Kind()
+			}
+			if kkind == reflect.Map || kkind == reflect.Slice {
+				failf("invalid map key: %#v", k.Interface())
+			}
+			e := reflect.New(et).Elem()
+			if d.unmarshal(n.Content[i+1], e) || n.Content[i+1].ShortTag() == nullTag && (mapIsNew || !out.MapIndex(k).IsValid()) {
+				out.SetMapIndex(k, e)
+			}
+		}
+	}
+
+	d.mergedFields = mergedFields
+	if mergeNode != nil {
+		d.merge(n, mergeNode, out)
+	}
+
+	d.stringMapType = stringMapType
+	d.generalMapType = generalMapType
+	return true
+}
+
+func isStringMap(n *Node) bool {
+	if n.Kind != MappingNode {
+		return false
+	}
+	l := len(n.Content)
+	for i := 0; i < l; i += 2 {
+		shortTag := n.Content[i].ShortTag()
+		if shortTag != strTag && shortTag != mergeTag {
+			return false
+		}
+	}
+	return true
+}
+
+func (d *decoder) mappingStruct(n *Node, out reflect.Value) (good bool) {
+	sinfo, err := getStructInfo(out.Type())
+	if err != nil {
+		panic(err)
+	}
+
+	var inlineMap reflect.Value
+	var elemType reflect.Type
+	if sinfo.InlineMap != -1 {
+		inlineMap = out.Field(sinfo.InlineMap)
+		elemType = inlineMap.Type().Elem()
+	}
+
+	for _, index := range sinfo.InlineUnmarshalers {
+		field := d.fieldByIndex(n, out, index)
+		d.prepare(n, field)
+	}
+
+	mergedFields := d.mergedFields
+	d.mergedFields = nil
+	var mergeNode *Node
+	var doneFields []bool
+	if d.uniqueKeys {
+		doneFields = make([]bool, len(sinfo.FieldsList))
+	}
+	name := settableValueOf("")
+	l := len(n.Content)
+	for i := 0; i < l; i += 2 {
+		ni := n.Content[i]
+		if isMerge(ni) {
+			mergeNode = n.Content[i+1]
+			continue
+		}
+		if !d.unmarshal(ni, name) {
+			continue
+		}
+		sname := name.String()
+		if mergedFields != nil {
+			if mergedFields[sname] {
+				continue
+			}
+			mergedFields[sname] = true
+		}
+		if info, ok := sinfo.FieldsMap[sname]; ok {
+			if d.uniqueKeys {
+				if doneFields[info.Id] {
+					d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s already set in type %s", ni.Line, name.String(), out.Type()))
+					continue
+				}
+				doneFields[info.Id] = true
+			}
+			var field reflect.Value
+			if info.Inline == nil {
+				field = out.Field(info.Num)
+			} else {
+				field = d.fieldByIndex(n, out, info.Inline)
+			}
+			d.unmarshal(n.Content[i+1], field)
+		} else if sinfo.InlineMap != -1 {
+			if inlineMap.IsNil() {
+				inlineMap.Set(reflect.MakeMap(inlineMap.Type()))
+			}
+			value := reflect.New(elemType).Elem()
+			d.unmarshal(n.Content[i+1], value)
+			inlineMap.SetMapIndex(name, value)
+		} else if d.knownFields {
+			d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in type %s", ni.Line, name.String(), out.Type()))
+		}
+	}
+
+	d.mergedFields = mergedFields
+	if mergeNode != nil {
+		d.merge(n, mergeNode, out)
+	}
+	return true
+}
+
+func failWantMap() {
+	failf("map merge requires map or sequence of maps as the value")
+}
+
+func (d *decoder) setPossiblyUnhashableKey(m map[interface{}]bool, key interface{}, value bool) {
+	defer func() {
+		if err := recover(); err != nil {
+			failf("%v", err)
+		}
+	}()
+	m[key] = value
+}
+
+func (d *decoder) getPossiblyUnhashableKey(m map[interface{}]bool, key interface{}) bool {
+	defer func() {
+		if err := recover(); err != nil {
+			failf("%v", err)
+		}
+	}()
+	return m[key]
+}
+
+func (d *decoder) merge(parent *Node, merge *Node, out reflect.Value) {
+	mergedFields := d.mergedFields
+	if mergedFields == nil {
+		d.mergedFields = make(map[interface{}]bool)
+		for i := 0; i < len(parent.Content); i += 2 {
+			k := reflect.New(ifaceType).Elem()
+			if d.unmarshal(parent.Content[i], k) {
+				d.setPossiblyUnhashableKey(d.mergedFields, k.Interface(), true)
+			}
+		}
+	}
+
+	switch merge.Kind {
+	case MappingNode:
+		d.unmarshal(merge, out)
+	case AliasNode:
+		if merge.Alias != nil && merge.Alias.Kind != MappingNode {
+			failWantMap()
+		}
+		d.unmarshal(merge, out)
+	case SequenceNode:
+		for i := 0; i < len(merge.Content); i++ {
+			ni := merge.Content[i]
+			if ni.Kind == AliasNode {
+				if ni.Alias != nil && ni.Alias.Kind != MappingNode {
+					failWantMap()
+				}
+			} else if ni.Kind != MappingNode {
+				failWantMap()
+			}
+			d.unmarshal(ni, out)
+		}
+	default:
+		failWantMap()
+	}
+
+	d.mergedFields = mergedFields
+}
+
+func isMerge(n *Node) bool {
+	return n.Kind == ScalarNode && n.Value == "<<" && (n.Tag == "" || n.Tag == "!" || shortTag(n.Tag) == mergeTag)
+}
diff --git a/vendor/go.yaml.in/yaml/v3/emitterc.go b/vendor/go.yaml.in/yaml/v3/emitterc.go
new file mode 100644
index 000000000..ab4e03ba7
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/emitterc.go
@@ -0,0 +1,2054 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+import (
+	"bytes"
+	"fmt"
+)
+
+// Flush the buffer if needed.
+func flush(emitter *yaml_emitter_t) bool {
+	if emitter.buffer_pos+5 >= len(emitter.buffer) {
+		return yaml_emitter_flush(emitter)
+	}
+	return true
+}
+
+// Put a character to the output buffer.
+func put(emitter *yaml_emitter_t, value byte) bool {
+	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
+		return false
+	}
+	emitter.buffer[emitter.buffer_pos] = value
+	emitter.buffer_pos++
+	emitter.column++
+	return true
+}
+
+// Put a line break to the output buffer.
+func put_break(emitter *yaml_emitter_t) bool {
+	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
+		return false
+	}
+	switch emitter.line_break {
+	case yaml_CR_BREAK:
+		emitter.buffer[emitter.buffer_pos] = '\r'
+		emitter.buffer_pos += 1
+	case yaml_LN_BREAK:
+		emitter.buffer[emitter.buffer_pos] = '\n'
+		emitter.buffer_pos += 1
+	case yaml_CRLN_BREAK:
+		emitter.buffer[emitter.buffer_pos+0] = '\r'
+		emitter.buffer[emitter.buffer_pos+1] = '\n'
+		emitter.buffer_pos += 2
+	default:
+		panic("unknown line break setting")
+	}
+	if emitter.column == 0 {
+		emitter.space_above = true
+	}
+	emitter.column = 0
+	emitter.line++
+	// [Go] Do this here and below and drop from everywhere else (see commented lines).
+	emitter.indention = true
+	return true
+}
+
+// Copy a character from a string into buffer.
+func write(emitter *yaml_emitter_t, s []byte, i *int) bool {
+	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
+		return false
+	}
+	p := emitter.buffer_pos
+	w := width(s[*i])
+	switch w {
+	case 4:
+		emitter.buffer[p+3] = s[*i+3]
+		fallthrough
+	case 3:
+		emitter.buffer[p+2] = s[*i+2]
+		fallthrough
+	case 2:
+		emitter.buffer[p+1] = s[*i+1]
+		fallthrough
+	case 1:
+		emitter.buffer[p+0] = s[*i+0]
+	default:
+		panic("unknown character width")
+	}
+	emitter.column++
+	emitter.buffer_pos += w
+	*i += w
+	return true
+}
+
+// Write a whole string into buffer.
+func write_all(emitter *yaml_emitter_t, s []byte) bool {
+	for i := 0; i < len(s); {
+		if !write(emitter, s, &i) {
+			return false
+		}
+	}
+	return true
+}
+
+// Copy a line break character from a string into buffer.
+func write_break(emitter *yaml_emitter_t, s []byte, i *int) bool {
+	if s[*i] == '\n' {
+		if !put_break(emitter) {
+			return false
+		}
+		*i++
+	} else {
+		if !write(emitter, s, i) {
+			return false
+		}
+		if emitter.column == 0 {
+			emitter.space_above = true
+		}
+		emitter.column = 0
+		emitter.line++
+		// [Go] Do this here and above and drop from everywhere else (see commented lines).
+		emitter.indention = true
+	}
+	return true
+}
+
+// Set an emitter error and return false.
+func yaml_emitter_set_emitter_error(emitter *yaml_emitter_t, problem string) bool {
+	emitter.error = yaml_EMITTER_ERROR
+	emitter.problem = problem
+	return false
+}
+
+// Emit an event.
+func yaml_emitter_emit(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	emitter.events = append(emitter.events, *event)
+	for !yaml_emitter_need_more_events(emitter) {
+		event := &emitter.events[emitter.events_head]
+		if !yaml_emitter_analyze_event(emitter, event) {
+			return false
+		}
+		if !yaml_emitter_state_machine(emitter, event) {
+			return false
+		}
+		yaml_event_delete(event)
+		emitter.events_head++
+	}
+	return true
+}
+
+// Check if we need to accumulate more events before emitting.
+//
+// We accumulate extra
+//   - 1 event for DOCUMENT-START
+//   - 2 events for SEQUENCE-START
+//   - 3 events for MAPPING-START
+func yaml_emitter_need_more_events(emitter *yaml_emitter_t) bool {
+	if emitter.events_head == len(emitter.events) {
+		return true
+	}
+	var accumulate int
+	switch emitter.events[emitter.events_head].typ {
+	case yaml_DOCUMENT_START_EVENT:
+		accumulate = 1
+		break
+	case yaml_SEQUENCE_START_EVENT:
+		accumulate = 2
+		break
+	case yaml_MAPPING_START_EVENT:
+		accumulate = 3
+		break
+	default:
+		return false
+	}
+	if len(emitter.events)-emitter.events_head > accumulate {
+		return false
+	}
+	var level int
+	for i := emitter.events_head; i < len(emitter.events); i++ {
+		switch emitter.events[i].typ {
+		case yaml_STREAM_START_EVENT, yaml_DOCUMENT_START_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT:
+			level++
+		case yaml_STREAM_END_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_END_EVENT, yaml_MAPPING_END_EVENT:
+			level--
+		}
+		if level == 0 {
+			return false
+		}
+	}
+	return true
+}
+
+// Append a directive to the directives stack.
+func yaml_emitter_append_tag_directive(emitter *yaml_emitter_t, value *yaml_tag_directive_t, allow_duplicates bool) bool {
+	for i := 0; i < len(emitter.tag_directives); i++ {
+		if bytes.Equal(value.handle, emitter.tag_directives[i].handle) {
+			if allow_duplicates {
+				return true
+			}
+			return yaml_emitter_set_emitter_error(emitter, "duplicate %TAG directive")
+		}
+	}
+
+	// [Go] Do we actually need to copy this given garbage collection
+	// and the lack of deallocating destructors?
+	tag_copy := yaml_tag_directive_t{
+		handle: make([]byte, len(value.handle)),
+		prefix: make([]byte, len(value.prefix)),
+	}
+	copy(tag_copy.handle, value.handle)
+	copy(tag_copy.prefix, value.prefix)
+	emitter.tag_directives = append(emitter.tag_directives, tag_copy)
+	return true
+}
+
+// Increase the indentation level.
+func yaml_emitter_increase_indent_compact(emitter *yaml_emitter_t, flow, indentless bool, compact_seq bool) bool {
+	emitter.indents = append(emitter.indents, emitter.indent)
+	if emitter.indent < 0 {
+		if flow {
+			emitter.indent = emitter.best_indent
+		} else {
+			emitter.indent = 0
+		}
+	} else if !indentless {
+		// [Go] This was changed so that indentations are more regular.
+		if emitter.states[len(emitter.states)-1] == yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE {
+			// The first indent inside a sequence will just skip the "- " indicator.
+			emitter.indent += 2
+		} else {
+			// Everything else aligns to the chosen indentation.
+			emitter.indent = emitter.best_indent * ((emitter.indent + emitter.best_indent) / emitter.best_indent)
+			if compact_seq {
+				// The value compact_seq passed in is almost always set to `false` when this function is called,
+				// except when we are dealing with sequence nodes. So this gets triggered to subtract 2 only when we
+				// are increasing the indent to account for sequence nodes, which will be correct because we need to
+				// subtract 2 to account for the - at the beginning of the sequence node.
+				emitter.indent = emitter.indent - 2
+			}
+		}
+	}
+	return true
+}
+
+// State dispatcher.
+func yaml_emitter_state_machine(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	switch emitter.state {
+	default:
+	case yaml_EMIT_STREAM_START_STATE:
+		return yaml_emitter_emit_stream_start(emitter, event)
+
+	case yaml_EMIT_FIRST_DOCUMENT_START_STATE:
+		return yaml_emitter_emit_document_start(emitter, event, true)
+
+	case yaml_EMIT_DOCUMENT_START_STATE:
+		return yaml_emitter_emit_document_start(emitter, event, false)
+
+	case yaml_EMIT_DOCUMENT_CONTENT_STATE:
+		return yaml_emitter_emit_document_content(emitter, event)
+
+	case yaml_EMIT_DOCUMENT_END_STATE:
+		return yaml_emitter_emit_document_end(emitter, event)
+
+	case yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE:
+		return yaml_emitter_emit_flow_sequence_item(emitter, event, true, false)
+
+	case yaml_EMIT_FLOW_SEQUENCE_TRAIL_ITEM_STATE:
+		return yaml_emitter_emit_flow_sequence_item(emitter, event, false, true)
+
+	case yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE:
+		return yaml_emitter_emit_flow_sequence_item(emitter, event, false, false)
+
+	case yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE:
+		return yaml_emitter_emit_flow_mapping_key(emitter, event, true, false)
+
+	case yaml_EMIT_FLOW_MAPPING_TRAIL_KEY_STATE:
+		return yaml_emitter_emit_flow_mapping_key(emitter, event, false, true)
+
+	case yaml_EMIT_FLOW_MAPPING_KEY_STATE:
+		return yaml_emitter_emit_flow_mapping_key(emitter, event, false, false)
+
+	case yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE:
+		return yaml_emitter_emit_flow_mapping_value(emitter, event, true)
+
+	case yaml_EMIT_FLOW_MAPPING_VALUE_STATE:
+		return yaml_emitter_emit_flow_mapping_value(emitter, event, false)
+
+	case yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE:
+		return yaml_emitter_emit_block_sequence_item(emitter, event, true)
+
+	case yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE:
+		return yaml_emitter_emit_block_sequence_item(emitter, event, false)
+
+	case yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE:
+		return yaml_emitter_emit_block_mapping_key(emitter, event, true)
+
+	case yaml_EMIT_BLOCK_MAPPING_KEY_STATE:
+		return yaml_emitter_emit_block_mapping_key(emitter, event, false)
+
+	case yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE:
+		return yaml_emitter_emit_block_mapping_value(emitter, event, true)
+
+	case yaml_EMIT_BLOCK_MAPPING_VALUE_STATE:
+		return yaml_emitter_emit_block_mapping_value(emitter, event, false)
+
+	case yaml_EMIT_END_STATE:
+		return yaml_emitter_set_emitter_error(emitter, "expected nothing after STREAM-END")
+	}
+	panic("invalid emitter state")
+}
+
+// Expect STREAM-START.
+func yaml_emitter_emit_stream_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	if event.typ != yaml_STREAM_START_EVENT {
+		return yaml_emitter_set_emitter_error(emitter, "expected STREAM-START")
+	}
+	if emitter.encoding == yaml_ANY_ENCODING {
+		emitter.encoding = event.encoding
+		if emitter.encoding == yaml_ANY_ENCODING {
+			emitter.encoding = yaml_UTF8_ENCODING
+		}
+	}
+	if emitter.best_indent < 2 || emitter.best_indent > 9 {
+		emitter.best_indent = 2
+	}
+	if emitter.best_width >= 0 && emitter.best_width <= emitter.best_indent*2 {
+		emitter.best_width = 80
+	}
+	if emitter.best_width < 0 {
+		emitter.best_width = 1<<31 - 1
+	}
+	if emitter.line_break == yaml_ANY_BREAK {
+		emitter.line_break = yaml_LN_BREAK
+	}
+
+	emitter.indent = -1
+	emitter.line = 0
+	emitter.column = 0
+	emitter.whitespace = true
+	emitter.indention = true
+	emitter.space_above = true
+	emitter.foot_indent = -1
+
+	if emitter.encoding != yaml_UTF8_ENCODING {
+		if !yaml_emitter_write_bom(emitter) {
+			return false
+		}
+	}
+	emitter.state = yaml_EMIT_FIRST_DOCUMENT_START_STATE
+	return true
+}
+
+// Expect DOCUMENT-START or STREAM-END.
+func yaml_emitter_emit_document_start(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
+
+	if event.typ == yaml_DOCUMENT_START_EVENT {
+
+		if event.version_directive != nil {
+			if !yaml_emitter_analyze_version_directive(emitter, event.version_directive) {
+				return false
+			}
+		}
+
+		for i := 0; i < len(event.tag_directives); i++ {
+			tag_directive := &event.tag_directives[i]
+			if !yaml_emitter_analyze_tag_directive(emitter, tag_directive) {
+				return false
+			}
+			if !yaml_emitter_append_tag_directive(emitter, tag_directive, false) {
+				return false
+			}
+		}
+
+		for i := 0; i < len(default_tag_directives); i++ {
+			tag_directive := &default_tag_directives[i]
+			if !yaml_emitter_append_tag_directive(emitter, tag_directive, true) {
+				return false
+			}
+		}
+
+		implicit := event.implicit
+		if !first || emitter.canonical {
+			implicit = false
+		}
+
+		if emitter.open_ended && (event.version_directive != nil || len(event.tag_directives) > 0) {
+			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
+				return false
+			}
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+		}
+
+		if event.version_directive != nil {
+			implicit = false
+			if !yaml_emitter_write_indicator(emitter, []byte("%YAML"), true, false, false) {
+				return false
+			}
+			if !yaml_emitter_write_indicator(emitter, []byte("1.1"), true, false, false) {
+				return false
+			}
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+		}
+
+		if len(event.tag_directives) > 0 {
+			implicit = false
+			for i := 0; i < len(event.tag_directives); i++ {
+				tag_directive := &event.tag_directives[i]
+				if !yaml_emitter_write_indicator(emitter, []byte("%TAG"), true, false, false) {
+					return false
+				}
+				if !yaml_emitter_write_tag_handle(emitter, tag_directive.handle) {
+					return false
+				}
+				if !yaml_emitter_write_tag_content(emitter, tag_directive.prefix, true) {
+					return false
+				}
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+			}
+		}
+
+		if yaml_emitter_check_empty_document(emitter) {
+			implicit = false
+		}
+		if !implicit {
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+			if !yaml_emitter_write_indicator(emitter, []byte("---"), true, false, false) {
+				return false
+			}
+			if emitter.canonical || true {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+			}
+		}
+
+		if len(emitter.head_comment) > 0 {
+			if !yaml_emitter_process_head_comment(emitter) {
+				return false
+			}
+			if !put_break(emitter) {
+				return false
+			}
+		}
+
+		emitter.state = yaml_EMIT_DOCUMENT_CONTENT_STATE
+		return true
+	}
+
+	if event.typ == yaml_STREAM_END_EVENT {
+		if emitter.open_ended {
+			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
+				return false
+			}
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+		}
+		if !yaml_emitter_flush(emitter) {
+			return false
+		}
+		emitter.state = yaml_EMIT_END_STATE
+		return true
+	}
+
+	return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-START or STREAM-END")
+}
+
+// yaml_emitter_increase_indent preserves the original signature and delegates to
+// yaml_emitter_increase_indent_compact without compact-sequence indentation
+func yaml_emitter_increase_indent(emitter *yaml_emitter_t, flow, indentless bool) bool {
+	return yaml_emitter_increase_indent_compact(emitter, flow, indentless, false)
+}
+
+// yaml_emitter_process_line_comment preserves the original signature and delegates to
+// yaml_emitter_process_line_comment_linebreak passing false for linebreak
+func yaml_emitter_process_line_comment(emitter *yaml_emitter_t) bool {
+	return yaml_emitter_process_line_comment_linebreak(emitter, false)
+}
+
+// Expect the root node.
+func yaml_emitter_emit_document_content(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	emitter.states = append(emitter.states, yaml_EMIT_DOCUMENT_END_STATE)
+
+	if !yaml_emitter_process_head_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_emit_node(emitter, event, true, false, false, false) {
+		return false
+	}
+	if !yaml_emitter_process_line_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_foot_comment(emitter) {
+		return false
+	}
+	return true
+}
+
+// Expect DOCUMENT-END.
+func yaml_emitter_emit_document_end(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	if event.typ != yaml_DOCUMENT_END_EVENT {
+		return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-END")
+	}
+	// [Go] Force document foot separation.
+	emitter.foot_indent = 0
+	if !yaml_emitter_process_foot_comment(emitter) {
+		return false
+	}
+	emitter.foot_indent = -1
+	if !yaml_emitter_write_indent(emitter) {
+		return false
+	}
+	if !event.implicit {
+		// [Go] Allocate the slice elsewhere.
+		if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
+			return false
+		}
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+	}
+	if !yaml_emitter_flush(emitter) {
+		return false
+	}
+	emitter.state = yaml_EMIT_DOCUMENT_START_STATE
+	emitter.tag_directives = emitter.tag_directives[:0]
+	return true
+}
+
+// Expect a flow item node.
+func yaml_emitter_emit_flow_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first, trail bool) bool {
+	if first {
+		if !yaml_emitter_write_indicator(emitter, []byte{'['}, true, true, false) {
+			return false
+		}
+		if !yaml_emitter_increase_indent(emitter, true, false) {
+			return false
+		}
+		emitter.flow_level++
+	}
+
+	if event.typ == yaml_SEQUENCE_END_EVENT {
+		if emitter.canonical && !first && !trail {
+			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
+				return false
+			}
+		}
+		emitter.flow_level--
+		emitter.indent = emitter.indents[len(emitter.indents)-1]
+		emitter.indents = emitter.indents[:len(emitter.indents)-1]
+		if emitter.column == 0 || emitter.canonical && !first {
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+		}
+		if !yaml_emitter_write_indicator(emitter, []byte{']'}, false, false, false) {
+			return false
+		}
+		if !yaml_emitter_process_line_comment(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_foot_comment(emitter) {
+			return false
+		}
+		emitter.state = emitter.states[len(emitter.states)-1]
+		emitter.states = emitter.states[:len(emitter.states)-1]
+
+		return true
+	}
+
+	if !first && !trail {
+		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
+			return false
+		}
+	}
+
+	if !yaml_emitter_process_head_comment(emitter) {
+		return false
+	}
+	if emitter.column == 0 {
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+	}
+
+	if emitter.canonical || emitter.column > emitter.best_width {
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+	}
+	if len(emitter.line_comment)+len(emitter.foot_comment)+len(emitter.tail_comment) > 0 {
+		emitter.states = append(emitter.states, yaml_EMIT_FLOW_SEQUENCE_TRAIL_ITEM_STATE)
+	} else {
+		emitter.states = append(emitter.states, yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE)
+	}
+	if !yaml_emitter_emit_node(emitter, event, false, true, false, false) {
+		return false
+	}
+	if len(emitter.line_comment)+len(emitter.foot_comment)+len(emitter.tail_comment) > 0 {
+		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
+			return false
+		}
+	}
+	if !yaml_emitter_process_line_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_foot_comment(emitter) {
+		return false
+	}
+	return true
+}
+
+// Expect a flow key node.
+func yaml_emitter_emit_flow_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first, trail bool) bool {
+	if first {
+		if !yaml_emitter_write_indicator(emitter, []byte{'{'}, true, true, false) {
+			return false
+		}
+		if !yaml_emitter_increase_indent(emitter, true, false) {
+			return false
+		}
+		emitter.flow_level++
+	}
+
+	if event.typ == yaml_MAPPING_END_EVENT {
+		if (emitter.canonical || len(emitter.head_comment)+len(emitter.foot_comment)+len(emitter.tail_comment) > 0) && !first && !trail {
+			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
+				return false
+			}
+		}
+		if !yaml_emitter_process_head_comment(emitter) {
+			return false
+		}
+		emitter.flow_level--
+		emitter.indent = emitter.indents[len(emitter.indents)-1]
+		emitter.indents = emitter.indents[:len(emitter.indents)-1]
+		if emitter.canonical && !first {
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+		}
+		if !yaml_emitter_write_indicator(emitter, []byte{'}'}, false, false, false) {
+			return false
+		}
+		if !yaml_emitter_process_line_comment(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_foot_comment(emitter) {
+			return false
+		}
+		emitter.state = emitter.states[len(emitter.states)-1]
+		emitter.states = emitter.states[:len(emitter.states)-1]
+		return true
+	}
+
+	if !first && !trail {
+		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
+			return false
+		}
+	}
+
+	if !yaml_emitter_process_head_comment(emitter) {
+		return false
+	}
+
+	if emitter.column == 0 {
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+	}
+
+	if emitter.canonical || emitter.column > emitter.best_width {
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+	}
+
+	if !emitter.canonical && yaml_emitter_check_simple_key(emitter) {
+		emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE)
+		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
+	}
+	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, false) {
+		return false
+	}
+	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_VALUE_STATE)
+	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
+}
+
+// Expect a flow value node.
+func yaml_emitter_emit_flow_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
+	if simple {
+		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
+			return false
+		}
+	} else {
+		if emitter.canonical || emitter.column > emitter.best_width {
+			if !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+		}
+		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, false) {
+			return false
+		}
+	}
+	if len(emitter.line_comment)+len(emitter.foot_comment)+len(emitter.tail_comment) > 0 {
+		emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_TRAIL_KEY_STATE)
+	} else {
+		emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_KEY_STATE)
+	}
+	if !yaml_emitter_emit_node(emitter, event, false, false, true, false) {
+		return false
+	}
+	if len(emitter.line_comment)+len(emitter.foot_comment)+len(emitter.tail_comment) > 0 {
+		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
+			return false
+		}
+	}
+	if !yaml_emitter_process_line_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_foot_comment(emitter) {
+		return false
+	}
+	return true
+}
+
+// Expect a block item node.
+func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
+	if first {
+		// emitter.mapping context tells us if we are currently in a mapping context.
+		// emiiter.column tells us which column we are in in the yaml output. 0 is the first char of the column.
+		// emitter.indentation tells us if the last character was an indentation character.
+		// emitter.compact_sequence_indent tells us if '- ' is considered part of the indentation for sequence elements.
+		// So, `seq` means that we are in a mapping context, and we are either at the first char of the column or
+		//  the last character was not an indentation character, and we consider '- ' part of the indentation
+		//  for sequence elements.
+		seq := emitter.mapping_context && (emitter.column == 0 || !emitter.indention) &&
+			emitter.compact_sequence_indent
+		if !yaml_emitter_increase_indent_compact(emitter, false, false, seq) {
+			return false
+		}
+	}
+	if event.typ == yaml_SEQUENCE_END_EVENT {
+		emitter.indent = emitter.indents[len(emitter.indents)-1]
+		emitter.indents = emitter.indents[:len(emitter.indents)-1]
+		emitter.state = emitter.states[len(emitter.states)-1]
+		emitter.states = emitter.states[:len(emitter.states)-1]
+		return true
+	}
+	if !yaml_emitter_process_head_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_write_indent(emitter) {
+		return false
+	}
+	if !yaml_emitter_write_indicator(emitter, []byte{'-'}, true, false, true) {
+		return false
+	}
+	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE)
+	if !yaml_emitter_emit_node(emitter, event, false, true, false, false) {
+		return false
+	}
+	if !yaml_emitter_process_line_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_foot_comment(emitter) {
+		return false
+	}
+	return true
+}
+
+// Expect a block key node.
+func yaml_emitter_emit_block_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
+	if first {
+		if !yaml_emitter_increase_indent(emitter, false, false) {
+			return false
+		}
+	}
+	if !yaml_emitter_process_head_comment(emitter) {
+		return false
+	}
+	if event.typ == yaml_MAPPING_END_EVENT {
+		emitter.indent = emitter.indents[len(emitter.indents)-1]
+		emitter.indents = emitter.indents[:len(emitter.indents)-1]
+		emitter.state = emitter.states[len(emitter.states)-1]
+		emitter.states = emitter.states[:len(emitter.states)-1]
+		return true
+	}
+	if !yaml_emitter_write_indent(emitter) {
+		return false
+	}
+	if len(emitter.line_comment) > 0 {
+		// [Go] A line comment was provided for the key. That's unusual as the
+		//      scanner associates line comments with the value. Either way,
+		//      save the line comment and render it appropriately later.
+		emitter.key_line_comment = emitter.line_comment
+		emitter.line_comment = nil
+	}
+	if yaml_emitter_check_simple_key(emitter) {
+		emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE)
+		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
+	}
+	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, true) {
+		return false
+	}
+	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_VALUE_STATE)
+	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
+}
+
+// Expect a block value node.
+func yaml_emitter_emit_block_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
+	if simple {
+		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
+			return false
+		}
+	} else {
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, true) {
+			return false
+		}
+	}
+	if len(emitter.key_line_comment) > 0 {
+		// [Go] Line comments are generally associated with the value, but when there's
+		//      no value on the same line as a mapping key they end up attached to the
+		//      key itself.
+		if event.typ == yaml_SCALAR_EVENT {
+			if len(emitter.line_comment) == 0 {
+				// A scalar is coming and it has no line comments by itself yet,
+				// so just let it handle the line comment as usual. If it has a
+				// line comment, we can't have both so the one from the key is lost.
+				emitter.line_comment = emitter.key_line_comment
+				emitter.key_line_comment = nil
+			}
+		} else if event.sequence_style() != yaml_FLOW_SEQUENCE_STYLE && (event.typ == yaml_MAPPING_START_EVENT || event.typ == yaml_SEQUENCE_START_EVENT) {
+			// An indented block follows, so write the comment right now.
+			emitter.line_comment, emitter.key_line_comment = emitter.key_line_comment, emitter.line_comment
+			if !yaml_emitter_process_line_comment(emitter) {
+				return false
+			}
+			emitter.line_comment, emitter.key_line_comment = emitter.key_line_comment, emitter.line_comment
+		}
+	}
+	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_KEY_STATE)
+	if !yaml_emitter_emit_node(emitter, event, false, false, true, false) {
+		return false
+	}
+	if !yaml_emitter_process_line_comment(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_foot_comment(emitter) {
+		return false
+	}
+	return true
+}
+
+func yaml_emitter_silent_nil_event(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	return event.typ == yaml_SCALAR_EVENT && event.implicit && !emitter.canonical && len(emitter.scalar_data.value) == 0
+}
+
+// Expect a node.
+func yaml_emitter_emit_node(emitter *yaml_emitter_t, event *yaml_event_t,
+	root bool, sequence bool, mapping bool, simple_key bool) bool {
+
+	emitter.root_context = root
+	emitter.sequence_context = sequence
+	emitter.mapping_context = mapping
+	emitter.simple_key_context = simple_key
+
+	switch event.typ {
+	case yaml_ALIAS_EVENT:
+		return yaml_emitter_emit_alias(emitter, event)
+	case yaml_SCALAR_EVENT:
+		return yaml_emitter_emit_scalar(emitter, event)
+	case yaml_SEQUENCE_START_EVENT:
+		return yaml_emitter_emit_sequence_start(emitter, event)
+	case yaml_MAPPING_START_EVENT:
+		return yaml_emitter_emit_mapping_start(emitter, event)
+	default:
+		return yaml_emitter_set_emitter_error(emitter,
+			fmt.Sprintf("expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS, but got %v", event.typ))
+	}
+}
+
+// Expect ALIAS.
+func yaml_emitter_emit_alias(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	if !yaml_emitter_process_anchor(emitter) {
+		return false
+	}
+	emitter.state = emitter.states[len(emitter.states)-1]
+	emitter.states = emitter.states[:len(emitter.states)-1]
+	return true
+}
+
+// Expect SCALAR.
+func yaml_emitter_emit_scalar(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	if !yaml_emitter_select_scalar_style(emitter, event) {
+		return false
+	}
+	if !yaml_emitter_process_anchor(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_tag(emitter) {
+		return false
+	}
+	if !yaml_emitter_increase_indent(emitter, true, false) {
+		return false
+	}
+	if !yaml_emitter_process_scalar(emitter) {
+		return false
+	}
+	emitter.indent = emitter.indents[len(emitter.indents)-1]
+	emitter.indents = emitter.indents[:len(emitter.indents)-1]
+	emitter.state = emitter.states[len(emitter.states)-1]
+	emitter.states = emitter.states[:len(emitter.states)-1]
+	return true
+}
+
+// Expect SEQUENCE-START.
+func yaml_emitter_emit_sequence_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	if !yaml_emitter_process_anchor(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_tag(emitter) {
+		return false
+	}
+	if emitter.flow_level > 0 || emitter.canonical || event.sequence_style() == yaml_FLOW_SEQUENCE_STYLE ||
+		yaml_emitter_check_empty_sequence(emitter) {
+		emitter.state = yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE
+	} else {
+		emitter.state = yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE
+	}
+	return true
+}
+
+// Expect MAPPING-START.
+func yaml_emitter_emit_mapping_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+	if !yaml_emitter_process_anchor(emitter) {
+		return false
+	}
+	if !yaml_emitter_process_tag(emitter) {
+		return false
+	}
+	if emitter.flow_level > 0 || emitter.canonical || event.mapping_style() == yaml_FLOW_MAPPING_STYLE ||
+		yaml_emitter_check_empty_mapping(emitter) {
+		emitter.state = yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE
+	} else {
+		emitter.state = yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE
+	}
+	return true
+}
+
+// Check if the document content is an empty scalar.
+func yaml_emitter_check_empty_document(emitter *yaml_emitter_t) bool {
+	return false // [Go] Huh?
+}
+
+// Check if the next events represent an empty sequence.
+func yaml_emitter_check_empty_sequence(emitter *yaml_emitter_t) bool {
+	if len(emitter.events)-emitter.events_head < 2 {
+		return false
+	}
+	return emitter.events[emitter.events_head].typ == yaml_SEQUENCE_START_EVENT &&
+		emitter.events[emitter.events_head+1].typ == yaml_SEQUENCE_END_EVENT
+}
+
+// Check if the next events represent an empty mapping.
+func yaml_emitter_check_empty_mapping(emitter *yaml_emitter_t) bool {
+	if len(emitter.events)-emitter.events_head < 2 {
+		return false
+	}
+	return emitter.events[emitter.events_head].typ == yaml_MAPPING_START_EVENT &&
+		emitter.events[emitter.events_head+1].typ == yaml_MAPPING_END_EVENT
+}
+
+// Check if the next node can be expressed as a simple key.
+func yaml_emitter_check_simple_key(emitter *yaml_emitter_t) bool {
+	length := 0
+	switch emitter.events[emitter.events_head].typ {
+	case yaml_ALIAS_EVENT:
+		length += len(emitter.anchor_data.anchor)
+	case yaml_SCALAR_EVENT:
+		if emitter.scalar_data.multiline {
+			return false
+		}
+		length += len(emitter.anchor_data.anchor) +
+			len(emitter.tag_data.handle) +
+			len(emitter.tag_data.suffix) +
+			len(emitter.scalar_data.value)
+	case yaml_SEQUENCE_START_EVENT:
+		if !yaml_emitter_check_empty_sequence(emitter) {
+			return false
+		}
+		length += len(emitter.anchor_data.anchor) +
+			len(emitter.tag_data.handle) +
+			len(emitter.tag_data.suffix)
+	case yaml_MAPPING_START_EVENT:
+		if !yaml_emitter_check_empty_mapping(emitter) {
+			return false
+		}
+		length += len(emitter.anchor_data.anchor) +
+			len(emitter.tag_data.handle) +
+			len(emitter.tag_data.suffix)
+	default:
+		return false
+	}
+	return length <= 128
+}
+
+// Determine an acceptable scalar style.
+func yaml_emitter_select_scalar_style(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+
+	no_tag := len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0
+	if no_tag && !event.implicit && !event.quoted_implicit {
+		return yaml_emitter_set_emitter_error(emitter, "neither tag nor implicit flags are specified")
+	}
+
+	style := event.scalar_style()
+	if style == yaml_ANY_SCALAR_STYLE {
+		style = yaml_PLAIN_SCALAR_STYLE
+	}
+	if emitter.canonical {
+		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+	}
+	if emitter.simple_key_context && emitter.scalar_data.multiline {
+		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+	}
+
+	if style == yaml_PLAIN_SCALAR_STYLE {
+		if emitter.flow_level > 0 && !emitter.scalar_data.flow_plain_allowed ||
+			emitter.flow_level == 0 && !emitter.scalar_data.block_plain_allowed {
+			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
+		}
+		if len(emitter.scalar_data.value) == 0 && (emitter.flow_level > 0 || emitter.simple_key_context) {
+			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
+		}
+		if no_tag && !event.implicit {
+			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
+		}
+	}
+	if style == yaml_SINGLE_QUOTED_SCALAR_STYLE {
+		if !emitter.scalar_data.single_quoted_allowed {
+			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+		}
+	}
+	if style == yaml_LITERAL_SCALAR_STYLE || style == yaml_FOLDED_SCALAR_STYLE {
+		if !emitter.scalar_data.block_allowed || emitter.flow_level > 0 || emitter.simple_key_context {
+			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+		}
+	}
+
+	if no_tag && !event.quoted_implicit && style != yaml_PLAIN_SCALAR_STYLE {
+		emitter.tag_data.handle = []byte{'!'}
+	}
+	emitter.scalar_data.style = style
+	return true
+}
+
+// Write an anchor.
+func yaml_emitter_process_anchor(emitter *yaml_emitter_t) bool {
+	if emitter.anchor_data.anchor == nil {
+		return true
+	}
+	c := []byte{'&'}
+	if emitter.anchor_data.alias {
+		c[0] = '*'
+	}
+	if !yaml_emitter_write_indicator(emitter, c, true, false, false) {
+		return false
+	}
+	return yaml_emitter_write_anchor(emitter, emitter.anchor_data.anchor)
+}
+
+// Write a tag.
+func yaml_emitter_process_tag(emitter *yaml_emitter_t) bool {
+	if len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0 {
+		return true
+	}
+	if len(emitter.tag_data.handle) > 0 {
+		if !yaml_emitter_write_tag_handle(emitter, emitter.tag_data.handle) {
+			return false
+		}
+		if len(emitter.tag_data.suffix) > 0 {
+			if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
+				return false
+			}
+		}
+	} else {
+		// [Go] Allocate these slices elsewhere.
+		if !yaml_emitter_write_indicator(emitter, []byte("!<"), true, false, false) {
+			return false
+		}
+		if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
+			return false
+		}
+		if !yaml_emitter_write_indicator(emitter, []byte{'>'}, false, false, false) {
+			return false
+		}
+	}
+	return true
+}
+
+// Write a scalar.
+func yaml_emitter_process_scalar(emitter *yaml_emitter_t) bool {
+	switch emitter.scalar_data.style {
+	case yaml_PLAIN_SCALAR_STYLE:
+		return yaml_emitter_write_plain_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
+
+	case yaml_SINGLE_QUOTED_SCALAR_STYLE:
+		return yaml_emitter_write_single_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
+
+	case yaml_DOUBLE_QUOTED_SCALAR_STYLE:
+		return yaml_emitter_write_double_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
+
+	case yaml_LITERAL_SCALAR_STYLE:
+		return yaml_emitter_write_literal_scalar(emitter, emitter.scalar_data.value)
+
+	case yaml_FOLDED_SCALAR_STYLE:
+		return yaml_emitter_write_folded_scalar(emitter, emitter.scalar_data.value)
+	}
+	panic("unknown scalar style")
+}
+
+// Write a head comment.
+func yaml_emitter_process_head_comment(emitter *yaml_emitter_t) bool {
+	if len(emitter.tail_comment) > 0 {
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+		if !yaml_emitter_write_comment(emitter, emitter.tail_comment) {
+			return false
+		}
+		emitter.tail_comment = emitter.tail_comment[:0]
+		emitter.foot_indent = emitter.indent
+		if emitter.foot_indent < 0 {
+			emitter.foot_indent = 0
+		}
+	}
+
+	if len(emitter.head_comment) == 0 {
+		return true
+	}
+	if !yaml_emitter_write_indent(emitter) {
+		return false
+	}
+	if !yaml_emitter_write_comment(emitter, emitter.head_comment) {
+		return false
+	}
+	emitter.head_comment = emitter.head_comment[:0]
+	return true
+}
+
+// Write an line comment.
+func yaml_emitter_process_line_comment_linebreak(emitter *yaml_emitter_t, linebreak bool) bool {
+	if len(emitter.line_comment) == 0 {
+		// The next 3 lines are needed to resolve an issue with leading newlines
+		// See https://github.com/go-yaml/yaml/issues/755
+		// When linebreak is set to true, put_break will be called and will add
+		// the needed newline.
+		if linebreak && !put_break(emitter) {
+			return false
+		}
+		return true
+	}
+	if !emitter.whitespace {
+		if !put(emitter, ' ') {
+			return false
+		}
+	}
+	if !yaml_emitter_write_comment(emitter, emitter.line_comment) {
+		return false
+	}
+	emitter.line_comment = emitter.line_comment[:0]
+	return true
+}
+
+// Write a foot comment.
+func yaml_emitter_process_foot_comment(emitter *yaml_emitter_t) bool {
+	if len(emitter.foot_comment) == 0 {
+		return true
+	}
+	if !yaml_emitter_write_indent(emitter) {
+		return false
+	}
+	if !yaml_emitter_write_comment(emitter, emitter.foot_comment) {
+		return false
+	}
+	emitter.foot_comment = emitter.foot_comment[:0]
+	emitter.foot_indent = emitter.indent
+	if emitter.foot_indent < 0 {
+		emitter.foot_indent = 0
+	}
+	return true
+}
+
+// Check if a %YAML directive is valid.
+func yaml_emitter_analyze_version_directive(emitter *yaml_emitter_t, version_directive *yaml_version_directive_t) bool {
+	if version_directive.major != 1 || version_directive.minor != 1 {
+		return yaml_emitter_set_emitter_error(emitter, "incompatible %YAML directive")
+	}
+	return true
+}
+
+// Check if a %TAG directive is valid.
+func yaml_emitter_analyze_tag_directive(emitter *yaml_emitter_t, tag_directive *yaml_tag_directive_t) bool {
+	handle := tag_directive.handle
+	prefix := tag_directive.prefix
+	if len(handle) == 0 {
+		return yaml_emitter_set_emitter_error(emitter, "tag handle must not be empty")
+	}
+	if handle[0] != '!' {
+		return yaml_emitter_set_emitter_error(emitter, "tag handle must start with '!'")
+	}
+	if handle[len(handle)-1] != '!' {
+		return yaml_emitter_set_emitter_error(emitter, "tag handle must end with '!'")
+	}
+	for i := 1; i < len(handle)-1; i += width(handle[i]) {
+		if !is_alpha(handle, i) {
+			return yaml_emitter_set_emitter_error(emitter, "tag handle must contain alphanumerical characters only")
+		}
+	}
+	if len(prefix) == 0 {
+		return yaml_emitter_set_emitter_error(emitter, "tag prefix must not be empty")
+	}
+	return true
+}
+
+// Check if an anchor is valid.
+func yaml_emitter_analyze_anchor(emitter *yaml_emitter_t, anchor []byte, alias bool) bool {
+	if len(anchor) == 0 {
+		problem := "anchor value must not be empty"
+		if alias {
+			problem = "alias value must not be empty"
+		}
+		return yaml_emitter_set_emitter_error(emitter, problem)
+	}
+	for i := 0; i < len(anchor); i += width(anchor[i]) {
+		if !is_alpha(anchor, i) {
+			problem := "anchor value must contain alphanumerical characters only"
+			if alias {
+				problem = "alias value must contain alphanumerical characters only"
+			}
+			return yaml_emitter_set_emitter_error(emitter, problem)
+		}
+	}
+	emitter.anchor_data.anchor = anchor
+	emitter.anchor_data.alias = alias
+	return true
+}
+
+// Check if a tag is valid.
+func yaml_emitter_analyze_tag(emitter *yaml_emitter_t, tag []byte) bool {
+	if len(tag) == 0 {
+		return yaml_emitter_set_emitter_error(emitter, "tag value must not be empty")
+	}
+	for i := 0; i < len(emitter.tag_directives); i++ {
+		tag_directive := &emitter.tag_directives[i]
+		if bytes.HasPrefix(tag, tag_directive.prefix) {
+			emitter.tag_data.handle = tag_directive.handle
+			emitter.tag_data.suffix = tag[len(tag_directive.prefix):]
+			return true
+		}
+	}
+	emitter.tag_data.suffix = tag
+	return true
+}
+
+// Check if a scalar is valid.
+func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool {
+	var (
+		block_indicators   = false
+		flow_indicators    = false
+		line_breaks        = false
+		special_characters = false
+		tab_characters     = false
+
+		leading_space  = false
+		leading_break  = false
+		trailing_space = false
+		trailing_break = false
+		break_space    = false
+		space_break    = false
+
+		preceded_by_whitespace = false
+		followed_by_whitespace = false
+		previous_space         = false
+		previous_break         = false
+	)
+
+	emitter.scalar_data.value = value
+
+	if len(value) == 0 {
+		emitter.scalar_data.multiline = false
+		emitter.scalar_data.flow_plain_allowed = false
+		emitter.scalar_data.block_plain_allowed = true
+		emitter.scalar_data.single_quoted_allowed = true
+		emitter.scalar_data.block_allowed = false
+		return true
+	}
+
+	if len(value) >= 3 && ((value[0] == '-' && value[1] == '-' && value[2] == '-') || (value[0] == '.' && value[1] == '.' && value[2] == '.')) {
+		block_indicators = true
+		flow_indicators = true
+	}
+
+	preceded_by_whitespace = true
+	for i, w := 0, 0; i < len(value); i += w {
+		w = width(value[i])
+		followed_by_whitespace = i+w >= len(value) || is_blank(value, i+w)
+
+		if i == 0 {
+			switch value[i] {
+			case '#', ',', '[', ']', '{', '}', '&', '*', '!', '|', '>', '\'', '"', '%', '@', '`':
+				flow_indicators = true
+				block_indicators = true
+			case '?', ':':
+				flow_indicators = true
+				if followed_by_whitespace {
+					block_indicators = true
+				}
+			case '-':
+				if followed_by_whitespace {
+					flow_indicators = true
+					block_indicators = true
+				}
+			}
+		} else {
+			switch value[i] {
+			case ',', '?', '[', ']', '{', '}':
+				flow_indicators = true
+			case ':':
+				flow_indicators = true
+				if followed_by_whitespace {
+					block_indicators = true
+				}
+			case '#':
+				if preceded_by_whitespace {
+					flow_indicators = true
+					block_indicators = true
+				}
+			}
+		}
+
+		if value[i] == '\t' {
+			tab_characters = true
+		} else if !is_printable(value, i) || !is_ascii(value, i) && !emitter.unicode {
+			special_characters = true
+		}
+		if is_space(value, i) {
+			if i == 0 {
+				leading_space = true
+			}
+			if i+width(value[i]) == len(value) {
+				trailing_space = true
+			}
+			if previous_break {
+				break_space = true
+			}
+			previous_space = true
+			previous_break = false
+		} else if is_break(value, i) {
+			line_breaks = true
+			if i == 0 {
+				leading_break = true
+			}
+			if i+width(value[i]) == len(value) {
+				trailing_break = true
+			}
+			if previous_space {
+				space_break = true
+			}
+			previous_space = false
+			previous_break = true
+		} else {
+			previous_space = false
+			previous_break = false
+		}
+
+		// [Go]: Why 'z'? Couldn't be the end of the string as that's the loop condition.
+		preceded_by_whitespace = is_blankz(value, i)
+	}
+
+	emitter.scalar_data.multiline = line_breaks
+	emitter.scalar_data.flow_plain_allowed = true
+	emitter.scalar_data.block_plain_allowed = true
+	emitter.scalar_data.single_quoted_allowed = true
+	emitter.scalar_data.block_allowed = true
+
+	if leading_space || leading_break || trailing_space || trailing_break {
+		emitter.scalar_data.flow_plain_allowed = false
+		emitter.scalar_data.block_plain_allowed = false
+	}
+	if trailing_space {
+		emitter.scalar_data.block_allowed = false
+	}
+	if break_space {
+		emitter.scalar_data.flow_plain_allowed = false
+		emitter.scalar_data.block_plain_allowed = false
+		emitter.scalar_data.single_quoted_allowed = false
+	}
+	if space_break || tab_characters || special_characters {
+		emitter.scalar_data.flow_plain_allowed = false
+		emitter.scalar_data.block_plain_allowed = false
+		emitter.scalar_data.single_quoted_allowed = false
+	}
+	if space_break || special_characters {
+		emitter.scalar_data.block_allowed = false
+	}
+	if line_breaks {
+		emitter.scalar_data.flow_plain_allowed = false
+		emitter.scalar_data.block_plain_allowed = false
+	}
+	if flow_indicators {
+		emitter.scalar_data.flow_plain_allowed = false
+	}
+	if block_indicators {
+		emitter.scalar_data.block_plain_allowed = false
+	}
+	return true
+}
+
+// Check if the event data is valid.
+func yaml_emitter_analyze_event(emitter *yaml_emitter_t, event *yaml_event_t) bool {
+
+	emitter.anchor_data.anchor = nil
+	emitter.tag_data.handle = nil
+	emitter.tag_data.suffix = nil
+	emitter.scalar_data.value = nil
+
+	if len(event.head_comment) > 0 {
+		emitter.head_comment = event.head_comment
+	}
+	if len(event.line_comment) > 0 {
+		emitter.line_comment = event.line_comment
+	}
+	if len(event.foot_comment) > 0 {
+		emitter.foot_comment = event.foot_comment
+	}
+	if len(event.tail_comment) > 0 {
+		emitter.tail_comment = event.tail_comment
+	}
+
+	switch event.typ {
+	case yaml_ALIAS_EVENT:
+		if !yaml_emitter_analyze_anchor(emitter, event.anchor, true) {
+			return false
+		}
+
+	case yaml_SCALAR_EVENT:
+		if len(event.anchor) > 0 {
+			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
+				return false
+			}
+		}
+		if len(event.tag) > 0 && (emitter.canonical || (!event.implicit && !event.quoted_implicit)) {
+			if !yaml_emitter_analyze_tag(emitter, event.tag) {
+				return false
+			}
+		}
+		if !yaml_emitter_analyze_scalar(emitter, event.value) {
+			return false
+		}
+
+	case yaml_SEQUENCE_START_EVENT:
+		if len(event.anchor) > 0 {
+			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
+				return false
+			}
+		}
+		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
+			if !yaml_emitter_analyze_tag(emitter, event.tag) {
+				return false
+			}
+		}
+
+	case yaml_MAPPING_START_EVENT:
+		if len(event.anchor) > 0 {
+			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
+				return false
+			}
+		}
+		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
+			if !yaml_emitter_analyze_tag(emitter, event.tag) {
+				return false
+			}
+		}
+	}
+	return true
+}
+
+// Write the BOM character.
+func yaml_emitter_write_bom(emitter *yaml_emitter_t) bool {
+	if !flush(emitter) {
+		return false
+	}
+	pos := emitter.buffer_pos
+	emitter.buffer[pos+0] = '\xEF'
+	emitter.buffer[pos+1] = '\xBB'
+	emitter.buffer[pos+2] = '\xBF'
+	emitter.buffer_pos += 3
+	return true
+}
+
+func yaml_emitter_write_indent(emitter *yaml_emitter_t) bool {
+	indent := emitter.indent
+	if indent < 0 {
+		indent = 0
+	}
+	if !emitter.indention || emitter.column > indent || (emitter.column == indent && !emitter.whitespace) {
+		if !put_break(emitter) {
+			return false
+		}
+	}
+	if emitter.foot_indent == indent {
+		if !put_break(emitter) {
+			return false
+		}
+	}
+	for emitter.column < indent {
+		if !put(emitter, ' ') {
+			return false
+		}
+	}
+	emitter.whitespace = true
+	//emitter.indention = true
+	emitter.space_above = false
+	emitter.foot_indent = -1
+	return true
+}
+
+func yaml_emitter_write_indicator(emitter *yaml_emitter_t, indicator []byte, need_whitespace, is_whitespace, is_indention bool) bool {
+	if need_whitespace && !emitter.whitespace {
+		if !put(emitter, ' ') {
+			return false
+		}
+	}
+	if !write_all(emitter, indicator) {
+		return false
+	}
+	emitter.whitespace = is_whitespace
+	emitter.indention = (emitter.indention && is_indention)
+	emitter.open_ended = false
+	return true
+}
+
+func yaml_emitter_write_anchor(emitter *yaml_emitter_t, value []byte) bool {
+	if !write_all(emitter, value) {
+		return false
+	}
+	emitter.whitespace = false
+	emitter.indention = false
+	return true
+}
+
+func yaml_emitter_write_tag_handle(emitter *yaml_emitter_t, value []byte) bool {
+	if !emitter.whitespace {
+		if !put(emitter, ' ') {
+			return false
+		}
+	}
+	if !write_all(emitter, value) {
+		return false
+	}
+	emitter.whitespace = false
+	emitter.indention = false
+	return true
+}
+
+func yaml_emitter_write_tag_content(emitter *yaml_emitter_t, value []byte, need_whitespace bool) bool {
+	if need_whitespace && !emitter.whitespace {
+		if !put(emitter, ' ') {
+			return false
+		}
+	}
+	for i := 0; i < len(value); {
+		var must_write bool
+		switch value[i] {
+		case ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '_', '.', '~', '*', '\'', '(', ')', '[', ']':
+			must_write = true
+		default:
+			must_write = is_alpha(value, i)
+		}
+		if must_write {
+			if !write(emitter, value, &i) {
+				return false
+			}
+		} else {
+			w := width(value[i])
+			for k := 0; k < w; k++ {
+				octet := value[i]
+				i++
+				if !put(emitter, '%') {
+					return false
+				}
+
+				c := octet >> 4
+				if c < 10 {
+					c += '0'
+				} else {
+					c += 'A' - 10
+				}
+				if !put(emitter, c) {
+					return false
+				}
+
+				c = octet & 0x0f
+				if c < 10 {
+					c += '0'
+				} else {
+					c += 'A' - 10
+				}
+				if !put(emitter, c) {
+					return false
+				}
+			}
+		}
+	}
+	emitter.whitespace = false
+	emitter.indention = false
+	return true
+}
+
+func yaml_emitter_write_plain_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
+	if len(value) > 0 && !emitter.whitespace {
+		if !put(emitter, ' ') {
+			return false
+		}
+	}
+
+	spaces := false
+	breaks := false
+	for i := 0; i < len(value); {
+		if is_space(value, i) {
+			if allow_breaks && !spaces && emitter.column > emitter.best_width && !is_space(value, i+1) {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+				i += width(value[i])
+			} else {
+				if !write(emitter, value, &i) {
+					return false
+				}
+			}
+			spaces = true
+		} else if is_break(value, i) {
+			if !breaks && value[i] == '\n' {
+				if !put_break(emitter) {
+					return false
+				}
+			}
+			if !write_break(emitter, value, &i) {
+				return false
+			}
+			//emitter.indention = true
+			breaks = true
+		} else {
+			if breaks {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+			}
+			if !write(emitter, value, &i) {
+				return false
+			}
+			emitter.indention = false
+			spaces = false
+			breaks = false
+		}
+	}
+
+	if len(value) > 0 {
+		emitter.whitespace = false
+	}
+	emitter.indention = false
+	if emitter.root_context {
+		emitter.open_ended = true
+	}
+
+	return true
+}
+
+func yaml_emitter_write_single_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
+
+	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, true, false, false) {
+		return false
+	}
+
+	spaces := false
+	breaks := false
+	for i := 0; i < len(value); {
+		if is_space(value, i) {
+			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 && !is_space(value, i+1) {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+				i += width(value[i])
+			} else {
+				if !write(emitter, value, &i) {
+					return false
+				}
+			}
+			spaces = true
+		} else if is_break(value, i) {
+			if !breaks && value[i] == '\n' {
+				if !put_break(emitter) {
+					return false
+				}
+			}
+			if !write_break(emitter, value, &i) {
+				return false
+			}
+			//emitter.indention = true
+			breaks = true
+		} else {
+			if breaks {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+			}
+			if value[i] == '\'' {
+				if !put(emitter, '\'') {
+					return false
+				}
+			}
+			if !write(emitter, value, &i) {
+				return false
+			}
+			emitter.indention = false
+			spaces = false
+			breaks = false
+		}
+	}
+	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, false, false, false) {
+		return false
+	}
+	emitter.whitespace = false
+	emitter.indention = false
+	return true
+}
+
+func yaml_emitter_write_double_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
+	spaces := false
+	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, true, false, false) {
+		return false
+	}
+
+	for i := 0; i < len(value); {
+		if !is_printable(value, i) || (!emitter.unicode && !is_ascii(value, i)) ||
+			is_bom(value, i) || is_break(value, i) ||
+			value[i] == '"' || value[i] == '\\' {
+
+			octet := value[i]
+
+			var w int
+			var v rune
+			switch {
+			case octet&0x80 == 0x00:
+				w, v = 1, rune(octet&0x7F)
+			case octet&0xE0 == 0xC0:
+				w, v = 2, rune(octet&0x1F)
+			case octet&0xF0 == 0xE0:
+				w, v = 3, rune(octet&0x0F)
+			case octet&0xF8 == 0xF0:
+				w, v = 4, rune(octet&0x07)
+			}
+			for k := 1; k < w; k++ {
+				octet = value[i+k]
+				v = (v << 6) + (rune(octet) & 0x3F)
+			}
+			i += w
+
+			if !put(emitter, '\\') {
+				return false
+			}
+
+			var ok bool
+			switch v {
+			case 0x00:
+				ok = put(emitter, '0')
+			case 0x07:
+				ok = put(emitter, 'a')
+			case 0x08:
+				ok = put(emitter, 'b')
+			case 0x09:
+				ok = put(emitter, 't')
+			case 0x0A:
+				ok = put(emitter, 'n')
+			case 0x0b:
+				ok = put(emitter, 'v')
+			case 0x0c:
+				ok = put(emitter, 'f')
+			case 0x0d:
+				ok = put(emitter, 'r')
+			case 0x1b:
+				ok = put(emitter, 'e')
+			case 0x22:
+				ok = put(emitter, '"')
+			case 0x5c:
+				ok = put(emitter, '\\')
+			case 0x85:
+				ok = put(emitter, 'N')
+			case 0xA0:
+				ok = put(emitter, '_')
+			case 0x2028:
+				ok = put(emitter, 'L')
+			case 0x2029:
+				ok = put(emitter, 'P')
+			default:
+				if v <= 0xFF {
+					ok = put(emitter, 'x')
+					w = 2
+				} else if v <= 0xFFFF {
+					ok = put(emitter, 'u')
+					w = 4
+				} else {
+					ok = put(emitter, 'U')
+					w = 8
+				}
+				for k := (w - 1) * 4; ok && k >= 0; k -= 4 {
+					digit := byte((v >> uint(k)) & 0x0F)
+					if digit < 10 {
+						ok = put(emitter, digit+'0')
+					} else {
+						ok = put(emitter, digit+'A'-10)
+					}
+				}
+			}
+			if !ok {
+				return false
+			}
+			spaces = false
+		} else if is_space(value, i) {
+			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+				if is_space(value, i+1) {
+					if !put(emitter, '\\') {
+						return false
+					}
+				}
+				i += width(value[i])
+			} else if !write(emitter, value, &i) {
+				return false
+			}
+			spaces = true
+		} else {
+			if !write(emitter, value, &i) {
+				return false
+			}
+			spaces = false
+		}
+	}
+	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, false, false, false) {
+		return false
+	}
+	emitter.whitespace = false
+	emitter.indention = false
+	return true
+}
+
+func yaml_emitter_write_block_scalar_hints(emitter *yaml_emitter_t, value []byte) bool {
+	if is_space(value, 0) || is_break(value, 0) {
+		indent_hint := []byte{'0' + byte(emitter.best_indent)}
+		if !yaml_emitter_write_indicator(emitter, indent_hint, false, false, false) {
+			return false
+		}
+	}
+
+	emitter.open_ended = false
+
+	var chomp_hint [1]byte
+	if len(value) == 0 {
+		chomp_hint[0] = '-'
+	} else {
+		i := len(value) - 1
+		for value[i]&0xC0 == 0x80 {
+			i--
+		}
+		if !is_break(value, i) {
+			chomp_hint[0] = '-'
+		} else if i == 0 {
+			chomp_hint[0] = '+'
+			emitter.open_ended = true
+		} else {
+			i--
+			for value[i]&0xC0 == 0x80 {
+				i--
+			}
+			if is_break(value, i) {
+				chomp_hint[0] = '+'
+				emitter.open_ended = true
+			}
+		}
+	}
+	if chomp_hint[0] != 0 {
+		if !yaml_emitter_write_indicator(emitter, chomp_hint[:], false, false, false) {
+			return false
+		}
+	}
+	return true
+}
+
+func yaml_emitter_write_literal_scalar(emitter *yaml_emitter_t, value []byte) bool {
+	if !yaml_emitter_write_indicator(emitter, []byte{'|'}, true, false, false) {
+		return false
+	}
+	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
+		return false
+	}
+	if !yaml_emitter_process_line_comment_linebreak(emitter, true) {
+		return false
+	}
+	//emitter.indention = true
+	emitter.whitespace = true
+	breaks := true
+	for i := 0; i < len(value); {
+		if is_break(value, i) {
+			if !write_break(emitter, value, &i) {
+				return false
+			}
+			//emitter.indention = true
+			breaks = true
+		} else {
+			if breaks {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+			}
+			if !write(emitter, value, &i) {
+				return false
+			}
+			emitter.indention = false
+			breaks = false
+		}
+	}
+
+	return true
+}
+
+func yaml_emitter_write_folded_scalar(emitter *yaml_emitter_t, value []byte) bool {
+	if !yaml_emitter_write_indicator(emitter, []byte{'>'}, true, false, false) {
+		return false
+	}
+	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
+		return false
+	}
+	if !yaml_emitter_process_line_comment_linebreak(emitter, true) {
+		return false
+	}
+
+	//emitter.indention = true
+	emitter.whitespace = true
+
+	breaks := true
+	leading_spaces := true
+	for i := 0; i < len(value); {
+		if is_break(value, i) {
+			if !breaks && !leading_spaces && value[i] == '\n' {
+				k := 0
+				for is_break(value, k) {
+					k += width(value[k])
+				}
+				if !is_blankz(value, k) {
+					if !put_break(emitter) {
+						return false
+					}
+				}
+			}
+			if !write_break(emitter, value, &i) {
+				return false
+			}
+			//emitter.indention = true
+			breaks = true
+		} else {
+			if breaks {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+				leading_spaces = is_blank(value, i)
+			}
+			if !breaks && is_space(value, i) && !is_space(value, i+1) && emitter.column > emitter.best_width {
+				if !yaml_emitter_write_indent(emitter) {
+					return false
+				}
+				i += width(value[i])
+			} else {
+				if !write(emitter, value, &i) {
+					return false
+				}
+			}
+			emitter.indention = false
+			breaks = false
+		}
+	}
+	return true
+}
+
+func yaml_emitter_write_comment(emitter *yaml_emitter_t, comment []byte) bool {
+	breaks := false
+	pound := false
+	for i := 0; i < len(comment); {
+		if is_break(comment, i) {
+			if !write_break(emitter, comment, &i) {
+				return false
+			}
+			//emitter.indention = true
+			breaks = true
+			pound = false
+		} else {
+			if breaks && !yaml_emitter_write_indent(emitter) {
+				return false
+			}
+			if !pound {
+				if comment[i] != '#' && (!put(emitter, '#') || !put(emitter, ' ')) {
+					return false
+				}
+				pound = true
+			}
+			if !write(emitter, comment, &i) {
+				return false
+			}
+			emitter.indention = false
+			breaks = false
+		}
+	}
+	if !breaks && !put_break(emitter) {
+		return false
+	}
+
+	emitter.whitespace = true
+	//emitter.indention = true
+	return true
+}
diff --git a/vendor/go.yaml.in/yaml/v3/encode.go b/vendor/go.yaml.in/yaml/v3/encode.go
new file mode 100644
index 000000000..de9e72a3e
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/encode.go
@@ -0,0 +1,577 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package yaml
+
+import (
+	"encoding"
+	"fmt"
+	"io"
+	"reflect"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+	"unicode/utf8"
+)
+
+type encoder struct {
+	emitter  yaml_emitter_t
+	event    yaml_event_t
+	out      []byte
+	flow     bool
+	indent   int
+	doneInit bool
+}
+
+func newEncoder() *encoder {
+	e := &encoder{}
+	yaml_emitter_initialize(&e.emitter)
+	yaml_emitter_set_output_string(&e.emitter, &e.out)
+	yaml_emitter_set_unicode(&e.emitter, true)
+	return e
+}
+
+func newEncoderWithWriter(w io.Writer) *encoder {
+	e := &encoder{}
+	yaml_emitter_initialize(&e.emitter)
+	yaml_emitter_set_output_writer(&e.emitter, w)
+	yaml_emitter_set_unicode(&e.emitter, true)
+	return e
+}
+
+func (e *encoder) init() {
+	if e.doneInit {
+		return
+	}
+	if e.indent == 0 {
+		e.indent = 4
+	}
+	e.emitter.best_indent = e.indent
+	yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING)
+	e.emit()
+	e.doneInit = true
+}
+
+func (e *encoder) finish() {
+	e.emitter.open_ended = false
+	yaml_stream_end_event_initialize(&e.event)
+	e.emit()
+}
+
+func (e *encoder) destroy() {
+	yaml_emitter_delete(&e.emitter)
+}
+
+func (e *encoder) emit() {
+	// This will internally delete the e.event value.
+	e.must(yaml_emitter_emit(&e.emitter, &e.event))
+}
+
+func (e *encoder) must(ok bool) {
+	if !ok {
+		msg := e.emitter.problem
+		if msg == "" {
+			msg = "unknown problem generating YAML content"
+		}
+		failf("%s", msg)
+	}
+}
+
+func (e *encoder) marshalDoc(tag string, in reflect.Value) {
+	e.init()
+	var node *Node
+	if in.IsValid() {
+		node, _ = in.Interface().(*Node)
+	}
+	if node != nil && node.Kind == DocumentNode {
+		e.nodev(in)
+	} else {
+		yaml_document_start_event_initialize(&e.event, nil, nil, true)
+		e.emit()
+		e.marshal(tag, in)
+		yaml_document_end_event_initialize(&e.event, true)
+		e.emit()
+	}
+}
+
+func (e *encoder) marshal(tag string, in reflect.Value) {
+	tag = shortTag(tag)
+	if !in.IsValid() || in.Kind() == reflect.Ptr && in.IsNil() {
+		e.nilv()
+		return
+	}
+	iface := in.Interface()
+	switch value := iface.(type) {
+	case *Node:
+		e.nodev(in)
+		return
+	case Node:
+		if !in.CanAddr() {
+			var n = reflect.New(in.Type()).Elem()
+			n.Set(in)
+			in = n
+		}
+		e.nodev(in.Addr())
+		return
+	case time.Time:
+		e.timev(tag, in)
+		return
+	case *time.Time:
+		e.timev(tag, in.Elem())
+		return
+	case time.Duration:
+		e.stringv(tag, reflect.ValueOf(value.String()))
+		return
+	case Marshaler:
+		v, err := value.MarshalYAML()
+		if err != nil {
+			fail(err)
+		}
+		if v == nil {
+			e.nilv()
+			return
+		}
+		e.marshal(tag, reflect.ValueOf(v))
+		return
+	case encoding.TextMarshaler:
+		text, err := value.MarshalText()
+		if err != nil {
+			fail(err)
+		}
+		in = reflect.ValueOf(string(text))
+	case nil:
+		e.nilv()
+		return
+	}
+	switch in.Kind() {
+	case reflect.Interface:
+		e.marshal(tag, in.Elem())
+	case reflect.Map:
+		e.mapv(tag, in)
+	case reflect.Ptr:
+		e.marshal(tag, in.Elem())
+	case reflect.Struct:
+		e.structv(tag, in)
+	case reflect.Slice, reflect.Array:
+		e.slicev(tag, in)
+	case reflect.String:
+		e.stringv(tag, in)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		e.intv(tag, in)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		e.uintv(tag, in)
+	case reflect.Float32, reflect.Float64:
+		e.floatv(tag, in)
+	case reflect.Bool:
+		e.boolv(tag, in)
+	default:
+		panic("cannot marshal type: " + in.Type().String())
+	}
+}
+
+func (e *encoder) mapv(tag string, in reflect.Value) {
+	e.mappingv(tag, func() {
+		keys := keyList(in.MapKeys())
+		sort.Sort(keys)
+		for _, k := range keys {
+			e.marshal("", k)
+			e.marshal("", in.MapIndex(k))
+		}
+	})
+}
+
+func (e *encoder) fieldByIndex(v reflect.Value, index []int) (field reflect.Value) {
+	for _, num := range index {
+		for {
+			if v.Kind() == reflect.Ptr {
+				if v.IsNil() {
+					return reflect.Value{}
+				}
+				v = v.Elem()
+				continue
+			}
+			break
+		}
+		v = v.Field(num)
+	}
+	return v
+}
+
+func (e *encoder) structv(tag string, in reflect.Value) {
+	sinfo, err := getStructInfo(in.Type())
+	if err != nil {
+		panic(err)
+	}
+	e.mappingv(tag, func() {
+		for _, info := range sinfo.FieldsList {
+			var value reflect.Value
+			if info.Inline == nil {
+				value = in.Field(info.Num)
+			} else {
+				value = e.fieldByIndex(in, info.Inline)
+				if !value.IsValid() {
+					continue
+				}
+			}
+			if info.OmitEmpty && isZero(value) {
+				continue
+			}
+			e.marshal("", reflect.ValueOf(info.Key))
+			e.flow = info.Flow
+			e.marshal("", value)
+		}
+		if sinfo.InlineMap >= 0 {
+			m := in.Field(sinfo.InlineMap)
+			if m.Len() > 0 {
+				e.flow = false
+				keys := keyList(m.MapKeys())
+				sort.Sort(keys)
+				for _, k := range keys {
+					if _, found := sinfo.FieldsMap[k.String()]; found {
+						panic(fmt.Sprintf("cannot have key %q in inlined map: conflicts with struct field", k.String()))
+					}
+					e.marshal("", k)
+					e.flow = false
+					e.marshal("", m.MapIndex(k))
+				}
+			}
+		}
+	})
+}
+
+func (e *encoder) mappingv(tag string, f func()) {
+	implicit := tag == ""
+	style := yaml_BLOCK_MAPPING_STYLE
+	if e.flow {
+		e.flow = false
+		style = yaml_FLOW_MAPPING_STYLE
+	}
+	yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style)
+	e.emit()
+	f()
+	yaml_mapping_end_event_initialize(&e.event)
+	e.emit()
+}
+
+func (e *encoder) slicev(tag string, in reflect.Value) {
+	implicit := tag == ""
+	style := yaml_BLOCK_SEQUENCE_STYLE
+	if e.flow {
+		e.flow = false
+		style = yaml_FLOW_SEQUENCE_STYLE
+	}
+	e.must(yaml_sequence_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
+	e.emit()
+	n := in.Len()
+	for i := 0; i < n; i++ {
+		e.marshal("", in.Index(i))
+	}
+	e.must(yaml_sequence_end_event_initialize(&e.event))
+	e.emit()
+}
+
+// isBase60 returns whether s is in base 60 notation as defined in YAML 1.1.
+//
+// The base 60 float notation in YAML 1.1 is a terrible idea and is unsupported
+// in YAML 1.2 and by this package, but these should be marshalled quoted for
+// the time being for compatibility with other parsers.
+func isBase60Float(s string) (result bool) {
+	// Fast path.
+	if s == "" {
+		return false
+	}
+	c := s[0]
+	if !(c == '+' || c == '-' || c >= '0' && c <= '9') || strings.IndexByte(s, ':') < 0 {
+		return false
+	}
+	// Do the full match.
+	return base60float.MatchString(s)
+}
+
+// From http://yaml.org/type/float.html, except the regular expression there
+// is bogus. In practice parsers do not enforce the "\.[0-9_]*" suffix.
+var base60float = regexp.MustCompile(`^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+(?:\.[0-9_]*)?$`)
+
+// isOldBool returns whether s is bool notation as defined in YAML 1.1.
+//
+// We continue to force strings that YAML 1.1 would interpret as booleans to be
+// rendered as quotes strings so that the marshalled output valid for YAML 1.1
+// parsing.
+func isOldBool(s string) (result bool) {
+	switch s {
+	case "y", "Y", "yes", "Yes", "YES", "on", "On", "ON",
+		"n", "N", "no", "No", "NO", "off", "Off", "OFF":
+		return true
+	default:
+		return false
+	}
+}
+
+func (e *encoder) stringv(tag string, in reflect.Value) {
+	var style yaml_scalar_style_t
+	s := in.String()
+	canUsePlain := true
+	switch {
+	case !utf8.ValidString(s):
+		if tag == binaryTag {
+			failf("explicitly tagged !!binary data must be base64-encoded")
+		}
+		if tag != "" {
+			failf("cannot marshal invalid UTF-8 data as %s", shortTag(tag))
+		}
+		// It can't be encoded directly as YAML so use a binary tag
+		// and encode it as base64.
+		tag = binaryTag
+		s = encodeBase64(s)
+	case tag == "":
+		// Check to see if it would resolve to a specific
+		// tag when encoded unquoted. If it doesn't,
+		// there's no need to quote it.
+		rtag, _ := resolve("", s)
+		canUsePlain = rtag == strTag && !(isBase60Float(s) || isOldBool(s))
+	}
+	// Note: it's possible for user code to emit invalid YAML
+	// if they explicitly specify a tag and a string containing
+	// text that's incompatible with that tag.
+	switch {
+	case strings.Contains(s, "\n"):
+		if e.flow {
+			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+		} else {
+			style = yaml_LITERAL_SCALAR_STYLE
+		}
+	case canUsePlain:
+		style = yaml_PLAIN_SCALAR_STYLE
+	default:
+		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+	}
+	e.emitScalar(s, "", tag, style, nil, nil, nil, nil)
+}
+
+func (e *encoder) boolv(tag string, in reflect.Value) {
+	var s string
+	if in.Bool() {
+		s = "true"
+	} else {
+		s = "false"
+	}
+	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
+}
+
+func (e *encoder) intv(tag string, in reflect.Value) {
+	s := strconv.FormatInt(in.Int(), 10)
+	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
+}
+
+func (e *encoder) uintv(tag string, in reflect.Value) {
+	s := strconv.FormatUint(in.Uint(), 10)
+	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
+}
+
+func (e *encoder) timev(tag string, in reflect.Value) {
+	t := in.Interface().(time.Time)
+	s := t.Format(time.RFC3339Nano)
+	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
+}
+
+func (e *encoder) floatv(tag string, in reflect.Value) {
+	// Issue #352: When formatting, use the precision of the underlying value
+	precision := 64
+	if in.Kind() == reflect.Float32 {
+		precision = 32
+	}
+
+	s := strconv.FormatFloat(in.Float(), 'g', -1, precision)
+	switch s {
+	case "+Inf":
+		s = ".inf"
+	case "-Inf":
+		s = "-.inf"
+	case "NaN":
+		s = ".nan"
+	}
+	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
+}
+
+func (e *encoder) nilv() {
+	e.emitScalar("null", "", "", yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
+}
+
+func (e *encoder) emitScalar(value, anchor, tag string, style yaml_scalar_style_t, head, line, foot, tail []byte) {
+	// TODO Kill this function. Replace all initialize calls by their underlining Go literals.
+	implicit := tag == ""
+	if !implicit {
+		tag = longTag(tag)
+	}
+	e.must(yaml_scalar_event_initialize(&e.event, []byte(anchor), []byte(tag), []byte(value), implicit, implicit, style))
+	e.event.head_comment = head
+	e.event.line_comment = line
+	e.event.foot_comment = foot
+	e.event.tail_comment = tail
+	e.emit()
+}
+
+func (e *encoder) nodev(in reflect.Value) {
+	e.node(in.Interface().(*Node), "")
+}
+
+func (e *encoder) node(node *Node, tail string) {
+	// Zero nodes behave as nil.
+	if node.Kind == 0 && node.IsZero() {
+		e.nilv()
+		return
+	}
+
+	// If the tag was not explicitly requested, and dropping it won't change the
+	// implicit tag of the value, don't include it in the presentation.
+	var tag = node.Tag
+	var stag = shortTag(tag)
+	var forceQuoting bool
+	if tag != "" && node.Style&TaggedStyle == 0 {
+		if node.Kind == ScalarNode {
+			if stag == strTag && node.Style&(SingleQuotedStyle|DoubleQuotedStyle|LiteralStyle|FoldedStyle) != 0 {
+				tag = ""
+			} else {
+				rtag, _ := resolve("", node.Value)
+				if rtag == stag {
+					tag = ""
+				} else if stag == strTag {
+					tag = ""
+					forceQuoting = true
+				}
+			}
+		} else {
+			var rtag string
+			switch node.Kind {
+			case MappingNode:
+				rtag = mapTag
+			case SequenceNode:
+				rtag = seqTag
+			}
+			if rtag == stag {
+				tag = ""
+			}
+		}
+	}
+
+	switch node.Kind {
+	case DocumentNode:
+		yaml_document_start_event_initialize(&e.event, nil, nil, true)
+		e.event.head_comment = []byte(node.HeadComment)
+		e.emit()
+		for _, node := range node.Content {
+			e.node(node, "")
+		}
+		yaml_document_end_event_initialize(&e.event, true)
+		e.event.foot_comment = []byte(node.FootComment)
+		e.emit()
+
+	case SequenceNode:
+		style := yaml_BLOCK_SEQUENCE_STYLE
+		if node.Style&FlowStyle != 0 {
+			style = yaml_FLOW_SEQUENCE_STYLE
+		}
+		e.must(yaml_sequence_start_event_initialize(&e.event, []byte(node.Anchor), []byte(longTag(tag)), tag == "", style))
+		e.event.head_comment = []byte(node.HeadComment)
+		e.emit()
+		for _, node := range node.Content {
+			e.node(node, "")
+		}
+		e.must(yaml_sequence_end_event_initialize(&e.event))
+		e.event.line_comment = []byte(node.LineComment)
+		e.event.foot_comment = []byte(node.FootComment)
+		e.emit()
+
+	case MappingNode:
+		style := yaml_BLOCK_MAPPING_STYLE
+		if node.Style&FlowStyle != 0 {
+			style = yaml_FLOW_MAPPING_STYLE
+		}
+		yaml_mapping_start_event_initialize(&e.event, []byte(node.Anchor), []byte(longTag(tag)), tag == "", style)
+		e.event.tail_comment = []byte(tail)
+		e.event.head_comment = []byte(node.HeadComment)
+		e.emit()
+
+		// The tail logic below moves the foot comment of prior keys to the following key,
+		// since the value for each key may be a nested structure and the foot needs to be
+		// processed only the entirety of the value is streamed. The last tail is processed
+		// with the mapping end event.
+		var tail string
+		for i := 0; i+1 < len(node.Content); i += 2 {
+			k := node.Content[i]
+			foot := k.FootComment
+			if foot != "" {
+				kopy := *k
+				kopy.FootComment = ""
+				k = &kopy
+			}
+			e.node(k, tail)
+			tail = foot
+
+			v := node.Content[i+1]
+			e.node(v, "")
+		}
+
+		yaml_mapping_end_event_initialize(&e.event)
+		e.event.tail_comment = []byte(tail)
+		e.event.line_comment = []byte(node.LineComment)
+		e.event.foot_comment = []byte(node.FootComment)
+		e.emit()
+
+	case AliasNode:
+		yaml_alias_event_initialize(&e.event, []byte(node.Value))
+		e.event.head_comment = []byte(node.HeadComment)
+		e.event.line_comment = []byte(node.LineComment)
+		e.event.foot_comment = []byte(node.FootComment)
+		e.emit()
+
+	case ScalarNode:
+		value := node.Value
+		if !utf8.ValidString(value) {
+			if stag == binaryTag {
+				failf("explicitly tagged !!binary data must be base64-encoded")
+			}
+			if stag != "" {
+				failf("cannot marshal invalid UTF-8 data as %s", stag)
+			}
+			// It can't be encoded directly as YAML so use a binary tag
+			// and encode it as base64.
+			tag = binaryTag
+			value = encodeBase64(value)
+		}
+
+		style := yaml_PLAIN_SCALAR_STYLE
+		switch {
+		case node.Style&DoubleQuotedStyle != 0:
+			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+		case node.Style&SingleQuotedStyle != 0:
+			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
+		case node.Style&LiteralStyle != 0:
+			style = yaml_LITERAL_SCALAR_STYLE
+		case node.Style&FoldedStyle != 0:
+			style = yaml_FOLDED_SCALAR_STYLE
+		case strings.Contains(value, "\n"):
+			style = yaml_LITERAL_SCALAR_STYLE
+		case forceQuoting:
+			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+		}
+
+		e.emitScalar(value, node.Anchor, tag, style, []byte(node.HeadComment), []byte(node.LineComment), []byte(node.FootComment), []byte(tail))
+	default:
+		failf("cannot encode node with unknown kind %d", node.Kind)
+	}
+}
diff --git a/vendor/go.yaml.in/yaml/v3/parserc.go b/vendor/go.yaml.in/yaml/v3/parserc.go
new file mode 100644
index 000000000..f35829db4
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/parserc.go
@@ -0,0 +1,1260 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+import (
+	"bytes"
+)
+
+// The parser implements the following grammar:
+//
+// stream               ::= STREAM-START implicit_document? explicit_document* STREAM-END
+// implicit_document    ::= block_node DOCUMENT-END*
+// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+// block_node_or_indentless_sequence    ::=
+//                          ALIAS
+//                          | properties (block_content | indentless_block_sequence)?
+//                          | block_content
+//                          | indentless_block_sequence
+// block_node           ::= ALIAS
+//                          | properties block_content?
+//                          | block_content
+// flow_node            ::= ALIAS
+//                          | properties flow_content?
+//                          | flow_content
+// properties           ::= TAG ANCHOR? | ANCHOR TAG?
+// block_content        ::= block_collection | flow_collection | SCALAR
+// flow_content         ::= flow_collection | SCALAR
+// block_collection     ::= block_sequence | block_mapping
+// flow_collection      ::= flow_sequence | flow_mapping
+// block_sequence       ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
+// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
+// block_mapping        ::= BLOCK-MAPPING_START
+//                          ((KEY block_node_or_indentless_sequence?)?
+//                          (VALUE block_node_or_indentless_sequence?)?)*
+//                          BLOCK-END
+// flow_sequence        ::= FLOW-SEQUENCE-START
+//                          (flow_sequence_entry FLOW-ENTRY)*
+//                          flow_sequence_entry?
+//                          FLOW-SEQUENCE-END
+// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+// flow_mapping         ::= FLOW-MAPPING-START
+//                          (flow_mapping_entry FLOW-ENTRY)*
+//                          flow_mapping_entry?
+//                          FLOW-MAPPING-END
+// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+
+// Peek the next token in the token queue.
+func peek_token(parser *yaml_parser_t) *yaml_token_t {
+	if parser.token_available || yaml_parser_fetch_more_tokens(parser) {
+		token := &parser.tokens[parser.tokens_head]
+		yaml_parser_unfold_comments(parser, token)
+		return token
+	}
+	return nil
+}
+
+// yaml_parser_unfold_comments walks through the comments queue and joins all
+// comments behind the position of the provided token into the respective
+// top-level comment slices in the parser.
+func yaml_parser_unfold_comments(parser *yaml_parser_t, token *yaml_token_t) {
+	for parser.comments_head < len(parser.comments) && token.start_mark.index >= parser.comments[parser.comments_head].token_mark.index {
+		comment := &parser.comments[parser.comments_head]
+		if len(comment.head) > 0 {
+			if token.typ == yaml_BLOCK_END_TOKEN {
+				// No heads on ends, so keep comment.head for a follow up token.
+				break
+			}
+			if len(parser.head_comment) > 0 {
+				parser.head_comment = append(parser.head_comment, '\n')
+			}
+			parser.head_comment = append(parser.head_comment, comment.head...)
+		}
+		if len(comment.foot) > 0 {
+			if len(parser.foot_comment) > 0 {
+				parser.foot_comment = append(parser.foot_comment, '\n')
+			}
+			parser.foot_comment = append(parser.foot_comment, comment.foot...)
+		}
+		if len(comment.line) > 0 {
+			if len(parser.line_comment) > 0 {
+				parser.line_comment = append(parser.line_comment, '\n')
+			}
+			parser.line_comment = append(parser.line_comment, comment.line...)
+		}
+		*comment = yaml_comment_t{}
+		parser.comments_head++
+	}
+}
+
+// Remove the next token from the queue (must be called after peek_token).
+func skip_token(parser *yaml_parser_t) {
+	parser.token_available = false
+	parser.tokens_parsed++
+	parser.stream_end_produced = parser.tokens[parser.tokens_head].typ == yaml_STREAM_END_TOKEN
+	parser.tokens_head++
+}
+
+// Get the next event.
+func yaml_parser_parse(parser *yaml_parser_t, event *yaml_event_t) bool {
+	// Erase the event object.
+	*event = yaml_event_t{}
+
+	// No events after the end of the stream or error.
+	if parser.stream_end_produced || parser.error != yaml_NO_ERROR || parser.state == yaml_PARSE_END_STATE {
+		return true
+	}
+
+	// Generate the next event.
+	return yaml_parser_state_machine(parser, event)
+}
+
+// Set parser error.
+func yaml_parser_set_parser_error(parser *yaml_parser_t, problem string, problem_mark yaml_mark_t) bool {
+	parser.error = yaml_PARSER_ERROR
+	parser.problem = problem
+	parser.problem_mark = problem_mark
+	return false
+}
+
+func yaml_parser_set_parser_error_context(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string, problem_mark yaml_mark_t) bool {
+	parser.error = yaml_PARSER_ERROR
+	parser.context = context
+	parser.context_mark = context_mark
+	parser.problem = problem
+	parser.problem_mark = problem_mark
+	return false
+}
+
+// State dispatcher.
+func yaml_parser_state_machine(parser *yaml_parser_t, event *yaml_event_t) bool {
+	//trace("yaml_parser_state_machine", "state:", parser.state.String())
+
+	switch parser.state {
+	case yaml_PARSE_STREAM_START_STATE:
+		return yaml_parser_parse_stream_start(parser, event)
+
+	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
+		return yaml_parser_parse_document_start(parser, event, true)
+
+	case yaml_PARSE_DOCUMENT_START_STATE:
+		return yaml_parser_parse_document_start(parser, event, false)
+
+	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
+		return yaml_parser_parse_document_content(parser, event)
+
+	case yaml_PARSE_DOCUMENT_END_STATE:
+		return yaml_parser_parse_document_end(parser, event)
+
+	case yaml_PARSE_BLOCK_NODE_STATE:
+		return yaml_parser_parse_node(parser, event, true, false)
+
+	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
+		return yaml_parser_parse_node(parser, event, true, true)
+
+	case yaml_PARSE_FLOW_NODE_STATE:
+		return yaml_parser_parse_node(parser, event, false, false)
+
+	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
+		return yaml_parser_parse_block_sequence_entry(parser, event, true)
+
+	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
+		return yaml_parser_parse_block_sequence_entry(parser, event, false)
+
+	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
+		return yaml_parser_parse_indentless_sequence_entry(parser, event)
+
+	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
+		return yaml_parser_parse_block_mapping_key(parser, event, true)
+
+	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
+		return yaml_parser_parse_block_mapping_key(parser, event, false)
+
+	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
+		return yaml_parser_parse_block_mapping_value(parser, event)
+
+	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
+		return yaml_parser_parse_flow_sequence_entry(parser, event, true)
+
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
+		return yaml_parser_parse_flow_sequence_entry(parser, event, false)
+
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
+		return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event)
+
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
+		return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event)
+
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
+		return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event)
+
+	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
+		return yaml_parser_parse_flow_mapping_key(parser, event, true)
+
+	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
+		return yaml_parser_parse_flow_mapping_key(parser, event, false)
+
+	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
+		return yaml_parser_parse_flow_mapping_value(parser, event, false)
+
+	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
+		return yaml_parser_parse_flow_mapping_value(parser, event, true)
+
+	default:
+		panic("invalid parser state")
+	}
+}
+
+// Parse the production:
+//
+//	stream   ::= STREAM-START implicit_document? explicit_document* STREAM-END
+//	             ************
+func yaml_parser_parse_stream_start(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	if token.typ != yaml_STREAM_START_TOKEN {
+		return yaml_parser_set_parser_error(parser, "did not find expected ", token.start_mark)
+	}
+	parser.state = yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE
+	*event = yaml_event_t{
+		typ:        yaml_STREAM_START_EVENT,
+		start_mark: token.start_mark,
+		end_mark:   token.end_mark,
+		encoding:   token.encoding,
+	}
+	skip_token(parser)
+	return true
+}
+
+// Parse the productions:
+//
+//	implicit_document    ::= block_node DOCUMENT-END*
+//	                         *
+//	explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+//	                         *************************
+func yaml_parser_parse_document_start(parser *yaml_parser_t, event *yaml_event_t, implicit bool) bool {
+
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	// Parse extra document end indicators.
+	if !implicit {
+		for token.typ == yaml_DOCUMENT_END_TOKEN {
+			skip_token(parser)
+			token = peek_token(parser)
+			if token == nil {
+				return false
+			}
+		}
+	}
+
+	if implicit && token.typ != yaml_VERSION_DIRECTIVE_TOKEN &&
+		token.typ != yaml_TAG_DIRECTIVE_TOKEN &&
+		token.typ != yaml_DOCUMENT_START_TOKEN &&
+		token.typ != yaml_STREAM_END_TOKEN {
+		// Parse an implicit document.
+		if !yaml_parser_process_directives(parser, nil, nil) {
+			return false
+		}
+		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
+		parser.state = yaml_PARSE_BLOCK_NODE_STATE
+
+		var head_comment []byte
+		if len(parser.head_comment) > 0 {
+			// [Go] Scan the header comment backwards, and if an empty line is found, break
+			//      the header so the part before the last empty line goes into the
+			//      document header, while the bottom of it goes into a follow up event.
+			for i := len(parser.head_comment) - 1; i > 0; i-- {
+				if parser.head_comment[i] == '\n' {
+					if i == len(parser.head_comment)-1 {
+						head_comment = parser.head_comment[:i]
+						parser.head_comment = parser.head_comment[i+1:]
+						break
+					} else if parser.head_comment[i-1] == '\n' {
+						head_comment = parser.head_comment[:i-1]
+						parser.head_comment = parser.head_comment[i+1:]
+						break
+					}
+				}
+			}
+		}
+
+		*event = yaml_event_t{
+			typ:        yaml_DOCUMENT_START_EVENT,
+			start_mark: token.start_mark,
+			end_mark:   token.end_mark,
+
+			head_comment: head_comment,
+		}
+
+	} else if token.typ != yaml_STREAM_END_TOKEN {
+		// Parse an explicit document.
+		var version_directive *yaml_version_directive_t
+		var tag_directives []yaml_tag_directive_t
+		start_mark := token.start_mark
+		if !yaml_parser_process_directives(parser, &version_directive, &tag_directives) {
+			return false
+		}
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_DOCUMENT_START_TOKEN {
+			yaml_parser_set_parser_error(parser,
+				"did not find expected ", token.start_mark)
+			return false
+		}
+		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
+		parser.state = yaml_PARSE_DOCUMENT_CONTENT_STATE
+		end_mark := token.end_mark
+
+		*event = yaml_event_t{
+			typ:               yaml_DOCUMENT_START_EVENT,
+			start_mark:        start_mark,
+			end_mark:          end_mark,
+			version_directive: version_directive,
+			tag_directives:    tag_directives,
+			implicit:          false,
+		}
+		skip_token(parser)
+
+	} else {
+		// Parse the stream end.
+		parser.state = yaml_PARSE_END_STATE
+		*event = yaml_event_t{
+			typ:        yaml_STREAM_END_EVENT,
+			start_mark: token.start_mark,
+			end_mark:   token.end_mark,
+		}
+		skip_token(parser)
+	}
+
+	return true
+}
+
+// Parse the productions:
+//
+//	explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+//	                                                   ***********
+func yaml_parser_parse_document_content(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	if token.typ == yaml_VERSION_DIRECTIVE_TOKEN ||
+		token.typ == yaml_TAG_DIRECTIVE_TOKEN ||
+		token.typ == yaml_DOCUMENT_START_TOKEN ||
+		token.typ == yaml_DOCUMENT_END_TOKEN ||
+		token.typ == yaml_STREAM_END_TOKEN {
+		parser.state = parser.states[len(parser.states)-1]
+		parser.states = parser.states[:len(parser.states)-1]
+		return yaml_parser_process_empty_scalar(parser, event,
+			token.start_mark)
+	}
+	return yaml_parser_parse_node(parser, event, true, false)
+}
+
+// Parse the productions:
+//
+//	implicit_document    ::= block_node DOCUMENT-END*
+//	                                    *************
+//	explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+func yaml_parser_parse_document_end(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	start_mark := token.start_mark
+	end_mark := token.start_mark
+
+	implicit := true
+	if token.typ == yaml_DOCUMENT_END_TOKEN {
+		end_mark = token.end_mark
+		skip_token(parser)
+		implicit = false
+	}
+
+	parser.tag_directives = parser.tag_directives[:0]
+
+	parser.state = yaml_PARSE_DOCUMENT_START_STATE
+	*event = yaml_event_t{
+		typ:        yaml_DOCUMENT_END_EVENT,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+		implicit:   implicit,
+	}
+	yaml_parser_set_event_comments(parser, event)
+	if len(event.head_comment) > 0 && len(event.foot_comment) == 0 {
+		event.foot_comment = event.head_comment
+		event.head_comment = nil
+	}
+	return true
+}
+
+func yaml_parser_set_event_comments(parser *yaml_parser_t, event *yaml_event_t) {
+	event.head_comment = parser.head_comment
+	event.line_comment = parser.line_comment
+	event.foot_comment = parser.foot_comment
+	parser.head_comment = nil
+	parser.line_comment = nil
+	parser.foot_comment = nil
+	parser.tail_comment = nil
+	parser.stem_comment = nil
+}
+
+// Parse the productions:
+//
+//	block_node_or_indentless_sequence    ::=
+//	                         ALIAS
+//	                         *****
+//	                         | properties (block_content | indentless_block_sequence)?
+//	                           **********  *
+//	                         | block_content | indentless_block_sequence
+//	                           *
+//	block_node           ::= ALIAS
+//	                         *****
+//	                         | properties block_content?
+//	                           ********** *
+//	                         | block_content
+//	                           *
+//	flow_node            ::= ALIAS
+//	                         *****
+//	                         | properties flow_content?
+//	                           ********** *
+//	                         | flow_content
+//	                           *
+//	properties           ::= TAG ANCHOR? | ANCHOR TAG?
+//	                         *************************
+//	block_content        ::= block_collection | flow_collection | SCALAR
+//	                                                              ******
+//	flow_content         ::= flow_collection | SCALAR
+//	                                           ******
+func yaml_parser_parse_node(parser *yaml_parser_t, event *yaml_event_t, block, indentless_sequence bool) bool {
+	//defer trace("yaml_parser_parse_node", "block:", block, "indentless_sequence:", indentless_sequence)()
+
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	if token.typ == yaml_ALIAS_TOKEN {
+		parser.state = parser.states[len(parser.states)-1]
+		parser.states = parser.states[:len(parser.states)-1]
+		*event = yaml_event_t{
+			typ:        yaml_ALIAS_EVENT,
+			start_mark: token.start_mark,
+			end_mark:   token.end_mark,
+			anchor:     token.value,
+		}
+		yaml_parser_set_event_comments(parser, event)
+		skip_token(parser)
+		return true
+	}
+
+	start_mark := token.start_mark
+	end_mark := token.start_mark
+
+	var tag_token bool
+	var tag_handle, tag_suffix, anchor []byte
+	var tag_mark yaml_mark_t
+	if token.typ == yaml_ANCHOR_TOKEN {
+		anchor = token.value
+		start_mark = token.start_mark
+		end_mark = token.end_mark
+		skip_token(parser)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ == yaml_TAG_TOKEN {
+			tag_token = true
+			tag_handle = token.value
+			tag_suffix = token.suffix
+			tag_mark = token.start_mark
+			end_mark = token.end_mark
+			skip_token(parser)
+			token = peek_token(parser)
+			if token == nil {
+				return false
+			}
+		}
+	} else if token.typ == yaml_TAG_TOKEN {
+		tag_token = true
+		tag_handle = token.value
+		tag_suffix = token.suffix
+		start_mark = token.start_mark
+		tag_mark = token.start_mark
+		end_mark = token.end_mark
+		skip_token(parser)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ == yaml_ANCHOR_TOKEN {
+			anchor = token.value
+			end_mark = token.end_mark
+			skip_token(parser)
+			token = peek_token(parser)
+			if token == nil {
+				return false
+			}
+		}
+	}
+
+	var tag []byte
+	if tag_token {
+		if len(tag_handle) == 0 {
+			tag = tag_suffix
+			tag_suffix = nil
+		} else {
+			for i := range parser.tag_directives {
+				if bytes.Equal(parser.tag_directives[i].handle, tag_handle) {
+					tag = append([]byte(nil), parser.tag_directives[i].prefix...)
+					tag = append(tag, tag_suffix...)
+					break
+				}
+			}
+			if len(tag) == 0 {
+				yaml_parser_set_parser_error_context(parser,
+					"while parsing a node", start_mark,
+					"found undefined tag handle", tag_mark)
+				return false
+			}
+		}
+	}
+
+	implicit := len(tag) == 0
+	if indentless_sequence && token.typ == yaml_BLOCK_ENTRY_TOKEN {
+		end_mark = token.end_mark
+		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
+		*event = yaml_event_t{
+			typ:        yaml_SEQUENCE_START_EVENT,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			anchor:     anchor,
+			tag:        tag,
+			implicit:   implicit,
+			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
+		}
+		return true
+	}
+	if token.typ == yaml_SCALAR_TOKEN {
+		var plain_implicit, quoted_implicit bool
+		end_mark = token.end_mark
+		if (len(tag) == 0 && token.style == yaml_PLAIN_SCALAR_STYLE) || (len(tag) == 1 && tag[0] == '!') {
+			plain_implicit = true
+		} else if len(tag) == 0 {
+			quoted_implicit = true
+		}
+		parser.state = parser.states[len(parser.states)-1]
+		parser.states = parser.states[:len(parser.states)-1]
+
+		*event = yaml_event_t{
+			typ:             yaml_SCALAR_EVENT,
+			start_mark:      start_mark,
+			end_mark:        end_mark,
+			anchor:          anchor,
+			tag:             tag,
+			value:           token.value,
+			implicit:        plain_implicit,
+			quoted_implicit: quoted_implicit,
+			style:           yaml_style_t(token.style),
+		}
+		yaml_parser_set_event_comments(parser, event)
+		skip_token(parser)
+		return true
+	}
+	if token.typ == yaml_FLOW_SEQUENCE_START_TOKEN {
+		// [Go] Some of the events below can be merged as they differ only on style.
+		end_mark = token.end_mark
+		parser.state = yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE
+		*event = yaml_event_t{
+			typ:        yaml_SEQUENCE_START_EVENT,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			anchor:     anchor,
+			tag:        tag,
+			implicit:   implicit,
+			style:      yaml_style_t(yaml_FLOW_SEQUENCE_STYLE),
+		}
+		yaml_parser_set_event_comments(parser, event)
+		return true
+	}
+	if token.typ == yaml_FLOW_MAPPING_START_TOKEN {
+		end_mark = token.end_mark
+		parser.state = yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE
+		*event = yaml_event_t{
+			typ:        yaml_MAPPING_START_EVENT,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			anchor:     anchor,
+			tag:        tag,
+			implicit:   implicit,
+			style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
+		}
+		yaml_parser_set_event_comments(parser, event)
+		return true
+	}
+	if block && token.typ == yaml_BLOCK_SEQUENCE_START_TOKEN {
+		end_mark = token.end_mark
+		parser.state = yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE
+		*event = yaml_event_t{
+			typ:        yaml_SEQUENCE_START_EVENT,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			anchor:     anchor,
+			tag:        tag,
+			implicit:   implicit,
+			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
+		}
+		if parser.stem_comment != nil {
+			event.head_comment = parser.stem_comment
+			parser.stem_comment = nil
+		}
+		return true
+	}
+	if block && token.typ == yaml_BLOCK_MAPPING_START_TOKEN {
+		end_mark = token.end_mark
+		parser.state = yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE
+		*event = yaml_event_t{
+			typ:        yaml_MAPPING_START_EVENT,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			anchor:     anchor,
+			tag:        tag,
+			implicit:   implicit,
+			style:      yaml_style_t(yaml_BLOCK_MAPPING_STYLE),
+		}
+		if parser.stem_comment != nil {
+			event.head_comment = parser.stem_comment
+			parser.stem_comment = nil
+		}
+		return true
+	}
+	if len(anchor) > 0 || len(tag) > 0 {
+		parser.state = parser.states[len(parser.states)-1]
+		parser.states = parser.states[:len(parser.states)-1]
+
+		*event = yaml_event_t{
+			typ:             yaml_SCALAR_EVENT,
+			start_mark:      start_mark,
+			end_mark:        end_mark,
+			anchor:          anchor,
+			tag:             tag,
+			implicit:        implicit,
+			quoted_implicit: false,
+			style:           yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
+		}
+		return true
+	}
+
+	context := "while parsing a flow node"
+	if block {
+		context = "while parsing a block node"
+	}
+	yaml_parser_set_parser_error_context(parser, context, start_mark,
+		"did not find expected node content", token.start_mark)
+	return false
+}
+
+// Parse the productions:
+//
+//	block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
+//	                   ********************  *********** *             *********
+func yaml_parser_parse_block_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
+	if first {
+		token := peek_token(parser)
+		if token == nil {
+			return false
+		}
+		parser.marks = append(parser.marks, token.start_mark)
+		skip_token(parser)
+	}
+
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
+		mark := token.end_mark
+		prior_head_len := len(parser.head_comment)
+		skip_token(parser)
+		yaml_parser_split_stem_comment(parser, prior_head_len)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_BLOCK_ENTRY_TOKEN && token.typ != yaml_BLOCK_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE)
+			return yaml_parser_parse_node(parser, event, true, false)
+		} else {
+			parser.state = yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE
+			return yaml_parser_process_empty_scalar(parser, event, mark)
+		}
+	}
+	if token.typ == yaml_BLOCK_END_TOKEN {
+		parser.state = parser.states[len(parser.states)-1]
+		parser.states = parser.states[:len(parser.states)-1]
+		parser.marks = parser.marks[:len(parser.marks)-1]
+
+		*event = yaml_event_t{
+			typ:        yaml_SEQUENCE_END_EVENT,
+			start_mark: token.start_mark,
+			end_mark:   token.end_mark,
+		}
+
+		skip_token(parser)
+		return true
+	}
+
+	context_mark := parser.marks[len(parser.marks)-1]
+	parser.marks = parser.marks[:len(parser.marks)-1]
+	return yaml_parser_set_parser_error_context(parser,
+		"while parsing a block collection", context_mark,
+		"did not find expected '-' indicator", token.start_mark)
+}
+
+// Parse the productions:
+//
+//	indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
+//	                          *********** *
+func yaml_parser_parse_indentless_sequence_entry(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
+		mark := token.end_mark
+		prior_head_len := len(parser.head_comment)
+		skip_token(parser)
+		yaml_parser_split_stem_comment(parser, prior_head_len)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_BLOCK_ENTRY_TOKEN &&
+			token.typ != yaml_KEY_TOKEN &&
+			token.typ != yaml_VALUE_TOKEN &&
+			token.typ != yaml_BLOCK_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE)
+			return yaml_parser_parse_node(parser, event, true, false)
+		}
+		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
+		return yaml_parser_process_empty_scalar(parser, event, mark)
+	}
+	parser.state = parser.states[len(parser.states)-1]
+	parser.states = parser.states[:len(parser.states)-1]
+
+	*event = yaml_event_t{
+		typ:        yaml_SEQUENCE_END_EVENT,
+		start_mark: token.start_mark,
+		end_mark:   token.start_mark, // [Go] Shouldn't this be token.end_mark?
+	}
+	return true
+}
+
+// Split stem comment from head comment.
+//
+// When a sequence or map is found under a sequence entry, the former head comment
+// is assigned to the underlying sequence or map as a whole, not the individual
+// sequence or map entry as would be expected otherwise. To handle this case the
+// previous head comment is moved aside as the stem comment.
+func yaml_parser_split_stem_comment(parser *yaml_parser_t, stem_len int) {
+	if stem_len == 0 {
+		return
+	}
+
+	token := peek_token(parser)
+	if token == nil || token.typ != yaml_BLOCK_SEQUENCE_START_TOKEN && token.typ != yaml_BLOCK_MAPPING_START_TOKEN {
+		return
+	}
+
+	parser.stem_comment = parser.head_comment[:stem_len]
+	if len(parser.head_comment) == stem_len {
+		parser.head_comment = nil
+	} else {
+		// Copy suffix to prevent very strange bugs if someone ever appends
+		// further bytes to the prefix in the stem_comment slice above.
+		parser.head_comment = append([]byte(nil), parser.head_comment[stem_len+1:]...)
+	}
+}
+
+// Parse the productions:
+//
+//	block_mapping        ::= BLOCK-MAPPING_START
+//	                         *******************
+//	                         ((KEY block_node_or_indentless_sequence?)?
+//	                           *** *
+//	                         (VALUE block_node_or_indentless_sequence?)?)*
+//
+//	                         BLOCK-END
+//	                         *********
+func yaml_parser_parse_block_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
+	if first {
+		token := peek_token(parser)
+		if token == nil {
+			return false
+		}
+		parser.marks = append(parser.marks, token.start_mark)
+		skip_token(parser)
+	}
+
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	// [Go] A tail comment was left from the prior mapping value processed. Emit an event
+	//      as it needs to be processed with that value and not the following key.
+	if len(parser.tail_comment) > 0 {
+		*event = yaml_event_t{
+			typ:          yaml_TAIL_COMMENT_EVENT,
+			start_mark:   token.start_mark,
+			end_mark:     token.end_mark,
+			foot_comment: parser.tail_comment,
+		}
+		parser.tail_comment = nil
+		return true
+	}
+
+	if token.typ == yaml_KEY_TOKEN {
+		mark := token.end_mark
+		skip_token(parser)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_KEY_TOKEN &&
+			token.typ != yaml_VALUE_TOKEN &&
+			token.typ != yaml_BLOCK_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_VALUE_STATE)
+			return yaml_parser_parse_node(parser, event, true, true)
+		} else {
+			parser.state = yaml_PARSE_BLOCK_MAPPING_VALUE_STATE
+			return yaml_parser_process_empty_scalar(parser, event, mark)
+		}
+	} else if token.typ == yaml_BLOCK_END_TOKEN {
+		parser.state = parser.states[len(parser.states)-1]
+		parser.states = parser.states[:len(parser.states)-1]
+		parser.marks = parser.marks[:len(parser.marks)-1]
+		*event = yaml_event_t{
+			typ:        yaml_MAPPING_END_EVENT,
+			start_mark: token.start_mark,
+			end_mark:   token.end_mark,
+		}
+		yaml_parser_set_event_comments(parser, event)
+		skip_token(parser)
+		return true
+	}
+
+	context_mark := parser.marks[len(parser.marks)-1]
+	parser.marks = parser.marks[:len(parser.marks)-1]
+	return yaml_parser_set_parser_error_context(parser,
+		"while parsing a block mapping", context_mark,
+		"did not find expected key", token.start_mark)
+}
+
+// Parse the productions:
+//
+//	block_mapping        ::= BLOCK-MAPPING_START
+//
+//	                          ((KEY block_node_or_indentless_sequence?)?
+//
+//	                          (VALUE block_node_or_indentless_sequence?)?)*
+//	                           ***** *
+//	                          BLOCK-END
+func yaml_parser_parse_block_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	if token.typ == yaml_VALUE_TOKEN {
+		mark := token.end_mark
+		skip_token(parser)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_KEY_TOKEN &&
+			token.typ != yaml_VALUE_TOKEN &&
+			token.typ != yaml_BLOCK_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_KEY_STATE)
+			return yaml_parser_parse_node(parser, event, true, true)
+		}
+		parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
+		return yaml_parser_process_empty_scalar(parser, event, mark)
+	}
+	parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
+	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
+}
+
+// Parse the productions:
+//
+//	flow_sequence        ::= FLOW-SEQUENCE-START
+//	                         *******************
+//	                         (flow_sequence_entry FLOW-ENTRY)*
+//	                          *                   **********
+//	                         flow_sequence_entry?
+//	                         *
+//	                         FLOW-SEQUENCE-END
+//	                         *****************
+//	flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+//	                         *
+func yaml_parser_parse_flow_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
+	if first {
+		token := peek_token(parser)
+		if token == nil {
+			return false
+		}
+		parser.marks = append(parser.marks, token.start_mark)
+		skip_token(parser)
+	}
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
+		if !first {
+			if token.typ == yaml_FLOW_ENTRY_TOKEN {
+				skip_token(parser)
+				token = peek_token(parser)
+				if token == nil {
+					return false
+				}
+			} else {
+				context_mark := parser.marks[len(parser.marks)-1]
+				parser.marks = parser.marks[:len(parser.marks)-1]
+				return yaml_parser_set_parser_error_context(parser,
+					"while parsing a flow sequence", context_mark,
+					"did not find expected ',' or ']'", token.start_mark)
+			}
+		}
+
+		if token.typ == yaml_KEY_TOKEN {
+			parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE
+			*event = yaml_event_t{
+				typ:        yaml_MAPPING_START_EVENT,
+				start_mark: token.start_mark,
+				end_mark:   token.end_mark,
+				implicit:   true,
+				style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
+			}
+			skip_token(parser)
+			return true
+		} else if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE)
+			return yaml_parser_parse_node(parser, event, false, false)
+		}
+	}
+
+	parser.state = parser.states[len(parser.states)-1]
+	parser.states = parser.states[:len(parser.states)-1]
+	parser.marks = parser.marks[:len(parser.marks)-1]
+
+	*event = yaml_event_t{
+		typ:        yaml_SEQUENCE_END_EVENT,
+		start_mark: token.start_mark,
+		end_mark:   token.end_mark,
+	}
+	yaml_parser_set_event_comments(parser, event)
+
+	skip_token(parser)
+	return true
+}
+
+// Parse the productions:
+//
+//	flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+//	                                     *** *
+func yaml_parser_parse_flow_sequence_entry_mapping_key(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	if token.typ != yaml_VALUE_TOKEN &&
+		token.typ != yaml_FLOW_ENTRY_TOKEN &&
+		token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
+		parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE)
+		return yaml_parser_parse_node(parser, event, false, false)
+	}
+	mark := token.end_mark
+	skip_token(parser)
+	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE
+	return yaml_parser_process_empty_scalar(parser, event, mark)
+}
+
+// Parse the productions:
+//
+//	flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+//	                                                     ***** *
+func yaml_parser_parse_flow_sequence_entry_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	if token.typ == yaml_VALUE_TOKEN {
+		skip_token(parser)
+		token := peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE)
+			return yaml_parser_parse_node(parser, event, false, false)
+		}
+	}
+	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE
+	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
+}
+
+// Parse the productions:
+//
+//	flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+//	                                                                     *
+func yaml_parser_parse_flow_sequence_entry_mapping_end(parser *yaml_parser_t, event *yaml_event_t) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE
+	*event = yaml_event_t{
+		typ:        yaml_MAPPING_END_EVENT,
+		start_mark: token.start_mark,
+		end_mark:   token.start_mark, // [Go] Shouldn't this be end_mark?
+	}
+	return true
+}
+
+// Parse the productions:
+//
+//	flow_mapping         ::= FLOW-MAPPING-START
+//	                         ******************
+//	                         (flow_mapping_entry FLOW-ENTRY)*
+//	                          *                  **********
+//	                         flow_mapping_entry?
+//	                         ******************
+//	                         FLOW-MAPPING-END
+//	                         ****************
+//	flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+//	                         *           *** *
+func yaml_parser_parse_flow_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
+	if first {
+		token := peek_token(parser)
+		parser.marks = append(parser.marks, token.start_mark)
+		skip_token(parser)
+	}
+
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
+		if !first {
+			if token.typ == yaml_FLOW_ENTRY_TOKEN {
+				skip_token(parser)
+				token = peek_token(parser)
+				if token == nil {
+					return false
+				}
+			} else {
+				context_mark := parser.marks[len(parser.marks)-1]
+				parser.marks = parser.marks[:len(parser.marks)-1]
+				return yaml_parser_set_parser_error_context(parser,
+					"while parsing a flow mapping", context_mark,
+					"did not find expected ',' or '}'", token.start_mark)
+			}
+		}
+
+		if token.typ == yaml_KEY_TOKEN {
+			skip_token(parser)
+			token = peek_token(parser)
+			if token == nil {
+				return false
+			}
+			if token.typ != yaml_VALUE_TOKEN &&
+				token.typ != yaml_FLOW_ENTRY_TOKEN &&
+				token.typ != yaml_FLOW_MAPPING_END_TOKEN {
+				parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_VALUE_STATE)
+				return yaml_parser_parse_node(parser, event, false, false)
+			} else {
+				parser.state = yaml_PARSE_FLOW_MAPPING_VALUE_STATE
+				return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
+			}
+		} else if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE)
+			return yaml_parser_parse_node(parser, event, false, false)
+		}
+	}
+
+	parser.state = parser.states[len(parser.states)-1]
+	parser.states = parser.states[:len(parser.states)-1]
+	parser.marks = parser.marks[:len(parser.marks)-1]
+	*event = yaml_event_t{
+		typ:        yaml_MAPPING_END_EVENT,
+		start_mark: token.start_mark,
+		end_mark:   token.end_mark,
+	}
+	yaml_parser_set_event_comments(parser, event)
+	skip_token(parser)
+	return true
+}
+
+// Parse the productions:
+//
+//	flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+//	                                  *                  ***** *
+func yaml_parser_parse_flow_mapping_value(parser *yaml_parser_t, event *yaml_event_t, empty bool) bool {
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+	if empty {
+		parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
+		return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
+	}
+	if token.typ == yaml_VALUE_TOKEN {
+		skip_token(parser)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_MAPPING_END_TOKEN {
+			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_KEY_STATE)
+			return yaml_parser_parse_node(parser, event, false, false)
+		}
+	}
+	parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
+	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
+}
+
+// Generate an empty scalar event.
+func yaml_parser_process_empty_scalar(parser *yaml_parser_t, event *yaml_event_t, mark yaml_mark_t) bool {
+	*event = yaml_event_t{
+		typ:        yaml_SCALAR_EVENT,
+		start_mark: mark,
+		end_mark:   mark,
+		value:      nil, // Empty
+		implicit:   true,
+		style:      yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
+	}
+	return true
+}
+
+var default_tag_directives = []yaml_tag_directive_t{
+	{[]byte("!"), []byte("!")},
+	{[]byte("!!"), []byte("tag:yaml.org,2002:")},
+}
+
+// Parse directives.
+func yaml_parser_process_directives(parser *yaml_parser_t,
+	version_directive_ref **yaml_version_directive_t,
+	tag_directives_ref *[]yaml_tag_directive_t) bool {
+
+	var version_directive *yaml_version_directive_t
+	var tag_directives []yaml_tag_directive_t
+
+	token := peek_token(parser)
+	if token == nil {
+		return false
+	}
+
+	for token.typ == yaml_VERSION_DIRECTIVE_TOKEN || token.typ == yaml_TAG_DIRECTIVE_TOKEN {
+		if token.typ == yaml_VERSION_DIRECTIVE_TOKEN {
+			if version_directive != nil {
+				yaml_parser_set_parser_error(parser,
+					"found duplicate %YAML directive", token.start_mark)
+				return false
+			}
+			if token.major != 1 || token.minor != 1 {
+				yaml_parser_set_parser_error(parser,
+					"found incompatible YAML document", token.start_mark)
+				return false
+			}
+			version_directive = &yaml_version_directive_t{
+				major: token.major,
+				minor: token.minor,
+			}
+		} else if token.typ == yaml_TAG_DIRECTIVE_TOKEN {
+			value := yaml_tag_directive_t{
+				handle: token.value,
+				prefix: token.prefix,
+			}
+			if !yaml_parser_append_tag_directive(parser, value, false, token.start_mark) {
+				return false
+			}
+			tag_directives = append(tag_directives, value)
+		}
+
+		skip_token(parser)
+		token = peek_token(parser)
+		if token == nil {
+			return false
+		}
+	}
+
+	for i := range default_tag_directives {
+		if !yaml_parser_append_tag_directive(parser, default_tag_directives[i], true, token.start_mark) {
+			return false
+		}
+	}
+
+	if version_directive_ref != nil {
+		*version_directive_ref = version_directive
+	}
+	if tag_directives_ref != nil {
+		*tag_directives_ref = tag_directives
+	}
+	return true
+}
+
+// Append a tag directive to the directives stack.
+func yaml_parser_append_tag_directive(parser *yaml_parser_t, value yaml_tag_directive_t, allow_duplicates bool, mark yaml_mark_t) bool {
+	for i := range parser.tag_directives {
+		if bytes.Equal(value.handle, parser.tag_directives[i].handle) {
+			if allow_duplicates {
+				return true
+			}
+			return yaml_parser_set_parser_error(parser, "found duplicate %TAG directive", mark)
+		}
+	}
+
+	// [Go] I suspect the copy is unnecessary. This was likely done
+	// because there was no way to track ownership of the data.
+	value_copy := yaml_tag_directive_t{
+		handle: make([]byte, len(value.handle)),
+		prefix: make([]byte, len(value.prefix)),
+	}
+	copy(value_copy.handle, value.handle)
+	copy(value_copy.prefix, value.prefix)
+	parser.tag_directives = append(parser.tag_directives, value_copy)
+	return true
+}
diff --git a/vendor/go.yaml.in/yaml/v3/readerc.go b/vendor/go.yaml.in/yaml/v3/readerc.go
new file mode 100644
index 000000000..56af24536
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/readerc.go
@@ -0,0 +1,434 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+import (
+	"io"
+)
+
+// Set the reader error and return 0.
+func yaml_parser_set_reader_error(parser *yaml_parser_t, problem string, offset int, value int) bool {
+	parser.error = yaml_READER_ERROR
+	parser.problem = problem
+	parser.problem_offset = offset
+	parser.problem_value = value
+	return false
+}
+
+// Byte order marks.
+const (
+	bom_UTF8    = "\xef\xbb\xbf"
+	bom_UTF16LE = "\xff\xfe"
+	bom_UTF16BE = "\xfe\xff"
+)
+
+// Determine the input stream encoding by checking the BOM symbol. If no BOM is
+// found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure.
+func yaml_parser_determine_encoding(parser *yaml_parser_t) bool {
+	// Ensure that we had enough bytes in the raw buffer.
+	for !parser.eof && len(parser.raw_buffer)-parser.raw_buffer_pos < 3 {
+		if !yaml_parser_update_raw_buffer(parser) {
+			return false
+		}
+	}
+
+	// Determine the encoding.
+	buf := parser.raw_buffer
+	pos := parser.raw_buffer_pos
+	avail := len(buf) - pos
+	if avail >= 2 && buf[pos] == bom_UTF16LE[0] && buf[pos+1] == bom_UTF16LE[1] {
+		parser.encoding = yaml_UTF16LE_ENCODING
+		parser.raw_buffer_pos += 2
+		parser.offset += 2
+	} else if avail >= 2 && buf[pos] == bom_UTF16BE[0] && buf[pos+1] == bom_UTF16BE[1] {
+		parser.encoding = yaml_UTF16BE_ENCODING
+		parser.raw_buffer_pos += 2
+		parser.offset += 2
+	} else if avail >= 3 && buf[pos] == bom_UTF8[0] && buf[pos+1] == bom_UTF8[1] && buf[pos+2] == bom_UTF8[2] {
+		parser.encoding = yaml_UTF8_ENCODING
+		parser.raw_buffer_pos += 3
+		parser.offset += 3
+	} else {
+		parser.encoding = yaml_UTF8_ENCODING
+	}
+	return true
+}
+
+// Update the raw buffer.
+func yaml_parser_update_raw_buffer(parser *yaml_parser_t) bool {
+	size_read := 0
+
+	// Return if the raw buffer is full.
+	if parser.raw_buffer_pos == 0 && len(parser.raw_buffer) == cap(parser.raw_buffer) {
+		return true
+	}
+
+	// Return on EOF.
+	if parser.eof {
+		return true
+	}
+
+	// Move the remaining bytes in the raw buffer to the beginning.
+	if parser.raw_buffer_pos > 0 && parser.raw_buffer_pos < len(parser.raw_buffer) {
+		copy(parser.raw_buffer, parser.raw_buffer[parser.raw_buffer_pos:])
+	}
+	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)-parser.raw_buffer_pos]
+	parser.raw_buffer_pos = 0
+
+	// Call the read handler to fill the buffer.
+	size_read, err := parser.read_handler(parser, parser.raw_buffer[len(parser.raw_buffer):cap(parser.raw_buffer)])
+	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)+size_read]
+	if err == io.EOF {
+		parser.eof = true
+	} else if err != nil {
+		return yaml_parser_set_reader_error(parser, "input error: "+err.Error(), parser.offset, -1)
+	}
+	return true
+}
+
+// Ensure that the buffer contains at least `length` characters.
+// Return true on success, false on failure.
+//
+// The length is supposed to be significantly less that the buffer size.
+func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
+	if parser.read_handler == nil {
+		panic("read handler must be set")
+	}
+
+	// [Go] This function was changed to guarantee the requested length size at EOF.
+	// The fact we need to do this is pretty awful, but the description above implies
+	// for that to be the case, and there are tests
+
+	// If the EOF flag is set and the raw buffer is empty, do nothing.
+	if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) {
+		// [Go] ACTUALLY! Read the documentation of this function above.
+		// This is just broken. To return true, we need to have the
+		// given length in the buffer. Not doing that means every single
+		// check that calls this function to make sure the buffer has a
+		// given length is Go) panicking; or C) accessing invalid memory.
+		//return true
+	}
+
+	// Return if the buffer contains enough characters.
+	if parser.unread >= length {
+		return true
+	}
+
+	// Determine the input encoding if it is not known yet.
+	if parser.encoding == yaml_ANY_ENCODING {
+		if !yaml_parser_determine_encoding(parser) {
+			return false
+		}
+	}
+
+	// Move the unread characters to the beginning of the buffer.
+	buffer_len := len(parser.buffer)
+	if parser.buffer_pos > 0 && parser.buffer_pos < buffer_len {
+		copy(parser.buffer, parser.buffer[parser.buffer_pos:])
+		buffer_len -= parser.buffer_pos
+		parser.buffer_pos = 0
+	} else if parser.buffer_pos == buffer_len {
+		buffer_len = 0
+		parser.buffer_pos = 0
+	}
+
+	// Open the whole buffer for writing, and cut it before returning.
+	parser.buffer = parser.buffer[:cap(parser.buffer)]
+
+	// Fill the buffer until it has enough characters.
+	first := true
+	for parser.unread < length {
+
+		// Fill the raw buffer if necessary.
+		if !first || parser.raw_buffer_pos == len(parser.raw_buffer) {
+			if !yaml_parser_update_raw_buffer(parser) {
+				parser.buffer = parser.buffer[:buffer_len]
+				return false
+			}
+		}
+		first = false
+
+		// Decode the raw buffer.
+	inner:
+		for parser.raw_buffer_pos != len(parser.raw_buffer) {
+			var value rune
+			var width int
+
+			raw_unread := len(parser.raw_buffer) - parser.raw_buffer_pos
+
+			// Decode the next character.
+			switch parser.encoding {
+			case yaml_UTF8_ENCODING:
+				// Decode a UTF-8 character.  Check RFC 3629
+				// (http://www.ietf.org/rfc/rfc3629.txt) for more details.
+				//
+				// The following table (taken from the RFC) is used for
+				// decoding.
+				//
+				//    Char. number range |        UTF-8 octet sequence
+				//      (hexadecimal)    |              (binary)
+				//   --------------------+------------------------------------
+				//   0000 0000-0000 007F | 0xxxxxxx
+				//   0000 0080-0000 07FF | 110xxxxx 10xxxxxx
+				//   0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
+				//   0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+				//
+				// Additionally, the characters in the range 0xD800-0xDFFF
+				// are prohibited as they are reserved for use with UTF-16
+				// surrogate pairs.
+
+				// Determine the length of the UTF-8 sequence.
+				octet := parser.raw_buffer[parser.raw_buffer_pos]
+				switch {
+				case octet&0x80 == 0x00:
+					width = 1
+				case octet&0xE0 == 0xC0:
+					width = 2
+				case octet&0xF0 == 0xE0:
+					width = 3
+				case octet&0xF8 == 0xF0:
+					width = 4
+				default:
+					// The leading octet is invalid.
+					return yaml_parser_set_reader_error(parser,
+						"invalid leading UTF-8 octet",
+						parser.offset, int(octet))
+				}
+
+				// Check if the raw buffer contains an incomplete character.
+				if width > raw_unread {
+					if parser.eof {
+						return yaml_parser_set_reader_error(parser,
+							"incomplete UTF-8 octet sequence",
+							parser.offset, -1)
+					}
+					break inner
+				}
+
+				// Decode the leading octet.
+				switch {
+				case octet&0x80 == 0x00:
+					value = rune(octet & 0x7F)
+				case octet&0xE0 == 0xC0:
+					value = rune(octet & 0x1F)
+				case octet&0xF0 == 0xE0:
+					value = rune(octet & 0x0F)
+				case octet&0xF8 == 0xF0:
+					value = rune(octet & 0x07)
+				default:
+					value = 0
+				}
+
+				// Check and decode the trailing octets.
+				for k := 1; k < width; k++ {
+					octet = parser.raw_buffer[parser.raw_buffer_pos+k]
+
+					// Check if the octet is valid.
+					if (octet & 0xC0) != 0x80 {
+						return yaml_parser_set_reader_error(parser,
+							"invalid trailing UTF-8 octet",
+							parser.offset+k, int(octet))
+					}
+
+					// Decode the octet.
+					value = (value << 6) + rune(octet&0x3F)
+				}
+
+				// Check the length of the sequence against the value.
+				switch {
+				case width == 1:
+				case width == 2 && value >= 0x80:
+				case width == 3 && value >= 0x800:
+				case width == 4 && value >= 0x10000:
+				default:
+					return yaml_parser_set_reader_error(parser,
+						"invalid length of a UTF-8 sequence",
+						parser.offset, -1)
+				}
+
+				// Check the range of the value.
+				if value >= 0xD800 && value <= 0xDFFF || value > 0x10FFFF {
+					return yaml_parser_set_reader_error(parser,
+						"invalid Unicode character",
+						parser.offset, int(value))
+				}
+
+			case yaml_UTF16LE_ENCODING, yaml_UTF16BE_ENCODING:
+				var low, high int
+				if parser.encoding == yaml_UTF16LE_ENCODING {
+					low, high = 0, 1
+				} else {
+					low, high = 1, 0
+				}
+
+				// The UTF-16 encoding is not as simple as one might
+				// naively think.  Check RFC 2781
+				// (http://www.ietf.org/rfc/rfc2781.txt).
+				//
+				// Normally, two subsequent bytes describe a Unicode
+				// character.  However a special technique (called a
+				// surrogate pair) is used for specifying character
+				// values larger than 0xFFFF.
+				//
+				// A surrogate pair consists of two pseudo-characters:
+				//      high surrogate area (0xD800-0xDBFF)
+				//      low surrogate area (0xDC00-0xDFFF)
+				//
+				// The following formulas are used for decoding
+				// and encoding characters using surrogate pairs:
+				//
+				//  U  = U' + 0x10000   (0x01 00 00 <= U <= 0x10 FF FF)
+				//  U' = yyyyyyyyyyxxxxxxxxxx   (0 <= U' <= 0x0F FF FF)
+				//  W1 = 110110yyyyyyyyyy
+				//  W2 = 110111xxxxxxxxxx
+				//
+				// where U is the character value, W1 is the high surrogate
+				// area, W2 is the low surrogate area.
+
+				// Check for incomplete UTF-16 character.
+				if raw_unread < 2 {
+					if parser.eof {
+						return yaml_parser_set_reader_error(parser,
+							"incomplete UTF-16 character",
+							parser.offset, -1)
+					}
+					break inner
+				}
+
+				// Get the character.
+				value = rune(parser.raw_buffer[parser.raw_buffer_pos+low]) +
+					(rune(parser.raw_buffer[parser.raw_buffer_pos+high]) << 8)
+
+				// Check for unexpected low surrogate area.
+				if value&0xFC00 == 0xDC00 {
+					return yaml_parser_set_reader_error(parser,
+						"unexpected low surrogate area",
+						parser.offset, int(value))
+				}
+
+				// Check for a high surrogate area.
+				if value&0xFC00 == 0xD800 {
+					width = 4
+
+					// Check for incomplete surrogate pair.
+					if raw_unread < 4 {
+						if parser.eof {
+							return yaml_parser_set_reader_error(parser,
+								"incomplete UTF-16 surrogate pair",
+								parser.offset, -1)
+						}
+						break inner
+					}
+
+					// Get the next character.
+					value2 := rune(parser.raw_buffer[parser.raw_buffer_pos+low+2]) +
+						(rune(parser.raw_buffer[parser.raw_buffer_pos+high+2]) << 8)
+
+					// Check for a low surrogate area.
+					if value2&0xFC00 != 0xDC00 {
+						return yaml_parser_set_reader_error(parser,
+							"expected low surrogate area",
+							parser.offset+2, int(value2))
+					}
+
+					// Generate the value of the surrogate pair.
+					value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF)
+				} else {
+					width = 2
+				}
+
+			default:
+				panic("impossible")
+			}
+
+			// Check if the character is in the allowed range:
+			//      #x9 | #xA | #xD | [#x20-#x7E]               (8 bit)
+			//      | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD]    (16 bit)
+			//      | [#x10000-#x10FFFF]                        (32 bit)
+			switch {
+			case value == 0x09:
+			case value == 0x0A:
+			case value == 0x0D:
+			case value >= 0x20 && value <= 0x7E:
+			case value == 0x85:
+			case value >= 0xA0 && value <= 0xD7FF:
+			case value >= 0xE000 && value <= 0xFFFD:
+			case value >= 0x10000 && value <= 0x10FFFF:
+			default:
+				return yaml_parser_set_reader_error(parser,
+					"control characters are not allowed",
+					parser.offset, int(value))
+			}
+
+			// Move the raw pointers.
+			parser.raw_buffer_pos += width
+			parser.offset += width
+
+			// Finally put the character into the buffer.
+			if value <= 0x7F {
+				// 0000 0000-0000 007F . 0xxxxxxx
+				parser.buffer[buffer_len+0] = byte(value)
+				buffer_len += 1
+			} else if value <= 0x7FF {
+				// 0000 0080-0000 07FF . 110xxxxx 10xxxxxx
+				parser.buffer[buffer_len+0] = byte(0xC0 + (value >> 6))
+				parser.buffer[buffer_len+1] = byte(0x80 + (value & 0x3F))
+				buffer_len += 2
+			} else if value <= 0xFFFF {
+				// 0000 0800-0000 FFFF . 1110xxxx 10xxxxxx 10xxxxxx
+				parser.buffer[buffer_len+0] = byte(0xE0 + (value >> 12))
+				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 6) & 0x3F))
+				parser.buffer[buffer_len+2] = byte(0x80 + (value & 0x3F))
+				buffer_len += 3
+			} else {
+				// 0001 0000-0010 FFFF . 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+				parser.buffer[buffer_len+0] = byte(0xF0 + (value >> 18))
+				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 12) & 0x3F))
+				parser.buffer[buffer_len+2] = byte(0x80 + ((value >> 6) & 0x3F))
+				parser.buffer[buffer_len+3] = byte(0x80 + (value & 0x3F))
+				buffer_len += 4
+			}
+
+			parser.unread++
+		}
+
+		// On EOF, put NUL into the buffer and return.
+		if parser.eof {
+			parser.buffer[buffer_len] = 0
+			buffer_len++
+			parser.unread++
+			break
+		}
+	}
+	// [Go] Read the documentation of this function above. To return true,
+	// we need to have the given length in the buffer. Not doing that means
+	// every single check that calls this function to make sure the buffer
+	// has a given length is Go) panicking; or C) accessing invalid memory.
+	// This happens here due to the EOF above breaking early.
+	for buffer_len < length {
+		parser.buffer[buffer_len] = 0
+		buffer_len++
+	}
+	parser.buffer = parser.buffer[:buffer_len]
+	return true
+}
diff --git a/vendor/go.yaml.in/yaml/v3/resolve.go b/vendor/go.yaml.in/yaml/v3/resolve.go
new file mode 100644
index 000000000..64ae88805
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/resolve.go
@@ -0,0 +1,326 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package yaml
+
+import (
+	"encoding/base64"
+	"math"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type resolveMapItem struct {
+	value interface{}
+	tag   string
+}
+
+var resolveTable = make([]byte, 256)
+var resolveMap = make(map[string]resolveMapItem)
+
+func init() {
+	t := resolveTable
+	t[int('+')] = 'S' // Sign
+	t[int('-')] = 'S'
+	for _, c := range "0123456789" {
+		t[int(c)] = 'D' // Digit
+	}
+	for _, c := range "yYnNtTfFoO~" {
+		t[int(c)] = 'M' // In map
+	}
+	t[int('.')] = '.' // Float (potentially in map)
+
+	var resolveMapList = []struct {
+		v   interface{}
+		tag string
+		l   []string
+	}{
+		{true, boolTag, []string{"true", "True", "TRUE"}},
+		{false, boolTag, []string{"false", "False", "FALSE"}},
+		{nil, nullTag, []string{"", "~", "null", "Null", "NULL"}},
+		{math.NaN(), floatTag, []string{".nan", ".NaN", ".NAN"}},
+		{math.Inf(+1), floatTag, []string{".inf", ".Inf", ".INF"}},
+		{math.Inf(+1), floatTag, []string{"+.inf", "+.Inf", "+.INF"}},
+		{math.Inf(-1), floatTag, []string{"-.inf", "-.Inf", "-.INF"}},
+		{"<<", mergeTag, []string{"<<"}},
+	}
+
+	m := resolveMap
+	for _, item := range resolveMapList {
+		for _, s := range item.l {
+			m[s] = resolveMapItem{item.v, item.tag}
+		}
+	}
+}
+
+const (
+	nullTag      = "!!null"
+	boolTag      = "!!bool"
+	strTag       = "!!str"
+	intTag       = "!!int"
+	floatTag     = "!!float"
+	timestampTag = "!!timestamp"
+	seqTag       = "!!seq"
+	mapTag       = "!!map"
+	binaryTag    = "!!binary"
+	mergeTag     = "!!merge"
+)
+
+var longTags = make(map[string]string)
+var shortTags = make(map[string]string)
+
+func init() {
+	for _, stag := range []string{nullTag, boolTag, strTag, intTag, floatTag, timestampTag, seqTag, mapTag, binaryTag, mergeTag} {
+		ltag := longTag(stag)
+		longTags[stag] = ltag
+		shortTags[ltag] = stag
+	}
+}
+
+const longTagPrefix = "tag:yaml.org,2002:"
+
+func shortTag(tag string) string {
+	if strings.HasPrefix(tag, longTagPrefix) {
+		if stag, ok := shortTags[tag]; ok {
+			return stag
+		}
+		return "!!" + tag[len(longTagPrefix):]
+	}
+	return tag
+}
+
+func longTag(tag string) string {
+	if strings.HasPrefix(tag, "!!") {
+		if ltag, ok := longTags[tag]; ok {
+			return ltag
+		}
+		return longTagPrefix + tag[2:]
+	}
+	return tag
+}
+
+func resolvableTag(tag string) bool {
+	switch tag {
+	case "", strTag, boolTag, intTag, floatTag, nullTag, timestampTag:
+		return true
+	}
+	return false
+}
+
+var yamlStyleFloat = regexp.MustCompile(`^[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?$`)
+
+func resolve(tag string, in string) (rtag string, out interface{}) {
+	tag = shortTag(tag)
+	if !resolvableTag(tag) {
+		return tag, in
+	}
+
+	defer func() {
+		switch tag {
+		case "", rtag, strTag, binaryTag:
+			return
+		case floatTag:
+			if rtag == intTag {
+				switch v := out.(type) {
+				case int64:
+					rtag = floatTag
+					out = float64(v)
+					return
+				case int:
+					rtag = floatTag
+					out = float64(v)
+					return
+				}
+			}
+		}
+		failf("cannot decode %s `%s` as a %s", shortTag(rtag), in, shortTag(tag))
+	}()
+
+	// Any data is accepted as a !!str or !!binary.
+	// Otherwise, the prefix is enough of a hint about what it might be.
+	hint := byte('N')
+	if in != "" {
+		hint = resolveTable[in[0]]
+	}
+	if hint != 0 && tag != strTag && tag != binaryTag {
+		// Handle things we can lookup in a map.
+		if item, ok := resolveMap[in]; ok {
+			return item.tag, item.value
+		}
+
+		// Base 60 floats are a bad idea, were dropped in YAML 1.2, and
+		// are purposefully unsupported here. They're still quoted on
+		// the way out for compatibility with other parser, though.
+
+		switch hint {
+		case 'M':
+			// We've already checked the map above.
+
+		case '.':
+			// Not in the map, so maybe a normal float.
+			floatv, err := strconv.ParseFloat(in, 64)
+			if err == nil {
+				return floatTag, floatv
+			}
+
+		case 'D', 'S':
+			// Int, float, or timestamp.
+			// Only try values as a timestamp if the value is unquoted or there's an explicit
+			// !!timestamp tag.
+			if tag == "" || tag == timestampTag {
+				t, ok := parseTimestamp(in)
+				if ok {
+					return timestampTag, t
+				}
+			}
+
+			plain := strings.Replace(in, "_", "", -1)
+			intv, err := strconv.ParseInt(plain, 0, 64)
+			if err == nil {
+				if intv == int64(int(intv)) {
+					return intTag, int(intv)
+				} else {
+					return intTag, intv
+				}
+			}
+			uintv, err := strconv.ParseUint(plain, 0, 64)
+			if err == nil {
+				return intTag, uintv
+			}
+			if yamlStyleFloat.MatchString(plain) {
+				floatv, err := strconv.ParseFloat(plain, 64)
+				if err == nil {
+					return floatTag, floatv
+				}
+			}
+			if strings.HasPrefix(plain, "0b") {
+				intv, err := strconv.ParseInt(plain[2:], 2, 64)
+				if err == nil {
+					if intv == int64(int(intv)) {
+						return intTag, int(intv)
+					} else {
+						return intTag, intv
+					}
+				}
+				uintv, err := strconv.ParseUint(plain[2:], 2, 64)
+				if err == nil {
+					return intTag, uintv
+				}
+			} else if strings.HasPrefix(plain, "-0b") {
+				intv, err := strconv.ParseInt("-"+plain[3:], 2, 64)
+				if err == nil {
+					if true || intv == int64(int(intv)) {
+						return intTag, int(intv)
+					} else {
+						return intTag, intv
+					}
+				}
+			}
+			// Octals as introduced in version 1.2 of the spec.
+			// Octals from the 1.1 spec, spelled as 0777, are still
+			// decoded by default in v3 as well for compatibility.
+			// May be dropped in v4 depending on how usage evolves.
+			if strings.HasPrefix(plain, "0o") {
+				intv, err := strconv.ParseInt(plain[2:], 8, 64)
+				if err == nil {
+					if intv == int64(int(intv)) {
+						return intTag, int(intv)
+					} else {
+						return intTag, intv
+					}
+				}
+				uintv, err := strconv.ParseUint(plain[2:], 8, 64)
+				if err == nil {
+					return intTag, uintv
+				}
+			} else if strings.HasPrefix(plain, "-0o") {
+				intv, err := strconv.ParseInt("-"+plain[3:], 8, 64)
+				if err == nil {
+					if true || intv == int64(int(intv)) {
+						return intTag, int(intv)
+					} else {
+						return intTag, intv
+					}
+				}
+			}
+		default:
+			panic("internal error: missing handler for resolver table: " + string(rune(hint)) + " (with " + in + ")")
+		}
+	}
+	return strTag, in
+}
+
+// encodeBase64 encodes s as base64 that is broken up into multiple lines
+// as appropriate for the resulting length.
+func encodeBase64(s string) string {
+	const lineLen = 70
+	encLen := base64.StdEncoding.EncodedLen(len(s))
+	lines := encLen/lineLen + 1
+	buf := make([]byte, encLen*2+lines)
+	in := buf[0:encLen]
+	out := buf[encLen:]
+	base64.StdEncoding.Encode(in, []byte(s))
+	k := 0
+	for i := 0; i < len(in); i += lineLen {
+		j := i + lineLen
+		if j > len(in) {
+			j = len(in)
+		}
+		k += copy(out[k:], in[i:j])
+		if lines > 1 {
+			out[k] = '\n'
+			k++
+		}
+	}
+	return string(out[:k])
+}
+
+// This is a subset of the formats allowed by the regular expression
+// defined at http://yaml.org/type/timestamp.html.
+var allowedTimestampFormats = []string{
+	"2006-1-2T15:4:5.999999999Z07:00", // RCF3339Nano with short date fields.
+	"2006-1-2t15:4:5.999999999Z07:00", // RFC3339Nano with short date fields and lower-case "t".
+	"2006-1-2 15:4:5.999999999",       // space separated with no time zone
+	"2006-1-2",                        // date only
+	// Notable exception: time.Parse cannot handle: "2001-12-14 21:59:43.10 -5"
+	// from the set of examples.
+}
+
+// parseTimestamp parses s as a timestamp string and
+// returns the timestamp and reports whether it succeeded.
+// Timestamp formats are defined at http://yaml.org/type/timestamp.html
+func parseTimestamp(s string) (time.Time, bool) {
+	// TODO write code to check all the formats supported by
+	// http://yaml.org/type/timestamp.html instead of using time.Parse.
+
+	// Quick check: all date formats start with YYYY-.
+	i := 0
+	for ; i < len(s); i++ {
+		if c := s[i]; c < '0' || c > '9' {
+			break
+		}
+	}
+	if i != 4 || i == len(s) || s[i] != '-' {
+		return time.Time{}, false
+	}
+	for _, format := range allowedTimestampFormats {
+		if t, err := time.Parse(format, s); err == nil {
+			return t, true
+		}
+	}
+	return time.Time{}, false
+}
diff --git a/vendor/go.yaml.in/yaml/v3/scannerc.go b/vendor/go.yaml.in/yaml/v3/scannerc.go
new file mode 100644
index 000000000..30b1f0892
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/scannerc.go
@@ -0,0 +1,3040 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+import (
+	"bytes"
+	"fmt"
+)
+
+// Introduction
+// ************
+//
+// The following notes assume that you are familiar with the YAML specification
+// (http://yaml.org/spec/1.2/spec.html).  We mostly follow it, although in
+// some cases we are less restrictive that it requires.
+//
+// The process of transforming a YAML stream into a sequence of events is
+// divided on two steps: Scanning and Parsing.
+//
+// The Scanner transforms the input stream into a sequence of tokens, while the
+// parser transform the sequence of tokens produced by the Scanner into a
+// sequence of parsing events.
+//
+// The Scanner is rather clever and complicated. The Parser, on the contrary,
+// is a straightforward implementation of a recursive-descendant parser (or,
+// LL(1) parser, as it is usually called).
+//
+// Actually there are two issues of Scanning that might be called "clever", the
+// rest is quite straightforward.  The issues are "block collection start" and
+// "simple keys".  Both issues are explained below in details.
+//
+// Here the Scanning step is explained and implemented.  We start with the list
+// of all the tokens produced by the Scanner together with short descriptions.
+//
+// Now, tokens:
+//
+//      STREAM-START(encoding)          # The stream start.
+//      STREAM-END                      # The stream end.
+//      VERSION-DIRECTIVE(major,minor)  # The '%YAML' directive.
+//      TAG-DIRECTIVE(handle,prefix)    # The '%TAG' directive.
+//      DOCUMENT-START                  # '---'
+//      DOCUMENT-END                    # '...'
+//      BLOCK-SEQUENCE-START            # Indentation increase denoting a block
+//      BLOCK-MAPPING-START             # sequence or a block mapping.
+//      BLOCK-END                       # Indentation decrease.
+//      FLOW-SEQUENCE-START             # '['
+//      FLOW-SEQUENCE-END               # ']'
+//      BLOCK-SEQUENCE-START            # '{'
+//      BLOCK-SEQUENCE-END              # '}'
+//      BLOCK-ENTRY                     # '-'
+//      FLOW-ENTRY                      # ','
+//      KEY                             # '?' or nothing (simple keys).
+//      VALUE                           # ':'
+//      ALIAS(anchor)                   # '*anchor'
+//      ANCHOR(anchor)                  # '&anchor'
+//      TAG(handle,suffix)              # '!handle!suffix'
+//      SCALAR(value,style)             # A scalar.
+//
+// The following two tokens are "virtual" tokens denoting the beginning and the
+// end of the stream:
+//
+//      STREAM-START(encoding)
+//      STREAM-END
+//
+// We pass the information about the input stream encoding with the
+// STREAM-START token.
+//
+// The next two tokens are responsible for tags:
+//
+//      VERSION-DIRECTIVE(major,minor)
+//      TAG-DIRECTIVE(handle,prefix)
+//
+// Example:
+//
+//      %YAML   1.1
+//      %TAG    !   !foo
+//      %TAG    !yaml!  tag:yaml.org,2002:
+//      ---
+//
+// The correspoding sequence of tokens:
+//
+//      STREAM-START(utf-8)
+//      VERSION-DIRECTIVE(1,1)
+//      TAG-DIRECTIVE("!","!foo")
+//      TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:")
+//      DOCUMENT-START
+//      STREAM-END
+//
+// Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole
+// line.
+//
+// The document start and end indicators are represented by:
+//
+//      DOCUMENT-START
+//      DOCUMENT-END
+//
+// Note that if a YAML stream contains an implicit document (without '---'
+// and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be
+// produced.
+//
+// In the following examples, we present whole documents together with the
+// produced tokens.
+//
+//      1. An implicit document:
+//
+//          'a scalar'
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          SCALAR("a scalar",single-quoted)
+//          STREAM-END
+//
+//      2. An explicit document:
+//
+//          ---
+//          'a scalar'
+//          ...
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          DOCUMENT-START
+//          SCALAR("a scalar",single-quoted)
+//          DOCUMENT-END
+//          STREAM-END
+//
+//      3. Several documents in a stream:
+//
+//          'a scalar'
+//          ---
+//          'another scalar'
+//          ---
+//          'yet another scalar'
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          SCALAR("a scalar",single-quoted)
+//          DOCUMENT-START
+//          SCALAR("another scalar",single-quoted)
+//          DOCUMENT-START
+//          SCALAR("yet another scalar",single-quoted)
+//          STREAM-END
+//
+// We have already introduced the SCALAR token above.  The following tokens are
+// used to describe aliases, anchors, tag, and scalars:
+//
+//      ALIAS(anchor)
+//      ANCHOR(anchor)
+//      TAG(handle,suffix)
+//      SCALAR(value,style)
+//
+// The following series of examples illustrate the usage of these tokens:
+//
+//      1. A recursive sequence:
+//
+//          &A [ *A ]
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          ANCHOR("A")
+//          FLOW-SEQUENCE-START
+//          ALIAS("A")
+//          FLOW-SEQUENCE-END
+//          STREAM-END
+//
+//      2. A tagged scalar:
+//
+//          !!float "3.14"  # A good approximation.
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          TAG("!!","float")
+//          SCALAR("3.14",double-quoted)
+//          STREAM-END
+//
+//      3. Various scalar styles:
+//
+//          --- # Implicit empty plain scalars do not produce tokens.
+//          --- a plain scalar
+//          --- 'a single-quoted scalar'
+//          --- "a double-quoted scalar"
+//          --- |-
+//            a literal scalar
+//          --- >-
+//            a folded
+//            scalar
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          DOCUMENT-START
+//          DOCUMENT-START
+//          SCALAR("a plain scalar",plain)
+//          DOCUMENT-START
+//          SCALAR("a single-quoted scalar",single-quoted)
+//          DOCUMENT-START
+//          SCALAR("a double-quoted scalar",double-quoted)
+//          DOCUMENT-START
+//          SCALAR("a literal scalar",literal)
+//          DOCUMENT-START
+//          SCALAR("a folded scalar",folded)
+//          STREAM-END
+//
+// Now it's time to review collection-related tokens. We will start with
+// flow collections:
+//
+//      FLOW-SEQUENCE-START
+//      FLOW-SEQUENCE-END
+//      FLOW-MAPPING-START
+//      FLOW-MAPPING-END
+//      FLOW-ENTRY
+//      KEY
+//      VALUE
+//
+// The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and
+// FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}'
+// correspondingly.  FLOW-ENTRY represent the ',' indicator.  Finally the
+// indicators '?' and ':', which are used for denoting mapping keys and values,
+// are represented by the KEY and VALUE tokens.
+//
+// The following examples show flow collections:
+//
+//      1. A flow sequence:
+//
+//          [item 1, item 2, item 3]
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          FLOW-SEQUENCE-START
+//          SCALAR("item 1",plain)
+//          FLOW-ENTRY
+//          SCALAR("item 2",plain)
+//          FLOW-ENTRY
+//          SCALAR("item 3",plain)
+//          FLOW-SEQUENCE-END
+//          STREAM-END
+//
+//      2. A flow mapping:
+//
+//          {
+//              a simple key: a value,  # Note that the KEY token is produced.
+//              ? a complex key: another value,
+//          }
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          FLOW-MAPPING-START
+//          KEY
+//          SCALAR("a simple key",plain)
+//          VALUE
+//          SCALAR("a value",plain)
+//          FLOW-ENTRY
+//          KEY
+//          SCALAR("a complex key",plain)
+//          VALUE
+//          SCALAR("another value",plain)
+//          FLOW-ENTRY
+//          FLOW-MAPPING-END
+//          STREAM-END
+//
+// A simple key is a key which is not denoted by the '?' indicator.  Note that
+// the Scanner still produce the KEY token whenever it encounters a simple key.
+//
+// For scanning block collections, the following tokens are used (note that we
+// repeat KEY and VALUE here):
+//
+//      BLOCK-SEQUENCE-START
+//      BLOCK-MAPPING-START
+//      BLOCK-END
+//      BLOCK-ENTRY
+//      KEY
+//      VALUE
+//
+// The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
+// increase that precedes a block collection (cf. the INDENT token in Python).
+// The token BLOCK-END denote indentation decrease that ends a block collection
+// (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
+// that makes detections of these tokens more complex.
+//
+// The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
+// '-', '?', and ':' correspondingly.
+//
+// The following examples show how the tokens BLOCK-SEQUENCE-START,
+// BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner:
+//
+//      1. Block sequences:
+//
+//          - item 1
+//          - item 2
+//          -
+//            - item 3.1
+//            - item 3.2
+//          -
+//            key 1: value 1
+//            key 2: value 2
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          BLOCK-SEQUENCE-START
+//          BLOCK-ENTRY
+//          SCALAR("item 1",plain)
+//          BLOCK-ENTRY
+//          SCALAR("item 2",plain)
+//          BLOCK-ENTRY
+//          BLOCK-SEQUENCE-START
+//          BLOCK-ENTRY
+//          SCALAR("item 3.1",plain)
+//          BLOCK-ENTRY
+//          SCALAR("item 3.2",plain)
+//          BLOCK-END
+//          BLOCK-ENTRY
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("key 1",plain)
+//          VALUE
+//          SCALAR("value 1",plain)
+//          KEY
+//          SCALAR("key 2",plain)
+//          VALUE
+//          SCALAR("value 2",plain)
+//          BLOCK-END
+//          BLOCK-END
+//          STREAM-END
+//
+//      2. Block mappings:
+//
+//          a simple key: a value   # The KEY token is produced here.
+//          ? a complex key
+//          : another value
+//          a mapping:
+//            key 1: value 1
+//            key 2: value 2
+//          a sequence:
+//            - item 1
+//            - item 2
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("a simple key",plain)
+//          VALUE
+//          SCALAR("a value",plain)
+//          KEY
+//          SCALAR("a complex key",plain)
+//          VALUE
+//          SCALAR("another value",plain)
+//          KEY
+//          SCALAR("a mapping",plain)
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("key 1",plain)
+//          VALUE
+//          SCALAR("value 1",plain)
+//          KEY
+//          SCALAR("key 2",plain)
+//          VALUE
+//          SCALAR("value 2",plain)
+//          BLOCK-END
+//          KEY
+//          SCALAR("a sequence",plain)
+//          VALUE
+//          BLOCK-SEQUENCE-START
+//          BLOCK-ENTRY
+//          SCALAR("item 1",plain)
+//          BLOCK-ENTRY
+//          SCALAR("item 2",plain)
+//          BLOCK-END
+//          BLOCK-END
+//          STREAM-END
+//
+// YAML does not always require to start a new block collection from a new
+// line.  If the current line contains only '-', '?', and ':' indicators, a new
+// block collection may start at the current line.  The following examples
+// illustrate this case:
+//
+//      1. Collections in a sequence:
+//
+//          - - item 1
+//            - item 2
+//          - key 1: value 1
+//            key 2: value 2
+//          - ? complex key
+//            : complex value
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          BLOCK-SEQUENCE-START
+//          BLOCK-ENTRY
+//          BLOCK-SEQUENCE-START
+//          BLOCK-ENTRY
+//          SCALAR("item 1",plain)
+//          BLOCK-ENTRY
+//          SCALAR("item 2",plain)
+//          BLOCK-END
+//          BLOCK-ENTRY
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("key 1",plain)
+//          VALUE
+//          SCALAR("value 1",plain)
+//          KEY
+//          SCALAR("key 2",plain)
+//          VALUE
+//          SCALAR("value 2",plain)
+//          BLOCK-END
+//          BLOCK-ENTRY
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("complex key")
+//          VALUE
+//          SCALAR("complex value")
+//          BLOCK-END
+//          BLOCK-END
+//          STREAM-END
+//
+//      2. Collections in a mapping:
+//
+//          ? a sequence
+//          : - item 1
+//            - item 2
+//          ? a mapping
+//          : key 1: value 1
+//            key 2: value 2
+//
+//      Tokens:
+//
+//          STREAM-START(utf-8)
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("a sequence",plain)
+//          VALUE
+//          BLOCK-SEQUENCE-START
+//          BLOCK-ENTRY
+//          SCALAR("item 1",plain)
+//          BLOCK-ENTRY
+//          SCALAR("item 2",plain)
+//          BLOCK-END
+//          KEY
+//          SCALAR("a mapping",plain)
+//          VALUE
+//          BLOCK-MAPPING-START
+//          KEY
+//          SCALAR("key 1",plain)
+//          VALUE
+//          SCALAR("value 1",plain)
+//          KEY
+//          SCALAR("key 2",plain)
+//          VALUE
+//          SCALAR("value 2",plain)
+//          BLOCK-END
+//          BLOCK-END
+//          STREAM-END
+//
+// YAML also permits non-indented sequences if they are included into a block
+// mapping.  In this case, the token BLOCK-SEQUENCE-START is not produced:
+//
+//      key:
+//      - item 1    # BLOCK-SEQUENCE-START is NOT produced here.
+//      - item 2
+//
+// Tokens:
+//
+//      STREAM-START(utf-8)
+//      BLOCK-MAPPING-START
+//      KEY
+//      SCALAR("key",plain)
+//      VALUE
+//      BLOCK-ENTRY
+//      SCALAR("item 1",plain)
+//      BLOCK-ENTRY
+//      SCALAR("item 2",plain)
+//      BLOCK-END
+//
+
+// Ensure that the buffer contains the required number of characters.
+// Return true on success, false on failure (reader error or memory error).
+func cache(parser *yaml_parser_t, length int) bool {
+	// [Go] This was inlined: !cache(A, B) -> unread < B && !update(A, B)
+	return parser.unread >= length || yaml_parser_update_buffer(parser, length)
+}
+
+// Advance the buffer pointer.
+func skip(parser *yaml_parser_t) {
+	if !is_blank(parser.buffer, parser.buffer_pos) {
+		parser.newlines = 0
+	}
+	parser.mark.index++
+	parser.mark.column++
+	parser.unread--
+	parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
+}
+
+func skip_line(parser *yaml_parser_t) {
+	if is_crlf(parser.buffer, parser.buffer_pos) {
+		parser.mark.index += 2
+		parser.mark.column = 0
+		parser.mark.line++
+		parser.unread -= 2
+		parser.buffer_pos += 2
+		parser.newlines++
+	} else if is_break(parser.buffer, parser.buffer_pos) {
+		parser.mark.index++
+		parser.mark.column = 0
+		parser.mark.line++
+		parser.unread--
+		parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
+		parser.newlines++
+	}
+}
+
+// Copy a character to a string buffer and advance pointers.
+func read(parser *yaml_parser_t, s []byte) []byte {
+	if !is_blank(parser.buffer, parser.buffer_pos) {
+		parser.newlines = 0
+	}
+	w := width(parser.buffer[parser.buffer_pos])
+	if w == 0 {
+		panic("invalid character sequence")
+	}
+	if len(s) == 0 {
+		s = make([]byte, 0, 32)
+	}
+	if w == 1 && len(s)+w <= cap(s) {
+		s = s[:len(s)+1]
+		s[len(s)-1] = parser.buffer[parser.buffer_pos]
+		parser.buffer_pos++
+	} else {
+		s = append(s, parser.buffer[parser.buffer_pos:parser.buffer_pos+w]...)
+		parser.buffer_pos += w
+	}
+	parser.mark.index++
+	parser.mark.column++
+	parser.unread--
+	return s
+}
+
+// Copy a line break character to a string buffer and advance pointers.
+func read_line(parser *yaml_parser_t, s []byte) []byte {
+	buf := parser.buffer
+	pos := parser.buffer_pos
+	switch {
+	case buf[pos] == '\r' && buf[pos+1] == '\n':
+		// CR LF . LF
+		s = append(s, '\n')
+		parser.buffer_pos += 2
+		parser.mark.index++
+		parser.unread--
+	case buf[pos] == '\r' || buf[pos] == '\n':
+		// CR|LF . LF
+		s = append(s, '\n')
+		parser.buffer_pos += 1
+	case buf[pos] == '\xC2' && buf[pos+1] == '\x85':
+		// NEL . LF
+		s = append(s, '\n')
+		parser.buffer_pos += 2
+	case buf[pos] == '\xE2' && buf[pos+1] == '\x80' && (buf[pos+2] == '\xA8' || buf[pos+2] == '\xA9'):
+		// LS|PS . LS|PS
+		s = append(s, buf[parser.buffer_pos:pos+3]...)
+		parser.buffer_pos += 3
+	default:
+		return s
+	}
+	parser.mark.index++
+	parser.mark.column = 0
+	parser.mark.line++
+	parser.unread--
+	parser.newlines++
+	return s
+}
+
+// Get the next token.
+func yaml_parser_scan(parser *yaml_parser_t, token *yaml_token_t) bool {
+	// Erase the token object.
+	*token = yaml_token_t{} // [Go] Is this necessary?
+
+	// No tokens after STREAM-END or error.
+	if parser.stream_end_produced || parser.error != yaml_NO_ERROR {
+		return true
+	}
+
+	// Ensure that the tokens queue contains enough tokens.
+	if !parser.token_available {
+		if !yaml_parser_fetch_more_tokens(parser) {
+			return false
+		}
+	}
+
+	// Fetch the next token from the queue.
+	*token = parser.tokens[parser.tokens_head]
+	parser.tokens_head++
+	parser.tokens_parsed++
+	parser.token_available = false
+
+	if token.typ == yaml_STREAM_END_TOKEN {
+		parser.stream_end_produced = true
+	}
+	return true
+}
+
+// Set the scanner error and return false.
+func yaml_parser_set_scanner_error(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string) bool {
+	parser.error = yaml_SCANNER_ERROR
+	parser.context = context
+	parser.context_mark = context_mark
+	parser.problem = problem
+	parser.problem_mark = parser.mark
+	return false
+}
+
+func yaml_parser_set_scanner_tag_error(parser *yaml_parser_t, directive bool, context_mark yaml_mark_t, problem string) bool {
+	context := "while parsing a tag"
+	if directive {
+		context = "while parsing a %TAG directive"
+	}
+	return yaml_parser_set_scanner_error(parser, context, context_mark, problem)
+}
+
+func trace(args ...interface{}) func() {
+	pargs := append([]interface{}{"+++"}, args...)
+	fmt.Println(pargs...)
+	pargs = append([]interface{}{"---"}, args...)
+	return func() { fmt.Println(pargs...) }
+}
+
+// Ensure that the tokens queue contains at least one token which can be
+// returned to the Parser.
+func yaml_parser_fetch_more_tokens(parser *yaml_parser_t) bool {
+	// While we need more tokens to fetch, do it.
+	for {
+		// [Go] The comment parsing logic requires a lookahead of two tokens
+		// so that foot comments may be parsed in time of associating them
+		// with the tokens that are parsed before them, and also for line
+		// comments to be transformed into head comments in some edge cases.
+		if parser.tokens_head < len(parser.tokens)-2 {
+			// If a potential simple key is at the head position, we need to fetch
+			// the next token to disambiguate it.
+			head_tok_idx, ok := parser.simple_keys_by_tok[parser.tokens_parsed]
+			if !ok {
+				break
+			} else if valid, ok := yaml_simple_key_is_valid(parser, &parser.simple_keys[head_tok_idx]); !ok {
+				return false
+			} else if !valid {
+				break
+			}
+		}
+		// Fetch the next token.
+		if !yaml_parser_fetch_next_token(parser) {
+			return false
+		}
+	}
+
+	parser.token_available = true
+	return true
+}
+
+// The dispatcher for token fetchers.
+func yaml_parser_fetch_next_token(parser *yaml_parser_t) (ok bool) {
+	// Ensure that the buffer is initialized.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	// Check if we just started scanning.  Fetch STREAM-START then.
+	if !parser.stream_start_produced {
+		return yaml_parser_fetch_stream_start(parser)
+	}
+
+	scan_mark := parser.mark
+
+	// Eat whitespaces and comments until we reach the next token.
+	if !yaml_parser_scan_to_next_token(parser) {
+		return false
+	}
+
+	// [Go] While unrolling indents, transform the head comments of prior
+	// indentation levels observed after scan_start into foot comments at
+	// the respective indexes.
+
+	// Check the indentation level against the current column.
+	if !yaml_parser_unroll_indent(parser, parser.mark.column, scan_mark) {
+		return false
+	}
+
+	// Ensure that the buffer contains at least 4 characters.  4 is the length
+	// of the longest indicators ('--- ' and '... ').
+	if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
+		return false
+	}
+
+	// Is it the end of the stream?
+	if is_z(parser.buffer, parser.buffer_pos) {
+		return yaml_parser_fetch_stream_end(parser)
+	}
+
+	// Is it a directive?
+	if parser.mark.column == 0 && parser.buffer[parser.buffer_pos] == '%' {
+		return yaml_parser_fetch_directive(parser)
+	}
+
+	buf := parser.buffer
+	pos := parser.buffer_pos
+
+	// Is it the document start indicator?
+	if parser.mark.column == 0 && buf[pos] == '-' && buf[pos+1] == '-' && buf[pos+2] == '-' && is_blankz(buf, pos+3) {
+		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_START_TOKEN)
+	}
+
+	// Is it the document end indicator?
+	if parser.mark.column == 0 && buf[pos] == '.' && buf[pos+1] == '.' && buf[pos+2] == '.' && is_blankz(buf, pos+3) {
+		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_END_TOKEN)
+	}
+
+	comment_mark := parser.mark
+	if len(parser.tokens) > 0 && (parser.flow_level == 0 && buf[pos] == ':' || parser.flow_level > 0 && buf[pos] == ',') {
+		// Associate any following comments with the prior token.
+		comment_mark = parser.tokens[len(parser.tokens)-1].start_mark
+	}
+	defer func() {
+		if !ok {
+			return
+		}
+		if len(parser.tokens) > 0 && parser.tokens[len(parser.tokens)-1].typ == yaml_BLOCK_ENTRY_TOKEN {
+			// Sequence indicators alone have no line comments. It becomes
+			// a head comment for whatever follows.
+			return
+		}
+		if !yaml_parser_scan_line_comment(parser, comment_mark) {
+			ok = false
+			return
+		}
+	}()
+
+	// Is it the flow sequence start indicator?
+	if buf[pos] == '[' {
+		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_SEQUENCE_START_TOKEN)
+	}
+
+	// Is it the flow mapping start indicator?
+	if parser.buffer[parser.buffer_pos] == '{' {
+		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_MAPPING_START_TOKEN)
+	}
+
+	// Is it the flow sequence end indicator?
+	if parser.buffer[parser.buffer_pos] == ']' {
+		return yaml_parser_fetch_flow_collection_end(parser,
+			yaml_FLOW_SEQUENCE_END_TOKEN)
+	}
+
+	// Is it the flow mapping end indicator?
+	if parser.buffer[parser.buffer_pos] == '}' {
+		return yaml_parser_fetch_flow_collection_end(parser,
+			yaml_FLOW_MAPPING_END_TOKEN)
+	}
+
+	// Is it the flow entry indicator?
+	if parser.buffer[parser.buffer_pos] == ',' {
+		return yaml_parser_fetch_flow_entry(parser)
+	}
+
+	// Is it the block entry indicator?
+	if parser.buffer[parser.buffer_pos] == '-' && is_blankz(parser.buffer, parser.buffer_pos+1) {
+		return yaml_parser_fetch_block_entry(parser)
+	}
+
+	// Is it the key indicator?
+	if parser.buffer[parser.buffer_pos] == '?' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
+		return yaml_parser_fetch_key(parser)
+	}
+
+	// Is it the value indicator?
+	if parser.buffer[parser.buffer_pos] == ':' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
+		return yaml_parser_fetch_value(parser)
+	}
+
+	// Is it an alias?
+	if parser.buffer[parser.buffer_pos] == '*' {
+		return yaml_parser_fetch_anchor(parser, yaml_ALIAS_TOKEN)
+	}
+
+	// Is it an anchor?
+	if parser.buffer[parser.buffer_pos] == '&' {
+		return yaml_parser_fetch_anchor(parser, yaml_ANCHOR_TOKEN)
+	}
+
+	// Is it a tag?
+	if parser.buffer[parser.buffer_pos] == '!' {
+		return yaml_parser_fetch_tag(parser)
+	}
+
+	// Is it a literal scalar?
+	if parser.buffer[parser.buffer_pos] == '|' && parser.flow_level == 0 {
+		return yaml_parser_fetch_block_scalar(parser, true)
+	}
+
+	// Is it a folded scalar?
+	if parser.buffer[parser.buffer_pos] == '>' && parser.flow_level == 0 {
+		return yaml_parser_fetch_block_scalar(parser, false)
+	}
+
+	// Is it a single-quoted scalar?
+	if parser.buffer[parser.buffer_pos] == '\'' {
+		return yaml_parser_fetch_flow_scalar(parser, true)
+	}
+
+	// Is it a double-quoted scalar?
+	if parser.buffer[parser.buffer_pos] == '"' {
+		return yaml_parser_fetch_flow_scalar(parser, false)
+	}
+
+	// Is it a plain scalar?
+	//
+	// A plain scalar may start with any non-blank characters except
+	//
+	//      '-', '?', ':', ',', '[', ']', '{', '}',
+	//      '#', '&', '*', '!', '|', '>', '\'', '\"',
+	//      '%', '@', '`'.
+	//
+	// In the block context (and, for the '-' indicator, in the flow context
+	// too), it may also start with the characters
+	//
+	//      '-', '?', ':'
+	//
+	// if it is followed by a non-space character.
+	//
+	// The last rule is more restrictive than the specification requires.
+	// [Go] TODO Make this logic more reasonable.
+	//switch parser.buffer[parser.buffer_pos] {
+	//case '-', '?', ':', ',', '?', '-', ',', ':', ']', '[', '}', '{', '&', '#', '!', '*', '>', '|', '"', '\'', '@', '%', '-', '`':
+	//}
+	if !(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '-' ||
+		parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':' ||
+		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '[' ||
+		parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
+		parser.buffer[parser.buffer_pos] == '}' || parser.buffer[parser.buffer_pos] == '#' ||
+		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '*' ||
+		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '|' ||
+		parser.buffer[parser.buffer_pos] == '>' || parser.buffer[parser.buffer_pos] == '\'' ||
+		parser.buffer[parser.buffer_pos] == '"' || parser.buffer[parser.buffer_pos] == '%' ||
+		parser.buffer[parser.buffer_pos] == '@' || parser.buffer[parser.buffer_pos] == '`') ||
+		(parser.buffer[parser.buffer_pos] == '-' && !is_blank(parser.buffer, parser.buffer_pos+1)) ||
+		(parser.flow_level == 0 &&
+			(parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':') &&
+			!is_blankz(parser.buffer, parser.buffer_pos+1)) {
+		return yaml_parser_fetch_plain_scalar(parser)
+	}
+
+	// If we don't determine the token type so far, it is an error.
+	return yaml_parser_set_scanner_error(parser,
+		"while scanning for the next token", parser.mark,
+		"found character that cannot start any token")
+}
+
+func yaml_simple_key_is_valid(parser *yaml_parser_t, simple_key *yaml_simple_key_t) (valid, ok bool) {
+	if !simple_key.possible {
+		return false, true
+	}
+
+	// The 1.2 specification says:
+	//
+	//     "If the ? indicator is omitted, parsing needs to see past the
+	//     implicit key to recognize it as such. To limit the amount of
+	//     lookahead required, the “:” indicator must appear at most 1024
+	//     Unicode characters beyond the start of the key. In addition, the key
+	//     is restricted to a single line."
+	//
+	if simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index {
+		// Check if the potential simple key to be removed is required.
+		if simple_key.required {
+			return false, yaml_parser_set_scanner_error(parser,
+				"while scanning a simple key", simple_key.mark,
+				"could not find expected ':'")
+		}
+		simple_key.possible = false
+		return false, true
+	}
+	return true, true
+}
+
+// Check if a simple key may start at the current position and add it if
+// needed.
+func yaml_parser_save_simple_key(parser *yaml_parser_t) bool {
+	// A simple key is required at the current position if the scanner is in
+	// the block context and the current column coincides with the indentation
+	// level.
+
+	required := parser.flow_level == 0 && parser.indent == parser.mark.column
+
+	//
+	// If the current position may start a simple key, save it.
+	//
+	if parser.simple_key_allowed {
+		simple_key := yaml_simple_key_t{
+			possible:     true,
+			required:     required,
+			token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
+			mark:         parser.mark,
+		}
+
+		if !yaml_parser_remove_simple_key(parser) {
+			return false
+		}
+		parser.simple_keys[len(parser.simple_keys)-1] = simple_key
+		parser.simple_keys_by_tok[simple_key.token_number] = len(parser.simple_keys) - 1
+	}
+	return true
+}
+
+// Remove a potential simple key at the current flow level.
+func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool {
+	i := len(parser.simple_keys) - 1
+	if parser.simple_keys[i].possible {
+		// If the key is required, it is an error.
+		if parser.simple_keys[i].required {
+			return yaml_parser_set_scanner_error(parser,
+				"while scanning a simple key", parser.simple_keys[i].mark,
+				"could not find expected ':'")
+		}
+		// Remove the key from the stack.
+		parser.simple_keys[i].possible = false
+		delete(parser.simple_keys_by_tok, parser.simple_keys[i].token_number)
+	}
+	return true
+}
+
+// max_flow_level limits the flow_level
+const max_flow_level = 10000
+
+// Increase the flow level and resize the simple key list if needed.
+func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool {
+	// Reset the simple key on the next level.
+	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{
+		possible:     false,
+		required:     false,
+		token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
+		mark:         parser.mark,
+	})
+
+	// Increase the flow level.
+	parser.flow_level++
+	if parser.flow_level > max_flow_level {
+		return yaml_parser_set_scanner_error(parser,
+			"while increasing flow level", parser.simple_keys[len(parser.simple_keys)-1].mark,
+			fmt.Sprintf("exceeded max depth of %d", max_flow_level))
+	}
+	return true
+}
+
+// Decrease the flow level.
+func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool {
+	if parser.flow_level > 0 {
+		parser.flow_level--
+		last := len(parser.simple_keys) - 1
+		delete(parser.simple_keys_by_tok, parser.simple_keys[last].token_number)
+		parser.simple_keys = parser.simple_keys[:last]
+	}
+	return true
+}
+
+// max_indents limits the indents stack size
+const max_indents = 10000
+
+// Push the current indentation level to the stack and set the new level
+// the current column is greater than the indentation level.  In this case,
+// append or insert the specified token into the token queue.
+func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml_token_type_t, mark yaml_mark_t) bool {
+	// In the flow context, do nothing.
+	if parser.flow_level > 0 {
+		return true
+	}
+
+	if parser.indent < column {
+		// Push the current indentation level to the stack and set the new
+		// indentation level.
+		parser.indents = append(parser.indents, parser.indent)
+		parser.indent = column
+		if len(parser.indents) > max_indents {
+			return yaml_parser_set_scanner_error(parser,
+				"while increasing indent level", parser.simple_keys[len(parser.simple_keys)-1].mark,
+				fmt.Sprintf("exceeded max depth of %d", max_indents))
+		}
+
+		// Create a token and insert it into the queue.
+		token := yaml_token_t{
+			typ:        typ,
+			start_mark: mark,
+			end_mark:   mark,
+		}
+		if number > -1 {
+			number -= parser.tokens_parsed
+		}
+		yaml_insert_token(parser, number, &token)
+	}
+	return true
+}
+
+// Pop indentation levels from the indents stack until the current level
+// becomes less or equal to the column.  For each indentation level, append
+// the BLOCK-END token.
+func yaml_parser_unroll_indent(parser *yaml_parser_t, column int, scan_mark yaml_mark_t) bool {
+	// In the flow context, do nothing.
+	if parser.flow_level > 0 {
+		return true
+	}
+
+	block_mark := scan_mark
+	block_mark.index--
+
+	// Loop through the indentation levels in the stack.
+	for parser.indent > column {
+
+		// [Go] Reposition the end token before potential following
+		//      foot comments of parent blocks. For that, search
+		//      backwards for recent comments that were at the same
+		//      indent as the block that is ending now.
+		stop_index := block_mark.index
+		for i := len(parser.comments) - 1; i >= 0; i-- {
+			comment := &parser.comments[i]
+
+			if comment.end_mark.index < stop_index {
+				// Don't go back beyond the start of the comment/whitespace scan, unless column < 0.
+				// If requested indent column is < 0, then the document is over and everything else
+				// is a foot anyway.
+				break
+			}
+			if comment.start_mark.column == parser.indent+1 {
+				// This is a good match. But maybe there's a former comment
+				// at that same indent level, so keep searching.
+				block_mark = comment.start_mark
+			}
+
+			// While the end of the former comment matches with
+			// the start of the following one, we know there's
+			// nothing in between and scanning is still safe.
+			stop_index = comment.scan_mark.index
+		}
+
+		// Create a token and append it to the queue.
+		token := yaml_token_t{
+			typ:        yaml_BLOCK_END_TOKEN,
+			start_mark: block_mark,
+			end_mark:   block_mark,
+		}
+		yaml_insert_token(parser, -1, &token)
+
+		// Pop the indentation level.
+		parser.indent = parser.indents[len(parser.indents)-1]
+		parser.indents = parser.indents[:len(parser.indents)-1]
+	}
+	return true
+}
+
+// Initialize the scanner and produce the STREAM-START token.
+func yaml_parser_fetch_stream_start(parser *yaml_parser_t) bool {
+
+	// Set the initial indentation.
+	parser.indent = -1
+
+	// Initialize the simple key stack.
+	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
+
+	parser.simple_keys_by_tok = make(map[int]int)
+
+	// A simple key is allowed at the beginning of the stream.
+	parser.simple_key_allowed = true
+
+	// We have started.
+	parser.stream_start_produced = true
+
+	// Create the STREAM-START token and append it to the queue.
+	token := yaml_token_t{
+		typ:        yaml_STREAM_START_TOKEN,
+		start_mark: parser.mark,
+		end_mark:   parser.mark,
+		encoding:   parser.encoding,
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the STREAM-END token and shut down the scanner.
+func yaml_parser_fetch_stream_end(parser *yaml_parser_t) bool {
+
+	// Force new line.
+	if parser.mark.column != 0 {
+		parser.mark.column = 0
+		parser.mark.line++
+	}
+
+	// Reset the indentation level.
+	if !yaml_parser_unroll_indent(parser, -1, parser.mark) {
+		return false
+	}
+
+	// Reset simple keys.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	parser.simple_key_allowed = false
+
+	// Create the STREAM-END token and append it to the queue.
+	token := yaml_token_t{
+		typ:        yaml_STREAM_END_TOKEN,
+		start_mark: parser.mark,
+		end_mark:   parser.mark,
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token.
+func yaml_parser_fetch_directive(parser *yaml_parser_t) bool {
+	// Reset the indentation level.
+	if !yaml_parser_unroll_indent(parser, -1, parser.mark) {
+		return false
+	}
+
+	// Reset simple keys.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	parser.simple_key_allowed = false
+
+	// Create the YAML-DIRECTIVE or TAG-DIRECTIVE token.
+	token := yaml_token_t{}
+	if !yaml_parser_scan_directive(parser, &token) {
+		return false
+	}
+	// Append the token to the queue.
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the DOCUMENT-START or DOCUMENT-END token.
+func yaml_parser_fetch_document_indicator(parser *yaml_parser_t, typ yaml_token_type_t) bool {
+	// Reset the indentation level.
+	if !yaml_parser_unroll_indent(parser, -1, parser.mark) {
+		return false
+	}
+
+	// Reset simple keys.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	parser.simple_key_allowed = false
+
+	// Consume the token.
+	start_mark := parser.mark
+
+	skip(parser)
+	skip(parser)
+	skip(parser)
+
+	end_mark := parser.mark
+
+	// Create the DOCUMENT-START or DOCUMENT-END token.
+	token := yaml_token_t{
+		typ:        typ,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	// Append the token to the queue.
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token.
+func yaml_parser_fetch_flow_collection_start(parser *yaml_parser_t, typ yaml_token_type_t) bool {
+
+	// The indicators '[' and '{' may start a simple key.
+	if !yaml_parser_save_simple_key(parser) {
+		return false
+	}
+
+	// Increase the flow level.
+	if !yaml_parser_increase_flow_level(parser) {
+		return false
+	}
+
+	// A simple key may follow the indicators '[' and '{'.
+	parser.simple_key_allowed = true
+
+	// Consume the token.
+	start_mark := parser.mark
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token.
+	token := yaml_token_t{
+		typ:        typ,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	// Append the token to the queue.
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token.
+func yaml_parser_fetch_flow_collection_end(parser *yaml_parser_t, typ yaml_token_type_t) bool {
+	// Reset any potential simple key on the current flow level.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	// Decrease the flow level.
+	if !yaml_parser_decrease_flow_level(parser) {
+		return false
+	}
+
+	// No simple keys after the indicators ']' and '}'.
+	parser.simple_key_allowed = false
+
+	// Consume the token.
+
+	start_mark := parser.mark
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token.
+	token := yaml_token_t{
+		typ:        typ,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	// Append the token to the queue.
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the FLOW-ENTRY token.
+func yaml_parser_fetch_flow_entry(parser *yaml_parser_t) bool {
+	// Reset any potential simple keys on the current flow level.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	// Simple keys are allowed after ','.
+	parser.simple_key_allowed = true
+
+	// Consume the token.
+	start_mark := parser.mark
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create the FLOW-ENTRY token and append it to the queue.
+	token := yaml_token_t{
+		typ:        yaml_FLOW_ENTRY_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the BLOCK-ENTRY token.
+func yaml_parser_fetch_block_entry(parser *yaml_parser_t) bool {
+	// Check if the scanner is in the block context.
+	if parser.flow_level == 0 {
+		// Check if we are allowed to start a new entry.
+		if !parser.simple_key_allowed {
+			return yaml_parser_set_scanner_error(parser, "", parser.mark,
+				"block sequence entries are not allowed in this context")
+		}
+		// Add the BLOCK-SEQUENCE-START token if needed.
+		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_SEQUENCE_START_TOKEN, parser.mark) {
+			return false
+		}
+	} else {
+		// It is an error for the '-' indicator to occur in the flow context,
+		// but we let the Parser detect and report about it because the Parser
+		// is able to point to the context.
+	}
+
+	// Reset any potential simple keys on the current flow level.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	// Simple keys are allowed after '-'.
+	parser.simple_key_allowed = true
+
+	// Consume the token.
+	start_mark := parser.mark
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create the BLOCK-ENTRY token and append it to the queue.
+	token := yaml_token_t{
+		typ:        yaml_BLOCK_ENTRY_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the KEY token.
+func yaml_parser_fetch_key(parser *yaml_parser_t) bool {
+
+	// In the block context, additional checks are required.
+	if parser.flow_level == 0 {
+		// Check if we are allowed to start a new key (not nessesary simple).
+		if !parser.simple_key_allowed {
+			return yaml_parser_set_scanner_error(parser, "", parser.mark,
+				"mapping keys are not allowed in this context")
+		}
+		// Add the BLOCK-MAPPING-START token if needed.
+		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
+			return false
+		}
+	}
+
+	// Reset any potential simple keys on the current flow level.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	// Simple keys are allowed after '?' in the block context.
+	parser.simple_key_allowed = parser.flow_level == 0
+
+	// Consume the token.
+	start_mark := parser.mark
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create the KEY token and append it to the queue.
+	token := yaml_token_t{
+		typ:        yaml_KEY_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the VALUE token.
+func yaml_parser_fetch_value(parser *yaml_parser_t) bool {
+
+	simple_key := &parser.simple_keys[len(parser.simple_keys)-1]
+
+	// Have we found a simple key?
+	if valid, ok := yaml_simple_key_is_valid(parser, simple_key); !ok {
+		return false
+
+	} else if valid {
+
+		// Create the KEY token and insert it into the queue.
+		token := yaml_token_t{
+			typ:        yaml_KEY_TOKEN,
+			start_mark: simple_key.mark,
+			end_mark:   simple_key.mark,
+		}
+		yaml_insert_token(parser, simple_key.token_number-parser.tokens_parsed, &token)
+
+		// In the block context, we may need to add the BLOCK-MAPPING-START token.
+		if !yaml_parser_roll_indent(parser, simple_key.mark.column,
+			simple_key.token_number,
+			yaml_BLOCK_MAPPING_START_TOKEN, simple_key.mark) {
+			return false
+		}
+
+		// Remove the simple key.
+		simple_key.possible = false
+		delete(parser.simple_keys_by_tok, simple_key.token_number)
+
+		// A simple key cannot follow another simple key.
+		parser.simple_key_allowed = false
+
+	} else {
+		// The ':' indicator follows a complex key.
+
+		// In the block context, extra checks are required.
+		if parser.flow_level == 0 {
+
+			// Check if we are allowed to start a complex value.
+			if !parser.simple_key_allowed {
+				return yaml_parser_set_scanner_error(parser, "", parser.mark,
+					"mapping values are not allowed in this context")
+			}
+
+			// Add the BLOCK-MAPPING-START token if needed.
+			if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
+				return false
+			}
+		}
+
+		// Simple keys after ':' are allowed in the block context.
+		parser.simple_key_allowed = parser.flow_level == 0
+	}
+
+	// Consume the token.
+	start_mark := parser.mark
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create the VALUE token and append it to the queue.
+	token := yaml_token_t{
+		typ:        yaml_VALUE_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the ALIAS or ANCHOR token.
+func yaml_parser_fetch_anchor(parser *yaml_parser_t, typ yaml_token_type_t) bool {
+	// An anchor or an alias could be a simple key.
+	if !yaml_parser_save_simple_key(parser) {
+		return false
+	}
+
+	// A simple key cannot follow an anchor or an alias.
+	parser.simple_key_allowed = false
+
+	// Create the ALIAS or ANCHOR token and append it to the queue.
+	var token yaml_token_t
+	if !yaml_parser_scan_anchor(parser, &token, typ) {
+		return false
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the TAG token.
+func yaml_parser_fetch_tag(parser *yaml_parser_t) bool {
+	// A tag could be a simple key.
+	if !yaml_parser_save_simple_key(parser) {
+		return false
+	}
+
+	// A simple key cannot follow a tag.
+	parser.simple_key_allowed = false
+
+	// Create the TAG token and append it to the queue.
+	var token yaml_token_t
+	if !yaml_parser_scan_tag(parser, &token) {
+		return false
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens.
+func yaml_parser_fetch_block_scalar(parser *yaml_parser_t, literal bool) bool {
+	// Remove any potential simple keys.
+	if !yaml_parser_remove_simple_key(parser) {
+		return false
+	}
+
+	// A simple key may follow a block scalar.
+	parser.simple_key_allowed = true
+
+	// Create the SCALAR token and append it to the queue.
+	var token yaml_token_t
+	if !yaml_parser_scan_block_scalar(parser, &token, literal) {
+		return false
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
+func yaml_parser_fetch_flow_scalar(parser *yaml_parser_t, single bool) bool {
+	// A plain scalar could be a simple key.
+	if !yaml_parser_save_simple_key(parser) {
+		return false
+	}
+
+	// A simple key cannot follow a flow scalar.
+	parser.simple_key_allowed = false
+
+	// Create the SCALAR token and append it to the queue.
+	var token yaml_token_t
+	if !yaml_parser_scan_flow_scalar(parser, &token, single) {
+		return false
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Produce the SCALAR(...,plain) token.
+func yaml_parser_fetch_plain_scalar(parser *yaml_parser_t) bool {
+	// A plain scalar could be a simple key.
+	if !yaml_parser_save_simple_key(parser) {
+		return false
+	}
+
+	// A simple key cannot follow a flow scalar.
+	parser.simple_key_allowed = false
+
+	// Create the SCALAR token and append it to the queue.
+	var token yaml_token_t
+	if !yaml_parser_scan_plain_scalar(parser, &token) {
+		return false
+	}
+	yaml_insert_token(parser, -1, &token)
+	return true
+}
+
+// Eat whitespaces and comments until the next token is found.
+func yaml_parser_scan_to_next_token(parser *yaml_parser_t) bool {
+
+	scan_mark := parser.mark
+
+	// Until the next token is not found.
+	for {
+		// Allow the BOM mark to start a line.
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+		if parser.mark.column == 0 && is_bom(parser.buffer, parser.buffer_pos) {
+			skip(parser)
+		}
+
+		// Eat whitespaces.
+		// Tabs are allowed:
+		//  - in the flow context
+		//  - in the block context, but not at the beginning of the line or
+		//  after '-', '?', or ':' (complex value).
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+
+		for parser.buffer[parser.buffer_pos] == ' ' || ((parser.flow_level > 0 || !parser.simple_key_allowed) && parser.buffer[parser.buffer_pos] == '\t') {
+			skip(parser)
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+
+		// Check if we just had a line comment under a sequence entry that
+		// looks more like a header to the following content. Similar to this:
+		//
+		// - # The comment
+		//   - Some data
+		//
+		// If so, transform the line comment to a head comment and reposition.
+		if len(parser.comments) > 0 && len(parser.tokens) > 1 {
+			tokenA := parser.tokens[len(parser.tokens)-2]
+			tokenB := parser.tokens[len(parser.tokens)-1]
+			comment := &parser.comments[len(parser.comments)-1]
+			if tokenA.typ == yaml_BLOCK_SEQUENCE_START_TOKEN && tokenB.typ == yaml_BLOCK_ENTRY_TOKEN && len(comment.line) > 0 && !is_break(parser.buffer, parser.buffer_pos) {
+				// If it was in the prior line, reposition so it becomes a
+				// header of the follow up token. Otherwise, keep it in place
+				// so it becomes a header of the former.
+				comment.head = comment.line
+				comment.line = nil
+				if comment.start_mark.line == parser.mark.line-1 {
+					comment.token_mark = parser.mark
+				}
+			}
+		}
+
+		// Eat a comment until a line break.
+		if parser.buffer[parser.buffer_pos] == '#' {
+			if !yaml_parser_scan_comments(parser, scan_mark) {
+				return false
+			}
+		}
+
+		// If it is a line break, eat it.
+		if is_break(parser.buffer, parser.buffer_pos) {
+			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+				return false
+			}
+			skip_line(parser)
+
+			// In the block context, a new line may start a simple key.
+			if parser.flow_level == 0 {
+				parser.simple_key_allowed = true
+			}
+		} else {
+			break // We have found a token.
+		}
+	}
+
+	return true
+}
+
+// Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token.
+//
+// Scope:
+//
+//	%YAML    1.1    # a comment \n
+//	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//	%TAG    !yaml!  tag:yaml.org,2002:  \n
+//	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+func yaml_parser_scan_directive(parser *yaml_parser_t, token *yaml_token_t) bool {
+	// Eat '%'.
+	start_mark := parser.mark
+	skip(parser)
+
+	// Scan the directive name.
+	var name []byte
+	if !yaml_parser_scan_directive_name(parser, start_mark, &name) {
+		return false
+	}
+
+	// Is it a YAML directive?
+	if bytes.Equal(name, []byte("YAML")) {
+		// Scan the VERSION directive value.
+		var major, minor int8
+		if !yaml_parser_scan_version_directive_value(parser, start_mark, &major, &minor) {
+			return false
+		}
+		end_mark := parser.mark
+
+		// Create a VERSION-DIRECTIVE token.
+		*token = yaml_token_t{
+			typ:        yaml_VERSION_DIRECTIVE_TOKEN,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			major:      major,
+			minor:      minor,
+		}
+
+		// Is it a TAG directive?
+	} else if bytes.Equal(name, []byte("TAG")) {
+		// Scan the TAG directive value.
+		var handle, prefix []byte
+		if !yaml_parser_scan_tag_directive_value(parser, start_mark, &handle, &prefix) {
+			return false
+		}
+		end_mark := parser.mark
+
+		// Create a TAG-DIRECTIVE token.
+		*token = yaml_token_t{
+			typ:        yaml_TAG_DIRECTIVE_TOKEN,
+			start_mark: start_mark,
+			end_mark:   end_mark,
+			value:      handle,
+			prefix:     prefix,
+		}
+
+		// Unknown directive.
+	} else {
+		yaml_parser_set_scanner_error(parser, "while scanning a directive",
+			start_mark, "found unknown directive name")
+		return false
+	}
+
+	// Eat the rest of the line including any comments.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	for is_blank(parser.buffer, parser.buffer_pos) {
+		skip(parser)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	if parser.buffer[parser.buffer_pos] == '#' {
+		// [Go] Discard this inline comment for the time being.
+		//if !yaml_parser_scan_line_comment(parser, start_mark) {
+		//	return false
+		//}
+		for !is_breakz(parser.buffer, parser.buffer_pos) {
+			skip(parser)
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+	}
+
+	// Check if we are at the end of the line.
+	if !is_breakz(parser.buffer, parser.buffer_pos) {
+		yaml_parser_set_scanner_error(parser, "while scanning a directive",
+			start_mark, "did not find expected comment or line break")
+		return false
+	}
+
+	// Eat a line break.
+	if is_break(parser.buffer, parser.buffer_pos) {
+		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+			return false
+		}
+		skip_line(parser)
+	}
+
+	return true
+}
+
+// Scan the directive name.
+//
+// Scope:
+//
+//	%YAML   1.1     # a comment \n
+//	 ^^^^
+//	%TAG    !yaml!  tag:yaml.org,2002:  \n
+//	 ^^^
+func yaml_parser_scan_directive_name(parser *yaml_parser_t, start_mark yaml_mark_t, name *[]byte) bool {
+	// Consume the directive name.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	var s []byte
+	for is_alpha(parser.buffer, parser.buffer_pos) {
+		s = read(parser, s)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	// Check if the name is empty.
+	if len(s) == 0 {
+		yaml_parser_set_scanner_error(parser, "while scanning a directive",
+			start_mark, "could not find expected directive name")
+		return false
+	}
+
+	// Check for an blank character after the name.
+	if !is_blankz(parser.buffer, parser.buffer_pos) {
+		yaml_parser_set_scanner_error(parser, "while scanning a directive",
+			start_mark, "found unexpected non-alphabetical character")
+		return false
+	}
+	*name = s
+	return true
+}
+
+// Scan the value of VERSION-DIRECTIVE.
+//
+// Scope:
+//
+//	%YAML   1.1     # a comment \n
+//	     ^^^^^^
+func yaml_parser_scan_version_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, major, minor *int8) bool {
+	// Eat whitespaces.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	for is_blank(parser.buffer, parser.buffer_pos) {
+		skip(parser)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	// Consume the major version number.
+	if !yaml_parser_scan_version_directive_number(parser, start_mark, major) {
+		return false
+	}
+
+	// Eat '.'.
+	if parser.buffer[parser.buffer_pos] != '.' {
+		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
+			start_mark, "did not find expected digit or '.' character")
+	}
+
+	skip(parser)
+
+	// Consume the minor version number.
+	if !yaml_parser_scan_version_directive_number(parser, start_mark, minor) {
+		return false
+	}
+	return true
+}
+
+const max_number_length = 2
+
+// Scan the version number of VERSION-DIRECTIVE.
+//
+// Scope:
+//
+//	%YAML   1.1     # a comment \n
+//	        ^
+//	%YAML   1.1     # a comment \n
+//	          ^
+func yaml_parser_scan_version_directive_number(parser *yaml_parser_t, start_mark yaml_mark_t, number *int8) bool {
+
+	// Repeat while the next character is digit.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	var value, length int8
+	for is_digit(parser.buffer, parser.buffer_pos) {
+		// Check if the number is too long.
+		length++
+		if length > max_number_length {
+			return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
+				start_mark, "found extremely long version number")
+		}
+		value = value*10 + int8(as_digit(parser.buffer, parser.buffer_pos))
+		skip(parser)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	// Check if the number was present.
+	if length == 0 {
+		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
+			start_mark, "did not find expected version number")
+	}
+	*number = value
+	return true
+}
+
+// Scan the value of a TAG-DIRECTIVE token.
+//
+// Scope:
+//
+//	%TAG    !yaml!  tag:yaml.org,2002:  \n
+//	    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+func yaml_parser_scan_tag_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, handle, prefix *[]byte) bool {
+	var handle_value, prefix_value []byte
+
+	// Eat whitespaces.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	for is_blank(parser.buffer, parser.buffer_pos) {
+		skip(parser)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	// Scan a handle.
+	if !yaml_parser_scan_tag_handle(parser, true, start_mark, &handle_value) {
+		return false
+	}
+
+	// Expect a whitespace.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	if !is_blank(parser.buffer, parser.buffer_pos) {
+		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
+			start_mark, "did not find expected whitespace")
+		return false
+	}
+
+	// Eat whitespaces.
+	for is_blank(parser.buffer, parser.buffer_pos) {
+		skip(parser)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	// Scan a prefix.
+	if !yaml_parser_scan_tag_uri(parser, true, nil, start_mark, &prefix_value) {
+		return false
+	}
+
+	// Expect a whitespace or line break.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	if !is_blankz(parser.buffer, parser.buffer_pos) {
+		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
+			start_mark, "did not find expected whitespace or line break")
+		return false
+	}
+
+	*handle = handle_value
+	*prefix = prefix_value
+	return true
+}
+
+func yaml_parser_scan_anchor(parser *yaml_parser_t, token *yaml_token_t, typ yaml_token_type_t) bool {
+	var s []byte
+
+	// Eat the indicator character.
+	start_mark := parser.mark
+	skip(parser)
+
+	// Consume the value.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	for is_alpha(parser.buffer, parser.buffer_pos) {
+		s = read(parser, s)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	end_mark := parser.mark
+
+	/*
+	 * Check if length of the anchor is greater than 0 and it is followed by
+	 * a whitespace character or one of the indicators:
+	 *
+	 *      '?', ':', ',', ']', '}', '%', '@', '`'.
+	 */
+
+	if len(s) == 0 ||
+		!(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '?' ||
+			parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == ',' ||
+			parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '}' ||
+			parser.buffer[parser.buffer_pos] == '%' || parser.buffer[parser.buffer_pos] == '@' ||
+			parser.buffer[parser.buffer_pos] == '`') {
+		context := "while scanning an alias"
+		if typ == yaml_ANCHOR_TOKEN {
+			context = "while scanning an anchor"
+		}
+		yaml_parser_set_scanner_error(parser, context, start_mark,
+			"did not find expected alphabetic or numeric character")
+		return false
+	}
+
+	// Create a token.
+	*token = yaml_token_t{
+		typ:        typ,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+		value:      s,
+	}
+
+	return true
+}
+
+/*
+ * Scan a TAG token.
+ */
+
+func yaml_parser_scan_tag(parser *yaml_parser_t, token *yaml_token_t) bool {
+	var handle, suffix []byte
+
+	start_mark := parser.mark
+
+	// Check if the tag is in the canonical form.
+	if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+		return false
+	}
+
+	if parser.buffer[parser.buffer_pos+1] == '<' {
+		// Keep the handle as ''
+
+		// Eat '!<'
+		skip(parser)
+		skip(parser)
+
+		// Consume the tag value.
+		if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
+			return false
+		}
+
+		// Check for '>' and eat it.
+		if parser.buffer[parser.buffer_pos] != '>' {
+			yaml_parser_set_scanner_error(parser, "while scanning a tag",
+				start_mark, "did not find the expected '>'")
+			return false
+		}
+
+		skip(parser)
+	} else {
+		// The tag has either the '!suffix' or the '!handle!suffix' form.
+
+		// First, try to scan a handle.
+		if !yaml_parser_scan_tag_handle(parser, false, start_mark, &handle) {
+			return false
+		}
+
+		// Check if it is, indeed, handle.
+		if handle[0] == '!' && len(handle) > 1 && handle[len(handle)-1] == '!' {
+			// Scan the suffix now.
+			if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
+				return false
+			}
+		} else {
+			// It wasn't a handle after all.  Scan the rest of the tag.
+			if !yaml_parser_scan_tag_uri(parser, false, handle, start_mark, &suffix) {
+				return false
+			}
+
+			// Set the handle to '!'.
+			handle = []byte{'!'}
+
+			// A special case: the '!' tag.  Set the handle to '' and the
+			// suffix to '!'.
+			if len(suffix) == 0 {
+				handle, suffix = suffix, handle
+			}
+		}
+	}
+
+	// Check the character which ends the tag.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	if !is_blankz(parser.buffer, parser.buffer_pos) {
+		yaml_parser_set_scanner_error(parser, "while scanning a tag",
+			start_mark, "did not find expected whitespace or line break")
+		return false
+	}
+
+	end_mark := parser.mark
+
+	// Create a token.
+	*token = yaml_token_t{
+		typ:        yaml_TAG_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+		value:      handle,
+		suffix:     suffix,
+	}
+	return true
+}
+
+// Scan a tag handle.
+func yaml_parser_scan_tag_handle(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, handle *[]byte) bool {
+	// Check the initial '!' character.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	if parser.buffer[parser.buffer_pos] != '!' {
+		yaml_parser_set_scanner_tag_error(parser, directive,
+			start_mark, "did not find expected '!'")
+		return false
+	}
+
+	var s []byte
+
+	// Copy the '!' character.
+	s = read(parser, s)
+
+	// Copy all subsequent alphabetical and numerical characters.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	for is_alpha(parser.buffer, parser.buffer_pos) {
+		s = read(parser, s)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+
+	// Check if the trailing character is '!' and copy it.
+	if parser.buffer[parser.buffer_pos] == '!' {
+		s = read(parser, s)
+	} else {
+		// It's either the '!' tag or not really a tag handle.  If it's a %TAG
+		// directive, it's an error.  If it's a tag token, it must be a part of URI.
+		if directive && string(s) != "!" {
+			yaml_parser_set_scanner_tag_error(parser, directive,
+				start_mark, "did not find expected '!'")
+			return false
+		}
+	}
+
+	*handle = s
+	return true
+}
+
+// Scan a tag.
+func yaml_parser_scan_tag_uri(parser *yaml_parser_t, directive bool, head []byte, start_mark yaml_mark_t, uri *[]byte) bool {
+	//size_t length = head ? strlen((char *)head) : 0
+	var s []byte
+	hasTag := len(head) > 0
+
+	// Copy the head if needed.
+	//
+	// Note that we don't copy the leading '!' character.
+	if len(head) > 1 {
+		s = append(s, head[1:]...)
+	}
+
+	// Scan the tag.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	// The set of characters that may appear in URI is as follows:
+	//
+	//      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
+	//      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
+	//      '%'.
+	// [Go] TODO Convert this into more reasonable logic.
+	for is_alpha(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == ';' ||
+		parser.buffer[parser.buffer_pos] == '/' || parser.buffer[parser.buffer_pos] == '?' ||
+		parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == '@' ||
+		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '=' ||
+		parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '$' ||
+		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '.' ||
+		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '~' ||
+		parser.buffer[parser.buffer_pos] == '*' || parser.buffer[parser.buffer_pos] == '\'' ||
+		parser.buffer[parser.buffer_pos] == '(' || parser.buffer[parser.buffer_pos] == ')' ||
+		parser.buffer[parser.buffer_pos] == '[' || parser.buffer[parser.buffer_pos] == ']' ||
+		parser.buffer[parser.buffer_pos] == '%' {
+		// Check if it is a URI-escape sequence.
+		if parser.buffer[parser.buffer_pos] == '%' {
+			if !yaml_parser_scan_uri_escapes(parser, directive, start_mark, &s) {
+				return false
+			}
+		} else {
+			s = read(parser, s)
+		}
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+		hasTag = true
+	}
+
+	if !hasTag {
+		yaml_parser_set_scanner_tag_error(parser, directive,
+			start_mark, "did not find expected tag URI")
+		return false
+	}
+	*uri = s
+	return true
+}
+
+// Decode an URI-escape sequence corresponding to a single UTF-8 character.
+func yaml_parser_scan_uri_escapes(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, s *[]byte) bool {
+
+	// Decode the required number of characters.
+	w := 1024
+	for w > 0 {
+		// Check for a URI-escaped octet.
+		if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
+			return false
+		}
+
+		if !(parser.buffer[parser.buffer_pos] == '%' &&
+			is_hex(parser.buffer, parser.buffer_pos+1) &&
+			is_hex(parser.buffer, parser.buffer_pos+2)) {
+			return yaml_parser_set_scanner_tag_error(parser, directive,
+				start_mark, "did not find URI escaped octet")
+		}
+
+		// Get the octet.
+		octet := byte((as_hex(parser.buffer, parser.buffer_pos+1) << 4) + as_hex(parser.buffer, parser.buffer_pos+2))
+
+		// If it is the leading octet, determine the length of the UTF-8 sequence.
+		if w == 1024 {
+			w = width(octet)
+			if w == 0 {
+				return yaml_parser_set_scanner_tag_error(parser, directive,
+					start_mark, "found an incorrect leading UTF-8 octet")
+			}
+		} else {
+			// Check if the trailing octet is correct.
+			if octet&0xC0 != 0x80 {
+				return yaml_parser_set_scanner_tag_error(parser, directive,
+					start_mark, "found an incorrect trailing UTF-8 octet")
+			}
+		}
+
+		// Copy the octet and move the pointers.
+		*s = append(*s, octet)
+		skip(parser)
+		skip(parser)
+		skip(parser)
+		w--
+	}
+	return true
+}
+
+// Scan a block scalar.
+func yaml_parser_scan_block_scalar(parser *yaml_parser_t, token *yaml_token_t, literal bool) bool {
+	// Eat the indicator '|' or '>'.
+	start_mark := parser.mark
+	skip(parser)
+
+	// Scan the additional block scalar indicators.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+
+	// Check for a chomping indicator.
+	var chomping, increment int
+	if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
+		// Set the chomping method and eat the indicator.
+		if parser.buffer[parser.buffer_pos] == '+' {
+			chomping = +1
+		} else {
+			chomping = -1
+		}
+		skip(parser)
+
+		// Check for an indentation indicator.
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+		if is_digit(parser.buffer, parser.buffer_pos) {
+			// Check that the indentation is greater than 0.
+			if parser.buffer[parser.buffer_pos] == '0' {
+				yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
+					start_mark, "found an indentation indicator equal to 0")
+				return false
+			}
+
+			// Get the indentation level and eat the indicator.
+			increment = as_digit(parser.buffer, parser.buffer_pos)
+			skip(parser)
+		}
+
+	} else if is_digit(parser.buffer, parser.buffer_pos) {
+		// Do the same as above, but in the opposite order.
+
+		if parser.buffer[parser.buffer_pos] == '0' {
+			yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
+				start_mark, "found an indentation indicator equal to 0")
+			return false
+		}
+		increment = as_digit(parser.buffer, parser.buffer_pos)
+		skip(parser)
+
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+		if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
+			if parser.buffer[parser.buffer_pos] == '+' {
+				chomping = +1
+			} else {
+				chomping = -1
+			}
+			skip(parser)
+		}
+	}
+
+	// Eat whitespaces and comments to the end of the line.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	for is_blank(parser.buffer, parser.buffer_pos) {
+		skip(parser)
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+	}
+	if parser.buffer[parser.buffer_pos] == '#' {
+		if !yaml_parser_scan_line_comment(parser, start_mark) {
+			return false
+		}
+		for !is_breakz(parser.buffer, parser.buffer_pos) {
+			skip(parser)
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+	}
+
+	// Check if we are at the end of the line.
+	if !is_breakz(parser.buffer, parser.buffer_pos) {
+		yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
+			start_mark, "did not find expected comment or line break")
+		return false
+	}
+
+	// Eat a line break.
+	if is_break(parser.buffer, parser.buffer_pos) {
+		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+			return false
+		}
+		skip_line(parser)
+	}
+
+	end_mark := parser.mark
+
+	// Set the indentation level if it was specified.
+	var indent int
+	if increment > 0 {
+		if parser.indent >= 0 {
+			indent = parser.indent + increment
+		} else {
+			indent = increment
+		}
+	}
+
+	// Scan the leading line breaks and determine the indentation level if needed.
+	var s, leading_break, trailing_breaks []byte
+	if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
+		return false
+	}
+
+	// Scan the block scalar content.
+	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+		return false
+	}
+	var leading_blank, trailing_blank bool
+	for parser.mark.column == indent && !is_z(parser.buffer, parser.buffer_pos) {
+		// We are at the beginning of a non-empty line.
+
+		// Is it a trailing whitespace?
+		trailing_blank = is_blank(parser.buffer, parser.buffer_pos)
+
+		// Check if we need to fold the leading line break.
+		if !literal && !leading_blank && !trailing_blank && len(leading_break) > 0 && leading_break[0] == '\n' {
+			// Do we need to join the lines by space?
+			if len(trailing_breaks) == 0 {
+				s = append(s, ' ')
+			}
+		} else {
+			s = append(s, leading_break...)
+		}
+		leading_break = leading_break[:0]
+
+		// Append the remaining line breaks.
+		s = append(s, trailing_breaks...)
+		trailing_breaks = trailing_breaks[:0]
+
+		// Is it a leading whitespace?
+		leading_blank = is_blank(parser.buffer, parser.buffer_pos)
+
+		// Consume the current line.
+		for !is_breakz(parser.buffer, parser.buffer_pos) {
+			s = read(parser, s)
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+
+		// Consume the line break.
+		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+			return false
+		}
+
+		leading_break = read_line(parser, leading_break)
+
+		// Eat the following indentation spaces and line breaks.
+		if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
+			return false
+		}
+	}
+
+	// Chomp the tail.
+	if chomping != -1 {
+		s = append(s, leading_break...)
+	}
+	if chomping == 1 {
+		s = append(s, trailing_breaks...)
+	}
+
+	// Create a token.
+	*token = yaml_token_t{
+		typ:        yaml_SCALAR_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+		value:      s,
+		style:      yaml_LITERAL_SCALAR_STYLE,
+	}
+	if !literal {
+		token.style = yaml_FOLDED_SCALAR_STYLE
+	}
+	return true
+}
+
+// Scan indentation spaces and line breaks for a block scalar.  Determine the
+// indentation level if needed.
+func yaml_parser_scan_block_scalar_breaks(parser *yaml_parser_t, indent *int, breaks *[]byte, start_mark yaml_mark_t, end_mark *yaml_mark_t) bool {
+	*end_mark = parser.mark
+
+	// Eat the indentation spaces and line breaks.
+	max_indent := 0
+	for {
+		// Eat the indentation spaces.
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+		for (*indent == 0 || parser.mark.column < *indent) && is_space(parser.buffer, parser.buffer_pos) {
+			skip(parser)
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+		if parser.mark.column > max_indent {
+			max_indent = parser.mark.column
+		}
+
+		// Check for a tab character messing the indentation.
+		if (*indent == 0 || parser.mark.column < *indent) && is_tab(parser.buffer, parser.buffer_pos) {
+			return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
+				start_mark, "found a tab character where an indentation space is expected")
+		}
+
+		// Have we found a non-empty line?
+		if !is_break(parser.buffer, parser.buffer_pos) {
+			break
+		}
+
+		// Consume the line break.
+		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+			return false
+		}
+		// [Go] Should really be returning breaks instead.
+		*breaks = read_line(parser, *breaks)
+		*end_mark = parser.mark
+	}
+
+	// Determine the indentation level if needed.
+	if *indent == 0 {
+		*indent = max_indent
+		if *indent < parser.indent+1 {
+			*indent = parser.indent + 1
+		}
+		if *indent < 1 {
+			*indent = 1
+		}
+	}
+	return true
+}
+
+// Scan a quoted scalar.
+func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, single bool) bool {
+	// Eat the left quote.
+	start_mark := parser.mark
+	skip(parser)
+
+	// Consume the content of the quoted scalar.
+	var s, leading_break, trailing_breaks, whitespaces []byte
+	for {
+		// Check that there are no document indicators at the beginning of the line.
+		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
+			return false
+		}
+
+		if parser.mark.column == 0 &&
+			((parser.buffer[parser.buffer_pos+0] == '-' &&
+				parser.buffer[parser.buffer_pos+1] == '-' &&
+				parser.buffer[parser.buffer_pos+2] == '-') ||
+				(parser.buffer[parser.buffer_pos+0] == '.' &&
+					parser.buffer[parser.buffer_pos+1] == '.' &&
+					parser.buffer[parser.buffer_pos+2] == '.')) &&
+			is_blankz(parser.buffer, parser.buffer_pos+3) {
+			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
+				start_mark, "found unexpected document indicator")
+			return false
+		}
+
+		// Check for EOF.
+		if is_z(parser.buffer, parser.buffer_pos) {
+			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
+				start_mark, "found unexpected end of stream")
+			return false
+		}
+
+		// Consume non-blank characters.
+		leading_blanks := false
+		for !is_blankz(parser.buffer, parser.buffer_pos) {
+			if single && parser.buffer[parser.buffer_pos] == '\'' && parser.buffer[parser.buffer_pos+1] == '\'' {
+				// Is is an escaped single quote.
+				s = append(s, '\'')
+				skip(parser)
+				skip(parser)
+
+			} else if single && parser.buffer[parser.buffer_pos] == '\'' {
+				// It is a right single quote.
+				break
+			} else if !single && parser.buffer[parser.buffer_pos] == '"' {
+				// It is a right double quote.
+				break
+
+			} else if !single && parser.buffer[parser.buffer_pos] == '\\' && is_break(parser.buffer, parser.buffer_pos+1) {
+				// It is an escaped line break.
+				if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
+					return false
+				}
+				skip(parser)
+				skip_line(parser)
+				leading_blanks = true
+				break
+
+			} else if !single && parser.buffer[parser.buffer_pos] == '\\' {
+				// It is an escape sequence.
+				code_length := 0
+
+				// Check the escape character.
+				switch parser.buffer[parser.buffer_pos+1] {
+				case '0':
+					s = append(s, 0)
+				case 'a':
+					s = append(s, '\x07')
+				case 'b':
+					s = append(s, '\x08')
+				case 't', '\t':
+					s = append(s, '\x09')
+				case 'n':
+					s = append(s, '\x0A')
+				case 'v':
+					s = append(s, '\x0B')
+				case 'f':
+					s = append(s, '\x0C')
+				case 'r':
+					s = append(s, '\x0D')
+				case 'e':
+					s = append(s, '\x1B')
+				case ' ':
+					s = append(s, '\x20')
+				case '"':
+					s = append(s, '"')
+				case '\'':
+					s = append(s, '\'')
+				case '\\':
+					s = append(s, '\\')
+				case 'N': // NEL (#x85)
+					s = append(s, '\xC2')
+					s = append(s, '\x85')
+				case '_': // #xA0
+					s = append(s, '\xC2')
+					s = append(s, '\xA0')
+				case 'L': // LS (#x2028)
+					s = append(s, '\xE2')
+					s = append(s, '\x80')
+					s = append(s, '\xA8')
+				case 'P': // PS (#x2029)
+					s = append(s, '\xE2')
+					s = append(s, '\x80')
+					s = append(s, '\xA9')
+				case 'x':
+					code_length = 2
+				case 'u':
+					code_length = 4
+				case 'U':
+					code_length = 8
+				default:
+					yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
+						start_mark, "found unknown escape character")
+					return false
+				}
+
+				skip(parser)
+				skip(parser)
+
+				// Consume an arbitrary escape code.
+				if code_length > 0 {
+					var value int
+
+					// Scan the character value.
+					if parser.unread < code_length && !yaml_parser_update_buffer(parser, code_length) {
+						return false
+					}
+					for k := 0; k < code_length; k++ {
+						if !is_hex(parser.buffer, parser.buffer_pos+k) {
+							yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
+								start_mark, "did not find expected hexdecimal number")
+							return false
+						}
+						value = (value << 4) + as_hex(parser.buffer, parser.buffer_pos+k)
+					}
+
+					// Check the value and write the character.
+					if (value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF {
+						yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
+							start_mark, "found invalid Unicode character escape code")
+						return false
+					}
+					if value <= 0x7F {
+						s = append(s, byte(value))
+					} else if value <= 0x7FF {
+						s = append(s, byte(0xC0+(value>>6)))
+						s = append(s, byte(0x80+(value&0x3F)))
+					} else if value <= 0xFFFF {
+						s = append(s, byte(0xE0+(value>>12)))
+						s = append(s, byte(0x80+((value>>6)&0x3F)))
+						s = append(s, byte(0x80+(value&0x3F)))
+					} else {
+						s = append(s, byte(0xF0+(value>>18)))
+						s = append(s, byte(0x80+((value>>12)&0x3F)))
+						s = append(s, byte(0x80+((value>>6)&0x3F)))
+						s = append(s, byte(0x80+(value&0x3F)))
+					}
+
+					// Advance the pointer.
+					for k := 0; k < code_length; k++ {
+						skip(parser)
+					}
+				}
+			} else {
+				// It is a non-escaped non-blank character.
+				s = read(parser, s)
+			}
+			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+				return false
+			}
+		}
+
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+
+		// Check if we are at the end of the scalar.
+		if single {
+			if parser.buffer[parser.buffer_pos] == '\'' {
+				break
+			}
+		} else {
+			if parser.buffer[parser.buffer_pos] == '"' {
+				break
+			}
+		}
+
+		// Consume blank characters.
+		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
+			if is_blank(parser.buffer, parser.buffer_pos) {
+				// Consume a space or a tab character.
+				if !leading_blanks {
+					whitespaces = read(parser, whitespaces)
+				} else {
+					skip(parser)
+				}
+			} else {
+				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+					return false
+				}
+
+				// Check if it is a first line break.
+				if !leading_blanks {
+					whitespaces = whitespaces[:0]
+					leading_break = read_line(parser, leading_break)
+					leading_blanks = true
+				} else {
+					trailing_breaks = read_line(parser, trailing_breaks)
+				}
+			}
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+
+		// Join the whitespaces or fold line breaks.
+		if leading_blanks {
+			// Do we need to fold line breaks?
+			if len(leading_break) > 0 && leading_break[0] == '\n' {
+				if len(trailing_breaks) == 0 {
+					s = append(s, ' ')
+				} else {
+					s = append(s, trailing_breaks...)
+				}
+			} else {
+				s = append(s, leading_break...)
+				s = append(s, trailing_breaks...)
+			}
+			trailing_breaks = trailing_breaks[:0]
+			leading_break = leading_break[:0]
+		} else {
+			s = append(s, whitespaces...)
+			whitespaces = whitespaces[:0]
+		}
+	}
+
+	// Eat the right quote.
+	skip(parser)
+	end_mark := parser.mark
+
+	// Create a token.
+	*token = yaml_token_t{
+		typ:        yaml_SCALAR_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+		value:      s,
+		style:      yaml_SINGLE_QUOTED_SCALAR_STYLE,
+	}
+	if !single {
+		token.style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
+	}
+	return true
+}
+
+// Scan a plain scalar.
+func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) bool {
+
+	var s, leading_break, trailing_breaks, whitespaces []byte
+	var leading_blanks bool
+	var indent = parser.indent + 1
+
+	start_mark := parser.mark
+	end_mark := parser.mark
+
+	// Consume the content of the plain scalar.
+	for {
+		// Check for a document indicator.
+		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
+			return false
+		}
+		if parser.mark.column == 0 &&
+			((parser.buffer[parser.buffer_pos+0] == '-' &&
+				parser.buffer[parser.buffer_pos+1] == '-' &&
+				parser.buffer[parser.buffer_pos+2] == '-') ||
+				(parser.buffer[parser.buffer_pos+0] == '.' &&
+					parser.buffer[parser.buffer_pos+1] == '.' &&
+					parser.buffer[parser.buffer_pos+2] == '.')) &&
+			is_blankz(parser.buffer, parser.buffer_pos+3) {
+			break
+		}
+
+		// Check for a comment.
+		if parser.buffer[parser.buffer_pos] == '#' {
+			break
+		}
+
+		// Consume non-blank characters.
+		for !is_blankz(parser.buffer, parser.buffer_pos) {
+
+			// Check for indicators that may end a plain scalar.
+			if (parser.buffer[parser.buffer_pos] == ':' && is_blankz(parser.buffer, parser.buffer_pos+1)) ||
+				(parser.flow_level > 0 &&
+					(parser.buffer[parser.buffer_pos] == ',' ||
+						parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == '[' ||
+						parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
+						parser.buffer[parser.buffer_pos] == '}')) {
+				break
+			}
+
+			// Check if we need to join whitespaces and breaks.
+			if leading_blanks || len(whitespaces) > 0 {
+				if leading_blanks {
+					// Do we need to fold line breaks?
+					if leading_break[0] == '\n' {
+						if len(trailing_breaks) == 0 {
+							s = append(s, ' ')
+						} else {
+							s = append(s, trailing_breaks...)
+						}
+					} else {
+						s = append(s, leading_break...)
+						s = append(s, trailing_breaks...)
+					}
+					trailing_breaks = trailing_breaks[:0]
+					leading_break = leading_break[:0]
+					leading_blanks = false
+				} else {
+					s = append(s, whitespaces...)
+					whitespaces = whitespaces[:0]
+				}
+			}
+
+			// Copy the character.
+			s = read(parser, s)
+
+			end_mark = parser.mark
+			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+				return false
+			}
+		}
+
+		// Is it the end?
+		if !(is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos)) {
+			break
+		}
+
+		// Consume blank characters.
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+
+		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
+			if is_blank(parser.buffer, parser.buffer_pos) {
+
+				// Check for tab characters that abuse indentation.
+				if leading_blanks && parser.mark.column < indent && is_tab(parser.buffer, parser.buffer_pos) {
+					yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
+						start_mark, "found a tab character that violates indentation")
+					return false
+				}
+
+				// Consume a space or a tab character.
+				if !leading_blanks {
+					whitespaces = read(parser, whitespaces)
+				} else {
+					skip(parser)
+				}
+			} else {
+				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+					return false
+				}
+
+				// Check if it is a first line break.
+				if !leading_blanks {
+					whitespaces = whitespaces[:0]
+					leading_break = read_line(parser, leading_break)
+					leading_blanks = true
+				} else {
+					trailing_breaks = read_line(parser, trailing_breaks)
+				}
+			}
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+		}
+
+		// Check indentation level.
+		if parser.flow_level == 0 && parser.mark.column < indent {
+			break
+		}
+	}
+
+	// Create a token.
+	*token = yaml_token_t{
+		typ:        yaml_SCALAR_TOKEN,
+		start_mark: start_mark,
+		end_mark:   end_mark,
+		value:      s,
+		style:      yaml_PLAIN_SCALAR_STYLE,
+	}
+
+	// Note that we change the 'simple_key_allowed' flag.
+	if leading_blanks {
+		parser.simple_key_allowed = true
+	}
+	return true
+}
+
+func yaml_parser_scan_line_comment(parser *yaml_parser_t, token_mark yaml_mark_t) bool {
+	if parser.newlines > 0 {
+		return true
+	}
+
+	var start_mark yaml_mark_t
+	var text []byte
+
+	for peek := 0; peek < 512; peek++ {
+		if parser.unread < peek+1 && !yaml_parser_update_buffer(parser, peek+1) {
+			break
+		}
+		if is_blank(parser.buffer, parser.buffer_pos+peek) {
+			continue
+		}
+		if parser.buffer[parser.buffer_pos+peek] == '#' {
+			seen := parser.mark.index + peek
+			for {
+				if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+					return false
+				}
+				if is_breakz(parser.buffer, parser.buffer_pos) {
+					if parser.mark.index >= seen {
+						break
+					}
+					if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+						return false
+					}
+					skip_line(parser)
+				} else if parser.mark.index >= seen {
+					if len(text) == 0 {
+						start_mark = parser.mark
+					}
+					text = read(parser, text)
+				} else {
+					skip(parser)
+				}
+			}
+		}
+		break
+	}
+	if len(text) > 0 {
+		parser.comments = append(parser.comments, yaml_comment_t{
+			token_mark: token_mark,
+			start_mark: start_mark,
+			line:       text,
+		})
+	}
+	return true
+}
+
+func yaml_parser_scan_comments(parser *yaml_parser_t, scan_mark yaml_mark_t) bool {
+	token := parser.tokens[len(parser.tokens)-1]
+
+	if token.typ == yaml_FLOW_ENTRY_TOKEN && len(parser.tokens) > 1 {
+		token = parser.tokens[len(parser.tokens)-2]
+	}
+
+	var token_mark = token.start_mark
+	var start_mark yaml_mark_t
+	var next_indent = parser.indent
+	if next_indent < 0 {
+		next_indent = 0
+	}
+
+	var recent_empty = false
+	var first_empty = parser.newlines <= 1
+
+	var line = parser.mark.line
+	var column = parser.mark.column
+
+	var text []byte
+
+	// The foot line is the place where a comment must start to
+	// still be considered as a foot of the prior content.
+	// If there's some content in the currently parsed line, then
+	// the foot is the line below it.
+	var foot_line = -1
+	if scan_mark.line > 0 {
+		foot_line = parser.mark.line - parser.newlines + 1
+		if parser.newlines == 0 && parser.mark.column > 1 {
+			foot_line++
+		}
+	}
+
+	var peek = 0
+	for ; peek < 512; peek++ {
+		if parser.unread < peek+1 && !yaml_parser_update_buffer(parser, peek+1) {
+			break
+		}
+		column++
+		if is_blank(parser.buffer, parser.buffer_pos+peek) {
+			continue
+		}
+		c := parser.buffer[parser.buffer_pos+peek]
+		var close_flow = parser.flow_level > 0 && (c == ']' || c == '}')
+		if close_flow || is_breakz(parser.buffer, parser.buffer_pos+peek) {
+			// Got line break or terminator.
+			if close_flow || !recent_empty {
+				if close_flow || first_empty && (start_mark.line == foot_line && token.typ != yaml_VALUE_TOKEN || start_mark.column-1 < next_indent) {
+					// This is the first empty line and there were no empty lines before,
+					// so this initial part of the comment is a foot of the prior token
+					// instead of being a head for the following one. Split it up.
+					// Alternatively, this might also be the last comment inside a flow
+					// scope, so it must be a footer.
+					if len(text) > 0 {
+						if start_mark.column-1 < next_indent {
+							// If dedented it's unrelated to the prior token.
+							token_mark = start_mark
+						}
+						parser.comments = append(parser.comments, yaml_comment_t{
+							scan_mark:  scan_mark,
+							token_mark: token_mark,
+							start_mark: start_mark,
+							end_mark:   yaml_mark_t{parser.mark.index + peek, line, column},
+							foot:       text,
+						})
+						scan_mark = yaml_mark_t{parser.mark.index + peek, line, column}
+						token_mark = scan_mark
+						text = nil
+					}
+				} else {
+					if len(text) > 0 && parser.buffer[parser.buffer_pos+peek] != 0 {
+						text = append(text, '\n')
+					}
+				}
+			}
+			if !is_break(parser.buffer, parser.buffer_pos+peek) {
+				break
+			}
+			first_empty = false
+			recent_empty = true
+			column = 0
+			line++
+			continue
+		}
+
+		if len(text) > 0 && (close_flow || column-1 < next_indent && column != start_mark.column) {
+			// The comment at the different indentation is a foot of the
+			// preceding data rather than a head of the upcoming one.
+			parser.comments = append(parser.comments, yaml_comment_t{
+				scan_mark:  scan_mark,
+				token_mark: token_mark,
+				start_mark: start_mark,
+				end_mark:   yaml_mark_t{parser.mark.index + peek, line, column},
+				foot:       text,
+			})
+			scan_mark = yaml_mark_t{parser.mark.index + peek, line, column}
+			token_mark = scan_mark
+			text = nil
+		}
+
+		if parser.buffer[parser.buffer_pos+peek] != '#' {
+			break
+		}
+
+		if len(text) == 0 {
+			start_mark = yaml_mark_t{parser.mark.index + peek, line, column}
+		} else {
+			text = append(text, '\n')
+		}
+
+		recent_empty = false
+
+		// Consume until after the consumed comment line.
+		seen := parser.mark.index + peek
+		for {
+			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+				return false
+			}
+			if is_breakz(parser.buffer, parser.buffer_pos) {
+				if parser.mark.index >= seen {
+					break
+				}
+				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
+					return false
+				}
+				skip_line(parser)
+			} else if parser.mark.index >= seen {
+				text = read(parser, text)
+			} else {
+				skip(parser)
+			}
+		}
+
+		peek = 0
+		column = 0
+		line = parser.mark.line
+		next_indent = parser.indent
+		if next_indent < 0 {
+			next_indent = 0
+		}
+	}
+
+	if len(text) > 0 {
+		parser.comments = append(parser.comments, yaml_comment_t{
+			scan_mark:  scan_mark,
+			token_mark: start_mark,
+			start_mark: start_mark,
+			end_mark:   yaml_mark_t{parser.mark.index + peek - 1, line, column},
+			head:       text,
+		})
+	}
+	return true
+}
diff --git a/vendor/go.yaml.in/yaml/v3/sorter.go b/vendor/go.yaml.in/yaml/v3/sorter.go
new file mode 100644
index 000000000..9210ece7e
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/sorter.go
@@ -0,0 +1,134 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package yaml
+
+import (
+	"reflect"
+	"unicode"
+)
+
+type keyList []reflect.Value
+
+func (l keyList) Len() int      { return len(l) }
+func (l keyList) Swap(i, j int) { l[i], l[j] = l[j], l[i] }
+func (l keyList) Less(i, j int) bool {
+	a := l[i]
+	b := l[j]
+	ak := a.Kind()
+	bk := b.Kind()
+	for (ak == reflect.Interface || ak == reflect.Ptr) && !a.IsNil() {
+		a = a.Elem()
+		ak = a.Kind()
+	}
+	for (bk == reflect.Interface || bk == reflect.Ptr) && !b.IsNil() {
+		b = b.Elem()
+		bk = b.Kind()
+	}
+	af, aok := keyFloat(a)
+	bf, bok := keyFloat(b)
+	if aok && bok {
+		if af != bf {
+			return af < bf
+		}
+		if ak != bk {
+			return ak < bk
+		}
+		return numLess(a, b)
+	}
+	if ak != reflect.String || bk != reflect.String {
+		return ak < bk
+	}
+	ar, br := []rune(a.String()), []rune(b.String())
+	digits := false
+	for i := 0; i < len(ar) && i < len(br); i++ {
+		if ar[i] == br[i] {
+			digits = unicode.IsDigit(ar[i])
+			continue
+		}
+		al := unicode.IsLetter(ar[i])
+		bl := unicode.IsLetter(br[i])
+		if al && bl {
+			return ar[i] < br[i]
+		}
+		if al || bl {
+			if digits {
+				return al
+			} else {
+				return bl
+			}
+		}
+		var ai, bi int
+		var an, bn int64
+		if ar[i] == '0' || br[i] == '0' {
+			for j := i - 1; j >= 0 && unicode.IsDigit(ar[j]); j-- {
+				if ar[j] != '0' {
+					an = 1
+					bn = 1
+					break
+				}
+			}
+		}
+		for ai = i; ai < len(ar) && unicode.IsDigit(ar[ai]); ai++ {
+			an = an*10 + int64(ar[ai]-'0')
+		}
+		for bi = i; bi < len(br) && unicode.IsDigit(br[bi]); bi++ {
+			bn = bn*10 + int64(br[bi]-'0')
+		}
+		if an != bn {
+			return an < bn
+		}
+		if ai != bi {
+			return ai < bi
+		}
+		return ar[i] < br[i]
+	}
+	return len(ar) < len(br)
+}
+
+// keyFloat returns a float value for v if it is a number/bool
+// and whether it is a number/bool or not.
+func keyFloat(v reflect.Value) (f float64, ok bool) {
+	switch v.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return float64(v.Int()), true
+	case reflect.Float32, reflect.Float64:
+		return v.Float(), true
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return float64(v.Uint()), true
+	case reflect.Bool:
+		if v.Bool() {
+			return 1, true
+		}
+		return 0, true
+	}
+	return 0, false
+}
+
+// numLess returns whether a < b.
+// a and b must necessarily have the same kind.
+func numLess(a, b reflect.Value) bool {
+	switch a.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return a.Int() < b.Int()
+	case reflect.Float32, reflect.Float64:
+		return a.Float() < b.Float()
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return a.Uint() < b.Uint()
+	case reflect.Bool:
+		return !a.Bool() && b.Bool()
+	}
+	panic("not a number")
+}
diff --git a/vendor/go.yaml.in/yaml/v3/writerc.go b/vendor/go.yaml.in/yaml/v3/writerc.go
new file mode 100644
index 000000000..266d0b092
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/writerc.go
@@ -0,0 +1,48 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+// Set the writer error and return false.
+func yaml_emitter_set_writer_error(emitter *yaml_emitter_t, problem string) bool {
+	emitter.error = yaml_WRITER_ERROR
+	emitter.problem = problem
+	return false
+}
+
+// Flush the output buffer.
+func yaml_emitter_flush(emitter *yaml_emitter_t) bool {
+	if emitter.write_handler == nil {
+		panic("write handler not set")
+	}
+
+	// Check if the buffer is empty.
+	if emitter.buffer_pos == 0 {
+		return true
+	}
+
+	if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil {
+		return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
+	}
+	emitter.buffer_pos = 0
+	return true
+}
diff --git a/vendor/go.yaml.in/yaml/v3/yaml.go b/vendor/go.yaml.in/yaml/v3/yaml.go
new file mode 100644
index 000000000..0b101cd20
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/yaml.go
@@ -0,0 +1,703 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package yaml implements YAML support for the Go language.
+//
+// Source code and other details for the project are available at GitHub:
+//
+//	https://github.com/yaml/go-yaml
+package yaml
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+	"sync"
+	"unicode/utf8"
+)
+
+// The Unmarshaler interface may be implemented by types to customize their
+// behavior when being unmarshaled from a YAML document.
+type Unmarshaler interface {
+	UnmarshalYAML(value *Node) error
+}
+
+type obsoleteUnmarshaler interface {
+	UnmarshalYAML(unmarshal func(interface{}) error) error
+}
+
+// The Marshaler interface may be implemented by types to customize their
+// behavior when being marshaled into a YAML document. The returned value
+// is marshaled in place of the original value implementing Marshaler.
+//
+// If an error is returned by MarshalYAML, the marshaling procedure stops
+// and returns with the provided error.
+type Marshaler interface {
+	MarshalYAML() (interface{}, error)
+}
+
+// Unmarshal decodes the first document found within the in byte slice
+// and assigns decoded values into the out value.
+//
+// Maps and pointers (to a struct, string, int, etc) are accepted as out
+// values. If an internal pointer within a struct is not initialized,
+// the yaml package will initialize it if necessary for unmarshalling
+// the provided data. The out parameter must not be nil.
+//
+// The type of the decoded values should be compatible with the respective
+// values in out. If one or more values cannot be decoded due to a type
+// mismatches, decoding continues partially until the end of the YAML
+// content, and a *yaml.TypeError is returned with details for all
+// missed values.
+//
+// Struct fields are only unmarshalled if they are exported (have an
+// upper case first letter), and are unmarshalled using the field name
+// lowercased as the default key. Custom keys may be defined via the
+// "yaml" name in the field tag: the content preceding the first comma
+// is used as the key, and the following comma-separated options are
+// used to tweak the marshalling process (see Marshal).
+// Conflicting names result in a runtime error.
+//
+// For example:
+//
+//	type T struct {
+//	    F int `yaml:"a,omitempty"`
+//	    B int
+//	}
+//	var t T
+//	yaml.Unmarshal([]byte("a: 1\nb: 2"), &t)
+//
+// See the documentation of Marshal for the format of tags and a list of
+// supported tag options.
+func Unmarshal(in []byte, out interface{}) (err error) {
+	return unmarshal(in, out, false)
+}
+
+// A Decoder reads and decodes YAML values from an input stream.
+type Decoder struct {
+	parser      *parser
+	knownFields bool
+}
+
+// NewDecoder returns a new decoder that reads from r.
+//
+// The decoder introduces its own buffering and may read
+// data from r beyond the YAML values requested.
+func NewDecoder(r io.Reader) *Decoder {
+	return &Decoder{
+		parser: newParserFromReader(r),
+	}
+}
+
+// KnownFields ensures that the keys in decoded mappings to
+// exist as fields in the struct being decoded into.
+func (dec *Decoder) KnownFields(enable bool) {
+	dec.knownFields = enable
+}
+
+// Decode reads the next YAML-encoded value from its input
+// and stores it in the value pointed to by v.
+//
+// See the documentation for Unmarshal for details about the
+// conversion of YAML into a Go value.
+func (dec *Decoder) Decode(v interface{}) (err error) {
+	d := newDecoder()
+	d.knownFields = dec.knownFields
+	defer handleErr(&err)
+	node := dec.parser.parse()
+	if node == nil {
+		return io.EOF
+	}
+	out := reflect.ValueOf(v)
+	if out.Kind() == reflect.Ptr && !out.IsNil() {
+		out = out.Elem()
+	}
+	d.unmarshal(node, out)
+	if len(d.terrors) > 0 {
+		return &TypeError{d.terrors}
+	}
+	return nil
+}
+
+// Decode decodes the node and stores its data into the value pointed to by v.
+//
+// See the documentation for Unmarshal for details about the
+// conversion of YAML into a Go value.
+func (n *Node) Decode(v interface{}) (err error) {
+	d := newDecoder()
+	defer handleErr(&err)
+	out := reflect.ValueOf(v)
+	if out.Kind() == reflect.Ptr && !out.IsNil() {
+		out = out.Elem()
+	}
+	d.unmarshal(n, out)
+	if len(d.terrors) > 0 {
+		return &TypeError{d.terrors}
+	}
+	return nil
+}
+
+func unmarshal(in []byte, out interface{}, strict bool) (err error) {
+	defer handleErr(&err)
+	d := newDecoder()
+	p := newParser(in)
+	defer p.destroy()
+	node := p.parse()
+	if node != nil {
+		v := reflect.ValueOf(out)
+		if v.Kind() == reflect.Ptr && !v.IsNil() {
+			v = v.Elem()
+		}
+		d.unmarshal(node, v)
+	}
+	if len(d.terrors) > 0 {
+		return &TypeError{d.terrors}
+	}
+	return nil
+}
+
+// Marshal serializes the value provided into a YAML document. The structure
+// of the generated document will reflect the structure of the value itself.
+// Maps and pointers (to struct, string, int, etc) are accepted as the in value.
+//
+// Struct fields are only marshalled if they are exported (have an upper case
+// first letter), and are marshalled using the field name lowercased as the
+// default key. Custom keys may be defined via the "yaml" name in the field
+// tag: the content preceding the first comma is used as the key, and the
+// following comma-separated options are used to tweak the marshalling process.
+// Conflicting names result in a runtime error.
+//
+// The field tag format accepted is:
+//
+//	`(...) yaml:"[][,[,]]" (...)`
+//
+// The following flags are currently supported:
+//
+//	omitempty    Only include the field if it's not set to the zero
+//	             value for the type or to empty slices or maps.
+//	             Zero valued structs will be omitted if all their public
+//	             fields are zero, unless they implement an IsZero
+//	             method (see the IsZeroer interface type), in which
+//	             case the field will be excluded if IsZero returns true.
+//
+//	flow         Marshal using a flow style (useful for structs,
+//	             sequences and maps).
+//
+//	inline       Inline the field, which must be a struct or a map,
+//	             causing all of its fields or keys to be processed as if
+//	             they were part of the outer struct. For maps, keys must
+//	             not conflict with the yaml keys of other struct fields.
+//
+// In addition, if the key is "-", the field is ignored.
+//
+// For example:
+//
+//	type T struct {
+//	    F int `yaml:"a,omitempty"`
+//	    B int
+//	}
+//	yaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
+//	yaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n"
+func Marshal(in interface{}) (out []byte, err error) {
+	defer handleErr(&err)
+	e := newEncoder()
+	defer e.destroy()
+	e.marshalDoc("", reflect.ValueOf(in))
+	e.finish()
+	out = e.out
+	return
+}
+
+// An Encoder writes YAML values to an output stream.
+type Encoder struct {
+	encoder *encoder
+}
+
+// NewEncoder returns a new encoder that writes to w.
+// The Encoder should be closed after use to flush all data
+// to w.
+func NewEncoder(w io.Writer) *Encoder {
+	return &Encoder{
+		encoder: newEncoderWithWriter(w),
+	}
+}
+
+// Encode writes the YAML encoding of v to the stream.
+// If multiple items are encoded to the stream, the
+// second and subsequent document will be preceded
+// with a "---" document separator, but the first will not.
+//
+// See the documentation for Marshal for details about the conversion of Go
+// values to YAML.
+func (e *Encoder) Encode(v interface{}) (err error) {
+	defer handleErr(&err)
+	e.encoder.marshalDoc("", reflect.ValueOf(v))
+	return nil
+}
+
+// Encode encodes value v and stores its representation in n.
+//
+// See the documentation for Marshal for details about the
+// conversion of Go values into YAML.
+func (n *Node) Encode(v interface{}) (err error) {
+	defer handleErr(&err)
+	e := newEncoder()
+	defer e.destroy()
+	e.marshalDoc("", reflect.ValueOf(v))
+	e.finish()
+	p := newParser(e.out)
+	p.textless = true
+	defer p.destroy()
+	doc := p.parse()
+	*n = *doc.Content[0]
+	return nil
+}
+
+// SetIndent changes the used indentation used when encoding.
+func (e *Encoder) SetIndent(spaces int) {
+	if spaces < 0 {
+		panic("yaml: cannot indent to a negative number of spaces")
+	}
+	e.encoder.indent = spaces
+}
+
+// CompactSeqIndent makes it so that '- ' is considered part of the indentation.
+func (e *Encoder) CompactSeqIndent() {
+	e.encoder.emitter.compact_sequence_indent = true
+}
+
+// DefaultSeqIndent makes it so that '- ' is not considered part of the indentation.
+func (e *Encoder) DefaultSeqIndent() {
+	e.encoder.emitter.compact_sequence_indent = false
+}
+
+// Close closes the encoder by writing any remaining data.
+// It does not write a stream terminating string "...".
+func (e *Encoder) Close() (err error) {
+	defer handleErr(&err)
+	e.encoder.finish()
+	return nil
+}
+
+func handleErr(err *error) {
+	if v := recover(); v != nil {
+		if e, ok := v.(yamlError); ok {
+			*err = e.err
+		} else {
+			panic(v)
+		}
+	}
+}
+
+type yamlError struct {
+	err error
+}
+
+func fail(err error) {
+	panic(yamlError{err})
+}
+
+func failf(format string, args ...interface{}) {
+	panic(yamlError{fmt.Errorf("yaml: "+format, args...)})
+}
+
+// A TypeError is returned by Unmarshal when one or more fields in
+// the YAML document cannot be properly decoded into the requested
+// types. When this error is returned, the value is still
+// unmarshaled partially.
+type TypeError struct {
+	Errors []string
+}
+
+func (e *TypeError) Error() string {
+	return fmt.Sprintf("yaml: unmarshal errors:\n  %s", strings.Join(e.Errors, "\n  "))
+}
+
+type Kind uint32
+
+const (
+	DocumentNode Kind = 1 << iota
+	SequenceNode
+	MappingNode
+	ScalarNode
+	AliasNode
+)
+
+type Style uint32
+
+const (
+	TaggedStyle Style = 1 << iota
+	DoubleQuotedStyle
+	SingleQuotedStyle
+	LiteralStyle
+	FoldedStyle
+	FlowStyle
+)
+
+// Node represents an element in the YAML document hierarchy. While documents
+// are typically encoded and decoded into higher level types, such as structs
+// and maps, Node is an intermediate representation that allows detailed
+// control over the content being decoded or encoded.
+//
+// It's worth noting that although Node offers access into details such as
+// line numbers, colums, and comments, the content when re-encoded will not
+// have its original textual representation preserved. An effort is made to
+// render the data plesantly, and to preserve comments near the data they
+// describe, though.
+//
+// Values that make use of the Node type interact with the yaml package in the
+// same way any other type would do, by encoding and decoding yaml data
+// directly or indirectly into them.
+//
+// For example:
+//
+//	var person struct {
+//	        Name    string
+//	        Address yaml.Node
+//	}
+//	err := yaml.Unmarshal(data, &person)
+//
+// Or by itself:
+//
+//	var person Node
+//	err := yaml.Unmarshal(data, &person)
+type Node struct {
+	// Kind defines whether the node is a document, a mapping, a sequence,
+	// a scalar value, or an alias to another node. The specific data type of
+	// scalar nodes may be obtained via the ShortTag and LongTag methods.
+	Kind Kind
+
+	// Style allows customizing the apperance of the node in the tree.
+	Style Style
+
+	// Tag holds the YAML tag defining the data type for the value.
+	// When decoding, this field will always be set to the resolved tag,
+	// even when it wasn't explicitly provided in the YAML content.
+	// When encoding, if this field is unset the value type will be
+	// implied from the node properties, and if it is set, it will only
+	// be serialized into the representation if TaggedStyle is used or
+	// the implicit tag diverges from the provided one.
+	Tag string
+
+	// Value holds the unescaped and unquoted represenation of the value.
+	Value string
+
+	// Anchor holds the anchor name for this node, which allows aliases to point to it.
+	Anchor string
+
+	// Alias holds the node that this alias points to. Only valid when Kind is AliasNode.
+	Alias *Node
+
+	// Content holds contained nodes for documents, mappings, and sequences.
+	Content []*Node
+
+	// HeadComment holds any comments in the lines preceding the node and
+	// not separated by an empty line.
+	HeadComment string
+
+	// LineComment holds any comments at the end of the line where the node is in.
+	LineComment string
+
+	// FootComment holds any comments following the node and before empty lines.
+	FootComment string
+
+	// Line and Column hold the node position in the decoded YAML text.
+	// These fields are not respected when encoding the node.
+	Line   int
+	Column int
+}
+
+// IsZero returns whether the node has all of its fields unset.
+func (n *Node) IsZero() bool {
+	return n.Kind == 0 && n.Style == 0 && n.Tag == "" && n.Value == "" && n.Anchor == "" && n.Alias == nil && n.Content == nil &&
+		n.HeadComment == "" && n.LineComment == "" && n.FootComment == "" && n.Line == 0 && n.Column == 0
+}
+
+// LongTag returns the long form of the tag that indicates the data type for
+// the node. If the Tag field isn't explicitly defined, one will be computed
+// based on the node properties.
+func (n *Node) LongTag() string {
+	return longTag(n.ShortTag())
+}
+
+// ShortTag returns the short form of the YAML tag that indicates data type for
+// the node. If the Tag field isn't explicitly defined, one will be computed
+// based on the node properties.
+func (n *Node) ShortTag() string {
+	if n.indicatedString() {
+		return strTag
+	}
+	if n.Tag == "" || n.Tag == "!" {
+		switch n.Kind {
+		case MappingNode:
+			return mapTag
+		case SequenceNode:
+			return seqTag
+		case AliasNode:
+			if n.Alias != nil {
+				return n.Alias.ShortTag()
+			}
+		case ScalarNode:
+			tag, _ := resolve("", n.Value)
+			return tag
+		case 0:
+			// Special case to make the zero value convenient.
+			if n.IsZero() {
+				return nullTag
+			}
+		}
+		return ""
+	}
+	return shortTag(n.Tag)
+}
+
+func (n *Node) indicatedString() bool {
+	return n.Kind == ScalarNode &&
+		(shortTag(n.Tag) == strTag ||
+			(n.Tag == "" || n.Tag == "!") && n.Style&(SingleQuotedStyle|DoubleQuotedStyle|LiteralStyle|FoldedStyle) != 0)
+}
+
+// SetString is a convenience function that sets the node to a string value
+// and defines its style in a pleasant way depending on its content.
+func (n *Node) SetString(s string) {
+	n.Kind = ScalarNode
+	if utf8.ValidString(s) {
+		n.Value = s
+		n.Tag = strTag
+	} else {
+		n.Value = encodeBase64(s)
+		n.Tag = binaryTag
+	}
+	if strings.Contains(n.Value, "\n") {
+		n.Style = LiteralStyle
+	}
+}
+
+// --------------------------------------------------------------------------
+// Maintain a mapping of keys to structure field indexes
+
+// The code in this section was copied from mgo/bson.
+
+// structInfo holds details for the serialization of fields of
+// a given struct.
+type structInfo struct {
+	FieldsMap  map[string]fieldInfo
+	FieldsList []fieldInfo
+
+	// InlineMap is the number of the field in the struct that
+	// contains an ,inline map, or -1 if there's none.
+	InlineMap int
+
+	// InlineUnmarshalers holds indexes to inlined fields that
+	// contain unmarshaler values.
+	InlineUnmarshalers [][]int
+}
+
+type fieldInfo struct {
+	Key       string
+	Num       int
+	OmitEmpty bool
+	Flow      bool
+	// Id holds the unique field identifier, so we can cheaply
+	// check for field duplicates without maintaining an extra map.
+	Id int
+
+	// Inline holds the field index if the field is part of an inlined struct.
+	Inline []int
+}
+
+var structMap = make(map[reflect.Type]*structInfo)
+var fieldMapMutex sync.RWMutex
+var unmarshalerType reflect.Type
+
+func init() {
+	var v Unmarshaler
+	unmarshalerType = reflect.ValueOf(&v).Elem().Type()
+}
+
+func getStructInfo(st reflect.Type) (*structInfo, error) {
+	fieldMapMutex.RLock()
+	sinfo, found := structMap[st]
+	fieldMapMutex.RUnlock()
+	if found {
+		return sinfo, nil
+	}
+
+	n := st.NumField()
+	fieldsMap := make(map[string]fieldInfo)
+	fieldsList := make([]fieldInfo, 0, n)
+	inlineMap := -1
+	inlineUnmarshalers := [][]int(nil)
+	for i := 0; i != n; i++ {
+		field := st.Field(i)
+		if field.PkgPath != "" && !field.Anonymous {
+			continue // Private field
+		}
+
+		info := fieldInfo{Num: i}
+
+		tag := field.Tag.Get("yaml")
+		if tag == "" && strings.Index(string(field.Tag), ":") < 0 {
+			tag = string(field.Tag)
+		}
+		if tag == "-" {
+			continue
+		}
+
+		inline := false
+		fields := strings.Split(tag, ",")
+		if len(fields) > 1 {
+			for _, flag := range fields[1:] {
+				switch flag {
+				case "omitempty":
+					info.OmitEmpty = true
+				case "flow":
+					info.Flow = true
+				case "inline":
+					inline = true
+				default:
+					return nil, errors.New(fmt.Sprintf("unsupported flag %q in tag %q of type %s", flag, tag, st))
+				}
+			}
+			tag = fields[0]
+		}
+
+		if inline {
+			switch field.Type.Kind() {
+			case reflect.Map:
+				if inlineMap >= 0 {
+					return nil, errors.New("multiple ,inline maps in struct " + st.String())
+				}
+				if field.Type.Key() != reflect.TypeOf("") {
+					return nil, errors.New("option ,inline needs a map with string keys in struct " + st.String())
+				}
+				inlineMap = info.Num
+			case reflect.Struct, reflect.Ptr:
+				ftype := field.Type
+				for ftype.Kind() == reflect.Ptr {
+					ftype = ftype.Elem()
+				}
+				if ftype.Kind() != reflect.Struct {
+					return nil, errors.New("option ,inline may only be used on a struct or map field")
+				}
+				if reflect.PtrTo(ftype).Implements(unmarshalerType) {
+					inlineUnmarshalers = append(inlineUnmarshalers, []int{i})
+				} else {
+					sinfo, err := getStructInfo(ftype)
+					if err != nil {
+						return nil, err
+					}
+					for _, index := range sinfo.InlineUnmarshalers {
+						inlineUnmarshalers = append(inlineUnmarshalers, append([]int{i}, index...))
+					}
+					for _, finfo := range sinfo.FieldsList {
+						if _, found := fieldsMap[finfo.Key]; found {
+							msg := "duplicated key '" + finfo.Key + "' in struct " + st.String()
+							return nil, errors.New(msg)
+						}
+						if finfo.Inline == nil {
+							finfo.Inline = []int{i, finfo.Num}
+						} else {
+							finfo.Inline = append([]int{i}, finfo.Inline...)
+						}
+						finfo.Id = len(fieldsList)
+						fieldsMap[finfo.Key] = finfo
+						fieldsList = append(fieldsList, finfo)
+					}
+				}
+			default:
+				return nil, errors.New("option ,inline may only be used on a struct or map field")
+			}
+			continue
+		}
+
+		if tag != "" {
+			info.Key = tag
+		} else {
+			info.Key = strings.ToLower(field.Name)
+		}
+
+		if _, found = fieldsMap[info.Key]; found {
+			msg := "duplicated key '" + info.Key + "' in struct " + st.String()
+			return nil, errors.New(msg)
+		}
+
+		info.Id = len(fieldsList)
+		fieldsList = append(fieldsList, info)
+		fieldsMap[info.Key] = info
+	}
+
+	sinfo = &structInfo{
+		FieldsMap:          fieldsMap,
+		FieldsList:         fieldsList,
+		InlineMap:          inlineMap,
+		InlineUnmarshalers: inlineUnmarshalers,
+	}
+
+	fieldMapMutex.Lock()
+	structMap[st] = sinfo
+	fieldMapMutex.Unlock()
+	return sinfo, nil
+}
+
+// IsZeroer is used to check whether an object is zero to
+// determine whether it should be omitted when marshaling
+// with the omitempty flag. One notable implementation
+// is time.Time.
+type IsZeroer interface {
+	IsZero() bool
+}
+
+func isZero(v reflect.Value) bool {
+	kind := v.Kind()
+	if z, ok := v.Interface().(IsZeroer); ok {
+		if (kind == reflect.Ptr || kind == reflect.Interface) && v.IsNil() {
+			return true
+		}
+		return z.IsZero()
+	}
+	switch kind {
+	case reflect.String:
+		return len(v.String()) == 0
+	case reflect.Interface, reflect.Ptr:
+		return v.IsNil()
+	case reflect.Slice:
+		return v.Len() == 0
+	case reflect.Map:
+		return v.Len() == 0
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return v.Int() == 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() == 0
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return v.Uint() == 0
+	case reflect.Bool:
+		return !v.Bool()
+	case reflect.Struct:
+		vt := v.Type()
+		for i := v.NumField() - 1; i >= 0; i-- {
+			if vt.Field(i).PkgPath != "" {
+				continue // Private field
+			}
+			if !isZero(v.Field(i)) {
+				return false
+			}
+		}
+		return true
+	}
+	return false
+}
diff --git a/vendor/go.yaml.in/yaml/v3/yamlh.go b/vendor/go.yaml.in/yaml/v3/yamlh.go
new file mode 100644
index 000000000..07c442361
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/yamlh.go
@@ -0,0 +1,807 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+import (
+	"fmt"
+	"io"
+)
+
+// The version directive data.
+type yaml_version_directive_t struct {
+	major int8 // The major version number.
+	minor int8 // The minor version number.
+}
+
+// The tag directive data.
+type yaml_tag_directive_t struct {
+	handle []byte // The tag handle.
+	prefix []byte // The tag prefix.
+}
+
+type yaml_encoding_t int
+
+// The stream encoding.
+const (
+	// Let the parser choose the encoding.
+	yaml_ANY_ENCODING yaml_encoding_t = iota
+
+	yaml_UTF8_ENCODING    // The default UTF-8 encoding.
+	yaml_UTF16LE_ENCODING // The UTF-16-LE encoding with BOM.
+	yaml_UTF16BE_ENCODING // The UTF-16-BE encoding with BOM.
+)
+
+type yaml_break_t int
+
+// Line break types.
+const (
+	// Let the parser choose the break type.
+	yaml_ANY_BREAK yaml_break_t = iota
+
+	yaml_CR_BREAK   // Use CR for line breaks (Mac style).
+	yaml_LN_BREAK   // Use LN for line breaks (Unix style).
+	yaml_CRLN_BREAK // Use CR LN for line breaks (DOS style).
+)
+
+type yaml_error_type_t int
+
+// Many bad things could happen with the parser and emitter.
+const (
+	// No error is produced.
+	yaml_NO_ERROR yaml_error_type_t = iota
+
+	yaml_MEMORY_ERROR   // Cannot allocate or reallocate a block of memory.
+	yaml_READER_ERROR   // Cannot read or decode the input stream.
+	yaml_SCANNER_ERROR  // Cannot scan the input stream.
+	yaml_PARSER_ERROR   // Cannot parse the input stream.
+	yaml_COMPOSER_ERROR // Cannot compose a YAML document.
+	yaml_WRITER_ERROR   // Cannot write to the output stream.
+	yaml_EMITTER_ERROR  // Cannot emit a YAML stream.
+)
+
+// The pointer position.
+type yaml_mark_t struct {
+	index  int // The position index.
+	line   int // The position line.
+	column int // The position column.
+}
+
+// Node Styles
+
+type yaml_style_t int8
+
+type yaml_scalar_style_t yaml_style_t
+
+// Scalar styles.
+const (
+	// Let the emitter choose the style.
+	yaml_ANY_SCALAR_STYLE yaml_scalar_style_t = 0
+
+	yaml_PLAIN_SCALAR_STYLE         yaml_scalar_style_t = 1 << iota // The plain scalar style.
+	yaml_SINGLE_QUOTED_SCALAR_STYLE                                 // The single-quoted scalar style.
+	yaml_DOUBLE_QUOTED_SCALAR_STYLE                                 // The double-quoted scalar style.
+	yaml_LITERAL_SCALAR_STYLE                                       // The literal scalar style.
+	yaml_FOLDED_SCALAR_STYLE                                        // The folded scalar style.
+)
+
+type yaml_sequence_style_t yaml_style_t
+
+// Sequence styles.
+const (
+	// Let the emitter choose the style.
+	yaml_ANY_SEQUENCE_STYLE yaml_sequence_style_t = iota
+
+	yaml_BLOCK_SEQUENCE_STYLE // The block sequence style.
+	yaml_FLOW_SEQUENCE_STYLE  // The flow sequence style.
+)
+
+type yaml_mapping_style_t yaml_style_t
+
+// Mapping styles.
+const (
+	// Let the emitter choose the style.
+	yaml_ANY_MAPPING_STYLE yaml_mapping_style_t = iota
+
+	yaml_BLOCK_MAPPING_STYLE // The block mapping style.
+	yaml_FLOW_MAPPING_STYLE  // The flow mapping style.
+)
+
+// Tokens
+
+type yaml_token_type_t int
+
+// Token types.
+const (
+	// An empty token.
+	yaml_NO_TOKEN yaml_token_type_t = iota
+
+	yaml_STREAM_START_TOKEN // A STREAM-START token.
+	yaml_STREAM_END_TOKEN   // A STREAM-END token.
+
+	yaml_VERSION_DIRECTIVE_TOKEN // A VERSION-DIRECTIVE token.
+	yaml_TAG_DIRECTIVE_TOKEN     // A TAG-DIRECTIVE token.
+	yaml_DOCUMENT_START_TOKEN    // A DOCUMENT-START token.
+	yaml_DOCUMENT_END_TOKEN      // A DOCUMENT-END token.
+
+	yaml_BLOCK_SEQUENCE_START_TOKEN // A BLOCK-SEQUENCE-START token.
+	yaml_BLOCK_MAPPING_START_TOKEN  // A BLOCK-SEQUENCE-END token.
+	yaml_BLOCK_END_TOKEN            // A BLOCK-END token.
+
+	yaml_FLOW_SEQUENCE_START_TOKEN // A FLOW-SEQUENCE-START token.
+	yaml_FLOW_SEQUENCE_END_TOKEN   // A FLOW-SEQUENCE-END token.
+	yaml_FLOW_MAPPING_START_TOKEN  // A FLOW-MAPPING-START token.
+	yaml_FLOW_MAPPING_END_TOKEN    // A FLOW-MAPPING-END token.
+
+	yaml_BLOCK_ENTRY_TOKEN // A BLOCK-ENTRY token.
+	yaml_FLOW_ENTRY_TOKEN  // A FLOW-ENTRY token.
+	yaml_KEY_TOKEN         // A KEY token.
+	yaml_VALUE_TOKEN       // A VALUE token.
+
+	yaml_ALIAS_TOKEN  // An ALIAS token.
+	yaml_ANCHOR_TOKEN // An ANCHOR token.
+	yaml_TAG_TOKEN    // A TAG token.
+	yaml_SCALAR_TOKEN // A SCALAR token.
+)
+
+func (tt yaml_token_type_t) String() string {
+	switch tt {
+	case yaml_NO_TOKEN:
+		return "yaml_NO_TOKEN"
+	case yaml_STREAM_START_TOKEN:
+		return "yaml_STREAM_START_TOKEN"
+	case yaml_STREAM_END_TOKEN:
+		return "yaml_STREAM_END_TOKEN"
+	case yaml_VERSION_DIRECTIVE_TOKEN:
+		return "yaml_VERSION_DIRECTIVE_TOKEN"
+	case yaml_TAG_DIRECTIVE_TOKEN:
+		return "yaml_TAG_DIRECTIVE_TOKEN"
+	case yaml_DOCUMENT_START_TOKEN:
+		return "yaml_DOCUMENT_START_TOKEN"
+	case yaml_DOCUMENT_END_TOKEN:
+		return "yaml_DOCUMENT_END_TOKEN"
+	case yaml_BLOCK_SEQUENCE_START_TOKEN:
+		return "yaml_BLOCK_SEQUENCE_START_TOKEN"
+	case yaml_BLOCK_MAPPING_START_TOKEN:
+		return "yaml_BLOCK_MAPPING_START_TOKEN"
+	case yaml_BLOCK_END_TOKEN:
+		return "yaml_BLOCK_END_TOKEN"
+	case yaml_FLOW_SEQUENCE_START_TOKEN:
+		return "yaml_FLOW_SEQUENCE_START_TOKEN"
+	case yaml_FLOW_SEQUENCE_END_TOKEN:
+		return "yaml_FLOW_SEQUENCE_END_TOKEN"
+	case yaml_FLOW_MAPPING_START_TOKEN:
+		return "yaml_FLOW_MAPPING_START_TOKEN"
+	case yaml_FLOW_MAPPING_END_TOKEN:
+		return "yaml_FLOW_MAPPING_END_TOKEN"
+	case yaml_BLOCK_ENTRY_TOKEN:
+		return "yaml_BLOCK_ENTRY_TOKEN"
+	case yaml_FLOW_ENTRY_TOKEN:
+		return "yaml_FLOW_ENTRY_TOKEN"
+	case yaml_KEY_TOKEN:
+		return "yaml_KEY_TOKEN"
+	case yaml_VALUE_TOKEN:
+		return "yaml_VALUE_TOKEN"
+	case yaml_ALIAS_TOKEN:
+		return "yaml_ALIAS_TOKEN"
+	case yaml_ANCHOR_TOKEN:
+		return "yaml_ANCHOR_TOKEN"
+	case yaml_TAG_TOKEN:
+		return "yaml_TAG_TOKEN"
+	case yaml_SCALAR_TOKEN:
+		return "yaml_SCALAR_TOKEN"
+	}
+	return ""
+}
+
+// The token structure.
+type yaml_token_t struct {
+	// The token type.
+	typ yaml_token_type_t
+
+	// The start/end of the token.
+	start_mark, end_mark yaml_mark_t
+
+	// The stream encoding (for yaml_STREAM_START_TOKEN).
+	encoding yaml_encoding_t
+
+	// The alias/anchor/scalar value or tag/tag directive handle
+	// (for yaml_ALIAS_TOKEN, yaml_ANCHOR_TOKEN, yaml_SCALAR_TOKEN, yaml_TAG_TOKEN, yaml_TAG_DIRECTIVE_TOKEN).
+	value []byte
+
+	// The tag suffix (for yaml_TAG_TOKEN).
+	suffix []byte
+
+	// The tag directive prefix (for yaml_TAG_DIRECTIVE_TOKEN).
+	prefix []byte
+
+	// The scalar style (for yaml_SCALAR_TOKEN).
+	style yaml_scalar_style_t
+
+	// The version directive major/minor (for yaml_VERSION_DIRECTIVE_TOKEN).
+	major, minor int8
+}
+
+// Events
+
+type yaml_event_type_t int8
+
+// Event types.
+const (
+	// An empty event.
+	yaml_NO_EVENT yaml_event_type_t = iota
+
+	yaml_STREAM_START_EVENT   // A STREAM-START event.
+	yaml_STREAM_END_EVENT     // A STREAM-END event.
+	yaml_DOCUMENT_START_EVENT // A DOCUMENT-START event.
+	yaml_DOCUMENT_END_EVENT   // A DOCUMENT-END event.
+	yaml_ALIAS_EVENT          // An ALIAS event.
+	yaml_SCALAR_EVENT         // A SCALAR event.
+	yaml_SEQUENCE_START_EVENT // A SEQUENCE-START event.
+	yaml_SEQUENCE_END_EVENT   // A SEQUENCE-END event.
+	yaml_MAPPING_START_EVENT  // A MAPPING-START event.
+	yaml_MAPPING_END_EVENT    // A MAPPING-END event.
+	yaml_TAIL_COMMENT_EVENT
+)
+
+var eventStrings = []string{
+	yaml_NO_EVENT:             "none",
+	yaml_STREAM_START_EVENT:   "stream start",
+	yaml_STREAM_END_EVENT:     "stream end",
+	yaml_DOCUMENT_START_EVENT: "document start",
+	yaml_DOCUMENT_END_EVENT:   "document end",
+	yaml_ALIAS_EVENT:          "alias",
+	yaml_SCALAR_EVENT:         "scalar",
+	yaml_SEQUENCE_START_EVENT: "sequence start",
+	yaml_SEQUENCE_END_EVENT:   "sequence end",
+	yaml_MAPPING_START_EVENT:  "mapping start",
+	yaml_MAPPING_END_EVENT:    "mapping end",
+	yaml_TAIL_COMMENT_EVENT:   "tail comment",
+}
+
+func (e yaml_event_type_t) String() string {
+	if e < 0 || int(e) >= len(eventStrings) {
+		return fmt.Sprintf("unknown event %d", e)
+	}
+	return eventStrings[e]
+}
+
+// The event structure.
+type yaml_event_t struct {
+
+	// The event type.
+	typ yaml_event_type_t
+
+	// The start and end of the event.
+	start_mark, end_mark yaml_mark_t
+
+	// The document encoding (for yaml_STREAM_START_EVENT).
+	encoding yaml_encoding_t
+
+	// The version directive (for yaml_DOCUMENT_START_EVENT).
+	version_directive *yaml_version_directive_t
+
+	// The list of tag directives (for yaml_DOCUMENT_START_EVENT).
+	tag_directives []yaml_tag_directive_t
+
+	// The comments
+	head_comment []byte
+	line_comment []byte
+	foot_comment []byte
+	tail_comment []byte
+
+	// The anchor (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_ALIAS_EVENT).
+	anchor []byte
+
+	// The tag (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
+	tag []byte
+
+	// The scalar value (for yaml_SCALAR_EVENT).
+	value []byte
+
+	// Is the document start/end indicator implicit, or the tag optional?
+	// (for yaml_DOCUMENT_START_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_SCALAR_EVENT).
+	implicit bool
+
+	// Is the tag optional for any non-plain style? (for yaml_SCALAR_EVENT).
+	quoted_implicit bool
+
+	// The style (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
+	style yaml_style_t
+}
+
+func (e *yaml_event_t) scalar_style() yaml_scalar_style_t     { return yaml_scalar_style_t(e.style) }
+func (e *yaml_event_t) sequence_style() yaml_sequence_style_t { return yaml_sequence_style_t(e.style) }
+func (e *yaml_event_t) mapping_style() yaml_mapping_style_t   { return yaml_mapping_style_t(e.style) }
+
+// Nodes
+
+const (
+	yaml_NULL_TAG      = "tag:yaml.org,2002:null"      // The tag !!null with the only possible value: null.
+	yaml_BOOL_TAG      = "tag:yaml.org,2002:bool"      // The tag !!bool with the values: true and false.
+	yaml_STR_TAG       = "tag:yaml.org,2002:str"       // The tag !!str for string values.
+	yaml_INT_TAG       = "tag:yaml.org,2002:int"       // The tag !!int for integer values.
+	yaml_FLOAT_TAG     = "tag:yaml.org,2002:float"     // The tag !!float for float values.
+	yaml_TIMESTAMP_TAG = "tag:yaml.org,2002:timestamp" // The tag !!timestamp for date and time values.
+
+	yaml_SEQ_TAG = "tag:yaml.org,2002:seq" // The tag !!seq is used to denote sequences.
+	yaml_MAP_TAG = "tag:yaml.org,2002:map" // The tag !!map is used to denote mapping.
+
+	// Not in original libyaml.
+	yaml_BINARY_TAG = "tag:yaml.org,2002:binary"
+	yaml_MERGE_TAG  = "tag:yaml.org,2002:merge"
+
+	yaml_DEFAULT_SCALAR_TAG   = yaml_STR_TAG // The default scalar tag is !!str.
+	yaml_DEFAULT_SEQUENCE_TAG = yaml_SEQ_TAG // The default sequence tag is !!seq.
+	yaml_DEFAULT_MAPPING_TAG  = yaml_MAP_TAG // The default mapping tag is !!map.
+)
+
+type yaml_node_type_t int
+
+// Node types.
+const (
+	// An empty node.
+	yaml_NO_NODE yaml_node_type_t = iota
+
+	yaml_SCALAR_NODE   // A scalar node.
+	yaml_SEQUENCE_NODE // A sequence node.
+	yaml_MAPPING_NODE  // A mapping node.
+)
+
+// An element of a sequence node.
+type yaml_node_item_t int
+
+// An element of a mapping node.
+type yaml_node_pair_t struct {
+	key   int // The key of the element.
+	value int // The value of the element.
+}
+
+// The node structure.
+type yaml_node_t struct {
+	typ yaml_node_type_t // The node type.
+	tag []byte           // The node tag.
+
+	// The node data.
+
+	// The scalar parameters (for yaml_SCALAR_NODE).
+	scalar struct {
+		value  []byte              // The scalar value.
+		length int                 // The length of the scalar value.
+		style  yaml_scalar_style_t // The scalar style.
+	}
+
+	// The sequence parameters (for YAML_SEQUENCE_NODE).
+	sequence struct {
+		items_data []yaml_node_item_t    // The stack of sequence items.
+		style      yaml_sequence_style_t // The sequence style.
+	}
+
+	// The mapping parameters (for yaml_MAPPING_NODE).
+	mapping struct {
+		pairs_data  []yaml_node_pair_t   // The stack of mapping pairs (key, value).
+		pairs_start *yaml_node_pair_t    // The beginning of the stack.
+		pairs_end   *yaml_node_pair_t    // The end of the stack.
+		pairs_top   *yaml_node_pair_t    // The top of the stack.
+		style       yaml_mapping_style_t // The mapping style.
+	}
+
+	start_mark yaml_mark_t // The beginning of the node.
+	end_mark   yaml_mark_t // The end of the node.
+
+}
+
+// The document structure.
+type yaml_document_t struct {
+
+	// The document nodes.
+	nodes []yaml_node_t
+
+	// The version directive.
+	version_directive *yaml_version_directive_t
+
+	// The list of tag directives.
+	tag_directives_data  []yaml_tag_directive_t
+	tag_directives_start int // The beginning of the tag directives list.
+	tag_directives_end   int // The end of the tag directives list.
+
+	start_implicit int // Is the document start indicator implicit?
+	end_implicit   int // Is the document end indicator implicit?
+
+	// The start/end of the document.
+	start_mark, end_mark yaml_mark_t
+}
+
+// The prototype of a read handler.
+//
+//	The read handler is called when the parser needs to read more bytes from the
+//	source. The handler should write not more than size bytes to the buffer.
+//	The number of written bytes should be set to the size_read variable.
+//
+//	[in,out]   data        A pointer to an application data specified by
+//	                       yaml_parser_set_input().
+//	[out]      buffer      The buffer to write the data from the source.
+//	[in]       size        The size of the buffer.
+//	[out]      size_read   The actual number of bytes read from the source.
+//
+//	On success, the handler should return 1.  If the handler failed,
+//	the returned value should be 0. On EOF, the handler should set the
+//	size_read to 0 and return 1.
+type yaml_read_handler_t func(parser *yaml_parser_t, buffer []byte) (n int, err error)
+
+// This structure holds information about a potential simple key.
+type yaml_simple_key_t struct {
+	possible     bool        // Is a simple key possible?
+	required     bool        // Is a simple key required?
+	token_number int         // The number of the token.
+	mark         yaml_mark_t // The position mark.
+}
+
+// The states of the parser.
+type yaml_parser_state_t int
+
+const (
+	yaml_PARSE_STREAM_START_STATE yaml_parser_state_t = iota
+
+	yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE           // Expect the beginning of an implicit document.
+	yaml_PARSE_DOCUMENT_START_STATE                    // Expect DOCUMENT-START.
+	yaml_PARSE_DOCUMENT_CONTENT_STATE                  // Expect the content of a document.
+	yaml_PARSE_DOCUMENT_END_STATE                      // Expect DOCUMENT-END.
+	yaml_PARSE_BLOCK_NODE_STATE                        // Expect a block node.
+	yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE // Expect a block node or indentless sequence.
+	yaml_PARSE_FLOW_NODE_STATE                         // Expect a flow node.
+	yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE        // Expect the first entry of a block sequence.
+	yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE              // Expect an entry of a block sequence.
+	yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE         // Expect an entry of an indentless sequence.
+	yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE           // Expect the first key of a block mapping.
+	yaml_PARSE_BLOCK_MAPPING_KEY_STATE                 // Expect a block mapping key.
+	yaml_PARSE_BLOCK_MAPPING_VALUE_STATE               // Expect a block mapping value.
+	yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE         // Expect the first entry of a flow sequence.
+	yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE               // Expect an entry of a flow sequence.
+	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE   // Expect a key of an ordered mapping.
+	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE // Expect a value of an ordered mapping.
+	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE   // Expect the and of an ordered mapping entry.
+	yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE            // Expect the first key of a flow mapping.
+	yaml_PARSE_FLOW_MAPPING_KEY_STATE                  // Expect a key of a flow mapping.
+	yaml_PARSE_FLOW_MAPPING_VALUE_STATE                // Expect a value of a flow mapping.
+	yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE          // Expect an empty value of a flow mapping.
+	yaml_PARSE_END_STATE                               // Expect nothing.
+)
+
+func (ps yaml_parser_state_t) String() string {
+	switch ps {
+	case yaml_PARSE_STREAM_START_STATE:
+		return "yaml_PARSE_STREAM_START_STATE"
+	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
+		return "yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE"
+	case yaml_PARSE_DOCUMENT_START_STATE:
+		return "yaml_PARSE_DOCUMENT_START_STATE"
+	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
+		return "yaml_PARSE_DOCUMENT_CONTENT_STATE"
+	case yaml_PARSE_DOCUMENT_END_STATE:
+		return "yaml_PARSE_DOCUMENT_END_STATE"
+	case yaml_PARSE_BLOCK_NODE_STATE:
+		return "yaml_PARSE_BLOCK_NODE_STATE"
+	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
+		return "yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE"
+	case yaml_PARSE_FLOW_NODE_STATE:
+		return "yaml_PARSE_FLOW_NODE_STATE"
+	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
+		return "yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE"
+	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
+		return "yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE"
+	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
+		return "yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE"
+	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
+		return "yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE"
+	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
+		return "yaml_PARSE_BLOCK_MAPPING_KEY_STATE"
+	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
+		return "yaml_PARSE_BLOCK_MAPPING_VALUE_STATE"
+	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
+		return "yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE"
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
+		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE"
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
+		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE"
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
+		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE"
+	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
+		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE"
+	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
+		return "yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE"
+	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
+		return "yaml_PARSE_FLOW_MAPPING_KEY_STATE"
+	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
+		return "yaml_PARSE_FLOW_MAPPING_VALUE_STATE"
+	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
+		return "yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE"
+	case yaml_PARSE_END_STATE:
+		return "yaml_PARSE_END_STATE"
+	}
+	return ""
+}
+
+// This structure holds aliases data.
+type yaml_alias_data_t struct {
+	anchor []byte      // The anchor.
+	index  int         // The node id.
+	mark   yaml_mark_t // The anchor mark.
+}
+
+// The parser structure.
+//
+// All members are internal. Manage the structure using the
+// yaml_parser_ family of functions.
+type yaml_parser_t struct {
+
+	// Error handling
+
+	error yaml_error_type_t // Error type.
+
+	problem string // Error description.
+
+	// The byte about which the problem occurred.
+	problem_offset int
+	problem_value  int
+	problem_mark   yaml_mark_t
+
+	// The error context.
+	context      string
+	context_mark yaml_mark_t
+
+	// Reader stuff
+
+	read_handler yaml_read_handler_t // Read handler.
+
+	input_reader io.Reader // File input data.
+	input        []byte    // String input data.
+	input_pos    int
+
+	eof bool // EOF flag
+
+	buffer     []byte // The working buffer.
+	buffer_pos int    // The current position of the buffer.
+
+	unread int // The number of unread characters in the buffer.
+
+	newlines int // The number of line breaks since last non-break/non-blank character
+
+	raw_buffer     []byte // The raw buffer.
+	raw_buffer_pos int    // The current position of the buffer.
+
+	encoding yaml_encoding_t // The input encoding.
+
+	offset int         // The offset of the current position (in bytes).
+	mark   yaml_mark_t // The mark of the current position.
+
+	// Comments
+
+	head_comment []byte // The current head comments
+	line_comment []byte // The current line comments
+	foot_comment []byte // The current foot comments
+	tail_comment []byte // Foot comment that happens at the end of a block.
+	stem_comment []byte // Comment in item preceding a nested structure (list inside list item, etc)
+
+	comments      []yaml_comment_t // The folded comments for all parsed tokens
+	comments_head int
+
+	// Scanner stuff
+
+	stream_start_produced bool // Have we started to scan the input stream?
+	stream_end_produced   bool // Have we reached the end of the input stream?
+
+	flow_level int // The number of unclosed '[' and '{' indicators.
+
+	tokens          []yaml_token_t // The tokens queue.
+	tokens_head     int            // The head of the tokens queue.
+	tokens_parsed   int            // The number of tokens fetched from the queue.
+	token_available bool           // Does the tokens queue contain a token ready for dequeueing.
+
+	indent  int   // The current indentation level.
+	indents []int // The indentation levels stack.
+
+	simple_key_allowed bool                // May a simple key occur at the current position?
+	simple_keys        []yaml_simple_key_t // The stack of simple keys.
+	simple_keys_by_tok map[int]int         // possible simple_key indexes indexed by token_number
+
+	// Parser stuff
+
+	state          yaml_parser_state_t    // The current parser state.
+	states         []yaml_parser_state_t  // The parser states stack.
+	marks          []yaml_mark_t          // The stack of marks.
+	tag_directives []yaml_tag_directive_t // The list of TAG directives.
+
+	// Dumper stuff
+
+	aliases []yaml_alias_data_t // The alias data.
+
+	document *yaml_document_t // The currently parsed document.
+}
+
+type yaml_comment_t struct {
+	scan_mark  yaml_mark_t // Position where scanning for comments started
+	token_mark yaml_mark_t // Position after which tokens will be associated with this comment
+	start_mark yaml_mark_t // Position of '#' comment mark
+	end_mark   yaml_mark_t // Position where comment terminated
+
+	head []byte
+	line []byte
+	foot []byte
+}
+
+// Emitter Definitions
+
+// The prototype of a write handler.
+//
+//	The write handler is called when the emitter needs to flush the accumulated
+//	characters to the output.  The handler should write @a size bytes of the
+//	@a buffer to the output.
+//
+//	@param[in,out]   data        A pointer to an application data specified by
+//	                             yaml_emitter_set_output().
+//	@param[in]       buffer      The buffer with bytes to be written.
+//	@param[in]       size        The size of the buffer.
+//
+//	@returns On success, the handler should return @c 1.  If the handler failed,
+//	the returned value should be @c 0.
+type yaml_write_handler_t func(emitter *yaml_emitter_t, buffer []byte) error
+
+type yaml_emitter_state_t int
+
+// The emitter states.
+const (
+	// Expect STREAM-START.
+	yaml_EMIT_STREAM_START_STATE yaml_emitter_state_t = iota
+
+	yaml_EMIT_FIRST_DOCUMENT_START_STATE       // Expect the first DOCUMENT-START or STREAM-END.
+	yaml_EMIT_DOCUMENT_START_STATE             // Expect DOCUMENT-START or STREAM-END.
+	yaml_EMIT_DOCUMENT_CONTENT_STATE           // Expect the content of a document.
+	yaml_EMIT_DOCUMENT_END_STATE               // Expect DOCUMENT-END.
+	yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE   // Expect the first item of a flow sequence.
+	yaml_EMIT_FLOW_SEQUENCE_TRAIL_ITEM_STATE   // Expect the next item of a flow sequence, with the comma already written out
+	yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE         // Expect an item of a flow sequence.
+	yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE     // Expect the first key of a flow mapping.
+	yaml_EMIT_FLOW_MAPPING_TRAIL_KEY_STATE     // Expect the next key of a flow mapping, with the comma already written out
+	yaml_EMIT_FLOW_MAPPING_KEY_STATE           // Expect a key of a flow mapping.
+	yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE  // Expect a value for a simple key of a flow mapping.
+	yaml_EMIT_FLOW_MAPPING_VALUE_STATE         // Expect a value of a flow mapping.
+	yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE  // Expect the first item of a block sequence.
+	yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE        // Expect an item of a block sequence.
+	yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE    // Expect the first key of a block mapping.
+	yaml_EMIT_BLOCK_MAPPING_KEY_STATE          // Expect the key of a block mapping.
+	yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE // Expect a value for a simple key of a block mapping.
+	yaml_EMIT_BLOCK_MAPPING_VALUE_STATE        // Expect a value of a block mapping.
+	yaml_EMIT_END_STATE                        // Expect nothing.
+)
+
+// The emitter structure.
+//
+// All members are internal.  Manage the structure using the @c yaml_emitter_
+// family of functions.
+type yaml_emitter_t struct {
+
+	// Error handling
+
+	error   yaml_error_type_t // Error type.
+	problem string            // Error description.
+
+	// Writer stuff
+
+	write_handler yaml_write_handler_t // Write handler.
+
+	output_buffer *[]byte   // String output data.
+	output_writer io.Writer // File output data.
+
+	buffer     []byte // The working buffer.
+	buffer_pos int    // The current position of the buffer.
+
+	raw_buffer     []byte // The raw buffer.
+	raw_buffer_pos int    // The current position of the buffer.
+
+	encoding yaml_encoding_t // The stream encoding.
+
+	// Emitter stuff
+
+	canonical   bool         // If the output is in the canonical style?
+	best_indent int          // The number of indentation spaces.
+	best_width  int          // The preferred width of the output lines.
+	unicode     bool         // Allow unescaped non-ASCII characters?
+	line_break  yaml_break_t // The preferred line break.
+
+	state  yaml_emitter_state_t   // The current emitter state.
+	states []yaml_emitter_state_t // The stack of states.
+
+	events      []yaml_event_t // The event queue.
+	events_head int            // The head of the event queue.
+
+	indents []int // The stack of indentation levels.
+
+	tag_directives []yaml_tag_directive_t // The list of tag directives.
+
+	indent int // The current indentation level.
+
+	compact_sequence_indent bool // Is '- ' is considered part of the indentation for sequence elements?
+
+	flow_level int // The current flow level.
+
+	root_context       bool // Is it the document root context?
+	sequence_context   bool // Is it a sequence context?
+	mapping_context    bool // Is it a mapping context?
+	simple_key_context bool // Is it a simple mapping key context?
+
+	line       int  // The current line.
+	column     int  // The current column.
+	whitespace bool // If the last character was a whitespace?
+	indention  bool // If the last character was an indentation character (' ', '-', '?', ':')?
+	open_ended bool // If an explicit document end is required?
+
+	space_above bool // Is there's an empty line above?
+	foot_indent int  // The indent used to write the foot comment above, or -1 if none.
+
+	// Anchor analysis.
+	anchor_data struct {
+		anchor []byte // The anchor value.
+		alias  bool   // Is it an alias?
+	}
+
+	// Tag analysis.
+	tag_data struct {
+		handle []byte // The tag handle.
+		suffix []byte // The tag suffix.
+	}
+
+	// Scalar analysis.
+	scalar_data struct {
+		value                 []byte              // The scalar value.
+		multiline             bool                // Does the scalar contain line breaks?
+		flow_plain_allowed    bool                // Can the scalar be expessed in the flow plain style?
+		block_plain_allowed   bool                // Can the scalar be expressed in the block plain style?
+		single_quoted_allowed bool                // Can the scalar be expressed in the single quoted style?
+		block_allowed         bool                // Can the scalar be expressed in the literal or folded styles?
+		style                 yaml_scalar_style_t // The output style.
+	}
+
+	// Comments
+	head_comment []byte
+	line_comment []byte
+	foot_comment []byte
+	tail_comment []byte
+
+	key_line_comment []byte
+
+	// Dumper stuff
+
+	opened bool // If the stream was already opened?
+	closed bool // If the stream was already closed?
+
+	// The information associated with the document nodes.
+	anchors *struct {
+		references int  // The number of references.
+		anchor     int  // The anchor id.
+		serialized bool // If the node has been emitted?
+	}
+
+	last_anchor_id int // The last assigned anchor id.
+
+	document *yaml_document_t // The currently emitted document.
+}
diff --git a/vendor/go.yaml.in/yaml/v3/yamlprivateh.go b/vendor/go.yaml.in/yaml/v3/yamlprivateh.go
new file mode 100644
index 000000000..dea1ba961
--- /dev/null
+++ b/vendor/go.yaml.in/yaml/v3/yamlprivateh.go
@@ -0,0 +1,198 @@
+//
+// Copyright (c) 2011-2019 Canonical Ltd
+// Copyright (c) 2006-2010 Kirill Simonov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package yaml
+
+const (
+	// The size of the input raw buffer.
+	input_raw_buffer_size = 512
+
+	// The size of the input buffer.
+	// It should be possible to decode the whole raw buffer.
+	input_buffer_size = input_raw_buffer_size * 3
+
+	// The size of the output buffer.
+	output_buffer_size = 128
+
+	// The size of the output raw buffer.
+	// It should be possible to encode the whole output buffer.
+	output_raw_buffer_size = (output_buffer_size*2 + 2)
+
+	// The size of other stacks and queues.
+	initial_stack_size  = 16
+	initial_queue_size  = 16
+	initial_string_size = 16
+)
+
+// Check if the character at the specified position is an alphabetical
+// character, a digit, '_', or '-'.
+func is_alpha(b []byte, i int) bool {
+	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'Z' || b[i] >= 'a' && b[i] <= 'z' || b[i] == '_' || b[i] == '-'
+}
+
+// Check if the character at the specified position is a digit.
+func is_digit(b []byte, i int) bool {
+	return b[i] >= '0' && b[i] <= '9'
+}
+
+// Get the value of a digit.
+func as_digit(b []byte, i int) int {
+	return int(b[i]) - '0'
+}
+
+// Check if the character at the specified position is a hex-digit.
+func is_hex(b []byte, i int) bool {
+	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'F' || b[i] >= 'a' && b[i] <= 'f'
+}
+
+// Get the value of a hex-digit.
+func as_hex(b []byte, i int) int {
+	bi := b[i]
+	if bi >= 'A' && bi <= 'F' {
+		return int(bi) - 'A' + 10
+	}
+	if bi >= 'a' && bi <= 'f' {
+		return int(bi) - 'a' + 10
+	}
+	return int(bi) - '0'
+}
+
+// Check if the character is ASCII.
+func is_ascii(b []byte, i int) bool {
+	return b[i] <= 0x7F
+}
+
+// Check if the character at the start of the buffer can be printed unescaped.
+func is_printable(b []byte, i int) bool {
+	return ((b[i] == 0x0A) || // . == #x0A
+		(b[i] >= 0x20 && b[i] <= 0x7E) || // #x20 <= . <= #x7E
+		(b[i] == 0xC2 && b[i+1] >= 0xA0) || // #0xA0 <= . <= #xD7FF
+		(b[i] > 0xC2 && b[i] < 0xED) ||
+		(b[i] == 0xED && b[i+1] < 0xA0) ||
+		(b[i] == 0xEE) ||
+		(b[i] == 0xEF && // #xE000 <= . <= #xFFFD
+			!(b[i+1] == 0xBB && b[i+2] == 0xBF) && // && . != #xFEFF
+			!(b[i+1] == 0xBF && (b[i+2] == 0xBE || b[i+2] == 0xBF))))
+}
+
+// Check if the character at the specified position is NUL.
+func is_z(b []byte, i int) bool {
+	return b[i] == 0x00
+}
+
+// Check if the beginning of the buffer is a BOM.
+func is_bom(b []byte, i int) bool {
+	return b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF
+}
+
+// Check if the character at the specified position is space.
+func is_space(b []byte, i int) bool {
+	return b[i] == ' '
+}
+
+// Check if the character at the specified position is tab.
+func is_tab(b []byte, i int) bool {
+	return b[i] == '\t'
+}
+
+// Check if the character at the specified position is blank (space or tab).
+func is_blank(b []byte, i int) bool {
+	//return is_space(b, i) || is_tab(b, i)
+	return b[i] == ' ' || b[i] == '\t'
+}
+
+// Check if the character at the specified position is a line break.
+func is_break(b []byte, i int) bool {
+	return (b[i] == '\r' || // CR (#xD)
+		b[i] == '\n' || // LF (#xA)
+		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9) // PS (#x2029)
+}
+
+func is_crlf(b []byte, i int) bool {
+	return b[i] == '\r' && b[i+1] == '\n'
+}
+
+// Check if the character is a line break or NUL.
+func is_breakz(b []byte, i int) bool {
+	//return is_break(b, i) || is_z(b, i)
+	return (
+	// is_break:
+	b[i] == '\r' || // CR (#xD)
+		b[i] == '\n' || // LF (#xA)
+		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
+		// is_z:
+		b[i] == 0)
+}
+
+// Check if the character is a line break, space, or NUL.
+func is_spacez(b []byte, i int) bool {
+	//return is_space(b, i) || is_breakz(b, i)
+	return (
+	// is_space:
+	b[i] == ' ' ||
+		// is_breakz:
+		b[i] == '\r' || // CR (#xD)
+		b[i] == '\n' || // LF (#xA)
+		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
+		b[i] == 0)
+}
+
+// Check if the character is a line break, space, tab, or NUL.
+func is_blankz(b []byte, i int) bool {
+	//return is_blank(b, i) || is_breakz(b, i)
+	return (
+	// is_blank:
+	b[i] == ' ' || b[i] == '\t' ||
+		// is_breakz:
+		b[i] == '\r' || // CR (#xD)
+		b[i] == '\n' || // LF (#xA)
+		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
+		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
+		b[i] == 0)
+}
+
+// Determine the width of the character.
+func width(b byte) int {
+	// Don't replace these by a switch without first
+	// confirming that it is being inlined.
+	if b&0x80 == 0x00 {
+		return 1
+	}
+	if b&0xE0 == 0xC0 {
+		return 2
+	}
+	if b&0xF0 == 0xE0 {
+		return 3
+	}
+	if b&0xF8 == 0xF0 {
+		return 4
+	}
+	return 0
+
+}
diff --git a/vendor/golang.org/x/crypto/argon2/argon2.go b/vendor/golang.org/x/crypto/argon2/argon2.go
deleted file mode 100644
index 2b65ec91a..000000000
--- a/vendor/golang.org/x/crypto/argon2/argon2.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package argon2 implements the key derivation function Argon2.
-// Argon2 was selected as the winner of the Password Hashing Competition and can
-// be used to derive cryptographic keys from passwords.
-//
-// For a detailed specification of Argon2 see [argon2-specs.pdf].
-//
-// If you aren't sure which function you need, use Argon2id (IDKey) and
-// the parameter recommendations for your scenario.
-//
-// # Argon2i
-//
-// Argon2i (implemented by Key) is the side-channel resistant version of Argon2.
-// It uses data-independent memory access, which is preferred for password
-// hashing and password-based key derivation. Argon2i requires more passes over
-// memory than Argon2id to protect from trade-off attacks. The recommended
-// parameters (taken from [RFC 9106 Section 7.3]) for non-interactive operations are time=3 and to
-// use the maximum available memory.
-//
-// # Argon2id
-//
-// Argon2id (implemented by IDKey) is a hybrid version of Argon2 combining
-// Argon2i and Argon2d. It uses data-independent memory access for the first
-// half of the first iteration over the memory and data-dependent memory access
-// for the rest. Argon2id is side-channel resistant and provides better brute-
-// force cost savings due to time-memory tradeoffs than Argon2i. The recommended
-// parameters for non-interactive operations (taken from [RFC 9106 Section 7.3]) are time=1 and to
-// use the maximum available memory.
-//
-// [argon2-specs.pdf]: https://github.com/P-H-C/phc-winner-argon2/blob/master/argon2-specs.pdf
-// [RFC 9106 Section 7.3]: https://www.rfc-editor.org/rfc/rfc9106.html#section-7.3
-package argon2
-
-import (
-	"encoding/binary"
-	"sync"
-
-	"golang.org/x/crypto/blake2b"
-)
-
-// The Argon2 version implemented by this package.
-const Version = 0x13
-
-const (
-	argon2d = iota
-	argon2i
-	argon2id
-)
-
-// Key derives a key from the password, salt, and cost parameters using Argon2i
-// returning a byte slice of length keyLen that can be used as cryptographic
-// key. The CPU cost and parallelism degree must be greater than zero.
-//
-// For example, you can get a derived key for e.g. AES-256 (which needs a
-// 32-byte key) by doing:
-//
-//	key := argon2.Key([]byte("some password"), salt, 3, 32*1024, 4, 32)
-//
-// [RFC 9106 Section 7.3] recommends time=3, and memory=32*1024 as a sensible number.
-// If using that amount of memory (32 MB) is not possible in some contexts then
-// the time parameter can be increased to compensate.
-//
-// The time parameter specifies the number of passes over the memory and the
-// memory parameter specifies the size of the memory in KiB. For example
-// memory=32*1024 sets the memory cost to ~32 MB. The number of threads can be
-// adjusted to the number of available CPUs. The cost parameters should be
-// increased as memory latency and CPU parallelism increases. Remember to get a
-// good random salt.
-//
-// [RFC 9106 Section 7.3]: https://www.rfc-editor.org/rfc/rfc9106.html#section-7.3
-func Key(password, salt []byte, time, memory uint32, threads uint8, keyLen uint32) []byte {
-	return deriveKey(argon2i, password, salt, nil, nil, time, memory, threads, keyLen)
-}
-
-// IDKey derives a key from the password, salt, and cost parameters using
-// Argon2id returning a byte slice of length keyLen that can be used as
-// cryptographic key. The CPU cost and parallelism degree must be greater than
-// zero.
-//
-// For example, you can get a derived key for e.g. AES-256 (which needs a
-// 32-byte key) by doing:
-//
-//	key := argon2.IDKey([]byte("some password"), salt, 1, 64*1024, 4, 32)
-//
-// [RFC 9106 Section 7.3] recommends time=1, and memory=64*1024 as a sensible number.
-// If using that amount of memory (64 MB) is not possible in some contexts then
-// the time parameter can be increased to compensate.
-//
-// The time parameter specifies the number of passes over the memory and the
-// memory parameter specifies the size of the memory in KiB. For example
-// memory=64*1024 sets the memory cost to ~64 MB. The number of threads can be
-// adjusted to the numbers of available CPUs. The cost parameters should be
-// increased as memory latency and CPU parallelism increases. Remember to get a
-// good random salt.
-//
-// [RFC 9106 Section 7.3]: https://www.rfc-editor.org/rfc/rfc9106.html#section-7.3
-func IDKey(password, salt []byte, time, memory uint32, threads uint8, keyLen uint32) []byte {
-	return deriveKey(argon2id, password, salt, nil, nil, time, memory, threads, keyLen)
-}
-
-func deriveKey(mode int, password, salt, secret, data []byte, time, memory uint32, threads uint8, keyLen uint32) []byte {
-	if time < 1 {
-		panic("argon2: number of rounds too small")
-	}
-	if threads < 1 {
-		panic("argon2: parallelism degree too low")
-	}
-	h0 := initHash(password, salt, secret, data, time, memory, uint32(threads), keyLen, mode)
-
-	memory = memory / (syncPoints * uint32(threads)) * (syncPoints * uint32(threads))
-	if memory < 2*syncPoints*uint32(threads) {
-		memory = 2 * syncPoints * uint32(threads)
-	}
-	B := initBlocks(&h0, memory, uint32(threads))
-	processBlocks(B, time, memory, uint32(threads), mode)
-	return extractKey(B, memory, uint32(threads), keyLen)
-}
-
-const (
-	blockLength = 128
-	syncPoints  = 4
-)
-
-type block [blockLength]uint64
-
-func initHash(password, salt, key, data []byte, time, memory, threads, keyLen uint32, mode int) [blake2b.Size + 8]byte {
-	var (
-		h0     [blake2b.Size + 8]byte
-		params [24]byte
-		tmp    [4]byte
-	)
-
-	b2, _ := blake2b.New512(nil)
-	binary.LittleEndian.PutUint32(params[0:4], threads)
-	binary.LittleEndian.PutUint32(params[4:8], keyLen)
-	binary.LittleEndian.PutUint32(params[8:12], memory)
-	binary.LittleEndian.PutUint32(params[12:16], time)
-	binary.LittleEndian.PutUint32(params[16:20], uint32(Version))
-	binary.LittleEndian.PutUint32(params[20:24], uint32(mode))
-	b2.Write(params[:])
-	binary.LittleEndian.PutUint32(tmp[:], uint32(len(password)))
-	b2.Write(tmp[:])
-	b2.Write(password)
-	binary.LittleEndian.PutUint32(tmp[:], uint32(len(salt)))
-	b2.Write(tmp[:])
-	b2.Write(salt)
-	binary.LittleEndian.PutUint32(tmp[:], uint32(len(key)))
-	b2.Write(tmp[:])
-	b2.Write(key)
-	binary.LittleEndian.PutUint32(tmp[:], uint32(len(data)))
-	b2.Write(tmp[:])
-	b2.Write(data)
-	b2.Sum(h0[:0])
-	return h0
-}
-
-func initBlocks(h0 *[blake2b.Size + 8]byte, memory, threads uint32) []block {
-	var block0 [1024]byte
-	B := make([]block, memory)
-	for lane := uint32(0); lane < threads; lane++ {
-		j := lane * (memory / threads)
-		binary.LittleEndian.PutUint32(h0[blake2b.Size+4:], lane)
-
-		binary.LittleEndian.PutUint32(h0[blake2b.Size:], 0)
-		blake2bHash(block0[:], h0[:])
-		for i := range B[j+0] {
-			B[j+0][i] = binary.LittleEndian.Uint64(block0[i*8:])
-		}
-
-		binary.LittleEndian.PutUint32(h0[blake2b.Size:], 1)
-		blake2bHash(block0[:], h0[:])
-		for i := range B[j+1] {
-			B[j+1][i] = binary.LittleEndian.Uint64(block0[i*8:])
-		}
-	}
-	return B
-}
-
-func processBlocks(B []block, time, memory, threads uint32, mode int) {
-	lanes := memory / threads
-	segments := lanes / syncPoints
-
-	processSegment := func(n, slice, lane uint32, wg *sync.WaitGroup) {
-		var addresses, in, zero block
-		if mode == argon2i || (mode == argon2id && n == 0 && slice < syncPoints/2) {
-			in[0] = uint64(n)
-			in[1] = uint64(lane)
-			in[2] = uint64(slice)
-			in[3] = uint64(memory)
-			in[4] = uint64(time)
-			in[5] = uint64(mode)
-		}
-
-		index := uint32(0)
-		if n == 0 && slice == 0 {
-			index = 2 // we have already generated the first two blocks
-			if mode == argon2i || mode == argon2id {
-				in[6]++
-				processBlock(&addresses, &in, &zero)
-				processBlock(&addresses, &addresses, &zero)
-			}
-		}
-
-		offset := lane*lanes + slice*segments + index
-		var random uint64
-		for index < segments {
-			prev := offset - 1
-			if index == 0 && slice == 0 {
-				prev += lanes // last block in lane
-			}
-			if mode == argon2i || (mode == argon2id && n == 0 && slice < syncPoints/2) {
-				if index%blockLength == 0 {
-					in[6]++
-					processBlock(&addresses, &in, &zero)
-					processBlock(&addresses, &addresses, &zero)
-				}
-				random = addresses[index%blockLength]
-			} else {
-				random = B[prev][0]
-			}
-			newOffset := indexAlpha(random, lanes, segments, threads, n, slice, lane, index)
-			processBlockXOR(&B[offset], &B[prev], &B[newOffset])
-			index, offset = index+1, offset+1
-		}
-		wg.Done()
-	}
-
-	for n := uint32(0); n < time; n++ {
-		for slice := uint32(0); slice < syncPoints; slice++ {
-			var wg sync.WaitGroup
-			for lane := uint32(0); lane < threads; lane++ {
-				wg.Add(1)
-				go processSegment(n, slice, lane, &wg)
-			}
-			wg.Wait()
-		}
-	}
-
-}
-
-func extractKey(B []block, memory, threads, keyLen uint32) []byte {
-	lanes := memory / threads
-	for lane := uint32(0); lane < threads-1; lane++ {
-		for i, v := range B[(lane*lanes)+lanes-1] {
-			B[memory-1][i] ^= v
-		}
-	}
-
-	var block [1024]byte
-	for i, v := range B[memory-1] {
-		binary.LittleEndian.PutUint64(block[i*8:], v)
-	}
-	key := make([]byte, keyLen)
-	blake2bHash(key, block[:])
-	return key
-}
-
-func indexAlpha(rand uint64, lanes, segments, threads, n, slice, lane, index uint32) uint32 {
-	refLane := uint32(rand>>32) % threads
-	if n == 0 && slice == 0 {
-		refLane = lane
-	}
-	m, s := 3*segments, ((slice+1)%syncPoints)*segments
-	if lane == refLane {
-		m += index
-	}
-	if n == 0 {
-		m, s = slice*segments, 0
-		if slice == 0 || lane == refLane {
-			m += index
-		}
-	}
-	if index == 0 || lane == refLane {
-		m--
-	}
-	return phi(rand, uint64(m), uint64(s), refLane, lanes)
-}
-
-func phi(rand, m, s uint64, lane, lanes uint32) uint32 {
-	p := rand & 0xFFFFFFFF
-	p = (p * p) >> 32
-	p = (p * m) >> 32
-	return lane*lanes + uint32((s+m-(p+1))%uint64(lanes))
-}
diff --git a/vendor/golang.org/x/crypto/argon2/blake2b.go b/vendor/golang.org/x/crypto/argon2/blake2b.go
deleted file mode 100644
index 10f46948d..000000000
--- a/vendor/golang.org/x/crypto/argon2/blake2b.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package argon2
-
-import (
-	"encoding/binary"
-	"hash"
-
-	"golang.org/x/crypto/blake2b"
-)
-
-// blake2bHash computes an arbitrary long hash value of in
-// and writes the hash to out.
-func blake2bHash(out []byte, in []byte) {
-	var b2 hash.Hash
-	if n := len(out); n < blake2b.Size {
-		b2, _ = blake2b.New(n, nil)
-	} else {
-		b2, _ = blake2b.New512(nil)
-	}
-
-	var buffer [blake2b.Size]byte
-	binary.LittleEndian.PutUint32(buffer[:4], uint32(len(out)))
-	b2.Write(buffer[:4])
-	b2.Write(in)
-
-	if len(out) <= blake2b.Size {
-		b2.Sum(out[:0])
-		return
-	}
-
-	outLen := len(out)
-	b2.Sum(buffer[:0])
-	b2.Reset()
-	copy(out, buffer[:32])
-	out = out[32:]
-	for len(out) > blake2b.Size {
-		b2.Write(buffer[:])
-		b2.Sum(buffer[:0])
-		copy(out, buffer[:32])
-		out = out[32:]
-		b2.Reset()
-	}
-
-	if outLen%blake2b.Size > 0 { // outLen > 64
-		r := ((outLen + 31) / 32) - 2 // ⌈τ /32⌉-2
-		b2, _ = blake2b.New(outLen-32*r, nil)
-	}
-	b2.Write(buffer[:])
-	b2.Sum(out[:0])
-}
diff --git a/vendor/golang.org/x/crypto/argon2/blamka_amd64.go b/vendor/golang.org/x/crypto/argon2/blamka_amd64.go
deleted file mode 100644
index 063e7784f..000000000
--- a/vendor/golang.org/x/crypto/argon2/blamka_amd64.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build amd64 && gc && !purego
-
-package argon2
-
-import "golang.org/x/sys/cpu"
-
-func init() {
-	useSSE4 = cpu.X86.HasSSE41
-}
-
-//go:noescape
-func mixBlocksSSE2(out, a, b, c *block)
-
-//go:noescape
-func xorBlocksSSE2(out, a, b, c *block)
-
-//go:noescape
-func blamkaSSE4(b *block)
-
-func processBlockSSE(out, in1, in2 *block, xor bool) {
-	var t block
-	mixBlocksSSE2(&t, in1, in2, &t)
-	if useSSE4 {
-		blamkaSSE4(&t)
-	} else {
-		for i := 0; i < blockLength; i += 16 {
-			blamkaGeneric(
-				&t[i+0], &t[i+1], &t[i+2], &t[i+3],
-				&t[i+4], &t[i+5], &t[i+6], &t[i+7],
-				&t[i+8], &t[i+9], &t[i+10], &t[i+11],
-				&t[i+12], &t[i+13], &t[i+14], &t[i+15],
-			)
-		}
-		for i := 0; i < blockLength/8; i += 2 {
-			blamkaGeneric(
-				&t[i], &t[i+1], &t[16+i], &t[16+i+1],
-				&t[32+i], &t[32+i+1], &t[48+i], &t[48+i+1],
-				&t[64+i], &t[64+i+1], &t[80+i], &t[80+i+1],
-				&t[96+i], &t[96+i+1], &t[112+i], &t[112+i+1],
-			)
-		}
-	}
-	if xor {
-		xorBlocksSSE2(out, in1, in2, &t)
-	} else {
-		mixBlocksSSE2(out, in1, in2, &t)
-	}
-}
-
-func processBlock(out, in1, in2 *block) {
-	processBlockSSE(out, in1, in2, false)
-}
-
-func processBlockXOR(out, in1, in2 *block) {
-	processBlockSSE(out, in1, in2, true)
-}
diff --git a/vendor/golang.org/x/crypto/argon2/blamka_amd64.s b/vendor/golang.org/x/crypto/argon2/blamka_amd64.s
deleted file mode 100644
index c3895478e..000000000
--- a/vendor/golang.org/x/crypto/argon2/blamka_amd64.s
+++ /dev/null
@@ -1,2791 +0,0 @@
-// Code generated by command: go run blamka_amd64.go -out ../blamka_amd64.s -pkg argon2. DO NOT EDIT.
-
-//go:build amd64 && gc && !purego
-
-#include "textflag.h"
-
-// func blamkaSSE4(b *block)
-// Requires: SSE2, SSSE3
-TEXT ·blamkaSSE4(SB), NOSPLIT, $0-8
-	MOVQ       b+0(FP), AX
-	MOVOU      ·c40<>+0(SB), X10
-	MOVOU      ·c48<>+0(SB), X11
-	MOVOU      (AX), X0
-	MOVOU      16(AX), X1
-	MOVOU      32(AX), X2
-	MOVOU      48(AX), X3
-	MOVOU      64(AX), X4
-	MOVOU      80(AX), X5
-	MOVOU      96(AX), X6
-	MOVOU      112(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, (AX)
-	MOVOU      X1, 16(AX)
-	MOVOU      X2, 32(AX)
-	MOVOU      X3, 48(AX)
-	MOVOU      X4, 64(AX)
-	MOVOU      X5, 80(AX)
-	MOVOU      X6, 96(AX)
-	MOVOU      X7, 112(AX)
-	MOVOU      128(AX), X0
-	MOVOU      144(AX), X1
-	MOVOU      160(AX), X2
-	MOVOU      176(AX), X3
-	MOVOU      192(AX), X4
-	MOVOU      208(AX), X5
-	MOVOU      224(AX), X6
-	MOVOU      240(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 128(AX)
-	MOVOU      X1, 144(AX)
-	MOVOU      X2, 160(AX)
-	MOVOU      X3, 176(AX)
-	MOVOU      X4, 192(AX)
-	MOVOU      X5, 208(AX)
-	MOVOU      X6, 224(AX)
-	MOVOU      X7, 240(AX)
-	MOVOU      256(AX), X0
-	MOVOU      272(AX), X1
-	MOVOU      288(AX), X2
-	MOVOU      304(AX), X3
-	MOVOU      320(AX), X4
-	MOVOU      336(AX), X5
-	MOVOU      352(AX), X6
-	MOVOU      368(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 256(AX)
-	MOVOU      X1, 272(AX)
-	MOVOU      X2, 288(AX)
-	MOVOU      X3, 304(AX)
-	MOVOU      X4, 320(AX)
-	MOVOU      X5, 336(AX)
-	MOVOU      X6, 352(AX)
-	MOVOU      X7, 368(AX)
-	MOVOU      384(AX), X0
-	MOVOU      400(AX), X1
-	MOVOU      416(AX), X2
-	MOVOU      432(AX), X3
-	MOVOU      448(AX), X4
-	MOVOU      464(AX), X5
-	MOVOU      480(AX), X6
-	MOVOU      496(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 384(AX)
-	MOVOU      X1, 400(AX)
-	MOVOU      X2, 416(AX)
-	MOVOU      X3, 432(AX)
-	MOVOU      X4, 448(AX)
-	MOVOU      X5, 464(AX)
-	MOVOU      X6, 480(AX)
-	MOVOU      X7, 496(AX)
-	MOVOU      512(AX), X0
-	MOVOU      528(AX), X1
-	MOVOU      544(AX), X2
-	MOVOU      560(AX), X3
-	MOVOU      576(AX), X4
-	MOVOU      592(AX), X5
-	MOVOU      608(AX), X6
-	MOVOU      624(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 512(AX)
-	MOVOU      X1, 528(AX)
-	MOVOU      X2, 544(AX)
-	MOVOU      X3, 560(AX)
-	MOVOU      X4, 576(AX)
-	MOVOU      X5, 592(AX)
-	MOVOU      X6, 608(AX)
-	MOVOU      X7, 624(AX)
-	MOVOU      640(AX), X0
-	MOVOU      656(AX), X1
-	MOVOU      672(AX), X2
-	MOVOU      688(AX), X3
-	MOVOU      704(AX), X4
-	MOVOU      720(AX), X5
-	MOVOU      736(AX), X6
-	MOVOU      752(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 640(AX)
-	MOVOU      X1, 656(AX)
-	MOVOU      X2, 672(AX)
-	MOVOU      X3, 688(AX)
-	MOVOU      X4, 704(AX)
-	MOVOU      X5, 720(AX)
-	MOVOU      X6, 736(AX)
-	MOVOU      X7, 752(AX)
-	MOVOU      768(AX), X0
-	MOVOU      784(AX), X1
-	MOVOU      800(AX), X2
-	MOVOU      816(AX), X3
-	MOVOU      832(AX), X4
-	MOVOU      848(AX), X5
-	MOVOU      864(AX), X6
-	MOVOU      880(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 768(AX)
-	MOVOU      X1, 784(AX)
-	MOVOU      X2, 800(AX)
-	MOVOU      X3, 816(AX)
-	MOVOU      X4, 832(AX)
-	MOVOU      X5, 848(AX)
-	MOVOU      X6, 864(AX)
-	MOVOU      X7, 880(AX)
-	MOVOU      896(AX), X0
-	MOVOU      912(AX), X1
-	MOVOU      928(AX), X2
-	MOVOU      944(AX), X3
-	MOVOU      960(AX), X4
-	MOVOU      976(AX), X5
-	MOVOU      992(AX), X6
-	MOVOU      1008(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 896(AX)
-	MOVOU      X1, 912(AX)
-	MOVOU      X2, 928(AX)
-	MOVOU      X3, 944(AX)
-	MOVOU      X4, 960(AX)
-	MOVOU      X5, 976(AX)
-	MOVOU      X6, 992(AX)
-	MOVOU      X7, 1008(AX)
-	MOVOU      (AX), X0
-	MOVOU      128(AX), X1
-	MOVOU      256(AX), X2
-	MOVOU      384(AX), X3
-	MOVOU      512(AX), X4
-	MOVOU      640(AX), X5
-	MOVOU      768(AX), X6
-	MOVOU      896(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, (AX)
-	MOVOU      X1, 128(AX)
-	MOVOU      X2, 256(AX)
-	MOVOU      X3, 384(AX)
-	MOVOU      X4, 512(AX)
-	MOVOU      X5, 640(AX)
-	MOVOU      X6, 768(AX)
-	MOVOU      X7, 896(AX)
-	MOVOU      16(AX), X0
-	MOVOU      144(AX), X1
-	MOVOU      272(AX), X2
-	MOVOU      400(AX), X3
-	MOVOU      528(AX), X4
-	MOVOU      656(AX), X5
-	MOVOU      784(AX), X6
-	MOVOU      912(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 16(AX)
-	MOVOU      X1, 144(AX)
-	MOVOU      X2, 272(AX)
-	MOVOU      X3, 400(AX)
-	MOVOU      X4, 528(AX)
-	MOVOU      X5, 656(AX)
-	MOVOU      X6, 784(AX)
-	MOVOU      X7, 912(AX)
-	MOVOU      32(AX), X0
-	MOVOU      160(AX), X1
-	MOVOU      288(AX), X2
-	MOVOU      416(AX), X3
-	MOVOU      544(AX), X4
-	MOVOU      672(AX), X5
-	MOVOU      800(AX), X6
-	MOVOU      928(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 32(AX)
-	MOVOU      X1, 160(AX)
-	MOVOU      X2, 288(AX)
-	MOVOU      X3, 416(AX)
-	MOVOU      X4, 544(AX)
-	MOVOU      X5, 672(AX)
-	MOVOU      X6, 800(AX)
-	MOVOU      X7, 928(AX)
-	MOVOU      48(AX), X0
-	MOVOU      176(AX), X1
-	MOVOU      304(AX), X2
-	MOVOU      432(AX), X3
-	MOVOU      560(AX), X4
-	MOVOU      688(AX), X5
-	MOVOU      816(AX), X6
-	MOVOU      944(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 48(AX)
-	MOVOU      X1, 176(AX)
-	MOVOU      X2, 304(AX)
-	MOVOU      X3, 432(AX)
-	MOVOU      X4, 560(AX)
-	MOVOU      X5, 688(AX)
-	MOVOU      X6, 816(AX)
-	MOVOU      X7, 944(AX)
-	MOVOU      64(AX), X0
-	MOVOU      192(AX), X1
-	MOVOU      320(AX), X2
-	MOVOU      448(AX), X3
-	MOVOU      576(AX), X4
-	MOVOU      704(AX), X5
-	MOVOU      832(AX), X6
-	MOVOU      960(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 64(AX)
-	MOVOU      X1, 192(AX)
-	MOVOU      X2, 320(AX)
-	MOVOU      X3, 448(AX)
-	MOVOU      X4, 576(AX)
-	MOVOU      X5, 704(AX)
-	MOVOU      X6, 832(AX)
-	MOVOU      X7, 960(AX)
-	MOVOU      80(AX), X0
-	MOVOU      208(AX), X1
-	MOVOU      336(AX), X2
-	MOVOU      464(AX), X3
-	MOVOU      592(AX), X4
-	MOVOU      720(AX), X5
-	MOVOU      848(AX), X6
-	MOVOU      976(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 80(AX)
-	MOVOU      X1, 208(AX)
-	MOVOU      X2, 336(AX)
-	MOVOU      X3, 464(AX)
-	MOVOU      X4, 592(AX)
-	MOVOU      X5, 720(AX)
-	MOVOU      X6, 848(AX)
-	MOVOU      X7, 976(AX)
-	MOVOU      96(AX), X0
-	MOVOU      224(AX), X1
-	MOVOU      352(AX), X2
-	MOVOU      480(AX), X3
-	MOVOU      608(AX), X4
-	MOVOU      736(AX), X5
-	MOVOU      864(AX), X6
-	MOVOU      992(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 96(AX)
-	MOVOU      X1, 224(AX)
-	MOVOU      X2, 352(AX)
-	MOVOU      X3, 480(AX)
-	MOVOU      X4, 608(AX)
-	MOVOU      X5, 736(AX)
-	MOVOU      X6, 864(AX)
-	MOVOU      X7, 992(AX)
-	MOVOU      112(AX), X0
-	MOVOU      240(AX), X1
-	MOVOU      368(AX), X2
-	MOVOU      496(AX), X3
-	MOVOU      624(AX), X4
-	MOVOU      752(AX), X5
-	MOVOU      880(AX), X6
-	MOVOU      1008(AX), X7
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFD     $0xb1, X6, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	PSHUFB     X10, X2
-	MOVO       X0, X8
-	PMULULQ    X2, X8
-	PADDQ      X2, X0
-	PADDQ      X8, X0
-	PADDQ      X8, X0
-	PXOR       X0, X6
-	PSHUFB     X11, X6
-	MOVO       X4, X8
-	PMULULQ    X6, X8
-	PADDQ      X6, X4
-	PADDQ      X8, X4
-	PADDQ      X8, X4
-	PXOR       X4, X2
-	MOVO       X2, X8
-	PADDQ      X2, X8
-	PSRLQ      $0x3f, X2
-	PXOR       X8, X2
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X7, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	PSHUFB     X10, X3
-	MOVO       X1, X8
-	PMULULQ    X3, X8
-	PADDQ      X3, X1
-	PADDQ      X8, X1
-	PADDQ      X8, X1
-	PXOR       X1, X7
-	PSHUFB     X11, X7
-	MOVO       X5, X8
-	PMULULQ    X7, X8
-	PADDQ      X7, X5
-	PADDQ      X8, X5
-	PADDQ      X8, X5
-	PXOR       X5, X3
-	MOVO       X3, X8
-	PADDQ      X3, X8
-	PSRLQ      $0x3f, X3
-	PXOR       X8, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      X0, 112(AX)
-	MOVOU      X1, 240(AX)
-	MOVOU      X2, 368(AX)
-	MOVOU      X3, 496(AX)
-	MOVOU      X4, 624(AX)
-	MOVOU      X5, 752(AX)
-	MOVOU      X6, 880(AX)
-	MOVOU      X7, 1008(AX)
-	RET
-
-DATA ·c40<>+0(SB)/8, $0x0201000706050403
-DATA ·c40<>+8(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·c40<>(SB), RODATA|NOPTR, $16
-
-DATA ·c48<>+0(SB)/8, $0x0100070605040302
-DATA ·c48<>+8(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·c48<>(SB), RODATA|NOPTR, $16
-
-// func mixBlocksSSE2(out *block, a *block, b *block, c *block)
-// Requires: SSE2
-TEXT ·mixBlocksSSE2(SB), NOSPLIT, $0-32
-	MOVQ out+0(FP), DX
-	MOVQ a+8(FP), AX
-	MOVQ b+16(FP), BX
-	MOVQ c+24(FP), CX
-	MOVQ $0x00000080, DI
-
-loop:
-	MOVOU (AX), X0
-	MOVOU (BX), X1
-	MOVOU (CX), X2
-	PXOR  X1, X0
-	PXOR  X2, X0
-	MOVOU X0, (DX)
-	ADDQ  $0x10, AX
-	ADDQ  $0x10, BX
-	ADDQ  $0x10, CX
-	ADDQ  $0x10, DX
-	SUBQ  $0x02, DI
-	JA    loop
-	RET
-
-// func xorBlocksSSE2(out *block, a *block, b *block, c *block)
-// Requires: SSE2
-TEXT ·xorBlocksSSE2(SB), NOSPLIT, $0-32
-	MOVQ out+0(FP), DX
-	MOVQ a+8(FP), AX
-	MOVQ b+16(FP), BX
-	MOVQ c+24(FP), CX
-	MOVQ $0x00000080, DI
-
-loop:
-	MOVOU (AX), X0
-	MOVOU (BX), X1
-	MOVOU (CX), X2
-	MOVOU (DX), X3
-	PXOR  X1, X0
-	PXOR  X2, X0
-	PXOR  X3, X0
-	MOVOU X0, (DX)
-	ADDQ  $0x10, AX
-	ADDQ  $0x10, BX
-	ADDQ  $0x10, CX
-	ADDQ  $0x10, DX
-	SUBQ  $0x02, DI
-	JA    loop
-	RET
diff --git a/vendor/golang.org/x/crypto/argon2/blamka_generic.go b/vendor/golang.org/x/crypto/argon2/blamka_generic.go
deleted file mode 100644
index a481b2243..000000000
--- a/vendor/golang.org/x/crypto/argon2/blamka_generic.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package argon2
-
-var useSSE4 bool
-
-func processBlockGeneric(out, in1, in2 *block, xor bool) {
-	var t block
-	for i := range t {
-		t[i] = in1[i] ^ in2[i]
-	}
-	for i := 0; i < blockLength; i += 16 {
-		blamkaGeneric(
-			&t[i+0], &t[i+1], &t[i+2], &t[i+3],
-			&t[i+4], &t[i+5], &t[i+6], &t[i+7],
-			&t[i+8], &t[i+9], &t[i+10], &t[i+11],
-			&t[i+12], &t[i+13], &t[i+14], &t[i+15],
-		)
-	}
-	for i := 0; i < blockLength/8; i += 2 {
-		blamkaGeneric(
-			&t[i], &t[i+1], &t[16+i], &t[16+i+1],
-			&t[32+i], &t[32+i+1], &t[48+i], &t[48+i+1],
-			&t[64+i], &t[64+i+1], &t[80+i], &t[80+i+1],
-			&t[96+i], &t[96+i+1], &t[112+i], &t[112+i+1],
-		)
-	}
-	if xor {
-		for i := range t {
-			out[i] ^= in1[i] ^ in2[i] ^ t[i]
-		}
-	} else {
-		for i := range t {
-			out[i] = in1[i] ^ in2[i] ^ t[i]
-		}
-	}
-}
-
-func blamkaGeneric(t00, t01, t02, t03, t04, t05, t06, t07, t08, t09, t10, t11, t12, t13, t14, t15 *uint64) {
-	v00, v01, v02, v03 := *t00, *t01, *t02, *t03
-	v04, v05, v06, v07 := *t04, *t05, *t06, *t07
-	v08, v09, v10, v11 := *t08, *t09, *t10, *t11
-	v12, v13, v14, v15 := *t12, *t13, *t14, *t15
-
-	v00 += v04 + 2*uint64(uint32(v00))*uint64(uint32(v04))
-	v12 ^= v00
-	v12 = v12>>32 | v12<<32
-	v08 += v12 + 2*uint64(uint32(v08))*uint64(uint32(v12))
-	v04 ^= v08
-	v04 = v04>>24 | v04<<40
-
-	v00 += v04 + 2*uint64(uint32(v00))*uint64(uint32(v04))
-	v12 ^= v00
-	v12 = v12>>16 | v12<<48
-	v08 += v12 + 2*uint64(uint32(v08))*uint64(uint32(v12))
-	v04 ^= v08
-	v04 = v04>>63 | v04<<1
-
-	v01 += v05 + 2*uint64(uint32(v01))*uint64(uint32(v05))
-	v13 ^= v01
-	v13 = v13>>32 | v13<<32
-	v09 += v13 + 2*uint64(uint32(v09))*uint64(uint32(v13))
-	v05 ^= v09
-	v05 = v05>>24 | v05<<40
-
-	v01 += v05 + 2*uint64(uint32(v01))*uint64(uint32(v05))
-	v13 ^= v01
-	v13 = v13>>16 | v13<<48
-	v09 += v13 + 2*uint64(uint32(v09))*uint64(uint32(v13))
-	v05 ^= v09
-	v05 = v05>>63 | v05<<1
-
-	v02 += v06 + 2*uint64(uint32(v02))*uint64(uint32(v06))
-	v14 ^= v02
-	v14 = v14>>32 | v14<<32
-	v10 += v14 + 2*uint64(uint32(v10))*uint64(uint32(v14))
-	v06 ^= v10
-	v06 = v06>>24 | v06<<40
-
-	v02 += v06 + 2*uint64(uint32(v02))*uint64(uint32(v06))
-	v14 ^= v02
-	v14 = v14>>16 | v14<<48
-	v10 += v14 + 2*uint64(uint32(v10))*uint64(uint32(v14))
-	v06 ^= v10
-	v06 = v06>>63 | v06<<1
-
-	v03 += v07 + 2*uint64(uint32(v03))*uint64(uint32(v07))
-	v15 ^= v03
-	v15 = v15>>32 | v15<<32
-	v11 += v15 + 2*uint64(uint32(v11))*uint64(uint32(v15))
-	v07 ^= v11
-	v07 = v07>>24 | v07<<40
-
-	v03 += v07 + 2*uint64(uint32(v03))*uint64(uint32(v07))
-	v15 ^= v03
-	v15 = v15>>16 | v15<<48
-	v11 += v15 + 2*uint64(uint32(v11))*uint64(uint32(v15))
-	v07 ^= v11
-	v07 = v07>>63 | v07<<1
-
-	v00 += v05 + 2*uint64(uint32(v00))*uint64(uint32(v05))
-	v15 ^= v00
-	v15 = v15>>32 | v15<<32
-	v10 += v15 + 2*uint64(uint32(v10))*uint64(uint32(v15))
-	v05 ^= v10
-	v05 = v05>>24 | v05<<40
-
-	v00 += v05 + 2*uint64(uint32(v00))*uint64(uint32(v05))
-	v15 ^= v00
-	v15 = v15>>16 | v15<<48
-	v10 += v15 + 2*uint64(uint32(v10))*uint64(uint32(v15))
-	v05 ^= v10
-	v05 = v05>>63 | v05<<1
-
-	v01 += v06 + 2*uint64(uint32(v01))*uint64(uint32(v06))
-	v12 ^= v01
-	v12 = v12>>32 | v12<<32
-	v11 += v12 + 2*uint64(uint32(v11))*uint64(uint32(v12))
-	v06 ^= v11
-	v06 = v06>>24 | v06<<40
-
-	v01 += v06 + 2*uint64(uint32(v01))*uint64(uint32(v06))
-	v12 ^= v01
-	v12 = v12>>16 | v12<<48
-	v11 += v12 + 2*uint64(uint32(v11))*uint64(uint32(v12))
-	v06 ^= v11
-	v06 = v06>>63 | v06<<1
-
-	v02 += v07 + 2*uint64(uint32(v02))*uint64(uint32(v07))
-	v13 ^= v02
-	v13 = v13>>32 | v13<<32
-	v08 += v13 + 2*uint64(uint32(v08))*uint64(uint32(v13))
-	v07 ^= v08
-	v07 = v07>>24 | v07<<40
-
-	v02 += v07 + 2*uint64(uint32(v02))*uint64(uint32(v07))
-	v13 ^= v02
-	v13 = v13>>16 | v13<<48
-	v08 += v13 + 2*uint64(uint32(v08))*uint64(uint32(v13))
-	v07 ^= v08
-	v07 = v07>>63 | v07<<1
-
-	v03 += v04 + 2*uint64(uint32(v03))*uint64(uint32(v04))
-	v14 ^= v03
-	v14 = v14>>32 | v14<<32
-	v09 += v14 + 2*uint64(uint32(v09))*uint64(uint32(v14))
-	v04 ^= v09
-	v04 = v04>>24 | v04<<40
-
-	v03 += v04 + 2*uint64(uint32(v03))*uint64(uint32(v04))
-	v14 ^= v03
-	v14 = v14>>16 | v14<<48
-	v09 += v14 + 2*uint64(uint32(v09))*uint64(uint32(v14))
-	v04 ^= v09
-	v04 = v04>>63 | v04<<1
-
-	*t00, *t01, *t02, *t03 = v00, v01, v02, v03
-	*t04, *t05, *t06, *t07 = v04, v05, v06, v07
-	*t08, *t09, *t10, *t11 = v08, v09, v10, v11
-	*t12, *t13, *t14, *t15 = v12, v13, v14, v15
-}
diff --git a/vendor/golang.org/x/crypto/argon2/blamka_ref.go b/vendor/golang.org/x/crypto/argon2/blamka_ref.go
deleted file mode 100644
index 16d58c650..000000000
--- a/vendor/golang.org/x/crypto/argon2/blamka_ref.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !amd64 || purego || !gc
-
-package argon2
-
-func processBlock(out, in1, in2 *block) {
-	processBlockGeneric(out, in1, in2, false)
-}
-
-func processBlockXOR(out, in1, in2 *block) {
-	processBlockGeneric(out, in1, in2, true)
-}
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2b.go b/vendor/golang.org/x/crypto/blake2b/blake2b.go
deleted file mode 100644
index d2e98d429..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2b.go
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package blake2b implements the BLAKE2b hash algorithm defined by RFC 7693
-// and the extendable output function (XOF) BLAKE2Xb.
-//
-// BLAKE2b is optimized for 64-bit platforms—including NEON-enabled ARMs—and
-// produces digests of any size between 1 and 64 bytes.
-// For a detailed specification of BLAKE2b see https://blake2.net/blake2.pdf
-// and for BLAKE2Xb see https://blake2.net/blake2x.pdf
-//
-// If you aren't sure which function you need, use BLAKE2b (Sum512 or New512).
-// If you need a secret-key MAC (message authentication code), use the New512
-// function with a non-nil key.
-//
-// BLAKE2X is a construction to compute hash values larger than 64 bytes. It
-// can produce hash values between 0 and 4 GiB.
-package blake2b
-
-import (
-	"encoding/binary"
-	"errors"
-	"hash"
-)
-
-const (
-	// The blocksize of BLAKE2b in bytes.
-	BlockSize = 128
-	// The hash size of BLAKE2b-512 in bytes.
-	Size = 64
-	// The hash size of BLAKE2b-384 in bytes.
-	Size384 = 48
-	// The hash size of BLAKE2b-256 in bytes.
-	Size256 = 32
-)
-
-var (
-	useAVX2 bool
-	useAVX  bool
-	useSSE4 bool
-)
-
-var (
-	errKeySize  = errors.New("blake2b: invalid key size")
-	errHashSize = errors.New("blake2b: invalid hash size")
-)
-
-var iv = [8]uint64{
-	0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1,
-	0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179,
-}
-
-// Sum512 returns the BLAKE2b-512 checksum of the data.
-func Sum512(data []byte) [Size]byte {
-	var sum [Size]byte
-	checkSum(&sum, Size, data)
-	return sum
-}
-
-// Sum384 returns the BLAKE2b-384 checksum of the data.
-func Sum384(data []byte) [Size384]byte {
-	var sum [Size]byte
-	var sum384 [Size384]byte
-	checkSum(&sum, Size384, data)
-	copy(sum384[:], sum[:Size384])
-	return sum384
-}
-
-// Sum256 returns the BLAKE2b-256 checksum of the data.
-func Sum256(data []byte) [Size256]byte {
-	var sum [Size]byte
-	var sum256 [Size256]byte
-	checkSum(&sum, Size256, data)
-	copy(sum256[:], sum[:Size256])
-	return sum256
-}
-
-// New512 returns a new hash.Hash computing the BLAKE2b-512 checksum. A non-nil
-// key turns the hash into a MAC. The key must be between zero and 64 bytes long.
-func New512(key []byte) (hash.Hash, error) { return newDigest(Size, key) }
-
-// New384 returns a new hash.Hash computing the BLAKE2b-384 checksum. A non-nil
-// key turns the hash into a MAC. The key must be between zero and 64 bytes long.
-func New384(key []byte) (hash.Hash, error) { return newDigest(Size384, key) }
-
-// New256 returns a new hash.Hash computing the BLAKE2b-256 checksum. A non-nil
-// key turns the hash into a MAC. The key must be between zero and 64 bytes long.
-func New256(key []byte) (hash.Hash, error) { return newDigest(Size256, key) }
-
-// New returns a new hash.Hash computing the BLAKE2b checksum with a custom length.
-// A non-nil key turns the hash into a MAC. The key must be between zero and 64 bytes long.
-// The hash size can be a value between 1 and 64 but it is highly recommended to use
-// values equal or greater than:
-// - 32 if BLAKE2b is used as a hash function (The key is zero bytes long).
-// - 16 if BLAKE2b is used as a MAC function (The key is at least 16 bytes long).
-// When the key is nil, the returned hash.Hash implements BinaryMarshaler
-// and BinaryUnmarshaler for state (de)serialization as documented by hash.Hash.
-func New(size int, key []byte) (hash.Hash, error) { return newDigest(size, key) }
-
-func newDigest(hashSize int, key []byte) (*digest, error) {
-	if hashSize < 1 || hashSize > Size {
-		return nil, errHashSize
-	}
-	if len(key) > Size {
-		return nil, errKeySize
-	}
-	d := &digest{
-		size:   hashSize,
-		keyLen: len(key),
-	}
-	copy(d.key[:], key)
-	d.Reset()
-	return d, nil
-}
-
-func checkSum(sum *[Size]byte, hashSize int, data []byte) {
-	h := iv
-	h[0] ^= uint64(hashSize) | (1 << 16) | (1 << 24)
-	var c [2]uint64
-
-	if length := len(data); length > BlockSize {
-		n := length &^ (BlockSize - 1)
-		if length == n {
-			n -= BlockSize
-		}
-		hashBlocks(&h, &c, 0, data[:n])
-		data = data[n:]
-	}
-
-	var block [BlockSize]byte
-	offset := copy(block[:], data)
-	remaining := uint64(BlockSize - offset)
-	if c[0] < remaining {
-		c[1]--
-	}
-	c[0] -= remaining
-
-	hashBlocks(&h, &c, 0xFFFFFFFFFFFFFFFF, block[:])
-
-	for i, v := range h[:(hashSize+7)/8] {
-		binary.LittleEndian.PutUint64(sum[8*i:], v)
-	}
-}
-
-type digest struct {
-	h      [8]uint64
-	c      [2]uint64
-	size   int
-	block  [BlockSize]byte
-	offset int
-
-	key    [BlockSize]byte
-	keyLen int
-}
-
-const (
-	magic         = "b2b"
-	marshaledSize = len(magic) + 8*8 + 2*8 + 1 + BlockSize + 1
-)
-
-func (d *digest) MarshalBinary() ([]byte, error) {
-	if d.keyLen != 0 {
-		return nil, errors.New("crypto/blake2b: cannot marshal MACs")
-	}
-	b := make([]byte, 0, marshaledSize)
-	b = append(b, magic...)
-	for i := 0; i < 8; i++ {
-		b = appendUint64(b, d.h[i])
-	}
-	b = appendUint64(b, d.c[0])
-	b = appendUint64(b, d.c[1])
-	// Maximum value for size is 64
-	b = append(b, byte(d.size))
-	b = append(b, d.block[:]...)
-	b = append(b, byte(d.offset))
-	return b, nil
-}
-
-func (d *digest) UnmarshalBinary(b []byte) error {
-	if len(b) < len(magic) || string(b[:len(magic)]) != magic {
-		return errors.New("crypto/blake2b: invalid hash state identifier")
-	}
-	if len(b) != marshaledSize {
-		return errors.New("crypto/blake2b: invalid hash state size")
-	}
-	b = b[len(magic):]
-	for i := 0; i < 8; i++ {
-		b, d.h[i] = consumeUint64(b)
-	}
-	b, d.c[0] = consumeUint64(b)
-	b, d.c[1] = consumeUint64(b)
-	d.size = int(b[0])
-	b = b[1:]
-	copy(d.block[:], b[:BlockSize])
-	b = b[BlockSize:]
-	d.offset = int(b[0])
-	return nil
-}
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Size() int { return d.size }
-
-func (d *digest) Reset() {
-	d.h = iv
-	d.h[0] ^= uint64(d.size) | (uint64(d.keyLen) << 8) | (1 << 16) | (1 << 24)
-	d.offset, d.c[0], d.c[1] = 0, 0, 0
-	if d.keyLen > 0 {
-		d.block = d.key
-		d.offset = BlockSize
-	}
-}
-
-func (d *digest) Write(p []byte) (n int, err error) {
-	n = len(p)
-
-	if d.offset > 0 {
-		remaining := BlockSize - d.offset
-		if n <= remaining {
-			d.offset += copy(d.block[d.offset:], p)
-			return
-		}
-		copy(d.block[d.offset:], p[:remaining])
-		hashBlocks(&d.h, &d.c, 0, d.block[:])
-		d.offset = 0
-		p = p[remaining:]
-	}
-
-	if length := len(p); length > BlockSize {
-		nn := length &^ (BlockSize - 1)
-		if length == nn {
-			nn -= BlockSize
-		}
-		hashBlocks(&d.h, &d.c, 0, p[:nn])
-		p = p[nn:]
-	}
-
-	if len(p) > 0 {
-		d.offset += copy(d.block[:], p)
-	}
-
-	return
-}
-
-func (d *digest) Sum(sum []byte) []byte {
-	var hash [Size]byte
-	d.finalize(&hash)
-	return append(sum, hash[:d.size]...)
-}
-
-func (d *digest) finalize(hash *[Size]byte) {
-	var block [BlockSize]byte
-	copy(block[:], d.block[:d.offset])
-	remaining := uint64(BlockSize - d.offset)
-
-	c := d.c
-	if c[0] < remaining {
-		c[1]--
-	}
-	c[0] -= remaining
-
-	h := d.h
-	hashBlocks(&h, &c, 0xFFFFFFFFFFFFFFFF, block[:])
-
-	for i, v := range h {
-		binary.LittleEndian.PutUint64(hash[8*i:], v)
-	}
-}
-
-func appendUint64(b []byte, x uint64) []byte {
-	var a [8]byte
-	binary.BigEndian.PutUint64(a[:], x)
-	return append(b, a[:]...)
-}
-
-func appendUint32(b []byte, x uint32) []byte {
-	var a [4]byte
-	binary.BigEndian.PutUint32(a[:], x)
-	return append(b, a[:]...)
-}
-
-func consumeUint64(b []byte) ([]byte, uint64) {
-	x := binary.BigEndian.Uint64(b)
-	return b[8:], x
-}
-
-func consumeUint32(b []byte) ([]byte, uint32) {
-	x := binary.BigEndian.Uint32(b)
-	return b[4:], x
-}
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go b/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
deleted file mode 100644
index 199c21d27..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build amd64 && gc && !purego
-
-package blake2b
-
-import "golang.org/x/sys/cpu"
-
-func init() {
-	useAVX2 = cpu.X86.HasAVX2
-	useAVX = cpu.X86.HasAVX
-	useSSE4 = cpu.X86.HasSSE41
-}
-
-//go:noescape
-func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-//go:noescape
-func hashBlocksAVX(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-//go:noescape
-func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-func hashBlocks(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	switch {
-	case useAVX2:
-		hashBlocksAVX2(h, c, flag, blocks)
-	case useAVX:
-		hashBlocksAVX(h, c, flag, blocks)
-	case useSSE4:
-		hashBlocksSSE4(h, c, flag, blocks)
-	default:
-		hashBlocksGeneric(h, c, flag, blocks)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s b/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
deleted file mode 100644
index f75162e03..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
+++ /dev/null
@@ -1,4559 +0,0 @@
-// Code generated by command: go run blake2bAVX2_amd64_asm.go -out ../../blake2bAVX2_amd64.s -pkg blake2b. DO NOT EDIT.
-
-//go:build amd64 && gc && !purego
-
-#include "textflag.h"
-
-// func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-// Requires: AVX, AVX2
-TEXT ·hashBlocksAVX2(SB), NOSPLIT, $320-48
-	MOVQ    h+0(FP), AX
-	MOVQ    c+8(FP), BX
-	MOVQ    flag+16(FP), CX
-	MOVQ    blocks_base+24(FP), SI
-	MOVQ    blocks_len+32(FP), DI
-	MOVQ    SP, DX
-	ADDQ    $+31, DX
-	ANDQ    $-32, DX
-	MOVQ    CX, 16(DX)
-	XORQ    CX, CX
-	MOVQ    CX, 24(DX)
-	VMOVDQU ·AVX2_c40<>+0(SB), Y4
-	VMOVDQU ·AVX2_c48<>+0(SB), Y5
-	VMOVDQU (AX), Y8
-	VMOVDQU 32(AX), Y9
-	VMOVDQU ·AVX2_iv0<>+0(SB), Y6
-	VMOVDQU ·AVX2_iv1<>+0(SB), Y7
-	MOVQ    (BX), R8
-	MOVQ    8(BX), R9
-	MOVQ    R9, 8(DX)
-
-loop:
-	ADDQ $0x80, R8
-	MOVQ R8, (DX)
-	CMPQ R8, $0x80
-	JGE  noinc
-	INCQ R9
-	MOVQ R9, 8(DX)
-
-noinc:
-	VMOVDQA     Y8, Y0
-	VMOVDQA     Y9, Y1
-	VMOVDQA     Y6, Y2
-	VPXOR       (DX), Y7, Y3
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x26
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x20
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x10
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x30
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x08
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x28
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x18
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x38
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x40
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x60
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x50
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x70
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x48
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x58
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x78
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VMOVDQA     Y12, 32(DX)
-	VMOVDQA     Y13, 64(DX)
-	VMOVDQA     Y14, 96(DX)
-	VMOVDQA     Y15, 128(DX)
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x70
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x48
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x20
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x50
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x78
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x40
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x30
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x58
-	VPSHUFD     $0x4e, (SI), X14
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x28
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x60
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x38
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x10
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x18
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VMOVDQA     Y12, 160(DX)
-	VMOVDQA     Y13, 192(DX)
-	VMOVDQA     Y14, 224(DX)
-	VMOVDQA     Y15, 256(DX)
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x28
-	VMOVDQU     88(SI), X12
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x78
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x40
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x10
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x2e
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x50
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x38
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x18
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x48
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x70
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x08
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x30
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x20
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x38
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x18
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x58
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x48
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x60
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x08
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x70
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x10
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x20
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x28
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x78
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x30
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x1e
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x50
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x40
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x48
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x10
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x28
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x50
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x2e
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x20
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x38
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x78
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x70
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x30
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x58
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x18
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x08
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x40
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x60
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x10
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x1e
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x30
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x40
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x60
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x58
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x50
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x18
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x20
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x78
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x38
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x08
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x68
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x70
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x28
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x48
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x60
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x70
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x08
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x20
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x28
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x78
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x50
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x36
-	VPSHUFD     $0x4e, 64(SI), X11
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x30
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x38
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x10
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x18
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x58
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x68
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x60
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x38
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x18
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x58
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x08
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x70
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x48
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x28
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x40
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x78
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x10
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x3e
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x30
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x20
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x50
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x30
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x58
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x70
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x1e
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x78
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x18
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x48
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x40
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x08
-	VMOVDQU     96(SI), X14
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x50
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x10
-	VMOVDQU     32(SI), X11
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x38
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x66
-	BYTE        $0x50
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x38
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x99
-	BYTE        $0x22
-	BYTE        $0x66
-	BYTE        $0x40
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x08
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y12, Y12
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x6e
-	BYTE        $0x10
-	VPSHUFD     $0x4e, 40(SI), X11
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x91
-	BYTE        $0x22
-	BYTE        $0x6e
-	BYTE        $0x20
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y13, Y13
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x76
-	BYTE        $0x78
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x18
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x89
-	BYTE        $0x22
-	BYTE        $0x76
-	BYTE        $0x48
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x5e
-	BYTE        $0x68
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y14, Y14
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x7e
-	BYTE        $0x58
-	BYTE        $0xc5
-	BYTE        $0x7a
-	BYTE        $0x7e
-	BYTE        $0x5e
-	BYTE        $0x60
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0x81
-	BYTE        $0x22
-	BYTE        $0x7e
-	BYTE        $0x70
-	BYTE        $0x01
-	BYTE        $0xc4
-	BYTE        $0x63
-	BYTE        $0xa1
-	BYTE        $0x22
-	BYTE        $0x1e
-	BYTE        $0x01
-	VINSERTI128 $0x01, X11, Y15, Y15
-	VPADDQ      Y12, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y13, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      Y14, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      Y15, Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	VPADDQ      32(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      64(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      96(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      128(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	VPADDQ      160(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      192(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x93
-	VPADDQ      224(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFD     $-79, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPSHUFB     Y4, Y1, Y1
-	VPADDQ      256(DX), Y0, Y0
-	VPADDQ      Y1, Y0, Y0
-	VPXOR       Y0, Y3, Y3
-	VPSHUFB     Y5, Y3, Y3
-	VPADDQ      Y3, Y2, Y2
-	VPXOR       Y2, Y1, Y1
-	VPADDQ      Y1, Y1, Y10
-	VPSRLQ      $0x3f, Y1, Y1
-	VPXOR       Y10, Y1, Y1
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xdb
-	BYTE        $0x39
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xd2
-	BYTE        $0x4e
-	BYTE        $0xc4
-	BYTE        $0xe3
-	BYTE        $0xfd
-	BYTE        $0x00
-	BYTE        $0xc9
-	BYTE        $0x93
-	VPXOR       Y0, Y8, Y8
-	VPXOR       Y1, Y9, Y9
-	VPXOR       Y2, Y8, Y8
-	VPXOR       Y3, Y9, Y9
-	LEAQ        128(SI), SI
-	SUBQ        $0x80, DI
-	JNE         loop
-	MOVQ        R8, (BX)
-	MOVQ        R9, 8(BX)
-	VMOVDQU     Y8, (AX)
-	VMOVDQU     Y9, 32(AX)
-	VZEROUPPER
-	RET
-
-DATA ·AVX2_c40<>+0(SB)/8, $0x0201000706050403
-DATA ·AVX2_c40<>+8(SB)/8, $0x0a09080f0e0d0c0b
-DATA ·AVX2_c40<>+16(SB)/8, $0x0201000706050403
-DATA ·AVX2_c40<>+24(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·AVX2_c40<>(SB), RODATA|NOPTR, $32
-
-DATA ·AVX2_c48<>+0(SB)/8, $0x0100070605040302
-DATA ·AVX2_c48<>+8(SB)/8, $0x09080f0e0d0c0b0a
-DATA ·AVX2_c48<>+16(SB)/8, $0x0100070605040302
-DATA ·AVX2_c48<>+24(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·AVX2_c48<>(SB), RODATA|NOPTR, $32
-
-DATA ·AVX2_iv0<>+0(SB)/8, $0x6a09e667f3bcc908
-DATA ·AVX2_iv0<>+8(SB)/8, $0xbb67ae8584caa73b
-DATA ·AVX2_iv0<>+16(SB)/8, $0x3c6ef372fe94f82b
-DATA ·AVX2_iv0<>+24(SB)/8, $0xa54ff53a5f1d36f1
-GLOBL ·AVX2_iv0<>(SB), RODATA|NOPTR, $32
-
-DATA ·AVX2_iv1<>+0(SB)/8, $0x510e527fade682d1
-DATA ·AVX2_iv1<>+8(SB)/8, $0x9b05688c2b3e6c1f
-DATA ·AVX2_iv1<>+16(SB)/8, $0x1f83d9abfb41bd6b
-DATA ·AVX2_iv1<>+24(SB)/8, $0x5be0cd19137e2179
-GLOBL ·AVX2_iv1<>(SB), RODATA|NOPTR, $32
-
-// func hashBlocksAVX(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-// Requires: AVX, SSE2
-TEXT ·hashBlocksAVX(SB), NOSPLIT, $288-48
-	MOVQ    h+0(FP), AX
-	MOVQ    c+8(FP), BX
-	MOVQ    flag+16(FP), CX
-	MOVQ    blocks_base+24(FP), SI
-	MOVQ    blocks_len+32(FP), DI
-	MOVQ    SP, R10
-	ADDQ    $0x0f, R10
-	ANDQ    $-16, R10
-	VMOVDQU ·AVX_c40<>+0(SB), X0
-	VMOVDQU ·AVX_c48<>+0(SB), X1
-	VMOVDQA X0, X8
-	VMOVDQA X1, X9
-	VMOVDQU ·AVX_iv3<>+0(SB), X0
-	VMOVDQA X0, (R10)
-	XORQ    CX, (R10)
-	VMOVDQU (AX), X10
-	VMOVDQU 16(AX), X11
-	VMOVDQU 32(AX), X2
-	VMOVDQU 48(AX), X3
-	MOVQ    (BX), R8
-	MOVQ    8(BX), R9
-
-loop:
-	ADDQ $0x80, R8
-	CMPQ R8, $0x80
-	JGE  noinc
-	INCQ R9
-
-noinc:
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0xf9
-	BYTE    $0x6e
-	BYTE    $0xf8
-	BYTE    $0xc4
-	BYTE    $0x43
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0xf9
-	BYTE    $0x01
-	VMOVDQA X10, X0
-	VMOVDQA X11, X1
-	VMOVDQU ·AVX_iv0<>+0(SB), X4
-	VMOVDQU ·AVX_iv1<>+0(SB), X5
-	VMOVDQU ·AVX_iv2<>+0(SB), X6
-	VPXOR   X15, X6, X6
-	VMOVDQA (R10), X7
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x26
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x20
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x08
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x28
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x10
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x30
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x18
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x38
-	BYTE    $0x01
-	VMOVDQA X12, 16(R10)
-	VMOVDQA X13, 32(R10)
-	VMOVDQA X14, 48(R10)
-	VMOVDQA X15, 64(R10)
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x40
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x60
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x48
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x68
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x50
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x70
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x58
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x78
-	BYTE    $0x01
-	VMOVDQA X12, 80(R10)
-	VMOVDQA X13, 96(R10)
-	VMOVDQA X14, 112(R10)
-	VMOVDQA X15, 128(R10)
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x70
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x48
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x50
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x78
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x20
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x68
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x40
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x30
-	BYTE    $0x01
-	VMOVDQA X12, 144(R10)
-	VMOVDQA X13, 160(R10)
-	VMOVDQA X14, 176(R10)
-	VMOVDQA X15, 192(R10)
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	VPSHUFD $0x4e, (SI), X12
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x58
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x60
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x38
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x28
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x10
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x18
-	BYTE    $0x01
-	VMOVDQA X12, 208(R10)
-	VMOVDQA X13, 224(R10)
-	VMOVDQA X14, 240(R10)
-	VMOVDQA X15, 256(R10)
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	VMOVDQU 88(SI), X12
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x28
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x40
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x10
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x78
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x36
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x68
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x50
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x38
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x70
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x08
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x18
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x48
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x30
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x20
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x38
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x68
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x48
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x60
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x18
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x58
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x08
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x70
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x10
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x20
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x30
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x3e
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x28
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x78
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x50
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x40
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x48
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x10
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x36
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x20
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x28
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x50
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x38
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x78
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x70
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x30
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x08
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x40
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x58
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x18
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x60
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x68
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x10
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x2e
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x60
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x58
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x30
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x40
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x50
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x18
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x20
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x78
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x68
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x70
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x38
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x08
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x28
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x48
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x60
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x70
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x28
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x68
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x08
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x20
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x78
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x50
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	MOVQ    (SI), X12
-	VPSHUFD $0x4e, 64(SI), X13
-	MOVQ    56(SI), X14
-	MOVQ    16(SI), X15
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x30
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x18
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x58
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x68
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x60
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x58
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x08
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x38
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x18
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x70
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x48
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	MOVQ    40(SI), X12
-	MOVQ    64(SI), X13
-	MOVQ    (SI), X14
-	MOVQ    48(SI), X15
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x78
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x10
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x20
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x50
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	MOVQ    48(SI), X12
-	MOVQ    88(SI), X13
-	MOVQ    120(SI), X14
-	MOVQ    24(SI), X15
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x70
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x2e
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x48
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x40
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	VMOVDQU 96(SI), X12
-	MOVQ    8(SI), X13
-	MOVQ    16(SI), X14
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x50
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x38
-	BYTE    $0x01
-	VMOVDQU 32(SI), X15
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x66
-	BYTE    $0x50
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x6e
-	BYTE    $0x38
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x76
-	BYTE    $0x10
-	BYTE    $0xc5
-	BYTE    $0x7a
-	BYTE    $0x7e
-	BYTE    $0x7e
-	BYTE    $0x30
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x40
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x08
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x20
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x7e
-	BYTE    $0x28
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	MOVQ    120(SI), X12
-	MOVQ    24(SI), X13
-	MOVQ    88(SI), X14
-	MOVQ    96(SI), X15
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x99
-	BYTE    $0x22
-	BYTE    $0x66
-	BYTE    $0x48
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x91
-	BYTE    $0x22
-	BYTE    $0x6e
-	BYTE    $0x68
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x89
-	BYTE    $0x22
-	BYTE    $0x76
-	BYTE    $0x70
-	BYTE    $0x01
-	BYTE    $0xc4
-	BYTE    $0x63
-	BYTE    $0x81
-	BYTE    $0x22
-	BYTE    $0x3e
-	BYTE    $0x01
-	VPADDQ  X12, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X13, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  X14, X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  X15, X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	VPADDQ  16(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  32(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  48(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  64(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	VPADDQ  80(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  96(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  112(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  128(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	VPADDQ  144(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  160(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  176(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  192(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X6, X13
-	VMOVDQA X2, X14
-	VMOVDQA X4, X6
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x11
-	BYTE    $0x6c
-	BYTE    $0xfd
-	VMOVDQA X5, X4
-	VMOVDQA X6, X5
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xff
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x69
-	BYTE    $0x6d
-	BYTE    $0xd7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xdf
-	VPADDQ  208(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  224(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFD $-79, X6, X6
-	VPSHUFD $-79, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPSHUFB X8, X2, X2
-	VPSHUFB X8, X3, X3
-	VPADDQ  240(R10), X0, X0
-	VPADDQ  X2, X0, X0
-	VPADDQ  256(R10), X1, X1
-	VPADDQ  X3, X1, X1
-	VPXOR   X0, X6, X6
-	VPXOR   X1, X7, X7
-	VPSHUFB X9, X6, X6
-	VPSHUFB X9, X7, X7
-	VPADDQ  X6, X4, X4
-	VPADDQ  X7, X5, X5
-	VPXOR   X4, X2, X2
-	VPXOR   X5, X3, X3
-	VPADDQ  X2, X2, X15
-	VPSRLQ  $0x3f, X2, X2
-	VPXOR   X15, X2, X2
-	VPADDQ  X3, X3, X15
-	VPSRLQ  $0x3f, X3, X3
-	VPXOR   X15, X3, X3
-	VMOVDQA X2, X13
-	VMOVDQA X4, X14
-	BYTE    $0xc5
-	BYTE    $0x69
-	BYTE    $0x6c
-	BYTE    $0xfa
-	VMOVDQA X5, X4
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x61
-	BYTE    $0x6d
-	BYTE    $0xd7
-	VMOVDQA X14, X5
-	BYTE    $0xc5
-	BYTE    $0x61
-	BYTE    $0x6c
-	BYTE    $0xfb
-	VMOVDQA X6, X14
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x11
-	BYTE    $0x6d
-	BYTE    $0xdf
-	BYTE    $0xc5
-	BYTE    $0x41
-	BYTE    $0x6c
-	BYTE    $0xff
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x49
-	BYTE    $0x6d
-	BYTE    $0xf7
-	BYTE    $0xc4
-	BYTE    $0x41
-	BYTE    $0x09
-	BYTE    $0x6c
-	BYTE    $0xfe
-	BYTE    $0xc4
-	BYTE    $0xc1
-	BYTE    $0x41
-	BYTE    $0x6d
-	BYTE    $0xff
-	VMOVDQU 32(AX), X14
-	VMOVDQU 48(AX), X15
-	VPXOR   X0, X10, X10
-	VPXOR   X1, X11, X11
-	VPXOR   X2, X14, X14
-	VPXOR   X3, X15, X15
-	VPXOR   X4, X10, X10
-	VPXOR   X5, X11, X11
-	VPXOR   X6, X14, X2
-	VPXOR   X7, X15, X3
-	VMOVDQU X2, 32(AX)
-	VMOVDQU X3, 48(AX)
-	LEAQ    128(SI), SI
-	SUBQ    $0x80, DI
-	JNE     loop
-	VMOVDQU X10, (AX)
-	VMOVDQU X11, 16(AX)
-	MOVQ    R8, (BX)
-	MOVQ    R9, 8(BX)
-	VZEROUPPER
-	RET
-
-DATA ·AVX_c40<>+0(SB)/8, $0x0201000706050403
-DATA ·AVX_c40<>+8(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·AVX_c40<>(SB), RODATA|NOPTR, $16
-
-DATA ·AVX_c48<>+0(SB)/8, $0x0100070605040302
-DATA ·AVX_c48<>+8(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·AVX_c48<>(SB), RODATA|NOPTR, $16
-
-DATA ·AVX_iv3<>+0(SB)/8, $0x1f83d9abfb41bd6b
-DATA ·AVX_iv3<>+8(SB)/8, $0x5be0cd19137e2179
-GLOBL ·AVX_iv3<>(SB), RODATA|NOPTR, $16
-
-DATA ·AVX_iv0<>+0(SB)/8, $0x6a09e667f3bcc908
-DATA ·AVX_iv0<>+8(SB)/8, $0xbb67ae8584caa73b
-GLOBL ·AVX_iv0<>(SB), RODATA|NOPTR, $16
-
-DATA ·AVX_iv1<>+0(SB)/8, $0x3c6ef372fe94f82b
-DATA ·AVX_iv1<>+8(SB)/8, $0xa54ff53a5f1d36f1
-GLOBL ·AVX_iv1<>(SB), RODATA|NOPTR, $16
-
-DATA ·AVX_iv2<>+0(SB)/8, $0x510e527fade682d1
-DATA ·AVX_iv2<>+8(SB)/8, $0x9b05688c2b3e6c1f
-GLOBL ·AVX_iv2<>(SB), RODATA|NOPTR, $16
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s b/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
deleted file mode 100644
index 9a0ce2124..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
+++ /dev/null
@@ -1,1441 +0,0 @@
-// Code generated by command: go run blake2b_amd64_asm.go -out ../../blake2b_amd64.s -pkg blake2b. DO NOT EDIT.
-
-//go:build amd64 && gc && !purego
-
-#include "textflag.h"
-
-// func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-// Requires: SSE2, SSE4.1, SSSE3
-TEXT ·hashBlocksSSE4(SB), NOSPLIT, $288-48
-	MOVQ  h+0(FP), AX
-	MOVQ  c+8(FP), BX
-	MOVQ  flag+16(FP), CX
-	MOVQ  blocks_base+24(FP), SI
-	MOVQ  blocks_len+32(FP), DI
-	MOVQ  SP, R10
-	ADDQ  $0x0f, R10
-	ANDQ  $-16, R10
-	MOVOU ·iv3<>+0(SB), X0
-	MOVO  X0, (R10)
-	XORQ  CX, (R10)
-	MOVOU ·c40<>+0(SB), X13
-	MOVOU ·c48<>+0(SB), X14
-	MOVOU (AX), X12
-	MOVOU 16(AX), X15
-	MOVQ  (BX), R8
-	MOVQ  8(BX), R9
-
-loop:
-	ADDQ $0x80, R8
-	CMPQ R8, $0x80
-	JGE  noinc
-	INCQ R9
-
-noinc:
-	MOVQ       R8, X8
-	PINSRQ     $0x01, R9, X8
-	MOVO       X12, X0
-	MOVO       X15, X1
-	MOVOU      32(AX), X2
-	MOVOU      48(AX), X3
-	MOVOU      ·iv0<>+0(SB), X4
-	MOVOU      ·iv1<>+0(SB), X5
-	MOVOU      ·iv2<>+0(SB), X6
-	PXOR       X8, X6
-	MOVO       (R10), X7
-	MOVQ       (SI), X8
-	PINSRQ     $0x01, 16(SI), X8
-	MOVQ       32(SI), X9
-	PINSRQ     $0x01, 48(SI), X9
-	MOVQ       8(SI), X10
-	PINSRQ     $0x01, 24(SI), X10
-	MOVQ       40(SI), X11
-	PINSRQ     $0x01, 56(SI), X11
-	MOVO       X8, 16(R10)
-	MOVO       X9, 32(R10)
-	MOVO       X10, 48(R10)
-	MOVO       X11, 64(R10)
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       64(SI), X8
-	PINSRQ     $0x01, 80(SI), X8
-	MOVQ       96(SI), X9
-	PINSRQ     $0x01, 112(SI), X9
-	MOVQ       72(SI), X10
-	PINSRQ     $0x01, 88(SI), X10
-	MOVQ       104(SI), X11
-	PINSRQ     $0x01, 120(SI), X11
-	MOVO       X8, 80(R10)
-	MOVO       X9, 96(R10)
-	MOVO       X10, 112(R10)
-	MOVO       X11, 128(R10)
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       112(SI), X8
-	PINSRQ     $0x01, 32(SI), X8
-	MOVQ       72(SI), X9
-	PINSRQ     $0x01, 104(SI), X9
-	MOVQ       80(SI), X10
-	PINSRQ     $0x01, 64(SI), X10
-	MOVQ       120(SI), X11
-	PINSRQ     $0x01, 48(SI), X11
-	MOVO       X8, 144(R10)
-	MOVO       X9, 160(R10)
-	MOVO       X10, 176(R10)
-	MOVO       X11, 192(R10)
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       8(SI), X8
-	PINSRQ     $0x01, (SI), X8
-	MOVQ       88(SI), X9
-	PINSRQ     $0x01, 40(SI), X9
-	MOVQ       96(SI), X10
-	PINSRQ     $0x01, 16(SI), X10
-	MOVQ       56(SI), X11
-	PINSRQ     $0x01, 24(SI), X11
-	MOVO       X8, 208(R10)
-	MOVO       X9, 224(R10)
-	MOVO       X10, 240(R10)
-	MOVO       X11, 256(R10)
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       88(SI), X8
-	PINSRQ     $0x01, 96(SI), X8
-	MOVQ       40(SI), X9
-	PINSRQ     $0x01, 120(SI), X9
-	MOVQ       64(SI), X10
-	PINSRQ     $0x01, (SI), X10
-	MOVQ       16(SI), X11
-	PINSRQ     $0x01, 104(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       80(SI), X8
-	PINSRQ     $0x01, 24(SI), X8
-	MOVQ       56(SI), X9
-	PINSRQ     $0x01, 72(SI), X9
-	MOVQ       112(SI), X10
-	PINSRQ     $0x01, 48(SI), X10
-	MOVQ       8(SI), X11
-	PINSRQ     $0x01, 32(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       56(SI), X8
-	PINSRQ     $0x01, 24(SI), X8
-	MOVQ       104(SI), X9
-	PINSRQ     $0x01, 88(SI), X9
-	MOVQ       72(SI), X10
-	PINSRQ     $0x01, 8(SI), X10
-	MOVQ       96(SI), X11
-	PINSRQ     $0x01, 112(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       16(SI), X8
-	PINSRQ     $0x01, 40(SI), X8
-	MOVQ       32(SI), X9
-	PINSRQ     $0x01, 120(SI), X9
-	MOVQ       48(SI), X10
-	PINSRQ     $0x01, 80(SI), X10
-	MOVQ       (SI), X11
-	PINSRQ     $0x01, 64(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       72(SI), X8
-	PINSRQ     $0x01, 40(SI), X8
-	MOVQ       16(SI), X9
-	PINSRQ     $0x01, 80(SI), X9
-	MOVQ       (SI), X10
-	PINSRQ     $0x01, 56(SI), X10
-	MOVQ       32(SI), X11
-	PINSRQ     $0x01, 120(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       112(SI), X8
-	PINSRQ     $0x01, 88(SI), X8
-	MOVQ       48(SI), X9
-	PINSRQ     $0x01, 24(SI), X9
-	MOVQ       8(SI), X10
-	PINSRQ     $0x01, 96(SI), X10
-	MOVQ       64(SI), X11
-	PINSRQ     $0x01, 104(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       16(SI), X8
-	PINSRQ     $0x01, 48(SI), X8
-	MOVQ       (SI), X9
-	PINSRQ     $0x01, 64(SI), X9
-	MOVQ       96(SI), X10
-	PINSRQ     $0x01, 80(SI), X10
-	MOVQ       88(SI), X11
-	PINSRQ     $0x01, 24(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       32(SI), X8
-	PINSRQ     $0x01, 56(SI), X8
-	MOVQ       120(SI), X9
-	PINSRQ     $0x01, 8(SI), X9
-	MOVQ       104(SI), X10
-	PINSRQ     $0x01, 40(SI), X10
-	MOVQ       112(SI), X11
-	PINSRQ     $0x01, 72(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       96(SI), X8
-	PINSRQ     $0x01, 8(SI), X8
-	MOVQ       112(SI), X9
-	PINSRQ     $0x01, 32(SI), X9
-	MOVQ       40(SI), X10
-	PINSRQ     $0x01, 120(SI), X10
-	MOVQ       104(SI), X11
-	PINSRQ     $0x01, 80(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       (SI), X8
-	PINSRQ     $0x01, 48(SI), X8
-	MOVQ       72(SI), X9
-	PINSRQ     $0x01, 64(SI), X9
-	MOVQ       56(SI), X10
-	PINSRQ     $0x01, 24(SI), X10
-	MOVQ       16(SI), X11
-	PINSRQ     $0x01, 88(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       104(SI), X8
-	PINSRQ     $0x01, 56(SI), X8
-	MOVQ       96(SI), X9
-	PINSRQ     $0x01, 24(SI), X9
-	MOVQ       88(SI), X10
-	PINSRQ     $0x01, 112(SI), X10
-	MOVQ       8(SI), X11
-	PINSRQ     $0x01, 72(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       40(SI), X8
-	PINSRQ     $0x01, 120(SI), X8
-	MOVQ       64(SI), X9
-	PINSRQ     $0x01, 16(SI), X9
-	MOVQ       (SI), X10
-	PINSRQ     $0x01, 32(SI), X10
-	MOVQ       48(SI), X11
-	PINSRQ     $0x01, 80(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       48(SI), X8
-	PINSRQ     $0x01, 112(SI), X8
-	MOVQ       88(SI), X9
-	PINSRQ     $0x01, (SI), X9
-	MOVQ       120(SI), X10
-	PINSRQ     $0x01, 72(SI), X10
-	MOVQ       24(SI), X11
-	PINSRQ     $0x01, 64(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       96(SI), X8
-	PINSRQ     $0x01, 104(SI), X8
-	MOVQ       8(SI), X9
-	PINSRQ     $0x01, 80(SI), X9
-	MOVQ       16(SI), X10
-	PINSRQ     $0x01, 56(SI), X10
-	MOVQ       32(SI), X11
-	PINSRQ     $0x01, 40(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVQ       80(SI), X8
-	PINSRQ     $0x01, 64(SI), X8
-	MOVQ       56(SI), X9
-	PINSRQ     $0x01, 8(SI), X9
-	MOVQ       16(SI), X10
-	PINSRQ     $0x01, 32(SI), X10
-	MOVQ       48(SI), X11
-	PINSRQ     $0x01, 40(SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	MOVQ       120(SI), X8
-	PINSRQ     $0x01, 72(SI), X8
-	MOVQ       24(SI), X9
-	PINSRQ     $0x01, 104(SI), X9
-	MOVQ       88(SI), X10
-	PINSRQ     $0x01, 112(SI), X10
-	MOVQ       96(SI), X11
-	PINSRQ     $0x01, (SI), X11
-	PADDQ      X8, X0
-	PADDQ      X9, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      X10, X0
-	PADDQ      X11, X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	PADDQ      16(R10), X0
-	PADDQ      32(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      48(R10), X0
-	PADDQ      64(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	PADDQ      80(R10), X0
-	PADDQ      96(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      112(R10), X0
-	PADDQ      128(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	PADDQ      144(R10), X0
-	PADDQ      160(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      176(R10), X0
-	PADDQ      192(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X6, X8
-	PUNPCKLQDQ X6, X9
-	PUNPCKHQDQ X7, X6
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X7, X9
-	MOVO       X8, X7
-	MOVO       X2, X8
-	PUNPCKHQDQ X9, X7
-	PUNPCKLQDQ X3, X9
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X3
-	PADDQ      208(R10), X0
-	PADDQ      224(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFD     $0xb1, X6, X6
-	PSHUFD     $0xb1, X7, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	PSHUFB     X13, X2
-	PSHUFB     X13, X3
-	PADDQ      240(R10), X0
-	PADDQ      256(R10), X1
-	PADDQ      X2, X0
-	PADDQ      X3, X1
-	PXOR       X0, X6
-	PXOR       X1, X7
-	PSHUFB     X14, X6
-	PSHUFB     X14, X7
-	PADDQ      X6, X4
-	PADDQ      X7, X5
-	PXOR       X4, X2
-	PXOR       X5, X3
-	MOVOU      X2, X11
-	PADDQ      X2, X11
-	PSRLQ      $0x3f, X2
-	PXOR       X11, X2
-	MOVOU      X3, X11
-	PADDQ      X3, X11
-	PSRLQ      $0x3f, X3
-	PXOR       X11, X3
-	MOVO       X4, X8
-	MOVO       X5, X4
-	MOVO       X8, X5
-	MOVO       X2, X8
-	PUNPCKLQDQ X2, X9
-	PUNPCKHQDQ X3, X2
-	PUNPCKHQDQ X9, X2
-	PUNPCKLQDQ X3, X9
-	MOVO       X8, X3
-	MOVO       X6, X8
-	PUNPCKHQDQ X9, X3
-	PUNPCKLQDQ X7, X9
-	PUNPCKHQDQ X9, X6
-	PUNPCKLQDQ X8, X9
-	PUNPCKHQDQ X9, X7
-	MOVOU      32(AX), X10
-	MOVOU      48(AX), X11
-	PXOR       X0, X12
-	PXOR       X1, X15
-	PXOR       X2, X10
-	PXOR       X3, X11
-	PXOR       X4, X12
-	PXOR       X5, X15
-	PXOR       X6, X10
-	PXOR       X7, X11
-	MOVOU      X10, 32(AX)
-	MOVOU      X11, 48(AX)
-	LEAQ       128(SI), SI
-	SUBQ       $0x80, DI
-	JNE        loop
-	MOVOU      X12, (AX)
-	MOVOU      X15, 16(AX)
-	MOVQ       R8, (BX)
-	MOVQ       R9, 8(BX)
-	RET
-
-DATA ·iv3<>+0(SB)/8, $0x1f83d9abfb41bd6b
-DATA ·iv3<>+8(SB)/8, $0x5be0cd19137e2179
-GLOBL ·iv3<>(SB), RODATA|NOPTR, $16
-
-DATA ·c40<>+0(SB)/8, $0x0201000706050403
-DATA ·c40<>+8(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·c40<>(SB), RODATA|NOPTR, $16
-
-DATA ·c48<>+0(SB)/8, $0x0100070605040302
-DATA ·c48<>+8(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·c48<>(SB), RODATA|NOPTR, $16
-
-DATA ·iv0<>+0(SB)/8, $0x6a09e667f3bcc908
-DATA ·iv0<>+8(SB)/8, $0xbb67ae8584caa73b
-GLOBL ·iv0<>(SB), RODATA|NOPTR, $16
-
-DATA ·iv1<>+0(SB)/8, $0x3c6ef372fe94f82b
-DATA ·iv1<>+8(SB)/8, $0xa54ff53a5f1d36f1
-GLOBL ·iv1<>(SB), RODATA|NOPTR, $16
-
-DATA ·iv2<>+0(SB)/8, $0x510e527fade682d1
-DATA ·iv2<>+8(SB)/8, $0x9b05688c2b3e6c1f
-GLOBL ·iv2<>(SB), RODATA|NOPTR, $16
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2b_generic.go b/vendor/golang.org/x/crypto/blake2b/blake2b_generic.go
deleted file mode 100644
index 3168a8aa3..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2b_generic.go
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2b
-
-import (
-	"encoding/binary"
-	"math/bits"
-)
-
-// the precomputed values for BLAKE2b
-// there are 12 16-byte arrays - one for each round
-// the entries are calculated from the sigma constants.
-var precomputed = [12][16]byte{
-	{0, 2, 4, 6, 1, 3, 5, 7, 8, 10, 12, 14, 9, 11, 13, 15},
-	{14, 4, 9, 13, 10, 8, 15, 6, 1, 0, 11, 5, 12, 2, 7, 3},
-	{11, 12, 5, 15, 8, 0, 2, 13, 10, 3, 7, 9, 14, 6, 1, 4},
-	{7, 3, 13, 11, 9, 1, 12, 14, 2, 5, 4, 15, 6, 10, 0, 8},
-	{9, 5, 2, 10, 0, 7, 4, 15, 14, 11, 6, 3, 1, 12, 8, 13},
-	{2, 6, 0, 8, 12, 10, 11, 3, 4, 7, 15, 1, 13, 5, 14, 9},
-	{12, 1, 14, 4, 5, 15, 13, 10, 0, 6, 9, 8, 7, 3, 2, 11},
-	{13, 7, 12, 3, 11, 14, 1, 9, 5, 15, 8, 2, 0, 4, 6, 10},
-	{6, 14, 11, 0, 15, 9, 3, 8, 12, 13, 1, 10, 2, 7, 4, 5},
-	{10, 8, 7, 1, 2, 4, 6, 5, 15, 9, 3, 13, 11, 14, 12, 0},
-	{0, 2, 4, 6, 1, 3, 5, 7, 8, 10, 12, 14, 9, 11, 13, 15}, // equal to the first
-	{14, 4, 9, 13, 10, 8, 15, 6, 1, 0, 11, 5, 12, 2, 7, 3}, // equal to the second
-}
-
-func hashBlocksGeneric(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	var m [16]uint64
-	c0, c1 := c[0], c[1]
-
-	for i := 0; i < len(blocks); {
-		c0 += BlockSize
-		if c0 < BlockSize {
-			c1++
-		}
-
-		v0, v1, v2, v3, v4, v5, v6, v7 := h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7]
-		v8, v9, v10, v11, v12, v13, v14, v15 := iv[0], iv[1], iv[2], iv[3], iv[4], iv[5], iv[6], iv[7]
-		v12 ^= c0
-		v13 ^= c1
-		v14 ^= flag
-
-		for j := range m {
-			m[j] = binary.LittleEndian.Uint64(blocks[i:])
-			i += 8
-		}
-
-		for j := range precomputed {
-			s := &(precomputed[j])
-
-			v0 += m[s[0]]
-			v0 += v4
-			v12 ^= v0
-			v12 = bits.RotateLeft64(v12, -32)
-			v8 += v12
-			v4 ^= v8
-			v4 = bits.RotateLeft64(v4, -24)
-			v1 += m[s[1]]
-			v1 += v5
-			v13 ^= v1
-			v13 = bits.RotateLeft64(v13, -32)
-			v9 += v13
-			v5 ^= v9
-			v5 = bits.RotateLeft64(v5, -24)
-			v2 += m[s[2]]
-			v2 += v6
-			v14 ^= v2
-			v14 = bits.RotateLeft64(v14, -32)
-			v10 += v14
-			v6 ^= v10
-			v6 = bits.RotateLeft64(v6, -24)
-			v3 += m[s[3]]
-			v3 += v7
-			v15 ^= v3
-			v15 = bits.RotateLeft64(v15, -32)
-			v11 += v15
-			v7 ^= v11
-			v7 = bits.RotateLeft64(v7, -24)
-
-			v0 += m[s[4]]
-			v0 += v4
-			v12 ^= v0
-			v12 = bits.RotateLeft64(v12, -16)
-			v8 += v12
-			v4 ^= v8
-			v4 = bits.RotateLeft64(v4, -63)
-			v1 += m[s[5]]
-			v1 += v5
-			v13 ^= v1
-			v13 = bits.RotateLeft64(v13, -16)
-			v9 += v13
-			v5 ^= v9
-			v5 = bits.RotateLeft64(v5, -63)
-			v2 += m[s[6]]
-			v2 += v6
-			v14 ^= v2
-			v14 = bits.RotateLeft64(v14, -16)
-			v10 += v14
-			v6 ^= v10
-			v6 = bits.RotateLeft64(v6, -63)
-			v3 += m[s[7]]
-			v3 += v7
-			v15 ^= v3
-			v15 = bits.RotateLeft64(v15, -16)
-			v11 += v15
-			v7 ^= v11
-			v7 = bits.RotateLeft64(v7, -63)
-
-			v0 += m[s[8]]
-			v0 += v5
-			v15 ^= v0
-			v15 = bits.RotateLeft64(v15, -32)
-			v10 += v15
-			v5 ^= v10
-			v5 = bits.RotateLeft64(v5, -24)
-			v1 += m[s[9]]
-			v1 += v6
-			v12 ^= v1
-			v12 = bits.RotateLeft64(v12, -32)
-			v11 += v12
-			v6 ^= v11
-			v6 = bits.RotateLeft64(v6, -24)
-			v2 += m[s[10]]
-			v2 += v7
-			v13 ^= v2
-			v13 = bits.RotateLeft64(v13, -32)
-			v8 += v13
-			v7 ^= v8
-			v7 = bits.RotateLeft64(v7, -24)
-			v3 += m[s[11]]
-			v3 += v4
-			v14 ^= v3
-			v14 = bits.RotateLeft64(v14, -32)
-			v9 += v14
-			v4 ^= v9
-			v4 = bits.RotateLeft64(v4, -24)
-
-			v0 += m[s[12]]
-			v0 += v5
-			v15 ^= v0
-			v15 = bits.RotateLeft64(v15, -16)
-			v10 += v15
-			v5 ^= v10
-			v5 = bits.RotateLeft64(v5, -63)
-			v1 += m[s[13]]
-			v1 += v6
-			v12 ^= v1
-			v12 = bits.RotateLeft64(v12, -16)
-			v11 += v12
-			v6 ^= v11
-			v6 = bits.RotateLeft64(v6, -63)
-			v2 += m[s[14]]
-			v2 += v7
-			v13 ^= v2
-			v13 = bits.RotateLeft64(v13, -16)
-			v8 += v13
-			v7 ^= v8
-			v7 = bits.RotateLeft64(v7, -63)
-			v3 += m[s[15]]
-			v3 += v4
-			v14 ^= v3
-			v14 = bits.RotateLeft64(v14, -16)
-			v9 += v14
-			v4 ^= v9
-			v4 = bits.RotateLeft64(v4, -63)
-
-		}
-
-		h[0] ^= v0 ^ v8
-		h[1] ^= v1 ^ v9
-		h[2] ^= v2 ^ v10
-		h[3] ^= v3 ^ v11
-		h[4] ^= v4 ^ v12
-		h[5] ^= v5 ^ v13
-		h[6] ^= v6 ^ v14
-		h[7] ^= v7 ^ v15
-	}
-	c[0], c[1] = c0, c1
-}
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2b_ref.go b/vendor/golang.org/x/crypto/blake2b/blake2b_ref.go
deleted file mode 100644
index 6e28668cd..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2b_ref.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !amd64 || purego || !gc
-
-package blake2b
-
-func hashBlocks(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	hashBlocksGeneric(h, c, flag, blocks)
-}
diff --git a/vendor/golang.org/x/crypto/blake2b/blake2x.go b/vendor/golang.org/x/crypto/blake2b/blake2x.go
deleted file mode 100644
index 7692bb346..000000000
--- a/vendor/golang.org/x/crypto/blake2b/blake2x.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2b
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-// XOF defines the interface to hash functions that
-// support arbitrary-length output.
-//
-// New callers should prefer the standard library [hash.XOF].
-type XOF interface {
-	// Write absorbs more data into the hash's state. It panics if called
-	// after Read.
-	io.Writer
-
-	// Read reads more output from the hash. It returns io.EOF if the limit
-	// has been reached.
-	io.Reader
-
-	// Clone returns a copy of the XOF in its current state.
-	Clone() XOF
-
-	// Reset resets the XOF to its initial state.
-	Reset()
-}
-
-// OutputLengthUnknown can be used as the size argument to NewXOF to indicate
-// the length of the output is not known in advance.
-const OutputLengthUnknown = 0
-
-// magicUnknownOutputLength is a magic value for the output size that indicates
-// an unknown number of output bytes.
-const magicUnknownOutputLength = (1 << 32) - 1
-
-// maxOutputLength is the absolute maximum number of bytes to produce when the
-// number of output bytes is unknown.
-const maxOutputLength = (1 << 32) * 64
-
-// NewXOF creates a new variable-output-length hash. The hash either produce a
-// known number of bytes (1 <= size < 2**32-1), or an unknown number of bytes
-// (size == OutputLengthUnknown). In the latter case, an absolute limit of
-// 256GiB applies.
-//
-// A non-nil key turns the hash into a MAC. The key must between
-// zero and 32 bytes long.
-//
-// The result can be safely interface-upgraded to [hash.XOF].
-func NewXOF(size uint32, key []byte) (XOF, error) {
-	if len(key) > Size {
-		return nil, errKeySize
-	}
-	if size == magicUnknownOutputLength {
-		// 2^32-1 indicates an unknown number of bytes and thus isn't a
-		// valid length.
-		return nil, errors.New("blake2b: XOF length too large")
-	}
-	if size == OutputLengthUnknown {
-		size = magicUnknownOutputLength
-	}
-	x := &xof{
-		d: digest{
-			size:   Size,
-			keyLen: len(key),
-		},
-		length: size,
-	}
-	copy(x.d.key[:], key)
-	x.Reset()
-	return x, nil
-}
-
-type xof struct {
-	d                digest
-	length           uint32
-	remaining        uint64
-	cfg, root, block [Size]byte
-	offset           int
-	nodeOffset       uint32
-	readMode         bool
-}
-
-func (x *xof) Write(p []byte) (n int, err error) {
-	if x.readMode {
-		panic("blake2b: write to XOF after read")
-	}
-	return x.d.Write(p)
-}
-
-func (x *xof) Clone() XOF {
-	clone := *x
-	return &clone
-}
-
-func (x *xof) BlockSize() int {
-	return x.d.BlockSize()
-}
-
-func (x *xof) Reset() {
-	x.cfg[0] = byte(Size)
-	binary.LittleEndian.PutUint32(x.cfg[4:], uint32(Size)) // leaf length
-	binary.LittleEndian.PutUint32(x.cfg[12:], x.length)    // XOF length
-	x.cfg[17] = byte(Size)                                 // inner hash size
-
-	x.d.Reset()
-	x.d.h[1] ^= uint64(x.length) << 32
-
-	x.remaining = uint64(x.length)
-	if x.remaining == magicUnknownOutputLength {
-		x.remaining = maxOutputLength
-	}
-	x.offset, x.nodeOffset = 0, 0
-	x.readMode = false
-}
-
-func (x *xof) Read(p []byte) (n int, err error) {
-	if !x.readMode {
-		x.d.finalize(&x.root)
-		x.readMode = true
-	}
-
-	if x.remaining == 0 {
-		return 0, io.EOF
-	}
-
-	n = len(p)
-	if uint64(n) > x.remaining {
-		n = int(x.remaining)
-		p = p[:n]
-	}
-
-	if x.offset > 0 {
-		blockRemaining := Size - x.offset
-		if n < blockRemaining {
-			x.offset += copy(p, x.block[x.offset:])
-			x.remaining -= uint64(n)
-			return
-		}
-		copy(p, x.block[x.offset:])
-		p = p[blockRemaining:]
-		x.offset = 0
-		x.remaining -= uint64(blockRemaining)
-	}
-
-	for len(p) >= Size {
-		binary.LittleEndian.PutUint32(x.cfg[8:], x.nodeOffset)
-		x.nodeOffset++
-
-		x.d.initConfig(&x.cfg)
-		x.d.Write(x.root[:])
-		x.d.finalize(&x.block)
-
-		copy(p, x.block[:])
-		p = p[Size:]
-		x.remaining -= uint64(Size)
-	}
-
-	if todo := len(p); todo > 0 {
-		if x.remaining < uint64(Size) {
-			x.cfg[0] = byte(x.remaining)
-		}
-		binary.LittleEndian.PutUint32(x.cfg[8:], x.nodeOffset)
-		x.nodeOffset++
-
-		x.d.initConfig(&x.cfg)
-		x.d.Write(x.root[:])
-		x.d.finalize(&x.block)
-
-		x.offset = copy(p, x.block[:todo])
-		x.remaining -= uint64(todo)
-	}
-	return
-}
-
-func (d *digest) initConfig(cfg *[Size]byte) {
-	d.offset, d.c[0], d.c[1] = 0, 0, 0
-	for i := range d.h {
-		d.h[i] = iv[i] ^ binary.LittleEndian.Uint64(cfg[i*8:])
-	}
-}
diff --git a/vendor/golang.org/x/crypto/blake2b/go125.go b/vendor/golang.org/x/crypto/blake2b/go125.go
deleted file mode 100644
index 67e990b7e..000000000
--- a/vendor/golang.org/x/crypto/blake2b/go125.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.25
-
-package blake2b
-
-import "hash"
-
-var _ hash.XOF = (*xof)(nil)
diff --git a/vendor/golang.org/x/crypto/blake2b/register.go b/vendor/golang.org/x/crypto/blake2b/register.go
deleted file mode 100644
index 54e446e1d..000000000
--- a/vendor/golang.org/x/crypto/blake2b/register.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2b
-
-import (
-	"crypto"
-	"hash"
-)
-
-func init() {
-	newHash256 := func() hash.Hash {
-		h, _ := New256(nil)
-		return h
-	}
-	newHash384 := func() hash.Hash {
-		h, _ := New384(nil)
-		return h
-	}
-
-	newHash512 := func() hash.Hash {
-		h, _ := New512(nil)
-		return h
-	}
-
-	crypto.RegisterHash(crypto.BLAKE2b_256, newHash256)
-	crypto.RegisterHash(crypto.BLAKE2b_384, newHash384)
-	crypto.RegisterHash(crypto.BLAKE2b_512, newHash512)
-}
diff --git a/vendor/golang.org/x/crypto/blowfish/block.go b/vendor/golang.org/x/crypto/blowfish/block.go
deleted file mode 100644
index 9d80f1952..000000000
--- a/vendor/golang.org/x/crypto/blowfish/block.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blowfish
-
-// getNextWord returns the next big-endian uint32 value from the byte slice
-// at the given position in a circular manner, updating the position.
-func getNextWord(b []byte, pos *int) uint32 {
-	var w uint32
-	j := *pos
-	for i := 0; i < 4; i++ {
-		w = w<<8 | uint32(b[j])
-		j++
-		if j >= len(b) {
-			j = 0
-		}
-	}
-	*pos = j
-	return w
-}
-
-// ExpandKey performs a key expansion on the given *Cipher. Specifically, it
-// performs the Blowfish algorithm's key schedule which sets up the *Cipher's
-// pi and substitution tables for calls to Encrypt. This is used, primarily,
-// by the bcrypt package to reuse the Blowfish key schedule during its
-// set up. It's unlikely that you need to use this directly.
-func ExpandKey(key []byte, c *Cipher) {
-	j := 0
-	for i := 0; i < 18; i++ {
-		// Using inlined getNextWord for performance.
-		var d uint32
-		for k := 0; k < 4; k++ {
-			d = d<<8 | uint32(key[j])
-			j++
-			if j >= len(key) {
-				j = 0
-			}
-		}
-		c.p[i] ^= d
-	}
-
-	var l, r uint32
-	for i := 0; i < 18; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.p[i], c.p[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s0[i], c.s0[i+1] = l, r
-	}
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s1[i], c.s1[i+1] = l, r
-	}
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s2[i], c.s2[i+1] = l, r
-	}
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s3[i], c.s3[i+1] = l, r
-	}
-}
-
-// This is similar to ExpandKey, but folds the salt during the key
-// schedule. While ExpandKey is essentially expandKeyWithSalt with an all-zero
-// salt passed in, reusing ExpandKey turns out to be a place of inefficiency
-// and specializing it here is useful.
-func expandKeyWithSalt(key []byte, salt []byte, c *Cipher) {
-	j := 0
-	for i := 0; i < 18; i++ {
-		c.p[i] ^= getNextWord(key, &j)
-	}
-
-	j = 0
-	var l, r uint32
-	for i := 0; i < 18; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.p[i], c.p[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s0[i], c.s0[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s1[i], c.s1[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s2[i], c.s2[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s3[i], c.s3[i+1] = l, r
-	}
-}
-
-func encryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
-	xl, xr := l, r
-	xl ^= c.p[0]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[1]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[2]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[3]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[4]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[5]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[6]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[7]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[8]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[9]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[10]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[11]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[12]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[13]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[14]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[15]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[16]
-	xr ^= c.p[17]
-	return xr, xl
-}
-
-func decryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
-	xl, xr := l, r
-	xl ^= c.p[17]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[16]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[15]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[14]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[13]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[12]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[11]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[10]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[9]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[8]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[7]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[6]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[5]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[4]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[3]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[2]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[1]
-	xr ^= c.p[0]
-	return xr, xl
-}
diff --git a/vendor/golang.org/x/crypto/blowfish/cipher.go b/vendor/golang.org/x/crypto/blowfish/cipher.go
deleted file mode 100644
index 089895680..000000000
--- a/vendor/golang.org/x/crypto/blowfish/cipher.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package blowfish implements Bruce Schneier's Blowfish encryption algorithm.
-//
-// Blowfish is a legacy cipher and its short block size makes it vulnerable to
-// birthday bound attacks (see https://sweet32.info). It should only be used
-// where compatibility with legacy systems, not security, is the goal.
-//
-// Deprecated: any new system should use AES (from crypto/aes, if necessary in
-// an AEAD mode like crypto/cipher.NewGCM) or XChaCha20-Poly1305 (from
-// golang.org/x/crypto/chacha20poly1305).
-package blowfish
-
-// The code is a port of Bruce Schneier's C implementation.
-// See https://www.schneier.com/blowfish.html.
-
-import "strconv"
-
-// The Blowfish block size in bytes.
-const BlockSize = 8
-
-// A Cipher is an instance of Blowfish encryption using a particular key.
-type Cipher struct {
-	p              [18]uint32
-	s0, s1, s2, s3 [256]uint32
-}
-
-type KeySizeError int
-
-func (k KeySizeError) Error() string {
-	return "crypto/blowfish: invalid key size " + strconv.Itoa(int(k))
-}
-
-// NewCipher creates and returns a Cipher.
-// The key argument should be the Blowfish key, from 1 to 56 bytes.
-func NewCipher(key []byte) (*Cipher, error) {
-	var result Cipher
-	if k := len(key); k < 1 || k > 56 {
-		return nil, KeySizeError(k)
-	}
-	initCipher(&result)
-	ExpandKey(key, &result)
-	return &result, nil
-}
-
-// NewSaltedCipher creates a returns a Cipher that folds a salt into its key
-// schedule. For most purposes, NewCipher, instead of NewSaltedCipher, is
-// sufficient and desirable. For bcrypt compatibility, the key can be over 56
-// bytes.
-func NewSaltedCipher(key, salt []byte) (*Cipher, error) {
-	if len(salt) == 0 {
-		return NewCipher(key)
-	}
-	var result Cipher
-	if k := len(key); k < 1 {
-		return nil, KeySizeError(k)
-	}
-	initCipher(&result)
-	expandKeyWithSalt(key, salt, &result)
-	return &result, nil
-}
-
-// BlockSize returns the Blowfish block size, 8 bytes.
-// It is necessary to satisfy the Block interface in the
-// package "crypto/cipher".
-func (c *Cipher) BlockSize() int { return BlockSize }
-
-// Encrypt encrypts the 8-byte buffer src using the key k
-// and stores the result in dst.
-// Note that for amounts of data larger than a block,
-// it is not safe to just call Encrypt on successive blocks;
-// instead, use an encryption mode like CBC (see crypto/cipher/cbc.go).
-func (c *Cipher) Encrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-	l, r = encryptBlock(l, r, c)
-	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
-	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
-}
-
-// Decrypt decrypts the 8-byte buffer src using the key k
-// and stores the result in dst.
-func (c *Cipher) Decrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-	l, r = decryptBlock(l, r, c)
-	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
-	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
-}
-
-func initCipher(c *Cipher) {
-	copy(c.p[0:], p[0:])
-	copy(c.s0[0:], s0[0:])
-	copy(c.s1[0:], s1[0:])
-	copy(c.s2[0:], s2[0:])
-	copy(c.s3[0:], s3[0:])
-}
diff --git a/vendor/golang.org/x/crypto/blowfish/const.go b/vendor/golang.org/x/crypto/blowfish/const.go
deleted file mode 100644
index d04077595..000000000
--- a/vendor/golang.org/x/crypto/blowfish/const.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The startup permutation array and substitution boxes.
-// They are the hexadecimal digits of PI; see:
-// https://www.schneier.com/code/constants.txt.
-
-package blowfish
-
-var s0 = [256]uint32{
-	0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96,
-	0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-	0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658,
-	0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-	0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
-	0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-	0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6,
-	0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-	0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c,
-	0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-	0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
-	0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-	0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a,
-	0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-	0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176,
-	0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-	0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706,
-	0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-	0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b,
-	0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-	0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c,
-	0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-	0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a,
-	0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-	0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760,
-	0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-	0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8,
-	0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-	0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33,
-	0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-	0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0,
-	0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-	0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
-	0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-	0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705,
-	0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-	0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e,
-	0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-	0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9,
-	0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-	0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f,
-	0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-	0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
-}
-
-var s1 = [256]uint32{
-	0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d,
-	0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-	0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65,
-	0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-	0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
-	0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-	0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d,
-	0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-	0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
-	0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-	0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
-	0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-	0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124,
-	0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-	0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908,
-	0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-	0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b,
-	0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-	0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
-	0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-	0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d,
-	0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-	0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5,
-	0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-	0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96,
-	0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-	0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
-	0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-	0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
-	0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-	0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054,
-	0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-	0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
-	0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-	0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646,
-	0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-	0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea,
-	0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-	0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
-	0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-	0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd,
-	0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-	0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
-}
-
-var s2 = [256]uint32{
-	0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7,
-	0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-	0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af,
-	0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-	0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4,
-	0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-	0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec,
-	0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-	0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332,
-	0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-	0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
-	0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-	0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22,
-	0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-	0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60,
-	0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-	0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99,
-	0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-	0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74,
-	0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-	0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3,
-	0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-	0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979,
-	0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-	0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa,
-	0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-	0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086,
-	0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-	0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24,
-	0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-	0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84,
-	0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-	0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
-	0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-	0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe,
-	0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-	0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0,
-	0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-	0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188,
-	0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-	0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8,
-	0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-	0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
-}
-
-var s3 = [256]uint32{
-	0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742,
-	0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-	0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79,
-	0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-	0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a,
-	0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-	0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1,
-	0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-	0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797,
-	0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-	0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
-	0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-	0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba,
-	0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-	0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5,
-	0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-	0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce,
-	0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-	0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd,
-	0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-	0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb,
-	0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-	0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc,
-	0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-	0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc,
-	0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-	0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
-	0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-	0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a,
-	0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-	0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b,
-	0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-	0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
-	0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-	0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623,
-	0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-	0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a,
-	0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-	0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3,
-	0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-	0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c,
-	0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-	0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6,
-}
-
-var p = [18]uint32{
-	0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
-	0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-	0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b,
-}
diff --git a/vendor/golang.org/x/crypto/cast5/cast5.go b/vendor/golang.org/x/crypto/cast5/cast5.go
deleted file mode 100644
index 016e90215..000000000
--- a/vendor/golang.org/x/crypto/cast5/cast5.go
+++ /dev/null
@@ -1,536 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cast5 implements CAST5, as defined in RFC 2144.
-//
-// CAST5 is a legacy cipher and its short block size makes it vulnerable to
-// birthday bound attacks (see https://sweet32.info). It should only be used
-// where compatibility with legacy systems, not security, is the goal.
-//
-// Deprecated: any new system should use AES (from crypto/aes, if necessary in
-// an AEAD mode like crypto/cipher.NewGCM) or XChaCha20-Poly1305 (from
-// golang.org/x/crypto/chacha20poly1305).
-package cast5
-
-import (
-	"errors"
-	"math/bits"
-)
-
-const BlockSize = 8
-const KeySize = 16
-
-type Cipher struct {
-	masking [16]uint32
-	rotate  [16]uint8
-}
-
-func NewCipher(key []byte) (c *Cipher, err error) {
-	if len(key) != KeySize {
-		return nil, errors.New("CAST5: keys must be 16 bytes")
-	}
-
-	c = new(Cipher)
-	c.keySchedule(key)
-	return
-}
-
-func (c *Cipher) BlockSize() int {
-	return BlockSize
-}
-
-func (c *Cipher) Encrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-
-	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
-	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
-	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-
-	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
-	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
-	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-
-	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
-	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
-	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-
-	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
-	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
-	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-
-	dst[0] = uint8(r >> 24)
-	dst[1] = uint8(r >> 16)
-	dst[2] = uint8(r >> 8)
-	dst[3] = uint8(r)
-	dst[4] = uint8(l >> 24)
-	dst[5] = uint8(l >> 16)
-	dst[6] = uint8(l >> 8)
-	dst[7] = uint8(l)
-}
-
-func (c *Cipher) Decrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-
-	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
-	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
-	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-
-	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
-	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
-	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-
-	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
-	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
-	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-
-	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
-	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
-	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-
-	dst[0] = uint8(r >> 24)
-	dst[1] = uint8(r >> 16)
-	dst[2] = uint8(r >> 8)
-	dst[3] = uint8(r)
-	dst[4] = uint8(l >> 24)
-	dst[5] = uint8(l >> 16)
-	dst[6] = uint8(l >> 8)
-	dst[7] = uint8(l)
-}
-
-type keyScheduleA [4][7]uint8
-type keyScheduleB [4][5]uint8
-
-// keyScheduleRound contains the magic values for a round of the key schedule.
-// The keyScheduleA deals with the lines like:
-//   z0z1z2z3 = x0x1x2x3 ^ S5[xD] ^ S6[xF] ^ S7[xC] ^ S8[xE] ^ S7[x8]
-// Conceptually, both x and z are in the same array, x first. The first
-// element describes which word of this array gets written to and the
-// second, which word gets read. So, for the line above, it's "4, 0", because
-// it's writing to the first word of z, which, being after x, is word 4, and
-// reading from the first word of x: word 0.
-//
-// Next are the indexes into the S-boxes. Now the array is treated as bytes. So
-// "xD" is 0xd. The first byte of z is written as "16 + 0", just to be clear
-// that it's z that we're indexing.
-//
-// keyScheduleB deals with lines like:
-//   K1 = S5[z8] ^ S6[z9] ^ S7[z7] ^ S8[z6] ^ S5[z2]
-// "K1" is ignored because key words are always written in order. So the five
-// elements are the S-box indexes. They use the same form as in keyScheduleA,
-// above.
-
-type keyScheduleRound struct{}
-type keySchedule []keyScheduleRound
-
-var schedule = []struct {
-	a keyScheduleA
-	b keyScheduleB
-}{
-	{
-		keyScheduleA{
-			{4, 0, 0xd, 0xf, 0xc, 0xe, 0x8},
-			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
-			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
-			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
-		},
-		keyScheduleB{
-			{16 + 8, 16 + 9, 16 + 7, 16 + 6, 16 + 2},
-			{16 + 0xa, 16 + 0xb, 16 + 5, 16 + 4, 16 + 6},
-			{16 + 0xc, 16 + 0xd, 16 + 3, 16 + 2, 16 + 9},
-			{16 + 0xe, 16 + 0xf, 16 + 1, 16 + 0, 16 + 0xc},
-		},
-	},
-	{
-		keyScheduleA{
-			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
-			{1, 4, 0, 2, 1, 3, 16 + 2},
-			{2, 5, 7, 6, 5, 4, 16 + 1},
-			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
-		},
-		keyScheduleB{
-			{3, 2, 0xc, 0xd, 8},
-			{1, 0, 0xe, 0xf, 0xd},
-			{7, 6, 8, 9, 3},
-			{5, 4, 0xa, 0xb, 7},
-		},
-	},
-	{
-		keyScheduleA{
-			{4, 0, 0xd, 0xf, 0xc, 0xe, 8},
-			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
-			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
-			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
-		},
-		keyScheduleB{
-			{16 + 3, 16 + 2, 16 + 0xc, 16 + 0xd, 16 + 9},
-			{16 + 1, 16 + 0, 16 + 0xe, 16 + 0xf, 16 + 0xc},
-			{16 + 7, 16 + 6, 16 + 8, 16 + 9, 16 + 2},
-			{16 + 5, 16 + 4, 16 + 0xa, 16 + 0xb, 16 + 6},
-		},
-	},
-	{
-		keyScheduleA{
-			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
-			{1, 4, 0, 2, 1, 3, 16 + 2},
-			{2, 5, 7, 6, 5, 4, 16 + 1},
-			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
-		},
-		keyScheduleB{
-			{8, 9, 7, 6, 3},
-			{0xa, 0xb, 5, 4, 7},
-			{0xc, 0xd, 3, 2, 8},
-			{0xe, 0xf, 1, 0, 0xd},
-		},
-	},
-}
-
-func (c *Cipher) keySchedule(in []byte) {
-	var t [8]uint32
-	var k [32]uint32
-
-	for i := 0; i < 4; i++ {
-		j := i * 4
-		t[i] = uint32(in[j])<<24 | uint32(in[j+1])<<16 | uint32(in[j+2])<<8 | uint32(in[j+3])
-	}
-
-	x := []byte{6, 7, 4, 5}
-	ki := 0
-
-	for half := 0; half < 2; half++ {
-		for _, round := range schedule {
-			for j := 0; j < 4; j++ {
-				var a [7]uint8
-				copy(a[:], round.a[j][:])
-				w := t[a[1]]
-				w ^= sBox[4][(t[a[2]>>2]>>(24-8*(a[2]&3)))&0xff]
-				w ^= sBox[5][(t[a[3]>>2]>>(24-8*(a[3]&3)))&0xff]
-				w ^= sBox[6][(t[a[4]>>2]>>(24-8*(a[4]&3)))&0xff]
-				w ^= sBox[7][(t[a[5]>>2]>>(24-8*(a[5]&3)))&0xff]
-				w ^= sBox[x[j]][(t[a[6]>>2]>>(24-8*(a[6]&3)))&0xff]
-				t[a[0]] = w
-			}
-
-			for j := 0; j < 4; j++ {
-				var b [5]uint8
-				copy(b[:], round.b[j][:])
-				w := sBox[4][(t[b[0]>>2]>>(24-8*(b[0]&3)))&0xff]
-				w ^= sBox[5][(t[b[1]>>2]>>(24-8*(b[1]&3)))&0xff]
-				w ^= sBox[6][(t[b[2]>>2]>>(24-8*(b[2]&3)))&0xff]
-				w ^= sBox[7][(t[b[3]>>2]>>(24-8*(b[3]&3)))&0xff]
-				w ^= sBox[4+j][(t[b[4]>>2]>>(24-8*(b[4]&3)))&0xff]
-				k[ki] = w
-				ki++
-			}
-		}
-	}
-
-	for i := 0; i < 16; i++ {
-		c.masking[i] = k[i]
-		c.rotate[i] = uint8(k[16+i] & 0x1f)
-	}
-}
-
-// These are the three 'f' functions. See RFC 2144, section 2.2.
-func f1(d, m uint32, r uint8) uint32 {
-	t := m + d
-	I := bits.RotateLeft32(t, int(r))
-	return ((sBox[0][I>>24] ^ sBox[1][(I>>16)&0xff]) - sBox[2][(I>>8)&0xff]) + sBox[3][I&0xff]
-}
-
-func f2(d, m uint32, r uint8) uint32 {
-	t := m ^ d
-	I := bits.RotateLeft32(t, int(r))
-	return ((sBox[0][I>>24] - sBox[1][(I>>16)&0xff]) + sBox[2][(I>>8)&0xff]) ^ sBox[3][I&0xff]
-}
-
-func f3(d, m uint32, r uint8) uint32 {
-	t := m - d
-	I := bits.RotateLeft32(t, int(r))
-	return ((sBox[0][I>>24] + sBox[1][(I>>16)&0xff]) ^ sBox[2][(I>>8)&0xff]) - sBox[3][I&0xff]
-}
-
-var sBox = [8][256]uint32{
-	{
-		0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
-		0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
-		0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2, 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
-		0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f, 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
-		0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de, 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
-		0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f, 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
-		0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d, 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
-		0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165, 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
-		0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272, 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
-		0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d, 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
-		0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a, 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
-		0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f, 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
-		0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9, 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
-		0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6, 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
-		0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9, 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
-		0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e, 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
-		0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e, 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
-		0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82, 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
-		0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac, 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
-		0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f, 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
-		0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491, 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
-		0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de, 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
-		0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a, 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
-		0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79, 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
-		0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779, 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
-		0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755, 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
-		0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb, 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
-		0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
-		0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
-		0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
-		0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
-		0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
-	},
-	{
-		0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
-		0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
-		0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
-		0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
-		0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
-		0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
-		0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21, 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
-		0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d, 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
-		0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f, 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
-		0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d, 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
-		0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4, 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
-		0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801, 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
-		0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755, 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
-		0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709, 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
-		0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b, 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
-		0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c, 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
-		0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9, 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
-		0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3, 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
-		0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9, 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
-		0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab, 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
-		0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
-		0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
-		0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
-		0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
-		0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
-		0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
-		0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
-		0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
-		0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
-		0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
-		0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
-		0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
-	},
-	{
-		0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
-		0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
-		0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e, 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
-		0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc, 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
-		0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e, 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
-		0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f, 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
-		0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99, 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
-		0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f, 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
-		0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380, 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
-		0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8, 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
-		0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504, 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
-		0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6, 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
-		0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e, 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
-		0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d, 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
-		0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1, 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
-		0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c, 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
-		0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15, 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
-		0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4, 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
-		0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b, 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
-		0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392, 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
-		0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231, 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
-		0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889, 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
-		0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67, 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
-		0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49, 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
-		0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d, 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
-		0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d, 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
-		0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e, 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
-		0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767, 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
-		0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce, 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
-		0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24, 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
-		0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0, 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
-		0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5, 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783,
-	},
-	{
-		0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
-		0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
-		0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220, 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
-		0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe, 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
-		0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701, 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
-		0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b, 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
-		0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93, 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
-		0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746, 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
-		0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9, 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
-		0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb, 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
-		0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c, 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
-		0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7, 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
-		0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340, 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
-		0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327, 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
-		0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec, 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
-		0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205, 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
-		0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031, 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
-		0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5, 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
-		0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c, 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
-		0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69, 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
-		0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9, 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
-		0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff, 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
-		0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3, 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
-		0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2, 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
-		0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff, 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
-		0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091, 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
-		0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df, 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
-		0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf, 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
-		0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367, 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
-		0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c, 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
-		0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43, 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
-		0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e, 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2,
-	},
-	{
-		0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
-		0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
-		0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180, 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
-		0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2, 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
-		0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725, 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
-		0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b, 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
-		0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571, 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
-		0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec, 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
-		0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea, 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
-		0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263, 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
-		0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468, 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
-		0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b, 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
-		0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284, 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
-		0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4, 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
-		0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7, 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
-		0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce, 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
-		0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6, 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
-		0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4, 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
-		0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561, 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
-		0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6, 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
-		0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406, 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
-		0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472, 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
-		0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
-		0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
-		0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
-		0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
-		0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
-		0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
-		0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
-		0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2, 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
-		0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be, 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
-		0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55, 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4,
-	},
-	{
-		0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
-		0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
-		0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e, 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
-		0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866, 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
-		0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c, 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
-		0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd, 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
-		0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53, 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
-		0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d, 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
-		0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf, 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
-		0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807, 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
-		0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a, 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
-		0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563, 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
-		0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0, 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
-		0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be, 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
-		0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0, 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
-		0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
-		0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
-		0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
-		0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
-		0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
-		0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
-		0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
-		0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
-		0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
-		0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
-		0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
-		0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
-		0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab, 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
-		0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b, 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
-		0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b, 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
-		0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855, 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
-		0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454, 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f,
-	},
-	{
-		0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
-		0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
-		0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd, 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
-		0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f, 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
-		0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9, 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
-		0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e, 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
-		0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83, 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
-		0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e, 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
-		0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a, 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
-		0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f, 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
-		0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b, 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
-		0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78, 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
-		0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d, 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
-		0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802, 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
-		0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9, 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
-		0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302, 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
-		0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858, 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
-		0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a, 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
-		0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4, 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
-		0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df, 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
-		0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9, 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
-		0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c, 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
-		0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07, 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
-		0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939, 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
-		0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e, 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
-		0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378, 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
-		0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd, 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
-		0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567, 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
-		0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2, 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
-		0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf, 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
-		0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2, 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
-		0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada, 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3,
-	},
-	{
-		0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
-		0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
-		0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940, 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
-		0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42, 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
-		0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164, 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
-		0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4, 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
-		0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0, 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
-		0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6, 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
-		0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491, 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
-		0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b, 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
-		0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8, 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
-		0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006, 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
-		0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564, 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
-		0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab, 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
-		0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc, 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
-		0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8, 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
-		0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441, 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
-		0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f, 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
-		0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504, 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
-		0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c, 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
-		0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6, 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
-		0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd, 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
-		0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4, 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
-		0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc, 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
-		0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba, 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
-		0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf, 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
-		0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603, 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
-		0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37, 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
-		0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819, 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
-		0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d, 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
-		0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347, 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
-		0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d, 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e,
-	},
-}
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_arm64.go b/vendor/golang.org/x/crypto/chacha20/chacha_arm64.go
deleted file mode 100644
index 661ea132e..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_arm64.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-package chacha20
-
-const bufSize = 256
-
-//go:noescape
-func xorKeyStreamVX(dst, src []byte, key *[8]uint32, nonce *[3]uint32, counter *uint32)
-
-func (c *Cipher) xorKeyStreamBlocks(dst, src []byte) {
-	xorKeyStreamVX(dst, src, &c.key, &c.nonce, &c.counter)
-}
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s b/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s
deleted file mode 100644
index 769af387e..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-#include "textflag.h"
-
-#define NUM_ROUNDS 10
-
-// func xorKeyStreamVX(dst, src []byte, key *[8]uint32, nonce *[3]uint32, counter *uint32)
-TEXT ·xorKeyStreamVX(SB), NOSPLIT, $0
-	MOVD	dst+0(FP), R1
-	MOVD	src+24(FP), R2
-	MOVD	src_len+32(FP), R3
-	MOVD	key+48(FP), R4
-	MOVD	nonce+56(FP), R6
-	MOVD	counter+64(FP), R7
-
-	MOVD	$·constants(SB), R10
-	MOVD	$·incRotMatrix(SB), R11
-
-	MOVW	(R7), R20
-
-	AND	$~255, R3, R13
-	ADD	R2, R13, R12 // R12 for block end
-	AND	$255, R3, R13
-loop:
-	MOVD	$NUM_ROUNDS, R21
-	VLD1	(R11), [V30.S4, V31.S4]
-
-	// load constants
-	// VLD4R (R10), [V0.S4, V1.S4, V2.S4, V3.S4]
-	WORD	$0x4D60E940
-
-	// load keys
-	// VLD4R 16(R4), [V4.S4, V5.S4, V6.S4, V7.S4]
-	WORD	$0x4DFFE884
-	// VLD4R 16(R4), [V8.S4, V9.S4, V10.S4, V11.S4]
-	WORD	$0x4DFFE888
-	SUB	$32, R4
-
-	// load counter + nonce
-	// VLD1R (R7), [V12.S4]
-	WORD	$0x4D40C8EC
-
-	// VLD3R (R6), [V13.S4, V14.S4, V15.S4]
-	WORD	$0x4D40E8CD
-
-	// update counter
-	VADD	V30.S4, V12.S4, V12.S4
-
-chacha:
-	// V0..V3 += V4..V7
-	// V12..V15 <<<= ((V12..V15 XOR V0..V3), 16)
-	VADD	V0.S4, V4.S4, V0.S4
-	VADD	V1.S4, V5.S4, V1.S4
-	VADD	V2.S4, V6.S4, V2.S4
-	VADD	V3.S4, V7.S4, V3.S4
-	VEOR	V12.B16, V0.B16, V12.B16
-	VEOR	V13.B16, V1.B16, V13.B16
-	VEOR	V14.B16, V2.B16, V14.B16
-	VEOR	V15.B16, V3.B16, V15.B16
-	VREV32	V12.H8, V12.H8
-	VREV32	V13.H8, V13.H8
-	VREV32	V14.H8, V14.H8
-	VREV32	V15.H8, V15.H8
-	// V8..V11 += V12..V15
-	// V4..V7 <<<= ((V4..V7 XOR V8..V11), 12)
-	VADD	V8.S4, V12.S4, V8.S4
-	VADD	V9.S4, V13.S4, V9.S4
-	VADD	V10.S4, V14.S4, V10.S4
-	VADD	V11.S4, V15.S4, V11.S4
-	VEOR	V8.B16, V4.B16, V16.B16
-	VEOR	V9.B16, V5.B16, V17.B16
-	VEOR	V10.B16, V6.B16, V18.B16
-	VEOR	V11.B16, V7.B16, V19.B16
-	VSHL	$12, V16.S4, V4.S4
-	VSHL	$12, V17.S4, V5.S4
-	VSHL	$12, V18.S4, V6.S4
-	VSHL	$12, V19.S4, V7.S4
-	VSRI	$20, V16.S4, V4.S4
-	VSRI	$20, V17.S4, V5.S4
-	VSRI	$20, V18.S4, V6.S4
-	VSRI	$20, V19.S4, V7.S4
-
-	// V0..V3 += V4..V7
-	// V12..V15 <<<= ((V12..V15 XOR V0..V3), 8)
-	VADD	V0.S4, V4.S4, V0.S4
-	VADD	V1.S4, V5.S4, V1.S4
-	VADD	V2.S4, V6.S4, V2.S4
-	VADD	V3.S4, V7.S4, V3.S4
-	VEOR	V12.B16, V0.B16, V12.B16
-	VEOR	V13.B16, V1.B16, V13.B16
-	VEOR	V14.B16, V2.B16, V14.B16
-	VEOR	V15.B16, V3.B16, V15.B16
-	VTBL	V31.B16, [V12.B16], V12.B16
-	VTBL	V31.B16, [V13.B16], V13.B16
-	VTBL	V31.B16, [V14.B16], V14.B16
-	VTBL	V31.B16, [V15.B16], V15.B16
-
-	// V8..V11 += V12..V15
-	// V4..V7 <<<= ((V4..V7 XOR V8..V11), 7)
-	VADD	V12.S4, V8.S4, V8.S4
-	VADD	V13.S4, V9.S4, V9.S4
-	VADD	V14.S4, V10.S4, V10.S4
-	VADD	V15.S4, V11.S4, V11.S4
-	VEOR	V8.B16, V4.B16, V16.B16
-	VEOR	V9.B16, V5.B16, V17.B16
-	VEOR	V10.B16, V6.B16, V18.B16
-	VEOR	V11.B16, V7.B16, V19.B16
-	VSHL	$7, V16.S4, V4.S4
-	VSHL	$7, V17.S4, V5.S4
-	VSHL	$7, V18.S4, V6.S4
-	VSHL	$7, V19.S4, V7.S4
-	VSRI	$25, V16.S4, V4.S4
-	VSRI	$25, V17.S4, V5.S4
-	VSRI	$25, V18.S4, V6.S4
-	VSRI	$25, V19.S4, V7.S4
-
-	// V0..V3 += V5..V7, V4
-	// V15,V12-V14 <<<= ((V15,V12-V14 XOR V0..V3), 16)
-	VADD	V0.S4, V5.S4, V0.S4
-	VADD	V1.S4, V6.S4, V1.S4
-	VADD	V2.S4, V7.S4, V2.S4
-	VADD	V3.S4, V4.S4, V3.S4
-	VEOR	V15.B16, V0.B16, V15.B16
-	VEOR	V12.B16, V1.B16, V12.B16
-	VEOR	V13.B16, V2.B16, V13.B16
-	VEOR	V14.B16, V3.B16, V14.B16
-	VREV32	V12.H8, V12.H8
-	VREV32	V13.H8, V13.H8
-	VREV32	V14.H8, V14.H8
-	VREV32	V15.H8, V15.H8
-
-	// V10 += V15; V5 <<<= ((V10 XOR V5), 12)
-	// ...
-	VADD	V15.S4, V10.S4, V10.S4
-	VADD	V12.S4, V11.S4, V11.S4
-	VADD	V13.S4, V8.S4, V8.S4
-	VADD	V14.S4, V9.S4, V9.S4
-	VEOR	V10.B16, V5.B16, V16.B16
-	VEOR	V11.B16, V6.B16, V17.B16
-	VEOR	V8.B16, V7.B16, V18.B16
-	VEOR	V9.B16, V4.B16, V19.B16
-	VSHL	$12, V16.S4, V5.S4
-	VSHL	$12, V17.S4, V6.S4
-	VSHL	$12, V18.S4, V7.S4
-	VSHL	$12, V19.S4, V4.S4
-	VSRI	$20, V16.S4, V5.S4
-	VSRI	$20, V17.S4, V6.S4
-	VSRI	$20, V18.S4, V7.S4
-	VSRI	$20, V19.S4, V4.S4
-
-	// V0 += V5; V15 <<<= ((V0 XOR V15), 8)
-	// ...
-	VADD	V5.S4, V0.S4, V0.S4
-	VADD	V6.S4, V1.S4, V1.S4
-	VADD	V7.S4, V2.S4, V2.S4
-	VADD	V4.S4, V3.S4, V3.S4
-	VEOR	V0.B16, V15.B16, V15.B16
-	VEOR	V1.B16, V12.B16, V12.B16
-	VEOR	V2.B16, V13.B16, V13.B16
-	VEOR	V3.B16, V14.B16, V14.B16
-	VTBL	V31.B16, [V12.B16], V12.B16
-	VTBL	V31.B16, [V13.B16], V13.B16
-	VTBL	V31.B16, [V14.B16], V14.B16
-	VTBL	V31.B16, [V15.B16], V15.B16
-
-	// V10 += V15; V5 <<<= ((V10 XOR V5), 7)
-	// ...
-	VADD	V15.S4, V10.S4, V10.S4
-	VADD	V12.S4, V11.S4, V11.S4
-	VADD	V13.S4, V8.S4, V8.S4
-	VADD	V14.S4, V9.S4, V9.S4
-	VEOR	V10.B16, V5.B16, V16.B16
-	VEOR	V11.B16, V6.B16, V17.B16
-	VEOR	V8.B16, V7.B16, V18.B16
-	VEOR	V9.B16, V4.B16, V19.B16
-	VSHL	$7, V16.S4, V5.S4
-	VSHL	$7, V17.S4, V6.S4
-	VSHL	$7, V18.S4, V7.S4
-	VSHL	$7, V19.S4, V4.S4
-	VSRI	$25, V16.S4, V5.S4
-	VSRI	$25, V17.S4, V6.S4
-	VSRI	$25, V18.S4, V7.S4
-	VSRI	$25, V19.S4, V4.S4
-
-	SUB	$1, R21
-	CBNZ	R21, chacha
-
-	// VLD4R (R10), [V16.S4, V17.S4, V18.S4, V19.S4]
-	WORD	$0x4D60E950
-
-	// VLD4R 16(R4), [V20.S4, V21.S4, V22.S4, V23.S4]
-	WORD	$0x4DFFE894
-	VADD	V30.S4, V12.S4, V12.S4
-	VADD	V16.S4, V0.S4, V0.S4
-	VADD	V17.S4, V1.S4, V1.S4
-	VADD	V18.S4, V2.S4, V2.S4
-	VADD	V19.S4, V3.S4, V3.S4
-	// VLD4R 16(R4), [V24.S4, V25.S4, V26.S4, V27.S4]
-	WORD	$0x4DFFE898
-	// restore R4
-	SUB	$32, R4
-
-	// load counter + nonce
-	// VLD1R (R7), [V28.S4]
-	WORD	$0x4D40C8FC
-	// VLD3R (R6), [V29.S4, V30.S4, V31.S4]
-	WORD	$0x4D40E8DD
-
-	VADD	V20.S4, V4.S4, V4.S4
-	VADD	V21.S4, V5.S4, V5.S4
-	VADD	V22.S4, V6.S4, V6.S4
-	VADD	V23.S4, V7.S4, V7.S4
-	VADD	V24.S4, V8.S4, V8.S4
-	VADD	V25.S4, V9.S4, V9.S4
-	VADD	V26.S4, V10.S4, V10.S4
-	VADD	V27.S4, V11.S4, V11.S4
-	VADD	V28.S4, V12.S4, V12.S4
-	VADD	V29.S4, V13.S4, V13.S4
-	VADD	V30.S4, V14.S4, V14.S4
-	VADD	V31.S4, V15.S4, V15.S4
-
-	VZIP1	V1.S4, V0.S4, V16.S4
-	VZIP2	V1.S4, V0.S4, V17.S4
-	VZIP1	V3.S4, V2.S4, V18.S4
-	VZIP2	V3.S4, V2.S4, V19.S4
-	VZIP1	V5.S4, V4.S4, V20.S4
-	VZIP2	V5.S4, V4.S4, V21.S4
-	VZIP1	V7.S4, V6.S4, V22.S4
-	VZIP2	V7.S4, V6.S4, V23.S4
-	VZIP1	V9.S4, V8.S4, V24.S4
-	VZIP2	V9.S4, V8.S4, V25.S4
-	VZIP1	V11.S4, V10.S4, V26.S4
-	VZIP2	V11.S4, V10.S4, V27.S4
-	VZIP1	V13.S4, V12.S4, V28.S4
-	VZIP2	V13.S4, V12.S4, V29.S4
-	VZIP1	V15.S4, V14.S4, V30.S4
-	VZIP2	V15.S4, V14.S4, V31.S4
-	VZIP1	V18.D2, V16.D2, V0.D2
-	VZIP2	V18.D2, V16.D2, V4.D2
-	VZIP1	V19.D2, V17.D2, V8.D2
-	VZIP2	V19.D2, V17.D2, V12.D2
-	VLD1.P	64(R2), [V16.B16, V17.B16, V18.B16, V19.B16]
-
-	VZIP1	V22.D2, V20.D2, V1.D2
-	VZIP2	V22.D2, V20.D2, V5.D2
-	VZIP1	V23.D2, V21.D2, V9.D2
-	VZIP2	V23.D2, V21.D2, V13.D2
-	VLD1.P	64(R2), [V20.B16, V21.B16, V22.B16, V23.B16]
-	VZIP1	V26.D2, V24.D2, V2.D2
-	VZIP2	V26.D2, V24.D2, V6.D2
-	VZIP1	V27.D2, V25.D2, V10.D2
-	VZIP2	V27.D2, V25.D2, V14.D2
-	VLD1.P	64(R2), [V24.B16, V25.B16, V26.B16, V27.B16]
-	VZIP1	V30.D2, V28.D2, V3.D2
-	VZIP2	V30.D2, V28.D2, V7.D2
-	VZIP1	V31.D2, V29.D2, V11.D2
-	VZIP2	V31.D2, V29.D2, V15.D2
-	VLD1.P	64(R2), [V28.B16, V29.B16, V30.B16, V31.B16]
-	VEOR	V0.B16, V16.B16, V16.B16
-	VEOR	V1.B16, V17.B16, V17.B16
-	VEOR	V2.B16, V18.B16, V18.B16
-	VEOR	V3.B16, V19.B16, V19.B16
-	VST1.P	[V16.B16, V17.B16, V18.B16, V19.B16], 64(R1)
-	VEOR	V4.B16, V20.B16, V20.B16
-	VEOR	V5.B16, V21.B16, V21.B16
-	VEOR	V6.B16, V22.B16, V22.B16
-	VEOR	V7.B16, V23.B16, V23.B16
-	VST1.P	[V20.B16, V21.B16, V22.B16, V23.B16], 64(R1)
-	VEOR	V8.B16, V24.B16, V24.B16
-	VEOR	V9.B16, V25.B16, V25.B16
-	VEOR	V10.B16, V26.B16, V26.B16
-	VEOR	V11.B16, V27.B16, V27.B16
-	VST1.P	[V24.B16, V25.B16, V26.B16, V27.B16], 64(R1)
-	VEOR	V12.B16, V28.B16, V28.B16
-	VEOR	V13.B16, V29.B16, V29.B16
-	VEOR	V14.B16, V30.B16, V30.B16
-	VEOR	V15.B16, V31.B16, V31.B16
-	VST1.P	[V28.B16, V29.B16, V30.B16, V31.B16], 64(R1)
-
-	ADD	$4, R20
-	MOVW	R20, (R7) // update counter
-
-	CMP	R2, R12
-	BGT	loop
-
-	RET
-
-
-DATA	·constants+0x00(SB)/4, $0x61707865
-DATA	·constants+0x04(SB)/4, $0x3320646e
-DATA	·constants+0x08(SB)/4, $0x79622d32
-DATA	·constants+0x0c(SB)/4, $0x6b206574
-GLOBL	·constants(SB), NOPTR|RODATA, $32
-
-DATA	·incRotMatrix+0x00(SB)/4, $0x00000000
-DATA	·incRotMatrix+0x04(SB)/4, $0x00000001
-DATA	·incRotMatrix+0x08(SB)/4, $0x00000002
-DATA	·incRotMatrix+0x0c(SB)/4, $0x00000003
-DATA	·incRotMatrix+0x10(SB)/4, $0x02010003
-DATA	·incRotMatrix+0x14(SB)/4, $0x06050407
-DATA	·incRotMatrix+0x18(SB)/4, $0x0A09080B
-DATA	·incRotMatrix+0x1c(SB)/4, $0x0E0D0C0F
-GLOBL	·incRotMatrix(SB), NOPTR|RODATA, $32
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_generic.go b/vendor/golang.org/x/crypto/chacha20/chacha_generic.go
deleted file mode 100644
index 93eb5ae6d..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_generic.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package chacha20 implements the ChaCha20 and XChaCha20 encryption algorithms
-// as specified in RFC 8439 and draft-irtf-cfrg-xchacha-01.
-package chacha20
-
-import (
-	"crypto/cipher"
-	"encoding/binary"
-	"errors"
-	"math/bits"
-
-	"golang.org/x/crypto/internal/alias"
-)
-
-const (
-	// KeySize is the size of the key used by this cipher, in bytes.
-	KeySize = 32
-
-	// NonceSize is the size of the nonce used with the standard variant of this
-	// cipher, in bytes.
-	//
-	// Note that this is too short to be safely generated at random if the same
-	// key is reused more than 2³² times.
-	NonceSize = 12
-
-	// NonceSizeX is the size of the nonce used with the XChaCha20 variant of
-	// this cipher, in bytes.
-	NonceSizeX = 24
-)
-
-// Cipher is a stateful instance of ChaCha20 or XChaCha20 using a particular key
-// and nonce. A *Cipher implements the cipher.Stream interface.
-type Cipher struct {
-	// The ChaCha20 state is 16 words: 4 constant, 8 of key, 1 of counter
-	// (incremented after each block), and 3 of nonce.
-	key     [8]uint32
-	counter uint32
-	nonce   [3]uint32
-
-	// The last len bytes of buf are leftover key stream bytes from the previous
-	// XORKeyStream invocation. The size of buf depends on how many blocks are
-	// computed at a time by xorKeyStreamBlocks.
-	buf [bufSize]byte
-	len int
-
-	// overflow is set when the counter overflowed, no more blocks can be
-	// generated, and the next XORKeyStream call should panic.
-	overflow bool
-
-	// The counter-independent results of the first round are cached after they
-	// are computed the first time.
-	precompDone      bool
-	p1, p5, p9, p13  uint32
-	p2, p6, p10, p14 uint32
-	p3, p7, p11, p15 uint32
-}
-
-var _ cipher.Stream = (*Cipher)(nil)
-
-// NewUnauthenticatedCipher creates a new ChaCha20 stream cipher with the given
-// 32 bytes key and a 12 or 24 bytes nonce. If a nonce of 24 bytes is provided,
-// the XChaCha20 construction will be used. It returns an error if key or nonce
-// have any other length.
-//
-// Note that ChaCha20, like all stream ciphers, is not authenticated and allows
-// attackers to silently tamper with the plaintext. For this reason, it is more
-// appropriate as a building block than as a standalone encryption mechanism.
-// Instead, consider using package golang.org/x/crypto/chacha20poly1305.
-func NewUnauthenticatedCipher(key, nonce []byte) (*Cipher, error) {
-	// This function is split into a wrapper so that the Cipher allocation will
-	// be inlined, and depending on how the caller uses the return value, won't
-	// escape to the heap.
-	c := &Cipher{}
-	return newUnauthenticatedCipher(c, key, nonce)
-}
-
-func newUnauthenticatedCipher(c *Cipher, key, nonce []byte) (*Cipher, error) {
-	if len(key) != KeySize {
-		return nil, errors.New("chacha20: wrong key size")
-	}
-	if len(nonce) == NonceSizeX {
-		// XChaCha20 uses the ChaCha20 core to mix 16 bytes of the nonce into a
-		// derived key, allowing it to operate on a nonce of 24 bytes. See
-		// draft-irtf-cfrg-xchacha-01, Section 2.3.
-		key, _ = HChaCha20(key, nonce[0:16])
-		cNonce := make([]byte, NonceSize)
-		copy(cNonce[4:12], nonce[16:24])
-		nonce = cNonce
-	} else if len(nonce) != NonceSize {
-		return nil, errors.New("chacha20: wrong nonce size")
-	}
-
-	key, nonce = key[:KeySize], nonce[:NonceSize] // bounds check elimination hint
-	c.key = [8]uint32{
-		binary.LittleEndian.Uint32(key[0:4]),
-		binary.LittleEndian.Uint32(key[4:8]),
-		binary.LittleEndian.Uint32(key[8:12]),
-		binary.LittleEndian.Uint32(key[12:16]),
-		binary.LittleEndian.Uint32(key[16:20]),
-		binary.LittleEndian.Uint32(key[20:24]),
-		binary.LittleEndian.Uint32(key[24:28]),
-		binary.LittleEndian.Uint32(key[28:32]),
-	}
-	c.nonce = [3]uint32{
-		binary.LittleEndian.Uint32(nonce[0:4]),
-		binary.LittleEndian.Uint32(nonce[4:8]),
-		binary.LittleEndian.Uint32(nonce[8:12]),
-	}
-	return c, nil
-}
-
-// The constant first 4 words of the ChaCha20 state.
-const (
-	j0 uint32 = 0x61707865 // expa
-	j1 uint32 = 0x3320646e // nd 3
-	j2 uint32 = 0x79622d32 // 2-by
-	j3 uint32 = 0x6b206574 // te k
-)
-
-const blockSize = 64
-
-// quarterRound is the core of ChaCha20. It shuffles the bits of 4 state words.
-// It's executed 4 times for each of the 20 ChaCha20 rounds, operating on all 16
-// words each round, in columnar or diagonal groups of 4 at a time.
-func quarterRound(a, b, c, d uint32) (uint32, uint32, uint32, uint32) {
-	a += b
-	d ^= a
-	d = bits.RotateLeft32(d, 16)
-	c += d
-	b ^= c
-	b = bits.RotateLeft32(b, 12)
-	a += b
-	d ^= a
-	d = bits.RotateLeft32(d, 8)
-	c += d
-	b ^= c
-	b = bits.RotateLeft32(b, 7)
-	return a, b, c, d
-}
-
-// SetCounter sets the Cipher counter. The next invocation of XORKeyStream will
-// behave as if (64 * counter) bytes had been encrypted so far.
-//
-// To prevent accidental counter reuse, SetCounter panics if counter is less
-// than the current value.
-//
-// Note that the execution time of XORKeyStream is not independent of the
-// counter value.
-func (s *Cipher) SetCounter(counter uint32) {
-	// Internally, s may buffer multiple blocks, which complicates this
-	// implementation slightly. When checking whether the counter has rolled
-	// back, we must use both s.counter and s.len to determine how many blocks
-	// we have already output.
-	outputCounter := s.counter - uint32(s.len)/blockSize
-	if s.overflow || counter < outputCounter {
-		panic("chacha20: SetCounter attempted to rollback counter")
-	}
-
-	// In the general case, we set the new counter value and reset s.len to 0,
-	// causing the next call to XORKeyStream to refill the buffer. However, if
-	// we're advancing within the existing buffer, we can save work by simply
-	// setting s.len.
-	if counter < s.counter {
-		s.len = int(s.counter-counter) * blockSize
-	} else {
-		s.counter = counter
-		s.len = 0
-	}
-}
-
-// XORKeyStream XORs each byte in the given slice with a byte from the
-// cipher's key stream. Dst and src must overlap entirely or not at all.
-//
-// If len(dst) < len(src), XORKeyStream will panic. It is acceptable
-// to pass a dst bigger than src, and in that case, XORKeyStream will
-// only update dst[:len(src)] and will not touch the rest of dst.
-//
-// Multiple calls to XORKeyStream behave as if the concatenation of
-// the src buffers was passed in a single run. That is, Cipher
-// maintains state and does not reset at each XORKeyStream call.
-func (s *Cipher) XORKeyStream(dst, src []byte) {
-	if len(src) == 0 {
-		return
-	}
-	if len(dst) < len(src) {
-		panic("chacha20: output smaller than input")
-	}
-	dst = dst[:len(src)]
-	if alias.InexactOverlap(dst, src) {
-		panic("chacha20: invalid buffer overlap")
-	}
-
-	// First, drain any remaining key stream from a previous XORKeyStream.
-	if s.len != 0 {
-		keyStream := s.buf[bufSize-s.len:]
-		if len(src) < len(keyStream) {
-			keyStream = keyStream[:len(src)]
-		}
-		_ = src[len(keyStream)-1] // bounds check elimination hint
-		for i, b := range keyStream {
-			dst[i] = src[i] ^ b
-		}
-		s.len -= len(keyStream)
-		dst, src = dst[len(keyStream):], src[len(keyStream):]
-	}
-	if len(src) == 0 {
-		return
-	}
-
-	// If we'd need to let the counter overflow and keep generating output,
-	// panic immediately. If instead we'd only reach the last block, remember
-	// not to generate any more output after the buffer is drained.
-	numBlocks := (uint64(len(src)) + blockSize - 1) / blockSize
-	if s.overflow || uint64(s.counter)+numBlocks > 1<<32 {
-		panic("chacha20: counter overflow")
-	} else if uint64(s.counter)+numBlocks == 1<<32 {
-		s.overflow = true
-	}
-
-	// xorKeyStreamBlocks implementations expect input lengths that are a
-	// multiple of bufSize. Platform-specific ones process multiple blocks at a
-	// time, so have bufSizes that are a multiple of blockSize.
-
-	full := len(src) - len(src)%bufSize
-	if full > 0 {
-		s.xorKeyStreamBlocks(dst[:full], src[:full])
-	}
-	dst, src = dst[full:], src[full:]
-
-	// If using a multi-block xorKeyStreamBlocks would overflow, use the generic
-	// one that does one block at a time.
-	const blocksPerBuf = bufSize / blockSize
-	if uint64(s.counter)+blocksPerBuf > 1<<32 {
-		s.buf = [bufSize]byte{}
-		numBlocks := (len(src) + blockSize - 1) / blockSize
-		buf := s.buf[bufSize-numBlocks*blockSize:]
-		copy(buf, src)
-		s.xorKeyStreamBlocksGeneric(buf, buf)
-		s.len = len(buf) - copy(dst, buf)
-		return
-	}
-
-	// If we have a partial (multi-)block, pad it for xorKeyStreamBlocks, and
-	// keep the leftover keystream for the next XORKeyStream invocation.
-	if len(src) > 0 {
-		s.buf = [bufSize]byte{}
-		copy(s.buf[:], src)
-		s.xorKeyStreamBlocks(s.buf[:], s.buf[:])
-		s.len = bufSize - copy(dst, s.buf[:])
-	}
-}
-
-func (s *Cipher) xorKeyStreamBlocksGeneric(dst, src []byte) {
-	if len(dst) != len(src) || len(dst)%blockSize != 0 {
-		panic("chacha20: internal error: wrong dst and/or src length")
-	}
-
-	// To generate each block of key stream, the initial cipher state
-	// (represented below) is passed through 20 rounds of shuffling,
-	// alternatively applying quarterRounds by columns (like 1, 5, 9, 13)
-	// or by diagonals (like 1, 6, 11, 12).
-	//
-	//      0:cccccccc   1:cccccccc   2:cccccccc   3:cccccccc
-	//      4:kkkkkkkk   5:kkkkkkkk   6:kkkkkkkk   7:kkkkkkkk
-	//      8:kkkkkkkk   9:kkkkkkkk  10:kkkkkkkk  11:kkkkkkkk
-	//     12:bbbbbbbb  13:nnnnnnnn  14:nnnnnnnn  15:nnnnnnnn
-	//
-	//            c=constant k=key b=blockcount n=nonce
-	var (
-		c0, c1, c2, c3   = j0, j1, j2, j3
-		c4, c5, c6, c7   = s.key[0], s.key[1], s.key[2], s.key[3]
-		c8, c9, c10, c11 = s.key[4], s.key[5], s.key[6], s.key[7]
-		_, c13, c14, c15 = s.counter, s.nonce[0], s.nonce[1], s.nonce[2]
-	)
-
-	// Three quarters of the first round don't depend on the counter, so we can
-	// calculate them here, and reuse them for multiple blocks in the loop, and
-	// for future XORKeyStream invocations.
-	if !s.precompDone {
-		s.p1, s.p5, s.p9, s.p13 = quarterRound(c1, c5, c9, c13)
-		s.p2, s.p6, s.p10, s.p14 = quarterRound(c2, c6, c10, c14)
-		s.p3, s.p7, s.p11, s.p15 = quarterRound(c3, c7, c11, c15)
-		s.precompDone = true
-	}
-
-	// A condition of len(src) > 0 would be sufficient, but this also
-	// acts as a bounds check elimination hint.
-	for len(src) >= 64 && len(dst) >= 64 {
-		// The remainder of the first column round.
-		fcr0, fcr4, fcr8, fcr12 := quarterRound(c0, c4, c8, s.counter)
-
-		// The second diagonal round.
-		x0, x5, x10, x15 := quarterRound(fcr0, s.p5, s.p10, s.p15)
-		x1, x6, x11, x12 := quarterRound(s.p1, s.p6, s.p11, fcr12)
-		x2, x7, x8, x13 := quarterRound(s.p2, s.p7, fcr8, s.p13)
-		x3, x4, x9, x14 := quarterRound(s.p3, fcr4, s.p9, s.p14)
-
-		// The remaining 18 rounds.
-		for i := 0; i < 9; i++ {
-			// Column round.
-			x0, x4, x8, x12 = quarterRound(x0, x4, x8, x12)
-			x1, x5, x9, x13 = quarterRound(x1, x5, x9, x13)
-			x2, x6, x10, x14 = quarterRound(x2, x6, x10, x14)
-			x3, x7, x11, x15 = quarterRound(x3, x7, x11, x15)
-
-			// Diagonal round.
-			x0, x5, x10, x15 = quarterRound(x0, x5, x10, x15)
-			x1, x6, x11, x12 = quarterRound(x1, x6, x11, x12)
-			x2, x7, x8, x13 = quarterRound(x2, x7, x8, x13)
-			x3, x4, x9, x14 = quarterRound(x3, x4, x9, x14)
-		}
-
-		// Add back the initial state to generate the key stream, then
-		// XOR the key stream with the source and write out the result.
-		addXor(dst[0:4], src[0:4], x0, c0)
-		addXor(dst[4:8], src[4:8], x1, c1)
-		addXor(dst[8:12], src[8:12], x2, c2)
-		addXor(dst[12:16], src[12:16], x3, c3)
-		addXor(dst[16:20], src[16:20], x4, c4)
-		addXor(dst[20:24], src[20:24], x5, c5)
-		addXor(dst[24:28], src[24:28], x6, c6)
-		addXor(dst[28:32], src[28:32], x7, c7)
-		addXor(dst[32:36], src[32:36], x8, c8)
-		addXor(dst[36:40], src[36:40], x9, c9)
-		addXor(dst[40:44], src[40:44], x10, c10)
-		addXor(dst[44:48], src[44:48], x11, c11)
-		addXor(dst[48:52], src[48:52], x12, s.counter)
-		addXor(dst[52:56], src[52:56], x13, c13)
-		addXor(dst[56:60], src[56:60], x14, c14)
-		addXor(dst[60:64], src[60:64], x15, c15)
-
-		s.counter += 1
-
-		src, dst = src[blockSize:], dst[blockSize:]
-	}
-}
-
-// HChaCha20 uses the ChaCha20 core to generate a derived key from a 32 bytes
-// key and a 16 bytes nonce. It returns an error if key or nonce have any other
-// length. It is used as part of the XChaCha20 construction.
-func HChaCha20(key, nonce []byte) ([]byte, error) {
-	// This function is split into a wrapper so that the slice allocation will
-	// be inlined, and depending on how the caller uses the return value, won't
-	// escape to the heap.
-	out := make([]byte, 32)
-	return hChaCha20(out, key, nonce)
-}
-
-func hChaCha20(out, key, nonce []byte) ([]byte, error) {
-	if len(key) != KeySize {
-		return nil, errors.New("chacha20: wrong HChaCha20 key size")
-	}
-	if len(nonce) != 16 {
-		return nil, errors.New("chacha20: wrong HChaCha20 nonce size")
-	}
-
-	x0, x1, x2, x3 := j0, j1, j2, j3
-	x4 := binary.LittleEndian.Uint32(key[0:4])
-	x5 := binary.LittleEndian.Uint32(key[4:8])
-	x6 := binary.LittleEndian.Uint32(key[8:12])
-	x7 := binary.LittleEndian.Uint32(key[12:16])
-	x8 := binary.LittleEndian.Uint32(key[16:20])
-	x9 := binary.LittleEndian.Uint32(key[20:24])
-	x10 := binary.LittleEndian.Uint32(key[24:28])
-	x11 := binary.LittleEndian.Uint32(key[28:32])
-	x12 := binary.LittleEndian.Uint32(nonce[0:4])
-	x13 := binary.LittleEndian.Uint32(nonce[4:8])
-	x14 := binary.LittleEndian.Uint32(nonce[8:12])
-	x15 := binary.LittleEndian.Uint32(nonce[12:16])
-
-	for i := 0; i < 10; i++ {
-		// Diagonal round.
-		x0, x4, x8, x12 = quarterRound(x0, x4, x8, x12)
-		x1, x5, x9, x13 = quarterRound(x1, x5, x9, x13)
-		x2, x6, x10, x14 = quarterRound(x2, x6, x10, x14)
-		x3, x7, x11, x15 = quarterRound(x3, x7, x11, x15)
-
-		// Column round.
-		x0, x5, x10, x15 = quarterRound(x0, x5, x10, x15)
-		x1, x6, x11, x12 = quarterRound(x1, x6, x11, x12)
-		x2, x7, x8, x13 = quarterRound(x2, x7, x8, x13)
-		x3, x4, x9, x14 = quarterRound(x3, x4, x9, x14)
-	}
-
-	_ = out[31] // bounds check elimination hint
-	binary.LittleEndian.PutUint32(out[0:4], x0)
-	binary.LittleEndian.PutUint32(out[4:8], x1)
-	binary.LittleEndian.PutUint32(out[8:12], x2)
-	binary.LittleEndian.PutUint32(out[12:16], x3)
-	binary.LittleEndian.PutUint32(out[16:20], x12)
-	binary.LittleEndian.PutUint32(out[20:24], x13)
-	binary.LittleEndian.PutUint32(out[24:28], x14)
-	binary.LittleEndian.PutUint32(out[28:32], x15)
-	return out, nil
-}
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_noasm.go b/vendor/golang.org/x/crypto/chacha20/chacha_noasm.go
deleted file mode 100644
index c709b7284..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_noasm.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (!arm64 && !s390x && !ppc64 && !ppc64le) || !gc || purego
-
-package chacha20
-
-const bufSize = blockSize
-
-func (s *Cipher) xorKeyStreamBlocks(dst, src []byte) {
-	s.xorKeyStreamBlocksGeneric(dst, src)
-}
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_ppc64x.go b/vendor/golang.org/x/crypto/chacha20/chacha_ppc64x.go
deleted file mode 100644
index bd183d9ba..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_ppc64x.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego && (ppc64 || ppc64le)
-
-package chacha20
-
-const bufSize = 256
-
-//go:noescape
-func chaCha20_ctr32_vsx(out, inp *byte, len int, key *[8]uint32, counter *uint32)
-
-func (c *Cipher) xorKeyStreamBlocks(dst, src []byte) {
-	chaCha20_ctr32_vsx(&dst[0], &src[0], len(src), &c.key, &c.counter)
-}
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_ppc64x.s b/vendor/golang.org/x/crypto/chacha20/chacha_ppc64x.s
deleted file mode 100644
index a660b4112..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_ppc64x.s
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on CRYPTOGAMS code with the following comment:
-// # ====================================================================
-// # Written by Andy Polyakov  for the OpenSSL
-// # project. The module is, however, dual licensed under OpenSSL and
-// # CRYPTOGAMS licenses depending on where you obtain it. For further
-// # details see http://www.openssl.org/~appro/cryptogams/.
-// # ====================================================================
-
-// Code for the perl script that generates the ppc64 assembler
-// can be found in the cryptogams repository at the link below. It is based on
-// the original from openssl.
-
-// https://github.com/dot-asm/cryptogams/commit/a60f5b50ed908e91
-
-// The differences in this and the original implementation are
-// due to the calling conventions and initialization of constants.
-
-//go:build gc && !purego && (ppc64 || ppc64le)
-
-#include "textflag.h"
-
-#define OUT  R3
-#define INP  R4
-#define LEN  R5
-#define KEY  R6
-#define CNT  R7
-#define TMP  R15
-
-#define CONSTBASE  R16
-#define BLOCKS R17
-
-// for VPERMXOR
-#define MASK  R18
-
-DATA consts<>+0x00(SB)/4, $0x61707865
-DATA consts<>+0x04(SB)/4, $0x3320646e
-DATA consts<>+0x08(SB)/4, $0x79622d32
-DATA consts<>+0x0c(SB)/4, $0x6b206574
-DATA consts<>+0x10(SB)/4, $0x00000001
-DATA consts<>+0x14(SB)/4, $0x00000000
-DATA consts<>+0x18(SB)/4, $0x00000000
-DATA consts<>+0x1c(SB)/4, $0x00000000
-DATA consts<>+0x20(SB)/4, $0x00000004
-DATA consts<>+0x24(SB)/4, $0x00000000
-DATA consts<>+0x28(SB)/4, $0x00000000
-DATA consts<>+0x2c(SB)/4, $0x00000000
-DATA consts<>+0x30(SB)/4, $0x0e0f0c0d
-DATA consts<>+0x34(SB)/4, $0x0a0b0809
-DATA consts<>+0x38(SB)/4, $0x06070405
-DATA consts<>+0x3c(SB)/4, $0x02030001
-DATA consts<>+0x40(SB)/4, $0x0d0e0f0c
-DATA consts<>+0x44(SB)/4, $0x090a0b08
-DATA consts<>+0x48(SB)/4, $0x05060704
-DATA consts<>+0x4c(SB)/4, $0x01020300
-DATA consts<>+0x50(SB)/4, $0x61707865
-DATA consts<>+0x54(SB)/4, $0x61707865
-DATA consts<>+0x58(SB)/4, $0x61707865
-DATA consts<>+0x5c(SB)/4, $0x61707865
-DATA consts<>+0x60(SB)/4, $0x3320646e
-DATA consts<>+0x64(SB)/4, $0x3320646e
-DATA consts<>+0x68(SB)/4, $0x3320646e
-DATA consts<>+0x6c(SB)/4, $0x3320646e
-DATA consts<>+0x70(SB)/4, $0x79622d32
-DATA consts<>+0x74(SB)/4, $0x79622d32
-DATA consts<>+0x78(SB)/4, $0x79622d32
-DATA consts<>+0x7c(SB)/4, $0x79622d32
-DATA consts<>+0x80(SB)/4, $0x6b206574
-DATA consts<>+0x84(SB)/4, $0x6b206574
-DATA consts<>+0x88(SB)/4, $0x6b206574
-DATA consts<>+0x8c(SB)/4, $0x6b206574
-DATA consts<>+0x90(SB)/4, $0x00000000
-DATA consts<>+0x94(SB)/4, $0x00000001
-DATA consts<>+0x98(SB)/4, $0x00000002
-DATA consts<>+0x9c(SB)/4, $0x00000003
-DATA consts<>+0xa0(SB)/4, $0x11223300
-DATA consts<>+0xa4(SB)/4, $0x55667744
-DATA consts<>+0xa8(SB)/4, $0x99aabb88
-DATA consts<>+0xac(SB)/4, $0xddeeffcc
-DATA consts<>+0xb0(SB)/4, $0x22330011
-DATA consts<>+0xb4(SB)/4, $0x66774455
-DATA consts<>+0xb8(SB)/4, $0xaabb8899
-DATA consts<>+0xbc(SB)/4, $0xeeffccdd
-GLOBL consts<>(SB), RODATA, $0xc0
-
-#ifdef GOARCH_ppc64
-#define BE_XXBRW_INIT() \
-		LVSL (R0)(R0), V24 \
-		VSPLTISB $3, V25   \
-		VXOR V24, V25, V24 \
-
-#define BE_XXBRW(vr) VPERM vr, vr, V24, vr
-#else
-#define BE_XXBRW_INIT()
-#define BE_XXBRW(vr)
-#endif
-
-//func chaCha20_ctr32_vsx(out, inp *byte, len int, key *[8]uint32, counter *uint32)
-TEXT ·chaCha20_ctr32_vsx(SB),NOSPLIT,$64-40
-	MOVD out+0(FP), OUT
-	MOVD inp+8(FP), INP
-	MOVD len+16(FP), LEN
-	MOVD key+24(FP), KEY
-	MOVD counter+32(FP), CNT
-
-	// Addressing for constants
-	MOVD $consts<>+0x00(SB), CONSTBASE
-	MOVD $16, R8
-	MOVD $32, R9
-	MOVD $48, R10
-	MOVD $64, R11
-	SRD $6, LEN, BLOCKS
-	// for VPERMXOR
-	MOVD $consts<>+0xa0(SB), MASK
-	MOVD $16, R20
-	// V16
-	LXVW4X (CONSTBASE)(R0), VS48
-	ADD $80,CONSTBASE
-
-	// Load key into V17,V18
-	LXVW4X (KEY)(R0), VS49
-	LXVW4X (KEY)(R8), VS50
-
-	// Load CNT, NONCE into V19
-	LXVW4X (CNT)(R0), VS51
-
-	// Clear V27
-	VXOR V27, V27, V27
-
-	BE_XXBRW_INIT()
-
-	// V28
-	LXVW4X (CONSTBASE)(R11), VS60
-
-	// Load mask constants for VPERMXOR
-	LXVW4X (MASK)(R0), V20
-	LXVW4X (MASK)(R20), V21
-
-	// splat slot from V19 -> V26
-	VSPLTW $0, V19, V26
-
-	VSLDOI $4, V19, V27, V19
-	VSLDOI $12, V27, V19, V19
-
-	VADDUWM V26, V28, V26
-
-	MOVD $10, R14
-	MOVD R14, CTR
-	PCALIGN $16
-loop_outer_vsx:
-	// V0, V1, V2, V3
-	LXVW4X (R0)(CONSTBASE), VS32
-	LXVW4X (R8)(CONSTBASE), VS33
-	LXVW4X (R9)(CONSTBASE), VS34
-	LXVW4X (R10)(CONSTBASE), VS35
-
-	// splat values from V17, V18 into V4-V11
-	VSPLTW $0, V17, V4
-	VSPLTW $1, V17, V5
-	VSPLTW $2, V17, V6
-	VSPLTW $3, V17, V7
-	VSPLTW $0, V18, V8
-	VSPLTW $1, V18, V9
-	VSPLTW $2, V18, V10
-	VSPLTW $3, V18, V11
-
-	// VOR
-	VOR V26, V26, V12
-
-	// splat values from V19 -> V13, V14, V15
-	VSPLTW $1, V19, V13
-	VSPLTW $2, V19, V14
-	VSPLTW $3, V19, V15
-
-	// splat   const values
-	VSPLTISW $-16, V27
-	VSPLTISW $12, V28
-	VSPLTISW $8, V29
-	VSPLTISW $7, V30
-	PCALIGN $16
-loop_vsx:
-	VADDUWM V0, V4, V0
-	VADDUWM V1, V5, V1
-	VADDUWM V2, V6, V2
-	VADDUWM V3, V7, V3
-
-	VPERMXOR V12, V0, V21, V12
-	VPERMXOR V13, V1, V21, V13
-	VPERMXOR V14, V2, V21, V14
-	VPERMXOR V15, V3, V21, V15
-
-	VADDUWM V8, V12, V8
-	VADDUWM V9, V13, V9
-	VADDUWM V10, V14, V10
-	VADDUWM V11, V15, V11
-
-	VXOR V4, V8, V4
-	VXOR V5, V9, V5
-	VXOR V6, V10, V6
-	VXOR V7, V11, V7
-
-	VRLW V4, V28, V4
-	VRLW V5, V28, V5
-	VRLW V6, V28, V6
-	VRLW V7, V28, V7
-
-	VADDUWM V0, V4, V0
-	VADDUWM V1, V5, V1
-	VADDUWM V2, V6, V2
-	VADDUWM V3, V7, V3
-
-	VPERMXOR V12, V0, V20, V12
-	VPERMXOR V13, V1, V20, V13
-	VPERMXOR V14, V2, V20, V14
-	VPERMXOR V15, V3, V20, V15
-
-	VADDUWM V8, V12, V8
-	VADDUWM V9, V13, V9
-	VADDUWM V10, V14, V10
-	VADDUWM V11, V15, V11
-
-	VXOR V4, V8, V4
-	VXOR V5, V9, V5
-	VXOR V6, V10, V6
-	VXOR V7, V11, V7
-
-	VRLW V4, V30, V4
-	VRLW V5, V30, V5
-	VRLW V6, V30, V6
-	VRLW V7, V30, V7
-
-	VADDUWM V0, V5, V0
-	VADDUWM V1, V6, V1
-	VADDUWM V2, V7, V2
-	VADDUWM V3, V4, V3
-
-	VPERMXOR V15, V0, V21, V15
-	VPERMXOR V12, V1, V21, V12
-	VPERMXOR V13, V2, V21, V13
-	VPERMXOR V14, V3, V21, V14
-
-	VADDUWM V10, V15, V10
-	VADDUWM V11, V12, V11
-	VADDUWM V8, V13, V8
-	VADDUWM V9, V14, V9
-
-	VXOR V5, V10, V5
-	VXOR V6, V11, V6
-	VXOR V7, V8, V7
-	VXOR V4, V9, V4
-
-	VRLW V5, V28, V5
-	VRLW V6, V28, V6
-	VRLW V7, V28, V7
-	VRLW V4, V28, V4
-
-	VADDUWM V0, V5, V0
-	VADDUWM V1, V6, V1
-	VADDUWM V2, V7, V2
-	VADDUWM V3, V4, V3
-
-	VPERMXOR V15, V0, V20, V15
-	VPERMXOR V12, V1, V20, V12
-	VPERMXOR V13, V2, V20, V13
-	VPERMXOR V14, V3, V20, V14
-
-	VADDUWM V10, V15, V10
-	VADDUWM V11, V12, V11
-	VADDUWM V8, V13, V8
-	VADDUWM V9, V14, V9
-
-	VXOR V5, V10, V5
-	VXOR V6, V11, V6
-	VXOR V7, V8, V7
-	VXOR V4, V9, V4
-
-	VRLW V5, V30, V5
-	VRLW V6, V30, V6
-	VRLW V7, V30, V7
-	VRLW V4, V30, V4
-	BDNZ   loop_vsx
-
-	VADDUWM V12, V26, V12
-
-	VMRGEW V0, V1, V27
-	VMRGEW V2, V3, V28
-
-	VMRGOW V0, V1, V0
-	VMRGOW V2, V3, V2
-
-	VMRGEW V4, V5, V29
-	VMRGEW V6, V7, V30
-
-	XXPERMDI VS32, VS34, $0, VS33
-	XXPERMDI VS32, VS34, $3, VS35
-	XXPERMDI VS59, VS60, $0, VS32
-	XXPERMDI VS59, VS60, $3, VS34
-
-	VMRGOW V4, V5, V4
-	VMRGOW V6, V7, V6
-
-	VMRGEW V8, V9, V27
-	VMRGEW V10, V11, V28
-
-	XXPERMDI VS36, VS38, $0, VS37
-	XXPERMDI VS36, VS38, $3, VS39
-	XXPERMDI VS61, VS62, $0, VS36
-	XXPERMDI VS61, VS62, $3, VS38
-
-	VMRGOW V8, V9, V8
-	VMRGOW V10, V11, V10
-
-	VMRGEW V12, V13, V29
-	VMRGEW V14, V15, V30
-
-	XXPERMDI VS40, VS42, $0, VS41
-	XXPERMDI VS40, VS42, $3, VS43
-	XXPERMDI VS59, VS60, $0, VS40
-	XXPERMDI VS59, VS60, $3, VS42
-
-	VMRGOW V12, V13, V12
-	VMRGOW V14, V15, V14
-
-	VSPLTISW $4, V27
-	VADDUWM V26, V27, V26
-
-	XXPERMDI VS44, VS46, $0, VS45
-	XXPERMDI VS44, VS46, $3, VS47
-	XXPERMDI VS61, VS62, $0, VS44
-	XXPERMDI VS61, VS62, $3, VS46
-
-	VADDUWM V0, V16, V0
-	VADDUWM V4, V17, V4
-	VADDUWM V8, V18, V8
-	VADDUWM V12, V19, V12
-
-	BE_XXBRW(V0)
-	BE_XXBRW(V4)
-	BE_XXBRW(V8)
-	BE_XXBRW(V12)
-
-	CMPU LEN, $64
-	BLT tail_vsx
-
-	// Bottom of loop
-	LXVW4X (INP)(R0), VS59
-	LXVW4X (INP)(R8), VS60
-	LXVW4X (INP)(R9), VS61
-	LXVW4X (INP)(R10), VS62
-
-	VXOR V27, V0, V27
-	VXOR V28, V4, V28
-	VXOR V29, V8, V29
-	VXOR V30, V12, V30
-
-	STXVW4X VS59, (OUT)(R0)
-	STXVW4X VS60, (OUT)(R8)
-	ADD     $64, INP
-	STXVW4X VS61, (OUT)(R9)
-	ADD     $-64, LEN
-	STXVW4X VS62, (OUT)(R10)
-	ADD     $64, OUT
-	BEQ     done_vsx
-
-	VADDUWM V1, V16, V0
-	VADDUWM V5, V17, V4
-	VADDUWM V9, V18, V8
-	VADDUWM V13, V19, V12
-
-	BE_XXBRW(V0)
-	BE_XXBRW(V4)
-	BE_XXBRW(V8)
-	BE_XXBRW(V12)
-
-	CMPU  LEN, $64
-	BLT   tail_vsx
-
-	LXVW4X (INP)(R0), VS59
-	LXVW4X (INP)(R8), VS60
-	LXVW4X (INP)(R9), VS61
-	LXVW4X (INP)(R10), VS62
-
-	VXOR V27, V0, V27
-	VXOR V28, V4, V28
-	VXOR V29, V8, V29
-	VXOR V30, V12, V30
-
-	STXVW4X VS59, (OUT)(R0)
-	STXVW4X VS60, (OUT)(R8)
-	ADD     $64, INP
-	STXVW4X VS61, (OUT)(R9)
-	ADD     $-64, LEN
-	STXVW4X VS62, (OUT)(V10)
-	ADD     $64, OUT
-	BEQ     done_vsx
-
-	VADDUWM V2, V16, V0
-	VADDUWM V6, V17, V4
-	VADDUWM V10, V18, V8
-	VADDUWM V14, V19, V12
-
-	BE_XXBRW(V0)
-	BE_XXBRW(V4)
-	BE_XXBRW(V8)
-	BE_XXBRW(V12)
-
-	CMPU LEN, $64
-	BLT  tail_vsx
-
-	LXVW4X (INP)(R0), VS59
-	LXVW4X (INP)(R8), VS60
-	LXVW4X (INP)(R9), VS61
-	LXVW4X (INP)(R10), VS62
-
-	VXOR V27, V0, V27
-	VXOR V28, V4, V28
-	VXOR V29, V8, V29
-	VXOR V30, V12, V30
-
-	STXVW4X VS59, (OUT)(R0)
-	STXVW4X VS60, (OUT)(R8)
-	ADD     $64, INP
-	STXVW4X VS61, (OUT)(R9)
-	ADD     $-64, LEN
-	STXVW4X VS62, (OUT)(R10)
-	ADD     $64, OUT
-	BEQ     done_vsx
-
-	VADDUWM V3, V16, V0
-	VADDUWM V7, V17, V4
-	VADDUWM V11, V18, V8
-	VADDUWM V15, V19, V12
-
-	BE_XXBRW(V0)
-	BE_XXBRW(V4)
-	BE_XXBRW(V8)
-	BE_XXBRW(V12)
-
-	CMPU  LEN, $64
-	BLT   tail_vsx
-
-	LXVW4X (INP)(R0), VS59
-	LXVW4X (INP)(R8), VS60
-	LXVW4X (INP)(R9), VS61
-	LXVW4X (INP)(R10), VS62
-
-	VXOR V27, V0, V27
-	VXOR V28, V4, V28
-	VXOR V29, V8, V29
-	VXOR V30, V12, V30
-
-	STXVW4X VS59, (OUT)(R0)
-	STXVW4X VS60, (OUT)(R8)
-	ADD     $64, INP
-	STXVW4X VS61, (OUT)(R9)
-	ADD     $-64, LEN
-	STXVW4X VS62, (OUT)(R10)
-	ADD     $64, OUT
-
-	MOVD $10, R14
-	MOVD R14, CTR
-	BNE  loop_outer_vsx
-
-done_vsx:
-	// Increment counter by number of 64 byte blocks
-	MOVWZ (CNT), R14
-	ADD  BLOCKS, R14
-	MOVWZ R14, (CNT)
-	RET
-
-tail_vsx:
-	ADD  $32, R1, R11
-	MOVD LEN, CTR
-
-	// Save values on stack to copy from
-	STXVW4X VS32, (R11)(R0)
-	STXVW4X VS36, (R11)(R8)
-	STXVW4X VS40, (R11)(R9)
-	STXVW4X VS44, (R11)(R10)
-	ADD $-1, R11, R12
-	ADD $-1, INP
-	ADD $-1, OUT
-	PCALIGN $16
-looptail_vsx:
-	// Copying the result to OUT
-	// in bytes.
-	MOVBZU 1(R12), KEY
-	MOVBZU 1(INP), TMP
-	XOR    KEY, TMP, KEY
-	MOVBU  KEY, 1(OUT)
-	BDNZ   looptail_vsx
-
-	// Clear the stack values
-	STXVW4X VS48, (R11)(R0)
-	STXVW4X VS48, (R11)(R8)
-	STXVW4X VS48, (R11)(R9)
-	STXVW4X VS48, (R11)(R10)
-	BR      done_vsx
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_s390x.go b/vendor/golang.org/x/crypto/chacha20/chacha_s390x.go
deleted file mode 100644
index 683ccfd1c..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_s390x.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-package chacha20
-
-import "golang.org/x/sys/cpu"
-
-var haveAsm = cpu.S390X.HasVX
-
-const bufSize = 256
-
-// xorKeyStreamVX is an assembly implementation of XORKeyStream. It must only
-// be called when the vector facility is available. Implementation in asm_s390x.s.
-//
-//go:noescape
-func xorKeyStreamVX(dst, src []byte, key *[8]uint32, nonce *[3]uint32, counter *uint32)
-
-func (c *Cipher) xorKeyStreamBlocks(dst, src []byte) {
-	if cpu.S390X.HasVX {
-		xorKeyStreamVX(dst, src, &c.key, &c.nonce, &c.counter)
-	} else {
-		c.xorKeyStreamBlocksGeneric(dst, src)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_s390x.s b/vendor/golang.org/x/crypto/chacha20/chacha_s390x.s
deleted file mode 100644
index 1eda91a3d..000000000
--- a/vendor/golang.org/x/crypto/chacha20/chacha_s390x.s
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-#include "go_asm.h"
-#include "textflag.h"
-
-// This is an implementation of the ChaCha20 encryption algorithm as
-// specified in RFC 7539. It uses vector instructions to compute
-// 4 keystream blocks in parallel (256 bytes) which are then XORed
-// with the bytes in the input slice.
-
-GLOBL ·constants<>(SB), RODATA|NOPTR, $32
-// BSWAP: swap bytes in each 4-byte element
-DATA ·constants<>+0x00(SB)/4, $0x03020100
-DATA ·constants<>+0x04(SB)/4, $0x07060504
-DATA ·constants<>+0x08(SB)/4, $0x0b0a0908
-DATA ·constants<>+0x0c(SB)/4, $0x0f0e0d0c
-// J0: [j0, j1, j2, j3]
-DATA ·constants<>+0x10(SB)/4, $0x61707865
-DATA ·constants<>+0x14(SB)/4, $0x3320646e
-DATA ·constants<>+0x18(SB)/4, $0x79622d32
-DATA ·constants<>+0x1c(SB)/4, $0x6b206574
-
-#define BSWAP V5
-#define J0    V6
-#define KEY0  V7
-#define KEY1  V8
-#define NONCE V9
-#define CTR   V10
-#define M0    V11
-#define M1    V12
-#define M2    V13
-#define M3    V14
-#define INC   V15
-#define X0    V16
-#define X1    V17
-#define X2    V18
-#define X3    V19
-#define X4    V20
-#define X5    V21
-#define X6    V22
-#define X7    V23
-#define X8    V24
-#define X9    V25
-#define X10   V26
-#define X11   V27
-#define X12   V28
-#define X13   V29
-#define X14   V30
-#define X15   V31
-
-#define NUM_ROUNDS 20
-
-#define ROUND4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3) \
-	VAF    a1, a0, a0  \
-	VAF    b1, b0, b0  \
-	VAF    c1, c0, c0  \
-	VAF    d1, d0, d0  \
-	VX     a0, a2, a2  \
-	VX     b0, b2, b2  \
-	VX     c0, c2, c2  \
-	VX     d0, d2, d2  \
-	VERLLF $16, a2, a2 \
-	VERLLF $16, b2, b2 \
-	VERLLF $16, c2, c2 \
-	VERLLF $16, d2, d2 \
-	VAF    a2, a3, a3  \
-	VAF    b2, b3, b3  \
-	VAF    c2, c3, c3  \
-	VAF    d2, d3, d3  \
-	VX     a3, a1, a1  \
-	VX     b3, b1, b1  \
-	VX     c3, c1, c1  \
-	VX     d3, d1, d1  \
-	VERLLF $12, a1, a1 \
-	VERLLF $12, b1, b1 \
-	VERLLF $12, c1, c1 \
-	VERLLF $12, d1, d1 \
-	VAF    a1, a0, a0  \
-	VAF    b1, b0, b0  \
-	VAF    c1, c0, c0  \
-	VAF    d1, d0, d0  \
-	VX     a0, a2, a2  \
-	VX     b0, b2, b2  \
-	VX     c0, c2, c2  \
-	VX     d0, d2, d2  \
-	VERLLF $8, a2, a2  \
-	VERLLF $8, b2, b2  \
-	VERLLF $8, c2, c2  \
-	VERLLF $8, d2, d2  \
-	VAF    a2, a3, a3  \
-	VAF    b2, b3, b3  \
-	VAF    c2, c3, c3  \
-	VAF    d2, d3, d3  \
-	VX     a3, a1, a1  \
-	VX     b3, b1, b1  \
-	VX     c3, c1, c1  \
-	VX     d3, d1, d1  \
-	VERLLF $7, a1, a1  \
-	VERLLF $7, b1, b1  \
-	VERLLF $7, c1, c1  \
-	VERLLF $7, d1, d1
-
-#define PERMUTE(mask, v0, v1, v2, v3) \
-	VPERM v0, v0, mask, v0 \
-	VPERM v1, v1, mask, v1 \
-	VPERM v2, v2, mask, v2 \
-	VPERM v3, v3, mask, v3
-
-#define ADDV(x, v0, v1, v2, v3) \
-	VAF x, v0, v0 \
-	VAF x, v1, v1 \
-	VAF x, v2, v2 \
-	VAF x, v3, v3
-
-#define XORV(off, dst, src, v0, v1, v2, v3) \
-	VLM  off(src), M0, M3          \
-	PERMUTE(BSWAP, v0, v1, v2, v3) \
-	VX   v0, M0, M0                \
-	VX   v1, M1, M1                \
-	VX   v2, M2, M2                \
-	VX   v3, M3, M3                \
-	VSTM M0, M3, off(dst)
-
-#define SHUFFLE(a, b, c, d, t, u, v, w) \
-	VMRHF a, c, t \ // t = {a[0], c[0], a[1], c[1]}
-	VMRHF b, d, u \ // u = {b[0], d[0], b[1], d[1]}
-	VMRLF a, c, v \ // v = {a[2], c[2], a[3], c[3]}
-	VMRLF b, d, w \ // w = {b[2], d[2], b[3], d[3]}
-	VMRHF t, u, a \ // a = {a[0], b[0], c[0], d[0]}
-	VMRLF t, u, b \ // b = {a[1], b[1], c[1], d[1]}
-	VMRHF v, w, c \ // c = {a[2], b[2], c[2], d[2]}
-	VMRLF v, w, d // d = {a[3], b[3], c[3], d[3]}
-
-// func xorKeyStreamVX(dst, src []byte, key *[8]uint32, nonce *[3]uint32, counter *uint32)
-TEXT ·xorKeyStreamVX(SB), NOSPLIT, $0
-	MOVD $·constants<>(SB), R1
-	MOVD dst+0(FP), R2         // R2=&dst[0]
-	LMG  src+24(FP), R3, R4    // R3=&src[0] R4=len(src)
-	MOVD key+48(FP), R5        // R5=key
-	MOVD nonce+56(FP), R6      // R6=nonce
-	MOVD counter+64(FP), R7    // R7=counter
-
-	// load BSWAP and J0
-	VLM (R1), BSWAP, J0
-
-	// setup
-	MOVD  $95, R0
-	VLM   (R5), KEY0, KEY1
-	VLL   R0, (R6), NONCE
-	VZERO M0
-	VLEIB $7, $32, M0
-	VSRLB M0, NONCE, NONCE
-
-	// initialize counter values
-	VLREPF (R7), CTR
-	VZERO  INC
-	VLEIF  $1, $1, INC
-	VLEIF  $2, $2, INC
-	VLEIF  $3, $3, INC
-	VAF    INC, CTR, CTR
-	VREPIF $4, INC
-
-chacha:
-	VREPF $0, J0, X0
-	VREPF $1, J0, X1
-	VREPF $2, J0, X2
-	VREPF $3, J0, X3
-	VREPF $0, KEY0, X4
-	VREPF $1, KEY0, X5
-	VREPF $2, KEY0, X6
-	VREPF $3, KEY0, X7
-	VREPF $0, KEY1, X8
-	VREPF $1, KEY1, X9
-	VREPF $2, KEY1, X10
-	VREPF $3, KEY1, X11
-	VLR   CTR, X12
-	VREPF $1, NONCE, X13
-	VREPF $2, NONCE, X14
-	VREPF $3, NONCE, X15
-
-	MOVD $(NUM_ROUNDS/2), R1
-
-loop:
-	ROUND4(X0, X4, X12,  X8, X1, X5, X13,  X9, X2, X6, X14, X10, X3, X7, X15, X11)
-	ROUND4(X0, X5, X15, X10, X1, X6, X12, X11, X2, X7, X13, X8,  X3, X4, X14, X9)
-
-	ADD $-1, R1
-	BNE loop
-
-	// decrement length
-	ADD $-256, R4
-
-	// rearrange vectors
-	SHUFFLE(X0, X1, X2, X3, M0, M1, M2, M3)
-	ADDV(J0, X0, X1, X2, X3)
-	SHUFFLE(X4, X5, X6, X7, M0, M1, M2, M3)
-	ADDV(KEY0, X4, X5, X6, X7)
-	SHUFFLE(X8, X9, X10, X11, M0, M1, M2, M3)
-	ADDV(KEY1, X8, X9, X10, X11)
-	VAF CTR, X12, X12
-	SHUFFLE(X12, X13, X14, X15, M0, M1, M2, M3)
-	ADDV(NONCE, X12, X13, X14, X15)
-
-	// increment counters
-	VAF INC, CTR, CTR
-
-	// xor keystream with plaintext
-	XORV(0*64, R2, R3, X0, X4,  X8, X12)
-	XORV(1*64, R2, R3, X1, X5,  X9, X13)
-	XORV(2*64, R2, R3, X2, X6, X10, X14)
-	XORV(3*64, R2, R3, X3, X7, X11, X15)
-
-	// increment pointers
-	MOVD $256(R2), R2
-	MOVD $256(R3), R3
-
-	CMPBNE  R4, $0, chacha
-
-	VSTEF $0, CTR, (R7)
-	RET
diff --git a/vendor/golang.org/x/crypto/chacha20/xor.go b/vendor/golang.org/x/crypto/chacha20/xor.go
deleted file mode 100644
index c2d04851e..000000000
--- a/vendor/golang.org/x/crypto/chacha20/xor.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found src the LICENSE file.
-
-package chacha20
-
-import "runtime"
-
-// Platforms that have fast unaligned 32-bit little endian accesses.
-const unaligned = runtime.GOARCH == "386" ||
-	runtime.GOARCH == "amd64" ||
-	runtime.GOARCH == "arm64" ||
-	runtime.GOARCH == "ppc64le" ||
-	runtime.GOARCH == "s390x"
-
-// addXor reads a little endian uint32 from src, XORs it with (a + b) and
-// places the result in little endian byte order in dst.
-func addXor(dst, src []byte, a, b uint32) {
-	_, _ = src[3], dst[3] // bounds check elimination hint
-	if unaligned {
-		// The compiler should optimize this code into
-		// 32-bit unaligned little endian loads and stores.
-		// TODO: delete once the compiler does a reliably
-		// good job with the generic code below.
-		// See issue #25111 for more details.
-		v := uint32(src[0])
-		v |= uint32(src[1]) << 8
-		v |= uint32(src[2]) << 16
-		v |= uint32(src[3]) << 24
-		v ^= a + b
-		dst[0] = byte(v)
-		dst[1] = byte(v >> 8)
-		dst[2] = byte(v >> 16)
-		dst[3] = byte(v >> 24)
-	} else {
-		a += b
-		dst[0] = src[0] ^ byte(a)
-		dst[1] = src[1] ^ byte(a>>8)
-		dst[2] = src[2] ^ byte(a>>16)
-		dst[3] = src[3] ^ byte(a>>24)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/cryptobyte/asn1.go b/vendor/golang.org/x/crypto/cryptobyte/asn1.go
deleted file mode 100644
index d25979d9f..000000000
--- a/vendor/golang.org/x/crypto/cryptobyte/asn1.go
+++ /dev/null
@@ -1,825 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte
-
-import (
-	encoding_asn1 "encoding/asn1"
-	"fmt"
-	"math/big"
-	"reflect"
-	"time"
-
-	"golang.org/x/crypto/cryptobyte/asn1"
-)
-
-// This file contains ASN.1-related methods for String and Builder.
-
-// Builder
-
-// AddASN1Int64 appends a DER-encoded ASN.1 INTEGER.
-func (b *Builder) AddASN1Int64(v int64) {
-	b.addASN1Signed(asn1.INTEGER, v)
-}
-
-// AddASN1Int64WithTag appends a DER-encoded ASN.1 INTEGER with the
-// given tag.
-func (b *Builder) AddASN1Int64WithTag(v int64, tag asn1.Tag) {
-	b.addASN1Signed(tag, v)
-}
-
-// AddASN1Enum appends a DER-encoded ASN.1 ENUMERATION.
-func (b *Builder) AddASN1Enum(v int64) {
-	b.addASN1Signed(asn1.ENUM, v)
-}
-
-func (b *Builder) addASN1Signed(tag asn1.Tag, v int64) {
-	b.AddASN1(tag, func(c *Builder) {
-		length := 1
-		for i := v; i >= 0x80 || i < -0x80; i >>= 8 {
-			length++
-		}
-
-		for ; length > 0; length-- {
-			i := v >> uint((length-1)*8) & 0xff
-			c.AddUint8(uint8(i))
-		}
-	})
-}
-
-// AddASN1Uint64 appends a DER-encoded ASN.1 INTEGER.
-func (b *Builder) AddASN1Uint64(v uint64) {
-	b.AddASN1(asn1.INTEGER, func(c *Builder) {
-		length := 1
-		for i := v; i >= 0x80; i >>= 8 {
-			length++
-		}
-
-		for ; length > 0; length-- {
-			i := v >> uint((length-1)*8) & 0xff
-			c.AddUint8(uint8(i))
-		}
-	})
-}
-
-// AddASN1BigInt appends a DER-encoded ASN.1 INTEGER.
-func (b *Builder) AddASN1BigInt(n *big.Int) {
-	if b.err != nil {
-		return
-	}
-
-	b.AddASN1(asn1.INTEGER, func(c *Builder) {
-		if n.Sign() < 0 {
-			// A negative number has to be converted to two's-complement form. So we
-			// invert and subtract 1. If the most-significant-bit isn't set then
-			// we'll need to pad the beginning with 0xff in order to keep the number
-			// negative.
-			nMinus1 := new(big.Int).Neg(n)
-			nMinus1.Sub(nMinus1, bigOne)
-			bytes := nMinus1.Bytes()
-			for i := range bytes {
-				bytes[i] ^= 0xff
-			}
-			if len(bytes) == 0 || bytes[0]&0x80 == 0 {
-				c.add(0xff)
-			}
-			c.add(bytes...)
-		} else if n.Sign() == 0 {
-			c.add(0)
-		} else {
-			bytes := n.Bytes()
-			if bytes[0]&0x80 != 0 {
-				c.add(0)
-			}
-			c.add(bytes...)
-		}
-	})
-}
-
-// AddASN1OctetString appends a DER-encoded ASN.1 OCTET STRING.
-func (b *Builder) AddASN1OctetString(bytes []byte) {
-	b.AddASN1(asn1.OCTET_STRING, func(c *Builder) {
-		c.AddBytes(bytes)
-	})
-}
-
-const generalizedTimeFormatStr = "20060102150405Z0700"
-
-// AddASN1GeneralizedTime appends a DER-encoded ASN.1 GENERALIZEDTIME.
-func (b *Builder) AddASN1GeneralizedTime(t time.Time) {
-	if t.Year() < 0 || t.Year() > 9999 {
-		b.err = fmt.Errorf("cryptobyte: cannot represent %v as a GeneralizedTime", t)
-		return
-	}
-	b.AddASN1(asn1.GeneralizedTime, func(c *Builder) {
-		c.AddBytes([]byte(t.Format(generalizedTimeFormatStr)))
-	})
-}
-
-// AddASN1UTCTime appends a DER-encoded ASN.1 UTCTime.
-func (b *Builder) AddASN1UTCTime(t time.Time) {
-	b.AddASN1(asn1.UTCTime, func(c *Builder) {
-		// As utilized by the X.509 profile, UTCTime can only
-		// represent the years 1950 through 2049.
-		if t.Year() < 1950 || t.Year() >= 2050 {
-			b.err = fmt.Errorf("cryptobyte: cannot represent %v as a UTCTime", t)
-			return
-		}
-		c.AddBytes([]byte(t.Format(defaultUTCTimeFormatStr)))
-	})
-}
-
-// AddASN1BitString appends a DER-encoded ASN.1 BIT STRING. This does not
-// support BIT STRINGs that are not a whole number of bytes.
-func (b *Builder) AddASN1BitString(data []byte) {
-	b.AddASN1(asn1.BIT_STRING, func(b *Builder) {
-		b.AddUint8(0)
-		b.AddBytes(data)
-	})
-}
-
-func (b *Builder) addBase128Int(n int64) {
-	var length int
-	if n == 0 {
-		length = 1
-	} else {
-		for i := n; i > 0; i >>= 7 {
-			length++
-		}
-	}
-
-	for i := length - 1; i >= 0; i-- {
-		o := byte(n >> uint(i*7))
-		o &= 0x7f
-		if i != 0 {
-			o |= 0x80
-		}
-
-		b.add(o)
-	}
-}
-
-func isValidOID(oid encoding_asn1.ObjectIdentifier) bool {
-	if len(oid) < 2 {
-		return false
-	}
-
-	if oid[0] > 2 || (oid[0] <= 1 && oid[1] >= 40) {
-		return false
-	}
-
-	for _, v := range oid {
-		if v < 0 {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (b *Builder) AddASN1ObjectIdentifier(oid encoding_asn1.ObjectIdentifier) {
-	b.AddASN1(asn1.OBJECT_IDENTIFIER, func(b *Builder) {
-		if !isValidOID(oid) {
-			b.err = fmt.Errorf("cryptobyte: invalid OID: %v", oid)
-			return
-		}
-
-		b.addBase128Int(int64(oid[0])*40 + int64(oid[1]))
-		for _, v := range oid[2:] {
-			b.addBase128Int(int64(v))
-		}
-	})
-}
-
-func (b *Builder) AddASN1Boolean(v bool) {
-	b.AddASN1(asn1.BOOLEAN, func(b *Builder) {
-		if v {
-			b.AddUint8(0xff)
-		} else {
-			b.AddUint8(0)
-		}
-	})
-}
-
-func (b *Builder) AddASN1NULL() {
-	b.add(uint8(asn1.NULL), 0)
-}
-
-// MarshalASN1 calls encoding_asn1.Marshal on its input and appends the result if
-// successful or records an error if one occurred.
-func (b *Builder) MarshalASN1(v interface{}) {
-	// NOTE(martinkr): This is somewhat of a hack to allow propagation of
-	// encoding_asn1.Marshal errors into Builder.err. N.B. if you call MarshalASN1 with a
-	// value embedded into a struct, its tag information is lost.
-	if b.err != nil {
-		return
-	}
-	bytes, err := encoding_asn1.Marshal(v)
-	if err != nil {
-		b.err = err
-		return
-	}
-	b.AddBytes(bytes)
-}
-
-// AddASN1 appends an ASN.1 object. The object is prefixed with the given tag.
-// Tags greater than 30 are not supported and result in an error (i.e.
-// low-tag-number form only). The child builder passed to the
-// BuilderContinuation can be used to build the content of the ASN.1 object.
-func (b *Builder) AddASN1(tag asn1.Tag, f BuilderContinuation) {
-	if b.err != nil {
-		return
-	}
-	// Identifiers with the low five bits set indicate high-tag-number format
-	// (two or more octets), which we don't support.
-	if tag&0x1f == 0x1f {
-		b.err = fmt.Errorf("cryptobyte: high-tag number identifier octets not supported: 0x%x", tag)
-		return
-	}
-	b.AddUint8(uint8(tag))
-	b.addLengthPrefixed(1, true, f)
-}
-
-// String
-
-// ReadASN1Boolean decodes an ASN.1 BOOLEAN and converts it to a boolean
-// representation into out and advances. It reports whether the read
-// was successful.
-func (s *String) ReadASN1Boolean(out *bool) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.BOOLEAN) || len(bytes) != 1 {
-		return false
-	}
-
-	switch bytes[0] {
-	case 0:
-		*out = false
-	case 0xff:
-		*out = true
-	default:
-		return false
-	}
-
-	return true
-}
-
-// ReadASN1Integer decodes an ASN.1 INTEGER into out and advances. If out does
-// not point to an integer, to a big.Int, or to a []byte it panics. Only
-// positive and zero values can be decoded into []byte, and they are returned as
-// big-endian binary values that share memory with s. Positive values will have
-// no leading zeroes, and zero will be returned as a single zero byte.
-// ReadASN1Integer reports whether the read was successful.
-func (s *String) ReadASN1Integer(out interface{}) bool {
-	switch out := out.(type) {
-	case *int, *int8, *int16, *int32, *int64:
-		var i int64
-		if !s.readASN1Int64(&i) || reflect.ValueOf(out).Elem().OverflowInt(i) {
-			return false
-		}
-		reflect.ValueOf(out).Elem().SetInt(i)
-		return true
-	case *uint, *uint8, *uint16, *uint32, *uint64:
-		var u uint64
-		if !s.readASN1Uint64(&u) || reflect.ValueOf(out).Elem().OverflowUint(u) {
-			return false
-		}
-		reflect.ValueOf(out).Elem().SetUint(u)
-		return true
-	case *big.Int:
-		return s.readASN1BigInt(out)
-	case *[]byte:
-		return s.readASN1Bytes(out)
-	default:
-		panic("out does not point to an integer type")
-	}
-}
-
-func checkASN1Integer(bytes []byte) bool {
-	if len(bytes) == 0 {
-		// An INTEGER is encoded with at least one octet.
-		return false
-	}
-	if len(bytes) == 1 {
-		return true
-	}
-	if bytes[0] == 0 && bytes[1]&0x80 == 0 || bytes[0] == 0xff && bytes[1]&0x80 == 0x80 {
-		// Value is not minimally encoded.
-		return false
-	}
-	return true
-}
-
-var bigOne = big.NewInt(1)
-
-func (s *String) readASN1BigInt(out *big.Int) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) {
-		return false
-	}
-	if bytes[0]&0x80 == 0x80 {
-		// Negative number.
-		neg := make([]byte, len(bytes))
-		for i, b := range bytes {
-			neg[i] = ^b
-		}
-		out.SetBytes(neg)
-		out.Add(out, bigOne)
-		out.Neg(out)
-	} else {
-		out.SetBytes(bytes)
-	}
-	return true
-}
-
-func (s *String) readASN1Bytes(out *[]byte) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) {
-		return false
-	}
-	if bytes[0]&0x80 == 0x80 {
-		return false
-	}
-	for len(bytes) > 1 && bytes[0] == 0 {
-		bytes = bytes[1:]
-	}
-	*out = bytes
-	return true
-}
-
-func (s *String) readASN1Int64(out *int64) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) || !asn1Signed(out, bytes) {
-		return false
-	}
-	return true
-}
-
-func asn1Signed(out *int64, n []byte) bool {
-	length := len(n)
-	if length > 8 {
-		return false
-	}
-	for i := 0; i < length; i++ {
-		*out <<= 8
-		*out |= int64(n[i])
-	}
-	// Shift up and down in order to sign extend the result.
-	*out <<= 64 - uint8(length)*8
-	*out >>= 64 - uint8(length)*8
-	return true
-}
-
-func (s *String) readASN1Uint64(out *uint64) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) || !asn1Unsigned(out, bytes) {
-		return false
-	}
-	return true
-}
-
-func asn1Unsigned(out *uint64, n []byte) bool {
-	length := len(n)
-	if length > 9 || length == 9 && n[0] != 0 {
-		// Too large for uint64.
-		return false
-	}
-	if n[0]&0x80 != 0 {
-		// Negative number.
-		return false
-	}
-	for i := 0; i < length; i++ {
-		*out <<= 8
-		*out |= uint64(n[i])
-	}
-	return true
-}
-
-// ReadASN1Int64WithTag decodes an ASN.1 INTEGER with the given tag into out
-// and advances. It reports whether the read was successful and resulted in a
-// value that can be represented in an int64.
-func (s *String) ReadASN1Int64WithTag(out *int64, tag asn1.Tag) bool {
-	var bytes String
-	return s.ReadASN1(&bytes, tag) && checkASN1Integer(bytes) && asn1Signed(out, bytes)
-}
-
-// ReadASN1Enum decodes an ASN.1 ENUMERATION into out and advances. It reports
-// whether the read was successful.
-func (s *String) ReadASN1Enum(out *int) bool {
-	var bytes String
-	var i int64
-	if !s.ReadASN1(&bytes, asn1.ENUM) || !checkASN1Integer(bytes) || !asn1Signed(&i, bytes) {
-		return false
-	}
-	if int64(int(i)) != i {
-		return false
-	}
-	*out = int(i)
-	return true
-}
-
-func (s *String) readBase128Int(out *int) bool {
-	ret := 0
-	for i := 0; len(*s) > 0; i++ {
-		if i == 5 {
-			return false
-		}
-		// Avoid overflowing int on a 32-bit platform.
-		// We don't want different behavior based on the architecture.
-		if ret >= 1<<(31-7) {
-			return false
-		}
-		ret <<= 7
-		b := s.read(1)[0]
-
-		// ITU-T X.690, section 8.19.2:
-		// The subidentifier shall be encoded in the fewest possible octets,
-		// that is, the leading octet of the subidentifier shall not have the value 0x80.
-		if i == 0 && b == 0x80 {
-			return false
-		}
-
-		ret |= int(b & 0x7f)
-		if b&0x80 == 0 {
-			*out = ret
-			return true
-		}
-	}
-	return false // truncated
-}
-
-// ReadASN1ObjectIdentifier decodes an ASN.1 OBJECT IDENTIFIER into out and
-// advances. It reports whether the read was successful.
-func (s *String) ReadASN1ObjectIdentifier(out *encoding_asn1.ObjectIdentifier) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.OBJECT_IDENTIFIER) || len(bytes) == 0 {
-		return false
-	}
-
-	// In the worst case, we get two elements from the first byte (which is
-	// encoded differently) and then every varint is a single byte long.
-	components := make([]int, len(bytes)+1)
-
-	// The first varint is 40*value1 + value2:
-	// According to this packing, value1 can take the values 0, 1 and 2 only.
-	// When value1 = 0 or value1 = 1, then value2 is <= 39. When value1 = 2,
-	// then there are no restrictions on value2.
-	var v int
-	if !bytes.readBase128Int(&v) {
-		return false
-	}
-	if v < 80 {
-		components[0] = v / 40
-		components[1] = v % 40
-	} else {
-		components[0] = 2
-		components[1] = v - 80
-	}
-
-	i := 2
-	for ; len(bytes) > 0; i++ {
-		if !bytes.readBase128Int(&v) {
-			return false
-		}
-		components[i] = v
-	}
-	*out = components[:i]
-	return true
-}
-
-// ReadASN1GeneralizedTime decodes an ASN.1 GENERALIZEDTIME into out and
-// advances. It reports whether the read was successful.
-func (s *String) ReadASN1GeneralizedTime(out *time.Time) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.GeneralizedTime) {
-		return false
-	}
-	t := string(bytes)
-	res, err := time.Parse(generalizedTimeFormatStr, t)
-	if err != nil {
-		return false
-	}
-	if serialized := res.Format(generalizedTimeFormatStr); serialized != t {
-		return false
-	}
-	*out = res
-	return true
-}
-
-const defaultUTCTimeFormatStr = "060102150405Z0700"
-
-// ReadASN1UTCTime decodes an ASN.1 UTCTime into out and advances.
-// It reports whether the read was successful.
-func (s *String) ReadASN1UTCTime(out *time.Time) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.UTCTime) {
-		return false
-	}
-	t := string(bytes)
-
-	formatStr := defaultUTCTimeFormatStr
-	var err error
-	res, err := time.Parse(formatStr, t)
-	if err != nil {
-		// Fallback to minute precision if we can't parse second
-		// precision. If we are following X.509 or X.690 we shouldn't
-		// support this, but we do.
-		formatStr = "0601021504Z0700"
-		res, err = time.Parse(formatStr, t)
-	}
-	if err != nil {
-		return false
-	}
-
-	if serialized := res.Format(formatStr); serialized != t {
-		return false
-	}
-
-	if res.Year() >= 2050 {
-		// UTCTime interprets the low order digits 50-99 as 1950-99.
-		// This only applies to its use in the X.509 profile.
-		// See https://tools.ietf.org/html/rfc5280#section-4.1.2.5.1
-		res = res.AddDate(-100, 0, 0)
-	}
-	*out = res
-	return true
-}
-
-// ReadASN1BitString decodes an ASN.1 BIT STRING into out and advances.
-// It reports whether the read was successful.
-func (s *String) ReadASN1BitString(out *encoding_asn1.BitString) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.BIT_STRING) || len(bytes) == 0 ||
-		len(bytes)*8/8 != len(bytes) {
-		return false
-	}
-
-	paddingBits := bytes[0]
-	bytes = bytes[1:]
-	if paddingBits > 7 ||
-		len(bytes) == 0 && paddingBits != 0 ||
-		len(bytes) > 0 && bytes[len(bytes)-1]&(1< 4 || len(*s) < int(2+lenLen) {
-			return false
-		}
-
-		lenBytes := String((*s)[2 : 2+lenLen])
-		if !lenBytes.readUnsigned(&len32, int(lenLen)) {
-			return false
-		}
-
-		// ITU-T X.690 section 10.1 (DER length forms) requires encoding the length
-		// with the minimum number of octets.
-		if len32 < 128 {
-			// Length should have used short-form encoding.
-			return false
-		}
-		if len32>>((lenLen-1)*8) == 0 {
-			// Leading octet is 0. Length should have been at least one byte shorter.
-			return false
-		}
-
-		headerLen = 2 + uint32(lenLen)
-		if headerLen+len32 < len32 {
-			// Overflow.
-			return false
-		}
-		length = headerLen + len32
-	}
-
-	if int(length) < 0 || !s.ReadBytes((*[]byte)(out), int(length)) {
-		return false
-	}
-	if skipHeader && !out.Skip(int(headerLen)) {
-		panic("cryptobyte: internal error")
-	}
-
-	return true
-}
diff --git a/vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go b/vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go
deleted file mode 100644
index 90ef6a241..000000000
--- a/vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package asn1 contains supporting types for parsing and building ASN.1
-// messages with the cryptobyte package.
-package asn1
-
-// Tag represents an ASN.1 identifier octet, consisting of a tag number
-// (indicating a type) and class (such as context-specific or constructed).
-//
-// Methods in the cryptobyte package only support the low-tag-number form, i.e.
-// a single identifier octet with bits 7-8 encoding the class and bits 1-6
-// encoding the tag number.
-type Tag uint8
-
-const (
-	classConstructed     = 0x20
-	classContextSpecific = 0x80
-)
-
-// Constructed returns t with the constructed class bit set.
-func (t Tag) Constructed() Tag { return t | classConstructed }
-
-// ContextSpecific returns t with the context-specific class bit set.
-func (t Tag) ContextSpecific() Tag { return t | classContextSpecific }
-
-// The following is a list of standard tag and class combinations.
-const (
-	BOOLEAN           = Tag(1)
-	INTEGER           = Tag(2)
-	BIT_STRING        = Tag(3)
-	OCTET_STRING      = Tag(4)
-	NULL              = Tag(5)
-	OBJECT_IDENTIFIER = Tag(6)
-	ENUM              = Tag(10)
-	UTF8String        = Tag(12)
-	SEQUENCE          = Tag(16 | classConstructed)
-	SET               = Tag(17 | classConstructed)
-	PrintableString   = Tag(19)
-	T61String         = Tag(20)
-	IA5String         = Tag(22)
-	UTCTime           = Tag(23)
-	GeneralizedTime   = Tag(24)
-	GeneralString     = Tag(27)
-)
diff --git a/vendor/golang.org/x/crypto/cryptobyte/builder.go b/vendor/golang.org/x/crypto/cryptobyte/builder.go
deleted file mode 100644
index cf254f5f1..000000000
--- a/vendor/golang.org/x/crypto/cryptobyte/builder.go
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte
-
-import (
-	"errors"
-	"fmt"
-)
-
-// A Builder builds byte strings from fixed-length and length-prefixed values.
-// Builders either allocate space as needed, or are ‘fixed’, which means that
-// they write into a given buffer and produce an error if it's exhausted.
-//
-// The zero value is a usable Builder that allocates space as needed.
-//
-// Simple values are marshaled and appended to a Builder using methods on the
-// Builder. Length-prefixed values are marshaled by providing a
-// BuilderContinuation, which is a function that writes the inner contents of
-// the value to a given Builder. See the documentation for BuilderContinuation
-// for details.
-type Builder struct {
-	err            error
-	result         []byte
-	fixedSize      bool
-	child          *Builder
-	offset         int
-	pendingLenLen  int
-	pendingIsASN1  bool
-	inContinuation *bool
-}
-
-// NewBuilder creates a Builder that appends its output to the given buffer.
-// Like append(), the slice will be reallocated if its capacity is exceeded.
-// Use Bytes to get the final buffer.
-func NewBuilder(buffer []byte) *Builder {
-	return &Builder{
-		result: buffer,
-	}
-}
-
-// NewFixedBuilder creates a Builder that appends its output into the given
-// buffer. This builder does not reallocate the output buffer. Writes that
-// would exceed the buffer's capacity are treated as an error.
-func NewFixedBuilder(buffer []byte) *Builder {
-	return &Builder{
-		result:    buffer,
-		fixedSize: true,
-	}
-}
-
-// SetError sets the value to be returned as the error from Bytes. Writes
-// performed after calling SetError are ignored.
-func (b *Builder) SetError(err error) {
-	b.err = err
-}
-
-// Bytes returns the bytes written by the builder or an error if one has
-// occurred during building.
-func (b *Builder) Bytes() ([]byte, error) {
-	if b.err != nil {
-		return nil, b.err
-	}
-	return b.result[b.offset:], nil
-}
-
-// BytesOrPanic returns the bytes written by the builder or panics if an error
-// has occurred during building.
-func (b *Builder) BytesOrPanic() []byte {
-	if b.err != nil {
-		panic(b.err)
-	}
-	return b.result[b.offset:]
-}
-
-// AddUint8 appends an 8-bit value to the byte string.
-func (b *Builder) AddUint8(v uint8) {
-	b.add(byte(v))
-}
-
-// AddUint16 appends a big-endian, 16-bit value to the byte string.
-func (b *Builder) AddUint16(v uint16) {
-	b.add(byte(v>>8), byte(v))
-}
-
-// AddUint24 appends a big-endian, 24-bit value to the byte string. The highest
-// byte of the 32-bit input value is silently truncated.
-func (b *Builder) AddUint24(v uint32) {
-	b.add(byte(v>>16), byte(v>>8), byte(v))
-}
-
-// AddUint32 appends a big-endian, 32-bit value to the byte string.
-func (b *Builder) AddUint32(v uint32) {
-	b.add(byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-}
-
-// AddUint48 appends a big-endian, 48-bit value to the byte string.
-func (b *Builder) AddUint48(v uint64) {
-	b.add(byte(v>>40), byte(v>>32), byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-}
-
-// AddUint64 appends a big-endian, 64-bit value to the byte string.
-func (b *Builder) AddUint64(v uint64) {
-	b.add(byte(v>>56), byte(v>>48), byte(v>>40), byte(v>>32), byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-}
-
-// AddBytes appends a sequence of bytes to the byte string.
-func (b *Builder) AddBytes(v []byte) {
-	b.add(v...)
-}
-
-// BuilderContinuation is a continuation-passing interface for building
-// length-prefixed byte sequences. Builder methods for length-prefixed
-// sequences (AddUint8LengthPrefixed etc) will invoke the BuilderContinuation
-// supplied to them. The child builder passed to the continuation can be used
-// to build the content of the length-prefixed sequence. For example:
-//
-//	parent := cryptobyte.NewBuilder()
-//	parent.AddUint8LengthPrefixed(func (child *Builder) {
-//	  child.AddUint8(42)
-//	  child.AddUint8LengthPrefixed(func (grandchild *Builder) {
-//	    grandchild.AddUint8(5)
-//	  })
-//	})
-//
-// It is an error to write more bytes to the child than allowed by the reserved
-// length prefix. After the continuation returns, the child must be considered
-// invalid, i.e. users must not store any copies or references of the child
-// that outlive the continuation.
-//
-// If the continuation panics with a value of type BuildError then the inner
-// error will be returned as the error from Bytes. If the child panics
-// otherwise then Bytes will repanic with the same value.
-type BuilderContinuation func(child *Builder)
-
-// BuildError wraps an error. If a BuilderContinuation panics with this value,
-// the panic will be recovered and the inner error will be returned from
-// Builder.Bytes.
-type BuildError struct {
-	Err error
-}
-
-// AddUint8LengthPrefixed adds a 8-bit length-prefixed byte sequence.
-func (b *Builder) AddUint8LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(1, false, f)
-}
-
-// AddUint16LengthPrefixed adds a big-endian, 16-bit length-prefixed byte sequence.
-func (b *Builder) AddUint16LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(2, false, f)
-}
-
-// AddUint24LengthPrefixed adds a big-endian, 24-bit length-prefixed byte sequence.
-func (b *Builder) AddUint24LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(3, false, f)
-}
-
-// AddUint32LengthPrefixed adds a big-endian, 32-bit length-prefixed byte sequence.
-func (b *Builder) AddUint32LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(4, false, f)
-}
-
-func (b *Builder) callContinuation(f BuilderContinuation, arg *Builder) {
-	if !*b.inContinuation {
-		*b.inContinuation = true
-
-		defer func() {
-			*b.inContinuation = false
-
-			r := recover()
-			if r == nil {
-				return
-			}
-
-			if buildError, ok := r.(BuildError); ok {
-				b.err = buildError.Err
-			} else {
-				panic(r)
-			}
-		}()
-	}
-
-	f(arg)
-}
-
-func (b *Builder) addLengthPrefixed(lenLen int, isASN1 bool, f BuilderContinuation) {
-	// Subsequent writes can be ignored if the builder has encountered an error.
-	if b.err != nil {
-		return
-	}
-
-	offset := len(b.result)
-	b.add(make([]byte, lenLen)...)
-
-	if b.inContinuation == nil {
-		b.inContinuation = new(bool)
-	}
-
-	b.child = &Builder{
-		result:         b.result,
-		fixedSize:      b.fixedSize,
-		offset:         offset,
-		pendingLenLen:  lenLen,
-		pendingIsASN1:  isASN1,
-		inContinuation: b.inContinuation,
-	}
-
-	b.callContinuation(f, b.child)
-	b.flushChild()
-	if b.child != nil {
-		panic("cryptobyte: internal error")
-	}
-}
-
-func (b *Builder) flushChild() {
-	if b.child == nil {
-		return
-	}
-	b.child.flushChild()
-	child := b.child
-	b.child = nil
-
-	if child.err != nil {
-		b.err = child.err
-		return
-	}
-
-	length := len(child.result) - child.pendingLenLen - child.offset
-
-	if length < 0 {
-		panic("cryptobyte: internal error") // result unexpectedly shrunk
-	}
-
-	if child.pendingIsASN1 {
-		// For ASN.1, we reserved a single byte for the length. If that turned out
-		// to be incorrect, we have to move the contents along in order to make
-		// space.
-		if child.pendingLenLen != 1 {
-			panic("cryptobyte: internal error")
-		}
-		var lenLen, lenByte uint8
-		if int64(length) > 0xfffffffe {
-			b.err = errors.New("pending ASN.1 child too long")
-			return
-		} else if length > 0xffffff {
-			lenLen = 5
-			lenByte = 0x80 | 4
-		} else if length > 0xffff {
-			lenLen = 4
-			lenByte = 0x80 | 3
-		} else if length > 0xff {
-			lenLen = 3
-			lenByte = 0x80 | 2
-		} else if length > 0x7f {
-			lenLen = 2
-			lenByte = 0x80 | 1
-		} else {
-			lenLen = 1
-			lenByte = uint8(length)
-			length = 0
-		}
-
-		// Insert the initial length byte, make space for successive length bytes,
-		// and adjust the offset.
-		child.result[child.offset] = lenByte
-		extraBytes := int(lenLen - 1)
-		if extraBytes != 0 {
-			child.add(make([]byte, extraBytes)...)
-			childStart := child.offset + child.pendingLenLen
-			copy(child.result[childStart+extraBytes:], child.result[childStart:])
-		}
-		child.offset++
-		child.pendingLenLen = extraBytes
-	}
-
-	l := length
-	for i := child.pendingLenLen - 1; i >= 0; i-- {
-		child.result[child.offset+i] = uint8(l)
-		l >>= 8
-	}
-	if l != 0 {
-		b.err = fmt.Errorf("cryptobyte: pending child length %d exceeds %d-byte length prefix", length, child.pendingLenLen)
-		return
-	}
-
-	if b.fixedSize && &b.result[0] != &child.result[0] {
-		panic("cryptobyte: BuilderContinuation reallocated a fixed-size buffer")
-	}
-
-	b.result = child.result
-}
-
-func (b *Builder) add(bytes ...byte) {
-	if b.err != nil {
-		return
-	}
-	if b.child != nil {
-		panic("cryptobyte: attempted write while child is pending")
-	}
-	if len(b.result)+len(bytes) < len(bytes) {
-		b.err = errors.New("cryptobyte: length overflow")
-	}
-	if b.fixedSize && len(b.result)+len(bytes) > cap(b.result) {
-		b.err = errors.New("cryptobyte: Builder is exceeding its fixed-size buffer")
-		return
-	}
-	b.result = append(b.result, bytes...)
-}
-
-// Unwrite rolls back non-negative n bytes written directly to the Builder.
-// An attempt by a child builder passed to a continuation to unwrite bytes
-// from its parent will panic.
-func (b *Builder) Unwrite(n int) {
-	if b.err != nil {
-		return
-	}
-	if b.child != nil {
-		panic("cryptobyte: attempted unwrite while child is pending")
-	}
-	length := len(b.result) - b.pendingLenLen - b.offset
-	if length < 0 {
-		panic("cryptobyte: internal error")
-	}
-	if n < 0 {
-		panic("cryptobyte: attempted to unwrite negative number of bytes")
-	}
-	if n > length {
-		panic("cryptobyte: attempted to unwrite more than was written")
-	}
-	b.result = b.result[:len(b.result)-n]
-}
-
-// A MarshalingValue marshals itself into a Builder.
-type MarshalingValue interface {
-	// Marshal is called by Builder.AddValue. It receives a pointer to a builder
-	// to marshal itself into. It may return an error that occurred during
-	// marshaling, such as unset or invalid values.
-	Marshal(b *Builder) error
-}
-
-// AddValue calls Marshal on v, passing a pointer to the builder to append to.
-// If Marshal returns an error, it is set on the Builder so that subsequent
-// appends don't have an effect.
-func (b *Builder) AddValue(v MarshalingValue) {
-	err := v.Marshal(b)
-	if err != nil {
-		b.err = err
-	}
-}
diff --git a/vendor/golang.org/x/crypto/cryptobyte/string.go b/vendor/golang.org/x/crypto/cryptobyte/string.go
deleted file mode 100644
index 4b0f8097f..000000000
--- a/vendor/golang.org/x/crypto/cryptobyte/string.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cryptobyte contains types that help with parsing and constructing
-// length-prefixed, binary messages, including ASN.1 DER. (The asn1 subpackage
-// contains useful ASN.1 constants.)
-//
-// The String type is for parsing. It wraps a []byte slice and provides helper
-// functions for consuming structures, value by value.
-//
-// The Builder type is for constructing messages. It providers helper functions
-// for appending values and also for appending length-prefixed submessages –
-// without having to worry about calculating the length prefix ahead of time.
-//
-// See the documentation and examples for the Builder and String types to get
-// started.
-package cryptobyte
-
-// String represents a string of bytes. It provides methods for parsing
-// fixed-length and length-prefixed values from it.
-type String []byte
-
-// read advances a String by n bytes and returns them. If less than n bytes
-// remain, it returns nil.
-func (s *String) read(n int) []byte {
-	if len(*s) < n || n < 0 {
-		return nil
-	}
-	v := (*s)[:n]
-	*s = (*s)[n:]
-	return v
-}
-
-// Skip advances the String by n byte and reports whether it was successful.
-func (s *String) Skip(n int) bool {
-	return s.read(n) != nil
-}
-
-// ReadUint8 decodes an 8-bit value into out and advances over it.
-// It reports whether the read was successful.
-func (s *String) ReadUint8(out *uint8) bool {
-	v := s.read(1)
-	if v == nil {
-		return false
-	}
-	*out = uint8(v[0])
-	return true
-}
-
-// ReadUint16 decodes a big-endian, 16-bit value into out and advances over it.
-// It reports whether the read was successful.
-func (s *String) ReadUint16(out *uint16) bool {
-	v := s.read(2)
-	if v == nil {
-		return false
-	}
-	*out = uint16(v[0])<<8 | uint16(v[1])
-	return true
-}
-
-// ReadUint24 decodes a big-endian, 24-bit value into out and advances over it.
-// It reports whether the read was successful.
-func (s *String) ReadUint24(out *uint32) bool {
-	v := s.read(3)
-	if v == nil {
-		return false
-	}
-	*out = uint32(v[0])<<16 | uint32(v[1])<<8 | uint32(v[2])
-	return true
-}
-
-// ReadUint32 decodes a big-endian, 32-bit value into out and advances over it.
-// It reports whether the read was successful.
-func (s *String) ReadUint32(out *uint32) bool {
-	v := s.read(4)
-	if v == nil {
-		return false
-	}
-	*out = uint32(v[0])<<24 | uint32(v[1])<<16 | uint32(v[2])<<8 | uint32(v[3])
-	return true
-}
-
-// ReadUint48 decodes a big-endian, 48-bit value into out and advances over it.
-// It reports whether the read was successful.
-func (s *String) ReadUint48(out *uint64) bool {
-	v := s.read(6)
-	if v == nil {
-		return false
-	}
-	*out = uint64(v[0])<<40 | uint64(v[1])<<32 | uint64(v[2])<<24 | uint64(v[3])<<16 | uint64(v[4])<<8 | uint64(v[5])
-	return true
-}
-
-// ReadUint64 decodes a big-endian, 64-bit value into out and advances over it.
-// It reports whether the read was successful.
-func (s *String) ReadUint64(out *uint64) bool {
-	v := s.read(8)
-	if v == nil {
-		return false
-	}
-	*out = uint64(v[0])<<56 | uint64(v[1])<<48 | uint64(v[2])<<40 | uint64(v[3])<<32 | uint64(v[4])<<24 | uint64(v[5])<<16 | uint64(v[6])<<8 | uint64(v[7])
-	return true
-}
-
-func (s *String) readUnsigned(out *uint32, length int) bool {
-	v := s.read(length)
-	if v == nil {
-		return false
-	}
-	var result uint32
-	for i := 0; i < length; i++ {
-		result <<= 8
-		result |= uint32(v[i])
-	}
-	*out = result
-	return true
-}
-
-func (s *String) readLengthPrefixed(lenLen int, outChild *String) bool {
-	lenBytes := s.read(lenLen)
-	if lenBytes == nil {
-		return false
-	}
-	var length uint32
-	for _, b := range lenBytes {
-		length = length << 8
-		length = length | uint32(b)
-	}
-	v := s.read(int(length))
-	if v == nil {
-		return false
-	}
-	*outChild = v
-	return true
-}
-
-// ReadUint8LengthPrefixed reads the content of an 8-bit length-prefixed value
-// into out and advances over it. It reports whether the read was successful.
-func (s *String) ReadUint8LengthPrefixed(out *String) bool {
-	return s.readLengthPrefixed(1, out)
-}
-
-// ReadUint16LengthPrefixed reads the content of a big-endian, 16-bit
-// length-prefixed value into out and advances over it. It reports whether the
-// read was successful.
-func (s *String) ReadUint16LengthPrefixed(out *String) bool {
-	return s.readLengthPrefixed(2, out)
-}
-
-// ReadUint24LengthPrefixed reads the content of a big-endian, 24-bit
-// length-prefixed value into out and advances over it. It reports whether
-// the read was successful.
-func (s *String) ReadUint24LengthPrefixed(out *String) bool {
-	return s.readLengthPrefixed(3, out)
-}
-
-// ReadBytes reads n bytes into out and advances over them. It reports
-// whether the read was successful.
-func (s *String) ReadBytes(out *[]byte, n int) bool {
-	v := s.read(n)
-	if v == nil {
-		return false
-	}
-	*out = v
-	return true
-}
-
-// CopyBytes copies len(out) bytes into out and advances over them. It reports
-// whether the copy operation was successful
-func (s *String) CopyBytes(out []byte) bool {
-	n := len(out)
-	v := s.read(n)
-	if v == nil {
-		return false
-	}
-	return copy(out, v) == n
-}
-
-// Empty reports whether the string does not contain any bytes.
-func (s String) Empty() bool {
-	return len(s) == 0
-}
diff --git a/vendor/golang.org/x/crypto/curve25519/curve25519.go b/vendor/golang.org/x/crypto/curve25519/curve25519.go
deleted file mode 100644
index 048faef3a..000000000
--- a/vendor/golang.org/x/crypto/curve25519/curve25519.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package curve25519 provides an implementation of the X25519 function, which
-// performs scalar multiplication on the elliptic curve known as Curve25519
-// according to [RFC 7748].
-//
-// The curve25519 package is a wrapper for the X25519 implementation in the
-// crypto/ecdh package. It is [frozen] and is not accepting new features.
-//
-// [RFC 7748]: https://datatracker.ietf.org/doc/html/rfc7748
-// [frozen]: https://go.dev/wiki/Frozen
-package curve25519
-
-import "crypto/ecdh"
-
-// ScalarMult sets dst to the product scalar * point.
-//
-// Deprecated: when provided a low-order point, ScalarMult will set dst to all
-// zeroes, irrespective of the scalar. Instead, use the X25519 function, which
-// will return an error.
-func ScalarMult(dst, scalar, point *[32]byte) {
-	if _, err := x25519(dst, scalar[:], point[:]); err != nil {
-		// The only error condition for x25519 when the inputs are 32 bytes long
-		// is if the output would have been the all-zero value.
-		for i := range dst {
-			dst[i] = 0
-		}
-	}
-}
-
-// ScalarBaseMult sets dst to the product scalar * base where base is the
-// standard generator.
-//
-// It is recommended to use the X25519 function with Basepoint instead, as
-// copying into fixed size arrays can lead to unexpected bugs.
-func ScalarBaseMult(dst, scalar *[32]byte) {
-	curve := ecdh.X25519()
-	priv, err := curve.NewPrivateKey(scalar[:])
-	if err != nil {
-		panic("curve25519: " + err.Error())
-	}
-	copy(dst[:], priv.PublicKey().Bytes())
-}
-
-const (
-	// ScalarSize is the size of the scalar input to X25519.
-	ScalarSize = 32
-	// PointSize is the size of the point input to X25519.
-	PointSize = 32
-)
-
-// Basepoint is the canonical Curve25519 generator.
-var Basepoint []byte
-
-var basePoint = [32]byte{9}
-
-func init() { Basepoint = basePoint[:] }
-
-// X25519 returns the result of the scalar multiplication (scalar * point),
-// according to RFC 7748, Section 5. scalar, point and the return value are
-// slices of 32 bytes.
-//
-// scalar can be generated at random, for example with crypto/rand. point should
-// be either Basepoint or the output of another X25519 call.
-//
-// If point is Basepoint (but not if it's a different slice with the same
-// contents) a precomputed implementation might be used for performance.
-func X25519(scalar, point []byte) ([]byte, error) {
-	// Outline the body of function, to let the allocation be inlined in the
-	// caller, and possibly avoid escaping to the heap.
-	var dst [32]byte
-	return x25519(&dst, scalar, point)
-}
-
-func x25519(dst *[32]byte, scalar, point []byte) ([]byte, error) {
-	curve := ecdh.X25519()
-	pub, err := curve.NewPublicKey(point)
-	if err != nil {
-		return nil, err
-	}
-	priv, err := curve.NewPrivateKey(scalar)
-	if err != nil {
-		return nil, err
-	}
-	out, err := priv.ECDH(pub)
-	if err != nil {
-		return nil, err
-	}
-	copy(dst[:], out)
-	return dst[:], nil
-}
diff --git a/vendor/golang.org/x/crypto/hkdf/hkdf.go b/vendor/golang.org/x/crypto/hkdf/hkdf.go
deleted file mode 100644
index 3bee66294..000000000
--- a/vendor/golang.org/x/crypto/hkdf/hkdf.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package hkdf implements the HMAC-based Extract-and-Expand Key Derivation
-// Function (HKDF) as defined in RFC 5869.
-//
-// HKDF is a cryptographic key derivation function (KDF) with the goal of
-// expanding limited input keying material into one or more cryptographically
-// strong secret keys.
-package hkdf
-
-import (
-	"crypto/hmac"
-	"errors"
-	"hash"
-	"io"
-)
-
-// Extract generates a pseudorandom key for use with Expand from an input secret
-// and an optional independent salt.
-//
-// Only use this function if you need to reuse the extracted key with multiple
-// Expand invocations and different context values. Most common scenarios,
-// including the generation of multiple keys, should use New instead.
-func Extract(hash func() hash.Hash, secret, salt []byte) []byte {
-	if salt == nil {
-		salt = make([]byte, hash().Size())
-	}
-	extractor := hmac.New(hash, salt)
-	extractor.Write(secret)
-	return extractor.Sum(nil)
-}
-
-type hkdf struct {
-	expander hash.Hash
-	size     int
-
-	info    []byte
-	counter byte
-
-	prev []byte
-	buf  []byte
-}
-
-func (f *hkdf) Read(p []byte) (int, error) {
-	// Check whether enough data can be generated
-	need := len(p)
-	remains := len(f.buf) + int(255-f.counter+1)*f.size
-	if remains < need {
-		return 0, errors.New("hkdf: entropy limit reached")
-	}
-	// Read any leftover from the buffer
-	n := copy(p, f.buf)
-	p = p[n:]
-
-	// Fill the rest of the buffer
-	for len(p) > 0 {
-		if f.counter > 1 {
-			f.expander.Reset()
-		}
-		f.expander.Write(f.prev)
-		f.expander.Write(f.info)
-		f.expander.Write([]byte{f.counter})
-		f.prev = f.expander.Sum(f.prev[:0])
-		f.counter++
-
-		// Copy the new batch into p
-		f.buf = f.prev
-		n = copy(p, f.buf)
-		p = p[n:]
-	}
-	// Save leftovers for next run
-	f.buf = f.buf[n:]
-
-	return need, nil
-}
-
-// Expand returns a Reader, from which keys can be read, using the given
-// pseudorandom key and optional context info, skipping the extraction step.
-//
-// The pseudorandomKey should have been generated by Extract, or be a uniformly
-// random or pseudorandom cryptographically strong key. See RFC 5869, Section
-// 3.3. Most common scenarios will want to use New instead.
-func Expand(hash func() hash.Hash, pseudorandomKey, info []byte) io.Reader {
-	expander := hmac.New(hash, pseudorandomKey)
-	return &hkdf{expander, expander.Size(), info, 1, nil, nil}
-}
-
-// New returns a Reader, from which keys can be read, using the given hash,
-// secret, salt and context info. Salt and info can be nil.
-func New(hash func() hash.Hash, secret, salt, info []byte) io.Reader {
-	prk := Extract(hash, secret, salt)
-	return Expand(hash, prk, info)
-}
diff --git a/vendor/golang.org/x/crypto/internal/alias/alias.go b/vendor/golang.org/x/crypto/internal/alias/alias.go
deleted file mode 100644
index 551ff0c35..000000000
--- a/vendor/golang.org/x/crypto/internal/alias/alias.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !purego
-
-// Package alias implements memory aliasing tests.
-package alias
-
-import "unsafe"
-
-// AnyOverlap reports whether x and y share memory at any (not necessarily
-// corresponding) index. The memory beyond the slice length is ignored.
-func AnyOverlap(x, y []byte) bool {
-	return len(x) > 0 && len(y) > 0 &&
-		uintptr(unsafe.Pointer(&x[0])) <= uintptr(unsafe.Pointer(&y[len(y)-1])) &&
-		uintptr(unsafe.Pointer(&y[0])) <= uintptr(unsafe.Pointer(&x[len(x)-1]))
-}
-
-// InexactOverlap reports whether x and y share memory at any non-corresponding
-// index. The memory beyond the slice length is ignored. Note that x and y can
-// have different lengths and still not have any inexact overlap.
-//
-// InexactOverlap can be used to implement the requirements of the crypto/cipher
-// AEAD, Block, BlockMode and Stream interfaces.
-func InexactOverlap(x, y []byte) bool {
-	if len(x) == 0 || len(y) == 0 || &x[0] == &y[0] {
-		return false
-	}
-	return AnyOverlap(x, y)
-}
diff --git a/vendor/golang.org/x/crypto/internal/alias/alias_purego.go b/vendor/golang.org/x/crypto/internal/alias/alias_purego.go
deleted file mode 100644
index 6fe61b5c6..000000000
--- a/vendor/golang.org/x/crypto/internal/alias/alias_purego.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build purego
-
-// Package alias implements memory aliasing tests.
-package alias
-
-// This is the Google App Engine standard variant based on reflect
-// because the unsafe package and cgo are disallowed.
-
-import "reflect"
-
-// AnyOverlap reports whether x and y share memory at any (not necessarily
-// corresponding) index. The memory beyond the slice length is ignored.
-func AnyOverlap(x, y []byte) bool {
-	return len(x) > 0 && len(y) > 0 &&
-		reflect.ValueOf(&x[0]).Pointer() <= reflect.ValueOf(&y[len(y)-1]).Pointer() &&
-		reflect.ValueOf(&y[0]).Pointer() <= reflect.ValueOf(&x[len(x)-1]).Pointer()
-}
-
-// InexactOverlap reports whether x and y share memory at any non-corresponding
-// index. The memory beyond the slice length is ignored. Note that x and y can
-// have different lengths and still not have any inexact overlap.
-//
-// InexactOverlap can be used to implement the requirements of the crypto/cipher
-// AEAD, Block, BlockMode and Stream interfaces.
-func InexactOverlap(x, y []byte) bool {
-	if len(x) == 0 || len(y) == 0 || &x[0] == &y[0] {
-		return false
-	}
-	return AnyOverlap(x, y)
-}
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/mac_noasm.go b/vendor/golang.org/x/crypto/internal/poly1305/mac_noasm.go
deleted file mode 100644
index 8d99551fe..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/mac_noasm.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (!amd64 && !loong64 && !ppc64le && !ppc64 && !s390x) || !gc || purego
-
-package poly1305
-
-type mac struct{ macGeneric }
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/poly1305.go b/vendor/golang.org/x/crypto/internal/poly1305/poly1305.go
deleted file mode 100644
index 4aaea810a..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/poly1305.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package poly1305 implements Poly1305 one-time message authentication code as
-// specified in https://cr.yp.to/mac/poly1305-20050329.pdf.
-//
-// Poly1305 is a fast, one-time authentication function. It is infeasible for an
-// attacker to generate an authenticator for a message without the key. However, a
-// key must only be used for a single message. Authenticating two different
-// messages with the same key allows an attacker to forge authenticators for other
-// messages with the same key.
-//
-// Poly1305 was originally coupled with AES in order to make Poly1305-AES. AES was
-// used with a fixed key in order to generate one-time keys from an nonce.
-// However, in this package AES isn't used and the one-time key is specified
-// directly.
-package poly1305
-
-import "crypto/subtle"
-
-// TagSize is the size, in bytes, of a poly1305 authenticator.
-const TagSize = 16
-
-// Sum generates an authenticator for msg using a one-time key and puts the
-// 16-byte result into out. Authenticating two different messages with the same
-// key allows an attacker to forge messages at will.
-func Sum(out *[16]byte, m []byte, key *[32]byte) {
-	h := New(key)
-	h.Write(m)
-	h.Sum(out[:0])
-}
-
-// Verify returns true if mac is a valid authenticator for m with the given key.
-func Verify(mac *[16]byte, m []byte, key *[32]byte) bool {
-	var tmp [16]byte
-	Sum(&tmp, m, key)
-	return subtle.ConstantTimeCompare(tmp[:], mac[:]) == 1
-}
-
-// New returns a new MAC computing an authentication
-// tag of all data written to it with the given key.
-// This allows writing the message progressively instead
-// of passing it as a single slice. Common users should use
-// the Sum function instead.
-//
-// The key must be unique for each message, as authenticating
-// two different messages with the same key allows an attacker
-// to forge messages at will.
-func New(key *[32]byte) *MAC {
-	m := &MAC{}
-	initialize(key, &m.macState)
-	return m
-}
-
-// MAC is an io.Writer computing an authentication tag
-// of the data written to it.
-//
-// MAC cannot be used like common hash.Hash implementations,
-// because using a poly1305 key twice breaks its security.
-// Therefore writing data to a running MAC after calling
-// Sum or Verify causes it to panic.
-type MAC struct {
-	mac // platform-dependent implementation
-
-	finalized bool
-}
-
-// Size returns the number of bytes Sum will return.
-func (h *MAC) Size() int { return TagSize }
-
-// Write adds more data to the running message authentication code.
-// It never returns an error.
-//
-// It must not be called after the first call of Sum or Verify.
-func (h *MAC) Write(p []byte) (n int, err error) {
-	if h.finalized {
-		panic("poly1305: write to MAC after Sum or Verify")
-	}
-	return h.mac.Write(p)
-}
-
-// Sum computes the authenticator of all data written to the
-// message authentication code.
-func (h *MAC) Sum(b []byte) []byte {
-	var mac [TagSize]byte
-	h.mac.Sum(&mac)
-	h.finalized = true
-	return append(b, mac[:]...)
-}
-
-// Verify returns whether the authenticator of all data written to
-// the message authentication code matches the expected value.
-func (h *MAC) Verify(expected []byte) bool {
-	var mac [TagSize]byte
-	h.mac.Sum(&mac)
-	h.finalized = true
-	return subtle.ConstantTimeCompare(expected, mac[:]) == 1
-}
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s b/vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s
deleted file mode 100644
index 133757384..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s
+++ /dev/null
@@ -1,93 +0,0 @@
-// Code generated by command: go run sum_amd64_asm.go -out ../sum_amd64.s -pkg poly1305. DO NOT EDIT.
-
-//go:build gc && !purego
-
-// func update(state *macState, msg []byte)
-TEXT ·update(SB), $0-32
-	MOVQ state+0(FP), DI
-	MOVQ msg_base+8(FP), SI
-	MOVQ msg_len+16(FP), R15
-	MOVQ (DI), R8
-	MOVQ 8(DI), R9
-	MOVQ 16(DI), R10
-	MOVQ 24(DI), R11
-	MOVQ 32(DI), R12
-	CMPQ R15, $0x10
-	JB   bytes_between_0_and_15
-
-loop:
-	ADDQ (SI), R8
-	ADCQ 8(SI), R9
-	ADCQ $0x01, R10
-	LEAQ 16(SI), SI
-
-multiply:
-	MOVQ  R11, AX
-	MULQ  R8
-	MOVQ  AX, BX
-	MOVQ  DX, CX
-	MOVQ  R11, AX
-	MULQ  R9
-	ADDQ  AX, CX
-	ADCQ  $0x00, DX
-	MOVQ  R11, R13
-	IMULQ R10, R13
-	ADDQ  DX, R13
-	MOVQ  R12, AX
-	MULQ  R8
-	ADDQ  AX, CX
-	ADCQ  $0x00, DX
-	MOVQ  DX, R8
-	MOVQ  R12, R14
-	IMULQ R10, R14
-	MOVQ  R12, AX
-	MULQ  R9
-	ADDQ  AX, R13
-	ADCQ  DX, R14
-	ADDQ  R8, R13
-	ADCQ  $0x00, R14
-	MOVQ  BX, R8
-	MOVQ  CX, R9
-	MOVQ  R13, R10
-	ANDQ  $0x03, R10
-	MOVQ  R13, BX
-	ANDQ  $-4, BX
-	ADDQ  BX, R8
-	ADCQ  R14, R9
-	ADCQ  $0x00, R10
-	SHRQ  $0x02, R14, R13
-	SHRQ  $0x02, R14
-	ADDQ  R13, R8
-	ADCQ  R14, R9
-	ADCQ  $0x00, R10
-	SUBQ  $0x10, R15
-	CMPQ  R15, $0x10
-	JAE   loop
-
-bytes_between_0_and_15:
-	TESTQ R15, R15
-	JZ    done
-	MOVQ  $0x00000001, BX
-	XORQ  CX, CX
-	XORQ  R13, R13
-	ADDQ  R15, SI
-
-flush_buffer:
-	SHLQ $0x08, BX, CX
-	SHLQ $0x08, BX
-	MOVB -1(SI), R13
-	XORQ R13, BX
-	DECQ SI
-	DECQ R15
-	JNZ  flush_buffer
-	ADDQ BX, R8
-	ADCQ CX, R9
-	ADCQ $0x00, R10
-	MOVQ $0x00000010, R15
-	JMP  multiply
-
-done:
-	MOVQ R8, (DI)
-	MOVQ R9, 8(DI)
-	MOVQ R10, 16(DI)
-	RET
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_asm.go b/vendor/golang.org/x/crypto/internal/poly1305/sum_asm.go
deleted file mode 100644
index 315b84ac3..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_asm.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego && (amd64 || loong64 || ppc64 || ppc64le)
-
-package poly1305
-
-//go:noescape
-func update(state *macState, msg []byte)
-
-// mac is a wrapper for macGeneric that redirects calls that would have gone to
-// updateGeneric to update.
-//
-// Its Write and Sum methods are otherwise identical to the macGeneric ones, but
-// using function pointers would carry a major performance cost.
-type mac struct{ macGeneric }
-
-func (h *mac) Write(p []byte) (int, error) {
-	nn := len(p)
-	if h.offset > 0 {
-		n := copy(h.buffer[h.offset:], p)
-		if h.offset+n < TagSize {
-			h.offset += n
-			return nn, nil
-		}
-		p = p[n:]
-		h.offset = 0
-		update(&h.macState, h.buffer[:])
-	}
-	if n := len(p) - (len(p) % TagSize); n > 0 {
-		update(&h.macState, p[:n])
-		p = p[n:]
-	}
-	if len(p) > 0 {
-		h.offset += copy(h.buffer[h.offset:], p)
-	}
-	return nn, nil
-}
-
-func (h *mac) Sum(out *[16]byte) {
-	state := h.macState
-	if h.offset > 0 {
-		update(&state, h.buffer[:h.offset])
-	}
-	finalize(out, &state.h, &state.s)
-}
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_generic.go b/vendor/golang.org/x/crypto/internal/poly1305/sum_generic.go
deleted file mode 100644
index ec2202bd7..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_generic.go
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file provides the generic implementation of Sum and MAC. Other files
-// might provide optimized assembly implementations of some of this code.
-
-package poly1305
-
-import (
-	"encoding/binary"
-	"math/bits"
-)
-
-// Poly1305 [RFC 7539] is a relatively simple algorithm: the authentication tag
-// for a 64 bytes message is approximately
-//
-//     s + m[0:16] * r⁴ + m[16:32] * r³ + m[32:48] * r² + m[48:64] * r  mod  2¹³⁰ - 5
-//
-// for some secret r and s. It can be computed sequentially like
-//
-//     for len(msg) > 0:
-//         h += read(msg, 16)
-//         h *= r
-//         h %= 2¹³⁰ - 5
-//     return h + s
-//
-// All the complexity is about doing performant constant-time math on numbers
-// larger than any available numeric type.
-
-func sumGeneric(out *[TagSize]byte, msg []byte, key *[32]byte) {
-	h := newMACGeneric(key)
-	h.Write(msg)
-	h.Sum(out)
-}
-
-func newMACGeneric(key *[32]byte) macGeneric {
-	m := macGeneric{}
-	initialize(key, &m.macState)
-	return m
-}
-
-// macState holds numbers in saturated 64-bit little-endian limbs. That is,
-// the value of [x0, x1, x2] is x[0] + x[1] * 2⁶⁴ + x[2] * 2¹²⁸.
-type macState struct {
-	// h is the main accumulator. It is to be interpreted modulo 2¹³⁰ - 5, but
-	// can grow larger during and after rounds. It must, however, remain below
-	// 2 * (2¹³⁰ - 5).
-	h [3]uint64
-	// r and s are the private key components.
-	r [2]uint64
-	s [2]uint64
-}
-
-type macGeneric struct {
-	macState
-
-	buffer [TagSize]byte
-	offset int
-}
-
-// Write splits the incoming message into TagSize chunks, and passes them to
-// update. It buffers incomplete chunks.
-func (h *macGeneric) Write(p []byte) (int, error) {
-	nn := len(p)
-	if h.offset > 0 {
-		n := copy(h.buffer[h.offset:], p)
-		if h.offset+n < TagSize {
-			h.offset += n
-			return nn, nil
-		}
-		p = p[n:]
-		h.offset = 0
-		updateGeneric(&h.macState, h.buffer[:])
-	}
-	if n := len(p) - (len(p) % TagSize); n > 0 {
-		updateGeneric(&h.macState, p[:n])
-		p = p[n:]
-	}
-	if len(p) > 0 {
-		h.offset += copy(h.buffer[h.offset:], p)
-	}
-	return nn, nil
-}
-
-// Sum flushes the last incomplete chunk from the buffer, if any, and generates
-// the MAC output. It does not modify its state, in order to allow for multiple
-// calls to Sum, even if no Write is allowed after Sum.
-func (h *macGeneric) Sum(out *[TagSize]byte) {
-	state := h.macState
-	if h.offset > 0 {
-		updateGeneric(&state, h.buffer[:h.offset])
-	}
-	finalize(out, &state.h, &state.s)
-}
-
-// [rMask0, rMask1] is the specified Poly1305 clamping mask in little-endian. It
-// clears some bits of the secret coefficient to make it possible to implement
-// multiplication more efficiently.
-const (
-	rMask0 = 0x0FFFFFFC0FFFFFFF
-	rMask1 = 0x0FFFFFFC0FFFFFFC
-)
-
-// initialize loads the 256-bit key into the two 128-bit secret values r and s.
-func initialize(key *[32]byte, m *macState) {
-	m.r[0] = binary.LittleEndian.Uint64(key[0:8]) & rMask0
-	m.r[1] = binary.LittleEndian.Uint64(key[8:16]) & rMask1
-	m.s[0] = binary.LittleEndian.Uint64(key[16:24])
-	m.s[1] = binary.LittleEndian.Uint64(key[24:32])
-}
-
-// uint128 holds a 128-bit number as two 64-bit limbs, for use with the
-// bits.Mul64 and bits.Add64 intrinsics.
-type uint128 struct {
-	lo, hi uint64
-}
-
-func mul64(a, b uint64) uint128 {
-	hi, lo := bits.Mul64(a, b)
-	return uint128{lo, hi}
-}
-
-func add128(a, b uint128) uint128 {
-	lo, c := bits.Add64(a.lo, b.lo, 0)
-	hi, c := bits.Add64(a.hi, b.hi, c)
-	if c != 0 {
-		panic("poly1305: unexpected overflow")
-	}
-	return uint128{lo, hi}
-}
-
-func shiftRightBy2(a uint128) uint128 {
-	a.lo = a.lo>>2 | (a.hi&3)<<62
-	a.hi = a.hi >> 2
-	return a
-}
-
-// updateGeneric absorbs msg into the state.h accumulator. For each chunk m of
-// 128 bits of message, it computes
-//
-//	h₊ = (h + m) * r  mod  2¹³⁰ - 5
-//
-// If the msg length is not a multiple of TagSize, it assumes the last
-// incomplete chunk is the final one.
-func updateGeneric(state *macState, msg []byte) {
-	h0, h1, h2 := state.h[0], state.h[1], state.h[2]
-	r0, r1 := state.r[0], state.r[1]
-
-	for len(msg) > 0 {
-		var c uint64
-
-		// For the first step, h + m, we use a chain of bits.Add64 intrinsics.
-		// The resulting value of h might exceed 2¹³⁰ - 5, but will be partially
-		// reduced at the end of the multiplication below.
-		//
-		// The spec requires us to set a bit just above the message size, not to
-		// hide leading zeroes. For full chunks, that's 1 << 128, so we can just
-		// add 1 to the most significant (2¹²⁸) limb, h2.
-		if len(msg) >= TagSize {
-			h0, c = bits.Add64(h0, binary.LittleEndian.Uint64(msg[0:8]), 0)
-			h1, c = bits.Add64(h1, binary.LittleEndian.Uint64(msg[8:16]), c)
-			h2 += c + 1
-
-			msg = msg[TagSize:]
-		} else {
-			var buf [TagSize]byte
-			copy(buf[:], msg)
-			buf[len(msg)] = 1
-
-			h0, c = bits.Add64(h0, binary.LittleEndian.Uint64(buf[0:8]), 0)
-			h1, c = bits.Add64(h1, binary.LittleEndian.Uint64(buf[8:16]), c)
-			h2 += c
-
-			msg = nil
-		}
-
-		// Multiplication of big number limbs is similar to elementary school
-		// columnar multiplication. Instead of digits, there are 64-bit limbs.
-		//
-		// We are multiplying a 3 limbs number, h, by a 2 limbs number, r.
-		//
-		//                        h2    h1    h0  x
-		//                              r1    r0  =
-		//                       ----------------
-		//                      h2r0  h1r0  h0r0     <-- individual 128-bit products
-		//            +   h2r1  h1r1  h0r1
-		//               ------------------------
-		//                 m3    m2    m1    m0      <-- result in 128-bit overlapping limbs
-		//               ------------------------
-		//         m3.hi m2.hi m1.hi m0.hi           <-- carry propagation
-		//     +         m3.lo m2.lo m1.lo m0.lo
-		//        -------------------------------
-		//           t4    t3    t2    t1    t0      <-- final result in 64-bit limbs
-		//
-		// The main difference from pen-and-paper multiplication is that we do
-		// carry propagation in a separate step, as if we wrote two digit sums
-		// at first (the 128-bit limbs), and then carried the tens all at once.
-
-		h0r0 := mul64(h0, r0)
-		h1r0 := mul64(h1, r0)
-		h2r0 := mul64(h2, r0)
-		h0r1 := mul64(h0, r1)
-		h1r1 := mul64(h1, r1)
-		h2r1 := mul64(h2, r1)
-
-		// Since h2 is known to be at most 7 (5 + 1 + 1), and r0 and r1 have their
-		// top 4 bits cleared by rMask{0,1}, we know that their product is not going
-		// to overflow 64 bits, so we can ignore the high part of the products.
-		//
-		// This also means that the product doesn't have a fifth limb (t4).
-		if h2r0.hi != 0 {
-			panic("poly1305: unexpected overflow")
-		}
-		if h2r1.hi != 0 {
-			panic("poly1305: unexpected overflow")
-		}
-
-		m0 := h0r0
-		m1 := add128(h1r0, h0r1) // These two additions don't overflow thanks again
-		m2 := add128(h2r0, h1r1) // to the 4 masked bits at the top of r0 and r1.
-		m3 := h2r1
-
-		t0 := m0.lo
-		t1, c := bits.Add64(m1.lo, m0.hi, 0)
-		t2, c := bits.Add64(m2.lo, m1.hi, c)
-		t3, _ := bits.Add64(m3.lo, m2.hi, c)
-
-		// Now we have the result as 4 64-bit limbs, and we need to reduce it
-		// modulo 2¹³⁰ - 5. The special shape of this Crandall prime lets us do
-		// a cheap partial reduction according to the reduction identity
-		//
-		//     c * 2¹³⁰ + n  =  c * 5 + n  mod  2¹³⁰ - 5
-		//
-		// because 2¹³⁰ = 5 mod 2¹³⁰ - 5. Partial reduction since the result is
-		// likely to be larger than 2¹³⁰ - 5, but still small enough to fit the
-		// assumptions we make about h in the rest of the code.
-		//
-		// See also https://speakerdeck.com/gtank/engineering-prime-numbers?slide=23
-
-		// We split the final result at the 2¹³⁰ mark into h and cc, the carry.
-		// Note that the carry bits are effectively shifted left by 2, in other
-		// words, cc = c * 4 for the c in the reduction identity.
-		h0, h1, h2 = t0, t1, t2&maskLow2Bits
-		cc := uint128{t2 & maskNotLow2Bits, t3}
-
-		// To add c * 5 to h, we first add cc = c * 4, and then add (cc >> 2) = c.
-
-		h0, c = bits.Add64(h0, cc.lo, 0)
-		h1, c = bits.Add64(h1, cc.hi, c)
-		h2 += c
-
-		cc = shiftRightBy2(cc)
-
-		h0, c = bits.Add64(h0, cc.lo, 0)
-		h1, c = bits.Add64(h1, cc.hi, c)
-		h2 += c
-
-		// h2 is at most 3 + 1 + 1 = 5, making the whole of h at most
-		//
-		//     5 * 2¹²⁸ + (2¹²⁸ - 1) = 6 * 2¹²⁸ - 1
-	}
-
-	state.h[0], state.h[1], state.h[2] = h0, h1, h2
-}
-
-const (
-	maskLow2Bits    uint64 = 0x0000000000000003
-	maskNotLow2Bits uint64 = ^maskLow2Bits
-)
-
-// select64 returns x if v == 1 and y if v == 0, in constant time.
-func select64(v, x, y uint64) uint64 { return ^(v-1)&x | (v-1)&y }
-
-// [p0, p1, p2] is 2¹³⁰ - 5 in little endian order.
-const (
-	p0 = 0xFFFFFFFFFFFFFFFB
-	p1 = 0xFFFFFFFFFFFFFFFF
-	p2 = 0x0000000000000003
-)
-
-// finalize completes the modular reduction of h and computes
-//
-//	out = h + s  mod  2¹²⁸
-func finalize(out *[TagSize]byte, h *[3]uint64, s *[2]uint64) {
-	h0, h1, h2 := h[0], h[1], h[2]
-
-	// After the partial reduction in updateGeneric, h might be more than
-	// 2¹³⁰ - 5, but will be less than 2 * (2¹³⁰ - 5). To complete the reduction
-	// in constant time, we compute t = h - (2¹³⁰ - 5), and select h as the
-	// result if the subtraction underflows, and t otherwise.
-
-	hMinusP0, b := bits.Sub64(h0, p0, 0)
-	hMinusP1, b := bits.Sub64(h1, p1, b)
-	_, b = bits.Sub64(h2, p2, b)
-
-	// h = h if h < p else h - p
-	h0 = select64(b, h0, hMinusP0)
-	h1 = select64(b, h1, hMinusP1)
-
-	// Finally, we compute the last Poly1305 step
-	//
-	//     tag = h + s  mod  2¹²⁸
-	//
-	// by just doing a wide addition with the 128 low bits of h and discarding
-	// the overflow.
-	h0, c := bits.Add64(h0, s[0], 0)
-	h1, _ = bits.Add64(h1, s[1], c)
-
-	binary.LittleEndian.PutUint64(out[0:8], h0)
-	binary.LittleEndian.PutUint64(out[8:16], h1)
-}
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_loong64.s b/vendor/golang.org/x/crypto/internal/poly1305/sum_loong64.s
deleted file mode 100644
index bc8361da4..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_loong64.s
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-// func update(state *macState, msg []byte)
-TEXT ·update(SB), $0-32
-	MOVV	state+0(FP), R4
-	MOVV	msg_base+8(FP), R5
-	MOVV	msg_len+16(FP), R6
-
-	MOVV	$0x10, R7
-
-	MOVV	(R4), R8	// h0
-	MOVV	8(R4), R9	// h1
-	MOVV	16(R4), R10	// h2
-	MOVV	24(R4), R11	// r0
-	MOVV	32(R4), R12	// r1
-
-	BLT	R6, R7, bytes_between_0_and_15
-
-loop:
-	MOVV	(R5), R14	// msg[0:8]
-	MOVV	8(R5), R16	// msg[8:16]
-	ADDV	R14, R8, R8	// h0 (x1 + y1 = z1', if z1' < x1 then z1' overflow)
-	ADDV	R16, R9, R27
-	SGTU	R14, R8, R24	// h0.carry
-	SGTU	R9, R27, R28
-	ADDV	R27, R24, R9	// h1
-	SGTU	R27, R9, R24
-	OR	R24, R28, R24	// h1.carry
-	ADDV	$0x01, R24, R24
-	ADDV	R10, R24, R10	// h2
-
-	ADDV	$16, R5, R5	// msg = msg[16:]
-
-multiply:
-	MULV	R8, R11, R14	// h0r0.lo
-	MULHVU	R8, R11, R15	// h0r0.hi
-	MULV	R9, R11, R13	// h1r0.lo
-	MULHVU	R9, R11, R16	// h1r0.hi
-	ADDV	R13, R15, R15
-	SGTU	R13, R15, R24
-	ADDV	R24, R16, R16
-	MULV	R10, R11, R25
-	ADDV	R16, R25, R25
-	MULV	R8, R12, R13	// h0r1.lo
-	MULHVU	R8, R12, R16	// h0r1.hi
-	ADDV	R13, R15, R15
-	SGTU	R13, R15, R24
-	ADDV	R24, R16, R16
-	MOVV	R16, R8
-	MULV	R10, R12, R26	// h2r1
-	MULV	R9, R12, R13	// h1r1.lo
-	MULHVU	R9, R12, R16	// h1r1.hi
-	ADDV	R13, R25, R25
-	ADDV	R16, R26, R27
-	SGTU	R13, R25, R24
-	ADDV	R27, R24, R26
-	ADDV	R8, R25, R25
-	SGTU	R8, R25, R24
-	ADDV	R24, R26, R26
-	AND	$3, R25, R10
-	AND	$-4, R25, R17
-	ADDV	R17, R14, R8
-	ADDV	R26, R15, R27
-	SGTU	R17, R8, R24
-	SGTU	R26, R27, R28
-	ADDV	R27, R24, R9
-	SGTU	R27, R9, R24
-	OR	R24, R28, R24
-	ADDV	R24, R10, R10
-	SLLV	$62, R26, R27
-	SRLV	$2, R25, R28
-	SRLV	$2, R26, R26
-	OR	R27, R28, R25
-	ADDV	R25, R8, R8
-	ADDV	R26, R9, R27
-	SGTU	R25, R8, R24
-	SGTU	R26, R27, R28
-	ADDV	R27, R24, R9
-	SGTU	R27, R9, R24
-	OR	R24, R28, R24
-	ADDV	R24, R10, R10
-
-	SUBV	$16, R6, R6
-	BGE	R6, R7, loop
-
-bytes_between_0_and_15:
-	BEQ	R6, R0, done
-	MOVV	$1, R14
-	XOR	R15, R15
-	ADDV	R6, R5, R5
-
-flush_buffer:
-	MOVBU	-1(R5), R25
-	SRLV	$56, R14, R24
-	SLLV	$8, R15, R28
-	SLLV	$8, R14, R14
-	OR	R24, R28, R15
-	XOR	R25, R14, R14
-	SUBV	$1, R6, R6
-	SUBV	$1, R5, R5
-	BNE	R6, R0, flush_buffer
-
-	ADDV	R14, R8, R8
-	SGTU	R14, R8, R24
-	ADDV	R15, R9, R27
-	SGTU	R15, R27, R28
-	ADDV	R27, R24, R9
-	SGTU	R27, R9, R24
-	OR	R24, R28, R24
-	ADDV	R10, R24, R10
-
-	MOVV	$16, R6
-	JMP	multiply
-
-done:
-	MOVV	R8, (R4)
-	MOVV	R9, 8(R4)
-	MOVV	R10, 16(R4)
-	RET
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64x.s b/vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64x.s
deleted file mode 100644
index 6899a1dab..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64x.s
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego && (ppc64 || ppc64le)
-
-#include "textflag.h"
-
-// This was ported from the amd64 implementation.
-
-#ifdef GOARCH_ppc64le
-#define LE_MOVD MOVD
-#define LE_MOVWZ MOVWZ
-#define LE_MOVHZ MOVHZ
-#else
-#define LE_MOVD MOVDBR
-#define LE_MOVWZ MOVWBR
-#define LE_MOVHZ MOVHBR
-#endif
-
-#define POLY1305_ADD(msg, h0, h1, h2, t0, t1, t2) \
-	LE_MOVD (msg)( R0), t0; \
-	LE_MOVD (msg)(R24), t1; \
-	MOVD $1, t2;     \
-	ADDC t0, h0, h0; \
-	ADDE t1, h1, h1; \
-	ADDE t2, h2;     \
-	ADD  $16, msg
-
-#define POLY1305_MUL(h0, h1, h2, r0, r1, t0, t1, t2, t3, t4, t5) \
-	MULLD  r0, h0, t0;  \
-	MULHDU r0, h0, t1;  \
-	MULLD  r0, h1, t4;  \
-	MULHDU r0, h1, t5;  \
-	ADDC   t4, t1, t1;  \
-	MULLD  r0, h2, t2;  \
-	MULHDU r1, h0, t4;  \
-	MULLD  r1, h0, h0;  \
-	ADDE   t5, t2, t2;  \
-	ADDC   h0, t1, t1;  \
-	MULLD  h2, r1, t3;  \
-	ADDZE  t4, h0;      \
-	MULHDU r1, h1, t5;  \
-	MULLD  r1, h1, t4;  \
-	ADDC   t4, t2, t2;  \
-	ADDE   t5, t3, t3;  \
-	ADDC   h0, t2, t2;  \
-	MOVD   $-4, t4;     \
-	ADDZE  t3;          \
-	RLDICL $0, t2, $62, h2; \
-	AND    t2, t4, h0;  \
-	ADDC   t0, h0, h0;  \
-	ADDE   t3, t1, h1;  \
-	SLD    $62, t3, t4; \
-	SRD    $2, t2;      \
-	ADDZE  h2;          \
-	OR     t4, t2, t2;  \
-	SRD    $2, t3;      \
-	ADDC   t2, h0, h0;  \
-	ADDE   t3, h1, h1;  \
-	ADDZE  h2
-
-// func update(state *[7]uint64, msg []byte)
-TEXT ·update(SB), $0-32
-	MOVD state+0(FP), R3
-	MOVD msg_base+8(FP), R4
-	MOVD msg_len+16(FP), R5
-
-	MOVD 0(R3), R8   // h0
-	MOVD 8(R3), R9   // h1
-	MOVD 16(R3), R10 // h2
-	MOVD 24(R3), R11 // r0
-	MOVD 32(R3), R12 // r1
-
-	MOVD $8, R24
-
-	CMP R5, $16
-	BLT bytes_between_0_and_15
-
-loop:
-	POLY1305_ADD(R4, R8, R9, R10, R20, R21, R22)
-
-	PCALIGN $16
-multiply:
-	POLY1305_MUL(R8, R9, R10, R11, R12, R16, R17, R18, R14, R20, R21)
-	ADD $-16, R5
-	CMP R5, $16
-	BGE loop
-
-bytes_between_0_and_15:
-	CMP  R5, $0
-	BEQ  done
-	MOVD $0, R16 // h0
-	MOVD $0, R17 // h1
-
-flush_buffer:
-	CMP R5, $8
-	BLE just1
-
-	MOVD $8, R21
-	SUB  R21, R5, R21
-
-	// Greater than 8 -- load the rightmost remaining bytes in msg
-	// and put into R17 (h1)
-	LE_MOVD (R4)(R21), R17
-	MOVD $16, R22
-
-	// Find the offset to those bytes
-	SUB R5, R22, R22
-	SLD $3, R22
-
-	// Shift to get only the bytes in msg
-	SRD R22, R17, R17
-
-	// Put 1 at high end
-	MOVD $1, R23
-	SLD  $3, R21
-	SLD  R21, R23, R23
-	OR   R23, R17, R17
-
-	// Remainder is 8
-	MOVD $8, R5
-
-just1:
-	CMP R5, $8
-	BLT less8
-
-	// Exactly 8
-	LE_MOVD (R4), R16
-
-	CMP R17, $0
-
-	// Check if we've already set R17; if not
-	// set 1 to indicate end of msg.
-	BNE  carry
-	MOVD $1, R17
-	BR   carry
-
-less8:
-	MOVD  $0, R16   // h0
-	MOVD  $0, R22   // shift count
-	CMP   R5, $4
-	BLT   less4
-	LE_MOVWZ (R4), R16
-	ADD   $4, R4
-	ADD   $-4, R5
-	MOVD  $32, R22
-
-less4:
-	CMP   R5, $2
-	BLT   less2
-	LE_MOVHZ (R4), R21
-	SLD   R22, R21, R21
-	OR    R16, R21, R16
-	ADD   $16, R22
-	ADD   $-2, R5
-	ADD   $2, R4
-
-less2:
-	CMP   R5, $0
-	BEQ   insert1
-	MOVBZ (R4), R21
-	SLD   R22, R21, R21
-	OR    R16, R21, R16
-	ADD   $8, R22
-
-insert1:
-	// Insert 1 at end of msg
-	MOVD $1, R21
-	SLD  R22, R21, R21
-	OR   R16, R21, R16
-
-carry:
-	// Add new values to h0, h1, h2
-	ADDC  R16, R8
-	ADDE  R17, R9
-	ADDZE R10, R10
-	MOVD  $16, R5
-	ADD   R5, R4
-	BR    multiply
-
-done:
-	// Save h0, h1, h2 in state
-	MOVD R8, 0(R3)
-	MOVD R9, 8(R3)
-	MOVD R10, 16(R3)
-	RET
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go b/vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go
deleted file mode 100644
index e1d033a49..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-package poly1305
-
-import (
-	"golang.org/x/sys/cpu"
-)
-
-// updateVX is an assembly implementation of Poly1305 that uses vector
-// instructions. It must only be called if the vector facility (vx) is
-// available.
-//
-//go:noescape
-func updateVX(state *macState, msg []byte)
-
-// mac is a replacement for macGeneric that uses a larger buffer and redirects
-// calls that would have gone to updateGeneric to updateVX if the vector
-// facility is installed.
-//
-// A larger buffer is required for good performance because the vector
-// implementation has a higher fixed cost per call than the generic
-// implementation.
-type mac struct {
-	macState
-
-	buffer [16 * TagSize]byte // size must be a multiple of block size (16)
-	offset int
-}
-
-func (h *mac) Write(p []byte) (int, error) {
-	nn := len(p)
-	if h.offset > 0 {
-		n := copy(h.buffer[h.offset:], p)
-		if h.offset+n < len(h.buffer) {
-			h.offset += n
-			return nn, nil
-		}
-		p = p[n:]
-		h.offset = 0
-		if cpu.S390X.HasVX {
-			updateVX(&h.macState, h.buffer[:])
-		} else {
-			updateGeneric(&h.macState, h.buffer[:])
-		}
-	}
-
-	tail := len(p) % len(h.buffer) // number of bytes to copy into buffer
-	body := len(p) - tail          // number of bytes to process now
-	if body > 0 {
-		if cpu.S390X.HasVX {
-			updateVX(&h.macState, p[:body])
-		} else {
-			updateGeneric(&h.macState, p[:body])
-		}
-	}
-	h.offset = copy(h.buffer[:], p[body:]) // copy tail bytes - can be 0
-	return nn, nil
-}
-
-func (h *mac) Sum(out *[TagSize]byte) {
-	state := h.macState
-	remainder := h.buffer[:h.offset]
-
-	// Use the generic implementation if we have 2 or fewer blocks left
-	// to sum. The vector implementation has a higher startup time.
-	if cpu.S390X.HasVX && len(remainder) > 2*TagSize {
-		updateVX(&state, remainder)
-	} else if len(remainder) > 0 {
-		updateGeneric(&state, remainder)
-	}
-	finalize(out, &state.h, &state.s)
-}
diff --git a/vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s b/vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s
deleted file mode 100644
index 0fe3a7c21..000000000
--- a/vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s
+++ /dev/null
@@ -1,503 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc && !purego
-
-#include "textflag.h"
-
-// This implementation of Poly1305 uses the vector facility (vx)
-// to process up to 2 blocks (32 bytes) per iteration using an
-// algorithm based on the one described in:
-//
-// NEON crypto, Daniel J. Bernstein & Peter Schwabe
-// https://cryptojedi.org/papers/neoncrypto-20120320.pdf
-//
-// This algorithm uses 5 26-bit limbs to represent a 130-bit
-// value. These limbs are, for the most part, zero extended and
-// placed into 64-bit vector register elements. Each vector
-// register is 128-bits wide and so holds 2 of these elements.
-// Using 26-bit limbs allows us plenty of headroom to accommodate
-// accumulations before and after multiplication without
-// overflowing either 32-bits (before multiplication) or 64-bits
-// (after multiplication).
-//
-// In order to parallelise the operations required to calculate
-// the sum we use two separate accumulators and then sum those
-// in an extra final step. For compatibility with the generic
-// implementation we perform this summation at the end of every
-// updateVX call.
-//
-// To use two accumulators we must multiply the message blocks
-// by r² rather than r. Only the final message block should be
-// multiplied by r.
-//
-// Example:
-//
-// We want to calculate the sum (h) for a 64 byte message (m):
-//
-//   h = m[0:16]r⁴ + m[16:32]r³ + m[32:48]r² + m[48:64]r
-//
-// To do this we split the calculation into the even indices
-// and odd indices of the message. These form our SIMD 'lanes':
-//
-//   h = m[ 0:16]r⁴ + m[32:48]r² +   <- lane 0
-//       m[16:32]r³ + m[48:64]r      <- lane 1
-//
-// To calculate this iteratively we refactor so that both lanes
-// are written in terms of r² and r:
-//
-//   h = (m[ 0:16]r² + m[32:48])r² + <- lane 0
-//       (m[16:32]r² + m[48:64])r    <- lane 1
-//                ^             ^
-//                |             coefficients for second iteration
-//                coefficients for first iteration
-//
-// So in this case we would have two iterations. In the first
-// both lanes are multiplied by r². In the second only the
-// first lane is multiplied by r² and the second lane is
-// instead multiplied by r. This gives use the odd and even
-// powers of r that we need from the original equation.
-//
-// Notation:
-//
-//   h - accumulator
-//   r - key
-//   m - message
-//
-//   [a, b]       - SIMD register holding two 64-bit values
-//   [a, b, c, d] - SIMD register holding four 32-bit values
-//   xᵢ[n]        - limb n of variable x with bit width i
-//
-// Limbs are expressed in little endian order, so for 26-bit
-// limbs x₂₆[4] will be the most significant limb and x₂₆[0]
-// will be the least significant limb.
-
-// masking constants
-#define MOD24 V0 // [0x0000000000ffffff, 0x0000000000ffffff] - mask low 24-bits
-#define MOD26 V1 // [0x0000000003ffffff, 0x0000000003ffffff] - mask low 26-bits
-
-// expansion constants (see EXPAND macro)
-#define EX0 V2
-#define EX1 V3
-#define EX2 V4
-
-// key (r², r or 1 depending on context)
-#define R_0 V5
-#define R_1 V6
-#define R_2 V7
-#define R_3 V8
-#define R_4 V9
-
-// precalculated coefficients (5r², 5r or 0 depending on context)
-#define R5_1 V10
-#define R5_2 V11
-#define R5_3 V12
-#define R5_4 V13
-
-// message block (m)
-#define M_0 V14
-#define M_1 V15
-#define M_2 V16
-#define M_3 V17
-#define M_4 V18
-
-// accumulator (h)
-#define H_0 V19
-#define H_1 V20
-#define H_2 V21
-#define H_3 V22
-#define H_4 V23
-
-// temporary registers (for short-lived values)
-#define T_0 V24
-#define T_1 V25
-#define T_2 V26
-#define T_3 V27
-#define T_4 V28
-
-GLOBL ·constants<>(SB), RODATA, $0x30
-// EX0
-DATA ·constants<>+0x00(SB)/8, $0x0006050403020100
-DATA ·constants<>+0x08(SB)/8, $0x1016151413121110
-// EX1
-DATA ·constants<>+0x10(SB)/8, $0x060c0b0a09080706
-DATA ·constants<>+0x18(SB)/8, $0x161c1b1a19181716
-// EX2
-DATA ·constants<>+0x20(SB)/8, $0x0d0d0d0d0d0f0e0d
-DATA ·constants<>+0x28(SB)/8, $0x1d1d1d1d1d1f1e1d
-
-// MULTIPLY multiplies each lane of f and g, partially reduced
-// modulo 2¹³⁰ - 5. The result, h, consists of partial products
-// in each lane that need to be reduced further to produce the
-// final result.
-//
-//   h₁₃₀ = (f₁₃₀g₁₃₀) % 2¹³⁰ + (5f₁₃₀g₁₃₀) / 2¹³⁰
-//
-// Note that the multiplication by 5 of the high bits is
-// achieved by precalculating the multiplication of four of the
-// g coefficients by 5. These are g51-g54.
-#define MULTIPLY(f0, f1, f2, f3, f4, g0, g1, g2, g3, g4, g51, g52, g53, g54, h0, h1, h2, h3, h4) \
-	VMLOF  f0, g0, h0        \
-	VMLOF  f0, g3, h3        \
-	VMLOF  f0, g1, h1        \
-	VMLOF  f0, g4, h4        \
-	VMLOF  f0, g2, h2        \
-	VMLOF  f1, g54, T_0      \
-	VMLOF  f1, g2, T_3       \
-	VMLOF  f1, g0, T_1       \
-	VMLOF  f1, g3, T_4       \
-	VMLOF  f1, g1, T_2       \
-	VMALOF f2, g53, h0, h0   \
-	VMALOF f2, g1, h3, h3    \
-	VMALOF f2, g54, h1, h1   \
-	VMALOF f2, g2, h4, h4    \
-	VMALOF f2, g0, h2, h2    \
-	VMALOF f3, g52, T_0, T_0 \
-	VMALOF f3, g0, T_3, T_3  \
-	VMALOF f3, g53, T_1, T_1 \
-	VMALOF f3, g1, T_4, T_4  \
-	VMALOF f3, g54, T_2, T_2 \
-	VMALOF f4, g51, h0, h0   \
-	VMALOF f4, g54, h3, h3   \
-	VMALOF f4, g52, h1, h1   \
-	VMALOF f4, g0, h4, h4    \
-	VMALOF f4, g53, h2, h2   \
-	VAG    T_0, h0, h0       \
-	VAG    T_3, h3, h3       \
-	VAG    T_1, h1, h1       \
-	VAG    T_4, h4, h4       \
-	VAG    T_2, h2, h2
-
-// REDUCE performs the following carry operations in four
-// stages, as specified in Bernstein & Schwabe:
-//
-//   1: h₂₆[0]->h₂₆[1] h₂₆[3]->h₂₆[4]
-//   2: h₂₆[1]->h₂₆[2] h₂₆[4]->h₂₆[0]
-//   3: h₂₆[0]->h₂₆[1] h₂₆[2]->h₂₆[3]
-//   4: h₂₆[3]->h₂₆[4]
-//
-// The result is that all of the limbs are limited to 26-bits
-// except for h₂₆[1] and h₂₆[4] which are limited to 27-bits.
-//
-// Note that although each limb is aligned at 26-bit intervals
-// they may contain values that exceed 2²⁶ - 1, hence the need
-// to carry the excess bits in each limb.
-#define REDUCE(h0, h1, h2, h3, h4) \
-	VESRLG $26, h0, T_0  \
-	VESRLG $26, h3, T_1  \
-	VN     MOD26, h0, h0 \
-	VN     MOD26, h3, h3 \
-	VAG    T_0, h1, h1   \
-	VAG    T_1, h4, h4   \
-	VESRLG $26, h1, T_2  \
-	VESRLG $26, h4, T_3  \
-	VN     MOD26, h1, h1 \
-	VN     MOD26, h4, h4 \
-	VESLG  $2, T_3, T_4  \
-	VAG    T_3, T_4, T_4 \
-	VAG    T_2, h2, h2   \
-	VAG    T_4, h0, h0   \
-	VESRLG $26, h2, T_0  \
-	VESRLG $26, h0, T_1  \
-	VN     MOD26, h2, h2 \
-	VN     MOD26, h0, h0 \
-	VAG    T_0, h3, h3   \
-	VAG    T_1, h1, h1   \
-	VESRLG $26, h3, T_2  \
-	VN     MOD26, h3, h3 \
-	VAG    T_2, h4, h4
-
-// EXPAND splits the 128-bit little-endian values in0 and in1
-// into 26-bit big-endian limbs and places the results into
-// the first and second lane of d₂₆[0:4] respectively.
-//
-// The EX0, EX1 and EX2 constants are arrays of byte indices
-// for permutation. The permutation both reverses the bytes
-// in the input and ensures the bytes are copied into the
-// destination limb ready to be shifted into their final
-// position.
-#define EXPAND(in0, in1, d0, d1, d2, d3, d4) \
-	VPERM  in0, in1, EX0, d0 \
-	VPERM  in0, in1, EX1, d2 \
-	VPERM  in0, in1, EX2, d4 \
-	VESRLG $26, d0, d1       \
-	VESRLG $30, d2, d3       \
-	VESRLG $4, d2, d2        \
-	VN     MOD26, d0, d0     \ // [in0₂₆[0], in1₂₆[0]]
-	VN     MOD26, d3, d3     \ // [in0₂₆[3], in1₂₆[3]]
-	VN     MOD26, d1, d1     \ // [in0₂₆[1], in1₂₆[1]]
-	VN     MOD24, d4, d4     \ // [in0₂₆[4], in1₂₆[4]]
-	VN     MOD26, d2, d2     // [in0₂₆[2], in1₂₆[2]]
-
-// func updateVX(state *macState, msg []byte)
-TEXT ·updateVX(SB), NOSPLIT, $0
-	MOVD state+0(FP), R1
-	LMG  msg+8(FP), R2, R3 // R2=msg_base, R3=msg_len
-
-	// load EX0, EX1 and EX2
-	MOVD $·constants<>(SB), R5
-	VLM  (R5), EX0, EX2
-
-	// generate masks
-	VGMG $(64-24), $63, MOD24 // [0x00ffffff, 0x00ffffff]
-	VGMG $(64-26), $63, MOD26 // [0x03ffffff, 0x03ffffff]
-
-	// load h (accumulator) and r (key) from state
-	VZERO T_1               // [0, 0]
-	VL    0(R1), T_0        // [h₆₄[0], h₆₄[1]]
-	VLEG  $0, 16(R1), T_1   // [h₆₄[2], 0]
-	VL    24(R1), T_2       // [r₆₄[0], r₆₄[1]]
-	VPDI  $0, T_0, T_2, T_3 // [h₆₄[0], r₆₄[0]]
-	VPDI  $5, T_0, T_2, T_4 // [h₆₄[1], r₆₄[1]]
-
-	// unpack h and r into 26-bit limbs
-	// note: h₆₄[2] may have the low 3 bits set, so h₂₆[4] is a 27-bit value
-	VN     MOD26, T_3, H_0            // [h₂₆[0], r₂₆[0]]
-	VZERO  H_1                        // [0, 0]
-	VZERO  H_3                        // [0, 0]
-	VGMG   $(64-12-14), $(63-12), T_0 // [0x03fff000, 0x03fff000] - 26-bit mask with low 12 bits masked out
-	VESLG  $24, T_1, T_1              // [h₆₄[2]<<24, 0]
-	VERIMG $-26&63, T_3, MOD26, H_1   // [h₂₆[1], r₂₆[1]]
-	VESRLG $+52&63, T_3, H_2          // [h₂₆[2], r₂₆[2]] - low 12 bits only
-	VERIMG $-14&63, T_4, MOD26, H_3   // [h₂₆[1], r₂₆[1]]
-	VESRLG $40, T_4, H_4              // [h₂₆[4], r₂₆[4]] - low 24 bits only
-	VERIMG $+12&63, T_4, T_0, H_2     // [h₂₆[2], r₂₆[2]] - complete
-	VO     T_1, H_4, H_4              // [h₂₆[4], r₂₆[4]] - complete
-
-	// replicate r across all 4 vector elements
-	VREPF $3, H_0, R_0 // [r₂₆[0], r₂₆[0], r₂₆[0], r₂₆[0]]
-	VREPF $3, H_1, R_1 // [r₂₆[1], r₂₆[1], r₂₆[1], r₂₆[1]]
-	VREPF $3, H_2, R_2 // [r₂₆[2], r₂₆[2], r₂₆[2], r₂₆[2]]
-	VREPF $3, H_3, R_3 // [r₂₆[3], r₂₆[3], r₂₆[3], r₂₆[3]]
-	VREPF $3, H_4, R_4 // [r₂₆[4], r₂₆[4], r₂₆[4], r₂₆[4]]
-
-	// zero out lane 1 of h
-	VLEIG $1, $0, H_0 // [h₂₆[0], 0]
-	VLEIG $1, $0, H_1 // [h₂₆[1], 0]
-	VLEIG $1, $0, H_2 // [h₂₆[2], 0]
-	VLEIG $1, $0, H_3 // [h₂₆[3], 0]
-	VLEIG $1, $0, H_4 // [h₂₆[4], 0]
-
-	// calculate 5r (ignore least significant limb)
-	VREPIF $5, T_0
-	VMLF   T_0, R_1, R5_1 // [5r₂₆[1], 5r₂₆[1], 5r₂₆[1], 5r₂₆[1]]
-	VMLF   T_0, R_2, R5_2 // [5r₂₆[2], 5r₂₆[2], 5r₂₆[2], 5r₂₆[2]]
-	VMLF   T_0, R_3, R5_3 // [5r₂₆[3], 5r₂₆[3], 5r₂₆[3], 5r₂₆[3]]
-	VMLF   T_0, R_4, R5_4 // [5r₂₆[4], 5r₂₆[4], 5r₂₆[4], 5r₂₆[4]]
-
-	// skip r² calculation if we are only calculating one block
-	CMPBLE R3, $16, skip
-
-	// calculate r²
-	MULTIPLY(R_0, R_1, R_2, R_3, R_4, R_0, R_1, R_2, R_3, R_4, R5_1, R5_2, R5_3, R5_4, M_0, M_1, M_2, M_3, M_4)
-	REDUCE(M_0, M_1, M_2, M_3, M_4)
-	VGBM   $0x0f0f, T_0
-	VERIMG $0, M_0, T_0, R_0 // [r₂₆[0], r²₂₆[0], r₂₆[0], r²₂₆[0]]
-	VERIMG $0, M_1, T_0, R_1 // [r₂₆[1], r²₂₆[1], r₂₆[1], r²₂₆[1]]
-	VERIMG $0, M_2, T_0, R_2 // [r₂₆[2], r²₂₆[2], r₂₆[2], r²₂₆[2]]
-	VERIMG $0, M_3, T_0, R_3 // [r₂₆[3], r²₂₆[3], r₂₆[3], r²₂₆[3]]
-	VERIMG $0, M_4, T_0, R_4 // [r₂₆[4], r²₂₆[4], r₂₆[4], r²₂₆[4]]
-
-	// calculate 5r² (ignore least significant limb)
-	VREPIF $5, T_0
-	VMLF   T_0, R_1, R5_1 // [5r₂₆[1], 5r²₂₆[1], 5r₂₆[1], 5r²₂₆[1]]
-	VMLF   T_0, R_2, R5_2 // [5r₂₆[2], 5r²₂₆[2], 5r₂₆[2], 5r²₂₆[2]]
-	VMLF   T_0, R_3, R5_3 // [5r₂₆[3], 5r²₂₆[3], 5r₂₆[3], 5r²₂₆[3]]
-	VMLF   T_0, R_4, R5_4 // [5r₂₆[4], 5r²₂₆[4], 5r₂₆[4], 5r²₂₆[4]]
-
-loop:
-	CMPBLE R3, $32, b2 // 2 or fewer blocks remaining, need to change key coefficients
-
-	// load next 2 blocks from message
-	VLM (R2), T_0, T_1
-
-	// update message slice
-	SUB  $32, R3
-	MOVD $32(R2), R2
-
-	// unpack message blocks into 26-bit big-endian limbs
-	EXPAND(T_0, T_1, M_0, M_1, M_2, M_3, M_4)
-
-	// add 2¹²⁸ to each message block value
-	VLEIB $4, $1, M_4
-	VLEIB $12, $1, M_4
-
-multiply:
-	// accumulate the incoming message
-	VAG H_0, M_0, M_0
-	VAG H_3, M_3, M_3
-	VAG H_1, M_1, M_1
-	VAG H_4, M_4, M_4
-	VAG H_2, M_2, M_2
-
-	// multiply the accumulator by the key coefficient
-	MULTIPLY(M_0, M_1, M_2, M_3, M_4, R_0, R_1, R_2, R_3, R_4, R5_1, R5_2, R5_3, R5_4, H_0, H_1, H_2, H_3, H_4)
-
-	// carry and partially reduce the partial products
-	REDUCE(H_0, H_1, H_2, H_3, H_4)
-
-	CMPBNE R3, $0, loop
-
-finish:
-	// sum lane 0 and lane 1 and put the result in lane 1
-	VZERO  T_0
-	VSUMQG H_0, T_0, H_0
-	VSUMQG H_3, T_0, H_3
-	VSUMQG H_1, T_0, H_1
-	VSUMQG H_4, T_0, H_4
-	VSUMQG H_2, T_0, H_2
-
-	// reduce again after summation
-	// TODO(mundaym): there might be a more efficient way to do this
-	// now that we only have 1 active lane. For example, we could
-	// simultaneously pack the values as we reduce them.
-	REDUCE(H_0, H_1, H_2, H_3, H_4)
-
-	// carry h[1] through to h[4] so that only h[4] can exceed 2²⁶ - 1
-	// TODO(mundaym): in testing this final carry was unnecessary.
-	// Needs a proof before it can be removed though.
-	VESRLG $26, H_1, T_1
-	VN     MOD26, H_1, H_1
-	VAQ    T_1, H_2, H_2
-	VESRLG $26, H_2, T_2
-	VN     MOD26, H_2, H_2
-	VAQ    T_2, H_3, H_3
-	VESRLG $26, H_3, T_3
-	VN     MOD26, H_3, H_3
-	VAQ    T_3, H_4, H_4
-
-	// h is now < 2(2¹³⁰ - 5)
-	// Pack each lane in h₂₆[0:4] into h₁₂₈[0:1].
-	VESLG $26, H_1, H_1
-	VESLG $26, H_3, H_3
-	VO    H_0, H_1, H_0
-	VO    H_2, H_3, H_2
-	VESLG $4, H_2, H_2
-	VLEIB $7, $48, H_1
-	VSLB  H_1, H_2, H_2
-	VO    H_0, H_2, H_0
-	VLEIB $7, $104, H_1
-	VSLB  H_1, H_4, H_3
-	VO    H_3, H_0, H_0
-	VLEIB $7, $24, H_1
-	VSRLB H_1, H_4, H_1
-
-	// update state
-	VSTEG $1, H_0, 0(R1)
-	VSTEG $0, H_0, 8(R1)
-	VSTEG $1, H_1, 16(R1)
-	RET
-
-b2:  // 2 or fewer blocks remaining
-	CMPBLE R3, $16, b1
-
-	// Load the 2 remaining blocks (17-32 bytes remaining).
-	MOVD $-17(R3), R0    // index of final byte to load modulo 16
-	VL   (R2), T_0       // load full 16 byte block
-	VLL  R0, 16(R2), T_1 // load final (possibly partial) block and pad with zeros to 16 bytes
-
-	// The Poly1305 algorithm requires that a 1 bit be appended to
-	// each message block. If the final block is less than 16 bytes
-	// long then it is easiest to insert the 1 before the message
-	// block is split into 26-bit limbs. If, on the other hand, the
-	// final message block is 16 bytes long then we append the 1 bit
-	// after expansion as normal.
-	MOVBZ  $1, R0
-	MOVD   $-16(R3), R3   // index of byte in last block to insert 1 at (could be 16)
-	CMPBEQ R3, $16, 2(PC) // skip the insertion if the final block is 16 bytes long
-	VLVGB  R3, R0, T_1    // insert 1 into the byte at index R3
-
-	// Split both blocks into 26-bit limbs in the appropriate lanes.
-	EXPAND(T_0, T_1, M_0, M_1, M_2, M_3, M_4)
-
-	// Append a 1 byte to the end of the second to last block.
-	VLEIB $4, $1, M_4
-
-	// Append a 1 byte to the end of the last block only if it is a
-	// full 16 byte block.
-	CMPBNE R3, $16, 2(PC)
-	VLEIB  $12, $1, M_4
-
-	// Finally, set up the coefficients for the final multiplication.
-	// We have previously saved r and 5r in the 32-bit even indexes
-	// of the R_[0-4] and R5_[1-4] coefficient registers.
-	//
-	// We want lane 0 to be multiplied by r² so that can be kept the
-	// same. We want lane 1 to be multiplied by r so we need to move
-	// the saved r value into the 32-bit odd index in lane 1 by
-	// rotating the 64-bit lane by 32.
-	VGBM   $0x00ff, T_0         // [0, 0xffffffffffffffff] - mask lane 1 only
-	VERIMG $32, R_0, T_0, R_0   // [_,  r²₂₆[0], _,  r₂₆[0]]
-	VERIMG $32, R_1, T_0, R_1   // [_,  r²₂₆[1], _,  r₂₆[1]]
-	VERIMG $32, R_2, T_0, R_2   // [_,  r²₂₆[2], _,  r₂₆[2]]
-	VERIMG $32, R_3, T_0, R_3   // [_,  r²₂₆[3], _,  r₂₆[3]]
-	VERIMG $32, R_4, T_0, R_4   // [_,  r²₂₆[4], _,  r₂₆[4]]
-	VERIMG $32, R5_1, T_0, R5_1 // [_, 5r²₂₆[1], _, 5r₂₆[1]]
-	VERIMG $32, R5_2, T_0, R5_2 // [_, 5r²₂₆[2], _, 5r₂₆[2]]
-	VERIMG $32, R5_3, T_0, R5_3 // [_, 5r²₂₆[3], _, 5r₂₆[3]]
-	VERIMG $32, R5_4, T_0, R5_4 // [_, 5r²₂₆[4], _, 5r₂₆[4]]
-
-	MOVD $0, R3
-	BR   multiply
-
-skip:
-	CMPBEQ R3, $0, finish
-
-b1:  // 1 block remaining
-
-	// Load the final block (1-16 bytes). This will be placed into
-	// lane 0.
-	MOVD $-1(R3), R0
-	VLL  R0, (R2), T_0 // pad to 16 bytes with zeros
-
-	// The Poly1305 algorithm requires that a 1 bit be appended to
-	// each message block. If the final block is less than 16 bytes
-	// long then it is easiest to insert the 1 before the message
-	// block is split into 26-bit limbs. If, on the other hand, the
-	// final message block is 16 bytes long then we append the 1 bit
-	// after expansion as normal.
-	MOVBZ  $1, R0
-	CMPBEQ R3, $16, 2(PC)
-	VLVGB  R3, R0, T_0
-
-	// Set the message block in lane 1 to the value 0 so that it
-	// can be accumulated without affecting the final result.
-	VZERO T_1
-
-	// Split the final message block into 26-bit limbs in lane 0.
-	// Lane 1 will be contain 0.
-	EXPAND(T_0, T_1, M_0, M_1, M_2, M_3, M_4)
-
-	// Append a 1 byte to the end of the last block only if it is a
-	// full 16 byte block.
-	CMPBNE R3, $16, 2(PC)
-	VLEIB  $4, $1, M_4
-
-	// We have previously saved r and 5r in the 32-bit even indexes
-	// of the R_[0-4] and R5_[1-4] coefficient registers.
-	//
-	// We want lane 0 to be multiplied by r so we need to move the
-	// saved r value into the 32-bit odd index in lane 0. We want
-	// lane 1 to be set to the value 1. This makes multiplication
-	// a no-op. We do this by setting lane 1 in every register to 0
-	// and then just setting the 32-bit index 3 in R_0 to 1.
-	VZERO T_0
-	MOVD  $0, R0
-	MOVD  $0x10111213, R12
-	VLVGP R12, R0, T_1         // [_, 0x10111213, _, 0x00000000]
-	VPERM T_0, R_0, T_1, R_0   // [_,  r₂₆[0], _, 0]
-	VPERM T_0, R_1, T_1, R_1   // [_,  r₂₆[1], _, 0]
-	VPERM T_0, R_2, T_1, R_2   // [_,  r₂₆[2], _, 0]
-	VPERM T_0, R_3, T_1, R_3   // [_,  r₂₆[3], _, 0]
-	VPERM T_0, R_4, T_1, R_4   // [_,  r₂₆[4], _, 0]
-	VPERM T_0, R5_1, T_1, R5_1 // [_, 5r₂₆[1], _, 0]
-	VPERM T_0, R5_2, T_1, R5_2 // [_, 5r₂₆[2], _, 0]
-	VPERM T_0, R5_3, T_1, R5_3 // [_, 5r₂₆[3], _, 0]
-	VPERM T_0, R5_4, T_1, R5_4 // [_, 5r₂₆[4], _, 0]
-
-	// Set the value of lane 1 to be 1.
-	VLEIF $3, $1, R_0 // [_,  r₂₆[0], _, 1]
-
-	MOVD $0, R3
-	BR   multiply
diff --git a/vendor/golang.org/x/crypto/sha3/hashes.go b/vendor/golang.org/x/crypto/sha3/hashes.go
deleted file mode 100644
index a51269d91..000000000
--- a/vendor/golang.org/x/crypto/sha3/hashes.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package sha3 implements the SHA-3 hash algorithms and the SHAKE extendable
-// output functions defined in FIPS 202.
-//
-// Most of this package is a wrapper around the crypto/sha3 package in the
-// standard library. The only exception is the legacy Keccak hash functions.
-package sha3
-
-import (
-	"crypto/sha3"
-	"hash"
-)
-
-// New224 creates a new SHA3-224 hash.
-// Its generic security strength is 224 bits against preimage attacks,
-// and 112 bits against collision attacks.
-//
-// It is a wrapper for the [sha3.New224] function in the standard library.
-//
-//go:fix inline
-func New224() hash.Hash {
-	return sha3.New224()
-}
-
-// New256 creates a new SHA3-256 hash.
-// Its generic security strength is 256 bits against preimage attacks,
-// and 128 bits against collision attacks.
-//
-// It is a wrapper for the [sha3.New256] function in the standard library.
-//
-//go:fix inline
-func New256() hash.Hash {
-	return sha3.New256()
-}
-
-// New384 creates a new SHA3-384 hash.
-// Its generic security strength is 384 bits against preimage attacks,
-// and 192 bits against collision attacks.
-//
-// It is a wrapper for the [sha3.New384] function in the standard library.
-//
-//go:fix inline
-func New384() hash.Hash {
-	return sha3.New384()
-}
-
-// New512 creates a new SHA3-512 hash.
-// Its generic security strength is 512 bits against preimage attacks,
-// and 256 bits against collision attacks.
-//
-// It is a wrapper for the [sha3.New512] function in the standard library.
-//
-//go:fix inline
-func New512() hash.Hash {
-	return sha3.New512()
-}
-
-// Sum224 returns the SHA3-224 digest of the data.
-//
-// It is a wrapper for the [sha3.Sum224] function in the standard library.
-//
-//go:fix inline
-func Sum224(data []byte) [28]byte {
-	return sha3.Sum224(data)
-}
-
-// Sum256 returns the SHA3-256 digest of the data.
-//
-// It is a wrapper for the [sha3.Sum256] function in the standard library.
-//
-//go:fix inline
-func Sum256(data []byte) [32]byte {
-	return sha3.Sum256(data)
-}
-
-// Sum384 returns the SHA3-384 digest of the data.
-//
-// It is a wrapper for the [sha3.Sum384] function in the standard library.
-//
-//go:fix inline
-func Sum384(data []byte) [48]byte {
-	return sha3.Sum384(data)
-}
-
-// Sum512 returns the SHA3-512 digest of the data.
-//
-// It is a wrapper for the [sha3.Sum512] function in the standard library.
-//
-//go:fix inline
-func Sum512(data []byte) [64]byte {
-	return sha3.Sum512(data)
-}
diff --git a/vendor/golang.org/x/crypto/sha3/legacy_hash.go b/vendor/golang.org/x/crypto/sha3/legacy_hash.go
deleted file mode 100644
index b8784536e..000000000
--- a/vendor/golang.org/x/crypto/sha3/legacy_hash.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// This implementation is only used for NewLegacyKeccak256 and
-// NewLegacyKeccak512, which are not implemented by crypto/sha3.
-// All other functions in this package are wrappers around crypto/sha3.
-
-import (
-	"crypto/subtle"
-	"encoding/binary"
-	"errors"
-	"hash"
-	"unsafe"
-
-	"golang.org/x/sys/cpu"
-)
-
-const (
-	dsbyteKeccak = 0b00000001
-
-	// rateK[c] is the rate in bytes for Keccak[c] where c is the capacity in
-	// bits. Given the sponge size is 1600 bits, the rate is 1600 - c bits.
-	rateK256  = (1600 - 256) / 8
-	rateK512  = (1600 - 512) / 8
-	rateK1024 = (1600 - 1024) / 8
-)
-
-// NewLegacyKeccak256 creates a new Keccak-256 hash.
-//
-// Only use this function if you require compatibility with an existing cryptosystem
-// that uses non-standard padding. All other users should use New256 instead.
-func NewLegacyKeccak256() hash.Hash {
-	return &state{rate: rateK512, outputLen: 32, dsbyte: dsbyteKeccak}
-}
-
-// NewLegacyKeccak512 creates a new Keccak-512 hash.
-//
-// Only use this function if you require compatibility with an existing cryptosystem
-// that uses non-standard padding. All other users should use New512 instead.
-func NewLegacyKeccak512() hash.Hash {
-	return &state{rate: rateK1024, outputLen: 64, dsbyte: dsbyteKeccak}
-}
-
-// spongeDirection indicates the direction bytes are flowing through the sponge.
-type spongeDirection int
-
-const (
-	// spongeAbsorbing indicates that the sponge is absorbing input.
-	spongeAbsorbing spongeDirection = iota
-	// spongeSqueezing indicates that the sponge is being squeezed.
-	spongeSqueezing
-)
-
-type state struct {
-	a [1600 / 8]byte // main state of the hash
-
-	// a[n:rate] is the buffer. If absorbing, it's the remaining space to XOR
-	// into before running the permutation. If squeezing, it's the remaining
-	// output to produce before running the permutation.
-	n, rate int
-
-	// dsbyte contains the "domain separation" bits and the first bit of
-	// the padding. Sections 6.1 and 6.2 of [1] separate the outputs of the
-	// SHA-3 and SHAKE functions by appending bitstrings to the message.
-	// Using a little-endian bit-ordering convention, these are "01" for SHA-3
-	// and "1111" for SHAKE, or 00000010b and 00001111b, respectively. Then the
-	// padding rule from section 5.1 is applied to pad the message to a multiple
-	// of the rate, which involves adding a "1" bit, zero or more "0" bits, and
-	// a final "1" bit. We merge the first "1" bit from the padding into dsbyte,
-	// giving 00000110b (0x06) and 00011111b (0x1f).
-	// [1] http://csrc.nist.gov/publications/drafts/fips-202/fips_202_draft.pdf
-	//     "Draft FIPS 202: SHA-3 Standard: Permutation-Based Hash and
-	//      Extendable-Output Functions (May 2014)"
-	dsbyte byte
-
-	outputLen int             // the default output size in bytes
-	state     spongeDirection // whether the sponge is absorbing or squeezing
-}
-
-// BlockSize returns the rate of sponge underlying this hash function.
-func (d *state) BlockSize() int { return d.rate }
-
-// Size returns the output size of the hash function in bytes.
-func (d *state) Size() int { return d.outputLen }
-
-// Reset clears the internal state by zeroing the sponge state and
-// the buffer indexes, and setting Sponge.state to absorbing.
-func (d *state) Reset() {
-	// Zero the permutation's state.
-	for i := range d.a {
-		d.a[i] = 0
-	}
-	d.state = spongeAbsorbing
-	d.n = 0
-}
-
-func (d *state) clone() *state {
-	ret := *d
-	return &ret
-}
-
-// permute applies the KeccakF-1600 permutation.
-func (d *state) permute() {
-	var a *[25]uint64
-	if cpu.IsBigEndian {
-		a = new([25]uint64)
-		for i := range a {
-			a[i] = binary.LittleEndian.Uint64(d.a[i*8:])
-		}
-	} else {
-		a = (*[25]uint64)(unsafe.Pointer(&d.a))
-	}
-
-	keccakF1600(a)
-	d.n = 0
-
-	if cpu.IsBigEndian {
-		for i := range a {
-			binary.LittleEndian.PutUint64(d.a[i*8:], a[i])
-		}
-	}
-}
-
-// pads appends the domain separation bits in dsbyte, applies
-// the multi-bitrate 10..1 padding rule, and permutes the state.
-func (d *state) padAndPermute() {
-	// Pad with this instance's domain-separator bits. We know that there's
-	// at least one byte of space in the sponge because, if it were full,
-	// permute would have been called to empty it. dsbyte also contains the
-	// first one bit for the padding. See the comment in the state struct.
-	d.a[d.n] ^= d.dsbyte
-	// This adds the final one bit for the padding. Because of the way that
-	// bits are numbered from the LSB upwards, the final bit is the MSB of
-	// the last byte.
-	d.a[d.rate-1] ^= 0x80
-	// Apply the permutation
-	d.permute()
-	d.state = spongeSqueezing
-}
-
-// Write absorbs more data into the hash's state. It panics if any
-// output has already been read.
-func (d *state) Write(p []byte) (n int, err error) {
-	if d.state != spongeAbsorbing {
-		panic("sha3: Write after Read")
-	}
-
-	n = len(p)
-
-	for len(p) > 0 {
-		x := subtle.XORBytes(d.a[d.n:d.rate], d.a[d.n:d.rate], p)
-		d.n += x
-		p = p[x:]
-
-		// If the sponge is full, apply the permutation.
-		if d.n == d.rate {
-			d.permute()
-		}
-	}
-
-	return
-}
-
-// Read squeezes an arbitrary number of bytes from the sponge.
-func (d *state) Read(out []byte) (n int, err error) {
-	// If we're still absorbing, pad and apply the permutation.
-	if d.state == spongeAbsorbing {
-		d.padAndPermute()
-	}
-
-	n = len(out)
-
-	// Now, do the squeezing.
-	for len(out) > 0 {
-		// Apply the permutation if we've squeezed the sponge dry.
-		if d.n == d.rate {
-			d.permute()
-		}
-
-		x := copy(out, d.a[d.n:d.rate])
-		d.n += x
-		out = out[x:]
-	}
-
-	return
-}
-
-// Sum applies padding to the hash state and then squeezes out the desired
-// number of output bytes. It panics if any output has already been read.
-func (d *state) Sum(in []byte) []byte {
-	if d.state != spongeAbsorbing {
-		panic("sha3: Sum after Read")
-	}
-
-	// Make a copy of the original hash so that caller can keep writing
-	// and summing.
-	dup := d.clone()
-	hash := make([]byte, dup.outputLen, 64) // explicit cap to allow stack allocation
-	dup.Read(hash)
-	return append(in, hash...)
-}
-
-const (
-	magicKeccak = "sha\x0b"
-	// magic || rate || main state || n || sponge direction
-	marshaledSize = len(magicKeccak) + 1 + 200 + 1 + 1
-)
-
-func (d *state) MarshalBinary() ([]byte, error) {
-	return d.AppendBinary(make([]byte, 0, marshaledSize))
-}
-
-func (d *state) AppendBinary(b []byte) ([]byte, error) {
-	switch d.dsbyte {
-	case dsbyteKeccak:
-		b = append(b, magicKeccak...)
-	default:
-		panic("unknown dsbyte")
-	}
-	// rate is at most 168, and n is at most rate.
-	b = append(b, byte(d.rate))
-	b = append(b, d.a[:]...)
-	b = append(b, byte(d.n), byte(d.state))
-	return b, nil
-}
-
-func (d *state) UnmarshalBinary(b []byte) error {
-	if len(b) != marshaledSize {
-		return errors.New("sha3: invalid hash state")
-	}
-
-	magic := string(b[:len(magicKeccak)])
-	b = b[len(magicKeccak):]
-	switch {
-	case magic == magicKeccak && d.dsbyte == dsbyteKeccak:
-	default:
-		return errors.New("sha3: invalid hash state identifier")
-	}
-
-	rate := int(b[0])
-	b = b[1:]
-	if rate != d.rate {
-		return errors.New("sha3: invalid hash state function")
-	}
-
-	copy(d.a[:], b)
-	b = b[len(d.a):]
-
-	n, state := int(b[0]), spongeDirection(b[1])
-	if n > d.rate {
-		return errors.New("sha3: invalid hash state")
-	}
-	d.n = n
-	if state != spongeAbsorbing && state != spongeSqueezing {
-		return errors.New("sha3: invalid hash state")
-	}
-	d.state = state
-
-	return nil
-}
diff --git a/vendor/golang.org/x/crypto/sha3/legacy_keccakf.go b/vendor/golang.org/x/crypto/sha3/legacy_keccakf.go
deleted file mode 100644
index 101588c16..000000000
--- a/vendor/golang.org/x/crypto/sha3/legacy_keccakf.go
+++ /dev/null
@@ -1,416 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// This implementation is only used for NewLegacyKeccak256 and
-// NewLegacyKeccak512, which are not implemented by crypto/sha3.
-// All other functions in this package are wrappers around crypto/sha3.
-
-import "math/bits"
-
-// rc stores the round constants for use in the ι step.
-var rc = [24]uint64{
-	0x0000000000000001,
-	0x0000000000008082,
-	0x800000000000808A,
-	0x8000000080008000,
-	0x000000000000808B,
-	0x0000000080000001,
-	0x8000000080008081,
-	0x8000000000008009,
-	0x000000000000008A,
-	0x0000000000000088,
-	0x0000000080008009,
-	0x000000008000000A,
-	0x000000008000808B,
-	0x800000000000008B,
-	0x8000000000008089,
-	0x8000000000008003,
-	0x8000000000008002,
-	0x8000000000000080,
-	0x000000000000800A,
-	0x800000008000000A,
-	0x8000000080008081,
-	0x8000000000008080,
-	0x0000000080000001,
-	0x8000000080008008,
-}
-
-// keccakF1600 applies the Keccak permutation to a 1600b-wide
-// state represented as a slice of 25 uint64s.
-func keccakF1600(a *[25]uint64) {
-	// Implementation translated from Keccak-inplace.c
-	// in the keccak reference code.
-	var t, bc0, bc1, bc2, bc3, bc4, d0, d1, d2, d3, d4 uint64
-
-	for i := 0; i < 24; i += 4 {
-		// Combines the 5 steps in each round into 2 steps.
-		// Unrolls 4 rounds per loop and spreads some steps across rounds.
-
-		// Round 1
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[6] ^ d1
-		bc1 = bits.RotateLeft64(t, 44)
-		t = a[12] ^ d2
-		bc2 = bits.RotateLeft64(t, 43)
-		t = a[18] ^ d3
-		bc3 = bits.RotateLeft64(t, 21)
-		t = a[24] ^ d4
-		bc4 = bits.RotateLeft64(t, 14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i]
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc2 = bits.RotateLeft64(t, 3)
-		t = a[16] ^ d1
-		bc3 = bits.RotateLeft64(t, 45)
-		t = a[22] ^ d2
-		bc4 = bits.RotateLeft64(t, 61)
-		t = a[3] ^ d3
-		bc0 = bits.RotateLeft64(t, 28)
-		t = a[9] ^ d4
-		bc1 = bits.RotateLeft64(t, 20)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc4 = bits.RotateLeft64(t, 18)
-		t = a[1] ^ d1
-		bc0 = bits.RotateLeft64(t, 1)
-		t = a[7] ^ d2
-		bc1 = bits.RotateLeft64(t, 6)
-		t = a[13] ^ d3
-		bc2 = bits.RotateLeft64(t, 25)
-		t = a[19] ^ d4
-		bc3 = bits.RotateLeft64(t, 8)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc1 = bits.RotateLeft64(t, 36)
-		t = a[11] ^ d1
-		bc2 = bits.RotateLeft64(t, 10)
-		t = a[17] ^ d2
-		bc3 = bits.RotateLeft64(t, 15)
-		t = a[23] ^ d3
-		bc4 = bits.RotateLeft64(t, 56)
-		t = a[4] ^ d4
-		bc0 = bits.RotateLeft64(t, 27)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc3 = bits.RotateLeft64(t, 41)
-		t = a[21] ^ d1
-		bc4 = bits.RotateLeft64(t, 2)
-		t = a[2] ^ d2
-		bc0 = bits.RotateLeft64(t, 62)
-		t = a[8] ^ d3
-		bc1 = bits.RotateLeft64(t, 55)
-		t = a[14] ^ d4
-		bc2 = bits.RotateLeft64(t, 39)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		// Round 2
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[16] ^ d1
-		bc1 = bits.RotateLeft64(t, 44)
-		t = a[7] ^ d2
-		bc2 = bits.RotateLeft64(t, 43)
-		t = a[23] ^ d3
-		bc3 = bits.RotateLeft64(t, 21)
-		t = a[14] ^ d4
-		bc4 = bits.RotateLeft64(t, 14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i+1]
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc2 = bits.RotateLeft64(t, 3)
-		t = a[11] ^ d1
-		bc3 = bits.RotateLeft64(t, 45)
-		t = a[2] ^ d2
-		bc4 = bits.RotateLeft64(t, 61)
-		t = a[18] ^ d3
-		bc0 = bits.RotateLeft64(t, 28)
-		t = a[9] ^ d4
-		bc1 = bits.RotateLeft64(t, 20)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc4 = bits.RotateLeft64(t, 18)
-		t = a[6] ^ d1
-		bc0 = bits.RotateLeft64(t, 1)
-		t = a[22] ^ d2
-		bc1 = bits.RotateLeft64(t, 6)
-		t = a[13] ^ d3
-		bc2 = bits.RotateLeft64(t, 25)
-		t = a[4] ^ d4
-		bc3 = bits.RotateLeft64(t, 8)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc1 = bits.RotateLeft64(t, 36)
-		t = a[1] ^ d1
-		bc2 = bits.RotateLeft64(t, 10)
-		t = a[17] ^ d2
-		bc3 = bits.RotateLeft64(t, 15)
-		t = a[8] ^ d3
-		bc4 = bits.RotateLeft64(t, 56)
-		t = a[24] ^ d4
-		bc0 = bits.RotateLeft64(t, 27)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc3 = bits.RotateLeft64(t, 41)
-		t = a[21] ^ d1
-		bc4 = bits.RotateLeft64(t, 2)
-		t = a[12] ^ d2
-		bc0 = bits.RotateLeft64(t, 62)
-		t = a[3] ^ d3
-		bc1 = bits.RotateLeft64(t, 55)
-		t = a[19] ^ d4
-		bc2 = bits.RotateLeft64(t, 39)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		// Round 3
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[11] ^ d1
-		bc1 = bits.RotateLeft64(t, 44)
-		t = a[22] ^ d2
-		bc2 = bits.RotateLeft64(t, 43)
-		t = a[8] ^ d3
-		bc3 = bits.RotateLeft64(t, 21)
-		t = a[19] ^ d4
-		bc4 = bits.RotateLeft64(t, 14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i+2]
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc2 = bits.RotateLeft64(t, 3)
-		t = a[1] ^ d1
-		bc3 = bits.RotateLeft64(t, 45)
-		t = a[12] ^ d2
-		bc4 = bits.RotateLeft64(t, 61)
-		t = a[23] ^ d3
-		bc0 = bits.RotateLeft64(t, 28)
-		t = a[9] ^ d4
-		bc1 = bits.RotateLeft64(t, 20)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc4 = bits.RotateLeft64(t, 18)
-		t = a[16] ^ d1
-		bc0 = bits.RotateLeft64(t, 1)
-		t = a[2] ^ d2
-		bc1 = bits.RotateLeft64(t, 6)
-		t = a[13] ^ d3
-		bc2 = bits.RotateLeft64(t, 25)
-		t = a[24] ^ d4
-		bc3 = bits.RotateLeft64(t, 8)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc1 = bits.RotateLeft64(t, 36)
-		t = a[6] ^ d1
-		bc2 = bits.RotateLeft64(t, 10)
-		t = a[17] ^ d2
-		bc3 = bits.RotateLeft64(t, 15)
-		t = a[3] ^ d3
-		bc4 = bits.RotateLeft64(t, 56)
-		t = a[14] ^ d4
-		bc0 = bits.RotateLeft64(t, 27)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc3 = bits.RotateLeft64(t, 41)
-		t = a[21] ^ d1
-		bc4 = bits.RotateLeft64(t, 2)
-		t = a[7] ^ d2
-		bc0 = bits.RotateLeft64(t, 62)
-		t = a[18] ^ d3
-		bc1 = bits.RotateLeft64(t, 55)
-		t = a[4] ^ d4
-		bc2 = bits.RotateLeft64(t, 39)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		// Round 4
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[1] ^ d1
-		bc1 = bits.RotateLeft64(t, 44)
-		t = a[2] ^ d2
-		bc2 = bits.RotateLeft64(t, 43)
-		t = a[3] ^ d3
-		bc3 = bits.RotateLeft64(t, 21)
-		t = a[4] ^ d4
-		bc4 = bits.RotateLeft64(t, 14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i+3]
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc2 = bits.RotateLeft64(t, 3)
-		t = a[6] ^ d1
-		bc3 = bits.RotateLeft64(t, 45)
-		t = a[7] ^ d2
-		bc4 = bits.RotateLeft64(t, 61)
-		t = a[8] ^ d3
-		bc0 = bits.RotateLeft64(t, 28)
-		t = a[9] ^ d4
-		bc1 = bits.RotateLeft64(t, 20)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc4 = bits.RotateLeft64(t, 18)
-		t = a[11] ^ d1
-		bc0 = bits.RotateLeft64(t, 1)
-		t = a[12] ^ d2
-		bc1 = bits.RotateLeft64(t, 6)
-		t = a[13] ^ d3
-		bc2 = bits.RotateLeft64(t, 25)
-		t = a[14] ^ d4
-		bc3 = bits.RotateLeft64(t, 8)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc1 = bits.RotateLeft64(t, 36)
-		t = a[16] ^ d1
-		bc2 = bits.RotateLeft64(t, 10)
-		t = a[17] ^ d2
-		bc3 = bits.RotateLeft64(t, 15)
-		t = a[18] ^ d3
-		bc4 = bits.RotateLeft64(t, 56)
-		t = a[19] ^ d4
-		bc0 = bits.RotateLeft64(t, 27)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc3 = bits.RotateLeft64(t, 41)
-		t = a[21] ^ d1
-		bc4 = bits.RotateLeft64(t, 2)
-		t = a[22] ^ d2
-		bc0 = bits.RotateLeft64(t, 62)
-		t = a[23] ^ d3
-		bc1 = bits.RotateLeft64(t, 55)
-		t = a[24] ^ d4
-		bc2 = bits.RotateLeft64(t, 39)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/sha3/shake.go b/vendor/golang.org/x/crypto/sha3/shake.go
deleted file mode 100644
index 6f3f70c26..000000000
--- a/vendor/golang.org/x/crypto/sha3/shake.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-import (
-	"crypto/sha3"
-	"hash"
-	"io"
-)
-
-// ShakeHash defines the interface to hash functions that support
-// arbitrary-length output. When used as a plain [hash.Hash], it
-// produces minimum-length outputs that provide full-strength generic
-// security.
-type ShakeHash interface {
-	hash.Hash
-
-	// Read reads more output from the hash; reading affects the hash's
-	// state. (ShakeHash.Read is thus very different from Hash.Sum.)
-	// It never returns an error, but subsequent calls to Write or Sum
-	// will panic.
-	io.Reader
-
-	// Clone returns a copy of the ShakeHash in its current state.
-	Clone() ShakeHash
-}
-
-// NewShake128 creates a new SHAKE128 variable-output-length ShakeHash.
-// Its generic security strength is 128 bits against all attacks if at
-// least 32 bytes of its output are used.
-func NewShake128() ShakeHash {
-	return &shakeWrapper{sha3.NewSHAKE128(), 32, false, sha3.NewSHAKE128}
-}
-
-// NewShake256 creates a new SHAKE256 variable-output-length ShakeHash.
-// Its generic security strength is 256 bits against all attacks if
-// at least 64 bytes of its output are used.
-func NewShake256() ShakeHash {
-	return &shakeWrapper{sha3.NewSHAKE256(), 64, false, sha3.NewSHAKE256}
-}
-
-// NewCShake128 creates a new instance of cSHAKE128 variable-output-length ShakeHash,
-// a customizable variant of SHAKE128.
-// N is used to define functions based on cSHAKE, it can be empty when plain cSHAKE is
-// desired. S is a customization byte string used for domain separation - two cSHAKE
-// computations on same input with different S yield unrelated outputs.
-// When N and S are both empty, this is equivalent to NewShake128.
-func NewCShake128(N, S []byte) ShakeHash {
-	return &shakeWrapper{sha3.NewCSHAKE128(N, S), 32, false, func() *sha3.SHAKE {
-		return sha3.NewCSHAKE128(N, S)
-	}}
-}
-
-// NewCShake256 creates a new instance of cSHAKE256 variable-output-length ShakeHash,
-// a customizable variant of SHAKE256.
-// N is used to define functions based on cSHAKE, it can be empty when plain cSHAKE is
-// desired. S is a customization byte string used for domain separation - two cSHAKE
-// computations on same input with different S yield unrelated outputs.
-// When N and S are both empty, this is equivalent to NewShake256.
-func NewCShake256(N, S []byte) ShakeHash {
-	return &shakeWrapper{sha3.NewCSHAKE256(N, S), 64, false, func() *sha3.SHAKE {
-		return sha3.NewCSHAKE256(N, S)
-	}}
-}
-
-// ShakeSum128 writes an arbitrary-length digest of data into hash.
-func ShakeSum128(hash, data []byte) {
-	h := NewShake128()
-	h.Write(data)
-	h.Read(hash)
-}
-
-// ShakeSum256 writes an arbitrary-length digest of data into hash.
-func ShakeSum256(hash, data []byte) {
-	h := NewShake256()
-	h.Write(data)
-	h.Read(hash)
-}
-
-// shakeWrapper adds the Size, Sum, and Clone methods to a sha3.SHAKE
-// to implement the ShakeHash interface.
-type shakeWrapper struct {
-	*sha3.SHAKE
-	outputLen int
-	squeezing bool
-	newSHAKE  func() *sha3.SHAKE
-}
-
-func (w *shakeWrapper) Read(p []byte) (n int, err error) {
-	w.squeezing = true
-	return w.SHAKE.Read(p)
-}
-
-func (w *shakeWrapper) Clone() ShakeHash {
-	s := w.newSHAKE()
-	b, err := w.MarshalBinary()
-	if err != nil {
-		panic(err) // unreachable
-	}
-	if err := s.UnmarshalBinary(b); err != nil {
-		panic(err) // unreachable
-	}
-	return &shakeWrapper{s, w.outputLen, w.squeezing, w.newSHAKE}
-}
-
-func (w *shakeWrapper) Size() int { return w.outputLen }
-
-func (w *shakeWrapper) Sum(b []byte) []byte {
-	if w.squeezing {
-		panic("sha3: Sum after Read")
-	}
-	out := make([]byte, w.outputLen)
-	// Clone the state so that we don't affect future Write calls.
-	s := w.Clone()
-	s.Read(out)
-	return append(b, out...)
-}
diff --git a/vendor/golang.org/x/crypto/ssh/agent/client.go b/vendor/golang.org/x/crypto/ssh/agent/client.go
deleted file mode 100644
index b357e18b0..000000000
--- a/vendor/golang.org/x/crypto/ssh/agent/client.go
+++ /dev/null
@@ -1,856 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package agent implements the ssh-agent protocol, and provides both
-// a client and a server. The client can talk to a standard ssh-agent
-// that uses UNIX sockets, and one could implement an alternative
-// ssh-agent process using the sample server.
-//
-// References:
-//
-//	[PROTOCOL.agent]: https://tools.ietf.org/html/draft-miller-ssh-agent-00
-package agent
-
-import (
-	"bytes"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/ed25519"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"encoding/base64"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"sync"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// SignatureFlags represent additional flags that can be passed to the signature
-// requests an defined in [PROTOCOL.agent] section 4.5.1.
-type SignatureFlags uint32
-
-// SignatureFlag values as defined in [PROTOCOL.agent] section 5.3.
-const (
-	SignatureFlagReserved SignatureFlags = 1 << iota
-	SignatureFlagRsaSha256
-	SignatureFlagRsaSha512
-)
-
-// Agent represents the capabilities of an ssh-agent.
-type Agent interface {
-	// List returns the identities known to the agent.
-	List() ([]*Key, error)
-
-	// Sign has the agent sign the data using a protocol 2 key as defined
-	// in [PROTOCOL.agent] section 2.6.2.
-	Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error)
-
-	// Add adds a private key to the agent.
-	Add(key AddedKey) error
-
-	// Remove removes all identities with the given public key.
-	Remove(key ssh.PublicKey) error
-
-	// RemoveAll removes all identities.
-	RemoveAll() error
-
-	// Lock locks the agent. Sign and Remove will fail, and List will empty an empty list.
-	Lock(passphrase []byte) error
-
-	// Unlock undoes the effect of Lock
-	Unlock(passphrase []byte) error
-
-	// Signers returns signers for all the known keys.
-	Signers() ([]ssh.Signer, error)
-}
-
-type ExtendedAgent interface {
-	Agent
-
-	// SignWithFlags signs like Sign, but allows for additional flags to be sent/received
-	SignWithFlags(key ssh.PublicKey, data []byte, flags SignatureFlags) (*ssh.Signature, error)
-
-	// Extension processes a custom extension request. Standard-compliant agents are not
-	// required to support any extensions, but this method allows agents to implement
-	// vendor-specific methods or add experimental features. See [PROTOCOL.agent] section 4.7.
-	// If agent extensions are unsupported entirely this method MUST return an
-	// ErrExtensionUnsupported error. Similarly, if just the specific extensionType in
-	// the request is unsupported by the agent then ErrExtensionUnsupported MUST be
-	// returned.
-	//
-	// In the case of success, since [PROTOCOL.agent] section 4.7 specifies that the contents
-	// of the response are unspecified (including the type of the message), the complete
-	// response will be returned as a []byte slice, including the "type" byte of the message.
-	Extension(extensionType string, contents []byte) ([]byte, error)
-}
-
-// ConstraintExtension describes an optional constraint defined by users.
-type ConstraintExtension struct {
-	// ExtensionName consist of a UTF-8 string suffixed by the
-	// implementation domain following the naming scheme defined
-	// in Section 4.2 of RFC 4251, e.g.  "foo@example.com".
-	ExtensionName string
-	// ExtensionDetails contains the actual content of the extended
-	// constraint.
-	ExtensionDetails []byte
-}
-
-// AddedKey describes an SSH key to be added to an Agent.
-type AddedKey struct {
-	// PrivateKey must be a *rsa.PrivateKey, *dsa.PrivateKey,
-	// ed25519.PrivateKey or *ecdsa.PrivateKey, which will be inserted into the
-	// agent.
-	PrivateKey interface{}
-	// Certificate, if not nil, is communicated to the agent and will be
-	// stored with the key.
-	Certificate *ssh.Certificate
-	// Comment is an optional, free-form string.
-	Comment string
-	// LifetimeSecs, if not zero, is the number of seconds that the
-	// agent will store the key for.
-	LifetimeSecs uint32
-	// ConfirmBeforeUse, if true, requests that the agent confirm with the
-	// user before each use of this key.
-	ConfirmBeforeUse bool
-	// ConstraintExtensions are the experimental or private-use constraints
-	// defined by users.
-	ConstraintExtensions []ConstraintExtension
-}
-
-// See [PROTOCOL.agent], section 3.
-const (
-	agentRequestV1Identities   = 1
-	agentRemoveAllV1Identities = 9
-
-	// 3.2 Requests from client to agent for protocol 2 key operations
-	agentAddIdentity         = 17
-	agentRemoveIdentity      = 18
-	agentRemoveAllIdentities = 19
-	agentAddIDConstrained    = 25
-
-	// 3.3 Key-type independent requests from client to agent
-	agentAddSmartcardKey            = 20
-	agentRemoveSmartcardKey         = 21
-	agentLock                       = 22
-	agentUnlock                     = 23
-	agentAddSmartcardKeyConstrained = 26
-
-	// 3.7 Key constraint identifiers
-	agentConstrainLifetime = 1
-	agentConstrainConfirm  = 2
-	// Constraint extension identifier up to version 2 of the protocol. A
-	// backward incompatible change will be required if we want to add support
-	// for SSH_AGENT_CONSTRAIN_MAXSIGN which uses the same ID.
-	agentConstrainExtensionV00 = 3
-	// Constraint extension identifier in version 3 and later of the protocol.
-	agentConstrainExtension = 255
-)
-
-// maxAgentResponseBytes is the maximum agent reply size that is accepted. This
-// is a sanity check, not a limit in the spec.
-const maxAgentResponseBytes = 16 << 20
-
-// Agent messages:
-// These structures mirror the wire format of the corresponding ssh agent
-// messages found in [PROTOCOL.agent].
-
-// 3.4 Generic replies from agent to client
-const agentFailure = 5
-
-type failureAgentMsg struct{}
-
-const agentSuccess = 6
-
-type successAgentMsg struct{}
-
-// See [PROTOCOL.agent], section 2.5.2.
-const agentRequestIdentities = 11
-
-type requestIdentitiesAgentMsg struct{}
-
-// See [PROTOCOL.agent], section 2.5.2.
-const agentIdentitiesAnswer = 12
-
-type identitiesAnswerAgentMsg struct {
-	NumKeys uint32 `sshtype:"12"`
-	Keys    []byte `ssh:"rest"`
-}
-
-// See [PROTOCOL.agent], section 2.6.2.
-const agentSignRequest = 13
-
-type signRequestAgentMsg struct {
-	KeyBlob []byte `sshtype:"13"`
-	Data    []byte
-	Flags   uint32
-}
-
-// See [PROTOCOL.agent], section 2.6.2.
-
-// 3.6 Replies from agent to client for protocol 2 key operations
-const agentSignResponse = 14
-
-type signResponseAgentMsg struct {
-	SigBlob []byte `sshtype:"14"`
-}
-
-type publicKey struct {
-	Format string
-	Rest   []byte `ssh:"rest"`
-}
-
-// 3.7 Key constraint identifiers
-type constrainLifetimeAgentMsg struct {
-	LifetimeSecs uint32 `sshtype:"1"`
-}
-
-type constrainExtensionAgentMsg struct {
-	ExtensionName    string `sshtype:"255|3"`
-	ExtensionDetails []byte
-
-	// Rest is a field used for parsing, not part of message
-	Rest []byte `ssh:"rest"`
-}
-
-// See [PROTOCOL.agent], section 4.7
-const agentExtension = 27
-const agentExtensionFailure = 28
-
-// ErrExtensionUnsupported indicates that an extension defined in
-// [PROTOCOL.agent] section 4.7 is unsupported by the agent. Specifically this
-// error indicates that the agent returned a standard SSH_AGENT_FAILURE message
-// as the result of a SSH_AGENTC_EXTENSION request. Note that the protocol
-// specification (and therefore this error) does not distinguish between a
-// specific extension being unsupported and extensions being unsupported entirely.
-var ErrExtensionUnsupported = errors.New("agent: extension unsupported")
-
-type extensionAgentMsg struct {
-	ExtensionType string `sshtype:"27"`
-	// NOTE: this matches OpenSSH's PROTOCOL.agent, not the IETF draft [PROTOCOL.agent],
-	// so that it matches what OpenSSH actually implements in the wild.
-	Contents []byte `ssh:"rest"`
-}
-
-// Key represents a protocol 2 public key as defined in
-// [PROTOCOL.agent], section 2.5.2.
-type Key struct {
-	Format  string
-	Blob    []byte
-	Comment string
-}
-
-func clientErr(err error) error {
-	return fmt.Errorf("agent: client error: %v", err)
-}
-
-// String returns the storage form of an agent key with the format, base64
-// encoded serialized key, and the comment if it is not empty.
-func (k *Key) String() string {
-	s := string(k.Format) + " " + base64.StdEncoding.EncodeToString(k.Blob)
-
-	if k.Comment != "" {
-		s += " " + k.Comment
-	}
-
-	return s
-}
-
-// Type returns the public key type.
-func (k *Key) Type() string {
-	return k.Format
-}
-
-// Marshal returns key blob to satisfy the ssh.PublicKey interface.
-func (k *Key) Marshal() []byte {
-	return k.Blob
-}
-
-// Verify satisfies the ssh.PublicKey interface.
-func (k *Key) Verify(data []byte, sig *ssh.Signature) error {
-	pubKey, err := ssh.ParsePublicKey(k.Blob)
-	if err != nil {
-		return fmt.Errorf("agent: bad public key: %v", err)
-	}
-	return pubKey.Verify(data, sig)
-}
-
-type wireKey struct {
-	Format string
-	Rest   []byte `ssh:"rest"`
-}
-
-func parseKey(in []byte) (out *Key, rest []byte, err error) {
-	var record struct {
-		Blob    []byte
-		Comment string
-		Rest    []byte `ssh:"rest"`
-	}
-
-	if err := ssh.Unmarshal(in, &record); err != nil {
-		return nil, nil, err
-	}
-
-	var wk wireKey
-	if err := ssh.Unmarshal(record.Blob, &wk); err != nil {
-		return nil, nil, err
-	}
-
-	return &Key{
-		Format:  wk.Format,
-		Blob:    record.Blob,
-		Comment: record.Comment,
-	}, record.Rest, nil
-}
-
-// client is a client for an ssh-agent process.
-type client struct {
-	// conn is typically a *net.UnixConn
-	conn io.ReadWriter
-	// mu is used to prevent concurrent access to the agent
-	mu sync.Mutex
-}
-
-// NewClient returns an Agent that talks to an ssh-agent process over
-// the given connection.
-func NewClient(rw io.ReadWriter) ExtendedAgent {
-	return &client{conn: rw}
-}
-
-// call sends an RPC to the agent. On success, the reply is
-// unmarshaled into reply and replyType is set to the first byte of
-// the reply, which contains the type of the message.
-func (c *client) call(req []byte) (reply interface{}, err error) {
-	buf, err := c.callRaw(req)
-	if err != nil {
-		return nil, err
-	}
-	reply, err = unmarshal(buf)
-	if err != nil {
-		return nil, clientErr(err)
-	}
-	return reply, nil
-}
-
-// callRaw sends an RPC to the agent. On success, the raw
-// bytes of the response are returned; no unmarshalling is
-// performed on the response.
-func (c *client) callRaw(req []byte) (reply []byte, err error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	msg := make([]byte, 4+len(req))
-	binary.BigEndian.PutUint32(msg, uint32(len(req)))
-	copy(msg[4:], req)
-	if _, err = c.conn.Write(msg); err != nil {
-		return nil, clientErr(err)
-	}
-
-	var respSizeBuf [4]byte
-	if _, err = io.ReadFull(c.conn, respSizeBuf[:]); err != nil {
-		return nil, clientErr(err)
-	}
-	respSize := binary.BigEndian.Uint32(respSizeBuf[:])
-	if respSize > maxAgentResponseBytes {
-		return nil, clientErr(errors.New("response too large"))
-	}
-
-	buf := make([]byte, respSize)
-	if _, err = io.ReadFull(c.conn, buf); err != nil {
-		return nil, clientErr(err)
-	}
-	return buf, nil
-}
-
-func (c *client) simpleCall(req []byte) error {
-	resp, err := c.call(req)
-	if err != nil {
-		return err
-	}
-	if _, ok := resp.(*successAgentMsg); ok {
-		return nil
-	}
-	return errors.New("agent: failure")
-}
-
-func (c *client) RemoveAll() error {
-	return c.simpleCall([]byte{agentRemoveAllIdentities})
-}
-
-func (c *client) Remove(key ssh.PublicKey) error {
-	req := ssh.Marshal(&agentRemoveIdentityMsg{
-		KeyBlob: key.Marshal(),
-	})
-	return c.simpleCall(req)
-}
-
-func (c *client) Lock(passphrase []byte) error {
-	req := ssh.Marshal(&agentLockMsg{
-		Passphrase: passphrase,
-	})
-	return c.simpleCall(req)
-}
-
-func (c *client) Unlock(passphrase []byte) error {
-	req := ssh.Marshal(&agentUnlockMsg{
-		Passphrase: passphrase,
-	})
-	return c.simpleCall(req)
-}
-
-// List returns the identities known to the agent.
-func (c *client) List() ([]*Key, error) {
-	// see [PROTOCOL.agent] section 2.5.2.
-	req := []byte{agentRequestIdentities}
-
-	msg, err := c.call(req)
-	if err != nil {
-		return nil, err
-	}
-
-	switch msg := msg.(type) {
-	case *identitiesAnswerAgentMsg:
-		if msg.NumKeys > maxAgentResponseBytes/8 {
-			return nil, errors.New("agent: too many keys in agent reply")
-		}
-		keys := make([]*Key, msg.NumKeys)
-		data := msg.Keys
-		for i := uint32(0); i < msg.NumKeys; i++ {
-			var key *Key
-			var err error
-			if key, data, err = parseKey(data); err != nil {
-				return nil, err
-			}
-			keys[i] = key
-		}
-		return keys, nil
-	case *failureAgentMsg:
-		return nil, errors.New("agent: failed to list keys")
-	default:
-		return nil, fmt.Errorf("agent: failed to list keys, unexpected message type %T", msg)
-	}
-}
-
-// Sign has the agent sign the data using a protocol 2 key as defined
-// in [PROTOCOL.agent] section 2.6.2.
-func (c *client) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
-	return c.SignWithFlags(key, data, 0)
-}
-
-func (c *client) SignWithFlags(key ssh.PublicKey, data []byte, flags SignatureFlags) (*ssh.Signature, error) {
-	req := ssh.Marshal(signRequestAgentMsg{
-		KeyBlob: key.Marshal(),
-		Data:    data,
-		Flags:   uint32(flags),
-	})
-
-	msg, err := c.call(req)
-	if err != nil {
-		return nil, err
-	}
-
-	switch msg := msg.(type) {
-	case *signResponseAgentMsg:
-		var sig ssh.Signature
-		if err := ssh.Unmarshal(msg.SigBlob, &sig); err != nil {
-			return nil, err
-		}
-
-		return &sig, nil
-	case *failureAgentMsg:
-		return nil, errors.New("agent: failed to sign challenge")
-	default:
-		return nil, fmt.Errorf("agent: failed to sign challenge, unexpected message type %T", msg)
-	}
-}
-
-// unmarshal parses an agent message in packet, returning the parsed
-// form and the message type of packet.
-func unmarshal(packet []byte) (interface{}, error) {
-	if len(packet) < 1 {
-		return nil, errors.New("agent: empty packet")
-	}
-	var msg interface{}
-	switch packet[0] {
-	case agentFailure:
-		return new(failureAgentMsg), nil
-	case agentSuccess:
-		return new(successAgentMsg), nil
-	case agentIdentitiesAnswer:
-		msg = new(identitiesAnswerAgentMsg)
-	case agentSignResponse:
-		msg = new(signResponseAgentMsg)
-	case agentV1IdentitiesAnswer:
-		msg = new(agentV1IdentityMsg)
-	default:
-		return nil, fmt.Errorf("agent: unknown type tag %d", packet[0])
-	}
-	if err := ssh.Unmarshal(packet, msg); err != nil {
-		return nil, err
-	}
-	return msg, nil
-}
-
-type rsaKeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	N           *big.Int
-	E           *big.Int
-	D           *big.Int
-	Iqmp        *big.Int // IQMP = Inverse Q Mod P
-	P           *big.Int
-	Q           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type dsaKeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	P           *big.Int
-	Q           *big.Int
-	G           *big.Int
-	Y           *big.Int
-	X           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ecdsaKeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	Curve       string
-	KeyBytes    []byte
-	D           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ed25519KeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	Pub         []byte
-	Priv        []byte
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-// Insert adds a private key to the agent.
-func (c *client) insertKey(s interface{}, comment string, constraints []byte) error {
-	var req []byte
-	switch k := s.(type) {
-	case *rsa.PrivateKey:
-		if len(k.Primes) != 2 {
-			return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
-		}
-		k.Precompute()
-		req = ssh.Marshal(rsaKeyMsg{
-			Type:        ssh.KeyAlgoRSA,
-			N:           k.N,
-			E:           big.NewInt(int64(k.E)),
-			D:           k.D,
-			Iqmp:        k.Precomputed.Qinv,
-			P:           k.Primes[0],
-			Q:           k.Primes[1],
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *dsa.PrivateKey:
-		req = ssh.Marshal(dsaKeyMsg{
-			Type:        ssh.InsecureKeyAlgoDSA,
-			P:           k.P,
-			Q:           k.Q,
-			G:           k.G,
-			Y:           k.Y,
-			X:           k.X,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *ecdsa.PrivateKey:
-		nistID := fmt.Sprintf("nistp%d", k.Params().BitSize)
-		req = ssh.Marshal(ecdsaKeyMsg{
-			Type:        "ecdsa-sha2-" + nistID,
-			Curve:       nistID,
-			KeyBytes:    elliptic.Marshal(k.Curve, k.X, k.Y),
-			D:           k.D,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case ed25519.PrivateKey:
-		req = ssh.Marshal(ed25519KeyMsg{
-			Type:        ssh.KeyAlgoED25519,
-			Pub:         []byte(k)[32:],
-			Priv:        []byte(k),
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	// This function originally supported only *ed25519.PrivateKey, however the
-	// general idiom is to pass ed25519.PrivateKey by value, not by pointer.
-	// We still support the pointer variant for backwards compatibility.
-	case *ed25519.PrivateKey:
-		req = ssh.Marshal(ed25519KeyMsg{
-			Type:        ssh.KeyAlgoED25519,
-			Pub:         []byte(*k)[32:],
-			Priv:        []byte(*k),
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	default:
-		return fmt.Errorf("agent: unsupported key type %T", s)
-	}
-
-	// if constraints are present then the message type needs to be changed.
-	if len(constraints) != 0 {
-		req[0] = agentAddIDConstrained
-	}
-
-	resp, err := c.call(req)
-	if err != nil {
-		return err
-	}
-	if _, ok := resp.(*successAgentMsg); ok {
-		return nil
-	}
-	return errors.New("agent: failure")
-}
-
-type rsaCertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	D           *big.Int
-	Iqmp        *big.Int // IQMP = Inverse Q Mod P
-	P           *big.Int
-	Q           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type dsaCertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	X           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ecdsaCertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	D           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ed25519CertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	Pub         []byte
-	Priv        []byte
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-// Add adds a private key to the agent. If a certificate is given,
-// that certificate is added instead as public key.
-func (c *client) Add(key AddedKey) error {
-	var constraints []byte
-
-	if secs := key.LifetimeSecs; secs != 0 {
-		constraints = append(constraints, ssh.Marshal(constrainLifetimeAgentMsg{secs})...)
-	}
-
-	if key.ConfirmBeforeUse {
-		constraints = append(constraints, agentConstrainConfirm)
-	}
-
-	cert := key.Certificate
-	if cert == nil {
-		return c.insertKey(key.PrivateKey, key.Comment, constraints)
-	}
-	return c.insertCert(key.PrivateKey, cert, key.Comment, constraints)
-}
-
-func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string, constraints []byte) error {
-	var req []byte
-	switch k := s.(type) {
-	case *rsa.PrivateKey:
-		if len(k.Primes) != 2 {
-			return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
-		}
-		k.Precompute()
-		req = ssh.Marshal(rsaCertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			D:           k.D,
-			Iqmp:        k.Precomputed.Qinv,
-			P:           k.Primes[0],
-			Q:           k.Primes[1],
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *dsa.PrivateKey:
-		req = ssh.Marshal(dsaCertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			X:           k.X,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *ecdsa.PrivateKey:
-		req = ssh.Marshal(ecdsaCertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			D:           k.D,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case ed25519.PrivateKey:
-		req = ssh.Marshal(ed25519CertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			Pub:         []byte(k)[32:],
-			Priv:        []byte(k),
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	// This function originally supported only *ed25519.PrivateKey, however the
-	// general idiom is to pass ed25519.PrivateKey by value, not by pointer.
-	// We still support the pointer variant for backwards compatibility.
-	case *ed25519.PrivateKey:
-		req = ssh.Marshal(ed25519CertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			Pub:         []byte(*k)[32:],
-			Priv:        []byte(*k),
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	default:
-		return fmt.Errorf("agent: unsupported key type %T", s)
-	}
-
-	// if constraints are present then the message type needs to be changed.
-	if len(constraints) != 0 {
-		req[0] = agentAddIDConstrained
-	}
-
-	signer, err := ssh.NewSignerFromKey(s)
-	if err != nil {
-		return err
-	}
-	if !bytes.Equal(cert.Key.Marshal(), signer.PublicKey().Marshal()) {
-		return errors.New("agent: signer and cert have different public key")
-	}
-
-	resp, err := c.call(req)
-	if err != nil {
-		return err
-	}
-	if _, ok := resp.(*successAgentMsg); ok {
-		return nil
-	}
-	return errors.New("agent: failure")
-}
-
-// Signers provides a callback for client authentication.
-func (c *client) Signers() ([]ssh.Signer, error) {
-	keys, err := c.List()
-	if err != nil {
-		return nil, err
-	}
-
-	var result []ssh.Signer
-	for _, k := range keys {
-		result = append(result, &agentKeyringSigner{c, k})
-	}
-	return result, nil
-}
-
-type agentKeyringSigner struct {
-	agent *client
-	pub   ssh.PublicKey
-}
-
-func (s *agentKeyringSigner) PublicKey() ssh.PublicKey {
-	return s.pub
-}
-
-func (s *agentKeyringSigner) Sign(rand io.Reader, data []byte) (*ssh.Signature, error) {
-	// The agent has its own entropy source, so the rand argument is ignored.
-	return s.agent.Sign(s.pub, data)
-}
-
-func (s *agentKeyringSigner) SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*ssh.Signature, error) {
-	if algorithm == "" || algorithm == underlyingAlgo(s.pub.Type()) {
-		return s.Sign(rand, data)
-	}
-
-	var flags SignatureFlags
-	switch algorithm {
-	case ssh.KeyAlgoRSASHA256:
-		flags = SignatureFlagRsaSha256
-	case ssh.KeyAlgoRSASHA512:
-		flags = SignatureFlagRsaSha512
-	default:
-		return nil, fmt.Errorf("agent: unsupported algorithm %q", algorithm)
-	}
-
-	return s.agent.SignWithFlags(s.pub, data, flags)
-}
-
-var _ ssh.AlgorithmSigner = &agentKeyringSigner{}
-
-// certKeyAlgoNames is a mapping from known certificate algorithm names to the
-// corresponding public key signature algorithm.
-//
-// This map must be kept in sync with the one in certs.go.
-var certKeyAlgoNames = map[string]string{
-	ssh.CertAlgoRSAv01:         ssh.KeyAlgoRSA,
-	ssh.CertAlgoRSASHA256v01:   ssh.KeyAlgoRSASHA256,
-	ssh.CertAlgoRSASHA512v01:   ssh.KeyAlgoRSASHA512,
-	ssh.InsecureCertAlgoDSAv01: ssh.InsecureKeyAlgoDSA,
-	ssh.CertAlgoECDSA256v01:    ssh.KeyAlgoECDSA256,
-	ssh.CertAlgoECDSA384v01:    ssh.KeyAlgoECDSA384,
-	ssh.CertAlgoECDSA521v01:    ssh.KeyAlgoECDSA521,
-	ssh.CertAlgoSKECDSA256v01:  ssh.KeyAlgoSKECDSA256,
-	ssh.CertAlgoED25519v01:     ssh.KeyAlgoED25519,
-	ssh.CertAlgoSKED25519v01:   ssh.KeyAlgoSKED25519,
-}
-
-// underlyingAlgo returns the signature algorithm associated with algo (which is
-// an advertised or negotiated public key or host key algorithm). These are
-// usually the same, except for certificate algorithms.
-func underlyingAlgo(algo string) string {
-	if a, ok := certKeyAlgoNames[algo]; ok {
-		return a
-	}
-	return algo
-}
-
-// Calls an extension method. It is up to the agent implementation as to whether or not
-// any particular extension is supported and may always return an error. Because the
-// type of the response is up to the implementation, this returns the bytes of the
-// response and does not attempt any type of unmarshalling.
-func (c *client) Extension(extensionType string, contents []byte) ([]byte, error) {
-	req := ssh.Marshal(extensionAgentMsg{
-		ExtensionType: extensionType,
-		Contents:      contents,
-	})
-	buf, err := c.callRaw(req)
-	if err != nil {
-		return nil, err
-	}
-	if len(buf) == 0 {
-		return nil, errors.New("agent: failure; empty response")
-	}
-	// [PROTOCOL.agent] section 4.7 indicates that an SSH_AGENT_FAILURE message
-	// represents an agent that does not support the extension
-	if buf[0] == agentFailure {
-		return nil, ErrExtensionUnsupported
-	}
-	if buf[0] == agentExtensionFailure {
-		return nil, errors.New("agent: generic extension failure")
-	}
-
-	return buf, nil
-}
diff --git a/vendor/golang.org/x/crypto/ssh/agent/forward.go b/vendor/golang.org/x/crypto/ssh/agent/forward.go
deleted file mode 100644
index fd24ba900..000000000
--- a/vendor/golang.org/x/crypto/ssh/agent/forward.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"errors"
-	"io"
-	"net"
-	"sync"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// RequestAgentForwarding sets up agent forwarding for the session.
-// ForwardToAgent or ForwardToRemote should be called to route
-// the authentication requests.
-func RequestAgentForwarding(session *ssh.Session) error {
-	ok, err := session.SendRequest("auth-agent-req@openssh.com", true, nil)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return errors.New("forwarding request denied")
-	}
-	return nil
-}
-
-// ForwardToAgent routes authentication requests to the given keyring.
-func ForwardToAgent(client *ssh.Client, keyring Agent) error {
-	channels := client.HandleChannelOpen(channelType)
-	if channels == nil {
-		return errors.New("agent: already have handler for " + channelType)
-	}
-
-	go func() {
-		for ch := range channels {
-			channel, reqs, err := ch.Accept()
-			if err != nil {
-				continue
-			}
-			go ssh.DiscardRequests(reqs)
-			go func() {
-				ServeAgent(keyring, channel)
-				channel.Close()
-			}()
-		}
-	}()
-	return nil
-}
-
-const channelType = "auth-agent@openssh.com"
-
-// ForwardToRemote routes authentication requests to the ssh-agent
-// process serving on the given unix socket.
-func ForwardToRemote(client *ssh.Client, addr string) error {
-	channels := client.HandleChannelOpen(channelType)
-	if channels == nil {
-		return errors.New("agent: already have handler for " + channelType)
-	}
-	conn, err := net.Dial("unix", addr)
-	if err != nil {
-		return err
-	}
-	conn.Close()
-
-	go func() {
-		for ch := range channels {
-			channel, reqs, err := ch.Accept()
-			if err != nil {
-				continue
-			}
-			go ssh.DiscardRequests(reqs)
-			go forwardUnixSocket(channel, addr)
-		}
-	}()
-	return nil
-}
-
-func forwardUnixSocket(channel ssh.Channel, addr string) {
-	conn, err := net.Dial("unix", addr)
-	if err != nil {
-		return
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-	go func() {
-		io.Copy(conn, channel)
-		conn.(*net.UnixConn).CloseWrite()
-		wg.Done()
-	}()
-	go func() {
-		io.Copy(channel, conn)
-		channel.CloseWrite()
-		wg.Done()
-	}()
-
-	wg.Wait()
-	conn.Close()
-	channel.Close()
-}
diff --git a/vendor/golang.org/x/crypto/ssh/agent/keyring.go b/vendor/golang.org/x/crypto/ssh/agent/keyring.go
deleted file mode 100644
index d12987551..000000000
--- a/vendor/golang.org/x/crypto/ssh/agent/keyring.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"bytes"
-	"crypto/rand"
-	"crypto/subtle"
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"golang.org/x/crypto/ssh"
-)
-
-type privKey struct {
-	signer  ssh.Signer
-	comment string
-	expire  *time.Time
-}
-
-type keyring struct {
-	mu   sync.Mutex
-	keys []privKey
-
-	locked     bool
-	passphrase []byte
-}
-
-var errLocked = errors.New("agent: locked")
-
-// NewKeyring returns an Agent that holds keys in memory.  It is safe
-// for concurrent use by multiple goroutines.
-func NewKeyring() Agent {
-	return &keyring{}
-}
-
-// RemoveAll removes all identities.
-func (r *keyring) RemoveAll() error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-
-	r.keys = nil
-	return nil
-}
-
-// removeLocked does the actual key removal. The caller must already be holding the
-// keyring mutex.
-func (r *keyring) removeLocked(want []byte) error {
-	found := false
-	for i := 0; i < len(r.keys); {
-		if bytes.Equal(r.keys[i].signer.PublicKey().Marshal(), want) {
-			found = true
-			r.keys[i] = r.keys[len(r.keys)-1]
-			r.keys = r.keys[:len(r.keys)-1]
-			continue
-		} else {
-			i++
-		}
-	}
-
-	if !found {
-		return errors.New("agent: key not found")
-	}
-	return nil
-}
-
-// Remove removes all identities with the given public key.
-func (r *keyring) Remove(key ssh.PublicKey) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-
-	return r.removeLocked(key.Marshal())
-}
-
-// Lock locks the agent. Sign and Remove will fail, and List will return an empty list.
-func (r *keyring) Lock(passphrase []byte) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-
-	r.locked = true
-	r.passphrase = passphrase
-	return nil
-}
-
-// Unlock undoes the effect of Lock
-func (r *keyring) Unlock(passphrase []byte) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if !r.locked {
-		return errors.New("agent: not locked")
-	}
-	if 1 != subtle.ConstantTimeCompare(passphrase, r.passphrase) {
-		return fmt.Errorf("agent: incorrect passphrase")
-	}
-
-	r.locked = false
-	r.passphrase = nil
-	return nil
-}
-
-// expireKeysLocked removes expired keys from the keyring. If a key was added
-// with a lifetimesecs constraint and seconds >= lifetimesecs seconds have
-// elapsed, it is removed. The caller *must* be holding the keyring mutex.
-func (r *keyring) expireKeysLocked() {
-	for _, k := range r.keys {
-		if k.expire != nil && time.Now().After(*k.expire) {
-			r.removeLocked(k.signer.PublicKey().Marshal())
-		}
-	}
-}
-
-// List returns the identities known to the agent.
-func (r *keyring) List() ([]*Key, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		// section 2.7: locked agents return empty.
-		return nil, nil
-	}
-
-	r.expireKeysLocked()
-	var ids []*Key
-	for _, k := range r.keys {
-		pub := k.signer.PublicKey()
-		ids = append(ids, &Key{
-			Format:  pub.Type(),
-			Blob:    pub.Marshal(),
-			Comment: k.comment})
-	}
-	return ids, nil
-}
-
-// Insert adds a private key to the keyring. If a certificate
-// is given, that certificate is added as public key. Note that
-// any constraints given are ignored.
-func (r *keyring) Add(key AddedKey) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-	signer, err := ssh.NewSignerFromKey(key.PrivateKey)
-
-	if err != nil {
-		return err
-	}
-
-	if cert := key.Certificate; cert != nil {
-		signer, err = ssh.NewCertSigner(cert, signer)
-		if err != nil {
-			return err
-		}
-	}
-
-	p := privKey{
-		signer:  signer,
-		comment: key.Comment,
-	}
-
-	if key.LifetimeSecs > 0 {
-		t := time.Now().Add(time.Duration(key.LifetimeSecs) * time.Second)
-		p.expire = &t
-	}
-
-	// If we already have a Signer with the same public key, replace it with the
-	// new one.
-	for idx, k := range r.keys {
-		if bytes.Equal(k.signer.PublicKey().Marshal(), p.signer.PublicKey().Marshal()) {
-			r.keys[idx] = p
-			return nil
-		}
-	}
-
-	r.keys = append(r.keys, p)
-
-	return nil
-}
-
-// Sign returns a signature for the data.
-func (r *keyring) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
-	return r.SignWithFlags(key, data, 0)
-}
-
-func (r *keyring) SignWithFlags(key ssh.PublicKey, data []byte, flags SignatureFlags) (*ssh.Signature, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return nil, errLocked
-	}
-
-	r.expireKeysLocked()
-	wanted := key.Marshal()
-	for _, k := range r.keys {
-		if bytes.Equal(k.signer.PublicKey().Marshal(), wanted) {
-			if flags == 0 {
-				return k.signer.Sign(rand.Reader, data)
-			} else {
-				if algorithmSigner, ok := k.signer.(ssh.AlgorithmSigner); !ok {
-					return nil, fmt.Errorf("agent: signature does not support non-default signature algorithm: %T", k.signer)
-				} else {
-					var algorithm string
-					switch flags {
-					case SignatureFlagRsaSha256:
-						algorithm = ssh.KeyAlgoRSASHA256
-					case SignatureFlagRsaSha512:
-						algorithm = ssh.KeyAlgoRSASHA512
-					default:
-						return nil, fmt.Errorf("agent: unsupported signature flags: %d", flags)
-					}
-					return algorithmSigner.SignWithAlgorithm(rand.Reader, data, algorithm)
-				}
-			}
-		}
-	}
-	return nil, errors.New("not found")
-}
-
-// Signers returns signers for all the known keys.
-func (r *keyring) Signers() ([]ssh.Signer, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return nil, errLocked
-	}
-
-	r.expireKeysLocked()
-	s := make([]ssh.Signer, 0, len(r.keys))
-	for _, k := range r.keys {
-		s = append(s, k.signer)
-	}
-	return s, nil
-}
-
-// The keyring does not support any extensions
-func (r *keyring) Extension(extensionType string, contents []byte) ([]byte, error) {
-	return nil, ErrExtensionUnsupported
-}
diff --git a/vendor/golang.org/x/crypto/ssh/agent/server.go b/vendor/golang.org/x/crypto/ssh/agent/server.go
deleted file mode 100644
index 4e8ff86b6..000000000
--- a/vendor/golang.org/x/crypto/ssh/agent/server.go
+++ /dev/null
@@ -1,573 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/ed25519"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"math/big"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// server wraps an Agent and uses it to implement the agent side of
-// the SSH-agent, wire protocol.
-type server struct {
-	agent Agent
-}
-
-func (s *server) processRequestBytes(reqData []byte) []byte {
-	rep, err := s.processRequest(reqData)
-	if err != nil {
-		if err != errLocked {
-			// TODO(hanwen): provide better logging interface?
-			log.Printf("agent %d: %v", reqData[0], err)
-		}
-		return []byte{agentFailure}
-	}
-
-	if err == nil && rep == nil {
-		return []byte{agentSuccess}
-	}
-
-	return ssh.Marshal(rep)
-}
-
-func marshalKey(k *Key) []byte {
-	var record struct {
-		Blob    []byte
-		Comment string
-	}
-	record.Blob = k.Marshal()
-	record.Comment = k.Comment
-
-	return ssh.Marshal(&record)
-}
-
-// See [PROTOCOL.agent], section 2.5.1.
-const agentV1IdentitiesAnswer = 2
-
-type agentV1IdentityMsg struct {
-	Numkeys uint32 `sshtype:"2"`
-}
-
-type agentRemoveIdentityMsg struct {
-	KeyBlob []byte `sshtype:"18"`
-}
-
-type agentLockMsg struct {
-	Passphrase []byte `sshtype:"22"`
-}
-
-type agentUnlockMsg struct {
-	Passphrase []byte `sshtype:"23"`
-}
-
-func (s *server) processRequest(data []byte) (interface{}, error) {
-	switch data[0] {
-	case agentRequestV1Identities:
-		return &agentV1IdentityMsg{0}, nil
-
-	case agentRemoveAllV1Identities:
-		return nil, nil
-
-	case agentRemoveIdentity:
-		var req agentRemoveIdentityMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-
-		var wk wireKey
-		if err := ssh.Unmarshal(req.KeyBlob, &wk); err != nil {
-			return nil, err
-		}
-
-		return nil, s.agent.Remove(&Key{Format: wk.Format, Blob: req.KeyBlob})
-
-	case agentRemoveAllIdentities:
-		return nil, s.agent.RemoveAll()
-
-	case agentLock:
-		var req agentLockMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-
-		return nil, s.agent.Lock(req.Passphrase)
-
-	case agentUnlock:
-		var req agentUnlockMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-		return nil, s.agent.Unlock(req.Passphrase)
-
-	case agentSignRequest:
-		var req signRequestAgentMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-
-		var wk wireKey
-		if err := ssh.Unmarshal(req.KeyBlob, &wk); err != nil {
-			return nil, err
-		}
-
-		k := &Key{
-			Format: wk.Format,
-			Blob:   req.KeyBlob,
-		}
-
-		var sig *ssh.Signature
-		var err error
-		if extendedAgent, ok := s.agent.(ExtendedAgent); ok {
-			sig, err = extendedAgent.SignWithFlags(k, req.Data, SignatureFlags(req.Flags))
-		} else {
-			sig, err = s.agent.Sign(k, req.Data)
-		}
-
-		if err != nil {
-			return nil, err
-		}
-		return &signResponseAgentMsg{SigBlob: ssh.Marshal(sig)}, nil
-
-	case agentRequestIdentities:
-		keys, err := s.agent.List()
-		if err != nil {
-			return nil, err
-		}
-
-		rep := identitiesAnswerAgentMsg{
-			NumKeys: uint32(len(keys)),
-		}
-		for _, k := range keys {
-			rep.Keys = append(rep.Keys, marshalKey(k)...)
-		}
-		return rep, nil
-
-	case agentAddIDConstrained, agentAddIdentity:
-		return nil, s.insertIdentity(data)
-
-	case agentExtension:
-		// Return a stub object where the whole contents of the response gets marshaled.
-		var responseStub struct {
-			Rest []byte `ssh:"rest"`
-		}
-
-		if extendedAgent, ok := s.agent.(ExtendedAgent); !ok {
-			// If this agent doesn't implement extensions, [PROTOCOL.agent] section 4.7
-			// requires that we return a standard SSH_AGENT_FAILURE message.
-			responseStub.Rest = []byte{agentFailure}
-		} else {
-			var req extensionAgentMsg
-			if err := ssh.Unmarshal(data, &req); err != nil {
-				return nil, err
-			}
-			res, err := extendedAgent.Extension(req.ExtensionType, req.Contents)
-			if err != nil {
-				// If agent extensions are unsupported, return a standard SSH_AGENT_FAILURE
-				// message as required by [PROTOCOL.agent] section 4.7.
-				if err == ErrExtensionUnsupported {
-					responseStub.Rest = []byte{agentFailure}
-				} else {
-					// As the result of any other error processing an extension request,
-					// [PROTOCOL.agent] section 4.7 requires that we return a
-					// SSH_AGENT_EXTENSION_FAILURE code.
-					responseStub.Rest = []byte{agentExtensionFailure}
-				}
-			} else {
-				if len(res) == 0 {
-					return nil, nil
-				}
-				responseStub.Rest = res
-			}
-		}
-
-		return responseStub, nil
-	}
-
-	return nil, fmt.Errorf("unknown opcode %d", data[0])
-}
-
-func parseConstraints(constraints []byte) (lifetimeSecs uint32, confirmBeforeUse bool, extensions []ConstraintExtension, err error) {
-	for len(constraints) != 0 {
-		switch constraints[0] {
-		case agentConstrainLifetime:
-			if len(constraints) < 5 {
-				return 0, false, nil, io.ErrUnexpectedEOF
-			}
-			lifetimeSecs = binary.BigEndian.Uint32(constraints[1:5])
-			constraints = constraints[5:]
-		case agentConstrainConfirm:
-			confirmBeforeUse = true
-			constraints = constraints[1:]
-		case agentConstrainExtension, agentConstrainExtensionV00:
-			var msg constrainExtensionAgentMsg
-			if err = ssh.Unmarshal(constraints, &msg); err != nil {
-				return 0, false, nil, err
-			}
-			extensions = append(extensions, ConstraintExtension{
-				ExtensionName:    msg.ExtensionName,
-				ExtensionDetails: msg.ExtensionDetails,
-			})
-			constraints = msg.Rest
-		default:
-			return 0, false, nil, fmt.Errorf("unknown constraint type: %d", constraints[0])
-		}
-	}
-	return
-}
-
-func setConstraints(key *AddedKey, constraintBytes []byte) error {
-	lifetimeSecs, confirmBeforeUse, constraintExtensions, err := parseConstraints(constraintBytes)
-	if err != nil {
-		return err
-	}
-
-	key.LifetimeSecs = lifetimeSecs
-	key.ConfirmBeforeUse = confirmBeforeUse
-	key.ConstraintExtensions = constraintExtensions
-	return nil
-}
-
-func parseRSAKey(req []byte) (*AddedKey, error) {
-	var k rsaKeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	if k.E.BitLen() > 30 {
-		return nil, errors.New("agent: RSA public exponent too large")
-	}
-	priv := &rsa.PrivateKey{
-		PublicKey: rsa.PublicKey{
-			E: int(k.E.Int64()),
-			N: k.N,
-		},
-		D:      k.D,
-		Primes: []*big.Int{k.P, k.Q},
-	}
-	priv.Precompute()
-
-	addedKey := &AddedKey{PrivateKey: priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseEd25519Key(req []byte) (*AddedKey, error) {
-	var k ed25519KeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	priv := ed25519.PrivateKey(k.Priv)
-
-	addedKey := &AddedKey{PrivateKey: &priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseDSAKey(req []byte) (*AddedKey, error) {
-	var k dsaKeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	priv := &dsa.PrivateKey{
-		PublicKey: dsa.PublicKey{
-			Parameters: dsa.Parameters{
-				P: k.P,
-				Q: k.Q,
-				G: k.G,
-			},
-			Y: k.Y,
-		},
-		X: k.X,
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func unmarshalECDSA(curveName string, keyBytes []byte, privScalar *big.Int) (priv *ecdsa.PrivateKey, err error) {
-	priv = &ecdsa.PrivateKey{
-		D: privScalar,
-	}
-
-	switch curveName {
-	case "nistp256":
-		priv.Curve = elliptic.P256()
-	case "nistp384":
-		priv.Curve = elliptic.P384()
-	case "nistp521":
-		priv.Curve = elliptic.P521()
-	default:
-		return nil, fmt.Errorf("agent: unknown curve %q", curveName)
-	}
-
-	priv.X, priv.Y = elliptic.Unmarshal(priv.Curve, keyBytes)
-	if priv.X == nil || priv.Y == nil {
-		return nil, errors.New("agent: point not on curve")
-	}
-
-	return priv, nil
-}
-
-func parseEd25519Cert(req []byte) (*AddedKey, error) {
-	var k ed25519CertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-	priv := ed25519.PrivateKey(k.Priv)
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad ED25519 certificate")
-	}
-
-	addedKey := &AddedKey{PrivateKey: &priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseECDSAKey(req []byte) (*AddedKey, error) {
-	var k ecdsaKeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-
-	priv, err := unmarshalECDSA(k.Curve, k.KeyBytes, k.D)
-	if err != nil {
-		return nil, err
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseRSACert(req []byte) (*AddedKey, error) {
-	var k rsaCertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad RSA certificate")
-	}
-
-	// An RSA publickey as marshaled by rsaPublicKey.Marshal() in keys.go
-	var rsaPub struct {
-		Name string
-		E    *big.Int
-		N    *big.Int
-	}
-	if err := ssh.Unmarshal(cert.Key.Marshal(), &rsaPub); err != nil {
-		return nil, fmt.Errorf("agent: Unmarshal failed to parse public key: %v", err)
-	}
-
-	if rsaPub.E.BitLen() > 30 {
-		return nil, errors.New("agent: RSA public exponent too large")
-	}
-
-	priv := rsa.PrivateKey{
-		PublicKey: rsa.PublicKey{
-			E: int(rsaPub.E.Int64()),
-			N: rsaPub.N,
-		},
-		D:      k.D,
-		Primes: []*big.Int{k.Q, k.P},
-	}
-	priv.Precompute()
-
-	addedKey := &AddedKey{PrivateKey: &priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseDSACert(req []byte) (*AddedKey, error) {
-	var k dsaCertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad DSA certificate")
-	}
-
-	// A DSA publickey as marshaled by dsaPublicKey.Marshal() in keys.go
-	var w struct {
-		Name       string
-		P, Q, G, Y *big.Int
-	}
-	if err := ssh.Unmarshal(cert.Key.Marshal(), &w); err != nil {
-		return nil, fmt.Errorf("agent: Unmarshal failed to parse public key: %v", err)
-	}
-
-	priv := &dsa.PrivateKey{
-		PublicKey: dsa.PublicKey{
-			Parameters: dsa.Parameters{
-				P: w.P,
-				Q: w.Q,
-				G: w.G,
-			},
-			Y: w.Y,
-		},
-		X: k.X,
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseECDSACert(req []byte) (*AddedKey, error) {
-	var k ecdsaCertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad ECDSA certificate")
-	}
-
-	// An ECDSA publickey as marshaled by ecdsaPublicKey.Marshal() in keys.go
-	var ecdsaPub struct {
-		Name string
-		ID   string
-		Key  []byte
-	}
-	if err := ssh.Unmarshal(cert.Key.Marshal(), &ecdsaPub); err != nil {
-		return nil, err
-	}
-
-	priv, err := unmarshalECDSA(ecdsaPub.ID, ecdsaPub.Key, k.D)
-	if err != nil {
-		return nil, err
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func (s *server) insertIdentity(req []byte) error {
-	var record struct {
-		Type string `sshtype:"17|25"`
-		Rest []byte `ssh:"rest"`
-	}
-
-	if err := ssh.Unmarshal(req, &record); err != nil {
-		return err
-	}
-
-	var addedKey *AddedKey
-	var err error
-
-	switch record.Type {
-	case ssh.KeyAlgoRSA:
-		addedKey, err = parseRSAKey(req)
-	case ssh.InsecureKeyAlgoDSA:
-		addedKey, err = parseDSAKey(req)
-	case ssh.KeyAlgoECDSA256, ssh.KeyAlgoECDSA384, ssh.KeyAlgoECDSA521:
-		addedKey, err = parseECDSAKey(req)
-	case ssh.KeyAlgoED25519:
-		addedKey, err = parseEd25519Key(req)
-	case ssh.CertAlgoRSAv01:
-		addedKey, err = parseRSACert(req)
-	case ssh.InsecureCertAlgoDSAv01:
-		addedKey, err = parseDSACert(req)
-	case ssh.CertAlgoECDSA256v01, ssh.CertAlgoECDSA384v01, ssh.CertAlgoECDSA521v01:
-		addedKey, err = parseECDSACert(req)
-	case ssh.CertAlgoED25519v01:
-		addedKey, err = parseEd25519Cert(req)
-	default:
-		return fmt.Errorf("agent: not implemented: %q", record.Type)
-	}
-
-	if err != nil {
-		return err
-	}
-	return s.agent.Add(*addedKey)
-}
-
-// ServeAgent serves the agent protocol on the given connection. It
-// returns when an I/O error occurs.
-func ServeAgent(agent Agent, c io.ReadWriter) error {
-	s := &server{agent}
-
-	var length [4]byte
-	for {
-		if _, err := io.ReadFull(c, length[:]); err != nil {
-			return err
-		}
-		l := binary.BigEndian.Uint32(length[:])
-		if l == 0 {
-			return fmt.Errorf("agent: request size is 0")
-		}
-		if l > maxAgentResponseBytes {
-			// We also cap requests.
-			return fmt.Errorf("agent: request too large: %d", l)
-		}
-
-		req := make([]byte, l)
-		if _, err := io.ReadFull(c, req); err != nil {
-			return err
-		}
-
-		repData := s.processRequestBytes(req)
-		if len(repData) > maxAgentResponseBytes {
-			return fmt.Errorf("agent: reply too large: %d bytes", len(repData))
-		}
-
-		binary.BigEndian.PutUint32(length[:], uint32(len(repData)))
-		if _, err := c.Write(length[:]); err != nil {
-			return err
-		}
-		if _, err := c.Write(repData); err != nil {
-			return err
-		}
-	}
-}
diff --git a/vendor/golang.org/x/crypto/ssh/buffer.go b/vendor/golang.org/x/crypto/ssh/buffer.go
deleted file mode 100644
index 1ab07d078..000000000
--- a/vendor/golang.org/x/crypto/ssh/buffer.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"io"
-	"sync"
-)
-
-// buffer provides a linked list buffer for data exchange
-// between producer and consumer. Theoretically the buffer is
-// of unlimited capacity as it does no allocation of its own.
-type buffer struct {
-	// protects concurrent access to head, tail and closed
-	*sync.Cond
-
-	head *element // the buffer that will be read first
-	tail *element // the buffer that will be read last
-
-	closed bool
-}
-
-// An element represents a single link in a linked list.
-type element struct {
-	buf  []byte
-	next *element
-}
-
-// newBuffer returns an empty buffer that is not closed.
-func newBuffer() *buffer {
-	e := new(element)
-	b := &buffer{
-		Cond: newCond(),
-		head: e,
-		tail: e,
-	}
-	return b
-}
-
-// write makes buf available for Read to receive.
-// buf must not be modified after the call to write.
-func (b *buffer) write(buf []byte) {
-	b.Cond.L.Lock()
-	e := &element{buf: buf}
-	b.tail.next = e
-	b.tail = e
-	b.Cond.Signal()
-	b.Cond.L.Unlock()
-}
-
-// eof closes the buffer. Reads from the buffer once all
-// the data has been consumed will receive io.EOF.
-func (b *buffer) eof() {
-	b.Cond.L.Lock()
-	b.closed = true
-	b.Cond.Signal()
-	b.Cond.L.Unlock()
-}
-
-// Read reads data from the internal buffer in buf.  Reads will block
-// if no data is available, or until the buffer is closed.
-func (b *buffer) Read(buf []byte) (n int, err error) {
-	b.Cond.L.Lock()
-	defer b.Cond.L.Unlock()
-
-	for len(buf) > 0 {
-		// if there is data in b.head, copy it
-		if len(b.head.buf) > 0 {
-			r := copy(buf, b.head.buf)
-			buf, b.head.buf = buf[r:], b.head.buf[r:]
-			n += r
-			continue
-		}
-		// if there is a next buffer, make it the head
-		if len(b.head.buf) == 0 && b.head != b.tail {
-			b.head = b.head.next
-			continue
-		}
-
-		// if at least one byte has been copied, return
-		if n > 0 {
-			break
-		}
-
-		// if nothing was read, and there is nothing outstanding
-		// check to see if the buffer is closed.
-		if b.closed {
-			err = io.EOF
-			break
-		}
-		// out of buffers, wait for producer
-		b.Cond.Wait()
-	}
-	return
-}
diff --git a/vendor/golang.org/x/crypto/ssh/certs.go b/vendor/golang.org/x/crypto/ssh/certs.go
deleted file mode 100644
index 139fa31e1..000000000
--- a/vendor/golang.org/x/crypto/ssh/certs.go
+++ /dev/null
@@ -1,624 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"sort"
-	"time"
-)
-
-// Certificate algorithm names from [PROTOCOL.certkeys]. These values can appear
-// in Certificate.Type, PublicKey.Type, and ClientConfig.HostKeyAlgorithms.
-// Unlike key algorithm names, these are not passed to AlgorithmSigner nor
-// returned by MultiAlgorithmSigner and don't appear in the Signature.Format
-// field.
-const (
-	CertAlgoRSAv01 = "ssh-rsa-cert-v01@openssh.com"
-	// Deprecated: DSA is only supported at insecure key sizes, and was removed
-	// from major implementations.
-	CertAlgoDSAv01 = InsecureCertAlgoDSAv01
-	// Deprecated: DSA is only supported at insecure key sizes, and was removed
-	// from major implementations.
-	InsecureCertAlgoDSAv01 = "ssh-dss-cert-v01@openssh.com"
-	CertAlgoECDSA256v01    = "ecdsa-sha2-nistp256-cert-v01@openssh.com"
-	CertAlgoECDSA384v01    = "ecdsa-sha2-nistp384-cert-v01@openssh.com"
-	CertAlgoECDSA521v01    = "ecdsa-sha2-nistp521-cert-v01@openssh.com"
-	CertAlgoSKECDSA256v01  = "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com"
-	CertAlgoED25519v01     = "ssh-ed25519-cert-v01@openssh.com"
-	CertAlgoSKED25519v01   = "sk-ssh-ed25519-cert-v01@openssh.com"
-
-	// CertAlgoRSASHA256v01 and CertAlgoRSASHA512v01 can't appear as a
-	// Certificate.Type (or PublicKey.Type), but only in
-	// ClientConfig.HostKeyAlgorithms.
-	CertAlgoRSASHA256v01 = "rsa-sha2-256-cert-v01@openssh.com"
-	CertAlgoRSASHA512v01 = "rsa-sha2-512-cert-v01@openssh.com"
-)
-
-const (
-	// Deprecated: use CertAlgoRSAv01.
-	CertSigAlgoRSAv01 = CertAlgoRSAv01
-	// Deprecated: use CertAlgoRSASHA256v01.
-	CertSigAlgoRSASHA2256v01 = CertAlgoRSASHA256v01
-	// Deprecated: use CertAlgoRSASHA512v01.
-	CertSigAlgoRSASHA2512v01 = CertAlgoRSASHA512v01
-)
-
-// Certificate types distinguish between host and user
-// certificates. The values can be set in the CertType field of
-// Certificate.
-const (
-	UserCert = 1
-	HostCert = 2
-)
-
-// Signature represents a cryptographic signature.
-type Signature struct {
-	Format string
-	Blob   []byte
-	Rest   []byte `ssh:"rest"`
-}
-
-// CertTimeInfinity can be used for OpenSSHCertV01.ValidBefore to indicate that
-// a certificate does not expire.
-const CertTimeInfinity = 1<<64 - 1
-
-// An Certificate represents an OpenSSH certificate as defined in
-// [PROTOCOL.certkeys]?rev=1.8. The Certificate type implements the
-// PublicKey interface, so it can be unmarshaled using
-// ParsePublicKey.
-type Certificate struct {
-	Nonce           []byte
-	Key             PublicKey
-	Serial          uint64
-	CertType        uint32
-	KeyId           string
-	ValidPrincipals []string
-	ValidAfter      uint64
-	ValidBefore     uint64
-	Permissions
-	Reserved     []byte
-	SignatureKey PublicKey
-	Signature    *Signature
-}
-
-// genericCertData holds the key-independent part of the certificate data.
-// Overall, certificates contain an nonce, public key fields and
-// key-independent fields.
-type genericCertData struct {
-	Serial          uint64
-	CertType        uint32
-	KeyId           string
-	ValidPrincipals []byte
-	ValidAfter      uint64
-	ValidBefore     uint64
-	CriticalOptions []byte
-	Extensions      []byte
-	Reserved        []byte
-	SignatureKey    []byte
-	Signature       []byte
-}
-
-func marshalStringList(namelist []string) []byte {
-	var to []byte
-	for _, name := range namelist {
-		s := struct{ N string }{name}
-		to = append(to, Marshal(&s)...)
-	}
-	return to
-}
-
-type optionsTuple struct {
-	Key   string
-	Value []byte
-}
-
-type optionsTupleValue struct {
-	Value string
-}
-
-// serialize a map of critical options or extensions
-// issue #10569 - per [PROTOCOL.certkeys] and SSH implementation,
-// we need two length prefixes for a non-empty string value
-func marshalTuples(tups map[string]string) []byte {
-	keys := make([]string, 0, len(tups))
-	for key := range tups {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-
-	var ret []byte
-	for _, key := range keys {
-		s := optionsTuple{Key: key}
-		if value := tups[key]; len(value) > 0 {
-			s.Value = Marshal(&optionsTupleValue{value})
-		}
-		ret = append(ret, Marshal(&s)...)
-	}
-	return ret
-}
-
-// issue #10569 - per [PROTOCOL.certkeys] and SSH implementation,
-// we need two length prefixes for a non-empty option value
-func parseTuples(in []byte) (map[string]string, error) {
-	tups := map[string]string{}
-	var lastKey string
-	var haveLastKey bool
-
-	for len(in) > 0 {
-		var key, val, extra []byte
-		var ok bool
-
-		if key, in, ok = parseString(in); !ok {
-			return nil, errShortRead
-		}
-		keyStr := string(key)
-		// according to [PROTOCOL.certkeys], the names must be in
-		// lexical order.
-		if haveLastKey && keyStr <= lastKey {
-			return nil, fmt.Errorf("ssh: certificate options are not in lexical order")
-		}
-		lastKey, haveLastKey = keyStr, true
-		// the next field is a data field, which if non-empty has a string embedded
-		if val, in, ok = parseString(in); !ok {
-			return nil, errShortRead
-		}
-		if len(val) > 0 {
-			val, extra, ok = parseString(val)
-			if !ok {
-				return nil, errShortRead
-			}
-			if len(extra) > 0 {
-				return nil, fmt.Errorf("ssh: unexpected trailing data after certificate option value")
-			}
-			tups[keyStr] = string(val)
-		} else {
-			tups[keyStr] = ""
-		}
-	}
-	return tups, nil
-}
-
-func parseCert(in []byte, privAlgo string) (*Certificate, error) {
-	nonce, rest, ok := parseString(in)
-	if !ok {
-		return nil, errShortRead
-	}
-
-	key, rest, err := parsePubKey(rest, privAlgo)
-	if err != nil {
-		return nil, err
-	}
-
-	var g genericCertData
-	if err := Unmarshal(rest, &g); err != nil {
-		return nil, err
-	}
-
-	c := &Certificate{
-		Nonce:       nonce,
-		Key:         key,
-		Serial:      g.Serial,
-		CertType:    g.CertType,
-		KeyId:       g.KeyId,
-		ValidAfter:  g.ValidAfter,
-		ValidBefore: g.ValidBefore,
-	}
-
-	for principals := g.ValidPrincipals; len(principals) > 0; {
-		principal, rest, ok := parseString(principals)
-		if !ok {
-			return nil, errShortRead
-		}
-		c.ValidPrincipals = append(c.ValidPrincipals, string(principal))
-		principals = rest
-	}
-
-	c.CriticalOptions, err = parseTuples(g.CriticalOptions)
-	if err != nil {
-		return nil, err
-	}
-	c.Extensions, err = parseTuples(g.Extensions)
-	if err != nil {
-		return nil, err
-	}
-	c.Reserved = g.Reserved
-	k, err := ParsePublicKey(g.SignatureKey)
-	if err != nil {
-		return nil, err
-	}
-	// The Type() function is intended to return only certificate key types, but
-	// we use certKeyAlgoNames anyway for safety, to match [Certificate.Type].
-	if _, ok := certKeyAlgoNames[k.Type()]; ok {
-		return nil, fmt.Errorf("ssh: the signature key type %q is invalid for certificates", k.Type())
-	}
-	c.SignatureKey = k
-	c.Signature, rest, ok = parseSignatureBody(g.Signature)
-	if !ok || len(rest) > 0 {
-		return nil, errors.New("ssh: signature parse error")
-	}
-
-	return c, nil
-}
-
-type openSSHCertSigner struct {
-	pub    *Certificate
-	signer Signer
-}
-
-type algorithmOpenSSHCertSigner struct {
-	*openSSHCertSigner
-	algorithmSigner AlgorithmSigner
-}
-
-// NewCertSigner returns a Signer that signs with the given Certificate, whose
-// private key is held by signer. It returns an error if the public key in cert
-// doesn't match the key used by signer.
-func NewCertSigner(cert *Certificate, signer Signer) (Signer, error) {
-	if !bytes.Equal(cert.Key.Marshal(), signer.PublicKey().Marshal()) {
-		return nil, errors.New("ssh: signer and cert have different public key")
-	}
-
-	switch s := signer.(type) {
-	case MultiAlgorithmSigner:
-		return &multiAlgorithmSigner{
-			AlgorithmSigner: &algorithmOpenSSHCertSigner{
-				&openSSHCertSigner{cert, signer}, s},
-			supportedAlgorithms: s.Algorithms(),
-		}, nil
-	case AlgorithmSigner:
-		return &algorithmOpenSSHCertSigner{
-			&openSSHCertSigner{cert, signer}, s}, nil
-	default:
-		return &openSSHCertSigner{cert, signer}, nil
-	}
-}
-
-func (s *openSSHCertSigner) Sign(rand io.Reader, data []byte) (*Signature, error) {
-	return s.signer.Sign(rand, data)
-}
-
-func (s *openSSHCertSigner) PublicKey() PublicKey {
-	return s.pub
-}
-
-func (s *algorithmOpenSSHCertSigner) SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*Signature, error) {
-	return s.algorithmSigner.SignWithAlgorithm(rand, data, algorithm)
-}
-
-const sourceAddressCriticalOption = "source-address"
-
-// CertChecker does the work of verifying a certificate. Its methods
-// can be plugged into ClientConfig.HostKeyCallback and
-// ServerConfig.PublicKeyCallback. For the CertChecker to work,
-// minimally, the IsAuthority callback should be set.
-type CertChecker struct {
-	// SupportedCriticalOptions lists the CriticalOptions that the
-	// server application layer understands. These are only used
-	// for user certificates.
-	SupportedCriticalOptions []string
-
-	// IsUserAuthority should return true if the key is recognized as an
-	// authority for user certificate. This must be set if this CertChecker
-	// will be checking user certificates.
-	IsUserAuthority func(auth PublicKey) bool
-
-	// IsHostAuthority should report whether the key is recognized as
-	// an authority for this host. This must be set if this CertChecker
-	// will be checking host certificates.
-	IsHostAuthority func(auth PublicKey, address string) bool
-
-	// Clock is used for verifying time stamps. If nil, time.Now
-	// is used.
-	Clock func() time.Time
-
-	// UserKeyFallback is called when CertChecker.Authenticate encounters a
-	// public key that is not a certificate. It must implement validation
-	// of user keys or else, if nil, all such keys are rejected.
-	UserKeyFallback func(conn ConnMetadata, key PublicKey) (*Permissions, error)
-
-	// HostKeyFallback is called when CertChecker.CheckHostKey encounters a
-	// public key that is not a certificate. It must implement host key
-	// validation or else, if nil, all such keys are rejected.
-	HostKeyFallback HostKeyCallback
-
-	// IsRevoked is called for each certificate so that revocation checking
-	// can be implemented. It should return true if the given certificate
-	// is revoked and false otherwise. If nil, no certificates are
-	// considered to have been revoked.
-	IsRevoked func(cert *Certificate) bool
-}
-
-// CheckHostKey checks a host key certificate. This method can be
-// plugged into ClientConfig.HostKeyCallback.
-func (c *CertChecker) CheckHostKey(addr string, remote net.Addr, key PublicKey) error {
-	cert, ok := key.(*Certificate)
-	if !ok {
-		if c.HostKeyFallback != nil {
-			return c.HostKeyFallback(addr, remote, key)
-		}
-		return errors.New("ssh: non-certificate host key")
-	}
-	if cert.CertType != HostCert {
-		return fmt.Errorf("ssh: certificate presented as a host key has type %d", cert.CertType)
-	}
-	if !c.IsHostAuthority(cert.SignatureKey, addr) {
-		return fmt.Errorf("ssh: no authorities for hostname: %v", addr)
-	}
-
-	hostname, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return err
-	}
-
-	// Pass hostname only as principal for host certificates (consistent with OpenSSH)
-	return c.CheckCert(hostname, cert)
-}
-
-// Authenticate checks a user certificate. Authenticate can be used as
-// a value for ServerConfig.PublicKeyCallback.
-func (c *CertChecker) Authenticate(conn ConnMetadata, pubKey PublicKey) (*Permissions, error) {
-	cert, ok := pubKey.(*Certificate)
-	if !ok {
-		if c.UserKeyFallback != nil {
-			return c.UserKeyFallback(conn, pubKey)
-		}
-		return nil, errors.New("ssh: normal key pairs not accepted")
-	}
-
-	if cert.CertType != UserCert {
-		return nil, fmt.Errorf("ssh: cert has type %d", cert.CertType)
-	}
-	if !c.IsUserAuthority(cert.SignatureKey) {
-		return nil, fmt.Errorf("ssh: certificate signed by unrecognized authority")
-	}
-
-	if err := c.CheckCert(conn.User(), cert); err != nil {
-		return nil, err
-	}
-
-	return &cert.Permissions, nil
-}
-
-// CheckCert checks CriticalOptions, ValidPrincipals, revocation, timestamp and
-// the signature of the certificate.
-func (c *CertChecker) CheckCert(principal string, cert *Certificate) error {
-	if c.IsRevoked != nil && c.IsRevoked(cert) {
-		return fmt.Errorf("ssh: certificate serial %d revoked", cert.Serial)
-	}
-
-	for opt := range cert.CriticalOptions {
-		// sourceAddressCriticalOption will be enforced by
-		// serverAuthenticate
-		if opt == sourceAddressCriticalOption {
-			continue
-		}
-
-		found := false
-		for _, supp := range c.SupportedCriticalOptions {
-			if supp == opt {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("ssh: unsupported critical option %q in certificate", opt)
-		}
-	}
-
-	if len(cert.ValidPrincipals) > 0 {
-		// By default, certs are valid for all users/hosts.
-		found := false
-		for _, p := range cert.ValidPrincipals {
-			if p == principal {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("ssh: principal %q not in the set of valid principals for given certificate: %q", principal, cert.ValidPrincipals)
-		}
-	}
-
-	clock := c.Clock
-	if clock == nil {
-		clock = time.Now
-	}
-
-	unixNow := clock().Unix()
-	if after := int64(cert.ValidAfter); after < 0 || unixNow < int64(cert.ValidAfter) {
-		return fmt.Errorf("ssh: cert is not yet valid")
-	}
-	if before := int64(cert.ValidBefore); cert.ValidBefore != uint64(CertTimeInfinity) && (unixNow >= before || before < 0) {
-		return fmt.Errorf("ssh: cert has expired")
-	}
-	if err := cert.SignatureKey.Verify(cert.bytesForSigning(), cert.Signature); err != nil {
-		return fmt.Errorf("ssh: certificate signature does not verify")
-	}
-
-	return nil
-}
-
-// SignCert signs the certificate with an authority, setting the Nonce,
-// SignatureKey, and Signature fields. If the authority implements the
-// MultiAlgorithmSigner interface the first algorithm in the list is used. This
-// is useful if you want to sign with a specific algorithm. As specified in
-// [SSH-CERTS], Section 2.1.1, authority can't be a [Certificate].
-func (c *Certificate) SignCert(rand io.Reader, authority Signer) error {
-	c.Nonce = make([]byte, 32)
-	if _, err := io.ReadFull(rand, c.Nonce); err != nil {
-		return err
-	}
-	// The Type() function is intended to return only certificate key types, but
-	// we use certKeyAlgoNames anyway for safety, to match [Certificate.Type].
-	if _, ok := certKeyAlgoNames[authority.PublicKey().Type()]; ok {
-		return fmt.Errorf("ssh: certificates cannot be used as authority (public key type %q)",
-			authority.PublicKey().Type())
-	}
-	c.SignatureKey = authority.PublicKey()
-
-	if v, ok := authority.(MultiAlgorithmSigner); ok {
-		if len(v.Algorithms()) == 0 {
-			return errors.New("the provided authority has no signature algorithm")
-		}
-		// Use the first algorithm in the list.
-		sig, err := v.SignWithAlgorithm(rand, c.bytesForSigning(), v.Algorithms()[0])
-		if err != nil {
-			return err
-		}
-		c.Signature = sig
-		return nil
-	} else if v, ok := authority.(AlgorithmSigner); ok && v.PublicKey().Type() == KeyAlgoRSA {
-		// Default to KeyAlgoRSASHA512 for ssh-rsa signers.
-		// TODO: consider using KeyAlgoRSASHA256 as default.
-		sig, err := v.SignWithAlgorithm(rand, c.bytesForSigning(), KeyAlgoRSASHA512)
-		if err != nil {
-			return err
-		}
-		c.Signature = sig
-		return nil
-	}
-
-	sig, err := authority.Sign(rand, c.bytesForSigning())
-	if err != nil {
-		return err
-	}
-	c.Signature = sig
-	return nil
-}
-
-// certKeyAlgoNames is a mapping from known certificate algorithm names to the
-// corresponding public key signature algorithm.
-//
-// This map must be kept in sync with the one in agent/client.go.
-var certKeyAlgoNames = map[string]string{
-	CertAlgoRSAv01:         KeyAlgoRSA,
-	CertAlgoRSASHA256v01:   KeyAlgoRSASHA256,
-	CertAlgoRSASHA512v01:   KeyAlgoRSASHA512,
-	InsecureCertAlgoDSAv01: InsecureKeyAlgoDSA,
-	CertAlgoECDSA256v01:    KeyAlgoECDSA256,
-	CertAlgoECDSA384v01:    KeyAlgoECDSA384,
-	CertAlgoECDSA521v01:    KeyAlgoECDSA521,
-	CertAlgoSKECDSA256v01:  KeyAlgoSKECDSA256,
-	CertAlgoED25519v01:     KeyAlgoED25519,
-	CertAlgoSKED25519v01:   KeyAlgoSKED25519,
-}
-
-// underlyingAlgo returns the signature algorithm associated with algo (which is
-// an advertised or negotiated public key or host key algorithm). These are
-// usually the same, except for certificate algorithms.
-func underlyingAlgo(algo string) string {
-	if a, ok := certKeyAlgoNames[algo]; ok {
-		return a
-	}
-	return algo
-}
-
-// certificateAlgo returns the certificate algorithms that uses the provided
-// underlying signature algorithm.
-func certificateAlgo(algo string) (certAlgo string, ok bool) {
-	for certName, algoName := range certKeyAlgoNames {
-		if algoName == algo {
-			return certName, true
-		}
-	}
-	return "", false
-}
-
-func (cert *Certificate) bytesForSigning() []byte {
-	c2 := *cert
-	c2.Signature = nil
-	out := c2.Marshal()
-	// Drop trailing signature length.
-	return out[:len(out)-4]
-}
-
-// Marshal serializes c into OpenSSH's wire format. It is part of the
-// PublicKey interface.
-func (c *Certificate) Marshal() []byte {
-	generic := genericCertData{
-		Serial:          c.Serial,
-		CertType:        c.CertType,
-		KeyId:           c.KeyId,
-		ValidPrincipals: marshalStringList(c.ValidPrincipals),
-		ValidAfter:      uint64(c.ValidAfter),
-		ValidBefore:     uint64(c.ValidBefore),
-		CriticalOptions: marshalTuples(c.CriticalOptions),
-		Extensions:      marshalTuples(c.Extensions),
-		Reserved:        c.Reserved,
-		SignatureKey:    c.SignatureKey.Marshal(),
-	}
-	if c.Signature != nil {
-		generic.Signature = Marshal(c.Signature)
-	}
-	genericBytes := Marshal(&generic)
-	keyBytes := c.Key.Marshal()
-	_, keyBytes, _ = parseString(keyBytes)
-	prefix := Marshal(&struct {
-		Name  string
-		Nonce []byte
-		Key   []byte `ssh:"rest"`
-	}{c.Type(), c.Nonce, keyBytes})
-
-	result := make([]byte, 0, len(prefix)+len(genericBytes))
-	result = append(result, prefix...)
-	result = append(result, genericBytes...)
-	return result
-}
-
-// Type returns the certificate algorithm name. It is part of the PublicKey interface.
-func (c *Certificate) Type() string {
-	certName, ok := certificateAlgo(c.Key.Type())
-	if !ok {
-		panic("unknown certificate type for key type " + c.Key.Type())
-	}
-	return certName
-}
-
-// Verify verifies a signature against the certificate's public
-// key. It is part of the PublicKey interface.
-func (c *Certificate) Verify(data []byte, sig *Signature) error {
-	return c.Key.Verify(data, sig)
-}
-
-func parseSignatureBody(in []byte) (out *Signature, rest []byte, ok bool) {
-	format, in, ok := parseString(in)
-	if !ok {
-		return
-	}
-
-	out = &Signature{
-		Format: string(format),
-	}
-
-	if out.Blob, in, ok = parseString(in); !ok {
-		return
-	}
-
-	switch out.Format {
-	case KeyAlgoSKECDSA256, CertAlgoSKECDSA256v01, KeyAlgoSKED25519, CertAlgoSKED25519v01:
-		out.Rest = in
-		return out, nil, ok
-	}
-
-	return out, in, ok
-}
-
-func parseSignature(in []byte) (out *Signature, rest []byte, ok bool) {
-	sigBytes, rest, ok := parseString(in)
-	if !ok {
-		return
-	}
-
-	out, trailing, ok := parseSignatureBody(sigBytes)
-	if !ok || len(trailing) > 0 {
-		return nil, nil, false
-	}
-	return
-}
diff --git a/vendor/golang.org/x/crypto/ssh/channel.go b/vendor/golang.org/x/crypto/ssh/channel.go
deleted file mode 100644
index cc0bb7ab6..000000000
--- a/vendor/golang.org/x/crypto/ssh/channel.go
+++ /dev/null
@@ -1,645 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"sync"
-)
-
-const (
-	minPacketLength = 9
-	// channelMaxPacket contains the maximum number of bytes that will be
-	// sent in a single packet. As per RFC 4253, section 6.1, 32k is also
-	// the minimum.
-	channelMaxPacket = 1 << 15
-	// We follow OpenSSH here.
-	channelWindowSize = 64 * channelMaxPacket
-)
-
-// NewChannel represents an incoming request to a channel. It must either be
-// accepted for use by calling Accept, or rejected by calling Reject.
-type NewChannel interface {
-	// Accept accepts the channel creation request. It returns the Channel
-	// and a Go channel containing SSH requests. The Go channel must be
-	// serviced otherwise the Channel will hang.
-	Accept() (Channel, <-chan *Request, error)
-
-	// Reject rejects the channel creation request. After calling
-	// this, no other methods on the Channel may be called.
-	Reject(reason RejectionReason, message string) error
-
-	// ChannelType returns the type of the channel, as supplied by the
-	// client.
-	ChannelType() string
-
-	// ExtraData returns the arbitrary payload for this channel, as supplied
-	// by the client. This data is specific to the channel type.
-	ExtraData() []byte
-}
-
-// A Channel is an ordered, reliable, flow-controlled, duplex stream
-// that is multiplexed over an SSH connection.
-type Channel interface {
-	// Read reads up to len(data) bytes from the channel.
-	Read(data []byte) (int, error)
-
-	// Write writes len(data) bytes to the channel.
-	Write(data []byte) (int, error)
-
-	// Close signals end of channel use. No data may be sent after this
-	// call.
-	Close() error
-
-	// CloseWrite signals the end of sending in-band
-	// data. Requests may still be sent, and the other side may
-	// still send data
-	CloseWrite() error
-
-	// SendRequest sends a channel request.  If wantReply is true,
-	// it will wait for a reply and return the result as a
-	// boolean, otherwise the return value will be false. Channel
-	// requests are out-of-band messages so they may be sent even
-	// if the data stream is closed or blocked by flow control.
-	// If the channel is closed before a reply is returned, io.EOF
-	// is returned.
-	SendRequest(name string, wantReply bool, payload []byte) (bool, error)
-
-	// Stderr returns an io.ReadWriter that writes to this channel
-	// with the extended data type set to stderr. Stderr may
-	// safely be read and written from a different goroutine than
-	// Read and Write respectively.
-	Stderr() io.ReadWriter
-}
-
-// Request is a request sent outside of the normal stream of
-// data. Requests can either be specific to an SSH channel, or they
-// can be global.
-type Request struct {
-	Type      string
-	WantReply bool
-	Payload   []byte
-
-	ch  *channel
-	mux *mux
-}
-
-// Reply sends a response to a request. It must be called for all requests
-// where WantReply is true and is a no-op otherwise. The payload argument is
-// ignored for replies to channel-specific requests.
-func (r *Request) Reply(ok bool, payload []byte) error {
-	if !r.WantReply {
-		return nil
-	}
-
-	if r.ch == nil {
-		return r.mux.ackRequest(ok, payload)
-	}
-
-	return r.ch.ackRequest(ok)
-}
-
-// RejectionReason is an enumeration used when rejecting channel creation
-// requests. See RFC 4254, section 5.1.
-type RejectionReason uint32
-
-const (
-	Prohibited RejectionReason = iota + 1
-	ConnectionFailed
-	UnknownChannelType
-	ResourceShortage
-)
-
-// String converts the rejection reason to human readable form.
-func (r RejectionReason) String() string {
-	switch r {
-	case Prohibited:
-		return "administratively prohibited"
-	case ConnectionFailed:
-		return "connect failed"
-	case UnknownChannelType:
-		return "unknown channel type"
-	case ResourceShortage:
-		return "resource shortage"
-	}
-	return fmt.Sprintf("unknown reason %d", int(r))
-}
-
-func min(a uint32, b int) uint32 {
-	if a < uint32(b) {
-		return a
-	}
-	return uint32(b)
-}
-
-type channelDirection uint8
-
-const (
-	channelInbound channelDirection = iota
-	channelOutbound
-)
-
-// channel is an implementation of the Channel interface that works
-// with the mux class.
-type channel struct {
-	// R/O after creation
-	chanType          string
-	extraData         []byte
-	localId, remoteId uint32
-
-	// maxIncomingPayload and maxRemotePayload are the maximum
-	// payload sizes of normal and extended data packets for
-	// receiving and sending, respectively. The wire packet will
-	// be 9 or 13 bytes larger (excluding encryption overhead).
-	maxIncomingPayload uint32
-	maxRemotePayload   uint32
-
-	mux *mux
-
-	// decided is set to true if an accept or reject message has been sent
-	// (for outbound channels) or received (for inbound channels).
-	decided bool
-
-	// direction contains either channelOutbound, for channels created
-	// locally, or channelInbound, for channels created by the peer.
-	direction channelDirection
-
-	// Pending internal channel messages.
-	msg chan interface{}
-
-	// Since requests have no ID, there can be only one request
-	// with WantReply=true outstanding.  This lock is held by a
-	// goroutine that has such an outgoing request pending.
-	sentRequestMu sync.Mutex
-
-	incomingRequests chan *Request
-
-	sentEOF bool
-
-	// thread-safe data
-	remoteWin  window
-	pending    *buffer
-	extPending *buffer
-
-	// windowMu protects myWindow, the flow-control window, and myConsumed,
-	// the number of bytes consumed since we last increased myWindow
-	windowMu   sync.Mutex
-	myWindow   uint32
-	myConsumed uint32
-
-	// writeMu serializes calls to mux.conn.writePacket() and
-	// protects sentClose and packetPool. This mutex must be
-	// different from windowMu, as writePacket can block if there
-	// is a key exchange pending.
-	writeMu   sync.Mutex
-	sentClose bool
-
-	// packetPool has a buffer for each extended channel ID to
-	// save allocations during writes.
-	packetPool map[uint32][]byte
-}
-
-// writePacket sends a packet. If the packet is a channel close, it updates
-// sentClose. This method takes the lock c.writeMu.
-func (ch *channel) writePacket(packet []byte) error {
-	ch.writeMu.Lock()
-	if ch.sentClose {
-		ch.writeMu.Unlock()
-		return io.EOF
-	}
-	ch.sentClose = (packet[0] == msgChannelClose)
-	err := ch.mux.conn.writePacket(packet)
-	ch.writeMu.Unlock()
-	return err
-}
-
-func (ch *channel) sendMessage(msg interface{}) error {
-	if debugMux {
-		log.Printf("send(%d): %#v", ch.mux.chanList.offset, msg)
-	}
-
-	p := Marshal(msg)
-	binary.BigEndian.PutUint32(p[1:], ch.remoteId)
-	return ch.writePacket(p)
-}
-
-// WriteExtended writes data to a specific extended stream. These streams are
-// used, for example, for stderr.
-func (ch *channel) WriteExtended(data []byte, extendedCode uint32) (n int, err error) {
-	if ch.sentEOF {
-		return 0, io.EOF
-	}
-	// 1 byte message type, 4 bytes remoteId, 4 bytes data length
-	opCode := byte(msgChannelData)
-	headerLength := uint32(9)
-	if extendedCode > 0 {
-		headerLength += 4
-		opCode = msgChannelExtendedData
-	}
-
-	ch.writeMu.Lock()
-	packet := ch.packetPool[extendedCode]
-	// We don't remove the buffer from packetPool, so
-	// WriteExtended calls from different goroutines will be
-	// flagged as errors by the race detector.
-	ch.writeMu.Unlock()
-
-	for len(data) > 0 {
-		space := min(ch.maxRemotePayload, len(data))
-		if space, err = ch.remoteWin.reserve(space); err != nil {
-			return n, err
-		}
-		if want := headerLength + space; uint32(cap(packet)) < want {
-			packet = make([]byte, want)
-		} else {
-			packet = packet[:want]
-		}
-
-		todo := data[:space]
-
-		packet[0] = opCode
-		binary.BigEndian.PutUint32(packet[1:], ch.remoteId)
-		if extendedCode > 0 {
-			binary.BigEndian.PutUint32(packet[5:], uint32(extendedCode))
-		}
-		binary.BigEndian.PutUint32(packet[headerLength-4:], uint32(len(todo)))
-		copy(packet[headerLength:], todo)
-		if err = ch.writePacket(packet); err != nil {
-			return n, err
-		}
-
-		n += len(todo)
-		data = data[len(todo):]
-	}
-
-	ch.writeMu.Lock()
-	ch.packetPool[extendedCode] = packet
-	ch.writeMu.Unlock()
-
-	return n, err
-}
-
-func (ch *channel) handleData(packet []byte) error {
-	headerLen := 9
-	isExtendedData := packet[0] == msgChannelExtendedData
-	if isExtendedData {
-		headerLen = 13
-	}
-	if len(packet) < headerLen {
-		// malformed data packet
-		return parseError(packet[0])
-	}
-
-	var extended uint32
-	if isExtendedData {
-		extended = binary.BigEndian.Uint32(packet[5:])
-	}
-
-	length := binary.BigEndian.Uint32(packet[headerLen-4 : headerLen])
-	if length == 0 {
-		return nil
-	}
-	if length > ch.maxIncomingPayload {
-		// TODO(hanwen): should send Disconnect?
-		return errors.New("ssh: incoming packet exceeds maximum payload size")
-	}
-
-	data := packet[headerLen:]
-	if length != uint32(len(data)) {
-		return errors.New("ssh: wrong packet length")
-	}
-
-	ch.windowMu.Lock()
-	if ch.myWindow < length {
-		ch.windowMu.Unlock()
-		// TODO(hanwen): should send Disconnect with reason?
-		return errors.New("ssh: remote side wrote too much")
-	}
-	ch.myWindow -= length
-	ch.windowMu.Unlock()
-
-	if extended == 1 {
-		ch.extPending.write(data)
-	} else if extended > 0 {
-		// discard other extended data.
-	} else {
-		ch.pending.write(data)
-	}
-	return nil
-}
-
-func (c *channel) adjustWindow(adj uint32) error {
-	c.windowMu.Lock()
-	// Since myConsumed and myWindow are managed on our side, and can never
-	// exceed the initial window setting, we don't worry about overflow.
-	c.myConsumed += adj
-	var sendAdj uint32
-	if (channelWindowSize-c.myWindow > 3*c.maxIncomingPayload) ||
-		(c.myWindow < channelWindowSize/2) {
-		sendAdj = c.myConsumed
-		c.myConsumed = 0
-		c.myWindow += sendAdj
-	}
-	c.windowMu.Unlock()
-	if sendAdj == 0 {
-		return nil
-	}
-	return c.sendMessage(windowAdjustMsg{
-		AdditionalBytes: sendAdj,
-	})
-}
-
-func (c *channel) ReadExtended(data []byte, extended uint32) (n int, err error) {
-	switch extended {
-	case 1:
-		n, err = c.extPending.Read(data)
-	case 0:
-		n, err = c.pending.Read(data)
-	default:
-		return 0, fmt.Errorf("ssh: extended code %d unimplemented", extended)
-	}
-
-	if n > 0 {
-		err = c.adjustWindow(uint32(n))
-		// sendWindowAdjust can return io.EOF if the remote
-		// peer has closed the connection, however we want to
-		// defer forwarding io.EOF to the caller of Read until
-		// the buffer has been drained.
-		if n > 0 && err == io.EOF {
-			err = nil
-		}
-	}
-
-	return n, err
-}
-
-func (c *channel) close() {
-	c.pending.eof()
-	c.extPending.eof()
-	close(c.msg)
-	close(c.incomingRequests)
-	c.writeMu.Lock()
-	// This is not necessary for a normal channel teardown, but if
-	// there was another error, it is.
-	c.sentClose = true
-	c.writeMu.Unlock()
-	// Unblock writers.
-	c.remoteWin.close()
-}
-
-// responseMessageReceived is called when a success or failure message is
-// received on a channel to check that such a message is reasonable for the
-// given channel.
-func (ch *channel) responseMessageReceived() error {
-	if ch.direction == channelInbound {
-		return errors.New("ssh: channel response message received on inbound channel")
-	}
-	if ch.decided {
-		return errors.New("ssh: duplicate response received for channel")
-	}
-	ch.decided = true
-	return nil
-}
-
-func (ch *channel) handlePacket(packet []byte) error {
-	switch packet[0] {
-	case msgChannelData, msgChannelExtendedData:
-		return ch.handleData(packet)
-	case msgChannelClose:
-		ch.sendMessage(channelCloseMsg{PeersID: ch.remoteId})
-		ch.mux.chanList.remove(ch.localId)
-		ch.close()
-		return nil
-	case msgChannelEOF:
-		// RFC 4254 is mute on how EOF affects dataExt messages but
-		// it is logical to signal EOF at the same time.
-		ch.extPending.eof()
-		ch.pending.eof()
-		return nil
-	}
-
-	decoded, err := decode(packet)
-	if err != nil {
-		return err
-	}
-
-	switch msg := decoded.(type) {
-	case *channelOpenFailureMsg:
-		if err := ch.responseMessageReceived(); err != nil {
-			return err
-		}
-		ch.mux.chanList.remove(msg.PeersID)
-		ch.msg <- msg
-	case *channelOpenConfirmMsg:
-		if err := ch.responseMessageReceived(); err != nil {
-			return err
-		}
-		if msg.MaxPacketSize < minPacketLength || msg.MaxPacketSize > 1<<31 {
-			return fmt.Errorf("ssh: invalid MaxPacketSize %d from peer", msg.MaxPacketSize)
-		}
-		ch.remoteId = msg.MyID
-		ch.maxRemotePayload = msg.MaxPacketSize
-		ch.remoteWin.add(msg.MyWindow)
-		ch.msg <- msg
-	case *windowAdjustMsg:
-		if !ch.remoteWin.add(msg.AdditionalBytes) {
-			return fmt.Errorf("ssh: invalid window update for %d bytes", msg.AdditionalBytes)
-		}
-	case *channelRequestMsg:
-		req := Request{
-			Type:      msg.Request,
-			WantReply: msg.WantReply,
-			Payload:   msg.RequestSpecificData,
-			ch:        ch,
-		}
-
-		ch.incomingRequests <- &req
-	default:
-		ch.msg <- msg
-	}
-	return nil
-}
-
-func (m *mux) newChannel(chanType string, direction channelDirection, extraData []byte) *channel {
-	ch := &channel{
-		remoteWin:        window{Cond: newCond()},
-		myWindow:         channelWindowSize,
-		pending:          newBuffer(),
-		extPending:       newBuffer(),
-		direction:        direction,
-		incomingRequests: make(chan *Request, chanSize),
-		msg:              make(chan interface{}, chanSize),
-		chanType:         chanType,
-		extraData:        extraData,
-		mux:              m,
-		packetPool:       make(map[uint32][]byte),
-	}
-	ch.localId = m.chanList.add(ch)
-	return ch
-}
-
-var errUndecided = errors.New("ssh: must Accept or Reject channel")
-var errDecidedAlready = errors.New("ssh: can call Accept or Reject only once")
-
-type extChannel struct {
-	code uint32
-	ch   *channel
-}
-
-func (e *extChannel) Write(data []byte) (n int, err error) {
-	return e.ch.WriteExtended(data, e.code)
-}
-
-func (e *extChannel) Read(data []byte) (n int, err error) {
-	return e.ch.ReadExtended(data, e.code)
-}
-
-func (ch *channel) Accept() (Channel, <-chan *Request, error) {
-	if ch.decided {
-		return nil, nil, errDecidedAlready
-	}
-	ch.maxIncomingPayload = channelMaxPacket
-	confirm := channelOpenConfirmMsg{
-		PeersID:       ch.remoteId,
-		MyID:          ch.localId,
-		MyWindow:      ch.myWindow,
-		MaxPacketSize: ch.maxIncomingPayload,
-	}
-	ch.decided = true
-	if err := ch.sendMessage(confirm); err != nil {
-		return nil, nil, err
-	}
-
-	return ch, ch.incomingRequests, nil
-}
-
-func (ch *channel) Reject(reason RejectionReason, message string) error {
-	if ch.decided {
-		return errDecidedAlready
-	}
-	reject := channelOpenFailureMsg{
-		PeersID:  ch.remoteId,
-		Reason:   reason,
-		Message:  message,
-		Language: "en",
-	}
-	ch.decided = true
-	return ch.sendMessage(reject)
-}
-
-func (ch *channel) Read(data []byte) (int, error) {
-	if !ch.decided {
-		return 0, errUndecided
-	}
-	return ch.ReadExtended(data, 0)
-}
-
-func (ch *channel) Write(data []byte) (int, error) {
-	if !ch.decided {
-		return 0, errUndecided
-	}
-	return ch.WriteExtended(data, 0)
-}
-
-func (ch *channel) CloseWrite() error {
-	if !ch.decided {
-		return errUndecided
-	}
-	ch.sentEOF = true
-	return ch.sendMessage(channelEOFMsg{
-		PeersID: ch.remoteId})
-}
-
-func (ch *channel) Close() error {
-	if !ch.decided {
-		return errUndecided
-	}
-
-	return ch.sendMessage(channelCloseMsg{
-		PeersID: ch.remoteId})
-}
-
-// Extended returns an io.ReadWriter that sends and receives data on the given,
-// SSH extended stream. Such streams are used, for example, for stderr.
-func (ch *channel) Extended(code uint32) io.ReadWriter {
-	if !ch.decided {
-		return nil
-	}
-	return &extChannel{code, ch}
-}
-
-func (ch *channel) Stderr() io.ReadWriter {
-	return ch.Extended(1)
-}
-
-func (ch *channel) SendRequest(name string, wantReply bool, payload []byte) (bool, error) {
-	if !ch.decided {
-		return false, errUndecided
-	}
-
-	if wantReply {
-		ch.sentRequestMu.Lock()
-		defer ch.sentRequestMu.Unlock()
-	}
-
-	msg := channelRequestMsg{
-		PeersID:             ch.remoteId,
-		Request:             name,
-		WantReply:           wantReply,
-		RequestSpecificData: payload,
-	}
-
-	if err := ch.sendMessage(msg); err != nil {
-		return false, err
-	}
-
-	if wantReply {
-		m, ok := (<-ch.msg)
-		if !ok {
-			return false, io.EOF
-		}
-		switch m.(type) {
-		case *channelRequestFailureMsg:
-			return false, nil
-		case *channelRequestSuccessMsg:
-			return true, nil
-		default:
-			return false, fmt.Errorf("ssh: unexpected response to channel request: %#v", m)
-		}
-	}
-
-	return false, nil
-}
-
-// ackRequest either sends an ack or nack to the channel request.
-func (ch *channel) ackRequest(ok bool) error {
-	if !ch.decided {
-		return errUndecided
-	}
-
-	var msg interface{}
-	if !ok {
-		msg = channelRequestFailureMsg{
-			PeersID: ch.remoteId,
-		}
-	} else {
-		msg = channelRequestSuccessMsg{
-			PeersID: ch.remoteId,
-		}
-	}
-	return ch.sendMessage(msg)
-}
-
-func (ch *channel) ChannelType() string {
-	return ch.chanType
-}
-
-func (ch *channel) ExtraData() []byte {
-	return ch.extraData
-}
diff --git a/vendor/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go
deleted file mode 100644
index 7554ed57a..000000000
--- a/vendor/golang.org/x/crypto/ssh/cipher.go
+++ /dev/null
@@ -1,789 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/des"
-	"crypto/fips140"
-	"crypto/rc4"
-	"crypto/subtle"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"hash"
-	"io"
-	"slices"
-
-	"golang.org/x/crypto/chacha20"
-	"golang.org/x/crypto/internal/poly1305"
-)
-
-const (
-	packetSizeMultiple = 16 // TODO(huin) this should be determined by the cipher.
-
-	// RFC 4253 section 6.1 defines a minimum packet size of 32768 that implementations
-	// MUST be able to process (plus a few more kilobytes for padding and mac). The RFC
-	// indicates implementations SHOULD be able to handle larger packet sizes, but then
-	// waffles on about reasonable limits.
-	//
-	// OpenSSH caps their maxPacket at 256kB so we choose to do
-	// the same. maxPacket is also used to ensure that uint32
-	// length fields do not overflow, so it should remain well
-	// below 4G.
-	maxPacket = 256 * 1024
-)
-
-// noneCipher implements cipher.Stream and provides no encryption. It is used
-// by the transport before the first key-exchange.
-type noneCipher struct{}
-
-func (c noneCipher) XORKeyStream(dst, src []byte) {
-	copy(dst, src)
-}
-
-func newAESCTR(key, iv []byte) (cipher.Stream, error) {
-	c, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-	return cipher.NewCTR(c, iv), nil
-}
-
-func newRC4(key, iv []byte) (cipher.Stream, error) {
-	return rc4.NewCipher(key)
-}
-
-type cipherMode struct {
-	keySize int
-	ivSize  int
-	create  func(key, iv []byte, macKey []byte, algs DirectionAlgorithms) (packetCipher, error)
-}
-
-func streamCipherMode(skip int, createFunc func(key, iv []byte) (cipher.Stream, error)) func(key, iv []byte, macKey []byte, algs DirectionAlgorithms) (packetCipher, error) {
-	return func(key, iv, macKey []byte, algs DirectionAlgorithms) (packetCipher, error) {
-		stream, err := createFunc(key, iv)
-		if err != nil {
-			return nil, err
-		}
-
-		var streamDump []byte
-		if skip > 0 {
-			streamDump = make([]byte, 512)
-		}
-
-		for remainingToDump := skip; remainingToDump > 0; {
-			dumpThisTime := remainingToDump
-			if dumpThisTime > len(streamDump) {
-				dumpThisTime = len(streamDump)
-			}
-			stream.XORKeyStream(streamDump[:dumpThisTime], streamDump[:dumpThisTime])
-			remainingToDump -= dumpThisTime
-		}
-
-		mac := macModes[algs.MAC].new(macKey)
-		return &streamPacketCipher{
-			mac:       mac,
-			etm:       macModes[algs.MAC].etm,
-			macResult: make([]byte, mac.Size()),
-			cipher:    stream,
-		}, nil
-	}
-}
-
-// cipherModes documents properties of supported ciphers. Ciphers not included
-// are not supported and will not be negotiated, even if explicitly configured.
-// When FIPS mode is enabled, only FIPS-approved algorithms are included.
-var cipherModes = map[string]*cipherMode{}
-
-func init() {
-	cipherModes[CipherAES128CTR] = &cipherMode{16, aes.BlockSize, streamCipherMode(0, newAESCTR)}
-	cipherModes[CipherAES192CTR] = &cipherMode{24, aes.BlockSize, streamCipherMode(0, newAESCTR)}
-	cipherModes[CipherAES256CTR] = &cipherMode{32, aes.BlockSize, streamCipherMode(0, newAESCTR)}
-	//  Use of GCM with arbitrary IVs is not allowed in FIPS 140-only mode,
-	// we'll wire it up to NewGCMForSSH in Go 1.26.
-	//
-	// For now it means we'll work with fips140=on but not fips140=only.
-	cipherModes[CipherAES128GCM] = &cipherMode{16, 12, newGCMCipher}
-	cipherModes[CipherAES256GCM] = &cipherMode{32, 12, newGCMCipher}
-
-	if fips140.Enabled() {
-		defaultCiphers = slices.DeleteFunc(defaultCiphers, func(algo string) bool {
-			_, ok := cipherModes[algo]
-			return !ok
-		})
-		return
-	}
-
-	cipherModes[CipherChaCha20Poly1305] = &cipherMode{64, 0, newChaCha20Cipher}
-	// Insecure ciphers not included in the default configuration.
-	cipherModes[InsecureCipherRC4128] = &cipherMode{16, 0, streamCipherMode(1536, newRC4)}
-	cipherModes[InsecureCipherRC4256] = &cipherMode{32, 0, streamCipherMode(1536, newRC4)}
-	cipherModes[InsecureCipherRC4] = &cipherMode{16, 0, streamCipherMode(0, newRC4)}
-	// CBC mode is insecure and so is not included in the default config.
-	// (See https://www.ieee-security.org/TC/SP2013/papers/4977a526.pdf). If absolutely
-	// needed, it's possible to specify a custom Config to enable it.
-	// You should expect that an active attacker can recover plaintext if
-	// you do.
-	cipherModes[InsecureCipherAES128CBC] = &cipherMode{16, aes.BlockSize, newAESCBCCipher}
-	cipherModes[InsecureCipherTripleDESCBC] = &cipherMode{24, des.BlockSize, newTripleDESCBCCipher}
-}
-
-// prefixLen is the length of the packet prefix that contains the packet length
-// and number of padding bytes.
-const prefixLen = 5
-
-// streamPacketCipher is a packetCipher using a stream cipher.
-type streamPacketCipher struct {
-	mac    hash.Hash
-	cipher cipher.Stream
-	etm    bool
-
-	// The following members are to avoid per-packet allocations.
-	prefix      [prefixLen]byte
-	seqNumBytes [4]byte
-	padding     [2 * packetSizeMultiple]byte
-	packetData  []byte
-	macResult   []byte
-}
-
-// readCipherPacket reads and decrypt a single packet from the reader argument.
-func (s *streamPacketCipher) readCipherPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	if _, err := io.ReadFull(r, s.prefix[:]); err != nil {
-		return nil, err
-	}
-
-	var encryptedPaddingLength [1]byte
-	if s.mac != nil && s.etm {
-		copy(encryptedPaddingLength[:], s.prefix[4:5])
-		s.cipher.XORKeyStream(s.prefix[4:5], s.prefix[4:5])
-	} else {
-		s.cipher.XORKeyStream(s.prefix[:], s.prefix[:])
-	}
-
-	length := binary.BigEndian.Uint32(s.prefix[0:4])
-	paddingLength := uint32(s.prefix[4])
-
-	var macSize uint32
-	if s.mac != nil {
-		s.mac.Reset()
-		binary.BigEndian.PutUint32(s.seqNumBytes[:], seqNum)
-		s.mac.Write(s.seqNumBytes[:])
-		if s.etm {
-			s.mac.Write(s.prefix[:4])
-			s.mac.Write(encryptedPaddingLength[:])
-		} else {
-			s.mac.Write(s.prefix[:])
-		}
-		macSize = uint32(s.mac.Size())
-	}
-
-	if length <= paddingLength+1 {
-		return nil, errors.New("ssh: invalid packet length, packet too small")
-	}
-
-	if length > maxPacket {
-		return nil, errors.New("ssh: invalid packet length, packet too large")
-	}
-
-	// the maxPacket check above ensures that length-1+macSize
-	// does not overflow.
-	if uint32(cap(s.packetData)) < length-1+macSize {
-		s.packetData = make([]byte, length-1+macSize)
-	} else {
-		s.packetData = s.packetData[:length-1+macSize]
-	}
-
-	if _, err := io.ReadFull(r, s.packetData); err != nil {
-		return nil, err
-	}
-	mac := s.packetData[length-1:]
-	data := s.packetData[:length-1]
-
-	if s.mac != nil && s.etm {
-		s.mac.Write(data)
-	}
-
-	s.cipher.XORKeyStream(data, data)
-
-	if s.mac != nil {
-		if !s.etm {
-			s.mac.Write(data)
-		}
-		s.macResult = s.mac.Sum(s.macResult[:0])
-		if subtle.ConstantTimeCompare(s.macResult, mac) != 1 {
-			return nil, errors.New("ssh: MAC failure")
-		}
-	}
-
-	return s.packetData[:length-paddingLength-1], nil
-}
-
-// writeCipherPacket encrypts and sends a packet of data to the writer argument
-func (s *streamPacketCipher) writeCipherPacket(seqNum uint32, w io.Writer, rand io.Reader, packet []byte) error {
-	if len(packet) > maxPacket {
-		return errors.New("ssh: packet too large")
-	}
-
-	aadlen := 0
-	if s.mac != nil && s.etm {
-		// packet length is not encrypted for EtM modes
-		aadlen = 4
-	}
-
-	paddingLength := packetSizeMultiple - (prefixLen+len(packet)-aadlen)%packetSizeMultiple
-	if paddingLength < 4 {
-		paddingLength += packetSizeMultiple
-	}
-
-	length := len(packet) + 1 + paddingLength
-	binary.BigEndian.PutUint32(s.prefix[:], uint32(length))
-	s.prefix[4] = byte(paddingLength)
-	padding := s.padding[:paddingLength]
-	if _, err := io.ReadFull(rand, padding); err != nil {
-		return err
-	}
-
-	if s.mac != nil {
-		s.mac.Reset()
-		binary.BigEndian.PutUint32(s.seqNumBytes[:], seqNum)
-		s.mac.Write(s.seqNumBytes[:])
-
-		if s.etm {
-			// For EtM algorithms, the packet length must stay unencrypted,
-			// but the following data (padding length) must be encrypted
-			s.cipher.XORKeyStream(s.prefix[4:5], s.prefix[4:5])
-		}
-
-		s.mac.Write(s.prefix[:])
-
-		if !s.etm {
-			// For non-EtM algorithms, the algorithm is applied on unencrypted data
-			s.mac.Write(packet)
-			s.mac.Write(padding)
-		}
-	}
-
-	if !(s.mac != nil && s.etm) {
-		// For EtM algorithms, the padding length has already been encrypted
-		// and the packet length must remain unencrypted
-		s.cipher.XORKeyStream(s.prefix[:], s.prefix[:])
-	}
-
-	s.cipher.XORKeyStream(packet, packet)
-	s.cipher.XORKeyStream(padding, padding)
-
-	if s.mac != nil && s.etm {
-		// For EtM algorithms, packet and padding must be encrypted
-		s.mac.Write(packet)
-		s.mac.Write(padding)
-	}
-
-	if _, err := w.Write(s.prefix[:]); err != nil {
-		return err
-	}
-	if _, err := w.Write(packet); err != nil {
-		return err
-	}
-	if _, err := w.Write(padding); err != nil {
-		return err
-	}
-
-	if s.mac != nil {
-		s.macResult = s.mac.Sum(s.macResult[:0])
-		if _, err := w.Write(s.macResult); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type gcmCipher struct {
-	aead   cipher.AEAD
-	prefix [4]byte
-	iv     []byte
-	buf    []byte
-}
-
-func newGCMCipher(key, iv, unusedMacKey []byte, unusedAlgs DirectionAlgorithms) (packetCipher, error) {
-	c, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	aead, err := cipher.NewGCM(c)
-	if err != nil {
-		return nil, err
-	}
-
-	return &gcmCipher{
-		aead: aead,
-		iv:   iv,
-	}, nil
-}
-
-const gcmTagSize = 16
-
-func (c *gcmCipher) writeCipherPacket(seqNum uint32, w io.Writer, rand io.Reader, packet []byte) error {
-	// Pad out to multiple of 16 bytes. This is different from the
-	// stream cipher because that encrypts the length too.
-	padding := byte(packetSizeMultiple - (1+len(packet))%packetSizeMultiple)
-	if padding < 4 {
-		padding += packetSizeMultiple
-	}
-
-	length := uint32(len(packet) + int(padding) + 1)
-	binary.BigEndian.PutUint32(c.prefix[:], length)
-	if _, err := w.Write(c.prefix[:]); err != nil {
-		return err
-	}
-
-	if cap(c.buf) < int(length) {
-		c.buf = make([]byte, length)
-	} else {
-		c.buf = c.buf[:length]
-	}
-
-	c.buf[0] = padding
-	copy(c.buf[1:], packet)
-	if _, err := io.ReadFull(rand, c.buf[1+len(packet):]); err != nil {
-		return err
-	}
-	c.buf = c.aead.Seal(c.buf[:0], c.iv, c.buf, c.prefix[:])
-	if _, err := w.Write(c.buf); err != nil {
-		return err
-	}
-	c.incIV()
-
-	return nil
-}
-
-func (c *gcmCipher) incIV() {
-	for i := 4 + 7; i >= 4; i-- {
-		c.iv[i]++
-		if c.iv[i] != 0 {
-			break
-		}
-	}
-}
-
-func (c *gcmCipher) readCipherPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	if _, err := io.ReadFull(r, c.prefix[:]); err != nil {
-		return nil, err
-	}
-	length := binary.BigEndian.Uint32(c.prefix[:])
-	if length > maxPacket {
-		return nil, errors.New("ssh: max packet length exceeded")
-	}
-
-	if cap(c.buf) < int(length+gcmTagSize) {
-		c.buf = make([]byte, length+gcmTagSize)
-	} else {
-		c.buf = c.buf[:length+gcmTagSize]
-	}
-
-	if _, err := io.ReadFull(r, c.buf); err != nil {
-		return nil, err
-	}
-
-	plain, err := c.aead.Open(c.buf[:0], c.iv, c.buf, c.prefix[:])
-	if err != nil {
-		return nil, err
-	}
-	c.incIV()
-
-	if len(plain) == 0 {
-		return nil, errors.New("ssh: empty packet")
-	}
-
-	padding := plain[0]
-	if padding < 4 {
-		// padding is a byte, so it automatically satisfies
-		// the maximum size, which is 255.
-		return nil, fmt.Errorf("ssh: illegal padding %d", padding)
-	}
-
-	if int(padding+1) >= len(plain) {
-		return nil, fmt.Errorf("ssh: padding %d too large", padding)
-	}
-	plain = plain[1 : length-uint32(padding)]
-	return plain, nil
-}
-
-// cbcCipher implements aes128-cbc cipher defined in RFC 4253 section 6.1
-type cbcCipher struct {
-	mac       hash.Hash
-	macSize   uint32
-	decrypter cipher.BlockMode
-	encrypter cipher.BlockMode
-
-	// The following members are to avoid per-packet allocations.
-	seqNumBytes [4]byte
-	packetData  []byte
-	macResult   []byte
-
-	// Amount of data we should still read to hide which
-	// verification error triggered.
-	oracleCamouflage uint32
-}
-
-func newCBCCipher(c cipher.Block, key, iv, macKey []byte, algs DirectionAlgorithms) (packetCipher, error) {
-	cbc := &cbcCipher{
-		mac:        macModes[algs.MAC].new(macKey),
-		decrypter:  cipher.NewCBCDecrypter(c, iv),
-		encrypter:  cipher.NewCBCEncrypter(c, iv),
-		packetData: make([]byte, 1024),
-	}
-	if cbc.mac != nil {
-		cbc.macSize = uint32(cbc.mac.Size())
-	}
-
-	return cbc, nil
-}
-
-func newAESCBCCipher(key, iv, macKey []byte, algs DirectionAlgorithms) (packetCipher, error) {
-	c, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	cbc, err := newCBCCipher(c, key, iv, macKey, algs)
-	if err != nil {
-		return nil, err
-	}
-
-	return cbc, nil
-}
-
-func newTripleDESCBCCipher(key, iv, macKey []byte, algs DirectionAlgorithms) (packetCipher, error) {
-	c, err := des.NewTripleDESCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	cbc, err := newCBCCipher(c, key, iv, macKey, algs)
-	if err != nil {
-		return nil, err
-	}
-
-	return cbc, nil
-}
-
-func maxUInt32(a, b int) uint32 {
-	if a > b {
-		return uint32(a)
-	}
-	return uint32(b)
-}
-
-const (
-	cbcMinPacketSizeMultiple = 8
-	cbcMinPacketSize         = 16
-	cbcMinPaddingSize        = 4
-)
-
-// cbcError represents a verification error that may leak information.
-type cbcError string
-
-func (e cbcError) Error() string { return string(e) }
-
-func (c *cbcCipher) readCipherPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	p, err := c.readCipherPacketLeaky(seqNum, r)
-	if err != nil {
-		if _, ok := err.(cbcError); ok {
-			// Verification error: read a fixed amount of
-			// data, to make distinguishing between
-			// failing MAC and failing length check more
-			// difficult.
-			io.CopyN(io.Discard, r, int64(c.oracleCamouflage))
-		}
-	}
-	return p, err
-}
-
-func (c *cbcCipher) readCipherPacketLeaky(seqNum uint32, r io.Reader) ([]byte, error) {
-	blockSize := c.decrypter.BlockSize()
-
-	// Read the header, which will include some of the subsequent data in the
-	// case of block ciphers - this is copied back to the payload later.
-	// How many bytes of payload/padding will be read with this first read.
-	firstBlockLength := uint32((prefixLen + blockSize - 1) / blockSize * blockSize)
-	firstBlock := c.packetData[:firstBlockLength]
-	if _, err := io.ReadFull(r, firstBlock); err != nil {
-		return nil, err
-	}
-
-	c.oracleCamouflage = maxPacket + 4 + c.macSize - firstBlockLength
-
-	c.decrypter.CryptBlocks(firstBlock, firstBlock)
-	length := binary.BigEndian.Uint32(firstBlock[:4])
-	if length > maxPacket {
-		return nil, cbcError("ssh: packet too large")
-	}
-	if length+4 < maxUInt32(cbcMinPacketSize, blockSize) {
-		// The minimum size of a packet is 16 (or the cipher block size, whichever
-		// is larger) bytes.
-		return nil, cbcError("ssh: packet too small")
-	}
-	// The length of the packet (including the length field but not the MAC) must
-	// be a multiple of the block size or 8, whichever is larger.
-	if (length+4)%maxUInt32(cbcMinPacketSizeMultiple, blockSize) != 0 {
-		return nil, cbcError("ssh: invalid packet length multiple")
-	}
-
-	paddingLength := uint32(firstBlock[4])
-	if paddingLength < cbcMinPaddingSize || length <= paddingLength+1 {
-		return nil, cbcError("ssh: invalid packet length")
-	}
-
-	// Positions within the c.packetData buffer:
-	macStart := 4 + length
-	paddingStart := macStart - paddingLength
-
-	// Entire packet size, starting before length, ending at end of mac.
-	entirePacketSize := macStart + c.macSize
-
-	// Ensure c.packetData is large enough for the entire packet data.
-	if uint32(cap(c.packetData)) < entirePacketSize {
-		// Still need to upsize and copy, but this should be rare at runtime, only
-		// on upsizing the packetData buffer.
-		c.packetData = make([]byte, entirePacketSize)
-		copy(c.packetData, firstBlock)
-	} else {
-		c.packetData = c.packetData[:entirePacketSize]
-	}
-
-	n, err := io.ReadFull(r, c.packetData[firstBlockLength:])
-	if err != nil {
-		return nil, err
-	}
-	c.oracleCamouflage -= uint32(n)
-
-	remainingCrypted := c.packetData[firstBlockLength:macStart]
-	c.decrypter.CryptBlocks(remainingCrypted, remainingCrypted)
-
-	mac := c.packetData[macStart:]
-	if c.mac != nil {
-		c.mac.Reset()
-		binary.BigEndian.PutUint32(c.seqNumBytes[:], seqNum)
-		c.mac.Write(c.seqNumBytes[:])
-		c.mac.Write(c.packetData[:macStart])
-		c.macResult = c.mac.Sum(c.macResult[:0])
-		if subtle.ConstantTimeCompare(c.macResult, mac) != 1 {
-			return nil, cbcError("ssh: MAC failure")
-		}
-	}
-
-	return c.packetData[prefixLen:paddingStart], nil
-}
-
-func (c *cbcCipher) writeCipherPacket(seqNum uint32, w io.Writer, rand io.Reader, packet []byte) error {
-	effectiveBlockSize := maxUInt32(cbcMinPacketSizeMultiple, c.encrypter.BlockSize())
-
-	// Length of encrypted portion of the packet (header, payload, padding).
-	// Enforce minimum padding and packet size.
-	encLength := maxUInt32(prefixLen+len(packet)+cbcMinPaddingSize, cbcMinPaddingSize)
-	// Enforce block size.
-	encLength = (encLength + effectiveBlockSize - 1) / effectiveBlockSize * effectiveBlockSize
-
-	length := encLength - 4
-	paddingLength := int(length) - (1 + len(packet))
-
-	// Overall buffer contains: header, payload, padding, mac.
-	// Space for the MAC is reserved in the capacity but not the slice length.
-	bufferSize := encLength + c.macSize
-	if uint32(cap(c.packetData)) < bufferSize {
-		c.packetData = make([]byte, encLength, bufferSize)
-	} else {
-		c.packetData = c.packetData[:encLength]
-	}
-
-	p := c.packetData
-
-	// Packet header.
-	binary.BigEndian.PutUint32(p, length)
-	p = p[4:]
-	p[0] = byte(paddingLength)
-
-	// Payload.
-	p = p[1:]
-	copy(p, packet)
-
-	// Padding.
-	p = p[len(packet):]
-	if _, err := io.ReadFull(rand, p); err != nil {
-		return err
-	}
-
-	if c.mac != nil {
-		c.mac.Reset()
-		binary.BigEndian.PutUint32(c.seqNumBytes[:], seqNum)
-		c.mac.Write(c.seqNumBytes[:])
-		c.mac.Write(c.packetData)
-		// The MAC is now appended into the capacity reserved for it earlier.
-		c.packetData = c.mac.Sum(c.packetData)
-	}
-
-	c.encrypter.CryptBlocks(c.packetData[:encLength], c.packetData[:encLength])
-
-	if _, err := w.Write(c.packetData); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// chacha20Poly1305Cipher implements the chacha20-poly1305@openssh.com
-// AEAD, which is described here:
-//
-//	https://tools.ietf.org/html/draft-josefsson-ssh-chacha20-poly1305-openssh-00
-//
-// the methods here also implement padding, which RFC 4253 Section 6
-// also requires of stream ciphers.
-type chacha20Poly1305Cipher struct {
-	lengthKey  [32]byte
-	contentKey [32]byte
-	buf        []byte
-}
-
-func newChaCha20Cipher(key, unusedIV, unusedMACKey []byte, unusedAlgs DirectionAlgorithms) (packetCipher, error) {
-	if len(key) != 64 {
-		panic(len(key))
-	}
-
-	c := &chacha20Poly1305Cipher{
-		buf: make([]byte, 256),
-	}
-
-	copy(c.contentKey[:], key[:32])
-	copy(c.lengthKey[:], key[32:])
-	return c, nil
-}
-
-func (c *chacha20Poly1305Cipher) readCipherPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	nonce := make([]byte, 12)
-	binary.BigEndian.PutUint32(nonce[8:], seqNum)
-	s, err := chacha20.NewUnauthenticatedCipher(c.contentKey[:], nonce)
-	if err != nil {
-		return nil, err
-	}
-	var polyKey, discardBuf [32]byte
-	s.XORKeyStream(polyKey[:], polyKey[:])
-	s.XORKeyStream(discardBuf[:], discardBuf[:]) // skip the next 32 bytes
-
-	encryptedLength := c.buf[:4]
-	if _, err := io.ReadFull(r, encryptedLength); err != nil {
-		return nil, err
-	}
-
-	var lenBytes [4]byte
-	ls, err := chacha20.NewUnauthenticatedCipher(c.lengthKey[:], nonce)
-	if err != nil {
-		return nil, err
-	}
-	ls.XORKeyStream(lenBytes[:], encryptedLength)
-
-	length := binary.BigEndian.Uint32(lenBytes[:])
-	if length > maxPacket {
-		return nil, errors.New("ssh: invalid packet length, packet too large")
-	}
-
-	contentEnd := 4 + length
-	packetEnd := contentEnd + poly1305.TagSize
-	if uint32(cap(c.buf)) < packetEnd {
-		c.buf = make([]byte, packetEnd)
-		copy(c.buf[:], encryptedLength)
-	} else {
-		c.buf = c.buf[:packetEnd]
-	}
-
-	if _, err := io.ReadFull(r, c.buf[4:packetEnd]); err != nil {
-		return nil, err
-	}
-
-	var mac [poly1305.TagSize]byte
-	copy(mac[:], c.buf[contentEnd:packetEnd])
-	if !poly1305.Verify(&mac, c.buf[:contentEnd], &polyKey) {
-		return nil, errors.New("ssh: MAC failure")
-	}
-
-	plain := c.buf[4:contentEnd]
-	s.XORKeyStream(plain, plain)
-
-	if len(plain) == 0 {
-		return nil, errors.New("ssh: empty packet")
-	}
-
-	padding := plain[0]
-	if padding < 4 {
-		// padding is a byte, so it automatically satisfies
-		// the maximum size, which is 255.
-		return nil, fmt.Errorf("ssh: illegal padding %d", padding)
-	}
-
-	if int(padding)+1 >= len(plain) {
-		return nil, fmt.Errorf("ssh: padding %d too large", padding)
-	}
-
-	plain = plain[1 : len(plain)-int(padding)]
-
-	return plain, nil
-}
-
-func (c *chacha20Poly1305Cipher) writeCipherPacket(seqNum uint32, w io.Writer, rand io.Reader, payload []byte) error {
-	nonce := make([]byte, 12)
-	binary.BigEndian.PutUint32(nonce[8:], seqNum)
-	s, err := chacha20.NewUnauthenticatedCipher(c.contentKey[:], nonce)
-	if err != nil {
-		return err
-	}
-	var polyKey, discardBuf [32]byte
-	s.XORKeyStream(polyKey[:], polyKey[:])
-	s.XORKeyStream(discardBuf[:], discardBuf[:]) // skip the next 32 bytes
-
-	// There is no blocksize, so fall back to multiple of 8 byte
-	// padding, as described in RFC 4253, Sec 6.
-	const packetSizeMultiple = 8
-
-	padding := packetSizeMultiple - (1+len(payload))%packetSizeMultiple
-	if padding < 4 {
-		padding += packetSizeMultiple
-	}
-
-	// size (4 bytes), padding (1), payload, padding, tag.
-	totalLength := 4 + 1 + len(payload) + padding + poly1305.TagSize
-	if cap(c.buf) < totalLength {
-		c.buf = make([]byte, totalLength)
-	} else {
-		c.buf = c.buf[:totalLength]
-	}
-
-	binary.BigEndian.PutUint32(c.buf, uint32(1+len(payload)+padding))
-	ls, err := chacha20.NewUnauthenticatedCipher(c.lengthKey[:], nonce)
-	if err != nil {
-		return err
-	}
-	ls.XORKeyStream(c.buf, c.buf[:4])
-	c.buf[4] = byte(padding)
-	copy(c.buf[5:], payload)
-	packetEnd := 5 + len(payload) + padding
-	if _, err := io.ReadFull(rand, c.buf[5+len(payload):packetEnd]); err != nil {
-		return err
-	}
-
-	s.XORKeyStream(c.buf[4:], c.buf[4:packetEnd])
-
-	var mac [poly1305.TagSize]byte
-	poly1305.Sum(&mac, c.buf[:packetEnd], &polyKey)
-
-	copy(c.buf[packetEnd:], mac[:])
-
-	if _, err := w.Write(c.buf); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/golang.org/x/crypto/ssh/client.go b/vendor/golang.org/x/crypto/ssh/client.go
deleted file mode 100644
index 33079789b..000000000
--- a/vendor/golang.org/x/crypto/ssh/client.go
+++ /dev/null
@@ -1,283 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"sync"
-	"time"
-)
-
-// Client implements a traditional SSH client that supports shells,
-// subprocesses, TCP port/streamlocal forwarding and tunneled dialing.
-type Client struct {
-	Conn
-
-	handleForwardsOnce sync.Once // guards calling (*Client).handleForwards
-
-	forwards        forwardList // forwarded tcpip connections from the remote side
-	mu              sync.Mutex
-	channelHandlers map[string]chan NewChannel
-}
-
-// HandleChannelOpen returns a channel on which NewChannel requests
-// for the given type are sent. If the type already is being handled,
-// nil is returned. The channel is closed when the connection is closed.
-func (c *Client) HandleChannelOpen(channelType string) <-chan NewChannel {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.channelHandlers == nil {
-		// The SSH channel has been closed.
-		c := make(chan NewChannel)
-		close(c)
-		return c
-	}
-
-	ch := c.channelHandlers[channelType]
-	if ch != nil {
-		return nil
-	}
-
-	ch = make(chan NewChannel, chanSize)
-	c.channelHandlers[channelType] = ch
-	return ch
-}
-
-// NewClient creates a Client on top of the given connection.
-func NewClient(c Conn, chans <-chan NewChannel, reqs <-chan *Request) *Client {
-	conn := &Client{
-		Conn:            c,
-		channelHandlers: make(map[string]chan NewChannel, 1),
-	}
-
-	go conn.handleGlobalRequests(reqs)
-	go conn.handleChannelOpens(chans)
-	go func() {
-		conn.Wait()
-		conn.forwards.closeAll()
-	}()
-	return conn
-}
-
-// NewClientConn establishes an authenticated SSH connection using c
-// as the underlying transport.  The Request and NewChannel channels
-// must be serviced or the connection will hang.
-func NewClientConn(c net.Conn, addr string, config *ClientConfig) (Conn, <-chan NewChannel, <-chan *Request, error) {
-	fullConf := *config
-	fullConf.SetDefaults()
-	if fullConf.HostKeyCallback == nil {
-		c.Close()
-		return nil, nil, nil, errors.New("ssh: must specify HostKeyCallback")
-	}
-
-	conn := &connection{
-		sshConn: sshConn{conn: c, user: fullConf.User},
-	}
-
-	if err := conn.clientHandshake(addr, &fullConf); err != nil {
-		c.Close()
-		return nil, nil, nil, fmt.Errorf("ssh: handshake failed: %w", err)
-	}
-	conn.mux = newMux(conn.transport)
-	return conn, conn.mux.incomingChannels, conn.mux.incomingRequests, nil
-}
-
-// clientHandshake performs the client side key exchange. See RFC 4253 Section
-// 7.
-func (c *connection) clientHandshake(dialAddress string, config *ClientConfig) error {
-	if config.ClientVersion != "" {
-		c.clientVersion = []byte(config.ClientVersion)
-	} else {
-		c.clientVersion = []byte(packageVersion)
-	}
-	var err error
-	c.serverVersion, err = exchangeVersions(c.sshConn.conn, c.clientVersion)
-	if err != nil {
-		return err
-	}
-
-	c.transport = newClientTransport(
-		newTransport(c.sshConn.conn, config.Rand, true /* is client */),
-		c.clientVersion, c.serverVersion, config, dialAddress, c.sshConn.RemoteAddr())
-	if err := c.transport.waitSession(); err != nil {
-		return err
-	}
-
-	c.sessionID = c.transport.getSessionID()
-	c.algorithms = c.transport.getAlgorithms()
-	return c.clientAuthenticate(config)
-}
-
-// verifyHostKeySignature verifies the host key obtained in the key exchange.
-// algo is the negotiated algorithm, and may be a certificate type.
-func verifyHostKeySignature(hostKey PublicKey, algo string, result *kexResult) error {
-	sig, rest, ok := parseSignatureBody(result.Signature)
-	if len(rest) > 0 || !ok {
-		return errors.New("ssh: signature parse error")
-	}
-
-	if a := underlyingAlgo(algo); sig.Format != a {
-		return fmt.Errorf("ssh: invalid signature algorithm %q, expected %q", sig.Format, a)
-	}
-
-	return hostKey.Verify(result.H, sig)
-}
-
-// NewSession opens a new Session for this client. (A session is a remote
-// execution of a program.)
-func (c *Client) NewSession() (*Session, error) {
-	ch, in, err := c.OpenChannel("session", nil)
-	if err != nil {
-		return nil, err
-	}
-	return newSession(ch, in)
-}
-
-func (c *Client) handleGlobalRequests(incoming <-chan *Request) {
-	for r := range incoming {
-		// This handles keepalive messages and matches
-		// the behaviour of OpenSSH.
-		r.Reply(false, nil)
-	}
-}
-
-// handleChannelOpens channel open messages from the remote side.
-func (c *Client) handleChannelOpens(in <-chan NewChannel) {
-	for ch := range in {
-		c.mu.Lock()
-		handler := c.channelHandlers[ch.ChannelType()]
-		c.mu.Unlock()
-
-		if handler != nil {
-			handler <- ch
-		} else {
-			ch.Reject(UnknownChannelType, fmt.Sprintf("unknown channel type: %v", ch.ChannelType()))
-		}
-	}
-
-	c.mu.Lock()
-	for _, ch := range c.channelHandlers {
-		close(ch)
-	}
-	c.channelHandlers = nil
-	c.mu.Unlock()
-}
-
-// Dial starts a client connection to the given SSH server. It is a
-// convenience function that connects to the given network address,
-// initiates the SSH handshake, and then sets up a Client.  For access
-// to incoming channels and requests, use net.Dial with NewClientConn
-// instead.
-func Dial(network, addr string, config *ClientConfig) (*Client, error) {
-	conn, err := net.DialTimeout(network, addr, config.Timeout)
-	if err != nil {
-		return nil, err
-	}
-	c, chans, reqs, err := NewClientConn(conn, addr, config)
-	if err != nil {
-		return nil, err
-	}
-	return NewClient(c, chans, reqs), nil
-}
-
-// HostKeyCallback is the function type used for verifying server
-// keys.  A HostKeyCallback must return nil if the host key is OK, or
-// an error to reject it. It receives the hostname as passed to Dial
-// or NewClientConn. The remote address is the RemoteAddr of the
-// net.Conn underlying the SSH connection.
-type HostKeyCallback func(hostname string, remote net.Addr, key PublicKey) error
-
-// BannerCallback is the function type used for treat the banner sent by
-// the server. A BannerCallback receives the message sent by the remote server.
-type BannerCallback func(message string) error
-
-// A ClientConfig structure is used to configure a Client. It must not be
-// modified after having been passed to an SSH function.
-type ClientConfig struct {
-	// Config contains configuration that is shared between clients and
-	// servers.
-	Config
-
-	// User contains the username to authenticate as.
-	User string
-
-	// Auth contains possible authentication methods to use with the
-	// server. Only the first instance of a particular RFC 4252 method will
-	// be used during authentication.
-	Auth []AuthMethod
-
-	// HostKeyCallback is called during the cryptographic
-	// handshake to validate the server's host key. The client
-	// configuration must supply this callback for the connection
-	// to succeed. The functions InsecureIgnoreHostKey or
-	// FixedHostKey can be used for simplistic host key checks.
-	HostKeyCallback HostKeyCallback
-
-	// BannerCallback is called during the SSH dance to display a custom
-	// server's message. The client configuration can supply this callback to
-	// handle it as wished. The function BannerDisplayStderr can be used for
-	// simplistic display on Stderr.
-	BannerCallback BannerCallback
-
-	// ClientVersion contains the version identification string that will
-	// be used for the connection. If empty, a reasonable default is used.
-	ClientVersion string
-
-	// HostKeyAlgorithms lists the public key algorithms that the client will
-	// accept from the server for host key authentication, in order of
-	// preference. If empty, a reasonable default is used. Any
-	// string returned from a PublicKey.Type method may be used, or
-	// any of the CertAlgo and KeyAlgo constants.
-	HostKeyAlgorithms []string
-
-	// Timeout is the maximum amount of time for the TCP connection to establish.
-	//
-	// A Timeout of zero means no timeout.
-	Timeout time.Duration
-}
-
-// InsecureIgnoreHostKey returns a function that can be used for
-// ClientConfig.HostKeyCallback to accept any host key. It should
-// not be used for production code.
-func InsecureIgnoreHostKey() HostKeyCallback {
-	return func(hostname string, remote net.Addr, key PublicKey) error {
-		return nil
-	}
-}
-
-type fixedHostKey struct {
-	key PublicKey
-}
-
-func (f *fixedHostKey) check(hostname string, remote net.Addr, key PublicKey) error {
-	if f.key == nil {
-		return fmt.Errorf("ssh: required host key was nil")
-	}
-	if !bytes.Equal(key.Marshal(), f.key.Marshal()) {
-		return fmt.Errorf("ssh: host key mismatch")
-	}
-	return nil
-}
-
-// FixedHostKey returns a function for use in
-// ClientConfig.HostKeyCallback to accept only a specific host key.
-func FixedHostKey(key PublicKey) HostKeyCallback {
-	hk := &fixedHostKey{key}
-	return hk.check
-}
-
-// BannerDisplayStderr returns a function that can be used for
-// ClientConfig.BannerCallback to display banners on os.Stderr.
-func BannerDisplayStderr() BannerCallback {
-	return func(banner string) error {
-		_, err := os.Stderr.WriteString(banner)
-
-		return err
-	}
-}
diff --git a/vendor/golang.org/x/crypto/ssh/client_auth.go b/vendor/golang.org/x/crypto/ssh/client_auth.go
deleted file mode 100644
index 3127e4990..000000000
--- a/vendor/golang.org/x/crypto/ssh/client_auth.go
+++ /dev/null
@@ -1,788 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"slices"
-	"strings"
-)
-
-type authResult int
-
-const (
-	authFailure authResult = iota
-	authPartialSuccess
-	authSuccess
-)
-
-// clientAuthenticate authenticates with the remote server. See RFC 4252.
-func (c *connection) clientAuthenticate(config *ClientConfig) error {
-	// initiate user auth session
-	if err := c.transport.writePacket(Marshal(&serviceRequestMsg{serviceUserAuth})); err != nil {
-		return err
-	}
-	packet, err := c.transport.readPacket()
-	if err != nil {
-		return err
-	}
-	// The server may choose to send a SSH_MSG_EXT_INFO at this point (if we
-	// advertised willingness to receive one, which we always do) or not. See
-	// RFC 8308, Section 2.4.
-	extensions := make(map[string][]byte)
-	if len(packet) > 0 && packet[0] == msgExtInfo {
-		var extInfo extInfoMsg
-		if err := Unmarshal(packet, &extInfo); err != nil {
-			return err
-		}
-		payload := extInfo.Payload
-		for i := uint32(0); i < extInfo.NumExtensions; i++ {
-			name, rest, ok := parseString(payload)
-			if !ok {
-				return parseError(msgExtInfo)
-			}
-			value, rest, ok := parseString(rest)
-			if !ok {
-				return parseError(msgExtInfo)
-			}
-			extensions[string(name)] = value
-			payload = rest
-		}
-		packet, err = c.transport.readPacket()
-		if err != nil {
-			return err
-		}
-	}
-	var serviceAccept serviceAcceptMsg
-	if err := Unmarshal(packet, &serviceAccept); err != nil {
-		return err
-	}
-
-	// during the authentication phase the client first attempts the "none" method
-	// then any untried methods suggested by the server.
-	var tried []string
-	var lastMethods []string
-
-	sessionID := c.transport.getSessionID()
-	for auth := AuthMethod(new(noneAuth)); auth != nil; {
-		ok, methods, err := auth.auth(sessionID, config.User, c.transport, config.Rand, extensions)
-		if err != nil {
-			// On disconnect, return error immediately
-			if _, ok := err.(*disconnectMsg); ok {
-				return err
-			}
-			// We return the error later if there is no other method left to
-			// try.
-			ok = authFailure
-		}
-		if ok == authSuccess {
-			// success
-			return nil
-		} else if ok == authFailure {
-			if m := auth.method(); !slices.Contains(tried, m) {
-				tried = append(tried, m)
-			}
-		}
-		if methods == nil {
-			methods = lastMethods
-		}
-		lastMethods = methods
-
-		auth = nil
-
-	findNext:
-		for _, a := range config.Auth {
-			candidateMethod := a.method()
-			if slices.Contains(tried, candidateMethod) {
-				continue
-			}
-			for _, meth := range methods {
-				if meth == candidateMethod {
-					auth = a
-					break findNext
-				}
-			}
-		}
-
-		if auth == nil && err != nil {
-			// We have an error and there are no other authentication methods to
-			// try, so we return it.
-			return err
-		}
-	}
-	return fmt.Errorf("ssh: unable to authenticate, attempted methods %v, no supported methods remain", tried)
-}
-
-// An AuthMethod represents an instance of an RFC 4252 authentication method.
-type AuthMethod interface {
-	// auth authenticates user over transport t.
-	// Returns true if authentication is successful.
-	// If authentication is not successful, a []string of alternative
-	// method names is returned. If the slice is nil, it will be ignored
-	// and the previous set of possible methods will be reused.
-	auth(session []byte, user string, p packetConn, rand io.Reader, extensions map[string][]byte) (authResult, []string, error)
-
-	// method returns the RFC 4252 method name.
-	method() string
-}
-
-// "none" authentication, RFC 4252 section 5.2.
-type noneAuth int
-
-func (n *noneAuth) auth(session []byte, user string, c packetConn, rand io.Reader, _ map[string][]byte) (authResult, []string, error) {
-	if err := c.writePacket(Marshal(&userAuthRequestMsg{
-		User:    user,
-		Service: serviceSSH,
-		Method:  "none",
-	})); err != nil {
-		return authFailure, nil, err
-	}
-
-	return handleAuthResponse(c)
-}
-
-func (n *noneAuth) method() string {
-	return "none"
-}
-
-// passwordCallback is an AuthMethod that fetches the password through
-// a function call, e.g. by prompting the user.
-type passwordCallback func() (password string, err error)
-
-func (cb passwordCallback) auth(session []byte, user string, c packetConn, rand io.Reader, _ map[string][]byte) (authResult, []string, error) {
-	type passwordAuthMsg struct {
-		User     string `sshtype:"50"`
-		Service  string
-		Method   string
-		Reply    bool
-		Password string
-	}
-
-	pw, err := cb()
-	// REVIEW NOTE: is there a need to support skipping a password attempt?
-	// The program may only find out that the user doesn't have a password
-	// when prompting.
-	if err != nil {
-		return authFailure, nil, err
-	}
-
-	if err := c.writePacket(Marshal(&passwordAuthMsg{
-		User:     user,
-		Service:  serviceSSH,
-		Method:   cb.method(),
-		Reply:    false,
-		Password: pw,
-	})); err != nil {
-		return authFailure, nil, err
-	}
-
-	return handleAuthResponse(c)
-}
-
-func (cb passwordCallback) method() string {
-	return "password"
-}
-
-// Password returns an AuthMethod using the given password.
-func Password(secret string) AuthMethod {
-	return passwordCallback(func() (string, error) { return secret, nil })
-}
-
-// PasswordCallback returns an AuthMethod that uses a callback for
-// fetching a password.
-func PasswordCallback(prompt func() (secret string, err error)) AuthMethod {
-	return passwordCallback(prompt)
-}
-
-type publickeyAuthMsg struct {
-	User    string `sshtype:"50"`
-	Service string
-	Method  string
-	// HasSig indicates to the receiver packet that the auth request is signed and
-	// should be used for authentication of the request.
-	HasSig   bool
-	Algoname string
-	PubKey   []byte
-	// Sig is tagged with "rest" so Marshal will exclude it during
-	// validateKey
-	Sig []byte `ssh:"rest"`
-}
-
-// publicKeyCallback is an AuthMethod that uses a set of key
-// pairs for authentication.
-type publicKeyCallback func() ([]Signer, error)
-
-func (cb publicKeyCallback) method() string {
-	return "publickey"
-}
-
-func pickSignatureAlgorithm(signer Signer, extensions map[string][]byte) (MultiAlgorithmSigner, string, error) {
-	var as MultiAlgorithmSigner
-	keyFormat := signer.PublicKey().Type()
-
-	// If the signer implements MultiAlgorithmSigner we use the algorithms it
-	// support, if it implements AlgorithmSigner we assume it supports all
-	// algorithms, otherwise only the key format one.
-	switch s := signer.(type) {
-	case MultiAlgorithmSigner:
-		as = s
-	case AlgorithmSigner:
-		as = &multiAlgorithmSigner{
-			AlgorithmSigner:     s,
-			supportedAlgorithms: algorithmsForKeyFormat(underlyingAlgo(keyFormat)),
-		}
-	default:
-		as = &multiAlgorithmSigner{
-			AlgorithmSigner:     algorithmSignerWrapper{signer},
-			supportedAlgorithms: []string{underlyingAlgo(keyFormat)},
-		}
-	}
-
-	getFallbackAlgo := func() (string, error) {
-		// Fallback to use if there is no "server-sig-algs" extension or a
-		// common algorithm cannot be found. We use the public key format if the
-		// MultiAlgorithmSigner supports it, otherwise we return an error.
-		if !slices.Contains(as.Algorithms(), underlyingAlgo(keyFormat)) {
-			return "", fmt.Errorf("ssh: no common public key signature algorithm, server only supports %q for key type %q, signer only supports %v",
-				underlyingAlgo(keyFormat), keyFormat, as.Algorithms())
-		}
-		return keyFormat, nil
-	}
-
-	extPayload, ok := extensions["server-sig-algs"]
-	if !ok {
-		// If there is no "server-sig-algs" extension use the fallback
-		// algorithm.
-		algo, err := getFallbackAlgo()
-		return as, algo, err
-	}
-
-	// The server-sig-algs extension only carries underlying signature
-	// algorithm, but we are trying to select a protocol-level public key
-	// algorithm, which might be a certificate type. Extend the list of server
-	// supported algorithms to include the corresponding certificate algorithms.
-	serverAlgos := strings.Split(string(extPayload), ",")
-	for _, algo := range serverAlgos {
-		if certAlgo, ok := certificateAlgo(algo); ok {
-			serverAlgos = append(serverAlgos, certAlgo)
-		}
-	}
-
-	// Filter algorithms based on those supported by MultiAlgorithmSigner.
-	var keyAlgos []string
-	for _, algo := range algorithmsForKeyFormat(keyFormat) {
-		if slices.Contains(as.Algorithms(), underlyingAlgo(algo)) {
-			keyAlgos = append(keyAlgos, algo)
-		}
-	}
-
-	algo, err := findCommon("public key signature algorithm", keyAlgos, serverAlgos, true)
-	if err != nil {
-		// If there is no overlap, return the fallback algorithm to support
-		// servers that fail to list all supported algorithms.
-		algo, err := getFallbackAlgo()
-		return as, algo, err
-	}
-	return as, algo, nil
-}
-
-func (cb publicKeyCallback) auth(session []byte, user string, c packetConn, rand io.Reader, extensions map[string][]byte) (authResult, []string, error) {
-	// Authentication is performed by sending an enquiry to test if a key is
-	// acceptable to the remote. If the key is acceptable, the client will
-	// attempt to authenticate with the valid key.  If not the client will repeat
-	// the process with the remaining keys.
-
-	signers, err := cb()
-	if err != nil {
-		return authFailure, nil, err
-	}
-	var methods []string
-	var errSigAlgo error
-
-	origSignersLen := len(signers)
-	for idx := 0; idx < len(signers); idx++ {
-		signer := signers[idx]
-		pub := signer.PublicKey()
-		as, algo, err := pickSignatureAlgorithm(signer, extensions)
-		if err != nil && errSigAlgo == nil {
-			// If we cannot negotiate a signature algorithm store the first
-			// error so we can return it to provide a more meaningful message if
-			// no other signers work.
-			errSigAlgo = err
-			continue
-		}
-		ok, err := validateKey(pub, algo, user, c)
-		if err != nil {
-			return authFailure, nil, err
-		}
-		// OpenSSH 7.2-7.7 advertises support for rsa-sha2-256 and rsa-sha2-512
-		// in the "server-sig-algs" extension but doesn't support these
-		// algorithms for certificate authentication, so if the server rejects
-		// the key try to use the obtained algorithm as if "server-sig-algs" had
-		// not been implemented if supported from the algorithm signer.
-		if !ok && idx < origSignersLen && isRSACert(algo) && algo != CertAlgoRSAv01 {
-			if slices.Contains(as.Algorithms(), KeyAlgoRSA) {
-				// We retry using the compat algorithm after all signers have
-				// been tried normally.
-				signers = append(signers, &multiAlgorithmSigner{
-					AlgorithmSigner:     as,
-					supportedAlgorithms: []string{KeyAlgoRSA},
-				})
-			}
-		}
-		if !ok {
-			continue
-		}
-
-		pubKey := pub.Marshal()
-		data := buildDataSignedForAuth(session, userAuthRequestMsg{
-			User:    user,
-			Service: serviceSSH,
-			Method:  cb.method(),
-		}, algo, pubKey)
-		sign, err := as.SignWithAlgorithm(rand, data, underlyingAlgo(algo))
-		if err != nil {
-			return authFailure, nil, err
-		}
-
-		// manually wrap the serialized signature in a string
-		s := Marshal(sign)
-		sig := make([]byte, stringLength(len(s)))
-		marshalString(sig, s)
-		msg := publickeyAuthMsg{
-			User:     user,
-			Service:  serviceSSH,
-			Method:   cb.method(),
-			HasSig:   true,
-			Algoname: algo,
-			PubKey:   pubKey,
-			Sig:      sig,
-		}
-		p := Marshal(&msg)
-		if err := c.writePacket(p); err != nil {
-			return authFailure, nil, err
-		}
-		var success authResult
-		success, methods, err = handleAuthResponse(c)
-		if err != nil {
-			return authFailure, nil, err
-		}
-
-		// If authentication succeeds or the list of available methods does not
-		// contain the "publickey" method, do not attempt to authenticate with any
-		// other keys.  According to RFC 4252 Section 7, the latter can occur when
-		// additional authentication methods are required.
-		if success == authSuccess || !slices.Contains(methods, cb.method()) {
-			return success, methods, err
-		}
-	}
-
-	return authFailure, methods, errSigAlgo
-}
-
-// validateKey validates the key provided is acceptable to the server.
-func validateKey(key PublicKey, algo string, user string, c packetConn) (bool, error) {
-	pubKey := key.Marshal()
-	msg := publickeyAuthMsg{
-		User:     user,
-		Service:  serviceSSH,
-		Method:   "publickey",
-		HasSig:   false,
-		Algoname: algo,
-		PubKey:   pubKey,
-	}
-	if err := c.writePacket(Marshal(&msg)); err != nil {
-		return false, err
-	}
-
-	return confirmKeyAck(key, c)
-}
-
-func confirmKeyAck(key PublicKey, c packetConn) (bool, error) {
-	pubKey := key.Marshal()
-
-	for {
-		packet, err := c.readPacket()
-		if err != nil {
-			return false, err
-		}
-		switch packet[0] {
-		case msgUserAuthBanner:
-			if err := handleBannerResponse(c, packet); err != nil {
-				return false, err
-			}
-		case msgUserAuthPubKeyOk:
-			var msg userAuthPubKeyOkMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return false, err
-			}
-			// According to RFC 4252 Section 7 the algorithm in
-			// SSH_MSG_USERAUTH_PK_OK should match that of the request but some
-			// servers send the key type instead. OpenSSH allows any algorithm
-			// that matches the public key, so we do the same.
-			// https://github.com/openssh/openssh-portable/blob/86bdd385/sshconnect2.c#L709
-			if !slices.Contains(algorithmsForKeyFormat(key.Type()), msg.Algo) {
-				return false, nil
-			}
-			if !bytes.Equal(msg.PubKey, pubKey) {
-				return false, nil
-			}
-			return true, nil
-		case msgUserAuthFailure:
-			return false, nil
-		default:
-			return false, unexpectedMessageError(msgUserAuthPubKeyOk, packet[0])
-		}
-	}
-}
-
-// PublicKeys returns an AuthMethod that uses the given key
-// pairs.
-func PublicKeys(signers ...Signer) AuthMethod {
-	return publicKeyCallback(func() ([]Signer, error) { return signers, nil })
-}
-
-// PublicKeysCallback returns an AuthMethod that runs the given
-// function to obtain a list of key pairs.
-func PublicKeysCallback(getSigners func() (signers []Signer, err error)) AuthMethod {
-	return publicKeyCallback(getSigners)
-}
-
-// handleAuthResponse returns whether the preceding authentication request succeeded
-// along with a list of remaining authentication methods to try next and
-// an error if an unexpected response was received.
-func handleAuthResponse(c packetConn) (authResult, []string, error) {
-	gotMsgExtInfo := false
-	for {
-		packet, err := c.readPacket()
-		if err != nil {
-			return authFailure, nil, err
-		}
-
-		switch packet[0] {
-		case msgUserAuthBanner:
-			if err := handleBannerResponse(c, packet); err != nil {
-				return authFailure, nil, err
-			}
-		case msgExtInfo:
-			// Ignore post-authentication RFC 8308 extensions, once.
-			if gotMsgExtInfo {
-				return authFailure, nil, unexpectedMessageError(msgUserAuthSuccess, packet[0])
-			}
-			gotMsgExtInfo = true
-		case msgUserAuthFailure:
-			var msg userAuthFailureMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return authFailure, nil, err
-			}
-			if msg.PartialSuccess {
-				return authPartialSuccess, msg.Methods, nil
-			}
-			return authFailure, msg.Methods, nil
-		case msgUserAuthSuccess:
-			return authSuccess, nil, nil
-		default:
-			return authFailure, nil, unexpectedMessageError(msgUserAuthSuccess, packet[0])
-		}
-	}
-}
-
-func handleBannerResponse(c packetConn, packet []byte) error {
-	var msg userAuthBannerMsg
-	if err := Unmarshal(packet, &msg); err != nil {
-		return err
-	}
-
-	transport, ok := c.(*handshakeTransport)
-	if !ok {
-		return nil
-	}
-
-	if transport.bannerCallback != nil {
-		return transport.bannerCallback(msg.Message)
-	}
-
-	return nil
-}
-
-// KeyboardInteractiveChallenge should print questions, optionally
-// disabling echoing (e.g. for passwords), and return all the answers.
-// Challenge may be called multiple times in a single session. After
-// successful authentication, the server may send a challenge with no
-// questions, for which the name and instruction messages should be
-// printed.  RFC 4256 section 3.3 details how the UI should behave for
-// both CLI and GUI environments.
-type KeyboardInteractiveChallenge func(name, instruction string, questions []string, echos []bool) (answers []string, err error)
-
-// KeyboardInteractive returns an AuthMethod using a prompt/response
-// sequence controlled by the server.
-func KeyboardInteractive(challenge KeyboardInteractiveChallenge) AuthMethod {
-	return challenge
-}
-
-func (cb KeyboardInteractiveChallenge) method() string {
-	return "keyboard-interactive"
-}
-
-func (cb KeyboardInteractiveChallenge) auth(session []byte, user string, c packetConn, rand io.Reader, _ map[string][]byte) (authResult, []string, error) {
-	type initiateMsg struct {
-		User       string `sshtype:"50"`
-		Service    string
-		Method     string
-		Language   string
-		Submethods string
-	}
-
-	if err := c.writePacket(Marshal(&initiateMsg{
-		User:    user,
-		Service: serviceSSH,
-		Method:  "keyboard-interactive",
-	})); err != nil {
-		return authFailure, nil, err
-	}
-
-	gotMsgExtInfo := false
-	gotUserAuthInfoRequest := false
-	for {
-		packet, err := c.readPacket()
-		if err != nil {
-			return authFailure, nil, err
-		}
-
-		// like handleAuthResponse, but with less options.
-		switch packet[0] {
-		case msgUserAuthBanner:
-			if err := handleBannerResponse(c, packet); err != nil {
-				return authFailure, nil, err
-			}
-			continue
-		case msgExtInfo:
-			// Ignore post-authentication RFC 8308 extensions, once.
-			if gotMsgExtInfo {
-				return authFailure, nil, unexpectedMessageError(msgUserAuthInfoRequest, packet[0])
-			}
-			gotMsgExtInfo = true
-			continue
-		case msgUserAuthInfoRequest:
-			// OK
-		case msgUserAuthFailure:
-			var msg userAuthFailureMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return authFailure, nil, err
-			}
-			if msg.PartialSuccess {
-				return authPartialSuccess, msg.Methods, nil
-			}
-			if !gotUserAuthInfoRequest {
-				return authFailure, msg.Methods, unexpectedMessageError(msgUserAuthInfoRequest, packet[0])
-			}
-			return authFailure, msg.Methods, nil
-		case msgUserAuthSuccess:
-			return authSuccess, nil, nil
-		default:
-			return authFailure, nil, unexpectedMessageError(msgUserAuthInfoRequest, packet[0])
-		}
-
-		var msg userAuthInfoRequestMsg
-		if err := Unmarshal(packet, &msg); err != nil {
-			return authFailure, nil, err
-		}
-		gotUserAuthInfoRequest = true
-
-		// Manually unpack the prompt/echo pairs.
-		rest := msg.Prompts
-		var prompts []string
-		var echos []bool
-		for i := 0; i < int(msg.NumPrompts); i++ {
-			prompt, r, ok := parseString(rest)
-			if !ok || len(r) == 0 {
-				return authFailure, nil, errors.New("ssh: prompt format error")
-			}
-			prompts = append(prompts, string(prompt))
-			echos = append(echos, r[0] != 0)
-			rest = r[1:]
-		}
-
-		if len(rest) != 0 {
-			return authFailure, nil, errors.New("ssh: extra data following keyboard-interactive pairs")
-		}
-
-		answers, err := cb(msg.Name, msg.Instruction, prompts, echos)
-		if err != nil {
-			return authFailure, nil, err
-		}
-
-		if len(answers) != len(prompts) {
-			return authFailure, nil, fmt.Errorf("ssh: incorrect number of answers from keyboard-interactive callback %d (expected %d)", len(answers), len(prompts))
-		}
-		responseLength := 1 + 4
-		for _, a := range answers {
-			responseLength += stringLength(len(a))
-		}
-		serialized := make([]byte, responseLength)
-		p := serialized
-		p[0] = msgUserAuthInfoResponse
-		p = p[1:]
-		p = marshalUint32(p, uint32(len(answers)))
-		for _, a := range answers {
-			p = marshalString(p, []byte(a))
-		}
-
-		if err := c.writePacket(serialized); err != nil {
-			return authFailure, nil, err
-		}
-	}
-}
-
-type retryableAuthMethod struct {
-	authMethod AuthMethod
-	maxTries   int
-}
-
-func (r *retryableAuthMethod) auth(session []byte, user string, c packetConn, rand io.Reader, extensions map[string][]byte) (ok authResult, methods []string, err error) {
-	for i := 0; r.maxTries <= 0 || i < r.maxTries; i++ {
-		ok, methods, err = r.authMethod.auth(session, user, c, rand, extensions)
-		if ok != authFailure || err != nil { // either success, partial success or error terminate
-			return ok, methods, err
-		}
-	}
-	return ok, methods, err
-}
-
-func (r *retryableAuthMethod) method() string {
-	return r.authMethod.method()
-}
-
-// RetryableAuthMethod is a decorator for other auth methods enabling them to
-// be retried up to maxTries before considering that AuthMethod itself failed.
-// If maxTries is <= 0, will retry indefinitely
-//
-// This is useful for interactive clients using challenge/response type
-// authentication (e.g. Keyboard-Interactive, Password, etc) where the user
-// could mistype their response resulting in the server issuing a
-// SSH_MSG_USERAUTH_FAILURE (rfc4252 #8 [password] and rfc4256 #3.4
-// [keyboard-interactive]); Without this decorator, the non-retryable
-// AuthMethod would be removed from future consideration, and never tried again
-// (and so the user would never be able to retry their entry).
-func RetryableAuthMethod(auth AuthMethod, maxTries int) AuthMethod {
-	return &retryableAuthMethod{authMethod: auth, maxTries: maxTries}
-}
-
-// GSSAPIWithMICAuthMethod is an AuthMethod with "gssapi-with-mic" authentication.
-// See RFC 4462 section 3
-// gssAPIClient is implementation of the GSSAPIClient interface, see the definition of the interface for details.
-// target is the server host you want to log in to.
-func GSSAPIWithMICAuthMethod(gssAPIClient GSSAPIClient, target string) AuthMethod {
-	if gssAPIClient == nil {
-		panic("gss-api client must be not nil with enable gssapi-with-mic")
-	}
-	return &gssAPIWithMICCallback{gssAPIClient: gssAPIClient, target: target}
-}
-
-type gssAPIWithMICCallback struct {
-	gssAPIClient GSSAPIClient
-	target       string
-}
-
-func (g *gssAPIWithMICCallback) auth(session []byte, user string, c packetConn, rand io.Reader, _ map[string][]byte) (authResult, []string, error) {
-	m := &userAuthRequestMsg{
-		User:    user,
-		Service: serviceSSH,
-		Method:  g.method(),
-	}
-	// The GSS-API authentication method is initiated when the client sends an SSH_MSG_USERAUTH_REQUEST.
-	// See RFC 4462 section 3.2.
-	m.Payload = appendU32(m.Payload, 1)
-	m.Payload = appendString(m.Payload, string(krb5OID))
-	if err := c.writePacket(Marshal(m)); err != nil {
-		return authFailure, nil, err
-	}
-	// The server responds to the SSH_MSG_USERAUTH_REQUEST with either an
-	// SSH_MSG_USERAUTH_FAILURE if none of the mechanisms are supported or
-	// with an SSH_MSG_USERAUTH_GSSAPI_RESPONSE.
-	// See RFC 4462 section 3.3.
-	// OpenSSH supports Kerberos V5 mechanism only for GSS-API authentication,so I don't want to check
-	// selected mech if it is valid.
-	packet, err := c.readPacket()
-	if err != nil {
-		return authFailure, nil, err
-	}
-	userAuthGSSAPIResp := &userAuthGSSAPIResponse{}
-	if err := Unmarshal(packet, userAuthGSSAPIResp); err != nil {
-		return authFailure, nil, err
-	}
-	// Start the loop into the exchange token.
-	// See RFC 4462 section 3.4.
-	var token []byte
-	defer g.gssAPIClient.DeleteSecContext()
-	for {
-		// Initiates the establishment of a security context between the application and a remote peer.
-		nextToken, needContinue, err := g.gssAPIClient.InitSecContext("host@"+g.target, token, false)
-		if err != nil {
-			return authFailure, nil, err
-		}
-		if len(nextToken) > 0 {
-			if err := c.writePacket(Marshal(&userAuthGSSAPIToken{
-				Token: nextToken,
-			})); err != nil {
-				return authFailure, nil, err
-			}
-		}
-		if !needContinue {
-			break
-		}
-		packet, err = c.readPacket()
-		if err != nil {
-			return authFailure, nil, err
-		}
-		switch packet[0] {
-		case msgUserAuthFailure:
-			var msg userAuthFailureMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return authFailure, nil, err
-			}
-			if msg.PartialSuccess {
-				return authPartialSuccess, msg.Methods, nil
-			}
-			return authFailure, msg.Methods, nil
-		case msgUserAuthGSSAPIError:
-			userAuthGSSAPIErrorResp := &userAuthGSSAPIError{}
-			if err := Unmarshal(packet, userAuthGSSAPIErrorResp); err != nil {
-				return authFailure, nil, err
-			}
-			return authFailure, nil, fmt.Errorf("GSS-API Error:\n"+
-				"Major Status: %d\n"+
-				"Minor Status: %d\n"+
-				"Error Message: %s\n", userAuthGSSAPIErrorResp.MajorStatus, userAuthGSSAPIErrorResp.MinorStatus,
-				userAuthGSSAPIErrorResp.Message)
-		case msgUserAuthGSSAPIToken:
-			userAuthGSSAPITokenReq := &userAuthGSSAPIToken{}
-			if err := Unmarshal(packet, userAuthGSSAPITokenReq); err != nil {
-				return authFailure, nil, err
-			}
-			token = userAuthGSSAPITokenReq.Token
-		}
-	}
-	// Binding Encryption Keys.
-	// See RFC 4462 section 3.5.
-	micField := buildMIC(string(session), user, "ssh-connection", "gssapi-with-mic")
-	micToken, err := g.gssAPIClient.GetMIC(micField)
-	if err != nil {
-		return authFailure, nil, err
-	}
-	if err := c.writePacket(Marshal(&userAuthGSSAPIMIC{
-		MIC: micToken,
-	})); err != nil {
-		return authFailure, nil, err
-	}
-	return handleAuthResponse(c)
-}
-
-func (g *gssAPIWithMICCallback) method() string {
-	return "gssapi-with-mic"
-}
diff --git a/vendor/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go
deleted file mode 100644
index 2e44e9c9e..000000000
--- a/vendor/golang.org/x/crypto/ssh/common.go
+++ /dev/null
@@ -1,727 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto"
-	"crypto/fips140"
-	"crypto/rand"
-	"fmt"
-	"io"
-	"math"
-	"slices"
-	"sync"
-
-	_ "crypto/sha1"
-	_ "crypto/sha256"
-	_ "crypto/sha512"
-)
-
-// These are string constants in the SSH protocol.
-const (
-	compressionNone = "none"
-	serviceUserAuth = "ssh-userauth"
-	serviceSSH      = "ssh-connection"
-)
-
-// The ciphers currently or previously implemented by this library, to use in
-// [Config.Ciphers]. For a list, see the [Algorithms.Ciphers] returned by
-// [SupportedAlgorithms] or [InsecureAlgorithms].
-const (
-	CipherAES128GCM            = "aes128-gcm@openssh.com"
-	CipherAES256GCM            = "aes256-gcm@openssh.com"
-	CipherChaCha20Poly1305     = "chacha20-poly1305@openssh.com"
-	CipherAES128CTR            = "aes128-ctr"
-	CipherAES192CTR            = "aes192-ctr"
-	CipherAES256CTR            = "aes256-ctr"
-	InsecureCipherAES128CBC    = "aes128-cbc"
-	InsecureCipherTripleDESCBC = "3des-cbc"
-	InsecureCipherRC4          = "arcfour"
-	InsecureCipherRC4128       = "arcfour128"
-	InsecureCipherRC4256       = "arcfour256"
-)
-
-// The key exchanges currently or previously implemented by this library, to use
-// in [Config.KeyExchanges]. For a list, see the
-// [Algorithms.KeyExchanges] returned by [SupportedAlgorithms] or
-// [InsecureAlgorithms].
-const (
-	InsecureKeyExchangeDH1SHA1   = "diffie-hellman-group1-sha1"
-	InsecureKeyExchangeDH14SHA1  = "diffie-hellman-group14-sha1"
-	KeyExchangeDH14SHA256        = "diffie-hellman-group14-sha256"
-	KeyExchangeDH16SHA512        = "diffie-hellman-group16-sha512"
-	KeyExchangeECDHP256          = "ecdh-sha2-nistp256"
-	KeyExchangeECDHP384          = "ecdh-sha2-nistp384"
-	KeyExchangeECDHP521          = "ecdh-sha2-nistp521"
-	KeyExchangeCurve25519        = "curve25519-sha256"
-	InsecureKeyExchangeDHGEXSHA1 = "diffie-hellman-group-exchange-sha1"
-	KeyExchangeDHGEXSHA256       = "diffie-hellman-group-exchange-sha256"
-	// KeyExchangeMLKEM768X25519 is supported from Go 1.24.
-	KeyExchangeMLKEM768X25519 = "mlkem768x25519-sha256"
-
-	// An alias for KeyExchangeCurve25519SHA256. This kex ID will be added if
-	// KeyExchangeCurve25519SHA256 is requested for backward compatibility with
-	// OpenSSH versions up to 7.2.
-	keyExchangeCurve25519LibSSH = "curve25519-sha256@libssh.org"
-)
-
-// The message authentication code (MAC) currently or previously implemented by
-// this library, to use in [Config.MACs]. For a list, see the
-// [Algorithms.MACs] returned by [SupportedAlgorithms] or
-// [InsecureAlgorithms].
-const (
-	HMACSHA256ETM      = "hmac-sha2-256-etm@openssh.com"
-	HMACSHA512ETM      = "hmac-sha2-512-etm@openssh.com"
-	HMACSHA256         = "hmac-sha2-256"
-	HMACSHA512         = "hmac-sha2-512"
-	HMACSHA1           = "hmac-sha1"
-	InsecureHMACSHA196 = "hmac-sha1-96"
-)
-
-var (
-	// supportedKexAlgos specifies key-exchange algorithms implemented by this
-	// package in preference order, excluding those with security issues.
-	supportedKexAlgos = []string{
-		KeyExchangeMLKEM768X25519,
-		KeyExchangeCurve25519,
-		KeyExchangeECDHP256,
-		KeyExchangeECDHP384,
-		KeyExchangeECDHP521,
-		KeyExchangeDH14SHA256,
-		KeyExchangeDH16SHA512,
-		KeyExchangeDHGEXSHA256,
-	}
-	// defaultKexAlgos specifies the default preference for key-exchange
-	// algorithms in preference order.
-	defaultKexAlgos = []string{
-		KeyExchangeMLKEM768X25519,
-		KeyExchangeCurve25519,
-		KeyExchangeECDHP256,
-		KeyExchangeECDHP384,
-		KeyExchangeECDHP521,
-		KeyExchangeDH14SHA256,
-		InsecureKeyExchangeDH14SHA1,
-	}
-	// insecureKexAlgos specifies key-exchange algorithms implemented by this
-	// package and which have security issues.
-	insecureKexAlgos = []string{
-		InsecureKeyExchangeDH14SHA1,
-		InsecureKeyExchangeDH1SHA1,
-		InsecureKeyExchangeDHGEXSHA1,
-	}
-	// supportedCiphers specifies cipher algorithms implemented by this package
-	// in preference order, excluding those with security issues.
-	supportedCiphers = []string{
-		CipherAES128GCM,
-		CipherAES256GCM,
-		CipherChaCha20Poly1305,
-		CipherAES128CTR,
-		CipherAES192CTR,
-		CipherAES256CTR,
-	}
-	// defaultCiphers specifies the default preference for ciphers algorithms
-	// in preference order.
-	defaultCiphers = supportedCiphers
-	// insecureCiphers specifies cipher algorithms implemented by this
-	// package and which have security issues.
-	insecureCiphers = []string{
-		InsecureCipherAES128CBC,
-		InsecureCipherTripleDESCBC,
-		InsecureCipherRC4256,
-		InsecureCipherRC4128,
-		InsecureCipherRC4,
-	}
-	// supportedMACs specifies MAC algorithms implemented by this package in
-	// preference order, excluding those with security issues.
-	supportedMACs = []string{
-		HMACSHA256ETM,
-		HMACSHA512ETM,
-		HMACSHA256,
-		HMACSHA512,
-		HMACSHA1,
-	}
-	// defaultMACs specifies the default preference for MAC algorithms in
-	// preference order.
-	defaultMACs = []string{
-		HMACSHA256ETM,
-		HMACSHA512ETM,
-		HMACSHA256,
-		HMACSHA512,
-		HMACSHA1,
-		InsecureHMACSHA196,
-	}
-	// insecureMACs specifies MAC algorithms implemented by this
-	// package and which have security issues.
-	insecureMACs = []string{
-		InsecureHMACSHA196,
-	}
-	// supportedHostKeyAlgos specifies the supported host-key algorithms (i.e.
-	// methods of authenticating servers) implemented by this package in
-	// preference order, excluding those with security issues.
-	supportedHostKeyAlgos = []string{
-		CertAlgoRSASHA256v01,
-		CertAlgoRSASHA512v01,
-		CertAlgoECDSA256v01,
-		CertAlgoECDSA384v01,
-		CertAlgoECDSA521v01,
-		CertAlgoED25519v01,
-		KeyAlgoRSASHA256,
-		KeyAlgoRSASHA512,
-		KeyAlgoECDSA256,
-		KeyAlgoECDSA384,
-		KeyAlgoECDSA521,
-		KeyAlgoED25519,
-	}
-	// defaultHostKeyAlgos specifies the default preference for host-key
-	// algorithms in preference order.
-	defaultHostKeyAlgos = []string{
-		CertAlgoRSASHA256v01,
-		CertAlgoRSASHA512v01,
-		CertAlgoRSAv01,
-		InsecureCertAlgoDSAv01,
-		CertAlgoECDSA256v01,
-		CertAlgoECDSA384v01,
-		CertAlgoECDSA521v01,
-		CertAlgoED25519v01,
-		KeyAlgoECDSA256,
-		KeyAlgoECDSA384,
-		KeyAlgoECDSA521,
-		KeyAlgoRSASHA256,
-		KeyAlgoRSASHA512,
-		KeyAlgoRSA,
-		InsecureKeyAlgoDSA,
-		KeyAlgoED25519,
-	}
-	// insecureHostKeyAlgos specifies host-key algorithms implemented by this
-	// package and which have security issues.
-	insecureHostKeyAlgos = []string{
-		KeyAlgoRSA,
-		InsecureKeyAlgoDSA,
-		CertAlgoRSAv01,
-		InsecureCertAlgoDSAv01,
-	}
-	// supportedPubKeyAuthAlgos specifies the supported client public key
-	// authentication algorithms. Note that this doesn't include certificate
-	// types since those use the underlying algorithm. Order is irrelevant.
-	supportedPubKeyAuthAlgos = []string{
-		KeyAlgoED25519,
-		KeyAlgoSKED25519,
-		KeyAlgoSKECDSA256,
-		KeyAlgoECDSA256,
-		KeyAlgoECDSA384,
-		KeyAlgoECDSA521,
-		KeyAlgoRSASHA256,
-		KeyAlgoRSASHA512,
-	}
-
-	// defaultPubKeyAuthAlgos specifies the preferred client public key
-	// authentication algorithms. This list is sent to the client if it supports
-	// the server-sig-algs extension. Order is irrelevant.
-	defaultPubKeyAuthAlgos = []string{
-		KeyAlgoED25519,
-		KeyAlgoSKED25519,
-		KeyAlgoSKECDSA256,
-		KeyAlgoECDSA256,
-		KeyAlgoECDSA384,
-		KeyAlgoECDSA521,
-		KeyAlgoRSASHA256,
-		KeyAlgoRSASHA512,
-		KeyAlgoRSA,
-		InsecureKeyAlgoDSA,
-	}
-	// insecurePubKeyAuthAlgos specifies client public key authentication
-	// algorithms implemented by this package and which have security issues.
-	insecurePubKeyAuthAlgos = []string{
-		KeyAlgoRSA,
-		InsecureKeyAlgoDSA,
-	}
-)
-
-// NegotiatedAlgorithms defines algorithms negotiated between client and server.
-type NegotiatedAlgorithms struct {
-	KeyExchange string
-	HostKey     string
-	Read        DirectionAlgorithms
-	Write       DirectionAlgorithms
-}
-
-// Algorithms defines a set of algorithms that can be configured in the client
-// or server config for negotiation during a handshake.
-type Algorithms struct {
-	KeyExchanges   []string
-	Ciphers        []string
-	MACs           []string
-	HostKeys       []string
-	PublicKeyAuths []string
-}
-
-func init() {
-	if fips140.Enabled() {
-		defaultHostKeyAlgos = slices.DeleteFunc(defaultHostKeyAlgos, func(algo string) bool {
-			_, err := hashFunc(underlyingAlgo(algo))
-			return err != nil
-		})
-		defaultPubKeyAuthAlgos = slices.DeleteFunc(defaultPubKeyAuthAlgos, func(algo string) bool {
-			_, err := hashFunc(underlyingAlgo(algo))
-			return err != nil
-		})
-	}
-}
-
-func hashFunc(format string) (crypto.Hash, error) {
-	switch format {
-	case KeyAlgoRSASHA256, KeyAlgoECDSA256, KeyAlgoSKED25519, KeyAlgoSKECDSA256:
-		return crypto.SHA256, nil
-	case KeyAlgoECDSA384:
-		return crypto.SHA384, nil
-	case KeyAlgoRSASHA512, KeyAlgoECDSA521:
-		return crypto.SHA512, nil
-	case KeyAlgoED25519:
-		// KeyAlgoED25519 doesn't pre-hash.
-		return 0, nil
-	case KeyAlgoRSA, InsecureKeyAlgoDSA:
-		if fips140.Enabled() {
-			return 0, fmt.Errorf("ssh: hash algorithm for format %q not allowed in FIPS 140 mode", format)
-		}
-		return crypto.SHA1, nil
-	default:
-		return 0, fmt.Errorf("ssh: hash algorithm for format %q not mapped", format)
-	}
-}
-
-// SupportedAlgorithms returns algorithms currently implemented by this package,
-// excluding those with security issues, which are returned by
-// InsecureAlgorithms. The algorithms listed here are in preference order.
-func SupportedAlgorithms() Algorithms {
-	return Algorithms{
-		Ciphers:        slices.Clone(supportedCiphers),
-		MACs:           slices.Clone(supportedMACs),
-		KeyExchanges:   slices.Clone(supportedKexAlgos),
-		HostKeys:       slices.Clone(supportedHostKeyAlgos),
-		PublicKeyAuths: slices.Clone(supportedPubKeyAuthAlgos),
-	}
-}
-
-// InsecureAlgorithms returns algorithms currently implemented by this package
-// and which have security issues.
-func InsecureAlgorithms() Algorithms {
-	return Algorithms{
-		KeyExchanges:   slices.Clone(insecureKexAlgos),
-		Ciphers:        slices.Clone(insecureCiphers),
-		MACs:           slices.Clone(insecureMACs),
-		HostKeys:       slices.Clone(insecureHostKeyAlgos),
-		PublicKeyAuths: slices.Clone(insecurePubKeyAuthAlgos),
-	}
-}
-
-var supportedCompressions = []string{compressionNone}
-
-// algorithmsForKeyFormat returns the supported signature algorithms for a given
-// public key format (PublicKey.Type), in order of preference. See RFC 8332,
-// Section 2. See also the note in sendKexInit on backwards compatibility.
-func algorithmsForKeyFormat(keyFormat string) []string {
-	switch keyFormat {
-	case KeyAlgoRSA:
-		return []string{KeyAlgoRSASHA256, KeyAlgoRSASHA512, KeyAlgoRSA}
-	case CertAlgoRSAv01:
-		return []string{CertAlgoRSASHA256v01, CertAlgoRSASHA512v01, CertAlgoRSAv01}
-	default:
-		return []string{keyFormat}
-	}
-}
-
-// keyFormatForAlgorithm returns the key format corresponding to the given
-// signature algorithm. It returns an empty string if the signature algorithm is
-// invalid or unsupported.
-func keyFormatForAlgorithm(sigAlgo string) string {
-	switch sigAlgo {
-	case KeyAlgoRSA, KeyAlgoRSASHA256, KeyAlgoRSASHA512:
-		return KeyAlgoRSA
-	case CertAlgoRSAv01, CertAlgoRSASHA256v01, CertAlgoRSASHA512v01:
-		return CertAlgoRSAv01
-	case KeyAlgoED25519,
-		KeyAlgoSKED25519,
-		KeyAlgoSKECDSA256,
-		KeyAlgoECDSA256,
-		KeyAlgoECDSA384,
-		KeyAlgoECDSA521,
-		InsecureKeyAlgoDSA,
-		InsecureCertAlgoDSAv01,
-		CertAlgoECDSA256v01,
-		CertAlgoECDSA384v01,
-		CertAlgoECDSA521v01,
-		CertAlgoSKECDSA256v01,
-		CertAlgoED25519v01,
-		CertAlgoSKED25519v01:
-		return sigAlgo
-	default:
-		return ""
-	}
-}
-
-// isRSA returns whether algo is a supported RSA algorithm, including certificate
-// algorithms.
-func isRSA(algo string) bool {
-	algos := algorithmsForKeyFormat(KeyAlgoRSA)
-	return slices.Contains(algos, underlyingAlgo(algo))
-}
-
-func isRSACert(algo string) bool {
-	_, ok := certKeyAlgoNames[algo]
-	if !ok {
-		return false
-	}
-	return isRSA(algo)
-}
-
-// unexpectedMessageError results when the SSH message that we received didn't
-// match what we wanted.
-func unexpectedMessageError(expected, got uint8) error {
-	return fmt.Errorf("ssh: unexpected message type %d (expected %d)", got, expected)
-}
-
-// parseError results from a malformed SSH message.
-func parseError(tag uint8) error {
-	return fmt.Errorf("ssh: parse error in message type %d", tag)
-}
-
-func findCommon(what string, client []string, server []string, isClient bool) (string, error) {
-	for _, c := range client {
-		for _, s := range server {
-			if c == s {
-				return c, nil
-			}
-		}
-	}
-	err := &AlgorithmNegotiationError{
-		What: what,
-	}
-	if isClient {
-		err.SupportedAlgorithms = client
-		err.RequestedAlgorithms = server
-	} else {
-		err.SupportedAlgorithms = server
-		err.RequestedAlgorithms = client
-	}
-	return "", err
-}
-
-// AlgorithmNegotiationError defines the error returned if the client and the
-// server cannot agree on an algorithm for key exchange, host key, cipher, MAC.
-type AlgorithmNegotiationError struct {
-	What string
-	// RequestedAlgorithms lists the algorithms supported by the peer.
-	RequestedAlgorithms []string
-	// SupportedAlgorithms lists the algorithms supported on our side.
-	SupportedAlgorithms []string
-}
-
-func (a *AlgorithmNegotiationError) Error() string {
-	return fmt.Sprintf("ssh: no common algorithm for %s; we offered: %v, peer offered: %v",
-		a.What, a.SupportedAlgorithms, a.RequestedAlgorithms)
-}
-
-// DirectionAlgorithms defines the algorithms negotiated in one direction
-// (either read or write).
-type DirectionAlgorithms struct {
-	Cipher      string
-	MAC         string
-	compression string
-}
-
-// rekeyBytes returns a rekeying intervals in bytes.
-func (a *DirectionAlgorithms) rekeyBytes() int64 {
-	// According to RFC 4344 block ciphers should rekey after
-	// 2^(BLOCKSIZE/4) blocks. For all AES flavors BLOCKSIZE is
-	// 128.
-	switch a.Cipher {
-	case CipherAES128CTR, CipherAES192CTR, CipherAES256CTR, CipherAES128GCM, CipherAES256GCM, InsecureCipherAES128CBC:
-		return 16 * (1 << 32)
-
-	}
-
-	// For others, stick with RFC 4253 recommendation to rekey after 1 Gb of data.
-	return 1 << 30
-}
-
-var aeadCiphers = map[string]bool{
-	CipherAES128GCM:        true,
-	CipherAES256GCM:        true,
-	CipherChaCha20Poly1305: true,
-}
-
-func findAgreedAlgorithms(isClient bool, clientKexInit, serverKexInit *kexInitMsg) (algs *NegotiatedAlgorithms, err error) {
-	result := &NegotiatedAlgorithms{}
-
-	result.KeyExchange, err = findCommon("key exchange", clientKexInit.KexAlgos, serverKexInit.KexAlgos, isClient)
-	if err != nil {
-		return
-	}
-
-	result.HostKey, err = findCommon("host key", clientKexInit.ServerHostKeyAlgos, serverKexInit.ServerHostKeyAlgos, isClient)
-	if err != nil {
-		return
-	}
-
-	stoc, ctos := &result.Write, &result.Read
-	if isClient {
-		ctos, stoc = stoc, ctos
-	}
-
-	ctos.Cipher, err = findCommon("client to server cipher", clientKexInit.CiphersClientServer, serverKexInit.CiphersClientServer, isClient)
-	if err != nil {
-		return
-	}
-
-	stoc.Cipher, err = findCommon("server to client cipher", clientKexInit.CiphersServerClient, serverKexInit.CiphersServerClient, isClient)
-	if err != nil {
-		return
-	}
-
-	if !aeadCiphers[ctos.Cipher] {
-		ctos.MAC, err = findCommon("client to server MAC", clientKexInit.MACsClientServer, serverKexInit.MACsClientServer, isClient)
-		if err != nil {
-			return
-		}
-	}
-
-	if !aeadCiphers[stoc.Cipher] {
-		stoc.MAC, err = findCommon("server to client MAC", clientKexInit.MACsServerClient, serverKexInit.MACsServerClient, isClient)
-		if err != nil {
-			return
-		}
-	}
-
-	ctos.compression, err = findCommon("client to server compression", clientKexInit.CompressionClientServer, serverKexInit.CompressionClientServer, isClient)
-	if err != nil {
-		return
-	}
-
-	stoc.compression, err = findCommon("server to client compression", clientKexInit.CompressionServerClient, serverKexInit.CompressionServerClient, isClient)
-	if err != nil {
-		return
-	}
-
-	return result, nil
-}
-
-// If rekeythreshold is too small, we can't make any progress sending
-// stuff.
-const minRekeyThreshold uint64 = 256
-
-// Config contains configuration data common to both ServerConfig and
-// ClientConfig.
-type Config struct {
-	// Rand provides the source of entropy for cryptographic
-	// primitives. If Rand is nil, the cryptographic random reader
-	// in package crypto/rand will be used.
-	Rand io.Reader
-
-	// The maximum number of bytes sent or received after which a
-	// new key is negotiated. It must be at least 256. If
-	// unspecified, a size suitable for the chosen cipher is used.
-	RekeyThreshold uint64
-
-	// The allowed key exchanges algorithms. If unspecified then a default set
-	// of algorithms is used. Unsupported values are silently ignored.
-	KeyExchanges []string
-
-	// The allowed cipher algorithms. If unspecified then a sensible default is
-	// used. Unsupported values are silently ignored.
-	Ciphers []string
-
-	// The allowed MAC algorithms. If unspecified then a sensible default is
-	// used. Unsupported values are silently ignored.
-	MACs []string
-}
-
-// SetDefaults sets sensible values for unset fields in config. This is
-// exported for testing: Configs passed to SSH functions are copied and have
-// default values set automatically.
-func (c *Config) SetDefaults() {
-	if c.Rand == nil {
-		c.Rand = rand.Reader
-	}
-	if c.Ciphers == nil {
-		c.Ciphers = defaultCiphers
-	}
-	var ciphers []string
-	for _, c := range c.Ciphers {
-		if cipherModes[c] != nil {
-			// Ignore the cipher if we have no cipherModes definition.
-			ciphers = append(ciphers, c)
-		}
-	}
-	c.Ciphers = ciphers
-
-	if c.KeyExchanges == nil {
-		c.KeyExchanges = defaultKexAlgos
-	}
-	var kexs []string
-	for _, k := range c.KeyExchanges {
-		if kexAlgoMap[k] != nil {
-			// Ignore the KEX if we have no kexAlgoMap definition.
-			kexs = append(kexs, k)
-			if k == KeyExchangeCurve25519 && !slices.Contains(c.KeyExchanges, keyExchangeCurve25519LibSSH) {
-				kexs = append(kexs, keyExchangeCurve25519LibSSH)
-			}
-		}
-	}
-	c.KeyExchanges = kexs
-
-	if c.MACs == nil {
-		c.MACs = defaultMACs
-	}
-	var macs []string
-	for _, m := range c.MACs {
-		if macModes[m] != nil {
-			// Ignore the MAC if we have no macModes definition.
-			macs = append(macs, m)
-		}
-	}
-	c.MACs = macs
-
-	if c.RekeyThreshold == 0 {
-		// cipher specific default
-	} else if c.RekeyThreshold < minRekeyThreshold {
-		c.RekeyThreshold = minRekeyThreshold
-	} else if c.RekeyThreshold >= math.MaxInt64 {
-		// Avoid weirdness if somebody uses -1 as a threshold.
-		c.RekeyThreshold = math.MaxInt64
-	}
-}
-
-// buildDataSignedForAuth returns the data that is signed in order to prove
-// possession of a private key. See RFC 4252, section 7. algo is the advertised
-// algorithm, and may be a certificate type.
-func buildDataSignedForAuth(sessionID []byte, req userAuthRequestMsg, algo string, pubKey []byte) []byte {
-	data := struct {
-		Session []byte
-		Type    byte
-		User    string
-		Service string
-		Method  string
-		Sign    bool
-		Algo    string
-		PubKey  []byte
-	}{
-		sessionID,
-		msgUserAuthRequest,
-		req.User,
-		req.Service,
-		req.Method,
-		true,
-		algo,
-		pubKey,
-	}
-	return Marshal(data)
-}
-
-func appendU16(buf []byte, n uint16) []byte {
-	return append(buf, byte(n>>8), byte(n))
-}
-
-func appendU32(buf []byte, n uint32) []byte {
-	return append(buf, byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-}
-
-func appendU64(buf []byte, n uint64) []byte {
-	return append(buf,
-		byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32),
-		byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-}
-
-func appendInt(buf []byte, n int) []byte {
-	return appendU32(buf, uint32(n))
-}
-
-func appendString(buf []byte, s string) []byte {
-	buf = appendU32(buf, uint32(len(s)))
-	buf = append(buf, s...)
-	return buf
-}
-
-func appendBool(buf []byte, b bool) []byte {
-	if b {
-		return append(buf, 1)
-	}
-	return append(buf, 0)
-}
-
-// newCond is a helper to hide the fact that there is no usable zero
-// value for sync.Cond.
-func newCond() *sync.Cond { return sync.NewCond(new(sync.Mutex)) }
-
-// window represents the buffer available to clients
-// wishing to write to a channel.
-type window struct {
-	*sync.Cond
-	win          uint32 // RFC 4254 5.2 says the window size can grow to 2^32-1
-	writeWaiters int
-	closed       bool
-}
-
-// add adds win to the amount of window available
-// for consumers.
-func (w *window) add(win uint32) bool {
-	// a zero sized window adjust is a noop.
-	if win == 0 {
-		return true
-	}
-	w.L.Lock()
-	if w.win+win < win {
-		w.L.Unlock()
-		return false
-	}
-	w.win += win
-	// It is unusual that multiple goroutines would be attempting to reserve
-	// window space, but not guaranteed. Use broadcast to notify all waiters
-	// that additional window is available.
-	w.Broadcast()
-	w.L.Unlock()
-	return true
-}
-
-// close sets the window to closed, so all reservations fail
-// immediately.
-func (w *window) close() {
-	w.L.Lock()
-	w.closed = true
-	w.Broadcast()
-	w.L.Unlock()
-}
-
-// reserve reserves win from the available window capacity.
-// If no capacity remains, reserve will block. reserve may
-// return less than requested.
-func (w *window) reserve(win uint32) (uint32, error) {
-	var err error
-	w.L.Lock()
-	w.writeWaiters++
-	w.Broadcast()
-	for w.win == 0 && !w.closed {
-		w.Wait()
-	}
-	w.writeWaiters--
-	if w.win < win {
-		win = w.win
-	}
-	w.win -= win
-	if w.closed {
-		err = io.EOF
-	}
-	w.L.Unlock()
-	return win, err
-}
-
-// waitWriterBlocked waits until some goroutine is blocked for further
-// writes. It is used in tests only.
-func (w *window) waitWriterBlocked() {
-	w.Cond.L.Lock()
-	for w.writeWaiters == 0 {
-		w.Cond.Wait()
-	}
-	w.Cond.L.Unlock()
-}
diff --git a/vendor/golang.org/x/crypto/ssh/connection.go b/vendor/golang.org/x/crypto/ssh/connection.go
deleted file mode 100644
index 613a71a7b..000000000
--- a/vendor/golang.org/x/crypto/ssh/connection.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"fmt"
-	"net"
-)
-
-// OpenChannelError is returned if the other side rejects an
-// OpenChannel request.
-type OpenChannelError struct {
-	Reason  RejectionReason
-	Message string
-}
-
-func (e *OpenChannelError) Error() string {
-	return fmt.Sprintf("ssh: rejected: %s (%s)", e.Reason, e.Message)
-}
-
-// ConnMetadata holds metadata for the connection.
-type ConnMetadata interface {
-	// User returns the user ID for this connection.
-	User() string
-
-	// SessionID returns the session hash, also denoted by H.
-	SessionID() []byte
-
-	// ClientVersion returns the client's version string as hashed
-	// into the session ID.
-	ClientVersion() []byte
-
-	// ServerVersion returns the server's version string as hashed
-	// into the session ID.
-	ServerVersion() []byte
-
-	// RemoteAddr returns the remote address for this connection.
-	RemoteAddr() net.Addr
-
-	// LocalAddr returns the local address for this connection.
-	LocalAddr() net.Addr
-}
-
-// Conn represents an SSH connection for both server and client roles.
-// Conn is the basis for implementing an application layer, such
-// as ClientConn, which implements the traditional shell access for
-// clients.
-type Conn interface {
-	ConnMetadata
-
-	// SendRequest sends a global request, and returns the
-	// reply. If wantReply is true, it returns the response status
-	// and payload. See also RFC 4254, section 4.
-	SendRequest(name string, wantReply bool, payload []byte) (bool, []byte, error)
-
-	// OpenChannel tries to open an channel. If the request is
-	// rejected, it returns *OpenChannelError. On success it returns
-	// the SSH Channel and a Go channel for incoming, out-of-band
-	// requests. The Go channel must be serviced, or the
-	// connection will hang.
-	OpenChannel(name string, data []byte) (Channel, <-chan *Request, error)
-
-	// Close closes the underlying network connection
-	Close() error
-
-	// Wait blocks until the connection has shut down, and returns the
-	// error causing the shutdown.
-	Wait() error
-
-	// TODO(hanwen): consider exposing:
-	//   RequestKeyChange
-	//   Disconnect
-}
-
-// AlgorithmsConnMetadata is a ConnMetadata that can return the algorithms
-// negotiated between client and server.
-type AlgorithmsConnMetadata interface {
-	ConnMetadata
-	Algorithms() NegotiatedAlgorithms
-}
-
-// DiscardRequests consumes and rejects all requests from the
-// passed-in channel.
-func DiscardRequests(in <-chan *Request) {
-	for req := range in {
-		if req.WantReply {
-			req.Reply(false, nil)
-		}
-	}
-}
-
-// A connection represents an incoming connection.
-type connection struct {
-	transport *handshakeTransport
-	sshConn
-
-	// The connection protocol.
-	*mux
-}
-
-func (c *connection) Close() error {
-	return c.sshConn.conn.Close()
-}
-
-// sshConn provides net.Conn metadata, but disallows direct reads and
-// writes.
-type sshConn struct {
-	conn net.Conn
-
-	user          string
-	sessionID     []byte
-	clientVersion []byte
-	serverVersion []byte
-	algorithms    NegotiatedAlgorithms
-}
-
-func dup(src []byte) []byte {
-	dst := make([]byte, len(src))
-	copy(dst, src)
-	return dst
-}
-
-func (c *sshConn) User() string {
-	return c.user
-}
-
-func (c *sshConn) RemoteAddr() net.Addr {
-	return c.conn.RemoteAddr()
-}
-
-func (c *sshConn) Close() error {
-	return c.conn.Close()
-}
-
-func (c *sshConn) LocalAddr() net.Addr {
-	return c.conn.LocalAddr()
-}
-
-func (c *sshConn) SessionID() []byte {
-	return dup(c.sessionID)
-}
-
-func (c *sshConn) ClientVersion() []byte {
-	return dup(c.clientVersion)
-}
-
-func (c *sshConn) ServerVersion() []byte {
-	return dup(c.serverVersion)
-}
-
-func (c *sshConn) Algorithms() NegotiatedAlgorithms {
-	return c.algorithms
-}
diff --git a/vendor/golang.org/x/crypto/ssh/doc.go b/vendor/golang.org/x/crypto/ssh/doc.go
deleted file mode 100644
index 5b4de9eff..000000000
--- a/vendor/golang.org/x/crypto/ssh/doc.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package ssh implements an SSH client and server.
-
-SSH is a transport security protocol, an authentication protocol and a
-family of application protocols. The most typical application level
-protocol is a remote shell and this is specifically implemented.  However,
-the multiplexed nature of SSH is exposed to users that wish to support
-others.
-
-References:
-
-	[PROTOCOL]: https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=HEAD
-	[PROTOCOL.certkeys]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.certkeys?rev=HEAD
-	[SSH-PARAMETERS]:    http://www.iana.org/assignments/ssh-parameters/ssh-parameters.xml#ssh-parameters-1
-	[SSH-CERTS]:	https://datatracker.ietf.org/doc/html/draft-miller-ssh-cert-01
-	[FIPS 140-3 mode]: https://go.dev/doc/security/fips140
-
-This package does not fall under the stability promise of the Go language itself,
-so its API may be changed when pressing needs arise.
-
-# FIPS 140-3 mode
-
-When the program is in [FIPS 140-3 mode], this package behaves as if only SP
-800-140C and SP 800-140D approved cipher suites, signature algorithms,
-certificate public key types and sizes, and key exchange and derivation
-algorithms were implemented. Others are silently ignored and not negotiated, or
-rejected. This set may depend on the algorithms supported by the FIPS 140-3 Go
-Cryptographic Module selected with GOFIPS140, and may change across Go versions.
-*/
-package ssh
diff --git a/vendor/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go
deleted file mode 100644
index 4be3cbb6d..000000000
--- a/vendor/golang.org/x/crypto/ssh/handshake.go
+++ /dev/null
@@ -1,847 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"slices"
-	"strings"
-	"sync"
-)
-
-// debugHandshake, if set, prints messages sent and received.  Key
-// exchange messages are printed as if DH were used, so the debug
-// messages are wrong when using ECDH.
-const debugHandshake = false
-
-// chanSize sets the amount of buffering SSH connections. This is
-// primarily for testing: setting chanSize=0 uncovers deadlocks more
-// quickly.
-const chanSize = 16
-
-// maxPendingPackets sets the maximum number of packets to queue while waiting
-// for KEX to complete. This limits the total pending data to maxPendingPackets
-// * maxPacket bytes, which is ~16.8MB.
-const maxPendingPackets = 64
-
-// keyingTransport is a packet based transport that supports key
-// changes. It need not be thread-safe. It should pass through
-// msgNewKeys in both directions.
-type keyingTransport interface {
-	packetConn
-
-	// prepareKeyChange sets up a key change. The key change for a
-	// direction will be effected if a msgNewKeys message is sent
-	// or received.
-	prepareKeyChange(*NegotiatedAlgorithms, *kexResult) error
-
-	// setStrictMode sets the strict KEX mode, notably triggering
-	// sequence number resets on sending or receiving msgNewKeys.
-	// If the sequence number is already > 1 when setStrictMode
-	// is called, an error is returned.
-	setStrictMode() error
-
-	// setInitialKEXDone indicates to the transport that the initial key exchange
-	// was completed
-	setInitialKEXDone()
-}
-
-// handshakeTransport implements rekeying on top of a keyingTransport
-// and offers a thread-safe writePacket() interface.
-type handshakeTransport struct {
-	conn   keyingTransport
-	config *Config
-
-	serverVersion []byte
-	clientVersion []byte
-
-	// hostKeys is non-empty if we are the server. In that case,
-	// it contains all host keys that can be used to sign the
-	// connection.
-	hostKeys []Signer
-
-	// publicKeyAuthAlgorithms is non-empty if we are the server. In that case,
-	// it contains the supported client public key authentication algorithms.
-	publicKeyAuthAlgorithms []string
-
-	// hostKeyAlgorithms is non-empty if we are the client. In that case,
-	// we accept these key types from the server as host key.
-	hostKeyAlgorithms []string
-
-	// On read error, incoming is closed, and readError is set.
-	incoming  chan []byte
-	readError error
-
-	mu sync.Mutex
-	// Condition for the above mutex. It is used to notify a completed key
-	// exchange or a write failure. Writes can wait for this condition while a
-	// key exchange is in progress.
-	writeCond      *sync.Cond
-	writeError     error
-	sentInitPacket []byte
-	sentInitMsg    *kexInitMsg
-	// Used to queue writes when a key exchange is in progress. The length is
-	// limited by pendingPacketsSize. Once full, writes will block until the key
-	// exchange is completed or an error occurs. If not empty, it is emptied
-	// all at once when the key exchange is completed in kexLoop.
-	pendingPackets   [][]byte
-	writePacketsLeft uint32
-	writeBytesLeft   int64
-	userAuthComplete bool // whether the user authentication phase is complete
-
-	// If the read loop wants to schedule a kex, it pings this
-	// channel, and the write loop will send out a kex
-	// message.
-	requestKex chan struct{}
-
-	// If the other side requests or confirms a kex, its kexInit
-	// packet is sent here for the write loop to find it.
-	startKex    chan *pendingKex
-	kexLoopDone chan struct{} // closed (with writeError non-nil) when kexLoop exits
-
-	// data for host key checking
-	hostKeyCallback HostKeyCallback
-	dialAddress     string
-	remoteAddr      net.Addr
-
-	// bannerCallback is non-empty if we are the client and it has been set in
-	// ClientConfig. In that case it is called during the user authentication
-	// dance to handle a custom server's message.
-	bannerCallback BannerCallback
-
-	// Algorithms agreed in the last key exchange.
-	algorithms *NegotiatedAlgorithms
-
-	// Counters exclusively owned by readLoop.
-	readPacketsLeft uint32
-	readBytesLeft   int64
-
-	// The session ID or nil if first kex did not complete yet.
-	sessionID []byte
-
-	// strictMode indicates if the other side of the handshake indicated
-	// that we should be following the strict KEX protocol restrictions.
-	strictMode bool
-}
-
-type pendingKex struct {
-	otherInit []byte
-	done      chan error
-}
-
-func newHandshakeTransport(conn keyingTransport, config *Config, clientVersion, serverVersion []byte) *handshakeTransport {
-	t := &handshakeTransport{
-		conn:          conn,
-		serverVersion: serverVersion,
-		clientVersion: clientVersion,
-		incoming:      make(chan []byte, chanSize),
-		requestKex:    make(chan struct{}, 1),
-		startKex:      make(chan *pendingKex),
-		kexLoopDone:   make(chan struct{}),
-
-		config: config,
-	}
-	t.writeCond = sync.NewCond(&t.mu)
-	t.resetReadThresholds()
-	t.resetWriteThresholds()
-
-	// We always start with a mandatory key exchange.
-	t.requestKex <- struct{}{}
-	return t
-}
-
-func newClientTransport(conn keyingTransport, clientVersion, serverVersion []byte, config *ClientConfig, dialAddr string, addr net.Addr) *handshakeTransport {
-	t := newHandshakeTransport(conn, &config.Config, clientVersion, serverVersion)
-	t.dialAddress = dialAddr
-	t.remoteAddr = addr
-	t.hostKeyCallback = config.HostKeyCallback
-	t.bannerCallback = config.BannerCallback
-	if config.HostKeyAlgorithms != nil {
-		t.hostKeyAlgorithms = config.HostKeyAlgorithms
-	} else {
-		t.hostKeyAlgorithms = defaultHostKeyAlgos
-	}
-	go t.readLoop()
-	go t.kexLoop()
-	return t
-}
-
-func newServerTransport(conn keyingTransport, clientVersion, serverVersion []byte, config *ServerConfig) *handshakeTransport {
-	t := newHandshakeTransport(conn, &config.Config, clientVersion, serverVersion)
-	t.hostKeys = config.hostKeys
-	t.publicKeyAuthAlgorithms = config.PublicKeyAuthAlgorithms
-	go t.readLoop()
-	go t.kexLoop()
-	return t
-}
-
-func (t *handshakeTransport) getSessionID() []byte {
-	return t.sessionID
-}
-
-func (t *handshakeTransport) getAlgorithms() NegotiatedAlgorithms {
-	return *t.algorithms
-}
-
-// waitSession waits for the session to be established. This should be
-// the first thing to call after instantiating handshakeTransport.
-func (t *handshakeTransport) waitSession() error {
-	p, err := t.readPacket()
-	if err != nil {
-		return err
-	}
-	if p[0] != msgNewKeys {
-		return fmt.Errorf("ssh: first packet should be msgNewKeys")
-	}
-
-	return nil
-}
-
-func (t *handshakeTransport) id() string {
-	if len(t.hostKeys) > 0 {
-		return "server"
-	}
-	return "client"
-}
-
-func (t *handshakeTransport) printPacket(p []byte, write bool) {
-	action := "got"
-	if write {
-		action = "sent"
-	}
-
-	if p[0] == msgChannelData || p[0] == msgChannelExtendedData {
-		log.Printf("%s %s data (packet %d bytes)", t.id(), action, len(p))
-	} else {
-		msg, err := decode(p)
-		log.Printf("%s %s %T %v (%v)", t.id(), action, msg, msg, err)
-	}
-}
-
-func (t *handshakeTransport) readPacket() ([]byte, error) {
-	p, ok := <-t.incoming
-	if !ok {
-		return nil, t.readError
-	}
-	return p, nil
-}
-
-func (t *handshakeTransport) readLoop() {
-	first := true
-	for {
-		p, err := t.readOnePacket(first)
-		first = false
-		if err != nil {
-			t.readError = err
-			close(t.incoming)
-			break
-		}
-		// If this is the first kex, and strict KEX mode is enabled,
-		// we don't ignore any messages, as they may be used to manipulate
-		// the packet sequence numbers.
-		if !(t.sessionID == nil && t.strictMode) && (p[0] == msgIgnore || p[0] == msgDebug) {
-			continue
-		}
-		t.incoming <- p
-	}
-
-	// Stop writers too.
-	t.recordWriteError(t.readError)
-
-	// Unblock the writer should it wait for this.
-	close(t.startKex)
-
-	// Don't close t.requestKex; it's also written to from writePacket.
-}
-
-func (t *handshakeTransport) pushPacket(p []byte) error {
-	if debugHandshake {
-		t.printPacket(p, true)
-	}
-	return t.conn.writePacket(p)
-}
-
-func (t *handshakeTransport) getWriteError() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	return t.writeError
-}
-
-func (t *handshakeTransport) recordWriteError(err error) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.writeError == nil && err != nil {
-		t.writeError = err
-		t.writeCond.Broadcast()
-	}
-}
-
-func (t *handshakeTransport) requestKeyExchange() {
-	select {
-	case t.requestKex <- struct{}{}:
-	default:
-		// something already requested a kex, so do nothing.
-	}
-}
-
-func (t *handshakeTransport) resetWriteThresholds() {
-	t.writePacketsLeft = packetRekeyThreshold
-	if t.config.RekeyThreshold > 0 {
-		t.writeBytesLeft = int64(t.config.RekeyThreshold)
-	} else if t.algorithms != nil {
-		t.writeBytesLeft = t.algorithms.Write.rekeyBytes()
-	} else {
-		t.writeBytesLeft = 1 << 30
-	}
-}
-
-func (t *handshakeTransport) kexLoop() {
-
-write:
-	for t.getWriteError() == nil {
-		var request *pendingKex
-		var sent bool
-
-		for request == nil || !sent {
-			var ok bool
-			select {
-			case request, ok = <-t.startKex:
-				if !ok {
-					break write
-				}
-			case <-t.requestKex:
-				break
-			}
-
-			if !sent {
-				if err := t.sendKexInit(); err != nil {
-					t.recordWriteError(err)
-					break
-				}
-				sent = true
-			}
-		}
-
-		if err := t.getWriteError(); err != nil {
-			if request != nil {
-				request.done <- err
-			}
-			break
-		}
-
-		// We're not servicing t.requestKex, but that is OK:
-		// we never block on sending to t.requestKex.
-
-		// We're not servicing t.startKex, but the remote end
-		// has just sent us a kexInitMsg, so it can't send
-		// another key change request, until we close the done
-		// channel on the pendingKex request.
-
-		err := t.enterKeyExchange(request.otherInit)
-
-		t.mu.Lock()
-		t.writeError = err
-		t.sentInitPacket = nil
-		t.sentInitMsg = nil
-
-		t.resetWriteThresholds()
-
-		// we have completed the key exchange. Since the
-		// reader is still blocked, it is safe to clear out
-		// the requestKex channel. This avoids the situation
-		// where: 1) we consumed our own request for the
-		// initial kex, and 2) the kex from the remote side
-		// caused another send on the requestKex channel,
-	clear:
-		for {
-			select {
-			case <-t.requestKex:
-				//
-			default:
-				break clear
-			}
-		}
-
-		request.done <- t.writeError
-
-		// kex finished. Push packets that we received while
-		// the kex was in progress. Don't look at t.startKex
-		// and don't increment writtenSinceKex: if we trigger
-		// another kex while we are still busy with the last
-		// one, things will become very confusing.
-		for _, p := range t.pendingPackets {
-			t.writeError = t.pushPacket(p)
-			if t.writeError != nil {
-				break
-			}
-		}
-		t.pendingPackets = t.pendingPackets[:0]
-		// Unblock writePacket if waiting for KEX.
-		t.writeCond.Broadcast()
-		t.mu.Unlock()
-	}
-
-	// Unblock reader.
-	t.conn.Close()
-
-	// drain startKex channel. We don't service t.requestKex
-	// because nobody does blocking sends there.
-	for request := range t.startKex {
-		request.done <- t.getWriteError()
-	}
-
-	// Mark that the loop is done so that Close can return.
-	close(t.kexLoopDone)
-}
-
-// The protocol uses uint32 for packet counters, so we can't let them
-// reach 1<<32.  We will actually read and write more packets than
-// this, though: the other side may send more packets, and after we
-// hit this limit on writing we will send a few more packets for the
-// key exchange itself.
-const packetRekeyThreshold = (1 << 31)
-
-func (t *handshakeTransport) resetReadThresholds() {
-	t.readPacketsLeft = packetRekeyThreshold
-	if t.config.RekeyThreshold > 0 {
-		t.readBytesLeft = int64(t.config.RekeyThreshold)
-	} else if t.algorithms != nil {
-		t.readBytesLeft = t.algorithms.Read.rekeyBytes()
-	} else {
-		t.readBytesLeft = 1 << 30
-	}
-}
-
-func (t *handshakeTransport) readOnePacket(first bool) ([]byte, error) {
-	p, err := t.conn.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	if t.readPacketsLeft > 0 {
-		t.readPacketsLeft--
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if t.readBytesLeft > 0 {
-		t.readBytesLeft -= int64(len(p))
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if debugHandshake {
-		t.printPacket(p, false)
-	}
-
-	if first && p[0] != msgKexInit {
-		return nil, fmt.Errorf("ssh: first packet should be msgKexInit")
-	}
-
-	if p[0] != msgKexInit {
-		return p, nil
-	}
-
-	firstKex := t.sessionID == nil
-
-	kex := pendingKex{
-		done:      make(chan error, 1),
-		otherInit: p,
-	}
-	t.startKex <- &kex
-	err = <-kex.done
-
-	if debugHandshake {
-		log.Printf("%s exited key exchange (first %v), err %v", t.id(), firstKex, err)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	t.resetReadThresholds()
-
-	// By default, a key exchange is hidden from higher layers by
-	// translating it into msgIgnore.
-	successPacket := []byte{msgIgnore}
-	if firstKex {
-		// sendKexInit() for the first kex waits for
-		// msgNewKeys so the authentication process is
-		// guaranteed to happen over an encrypted transport.
-		successPacket = []byte{msgNewKeys}
-	}
-
-	return successPacket, nil
-}
-
-const (
-	kexStrictClient = "kex-strict-c-v00@openssh.com"
-	kexStrictServer = "kex-strict-s-v00@openssh.com"
-)
-
-// sendKexInit sends a key change message.
-func (t *handshakeTransport) sendKexInit() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.sentInitMsg != nil {
-		// kexInits may be sent either in response to the other side,
-		// or because our side wants to initiate a key change, so we
-		// may have already sent a kexInit. In that case, don't send a
-		// second kexInit.
-		return nil
-	}
-
-	msg := &kexInitMsg{
-		CiphersClientServer:     t.config.Ciphers,
-		CiphersServerClient:     t.config.Ciphers,
-		MACsClientServer:        t.config.MACs,
-		MACsServerClient:        t.config.MACs,
-		CompressionClientServer: supportedCompressions,
-		CompressionServerClient: supportedCompressions,
-	}
-	io.ReadFull(t.config.Rand, msg.Cookie[:])
-
-	// We mutate the KexAlgos slice, in order to add the kex-strict extension algorithm,
-	// and possibly to add the ext-info extension algorithm. Since the slice may be the
-	// user owned KeyExchanges, we create our own slice in order to avoid using user
-	// owned memory by mistake.
-	msg.KexAlgos = make([]string, 0, len(t.config.KeyExchanges)+2) // room for kex-strict and ext-info
-	msg.KexAlgos = append(msg.KexAlgos, t.config.KeyExchanges...)
-
-	isServer := len(t.hostKeys) > 0
-	if isServer {
-		for _, k := range t.hostKeys {
-			// If k is a MultiAlgorithmSigner, we restrict the signature
-			// algorithms. If k is a AlgorithmSigner, presume it supports all
-			// signature algorithms associated with the key format. If k is not
-			// an AlgorithmSigner, we can only assume it only supports the
-			// algorithms that matches the key format. (This means that Sign
-			// can't pick a different default).
-			keyFormat := k.PublicKey().Type()
-
-			switch s := k.(type) {
-			case MultiAlgorithmSigner:
-				for _, algo := range algorithmsForKeyFormat(keyFormat) {
-					if slices.Contains(s.Algorithms(), underlyingAlgo(algo)) {
-						msg.ServerHostKeyAlgos = append(msg.ServerHostKeyAlgos, algo)
-					}
-				}
-			case AlgorithmSigner:
-				msg.ServerHostKeyAlgos = append(msg.ServerHostKeyAlgos, algorithmsForKeyFormat(keyFormat)...)
-			default:
-				msg.ServerHostKeyAlgos = append(msg.ServerHostKeyAlgos, keyFormat)
-			}
-		}
-
-		if t.sessionID == nil {
-			msg.KexAlgos = append(msg.KexAlgos, kexStrictServer)
-		}
-	} else {
-		msg.ServerHostKeyAlgos = t.hostKeyAlgorithms
-
-		// As a client we opt in to receiving SSH_MSG_EXT_INFO so we know what
-		// algorithms the server supports for public key authentication. See RFC
-		// 8308, Section 2.1.
-		//
-		// We also send the strict KEX mode extension algorithm, in order to opt
-		// into the strict KEX mode.
-		if firstKeyExchange := t.sessionID == nil; firstKeyExchange {
-			msg.KexAlgos = append(msg.KexAlgos, "ext-info-c")
-			msg.KexAlgos = append(msg.KexAlgos, kexStrictClient)
-		}
-
-	}
-
-	packet := Marshal(msg)
-
-	// writePacket destroys the contents, so save a copy.
-	packetCopy := make([]byte, len(packet))
-	copy(packetCopy, packet)
-
-	if err := t.pushPacket(packetCopy); err != nil {
-		return err
-	}
-
-	t.sentInitMsg = msg
-	t.sentInitPacket = packet
-
-	return nil
-}
-
-var errSendBannerPhase = errors.New("ssh: SendAuthBanner outside of authentication phase")
-
-func (t *handshakeTransport) writePacket(p []byte) error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
-	switch p[0] {
-	case msgKexInit:
-		return errors.New("ssh: only handshakeTransport can send kexInit")
-	case msgNewKeys:
-		return errors.New("ssh: only handshakeTransport can send newKeys")
-	case msgUserAuthBanner:
-		if t.userAuthComplete {
-			return errSendBannerPhase
-		}
-	case msgUserAuthSuccess:
-		t.userAuthComplete = true
-	}
-
-	if t.writeError != nil {
-		return t.writeError
-	}
-
-	if t.sentInitMsg != nil {
-		if len(t.pendingPackets) < maxPendingPackets {
-			// Copy the packet so the writer can reuse the buffer.
-			cp := make([]byte, len(p))
-			copy(cp, p)
-			t.pendingPackets = append(t.pendingPackets, cp)
-			return nil
-		}
-		for t.sentInitMsg != nil {
-			// Block and wait for KEX to complete or an error.
-			t.writeCond.Wait()
-			if t.writeError != nil {
-				return t.writeError
-			}
-		}
-	}
-
-	if t.writeBytesLeft > 0 {
-		t.writeBytesLeft -= int64(len(p))
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if t.writePacketsLeft > 0 {
-		t.writePacketsLeft--
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if err := t.pushPacket(p); err != nil {
-		t.writeError = err
-		t.writeCond.Broadcast()
-	}
-
-	return nil
-}
-
-func (t *handshakeTransport) Close() error {
-	// Close the connection. This should cause the readLoop goroutine to wake up
-	// and close t.startKex, which will shut down kexLoop if running.
-	err := t.conn.Close()
-
-	// Wait for the kexLoop goroutine to complete.
-	// At that point we know that the readLoop goroutine is complete too,
-	// because kexLoop itself waits for readLoop to close the startKex channel.
-	<-t.kexLoopDone
-
-	return err
-}
-
-func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error {
-	if debugHandshake {
-		log.Printf("%s entered key exchange", t.id())
-	}
-
-	otherInit := &kexInitMsg{}
-	if err := Unmarshal(otherInitPacket, otherInit); err != nil {
-		return err
-	}
-
-	magics := handshakeMagics{
-		clientVersion: t.clientVersion,
-		serverVersion: t.serverVersion,
-		clientKexInit: otherInitPacket,
-		serverKexInit: t.sentInitPacket,
-	}
-
-	clientInit := otherInit
-	serverInit := t.sentInitMsg
-	isClient := len(t.hostKeys) == 0
-	if isClient {
-		clientInit, serverInit = serverInit, clientInit
-
-		magics.clientKexInit = t.sentInitPacket
-		magics.serverKexInit = otherInitPacket
-	}
-
-	var err error
-	t.algorithms, err = findAgreedAlgorithms(isClient, clientInit, serverInit)
-	if err != nil {
-		return err
-	}
-
-	if t.sessionID == nil && ((isClient && slices.Contains(serverInit.KexAlgos, kexStrictServer)) || (!isClient && slices.Contains(clientInit.KexAlgos, kexStrictClient))) {
-		t.strictMode = true
-		if err := t.conn.setStrictMode(); err != nil {
-			return err
-		}
-	}
-
-	// We don't send FirstKexFollows, but we handle receiving it.
-	//
-	// RFC 4253 section 7 defines the kex and the agreement method for
-	// first_kex_packet_follows. It states that the guessed packet
-	// should be ignored if the "kex algorithm and/or the host
-	// key algorithm is guessed wrong (server and client have
-	// different preferred algorithm), or if any of the other
-	// algorithms cannot be agreed upon". The other algorithms have
-	// already been checked above so the kex algorithm and host key
-	// algorithm are checked here.
-	if otherInit.FirstKexFollows && (clientInit.KexAlgos[0] != serverInit.KexAlgos[0] || clientInit.ServerHostKeyAlgos[0] != serverInit.ServerHostKeyAlgos[0]) {
-		// other side sent a kex message for the wrong algorithm,
-		// which we have to ignore.
-		if _, err := t.conn.readPacket(); err != nil {
-			return err
-		}
-	}
-
-	kex, ok := kexAlgoMap[t.algorithms.KeyExchange]
-	if !ok {
-		return fmt.Errorf("ssh: unexpected key exchange algorithm %v", t.algorithms.KeyExchange)
-	}
-
-	var result *kexResult
-	if len(t.hostKeys) > 0 {
-		result, err = t.server(kex, &magics)
-	} else {
-		result, err = t.client(kex, &magics)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	firstKeyExchange := t.sessionID == nil
-	if firstKeyExchange {
-		t.sessionID = result.H
-	}
-	result.SessionID = t.sessionID
-
-	if err := t.conn.prepareKeyChange(t.algorithms, result); err != nil {
-		return err
-	}
-	if err = t.conn.writePacket([]byte{msgNewKeys}); err != nil {
-		return err
-	}
-
-	// On the server side, after the first SSH_MSG_NEWKEYS, send a SSH_MSG_EXT_INFO
-	// message with the server-sig-algs extension if the client supports it. See
-	// RFC 8308, Sections 2.4 and 3.1, and [PROTOCOL], Section 1.9.
-	if !isClient && firstKeyExchange && slices.Contains(clientInit.KexAlgos, "ext-info-c") {
-		supportedPubKeyAuthAlgosList := strings.Join(t.publicKeyAuthAlgorithms, ",")
-		extInfo := &extInfoMsg{
-			NumExtensions: 2,
-			Payload:       make([]byte, 0, 4+15+4+len(supportedPubKeyAuthAlgosList)+4+16+4+1),
-		}
-		extInfo.Payload = appendInt(extInfo.Payload, len("server-sig-algs"))
-		extInfo.Payload = append(extInfo.Payload, "server-sig-algs"...)
-		extInfo.Payload = appendInt(extInfo.Payload, len(supportedPubKeyAuthAlgosList))
-		extInfo.Payload = append(extInfo.Payload, supportedPubKeyAuthAlgosList...)
-		extInfo.Payload = appendInt(extInfo.Payload, len("ping@openssh.com"))
-		extInfo.Payload = append(extInfo.Payload, "ping@openssh.com"...)
-		extInfo.Payload = appendInt(extInfo.Payload, 1)
-		extInfo.Payload = append(extInfo.Payload, "0"...)
-		if err := t.conn.writePacket(Marshal(extInfo)); err != nil {
-			return err
-		}
-	}
-
-	if packet, err := t.conn.readPacket(); err != nil {
-		return err
-	} else if packet[0] != msgNewKeys {
-		return unexpectedMessageError(msgNewKeys, packet[0])
-	}
-
-	if firstKeyExchange {
-		// Indicates to the transport that the first key exchange is completed
-		// after receiving SSH_MSG_NEWKEYS.
-		t.conn.setInitialKEXDone()
-	}
-
-	return nil
-}
-
-// algorithmSignerWrapper is an AlgorithmSigner that only supports the default
-// key format algorithm.
-//
-// This is technically a violation of the AlgorithmSigner interface, but it
-// should be unreachable given where we use this. Anyway, at least it returns an
-// error instead of panicing or producing an incorrect signature.
-type algorithmSignerWrapper struct {
-	Signer
-}
-
-func (a algorithmSignerWrapper) SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*Signature, error) {
-	if algorithm != underlyingAlgo(a.PublicKey().Type()) {
-		return nil, errors.New("ssh: internal error: algorithmSignerWrapper invoked with non-default algorithm")
-	}
-	return a.Sign(rand, data)
-}
-
-func pickHostKey(hostKeys []Signer, algo string) AlgorithmSigner {
-	for _, k := range hostKeys {
-		if s, ok := k.(MultiAlgorithmSigner); ok {
-			if !slices.Contains(s.Algorithms(), underlyingAlgo(algo)) {
-				continue
-			}
-		}
-
-		if algo == k.PublicKey().Type() {
-			return algorithmSignerWrapper{k}
-		}
-
-		k, ok := k.(AlgorithmSigner)
-		if !ok {
-			continue
-		}
-		for _, a := range algorithmsForKeyFormat(k.PublicKey().Type()) {
-			if algo == a {
-				return k
-			}
-		}
-	}
-	return nil
-}
-
-func (t *handshakeTransport) server(kex kexAlgorithm, magics *handshakeMagics) (*kexResult, error) {
-	hostKey := pickHostKey(t.hostKeys, t.algorithms.HostKey)
-	if hostKey == nil {
-		return nil, errors.New("ssh: internal error: negotiated unsupported signature type")
-	}
-
-	r, err := kex.Server(t.conn, t.config.Rand, magics, hostKey, t.algorithms.HostKey)
-	return r, err
-}
-
-func (t *handshakeTransport) client(kex kexAlgorithm, magics *handshakeMagics) (*kexResult, error) {
-	result, err := kex.Client(t.conn, t.config.Rand, magics)
-	if err != nil {
-		return nil, err
-	}
-
-	hostKey, err := ParsePublicKey(result.HostKey)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := verifyHostKeySignature(hostKey, t.algorithms.HostKey, result); err != nil {
-		return nil, err
-	}
-
-	err = t.hostKeyCallback(t.dialAddress, t.remoteAddr, hostKey)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
diff --git a/vendor/golang.org/x/crypto/ssh/internal/bcrypt_pbkdf/bcrypt_pbkdf.go b/vendor/golang.org/x/crypto/ssh/internal/bcrypt_pbkdf/bcrypt_pbkdf.go
deleted file mode 100644
index af81d2665..000000000
--- a/vendor/golang.org/x/crypto/ssh/internal/bcrypt_pbkdf/bcrypt_pbkdf.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package bcrypt_pbkdf implements bcrypt_pbkdf(3) from OpenBSD.
-//
-// See https://flak.tedunangst.com/post/bcrypt-pbkdf and
-// https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libutil/bcrypt_pbkdf.c.
-package bcrypt_pbkdf
-
-import (
-	"crypto/sha512"
-	"errors"
-	"golang.org/x/crypto/blowfish"
-)
-
-const blockSize = 32
-
-// Key derives a key from the password, salt and rounds count, returning a
-// []byte of length keyLen that can be used as cryptographic key.
-func Key(password, salt []byte, rounds, keyLen int) ([]byte, error) {
-	if rounds < 1 {
-		return nil, errors.New("bcrypt_pbkdf: number of rounds is too small")
-	}
-	if len(password) == 0 {
-		return nil, errors.New("bcrypt_pbkdf: empty password")
-	}
-	if len(salt) == 0 || len(salt) > 1<<20 {
-		return nil, errors.New("bcrypt_pbkdf: bad salt length")
-	}
-	if keyLen > 1024 {
-		return nil, errors.New("bcrypt_pbkdf: keyLen is too large")
-	}
-
-	numBlocks := (keyLen + blockSize - 1) / blockSize
-	key := make([]byte, numBlocks*blockSize)
-
-	h := sha512.New()
-	h.Write(password)
-	shapass := h.Sum(nil)
-
-	shasalt := make([]byte, 0, sha512.Size)
-	cnt, tmp := make([]byte, 4), make([]byte, blockSize)
-	for block := 1; block <= numBlocks; block++ {
-		h.Reset()
-		h.Write(salt)
-		cnt[0] = byte(block >> 24)
-		cnt[1] = byte(block >> 16)
-		cnt[2] = byte(block >> 8)
-		cnt[3] = byte(block)
-		h.Write(cnt)
-		bcryptHash(tmp, shapass, h.Sum(shasalt))
-
-		out := make([]byte, blockSize)
-		copy(out, tmp)
-		for i := 2; i <= rounds; i++ {
-			h.Reset()
-			h.Write(tmp)
-			bcryptHash(tmp, shapass, h.Sum(shasalt))
-			for j := 0; j < len(out); j++ {
-				out[j] ^= tmp[j]
-			}
-		}
-
-		for i, v := range out {
-			key[i*numBlocks+(block-1)] = v
-		}
-	}
-	return key[:keyLen], nil
-}
-
-var magic = []byte("OxychromaticBlowfishSwatDynamite")
-
-func bcryptHash(out, shapass, shasalt []byte) {
-	c, err := blowfish.NewSaltedCipher(shapass, shasalt)
-	if err != nil {
-		panic(err)
-	}
-	for i := 0; i < 64; i++ {
-		blowfish.ExpandKey(shasalt, c)
-		blowfish.ExpandKey(shapass, c)
-	}
-	copy(out, magic)
-	for i := 0; i < 32; i += 8 {
-		for j := 0; j < 64; j++ {
-			c.Encrypt(out[i:i+8], out[i:i+8])
-		}
-	}
-	// Swap bytes due to different endianness.
-	for i := 0; i < 32; i += 4 {
-		out[i+3], out[i+2], out[i+1], out[i] = out[i], out[i+1], out[i+2], out[i+3]
-	}
-}
diff --git a/vendor/golang.org/x/crypto/ssh/kex.go b/vendor/golang.org/x/crypto/ssh/kex.go
deleted file mode 100644
index 5f7fdd851..000000000
--- a/vendor/golang.org/x/crypto/ssh/kex.go
+++ /dev/null
@@ -1,807 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/fips140"
-	"crypto/rand"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"slices"
-
-	"golang.org/x/crypto/curve25519"
-)
-
-const (
-	// This is the group called diffie-hellman-group1-sha1 in RFC 4253 and
-	// Oakley Group 2 in RFC 2409.
-	oakleyGroup2 = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF"
-	// This is the group called diffie-hellman-group14-sha1 in RFC 4253 and
-	// Oakley Group 14 in RFC 3526.
-	oakleyGroup14 = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF"
-	// This is the group called diffie-hellman-group15-sha512 in RFC 8268 and
-	// Oakley Group 15 in RFC 3526.
-	oakleyGroup15 = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF"
-	// This is the group called diffie-hellman-group16-sha512 in RFC 8268 and
-	// Oakley Group 16 in RFC 3526.
-	oakleyGroup16 = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF"
-)
-
-// kexResult captures the outcome of a key exchange.
-type kexResult struct {
-	// Session hash. See also RFC 4253, section 8.
-	H []byte
-
-	// Shared secret. See also RFC 4253, section 8.
-	K []byte
-
-	// Host key as hashed into H.
-	HostKey []byte
-
-	// Signature of H.
-	Signature []byte
-
-	// A cryptographic hash function that matches the security
-	// level of the key exchange algorithm. It is used for
-	// calculating H, and for deriving keys from H and K.
-	Hash crypto.Hash
-
-	// The session ID, which is the first H computed. This is used
-	// to derive key material inside the transport.
-	SessionID []byte
-}
-
-// handshakeMagics contains data that is always included in the
-// session hash.
-type handshakeMagics struct {
-	clientVersion, serverVersion []byte
-	clientKexInit, serverKexInit []byte
-}
-
-func (m *handshakeMagics) write(w io.Writer) {
-	writeString(w, m.clientVersion)
-	writeString(w, m.serverVersion)
-	writeString(w, m.clientKexInit)
-	writeString(w, m.serverKexInit)
-}
-
-// kexAlgorithm abstracts different key exchange algorithms.
-type kexAlgorithm interface {
-	// Server runs server-side key agreement, signing the result
-	// with a hostkey. algo is the negotiated algorithm, and may
-	// be a certificate type.
-	Server(p packetConn, rand io.Reader, magics *handshakeMagics, s AlgorithmSigner, algo string) (*kexResult, error)
-
-	// Client runs the client-side key agreement. Caller is
-	// responsible for verifying the host key signature.
-	Client(p packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error)
-}
-
-// dhGroup is a multiplicative group suitable for implementing Diffie-Hellman key agreement.
-type dhGroup struct {
-	g, p, pMinus1 *big.Int
-	hashFunc      crypto.Hash
-}
-
-func (group *dhGroup) diffieHellman(theirPublic, myPrivate *big.Int) (*big.Int, error) {
-	if theirPublic.Cmp(bigOne) <= 0 || theirPublic.Cmp(group.pMinus1) >= 0 {
-		return nil, errors.New("ssh: DH parameter out of bounds")
-	}
-	return new(big.Int).Exp(theirPublic, myPrivate, group.p), nil
-}
-
-func (group *dhGroup) Client(c packetConn, randSource io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	var x *big.Int
-	for {
-		var err error
-		if x, err = rand.Int(randSource, group.pMinus1); err != nil {
-			return nil, err
-		}
-		if x.Sign() > 0 {
-			break
-		}
-	}
-
-	X := new(big.Int).Exp(group.g, x, group.p)
-	kexDHInit := kexDHInitMsg{
-		X: X,
-	}
-	if err := c.writePacket(Marshal(&kexDHInit)); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var kexDHReply kexDHReplyMsg
-	if err = Unmarshal(packet, &kexDHReply); err != nil {
-		return nil, err
-	}
-
-	ki, err := group.diffieHellman(kexDHReply.Y, x)
-	if err != nil {
-		return nil, err
-	}
-
-	h := group.hashFunc.New()
-	magics.write(h)
-	writeString(h, kexDHReply.HostKey)
-	writeInt(h, X)
-	writeInt(h, kexDHReply.Y)
-	K := make([]byte, intLength(ki))
-	marshalInt(K, ki)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   kexDHReply.HostKey,
-		Signature: kexDHReply.Signature,
-		Hash:      group.hashFunc,
-	}, nil
-}
-
-func (group *dhGroup) Server(c packetConn, randSource io.Reader, magics *handshakeMagics, priv AlgorithmSigner, algo string) (result *kexResult, err error) {
-	packet, err := c.readPacket()
-	if err != nil {
-		return
-	}
-	var kexDHInit kexDHInitMsg
-	if err = Unmarshal(packet, &kexDHInit); err != nil {
-		return
-	}
-
-	var y *big.Int
-	for {
-		if y, err = rand.Int(randSource, group.pMinus1); err != nil {
-			return
-		}
-		if y.Sign() > 0 {
-			break
-		}
-	}
-
-	Y := new(big.Int).Exp(group.g, y, group.p)
-	ki, err := group.diffieHellman(kexDHInit.X, y)
-	if err != nil {
-		return nil, err
-	}
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	h := group.hashFunc.New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeInt(h, kexDHInit.X)
-	writeInt(h, Y)
-
-	K := make([]byte, intLength(ki))
-	marshalInt(K, ki)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	// H is already a hash, but the hostkey signing will apply its
-	// own key-specific hash algorithm.
-	sig, err := signAndMarshal(priv, randSource, H, algo)
-	if err != nil {
-		return nil, err
-	}
-
-	kexDHReply := kexDHReplyMsg{
-		HostKey:   hostKeyBytes,
-		Y:         Y,
-		Signature: sig,
-	}
-	packet = Marshal(&kexDHReply)
-
-	err = c.writePacket(packet)
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   hostKeyBytes,
-		Signature: sig,
-		Hash:      group.hashFunc,
-	}, err
-}
-
-// ecdh performs Elliptic Curve Diffie-Hellman key exchange as
-// described in RFC 5656, section 4.
-type ecdh struct {
-	curve elliptic.Curve
-}
-
-func (kex *ecdh) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	ephKey, err := ecdsa.GenerateKey(kex.curve, rand)
-	if err != nil {
-		return nil, err
-	}
-
-	kexInit := kexECDHInitMsg{
-		ClientPubKey: elliptic.Marshal(kex.curve, ephKey.PublicKey.X, ephKey.PublicKey.Y),
-	}
-
-	serialized := Marshal(&kexInit)
-	if err := c.writePacket(serialized); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var reply kexECDHReplyMsg
-	if err = Unmarshal(packet, &reply); err != nil {
-		return nil, err
-	}
-
-	x, y, err := unmarshalECKey(kex.curve, reply.EphemeralPubKey)
-	if err != nil {
-		return nil, err
-	}
-
-	// generate shared secret
-	secret, _ := kex.curve.ScalarMult(x, y, ephKey.D.Bytes())
-
-	h := ecHash(kex.curve).New()
-	magics.write(h)
-	writeString(h, reply.HostKey)
-	writeString(h, kexInit.ClientPubKey)
-	writeString(h, reply.EphemeralPubKey)
-	K := make([]byte, intLength(secret))
-	marshalInt(K, secret)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: reply.Signature,
-		Hash:      ecHash(kex.curve),
-	}, nil
-}
-
-// unmarshalECKey parses and checks an EC key.
-func unmarshalECKey(curve elliptic.Curve, pubkey []byte) (x, y *big.Int, err error) {
-	x, y = elliptic.Unmarshal(curve, pubkey)
-	if x == nil {
-		return nil, nil, errors.New("ssh: elliptic.Unmarshal failure")
-	}
-	if !validateECPublicKey(curve, x, y) {
-		return nil, nil, errors.New("ssh: public key not on curve")
-	}
-	return x, y, nil
-}
-
-// validateECPublicKey checks that the point is a valid public key for
-// the given curve. See [SEC1], 3.2.2
-func validateECPublicKey(curve elliptic.Curve, x, y *big.Int) bool {
-	if x.Sign() == 0 && y.Sign() == 0 {
-		return false
-	}
-
-	if x.Cmp(curve.Params().P) >= 0 {
-		return false
-	}
-
-	if y.Cmp(curve.Params().P) >= 0 {
-		return false
-	}
-
-	if !curve.IsOnCurve(x, y) {
-		return false
-	}
-
-	// We don't check if N * PubKey == 0, since
-	//
-	// - the NIST curves have cofactor = 1, so this is implicit.
-	// (We don't foresee an implementation that supports non NIST
-	// curves)
-	//
-	// - for ephemeral keys, we don't need to worry about small
-	// subgroup attacks.
-	return true
-}
-
-func (kex *ecdh) Server(c packetConn, rand io.Reader, magics *handshakeMagics, priv AlgorithmSigner, algo string) (result *kexResult, err error) {
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var kexECDHInit kexECDHInitMsg
-	if err = Unmarshal(packet, &kexECDHInit); err != nil {
-		return nil, err
-	}
-
-	clientX, clientY, err := unmarshalECKey(kex.curve, kexECDHInit.ClientPubKey)
-	if err != nil {
-		return nil, err
-	}
-
-	// We could cache this key across multiple users/multiple
-	// connection attempts, but the benefit is small. OpenSSH
-	// generates a new key for each incoming connection.
-	ephKey, err := ecdsa.GenerateKey(kex.curve, rand)
-	if err != nil {
-		return nil, err
-	}
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	serializedEphKey := elliptic.Marshal(kex.curve, ephKey.PublicKey.X, ephKey.PublicKey.Y)
-
-	// generate shared secret
-	secret, _ := kex.curve.ScalarMult(clientX, clientY, ephKey.D.Bytes())
-
-	h := ecHash(kex.curve).New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeString(h, kexECDHInit.ClientPubKey)
-	writeString(h, serializedEphKey)
-
-	K := make([]byte, intLength(secret))
-	marshalInt(K, secret)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	// H is already a hash, but the hostkey signing will apply its
-	// own key-specific hash algorithm.
-	sig, err := signAndMarshal(priv, rand, H, algo)
-	if err != nil {
-		return nil, err
-	}
-
-	reply := kexECDHReplyMsg{
-		EphemeralPubKey: serializedEphKey,
-		HostKey:         hostKeyBytes,
-		Signature:       sig,
-	}
-
-	serialized := Marshal(&reply)
-	if err := c.writePacket(serialized); err != nil {
-		return nil, err
-	}
-
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: sig,
-		Hash:      ecHash(kex.curve),
-	}, nil
-}
-
-// ecHash returns the hash to match the given elliptic curve, see RFC
-// 5656, section 6.2.1
-func ecHash(curve elliptic.Curve) crypto.Hash {
-	bitSize := curve.Params().BitSize
-	switch {
-	case bitSize <= 256:
-		return crypto.SHA256
-	case bitSize <= 384:
-		return crypto.SHA384
-	}
-	return crypto.SHA512
-}
-
-// kexAlgoMap defines the supported KEXs. KEXs not included are not supported
-// and will not be negotiated, even if explicitly configured. When FIPS mode is
-// enabled, only FIPS-approved algorithms are included.
-var kexAlgoMap = map[string]kexAlgorithm{}
-
-func init() {
-	// mlkem768x25519-sha256 we'll work with fips140=on but not fips140=only
-	// until Go 1.26.
-	kexAlgoMap[KeyExchangeMLKEM768X25519] = &mlkem768WithCurve25519sha256{}
-	kexAlgoMap[KeyExchangeECDHP521] = &ecdh{elliptic.P521()}
-	kexAlgoMap[KeyExchangeECDHP384] = &ecdh{elliptic.P384()}
-	kexAlgoMap[KeyExchangeECDHP256] = &ecdh{elliptic.P256()}
-
-	if fips140.Enabled() {
-		defaultKexAlgos = slices.DeleteFunc(defaultKexAlgos, func(algo string) bool {
-			_, ok := kexAlgoMap[algo]
-			return !ok
-		})
-		return
-	}
-
-	p, _ := new(big.Int).SetString(oakleyGroup2, 16)
-	kexAlgoMap[InsecureKeyExchangeDH1SHA1] = &dhGroup{
-		g:        new(big.Int).SetInt64(2),
-		p:        p,
-		pMinus1:  new(big.Int).Sub(p, bigOne),
-		hashFunc: crypto.SHA1,
-	}
-
-	p, _ = new(big.Int).SetString(oakleyGroup14, 16)
-	group14 := &dhGroup{
-		g:       new(big.Int).SetInt64(2),
-		p:       p,
-		pMinus1: new(big.Int).Sub(p, bigOne),
-	}
-
-	kexAlgoMap[InsecureKeyExchangeDH14SHA1] = &dhGroup{
-		g: group14.g, p: group14.p, pMinus1: group14.pMinus1,
-		hashFunc: crypto.SHA1,
-	}
-	kexAlgoMap[KeyExchangeDH14SHA256] = &dhGroup{
-		g: group14.g, p: group14.p, pMinus1: group14.pMinus1,
-		hashFunc: crypto.SHA256,
-	}
-
-	p, _ = new(big.Int).SetString(oakleyGroup16, 16)
-
-	kexAlgoMap[KeyExchangeDH16SHA512] = &dhGroup{
-		g:        new(big.Int).SetInt64(2),
-		p:        p,
-		pMinus1:  new(big.Int).Sub(p, bigOne),
-		hashFunc: crypto.SHA512,
-	}
-
-	kexAlgoMap[KeyExchangeCurve25519] = &curve25519sha256{}
-	kexAlgoMap[keyExchangeCurve25519LibSSH] = &curve25519sha256{}
-	kexAlgoMap[InsecureKeyExchangeDHGEXSHA1] = &dhGEXSHA{hashFunc: crypto.SHA1}
-	kexAlgoMap[KeyExchangeDHGEXSHA256] = &dhGEXSHA{hashFunc: crypto.SHA256}
-}
-
-// curve25519sha256 implements the curve25519-sha256 (formerly known as
-// curve25519-sha256@libssh.org) key exchange method, as described in RFC 8731.
-type curve25519sha256 struct{}
-
-type curve25519KeyPair struct {
-	priv [32]byte
-	pub  [32]byte
-}
-
-func (kp *curve25519KeyPair) generate(rand io.Reader) error {
-	if _, err := io.ReadFull(rand, kp.priv[:]); err != nil {
-		return err
-	}
-	p, err := curve25519.X25519(kp.priv[:], curve25519.Basepoint)
-	if err != nil {
-		return fmt.Errorf("curve25519: %w", err)
-	}
-	if len(p) != 32 {
-		return fmt.Errorf("curve25519: internal error: X25519 returned %d bytes, expected 32", len(p))
-	}
-	copy(kp.pub[:], p)
-	return nil
-}
-
-func (kex *curve25519sha256) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	var kp curve25519KeyPair
-	if err := kp.generate(rand); err != nil {
-		return nil, err
-	}
-	if err := c.writePacket(Marshal(&kexECDHInitMsg{kp.pub[:]})); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var reply kexECDHReplyMsg
-	if err = Unmarshal(packet, &reply); err != nil {
-		return nil, err
-	}
-	if len(reply.EphemeralPubKey) != 32 {
-		return nil, errors.New("ssh: peer's curve25519 public value has wrong length")
-	}
-
-	secret, err := curve25519.X25519(kp.priv[:], reply.EphemeralPubKey)
-	if err != nil {
-		return nil, fmt.Errorf("ssh: peer's curve25519 public value is not valid: %w", err)
-	}
-
-	h := crypto.SHA256.New()
-	magics.write(h)
-	writeString(h, reply.HostKey)
-	writeString(h, kp.pub[:])
-	writeString(h, reply.EphemeralPubKey)
-
-	ki := new(big.Int).SetBytes(secret[:])
-	K := make([]byte, intLength(ki))
-	marshalInt(K, ki)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: reply.Signature,
-		Hash:      crypto.SHA256,
-	}, nil
-}
-
-func (kex *curve25519sha256) Server(c packetConn, rand io.Reader, magics *handshakeMagics, priv AlgorithmSigner, algo string) (result *kexResult, err error) {
-	packet, err := c.readPacket()
-	if err != nil {
-		return
-	}
-	var kexInit kexECDHInitMsg
-	if err = Unmarshal(packet, &kexInit); err != nil {
-		return
-	}
-
-	if len(kexInit.ClientPubKey) != 32 {
-		return nil, errors.New("ssh: peer's curve25519 public value has wrong length")
-	}
-
-	var kp curve25519KeyPair
-	if err := kp.generate(rand); err != nil {
-		return nil, err
-	}
-
-	secret, err := curve25519.X25519(kp.priv[:], kexInit.ClientPubKey)
-	if err != nil {
-		return nil, fmt.Errorf("ssh: peer's curve25519 public value is not valid: %w", err)
-	}
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	h := crypto.SHA256.New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeString(h, kexInit.ClientPubKey)
-	writeString(h, kp.pub[:])
-
-	ki := new(big.Int).SetBytes(secret[:])
-	K := make([]byte, intLength(ki))
-	marshalInt(K, ki)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	sig, err := signAndMarshal(priv, rand, H, algo)
-	if err != nil {
-		return nil, err
-	}
-
-	reply := kexECDHReplyMsg{
-		EphemeralPubKey: kp.pub[:],
-		HostKey:         hostKeyBytes,
-		Signature:       sig,
-	}
-	if err := c.writePacket(Marshal(&reply)); err != nil {
-		return nil, err
-	}
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   hostKeyBytes,
-		Signature: sig,
-		Hash:      crypto.SHA256,
-	}, nil
-}
-
-// dhGEXSHA implements the diffie-hellman-group-exchange-sha1 and
-// diffie-hellman-group-exchange-sha256 key agreement protocols,
-// as described in RFC 4419
-type dhGEXSHA struct {
-	hashFunc crypto.Hash
-}
-
-const (
-	dhGroupExchangeMinimumBits   = 2048
-	dhGroupExchangePreferredBits = 2048
-	dhGroupExchangeMaximumBits   = 8192
-)
-
-func (gex *dhGEXSHA) Client(c packetConn, randSource io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	// Send GexRequest
-	kexDHGexRequest := kexDHGexRequestMsg{
-		MinBits:       dhGroupExchangeMinimumBits,
-		PreferredBits: dhGroupExchangePreferredBits,
-		MaxBits:       dhGroupExchangeMaximumBits,
-	}
-	if err := c.writePacket(Marshal(&kexDHGexRequest)); err != nil {
-		return nil, err
-	}
-
-	// Receive GexGroup
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var msg kexDHGexGroupMsg
-	if err = Unmarshal(packet, &msg); err != nil {
-		return nil, err
-	}
-
-	// reject if p's bit length < dhGroupExchangeMinimumBits or > dhGroupExchangeMaximumBits
-	if msg.P.BitLen() < dhGroupExchangeMinimumBits || msg.P.BitLen() > dhGroupExchangeMaximumBits {
-		return nil, fmt.Errorf("ssh: server-generated gex p is out of range (%d bits)", msg.P.BitLen())
-	}
-
-	// Check if g is safe by verifying that 1 < g < p-1
-	pMinusOne := new(big.Int).Sub(msg.P, bigOne)
-	if msg.G.Cmp(bigOne) <= 0 || msg.G.Cmp(pMinusOne) >= 0 {
-		return nil, fmt.Errorf("ssh: server provided gex g is not safe")
-	}
-
-	// Send GexInit
-	pHalf := new(big.Int).Rsh(msg.P, 1)
-	x, err := rand.Int(randSource, pHalf)
-	if err != nil {
-		return nil, err
-	}
-	X := new(big.Int).Exp(msg.G, x, msg.P)
-	kexDHGexInit := kexDHGexInitMsg{
-		X: X,
-	}
-	if err := c.writePacket(Marshal(&kexDHGexInit)); err != nil {
-		return nil, err
-	}
-
-	// Receive GexReply
-	packet, err = c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var kexDHGexReply kexDHGexReplyMsg
-	if err = Unmarshal(packet, &kexDHGexReply); err != nil {
-		return nil, err
-	}
-
-	if kexDHGexReply.Y.Cmp(bigOne) <= 0 || kexDHGexReply.Y.Cmp(pMinusOne) >= 0 {
-		return nil, errors.New("ssh: DH parameter out of bounds")
-	}
-	kInt := new(big.Int).Exp(kexDHGexReply.Y, x, msg.P)
-
-	// Check if k is safe by verifying that k > 1 and k < p - 1
-	if kInt.Cmp(bigOne) <= 0 || kInt.Cmp(pMinusOne) >= 0 {
-		return nil, fmt.Errorf("ssh: derived k is not safe")
-	}
-
-	h := gex.hashFunc.New()
-	magics.write(h)
-	writeString(h, kexDHGexReply.HostKey)
-	binary.Write(h, binary.BigEndian, uint32(dhGroupExchangeMinimumBits))
-	binary.Write(h, binary.BigEndian, uint32(dhGroupExchangePreferredBits))
-	binary.Write(h, binary.BigEndian, uint32(dhGroupExchangeMaximumBits))
-	writeInt(h, msg.P)
-	writeInt(h, msg.G)
-	writeInt(h, X)
-	writeInt(h, kexDHGexReply.Y)
-	K := make([]byte, intLength(kInt))
-	marshalInt(K, kInt)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   kexDHGexReply.HostKey,
-		Signature: kexDHGexReply.Signature,
-		Hash:      gex.hashFunc,
-	}, nil
-}
-
-// Server half implementation of the Diffie Hellman Key Exchange with SHA1 and SHA256.
-func (gex *dhGEXSHA) Server(c packetConn, randSource io.Reader, magics *handshakeMagics, priv AlgorithmSigner, algo string) (result *kexResult, err error) {
-	// Receive GexRequest
-	packet, err := c.readPacket()
-	if err != nil {
-		return
-	}
-	var kexDHGexRequest kexDHGexRequestMsg
-	if err = Unmarshal(packet, &kexDHGexRequest); err != nil {
-		return
-	}
-	// We check that the request received is valid and that the MaxBits
-	// requested are at least equal to our supported minimum. This is the same
-	// check done in OpenSSH:
-	// https://github.com/openssh/openssh-portable/blob/80a2f64b/kexgexs.c#L94
-	//
-	// Furthermore, we also check that the required MinBits are less than or
-	// equal to 4096 because we can use up to Oakley Group 16.
-	if kexDHGexRequest.MaxBits < kexDHGexRequest.MinBits || kexDHGexRequest.PreferredBits < kexDHGexRequest.MinBits ||
-		kexDHGexRequest.MaxBits < kexDHGexRequest.PreferredBits || kexDHGexRequest.MaxBits < dhGroupExchangeMinimumBits ||
-		kexDHGexRequest.MinBits > 4096 {
-		return nil, fmt.Errorf("ssh: DH GEX request out of range, min: %d, max: %d, preferred: %d", kexDHGexRequest.MinBits,
-			kexDHGexRequest.MaxBits, kexDHGexRequest.PreferredBits)
-	}
-
-	var p *big.Int
-	// We hardcode sending Oakley Group 14 (2048 bits), Oakley Group 15 (3072
-	// bits) or Oakley Group 16 (4096 bits), based on the requested max size.
-	if kexDHGexRequest.MaxBits < 3072 {
-		p, _ = new(big.Int).SetString(oakleyGroup14, 16)
-	} else if kexDHGexRequest.MaxBits < 4096 {
-		p, _ = new(big.Int).SetString(oakleyGroup15, 16)
-	} else {
-		p, _ = new(big.Int).SetString(oakleyGroup16, 16)
-	}
-
-	g := big.NewInt(2)
-	msg := &kexDHGexGroupMsg{
-		P: p,
-		G: g,
-	}
-	if err := c.writePacket(Marshal(msg)); err != nil {
-		return nil, err
-	}
-
-	// Receive GexInit
-	packet, err = c.readPacket()
-	if err != nil {
-		return
-	}
-	var kexDHGexInit kexDHGexInitMsg
-	if err = Unmarshal(packet, &kexDHGexInit); err != nil {
-		return
-	}
-
-	pHalf := new(big.Int).Rsh(p, 1)
-
-	y, err := rand.Int(randSource, pHalf)
-	if err != nil {
-		return
-	}
-	Y := new(big.Int).Exp(g, y, p)
-
-	pMinusOne := new(big.Int).Sub(p, bigOne)
-	if kexDHGexInit.X.Cmp(bigOne) <= 0 || kexDHGexInit.X.Cmp(pMinusOne) >= 0 {
-		return nil, errors.New("ssh: DH parameter out of bounds")
-	}
-	kInt := new(big.Int).Exp(kexDHGexInit.X, y, p)
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	h := gex.hashFunc.New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	binary.Write(h, binary.BigEndian, kexDHGexRequest.MinBits)
-	binary.Write(h, binary.BigEndian, kexDHGexRequest.PreferredBits)
-	binary.Write(h, binary.BigEndian, kexDHGexRequest.MaxBits)
-	writeInt(h, p)
-	writeInt(h, g)
-	writeInt(h, kexDHGexInit.X)
-	writeInt(h, Y)
-
-	K := make([]byte, intLength(kInt))
-	marshalInt(K, kInt)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	// H is already a hash, but the hostkey signing will apply its
-	// own key-specific hash algorithm.
-	sig, err := signAndMarshal(priv, randSource, H, algo)
-	if err != nil {
-		return nil, err
-	}
-
-	kexDHGexReply := kexDHGexReplyMsg{
-		HostKey:   hostKeyBytes,
-		Y:         Y,
-		Signature: sig,
-	}
-	packet = Marshal(&kexDHGexReply)
-
-	err = c.writePacket(packet)
-
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   hostKeyBytes,
-		Signature: sig,
-		Hash:      gex.hashFunc,
-	}, err
-}
diff --git a/vendor/golang.org/x/crypto/ssh/keys.go b/vendor/golang.org/x/crypto/ssh/keys.go
deleted file mode 100644
index 47a07539d..000000000
--- a/vendor/golang.org/x/crypto/ssh/keys.go
+++ /dev/null
@@ -1,1823 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/ed25519"
-	"crypto/elliptic"
-	"crypto/md5"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha256"
-	"crypto/x509"
-	"encoding/asn1"
-	"encoding/base64"
-	"encoding/binary"
-	"encoding/hex"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"slices"
-	"strings"
-
-	"golang.org/x/crypto/ssh/internal/bcrypt_pbkdf"
-)
-
-// Public key algorithms names. These values can appear in PublicKey.Type,
-// ClientConfig.HostKeyAlgorithms, Signature.Format, or as AlgorithmSigner
-// arguments.
-const (
-	KeyAlgoRSA = "ssh-rsa"
-	// Deprecated: DSA is only supported at insecure key sizes, and was removed
-	// from major implementations.
-	KeyAlgoDSA = InsecureKeyAlgoDSA
-	// Deprecated: DSA is only supported at insecure key sizes, and was removed
-	// from major implementations.
-	InsecureKeyAlgoDSA = "ssh-dss"
-	KeyAlgoECDSA256    = "ecdsa-sha2-nistp256"
-	KeyAlgoSKECDSA256  = "sk-ecdsa-sha2-nistp256@openssh.com"
-	KeyAlgoECDSA384    = "ecdsa-sha2-nistp384"
-	KeyAlgoECDSA521    = "ecdsa-sha2-nistp521"
-	KeyAlgoED25519     = "ssh-ed25519"
-	KeyAlgoSKED25519   = "sk-ssh-ed25519@openssh.com"
-
-	// KeyAlgoRSASHA256 and KeyAlgoRSASHA512 are only public key algorithms, not
-	// public key formats, so they can't appear as a PublicKey.Type. The
-	// corresponding PublicKey.Type is KeyAlgoRSA. See RFC 8332, Section 2.
-	KeyAlgoRSASHA256 = "rsa-sha2-256"
-	KeyAlgoRSASHA512 = "rsa-sha2-512"
-)
-
-const (
-	// Deprecated: use KeyAlgoRSA.
-	SigAlgoRSA = KeyAlgoRSA
-	// Deprecated: use KeyAlgoRSASHA256.
-	SigAlgoRSASHA2256 = KeyAlgoRSASHA256
-	// Deprecated: use KeyAlgoRSASHA512.
-	SigAlgoRSASHA2512 = KeyAlgoRSASHA512
-)
-
-// parsePubKey parses a public key of the given algorithm.
-// Use ParsePublicKey for keys with prepended algorithm.
-func parsePubKey(in []byte, algo string) (pubKey PublicKey, rest []byte, err error) {
-	switch algo {
-	case KeyAlgoRSA:
-		return parseRSA(in)
-	case InsecureKeyAlgoDSA:
-		return parseDSA(in)
-	case KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521:
-		return parseECDSA(in)
-	case KeyAlgoSKECDSA256:
-		return parseSKECDSA(in)
-	case KeyAlgoED25519:
-		return parseED25519(in)
-	case KeyAlgoSKED25519:
-		return parseSKEd25519(in)
-	case CertAlgoRSAv01, InsecureCertAlgoDSAv01, CertAlgoECDSA256v01, CertAlgoECDSA384v01, CertAlgoECDSA521v01, CertAlgoSKECDSA256v01, CertAlgoED25519v01, CertAlgoSKED25519v01:
-		cert, err := parseCert(in, certKeyAlgoNames[algo])
-		if err != nil {
-			return nil, nil, err
-		}
-		return cert, nil, nil
-	}
-	if keyFormat := keyFormatForAlgorithm(algo); keyFormat != "" {
-		return nil, nil, fmt.Errorf("ssh: signature algorithm %q isn't a key format; key is malformed and should be re-encoded with type %q",
-			algo, keyFormat)
-	}
-
-	return nil, nil, fmt.Errorf("ssh: unknown key algorithm: %v", algo)
-}
-
-// parseAuthorizedKey parses a public key in OpenSSH authorized_keys format
-// (see sshd(8) manual page) once the options and key type fields have been
-// removed.
-func parseAuthorizedKey(in []byte) (out PublicKey, comment string, err error) {
-	in = bytes.TrimSpace(in)
-
-	i := bytes.IndexAny(in, " \t")
-	if i == -1 {
-		i = len(in)
-	}
-	base64Key := in[:i]
-
-	key := make([]byte, base64.StdEncoding.DecodedLen(len(base64Key)))
-	n, err := base64.StdEncoding.Decode(key, base64Key)
-	if err != nil {
-		return nil, "", err
-	}
-	key = key[:n]
-	out, err = ParsePublicKey(key)
-	if err != nil {
-		return nil, "", err
-	}
-	comment = string(bytes.TrimSpace(in[i:]))
-	return out, comment, nil
-}
-
-// ParseKnownHosts parses an entry in the format of the known_hosts file.
-//
-// The known_hosts format is documented in the sshd(8) manual page. This
-// function will parse a single entry from in. On successful return, marker
-// will contain the optional marker value (i.e. "cert-authority" or "revoked")
-// or else be empty, hosts will contain the hosts that this entry matches,
-// pubKey will contain the public key and comment will contain any trailing
-// comment at the end of the line. See the sshd(8) manual page for the various
-// forms that a host string can take.
-//
-// The unparsed remainder of the input will be returned in rest. This function
-// can be called repeatedly to parse multiple entries.
-//
-// If no entries were found in the input then err will be io.EOF. Otherwise a
-// non-nil err value indicates a parse error.
-func ParseKnownHosts(in []byte) (marker string, hosts []string, pubKey PublicKey, comment string, rest []byte, err error) {
-	for len(in) > 0 {
-		end := bytes.IndexByte(in, '\n')
-		if end != -1 {
-			rest = in[end+1:]
-			in = in[:end]
-		} else {
-			rest = nil
-		}
-
-		end = bytes.IndexByte(in, '\r')
-		if end != -1 {
-			in = in[:end]
-		}
-
-		in = bytes.TrimSpace(in)
-		if len(in) == 0 || in[0] == '#' {
-			in = rest
-			continue
-		}
-
-		i := bytes.IndexAny(in, " \t")
-		if i == -1 {
-			in = rest
-			continue
-		}
-
-		// Strip out the beginning of the known_host key.
-		// This is either an optional marker or a (set of) hostname(s).
-		keyFields := bytes.Fields(in)
-		if len(keyFields) < 3 || len(keyFields) > 5 {
-			return "", nil, nil, "", nil, errors.New("ssh: invalid entry in known_hosts data")
-		}
-
-		// keyFields[0] is either "@cert-authority", "@revoked" or a comma separated
-		// list of hosts
-		marker := ""
-		if keyFields[0][0] == '@' {
-			marker = string(keyFields[0][1:])
-			keyFields = keyFields[1:]
-		}
-
-		hosts := string(keyFields[0])
-		// keyFields[1] contains the key type (e.g. “ssh-rsa”).
-		// However, that information is duplicated inside the
-		// base64-encoded key and so is ignored here.
-
-		key := bytes.Join(keyFields[2:], []byte(" "))
-		if pubKey, comment, err = parseAuthorizedKey(key); err != nil {
-			return "", nil, nil, "", nil, err
-		}
-
-		return marker, strings.Split(hosts, ","), pubKey, comment, rest, nil
-	}
-
-	return "", nil, nil, "", nil, io.EOF
-}
-
-// ParseAuthorizedKey parses a public key from an authorized_keys file used in
-// OpenSSH according to the sshd(8) manual page. Invalid lines are ignored.
-func ParseAuthorizedKey(in []byte) (out PublicKey, comment string, options []string, rest []byte, err error) {
-	var lastErr error
-	for len(in) > 0 {
-		end := bytes.IndexByte(in, '\n')
-		if end != -1 {
-			rest = in[end+1:]
-			in = in[:end]
-		} else {
-			rest = nil
-		}
-
-		end = bytes.IndexByte(in, '\r')
-		if end != -1 {
-			in = in[:end]
-		}
-
-		in = bytes.TrimSpace(in)
-		if len(in) == 0 || in[0] == '#' {
-			in = rest
-			continue
-		}
-
-		i := bytes.IndexAny(in, " \t")
-		if i == -1 {
-			in = rest
-			continue
-		}
-
-		if out, comment, err = parseAuthorizedKey(in[i:]); err == nil {
-			return out, comment, options, rest, nil
-		} else {
-			lastErr = err
-		}
-
-		// No key type recognised. Maybe there's an options field at
-		// the beginning.
-		var b byte
-		inQuote := false
-		var candidateOptions []string
-		optionStart := 0
-		for i, b = range in {
-			isEnd := !inQuote && (b == ' ' || b == '\t')
-			if (b == ',' && !inQuote) || isEnd {
-				if i-optionStart > 0 {
-					candidateOptions = append(candidateOptions, string(in[optionStart:i]))
-				}
-				optionStart = i + 1
-			}
-			if isEnd {
-				break
-			}
-			if b == '"' && (i == 0 || (i > 0 && in[i-1] != '\\')) {
-				inQuote = !inQuote
-			}
-		}
-		for i < len(in) && (in[i] == ' ' || in[i] == '\t') {
-			i++
-		}
-		if i == len(in) {
-			// Invalid line: unmatched quote
-			in = rest
-			continue
-		}
-
-		in = in[i:]
-		i = bytes.IndexAny(in, " \t")
-		if i == -1 {
-			in = rest
-			continue
-		}
-
-		if out, comment, err = parseAuthorizedKey(in[i:]); err == nil {
-			options = candidateOptions
-			return out, comment, options, rest, nil
-		} else {
-			lastErr = err
-		}
-
-		in = rest
-		continue
-	}
-
-	if lastErr != nil {
-		return nil, "", nil, nil, fmt.Errorf("ssh: no key found; last parsing error for ignored line: %w", lastErr)
-	}
-
-	return nil, "", nil, nil, errors.New("ssh: no key found")
-}
-
-// ParsePublicKey parses an SSH public key or certificate formatted for use in
-// the SSH wire protocol according to RFC 4253, section 6.6.
-func ParsePublicKey(in []byte) (out PublicKey, err error) {
-	algo, in, ok := parseString(in)
-	if !ok {
-		return nil, errShortRead
-	}
-	var rest []byte
-	out, rest, err = parsePubKey(in, string(algo))
-	if len(rest) > 0 {
-		return nil, errors.New("ssh: trailing junk in public key")
-	}
-
-	return out, err
-}
-
-// MarshalAuthorizedKey serializes key for inclusion in an OpenSSH
-// authorized_keys file. The return value ends with newline.
-func MarshalAuthorizedKey(key PublicKey) []byte {
-	b := &bytes.Buffer{}
-	b.WriteString(key.Type())
-	b.WriteByte(' ')
-	e := base64.NewEncoder(base64.StdEncoding, b)
-	e.Write(key.Marshal())
-	e.Close()
-	b.WriteByte('\n')
-	return b.Bytes()
-}
-
-// MarshalPrivateKey returns a PEM block with the private key serialized in the
-// OpenSSH format.
-func MarshalPrivateKey(key crypto.PrivateKey, comment string) (*pem.Block, error) {
-	return marshalOpenSSHPrivateKey(key, comment, unencryptedOpenSSHMarshaler)
-}
-
-// MarshalPrivateKeyWithPassphrase returns a PEM block holding the encrypted
-// private key serialized in the OpenSSH format.
-func MarshalPrivateKeyWithPassphrase(key crypto.PrivateKey, comment string, passphrase []byte) (*pem.Block, error) {
-	return marshalOpenSSHPrivateKey(key, comment, passphraseProtectedOpenSSHMarshaler(passphrase))
-}
-
-// PublicKey represents a public key using an unspecified algorithm.
-//
-// Some PublicKeys provided by this package also implement CryptoPublicKey.
-type PublicKey interface {
-	// Type returns the key format name, e.g. "ssh-rsa".
-	Type() string
-
-	// Marshal returns the serialized key data in SSH wire format, with the name
-	// prefix. To unmarshal the returned data, use the ParsePublicKey function.
-	Marshal() []byte
-
-	// Verify that sig is a signature on the given data using this key. This
-	// method will hash the data appropriately first. sig.Format is allowed to
-	// be any signature algorithm compatible with the key type, the caller
-	// should check if it has more stringent requirements.
-	Verify(data []byte, sig *Signature) error
-}
-
-// CryptoPublicKey, if implemented by a PublicKey,
-// returns the underlying crypto.PublicKey form of the key.
-type CryptoPublicKey interface {
-	CryptoPublicKey() crypto.PublicKey
-}
-
-// A Signer can create signatures that verify against a public key.
-//
-// Some Signers provided by this package also implement MultiAlgorithmSigner.
-type Signer interface {
-	// PublicKey returns the associated PublicKey.
-	PublicKey() PublicKey
-
-	// Sign returns a signature for the given data. This method will hash the
-	// data appropriately first. The signature algorithm is expected to match
-	// the key format returned by the PublicKey.Type method (and not to be any
-	// alternative algorithm supported by the key format).
-	Sign(rand io.Reader, data []byte) (*Signature, error)
-}
-
-// An AlgorithmSigner is a Signer that also supports specifying an algorithm to
-// use for signing.
-//
-// An AlgorithmSigner can't advertise the algorithms it supports, unless it also
-// implements MultiAlgorithmSigner, so it should be prepared to be invoked with
-// every algorithm supported by the public key format.
-type AlgorithmSigner interface {
-	Signer
-
-	// SignWithAlgorithm is like Signer.Sign, but allows specifying a desired
-	// signing algorithm. Callers may pass an empty string for the algorithm in
-	// which case the AlgorithmSigner will use a default algorithm. This default
-	// doesn't currently control any behavior in this package.
-	SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*Signature, error)
-}
-
-// MultiAlgorithmSigner is an AlgorithmSigner that also reports the algorithms
-// supported by that signer.
-type MultiAlgorithmSigner interface {
-	AlgorithmSigner
-
-	// Algorithms returns the available algorithms in preference order. The list
-	// must not be empty, and it must not include certificate types.
-	Algorithms() []string
-}
-
-// NewSignerWithAlgorithms returns a signer restricted to the specified
-// algorithms. The algorithms must be set in preference order. The list must not
-// be empty, and it must not include certificate types. An error is returned if
-// the specified algorithms are incompatible with the public key type.
-func NewSignerWithAlgorithms(signer AlgorithmSigner, algorithms []string) (MultiAlgorithmSigner, error) {
-	if len(algorithms) == 0 {
-		return nil, errors.New("ssh: please specify at least one valid signing algorithm")
-	}
-	var signerAlgos []string
-	supportedAlgos := algorithmsForKeyFormat(underlyingAlgo(signer.PublicKey().Type()))
-	if s, ok := signer.(*multiAlgorithmSigner); ok {
-		signerAlgos = s.Algorithms()
-	} else {
-		signerAlgos = supportedAlgos
-	}
-
-	for _, algo := range algorithms {
-		if !slices.Contains(supportedAlgos, algo) {
-			return nil, fmt.Errorf("ssh: algorithm %q is not supported for key type %q",
-				algo, signer.PublicKey().Type())
-		}
-		if !slices.Contains(signerAlgos, algo) {
-			return nil, fmt.Errorf("ssh: algorithm %q is restricted for the provided signer", algo)
-		}
-	}
-	return &multiAlgorithmSigner{
-		AlgorithmSigner:     signer,
-		supportedAlgorithms: algorithms,
-	}, nil
-}
-
-type multiAlgorithmSigner struct {
-	AlgorithmSigner
-	supportedAlgorithms []string
-}
-
-func (s *multiAlgorithmSigner) Algorithms() []string {
-	return s.supportedAlgorithms
-}
-
-func (s *multiAlgorithmSigner) isAlgorithmSupported(algorithm string) bool {
-	if algorithm == "" {
-		algorithm = underlyingAlgo(s.PublicKey().Type())
-	}
-	for _, algo := range s.supportedAlgorithms {
-		if algorithm == algo {
-			return true
-		}
-	}
-	return false
-}
-
-func (s *multiAlgorithmSigner) SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*Signature, error) {
-	if !s.isAlgorithmSupported(algorithm) {
-		return nil, fmt.Errorf("ssh: algorithm %q is not supported: %v", algorithm, s.supportedAlgorithms)
-	}
-	return s.AlgorithmSigner.SignWithAlgorithm(rand, data, algorithm)
-}
-
-type rsaPublicKey rsa.PublicKey
-
-func (r *rsaPublicKey) Type() string {
-	return "ssh-rsa"
-}
-
-// parseRSA parses an RSA key according to RFC 4253, section 6.6.
-func parseRSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		E    *big.Int
-		N    *big.Int
-		Rest []byte `ssh:"rest"`
-	}
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	if w.E.BitLen() > 24 {
-		return nil, nil, errors.New("ssh: exponent too large")
-	}
-	e := w.E.Int64()
-	if e < 3 || e&1 == 0 {
-		return nil, nil, errors.New("ssh: incorrect exponent")
-	}
-
-	var key rsa.PublicKey
-	key.E = int(e)
-	key.N = w.N
-	return (*rsaPublicKey)(&key), w.Rest, nil
-}
-
-func (r *rsaPublicKey) Marshal() []byte {
-	e := new(big.Int).SetInt64(int64(r.E))
-	// RSA publickey struct layout should match the struct used by
-	// parseRSACert in the x/crypto/ssh/agent package.
-	wirekey := struct {
-		Name string
-		E    *big.Int
-		N    *big.Int
-	}{
-		KeyAlgoRSA,
-		e,
-		r.N,
-	}
-	return Marshal(&wirekey)
-}
-
-func (r *rsaPublicKey) Verify(data []byte, sig *Signature) error {
-	supportedAlgos := algorithmsForKeyFormat(r.Type())
-	if !slices.Contains(supportedAlgos, sig.Format) {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, r.Type())
-	}
-	hash, err := hashFunc(sig.Format)
-	if err != nil {
-		return err
-	}
-	h := hash.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-
-	// Signatures in PKCS1v15 must match the key's modulus in
-	// length. However with SSH, some signers provide RSA
-	// signatures which are missing the MSB 0's of the bignum
-	// represented. With ssh-rsa signatures, this is encouraged by
-	// the spec (even though e.g. OpenSSH will give the full
-	// length unconditionally). With rsa-sha2-* signatures, the
-	// verifier is allowed to support these, even though they are
-	// out of spec. See RFC 4253 Section 6.6 for ssh-rsa and RFC
-	// 8332 Section 3 for rsa-sha2-* details.
-	//
-	// In practice:
-	// * OpenSSH always allows "short" signatures:
-	//   https://github.com/openssh/openssh-portable/blob/V_9_8_P1/ssh-rsa.c#L526
-	//   but always generates padded signatures:
-	//   https://github.com/openssh/openssh-portable/blob/V_9_8_P1/ssh-rsa.c#L439
-	//
-	// * PuTTY versions 0.81 and earlier will generate short
-	//   signatures for all RSA signature variants. Note that
-	//   PuTTY is embedded in other software, such as WinSCP and
-	//   FileZilla. At the time of writing, a patch has been
-	//   applied to PuTTY to generate padded signatures for
-	//   rsa-sha2-*, but not yet released:
-	//   https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=a5bcf3d384e1bf15a51a6923c3724cbbee022d8e
-	//
-	// * SSH.NET versions 2024.0.0 and earlier will generate short
-	//   signatures for all RSA signature variants, fixed in 2024.1.0:
-	//   https://github.com/sshnet/SSH.NET/releases/tag/2024.1.0
-	//
-	// As a result, we pad these up to the key size by inserting
-	// leading 0's.
-	//
-	// Note that support for short signatures with rsa-sha2-* may
-	// be removed in the future due to such signatures not being
-	// allowed by the spec.
-	blob := sig.Blob
-	keySize := (*rsa.PublicKey)(r).Size()
-	if len(blob) < keySize {
-		padded := make([]byte, keySize)
-		copy(padded[keySize-len(blob):], blob)
-		blob = padded
-	}
-	return rsa.VerifyPKCS1v15((*rsa.PublicKey)(r), hash, digest, blob)
-}
-
-func (r *rsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return (*rsa.PublicKey)(r)
-}
-
-type dsaPublicKey dsa.PublicKey
-
-func (k *dsaPublicKey) Type() string {
-	return "ssh-dss"
-}
-
-func checkDSAParams(param *dsa.Parameters) error {
-	// SSH specifies FIPS 186-2, which only provided a single size
-	// (1024 bits) DSA key. FIPS 186-3 allows for larger key
-	// sizes, which would confuse SSH.
-	if l := param.P.BitLen(); l != 1024 {
-		return fmt.Errorf("ssh: unsupported DSA key size %d", l)
-	}
-
-	return nil
-}
-
-// parseDSA parses an DSA key according to RFC 4253, section 6.6.
-func parseDSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		P, Q, G, Y *big.Int
-		Rest       []byte `ssh:"rest"`
-	}
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	param := dsa.Parameters{
-		P: w.P,
-		Q: w.Q,
-		G: w.G,
-	}
-	if err := checkDSAParams(¶m); err != nil {
-		return nil, nil, err
-	}
-
-	key := &dsaPublicKey{
-		Parameters: param,
-		Y:          w.Y,
-	}
-	return key, w.Rest, nil
-}
-
-func (k *dsaPublicKey) Marshal() []byte {
-	// DSA publickey struct layout should match the struct used by
-	// parseDSACert in the x/crypto/ssh/agent package.
-	w := struct {
-		Name       string
-		P, Q, G, Y *big.Int
-	}{
-		k.Type(),
-		k.P,
-		k.Q,
-		k.G,
-		k.Y,
-	}
-
-	return Marshal(&w)
-}
-
-func (k *dsaPublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != k.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
-	}
-	hash, err := hashFunc(sig.Format)
-	if err != nil {
-		return err
-	}
-	h := hash.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-
-	// Per RFC 4253, section 6.6,
-	// The value for 'dss_signature_blob' is encoded as a string containing
-	// r, followed by s (which are 160-bit integers, without lengths or
-	// padding, unsigned, and in network byte order).
-	// For DSS purposes, sig.Blob should be exactly 40 bytes in length.
-	if len(sig.Blob) != 40 {
-		return errors.New("ssh: DSA signature parse error")
-	}
-	r := new(big.Int).SetBytes(sig.Blob[:20])
-	s := new(big.Int).SetBytes(sig.Blob[20:])
-	if dsa.Verify((*dsa.PublicKey)(k), digest, r, s) {
-		return nil
-	}
-	return errors.New("ssh: signature did not verify")
-}
-
-func (k *dsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return (*dsa.PublicKey)(k)
-}
-
-type dsaPrivateKey struct {
-	*dsa.PrivateKey
-}
-
-func (k *dsaPrivateKey) PublicKey() PublicKey {
-	return (*dsaPublicKey)(&k.PrivateKey.PublicKey)
-}
-
-func (k *dsaPrivateKey) Sign(rand io.Reader, data []byte) (*Signature, error) {
-	return k.SignWithAlgorithm(rand, data, k.PublicKey().Type())
-}
-
-func (k *dsaPrivateKey) Algorithms() []string {
-	return []string{k.PublicKey().Type()}
-}
-
-func (k *dsaPrivateKey) SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*Signature, error) {
-	if algorithm != "" && algorithm != k.PublicKey().Type() {
-		return nil, fmt.Errorf("ssh: unsupported signature algorithm %s", algorithm)
-	}
-
-	hash, err := hashFunc(k.PublicKey().Type())
-	if err != nil {
-		return nil, err
-	}
-	h := hash.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-	r, s, err := dsa.Sign(rand, k.PrivateKey, digest)
-	if err != nil {
-		return nil, err
-	}
-
-	sig := make([]byte, 40)
-	rb := r.Bytes()
-	sb := s.Bytes()
-
-	copy(sig[20-len(rb):20], rb)
-	copy(sig[40-len(sb):], sb)
-
-	return &Signature{
-		Format: k.PublicKey().Type(),
-		Blob:   sig,
-	}, nil
-}
-
-type ecdsaPublicKey ecdsa.PublicKey
-
-func (k *ecdsaPublicKey) Type() string {
-	return "ecdsa-sha2-" + k.nistID()
-}
-
-func (k *ecdsaPublicKey) nistID() string {
-	switch k.Params().BitSize {
-	case 256:
-		return "nistp256"
-	case 384:
-		return "nistp384"
-	case 521:
-		return "nistp521"
-	}
-	panic("ssh: unsupported ecdsa key size")
-}
-
-type ed25519PublicKey ed25519.PublicKey
-
-func (k ed25519PublicKey) Type() string {
-	return KeyAlgoED25519
-}
-
-func parseED25519(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		KeyBytes []byte
-		Rest     []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	if l := len(w.KeyBytes); l != ed25519.PublicKeySize {
-		return nil, nil, fmt.Errorf("invalid size %d for Ed25519 public key", l)
-	}
-
-	return ed25519PublicKey(w.KeyBytes), w.Rest, nil
-}
-
-func (k ed25519PublicKey) Marshal() []byte {
-	w := struct {
-		Name     string
-		KeyBytes []byte
-	}{
-		KeyAlgoED25519,
-		[]byte(k),
-	}
-	return Marshal(&w)
-}
-
-func (k ed25519PublicKey) Verify(b []byte, sig *Signature) error {
-	if sig.Format != k.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
-	}
-	if l := len(k); l != ed25519.PublicKeySize {
-		return fmt.Errorf("ssh: invalid size %d for Ed25519 public key", l)
-	}
-
-	if ok := ed25519.Verify(ed25519.PublicKey(k), b, sig.Blob); !ok {
-		return errors.New("ssh: signature did not verify")
-	}
-
-	return nil
-}
-
-func (k ed25519PublicKey) CryptoPublicKey() crypto.PublicKey {
-	return ed25519.PublicKey(k)
-}
-
-func supportedEllipticCurve(curve elliptic.Curve) bool {
-	return curve == elliptic.P256() || curve == elliptic.P384() || curve == elliptic.P521()
-}
-
-// parseECDSA parses an ECDSA key according to RFC 5656, section 3.1.
-func parseECDSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		Curve    string
-		KeyBytes []byte
-		Rest     []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	key := new(ecdsa.PublicKey)
-
-	switch w.Curve {
-	case "nistp256":
-		key.Curve = elliptic.P256()
-	case "nistp384":
-		key.Curve = elliptic.P384()
-	case "nistp521":
-		key.Curve = elliptic.P521()
-	default:
-		return nil, nil, errors.New("ssh: unsupported curve")
-	}
-
-	key.X, key.Y = elliptic.Unmarshal(key.Curve, w.KeyBytes)
-	if key.X == nil || key.Y == nil {
-		return nil, nil, errors.New("ssh: invalid curve point")
-	}
-	return (*ecdsaPublicKey)(key), w.Rest, nil
-}
-
-func (k *ecdsaPublicKey) Marshal() []byte {
-	// See RFC 5656, section 3.1.
-	keyBytes := elliptic.Marshal(k.Curve, k.X, k.Y)
-	// ECDSA publickey struct layout should match the struct used by
-	// parseECDSACert in the x/crypto/ssh/agent package.
-	w := struct {
-		Name string
-		ID   string
-		Key  []byte
-	}{
-		k.Type(),
-		k.nistID(),
-		keyBytes,
-	}
-
-	return Marshal(&w)
-}
-
-func (k *ecdsaPublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != k.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
-	}
-	hash, err := hashFunc(sig.Format)
-	if err != nil {
-		return err
-	}
-	h := hash.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-
-	// Per RFC 5656, section 3.1.2,
-	// The ecdsa_signature_blob value has the following specific encoding:
-	//    mpint    r
-	//    mpint    s
-	var ecSig struct {
-		R *big.Int
-		S *big.Int
-	}
-
-	if err := Unmarshal(sig.Blob, &ecSig); err != nil {
-		return err
-	}
-
-	if ecdsa.Verify((*ecdsa.PublicKey)(k), digest, ecSig.R, ecSig.S) {
-		return nil
-	}
-	return errors.New("ssh: signature did not verify")
-}
-
-func (k *ecdsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return (*ecdsa.PublicKey)(k)
-}
-
-// skFields holds the additional fields present in U2F/FIDO2 signatures.
-// See openssh/PROTOCOL.u2f 'SSH U2F Signatures' for details.
-type skFields struct {
-	// Flags contains U2F/FIDO2 flags such as 'user present'
-	Flags byte
-	// Counter is a monotonic signature counter which can be
-	// used to detect concurrent use of a private key, should
-	// it be extracted from hardware.
-	Counter uint32
-}
-
-type skECDSAPublicKey struct {
-	// application is a URL-like string, typically "ssh:" for SSH.
-	// see openssh/PROTOCOL.u2f for details.
-	application string
-	ecdsa.PublicKey
-}
-
-func (k *skECDSAPublicKey) Type() string {
-	return KeyAlgoSKECDSA256
-}
-
-func (k *skECDSAPublicKey) nistID() string {
-	return "nistp256"
-}
-
-func parseSKECDSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		Curve       string
-		KeyBytes    []byte
-		Application string
-		Rest        []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	key := new(skECDSAPublicKey)
-	key.application = w.Application
-
-	if w.Curve != "nistp256" {
-		return nil, nil, errors.New("ssh: unsupported curve")
-	}
-	key.Curve = elliptic.P256()
-
-	key.X, key.Y = elliptic.Unmarshal(key.Curve, w.KeyBytes)
-	if key.X == nil || key.Y == nil {
-		return nil, nil, errors.New("ssh: invalid curve point")
-	}
-
-	return key, w.Rest, nil
-}
-
-func (k *skECDSAPublicKey) Marshal() []byte {
-	// See RFC 5656, section 3.1.
-	keyBytes := elliptic.Marshal(k.Curve, k.X, k.Y)
-	w := struct {
-		Name        string
-		ID          string
-		Key         []byte
-		Application string
-	}{
-		k.Type(),
-		k.nistID(),
-		keyBytes,
-		k.application,
-	}
-
-	return Marshal(&w)
-}
-
-func (k *skECDSAPublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != k.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
-	}
-	hash, err := hashFunc(sig.Format)
-	if err != nil {
-		return err
-	}
-	h := hash.New()
-	h.Write([]byte(k.application))
-	appDigest := h.Sum(nil)
-
-	h.Reset()
-	h.Write(data)
-	dataDigest := h.Sum(nil)
-
-	var ecSig struct {
-		R *big.Int
-		S *big.Int
-	}
-	if err := Unmarshal(sig.Blob, &ecSig); err != nil {
-		return err
-	}
-
-	var skf skFields
-	if err := Unmarshal(sig.Rest, &skf); err != nil {
-		return err
-	}
-
-	blob := struct {
-		ApplicationDigest []byte `ssh:"rest"`
-		Flags             byte
-		Counter           uint32
-		MessageDigest     []byte `ssh:"rest"`
-	}{
-		appDigest,
-		skf.Flags,
-		skf.Counter,
-		dataDigest,
-	}
-
-	original := Marshal(blob)
-
-	h.Reset()
-	h.Write(original)
-	digest := h.Sum(nil)
-
-	if ecdsa.Verify((*ecdsa.PublicKey)(&k.PublicKey), digest, ecSig.R, ecSig.S) {
-		return nil
-	}
-	return errors.New("ssh: signature did not verify")
-}
-
-func (k *skECDSAPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return &k.PublicKey
-}
-
-type skEd25519PublicKey struct {
-	// application is a URL-like string, typically "ssh:" for SSH.
-	// see openssh/PROTOCOL.u2f for details.
-	application string
-	ed25519.PublicKey
-}
-
-func (k *skEd25519PublicKey) Type() string {
-	return KeyAlgoSKED25519
-}
-
-func parseSKEd25519(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		KeyBytes    []byte
-		Application string
-		Rest        []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	if l := len(w.KeyBytes); l != ed25519.PublicKeySize {
-		return nil, nil, fmt.Errorf("invalid size %d for Ed25519 public key", l)
-	}
-
-	key := new(skEd25519PublicKey)
-	key.application = w.Application
-	key.PublicKey = ed25519.PublicKey(w.KeyBytes)
-
-	return key, w.Rest, nil
-}
-
-func (k *skEd25519PublicKey) Marshal() []byte {
-	w := struct {
-		Name        string
-		KeyBytes    []byte
-		Application string
-	}{
-		KeyAlgoSKED25519,
-		[]byte(k.PublicKey),
-		k.application,
-	}
-	return Marshal(&w)
-}
-
-func (k *skEd25519PublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != k.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
-	}
-	if l := len(k.PublicKey); l != ed25519.PublicKeySize {
-		return fmt.Errorf("invalid size %d for Ed25519 public key", l)
-	}
-
-	hash, err := hashFunc(sig.Format)
-	if err != nil {
-		return err
-	}
-	h := hash.New()
-	h.Write([]byte(k.application))
-	appDigest := h.Sum(nil)
-
-	h.Reset()
-	h.Write(data)
-	dataDigest := h.Sum(nil)
-
-	var edSig struct {
-		Signature []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(sig.Blob, &edSig); err != nil {
-		return err
-	}
-
-	var skf skFields
-	if err := Unmarshal(sig.Rest, &skf); err != nil {
-		return err
-	}
-
-	blob := struct {
-		ApplicationDigest []byte `ssh:"rest"`
-		Flags             byte
-		Counter           uint32
-		MessageDigest     []byte `ssh:"rest"`
-	}{
-		appDigest,
-		skf.Flags,
-		skf.Counter,
-		dataDigest,
-	}
-
-	original := Marshal(blob)
-
-	if ok := ed25519.Verify(k.PublicKey, original, edSig.Signature); !ok {
-		return errors.New("ssh: signature did not verify")
-	}
-
-	return nil
-}
-
-func (k *skEd25519PublicKey) CryptoPublicKey() crypto.PublicKey {
-	return k.PublicKey
-}
-
-// NewSignerFromKey takes an *rsa.PrivateKey, *dsa.PrivateKey,
-// *ecdsa.PrivateKey or any other crypto.Signer and returns a
-// corresponding Signer instance. ECDSA keys must use P-256, P-384 or
-// P-521. DSA keys must use parameter size L1024N160.
-func NewSignerFromKey(key interface{}) (Signer, error) {
-	switch key := key.(type) {
-	case crypto.Signer:
-		return NewSignerFromSigner(key)
-	case *dsa.PrivateKey:
-		return newDSAPrivateKey(key)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %T", key)
-	}
-}
-
-func newDSAPrivateKey(key *dsa.PrivateKey) (Signer, error) {
-	if err := checkDSAParams(&key.PublicKey.Parameters); err != nil {
-		return nil, err
-	}
-
-	return &dsaPrivateKey{key}, nil
-}
-
-type wrappedSigner struct {
-	signer crypto.Signer
-	pubKey PublicKey
-}
-
-// NewSignerFromSigner takes any crypto.Signer implementation and
-// returns a corresponding Signer interface. This can be used, for
-// example, with keys kept in hardware modules.
-func NewSignerFromSigner(signer crypto.Signer) (Signer, error) {
-	pubKey, err := NewPublicKey(signer.Public())
-	if err != nil {
-		return nil, err
-	}
-
-	return &wrappedSigner{signer, pubKey}, nil
-}
-
-func (s *wrappedSigner) PublicKey() PublicKey {
-	return s.pubKey
-}
-
-func (s *wrappedSigner) Sign(rand io.Reader, data []byte) (*Signature, error) {
-	return s.SignWithAlgorithm(rand, data, s.pubKey.Type())
-}
-
-func (s *wrappedSigner) Algorithms() []string {
-	return algorithmsForKeyFormat(s.pubKey.Type())
-}
-
-func (s *wrappedSigner) SignWithAlgorithm(rand io.Reader, data []byte, algorithm string) (*Signature, error) {
-	if algorithm == "" {
-		algorithm = s.pubKey.Type()
-	}
-
-	if !slices.Contains(s.Algorithms(), algorithm) {
-		return nil, fmt.Errorf("ssh: unsupported signature algorithm %q for key format %q", algorithm, s.pubKey.Type())
-	}
-
-	hashFunc, err := hashFunc(algorithm)
-	if err != nil {
-		return nil, err
-	}
-	var digest []byte
-	if hashFunc != 0 {
-		h := hashFunc.New()
-		h.Write(data)
-		digest = h.Sum(nil)
-	} else {
-		digest = data
-	}
-
-	signature, err := s.signer.Sign(rand, digest, hashFunc)
-	if err != nil {
-		return nil, err
-	}
-
-	// crypto.Signer.Sign is expected to return an ASN.1-encoded signature
-	// for ECDSA and DSA, but that's not the encoding expected by SSH, so
-	// re-encode.
-	switch s.pubKey.(type) {
-	case *ecdsaPublicKey, *dsaPublicKey:
-		type asn1Signature struct {
-			R, S *big.Int
-		}
-		asn1Sig := new(asn1Signature)
-		_, err := asn1.Unmarshal(signature, asn1Sig)
-		if err != nil {
-			return nil, err
-		}
-
-		switch s.pubKey.(type) {
-		case *ecdsaPublicKey:
-			signature = Marshal(asn1Sig)
-
-		case *dsaPublicKey:
-			signature = make([]byte, 40)
-			r := asn1Sig.R.Bytes()
-			s := asn1Sig.S.Bytes()
-			copy(signature[20-len(r):20], r)
-			copy(signature[40-len(s):40], s)
-		}
-	}
-
-	return &Signature{
-		Format: algorithm,
-		Blob:   signature,
-	}, nil
-}
-
-// NewPublicKey takes an *rsa.PublicKey, *dsa.PublicKey, *ecdsa.PublicKey,
-// or ed25519.PublicKey returns a corresponding PublicKey instance.
-// ECDSA keys must use P-256, P-384 or P-521.
-func NewPublicKey(key interface{}) (PublicKey, error) {
-	switch key := key.(type) {
-	case *rsa.PublicKey:
-		return (*rsaPublicKey)(key), nil
-	case *ecdsa.PublicKey:
-		if !supportedEllipticCurve(key.Curve) {
-			return nil, errors.New("ssh: only P-256, P-384 and P-521 EC keys are supported")
-		}
-		return (*ecdsaPublicKey)(key), nil
-	case *dsa.PublicKey:
-		return (*dsaPublicKey)(key), nil
-	case ed25519.PublicKey:
-		if l := len(key); l != ed25519.PublicKeySize {
-			return nil, fmt.Errorf("ssh: invalid size %d for Ed25519 public key", l)
-		}
-		return ed25519PublicKey(key), nil
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %T", key)
-	}
-}
-
-// ParsePrivateKey returns a Signer from a PEM encoded private key. It supports
-// the same keys as ParseRawPrivateKey. If the private key is encrypted, it
-// will return a PassphraseMissingError.
-func ParsePrivateKey(pemBytes []byte) (Signer, error) {
-	key, err := ParseRawPrivateKey(pemBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewSignerFromKey(key)
-}
-
-// ParsePrivateKeyWithPassphrase returns a Signer from a PEM encoded private
-// key and passphrase. It supports the same keys as
-// ParseRawPrivateKeyWithPassphrase.
-func ParsePrivateKeyWithPassphrase(pemBytes, passphrase []byte) (Signer, error) {
-	key, err := ParseRawPrivateKeyWithPassphrase(pemBytes, passphrase)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewSignerFromKey(key)
-}
-
-// encryptedBlock tells whether a private key is
-// encrypted by examining its Proc-Type header
-// for a mention of ENCRYPTED
-// according to RFC 1421 Section 4.6.1.1.
-func encryptedBlock(block *pem.Block) bool {
-	return strings.Contains(block.Headers["Proc-Type"], "ENCRYPTED")
-}
-
-// A PassphraseMissingError indicates that parsing this private key requires a
-// passphrase. Use ParsePrivateKeyWithPassphrase.
-type PassphraseMissingError struct {
-	// PublicKey will be set if the private key format includes an unencrypted
-	// public key along with the encrypted private key.
-	PublicKey PublicKey
-}
-
-func (*PassphraseMissingError) Error() string {
-	return "ssh: this private key is passphrase protected"
-}
-
-// ParseRawPrivateKey returns a private key from a PEM encoded private key. It supports
-// RSA, DSA, ECDSA, and Ed25519 private keys in PKCS#1, PKCS#8, OpenSSL, and OpenSSH
-// formats. If the private key is encrypted, it will return a PassphraseMissingError.
-func ParseRawPrivateKey(pemBytes []byte) (interface{}, error) {
-	block, _ := pem.Decode(pemBytes)
-	if block == nil {
-		return nil, errors.New("ssh: no key found")
-	}
-
-	if encryptedBlock(block) {
-		return nil, &PassphraseMissingError{}
-	}
-
-	switch block.Type {
-	case "RSA PRIVATE KEY":
-		return x509.ParsePKCS1PrivateKey(block.Bytes)
-	// RFC5208 - https://tools.ietf.org/html/rfc5208
-	case "PRIVATE KEY":
-		return x509.ParsePKCS8PrivateKey(block.Bytes)
-	case "EC PRIVATE KEY":
-		return x509.ParseECPrivateKey(block.Bytes)
-	case "DSA PRIVATE KEY":
-		return ParseDSAPrivateKey(block.Bytes)
-	case "OPENSSH PRIVATE KEY":
-		return parseOpenSSHPrivateKey(block.Bytes, unencryptedOpenSSHKey)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %q", block.Type)
-	}
-}
-
-// ParseRawPrivateKeyWithPassphrase returns a private key decrypted with
-// passphrase from a PEM encoded private key. If the passphrase is wrong, it
-// will return x509.IncorrectPasswordError.
-func ParseRawPrivateKeyWithPassphrase(pemBytes, passphrase []byte) (interface{}, error) {
-	block, _ := pem.Decode(pemBytes)
-	if block == nil {
-		return nil, errors.New("ssh: no key found")
-	}
-
-	if block.Type == "OPENSSH PRIVATE KEY" {
-		return parseOpenSSHPrivateKey(block.Bytes, passphraseProtectedOpenSSHKey(passphrase))
-	}
-
-	if !encryptedBlock(block) || !x509.IsEncryptedPEMBlock(block) {
-		return nil, errors.New("ssh: not an encrypted key")
-	}
-
-	buf, err := x509.DecryptPEMBlock(block, passphrase)
-	if err != nil {
-		if err == x509.IncorrectPasswordError {
-			return nil, err
-		}
-		return nil, fmt.Errorf("ssh: cannot decode encrypted private keys: %v", err)
-	}
-
-	var result interface{}
-
-	switch block.Type {
-	case "RSA PRIVATE KEY":
-		result, err = x509.ParsePKCS1PrivateKey(buf)
-	case "EC PRIVATE KEY":
-		result, err = x509.ParseECPrivateKey(buf)
-	case "DSA PRIVATE KEY":
-		result, err = ParseDSAPrivateKey(buf)
-	default:
-		err = fmt.Errorf("ssh: unsupported key type %q", block.Type)
-	}
-	// Because of deficiencies in the format, DecryptPEMBlock does not always
-	// detect an incorrect password. In these cases decrypted DER bytes is
-	// random noise. If the parsing of the key returns an asn1.StructuralError
-	// we return x509.IncorrectPasswordError.
-	if _, ok := err.(asn1.StructuralError); ok {
-		return nil, x509.IncorrectPasswordError
-	}
-
-	return result, err
-}
-
-// ParseDSAPrivateKey returns a DSA private key from its ASN.1 DER encoding, as
-// specified by the OpenSSL DSA man page.
-func ParseDSAPrivateKey(der []byte) (*dsa.PrivateKey, error) {
-	var k struct {
-		Version int
-		P       *big.Int
-		Q       *big.Int
-		G       *big.Int
-		Pub     *big.Int
-		Priv    *big.Int
-	}
-	rest, err := asn1.Unmarshal(der, &k)
-	if err != nil {
-		return nil, errors.New("ssh: failed to parse DSA key: " + err.Error())
-	}
-	if len(rest) > 0 {
-		return nil, errors.New("ssh: garbage after DSA key")
-	}
-
-	return &dsa.PrivateKey{
-		PublicKey: dsa.PublicKey{
-			Parameters: dsa.Parameters{
-				P: k.P,
-				Q: k.Q,
-				G: k.G,
-			},
-			Y: k.Pub,
-		},
-		X: k.Priv,
-	}, nil
-}
-
-func unencryptedOpenSSHKey(cipherName, kdfName, kdfOpts string, privKeyBlock []byte) ([]byte, error) {
-	if kdfName != "none" || cipherName != "none" {
-		return nil, &PassphraseMissingError{}
-	}
-	if kdfOpts != "" {
-		return nil, errors.New("ssh: invalid openssh private key")
-	}
-	return privKeyBlock, nil
-}
-
-func passphraseProtectedOpenSSHKey(passphrase []byte) openSSHDecryptFunc {
-	return func(cipherName, kdfName, kdfOpts string, privKeyBlock []byte) ([]byte, error) {
-		if kdfName == "none" || cipherName == "none" {
-			return nil, errors.New("ssh: key is not password protected")
-		}
-		if kdfName != "bcrypt" {
-			return nil, fmt.Errorf("ssh: unknown KDF %q, only supports %q", kdfName, "bcrypt")
-		}
-
-		var opts struct {
-			Salt   string
-			Rounds uint32
-		}
-		if err := Unmarshal([]byte(kdfOpts), &opts); err != nil {
-			return nil, err
-		}
-
-		k, err := bcrypt_pbkdf.Key(passphrase, []byte(opts.Salt), int(opts.Rounds), 32+16)
-		if err != nil {
-			return nil, err
-		}
-		key, iv := k[:32], k[32:]
-
-		c, err := aes.NewCipher(key)
-		if err != nil {
-			return nil, err
-		}
-		switch cipherName {
-		case "aes256-ctr":
-			ctr := cipher.NewCTR(c, iv)
-			ctr.XORKeyStream(privKeyBlock, privKeyBlock)
-		case "aes256-cbc":
-			if len(privKeyBlock)%c.BlockSize() != 0 {
-				return nil, fmt.Errorf("ssh: invalid encrypted private key length, not a multiple of the block size")
-			}
-			cbc := cipher.NewCBCDecrypter(c, iv)
-			cbc.CryptBlocks(privKeyBlock, privKeyBlock)
-		default:
-			return nil, fmt.Errorf("ssh: unknown cipher %q, only supports %q or %q", cipherName, "aes256-ctr", "aes256-cbc")
-		}
-
-		return privKeyBlock, nil
-	}
-}
-
-func unencryptedOpenSSHMarshaler(privKeyBlock []byte) ([]byte, string, string, string, error) {
-	key := generateOpenSSHPadding(privKeyBlock, 8)
-	return key, "none", "none", "", nil
-}
-
-func passphraseProtectedOpenSSHMarshaler(passphrase []byte) openSSHEncryptFunc {
-	return func(privKeyBlock []byte) ([]byte, string, string, string, error) {
-		salt := make([]byte, 16)
-		if _, err := rand.Read(salt); err != nil {
-			return nil, "", "", "", err
-		}
-
-		opts := struct {
-			Salt   []byte
-			Rounds uint32
-		}{salt, 16}
-
-		// Derive key to encrypt the private key block.
-		k, err := bcrypt_pbkdf.Key(passphrase, salt, int(opts.Rounds), 32+aes.BlockSize)
-		if err != nil {
-			return nil, "", "", "", err
-		}
-
-		// Add padding matching the block size of AES.
-		keyBlock := generateOpenSSHPadding(privKeyBlock, aes.BlockSize)
-
-		// Encrypt the private key using the derived secret.
-
-		dst := make([]byte, len(keyBlock))
-		key, iv := k[:32], k[32:]
-		block, err := aes.NewCipher(key)
-		if err != nil {
-			return nil, "", "", "", err
-		}
-
-		stream := cipher.NewCTR(block, iv)
-		stream.XORKeyStream(dst, keyBlock)
-
-		return dst, "aes256-ctr", "bcrypt", string(Marshal(opts)), nil
-	}
-}
-
-const privateKeyAuthMagic = "openssh-key-v1\x00"
-
-type openSSHDecryptFunc func(CipherName, KdfName, KdfOpts string, PrivKeyBlock []byte) ([]byte, error)
-type openSSHEncryptFunc func(PrivKeyBlock []byte) (ProtectedKeyBlock []byte, cipherName, kdfName, kdfOptions string, err error)
-
-type openSSHEncryptedPrivateKey struct {
-	CipherName   string
-	KdfName      string
-	KdfOpts      string
-	NumKeys      uint32
-	PubKey       []byte
-	PrivKeyBlock []byte
-	Rest         []byte `ssh:"rest"`
-}
-
-type openSSHPrivateKey struct {
-	Check1  uint32
-	Check2  uint32
-	Keytype string
-	Rest    []byte `ssh:"rest"`
-}
-
-type openSSHRSAPrivateKey struct {
-	N       *big.Int
-	E       *big.Int
-	D       *big.Int
-	Iqmp    *big.Int
-	P       *big.Int
-	Q       *big.Int
-	Comment string
-	Pad     []byte `ssh:"rest"`
-}
-
-type openSSHEd25519PrivateKey struct {
-	Pub     []byte
-	Priv    []byte
-	Comment string
-	Pad     []byte `ssh:"rest"`
-}
-
-type openSSHECDSAPrivateKey struct {
-	Curve   string
-	Pub     []byte
-	D       *big.Int
-	Comment string
-	Pad     []byte `ssh:"rest"`
-}
-
-// parseOpenSSHPrivateKey parses an OpenSSH private key, using the decrypt
-// function to unwrap the encrypted portion. unencryptedOpenSSHKey can be used
-// as the decrypt function to parse an unencrypted private key. See
-// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key.
-func parseOpenSSHPrivateKey(key []byte, decrypt openSSHDecryptFunc) (crypto.PrivateKey, error) {
-	if len(key) < len(privateKeyAuthMagic) || string(key[:len(privateKeyAuthMagic)]) != privateKeyAuthMagic {
-		return nil, errors.New("ssh: invalid openssh private key format")
-	}
-	remaining := key[len(privateKeyAuthMagic):]
-
-	var w openSSHEncryptedPrivateKey
-	if err := Unmarshal(remaining, &w); err != nil {
-		return nil, err
-	}
-	if w.NumKeys != 1 {
-		// We only support single key files, and so does OpenSSH.
-		// https://github.com/openssh/openssh-portable/blob/4103a3ec7/sshkey.c#L4171
-		return nil, errors.New("ssh: multi-key files are not supported")
-	}
-
-	privKeyBlock, err := decrypt(w.CipherName, w.KdfName, w.KdfOpts, w.PrivKeyBlock)
-	if err != nil {
-		if err, ok := err.(*PassphraseMissingError); ok {
-			pub, errPub := ParsePublicKey(w.PubKey)
-			if errPub != nil {
-				return nil, fmt.Errorf("ssh: failed to parse embedded public key: %v", errPub)
-			}
-			err.PublicKey = pub
-		}
-		return nil, err
-	}
-
-	var pk1 openSSHPrivateKey
-	if err := Unmarshal(privKeyBlock, &pk1); err != nil || pk1.Check1 != pk1.Check2 {
-		if w.CipherName != "none" {
-			return nil, x509.IncorrectPasswordError
-		}
-		return nil, errors.New("ssh: malformed OpenSSH key")
-	}
-
-	switch pk1.Keytype {
-	case KeyAlgoRSA:
-		var key openSSHRSAPrivateKey
-		if err := Unmarshal(pk1.Rest, &key); err != nil {
-			return nil, err
-		}
-
-		if err := checkOpenSSHKeyPadding(key.Pad); err != nil {
-			return nil, err
-		}
-
-		pk := &rsa.PrivateKey{
-			PublicKey: rsa.PublicKey{
-				N: key.N,
-				E: int(key.E.Int64()),
-			},
-			D:      key.D,
-			Primes: []*big.Int{key.P, key.Q},
-		}
-
-		if err := pk.Validate(); err != nil {
-			return nil, err
-		}
-
-		pk.Precompute()
-
-		return pk, nil
-	case KeyAlgoED25519:
-		var key openSSHEd25519PrivateKey
-		if err := Unmarshal(pk1.Rest, &key); err != nil {
-			return nil, err
-		}
-
-		if len(key.Priv) != ed25519.PrivateKeySize {
-			return nil, errors.New("ssh: private key unexpected length")
-		}
-
-		if err := checkOpenSSHKeyPadding(key.Pad); err != nil {
-			return nil, err
-		}
-
-		pk := ed25519.PrivateKey(make([]byte, ed25519.PrivateKeySize))
-		copy(pk, key.Priv)
-		return &pk, nil
-	case KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521:
-		var key openSSHECDSAPrivateKey
-		if err := Unmarshal(pk1.Rest, &key); err != nil {
-			return nil, err
-		}
-
-		if err := checkOpenSSHKeyPadding(key.Pad); err != nil {
-			return nil, err
-		}
-
-		var curve elliptic.Curve
-		switch key.Curve {
-		case "nistp256":
-			curve = elliptic.P256()
-		case "nistp384":
-			curve = elliptic.P384()
-		case "nistp521":
-			curve = elliptic.P521()
-		default:
-			return nil, errors.New("ssh: unhandled elliptic curve: " + key.Curve)
-		}
-
-		X, Y := elliptic.Unmarshal(curve, key.Pub)
-		if X == nil || Y == nil {
-			return nil, errors.New("ssh: failed to unmarshal public key")
-		}
-
-		if key.D.Cmp(curve.Params().N) >= 0 {
-			return nil, errors.New("ssh: scalar is out of range")
-		}
-
-		x, y := curve.ScalarBaseMult(key.D.Bytes())
-		if x.Cmp(X) != 0 || y.Cmp(Y) != 0 {
-			return nil, errors.New("ssh: public key does not match private key")
-		}
-
-		return &ecdsa.PrivateKey{
-			PublicKey: ecdsa.PublicKey{
-				Curve: curve,
-				X:     X,
-				Y:     Y,
-			},
-			D: key.D,
-		}, nil
-	default:
-		return nil, errors.New("ssh: unhandled key type")
-	}
-}
-
-func marshalOpenSSHPrivateKey(key crypto.PrivateKey, comment string, encrypt openSSHEncryptFunc) (*pem.Block, error) {
-	var w openSSHEncryptedPrivateKey
-	var pk1 openSSHPrivateKey
-
-	// Random check bytes.
-	var check uint32
-	if err := binary.Read(rand.Reader, binary.BigEndian, &check); err != nil {
-		return nil, err
-	}
-
-	pk1.Check1 = check
-	pk1.Check2 = check
-	w.NumKeys = 1
-
-	// Use a []byte directly on ed25519 keys.
-	if k, ok := key.(*ed25519.PrivateKey); ok {
-		key = *k
-	}
-
-	switch k := key.(type) {
-	case *rsa.PrivateKey:
-		E := new(big.Int).SetInt64(int64(k.PublicKey.E))
-		// Marshal public key:
-		// E and N are in reversed order in the public and private key.
-		pubKey := struct {
-			KeyType string
-			E       *big.Int
-			N       *big.Int
-		}{
-			KeyAlgoRSA,
-			E, k.PublicKey.N,
-		}
-		w.PubKey = Marshal(pubKey)
-
-		// Marshal private key.
-		key := openSSHRSAPrivateKey{
-			N:       k.PublicKey.N,
-			E:       E,
-			D:       k.D,
-			Iqmp:    k.Precomputed.Qinv,
-			P:       k.Primes[0],
-			Q:       k.Primes[1],
-			Comment: comment,
-		}
-		pk1.Keytype = KeyAlgoRSA
-		pk1.Rest = Marshal(key)
-	case ed25519.PrivateKey:
-		pub := make([]byte, ed25519.PublicKeySize)
-		priv := make([]byte, ed25519.PrivateKeySize)
-		copy(pub, k[32:])
-		copy(priv, k)
-
-		// Marshal public key.
-		pubKey := struct {
-			KeyType string
-			Pub     []byte
-		}{
-			KeyAlgoED25519, pub,
-		}
-		w.PubKey = Marshal(pubKey)
-
-		// Marshal private key.
-		key := openSSHEd25519PrivateKey{
-			Pub:     pub,
-			Priv:    priv,
-			Comment: comment,
-		}
-		pk1.Keytype = KeyAlgoED25519
-		pk1.Rest = Marshal(key)
-	case *ecdsa.PrivateKey:
-		var curve, keyType string
-		switch name := k.Curve.Params().Name; name {
-		case "P-256":
-			curve = "nistp256"
-			keyType = KeyAlgoECDSA256
-		case "P-384":
-			curve = "nistp384"
-			keyType = KeyAlgoECDSA384
-		case "P-521":
-			curve = "nistp521"
-			keyType = KeyAlgoECDSA521
-		default:
-			return nil, errors.New("ssh: unhandled elliptic curve " + name)
-		}
-
-		pub := elliptic.Marshal(k.Curve, k.PublicKey.X, k.PublicKey.Y)
-
-		// Marshal public key.
-		pubKey := struct {
-			KeyType string
-			Curve   string
-			Pub     []byte
-		}{
-			keyType, curve, pub,
-		}
-		w.PubKey = Marshal(pubKey)
-
-		// Marshal private key.
-		key := openSSHECDSAPrivateKey{
-			Curve:   curve,
-			Pub:     pub,
-			D:       k.D,
-			Comment: comment,
-		}
-		pk1.Keytype = keyType
-		pk1.Rest = Marshal(key)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %T", k)
-	}
-
-	var err error
-	// Add padding and encrypt the key if necessary.
-	w.PrivKeyBlock, w.CipherName, w.KdfName, w.KdfOpts, err = encrypt(Marshal(pk1))
-	if err != nil {
-		return nil, err
-	}
-
-	b := Marshal(w)
-	block := &pem.Block{
-		Type:  "OPENSSH PRIVATE KEY",
-		Bytes: append([]byte(privateKeyAuthMagic), b...),
-	}
-	return block, nil
-}
-
-func checkOpenSSHKeyPadding(pad []byte) error {
-	for i, b := range pad {
-		if int(b) != i+1 {
-			return errors.New("ssh: padding not as expected")
-		}
-	}
-	return nil
-}
-
-func generateOpenSSHPadding(block []byte, blockSize int) []byte {
-	for i, l := 0, len(block); (l+i)%blockSize != 0; i++ {
-		block = append(block, byte(i+1))
-	}
-	return block
-}
-
-// FingerprintLegacyMD5 returns the user presentation of the key's
-// fingerprint as described by RFC 4716 section 4.
-func FingerprintLegacyMD5(pubKey PublicKey) string {
-	md5sum := md5.Sum(pubKey.Marshal())
-	hexarray := make([]string, len(md5sum))
-	for i, c := range md5sum {
-		hexarray[i] = hex.EncodeToString([]byte{c})
-	}
-	return strings.Join(hexarray, ":")
-}
-
-// FingerprintSHA256 returns the user presentation of the key's
-// fingerprint as unpadded base64 encoded sha256 hash.
-// This format was introduced from OpenSSH 6.8.
-// https://www.openssh.com/txt/release-6.8
-// https://tools.ietf.org/html/rfc4648#section-3.2 (unpadded base64 encoding)
-func FingerprintSHA256(pubKey PublicKey) string {
-	sha256sum := sha256.Sum256(pubKey.Marshal())
-	hash := base64.RawStdEncoding.EncodeToString(sha256sum[:])
-	return "SHA256:" + hash
-}
diff --git a/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts.go b/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts.go
deleted file mode 100644
index 1ebd7e6da..000000000
--- a/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts.go
+++ /dev/null
@@ -1,532 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package knownhosts implements a parser for the OpenSSH known_hosts
-// host key database, and provides utility functions for writing
-// OpenSSH compliant known_hosts files.
-package knownhosts
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/hmac"
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// See the sshd manpage
-// (http://man.openbsd.org/sshd#SSH_KNOWN_HOSTS_FILE_FORMAT) for
-// background.
-
-type addr struct{ host, port string }
-
-func (a *addr) String() string {
-	h := a.host
-	if strings.Contains(h, ":") {
-		h = "[" + h + "]"
-	}
-	return h + ":" + a.port
-}
-
-type matcher interface {
-	match(addr) bool
-}
-
-type hostPattern struct {
-	negate bool
-	addr   addr
-}
-
-func (p *hostPattern) String() string {
-	n := ""
-	if p.negate {
-		n = "!"
-	}
-
-	return n + p.addr.String()
-}
-
-type hostPatterns []hostPattern
-
-func (ps hostPatterns) match(a addr) bool {
-	matched := false
-	for _, p := range ps {
-		if !p.match(a) {
-			continue
-		}
-		if p.negate {
-			return false
-		}
-		matched = true
-	}
-	return matched
-}
-
-// See
-// https://android.googlesource.com/platform/external/openssh/+/ab28f5495c85297e7a597c1ba62e996416da7c7e/addrmatch.c
-// The matching of * has no regard for separators, unlike filesystem globs
-func wildcardMatch(pat []byte, str []byte) bool {
-	for {
-		if len(pat) == 0 {
-			return len(str) == 0
-		}
-		if len(str) == 0 {
-			return false
-		}
-
-		if pat[0] == '*' {
-			if len(pat) == 1 {
-				return true
-			}
-
-			for j := range str {
-				if wildcardMatch(pat[1:], str[j:]) {
-					return true
-				}
-			}
-			return false
-		}
-
-		if pat[0] == '?' || pat[0] == str[0] {
-			pat = pat[1:]
-			str = str[1:]
-		} else {
-			return false
-		}
-	}
-}
-
-func (p *hostPattern) match(a addr) bool {
-	return wildcardMatch([]byte(p.addr.host), []byte(a.host)) && p.addr.port == a.port
-}
-
-type keyDBLine struct {
-	cert     bool
-	matcher  matcher
-	knownKey KnownKey
-}
-
-func serialize(k ssh.PublicKey) string {
-	return k.Type() + " " + base64.StdEncoding.EncodeToString(k.Marshal())
-}
-
-func (l *keyDBLine) match(a addr) bool {
-	return l.matcher.match(a)
-}
-
-type hostKeyDB struct {
-	// Serialized version of revoked keys
-	revoked map[string]*KnownKey
-	lines   []keyDBLine
-}
-
-func newHostKeyDB() *hostKeyDB {
-	db := &hostKeyDB{
-		revoked: make(map[string]*KnownKey),
-	}
-
-	return db
-}
-
-func keyEq(a, b ssh.PublicKey) bool {
-	return bytes.Equal(a.Marshal(), b.Marshal())
-}
-
-// IsHostAuthority can be used as a callback in ssh.CertChecker
-func (db *hostKeyDB) IsHostAuthority(remote ssh.PublicKey, address string) bool {
-	h, p, err := net.SplitHostPort(address)
-	if err != nil {
-		return false
-	}
-	a := addr{host: h, port: p}
-
-	for _, l := range db.lines {
-		if l.cert && keyEq(l.knownKey.Key, remote) && l.match(a) {
-			return true
-		}
-	}
-	return false
-}
-
-// IsRevoked can be used as a callback in ssh.CertChecker
-func (db *hostKeyDB) IsRevoked(key *ssh.Certificate) bool {
-	_, ok := db.revoked[string(key.Marshal())]
-	return ok
-}
-
-const markerCert = "@cert-authority"
-const markerRevoked = "@revoked"
-
-func nextWord(line []byte) (string, []byte) {
-	i := bytes.IndexAny(line, "\t ")
-	if i == -1 {
-		return string(line), nil
-	}
-
-	return string(line[:i]), bytes.TrimSpace(line[i:])
-}
-
-func parseLine(line []byte) (marker, host string, key ssh.PublicKey, err error) {
-	if w, next := nextWord(line); w == markerCert || w == markerRevoked {
-		marker = w
-		line = next
-	}
-
-	host, line = nextWord(line)
-	if len(line) == 0 {
-		return "", "", nil, errors.New("knownhosts: missing host pattern")
-	}
-
-	// ignore the keytype as it's in the key blob anyway.
-	_, line = nextWord(line)
-	if len(line) == 0 {
-		return "", "", nil, errors.New("knownhosts: missing key type pattern")
-	}
-
-	keyBlob, _ := nextWord(line)
-
-	keyBytes, err := base64.StdEncoding.DecodeString(keyBlob)
-	if err != nil {
-		return "", "", nil, err
-	}
-	key, err = ssh.ParsePublicKey(keyBytes)
-	if err != nil {
-		return "", "", nil, err
-	}
-
-	return marker, host, key, nil
-}
-
-func (db *hostKeyDB) parseLine(line []byte, filename string, linenum int) error {
-	marker, pattern, key, err := parseLine(line)
-	if err != nil {
-		return err
-	}
-
-	if marker == markerRevoked {
-		db.revoked[string(key.Marshal())] = &KnownKey{
-			Key:      key,
-			Filename: filename,
-			Line:     linenum,
-		}
-
-		return nil
-	}
-
-	entry := keyDBLine{
-		cert: marker == markerCert,
-		knownKey: KnownKey{
-			Filename: filename,
-			Line:     linenum,
-			Key:      key,
-		},
-	}
-
-	if pattern[0] == '|' {
-		entry.matcher, err = newHashedHost(pattern)
-	} else {
-		entry.matcher, err = newHostnameMatcher(pattern)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	db.lines = append(db.lines, entry)
-	return nil
-}
-
-func newHostnameMatcher(pattern string) (matcher, error) {
-	var hps hostPatterns
-	for _, p := range strings.Split(pattern, ",") {
-		if len(p) == 0 {
-			continue
-		}
-
-		var a addr
-		var negate bool
-		if p[0] == '!' {
-			negate = true
-			p = p[1:]
-		}
-
-		if len(p) == 0 {
-			return nil, errors.New("knownhosts: negation without following hostname")
-		}
-
-		var err error
-		if p[0] == '[' {
-			a.host, a.port, err = net.SplitHostPort(p)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			a.host, a.port, err = net.SplitHostPort(p)
-			if err != nil {
-				a.host = p
-				a.port = "22"
-			}
-		}
-		hps = append(hps, hostPattern{
-			negate: negate,
-			addr:   a,
-		})
-	}
-	return hps, nil
-}
-
-// KnownKey represents a key declared in a known_hosts file.
-type KnownKey struct {
-	Key      ssh.PublicKey
-	Filename string
-	Line     int
-}
-
-func (k *KnownKey) String() string {
-	return fmt.Sprintf("%s:%d: %s", k.Filename, k.Line, serialize(k.Key))
-}
-
-// KeyError is returned if we did not find the key in the host key
-// database, or there was a mismatch.  Typically, in batch
-// applications, this should be interpreted as failure. Interactive
-// applications can offer an interactive prompt to the user.
-type KeyError struct {
-	// Want holds the accepted host keys. For each key algorithm,
-	// there can be multiple hostkeys.  If Want is empty, the host
-	// is unknown. If Want is non-empty, there was a mismatch, which
-	// can signify a MITM attack.
-	Want []KnownKey
-}
-
-func (u *KeyError) Error() string {
-	if len(u.Want) == 0 {
-		return "knownhosts: key is unknown"
-	}
-	return "knownhosts: key mismatch"
-}
-
-// RevokedError is returned if we found a key that was revoked.
-type RevokedError struct {
-	Revoked KnownKey
-}
-
-func (r *RevokedError) Error() string {
-	return "knownhosts: key is revoked"
-}
-
-// check checks a key against the host database. This should not be
-// used for verifying certificates.
-func (db *hostKeyDB) check(address string, remote net.Addr, remoteKey ssh.PublicKey) error {
-	if revoked := db.revoked[string(remoteKey.Marshal())]; revoked != nil {
-		return &RevokedError{Revoked: *revoked}
-	}
-
-	host, port, err := net.SplitHostPort(remote.String())
-	if err != nil {
-		return fmt.Errorf("knownhosts: SplitHostPort(%s): %v", remote, err)
-	}
-
-	hostToCheck := addr{host, port}
-	if address != "" {
-		// Give preference to the hostname if available.
-		host, port, err := net.SplitHostPort(address)
-		if err != nil {
-			return fmt.Errorf("knownhosts: SplitHostPort(%s): %v", address, err)
-		}
-
-		hostToCheck = addr{host, port}
-	}
-
-	return db.checkAddr(hostToCheck, remoteKey)
-}
-
-// checkAddr checks if we can find the given public key for the
-// given address.  If we only find an entry for the IP address,
-// or only the hostname, then this still succeeds.
-func (db *hostKeyDB) checkAddr(a addr, remoteKey ssh.PublicKey) error {
-	// TODO(hanwen): are these the right semantics? What if there
-	// is just a key for the IP address, but not for the
-	// hostname?
-
-	keyErr := &KeyError{}
-
-	for _, l := range db.lines {
-		if !l.match(a) {
-			continue
-		}
-
-		keyErr.Want = append(keyErr.Want, l.knownKey)
-		if keyEq(l.knownKey.Key, remoteKey) {
-			return nil
-		}
-	}
-
-	return keyErr
-}
-
-// The Read function parses file contents.
-func (db *hostKeyDB) Read(r io.Reader, filename string) error {
-	scanner := bufio.NewScanner(r)
-
-	lineNum := 0
-	for scanner.Scan() {
-		lineNum++
-		line := scanner.Bytes()
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 || line[0] == '#' {
-			continue
-		}
-
-		if err := db.parseLine(line, filename, lineNum); err != nil {
-			return fmt.Errorf("knownhosts: %s:%d: %v", filename, lineNum, err)
-		}
-	}
-	return scanner.Err()
-}
-
-// New creates a host key callback from the given OpenSSH host key
-// files. The returned callback is for use in
-// ssh.ClientConfig.HostKeyCallback. By preference, the key check
-// operates on the hostname if available, i.e. if a server changes its
-// IP address, the host key check will still succeed, even though a
-// record of the new IP address is not available.
-func New(files ...string) (ssh.HostKeyCallback, error) {
-	db := newHostKeyDB()
-	for _, fn := range files {
-		f, err := os.Open(fn)
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-		if err := db.Read(f, fn); err != nil {
-			return nil, err
-		}
-	}
-
-	var certChecker ssh.CertChecker
-	certChecker.IsHostAuthority = db.IsHostAuthority
-	certChecker.IsRevoked = db.IsRevoked
-	certChecker.HostKeyFallback = db.check
-
-	return certChecker.CheckHostKey, nil
-}
-
-// Normalize normalizes an address into the form used in known_hosts. Supports
-// IPv4, hostnames, bracketed IPv6. Any other non-standard formats are returned
-// with minimal transformation.
-func Normalize(address string) string {
-	const defaultSSHPort = "22"
-
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		host = address
-		port = defaultSSHPort
-	}
-
-	if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
-		host = host[1 : len(host)-1]
-	}
-
-	if port == defaultSSHPort {
-		return host
-	}
-	return "[" + host + "]:" + port
-}
-
-// Line returns a line to add append to the known_hosts files.
-func Line(addresses []string, key ssh.PublicKey) string {
-	var trimmed []string
-	for _, a := range addresses {
-		trimmed = append(trimmed, Normalize(a))
-	}
-
-	return strings.Join(trimmed, ",") + " " + serialize(key)
-}
-
-// HashHostname hashes the given hostname. The hostname is not
-// normalized before hashing.
-func HashHostname(hostname string) string {
-	// TODO(hanwen): check if we can safely normalize this always.
-	salt := make([]byte, sha1.Size)
-
-	_, err := rand.Read(salt)
-	if err != nil {
-		panic(fmt.Sprintf("crypto/rand failure %v", err))
-	}
-
-	hash := hashHost(hostname, salt)
-	return encodeHash(sha1HashType, salt, hash)
-}
-
-func decodeHash(encoded string) (hashType string, salt, hash []byte, err error) {
-	if len(encoded) == 0 || encoded[0] != '|' {
-		err = errors.New("knownhosts: hashed host must start with '|'")
-		return
-	}
-	components := strings.Split(encoded, "|")
-	if len(components) != 4 {
-		err = fmt.Errorf("knownhosts: got %d components, want 3", len(components))
-		return
-	}
-
-	hashType = components[1]
-	if salt, err = base64.StdEncoding.DecodeString(components[2]); err != nil {
-		return
-	}
-	if hash, err = base64.StdEncoding.DecodeString(components[3]); err != nil {
-		return
-	}
-	return
-}
-
-func encodeHash(typ string, salt []byte, hash []byte) string {
-	return strings.Join([]string{"",
-		typ,
-		base64.StdEncoding.EncodeToString(salt),
-		base64.StdEncoding.EncodeToString(hash),
-	}, "|")
-}
-
-// See https://android.googlesource.com/platform/external/openssh/+/ab28f5495c85297e7a597c1ba62e996416da7c7e/hostfile.c#120
-func hashHost(hostname string, salt []byte) []byte {
-	mac := hmac.New(sha1.New, salt)
-	mac.Write([]byte(hostname))
-	return mac.Sum(nil)
-}
-
-type hashedHost struct {
-	salt []byte
-	hash []byte
-}
-
-const sha1HashType = "1"
-
-func newHashedHost(encoded string) (*hashedHost, error) {
-	typ, salt, hash, err := decodeHash(encoded)
-	if err != nil {
-		return nil, err
-	}
-
-	// The type field seems for future algorithm agility, but it's
-	// actually hardcoded in openssh currently, see
-	// https://android.googlesource.com/platform/external/openssh/+/ab28f5495c85297e7a597c1ba62e996416da7c7e/hostfile.c#120
-	if typ != sha1HashType {
-		return nil, fmt.Errorf("knownhosts: got hash type %s, must be '1'", typ)
-	}
-
-	return &hashedHost{salt: salt, hash: hash}, nil
-}
-
-func (h *hashedHost) match(a addr) bool {
-	return bytes.Equal(hashHost(Normalize(a.String()), h.salt), h.hash)
-}
diff --git a/vendor/golang.org/x/crypto/ssh/mac.go b/vendor/golang.org/x/crypto/ssh/mac.go
deleted file mode 100644
index 87d626fbb..000000000
--- a/vendor/golang.org/x/crypto/ssh/mac.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-// Message authentication support
-
-import (
-	"crypto/fips140"
-	"crypto/hmac"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
-	"hash"
-	"slices"
-)
-
-type macMode struct {
-	keySize int
-	etm     bool
-	new     func(key []byte) hash.Hash
-}
-
-// truncatingMAC wraps around a hash.Hash and truncates the output digest to
-// a given size.
-type truncatingMAC struct {
-	length int
-	hmac   hash.Hash
-}
-
-func (t truncatingMAC) Write(data []byte) (int, error) {
-	return t.hmac.Write(data)
-}
-
-func (t truncatingMAC) Sum(in []byte) []byte {
-	out := t.hmac.Sum(in)
-	return out[:len(in)+t.length]
-}
-
-func (t truncatingMAC) Reset() {
-	t.hmac.Reset()
-}
-
-func (t truncatingMAC) Size() int {
-	return t.length
-}
-
-func (t truncatingMAC) BlockSize() int { return t.hmac.BlockSize() }
-
-// macModes defines the supported MACs. MACs not included are not supported
-// and will not be negotiated, even if explicitly configured. When FIPS mode is
-// enabled, only FIPS-approved algorithms are included.
-var macModes = map[string]*macMode{}
-
-func init() {
-	macModes[HMACSHA512ETM] = &macMode{64, true, func(key []byte) hash.Hash {
-		return hmac.New(sha512.New, key)
-	}}
-	macModes[HMACSHA256ETM] = &macMode{32, true, func(key []byte) hash.Hash {
-		return hmac.New(sha256.New, key)
-	}}
-	macModes[HMACSHA512] = &macMode{64, false, func(key []byte) hash.Hash {
-		return hmac.New(sha512.New, key)
-	}}
-	macModes[HMACSHA256] = &macMode{32, false, func(key []byte) hash.Hash {
-		return hmac.New(sha256.New, key)
-	}}
-
-	if fips140.Enabled() {
-		defaultMACs = slices.DeleteFunc(defaultMACs, func(algo string) bool {
-			_, ok := macModes[algo]
-			return !ok
-		})
-		return
-	}
-
-	macModes[HMACSHA1] = &macMode{20, false, func(key []byte) hash.Hash {
-		return hmac.New(sha1.New, key)
-	}}
-	macModes[InsecureHMACSHA196] = &macMode{20, false, func(key []byte) hash.Hash {
-		return truncatingMAC{12, hmac.New(sha1.New, key)}
-	}}
-}
diff --git a/vendor/golang.org/x/crypto/ssh/messages.go b/vendor/golang.org/x/crypto/ssh/messages.go
deleted file mode 100644
index ab22c3d38..000000000
--- a/vendor/golang.org/x/crypto/ssh/messages.go
+++ /dev/null
@@ -1,893 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"reflect"
-	"strconv"
-	"strings"
-)
-
-// These are SSH message type numbers. They are scattered around several
-// documents but many were taken from [SSH-PARAMETERS].
-const (
-	msgIgnore        = 2
-	msgUnimplemented = 3
-	msgDebug         = 4
-	msgNewKeys       = 21
-)
-
-// SSH messages:
-//
-// These structures mirror the wire format of the corresponding SSH messages.
-// They are marshaled using reflection with the marshal and unmarshal functions
-// in this file. The only wrinkle is that a final member of type []byte with a
-// ssh tag of "rest" receives the remainder of a packet when unmarshaling.
-
-// See RFC 4253, section 11.1.
-const msgDisconnect = 1
-
-// disconnectMsg is the message that signals a disconnect. It is also
-// the error type returned from mux.Wait()
-type disconnectMsg struct {
-	Reason   uint32 `sshtype:"1"`
-	Message  string
-	Language string
-}
-
-func (d *disconnectMsg) Error() string {
-	return fmt.Sprintf("ssh: disconnect, reason %d: %s", d.Reason, d.Message)
-}
-
-// See RFC 4253, section 7.1.
-const msgKexInit = 20
-
-type kexInitMsg struct {
-	Cookie                  [16]byte `sshtype:"20"`
-	KexAlgos                []string
-	ServerHostKeyAlgos      []string
-	CiphersClientServer     []string
-	CiphersServerClient     []string
-	MACsClientServer        []string
-	MACsServerClient        []string
-	CompressionClientServer []string
-	CompressionServerClient []string
-	LanguagesClientServer   []string
-	LanguagesServerClient   []string
-	FirstKexFollows         bool
-	Reserved                uint32
-}
-
-// See RFC 4253, section 8.
-
-// Diffie-Hellman
-const msgKexDHInit = 30
-
-type kexDHInitMsg struct {
-	X *big.Int `sshtype:"30"`
-}
-
-const msgKexECDHInit = 30
-
-type kexECDHInitMsg struct {
-	ClientPubKey []byte `sshtype:"30"`
-}
-
-const msgKexECDHReply = 31
-
-type kexECDHReplyMsg struct {
-	HostKey         []byte `sshtype:"31"`
-	EphemeralPubKey []byte
-	Signature       []byte
-}
-
-const msgKexDHReply = 31
-
-type kexDHReplyMsg struct {
-	HostKey   []byte `sshtype:"31"`
-	Y         *big.Int
-	Signature []byte
-}
-
-// See RFC 4419, section 5.
-const msgKexDHGexGroup = 31
-
-type kexDHGexGroupMsg struct {
-	P *big.Int `sshtype:"31"`
-	G *big.Int
-}
-
-const msgKexDHGexInit = 32
-
-type kexDHGexInitMsg struct {
-	X *big.Int `sshtype:"32"`
-}
-
-const msgKexDHGexReply = 33
-
-type kexDHGexReplyMsg struct {
-	HostKey   []byte `sshtype:"33"`
-	Y         *big.Int
-	Signature []byte
-}
-
-const msgKexDHGexRequest = 34
-
-type kexDHGexRequestMsg struct {
-	MinBits       uint32 `sshtype:"34"`
-	PreferredBits uint32
-	MaxBits       uint32
-}
-
-// See RFC 4253, section 10.
-const msgServiceRequest = 5
-
-type serviceRequestMsg struct {
-	Service string `sshtype:"5"`
-}
-
-// See RFC 4253, section 10.
-const msgServiceAccept = 6
-
-type serviceAcceptMsg struct {
-	Service string `sshtype:"6"`
-}
-
-// See RFC 8308, section 2.3
-const msgExtInfo = 7
-
-type extInfoMsg struct {
-	NumExtensions uint32 `sshtype:"7"`
-	Payload       []byte `ssh:"rest"`
-}
-
-// See RFC 4252, section 5.
-const msgUserAuthRequest = 50
-
-type userAuthRequestMsg struct {
-	User    string `sshtype:"50"`
-	Service string
-	Method  string
-	Payload []byte `ssh:"rest"`
-}
-
-// Used for debug printouts of packets.
-type userAuthSuccessMsg struct {
-}
-
-// See RFC 4252, section 5.1
-const msgUserAuthFailure = 51
-
-type userAuthFailureMsg struct {
-	Methods        []string `sshtype:"51"`
-	PartialSuccess bool
-}
-
-// See RFC 4252, section 5.1
-const msgUserAuthSuccess = 52
-
-// See RFC 4252, section 5.4
-const msgUserAuthBanner = 53
-
-type userAuthBannerMsg struct {
-	Message string `sshtype:"53"`
-	// unused, but required to allow message parsing
-	Language string
-}
-
-// See RFC 4256, section 3.2
-const msgUserAuthInfoRequest = 60
-const msgUserAuthInfoResponse = 61
-
-type userAuthInfoRequestMsg struct {
-	Name        string `sshtype:"60"`
-	Instruction string
-	Language    string
-	NumPrompts  uint32
-	Prompts     []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.1.
-const msgChannelOpen = 90
-
-type channelOpenMsg struct {
-	ChanType         string `sshtype:"90"`
-	PeersID          uint32
-	PeersWindow      uint32
-	MaxPacketSize    uint32
-	TypeSpecificData []byte `ssh:"rest"`
-}
-
-const msgChannelExtendedData = 95
-const msgChannelData = 94
-
-// Used for debug print outs of packets.
-type channelDataMsg struct {
-	PeersID uint32 `sshtype:"94"`
-	Length  uint32
-	Rest    []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.1.
-const msgChannelOpenConfirm = 91
-
-type channelOpenConfirmMsg struct {
-	PeersID          uint32 `sshtype:"91"`
-	MyID             uint32
-	MyWindow         uint32
-	MaxPacketSize    uint32
-	TypeSpecificData []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.1.
-const msgChannelOpenFailure = 92
-
-type channelOpenFailureMsg struct {
-	PeersID  uint32 `sshtype:"92"`
-	Reason   RejectionReason
-	Message  string
-	Language string
-}
-
-const msgChannelRequest = 98
-
-type channelRequestMsg struct {
-	PeersID             uint32 `sshtype:"98"`
-	Request             string
-	WantReply           bool
-	RequestSpecificData []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.4.
-const msgChannelSuccess = 99
-
-type channelRequestSuccessMsg struct {
-	PeersID uint32 `sshtype:"99"`
-}
-
-// See RFC 4254, section 5.4.
-const msgChannelFailure = 100
-
-type channelRequestFailureMsg struct {
-	PeersID uint32 `sshtype:"100"`
-}
-
-// See RFC 4254, section 5.3
-const msgChannelClose = 97
-
-type channelCloseMsg struct {
-	PeersID uint32 `sshtype:"97"`
-}
-
-// See RFC 4254, section 5.3
-const msgChannelEOF = 96
-
-type channelEOFMsg struct {
-	PeersID uint32 `sshtype:"96"`
-}
-
-// See RFC 4254, section 4
-const msgGlobalRequest = 80
-
-type globalRequestMsg struct {
-	Type      string `sshtype:"80"`
-	WantReply bool
-	Data      []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 4
-const msgRequestSuccess = 81
-
-type globalRequestSuccessMsg struct {
-	Data []byte `ssh:"rest" sshtype:"81"`
-}
-
-// See RFC 4254, section 4
-const msgRequestFailure = 82
-
-type globalRequestFailureMsg struct {
-	Data []byte `ssh:"rest" sshtype:"82"`
-}
-
-// See RFC 4254, section 5.2
-const msgChannelWindowAdjust = 93
-
-type windowAdjustMsg struct {
-	PeersID         uint32 `sshtype:"93"`
-	AdditionalBytes uint32
-}
-
-// See RFC 4252, section 7
-const msgUserAuthPubKeyOk = 60
-
-type userAuthPubKeyOkMsg struct {
-	Algo   string `sshtype:"60"`
-	PubKey []byte
-}
-
-// See RFC 4462, section 3
-const msgUserAuthGSSAPIResponse = 60
-
-type userAuthGSSAPIResponse struct {
-	SupportMech []byte `sshtype:"60"`
-}
-
-const msgUserAuthGSSAPIToken = 61
-
-type userAuthGSSAPIToken struct {
-	Token []byte `sshtype:"61"`
-}
-
-const msgUserAuthGSSAPIMIC = 66
-
-type userAuthGSSAPIMIC struct {
-	MIC []byte `sshtype:"66"`
-}
-
-// See RFC 4462, section 3.9
-const msgUserAuthGSSAPIErrTok = 64
-
-type userAuthGSSAPIErrTok struct {
-	ErrorToken []byte `sshtype:"64"`
-}
-
-// See RFC 4462, section 3.8
-const msgUserAuthGSSAPIError = 65
-
-type userAuthGSSAPIError struct {
-	MajorStatus uint32 `sshtype:"65"`
-	MinorStatus uint32
-	Message     string
-	LanguageTag string
-}
-
-// Transport layer OpenSSH extension. See [PROTOCOL], section 1.9
-const msgPing = 192
-
-type pingMsg struct {
-	Data string `sshtype:"192"`
-}
-
-// Transport layer OpenSSH extension. See [PROTOCOL], section 1.9
-const msgPong = 193
-
-type pongMsg struct {
-	Data string `sshtype:"193"`
-}
-
-// typeTags returns the possible type bytes for the given reflect.Type, which
-// should be a struct. The possible values are separated by a '|' character.
-func typeTags(structType reflect.Type) (tags []byte) {
-	tagStr := structType.Field(0).Tag.Get("sshtype")
-
-	for _, tag := range strings.Split(tagStr, "|") {
-		i, err := strconv.Atoi(tag)
-		if err == nil {
-			tags = append(tags, byte(i))
-		}
-	}
-
-	return tags
-}
-
-func fieldError(t reflect.Type, field int, problem string) error {
-	if problem != "" {
-		problem = ": " + problem
-	}
-	return fmt.Errorf("ssh: unmarshal error for field %s of type %s%s", t.Field(field).Name, t.Name(), problem)
-}
-
-var errShortRead = errors.New("ssh: short read")
-
-// Unmarshal parses data in SSH wire format into a structure. The out
-// argument should be a pointer to struct. If the first member of the
-// struct has the "sshtype" tag set to a '|'-separated set of numbers
-// in decimal, the packet must start with one of those numbers. In
-// case of error, Unmarshal returns a ParseError or
-// UnexpectedMessageError.
-func Unmarshal(data []byte, out interface{}) error {
-	v := reflect.ValueOf(out).Elem()
-	structType := v.Type()
-	expectedTypes := typeTags(structType)
-
-	var expectedType byte
-	if len(expectedTypes) > 0 {
-		expectedType = expectedTypes[0]
-	}
-
-	if len(data) == 0 {
-		return parseError(expectedType)
-	}
-
-	if len(expectedTypes) > 0 {
-		goodType := false
-		for _, e := range expectedTypes {
-			if e > 0 && data[0] == e {
-				goodType = true
-				break
-			}
-		}
-		if !goodType {
-			return fmt.Errorf("ssh: unexpected message type %d (expected one of %v)", data[0], expectedTypes)
-		}
-		data = data[1:]
-	}
-
-	var ok bool
-	for i := 0; i < v.NumField(); i++ {
-		field := v.Field(i)
-		t := field.Type()
-		switch t.Kind() {
-		case reflect.Bool:
-			if len(data) < 1 {
-				return errShortRead
-			}
-			field.SetBool(data[0] != 0)
-			data = data[1:]
-		case reflect.Array:
-			if t.Elem().Kind() != reflect.Uint8 {
-				return fieldError(structType, i, "array of unsupported type")
-			}
-			if len(data) < t.Len() {
-				return errShortRead
-			}
-			for j, n := 0, t.Len(); j < n; j++ {
-				field.Index(j).Set(reflect.ValueOf(data[j]))
-			}
-			data = data[t.Len():]
-		case reflect.Uint64:
-			var u64 uint64
-			if u64, data, ok = parseUint64(data); !ok {
-				return errShortRead
-			}
-			field.SetUint(u64)
-		case reflect.Uint32:
-			var u32 uint32
-			if u32, data, ok = parseUint32(data); !ok {
-				return errShortRead
-			}
-			field.SetUint(uint64(u32))
-		case reflect.Uint8:
-			if len(data) < 1 {
-				return errShortRead
-			}
-			field.SetUint(uint64(data[0]))
-			data = data[1:]
-		case reflect.String:
-			var s []byte
-			if s, data, ok = parseString(data); !ok {
-				return fieldError(structType, i, "")
-			}
-			field.SetString(string(s))
-		case reflect.Slice:
-			switch t.Elem().Kind() {
-			case reflect.Uint8:
-				if structType.Field(i).Tag.Get("ssh") == "rest" {
-					field.Set(reflect.ValueOf(data))
-					data = nil
-				} else {
-					var s []byte
-					if s, data, ok = parseString(data); !ok {
-						return errShortRead
-					}
-					field.Set(reflect.ValueOf(s))
-				}
-			case reflect.String:
-				var nl []string
-				if nl, data, ok = parseNameList(data); !ok {
-					return errShortRead
-				}
-				field.Set(reflect.ValueOf(nl))
-			default:
-				return fieldError(structType, i, "slice of unsupported type")
-			}
-		case reflect.Ptr:
-			if t == bigIntType {
-				var n *big.Int
-				if n, data, ok = parseInt(data); !ok {
-					return errShortRead
-				}
-				field.Set(reflect.ValueOf(n))
-			} else {
-				return fieldError(structType, i, "pointer to unsupported type")
-			}
-		default:
-			return fieldError(structType, i, fmt.Sprintf("unsupported type: %v", t))
-		}
-	}
-
-	if len(data) != 0 {
-		return parseError(expectedType)
-	}
-
-	return nil
-}
-
-// Marshal serializes the message in msg to SSH wire format.  The msg
-// argument should be a struct or pointer to struct. If the first
-// member has the "sshtype" tag set to a number in decimal, that
-// number is prepended to the result. If the last of member has the
-// "ssh" tag set to "rest", its contents are appended to the output.
-func Marshal(msg interface{}) []byte {
-	out := make([]byte, 0, 64)
-	return marshalStruct(out, msg)
-}
-
-func marshalStruct(out []byte, msg interface{}) []byte {
-	v := reflect.Indirect(reflect.ValueOf(msg))
-	msgTypes := typeTags(v.Type())
-	if len(msgTypes) > 0 {
-		out = append(out, msgTypes[0])
-	}
-
-	for i, n := 0, v.NumField(); i < n; i++ {
-		field := v.Field(i)
-		switch t := field.Type(); t.Kind() {
-		case reflect.Bool:
-			var v uint8
-			if field.Bool() {
-				v = 1
-			}
-			out = append(out, v)
-		case reflect.Array:
-			if t.Elem().Kind() != reflect.Uint8 {
-				panic(fmt.Sprintf("array of non-uint8 in field %d: %T", i, field.Interface()))
-			}
-			for j, l := 0, t.Len(); j < l; j++ {
-				out = append(out, uint8(field.Index(j).Uint()))
-			}
-		case reflect.Uint32:
-			out = appendU32(out, uint32(field.Uint()))
-		case reflect.Uint64:
-			out = appendU64(out, uint64(field.Uint()))
-		case reflect.Uint8:
-			out = append(out, uint8(field.Uint()))
-		case reflect.String:
-			s := field.String()
-			out = appendInt(out, len(s))
-			out = append(out, s...)
-		case reflect.Slice:
-			switch t.Elem().Kind() {
-			case reflect.Uint8:
-				if v.Type().Field(i).Tag.Get("ssh") != "rest" {
-					out = appendInt(out, field.Len())
-				}
-				out = append(out, field.Bytes()...)
-			case reflect.String:
-				offset := len(out)
-				out = appendU32(out, 0)
-				if n := field.Len(); n > 0 {
-					for j := 0; j < n; j++ {
-						f := field.Index(j)
-						if j != 0 {
-							out = append(out, ',')
-						}
-						out = append(out, f.String()...)
-					}
-					// overwrite length value
-					binary.BigEndian.PutUint32(out[offset:], uint32(len(out)-offset-4))
-				}
-			default:
-				panic(fmt.Sprintf("slice of unknown type in field %d: %T", i, field.Interface()))
-			}
-		case reflect.Ptr:
-			if t == bigIntType {
-				var n *big.Int
-				nValue := reflect.ValueOf(&n)
-				nValue.Elem().Set(field)
-				needed := intLength(n)
-				oldLength := len(out)
-
-				if cap(out)-len(out) < needed {
-					newOut := make([]byte, len(out), 2*(len(out)+needed))
-					copy(newOut, out)
-					out = newOut
-				}
-				out = out[:oldLength+needed]
-				marshalInt(out[oldLength:], n)
-			} else {
-				panic(fmt.Sprintf("pointer to unknown type in field %d: %T", i, field.Interface()))
-			}
-		}
-	}
-
-	return out
-}
-
-var bigOne = big.NewInt(1)
-
-func parseString(in []byte) (out, rest []byte, ok bool) {
-	if len(in) < 4 {
-		return
-	}
-	length := binary.BigEndian.Uint32(in)
-	in = in[4:]
-	if uint32(len(in)) < length {
-		return
-	}
-	out = in[:length]
-	rest = in[length:]
-	ok = true
-	return
-}
-
-var (
-	comma         = []byte{','}
-	emptyNameList = []string{}
-)
-
-func parseNameList(in []byte) (out []string, rest []byte, ok bool) {
-	contents, rest, ok := parseString(in)
-	if !ok {
-		return
-	}
-	if len(contents) == 0 {
-		out = emptyNameList
-		return
-	}
-	parts := bytes.Split(contents, comma)
-	out = make([]string, len(parts))
-	for i, part := range parts {
-		out[i] = string(part)
-	}
-	return
-}
-
-func parseInt(in []byte) (out *big.Int, rest []byte, ok bool) {
-	contents, rest, ok := parseString(in)
-	if !ok {
-		return
-	}
-	out = new(big.Int)
-
-	if len(contents) > 0 && contents[0]&0x80 == 0x80 {
-		// This is a negative number
-		notBytes := make([]byte, len(contents))
-		for i := range notBytes {
-			notBytes[i] = ^contents[i]
-		}
-		out.SetBytes(notBytes)
-		out.Add(out, bigOne)
-		out.Neg(out)
-	} else {
-		// Positive number
-		out.SetBytes(contents)
-	}
-	ok = true
-	return
-}
-
-func parseUint32(in []byte) (uint32, []byte, bool) {
-	if len(in) < 4 {
-		return 0, nil, false
-	}
-	return binary.BigEndian.Uint32(in), in[4:], true
-}
-
-func parseUint64(in []byte) (uint64, []byte, bool) {
-	if len(in) < 8 {
-		return 0, nil, false
-	}
-	return binary.BigEndian.Uint64(in), in[8:], true
-}
-
-func intLength(n *big.Int) int {
-	length := 4 /* length bytes */
-	if n.Sign() < 0 {
-		nMinus1 := new(big.Int).Neg(n)
-		nMinus1.Sub(nMinus1, bigOne)
-		bitLen := nMinus1.BitLen()
-		if bitLen%8 == 0 {
-			// The number will need 0xff padding
-			length++
-		}
-		length += (bitLen + 7) / 8
-	} else if n.Sign() == 0 {
-		// A zero is the zero length string
-	} else {
-		bitLen := n.BitLen()
-		if bitLen%8 == 0 {
-			// The number will need 0x00 padding
-			length++
-		}
-		length += (bitLen + 7) / 8
-	}
-
-	return length
-}
-
-func marshalUint32(to []byte, n uint32) []byte {
-	binary.BigEndian.PutUint32(to, n)
-	return to[4:]
-}
-
-func marshalUint64(to []byte, n uint64) []byte {
-	binary.BigEndian.PutUint64(to, n)
-	return to[8:]
-}
-
-func marshalInt(to []byte, n *big.Int) []byte {
-	lengthBytes := to
-	to = to[4:]
-	length := 0
-
-	if n.Sign() < 0 {
-		// A negative number has to be converted to two's-complement
-		// form. So we'll subtract 1 and invert. If the
-		// most-significant-bit isn't set then we'll need to pad the
-		// beginning with 0xff in order to keep the number negative.
-		nMinus1 := new(big.Int).Neg(n)
-		nMinus1.Sub(nMinus1, bigOne)
-		bytes := nMinus1.Bytes()
-		for i := range bytes {
-			bytes[i] ^= 0xff
-		}
-		if len(bytes) == 0 || bytes[0]&0x80 == 0 {
-			to[0] = 0xff
-			to = to[1:]
-			length++
-		}
-		nBytes := copy(to, bytes)
-		to = to[nBytes:]
-		length += nBytes
-	} else if n.Sign() == 0 {
-		// A zero is the zero length string
-	} else {
-		bytes := n.Bytes()
-		if len(bytes) > 0 && bytes[0]&0x80 != 0 {
-			// We'll have to pad this with a 0x00 in order to
-			// stop it looking like a negative number.
-			to[0] = 0
-			to = to[1:]
-			length++
-		}
-		nBytes := copy(to, bytes)
-		to = to[nBytes:]
-		length += nBytes
-	}
-
-	lengthBytes[0] = byte(length >> 24)
-	lengthBytes[1] = byte(length >> 16)
-	lengthBytes[2] = byte(length >> 8)
-	lengthBytes[3] = byte(length)
-	return to
-}
-
-func writeInt(w io.Writer, n *big.Int) {
-	length := intLength(n)
-	buf := make([]byte, length)
-	marshalInt(buf, n)
-	w.Write(buf)
-}
-
-func writeString(w io.Writer, s []byte) {
-	var lengthBytes [4]byte
-	lengthBytes[0] = byte(len(s) >> 24)
-	lengthBytes[1] = byte(len(s) >> 16)
-	lengthBytes[2] = byte(len(s) >> 8)
-	lengthBytes[3] = byte(len(s))
-	w.Write(lengthBytes[:])
-	w.Write(s)
-}
-
-func stringLength(n int) int {
-	return 4 + n
-}
-
-func marshalString(to []byte, s []byte) []byte {
-	to[0] = byte(len(s) >> 24)
-	to[1] = byte(len(s) >> 16)
-	to[2] = byte(len(s) >> 8)
-	to[3] = byte(len(s))
-	to = to[4:]
-	copy(to, s)
-	return to[len(s):]
-}
-
-var bigIntType = reflect.TypeFor[*big.Int]()
-
-// Decode a packet into its corresponding message.
-func decode(packet []byte) (interface{}, error) {
-	var msg interface{}
-	switch packet[0] {
-	case msgDisconnect:
-		msg = new(disconnectMsg)
-	case msgServiceRequest:
-		msg = new(serviceRequestMsg)
-	case msgServiceAccept:
-		msg = new(serviceAcceptMsg)
-	case msgExtInfo:
-		msg = new(extInfoMsg)
-	case msgKexInit:
-		msg = new(kexInitMsg)
-	case msgKexDHInit:
-		msg = new(kexDHInitMsg)
-	case msgKexDHReply:
-		msg = new(kexDHReplyMsg)
-	case msgUserAuthRequest:
-		msg = new(userAuthRequestMsg)
-	case msgUserAuthSuccess:
-		return new(userAuthSuccessMsg), nil
-	case msgUserAuthFailure:
-		msg = new(userAuthFailureMsg)
-	case msgUserAuthBanner:
-		msg = new(userAuthBannerMsg)
-	case msgUserAuthPubKeyOk:
-		msg = new(userAuthPubKeyOkMsg)
-	case msgGlobalRequest:
-		msg = new(globalRequestMsg)
-	case msgRequestSuccess:
-		msg = new(globalRequestSuccessMsg)
-	case msgRequestFailure:
-		msg = new(globalRequestFailureMsg)
-	case msgChannelOpen:
-		msg = new(channelOpenMsg)
-	case msgChannelData:
-		msg = new(channelDataMsg)
-	case msgChannelOpenConfirm:
-		msg = new(channelOpenConfirmMsg)
-	case msgChannelOpenFailure:
-		msg = new(channelOpenFailureMsg)
-	case msgChannelWindowAdjust:
-		msg = new(windowAdjustMsg)
-	case msgChannelEOF:
-		msg = new(channelEOFMsg)
-	case msgChannelClose:
-		msg = new(channelCloseMsg)
-	case msgChannelRequest:
-		msg = new(channelRequestMsg)
-	case msgChannelSuccess:
-		msg = new(channelRequestSuccessMsg)
-	case msgChannelFailure:
-		msg = new(channelRequestFailureMsg)
-	case msgUserAuthGSSAPIToken:
-		msg = new(userAuthGSSAPIToken)
-	case msgUserAuthGSSAPIMIC:
-		msg = new(userAuthGSSAPIMIC)
-	case msgUserAuthGSSAPIErrTok:
-		msg = new(userAuthGSSAPIErrTok)
-	case msgUserAuthGSSAPIError:
-		msg = new(userAuthGSSAPIError)
-	default:
-		return nil, unexpectedMessageError(0, packet[0])
-	}
-	if err := Unmarshal(packet, msg); err != nil {
-		return nil, err
-	}
-	return msg, nil
-}
-
-var packetTypeNames = map[byte]string{
-	msgDisconnect:          "disconnectMsg",
-	msgServiceRequest:      "serviceRequestMsg",
-	msgServiceAccept:       "serviceAcceptMsg",
-	msgExtInfo:             "extInfoMsg",
-	msgKexInit:             "kexInitMsg",
-	msgKexDHInit:           "kexDHInitMsg",
-	msgKexDHReply:          "kexDHReplyMsg",
-	msgUserAuthRequest:     "userAuthRequestMsg",
-	msgUserAuthSuccess:     "userAuthSuccessMsg",
-	msgUserAuthFailure:     "userAuthFailureMsg",
-	msgUserAuthPubKeyOk:    "userAuthPubKeyOkMsg",
-	msgGlobalRequest:       "globalRequestMsg",
-	msgRequestSuccess:      "globalRequestSuccessMsg",
-	msgRequestFailure:      "globalRequestFailureMsg",
-	msgChannelOpen:         "channelOpenMsg",
-	msgChannelData:         "channelDataMsg",
-	msgChannelOpenConfirm:  "channelOpenConfirmMsg",
-	msgChannelOpenFailure:  "channelOpenFailureMsg",
-	msgChannelWindowAdjust: "windowAdjustMsg",
-	msgChannelEOF:          "channelEOFMsg",
-	msgChannelClose:        "channelCloseMsg",
-	msgChannelRequest:      "channelRequestMsg",
-	msgChannelSuccess:      "channelRequestSuccessMsg",
-	msgChannelFailure:      "channelRequestFailureMsg",
-}
diff --git a/vendor/golang.org/x/crypto/ssh/mlkem.go b/vendor/golang.org/x/crypto/ssh/mlkem.go
deleted file mode 100644
index ddc0ed1fc..000000000
--- a/vendor/golang.org/x/crypto/ssh/mlkem.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto"
-	"crypto/mlkem"
-	"crypto/sha256"
-	"errors"
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/curve25519"
-)
-
-// mlkem768WithCurve25519sha256 implements the hybrid ML-KEM768 with
-// curve25519-sha256 key exchange method, as described by
-// draft-kampanakis-curdle-ssh-pq-ke-05 section 2.3.3.
-type mlkem768WithCurve25519sha256 struct{}
-
-func (kex *mlkem768WithCurve25519sha256) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	var c25519kp curve25519KeyPair
-	if err := c25519kp.generate(rand); err != nil {
-		return nil, err
-	}
-
-	seed := make([]byte, mlkem.SeedSize)
-	if _, err := io.ReadFull(rand, seed); err != nil {
-		return nil, err
-	}
-
-	mlkemDk, err := mlkem.NewDecapsulationKey768(seed)
-	if err != nil {
-		return nil, err
-	}
-
-	hybridKey := append(mlkemDk.EncapsulationKey().Bytes(), c25519kp.pub[:]...)
-	if err := c.writePacket(Marshal(&kexECDHInitMsg{hybridKey})); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var reply kexECDHReplyMsg
-	if err = Unmarshal(packet, &reply); err != nil {
-		return nil, err
-	}
-
-	if len(reply.EphemeralPubKey) != mlkem.CiphertextSize768+32 {
-		return nil, errors.New("ssh: peer's mlkem768x25519 public value has wrong length")
-	}
-
-	// Perform KEM decapsulate operation to obtain shared key from ML-KEM.
-	mlkem768Secret, err := mlkemDk.Decapsulate(reply.EphemeralPubKey[:mlkem.CiphertextSize768])
-	if err != nil {
-		return nil, err
-	}
-
-	// Complete Curve25519 ECDH to obtain its shared key.
-	c25519Secret, err := curve25519.X25519(c25519kp.priv[:], reply.EphemeralPubKey[mlkem.CiphertextSize768:])
-	if err != nil {
-		return nil, fmt.Errorf("ssh: peer's mlkem768x25519 public value is not valid: %w", err)
-	}
-	// Compute actual shared key.
-	h := sha256.New()
-	h.Write(mlkem768Secret)
-	h.Write(c25519Secret)
-	secret := h.Sum(nil)
-
-	h.Reset()
-	magics.write(h)
-	writeString(h, reply.HostKey)
-	writeString(h, hybridKey)
-	writeString(h, reply.EphemeralPubKey)
-
-	K := make([]byte, stringLength(len(secret)))
-	marshalString(K, secret)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: reply.Signature,
-		Hash:      crypto.SHA256,
-	}, nil
-}
-
-func (kex *mlkem768WithCurve25519sha256) Server(c packetConn, rand io.Reader, magics *handshakeMagics, priv AlgorithmSigner, algo string) (*kexResult, error) {
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var kexInit kexECDHInitMsg
-	if err = Unmarshal(packet, &kexInit); err != nil {
-		return nil, err
-	}
-
-	if len(kexInit.ClientPubKey) != mlkem.EncapsulationKeySize768+32 {
-		return nil, errors.New("ssh: peer's ML-KEM768/curve25519 public value has wrong length")
-	}
-
-	encapsulationKey, err := mlkem.NewEncapsulationKey768(kexInit.ClientPubKey[:mlkem.EncapsulationKeySize768])
-	if err != nil {
-		return nil, fmt.Errorf("ssh: peer's ML-KEM768 encapsulation key is not valid: %w", err)
-	}
-	// Perform KEM encapsulate operation to obtain ciphertext and shared key.
-	mlkem768Secret, mlkem768Ciphertext := encapsulationKey.Encapsulate()
-
-	// Perform server side of Curve25519 ECDH to obtain server public value and
-	// shared key.
-	var c25519kp curve25519KeyPair
-	if err := c25519kp.generate(rand); err != nil {
-		return nil, err
-	}
-	c25519Secret, err := curve25519.X25519(c25519kp.priv[:], kexInit.ClientPubKey[mlkem.EncapsulationKeySize768:])
-	if err != nil {
-		return nil, fmt.Errorf("ssh: peer's ML-KEM768/curve25519 public value is not valid: %w", err)
-	}
-	hybridKey := append(mlkem768Ciphertext, c25519kp.pub[:]...)
-
-	// Compute actual shared key.
-	h := sha256.New()
-	h.Write(mlkem768Secret)
-	h.Write(c25519Secret)
-	secret := h.Sum(nil)
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	h.Reset()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeString(h, kexInit.ClientPubKey)
-	writeString(h, hybridKey)
-
-	K := make([]byte, stringLength(len(secret)))
-	marshalString(K, secret)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	sig, err := signAndMarshal(priv, rand, H, algo)
-	if err != nil {
-		return nil, err
-	}
-
-	reply := kexECDHReplyMsg{
-		EphemeralPubKey: hybridKey,
-		HostKey:         hostKeyBytes,
-		Signature:       sig,
-	}
-	if err := c.writePacket(Marshal(&reply)); err != nil {
-		return nil, err
-	}
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   hostKeyBytes,
-		Signature: sig,
-		Hash:      crypto.SHA256,
-	}, nil
-}
diff --git a/vendor/golang.org/x/crypto/ssh/mux.go b/vendor/golang.org/x/crypto/ssh/mux.go
deleted file mode 100644
index d2d24c635..000000000
--- a/vendor/golang.org/x/crypto/ssh/mux.go
+++ /dev/null
@@ -1,357 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"log"
-	"sync"
-	"sync/atomic"
-)
-
-// debugMux, if set, causes messages in the connection protocol to be
-// logged.
-const debugMux = false
-
-// chanList is a thread safe channel list.
-type chanList struct {
-	// protects concurrent access to chans
-	sync.Mutex
-
-	// chans are indexed by the local id of the channel, which the
-	// other side should send in the PeersId field.
-	chans []*channel
-
-	// This is a debugging aid: it offsets all IDs by this
-	// amount. This helps distinguish otherwise identical
-	// server/client muxes
-	offset uint32
-}
-
-// Assigns a channel ID to the given channel.
-func (c *chanList) add(ch *channel) uint32 {
-	c.Lock()
-	defer c.Unlock()
-	for i := range c.chans {
-		if c.chans[i] == nil {
-			c.chans[i] = ch
-			return uint32(i) + c.offset
-		}
-	}
-	c.chans = append(c.chans, ch)
-	return uint32(len(c.chans)-1) + c.offset
-}
-
-// getChan returns the channel for the given ID.
-func (c *chanList) getChan(id uint32) *channel {
-	id -= c.offset
-
-	c.Lock()
-	defer c.Unlock()
-	if id < uint32(len(c.chans)) {
-		return c.chans[id]
-	}
-	return nil
-}
-
-func (c *chanList) remove(id uint32) {
-	id -= c.offset
-	c.Lock()
-	if id < uint32(len(c.chans)) {
-		c.chans[id] = nil
-	}
-	c.Unlock()
-}
-
-// dropAll forgets all channels it knows, returning them in a slice.
-func (c *chanList) dropAll() []*channel {
-	c.Lock()
-	defer c.Unlock()
-	var r []*channel
-
-	for _, ch := range c.chans {
-		if ch == nil {
-			continue
-		}
-		r = append(r, ch)
-	}
-	c.chans = nil
-	return r
-}
-
-// mux represents the state for the SSH connection protocol, which
-// multiplexes many channels onto a single packet transport.
-type mux struct {
-	conn     packetConn
-	chanList chanList
-
-	incomingChannels chan NewChannel
-
-	globalSentMu     sync.Mutex
-	globalResponses  chan interface{}
-	incomingRequests chan *Request
-
-	errCond *sync.Cond
-	err     error
-}
-
-// When debugging, each new chanList instantiation has a different
-// offset.
-var globalOff uint32
-
-func (m *mux) Wait() error {
-	m.errCond.L.Lock()
-	defer m.errCond.L.Unlock()
-	for m.err == nil {
-		m.errCond.Wait()
-	}
-	return m.err
-}
-
-// newMux returns a mux that runs over the given connection.
-func newMux(p packetConn) *mux {
-	m := &mux{
-		conn:             p,
-		incomingChannels: make(chan NewChannel, chanSize),
-		globalResponses:  make(chan interface{}, 1),
-		incomingRequests: make(chan *Request, chanSize),
-		errCond:          newCond(),
-	}
-	if debugMux {
-		m.chanList.offset = atomic.AddUint32(&globalOff, 1)
-	}
-
-	go m.loop()
-	return m
-}
-
-func (m *mux) sendMessage(msg interface{}) error {
-	p := Marshal(msg)
-	if debugMux {
-		log.Printf("send global(%d): %#v", m.chanList.offset, msg)
-	}
-	return m.conn.writePacket(p)
-}
-
-func (m *mux) SendRequest(name string, wantReply bool, payload []byte) (bool, []byte, error) {
-	if wantReply {
-		m.globalSentMu.Lock()
-		defer m.globalSentMu.Unlock()
-	}
-
-	if err := m.sendMessage(globalRequestMsg{
-		Type:      name,
-		WantReply: wantReply,
-		Data:      payload,
-	}); err != nil {
-		return false, nil, err
-	}
-
-	if !wantReply {
-		return false, nil, nil
-	}
-
-	msg, ok := <-m.globalResponses
-	if !ok {
-		return false, nil, io.EOF
-	}
-	switch msg := msg.(type) {
-	case *globalRequestFailureMsg:
-		return false, msg.Data, nil
-	case *globalRequestSuccessMsg:
-		return true, msg.Data, nil
-	default:
-		return false, nil, fmt.Errorf("ssh: unexpected response to request: %#v", msg)
-	}
-}
-
-// ackRequest must be called after processing a global request that
-// has WantReply set.
-func (m *mux) ackRequest(ok bool, data []byte) error {
-	if ok {
-		return m.sendMessage(globalRequestSuccessMsg{Data: data})
-	}
-	return m.sendMessage(globalRequestFailureMsg{Data: data})
-}
-
-func (m *mux) Close() error {
-	return m.conn.Close()
-}
-
-// loop runs the connection machine. It will process packets until an
-// error is encountered. To synchronize on loop exit, use mux.Wait.
-func (m *mux) loop() {
-	var err error
-	for err == nil {
-		err = m.onePacket()
-	}
-
-	for _, ch := range m.chanList.dropAll() {
-		ch.close()
-	}
-
-	close(m.incomingChannels)
-	close(m.incomingRequests)
-	close(m.globalResponses)
-
-	m.conn.Close()
-
-	m.errCond.L.Lock()
-	m.err = err
-	m.errCond.Broadcast()
-	m.errCond.L.Unlock()
-
-	if debugMux {
-		log.Println("loop exit", err)
-	}
-}
-
-// onePacket reads and processes one packet.
-func (m *mux) onePacket() error {
-	packet, err := m.conn.readPacket()
-	if err != nil {
-		return err
-	}
-
-	if debugMux {
-		if packet[0] == msgChannelData || packet[0] == msgChannelExtendedData {
-			log.Printf("decoding(%d): data packet - %d bytes", m.chanList.offset, len(packet))
-		} else {
-			p, _ := decode(packet)
-			log.Printf("decoding(%d): %d %#v - %d bytes", m.chanList.offset, packet[0], p, len(packet))
-		}
-	}
-
-	switch packet[0] {
-	case msgChannelOpen:
-		return m.handleChannelOpen(packet)
-	case msgGlobalRequest, msgRequestSuccess, msgRequestFailure:
-		return m.handleGlobalPacket(packet)
-	case msgPing:
-		var msg pingMsg
-		if err := Unmarshal(packet, &msg); err != nil {
-			return fmt.Errorf("failed to unmarshal ping@openssh.com message: %w", err)
-		}
-		return m.sendMessage(pongMsg(msg))
-	}
-
-	// assume a channel packet.
-	if len(packet) < 5 {
-		return parseError(packet[0])
-	}
-	id := binary.BigEndian.Uint32(packet[1:])
-	ch := m.chanList.getChan(id)
-	if ch == nil {
-		return m.handleUnknownChannelPacket(id, packet)
-	}
-
-	return ch.handlePacket(packet)
-}
-
-func (m *mux) handleGlobalPacket(packet []byte) error {
-	msg, err := decode(packet)
-	if err != nil {
-		return err
-	}
-
-	switch msg := msg.(type) {
-	case *globalRequestMsg:
-		m.incomingRequests <- &Request{
-			Type:      msg.Type,
-			WantReply: msg.WantReply,
-			Payload:   msg.Data,
-			mux:       m,
-		}
-	case *globalRequestSuccessMsg, *globalRequestFailureMsg:
-		m.globalResponses <- msg
-	default:
-		panic(fmt.Sprintf("not a global message %#v", msg))
-	}
-
-	return nil
-}
-
-// handleChannelOpen schedules a channel to be Accept()ed.
-func (m *mux) handleChannelOpen(packet []byte) error {
-	var msg channelOpenMsg
-	if err := Unmarshal(packet, &msg); err != nil {
-		return err
-	}
-
-	if msg.MaxPacketSize < minPacketLength || msg.MaxPacketSize > 1<<31 {
-		failMsg := channelOpenFailureMsg{
-			PeersID:  msg.PeersID,
-			Reason:   ConnectionFailed,
-			Message:  "invalid request",
-			Language: "en_US.UTF-8",
-		}
-		return m.sendMessage(failMsg)
-	}
-
-	c := m.newChannel(msg.ChanType, channelInbound, msg.TypeSpecificData)
-	c.remoteId = msg.PeersID
-	c.maxRemotePayload = msg.MaxPacketSize
-	c.remoteWin.add(msg.PeersWindow)
-	m.incomingChannels <- c
-	return nil
-}
-
-func (m *mux) OpenChannel(chanType string, extra []byte) (Channel, <-chan *Request, error) {
-	ch, err := m.openChannel(chanType, extra)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return ch, ch.incomingRequests, nil
-}
-
-func (m *mux) openChannel(chanType string, extra []byte) (*channel, error) {
-	ch := m.newChannel(chanType, channelOutbound, extra)
-
-	ch.maxIncomingPayload = channelMaxPacket
-
-	open := channelOpenMsg{
-		ChanType:         chanType,
-		PeersWindow:      ch.myWindow,
-		MaxPacketSize:    ch.maxIncomingPayload,
-		TypeSpecificData: extra,
-		PeersID:          ch.localId,
-	}
-	if err := m.sendMessage(open); err != nil {
-		return nil, err
-	}
-
-	switch msg := (<-ch.msg).(type) {
-	case *channelOpenConfirmMsg:
-		return ch, nil
-	case *channelOpenFailureMsg:
-		return nil, &OpenChannelError{msg.Reason, msg.Message}
-	default:
-		return nil, fmt.Errorf("ssh: unexpected packet in response to channel open: %T", msg)
-	}
-}
-
-func (m *mux) handleUnknownChannelPacket(id uint32, packet []byte) error {
-	msg, err := decode(packet)
-	if err != nil {
-		return err
-	}
-
-	switch msg := msg.(type) {
-	// RFC 4254 section 5.4 says unrecognized channel requests should
-	// receive a failure response.
-	case *channelRequestMsg:
-		if msg.WantReply {
-			return m.sendMessage(channelRequestFailureMsg{
-				PeersID: msg.PeersID,
-			})
-		}
-		return nil
-	default:
-		return fmt.Errorf("ssh: invalid channel %d", id)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go
deleted file mode 100644
index 064dcbaf5..000000000
--- a/vendor/golang.org/x/crypto/ssh/server.go
+++ /dev/null
@@ -1,955 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"slices"
-	"strings"
-)
-
-// The Permissions type holds fine-grained permissions that are
-// specific to a user or a specific authentication method for a user.
-// The Permissions value for a successful authentication attempt is
-// available in ServerConn, so it can be used to pass information from
-// the user-authentication phase to the application layer.
-type Permissions struct {
-	// CriticalOptions indicate restrictions to the default
-	// permissions, and are typically used in conjunction with
-	// user certificates. The standard for SSH certificates
-	// defines "force-command" (only allow the given command to
-	// execute) and "source-address" (only allow connections from
-	// the given address). The SSH package currently only enforces
-	// the "source-address" critical option. It is up to server
-	// implementations to enforce other critical options, such as
-	// "force-command", by checking them after the SSH handshake
-	// is successful. In general, SSH servers should reject
-	// connections that specify critical options that are unknown
-	// or not supported.
-	CriticalOptions map[string]string
-
-	// Extensions are extra functionality that the server may
-	// offer on authenticated connections. Lack of support for an
-	// extension does not preclude authenticating a user. Common
-	// extensions are "permit-agent-forwarding",
-	// "permit-X11-forwarding". The Go SSH library currently does
-	// not act on any extension, and it is up to server
-	// implementations to honor them. Extensions can be used to
-	// pass data from the authentication callbacks to the server
-	// application layer.
-	Extensions map[string]string
-
-	// ExtraData allows to store user defined data.
-	ExtraData map[any]any
-}
-
-type GSSAPIWithMICConfig struct {
-	// AllowLogin, must be set, is called when gssapi-with-mic
-	// authentication is selected (RFC 4462 section 3). The srcName is from the
-	// results of the GSS-API authentication. The format is username@DOMAIN.
-	// GSSAPI just guarantees to the server who the user is, but not if they can log in, and with what permissions.
-	// This callback is called after the user identity is established with GSSAPI to decide if the user can login with
-	// which permissions. If the user is allowed to login, it should return a nil error.
-	AllowLogin func(conn ConnMetadata, srcName string) (*Permissions, error)
-
-	// Server must be set. It's the implementation
-	// of the GSSAPIServer interface. See GSSAPIServer interface for details.
-	Server GSSAPIServer
-}
-
-// SendAuthBanner implements [ServerPreAuthConn].
-func (s *connection) SendAuthBanner(msg string) error {
-	return s.transport.writePacket(Marshal(&userAuthBannerMsg{
-		Message: msg,
-	}))
-}
-
-func (*connection) unexportedMethodForFutureProofing() {}
-
-// ServerPreAuthConn is the interface available on an incoming server
-// connection before authentication has completed.
-type ServerPreAuthConn interface {
-	unexportedMethodForFutureProofing() // permits growing ServerPreAuthConn safely later, ala testing.TB
-
-	ConnMetadata
-
-	// SendAuthBanner sends a banner message to the client.
-	// It returns an error once the authentication phase has ended.
-	SendAuthBanner(string) error
-}
-
-// ServerConfig holds server specific configuration data.
-type ServerConfig struct {
-	// Config contains configuration shared between client and server.
-	Config
-
-	// PublicKeyAuthAlgorithms specifies the supported client public key
-	// authentication algorithms. Note that this should not include certificate
-	// types since those use the underlying algorithm. This list is sent to the
-	// client if it supports the server-sig-algs extension. Order is irrelevant.
-	// If unspecified then a default set of algorithms is used.
-	PublicKeyAuthAlgorithms []string
-
-	hostKeys []Signer
-
-	// NoClientAuth is true if clients are allowed to connect without
-	// authenticating.
-	// To determine NoClientAuth at runtime, set NoClientAuth to true
-	// and the optional NoClientAuthCallback to a non-nil value.
-	NoClientAuth bool
-
-	// NoClientAuthCallback, if non-nil, is called when a user
-	// attempts to authenticate with auth method "none".
-	// NoClientAuth must also be set to true for this be used, or
-	// this func is unused.
-	NoClientAuthCallback func(ConnMetadata) (*Permissions, error)
-
-	// MaxAuthTries specifies the maximum number of authentication attempts
-	// permitted per connection. If set to a negative number, the number of
-	// attempts are unlimited. If set to zero, the number of attempts are limited
-	// to 6.
-	MaxAuthTries int
-
-	// PasswordCallback, if non-nil, is called when a user
-	// attempts to authenticate using a password.
-	PasswordCallback func(conn ConnMetadata, password []byte) (*Permissions, error)
-
-	// PublicKeyCallback, if non-nil, is called when a client
-	// offers a public key for authentication. It must return a nil error
-	// if the given public key can be used to authenticate the
-	// given user. For example, see CertChecker.Authenticate. A
-	// call to this function does not guarantee that the key
-	// offered is in fact used to authenticate. To record any data
-	// depending on the public key, store it inside a
-	// Permissions.Extensions entry.
-	PublicKeyCallback func(conn ConnMetadata, key PublicKey) (*Permissions, error)
-
-	// VerifiedPublicKeyCallback, if non-nil, is called after a client
-	// successfully confirms having control over a key that was previously
-	// approved by PublicKeyCallback. The permissions object passed to the
-	// callback is the one returned by PublicKeyCallback for the given public
-	// key and its ownership is transferred to the callback. The returned
-	// Permissions object can be the same object, optionally modified, or a
-	// completely new object. If VerifiedPublicKeyCallback is non-nil,
-	// PublicKeyCallback is not allowed to return a PartialSuccessError, which
-	// can instead be returned by VerifiedPublicKeyCallback.
-	//
-	// VerifiedPublicKeyCallback does not affect which authentication methods
-	// are included in the list of methods that can be attempted by the client.
-	VerifiedPublicKeyCallback func(conn ConnMetadata, key PublicKey, permissions *Permissions,
-		signatureAlgorithm string) (*Permissions, error)
-
-	// KeyboardInteractiveCallback, if non-nil, is called when
-	// keyboard-interactive authentication is selected (RFC
-	// 4256). The client object's Challenge function should be
-	// used to query the user. The callback may offer multiple
-	// Challenge rounds. To avoid information leaks, the client
-	// should be presented a challenge even if the user is
-	// unknown.
-	KeyboardInteractiveCallback func(conn ConnMetadata, client KeyboardInteractiveChallenge) (*Permissions, error)
-
-	// AuthLogCallback, if non-nil, is called to log all authentication
-	// attempts.
-	AuthLogCallback func(conn ConnMetadata, method string, err error)
-
-	// PreAuthConnCallback, if non-nil, is called upon receiving a new connection
-	// before any authentication has started. The provided ServerPreAuthConn
-	// can be used at any time before authentication is complete, including
-	// after this callback has returned.
-	PreAuthConnCallback func(ServerPreAuthConn)
-
-	// ServerVersion is the version identification string to announce in
-	// the public handshake.
-	// If empty, a reasonable default is used.
-	// Note that RFC 4253 section 4.2 requires that this string start with
-	// "SSH-2.0-".
-	ServerVersion string
-
-	// BannerCallback, if present, is called and the return string is sent to
-	// the client after key exchange completed but before authentication.
-	BannerCallback func(conn ConnMetadata) string
-
-	// GSSAPIWithMICConfig includes gssapi server and callback, which if both non-nil, is used
-	// when gssapi-with-mic authentication is selected (RFC 4462 section 3).
-	GSSAPIWithMICConfig *GSSAPIWithMICConfig
-}
-
-// AddHostKey adds a private key as a host key. If an existing host
-// key exists with the same public key format, it is replaced. Each server
-// config must have at least one host key.
-func (s *ServerConfig) AddHostKey(key Signer) {
-	for i, k := range s.hostKeys {
-		if k.PublicKey().Type() == key.PublicKey().Type() {
-			s.hostKeys[i] = key
-			return
-		}
-	}
-
-	s.hostKeys = append(s.hostKeys, key)
-}
-
-// cachedPubKey contains the results of querying whether a public key is
-// acceptable for a user. This is a FIFO cache.
-type cachedPubKey struct {
-	user       string
-	pubKeyData []byte
-	result     error
-	perms      *Permissions
-}
-
-// maxCachedPubKeys is the number of cache entries we store.
-//
-// Due to consistent misuse of the PublicKeyCallback API, we have reduced this
-// to 1, such that the only key in the cache is the most recently seen one. This
-// forces the behavior that the last call to PublicKeyCallback will always be
-// with the key that is used for authentication.
-const maxCachedPubKeys = 1
-
-// pubKeyCache caches tests for public keys.  Since SSH clients
-// will query whether a public key is acceptable before attempting to
-// authenticate with it, we end up with duplicate queries for public
-// key validity.  The cache only applies to a single ServerConn.
-type pubKeyCache struct {
-	keys []cachedPubKey
-}
-
-// get returns the result for a given user/algo/key tuple.
-func (c *pubKeyCache) get(user string, pubKeyData []byte) (cachedPubKey, bool) {
-	for _, k := range c.keys {
-		if k.user == user && bytes.Equal(k.pubKeyData, pubKeyData) {
-			return k, true
-		}
-	}
-	return cachedPubKey{}, false
-}
-
-// add adds the given tuple to the cache.
-func (c *pubKeyCache) add(candidate cachedPubKey) {
-	if len(c.keys) >= maxCachedPubKeys {
-		c.keys = c.keys[1:]
-	}
-	c.keys = append(c.keys, candidate)
-}
-
-// ServerConn is an authenticated SSH connection, as seen from the
-// server
-type ServerConn struct {
-	Conn
-
-	// If the succeeding authentication callback returned a
-	// non-nil Permissions pointer, it is stored here.
-	Permissions *Permissions
-}
-
-// NewServerConn starts a new SSH server with c as the underlying
-// transport.  It starts with a handshake and, if the handshake is
-// unsuccessful, it closes the connection and returns an error.  The
-// Request and NewChannel channels must be serviced, or the connection
-// will hang.
-//
-// The returned error may be of type *ServerAuthError for
-// authentication errors.
-func NewServerConn(c net.Conn, config *ServerConfig) (*ServerConn, <-chan NewChannel, <-chan *Request, error) {
-	fullConf := *config
-	fullConf.SetDefaults()
-	if fullConf.MaxAuthTries == 0 {
-		fullConf.MaxAuthTries = 6
-	}
-	if len(fullConf.PublicKeyAuthAlgorithms) == 0 {
-		fullConf.PublicKeyAuthAlgorithms = defaultPubKeyAuthAlgos
-	} else {
-		for _, algo := range fullConf.PublicKeyAuthAlgorithms {
-			if !slices.Contains(SupportedAlgorithms().PublicKeyAuths, algo) && !slices.Contains(InsecureAlgorithms().PublicKeyAuths, algo) {
-				c.Close()
-				return nil, nil, nil, fmt.Errorf("ssh: unsupported public key authentication algorithm %s", algo)
-			}
-		}
-	}
-
-	s := &connection{
-		sshConn: sshConn{conn: c},
-	}
-	perms, err := s.serverHandshake(&fullConf)
-	if err != nil {
-		c.Close()
-		return nil, nil, nil, err
-	}
-	return &ServerConn{s, perms}, s.mux.incomingChannels, s.mux.incomingRequests, nil
-}
-
-// signAndMarshal signs the data with the appropriate algorithm,
-// and serializes the result in SSH wire format. algo is the negotiate
-// algorithm and may be a certificate type.
-func signAndMarshal(k AlgorithmSigner, rand io.Reader, data []byte, algo string) ([]byte, error) {
-	sig, err := k.SignWithAlgorithm(rand, data, underlyingAlgo(algo))
-	if err != nil {
-		return nil, err
-	}
-
-	return Marshal(sig), nil
-}
-
-// handshake performs key exchange and user authentication.
-func (s *connection) serverHandshake(config *ServerConfig) (*Permissions, error) {
-	if len(config.hostKeys) == 0 {
-		return nil, errors.New("ssh: server has no host keys")
-	}
-
-	if !config.NoClientAuth && config.PasswordCallback == nil && config.PublicKeyCallback == nil &&
-		config.KeyboardInteractiveCallback == nil && (config.GSSAPIWithMICConfig == nil ||
-		config.GSSAPIWithMICConfig.AllowLogin == nil || config.GSSAPIWithMICConfig.Server == nil) {
-		return nil, errors.New("ssh: no authentication methods configured but NoClientAuth is also false")
-	}
-
-	if config.ServerVersion != "" {
-		s.serverVersion = []byte(config.ServerVersion)
-	} else {
-		s.serverVersion = []byte(packageVersion)
-	}
-	var err error
-	s.clientVersion, err = exchangeVersions(s.sshConn.conn, s.serverVersion)
-	if err != nil {
-		return nil, err
-	}
-
-	tr := newTransport(s.sshConn.conn, config.Rand, false /* not client */)
-	s.transport = newServerTransport(tr, s.clientVersion, s.serverVersion, config)
-
-	if err := s.transport.waitSession(); err != nil {
-		return nil, err
-	}
-
-	// We just did the key change, so the session ID is established.
-	s.sessionID = s.transport.getSessionID()
-	s.algorithms = s.transport.getAlgorithms()
-
-	var packet []byte
-	if packet, err = s.transport.readPacket(); err != nil {
-		return nil, err
-	}
-
-	var serviceRequest serviceRequestMsg
-	if err = Unmarshal(packet, &serviceRequest); err != nil {
-		return nil, err
-	}
-	if serviceRequest.Service != serviceUserAuth {
-		return nil, errors.New("ssh: requested service '" + serviceRequest.Service + "' before authenticating")
-	}
-	serviceAccept := serviceAcceptMsg{
-		Service: serviceUserAuth,
-	}
-	if err := s.transport.writePacket(Marshal(&serviceAccept)); err != nil {
-		return nil, err
-	}
-
-	perms, err := s.serverAuthenticate(config)
-	if err != nil {
-		return nil, err
-	}
-	s.mux = newMux(s.transport)
-	return perms, err
-}
-
-func checkSourceAddress(addr net.Addr, sourceAddrs string) error {
-	if addr == nil {
-		return errors.New("ssh: no address known for client, but source-address match required")
-	}
-
-	tcpAddr, ok := addr.(*net.TCPAddr)
-	if !ok {
-		return fmt.Errorf("ssh: remote address %v is not an TCP address when checking source-address match", addr)
-	}
-
-	for _, sourceAddr := range strings.Split(sourceAddrs, ",") {
-		if allowedIP := net.ParseIP(sourceAddr); allowedIP != nil {
-			if allowedIP.Equal(tcpAddr.IP) {
-				return nil
-			}
-		} else {
-			_, ipNet, err := net.ParseCIDR(sourceAddr)
-			if err != nil {
-				return fmt.Errorf("ssh: error parsing source-address restriction %q: %v", sourceAddr, err)
-			}
-
-			if ipNet.Contains(tcpAddr.IP) {
-				return nil
-			}
-		}
-	}
-
-	return fmt.Errorf("ssh: remote address %v is not allowed because of source-address restriction", addr)
-}
-
-func gssExchangeToken(gssapiConfig *GSSAPIWithMICConfig, token []byte, s *connection,
-	sessionID []byte, userAuthReq userAuthRequestMsg) (authErr error, perms *Permissions, err error) {
-	gssAPIServer := gssapiConfig.Server
-	defer gssAPIServer.DeleteSecContext()
-	var srcName string
-	for {
-		var (
-			outToken     []byte
-			needContinue bool
-		)
-		outToken, srcName, needContinue, err = gssAPIServer.AcceptSecContext(token)
-		if err != nil {
-			return err, nil, nil
-		}
-		if len(outToken) != 0 {
-			if err := s.transport.writePacket(Marshal(&userAuthGSSAPIToken{
-				Token: outToken,
-			})); err != nil {
-				return nil, nil, err
-			}
-		}
-		if !needContinue {
-			break
-		}
-		packet, err := s.transport.readPacket()
-		if err != nil {
-			return nil, nil, err
-		}
-		userAuthGSSAPITokenReq := &userAuthGSSAPIToken{}
-		if err := Unmarshal(packet, userAuthGSSAPITokenReq); err != nil {
-			return nil, nil, err
-		}
-		token = userAuthGSSAPITokenReq.Token
-	}
-	packet, err := s.transport.readPacket()
-	if err != nil {
-		return nil, nil, err
-	}
-	userAuthGSSAPIMICReq := &userAuthGSSAPIMIC{}
-	if err := Unmarshal(packet, userAuthGSSAPIMICReq); err != nil {
-		return nil, nil, err
-	}
-	mic := buildMIC(string(sessionID), userAuthReq.User, userAuthReq.Service, userAuthReq.Method)
-	if err := gssAPIServer.VerifyMIC(mic, userAuthGSSAPIMICReq.MIC); err != nil {
-		return err, nil, nil
-	}
-	perms, authErr = gssapiConfig.AllowLogin(s, srcName)
-	return authErr, perms, nil
-}
-
-// isAlgoCompatible checks if the signature format is compatible with the
-// selected algorithm taking into account edge cases that occur with old
-// clients.
-func isAlgoCompatible(algo, sigFormat string) bool {
-	// Compatibility for old clients.
-	//
-	// For certificate authentication with OpenSSH 7.2-7.7 signature format can
-	// be rsa-sha2-256 or rsa-sha2-512 for the algorithm
-	// ssh-rsa-cert-v01@openssh.com.
-	//
-	// With gpg-agent < 2.2.6 the algorithm can be rsa-sha2-256 or rsa-sha2-512
-	// for signature format ssh-rsa.
-	if isRSA(algo) && isRSA(sigFormat) {
-		return true
-	}
-	// Standard case: the underlying algorithm must match the signature format.
-	return underlyingAlgo(algo) == sigFormat
-}
-
-// ServerAuthError represents server authentication errors and is
-// sometimes returned by NewServerConn. It appends any authentication
-// errors that may occur, and is returned if all of the authentication
-// methods provided by the user failed to authenticate.
-type ServerAuthError struct {
-	// Errors contains authentication errors returned by the authentication
-	// callback methods. The first entry is typically ErrNoAuth.
-	Errors []error
-}
-
-func (l ServerAuthError) Error() string {
-	var errs []string
-	for _, err := range l.Errors {
-		errs = append(errs, err.Error())
-	}
-	return "[" + strings.Join(errs, ", ") + "]"
-}
-
-// ServerAuthCallbacks defines server-side authentication callbacks.
-type ServerAuthCallbacks struct {
-	// PasswordCallback behaves like [ServerConfig.PasswordCallback].
-	PasswordCallback func(conn ConnMetadata, password []byte) (*Permissions, error)
-
-	// PublicKeyCallback behaves like [ServerConfig.PublicKeyCallback].
-	PublicKeyCallback func(conn ConnMetadata, key PublicKey) (*Permissions, error)
-
-	// KeyboardInteractiveCallback behaves like [ServerConfig.KeyboardInteractiveCallback].
-	KeyboardInteractiveCallback func(conn ConnMetadata, client KeyboardInteractiveChallenge) (*Permissions, error)
-
-	// GSSAPIWithMICConfig behaves like [ServerConfig.GSSAPIWithMICConfig].
-	GSSAPIWithMICConfig *GSSAPIWithMICConfig
-}
-
-// PartialSuccessError can be returned by any of the [ServerConfig]
-// authentication callbacks to indicate to the client that authentication has
-// partially succeeded, but further steps are required.
-type PartialSuccessError struct {
-	// Next defines the authentication callbacks to apply to further steps. The
-	// available methods communicated to the client are based on the non-nil
-	// ServerAuthCallbacks fields.
-	Next ServerAuthCallbacks
-}
-
-func (p *PartialSuccessError) Error() string {
-	return "ssh: authenticated with partial success"
-}
-
-// ErrNoAuth is the error value returned if no
-// authentication method has been passed yet. This happens as a normal
-// part of the authentication loop, since the client first tries
-// 'none' authentication to discover available methods.
-// It is returned in ServerAuthError.Errors from NewServerConn.
-var ErrNoAuth = errors.New("ssh: no auth passed yet")
-
-// BannerError is an error that can be returned by authentication handlers in
-// ServerConfig to send a banner message to the client.
-type BannerError struct {
-	Err     error
-	Message string
-}
-
-func (b *BannerError) Unwrap() error {
-	return b.Err
-}
-
-func (b *BannerError) Error() string {
-	if b.Err == nil {
-		return b.Message
-	}
-	return b.Err.Error()
-}
-
-func (s *connection) serverAuthenticate(config *ServerConfig) (*Permissions, error) {
-	if config.PreAuthConnCallback != nil {
-		config.PreAuthConnCallback(s)
-	}
-
-	sessionID := s.transport.getSessionID()
-	var cache pubKeyCache
-	var perms *Permissions
-
-	authFailures := 0
-	noneAuthCount := 0
-	var authErrs []error
-	var calledBannerCallback bool
-	partialSuccessReturned := false
-	// Set the initial authentication callbacks from the config. They can be
-	// changed if a PartialSuccessError is returned.
-	authConfig := ServerAuthCallbacks{
-		PasswordCallback:            config.PasswordCallback,
-		PublicKeyCallback:           config.PublicKeyCallback,
-		KeyboardInteractiveCallback: config.KeyboardInteractiveCallback,
-		GSSAPIWithMICConfig:         config.GSSAPIWithMICConfig,
-	}
-
-userAuthLoop:
-	for {
-		if authFailures >= config.MaxAuthTries && config.MaxAuthTries > 0 {
-			discMsg := &disconnectMsg{
-				Reason:  2,
-				Message: "too many authentication failures",
-			}
-
-			if err := s.transport.writePacket(Marshal(discMsg)); err != nil {
-				return nil, err
-			}
-			authErrs = append(authErrs, discMsg)
-			return nil, &ServerAuthError{Errors: authErrs}
-		}
-
-		var userAuthReq userAuthRequestMsg
-		if packet, err := s.transport.readPacket(); err != nil {
-			if err == io.EOF {
-				return nil, &ServerAuthError{Errors: authErrs}
-			}
-			return nil, err
-		} else if err = Unmarshal(packet, &userAuthReq); err != nil {
-			return nil, err
-		}
-
-		if userAuthReq.Service != serviceSSH {
-			return nil, errors.New("ssh: client attempted to negotiate for unknown service: " + userAuthReq.Service)
-		}
-
-		if s.user != userAuthReq.User && partialSuccessReturned {
-			return nil, fmt.Errorf("ssh: client changed the user after a partial success authentication, previous user %q, current user %q",
-				s.user, userAuthReq.User)
-		}
-
-		s.user = userAuthReq.User
-
-		if !calledBannerCallback && config.BannerCallback != nil {
-			calledBannerCallback = true
-			if msg := config.BannerCallback(s); msg != "" {
-				if err := s.SendAuthBanner(msg); err != nil {
-					return nil, err
-				}
-			}
-		}
-
-		perms = nil
-		authErr := ErrNoAuth
-
-		switch userAuthReq.Method {
-		case "none":
-			noneAuthCount++
-			// We don't allow none authentication after a partial success
-			// response.
-			if config.NoClientAuth && !partialSuccessReturned {
-				if config.NoClientAuthCallback != nil {
-					perms, authErr = config.NoClientAuthCallback(s)
-				} else {
-					authErr = nil
-				}
-			}
-		case "password":
-			if authConfig.PasswordCallback == nil {
-				authErr = errors.New("ssh: password auth not configured")
-				break
-			}
-			payload := userAuthReq.Payload
-			if len(payload) < 1 || payload[0] != 0 {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			payload = payload[1:]
-			password, payload, ok := parseString(payload)
-			if !ok || len(payload) > 0 {
-				return nil, parseError(msgUserAuthRequest)
-			}
-
-			perms, authErr = authConfig.PasswordCallback(s, password)
-		case "keyboard-interactive":
-			if authConfig.KeyboardInteractiveCallback == nil {
-				authErr = errors.New("ssh: keyboard-interactive auth not configured")
-				break
-			}
-
-			prompter := &sshClientKeyboardInteractive{s}
-			perms, authErr = authConfig.KeyboardInteractiveCallback(s, prompter.Challenge)
-		case "publickey":
-			if authConfig.PublicKeyCallback == nil {
-				authErr = errors.New("ssh: publickey auth not configured")
-				break
-			}
-			payload := userAuthReq.Payload
-			if len(payload) < 1 {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			isQuery := payload[0] == 0
-			payload = payload[1:]
-			algoBytes, payload, ok := parseString(payload)
-			if !ok {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			algo := string(algoBytes)
-			if !slices.Contains(config.PublicKeyAuthAlgorithms, underlyingAlgo(algo)) {
-				authErr = fmt.Errorf("ssh: algorithm %q not accepted", algo)
-				break
-			}
-
-			pubKeyData, payload, ok := parseString(payload)
-			if !ok {
-				return nil, parseError(msgUserAuthRequest)
-			}
-
-			pubKey, err := ParsePublicKey(pubKeyData)
-			if err != nil {
-				return nil, err
-			}
-
-			candidate, ok := cache.get(s.user, pubKeyData)
-			if !ok {
-				candidate.user = s.user
-				candidate.pubKeyData = pubKeyData
-				candidate.perms, candidate.result = authConfig.PublicKeyCallback(s, pubKey)
-				_, isPartialSuccessError := candidate.result.(*PartialSuccessError)
-				if isPartialSuccessError && config.VerifiedPublicKeyCallback != nil {
-					return nil, errors.New("ssh: invalid library usage: PublicKeyCallback must not return partial success when VerifiedPublicKeyCallback is defined")
-				}
-
-				if (candidate.result == nil || isPartialSuccessError) &&
-					candidate.perms != nil &&
-					candidate.perms.CriticalOptions != nil &&
-					candidate.perms.CriticalOptions[sourceAddressCriticalOption] != "" {
-					if err := checkSourceAddress(
-						s.RemoteAddr(),
-						candidate.perms.CriticalOptions[sourceAddressCriticalOption]); err != nil {
-						candidate.result = err
-					}
-				}
-				cache.add(candidate)
-			}
-
-			if isQuery {
-				// The client can query if the given public key
-				// would be okay.
-
-				if len(payload) > 0 {
-					return nil, parseError(msgUserAuthRequest)
-				}
-				_, isPartialSuccessError := candidate.result.(*PartialSuccessError)
-				if candidate.result == nil || isPartialSuccessError {
-					okMsg := userAuthPubKeyOkMsg{
-						Algo:   algo,
-						PubKey: pubKeyData,
-					}
-					if err = s.transport.writePacket(Marshal(&okMsg)); err != nil {
-						return nil, err
-					}
-					continue userAuthLoop
-				}
-				authErr = candidate.result
-			} else {
-				sig, payload, ok := parseSignature(payload)
-				if !ok || len(payload) > 0 {
-					return nil, parseError(msgUserAuthRequest)
-				}
-				// Ensure the declared public key algo is compatible with the
-				// decoded one. This check will ensure we don't accept e.g.
-				// ssh-rsa-cert-v01@openssh.com algorithm with ssh-rsa public
-				// key type. The algorithm and public key type must be
-				// consistent: both must be certificate algorithms, or neither.
-				if !slices.Contains(algorithmsForKeyFormat(pubKey.Type()), algo) {
-					authErr = fmt.Errorf("ssh: public key type %q not compatible with selected algorithm %q",
-						pubKey.Type(), algo)
-					break
-				}
-				// Ensure the public key algo and signature algo
-				// are supported.  Compare the private key
-				// algorithm name that corresponds to algo with
-				// sig.Format.  This is usually the same, but
-				// for certs, the names differ.
-				if !slices.Contains(config.PublicKeyAuthAlgorithms, sig.Format) {
-					authErr = fmt.Errorf("ssh: algorithm %q not accepted", sig.Format)
-					break
-				}
-				if !isAlgoCompatible(algo, sig.Format) {
-					authErr = fmt.Errorf("ssh: signature %q not compatible with selected algorithm %q", sig.Format, algo)
-					break
-				}
-
-				signedData := buildDataSignedForAuth(sessionID, userAuthReq, algo, pubKeyData)
-
-				if err := pubKey.Verify(signedData, sig); err != nil {
-					return nil, err
-				}
-
-				authErr = candidate.result
-				perms = candidate.perms
-				if authErr == nil && config.VerifiedPublicKeyCallback != nil {
-					// Only call VerifiedPublicKeyCallback after the key has been accepted
-					// and successfully verified. If authErr is non-nil, the key is not
-					// considered verified and the callback must not run.
-					perms, authErr = config.VerifiedPublicKeyCallback(s, pubKey, perms, algo)
-				}
-			}
-		case "gssapi-with-mic":
-			if authConfig.GSSAPIWithMICConfig == nil {
-				authErr = errors.New("ssh: gssapi-with-mic auth not configured")
-				break
-			}
-			gssapiConfig := authConfig.GSSAPIWithMICConfig
-			userAuthRequestGSSAPI, err := parseGSSAPIPayload(userAuthReq.Payload)
-			if err != nil {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			// OpenSSH supports Kerberos V5 mechanism only for GSS-API authentication.
-			if userAuthRequestGSSAPI.N == 0 {
-				authErr = fmt.Errorf("ssh: Mechanism negotiation is not supported")
-				break
-			}
-			var i uint32
-			present := false
-			for i = 0; i < userAuthRequestGSSAPI.N; i++ {
-				if userAuthRequestGSSAPI.OIDS[i].Equal(krb5Mesh) {
-					present = true
-					break
-				}
-			}
-			if !present {
-				authErr = fmt.Errorf("ssh: GSSAPI authentication must use the Kerberos V5 mechanism")
-				break
-			}
-			// Initial server response, see RFC 4462 section 3.3.
-			if err := s.transport.writePacket(Marshal(&userAuthGSSAPIResponse{
-				SupportMech: krb5OID,
-			})); err != nil {
-				return nil, err
-			}
-			// Exchange token, see RFC 4462 section 3.4.
-			packet, err := s.transport.readPacket()
-			if err != nil {
-				return nil, err
-			}
-			userAuthGSSAPITokenReq := &userAuthGSSAPIToken{}
-			if err := Unmarshal(packet, userAuthGSSAPITokenReq); err != nil {
-				return nil, err
-			}
-			authErr, perms, err = gssExchangeToken(gssapiConfig, userAuthGSSAPITokenReq.Token, s, sessionID,
-				userAuthReq)
-			if err != nil {
-				return nil, err
-			}
-		default:
-			authErr = fmt.Errorf("ssh: unknown method %q", userAuthReq.Method)
-		}
-
-		authErrs = append(authErrs, authErr)
-
-		if config.AuthLogCallback != nil {
-			config.AuthLogCallback(s, userAuthReq.Method, authErr)
-		}
-
-		var bannerErr *BannerError
-		if errors.As(authErr, &bannerErr) {
-			if bannerErr.Message != "" {
-				if err := s.SendAuthBanner(bannerErr.Message); err != nil {
-					return nil, err
-				}
-			}
-		}
-
-		if authErr == nil {
-			break userAuthLoop
-		}
-
-		var failureMsg userAuthFailureMsg
-
-		if partialSuccess, ok := authErr.(*PartialSuccessError); ok {
-			// After a partial success error we don't allow changing the user
-			// name and execute the NoClientAuthCallback.
-			partialSuccessReturned = true
-
-			// In case a partial success is returned, the server may send
-			// a new set of authentication methods.
-			authConfig = partialSuccess.Next
-
-			// Reset pubkey cache, as the new PublicKeyCallback might
-			// accept a different set of public keys.
-			cache = pubKeyCache{}
-
-			// Send back a partial success message to the user.
-			failureMsg.PartialSuccess = true
-		} else {
-			// Allow initial attempt of 'none' without penalty.
-			if authFailures > 0 || userAuthReq.Method != "none" || noneAuthCount != 1 {
-				authFailures++
-			}
-			if config.MaxAuthTries > 0 && authFailures >= config.MaxAuthTries {
-				// If we have hit the max attempts, don't bother sending the
-				// final SSH_MSG_USERAUTH_FAILURE message, since there are
-				// no more authentication methods which can be attempted,
-				// and this message may cause the client to re-attempt
-				// authentication while we send the disconnect message.
-				// Continue, and trigger the disconnect at the start of
-				// the loop.
-				//
-				// The SSH specification is somewhat confusing about this,
-				// RFC 4252 Section 5.1 requires each authentication failure
-				// be responded to with a respective SSH_MSG_USERAUTH_FAILURE
-				// message, but Section 4 says the server should disconnect
-				// after some number of attempts, but it isn't explicit which
-				// message should take precedence (i.e. should there be a failure
-				// message than a disconnect message, or if we are going to
-				// disconnect, should we only send that message.)
-				//
-				// Either way, OpenSSH disconnects immediately after the last
-				// failed authentication attempt, and given they are typically
-				// considered the golden implementation it seems reasonable
-				// to match that behavior.
-				continue
-			}
-		}
-
-		if authConfig.PasswordCallback != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "password")
-		}
-		if authConfig.PublicKeyCallback != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "publickey")
-		}
-		if authConfig.KeyboardInteractiveCallback != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "keyboard-interactive")
-		}
-		if authConfig.GSSAPIWithMICConfig != nil && authConfig.GSSAPIWithMICConfig.Server != nil &&
-			authConfig.GSSAPIWithMICConfig.AllowLogin != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "gssapi-with-mic")
-		}
-
-		if len(failureMsg.Methods) == 0 {
-			return nil, errors.New("ssh: no authentication methods available")
-		}
-
-		if err := s.transport.writePacket(Marshal(&failureMsg)); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := s.transport.writePacket([]byte{msgUserAuthSuccess}); err != nil {
-		return nil, err
-	}
-	return perms, nil
-}
-
-// sshClientKeyboardInteractive implements a ClientKeyboardInteractive by
-// asking the client on the other side of a ServerConn.
-type sshClientKeyboardInteractive struct {
-	*connection
-}
-
-func (c *sshClientKeyboardInteractive) Challenge(name, instruction string, questions []string, echos []bool) (answers []string, err error) {
-	if len(questions) != len(echos) {
-		return nil, errors.New("ssh: echos and questions must have equal length")
-	}
-
-	var prompts []byte
-	for i := range questions {
-		prompts = appendString(prompts, questions[i])
-		prompts = appendBool(prompts, echos[i])
-	}
-
-	if err := c.transport.writePacket(Marshal(&userAuthInfoRequestMsg{
-		Name:        name,
-		Instruction: instruction,
-		NumPrompts:  uint32(len(questions)),
-		Prompts:     prompts,
-	})); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.transport.readPacket()
-	if err != nil {
-		return nil, err
-	}
-	if packet[0] != msgUserAuthInfoResponse {
-		return nil, unexpectedMessageError(msgUserAuthInfoResponse, packet[0])
-	}
-	packet = packet[1:]
-
-	n, packet, ok := parseUint32(packet)
-	if !ok || int(n) != len(questions) {
-		return nil, parseError(msgUserAuthInfoResponse)
-	}
-
-	for i := uint32(0); i < n; i++ {
-		ans, rest, ok := parseString(packet)
-		if !ok {
-			return nil, parseError(msgUserAuthInfoResponse)
-		}
-
-		answers = append(answers, string(ans))
-		packet = rest
-	}
-	if len(packet) != 0 {
-		return nil, errors.New("ssh: junk at end of message")
-	}
-
-	return answers, nil
-}
diff --git a/vendor/golang.org/x/crypto/ssh/session.go b/vendor/golang.org/x/crypto/ssh/session.go
deleted file mode 100644
index acef62259..000000000
--- a/vendor/golang.org/x/crypto/ssh/session.go
+++ /dev/null
@@ -1,647 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-// Session implements an interactive session described in
-// "RFC 4254, section 6".
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-)
-
-type Signal string
-
-// POSIX signals as listed in RFC 4254 Section 6.10.
-const (
-	SIGABRT Signal = "ABRT"
-	SIGALRM Signal = "ALRM"
-	SIGFPE  Signal = "FPE"
-	SIGHUP  Signal = "HUP"
-	SIGILL  Signal = "ILL"
-	SIGINT  Signal = "INT"
-	SIGKILL Signal = "KILL"
-	SIGPIPE Signal = "PIPE"
-	SIGQUIT Signal = "QUIT"
-	SIGSEGV Signal = "SEGV"
-	SIGTERM Signal = "TERM"
-	SIGUSR1 Signal = "USR1"
-	SIGUSR2 Signal = "USR2"
-)
-
-var signals = map[Signal]int{
-	SIGABRT: 6,
-	SIGALRM: 14,
-	SIGFPE:  8,
-	SIGHUP:  1,
-	SIGILL:  4,
-	SIGINT:  2,
-	SIGKILL: 9,
-	SIGPIPE: 13,
-	SIGQUIT: 3,
-	SIGSEGV: 11,
-	SIGTERM: 15,
-}
-
-type TerminalModes map[uint8]uint32
-
-// POSIX terminal mode flags as listed in RFC 4254 Section 8.
-const (
-	tty_OP_END    = 0
-	VINTR         = 1
-	VQUIT         = 2
-	VERASE        = 3
-	VKILL         = 4
-	VEOF          = 5
-	VEOL          = 6
-	VEOL2         = 7
-	VSTART        = 8
-	VSTOP         = 9
-	VSUSP         = 10
-	VDSUSP        = 11
-	VREPRINT      = 12
-	VWERASE       = 13
-	VLNEXT        = 14
-	VFLUSH        = 15
-	VSWTCH        = 16
-	VSTATUS       = 17
-	VDISCARD      = 18
-	IGNPAR        = 30
-	PARMRK        = 31
-	INPCK         = 32
-	ISTRIP        = 33
-	INLCR         = 34
-	IGNCR         = 35
-	ICRNL         = 36
-	IUCLC         = 37
-	IXON          = 38
-	IXANY         = 39
-	IXOFF         = 40
-	IMAXBEL       = 41
-	IUTF8         = 42 // RFC 8160
-	ISIG          = 50
-	ICANON        = 51
-	XCASE         = 52
-	ECHO          = 53
-	ECHOE         = 54
-	ECHOK         = 55
-	ECHONL        = 56
-	NOFLSH        = 57
-	TOSTOP        = 58
-	IEXTEN        = 59
-	ECHOCTL       = 60
-	ECHOKE        = 61
-	PENDIN        = 62
-	OPOST         = 70
-	OLCUC         = 71
-	ONLCR         = 72
-	OCRNL         = 73
-	ONOCR         = 74
-	ONLRET        = 75
-	CS7           = 90
-	CS8           = 91
-	PARENB        = 92
-	PARODD        = 93
-	TTY_OP_ISPEED = 128
-	TTY_OP_OSPEED = 129
-)
-
-// A Session represents a connection to a remote command or shell.
-type Session struct {
-	// Stdin specifies the remote process's standard input.
-	// If Stdin is nil, the remote process reads from an empty
-	// bytes.Buffer.
-	Stdin io.Reader
-
-	// Stdout and Stderr specify the remote process's standard
-	// output and error.
-	//
-	// If either is nil, Run connects the corresponding file
-	// descriptor to an instance of io.Discard. There is a
-	// fixed amount of buffering that is shared for the two streams.
-	// If either blocks it may eventually cause the remote
-	// command to block.
-	Stdout io.Writer
-	Stderr io.Writer
-
-	ch        Channel // the channel backing this session
-	started   bool    // true once Start, Run or Shell is invoked.
-	copyFuncs []func() error
-	errors    chan error // one send per copyFunc
-
-	// true if pipe method is active
-	stdinpipe, stdoutpipe, stderrpipe bool
-
-	// stdinPipeWriter is non-nil if StdinPipe has not been called
-	// and Stdin was specified by the user; it is the write end of
-	// a pipe connecting Session.Stdin to the stdin channel.
-	stdinPipeWriter io.WriteCloser
-
-	exitStatus chan error
-}
-
-// SendRequest sends an out-of-band channel request on the SSH channel
-// underlying the session.
-func (s *Session) SendRequest(name string, wantReply bool, payload []byte) (bool, error) {
-	return s.ch.SendRequest(name, wantReply, payload)
-}
-
-func (s *Session) Close() error {
-	return s.ch.Close()
-}
-
-// RFC 4254 Section 6.4.
-type setenvRequest struct {
-	Name  string
-	Value string
-}
-
-// Setenv sets an environment variable that will be applied to any
-// command executed by Shell or Run.
-func (s *Session) Setenv(name, value string) error {
-	msg := setenvRequest{
-		Name:  name,
-		Value: value,
-	}
-	ok, err := s.ch.SendRequest("env", true, Marshal(&msg))
-	if err == nil && !ok {
-		err = errors.New("ssh: setenv failed")
-	}
-	return err
-}
-
-// RFC 4254 Section 6.2.
-type ptyRequestMsg struct {
-	Term     string
-	Columns  uint32
-	Rows     uint32
-	Width    uint32
-	Height   uint32
-	Modelist string
-}
-
-// RequestPty requests the association of a pty with the session on the remote host.
-func (s *Session) RequestPty(term string, h, w int, termmodes TerminalModes) error {
-	var tm []byte
-	for k, v := range termmodes {
-		kv := struct {
-			Key byte
-			Val uint32
-		}{k, v}
-
-		tm = append(tm, Marshal(&kv)...)
-	}
-	tm = append(tm, tty_OP_END)
-	req := ptyRequestMsg{
-		Term:     term,
-		Columns:  uint32(w),
-		Rows:     uint32(h),
-		Width:    uint32(w * 8),
-		Height:   uint32(h * 8),
-		Modelist: string(tm),
-	}
-	ok, err := s.ch.SendRequest("pty-req", true, Marshal(&req))
-	if err == nil && !ok {
-		err = errors.New("ssh: pty-req failed")
-	}
-	return err
-}
-
-// RFC 4254 Section 6.5.
-type subsystemRequestMsg struct {
-	Subsystem string
-}
-
-// RequestSubsystem requests the association of a subsystem with the session on the remote host.
-// A subsystem is a predefined command that runs in the background when the ssh session is initiated
-func (s *Session) RequestSubsystem(subsystem string) error {
-	msg := subsystemRequestMsg{
-		Subsystem: subsystem,
-	}
-	ok, err := s.ch.SendRequest("subsystem", true, Marshal(&msg))
-	if err == nil && !ok {
-		err = errors.New("ssh: subsystem request failed")
-	}
-	return err
-}
-
-// RFC 4254 Section 6.7.
-type ptyWindowChangeMsg struct {
-	Columns uint32
-	Rows    uint32
-	Width   uint32
-	Height  uint32
-}
-
-// WindowChange informs the remote host about a terminal window dimension change to h rows and w columns.
-func (s *Session) WindowChange(h, w int) error {
-	req := ptyWindowChangeMsg{
-		Columns: uint32(w),
-		Rows:    uint32(h),
-		Width:   uint32(w * 8),
-		Height:  uint32(h * 8),
-	}
-	_, err := s.ch.SendRequest("window-change", false, Marshal(&req))
-	return err
-}
-
-// RFC 4254 Section 6.9.
-type signalMsg struct {
-	Signal string
-}
-
-// Signal sends the given signal to the remote process.
-// sig is one of the SIG* constants.
-func (s *Session) Signal(sig Signal) error {
-	msg := signalMsg{
-		Signal: string(sig),
-	}
-
-	_, err := s.ch.SendRequest("signal", false, Marshal(&msg))
-	return err
-}
-
-// RFC 4254 Section 6.5.
-type execMsg struct {
-	Command string
-}
-
-// Start runs cmd on the remote host. Typically, the remote
-// server passes cmd to the shell for interpretation.
-// A Session only accepts one call to Run, Start or Shell.
-func (s *Session) Start(cmd string) error {
-	if s.started {
-		return errors.New("ssh: session already started")
-	}
-	req := execMsg{
-		Command: cmd,
-	}
-
-	ok, err := s.ch.SendRequest("exec", true, Marshal(&req))
-	if err == nil && !ok {
-		err = fmt.Errorf("ssh: command %v failed", cmd)
-	}
-	if err != nil {
-		return err
-	}
-	return s.start()
-}
-
-// Run runs cmd on the remote host. Typically, the remote
-// server passes cmd to the shell for interpretation.
-// A Session only accepts one call to Run, Start, Shell, Output,
-// or CombinedOutput.
-//
-// The returned error is nil if the command runs, has no problems
-// copying stdin, stdout, and stderr, and exits with a zero exit
-// status.
-//
-// If the remote server does not send an exit status, an error of type
-// *ExitMissingError is returned. If the command completes
-// unsuccessfully or is interrupted by a signal, the error is of type
-// *ExitError. Other error types may be returned for I/O problems.
-func (s *Session) Run(cmd string) error {
-	err := s.Start(cmd)
-	if err != nil {
-		return err
-	}
-	return s.Wait()
-}
-
-// Output runs cmd on the remote host and returns its standard output.
-func (s *Session) Output(cmd string) ([]byte, error) {
-	if s.Stdout != nil {
-		return nil, errors.New("ssh: Stdout already set")
-	}
-	var b bytes.Buffer
-	s.Stdout = &b
-	err := s.Run(cmd)
-	return b.Bytes(), err
-}
-
-type singleWriter struct {
-	b  bytes.Buffer
-	mu sync.Mutex
-}
-
-func (w *singleWriter) Write(p []byte) (int, error) {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.b.Write(p)
-}
-
-// CombinedOutput runs cmd on the remote host and returns its combined
-// standard output and standard error.
-func (s *Session) CombinedOutput(cmd string) ([]byte, error) {
-	if s.Stdout != nil {
-		return nil, errors.New("ssh: Stdout already set")
-	}
-	if s.Stderr != nil {
-		return nil, errors.New("ssh: Stderr already set")
-	}
-	var b singleWriter
-	s.Stdout = &b
-	s.Stderr = &b
-	err := s.Run(cmd)
-	return b.b.Bytes(), err
-}
-
-// Shell starts a login shell on the remote host. A Session only
-// accepts one call to Run, Start, Shell, Output, or CombinedOutput.
-func (s *Session) Shell() error {
-	if s.started {
-		return errors.New("ssh: session already started")
-	}
-
-	ok, err := s.ch.SendRequest("shell", true, nil)
-	if err == nil && !ok {
-		return errors.New("ssh: could not start shell")
-	}
-	if err != nil {
-		return err
-	}
-	return s.start()
-}
-
-func (s *Session) start() error {
-	s.started = true
-
-	type F func(*Session)
-	for _, setupFd := range []F{(*Session).stdin, (*Session).stdout, (*Session).stderr} {
-		setupFd(s)
-	}
-
-	s.errors = make(chan error, len(s.copyFuncs))
-	for _, fn := range s.copyFuncs {
-		go func(fn func() error) {
-			s.errors <- fn()
-		}(fn)
-	}
-	return nil
-}
-
-// Wait waits for the remote command to exit.
-//
-// The returned error is nil if the command runs, has no problems
-// copying stdin, stdout, and stderr, and exits with a zero exit
-// status.
-//
-// If the remote server does not send an exit status, an error of type
-// *ExitMissingError is returned. If the command completes
-// unsuccessfully or is interrupted by a signal, the error is of type
-// *ExitError. Other error types may be returned for I/O problems.
-func (s *Session) Wait() error {
-	if !s.started {
-		return errors.New("ssh: session not started")
-	}
-	waitErr := <-s.exitStatus
-
-	if s.stdinPipeWriter != nil {
-		s.stdinPipeWriter.Close()
-	}
-	var copyError error
-	for range s.copyFuncs {
-		if err := <-s.errors; err != nil && copyError == nil {
-			copyError = err
-		}
-	}
-	if waitErr != nil {
-		return waitErr
-	}
-	return copyError
-}
-
-func (s *Session) wait(reqs <-chan *Request) error {
-	wm := Waitmsg{status: -1}
-	// Wait for msg channel to be closed before returning.
-	for msg := range reqs {
-		switch msg.Type {
-		case "exit-status":
-			wm.status = int(binary.BigEndian.Uint32(msg.Payload))
-		case "exit-signal":
-			var sigval struct {
-				Signal     string
-				CoreDumped bool
-				Error      string
-				Lang       string
-			}
-			if err := Unmarshal(msg.Payload, &sigval); err != nil {
-				return err
-			}
-
-			// Must sanitize strings?
-			wm.signal = sigval.Signal
-			wm.msg = sigval.Error
-			wm.lang = sigval.Lang
-		default:
-			// This handles keepalives and matches
-			// OpenSSH's behaviour.
-			if msg.WantReply {
-				msg.Reply(false, nil)
-			}
-		}
-	}
-	if wm.status == 0 {
-		return nil
-	}
-	if wm.status == -1 {
-		// exit-status was never sent from server
-		if wm.signal == "" {
-			// signal was not sent either.  RFC 4254
-			// section 6.10 recommends against this
-			// behavior, but it is allowed, so we let
-			// clients handle it.
-			return &ExitMissingError{}
-		}
-		wm.status = 128
-		if _, ok := signals[Signal(wm.signal)]; ok {
-			wm.status += signals[Signal(wm.signal)]
-		}
-	}
-
-	return &ExitError{wm}
-}
-
-// ExitMissingError is returned if a session is torn down cleanly, but
-// the server sends no confirmation of the exit status.
-type ExitMissingError struct{}
-
-func (e *ExitMissingError) Error() string {
-	return "wait: remote command exited without exit status or exit signal"
-}
-
-func (s *Session) stdin() {
-	if s.stdinpipe {
-		return
-	}
-	var stdin io.Reader
-	if s.Stdin == nil {
-		stdin = new(bytes.Buffer)
-	} else {
-		r, w := io.Pipe()
-		go func() {
-			_, err := io.Copy(w, s.Stdin)
-			w.CloseWithError(err)
-		}()
-		stdin, s.stdinPipeWriter = r, w
-	}
-	s.copyFuncs = append(s.copyFuncs, func() error {
-		_, err := io.Copy(s.ch, stdin)
-		if err1 := s.ch.CloseWrite(); err == nil && err1 != io.EOF {
-			err = err1
-		}
-		return err
-	})
-}
-
-func (s *Session) stdout() {
-	if s.stdoutpipe {
-		return
-	}
-	if s.Stdout == nil {
-		s.Stdout = io.Discard
-	}
-	s.copyFuncs = append(s.copyFuncs, func() error {
-		_, err := io.Copy(s.Stdout, s.ch)
-		return err
-	})
-}
-
-func (s *Session) stderr() {
-	if s.stderrpipe {
-		return
-	}
-	if s.Stderr == nil {
-		s.Stderr = io.Discard
-	}
-	s.copyFuncs = append(s.copyFuncs, func() error {
-		_, err := io.Copy(s.Stderr, s.ch.Stderr())
-		return err
-	})
-}
-
-// sessionStdin reroutes Close to CloseWrite.
-type sessionStdin struct {
-	io.Writer
-	ch Channel
-}
-
-func (s *sessionStdin) Close() error {
-	return s.ch.CloseWrite()
-}
-
-// StdinPipe returns a pipe that will be connected to the
-// remote command's standard input when the command starts.
-func (s *Session) StdinPipe() (io.WriteCloser, error) {
-	if s.Stdin != nil {
-		return nil, errors.New("ssh: Stdin already set")
-	}
-	if s.started {
-		return nil, errors.New("ssh: StdinPipe after process started")
-	}
-	s.stdinpipe = true
-	return &sessionStdin{s.ch, s.ch}, nil
-}
-
-// StdoutPipe returns a pipe that will be connected to the
-// remote command's standard output when the command starts.
-// There is a fixed amount of buffering that is shared between
-// stdout and stderr streams. If the StdoutPipe reader is
-// not serviced fast enough it may eventually cause the
-// remote command to block.
-func (s *Session) StdoutPipe() (io.Reader, error) {
-	if s.Stdout != nil {
-		return nil, errors.New("ssh: Stdout already set")
-	}
-	if s.started {
-		return nil, errors.New("ssh: StdoutPipe after process started")
-	}
-	s.stdoutpipe = true
-	return s.ch, nil
-}
-
-// StderrPipe returns a pipe that will be connected to the
-// remote command's standard error when the command starts.
-// There is a fixed amount of buffering that is shared between
-// stdout and stderr streams. If the StderrPipe reader is
-// not serviced fast enough it may eventually cause the
-// remote command to block.
-func (s *Session) StderrPipe() (io.Reader, error) {
-	if s.Stderr != nil {
-		return nil, errors.New("ssh: Stderr already set")
-	}
-	if s.started {
-		return nil, errors.New("ssh: StderrPipe after process started")
-	}
-	s.stderrpipe = true
-	return s.ch.Stderr(), nil
-}
-
-// newSession returns a new interactive session on the remote host.
-func newSession(ch Channel, reqs <-chan *Request) (*Session, error) {
-	s := &Session{
-		ch: ch,
-	}
-	s.exitStatus = make(chan error, 1)
-	go func() {
-		s.exitStatus <- s.wait(reqs)
-	}()
-
-	return s, nil
-}
-
-// An ExitError reports unsuccessful completion of a remote command.
-type ExitError struct {
-	Waitmsg
-}
-
-func (e *ExitError) Error() string {
-	return e.Waitmsg.String()
-}
-
-// Waitmsg stores the information about an exited remote command
-// as reported by Wait.
-type Waitmsg struct {
-	status int
-	signal string
-	msg    string
-	lang   string
-}
-
-// ExitStatus returns the exit status of the remote command.
-func (w Waitmsg) ExitStatus() int {
-	return w.status
-}
-
-// Signal returns the exit signal of the remote command if
-// it was terminated violently.
-func (w Waitmsg) Signal() string {
-	return w.signal
-}
-
-// Msg returns the exit message given by the remote command
-func (w Waitmsg) Msg() string {
-	return w.msg
-}
-
-// Lang returns the language tag. See RFC 3066
-func (w Waitmsg) Lang() string {
-	return w.lang
-}
-
-func (w Waitmsg) String() string {
-	str := fmt.Sprintf("Process exited with status %v", w.status)
-	if w.signal != "" {
-		str += fmt.Sprintf(" from signal %v", w.signal)
-	}
-	if w.msg != "" {
-		str += fmt.Sprintf(". Reason was: %v", w.msg)
-	}
-	return str
-}
diff --git a/vendor/golang.org/x/crypto/ssh/ssh_gss.go b/vendor/golang.org/x/crypto/ssh/ssh_gss.go
deleted file mode 100644
index a6249a122..000000000
--- a/vendor/golang.org/x/crypto/ssh/ssh_gss.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"encoding/asn1"
-	"errors"
-)
-
-var krb5OID []byte
-
-func init() {
-	krb5OID, _ = asn1.Marshal(krb5Mesh)
-}
-
-// GSSAPIClient provides the API to plug-in GSSAPI authentication for client logins.
-type GSSAPIClient interface {
-	// InitSecContext initiates the establishment of a security context for GSS-API between the
-	// ssh client and ssh server. Initially the token parameter should be specified as nil.
-	// The routine may return a outputToken which should be transferred to
-	// the ssh server, where the ssh server will present it to
-	// AcceptSecContext. If no token need be sent, InitSecContext will indicate this by setting
-	// needContinue to false. To complete the context
-	// establishment, one or more reply tokens may be required from the ssh
-	// server;if so, InitSecContext will return a needContinue which is true.
-	// In this case, InitSecContext should be called again when the
-	// reply token is received from the ssh server, passing the reply
-	// token to InitSecContext via the token parameters.
-	// See RFC 2743 section 2.2.1 and RFC 4462 section 3.4.
-	InitSecContext(target string, token []byte, isGSSDelegCreds bool) (outputToken []byte, needContinue bool, err error)
-	// GetMIC generates a cryptographic MIC for the SSH2 message, and places
-	// the MIC in a token for transfer to the ssh server.
-	// The contents of the MIC field are obtained by calling GSS_GetMIC()
-	// over the following, using the GSS-API context that was just
-	// established:
-	//  string    session identifier
-	//  byte      SSH_MSG_USERAUTH_REQUEST
-	//  string    user name
-	//  string    service
-	//  string    "gssapi-with-mic"
-	// See RFC 2743 section 2.3.1 and RFC 4462 3.5.
-	GetMIC(micFiled []byte) ([]byte, error)
-	// Whenever possible, it should be possible for
-	// DeleteSecContext() calls to be successfully processed even
-	// if other calls cannot succeed, thereby enabling context-related
-	// resources to be released.
-	// In addition to deleting established security contexts,
-	// gss_delete_sec_context must also be able to delete "half-built"
-	// security contexts resulting from an incomplete sequence of
-	// InitSecContext()/AcceptSecContext() calls.
-	// See RFC 2743 section 2.2.3.
-	DeleteSecContext() error
-}
-
-// GSSAPIServer provides the API to plug in GSSAPI authentication for server logins.
-type GSSAPIServer interface {
-	// AcceptSecContext allows a remotely initiated security context between the application
-	// and a remote peer to be established by the ssh client. The routine may return a
-	// outputToken which should be transferred to the ssh client,
-	// where the ssh client will present it to InitSecContext.
-	// If no token need be sent, AcceptSecContext will indicate this
-	// by setting the needContinue to false. To
-	// complete the context establishment, one or more reply tokens may be
-	// required from the ssh client. if so, AcceptSecContext
-	// will return a needContinue which is true, in which case it
-	// should be called again when the reply token is received from the ssh
-	// client, passing the token to AcceptSecContext via the
-	// token parameters.
-	// The srcName return value is the authenticated username.
-	// See RFC 2743 section 2.2.2 and RFC 4462 section 3.4.
-	AcceptSecContext(token []byte) (outputToken []byte, srcName string, needContinue bool, err error)
-	// VerifyMIC verifies that a cryptographic MIC, contained in the token parameter,
-	// fits the supplied message is received from the ssh client.
-	// See RFC 2743 section 2.3.2.
-	VerifyMIC(micField []byte, micToken []byte) error
-	// Whenever possible, it should be possible for
-	// DeleteSecContext() calls to be successfully processed even
-	// if other calls cannot succeed, thereby enabling context-related
-	// resources to be released.
-	// In addition to deleting established security contexts,
-	// gss_delete_sec_context must also be able to delete "half-built"
-	// security contexts resulting from an incomplete sequence of
-	// InitSecContext()/AcceptSecContext() calls.
-	// See RFC 2743 section 2.2.3.
-	DeleteSecContext() error
-}
-
-var (
-	// OpenSSH supports Kerberos V5 mechanism only for GSS-API authentication,
-	// so we also support the krb5 mechanism only.
-	// See RFC 1964 section 1.
-	krb5Mesh = asn1.ObjectIdentifier{1, 2, 840, 113554, 1, 2, 2}
-)
-
-// The GSS-API authentication method is initiated when the client sends an SSH_MSG_USERAUTH_REQUEST
-// See RFC 4462 section 3.2.
-type userAuthRequestGSSAPI struct {
-	N    uint32
-	OIDS []asn1.ObjectIdentifier
-}
-
-func parseGSSAPIPayload(payload []byte) (*userAuthRequestGSSAPI, error) {
-	n, rest, ok := parseUint32(payload)
-	if !ok {
-		return nil, errors.New("parse uint32 failed")
-	}
-	// Each ASN.1 encoded OID must have a minimum
-	// of 2 bytes; 64 maximum mechanisms is an
-	// arbitrary, but reasonable ceiling.
-	const maxMechs = 64
-	if n > maxMechs || int(n)*2 > len(rest) {
-		return nil, errors.New("invalid mechanism count")
-	}
-	s := &userAuthRequestGSSAPI{
-		N:    n,
-		OIDS: make([]asn1.ObjectIdentifier, n),
-	}
-	for i := 0; i < int(n); i++ {
-		var (
-			desiredMech []byte
-			err         error
-		)
-		desiredMech, rest, ok = parseString(rest)
-		if !ok {
-			return nil, errors.New("parse string failed")
-		}
-		if rest, err = asn1.Unmarshal(desiredMech, &s.OIDS[i]); err != nil {
-			return nil, err
-		}
-	}
-	return s, nil
-}
-
-// See RFC 4462 section 3.6.
-func buildMIC(sessionID string, username string, service string, authMethod string) []byte {
-	out := make([]byte, 0, 0)
-	out = appendString(out, sessionID)
-	out = append(out, msgUserAuthRequest)
-	out = appendString(out, username)
-	out = appendString(out, service)
-	out = appendString(out, authMethod)
-	return out
-}
diff --git a/vendor/golang.org/x/crypto/ssh/streamlocal.go b/vendor/golang.org/x/crypto/ssh/streamlocal.go
deleted file mode 100644
index 152470fcb..000000000
--- a/vendor/golang.org/x/crypto/ssh/streamlocal.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package ssh
-
-import (
-	"errors"
-	"io"
-	"net"
-)
-
-// streamLocalChannelOpenDirectMsg is a struct used for SSH_MSG_CHANNEL_OPEN message
-// with "direct-streamlocal@openssh.com" string.
-//
-// See openssh-portable/PROTOCOL, section 2.4. connection: Unix domain socket forwarding
-// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL#L235
-type streamLocalChannelOpenDirectMsg struct {
-	socketPath string
-	reserved0  string
-	reserved1  uint32
-}
-
-// forwardedStreamLocalPayload is a struct used for SSH_MSG_CHANNEL_OPEN message
-// with "forwarded-streamlocal@openssh.com" string.
-type forwardedStreamLocalPayload struct {
-	SocketPath string
-	Reserved0  string
-}
-
-// streamLocalChannelForwardMsg is a struct used for SSH2_MSG_GLOBAL_REQUEST message
-// with "streamlocal-forward@openssh.com"/"cancel-streamlocal-forward@openssh.com" string.
-type streamLocalChannelForwardMsg struct {
-	socketPath string
-}
-
-// ListenUnix is similar to ListenTCP but uses a Unix domain socket.
-func (c *Client) ListenUnix(socketPath string) (net.Listener, error) {
-	c.handleForwardsOnce.Do(c.handleForwards)
-	m := streamLocalChannelForwardMsg{
-		socketPath,
-	}
-	// send message
-	ok, _, err := c.SendRequest("streamlocal-forward@openssh.com", true, Marshal(&m))
-	if err != nil {
-		return nil, err
-	}
-	if !ok {
-		return nil, errors.New("ssh: streamlocal-forward@openssh.com request denied by peer")
-	}
-	ch := c.forwards.add("unix", socketPath)
-
-	return &unixListener{socketPath, c, ch}, nil
-}
-
-func (c *Client) dialStreamLocal(socketPath string) (Channel, error) {
-	msg := streamLocalChannelOpenDirectMsg{
-		socketPath: socketPath,
-	}
-	ch, in, err := c.OpenChannel("direct-streamlocal@openssh.com", Marshal(&msg))
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(in)
-	return ch, err
-}
-
-type unixListener struct {
-	socketPath string
-
-	conn *Client
-	in   <-chan forward
-}
-
-// Accept waits for and returns the next connection to the listener.
-func (l *unixListener) Accept() (net.Conn, error) {
-	s, ok := <-l.in
-	if !ok {
-		return nil, io.EOF
-	}
-	ch, incoming, err := s.newCh.Accept()
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(incoming)
-
-	return &chanConn{
-		Channel: ch,
-		laddr: &net.UnixAddr{
-			Name: l.socketPath,
-			Net:  "unix",
-		},
-		raddr: &net.UnixAddr{
-			Name: "@",
-			Net:  "unix",
-		},
-	}, nil
-}
-
-// Close closes the listener.
-func (l *unixListener) Close() error {
-	// this also closes the listener.
-	l.conn.forwards.remove("unix", l.socketPath)
-	m := streamLocalChannelForwardMsg{
-		l.socketPath,
-	}
-	ok, _, err := l.conn.SendRequest("cancel-streamlocal-forward@openssh.com", true, Marshal(&m))
-	if err == nil && !ok {
-		err = errors.New("ssh: cancel-streamlocal-forward@openssh.com failed")
-	}
-	return err
-}
-
-// Addr returns the listener's network address.
-func (l *unixListener) Addr() net.Addr {
-	return &net.UnixAddr{
-		Name: l.socketPath,
-		Net:  "unix",
-	}
-}
diff --git a/vendor/golang.org/x/crypto/ssh/tcpip.go b/vendor/golang.org/x/crypto/ssh/tcpip.go
deleted file mode 100644
index 78c41fe5a..000000000
--- a/vendor/golang.org/x/crypto/ssh/tcpip.go
+++ /dev/null
@@ -1,545 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"math/rand"
-	"net"
-	"net/netip"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-// Listen requests the remote peer open a listening socket on
-// addr. Incoming connections will be available by calling Accept on
-// the returned net.Listener. The listener must be serviced, or the
-// SSH connection may hang.
-// N must be "tcp", "tcp4", "tcp6", or "unix".
-//
-// If the address is a hostname, it is sent to the remote peer as-is, without
-// being resolved locally, and the Listener Addr method will return a zero IP.
-func (c *Client) Listen(n, addr string) (net.Listener, error) {
-	switch n {
-	case "tcp", "tcp4", "tcp6":
-		host, portStr, err := net.SplitHostPort(addr)
-		if err != nil {
-			return nil, err
-		}
-		port, err := strconv.ParseInt(portStr, 10, 32)
-		if err != nil {
-			return nil, err
-		}
-		return c.listenTCPInternal(host, int(port))
-	case "unix":
-		return c.ListenUnix(addr)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported protocol: %s", n)
-	}
-}
-
-// Automatic port allocation is broken with OpenSSH before 6.0. See
-// also https://bugzilla.mindrot.org/show_bug.cgi?id=2017.  In
-// particular, OpenSSH 5.9 sends a channelOpenMsg with port number 0,
-// rather than the actual port number. This means you can never open
-// two different listeners with auto allocated ports. We work around
-// this by trying explicit ports until we succeed.
-
-const openSSHPrefix = "OpenSSH_"
-
-var portRandomizer = rand.New(rand.NewSource(time.Now().UnixNano()))
-
-// isBrokenOpenSSHVersion returns true if the given version string
-// specifies a version of OpenSSH that is known to have a bug in port
-// forwarding.
-func isBrokenOpenSSHVersion(versionStr string) bool {
-	i := strings.Index(versionStr, openSSHPrefix)
-	if i < 0 {
-		return false
-	}
-	i += len(openSSHPrefix)
-	j := i
-	for ; j < len(versionStr); j++ {
-		if versionStr[j] < '0' || versionStr[j] > '9' {
-			break
-		}
-	}
-	version, _ := strconv.Atoi(versionStr[i:j])
-	return version < 6
-}
-
-// autoPortListenWorkaround simulates automatic port allocation by
-// trying random ports repeatedly.
-func (c *Client) autoPortListenWorkaround(laddr *net.TCPAddr) (net.Listener, error) {
-	var sshListener net.Listener
-	var err error
-	const tries = 10
-	for i := 0; i < tries; i++ {
-		addr := *laddr
-		addr.Port = 1024 + portRandomizer.Intn(60000)
-		sshListener, err = c.ListenTCP(&addr)
-		if err == nil {
-			laddr.Port = addr.Port
-			return sshListener, err
-		}
-	}
-	return nil, fmt.Errorf("ssh: listen on random port failed after %d tries: %v", tries, err)
-}
-
-// RFC 4254 7.1
-type channelForwardMsg struct {
-	addr  string
-	rport uint32
-}
-
-// handleForwards starts goroutines handling forwarded connections.
-// It's called on first use by (*Client).ListenTCP to not launch
-// goroutines until needed.
-func (c *Client) handleForwards() {
-	go c.forwards.handleChannels(c.HandleChannelOpen("forwarded-tcpip"))
-	go c.forwards.handleChannels(c.HandleChannelOpen("forwarded-streamlocal@openssh.com"))
-}
-
-// ListenTCP requests the remote peer open a listening socket
-// on laddr. Incoming connections will be available by calling
-// Accept on the returned net.Listener.
-//
-// ListenTCP accepts an IP address, to provide a hostname use [Client.Listen]
-// with "tcp", "tcp4", or "tcp6" network instead.
-func (c *Client) ListenTCP(laddr *net.TCPAddr) (net.Listener, error) {
-	c.handleForwardsOnce.Do(c.handleForwards)
-	if laddr.Port == 0 && isBrokenOpenSSHVersion(string(c.ServerVersion())) {
-		return c.autoPortListenWorkaround(laddr)
-	}
-
-	return c.listenTCPInternal(laddr.IP.String(), laddr.Port)
-}
-
-func (c *Client) listenTCPInternal(host string, port int) (net.Listener, error) {
-	c.handleForwardsOnce.Do(c.handleForwards)
-
-	m := channelForwardMsg{
-		host,
-		uint32(port),
-	}
-	// send message
-	ok, resp, err := c.SendRequest("tcpip-forward", true, Marshal(&m))
-	if err != nil {
-		return nil, err
-	}
-	if !ok {
-		return nil, errors.New("ssh: tcpip-forward request denied by peer")
-	}
-
-	// If the original port was 0, then the remote side will
-	// supply a real port number in the response.
-	if port == 0 {
-		var p struct {
-			Port uint32
-		}
-		if err := Unmarshal(resp, &p); err != nil {
-			return nil, err
-		}
-		port = int(p.Port)
-	}
-	// Construct a local address placeholder for the remote listener. If the
-	// original host is an IP address, preserve it so that Listener.Addr()
-	// reports the same IP. If the host is a hostname or cannot be parsed as an
-	// IP, fall back to IPv4zero. The port field is always set, even if the
-	// original port was 0, because in that case the remote server will assign
-	// one, allowing callers to determine which port was selected.
-	ip := net.IPv4zero
-	if parsed, err := netip.ParseAddr(host); err == nil {
-		ip = net.IP(parsed.AsSlice())
-	}
-	laddr := &net.TCPAddr{
-		IP:   ip,
-		Port: port,
-	}
-	addr := net.JoinHostPort(host, strconv.FormatInt(int64(port), 10))
-	ch := c.forwards.add("tcp", addr)
-
-	return &tcpListener{laddr, addr, c, ch}, nil
-}
-
-// forwardList stores a mapping between remote
-// forward requests and the tcpListeners.
-type forwardList struct {
-	sync.Mutex
-	entries []forwardEntry
-}
-
-// forwardEntry represents an established mapping of a laddr on a
-// remote ssh server to a channel connected to a tcpListener.
-type forwardEntry struct {
-	addr    string // host:port or socket path
-	network string // tcp or unix
-	c       chan forward
-}
-
-// forward represents an incoming forwarded tcpip connection. The
-// arguments to add/remove/lookup should be address as specified in
-// the original forward-request.
-type forward struct {
-	newCh NewChannel // the ssh client channel underlying this forward
-	raddr net.Addr   // the raddr of the incoming connection
-}
-
-func (l *forwardList) add(n, addr string) chan forward {
-	l.Lock()
-	defer l.Unlock()
-	f := forwardEntry{
-		addr:    addr,
-		network: n,
-		c:       make(chan forward, 1),
-	}
-	l.entries = append(l.entries, f)
-	return f.c
-}
-
-// See RFC 4254, section 7.2
-type forwardedTCPPayload struct {
-	Addr       string
-	Port       uint32
-	OriginAddr string
-	OriginPort uint32
-}
-
-// parseTCPAddr parses the originating address from the remote into a *net.TCPAddr.
-func parseTCPAddr(addr string, port uint32) (*net.TCPAddr, error) {
-	if port == 0 || port > 65535 {
-		return nil, fmt.Errorf("ssh: port number out of range: %d", port)
-	}
-	ip, err := netip.ParseAddr(addr)
-	if err != nil {
-		return nil, fmt.Errorf("ssh: cannot parse IP address %q", addr)
-	}
-	return &net.TCPAddr{IP: net.IP(ip.AsSlice()), Port: int(port)}, nil
-}
-
-func (l *forwardList) handleChannels(in <-chan NewChannel) {
-	for ch := range in {
-		var (
-			addr    string
-			network string
-			raddr   net.Addr
-			err     error
-		)
-		switch channelType := ch.ChannelType(); channelType {
-		case "forwarded-tcpip":
-			var payload forwardedTCPPayload
-			if err = Unmarshal(ch.ExtraData(), &payload); err != nil {
-				ch.Reject(ConnectionFailed, "could not parse forwarded-tcpip payload: "+err.Error())
-				continue
-			}
-
-			// RFC 4254 section 7.2 specifies that incoming addresses should
-			// list the address that was connected, in string format. It is the
-			// same address used in the tcpip-forward request. The originator
-			// address is an IP address instead.
-			addr = net.JoinHostPort(payload.Addr, strconv.FormatUint(uint64(payload.Port), 10))
-
-			raddr, err = parseTCPAddr(payload.OriginAddr, payload.OriginPort)
-			if err != nil {
-				ch.Reject(ConnectionFailed, err.Error())
-				continue
-			}
-			network = "tcp"
-		case "forwarded-streamlocal@openssh.com":
-			var payload forwardedStreamLocalPayload
-			if err = Unmarshal(ch.ExtraData(), &payload); err != nil {
-				ch.Reject(ConnectionFailed, "could not parse forwarded-streamlocal@openssh.com payload: "+err.Error())
-				continue
-			}
-			addr = payload.SocketPath
-			raddr = &net.UnixAddr{
-				Name: "@",
-				Net:  "unix",
-			}
-			network = "unix"
-		default:
-			panic(fmt.Errorf("ssh: unknown channel type %s", channelType))
-		}
-		if ok := l.forward(network, addr, raddr, ch); !ok {
-			// Section 7.2, implementations MUST reject spurious incoming
-			// connections.
-			ch.Reject(Prohibited, "no forward for address")
-			continue
-		}
-
-	}
-}
-
-// remove removes the forward entry, and the channel feeding its
-// listener.
-func (l *forwardList) remove(n, addr string) {
-	l.Lock()
-	defer l.Unlock()
-	for i, f := range l.entries {
-		if n == f.network && addr == f.addr {
-			l.entries = append(l.entries[:i], l.entries[i+1:]...)
-			close(f.c)
-			return
-		}
-	}
-}
-
-// closeAll closes and clears all forwards.
-func (l *forwardList) closeAll() {
-	l.Lock()
-	defer l.Unlock()
-	for _, f := range l.entries {
-		close(f.c)
-	}
-	l.entries = nil
-}
-
-func (l *forwardList) forward(n, addr string, raddr net.Addr, ch NewChannel) bool {
-	l.Lock()
-	defer l.Unlock()
-	for _, f := range l.entries {
-		if n == f.network && addr == f.addr {
-			f.c <- forward{newCh: ch, raddr: raddr}
-			return true
-		}
-	}
-	return false
-}
-
-type tcpListener struct {
-	laddr *net.TCPAddr
-	addr  string
-
-	conn *Client
-	in   <-chan forward
-}
-
-// Accept waits for and returns the next connection to the listener.
-func (l *tcpListener) Accept() (net.Conn, error) {
-	s, ok := <-l.in
-	if !ok {
-		return nil, io.EOF
-	}
-	ch, incoming, err := s.newCh.Accept()
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(incoming)
-
-	return &chanConn{
-		Channel: ch,
-		laddr:   l.laddr,
-		raddr:   s.raddr,
-	}, nil
-}
-
-// Close closes the listener.
-func (l *tcpListener) Close() error {
-	host, port, err := net.SplitHostPort(l.addr)
-	if err != nil {
-		return err
-	}
-	rport, err := strconv.ParseUint(port, 10, 32)
-	if err != nil {
-		return err
-	}
-	m := channelForwardMsg{
-		host,
-		uint32(rport),
-	}
-
-	// this also closes the listener.
-	l.conn.forwards.remove("tcp", l.addr)
-	ok, _, err := l.conn.SendRequest("cancel-tcpip-forward", true, Marshal(&m))
-	if err == nil && !ok {
-		err = errors.New("ssh: cancel-tcpip-forward failed")
-	}
-	return err
-}
-
-// Addr returns the listener's network address.
-func (l *tcpListener) Addr() net.Addr {
-	return l.laddr
-}
-
-// DialContext initiates a connection to the addr from the remote host.
-//
-// The provided Context must be non-nil. If the context expires before the
-// connection is complete, an error is returned. Once successfully connected,
-// any expiration of the context will not affect the connection.
-//
-// See func Dial for additional information.
-func (c *Client) DialContext(ctx context.Context, n, addr string) (net.Conn, error) {
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-	type connErr struct {
-		conn net.Conn
-		err  error
-	}
-	ch := make(chan connErr)
-	go func() {
-		conn, err := c.Dial(n, addr)
-		select {
-		case ch <- connErr{conn, err}:
-		case <-ctx.Done():
-			if conn != nil {
-				conn.Close()
-			}
-		}
-	}()
-	select {
-	case res := <-ch:
-		return res.conn, res.err
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	}
-}
-
-// Dial initiates a connection to the addr from the remote host.
-// The resulting connection has a zero LocalAddr() and RemoteAddr().
-func (c *Client) Dial(n, addr string) (net.Conn, error) {
-	var ch Channel
-	switch n {
-	case "tcp", "tcp4", "tcp6":
-		// Parse the address into host and numeric port.
-		host, portString, err := net.SplitHostPort(addr)
-		if err != nil {
-			return nil, err
-		}
-		port, err := strconv.ParseUint(portString, 10, 16)
-		if err != nil {
-			return nil, err
-		}
-		ch, err = c.dial(net.IPv4zero.String(), 0, host, int(port))
-		if err != nil {
-			return nil, err
-		}
-		// Use a zero address for local and remote address.
-		zeroAddr := &net.TCPAddr{
-			IP:   net.IPv4zero,
-			Port: 0,
-		}
-		return &chanConn{
-			Channel: ch,
-			laddr:   zeroAddr,
-			raddr:   zeroAddr,
-		}, nil
-	case "unix":
-		var err error
-		ch, err = c.dialStreamLocal(addr)
-		if err != nil {
-			return nil, err
-		}
-		return &chanConn{
-			Channel: ch,
-			laddr: &net.UnixAddr{
-				Name: "@",
-				Net:  "unix",
-			},
-			raddr: &net.UnixAddr{
-				Name: addr,
-				Net:  "unix",
-			},
-		}, nil
-	default:
-		return nil, fmt.Errorf("ssh: unsupported protocol: %s", n)
-	}
-}
-
-// DialTCP connects to the remote address raddr on the network net,
-// which must be "tcp", "tcp4", or "tcp6".  If laddr is not nil, it is used
-// as the local address for the connection.
-func (c *Client) DialTCP(n string, laddr, raddr *net.TCPAddr) (net.Conn, error) {
-	if laddr == nil {
-		laddr = &net.TCPAddr{
-			IP:   net.IPv4zero,
-			Port: 0,
-		}
-	}
-	ch, err := c.dial(laddr.IP.String(), laddr.Port, raddr.IP.String(), raddr.Port)
-	if err != nil {
-		return nil, err
-	}
-	return &chanConn{
-		Channel: ch,
-		laddr:   laddr,
-		raddr:   raddr,
-	}, nil
-}
-
-// RFC 4254 7.2
-type channelOpenDirectMsg struct {
-	raddr string
-	rport uint32
-	laddr string
-	lport uint32
-}
-
-func (c *Client) dial(laddr string, lport int, raddr string, rport int) (Channel, error) {
-	msg := channelOpenDirectMsg{
-		raddr: raddr,
-		rport: uint32(rport),
-		laddr: laddr,
-		lport: uint32(lport),
-	}
-	ch, in, err := c.OpenChannel("direct-tcpip", Marshal(&msg))
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(in)
-	return ch, nil
-}
-
-type tcpChan struct {
-	Channel // the backing channel
-}
-
-// chanConn fulfills the net.Conn interface without
-// the tcpChan having to hold laddr or raddr directly.
-type chanConn struct {
-	Channel
-	laddr, raddr net.Addr
-}
-
-// LocalAddr returns the local network address.
-func (t *chanConn) LocalAddr() net.Addr {
-	return t.laddr
-}
-
-// RemoteAddr returns the remote network address.
-func (t *chanConn) RemoteAddr() net.Addr {
-	return t.raddr
-}
-
-// SetDeadline sets the read and write deadlines associated
-// with the connection.
-func (t *chanConn) SetDeadline(deadline time.Time) error {
-	if err := t.SetReadDeadline(deadline); err != nil {
-		return err
-	}
-	return t.SetWriteDeadline(deadline)
-}
-
-// SetReadDeadline sets the read deadline.
-// A zero value for t means Read will not time out.
-// After the deadline, the error from Read will implement net.Error
-// with Timeout() == true.
-func (t *chanConn) SetReadDeadline(deadline time.Time) error {
-	// for compatibility with previous version,
-	// the error message contains "tcpChan"
-	return errors.New("ssh: tcpChan: deadline not supported")
-}
-
-// SetWriteDeadline exists to satisfy the net.Conn interface
-// but is not implemented by this type.  It always returns an error.
-func (t *chanConn) SetWriteDeadline(deadline time.Time) error {
-	return errors.New("ssh: tcpChan: deadline not supported")
-}
diff --git a/vendor/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go
deleted file mode 100644
index fa3dd6a42..000000000
--- a/vendor/golang.org/x/crypto/ssh/transport.go
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-)
-
-// debugTransport if set, will print packet types as they go over the
-// wire. No message decoding is done, to minimize the impact on timing.
-const debugTransport = false
-
-// packetConn represents a transport that implements packet based
-// operations.
-type packetConn interface {
-	// Encrypt and send a packet of data to the remote peer.
-	writePacket(packet []byte) error
-
-	// Read a packet from the connection. The read is blocking,
-	// i.e. if error is nil, then the returned byte slice is
-	// always non-empty.
-	readPacket() ([]byte, error)
-
-	// Close closes the write-side of the connection.
-	Close() error
-}
-
-// transport is the keyingTransport that implements the SSH packet
-// protocol.
-type transport struct {
-	reader connectionState
-	writer connectionState
-
-	bufReader *bufio.Reader
-	bufWriter *bufio.Writer
-	rand      io.Reader
-	isClient  bool
-	io.Closer
-
-	strictMode     bool
-	initialKEXDone bool
-}
-
-// packetCipher represents a combination of SSH encryption/MAC
-// protocol.  A single instance should be used for one direction only.
-type packetCipher interface {
-	// writeCipherPacket encrypts the packet and writes it to w. The
-	// contents of the packet are generally scrambled.
-	writeCipherPacket(seqnum uint32, w io.Writer, rand io.Reader, packet []byte) error
-
-	// readCipherPacket reads and decrypts a packet of data. The
-	// returned packet may be overwritten by future calls of
-	// readPacket.
-	readCipherPacket(seqnum uint32, r io.Reader) ([]byte, error)
-}
-
-// connectionState represents one side (read or write) of the
-// connection. This is necessary because each direction has its own
-// keys, and can even have its own algorithms
-type connectionState struct {
-	packetCipher
-	seqNum           uint32
-	dir              direction
-	pendingKeyChange chan packetCipher
-}
-
-func (t *transport) setStrictMode() error {
-	if t.reader.seqNum != 1 {
-		return errors.New("ssh: sequence number != 1 when strict KEX mode requested")
-	}
-	t.strictMode = true
-	return nil
-}
-
-func (t *transport) setInitialKEXDone() {
-	t.initialKEXDone = true
-}
-
-// prepareKeyChange sets up key material for a keychange. The key changes in
-// both directions are triggered by reading and writing a msgNewKey packet
-// respectively.
-func (t *transport) prepareKeyChange(algs *NegotiatedAlgorithms, kexResult *kexResult) error {
-	ciph, err := newPacketCipher(t.reader.dir, algs.Read, kexResult)
-	if err != nil {
-		return err
-	}
-	t.reader.pendingKeyChange <- ciph
-
-	ciph, err = newPacketCipher(t.writer.dir, algs.Write, kexResult)
-	if err != nil {
-		return err
-	}
-	t.writer.pendingKeyChange <- ciph
-
-	return nil
-}
-
-func (t *transport) printPacket(p []byte, write bool) {
-	if len(p) == 0 {
-		return
-	}
-	who := "server"
-	if t.isClient {
-		who = "client"
-	}
-	what := "read"
-	if write {
-		what = "write"
-	}
-
-	log.Println(what, who, p[0])
-}
-
-// Read and decrypt next packet.
-func (t *transport) readPacket() (p []byte, err error) {
-	for {
-		p, err = t.reader.readPacket(t.bufReader, t.strictMode)
-		if err != nil {
-			break
-		}
-		// in strict mode we pass through DEBUG and IGNORE packets only during the initial KEX
-		if len(p) == 0 || (t.strictMode && !t.initialKEXDone) || (p[0] != msgIgnore && p[0] != msgDebug) {
-			break
-		}
-	}
-	if debugTransport {
-		t.printPacket(p, false)
-	}
-
-	return p, err
-}
-
-func (s *connectionState) readPacket(r *bufio.Reader, strictMode bool) ([]byte, error) {
-	packet, err := s.packetCipher.readCipherPacket(s.seqNum, r)
-	s.seqNum++
-	if err == nil && len(packet) == 0 {
-		err = errors.New("ssh: zero length packet")
-	}
-
-	if len(packet) > 0 {
-		switch packet[0] {
-		case msgNewKeys:
-			select {
-			case cipher := <-s.pendingKeyChange:
-				s.packetCipher = cipher
-				if strictMode {
-					s.seqNum = 0
-				}
-			default:
-				return nil, errors.New("ssh: got bogus newkeys message")
-			}
-
-		case msgDisconnect:
-			// Transform a disconnect message into an
-			// error. Since this is lowest level at which
-			// we interpret message types, doing it here
-			// ensures that we don't have to handle it
-			// elsewhere.
-			var msg disconnectMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return nil, err
-			}
-			return nil, &msg
-		}
-	}
-
-	// The packet may point to an internal buffer, so copy the
-	// packet out here.
-	fresh := make([]byte, len(packet))
-	copy(fresh, packet)
-
-	return fresh, err
-}
-
-func (t *transport) writePacket(packet []byte) error {
-	if debugTransport {
-		t.printPacket(packet, true)
-	}
-	return t.writer.writePacket(t.bufWriter, t.rand, packet, t.strictMode)
-}
-
-func (s *connectionState) writePacket(w *bufio.Writer, rand io.Reader, packet []byte, strictMode bool) error {
-	changeKeys := len(packet) > 0 && packet[0] == msgNewKeys
-
-	err := s.packetCipher.writeCipherPacket(s.seqNum, w, rand, packet)
-	if err != nil {
-		return err
-	}
-	if err = w.Flush(); err != nil {
-		return err
-	}
-	s.seqNum++
-	if changeKeys {
-		select {
-		case cipher := <-s.pendingKeyChange:
-			s.packetCipher = cipher
-			if strictMode {
-				s.seqNum = 0
-			}
-		default:
-			panic("ssh: no key material for msgNewKeys")
-		}
-	}
-	return err
-}
-
-func newTransport(rwc io.ReadWriteCloser, rand io.Reader, isClient bool) *transport {
-	t := &transport{
-		bufReader: bufio.NewReader(rwc),
-		bufWriter: bufio.NewWriter(rwc),
-		rand:      rand,
-		reader: connectionState{
-			packetCipher:     &streamPacketCipher{cipher: noneCipher{}},
-			pendingKeyChange: make(chan packetCipher, 1),
-		},
-		writer: connectionState{
-			packetCipher:     &streamPacketCipher{cipher: noneCipher{}},
-			pendingKeyChange: make(chan packetCipher, 1),
-		},
-		Closer: rwc,
-	}
-	t.isClient = isClient
-
-	if isClient {
-		t.reader.dir = serverKeys
-		t.writer.dir = clientKeys
-	} else {
-		t.reader.dir = clientKeys
-		t.writer.dir = serverKeys
-	}
-
-	return t
-}
-
-type direction struct {
-	ivTag     []byte
-	keyTag    []byte
-	macKeyTag []byte
-}
-
-var (
-	serverKeys = direction{[]byte{'B'}, []byte{'D'}, []byte{'F'}}
-	clientKeys = direction{[]byte{'A'}, []byte{'C'}, []byte{'E'}}
-)
-
-// setupKeys sets the cipher and MAC keys from kex.K, kex.H and sessionId, as
-// described in RFC 4253, section 6.4. direction should either be serverKeys
-// (to setup server->client keys) or clientKeys (for client->server keys).
-func newPacketCipher(d direction, algs DirectionAlgorithms, kex *kexResult) (packetCipher, error) {
-	cipherMode := cipherModes[algs.Cipher]
-	if cipherMode == nil {
-		return nil, fmt.Errorf("ssh: unsupported cipher %v", algs.Cipher)
-	}
-
-	iv := make([]byte, cipherMode.ivSize)
-	key := make([]byte, cipherMode.keySize)
-
-	generateKeyMaterial(iv, d.ivTag, kex)
-	generateKeyMaterial(key, d.keyTag, kex)
-
-	var macKey []byte
-	if !aeadCiphers[algs.Cipher] {
-		macMode := macModes[algs.MAC]
-		macKey = make([]byte, macMode.keySize)
-		generateKeyMaterial(macKey, d.macKeyTag, kex)
-	}
-
-	return cipherModes[algs.Cipher].create(key, iv, macKey, algs)
-}
-
-// generateKeyMaterial fills out with key material generated from tag, K, H
-// and sessionId, as specified in RFC 4253, section 7.2.
-func generateKeyMaterial(out, tag []byte, r *kexResult) {
-	var digestsSoFar []byte
-
-	h := r.Hash.New()
-	for len(out) > 0 {
-		h.Reset()
-		h.Write(r.K)
-		h.Write(r.H)
-
-		if len(digestsSoFar) == 0 {
-			h.Write(tag)
-			h.Write(r.SessionID)
-		} else {
-			h.Write(digestsSoFar)
-		}
-
-		digest := h.Sum(nil)
-		n := copy(out, digest)
-		out = out[n:]
-		if len(out) > 0 {
-			digestsSoFar = append(digestsSoFar, digest...)
-		}
-	}
-}
-
-const packageVersion = "SSH-2.0-Go"
-
-// Sends and receives a version line.  The versionLine string should
-// be US ASCII, start with "SSH-2.0-", and should not include a
-// newline. exchangeVersions returns the other side's version line.
-func exchangeVersions(rw io.ReadWriter, versionLine []byte) (them []byte, err error) {
-	// Contrary to the RFC, we do not ignore lines that don't
-	// start with "SSH-2.0-" to make the library usable with
-	// nonconforming servers.
-	for _, c := range versionLine {
-		// The spec disallows non US-ASCII chars, and
-		// specifically forbids null chars.
-		if c < 32 {
-			return nil, errors.New("ssh: junk character in version line")
-		}
-	}
-	if _, err = rw.Write(append(versionLine, '\r', '\n')); err != nil {
-		return
-	}
-
-	them, err = readVersion(rw)
-	return them, err
-}
-
-// maxVersionStringBytes is the maximum number of bytes that we'll
-// accept as a version string. RFC 4253 section 4.2 limits this at 255
-// chars
-const maxVersionStringBytes = 255
-
-// Read version string as specified by RFC 4253, section 4.2.
-func readVersion(r io.Reader) ([]byte, error) {
-	versionString := make([]byte, 0, 64)
-	var ok bool
-	var buf [1]byte
-
-	for length := 0; length < maxVersionStringBytes; length++ {
-		_, err := io.ReadFull(r, buf[:])
-		if err != nil {
-			return nil, err
-		}
-		// The RFC says that the version should be terminated with \r\n
-		// but several SSH servers actually only send a \n.
-		if buf[0] == '\n' {
-			if !bytes.HasPrefix(versionString, []byte("SSH-")) {
-				// RFC 4253 says we need to ignore all version string lines
-				// except the one containing the SSH version (provided that
-				// all the lines do not exceed 255 bytes in total).
-				versionString = versionString[:0]
-				continue
-			}
-			ok = true
-			break
-		}
-
-		// non ASCII chars are disallowed, but we are lenient,
-		// since Go doesn't use null-terminated strings.
-
-		// The RFC allows a comment after a space, however,
-		// all of it (version and comments) goes into the
-		// session hash.
-		versionString = append(versionString, buf[0])
-	}
-
-	if !ok {
-		return nil, errors.New("ssh: overflow reading version string")
-	}
-
-	// There might be a '\r' on the end which we should remove.
-	if len(versionString) > 0 && versionString[len(versionString)-1] == '\r' {
-		versionString = versionString[:len(versionString)-1]
-	}
-	return versionString, nil
-}
diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/mod/LICENSE
similarity index 100%
rename from vendor/golang.org/x/crypto/LICENSE
rename to vendor/golang.org/x/mod/LICENSE
diff --git a/vendor/github.com/ProtonMail/go-crypto/PATENTS b/vendor/golang.org/x/mod/PATENTS
similarity index 100%
rename from vendor/github.com/ProtonMail/go-crypto/PATENTS
rename to vendor/golang.org/x/mod/PATENTS
diff --git a/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go b/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go
new file mode 100644
index 000000000..150f887e7
--- /dev/null
+++ b/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go
@@ -0,0 +1,78 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package lazyregexp is a thin wrapper over regexp, allowing the use of global
+// regexp variables without forcing them to be compiled at init.
+package lazyregexp
+
+import (
+	"os"
+	"regexp"
+	"strings"
+	"sync"
+)
+
+// Regexp is a wrapper around [regexp.Regexp], where the underlying regexp will be
+// compiled the first time it is needed.
+type Regexp struct {
+	str  string
+	once sync.Once
+	rx   *regexp.Regexp
+}
+
+func (r *Regexp) re() *regexp.Regexp {
+	r.once.Do(r.build)
+	return r.rx
+}
+
+func (r *Regexp) build() {
+	r.rx = regexp.MustCompile(r.str)
+	r.str = ""
+}
+
+func (r *Regexp) FindSubmatch(s []byte) [][]byte {
+	return r.re().FindSubmatch(s)
+}
+
+func (r *Regexp) FindStringSubmatch(s string) []string {
+	return r.re().FindStringSubmatch(s)
+}
+
+func (r *Regexp) FindStringSubmatchIndex(s string) []int {
+	return r.re().FindStringSubmatchIndex(s)
+}
+
+func (r *Regexp) ReplaceAllString(src, repl string) string {
+	return r.re().ReplaceAllString(src, repl)
+}
+
+func (r *Regexp) FindString(s string) string {
+	return r.re().FindString(s)
+}
+
+func (r *Regexp) FindAllString(s string, n int) []string {
+	return r.re().FindAllString(s, n)
+}
+
+func (r *Regexp) MatchString(s string) bool {
+	return r.re().MatchString(s)
+}
+
+func (r *Regexp) SubexpNames() []string {
+	return r.re().SubexpNames()
+}
+
+var inTest = len(os.Args) > 0 && strings.HasSuffix(strings.TrimSuffix(os.Args[0], ".exe"), ".test")
+
+// New creates a new lazy regexp, delaying the compiling work until it is first
+// needed. If the code is being run as part of tests, the regexp compiling will
+// happen immediately.
+func New(str string) *Regexp {
+	lr := &Regexp{str: str}
+	if inTest {
+		// In tests, always compile the regexps early.
+		lr.re()
+	}
+	return lr
+}
diff --git a/vendor/golang.org/x/mod/modfile/print.go b/vendor/golang.org/x/mod/modfile/print.go
new file mode 100644
index 000000000..48dbd82ae
--- /dev/null
+++ b/vendor/golang.org/x/mod/modfile/print.go
@@ -0,0 +1,184 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Module file printer.
+
+package modfile
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+)
+
+// Format returns a go.mod file as a byte slice, formatted in standard style.
+func Format(f *FileSyntax) []byte {
+	pr := &printer{}
+	pr.file(f)
+
+	// remove trailing blank lines
+	b := pr.Bytes()
+	for len(b) > 0 && b[len(b)-1] == '\n' && (len(b) == 1 || b[len(b)-2] == '\n') {
+		b = b[:len(b)-1]
+	}
+	return b
+}
+
+// A printer collects the state during printing of a file or expression.
+type printer struct {
+	bytes.Buffer           // output buffer
+	comment      []Comment // pending end-of-line comments
+	margin       int       // left margin (indent), a number of tabs
+}
+
+// printf prints to the buffer.
+func (p *printer) printf(format string, args ...any) {
+	fmt.Fprintf(p, format, args...)
+}
+
+// indent returns the position on the current line, in bytes, 0-indexed.
+func (p *printer) indent() int {
+	b := p.Bytes()
+	n := 0
+	for n < len(b) && b[len(b)-1-n] != '\n' {
+		n++
+	}
+	return n
+}
+
+// newline ends the current line, flushing end-of-line comments.
+func (p *printer) newline() {
+	if len(p.comment) > 0 {
+		p.printf(" ")
+		for i, com := range p.comment {
+			if i > 0 {
+				p.trim()
+				p.printf("\n")
+				for i := 0; i < p.margin; i++ {
+					p.printf("\t")
+				}
+			}
+			p.printf("%s", strings.TrimSpace(com.Token))
+		}
+		p.comment = p.comment[:0]
+	}
+
+	p.trim()
+	if b := p.Bytes(); len(b) == 0 || (len(b) >= 2 && b[len(b)-1] == '\n' && b[len(b)-2] == '\n') {
+		// skip the blank line at top of file or after a blank line
+	} else {
+		p.printf("\n")
+	}
+	for i := 0; i < p.margin; i++ {
+		p.printf("\t")
+	}
+}
+
+// trim removes trailing spaces and tabs from the current line.
+func (p *printer) trim() {
+	// Remove trailing spaces and tabs from line we're about to end.
+	b := p.Bytes()
+	n := len(b)
+	for n > 0 && (b[n-1] == '\t' || b[n-1] == ' ') {
+		n--
+	}
+	p.Truncate(n)
+}
+
+// file formats the given file into the print buffer.
+func (p *printer) file(f *FileSyntax) {
+	for _, com := range f.Before {
+		p.printf("%s", strings.TrimSpace(com.Token))
+		p.newline()
+	}
+
+	for i, stmt := range f.Stmt {
+		switch x := stmt.(type) {
+		case *CommentBlock:
+			// comments already handled
+			p.expr(x)
+
+		default:
+			p.expr(x)
+			p.newline()
+		}
+
+		for _, com := range stmt.Comment().After {
+			p.printf("%s", strings.TrimSpace(com.Token))
+			p.newline()
+		}
+
+		if i+1 < len(f.Stmt) {
+			p.newline()
+		}
+	}
+}
+
+func (p *printer) expr(x Expr) {
+	// Emit line-comments preceding this expression.
+	if before := x.Comment().Before; len(before) > 0 {
+		// Want to print a line comment.
+		// Line comments must be at the current margin.
+		p.trim()
+		if p.indent() > 0 {
+			// There's other text on the line. Start a new line.
+			p.printf("\n")
+		}
+		// Re-indent to margin.
+		for i := 0; i < p.margin; i++ {
+			p.printf("\t")
+		}
+		for _, com := range before {
+			p.printf("%s", strings.TrimSpace(com.Token))
+			p.newline()
+		}
+	}
+
+	switch x := x.(type) {
+	default:
+		panic(fmt.Errorf("printer: unexpected type %T", x))
+
+	case *CommentBlock:
+		// done
+
+	case *LParen:
+		p.printf("(")
+	case *RParen:
+		p.printf(")")
+
+	case *Line:
+		p.tokens(x.Token)
+
+	case *LineBlock:
+		p.tokens(x.Token)
+		p.printf(" ")
+		p.expr(&x.LParen)
+		p.margin++
+		for _, l := range x.Line {
+			p.newline()
+			p.expr(l)
+		}
+		p.margin--
+		p.newline()
+		p.expr(&x.RParen)
+	}
+
+	// Queue end-of-line comments for printing when we
+	// reach the end of the line.
+	p.comment = append(p.comment, x.Comment().Suffix...)
+}
+
+func (p *printer) tokens(tokens []string) {
+	sep := ""
+	for _, t := range tokens {
+		if t == "," || t == ")" || t == "]" || t == "}" {
+			sep = ""
+		}
+		p.printf("%s%s", sep, t)
+		sep = " "
+		if t == "(" || t == "[" || t == "{" {
+			sep = ""
+		}
+	}
+}
diff --git a/vendor/golang.org/x/mod/modfile/read.go b/vendor/golang.org/x/mod/modfile/read.go
new file mode 100644
index 000000000..9e35e1ac5
--- /dev/null
+++ b/vendor/golang.org/x/mod/modfile/read.go
@@ -0,0 +1,962 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package modfile
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"os"
+	"slices"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+// A Position describes an arbitrary source position in a file, including the
+// file, line, column, and byte offset.
+type Position struct {
+	Line     int // line in input (starting at 1)
+	LineRune int // rune in line (starting at 1)
+	Byte     int // byte in input (starting at 0)
+}
+
+// add returns the position at the end of s, assuming it starts at p.
+func (p Position) add(s string) Position {
+	p.Byte += len(s)
+	if n := strings.Count(s, "\n"); n > 0 {
+		p.Line += n
+		s = s[strings.LastIndex(s, "\n")+1:]
+		p.LineRune = 1
+	}
+	p.LineRune += utf8.RuneCountInString(s)
+	return p
+}
+
+// An Expr represents an input element.
+type Expr interface {
+	// Span returns the start and end position of the expression,
+	// excluding leading or trailing comments.
+	Span() (start, end Position)
+
+	// Comment returns the comments attached to the expression.
+	// This method would normally be named 'Comments' but that
+	// would interfere with embedding a type of the same name.
+	Comment() *Comments
+}
+
+// A Comment represents a single // comment.
+type Comment struct {
+	Start  Position
+	Token  string // without trailing newline
+	Suffix bool   // an end of line (not whole line) comment
+}
+
+// Comments collects the comments associated with an expression.
+type Comments struct {
+	Before []Comment // whole-line comments before this expression
+	Suffix []Comment // end-of-line comments after this expression
+
+	// For top-level expressions only, After lists whole-line
+	// comments following the expression.
+	After []Comment
+}
+
+// Comment returns the receiver. This isn't useful by itself, but
+// a [Comments] struct is embedded into all the expression
+// implementation types, and this gives each of those a Comment
+// method to satisfy the Expr interface.
+func (c *Comments) Comment() *Comments {
+	return c
+}
+
+// A FileSyntax represents an entire go.mod file.
+type FileSyntax struct {
+	Name string // file path
+	Comments
+	Stmt []Expr
+}
+
+func (x *FileSyntax) Span() (start, end Position) {
+	if len(x.Stmt) == 0 {
+		return
+	}
+	start, _ = x.Stmt[0].Span()
+	_, end = x.Stmt[len(x.Stmt)-1].Span()
+	return start, end
+}
+
+// addLine adds a line containing the given tokens to the file.
+//
+// If the first token of the hint matches the first token of the
+// line, the new line is added at the end of the block containing hint,
+// extracting hint into a new block if it is not yet in one.
+//
+// If the hint is non-nil but its first token does not match,
+// the new line is added after the block containing hint
+// (or hint itself, if not in a block).
+//
+// If no hint is provided, addLine appends the line to the end of
+// the last block with a matching first token,
+// or to the end of the file if no such block exists.
+func (x *FileSyntax) addLine(hint Expr, tokens ...string) *Line {
+	if hint == nil {
+		// If no hint given, add to the last statement of the given type.
+	Loop:
+		for _, stmt := range slices.Backward(x.Stmt) {
+			switch stmt := stmt.(type) {
+			case *Line:
+				if stmt.Token != nil && stmt.Token[0] == tokens[0] {
+					hint = stmt
+					break Loop
+				}
+			case *LineBlock:
+				if stmt.Token[0] == tokens[0] {
+					hint = stmt
+					break Loop
+				}
+			}
+		}
+	}
+
+	newLineAfter := func(i int) *Line {
+		new := &Line{Token: tokens}
+		if i == len(x.Stmt) {
+			x.Stmt = append(x.Stmt, new)
+		} else {
+			x.Stmt = append(x.Stmt, nil)
+			copy(x.Stmt[i+2:], x.Stmt[i+1:])
+			x.Stmt[i+1] = new
+		}
+		return new
+	}
+
+	if hint != nil {
+		for i, stmt := range x.Stmt {
+			switch stmt := stmt.(type) {
+			case *Line:
+				if stmt == hint {
+					if stmt.Token == nil || stmt.Token[0] != tokens[0] {
+						return newLineAfter(i)
+					}
+
+					// Convert line to line block.
+					stmt.InBlock = true
+					block := &LineBlock{Token: stmt.Token[:1], Line: []*Line{stmt}}
+					stmt.Token = stmt.Token[1:]
+					x.Stmt[i] = block
+					new := &Line{Token: tokens[1:], InBlock: true}
+					block.Line = append(block.Line, new)
+					return new
+				}
+
+			case *LineBlock:
+				if stmt == hint {
+					if stmt.Token[0] != tokens[0] {
+						return newLineAfter(i)
+					}
+
+					new := &Line{Token: tokens[1:], InBlock: true}
+					stmt.Line = append(stmt.Line, new)
+					return new
+				}
+
+				for j, line := range stmt.Line {
+					if line == hint {
+						if stmt.Token[0] != tokens[0] {
+							return newLineAfter(i)
+						}
+
+						// Add new line after hint within the block.
+						stmt.Line = append(stmt.Line, nil)
+						copy(stmt.Line[j+2:], stmt.Line[j+1:])
+						new := &Line{Token: tokens[1:], InBlock: true}
+						stmt.Line[j+1] = new
+						return new
+					}
+				}
+			}
+		}
+	}
+
+	new := &Line{Token: tokens}
+	x.Stmt = append(x.Stmt, new)
+	return new
+}
+
+func (x *FileSyntax) updateLine(line *Line, tokens ...string) {
+	if line.InBlock {
+		tokens = tokens[1:]
+	}
+	line.Token = tokens
+}
+
+// markRemoved modifies line so that it (and its end-of-line comment, if any)
+// will be dropped by (*FileSyntax).Cleanup.
+func (line *Line) markRemoved() {
+	line.Token = nil
+	line.Comments.Suffix = nil
+}
+
+// Cleanup cleans up the file syntax x after any edit operations.
+// To avoid quadratic behavior, (*Line).markRemoved marks the line as dead
+// by setting line.Token = nil but does not remove it from the slice
+// in which it appears. After edits have all been indicated,
+// calling Cleanup cleans out the dead lines.
+func (x *FileSyntax) Cleanup() {
+	w := 0
+	for _, stmt := range x.Stmt {
+		switch stmt := stmt.(type) {
+		case *Line:
+			if stmt.Token == nil {
+				continue
+			}
+		case *LineBlock:
+			ww := 0
+			for _, line := range stmt.Line {
+				if line.Token != nil {
+					stmt.Line[ww] = line
+					ww++
+				}
+			}
+			if ww == 0 {
+				continue
+			}
+			if ww == 1 && len(stmt.RParen.Comments.Before) == 0 {
+				// Collapse block into single line but keep the Line reference used by the
+				// parsed File structure.
+				*stmt.Line[0] = Line{
+					Comments: Comments{
+						Before: commentsAdd(stmt.Before, stmt.Line[0].Before),
+						Suffix: commentsAdd(stmt.Line[0].Suffix, stmt.Suffix),
+						After:  commentsAdd(stmt.Line[0].After, stmt.After),
+					},
+					Token: stringsAdd(stmt.Token, stmt.Line[0].Token),
+				}
+				x.Stmt[w] = stmt.Line[0]
+				w++
+				continue
+			}
+			stmt.Line = stmt.Line[:ww]
+		}
+		x.Stmt[w] = stmt
+		w++
+	}
+	x.Stmt = x.Stmt[:w]
+}
+
+func commentsAdd(x, y []Comment) []Comment {
+	return append(x[:len(x):len(x)], y...)
+}
+
+func stringsAdd(x, y []string) []string {
+	return append(x[:len(x):len(x)], y...)
+}
+
+// A CommentBlock represents a top-level block of comments separate
+// from any rule.
+type CommentBlock struct {
+	Comments
+	Start Position
+}
+
+func (x *CommentBlock) Span() (start, end Position) {
+	return x.Start, x.Start
+}
+
+// A Line is a single line of tokens.
+type Line struct {
+	Comments
+	Start   Position
+	Token   []string
+	InBlock bool
+	End     Position
+}
+
+func (x *Line) Span() (start, end Position) {
+	return x.Start, x.End
+}
+
+// A LineBlock is a factored block of lines, like
+//
+//	require (
+//		"x"
+//		"y"
+//	)
+type LineBlock struct {
+	Comments
+	Start  Position
+	LParen LParen
+	Token  []string
+	Line   []*Line
+	RParen RParen
+}
+
+func (x *LineBlock) Span() (start, end Position) {
+	return x.Start, x.RParen.Pos.add(")")
+}
+
+// An LParen represents the beginning of a parenthesized line block.
+// It is a place to store suffix comments.
+type LParen struct {
+	Comments
+	Pos Position
+}
+
+func (x *LParen) Span() (start, end Position) {
+	return x.Pos, x.Pos.add(")")
+}
+
+// An RParen represents the end of a parenthesized line block.
+// It is a place to store whole-line (before) comments.
+type RParen struct {
+	Comments
+	Pos Position
+}
+
+func (x *RParen) Span() (start, end Position) {
+	return x.Pos, x.Pos.add(")")
+}
+
+// An input represents a single input file being parsed.
+type input struct {
+	// Lexing state.
+	filename   string    // name of input file, for errors
+	complete   []byte    // entire input
+	remaining  []byte    // remaining input
+	tokenStart []byte    // token being scanned to end of input
+	token      token     // next token to be returned by lex, peek
+	pos        Position  // current input position
+	comments   []Comment // accumulated comments
+
+	// Parser state.
+	file        *FileSyntax // returned top-level syntax tree
+	parseErrors ErrorList   // errors encountered during parsing
+
+	// Comment assignment state.
+	pre  []Expr // all expressions, in preorder traversal
+	post []Expr // all expressions, in postorder traversal
+}
+
+func newInput(filename string, data []byte) *input {
+	return &input{
+		filename:  filename,
+		complete:  data,
+		remaining: data,
+		pos:       Position{Line: 1, LineRune: 1, Byte: 0},
+	}
+}
+
+// parse parses the input file.
+func parse(file string, data []byte) (f *FileSyntax, err error) {
+	// The parser panics for both routine errors like syntax errors
+	// and for programmer bugs like array index errors.
+	// Turn both into error returns. Catching bug panics is
+	// especially important when processing many files.
+	in := newInput(file, data)
+	defer func() {
+		if e := recover(); e != nil && e != &in.parseErrors {
+			in.parseErrors = append(in.parseErrors, Error{
+				Filename: in.filename,
+				Pos:      in.pos,
+				Err:      fmt.Errorf("internal error: %v", e),
+			})
+		}
+		if err == nil && len(in.parseErrors) > 0 {
+			err = in.parseErrors
+		}
+	}()
+
+	// Prime the lexer by reading in the first token. It will be available
+	// in the next peek() or lex() call.
+	in.readToken()
+
+	// Invoke the parser.
+	in.parseFile()
+	if len(in.parseErrors) > 0 {
+		return nil, in.parseErrors
+	}
+	in.file.Name = in.filename
+
+	// Assign comments to nearby syntax.
+	in.assignComments()
+
+	return in.file, nil
+}
+
+// Error is called to report an error.
+// Error does not return: it panics.
+func (in *input) Error(s string) {
+	in.parseErrors = append(in.parseErrors, Error{
+		Filename: in.filename,
+		Pos:      in.pos,
+		Err:      errors.New(s),
+	})
+	panic(&in.parseErrors)
+}
+
+// eof reports whether the input has reached end of file.
+func (in *input) eof() bool {
+	return len(in.remaining) == 0
+}
+
+// peekRune returns the next rune in the input without consuming it.
+func (in *input) peekRune() int {
+	if len(in.remaining) == 0 {
+		return 0
+	}
+	r, _ := utf8.DecodeRune(in.remaining)
+	return int(r)
+}
+
+// peekPrefix reports whether the remaining input begins with the given prefix.
+func (in *input) peekPrefix(prefix string) bool {
+	// This is like bytes.HasPrefix(in.remaining, []byte(prefix))
+	// but without the allocation of the []byte copy of prefix.
+	for i := 0; i < len(prefix); i++ {
+		if i >= len(in.remaining) || in.remaining[i] != prefix[i] {
+			return false
+		}
+	}
+	return true
+}
+
+// readRune consumes and returns the next rune in the input.
+func (in *input) readRune() int {
+	if len(in.remaining) == 0 {
+		in.Error("internal lexer error: readRune at EOF")
+	}
+	r, size := utf8.DecodeRune(in.remaining)
+	in.remaining = in.remaining[size:]
+	if r == '\n' {
+		in.pos.Line++
+		in.pos.LineRune = 1
+	} else {
+		in.pos.LineRune++
+	}
+	in.pos.Byte += size
+	return int(r)
+}
+
+type token struct {
+	kind   tokenKind
+	pos    Position
+	endPos Position
+	text   string
+}
+
+type tokenKind int
+
+const (
+	_EOF tokenKind = -(iota + 1)
+	_EOLCOMMENT
+	_IDENT
+	_STRING
+	_COMMENT
+
+	// newlines and punctuation tokens are allowed as ASCII codes.
+)
+
+func (k tokenKind) isComment() bool {
+	return k == _COMMENT || k == _EOLCOMMENT
+}
+
+// isEOL returns whether a token terminates a line.
+func (k tokenKind) isEOL() bool {
+	return k == _EOF || k == _EOLCOMMENT || k == '\n'
+}
+
+// startToken marks the beginning of the next input token.
+// It must be followed by a call to endToken, once the token's text has
+// been consumed using readRune.
+func (in *input) startToken() {
+	in.tokenStart = in.remaining
+	in.token.text = ""
+	in.token.pos = in.pos
+}
+
+// endToken marks the end of an input token.
+// It records the actual token string in tok.text.
+// A single trailing newline (LF or CRLF) will be removed from comment tokens.
+func (in *input) endToken(kind tokenKind) {
+	in.token.kind = kind
+	text := string(in.tokenStart[:len(in.tokenStart)-len(in.remaining)])
+	if kind.isComment() {
+		if strings.HasSuffix(text, "\r\n") {
+			text = text[:len(text)-2]
+		} else {
+			text = strings.TrimSuffix(text, "\n")
+		}
+	}
+	in.token.text = text
+	in.token.endPos = in.pos
+}
+
+// peek returns the kind of the next token returned by lex.
+func (in *input) peek() tokenKind {
+	return in.token.kind
+}
+
+// lex is called from the parser to obtain the next input token.
+func (in *input) lex() token {
+	tok := in.token
+	in.readToken()
+	return tok
+}
+
+// readToken lexes the next token from the text and stores it in in.token.
+func (in *input) readToken() {
+	// Skip past spaces, stopping at non-space or EOF.
+	for !in.eof() {
+		c := in.peekRune()
+		if c == ' ' || c == '\t' || c == '\r' {
+			in.readRune()
+			continue
+		}
+
+		// Comment runs to end of line.
+		if in.peekPrefix("//") {
+			in.startToken()
+
+			// Is this comment the only thing on its line?
+			// Find the last \n before this // and see if it's all
+			// spaces from there to here.
+			i := bytes.LastIndex(in.complete[:in.pos.Byte], []byte("\n"))
+			suffix := len(bytes.TrimSpace(in.complete[i+1:in.pos.Byte])) > 0
+			in.readRune()
+			in.readRune()
+
+			// Consume comment.
+			for len(in.remaining) > 0 && in.readRune() != '\n' {
+			}
+
+			// If we are at top level (not in a statement), hand the comment to
+			// the parser as a _COMMENT token. The grammar is written
+			// to handle top-level comments itself.
+			if !suffix {
+				in.endToken(_COMMENT)
+				return
+			}
+
+			// Otherwise, save comment for later attachment to syntax tree.
+			in.endToken(_EOLCOMMENT)
+			in.comments = append(in.comments, Comment{in.token.pos, in.token.text, suffix})
+			return
+		}
+
+		if in.peekPrefix("/*") {
+			in.Error("mod files must use // comments (not /* */ comments)")
+		}
+
+		// Found non-space non-comment.
+		break
+	}
+
+	// Found the beginning of the next token.
+	in.startToken()
+
+	// End of file.
+	if in.eof() {
+		in.endToken(_EOF)
+		return
+	}
+
+	// Punctuation tokens.
+	switch c := in.peekRune(); c {
+	case '\n', '(', ')', '[', ']', '{', '}', ',':
+		in.readRune()
+		in.endToken(tokenKind(c))
+		return
+
+	case '"', '`': // quoted string
+		quote := c
+		in.readRune()
+		for {
+			if in.eof() {
+				in.pos = in.token.pos
+				in.Error("unexpected EOF in string")
+			}
+			if in.peekRune() == '\n' {
+				in.Error("unexpected newline in string")
+			}
+			c := in.readRune()
+			if c == quote {
+				break
+			}
+			if c == '\\' && quote != '`' {
+				if in.eof() {
+					in.pos = in.token.pos
+					in.Error("unexpected EOF in string")
+				}
+				in.readRune()
+			}
+		}
+		in.endToken(_STRING)
+		return
+	}
+
+	// Checked all punctuation. Must be identifier token.
+	if c := in.peekRune(); !isIdent(c) {
+		in.Error(fmt.Sprintf("unexpected input character %#q", rune(c)))
+	}
+
+	// Scan over identifier.
+	for isIdent(in.peekRune()) {
+		if in.peekPrefix("//") {
+			break
+		}
+		if in.peekPrefix("/*") {
+			in.Error("mod files must use // comments (not /* */ comments)")
+		}
+		in.readRune()
+	}
+	in.endToken(_IDENT)
+}
+
+// isIdent reports whether c is an identifier rune.
+// We treat most printable runes as identifier runes, except for a handful of
+// ASCII punctuation characters.
+func isIdent(c int) bool {
+	switch r := rune(c); r {
+	case ' ', '(', ')', '[', ']', '{', '}', ',':
+		return false
+	default:
+		return !unicode.IsSpace(r) && unicode.IsPrint(r)
+	}
+}
+
+// Comment assignment.
+// We build two lists of all subexpressions, preorder and postorder.
+// The preorder list is ordered by start location, with outer expressions first.
+// The postorder list is ordered by end location, with outer expressions last.
+// We use the preorder list to assign each whole-line comment to the syntax
+// immediately following it, and we use the postorder list to assign each
+// end-of-line comment to the syntax immediately preceding it.
+
+// order walks the expression adding it and its subexpressions to the
+// preorder and postorder lists.
+func (in *input) order(x Expr) {
+	if x != nil {
+		in.pre = append(in.pre, x)
+	}
+	switch x := x.(type) {
+	default:
+		panic(fmt.Errorf("order: unexpected type %T", x))
+	case nil:
+		// nothing
+	case *LParen, *RParen:
+		// nothing
+	case *CommentBlock:
+		// nothing
+	case *Line:
+		// nothing
+	case *FileSyntax:
+		for _, stmt := range x.Stmt {
+			in.order(stmt)
+		}
+	case *LineBlock:
+		in.order(&x.LParen)
+		for _, l := range x.Line {
+			in.order(l)
+		}
+		in.order(&x.RParen)
+	}
+	if x != nil {
+		in.post = append(in.post, x)
+	}
+}
+
+// assignComments attaches comments to nearby syntax.
+func (in *input) assignComments() {
+	const debug = false
+
+	// Generate preorder and postorder lists.
+	in.order(in.file)
+
+	// Split into whole-line comments and suffix comments.
+	var line, suffix []Comment
+	for _, com := range in.comments {
+		if com.Suffix {
+			suffix = append(suffix, com)
+		} else {
+			line = append(line, com)
+		}
+	}
+
+	if debug {
+		for _, c := range line {
+			fmt.Fprintf(os.Stderr, "LINE %q :%d:%d #%d\n", c.Token, c.Start.Line, c.Start.LineRune, c.Start.Byte)
+		}
+	}
+
+	// Assign line comments to syntax immediately following.
+	for _, x := range in.pre {
+		start, _ := x.Span()
+		if debug {
+			fmt.Fprintf(os.Stderr, "pre %T :%d:%d #%d\n", x, start.Line, start.LineRune, start.Byte)
+		}
+		xcom := x.Comment()
+		for len(line) > 0 && start.Byte >= line[0].Start.Byte {
+			if debug {
+				fmt.Fprintf(os.Stderr, "ASSIGN LINE %q #%d\n", line[0].Token, line[0].Start.Byte)
+			}
+			xcom.Before = append(xcom.Before, line[0])
+			line = line[1:]
+		}
+	}
+
+	// Remaining line comments go at end of file.
+	in.file.After = append(in.file.After, line...)
+
+	if debug {
+		for _, c := range suffix {
+			fmt.Fprintf(os.Stderr, "SUFFIX %q :%d:%d #%d\n", c.Token, c.Start.Line, c.Start.LineRune, c.Start.Byte)
+		}
+	}
+
+	// Assign suffix comments to syntax immediately before.
+	for _, x := range slices.Backward(in.post) {
+		start, end := x.Span()
+		if debug {
+			fmt.Fprintf(os.Stderr, "post %T :%d:%d #%d :%d:%d #%d\n", x, start.Line, start.LineRune, start.Byte, end.Line, end.LineRune, end.Byte)
+		}
+
+		// Do not assign suffix comments to end of line block or whole file.
+		// Instead assign them to the last element inside.
+		switch x.(type) {
+		case *FileSyntax:
+			continue
+		}
+
+		// Do not assign suffix comments to something that starts
+		// on an earlier line, so that in
+		//
+		//	x ( y
+		//		z ) // comment
+		//
+		// we assign the comment to z and not to x ( ... ).
+		if start.Line != end.Line {
+			continue
+		}
+		xcom := x.Comment()
+		for len(suffix) > 0 && end.Byte <= suffix[len(suffix)-1].Start.Byte {
+			if debug {
+				fmt.Fprintf(os.Stderr, "ASSIGN SUFFIX %q #%d\n", suffix[len(suffix)-1].Token, suffix[len(suffix)-1].Start.Byte)
+			}
+			xcom.Suffix = append(xcom.Suffix, suffix[len(suffix)-1])
+			suffix = suffix[:len(suffix)-1]
+		}
+	}
+
+	// We assigned suffix comments in reverse.
+	// If multiple suffix comments were appended to the same
+	// expression node, they are now in reverse. Fix that.
+	for _, x := range in.post {
+		reverseComments(x.Comment().Suffix)
+	}
+
+	// Remaining suffix comments go at beginning of file.
+	in.file.Before = append(in.file.Before, suffix...)
+}
+
+// reverseComments reverses the []Comment list.
+func reverseComments(list []Comment) {
+	for i, j := 0, len(list)-1; i < j; i, j = i+1, j-1 {
+		list[i], list[j] = list[j], list[i]
+	}
+}
+
+func (in *input) parseFile() {
+	in.file = new(FileSyntax)
+	var cb *CommentBlock
+	for {
+		switch in.peek() {
+		case '\n':
+			in.lex()
+			if cb != nil {
+				in.file.Stmt = append(in.file.Stmt, cb)
+				cb = nil
+			}
+		case _COMMENT:
+			tok := in.lex()
+			if cb == nil {
+				cb = &CommentBlock{Start: tok.pos}
+			}
+			com := cb.Comment()
+			com.Before = append(com.Before, Comment{Start: tok.pos, Token: tok.text})
+		case _EOF:
+			if cb != nil {
+				in.file.Stmt = append(in.file.Stmt, cb)
+			}
+			return
+		default:
+			in.parseStmt()
+			if cb != nil {
+				in.file.Stmt[len(in.file.Stmt)-1].Comment().Before = cb.Before
+				cb = nil
+			}
+		}
+	}
+}
+
+func (in *input) parseStmt() {
+	tok := in.lex()
+	start := tok.pos
+	end := tok.endPos
+	tokens := []string{tok.text}
+	for {
+		tok := in.lex()
+		switch {
+		case tok.kind.isEOL():
+			in.file.Stmt = append(in.file.Stmt, &Line{
+				Start: start,
+				Token: tokens,
+				End:   end,
+			})
+			return
+
+		case tok.kind == '(':
+			if next := in.peek(); next.isEOL() {
+				// Start of block: no more tokens on this line.
+				in.file.Stmt = append(in.file.Stmt, in.parseLineBlock(start, tokens, tok))
+				return
+			} else if next == ')' {
+				rparen := in.lex()
+				if in.peek().isEOL() {
+					// Empty block.
+					in.lex()
+					in.file.Stmt = append(in.file.Stmt, &LineBlock{
+						Start:  start,
+						Token:  tokens,
+						LParen: LParen{Pos: tok.pos},
+						RParen: RParen{Pos: rparen.pos},
+					})
+					return
+				}
+				// '( )' in the middle of the line, not a block.
+				tokens = append(tokens, tok.text, rparen.text)
+			} else {
+				// '(' in the middle of the line, not a block.
+				tokens = append(tokens, tok.text)
+			}
+
+		default:
+			tokens = append(tokens, tok.text)
+			end = tok.endPos
+		}
+	}
+}
+
+func (in *input) parseLineBlock(start Position, token []string, lparen token) *LineBlock {
+	x := &LineBlock{
+		Start:  start,
+		Token:  token,
+		LParen: LParen{Pos: lparen.pos},
+	}
+	var comments []Comment
+	for {
+		switch in.peek() {
+		case _EOLCOMMENT:
+			// Suffix comment, will be attached later by assignComments.
+			in.lex()
+		case '\n':
+			// Blank line. Add an empty comment to preserve it.
+			in.lex()
+			if len(comments) == 0 && len(x.Line) > 0 || len(comments) > 0 && comments[len(comments)-1].Token != "" {
+				comments = append(comments, Comment{})
+			}
+		case _COMMENT:
+			tok := in.lex()
+			comments = append(comments, Comment{Start: tok.pos, Token: tok.text})
+		case _EOF:
+			in.Error(fmt.Sprintf("syntax error (unterminated block started at %s:%d:%d)", in.filename, x.Start.Line, x.Start.LineRune))
+		case ')':
+			rparen := in.lex()
+			// Don't preserve blank lines (denoted by a single empty comment, added above)
+			// at the end of the block.
+			if len(comments) == 1 && comments[0] == (Comment{}) {
+				comments = nil
+			}
+			x.RParen.Before = comments
+			x.RParen.Pos = rparen.pos
+			if !in.peek().isEOL() {
+				in.Error("syntax error (expected newline after closing paren)")
+			}
+			in.lex()
+			return x
+		default:
+			l := in.parseLine()
+			x.Line = append(x.Line, l)
+			l.Comment().Before = comments
+			comments = nil
+		}
+	}
+}
+
+func (in *input) parseLine() *Line {
+	tok := in.lex()
+	if tok.kind.isEOL() {
+		in.Error("internal parse error: parseLine at end of line")
+	}
+	start := tok.pos
+	end := tok.endPos
+	tokens := []string{tok.text}
+	for {
+		tok := in.lex()
+		if tok.kind.isEOL() {
+			return &Line{
+				Start:   start,
+				Token:   tokens,
+				End:     end,
+				InBlock: true,
+			}
+		}
+		tokens = append(tokens, tok.text)
+		end = tok.endPos
+	}
+}
+
+var (
+	slashSlash = []byte("//")
+	moduleStr  = []byte("module")
+)
+
+// ModulePath returns the module path from the go.mod file text.
+// If it cannot find a module path, it returns an empty string.
+// It is tolerant of unrelated problems in the go.mod file.
+func ModulePath(mod []byte) string {
+	for len(mod) > 0 {
+		line := mod
+		mod = nil
+		if i := bytes.IndexByte(line, '\n'); i >= 0 {
+			line, mod = line[:i], line[i+1:]
+		}
+		if i := bytes.Index(line, slashSlash); i >= 0 {
+			line = line[:i]
+		}
+		line = bytes.TrimSpace(line)
+		if !bytes.HasPrefix(line, moduleStr) {
+			continue
+		}
+		line = line[len(moduleStr):]
+		n := len(line)
+		line = bytes.TrimSpace(line)
+		if len(line) == n || len(line) == 0 {
+			continue
+		}
+
+		if line[0] == '"' || line[0] == '`' {
+			p, err := strconv.Unquote(string(line))
+			if err != nil {
+				return "" // malformed quoted string or multiline module path
+			}
+			return p
+		}
+
+		return string(line)
+	}
+	return "" // missing module path
+}
diff --git a/vendor/golang.org/x/mod/modfile/rule.go b/vendor/golang.org/x/mod/modfile/rule.go
new file mode 100644
index 000000000..20ba825d2
--- /dev/null
+++ b/vendor/golang.org/x/mod/modfile/rule.go
@@ -0,0 +1,1951 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package modfile implements a parser and formatter for go.mod files.
+//
+// The go.mod syntax is described in
+// https://pkg.go.dev/cmd/go/#hdr-The_go_mod_file.
+//
+// The [Parse] and [ParseLax] functions both parse a go.mod file and return an
+// abstract syntax tree. ParseLax ignores unknown statements and may be used to
+// parse go.mod files that may have been developed with newer versions of Go.
+//
+// The [File] struct returned by Parse and ParseLax represent an abstract
+// go.mod file. File has several methods like [File.AddNewRequire] and
+// [File.DropReplace] that can be used to programmatically edit a file.
+//
+// The [Format] function formats a File back to a byte slice which can be
+// written to a file.
+package modfile
+
+import (
+	"cmp"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"slices"
+	"strconv"
+	"strings"
+	"unicode"
+
+	"golang.org/x/mod/internal/lazyregexp"
+	"golang.org/x/mod/module"
+	"golang.org/x/mod/semver"
+)
+
+// A File is the parsed, interpreted form of a go.mod file.
+type File struct {
+	Module    *Module
+	Go        *Go
+	Toolchain *Toolchain
+	Godebug   []*Godebug
+	Require   []*Require
+	Exclude   []*Exclude
+	Replace   []*Replace
+	Retract   []*Retract
+	Tool      []*Tool
+	Ignore    []*Ignore
+
+	Syntax *FileSyntax
+}
+
+// A Module is the module statement.
+type Module struct {
+	Mod        module.Version
+	Deprecated string
+	Syntax     *Line
+}
+
+// A Go is the go statement.
+type Go struct {
+	Version string // "1.23"
+	Syntax  *Line
+}
+
+// A Toolchain is the toolchain statement.
+type Toolchain struct {
+	Name   string // "go1.21rc1"
+	Syntax *Line
+}
+
+// A Godebug is a single godebug key=value statement.
+type Godebug struct {
+	Key    string
+	Value  string
+	Syntax *Line
+}
+
+// An Exclude is a single exclude statement.
+type Exclude struct {
+	Mod    module.Version
+	Syntax *Line
+}
+
+// A Replace is a single replace statement.
+type Replace struct {
+	Old    module.Version
+	New    module.Version
+	Syntax *Line
+}
+
+// A Retract is a single retract statement.
+type Retract struct {
+	VersionInterval
+	Rationale string
+	Syntax    *Line
+}
+
+// A Tool is a single tool statement.
+type Tool struct {
+	Path   string
+	Syntax *Line
+}
+
+// An Ignore is a single ignore statement.
+type Ignore struct {
+	Path   string
+	Syntax *Line
+}
+
+// A VersionInterval represents a range of versions with upper and lower bounds.
+// Intervals are closed: both bounds are included. When Low is equal to High,
+// the interval may refer to a single version ('v1.2.3') or an interval
+// ('[v1.2.3, v1.2.3]'); both have the same representation.
+type VersionInterval struct {
+	Low, High string
+}
+
+// A Require is a single require statement.
+type Require struct {
+	Mod      module.Version
+	Indirect bool // has "// indirect" comment
+	Syntax   *Line
+}
+
+func (r *Require) markRemoved() {
+	r.Syntax.markRemoved()
+	*r = Require{}
+}
+
+func (r *Require) setVersion(v string) {
+	r.Mod.Version = v
+
+	if line := r.Syntax; len(line.Token) > 0 {
+		if line.InBlock {
+			// If the line is preceded by an empty line, remove it; see
+			// https://golang.org/issue/33779.
+			if len(line.Comments.Before) == 1 && len(line.Comments.Before[0].Token) == 0 {
+				line.Comments.Before = line.Comments.Before[:0]
+			}
+			if len(line.Token) >= 2 { // example.com v1.2.3
+				line.Token[1] = v
+			}
+		} else {
+			if len(line.Token) >= 3 { // require example.com v1.2.3
+				line.Token[2] = v
+			}
+		}
+	}
+}
+
+// setIndirect sets line to have (or not have) a "// indirect" comment.
+func (r *Require) setIndirect(indirect bool) {
+	r.Indirect = indirect
+	line := r.Syntax
+	if isIndirect(line) == indirect {
+		return
+	}
+	if indirect {
+		// Adding comment.
+		if len(line.Suffix) == 0 {
+			// New comment.
+			line.Suffix = []Comment{{Token: "// indirect", Suffix: true}}
+			return
+		}
+
+		com := &line.Suffix[0]
+		text := strings.TrimSpace(strings.TrimPrefix(com.Token, string(slashSlash)))
+		if text == "" {
+			// Empty comment.
+			com.Token = "// indirect"
+			return
+		}
+
+		// Insert at beginning of existing comment.
+		com.Token = "// indirect; " + text
+		return
+	}
+
+	// Removing comment.
+	f := strings.TrimSpace(strings.TrimPrefix(line.Suffix[0].Token, string(slashSlash)))
+	if f == "indirect" {
+		// Remove whole comment.
+		line.Suffix = nil
+		return
+	}
+
+	// Remove comment prefix.
+	com := &line.Suffix[0]
+	i := strings.Index(com.Token, "indirect;")
+	com.Token = "//" + com.Token[i+len("indirect;"):]
+}
+
+// isIndirect reports whether line has a "// indirect" comment,
+// meaning it is in go.mod only for its effect on indirect dependencies,
+// so that it can be dropped entirely once the effective version of the
+// indirect dependency reaches the given minimum version.
+func isIndirect(line *Line) bool {
+	if len(line.Suffix) == 0 {
+		return false
+	}
+	f := strings.Fields(strings.TrimPrefix(line.Suffix[0].Token, string(slashSlash)))
+	return (len(f) == 1 && f[0] == "indirect" || len(f) > 1 && f[0] == "indirect;")
+}
+
+func (f *File) AddModuleStmt(path string) error {
+	if f.Syntax == nil {
+		f.Syntax = new(FileSyntax)
+	}
+	if f.Module == nil {
+		f.Module = &Module{
+			Mod:    module.Version{Path: path},
+			Syntax: f.Syntax.addLine(nil, "module", AutoQuote(path)),
+		}
+	} else {
+		f.Module.Mod.Path = path
+		f.Syntax.updateLine(f.Module.Syntax, "module", AutoQuote(path))
+	}
+	return nil
+}
+
+func (f *File) AddComment(text string) {
+	if f.Syntax == nil {
+		f.Syntax = new(FileSyntax)
+	}
+	f.Syntax.Stmt = append(f.Syntax.Stmt, &CommentBlock{
+		Comments: Comments{
+			Before: []Comment{
+				{
+					Token: text,
+				},
+			},
+		},
+	})
+}
+
+type VersionFixer func(path, version string) (string, error)
+
+// errDontFix is returned by a VersionFixer to indicate the version should be
+// left alone, even if it's not canonical.
+var dontFixRetract VersionFixer = func(_, vers string) (string, error) {
+	return vers, nil
+}
+
+// Parse parses and returns a go.mod file.
+//
+// file is the name of the file, used in positions and errors.
+//
+// data is the content of the file.
+//
+// fix is an optional function that canonicalizes module versions.
+// If fix is nil, all module versions must be canonical ([module.CanonicalVersion]
+// must return the same string).
+func Parse(file string, data []byte, fix VersionFixer) (*File, error) {
+	return parseToFile(file, data, fix, true)
+}
+
+// ParseLax is like Parse but ignores unknown statements.
+// It is used when parsing go.mod files other than the main module,
+// under the theory that most statement types we add in the future will
+// only apply in the main module, like exclude and replace,
+// and so we get better gradual deployments if old go commands
+// simply ignore those statements when found in go.mod files
+// in dependencies.
+func ParseLax(file string, data []byte, fix VersionFixer) (*File, error) {
+	return parseToFile(file, data, fix, false)
+}
+
+func parseToFile(file string, data []byte, fix VersionFixer, strict bool) (parsed *File, err error) {
+	fs, err := parse(file, data)
+	if err != nil {
+		return nil, err
+	}
+	f := &File{
+		Syntax: fs,
+	}
+	var errs ErrorList
+
+	// fix versions in retract directives after the file is parsed.
+	// We need the module path to fix versions, and it might be at the end.
+	defer func() {
+		oldLen := len(errs)
+		f.fixRetract(fix, &errs)
+		if len(errs) > oldLen {
+			parsed, err = nil, errs
+		}
+	}()
+
+	for _, x := range fs.Stmt {
+		switch x := x.(type) {
+		case *Line:
+			f.add(&errs, nil, x, x.Token[0], x.Token[1:], fix, strict)
+
+		case *LineBlock:
+			if len(x.Token) > 1 {
+				if strict {
+					errs = append(errs, Error{
+						Filename: file,
+						Pos:      x.Start,
+						Err:      fmt.Errorf("unknown block type: %s", strings.Join(x.Token, " ")),
+					})
+				}
+				continue
+			}
+			switch x.Token[0] {
+			default:
+				if strict {
+					errs = append(errs, Error{
+						Filename: file,
+						Pos:      x.Start,
+						Err:      fmt.Errorf("unknown block type: %s", strings.Join(x.Token, " ")),
+					})
+				}
+				continue
+			case "module", "godebug", "require", "exclude", "replace", "retract", "tool", "ignore":
+				for _, l := range x.Line {
+					f.add(&errs, x, l, x.Token[0], l.Token, fix, strict)
+				}
+			}
+		}
+	}
+
+	if len(errs) > 0 {
+		return nil, errs
+	}
+	return f, nil
+}
+
+var GoVersionRE = lazyregexp.New(`^([1-9][0-9]*)\.(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))?([a-z]+[0-9]+)?$`)
+
+var laxGoVersionRE = lazyregexp.New(`^v?(([1-9][0-9]*)\.(0|[1-9][0-9]*))([^0-9].*)$`)
+
+// Toolchains must be named beginning with `go1`,
+// like "go1.20.3" or "go1.20.3-gccgo". As a special case, "default" is also permitted.
+// Note that this regexp is a much looser condition than go/version.IsValid,
+// for forward compatibility.
+// (This code has to be work to identify new toolchains even if we tweak the syntax in the future.)
+var ToolchainRE = lazyregexp.New(`^default$|^go1($|\.)`)
+
+func (f *File) add(errs *ErrorList, block *LineBlock, line *Line, verb string, args []string, fix VersionFixer, strict bool) {
+	// If strict is false, this module is a dependency.
+	// We ignore all unknown directives as well as main-module-only
+	// directives like replace and exclude. It will work better for
+	// forward compatibility if we can depend on modules that have unknown
+	// statements (presumed relevant only when acting as the main module)
+	// and simply ignore those statements.
+	if !strict {
+		switch verb {
+		case "go", "module", "retract", "require", "ignore":
+			// want these even for dependency go.mods
+		default:
+			return
+		}
+	}
+
+	wrapModPathError := func(modPath string, err error) {
+		*errs = append(*errs, Error{
+			Filename: f.Syntax.Name,
+			Pos:      line.Start,
+			ModPath:  modPath,
+			Verb:     verb,
+			Err:      err,
+		})
+	}
+	wrapError := func(err error) {
+		*errs = append(*errs, Error{
+			Filename: f.Syntax.Name,
+			Pos:      line.Start,
+			Err:      err,
+		})
+	}
+	errorf := func(format string, args ...any) {
+		wrapError(fmt.Errorf(format, args...))
+	}
+
+	switch verb {
+	default:
+		errorf("unknown directive: %s", verb)
+
+	case "go":
+		if f.Go != nil {
+			errorf("repeated go statement")
+			return
+		}
+		if len(args) != 1 {
+			errorf("go directive expects exactly one argument")
+			return
+		} else if !GoVersionRE.MatchString(args[0]) {
+			fixed := false
+			if !strict {
+				if m := laxGoVersionRE.FindStringSubmatch(args[0]); m != nil {
+					args[0] = m[1]
+					fixed = true
+				}
+			}
+			if !fixed {
+				errorf("invalid go version '%s': must match format 1.23.0", args[0])
+				return
+			}
+		}
+
+		f.Go = &Go{Syntax: line}
+		f.Go.Version = args[0]
+
+	case "toolchain":
+		if f.Toolchain != nil {
+			errorf("repeated toolchain statement")
+			return
+		}
+		if len(args) != 1 {
+			errorf("toolchain directive expects exactly one argument")
+			return
+		} else if !ToolchainRE.MatchString(args[0]) {
+			errorf("invalid toolchain version '%s': must match format go1.23.0 or default", args[0])
+			return
+		}
+		f.Toolchain = &Toolchain{Syntax: line}
+		f.Toolchain.Name = args[0]
+
+	case "module":
+		if f.Module != nil {
+			errorf("repeated module statement")
+			return
+		}
+		deprecated := parseDeprecation(block, line)
+		f.Module = &Module{
+			Syntax:     line,
+			Deprecated: deprecated,
+		}
+		if len(args) != 1 {
+			errorf("usage: module module/path")
+			return
+		}
+		s, err := parseString(&args[0])
+		if err != nil {
+			errorf("invalid quoted string: %v", err)
+			return
+		}
+		f.Module.Mod = module.Version{Path: s}
+
+	case "godebug":
+		if len(args) != 1 || strings.ContainsAny(args[0], "\"`',") {
+			errorf("usage: godebug key=value")
+			return
+		}
+		key, value, ok := strings.Cut(args[0], "=")
+		if !ok {
+			errorf("usage: godebug key=value")
+			return
+		}
+		f.Godebug = append(f.Godebug, &Godebug{
+			Key:    key,
+			Value:  value,
+			Syntax: line,
+		})
+
+	case "require", "exclude":
+		if len(args) != 2 {
+			errorf("usage: %s module/path v1.2.3", verb)
+			return
+		}
+		s, err := parseString(&args[0])
+		if err != nil {
+			errorf("invalid quoted string: %v", err)
+			return
+		}
+		v, err := parseVersion(verb, s, &args[1], fix)
+		if err != nil {
+			wrapError(err)
+			return
+		}
+		pathMajor, err := modulePathMajor(s)
+		if err != nil {
+			wrapError(err)
+			return
+		}
+		if err := module.CheckPathMajor(v, pathMajor); err != nil {
+			wrapModPathError(s, err)
+			return
+		}
+		if verb == "require" {
+			f.Require = append(f.Require, &Require{
+				Mod:      module.Version{Path: s, Version: v},
+				Syntax:   line,
+				Indirect: isIndirect(line),
+			})
+		} else {
+			f.Exclude = append(f.Exclude, &Exclude{
+				Mod:    module.Version{Path: s, Version: v},
+				Syntax: line,
+			})
+		}
+
+	case "replace":
+		replace, wrappederr := parseReplace(f.Syntax.Name, line, verb, args, fix)
+		if wrappederr != nil {
+			*errs = append(*errs, *wrappederr)
+			return
+		}
+		f.Replace = append(f.Replace, replace)
+
+	case "retract":
+		rationale := parseDirectiveComment(block, line)
+		vi, err := parseVersionInterval(verb, "", &args, dontFixRetract)
+		if err != nil {
+			if strict {
+				wrapError(err)
+				return
+			} else {
+				// Only report errors parsing intervals in the main module. We may
+				// support additional syntax in the future, such as open and half-open
+				// intervals. Those can't be supported now, because they break the
+				// go.mod parser, even in lax mode.
+				return
+			}
+		}
+		if len(args) > 0 && strict {
+			// In the future, there may be additional information after the version.
+			errorf("unexpected token after version: %q", args[0])
+			return
+		}
+		retract := &Retract{
+			VersionInterval: vi,
+			Rationale:       rationale,
+			Syntax:          line,
+		}
+		f.Retract = append(f.Retract, retract)
+
+	case "tool":
+		if len(args) != 1 {
+			errorf("tool directive expects exactly one argument")
+			return
+		}
+		s, err := parseString(&args[0])
+		if err != nil {
+			errorf("invalid quoted string: %v", err)
+			return
+		}
+		f.Tool = append(f.Tool, &Tool{
+			Path:   s,
+			Syntax: line,
+		})
+
+	case "ignore":
+		if len(args) != 1 {
+			errorf("ignore directive expects exactly one argument")
+			return
+		}
+		s, err := parseString(&args[0])
+		if err != nil {
+			errorf("invalid quoted string: %v", err)
+			return
+		}
+		f.Ignore = append(f.Ignore, &Ignore{
+			Path:   s,
+			Syntax: line,
+		})
+	}
+}
+
+func parseReplace(filename string, line *Line, verb string, args []string, fix VersionFixer) (*Replace, *Error) {
+	wrapModPathError := func(modPath string, err error) *Error {
+		return &Error{
+			Filename: filename,
+			Pos:      line.Start,
+			ModPath:  modPath,
+			Verb:     verb,
+			Err:      err,
+		}
+	}
+	wrapError := func(err error) *Error {
+		return &Error{
+			Filename: filename,
+			Pos:      line.Start,
+			Err:      err,
+		}
+	}
+	errorf := func(format string, args ...any) *Error {
+		return wrapError(fmt.Errorf(format, args...))
+	}
+
+	arrow := 2
+	if len(args) >= 2 && args[1] == "=>" {
+		arrow = 1
+	}
+	if len(args) < arrow+2 || len(args) > arrow+3 || args[arrow] != "=>" {
+		return nil, errorf("usage: %s module/path [v1.2.3] => other/module v1.4\n\t or %s module/path [v1.2.3] => ../local/directory", verb, verb)
+	}
+	s, err := parseString(&args[0])
+	if err != nil {
+		return nil, errorf("invalid quoted string: %v", err)
+	}
+	pathMajor, err := modulePathMajor(s)
+	if err != nil {
+		return nil, wrapModPathError(s, err)
+
+	}
+	var v string
+	if arrow == 2 {
+		v, err = parseVersion(verb, s, &args[1], fix)
+		if err != nil {
+			return nil, wrapError(err)
+		}
+		if err := module.CheckPathMajor(v, pathMajor); err != nil {
+			return nil, wrapModPathError(s, err)
+		}
+	}
+	ns, err := parseString(&args[arrow+1])
+	if err != nil {
+		return nil, errorf("invalid quoted string: %v", err)
+	}
+	nv := ""
+	if len(args) == arrow+2 {
+		if !IsDirectoryPath(ns) {
+			if strings.Contains(ns, "@") {
+				return nil, errorf("replacement module must match format 'path version', not 'path@version'")
+			}
+			return nil, errorf("replacement module without version must be directory path (rooted or starting with . or ..)")
+		}
+		if filepath.Separator == '/' && strings.Contains(ns, `\`) {
+			return nil, errorf("replacement directory appears to be Windows path (on a non-windows system)")
+		}
+	}
+	if len(args) == arrow+3 {
+		nv, err = parseVersion(verb, ns, &args[arrow+2], fix)
+		if err != nil {
+			return nil, wrapError(err)
+		}
+		if IsDirectoryPath(ns) {
+			return nil, errorf("replacement module directory path %q cannot have version", ns)
+		}
+	}
+	return &Replace{
+		Old:    module.Version{Path: s, Version: v},
+		New:    module.Version{Path: ns, Version: nv},
+		Syntax: line,
+	}, nil
+}
+
+// fixRetract applies fix to each retract directive in f, appending any errors
+// to errs.
+//
+// Most versions are fixed as we parse the file, but for retract directives,
+// the relevant module path is the one specified with the module directive,
+// and that might appear at the end of the file (or not at all).
+func (f *File) fixRetract(fix VersionFixer, errs *ErrorList) {
+	if fix == nil {
+		return
+	}
+	path := ""
+	if f.Module != nil {
+		path = f.Module.Mod.Path
+	}
+	var r *Retract
+	wrapError := func(err error) {
+		*errs = append(*errs, Error{
+			Filename: f.Syntax.Name,
+			Pos:      r.Syntax.Start,
+			Err:      err,
+		})
+	}
+
+	for _, r = range f.Retract {
+		if path == "" {
+			wrapError(errors.New("no module directive found, so retract cannot be used"))
+			return // only print the first one of these
+		}
+
+		args := r.Syntax.Token
+		if args[0] == "retract" {
+			args = args[1:]
+		}
+		vi, err := parseVersionInterval("retract", path, &args, fix)
+		if err != nil {
+			wrapError(err)
+		}
+		r.VersionInterval = vi
+	}
+}
+
+func (f *WorkFile) add(errs *ErrorList, line *Line, verb string, args []string, fix VersionFixer) {
+	wrapError := func(err error) {
+		*errs = append(*errs, Error{
+			Filename: f.Syntax.Name,
+			Pos:      line.Start,
+			Err:      err,
+		})
+	}
+	errorf := func(format string, args ...any) {
+		wrapError(fmt.Errorf(format, args...))
+	}
+
+	switch verb {
+	default:
+		errorf("unknown directive: %s", verb)
+
+	case "go":
+		if f.Go != nil {
+			errorf("repeated go statement")
+			return
+		}
+		if len(args) != 1 {
+			errorf("go directive expects exactly one argument")
+			return
+		} else if !GoVersionRE.MatchString(args[0]) {
+			errorf("invalid go version '%s': must match format 1.23.0", args[0])
+			return
+		}
+
+		f.Go = &Go{Syntax: line}
+		f.Go.Version = args[0]
+
+	case "toolchain":
+		if f.Toolchain != nil {
+			errorf("repeated toolchain statement")
+			return
+		}
+		if len(args) != 1 {
+			errorf("toolchain directive expects exactly one argument")
+			return
+		} else if !ToolchainRE.MatchString(args[0]) {
+			errorf("invalid toolchain version '%s': must match format go1.23.0 or default", args[0])
+			return
+		}
+
+		f.Toolchain = &Toolchain{Syntax: line}
+		f.Toolchain.Name = args[0]
+
+	case "godebug":
+		if len(args) != 1 || strings.ContainsAny(args[0], "\"`',") {
+			errorf("usage: godebug key=value")
+			return
+		}
+		key, value, ok := strings.Cut(args[0], "=")
+		if !ok {
+			errorf("usage: godebug key=value")
+			return
+		}
+		f.Godebug = append(f.Godebug, &Godebug{
+			Key:    key,
+			Value:  value,
+			Syntax: line,
+		})
+
+	case "use":
+		if len(args) != 1 {
+			errorf("usage: %s local/dir", verb)
+			return
+		}
+		s, err := parseString(&args[0])
+		if err != nil {
+			errorf("invalid quoted string: %v", err)
+			return
+		}
+		f.Use = append(f.Use, &Use{
+			Path:   s,
+			Syntax: line,
+		})
+
+	case "replace":
+		replace, wrappederr := parseReplace(f.Syntax.Name, line, verb, args, fix)
+		if wrappederr != nil {
+			*errs = append(*errs, *wrappederr)
+			return
+		}
+		f.Replace = append(f.Replace, replace)
+	}
+}
+
+// IsDirectoryPath reports whether the given path should be interpreted as a directory path.
+// Just like on the go command line, relative paths starting with a '.' or '..' path component
+// and rooted paths are directory paths; the rest are module paths.
+func IsDirectoryPath(ns string) bool {
+	// Because go.mod files can move from one system to another,
+	// we check all known path syntaxes, both Unix and Windows.
+	return ns == "." || strings.HasPrefix(ns, "./") || strings.HasPrefix(ns, `.\`) ||
+		ns == ".." || strings.HasPrefix(ns, "../") || strings.HasPrefix(ns, `..\`) ||
+		strings.HasPrefix(ns, "/") || strings.HasPrefix(ns, `\`) ||
+		len(ns) >= 2 && ('A' <= ns[0] && ns[0] <= 'Z' || 'a' <= ns[0] && ns[0] <= 'z') && ns[1] == ':'
+}
+
+// MustQuote reports whether s must be quoted in order to appear as
+// a single token in a go.mod line.
+func MustQuote(s string) bool {
+	for _, r := range s {
+		switch r {
+		case ' ', '"', '\'', '`':
+			return true
+
+		case '(', ')', '[', ']', '{', '}', ',':
+			if len(s) > 1 {
+				return true
+			}
+
+		default:
+			if !unicode.IsPrint(r) {
+				return true
+			}
+		}
+	}
+	return s == "" || strings.Contains(s, "//") || strings.Contains(s, "/*")
+}
+
+// AutoQuote returns s or, if quoting is required for s to appear in a go.mod,
+// the quotation of s.
+func AutoQuote(s string) string {
+	if MustQuote(s) {
+		return strconv.Quote(s)
+	}
+	return s
+}
+
+func parseVersionInterval(verb string, path string, args *[]string, fix VersionFixer) (VersionInterval, error) {
+	toks := *args
+	if len(toks) == 0 || toks[0] == "(" {
+		return VersionInterval{}, fmt.Errorf("expected '[' or version")
+	}
+	if toks[0] != "[" {
+		v, err := parseVersion(verb, path, &toks[0], fix)
+		if err != nil {
+			return VersionInterval{}, err
+		}
+		*args = toks[1:]
+		return VersionInterval{Low: v, High: v}, nil
+	}
+	toks = toks[1:]
+
+	if len(toks) == 0 {
+		return VersionInterval{}, fmt.Errorf("expected version after '['")
+	}
+	low, err := parseVersion(verb, path, &toks[0], fix)
+	if err != nil {
+		return VersionInterval{}, err
+	}
+	toks = toks[1:]
+
+	if len(toks) == 0 || toks[0] != "," {
+		return VersionInterval{}, fmt.Errorf("expected ',' after version")
+	}
+	toks = toks[1:]
+
+	if len(toks) == 0 {
+		return VersionInterval{}, fmt.Errorf("expected version after ','")
+	}
+	high, err := parseVersion(verb, path, &toks[0], fix)
+	if err != nil {
+		return VersionInterval{}, err
+	}
+	toks = toks[1:]
+
+	if len(toks) == 0 || toks[0] != "]" {
+		return VersionInterval{}, fmt.Errorf("expected ']' after version")
+	}
+	toks = toks[1:]
+
+	*args = toks
+	return VersionInterval{Low: low, High: high}, nil
+}
+
+func parseString(s *string) (string, error) {
+	t := *s
+	if strings.HasPrefix(t, `"`) {
+		var err error
+		if t, err = strconv.Unquote(t); err != nil {
+			return "", err
+		}
+	} else if strings.ContainsAny(t, "\"'`") {
+		// Other quotes are reserved both for possible future expansion
+		// and to avoid confusion. For example if someone types 'x'
+		// we want that to be a syntax error and not a literal x in literal quotation marks.
+		return "", fmt.Errorf("unquoted string cannot contain quote")
+	}
+	*s = AutoQuote(t)
+	return t, nil
+}
+
+var deprecatedRE = lazyregexp.New(`(?s)(?:^|\n\n)Deprecated: *(.*?)(?:$|\n\n)`)
+
+// parseDeprecation extracts the text of comments on a "module" directive and
+// extracts a deprecation message from that.
+//
+// A deprecation message is contained in a paragraph within a block of comments
+// that starts with "Deprecated:" (case sensitive). The message runs until the
+// end of the paragraph and does not include the "Deprecated:" prefix. If the
+// comment block has multiple paragraphs that start with "Deprecated:",
+// parseDeprecation returns the message from the first.
+func parseDeprecation(block *LineBlock, line *Line) string {
+	text := parseDirectiveComment(block, line)
+	m := deprecatedRE.FindStringSubmatch(text)
+	if m == nil {
+		return ""
+	}
+	return m[1]
+}
+
+// parseDirectiveComment extracts the text of comments on a directive.
+// If the directive's line does not have comments and is part of a block that
+// does have comments, the block's comments are used.
+func parseDirectiveComment(block *LineBlock, line *Line) string {
+	comments := line.Comment()
+	if block != nil && len(comments.Before) == 0 && len(comments.Suffix) == 0 {
+		comments = block.Comment()
+	}
+	groups := [][]Comment{comments.Before, comments.Suffix}
+	var lines []string
+	for _, g := range groups {
+		for _, c := range g {
+			if !strings.HasPrefix(c.Token, "//") {
+				continue // blank line
+			}
+			lines = append(lines, strings.TrimSpace(strings.TrimPrefix(c.Token, "//")))
+		}
+	}
+	return strings.Join(lines, "\n")
+}
+
+type ErrorList []Error
+
+func (e ErrorList) Error() string {
+	errStrs := make([]string, len(e))
+	for i, err := range e {
+		errStrs[i] = err.Error()
+	}
+	return strings.Join(errStrs, "\n")
+}
+
+type Error struct {
+	Filename string
+	Pos      Position
+	Verb     string
+	ModPath  string
+	Err      error
+}
+
+func (e *Error) Error() string {
+	var pos string
+	if e.Pos.LineRune > 1 {
+		// Don't print LineRune if it's 1 (beginning of line).
+		// It's always 1 except in scanner errors, which are rare.
+		pos = fmt.Sprintf("%s:%d:%d: ", e.Filename, e.Pos.Line, e.Pos.LineRune)
+	} else if e.Pos.Line > 0 {
+		pos = fmt.Sprintf("%s:%d: ", e.Filename, e.Pos.Line)
+	} else if e.Filename != "" {
+		pos = fmt.Sprintf("%s: ", e.Filename)
+	}
+
+	var directive string
+	if e.ModPath != "" {
+		directive = fmt.Sprintf("%s %s: ", e.Verb, e.ModPath)
+	} else if e.Verb != "" {
+		directive = fmt.Sprintf("%s: ", e.Verb)
+	}
+
+	return pos + directive + e.Err.Error()
+}
+
+func (e *Error) Unwrap() error { return e.Err }
+
+func parseVersion(verb string, path string, s *string, fix VersionFixer) (string, error) {
+	t, err := parseString(s)
+	if err != nil {
+		return "", &Error{
+			Verb:    verb,
+			ModPath: path,
+			Err: &module.InvalidVersionError{
+				Version: *s,
+				Err:     err,
+			},
+		}
+	}
+	if fix != nil {
+		fixed, err := fix(path, t)
+		if err != nil {
+			if err, ok := err.(*module.ModuleError); ok {
+				return "", &Error{
+					Verb:    verb,
+					ModPath: path,
+					Err:     err.Err,
+				}
+			}
+			return "", err
+		}
+		t = fixed
+	} else {
+		cv := module.CanonicalVersion(t)
+		if cv == "" {
+			return "", &Error{
+				Verb:    verb,
+				ModPath: path,
+				Err: &module.InvalidVersionError{
+					Version: t,
+					Err:     errors.New("must be of the form v1.2.3"),
+				},
+			}
+		}
+		t = cv
+	}
+	*s = t
+	return *s, nil
+}
+
+func modulePathMajor(path string) (string, error) {
+	_, major, ok := module.SplitPathVersion(path)
+	if !ok {
+		return "", fmt.Errorf("invalid module path")
+	}
+	return major, nil
+}
+
+func (f *File) Format() ([]byte, error) {
+	return Format(f.Syntax), nil
+}
+
+// Cleanup cleans up the file f after any edit operations.
+// To avoid quadratic behavior, modifications like [File.DropRequire]
+// clear the entry but do not remove it from the slice.
+// Cleanup cleans out all the cleared entries.
+func (f *File) Cleanup() {
+	w := 0
+	for _, g := range f.Godebug {
+		if g.Key != "" {
+			f.Godebug[w] = g
+			w++
+		}
+	}
+	f.Godebug = f.Godebug[:w]
+
+	w = 0
+	for _, r := range f.Require {
+		if r.Mod.Path != "" {
+			f.Require[w] = r
+			w++
+		}
+	}
+	f.Require = f.Require[:w]
+
+	w = 0
+	for _, x := range f.Exclude {
+		if x.Mod.Path != "" {
+			f.Exclude[w] = x
+			w++
+		}
+	}
+	f.Exclude = f.Exclude[:w]
+
+	w = 0
+	for _, r := range f.Replace {
+		if r.Old.Path != "" {
+			f.Replace[w] = r
+			w++
+		}
+	}
+	f.Replace = f.Replace[:w]
+
+	w = 0
+	for _, r := range f.Retract {
+		if r.Low != "" || r.High != "" {
+			f.Retract[w] = r
+			w++
+		}
+	}
+	f.Retract = f.Retract[:w]
+
+	f.Syntax.Cleanup()
+}
+
+func (f *File) AddGoStmt(version string) error {
+	if !GoVersionRE.MatchString(version) {
+		return fmt.Errorf("invalid language version %q", version)
+	}
+	if f.Go == nil {
+		var hint Expr
+		if f.Module != nil && f.Module.Syntax != nil {
+			hint = f.Module.Syntax
+		} else if f.Syntax == nil {
+			f.Syntax = new(FileSyntax)
+		}
+		f.Go = &Go{
+			Version: version,
+			Syntax:  f.Syntax.addLine(hint, "go", version),
+		}
+	} else {
+		f.Go.Version = version
+		f.Syntax.updateLine(f.Go.Syntax, "go", version)
+	}
+	return nil
+}
+
+// DropGoStmt deletes the go statement from the file.
+func (f *File) DropGoStmt() {
+	if f.Go != nil {
+		f.Go.Syntax.markRemoved()
+		f.Go = nil
+	}
+}
+
+// DropToolchainStmt deletes the toolchain statement from the file.
+func (f *File) DropToolchainStmt() {
+	if f.Toolchain != nil {
+		f.Toolchain.Syntax.markRemoved()
+		f.Toolchain = nil
+	}
+}
+
+func (f *File) AddToolchainStmt(name string) error {
+	if !ToolchainRE.MatchString(name) {
+		return fmt.Errorf("invalid toolchain name %q", name)
+	}
+	if f.Toolchain == nil {
+		var hint Expr
+		if f.Go != nil && f.Go.Syntax != nil {
+			hint = f.Go.Syntax
+		} else if f.Module != nil && f.Module.Syntax != nil {
+			hint = f.Module.Syntax
+		}
+		f.Toolchain = &Toolchain{
+			Name:   name,
+			Syntax: f.Syntax.addLine(hint, "toolchain", name),
+		}
+	} else {
+		f.Toolchain.Name = name
+		f.Syntax.updateLine(f.Toolchain.Syntax, "toolchain", name)
+	}
+	return nil
+}
+
+// AddGodebug sets the first godebug line for key to value,
+// preserving any existing comments for that line and removing all
+// other godebug lines for key.
+//
+// If no line currently exists for key, AddGodebug adds a new line
+// at the end of the last godebug block.
+func (f *File) AddGodebug(key, value string) error {
+	need := true
+	for _, g := range f.Godebug {
+		if g.Key == key {
+			if need {
+				g.Value = value
+				f.Syntax.updateLine(g.Syntax, "godebug", key+"="+value)
+				need = false
+			} else {
+				g.Syntax.markRemoved()
+				*g = Godebug{}
+			}
+		}
+	}
+
+	if need {
+		f.addNewGodebug(key, value)
+	}
+	return nil
+}
+
+// addNewGodebug adds a new godebug key=value line at the end
+// of the last godebug block, regardless of any existing godebug lines for key.
+func (f *File) addNewGodebug(key, value string) {
+	line := f.Syntax.addLine(nil, "godebug", key+"="+value)
+	g := &Godebug{
+		Key:    key,
+		Value:  value,
+		Syntax: line,
+	}
+	f.Godebug = append(f.Godebug, g)
+}
+
+// AddRequire sets the first require line for path to version vers,
+// preserving any existing comments for that line and removing all
+// other lines for path.
+//
+// If no line currently exists for path, AddRequire adds a new line
+// at the end of the last require block.
+func (f *File) AddRequire(path, vers string) error {
+	need := true
+	for _, r := range f.Require {
+		if r.Mod.Path == path {
+			if need {
+				r.Mod.Version = vers
+				f.Syntax.updateLine(r.Syntax, "require", AutoQuote(path), vers)
+				need = false
+			} else {
+				r.Syntax.markRemoved()
+				*r = Require{}
+			}
+		}
+	}
+
+	if need {
+		f.AddNewRequire(path, vers, false)
+	}
+	return nil
+}
+
+// AddNewRequire adds a new require line for path at version vers at the end of
+// the last require block, regardless of any existing require lines for path.
+func (f *File) AddNewRequire(path, vers string, indirect bool) {
+	line := f.Syntax.addLine(nil, "require", AutoQuote(path), vers)
+	r := &Require{
+		Mod:    module.Version{Path: path, Version: vers},
+		Syntax: line,
+	}
+	r.setIndirect(indirect)
+	f.Require = append(f.Require, r)
+}
+
+// SetRequire updates the requirements of f to contain exactly req, preserving
+// the existing block structure and line comment contents (except for 'indirect'
+// markings) for the first requirement on each named module path.
+//
+// The Syntax field is ignored for the requirements in req.
+//
+// Any requirements not already present in the file are added to the block
+// containing the last require line.
+//
+// The requirements in req must specify at most one distinct version for each
+// module path.
+//
+// If any existing requirements may be removed, the caller should call
+// [File.Cleanup] after all edits are complete.
+func (f *File) SetRequire(req []*Require) {
+	type elem struct {
+		version  string
+		indirect bool
+	}
+	need := make(map[string]elem)
+	for _, r := range req {
+		if prev, dup := need[r.Mod.Path]; dup && prev.version != r.Mod.Version {
+			panic(fmt.Errorf("SetRequire called with conflicting versions for path %s (%s and %s)", r.Mod.Path, prev.version, r.Mod.Version))
+		}
+		need[r.Mod.Path] = elem{r.Mod.Version, r.Indirect}
+	}
+
+	// Update or delete the existing Require entries to preserve
+	// only the first for each module path in req.
+	for _, r := range f.Require {
+		e, ok := need[r.Mod.Path]
+		if ok {
+			r.setVersion(e.version)
+			r.setIndirect(e.indirect)
+		} else {
+			r.markRemoved()
+		}
+		delete(need, r.Mod.Path)
+	}
+
+	// Add new entries in the last block of the file for any paths that weren't
+	// already present.
+	//
+	// This step is nondeterministic, but the final result will be deterministic
+	// because we will sort the block.
+	for path, e := range need {
+		f.AddNewRequire(path, e.version, e.indirect)
+	}
+
+	f.SortBlocks()
+}
+
+// SetRequireSeparateIndirect updates the requirements of f to contain the given
+// requirements. Comment contents (except for 'indirect' markings) are retained
+// from the first existing requirement for each module path. Like SetRequire,
+// SetRequireSeparateIndirect adds requirements for new paths in req,
+// updates the version and "// indirect" comment on existing requirements,
+// and deletes requirements on paths not in req. Existing duplicate requirements
+// are deleted.
+//
+// As its name suggests, SetRequireSeparateIndirect puts direct and indirect
+// requirements into two separate blocks, one containing only direct
+// requirements, and the other containing only indirect requirements.
+// SetRequireSeparateIndirect may move requirements between these two blocks
+// when their indirect markings change. However, SetRequireSeparateIndirect
+// won't move requirements from other blocks, especially blocks with comments.
+//
+// If the file initially has one uncommented block of requirements,
+// SetRequireSeparateIndirect will split it into a direct-only and indirect-only
+// block. This aids in the transition to separate blocks.
+func (f *File) SetRequireSeparateIndirect(req []*Require) {
+	f.setRequireSeparateIndirect(req, false)
+}
+
+// SetRequireAtMostTwo is like SetRequireSeparateIndirect but it aggressively
+// consolidates all requirements into at most two blocks (one direct, one indirect).
+// It ignores existing blocks and comments when deciding where to place requirements.
+func (f *File) SetRequireAtMostTwo(req []*Require) {
+	f.setRequireSeparateIndirect(req, true)
+}
+
+func (f *File) setRequireSeparateIndirect(req []*Require, simplify bool) {
+	// hasComments returns whether a line or block has comments
+	// other than "indirect".
+	hasComments := func(c Comments) bool {
+		return len(c.Before) > 0 || len(c.After) > 0 || len(c.Suffix) > 1 ||
+			(len(c.Suffix) == 1 &&
+				strings.TrimSpace(strings.TrimPrefix(c.Suffix[0].Token, string(slashSlash))) != "indirect")
+	}
+
+	// moveReq adds r to block. If r was in another block, moveReq deletes
+	// it from that block and transfers its comments.
+	moveReq := func(r *Require, block *LineBlock) {
+		var line *Line
+		if r.Syntax == nil {
+			line = &Line{Token: []string{AutoQuote(r.Mod.Path), r.Mod.Version}}
+			r.Syntax = line
+			if r.Indirect {
+				r.setIndirect(true)
+			}
+		} else {
+			line = new(Line)
+			*line = *r.Syntax
+			if !line.InBlock && len(line.Token) > 0 && line.Token[0] == "require" {
+				line.Token = line.Token[1:]
+			}
+			r.Syntax.Token = nil // Cleanup will delete the old line.
+			r.Syntax = line
+		}
+		line.InBlock = true
+		block.Line = append(block.Line, line)
+	}
+
+	// Examine existing require lines and blocks.
+	need := make(map[string]*Require)
+	for _, r := range req {
+		need[r.Mod.Path] = r
+	}
+	lineIndirect := make(map[*Line]bool)
+	for _, r := range f.Require {
+		if n := need[r.Mod.Path]; n != nil {
+			lineIndirect[r.Syntax] = n.Indirect
+		}
+	}
+
+	var (
+		// We may insert new requirements into the last uncommented
+		// direct-only and indirect-only blocks. We may also move requirements
+		// to the opposite block if their indirect markings change.
+		lastDirectIndex   = -1
+		lastIndirectIndex = -1
+
+		// If there are no direct-only or indirect-only blocks, a new block may
+		// be inserted after the last require line or block.
+		lastRequireIndex = -1
+
+		// If there's only one require line or block, and it's uncommented,
+		// we'll move its requirements to the direct-only or indirect-only blocks.
+		requireLineOrBlockCount = 0
+
+		// Track the block each requirement belongs to (if any) so we can
+		// move them later.
+		lineToBlock           = make(map[*Line]*LineBlock)
+		directBlockComments   []Comment
+		indirectBlockComments []Comment
+	)
+	for i, stmt := range f.Syntax.Stmt {
+		switch stmt := stmt.(type) {
+		case *Line:
+			if len(stmt.Token) == 0 || stmt.Token[0] != "require" {
+				continue
+			}
+			lastRequireIndex = i
+			requireLineOrBlockCount++
+			if !hasComments(stmt.Comments) {
+				if isIndirect(stmt) {
+					lastIndirectIndex = i
+				} else {
+					lastDirectIndex = i
+				}
+			}
+
+		case *LineBlock:
+			if len(stmt.Token) == 0 || stmt.Token[0] != "require" {
+				continue
+			}
+			lastRequireIndex = i
+			requireLineOrBlockCount++
+			allDirect := len(stmt.Line) > 0 && !hasComments(stmt.Comments)
+			allIndirect := len(stmt.Line) > 0 && !hasComments(stmt.Comments)
+			for _, line := range stmt.Line {
+				lineToBlock[line] = stmt
+				if hasComments(line.Comments) {
+					allDirect = false
+					allIndirect = false
+				} else if isIndirect(line) {
+					allDirect = false
+				} else {
+					allIndirect = false
+				}
+			}
+			if allDirect {
+				lastDirectIndex = i
+			}
+			if allIndirect {
+				lastIndirectIndex = i
+			}
+			if simplify {
+				anyDirect := false
+				for _, line := range stmt.Line {
+					if ind, ok := lineIndirect[line]; ok && !ind {
+						anyDirect = true
+						break
+					}
+				}
+				target := &directBlockComments
+				if !anyDirect && len(stmt.Line) > 0 {
+					target = &indirectBlockComments
+				}
+				if len(*target) > 0 && len(stmt.Comments.Before) > 0 {
+					*target = append(*target, Comment{Token: "//"})
+				}
+				*target = append(*target, stmt.Comments.Before...)
+				stmt.Comments.Before = nil
+			}
+		}
+	}
+
+	oneFlatUncommentedBlock := requireLineOrBlockCount == 1 &&
+		!hasComments(*f.Syntax.Stmt[lastRequireIndex].Comment())
+
+	// Create direct and indirect blocks if needed. Convert lines into blocks
+	// if needed. If we end up with an empty block or a one-line block,
+	// Cleanup will delete it or convert it to a line later.
+	insertBlock := func(i int) *LineBlock {
+		block := &LineBlock{Token: []string{"require"}}
+		f.Syntax.Stmt = append(f.Syntax.Stmt, nil)
+		copy(f.Syntax.Stmt[i+1:], f.Syntax.Stmt[i:])
+		f.Syntax.Stmt[i] = block
+		return block
+	}
+
+	ensureBlock := func(i int) *LineBlock {
+		switch stmt := f.Syntax.Stmt[i].(type) {
+		case *LineBlock:
+			return stmt
+		case *Line:
+			block := &LineBlock{
+				Token: []string{"require"},
+				Line:  []*Line{stmt},
+			}
+			stmt.Token = stmt.Token[1:] // remove "require"
+			stmt.InBlock = true
+			f.Syntax.Stmt[i] = block
+			return block
+		default:
+			panic(fmt.Sprintf("unexpected statement: %v", stmt))
+		}
+	}
+
+	var lastDirectBlock *LineBlock
+	if lastDirectIndex < 0 {
+		if lastIndirectIndex >= 0 {
+			lastDirectIndex = lastIndirectIndex
+			lastIndirectIndex++
+		} else if lastRequireIndex >= 0 {
+			lastDirectIndex = lastRequireIndex + 1
+		} else {
+			lastDirectIndex = len(f.Syntax.Stmt)
+		}
+		lastDirectBlock = insertBlock(lastDirectIndex)
+	} else {
+		lastDirectBlock = ensureBlock(lastDirectIndex)
+	}
+
+	var lastIndirectBlock *LineBlock
+	if lastIndirectIndex < 0 {
+		lastIndirectIndex = lastDirectIndex + 1
+		lastIndirectBlock = insertBlock(lastIndirectIndex)
+	} else {
+		lastIndirectBlock = ensureBlock(lastIndirectIndex)
+	}
+
+	if simplify {
+		if len(directBlockComments) > 0 {
+			lastDirectBlock.Comments.Before = append(lastDirectBlock.Comments.Before, directBlockComments...)
+		}
+		if len(indirectBlockComments) > 0 {
+			lastIndirectBlock.Comments.Before = append(lastIndirectBlock.Comments.Before, indirectBlockComments...)
+		}
+	}
+
+	// Delete requirements we don't want anymore.
+	// Update versions and indirect comments on requirements we want to keep.
+	// If a requirement is in last{Direct,Indirect}Block with the wrong
+	// indirect marking after this, or if the requirement is in a single
+	// uncommented mixed block (oneFlatUncommentedBlock), move it to the
+	// correct block.
+	//
+	// Some blocks may be empty after this. Cleanup will remove them.
+	have := make(map[string]*Require)
+	for _, r := range f.Require {
+		path := r.Mod.Path
+		if need[path] == nil || have[path] != nil {
+			// Requirement not needed, or duplicate requirement. Delete.
+			r.markRemoved()
+			continue
+		}
+		have[r.Mod.Path] = r
+		r.setVersion(need[path].Mod.Version)
+		r.setIndirect(need[path].Indirect)
+		if need[path].Indirect &&
+			(simplify || oneFlatUncommentedBlock || lineToBlock[r.Syntax] == lastDirectBlock) {
+			moveReq(r, lastIndirectBlock)
+		} else if !need[path].Indirect &&
+			(simplify || oneFlatUncommentedBlock || lineToBlock[r.Syntax] == lastIndirectBlock) {
+			moveReq(r, lastDirectBlock)
+		}
+	}
+
+	// Add new requirements.
+	for path, r := range need {
+		if have[path] == nil {
+			if r.Indirect {
+				moveReq(r, lastIndirectBlock)
+			} else {
+				moveReq(r, lastDirectBlock)
+			}
+			f.Require = append(f.Require, r)
+		}
+	}
+
+	f.SortBlocks()
+}
+
+func (f *File) DropGodebug(key string) error {
+	for _, g := range f.Godebug {
+		if g.Key == key {
+			g.Syntax.markRemoved()
+			*g = Godebug{}
+		}
+	}
+	return nil
+}
+
+func (f *File) DropRequire(path string) error {
+	for _, r := range f.Require {
+		if r.Mod.Path == path {
+			r.Syntax.markRemoved()
+			*r = Require{}
+		}
+	}
+	return nil
+}
+
+// AddExclude adds an exclude statement to the mod file. Errors if the provided
+// version is not a canonical version string
+func (f *File) AddExclude(path, vers string) error {
+	if err := checkCanonicalVersion(path, vers); err != nil {
+		return err
+	}
+
+	var hint *Line
+	for _, x := range f.Exclude {
+		if x.Mod.Path == path && x.Mod.Version == vers {
+			return nil
+		}
+		if x.Mod.Path == path {
+			hint = x.Syntax
+		}
+	}
+
+	f.Exclude = append(f.Exclude, &Exclude{Mod: module.Version{Path: path, Version: vers}, Syntax: f.Syntax.addLine(hint, "exclude", AutoQuote(path), vers)})
+	return nil
+}
+
+func (f *File) DropExclude(path, vers string) error {
+	for _, x := range f.Exclude {
+		if x.Mod.Path == path && x.Mod.Version == vers {
+			x.Syntax.markRemoved()
+			*x = Exclude{}
+		}
+	}
+	return nil
+}
+
+func (f *File) AddReplace(oldPath, oldVers, newPath, newVers string) error {
+	return addReplace(f.Syntax, &f.Replace, oldPath, oldVers, newPath, newVers)
+}
+
+func addReplace(syntax *FileSyntax, replace *[]*Replace, oldPath, oldVers, newPath, newVers string) error {
+	need := true
+	old := module.Version{Path: oldPath, Version: oldVers}
+	new := module.Version{Path: newPath, Version: newVers}
+	tokens := []string{"replace", AutoQuote(oldPath)}
+	if oldVers != "" {
+		tokens = append(tokens, oldVers)
+	}
+	tokens = append(tokens, "=>", AutoQuote(newPath))
+	if newVers != "" {
+		tokens = append(tokens, newVers)
+	}
+
+	var hint *Line
+	for _, r := range *replace {
+		if r.Old.Path == oldPath && (oldVers == "" || r.Old.Version == oldVers) {
+			if need {
+				// Found replacement for old; update to use new.
+				r.New = new
+				syntax.updateLine(r.Syntax, tokens...)
+				need = false
+				continue
+			}
+			// Already added; delete other replacements for same.
+			r.Syntax.markRemoved()
+			*r = Replace{}
+		}
+		if r.Old.Path == oldPath {
+			hint = r.Syntax
+		}
+	}
+	if need {
+		*replace = append(*replace, &Replace{Old: old, New: new, Syntax: syntax.addLine(hint, tokens...)})
+	}
+	return nil
+}
+
+func (f *File) DropReplace(oldPath, oldVers string) error {
+	for _, r := range f.Replace {
+		if r.Old.Path == oldPath && r.Old.Version == oldVers {
+			r.Syntax.markRemoved()
+			*r = Replace{}
+		}
+	}
+	return nil
+}
+
+// AddRetract adds a retract statement to the mod file. Errors if the provided
+// version interval does not consist of canonical version strings
+func (f *File) AddRetract(vi VersionInterval, rationale string) error {
+	var path string
+	if f.Module != nil {
+		path = f.Module.Mod.Path
+	}
+	if err := checkCanonicalVersion(path, vi.High); err != nil {
+		return err
+	}
+	if err := checkCanonicalVersion(path, vi.Low); err != nil {
+		return err
+	}
+
+	r := &Retract{
+		VersionInterval: vi,
+	}
+	if vi.Low == vi.High {
+		r.Syntax = f.Syntax.addLine(nil, "retract", AutoQuote(vi.Low))
+	} else {
+		r.Syntax = f.Syntax.addLine(nil, "retract", "[", AutoQuote(vi.Low), ",", AutoQuote(vi.High), "]")
+	}
+	if rationale != "" {
+		for line := range strings.SplitSeq(rationale, "\n") {
+			com := Comment{Token: "// " + line}
+			r.Syntax.Comment().Before = append(r.Syntax.Comment().Before, com)
+		}
+	}
+	return nil
+}
+
+func (f *File) DropRetract(vi VersionInterval) error {
+	for _, r := range f.Retract {
+		if r.VersionInterval == vi {
+			r.Syntax.markRemoved()
+			*r = Retract{}
+		}
+	}
+	return nil
+}
+
+// AddTool adds a new tool directive with the given path.
+// It does nothing if the tool line already exists.
+func (f *File) AddTool(path string) error {
+	for _, t := range f.Tool {
+		if t.Path == path {
+			return nil
+		}
+	}
+
+	f.Tool = append(f.Tool, &Tool{
+		Path:   path,
+		Syntax: f.Syntax.addLine(nil, "tool", path),
+	})
+
+	f.SortBlocks()
+	return nil
+}
+
+// RemoveTool removes a tool directive with the given path.
+// It does nothing if no such tool directive exists.
+func (f *File) DropTool(path string) error {
+	for _, t := range f.Tool {
+		if t.Path == path {
+			t.Syntax.markRemoved()
+			*t = Tool{}
+		}
+	}
+	return nil
+}
+
+// AddIgnore adds a new ignore directive with the given path.
+// It does nothing if the ignore line already exists.
+func (f *File) AddIgnore(path string) error {
+	for _, t := range f.Ignore {
+		if t.Path == path {
+			return nil
+		}
+	}
+
+	f.Ignore = append(f.Ignore, &Ignore{
+		Path:   path,
+		Syntax: f.Syntax.addLine(nil, "ignore", path),
+	})
+
+	f.SortBlocks()
+	return nil
+}
+
+// DropIgnore removes an ignore directive with the given path.
+// It does nothing if no such ignore directive exists.
+func (f *File) DropIgnore(path string) error {
+	for _, t := range f.Ignore {
+		if t.Path == path {
+			t.Syntax.markRemoved()
+			*t = Ignore{}
+		}
+	}
+	return nil
+}
+
+func (f *File) SortBlocks() {
+	f.removeDups() // otherwise sorting is unsafe
+
+	// semanticSortForExcludeVersionV is the Go version (plus leading "v") at which
+	// lines in exclude blocks start to use semantic sort instead of lexicographic sort.
+	// See go.dev/issue/60028.
+	const semanticSortForExcludeVersionV = "v1.21"
+	useSemanticSortForExclude := f.Go != nil && semver.Compare("v"+f.Go.Version, semanticSortForExcludeVersionV) >= 0
+
+	for _, stmt := range f.Syntax.Stmt {
+		block, ok := stmt.(*LineBlock)
+		if !ok {
+			continue
+		}
+		less := compareLine
+		if block.Token[0] == "exclude" && useSemanticSortForExclude {
+			less = compareLineExclude
+		} else if block.Token[0] == "retract" {
+			less = compareLineRetract
+		}
+		slices.SortStableFunc(block.Line, less)
+	}
+}
+
+// removeDups removes duplicate exclude, replace and tool directives.
+//
+// Earlier exclude and tool directives take priority.
+//
+// Later replace directives take priority.
+//
+// require directives are not de-duplicated. That's left up to higher-level
+// logic (MVS).
+//
+// retract directives are not de-duplicated since comments are
+// meaningful, and versions may be retracted multiple times.
+func (f *File) removeDups() {
+	removeDups(f.Syntax, &f.Exclude, &f.Replace, &f.Tool, &f.Ignore)
+}
+
+func removeDups(syntax *FileSyntax, exclude *[]*Exclude, replace *[]*Replace, tool *[]*Tool, ignore *[]*Ignore) {
+	kill := make(map[*Line]bool)
+
+	// Remove duplicate excludes.
+	if exclude != nil {
+		haveExclude := make(map[module.Version]bool)
+		for _, x := range *exclude {
+			if haveExclude[x.Mod] {
+				kill[x.Syntax] = true
+				continue
+			}
+			haveExclude[x.Mod] = true
+		}
+		var excl []*Exclude
+		for _, x := range *exclude {
+			if !kill[x.Syntax] {
+				excl = append(excl, x)
+			}
+		}
+		*exclude = excl
+	}
+
+	// Remove duplicate replacements.
+	// Later replacements take priority over earlier ones.
+	haveReplace := make(map[module.Version]bool)
+	for _, x := range slices.Backward(*replace) {
+		if haveReplace[x.Old] {
+			kill[x.Syntax] = true
+			continue
+		}
+		haveReplace[x.Old] = true
+	}
+	var repl []*Replace
+	for _, x := range *replace {
+		if !kill[x.Syntax] {
+			repl = append(repl, x)
+		}
+	}
+	*replace = repl
+
+	if tool != nil {
+		haveTool := make(map[string]bool)
+		for _, t := range *tool {
+			if haveTool[t.Path] {
+				kill[t.Syntax] = true
+				continue
+			}
+			haveTool[t.Path] = true
+		}
+		var newTool []*Tool
+		for _, t := range *tool {
+			if !kill[t.Syntax] {
+				newTool = append(newTool, t)
+			}
+		}
+		*tool = newTool
+	}
+
+	if ignore != nil {
+		haveIgnore := make(map[string]bool)
+		for _, i := range *ignore {
+			if haveIgnore[i.Path] {
+				kill[i.Syntax] = true
+				continue
+			}
+			haveIgnore[i.Path] = true
+		}
+		var newIgnore []*Ignore
+		for _, i := range *ignore {
+			if !kill[i.Syntax] {
+				newIgnore = append(newIgnore, i)
+			}
+		}
+		*ignore = newIgnore
+	}
+
+	// Duplicate require and retract directives are not removed.
+
+	// Drop killed statements from the syntax tree.
+	var stmts []Expr
+	for _, stmt := range syntax.Stmt {
+		switch stmt := stmt.(type) {
+		case *Line:
+			if kill[stmt] {
+				continue
+			}
+		case *LineBlock:
+			var lines []*Line
+			for _, line := range stmt.Line {
+				if !kill[line] {
+					lines = append(lines, line)
+				}
+			}
+			stmt.Line = lines
+			if len(lines) == 0 {
+				continue
+			}
+		}
+		stmts = append(stmts, stmt)
+	}
+	syntax.Stmt = stmts
+}
+
+// compareLine compares li and lj. It sorts lexicographically without assigning
+// any special meaning to tokens.
+func compareLine(li, lj *Line) int {
+	for k := 0; k < len(li.Token) && k < len(lj.Token); k++ {
+		if li.Token[k] != lj.Token[k] {
+			return cmp.Compare(li.Token[k], lj.Token[k])
+		}
+	}
+	return cmp.Compare(len(li.Token), len(lj.Token))
+}
+
+// compareLineExclude compares li and lj for lines in an "exclude" block.
+func compareLineExclude(li, lj *Line) int {
+	if len(li.Token) != 2 || len(lj.Token) != 2 {
+		// Not a known exclude specification.
+		// Fall back to sorting lexicographically.
+		return compareLine(li, lj)
+	}
+	// An exclude specification has two tokens: ModulePath and Version.
+	// Compare module path by string order and version by semver rules.
+	if pi, pj := li.Token[0], lj.Token[0]; pi != pj {
+		return cmp.Compare(pi, pj)
+	}
+	return semver.Compare(li.Token[1], lj.Token[1])
+}
+
+// compareLineRetract compares li and lj for lines in a "retract" block.
+// It treats each line as a version interval. Single versions are compared as
+// if they were intervals with the same low and high version.
+// Intervals are sorted in descending order, first by low version, then by
+// high version, using [semver.Compare].
+func compareLineRetract(li, lj *Line) int {
+	interval := func(l *Line) VersionInterval {
+		if len(l.Token) == 1 {
+			return VersionInterval{Low: l.Token[0], High: l.Token[0]}
+		} else if len(l.Token) == 5 && l.Token[0] == "[" && l.Token[2] == "," && l.Token[4] == "]" {
+			return VersionInterval{Low: l.Token[1], High: l.Token[3]}
+		} else {
+			// Line in unknown format. Treat as an invalid version.
+			return VersionInterval{}
+		}
+	}
+	vii := interval(li)
+	vij := interval(lj)
+	if cmp := semver.Compare(vii.Low, vij.Low); cmp != 0 {
+		return -cmp
+	}
+	return -semver.Compare(vii.High, vij.High)
+}
+
+// checkCanonicalVersion returns a non-nil error if vers is not a canonical
+// version string or does not match the major version of path.
+//
+// If path is non-empty, the error text suggests a format with a major version
+// corresponding to the path.
+func checkCanonicalVersion(path, vers string) error {
+	_, pathMajor, pathMajorOk := module.SplitPathVersion(path)
+
+	if vers == "" || vers != module.CanonicalVersion(vers) {
+		if pathMajor == "" {
+			return &module.InvalidVersionError{
+				Version: vers,
+				Err:     fmt.Errorf("must be of the form v1.2.3"),
+			}
+		}
+		return &module.InvalidVersionError{
+			Version: vers,
+			Err:     fmt.Errorf("must be of the form %s.2.3", module.PathMajorPrefix(pathMajor)),
+		}
+	}
+
+	if pathMajorOk {
+		if err := module.CheckPathMajor(vers, pathMajor); err != nil {
+			if pathMajor == "" {
+				// In this context, the user probably wrote "v2.3.4" when they meant
+				// "v2.3.4+incompatible". Suggest that instead of "v0 or v1".
+				return &module.InvalidVersionError{
+					Version: vers,
+					Err:     fmt.Errorf("should be %s+incompatible (or module %s/%v)", vers, path, semver.Major(vers)),
+				}
+			}
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/golang.org/x/mod/modfile/work.go b/vendor/golang.org/x/mod/modfile/work.go
new file mode 100644
index 000000000..09df5ea3c
--- /dev/null
+++ b/vendor/golang.org/x/mod/modfile/work.go
@@ -0,0 +1,333 @@
+// Copyright 2021 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package modfile
+
+import (
+	"fmt"
+	"slices"
+	"strings"
+)
+
+// A WorkFile is the parsed, interpreted form of a go.work file.
+type WorkFile struct {
+	Go        *Go
+	Toolchain *Toolchain
+	Godebug   []*Godebug
+	Use       []*Use
+	Replace   []*Replace
+
+	Syntax *FileSyntax
+}
+
+// A Use is a single directory statement.
+type Use struct {
+	Path       string // Use path of module.
+	ModulePath string // Module path in the comment.
+	Syntax     *Line
+}
+
+// ParseWork parses and returns a go.work file.
+//
+// file is the name of the file, used in positions and errors.
+//
+// data is the content of the file.
+//
+// fix is an optional function that canonicalizes module versions.
+// If fix is nil, all module versions must be canonical ([module.CanonicalVersion]
+// must return the same string).
+func ParseWork(file string, data []byte, fix VersionFixer) (*WorkFile, error) {
+	fs, err := parse(file, data)
+	if err != nil {
+		return nil, err
+	}
+	f := &WorkFile{
+		Syntax: fs,
+	}
+	var errs ErrorList
+
+	for _, x := range fs.Stmt {
+		switch x := x.(type) {
+		case *Line:
+			f.add(&errs, x, x.Token[0], x.Token[1:], fix)
+
+		case *LineBlock:
+			if len(x.Token) > 1 {
+				errs = append(errs, Error{
+					Filename: file,
+					Pos:      x.Start,
+					Err:      fmt.Errorf("unknown block type: %s", strings.Join(x.Token, " ")),
+				})
+				continue
+			}
+			switch x.Token[0] {
+			default:
+				errs = append(errs, Error{
+					Filename: file,
+					Pos:      x.Start,
+					Err:      fmt.Errorf("unknown block type: %s", strings.Join(x.Token, " ")),
+				})
+				continue
+			case "godebug", "use", "replace":
+				for _, l := range x.Line {
+					f.add(&errs, l, x.Token[0], l.Token, fix)
+				}
+			}
+		}
+	}
+
+	if len(errs) > 0 {
+		return nil, errs
+	}
+	return f, nil
+}
+
+// Cleanup cleans up the file f after any edit operations.
+// To avoid quadratic behavior, modifications like [WorkFile.DropRequire]
+// clear the entry but do not remove it from the slice.
+// Cleanup cleans out all the cleared entries.
+func (f *WorkFile) Cleanup() {
+	w := 0
+	for _, r := range f.Use {
+		if r.Path != "" {
+			f.Use[w] = r
+			w++
+		}
+	}
+	f.Use = f.Use[:w]
+
+	w = 0
+	for _, r := range f.Replace {
+		if r.Old.Path != "" {
+			f.Replace[w] = r
+			w++
+		}
+	}
+	f.Replace = f.Replace[:w]
+
+	f.Syntax.Cleanup()
+}
+
+func (f *WorkFile) AddGoStmt(version string) error {
+	if !GoVersionRE.MatchString(version) {
+		return fmt.Errorf("invalid language version %q", version)
+	}
+	if f.Go == nil {
+		stmt := &Line{Token: []string{"go", version}}
+		f.Go = &Go{
+			Version: version,
+			Syntax:  stmt,
+		}
+		// Find the first non-comment-only block and add
+		// the go statement before it. That will keep file comments at the top.
+		i := 0
+		for i = 0; i < len(f.Syntax.Stmt); i++ {
+			if _, ok := f.Syntax.Stmt[i].(*CommentBlock); !ok {
+				break
+			}
+		}
+		f.Syntax.Stmt = append(append(f.Syntax.Stmt[:i:i], stmt), f.Syntax.Stmt[i:]...)
+	} else {
+		f.Go.Version = version
+		f.Syntax.updateLine(f.Go.Syntax, "go", version)
+	}
+	return nil
+}
+
+func (f *WorkFile) AddToolchainStmt(name string) error {
+	if !ToolchainRE.MatchString(name) {
+		return fmt.Errorf("invalid toolchain name %q", name)
+	}
+	if f.Toolchain == nil {
+		stmt := &Line{Token: []string{"toolchain", name}}
+		f.Toolchain = &Toolchain{
+			Name:   name,
+			Syntax: stmt,
+		}
+		// Find the go line and add the toolchain line after it.
+		// Or else find the first non-comment-only block and add
+		// the toolchain line before it. That will keep file comments at the top.
+		i := 0
+		for i = 0; i < len(f.Syntax.Stmt); i++ {
+			if line, ok := f.Syntax.Stmt[i].(*Line); ok && len(line.Token) > 0 && line.Token[0] == "go" {
+				i++
+				goto Found
+			}
+		}
+		for i = 0; i < len(f.Syntax.Stmt); i++ {
+			if _, ok := f.Syntax.Stmt[i].(*CommentBlock); !ok {
+				break
+			}
+		}
+	Found:
+		f.Syntax.Stmt = append(append(f.Syntax.Stmt[:i:i], stmt), f.Syntax.Stmt[i:]...)
+	} else {
+		f.Toolchain.Name = name
+		f.Syntax.updateLine(f.Toolchain.Syntax, "toolchain", name)
+	}
+	return nil
+}
+
+// DropGoStmt deletes the go statement from the file.
+func (f *WorkFile) DropGoStmt() {
+	if f.Go != nil {
+		f.Go.Syntax.markRemoved()
+		f.Go = nil
+	}
+}
+
+// DropToolchainStmt deletes the toolchain statement from the file.
+func (f *WorkFile) DropToolchainStmt() {
+	if f.Toolchain != nil {
+		f.Toolchain.Syntax.markRemoved()
+		f.Toolchain = nil
+	}
+}
+
+// AddGodebug sets the first godebug line for key to value,
+// preserving any existing comments for that line and removing all
+// other godebug lines for key.
+//
+// If no line currently exists for key, AddGodebug adds a new line
+// at the end of the last godebug block.
+func (f *WorkFile) AddGodebug(key, value string) error {
+	need := true
+	for _, g := range f.Godebug {
+		if g.Key == key {
+			if need {
+				g.Value = value
+				f.Syntax.updateLine(g.Syntax, "godebug", key+"="+value)
+				need = false
+			} else {
+				g.Syntax.markRemoved()
+				*g = Godebug{}
+			}
+		}
+	}
+
+	if need {
+		f.addNewGodebug(key, value)
+	}
+	return nil
+}
+
+// addNewGodebug adds a new godebug key=value line at the end
+// of the last godebug block, regardless of any existing godebug lines for key.
+func (f *WorkFile) addNewGodebug(key, value string) {
+	line := f.Syntax.addLine(nil, "godebug", key+"="+value)
+	g := &Godebug{
+		Key:    key,
+		Value:  value,
+		Syntax: line,
+	}
+	f.Godebug = append(f.Godebug, g)
+}
+
+func (f *WorkFile) DropGodebug(key string) error {
+	for _, g := range f.Godebug {
+		if g.Key == key {
+			g.Syntax.markRemoved()
+			*g = Godebug{}
+		}
+	}
+	return nil
+}
+
+func (f *WorkFile) AddUse(diskPath, modulePath string) error {
+	need := true
+	for _, d := range f.Use {
+		if d.Path == diskPath {
+			if need {
+				d.ModulePath = modulePath
+				f.Syntax.updateLine(d.Syntax, "use", AutoQuote(diskPath))
+				need = false
+			} else {
+				d.Syntax.markRemoved()
+				*d = Use{}
+			}
+		}
+	}
+
+	if need {
+		f.AddNewUse(diskPath, modulePath)
+	}
+	return nil
+}
+
+func (f *WorkFile) AddNewUse(diskPath, modulePath string) {
+	line := f.Syntax.addLine(nil, "use", AutoQuote(diskPath))
+	f.Use = append(f.Use, &Use{Path: diskPath, ModulePath: modulePath, Syntax: line})
+}
+
+func (f *WorkFile) SetUse(dirs []*Use) {
+	need := make(map[string]string)
+	for _, d := range dirs {
+		need[d.Path] = d.ModulePath
+	}
+
+	for _, d := range f.Use {
+		if modulePath, ok := need[d.Path]; ok {
+			d.ModulePath = modulePath
+		} else {
+			d.Syntax.markRemoved()
+			*d = Use{}
+		}
+	}
+
+	// TODO(#45713): Add module path to comment.
+
+	for diskPath, modulePath := range need {
+		f.AddNewUse(diskPath, modulePath)
+	}
+	f.SortBlocks()
+}
+
+func (f *WorkFile) DropUse(path string) error {
+	for _, d := range f.Use {
+		if d.Path == path {
+			d.Syntax.markRemoved()
+			*d = Use{}
+		}
+	}
+	return nil
+}
+
+func (f *WorkFile) AddReplace(oldPath, oldVers, newPath, newVers string) error {
+	return addReplace(f.Syntax, &f.Replace, oldPath, oldVers, newPath, newVers)
+}
+
+func (f *WorkFile) DropReplace(oldPath, oldVers string) error {
+	for _, r := range f.Replace {
+		if r.Old.Path == oldPath && r.Old.Version == oldVers {
+			r.Syntax.markRemoved()
+			*r = Replace{}
+		}
+	}
+	return nil
+}
+
+func (f *WorkFile) SortBlocks() {
+	f.removeDups() // otherwise sorting is unsafe
+
+	for _, stmt := range f.Syntax.Stmt {
+		block, ok := stmt.(*LineBlock)
+		if !ok {
+			continue
+		}
+		slices.SortStableFunc(block.Line, compareLine)
+	}
+}
+
+// removeDups removes duplicate replace directives.
+//
+// Later replace directives take priority.
+//
+// require directives are not de-duplicated. That's left up to higher-level
+// logic (MVS).
+//
+// retract directives are not de-duplicated since comments are
+// meaningful, and versions may be retracted multiple times.
+func (f *WorkFile) removeDups() {
+	removeDups(f.Syntax, nil, &f.Replace, nil, nil)
+}
diff --git a/vendor/golang.org/x/mod/module/module.go b/vendor/golang.org/x/mod/module/module.go
new file mode 100644
index 000000000..739c13f48
--- /dev/null
+++ b/vendor/golang.org/x/mod/module/module.go
@@ -0,0 +1,840 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package module defines the module.Version type along with support code.
+//
+// The [module.Version] type is a simple Path, Version pair:
+//
+//	type Version struct {
+//		Path string
+//		Version string
+//	}
+//
+// There are no restrictions imposed directly by use of this structure,
+// but additional checking functions, most notably [Check], verify that
+// a particular path, version pair is valid.
+//
+// # Escaped Paths
+//
+// Module paths appear as substrings of file system paths
+// (in the download cache) and of web server URLs in the proxy protocol.
+// In general we cannot rely on file systems to be case-sensitive,
+// nor can we rely on web servers, since they read from file systems.
+// That is, we cannot rely on the file system to keep rsc.io/QUOTE
+// and rsc.io/quote separate. Windows and macOS don't.
+// Instead, we must never require two different casings of a file path.
+// Because we want the download cache to match the proxy protocol,
+// and because we want the proxy protocol to be possible to serve
+// from a tree of static files (which might be stored on a case-insensitive
+// file system), the proxy protocol must never require two different casings
+// of a URL path either.
+//
+// One possibility would be to make the escaped form be the lowercase
+// hexadecimal encoding of the actual path bytes. This would avoid ever
+// needing different casings of a file path, but it would be fairly illegible
+// to most programmers when those paths appeared in the file system
+// (including in file paths in compiler errors and stack traces)
+// in web server logs, and so on. Instead, we want a safe escaped form that
+// leaves most paths unaltered.
+//
+// The safe escaped form is to replace every uppercase letter
+// with an exclamation mark followed by the letter's lowercase equivalent.
+//
+// For example,
+//
+//	github.com/Azure/azure-sdk-for-go ->  github.com/!azure/azure-sdk-for-go.
+//	github.com/GoogleCloudPlatform/cloudsql-proxy -> github.com/!google!cloud!platform/cloudsql-proxy
+//	github.com/Sirupsen/logrus -> github.com/!sirupsen/logrus.
+//
+// Import paths that avoid upper-case letters are left unchanged.
+// Note that because import paths are ASCII-only and avoid various
+// problematic punctuation (like : < and >), the escaped form is also ASCII-only
+// and avoids the same problematic punctuation.
+//
+// Import paths have never allowed exclamation marks, so there is no
+// need to define how to escape a literal !.
+//
+// # Unicode Restrictions
+//
+// Today, paths are disallowed from using Unicode.
+//
+// Although paths are currently disallowed from using Unicode,
+// we would like at some point to allow Unicode letters as well, to assume that
+// file systems and URLs are Unicode-safe (storing UTF-8), and apply
+// the !-for-uppercase convention for escaping them in the file system.
+// But there are at least two subtle considerations.
+//
+// First, note that not all case-fold equivalent distinct runes
+// form an upper/lower pair.
+// For example, U+004B ('K'), U+006B ('k'), and U+212A ('K' for Kelvin)
+// are three distinct runes that case-fold to each other.
+// When we do add Unicode letters, we must not assume that upper/lower
+// are the only case-equivalent pairs.
+// Perhaps the Kelvin symbol would be disallowed entirely, for example.
+// Or perhaps it would escape as "!!k", or perhaps as "(212A)".
+//
+// Second, it would be nice to allow Unicode marks as well as letters,
+// but marks include combining marks, and then we must deal not
+// only with case folding but also normalization: both U+00E9 ('é')
+// and U+0065 U+0301 ('e' followed by combining acute accent)
+// look the same on the page and are treated by some file systems
+// as the same path. If we do allow Unicode marks in paths, there
+// must be some kind of normalization to allow only one canonical
+// encoding of any character used in an import path.
+package module
+
+// IMPORTANT NOTE
+//
+// This file essentially defines the set of valid import paths for the go command.
+// There are many subtle considerations, including Unicode ambiguity,
+// security, network, and file system representations.
+//
+// This file also defines the set of valid module path and version combinations,
+// another topic with many subtle considerations.
+//
+// Changes to the semantics in this file require approval from rsc.
+
+import (
+	"cmp"
+	"errors"
+	"fmt"
+	"path"
+	"slices"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"golang.org/x/mod/semver"
+)
+
+// A Version (for clients, a module.Version) is defined by a module path and version pair.
+// These are stored in their plain (unescaped) form.
+type Version struct {
+	// Path is a module path, like "golang.org/x/text" or "rsc.io/quote/v2".
+	Path string
+
+	// Version is usually a semantic version in canonical form.
+	// There are three exceptions to this general rule.
+	// First, the top-level target of a build has no specific version
+	// and uses Version = "".
+	// Second, during MVS calculations the version "none" is used
+	// to represent the decision to take no version of a given module.
+	// Third, filesystem paths found in "replace" directives are
+	// represented by a path with an empty version.
+	Version string `json:",omitempty"`
+}
+
+// String returns a representation of the Version suitable for logging
+// (Path@Version, or just Path if Version is empty).
+func (m Version) String() string {
+	if m.Version == "" {
+		return m.Path
+	}
+	return m.Path + "@" + m.Version
+}
+
+// A ModuleError indicates an error specific to a module.
+type ModuleError struct {
+	Path    string
+	Version string
+	Err     error
+}
+
+// VersionError returns a [ModuleError] derived from a [Version] and error,
+// or err itself if it is already such an error.
+func VersionError(v Version, err error) error {
+	var mErr *ModuleError
+	if errors.As(err, &mErr) && mErr.Path == v.Path && mErr.Version == v.Version {
+		return err
+	}
+	return &ModuleError{
+		Path:    v.Path,
+		Version: v.Version,
+		Err:     err,
+	}
+}
+
+func (e *ModuleError) Error() string {
+	if v, ok := e.Err.(*InvalidVersionError); ok {
+		return fmt.Sprintf("%s@%s: invalid %s: %v", e.Path, v.Version, v.noun(), v.Err)
+	}
+	if e.Version != "" {
+		return fmt.Sprintf("%s@%s: %v", e.Path, e.Version, e.Err)
+	}
+	return fmt.Sprintf("module %s: %v", e.Path, e.Err)
+}
+
+func (e *ModuleError) Unwrap() error { return e.Err }
+
+// An InvalidVersionError indicates an error specific to a version, with the
+// module path unknown or specified externally.
+//
+// A [ModuleError] may wrap an InvalidVersionError, but an InvalidVersionError
+// must not wrap a ModuleError.
+type InvalidVersionError struct {
+	Version string
+	Pseudo  bool
+	Err     error
+}
+
+// noun returns either "version" or "pseudo-version", depending on whether
+// e.Version is a pseudo-version.
+func (e *InvalidVersionError) noun() string {
+	if e.Pseudo {
+		return "pseudo-version"
+	}
+	return "version"
+}
+
+func (e *InvalidVersionError) Error() string {
+	return fmt.Sprintf("%s %q invalid: %s", e.noun(), e.Version, e.Err)
+}
+
+func (e *InvalidVersionError) Unwrap() error { return e.Err }
+
+// An InvalidPathError indicates a module, import, or file path doesn't
+// satisfy all naming constraints. See [CheckPath], [CheckImportPath],
+// and [CheckFilePath] for specific restrictions.
+type InvalidPathError struct {
+	Kind string // "module", "import", or "file"
+	Path string
+	Err  error
+}
+
+func (e *InvalidPathError) Error() string {
+	return fmt.Sprintf("malformed %s path %q: %v", e.Kind, e.Path, e.Err)
+}
+
+func (e *InvalidPathError) Unwrap() error { return e.Err }
+
+// Check checks that a given module path, version pair is valid.
+// In addition to the path being a valid module path
+// and the version being a valid semantic version,
+// the two must correspond.
+// For example, the path "yaml/v2" only corresponds to
+// semantic versions beginning with "v2.".
+func Check(path, version string) error {
+	if err := CheckPath(path); err != nil {
+		return err
+	}
+	if !semver.IsValid(version) {
+		return &ModuleError{
+			Path: path,
+			Err:  &InvalidVersionError{Version: version, Err: errors.New("not a semantic version")},
+		}
+	}
+	_, pathMajor, _ := SplitPathVersion(path)
+	if err := CheckPathMajor(version, pathMajor); err != nil {
+		return &ModuleError{Path: path, Err: err}
+	}
+	return nil
+}
+
+// firstPathOK reports whether r can appear in the first element of a module path.
+// The first element of the path must be an LDH domain name, at least for now.
+// To avoid case ambiguity, the domain name must be entirely lower case.
+func firstPathOK(r rune) bool {
+	return r == '-' || r == '.' ||
+		'0' <= r && r <= '9' ||
+		'a' <= r && r <= 'z'
+}
+
+// modPathOK reports whether r can appear in a module path element.
+// Paths can be ASCII letters, ASCII digits, and limited ASCII punctuation: - . _ and ~.
+//
+// This matches what "go get" has historically recognized in import paths,
+// and avoids confusing sequences like '%20' or '+' that would change meaning
+// if used in a URL.
+//
+// TODO(rsc): We would like to allow Unicode letters, but that requires additional
+// care in the safe encoding (see "escaped paths" above).
+func modPathOK(r rune) bool {
+	if r < utf8.RuneSelf {
+		return r == '-' || r == '.' || r == '_' || r == '~' ||
+			'0' <= r && r <= '9' ||
+			'A' <= r && r <= 'Z' ||
+			'a' <= r && r <= 'z'
+	}
+	return false
+}
+
+// importPathOK reports whether r can appear in a package import path element.
+//
+// Import paths are intermediate between module paths and file paths: we
+// disallow characters that would be confusing or ambiguous as arguments to
+// 'go get' (such as '@' and ' ' ), but allow certain characters that are
+// otherwise-unambiguous on the command line and historically used for some
+// binary names (such as '++' as a suffix for compiler binaries and wrappers).
+func importPathOK(r rune) bool {
+	return modPathOK(r) || r == '+'
+}
+
+// fileNameOK reports whether r can appear in a file name.
+// For now we allow all Unicode letters but otherwise limit to pathOK plus a few more punctuation characters.
+// If we expand the set of allowed characters here, we have to
+// work harder at detecting potential case-folding and normalization collisions.
+// See note about "escaped paths" above.
+func fileNameOK(r rune) bool {
+	if r < utf8.RuneSelf {
+		// Entire set of ASCII punctuation, from which we remove characters:
+		//     ! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
+		// We disallow some shell special characters: " ' * < > ? ` |
+		// (Note that some of those are disallowed by the Windows file system as well.)
+		// We also disallow path separators / : and \ (fileNameOK is only called on path element characters).
+		// We allow spaces (U+0020) in file names.
+		const allowed = "!#$%&()+,-.=@[]^_{}~ "
+		if '0' <= r && r <= '9' || 'A' <= r && r <= 'Z' || 'a' <= r && r <= 'z' {
+			return true
+		}
+		return strings.ContainsRune(allowed, r)
+	}
+	// It may be OK to add more ASCII punctuation here, but only carefully.
+	// For example Windows disallows < > \, and macOS disallows :, so we must not allow those.
+	return unicode.IsLetter(r)
+}
+
+// CheckPath checks that a module path is valid.
+// A valid module path is a valid import path, as checked by [CheckImportPath],
+// with three additional constraints.
+// First, the leading path element (up to the first slash, if any),
+// by convention a domain name, must contain only lower-case ASCII letters,
+// ASCII digits, dots (U+002E), and dashes (U+002D);
+// it must contain at least one dot and cannot start with a dash.
+// Second, for a final path element of the form /vN, where N looks numeric
+// (ASCII digits and dots) must not begin with a leading zero, must not be /v1,
+// and must not contain any dots. For paths beginning with "gopkg.in/",
+// this second requirement is replaced by a requirement that the path
+// follow the gopkg.in server's conventions.
+// Third, no path element may begin with a dot.
+func CheckPath(path string) (err error) {
+	defer func() {
+		if err != nil {
+			err = &InvalidPathError{Kind: "module", Path: path, Err: err}
+		}
+	}()
+
+	if err := checkPath(path, modulePath); err != nil {
+		return err
+	}
+	i := strings.Index(path, "/")
+	if i < 0 {
+		i = len(path)
+	}
+	if i == 0 {
+		return fmt.Errorf("leading slash")
+	}
+	if !strings.Contains(path[:i], ".") {
+		return fmt.Errorf("missing dot in first path element")
+	}
+	if path[0] == '-' {
+		return fmt.Errorf("leading dash in first path element")
+	}
+	for _, r := range path[:i] {
+		if !firstPathOK(r) {
+			return fmt.Errorf("invalid char %q in first path element", r)
+		}
+	}
+	if _, _, ok := SplitPathVersion(path); !ok {
+		return fmt.Errorf("invalid version")
+	}
+	return nil
+}
+
+// CheckImportPath checks that an import path is valid.
+//
+// A valid import path consists of one or more valid path elements
+// separated by slashes (U+002F). (It must not begin with nor end in a slash.)
+//
+// A valid path element is a non-empty string made up of
+// ASCII letters, ASCII digits, and limited ASCII punctuation: - . _ and ~.
+// It must not end with a dot (U+002E), nor contain two dots in a row.
+//
+// The element prefix up to the first dot must not be a reserved file name
+// on Windows, regardless of case (CON, com1, NuL, and so on). The element
+// must not have a suffix of a tilde followed by one or more ASCII digits
+// (to exclude paths elements that look like Windows short-names).
+//
+// CheckImportPath may be less restrictive in the future, but see the
+// top-level package documentation for additional information about
+// subtleties of Unicode.
+func CheckImportPath(path string) error {
+	if err := checkPath(path, importPath); err != nil {
+		return &InvalidPathError{Kind: "import", Path: path, Err: err}
+	}
+	return nil
+}
+
+// pathKind indicates what kind of path we're checking. Module paths,
+// import paths, and file paths have different restrictions.
+type pathKind int
+
+const (
+	modulePath pathKind = iota
+	importPath
+	filePath
+)
+
+// checkPath checks that a general path is valid. kind indicates what
+// specific constraints should be applied.
+//
+// checkPath returns an error describing why the path is not valid.
+// Because these checks apply to module, import, and file paths,
+// and because other checks may be applied, the caller is expected to wrap
+// this error with [InvalidPathError].
+func checkPath(path string, kind pathKind) error {
+	if !utf8.ValidString(path) {
+		return fmt.Errorf("invalid UTF-8")
+	}
+	if path == "" {
+		return fmt.Errorf("empty string")
+	}
+	if path[0] == '-' && kind != filePath {
+		return fmt.Errorf("leading dash")
+	}
+	if strings.Contains(path, "//") {
+		return fmt.Errorf("double slash")
+	}
+	if path[len(path)-1] == '/' {
+		return fmt.Errorf("trailing slash")
+	}
+	elemStart := 0
+	for i, r := range path {
+		if r == '/' {
+			if err := checkElem(path[elemStart:i], kind); err != nil {
+				return err
+			}
+			elemStart = i + 1
+		}
+	}
+	if err := checkElem(path[elemStart:], kind); err != nil {
+		return err
+	}
+	return nil
+}
+
+// checkElem checks whether an individual path element is valid.
+func checkElem(elem string, kind pathKind) error {
+	if elem == "" {
+		return fmt.Errorf("empty path element")
+	}
+	if strings.Count(elem, ".") == len(elem) {
+		return fmt.Errorf("invalid path element %q", elem)
+	}
+	if elem[0] == '.' && kind == modulePath {
+		return fmt.Errorf("leading dot in path element")
+	}
+	if elem[len(elem)-1] == '.' {
+		return fmt.Errorf("trailing dot in path element")
+	}
+	for _, r := range elem {
+		ok := false
+		switch kind {
+		case modulePath:
+			ok = modPathOK(r)
+		case importPath:
+			ok = importPathOK(r)
+		case filePath:
+			ok = fileNameOK(r)
+		default:
+			panic(fmt.Sprintf("internal error: invalid kind %v", kind))
+		}
+		if !ok {
+			return fmt.Errorf("invalid char %q", r)
+		}
+	}
+
+	// Windows disallows a bunch of path elements, sadly.
+	// See https://docs.microsoft.com/en-us/windows/desktop/fileio/naming-a-file
+	short := elem
+	if i := strings.Index(short, "."); i >= 0 {
+		short = short[:i]
+	}
+	for _, bad := range badWindowsNames {
+		if strings.EqualFold(bad, short) {
+			return fmt.Errorf("%q disallowed as path element component on Windows", short)
+		}
+	}
+
+	if kind == filePath {
+		// don't check for Windows short-names in file names. They're
+		// only an issue for import paths.
+		return nil
+	}
+
+	// Reject path components that look like Windows short-names.
+	// Those usually end in a tilde followed by one or more ASCII digits.
+	if tilde := strings.LastIndexByte(short, '~'); tilde >= 0 && tilde < len(short)-1 {
+		suffix := short[tilde+1:]
+		suffixIsDigits := true
+		for _, r := range suffix {
+			if r < '0' || r > '9' {
+				suffixIsDigits = false
+				break
+			}
+		}
+		if suffixIsDigits {
+			return fmt.Errorf("trailing tilde and digits in path element")
+		}
+	}
+
+	return nil
+}
+
+// CheckFilePath checks that a slash-separated file path is valid.
+// The definition of a valid file path is the same as the definition
+// of a valid import path except that the set of allowed characters is larger:
+// all Unicode letters, ASCII digits, the ASCII space character (U+0020),
+// and the ASCII punctuation characters
+// “!#$%&()+,-.=@[]^_{}~”.
+// (The excluded punctuation characters, " * < > ? ` ' | / \ and :,
+// have special meanings in certain shells or operating systems.)
+//
+// CheckFilePath may be less restrictive in the future, but see the
+// top-level package documentation for additional information about
+// subtleties of Unicode.
+func CheckFilePath(path string) error {
+	if err := checkPath(path, filePath); err != nil {
+		return &InvalidPathError{Kind: "file", Path: path, Err: err}
+	}
+	return nil
+}
+
+// badWindowsNames are the reserved file path elements on Windows.
+// See https://docs.microsoft.com/en-us/windows/desktop/fileio/naming-a-file
+var badWindowsNames = []string{
+	"CON",
+	"PRN",
+	"AUX",
+	"NUL",
+	"COM1",
+	"COM2",
+	"COM3",
+	"COM4",
+	"COM5",
+	"COM6",
+	"COM7",
+	"COM8",
+	"COM9",
+	"LPT1",
+	"LPT2",
+	"LPT3",
+	"LPT4",
+	"LPT5",
+	"LPT6",
+	"LPT7",
+	"LPT8",
+	"LPT9",
+}
+
+// SplitPathVersion returns prefix and major version such that prefix+pathMajor == path
+// and version is either empty or "/vN" for N >= 2.
+// As a special case, gopkg.in paths are recognized directly;
+// they require ".vN" instead of "/vN", and for all N, not just N >= 2.
+// SplitPathVersion returns with ok = false when presented with
+// a path whose last path element does not satisfy the constraints
+// applied by [CheckPath], such as "example.com/pkg/v1" or "example.com/pkg/v1.2".
+func SplitPathVersion(path string) (prefix, pathMajor string, ok bool) {
+	if strings.HasPrefix(path, "gopkg.in/") {
+		return splitGopkgIn(path)
+	}
+
+	i := len(path)
+	dot := false
+	for i > 0 && ('0' <= path[i-1] && path[i-1] <= '9' || path[i-1] == '.') {
+		if path[i-1] == '.' {
+			dot = true
+		}
+		i--
+	}
+	if i <= 1 || i == len(path) || path[i-1] != 'v' || path[i-2] != '/' {
+		return path, "", true
+	}
+	prefix, pathMajor = path[:i-2], path[i-2:]
+	if dot || len(pathMajor) <= 2 || pathMajor[2] == '0' || pathMajor == "/v1" {
+		return path, "", false
+	}
+	return prefix, pathMajor, true
+}
+
+// splitGopkgIn is like SplitPathVersion but only for gopkg.in paths.
+func splitGopkgIn(path string) (prefix, pathMajor string, ok bool) {
+	if !strings.HasPrefix(path, "gopkg.in/") {
+		return path, "", false
+	}
+	i := len(path)
+	if strings.HasSuffix(path, "-unstable") {
+		i -= len("-unstable")
+	}
+	for i > 0 && ('0' <= path[i-1] && path[i-1] <= '9') {
+		i--
+	}
+	if i <= 1 || path[i-1] != 'v' || path[i-2] != '.' {
+		// All gopkg.in paths must end in vN for some N.
+		return path, "", false
+	}
+	prefix, pathMajor = path[:i-2], path[i-2:]
+	if len(pathMajor) <= 2 || pathMajor[2] == '0' && pathMajor != ".v0" {
+		return path, "", false
+	}
+	return prefix, pathMajor, true
+}
+
+// MatchPathMajor reports whether the semantic version v
+// matches the path major version pathMajor.
+//
+// MatchPathMajor returns true if and only if [CheckPathMajor] returns nil.
+func MatchPathMajor(v, pathMajor string) bool {
+	return CheckPathMajor(v, pathMajor) == nil
+}
+
+// CheckPathMajor returns a non-nil error if the semantic version v
+// does not match the path major version pathMajor.
+func CheckPathMajor(v, pathMajor string) error {
+	// TODO(jayconrod): return errors or panic for invalid inputs. This function
+	// (and others) was covered by integration tests for cmd/go, and surrounding
+	// code protected against invalid inputs like non-canonical versions.
+	if strings.HasPrefix(pathMajor, ".v") && strings.HasSuffix(pathMajor, "-unstable") {
+		pathMajor = strings.TrimSuffix(pathMajor, "-unstable")
+	}
+	if strings.HasPrefix(v, "v0.0.0-") && pathMajor == ".v1" {
+		// Allow old bug in pseudo-versions that generated v0.0.0- pseudoversion for gopkg .v1.
+		// For example, gopkg.in/yaml.v2@v2.2.1's go.mod requires gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405.
+		return nil
+	}
+	m := semver.Major(v)
+	if pathMajor == "" {
+		if m == "v0" || m == "v1" || semver.Build(v) == "+incompatible" {
+			return nil
+		}
+		pathMajor = "v0 or v1"
+	} else if pathMajor[0] == '/' || pathMajor[0] == '.' {
+		if m == pathMajor[1:] {
+			return nil
+		}
+		pathMajor = pathMajor[1:]
+	}
+	return &InvalidVersionError{
+		Version: v,
+		Err:     fmt.Errorf("should be %s, not %s", pathMajor, semver.Major(v)),
+	}
+}
+
+// PathMajorPrefix returns the major-version tag prefix implied by pathMajor.
+// An empty PathMajorPrefix allows either v0 or v1.
+//
+// Note that [MatchPathMajor] may accept some versions that do not actually begin
+// with this prefix: namely, it accepts a 'v0.0.0-' prefix for a '.v1'
+// pathMajor, even though that pathMajor implies 'v1' tagging.
+func PathMajorPrefix(pathMajor string) string {
+	if pathMajor == "" {
+		return ""
+	}
+	if pathMajor[0] != '/' && pathMajor[0] != '.' {
+		panic("pathMajor suffix " + pathMajor + " passed to PathMajorPrefix lacks separator")
+	}
+	if strings.HasPrefix(pathMajor, ".v") && strings.HasSuffix(pathMajor, "-unstable") {
+		pathMajor = strings.TrimSuffix(pathMajor, "-unstable")
+	}
+	m := pathMajor[1:]
+	if m != semver.Major(m) {
+		panic("pathMajor suffix " + pathMajor + "passed to PathMajorPrefix is not a valid major version")
+	}
+	return m
+}
+
+// CanonicalVersion returns the canonical form of the version string v.
+// It is the same as [semver.Canonical] except that it preserves the special build suffix "+incompatible".
+func CanonicalVersion(v string) string {
+	cv := semver.Canonical(v)
+	if semver.Build(v) == "+incompatible" {
+		cv += "+incompatible"
+	}
+	return cv
+}
+
+// Sort sorts the list by Path, breaking ties by comparing [Version] fields.
+// The Version fields are interpreted as semantic versions (using [semver.Compare])
+// optionally followed by a tie-breaking suffix introduced by a slash character,
+// like in "v0.0.1/go.mod".
+func Sort(list []Version) {
+	slices.SortFunc(list, func(i, j Version) int {
+		if i.Path != j.Path {
+			return strings.Compare(i.Path, j.Path)
+		}
+		// To help go.sum formatting, allow version/file.
+		// Compare semver prefix by semver rules,
+		// file by string order.
+		vi := i.Version
+		vj := j.Version
+		var fi, fj string
+		if k := strings.Index(vi, "/"); k >= 0 {
+			vi, fi = vi[:k], vi[k:]
+		}
+		if k := strings.Index(vj, "/"); k >= 0 {
+			vj, fj = vj[:k], vj[k:]
+		}
+		if vi != vj {
+			return semver.Compare(vi, vj)
+		}
+		return cmp.Compare(fi, fj)
+	})
+}
+
+// EscapePath returns the escaped form of the given module path.
+// It fails if the module path is invalid.
+func EscapePath(path string) (escaped string, err error) {
+	if err := CheckPath(path); err != nil {
+		return "", err
+	}
+
+	return escapeString(path)
+}
+
+// EscapeVersion returns the escaped form of the given module version.
+// Versions are allowed to be in non-semver form but must be valid file names
+// and not contain exclamation marks.
+func EscapeVersion(v string) (escaped string, err error) {
+	if err := checkElem(v, filePath); err != nil || strings.Contains(v, "!") {
+		return "", &InvalidVersionError{
+			Version: v,
+			Err:     fmt.Errorf("disallowed version string"),
+		}
+	}
+	return escapeString(v)
+}
+
+func escapeString(s string) (escaped string, err error) {
+	haveUpper := false
+	for _, r := range s {
+		if r == '!' || r >= utf8.RuneSelf {
+			// This should be disallowed by CheckPath, but diagnose anyway.
+			// The correctness of the escaping loop below depends on it.
+			return "", fmt.Errorf("internal error: inconsistency in EscapePath")
+		}
+		if 'A' <= r && r <= 'Z' {
+			haveUpper = true
+		}
+	}
+
+	if !haveUpper {
+		return s, nil
+	}
+
+	var buf []byte
+	for _, r := range s {
+		if 'A' <= r && r <= 'Z' {
+			buf = append(buf, '!', byte(r+'a'-'A'))
+		} else {
+			buf = append(buf, byte(r))
+		}
+	}
+	return string(buf), nil
+}
+
+// UnescapePath returns the module path for the given escaped path.
+// It fails if the escaped path is invalid or describes an invalid path.
+func UnescapePath(escaped string) (path string, err error) {
+	path, ok := unescapeString(escaped)
+	if !ok {
+		return "", fmt.Errorf("invalid escaped module path %q", escaped)
+	}
+	if err := CheckPath(path); err != nil {
+		return "", fmt.Errorf("invalid escaped module path %q: %v", escaped, err)
+	}
+	return path, nil
+}
+
+// UnescapeVersion returns the version string for the given escaped version.
+// It fails if the escaped form is invalid or describes an invalid version.
+// Versions are allowed to be in non-semver form but must be valid file names
+// and not contain exclamation marks.
+func UnescapeVersion(escaped string) (v string, err error) {
+	v, ok := unescapeString(escaped)
+	if !ok {
+		return "", fmt.Errorf("invalid escaped version %q", escaped)
+	}
+	if err := checkElem(v, filePath); err != nil {
+		return "", fmt.Errorf("invalid escaped version %q: %v", v, err)
+	}
+	return v, nil
+}
+
+func unescapeString(escaped string) (string, bool) {
+	var buf []byte
+
+	bang := false
+	for _, r := range escaped {
+		if r >= utf8.RuneSelf {
+			return "", false
+		}
+		if bang {
+			bang = false
+			if r < 'a' || 'z' < r {
+				return "", false
+			}
+			buf = append(buf, byte(r+'A'-'a'))
+			continue
+		}
+		if r == '!' {
+			bang = true
+			continue
+		}
+		if 'A' <= r && r <= 'Z' {
+			return "", false
+		}
+		buf = append(buf, byte(r))
+	}
+	if bang {
+		return "", false
+	}
+	return string(buf), true
+}
+
+// MatchPrefixPatterns reports whether any path prefix of target matches one of
+// the glob patterns (as defined by [path.Match]) in the comma-separated globs
+// list. This implements the algorithm used when matching a module path to the
+// GOPRIVATE environment variable, as described by 'go help module-private'.
+//
+// It ignores any empty or malformed patterns in the list.
+// Trailing slashes on patterns are ignored.
+func MatchPrefixPatterns(globs, target string) bool {
+	for globs != "" {
+		// Extract next non-empty glob in comma-separated list.
+		var glob string
+		if before, after, ok := strings.Cut(globs, ","); ok {
+			glob, globs = before, after
+		} else {
+			glob, globs = globs, ""
+		}
+		glob = strings.TrimSuffix(glob, "/")
+		if glob == "" {
+			continue
+		}
+
+		// A glob with N+1 path elements (N slashes) needs to be matched
+		// against the first N+1 path elements of target,
+		// which end just before the N+1'th slash.
+		n := strings.Count(glob, "/")
+		prefix := target
+		// Walk target, counting slashes, truncating at the N+1'th slash.
+		for i := 0; i < len(target); i++ {
+			if target[i] == '/' {
+				if n == 0 {
+					prefix = target[:i]
+					break
+				}
+				n--
+			}
+		}
+		if n > 0 {
+			// Not enough prefix elements.
+			continue
+		}
+		matched, _ := path.Match(glob, prefix)
+		if matched {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/golang.org/x/mod/module/pseudo.go b/vendor/golang.org/x/mod/module/pseudo.go
new file mode 100644
index 000000000..9cf19d325
--- /dev/null
+++ b/vendor/golang.org/x/mod/module/pseudo.go
@@ -0,0 +1,250 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Pseudo-versions
+//
+// Code authors are expected to tag the revisions they want users to use,
+// including prereleases. However, not all authors tag versions at all,
+// and not all commits a user might want to try will have tags.
+// A pseudo-version is a version with a special form that allows us to
+// address an untagged commit and order that version with respect to
+// other versions we might encounter.
+//
+// A pseudo-version takes one of the general forms:
+//
+//	(1) vX.0.0-yyyymmddhhmmss-abcdef123456
+//	(2) vX.Y.(Z+1)-0.yyyymmddhhmmss-abcdef123456
+//	(3) vX.Y.(Z+1)-0.yyyymmddhhmmss-abcdef123456+incompatible
+//	(4) vX.Y.Z-pre.0.yyyymmddhhmmss-abcdef123456
+//	(5) vX.Y.Z-pre.0.yyyymmddhhmmss-abcdef123456+incompatible
+//
+// If there is no recently tagged version with the right major version vX,
+// then form (1) is used, creating a space of pseudo-versions at the bottom
+// of the vX version range, less than any tagged version, including the unlikely v0.0.0.
+//
+// If the most recent tagged version before the target commit is vX.Y.Z or vX.Y.Z+incompatible,
+// then the pseudo-version uses form (2) or (3), making it a prerelease for the next
+// possible semantic version after vX.Y.Z. The leading 0 segment in the prerelease string
+// ensures that the pseudo-version compares less than possible future explicit prereleases
+// like vX.Y.(Z+1)-rc1 or vX.Y.(Z+1)-1.
+//
+// If the most recent tagged version before the target commit is vX.Y.Z-pre or vX.Y.Z-pre+incompatible,
+// then the pseudo-version uses form (4) or (5), making it a slightly later prerelease.
+
+package module
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"golang.org/x/mod/internal/lazyregexp"
+	"golang.org/x/mod/semver"
+)
+
+var pseudoVersionRE = lazyregexp.New(`^v[0-9]+\.(0\.0-|\d+\.\d+-([^+]*\.)?0\.)\d{14}-[A-Za-z0-9]+(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$`)
+
+const PseudoVersionTimestampFormat = "20060102150405"
+
+// PseudoVersion returns a pseudo-version for the given major version ("v1")
+// preexisting older tagged version ("" or "v1.2.3" or "v1.2.3-pre"), revision time,
+// and revision identifier (usually a 12-byte commit hash prefix).
+func PseudoVersion(major, older string, t time.Time, rev string) string {
+	if major == "" {
+		major = "v0"
+	}
+	segment := fmt.Sprintf("%s-%s", t.UTC().Format(PseudoVersionTimestampFormat), rev)
+	build := semver.Build(older)
+	older = semver.Canonical(older)
+	if older == "" {
+		return major + ".0.0-" + segment // form (1)
+	}
+	if semver.Prerelease(older) != "" {
+		return older + ".0." + segment + build // form (4), (5)
+	}
+
+	// Form (2), (3).
+	// Extract patch from vMAJOR.MINOR.PATCH
+	i := strings.LastIndex(older, ".") + 1
+	v, patch := older[:i], older[i:]
+
+	// Reassemble.
+	return v + incDecimal(patch) + "-0." + segment + build
+}
+
+// ZeroPseudoVersion returns a pseudo-version with a zero timestamp and
+// revision, which may be used as a placeholder.
+func ZeroPseudoVersion(major string) string {
+	return PseudoVersion(major, "", time.Time{}, "000000000000")
+}
+
+// incDecimal returns the decimal string incremented by 1.
+func incDecimal(decimal string) string {
+	// Scan right to left turning 9s to 0s until you find a digit to increment.
+	digits := []byte(decimal)
+	i := len(digits) - 1
+	for ; i >= 0 && digits[i] == '9'; i-- {
+		digits[i] = '0'
+	}
+	if i >= 0 {
+		digits[i]++
+	} else {
+		// digits is all zeros
+		digits[0] = '1'
+		digits = append(digits, '0')
+	}
+	return string(digits)
+}
+
+// decDecimal returns the decimal string decremented by 1, or the empty string
+// if the decimal is all zeroes.
+func decDecimal(decimal string) string {
+	// Scan right to left turning 0s to 9s until you find a digit to decrement.
+	digits := []byte(decimal)
+	i := len(digits) - 1
+	for ; i >= 0 && digits[i] == '0'; i-- {
+		digits[i] = '9'
+	}
+	if i < 0 {
+		// decimal is all zeros
+		return ""
+	}
+	if i == 0 && digits[i] == '1' && len(digits) > 1 {
+		digits = digits[1:]
+	} else {
+		digits[i]--
+	}
+	return string(digits)
+}
+
+// IsPseudoVersion reports whether v is a pseudo-version.
+func IsPseudoVersion(v string) bool {
+	return strings.Count(v, "-") >= 2 && semver.IsValid(v) && pseudoVersionRE.MatchString(v)
+}
+
+// IsZeroPseudoVersion returns whether v is a pseudo-version with a zero base,
+// timestamp, and revision, as returned by [ZeroPseudoVersion].
+func IsZeroPseudoVersion(v string) bool {
+	return v == ZeroPseudoVersion(semver.Major(v))
+}
+
+// PseudoVersionTime returns the time stamp of the pseudo-version v.
+// It returns an error if v is not a pseudo-version or if the time stamp
+// embedded in the pseudo-version is not a valid time.
+func PseudoVersionTime(v string) (time.Time, error) {
+	_, timestamp, _, _, err := parsePseudoVersion(v)
+	if err != nil {
+		return time.Time{}, err
+	}
+	t, err := time.Parse("20060102150405", timestamp)
+	if err != nil {
+		return time.Time{}, &InvalidVersionError{
+			Version: v,
+			Pseudo:  true,
+			Err:     fmt.Errorf("malformed time %q", timestamp),
+		}
+	}
+	return t, nil
+}
+
+// PseudoVersionRev returns the revision identifier of the pseudo-version v.
+// It returns an error if v is not a pseudo-version.
+func PseudoVersionRev(v string) (rev string, err error) {
+	_, _, rev, _, err = parsePseudoVersion(v)
+	return
+}
+
+// PseudoVersionBase returns the canonical parent version, if any, upon which
+// the pseudo-version v is based.
+//
+// If v has no parent version (that is, if it is "vX.0.0-[…]"),
+// PseudoVersionBase returns the empty string and a nil error.
+func PseudoVersionBase(v string) (string, error) {
+	base, _, _, build, err := parsePseudoVersion(v)
+	if err != nil {
+		return "", err
+	}
+
+	switch pre := semver.Prerelease(base); pre {
+	case "":
+		// vX.0.0-yyyymmddhhmmss-abcdef123456 → ""
+		if build != "" {
+			// Pseudo-versions of the form vX.0.0-yyyymmddhhmmss-abcdef123456+incompatible
+			// are nonsensical: the "vX.0.0-" prefix implies that there is no parent tag,
+			// but the "+incompatible" suffix implies that the major version of
+			// the parent tag is not compatible with the module's import path.
+			//
+			// There are a few such entries in the index generated by proxy.golang.org,
+			// but we believe those entries were generated by the proxy itself.
+			return "", &InvalidVersionError{
+				Version: v,
+				Pseudo:  true,
+				Err:     fmt.Errorf("lacks base version, but has build metadata %q", build),
+			}
+		}
+		return "", nil
+
+	case "-0":
+		// vX.Y.(Z+1)-0.yyyymmddhhmmss-abcdef123456 → vX.Y.Z
+		// vX.Y.(Z+1)-0.yyyymmddhhmmss-abcdef123456+incompatible → vX.Y.Z+incompatible
+		base = strings.TrimSuffix(base, pre)
+		i := strings.LastIndexByte(base, '.')
+		if i < 0 {
+			panic("base from parsePseudoVersion missing patch number: " + base)
+		}
+		patch := decDecimal(base[i+1:])
+		if patch == "" {
+			// vX.0.0-0 is invalid, but has been observed in the wild in the index
+			// generated by requests to proxy.golang.org.
+			//
+			// NOTE(bcmills): I cannot find a historical bug that accounts for
+			// pseudo-versions of this form, nor have I seen such versions in any
+			// actual go.mod files. If we find actual examples of this form and a
+			// reasonable theory of how they came into existence, it seems fine to
+			// treat them as equivalent to vX.0.0 (especially since the invalid
+			// pseudo-versions have lower precedence than the real ones). For now, we
+			// reject them.
+			return "", &InvalidVersionError{
+				Version: v,
+				Pseudo:  true,
+				Err:     fmt.Errorf("version before %s would have negative patch number", base),
+			}
+		}
+		return base[:i+1] + patch + build, nil
+
+	default:
+		// vX.Y.Z-pre.0.yyyymmddhhmmss-abcdef123456 → vX.Y.Z-pre
+		// vX.Y.Z-pre.0.yyyymmddhhmmss-abcdef123456+incompatible → vX.Y.Z-pre+incompatible
+		if !strings.HasSuffix(base, ".0") {
+			panic(`base from parsePseudoVersion missing ".0" before date: ` + base)
+		}
+		return strings.TrimSuffix(base, ".0") + build, nil
+	}
+}
+
+var errPseudoSyntax = errors.New("syntax error")
+
+func parsePseudoVersion(v string) (base, timestamp, rev, build string, err error) {
+	if !IsPseudoVersion(v) {
+		return "", "", "", "", &InvalidVersionError{
+			Version: v,
+			Pseudo:  true,
+			Err:     errPseudoSyntax,
+		}
+	}
+	build = semver.Build(v)
+	v = strings.TrimSuffix(v, build)
+	j := strings.LastIndex(v, "-")
+	v, rev = v[:j], v[j+1:]
+	i := strings.LastIndex(v, "-")
+	if j := strings.LastIndex(v, "."); j > i {
+		base = v[:j] // "vX.Y.Z-pre.0" or "vX.Y.(Z+1)-0"
+		timestamp = v[j+1:]
+	} else {
+		base = v[:i] // "vX.0.0"
+		timestamp = v[i+1:]
+	}
+	return base, timestamp, rev, build, nil
+}
diff --git a/vendor/golang.org/x/mod/semver/semver.go b/vendor/golang.org/x/mod/semver/semver.go
new file mode 100644
index 000000000..824b282c8
--- /dev/null
+++ b/vendor/golang.org/x/mod/semver/semver.go
@@ -0,0 +1,407 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package semver implements comparison of semantic version strings.
+// In this package, semantic version strings must begin with a leading "v",
+// as in "v1.0.0".
+//
+// The general form of a semantic version string accepted by this package is
+//
+//	vMAJOR[.MINOR[.PATCH[-PRERELEASE][+BUILD]]]
+//
+// where square brackets indicate optional parts of the syntax;
+// MAJOR, MINOR, and PATCH are decimal integers without extra leading zeros;
+// PRERELEASE and BUILD are each a series of non-empty dot-separated identifiers
+// using only alphanumeric characters and hyphens; and
+// all-numeric PRERELEASE identifiers must not have leading zeros.
+//
+// This package follows Semantic Versioning 2.0.0 (see semver.org)
+// with two exceptions. First, it requires the "v" prefix. Second, it recognizes
+// vMAJOR and vMAJOR.MINOR (with no prerelease or build suffixes)
+// as shorthands for vMAJOR.0.0 and vMAJOR.MINOR.0.
+package semver
+
+import (
+	"slices"
+	"strings"
+)
+
+// parsed returns the parsed form of a semantic version string.
+type parsed struct {
+	major      string
+	minor      string
+	patch      string
+	short      string
+	prerelease string
+	build      string
+}
+
+// IsValid reports whether v is a valid semantic version string.
+func IsValid(v string) bool {
+	_, ok := parse(v)
+	return ok
+}
+
+// Canonical returns the canonical formatting of the semantic version v.
+// It fills in any missing .MINOR or .PATCH and discards build metadata.
+// Two semantic versions compare equal only if their canonical formatting
+// is an identical string.
+// The canonical invalid semantic version is the empty string.
+func Canonical(v string) string {
+	p, ok := parse(v)
+	if !ok {
+		return ""
+	}
+	if p.build != "" {
+		return v[:len(v)-len(p.build)]
+	}
+	if p.short != "" {
+		return v + p.short
+	}
+	return v
+}
+
+// Major returns the major version prefix of the semantic version v.
+// For example, Major("v2.1.0") == "v2".
+// If v is an invalid semantic version string, Major returns the empty string.
+func Major(v string) string {
+	pv, ok := parse(v)
+	if !ok {
+		return ""
+	}
+	return v[:1+len(pv.major)]
+}
+
+// MajorMinor returns the major.minor version prefix of the semantic version v.
+// For example, MajorMinor("v2.1.0") == "v2.1".
+// If v is an invalid semantic version string, MajorMinor returns the empty string.
+func MajorMinor(v string) string {
+	pv, ok := parse(v)
+	if !ok {
+		return ""
+	}
+	i := 1 + len(pv.major)
+	if j := i + 1 + len(pv.minor); j <= len(v) && v[i] == '.' && v[i+1:j] == pv.minor {
+		return v[:j]
+	}
+	return v[:i] + "." + pv.minor
+}
+
+// Prerelease returns the prerelease suffix of the semantic version v.
+// For example, Prerelease("v2.1.0-pre+meta") == "-pre".
+// If v is an invalid semantic version string, Prerelease returns the empty string.
+func Prerelease(v string) string {
+	pv, ok := parse(v)
+	if !ok {
+		return ""
+	}
+	return pv.prerelease
+}
+
+// Build returns the build suffix of the semantic version v.
+// For example, Build("v2.1.0+meta") == "+meta".
+// If v is an invalid semantic version string, Build returns the empty string.
+func Build(v string) string {
+	pv, ok := parse(v)
+	if !ok {
+		return ""
+	}
+	return pv.build
+}
+
+// Compare returns an integer comparing two versions according to
+// semantic version precedence.
+// The result will be 0 if v == w, -1 if v < w, or +1 if v > w.
+//
+// An invalid semantic version string is considered less than a valid one.
+// All invalid semantic version strings compare equal to each other.
+func Compare(v, w string) int {
+	pv, ok1 := parse(v)
+	pw, ok2 := parse(w)
+	if !ok1 && !ok2 {
+		return 0
+	}
+	if !ok1 {
+		return -1
+	}
+	if !ok2 {
+		return +1
+	}
+	if c := compareInt(pv.major, pw.major); c != 0 {
+		return c
+	}
+	if c := compareInt(pv.minor, pw.minor); c != 0 {
+		return c
+	}
+	if c := compareInt(pv.patch, pw.patch); c != 0 {
+		return c
+	}
+	return comparePrerelease(pv.prerelease, pw.prerelease)
+}
+
+// Max canonicalizes its arguments and then returns the version string
+// that compares greater.
+//
+// Deprecated: use [Compare] instead. In most cases, returning a canonicalized
+// version is not expected or desired.
+func Max(v, w string) string {
+	v = Canonical(v)
+	w = Canonical(w)
+	if Compare(v, w) > 0 {
+		return v
+	}
+	return w
+}
+
+// ByVersion implements [sort.Interface] for sorting semantic version strings.
+type ByVersion []string
+
+func (vs ByVersion) Len() int           { return len(vs) }
+func (vs ByVersion) Swap(i, j int)      { vs[i], vs[j] = vs[j], vs[i] }
+func (vs ByVersion) Less(i, j int) bool { return compareVersion(vs[i], vs[j]) < 0 }
+
+// Sort sorts a list of semantic version strings using [Compare] and falls back
+// to use [strings.Compare] if both versions are considered equal.
+func Sort(list []string) {
+	slices.SortFunc(list, compareVersion)
+}
+
+func compareVersion(a, b string) int {
+	cmp := Compare(a, b)
+	if cmp != 0 {
+		return cmp
+	}
+	return strings.Compare(a, b)
+}
+
+func parse(v string) (p parsed, ok bool) {
+	if v == "" || v[0] != 'v' {
+		return
+	}
+	p.major, v, ok = parseInt(v[1:])
+	if !ok {
+		return
+	}
+	if v == "" {
+		p.minor = "0"
+		p.patch = "0"
+		p.short = ".0.0"
+		return
+	}
+	if v[0] != '.' {
+		ok = false
+		return
+	}
+	p.minor, v, ok = parseInt(v[1:])
+	if !ok {
+		return
+	}
+	if v == "" {
+		p.patch = "0"
+		p.short = ".0"
+		return
+	}
+	if v[0] != '.' {
+		ok = false
+		return
+	}
+	p.patch, v, ok = parseInt(v[1:])
+	if !ok {
+		return
+	}
+	if len(v) > 0 && v[0] == '-' {
+		p.prerelease, v, ok = parsePrerelease(v)
+		if !ok {
+			return
+		}
+	}
+	if len(v) > 0 && v[0] == '+' {
+		p.build, v, ok = parseBuild(v)
+		if !ok {
+			return
+		}
+	}
+	if v != "" {
+		ok = false
+		return
+	}
+	ok = true
+	return
+}
+
+func parseInt(v string) (t, rest string, ok bool) {
+	if v == "" {
+		return
+	}
+	if v[0] < '0' || '9' < v[0] {
+		return
+	}
+	i := 1
+	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
+		i++
+	}
+	if v[0] == '0' && i != 1 {
+		return
+	}
+	return v[:i], v[i:], true
+}
+
+func parsePrerelease(v string) (t, rest string, ok bool) {
+	// "A pre-release version MAY be denoted by appending a hyphen and
+	// a series of dot separated identifiers immediately following the patch version.
+	// Identifiers MUST comprise only ASCII alphanumerics and hyphen [0-9A-Za-z-].
+	// Identifiers MUST NOT be empty. Numeric identifiers MUST NOT include leading zeroes."
+	if v == "" || v[0] != '-' {
+		return
+	}
+	i := 1
+	start := 1
+	for i < len(v) && v[i] != '+' {
+		if !isIdentChar(v[i]) && v[i] != '.' {
+			return
+		}
+		if v[i] == '.' {
+			if start == i || isBadNum(v[start:i]) {
+				return
+			}
+			start = i + 1
+		}
+		i++
+	}
+	if start == i || isBadNum(v[start:i]) {
+		return
+	}
+	return v[:i], v[i:], true
+}
+
+func parseBuild(v string) (t, rest string, ok bool) {
+	if v == "" || v[0] != '+' {
+		return
+	}
+	i := 1
+	start := 1
+	for i < len(v) {
+		if !isIdentChar(v[i]) && v[i] != '.' {
+			return
+		}
+		if v[i] == '.' {
+			if start == i {
+				return
+			}
+			start = i + 1
+		}
+		i++
+	}
+	if start == i {
+		return
+	}
+	return v[:i], v[i:], true
+}
+
+func isIdentChar(c byte) bool {
+	return 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' || c == '-'
+}
+
+func isBadNum(v string) bool {
+	i := 0
+	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
+		i++
+	}
+	return i == len(v) && i > 1 && v[0] == '0'
+}
+
+func isNum(v string) bool {
+	i := 0
+	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
+		i++
+	}
+	return i == len(v)
+}
+
+func compareInt(x, y string) int {
+	if x == y {
+		return 0
+	}
+	if len(x) < len(y) {
+		return -1
+	}
+	if len(x) > len(y) {
+		return +1
+	}
+	if x < y {
+		return -1
+	} else {
+		return +1
+	}
+}
+
+func comparePrerelease(x, y string) int {
+	// "When major, minor, and patch are equal, a pre-release version has
+	// lower precedence than a normal version.
+	// Example: 1.0.0-alpha < 1.0.0.
+	// Precedence for two pre-release versions with the same major, minor,
+	// and patch version MUST be determined by comparing each dot separated
+	// identifier from left to right until a difference is found as follows:
+	// identifiers consisting of only digits are compared numerically and
+	// identifiers with letters or hyphens are compared lexically in ASCII
+	// sort order. Numeric identifiers always have lower precedence than
+	// non-numeric identifiers. A larger set of pre-release fields has a
+	// higher precedence than a smaller set, if all of the preceding
+	// identifiers are equal.
+	// Example: 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta <
+	// 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0."
+	if x == y {
+		return 0
+	}
+	if x == "" {
+		return +1
+	}
+	if y == "" {
+		return -1
+	}
+	for x != "" && y != "" {
+		x = x[1:] // skip - or .
+		y = y[1:] // skip - or .
+		var dx, dy string
+		dx, x = nextIdent(x)
+		dy, y = nextIdent(y)
+		if dx != dy {
+			ix := isNum(dx)
+			iy := isNum(dy)
+			if ix != iy {
+				if ix {
+					return -1
+				} else {
+					return +1
+				}
+			}
+			if ix {
+				if len(dx) < len(dy) {
+					return -1
+				}
+				if len(dx) > len(dy) {
+					return +1
+				}
+			}
+			if dx < dy {
+				return -1
+			} else {
+				return +1
+			}
+		}
+	}
+	if x == "" {
+		return -1
+	} else {
+		return +1
+	}
+}
+
+func nextIdent(x string) (dx, rest string) {
+	i := 0
+	for i < len(x) && x[i] != '.' {
+		i++
+	}
+	return x[:i], x[i:]
+}
diff --git a/vendor/golang.org/x/net/PATENTS b/vendor/golang.org/x/net/PATENTS
deleted file mode 100644
index 733099041..000000000
--- a/vendor/golang.org/x/net/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
deleted file mode 100644
index 24cea6882..000000000
--- a/vendor/golang.org/x/net/context/context.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package context has been superseded by the standard library [context] package.
-//
-// Deprecated: Use the standard library context package instead.
-package context
-
-import (
-	"context" // standard library's context, as of Go 1.7
-	"time"
-)
-
-// A Context carries a deadline, a cancellation signal, and other values across
-// API boundaries.
-//
-// Context's methods may be called by multiple goroutines simultaneously.
-//
-//go:fix inline
-type Context = context.Context
-
-// Canceled is the error returned by [Context.Err] when the context is canceled
-// for some reason other than its deadline passing.
-//
-//go:fix inline
-var Canceled = context.Canceled
-
-// DeadlineExceeded is the error returned by [Context.Err] when the context is canceled
-// due to its deadline passing.
-//
-//go:fix inline
-var DeadlineExceeded = context.DeadlineExceeded
-
-// Background returns a non-nil, empty Context. It is never canceled, has no
-// values, and has no deadline. It is typically used by the main function,
-// initialization, and tests, and as the top-level Context for incoming
-// requests.
-//
-//go:fix inline
-func Background() Context { return context.Background() }
-
-// TODO returns a non-nil, empty Context. Code should use context.TODO when
-// it's unclear which Context to use or it is not yet available (because the
-// surrounding function has not yet been extended to accept a Context
-// parameter).
-//
-//go:fix inline
-func TODO() Context { return context.TODO() }
-
-// A CancelFunc tells an operation to abandon its work.
-// A CancelFunc does not wait for the work to stop.
-// A CancelFunc may be called by multiple goroutines simultaneously.
-// After the first call, subsequent calls to a CancelFunc do nothing.
-type CancelFunc = context.CancelFunc
-
-// WithCancel returns a derived context that points to the parent context
-// but has a new Done channel. The returned context's Done channel is closed
-// when the returned cancel function is called or when the parent context's
-// Done channel is closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this [Context] complete.
-//
-//go:fix inline
-func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
-	return context.WithCancel(parent)
-}
-
-// WithDeadline returns a derived context that points to the parent context
-// but has the deadline adjusted to be no later than d. If the parent's
-// deadline is already earlier than d, WithDeadline(parent, d) is semantically
-// equivalent to parent. The returned [Context.Done] channel is closed when
-// the deadline expires, when the returned cancel function is called,
-// or when the parent context's Done channel is closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this [Context] complete.
-//
-//go:fix inline
-func WithDeadline(parent Context, d time.Time) (Context, CancelFunc) {
-	return context.WithDeadline(parent, d)
-}
-
-// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this [Context] complete:
-//
-//	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
-//		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
-//		defer cancel()  // releases resources if slowOperation completes before timeout elapses
-//		return slowOperation(ctx)
-//	}
-//
-//go:fix inline
-func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
-	return context.WithTimeout(parent, timeout)
-}
-
-// WithValue returns a derived context that points to the parent Context.
-// In the derived context, the value associated with key is val.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-//
-// The provided key must be comparable and should not be of type
-// string or any other built-in type to avoid collisions between
-// packages using context. Users of WithValue should define their own
-// types for keys. To avoid allocating when assigning to an
-// interface{}, context keys often have concrete type
-// struct{}. Alternatively, exported context key variables' static
-// type should be a pointer or interface.
-//
-//go:fix inline
-func WithValue(parent Context, key, val interface{}) Context {
-	return context.WithValue(parent, key, val)
-}
diff --git a/vendor/golang.org/x/net/internal/socks/client.go b/vendor/golang.org/x/net/internal/socks/client.go
deleted file mode 100644
index 3d6f516a5..000000000
--- a/vendor/golang.org/x/net/internal/socks/client.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package socks
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net"
-	"strconv"
-	"time"
-)
-
-var (
-	noDeadline   = time.Time{}
-	aLongTimeAgo = time.Unix(1, 0)
-)
-
-func (d *Dialer) connect(ctx context.Context, c net.Conn, address string) (_ net.Addr, ctxErr error) {
-	host, port, err := splitHostPort(address)
-	if err != nil {
-		return nil, err
-	}
-	if deadline, ok := ctx.Deadline(); ok && !deadline.IsZero() {
-		c.SetDeadline(deadline)
-		defer c.SetDeadline(noDeadline)
-	}
-	if ctx != context.Background() {
-		errCh := make(chan error, 1)
-		done := make(chan struct{})
-		defer func() {
-			close(done)
-			if ctxErr == nil {
-				ctxErr = <-errCh
-			}
-		}()
-		go func() {
-			select {
-			case <-ctx.Done():
-				c.SetDeadline(aLongTimeAgo)
-				errCh <- ctx.Err()
-			case <-done:
-				errCh <- nil
-			}
-		}()
-	}
-
-	b := make([]byte, 0, 6+len(host)) // the size here is just an estimate
-	b = append(b, Version5)
-	if len(d.AuthMethods) == 0 || d.Authenticate == nil {
-		b = append(b, 1, byte(AuthMethodNotRequired))
-	} else {
-		ams := d.AuthMethods
-		if len(ams) > 255 {
-			return nil, errors.New("too many authentication methods")
-		}
-		b = append(b, byte(len(ams)))
-		for _, am := range ams {
-			b = append(b, byte(am))
-		}
-	}
-	if _, ctxErr = c.Write(b); ctxErr != nil {
-		return
-	}
-
-	if _, ctxErr = io.ReadFull(c, b[:2]); ctxErr != nil {
-		return
-	}
-	if b[0] != Version5 {
-		return nil, errors.New("unexpected protocol version " + strconv.Itoa(int(b[0])))
-	}
-	am := AuthMethod(b[1])
-	if am == AuthMethodNoAcceptableMethods {
-		return nil, errors.New("no acceptable authentication methods")
-	}
-	if d.Authenticate != nil {
-		if ctxErr = d.Authenticate(ctx, c, am); ctxErr != nil {
-			return
-		}
-	}
-
-	b = b[:0]
-	b = append(b, Version5, byte(d.cmd), 0)
-	if ip := net.ParseIP(host); ip != nil {
-		if ip4 := ip.To4(); ip4 != nil {
-			b = append(b, AddrTypeIPv4)
-			b = append(b, ip4...)
-		} else if ip6 := ip.To16(); ip6 != nil {
-			b = append(b, AddrTypeIPv6)
-			b = append(b, ip6...)
-		} else {
-			return nil, errors.New("unknown address type")
-		}
-	} else {
-		if len(host) > 255 {
-			return nil, errors.New("FQDN too long")
-		}
-		b = append(b, AddrTypeFQDN)
-		b = append(b, byte(len(host)))
-		b = append(b, host...)
-	}
-	b = append(b, byte(port>>8), byte(port))
-	if _, ctxErr = c.Write(b); ctxErr != nil {
-		return
-	}
-
-	if _, ctxErr = io.ReadFull(c, b[:4]); ctxErr != nil {
-		return
-	}
-	if b[0] != Version5 {
-		return nil, errors.New("unexpected protocol version " + strconv.Itoa(int(b[0])))
-	}
-	if cmdErr := Reply(b[1]); cmdErr != StatusSucceeded {
-		return nil, errors.New("unknown error " + cmdErr.String())
-	}
-	if b[2] != 0 {
-		return nil, errors.New("non-zero reserved field")
-	}
-	l := 2
-	var a Addr
-	switch b[3] {
-	case AddrTypeIPv4:
-		l += net.IPv4len
-		a.IP = make(net.IP, net.IPv4len)
-	case AddrTypeIPv6:
-		l += net.IPv6len
-		a.IP = make(net.IP, net.IPv6len)
-	case AddrTypeFQDN:
-		if _, err := io.ReadFull(c, b[:1]); err != nil {
-			return nil, err
-		}
-		l += int(b[0])
-	default:
-		return nil, errors.New("unknown address type " + strconv.Itoa(int(b[3])))
-	}
-	if cap(b) < l {
-		b = make([]byte, l)
-	} else {
-		b = b[:l]
-	}
-	if _, ctxErr = io.ReadFull(c, b); ctxErr != nil {
-		return
-	}
-	if a.IP != nil {
-		copy(a.IP, b)
-	} else {
-		a.Name = string(b[:len(b)-2])
-	}
-	a.Port = int(b[len(b)-2])<<8 | int(b[len(b)-1])
-	return &a, nil
-}
-
-func splitHostPort(address string) (string, int, error) {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return "", 0, err
-	}
-	portnum, err := strconv.Atoi(port)
-	if err != nil {
-		return "", 0, err
-	}
-	if 1 > portnum || portnum > 0xffff {
-		return "", 0, errors.New("port number out of range " + port)
-	}
-	return host, portnum, nil
-}
diff --git a/vendor/golang.org/x/net/internal/socks/socks.go b/vendor/golang.org/x/net/internal/socks/socks.go
deleted file mode 100644
index 8eedb84ce..000000000
--- a/vendor/golang.org/x/net/internal/socks/socks.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package socks provides a SOCKS version 5 client implementation.
-//
-// SOCKS protocol version 5 is defined in RFC 1928.
-// Username/Password authentication for SOCKS version 5 is defined in
-// RFC 1929.
-package socks
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net"
-	"strconv"
-)
-
-// A Command represents a SOCKS command.
-type Command int
-
-func (cmd Command) String() string {
-	switch cmd {
-	case CmdConnect:
-		return "socks connect"
-	case cmdBind:
-		return "socks bind"
-	default:
-		return "socks " + strconv.Itoa(int(cmd))
-	}
-}
-
-// An AuthMethod represents a SOCKS authentication method.
-type AuthMethod int
-
-// A Reply represents a SOCKS command reply code.
-type Reply int
-
-func (code Reply) String() string {
-	switch code {
-	case StatusSucceeded:
-		return "succeeded"
-	case 0x01:
-		return "general SOCKS server failure"
-	case 0x02:
-		return "connection not allowed by ruleset"
-	case 0x03:
-		return "network unreachable"
-	case 0x04:
-		return "host unreachable"
-	case 0x05:
-		return "connection refused"
-	case 0x06:
-		return "TTL expired"
-	case 0x07:
-		return "command not supported"
-	case 0x08:
-		return "address type not supported"
-	default:
-		return "unknown code: " + strconv.Itoa(int(code))
-	}
-}
-
-// Wire protocol constants.
-const (
-	Version5 = 0x05
-
-	AddrTypeIPv4 = 0x01
-	AddrTypeFQDN = 0x03
-	AddrTypeIPv6 = 0x04
-
-	CmdConnect Command = 0x01 // establishes an active-open forward proxy connection
-	cmdBind    Command = 0x02 // establishes a passive-open forward proxy connection
-
-	AuthMethodNotRequired         AuthMethod = 0x00 // no authentication required
-	AuthMethodUsernamePassword    AuthMethod = 0x02 // use username/password
-	AuthMethodNoAcceptableMethods AuthMethod = 0xff // no acceptable authentication methods
-
-	StatusSucceeded Reply = 0x00
-)
-
-// An Addr represents a SOCKS-specific address.
-// Either Name or IP is used exclusively.
-type Addr struct {
-	Name string // fully-qualified domain name
-	IP   net.IP
-	Port int
-}
-
-func (a *Addr) Network() string { return "socks" }
-
-func (a *Addr) String() string {
-	if a == nil {
-		return ""
-	}
-	port := strconv.Itoa(a.Port)
-	if a.IP == nil {
-		return net.JoinHostPort(a.Name, port)
-	}
-	return net.JoinHostPort(a.IP.String(), port)
-}
-
-// A Conn represents a forward proxy connection.
-type Conn struct {
-	net.Conn
-
-	boundAddr net.Addr
-}
-
-// BoundAddr returns the address assigned by the proxy server for
-// connecting to the command target address from the proxy server.
-func (c *Conn) BoundAddr() net.Addr {
-	if c == nil {
-		return nil
-	}
-	return c.boundAddr
-}
-
-// A Dialer holds SOCKS-specific options.
-type Dialer struct {
-	cmd          Command // either CmdConnect or cmdBind
-	proxyNetwork string  // network between a proxy server and a client
-	proxyAddress string  // proxy server address
-
-	// ProxyDial specifies the optional dial function for
-	// establishing the transport connection.
-	ProxyDial func(context.Context, string, string) (net.Conn, error)
-
-	// AuthMethods specifies the list of request authentication
-	// methods.
-	// If empty, SOCKS client requests only AuthMethodNotRequired.
-	AuthMethods []AuthMethod
-
-	// Authenticate specifies the optional authentication
-	// function. It must be non-nil when AuthMethods is not empty.
-	// It must return an error when the authentication is failed.
-	Authenticate func(context.Context, io.ReadWriter, AuthMethod) error
-}
-
-// DialContext connects to the provided address on the provided
-// network.
-//
-// The returned error value may be a net.OpError. When the Op field of
-// net.OpError contains "socks", the Source field contains a proxy
-// server address and the Addr field contains a command target
-// address.
-//
-// See func Dial of the net package of standard library for a
-// description of the network and address parameters.
-func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	if err := d.validateTarget(network, address); err != nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	if ctx == nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: errors.New("nil context")}
-	}
-	var err error
-	var c net.Conn
-	if d.ProxyDial != nil {
-		c, err = d.ProxyDial(ctx, d.proxyNetwork, d.proxyAddress)
-	} else {
-		var dd net.Dialer
-		c, err = dd.DialContext(ctx, d.proxyNetwork, d.proxyAddress)
-	}
-	if err != nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	a, err := d.connect(ctx, c, address)
-	if err != nil {
-		c.Close()
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	return &Conn{Conn: c, boundAddr: a}, nil
-}
-
-// DialWithConn initiates a connection from SOCKS server to the target
-// network and address using the connection c that is already
-// connected to the SOCKS server.
-//
-// It returns the connection's local address assigned by the SOCKS
-// server.
-func (d *Dialer) DialWithConn(ctx context.Context, c net.Conn, network, address string) (net.Addr, error) {
-	if err := d.validateTarget(network, address); err != nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	if ctx == nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: errors.New("nil context")}
-	}
-	a, err := d.connect(ctx, c, address)
-	if err != nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	return a, nil
-}
-
-// Dial connects to the provided address on the provided network.
-//
-// Unlike DialContext, it returns a raw transport connection instead
-// of a forward proxy connection.
-//
-// Deprecated: Use DialContext or DialWithConn instead.
-func (d *Dialer) Dial(network, address string) (net.Conn, error) {
-	if err := d.validateTarget(network, address); err != nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	var err error
-	var c net.Conn
-	if d.ProxyDial != nil {
-		c, err = d.ProxyDial(context.Background(), d.proxyNetwork, d.proxyAddress)
-	} else {
-		c, err = net.Dial(d.proxyNetwork, d.proxyAddress)
-	}
-	if err != nil {
-		proxy, dst, _ := d.pathAddrs(address)
-		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
-	}
-	if _, err := d.DialWithConn(context.Background(), c, network, address); err != nil {
-		c.Close()
-		return nil, err
-	}
-	return c, nil
-}
-
-func (d *Dialer) validateTarget(network, address string) error {
-	switch network {
-	case "tcp", "tcp6", "tcp4":
-	default:
-		return errors.New("network not implemented")
-	}
-	switch d.cmd {
-	case CmdConnect, cmdBind:
-	default:
-		return errors.New("command not implemented")
-	}
-	return nil
-}
-
-func (d *Dialer) pathAddrs(address string) (proxy, dst net.Addr, err error) {
-	for i, s := range []string{d.proxyAddress, address} {
-		host, port, err := splitHostPort(s)
-		if err != nil {
-			return nil, nil, err
-		}
-		a := &Addr{Port: port}
-		a.IP = net.ParseIP(host)
-		if a.IP == nil {
-			a.Name = host
-		}
-		if i == 0 {
-			proxy = a
-		} else {
-			dst = a
-		}
-	}
-	return
-}
-
-// NewDialer returns a new Dialer that dials through the provided
-// proxy server's network and address.
-func NewDialer(network, address string) *Dialer {
-	return &Dialer{proxyNetwork: network, proxyAddress: address, cmd: CmdConnect}
-}
-
-const (
-	authUsernamePasswordVersion = 0x01
-	authStatusSucceeded         = 0x00
-)
-
-// UsernamePassword are the credentials for the username/password
-// authentication method.
-type UsernamePassword struct {
-	Username string
-	Password string
-}
-
-// Authenticate authenticates a pair of username and password with the
-// proxy server.
-func (up *UsernamePassword) Authenticate(ctx context.Context, rw io.ReadWriter, auth AuthMethod) error {
-	switch auth {
-	case AuthMethodNotRequired:
-		return nil
-	case AuthMethodUsernamePassword:
-		if len(up.Username) == 0 || len(up.Username) > 255 || len(up.Password) > 255 {
-			return errors.New("invalid username/password")
-		}
-		b := []byte{authUsernamePasswordVersion}
-		b = append(b, byte(len(up.Username)))
-		b = append(b, up.Username...)
-		b = append(b, byte(len(up.Password)))
-		b = append(b, up.Password...)
-		// TODO(mikio): handle IO deadlines and cancellation if
-		// necessary
-		if _, err := rw.Write(b); err != nil {
-			return err
-		}
-		if _, err := io.ReadFull(rw, b[:2]); err != nil {
-			return err
-		}
-		if b[0] != authUsernamePasswordVersion {
-			return errors.New("invalid username/password version")
-		}
-		if b[1] != authStatusSucceeded {
-			return errors.New("username/password authentication failed")
-		}
-		return nil
-	}
-	return errors.New("unsupported authentication method " + strconv.Itoa(int(auth)))
-}
diff --git a/vendor/golang.org/x/net/proxy/dial.go b/vendor/golang.org/x/net/proxy/dial.go
deleted file mode 100644
index 811c2e4e9..000000000
--- a/vendor/golang.org/x/net/proxy/dial.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"context"
-	"net"
-)
-
-// A ContextDialer dials using a context.
-type ContextDialer interface {
-	DialContext(ctx context.Context, network, address string) (net.Conn, error)
-}
-
-// Dial works like DialContext on net.Dialer but using a dialer returned by FromEnvironment.
-//
-// The passed ctx is only used for returning the Conn, not the lifetime of the Conn.
-//
-// Custom dialers (registered via RegisterDialerType) that do not implement ContextDialer
-// can leak a goroutine for as long as it takes the underlying Dialer implementation to timeout.
-//
-// A Conn returned from a successful Dial after the context has been cancelled will be immediately closed.
-func Dial(ctx context.Context, network, address string) (net.Conn, error) {
-	d := FromEnvironment()
-	if xd, ok := d.(ContextDialer); ok {
-		return xd.DialContext(ctx, network, address)
-	}
-	return dialContext(ctx, d, network, address)
-}
-
-// WARNING: this can leak a goroutine for as long as the underlying Dialer implementation takes to timeout
-// A Conn returned from a successful Dial after the context has been cancelled will be immediately closed.
-func dialContext(ctx context.Context, d Dialer, network, address string) (net.Conn, error) {
-	var (
-		conn net.Conn
-		done = make(chan struct{}, 1)
-		err  error
-	)
-	go func() {
-		conn, err = d.Dial(network, address)
-		close(done)
-		if conn != nil && ctx.Err() != nil {
-			conn.Close()
-		}
-	}()
-	select {
-	case <-ctx.Done():
-		err = ctx.Err()
-	case <-done:
-	}
-	return conn, err
-}
diff --git a/vendor/golang.org/x/net/proxy/direct.go b/vendor/golang.org/x/net/proxy/direct.go
deleted file mode 100644
index 3d66bdef9..000000000
--- a/vendor/golang.org/x/net/proxy/direct.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"context"
-	"net"
-)
-
-type direct struct{}
-
-// Direct implements Dialer by making network connections directly using net.Dial or net.DialContext.
-var Direct = direct{}
-
-var (
-	_ Dialer        = Direct
-	_ ContextDialer = Direct
-)
-
-// Dial directly invokes net.Dial with the supplied parameters.
-func (direct) Dial(network, addr string) (net.Conn, error) {
-	return net.Dial(network, addr)
-}
-
-// DialContext instantiates a net.Dialer and invokes its DialContext receiver with the supplied parameters.
-func (direct) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
-	var d net.Dialer
-	return d.DialContext(ctx, network, addr)
-}
diff --git a/vendor/golang.org/x/net/proxy/per_host.go b/vendor/golang.org/x/net/proxy/per_host.go
deleted file mode 100644
index 32bdf435e..000000000
--- a/vendor/golang.org/x/net/proxy/per_host.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"context"
-	"net"
-	"net/netip"
-	"strings"
-)
-
-// A PerHost directs connections to a default Dialer unless the host name
-// requested matches one of a number of exceptions.
-type PerHost struct {
-	def, bypass Dialer
-
-	bypassNetworks []*net.IPNet
-	bypassIPs      []net.IP
-	bypassZones    []string
-	bypassHosts    []string
-}
-
-// NewPerHost returns a PerHost Dialer that directs connections to either
-// defaultDialer or bypass, depending on whether the connection matches one of
-// the configured rules.
-func NewPerHost(defaultDialer, bypass Dialer) *PerHost {
-	return &PerHost{
-		def:    defaultDialer,
-		bypass: bypass,
-	}
-}
-
-// Dial connects to the address addr on the given network through either
-// defaultDialer or bypass.
-func (p *PerHost) Dial(network, addr string) (c net.Conn, err error) {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-
-	return p.dialerForRequest(host).Dial(network, addr)
-}
-
-// DialContext connects to the address addr on the given network through either
-// defaultDialer or bypass.
-func (p *PerHost) DialContext(ctx context.Context, network, addr string) (c net.Conn, err error) {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-	d := p.dialerForRequest(host)
-	if x, ok := d.(ContextDialer); ok {
-		return x.DialContext(ctx, network, addr)
-	}
-	return dialContext(ctx, d, network, addr)
-}
-
-func (p *PerHost) dialerForRequest(host string) Dialer {
-	if nip, err := netip.ParseAddr(host); err == nil {
-		ip := net.IP(nip.AsSlice())
-		for _, net := range p.bypassNetworks {
-			if net.Contains(ip) {
-				return p.bypass
-			}
-		}
-		for _, bypassIP := range p.bypassIPs {
-			if bypassIP.Equal(ip) {
-				return p.bypass
-			}
-		}
-		return p.def
-	}
-
-	for _, zone := range p.bypassZones {
-		if strings.HasSuffix(host, zone) {
-			return p.bypass
-		}
-		if host == zone[1:] {
-			// For a zone ".example.com", we match "example.com"
-			// too.
-			return p.bypass
-		}
-	}
-	for _, bypassHost := range p.bypassHosts {
-		if bypassHost == host {
-			return p.bypass
-		}
-	}
-	return p.def
-}
-
-// AddFromString parses a string that contains comma-separated values
-// specifying hosts that should use the bypass proxy. Each value is either an
-// IP address, a CIDR range, a zone (*.example.com) or a host name
-// (localhost). A best effort is made to parse the string and errors are
-// ignored.
-func (p *PerHost) AddFromString(s string) {
-	hosts := strings.Split(s, ",")
-	for _, host := range hosts {
-		host = strings.TrimSpace(host)
-		if len(host) == 0 {
-			continue
-		}
-		if strings.Contains(host, "/") {
-			// We assume that it's a CIDR address like 127.0.0.0/8
-			if _, net, err := net.ParseCIDR(host); err == nil {
-				p.AddNetwork(net)
-			}
-			continue
-		}
-		if nip, err := netip.ParseAddr(host); err == nil {
-			p.AddIP(net.IP(nip.AsSlice()))
-			continue
-		}
-		if strings.HasPrefix(host, "*.") {
-			p.AddZone(host[1:])
-			continue
-		}
-		p.AddHost(host)
-	}
-}
-
-// AddIP specifies an IP address that will use the bypass proxy. Note that
-// this will only take effect if a literal IP address is dialed. A connection
-// to a named host will never match an IP.
-func (p *PerHost) AddIP(ip net.IP) {
-	p.bypassIPs = append(p.bypassIPs, ip)
-}
-
-// AddNetwork specifies an IP range that will use the bypass proxy. Note that
-// this will only take effect if a literal IP address is dialed. A connection
-// to a named host will never match.
-func (p *PerHost) AddNetwork(net *net.IPNet) {
-	p.bypassNetworks = append(p.bypassNetworks, net)
-}
-
-// AddZone specifies a DNS suffix that will use the bypass proxy. A zone of
-// "example.com" matches "example.com" and all of its subdomains.
-func (p *PerHost) AddZone(zone string) {
-	zone = strings.TrimSuffix(zone, ".")
-	if !strings.HasPrefix(zone, ".") {
-		zone = "." + zone
-	}
-	p.bypassZones = append(p.bypassZones, zone)
-}
-
-// AddHost specifies a host name that will use the bypass proxy.
-func (p *PerHost) AddHost(host string) {
-	host = strings.TrimSuffix(host, ".")
-	p.bypassHosts = append(p.bypassHosts, host)
-}
diff --git a/vendor/golang.org/x/net/proxy/proxy.go b/vendor/golang.org/x/net/proxy/proxy.go
deleted file mode 100644
index 9ff4b9a77..000000000
--- a/vendor/golang.org/x/net/proxy/proxy.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package proxy provides support for a variety of protocols to proxy network
-// data.
-package proxy // import "golang.org/x/net/proxy"
-
-import (
-	"errors"
-	"net"
-	"net/url"
-	"os"
-	"sync"
-)
-
-// A Dialer is a means to establish a connection.
-// Custom dialers should also implement ContextDialer.
-type Dialer interface {
-	// Dial connects to the given address via the proxy.
-	Dial(network, addr string) (c net.Conn, err error)
-}
-
-// Auth contains authentication parameters that specific Dialers may require.
-type Auth struct {
-	User, Password string
-}
-
-// FromEnvironment returns the dialer specified by the proxy-related
-// variables in the environment and makes underlying connections
-// directly.
-func FromEnvironment() Dialer {
-	return FromEnvironmentUsing(Direct)
-}
-
-// FromEnvironmentUsing returns the dialer specify by the proxy-related
-// variables in the environment and makes underlying connections
-// using the provided forwarding Dialer (for instance, a *net.Dialer
-// with desired configuration).
-func FromEnvironmentUsing(forward Dialer) Dialer {
-	allProxy := allProxyEnv.Get()
-	if len(allProxy) == 0 {
-		return forward
-	}
-
-	proxyURL, err := url.Parse(allProxy)
-	if err != nil {
-		return forward
-	}
-	proxy, err := FromURL(proxyURL, forward)
-	if err != nil {
-		return forward
-	}
-
-	noProxy := noProxyEnv.Get()
-	if len(noProxy) == 0 {
-		return proxy
-	}
-
-	perHost := NewPerHost(proxy, forward)
-	perHost.AddFromString(noProxy)
-	return perHost
-}
-
-// proxySchemes is a map from URL schemes to a function that creates a Dialer
-// from a URL with such a scheme.
-var proxySchemes map[string]func(*url.URL, Dialer) (Dialer, error)
-
-// RegisterDialerType takes a URL scheme and a function to generate Dialers from
-// a URL with that scheme and a forwarding Dialer. Registered schemes are used
-// by FromURL.
-func RegisterDialerType(scheme string, f func(*url.URL, Dialer) (Dialer, error)) {
-	if proxySchemes == nil {
-		proxySchemes = make(map[string]func(*url.URL, Dialer) (Dialer, error))
-	}
-	proxySchemes[scheme] = f
-}
-
-// FromURL returns a Dialer given a URL specification and an underlying
-// Dialer for it to make network requests.
-func FromURL(u *url.URL, forward Dialer) (Dialer, error) {
-	var auth *Auth
-	if u.User != nil {
-		auth = new(Auth)
-		auth.User = u.User.Username()
-		if p, ok := u.User.Password(); ok {
-			auth.Password = p
-		}
-	}
-
-	switch u.Scheme {
-	case "socks5", "socks5h":
-		addr := u.Hostname()
-		port := u.Port()
-		if port == "" {
-			port = "1080"
-		}
-		return SOCKS5("tcp", net.JoinHostPort(addr, port), auth, forward)
-	}
-
-	// If the scheme doesn't match any of the built-in schemes, see if it
-	// was registered by another package.
-	if proxySchemes != nil {
-		if f, ok := proxySchemes[u.Scheme]; ok {
-			return f(u, forward)
-		}
-	}
-
-	return nil, errors.New("proxy: unknown scheme: " + u.Scheme)
-}
-
-var (
-	allProxyEnv = &envOnce{
-		names: []string{"ALL_PROXY", "all_proxy"},
-	}
-	noProxyEnv = &envOnce{
-		names: []string{"NO_PROXY", "no_proxy"},
-	}
-)
-
-// envOnce looks up an environment variable (optionally by multiple
-// names) once. It mitigates expensive lookups on some platforms
-// (e.g. Windows).
-// (Borrowed from net/http/transport.go)
-type envOnce struct {
-	names []string
-	once  sync.Once
-	val   string
-}
-
-func (e *envOnce) Get() string {
-	e.once.Do(e.init)
-	return e.val
-}
-
-func (e *envOnce) init() {
-	for _, n := range e.names {
-		e.val = os.Getenv(n)
-		if e.val != "" {
-			return
-		}
-	}
-}
-
-// reset is used by tests
-func (e *envOnce) reset() {
-	e.once = sync.Once{}
-	e.val = ""
-}
diff --git a/vendor/golang.org/x/net/proxy/socks5.go b/vendor/golang.org/x/net/proxy/socks5.go
deleted file mode 100644
index c91651f96..000000000
--- a/vendor/golang.org/x/net/proxy/socks5.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"context"
-	"net"
-
-	"golang.org/x/net/internal/socks"
-)
-
-// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given
-// address with an optional username and password.
-// See RFC 1928 and RFC 1929.
-func SOCKS5(network, address string, auth *Auth, forward Dialer) (Dialer, error) {
-	d := socks.NewDialer(network, address)
-	if forward != nil {
-		if f, ok := forward.(ContextDialer); ok {
-			d.ProxyDial = func(ctx context.Context, network string, address string) (net.Conn, error) {
-				return f.DialContext(ctx, network, address)
-			}
-		} else {
-			d.ProxyDial = func(ctx context.Context, network string, address string) (net.Conn, error) {
-				return dialContext(ctx, forward, network, address)
-			}
-		}
-	}
-	if auth != nil {
-		up := socks.UsernamePassword{
-			Username: auth.User,
-			Password: auth.Password,
-		}
-		d.AuthMethods = []socks.AuthMethod{
-			socks.AuthMethodNotRequired,
-			socks.AuthMethodUsernamePassword,
-		}
-		d.Authenticate = up.Authenticate
-	}
-	return d, nil
-}
diff --git a/vendor/golang.org/x/sync/errgroup/errgroup.go b/vendor/golang.org/x/sync/errgroup/errgroup.go
index f69fd7546..c261a8ebb 100644
--- a/vendor/golang.org/x/sync/errgroup/errgroup.go
+++ b/vendor/golang.org/x/sync/errgroup/errgroup.go
@@ -109,7 +109,7 @@ func (g *Group) TryGo(f func() error) bool {
 	if g.sem != nil {
 		select {
 		case g.sem <- token{}:
-			// Note: this allows barging iff channels in general allow barging.
+			// Note: this allows barging if and only if channels in general allow barging.
 		default:
 			return false
 		}
diff --git a/vendor/golang.org/x/sync/semaphore/semaphore.go b/vendor/golang.org/x/sync/semaphore/semaphore.go
new file mode 100644
index 000000000..96a035aed
--- /dev/null
+++ b/vendor/golang.org/x/sync/semaphore/semaphore.go
@@ -0,0 +1,169 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package semaphore provides a weighted semaphore implementation.
+package semaphore // import "golang.org/x/sync/semaphore"
+
+import (
+	"container/list"
+	"context"
+	"sync"
+)
+
+type waiter struct {
+	n     int64
+	ready chan<- struct{} // Closed when semaphore acquired.
+}
+
+// NewWeighted creates a new weighted semaphore with the given
+// maximum combined weight for concurrent access.
+func NewWeighted(n int64) *Weighted {
+	w := &Weighted{size: n}
+	return w
+}
+
+// Weighted provides a way to bound concurrent access to a resource.
+// The callers can request access with a given non-negative weight.
+type Weighted struct {
+	size    int64
+	cur     int64
+	mu      sync.Mutex
+	waiters list.List
+}
+
+// Acquire acquires the semaphore with a non-negative weight of n, blocking until resources
+// are available or ctx is done. On success, returns nil. On failure, returns
+// ctx.Err() and leaves the semaphore unchanged.
+func (s *Weighted) Acquire(ctx context.Context, n int64) error {
+	if n < 0 {
+		panic("semaphore: n < 0")
+	}
+	done := ctx.Done()
+
+	s.mu.Lock()
+	select {
+	case <-done:
+		// ctx becoming done has "happened before" acquiring the semaphore,
+		// whether it became done before the call began or while we were
+		// waiting for the mutex. We prefer to fail even if we could acquire
+		// the mutex without blocking.
+		s.mu.Unlock()
+		return ctx.Err()
+	default:
+	}
+	if s.size-s.cur >= n && s.waiters.Len() == 0 {
+		// Since we hold s.mu and haven't synchronized since checking done, if
+		// ctx becomes done before we return here, it becoming done must have
+		// "happened concurrently" with this call - it cannot "happen before"
+		// we return in this branch. So, we're ok to always acquire here.
+		s.cur += n
+		s.mu.Unlock()
+		return nil
+	}
+
+	if n > s.size {
+		// Don't make other Acquire calls block on one that's doomed to fail.
+		s.mu.Unlock()
+		<-done
+		return ctx.Err()
+	}
+
+	ready := make(chan struct{})
+	w := waiter{n: n, ready: ready}
+	elem := s.waiters.PushBack(w)
+	s.mu.Unlock()
+
+	select {
+	case <-done:
+		s.mu.Lock()
+		select {
+		case <-ready:
+			// Acquired the semaphore after we were canceled.
+			// Pretend we didn't and put the tokens back.
+			s.cur -= n
+			s.notifyWaiters()
+		default:
+			isFront := s.waiters.Front() == elem
+			s.waiters.Remove(elem)
+			// If we're at the front and there are extra tokens left, notify other waiters.
+			if isFront && s.size > s.cur {
+				s.notifyWaiters()
+			}
+		}
+		s.mu.Unlock()
+		return ctx.Err()
+
+	case <-ready:
+		// Acquired the semaphore. Check that ctx isn't already done.
+		// We check the done channel instead of calling ctx.Err because we
+		// already have the channel, and ctx.Err is O(n) with the nesting
+		// depth of ctx.
+		select {
+		case <-done:
+			s.Release(n)
+			return ctx.Err()
+		default:
+		}
+		return nil
+	}
+}
+
+// TryAcquire acquires the semaphore with a non-negative weight of n without blocking.
+// On success, returns true. On failure, returns false and leaves the semaphore unchanged.
+func (s *Weighted) TryAcquire(n int64) bool {
+	if n < 0 {
+		panic("semaphore: n < 0")
+	}
+	s.mu.Lock()
+	success := s.size-s.cur >= n && s.waiters.Len() == 0
+	if success {
+		s.cur += n
+	}
+	s.mu.Unlock()
+	return success
+}
+
+// Release releases the semaphore with a non-negative weight of n.
+func (s *Weighted) Release(n int64) {
+	if n < 0 {
+		panic("semaphore: n < 0")
+	}
+	s.mu.Lock()
+	s.cur -= n
+	if s.cur < 0 {
+		s.mu.Unlock()
+		panic("semaphore: released more than held")
+	}
+	s.notifyWaiters()
+	s.mu.Unlock()
+}
+
+func (s *Weighted) notifyWaiters() {
+	for {
+		next := s.waiters.Front()
+		if next == nil {
+			break // No more waiters blocked.
+		}
+
+		w := next.Value.(waiter)
+		if s.size-s.cur < w.n {
+			// Not enough tokens for the next waiter. We could keep going (to try to
+			// find a waiter with a smaller request), but under load that could cause
+			// starvation for large requests; instead, we leave all remaining waiters
+			// blocked.
+			//
+			// Consider a semaphore used as a read-write lock, with N tokens, N
+			// readers, and one writer. Each reader can Acquire(1) to obtain a read
+			// lock. The writer can Acquire(N) to obtain a write lock, excluding all
+			// of the readers. If we allow the readers to jump ahead in the queue,
+			// the writer will starve — there is always one token available for every
+			// reader.
+			break
+		}
+
+		s.cur += w.n
+		s.waiters.Remove(next)
+		close(w.ready)
+	}
+}
diff --git a/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s b/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s
deleted file mode 100644
index 269e173ca..000000000
--- a/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc
-
-#include "textflag.h"
-
-//
-// System calls for ppc64, AIX are implemented in runtime/syscall_aix.go
-//
-
-TEXT ·syscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·syscall6(SB)
-
-TEXT ·rawSyscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·rawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/cpu/asm_darwin_arm64_gc.s b/vendor/golang.org/x/sys/cpu/asm_darwin_arm64_gc.s
deleted file mode 100644
index e07fa75eb..000000000
--- a/vendor/golang.org/x/sys/cpu/asm_darwin_arm64_gc.s
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build darwin && arm64 && gc
-
-#include "textflag.h"
-
-TEXT libc_sysctlbyname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctlbyname(SB)
-GLOBL	·libc_sysctlbyname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctlbyname_trampoline_addr(SB)/8, $libc_sysctlbyname_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/cpu/asm_darwin_x86_gc.s b/vendor/golang.org/x/sys/cpu/asm_darwin_x86_gc.s
deleted file mode 100644
index ec2acfe54..000000000
--- a/vendor/golang.org/x/sys/cpu/asm_darwin_x86_gc.s
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build darwin && amd64 && gc
-
-#include "textflag.h"
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
-
-TEXT libc_sysctlbyname_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctlbyname(SB)
-GLOBL	·libc_sysctlbyname_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctlbyname_trampoline_addr(SB)/8, $libc_sysctlbyname_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/cpu/byteorder.go b/vendor/golang.org/x/sys/cpu/byteorder.go
deleted file mode 100644
index 271055be0..000000000
--- a/vendor/golang.org/x/sys/cpu/byteorder.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"runtime"
-)
-
-// byteOrder is a subset of encoding/binary.ByteOrder.
-type byteOrder interface {
-	Uint32([]byte) uint32
-	Uint64([]byte) uint64
-}
-
-type littleEndian struct{}
-type bigEndian struct{}
-
-func (littleEndian) Uint32(b []byte) uint32 {
-	_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-}
-
-func (littleEndian) Uint64(b []byte) uint64 {
-	_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-}
-
-func (bigEndian) Uint32(b []byte) uint32 {
-	_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-}
-
-func (bigEndian) Uint64(b []byte) uint64 {
-	_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-}
-
-// hostByteOrder returns littleEndian on little-endian machines and
-// bigEndian on big-endian machines.
-func hostByteOrder() byteOrder {
-	switch runtime.GOARCH {
-	case "386", "amd64", "amd64p32",
-		"alpha",
-		"arm", "arm64",
-		"loong64",
-		"mipsle", "mips64le", "mips64p32le",
-		"nios2",
-		"ppc64le",
-		"riscv", "riscv64",
-		"sh":
-		return littleEndian{}
-	case "armbe", "arm64be",
-		"m68k",
-		"mips", "mips64", "mips64p32",
-		"ppc", "ppc64",
-		"s390", "s390x",
-		"shbe",
-		"sparc", "sparc64":
-		return bigEndian{}
-	}
-	panic("unknown architecture")
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu.go b/vendor/golang.org/x/sys/cpu/cpu.go
deleted file mode 100644
index 63541994e..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu.go
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cpu implements processor feature detection for
-// various CPU architectures.
-package cpu
-
-import (
-	"os"
-	"strings"
-)
-
-// Initialized reports whether the CPU features were initialized.
-//
-// For some GOOS/GOARCH combinations initialization of the CPU features depends
-// on reading an operating specific file, e.g. /proc/self/auxv on linux/arm
-// Initialized will report false if reading the file fails.
-var Initialized bool
-
-// CacheLinePad is used to pad structs to avoid false sharing.
-type CacheLinePad struct{ _ [cacheLineSize]byte }
-
-// X86 contains the supported CPU features of the
-// current X86/AMD64 platform. If the current platform
-// is not X86/AMD64 then all feature flags are false.
-//
-// X86 is padded to avoid false sharing. Further the HasAVX
-// and HasAVX2 are only set if the OS supports XMM and YMM
-// registers in addition to the CPUID feature bit being set.
-var X86 struct {
-	_                   CacheLinePad
-	HasAES              bool // AES hardware implementation (AES NI)
-	HasADX              bool // Multi-precision add-carry instruction extensions
-	HasAVX              bool // Advanced vector extension
-	HasAVX2             bool // Advanced vector extension 2
-	HasAVX512           bool // Advanced vector extension 512
-	HasAVX512F          bool // Advanced vector extension 512 Foundation Instructions
-	HasAVX512CD         bool // Advanced vector extension 512 Conflict Detection Instructions
-	HasAVX512ER         bool // Advanced vector extension 512 Exponential and Reciprocal Instructions
-	HasAVX512PF         bool // Advanced vector extension 512 Prefetch Instructions
-	HasAVX512VL         bool // Advanced vector extension 512 Vector Length Extensions
-	HasAVX512BW         bool // Advanced vector extension 512 Byte and Word Instructions
-	HasAVX512DQ         bool // Advanced vector extension 512 Doubleword and Quadword Instructions
-	HasAVX512IFMA       bool // Advanced vector extension 512 Integer Fused Multiply Add
-	HasAVX512VBMI       bool // Advanced vector extension 512 Vector Byte Manipulation Instructions
-	HasAVX5124VNNIW     bool // Advanced vector extension 512 Vector Neural Network Instructions Word variable precision
-	HasAVX5124FMAPS     bool // Advanced vector extension 512 Fused Multiply Accumulation Packed Single precision
-	HasAVX512VPOPCNTDQ  bool // Advanced vector extension 512 Double and quad word population count instructions
-	HasAVX512VPCLMULQDQ bool // Advanced vector extension 512 Vector carry-less multiply operations
-	HasAVX512VNNI       bool // Advanced vector extension 512 Vector Neural Network Instructions
-	HasAVX512GFNI       bool // Advanced vector extension 512 Galois field New Instructions
-	HasAVX512VAES       bool // Advanced vector extension 512 Vector AES instructions
-	HasAVX512VBMI2      bool // Advanced vector extension 512 Vector Byte Manipulation Instructions 2
-	HasAVX512BITALG     bool // Advanced vector extension 512 Bit Algorithms
-	HasAVX512BF16       bool // Advanced vector extension 512 BFloat16 Instructions
-	HasAMXTile          bool // Advanced Matrix Extension Tile instructions
-	HasAMXInt8          bool // Advanced Matrix Extension Int8 instructions
-	HasAMXBF16          bool // Advanced Matrix Extension BFloat16 instructions
-	HasBMI1             bool // Bit manipulation instruction set 1
-	HasBMI2             bool // Bit manipulation instruction set 2
-	HasCX16             bool // Compare and exchange 16 Bytes
-	HasERMS             bool // Enhanced REP for MOVSB and STOSB
-	HasFMA              bool // Fused-multiply-add instructions
-	HasOSXSAVE          bool // OS supports XSAVE/XRESTOR for saving/restoring XMM registers.
-	HasPCLMULQDQ        bool // PCLMULQDQ instruction - most often used for AES-GCM
-	HasPOPCNT           bool // Hamming weight instruction POPCNT.
-	HasRDRAND           bool // RDRAND instruction (on-chip random number generator)
-	HasRDSEED           bool // RDSEED instruction (on-chip random number generator)
-	HasSSE2             bool // Streaming SIMD extension 2 (always available on amd64)
-	HasSSE3             bool // Streaming SIMD extension 3
-	HasSSSE3            bool // Supplemental streaming SIMD extension 3
-	HasSSE41            bool // Streaming SIMD extension 4 and 4.1
-	HasSSE42            bool // Streaming SIMD extension 4 and 4.2
-	HasAVXIFMA          bool // Advanced vector extension Integer Fused Multiply Add
-	HasAVXVNNI          bool // Advanced vector extension Vector Neural Network Instructions
-	HasAVXVNNIInt8      bool // Advanced vector extension Vector Neural Network Int8 instructions
-	_                   CacheLinePad
-}
-
-// ARM64 contains the supported CPU features of the
-// current ARMv8(aarch64) platform. If the current platform
-// is not arm64 then all feature flags are false.
-var ARM64 struct {
-	_           CacheLinePad
-	HasFP       bool // Floating-point instruction set (always available)
-	HasASIMD    bool // Advanced SIMD (always available)
-	HasEVTSTRM  bool // Event stream support
-	HasAES      bool // AES hardware implementation
-	HasPMULL    bool // Polynomial multiplication instruction set
-	HasSHA1     bool // SHA1 hardware implementation
-	HasSHA2     bool // SHA2 hardware implementation
-	HasCRC32    bool // CRC32 hardware implementation
-	HasATOMICS  bool // Atomic memory operation instruction set
-	HasFPHP     bool // Half precision floating-point instruction set
-	HasASIMDHP  bool // Advanced SIMD half precision instruction set
-	HasCPUID    bool // CPUID identification scheme registers
-	HasASIMDRDM bool // Rounding double multiply add/subtract instruction set
-	HasJSCVT    bool // Javascript conversion from floating-point to integer
-	HasFCMA     bool // Floating-point multiplication and addition of complex numbers
-	HasLRCPC    bool // Release Consistent processor consistent support
-	HasDCPOP    bool // Persistent memory support
-	HasSHA3     bool // SHA3 hardware implementation
-	HasSM3      bool // SM3 hardware implementation
-	HasSM4      bool // SM4 hardware implementation
-	HasASIMDDP  bool // Advanced SIMD double precision instruction set
-	HasSHA512   bool // SHA512 hardware implementation
-	HasSVE      bool // Scalable Vector Extensions
-	HasSVE2     bool // Scalable Vector Extensions 2
-	HasASIMDFHM bool // Advanced SIMD multiplication FP16 to FP32
-	HasDIT      bool // Data Independent Timing support
-	HasI8MM     bool // Advanced SIMD Int8 matrix multiplication instructions
-	_           CacheLinePad
-}
-
-// ARM contains the supported CPU features of the current ARM (32-bit) platform.
-// All feature flags are false if:
-//  1. the current platform is not arm, or
-//  2. the current operating system is not Linux.
-var ARM struct {
-	_           CacheLinePad
-	HasSWP      bool // SWP instruction support
-	HasHALF     bool // Half-word load and store support
-	HasTHUMB    bool // ARM Thumb instruction set
-	Has26BIT    bool // Address space limited to 26-bits
-	HasFASTMUL  bool // 32-bit operand, 64-bit result multiplication support
-	HasFPA      bool // Floating point arithmetic support
-	HasVFP      bool // Vector floating point support
-	HasEDSP     bool // DSP Extensions support
-	HasJAVA     bool // Java instruction set
-	HasIWMMXT   bool // Intel Wireless MMX technology support
-	HasCRUNCH   bool // MaverickCrunch context switching and handling
-	HasTHUMBEE  bool // Thumb EE instruction set
-	HasNEON     bool // NEON instruction set
-	HasVFPv3    bool // Vector floating point version 3 support
-	HasVFPv3D16 bool // Vector floating point version 3 D8-D15
-	HasTLS      bool // Thread local storage support
-	HasVFPv4    bool // Vector floating point version 4 support
-	HasIDIVA    bool // Integer divide instruction support in ARM mode
-	HasIDIVT    bool // Integer divide instruction support in Thumb mode
-	HasVFPD32   bool // Vector floating point version 3 D15-D31
-	HasLPAE     bool // Large Physical Address Extensions
-	HasEVTSTRM  bool // Event stream support
-	HasAES      bool // AES hardware implementation
-	HasPMULL    bool // Polynomial multiplication instruction set
-	HasSHA1     bool // SHA1 hardware implementation
-	HasSHA2     bool // SHA2 hardware implementation
-	HasCRC32    bool // CRC32 hardware implementation
-	_           CacheLinePad
-}
-
-// The booleans in Loong64 contain the correspondingly named cpu feature bit.
-// The struct is padded to avoid false sharing.
-var Loong64 struct {
-	_         CacheLinePad
-	HasLSX    bool // support 128-bit vector extension
-	HasLASX   bool // support 256-bit vector extension
-	HasCRC32  bool // support CRC instruction
-	HasLAM_BH bool // support AM{SWAP/ADD}[_DB].{B/H} instruction
-	HasLAMCAS bool // support AMCAS[_DB].{B/H/W/D} instruction
-	_         CacheLinePad
-}
-
-// MIPS64X contains the supported CPU features of the current mips64/mips64le
-// platforms. If the current platform is not mips64/mips64le or the current
-// operating system is not Linux then all feature flags are false.
-var MIPS64X struct {
-	_      CacheLinePad
-	HasMSA bool // MIPS SIMD architecture
-	_      CacheLinePad
-}
-
-// PPC64 contains the supported CPU features of the current ppc64/ppc64le platforms.
-// If the current platform is not ppc64/ppc64le then all feature flags are false.
-//
-// For ppc64/ppc64le, it is safe to check only for ISA level starting on ISA v3.00,
-// since there are no optional categories. There are some exceptions that also
-// require kernel support to work (DARN, SCV), so there are feature bits for
-// those as well. The struct is padded to avoid false sharing.
-var PPC64 struct {
-	_        CacheLinePad
-	HasDARN  bool // Hardware random number generator (requires kernel enablement)
-	HasSCV   bool // Syscall vectored (requires kernel enablement)
-	IsPOWER8 bool // ISA v2.07 (POWER8)
-	IsPOWER9 bool // ISA v3.00 (POWER9), implies IsPOWER8
-	_        CacheLinePad
-}
-
-// S390X contains the supported CPU features of the current IBM Z
-// (s390x) platform. If the current platform is not IBM Z then all
-// feature flags are false.
-//
-// S390X is padded to avoid false sharing. Further HasVX is only set
-// if the OS supports vector registers in addition to the STFLE
-// feature bit being set.
-var S390X struct {
-	_         CacheLinePad
-	HasZARCH  bool // z/Architecture mode is active [mandatory]
-	HasSTFLE  bool // store facility list extended
-	HasLDISP  bool // long (20-bit) displacements
-	HasEIMM   bool // 32-bit immediates
-	HasDFP    bool // decimal floating point
-	HasETF3EH bool // ETF-3 enhanced
-	HasMSA    bool // message security assist (CPACF)
-	HasAES    bool // KM-AES{128,192,256} functions
-	HasAESCBC bool // KMC-AES{128,192,256} functions
-	HasAESCTR bool // KMCTR-AES{128,192,256} functions
-	HasAESGCM bool // KMA-GCM-AES{128,192,256} functions
-	HasGHASH  bool // KIMD-GHASH function
-	HasSHA1   bool // K{I,L}MD-SHA-1 functions
-	HasSHA256 bool // K{I,L}MD-SHA-256 functions
-	HasSHA512 bool // K{I,L}MD-SHA-512 functions
-	HasSHA3   bool // K{I,L}MD-SHA3-{224,256,384,512} and K{I,L}MD-SHAKE-{128,256} functions
-	HasVX     bool // vector facility
-	HasVXE    bool // vector-enhancements facility 1
-	_         CacheLinePad
-}
-
-// RISCV64 contains the supported CPU features and performance characteristics for riscv64
-// platforms. The booleans in RISCV64, with the exception of HasFastMisaligned, indicate
-// the presence of RISC-V extensions.
-//
-// It is safe to assume that all the RV64G extensions are supported and so they are omitted from
-// this structure. As riscv64 Go programs require at least RV64G, the code that populates
-// this structure cannot run successfully if some of the RV64G extensions are missing.
-// The struct is padded to avoid false sharing.
-var RISCV64 struct {
-	_                 CacheLinePad
-	HasFastMisaligned bool // Fast misaligned accesses
-	HasC              bool // Compressed instruction-set extension
-	HasV              bool // Vector extension compatible with RVV 1.0
-	HasZba            bool // Address generation instructions extension
-	HasZbb            bool // Basic bit-manipulation extension
-	HasZbs            bool // Single-bit instructions extension
-	HasZvbb           bool // Vector Basic Bit-manipulation
-	HasZvbc           bool // Vector Carryless Multiplication
-	HasZvkb           bool // Vector Cryptography Bit-manipulation
-	HasZvkt           bool // Vector Data-Independent Execution Latency
-	HasZvkg           bool // Vector GCM/GMAC
-	HasZvkn           bool // NIST Algorithm Suite (AES/SHA256/SHA512)
-	HasZvknc          bool // NIST Algorithm Suite with carryless multiply
-	HasZvkng          bool // NIST Algorithm Suite with GCM
-	HasZvks           bool // ShangMi Algorithm Suite
-	HasZvksc          bool // ShangMi Algorithm Suite with carryless multiplication
-	HasZvksg          bool // ShangMi Algorithm Suite with GCM
-	_                 CacheLinePad
-}
-
-func init() {
-	archInit()
-	initOptions()
-	processOptions()
-}
-
-// options contains the cpu debug options that can be used in GODEBUG.
-// Options are arch dependent and are added by the arch specific initOptions functions.
-// Features that are mandatory for the specific GOARCH should have the Required field set
-// (e.g. SSE2 on amd64).
-var options []option
-
-// Option names should be lower case. e.g. avx instead of AVX.
-type option struct {
-	Name      string
-	Feature   *bool
-	Specified bool // whether feature value was specified in GODEBUG
-	Enable    bool // whether feature should be enabled
-	Required  bool // whether feature is mandatory and can not be disabled
-}
-
-func processOptions() {
-	env := os.Getenv("GODEBUG")
-field:
-	for env != "" {
-		field := ""
-		i := strings.IndexByte(env, ',')
-		if i < 0 {
-			field, env = env, ""
-		} else {
-			field, env = env[:i], env[i+1:]
-		}
-		if len(field) < 4 || field[:4] != "cpu." {
-			continue
-		}
-		i = strings.IndexByte(field, '=')
-		if i < 0 {
-			print("GODEBUG sys/cpu: no value specified for \"", field, "\"\n")
-			continue
-		}
-		key, value := field[4:i], field[i+1:] // e.g. "SSE2", "on"
-
-		var enable bool
-		switch value {
-		case "on":
-			enable = true
-		case "off":
-			enable = false
-		default:
-			print("GODEBUG sys/cpu: value \"", value, "\" not supported for cpu option \"", key, "\"\n")
-			continue field
-		}
-
-		if key == "all" {
-			for i := range options {
-				options[i].Specified = true
-				options[i].Enable = enable || options[i].Required
-			}
-			continue field
-		}
-
-		for i := range options {
-			if options[i].Name == key {
-				options[i].Specified = true
-				options[i].Enable = enable
-				continue field
-			}
-		}
-
-		print("GODEBUG sys/cpu: unknown cpu feature \"", key, "\"\n")
-	}
-
-	for _, o := range options {
-		if !o.Specified {
-			continue
-		}
-
-		if o.Enable && !*o.Feature {
-			print("GODEBUG sys/cpu: can not enable \"", o.Name, "\", missing CPU support\n")
-			continue
-		}
-
-		if !o.Enable && o.Required {
-			print("GODEBUG sys/cpu: can not disable \"", o.Name, "\", required CPU feature\n")
-			continue
-		}
-
-		*o.Feature = o.Enable
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_aix.go b/vendor/golang.org/x/sys/cpu/cpu_aix.go
deleted file mode 100644
index 9bf0c32eb..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_aix.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build aix
-
-package cpu
-
-const (
-	// getsystemcfg constants
-	_SC_IMPL     = 2
-	_IMPL_POWER8 = 0x10000
-	_IMPL_POWER9 = 0x20000
-)
-
-func archInit() {
-	impl := getsystemcfg(_SC_IMPL)
-	if impl&_IMPL_POWER8 != 0 {
-		PPC64.IsPOWER8 = true
-	}
-	if impl&_IMPL_POWER9 != 0 {
-		PPC64.IsPOWER8 = true
-		PPC64.IsPOWER9 = true
-	}
-
-	Initialized = true
-}
-
-func getsystemcfg(label int) (n uint64) {
-	r0, _ := callgetsystemcfg(label)
-	n = uint64(r0)
-	return
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm.go b/vendor/golang.org/x/sys/cpu/cpu_arm.go
deleted file mode 100644
index 301b752e9..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_arm.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-const cacheLineSize = 32
-
-// HWCAP/HWCAP2 bits.
-// These are specific to Linux.
-const (
-	hwcap_SWP       = 1 << 0
-	hwcap_HALF      = 1 << 1
-	hwcap_THUMB     = 1 << 2
-	hwcap_26BIT     = 1 << 3
-	hwcap_FAST_MULT = 1 << 4
-	hwcap_FPA       = 1 << 5
-	hwcap_VFP       = 1 << 6
-	hwcap_EDSP      = 1 << 7
-	hwcap_JAVA      = 1 << 8
-	hwcap_IWMMXT    = 1 << 9
-	hwcap_CRUNCH    = 1 << 10
-	hwcap_THUMBEE   = 1 << 11
-	hwcap_NEON      = 1 << 12
-	hwcap_VFPv3     = 1 << 13
-	hwcap_VFPv3D16  = 1 << 14
-	hwcap_TLS       = 1 << 15
-	hwcap_VFPv4     = 1 << 16
-	hwcap_IDIVA     = 1 << 17
-	hwcap_IDIVT     = 1 << 18
-	hwcap_VFPD32    = 1 << 19
-	hwcap_LPAE      = 1 << 20
-	hwcap_EVTSTRM   = 1 << 21
-
-	hwcap2_AES   = 1 << 0
-	hwcap2_PMULL = 1 << 1
-	hwcap2_SHA1  = 1 << 2
-	hwcap2_SHA2  = 1 << 3
-	hwcap2_CRC32 = 1 << 4
-)
-
-func initOptions() {
-	options = []option{
-		{Name: "pmull", Feature: &ARM.HasPMULL},
-		{Name: "sha1", Feature: &ARM.HasSHA1},
-		{Name: "sha2", Feature: &ARM.HasSHA2},
-		{Name: "swp", Feature: &ARM.HasSWP},
-		{Name: "thumb", Feature: &ARM.HasTHUMB},
-		{Name: "thumbee", Feature: &ARM.HasTHUMBEE},
-		{Name: "tls", Feature: &ARM.HasTLS},
-		{Name: "vfp", Feature: &ARM.HasVFP},
-		{Name: "vfpd32", Feature: &ARM.HasVFPD32},
-		{Name: "vfpv3", Feature: &ARM.HasVFPv3},
-		{Name: "vfpv3d16", Feature: &ARM.HasVFPv3D16},
-		{Name: "vfpv4", Feature: &ARM.HasVFPv4},
-		{Name: "half", Feature: &ARM.HasHALF},
-		{Name: "26bit", Feature: &ARM.Has26BIT},
-		{Name: "fastmul", Feature: &ARM.HasFASTMUL},
-		{Name: "fpa", Feature: &ARM.HasFPA},
-		{Name: "edsp", Feature: &ARM.HasEDSP},
-		{Name: "java", Feature: &ARM.HasJAVA},
-		{Name: "iwmmxt", Feature: &ARM.HasIWMMXT},
-		{Name: "crunch", Feature: &ARM.HasCRUNCH},
-		{Name: "neon", Feature: &ARM.HasNEON},
-		{Name: "idivt", Feature: &ARM.HasIDIVT},
-		{Name: "idiva", Feature: &ARM.HasIDIVA},
-		{Name: "lpae", Feature: &ARM.HasLPAE},
-		{Name: "evtstrm", Feature: &ARM.HasEVTSTRM},
-		{Name: "aes", Feature: &ARM.HasAES},
-		{Name: "crc32", Feature: &ARM.HasCRC32},
-	}
-
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_arm64.go
deleted file mode 100644
index 5fc09e293..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_arm64.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import "runtime"
-
-// cacheLineSize is used to prevent false sharing of cache lines.
-// We choose 128 because Apple Silicon, a.k.a. M1, has 128-byte cache line size.
-// It doesn't cost much and is much more future-proof.
-const cacheLineSize = 128
-
-func initOptions() {
-	options = []option{
-		{Name: "fp", Feature: &ARM64.HasFP},
-		{Name: "asimd", Feature: &ARM64.HasASIMD},
-		{Name: "evstrm", Feature: &ARM64.HasEVTSTRM},
-		{Name: "aes", Feature: &ARM64.HasAES},
-		{Name: "fphp", Feature: &ARM64.HasFPHP},
-		{Name: "jscvt", Feature: &ARM64.HasJSCVT},
-		{Name: "lrcpc", Feature: &ARM64.HasLRCPC},
-		{Name: "pmull", Feature: &ARM64.HasPMULL},
-		{Name: "sha1", Feature: &ARM64.HasSHA1},
-		{Name: "sha2", Feature: &ARM64.HasSHA2},
-		{Name: "sha3", Feature: &ARM64.HasSHA3},
-		{Name: "sha512", Feature: &ARM64.HasSHA512},
-		{Name: "sm3", Feature: &ARM64.HasSM3},
-		{Name: "sm4", Feature: &ARM64.HasSM4},
-		{Name: "sve", Feature: &ARM64.HasSVE},
-		{Name: "sve2", Feature: &ARM64.HasSVE2},
-		{Name: "crc32", Feature: &ARM64.HasCRC32},
-		{Name: "atomics", Feature: &ARM64.HasATOMICS},
-		{Name: "asimdhp", Feature: &ARM64.HasASIMDHP},
-		{Name: "cpuid", Feature: &ARM64.HasCPUID},
-		{Name: "asimrdm", Feature: &ARM64.HasASIMDRDM},
-		{Name: "fcma", Feature: &ARM64.HasFCMA},
-		{Name: "dcpop", Feature: &ARM64.HasDCPOP},
-		{Name: "asimddp", Feature: &ARM64.HasASIMDDP},
-		{Name: "asimdfhm", Feature: &ARM64.HasASIMDFHM},
-		{Name: "dit", Feature: &ARM64.HasDIT},
-		{Name: "i8mm", Feature: &ARM64.HasI8MM},
-	}
-}
-
-func archInit() {
-	if runtime.GOOS == "freebsd" {
-		readARM64Registers()
-	} else {
-		// Most platforms don't seem to allow directly reading these registers.
-		doinit()
-	}
-}
-
-// setMinimalFeatures fakes the minimal ARM64 features expected by
-// TestARM64minimalFeatures.
-func setMinimalFeatures() {
-	ARM64.HasASIMD = true
-	ARM64.HasFP = true
-}
-
-func readARM64Registers() {
-	Initialized = true
-
-	parseARM64SystemRegisters(getisar0(), getisar1(), getpfr0())
-}
-
-func parseARM64SystemRegisters(isar0, isar1, pfr0 uint64) {
-	// ID_AA64ISAR0_EL1
-	switch extractBits(isar0, 4, 7) {
-	case 1:
-		ARM64.HasAES = true
-	case 2:
-		ARM64.HasAES = true
-		ARM64.HasPMULL = true
-	}
-
-	switch extractBits(isar0, 8, 11) {
-	case 1:
-		ARM64.HasSHA1 = true
-	}
-
-	switch extractBits(isar0, 12, 15) {
-	case 1:
-		ARM64.HasSHA2 = true
-	case 2:
-		ARM64.HasSHA2 = true
-		ARM64.HasSHA512 = true
-	}
-
-	switch extractBits(isar0, 16, 19) {
-	case 1:
-		ARM64.HasCRC32 = true
-	}
-
-	switch extractBits(isar0, 20, 23) {
-	case 2:
-		ARM64.HasATOMICS = true
-	}
-
-	switch extractBits(isar0, 28, 31) {
-	case 1:
-		ARM64.HasASIMDRDM = true
-	}
-
-	switch extractBits(isar0, 32, 35) {
-	case 1:
-		ARM64.HasSHA3 = true
-	}
-
-	switch extractBits(isar0, 36, 39) {
-	case 1:
-		ARM64.HasSM3 = true
-	}
-
-	switch extractBits(isar0, 40, 43) {
-	case 1:
-		ARM64.HasSM4 = true
-	}
-
-	switch extractBits(isar0, 44, 47) {
-	case 1:
-		ARM64.HasASIMDDP = true
-	}
-
-	// ID_AA64ISAR1_EL1
-	switch extractBits(isar1, 0, 3) {
-	case 1:
-		ARM64.HasDCPOP = true
-	}
-
-	switch extractBits(isar1, 12, 15) {
-	case 1:
-		ARM64.HasJSCVT = true
-	}
-
-	switch extractBits(isar1, 16, 19) {
-	case 1:
-		ARM64.HasFCMA = true
-	}
-
-	switch extractBits(isar1, 20, 23) {
-	case 1:
-		ARM64.HasLRCPC = true
-	}
-
-	switch extractBits(isar1, 52, 55) {
-	case 1:
-		ARM64.HasI8MM = true
-	}
-
-	// ID_AA64PFR0_EL1
-	switch extractBits(pfr0, 16, 19) {
-	case 0:
-		ARM64.HasFP = true
-	case 1:
-		ARM64.HasFP = true
-		ARM64.HasFPHP = true
-	}
-
-	switch extractBits(pfr0, 20, 23) {
-	case 0:
-		ARM64.HasASIMD = true
-	case 1:
-		ARM64.HasASIMD = true
-		ARM64.HasASIMDHP = true
-	}
-
-	switch extractBits(pfr0, 32, 35) {
-	case 1:
-		ARM64.HasSVE = true
-
-		parseARM64SVERegister(getzfr0())
-	}
-
-	switch extractBits(pfr0, 48, 51) {
-	case 1:
-		ARM64.HasDIT = true
-	}
-}
-
-func parseARM64SVERegister(zfr0 uint64) {
-	switch extractBits(zfr0, 0, 3) {
-	case 1:
-		ARM64.HasSVE2 = true
-	}
-}
-
-func extractBits(data uint64, start, end uint) uint {
-	return (uint)(data>>start) & ((1 << (end - start + 1)) - 1)
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.s b/vendor/golang.org/x/sys/cpu/cpu_arm64.s
deleted file mode 100644
index 3b0450a06..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_arm64.s
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc
-
-#include "textflag.h"
-
-// func getisar0() uint64
-TEXT ·getisar0(SB),NOSPLIT,$0-8
-	// get Instruction Set Attributes 0 into x0
-	MRS	ID_AA64ISAR0_EL1, R0
-	MOVD	R0, ret+0(FP)
-	RET
-
-// func getisar1() uint64
-TEXT ·getisar1(SB),NOSPLIT,$0-8
-	// get Instruction Set Attributes 1 into x0
-	MRS	ID_AA64ISAR1_EL1, R0
-	MOVD	R0, ret+0(FP)
-	RET
-
-// func getpfr0() uint64
-TEXT ·getpfr0(SB),NOSPLIT,$0-8
-	// get Processor Feature Register 0 into x0
-	MRS	ID_AA64PFR0_EL1, R0
-	MOVD	R0, ret+0(FP)
-	RET
-
-// func getzfr0() uint64
-TEXT ·getzfr0(SB),NOSPLIT,$0-8
-	// get SVE Feature Register 0 into x0
-	MRS	ID_AA64ZFR0_EL1, R0
-	MOVD	R0, ret+0(FP)
-	RET
diff --git a/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64.go
deleted file mode 100644
index 0b470744a..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2026 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build darwin && arm64 && gc
-
-package cpu
-
-func doinit() {
-	setMinimalFeatures()
-
-	// The feature flags are explained in [Instruction Set Detection].
-	// There are some differences between MacOS versions:
-	//
-	// MacOS 11 and 12 do not have "hw.optional" sysctl values for some of the features.
-	//
-	// MacOS 13 changed some of the naming conventions to align with ARM Architecture Reference Manual.
-	// For example "hw.optional.armv8_2_sha512" became "hw.optional.arm.FEAT_SHA512".
-	// It currently checks both to stay compatible with MacOS 11 and 12.
-	// The old names also work with MacOS 13, however it's not clear whether
-	// they will continue working with future OS releases.
-	//
-	// Once MacOS 12 is no longer supported the old names can be removed.
-	//
-	// [Instruction Set Detection]: https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_instruction_set_characteristics
-
-	// Encryption, hashing and checksum capabilities
-
-	// For the following flags there are no MacOS 11 sysctl flags.
-	ARM64.HasAES = true || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_AES\x00"))
-	ARM64.HasPMULL = true || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_PMULL\x00"))
-	ARM64.HasSHA1 = true || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SHA1\x00"))
-	ARM64.HasSHA2 = true || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SHA256\x00"))
-
-	ARM64.HasSHA3 = darwinSysctlEnabled([]byte("hw.optional.armv8_2_sha3\x00")) || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SHA3\x00"))
-	ARM64.HasSHA512 = darwinSysctlEnabled([]byte("hw.optional.armv8_2_sha512\x00")) || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SHA512\x00"))
-
-	ARM64.HasCRC32 = darwinSysctlEnabled([]byte("hw.optional.armv8_crc32\x00"))
-
-	// Atomic and memory ordering
-	ARM64.HasATOMICS = darwinSysctlEnabled([]byte("hw.optional.armv8_1_atomics\x00")) || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_LSE\x00"))
-	ARM64.HasLRCPC = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_LRCPC\x00"))
-
-	// SIMD and floating point capabilities
-	ARM64.HasFPHP = darwinSysctlEnabled([]byte("hw.optional.neon_fp16\x00")) || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_FP16\x00"))
-	ARM64.HasASIMDHP = darwinSysctlEnabled([]byte("hw.optional.neon_hpfp\x00")) || darwinSysctlEnabled([]byte("hw.optional.AdvSIMD_HPFPCvt\x00"))
-	ARM64.HasASIMDRDM = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_RDM\x00"))
-	ARM64.HasASIMDDP = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_DotProd\x00"))
-	ARM64.HasASIMDFHM = darwinSysctlEnabled([]byte("hw.optional.armv8_2_fhm\x00")) || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_FHM\x00"))
-	ARM64.HasI8MM = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_I8MM\x00"))
-
-	ARM64.HasJSCVT = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_JSCVT\x00"))
-	ARM64.HasFCMA = darwinSysctlEnabled([]byte("hw.optional.armv8_3_compnum\x00")) || darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_FCMA\x00"))
-
-	// Miscellaneous
-	ARM64.HasDCPOP = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_DPB\x00"))
-	ARM64.HasEVTSTRM = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_ECV\x00"))
-	ARM64.HasDIT = darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_DIT\x00"))
-
-	// Not supported, but added for completeness
-	ARM64.HasCPUID = false
-
-	ARM64.HasSM3 = false  // darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SM3\x00"))
-	ARM64.HasSM4 = false  // darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SM4\x00"))
-	ARM64.HasSVE = false  // darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SVE\x00"))
-	ARM64.HasSVE2 = false // darwinSysctlEnabled([]byte("hw.optional.arm.FEAT_SVE2\x00"))
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go b/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go
deleted file mode 100644
index 4ee68e38d..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2026 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build darwin && arm64 && !gc
-
-package cpu
-
-func doinit() {
-	setMinimalFeatures()
-
-	ARM64.HasASIMD = true
-	ARM64.HasFP = true
-
-	// Go already assumes these to be available because they were on the M1
-	// and these are supported on all Apple arm64 chips.
-	ARM64.HasAES = true
-	ARM64.HasPMULL = true
-	ARM64.HasSHA1 = true
-	ARM64.HasSHA2 = true
-
-	if runtime.GOOS != "ios" {
-		// Apple A7 processors do not support these, however
-		// M-series SoCs are at least armv8.4-a
-		ARM64.HasCRC32 = true   // armv8.1
-		ARM64.HasATOMICS = true // armv8.2
-		ARM64.HasJSCVT = true   // armv8.3, if HasFP
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_darwin_x86.go b/vendor/golang.org/x/sys/cpu/cpu_darwin_x86.go
deleted file mode 100644
index b838cb9e9..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_darwin_x86.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build darwin && amd64 && gc
-
-package cpu
-
-// darwinSupportsAVX512 checks Darwin kernel for AVX512 support via sysctl
-// call (see issue 43089). It also restricts AVX512 support for Darwin to
-// kernel version 21.3.0 (MacOS 12.2.0) or later (see issue 49233).
-//
-// Background:
-// Darwin implements a special mechanism to economize on thread state when
-// AVX512 specific registers are not in use. This scheme minimizes state when
-// preempting threads that haven't yet used any AVX512 instructions, but adds
-// special requirements to check for AVX512 hardware support at runtime (e.g.
-// via sysctl call or commpage inspection). See issue 43089 and link below for
-// full background:
-// https://github.com/apple-oss-distributions/xnu/blob/xnu-11215.1.10/osfmk/i386/fpu.c#L214-L240
-//
-// Additionally, all versions of the Darwin kernel from 19.6.0 through 21.2.0
-// (corresponding to MacOS 10.15.6 - 12.1) have a bug that can cause corruption
-// of the AVX512 mask registers (K0-K7) upon signal return. For this reason
-// AVX512 is considered unsafe to use on Darwin for kernel versions prior to
-// 21.3.0, where a fix has been confirmed. See issue 49233 for full background.
-func darwinSupportsAVX512() bool {
-	return darwinSysctlEnabled([]byte("hw.optional.avx512f\x00")) && darwinKernelVersionCheck(21, 3, 0)
-}
-
-// Ensure Darwin kernel version is at least major.minor.patch, avoiding dependencies
-func darwinKernelVersionCheck(major, minor, patch int) bool {
-	var release [256]byte
-	err := darwinOSRelease(&release)
-	if err != nil {
-		return false
-	}
-
-	var mmp [3]int
-	c := 0
-Loop:
-	for _, b := range release[:] {
-		switch {
-		case b >= '0' && b <= '9':
-			mmp[c] = 10*mmp[c] + int(b-'0')
-		case b == '.':
-			c++
-			if c > 2 {
-				return false
-			}
-		case b == 0:
-			break Loop
-		default:
-			return false
-		}
-	}
-	if c != 2 {
-		return false
-	}
-	return mmp[0] > major || mmp[0] == major && (mmp[1] > minor || mmp[1] == minor && mmp[2] >= patch)
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go
deleted file mode 100644
index 6ac6e1efb..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc
-
-package cpu
-
-func getisar0() uint64
-func getisar1() uint64
-func getpfr0() uint64
-func getzfr0() uint64
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go
deleted file mode 100644
index c8ae6ddc1..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc
-
-package cpu
-
-// haveAsmFunctions reports whether the other functions in this file can
-// be safely called.
-func haveAsmFunctions() bool { return true }
-
-// The following feature detection functions are defined in cpu_s390x.s.
-// They are likely to be expensive to call so the results should be cached.
-func stfle() facilityList
-func kmQuery() queryResult
-func kmcQuery() queryResult
-func kmctrQuery() queryResult
-func kmaQuery() queryResult
-func kimdQuery() queryResult
-func klmdQuery() queryResult
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go b/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
deleted file mode 100644
index 32a44514e..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (386 || amd64 || amd64p32) && gc
-
-package cpu
-
-// cpuid is implemented in cpu_gc_x86.s for gc compiler
-// and in cpu_gccgo.c for gccgo.
-func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
-
-// xgetbv with ecx = 0 is implemented in cpu_gc_x86.s for gc compiler
-// and in cpu_gccgo.c for gccgo.
-func xgetbv() (eax, edx uint32)
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_x86.s b/vendor/golang.org/x/sys/cpu/cpu_gc_x86.s
deleted file mode 100644
index ce208ce6d..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gc_x86.s
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (386 || amd64 || amd64p32) && gc
-
-#include "textflag.h"
-
-// func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·cpuid(SB), NOSPLIT, $0-24
-	MOVL eaxArg+0(FP), AX
-	MOVL ecxArg+4(FP), CX
-	CPUID
-	MOVL AX, eax+8(FP)
-	MOVL BX, ebx+12(FP)
-	MOVL CX, ecx+16(FP)
-	MOVL DX, edx+20(FP)
-	RET
-
-// func xgetbv() (eax, edx uint32)
-TEXT ·xgetbv(SB), NOSPLIT, $0-8
-	MOVL $0, CX
-	XGETBV
-	MOVL AX, eax+0(FP)
-	MOVL DX, edx+4(FP)
-	RET
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go
deleted file mode 100644
index 05913081e..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gccgo
-
-package cpu
-
-func getisar0() uint64 { return 0 }
-func getisar1() uint64 { return 0 }
-func getpfr0() uint64  { return 0 }
-func getzfr0() uint64  { return 0 }
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go
deleted file mode 100644
index 9526d2ce3..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gccgo
-
-package cpu
-
-// haveAsmFunctions reports whether the other functions in this file can
-// be safely called.
-func haveAsmFunctions() bool { return false }
-
-// TODO(mundaym): the following feature detection functions are currently
-// stubs. See https://golang.org/cl/162887 for how to fix this.
-// They are likely to be expensive to call so the results should be cached.
-func stfle() facilityList     { panic("not implemented for gccgo") }
-func kmQuery() queryResult    { panic("not implemented for gccgo") }
-func kmcQuery() queryResult   { panic("not implemented for gccgo") }
-func kmctrQuery() queryResult { panic("not implemented for gccgo") }
-func kmaQuery() queryResult   { panic("not implemented for gccgo") }
-func kimdQuery() queryResult  { panic("not implemented for gccgo") }
-func klmdQuery() queryResult  { panic("not implemented for gccgo") }
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c b/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
deleted file mode 100644
index 3f73a05dc..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (386 || amd64 || amd64p32) && gccgo
-
-#include 
-#include 
-#include 
-
-// Need to wrap __get_cpuid_count because it's declared as static.
-int
-gccgoGetCpuidCount(uint32_t leaf, uint32_t subleaf,
-                   uint32_t *eax, uint32_t *ebx,
-                   uint32_t *ecx, uint32_t *edx)
-{
-	return __get_cpuid_count(leaf, subleaf, eax, ebx, ecx, edx);
-}
-
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC push_options
-#pragma GCC target("xsave")
-#pragma clang attribute push (__attribute__((target("xsave"))), apply_to=function)
-
-// xgetbv reads the contents of an XCR (Extended Control Register)
-// specified in the ECX register into registers EDX:EAX.
-// Currently, the only supported value for XCR is 0.
-void
-gccgoXgetbv(uint32_t *eax, uint32_t *edx)
-{
-	uint64_t v = _xgetbv(0);
-	*eax = v & 0xffffffff;
-	*edx = v >> 32;
-}
-
-#pragma clang attribute pop
-#pragma GCC pop_options
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go
deleted file mode 100644
index 170d21ddf..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build (386 || amd64 || amd64p32) && gccgo
-
-package cpu
-
-//extern gccgoGetCpuidCount
-func gccgoGetCpuidCount(eaxArg, ecxArg uint32, eax, ebx, ecx, edx *uint32)
-
-func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32) {
-	var a, b, c, d uint32
-	gccgoGetCpuidCount(eaxArg, ecxArg, &a, &b, &c, &d)
-	return a, b, c, d
-}
-
-//extern gccgoXgetbv
-func gccgoXgetbv(eax, edx *uint32)
-
-func xgetbv() (eax, edx uint32) {
-	var a, d uint32
-	gccgoXgetbv(&a, &d)
-	return a, d
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux.go b/vendor/golang.org/x/sys/cpu/cpu_linux.go
deleted file mode 100644
index 743eb5435..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !386 && !amd64 && !amd64p32 && !arm64
-
-package cpu
-
-func archInit() {
-	if err := readHWCAP(); err != nil {
-		return
-	}
-	doinit()
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_arm.go b/vendor/golang.org/x/sys/cpu/cpu_linux_arm.go
deleted file mode 100644
index 2057006dc..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_arm.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-func doinit() {
-	ARM.HasSWP = isSet(hwCap, hwcap_SWP)
-	ARM.HasHALF = isSet(hwCap, hwcap_HALF)
-	ARM.HasTHUMB = isSet(hwCap, hwcap_THUMB)
-	ARM.Has26BIT = isSet(hwCap, hwcap_26BIT)
-	ARM.HasFASTMUL = isSet(hwCap, hwcap_FAST_MULT)
-	ARM.HasFPA = isSet(hwCap, hwcap_FPA)
-	ARM.HasVFP = isSet(hwCap, hwcap_VFP)
-	ARM.HasEDSP = isSet(hwCap, hwcap_EDSP)
-	ARM.HasJAVA = isSet(hwCap, hwcap_JAVA)
-	ARM.HasIWMMXT = isSet(hwCap, hwcap_IWMMXT)
-	ARM.HasCRUNCH = isSet(hwCap, hwcap_CRUNCH)
-	ARM.HasTHUMBEE = isSet(hwCap, hwcap_THUMBEE)
-	ARM.HasNEON = isSet(hwCap, hwcap_NEON)
-	ARM.HasVFPv3 = isSet(hwCap, hwcap_VFPv3)
-	ARM.HasVFPv3D16 = isSet(hwCap, hwcap_VFPv3D16)
-	ARM.HasTLS = isSet(hwCap, hwcap_TLS)
-	ARM.HasVFPv4 = isSet(hwCap, hwcap_VFPv4)
-	ARM.HasIDIVA = isSet(hwCap, hwcap_IDIVA)
-	ARM.HasIDIVT = isSet(hwCap, hwcap_IDIVT)
-	ARM.HasVFPD32 = isSet(hwCap, hwcap_VFPD32)
-	ARM.HasLPAE = isSet(hwCap, hwcap_LPAE)
-	ARM.HasEVTSTRM = isSet(hwCap, hwcap_EVTSTRM)
-	ARM.HasAES = isSet(hwCap2, hwcap2_AES)
-	ARM.HasPMULL = isSet(hwCap2, hwcap2_PMULL)
-	ARM.HasSHA1 = isSet(hwCap2, hwcap2_SHA1)
-	ARM.HasSHA2 = isSet(hwCap2, hwcap2_SHA2)
-	ARM.HasCRC32 = isSet(hwCap2, hwcap2_CRC32)
-}
-
-func isSet(hwc uint, value uint) bool {
-	return hwc&value != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go
deleted file mode 100644
index f1caf0f78..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"strings"
-	"syscall"
-)
-
-// HWCAP/HWCAP2 bits. These are exposed by Linux.
-const (
-	hwcap_FP       = 1 << 0
-	hwcap_ASIMD    = 1 << 1
-	hwcap_EVTSTRM  = 1 << 2
-	hwcap_AES      = 1 << 3
-	hwcap_PMULL    = 1 << 4
-	hwcap_SHA1     = 1 << 5
-	hwcap_SHA2     = 1 << 6
-	hwcap_CRC32    = 1 << 7
-	hwcap_ATOMICS  = 1 << 8
-	hwcap_FPHP     = 1 << 9
-	hwcap_ASIMDHP  = 1 << 10
-	hwcap_CPUID    = 1 << 11
-	hwcap_ASIMDRDM = 1 << 12
-	hwcap_JSCVT    = 1 << 13
-	hwcap_FCMA     = 1 << 14
-	hwcap_LRCPC    = 1 << 15
-	hwcap_DCPOP    = 1 << 16
-	hwcap_SHA3     = 1 << 17
-	hwcap_SM3      = 1 << 18
-	hwcap_SM4      = 1 << 19
-	hwcap_ASIMDDP  = 1 << 20
-	hwcap_SHA512   = 1 << 21
-	hwcap_SVE      = 1 << 22
-	hwcap_ASIMDFHM = 1 << 23
-	hwcap_DIT      = 1 << 24
-
-	hwcap2_SVE2 = 1 << 1
-	hwcap2_I8MM = 1 << 13
-)
-
-// linuxKernelCanEmulateCPUID reports whether we're running
-// on Linux 4.11+. Ideally we'd like to ask the question about
-// whether the current kernel contains
-// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=77c97b4ee21290f5f083173d957843b615abbff2
-// but the version number will have to do.
-func linuxKernelCanEmulateCPUID() bool {
-	var un syscall.Utsname
-	syscall.Uname(&un)
-	var sb strings.Builder
-	for _, b := range un.Release[:] {
-		if b == 0 {
-			break
-		}
-		sb.WriteByte(byte(b))
-	}
-	major, minor, _, ok := parseRelease(sb.String())
-	return ok && (major > 4 || major == 4 && minor >= 11)
-}
-
-func doinit() {
-	if err := readHWCAP(); err != nil {
-		// We failed to read /proc/self/auxv. This can happen if the binary has
-		// been given extra capabilities(7) with /bin/setcap.
-		//
-		// When this happens, we have two options. If the Linux kernel is new
-		// enough (4.11+), we can read the arm64 registers directly which'll
-		// trap into the kernel and then return back to userspace.
-		//
-		// But on older kernels, such as Linux 4.4.180 as used on many Synology
-		// devices, calling readARM64Registers (specifically getisar0) will
-		// cause a SIGILL and we'll die. So for older kernels, parse /proc/cpuinfo
-		// instead.
-		//
-		// See golang/go#57336.
-		if linuxKernelCanEmulateCPUID() {
-			readARM64Registers()
-		} else {
-			readLinuxProcCPUInfo()
-		}
-		return
-	}
-
-	// HWCAP feature bits
-	ARM64.HasFP = isSet(hwCap, hwcap_FP)
-	ARM64.HasASIMD = isSet(hwCap, hwcap_ASIMD)
-	ARM64.HasEVTSTRM = isSet(hwCap, hwcap_EVTSTRM)
-	ARM64.HasAES = isSet(hwCap, hwcap_AES)
-	ARM64.HasPMULL = isSet(hwCap, hwcap_PMULL)
-	ARM64.HasSHA1 = isSet(hwCap, hwcap_SHA1)
-	ARM64.HasSHA2 = isSet(hwCap, hwcap_SHA2)
-	ARM64.HasCRC32 = isSet(hwCap, hwcap_CRC32)
-	ARM64.HasATOMICS = isSet(hwCap, hwcap_ATOMICS)
-	ARM64.HasFPHP = isSet(hwCap, hwcap_FPHP)
-	ARM64.HasASIMDHP = isSet(hwCap, hwcap_ASIMDHP)
-	ARM64.HasCPUID = isSet(hwCap, hwcap_CPUID)
-	ARM64.HasASIMDRDM = isSet(hwCap, hwcap_ASIMDRDM)
-	ARM64.HasJSCVT = isSet(hwCap, hwcap_JSCVT)
-	ARM64.HasFCMA = isSet(hwCap, hwcap_FCMA)
-	ARM64.HasLRCPC = isSet(hwCap, hwcap_LRCPC)
-	ARM64.HasDCPOP = isSet(hwCap, hwcap_DCPOP)
-	ARM64.HasSHA3 = isSet(hwCap, hwcap_SHA3)
-	ARM64.HasSM3 = isSet(hwCap, hwcap_SM3)
-	ARM64.HasSM4 = isSet(hwCap, hwcap_SM4)
-	ARM64.HasASIMDDP = isSet(hwCap, hwcap_ASIMDDP)
-	ARM64.HasSHA512 = isSet(hwCap, hwcap_SHA512)
-	ARM64.HasSVE = isSet(hwCap, hwcap_SVE)
-	ARM64.HasASIMDFHM = isSet(hwCap, hwcap_ASIMDFHM)
-	ARM64.HasDIT = isSet(hwCap, hwcap_DIT)
-
-	// HWCAP2 feature bits
-	ARM64.HasSVE2 = isSet(hwCap2, hwcap2_SVE2)
-	ARM64.HasI8MM = isSet(hwCap2, hwcap2_I8MM)
-}
-
-func isSet(hwc uint, value uint) bool {
-	return hwc&value != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_loong64.go b/vendor/golang.org/x/sys/cpu/cpu_linux_loong64.go
deleted file mode 100644
index 4f3411432..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_loong64.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-// HWCAP bits. These are exposed by the Linux kernel.
-const (
-	hwcap_LOONGARCH_LSX  = 1 << 4
-	hwcap_LOONGARCH_LASX = 1 << 5
-)
-
-func doinit() {
-	// TODO: Features that require kernel support like LSX and LASX can
-	// be detected here once needed in std library or by the compiler.
-	Loong64.HasLSX = hwcIsSet(hwCap, hwcap_LOONGARCH_LSX)
-	Loong64.HasLASX = hwcIsSet(hwCap, hwcap_LOONGARCH_LASX)
-}
-
-func hwcIsSet(hwc uint, val uint) bool {
-	return hwc&val != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go b/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go
deleted file mode 100644
index 4686c1d54..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && (mips64 || mips64le)
-
-package cpu
-
-// HWCAP bits. These are exposed by the Linux kernel 5.4.
-const (
-	// CPU features
-	hwcap_MIPS_MSA = 1 << 1
-)
-
-func doinit() {
-	// HWCAP feature bits
-	MIPS64X.HasMSA = isSet(hwCap, hwcap_MIPS_MSA)
-}
-
-func isSet(hwc uint, value uint) bool {
-	return hwc&value != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go b/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go
deleted file mode 100644
index a428dec9c..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && !arm && !arm64 && !loong64 && !mips64 && !mips64le && !ppc64 && !ppc64le && !s390x && !riscv64
-
-package cpu
-
-func doinit() {}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go b/vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go
deleted file mode 100644
index 197188e67..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && (ppc64 || ppc64le)
-
-package cpu
-
-// HWCAP/HWCAP2 bits. These are exposed by the kernel.
-const (
-	// ISA Level
-	_PPC_FEATURE2_ARCH_2_07 = 0x80000000
-	_PPC_FEATURE2_ARCH_3_00 = 0x00800000
-
-	// CPU features
-	_PPC_FEATURE2_DARN = 0x00200000
-	_PPC_FEATURE2_SCV  = 0x00100000
-)
-
-func doinit() {
-	// HWCAP2 feature bits
-	PPC64.IsPOWER8 = isSet(hwCap2, _PPC_FEATURE2_ARCH_2_07)
-	PPC64.IsPOWER9 = isSet(hwCap2, _PPC_FEATURE2_ARCH_3_00)
-	PPC64.HasDARN = isSet(hwCap2, _PPC_FEATURE2_DARN)
-	PPC64.HasSCV = isSet(hwCap2, _PPC_FEATURE2_SCV)
-}
-
-func isSet(hwc uint, value uint) bool {
-	return hwc&value != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_riscv64.go b/vendor/golang.org/x/sys/cpu/cpu_linux_riscv64.go
deleted file mode 100644
index ad741536f..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_riscv64.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// RISC-V extension discovery code for Linux. The approach here is to first try the riscv_hwprobe
-// syscall falling back to HWCAP to check for the C extension if riscv_hwprobe is not available.
-//
-// A note on detection of the Vector extension using HWCAP.
-//
-// Support for the Vector extension version 1.0 was added to the Linux kernel in release 6.5.
-// Support for the riscv_hwprobe syscall was added in 6.4. It follows that if the riscv_hwprobe
-// syscall is not available then neither is the Vector extension (which needs kernel support).
-// The riscv_hwprobe syscall should then be all we need to detect the Vector extension.
-// However, some RISC-V board manufacturers ship boards with an older kernel on top of which
-// they have back-ported various versions of the Vector extension patches but not the riscv_hwprobe
-// patches. These kernels advertise support for the Vector extension using HWCAP. Falling
-// back to HWCAP to detect the Vector extension, if riscv_hwprobe is not available, or simply not
-// bothering with riscv_hwprobe at all and just using HWCAP may then seem like an attractive option.
-//
-// Unfortunately, simply checking the 'V' bit in AT_HWCAP will not work as this bit is used by
-// RISC-V board and cloud instance providers to mean different things. The Lichee Pi 4A board
-// and the Scaleway RV1 cloud instances use the 'V' bit to advertise their support for the unratified
-// 0.7.1 version of the Vector Specification. The Banana Pi BPI-F3 and the CanMV-K230 board use
-// it to advertise support for 1.0 of the Vector extension. Versions 0.7.1 and 1.0 of the Vector
-// extension are binary incompatible. HWCAP can then not be used in isolation to populate the
-// HasV field as this field indicates that the underlying CPU is compatible with RVV 1.0.
-//
-// There is a way at runtime to distinguish between versions 0.7.1 and 1.0 of the Vector
-// specification by issuing a RVV 1.0 vsetvli instruction and checking the vill bit of the vtype
-// register. This check would allow us to safely detect version 1.0 of the Vector extension
-// with HWCAP, if riscv_hwprobe were not available. However, the check cannot
-// be added until the assembler supports the Vector instructions.
-//
-// Note the riscv_hwprobe syscall does not suffer from these ambiguities by design as all of the
-// extensions it advertises support for are explicitly versioned. It's also worth noting that
-// the riscv_hwprobe syscall is the only way to detect multi-letter RISC-V extensions, e.g., Zba.
-// These cannot be detected using HWCAP and so riscv_hwprobe must be used to detect the majority
-// of RISC-V extensions.
-//
-// Please see https://docs.kernel.org/arch/riscv/hwprobe.html for more information.
-
-// golang.org/x/sys/cpu is not allowed to depend on golang.org/x/sys/unix so we must
-// reproduce the constants, types and functions needed to make the riscv_hwprobe syscall
-// here.
-
-const (
-	// Copied from golang.org/x/sys/unix/ztypes_linux_riscv64.go.
-	riscv_HWPROBE_KEY_IMA_EXT_0   = 0x4
-	riscv_HWPROBE_IMA_C           = 0x2
-	riscv_HWPROBE_IMA_V           = 0x4
-	riscv_HWPROBE_EXT_ZBA         = 0x8
-	riscv_HWPROBE_EXT_ZBB         = 0x10
-	riscv_HWPROBE_EXT_ZBS         = 0x20
-	riscv_HWPROBE_EXT_ZVBB        = 0x20000
-	riscv_HWPROBE_EXT_ZVBC        = 0x40000
-	riscv_HWPROBE_EXT_ZVKB        = 0x80000
-	riscv_HWPROBE_EXT_ZVKG        = 0x100000
-	riscv_HWPROBE_EXT_ZVKNED      = 0x200000
-	riscv_HWPROBE_EXT_ZVKNHB      = 0x800000
-	riscv_HWPROBE_EXT_ZVKSED      = 0x1000000
-	riscv_HWPROBE_EXT_ZVKSH       = 0x2000000
-	riscv_HWPROBE_EXT_ZVKT        = 0x4000000
-	riscv_HWPROBE_KEY_CPUPERF_0   = 0x5
-	riscv_HWPROBE_MISALIGNED_FAST = 0x3
-	riscv_HWPROBE_MISALIGNED_MASK = 0x7
-)
-
-const (
-	// sys_RISCV_HWPROBE is copied from golang.org/x/sys/unix/zsysnum_linux_riscv64.go.
-	sys_RISCV_HWPROBE = 258
-)
-
-// riscvHWProbePairs is copied from golang.org/x/sys/unix/ztypes_linux_riscv64.go.
-type riscvHWProbePairs struct {
-	key   int64
-	value uint64
-}
-
-const (
-	// CPU features
-	hwcap_RISCV_ISA_C = 1 << ('C' - 'A')
-)
-
-func doinit() {
-	// A slice of key/value pair structures is passed to the RISCVHWProbe syscall. The key
-	// field should be initialised with one of the key constants defined above, e.g.,
-	// RISCV_HWPROBE_KEY_IMA_EXT_0. The syscall will set the value field to the appropriate value.
-	// If the kernel does not recognise a key it will set the key field to -1 and the value field to 0.
-
-	pairs := []riscvHWProbePairs{
-		{riscv_HWPROBE_KEY_IMA_EXT_0, 0},
-		{riscv_HWPROBE_KEY_CPUPERF_0, 0},
-	}
-
-	// This call only indicates that extensions are supported if they are implemented on all cores.
-	if riscvHWProbe(pairs, 0) {
-		if pairs[0].key != -1 {
-			v := uint(pairs[0].value)
-			RISCV64.HasC = isSet(v, riscv_HWPROBE_IMA_C)
-			RISCV64.HasV = isSet(v, riscv_HWPROBE_IMA_V)
-			RISCV64.HasZba = isSet(v, riscv_HWPROBE_EXT_ZBA)
-			RISCV64.HasZbb = isSet(v, riscv_HWPROBE_EXT_ZBB)
-			RISCV64.HasZbs = isSet(v, riscv_HWPROBE_EXT_ZBS)
-			RISCV64.HasZvbb = isSet(v, riscv_HWPROBE_EXT_ZVBB)
-			RISCV64.HasZvbc = isSet(v, riscv_HWPROBE_EXT_ZVBC)
-			RISCV64.HasZvkb = isSet(v, riscv_HWPROBE_EXT_ZVKB)
-			RISCV64.HasZvkg = isSet(v, riscv_HWPROBE_EXT_ZVKG)
-			RISCV64.HasZvkt = isSet(v, riscv_HWPROBE_EXT_ZVKT)
-			// Cryptography shorthand extensions
-			RISCV64.HasZvkn = isSet(v, riscv_HWPROBE_EXT_ZVKNED) &&
-				isSet(v, riscv_HWPROBE_EXT_ZVKNHB) && RISCV64.HasZvkb && RISCV64.HasZvkt
-			RISCV64.HasZvknc = RISCV64.HasZvkn && RISCV64.HasZvbc
-			RISCV64.HasZvkng = RISCV64.HasZvkn && RISCV64.HasZvkg
-			RISCV64.HasZvks = isSet(v, riscv_HWPROBE_EXT_ZVKSED) &&
-				isSet(v, riscv_HWPROBE_EXT_ZVKSH) && RISCV64.HasZvkb && RISCV64.HasZvkt
-			RISCV64.HasZvksc = RISCV64.HasZvks && RISCV64.HasZvbc
-			RISCV64.HasZvksg = RISCV64.HasZvks && RISCV64.HasZvkg
-		}
-		if pairs[1].key != -1 {
-			v := pairs[1].value & riscv_HWPROBE_MISALIGNED_MASK
-			RISCV64.HasFastMisaligned = v == riscv_HWPROBE_MISALIGNED_FAST
-		}
-	}
-
-	// Let's double check with HWCAP if the C extension does not appear to be supported.
-	// This may happen if we're running on a kernel older than 6.4.
-
-	if !RISCV64.HasC {
-		RISCV64.HasC = isSet(hwCap, hwcap_RISCV_ISA_C)
-	}
-}
-
-func isSet(hwc uint, value uint) bool {
-	return hwc&value != 0
-}
-
-// riscvHWProbe is a simplified version of the generated wrapper function found in
-// golang.org/x/sys/unix/zsyscall_linux_riscv64.go. We simplify it by removing the
-// cpuCount and cpus parameters which we do not need. We always want to pass 0 for
-// these parameters here so the kernel only reports the extensions that are present
-// on all cores.
-func riscvHWProbe(pairs []riscvHWProbePairs, flags uint) bool {
-	var _zero uintptr
-	var p0 unsafe.Pointer
-	if len(pairs) > 0 {
-		p0 = unsafe.Pointer(&pairs[0])
-	} else {
-		p0 = unsafe.Pointer(&_zero)
-	}
-
-	_, _, e1 := syscall.Syscall6(sys_RISCV_HWPROBE, uintptr(p0), uintptr(len(pairs)), uintptr(0), uintptr(0), uintptr(flags), 0)
-	return e1 == 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_linux_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_linux_s390x.go
deleted file mode 100644
index 1517ac61d..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_linux_s390x.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-const (
-	// bit mask values from /usr/include/bits/hwcap.h
-	hwcap_ZARCH  = 2
-	hwcap_STFLE  = 4
-	hwcap_MSA    = 8
-	hwcap_LDISP  = 16
-	hwcap_EIMM   = 32
-	hwcap_DFP    = 64
-	hwcap_ETF3EH = 256
-	hwcap_VX     = 2048
-	hwcap_VXE    = 8192
-)
-
-func initS390Xbase() {
-	// test HWCAP bit vector
-	has := func(featureMask uint) bool {
-		return hwCap&featureMask == featureMask
-	}
-
-	// mandatory
-	S390X.HasZARCH = has(hwcap_ZARCH)
-
-	// optional
-	S390X.HasSTFLE = has(hwcap_STFLE)
-	S390X.HasLDISP = has(hwcap_LDISP)
-	S390X.HasEIMM = has(hwcap_EIMM)
-	S390X.HasETF3EH = has(hwcap_ETF3EH)
-	S390X.HasDFP = has(hwcap_DFP)
-	S390X.HasMSA = has(hwcap_MSA)
-	S390X.HasVX = has(hwcap_VX)
-	if S390X.HasVX {
-		S390X.HasVXE = has(hwcap_VXE)
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_loong64.go b/vendor/golang.org/x/sys/cpu/cpu_loong64.go
deleted file mode 100644
index 45ecb29ae..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_loong64.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build loong64
-
-package cpu
-
-const cacheLineSize = 64
-
-// Bit fields for CPUCFG registers, Related reference documents:
-// https://loongson.github.io/LoongArch-Documentation/LoongArch-Vol1-EN.html#_cpucfg
-const (
-	// CPUCFG1 bits
-	cpucfg1_CRC32 = 1 << 25
-
-	// CPUCFG2 bits
-	cpucfg2_LAM_BH = 1 << 27
-	cpucfg2_LAMCAS = 1 << 28
-)
-
-func initOptions() {
-	options = []option{
-		{Name: "lsx", Feature: &Loong64.HasLSX},
-		{Name: "lasx", Feature: &Loong64.HasLASX},
-		{Name: "crc32", Feature: &Loong64.HasCRC32},
-		{Name: "lam_bh", Feature: &Loong64.HasLAM_BH},
-		{Name: "lamcas", Feature: &Loong64.HasLAMCAS},
-	}
-
-	// The CPUCFG data on Loong64 only reflects the hardware capabilities,
-	// not the kernel support status, so features such as LSX and LASX that
-	// require kernel support cannot be obtained from the CPUCFG data.
-	//
-	// These features only require hardware capability support and do not
-	// require kernel specific support, so they can be obtained directly
-	// through CPUCFG
-	cfg1 := get_cpucfg(1)
-	cfg2 := get_cpucfg(2)
-
-	Loong64.HasCRC32 = cfgIsSet(cfg1, cpucfg1_CRC32)
-	Loong64.HasLAMCAS = cfgIsSet(cfg2, cpucfg2_LAMCAS)
-	Loong64.HasLAM_BH = cfgIsSet(cfg2, cpucfg2_LAM_BH)
-}
-
-func get_cpucfg(reg uint32) uint32
-
-func cfgIsSet(cfg uint32, val uint32) bool {
-	return cfg&val != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_loong64.s b/vendor/golang.org/x/sys/cpu/cpu_loong64.s
deleted file mode 100644
index 71cbaf1ce..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_loong64.s
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-// func get_cpucfg(reg uint32) uint32
-TEXT ·get_cpucfg(SB), NOSPLIT|NOFRAME, $0
-	MOVW	reg+0(FP), R5
-	// CPUCFG R5, R4 = 0x00006ca4
-	WORD	$0x00006ca4
-	MOVW	R4, ret+8(FP)
-	RET
diff --git a/vendor/golang.org/x/sys/cpu/cpu_mips64x.go b/vendor/golang.org/x/sys/cpu/cpu_mips64x.go
deleted file mode 100644
index fedb00cc4..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_mips64x.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build mips64 || mips64le
-
-package cpu
-
-const cacheLineSize = 32
-
-func initOptions() {
-	options = []option{
-		{Name: "msa", Feature: &MIPS64X.HasMSA},
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_mipsx.go b/vendor/golang.org/x/sys/cpu/cpu_mipsx.go
deleted file mode 100644
index ffb4ec7eb..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_mipsx.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build mips || mipsle
-
-package cpu
-
-const cacheLineSize = 32
-
-func initOptions() {}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_netbsd_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_netbsd_arm64.go
deleted file mode 100644
index ebfb3fc8e..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_netbsd_arm64.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// Minimal copy of functionality from x/sys/unix so the cpu package can call
-// sysctl without depending on x/sys/unix.
-
-const (
-	_CTL_QUERY = -2
-
-	_SYSCTL_VERS_1 = 0x1000000
-)
-
-var _zero uintptr
-
-func sysctl(mib []int32, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, errno := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(_p0),
-		uintptr(len(mib)),
-		uintptr(unsafe.Pointer(old)),
-		uintptr(unsafe.Pointer(oldlen)),
-		uintptr(unsafe.Pointer(new)),
-		uintptr(newlen))
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
-
-type sysctlNode struct {
-	Flags          uint32
-	Num            int32
-	Name           [32]int8
-	Ver            uint32
-	__rsvd         uint32
-	Un             [16]byte
-	_sysctl_size   [8]byte
-	_sysctl_func   [8]byte
-	_sysctl_parent [8]byte
-	_sysctl_desc   [8]byte
-}
-
-func sysctlNodes(mib []int32) ([]sysctlNode, error) {
-	var olen uintptr
-
-	// Get a list of all sysctl nodes below the given MIB by performing
-	// a sysctl for the given MIB with CTL_QUERY appended.
-	mib = append(mib, _CTL_QUERY)
-	qnode := sysctlNode{Flags: _SYSCTL_VERS_1}
-	qp := (*byte)(unsafe.Pointer(&qnode))
-	sz := unsafe.Sizeof(qnode)
-	if err := sysctl(mib, nil, &olen, qp, sz); err != nil {
-		return nil, err
-	}
-
-	// Now that we know the size, get the actual nodes.
-	nodes := make([]sysctlNode, olen/sz)
-	np := (*byte)(unsafe.Pointer(&nodes[0]))
-	if err := sysctl(mib, np, &olen, qp, sz); err != nil {
-		return nil, err
-	}
-
-	return nodes, nil
-}
-
-func nametomib(name string) ([]int32, error) {
-	// Split name into components.
-	var parts []string
-	last := 0
-	for i := 0; i < len(name); i++ {
-		if name[i] == '.' {
-			parts = append(parts, name[last:i])
-			last = i + 1
-		}
-	}
-	parts = append(parts, name[last:])
-
-	mib := []int32{}
-	// Discover the nodes and construct the MIB OID.
-	for partno, part := range parts {
-		nodes, err := sysctlNodes(mib)
-		if err != nil {
-			return nil, err
-		}
-		for _, node := range nodes {
-			n := make([]byte, 0)
-			for i := range node.Name {
-				if node.Name[i] != 0 {
-					n = append(n, byte(node.Name[i]))
-				}
-			}
-			if string(n) == part {
-				mib = append(mib, int32(node.Num))
-				break
-			}
-		}
-		if len(mib) != partno+1 {
-			return nil, err
-		}
-	}
-
-	return mib, nil
-}
-
-// aarch64SysctlCPUID is struct aarch64_sysctl_cpu_id from NetBSD's 
-type aarch64SysctlCPUID struct {
-	midr      uint64 /* Main ID Register */
-	revidr    uint64 /* Revision ID Register */
-	mpidr     uint64 /* Multiprocessor Affinity Register */
-	aa64dfr0  uint64 /* A64 Debug Feature Register 0 */
-	aa64dfr1  uint64 /* A64 Debug Feature Register 1 */
-	aa64isar0 uint64 /* A64 Instruction Set Attribute Register 0 */
-	aa64isar1 uint64 /* A64 Instruction Set Attribute Register 1 */
-	aa64mmfr0 uint64 /* A64 Memory Model Feature Register 0 */
-	aa64mmfr1 uint64 /* A64 Memory Model Feature Register 1 */
-	aa64mmfr2 uint64 /* A64 Memory Model Feature Register 2 */
-	aa64pfr0  uint64 /* A64 Processor Feature Register 0 */
-	aa64pfr1  uint64 /* A64 Processor Feature Register 1 */
-	aa64zfr0  uint64 /* A64 SVE Feature ID Register 0 */
-	mvfr0     uint32 /* Media and VFP Feature Register 0 */
-	mvfr1     uint32 /* Media and VFP Feature Register 1 */
-	mvfr2     uint32 /* Media and VFP Feature Register 2 */
-	pad       uint32
-	clidr     uint64 /* Cache Level ID Register */
-	ctr       uint64 /* Cache Type Register */
-}
-
-func sysctlCPUID(name string) (*aarch64SysctlCPUID, error) {
-	mib, err := nametomib(name)
-	if err != nil {
-		return nil, err
-	}
-
-	out := aarch64SysctlCPUID{}
-	n := unsafe.Sizeof(out)
-	_, _, errno := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(len(mib)),
-		uintptr(unsafe.Pointer(&out)),
-		uintptr(unsafe.Pointer(&n)),
-		uintptr(0),
-		uintptr(0))
-	if errno != 0 {
-		return nil, errno
-	}
-	return &out, nil
-}
-
-func doinit() {
-	cpuid, err := sysctlCPUID("machdep.cpu0.cpu_id")
-	if err != nil {
-		setMinimalFeatures()
-		return
-	}
-	parseARM64SystemRegisters(cpuid.aa64isar0, cpuid.aa64isar1, cpuid.aa64pfr0)
-
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.go
deleted file mode 100644
index 85b64d5cc..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// Minimal copy of functionality from x/sys/unix so the cpu package can call
-// sysctl without depending on x/sys/unix.
-
-const (
-	// From OpenBSD's sys/sysctl.h.
-	_CTL_MACHDEP = 7
-
-	// From OpenBSD's machine/cpu.h.
-	_CPU_ID_AA64ISAR0 = 2
-	_CPU_ID_AA64ISAR1 = 3
-)
-
-// Implemented in the runtime package (runtime/sys_openbsd3.go)
-func syscall_syscall6(fn, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-//go:linkname syscall_syscall6 syscall.syscall6
-
-func sysctl(mib []uint32, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	_, _, errno := syscall_syscall6(libc_sysctl_trampoline_addr, uintptr(unsafe.Pointer(&mib[0])), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-//go:cgo_import_dynamic libc_sysctl sysctl "libc.so"
-
-func sysctlUint64(mib []uint32) (uint64, bool) {
-	var out uint64
-	nout := unsafe.Sizeof(out)
-	if err := sysctl(mib, (*byte)(unsafe.Pointer(&out)), &nout, nil, 0); err != nil {
-		return 0, false
-	}
-	return out, true
-}
-
-func doinit() {
-	setMinimalFeatures()
-
-	// Get ID_AA64ISAR0 and ID_AA64ISAR1 from sysctl.
-	isar0, ok := sysctlUint64([]uint32{_CTL_MACHDEP, _CPU_ID_AA64ISAR0})
-	if !ok {
-		return
-	}
-	isar1, ok := sysctlUint64([]uint32{_CTL_MACHDEP, _CPU_ID_AA64ISAR1})
-	if !ok {
-		return
-	}
-	parseARM64SystemRegisters(isar0, isar1, 0)
-
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.s b/vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.s
deleted file mode 100644
index 054ba05d6..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.s
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
-	JMP	libc_sysctl(SB)
-
-GLOBL	·libc_sysctl_trampoline_addr(SB), RODATA, $8
-DATA	·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_arm.go b/vendor/golang.org/x/sys/cpu/cpu_other_arm.go
deleted file mode 100644
index e9ecf2a45..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_other_arm.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !linux && arm
-
-package cpu
-
-func archInit() {}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go
deleted file mode 100644
index 6c7c5bfd5..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !darwin && !linux && !netbsd && !openbsd && !windows && arm64
-
-package cpu
-
-func doinit() {
-	setMinimalFeatures()
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_mips64x.go b/vendor/golang.org/x/sys/cpu/cpu_other_mips64x.go
deleted file mode 100644
index 5f8f2419a..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_other_mips64x.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !linux && (mips64 || mips64le)
-
-package cpu
-
-func archInit() {
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go b/vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go
deleted file mode 100644
index 89608fba2..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !aix && !linux && (ppc64 || ppc64le)
-
-package cpu
-
-func archInit() {
-	PPC64.IsPOWER8 = true
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_riscv64.go b/vendor/golang.org/x/sys/cpu/cpu_other_riscv64.go
deleted file mode 100644
index 5ab87808f..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_other_riscv64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !linux && riscv64
-
-package cpu
-
-func archInit() {
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_x86.go b/vendor/golang.org/x/sys/cpu/cpu_other_x86.go
deleted file mode 100644
index a0fd7e2f7..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_other_x86.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build 386 || amd64p32 || (amd64 && (!darwin || !gc))
-
-package cpu
-
-func darwinSupportsAVX512() bool {
-	panic("only implemented for gc && amd64 && darwin")
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_ppc64x.go b/vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
deleted file mode 100644
index c14f12b14..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build ppc64 || ppc64le
-
-package cpu
-
-const cacheLineSize = 128
-
-func initOptions() {
-	options = []option{
-		{Name: "darn", Feature: &PPC64.HasDARN},
-		{Name: "scv", Feature: &PPC64.HasSCV},
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_riscv64.go b/vendor/golang.org/x/sys/cpu/cpu_riscv64.go
deleted file mode 100644
index 0f617aef5..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_riscv64.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build riscv64
-
-package cpu
-
-const cacheLineSize = 64
-
-func initOptions() {
-	options = []option{
-		{Name: "fastmisaligned", Feature: &RISCV64.HasFastMisaligned},
-		{Name: "c", Feature: &RISCV64.HasC},
-		{Name: "v", Feature: &RISCV64.HasV},
-		{Name: "zba", Feature: &RISCV64.HasZba},
-		{Name: "zbb", Feature: &RISCV64.HasZbb},
-		{Name: "zbs", Feature: &RISCV64.HasZbs},
-		// RISC-V Cryptography Extensions
-		{Name: "zvbb", Feature: &RISCV64.HasZvbb},
-		{Name: "zvbc", Feature: &RISCV64.HasZvbc},
-		{Name: "zvkb", Feature: &RISCV64.HasZvkb},
-		{Name: "zvkg", Feature: &RISCV64.HasZvkg},
-		{Name: "zvkt", Feature: &RISCV64.HasZvkt},
-		{Name: "zvkn", Feature: &RISCV64.HasZvkn},
-		{Name: "zvknc", Feature: &RISCV64.HasZvknc},
-		{Name: "zvkng", Feature: &RISCV64.HasZvkng},
-		{Name: "zvks", Feature: &RISCV64.HasZvks},
-		{Name: "zvksc", Feature: &RISCV64.HasZvksc},
-		{Name: "zvksg", Feature: &RISCV64.HasZvksg},
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_s390x.go
deleted file mode 100644
index 5881b8833..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_s390x.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-const cacheLineSize = 256
-
-func initOptions() {
-	options = []option{
-		{Name: "zarch", Feature: &S390X.HasZARCH, Required: true},
-		{Name: "stfle", Feature: &S390X.HasSTFLE, Required: true},
-		{Name: "ldisp", Feature: &S390X.HasLDISP, Required: true},
-		{Name: "eimm", Feature: &S390X.HasEIMM, Required: true},
-		{Name: "dfp", Feature: &S390X.HasDFP},
-		{Name: "etf3eh", Feature: &S390X.HasETF3EH},
-		{Name: "msa", Feature: &S390X.HasMSA},
-		{Name: "aes", Feature: &S390X.HasAES},
-		{Name: "aescbc", Feature: &S390X.HasAESCBC},
-		{Name: "aesctr", Feature: &S390X.HasAESCTR},
-		{Name: "aesgcm", Feature: &S390X.HasAESGCM},
-		{Name: "ghash", Feature: &S390X.HasGHASH},
-		{Name: "sha1", Feature: &S390X.HasSHA1},
-		{Name: "sha256", Feature: &S390X.HasSHA256},
-		{Name: "sha3", Feature: &S390X.HasSHA3},
-		{Name: "sha512", Feature: &S390X.HasSHA512},
-		{Name: "vx", Feature: &S390X.HasVX},
-		{Name: "vxe", Feature: &S390X.HasVXE},
-	}
-}
-
-// bitIsSet reports whether the bit at index is set. The bit index
-// is in big endian order, so bit index 0 is the leftmost bit.
-func bitIsSet(bits []uint64, index uint) bool {
-	return bits[index/64]&((1<<63)>>(index%64)) != 0
-}
-
-// facility is a bit index for the named facility.
-type facility uint8
-
-const (
-	// mandatory facilities
-	zarch  facility = 1  // z architecture mode is active
-	stflef facility = 7  // store-facility-list-extended
-	ldisp  facility = 18 // long-displacement
-	eimm   facility = 21 // extended-immediate
-
-	// miscellaneous facilities
-	dfp    facility = 42 // decimal-floating-point
-	etf3eh facility = 30 // extended-translation 3 enhancement
-
-	// cryptography facilities
-	msa  facility = 17  // message-security-assist
-	msa3 facility = 76  // message-security-assist extension 3
-	msa4 facility = 77  // message-security-assist extension 4
-	msa5 facility = 57  // message-security-assist extension 5
-	msa8 facility = 146 // message-security-assist extension 8
-	msa9 facility = 155 // message-security-assist extension 9
-
-	// vector facilities
-	vx   facility = 129 // vector facility
-	vxe  facility = 135 // vector-enhancements 1
-	vxe2 facility = 148 // vector-enhancements 2
-)
-
-// facilityList contains the result of an STFLE call.
-// Bits are numbered in big endian order so the
-// leftmost bit (the MSB) is at index 0.
-type facilityList struct {
-	bits [4]uint64
-}
-
-// Has reports whether the given facilities are present.
-func (s *facilityList) Has(fs ...facility) bool {
-	if len(fs) == 0 {
-		panic("no facility bits provided")
-	}
-	for _, f := range fs {
-		if !bitIsSet(s.bits[:], uint(f)) {
-			return false
-		}
-	}
-	return true
-}
-
-// function is the code for the named cryptographic function.
-type function uint8
-
-const (
-	// KM{,A,C,CTR} function codes
-	aes128 function = 18 // AES-128
-	aes192 function = 19 // AES-192
-	aes256 function = 20 // AES-256
-
-	// K{I,L}MD function codes
-	sha1     function = 1  // SHA-1
-	sha256   function = 2  // SHA-256
-	sha512   function = 3  // SHA-512
-	sha3_224 function = 32 // SHA3-224
-	sha3_256 function = 33 // SHA3-256
-	sha3_384 function = 34 // SHA3-384
-	sha3_512 function = 35 // SHA3-512
-	shake128 function = 36 // SHAKE-128
-	shake256 function = 37 // SHAKE-256
-
-	// KLMD function codes
-	ghash function = 65 // GHASH
-)
-
-// queryResult contains the result of a Query function
-// call. Bits are numbered in big endian order so the
-// leftmost bit (the MSB) is at index 0.
-type queryResult struct {
-	bits [2]uint64
-}
-
-// Has reports whether the given functions are present.
-func (q *queryResult) Has(fns ...function) bool {
-	if len(fns) == 0 {
-		panic("no function codes provided")
-	}
-	for _, f := range fns {
-		if !bitIsSet(q.bits[:], uint(f)) {
-			return false
-		}
-	}
-	return true
-}
-
-func doinit() {
-	initS390Xbase()
-
-	// We need implementations of stfle, km and so on
-	// to detect cryptographic features.
-	if !haveAsmFunctions() {
-		return
-	}
-
-	// optional cryptographic functions
-	if S390X.HasMSA {
-		aes := []function{aes128, aes192, aes256}
-
-		// cipher message
-		km, kmc := kmQuery(), kmcQuery()
-		S390X.HasAES = km.Has(aes...)
-		S390X.HasAESCBC = kmc.Has(aes...)
-		if S390X.HasSTFLE {
-			facilities := stfle()
-			if facilities.Has(msa4) {
-				kmctr := kmctrQuery()
-				S390X.HasAESCTR = kmctr.Has(aes...)
-			}
-			if facilities.Has(msa8) {
-				kma := kmaQuery()
-				S390X.HasAESGCM = kma.Has(aes...)
-			}
-		}
-
-		// compute message digest
-		kimd := kimdQuery() // intermediate (no padding)
-		klmd := klmdQuery() // last (padding)
-		S390X.HasSHA1 = kimd.Has(sha1) && klmd.Has(sha1)
-		S390X.HasSHA256 = kimd.Has(sha256) && klmd.Has(sha256)
-		S390X.HasSHA512 = kimd.Has(sha512) && klmd.Has(sha512)
-		S390X.HasGHASH = kimd.Has(ghash) // KLMD-GHASH does not exist
-		sha3 := []function{
-			sha3_224, sha3_256, sha3_384, sha3_512,
-			shake128, shake256,
-		}
-		S390X.HasSHA3 = kimd.Has(sha3...) && klmd.Has(sha3...)
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_s390x.s b/vendor/golang.org/x/sys/cpu/cpu_s390x.s
deleted file mode 100644
index 1fb4b7013..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_s390x.s
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build gc
-
-#include "textflag.h"
-
-// func stfle() facilityList
-TEXT ·stfle(SB), NOSPLIT|NOFRAME, $0-32
-	MOVD $ret+0(FP), R1
-	MOVD $3, R0          // last doubleword index to store
-	XC   $32, (R1), (R1) // clear 4 doublewords (32 bytes)
-	WORD $0xb2b01000     // store facility list extended (STFLE)
-	RET
-
-// func kmQuery() queryResult
-TEXT ·kmQuery(SB), NOSPLIT|NOFRAME, $0-16
-	MOVD $0, R0         // set function code to 0 (KM-Query)
-	MOVD $ret+0(FP), R1 // address of 16-byte return value
-	WORD $0xB92E0024    // cipher message (KM)
-	RET
-
-// func kmcQuery() queryResult
-TEXT ·kmcQuery(SB), NOSPLIT|NOFRAME, $0-16
-	MOVD $0, R0         // set function code to 0 (KMC-Query)
-	MOVD $ret+0(FP), R1 // address of 16-byte return value
-	WORD $0xB92F0024    // cipher message with chaining (KMC)
-	RET
-
-// func kmctrQuery() queryResult
-TEXT ·kmctrQuery(SB), NOSPLIT|NOFRAME, $0-16
-	MOVD $0, R0         // set function code to 0 (KMCTR-Query)
-	MOVD $ret+0(FP), R1 // address of 16-byte return value
-	WORD $0xB92D4024    // cipher message with counter (KMCTR)
-	RET
-
-// func kmaQuery() queryResult
-TEXT ·kmaQuery(SB), NOSPLIT|NOFRAME, $0-16
-	MOVD $0, R0         // set function code to 0 (KMA-Query)
-	MOVD $ret+0(FP), R1 // address of 16-byte return value
-	WORD $0xb9296024    // cipher message with authentication (KMA)
-	RET
-
-// func kimdQuery() queryResult
-TEXT ·kimdQuery(SB), NOSPLIT|NOFRAME, $0-16
-	MOVD $0, R0         // set function code to 0 (KIMD-Query)
-	MOVD $ret+0(FP), R1 // address of 16-byte return value
-	WORD $0xB93E0024    // compute intermediate message digest (KIMD)
-	RET
-
-// func klmdQuery() queryResult
-TEXT ·klmdQuery(SB), NOSPLIT|NOFRAME, $0-16
-	MOVD $0, R0         // set function code to 0 (KLMD-Query)
-	MOVD $ret+0(FP), R1 // address of 16-byte return value
-	WORD $0xB93F0024    // compute last message digest (KLMD)
-	RET
diff --git a/vendor/golang.org/x/sys/cpu/cpu_wasm.go b/vendor/golang.org/x/sys/cpu/cpu_wasm.go
deleted file mode 100644
index 384787ea3..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_wasm.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build wasm
-
-package cpu
-
-// We're compiling the cpu package for an unknown (software-abstracted) CPU.
-// Make CacheLinePad an empty struct and hope that the usual struct alignment
-// rules are good enough.
-
-const cacheLineSize = 0
-
-func initOptions() {}
-
-func archInit() {}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_windows_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_windows_arm64.go
deleted file mode 100644
index d09e85a36..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_windows_arm64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2026 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"golang.org/x/sys/windows"
-)
-
-func doinit() {
-	// set HasASIMD and HasFP to true as per
-	// https://learn.microsoft.com/en-us/cpp/build/arm64-windows-abi-conventions?view=msvc-170#base-requirements
-	//
-	// The ARM64 version of Windows always presupposes that it's running on an ARMv8 or later architecture.
-	// Both floating-point and NEON support are presumed to be present in hardware.
-	//
-	ARM64.HasASIMD = true
-	ARM64.HasFP = true
-
-	if windows.IsProcessorFeaturePresent(windows.PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) {
-		ARM64.HasAES = true
-		ARM64.HasPMULL = true
-		ARM64.HasSHA1 = true
-		ARM64.HasSHA2 = true
-	}
-	ARM64.HasSHA3 = windows.IsProcessorFeaturePresent(windows.PF_ARM_SHA3_INSTRUCTIONS_AVAILABLE)
-	ARM64.HasCRC32 = windows.IsProcessorFeaturePresent(windows.PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE)
-	ARM64.HasSHA512 = windows.IsProcessorFeaturePresent(windows.PF_ARM_SHA512_INSTRUCTIONS_AVAILABLE)
-	ARM64.HasATOMICS = windows.IsProcessorFeaturePresent(windows.PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE)
-	if windows.IsProcessorFeaturePresent(windows.PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) {
-		ARM64.HasASIMDDP = true
-		ARM64.HasASIMDRDM = true
-	}
-	if windows.IsProcessorFeaturePresent(windows.PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE) {
-		ARM64.HasLRCPC = true
-		ARM64.HasSM3 = true
-	}
-	ARM64.HasSVE = windows.IsProcessorFeaturePresent(windows.PF_ARM_SVE_INSTRUCTIONS_AVAILABLE)
-	ARM64.HasSVE2 = windows.IsProcessorFeaturePresent(windows.PF_ARM_SVE2_INSTRUCTIONS_AVAILABLE)
-	ARM64.HasJSCVT = windows.IsProcessorFeaturePresent(windows.PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE)
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_x86.go b/vendor/golang.org/x/sys/cpu/cpu_x86.go
deleted file mode 100644
index f5723d4f7..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_x86.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build 386 || amd64 || amd64p32
-
-package cpu
-
-import "runtime"
-
-const cacheLineSize = 64
-
-func initOptions() {
-	options = []option{
-		{Name: "adx", Feature: &X86.HasADX},
-		{Name: "aes", Feature: &X86.HasAES},
-		{Name: "avx", Feature: &X86.HasAVX},
-		{Name: "avx2", Feature: &X86.HasAVX2},
-		{Name: "avx512", Feature: &X86.HasAVX512},
-		{Name: "avx512f", Feature: &X86.HasAVX512F},
-		{Name: "avx512cd", Feature: &X86.HasAVX512CD},
-		{Name: "avx512er", Feature: &X86.HasAVX512ER},
-		{Name: "avx512pf", Feature: &X86.HasAVX512PF},
-		{Name: "avx512vl", Feature: &X86.HasAVX512VL},
-		{Name: "avx512bw", Feature: &X86.HasAVX512BW},
-		{Name: "avx512dq", Feature: &X86.HasAVX512DQ},
-		{Name: "avx512ifma", Feature: &X86.HasAVX512IFMA},
-		{Name: "avx512vbmi", Feature: &X86.HasAVX512VBMI},
-		{Name: "avx512vnniw", Feature: &X86.HasAVX5124VNNIW},
-		{Name: "avx5124fmaps", Feature: &X86.HasAVX5124FMAPS},
-		{Name: "avx512vpopcntdq", Feature: &X86.HasAVX512VPOPCNTDQ},
-		{Name: "avx512vpclmulqdq", Feature: &X86.HasAVX512VPCLMULQDQ},
-		{Name: "avx512vnni", Feature: &X86.HasAVX512VNNI},
-		{Name: "avx512gfni", Feature: &X86.HasAVX512GFNI},
-		{Name: "avx512vaes", Feature: &X86.HasAVX512VAES},
-		{Name: "avx512vbmi2", Feature: &X86.HasAVX512VBMI2},
-		{Name: "avx512bitalg", Feature: &X86.HasAVX512BITALG},
-		{Name: "avx512bf16", Feature: &X86.HasAVX512BF16},
-		{Name: "amxtile", Feature: &X86.HasAMXTile},
-		{Name: "amxint8", Feature: &X86.HasAMXInt8},
-		{Name: "amxbf16", Feature: &X86.HasAMXBF16},
-		{Name: "bmi1", Feature: &X86.HasBMI1},
-		{Name: "bmi2", Feature: &X86.HasBMI2},
-		{Name: "cx16", Feature: &X86.HasCX16},
-		{Name: "erms", Feature: &X86.HasERMS},
-		{Name: "fma", Feature: &X86.HasFMA},
-		{Name: "osxsave", Feature: &X86.HasOSXSAVE},
-		{Name: "pclmulqdq", Feature: &X86.HasPCLMULQDQ},
-		{Name: "popcnt", Feature: &X86.HasPOPCNT},
-		{Name: "rdrand", Feature: &X86.HasRDRAND},
-		{Name: "rdseed", Feature: &X86.HasRDSEED},
-		{Name: "sse3", Feature: &X86.HasSSE3},
-		{Name: "sse41", Feature: &X86.HasSSE41},
-		{Name: "sse42", Feature: &X86.HasSSE42},
-		{Name: "ssse3", Feature: &X86.HasSSSE3},
-		{Name: "avxifma", Feature: &X86.HasAVXIFMA},
-		{Name: "avxvnni", Feature: &X86.HasAVXVNNI},
-		{Name: "avxvnniint8", Feature: &X86.HasAVXVNNIInt8},
-
-		// These capabilities should always be enabled on amd64:
-		{Name: "sse2", Feature: &X86.HasSSE2, Required: runtime.GOARCH == "amd64"},
-	}
-}
-
-func archInit() {
-
-	// From internal/cpu
-	const (
-		// eax bits
-		cpuid_AVXVNNI = 1 << 4
-
-		// ecx bits
-		cpuid_SSE3            = 1 << 0
-		cpuid_PCLMULQDQ       = 1 << 1
-		cpuid_AVX512VBMI      = 1 << 1
-		cpuid_AVX512VBMI2     = 1 << 6
-		cpuid_SSSE3           = 1 << 9
-		cpuid_AVX512GFNI      = 1 << 8
-		cpuid_AVX512VAES      = 1 << 9
-		cpuid_AVX512VNNI      = 1 << 11
-		cpuid_AVX512BITALG    = 1 << 12
-		cpuid_FMA             = 1 << 12
-		cpuid_AVX512VPOPCNTDQ = 1 << 14
-		cpuid_SSE41           = 1 << 19
-		cpuid_SSE42           = 1 << 20
-		cpuid_POPCNT          = 1 << 23
-		cpuid_AES             = 1 << 25
-		cpuid_OSXSAVE         = 1 << 27
-		cpuid_AVX             = 1 << 28
-
-		// "Extended Feature Flag" bits returned in EBX for CPUID EAX=0x7 ECX=0x0
-		cpuid_BMI1     = 1 << 3
-		cpuid_AVX2     = 1 << 5
-		cpuid_BMI2     = 1 << 8
-		cpuid_ERMS     = 1 << 9
-		cpuid_AVX512F  = 1 << 16
-		cpuid_AVX512DQ = 1 << 17
-		cpuid_ADX      = 1 << 19
-		cpuid_AVX512CD = 1 << 28
-		cpuid_SHA      = 1 << 29
-		cpuid_AVX512BW = 1 << 30
-		cpuid_AVX512VL = 1 << 31
-
-		// "Extended Feature Flag" bits returned in ECX for CPUID EAX=0x7 ECX=0x0
-		cpuid_AVX512_VBMI      = 1 << 1
-		cpuid_AVX512_VBMI2     = 1 << 6
-		cpuid_GFNI             = 1 << 8
-		cpuid_AVX512VPCLMULQDQ = 1 << 10
-		cpuid_AVX512_BITALG    = 1 << 12
-
-		// edx bits
-		cpuid_FSRM = 1 << 4
-		// edx bits for CPUID 0x80000001
-		cpuid_RDTSCP = 1 << 27
-	)
-	// Additional constants not in internal/cpu
-	const (
-		// eax=1: edx
-		cpuid_SSE2 = 1 << 26
-		// eax=1: ecx
-		cpuid_CX16   = 1 << 13
-		cpuid_RDRAND = 1 << 30
-		// eax=7,ecx=0: ebx
-		cpuid_RDSEED     = 1 << 18
-		cpuid_AVX512IFMA = 1 << 21
-		cpuid_AVX512PF   = 1 << 26
-		cpuid_AVX512ER   = 1 << 27
-		// eax=7,ecx=0: edx
-		cpuid_AVX5124VNNIW = 1 << 2
-		cpuid_AVX5124FMAPS = 1 << 3
-		cpuid_AMXBF16      = 1 << 22
-		cpuid_AMXTile      = 1 << 24
-		cpuid_AMXInt8      = 1 << 25
-		// eax=7,ecx=1: eax
-		cpuid_AVX512BF16 = 1 << 5
-		cpuid_AVXIFMA    = 1 << 23
-		// eax=7,ecx=1: edx
-		cpuid_AVXVNNIInt8 = 1 << 4
-	)
-
-	Initialized = true
-
-	maxID, _, _, _ := cpuid(0, 0)
-
-	if maxID < 1 {
-		return
-	}
-
-	_, _, ecx1, edx1 := cpuid(1, 0)
-	X86.HasSSE2 = isSet(edx1, cpuid_SSE2)
-
-	X86.HasSSE3 = isSet(ecx1, cpuid_SSE3)
-	X86.HasPCLMULQDQ = isSet(ecx1, cpuid_PCLMULQDQ)
-	X86.HasSSSE3 = isSet(ecx1, cpuid_SSSE3)
-	X86.HasFMA = isSet(ecx1, cpuid_FMA)
-	X86.HasCX16 = isSet(ecx1, cpuid_CX16)
-	X86.HasSSE41 = isSet(ecx1, cpuid_SSE41)
-	X86.HasSSE42 = isSet(ecx1, cpuid_SSE42)
-	X86.HasPOPCNT = isSet(ecx1, cpuid_POPCNT)
-	X86.HasAES = isSet(ecx1, cpuid_AES)
-	X86.HasOSXSAVE = isSet(ecx1, cpuid_OSXSAVE)
-	X86.HasRDRAND = isSet(ecx1, cpuid_RDRAND)
-
-	var osSupportsAVX, osSupportsAVX512 bool
-	// For XGETBV, OSXSAVE bit is required and sufficient.
-	if X86.HasOSXSAVE {
-		eax, _ := xgetbv()
-		// Check if XMM and YMM registers have OS support.
-		osSupportsAVX = isSet(eax, 1<<1) && isSet(eax, 1<<2)
-
-		if runtime.GOOS == "darwin" {
-			// Darwin requires special AVX512 checks, see cpu_darwin_x86.go
-			osSupportsAVX512 = osSupportsAVX && darwinSupportsAVX512()
-		} else {
-			// Check if OPMASK and ZMM registers have OS support.
-			osSupportsAVX512 = osSupportsAVX && isSet(eax, 1<<5) && isSet(eax, 1<<6) && isSet(eax, 1<<7)
-		}
-	}
-
-	X86.HasAVX = isSet(ecx1, cpuid_AVX) && osSupportsAVX
-
-	if maxID < 7 {
-		return
-	}
-
-	eax7, ebx7, ecx7, edx7 := cpuid(7, 0)
-	X86.HasBMI1 = isSet(ebx7, cpuid_BMI1)
-	X86.HasAVX2 = isSet(ebx7, cpuid_AVX2) && osSupportsAVX
-	X86.HasBMI2 = isSet(ebx7, cpuid_BMI2)
-	X86.HasERMS = isSet(ebx7, cpuid_ERMS)
-	X86.HasRDSEED = isSet(ebx7, cpuid_RDSEED)
-	X86.HasADX = isSet(ebx7, cpuid_ADX)
-
-	X86.HasAVX512 = isSet(ebx7, cpuid_AVX512F) && osSupportsAVX512 // Because avx-512 foundation is the core required extension
-	if X86.HasAVX512 {
-		X86.HasAVX512F = true
-		X86.HasAVX512CD = isSet(ebx7, cpuid_AVX512CD)
-		X86.HasAVX512ER = isSet(ebx7, cpuid_AVX512ER)
-		X86.HasAVX512PF = isSet(ebx7, cpuid_AVX512PF)
-		X86.HasAVX512VL = isSet(ebx7, cpuid_AVX512VL)
-		X86.HasAVX512BW = isSet(ebx7, cpuid_AVX512BW)
-		X86.HasAVX512DQ = isSet(ebx7, cpuid_AVX512DQ)
-		X86.HasAVX512IFMA = isSet(ebx7, cpuid_AVX512IFMA)
-		X86.HasAVX512VBMI = isSet(ecx7, cpuid_AVX512_VBMI)
-		X86.HasAVX5124VNNIW = isSet(edx7, cpuid_AVX5124VNNIW)
-		X86.HasAVX5124FMAPS = isSet(edx7, cpuid_AVX5124FMAPS)
-		X86.HasAVX512VPOPCNTDQ = isSet(ecx7, cpuid_AVX512VPOPCNTDQ)
-		X86.HasAVX512VPCLMULQDQ = isSet(ecx7, cpuid_AVX512VPCLMULQDQ)
-		X86.HasAVX512VNNI = isSet(ecx7, cpuid_AVX512VNNI)
-		X86.HasAVX512GFNI = isSet(ecx7, cpuid_AVX512GFNI)
-		X86.HasAVX512VAES = isSet(ecx7, cpuid_AVX512VAES)
-		X86.HasAVX512VBMI2 = isSet(ecx7, cpuid_AVX512VBMI2)
-		X86.HasAVX512BITALG = isSet(ecx7, cpuid_AVX512BITALG)
-	}
-
-	X86.HasAMXTile = isSet(edx7, cpuid_AMXTile)
-	X86.HasAMXInt8 = isSet(edx7, cpuid_AMXInt8)
-	X86.HasAMXBF16 = isSet(edx7, cpuid_AMXBF16)
-
-	// These features depend on the second level of extended features.
-	if eax7 >= 1 {
-		eax71, _, _, edx71 := cpuid(7, 1)
-		if X86.HasAVX512 {
-			X86.HasAVX512BF16 = isSet(eax71, cpuid_AVX512BF16)
-		}
-		if X86.HasAVX {
-			X86.HasAVXIFMA = isSet(eax71, cpuid_AVXIFMA)
-			X86.HasAVXVNNI = isSet(eax71, cpuid_AVXVNNI)
-			X86.HasAVXVNNIInt8 = isSet(edx71, cpuid_AVXVNNIInt8)
-		}
-	}
-}
-
-func isSet(hwc uint32, value uint32) bool {
-	return hwc&value != 0
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_zos.go b/vendor/golang.org/x/sys/cpu/cpu_zos.go
deleted file mode 100644
index 5f54683a2..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_zos.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-func archInit() {
-	doinit()
-	Initialized = true
-}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_zos_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_zos_s390x.go
deleted file mode 100644
index ccb1b708a..000000000
--- a/vendor/golang.org/x/sys/cpu/cpu_zos_s390x.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-func initS390Xbase() {
-	// get the facilities list
-	facilities := stfle()
-
-	// mandatory
-	S390X.HasZARCH = facilities.Has(zarch)
-	S390X.HasSTFLE = facilities.Has(stflef)
-	S390X.HasLDISP = facilities.Has(ldisp)
-	S390X.HasEIMM = facilities.Has(eimm)
-
-	// optional
-	S390X.HasETF3EH = facilities.Has(etf3eh)
-	S390X.HasDFP = facilities.Has(dfp)
-	S390X.HasMSA = facilities.Has(msa)
-	S390X.HasVX = facilities.Has(vx)
-	if S390X.HasVX {
-		S390X.HasVXE = facilities.Has(vxe)
-	}
-}
diff --git a/vendor/golang.org/x/sys/cpu/endian_big.go b/vendor/golang.org/x/sys/cpu/endian_big.go
deleted file mode 100644
index 7fe04b0a1..000000000
--- a/vendor/golang.org/x/sys/cpu/endian_big.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build armbe || arm64be || m68k || mips || mips64 || mips64p32 || ppc || ppc64 || s390 || s390x || shbe || sparc || sparc64
-
-package cpu
-
-// IsBigEndian records whether the GOARCH's byte order is big endian.
-const IsBigEndian = true
diff --git a/vendor/golang.org/x/sys/cpu/endian_little.go b/vendor/golang.org/x/sys/cpu/endian_little.go
deleted file mode 100644
index 48eccc4c7..000000000
--- a/vendor/golang.org/x/sys/cpu/endian_little.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh || wasm
-
-package cpu
-
-// IsBigEndian records whether the GOARCH's byte order is big endian.
-const IsBigEndian = false
diff --git a/vendor/golang.org/x/sys/cpu/hwcap_linux.go b/vendor/golang.org/x/sys/cpu/hwcap_linux.go
deleted file mode 100644
index 34e49f955..000000000
--- a/vendor/golang.org/x/sys/cpu/hwcap_linux.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import (
-	"os"
-)
-
-const (
-	_AT_HWCAP  = 16
-	_AT_HWCAP2 = 26
-
-	procAuxv = "/proc/self/auxv"
-
-	uintSize = int(32 << (^uint(0) >> 63))
-)
-
-// For those platforms don't have a 'cpuid' equivalent we use HWCAP/HWCAP2
-// These are initialized in cpu_$GOARCH.go
-// and should not be changed after they are initialized.
-var hwCap uint
-var hwCap2 uint
-
-func readHWCAP() error {
-	// For Go 1.21+, get auxv from the Go runtime.
-	if a := getAuxv(); len(a) > 0 {
-		for len(a) >= 2 {
-			tag, val := a[0], uint(a[1])
-			a = a[2:]
-			switch tag {
-			case _AT_HWCAP:
-				hwCap = val
-			case _AT_HWCAP2:
-				hwCap2 = val
-			}
-		}
-		return nil
-	}
-
-	buf, err := os.ReadFile(procAuxv)
-	if err != nil {
-		// e.g. on android /proc/self/auxv is not accessible, so silently
-		// ignore the error and leave Initialized = false. On some
-		// architectures (e.g. arm64) doinit() implements a fallback
-		// readout and will set Initialized = true again.
-		return err
-	}
-	bo := hostByteOrder()
-	for len(buf) >= 2*(uintSize/8) {
-		var tag, val uint
-		switch uintSize {
-		case 32:
-			tag = uint(bo.Uint32(buf[0:]))
-			val = uint(bo.Uint32(buf[4:]))
-			buf = buf[8:]
-		case 64:
-			tag = uint(bo.Uint64(buf[0:]))
-			val = uint(bo.Uint64(buf[8:]))
-			buf = buf[16:]
-		}
-		switch tag {
-		case _AT_HWCAP:
-			hwCap = val
-		case _AT_HWCAP2:
-			hwCap2 = val
-		}
-	}
-	return nil
-}
diff --git a/vendor/golang.org/x/sys/cpu/parse.go b/vendor/golang.org/x/sys/cpu/parse.go
deleted file mode 100644
index 56a7e1a17..000000000
--- a/vendor/golang.org/x/sys/cpu/parse.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-import "strconv"
-
-// parseRelease parses a dot-separated version number. It follows the semver
-// syntax, but allows the minor and patch versions to be elided.
-//
-// This is a copy of the Go runtime's parseRelease from
-// https://golang.org/cl/209597.
-func parseRelease(rel string) (major, minor, patch int, ok bool) {
-	// Strip anything after a dash or plus.
-	for i := range len(rel) {
-		if rel[i] == '-' || rel[i] == '+' {
-			rel = rel[:i]
-			break
-		}
-	}
-
-	next := func() (int, bool) {
-		for i := range len(rel) {
-			if rel[i] == '.' {
-				ver, err := strconv.Atoi(rel[:i])
-				rel = rel[i+1:]
-				return ver, err == nil
-			}
-		}
-		ver, err := strconv.Atoi(rel)
-		rel = ""
-		return ver, err == nil
-	}
-	if major, ok = next(); !ok || rel == "" {
-		return
-	}
-	if minor, ok = next(); !ok || rel == "" {
-		return
-	}
-	patch, ok = next()
-	return
-}
diff --git a/vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go b/vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go
deleted file mode 100644
index 4cd64c704..000000000
--- a/vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && arm64
-
-package cpu
-
-import (
-	"errors"
-	"io"
-	"os"
-	"strings"
-)
-
-func readLinuxProcCPUInfo() error {
-	f, err := os.Open("/proc/cpuinfo")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	var buf [1 << 10]byte // enough for first CPU
-	n, err := io.ReadFull(f, buf[:])
-	if err != nil && err != io.ErrUnexpectedEOF {
-		return err
-	}
-	in := string(buf[:n])
-	const features = "\nFeatures	: "
-	i := strings.Index(in, features)
-	if i == -1 {
-		return errors.New("no CPU features found")
-	}
-	in = in[i+len(features):]
-	if i := strings.Index(in, "\n"); i != -1 {
-		in = in[:i]
-	}
-	m := map[string]*bool{}
-
-	initOptions() // need it early here; it's harmless to call twice
-	for _, o := range options {
-		m[o.Name] = o.Feature
-	}
-	// The EVTSTRM field has alias "evstrm" in Go, but Linux calls it "evtstrm".
-	m["evtstrm"] = &ARM64.HasEVTSTRM
-
-	for _, f := range strings.Fields(in) {
-		if p, ok := m[f]; ok {
-			*p = true
-		}
-	}
-	return nil
-}
diff --git a/vendor/golang.org/x/sys/cpu/runtime_auxv.go b/vendor/golang.org/x/sys/cpu/runtime_auxv.go
deleted file mode 100644
index 5f92ac9a2..000000000
--- a/vendor/golang.org/x/sys/cpu/runtime_auxv.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu
-
-// getAuxvFn is non-nil on Go 1.21+ (via runtime_auxv_go121.go init)
-// on platforms that use auxv.
-var getAuxvFn func() []uintptr
-
-func getAuxv() []uintptr {
-	if getAuxvFn == nil {
-		return nil
-	}
-	return getAuxvFn()
-}
diff --git a/vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go b/vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
deleted file mode 100644
index 4c9788ea8..000000000
--- a/vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.21
-
-package cpu
-
-import (
-	_ "unsafe" // for linkname
-)
-
-//go:linkname runtime_getAuxv runtime.getAuxv
-func runtime_getAuxv() []uintptr
-
-func init() {
-	getAuxvFn = runtime_getAuxv
-}
diff --git a/vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go b/vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go
deleted file mode 100644
index 1b9ccb091..000000000
--- a/vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Recreate a getsystemcfg syscall handler instead of
-// using the one provided by x/sys/unix to avoid having
-// the dependency between them. (See golang.org/issue/32102)
-// Moreover, this file will be used during the building of
-// gccgo's libgo and thus must not used a CGo method.
-
-//go:build aix && gccgo
-
-package cpu
-
-import (
-	"syscall"
-)
-
-//extern getsystemcfg
-func gccgoGetsystemcfg(label uint32) (r uint64)
-
-func callgetsystemcfg(label int) (r1 uintptr, e1 syscall.Errno) {
-	r1 = uintptr(gccgoGetsystemcfg(uint32(label)))
-	e1 = syscall.GetErrno()
-	return
-}
diff --git a/vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go b/vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
deleted file mode 100644
index e8b6cdbe9..000000000
--- a/vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Minimal copy of x/sys/unix so the cpu package can make a
-// system call on AIX without depending on x/sys/unix.
-// (See golang.org/issue/32102)
-
-//go:build aix && ppc64 && gc
-
-package cpu
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:cgo_import_dynamic libc_getsystemcfg getsystemcfg "libc.a/shr_64.o"
-
-//go:linkname libc_getsystemcfg libc_getsystemcfg
-
-type syscallFunc uintptr
-
-var libc_getsystemcfg syscallFunc
-
-type errno = syscall.Errno
-
-// Implemented in runtime/syscall_aix.go.
-func rawSyscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err errno)
-func syscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err errno)
-
-func callgetsystemcfg(label int) (r1 uintptr, e1 errno) {
-	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_getsystemcfg)), 1, uintptr(label), 0, 0, 0, 0, 0)
-	return
-}
diff --git a/vendor/golang.org/x/sys/cpu/syscall_darwin_arm64_gc.go b/vendor/golang.org/x/sys/cpu/syscall_darwin_arm64_gc.go
deleted file mode 100644
index 7b4e67ff9..000000000
--- a/vendor/golang.org/x/sys/cpu/syscall_darwin_arm64_gc.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Minimal copy from internal/cpu and runtime to make sysctl calls.
-
-//go:build darwin && arm64 && gc
-
-package cpu
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type Errno = syscall.Errno
-
-// adapted from internal/cpu/cpu_arm64_darwin.go
-func darwinSysctlEnabled(name []byte) bool {
-	out := int32(0)
-	nout := unsafe.Sizeof(out)
-	if ret := sysctlbyname(&name[0], (*byte)(unsafe.Pointer(&out)), &nout, nil, 0); ret != nil {
-		return false
-	}
-	return out > 0
-}
-
-//go:cgo_import_dynamic libc_sysctl sysctl "/usr/lib/libSystem.B.dylib"
-
-var libc_sysctlbyname_trampoline_addr uintptr
-
-// adapted from runtime/sys_darwin.go in the pattern of sysctl() above, as defined in x/sys/unix
-func sysctlbyname(name *byte, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
-	if _, _, err := syscall_syscall6(
-		libc_sysctlbyname_trampoline_addr,
-		uintptr(unsafe.Pointer(name)),
-		uintptr(unsafe.Pointer(old)),
-		uintptr(unsafe.Pointer(oldlen)),
-		uintptr(unsafe.Pointer(new)),
-		uintptr(newlen),
-		0,
-	); err != 0 {
-		return err
-	}
-
-	return nil
-}
-
-//go:cgo_import_dynamic libc_sysctlbyname sysctlbyname "/usr/lib/libSystem.B.dylib"
-
-// Implemented in the runtime package (runtime/sys_darwin.go)
-func syscall_syscall6(fn, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
-
-//go:linkname syscall_syscall6 syscall.syscall6
diff --git a/vendor/golang.org/x/sys/cpu/syscall_darwin_x86_gc.go b/vendor/golang.org/x/sys/cpu/syscall_darwin_x86_gc.go
deleted file mode 100644
index 4d0888b0c..000000000
--- a/vendor/golang.org/x/sys/cpu/syscall_darwin_x86_gc.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Minimal copy of x/sys/unix so the cpu package can make a
-// system call on Darwin without depending on x/sys/unix.
-
-//go:build darwin && amd64 && gc
-
-package cpu
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type _C_int int32
-
-// adapted from unix.Uname() at x/sys/unix/syscall_darwin.go L419
-func darwinOSRelease(release *[256]byte) error {
-	// from x/sys/unix/zerrors_openbsd_amd64.go
-	const (
-		CTL_KERN       = 0x1
-		KERN_OSRELEASE = 0x2
-	)
-
-	mib := []_C_int{CTL_KERN, KERN_OSRELEASE}
-	n := unsafe.Sizeof(*release)
-
-	return sysctl(mib, &release[0], &n, nil, 0)
-}
-
-type Errno = syscall.Errno
-
-var _zero uintptr // Single-word zero for use when we need a valid pointer to 0 bytes.
-
-// from x/sys/unix/zsyscall_darwin_amd64.go L791-807
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	if _, _, err := syscall_syscall6(
-		libc_sysctl_trampoline_addr,
-		uintptr(_p0),
-		uintptr(len(mib)),
-		uintptr(unsafe.Pointer(old)),
-		uintptr(unsafe.Pointer(oldlen)),
-		uintptr(unsafe.Pointer(new)),
-		uintptr(newlen),
-	); err != 0 {
-		return err
-	}
-
-	return nil
-}
-
-var libc_sysctl_trampoline_addr uintptr
-
-// adapted from internal/cpu/cpu_arm64_darwin.go
-func darwinSysctlEnabled(name []byte) bool {
-	out := int32(0)
-	nout := unsafe.Sizeof(out)
-	if ret := sysctlbyname(&name[0], (*byte)(unsafe.Pointer(&out)), &nout, nil, 0); ret != nil {
-		return false
-	}
-	return out > 0
-}
-
-//go:cgo_import_dynamic libc_sysctl sysctl "/usr/lib/libSystem.B.dylib"
-
-var libc_sysctlbyname_trampoline_addr uintptr
-
-// adapted from runtime/sys_darwin.go in the pattern of sysctl() above, as defined in x/sys/unix
-func sysctlbyname(name *byte, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
-	if _, _, err := syscall_syscall6(
-		libc_sysctlbyname_trampoline_addr,
-		uintptr(unsafe.Pointer(name)),
-		uintptr(unsafe.Pointer(old)),
-		uintptr(unsafe.Pointer(oldlen)),
-		uintptr(unsafe.Pointer(new)),
-		uintptr(newlen),
-		0,
-	); err != 0 {
-		return err
-	}
-
-	return nil
-}
-
-//go:cgo_import_dynamic libc_sysctlbyname sysctlbyname "/usr/lib/libSystem.B.dylib"
-
-// Implemented in the runtime package (runtime/sys_darwin.go)
-func syscall_syscall6(fn, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
-
-//go:linkname syscall_syscall6 syscall.syscall6
diff --git a/vendor/golang.org/x/sys/execabs/execabs.go b/vendor/golang.org/x/sys/execabs/execabs.go
deleted file mode 100644
index 3bf40fdfe..000000000
--- a/vendor/golang.org/x/sys/execabs/execabs.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package execabs is a drop-in replacement for os/exec
-// that requires PATH lookups to find absolute paths.
-// That is, execabs.Command("cmd") runs the same PATH lookup
-// as exec.Command("cmd"), but if the result is a path
-// which is relative, the Run and Start methods will report
-// an error instead of running the executable.
-//
-// See https://blog.golang.org/path-security for more information
-// about when it may be necessary or appropriate to use this package.
-package execabs
-
-import (
-	"context"
-	"fmt"
-	"os/exec"
-	"path/filepath"
-	"reflect"
-	"unsafe"
-)
-
-// ErrNotFound is the error resulting if a path search failed to find an executable file.
-// It is an alias for exec.ErrNotFound.
-var ErrNotFound = exec.ErrNotFound
-
-// Cmd represents an external command being prepared or run.
-// It is an alias for exec.Cmd.
-type Cmd = exec.Cmd
-
-// Error is returned by LookPath when it fails to classify a file as an executable.
-// It is an alias for exec.Error.
-type Error = exec.Error
-
-// An ExitError reports an unsuccessful exit by a command.
-// It is an alias for exec.ExitError.
-type ExitError = exec.ExitError
-
-func relError(file, path string) error {
-	return fmt.Errorf("%s resolves to executable in current directory (.%c%s)", file, filepath.Separator, path)
-}
-
-// LookPath searches for an executable named file in the directories
-// named by the PATH environment variable. If file contains a slash,
-// it is tried directly and the PATH is not consulted. The result will be
-// an absolute path.
-//
-// LookPath differs from exec.LookPath in its handling of PATH lookups,
-// which are used for file names without slashes. If exec.LookPath's
-// PATH lookup would have returned an executable from the current directory,
-// LookPath instead returns an error.
-func LookPath(file string) (string, error) {
-	path, err := exec.LookPath(file)
-	if err != nil && !isGo119ErrDot(err) {
-		return "", err
-	}
-	if filepath.Base(file) == file && !filepath.IsAbs(path) {
-		return "", relError(file, path)
-	}
-	return path, nil
-}
-
-func fixCmd(name string, cmd *exec.Cmd) {
-	if filepath.Base(name) == name && !filepath.IsAbs(cmd.Path) && !isGo119ErrFieldSet(cmd) {
-		// exec.Command was called with a bare binary name and
-		// exec.LookPath returned a path which is not absolute.
-		// Set cmd.lookPathErr and clear cmd.Path so that it
-		// cannot be run.
-		lookPathErr := (*error)(unsafe.Pointer(reflect.ValueOf(cmd).Elem().FieldByName("lookPathErr").Addr().Pointer()))
-		if *lookPathErr == nil {
-			*lookPathErr = relError(name, cmd.Path)
-		}
-		cmd.Path = ""
-	}
-}
-
-// CommandContext is like Command but includes a context.
-//
-// The provided context is used to kill the process (by calling os.Process.Kill)
-// if the context becomes done before the command completes on its own.
-func CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd {
-	cmd := exec.CommandContext(ctx, name, arg...)
-	fixCmd(name, cmd)
-	return cmd
-
-}
-
-// Command returns the Cmd struct to execute the named program with the given arguments.
-// See exec.Command for most details.
-//
-// Command differs from exec.Command in its handling of PATH lookups,
-// which are used when the program name contains no slashes.
-// If exec.Command would have returned an exec.Cmd configured to run an
-// executable from the current directory, Command instead
-// returns an exec.Cmd that will return an error from Start or Run.
-func Command(name string, arg ...string) *exec.Cmd {
-	cmd := exec.Command(name, arg...)
-	fixCmd(name, cmd)
-	return cmd
-}
diff --git a/vendor/golang.org/x/sys/execabs/execabs_go118.go b/vendor/golang.org/x/sys/execabs/execabs_go118.go
deleted file mode 100644
index 5627d70e3..000000000
--- a/vendor/golang.org/x/sys/execabs/execabs_go118.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !go1.19
-
-package execabs
-
-import "os/exec"
-
-func isGo119ErrDot(err error) bool {
-	return false
-}
-
-func isGo119ErrFieldSet(cmd *exec.Cmd) bool {
-	return false
-}
diff --git a/vendor/golang.org/x/sys/execabs/execabs_go119.go b/vendor/golang.org/x/sys/execabs/execabs_go119.go
deleted file mode 100644
index d60ab1b41..000000000
--- a/vendor/golang.org/x/sys/execabs/execabs_go119.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.19
-
-package execabs
-
-import (
-	"errors"
-	"os/exec"
-)
-
-func isGo119ErrDot(err error) bool {
-	return errors.Is(err, exec.ErrDot)
-}
-
-func isGo119ErrFieldSet(cmd *exec.Cmd) bool {
-	return cmd.Err != nil
-}
diff --git a/vendor/golang.org/x/sys/unix/affinity_linux.go b/vendor/golang.org/x/sys/unix/affinity_linux.go
index 3ea470387..acd6257fa 100644
--- a/vendor/golang.org/x/sys/unix/affinity_linux.go
+++ b/vendor/golang.org/x/sys/unix/affinity_linux.go
@@ -13,11 +13,19 @@ import (
 
 const cpuSetSize = _CPU_SETSIZE / _NCPUBITS
 
-// CPUSet represents a CPU affinity mask.
+// CPUSet represents a bit mask of CPUs, to be used with [SchedGetaffinity], [SchedSetaffinity],
+// and [SetMemPolicy].
+//
+// Note this type can only represent CPU IDs 0 through 1023.
+// Use [CPUSetDynamic]/[NewCPUSet] instead to avoid this limit.
 type CPUSet [cpuSetSize]cpuMask
 
-func schedAffinity(trap uintptr, pid int, set *CPUSet) error {
-	_, _, e := RawSyscall(trap, uintptr(pid), uintptr(unsafe.Sizeof(*set)), uintptr(unsafe.Pointer(set)))
+// CPUSetDynamic represents a bit mask of CPUs, to be used with [SchedGetaffinityDynamic],
+// [SchedSetaffinityDynamic], and [SetMemPolicyDynamic]. Use [NewCPUSet] to allocate.
+type CPUSetDynamic []cpuMask
+
+func schedAffinity(trap uintptr, pid int, size uintptr, ptr unsafe.Pointer) error {
+	_, _, e := RawSyscall(trap, uintptr(pid), uintptr(size), uintptr(ptr))
 	if e != 0 {
 		return errnoErr(e)
 	}
@@ -27,13 +35,13 @@ func schedAffinity(trap uintptr, pid int, set *CPUSet) error {
 // SchedGetaffinity gets the CPU affinity mask of the thread specified by pid.
 // If pid is 0 the calling thread is used.
 func SchedGetaffinity(pid int, set *CPUSet) error {
-	return schedAffinity(SYS_SCHED_GETAFFINITY, pid, set)
+	return schedAffinity(SYS_SCHED_GETAFFINITY, pid, unsafe.Sizeof(*set), unsafe.Pointer(set))
 }
 
 // SchedSetaffinity sets the CPU affinity mask of the thread specified by pid.
 // If pid is 0 the calling thread is used.
 func SchedSetaffinity(pid int, set *CPUSet) error {
-	return schedAffinity(SYS_SCHED_SETAFFINITY, pid, set)
+	return schedAffinity(SYS_SCHED_SETAFFINITY, pid, unsafe.Sizeof(*set), unsafe.Pointer(set))
 }
 
 // Zero clears the set s, so that it contains no CPUs.
@@ -45,9 +53,7 @@ func (s *CPUSet) Zero() {
 // will silently ignore any invalid CPU bits in [CPUSet] so this is an
 // efficient way of resetting the CPU affinity of a process.
 func (s *CPUSet) Fill() {
-	for i := range s {
-		s[i] = ^cpuMask(0)
-	}
+	cpuMaskFill(s[:])
 }
 
 func cpuBitsIndex(cpu int) int {
@@ -58,24 +64,27 @@ func cpuBitsMask(cpu int) cpuMask {
 	return cpuMask(1 << (uint(cpu) % _NCPUBITS))
 }
 
-// Set adds cpu to the set s.
-func (s *CPUSet) Set(cpu int) {
+func cpuMaskFill(s []cpuMask) {
+	for i := range s {
+		s[i] = ^cpuMask(0)
+	}
+}
+
+func cpuMaskSet(s []cpuMask, cpu int) {
 	i := cpuBitsIndex(cpu)
 	if i < len(s) {
 		s[i] |= cpuBitsMask(cpu)
 	}
 }
 
-// Clear removes cpu from the set s.
-func (s *CPUSet) Clear(cpu int) {
+func cpuMaskClear(s []cpuMask, cpu int) {
 	i := cpuBitsIndex(cpu)
 	if i < len(s) {
 		s[i] &^= cpuBitsMask(cpu)
 	}
 }
 
-// IsSet reports whether cpu is in the set s.
-func (s *CPUSet) IsSet(cpu int) bool {
+func cpuMaskIsSet(s []cpuMask, cpu int) bool {
 	i := cpuBitsIndex(cpu)
 	if i < len(s) {
 		return s[i]&cpuBitsMask(cpu) != 0
@@ -83,11 +92,98 @@ func (s *CPUSet) IsSet(cpu int) bool {
 	return false
 }
 
-// Count returns the number of CPUs in the set s.
-func (s *CPUSet) Count() int {
+func cpuMaskCount(s []cpuMask) int {
 	c := 0
 	for _, b := range s {
 		c += bits.OnesCount64(uint64(b))
 	}
 	return c
 }
+
+// Set adds cpu to the set s. If cpu is out of bounds for s, no action is taken.
+func (s *CPUSet) Set(cpu int) {
+	cpuMaskSet(s[:], cpu)
+}
+
+// Clear removes cpu from the set s. If cpu is out of bounds for s, no action is taken.
+func (s *CPUSet) Clear(cpu int) {
+	cpuMaskClear(s[:], cpu)
+}
+
+// IsSet reports whether cpu is in the set s.
+func (s *CPUSet) IsSet(cpu int) bool {
+	return cpuMaskIsSet(s[:], cpu)
+}
+
+// Count returns the number of CPUs in the set s.
+func (s *CPUSet) Count() int {
+	return cpuMaskCount(s[:])
+}
+
+// NewCPUSet creates a CPU affinity mask capable of representing CPU IDs
+// up to maxCPU (exclusive).
+func NewCPUSet(maxCPU int) CPUSetDynamic {
+	numMasks := (maxCPU + _NCPUBITS - 1) / _NCPUBITS
+	if numMasks == 0 {
+		numMasks = 1
+	}
+	return make(CPUSetDynamic, numMasks)
+}
+
+// Zero clears the set s, so that it contains no CPUs.
+func (s CPUSetDynamic) Zero() {
+	clear(s)
+}
+
+// Fill adds all possible CPU bits to the set s. On Linux, [SchedSetaffinityDynamic]
+// will silently ignore any invalid CPU bits in [CPUSetDynamic] so this is an
+// efficient way of resetting the CPU affinity of a process.
+func (s CPUSetDynamic) Fill() {
+	cpuMaskFill(s)
+}
+
+// Set adds cpu to the set s. If cpu is out of bounds for s, no action is taken.
+func (s CPUSetDynamic) Set(cpu int) {
+	cpuMaskSet(s, cpu)
+}
+
+// Clear removes cpu from the set s. If cpu is out of bounds for s, no action is taken.
+func (s CPUSetDynamic) Clear(cpu int) {
+	cpuMaskClear(s, cpu)
+}
+
+// IsSet reports whether cpu is in the set s.
+func (s CPUSetDynamic) IsSet(cpu int) bool {
+	return cpuMaskIsSet(s, cpu)
+}
+
+// Count returns the number of CPUs in the set s.
+func (s CPUSetDynamic) Count() int {
+	return cpuMaskCount(s)
+}
+
+func (s CPUSetDynamic) size() uintptr {
+	return uintptr(len(s)) * unsafe.Sizeof(cpuMask(0))
+}
+
+func (s CPUSetDynamic) pointer() unsafe.Pointer {
+	if len(s) == 0 {
+		return nil
+	}
+	return unsafe.Pointer(&s[0])
+}
+
+// SchedGetaffinityDynamic gets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+//
+// If the set is smaller than the size of the affinity mask used by the kernel,
+// [EINVAL] is returned.
+func SchedGetaffinityDynamic(pid int, set CPUSetDynamic) error {
+	return schedAffinity(SYS_SCHED_GETAFFINITY, pid, set.size(), set.pointer())
+}
+
+// SchedSetaffinityDynamic sets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedSetaffinityDynamic(pid int, set CPUSetDynamic) error {
+	return schedAffinity(SYS_SCHED_SETAFFINITY, pid, set.size(), set.pointer())
+}
diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh
index d0ed61191..f6ddee1ae 100644
--- a/vendor/golang.org/x/sys/unix/mkall.sh
+++ b/vendor/golang.org/x/sys/unix/mkall.sh
@@ -51,7 +51,7 @@ if [[ "$GOOS" = "linux" ]]; then
 	# Files generated through docker (use $cmd so you can Ctl-C the build or run)
 	set -e
 	$cmd docker build --tag generate:$GOOS $GOOS
-	$cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && pwd):/build generate:$GOOS
+	$cmd docker run --rm --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && pwd):/build generate:$GOOS
 	exit
 fi
 
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
index fd39be4ef..fa74cfe9e 100644
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -354,6 +354,9 @@ struct ltchars {
 // Renamed in v6.16, commit c6d732c38f93 ("net: ethtool: remove duplicate defines for family info")
 #define ETHTOOL_FAMILY_NAME	ETHTOOL_GENL_NAME
 #define ETHTOOL_FAMILY_VERSION	ETHTOOL_GENL_VERSION
+
+// Removed in v6.17, commit 760e6f7befba ("futex: Remove support for IMMUTABLE")
+#define PR_FUTEX_HASH_GET_IMMUTABLE 3
 '
 
 includes_NetBSD='
diff --git a/vendor/golang.org/x/sys/unix/readv_unix.go b/vendor/golang.org/x/sys/unix/readv_unix.go
new file mode 100644
index 000000000..38a2be937
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/readv_unix.go
@@ -0,0 +1,103 @@
+// Copyright 2026 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build darwin || linux || openbsd
+
+package unix
+
+import "unsafe"
+
+// minIovec is the size of the small initial allocation used by
+// Readv, Writev, etc.
+//
+// This small allocation gets stack allocated, which lets the
+// common use case of len(iovs) <= minIovec avoid more expensive
+// heap allocations.
+const minIovec = 8
+
+// appendBytes converts bs to Iovecs and appends them to vecs.
+func appendBytes(vecs []Iovec, bs [][]byte) []Iovec {
+	for _, b := range bs {
+		var v Iovec
+		v.SetLen(len(b))
+		if len(b) > 0 {
+			v.Base = &b[0]
+		} else {
+			v.Base = (*byte)(unsafe.Pointer(&_zero))
+		}
+		vecs = append(vecs, v)
+	}
+	return vecs
+}
+
+// writevRaceDetect tells the race detector that the program
+// has read the first n bytes stored in iovecs.
+func writevRaceDetect(iovecs []Iovec, n int) {
+	if !raceenabled {
+		return
+	}
+	for i := 0; n > 0 && i < len(iovecs); i++ {
+		m := min(int(iovecs[i].Len), n)
+		n -= m
+		if m > 0 {
+			raceReadRange(unsafe.Pointer(iovecs[i].Base), m)
+		}
+	}
+}
+
+// readvRaceDetect tells the race detector that the program
+// has written to the first n bytes stored in iovecs.
+func readvRaceDetect(iovecs []Iovec, n int, err error) {
+	if !raceenabled {
+		return
+	}
+	for i := 0; n > 0 && i < len(iovecs); i++ {
+		m := min(int(iovecs[i].Len), n)
+		n -= m
+		if m > 0 {
+			raceWriteRange(unsafe.Pointer(iovecs[i].Base), m)
+		}
+	}
+	if err == nil {
+		raceAcquire(unsafe.Pointer(&ioSync))
+	}
+}
+
+func Readv(fd int, iovs [][]byte) (n int, err error) {
+	iovecs := make([]Iovec, 0, minIovec)
+	iovecs = appendBytes(iovecs, iovs)
+	n, err = readv(fd, iovecs)
+	readvRaceDetect(iovecs, n, err)
+	return n, err
+}
+
+func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) {
+	iovecs := make([]Iovec, 0, minIovec)
+	iovecs = appendBytes(iovecs, iovs)
+	n, err = preadv(fd, iovecs, offset)
+	readvRaceDetect(iovecs, n, err)
+	return n, err
+}
+
+func Writev(fd int, iovs [][]byte) (n int, err error) {
+	iovecs := make([]Iovec, 0, minIovec)
+	iovecs = appendBytes(iovecs, iovs)
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	n, err = writev(fd, iovecs)
+	writevRaceDetect(iovecs, n)
+	return n, err
+}
+
+func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) {
+	iovecs := make([]Iovec, 0, minIovec)
+	iovecs = appendBytes(iovecs, iovs)
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	n, err = pwritev(fd, iovecs, offset)
+	writevRaceDetect(iovecs, n)
+	return n, err
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 7838ca5db..38590ca81 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -602,95 +602,6 @@ func Connectx(fd int, srcIf uint32, srcAddr, dstAddr Sockaddr, associd SaeAssocI
 	return
 }
 
-const minIovec = 8
-
-func Readv(fd int, iovs [][]byte) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	n, err = readv(fd, iovecs)
-	readvRacedetect(iovecs, n, err)
-	return n, err
-}
-
-func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	n, err = preadv(fd, iovecs, offset)
-	readvRacedetect(iovecs, n, err)
-	return n, err
-}
-
-func Writev(fd int, iovs [][]byte) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = writev(fd, iovecs)
-	writevRacedetect(iovecs, n)
-	return n, err
-}
-
-func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = pwritev(fd, iovecs, offset)
-	writevRacedetect(iovecs, n)
-	return n, err
-}
-
-func appendBytes(vecs []Iovec, bs [][]byte) []Iovec {
-	for _, b := range bs {
-		var v Iovec
-		v.SetLen(len(b))
-		if len(b) > 0 {
-			v.Base = &b[0]
-		} else {
-			v.Base = (*byte)(unsafe.Pointer(&_zero))
-		}
-		vecs = append(vecs, v)
-	}
-	return vecs
-}
-
-func writevRacedetect(iovecs []Iovec, n int) {
-	if !raceenabled {
-		return
-	}
-	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := int(iovecs[i].Len)
-		if m > n {
-			m = n
-		}
-		n -= m
-		if m > 0 {
-			raceReadRange(unsafe.Pointer(iovecs[i].Base), m)
-		}
-	}
-}
-
-func readvRacedetect(iovecs []Iovec, n int, err error) {
-	if !raceenabled {
-		return
-	}
-	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := int(iovecs[i].Len)
-		if m > n {
-			m = n
-		}
-		n -= m
-		if m > 0 {
-			raceWriteRange(unsafe.Pointer(iovecs[i].Base), m)
-		}
-	}
-	if err == nil {
-		raceAcquire(unsafe.Pointer(&ioSync))
-	}
-}
-
 //sys	connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error)
 //sys	sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error)
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index 06c0eea6f..21e2bfa39 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -1874,6 +1874,7 @@ func Dup2(oldfd, newfd int) error {
 //sys	Dup3(oldfd int, newfd int, flags int) (err error)
 //sysnb	EpollCreate1(flag int) (fd int, err error)
 //sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
 //sys	Eventfd(initval uint, flags int) (fd int, err error) = SYS_EVENTFD2
 //sys	Exit(code int) = SYS_EXIT_GROUP
 //sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
@@ -2150,33 +2151,10 @@ func Signalfd(fd int, sigmask *Sigset_t, flags int) (newfd int, err error) {
 //sys	exitThread(code int) (err error) = SYS_EXIT
 //sys	readv(fd int, iovs []Iovec) (n int, err error) = SYS_READV
 //sys	writev(fd int, iovs []Iovec) (n int, err error) = SYS_WRITEV
-//sys	preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PREADV
-//sys	pwritev(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PWRITEV
-//sys	preadv2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PREADV2
-//sys	pwritev2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PWRITEV2
-
-// minIovec is the size of the small initial allocation used by
-// Readv, Writev, etc.
-//
-// This small allocation gets stack allocated, which lets the
-// common use case of len(iovs) <= minIovs avoid more expensive
-// heap allocations.
-const minIovec = 8
-
-// appendBytes converts bs to Iovecs and appends them to vecs.
-func appendBytes(vecs []Iovec, bs [][]byte) []Iovec {
-	for _, b := range bs {
-		var v Iovec
-		v.SetLen(len(b))
-		if len(b) > 0 {
-			v.Base = &b[0]
-		} else {
-			v.Base = (*byte)(unsafe.Pointer(&_zero))
-		}
-		vecs = append(vecs, v)
-	}
-	return vecs
-}
+//sys	preadvSyscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PREADV
+//sys	pwritevSyscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PWRITEV
+//sys	preadv2Syscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PREADV2
+//sys	pwritev2Syscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) = SYS_PWRITEV2
 
 // offs2lohi splits offs into its low and high order bits.
 func offs2lohi(offs int64) (lo, hi uintptr) {
@@ -2184,69 +2162,23 @@ func offs2lohi(offs int64) (lo, hi uintptr) {
 	return uintptr(offs), uintptr(uint64(offs) >> (longBits - 1) >> 1) // two shifts to avoid false positive in vet
 }
 
-func Readv(fd int, iovs [][]byte) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	n, err = readv(fd, iovecs)
-	readvRacedetect(iovecs, n, err)
-	return n, err
-}
-
-func Preadv(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
 	lo, hi := offs2lohi(offset)
-	n, err = preadv(fd, iovecs, lo, hi)
-	readvRacedetect(iovecs, n, err)
-	return n, err
+	return preadvSyscall(fd, iovecs, lo, hi)
 }
 
 func Preadv2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error) {
 	iovecs := make([]Iovec, 0, minIovec)
 	iovecs = appendBytes(iovecs, iovs)
 	lo, hi := offs2lohi(offset)
-	n, err = preadv2(fd, iovecs, lo, hi, flags)
-	readvRacedetect(iovecs, n, err)
+	n, err = preadv2Syscall(fd, iovecs, lo, hi, flags)
+	readvRaceDetect(iovecs, n, err)
 	return n, err
 }
 
-func readvRacedetect(iovecs []Iovec, n int, err error) {
-	if !raceenabled {
-		return
-	}
-	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := min(int(iovecs[i].Len), n)
-		n -= m
-		if m > 0 {
-			raceWriteRange(unsafe.Pointer(iovecs[i].Base), m)
-		}
-	}
-	if err == nil {
-		raceAcquire(unsafe.Pointer(&ioSync))
-	}
-}
-
-func Writev(fd int, iovs [][]byte) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = writev(fd, iovecs)
-	writevRacedetect(iovecs, n)
-	return n, err
-}
-
-func Pwritev(fd int, iovs [][]byte, offset int64) (n int, err error) {
-	iovecs := make([]Iovec, 0, minIovec)
-	iovecs = appendBytes(iovecs, iovs)
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
 	lo, hi := offs2lohi(offset)
-	n, err = pwritev(fd, iovecs, lo, hi)
-	writevRacedetect(iovecs, n)
-	return n, err
+	return pwritevSyscall(fd, iovecs, lo, hi)
 }
 
 func Pwritev2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error) {
@@ -2256,24 +2188,11 @@ func Pwritev2(fd int, iovs [][]byte, offset int64, flags int) (n int, err error)
 		raceReleaseMerge(unsafe.Pointer(&ioSync))
 	}
 	lo, hi := offs2lohi(offset)
-	n, err = pwritev2(fd, iovecs, lo, hi, flags)
-	writevRacedetect(iovecs, n)
+	n, err = pwritev2Syscall(fd, iovecs, lo, hi, flags)
+	writevRaceDetect(iovecs, n)
 	return n, err
 }
 
-func writevRacedetect(iovecs []Iovec, n int) {
-	if !raceenabled {
-		return
-	}
-	for i := 0; n > 0 && i < len(iovecs); i++ {
-		m := min(int(iovecs[i].Len), n)
-		n -= m
-		if m > 0 {
-			raceReadRange(unsafe.Pointer(iovecs[i].Base), m)
-		}
-	}
-}
-
 // mmap varies by architecture; see syscall_linux_*.go.
 //sys	munmap(addr uintptr, length uintptr) (err error)
 //sys	mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error)
@@ -2644,8 +2563,12 @@ func SchedGetAttr(pid int, flags uint) (*SchedAttr, error) {
 //sys	Cachestat(fd uint, crange *CachestatRange, cstat *Cachestat_t, flags uint) (err error)
 //sys	Mseal(b []byte, flags uint) (err error)
 
-//sys	setMemPolicy(mode int, mask *CPUSet, size int) (err error) = SYS_SET_MEMPOLICY
+//sys	setMemPolicy(mode int, mask unsafe.Pointer, size uintptr) (err error) = SYS_SET_MEMPOLICY
 
 func SetMemPolicy(mode int, mask *CPUSet) error {
-	return setMemPolicy(mode, mask, _CPU_SETSIZE)
+	return setMemPolicy(mode, unsafe.Pointer(mask), _CPU_SETSIZE)
+}
+
+func SetMemPolicyDynamic(mode int, mask CPUSetDynamic) error {
+	return setMemPolicy(mode, mask.pointer(), mask.size())
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
index 506dafa7b..210d545c9 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -20,7 +20,6 @@ func setTimeval(sec, usec int64) Timeval {
 
 // 64-bit file system and 32-bit uid calls
 // (386 default is 32-bit file system and 16-bit uid).
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
index d557cf8de..a9a52f231 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -6,7 +6,6 @@
 
 package unix
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
index cd2dd797f..54474c20f 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -44,7 +44,6 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 
 // 64-bit file system and 32-bit uid calls
 // (16-bit uid calls are not always supported in newer kernels)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
 //sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
@@ -82,6 +81,9 @@ func Time(t *Time_t) (Time_t, error) {
 }
 
 func Utime(path string, buf *Utimbuf) error {
+	if buf == nil {
+		return Utimes(path, nil)
+	}
 	tv := []Timeval{
 		{Sec: buf.Actime},
 		{Sec: buf.Modtime},
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
index 745e5c7e6..e9f30db97 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -8,7 +8,6 @@ package unix
 
 import "unsafe"
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
@@ -113,6 +112,9 @@ func Time(t *Time_t) (Time_t, error) {
 }
 
 func Utime(path string, buf *Utimbuf) error {
+	if buf == nil {
+		return Utimes(path, nil)
+	}
 	tv := []Timeval{
 		{Sec: buf.Actime},
 		{Sec: buf.Modtime},
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
index dd2262a40..6f09ca200 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
@@ -8,7 +8,6 @@ package unix
 
 import "unsafe"
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
@@ -150,6 +149,9 @@ func Time(t *Time_t) (Time_t, error) {
 }
 
 func Utime(path string, buf *Utimbuf) error {
+	if buf == nil {
+		return Utimes(path, nil)
+	}
 	tv := []Timeval{
 		{Sec: buf.Actime},
 		{Sec: buf.Modtime},
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
index 70963a95a..ca3b56597 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -6,7 +6,6 @@
 
 package unix
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
index c218ebd28..54ba667b1 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -13,7 +13,6 @@ import (
 
 func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
index e6c48500c..ce4628590 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
@@ -11,7 +11,6 @@ import (
 	"unsafe"
 )
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
 //sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
index 7286a9aa8..33f7af380 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -6,7 +6,6 @@
 
 package unix
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
index 8cf3670bd..c658871e3 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
@@ -8,7 +8,6 @@ package unix
 
 import "unsafe"
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
@@ -112,6 +111,9 @@ func Time(t *Time_t) (Time_t, error) {
 }
 
 func Utime(path string, buf *Utimbuf) error {
+	if buf == nil {
+		return Utimes(path, nil)
+	}
 	tv := []Timeval{
 		{Sec: buf.Actime},
 		{Sec: buf.Modtime},
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
index 66f31210d..2c8587691 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -10,7 +10,6 @@ import (
 	"unsafe"
 )
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
index 11d1f1698..4964119af 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
@@ -6,7 +6,6 @@
 
 package unix
 
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index b86ded549..7b0ef8e12 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -300,6 +300,10 @@ func Uname(uname *Utsname) error {
 //sys	Pathconf(path string, name int) (val int, err error)
 //sys	pread(fd int, p []byte, offset int64) (n int, err error)
 //sys	pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	readv(fd int, iovecs []Iovec) (n int, err error)
+//sys	writev(fd int, iovecs []Iovec) (n int, err error)
+//sys	preadv(fd int, iovecs []Iovec, offset int64) (n int, err error)
+//sys	pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 120a7b35d..5bb51d7ae 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -353,8 +353,10 @@ const (
 	AUDIT_MAC_IPSEC_EVENT                       = 0x587
 	AUDIT_MAC_MAP_ADD                           = 0x581
 	AUDIT_MAC_MAP_DEL                           = 0x582
+	AUDIT_MAC_OBJ_CONTEXTS                      = 0x592
 	AUDIT_MAC_POLICY_LOAD                       = 0x57b
 	AUDIT_MAC_STATUS                            = 0x57c
+	AUDIT_MAC_TASK_CONTEXTS                     = 0x591
 	AUDIT_MAC_UNLBL_ALLOW                       = 0x57e
 	AUDIT_MAC_UNLBL_STCADD                      = 0x588
 	AUDIT_MAC_UNLBL_STCDEL                      = 0x589
@@ -591,8 +593,13 @@ const (
 	CAN_CTRLMODE_LOOPBACK                       = 0x1
 	CAN_CTRLMODE_ONE_SHOT                       = 0x8
 	CAN_CTRLMODE_PRESUME_ACK                    = 0x40
+	CAN_CTRLMODE_RESTRICTED                     = 0x800
 	CAN_CTRLMODE_TDC_AUTO                       = 0x200
 	CAN_CTRLMODE_TDC_MANUAL                     = 0x400
+	CAN_CTRLMODE_XL                             = 0x1000
+	CAN_CTRLMODE_XL_TDC_AUTO                    = 0x2000
+	CAN_CTRLMODE_XL_TDC_MANUAL                  = 0x4000
+	CAN_CTRLMODE_XL_TMS                         = 0x8000
 	CAN_EFF_FLAG                                = 0x80000000
 	CAN_EFF_ID_BITS                             = 0x1d
 	CAN_EFF_MASK                                = 0x1fffffff
@@ -800,6 +807,8 @@ const (
 	DEVLINK_PORT_FN_CAP_IPSEC_PACKET            = 0x8
 	DEVLINK_PORT_FN_CAP_MIGRATABLE              = 0x2
 	DEVLINK_PORT_FN_CAP_ROCE                    = 0x1
+	DEVLINK_RATE_TCS_MAX                        = 0x8
+	DEVLINK_RATE_TC_INDEX_MAX                   = 0x7
 	DEVLINK_SB_THRESHOLD_TO_ALPHA_MAX           = 0x14
 	DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS  = 0x3
 	DEVMEM_MAGIC                                = 0x454d444d
@@ -1186,6 +1195,7 @@ const (
 	ETH_P_MPLS_UC                               = 0x8847
 	ETH_P_MRP                                   = 0x88e3
 	ETH_P_MVRP                                  = 0x88f5
+	ETH_P_MXLGSW                                = 0x88c3
 	ETH_P_NCSI                                  = 0x88f8
 	ETH_P_NSH                                   = 0x894f
 	ETH_P_PAE                                   = 0x888e
@@ -1218,6 +1228,7 @@ const (
 	ETH_P_WCCP                                  = 0x883e
 	ETH_P_X25                                   = 0x805
 	ETH_P_XDSA                                  = 0xf8
+	ETH_P_YT921X                                = 0x9988
 	ET_CORE                                     = 0x4
 	ET_DYN                                      = 0x3
 	ET_EXEC                                     = 0x2
@@ -1258,6 +1269,7 @@ const (
 	FALLOC_FL_NO_HIDE_STALE                     = 0x4
 	FALLOC_FL_PUNCH_HOLE                        = 0x2
 	FALLOC_FL_UNSHARE_RANGE                     = 0x40
+	FALLOC_FL_WRITE_ZEROES                      = 0x80
 	FALLOC_FL_ZERO_RANGE                        = 0x10
 	FANOTIFY_METADATA_VERSION                   = 0x3
 	FAN_ACCESS                                  = 0x1
@@ -1347,6 +1359,7 @@ const (
 	FAN_UNLIMITED_MARKS                         = 0x20
 	FAN_UNLIMITED_QUEUE                         = 0x10
 	FD_CLOEXEC                                  = 0x1
+	FD_PIDFS_ROOT                               = -0x2712
 	FD_SETSIZE                                  = 0x400
 	FF0                                         = 0x0
 	FIB_RULE_DEV_DETACHED                       = 0x8
@@ -1477,6 +1490,7 @@ const (
 	GRND_INSECURE                               = 0x4
 	GRND_NONBLOCK                               = 0x1
 	GRND_RANDOM                                 = 0x2
+	GUEST_MEMFD_MAGIC                           = 0x474d454d
 	HDIO_DRIVE_CMD                              = 0x31f
 	HDIO_DRIVE_CMD_AEB                          = 0x31e
 	HDIO_DRIVE_CMD_HDR_SIZE                     = 0x4
@@ -1517,6 +1531,7 @@ const (
 	HDIO_SET_XFER                               = 0x306
 	HDIO_TRISTATE_HWIF                          = 0x31b
 	HDIO_UNREGISTER_HWIF                        = 0x32a
+	HIDIOCTL_LAST                               = 0xd
 	HID_MAX_DESCRIPTOR_SIZE                     = 0x1000
 	HOSTFS_SUPER_MAGIC                          = 0xc0ffee
 	HPFS_SUPER_MAGIC                            = 0xf995e849
@@ -1809,6 +1824,8 @@ const (
 	KEXEC_ARCH_X86_64                           = 0x3e0000
 	KEXEC_CRASH_HOTPLUG_SUPPORT                 = 0x8
 	KEXEC_FILE_DEBUG                            = 0x8
+	KEXEC_FILE_FORCE_DTB                        = 0x20
+	KEXEC_FILE_NO_CMA                           = 0x10
 	KEXEC_FILE_NO_INITRAMFS                     = 0x4
 	KEXEC_FILE_ON_CRASH                         = 0x2
 	KEXEC_FILE_UNLOAD                           = 0x1
@@ -1905,6 +1922,7 @@ const (
 	LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON      = 0x2
 	LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF    = 0x1
 	LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF   = 0x4
+	LANDLOCK_RESTRICT_SELF_TSYNC                = 0x8
 	LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET         = 0x1
 	LANDLOCK_SCOPE_SIGNAL                       = 0x2
 	LINUX_REBOOT_CMD_CAD_OFF                    = 0x0
@@ -1953,6 +1971,8 @@ const (
 	MADV_DONTNEED                               = 0x4
 	MADV_DONTNEED_LOCKED                        = 0x18
 	MADV_FREE                                   = 0x8
+	MADV_GUARD_INSTALL                          = 0x66
+	MADV_GUARD_REMOVE                           = 0x67
 	MADV_HUGEPAGE                               = 0xe
 	MADV_HWPOISON                               = 0x64
 	MADV_KEEPONFORK                             = 0x13
@@ -2097,7 +2117,7 @@ const (
 	MS_NOSEC                                    = 0x10000000
 	MS_NOSUID                                   = 0x2
 	MS_NOSYMFOLLOW                              = 0x100
-	MS_NOUSER                                   = -0x80000000
+	MS_NOUSER                                   = 0x80000000
 	MS_POSIXACL                                 = 0x10000
 	MS_PRIVATE                                  = 0x40000
 	MS_RDONLY                                   = 0x1
@@ -2412,6 +2432,7 @@ const (
 	NN_PRXFPREG                                 = "LINUX"
 	NN_RISCV_CSR                                = "LINUX"
 	NN_RISCV_TAGGED_ADDR_CTRL                   = "LINUX"
+	NN_RISCV_USER_CFI                           = "LINUX"
 	NN_RISCV_VECTOR                             = "LINUX"
 	NN_S390_CTRS                                = "LINUX"
 	NN_S390_GS_BC                               = "LINUX"
@@ -2493,6 +2514,7 @@ const (
 	NT_PRXFPREG                                 = 0x46e62b7f
 	NT_RISCV_CSR                                = 0x900
 	NT_RISCV_TAGGED_ADDR_CTRL                   = 0x902
+	NT_RISCV_USER_CFI                           = 0x903
 	NT_RISCV_VECTOR                             = 0x901
 	NT_S390_CTRS                                = 0x304
 	NT_S390_GS_BC                               = 0x30c
@@ -2515,6 +2537,7 @@ const (
 	NT_X86_SHSTK                                = 0x204
 	NT_X86_XSAVE_LAYOUT                         = 0x205
 	NT_X86_XSTATE                               = 0x202
+	NULL_FS_MAGIC                               = 0x4e554c4c
 	OCFS2_SUPER_MAGIC                           = 0x7461636f
 	OCRNL                                       = 0x8
 	OFDEL                                       = 0x80
@@ -2594,6 +2617,7 @@ const (
 	PERF_ATTR_SIZE_VER6                         = 0x78
 	PERF_ATTR_SIZE_VER7                         = 0x80
 	PERF_ATTR_SIZE_VER8                         = 0x88
+	PERF_ATTR_SIZE_VER9                         = 0x90
 	PERF_AUX_FLAG_COLLISION                     = 0x8
 	PERF_AUX_FLAG_CORESIGHT_FORMAT_CORESIGHT    = 0x0
 	PERF_AUX_FLAG_CORESIGHT_FORMAT_RAW          = 0x100
@@ -2629,6 +2653,7 @@ const (
 	PERF_MEM_LVLNUM_ANY_CACHE                   = 0xb
 	PERF_MEM_LVLNUM_CXL                         = 0x9
 	PERF_MEM_LVLNUM_IO                          = 0xa
+	PERF_MEM_LVLNUM_L0                          = 0x7
 	PERF_MEM_LVLNUM_L1                          = 0x1
 	PERF_MEM_LVLNUM_L2                          = 0x2
 	PERF_MEM_LVLNUM_L2_MHB                      = 0x5
@@ -2662,6 +2687,23 @@ const (
 	PERF_MEM_OP_PFETCH                          = 0x8
 	PERF_MEM_OP_SHIFT                           = 0x0
 	PERF_MEM_OP_STORE                           = 0x4
+	PERF_MEM_REGION_L_NON_SHARE                 = 0x3
+	PERF_MEM_REGION_L_SHARE                     = 0x2
+	PERF_MEM_REGION_MEM0                        = 0x8
+	PERF_MEM_REGION_MEM1                        = 0x9
+	PERF_MEM_REGION_MEM2                        = 0xa
+	PERF_MEM_REGION_MEM3                        = 0xb
+	PERF_MEM_REGION_MEM4                        = 0xc
+	PERF_MEM_REGION_MEM5                        = 0xd
+	PERF_MEM_REGION_MEM6                        = 0xe
+	PERF_MEM_REGION_MEM7                        = 0xf
+	PERF_MEM_REGION_MMIO                        = 0x7
+	PERF_MEM_REGION_NA                          = 0x0
+	PERF_MEM_REGION_O_IO                        = 0x4
+	PERF_MEM_REGION_O_NON_SHARE                 = 0x6
+	PERF_MEM_REGION_O_SHARE                     = 0x5
+	PERF_MEM_REGION_RSVD                        = 0x1
+	PERF_MEM_REGION_SHIFT                       = 0x2e
 	PERF_MEM_REMOTE_REMOTE                      = 0x1
 	PERF_MEM_REMOTE_SHIFT                       = 0x25
 	PERF_MEM_SNOOPX_FWD                         = 0x1
@@ -2776,6 +2818,10 @@ const (
 	PR_CAP_AMBIENT_IS_SET                       = 0x1
 	PR_CAP_AMBIENT_LOWER                        = 0x3
 	PR_CAP_AMBIENT_RAISE                        = 0x2
+	PR_CFI_BRANCH_LANDING_PADS                  = 0x0
+	PR_CFI_DISABLE                              = 0x2
+	PR_CFI_ENABLE                               = 0x1
+	PR_CFI_LOCK                                 = 0x4
 	PR_ENDIAN_BIG                               = 0x0
 	PR_ENDIAN_LITTLE                            = 0x1
 	PR_ENDIAN_PPC_LITTLE                        = 0x2
@@ -2798,6 +2844,7 @@ const (
 	PR_FUTEX_HASH_GET_SLOTS                     = 0x2
 	PR_FUTEX_HASH_SET_SLOTS                     = 0x1
 	PR_GET_AUXV                                 = 0x41555856
+	PR_GET_CFI                                  = 0x50
 	PR_GET_CHILD_SUBREAPER                      = 0x25
 	PR_GET_DUMPABLE                             = 0x3
 	PR_GET_ENDIAN                               = 0x13
@@ -2834,6 +2881,7 @@ const (
 	PR_MDWE_REFUSE_EXEC_GAIN                    = 0x1
 	PR_MPX_DISABLE_MANAGEMENT                   = 0x2c
 	PR_MPX_ENABLE_MANAGEMENT                    = 0x2b
+	PR_MTE_STORE_ONLY                           = 0x80000
 	PR_MTE_TAG_MASK                             = 0x7fff8
 	PR_MTE_TAG_SHIFT                            = 0x3
 	PR_MTE_TCF_ASYNC                            = 0x4
@@ -2877,6 +2925,10 @@ const (
 	PR_RISCV_V_VSTATE_CTRL_NEXT_MASK            = 0xc
 	PR_RISCV_V_VSTATE_CTRL_OFF                  = 0x1
 	PR_RISCV_V_VSTATE_CTRL_ON                   = 0x2
+	PR_RSEQ_SLICE_EXTENSION                     = 0x4f
+	PR_RSEQ_SLICE_EXTENSION_GET                 = 0x1
+	PR_RSEQ_SLICE_EXTENSION_SET                 = 0x2
+	PR_RSEQ_SLICE_EXT_ENABLE                    = 0x1
 	PR_SCHED_CORE                               = 0x3e
 	PR_SCHED_CORE_CREATE                        = 0x1
 	PR_SCHED_CORE_GET                           = 0x0
@@ -2886,6 +2938,7 @@ const (
 	PR_SCHED_CORE_SCOPE_THREAD_GROUP            = 0x1
 	PR_SCHED_CORE_SHARE_FROM                    = 0x3
 	PR_SCHED_CORE_SHARE_TO                      = 0x2
+	PR_SET_CFI                                  = 0x51
 	PR_SET_CHILD_SUBREAPER                      = 0x24
 	PR_SET_DUMPABLE                             = 0x4
 	PR_SET_ENDIAN                               = 0x14
@@ -2951,11 +3004,14 @@ const (
 	PR_SVE_SET_VL_ONEXEC                        = 0x40000
 	PR_SVE_VL_INHERIT                           = 0x20000
 	PR_SVE_VL_LEN_MASK                          = 0xffff
+	PR_SYS_DISPATCH_EXCLUSIVE_ON                = 0x1
+	PR_SYS_DISPATCH_INCLUSIVE_ON                = 0x2
 	PR_SYS_DISPATCH_OFF                         = 0x0
 	PR_SYS_DISPATCH_ON                          = 0x1
 	PR_TAGGED_ADDR_ENABLE                       = 0x1
 	PR_TASK_PERF_EVENTS_DISABLE                 = 0x1f
 	PR_TASK_PERF_EVENTS_ENABLE                  = 0x20
+	PR_THP_DISABLE_EXCEPT_ADVISED               = 0x2
 	PR_TIMER_CREATE_RESTORE_IDS                 = 0x4d
 	PR_TIMER_CREATE_RESTORE_IDS_GET             = 0x2
 	PR_TIMER_CREATE_RESTORE_IDS_OFF             = 0x0
@@ -2987,8 +3043,10 @@ const (
 	PTP_STRICT_FLAGS                            = 0x8
 	PTP_SYS_OFFSET_EXTENDED                     = 0xc4c03d09
 	PTP_SYS_OFFSET_EXTENDED2                    = 0xc4c03d12
+	PTP_SYS_OFFSET_EXTENDED_CYCLES              = 0xc4c03d16
 	PTP_SYS_OFFSET_PRECISE                      = 0xc0403d08
 	PTP_SYS_OFFSET_PRECISE2                     = 0xc0403d11
+	PTP_SYS_OFFSET_PRECISE_CYCLES               = 0xc0403d15
 	PTRACE_ATTACH                               = 0x10
 	PTRACE_CONT                                 = 0x7
 	PTRACE_DETACH                               = 0x11
@@ -3330,8 +3388,9 @@ const (
 	RWF_DSYNC                                   = 0x2
 	RWF_HIPRI                                   = 0x1
 	RWF_NOAPPEND                                = 0x20
+	RWF_NOSIGNAL                                = 0x100
 	RWF_NOWAIT                                  = 0x8
-	RWF_SUPPORTED                               = 0xff
+	RWF_SUPPORTED                               = 0x1ff
 	RWF_SYNC                                    = 0x4
 	RWF_WRITE_LIFE_NOT_SET                      = 0x0
 	SCHED_BATCH                                 = 0x3
@@ -3714,7 +3773,7 @@ const (
 	TASKSTATS_GENL_NAME                         = "TASKSTATS"
 	TASKSTATS_GENL_VERSION                      = 0x1
 	TASKSTATS_TYPE_MAX                          = 0x6
-	TASKSTATS_VERSION                           = 0x10
+	TASKSTATS_VERSION                           = 0x11
 	TCIFLUSH                                    = 0x0
 	TCIOFF                                      = 0x2
 	TCIOFLUSH                                   = 0x2
@@ -3730,6 +3789,9 @@ const (
 	TCPOPT_TIMESTAMP                            = 0x8
 	TCPOPT_TSTAMP_HDR                           = 0x101080a
 	TCPOPT_WINDOW                               = 0x3
+	TCP_AO_KEYF_EXCLUDE_OPT                     = 0x2
+	TCP_AO_KEYF_IFINDEX                         = 0x1
+	TCP_AO_MAXKEYLEN                            = 0x50
 	TCP_CC_INFO                                 = 0x1a
 	TCP_CM_INQ                                  = 0x24
 	TCP_CONGESTION                              = 0xd
@@ -4052,6 +4114,7 @@ const (
 	XDP_FLAGS_REPLACE                           = 0x10
 	XDP_FLAGS_SKB_MODE                          = 0x2
 	XDP_FLAGS_UPDATE_IF_NOEXIST                 = 0x1
+	XDP_MAX_TX_SKB_BUDGET                       = 0x9
 	XDP_MMAP_OFFSETS                            = 0x1
 	XDP_OPTIONS                                 = 0x8
 	XDP_OPTIONS_ZEROCOPY                        = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 97a61fc5b..c0a8ea1de 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -159,6 +159,7 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x8008b70d
 	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
@@ -305,6 +306,7 @@ const (
 	RTC_WKALM_SET                    = 0x4028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -352,6 +354,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -596,6 +599,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -819,7 +824,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index a0d6d498c..ff927c830 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -159,6 +159,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x8008b70d
 	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
@@ -306,6 +307,7 @@ const (
 	RTC_WKALM_SET                    = 0x4028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -353,6 +355,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -596,6 +599,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -819,7 +824,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index dd9c903f9..55294eda5 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -156,6 +156,7 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x8008b70d
 	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
@@ -311,6 +312,7 @@ const (
 	RTC_WKALM_SET                    = 0x4028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -358,6 +360,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -601,6 +604,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -824,7 +829,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 384c61ca3..5dac54c35 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -161,6 +161,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x8008b70d
 	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
@@ -304,6 +305,7 @@ const (
 	RTC_WKALM_SET                    = 0x4028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -351,6 +353,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -598,6 +601,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -821,7 +826,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
index 6384c9831..46ac1fcb2 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
@@ -160,6 +160,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x8008b70d
 	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
@@ -298,6 +299,7 @@ const (
 	RTC_WKALM_SET                    = 0x4028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -345,6 +347,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -588,6 +591,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -811,7 +816,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 553c1c6f1..b55483e8a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -156,6 +156,7 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -304,6 +305,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -351,6 +353,7 @@ const (
 	SO_ERROR                         = 0x1007
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x8
 	SO_LINGER                        = 0x80
 	SO_LOCK_FILTER                   = 0x2c
@@ -597,6 +600,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x60)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x46d)
+	EFSBADCRC       = syscall.Errno(0x4d)
+	EFSCORRUPTED    = syscall.Errno(0x87)
 	EHOSTDOWN       = syscall.Errno(0x93)
 	EHOSTUNREACH    = syscall.Errno(0x94)
 	EHWPOISON       = syscall.Errno(0xa8)
@@ -814,7 +819,7 @@ var errorList = [...]struct {
 	{132, "ENOBUFS", "no buffer space available"},
 	{133, "EISCONN", "transport endpoint is already connected"},
 	{134, "ENOTCONN", "transport endpoint is not connected"},
-	{135, "EUCLEAN", "structure needs cleaning"},
+	{135, "EFSCORRUPTED", "structure needs cleaning"},
 	{137, "ENOTNAM", "not a XENIX named type file"},
 	{138, "ENAVAIL", "no XENIX semaphores available"},
 	{139, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index b3339f209..71890c98a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -156,6 +156,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -304,6 +305,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -351,6 +353,7 @@ const (
 	SO_ERROR                         = 0x1007
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x8
 	SO_LINGER                        = 0x80
 	SO_LOCK_FILTER                   = 0x2c
@@ -597,6 +600,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x60)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x46d)
+	EFSBADCRC       = syscall.Errno(0x4d)
+	EFSCORRUPTED    = syscall.Errno(0x87)
 	EHOSTDOWN       = syscall.Errno(0x93)
 	EHOSTUNREACH    = syscall.Errno(0x94)
 	EHWPOISON       = syscall.Errno(0xa8)
@@ -814,7 +819,7 @@ var errorList = [...]struct {
 	{132, "ENOBUFS", "no buffer space available"},
 	{133, "EISCONN", "transport endpoint is already connected"},
 	{134, "ENOTCONN", "transport endpoint is not connected"},
-	{135, "EUCLEAN", "structure needs cleaning"},
+	{135, "EFSCORRUPTED", "structure needs cleaning"},
 	{137, "ENOTNAM", "not a XENIX named type file"},
 	{138, "ENAVAIL", "no XENIX semaphores available"},
 	{139, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 177091d2b..a78b6cc14 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -156,6 +156,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -304,6 +305,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -351,6 +353,7 @@ const (
 	SO_ERROR                         = 0x1007
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x8
 	SO_LINGER                        = 0x80
 	SO_LOCK_FILTER                   = 0x2c
@@ -597,6 +600,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x60)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x46d)
+	EFSBADCRC       = syscall.Errno(0x4d)
+	EFSCORRUPTED    = syscall.Errno(0x87)
 	EHOSTDOWN       = syscall.Errno(0x93)
 	EHOSTUNREACH    = syscall.Errno(0x94)
 	EHWPOISON       = syscall.Errno(0xa8)
@@ -814,7 +819,7 @@ var errorList = [...]struct {
 	{132, "ENOBUFS", "no buffer space available"},
 	{133, "EISCONN", "transport endpoint is already connected"},
 	{134, "ENOTCONN", "transport endpoint is not connected"},
-	{135, "EUCLEAN", "structure needs cleaning"},
+	{135, "EFSCORRUPTED", "structure needs cleaning"},
 	{137, "ENOTNAM", "not a XENIX named type file"},
 	{138, "ENAVAIL", "no XENIX semaphores available"},
 	{139, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index c5abf156d..d0e38ca73 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -156,6 +156,7 @@ const (
 	NFDBITS                          = 0x20
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -304,6 +305,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -351,6 +353,7 @@ const (
 	SO_ERROR                         = 0x1007
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x8
 	SO_LINGER                        = 0x80
 	SO_LOCK_FILTER                   = 0x2c
@@ -597,6 +600,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x60)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x46d)
+	EFSBADCRC       = syscall.Errno(0x4d)
+	EFSCORRUPTED    = syscall.Errno(0x87)
 	EHOSTDOWN       = syscall.Errno(0x93)
 	EHOSTUNREACH    = syscall.Errno(0x94)
 	EHWPOISON       = syscall.Errno(0xa8)
@@ -814,7 +819,7 @@ var errorList = [...]struct {
 	{132, "ENOBUFS", "no buffer space available"},
 	{133, "EISCONN", "transport endpoint is already connected"},
 	{134, "ENOTCONN", "transport endpoint is not connected"},
-	{135, "EUCLEAN", "structure needs cleaning"},
+	{135, "EFSCORRUPTED", "structure needs cleaning"},
 	{137, "ENOTNAM", "not a XENIX named type file"},
 	{138, "ENAVAIL", "no XENIX semaphores available"},
 	{139, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
index f1f3fadf5..c883e14c7 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
@@ -158,6 +158,7 @@ const (
 	NL3                              = 0x300
 	NLDLY                            = 0x300
 	NOFLSH                           = 0x80000000
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -359,6 +360,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -406,6 +408,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -653,6 +656,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -877,7 +882,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 203ad9c54..1834273d4 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -158,6 +158,7 @@ const (
 	NL3                              = 0x300
 	NLDLY                            = 0x300
 	NOFLSH                           = 0x80000000
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -363,6 +364,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -410,6 +412,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -657,6 +660,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -881,7 +886,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 4b9abcb21..39945dd9a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -158,6 +158,7 @@ const (
 	NL3                              = 0x300
 	NLDLY                            = 0x300
 	NOFLSH                           = 0x80000000
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -363,6 +364,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -410,6 +412,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -657,6 +660,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -881,7 +886,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
index f87983037..bc0f37241 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -11,553 +11,569 @@ package unix
 import "syscall"
 
 const (
-	B1000000                         = 0x1008
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1500000                         = 0x100a
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2500000                         = 0x100c
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B921600                          = 0x1007
-	BLKALIGNOFF                      = 0x127a
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKDISCARD                       = 0x1277
-	BLKDISCARDZEROES                 = 0x127c
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETDISKSEQ                    = 0x80081280
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKIOMIN                         = 0x1278
-	BLKIOOPT                         = 0x1279
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKROTATIONAL                    = 0x127e
-	BLKRRPART                        = 0x125f
-	BLKSECDISCARD                    = 0x127d
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BLKZEROOUT                       = 0x127f
-	BOTHER                           = 0x1000
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIZE                            = 0x30
-	CSTOPB                           = 0x40
-	DM_MPATH_PROBE_PATHS             = 0xfd12
-	ECCGETLAYOUT                     = 0x81484d11
-	ECCGETSTATS                      = 0x80104d12
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	EFD_CLOEXEC                      = 0x80000
-	EFD_NONBLOCK                     = 0x800
-	EPIOCGPARAMS                     = 0x80088a02
-	EPIOCSPARAMS                     = 0x40088a01
-	EPOLL_CLOEXEC                    = 0x80000
-	EXTPROC                          = 0x10000
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FICLONE                          = 0x40049409
-	FICLONERANGE                     = 0x4020940d
-	FLUSHO                           = 0x1000
-	FS_IOC_ENABLE_VERITY             = 0x40806685
-	FS_IOC_GETFLAGS                  = 0x80086601
-	FS_IOC_GET_ENCRYPTION_NONCE      = 0x8010661b
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SETFLAGS                  = 0x40086602
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_RDLCK                          = 0x0
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HIDIOCGRAWINFO                   = 0x80084803
-	HIDIOCGRDESC                     = 0x90044802
-	HIDIOCGRDESCSIZE                 = 0x80044801
-	HIDIOCREVOKE                     = 0x4004480d
-	HUPCL                            = 0x400
-	ICANON                           = 0x2
-	IEXTEN                           = 0x8000
-	IN_CLOEXEC                       = 0x80000
-	IN_NONBLOCK                      = 0x800
-	IOCTL_MEI_NOTIFY_GET             = 0x80044803
-	IOCTL_MEI_NOTIFY_SET             = 0x40044802
-	IOCTL_VM_SOCKETS_GET_LOCAL_CID   = 0x7b9
-	IPV6_FLOWINFO_MASK               = 0xffffff0f
-	IPV6_FLOWLABEL_MASK              = 0xffff0f00
-	ISIG                             = 0x1
-	IUCLC                            = 0x200
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_STACK                        = 0x20000
-	MAP_SYNC                         = 0x80000
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MEMERASE                         = 0x40084d02
-	MEMERASE64                       = 0x40104d14
-	MEMGETBADBLOCK                   = 0x40084d0b
-	MEMGETINFO                       = 0x80204d01
-	MEMGETOOBSEL                     = 0x80c84d0a
-	MEMGETREGIONCOUNT                = 0x80044d07
-	MEMISLOCKED                      = 0x80084d17
-	MEMLOCK                          = 0x40084d05
-	MEMREAD                          = 0xc0404d1a
-	MEMREADOOB                       = 0xc0104d04
-	MEMSETBADBLOCK                   = 0x40084d0c
-	MEMUNLOCK                        = 0x40084d06
-	MEMWRITEOOB                      = 0xc0104d03
-	MTDFILEMODE                      = 0x4d13
-	NFDBITS                          = 0x40
-	NLDLY                            = 0x100
-	NOFLSH                           = 0x80
-	NS_GET_MNTNS_ID                  = 0x8008b705
-	NS_GET_NSTYPE                    = 0xb703
-	NS_GET_OWNER_UID                 = 0xb704
-	NS_GET_PARENT                    = 0xb702
-	NS_GET_PID_FROM_PIDNS            = 0x8004b706
-	NS_GET_PID_IN_PIDNS              = 0x8004b708
-	NS_GET_TGID_FROM_PIDNS           = 0x8004b707
-	NS_GET_TGID_IN_PIDNS             = 0x8004b709
-	NS_GET_USERNS                    = 0xb701
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	OTPERASE                         = 0x400c4d19
-	OTPGETREGIONCOUNT                = 0x40044d0e
-	OTPGETREGIONINFO                 = 0x400c4d0f
-	OTPLOCK                          = 0x800c4d10
-	OTPSELECT                        = 0x80044d0d
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	PARENB                           = 0x100
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PERF_EVENT_IOC_DISABLE           = 0x2401
-	PERF_EVENT_IOC_ENABLE            = 0x2400
-	PERF_EVENT_IOC_ID                = 0x80082407
-	PERF_EVENT_IOC_MODIFY_ATTRIBUTES = 0x4008240b
-	PERF_EVENT_IOC_PAUSE_OUTPUT      = 0x40042409
-	PERF_EVENT_IOC_PERIOD            = 0x40082404
-	PERF_EVENT_IOC_QUERY_BPF         = 0xc008240a
-	PERF_EVENT_IOC_REFRESH           = 0x2402
-	PERF_EVENT_IOC_RESET             = 0x2403
-	PERF_EVENT_IOC_SET_BPF           = 0x40042408
-	PERF_EVENT_IOC_SET_FILTER        = 0x40082406
-	PERF_EVENT_IOC_SET_OUTPUT        = 0x2405
-	PPPIOCATTACH                     = 0x4004743d
-	PPPIOCATTCHAN                    = 0x40047438
-	PPPIOCBRIDGECHAN                 = 0x40047435
-	PPPIOCCONNECT                    = 0x4004743a
-	PPPIOCDETACH                     = 0x4004743c
-	PPPIOCDISCONN                    = 0x7439
-	PPPIOCGASYNCMAP                  = 0x80047458
-	PPPIOCGCHAN                      = 0x80047437
-	PPPIOCGDEBUG                     = 0x80047441
-	PPPIOCGFLAGS                     = 0x8004745a
-	PPPIOCGIDLE                      = 0x8010743f
-	PPPIOCGIDLE32                    = 0x8008743f
-	PPPIOCGIDLE64                    = 0x8010743f
-	PPPIOCGL2TPSTATS                 = 0x80487436
-	PPPIOCGMRU                       = 0x80047453
-	PPPIOCGRASYNCMAP                 = 0x80047455
-	PPPIOCGUNIT                      = 0x80047456
-	PPPIOCGXASYNCMAP                 = 0x80207450
-	PPPIOCSACTIVE                    = 0x40107446
-	PPPIOCSASYNCMAP                  = 0x40047457
-	PPPIOCSCOMPRESS                  = 0x4010744d
-	PPPIOCSDEBUG                     = 0x40047440
-	PPPIOCSFLAGS                     = 0x40047459
-	PPPIOCSMAXCID                    = 0x40047451
-	PPPIOCSMRRU                      = 0x4004743b
-	PPPIOCSMRU                       = 0x40047452
-	PPPIOCSNPMODE                    = 0x4008744b
-	PPPIOCSPASS                      = 0x40107447
-	PPPIOCSRASYNCMAP                 = 0x40047454
-	PPPIOCSXASYNCMAP                 = 0x4020744f
-	PPPIOCUNBRIDGECHAN               = 0x7434
-	PPPIOCXFERUNIT                   = 0x744e
-	PR_SET_PTRACER_ANY               = 0xffffffffffffffff
-	PTP_CLOCK_GETCAPS                = 0x80503d01
-	PTP_CLOCK_GETCAPS2               = 0x80503d0a
-	PTP_ENABLE_PPS                   = 0x40043d04
-	PTP_ENABLE_PPS2                  = 0x40043d0d
-	PTP_EXTTS_REQUEST                = 0x40103d02
-	PTP_EXTTS_REQUEST2               = 0x40103d0b
-	PTP_MASK_CLEAR_ALL               = 0x3d13
-	PTP_MASK_EN_SINGLE               = 0x40043d14
-	PTP_PEROUT_REQUEST               = 0x40383d03
-	PTP_PEROUT_REQUEST2              = 0x40383d0c
-	PTP_PIN_SETFUNC                  = 0x40603d07
-	PTP_PIN_SETFUNC2                 = 0x40603d10
-	PTP_SYS_OFFSET                   = 0x43403d05
-	PTP_SYS_OFFSET2                  = 0x43403d0e
-	PTRACE_GETFDPIC                  = 0x21
-	PTRACE_GETFDPIC_EXEC             = 0x0
-	PTRACE_GETFDPIC_INTERP           = 0x1
-	RLIMIT_AS                        = 0x9
-	RLIMIT_MEMLOCK                   = 0x8
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_NPROC                     = 0x6
-	RLIMIT_RSS                       = 0x5
-	RNDADDENTROPY                    = 0x40085203
-	RNDADDTOENTCNT                   = 0x40045201
-	RNDCLEARPOOL                     = 0x5206
-	RNDGETENTCNT                     = 0x80045200
-	RNDGETPOOL                       = 0x80085202
-	RNDRESEEDCRNG                    = 0x5207
-	RNDZAPENTCNT                     = 0x5204
-	RTC_AIE_OFF                      = 0x7002
-	RTC_AIE_ON                       = 0x7001
-	RTC_ALM_READ                     = 0x80247008
-	RTC_ALM_SET                      = 0x40247007
-	RTC_EPOCH_READ                   = 0x8008700d
-	RTC_EPOCH_SET                    = 0x4008700e
-	RTC_IRQP_READ                    = 0x8008700b
-	RTC_IRQP_SET                     = 0x4008700c
-	RTC_PARAM_GET                    = 0x40187013
-	RTC_PARAM_SET                    = 0x40187014
-	RTC_PIE_OFF                      = 0x7006
-	RTC_PIE_ON                       = 0x7005
-	RTC_PLL_GET                      = 0x80207011
-	RTC_PLL_SET                      = 0x40207012
-	RTC_RD_TIME                      = 0x80247009
-	RTC_SET_TIME                     = 0x4024700a
-	RTC_UIE_OFF                      = 0x7004
-	RTC_UIE_ON                       = 0x7003
-	RTC_VL_CLR                       = 0x7014
-	RTC_VL_READ                      = 0x80047013
-	RTC_WIE_OFF                      = 0x7010
-	RTC_WIE_ON                       = 0x700f
-	RTC_WKALM_RD                     = 0x80287010
-	RTC_WKALM_SET                    = 0x4028700f
-	SCM_DEVMEM_DMABUF                = 0x4f
-	SCM_DEVMEM_LINEAR                = 0x4e
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPING_PKTINFO         = 0x3a
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_TS_OPT_ID                    = 0x51
-	SCM_TXTIME                       = 0x3d
-	SCM_WIFI_STATUS                  = 0x29
-	SECCOMP_IOCTL_NOTIF_ADDFD        = 0x40182103
-	SECCOMP_IOCTL_NOTIF_ID_VALID     = 0x40082102
-	SECCOMP_IOCTL_NOTIF_SET_FLAGS    = 0x40082104
-	SFD_CLOEXEC                      = 0x80000
-	SFD_NONBLOCK                     = 0x800
-	SIOCATMARK                       = 0x8905
-	SIOCGPGRP                        = 0x8904
-	SIOCGSTAMPNS_NEW                 = 0x80108907
-	SIOCGSTAMP_NEW                   = 0x80108906
-	SIOCINQ                          = 0x541b
-	SIOCOUTQ                         = 0x5411
-	SIOCSPGRP                        = 0x8902
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_STREAM                      = 0x1
-	SOL_SOCKET                       = 0x1
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BINDTOIFINDEX                 = 0x3e
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUF_LOCK                      = 0x48
-	SO_BUSY_POLL                     = 0x2e
-	SO_BUSY_POLL_BUDGET              = 0x46
-	SO_CNX_ADVICE                    = 0x35
-	SO_COOKIE                        = 0x39
-	SO_DETACH_REUSEPORT_BPF          = 0x44
-	SO_DEVMEM_DMABUF                 = 0x4f
-	SO_DEVMEM_DONTNEED               = 0x50
-	SO_DEVMEM_LINEAR                 = 0x4e
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_INCOMING_CPU                  = 0x31
-	SO_INCOMING_NAPI_ID              = 0x38
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_MEMINFO                       = 0x37
-	SO_NETNS_COOKIE                  = 0x47
-	SO_NOFCS                         = 0x2b
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSPIDFD                     = 0x4c
-	SO_PASSRIGHTS                    = 0x53
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERGROUPS                    = 0x3b
-	SO_PEERPIDFD                     = 0x4d
-	SO_PEERSEC                       = 0x1f
-	SO_PREFER_BUSY_POLL              = 0x45
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVMARK                       = 0x4b
-	SO_RCVPRIORITY                   = 0x52
-	SO_RCVTIMEO                      = 0x14
-	SO_RCVTIMEO_NEW                  = 0x42
-	SO_RCVTIMEO_OLD                  = 0x14
-	SO_RESERVE_MEM                   = 0x49
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_SNDTIMEO_NEW                  = 0x43
-	SO_SNDTIMEO_OLD                  = 0x15
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPING_NEW              = 0x41
-	SO_TIMESTAMPING_OLD              = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TIMESTAMPNS_NEW               = 0x40
-	SO_TIMESTAMPNS_OLD               = 0x23
-	SO_TIMESTAMP_NEW                 = 0x3f
-	SO_TXREHASH                      = 0x4a
-	SO_TXTIME                        = 0x3d
-	SO_TYPE                          = 0x3
-	SO_WIFI_STATUS                   = 0x29
-	SO_ZEROCOPY                      = 0x3c
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TFD_CLOEXEC                      = 0x80000
-	TFD_NONBLOCK                     = 0x800
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGISO7816                     = 0x80285442
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGPTPEER                      = 0x5441
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSISO7816                     = 0xc0285443
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETDEVNETNS                   = 0x54e3
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETCARRIER                    = 0x400454e2
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETFILTEREBPF                 = 0x800454e1
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETSTEERINGEBPF               = 0x800454e0
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	UBI_IOCATT                       = 0x40186f40
-	UBI_IOCDET                       = 0x40046f41
-	UBI_IOCEBCH                      = 0x40044f02
-	UBI_IOCEBER                      = 0x40044f01
-	UBI_IOCEBISMAP                   = 0x80044f05
-	UBI_IOCEBMAP                     = 0x40084f03
-	UBI_IOCEBUNMAP                   = 0x40044f04
-	UBI_IOCMKVOL                     = 0x40986f00
-	UBI_IOCRMVOL                     = 0x40046f01
-	UBI_IOCRNVOL                     = 0x51106f03
-	UBI_IOCRPEB                      = 0x40046f04
-	UBI_IOCRSVOL                     = 0x400c6f02
-	UBI_IOCSETVOLPROP                = 0x40104f06
-	UBI_IOCSPEB                      = 0x40046f05
-	UBI_IOCVOLCRBLK                  = 0x40804f07
-	UBI_IOCVOLRMBLK                  = 0x4f08
-	UBI_IOCVOLUP                     = 0x40084f00
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VMIN                             = 0x6
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WDIOC_GETBOOTSTATUS              = 0x80045702
-	WDIOC_GETPRETIMEOUT              = 0x80045709
-	WDIOC_GETSTATUS                  = 0x80045701
-	WDIOC_GETSUPPORT                 = 0x80285700
-	WDIOC_GETTEMP                    = 0x80045703
-	WDIOC_GETTIMELEFT                = 0x8004570a
-	WDIOC_GETTIMEOUT                 = 0x80045707
-	WDIOC_KEEPALIVE                  = 0x80045705
-	WDIOC_SETOPTIONS                 = 0x80045704
-	WORDSIZE                         = 0x40
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-	_HIDIOCGRAWNAME                  = 0x80804804
-	_HIDIOCGRAWPHYS                  = 0x80404805
-	_HIDIOCGRAWUNIQ                  = 0x80404808
+	B1000000                                     = 0x1008
+	B115200                                      = 0x1002
+	B1152000                                     = 0x1009
+	B1500000                                     = 0x100a
+	B2000000                                     = 0x100b
+	B230400                                      = 0x1003
+	B2500000                                     = 0x100c
+	B3000000                                     = 0x100d
+	B3500000                                     = 0x100e
+	B4000000                                     = 0x100f
+	B460800                                      = 0x1004
+	B500000                                      = 0x1005
+	B57600                                       = 0x1001
+	B576000                                      = 0x1006
+	B921600                                      = 0x1007
+	BLKALIGNOFF                                  = 0x127a
+	BLKBSZGET                                    = 0x80081270
+	BLKBSZSET                                    = 0x40081271
+	BLKDISCARD                                   = 0x1277
+	BLKDISCARDZEROES                             = 0x127c
+	BLKFLSBUF                                    = 0x1261
+	BLKFRAGET                                    = 0x1265
+	BLKFRASET                                    = 0x1264
+	BLKGETDISKSEQ                                = 0x80081280
+	BLKGETSIZE                                   = 0x1260
+	BLKGETSIZE64                                 = 0x80081272
+	BLKIOMIN                                     = 0x1278
+	BLKIOOPT                                     = 0x1279
+	BLKPBSZGET                                   = 0x127b
+	BLKRAGET                                     = 0x1263
+	BLKRASET                                     = 0x1262
+	BLKROGET                                     = 0x125e
+	BLKROSET                                     = 0x125d
+	BLKROTATIONAL                                = 0x127e
+	BLKRRPART                                    = 0x125f
+	BLKSECDISCARD                                = 0x127d
+	BLKSECTGET                                   = 0x1267
+	BLKSECTSET                                   = 0x1266
+	BLKSSZGET                                    = 0x1268
+	BLKZEROOUT                                   = 0x127f
+	BOTHER                                       = 0x1000
+	BS1                                          = 0x2000
+	BSDLY                                        = 0x2000
+	CBAUD                                        = 0x100f
+	CBAUDEX                                      = 0x1000
+	CIBAUD                                       = 0x100f0000
+	CLOCAL                                       = 0x800
+	CR1                                          = 0x200
+	CR2                                          = 0x400
+	CR3                                          = 0x600
+	CRDLY                                        = 0x600
+	CREAD                                        = 0x80
+	CS6                                          = 0x10
+	CS7                                          = 0x20
+	CS8                                          = 0x30
+	CSIZE                                        = 0x30
+	CSTOPB                                       = 0x40
+	DM_MPATH_PROBE_PATHS                         = 0xfd12
+	ECCGETLAYOUT                                 = 0x81484d11
+	ECCGETSTATS                                  = 0x80104d12
+	ECHOCTL                                      = 0x200
+	ECHOE                                        = 0x10
+	ECHOK                                        = 0x20
+	ECHOKE                                       = 0x800
+	ECHONL                                       = 0x40
+	ECHOPRT                                      = 0x400
+	EFD_CLOEXEC                                  = 0x80000
+	EFD_NONBLOCK                                 = 0x800
+	EPIOCGPARAMS                                 = 0x80088a02
+	EPIOCSPARAMS                                 = 0x40088a01
+	EPOLL_CLOEXEC                                = 0x80000
+	EXTPROC                                      = 0x10000
+	FF1                                          = 0x8000
+	FFDLY                                        = 0x8000
+	FICLONE                                      = 0x40049409
+	FICLONERANGE                                 = 0x4020940d
+	FLUSHO                                       = 0x1000
+	FS_IOC_ENABLE_VERITY                         = 0x40806685
+	FS_IOC_GETFLAGS                              = 0x80086601
+	FS_IOC_GET_ENCRYPTION_NONCE                  = 0x8010661b
+	FS_IOC_GET_ENCRYPTION_POLICY                 = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT                 = 0x40106614
+	FS_IOC_SETFLAGS                              = 0x40086602
+	FS_IOC_SET_ENCRYPTION_POLICY                 = 0x800c6613
+	F_GETLK                                      = 0x5
+	F_GETLK64                                    = 0x5
+	F_GETOWN                                     = 0x9
+	F_RDLCK                                      = 0x0
+	F_SETLK                                      = 0x6
+	F_SETLK64                                    = 0x6
+	F_SETLKW                                     = 0x7
+	F_SETLKW64                                   = 0x7
+	F_SETOWN                                     = 0x8
+	F_UNLCK                                      = 0x2
+	F_WRLCK                                      = 0x1
+	HIDIOCGRAWINFO                               = 0x80084803
+	HIDIOCGRDESC                                 = 0x90044802
+	HIDIOCGRDESCSIZE                             = 0x80044801
+	HIDIOCREVOKE                                 = 0x4004480d
+	HUPCL                                        = 0x400
+	ICANON                                       = 0x2
+	IEXTEN                                       = 0x8000
+	IN_CLOEXEC                                   = 0x80000
+	IN_NONBLOCK                                  = 0x800
+	IOCTL_MEI_NOTIFY_GET                         = 0x80044803
+	IOCTL_MEI_NOTIFY_SET                         = 0x40044802
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID               = 0x7b9
+	IPV6_FLOWINFO_MASK                           = 0xffffff0f
+	IPV6_FLOWLABEL_MASK                          = 0xffff0f00
+	ISIG                                         = 0x1
+	IUCLC                                        = 0x200
+	IXOFF                                        = 0x1000
+	IXON                                         = 0x400
+	MAP_ANON                                     = 0x20
+	MAP_ANONYMOUS                                = 0x20
+	MAP_DENYWRITE                                = 0x800
+	MAP_EXECUTABLE                               = 0x1000
+	MAP_GROWSDOWN                                = 0x100
+	MAP_HUGETLB                                  = 0x40000
+	MAP_LOCKED                                   = 0x2000
+	MAP_NONBLOCK                                 = 0x10000
+	MAP_NORESERVE                                = 0x4000
+	MAP_POPULATE                                 = 0x8000
+	MAP_STACK                                    = 0x20000
+	MAP_SYNC                                     = 0x80000
+	MCL_CURRENT                                  = 0x1
+	MCL_FUTURE                                   = 0x2
+	MCL_ONFAULT                                  = 0x4
+	MEMERASE                                     = 0x40084d02
+	MEMERASE64                                   = 0x40104d14
+	MEMGETBADBLOCK                               = 0x40084d0b
+	MEMGETINFO                                   = 0x80204d01
+	MEMGETOOBSEL                                 = 0x80c84d0a
+	MEMGETREGIONCOUNT                            = 0x80044d07
+	MEMISLOCKED                                  = 0x80084d17
+	MEMLOCK                                      = 0x40084d05
+	MEMREAD                                      = 0xc0404d1a
+	MEMREADOOB                                   = 0xc0104d04
+	MEMSETBADBLOCK                               = 0x40084d0c
+	MEMUNLOCK                                    = 0x40084d06
+	MEMWRITEOOB                                  = 0xc0104d03
+	MTDFILEMODE                                  = 0x4d13
+	NFDBITS                                      = 0x40
+	NLDLY                                        = 0x100
+	NOFLSH                                       = 0x80
+	NS_GET_ID                                    = 0x8008b70d
+	NS_GET_MNTNS_ID                              = 0x8008b705
+	NS_GET_NSTYPE                                = 0xb703
+	NS_GET_OWNER_UID                             = 0xb704
+	NS_GET_PARENT                                = 0xb702
+	NS_GET_PID_FROM_PIDNS                        = 0x8004b706
+	NS_GET_PID_IN_PIDNS                          = 0x8004b708
+	NS_GET_TGID_FROM_PIDNS                       = 0x8004b707
+	NS_GET_TGID_IN_PIDNS                         = 0x8004b709
+	NS_GET_USERNS                                = 0xb701
+	OLCUC                                        = 0x2
+	ONLCR                                        = 0x4
+	OTPERASE                                     = 0x400c4d19
+	OTPGETREGIONCOUNT                            = 0x40044d0e
+	OTPGETREGIONINFO                             = 0x400c4d0f
+	OTPLOCK                                      = 0x800c4d10
+	OTPSELECT                                    = 0x80044d0d
+	O_APPEND                                     = 0x400
+	O_ASYNC                                      = 0x2000
+	O_CLOEXEC                                    = 0x80000
+	O_CREAT                                      = 0x40
+	O_DIRECT                                     = 0x4000
+	O_DIRECTORY                                  = 0x10000
+	O_DSYNC                                      = 0x1000
+	O_EXCL                                       = 0x80
+	O_FSYNC                                      = 0x101000
+	O_LARGEFILE                                  = 0x0
+	O_NDELAY                                     = 0x800
+	O_NOATIME                                    = 0x40000
+	O_NOCTTY                                     = 0x100
+	O_NOFOLLOW                                   = 0x20000
+	O_NONBLOCK                                   = 0x800
+	O_PATH                                       = 0x200000
+	O_RSYNC                                      = 0x101000
+	O_SYNC                                       = 0x101000
+	O_TMPFILE                                    = 0x410000
+	O_TRUNC                                      = 0x200
+	PARENB                                       = 0x100
+	PARODD                                       = 0x200
+	PENDIN                                       = 0x4000
+	PERF_EVENT_IOC_DISABLE                       = 0x2401
+	PERF_EVENT_IOC_ENABLE                        = 0x2400
+	PERF_EVENT_IOC_ID                            = 0x80082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES             = 0x4008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT                  = 0x40042409
+	PERF_EVENT_IOC_PERIOD                        = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF                     = 0xc008240a
+	PERF_EVENT_IOC_REFRESH                       = 0x2402
+	PERF_EVENT_IOC_RESET                         = 0x2403
+	PERF_EVENT_IOC_SET_BPF                       = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER                    = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT                    = 0x2405
+	PPPIOCATTACH                                 = 0x4004743d
+	PPPIOCATTCHAN                                = 0x40047438
+	PPPIOCBRIDGECHAN                             = 0x40047435
+	PPPIOCCONNECT                                = 0x4004743a
+	PPPIOCDETACH                                 = 0x4004743c
+	PPPIOCDISCONN                                = 0x7439
+	PPPIOCGASYNCMAP                              = 0x80047458
+	PPPIOCGCHAN                                  = 0x80047437
+	PPPIOCGDEBUG                                 = 0x80047441
+	PPPIOCGFLAGS                                 = 0x8004745a
+	PPPIOCGIDLE                                  = 0x8010743f
+	PPPIOCGIDLE32                                = 0x8008743f
+	PPPIOCGIDLE64                                = 0x8010743f
+	PPPIOCGL2TPSTATS                             = 0x80487436
+	PPPIOCGMRU                                   = 0x80047453
+	PPPIOCGRASYNCMAP                             = 0x80047455
+	PPPIOCGUNIT                                  = 0x80047456
+	PPPIOCGXASYNCMAP                             = 0x80207450
+	PPPIOCSACTIVE                                = 0x40107446
+	PPPIOCSASYNCMAP                              = 0x40047457
+	PPPIOCSCOMPRESS                              = 0x4010744d
+	PPPIOCSDEBUG                                 = 0x40047440
+	PPPIOCSFLAGS                                 = 0x40047459
+	PPPIOCSMAXCID                                = 0x40047451
+	PPPIOCSMRRU                                  = 0x4004743b
+	PPPIOCSMRU                                   = 0x40047452
+	PPPIOCSNPMODE                                = 0x4008744b
+	PPPIOCSPASS                                  = 0x40107447
+	PPPIOCSRASYNCMAP                             = 0x40047454
+	PPPIOCSXASYNCMAP                             = 0x4020744f
+	PPPIOCUNBRIDGECHAN                           = 0x7434
+	PPPIOCXFERUNIT                               = 0x744e
+	PR_SET_PTRACER_ANY                           = 0xffffffffffffffff
+	PTP_CLOCK_GETCAPS                            = 0x80503d01
+	PTP_CLOCK_GETCAPS2                           = 0x80503d0a
+	PTP_ENABLE_PPS                               = 0x40043d04
+	PTP_ENABLE_PPS2                              = 0x40043d0d
+	PTP_EXTTS_REQUEST                            = 0x40103d02
+	PTP_EXTTS_REQUEST2                           = 0x40103d0b
+	PTP_MASK_CLEAR_ALL                           = 0x3d13
+	PTP_MASK_EN_SINGLE                           = 0x40043d14
+	PTP_PEROUT_REQUEST                           = 0x40383d03
+	PTP_PEROUT_REQUEST2                          = 0x40383d0c
+	PTP_PIN_SETFUNC                              = 0x40603d07
+	PTP_PIN_SETFUNC2                             = 0x40603d10
+	PTP_SYS_OFFSET                               = 0x43403d05
+	PTP_SYS_OFFSET2                              = 0x43403d0e
+	PTRACE_CFI_BRANCH_EXPECTED_LANDING_PAD_BIT   = 0x2
+	PTRACE_CFI_BRANCH_EXPECTED_LANDING_PAD_STATE = 0x4
+	PTRACE_CFI_BRANCH_LANDING_PAD_EN_BIT         = 0x0
+	PTRACE_CFI_BRANCH_LANDING_PAD_EN_STATE       = 0x1
+	PTRACE_CFI_BRANCH_LANDING_PAD_LOCK_BIT       = 0x1
+	PTRACE_CFI_BRANCH_LANDING_PAD_LOCK_STATE     = 0x2
+	PTRACE_CFI_SHADOW_STACK_EN_BIT               = 0x3
+	PTRACE_CFI_SHADOW_STACK_EN_STATE             = 0x8
+	PTRACE_CFI_SHADOW_STACK_LOCK_BIT             = 0x4
+	PTRACE_CFI_SHADOW_STACK_LOCK_STATE           = 0x10
+	PTRACE_CFI_SHADOW_STACK_PTR_BIT              = 0x5
+	PTRACE_CFI_SHADOW_STACK_PTR_STATE            = 0x20
+	PTRACE_CFI_STATE_INVALID_MASK                = 0xffffffffffffffc0
+	PTRACE_GETFDPIC                              = 0x21
+	PTRACE_GETFDPIC_EXEC                         = 0x0
+	PTRACE_GETFDPIC_INTERP                       = 0x1
+	RLIMIT_AS                                    = 0x9
+	RLIMIT_MEMLOCK                               = 0x8
+	RLIMIT_NOFILE                                = 0x7
+	RLIMIT_NPROC                                 = 0x6
+	RLIMIT_RSS                                   = 0x5
+	RNDADDENTROPY                                = 0x40085203
+	RNDADDTOENTCNT                               = 0x40045201
+	RNDCLEARPOOL                                 = 0x5206
+	RNDGETENTCNT                                 = 0x80045200
+	RNDGETPOOL                                   = 0x80085202
+	RNDRESEEDCRNG                                = 0x5207
+	RNDZAPENTCNT                                 = 0x5204
+	RTC_AIE_OFF                                  = 0x7002
+	RTC_AIE_ON                                   = 0x7001
+	RTC_ALM_READ                                 = 0x80247008
+	RTC_ALM_SET                                  = 0x40247007
+	RTC_EPOCH_READ                               = 0x8008700d
+	RTC_EPOCH_SET                                = 0x4008700e
+	RTC_IRQP_READ                                = 0x8008700b
+	RTC_IRQP_SET                                 = 0x4008700c
+	RTC_PARAM_GET                                = 0x40187013
+	RTC_PARAM_SET                                = 0x40187014
+	RTC_PIE_OFF                                  = 0x7006
+	RTC_PIE_ON                                   = 0x7005
+	RTC_PLL_GET                                  = 0x80207011
+	RTC_PLL_SET                                  = 0x40207012
+	RTC_RD_TIME                                  = 0x80247009
+	RTC_SET_TIME                                 = 0x4024700a
+	RTC_UIE_OFF                                  = 0x7004
+	RTC_UIE_ON                                   = 0x7003
+	RTC_VL_CLR                                   = 0x7014
+	RTC_VL_READ                                  = 0x80047013
+	RTC_WIE_OFF                                  = 0x7010
+	RTC_WIE_ON                                   = 0x700f
+	RTC_WKALM_RD                                 = 0x80287010
+	RTC_WKALM_SET                                = 0x4028700f
+	SCM_DEVMEM_DMABUF                            = 0x4f
+	SCM_DEVMEM_LINEAR                            = 0x4e
+	SCM_INQ                                      = 0x54
+	SCM_TIMESTAMPING                             = 0x25
+	SCM_TIMESTAMPING_OPT_STATS                   = 0x36
+	SCM_TIMESTAMPING_PKTINFO                     = 0x3a
+	SCM_TIMESTAMPNS                              = 0x23
+	SCM_TS_OPT_ID                                = 0x51
+	SCM_TXTIME                                   = 0x3d
+	SCM_WIFI_STATUS                              = 0x29
+	SECCOMP_IOCTL_NOTIF_ADDFD                    = 0x40182103
+	SECCOMP_IOCTL_NOTIF_ID_VALID                 = 0x40082102
+	SECCOMP_IOCTL_NOTIF_SET_FLAGS                = 0x40082104
+	SFD_CLOEXEC                                  = 0x80000
+	SFD_NONBLOCK                                 = 0x800
+	SIOCATMARK                                   = 0x8905
+	SIOCGPGRP                                    = 0x8904
+	SIOCGSTAMPNS_NEW                             = 0x80108907
+	SIOCGSTAMP_NEW                               = 0x80108906
+	SIOCINQ                                      = 0x541b
+	SIOCOUTQ                                     = 0x5411
+	SIOCSPGRP                                    = 0x8902
+	SOCK_CLOEXEC                                 = 0x80000
+	SOCK_DGRAM                                   = 0x2
+	SOCK_NONBLOCK                                = 0x800
+	SOCK_STREAM                                  = 0x1
+	SOL_SOCKET                                   = 0x1
+	SO_ACCEPTCONN                                = 0x1e
+	SO_ATTACH_BPF                                = 0x32
+	SO_ATTACH_REUSEPORT_CBPF                     = 0x33
+	SO_ATTACH_REUSEPORT_EBPF                     = 0x34
+	SO_BINDTODEVICE                              = 0x19
+	SO_BINDTOIFINDEX                             = 0x3e
+	SO_BPF_EXTENSIONS                            = 0x30
+	SO_BROADCAST                                 = 0x6
+	SO_BSDCOMPAT                                 = 0xe
+	SO_BUF_LOCK                                  = 0x48
+	SO_BUSY_POLL                                 = 0x2e
+	SO_BUSY_POLL_BUDGET                          = 0x46
+	SO_CNX_ADVICE                                = 0x35
+	SO_COOKIE                                    = 0x39
+	SO_DETACH_REUSEPORT_BPF                      = 0x44
+	SO_DEVMEM_DMABUF                             = 0x4f
+	SO_DEVMEM_DONTNEED                           = 0x50
+	SO_DEVMEM_LINEAR                             = 0x4e
+	SO_DOMAIN                                    = 0x27
+	SO_DONTROUTE                                 = 0x5
+	SO_ERROR                                     = 0x4
+	SO_INCOMING_CPU                              = 0x31
+	SO_INCOMING_NAPI_ID                          = 0x38
+	SO_INQ                                       = 0x54
+	SO_KEEPALIVE                                 = 0x9
+	SO_LINGER                                    = 0xd
+	SO_LOCK_FILTER                               = 0x2c
+	SO_MARK                                      = 0x24
+	SO_MAX_PACING_RATE                           = 0x2f
+	SO_MEMINFO                                   = 0x37
+	SO_NETNS_COOKIE                              = 0x47
+	SO_NOFCS                                     = 0x2b
+	SO_OOBINLINE                                 = 0xa
+	SO_PASSCRED                                  = 0x10
+	SO_PASSPIDFD                                 = 0x4c
+	SO_PASSRIGHTS                                = 0x53
+	SO_PASSSEC                                   = 0x22
+	SO_PEEK_OFF                                  = 0x2a
+	SO_PEERCRED                                  = 0x11
+	SO_PEERGROUPS                                = 0x3b
+	SO_PEERPIDFD                                 = 0x4d
+	SO_PEERSEC                                   = 0x1f
+	SO_PREFER_BUSY_POLL                          = 0x45
+	SO_PROTOCOL                                  = 0x26
+	SO_RCVBUF                                    = 0x8
+	SO_RCVBUFFORCE                               = 0x21
+	SO_RCVLOWAT                                  = 0x12
+	SO_RCVMARK                                   = 0x4b
+	SO_RCVPRIORITY                               = 0x52
+	SO_RCVTIMEO                                  = 0x14
+	SO_RCVTIMEO_NEW                              = 0x42
+	SO_RCVTIMEO_OLD                              = 0x14
+	SO_RESERVE_MEM                               = 0x49
+	SO_REUSEADDR                                 = 0x2
+	SO_REUSEPORT                                 = 0xf
+	SO_RXQ_OVFL                                  = 0x28
+	SO_SECURITY_AUTHENTICATION                   = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK               = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT             = 0x17
+	SO_SELECT_ERR_QUEUE                          = 0x2d
+	SO_SNDBUF                                    = 0x7
+	SO_SNDBUFFORCE                               = 0x20
+	SO_SNDLOWAT                                  = 0x13
+	SO_SNDTIMEO                                  = 0x15
+	SO_SNDTIMEO_NEW                              = 0x43
+	SO_SNDTIMEO_OLD                              = 0x15
+	SO_TIMESTAMPING                              = 0x25
+	SO_TIMESTAMPING_NEW                          = 0x41
+	SO_TIMESTAMPING_OLD                          = 0x25
+	SO_TIMESTAMPNS                               = 0x23
+	SO_TIMESTAMPNS_NEW                           = 0x40
+	SO_TIMESTAMPNS_OLD                           = 0x23
+	SO_TIMESTAMP_NEW                             = 0x3f
+	SO_TXREHASH                                  = 0x4a
+	SO_TXTIME                                    = 0x3d
+	SO_TYPE                                      = 0x3
+	SO_WIFI_STATUS                               = 0x29
+	SO_ZEROCOPY                                  = 0x3c
+	TAB1                                         = 0x800
+	TAB2                                         = 0x1000
+	TAB3                                         = 0x1800
+	TABDLY                                       = 0x1800
+	TCFLSH                                       = 0x540b
+	TCGETA                                       = 0x5405
+	TCGETS                                       = 0x5401
+	TCGETS2                                      = 0x802c542a
+	TCGETX                                       = 0x5432
+	TCSAFLUSH                                    = 0x2
+	TCSBRK                                       = 0x5409
+	TCSBRKP                                      = 0x5425
+	TCSETA                                       = 0x5406
+	TCSETAF                                      = 0x5408
+	TCSETAW                                      = 0x5407
+	TCSETS                                       = 0x5402
+	TCSETS2                                      = 0x402c542b
+	TCSETSF                                      = 0x5404
+	TCSETSF2                                     = 0x402c542d
+	TCSETSW                                      = 0x5403
+	TCSETSW2                                     = 0x402c542c
+	TCSETX                                       = 0x5433
+	TCSETXF                                      = 0x5434
+	TCSETXW                                      = 0x5435
+	TCXONC                                       = 0x540a
+	TFD_CLOEXEC                                  = 0x80000
+	TFD_NONBLOCK                                 = 0x800
+	TIOCCBRK                                     = 0x5428
+	TIOCCONS                                     = 0x541d
+	TIOCEXCL                                     = 0x540c
+	TIOCGDEV                                     = 0x80045432
+	TIOCGETD                                     = 0x5424
+	TIOCGEXCL                                    = 0x80045440
+	TIOCGICOUNT                                  = 0x545d
+	TIOCGISO7816                                 = 0x80285442
+	TIOCGLCKTRMIOS                               = 0x5456
+	TIOCGPGRP                                    = 0x540f
+	TIOCGPKT                                     = 0x80045438
+	TIOCGPTLCK                                   = 0x80045439
+	TIOCGPTN                                     = 0x80045430
+	TIOCGPTPEER                                  = 0x5441
+	TIOCGRS485                                   = 0x542e
+	TIOCGSERIAL                                  = 0x541e
+	TIOCGSID                                     = 0x5429
+	TIOCGSOFTCAR                                 = 0x5419
+	TIOCGWINSZ                                   = 0x5413
+	TIOCINQ                                      = 0x541b
+	TIOCLINUX                                    = 0x541c
+	TIOCMBIC                                     = 0x5417
+	TIOCMBIS                                     = 0x5416
+	TIOCMGET                                     = 0x5415
+	TIOCMIWAIT                                   = 0x545c
+	TIOCMSET                                     = 0x5418
+	TIOCM_CAR                                    = 0x40
+	TIOCM_CD                                     = 0x40
+	TIOCM_CTS                                    = 0x20
+	TIOCM_DSR                                    = 0x100
+	TIOCM_RI                                     = 0x80
+	TIOCM_RNG                                    = 0x80
+	TIOCM_SR                                     = 0x10
+	TIOCM_ST                                     = 0x8
+	TIOCNOTTY                                    = 0x5422
+	TIOCNXCL                                     = 0x540d
+	TIOCOUTQ                                     = 0x5411
+	TIOCPKT                                      = 0x5420
+	TIOCSBRK                                     = 0x5427
+	TIOCSCTTY                                    = 0x540e
+	TIOCSERCONFIG                                = 0x5453
+	TIOCSERGETLSR                                = 0x5459
+	TIOCSERGETMULTI                              = 0x545a
+	TIOCSERGSTRUCT                               = 0x5458
+	TIOCSERGWILD                                 = 0x5454
+	TIOCSERSETMULTI                              = 0x545b
+	TIOCSERSWILD                                 = 0x5455
+	TIOCSER_TEMT                                 = 0x1
+	TIOCSETD                                     = 0x5423
+	TIOCSIG                                      = 0x40045436
+	TIOCSISO7816                                 = 0xc0285443
+	TIOCSLCKTRMIOS                               = 0x5457
+	TIOCSPGRP                                    = 0x5410
+	TIOCSPTLCK                                   = 0x40045431
+	TIOCSRS485                                   = 0x542f
+	TIOCSSERIAL                                  = 0x541f
+	TIOCSSOFTCAR                                 = 0x541a
+	TIOCSTI                                      = 0x5412
+	TIOCSWINSZ                                   = 0x5414
+	TIOCVHANGUP                                  = 0x5437
+	TOSTOP                                       = 0x100
+	TUNATTACHFILTER                              = 0x401054d5
+	TUNDETACHFILTER                              = 0x401054d6
+	TUNGETDEVNETNS                               = 0x54e3
+	TUNGETFEATURES                               = 0x800454cf
+	TUNGETFILTER                                 = 0x801054db
+	TUNGETIFF                                    = 0x800454d2
+	TUNGETSNDBUF                                 = 0x800454d3
+	TUNGETVNETBE                                 = 0x800454df
+	TUNGETVNETHDRSZ                              = 0x800454d7
+	TUNGETVNETLE                                 = 0x800454dd
+	TUNSETCARRIER                                = 0x400454e2
+	TUNSETDEBUG                                  = 0x400454c9
+	TUNSETFILTEREBPF                             = 0x800454e1
+	TUNSETGROUP                                  = 0x400454ce
+	TUNSETIFF                                    = 0x400454ca
+	TUNSETIFINDEX                                = 0x400454da
+	TUNSETLINK                                   = 0x400454cd
+	TUNSETNOCSUM                                 = 0x400454c8
+	TUNSETOFFLOAD                                = 0x400454d0
+	TUNSETOWNER                                  = 0x400454cc
+	TUNSETPERSIST                                = 0x400454cb
+	TUNSETQUEUE                                  = 0x400454d9
+	TUNSETSNDBUF                                 = 0x400454d4
+	TUNSETSTEERINGEBPF                           = 0x800454e0
+	TUNSETTXFILTER                               = 0x400454d1
+	TUNSETVNETBE                                 = 0x400454de
+	TUNSETVNETHDRSZ                              = 0x400454d8
+	TUNSETVNETLE                                 = 0x400454dc
+	UBI_IOCATT                                   = 0x40186f40
+	UBI_IOCDET                                   = 0x40046f41
+	UBI_IOCEBCH                                  = 0x40044f02
+	UBI_IOCEBER                                  = 0x40044f01
+	UBI_IOCEBISMAP                               = 0x80044f05
+	UBI_IOCEBMAP                                 = 0x40084f03
+	UBI_IOCEBUNMAP                               = 0x40044f04
+	UBI_IOCMKVOL                                 = 0x40986f00
+	UBI_IOCRMVOL                                 = 0x40046f01
+	UBI_IOCRNVOL                                 = 0x51106f03
+	UBI_IOCRPEB                                  = 0x40046f04
+	UBI_IOCRSVOL                                 = 0x400c6f02
+	UBI_IOCSETVOLPROP                            = 0x40104f06
+	UBI_IOCSPEB                                  = 0x40046f05
+	UBI_IOCVOLCRBLK                              = 0x40804f07
+	UBI_IOCVOLRMBLK                              = 0x4f08
+	UBI_IOCVOLUP                                 = 0x40084f00
+	VDISCARD                                     = 0xd
+	VEOF                                         = 0x4
+	VEOL                                         = 0xb
+	VEOL2                                        = 0x10
+	VMIN                                         = 0x6
+	VREPRINT                                     = 0xc
+	VSTART                                       = 0x8
+	VSTOP                                        = 0x9
+	VSUSP                                        = 0xa
+	VSWTC                                        = 0x7
+	VT1                                          = 0x4000
+	VTDLY                                        = 0x4000
+	VTIME                                        = 0x5
+	VWERASE                                      = 0xe
+	WDIOC_GETBOOTSTATUS                          = 0x80045702
+	WDIOC_GETPRETIMEOUT                          = 0x80045709
+	WDIOC_GETSTATUS                              = 0x80045701
+	WDIOC_GETSUPPORT                             = 0x80285700
+	WDIOC_GETTEMP                                = 0x80045703
+	WDIOC_GETTIMELEFT                            = 0x8004570a
+	WDIOC_GETTIMEOUT                             = 0x80045707
+	WDIOC_KEEPALIVE                              = 0x80045705
+	WDIOC_SETOPTIONS                             = 0x80045704
+	WORDSIZE                                     = 0x40
+	XCASE                                        = 0x4
+	XTABS                                        = 0x1800
+	_HIDIOCGRAWNAME                              = 0x80804804
+	_HIDIOCGRAWPHYS                              = 0x80404805
+	_HIDIOCGRAWUNIQ                              = 0x80404808
 )
 
 // Errors
@@ -585,6 +601,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -808,7 +826,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 64347eb35..6e87bd659 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -156,6 +156,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x8008b70d
 	NS_GET_MNTNS_ID                  = 0x8008b705
 	NS_GET_NSTYPE                    = 0xb703
 	NS_GET_OWNER_UID                 = 0xb704
@@ -367,6 +368,7 @@ const (
 	RTC_WKALM_SET                    = 0x4028700f
 	SCM_DEVMEM_DMABUF                = 0x4f
 	SCM_DEVMEM_LINEAR                = 0x4e
+	SCM_INQ                          = 0x54
 	SCM_TIMESTAMPING                 = 0x25
 	SCM_TIMESTAMPING_OPT_STATS       = 0x36
 	SCM_TIMESTAMPING_PKTINFO         = 0x3a
@@ -414,6 +416,7 @@ const (
 	SO_ERROR                         = 0x4
 	SO_INCOMING_CPU                  = 0x31
 	SO_INCOMING_NAPI_ID              = 0x38
+	SO_INQ                           = 0x54
 	SO_KEEPALIVE                     = 0x9
 	SO_LINGER                        = 0xd
 	SO_LOCK_FILTER                   = 0x2c
@@ -657,6 +660,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x59)
 	EDOTDOT         = syscall.Errno(0x49)
 	EDQUOT          = syscall.Errno(0x7a)
+	EFSBADCRC       = syscall.Errno(0x4a)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x70)
 	EHOSTUNREACH    = syscall.Errno(0x71)
 	EHWPOISON       = syscall.Errno(0x85)
@@ -880,7 +885,7 @@ var errorList = [...]struct {
 	{114, "EALREADY", "operation already in progress"},
 	{115, "EINPROGRESS", "operation now in progress"},
 	{116, "ESTALE", "stale file handle"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
index 7d7191171..7e2b2e8a6 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -161,6 +161,7 @@ const (
 	NFDBITS                          = 0x40
 	NLDLY                            = 0x100
 	NOFLSH                           = 0x80
+	NS_GET_ID                        = 0x4008b70d
 	NS_GET_MNTNS_ID                  = 0x4008b705
 	NS_GET_NSTYPE                    = 0x2000b703
 	NS_GET_OWNER_UID                 = 0x2000b704
@@ -358,6 +359,7 @@ const (
 	RTC_WKALM_SET                    = 0x8028700f
 	SCM_DEVMEM_DMABUF                = 0x58
 	SCM_DEVMEM_LINEAR                = 0x57
+	SCM_INQ                          = 0x5d
 	SCM_TIMESTAMPING                 = 0x23
 	SCM_TIMESTAMPING_OPT_STATS       = 0x38
 	SCM_TIMESTAMPING_PKTINFO         = 0x3c
@@ -453,6 +455,7 @@ const (
 	SO_ERROR                         = 0x1007
 	SO_INCOMING_CPU                  = 0x33
 	SO_INCOMING_NAPI_ID              = 0x3a
+	SO_INQ                           = 0x5d
 	SO_KEEPALIVE                     = 0x8
 	SO_LINGER                        = 0x80
 	SO_LOCK_FILTER                   = 0x28
@@ -694,6 +697,8 @@ const (
 	EDESTADDRREQ    = syscall.Errno(0x27)
 	EDOTDOT         = syscall.Errno(0x58)
 	EDQUOT          = syscall.Errno(0x45)
+	EFSBADCRC       = syscall.Errno(0x4c)
+	EFSCORRUPTED    = syscall.Errno(0x75)
 	EHOSTDOWN       = syscall.Errno(0x40)
 	EHOSTUNREACH    = syscall.Errno(0x41)
 	EHWPOISON       = syscall.Errno(0x87)
@@ -921,7 +926,7 @@ var errorList = [...]struct {
 	{114, "ELIBACC", "can not access a needed shared library"},
 	{115, "ENOTUNIQ", "name not unique on network"},
 	{116, "ERESTART", "interrupted system call should be restarted"},
-	{117, "EUCLEAN", "structure needs cleaning"},
+	{117, "EFSCORRUPTED", "structure needs cleaning"},
 	{118, "ENOTNAM", "not a XENIX named type file"},
 	{119, "ENAVAIL", "no XENIX semaphores available"},
 	{120, "EISNAM", "is a named type file"},
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
index 8935d10a3..5788c2a58 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
@@ -700,6 +700,23 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Eventfd(initval uint, flags int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
 	fd = int(r0)
@@ -1785,7 +1802,7 @@ func writev(fd int, iovs []Iovec) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) {
+func preadvSyscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(iovs) > 0 {
 		_p0 = unsafe.Pointer(&iovs[0])
@@ -1802,7 +1819,7 @@ func preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err er
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwritev(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) {
+func pwritevSyscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(iovs) > 0 {
 		_p0 = unsafe.Pointer(&iovs[0])
@@ -1819,7 +1836,7 @@ func pwritev(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func preadv2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) {
+func preadv2Syscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(iovs) > 0 {
 		_p0 = unsafe.Pointer(&iovs[0])
@@ -1836,7 +1853,7 @@ func preadv2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pwritev2(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) {
+func pwritev2Syscall(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr, flags int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(iovs) > 0 {
 		_p0 = unsafe.Pointer(&iovs[0])
@@ -2241,8 +2258,8 @@ func Mseal(b []byte, flags uint) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func setMemPolicy(mode int, mask *CPUSet, size int) (err error) {
-	_, _, e1 := Syscall(SYS_SET_MEMPOLICY, uintptr(mode), uintptr(unsafe.Pointer(mask)), uintptr(size))
+func setMemPolicy(mode int, mask unsafe.Pointer, size uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_SET_MEMPOLICY, uintptr(mode), uintptr(mask), uintptr(size))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index 4def3e9fc..254f33988 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64_64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index fef2bc8ba..27c05db1a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index a9fd76a88..840d85bfc 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -213,23 +213,6 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index 460065028..fe414498b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
index c8987d264..eb358ce05 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
index 921f43061..c437622f1 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset>>32), uintptr(offset), uintptr(length>>32), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index 44f067829..bc4ca2558 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index e7fa0abf0..5051435ce 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
index 8c5125675..33aa5418a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
index 7392fd45e..3bef8ef1d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 41180434e..fc1bd4e2c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index 40c6ce7ae..d78fe7dab 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
index 2cfe34adb..76dcf87d0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
index 61e6f0709..2cf020f2b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
index 834b84204..527637623 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
@@ -45,23 +45,6 @@ func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
index 1851df14e..6487475f0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
index 0b43c6936..f10201dac 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
@@ -498,6 +498,26 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $4
 DATA	·libc_pwrite_trampoline_addr(SB)/4, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readv(SB)
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $4
+DATA	·libc_readv_trampoline_addr(SB)/4, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_writev(SB)
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $4
+DATA	·libc_writev_trampoline_addr(SB)/4, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_preadv(SB)
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $4
+DATA	·libc_preadv_trampoline_addr(SB)/4, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_pwritev(SB)
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $4
+DATA	·libc_pwritev_trampoline_addr(SB)/4, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $4
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
index e1ec0dbe4..50980475d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
index 880c6d6e3..9de2cbaa4 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
@@ -498,6 +498,26 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readv(SB)
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_writev(SB)
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_preadv(SB)
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_pwritev(SB)
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
index 7c8452a63..33c9c3a43 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
index b8ef95b0f..c6b9175a6 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
@@ -498,6 +498,26 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $4
 DATA	·libc_pwrite_trampoline_addr(SB)/4, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readv(SB)
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $4
+DATA	·libc_readv_trampoline_addr(SB)/4, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_writev(SB)
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $4
+DATA	·libc_writev_trampoline_addr(SB)/4, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_preadv(SB)
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $4
+DATA	·libc_preadv_trampoline_addr(SB)/4, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_pwritev(SB)
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $4
+DATA	·libc_pwritev_trampoline_addr(SB)/4, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $4
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
index 2ffdf861f..d3410262e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
index 2af3b5c76..1be10bb45 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
@@ -498,6 +498,26 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readv(SB)
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_writev(SB)
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_preadv(SB)
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_pwritev(SB)
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
index 1da08d526..dea19d54e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
index b7a251353..a9fec24d9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
@@ -498,6 +498,26 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readv(SB)
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_writev(SB)
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_preadv(SB)
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_pwritev(SB)
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
index 6e85b0aac..436efb586 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
index f15dadf05..441ed4e40 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
@@ -597,6 +597,30 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	CALL	libc_readv(SB)
+	RET
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	CALL	libc_writev(SB)
+	RET
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	CALL	libc_preadv(SB)
+	RET
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	CALL	libc_pwritev(SB)
+	RET
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	CALL	libc_read(SB)
 	RET
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
index 28b487df2..d801e4b4e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
@@ -1633,6 +1633,90 @@ var libc_pwrite_trampoline_addr uintptr
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func readv(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_readv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_readv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_readv readv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writev(fd int, iovecs []Iovec) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(libc_writev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_writev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_writev writev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func preadv(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_preadv_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_preadv_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_preadv preadv "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pwritev(fd int, iovecs []Iovec, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(iovecs) > 0 {
+		_p0 = unsafe.Pointer(&iovecs[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall6(libc_pwritev_trampoline_addr, uintptr(fd), uintptr(_p0), uintptr(len(iovecs)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+var libc_pwritev_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
index 1e7f321e4..b15cc0174 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
@@ -498,6 +498,26 @@ TEXT libc_pwrite_trampoline<>(SB),NOSPLIT,$0-0
 GLOBL	·libc_pwrite_trampoline_addr(SB), RODATA, $8
 DATA	·libc_pwrite_trampoline_addr(SB)/8, $libc_pwrite_trampoline<>(SB)
 
+TEXT libc_readv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_readv(SB)
+GLOBL	·libc_readv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_readv_trampoline_addr(SB)/8, $libc_readv_trampoline<>(SB)
+
+TEXT libc_writev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_writev(SB)
+GLOBL	·libc_writev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_writev_trampoline_addr(SB)/8, $libc_writev_trampoline<>(SB)
+
+TEXT libc_preadv_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_preadv(SB)
+GLOBL	·libc_preadv_trampoline_addr(SB), RODATA, $8
+DATA	·libc_preadv_trampoline_addr(SB)/8, $libc_preadv_trampoline<>(SB)
+
+TEXT libc_pwritev_trampoline<>(SB),NOSPLIT,$0-0
+	JMP	libc_pwritev(SB)
+GLOBL	·libc_pwritev_trampoline_addr(SB), RODATA, $8
+DATA	·libc_pwritev_trampoline_addr(SB)/8, $libc_pwritev_trampoline<>(SB)
+
 TEXT libc_read_trampoline<>(SB),NOSPLIT,$0-0
 	JMP	libc_read(SB)
 GLOBL	·libc_read_trampoline_addr(SB), RODATA, $8
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
index aca56ee49..49d1b8803 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
@@ -463,4 +463,8 @@ const (
 	SYS_LISTXATTRAT                  = 465
 	SYS_REMOVEXATTRAT                = 466
 	SYS_OPEN_TREE_ATTR               = 467
+	SYS_FILE_GETATTR                 = 468
+	SYS_FILE_SETATTR                 = 469
+	SYS_LISTNS                       = 470
+	SYS_RSEQ_SLICE_YIELD             = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
index 2ea1ef58c..f11f1de77 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
@@ -342,6 +342,7 @@ const (
 	SYS_IO_PGETEVENTS           = 333
 	SYS_RSEQ                    = 334
 	SYS_URETPROBE               = 335
+	SYS_UPROBE                  = 336
 	SYS_PIDFD_SEND_SIGNAL       = 424
 	SYS_IO_URING_SETUP          = 425
 	SYS_IO_URING_ENTER          = 426
@@ -386,4 +387,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
index d22c8af31..bad740b79 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
@@ -427,4 +427,8 @@ const (
 	SYS_LISTXATTRAT                  = 465
 	SYS_REMOVEXATTRAT                = 466
 	SYS_OPEN_TREE_ATTR               = 467
+	SYS_FILE_GETATTR                 = 468
+	SYS_FILE_SETATTR                 = 469
+	SYS_LISTNS                       = 470
+	SYS_RSEQ_SLICE_YIELD             = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
index 5ee264ae9..fe646d18e 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
@@ -330,4 +330,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
index f9f03ebf5..4362f6d55 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
@@ -306,6 +306,7 @@ const (
 	SYS_LANDLOCK_CREATE_RULESET = 444
 	SYS_LANDLOCK_ADD_RULE       = 445
 	SYS_LANDLOCK_RESTRICT_SELF  = 446
+	SYS_MEMFD_SECRET            = 447
 	SYS_PROCESS_MRELEASE        = 448
 	SYS_FUTEX_WAITV             = 449
 	SYS_SET_MEMPOLICY_HOME_NODE = 450
@@ -326,4 +327,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
index 87c2118e8..b63d155ae 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
@@ -447,4 +447,8 @@ const (
 	SYS_LISTXATTRAT                  = 4465
 	SYS_REMOVEXATTRAT                = 4466
 	SYS_OPEN_TREE_ATTR               = 4467
+	SYS_FILE_GETATTR                 = 4468
+	SYS_FILE_SETATTR                 = 4469
+	SYS_LISTNS                       = 4470
+	SYS_RSEQ_SLICE_YIELD             = 4471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
index 391ad102f..435d43319 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
@@ -377,4 +377,8 @@ const (
 	SYS_LISTXATTRAT             = 5465
 	SYS_REMOVEXATTRAT           = 5466
 	SYS_OPEN_TREE_ATTR          = 5467
+	SYS_FILE_GETATTR            = 5468
+	SYS_FILE_SETATTR            = 5469
+	SYS_LISTNS                  = 5470
+	SYS_RSEQ_SLICE_YIELD        = 5471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
index 565615775..dcc0468d6 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
@@ -377,4 +377,8 @@ const (
 	SYS_LISTXATTRAT             = 5465
 	SYS_REMOVEXATTRAT           = 5466
 	SYS_OPEN_TREE_ATTR          = 5467
+	SYS_FILE_GETATTR            = 5468
+	SYS_FILE_SETATTR            = 5469
+	SYS_LISTNS                  = 5470
+	SYS_RSEQ_SLICE_YIELD        = 5471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
index 0482b52e3..b96f85ebd 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
@@ -447,4 +447,8 @@ const (
 	SYS_LISTXATTRAT                  = 4465
 	SYS_REMOVEXATTRAT                = 4466
 	SYS_OPEN_TREE_ATTR               = 4467
+	SYS_FILE_GETATTR                 = 4468
+	SYS_FILE_SETATTR                 = 4469
+	SYS_LISTNS                       = 4470
+	SYS_RSEQ_SLICE_YIELD             = 4471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
index 71806f08f..bffa2bd1e 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
@@ -454,4 +454,8 @@ const (
 	SYS_LISTXATTRAT                  = 465
 	SYS_REMOVEXATTRAT                = 466
 	SYS_OPEN_TREE_ATTR               = 467
+	SYS_FILE_GETATTR                 = 468
+	SYS_FILE_SETATTR                 = 469
+	SYS_LISTNS                       = 470
+	SYS_RSEQ_SLICE_YIELD             = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
index e35a71058..57bfc6b26 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
@@ -426,4 +426,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
index 2aea47670..750f706d5 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
@@ -426,4 +426,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
index 6c9bb4e56..303ccbf46 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
@@ -331,4 +331,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
index 680bc9915..5e5dd4ccb 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -392,4 +392,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
index 620f27105..f7c4fb3df 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
@@ -374,6 +374,7 @@ const (
 	SYS_FSMOUNT                 = 432
 	SYS_FSPICK                  = 433
 	SYS_PIDFD_OPEN              = 434
+	SYS_CLONE3                  = 435
 	SYS_CLOSE_RANGE             = 436
 	SYS_OPENAT2                 = 437
 	SYS_PIDFD_GETFD             = 438
@@ -405,4 +406,8 @@ const (
 	SYS_LISTXATTRAT             = 465
 	SYS_REMOVEXATTRAT           = 466
 	SYS_OPEN_TREE_ATTR          = 467
+	SYS_FILE_GETATTR            = 468
+	SYS_FILE_SETATTR            = 469
+	SYS_LISTNS                  = 470
+	SYS_RSEQ_SLICE_YIELD        = 471
 )
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index 45476a73c..526a0d5f4 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -18,6 +18,11 @@ type (
 	_C_long_long int64
 )
 
+type KernelTimespec struct {
+	Sec  int64
+	Nsec int64
+}
+
 type ItimerSpec struct {
 	Interval Timespec
 	Value    Timespec
@@ -521,6 +526,14 @@ type TCPInfo struct {
 	Total_rto            uint16
 	Total_rto_recoveries uint16
 	Total_rto_time       uint32
+	Received_ce          uint32
+	Delivered_e1_bytes   uint32
+	Delivered_e0_bytes   uint32
+	Delivered_ce_bytes   uint32
+	Received_e1_bytes    uint32
+	Received_e0_bytes    uint32
+	Received_ce_bytes    uint32
+	_                    [4]byte
 }
 
 type TCPVegasInfo struct {
@@ -586,7 +599,7 @@ const (
 	SizeofIPv6MTUInfo       = 0x20
 	SizeofICMPv6Filter      = 0x20
 	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0xf8
+	SizeofTCPInfo           = 0x118
 	SizeofTCPCCInfo         = 0x14
 	SizeofCanFilter         = 0x8
 	SizeofTCPRepairOpt      = 0x8
@@ -1324,7 +1337,7 @@ const (
 	PERF_RECORD_CGROUP                    = 0x13
 	PERF_RECORD_TEXT_POKE                 = 0x14
 	PERF_RECORD_AUX_OUTPUT_HW_ID          = 0x15
-	PERF_RECORD_MAX                       = 0x16
+	PERF_RECORD_MAX                       = 0x17
 	PERF_RECORD_KSYMBOL_TYPE_UNKNOWN      = 0x0
 	PERF_RECORD_KSYMBOL_TYPE_BPF          = 0x1
 	PERF_RECORD_KSYMBOL_TYPE_OOL          = 0x2
@@ -3566,7 +3579,7 @@ const (
 	DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES              = 0xae
 	DEVLINK_ATTR_NESTED_DEVLINK                        = 0xaf
 	DEVLINK_ATTR_SELFTESTS                             = 0xb0
-	DEVLINK_ATTR_MAX                                   = 0xb3
+	DEVLINK_ATTR_MAX                                   = 0xb7
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE              = 0x0
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX           = 0x1
 	DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT               = 0x0
@@ -3888,7 +3901,7 @@ const (
 	ETHTOOL_MSG_PHY_GET                       = 0x2d
 	ETHTOOL_MSG_TSCONFIG_GET                  = 0x2e
 	ETHTOOL_MSG_TSCONFIG_SET                  = 0x2f
-	ETHTOOL_MSG_USER_MAX                      = 0x2f
+	ETHTOOL_MSG_USER_MAX                      = 0x33
 	ETHTOOL_MSG_KERNEL_NONE                   = 0x0
 	ETHTOOL_MSG_STRSET_GET_REPLY              = 0x1
 	ETHTOOL_MSG_LINKINFO_GET_REPLY            = 0x2
@@ -3938,7 +3951,7 @@ const (
 	ETHTOOL_MSG_PHY_NTF                       = 0x2e
 	ETHTOOL_MSG_TSCONFIG_GET_REPLY            = 0x2f
 	ETHTOOL_MSG_TSCONFIG_SET_REPLY            = 0x30
-	ETHTOOL_MSG_KERNEL_MAX                    = 0x30
+	ETHTOOL_MSG_KERNEL_MAX                    = 0x36
 	ETHTOOL_FLAG_COMPACT_BITSETS              = 0x1
 	ETHTOOL_FLAG_OMIT_REPLY                   = 0x2
 	ETHTOOL_FLAG_STATS                        = 0x4
@@ -4867,7 +4880,7 @@ const (
 	NL80211_ATTR_MAC_HINT                                   = 0xc8
 	NL80211_ATTR_MAC_MASK                                   = 0xd7
 	NL80211_ATTR_MAX_AP_ASSOC_STA                           = 0xca
-	NL80211_ATTR_MAX                                        = 0x151
+	NL80211_ATTR_MAX                                        = 0x15c
 	NL80211_ATTR_MAX_CRIT_PROT_DURATION                     = 0xb4
 	NL80211_ATTR_MAX_CSA_COUNTERS                           = 0xce
 	NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS                     = 0x143
@@ -5082,12 +5095,12 @@ const (
 	NL80211_ATTR_WOWLAN_TRIGGERS                            = 0x75
 	NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED                  = 0x76
 	NL80211_ATTR_WPA_VERSIONS                               = 0x4b
-	NL80211_AUTHTYPE_AUTOMATIC                              = 0x8
+	NL80211_AUTHTYPE_AUTOMATIC                              = 0x9
 	NL80211_AUTHTYPE_FILS_PK                                = 0x7
 	NL80211_AUTHTYPE_FILS_SK                                = 0x5
 	NL80211_AUTHTYPE_FILS_SK_PFS                            = 0x6
 	NL80211_AUTHTYPE_FT                                     = 0x2
-	NL80211_AUTHTYPE_MAX                                    = 0x7
+	NL80211_AUTHTYPE_MAX                                    = 0x8
 	NL80211_AUTHTYPE_NETWORK_EAP                            = 0x3
 	NL80211_AUTHTYPE_OPEN_SYSTEM                            = 0x0
 	NL80211_AUTHTYPE_SAE                                    = 0x4
@@ -5120,7 +5133,7 @@ const (
 	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY                     = 0x3
 	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE                     = 0x5
 	NL80211_BAND_IFTYPE_ATTR_IFTYPES                        = 0x1
-	NL80211_BAND_IFTYPE_ATTR_MAX                            = 0xb
+	NL80211_BAND_IFTYPE_ATTR_MAX                            = 0xd
 	NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS                   = 0x7
 	NL80211_BAND_LC                                         = 0x5
 	NL80211_BAND_S1GHZ                                      = 0x4
@@ -5255,7 +5268,7 @@ const (
 	NL80211_CMD_LEAVE_MESH                                  = 0x45
 	NL80211_CMD_LEAVE_OCB                                   = 0x6d
 	NL80211_CMD_LINKS_REMOVED                               = 0x9a
-	NL80211_CMD_MAX                                         = 0x9d
+	NL80211_CMD_MAX                                         = 0x9f
 	NL80211_CMD_MICHAEL_MIC_FAILURE                         = 0x29
 	NL80211_CMD_MODIFY_LINK_STA                             = 0x97
 	NL80211_CMD_NAN_MATCH                                   = 0x78
@@ -5501,7 +5514,7 @@ const (
 	NL80211_FREQUENCY_ATTR_GO_CONCURRENT                    = 0xf
 	NL80211_FREQUENCY_ATTR_INDOOR_ONLY                      = 0xe
 	NL80211_FREQUENCY_ATTR_IR_CONCURRENT                    = 0xf
-	NL80211_FREQUENCY_ATTR_MAX                              = 0x22
+	NL80211_FREQUENCY_ATTR_MAX                              = 0x27
 	NL80211_FREQUENCY_ATTR_MAX_TX_POWER                     = 0x6
 	NL80211_FREQUENCY_ATTR_NO_10MHZ                         = 0x11
 	NL80211_FREQUENCY_ATTR_NO_160MHZ                        = 0xc
@@ -5766,7 +5779,7 @@ const (
 	NL80211_PMSR_FTM_CAPA_ATTR_ASAP                         = 0x1
 	NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS                   = 0x6
 	NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT          = 0x7
-	NL80211_PMSR_FTM_CAPA_ATTR_MAX                          = 0xa
+	NL80211_PMSR_FTM_CAPA_ATTR_MAX                          = 0x12
 	NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST           = 0x8
 	NL80211_PMSR_FTM_CAPA_ATTR_NON_ASAP                     = 0x2
 	NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED            = 0xa
@@ -5788,7 +5801,7 @@ const (
 	NL80211_PMSR_FTM_REQ_ATTR_BURST_PERIOD                  = 0x4
 	NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST                = 0x6
 	NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK                  = 0xc
-	NL80211_PMSR_FTM_REQ_ATTR_MAX                           = 0xd
+	NL80211_PMSR_FTM_REQ_ATTR_MAX                           = 0xe
 	NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED             = 0xb
 	NL80211_PMSR_FTM_REQ_ATTR_NUM_BURSTS_EXP                = 0x3
 	NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES              = 0x7
@@ -5806,7 +5819,7 @@ const (
 	NL80211_PMSR_FTM_RESP_ATTR_FAIL_REASON                  = 0x1
 	NL80211_PMSR_FTM_RESP_ATTR_FTMS_PER_BURST               = 0x8
 	NL80211_PMSR_FTM_RESP_ATTR_LCI                          = 0x13
-	NL80211_PMSR_FTM_RESP_ATTR_MAX                          = 0x15
+	NL80211_PMSR_FTM_RESP_ATTR_MAX                          = 0x16
 	NL80211_PMSR_FTM_RESP_ATTR_NUM_BURSTS_EXP               = 0x6
 	NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_ATTEMPTS            = 0x3
 	NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_SUCCESSES           = 0x4
@@ -5913,7 +5926,7 @@ const (
 	NL80211_RATE_INFO_HE_RU_ALLOC_52                        = 0x1
 	NL80211_RATE_INFO_HE_RU_ALLOC_996                       = 0x5
 	NL80211_RATE_INFO_HE_RU_ALLOC                           = 0x11
-	NL80211_RATE_INFO_MAX                                   = 0x1d
+	NL80211_RATE_INFO_MAX                                   = 0x20
 	NL80211_RATE_INFO_MCS                                   = 0x2
 	NL80211_RATE_INFO_S1G_MCS                               = 0x17
 	NL80211_RATE_INFO_S1G_NSS                               = 0x18
@@ -6167,7 +6180,7 @@ const (
 	NL80211_TXRATE_HT                                       = 0x2
 	NL80211_TXRATE_LEGACY                                   = 0x1
 	NL80211_TX_RATE_LIMITED                                 = 0x1
-	NL80211_TXRATE_MAX                                      = 0x7
+	NL80211_TXRATE_MAX                                      = 0xa
 	NL80211_TXRATE_MCS                                      = 0x2
 	NL80211_TXRATE_VHT                                      = 0x3
 	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT                 = 0x1
@@ -6183,7 +6196,7 @@ const (
 	NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE                     = 0x2
 	NL80211_WIPHY_RADIO_ATTR_INDEX                          = 0x1
 	NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION          = 0x3
-	NL80211_WIPHY_RADIO_ATTR_MAX                            = 0x4
+	NL80211_WIPHY_RADIO_ATTR_MAX                            = 0x5
 	NL80211_WIPHY_RADIO_FREQ_ATTR_END                       = 0x2
 	NL80211_WIPHY_RADIO_FREQ_ATTR_MAX                       = 0x2
 	NL80211_WIPHY_RADIO_FREQ_ATTR_START                     = 0x1
@@ -6384,3 +6397,79 @@ const (
 	MPOL_PREFERRED_MANY      = 0x5
 	MPOL_WEIGHTED_INTERLEAVE = 0x6
 )
+
+const (
+	GPIO_V2_GET_LINEINFO_IOCTL       = 0xc100b405
+	GPIO_V2_GET_LINE_IOCTL           = 0xc250b407
+	GPIO_V2_LINE_GET_VALUES_IOCTL    = 0xc010b40e
+	GPIO_V2_LINE_SET_VALUES_IOCTL    = 0xc010b40f
+	GPIO_V2_GET_LINEINFO_WATCH_IOCTL = 0xc100b406
+	GPIO_GET_LINEINFO_UNWATCH_IOCTL  = 0xc004b40c
+)
+const (
+	GPIO_V2_LINE_ATTR_ID_FLAGS         = 0x1
+	GPIO_V2_LINE_ATTR_ID_OUTPUT_VALUES = 0x2
+	GPIO_V2_LINE_ATTR_ID_DEBOUNCE      = 0x3
+	GPIO_V2_LINE_CHANGED_REQUESTED     = 0x1
+	GPIO_V2_LINE_CHANGED_RELEASED      = 0x2
+	GPIO_V2_LINE_CHANGED_CONFIG        = 0x3
+	GPIO_V2_LINE_EVENT_RISING_EDGE     = 0x1
+	GPIO_V2_LINE_EVENT_FALLING_EDGE    = 0x2
+)
+
+type GPIOChipInfo struct {
+	Name  [32]byte
+	Label [32]byte
+	Lines uint32
+}
+type GPIOV2LineValues struct {
+	Bits uint64
+	Mask uint64
+}
+type GPIOV2LineAttribute struct {
+	Id    uint32
+	_     uint32
+	Flags uint64
+}
+type GPIOV2LineConfigAttribute struct {
+	Attr GPIOV2LineAttribute
+	Mask uint64
+}
+type GPIOV2LineConfig struct {
+	Flags     uint64
+	Num_attrs uint32
+	_         [5]uint32
+	Attrs     [10]GPIOV2LineConfigAttribute
+}
+type GPIOV2LineRequest struct {
+	Offsets           [64]uint32
+	Consumer          [32]byte
+	Config            GPIOV2LineConfig
+	Num_lines         uint32
+	Event_buffer_size uint32
+	_                 [5]uint32
+	Fd                int32
+}
+type GPIOV2LineInfo struct {
+	Name      [32]byte
+	Consumer  [32]byte
+	Offset    uint32
+	Num_attrs uint32
+	Flags     uint64
+	Attrs     [10]GPIOV2LineAttribute
+	_         [4]uint32
+}
+type GPIOV2LineInfoChanged struct {
+	Info         GPIOV2LineInfo
+	Timestamp_ns uint64
+	Event_type   uint32
+	_            [5]uint32
+}
+type GPIOV2LineEvent struct {
+	Timestamp_ns uint64
+	Id           uint32
+	Offset       uint32
+	Seqno        uint32
+	Line_seqno   uint32
+	_            [6]uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
index 485f2d3a1..aede1de7f 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -354,6 +354,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint32
@@ -703,3 +711,7 @@ type SysvShmDesc struct {
 	_          uint32
 	_          uint32
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
index ecbd1ad8b..bb3bc4dc2 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -367,6 +367,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -717,3 +725,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
index 02f0463a4..1fdf4c517 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -345,6 +345,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint32
@@ -697,3 +705,7 @@ type SysvShmDesc struct {
 	_          uint32
 	_          uint32
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
index 6f4d400d2..063e6f0b4 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -346,6 +346,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -696,3 +704,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
index cd532cfa5..9cf836c70 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
@@ -347,6 +347,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -697,3 +705,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
index 413362085..1d222fcb3 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -350,6 +350,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint32
@@ -702,3 +710,7 @@ type SysvShmDesc struct {
 	Ctime_high uint16
 	_          uint16
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
index eaa37eb71..912cc4ab6 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -349,6 +349,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -699,3 +707,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
index 98ae6a1e4..1e358ef34 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -349,6 +349,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -699,3 +707,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
index cae196159..df59f32f5 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -350,6 +350,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint32
@@ -702,3 +710,7 @@ type SysvShmDesc struct {
 	Ctime_high uint16
 	_          uint16
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
index 6ce3b4e02..29355aa0b 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
@@ -357,6 +357,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint32
@@ -710,3 +718,7 @@ type SysvShmDesc struct {
 	_          uint32
 	_          [4]byte
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
index c7429c6a1..c6083a15d 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -356,6 +356,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -705,3 +713,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
index 4bf4baf4c..6321cc762 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -356,6 +356,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -705,3 +713,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
index e9709d70a..b44f402fe 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
@@ -374,6 +374,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -784,3 +792,7 @@ const (
 	RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE  = 0x6
 	RISCV_HWPROBE_WHICH_CPUS             = 0x1
 )
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
index fb44268ca..b22c795a6 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -369,6 +369,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -719,3 +727,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x8044b401
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
index 9c38265c7..0b18075b5 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
@@ -351,6 +351,14 @@ type Taskstats struct {
 	Wpcopy_delay_min          uint64
 	Irq_delay_max             uint64
 	Irq_delay_min             uint64
+	Cpu_delay_max_ts          KernelTimespec
+	Blkio_delay_max_ts        KernelTimespec
+	Swapin_delay_max_ts       KernelTimespec
+	Freepages_delay_max_ts    KernelTimespec
+	Thrashing_delay_max_ts    KernelTimespec
+	Compact_delay_max_ts      KernelTimespec
+	Wpcopy_delay_max_ts       KernelTimespec
+	Irq_delay_max_ts          KernelTimespec
 }
 
 type cpuMask uint64
@@ -700,3 +708,7 @@ type SysvShmDesc struct {
 	_      uint64
 	_      uint64
 }
+
+const (
+	GPIO_GET_CHIPINFO_IOCTL = 0x4044b401
+)
diff --git a/vendor/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go
index 3ca814f54..1157b06d8 100644
--- a/vendor/golang.org/x/sys/windows/dll_windows.go
+++ b/vendor/golang.org/x/sys/windows/dll_windows.go
@@ -163,42 +163,7 @@ func (p *Proc) Addr() uintptr {
 // (according to the semantics of the specific function being called) before consulting
 // the error. The error will be guaranteed to contain windows.Errno.
 func (p *Proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
-	switch len(a) {
-	case 0:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), 0, 0, 0)
-	case 1:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], 0, 0)
-	case 2:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], 0)
-	case 3:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], a[2])
-	case 4:
-		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], 0, 0)
-	case 5:
-		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], 0)
-	case 6:
-		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5])
-	case 7:
-		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
-	case 8:
-		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
-	case 9:
-		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
-	case 10:
-		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
-	case 11:
-		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
-	case 12:
-		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
-	case 13:
-		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
-	case 14:
-		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
-	case 15:
-		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
-	default:
-		panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".")
-	}
+	return syscall.SyscallN(p.Addr(), a...)
 }
 
 // A LazyDLL implements access to a single DLL.
diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go
index a8b0364c7..783621561 100644
--- a/vendor/golang.org/x/sys/windows/security_windows.go
+++ b/vendor/golang.org/x/sys/windows/security_windows.go
@@ -1109,17 +1109,53 @@ const (
 )
 
 // This type is the union inside of TRUSTEE and must be created using one of the TrusteeValueFrom* functions.
+//
+// Go pointers stored in a TrusteeValue must be pinned using [runtime.Pinner]
+// for the lifetime of the TrusteeValue.
 type TrusteeValue uintptr
 
+// TrusteeValueFromString is unsafe and should not be used.
+//
+// It returns a uintptr containing a reference to newly-allocated memory
+// which will be freed by the garbage collector.
+// There is no way for the caller to safely reference this memory.
+//
+// To create a [TrusteeValue] from a string, use:
+//
+//	p, err := windows.UTF16PtrFromString(s)
+//	if err != nil {
+//		// handle error
+//	}
+//
+//	// Pin the string for as long as it is used.
+//	var pinner runtime.Pinner
+//	pinner.Pin(p)
+//	defer pinner.Unpin()
+//
+//	tv := TrusteeValue(unsafe.Pointer(p))
+//
+// Deprecated: TrusteeValueFromString is unsafe and should not be used.
 func TrusteeValueFromString(str string) TrusteeValue {
 	return TrusteeValue(unsafe.Pointer(StringToUTF16Ptr(str)))
 }
+
+// TrusteeValueFromSID returns a [TrusteeValue] referencing sid.
+//
+// The caller must pin sid using a [runtime.Pinner] for the lifetime of the TrusteeValue.
 func TrusteeValueFromSID(sid *SID) TrusteeValue {
 	return TrusteeValue(unsafe.Pointer(sid))
 }
+
+// TrusteeValueFromObjectsAndSid returns a [TrusteeValue] referencing objectsAndSid.
+//
+// The caller must pin objectsAndSid using a [runtime.Pinner] for the lifetime of the TrusteeValue.
 func TrusteeValueFromObjectsAndSid(objectsAndSid *OBJECTS_AND_SID) TrusteeValue {
 	return TrusteeValue(unsafe.Pointer(objectsAndSid))
 }
+
+// TrusteeValueFromObjectsAndName returns a [TrusteeValue] referencing objectsAndName.
+//
+// The caller must pin objectsAndName using a [runtime.Pinner] for the lifetime of the TrusteeValue.
 func TrusteeValueFromObjectsAndName(objectsAndName *OBJECTS_AND_NAME) TrusteeValue {
 	return TrusteeValue(unsafe.Pointer(objectsAndName))
 }
@@ -1438,13 +1474,17 @@ func GetSecurityInfo(handle Handle, objectType SE_OBJECT_TYPE, securityInformati
 }
 
 // GetNamedSecurityInfo queries the security information for a given named object and returns the self-relative security
-// descriptor result on the Go heap.
+// descriptor result on the Go heap. The security descriptor might be nil, even when err is nil, if the object exists
+// but has no security descriptor.
 func GetNamedSecurityInfo(objectName string, objectType SE_OBJECT_TYPE, securityInformation SECURITY_INFORMATION) (sd *SECURITY_DESCRIPTOR, err error) {
 	var winHeapSD *SECURITY_DESCRIPTOR
 	err = getNamedSecurityInfo(objectName, objectType, securityInformation, nil, nil, nil, nil, &winHeapSD)
 	if err != nil {
 		return
 	}
+	if winHeapSD == nil {
+		return nil, nil
+	}
 	defer LocalFree(Handle(unsafe.Pointer(winHeapSD)))
 	return winHeapSD.copySelfRelativeSecurityDescriptor(), nil
 }
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index d76643658..e6966b4c3 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -452,6 +452,7 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	RtlInitString(destinationString *NTString, sourceString *byte) = ntdll.RtlInitString
 //sys	NtCreateFile(handle *Handle, access uint32, oa *OBJECT_ATTRIBUTES, iosb *IO_STATUS_BLOCK, allocationSize *int64, attributes uint32, share uint32, disposition uint32, options uint32, eabuffer uintptr, ealength uint32) (ntstatus error) = ntdll.NtCreateFile
 //sys	NtCreateNamedPipeFile(pipe *Handle, access uint32, oa *OBJECT_ATTRIBUTES, iosb *IO_STATUS_BLOCK, share uint32, disposition uint32, options uint32, typ uint32, readMode uint32, completionMode uint32, maxInstances uint32, inboundQuota uint32, outputQuota uint32, timeout *int64) (ntstatus error) = ntdll.NtCreateNamedPipeFile
+//sys	NtQueryInformationFile(handle Handle, iosb *IO_STATUS_BLOCK, outBuffer *byte, outBufferLen uint32, class uint32) (ntstatus error) = ntdll.NtQueryInformationFile
 //sys	NtSetInformationFile(handle Handle, iosb *IO_STATUS_BLOCK, inBuffer *byte, inBufferLen uint32, class uint32) (ntstatus error) = ntdll.NtSetInformationFile
 //sys	RtlDosPathNameToNtPathName(dosName *uint16, ntName *NTUnicodeString, ntFileNamePart *uint16, relativeName *RTL_RELATIVE_NAME) (ntstatus error) = ntdll.RtlDosPathNameToNtPathName_U_WithStatus
 //sys	RtlDosPathNameToRelativeNtPathName(dosName *uint16, ntName *NTUnicodeString, ntFileNamePart *uint16, relativeName *RTL_RELATIVE_NAME) (ntstatus error) = ntdll.RtlDosPathNameToRelativeNtPathName_U_WithStatus
@@ -460,6 +461,8 @@ func NewCallbackCDecl(fn interface{}) uintptr {
 //sys	NtSetInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe.Pointer, procInfoLen uint32) (ntstatus error) = ntdll.NtSetInformationProcess
 //sys	NtQuerySystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInfoLen uint32, retLen *uint32) (ntstatus error) = ntdll.NtQuerySystemInformation
 //sys	NtSetSystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInfoLen uint32) (ntstatus error) = ntdll.NtSetSystemInformation
+//sys	NtQueryEaFile(handle Handle, iosb *IO_STATUS_BLOCK, outBuffer *byte, outBufferLen uint32, returnSingleEntry bool, eaList *byte, eaListLen uint32, eaIndex *uint32, restartScan bool) (ntstatus error) = ntdll.NtQueryEaFile
+//sys	NtSetEaFile(handle Handle, iosb *IO_STATUS_BLOCK, inBuffer *byte, inBufferLen uint32) (ntstatus error) = ntdll.NtSetEaFile
 //sys	RtlAddFunctionTable(functionTable *RUNTIME_FUNCTION, entryCount uint32, baseAddress uintptr) (ret bool) = ntdll.RtlAddFunctionTable
 //sys	RtlDeleteFunctionTable(functionTable *RUNTIME_FUNCTION) (ret bool) = ntdll.RtlDeleteFunctionTable
 
@@ -892,9 +895,13 @@ const socket_error = uintptr(^uint32(0))
 //sys	MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) = kernel32.MultiByteToWideChar
 //sys	getBestInterfaceEx(sockaddr unsafe.Pointer, pdwBestIfIndex *uint32) (errcode error) = iphlpapi.GetBestInterfaceEx
 //sys   GetIfEntry2Ex(level uint32, row *MibIfRow2) (errcode error) = iphlpapi.GetIfEntry2Ex
+//sys   GetIfTable2Ex(level uint32, table **MibIfTable2) (errcode error) = iphlpapi.GetIfTable2Ex
 //sys   GetIpForwardEntry2(row *MibIpForwardRow2) (errcode error) = iphlpapi.GetIpForwardEntry2
 //sys   GetIpForwardTable2(family uint16, table **MibIpForwardTable2) (errcode error) = iphlpapi.GetIpForwardTable2
+//sys   GetIpInterfaceEntry(row *MibIpInterfaceRow) (errcode error) = iphlpapi.GetIpInterfaceEntry
+//sys   GetIpInterfaceTable(family uint16, table **MibIpInterfaceTable) (errcode error) = iphlpapi.GetIpInterfaceTable
 //sys   GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) = iphlpapi.GetUnicastIpAddressEntry
+//sys   GetUnicastIpAddressTable(family uint16, table **MibUnicastIpAddressTable) (errcode error) = iphlpapi.GetUnicastIpAddressTable
 //sys   FreeMibTable(memory unsafe.Pointer) = iphlpapi.FreeMibTable
 //sys   NotifyIpInterfaceChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyIpInterfaceChange
 //sys   NotifyRouteChange2(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyRouteChange2
@@ -1693,10 +1700,13 @@ func NewNTUnicodeString(s string) (*NTUnicodeString, error) {
 	if err != nil {
 		return nil, err
 	}
-	n := uint16(len(s16) * 2)
+	n := len(s16) * 2
+	if n > (1<<16)-1 {
+		return nil, syscall.EINVAL
+	}
 	return &NTUnicodeString{
-		Length:        n - 2, // subtract 2 bytes for the NULL terminator
-		MaximumLength: n,
+		Length:        uint16(n) - 2, // subtract 2 bytes for the NULL terminator
+		MaximumLength: uint16(n),
 		Buffer:        &s16[0],
 	}, nil
 }
@@ -1718,11 +1728,15 @@ func (s *NTUnicodeString) String() string {
 // the more common *uint16 string type.
 func NewNTString(s string) (*NTString, error) {
 	var nts NTString
-	s8, err := BytePtrFromString(s)
+	s8, err := ByteSliceFromString(s)
 	if err != nil {
 		return nil, err
 	}
-	RtlInitString(&nts, s8)
+	// The source string plus its terminating NUL must fit within MAX_USHORT.
+	if len(s8) > MAX_USHORT {
+		return nil, syscall.EINVAL
+	}
+	RtlInitString(&nts, &s8[0])
 	return &nts, nil
 }
 
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
index d5658a138..75a50b316 100644
--- a/vendor/golang.org/x/sys/windows/types_windows.go
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -169,6 +169,7 @@ const (
 	FORMAT_MESSAGE_ARGUMENT_ARRAY  = 8192
 	FORMAT_MESSAGE_MAX_WIDTH_MASK  = 255
 
+	MAX_USHORT    = 0xffff
 	MAX_PATH      = 260
 	MAX_LONG_PATH = 32768
 
@@ -2320,6 +2321,21 @@ type MibIfRow2 struct {
 	OutQLen                     uint64
 }
 
+// MIB_IF_TABLE_LEVEL enumeration from netioapi.h or
+// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ne-netioapi-mib_if_table_level.
+const (
+	MibIfTableNormal                  = 0
+	MibIfTableRaw                     = 1
+	MibIfTableNormalWithoutStatistics = 2
+)
+
+// MibIfTable2 contains a table of logical and physical interface entries. See
+// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_if_table2.
+type MibIfTable2 struct {
+	NumEntries uint32
+	Table      [1]MibIfRow2
+}
+
 // IP_ADDRESS_PREFIX stores an IP address prefix. See
 // https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-ip_address_prefix.
 type IpAddressPrefix struct {
@@ -2413,6 +2429,13 @@ type MibUnicastIpAddressRow struct {
 	CreationTimeStamp  Filetime
 }
 
+// MibUnicastIpAddressTable contains a table of unicast IP address entries. See
+// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_unicastipaddress_table.
+type MibUnicastIpAddressTable struct {
+	NumEntries uint32
+	Table      [1]MibUnicastIpAddressRow
+}
+
 const ScopeLevelCount = 16
 
 // MIB_IPINTERFACE_ROW stores interface management information for a particular IP address family on a network interface.
@@ -2455,6 +2478,13 @@ type MibIpInterfaceRow struct {
 	DisableDefaultRoutes                 uint8
 }
 
+// MibIpInterfaceTable contains a table of IP interface entries. See
+// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_ipinterface_table.
+type MibIpInterfaceTable struct {
+	NumEntries uint32
+	Table      [1]MibIpInterfaceRow
+}
+
 // Console related constants used for the mode parameter to SetConsoleMode. See
 // https://docs.microsoft.com/en-us/windows/console/setconsolemode for details.
 
@@ -3014,8 +3044,10 @@ const (
 )
 
 const (
-	// FileInformationClass for NtSetInformationFile
+	// FileInformationClass for NtSetInformationFile/NtQueryInformationFile, see
+	// https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/ne-wdm-_file_information_class
 	FileBasicInformation                         = 4
+	FileEaInformation                            = 7
 	FileRenameInformation                        = 10
 	FileDispositionInformation                   = 13
 	FilePositionInformation                      = 14
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index fe7a4ea12..192d19300 100644
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -188,9 +188,13 @@ var (
 	procGetBestInterfaceEx                                   = modiphlpapi.NewProc("GetBestInterfaceEx")
 	procGetIfEntry                                           = modiphlpapi.NewProc("GetIfEntry")
 	procGetIfEntry2Ex                                        = modiphlpapi.NewProc("GetIfEntry2Ex")
+	procGetIfTable2Ex                                        = modiphlpapi.NewProc("GetIfTable2Ex")
 	procGetIpForwardEntry2                                   = modiphlpapi.NewProc("GetIpForwardEntry2")
 	procGetIpForwardTable2                                   = modiphlpapi.NewProc("GetIpForwardTable2")
+	procGetIpInterfaceEntry                                  = modiphlpapi.NewProc("GetIpInterfaceEntry")
+	procGetIpInterfaceTable                                  = modiphlpapi.NewProc("GetIpInterfaceTable")
 	procGetUnicastIpAddressEntry                             = modiphlpapi.NewProc("GetUnicastIpAddressEntry")
+	procGetUnicastIpAddressTable                             = modiphlpapi.NewProc("GetUnicastIpAddressTable")
 	procNotifyIpInterfaceChange                              = modiphlpapi.NewProc("NotifyIpInterfaceChange")
 	procNotifyRouteChange2                                   = modiphlpapi.NewProc("NotifyRouteChange2")
 	procNotifyUnicastIpAddressChange                         = modiphlpapi.NewProc("NotifyUnicastIpAddressChange")
@@ -424,8 +428,11 @@ var (
 	procNetUserGetInfo                                       = modnetapi32.NewProc("NetUserGetInfo")
 	procNtCreateFile                                         = modntdll.NewProc("NtCreateFile")
 	procNtCreateNamedPipeFile                                = modntdll.NewProc("NtCreateNamedPipeFile")
+	procNtQueryEaFile                                        = modntdll.NewProc("NtQueryEaFile")
+	procNtQueryInformationFile                               = modntdll.NewProc("NtQueryInformationFile")
 	procNtQueryInformationProcess                            = modntdll.NewProc("NtQueryInformationProcess")
 	procNtQuerySystemInformation                             = modntdll.NewProc("NtQuerySystemInformation")
+	procNtSetEaFile                                          = modntdll.NewProc("NtSetEaFile")
 	procNtSetInformationFile                                 = modntdll.NewProc("NtSetInformationFile")
 	procNtSetInformationProcess                              = modntdll.NewProc("NtSetInformationProcess")
 	procNtSetSystemInformation                               = modntdll.NewProc("NtSetSystemInformation")
@@ -1674,6 +1681,14 @@ func GetIfEntry2Ex(level uint32, row *MibIfRow2) (errcode error) {
 	return
 }
 
+func GetIfTable2Ex(level uint32, table **MibIfTable2) (errcode error) {
+	r0, _, _ := syscall.SyscallN(procGetIfTable2Ex.Addr(), uintptr(level), uintptr(unsafe.Pointer(table)))
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
 func GetIpForwardEntry2(row *MibIpForwardRow2) (errcode error) {
 	r0, _, _ := syscall.SyscallN(procGetIpForwardEntry2.Addr(), uintptr(unsafe.Pointer(row)))
 	if r0 != 0 {
@@ -1690,6 +1705,22 @@ func GetIpForwardTable2(family uint16, table **MibIpForwardTable2) (errcode erro
 	return
 }
 
+func GetIpInterfaceEntry(row *MibIpInterfaceRow) (errcode error) {
+	r0, _, _ := syscall.SyscallN(procGetIpInterfaceEntry.Addr(), uintptr(unsafe.Pointer(row)))
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
+func GetIpInterfaceTable(family uint16, table **MibIpInterfaceTable) (errcode error) {
+	r0, _, _ := syscall.SyscallN(procGetIpInterfaceTable.Addr(), uintptr(family), uintptr(unsafe.Pointer(table)))
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
 func GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) {
 	r0, _, _ := syscall.SyscallN(procGetUnicastIpAddressEntry.Addr(), uintptr(unsafe.Pointer(row)))
 	if r0 != 0 {
@@ -1698,6 +1729,14 @@ func GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) {
 	return
 }
 
+func GetUnicastIpAddressTable(family uint16, table **MibUnicastIpAddressTable) (errcode error) {
+	r0, _, _ := syscall.SyscallN(procGetUnicastIpAddressTable.Addr(), uintptr(family), uintptr(unsafe.Pointer(table)))
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
 func NotifyIpInterfaceChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) {
 	var _p0 uint32
 	if initialNotification {
@@ -3704,6 +3743,30 @@ func NtCreateNamedPipeFile(pipe *Handle, access uint32, oa *OBJECT_ATTRIBUTES, i
 	return
 }
 
+func NtQueryEaFile(handle Handle, iosb *IO_STATUS_BLOCK, outBuffer *byte, outBufferLen uint32, returnSingleEntry bool, eaList *byte, eaListLen uint32, eaIndex *uint32, restartScan bool) (ntstatus error) {
+	var _p0 uint32
+	if returnSingleEntry {
+		_p0 = 1
+	}
+	var _p1 uint32
+	if restartScan {
+		_p1 = 1
+	}
+	r0, _, _ := syscall.SyscallN(procNtQueryEaFile.Addr(), uintptr(handle), uintptr(unsafe.Pointer(iosb)), uintptr(unsafe.Pointer(outBuffer)), uintptr(outBufferLen), uintptr(_p0), uintptr(unsafe.Pointer(eaList)), uintptr(eaListLen), uintptr(unsafe.Pointer(eaIndex)), uintptr(_p1))
+	if r0 != 0 {
+		ntstatus = NTStatus(r0)
+	}
+	return
+}
+
+func NtQueryInformationFile(handle Handle, iosb *IO_STATUS_BLOCK, outBuffer *byte, outBufferLen uint32, class uint32) (ntstatus error) {
+	r0, _, _ := syscall.SyscallN(procNtQueryInformationFile.Addr(), uintptr(handle), uintptr(unsafe.Pointer(iosb)), uintptr(unsafe.Pointer(outBuffer)), uintptr(outBufferLen), uintptr(class))
+	if r0 != 0 {
+		ntstatus = NTStatus(r0)
+	}
+	return
+}
+
 func NtQueryInformationProcess(proc Handle, procInfoClass int32, procInfo unsafe.Pointer, procInfoLen uint32, retLen *uint32) (ntstatus error) {
 	r0, _, _ := syscall.SyscallN(procNtQueryInformationProcess.Addr(), uintptr(proc), uintptr(procInfoClass), uintptr(procInfo), uintptr(procInfoLen), uintptr(unsafe.Pointer(retLen)))
 	if r0 != 0 {
@@ -3720,6 +3783,14 @@ func NtQuerySystemInformation(sysInfoClass int32, sysInfo unsafe.Pointer, sysInf
 	return
 }
 
+func NtSetEaFile(handle Handle, iosb *IO_STATUS_BLOCK, inBuffer *byte, inBufferLen uint32) (ntstatus error) {
+	r0, _, _ := syscall.SyscallN(procNtSetEaFile.Addr(), uintptr(handle), uintptr(unsafe.Pointer(iosb)), uintptr(unsafe.Pointer(inBuffer)), uintptr(inBufferLen))
+	if r0 != 0 {
+		ntstatus = NTStatus(r0)
+	}
+	return
+}
+
 func NtSetInformationFile(handle Handle, iosb *IO_STATUS_BLOCK, inBuffer *byte, inBufferLen uint32, class uint32) (ntstatus error) {
 	r0, _, _ := syscall.SyscallN(procNtSetInformationFile.Addr(), uintptr(handle), uintptr(unsafe.Pointer(iosb)), uintptr(unsafe.Pointer(inBuffer)), uintptr(inBufferLen), uintptr(class))
 	if r0 != 0 {
diff --git a/vendor/golang.org/x/text/cases/cases.go b/vendor/golang.org/x/text/cases/cases.go
new file mode 100644
index 000000000..752cdf031
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/cases.go
@@ -0,0 +1,162 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go gen_trieval.go
+
+// Package cases provides general and language-specific case mappers.
+package cases // import "golang.org/x/text/cases"
+
+import (
+	"golang.org/x/text/language"
+	"golang.org/x/text/transform"
+)
+
+// References:
+// - Unicode Reference Manual Chapter 3.13, 4.2, and 5.18.
+// - https://www.unicode.org/reports/tr29/
+// - https://www.unicode.org/Public/6.3.0/ucd/CaseFolding.txt
+// - https://www.unicode.org/Public/6.3.0/ucd/SpecialCasing.txt
+// - https://www.unicode.org/Public/6.3.0/ucd/DerivedCoreProperties.txt
+// - https://www.unicode.org/Public/6.3.0/ucd/auxiliary/WordBreakProperty.txt
+// - https://www.unicode.org/Public/6.3.0/ucd/auxiliary/WordBreakTest.txt
+// - http://userguide.icu-project.org/transforms/casemappings
+
+// TODO:
+// - Case folding
+// - Wide and Narrow?
+// - Segmenter option for title casing.
+// - ASCII fast paths
+// - Encode Soft-Dotted property within trie somehow.
+
+// A Caser transforms given input to a certain case. It implements
+// transform.Transformer.
+//
+// A Caser may be stateful and should therefore not be shared between
+// goroutines.
+type Caser struct {
+	t transform.SpanningTransformer
+}
+
+// Bytes returns a new byte slice with the result of converting b to the case
+// form implemented by c.
+func (c Caser) Bytes(b []byte) []byte {
+	b, _, _ = transform.Bytes(c.t, b)
+	return b
+}
+
+// String returns a string with the result of transforming s to the case form
+// implemented by c.
+func (c Caser) String(s string) string {
+	s, _, _ = transform.String(c.t, s)
+	return s
+}
+
+// Reset resets the Caser to be reused for new input after a previous call to
+// Transform.
+func (c Caser) Reset() { c.t.Reset() }
+
+// Transform implements the transform.Transformer interface and transforms the
+// given input to the case form implemented by c.
+func (c Caser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	return c.t.Transform(dst, src, atEOF)
+}
+
+// Span implements the transform.SpanningTransformer interface.
+func (c Caser) Span(src []byte, atEOF bool) (n int, err error) {
+	return c.t.Span(src, atEOF)
+}
+
+// Upper returns a Caser for language-specific uppercasing.
+func Upper(t language.Tag, opts ...Option) Caser {
+	return Caser{makeUpper(t, getOpts(opts...))}
+}
+
+// Lower returns a Caser for language-specific lowercasing.
+func Lower(t language.Tag, opts ...Option) Caser {
+	return Caser{makeLower(t, getOpts(opts...))}
+}
+
+// Title returns a Caser for language-specific title casing. It uses an
+// approximation of the default Unicode Word Break algorithm.
+func Title(t language.Tag, opts ...Option) Caser {
+	return Caser{makeTitle(t, getOpts(opts...))}
+}
+
+// Fold returns a Caser that implements Unicode case folding. The returned Caser
+// is stateless and safe to use concurrently by multiple goroutines.
+//
+// Case folding does not normalize the input and may not preserve a normal form.
+// Use the collate or search package for more convenient and linguistically
+// sound comparisons. Use golang.org/x/text/secure/precis for string comparisons
+// where security aspects are a concern.
+func Fold(opts ...Option) Caser {
+	return Caser{makeFold(getOpts(opts...))}
+}
+
+// An Option is used to modify the behavior of a Caser.
+type Option func(o options) options
+
+// TODO: consider these options to take a boolean as well, like FinalSigma.
+// The advantage of using this approach is that other providers of a lower-case
+// algorithm could set different defaults by prefixing a user-provided slice
+// of options with their own. This is handy, for instance, for the precis
+// package which would override the default to not handle the Greek final sigma.
+
+var (
+	// NoLower disables the lowercasing of non-leading letters for a title
+	// caser.
+	NoLower Option = noLower
+
+	// Compact omits mappings in case folding for characters that would grow the
+	// input. (Unimplemented.)
+	Compact Option = compact
+)
+
+// TODO: option to preserve a normal form, if applicable?
+
+type options struct {
+	noLower bool
+	simple  bool
+
+	// TODO: segmenter, max ignorable, alternative versions, etc.
+
+	ignoreFinalSigma bool
+}
+
+func getOpts(o ...Option) (res options) {
+	for _, f := range o {
+		res = f(res)
+	}
+	return
+}
+
+func noLower(o options) options {
+	o.noLower = true
+	return o
+}
+
+func compact(o options) options {
+	o.simple = true
+	return o
+}
+
+// HandleFinalSigma specifies whether the special handling of Greek final sigma
+// should be enabled. Unicode prescribes handling the Greek final sigma for all
+// locales, but standards like IDNA and PRECIS override this default.
+func HandleFinalSigma(enable bool) Option {
+	if enable {
+		return handleFinalSigma
+	}
+	return ignoreFinalSigma
+}
+
+func ignoreFinalSigma(o options) options {
+	o.ignoreFinalSigma = true
+	return o
+}
+
+func handleFinalSigma(o options) options {
+	o.ignoreFinalSigma = false
+	return o
+}
diff --git a/vendor/golang.org/x/text/cases/context.go b/vendor/golang.org/x/text/cases/context.go
new file mode 100644
index 000000000..a28f45d7b
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/context.go
@@ -0,0 +1,376 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cases
+
+import "golang.org/x/text/transform"
+
+// A context is used for iterating over source bytes, fetching case info and
+// writing to a destination buffer.
+//
+// Casing operations may need more than one rune of context to decide how a rune
+// should be cased. Casing implementations should call checkpoint on context
+// whenever it is known to be safe to return the runes processed so far.
+//
+// It is recommended for implementations to not allow for more than 30 case
+// ignorables as lookahead (analogous to the limit in norm) and to use state if
+// unbounded lookahead is needed for cased runes.
+type context struct {
+	dst, src []byte
+	atEOF    bool
+
+	pDst int // pDst points past the last written rune in dst.
+	pSrc int // pSrc points to the start of the currently scanned rune.
+
+	// checkpoints safe to return in Transform, where nDst <= pDst and nSrc <= pSrc.
+	nDst, nSrc int
+	err        error
+
+	sz   int  // size of current rune
+	info info // case information of currently scanned rune
+
+	// State preserved across calls to Transform.
+	isMidWord bool // false if next cased letter needs to be title-cased.
+}
+
+func (c *context) Reset() {
+	c.isMidWord = false
+}
+
+// ret returns the return values for the Transform method. It checks whether
+// there were insufficient bytes in src to complete and introduces an error
+// accordingly, if necessary.
+func (c *context) ret() (nDst, nSrc int, err error) {
+	if c.err != nil || c.nSrc == len(c.src) {
+		return c.nDst, c.nSrc, c.err
+	}
+	// This point is only reached by mappers if there was no short destination
+	// buffer. This means that the source buffer was exhausted and that c.sz was
+	// set to 0 by next.
+	if c.atEOF && c.pSrc == len(c.src) {
+		return c.pDst, c.pSrc, nil
+	}
+	return c.nDst, c.nSrc, transform.ErrShortSrc
+}
+
+// retSpan returns the return values for the Span method. It checks whether
+// there were insufficient bytes in src to complete and introduces an error
+// accordingly, if necessary.
+func (c *context) retSpan() (n int, err error) {
+	_, nSrc, err := c.ret()
+	return nSrc, err
+}
+
+// checkpoint sets the return value buffer points for Transform to the current
+// positions.
+func (c *context) checkpoint() {
+	if c.err == nil {
+		c.nDst, c.nSrc = c.pDst, c.pSrc+c.sz
+	}
+}
+
+// unreadRune causes the last rune read by next to be reread on the next
+// invocation of next. Only one unreadRune may be called after a call to next.
+func (c *context) unreadRune() {
+	c.sz = 0
+}
+
+func (c *context) next() bool {
+	c.pSrc += c.sz
+	if c.pSrc == len(c.src) || c.err != nil {
+		c.info, c.sz = 0, 0
+		return false
+	}
+	v, sz := trie.lookup(c.src[c.pSrc:])
+	c.info, c.sz = info(v), sz
+	if c.sz == 0 {
+		if c.atEOF {
+			// A zero size means we have an incomplete rune. If we are atEOF,
+			// this means it is an illegal rune, which we will consume one
+			// byte at a time.
+			c.sz = 1
+		} else {
+			c.err = transform.ErrShortSrc
+			return false
+		}
+	}
+	return true
+}
+
+// writeBytes adds bytes to dst.
+func (c *context) writeBytes(b []byte) bool {
+	if len(c.dst)-c.pDst < len(b) {
+		c.err = transform.ErrShortDst
+		return false
+	}
+	// This loop is faster than using copy.
+	for _, ch := range b {
+		c.dst[c.pDst] = ch
+		c.pDst++
+	}
+	return true
+}
+
+// writeString writes the given string to dst.
+func (c *context) writeString(s string) bool {
+	if len(c.dst)-c.pDst < len(s) {
+		c.err = transform.ErrShortDst
+		return false
+	}
+	// This loop is faster than using copy.
+	for i := 0; i < len(s); i++ {
+		c.dst[c.pDst] = s[i]
+		c.pDst++
+	}
+	return true
+}
+
+// copy writes the current rune to dst.
+func (c *context) copy() bool {
+	return c.writeBytes(c.src[c.pSrc : c.pSrc+c.sz])
+}
+
+// copyXOR copies the current rune to dst and modifies it by applying the XOR
+// pattern of the case info. It is the responsibility of the caller to ensure
+// that this is a rune with a XOR pattern defined.
+func (c *context) copyXOR() bool {
+	if !c.copy() {
+		return false
+	}
+	if c.info&xorIndexBit == 0 {
+		// Fast path for 6-bit XOR pattern, which covers most cases.
+		c.dst[c.pDst-1] ^= byte(c.info >> xorShift)
+	} else {
+		// Interpret XOR bits as an index.
+		// TODO: test performance for unrolling this loop. Verify that we have
+		// at least two bytes and at most three.
+		idx := c.info >> xorShift
+		for p := c.pDst - 1; ; p-- {
+			c.dst[p] ^= xorData[idx]
+			idx--
+			if xorData[idx] == 0 {
+				break
+			}
+		}
+	}
+	return true
+}
+
+// hasPrefix returns true if src[pSrc:] starts with the given string.
+func (c *context) hasPrefix(s string) bool {
+	b := c.src[c.pSrc:]
+	if len(b) < len(s) {
+		return false
+	}
+	for i, c := range b[:len(s)] {
+		if c != s[i] {
+			return false
+		}
+	}
+	return true
+}
+
+// caseType returns an info with only the case bits, normalized to either
+// cLower, cUpper, cTitle or cUncased.
+func (c *context) caseType() info {
+	cm := c.info & 0x7
+	if cm < 4 {
+		return cm
+	}
+	if cm >= cXORCase {
+		// xor the last bit of the rune with the case type bits.
+		b := c.src[c.pSrc+c.sz-1]
+		return info(b&1) ^ cm&0x3
+	}
+	if cm == cIgnorableCased {
+		return cLower
+	}
+	return cUncased
+}
+
+// lower writes the lowercase version of the current rune to dst.
+func lower(c *context) bool {
+	ct := c.caseType()
+	if c.info&hasMappingMask == 0 || ct == cLower {
+		return c.copy()
+	}
+	if c.info&exceptionBit == 0 {
+		return c.copyXOR()
+	}
+	e := exceptions[c.info>>exceptionShift:]
+	offset := 2 + e[0]&lengthMask // size of header + fold string
+	if nLower := (e[1] >> lengthBits) & lengthMask; nLower != noChange {
+		return c.writeString(e[offset : offset+nLower])
+	}
+	return c.copy()
+}
+
+func isLower(c *context) bool {
+	ct := c.caseType()
+	if c.info&hasMappingMask == 0 || ct == cLower {
+		return true
+	}
+	if c.info&exceptionBit == 0 {
+		c.err = transform.ErrEndOfSpan
+		return false
+	}
+	e := exceptions[c.info>>exceptionShift:]
+	if nLower := (e[1] >> lengthBits) & lengthMask; nLower != noChange {
+		c.err = transform.ErrEndOfSpan
+		return false
+	}
+	return true
+}
+
+// upper writes the uppercase version of the current rune to dst.
+func upper(c *context) bool {
+	ct := c.caseType()
+	if c.info&hasMappingMask == 0 || ct == cUpper {
+		return c.copy()
+	}
+	if c.info&exceptionBit == 0 {
+		return c.copyXOR()
+	}
+	e := exceptions[c.info>>exceptionShift:]
+	offset := 2 + e[0]&lengthMask // size of header + fold string
+	// Get length of first special case mapping.
+	n := (e[1] >> lengthBits) & lengthMask
+	if ct == cTitle {
+		// The first special case mapping is for lower. Set n to the second.
+		if n == noChange {
+			n = 0
+		}
+		n, e = e[1]&lengthMask, e[n:]
+	}
+	if n != noChange {
+		return c.writeString(e[offset : offset+n])
+	}
+	return c.copy()
+}
+
+// isUpper reports whether the current rune is in upper case.
+func isUpper(c *context) bool {
+	ct := c.caseType()
+	if c.info&hasMappingMask == 0 || ct == cUpper {
+		return true
+	}
+	if c.info&exceptionBit == 0 {
+		c.err = transform.ErrEndOfSpan
+		return false
+	}
+	e := exceptions[c.info>>exceptionShift:]
+	// Get length of first special case mapping.
+	n := (e[1] >> lengthBits) & lengthMask
+	if ct == cTitle {
+		n = e[1] & lengthMask
+	}
+	if n != noChange {
+		c.err = transform.ErrEndOfSpan
+		return false
+	}
+	return true
+}
+
+// title writes the title case version of the current rune to dst.
+func title(c *context) bool {
+	ct := c.caseType()
+	if c.info&hasMappingMask == 0 || ct == cTitle {
+		return c.copy()
+	}
+	if c.info&exceptionBit == 0 {
+		if ct == cLower {
+			return c.copyXOR()
+		}
+		return c.copy()
+	}
+	// Get the exception data.
+	e := exceptions[c.info>>exceptionShift:]
+	offset := 2 + e[0]&lengthMask // size of header + fold string
+
+	nFirst := (e[1] >> lengthBits) & lengthMask
+	if nTitle := e[1] & lengthMask; nTitle != noChange {
+		if nFirst != noChange {
+			e = e[nFirst:]
+		}
+		return c.writeString(e[offset : offset+nTitle])
+	}
+	if ct == cLower && nFirst != noChange {
+		// Use the uppercase version instead.
+		return c.writeString(e[offset : offset+nFirst])
+	}
+	// Already in correct case.
+	return c.copy()
+}
+
+// isTitle reports whether the current rune is in title case.
+func isTitle(c *context) bool {
+	ct := c.caseType()
+	if c.info&hasMappingMask == 0 || ct == cTitle {
+		return true
+	}
+	if c.info&exceptionBit == 0 {
+		if ct == cLower {
+			c.err = transform.ErrEndOfSpan
+			return false
+		}
+		return true
+	}
+	// Get the exception data.
+	e := exceptions[c.info>>exceptionShift:]
+	if nTitle := e[1] & lengthMask; nTitle != noChange {
+		c.err = transform.ErrEndOfSpan
+		return false
+	}
+	nFirst := (e[1] >> lengthBits) & lengthMask
+	if ct == cLower && nFirst != noChange {
+		c.err = transform.ErrEndOfSpan
+		return false
+	}
+	return true
+}
+
+// foldFull writes the foldFull version of the current rune to dst.
+func foldFull(c *context) bool {
+	if c.info&hasMappingMask == 0 {
+		return c.copy()
+	}
+	ct := c.caseType()
+	if c.info&exceptionBit == 0 {
+		if ct != cLower || c.info&inverseFoldBit != 0 {
+			return c.copyXOR()
+		}
+		return c.copy()
+	}
+	e := exceptions[c.info>>exceptionShift:]
+	n := e[0] & lengthMask
+	if n == 0 {
+		if ct == cLower {
+			return c.copy()
+		}
+		n = (e[1] >> lengthBits) & lengthMask
+	}
+	return c.writeString(e[2 : 2+n])
+}
+
+// isFoldFull reports whether the current run is mapped to foldFull
+func isFoldFull(c *context) bool {
+	if c.info&hasMappingMask == 0 {
+		return true
+	}
+	ct := c.caseType()
+	if c.info&exceptionBit == 0 {
+		if ct != cLower || c.info&inverseFoldBit != 0 {
+			c.err = transform.ErrEndOfSpan
+			return false
+		}
+		return true
+	}
+	e := exceptions[c.info>>exceptionShift:]
+	n := e[0] & lengthMask
+	if n == 0 && ct == cLower {
+		return true
+	}
+	c.err = transform.ErrEndOfSpan
+	return false
+}
diff --git a/vendor/golang.org/x/text/cases/fold.go b/vendor/golang.org/x/text/cases/fold.go
new file mode 100644
index 000000000..85cc434fa
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/fold.go
@@ -0,0 +1,34 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cases
+
+import "golang.org/x/text/transform"
+
+type caseFolder struct{ transform.NopResetter }
+
+// caseFolder implements the Transformer interface for doing case folding.
+func (t *caseFolder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	c := context{dst: dst, src: src, atEOF: atEOF}
+	for c.next() {
+		foldFull(&c)
+		c.checkpoint()
+	}
+	return c.ret()
+}
+
+func (t *caseFolder) Span(src []byte, atEOF bool) (n int, err error) {
+	c := context{src: src, atEOF: atEOF}
+	for c.next() && isFoldFull(&c) {
+		c.checkpoint()
+	}
+	return c.retSpan()
+}
+
+func makeFold(o options) transform.SpanningTransformer {
+	// TODO: Special case folding, through option Language, Special/Turkic, or
+	// both.
+	// TODO: Implement Compact options.
+	return &caseFolder{}
+}
diff --git a/vendor/golang.org/x/text/cases/icu.go b/vendor/golang.org/x/text/cases/icu.go
new file mode 100644
index 000000000..db7c237cc
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/icu.go
@@ -0,0 +1,61 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build icu
+
+package cases
+
+// Ideally these functions would be defined in a test file, but go test doesn't
+// allow CGO in tests. The build tag should ensure either way that these
+// functions will not end up in the package.
+
+// TODO: Ensure that the correct ICU version is set.
+
+/*
+#cgo LDFLAGS: -licui18n.57 -licuuc.57
+#include 
+#include 
+#include 
+#include 
+#include 
+*/
+import "C"
+
+import "unsafe"
+
+func doICU(tag, caser, input string) string {
+	err := C.UErrorCode(0)
+	loc := C.CString(tag)
+	cm := C.ucasemap_open(loc, C.uint32_t(0), &err)
+
+	buf := make([]byte, len(input)*4)
+	dst := (*C.char)(unsafe.Pointer(&buf[0]))
+	src := C.CString(input)
+
+	cn := C.int32_t(0)
+
+	switch caser {
+	case "fold":
+		cn = C.ucasemap_utf8FoldCase(cm,
+			dst, C.int32_t(len(buf)),
+			src, C.int32_t(len(input)),
+			&err)
+	case "lower":
+		cn = C.ucasemap_utf8ToLower(cm,
+			dst, C.int32_t(len(buf)),
+			src, C.int32_t(len(input)),
+			&err)
+	case "upper":
+		cn = C.ucasemap_utf8ToUpper(cm,
+			dst, C.int32_t(len(buf)),
+			src, C.int32_t(len(input)),
+			&err)
+	case "title":
+		cn = C.ucasemap_utf8ToTitle(cm,
+			dst, C.int32_t(len(buf)),
+			src, C.int32_t(len(input)),
+			&err)
+	}
+	return string(buf[:cn])
+}
diff --git a/vendor/golang.org/x/text/cases/info.go b/vendor/golang.org/x/text/cases/info.go
new file mode 100644
index 000000000..87a7c3e95
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/info.go
@@ -0,0 +1,82 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cases
+
+func (c info) cccVal() info {
+	if c&exceptionBit != 0 {
+		return info(exceptions[c>>exceptionShift]) & cccMask
+	}
+	return c & cccMask
+}
+
+func (c info) cccType() info {
+	ccc := c.cccVal()
+	if ccc <= cccZero {
+		return cccZero
+	}
+	return ccc
+}
+
+// TODO: Implement full Unicode breaking algorithm:
+// 1) Implement breaking in separate package.
+// 2) Use the breaker here.
+// 3) Compare table size and performance of using the more generic breaker.
+//
+// Note that we can extend the current algorithm to be much more accurate. This
+// only makes sense, though, if the performance and/or space penalty of using
+// the generic breaker is big. Extra data will only be needed for non-cased
+// runes, which means there are sufficient bits left in the caseType.
+// ICU prohibits breaking in such cases as well.
+
+// For the purpose of title casing we use an approximation of the Unicode Word
+// Breaking algorithm defined in Annex #29:
+// https://www.unicode.org/reports/tr29/#Default_Grapheme_Cluster_Table.
+//
+// For our approximation, we group the Word Break types into the following
+// categories, with associated rules:
+//
+// 1) Letter:
+//    ALetter, Hebrew_Letter, Numeric, ExtendNumLet, Extend, Format_FE, ZWJ.
+//    Rule: Never break between consecutive runes of this category.
+//
+// 2) Mid:
+//    MidLetter, MidNumLet, Single_Quote.
+//    (Cf. case-ignorable: MidLetter, MidNumLet, Single_Quote or cat is Mn,
+//    Me, Cf, Lm or Sk).
+//    Rule: Don't break between Letter and Mid, but break between two Mids.
+//
+// 3) Break:
+//    Any other category: NewLine, MidNum, CR, LF, Double_Quote, Katakana, and
+//    Other.
+//    These categories should always result in a break between two cased letters.
+//    Rule: Always break.
+//
+// Note 1: the Katakana and MidNum categories can, in esoteric cases, result in
+// preventing a break between two cased letters. For now we will ignore this
+// (e.g. [ALetter] [ExtendNumLet] [Katakana] [ExtendNumLet] [ALetter] and
+// [ALetter] [Numeric] [MidNum] [Numeric] [ALetter].)
+//
+// Note 2: the rule for Mid is very approximate, but works in most cases. To
+// improve, we could store the categories in the trie value and use a FA to
+// manage breaks. See TODO comment above.
+//
+// Note 3: according to the spec, it is possible for the Extend category to
+// introduce breaks between other categories grouped in Letter. However, this
+// is undesirable for our purposes. ICU prevents breaks in such cases as well.
+
+// isBreak returns whether this rune should introduce a break.
+func (c info) isBreak() bool {
+	return c.cccVal() == cccBreak
+}
+
+// isLetter returns whether the rune is of break type ALetter, Hebrew_Letter,
+// Numeric, ExtendNumLet, or Extend.
+func (c info) isLetter() bool {
+	ccc := c.cccVal()
+	if ccc == cccZero {
+		return !c.isCaseIgnorable()
+	}
+	return ccc != cccBreak
+}
diff --git a/vendor/golang.org/x/text/cases/map.go b/vendor/golang.org/x/text/cases/map.go
new file mode 100644
index 000000000..51a683092
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/map.go
@@ -0,0 +1,816 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cases
+
+// This file contains the definitions of case mappings for all supported
+// languages. The rules for the language-specific tailorings were taken and
+// modified from the CLDR transform definitions in common/transforms.
+
+import (
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"golang.org/x/text/internal"
+	"golang.org/x/text/language"
+	"golang.org/x/text/transform"
+	"golang.org/x/text/unicode/norm"
+)
+
+// A mapFunc takes a context set to the current rune and writes the mapped
+// version to the same context. It may advance the context to the next rune. It
+// returns whether a checkpoint is possible: whether the pDst bytes written to
+// dst so far won't need changing as we see more source bytes.
+type mapFunc func(*context) bool
+
+// A spanFunc takes a context set to the current rune and returns whether this
+// rune would be altered when written to the output. It may advance the context
+// to the next rune. It returns whether a checkpoint is possible.
+type spanFunc func(*context) bool
+
+// maxIgnorable defines the maximum number of ignorables to consider for
+// lookahead operations.
+const maxIgnorable = 30
+
+// supported lists the language tags for which we have tailorings.
+const supported = "und af az el lt nl tr"
+
+func init() {
+	tags := []language.Tag{}
+	for _, s := range strings.Split(supported, " ") {
+		tags = append(tags, language.MustParse(s))
+	}
+	matcher = internal.NewInheritanceMatcher(tags)
+	Supported = language.NewCoverage(tags)
+}
+
+var (
+	matcher *internal.InheritanceMatcher
+
+	Supported language.Coverage
+
+	// We keep the following lists separate, instead of having a single per-
+	// language struct, to give the compiler a chance to remove unused code.
+
+	// Some uppercase mappers are stateless, so we can precompute the
+	// Transformers and save a bit on runtime allocations.
+	upperFunc = []struct {
+		upper mapFunc
+		span  spanFunc
+	}{
+		{nil, nil},                  // und
+		{nil, nil},                  // af
+		{aztrUpper(upper), isUpper}, // az
+		{elUpper, noSpan},           // el
+		{ltUpper(upper), noSpan},    // lt
+		{nil, nil},                  // nl
+		{aztrUpper(upper), isUpper}, // tr
+	}
+
+	undUpper            transform.SpanningTransformer = &undUpperCaser{}
+	undLower            transform.SpanningTransformer = &undLowerCaser{}
+	undLowerIgnoreSigma transform.SpanningTransformer = &undLowerIgnoreSigmaCaser{}
+
+	lowerFunc = []mapFunc{
+		nil,       // und
+		nil,       // af
+		aztrLower, // az
+		nil,       // el
+		ltLower,   // lt
+		nil,       // nl
+		aztrLower, // tr
+	}
+
+	titleInfos = []struct {
+		title     mapFunc
+		lower     mapFunc
+		titleSpan spanFunc
+		rewrite   func(*context)
+	}{
+		{title, lower, isTitle, nil},                // und
+		{title, lower, isTitle, afnlRewrite},        // af
+		{aztrUpper(title), aztrLower, isTitle, nil}, // az
+		{title, lower, isTitle, nil},                // el
+		{ltUpper(title), ltLower, noSpan, nil},      // lt
+		{nlTitle, lower, nlTitleSpan, afnlRewrite},  // nl
+		{aztrUpper(title), aztrLower, isTitle, nil}, // tr
+	}
+)
+
+func makeUpper(t language.Tag, o options) transform.SpanningTransformer {
+	_, i, _ := matcher.Match(t)
+	f := upperFunc[i].upper
+	if f == nil {
+		return undUpper
+	}
+	return &simpleCaser{f: f, span: upperFunc[i].span}
+}
+
+func makeLower(t language.Tag, o options) transform.SpanningTransformer {
+	_, i, _ := matcher.Match(t)
+	f := lowerFunc[i]
+	if f == nil {
+		if o.ignoreFinalSigma {
+			return undLowerIgnoreSigma
+		}
+		return undLower
+	}
+	if o.ignoreFinalSigma {
+		return &simpleCaser{f: f, span: isLower}
+	}
+	return &lowerCaser{
+		first:   f,
+		midWord: finalSigma(f),
+	}
+}
+
+func makeTitle(t language.Tag, o options) transform.SpanningTransformer {
+	_, i, _ := matcher.Match(t)
+	x := &titleInfos[i]
+	lower := x.lower
+	if o.noLower {
+		lower = (*context).copy
+	} else if !o.ignoreFinalSigma {
+		lower = finalSigma(lower)
+	}
+	return &titleCaser{
+		title:     x.title,
+		lower:     lower,
+		titleSpan: x.titleSpan,
+		rewrite:   x.rewrite,
+	}
+}
+
+func noSpan(c *context) bool {
+	c.err = transform.ErrEndOfSpan
+	return false
+}
+
+// TODO: consider a similar special case for the fast majority lower case. This
+// is a bit more involved so will require some more precise benchmarking to
+// justify it.
+
+type undUpperCaser struct{ transform.NopResetter }
+
+// undUpperCaser implements the Transformer interface for doing an upper case
+// mapping for the root locale (und). It eliminates the need for an allocation
+// as it prevents escaping by not using function pointers.
+func (t undUpperCaser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	c := context{dst: dst, src: src, atEOF: atEOF}
+	for c.next() {
+		upper(&c)
+		c.checkpoint()
+	}
+	return c.ret()
+}
+
+func (t undUpperCaser) Span(src []byte, atEOF bool) (n int, err error) {
+	c := context{src: src, atEOF: atEOF}
+	for c.next() && isUpper(&c) {
+		c.checkpoint()
+	}
+	return c.retSpan()
+}
+
+// undLowerIgnoreSigmaCaser implements the Transformer interface for doing
+// a lower case mapping for the root locale (und) ignoring final sigma
+// handling. This casing algorithm is used in some performance-critical packages
+// like secure/precis and x/net/http/idna, which warrants its special-casing.
+type undLowerIgnoreSigmaCaser struct{ transform.NopResetter }
+
+func (t undLowerIgnoreSigmaCaser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	c := context{dst: dst, src: src, atEOF: atEOF}
+	for c.next() && lower(&c) {
+		c.checkpoint()
+	}
+	return c.ret()
+
+}
+
+// Span implements a generic lower-casing. This is possible as isLower works
+// for all lowercasing variants. All lowercase variants only vary in how they
+// transform a non-lowercase letter. They will never change an already lowercase
+// letter. In addition, there is no state.
+func (t undLowerIgnoreSigmaCaser) Span(src []byte, atEOF bool) (n int, err error) {
+	c := context{src: src, atEOF: atEOF}
+	for c.next() && isLower(&c) {
+		c.checkpoint()
+	}
+	return c.retSpan()
+}
+
+type simpleCaser struct {
+	context
+	f    mapFunc
+	span spanFunc
+}
+
+// simpleCaser implements the Transformer interface for doing a case operation
+// on a rune-by-rune basis.
+func (t *simpleCaser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	c := context{dst: dst, src: src, atEOF: atEOF}
+	for c.next() && t.f(&c) {
+		c.checkpoint()
+	}
+	return c.ret()
+}
+
+func (t *simpleCaser) Span(src []byte, atEOF bool) (n int, err error) {
+	c := context{src: src, atEOF: atEOF}
+	for c.next() && t.span(&c) {
+		c.checkpoint()
+	}
+	return c.retSpan()
+}
+
+// undLowerCaser implements the Transformer interface for doing a lower case
+// mapping for the root locale (und) ignoring final sigma handling. This casing
+// algorithm is used in some performance-critical packages like secure/precis
+// and x/net/http/idna, which warrants its special-casing.
+type undLowerCaser struct{ transform.NopResetter }
+
+func (t undLowerCaser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	c := context{dst: dst, src: src, atEOF: atEOF}
+
+	for isInterWord := true; c.next(); {
+		if isInterWord {
+			if c.info.isCased() {
+				if !lower(&c) {
+					break
+				}
+				isInterWord = false
+			} else if !c.copy() {
+				break
+			}
+		} else {
+			if c.info.isNotCasedAndNotCaseIgnorable() {
+				if !c.copy() {
+					break
+				}
+				isInterWord = true
+			} else if !c.hasPrefix("Σ") {
+				if !lower(&c) {
+					break
+				}
+			} else if !finalSigmaBody(&c) {
+				break
+			}
+		}
+		c.checkpoint()
+	}
+	return c.ret()
+}
+
+func (t undLowerCaser) Span(src []byte, atEOF bool) (n int, err error) {
+	c := context{src: src, atEOF: atEOF}
+	for c.next() && isLower(&c) {
+		c.checkpoint()
+	}
+	return c.retSpan()
+}
+
+// lowerCaser implements the Transformer interface. The default Unicode lower
+// casing requires different treatment for the first and subsequent characters
+// of a word, most notably to handle the Greek final Sigma.
+type lowerCaser struct {
+	undLowerIgnoreSigmaCaser
+
+	context
+
+	first, midWord mapFunc
+}
+
+func (t *lowerCaser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	t.context = context{dst: dst, src: src, atEOF: atEOF}
+	c := &t.context
+
+	for isInterWord := true; c.next(); {
+		if isInterWord {
+			if c.info.isCased() {
+				if !t.first(c) {
+					break
+				}
+				isInterWord = false
+			} else if !c.copy() {
+				break
+			}
+		} else {
+			if c.info.isNotCasedAndNotCaseIgnorable() {
+				if !c.copy() {
+					break
+				}
+				isInterWord = true
+			} else if !t.midWord(c) {
+				break
+			}
+		}
+		c.checkpoint()
+	}
+	return c.ret()
+}
+
+// titleCaser implements the Transformer interface. Title casing algorithms
+// distinguish between the first letter of a word and subsequent letters of the
+// same word. It uses state to avoid requiring a potentially infinite lookahead.
+type titleCaser struct {
+	context
+
+	// rune mappings used by the actual casing algorithms.
+	title     mapFunc
+	lower     mapFunc
+	titleSpan spanFunc
+
+	rewrite func(*context)
+}
+
+// Transform implements the standard Unicode title case algorithm as defined in
+// Chapter 3 of The Unicode Standard:
+// toTitlecase(X): Find the word boundaries in X according to Unicode Standard
+// Annex #29, "Unicode Text Segmentation." For each word boundary, find the
+// first cased character F following the word boundary. If F exists, map F to
+// Titlecase_Mapping(F); then map all characters C between F and the following
+// word boundary to Lowercase_Mapping(C).
+func (t *titleCaser) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	t.context = context{dst: dst, src: src, atEOF: atEOF, isMidWord: t.isMidWord}
+	c := &t.context
+
+	if !c.next() {
+		return c.ret()
+	}
+
+	for {
+		p := c.info
+		if t.rewrite != nil {
+			t.rewrite(c)
+		}
+
+		wasMid := p.isMid()
+		// Break out of this loop on failure to ensure we do not modify the
+		// state incorrectly.
+		if p.isCased() {
+			if !c.isMidWord {
+				if !t.title(c) {
+					break
+				}
+				c.isMidWord = true
+			} else if !t.lower(c) {
+				break
+			}
+		} else if !c.copy() {
+			break
+		} else if p.isBreak() {
+			c.isMidWord = false
+		}
+
+		// As we save the state of the transformer, it is safe to call
+		// checkpoint after any successful write.
+		if !(c.isMidWord && wasMid) {
+			c.checkpoint()
+		}
+
+		if !c.next() {
+			break
+		}
+		if wasMid && c.info.isMid() {
+			c.isMidWord = false
+		}
+	}
+	return c.ret()
+}
+
+func (t *titleCaser) Span(src []byte, atEOF bool) (n int, err error) {
+	t.context = context{src: src, atEOF: atEOF, isMidWord: t.isMidWord}
+	c := &t.context
+
+	if !c.next() {
+		return c.retSpan()
+	}
+
+	for {
+		p := c.info
+		if t.rewrite != nil {
+			t.rewrite(c)
+		}
+
+		wasMid := p.isMid()
+		// Break out of this loop on failure to ensure we do not modify the
+		// state incorrectly.
+		if p.isCased() {
+			if !c.isMidWord {
+				if !t.titleSpan(c) {
+					break
+				}
+				c.isMidWord = true
+			} else if !isLower(c) {
+				break
+			}
+		} else if p.isBreak() {
+			c.isMidWord = false
+		}
+		// As we save the state of the transformer, it is safe to call
+		// checkpoint after any successful write.
+		if !(c.isMidWord && wasMid) {
+			c.checkpoint()
+		}
+
+		if !c.next() {
+			break
+		}
+		if wasMid && c.info.isMid() {
+			c.isMidWord = false
+		}
+	}
+	return c.retSpan()
+}
+
+// finalSigma adds Greek final Sigma handing to another casing function. It
+// determines whether a lowercased sigma should be σ or ς, by looking ahead for
+// case-ignorables and a cased letters.
+func finalSigma(f mapFunc) mapFunc {
+	return func(c *context) bool {
+		if !c.hasPrefix("Σ") {
+			return f(c)
+		}
+		return finalSigmaBody(c)
+	}
+}
+
+func finalSigmaBody(c *context) bool {
+	// Current rune must be ∑.
+
+	// ::NFD();
+	// # 03A3; 03C2; 03A3; 03A3; Final_Sigma; # GREEK CAPITAL LETTER SIGMA
+	// Σ } [:case-ignorable:]* [:cased:] → σ;
+	// [:cased:] [:case-ignorable:]* { Σ → ς;
+	// ::Any-Lower;
+	// ::NFC();
+
+	p := c.pDst
+	c.writeString("ς")
+
+	// TODO: we should do this here, but right now this will never have an
+	// effect as this is called when the prefix is Sigma, whereas Dutch and
+	// Afrikaans only test for an apostrophe.
+	//
+	// if t.rewrite != nil {
+	// 	t.rewrite(c)
+	// }
+
+	// We need to do one more iteration after maxIgnorable, as a cased
+	// letter is not an ignorable and may modify the result.
+	wasMid := false
+	for i := 0; i < maxIgnorable+1; i++ {
+		if !c.next() {
+			return false
+		}
+		if !c.info.isCaseIgnorable() {
+			// All Midword runes are also case ignorable, so we are
+			// guaranteed to have a letter or word break here. As we are
+			// unreading the run, there is no need to unset c.isMidWord;
+			// the title caser will handle this.
+			if c.info.isCased() {
+				// p+1 is guaranteed to be in bounds: if writing ς was
+				// successful, p+1 will contain the second byte of ς. If not,
+				// this function will have returned after c.next returned false.
+				c.dst[p+1]++ // ς → σ
+			}
+			c.unreadRune()
+			return true
+		}
+		// A case ignorable may also introduce a word break, so we may need
+		// to continue searching even after detecting a break.
+		isMid := c.info.isMid()
+		if (wasMid && isMid) || c.info.isBreak() {
+			c.isMidWord = false
+		}
+		wasMid = isMid
+		c.copy()
+	}
+	return true
+}
+
+// finalSigmaSpan would be the same as isLower.
+
+// elUpper implements Greek upper casing, which entails removing a predefined
+// set of non-blocked modifiers. Note that these accents should not be removed
+// for title casing!
+// Example: "Οδός" -> "ΟΔΟΣ".
+func elUpper(c *context) bool {
+	// From CLDR:
+	// [:Greek:] [^[:ccc=Not_Reordered:][:ccc=Above:]]*? { [\u0313\u0314\u0301\u0300\u0306\u0342\u0308\u0304] → ;
+	// [:Greek:] [^[:ccc=Not_Reordered:][:ccc=Iota_Subscript:]]*? { \u0345 → ;
+
+	r, _ := utf8.DecodeRune(c.src[c.pSrc:])
+	oldPDst := c.pDst
+	if !upper(c) {
+		return false
+	}
+	if !unicode.Is(unicode.Greek, r) {
+		return true
+	}
+	i := 0
+	// Take the properties of the uppercased rune that is already written to the
+	// destination. This saves us the trouble of having to uppercase the
+	// decomposed rune again.
+	if b := norm.NFD.Properties(c.dst[oldPDst:]).Decomposition(); b != nil {
+		// Restore the destination position and process the decomposed rune.
+		r, sz := utf8.DecodeRune(b)
+		if r <= 0xFF { // See A.6.1
+			return true
+		}
+		c.pDst = oldPDst
+		// Insert the first rune and ignore the modifiers. See A.6.2.
+		c.writeBytes(b[:sz])
+		i = len(b[sz:]) / 2 // Greek modifiers are always of length 2.
+	}
+
+	for ; i < maxIgnorable && c.next(); i++ {
+		switch r, _ := utf8.DecodeRune(c.src[c.pSrc:]); r {
+		// Above and Iota Subscript
+		case 0x0300, // U+0300 COMBINING GRAVE ACCENT
+			0x0301, // U+0301 COMBINING ACUTE ACCENT
+			0x0304, // U+0304 COMBINING MACRON
+			0x0306, // U+0306 COMBINING BREVE
+			0x0308, // U+0308 COMBINING DIAERESIS
+			0x0313, // U+0313 COMBINING COMMA ABOVE
+			0x0314, // U+0314 COMBINING REVERSED COMMA ABOVE
+			0x0342, // U+0342 COMBINING GREEK PERISPOMENI
+			0x0345: // U+0345 COMBINING GREEK YPOGEGRAMMENI
+			// No-op. Gobble the modifier.
+
+		default:
+			switch v, _ := trie.lookup(c.src[c.pSrc:]); info(v).cccType() {
+			case cccZero:
+				c.unreadRune()
+				return true
+
+			// We don't need to test for IotaSubscript as the only rune that
+			// qualifies (U+0345) was already excluded in the switch statement
+			// above. See A.4.
+
+			case cccAbove:
+				return c.copy()
+			default:
+				// Some other modifier. We're still allowed to gobble Greek
+				// modifiers after this.
+				c.copy()
+			}
+		}
+	}
+	return i == maxIgnorable
+}
+
+// TODO: implement elUpperSpan (low-priority: complex and infrequent).
+
+func ltLower(c *context) bool {
+	// From CLDR:
+	// # Introduce an explicit dot above when lowercasing capital I's and J's
+	// # whenever there are more accents above.
+	// # (of the accents used in Lithuanian: grave, acute, tilde above, and ogonek)
+	// # 0049; 0069 0307; 0049; 0049; lt More_Above; # LATIN CAPITAL LETTER I
+	// # 004A; 006A 0307; 004A; 004A; lt More_Above; # LATIN CAPITAL LETTER J
+	// # 012E; 012F 0307; 012E; 012E; lt More_Above; # LATIN CAPITAL LETTER I WITH OGONEK
+	// # 00CC; 0069 0307 0300; 00CC; 00CC; lt; # LATIN CAPITAL LETTER I WITH GRAVE
+	// # 00CD; 0069 0307 0301; 00CD; 00CD; lt; # LATIN CAPITAL LETTER I WITH ACUTE
+	// # 0128; 0069 0307 0303; 0128; 0128; lt; # LATIN CAPITAL LETTER I WITH TILDE
+	// ::NFD();
+	// I } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → i \u0307;
+	// J } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → j \u0307;
+	// I \u0328 (Į) } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → i \u0328 \u0307;
+	// I \u0300 (Ì) → i \u0307 \u0300;
+	// I \u0301 (Í) → i \u0307 \u0301;
+	// I \u0303 (Ĩ) → i \u0307 \u0303;
+	// ::Any-Lower();
+	// ::NFC();
+
+	i := 0
+	if r := c.src[c.pSrc]; r < utf8.RuneSelf {
+		lower(c)
+		if r != 'I' && r != 'J' {
+			return true
+		}
+	} else {
+		p := norm.NFD.Properties(c.src[c.pSrc:])
+		if d := p.Decomposition(); len(d) >= 3 && (d[0] == 'I' || d[0] == 'J') {
+			// UTF-8 optimization: the decomposition will only have an above
+			// modifier if the last rune of the decomposition is in [U+300-U+311].
+			// In all other cases, a decomposition starting with I is always
+			// an I followed by modifiers that are not cased themselves. See A.2.
+			if d[1] == 0xCC && d[2] <= 0x91 { // A.2.4.
+				if !c.writeBytes(d[:1]) {
+					return false
+				}
+				c.dst[c.pDst-1] += 'a' - 'A' // lower
+
+				// Assumption: modifier never changes on lowercase. See A.1.
+				// Assumption: all modifiers added have CCC = Above. See A.2.3.
+				return c.writeString("\u0307") && c.writeBytes(d[1:])
+			}
+			// In all other cases the additional modifiers will have a CCC
+			// that is less than 230 (Above). We will insert the U+0307, if
+			// needed, after these modifiers so that a string in FCD form
+			// will remain so. See A.2.2.
+			lower(c)
+			i = 1
+		} else {
+			return lower(c)
+		}
+	}
+
+	for ; i < maxIgnorable && c.next(); i++ {
+		switch c.info.cccType() {
+		case cccZero:
+			c.unreadRune()
+			return true
+		case cccAbove:
+			return c.writeString("\u0307") && c.copy() // See A.1.
+		default:
+			c.copy() // See A.1.
+		}
+	}
+	return i == maxIgnorable
+}
+
+// ltLowerSpan would be the same as isLower.
+
+func ltUpper(f mapFunc) mapFunc {
+	return func(c *context) bool {
+		// Unicode:
+		// 0307; 0307; ; ; lt After_Soft_Dotted; # COMBINING DOT ABOVE
+		//
+		// From CLDR:
+		// # Remove \u0307 following soft-dotteds (i, j, and the like), with possible
+		// # intervening non-230 marks.
+		// ::NFD();
+		// [:Soft_Dotted:] [^[:ccc=Not_Reordered:][:ccc=Above:]]* { \u0307 → ;
+		// ::Any-Upper();
+		// ::NFC();
+
+		// TODO: See A.5. A soft-dotted rune never has an exception. This would
+		// allow us to overload the exception bit and encode this property in
+		// info. Need to measure performance impact of this.
+		r, _ := utf8.DecodeRune(c.src[c.pSrc:])
+		oldPDst := c.pDst
+		if !f(c) {
+			return false
+		}
+		if !unicode.Is(unicode.Soft_Dotted, r) {
+			return true
+		}
+
+		// We don't need to do an NFD normalization, as a soft-dotted rune never
+		// contains U+0307. See A.3.
+
+		i := 0
+		for ; i < maxIgnorable && c.next(); i++ {
+			switch c.info.cccType() {
+			case cccZero:
+				c.unreadRune()
+				return true
+			case cccAbove:
+				if c.hasPrefix("\u0307") {
+					// We don't do a full NFC, but rather combine runes for
+					// some of the common cases. (Returning NFC or
+					// preserving normal form is neither a requirement nor
+					// a possibility anyway).
+					if !c.next() {
+						return false
+					}
+					if c.dst[oldPDst] == 'I' && c.pDst == oldPDst+1 && c.src[c.pSrc] == 0xcc {
+						s := ""
+						switch c.src[c.pSrc+1] {
+						case 0x80: // U+0300 COMBINING GRAVE ACCENT
+							s = "\u00cc" // U+00CC LATIN CAPITAL LETTER I WITH GRAVE
+						case 0x81: // U+0301 COMBINING ACUTE ACCENT
+							s = "\u00cd" // U+00CD LATIN CAPITAL LETTER I WITH ACUTE
+						case 0x83: // U+0303 COMBINING TILDE
+							s = "\u0128" // U+0128 LATIN CAPITAL LETTER I WITH TILDE
+						case 0x88: // U+0308 COMBINING DIAERESIS
+							s = "\u00cf" // U+00CF LATIN CAPITAL LETTER I WITH DIAERESIS
+						default:
+						}
+						if s != "" {
+							c.pDst = oldPDst
+							return c.writeString(s)
+						}
+					}
+				}
+				return c.copy()
+			default:
+				c.copy()
+			}
+		}
+		return i == maxIgnorable
+	}
+}
+
+// TODO: implement ltUpperSpan (low priority: complex and infrequent).
+
+func aztrUpper(f mapFunc) mapFunc {
+	return func(c *context) bool {
+		// i→İ;
+		if c.src[c.pSrc] == 'i' {
+			return c.writeString("İ")
+		}
+		return f(c)
+	}
+}
+
+func aztrLower(c *context) (done bool) {
+	// From CLDR:
+	// # I and i-dotless; I-dot and i are case pairs in Turkish and Azeri
+	// # 0130; 0069; 0130; 0130; tr; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+	// İ→i;
+	// # When lowercasing, remove dot_above in the sequence I + dot_above, which will turn into i.
+	// # This matches the behavior of the canonically equivalent I-dot_above
+	// # 0307; ; 0307; 0307; tr After_I; # COMBINING DOT ABOVE
+	// # When lowercasing, unless an I is before a dot_above, it turns into a dotless i.
+	// # 0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I
+	// I([^[:ccc=Not_Reordered:][:ccc=Above:]]*)\u0307 → i$1 ;
+	// I→ı ;
+	// ::Any-Lower();
+	if c.hasPrefix("\u0130") { // İ
+		return c.writeString("i")
+	}
+	if c.src[c.pSrc] != 'I' {
+		return lower(c)
+	}
+
+	// We ignore the lower-case I for now, but insert it later when we know
+	// which form we need.
+	start := c.pSrc + c.sz
+
+	i := 0
+Loop:
+	// We check for up to n ignorables before \u0307. As \u0307 is an
+	// ignorable as well, n is maxIgnorable-1.
+	for ; i < maxIgnorable && c.next(); i++ {
+		switch c.info.cccType() {
+		case cccAbove:
+			if c.hasPrefix("\u0307") {
+				return c.writeString("i") && c.writeBytes(c.src[start:c.pSrc]) // ignore U+0307
+			}
+			done = true
+			break Loop
+		case cccZero:
+			c.unreadRune()
+			done = true
+			break Loop
+		default:
+			// We'll write this rune after we know which starter to use.
+		}
+	}
+	if i == maxIgnorable {
+		done = true
+	}
+	return c.writeString("ı") && c.writeBytes(c.src[start:c.pSrc+c.sz]) && done
+}
+
+// aztrLowerSpan would be the same as isLower.
+
+func nlTitle(c *context) bool {
+	// From CLDR:
+	// # Special titlecasing for Dutch initial "ij".
+	// ::Any-Title();
+	// # Fix up Ij at the beginning of a "word" (per Any-Title, not UAX #29)
+	// [:^WB=ALetter:] [:WB=Extend:]* [[:WB=MidLetter:][:WB=MidNumLet:]]? { Ij } → IJ ;
+	if c.src[c.pSrc] != 'I' && c.src[c.pSrc] != 'i' {
+		return title(c)
+	}
+
+	if !c.writeString("I") || !c.next() {
+		return false
+	}
+	if c.src[c.pSrc] == 'j' || c.src[c.pSrc] == 'J' {
+		return c.writeString("J")
+	}
+	c.unreadRune()
+	return true
+}
+
+func nlTitleSpan(c *context) bool {
+	// From CLDR:
+	// # Special titlecasing for Dutch initial "ij".
+	// ::Any-Title();
+	// # Fix up Ij at the beginning of a "word" (per Any-Title, not UAX #29)
+	// [:^WB=ALetter:] [:WB=Extend:]* [[:WB=MidLetter:][:WB=MidNumLet:]]? { Ij } → IJ ;
+	if c.src[c.pSrc] != 'I' {
+		return isTitle(c)
+	}
+	if !c.next() || c.src[c.pSrc] == 'j' {
+		return false
+	}
+	if c.src[c.pSrc] != 'J' {
+		c.unreadRune()
+	}
+	return true
+}
+
+// Not part of CLDR, but see https://unicode.org/cldr/trac/ticket/7078.
+func afnlRewrite(c *context) {
+	if c.hasPrefix("'") || c.hasPrefix("’") {
+		c.isMidWord = true
+	}
+}
diff --git a/vendor/golang.org/x/text/cases/tables15.0.0.go b/vendor/golang.org/x/text/cases/tables15.0.0.go
new file mode 100644
index 000000000..6aa111610
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/tables15.0.0.go
@@ -0,0 +1,2527 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+//go:build !go1.27
+
+package cases
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "15.0.0"
+
+var xorData string = "" + // Size: 213 bytes
+	"\x00\x06\x07\x00\x01?\x00\x0f\x03\x00\x0f\x12\x00\x0f\x1f\x00\x0f\x1d" +
+	"\x00\x01\x13\x00\x0f\x16\x00\x0f\x0b\x00\x0f3\x00\x0f7\x00\x01#\x00\x0f?" +
+	"\x00\x0e'\x00\x0f/\x00\x0e>\x00\x0f*\x00\x0c&\x00\x0c*\x00\x0c;\x00\x0c9" +
+	"\x00\x0c%\x00\x01\x08\x00\x03\x0d\x00\x03\x09\x00\x02\x06\x00\x02\x02" +
+	"\x00\x02\x0c\x00\x01\x00\x00\x01\x03\x00\x01\x01\x00\x01 \x00\x01\x0c" +
+	"\x00\x01\x10\x00\x03\x10\x00\x036 \x00\x037 \x00\x0b#\x10\x00\x0b 0\x00" +
+	"\x0b!\x10\x00\x0b!0\x001\x00\x00\x0b(\x04\x00\x03\x04\x1e\x00\x0b)\x08" +
+	"\x00\x03\x0a\x00\x02:\x00\x02>\x00\x02,\x00\x02\x00\x00\x02\x10\x00\x01<" +
+	"\x00\x01&\x00\x01*\x00\x01.\x00\x010\x003 \x00\x01\x18\x00\x01(\x00\x03'" +
+	"\x00\x03)\x00\x03+\x00\x03/\x00\x03\x19\x00\x03\x1b\x00\x03\x1f\x00\x01" +
+	"\x1e\x00\x01\x22"
+
+var exceptions string = "" + // Size: 2450 bytes
+	"\x00\x12\x12μΜΜ\x12\x12ssSSSs\x13\x18i̇i̇\x10\x09II\x13\x1bʼnʼNʼN\x11" +
+	"\x09sSS\x12\x12dždžDž\x12\x12dždžDŽ\x10\x12DŽDž\x12\x12ljljLj\x12\x12ljljLJ\x10\x12LJLj" +
+	"\x12\x12njnjNj\x12\x12njnjNJ\x10\x12NJNj\x13\x1bǰJ̌J̌\x12\x12dzdzDz\x12\x12dzdzDZ\x10" +
+	"\x12DZDz\x13\x18ⱥⱥ\x13\x18ⱦⱦ\x10\x1bⱾⱾ\x10\x1bⱿⱿ\x10\x1bⱯⱯ\x10\x1bⱭⱭ\x10" +
+	"\x1bⱰⱰ\x10\x1bꞫꞫ\x10\x1bꞬꞬ\x10\x1bꞍꞍ\x10\x1bꞪꞪ\x10\x1bꞮꞮ\x10\x1bⱢⱢ\x10" +
+	"\x1bꞭꞭ\x10\x1bⱮⱮ\x10\x1bⱤⱤ\x10\x1bꟅꟅ\x10\x1bꞱꞱ\x10\x1bꞲꞲ\x10\x1bꞰꞰ2\x12ι" +
+	"ΙΙ\x166ΐΪ́Ϊ́\x166ΰΫ́Ϋ́\x12\x12σΣΣ\x12\x12βΒΒ\x12\x12θΘΘ\x12\x12" +
+	"φΦΦ\x12\x12πΠΠ\x12\x12κΚΚ\x12\x12ρΡΡ\x12\x12εΕΕ\x14$եւԵՒԵւ\x10\x1bᲐა" +
+	"\x10\x1bᲑბ\x10\x1bᲒგ\x10\x1bᲓდ\x10\x1bᲔე\x10\x1bᲕვ\x10\x1bᲖზ\x10\x1bᲗთ" +
+	"\x10\x1bᲘი\x10\x1bᲙკ\x10\x1bᲚლ\x10\x1bᲛმ\x10\x1bᲜნ\x10\x1bᲝო\x10\x1bᲞპ" +
+	"\x10\x1bᲟჟ\x10\x1bᲠრ\x10\x1bᲡს\x10\x1bᲢტ\x10\x1bᲣუ\x10\x1bᲤფ\x10\x1bᲥქ" +
+	"\x10\x1bᲦღ\x10\x1bᲧყ\x10\x1bᲨშ\x10\x1bᲩჩ\x10\x1bᲪც\x10\x1bᲫძ\x10\x1bᲬწ" +
+	"\x10\x1bᲭჭ\x10\x1bᲮხ\x10\x1bᲯჯ\x10\x1bᲰჰ\x10\x1bᲱჱ\x10\x1bᲲჲ\x10\x1bᲳჳ" +
+	"\x10\x1bᲴჴ\x10\x1bᲵჵ\x10\x1bᲶჶ\x10\x1bᲷჷ\x10\x1bᲸჸ\x10\x1bᲹჹ\x10\x1bᲺჺ" +
+	"\x10\x1bᲽჽ\x10\x1bᲾჾ\x10\x1bᲿჿ\x12\x12вВВ\x12\x12дДД\x12\x12оОО\x12\x12с" +
+	"СС\x12\x12тТТ\x12\x12тТТ\x12\x12ъЪЪ\x12\x12ѣѢѢ\x13\x1bꙋꙊꙊ\x13\x1bẖH̱H̱" +
+	"\x13\x1bẗT̈T̈\x13\x1bẘW̊W̊\x13\x1bẙY̊Y̊\x13\x1baʾAʾAʾ\x13\x1bṡṠṠ\x12" +
+	"\x10ssß\x14$ὐΥ̓Υ̓\x166ὒΥ̓̀Υ̓̀\x166ὔΥ̓́Υ̓́\x166ὖΥ̓͂Υ̓͂\x15+ἀιἈΙᾈ" +
+	"\x15+ἁιἉΙᾉ\x15+ἂιἊΙᾊ\x15+ἃιἋΙᾋ\x15+ἄιἌΙᾌ\x15+ἅιἍΙᾍ\x15+ἆιἎΙᾎ\x15+ἇιἏΙᾏ" +
+	"\x15\x1dἀιᾀἈΙ\x15\x1dἁιᾁἉΙ\x15\x1dἂιᾂἊΙ\x15\x1dἃιᾃἋΙ\x15\x1dἄιᾄἌΙ\x15" +
+	"\x1dἅιᾅἍΙ\x15\x1dἆιᾆἎΙ\x15\x1dἇιᾇἏΙ\x15+ἠιἨΙᾘ\x15+ἡιἩΙᾙ\x15+ἢιἪΙᾚ\x15+ἣι" +
+	"ἫΙᾛ\x15+ἤιἬΙᾜ\x15+ἥιἭΙᾝ\x15+ἦιἮΙᾞ\x15+ἧιἯΙᾟ\x15\x1dἠιᾐἨΙ\x15\x1dἡιᾑἩΙ" +
+	"\x15\x1dἢιᾒἪΙ\x15\x1dἣιᾓἫΙ\x15\x1dἤιᾔἬΙ\x15\x1dἥιᾕἭΙ\x15\x1dἦιᾖἮΙ\x15" +
+	"\x1dἧιᾗἯΙ\x15+ὠιὨΙᾨ\x15+ὡιὩΙᾩ\x15+ὢιὪΙᾪ\x15+ὣιὫΙᾫ\x15+ὤιὬΙᾬ\x15+ὥιὭΙᾭ" +
+	"\x15+ὦιὮΙᾮ\x15+ὧιὯΙᾯ\x15\x1dὠιᾠὨΙ\x15\x1dὡιᾡὩΙ\x15\x1dὢιᾢὪΙ\x15\x1dὣιᾣὫΙ" +
+	"\x15\x1dὤιᾤὬΙ\x15\x1dὥιᾥὭΙ\x15\x1dὦιᾦὮΙ\x15\x1dὧιᾧὯΙ\x15-ὰιᾺΙᾺͅ\x14#αιΑΙ" +
+	"ᾼ\x14$άιΆΙΆͅ\x14$ᾶΑ͂Α͂\x166ᾶιΑ͂Ιᾼ͂\x14\x1cαιᾳΑΙ\x12\x12ιΙΙ\x15-ὴιῊΙ" +
+	"Ὴͅ\x14#ηιΗΙῌ\x14$ήιΉΙΉͅ\x14$ῆΗ͂Η͂\x166ῆιΗ͂Ιῌ͂\x14\x1cηιῃΗΙ\x166ῒΙ" +
+	"̈̀Ϊ̀\x166ΐΪ́Ϊ́\x14$ῖΙ͂Ι͂\x166ῗΪ͂Ϊ͂\x166ῢΫ̀Ϋ̀\x166ΰΫ́Ϋ" +
+	"́\x14$ῤΡ̓Ρ̓\x14$ῦΥ͂Υ͂\x166ῧΫ͂Ϋ͂\x15-ὼιῺΙῺͅ\x14#ωιΩΙῼ\x14$ώιΏΙΏͅ" +
+	"\x14$ῶΩ͂Ω͂\x166ῶιΩ͂Ιῼ͂\x14\x1cωιῳΩΙ\x12\x10ωω\x11\x08kk\x12\x10åå\x12" +
+	"\x10ɫɫ\x12\x10ɽɽ\x10\x12ȺȺ\x10\x12ȾȾ\x12\x10ɑɑ\x12\x10ɱɱ\x12\x10ɐɐ\x12" +
+	"\x10ɒɒ\x12\x10ȿȿ\x12\x10ɀɀ\x12\x10ɥɥ\x12\x10ɦɦ\x12\x10ɜɜ\x12\x10ɡɡ\x12" +
+	"\x10ɬɬ\x12\x10ɪɪ\x12\x10ʞʞ\x12\x10ʇʇ\x12\x10ʝʝ\x12\x10ʂʂ\x12\x12ffFFFf" +
+	"\x12\x12fiFIFi\x12\x12flFLFl\x13\x1bffiFFIFfi\x13\x1bfflFFLFfl\x12\x12st" +
+	"STSt\x12\x12stSTSt\x14$մնՄՆՄն\x14$մեՄԵՄե\x14$միՄԻՄի\x14$վնՎՆՎն\x14$մխՄԽՄ" +
+	"խ"
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *caseTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return caseValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = caseIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *caseTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return caseValues[c0]
+	}
+	i := caseIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *caseTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return caseValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = caseIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *caseTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return caseValues[c0]
+	}
+	i := caseIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// caseTrie. Total size: 13398 bytes (13.08 KiB). Checksum: 544af6e6b1b70931.
+type caseTrie struct{}
+
+func newCaseTrie(i int) *caseTrie {
+	return &caseTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *caseTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 22:
+		return uint16(caseValues[n<<6+uint32(b)])
+	default:
+		n -= 22
+		return uint16(sparse.lookup(n, b))
+	}
+}
+
+// caseValues: 24 blocks, 1536 entries, 3072 bytes
+// The third block is the zero block.
+var caseValues = [1536]uint16{
+	// Block 0x0, offset 0x0
+	0x27: 0x0054,
+	0x2e: 0x0054,
+	0x30: 0x0010, 0x31: 0x0010, 0x32: 0x0010, 0x33: 0x0010, 0x34: 0x0010, 0x35: 0x0010,
+	0x36: 0x0010, 0x37: 0x0010, 0x38: 0x0010, 0x39: 0x0010, 0x3a: 0x0054,
+	// Block 0x1, offset 0x40
+	0x41: 0x2013, 0x42: 0x2013, 0x43: 0x2013, 0x44: 0x2013, 0x45: 0x2013,
+	0x46: 0x2013, 0x47: 0x2013, 0x48: 0x2013, 0x49: 0x2013, 0x4a: 0x2013, 0x4b: 0x2013,
+	0x4c: 0x2013, 0x4d: 0x2013, 0x4e: 0x2013, 0x4f: 0x2013, 0x50: 0x2013, 0x51: 0x2013,
+	0x52: 0x2013, 0x53: 0x2013, 0x54: 0x2013, 0x55: 0x2013, 0x56: 0x2013, 0x57: 0x2013,
+	0x58: 0x2013, 0x59: 0x2013, 0x5a: 0x2013,
+	0x5e: 0x0004, 0x5f: 0x0010, 0x60: 0x0004, 0x61: 0x2012, 0x62: 0x2012, 0x63: 0x2012,
+	0x64: 0x2012, 0x65: 0x2012, 0x66: 0x2012, 0x67: 0x2012, 0x68: 0x2012, 0x69: 0x2012,
+	0x6a: 0x2012, 0x6b: 0x2012, 0x6c: 0x2012, 0x6d: 0x2012, 0x6e: 0x2012, 0x6f: 0x2012,
+	0x70: 0x2012, 0x71: 0x2012, 0x72: 0x2012, 0x73: 0x2012, 0x74: 0x2012, 0x75: 0x2012,
+	0x76: 0x2012, 0x77: 0x2012, 0x78: 0x2012, 0x79: 0x2012, 0x7a: 0x2012,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x0852, 0xc1: 0x0b53, 0xc2: 0x0113, 0xc3: 0x0112, 0xc4: 0x0113, 0xc5: 0x0112,
+	0xc6: 0x0b53, 0xc7: 0x0f13, 0xc8: 0x0f12, 0xc9: 0x0e53, 0xca: 0x1153, 0xcb: 0x0713,
+	0xcc: 0x0712, 0xcd: 0x0012, 0xce: 0x1453, 0xcf: 0x1753, 0xd0: 0x1a53, 0xd1: 0x0313,
+	0xd2: 0x0312, 0xd3: 0x1d53, 0xd4: 0x2053, 0xd5: 0x2352, 0xd6: 0x2653, 0xd7: 0x2653,
+	0xd8: 0x0113, 0xd9: 0x0112, 0xda: 0x2952, 0xdb: 0x0012, 0xdc: 0x1d53, 0xdd: 0x2c53,
+	0xde: 0x2f52, 0xdf: 0x3253, 0xe0: 0x0113, 0xe1: 0x0112, 0xe2: 0x0113, 0xe3: 0x0112,
+	0xe4: 0x0113, 0xe5: 0x0112, 0xe6: 0x3553, 0xe7: 0x0f13, 0xe8: 0x0f12, 0xe9: 0x3853,
+	0xea: 0x0012, 0xeb: 0x0012, 0xec: 0x0113, 0xed: 0x0112, 0xee: 0x3553, 0xef: 0x1f13,
+	0xf0: 0x1f12, 0xf1: 0x3b53, 0xf2: 0x3e53, 0xf3: 0x0713, 0xf4: 0x0712, 0xf5: 0x0313,
+	0xf6: 0x0312, 0xf7: 0x4153, 0xf8: 0x0113, 0xf9: 0x0112, 0xfa: 0x0012, 0xfb: 0x0010,
+	0xfc: 0x0113, 0xfd: 0x0112, 0xfe: 0x0012, 0xff: 0x4452,
+	// Block 0x4, offset 0x100
+	0x100: 0x0010, 0x101: 0x0010, 0x102: 0x0010, 0x103: 0x0010, 0x104: 0x02db, 0x105: 0x0359,
+	0x106: 0x03da, 0x107: 0x043b, 0x108: 0x04b9, 0x109: 0x053a, 0x10a: 0x059b, 0x10b: 0x0619,
+	0x10c: 0x069a, 0x10d: 0x0313, 0x10e: 0x0312, 0x10f: 0x1f13, 0x110: 0x1f12, 0x111: 0x0313,
+	0x112: 0x0312, 0x113: 0x0713, 0x114: 0x0712, 0x115: 0x0313, 0x116: 0x0312, 0x117: 0x0f13,
+	0x118: 0x0f12, 0x119: 0x0313, 0x11a: 0x0312, 0x11b: 0x0713, 0x11c: 0x0712, 0x11d: 0x1452,
+	0x11e: 0x0113, 0x11f: 0x0112, 0x120: 0x0113, 0x121: 0x0112, 0x122: 0x0113, 0x123: 0x0112,
+	0x124: 0x0113, 0x125: 0x0112, 0x126: 0x0113, 0x127: 0x0112, 0x128: 0x0113, 0x129: 0x0112,
+	0x12a: 0x0113, 0x12b: 0x0112, 0x12c: 0x0113, 0x12d: 0x0112, 0x12e: 0x0113, 0x12f: 0x0112,
+	0x130: 0x06fa, 0x131: 0x07ab, 0x132: 0x0829, 0x133: 0x08aa, 0x134: 0x0113, 0x135: 0x0112,
+	0x136: 0x2353, 0x137: 0x4453, 0x138: 0x0113, 0x139: 0x0112, 0x13a: 0x0113, 0x13b: 0x0112,
+	0x13c: 0x0113, 0x13d: 0x0112, 0x13e: 0x0113, 0x13f: 0x0112,
+	// Block 0x5, offset 0x140
+	0x140: 0x0a8a, 0x141: 0x0313, 0x142: 0x0312, 0x143: 0x0853, 0x144: 0x4753, 0x145: 0x4a53,
+	0x146: 0x0113, 0x147: 0x0112, 0x148: 0x0113, 0x149: 0x0112, 0x14a: 0x0113, 0x14b: 0x0112,
+	0x14c: 0x0113, 0x14d: 0x0112, 0x14e: 0x0113, 0x14f: 0x0112, 0x150: 0x0b0a, 0x151: 0x0b8a,
+	0x152: 0x0c0a, 0x153: 0x0b52, 0x154: 0x0b52, 0x155: 0x0012, 0x156: 0x0e52, 0x157: 0x1152,
+	0x158: 0x0012, 0x159: 0x1752, 0x15a: 0x0012, 0x15b: 0x1a52, 0x15c: 0x0c8a, 0x15d: 0x0012,
+	0x15e: 0x0012, 0x15f: 0x0012, 0x160: 0x1d52, 0x161: 0x0d0a, 0x162: 0x0012, 0x163: 0x2052,
+	0x164: 0x0012, 0x165: 0x0d8a, 0x166: 0x0e0a, 0x167: 0x0012, 0x168: 0x2652, 0x169: 0x2652,
+	0x16a: 0x0e8a, 0x16b: 0x0f0a, 0x16c: 0x0f8a, 0x16d: 0x0012, 0x16e: 0x0012, 0x16f: 0x1d52,
+	0x170: 0x0012, 0x171: 0x100a, 0x172: 0x2c52, 0x173: 0x0012, 0x174: 0x0012, 0x175: 0x3252,
+	0x176: 0x0012, 0x177: 0x0012, 0x178: 0x0012, 0x179: 0x0012, 0x17a: 0x0012, 0x17b: 0x0012,
+	0x17c: 0x0012, 0x17d: 0x108a, 0x17e: 0x0012, 0x17f: 0x0012,
+	// Block 0x6, offset 0x180
+	0x180: 0x3552, 0x181: 0x0012, 0x182: 0x110a, 0x183: 0x3852, 0x184: 0x0012, 0x185: 0x0012,
+	0x186: 0x0012, 0x187: 0x118a, 0x188: 0x3552, 0x189: 0x4752, 0x18a: 0x3b52, 0x18b: 0x3e52,
+	0x18c: 0x4a52, 0x18d: 0x0012, 0x18e: 0x0012, 0x18f: 0x0012, 0x190: 0x0012, 0x191: 0x0012,
+	0x192: 0x4152, 0x193: 0x0012, 0x194: 0x0010, 0x195: 0x0012, 0x196: 0x0012, 0x197: 0x0012,
+	0x198: 0x0012, 0x199: 0x0012, 0x19a: 0x0012, 0x19b: 0x0012, 0x19c: 0x0012, 0x19d: 0x120a,
+	0x19e: 0x128a, 0x19f: 0x0012, 0x1a0: 0x0012, 0x1a1: 0x0012, 0x1a2: 0x0012, 0x1a3: 0x0012,
+	0x1a4: 0x0012, 0x1a5: 0x0012, 0x1a6: 0x0012, 0x1a7: 0x0012, 0x1a8: 0x0012, 0x1a9: 0x0012,
+	0x1aa: 0x0012, 0x1ab: 0x0012, 0x1ac: 0x0012, 0x1ad: 0x0012, 0x1ae: 0x0012, 0x1af: 0x0012,
+	0x1b0: 0x0015, 0x1b1: 0x0015, 0x1b2: 0x0015, 0x1b3: 0x0015, 0x1b4: 0x0015, 0x1b5: 0x0015,
+	0x1b6: 0x0015, 0x1b7: 0x0015, 0x1b8: 0x0015, 0x1b9: 0x0014, 0x1ba: 0x0014, 0x1bb: 0x0014,
+	0x1bc: 0x0014, 0x1bd: 0x0014, 0x1be: 0x0014, 0x1bf: 0x0014,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x0024, 0x1c1: 0x0024, 0x1c2: 0x0024, 0x1c3: 0x0024, 0x1c4: 0x0024, 0x1c5: 0x130d,
+	0x1c6: 0x0024, 0x1c7: 0x0034, 0x1c8: 0x0034, 0x1c9: 0x0034, 0x1ca: 0x0024, 0x1cb: 0x0024,
+	0x1cc: 0x0024, 0x1cd: 0x0034, 0x1ce: 0x0034, 0x1cf: 0x0014, 0x1d0: 0x0024, 0x1d1: 0x0024,
+	0x1d2: 0x0024, 0x1d3: 0x0034, 0x1d4: 0x0034, 0x1d5: 0x0034, 0x1d6: 0x0034, 0x1d7: 0x0024,
+	0x1d8: 0x0034, 0x1d9: 0x0034, 0x1da: 0x0034, 0x1db: 0x0024, 0x1dc: 0x0034, 0x1dd: 0x0034,
+	0x1de: 0x0034, 0x1df: 0x0034, 0x1e0: 0x0034, 0x1e1: 0x0034, 0x1e2: 0x0034, 0x1e3: 0x0024,
+	0x1e4: 0x0024, 0x1e5: 0x0024, 0x1e6: 0x0024, 0x1e7: 0x0024, 0x1e8: 0x0024, 0x1e9: 0x0024,
+	0x1ea: 0x0024, 0x1eb: 0x0024, 0x1ec: 0x0024, 0x1ed: 0x0024, 0x1ee: 0x0024, 0x1ef: 0x0024,
+	0x1f0: 0x0113, 0x1f1: 0x0112, 0x1f2: 0x0113, 0x1f3: 0x0112, 0x1f4: 0x0014, 0x1f5: 0x0004,
+	0x1f6: 0x0113, 0x1f7: 0x0112, 0x1fa: 0x0015, 0x1fb: 0x4d52,
+	0x1fc: 0x5052, 0x1fd: 0x5052, 0x1ff: 0x5353,
+	// Block 0x8, offset 0x200
+	0x204: 0x0004, 0x205: 0x0004,
+	0x206: 0x2a13, 0x207: 0x0054, 0x208: 0x2513, 0x209: 0x2713, 0x20a: 0x2513,
+	0x20c: 0x5653, 0x20e: 0x5953, 0x20f: 0x5c53, 0x210: 0x138a, 0x211: 0x2013,
+	0x212: 0x2013, 0x213: 0x2013, 0x214: 0x2013, 0x215: 0x2013, 0x216: 0x2013, 0x217: 0x2013,
+	0x218: 0x2013, 0x219: 0x2013, 0x21a: 0x2013, 0x21b: 0x2013, 0x21c: 0x2013, 0x21d: 0x2013,
+	0x21e: 0x2013, 0x21f: 0x2013, 0x220: 0x5f53, 0x221: 0x5f53, 0x223: 0x5f53,
+	0x224: 0x5f53, 0x225: 0x5f53, 0x226: 0x5f53, 0x227: 0x5f53, 0x228: 0x5f53, 0x229: 0x5f53,
+	0x22a: 0x5f53, 0x22b: 0x5f53, 0x22c: 0x2a12, 0x22d: 0x2512, 0x22e: 0x2712, 0x22f: 0x2512,
+	0x230: 0x14ca, 0x231: 0x2012, 0x232: 0x2012, 0x233: 0x2012, 0x234: 0x2012, 0x235: 0x2012,
+	0x236: 0x2012, 0x237: 0x2012, 0x238: 0x2012, 0x239: 0x2012, 0x23a: 0x2012, 0x23b: 0x2012,
+	0x23c: 0x2012, 0x23d: 0x2012, 0x23e: 0x2012, 0x23f: 0x2012,
+	// Block 0x9, offset 0x240
+	0x240: 0x5f52, 0x241: 0x5f52, 0x242: 0x160a, 0x243: 0x5f52, 0x244: 0x5f52, 0x245: 0x5f52,
+	0x246: 0x5f52, 0x247: 0x5f52, 0x248: 0x5f52, 0x249: 0x5f52, 0x24a: 0x5f52, 0x24b: 0x5f52,
+	0x24c: 0x5652, 0x24d: 0x5952, 0x24e: 0x5c52, 0x24f: 0x1813, 0x250: 0x168a, 0x251: 0x170a,
+	0x252: 0x0013, 0x253: 0x0013, 0x254: 0x0013, 0x255: 0x178a, 0x256: 0x180a, 0x257: 0x1812,
+	0x258: 0x0113, 0x259: 0x0112, 0x25a: 0x0113, 0x25b: 0x0112, 0x25c: 0x0113, 0x25d: 0x0112,
+	0x25e: 0x0113, 0x25f: 0x0112, 0x260: 0x0113, 0x261: 0x0112, 0x262: 0x0113, 0x263: 0x0112,
+	0x264: 0x0113, 0x265: 0x0112, 0x266: 0x0113, 0x267: 0x0112, 0x268: 0x0113, 0x269: 0x0112,
+	0x26a: 0x0113, 0x26b: 0x0112, 0x26c: 0x0113, 0x26d: 0x0112, 0x26e: 0x0113, 0x26f: 0x0112,
+	0x270: 0x188a, 0x271: 0x190a, 0x272: 0x0b12, 0x273: 0x5352, 0x274: 0x6253, 0x275: 0x198a,
+	0x277: 0x0f13, 0x278: 0x0f12, 0x279: 0x0b13, 0x27a: 0x0113, 0x27b: 0x0112,
+	0x27c: 0x0012, 0x27d: 0x4d53, 0x27e: 0x5053, 0x27f: 0x5053,
+	// Block 0xa, offset 0x280
+	0x280: 0x6852, 0x281: 0x6852, 0x282: 0x6852, 0x283: 0x6852, 0x284: 0x6852, 0x285: 0x6852,
+	0x286: 0x6852, 0x287: 0x1a0a, 0x288: 0x0012, 0x28a: 0x0010,
+	0x291: 0x0034,
+	0x292: 0x0024, 0x293: 0x0024, 0x294: 0x0024, 0x295: 0x0024, 0x296: 0x0034, 0x297: 0x0024,
+	0x298: 0x0024, 0x299: 0x0024, 0x29a: 0x0034, 0x29b: 0x0034, 0x29c: 0x0024, 0x29d: 0x0024,
+	0x29e: 0x0024, 0x29f: 0x0024, 0x2a0: 0x0024, 0x2a1: 0x0024, 0x2a2: 0x0034, 0x2a3: 0x0034,
+	0x2a4: 0x0034, 0x2a5: 0x0034, 0x2a6: 0x0034, 0x2a7: 0x0034, 0x2a8: 0x0024, 0x2a9: 0x0024,
+	0x2aa: 0x0034, 0x2ab: 0x0024, 0x2ac: 0x0024, 0x2ad: 0x0034, 0x2ae: 0x0034, 0x2af: 0x0024,
+	0x2b0: 0x0034, 0x2b1: 0x0034, 0x2b2: 0x0034, 0x2b3: 0x0034, 0x2b4: 0x0034, 0x2b5: 0x0034,
+	0x2b6: 0x0034, 0x2b7: 0x0034, 0x2b8: 0x0034, 0x2b9: 0x0034, 0x2ba: 0x0034, 0x2bb: 0x0034,
+	0x2bc: 0x0034, 0x2bd: 0x0034, 0x2bf: 0x0034,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x0010, 0x2c1: 0x0010, 0x2c2: 0x0010, 0x2c3: 0x0010, 0x2c4: 0x0010, 0x2c5: 0x0010,
+	0x2c6: 0x0010, 0x2c7: 0x0010, 0x2c8: 0x0010, 0x2c9: 0x0014, 0x2ca: 0x0024, 0x2cb: 0x0024,
+	0x2cc: 0x0024, 0x2cd: 0x0024, 0x2ce: 0x0024, 0x2cf: 0x0034, 0x2d0: 0x0034, 0x2d1: 0x0034,
+	0x2d2: 0x0034, 0x2d3: 0x0034, 0x2d4: 0x0024, 0x2d5: 0x0024, 0x2d6: 0x0024, 0x2d7: 0x0024,
+	0x2d8: 0x0024, 0x2d9: 0x0024, 0x2da: 0x0024, 0x2db: 0x0024, 0x2dc: 0x0024, 0x2dd: 0x0024,
+	0x2de: 0x0024, 0x2df: 0x0024, 0x2e0: 0x0024, 0x2e1: 0x0024, 0x2e2: 0x0014, 0x2e3: 0x0034,
+	0x2e4: 0x0024, 0x2e5: 0x0024, 0x2e6: 0x0034, 0x2e7: 0x0024, 0x2e8: 0x0024, 0x2e9: 0x0034,
+	0x2ea: 0x0024, 0x2eb: 0x0024, 0x2ec: 0x0024, 0x2ed: 0x0034, 0x2ee: 0x0034, 0x2ef: 0x0034,
+	0x2f0: 0x0034, 0x2f1: 0x0034, 0x2f2: 0x0034, 0x2f3: 0x0024, 0x2f4: 0x0024, 0x2f5: 0x0024,
+	0x2f6: 0x0034, 0x2f7: 0x0024, 0x2f8: 0x0024, 0x2f9: 0x0034, 0x2fa: 0x0034, 0x2fb: 0x0024,
+	0x2fc: 0x0024, 0x2fd: 0x0024, 0x2fe: 0x0024, 0x2ff: 0x0024,
+	// Block 0xc, offset 0x300
+	0x300: 0x7053, 0x301: 0x7053, 0x302: 0x7053, 0x303: 0x7053, 0x304: 0x7053, 0x305: 0x7053,
+	0x307: 0x7053,
+	0x30d: 0x7053, 0x310: 0x1aea, 0x311: 0x1b6a,
+	0x312: 0x1bea, 0x313: 0x1c6a, 0x314: 0x1cea, 0x315: 0x1d6a, 0x316: 0x1dea, 0x317: 0x1e6a,
+	0x318: 0x1eea, 0x319: 0x1f6a, 0x31a: 0x1fea, 0x31b: 0x206a, 0x31c: 0x20ea, 0x31d: 0x216a,
+	0x31e: 0x21ea, 0x31f: 0x226a, 0x320: 0x22ea, 0x321: 0x236a, 0x322: 0x23ea, 0x323: 0x246a,
+	0x324: 0x24ea, 0x325: 0x256a, 0x326: 0x25ea, 0x327: 0x266a, 0x328: 0x26ea, 0x329: 0x276a,
+	0x32a: 0x27ea, 0x32b: 0x286a, 0x32c: 0x28ea, 0x32d: 0x296a, 0x32e: 0x29ea, 0x32f: 0x2a6a,
+	0x330: 0x2aea, 0x331: 0x2b6a, 0x332: 0x2bea, 0x333: 0x2c6a, 0x334: 0x2cea, 0x335: 0x2d6a,
+	0x336: 0x2dea, 0x337: 0x2e6a, 0x338: 0x2eea, 0x339: 0x2f6a, 0x33a: 0x2fea,
+	0x33c: 0x0015, 0x33d: 0x306a, 0x33e: 0x30ea, 0x33f: 0x316a,
+	// Block 0xd, offset 0x340
+	0x340: 0x0812, 0x341: 0x0812, 0x342: 0x0812, 0x343: 0x0812, 0x344: 0x0812, 0x345: 0x0812,
+	0x348: 0x0813, 0x349: 0x0813, 0x34a: 0x0813, 0x34b: 0x0813,
+	0x34c: 0x0813, 0x34d: 0x0813, 0x350: 0x3b1a, 0x351: 0x0812,
+	0x352: 0x3bfa, 0x353: 0x0812, 0x354: 0x3d3a, 0x355: 0x0812, 0x356: 0x3e7a, 0x357: 0x0812,
+	0x359: 0x0813, 0x35b: 0x0813, 0x35d: 0x0813,
+	0x35f: 0x0813, 0x360: 0x0812, 0x361: 0x0812, 0x362: 0x0812, 0x363: 0x0812,
+	0x364: 0x0812, 0x365: 0x0812, 0x366: 0x0812, 0x367: 0x0812, 0x368: 0x0813, 0x369: 0x0813,
+	0x36a: 0x0813, 0x36b: 0x0813, 0x36c: 0x0813, 0x36d: 0x0813, 0x36e: 0x0813, 0x36f: 0x0813,
+	0x370: 0x9252, 0x371: 0x9252, 0x372: 0x9552, 0x373: 0x9552, 0x374: 0x9852, 0x375: 0x9852,
+	0x376: 0x9b52, 0x377: 0x9b52, 0x378: 0x9e52, 0x379: 0x9e52, 0x37a: 0xa152, 0x37b: 0xa152,
+	0x37c: 0x4d52, 0x37d: 0x4d52,
+	// Block 0xe, offset 0x380
+	0x380: 0x3fba, 0x381: 0x40aa, 0x382: 0x419a, 0x383: 0x428a, 0x384: 0x437a, 0x385: 0x446a,
+	0x386: 0x455a, 0x387: 0x464a, 0x388: 0x4739, 0x389: 0x4829, 0x38a: 0x4919, 0x38b: 0x4a09,
+	0x38c: 0x4af9, 0x38d: 0x4be9, 0x38e: 0x4cd9, 0x38f: 0x4dc9, 0x390: 0x4eba, 0x391: 0x4faa,
+	0x392: 0x509a, 0x393: 0x518a, 0x394: 0x527a, 0x395: 0x536a, 0x396: 0x545a, 0x397: 0x554a,
+	0x398: 0x5639, 0x399: 0x5729, 0x39a: 0x5819, 0x39b: 0x5909, 0x39c: 0x59f9, 0x39d: 0x5ae9,
+	0x39e: 0x5bd9, 0x39f: 0x5cc9, 0x3a0: 0x5dba, 0x3a1: 0x5eaa, 0x3a2: 0x5f9a, 0x3a3: 0x608a,
+	0x3a4: 0x617a, 0x3a5: 0x626a, 0x3a6: 0x635a, 0x3a7: 0x644a, 0x3a8: 0x6539, 0x3a9: 0x6629,
+	0x3aa: 0x6719, 0x3ab: 0x6809, 0x3ac: 0x68f9, 0x3ad: 0x69e9, 0x3ae: 0x6ad9, 0x3af: 0x6bc9,
+	0x3b0: 0x0812, 0x3b1: 0x0812, 0x3b2: 0x6cba, 0x3b3: 0x6dca, 0x3b4: 0x6e9a,
+	0x3b6: 0x6f7a, 0x3b7: 0x705a, 0x3b8: 0x0813, 0x3b9: 0x0813, 0x3ba: 0x9253, 0x3bb: 0x9253,
+	0x3bc: 0x7199, 0x3bd: 0x0004, 0x3be: 0x726a, 0x3bf: 0x0004,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x0004, 0x3c1: 0x0004, 0x3c2: 0x72ea, 0x3c3: 0x73fa, 0x3c4: 0x74ca,
+	0x3c6: 0x75aa, 0x3c7: 0x768a, 0x3c8: 0x9553, 0x3c9: 0x9553, 0x3ca: 0x9853, 0x3cb: 0x9853,
+	0x3cc: 0x77c9, 0x3cd: 0x0004, 0x3ce: 0x0004, 0x3cf: 0x0004, 0x3d0: 0x0812, 0x3d1: 0x0812,
+	0x3d2: 0x789a, 0x3d3: 0x79da, 0x3d6: 0x7b1a, 0x3d7: 0x7bfa,
+	0x3d8: 0x0813, 0x3d9: 0x0813, 0x3da: 0x9b53, 0x3db: 0x9b53, 0x3dd: 0x0004,
+	0x3de: 0x0004, 0x3df: 0x0004, 0x3e0: 0x0812, 0x3e1: 0x0812, 0x3e2: 0x7d3a, 0x3e3: 0x7e7a,
+	0x3e4: 0x7fba, 0x3e5: 0x0912, 0x3e6: 0x809a, 0x3e7: 0x817a, 0x3e8: 0x0813, 0x3e9: 0x0813,
+	0x3ea: 0xa153, 0x3eb: 0xa153, 0x3ec: 0x0913, 0x3ed: 0x0004, 0x3ee: 0x0004, 0x3ef: 0x0004,
+	0x3f2: 0x82ba, 0x3f3: 0x83ca, 0x3f4: 0x849a,
+	0x3f6: 0x857a, 0x3f7: 0x865a, 0x3f8: 0x9e53, 0x3f9: 0x9e53, 0x3fa: 0x4d53, 0x3fb: 0x4d53,
+	0x3fc: 0x8799, 0x3fd: 0x0004, 0x3fe: 0x0004,
+	// Block 0x10, offset 0x400
+	0x402: 0x0013,
+	0x407: 0x0013, 0x40a: 0x0012, 0x40b: 0x0013,
+	0x40c: 0x0013, 0x40d: 0x0013, 0x40e: 0x0012, 0x40f: 0x0012, 0x410: 0x0013, 0x411: 0x0013,
+	0x412: 0x0013, 0x413: 0x0012, 0x415: 0x0013,
+	0x419: 0x0013, 0x41a: 0x0013, 0x41b: 0x0013, 0x41c: 0x0013, 0x41d: 0x0013,
+	0x424: 0x0013, 0x426: 0x886b, 0x428: 0x0013,
+	0x42a: 0x88cb, 0x42b: 0x890b, 0x42c: 0x0013, 0x42d: 0x0013, 0x42f: 0x0012,
+	0x430: 0x0013, 0x431: 0x0013, 0x432: 0xa453, 0x433: 0x0013, 0x434: 0x0012, 0x435: 0x0010,
+	0x436: 0x0010, 0x437: 0x0010, 0x438: 0x0010, 0x439: 0x0012,
+	0x43c: 0x0012, 0x43d: 0x0012, 0x43e: 0x0013, 0x43f: 0x0013,
+	// Block 0x11, offset 0x440
+	0x440: 0x1a13, 0x441: 0x1a13, 0x442: 0x1e13, 0x443: 0x1e13, 0x444: 0x1a13, 0x445: 0x1a13,
+	0x446: 0x2613, 0x447: 0x2613, 0x448: 0x2a13, 0x449: 0x2a13, 0x44a: 0x2e13, 0x44b: 0x2e13,
+	0x44c: 0x2a13, 0x44d: 0x2a13, 0x44e: 0x2613, 0x44f: 0x2613, 0x450: 0xa752, 0x451: 0xa752,
+	0x452: 0xaa52, 0x453: 0xaa52, 0x454: 0xad52, 0x455: 0xad52, 0x456: 0xaa52, 0x457: 0xaa52,
+	0x458: 0xa752, 0x459: 0xa752, 0x45a: 0x1a12, 0x45b: 0x1a12, 0x45c: 0x1e12, 0x45d: 0x1e12,
+	0x45e: 0x1a12, 0x45f: 0x1a12, 0x460: 0x2612, 0x461: 0x2612, 0x462: 0x2a12, 0x463: 0x2a12,
+	0x464: 0x2e12, 0x465: 0x2e12, 0x466: 0x2a12, 0x467: 0x2a12, 0x468: 0x2612, 0x469: 0x2612,
+	// Block 0x12, offset 0x480
+	0x480: 0x6552, 0x481: 0x6552, 0x482: 0x6552, 0x483: 0x6552, 0x484: 0x6552, 0x485: 0x6552,
+	0x486: 0x6552, 0x487: 0x6552, 0x488: 0x6552, 0x489: 0x6552, 0x48a: 0x6552, 0x48b: 0x6552,
+	0x48c: 0x6552, 0x48d: 0x6552, 0x48e: 0x6552, 0x48f: 0x6552, 0x490: 0xb052, 0x491: 0xb052,
+	0x492: 0xb052, 0x493: 0xb052, 0x494: 0xb052, 0x495: 0xb052, 0x496: 0xb052, 0x497: 0xb052,
+	0x498: 0xb052, 0x499: 0xb052, 0x49a: 0xb052, 0x49b: 0xb052, 0x49c: 0xb052, 0x49d: 0xb052,
+	0x49e: 0xb052, 0x49f: 0xb052, 0x4a0: 0x0113, 0x4a1: 0x0112, 0x4a2: 0x896b, 0x4a3: 0x8b53,
+	0x4a4: 0x89cb, 0x4a5: 0x8a2a, 0x4a6: 0x8a8a, 0x4a7: 0x0f13, 0x4a8: 0x0f12, 0x4a9: 0x0313,
+	0x4aa: 0x0312, 0x4ab: 0x0713, 0x4ac: 0x0712, 0x4ad: 0x8aeb, 0x4ae: 0x8b4b, 0x4af: 0x8bab,
+	0x4b0: 0x8c0b, 0x4b1: 0x0012, 0x4b2: 0x0113, 0x4b3: 0x0112, 0x4b4: 0x0012, 0x4b5: 0x0313,
+	0x4b6: 0x0312, 0x4b7: 0x0012, 0x4b8: 0x0012, 0x4b9: 0x0012, 0x4ba: 0x0012, 0x4bb: 0x0012,
+	0x4bc: 0x0015, 0x4bd: 0x0015, 0x4be: 0x8c6b, 0x4bf: 0x8ccb,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x0113, 0x4c1: 0x0112, 0x4c2: 0x0113, 0x4c3: 0x0112, 0x4c4: 0x0113, 0x4c5: 0x0112,
+	0x4c6: 0x0113, 0x4c7: 0x0112, 0x4c8: 0x0014, 0x4c9: 0x0014, 0x4ca: 0x0014, 0x4cb: 0x0713,
+	0x4cc: 0x0712, 0x4cd: 0x8d2b, 0x4ce: 0x0012, 0x4cf: 0x0010, 0x4d0: 0x0113, 0x4d1: 0x0112,
+	0x4d2: 0x0113, 0x4d3: 0x0112, 0x4d4: 0x6552, 0x4d5: 0x0012, 0x4d6: 0x0113, 0x4d7: 0x0112,
+	0x4d8: 0x0113, 0x4d9: 0x0112, 0x4da: 0x0113, 0x4db: 0x0112, 0x4dc: 0x0113, 0x4dd: 0x0112,
+	0x4de: 0x0113, 0x4df: 0x0112, 0x4e0: 0x0113, 0x4e1: 0x0112, 0x4e2: 0x0113, 0x4e3: 0x0112,
+	0x4e4: 0x0113, 0x4e5: 0x0112, 0x4e6: 0x0113, 0x4e7: 0x0112, 0x4e8: 0x0113, 0x4e9: 0x0112,
+	0x4ea: 0x8d8b, 0x4eb: 0x8deb, 0x4ec: 0x8e4b, 0x4ed: 0x8eab, 0x4ee: 0x8f0b, 0x4ef: 0x0012,
+	0x4f0: 0x8f6b, 0x4f1: 0x8fcb, 0x4f2: 0x902b, 0x4f3: 0xb353, 0x4f4: 0x0113, 0x4f5: 0x0112,
+	0x4f6: 0x0113, 0x4f7: 0x0112, 0x4f8: 0x0113, 0x4f9: 0x0112, 0x4fa: 0x0113, 0x4fb: 0x0112,
+	0x4fc: 0x0113, 0x4fd: 0x0112, 0x4fe: 0x0113, 0x4ff: 0x0112,
+	// Block 0x14, offset 0x500
+	0x500: 0x90ea, 0x501: 0x916a, 0x502: 0x91ea, 0x503: 0x926a, 0x504: 0x931a, 0x505: 0x93ca,
+	0x506: 0x944a,
+	0x513: 0x94ca, 0x514: 0x95aa, 0x515: 0x968a, 0x516: 0x976a, 0x517: 0x984a,
+	0x51d: 0x0010,
+	0x51e: 0x0034, 0x51f: 0x0010, 0x520: 0x0010, 0x521: 0x0010, 0x522: 0x0010, 0x523: 0x0010,
+	0x524: 0x0010, 0x525: 0x0010, 0x526: 0x0010, 0x527: 0x0010, 0x528: 0x0010,
+	0x52a: 0x0010, 0x52b: 0x0010, 0x52c: 0x0010, 0x52d: 0x0010, 0x52e: 0x0010, 0x52f: 0x0010,
+	0x530: 0x0010, 0x531: 0x0010, 0x532: 0x0010, 0x533: 0x0010, 0x534: 0x0010, 0x535: 0x0010,
+	0x536: 0x0010, 0x538: 0x0010, 0x539: 0x0010, 0x53a: 0x0010, 0x53b: 0x0010,
+	0x53c: 0x0010, 0x53e: 0x0010,
+	// Block 0x15, offset 0x540
+	0x540: 0x2713, 0x541: 0x2913, 0x542: 0x2b13, 0x543: 0x2913, 0x544: 0x2f13, 0x545: 0x2913,
+	0x546: 0x2b13, 0x547: 0x2913, 0x548: 0x2713, 0x549: 0x3913, 0x54a: 0x3b13,
+	0x54c: 0x3f13, 0x54d: 0x3913, 0x54e: 0x3b13, 0x54f: 0x3913, 0x550: 0x2713, 0x551: 0x2913,
+	0x552: 0x2b13, 0x554: 0x2f13, 0x555: 0x2913, 0x557: 0xbc52,
+	0x558: 0xbf52, 0x559: 0xc252, 0x55a: 0xbf52, 0x55b: 0xc552, 0x55c: 0xbf52, 0x55d: 0xc252,
+	0x55e: 0xbf52, 0x55f: 0xbc52, 0x560: 0xc852, 0x561: 0xcb52, 0x563: 0xce52,
+	0x564: 0xc852, 0x565: 0xcb52, 0x566: 0xc852, 0x567: 0x2712, 0x568: 0x2912, 0x569: 0x2b12,
+	0x56a: 0x2912, 0x56b: 0x2f12, 0x56c: 0x2912, 0x56d: 0x2b12, 0x56e: 0x2912, 0x56f: 0x2712,
+	0x570: 0x3912, 0x571: 0x3b12, 0x573: 0x3f12, 0x574: 0x3912, 0x575: 0x3b12,
+	0x576: 0x3912, 0x577: 0x2712, 0x578: 0x2912, 0x579: 0x2b12, 0x57b: 0x2f12,
+	0x57c: 0x2912,
+	// Block 0x16, offset 0x580
+	0x580: 0x2213, 0x581: 0x2213, 0x582: 0x2613, 0x583: 0x2613, 0x584: 0x2213, 0x585: 0x2213,
+	0x586: 0x2e13, 0x587: 0x2e13, 0x588: 0x2213, 0x589: 0x2213, 0x58a: 0x2613, 0x58b: 0x2613,
+	0x58c: 0x2213, 0x58d: 0x2213, 0x58e: 0x3e13, 0x58f: 0x3e13, 0x590: 0x2213, 0x591: 0x2213,
+	0x592: 0x2613, 0x593: 0x2613, 0x594: 0x2213, 0x595: 0x2213, 0x596: 0x2e13, 0x597: 0x2e13,
+	0x598: 0x2213, 0x599: 0x2213, 0x59a: 0x2613, 0x59b: 0x2613, 0x59c: 0x2213, 0x59d: 0x2213,
+	0x59e: 0xd153, 0x59f: 0xd153, 0x5a0: 0xd453, 0x5a1: 0xd453, 0x5a2: 0x2212, 0x5a3: 0x2212,
+	0x5a4: 0x2612, 0x5a5: 0x2612, 0x5a6: 0x2212, 0x5a7: 0x2212, 0x5a8: 0x2e12, 0x5a9: 0x2e12,
+	0x5aa: 0x2212, 0x5ab: 0x2212, 0x5ac: 0x2612, 0x5ad: 0x2612, 0x5ae: 0x2212, 0x5af: 0x2212,
+	0x5b0: 0x3e12, 0x5b1: 0x3e12, 0x5b2: 0x2212, 0x5b3: 0x2212, 0x5b4: 0x2612, 0x5b5: 0x2612,
+	0x5b6: 0x2212, 0x5b7: 0x2212, 0x5b8: 0x2e12, 0x5b9: 0x2e12, 0x5ba: 0x2212, 0x5bb: 0x2212,
+	0x5bc: 0x2612, 0x5bd: 0x2612, 0x5be: 0x2212, 0x5bf: 0x2212,
+	// Block 0x17, offset 0x5c0
+	0x5c2: 0x0010,
+	0x5c7: 0x0010, 0x5c9: 0x0010, 0x5cb: 0x0010,
+	0x5cd: 0x0010, 0x5ce: 0x0010, 0x5cf: 0x0010, 0x5d1: 0x0010,
+	0x5d2: 0x0010, 0x5d4: 0x0010, 0x5d7: 0x0010,
+	0x5d9: 0x0010, 0x5db: 0x0010, 0x5dd: 0x0010,
+	0x5df: 0x0010, 0x5e1: 0x0010, 0x5e2: 0x0010,
+	0x5e4: 0x0010, 0x5e7: 0x0010, 0x5e8: 0x0010, 0x5e9: 0x0010,
+	0x5ea: 0x0010, 0x5ec: 0x0010, 0x5ed: 0x0010, 0x5ee: 0x0010, 0x5ef: 0x0010,
+	0x5f0: 0x0010, 0x5f1: 0x0010, 0x5f2: 0x0010, 0x5f4: 0x0010, 0x5f5: 0x0010,
+	0x5f6: 0x0010, 0x5f7: 0x0010, 0x5f9: 0x0010, 0x5fa: 0x0010, 0x5fb: 0x0010,
+	0x5fc: 0x0010, 0x5fe: 0x0010,
+}
+
+// caseIndex: 27 blocks, 1728 entries, 3456 bytes
+// Block 0 is the zero block.
+var caseIndex = [1728]uint16{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x16, 0xc3: 0x17, 0xc4: 0x18, 0xc5: 0x19, 0xc6: 0x01, 0xc7: 0x02,
+	0xc8: 0x1a, 0xc9: 0x03, 0xca: 0x04, 0xcb: 0x1b, 0xcc: 0x1c, 0xcd: 0x05, 0xce: 0x06, 0xcf: 0x07,
+	0xd0: 0x1d, 0xd1: 0x1e, 0xd2: 0x1f, 0xd3: 0x20, 0xd4: 0x21, 0xd5: 0x22, 0xd6: 0x08, 0xd7: 0x23,
+	0xd8: 0x24, 0xd9: 0x25, 0xda: 0x26, 0xdb: 0x27, 0xdc: 0x28, 0xdd: 0x29, 0xde: 0x2a, 0xdf: 0x2b,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x07, 0xed: 0x08, 0xef: 0x09,
+	0xf0: 0x16, 0xf3: 0x18,
+	// Block 0x4, offset 0x100
+	0x120: 0x2c, 0x121: 0x2d, 0x122: 0x2e, 0x123: 0x09, 0x124: 0x2f, 0x125: 0x30, 0x126: 0x31, 0x127: 0x32,
+	0x128: 0x33, 0x129: 0x34, 0x12a: 0x35, 0x12b: 0x36, 0x12c: 0x37, 0x12d: 0x38, 0x12e: 0x39, 0x12f: 0x3a,
+	0x130: 0x3b, 0x131: 0x3c, 0x132: 0x3d, 0x133: 0x3e, 0x134: 0x3f, 0x135: 0x40, 0x136: 0x41, 0x137: 0x42,
+	0x138: 0x43, 0x139: 0x44, 0x13a: 0x45, 0x13b: 0x46, 0x13c: 0x47, 0x13d: 0x48, 0x13e: 0x49, 0x13f: 0x4a,
+	// Block 0x5, offset 0x140
+	0x140: 0x4b, 0x141: 0x4c, 0x142: 0x4d, 0x143: 0x0a, 0x144: 0x26, 0x145: 0x26, 0x146: 0x26, 0x147: 0x26,
+	0x148: 0x26, 0x149: 0x4e, 0x14a: 0x4f, 0x14b: 0x50, 0x14c: 0x51, 0x14d: 0x52, 0x14e: 0x53, 0x14f: 0x54,
+	0x150: 0x55, 0x151: 0x26, 0x152: 0x26, 0x153: 0x26, 0x154: 0x26, 0x155: 0x26, 0x156: 0x26, 0x157: 0x26,
+	0x158: 0x26, 0x159: 0x56, 0x15a: 0x57, 0x15b: 0x58, 0x15c: 0x59, 0x15d: 0x5a, 0x15e: 0x5b, 0x15f: 0x5c,
+	0x160: 0x5d, 0x161: 0x5e, 0x162: 0x5f, 0x163: 0x60, 0x164: 0x61, 0x165: 0x62, 0x167: 0x63,
+	0x168: 0x64, 0x169: 0x65, 0x16a: 0x66, 0x16b: 0x67, 0x16c: 0x68, 0x16d: 0x69, 0x16e: 0x6a, 0x16f: 0x6b,
+	0x170: 0x6c, 0x171: 0x6d, 0x172: 0x6e, 0x173: 0x6f, 0x174: 0x70, 0x175: 0x71, 0x176: 0x72, 0x177: 0x73,
+	0x178: 0x74, 0x179: 0x74, 0x17a: 0x75, 0x17b: 0x74, 0x17c: 0x76, 0x17d: 0x0b, 0x17e: 0x0c, 0x17f: 0x0d,
+	// Block 0x6, offset 0x180
+	0x180: 0x77, 0x181: 0x78, 0x182: 0x79, 0x183: 0x7a, 0x184: 0x0e, 0x185: 0x7b, 0x186: 0x7c,
+	0x192: 0x7d, 0x193: 0x0f,
+	0x1b0: 0x7e, 0x1b1: 0x10, 0x1b2: 0x74, 0x1b3: 0x7f, 0x1b4: 0x80, 0x1b5: 0x81, 0x1b6: 0x82, 0x1b7: 0x83,
+	0x1b8: 0x84,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x85, 0x1c2: 0x86, 0x1c3: 0x87, 0x1c4: 0x88, 0x1c5: 0x26, 0x1c6: 0x89,
+	// Block 0x8, offset 0x200
+	0x200: 0x8a, 0x201: 0x26, 0x202: 0x26, 0x203: 0x26, 0x204: 0x26, 0x205: 0x26, 0x206: 0x26, 0x207: 0x26,
+	0x208: 0x26, 0x209: 0x26, 0x20a: 0x26, 0x20b: 0x26, 0x20c: 0x26, 0x20d: 0x26, 0x20e: 0x26, 0x20f: 0x26,
+	0x210: 0x26, 0x211: 0x26, 0x212: 0x8b, 0x213: 0x8c, 0x214: 0x26, 0x215: 0x26, 0x216: 0x26, 0x217: 0x26,
+	0x218: 0x8d, 0x219: 0x8e, 0x21a: 0x8f, 0x21b: 0x90, 0x21c: 0x91, 0x21d: 0x92, 0x21e: 0x11, 0x21f: 0x93,
+	0x220: 0x94, 0x221: 0x95, 0x222: 0x26, 0x223: 0x96, 0x224: 0x97, 0x225: 0x98, 0x226: 0x99, 0x227: 0x9a,
+	0x228: 0x9b, 0x229: 0x9c, 0x22a: 0x9d, 0x22b: 0x9e, 0x22c: 0x9f, 0x22d: 0xa0, 0x22e: 0xa1, 0x22f: 0xa2,
+	0x230: 0x26, 0x231: 0x26, 0x232: 0x26, 0x233: 0x26, 0x234: 0x26, 0x235: 0x26, 0x236: 0x26, 0x237: 0x26,
+	0x238: 0x26, 0x239: 0x26, 0x23a: 0x26, 0x23b: 0x26, 0x23c: 0x26, 0x23d: 0x26, 0x23e: 0x26, 0x23f: 0x26,
+	// Block 0x9, offset 0x240
+	0x240: 0x26, 0x241: 0x26, 0x242: 0x26, 0x243: 0x26, 0x244: 0x26, 0x245: 0x26, 0x246: 0x26, 0x247: 0x26,
+	0x248: 0x26, 0x249: 0x26, 0x24a: 0x26, 0x24b: 0x26, 0x24c: 0x26, 0x24d: 0x26, 0x24e: 0x26, 0x24f: 0x26,
+	0x250: 0x26, 0x251: 0x26, 0x252: 0x26, 0x253: 0x26, 0x254: 0x26, 0x255: 0x26, 0x256: 0x26, 0x257: 0x26,
+	0x258: 0x26, 0x259: 0x26, 0x25a: 0x26, 0x25b: 0x26, 0x25c: 0x26, 0x25d: 0x26, 0x25e: 0x26, 0x25f: 0x26,
+	0x260: 0x26, 0x261: 0x26, 0x262: 0x26, 0x263: 0x26, 0x264: 0x26, 0x265: 0x26, 0x266: 0x26, 0x267: 0x26,
+	0x268: 0x26, 0x269: 0x26, 0x26a: 0x26, 0x26b: 0x26, 0x26c: 0x26, 0x26d: 0x26, 0x26e: 0x26, 0x26f: 0x26,
+	0x270: 0x26, 0x271: 0x26, 0x272: 0x26, 0x273: 0x26, 0x274: 0x26, 0x275: 0x26, 0x276: 0x26, 0x277: 0x26,
+	0x278: 0x26, 0x279: 0x26, 0x27a: 0x26, 0x27b: 0x26, 0x27c: 0x26, 0x27d: 0x26, 0x27e: 0x26, 0x27f: 0x26,
+	// Block 0xa, offset 0x280
+	0x280: 0x26, 0x281: 0x26, 0x282: 0x26, 0x283: 0x26, 0x284: 0x26, 0x285: 0x26, 0x286: 0x26, 0x287: 0x26,
+	0x288: 0x26, 0x289: 0x26, 0x28a: 0x26, 0x28b: 0x26, 0x28c: 0x26, 0x28d: 0x26, 0x28e: 0x26, 0x28f: 0x26,
+	0x290: 0x26, 0x291: 0x26, 0x292: 0x26, 0x293: 0x26, 0x294: 0x26, 0x295: 0x26, 0x296: 0x26, 0x297: 0x26,
+	0x298: 0x26, 0x299: 0x26, 0x29a: 0x26, 0x29b: 0x26, 0x29c: 0x26, 0x29d: 0x26, 0x29e: 0xa3, 0x29f: 0xa4,
+	// Block 0xb, offset 0x2c0
+	0x2ec: 0x12, 0x2ed: 0xa5, 0x2ee: 0xa6, 0x2ef: 0xa7,
+	0x2f0: 0x26, 0x2f1: 0x26, 0x2f2: 0x26, 0x2f3: 0x26, 0x2f4: 0xa8, 0x2f5: 0xa9, 0x2f6: 0xaa, 0x2f7: 0xab,
+	0x2f8: 0xac, 0x2f9: 0xad, 0x2fa: 0x26, 0x2fb: 0xae, 0x2fc: 0xaf, 0x2fd: 0xb0, 0x2fe: 0xb1, 0x2ff: 0xb2,
+	// Block 0xc, offset 0x300
+	0x300: 0xb3, 0x301: 0xb4, 0x302: 0x26, 0x303: 0xb5, 0x305: 0xb6, 0x307: 0xb7,
+	0x30a: 0xb8, 0x30b: 0xb9, 0x30c: 0xba, 0x30d: 0xbb, 0x30e: 0xbc, 0x30f: 0xbd,
+	0x310: 0xbe, 0x311: 0xbf, 0x312: 0xc0, 0x313: 0xc1, 0x314: 0xc2, 0x315: 0xc3, 0x316: 0x13,
+	0x318: 0x26, 0x319: 0x26, 0x31a: 0x26, 0x31b: 0x26, 0x31c: 0xc4, 0x31d: 0xc5, 0x31e: 0xc6,
+	0x320: 0xc7, 0x321: 0xc8, 0x322: 0xc9, 0x323: 0xca, 0x324: 0xcb, 0x326: 0xcc,
+	0x328: 0xcd, 0x329: 0xce, 0x32a: 0xcf, 0x32b: 0xd0, 0x32c: 0x60, 0x32d: 0xd1, 0x32e: 0xd2,
+	0x330: 0x26, 0x331: 0xd3, 0x332: 0xd4, 0x333: 0xd5, 0x334: 0xd6,
+	0x33a: 0xd7, 0x33b: 0xd8, 0x33c: 0xd9, 0x33d: 0xda, 0x33e: 0xdb, 0x33f: 0xdc,
+	// Block 0xd, offset 0x340
+	0x340: 0xdd, 0x341: 0xde, 0x342: 0xdf, 0x343: 0xe0, 0x344: 0xe1, 0x345: 0xe2, 0x346: 0xe3, 0x347: 0xe4,
+	0x348: 0xe5, 0x349: 0xe6, 0x34a: 0xe7, 0x34b: 0xe8, 0x34c: 0xe9, 0x34d: 0xea,
+	0x350: 0xeb, 0x351: 0xec, 0x352: 0xed, 0x353: 0xee, 0x356: 0xef, 0x357: 0xf0,
+	0x358: 0xf1, 0x359: 0xf2, 0x35a: 0xf3, 0x35b: 0xf4, 0x35c: 0xf5,
+	0x360: 0xf6, 0x362: 0xf7, 0x363: 0xf8, 0x364: 0xf9, 0x365: 0xfa, 0x366: 0xfb, 0x367: 0xfc,
+	0x368: 0xfd, 0x369: 0xfe, 0x36a: 0xff, 0x36b: 0x100,
+	0x370: 0x101, 0x371: 0x102, 0x372: 0x103, 0x374: 0x104, 0x375: 0x105, 0x376: 0x106,
+	0x37b: 0x107, 0x37c: 0x108, 0x37d: 0x109, 0x37e: 0x10a,
+	// Block 0xe, offset 0x380
+	0x380: 0x26, 0x381: 0x26, 0x382: 0x26, 0x383: 0x26, 0x384: 0x26, 0x385: 0x26, 0x386: 0x26, 0x387: 0x26,
+	0x388: 0x26, 0x389: 0x26, 0x38a: 0x26, 0x38b: 0x26, 0x38c: 0x26, 0x38d: 0x26, 0x38e: 0x10b,
+	0x390: 0x26, 0x391: 0x10c, 0x392: 0x26, 0x393: 0x26, 0x394: 0x26, 0x395: 0x10d,
+	0x3be: 0xa9, 0x3bf: 0x10e,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x26, 0x3c1: 0x26, 0x3c2: 0x26, 0x3c3: 0x26, 0x3c4: 0x26, 0x3c5: 0x26, 0x3c6: 0x26, 0x3c7: 0x26,
+	0x3c8: 0x26, 0x3c9: 0x26, 0x3ca: 0x26, 0x3cb: 0x26, 0x3cc: 0x26, 0x3cd: 0x26, 0x3ce: 0x26, 0x3cf: 0x26,
+	0x3d0: 0x10f, 0x3d1: 0x110,
+	// Block 0x10, offset 0x400
+	0x410: 0x26, 0x411: 0x26, 0x412: 0x26, 0x413: 0x26, 0x414: 0x26, 0x415: 0x26, 0x416: 0x26, 0x417: 0x26,
+	0x418: 0x26, 0x419: 0x111,
+	// Block 0x11, offset 0x440
+	0x460: 0x26, 0x461: 0x26, 0x462: 0x26, 0x463: 0x26, 0x464: 0x26, 0x465: 0x26, 0x466: 0x26, 0x467: 0x26,
+	0x468: 0x100, 0x469: 0x112, 0x46a: 0x113, 0x46b: 0x114, 0x46c: 0x115, 0x46d: 0x116, 0x46e: 0x117,
+	0x479: 0x118, 0x47c: 0x26, 0x47d: 0x119, 0x47e: 0x11a, 0x47f: 0x11b,
+	// Block 0x12, offset 0x480
+	0x4bf: 0x11c,
+	// Block 0x13, offset 0x4c0
+	0x4f0: 0x26, 0x4f1: 0x11d, 0x4f2: 0x11e,
+	// Block 0x14, offset 0x500
+	0x53c: 0x11f, 0x53d: 0x120,
+	// Block 0x15, offset 0x540
+	0x545: 0x121, 0x546: 0x122,
+	0x549: 0x123,
+	0x550: 0x124, 0x551: 0x125, 0x552: 0x126, 0x553: 0x127, 0x554: 0x128, 0x555: 0x129, 0x556: 0x12a, 0x557: 0x12b,
+	0x558: 0x12c, 0x559: 0x12d, 0x55a: 0x12e, 0x55b: 0x12f, 0x55c: 0x130, 0x55d: 0x131, 0x55e: 0x132, 0x55f: 0x133,
+	0x568: 0x134, 0x569: 0x135, 0x56a: 0x136,
+	0x57c: 0x137,
+	// Block 0x16, offset 0x580
+	0x580: 0x138, 0x581: 0x139, 0x582: 0x13a, 0x584: 0x13b, 0x585: 0x13c,
+	0x58a: 0x13d, 0x58b: 0x13e,
+	0x593: 0x13f,
+	0x59f: 0x140,
+	0x5a0: 0x26, 0x5a1: 0x26, 0x5a2: 0x26, 0x5a3: 0x141, 0x5a4: 0x14, 0x5a5: 0x142,
+	0x5b8: 0x143, 0x5b9: 0x15, 0x5ba: 0x144,
+	// Block 0x17, offset 0x5c0
+	0x5c4: 0x145, 0x5c5: 0x146, 0x5c6: 0x147,
+	0x5cf: 0x148,
+	0x5ef: 0x149,
+	// Block 0x18, offset 0x600
+	0x610: 0x0a, 0x611: 0x0b, 0x612: 0x0c, 0x613: 0x0d, 0x614: 0x0e, 0x616: 0x0f,
+	0x61a: 0x10, 0x61b: 0x11, 0x61c: 0x12, 0x61d: 0x13, 0x61e: 0x14, 0x61f: 0x15,
+	// Block 0x19, offset 0x640
+	0x640: 0x14a, 0x641: 0x14b, 0x644: 0x14b, 0x645: 0x14b, 0x646: 0x14b, 0x647: 0x14c,
+	// Block 0x1a, offset 0x680
+	0x6a0: 0x17,
+}
+
+// sparseOffsets: 312 entries, 624 bytes
+var sparseOffsets = []uint16{0x0, 0x9, 0xf, 0x18, 0x24, 0x2e, 0x34, 0x37, 0x3b, 0x3e, 0x42, 0x4c, 0x4e, 0x57, 0x5e, 0x63, 0x71, 0x72, 0x80, 0x8f, 0x99, 0x9c, 0xa3, 0xab, 0xaf, 0xb7, 0xbd, 0xcb, 0xd6, 0xe3, 0xee, 0xfa, 0x104, 0x110, 0x11b, 0x127, 0x133, 0x13b, 0x145, 0x150, 0x15b, 0x167, 0x16d, 0x178, 0x17e, 0x186, 0x189, 0x18e, 0x192, 0x196, 0x19d, 0x1a6, 0x1ae, 0x1af, 0x1b8, 0x1bf, 0x1c7, 0x1cd, 0x1d2, 0x1d6, 0x1d9, 0x1db, 0x1de, 0x1e3, 0x1e4, 0x1e6, 0x1e8, 0x1ea, 0x1f1, 0x1f6, 0x1fa, 0x203, 0x206, 0x209, 0x20f, 0x210, 0x21b, 0x21c, 0x21d, 0x222, 0x22f, 0x238, 0x23e, 0x246, 0x24f, 0x258, 0x261, 0x266, 0x269, 0x274, 0x282, 0x284, 0x28b, 0x28f, 0x29b, 0x29c, 0x2a7, 0x2af, 0x2b7, 0x2bd, 0x2be, 0x2cc, 0x2d1, 0x2d4, 0x2d9, 0x2dd, 0x2e3, 0x2e8, 0x2eb, 0x2f0, 0x2f5, 0x2f6, 0x2fc, 0x2fe, 0x2ff, 0x301, 0x303, 0x306, 0x307, 0x309, 0x30c, 0x312, 0x316, 0x318, 0x31d, 0x324, 0x334, 0x33e, 0x33f, 0x348, 0x34c, 0x351, 0x359, 0x35f, 0x365, 0x36f, 0x374, 0x37d, 0x383, 0x38c, 0x390, 0x398, 0x39a, 0x39c, 0x39f, 0x3a1, 0x3a3, 0x3a4, 0x3a5, 0x3a7, 0x3a9, 0x3af, 0x3b4, 0x3b6, 0x3bd, 0x3c0, 0x3c2, 0x3c8, 0x3cd, 0x3cf, 0x3d0, 0x3d1, 0x3d2, 0x3d4, 0x3d6, 0x3d8, 0x3db, 0x3dd, 0x3e0, 0x3e8, 0x3eb, 0x3ef, 0x3f7, 0x3f9, 0x409, 0x40a, 0x40c, 0x411, 0x417, 0x419, 0x41a, 0x41c, 0x41e, 0x420, 0x42d, 0x42e, 0x42f, 0x433, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43c, 0x43f, 0x440, 0x443, 0x44a, 0x450, 0x452, 0x456, 0x45e, 0x464, 0x468, 0x46f, 0x473, 0x477, 0x480, 0x48a, 0x48c, 0x492, 0x498, 0x4a2, 0x4ac, 0x4ae, 0x4b7, 0x4bd, 0x4c3, 0x4c9, 0x4cc, 0x4d2, 0x4d5, 0x4de, 0x4df, 0x4e6, 0x4ea, 0x4eb, 0x4ee, 0x4f8, 0x4fb, 0x4fd, 0x504, 0x50c, 0x512, 0x519, 0x51a, 0x520, 0x523, 0x52b, 0x532, 0x53c, 0x544, 0x547, 0x54c, 0x550, 0x551, 0x552, 0x553, 0x554, 0x555, 0x557, 0x55a, 0x55b, 0x55e, 0x55f, 0x562, 0x564, 0x568, 0x569, 0x56b, 0x56e, 0x570, 0x573, 0x576, 0x578, 0x57d, 0x57f, 0x580, 0x585, 0x589, 0x58a, 0x58d, 0x591, 0x59c, 0x5a0, 0x5a8, 0x5ad, 0x5b1, 0x5b4, 0x5b8, 0x5bb, 0x5be, 0x5c3, 0x5c7, 0x5cb, 0x5cf, 0x5d3, 0x5d5, 0x5d7, 0x5da, 0x5de, 0x5e4, 0x5e5, 0x5e6, 0x5e9, 0x5eb, 0x5ed, 0x5f0, 0x5f5, 0x5f9, 0x5fb, 0x601, 0x60a, 0x60f, 0x610, 0x613, 0x614, 0x615, 0x616, 0x618, 0x619, 0x61a}
+
+// sparseValues: 1562 entries, 6248 bytes
+var sparseValues = [1562]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0004, lo: 0xa8, hi: 0xa8},
+	{value: 0x0012, lo: 0xaa, hi: 0xaa},
+	{value: 0x0014, lo: 0xad, hi: 0xad},
+	{value: 0x0004, lo: 0xaf, hi: 0xaf},
+	{value: 0x0004, lo: 0xb4, hi: 0xb4},
+	{value: 0x001a, lo: 0xb5, hi: 0xb5},
+	{value: 0x0054, lo: 0xb7, hi: 0xb7},
+	{value: 0x0004, lo: 0xb8, hi: 0xb8},
+	{value: 0x0012, lo: 0xba, hi: 0xba},
+	// Block 0x1, offset 0x9
+	{value: 0x2013, lo: 0x80, hi: 0x96},
+	{value: 0x2013, lo: 0x98, hi: 0x9e},
+	{value: 0x009a, lo: 0x9f, hi: 0x9f},
+	{value: 0x2012, lo: 0xa0, hi: 0xb6},
+	{value: 0x2012, lo: 0xb8, hi: 0xbe},
+	{value: 0x0252, lo: 0xbf, hi: 0xbf},
+	// Block 0x2, offset 0xf
+	{value: 0x0117, lo: 0x80, hi: 0xaf},
+	{value: 0x011b, lo: 0xb0, hi: 0xb0},
+	{value: 0x019a, lo: 0xb1, hi: 0xb1},
+	{value: 0x0117, lo: 0xb2, hi: 0xb7},
+	{value: 0x0012, lo: 0xb8, hi: 0xb8},
+	{value: 0x0316, lo: 0xb9, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x0316, lo: 0xbd, hi: 0xbe},
+	{value: 0x0553, lo: 0xbf, hi: 0xbf},
+	// Block 0x3, offset 0x18
+	{value: 0x0552, lo: 0x80, hi: 0x80},
+	{value: 0x0316, lo: 0x81, hi: 0x82},
+	{value: 0x0716, lo: 0x83, hi: 0x84},
+	{value: 0x0316, lo: 0x85, hi: 0x86},
+	{value: 0x0f16, lo: 0x87, hi: 0x88},
+	{value: 0x01da, lo: 0x89, hi: 0x89},
+	{value: 0x0117, lo: 0x8a, hi: 0xb7},
+	{value: 0x0253, lo: 0xb8, hi: 0xb8},
+	{value: 0x0316, lo: 0xb9, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x0316, lo: 0xbd, hi: 0xbe},
+	{value: 0x028a, lo: 0xbf, hi: 0xbf},
+	// Block 0x4, offset 0x24
+	{value: 0x0117, lo: 0x80, hi: 0x9f},
+	{value: 0x2f53, lo: 0xa0, hi: 0xa0},
+	{value: 0x0012, lo: 0xa1, hi: 0xa1},
+	{value: 0x0117, lo: 0xa2, hi: 0xb3},
+	{value: 0x0012, lo: 0xb4, hi: 0xb9},
+	{value: 0x090b, lo: 0xba, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x2953, lo: 0xbd, hi: 0xbd},
+	{value: 0x098b, lo: 0xbe, hi: 0xbe},
+	{value: 0x0a0a, lo: 0xbf, hi: 0xbf},
+	// Block 0x5, offset 0x2e
+	{value: 0x0015, lo: 0x80, hi: 0x81},
+	{value: 0x0014, lo: 0x82, hi: 0x97},
+	{value: 0x0004, lo: 0x98, hi: 0x9d},
+	{value: 0x0014, lo: 0x9e, hi: 0x9f},
+	{value: 0x0015, lo: 0xa0, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xbf},
+	// Block 0x6, offset 0x34
+	{value: 0x0024, lo: 0x80, hi: 0x94},
+	{value: 0x0034, lo: 0x95, hi: 0xbc},
+	{value: 0x0024, lo: 0xbd, hi: 0xbf},
+	// Block 0x7, offset 0x37
+	{value: 0x6553, lo: 0x80, hi: 0x8f},
+	{value: 0x2013, lo: 0x90, hi: 0x9f},
+	{value: 0x5f53, lo: 0xa0, hi: 0xaf},
+	{value: 0x2012, lo: 0xb0, hi: 0xbf},
+	// Block 0x8, offset 0x3b
+	{value: 0x5f52, lo: 0x80, hi: 0x8f},
+	{value: 0x6552, lo: 0x90, hi: 0x9f},
+	{value: 0x0117, lo: 0xa0, hi: 0xbf},
+	// Block 0x9, offset 0x3e
+	{value: 0x0117, lo: 0x80, hi: 0x81},
+	{value: 0x0024, lo: 0x83, hi: 0x87},
+	{value: 0x0014, lo: 0x88, hi: 0x89},
+	{value: 0x0117, lo: 0x8a, hi: 0xbf},
+	// Block 0xa, offset 0x42
+	{value: 0x0f13, lo: 0x80, hi: 0x80},
+	{value: 0x0316, lo: 0x81, hi: 0x82},
+	{value: 0x0716, lo: 0x83, hi: 0x84},
+	{value: 0x0316, lo: 0x85, hi: 0x86},
+	{value: 0x0f16, lo: 0x87, hi: 0x88},
+	{value: 0x0316, lo: 0x89, hi: 0x8a},
+	{value: 0x0716, lo: 0x8b, hi: 0x8c},
+	{value: 0x0316, lo: 0x8d, hi: 0x8e},
+	{value: 0x0f12, lo: 0x8f, hi: 0x8f},
+	{value: 0x0117, lo: 0x90, hi: 0xbf},
+	// Block 0xb, offset 0x4c
+	{value: 0x0117, lo: 0x80, hi: 0xaf},
+	{value: 0x6553, lo: 0xb1, hi: 0xbf},
+	// Block 0xc, offset 0x4e
+	{value: 0x3013, lo: 0x80, hi: 0x8f},
+	{value: 0x6853, lo: 0x90, hi: 0x96},
+	{value: 0x0014, lo: 0x99, hi: 0x99},
+	{value: 0x0010, lo: 0x9a, hi: 0x9c},
+	{value: 0x0010, lo: 0x9e, hi: 0x9e},
+	{value: 0x0054, lo: 0x9f, hi: 0x9f},
+	{value: 0x0012, lo: 0xa0, hi: 0xa0},
+	{value: 0x6552, lo: 0xa1, hi: 0xaf},
+	{value: 0x3012, lo: 0xb0, hi: 0xbf},
+	// Block 0xd, offset 0x57
+	{value: 0x0034, lo: 0x81, hi: 0x82},
+	{value: 0x0024, lo: 0x84, hi: 0x84},
+	{value: 0x0034, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0xaa},
+	{value: 0x0010, lo: 0xaf, hi: 0xb3},
+	{value: 0x0054, lo: 0xb4, hi: 0xb4},
+	// Block 0xe, offset 0x5e
+	{value: 0x0014, lo: 0x80, hi: 0x85},
+	{value: 0x0024, lo: 0x90, hi: 0x97},
+	{value: 0x0034, lo: 0x98, hi: 0x9a},
+	{value: 0x0014, lo: 0x9c, hi: 0x9c},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0xf, offset 0x63
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x8a},
+	{value: 0x0034, lo: 0x8b, hi: 0x92},
+	{value: 0x0024, lo: 0x93, hi: 0x94},
+	{value: 0x0034, lo: 0x95, hi: 0x96},
+	{value: 0x0024, lo: 0x97, hi: 0x9b},
+	{value: 0x0034, lo: 0x9c, hi: 0x9c},
+	{value: 0x0024, lo: 0x9d, hi: 0x9e},
+	{value: 0x0034, lo: 0x9f, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xab, hi: 0xab},
+	{value: 0x0010, lo: 0xae, hi: 0xaf},
+	{value: 0x0034, lo: 0xb0, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xbf},
+	// Block 0x10, offset 0x71
+	{value: 0x0010, lo: 0x80, hi: 0xbf},
+	// Block 0x11, offset 0x72
+	{value: 0x0010, lo: 0x80, hi: 0x93},
+	{value: 0x0010, lo: 0x95, hi: 0x95},
+	{value: 0x0024, lo: 0x96, hi: 0x9c},
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x0024, lo: 0x9f, hi: 0xa2},
+	{value: 0x0034, lo: 0xa3, hi: 0xa3},
+	{value: 0x0024, lo: 0xa4, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xa6},
+	{value: 0x0024, lo: 0xa7, hi: 0xa8},
+	{value: 0x0034, lo: 0xaa, hi: 0xaa},
+	{value: 0x0024, lo: 0xab, hi: 0xac},
+	{value: 0x0034, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xbc},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x12, offset 0x80
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0034, lo: 0x91, hi: 0x91},
+	{value: 0x0010, lo: 0x92, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb0},
+	{value: 0x0034, lo: 0xb1, hi: 0xb1},
+	{value: 0x0024, lo: 0xb2, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0024, lo: 0xb5, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb9},
+	{value: 0x0024, lo: 0xba, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbc},
+	{value: 0x0024, lo: 0xbd, hi: 0xbd},
+	{value: 0x0034, lo: 0xbe, hi: 0xbe},
+	{value: 0x0024, lo: 0xbf, hi: 0xbf},
+	// Block 0x13, offset 0x8f
+	{value: 0x0024, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0024, lo: 0x83, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x84},
+	{value: 0x0024, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0024, lo: 0x87, hi: 0x87},
+	{value: 0x0034, lo: 0x88, hi: 0x88},
+	{value: 0x0024, lo: 0x89, hi: 0x8a},
+	{value: 0x0010, lo: 0x8d, hi: 0xbf},
+	// Block 0x14, offset 0x99
+	{value: 0x0010, lo: 0x80, hi: 0xa5},
+	{value: 0x0014, lo: 0xa6, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	// Block 0x15, offset 0x9c
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0024, lo: 0xab, hi: 0xb1},
+	{value: 0x0034, lo: 0xb2, hi: 0xb2},
+	{value: 0x0024, lo: 0xb3, hi: 0xb3},
+	{value: 0x0014, lo: 0xb4, hi: 0xb5},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0034, lo: 0xbd, hi: 0xbd},
+	// Block 0x16, offset 0xa3
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0024, lo: 0x96, hi: 0x99},
+	{value: 0x0014, lo: 0x9a, hi: 0x9a},
+	{value: 0x0024, lo: 0x9b, hi: 0xa3},
+	{value: 0x0014, lo: 0xa4, hi: 0xa4},
+	{value: 0x0024, lo: 0xa5, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa8},
+	{value: 0x0024, lo: 0xa9, hi: 0xad},
+	// Block 0x17, offset 0xab
+	{value: 0x0010, lo: 0x80, hi: 0x98},
+	{value: 0x0034, lo: 0x99, hi: 0x9b},
+	{value: 0x0010, lo: 0xa0, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x18, offset 0xaf
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0004, lo: 0x88, hi: 0x88},
+	{value: 0x0010, lo: 0x89, hi: 0x8e},
+	{value: 0x0014, lo: 0x90, hi: 0x91},
+	{value: 0x0024, lo: 0x98, hi: 0x98},
+	{value: 0x0034, lo: 0x99, hi: 0x9b},
+	{value: 0x0024, lo: 0x9c, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x19, offset 0xb7
+	{value: 0x0014, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xb9},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x1a, offset 0xbd
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x88},
+	{value: 0x0010, lo: 0x89, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0024, lo: 0x91, hi: 0x91},
+	{value: 0x0034, lo: 0x92, hi: 0x92},
+	{value: 0x0024, lo: 0x93, hi: 0x94},
+	{value: 0x0014, lo: 0x95, hi: 0x97},
+	{value: 0x0010, lo: 0x98, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0014, lo: 0xb1, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xbf},
+	// Block 0x1b, offset 0xcb
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb2},
+	{value: 0x0010, lo: 0xb6, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x1c, offset 0xd6
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x9c, hi: 0x9d},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xb1},
+	{value: 0x0010, lo: 0xbc, hi: 0xbc},
+	{value: 0x0024, lo: 0xbe, hi: 0xbe},
+	// Block 0x1d, offset 0xe3
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8a},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb6},
+	{value: 0x0010, lo: 0xb8, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x1e, offset 0xee
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0014, lo: 0x87, hi: 0x88},
+	{value: 0x0014, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0014, lo: 0x91, hi: 0x91},
+	{value: 0x0010, lo: 0x99, hi: 0x9c},
+	{value: 0x0010, lo: 0x9e, hi: 0x9e},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb5},
+	// Block 0x1f, offset 0xfa
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8d},
+	{value: 0x0010, lo: 0x8f, hi: 0x91},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x20, offset 0x104
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x85},
+	{value: 0x0014, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x89, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb9, hi: 0xb9},
+	{value: 0x0014, lo: 0xba, hi: 0xbf},
+	// Block 0x21, offset 0x110
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x22, offset 0x11b
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0014, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x9c, hi: 0x9d},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	// Block 0x23, offset 0x127
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8a},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0x95},
+	{value: 0x0010, lo: 0x99, hi: 0x9a},
+	{value: 0x0010, lo: 0x9c, hi: 0x9c},
+	{value: 0x0010, lo: 0x9e, hi: 0x9f},
+	{value: 0x0010, lo: 0xa3, hi: 0xa4},
+	{value: 0x0010, lo: 0xa8, hi: 0xaa},
+	{value: 0x0010, lo: 0xae, hi: 0xb9},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x24, offset 0x133
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x82},
+	{value: 0x0010, lo: 0x86, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	// Block 0x25, offset 0x13b
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x83},
+	{value: 0x0014, lo: 0x84, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbd},
+	{value: 0x0014, lo: 0xbe, hi: 0xbf},
+	// Block 0x26, offset 0x145
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x84},
+	{value: 0x0014, lo: 0x86, hi: 0x88},
+	{value: 0x0014, lo: 0x8a, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0034, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x9a},
+	{value: 0x0010, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	// Block 0x27, offset 0x150
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x28, offset 0x15b
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0014, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x9d, hi: 0x9e},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb1, hi: 0xb3},
+	// Block 0x29, offset 0x167
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x2a, offset 0x16d
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x86, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x94, hi: 0x97},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xba, hi: 0xbf},
+	// Block 0x2b, offset 0x178
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x96},
+	{value: 0x0010, lo: 0x9a, hi: 0xb1},
+	{value: 0x0010, lo: 0xb3, hi: 0xbb},
+	{value: 0x0010, lo: 0xbd, hi: 0xbd},
+	// Block 0x2c, offset 0x17e
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0010, lo: 0x8f, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x94},
+	{value: 0x0014, lo: 0x96, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x9f},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	// Block 0x2d, offset 0x186
+	{value: 0x0014, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb4, hi: 0xb7},
+	{value: 0x0034, lo: 0xb8, hi: 0xba},
+	// Block 0x2e, offset 0x189
+	{value: 0x0004, lo: 0x86, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x87},
+	{value: 0x0034, lo: 0x88, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x2f, offset 0x18e
+	{value: 0x0014, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb4, hi: 0xb7},
+	{value: 0x0034, lo: 0xb8, hi: 0xba},
+	{value: 0x0014, lo: 0xbb, hi: 0xbc},
+	// Block 0x30, offset 0x192
+	{value: 0x0004, lo: 0x86, hi: 0x86},
+	{value: 0x0034, lo: 0x88, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x31, offset 0x196
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0034, lo: 0x98, hi: 0x99},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0034, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	{value: 0x0034, lo: 0xb9, hi: 0xb9},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x32, offset 0x19d
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0010, lo: 0x89, hi: 0xac},
+	{value: 0x0034, lo: 0xb1, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xba, hi: 0xbd},
+	{value: 0x0014, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x33, offset 0x1a6
+	{value: 0x0034, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0024, lo: 0x82, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x84},
+	{value: 0x0024, lo: 0x86, hi: 0x87},
+	{value: 0x0010, lo: 0x88, hi: 0x8c},
+	{value: 0x0014, lo: 0x8d, hi: 0x97},
+	{value: 0x0014, lo: 0x99, hi: 0xbc},
+	// Block 0x34, offset 0x1ae
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	// Block 0x35, offset 0x1af
+	{value: 0x0010, lo: 0xab, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	{value: 0x0010, lo: 0xb8, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbc},
+	{value: 0x0014, lo: 0xbd, hi: 0xbe},
+	// Block 0x36, offset 0x1b8
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x96, hi: 0x97},
+	{value: 0x0014, lo: 0x98, hi: 0x99},
+	{value: 0x0014, lo: 0x9e, hi: 0xa0},
+	{value: 0x0010, lo: 0xa2, hi: 0xa4},
+	{value: 0x0010, lo: 0xa7, hi: 0xad},
+	{value: 0x0014, lo: 0xb1, hi: 0xb4},
+	// Block 0x37, offset 0x1bf
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8f, hi: 0x9c},
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x6c53, lo: 0xa0, hi: 0xbf},
+	// Block 0x38, offset 0x1c7
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x98},
+	{value: 0x0010, lo: 0x9a, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x39, offset 0x1cd
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb5},
+	{value: 0x0010, lo: 0xb8, hi: 0xbe},
+	// Block 0x3a, offset 0x1d2
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x82, hi: 0x85},
+	{value: 0x0010, lo: 0x88, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0xbf},
+	// Block 0x3b, offset 0x1d6
+	{value: 0x0010, lo: 0x80, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0x95},
+	{value: 0x0010, lo: 0x98, hi: 0xbf},
+	// Block 0x3c, offset 0x1d9
+	{value: 0x0010, lo: 0x80, hi: 0x9a},
+	{value: 0x0024, lo: 0x9d, hi: 0x9f},
+	// Block 0x3d, offset 0x1db
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	{value: 0x7453, lo: 0xa0, hi: 0xaf},
+	{value: 0x7853, lo: 0xb0, hi: 0xbf},
+	// Block 0x3e, offset 0x1de
+	{value: 0x7c53, lo: 0x80, hi: 0x8f},
+	{value: 0x8053, lo: 0x90, hi: 0x9f},
+	{value: 0x7c53, lo: 0xa0, hi: 0xaf},
+	{value: 0x0813, lo: 0xb0, hi: 0xb5},
+	{value: 0x0892, lo: 0xb8, hi: 0xbd},
+	// Block 0x3f, offset 0x1e3
+	{value: 0x0010, lo: 0x81, hi: 0xbf},
+	// Block 0x40, offset 0x1e4
+	{value: 0x0010, lo: 0x80, hi: 0xac},
+	{value: 0x0010, lo: 0xaf, hi: 0xbf},
+	// Block 0x41, offset 0x1e6
+	{value: 0x0010, lo: 0x81, hi: 0x9a},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x42, offset 0x1e8
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0010, lo: 0xae, hi: 0xb8},
+	// Block 0x43, offset 0x1ea
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x93},
+	{value: 0x0034, lo: 0x94, hi: 0x94},
+	{value: 0x0030, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0x9f, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb3},
+	{value: 0x0030, lo: 0xb4, hi: 0xb4},
+	// Block 0x44, offset 0x1f1
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x93},
+	{value: 0x0010, lo: 0xa0, hi: 0xac},
+	{value: 0x0010, lo: 0xae, hi: 0xb0},
+	{value: 0x0014, lo: 0xb2, hi: 0xb3},
+	// Block 0x45, offset 0x1f6
+	{value: 0x0014, lo: 0xb4, hi: 0xb5},
+	{value: 0x0010, lo: 0xb6, hi: 0xb6},
+	{value: 0x0014, lo: 0xb7, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x46, offset 0x1fa
+	{value: 0x0010, lo: 0x80, hi: 0x85},
+	{value: 0x0014, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0014, lo: 0x89, hi: 0x91},
+	{value: 0x0034, lo: 0x92, hi: 0x92},
+	{value: 0x0014, lo: 0x93, hi: 0x93},
+	{value: 0x0004, lo: 0x97, hi: 0x97},
+	{value: 0x0024, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	// Block 0x47, offset 0x203
+	{value: 0x0014, lo: 0x8b, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x48, offset 0x206
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0xb8},
+	// Block 0x49, offset 0x209
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0xa8},
+	{value: 0x0034, lo: 0xa9, hi: 0xa9},
+	{value: 0x0010, lo: 0xaa, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x4a, offset 0x20f
+	{value: 0x0010, lo: 0x80, hi: 0xb5},
+	// Block 0x4b, offset 0x210
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0014, lo: 0xa0, hi: 0xa2},
+	{value: 0x0010, lo: 0xa3, hi: 0xa6},
+	{value: 0x0014, lo: 0xa7, hi: 0xa8},
+	{value: 0x0010, lo: 0xa9, hi: 0xab},
+	{value: 0x0010, lo: 0xb0, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb2},
+	{value: 0x0010, lo: 0xb3, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xb9},
+	{value: 0x0024, lo: 0xba, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbb},
+	// Block 0x4c, offset 0x21b
+	{value: 0x0010, lo: 0x86, hi: 0x8f},
+	// Block 0x4d, offset 0x21c
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x4e, offset 0x21d
+	{value: 0x0010, lo: 0x80, hi: 0x96},
+	{value: 0x0024, lo: 0x97, hi: 0x97},
+	{value: 0x0034, lo: 0x98, hi: 0x98},
+	{value: 0x0010, lo: 0x99, hi: 0x9a},
+	{value: 0x0014, lo: 0x9b, hi: 0x9b},
+	// Block 0x4f, offset 0x222
+	{value: 0x0010, lo: 0x95, hi: 0x95},
+	{value: 0x0014, lo: 0x96, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0014, lo: 0x98, hi: 0x9e},
+	{value: 0x0034, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa2},
+	{value: 0x0010, lo: 0xa3, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xac},
+	{value: 0x0010, lo: 0xad, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0024, lo: 0xb5, hi: 0xbc},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x50, offset 0x22f
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0004, lo: 0xa7, hi: 0xa7},
+	{value: 0x0024, lo: 0xb0, hi: 0xb4},
+	{value: 0x0034, lo: 0xb5, hi: 0xba},
+	{value: 0x0024, lo: 0xbb, hi: 0xbc},
+	{value: 0x0034, lo: 0xbd, hi: 0xbd},
+	{value: 0x0014, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x51, offset 0x238
+	{value: 0x0034, lo: 0x80, hi: 0x80},
+	{value: 0x0024, lo: 0x81, hi: 0x82},
+	{value: 0x0034, lo: 0x83, hi: 0x84},
+	{value: 0x0024, lo: 0x85, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0024, lo: 0x8b, hi: 0x8e},
+	// Block 0x52, offset 0x23e
+	{value: 0x0014, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x53, offset 0x246
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0030, lo: 0x84, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0024, lo: 0xab, hi: 0xab},
+	{value: 0x0034, lo: 0xac, hi: 0xac},
+	{value: 0x0024, lo: 0xad, hi: 0xb3},
+	// Block 0x54, offset 0x24f
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa5},
+	{value: 0x0010, lo: 0xa6, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa9},
+	{value: 0x0030, lo: 0xaa, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xab},
+	{value: 0x0014, lo: 0xac, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xbf},
+	// Block 0x55, offset 0x258
+	{value: 0x0010, lo: 0x80, hi: 0xa5},
+	{value: 0x0034, lo: 0xa6, hi: 0xa6},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa9},
+	{value: 0x0010, lo: 0xaa, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xae},
+	{value: 0x0014, lo: 0xaf, hi: 0xb1},
+	{value: 0x0030, lo: 0xb2, hi: 0xb3},
+	// Block 0x56, offset 0x261
+	{value: 0x0010, lo: 0x80, hi: 0xab},
+	{value: 0x0014, lo: 0xac, hi: 0xb3},
+	{value: 0x0010, lo: 0xb4, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	// Block 0x57, offset 0x266
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8d, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbd},
+	// Block 0x58, offset 0x269
+	{value: 0x31ea, lo: 0x80, hi: 0x80},
+	{value: 0x326a, lo: 0x81, hi: 0x81},
+	{value: 0x32ea, lo: 0x82, hi: 0x82},
+	{value: 0x336a, lo: 0x83, hi: 0x83},
+	{value: 0x33ea, lo: 0x84, hi: 0x84},
+	{value: 0x346a, lo: 0x85, hi: 0x85},
+	{value: 0x34ea, lo: 0x86, hi: 0x86},
+	{value: 0x356a, lo: 0x87, hi: 0x87},
+	{value: 0x35ea, lo: 0x88, hi: 0x88},
+	{value: 0x8353, lo: 0x90, hi: 0xba},
+	{value: 0x8353, lo: 0xbd, hi: 0xbf},
+	// Block 0x59, offset 0x274
+	{value: 0x0024, lo: 0x90, hi: 0x92},
+	{value: 0x0034, lo: 0x94, hi: 0x99},
+	{value: 0x0024, lo: 0x9a, hi: 0x9b},
+	{value: 0x0034, lo: 0x9c, hi: 0x9f},
+	{value: 0x0024, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0034, lo: 0xa2, hi: 0xa8},
+	{value: 0x0010, lo: 0xa9, hi: 0xac},
+	{value: 0x0034, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xb3},
+	{value: 0x0024, lo: 0xb4, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb7},
+	{value: 0x0024, lo: 0xb8, hi: 0xb9},
+	{value: 0x0010, lo: 0xba, hi: 0xba},
+	// Block 0x5a, offset 0x282
+	{value: 0x0012, lo: 0x80, hi: 0xab},
+	{value: 0x0015, lo: 0xac, hi: 0xbf},
+	// Block 0x5b, offset 0x284
+	{value: 0x0015, lo: 0x80, hi: 0xaa},
+	{value: 0x0012, lo: 0xab, hi: 0xb7},
+	{value: 0x0015, lo: 0xb8, hi: 0xb8},
+	{value: 0x8752, lo: 0xb9, hi: 0xb9},
+	{value: 0x0012, lo: 0xba, hi: 0xbc},
+	{value: 0x8b52, lo: 0xbd, hi: 0xbd},
+	{value: 0x0012, lo: 0xbe, hi: 0xbf},
+	// Block 0x5c, offset 0x28b
+	{value: 0x0012, lo: 0x80, hi: 0x8d},
+	{value: 0x8f52, lo: 0x8e, hi: 0x8e},
+	{value: 0x0012, lo: 0x8f, hi: 0x9a},
+	{value: 0x0015, lo: 0x9b, hi: 0xbf},
+	// Block 0x5d, offset 0x28f
+	{value: 0x0024, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0024, lo: 0x83, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0024, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x90},
+	{value: 0x0024, lo: 0x91, hi: 0xb5},
+	{value: 0x0034, lo: 0xb6, hi: 0xba},
+	{value: 0x0024, lo: 0xbb, hi: 0xbb},
+	{value: 0x0034, lo: 0xbc, hi: 0xbd},
+	{value: 0x0024, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x5e, offset 0x29b
+	{value: 0x0117, lo: 0x80, hi: 0xbf},
+	// Block 0x5f, offset 0x29c
+	{value: 0x0117, lo: 0x80, hi: 0x95},
+	{value: 0x369a, lo: 0x96, hi: 0x96},
+	{value: 0x374a, lo: 0x97, hi: 0x97},
+	{value: 0x37fa, lo: 0x98, hi: 0x98},
+	{value: 0x38aa, lo: 0x99, hi: 0x99},
+	{value: 0x395a, lo: 0x9a, hi: 0x9a},
+	{value: 0x3a0a, lo: 0x9b, hi: 0x9b},
+	{value: 0x0012, lo: 0x9c, hi: 0x9d},
+	{value: 0x3abb, lo: 0x9e, hi: 0x9e},
+	{value: 0x0012, lo: 0x9f, hi: 0x9f},
+	{value: 0x0117, lo: 0xa0, hi: 0xbf},
+	// Block 0x60, offset 0x2a7
+	{value: 0x0812, lo: 0x80, hi: 0x87},
+	{value: 0x0813, lo: 0x88, hi: 0x8f},
+	{value: 0x0812, lo: 0x90, hi: 0x95},
+	{value: 0x0813, lo: 0x98, hi: 0x9d},
+	{value: 0x0812, lo: 0xa0, hi: 0xa7},
+	{value: 0x0813, lo: 0xa8, hi: 0xaf},
+	{value: 0x0812, lo: 0xb0, hi: 0xb7},
+	{value: 0x0813, lo: 0xb8, hi: 0xbf},
+	// Block 0x61, offset 0x2af
+	{value: 0x0004, lo: 0x8b, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8f},
+	{value: 0x0054, lo: 0x98, hi: 0x99},
+	{value: 0x0054, lo: 0xa4, hi: 0xa4},
+	{value: 0x0054, lo: 0xa7, hi: 0xa7},
+	{value: 0x0014, lo: 0xaa, hi: 0xae},
+	{value: 0x0010, lo: 0xaf, hi: 0xaf},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x62, offset 0x2b7
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x94, hi: 0x94},
+	{value: 0x0014, lo: 0xa0, hi: 0xa4},
+	{value: 0x0014, lo: 0xa6, hi: 0xaf},
+	{value: 0x0015, lo: 0xb1, hi: 0xb1},
+	{value: 0x0015, lo: 0xbf, hi: 0xbf},
+	// Block 0x63, offset 0x2bd
+	{value: 0x0015, lo: 0x90, hi: 0x9c},
+	// Block 0x64, offset 0x2be
+	{value: 0x0024, lo: 0x90, hi: 0x91},
+	{value: 0x0034, lo: 0x92, hi: 0x93},
+	{value: 0x0024, lo: 0x94, hi: 0x97},
+	{value: 0x0034, lo: 0x98, hi: 0x9a},
+	{value: 0x0024, lo: 0x9b, hi: 0x9c},
+	{value: 0x0014, lo: 0x9d, hi: 0xa0},
+	{value: 0x0024, lo: 0xa1, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa4},
+	{value: 0x0034, lo: 0xa5, hi: 0xa6},
+	{value: 0x0024, lo: 0xa7, hi: 0xa7},
+	{value: 0x0034, lo: 0xa8, hi: 0xa8},
+	{value: 0x0024, lo: 0xa9, hi: 0xa9},
+	{value: 0x0034, lo: 0xaa, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb0},
+	// Block 0x65, offset 0x2cc
+	{value: 0x0016, lo: 0x85, hi: 0x86},
+	{value: 0x0012, lo: 0x87, hi: 0x89},
+	{value: 0xa452, lo: 0x8e, hi: 0x8e},
+	{value: 0x1013, lo: 0xa0, hi: 0xaf},
+	{value: 0x1012, lo: 0xb0, hi: 0xbf},
+	// Block 0x66, offset 0x2d1
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0716, lo: 0x83, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x88},
+	// Block 0x67, offset 0x2d4
+	{value: 0xa753, lo: 0xb6, hi: 0xb7},
+	{value: 0xaa53, lo: 0xb8, hi: 0xb9},
+	{value: 0xad53, lo: 0xba, hi: 0xbb},
+	{value: 0xaa53, lo: 0xbc, hi: 0xbd},
+	{value: 0xa753, lo: 0xbe, hi: 0xbf},
+	// Block 0x68, offset 0x2d9
+	{value: 0x3013, lo: 0x80, hi: 0x8f},
+	{value: 0x6553, lo: 0x90, hi: 0x9f},
+	{value: 0xb053, lo: 0xa0, hi: 0xaf},
+	{value: 0x3012, lo: 0xb0, hi: 0xbf},
+	// Block 0x69, offset 0x2dd
+	{value: 0x0117, lo: 0x80, hi: 0xa3},
+	{value: 0x0012, lo: 0xa4, hi: 0xa4},
+	{value: 0x0716, lo: 0xab, hi: 0xac},
+	{value: 0x0316, lo: 0xad, hi: 0xae},
+	{value: 0x0024, lo: 0xaf, hi: 0xb1},
+	{value: 0x0117, lo: 0xb2, hi: 0xb3},
+	// Block 0x6a, offset 0x2e3
+	{value: 0x6c52, lo: 0x80, hi: 0x9f},
+	{value: 0x7052, lo: 0xa0, hi: 0xa5},
+	{value: 0x7052, lo: 0xa7, hi: 0xa7},
+	{value: 0x7052, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x6b, offset 0x2e8
+	{value: 0x0010, lo: 0x80, hi: 0xa7},
+	{value: 0x0014, lo: 0xaf, hi: 0xaf},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x6c, offset 0x2eb
+	{value: 0x0010, lo: 0x80, hi: 0x96},
+	{value: 0x0010, lo: 0xa0, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xae},
+	{value: 0x0010, lo: 0xb0, hi: 0xb6},
+	{value: 0x0010, lo: 0xb8, hi: 0xbe},
+	// Block 0x6d, offset 0x2f0
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x88, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x9e},
+	{value: 0x0024, lo: 0xa0, hi: 0xbf},
+	// Block 0x6e, offset 0x2f5
+	{value: 0x0014, lo: 0xaf, hi: 0xaf},
+	// Block 0x6f, offset 0x2f6
+	{value: 0x0014, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0xaa, hi: 0xad},
+	{value: 0x0030, lo: 0xae, hi: 0xaf},
+	{value: 0x0004, lo: 0xb1, hi: 0xb5},
+	{value: 0x0014, lo: 0xbb, hi: 0xbb},
+	{value: 0x0010, lo: 0xbc, hi: 0xbc},
+	// Block 0x70, offset 0x2fc
+	{value: 0x0034, lo: 0x99, hi: 0x9a},
+	{value: 0x0004, lo: 0x9b, hi: 0x9e},
+	// Block 0x71, offset 0x2fe
+	{value: 0x0004, lo: 0xbc, hi: 0xbe},
+	// Block 0x72, offset 0x2ff
+	{value: 0x0010, lo: 0x85, hi: 0xaf},
+	{value: 0x0010, lo: 0xb1, hi: 0xbf},
+	// Block 0x73, offset 0x301
+	{value: 0x0010, lo: 0x80, hi: 0x8e},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x74, offset 0x303
+	{value: 0x0010, lo: 0x80, hi: 0x94},
+	{value: 0x0014, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0x96, hi: 0xbf},
+	// Block 0x75, offset 0x306
+	{value: 0x0010, lo: 0x80, hi: 0x8c},
+	// Block 0x76, offset 0x307
+	{value: 0x0010, lo: 0x90, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbd},
+	// Block 0x77, offset 0x309
+	{value: 0x0010, lo: 0x80, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0010, lo: 0x90, hi: 0xab},
+	// Block 0x78, offset 0x30c
+	{value: 0x0117, lo: 0x80, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xae},
+	{value: 0x0024, lo: 0xaf, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb2},
+	{value: 0x0024, lo: 0xb4, hi: 0xbd},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x79, offset 0x312
+	{value: 0x0117, lo: 0x80, hi: 0x9b},
+	{value: 0x0015, lo: 0x9c, hi: 0x9d},
+	{value: 0x0024, lo: 0x9e, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x7a, offset 0x316
+	{value: 0x0010, lo: 0x80, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb1},
+	// Block 0x7b, offset 0x318
+	{value: 0x0004, lo: 0x80, hi: 0x87},
+	{value: 0x0014, lo: 0x88, hi: 0xa1},
+	{value: 0x0117, lo: 0xa2, hi: 0xaf},
+	{value: 0x0012, lo: 0xb0, hi: 0xb1},
+	{value: 0x0117, lo: 0xb2, hi: 0xbf},
+	// Block 0x7c, offset 0x31d
+	{value: 0x0117, lo: 0x80, hi: 0xaf},
+	{value: 0x0015, lo: 0xb0, hi: 0xb0},
+	{value: 0x0012, lo: 0xb1, hi: 0xb8},
+	{value: 0x0316, lo: 0xb9, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x8753, lo: 0xbd, hi: 0xbd},
+	{value: 0x0117, lo: 0xbe, hi: 0xbf},
+	// Block 0x7d, offset 0x324
+	{value: 0x0117, lo: 0x80, hi: 0x83},
+	{value: 0x6553, lo: 0x84, hi: 0x84},
+	{value: 0x908b, lo: 0x85, hi: 0x85},
+	{value: 0x8f53, lo: 0x86, hi: 0x86},
+	{value: 0x0f16, lo: 0x87, hi: 0x88},
+	{value: 0x0316, lo: 0x89, hi: 0x8a},
+	{value: 0x0117, lo: 0x90, hi: 0x91},
+	{value: 0x0012, lo: 0x93, hi: 0x93},
+	{value: 0x0012, lo: 0x95, hi: 0x95},
+	{value: 0x0117, lo: 0x96, hi: 0x99},
+	{value: 0x0015, lo: 0xb2, hi: 0xb4},
+	{value: 0x0316, lo: 0xb5, hi: 0xb6},
+	{value: 0x0010, lo: 0xb7, hi: 0xb7},
+	{value: 0x0015, lo: 0xb8, hi: 0xb9},
+	{value: 0x0012, lo: 0xba, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbf},
+	// Block 0x7e, offset 0x334
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x8a},
+	{value: 0x0014, lo: 0x8b, hi: 0x8b},
+	{value: 0x0010, lo: 0x8c, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xa6},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0034, lo: 0xac, hi: 0xac},
+	// Block 0x7f, offset 0x33e
+	{value: 0x0010, lo: 0x80, hi: 0xb3},
+	// Block 0x80, offset 0x33f
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x85},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0024, lo: 0xa0, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xb7},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0010, lo: 0xbd, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x81, offset 0x348
+	{value: 0x0010, lo: 0x80, hi: 0xa5},
+	{value: 0x0014, lo: 0xa6, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xad},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x82, offset 0x34c
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x91},
+	{value: 0x0010, lo: 0x92, hi: 0x92},
+	{value: 0x0030, lo: 0x93, hi: 0x93},
+	{value: 0x0010, lo: 0xa0, hi: 0xbc},
+	// Block 0x83, offset 0x351
+	{value: 0x0014, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xb2},
+	{value: 0x0034, lo: 0xb3, hi: 0xb3},
+	{value: 0x0010, lo: 0xb4, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xb9},
+	{value: 0x0010, lo: 0xba, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x84, offset 0x359
+	{value: 0x0030, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0014, lo: 0xa5, hi: 0xa5},
+	{value: 0x0004, lo: 0xa6, hi: 0xa6},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x85, offset 0x35f
+	{value: 0x0010, lo: 0x80, hi: 0xa8},
+	{value: 0x0014, lo: 0xa9, hi: 0xae},
+	{value: 0x0010, lo: 0xaf, hi: 0xb0},
+	{value: 0x0014, lo: 0xb1, hi: 0xb2},
+	{value: 0x0010, lo: 0xb3, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb6},
+	// Block 0x86, offset 0x365
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0010, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0004, lo: 0xb0, hi: 0xb0},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbd},
+	// Block 0x87, offset 0x36f
+	{value: 0x0024, lo: 0xb0, hi: 0xb0},
+	{value: 0x0024, lo: 0xb2, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0024, lo: 0xb7, hi: 0xb8},
+	{value: 0x0024, lo: 0xbe, hi: 0xbf},
+	// Block 0x88, offset 0x374
+	{value: 0x0024, lo: 0x81, hi: 0x81},
+	{value: 0x0004, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xab},
+	{value: 0x0014, lo: 0xac, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xaf},
+	{value: 0x0010, lo: 0xb2, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xb6, hi: 0xb6},
+	// Block 0x89, offset 0x37d
+	{value: 0x0010, lo: 0x81, hi: 0x86},
+	{value: 0x0010, lo: 0x89, hi: 0x8e},
+	{value: 0x0010, lo: 0x91, hi: 0x96},
+	{value: 0x0010, lo: 0xa0, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xae},
+	{value: 0x0012, lo: 0xb0, hi: 0xbf},
+	// Block 0x8a, offset 0x383
+	{value: 0x0012, lo: 0x80, hi: 0x92},
+	{value: 0xb352, lo: 0x93, hi: 0x93},
+	{value: 0x0012, lo: 0x94, hi: 0x9a},
+	{value: 0x0014, lo: 0x9b, hi: 0x9b},
+	{value: 0x0015, lo: 0x9c, hi: 0x9f},
+	{value: 0x0012, lo: 0xa0, hi: 0xa8},
+	{value: 0x0015, lo: 0xa9, hi: 0xa9},
+	{value: 0x0004, lo: 0xaa, hi: 0xab},
+	{value: 0x74d2, lo: 0xb0, hi: 0xbf},
+	// Block 0x8b, offset 0x38c
+	{value: 0x78d2, lo: 0x80, hi: 0x8f},
+	{value: 0x7cd2, lo: 0x90, hi: 0x9f},
+	{value: 0x80d2, lo: 0xa0, hi: 0xaf},
+	{value: 0x7cd2, lo: 0xb0, hi: 0xbf},
+	// Block 0x8c, offset 0x390
+	{value: 0x0010, lo: 0x80, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xa5},
+	{value: 0x0010, lo: 0xa6, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa8},
+	{value: 0x0010, lo: 0xa9, hi: 0xaa},
+	{value: 0x0010, lo: 0xac, hi: 0xac},
+	{value: 0x0034, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x8d, offset 0x398
+	{value: 0x0010, lo: 0x80, hi: 0xa3},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x8e, offset 0x39a
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x8b, hi: 0xbb},
+	// Block 0x8f, offset 0x39c
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x83, hi: 0x84},
+	{value: 0x0010, lo: 0x86, hi: 0xbf},
+	// Block 0x90, offset 0x39f
+	{value: 0x0010, lo: 0x80, hi: 0xb1},
+	{value: 0x0004, lo: 0xb2, hi: 0xbf},
+	// Block 0x91, offset 0x3a1
+	{value: 0x0004, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x93, hi: 0xbf},
+	// Block 0x92, offset 0x3a3
+	{value: 0x0010, lo: 0x80, hi: 0xbd},
+	// Block 0x93, offset 0x3a4
+	{value: 0x0010, lo: 0x90, hi: 0xbf},
+	// Block 0x94, offset 0x3a5
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	{value: 0x0010, lo: 0x92, hi: 0xbf},
+	// Block 0x95, offset 0x3a7
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0010, lo: 0xb0, hi: 0xbb},
+	// Block 0x96, offset 0x3a9
+	{value: 0x0014, lo: 0x80, hi: 0x8f},
+	{value: 0x0054, lo: 0x93, hi: 0x93},
+	{value: 0x0024, lo: 0xa0, hi: 0xa6},
+	{value: 0x0034, lo: 0xa7, hi: 0xad},
+	{value: 0x0024, lo: 0xae, hi: 0xaf},
+	{value: 0x0010, lo: 0xb3, hi: 0xb4},
+	// Block 0x97, offset 0x3af
+	{value: 0x0010, lo: 0x8d, hi: 0x8f},
+	{value: 0x0054, lo: 0x92, hi: 0x92},
+	{value: 0x0054, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0xb0, hi: 0xb4},
+	{value: 0x0010, lo: 0xb6, hi: 0xbf},
+	// Block 0x98, offset 0x3b4
+	{value: 0x0010, lo: 0x80, hi: 0xbc},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x99, offset 0x3b6
+	{value: 0x0054, lo: 0x87, hi: 0x87},
+	{value: 0x0054, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0054, lo: 0x9a, hi: 0x9a},
+	{value: 0x5f53, lo: 0xa1, hi: 0xba},
+	{value: 0x0004, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x9a, offset 0x3bd
+	{value: 0x0004, lo: 0x80, hi: 0x80},
+	{value: 0x5f52, lo: 0x81, hi: 0x9a},
+	{value: 0x0004, lo: 0xb0, hi: 0xb0},
+	// Block 0x9b, offset 0x3c0
+	{value: 0x0014, lo: 0x9e, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xbe},
+	// Block 0x9c, offset 0x3c2
+	{value: 0x0010, lo: 0x82, hi: 0x87},
+	{value: 0x0010, lo: 0x8a, hi: 0x8f},
+	{value: 0x0010, lo: 0x92, hi: 0x97},
+	{value: 0x0010, lo: 0x9a, hi: 0x9c},
+	{value: 0x0004, lo: 0xa3, hi: 0xa3},
+	{value: 0x0014, lo: 0xb9, hi: 0xbb},
+	// Block 0x9d, offset 0x3c8
+	{value: 0x0010, lo: 0x80, hi: 0x8b},
+	{value: 0x0010, lo: 0x8d, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xba},
+	{value: 0x0010, lo: 0xbc, hi: 0xbd},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x9e, offset 0x3cd
+	{value: 0x0010, lo: 0x80, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x9d},
+	// Block 0x9f, offset 0x3cf
+	{value: 0x0010, lo: 0x80, hi: 0xba},
+	// Block 0xa0, offset 0x3d0
+	{value: 0x0010, lo: 0x80, hi: 0xb4},
+	// Block 0xa1, offset 0x3d1
+	{value: 0x0034, lo: 0xbd, hi: 0xbd},
+	// Block 0xa2, offset 0x3d2
+	{value: 0x0010, lo: 0x80, hi: 0x9c},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0xa3, offset 0x3d4
+	{value: 0x0010, lo: 0x80, hi: 0x90},
+	{value: 0x0034, lo: 0xa0, hi: 0xa0},
+	// Block 0xa4, offset 0x3d6
+	{value: 0x0010, lo: 0x80, hi: 0x9f},
+	{value: 0x0010, lo: 0xad, hi: 0xbf},
+	// Block 0xa5, offset 0x3d8
+	{value: 0x0010, lo: 0x80, hi: 0x8a},
+	{value: 0x0010, lo: 0x90, hi: 0xb5},
+	{value: 0x0024, lo: 0xb6, hi: 0xba},
+	// Block 0xa6, offset 0x3db
+	{value: 0x0010, lo: 0x80, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0xa7, offset 0x3dd
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x88, hi: 0x8f},
+	{value: 0x0010, lo: 0x91, hi: 0x95},
+	// Block 0xa8, offset 0x3e0
+	{value: 0x2813, lo: 0x80, hi: 0x87},
+	{value: 0x3813, lo: 0x88, hi: 0x8f},
+	{value: 0x2813, lo: 0x90, hi: 0x97},
+	{value: 0xb653, lo: 0x98, hi: 0x9f},
+	{value: 0xb953, lo: 0xa0, hi: 0xa7},
+	{value: 0x2812, lo: 0xa8, hi: 0xaf},
+	{value: 0x3812, lo: 0xb0, hi: 0xb7},
+	{value: 0x2812, lo: 0xb8, hi: 0xbf},
+	// Block 0xa9, offset 0x3e8
+	{value: 0xb652, lo: 0x80, hi: 0x87},
+	{value: 0xb952, lo: 0x88, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0xbf},
+	// Block 0xaa, offset 0x3eb
+	{value: 0x0010, lo: 0x80, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0xb953, lo: 0xb0, hi: 0xb7},
+	{value: 0xb653, lo: 0xb8, hi: 0xbf},
+	// Block 0xab, offset 0x3ef
+	{value: 0x2813, lo: 0x80, hi: 0x87},
+	{value: 0x3813, lo: 0x88, hi: 0x8f},
+	{value: 0x2813, lo: 0x90, hi: 0x93},
+	{value: 0xb952, lo: 0x98, hi: 0x9f},
+	{value: 0xb652, lo: 0xa0, hi: 0xa7},
+	{value: 0x2812, lo: 0xa8, hi: 0xaf},
+	{value: 0x3812, lo: 0xb0, hi: 0xb7},
+	{value: 0x2812, lo: 0xb8, hi: 0xbb},
+	// Block 0xac, offset 0x3f7
+	{value: 0x0010, lo: 0x80, hi: 0xa7},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xad, offset 0x3f9
+	{value: 0x0010, lo: 0x80, hi: 0xa3},
+	{value: 0xbc53, lo: 0xb0, hi: 0xb0},
+	{value: 0xbf53, lo: 0xb1, hi: 0xb1},
+	{value: 0xc253, lo: 0xb2, hi: 0xb2},
+	{value: 0xbf53, lo: 0xb3, hi: 0xb3},
+	{value: 0xc553, lo: 0xb4, hi: 0xb4},
+	{value: 0xbf53, lo: 0xb5, hi: 0xb5},
+	{value: 0xc253, lo: 0xb6, hi: 0xb6},
+	{value: 0xbf53, lo: 0xb7, hi: 0xb7},
+	{value: 0xbc53, lo: 0xb8, hi: 0xb8},
+	{value: 0xc853, lo: 0xb9, hi: 0xb9},
+	{value: 0xcb53, lo: 0xba, hi: 0xba},
+	{value: 0xce53, lo: 0xbc, hi: 0xbc},
+	{value: 0xc853, lo: 0xbd, hi: 0xbd},
+	{value: 0xcb53, lo: 0xbe, hi: 0xbe},
+	{value: 0xc853, lo: 0xbf, hi: 0xbf},
+	// Block 0xae, offset 0x409
+	{value: 0x0010, lo: 0x80, hi: 0xb6},
+	// Block 0xaf, offset 0x40a
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xa7},
+	// Block 0xb0, offset 0x40c
+	{value: 0x0015, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0015, lo: 0x83, hi: 0x85},
+	{value: 0x0015, lo: 0x87, hi: 0xb0},
+	{value: 0x0015, lo: 0xb2, hi: 0xba},
+	// Block 0xb1, offset 0x411
+	{value: 0x0010, lo: 0x80, hi: 0x85},
+	{value: 0x0010, lo: 0x88, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0xb5},
+	{value: 0x0010, lo: 0xb7, hi: 0xb8},
+	{value: 0x0010, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xb2, offset 0x417
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xb6},
+	// Block 0xb3, offset 0x419
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	// Block 0xb4, offset 0x41a
+	{value: 0x0010, lo: 0xa0, hi: 0xb2},
+	{value: 0x0010, lo: 0xb4, hi: 0xb5},
+	// Block 0xb5, offset 0x41c
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xb9},
+	// Block 0xb6, offset 0x41e
+	{value: 0x0010, lo: 0x80, hi: 0xb7},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0xb7, offset 0x420
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x83},
+	{value: 0x0014, lo: 0x85, hi: 0x86},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0014, lo: 0x8e, hi: 0x8e},
+	{value: 0x0024, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x93},
+	{value: 0x0010, lo: 0x95, hi: 0x97},
+	{value: 0x0010, lo: 0x99, hi: 0xb5},
+	{value: 0x0024, lo: 0xb8, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xb8, offset 0x42d
+	{value: 0x0010, lo: 0xa0, hi: 0xbc},
+	// Block 0xb9, offset 0x42e
+	{value: 0x0010, lo: 0x80, hi: 0x9c},
+	// Block 0xba, offset 0x42f
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0010, lo: 0x89, hi: 0xa4},
+	{value: 0x0024, lo: 0xa5, hi: 0xa5},
+	{value: 0x0034, lo: 0xa6, hi: 0xa6},
+	// Block 0xbb, offset 0x433
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xb2},
+	// Block 0xbc, offset 0x435
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	// Block 0xbd, offset 0x436
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	// Block 0xbe, offset 0x437
+	{value: 0x5653, lo: 0x80, hi: 0xb2},
+	// Block 0xbf, offset 0x438
+	{value: 0x5652, lo: 0x80, hi: 0xb2},
+	// Block 0xc0, offset 0x439
+	{value: 0x0010, lo: 0x80, hi: 0xa3},
+	{value: 0x0024, lo: 0xa4, hi: 0xa7},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xc1, offset 0x43c
+	{value: 0x0010, lo: 0x80, hi: 0xa9},
+	{value: 0x0024, lo: 0xab, hi: 0xac},
+	{value: 0x0010, lo: 0xb0, hi: 0xb1},
+	// Block 0xc2, offset 0x43f
+	{value: 0x0034, lo: 0xbd, hi: 0xbf},
+	// Block 0xc3, offset 0x440
+	{value: 0x0010, lo: 0x80, hi: 0x9c},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xc4, offset 0x443
+	{value: 0x0010, lo: 0x80, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x87},
+	{value: 0x0024, lo: 0x88, hi: 0x8a},
+	{value: 0x0034, lo: 0x8b, hi: 0x8b},
+	{value: 0x0024, lo: 0x8c, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x90},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xc5, offset 0x44a
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0024, lo: 0x82, hi: 0x82},
+	{value: 0x0034, lo: 0x83, hi: 0x83},
+	{value: 0x0024, lo: 0x84, hi: 0x84},
+	{value: 0x0034, lo: 0x85, hi: 0x85},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xc6, offset 0x450
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0010, lo: 0xa0, hi: 0xb6},
+	// Block 0xc7, offset 0x452
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbf},
+	// Block 0xc8, offset 0x456
+	{value: 0x0014, lo: 0x80, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0034, lo: 0xb0, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xc9, offset 0x45e
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb6},
+	{value: 0x0010, lo: 0xb7, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	{value: 0x0014, lo: 0xbd, hi: 0xbd},
+	// Block 0xca, offset 0x464
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0014, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0xa8},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xcb, offset 0x468
+	{value: 0x0024, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xa6},
+	{value: 0x0014, lo: 0xa7, hi: 0xab},
+	{value: 0x0010, lo: 0xac, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xb2},
+	{value: 0x0034, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb6, hi: 0xbf},
+	// Block 0xcc, offset 0x46f
+	{value: 0x0010, lo: 0x84, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0xb2},
+	{value: 0x0034, lo: 0xb3, hi: 0xb3},
+	{value: 0x0010, lo: 0xb6, hi: 0xb6},
+	// Block 0xcd, offset 0x473
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xce, offset 0x477
+	{value: 0x0030, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x84},
+	{value: 0x0014, lo: 0x89, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0014, lo: 0x8b, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x9a},
+	{value: 0x0010, lo: 0x9c, hi: 0x9c},
+	// Block 0xcf, offset 0x480
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	{value: 0x0010, lo: 0x93, hi: 0xae},
+	{value: 0x0014, lo: 0xaf, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0014, lo: 0xb4, hi: 0xb4},
+	{value: 0x0030, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xb6, hi: 0xb6},
+	{value: 0x0014, lo: 0xb7, hi: 0xb7},
+	{value: 0x0014, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xd0, offset 0x48a
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	// Block 0xd1, offset 0x48c
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x88, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8d},
+	{value: 0x0010, lo: 0x8f, hi: 0x9d},
+	{value: 0x0010, lo: 0x9f, hi: 0xa8},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xd2, offset 0x492
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0014, lo: 0x9f, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa2},
+	{value: 0x0014, lo: 0xa3, hi: 0xa8},
+	{value: 0x0034, lo: 0xa9, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xd3, offset 0x498
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbb, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0xd4, offset 0x4a2
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0030, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x9d, hi: 0xa3},
+	{value: 0x0024, lo: 0xa6, hi: 0xac},
+	{value: 0x0024, lo: 0xb0, hi: 0xb4},
+	// Block 0xd5, offset 0x4ac
+	{value: 0x0010, lo: 0x80, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbf},
+	// Block 0xd6, offset 0x4ae
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x8a},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0024, lo: 0x9e, hi: 0x9e},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	// Block 0xd7, offset 0x4b7
+	{value: 0x0010, lo: 0x80, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb8},
+	{value: 0x0010, lo: 0xb9, hi: 0xb9},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0xd8, offset 0x4bd
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0x85},
+	{value: 0x0010, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xd9, offset 0x4c3
+	{value: 0x0010, lo: 0x80, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb5},
+	{value: 0x0010, lo: 0xb8, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xda, offset 0x4c9
+	{value: 0x0034, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x98, hi: 0x9b},
+	{value: 0x0014, lo: 0x9c, hi: 0x9d},
+	// Block 0xdb, offset 0x4cc
+	{value: 0x0010, lo: 0x80, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbc},
+	{value: 0x0014, lo: 0xbd, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xdc, offset 0x4d2
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x84, hi: 0x84},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xdd, offset 0x4d5
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0014, lo: 0xab, hi: 0xab},
+	{value: 0x0010, lo: 0xac, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb5},
+	{value: 0x0030, lo: 0xb6, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	{value: 0x0010, lo: 0xb8, hi: 0xb8},
+	// Block 0xde, offset 0x4de
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	// Block 0xdf, offset 0x4df
+	{value: 0x0014, lo: 0x9d, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa5},
+	{value: 0x0010, lo: 0xa6, hi: 0xa6},
+	{value: 0x0014, lo: 0xa7, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xab},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xe0, offset 0x4e6
+	{value: 0x0010, lo: 0x80, hi: 0xae},
+	{value: 0x0014, lo: 0xaf, hi: 0xb7},
+	{value: 0x0010, lo: 0xb8, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	// Block 0xe1, offset 0x4ea
+	{value: 0x5f53, lo: 0xa0, hi: 0xbf},
+	// Block 0xe2, offset 0x4eb
+	{value: 0x5f52, lo: 0x80, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xe3, offset 0x4ee
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x89, hi: 0x89},
+	{value: 0x0010, lo: 0x8c, hi: 0x93},
+	{value: 0x0010, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0xb5},
+	{value: 0x0010, lo: 0xb7, hi: 0xb8},
+	{value: 0x0014, lo: 0xbb, hi: 0xbc},
+	{value: 0x0030, lo: 0xbd, hi: 0xbd},
+	{value: 0x0034, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xe4, offset 0x4f8
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0034, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xe5, offset 0x4fb
+	{value: 0x0010, lo: 0xa0, hi: 0xa7},
+	{value: 0x0010, lo: 0xaa, hi: 0xbf},
+	// Block 0xe6, offset 0x4fd
+	{value: 0x0010, lo: 0x80, hi: 0x93},
+	{value: 0x0014, lo: 0x94, hi: 0x97},
+	{value: 0x0014, lo: 0x9a, hi: 0x9b},
+	{value: 0x0010, lo: 0x9c, hi: 0x9f},
+	{value: 0x0034, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0010, lo: 0xa3, hi: 0xa4},
+	// Block 0xe7, offset 0x504
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x8a},
+	{value: 0x0010, lo: 0x8b, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb8},
+	{value: 0x0010, lo: 0xb9, hi: 0xba},
+	{value: 0x0014, lo: 0xbb, hi: 0xbe},
+	// Block 0xe8, offset 0x50c
+	{value: 0x0034, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0014, lo: 0x91, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x98},
+	{value: 0x0014, lo: 0x99, hi: 0x9b},
+	{value: 0x0010, lo: 0x9c, hi: 0xbf},
+	// Block 0xe9, offset 0x512
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0014, lo: 0x8a, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0014, lo: 0x98, hi: 0x98},
+	{value: 0x0034, lo: 0x99, hi: 0x99},
+	{value: 0x0010, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xea, offset 0x519
+	{value: 0x0010, lo: 0x80, hi: 0xb8},
+	// Block 0xeb, offset 0x51a
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb6},
+	{value: 0x0014, lo: 0xb8, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xec, offset 0x520
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xb2, hi: 0xbf},
+	// Block 0xed, offset 0x523
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	{value: 0x0014, lo: 0x92, hi: 0xa7},
+	{value: 0x0010, lo: 0xa9, hi: 0xa9},
+	{value: 0x0014, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb4, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb6},
+	// Block 0xee, offset 0x52b
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x88, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0xb0},
+	{value: 0x0014, lo: 0xb1, hi: 0xb6},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0014, lo: 0xbc, hi: 0xbd},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0xef, offset 0x532
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x85},
+	{value: 0x0010, lo: 0x86, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xa0, hi: 0xa5},
+	{value: 0x0010, lo: 0xa7, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xbf},
+	// Block 0xf0, offset 0x53c
+	{value: 0x0010, lo: 0x80, hi: 0x8e},
+	{value: 0x0014, lo: 0x90, hi: 0x91},
+	{value: 0x0010, lo: 0x93, hi: 0x94},
+	{value: 0x0014, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0x96, hi: 0x96},
+	{value: 0x0034, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x98, hi: 0x98},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	// Block 0xf1, offset 0x544
+	{value: 0x0010, lo: 0xa0, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb6},
+	// Block 0xf2, offset 0x547
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xba},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0xf3, offset 0x54c
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0030, lo: 0x81, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xf4, offset 0x550
+	{value: 0x0010, lo: 0xb0, hi: 0xb0},
+	// Block 0xf5, offset 0x551
+	{value: 0x0010, lo: 0x80, hi: 0x99},
+	// Block 0xf6, offset 0x552
+	{value: 0x0010, lo: 0x80, hi: 0xae},
+	// Block 0xf7, offset 0x553
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	// Block 0xf8, offset 0x554
+	{value: 0x0010, lo: 0x80, hi: 0xb0},
+	// Block 0xf9, offset 0x555
+	{value: 0x0010, lo: 0x80, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xbf},
+	// Block 0xfa, offset 0x557
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x95},
+	// Block 0xfb, offset 0x55a
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	// Block 0xfc, offset 0x55b
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xfd, offset 0x55e
+	{value: 0x0010, lo: 0x80, hi: 0xbe},
+	// Block 0xfe, offset 0x55f
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x90, hi: 0xad},
+	{value: 0x0034, lo: 0xb0, hi: 0xb4},
+	// Block 0xff, offset 0x562
+	{value: 0x0010, lo: 0x80, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb6},
+	// Block 0x100, offset 0x564
+	{value: 0x0014, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xa3, hi: 0xb7},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x101, offset 0x568
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	// Block 0x102, offset 0x569
+	{value: 0x2013, lo: 0x80, hi: 0x9f},
+	{value: 0x2012, lo: 0xa0, hi: 0xbf},
+	// Block 0x103, offset 0x56b
+	{value: 0x0010, lo: 0x80, hi: 0x8a},
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0xbf},
+	// Block 0x104, offset 0x56e
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0014, lo: 0x8f, hi: 0x9f},
+	// Block 0x105, offset 0x570
+	{value: 0x0014, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa3, hi: 0xa4},
+	{value: 0x0030, lo: 0xb0, hi: 0xb1},
+	// Block 0x106, offset 0x573
+	{value: 0x0004, lo: 0xb0, hi: 0xb3},
+	{value: 0x0004, lo: 0xb5, hi: 0xbb},
+	{value: 0x0004, lo: 0xbd, hi: 0xbe},
+	// Block 0x107, offset 0x576
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xbc},
+	// Block 0x108, offset 0x578
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x0034, lo: 0x9e, hi: 0x9e},
+	{value: 0x0014, lo: 0xa0, hi: 0xa3},
+	// Block 0x109, offset 0x57d
+	{value: 0x0014, lo: 0x80, hi: 0xad},
+	{value: 0x0014, lo: 0xb0, hi: 0xbf},
+	// Block 0x10a, offset 0x57f
+	{value: 0x0014, lo: 0x80, hi: 0x86},
+	// Block 0x10b, offset 0x580
+	{value: 0x0030, lo: 0xa5, hi: 0xa6},
+	{value: 0x0034, lo: 0xa7, hi: 0xa9},
+	{value: 0x0030, lo: 0xad, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbf},
+	// Block 0x10c, offset 0x585
+	{value: 0x0034, lo: 0x80, hi: 0x82},
+	{value: 0x0024, lo: 0x85, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8b},
+	{value: 0x0024, lo: 0xaa, hi: 0xad},
+	// Block 0x10d, offset 0x589
+	{value: 0x0024, lo: 0x82, hi: 0x84},
+	// Block 0x10e, offset 0x58a
+	{value: 0x0013, lo: 0x80, hi: 0x99},
+	{value: 0x0012, lo: 0x9a, hi: 0xb3},
+	{value: 0x0013, lo: 0xb4, hi: 0xbf},
+	// Block 0x10f, offset 0x58d
+	{value: 0x0013, lo: 0x80, hi: 0x8d},
+	{value: 0x0012, lo: 0x8e, hi: 0x94},
+	{value: 0x0012, lo: 0x96, hi: 0xa7},
+	{value: 0x0013, lo: 0xa8, hi: 0xbf},
+	// Block 0x110, offset 0x591
+	{value: 0x0013, lo: 0x80, hi: 0x81},
+	{value: 0x0012, lo: 0x82, hi: 0x9b},
+	{value: 0x0013, lo: 0x9c, hi: 0x9c},
+	{value: 0x0013, lo: 0x9e, hi: 0x9f},
+	{value: 0x0013, lo: 0xa2, hi: 0xa2},
+	{value: 0x0013, lo: 0xa5, hi: 0xa6},
+	{value: 0x0013, lo: 0xa9, hi: 0xac},
+	{value: 0x0013, lo: 0xae, hi: 0xb5},
+	{value: 0x0012, lo: 0xb6, hi: 0xb9},
+	{value: 0x0012, lo: 0xbb, hi: 0xbb},
+	{value: 0x0012, lo: 0xbd, hi: 0xbf},
+	// Block 0x111, offset 0x59c
+	{value: 0x0012, lo: 0x80, hi: 0x83},
+	{value: 0x0012, lo: 0x85, hi: 0x8f},
+	{value: 0x0013, lo: 0x90, hi: 0xa9},
+	{value: 0x0012, lo: 0xaa, hi: 0xbf},
+	// Block 0x112, offset 0x5a0
+	{value: 0x0012, lo: 0x80, hi: 0x83},
+	{value: 0x0013, lo: 0x84, hi: 0x85},
+	{value: 0x0013, lo: 0x87, hi: 0x8a},
+	{value: 0x0013, lo: 0x8d, hi: 0x94},
+	{value: 0x0013, lo: 0x96, hi: 0x9c},
+	{value: 0x0012, lo: 0x9e, hi: 0xb7},
+	{value: 0x0013, lo: 0xb8, hi: 0xb9},
+	{value: 0x0013, lo: 0xbb, hi: 0xbe},
+	// Block 0x113, offset 0x5a8
+	{value: 0x0013, lo: 0x80, hi: 0x84},
+	{value: 0x0013, lo: 0x86, hi: 0x86},
+	{value: 0x0013, lo: 0x8a, hi: 0x90},
+	{value: 0x0012, lo: 0x92, hi: 0xab},
+	{value: 0x0013, lo: 0xac, hi: 0xbf},
+	// Block 0x114, offset 0x5ad
+	{value: 0x0013, lo: 0x80, hi: 0x85},
+	{value: 0x0012, lo: 0x86, hi: 0x9f},
+	{value: 0x0013, lo: 0xa0, hi: 0xb9},
+	{value: 0x0012, lo: 0xba, hi: 0xbf},
+	// Block 0x115, offset 0x5b1
+	{value: 0x0012, lo: 0x80, hi: 0x93},
+	{value: 0x0013, lo: 0x94, hi: 0xad},
+	{value: 0x0012, lo: 0xae, hi: 0xbf},
+	// Block 0x116, offset 0x5b4
+	{value: 0x0012, lo: 0x80, hi: 0x87},
+	{value: 0x0013, lo: 0x88, hi: 0xa1},
+	{value: 0x0012, lo: 0xa2, hi: 0xbb},
+	{value: 0x0013, lo: 0xbc, hi: 0xbf},
+	// Block 0x117, offset 0x5b8
+	{value: 0x0013, lo: 0x80, hi: 0x95},
+	{value: 0x0012, lo: 0x96, hi: 0xaf},
+	{value: 0x0013, lo: 0xb0, hi: 0xbf},
+	// Block 0x118, offset 0x5bb
+	{value: 0x0013, lo: 0x80, hi: 0x89},
+	{value: 0x0012, lo: 0x8a, hi: 0xa5},
+	{value: 0x0013, lo: 0xa8, hi: 0xbf},
+	// Block 0x119, offset 0x5be
+	{value: 0x0013, lo: 0x80, hi: 0x80},
+	{value: 0x0012, lo: 0x82, hi: 0x9a},
+	{value: 0x0012, lo: 0x9c, hi: 0xa1},
+	{value: 0x0013, lo: 0xa2, hi: 0xba},
+	{value: 0x0012, lo: 0xbc, hi: 0xbf},
+	// Block 0x11a, offset 0x5c3
+	{value: 0x0012, lo: 0x80, hi: 0x94},
+	{value: 0x0012, lo: 0x96, hi: 0x9b},
+	{value: 0x0013, lo: 0x9c, hi: 0xb4},
+	{value: 0x0012, lo: 0xb6, hi: 0xbf},
+	// Block 0x11b, offset 0x5c7
+	{value: 0x0012, lo: 0x80, hi: 0x8e},
+	{value: 0x0012, lo: 0x90, hi: 0x95},
+	{value: 0x0013, lo: 0x96, hi: 0xae},
+	{value: 0x0012, lo: 0xb0, hi: 0xbf},
+	// Block 0x11c, offset 0x5cb
+	{value: 0x0012, lo: 0x80, hi: 0x88},
+	{value: 0x0012, lo: 0x8a, hi: 0x8f},
+	{value: 0x0013, lo: 0x90, hi: 0xa8},
+	{value: 0x0012, lo: 0xaa, hi: 0xbf},
+	// Block 0x11d, offset 0x5cf
+	{value: 0x0012, lo: 0x80, hi: 0x82},
+	{value: 0x0012, lo: 0x84, hi: 0x89},
+	{value: 0x0017, lo: 0x8a, hi: 0x8b},
+	{value: 0x0010, lo: 0x8e, hi: 0xbf},
+	// Block 0x11e, offset 0x5d3
+	{value: 0x0014, lo: 0x80, hi: 0xb6},
+	{value: 0x0014, lo: 0xbb, hi: 0xbf},
+	// Block 0x11f, offset 0x5d5
+	{value: 0x0014, lo: 0x80, hi: 0xac},
+	{value: 0x0014, lo: 0xb5, hi: 0xb5},
+	// Block 0x120, offset 0x5d7
+	{value: 0x0014, lo: 0x84, hi: 0x84},
+	{value: 0x0014, lo: 0x9b, hi: 0x9f},
+	{value: 0x0014, lo: 0xa1, hi: 0xaf},
+	// Block 0x121, offset 0x5da
+	{value: 0x0012, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8a, hi: 0x8a},
+	{value: 0x0012, lo: 0x8b, hi: 0x9e},
+	{value: 0x0012, lo: 0xa5, hi: 0xaa},
+	// Block 0x122, offset 0x5de
+	{value: 0x0024, lo: 0x80, hi: 0x86},
+	{value: 0x0024, lo: 0x88, hi: 0x98},
+	{value: 0x0024, lo: 0x9b, hi: 0xa1},
+	{value: 0x0024, lo: 0xa3, hi: 0xa4},
+	{value: 0x0024, lo: 0xa6, hi: 0xaa},
+	{value: 0x0015, lo: 0xb0, hi: 0xbf},
+	// Block 0x123, offset 0x5e4
+	{value: 0x0015, lo: 0x80, hi: 0xad},
+	// Block 0x124, offset 0x5e5
+	{value: 0x0024, lo: 0x8f, hi: 0x8f},
+	// Block 0x125, offset 0x5e6
+	{value: 0x0010, lo: 0x80, hi: 0xac},
+	{value: 0x0024, lo: 0xb0, hi: 0xb6},
+	{value: 0x0014, lo: 0xb7, hi: 0xbd},
+	// Block 0x126, offset 0x5e9
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	// Block 0x127, offset 0x5eb
+	{value: 0x0010, lo: 0x90, hi: 0xad},
+	{value: 0x0024, lo: 0xae, hi: 0xae},
+	// Block 0x128, offset 0x5ed
+	{value: 0x0010, lo: 0x80, hi: 0xab},
+	{value: 0x0024, lo: 0xac, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x129, offset 0x5f0
+	{value: 0x0010, lo: 0x90, hi: 0xaa},
+	{value: 0x0014, lo: 0xab, hi: 0xab},
+	{value: 0x0034, lo: 0xac, hi: 0xae},
+	{value: 0x0024, lo: 0xaf, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x12a, offset 0x5f5
+	{value: 0x0010, lo: 0xa0, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xab},
+	{value: 0x0010, lo: 0xad, hi: 0xae},
+	{value: 0x0010, lo: 0xb0, hi: 0xbe},
+	// Block 0x12b, offset 0x5f9
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0034, lo: 0x90, hi: 0x96},
+	// Block 0x12c, offset 0x5fb
+	{value: 0xd152, lo: 0x80, hi: 0x81},
+	{value: 0xd452, lo: 0x82, hi: 0x83},
+	{value: 0x0024, lo: 0x84, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0014, lo: 0x8b, hi: 0x8b},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x12d, offset 0x601
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x9f},
+	{value: 0x0010, lo: 0xa1, hi: 0xa2},
+	{value: 0x0010, lo: 0xa4, hi: 0xa4},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0010, lo: 0xa9, hi: 0xb2},
+	{value: 0x0010, lo: 0xb4, hi: 0xb7},
+	{value: 0x0010, lo: 0xb9, hi: 0xb9},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	// Block 0x12e, offset 0x60a
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0x9b},
+	{value: 0x0010, lo: 0xa1, hi: 0xa3},
+	{value: 0x0010, lo: 0xa5, hi: 0xa9},
+	{value: 0x0010, lo: 0xab, hi: 0xbb},
+	// Block 0x12f, offset 0x60f
+	{value: 0x0013, lo: 0xb0, hi: 0xbf},
+	// Block 0x130, offset 0x610
+	{value: 0x0013, lo: 0x80, hi: 0x89},
+	{value: 0x0013, lo: 0x90, hi: 0xa9},
+	{value: 0x0013, lo: 0xb0, hi: 0xbf},
+	// Block 0x131, offset 0x613
+	{value: 0x0013, lo: 0x80, hi: 0x89},
+	// Block 0x132, offset 0x614
+	{value: 0x0014, lo: 0xbb, hi: 0xbf},
+	// Block 0x133, offset 0x615
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x134, offset 0x616
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0014, lo: 0xa0, hi: 0xbf},
+	// Block 0x135, offset 0x618
+	{value: 0x0014, lo: 0x80, hi: 0xbf},
+	// Block 0x136, offset 0x619
+	{value: 0x0014, lo: 0x80, hi: 0xaf},
+}
+
+// Total table size 16093 bytes (15KiB); checksum: EE91C452
diff --git a/vendor/golang.org/x/text/cases/tables17.0.0.go b/vendor/golang.org/x/text/cases/tables17.0.0.go
new file mode 100644
index 000000000..cee93cbdc
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/tables17.0.0.go
@@ -0,0 +1,2642 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+//go:build go1.27
+
+package cases
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "17.0.0"
+
+var xorData string = "" + // Size: 237 bytes
+	"\x00\x06\x07\x00\x01?\x00\x0f\x03\x00\x0f\x12\x00\x0f\x1f\x00\x0f\x1d" +
+	"\x00\x01\x13\x00\x0f\x16\x00\x0f\x0b\x00\x0f3\x00\x0f7\x00\x01#\x00\x0f?" +
+	"\x00\x0e'\x00\x0f/\x00\x0e>\x00\x0f*\x00\x0c&\x00\x0c*\x00\x0c;\x00\x0c9" +
+	"\x00\x0c%\x00\x01\x08\x00\x03\x0d\x00\x03\x09\x00\x02\x06\x00\x02\x02" +
+	"\x00\x02\x0c\x00\x01\x00\x00\x01\x03\x00\x01\x01\x00\x01 \x00\x01\x0c" +
+	"\x00\x01\x10\x00\x03\x10\x00\x036 \x00\x037 \x00\x0b#\x10\x00\x0b 0\x00" +
+	"\x0b!\x10\x00\x0b!0\x001\x00\x00\x0b(\x04\x00\x03\x04\x1e\x00\x0b)\x08" +
+	"\x00\x03\x0a\x00\x02:\x00\x02>\x00\x02,\x00\x02\x00\x00\x02\x10\x00\x01<" +
+	"\x00\x01&\x00\x01*\x00\x01.\x00\x010\x003 \x00\x01\x18\x00\x01(\x00\x03'" +
+	"\x00\x03)\x00\x03+\x00\x03/\x00\x03\x19\x00\x03\x1b\x00\x03\x1f\x00\x03 " +
+	"\x00\x01%\x00\x01'\x00\x01+\x00\x01-\x00\x01/\x00\x01;\x00\x01=\x00\x01" +
+	"\x1e\x00\x01\x22"
+
+var exceptions string = "" + // Size: 2478 bytes
+	"\x00\x12\x12μΜΜ\x12\x12ssSSSs\x13\x18i̇i̇\x10\x09II\x13\x1bʼnʼNʼN\x11" +
+	"\x09sSS\x10\x1bꟜꟜ\x12\x12dždžDž\x12\x12dždžDŽ\x10\x12DŽDž\x12\x12ljljLj\x12\x12ljljLJ" +
+	"\x10\x12LJLj\x12\x12njnjNj\x12\x12njnjNJ\x10\x12NJNj\x13\x1bǰJ̌J̌\x12\x12dzdzDz\x12" +
+	"\x12dzdzDZ\x10\x12DZDz\x13\x18ⱥⱥ\x13\x18ⱦⱦ\x10\x1bⱾⱾ\x10\x1bⱿⱿ\x10\x1bⱯⱯ\x10" +
+	"\x1bⱭⱭ\x10\x1bⱰⱰ\x10\x1bꞫꞫ\x10\x1bꞬꞬ\x10\x1bꟋꟋ\x10\x1bꞍꞍ\x10\x1bꞪꞪ\x10" +
+	"\x1bꞮꞮ\x10\x1bⱢⱢ\x10\x1bꞭꞭ\x10\x1bⱮⱮ\x10\x1bⱤⱤ\x10\x1bꟅꟅ\x10\x1bꞱꞱ\x10" +
+	"\x1bꞲꞲ\x10\x1bꞰꞰ2\x12ιΙΙ\x166ΐΪ́Ϊ́\x166ΰΫ́Ϋ́\x12\x12σΣΣ\x12\x12β" +
+	"ΒΒ\x12\x12θΘΘ\x12\x12φΦΦ\x12\x12πΠΠ\x12\x12κΚΚ\x12\x12ρΡΡ\x12\x12εΕΕ" +
+	"\x14$եւԵՒԵւ\x10\x1bᲐა\x10\x1bᲑბ\x10\x1bᲒგ\x10\x1bᲓდ\x10\x1bᲔე\x10\x1bᲕვ" +
+	"\x10\x1bᲖზ\x10\x1bᲗთ\x10\x1bᲘი\x10\x1bᲙკ\x10\x1bᲚლ\x10\x1bᲛმ\x10\x1bᲜნ" +
+	"\x10\x1bᲝო\x10\x1bᲞპ\x10\x1bᲟჟ\x10\x1bᲠრ\x10\x1bᲡს\x10\x1bᲢტ\x10\x1bᲣუ" +
+	"\x10\x1bᲤფ\x10\x1bᲥქ\x10\x1bᲦღ\x10\x1bᲧყ\x10\x1bᲨშ\x10\x1bᲩჩ\x10\x1bᲪც" +
+	"\x10\x1bᲫძ\x10\x1bᲬწ\x10\x1bᲭჭ\x10\x1bᲮხ\x10\x1bᲯჯ\x10\x1bᲰჰ\x10\x1bᲱჱ" +
+	"\x10\x1bᲲჲ\x10\x1bᲳჳ\x10\x1bᲴჴ\x10\x1bᲵჵ\x10\x1bᲶჶ\x10\x1bᲷჷ\x10\x1bᲸჸ" +
+	"\x10\x1bᲹჹ\x10\x1bᲺჺ\x10\x1bᲽჽ\x10\x1bᲾჾ\x10\x1bᲿჿ\x12\x12вВВ\x12\x12дДД" +
+	"\x12\x12оОО\x12\x12сСС\x12\x12тТТ\x12\x12тТТ\x12\x12ъЪЪ\x12\x12ѣѢѢ\x13" +
+	"\x1bꙋꙊꙊ\x13\x1bẖH̱H̱\x13\x1bẗT̈T̈\x13\x1bẘW̊W̊\x13\x1bẙY̊Y̊\x13\x1ba" +
+	"ʾAʾAʾ\x13\x1bṡṠṠ\x12\x10ssß\x14$ὐΥ̓Υ̓\x166ὒΥ̓̀Υ̓̀\x166ὔΥ̓́Υ̓́\x166" +
+	"ὖΥ̓͂Υ̓͂\x15+ἀιἈΙᾈ\x15+ἁιἉΙᾉ\x15+ἂιἊΙᾊ\x15+ἃιἋΙᾋ\x15+ἄιἌΙᾌ\x15+ἅιἍΙᾍ" +
+	"\x15+ἆιἎΙᾎ\x15+ἇιἏΙᾏ\x15\x1dἀιᾀἈΙ\x15\x1dἁιᾁἉΙ\x15\x1dἂιᾂἊΙ\x15\x1dἃιᾃἋΙ" +
+	"\x15\x1dἄιᾄἌΙ\x15\x1dἅιᾅἍΙ\x15\x1dἆιᾆἎΙ\x15\x1dἇιᾇἏΙ\x15+ἠιἨΙᾘ\x15+ἡιἩΙᾙ" +
+	"\x15+ἢιἪΙᾚ\x15+ἣιἫΙᾛ\x15+ἤιἬΙᾜ\x15+ἥιἭΙᾝ\x15+ἦιἮΙᾞ\x15+ἧιἯΙᾟ\x15\x1dἠιᾐἨ" +
+	"Ι\x15\x1dἡιᾑἩΙ\x15\x1dἢιᾒἪΙ\x15\x1dἣιᾓἫΙ\x15\x1dἤιᾔἬΙ\x15\x1dἥιᾕἭΙ\x15" +
+	"\x1dἦιᾖἮΙ\x15\x1dἧιᾗἯΙ\x15+ὠιὨΙᾨ\x15+ὡιὩΙᾩ\x15+ὢιὪΙᾪ\x15+ὣιὫΙᾫ\x15+ὤιὬΙᾬ" +
+	"\x15+ὥιὭΙᾭ\x15+ὦιὮΙᾮ\x15+ὧιὯΙᾯ\x15\x1dὠιᾠὨΙ\x15\x1dὡιᾡὩΙ\x15\x1dὢιᾢὪΙ" +
+	"\x15\x1dὣιᾣὫΙ\x15\x1dὤιᾤὬΙ\x15\x1dὥιᾥὭΙ\x15\x1dὦιᾦὮΙ\x15\x1dὧιᾧὯΙ\x15-ὰι" +
+	"ᾺΙᾺͅ\x14#αιΑΙᾼ\x14$άιΆΙΆͅ\x14$ᾶΑ͂Α͂\x166ᾶιΑ͂Ιᾼ͂\x14\x1cαιᾳΑΙ\x12" +
+	"\x12ιΙΙ\x15-ὴιῊΙῊͅ\x14#ηιΗΙῌ\x14$ήιΉΙΉͅ\x14$ῆΗ͂Η͂\x166ῆιΗ͂Ιῌ͂\x14\x1c" +
+	"ηιῃΗΙ\x166ῒΪ̀Ϊ̀\x166ΐΪ́Ϊ́\x14$ῖΙ͂Ι͂\x166ῗΪ͂Ϊ͂\x166ῢΫ̀Ϋ" +
+	"̀\x166ΰΫ́Ϋ́\x14$ῤΡ̓Ρ̓\x14$ῦΥ͂Υ͂\x166ῧΫ͂Ϋ͂\x15-ὼιῺΙῺͅ\x14#ωιΩΙ" +
+	"ῼ\x14$ώιΏΙΏͅ\x14$ῶΩ͂Ω͂\x166ῶιΩ͂Ιῼ͂\x14\x1cωιῳΩΙ\x12\x10ωω\x11\x08kk" +
+	"\x12\x10åå\x12\x10ɫɫ\x12\x10ɽɽ\x10\x12ȺȺ\x10\x12ȾȾ\x12\x10ɑɑ\x12\x10ɱɱ" +
+	"\x12\x10ɐɐ\x12\x10ɒɒ\x12\x10ȿȿ\x12\x10ɀɀ\x12\x10ɥɥ\x12\x10ɦɦ\x12\x10ɜɜ" +
+	"\x12\x10ɡɡ\x12\x10ɬɬ\x12\x10ɪɪ\x12\x10ʞʞ\x12\x10ʇʇ\x12\x10ʝʝ\x12\x10ʂʂ" +
+	"\x12\x10ɤɤ\x12\x10ƛƛ\x12\x12ffFFFf\x12\x12fiFIFi\x12\x12flFLFl\x13\x1bff" +
+	"iFFIFfi\x13\x1bfflFFLFfl\x12\x12stSTSt\x12\x12stSTSt\x14$մնՄՆՄն\x14$մեՄԵ" +
+	"Մե\x14$միՄԻՄի\x14$վնՎՆՎն\x14$մխՄԽՄխ"
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *caseTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return caseValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = caseIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *caseTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return caseValues[c0]
+	}
+	i := caseIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *caseTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return caseValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := caseIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = caseIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = caseIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *caseTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return caseValues[c0]
+	}
+	i := caseIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = caseIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// caseTrie. Total size: 14000 bytes (13.67 KiB). Checksum: 76c852e9b991a172.
+type caseTrie struct{}
+
+func newCaseTrie(i int) *caseTrie {
+	return &caseTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *caseTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 24:
+		return uint16(caseValues[n<<6+uint32(b)])
+	default:
+		n -= 24
+		return uint16(sparse.lookup(n, b))
+	}
+}
+
+// caseValues: 26 blocks, 1664 entries, 3328 bytes
+// The third block is the zero block.
+var caseValues = [1664]uint16{
+	// Block 0x0, offset 0x0
+	0x27: 0x0054,
+	0x2e: 0x0054,
+	0x30: 0x0010, 0x31: 0x0010, 0x32: 0x0010, 0x33: 0x0010, 0x34: 0x0010, 0x35: 0x0010,
+	0x36: 0x0010, 0x37: 0x0010, 0x38: 0x0010, 0x39: 0x0010, 0x3a: 0x0054,
+	// Block 0x1, offset 0x40
+	0x41: 0x2013, 0x42: 0x2013, 0x43: 0x2013, 0x44: 0x2013, 0x45: 0x2013,
+	0x46: 0x2013, 0x47: 0x2013, 0x48: 0x2013, 0x49: 0x2013, 0x4a: 0x2013, 0x4b: 0x2013,
+	0x4c: 0x2013, 0x4d: 0x2013, 0x4e: 0x2013, 0x4f: 0x2013, 0x50: 0x2013, 0x51: 0x2013,
+	0x52: 0x2013, 0x53: 0x2013, 0x54: 0x2013, 0x55: 0x2013, 0x56: 0x2013, 0x57: 0x2013,
+	0x58: 0x2013, 0x59: 0x2013, 0x5a: 0x2013,
+	0x5e: 0x0004, 0x5f: 0x0010, 0x60: 0x0004, 0x61: 0x2012, 0x62: 0x2012, 0x63: 0x2012,
+	0x64: 0x2012, 0x65: 0x2012, 0x66: 0x2012, 0x67: 0x2012, 0x68: 0x2012, 0x69: 0x2012,
+	0x6a: 0x2012, 0x6b: 0x2012, 0x6c: 0x2012, 0x6d: 0x2012, 0x6e: 0x2012, 0x6f: 0x2012,
+	0x70: 0x2012, 0x71: 0x2012, 0x72: 0x2012, 0x73: 0x2012, 0x74: 0x2012, 0x75: 0x2012,
+	0x76: 0x2012, 0x77: 0x2012, 0x78: 0x2012, 0x79: 0x2012, 0x7a: 0x2012,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x0852, 0xc1: 0x0b53, 0xc2: 0x0113, 0xc3: 0x0112, 0xc4: 0x0113, 0xc5: 0x0112,
+	0xc6: 0x0b53, 0xc7: 0x0f13, 0xc8: 0x0f12, 0xc9: 0x0e53, 0xca: 0x1153, 0xcb: 0x0713,
+	0xcc: 0x0712, 0xcd: 0x0012, 0xce: 0x1453, 0xcf: 0x1753, 0xd0: 0x1a53, 0xd1: 0x0313,
+	0xd2: 0x0312, 0xd3: 0x1d53, 0xd4: 0x2053, 0xd5: 0x2352, 0xd6: 0x2653, 0xd7: 0x2653,
+	0xd8: 0x0113, 0xd9: 0x0112, 0xda: 0x2952, 0xdb: 0x02da, 0xdc: 0x1d53, 0xdd: 0x2c53,
+	0xde: 0x2f52, 0xdf: 0x3253, 0xe0: 0x0113, 0xe1: 0x0112, 0xe2: 0x0113, 0xe3: 0x0112,
+	0xe4: 0x0113, 0xe5: 0x0112, 0xe6: 0x3553, 0xe7: 0x0f13, 0xe8: 0x0f12, 0xe9: 0x3853,
+	0xea: 0x0012, 0xeb: 0x0012, 0xec: 0x0113, 0xed: 0x0112, 0xee: 0x3553, 0xef: 0x1f13,
+	0xf0: 0x1f12, 0xf1: 0x3b53, 0xf2: 0x3e53, 0xf3: 0x0713, 0xf4: 0x0712, 0xf5: 0x0313,
+	0xf6: 0x0312, 0xf7: 0x4153, 0xf8: 0x0113, 0xf9: 0x0112, 0xfa: 0x0012, 0xfb: 0x0010,
+	0xfc: 0x0113, 0xfd: 0x0112, 0xfe: 0x0012, 0xff: 0x4452,
+	// Block 0x4, offset 0x100
+	0x100: 0x0010, 0x101: 0x0010, 0x102: 0x0010, 0x103: 0x0010, 0x104: 0x035b, 0x105: 0x03d9,
+	0x106: 0x045a, 0x107: 0x04bb, 0x108: 0x0539, 0x109: 0x05ba, 0x10a: 0x061b, 0x10b: 0x0699,
+	0x10c: 0x071a, 0x10d: 0x0313, 0x10e: 0x0312, 0x10f: 0x1f13, 0x110: 0x1f12, 0x111: 0x0313,
+	0x112: 0x0312, 0x113: 0x0713, 0x114: 0x0712, 0x115: 0x0313, 0x116: 0x0312, 0x117: 0x0f13,
+	0x118: 0x0f12, 0x119: 0x0313, 0x11a: 0x0312, 0x11b: 0x0713, 0x11c: 0x0712, 0x11d: 0x1452,
+	0x11e: 0x0113, 0x11f: 0x0112, 0x120: 0x0113, 0x121: 0x0112, 0x122: 0x0113, 0x123: 0x0112,
+	0x124: 0x0113, 0x125: 0x0112, 0x126: 0x0113, 0x127: 0x0112, 0x128: 0x0113, 0x129: 0x0112,
+	0x12a: 0x0113, 0x12b: 0x0112, 0x12c: 0x0113, 0x12d: 0x0112, 0x12e: 0x0113, 0x12f: 0x0112,
+	0x130: 0x077a, 0x131: 0x082b, 0x132: 0x08a9, 0x133: 0x092a, 0x134: 0x0113, 0x135: 0x0112,
+	0x136: 0x2353, 0x137: 0x4453, 0x138: 0x0113, 0x139: 0x0112, 0x13a: 0x0113, 0x13b: 0x0112,
+	0x13c: 0x0113, 0x13d: 0x0112, 0x13e: 0x0113, 0x13f: 0x0112,
+	// Block 0x5, offset 0x140
+	0x140: 0x0b0a, 0x141: 0x0313, 0x142: 0x0312, 0x143: 0x0853, 0x144: 0x4753, 0x145: 0x4a53,
+	0x146: 0x0113, 0x147: 0x0112, 0x148: 0x0113, 0x149: 0x0112, 0x14a: 0x0113, 0x14b: 0x0112,
+	0x14c: 0x0113, 0x14d: 0x0112, 0x14e: 0x0113, 0x14f: 0x0112, 0x150: 0x0b8a, 0x151: 0x0c0a,
+	0x152: 0x0c8a, 0x153: 0x0b52, 0x154: 0x0b52, 0x155: 0x0012, 0x156: 0x0e52, 0x157: 0x1152,
+	0x158: 0x0012, 0x159: 0x1752, 0x15a: 0x0012, 0x15b: 0x1a52, 0x15c: 0x0d0a, 0x15d: 0x0012,
+	0x15e: 0x0012, 0x15f: 0x0012, 0x160: 0x1d52, 0x161: 0x0d8a, 0x162: 0x0012, 0x163: 0x2052,
+	0x164: 0x0e0a, 0x165: 0x0e8a, 0x166: 0x0f0a, 0x167: 0x0012, 0x168: 0x2652, 0x169: 0x2652,
+	0x16a: 0x0f8a, 0x16b: 0x100a, 0x16c: 0x108a, 0x16d: 0x0012, 0x16e: 0x0012, 0x16f: 0x1d52,
+	0x170: 0x0012, 0x171: 0x110a, 0x172: 0x2c52, 0x173: 0x0012, 0x174: 0x0012, 0x175: 0x3252,
+	0x176: 0x0012, 0x177: 0x0012, 0x178: 0x0012, 0x179: 0x0012, 0x17a: 0x0012, 0x17b: 0x0012,
+	0x17c: 0x0012, 0x17d: 0x118a, 0x17e: 0x0012, 0x17f: 0x0012,
+	// Block 0x6, offset 0x180
+	0x180: 0x3552, 0x181: 0x0012, 0x182: 0x120a, 0x183: 0x3852, 0x184: 0x0012, 0x185: 0x0012,
+	0x186: 0x0012, 0x187: 0x128a, 0x188: 0x3552, 0x189: 0x4752, 0x18a: 0x3b52, 0x18b: 0x3e52,
+	0x18c: 0x4a52, 0x18d: 0x0012, 0x18e: 0x0012, 0x18f: 0x0012, 0x190: 0x0012, 0x191: 0x0012,
+	0x192: 0x4152, 0x193: 0x0012, 0x194: 0x0010, 0x195: 0x0010, 0x196: 0x0012, 0x197: 0x0012,
+	0x198: 0x0012, 0x199: 0x0012, 0x19a: 0x0012, 0x19b: 0x0012, 0x19c: 0x0012, 0x19d: 0x130a,
+	0x19e: 0x138a, 0x19f: 0x0012, 0x1a0: 0x0012, 0x1a1: 0x0012, 0x1a2: 0x0012, 0x1a3: 0x0012,
+	0x1a4: 0x0012, 0x1a5: 0x0012, 0x1a6: 0x0012, 0x1a7: 0x0012, 0x1a8: 0x0012, 0x1a9: 0x0012,
+	0x1aa: 0x0012, 0x1ab: 0x0012, 0x1ac: 0x0012, 0x1ad: 0x0012, 0x1ae: 0x0012, 0x1af: 0x0012,
+	0x1b0: 0x0015, 0x1b1: 0x0015, 0x1b2: 0x0015, 0x1b3: 0x0015, 0x1b4: 0x0015, 0x1b5: 0x0015,
+	0x1b6: 0x0015, 0x1b7: 0x0015, 0x1b8: 0x0015, 0x1b9: 0x0014, 0x1ba: 0x0014, 0x1bb: 0x0014,
+	0x1bc: 0x0014, 0x1bd: 0x0014, 0x1be: 0x0014, 0x1bf: 0x0014,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x0024, 0x1c1: 0x0024, 0x1c2: 0x0024, 0x1c3: 0x0024, 0x1c4: 0x0024, 0x1c5: 0x140d,
+	0x1c6: 0x0024, 0x1c7: 0x0034, 0x1c8: 0x0034, 0x1c9: 0x0034, 0x1ca: 0x0024, 0x1cb: 0x0024,
+	0x1cc: 0x0024, 0x1cd: 0x0034, 0x1ce: 0x0034, 0x1cf: 0x0014, 0x1d0: 0x0024, 0x1d1: 0x0024,
+	0x1d2: 0x0024, 0x1d3: 0x0034, 0x1d4: 0x0034, 0x1d5: 0x0034, 0x1d6: 0x0034, 0x1d7: 0x0024,
+	0x1d8: 0x0034, 0x1d9: 0x0034, 0x1da: 0x0034, 0x1db: 0x0024, 0x1dc: 0x0034, 0x1dd: 0x0034,
+	0x1de: 0x0034, 0x1df: 0x0034, 0x1e0: 0x0034, 0x1e1: 0x0034, 0x1e2: 0x0034, 0x1e3: 0x0024,
+	0x1e4: 0x0024, 0x1e5: 0x0024, 0x1e6: 0x0024, 0x1e7: 0x0024, 0x1e8: 0x0024, 0x1e9: 0x0024,
+	0x1ea: 0x0024, 0x1eb: 0x0024, 0x1ec: 0x0024, 0x1ed: 0x0024, 0x1ee: 0x0024, 0x1ef: 0x0024,
+	0x1f0: 0x0113, 0x1f1: 0x0112, 0x1f2: 0x0113, 0x1f3: 0x0112, 0x1f4: 0x0014, 0x1f5: 0x0004,
+	0x1f6: 0x0113, 0x1f7: 0x0112, 0x1fa: 0x0015, 0x1fb: 0x4d52,
+	0x1fc: 0x5052, 0x1fd: 0x5052, 0x1ff: 0x5353,
+	// Block 0x8, offset 0x200
+	0x204: 0x0004, 0x205: 0x0004,
+	0x206: 0x2a13, 0x207: 0x0054, 0x208: 0x2513, 0x209: 0x2713, 0x20a: 0x2513,
+	0x20c: 0x5653, 0x20e: 0x5953, 0x20f: 0x5c53, 0x210: 0x148a, 0x211: 0x2013,
+	0x212: 0x2013, 0x213: 0x2013, 0x214: 0x2013, 0x215: 0x2013, 0x216: 0x2013, 0x217: 0x2013,
+	0x218: 0x2013, 0x219: 0x2013, 0x21a: 0x2013, 0x21b: 0x2013, 0x21c: 0x2013, 0x21d: 0x2013,
+	0x21e: 0x2013, 0x21f: 0x2013, 0x220: 0x5f53, 0x221: 0x5f53, 0x223: 0x5f53,
+	0x224: 0x5f53, 0x225: 0x5f53, 0x226: 0x5f53, 0x227: 0x5f53, 0x228: 0x5f53, 0x229: 0x5f53,
+	0x22a: 0x5f53, 0x22b: 0x5f53, 0x22c: 0x2a12, 0x22d: 0x2512, 0x22e: 0x2712, 0x22f: 0x2512,
+	0x230: 0x15ca, 0x231: 0x2012, 0x232: 0x2012, 0x233: 0x2012, 0x234: 0x2012, 0x235: 0x2012,
+	0x236: 0x2012, 0x237: 0x2012, 0x238: 0x2012, 0x239: 0x2012, 0x23a: 0x2012, 0x23b: 0x2012,
+	0x23c: 0x2012, 0x23d: 0x2012, 0x23e: 0x2012, 0x23f: 0x2012,
+	// Block 0x9, offset 0x240
+	0x240: 0x5f52, 0x241: 0x5f52, 0x242: 0x170a, 0x243: 0x5f52, 0x244: 0x5f52, 0x245: 0x5f52,
+	0x246: 0x5f52, 0x247: 0x5f52, 0x248: 0x5f52, 0x249: 0x5f52, 0x24a: 0x5f52, 0x24b: 0x5f52,
+	0x24c: 0x5652, 0x24d: 0x5952, 0x24e: 0x5c52, 0x24f: 0x1813, 0x250: 0x178a, 0x251: 0x180a,
+	0x252: 0x0013, 0x253: 0x0013, 0x254: 0x0013, 0x255: 0x188a, 0x256: 0x190a, 0x257: 0x1812,
+	0x258: 0x0113, 0x259: 0x0112, 0x25a: 0x0113, 0x25b: 0x0112, 0x25c: 0x0113, 0x25d: 0x0112,
+	0x25e: 0x0113, 0x25f: 0x0112, 0x260: 0x0113, 0x261: 0x0112, 0x262: 0x0113, 0x263: 0x0112,
+	0x264: 0x0113, 0x265: 0x0112, 0x266: 0x0113, 0x267: 0x0112, 0x268: 0x0113, 0x269: 0x0112,
+	0x26a: 0x0113, 0x26b: 0x0112, 0x26c: 0x0113, 0x26d: 0x0112, 0x26e: 0x0113, 0x26f: 0x0112,
+	0x270: 0x198a, 0x271: 0x1a0a, 0x272: 0x0b12, 0x273: 0x5352, 0x274: 0x6253, 0x275: 0x1a8a,
+	0x277: 0x0f13, 0x278: 0x0f12, 0x279: 0x0b13, 0x27a: 0x0113, 0x27b: 0x0112,
+	0x27c: 0x0012, 0x27d: 0x4d53, 0x27e: 0x5053, 0x27f: 0x5053,
+	// Block 0xa, offset 0x280
+	0x280: 0x6852, 0x281: 0x6852, 0x282: 0x6852, 0x283: 0x6852, 0x284: 0x6852, 0x285: 0x6852,
+	0x286: 0x6852, 0x287: 0x1b0a, 0x288: 0x0012, 0x28a: 0x0010,
+	0x291: 0x0034,
+	0x292: 0x0024, 0x293: 0x0024, 0x294: 0x0024, 0x295: 0x0024, 0x296: 0x0034, 0x297: 0x0024,
+	0x298: 0x0024, 0x299: 0x0024, 0x29a: 0x0034, 0x29b: 0x0034, 0x29c: 0x0024, 0x29d: 0x0024,
+	0x29e: 0x0024, 0x29f: 0x0024, 0x2a0: 0x0024, 0x2a1: 0x0024, 0x2a2: 0x0034, 0x2a3: 0x0034,
+	0x2a4: 0x0034, 0x2a5: 0x0034, 0x2a6: 0x0034, 0x2a7: 0x0034, 0x2a8: 0x0024, 0x2a9: 0x0024,
+	0x2aa: 0x0034, 0x2ab: 0x0024, 0x2ac: 0x0024, 0x2ad: 0x0034, 0x2ae: 0x0034, 0x2af: 0x0024,
+	0x2b0: 0x0034, 0x2b1: 0x0034, 0x2b2: 0x0034, 0x2b3: 0x0034, 0x2b4: 0x0034, 0x2b5: 0x0034,
+	0x2b6: 0x0034, 0x2b7: 0x0034, 0x2b8: 0x0034, 0x2b9: 0x0034, 0x2ba: 0x0034, 0x2bb: 0x0034,
+	0x2bc: 0x0034, 0x2bd: 0x0034, 0x2bf: 0x0034,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x0010, 0x2c1: 0x0010, 0x2c2: 0x0010, 0x2c3: 0x0010, 0x2c4: 0x0010, 0x2c5: 0x0010,
+	0x2c6: 0x0010, 0x2c7: 0x0010, 0x2c8: 0x0010, 0x2c9: 0x0014, 0x2ca: 0x0024, 0x2cb: 0x0024,
+	0x2cc: 0x0024, 0x2cd: 0x0024, 0x2ce: 0x0024, 0x2cf: 0x0034, 0x2d0: 0x0034, 0x2d1: 0x0034,
+	0x2d2: 0x0034, 0x2d3: 0x0034, 0x2d4: 0x0024, 0x2d5: 0x0024, 0x2d6: 0x0024, 0x2d7: 0x0024,
+	0x2d8: 0x0024, 0x2d9: 0x0024, 0x2da: 0x0024, 0x2db: 0x0024, 0x2dc: 0x0024, 0x2dd: 0x0024,
+	0x2de: 0x0024, 0x2df: 0x0024, 0x2e0: 0x0024, 0x2e1: 0x0024, 0x2e2: 0x0014, 0x2e3: 0x0034,
+	0x2e4: 0x0024, 0x2e5: 0x0024, 0x2e6: 0x0034, 0x2e7: 0x0024, 0x2e8: 0x0024, 0x2e9: 0x0034,
+	0x2ea: 0x0024, 0x2eb: 0x0024, 0x2ec: 0x0024, 0x2ed: 0x0034, 0x2ee: 0x0034, 0x2ef: 0x0034,
+	0x2f0: 0x0034, 0x2f1: 0x0034, 0x2f2: 0x0034, 0x2f3: 0x0024, 0x2f4: 0x0024, 0x2f5: 0x0024,
+	0x2f6: 0x0034, 0x2f7: 0x0024, 0x2f8: 0x0024, 0x2f9: 0x0034, 0x2fa: 0x0034, 0x2fb: 0x0024,
+	0x2fc: 0x0024, 0x2fd: 0x0024, 0x2fe: 0x0024, 0x2ff: 0x0024,
+	// Block 0xc, offset 0x300
+	0x300: 0x7053, 0x301: 0x7053, 0x302: 0x7053, 0x303: 0x7053, 0x304: 0x7053, 0x305: 0x7053,
+	0x307: 0x7053,
+	0x30d: 0x7053, 0x310: 0x1bea, 0x311: 0x1c6a,
+	0x312: 0x1cea, 0x313: 0x1d6a, 0x314: 0x1dea, 0x315: 0x1e6a, 0x316: 0x1eea, 0x317: 0x1f6a,
+	0x318: 0x1fea, 0x319: 0x206a, 0x31a: 0x20ea, 0x31b: 0x216a, 0x31c: 0x21ea, 0x31d: 0x226a,
+	0x31e: 0x22ea, 0x31f: 0x236a, 0x320: 0x23ea, 0x321: 0x246a, 0x322: 0x24ea, 0x323: 0x256a,
+	0x324: 0x25ea, 0x325: 0x266a, 0x326: 0x26ea, 0x327: 0x276a, 0x328: 0x27ea, 0x329: 0x286a,
+	0x32a: 0x28ea, 0x32b: 0x296a, 0x32c: 0x29ea, 0x32d: 0x2a6a, 0x32e: 0x2aea, 0x32f: 0x2b6a,
+	0x330: 0x2bea, 0x331: 0x2c6a, 0x332: 0x2cea, 0x333: 0x2d6a, 0x334: 0x2dea, 0x335: 0x2e6a,
+	0x336: 0x2eea, 0x337: 0x2f6a, 0x338: 0x2fea, 0x339: 0x306a, 0x33a: 0x30ea,
+	0x33c: 0x0015, 0x33d: 0x316a, 0x33e: 0x31ea, 0x33f: 0x326a,
+	// Block 0xd, offset 0x340
+	0x340: 0x0812, 0x341: 0x0812, 0x342: 0x0812, 0x343: 0x0812, 0x344: 0x0812, 0x345: 0x0812,
+	0x348: 0x0813, 0x349: 0x0813, 0x34a: 0x0813, 0x34b: 0x0813,
+	0x34c: 0x0813, 0x34d: 0x0813, 0x350: 0x3c1a, 0x351: 0x0812,
+	0x352: 0x3cfa, 0x353: 0x0812, 0x354: 0x3e3a, 0x355: 0x0812, 0x356: 0x3f7a, 0x357: 0x0812,
+	0x359: 0x0813, 0x35b: 0x0813, 0x35d: 0x0813,
+	0x35f: 0x0813, 0x360: 0x0812, 0x361: 0x0812, 0x362: 0x0812, 0x363: 0x0812,
+	0x364: 0x0812, 0x365: 0x0812, 0x366: 0x0812, 0x367: 0x0812, 0x368: 0x0813, 0x369: 0x0813,
+	0x36a: 0x0813, 0x36b: 0x0813, 0x36c: 0x0813, 0x36d: 0x0813, 0x36e: 0x0813, 0x36f: 0x0813,
+	0x370: 0x9252, 0x371: 0x9252, 0x372: 0x9552, 0x373: 0x9552, 0x374: 0x9852, 0x375: 0x9852,
+	0x376: 0x9b52, 0x377: 0x9b52, 0x378: 0x9e52, 0x379: 0x9e52, 0x37a: 0xa152, 0x37b: 0xa152,
+	0x37c: 0x4d52, 0x37d: 0x4d52,
+	// Block 0xe, offset 0x380
+	0x380: 0x40ba, 0x381: 0x41aa, 0x382: 0x429a, 0x383: 0x438a, 0x384: 0x447a, 0x385: 0x456a,
+	0x386: 0x465a, 0x387: 0x474a, 0x388: 0x4839, 0x389: 0x4929, 0x38a: 0x4a19, 0x38b: 0x4b09,
+	0x38c: 0x4bf9, 0x38d: 0x4ce9, 0x38e: 0x4dd9, 0x38f: 0x4ec9, 0x390: 0x4fba, 0x391: 0x50aa,
+	0x392: 0x519a, 0x393: 0x528a, 0x394: 0x537a, 0x395: 0x546a, 0x396: 0x555a, 0x397: 0x564a,
+	0x398: 0x5739, 0x399: 0x5829, 0x39a: 0x5919, 0x39b: 0x5a09, 0x39c: 0x5af9, 0x39d: 0x5be9,
+	0x39e: 0x5cd9, 0x39f: 0x5dc9, 0x3a0: 0x5eba, 0x3a1: 0x5faa, 0x3a2: 0x609a, 0x3a3: 0x618a,
+	0x3a4: 0x627a, 0x3a5: 0x636a, 0x3a6: 0x645a, 0x3a7: 0x654a, 0x3a8: 0x6639, 0x3a9: 0x6729,
+	0x3aa: 0x6819, 0x3ab: 0x6909, 0x3ac: 0x69f9, 0x3ad: 0x6ae9, 0x3ae: 0x6bd9, 0x3af: 0x6cc9,
+	0x3b0: 0x0812, 0x3b1: 0x0812, 0x3b2: 0x6dba, 0x3b3: 0x6eca, 0x3b4: 0x6f9a,
+	0x3b6: 0x707a, 0x3b7: 0x715a, 0x3b8: 0x0813, 0x3b9: 0x0813, 0x3ba: 0x9253, 0x3bb: 0x9253,
+	0x3bc: 0x7299, 0x3bd: 0x0004, 0x3be: 0x736a, 0x3bf: 0x0004,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x0004, 0x3c1: 0x0004, 0x3c2: 0x73ea, 0x3c3: 0x74fa, 0x3c4: 0x75ca,
+	0x3c6: 0x76aa, 0x3c7: 0x778a, 0x3c8: 0x9553, 0x3c9: 0x9553, 0x3ca: 0x9853, 0x3cb: 0x9853,
+	0x3cc: 0x78c9, 0x3cd: 0x0004, 0x3ce: 0x0004, 0x3cf: 0x0004, 0x3d0: 0x0812, 0x3d1: 0x0812,
+	0x3d2: 0x799a, 0x3d3: 0x7ada, 0x3d6: 0x7c1a, 0x3d7: 0x7cfa,
+	0x3d8: 0x0813, 0x3d9: 0x0813, 0x3da: 0x9b53, 0x3db: 0x9b53, 0x3dd: 0x0004,
+	0x3de: 0x0004, 0x3df: 0x0004, 0x3e0: 0x0812, 0x3e1: 0x0812, 0x3e2: 0x7e3a, 0x3e3: 0x7f7a,
+	0x3e4: 0x80ba, 0x3e5: 0x0912, 0x3e6: 0x819a, 0x3e7: 0x827a, 0x3e8: 0x0813, 0x3e9: 0x0813,
+	0x3ea: 0xa153, 0x3eb: 0xa153, 0x3ec: 0x0913, 0x3ed: 0x0004, 0x3ee: 0x0004, 0x3ef: 0x0004,
+	0x3f2: 0x83ba, 0x3f3: 0x84ca, 0x3f4: 0x859a,
+	0x3f6: 0x867a, 0x3f7: 0x875a, 0x3f8: 0x9e53, 0x3f9: 0x9e53, 0x3fa: 0x4d53, 0x3fb: 0x4d53,
+	0x3fc: 0x8899, 0x3fd: 0x0004, 0x3fe: 0x0004,
+	// Block 0x10, offset 0x400
+	0x402: 0x0013,
+	0x407: 0x0013, 0x40a: 0x0012, 0x40b: 0x0013,
+	0x40c: 0x0013, 0x40d: 0x0013, 0x40e: 0x0012, 0x40f: 0x0012, 0x410: 0x0013, 0x411: 0x0013,
+	0x412: 0x0013, 0x413: 0x0012, 0x415: 0x0013,
+	0x419: 0x0013, 0x41a: 0x0013, 0x41b: 0x0013, 0x41c: 0x0013, 0x41d: 0x0013,
+	0x424: 0x0013, 0x426: 0x896b, 0x428: 0x0013,
+	0x42a: 0x89cb, 0x42b: 0x8a0b, 0x42c: 0x0013, 0x42d: 0x0013, 0x42f: 0x0012,
+	0x430: 0x0013, 0x431: 0x0013, 0x432: 0xa453, 0x433: 0x0013, 0x434: 0x0012, 0x435: 0x0010,
+	0x436: 0x0010, 0x437: 0x0010, 0x438: 0x0010, 0x439: 0x0012,
+	0x43c: 0x0012, 0x43d: 0x0012, 0x43e: 0x0013, 0x43f: 0x0013,
+	// Block 0x11, offset 0x440
+	0x440: 0x1a13, 0x441: 0x1a13, 0x442: 0x1e13, 0x443: 0x1e13, 0x444: 0x1a13, 0x445: 0x1a13,
+	0x446: 0x2613, 0x447: 0x2613, 0x448: 0x2a13, 0x449: 0x2a13, 0x44a: 0x2e13, 0x44b: 0x2e13,
+	0x44c: 0x2a13, 0x44d: 0x2a13, 0x44e: 0x2613, 0x44f: 0x2613, 0x450: 0xa752, 0x451: 0xa752,
+	0x452: 0xaa52, 0x453: 0xaa52, 0x454: 0xad52, 0x455: 0xad52, 0x456: 0xaa52, 0x457: 0xaa52,
+	0x458: 0xa752, 0x459: 0xa752, 0x45a: 0x1a12, 0x45b: 0x1a12, 0x45c: 0x1e12, 0x45d: 0x1e12,
+	0x45e: 0x1a12, 0x45f: 0x1a12, 0x460: 0x2612, 0x461: 0x2612, 0x462: 0x2a12, 0x463: 0x2a12,
+	0x464: 0x2e12, 0x465: 0x2e12, 0x466: 0x2a12, 0x467: 0x2a12, 0x468: 0x2612, 0x469: 0x2612,
+	// Block 0x12, offset 0x480
+	0x480: 0x6552, 0x481: 0x6552, 0x482: 0x6552, 0x483: 0x6552, 0x484: 0x6552, 0x485: 0x6552,
+	0x486: 0x6552, 0x487: 0x6552, 0x488: 0x6552, 0x489: 0x6552, 0x48a: 0x6552, 0x48b: 0x6552,
+	0x48c: 0x6552, 0x48d: 0x6552, 0x48e: 0x6552, 0x48f: 0x6552, 0x490: 0xb052, 0x491: 0xb052,
+	0x492: 0xb052, 0x493: 0xb052, 0x494: 0xb052, 0x495: 0xb052, 0x496: 0xb052, 0x497: 0xb052,
+	0x498: 0xb052, 0x499: 0xb052, 0x49a: 0xb052, 0x49b: 0xb052, 0x49c: 0xb052, 0x49d: 0xb052,
+	0x49e: 0xb052, 0x49f: 0xb052, 0x4a0: 0x0113, 0x4a1: 0x0112, 0x4a2: 0x8a6b, 0x4a3: 0x8b53,
+	0x4a4: 0x8acb, 0x4a5: 0x8b2a, 0x4a6: 0x8b8a, 0x4a7: 0x0f13, 0x4a8: 0x0f12, 0x4a9: 0x0313,
+	0x4aa: 0x0312, 0x4ab: 0x0713, 0x4ac: 0x0712, 0x4ad: 0x8beb, 0x4ae: 0x8c4b, 0x4af: 0x8cab,
+	0x4b0: 0x8d0b, 0x4b1: 0x0012, 0x4b2: 0x0113, 0x4b3: 0x0112, 0x4b4: 0x0012, 0x4b5: 0x0313,
+	0x4b6: 0x0312, 0x4b7: 0x0012, 0x4b8: 0x0012, 0x4b9: 0x0012, 0x4ba: 0x0012, 0x4bb: 0x0012,
+	0x4bc: 0x0015, 0x4bd: 0x0015, 0x4be: 0x8d6b, 0x4bf: 0x8dcb,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x0113, 0x4c1: 0x0112, 0x4c2: 0x0113, 0x4c3: 0x0112, 0x4c4: 0x0113, 0x4c5: 0x0112,
+	0x4c6: 0x0113, 0x4c7: 0x0112, 0x4c8: 0x0014, 0x4c9: 0x0014, 0x4ca: 0x0014, 0x4cb: 0x0713,
+	0x4cc: 0x0712, 0x4cd: 0x8e2b, 0x4ce: 0x0012, 0x4cf: 0x0010, 0x4d0: 0x0113, 0x4d1: 0x0112,
+	0x4d2: 0x0113, 0x4d3: 0x0112, 0x4d4: 0x6552, 0x4d5: 0x0012, 0x4d6: 0x0113, 0x4d7: 0x0112,
+	0x4d8: 0x0113, 0x4d9: 0x0112, 0x4da: 0x0113, 0x4db: 0x0112, 0x4dc: 0x0113, 0x4dd: 0x0112,
+	0x4de: 0x0113, 0x4df: 0x0112, 0x4e0: 0x0113, 0x4e1: 0x0112, 0x4e2: 0x0113, 0x4e3: 0x0112,
+	0x4e4: 0x0113, 0x4e5: 0x0112, 0x4e6: 0x0113, 0x4e7: 0x0112, 0x4e8: 0x0113, 0x4e9: 0x0112,
+	0x4ea: 0x8e8b, 0x4eb: 0x8eeb, 0x4ec: 0x8f4b, 0x4ed: 0x8fab, 0x4ee: 0x900b, 0x4ef: 0x0012,
+	0x4f0: 0x906b, 0x4f1: 0x90cb, 0x4f2: 0x912b, 0x4f3: 0xb353, 0x4f4: 0x0113, 0x4f5: 0x0112,
+	0x4f6: 0x0113, 0x4f7: 0x0112, 0x4f8: 0x0113, 0x4f9: 0x0112, 0x4fa: 0x0113, 0x4fb: 0x0112,
+	0x4fc: 0x0113, 0x4fd: 0x0112, 0x4fe: 0x0113, 0x4ff: 0x0112,
+	// Block 0x14, offset 0x500
+	0x500: 0x92aa, 0x501: 0x932a, 0x502: 0x93aa, 0x503: 0x942a, 0x504: 0x94da, 0x505: 0x958a,
+	0x506: 0x960a,
+	0x513: 0x968a, 0x514: 0x976a, 0x515: 0x984a, 0x516: 0x992a, 0x517: 0x9a0a,
+	0x51d: 0x0010,
+	0x51e: 0x0034, 0x51f: 0x0010, 0x520: 0x0010, 0x521: 0x0010, 0x522: 0x0010, 0x523: 0x0010,
+	0x524: 0x0010, 0x525: 0x0010, 0x526: 0x0010, 0x527: 0x0010, 0x528: 0x0010,
+	0x52a: 0x0010, 0x52b: 0x0010, 0x52c: 0x0010, 0x52d: 0x0010, 0x52e: 0x0010, 0x52f: 0x0010,
+	0x530: 0x0010, 0x531: 0x0010, 0x532: 0x0010, 0x533: 0x0010, 0x534: 0x0010, 0x535: 0x0010,
+	0x536: 0x0010, 0x538: 0x0010, 0x539: 0x0010, 0x53a: 0x0010, 0x53b: 0x0010,
+	0x53c: 0x0010, 0x53e: 0x0010,
+	// Block 0x15, offset 0x540
+	0x540: 0x2713, 0x541: 0x2913, 0x542: 0x2b13, 0x543: 0x2913, 0x544: 0x2f13, 0x545: 0x2913,
+	0x546: 0x2b13, 0x547: 0x2913, 0x548: 0x2713, 0x549: 0x3913, 0x54a: 0x3b13,
+	0x54c: 0x3f13, 0x54d: 0x3913, 0x54e: 0x3b13, 0x54f: 0x3913, 0x550: 0x2713, 0x551: 0x2913,
+	0x552: 0x2b13, 0x554: 0x2f13, 0x555: 0x2913, 0x557: 0xbc52,
+	0x558: 0xbf52, 0x559: 0xc252, 0x55a: 0xbf52, 0x55b: 0xc552, 0x55c: 0xbf52, 0x55d: 0xc252,
+	0x55e: 0xbf52, 0x55f: 0xbc52, 0x560: 0xc852, 0x561: 0xcb52, 0x563: 0xce52,
+	0x564: 0xc852, 0x565: 0xcb52, 0x566: 0xc852, 0x567: 0x2712, 0x568: 0x2912, 0x569: 0x2b12,
+	0x56a: 0x2912, 0x56b: 0x2f12, 0x56c: 0x2912, 0x56d: 0x2b12, 0x56e: 0x2912, 0x56f: 0x2712,
+	0x570: 0x3912, 0x571: 0x3b12, 0x573: 0x3f12, 0x574: 0x3912, 0x575: 0x3b12,
+	0x576: 0x3912, 0x577: 0x2712, 0x578: 0x2912, 0x579: 0x2b12, 0x57b: 0x2f12,
+	0x57c: 0x2912,
+	// Block 0x16, offset 0x580
+	0x5a0: 0x1b13, 0x5a1: 0x1d13, 0x5a2: 0x1f13, 0x5a3: 0x1d13,
+	0x5a4: 0x1b13, 0x5a5: 0xd453, 0x5a6: 0xd753, 0x5a7: 0xd453, 0x5a8: 0xda53, 0x5a9: 0xdd53,
+	0x5aa: 0xe053, 0x5ab: 0xdd53, 0x5ac: 0xda53, 0x5ad: 0xd453, 0x5ae: 0xd753, 0x5af: 0xd453,
+	0x5b0: 0xe353, 0x5b1: 0xe653, 0x5b2: 0x0553, 0x5b3: 0xe653, 0x5b4: 0xe353, 0x5b5: 0xd453,
+	0x5b6: 0xd753, 0x5b7: 0xd453, 0x5b8: 0xda53, 0x5bb: 0x1b12,
+	0x5bc: 0x1d12, 0x5bd: 0x1f12, 0x5be: 0x1d12, 0x5bf: 0x1b12,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0xd452, 0x5c1: 0xd752, 0x5c2: 0xd452, 0x5c3: 0xda52, 0x5c4: 0xdd52, 0x5c5: 0xe052,
+	0x5c6: 0xdd52, 0x5c7: 0xda52, 0x5c8: 0xd452, 0x5c9: 0xd752, 0x5ca: 0xd452, 0x5cb: 0xe352,
+	0x5cc: 0xe652, 0x5cd: 0x0552, 0x5ce: 0xe652, 0x5cf: 0xe352, 0x5d0: 0xd452, 0x5d1: 0xd752,
+	0x5d2: 0xd452, 0x5d3: 0xda52,
+	// Block 0x18, offset 0x600
+	0x600: 0x2213, 0x601: 0x2213, 0x602: 0x2613, 0x603: 0x2613, 0x604: 0x2213, 0x605: 0x2213,
+	0x606: 0x2e13, 0x607: 0x2e13, 0x608: 0x2213, 0x609: 0x2213, 0x60a: 0x2613, 0x60b: 0x2613,
+	0x60c: 0x2213, 0x60d: 0x2213, 0x60e: 0x3e13, 0x60f: 0x3e13, 0x610: 0x2213, 0x611: 0x2213,
+	0x612: 0x2613, 0x613: 0x2613, 0x614: 0x2213, 0x615: 0x2213, 0x616: 0x2e13, 0x617: 0x2e13,
+	0x618: 0x2213, 0x619: 0x2213, 0x61a: 0x2613, 0x61b: 0x2613, 0x61c: 0x2213, 0x61d: 0x2213,
+	0x61e: 0xe953, 0x61f: 0xe953, 0x620: 0xec53, 0x621: 0xec53, 0x622: 0x2212, 0x623: 0x2212,
+	0x624: 0x2612, 0x625: 0x2612, 0x626: 0x2212, 0x627: 0x2212, 0x628: 0x2e12, 0x629: 0x2e12,
+	0x62a: 0x2212, 0x62b: 0x2212, 0x62c: 0x2612, 0x62d: 0x2612, 0x62e: 0x2212, 0x62f: 0x2212,
+	0x630: 0x3e12, 0x631: 0x3e12, 0x632: 0x2212, 0x633: 0x2212, 0x634: 0x2612, 0x635: 0x2612,
+	0x636: 0x2212, 0x637: 0x2212, 0x638: 0x2e12, 0x639: 0x2e12, 0x63a: 0x2212, 0x63b: 0x2212,
+	0x63c: 0x2612, 0x63d: 0x2612, 0x63e: 0x2212, 0x63f: 0x2212,
+	// Block 0x19, offset 0x640
+	0x642: 0x0010,
+	0x647: 0x0010, 0x649: 0x0010, 0x64b: 0x0010,
+	0x64d: 0x0010, 0x64e: 0x0010, 0x64f: 0x0010, 0x651: 0x0010,
+	0x652: 0x0010, 0x654: 0x0010, 0x657: 0x0010,
+	0x659: 0x0010, 0x65b: 0x0010, 0x65d: 0x0010,
+	0x65f: 0x0010, 0x661: 0x0010, 0x662: 0x0010,
+	0x664: 0x0010, 0x667: 0x0010, 0x668: 0x0010, 0x669: 0x0010,
+	0x66a: 0x0010, 0x66c: 0x0010, 0x66d: 0x0010, 0x66e: 0x0010, 0x66f: 0x0010,
+	0x670: 0x0010, 0x671: 0x0010, 0x672: 0x0010, 0x674: 0x0010, 0x675: 0x0010,
+	0x676: 0x0010, 0x677: 0x0010, 0x679: 0x0010, 0x67a: 0x0010, 0x67b: 0x0010,
+	0x67c: 0x0010, 0x67e: 0x0010,
+}
+
+// caseIndex: 27 blocks, 1728 entries, 3456 bytes
+// Block 0 is the zero block.
+var caseIndex = [1728]uint16{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x18, 0xc3: 0x19, 0xc4: 0x1a, 0xc5: 0x1b, 0xc6: 0x01, 0xc7: 0x02,
+	0xc8: 0x1c, 0xc9: 0x03, 0xca: 0x04, 0xcb: 0x1d, 0xcc: 0x1e, 0xcd: 0x05, 0xce: 0x06, 0xcf: 0x07,
+	0xd0: 0x1f, 0xd1: 0x20, 0xd2: 0x21, 0xd3: 0x22, 0xd4: 0x23, 0xd5: 0x24, 0xd6: 0x08, 0xd7: 0x25,
+	0xd8: 0x26, 0xd9: 0x27, 0xda: 0x28, 0xdb: 0x29, 0xdc: 0x2a, 0xdd: 0x2b, 0xde: 0x2c, 0xdf: 0x2d,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x07, 0xed: 0x08, 0xef: 0x09,
+	0xf0: 0x16, 0xf3: 0x18,
+	// Block 0x4, offset 0x100
+	0x120: 0x2e, 0x121: 0x2f, 0x122: 0x30, 0x123: 0x09, 0x124: 0x31, 0x125: 0x32, 0x126: 0x33, 0x127: 0x34,
+	0x128: 0x35, 0x129: 0x36, 0x12a: 0x37, 0x12b: 0x38, 0x12c: 0x39, 0x12d: 0x3a, 0x12e: 0x3b, 0x12f: 0x3c,
+	0x130: 0x3d, 0x131: 0x3e, 0x132: 0x3f, 0x133: 0x40, 0x134: 0x41, 0x135: 0x42, 0x136: 0x43, 0x137: 0x44,
+	0x138: 0x45, 0x139: 0x46, 0x13a: 0x47, 0x13b: 0x48, 0x13c: 0x49, 0x13d: 0x4a, 0x13e: 0x4b, 0x13f: 0x4c,
+	// Block 0x5, offset 0x140
+	0x140: 0x4d, 0x141: 0x4e, 0x142: 0x4f, 0x143: 0x0a, 0x144: 0x28, 0x145: 0x28, 0x146: 0x28, 0x147: 0x28,
+	0x148: 0x28, 0x149: 0x50, 0x14a: 0x51, 0x14b: 0x52, 0x14c: 0x53, 0x14d: 0x54, 0x14e: 0x55, 0x14f: 0x56,
+	0x150: 0x57, 0x151: 0x28, 0x152: 0x28, 0x153: 0x28, 0x154: 0x28, 0x155: 0x28, 0x156: 0x28, 0x157: 0x28,
+	0x158: 0x28, 0x159: 0x58, 0x15a: 0x59, 0x15b: 0x5a, 0x15c: 0x5b, 0x15d: 0x5c, 0x15e: 0x5d, 0x15f: 0x5e,
+	0x160: 0x5f, 0x161: 0x60, 0x162: 0x61, 0x163: 0x62, 0x164: 0x63, 0x165: 0x64, 0x167: 0x65,
+	0x168: 0x66, 0x169: 0x67, 0x16a: 0x68, 0x16b: 0x69, 0x16c: 0x6a, 0x16d: 0x6b, 0x16e: 0x6c, 0x16f: 0x6d,
+	0x170: 0x6e, 0x171: 0x6f, 0x172: 0x70, 0x173: 0x71, 0x174: 0x72, 0x175: 0x73, 0x176: 0x74, 0x177: 0x75,
+	0x178: 0x76, 0x179: 0x76, 0x17a: 0x77, 0x17b: 0x76, 0x17c: 0x78, 0x17d: 0x0b, 0x17e: 0x0c, 0x17f: 0x0d,
+	// Block 0x6, offset 0x180
+	0x180: 0x79, 0x181: 0x7a, 0x182: 0x7b, 0x183: 0x7c, 0x184: 0x0e, 0x185: 0x7d, 0x186: 0x7e,
+	0x192: 0x7f, 0x193: 0x0f,
+	0x1b0: 0x80, 0x1b1: 0x10, 0x1b2: 0x76, 0x1b3: 0x81, 0x1b4: 0x82, 0x1b5: 0x83, 0x1b6: 0x84, 0x1b7: 0x85,
+	0x1b8: 0x86,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x87, 0x1c2: 0x88, 0x1c3: 0x89, 0x1c4: 0x8a, 0x1c5: 0x28, 0x1c6: 0x8b,
+	// Block 0x8, offset 0x200
+	0x200: 0x8c, 0x201: 0x28, 0x202: 0x28, 0x203: 0x28, 0x204: 0x28, 0x205: 0x28, 0x206: 0x28, 0x207: 0x28,
+	0x208: 0x28, 0x209: 0x28, 0x20a: 0x28, 0x20b: 0x28, 0x20c: 0x28, 0x20d: 0x28, 0x20e: 0x28, 0x20f: 0x28,
+	0x210: 0x28, 0x211: 0x28, 0x212: 0x8d, 0x213: 0x8e, 0x214: 0x28, 0x215: 0x28, 0x216: 0x28, 0x217: 0x28,
+	0x218: 0x8f, 0x219: 0x90, 0x21a: 0x91, 0x21b: 0x92, 0x21c: 0x93, 0x21d: 0x94, 0x21e: 0x11, 0x21f: 0x95,
+	0x220: 0x96, 0x221: 0x97, 0x222: 0x28, 0x223: 0x98, 0x224: 0x99, 0x225: 0x9a, 0x226: 0x9b, 0x227: 0x9c,
+	0x228: 0x9d, 0x229: 0x9e, 0x22a: 0x9f, 0x22b: 0xa0, 0x22c: 0xa1, 0x22d: 0xa2, 0x22e: 0xa3, 0x22f: 0xa4,
+	0x230: 0x28, 0x231: 0x28, 0x232: 0x28, 0x233: 0x28, 0x234: 0x28, 0x235: 0x28, 0x236: 0x28, 0x237: 0x28,
+	0x238: 0x28, 0x239: 0x28, 0x23a: 0x28, 0x23b: 0x28, 0x23c: 0x28, 0x23d: 0x28, 0x23e: 0x28, 0x23f: 0x28,
+	// Block 0x9, offset 0x240
+	0x240: 0x28, 0x241: 0x28, 0x242: 0x28, 0x243: 0x28, 0x244: 0x28, 0x245: 0x28, 0x246: 0x28, 0x247: 0x28,
+	0x248: 0x28, 0x249: 0x28, 0x24a: 0x28, 0x24b: 0x28, 0x24c: 0x28, 0x24d: 0x28, 0x24e: 0x28, 0x24f: 0x28,
+	0x250: 0x28, 0x251: 0x28, 0x252: 0x28, 0x253: 0x28, 0x254: 0x28, 0x255: 0x28, 0x256: 0x28, 0x257: 0x28,
+	0x258: 0x28, 0x259: 0x28, 0x25a: 0x28, 0x25b: 0x28, 0x25c: 0x28, 0x25d: 0x28, 0x25e: 0x28, 0x25f: 0x28,
+	0x260: 0x28, 0x261: 0x28, 0x262: 0x28, 0x263: 0x28, 0x264: 0x28, 0x265: 0x28, 0x266: 0x28, 0x267: 0x28,
+	0x268: 0x28, 0x269: 0x28, 0x26a: 0x28, 0x26b: 0x28, 0x26c: 0x28, 0x26d: 0x28, 0x26e: 0x28, 0x26f: 0x28,
+	0x270: 0x28, 0x271: 0x28, 0x272: 0x28, 0x273: 0x28, 0x274: 0x28, 0x275: 0x28, 0x276: 0x28, 0x277: 0x28,
+	0x278: 0x28, 0x279: 0x28, 0x27a: 0x28, 0x27b: 0x28, 0x27c: 0x28, 0x27d: 0x28, 0x27e: 0x28, 0x27f: 0x28,
+	// Block 0xa, offset 0x280
+	0x280: 0x28, 0x281: 0x28, 0x282: 0x28, 0x283: 0x28, 0x284: 0x28, 0x285: 0x28, 0x286: 0x28, 0x287: 0x28,
+	0x288: 0x28, 0x289: 0x28, 0x28a: 0x28, 0x28b: 0x28, 0x28c: 0x28, 0x28d: 0x28, 0x28e: 0x28, 0x28f: 0x28,
+	0x290: 0x28, 0x291: 0x28, 0x292: 0x28, 0x293: 0x28, 0x294: 0x28, 0x295: 0x28, 0x296: 0x28, 0x297: 0x28,
+	0x298: 0x28, 0x299: 0x28, 0x29a: 0x28, 0x29b: 0x28, 0x29c: 0x28, 0x29d: 0x28, 0x29e: 0xa5, 0x29f: 0xa6,
+	// Block 0xb, offset 0x2c0
+	0x2ec: 0x12, 0x2ed: 0xa7, 0x2ee: 0xa8, 0x2ef: 0xa9,
+	0x2f0: 0x28, 0x2f1: 0x28, 0x2f2: 0x28, 0x2f3: 0x28, 0x2f4: 0xaa, 0x2f5: 0xab, 0x2f6: 0xac, 0x2f7: 0xad,
+	0x2f8: 0xae, 0x2f9: 0xaf, 0x2fa: 0x28, 0x2fb: 0xb0, 0x2fc: 0xb1, 0x2fd: 0xb2, 0x2fe: 0xb3, 0x2ff: 0xb4,
+	// Block 0xc, offset 0x300
+	0x300: 0xb5, 0x301: 0xb6, 0x302: 0x28, 0x303: 0xb7, 0x305: 0xb8, 0x307: 0xb9,
+	0x30a: 0xba, 0x30b: 0xbb, 0x30c: 0xbc, 0x30d: 0xbd, 0x30e: 0xbe, 0x30f: 0xbf,
+	0x310: 0xc0, 0x311: 0xc1, 0x312: 0xc2, 0x313: 0xc3, 0x314: 0xc4, 0x315: 0xc5, 0x316: 0x13, 0x317: 0x97,
+	0x318: 0x28, 0x319: 0x28, 0x31a: 0x28, 0x31b: 0x28, 0x31c: 0xc6, 0x31d: 0xc7, 0x31e: 0xc8,
+	0x320: 0xc9, 0x321: 0xca, 0x322: 0xcb, 0x323: 0xcc, 0x324: 0xcd, 0x325: 0xce, 0x326: 0xcf,
+	0x328: 0xd0, 0x329: 0xd1, 0x32a: 0xd2, 0x32b: 0xd3, 0x32c: 0x62, 0x32d: 0xd4, 0x32e: 0xd5,
+	0x330: 0x28, 0x331: 0xd6, 0x332: 0xd7, 0x333: 0xd8, 0x334: 0xd9, 0x335: 0xda, 0x336: 0xdb,
+	0x33a: 0xdc, 0x33b: 0xdd, 0x33c: 0xde, 0x33d: 0xdf, 0x33e: 0xe0, 0x33f: 0xe1,
+	// Block 0xd, offset 0x340
+	0x340: 0xe2, 0x341: 0xe3, 0x342: 0xe4, 0x343: 0xe5, 0x344: 0xe6, 0x345: 0xe7, 0x346: 0xe8, 0x347: 0xe9,
+	0x348: 0xea, 0x349: 0xeb, 0x34a: 0xec, 0x34b: 0xed, 0x34c: 0xee, 0x34d: 0xef, 0x34e: 0xf0, 0x34f: 0xf1,
+	0x350: 0xf2, 0x351: 0xf3, 0x352: 0xf4, 0x353: 0xf5, 0x356: 0xf6, 0x357: 0xf7,
+	0x358: 0xf8, 0x359: 0xf9, 0x35a: 0xfa, 0x35b: 0xfb, 0x35c: 0xfc,
+	0x360: 0xfd, 0x362: 0xfe, 0x363: 0xff, 0x364: 0x100, 0x365: 0x101, 0x366: 0x102, 0x367: 0x103,
+	0x368: 0x104, 0x369: 0x105, 0x36a: 0x106, 0x36b: 0x107, 0x36d: 0x108, 0x36f: 0x109,
+	0x370: 0x10a, 0x371: 0x10b, 0x372: 0x10c, 0x374: 0x10d, 0x375: 0x10e, 0x376: 0x10f, 0x377: 0x110,
+	0x37b: 0x111, 0x37c: 0x112, 0x37d: 0x113, 0x37e: 0x114,
+	// Block 0xe, offset 0x380
+	0x380: 0x28, 0x381: 0x28, 0x382: 0x28, 0x383: 0x28, 0x384: 0x28, 0x385: 0x28, 0x386: 0x28, 0x387: 0x28,
+	0x388: 0x28, 0x389: 0x28, 0x38a: 0x28, 0x38b: 0x28, 0x38c: 0x28, 0x38d: 0x28, 0x38e: 0xce,
+	0x390: 0x28, 0x391: 0x115, 0x392: 0x28, 0x393: 0x28, 0x394: 0x28, 0x395: 0x116,
+	0x3be: 0xab, 0x3bf: 0x117,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x28, 0x3c1: 0x28, 0x3c2: 0x28, 0x3c3: 0x28, 0x3c4: 0x28, 0x3c5: 0x28, 0x3c6: 0x28, 0x3c7: 0x28,
+	0x3c8: 0x28, 0x3c9: 0x28, 0x3ca: 0x28, 0x3cb: 0x28, 0x3cc: 0x28, 0x3cd: 0x28, 0x3ce: 0x28, 0x3cf: 0x28,
+	0x3d0: 0x118, 0x3d1: 0x119, 0x3d2: 0x28, 0x3d3: 0x28, 0x3d4: 0x28, 0x3d5: 0x28, 0x3d6: 0x28, 0x3d7: 0x28,
+	0x3d8: 0x28, 0x3d9: 0x28, 0x3da: 0x28, 0x3db: 0x28, 0x3dc: 0x28, 0x3dd: 0x28, 0x3de: 0x28, 0x3df: 0x28,
+	0x3e0: 0x28, 0x3e1: 0x28, 0x3e2: 0x28, 0x3e3: 0x28, 0x3e4: 0x28, 0x3e5: 0x28, 0x3e6: 0x28, 0x3e7: 0x28,
+	0x3e8: 0x28, 0x3e9: 0x28, 0x3ea: 0x28, 0x3eb: 0x28, 0x3ec: 0x28, 0x3ed: 0x28, 0x3ee: 0x28, 0x3ef: 0x28,
+	0x3f0: 0x28, 0x3f1: 0x28, 0x3f2: 0x28, 0x3f3: 0x28, 0x3f4: 0x28, 0x3f5: 0x28, 0x3f6: 0x28, 0x3f7: 0x28,
+	0x3f8: 0x28, 0x3f9: 0x28, 0x3fa: 0x28, 0x3fb: 0x28, 0x3fc: 0x28, 0x3fd: 0x28, 0x3fe: 0x28, 0x3ff: 0x28,
+	// Block 0x10, offset 0x400
+	0x400: 0x28, 0x401: 0x28, 0x402: 0x28, 0x403: 0x28, 0x404: 0x28, 0x405: 0x28, 0x406: 0x28, 0x407: 0x28,
+	0x408: 0x28, 0x409: 0x28, 0x40a: 0x28, 0x40b: 0x28, 0x40c: 0x28, 0x40d: 0x28, 0x40e: 0x28, 0x40f: 0xb7,
+	0x410: 0x28, 0x411: 0x28, 0x412: 0x28, 0x413: 0x28, 0x414: 0x28, 0x415: 0x28, 0x416: 0x28, 0x417: 0x28,
+	0x418: 0x28, 0x419: 0x11a,
+	// Block 0x11, offset 0x440
+	0x444: 0x11b,
+	0x460: 0x28, 0x461: 0x28, 0x462: 0x28, 0x463: 0x28, 0x464: 0x28, 0x465: 0x28, 0x466: 0x28, 0x467: 0x28,
+	0x468: 0x107, 0x469: 0x11c, 0x46a: 0x11d, 0x46b: 0x11e, 0x46c: 0x11f, 0x46d: 0x120, 0x46e: 0x121,
+	0x475: 0x122,
+	0x479: 0x123, 0x47a: 0x14, 0x47b: 0x15, 0x47c: 0x28, 0x47d: 0x124, 0x47e: 0x125, 0x47f: 0x126,
+	// Block 0x12, offset 0x480
+	0x4bf: 0x127,
+	// Block 0x13, offset 0x4c0
+	0x4f0: 0x28, 0x4f1: 0x128, 0x4f2: 0x129,
+	// Block 0x14, offset 0x500
+	0x533: 0x12a,
+	0x53c: 0x12b, 0x53d: 0x12c,
+	// Block 0x15, offset 0x540
+	0x545: 0x12d, 0x546: 0x12e,
+	0x549: 0x12f,
+	0x550: 0x130, 0x551: 0x131, 0x552: 0x132, 0x553: 0x133, 0x554: 0x134, 0x555: 0x135, 0x556: 0x136, 0x557: 0x137,
+	0x558: 0x138, 0x559: 0x139, 0x55a: 0x13a, 0x55b: 0x13b, 0x55c: 0x13c, 0x55d: 0x13d, 0x55e: 0x13e, 0x55f: 0x13f,
+	0x568: 0x140, 0x569: 0x141, 0x56a: 0x142,
+	0x57c: 0x143,
+	// Block 0x16, offset 0x580
+	0x580: 0x144, 0x581: 0x145, 0x582: 0x146, 0x584: 0x147, 0x585: 0x148,
+	0x58a: 0x149, 0x58b: 0x14a,
+	0x593: 0x14b, 0x597: 0x14c,
+	0x59b: 0x14d, 0x59f: 0x14e,
+	0x5a0: 0x28, 0x5a1: 0x28, 0x5a2: 0x28, 0x5a3: 0x14f, 0x5a4: 0x16, 0x5a5: 0x150,
+	0x5b8: 0x151, 0x5b9: 0x17, 0x5ba: 0x152,
+	// Block 0x17, offset 0x5c0
+	0x5c4: 0x153, 0x5c5: 0x154, 0x5c6: 0x155,
+	0x5cf: 0x156,
+	0x5ef: 0x12a,
+	// Block 0x18, offset 0x600
+	0x610: 0x0a, 0x611: 0x0b, 0x612: 0x0c, 0x613: 0x0d, 0x614: 0x0e, 0x616: 0x0f,
+	0x61a: 0x10, 0x61b: 0x11, 0x61c: 0x12, 0x61d: 0x13, 0x61e: 0x14, 0x61f: 0x15,
+	// Block 0x19, offset 0x640
+	0x640: 0x157, 0x641: 0x158, 0x644: 0x158, 0x645: 0x158, 0x646: 0x158, 0x647: 0x159,
+	// Block 0x1a, offset 0x680
+	0x6a0: 0x17,
+}
+
+// sparseOffsets: 323 entries, 646 bytes
+var sparseOffsets = []uint16{0x0, 0x9, 0xf, 0x18, 0x24, 0x2e, 0x34, 0x37, 0x3b, 0x3e, 0x42, 0x4c, 0x4e, 0x57, 0x5e, 0x63, 0x71, 0x72, 0x80, 0x8f, 0x99, 0x9c, 0xa3, 0xab, 0xaf, 0xb7, 0xbd, 0xcb, 0xd6, 0xe3, 0xee, 0xfa, 0x104, 0x110, 0x11b, 0x127, 0x133, 0x13b, 0x145, 0x150, 0x15b, 0x167, 0x16d, 0x178, 0x17e, 0x186, 0x189, 0x18e, 0x192, 0x196, 0x19d, 0x1a6, 0x1ae, 0x1af, 0x1b8, 0x1bf, 0x1c7, 0x1cd, 0x1d2, 0x1d6, 0x1d9, 0x1db, 0x1de, 0x1e3, 0x1e4, 0x1e6, 0x1e8, 0x1ea, 0x1f1, 0x1f6, 0x1fa, 0x203, 0x206, 0x209, 0x20f, 0x210, 0x21b, 0x21c, 0x21d, 0x222, 0x22f, 0x238, 0x243, 0x24b, 0x254, 0x25d, 0x266, 0x26b, 0x26e, 0x27a, 0x288, 0x28a, 0x291, 0x295, 0x2a1, 0x2a2, 0x2ad, 0x2b5, 0x2bd, 0x2c3, 0x2c4, 0x2d2, 0x2d7, 0x2da, 0x2df, 0x2e3, 0x2e9, 0x2ee, 0x2f1, 0x2f6, 0x2fb, 0x2fc, 0x302, 0x304, 0x305, 0x307, 0x309, 0x30c, 0x30d, 0x30f, 0x312, 0x318, 0x31c, 0x31e, 0x323, 0x32a, 0x339, 0x343, 0x344, 0x34d, 0x351, 0x356, 0x35e, 0x364, 0x36a, 0x374, 0x379, 0x382, 0x388, 0x391, 0x395, 0x39d, 0x39f, 0x3a1, 0x3a4, 0x3a6, 0x3a8, 0x3a9, 0x3aa, 0x3ac, 0x3ae, 0x3b4, 0x3b9, 0x3bb, 0x3c2, 0x3c5, 0x3c7, 0x3cd, 0x3d2, 0x3d4, 0x3d5, 0x3d6, 0x3d7, 0x3d9, 0x3db, 0x3dd, 0x3e0, 0x3e2, 0x3e5, 0x3ed, 0x3f0, 0x3f4, 0x3fc, 0x3fe, 0x40e, 0x40f, 0x411, 0x416, 0x41c, 0x41e, 0x41f, 0x421, 0x423, 0x424, 0x426, 0x433, 0x434, 0x435, 0x439, 0x43b, 0x43c, 0x43d, 0x43e, 0x43f, 0x442, 0x44a, 0x44b, 0x44e, 0x454, 0x457, 0x45e, 0x464, 0x466, 0x46a, 0x472, 0x478, 0x47c, 0x483, 0x487, 0x48b, 0x494, 0x49e, 0x4a0, 0x4a6, 0x4ac, 0x4b6, 0x4c0, 0x4c6, 0x4d2, 0x4d4, 0x4dd, 0x4e3, 0x4e9, 0x4ef, 0x4f2, 0x4f8, 0x4fb, 0x504, 0x506, 0x50f, 0x513, 0x514, 0x517, 0x521, 0x524, 0x526, 0x52d, 0x535, 0x53b, 0x542, 0x543, 0x549, 0x54b, 0x551, 0x554, 0x55c, 0x563, 0x56d, 0x576, 0x57a, 0x57d, 0x582, 0x587, 0x588, 0x589, 0x58a, 0x58b, 0x58d, 0x591, 0x592, 0x598, 0x59b, 0x59c, 0x59f, 0x5a1, 0x5a5, 0x5a6, 0x5aa, 0x5ac, 0x5af, 0x5b1, 0x5b5, 0x5b8, 0x5ba, 0x5bf, 0x5c0, 0x5c2, 0x5c3, 0x5c8, 0x5cc, 0x5cd, 0x5d0, 0x5d4, 0x5df, 0x5e3, 0x5eb, 0x5f0, 0x5f4, 0x5f7, 0x5fb, 0x5fe, 0x601, 0x606, 0x60a, 0x60e, 0x612, 0x616, 0x618, 0x61a, 0x61d, 0x621, 0x627, 0x628, 0x629, 0x62c, 0x62e, 0x630, 0x633, 0x638, 0x63c, 0x647, 0x64b, 0x64d, 0x653, 0x65c, 0x661, 0x662, 0x665, 0x666, 0x667, 0x669, 0x66a, 0x66b}
+
+// sparseValues: 1643 entries, 6572 bytes
+var sparseValues = [1643]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0004, lo: 0xa8, hi: 0xa8},
+	{value: 0x0012, lo: 0xaa, hi: 0xaa},
+	{value: 0x0014, lo: 0xad, hi: 0xad},
+	{value: 0x0004, lo: 0xaf, hi: 0xaf},
+	{value: 0x0004, lo: 0xb4, hi: 0xb4},
+	{value: 0x001a, lo: 0xb5, hi: 0xb5},
+	{value: 0x0054, lo: 0xb7, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xb8},
+	{value: 0x0012, lo: 0xba, hi: 0xba},
+	// Block 0x1, offset 0x9
+	{value: 0x2013, lo: 0x80, hi: 0x96},
+	{value: 0x2013, lo: 0x98, hi: 0x9e},
+	{value: 0x009a, lo: 0x9f, hi: 0x9f},
+	{value: 0x2012, lo: 0xa0, hi: 0xb6},
+	{value: 0x2012, lo: 0xb8, hi: 0xbe},
+	{value: 0x0252, lo: 0xbf, hi: 0xbf},
+	// Block 0x2, offset 0xf
+	{value: 0x0117, lo: 0x80, hi: 0xaf},
+	{value: 0x011b, lo: 0xb0, hi: 0xb0},
+	{value: 0x019a, lo: 0xb1, hi: 0xb1},
+	{value: 0x0117, lo: 0xb2, hi: 0xb7},
+	{value: 0x0012, lo: 0xb8, hi: 0xb8},
+	{value: 0x0316, lo: 0xb9, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x0316, lo: 0xbd, hi: 0xbe},
+	{value: 0x0553, lo: 0xbf, hi: 0xbf},
+	// Block 0x3, offset 0x18
+	{value: 0x0552, lo: 0x80, hi: 0x80},
+	{value: 0x0316, lo: 0x81, hi: 0x82},
+	{value: 0x0716, lo: 0x83, hi: 0x84},
+	{value: 0x0316, lo: 0x85, hi: 0x86},
+	{value: 0x0f16, lo: 0x87, hi: 0x88},
+	{value: 0x01da, lo: 0x89, hi: 0x89},
+	{value: 0x0117, lo: 0x8a, hi: 0xb7},
+	{value: 0x0253, lo: 0xb8, hi: 0xb8},
+	{value: 0x0316, lo: 0xb9, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x0316, lo: 0xbd, hi: 0xbe},
+	{value: 0x028a, lo: 0xbf, hi: 0xbf},
+	// Block 0x4, offset 0x24
+	{value: 0x0117, lo: 0x80, hi: 0x9f},
+	{value: 0x2f53, lo: 0xa0, hi: 0xa0},
+	{value: 0x0012, lo: 0xa1, hi: 0xa1},
+	{value: 0x0117, lo: 0xa2, hi: 0xb3},
+	{value: 0x0012, lo: 0xb4, hi: 0xb9},
+	{value: 0x098b, lo: 0xba, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x2953, lo: 0xbd, hi: 0xbd},
+	{value: 0x0a0b, lo: 0xbe, hi: 0xbe},
+	{value: 0x0a8a, lo: 0xbf, hi: 0xbf},
+	// Block 0x5, offset 0x2e
+	{value: 0x0015, lo: 0x80, hi: 0x81},
+	{value: 0x0014, lo: 0x82, hi: 0x97},
+	{value: 0x0004, lo: 0x98, hi: 0x9d},
+	{value: 0x0014, lo: 0x9e, hi: 0x9f},
+	{value: 0x0015, lo: 0xa0, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xbf},
+	// Block 0x6, offset 0x34
+	{value: 0x0024, lo: 0x80, hi: 0x94},
+	{value: 0x0034, lo: 0x95, hi: 0xbc},
+	{value: 0x0024, lo: 0xbd, hi: 0xbf},
+	// Block 0x7, offset 0x37
+	{value: 0x6553, lo: 0x80, hi: 0x8f},
+	{value: 0x2013, lo: 0x90, hi: 0x9f},
+	{value: 0x5f53, lo: 0xa0, hi: 0xaf},
+	{value: 0x2012, lo: 0xb0, hi: 0xbf},
+	// Block 0x8, offset 0x3b
+	{value: 0x5f52, lo: 0x80, hi: 0x8f},
+	{value: 0x6552, lo: 0x90, hi: 0x9f},
+	{value: 0x0117, lo: 0xa0, hi: 0xbf},
+	// Block 0x9, offset 0x3e
+	{value: 0x0117, lo: 0x80, hi: 0x81},
+	{value: 0x0024, lo: 0x83, hi: 0x87},
+	{value: 0x0014, lo: 0x88, hi: 0x89},
+	{value: 0x0117, lo: 0x8a, hi: 0xbf},
+	// Block 0xa, offset 0x42
+	{value: 0x0f13, lo: 0x80, hi: 0x80},
+	{value: 0x0316, lo: 0x81, hi: 0x82},
+	{value: 0x0716, lo: 0x83, hi: 0x84},
+	{value: 0x0316, lo: 0x85, hi: 0x86},
+	{value: 0x0f16, lo: 0x87, hi: 0x88},
+	{value: 0x0316, lo: 0x89, hi: 0x8a},
+	{value: 0x0716, lo: 0x8b, hi: 0x8c},
+	{value: 0x0316, lo: 0x8d, hi: 0x8e},
+	{value: 0x0f12, lo: 0x8f, hi: 0x8f},
+	{value: 0x0117, lo: 0x90, hi: 0xbf},
+	// Block 0xb, offset 0x4c
+	{value: 0x0117, lo: 0x80, hi: 0xaf},
+	{value: 0x6553, lo: 0xb1, hi: 0xbf},
+	// Block 0xc, offset 0x4e
+	{value: 0x3013, lo: 0x80, hi: 0x8f},
+	{value: 0x6853, lo: 0x90, hi: 0x96},
+	{value: 0x0014, lo: 0x99, hi: 0x99},
+	{value: 0x0010, lo: 0x9a, hi: 0x9c},
+	{value: 0x0010, lo: 0x9e, hi: 0x9e},
+	{value: 0x0054, lo: 0x9f, hi: 0x9f},
+	{value: 0x0012, lo: 0xa0, hi: 0xa0},
+	{value: 0x6552, lo: 0xa1, hi: 0xaf},
+	{value: 0x3012, lo: 0xb0, hi: 0xbf},
+	// Block 0xd, offset 0x57
+	{value: 0x0034, lo: 0x81, hi: 0x82},
+	{value: 0x0024, lo: 0x84, hi: 0x84},
+	{value: 0x0034, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0xaa},
+	{value: 0x0010, lo: 0xaf, hi: 0xb3},
+	{value: 0x0054, lo: 0xb4, hi: 0xb4},
+	// Block 0xe, offset 0x5e
+	{value: 0x0014, lo: 0x80, hi: 0x85},
+	{value: 0x0024, lo: 0x90, hi: 0x97},
+	{value: 0x0034, lo: 0x98, hi: 0x9a},
+	{value: 0x0014, lo: 0x9c, hi: 0x9c},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0xf, offset 0x63
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x8a},
+	{value: 0x0034, lo: 0x8b, hi: 0x92},
+	{value: 0x0024, lo: 0x93, hi: 0x94},
+	{value: 0x0034, lo: 0x95, hi: 0x96},
+	{value: 0x0024, lo: 0x97, hi: 0x9b},
+	{value: 0x0034, lo: 0x9c, hi: 0x9c},
+	{value: 0x0024, lo: 0x9d, hi: 0x9e},
+	{value: 0x0034, lo: 0x9f, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xab, hi: 0xab},
+	{value: 0x0010, lo: 0xae, hi: 0xaf},
+	{value: 0x0034, lo: 0xb0, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xbf},
+	// Block 0x10, offset 0x71
+	{value: 0x0010, lo: 0x80, hi: 0xbf},
+	// Block 0x11, offset 0x72
+	{value: 0x0010, lo: 0x80, hi: 0x93},
+	{value: 0x0010, lo: 0x95, hi: 0x95},
+	{value: 0x0024, lo: 0x96, hi: 0x9c},
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x0024, lo: 0x9f, hi: 0xa2},
+	{value: 0x0034, lo: 0xa3, hi: 0xa3},
+	{value: 0x0024, lo: 0xa4, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xa6},
+	{value: 0x0024, lo: 0xa7, hi: 0xa8},
+	{value: 0x0034, lo: 0xaa, hi: 0xaa},
+	{value: 0x0024, lo: 0xab, hi: 0xac},
+	{value: 0x0034, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xbc},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x12, offset 0x80
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0034, lo: 0x91, hi: 0x91},
+	{value: 0x0010, lo: 0x92, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb0},
+	{value: 0x0034, lo: 0xb1, hi: 0xb1},
+	{value: 0x0024, lo: 0xb2, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0024, lo: 0xb5, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb9},
+	{value: 0x0024, lo: 0xba, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbc},
+	{value: 0x0024, lo: 0xbd, hi: 0xbd},
+	{value: 0x0034, lo: 0xbe, hi: 0xbe},
+	{value: 0x0024, lo: 0xbf, hi: 0xbf},
+	// Block 0x13, offset 0x8f
+	{value: 0x0024, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0024, lo: 0x83, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x84},
+	{value: 0x0024, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0024, lo: 0x87, hi: 0x87},
+	{value: 0x0034, lo: 0x88, hi: 0x88},
+	{value: 0x0024, lo: 0x89, hi: 0x8a},
+	{value: 0x0010, lo: 0x8d, hi: 0xbf},
+	// Block 0x14, offset 0x99
+	{value: 0x0010, lo: 0x80, hi: 0xa5},
+	{value: 0x0014, lo: 0xa6, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	// Block 0x15, offset 0x9c
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0024, lo: 0xab, hi: 0xb1},
+	{value: 0x0034, lo: 0xb2, hi: 0xb2},
+	{value: 0x0024, lo: 0xb3, hi: 0xb3},
+	{value: 0x0014, lo: 0xb4, hi: 0xb5},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0034, lo: 0xbd, hi: 0xbd},
+	// Block 0x16, offset 0xa3
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0024, lo: 0x96, hi: 0x99},
+	{value: 0x0014, lo: 0x9a, hi: 0x9a},
+	{value: 0x0024, lo: 0x9b, hi: 0xa3},
+	{value: 0x0014, lo: 0xa4, hi: 0xa4},
+	{value: 0x0024, lo: 0xa5, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa8},
+	{value: 0x0024, lo: 0xa9, hi: 0xad},
+	// Block 0x17, offset 0xab
+	{value: 0x0010, lo: 0x80, hi: 0x98},
+	{value: 0x0034, lo: 0x99, hi: 0x9b},
+	{value: 0x0010, lo: 0xa0, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x18, offset 0xaf
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0004, lo: 0x88, hi: 0x88},
+	{value: 0x0010, lo: 0x89, hi: 0x8f},
+	{value: 0x0014, lo: 0x90, hi: 0x91},
+	{value: 0x0024, lo: 0x97, hi: 0x98},
+	{value: 0x0034, lo: 0x99, hi: 0x9b},
+	{value: 0x0024, lo: 0x9c, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x19, offset 0xb7
+	{value: 0x0014, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xb9},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x1a, offset 0xbd
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x88},
+	{value: 0x0010, lo: 0x89, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0024, lo: 0x91, hi: 0x91},
+	{value: 0x0034, lo: 0x92, hi: 0x92},
+	{value: 0x0024, lo: 0x93, hi: 0x94},
+	{value: 0x0014, lo: 0x95, hi: 0x97},
+	{value: 0x0010, lo: 0x98, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0014, lo: 0xb1, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xbf},
+	// Block 0x1b, offset 0xcb
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb2},
+	{value: 0x0010, lo: 0xb6, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x1c, offset 0xd6
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x9c, hi: 0x9d},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xb1},
+	{value: 0x0010, lo: 0xbc, hi: 0xbc},
+	{value: 0x0024, lo: 0xbe, hi: 0xbe},
+	// Block 0x1d, offset 0xe3
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8a},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb6},
+	{value: 0x0010, lo: 0xb8, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x1e, offset 0xee
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0014, lo: 0x87, hi: 0x88},
+	{value: 0x0014, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0014, lo: 0x91, hi: 0x91},
+	{value: 0x0010, lo: 0x99, hi: 0x9c},
+	{value: 0x0010, lo: 0x9e, hi: 0x9e},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb5},
+	// Block 0x1f, offset 0xfa
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8d},
+	{value: 0x0010, lo: 0x8f, hi: 0x91},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x20, offset 0x104
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x85},
+	{value: 0x0014, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x89, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb9, hi: 0xb9},
+	{value: 0x0014, lo: 0xba, hi: 0xbf},
+	// Block 0x21, offset 0x110
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x22, offset 0x11b
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0014, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x9c, hi: 0x9d},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	// Block 0x23, offset 0x127
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8a},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0x95},
+	{value: 0x0010, lo: 0x99, hi: 0x9a},
+	{value: 0x0010, lo: 0x9c, hi: 0x9c},
+	{value: 0x0010, lo: 0x9e, hi: 0x9f},
+	{value: 0x0010, lo: 0xa3, hi: 0xa4},
+	{value: 0x0010, lo: 0xa8, hi: 0xaa},
+	{value: 0x0010, lo: 0xae, hi: 0xb9},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x24, offset 0x133
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x82},
+	{value: 0x0010, lo: 0x86, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	// Block 0x25, offset 0x13b
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x83},
+	{value: 0x0014, lo: 0x84, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbd},
+	{value: 0x0014, lo: 0xbe, hi: 0xbf},
+	// Block 0x26, offset 0x145
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x84},
+	{value: 0x0014, lo: 0x86, hi: 0x88},
+	{value: 0x0014, lo: 0x8a, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0034, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x9a},
+	{value: 0x0010, lo: 0x9c, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	// Block 0x27, offset 0x150
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x28, offset 0x15b
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0014, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x9c, hi: 0x9e},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb1, hi: 0xb3},
+	// Block 0x29, offset 0x167
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x2a, offset 0x16d
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x86, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x94, hi: 0x97},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa3},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xba, hi: 0xbf},
+	// Block 0x2b, offset 0x178
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x96},
+	{value: 0x0010, lo: 0x9a, hi: 0xb1},
+	{value: 0x0010, lo: 0xb3, hi: 0xbb},
+	{value: 0x0010, lo: 0xbd, hi: 0xbd},
+	// Block 0x2c, offset 0x17e
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0010, lo: 0x8f, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x94},
+	{value: 0x0014, lo: 0x96, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x9f},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	// Block 0x2d, offset 0x186
+	{value: 0x0014, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb4, hi: 0xb7},
+	{value: 0x0034, lo: 0xb8, hi: 0xba},
+	// Block 0x2e, offset 0x189
+	{value: 0x0004, lo: 0x86, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x87},
+	{value: 0x0034, lo: 0x88, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x2f, offset 0x18e
+	{value: 0x0014, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb4, hi: 0xb7},
+	{value: 0x0034, lo: 0xb8, hi: 0xba},
+	{value: 0x0014, lo: 0xbb, hi: 0xbc},
+	// Block 0x30, offset 0x192
+	{value: 0x0004, lo: 0x86, hi: 0x86},
+	{value: 0x0034, lo: 0x88, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x31, offset 0x196
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0034, lo: 0x98, hi: 0x99},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0034, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	{value: 0x0034, lo: 0xb9, hi: 0xb9},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x32, offset 0x19d
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0010, lo: 0x89, hi: 0xac},
+	{value: 0x0034, lo: 0xb1, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xba, hi: 0xbd},
+	{value: 0x0014, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x33, offset 0x1a6
+	{value: 0x0034, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0024, lo: 0x82, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x84},
+	{value: 0x0024, lo: 0x86, hi: 0x87},
+	{value: 0x0010, lo: 0x88, hi: 0x8c},
+	{value: 0x0014, lo: 0x8d, hi: 0x97},
+	{value: 0x0014, lo: 0x99, hi: 0xbc},
+	// Block 0x34, offset 0x1ae
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	// Block 0x35, offset 0x1af
+	{value: 0x0010, lo: 0xab, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	{value: 0x0010, lo: 0xb8, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbc},
+	{value: 0x0014, lo: 0xbd, hi: 0xbe},
+	// Block 0x36, offset 0x1b8
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x96, hi: 0x97},
+	{value: 0x0014, lo: 0x98, hi: 0x99},
+	{value: 0x0014, lo: 0x9e, hi: 0xa0},
+	{value: 0x0010, lo: 0xa2, hi: 0xa4},
+	{value: 0x0010, lo: 0xa7, hi: 0xad},
+	{value: 0x0014, lo: 0xb1, hi: 0xb4},
+	// Block 0x37, offset 0x1bf
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x8f, hi: 0x9c},
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x6c53, lo: 0xa0, hi: 0xbf},
+	// Block 0x38, offset 0x1c7
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x98},
+	{value: 0x0010, lo: 0x9a, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x39, offset 0x1cd
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb5},
+	{value: 0x0010, lo: 0xb8, hi: 0xbe},
+	// Block 0x3a, offset 0x1d2
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x82, hi: 0x85},
+	{value: 0x0010, lo: 0x88, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0xbf},
+	// Block 0x3b, offset 0x1d6
+	{value: 0x0010, lo: 0x80, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0x95},
+	{value: 0x0010, lo: 0x98, hi: 0xbf},
+	// Block 0x3c, offset 0x1d9
+	{value: 0x0010, lo: 0x80, hi: 0x9a},
+	{value: 0x0024, lo: 0x9d, hi: 0x9f},
+	// Block 0x3d, offset 0x1db
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	{value: 0x7453, lo: 0xa0, hi: 0xaf},
+	{value: 0x7853, lo: 0xb0, hi: 0xbf},
+	// Block 0x3e, offset 0x1de
+	{value: 0x7c53, lo: 0x80, hi: 0x8f},
+	{value: 0x8053, lo: 0x90, hi: 0x9f},
+	{value: 0x7c53, lo: 0xa0, hi: 0xaf},
+	{value: 0x0813, lo: 0xb0, hi: 0xb5},
+	{value: 0x0892, lo: 0xb8, hi: 0xbd},
+	// Block 0x3f, offset 0x1e3
+	{value: 0x0010, lo: 0x81, hi: 0xbf},
+	// Block 0x40, offset 0x1e4
+	{value: 0x0010, lo: 0x80, hi: 0xac},
+	{value: 0x0010, lo: 0xaf, hi: 0xbf},
+	// Block 0x41, offset 0x1e6
+	{value: 0x0010, lo: 0x81, hi: 0x9a},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x42, offset 0x1e8
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0010, lo: 0xae, hi: 0xb8},
+	// Block 0x43, offset 0x1ea
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x93},
+	{value: 0x0034, lo: 0x94, hi: 0x94},
+	{value: 0x0030, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0x9f, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb3},
+	{value: 0x0030, lo: 0xb4, hi: 0xb4},
+	// Block 0x44, offset 0x1f1
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x93},
+	{value: 0x0010, lo: 0xa0, hi: 0xac},
+	{value: 0x0010, lo: 0xae, hi: 0xb0},
+	{value: 0x0014, lo: 0xb2, hi: 0xb3},
+	// Block 0x45, offset 0x1f6
+	{value: 0x0014, lo: 0xb4, hi: 0xb5},
+	{value: 0x0010, lo: 0xb6, hi: 0xb6},
+	{value: 0x0014, lo: 0xb7, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x46, offset 0x1fa
+	{value: 0x0010, lo: 0x80, hi: 0x85},
+	{value: 0x0014, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0014, lo: 0x89, hi: 0x91},
+	{value: 0x0034, lo: 0x92, hi: 0x92},
+	{value: 0x0014, lo: 0x93, hi: 0x93},
+	{value: 0x0004, lo: 0x97, hi: 0x97},
+	{value: 0x0024, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	// Block 0x47, offset 0x203
+	{value: 0x0014, lo: 0x8b, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x48, offset 0x206
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0xb8},
+	// Block 0x49, offset 0x209
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0xa8},
+	{value: 0x0034, lo: 0xa9, hi: 0xa9},
+	{value: 0x0010, lo: 0xaa, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x4a, offset 0x20f
+	{value: 0x0010, lo: 0x80, hi: 0xb5},
+	// Block 0x4b, offset 0x210
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0014, lo: 0xa0, hi: 0xa2},
+	{value: 0x0010, lo: 0xa3, hi: 0xa6},
+	{value: 0x0014, lo: 0xa7, hi: 0xa8},
+	{value: 0x0010, lo: 0xa9, hi: 0xab},
+	{value: 0x0010, lo: 0xb0, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb2},
+	{value: 0x0010, lo: 0xb3, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xb9},
+	{value: 0x0024, lo: 0xba, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbb},
+	// Block 0x4c, offset 0x21b
+	{value: 0x0010, lo: 0x86, hi: 0x8f},
+	// Block 0x4d, offset 0x21c
+	{value: 0x0010, lo: 0x90, hi: 0x9a},
+	// Block 0x4e, offset 0x21d
+	{value: 0x0010, lo: 0x80, hi: 0x96},
+	{value: 0x0024, lo: 0x97, hi: 0x97},
+	{value: 0x0034, lo: 0x98, hi: 0x98},
+	{value: 0x0010, lo: 0x99, hi: 0x9a},
+	{value: 0x0014, lo: 0x9b, hi: 0x9b},
+	// Block 0x4f, offset 0x222
+	{value: 0x0010, lo: 0x95, hi: 0x95},
+	{value: 0x0014, lo: 0x96, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0014, lo: 0x98, hi: 0x9e},
+	{value: 0x0034, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa2},
+	{value: 0x0010, lo: 0xa3, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xac},
+	{value: 0x0010, lo: 0xad, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0024, lo: 0xb5, hi: 0xbc},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x50, offset 0x22f
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0004, lo: 0xa7, hi: 0xa7},
+	{value: 0x0024, lo: 0xb0, hi: 0xb4},
+	{value: 0x0034, lo: 0xb5, hi: 0xba},
+	{value: 0x0024, lo: 0xbb, hi: 0xbc},
+	{value: 0x0034, lo: 0xbd, hi: 0xbd},
+	{value: 0x0014, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x51, offset 0x238
+	{value: 0x0034, lo: 0x80, hi: 0x80},
+	{value: 0x0024, lo: 0x81, hi: 0x82},
+	{value: 0x0034, lo: 0x83, hi: 0x84},
+	{value: 0x0024, lo: 0x85, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0024, lo: 0x8b, hi: 0x9c},
+	{value: 0x0034, lo: 0x9d, hi: 0x9d},
+	{value: 0x0024, lo: 0xa0, hi: 0xa5},
+	{value: 0x0034, lo: 0xa6, hi: 0xa6},
+	{value: 0x0024, lo: 0xa7, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xab},
+	// Block 0x52, offset 0x243
+	{value: 0x0014, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x53, offset 0x24b
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x83},
+	{value: 0x0030, lo: 0x84, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0024, lo: 0xab, hi: 0xab},
+	{value: 0x0034, lo: 0xac, hi: 0xac},
+	{value: 0x0024, lo: 0xad, hi: 0xb3},
+	// Block 0x54, offset 0x254
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa5},
+	{value: 0x0010, lo: 0xa6, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa9},
+	{value: 0x0030, lo: 0xaa, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xab},
+	{value: 0x0014, lo: 0xac, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xbf},
+	// Block 0x55, offset 0x25d
+	{value: 0x0010, lo: 0x80, hi: 0xa5},
+	{value: 0x0034, lo: 0xa6, hi: 0xa6},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa9},
+	{value: 0x0010, lo: 0xaa, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xae},
+	{value: 0x0014, lo: 0xaf, hi: 0xb1},
+	{value: 0x0030, lo: 0xb2, hi: 0xb3},
+	// Block 0x56, offset 0x266
+	{value: 0x0010, lo: 0x80, hi: 0xab},
+	{value: 0x0014, lo: 0xac, hi: 0xb3},
+	{value: 0x0010, lo: 0xb4, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	// Block 0x57, offset 0x26b
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8d, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbd},
+	// Block 0x58, offset 0x26e
+	{value: 0x32ea, lo: 0x80, hi: 0x80},
+	{value: 0x336a, lo: 0x81, hi: 0x81},
+	{value: 0x33ea, lo: 0x82, hi: 0x82},
+	{value: 0x346a, lo: 0x83, hi: 0x83},
+	{value: 0x34ea, lo: 0x84, hi: 0x84},
+	{value: 0x356a, lo: 0x85, hi: 0x85},
+	{value: 0x35ea, lo: 0x86, hi: 0x86},
+	{value: 0x366a, lo: 0x87, hi: 0x87},
+	{value: 0x36ea, lo: 0x88, hi: 0x88},
+	{value: 0x0316, lo: 0x89, hi: 0x8a},
+	{value: 0x8353, lo: 0x90, hi: 0xba},
+	{value: 0x8353, lo: 0xbd, hi: 0xbf},
+	// Block 0x59, offset 0x27a
+	{value: 0x0024, lo: 0x90, hi: 0x92},
+	{value: 0x0034, lo: 0x94, hi: 0x99},
+	{value: 0x0024, lo: 0x9a, hi: 0x9b},
+	{value: 0x0034, lo: 0x9c, hi: 0x9f},
+	{value: 0x0024, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0034, lo: 0xa2, hi: 0xa8},
+	{value: 0x0010, lo: 0xa9, hi: 0xac},
+	{value: 0x0034, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xb3},
+	{value: 0x0024, lo: 0xb4, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb7},
+	{value: 0x0024, lo: 0xb8, hi: 0xb9},
+	{value: 0x0010, lo: 0xba, hi: 0xba},
+	// Block 0x5a, offset 0x288
+	{value: 0x0012, lo: 0x80, hi: 0xab},
+	{value: 0x0015, lo: 0xac, hi: 0xbf},
+	// Block 0x5b, offset 0x28a
+	{value: 0x0015, lo: 0x80, hi: 0xaa},
+	{value: 0x0012, lo: 0xab, hi: 0xb7},
+	{value: 0x0015, lo: 0xb8, hi: 0xb8},
+	{value: 0x8752, lo: 0xb9, hi: 0xb9},
+	{value: 0x0012, lo: 0xba, hi: 0xbc},
+	{value: 0x8b52, lo: 0xbd, hi: 0xbd},
+	{value: 0x0012, lo: 0xbe, hi: 0xbf},
+	// Block 0x5c, offset 0x291
+	{value: 0x0012, lo: 0x80, hi: 0x8d},
+	{value: 0x8f52, lo: 0x8e, hi: 0x8e},
+	{value: 0x0012, lo: 0x8f, hi: 0x9a},
+	{value: 0x0015, lo: 0x9b, hi: 0xbf},
+	// Block 0x5d, offset 0x295
+	{value: 0x0024, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0024, lo: 0x83, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0024, lo: 0x8b, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x90},
+	{value: 0x0024, lo: 0x91, hi: 0xb5},
+	{value: 0x0034, lo: 0xb6, hi: 0xba},
+	{value: 0x0024, lo: 0xbb, hi: 0xbb},
+	{value: 0x0034, lo: 0xbc, hi: 0xbd},
+	{value: 0x0024, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x5e, offset 0x2a1
+	{value: 0x0117, lo: 0x80, hi: 0xbf},
+	// Block 0x5f, offset 0x2a2
+	{value: 0x0117, lo: 0x80, hi: 0x95},
+	{value: 0x379a, lo: 0x96, hi: 0x96},
+	{value: 0x384a, lo: 0x97, hi: 0x97},
+	{value: 0x38fa, lo: 0x98, hi: 0x98},
+	{value: 0x39aa, lo: 0x99, hi: 0x99},
+	{value: 0x3a5a, lo: 0x9a, hi: 0x9a},
+	{value: 0x3b0a, lo: 0x9b, hi: 0x9b},
+	{value: 0x0012, lo: 0x9c, hi: 0x9d},
+	{value: 0x3bbb, lo: 0x9e, hi: 0x9e},
+	{value: 0x0012, lo: 0x9f, hi: 0x9f},
+	{value: 0x0117, lo: 0xa0, hi: 0xbf},
+	// Block 0x60, offset 0x2ad
+	{value: 0x0812, lo: 0x80, hi: 0x87},
+	{value: 0x0813, lo: 0x88, hi: 0x8f},
+	{value: 0x0812, lo: 0x90, hi: 0x95},
+	{value: 0x0813, lo: 0x98, hi: 0x9d},
+	{value: 0x0812, lo: 0xa0, hi: 0xa7},
+	{value: 0x0813, lo: 0xa8, hi: 0xaf},
+	{value: 0x0812, lo: 0xb0, hi: 0xb7},
+	{value: 0x0813, lo: 0xb8, hi: 0xbf},
+	// Block 0x61, offset 0x2b5
+	{value: 0x0004, lo: 0x8b, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8f},
+	{value: 0x0054, lo: 0x98, hi: 0x99},
+	{value: 0x0054, lo: 0xa4, hi: 0xa4},
+	{value: 0x0054, lo: 0xa7, hi: 0xa7},
+	{value: 0x0014, lo: 0xaa, hi: 0xae},
+	{value: 0x0010, lo: 0xaf, hi: 0xaf},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x62, offset 0x2bd
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x94, hi: 0x94},
+	{value: 0x0014, lo: 0xa0, hi: 0xa4},
+	{value: 0x0014, lo: 0xa6, hi: 0xaf},
+	{value: 0x0015, lo: 0xb1, hi: 0xb1},
+	{value: 0x0015, lo: 0xbf, hi: 0xbf},
+	// Block 0x63, offset 0x2c3
+	{value: 0x0015, lo: 0x90, hi: 0x9c},
+	// Block 0x64, offset 0x2c4
+	{value: 0x0024, lo: 0x90, hi: 0x91},
+	{value: 0x0034, lo: 0x92, hi: 0x93},
+	{value: 0x0024, lo: 0x94, hi: 0x97},
+	{value: 0x0034, lo: 0x98, hi: 0x9a},
+	{value: 0x0024, lo: 0x9b, hi: 0x9c},
+	{value: 0x0014, lo: 0x9d, hi: 0xa0},
+	{value: 0x0024, lo: 0xa1, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa4},
+	{value: 0x0034, lo: 0xa5, hi: 0xa6},
+	{value: 0x0024, lo: 0xa7, hi: 0xa7},
+	{value: 0x0034, lo: 0xa8, hi: 0xa8},
+	{value: 0x0024, lo: 0xa9, hi: 0xa9},
+	{value: 0x0034, lo: 0xaa, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb0},
+	// Block 0x65, offset 0x2d2
+	{value: 0x0016, lo: 0x85, hi: 0x86},
+	{value: 0x0012, lo: 0x87, hi: 0x89},
+	{value: 0xa452, lo: 0x8e, hi: 0x8e},
+	{value: 0x1013, lo: 0xa0, hi: 0xaf},
+	{value: 0x1012, lo: 0xb0, hi: 0xbf},
+	// Block 0x66, offset 0x2d7
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0716, lo: 0x83, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x88},
+	// Block 0x67, offset 0x2da
+	{value: 0xa753, lo: 0xb6, hi: 0xb7},
+	{value: 0xaa53, lo: 0xb8, hi: 0xb9},
+	{value: 0xad53, lo: 0xba, hi: 0xbb},
+	{value: 0xaa53, lo: 0xbc, hi: 0xbd},
+	{value: 0xa753, lo: 0xbe, hi: 0xbf},
+	// Block 0x68, offset 0x2df
+	{value: 0x3013, lo: 0x80, hi: 0x8f},
+	{value: 0x6553, lo: 0x90, hi: 0x9f},
+	{value: 0xb053, lo: 0xa0, hi: 0xaf},
+	{value: 0x3012, lo: 0xb0, hi: 0xbf},
+	// Block 0x69, offset 0x2e3
+	{value: 0x0117, lo: 0x80, hi: 0xa3},
+	{value: 0x0012, lo: 0xa4, hi: 0xa4},
+	{value: 0x0716, lo: 0xab, hi: 0xac},
+	{value: 0x0316, lo: 0xad, hi: 0xae},
+	{value: 0x0024, lo: 0xaf, hi: 0xb1},
+	{value: 0x0117, lo: 0xb2, hi: 0xb3},
+	// Block 0x6a, offset 0x2e9
+	{value: 0x6c52, lo: 0x80, hi: 0x9f},
+	{value: 0x7052, lo: 0xa0, hi: 0xa5},
+	{value: 0x7052, lo: 0xa7, hi: 0xa7},
+	{value: 0x7052, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x6b, offset 0x2ee
+	{value: 0x0010, lo: 0x80, hi: 0xa7},
+	{value: 0x0014, lo: 0xaf, hi: 0xaf},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0x6c, offset 0x2f1
+	{value: 0x0010, lo: 0x80, hi: 0x96},
+	{value: 0x0010, lo: 0xa0, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xae},
+	{value: 0x0010, lo: 0xb0, hi: 0xb6},
+	{value: 0x0010, lo: 0xb8, hi: 0xbe},
+	// Block 0x6d, offset 0x2f6
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x88, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0x9e},
+	{value: 0x0024, lo: 0xa0, hi: 0xbf},
+	// Block 0x6e, offset 0x2fb
+	{value: 0x0014, lo: 0xaf, hi: 0xaf},
+	// Block 0x6f, offset 0x2fc
+	{value: 0x0014, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0xaa, hi: 0xad},
+	{value: 0x0030, lo: 0xae, hi: 0xaf},
+	{value: 0x0004, lo: 0xb1, hi: 0xb5},
+	{value: 0x0014, lo: 0xbb, hi: 0xbb},
+	{value: 0x0010, lo: 0xbc, hi: 0xbc},
+	// Block 0x70, offset 0x302
+	{value: 0x0034, lo: 0x99, hi: 0x9a},
+	{value: 0x0004, lo: 0x9b, hi: 0x9e},
+	// Block 0x71, offset 0x304
+	{value: 0x0004, lo: 0xbc, hi: 0xbe},
+	// Block 0x72, offset 0x305
+	{value: 0x0010, lo: 0x85, hi: 0xaf},
+	{value: 0x0010, lo: 0xb1, hi: 0xbf},
+	// Block 0x73, offset 0x307
+	{value: 0x0010, lo: 0x80, hi: 0x8e},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x74, offset 0x309
+	{value: 0x0010, lo: 0x80, hi: 0x94},
+	{value: 0x0014, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0x96, hi: 0xbf},
+	// Block 0x75, offset 0x30c
+	{value: 0x0010, lo: 0x80, hi: 0x8c},
+	// Block 0x76, offset 0x30d
+	{value: 0x0010, lo: 0x90, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbd},
+	// Block 0x77, offset 0x30f
+	{value: 0x0010, lo: 0x80, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0010, lo: 0x90, hi: 0xab},
+	// Block 0x78, offset 0x312
+	{value: 0x0117, lo: 0x80, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xae},
+	{value: 0x0024, lo: 0xaf, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb2},
+	{value: 0x0024, lo: 0xb4, hi: 0xbd},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x79, offset 0x318
+	{value: 0x0117, lo: 0x80, hi: 0x9b},
+	{value: 0x0015, lo: 0x9c, hi: 0x9d},
+	{value: 0x0024, lo: 0x9e, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x7a, offset 0x31c
+	{value: 0x0010, lo: 0x80, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb1},
+	// Block 0x7b, offset 0x31e
+	{value: 0x0004, lo: 0x80, hi: 0x87},
+	{value: 0x0014, lo: 0x88, hi: 0xa1},
+	{value: 0x0117, lo: 0xa2, hi: 0xaf},
+	{value: 0x0012, lo: 0xb0, hi: 0xb1},
+	{value: 0x0117, lo: 0xb2, hi: 0xbf},
+	// Block 0x7c, offset 0x323
+	{value: 0x0117, lo: 0x80, hi: 0xaf},
+	{value: 0x0015, lo: 0xb0, hi: 0xb0},
+	{value: 0x0012, lo: 0xb1, hi: 0xb8},
+	{value: 0x0316, lo: 0xb9, hi: 0xba},
+	{value: 0x0716, lo: 0xbb, hi: 0xbc},
+	{value: 0x8753, lo: 0xbd, hi: 0xbd},
+	{value: 0x0117, lo: 0xbe, hi: 0xbf},
+	// Block 0x7d, offset 0x32a
+	{value: 0x0117, lo: 0x80, hi: 0x83},
+	{value: 0x6553, lo: 0x84, hi: 0x84},
+	{value: 0x918b, lo: 0x85, hi: 0x85},
+	{value: 0x8f53, lo: 0x86, hi: 0x86},
+	{value: 0x0f16, lo: 0x87, hi: 0x88},
+	{value: 0x0316, lo: 0x89, hi: 0x8a},
+	{value: 0x91eb, lo: 0x8b, hi: 0x8b},
+	{value: 0x0117, lo: 0x8c, hi: 0x9b},
+	{value: 0x924b, lo: 0x9c, hi: 0x9c},
+	{value: 0x0015, lo: 0xb1, hi: 0xb4},
+	{value: 0x0316, lo: 0xb5, hi: 0xb6},
+	{value: 0x0010, lo: 0xb7, hi: 0xb7},
+	{value: 0x0015, lo: 0xb8, hi: 0xb9},
+	{value: 0x0012, lo: 0xba, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbf},
+	// Block 0x7e, offset 0x339
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x8a},
+	{value: 0x0014, lo: 0x8b, hi: 0x8b},
+	{value: 0x0010, lo: 0x8c, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xa6},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0034, lo: 0xac, hi: 0xac},
+	// Block 0x7f, offset 0x343
+	{value: 0x0010, lo: 0x80, hi: 0xb3},
+	// Block 0x80, offset 0x344
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x85},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0024, lo: 0xa0, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xb7},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0010, lo: 0xbd, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x81, offset 0x34d
+	{value: 0x0010, lo: 0x80, hi: 0xa5},
+	{value: 0x0014, lo: 0xa6, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xad},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x82, offset 0x351
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x91},
+	{value: 0x0010, lo: 0x92, hi: 0x92},
+	{value: 0x0030, lo: 0x93, hi: 0x93},
+	{value: 0x0010, lo: 0xa0, hi: 0xbc},
+	// Block 0x83, offset 0x356
+	{value: 0x0014, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xb2},
+	{value: 0x0034, lo: 0xb3, hi: 0xb3},
+	{value: 0x0010, lo: 0xb4, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xb9},
+	{value: 0x0010, lo: 0xba, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0x84, offset 0x35e
+	{value: 0x0030, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0014, lo: 0xa5, hi: 0xa5},
+	{value: 0x0004, lo: 0xa6, hi: 0xa6},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x85, offset 0x364
+	{value: 0x0010, lo: 0x80, hi: 0xa8},
+	{value: 0x0014, lo: 0xa9, hi: 0xae},
+	{value: 0x0010, lo: 0xaf, hi: 0xb0},
+	{value: 0x0014, lo: 0xb1, hi: 0xb2},
+	{value: 0x0010, lo: 0xb3, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb6},
+	// Block 0x86, offset 0x36a
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0x8b},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0010, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0004, lo: 0xb0, hi: 0xb0},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbd},
+	// Block 0x87, offset 0x374
+	{value: 0x0024, lo: 0xb0, hi: 0xb0},
+	{value: 0x0024, lo: 0xb2, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0024, lo: 0xb7, hi: 0xb8},
+	{value: 0x0024, lo: 0xbe, hi: 0xbf},
+	// Block 0x88, offset 0x379
+	{value: 0x0024, lo: 0x81, hi: 0x81},
+	{value: 0x0004, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xab},
+	{value: 0x0014, lo: 0xac, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xaf},
+	{value: 0x0010, lo: 0xb2, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xb6, hi: 0xb6},
+	// Block 0x89, offset 0x382
+	{value: 0x0010, lo: 0x81, hi: 0x86},
+	{value: 0x0010, lo: 0x89, hi: 0x8e},
+	{value: 0x0010, lo: 0x91, hi: 0x96},
+	{value: 0x0010, lo: 0xa0, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xae},
+	{value: 0x0012, lo: 0xb0, hi: 0xbf},
+	// Block 0x8a, offset 0x388
+	{value: 0x0012, lo: 0x80, hi: 0x92},
+	{value: 0xb352, lo: 0x93, hi: 0x93},
+	{value: 0x0012, lo: 0x94, hi: 0x9a},
+	{value: 0x0014, lo: 0x9b, hi: 0x9b},
+	{value: 0x0015, lo: 0x9c, hi: 0x9f},
+	{value: 0x0012, lo: 0xa0, hi: 0xa8},
+	{value: 0x0015, lo: 0xa9, hi: 0xa9},
+	{value: 0x0004, lo: 0xaa, hi: 0xab},
+	{value: 0x74d2, lo: 0xb0, hi: 0xbf},
+	// Block 0x8b, offset 0x391
+	{value: 0x78d2, lo: 0x80, hi: 0x8f},
+	{value: 0x7cd2, lo: 0x90, hi: 0x9f},
+	{value: 0x80d2, lo: 0xa0, hi: 0xaf},
+	{value: 0x7cd2, lo: 0xb0, hi: 0xbf},
+	// Block 0x8c, offset 0x395
+	{value: 0x0010, lo: 0x80, hi: 0xa4},
+	{value: 0x0014, lo: 0xa5, hi: 0xa5},
+	{value: 0x0010, lo: 0xa6, hi: 0xa7},
+	{value: 0x0014, lo: 0xa8, hi: 0xa8},
+	{value: 0x0010, lo: 0xa9, hi: 0xaa},
+	{value: 0x0010, lo: 0xac, hi: 0xac},
+	{value: 0x0034, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x8d, offset 0x39d
+	{value: 0x0010, lo: 0x80, hi: 0xa3},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x8e, offset 0x39f
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x8b, hi: 0xbb},
+	// Block 0x8f, offset 0x3a1
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x83, hi: 0x84},
+	{value: 0x0010, lo: 0x86, hi: 0xbf},
+	// Block 0x90, offset 0x3a4
+	{value: 0x0010, lo: 0x80, hi: 0xb1},
+	{value: 0x0004, lo: 0xb2, hi: 0xbf},
+	// Block 0x91, offset 0x3a6
+	{value: 0x0004, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x93, hi: 0xbf},
+	// Block 0x92, offset 0x3a8
+	{value: 0x0010, lo: 0x80, hi: 0xbd},
+	// Block 0x93, offset 0x3a9
+	{value: 0x0010, lo: 0x90, hi: 0xbf},
+	// Block 0x94, offset 0x3aa
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	{value: 0x0010, lo: 0x92, hi: 0xbf},
+	// Block 0x95, offset 0x3ac
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0010, lo: 0xb0, hi: 0xbb},
+	// Block 0x96, offset 0x3ae
+	{value: 0x0014, lo: 0x80, hi: 0x8f},
+	{value: 0x0054, lo: 0x93, hi: 0x93},
+	{value: 0x0024, lo: 0xa0, hi: 0xa6},
+	{value: 0x0034, lo: 0xa7, hi: 0xad},
+	{value: 0x0024, lo: 0xae, hi: 0xaf},
+	{value: 0x0010, lo: 0xb3, hi: 0xb4},
+	// Block 0x97, offset 0x3b4
+	{value: 0x0010, lo: 0x8d, hi: 0x8f},
+	{value: 0x0054, lo: 0x92, hi: 0x92},
+	{value: 0x0054, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0xb0, hi: 0xb4},
+	{value: 0x0010, lo: 0xb6, hi: 0xbf},
+	// Block 0x98, offset 0x3b9
+	{value: 0x0010, lo: 0x80, hi: 0xbc},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x99, offset 0x3bb
+	{value: 0x0054, lo: 0x87, hi: 0x87},
+	{value: 0x0054, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0054, lo: 0x9a, hi: 0x9a},
+	{value: 0x5f53, lo: 0xa1, hi: 0xba},
+	{value: 0x0004, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x9a, offset 0x3c2
+	{value: 0x0004, lo: 0x80, hi: 0x80},
+	{value: 0x5f52, lo: 0x81, hi: 0x9a},
+	{value: 0x0004, lo: 0xb0, hi: 0xb0},
+	// Block 0x9b, offset 0x3c5
+	{value: 0x0014, lo: 0x9e, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xbe},
+	// Block 0x9c, offset 0x3c7
+	{value: 0x0010, lo: 0x82, hi: 0x87},
+	{value: 0x0010, lo: 0x8a, hi: 0x8f},
+	{value: 0x0010, lo: 0x92, hi: 0x97},
+	{value: 0x0010, lo: 0x9a, hi: 0x9c},
+	{value: 0x0004, lo: 0xa3, hi: 0xa3},
+	{value: 0x0014, lo: 0xb9, hi: 0xbb},
+	// Block 0x9d, offset 0x3cd
+	{value: 0x0010, lo: 0x80, hi: 0x8b},
+	{value: 0x0010, lo: 0x8d, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xba},
+	{value: 0x0010, lo: 0xbc, hi: 0xbd},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0x9e, offset 0x3d2
+	{value: 0x0010, lo: 0x80, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x9d},
+	// Block 0x9f, offset 0x3d4
+	{value: 0x0010, lo: 0x80, hi: 0xba},
+	// Block 0xa0, offset 0x3d5
+	{value: 0x0010, lo: 0x80, hi: 0xb4},
+	// Block 0xa1, offset 0x3d6
+	{value: 0x0034, lo: 0xbd, hi: 0xbd},
+	// Block 0xa2, offset 0x3d7
+	{value: 0x0010, lo: 0x80, hi: 0x9c},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0xa3, offset 0x3d9
+	{value: 0x0010, lo: 0x80, hi: 0x90},
+	{value: 0x0034, lo: 0xa0, hi: 0xa0},
+	// Block 0xa4, offset 0x3db
+	{value: 0x0010, lo: 0x80, hi: 0x9f},
+	{value: 0x0010, lo: 0xad, hi: 0xbf},
+	// Block 0xa5, offset 0x3dd
+	{value: 0x0010, lo: 0x80, hi: 0x8a},
+	{value: 0x0010, lo: 0x90, hi: 0xb5},
+	{value: 0x0024, lo: 0xb6, hi: 0xba},
+	// Block 0xa6, offset 0x3e0
+	{value: 0x0010, lo: 0x80, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0xa7, offset 0x3e2
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x88, hi: 0x8f},
+	{value: 0x0010, lo: 0x91, hi: 0x95},
+	// Block 0xa8, offset 0x3e5
+	{value: 0x2813, lo: 0x80, hi: 0x87},
+	{value: 0x3813, lo: 0x88, hi: 0x8f},
+	{value: 0x2813, lo: 0x90, hi: 0x97},
+	{value: 0xb653, lo: 0x98, hi: 0x9f},
+	{value: 0xb953, lo: 0xa0, hi: 0xa7},
+	{value: 0x2812, lo: 0xa8, hi: 0xaf},
+	{value: 0x3812, lo: 0xb0, hi: 0xb7},
+	{value: 0x2812, lo: 0xb8, hi: 0xbf},
+	// Block 0xa9, offset 0x3ed
+	{value: 0xb652, lo: 0x80, hi: 0x87},
+	{value: 0xb952, lo: 0x88, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0xbf},
+	// Block 0xaa, offset 0x3f0
+	{value: 0x0010, lo: 0x80, hi: 0x9d},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0xb953, lo: 0xb0, hi: 0xb7},
+	{value: 0xb653, lo: 0xb8, hi: 0xbf},
+	// Block 0xab, offset 0x3f4
+	{value: 0x2813, lo: 0x80, hi: 0x87},
+	{value: 0x3813, lo: 0x88, hi: 0x8f},
+	{value: 0x2813, lo: 0x90, hi: 0x93},
+	{value: 0xb952, lo: 0x98, hi: 0x9f},
+	{value: 0xb652, lo: 0xa0, hi: 0xa7},
+	{value: 0x2812, lo: 0xa8, hi: 0xaf},
+	{value: 0x3812, lo: 0xb0, hi: 0xb7},
+	{value: 0x2812, lo: 0xb8, hi: 0xbb},
+	// Block 0xac, offset 0x3fc
+	{value: 0x0010, lo: 0x80, hi: 0xa7},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xad, offset 0x3fe
+	{value: 0x0010, lo: 0x80, hi: 0xa3},
+	{value: 0xbc53, lo: 0xb0, hi: 0xb0},
+	{value: 0xbf53, lo: 0xb1, hi: 0xb1},
+	{value: 0xc253, lo: 0xb2, hi: 0xb2},
+	{value: 0xbf53, lo: 0xb3, hi: 0xb3},
+	{value: 0xc553, lo: 0xb4, hi: 0xb4},
+	{value: 0xbf53, lo: 0xb5, hi: 0xb5},
+	{value: 0xc253, lo: 0xb6, hi: 0xb6},
+	{value: 0xbf53, lo: 0xb7, hi: 0xb7},
+	{value: 0xbc53, lo: 0xb8, hi: 0xb8},
+	{value: 0xc853, lo: 0xb9, hi: 0xb9},
+	{value: 0xcb53, lo: 0xba, hi: 0xba},
+	{value: 0xce53, lo: 0xbc, hi: 0xbc},
+	{value: 0xc853, lo: 0xbd, hi: 0xbd},
+	{value: 0xcb53, lo: 0xbe, hi: 0xbe},
+	{value: 0xc853, lo: 0xbf, hi: 0xbf},
+	// Block 0xae, offset 0x40e
+	{value: 0x0010, lo: 0x80, hi: 0xb6},
+	// Block 0xaf, offset 0x40f
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xa7},
+	// Block 0xb0, offset 0x411
+	{value: 0x0015, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x82},
+	{value: 0x0015, lo: 0x83, hi: 0x85},
+	{value: 0x0015, lo: 0x87, hi: 0xb0},
+	{value: 0x0015, lo: 0xb2, hi: 0xba},
+	// Block 0xb1, offset 0x416
+	{value: 0x0010, lo: 0x80, hi: 0x85},
+	{value: 0x0010, lo: 0x88, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0xb5},
+	{value: 0x0010, lo: 0xb7, hi: 0xb8},
+	{value: 0x0010, lo: 0xbc, hi: 0xbc},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xb2, offset 0x41c
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xb6},
+	// Block 0xb3, offset 0x41e
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	// Block 0xb4, offset 0x41f
+	{value: 0x0010, lo: 0xa0, hi: 0xb2},
+	{value: 0x0010, lo: 0xb4, hi: 0xb5},
+	// Block 0xb5, offset 0x421
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xb9},
+	// Block 0xb6, offset 0x423
+	{value: 0x0010, lo: 0x80, hi: 0x99},
+	// Block 0xb7, offset 0x424
+	{value: 0x0010, lo: 0x80, hi: 0xb7},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0xb8, offset 0x426
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x83},
+	{value: 0x0014, lo: 0x85, hi: 0x86},
+	{value: 0x0014, lo: 0x8c, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x8d},
+	{value: 0x0014, lo: 0x8e, hi: 0x8e},
+	{value: 0x0024, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x93},
+	{value: 0x0010, lo: 0x95, hi: 0x97},
+	{value: 0x0010, lo: 0x99, hi: 0xb5},
+	{value: 0x0024, lo: 0xb8, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xb9, offset 0x433
+	{value: 0x0010, lo: 0xa0, hi: 0xbc},
+	// Block 0xba, offset 0x434
+	{value: 0x0010, lo: 0x80, hi: 0x9c},
+	// Block 0xbb, offset 0x435
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0010, lo: 0x89, hi: 0xa4},
+	{value: 0x0024, lo: 0xa5, hi: 0xa5},
+	{value: 0x0034, lo: 0xa6, hi: 0xa6},
+	// Block 0xbc, offset 0x439
+	{value: 0x0010, lo: 0x80, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xb2},
+	// Block 0xbd, offset 0x43b
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	// Block 0xbe, offset 0x43c
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	// Block 0xbf, offset 0x43d
+	{value: 0x5653, lo: 0x80, hi: 0xb2},
+	// Block 0xc0, offset 0x43e
+	{value: 0x5652, lo: 0x80, hi: 0xb2},
+	// Block 0xc1, offset 0x43f
+	{value: 0x0010, lo: 0x80, hi: 0xa3},
+	{value: 0x0024, lo: 0xa4, hi: 0xa7},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xc2, offset 0x442
+	{value: 0x0010, lo: 0x80, hi: 0x8d},
+	{value: 0x0014, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x8f, hi: 0x8f},
+	{value: 0x2013, lo: 0x90, hi: 0x9f},
+	{value: 0xd153, lo: 0xa0, hi: 0xa5},
+	{value: 0x0024, lo: 0xa9, hi: 0xad},
+	{value: 0x0014, lo: 0xaf, hi: 0xaf},
+	{value: 0x2012, lo: 0xb0, hi: 0xbf},
+	// Block 0xc3, offset 0x44a
+	{value: 0xd152, lo: 0x80, hi: 0x85},
+	// Block 0xc4, offset 0x44b
+	{value: 0x0010, lo: 0x80, hi: 0xa9},
+	{value: 0x0024, lo: 0xab, hi: 0xac},
+	{value: 0x0010, lo: 0xb0, hi: 0xb1},
+	// Block 0xc5, offset 0x44e
+	{value: 0x0010, lo: 0x82, hi: 0x84},
+	{value: 0x0014, lo: 0x85, hi: 0x85},
+	{value: 0x0010, lo: 0x86, hi: 0x87},
+	{value: 0x0034, lo: 0xba, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbc},
+	{value: 0x0034, lo: 0xbd, hi: 0xbf},
+	// Block 0xc6, offset 0x454
+	{value: 0x0010, lo: 0x80, hi: 0x9c},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xc7, offset 0x457
+	{value: 0x0010, lo: 0x80, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x87},
+	{value: 0x0024, lo: 0x88, hi: 0x8a},
+	{value: 0x0034, lo: 0x8b, hi: 0x8b},
+	{value: 0x0024, lo: 0x8c, hi: 0x8c},
+	{value: 0x0034, lo: 0x8d, hi: 0x90},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xc8, offset 0x45e
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0024, lo: 0x82, hi: 0x82},
+	{value: 0x0034, lo: 0x83, hi: 0x83},
+	{value: 0x0024, lo: 0x84, hi: 0x84},
+	{value: 0x0034, lo: 0x85, hi: 0x85},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xc9, offset 0x464
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0010, lo: 0xa0, hi: 0xb6},
+	// Block 0xca, offset 0x466
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbf},
+	// Block 0xcb, offset 0x46a
+	{value: 0x0014, lo: 0x80, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0xa6, hi: 0xaf},
+	{value: 0x0034, lo: 0xb0, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xcc, offset 0x472
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb6},
+	{value: 0x0010, lo: 0xb7, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	{value: 0x0014, lo: 0xbd, hi: 0xbd},
+	// Block 0xcd, offset 0x478
+	{value: 0x0014, lo: 0x82, hi: 0x82},
+	{value: 0x0014, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0xa8},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xce, offset 0x47c
+	{value: 0x0024, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xa6},
+	{value: 0x0014, lo: 0xa7, hi: 0xab},
+	{value: 0x0010, lo: 0xac, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xb2},
+	{value: 0x0034, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb6, hi: 0xbf},
+	// Block 0xcf, offset 0x483
+	{value: 0x0010, lo: 0x84, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0xb2},
+	{value: 0x0034, lo: 0xb3, hi: 0xb3},
+	{value: 0x0010, lo: 0xb6, hi: 0xb6},
+	// Block 0xd0, offset 0x487
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xd1, offset 0x48b
+	{value: 0x0030, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x84},
+	{value: 0x0014, lo: 0x89, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0014, lo: 0x8b, hi: 0x8c},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0x9a},
+	{value: 0x0010, lo: 0x9c, hi: 0x9c},
+	// Block 0xd2, offset 0x494
+	{value: 0x0010, lo: 0x80, hi: 0x91},
+	{value: 0x0010, lo: 0x93, hi: 0xae},
+	{value: 0x0014, lo: 0xaf, hi: 0xb1},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0014, lo: 0xb4, hi: 0xb4},
+	{value: 0x0030, lo: 0xb5, hi: 0xb5},
+	{value: 0x0034, lo: 0xb6, hi: 0xb6},
+	{value: 0x0014, lo: 0xb7, hi: 0xb7},
+	{value: 0x0014, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xd3, offset 0x49e
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	// Block 0xd4, offset 0x4a0
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x88, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0x8d},
+	{value: 0x0010, lo: 0x8f, hi: 0x9d},
+	{value: 0x0010, lo: 0x9f, hi: 0xa8},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xd5, offset 0x4a6
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0014, lo: 0x9f, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa2},
+	{value: 0x0014, lo: 0xa3, hi: 0xa8},
+	{value: 0x0034, lo: 0xa9, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xd6, offset 0x4ac
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x8c},
+	{value: 0x0010, lo: 0x8f, hi: 0x90},
+	{value: 0x0010, lo: 0x93, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb5, hi: 0xb9},
+	{value: 0x0034, lo: 0xbb, hi: 0xbc},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0xd7, offset 0x4b6
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x84},
+	{value: 0x0010, lo: 0x87, hi: 0x88},
+	{value: 0x0010, lo: 0x8b, hi: 0x8c},
+	{value: 0x0030, lo: 0x8d, hi: 0x8d},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x9d, hi: 0xa3},
+	{value: 0x0024, lo: 0xa6, hi: 0xac},
+	{value: 0x0024, lo: 0xb0, hi: 0xb4},
+	// Block 0xd8, offset 0x4c0
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0x8b},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	{value: 0x0010, lo: 0x90, hi: 0xb5},
+	{value: 0x0010, lo: 0xb7, hi: 0xba},
+	{value: 0x0014, lo: 0xbb, hi: 0xbf},
+	// Block 0xd9, offset 0x4c6
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x85, hi: 0x85},
+	{value: 0x0010, lo: 0x87, hi: 0x8a},
+	{value: 0x0010, lo: 0x8c, hi: 0x8d},
+	{value: 0x0034, lo: 0x8e, hi: 0x8e},
+	{value: 0x0030, lo: 0x8f, hi: 0x8f},
+	{value: 0x0034, lo: 0x90, hi: 0x90},
+	{value: 0x0010, lo: 0x91, hi: 0x91},
+	{value: 0x0014, lo: 0x92, hi: 0x92},
+	{value: 0x0010, lo: 0x93, hi: 0x93},
+	{value: 0x0014, lo: 0xa1, hi: 0xa2},
+	// Block 0xda, offset 0x4d2
+	{value: 0x0010, lo: 0x80, hi: 0xb7},
+	{value: 0x0014, lo: 0xb8, hi: 0xbf},
+	// Block 0xdb, offset 0x4d4
+	{value: 0x0010, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x84},
+	{value: 0x0010, lo: 0x85, hi: 0x85},
+	{value: 0x0034, lo: 0x86, hi: 0x86},
+	{value: 0x0010, lo: 0x87, hi: 0x8a},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0024, lo: 0x9e, hi: 0x9e},
+	{value: 0x0010, lo: 0x9f, hi: 0xa1},
+	// Block 0xdc, offset 0x4dd
+	{value: 0x0010, lo: 0x80, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb8},
+	{value: 0x0010, lo: 0xb9, hi: 0xb9},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0xdd, offset 0x4e3
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x83},
+	{value: 0x0010, lo: 0x84, hi: 0x85},
+	{value: 0x0010, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xde, offset 0x4e9
+	{value: 0x0010, lo: 0x80, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb5},
+	{value: 0x0010, lo: 0xb8, hi: 0xbb},
+	{value: 0x0014, lo: 0xbc, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xdf, offset 0x4ef
+	{value: 0x0034, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x98, hi: 0x9b},
+	{value: 0x0014, lo: 0x9c, hi: 0x9d},
+	// Block 0xe0, offset 0x4f2
+	{value: 0x0010, lo: 0x80, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xba},
+	{value: 0x0010, lo: 0xbb, hi: 0xbc},
+	{value: 0x0014, lo: 0xbd, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xe1, offset 0x4f8
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x84, hi: 0x84},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xe2, offset 0x4fb
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0014, lo: 0xab, hi: 0xab},
+	{value: 0x0010, lo: 0xac, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xad},
+	{value: 0x0010, lo: 0xae, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb5},
+	{value: 0x0030, lo: 0xb6, hi: 0xb6},
+	{value: 0x0034, lo: 0xb7, hi: 0xb7},
+	{value: 0x0010, lo: 0xb8, hi: 0xb8},
+	// Block 0xe3, offset 0x504
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x90, hi: 0xa3},
+	// Block 0xe4, offset 0x506
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0x9e, hi: 0x9e},
+	{value: 0x0014, lo: 0x9f, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa5},
+	{value: 0x0010, lo: 0xa6, hi: 0xa6},
+	{value: 0x0014, lo: 0xa7, hi: 0xaa},
+	{value: 0x0034, lo: 0xab, hi: 0xab},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xe5, offset 0x50f
+	{value: 0x0010, lo: 0x80, hi: 0xae},
+	{value: 0x0014, lo: 0xaf, hi: 0xb7},
+	{value: 0x0010, lo: 0xb8, hi: 0xb8},
+	{value: 0x0034, lo: 0xb9, hi: 0xba},
+	// Block 0xe6, offset 0x513
+	{value: 0x5f53, lo: 0xa0, hi: 0xbf},
+	// Block 0xe7, offset 0x514
+	{value: 0x5f52, lo: 0x80, hi: 0x9f},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xe8, offset 0x517
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x89, hi: 0x89},
+	{value: 0x0010, lo: 0x8c, hi: 0x93},
+	{value: 0x0010, lo: 0x95, hi: 0x96},
+	{value: 0x0010, lo: 0x98, hi: 0xb5},
+	{value: 0x0010, lo: 0xb7, hi: 0xb8},
+	{value: 0x0014, lo: 0xbb, hi: 0xbc},
+	{value: 0x0030, lo: 0xbd, hi: 0xbd},
+	{value: 0x0034, lo: 0xbe, hi: 0xbe},
+	{value: 0x0010, lo: 0xbf, hi: 0xbf},
+	// Block 0xe9, offset 0x521
+	{value: 0x0010, lo: 0x80, hi: 0x82},
+	{value: 0x0034, lo: 0x83, hi: 0x83},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0xea, offset 0x524
+	{value: 0x0010, lo: 0xa0, hi: 0xa7},
+	{value: 0x0010, lo: 0xaa, hi: 0xbf},
+	// Block 0xeb, offset 0x526
+	{value: 0x0010, lo: 0x80, hi: 0x93},
+	{value: 0x0014, lo: 0x94, hi: 0x97},
+	{value: 0x0014, lo: 0x9a, hi: 0x9b},
+	{value: 0x0010, lo: 0x9c, hi: 0x9f},
+	{value: 0x0034, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0010, lo: 0xa3, hi: 0xa4},
+	// Block 0xec, offset 0x52d
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0014, lo: 0x81, hi: 0x8a},
+	{value: 0x0010, lo: 0x8b, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb3},
+	{value: 0x0034, lo: 0xb4, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb8},
+	{value: 0x0010, lo: 0xb9, hi: 0xba},
+	{value: 0x0014, lo: 0xbb, hi: 0xbe},
+	// Block 0xed, offset 0x535
+	{value: 0x0034, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0x90},
+	{value: 0x0014, lo: 0x91, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x98},
+	{value: 0x0014, lo: 0x99, hi: 0x9b},
+	{value: 0x0010, lo: 0x9c, hi: 0xbf},
+	// Block 0xee, offset 0x53b
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0014, lo: 0x8a, hi: 0x96},
+	{value: 0x0010, lo: 0x97, hi: 0x97},
+	{value: 0x0014, lo: 0x98, hi: 0x98},
+	{value: 0x0034, lo: 0x99, hi: 0x99},
+	{value: 0x0010, lo: 0x9d, hi: 0x9d},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xef, offset 0x542
+	{value: 0x0010, lo: 0x80, hi: 0xb8},
+	// Block 0xf0, offset 0x543
+	{value: 0x0014, lo: 0xa0, hi: 0xa0},
+	{value: 0x0010, lo: 0xa1, hi: 0xa1},
+	{value: 0x0014, lo: 0xa2, hi: 0xa4},
+	{value: 0x0010, lo: 0xa5, hi: 0xa5},
+	{value: 0x0014, lo: 0xa6, hi: 0xa6},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	// Block 0xf1, offset 0x549
+	{value: 0x0010, lo: 0x80, hi: 0xa0},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0xf2, offset 0x54b
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x8a, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xb6},
+	{value: 0x0014, lo: 0xb8, hi: 0xbd},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0034, lo: 0xbf, hi: 0xbf},
+	// Block 0xf3, offset 0x551
+	{value: 0x0010, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xb2, hi: 0xbf},
+	// Block 0xf4, offset 0x554
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	{value: 0x0014, lo: 0x92, hi: 0xa7},
+	{value: 0x0010, lo: 0xa9, hi: 0xa9},
+	{value: 0x0014, lo: 0xaa, hi: 0xb0},
+	{value: 0x0010, lo: 0xb1, hi: 0xb1},
+	{value: 0x0014, lo: 0xb2, hi: 0xb3},
+	{value: 0x0010, lo: 0xb4, hi: 0xb4},
+	{value: 0x0014, lo: 0xb5, hi: 0xb6},
+	// Block 0xf5, offset 0x55c
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	{value: 0x0010, lo: 0x88, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0xb0},
+	{value: 0x0014, lo: 0xb1, hi: 0xb6},
+	{value: 0x0014, lo: 0xba, hi: 0xba},
+	{value: 0x0014, lo: 0xbc, hi: 0xbd},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0xf6, offset 0x563
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0014, lo: 0x83, hi: 0x83},
+	{value: 0x0034, lo: 0x84, hi: 0x85},
+	{value: 0x0010, lo: 0x86, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x87},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xa0, hi: 0xa5},
+	{value: 0x0010, lo: 0xa7, hi: 0xa8},
+	{value: 0x0010, lo: 0xaa, hi: 0xbf},
+	// Block 0xf7, offset 0x56d
+	{value: 0x0010, lo: 0x80, hi: 0x8e},
+	{value: 0x0014, lo: 0x90, hi: 0x91},
+	{value: 0x0010, lo: 0x93, hi: 0x94},
+	{value: 0x0014, lo: 0x95, hi: 0x95},
+	{value: 0x0010, lo: 0x96, hi: 0x96},
+	{value: 0x0034, lo: 0x97, hi: 0x97},
+	{value: 0x0010, lo: 0x98, hi: 0x98},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0xf8, offset 0x576
+	{value: 0x0010, lo: 0x80, hi: 0x98},
+	{value: 0x0014, lo: 0x99, hi: 0x99},
+	{value: 0x0010, lo: 0x9a, hi: 0x9b},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	// Block 0xf9, offset 0x57a
+	{value: 0x0010, lo: 0xa0, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xb4},
+	{value: 0x0010, lo: 0xb5, hi: 0xb6},
+	// Block 0xfa, offset 0x57d
+	{value: 0x0014, lo: 0x80, hi: 0x81},
+	{value: 0x0010, lo: 0x82, hi: 0x90},
+	{value: 0x0010, lo: 0x92, hi: 0xb5},
+	{value: 0x0014, lo: 0xb6, hi: 0xba},
+	{value: 0x0010, lo: 0xbe, hi: 0xbf},
+	// Block 0xfb, offset 0x582
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0030, lo: 0x81, hi: 0x81},
+	{value: 0x0034, lo: 0x82, hi: 0x82},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0014, lo: 0x9a, hi: 0x9a},
+	// Block 0xfc, offset 0x587
+	{value: 0x0010, lo: 0xb0, hi: 0xb0},
+	// Block 0xfd, offset 0x588
+	{value: 0x0010, lo: 0x80, hi: 0xae},
+	// Block 0xfe, offset 0x589
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	// Block 0xff, offset 0x58a
+	{value: 0x0010, lo: 0x80, hi: 0xb0},
+	// Block 0x100, offset 0x58b
+	{value: 0x0010, lo: 0x80, hi: 0xaf},
+	{value: 0x0014, lo: 0xb0, hi: 0xbf},
+	// Block 0x101, offset 0x58d
+	{value: 0x0014, lo: 0x80, hi: 0x80},
+	{value: 0x0010, lo: 0x81, hi: 0x86},
+	{value: 0x0014, lo: 0x87, hi: 0x95},
+	{value: 0x0010, lo: 0xa0, hi: 0xbf},
+	// Block 0x102, offset 0x591
+	{value: 0x0010, lo: 0x80, hi: 0x86},
+	// Block 0x103, offset 0x592
+	{value: 0x0010, lo: 0x80, hi: 0x9d},
+	{value: 0x0014, lo: 0x9e, hi: 0xa9},
+	{value: 0x0010, lo: 0xaa, hi: 0xac},
+	{value: 0x0014, lo: 0xad, hi: 0xae},
+	{value: 0x0034, lo: 0xaf, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x104, offset 0x598
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0010, lo: 0xa0, hi: 0xa9},
+	{value: 0x0010, lo: 0xb0, hi: 0xbf},
+	// Block 0x105, offset 0x59b
+	{value: 0x0010, lo: 0x80, hi: 0xbe},
+	// Block 0x106, offset 0x59c
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x90, hi: 0xad},
+	{value: 0x0034, lo: 0xb0, hi: 0xb4},
+	// Block 0x107, offset 0x59f
+	{value: 0x0010, lo: 0x80, hi: 0xaf},
+	{value: 0x0024, lo: 0xb0, hi: 0xb6},
+	// Block 0x108, offset 0x5a1
+	{value: 0x0014, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0010, lo: 0xa3, hi: 0xb7},
+	{value: 0x0010, lo: 0xbd, hi: 0xbf},
+	// Block 0x109, offset 0x5a5
+	{value: 0x0010, lo: 0x80, hi: 0x8f},
+	// Block 0x10a, offset 0x5a6
+	{value: 0x0014, lo: 0x80, hi: 0x82},
+	{value: 0x0010, lo: 0x83, hi: 0xaa},
+	{value: 0x0014, lo: 0xab, hi: 0xac},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x10b, offset 0x5aa
+	{value: 0x2013, lo: 0x80, hi: 0x9f},
+	{value: 0x2012, lo: 0xa0, hi: 0xbf},
+	// Block 0x10c, offset 0x5ac
+	{value: 0x0010, lo: 0x80, hi: 0x8a},
+	{value: 0x0014, lo: 0x8f, hi: 0x8f},
+	{value: 0x0010, lo: 0x90, hi: 0xbf},
+	// Block 0x10d, offset 0x5af
+	{value: 0x0010, lo: 0x80, hi: 0x87},
+	{value: 0x0014, lo: 0x8f, hi: 0x9f},
+	// Block 0x10e, offset 0x5b1
+	{value: 0x0014, lo: 0xa0, hi: 0xa1},
+	{value: 0x0014, lo: 0xa3, hi: 0xa4},
+	{value: 0x0030, lo: 0xb0, hi: 0xb1},
+	{value: 0x0004, lo: 0xb2, hi: 0xb3},
+	// Block 0x10f, offset 0x5b5
+	{value: 0x0004, lo: 0xb0, hi: 0xb3},
+	{value: 0x0004, lo: 0xb5, hi: 0xbb},
+	{value: 0x0004, lo: 0xbd, hi: 0xbe},
+	// Block 0x110, offset 0x5b8
+	{value: 0x0010, lo: 0x80, hi: 0xaa},
+	{value: 0x0010, lo: 0xb0, hi: 0xbc},
+	// Block 0x111, offset 0x5ba
+	{value: 0x0010, lo: 0x80, hi: 0x88},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	{value: 0x0014, lo: 0x9d, hi: 0x9d},
+	{value: 0x0034, lo: 0x9e, hi: 0x9e},
+	{value: 0x0014, lo: 0xa0, hi: 0xa3},
+	// Block 0x112, offset 0x5bf
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x113, offset 0x5c0
+	{value: 0x0014, lo: 0x80, hi: 0xad},
+	{value: 0x0014, lo: 0xb0, hi: 0xbf},
+	// Block 0x114, offset 0x5c2
+	{value: 0x0014, lo: 0x80, hi: 0x86},
+	// Block 0x115, offset 0x5c3
+	{value: 0x0030, lo: 0xa5, hi: 0xa6},
+	{value: 0x0034, lo: 0xa7, hi: 0xa9},
+	{value: 0x0030, lo: 0xad, hi: 0xb2},
+	{value: 0x0014, lo: 0xb3, hi: 0xba},
+	{value: 0x0034, lo: 0xbb, hi: 0xbf},
+	// Block 0x116, offset 0x5c8
+	{value: 0x0034, lo: 0x80, hi: 0x82},
+	{value: 0x0024, lo: 0x85, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8b},
+	{value: 0x0024, lo: 0xaa, hi: 0xad},
+	// Block 0x117, offset 0x5cc
+	{value: 0x0024, lo: 0x82, hi: 0x84},
+	// Block 0x118, offset 0x5cd
+	{value: 0x0013, lo: 0x80, hi: 0x99},
+	{value: 0x0012, lo: 0x9a, hi: 0xb3},
+	{value: 0x0013, lo: 0xb4, hi: 0xbf},
+	// Block 0x119, offset 0x5d0
+	{value: 0x0013, lo: 0x80, hi: 0x8d},
+	{value: 0x0012, lo: 0x8e, hi: 0x94},
+	{value: 0x0012, lo: 0x96, hi: 0xa7},
+	{value: 0x0013, lo: 0xa8, hi: 0xbf},
+	// Block 0x11a, offset 0x5d4
+	{value: 0x0013, lo: 0x80, hi: 0x81},
+	{value: 0x0012, lo: 0x82, hi: 0x9b},
+	{value: 0x0013, lo: 0x9c, hi: 0x9c},
+	{value: 0x0013, lo: 0x9e, hi: 0x9f},
+	{value: 0x0013, lo: 0xa2, hi: 0xa2},
+	{value: 0x0013, lo: 0xa5, hi: 0xa6},
+	{value: 0x0013, lo: 0xa9, hi: 0xac},
+	{value: 0x0013, lo: 0xae, hi: 0xb5},
+	{value: 0x0012, lo: 0xb6, hi: 0xb9},
+	{value: 0x0012, lo: 0xbb, hi: 0xbb},
+	{value: 0x0012, lo: 0xbd, hi: 0xbf},
+	// Block 0x11b, offset 0x5df
+	{value: 0x0012, lo: 0x80, hi: 0x83},
+	{value: 0x0012, lo: 0x85, hi: 0x8f},
+	{value: 0x0013, lo: 0x90, hi: 0xa9},
+	{value: 0x0012, lo: 0xaa, hi: 0xbf},
+	// Block 0x11c, offset 0x5e3
+	{value: 0x0012, lo: 0x80, hi: 0x83},
+	{value: 0x0013, lo: 0x84, hi: 0x85},
+	{value: 0x0013, lo: 0x87, hi: 0x8a},
+	{value: 0x0013, lo: 0x8d, hi: 0x94},
+	{value: 0x0013, lo: 0x96, hi: 0x9c},
+	{value: 0x0012, lo: 0x9e, hi: 0xb7},
+	{value: 0x0013, lo: 0xb8, hi: 0xb9},
+	{value: 0x0013, lo: 0xbb, hi: 0xbe},
+	// Block 0x11d, offset 0x5eb
+	{value: 0x0013, lo: 0x80, hi: 0x84},
+	{value: 0x0013, lo: 0x86, hi: 0x86},
+	{value: 0x0013, lo: 0x8a, hi: 0x90},
+	{value: 0x0012, lo: 0x92, hi: 0xab},
+	{value: 0x0013, lo: 0xac, hi: 0xbf},
+	// Block 0x11e, offset 0x5f0
+	{value: 0x0013, lo: 0x80, hi: 0x85},
+	{value: 0x0012, lo: 0x86, hi: 0x9f},
+	{value: 0x0013, lo: 0xa0, hi: 0xb9},
+	{value: 0x0012, lo: 0xba, hi: 0xbf},
+	// Block 0x11f, offset 0x5f4
+	{value: 0x0012, lo: 0x80, hi: 0x93},
+	{value: 0x0013, lo: 0x94, hi: 0xad},
+	{value: 0x0012, lo: 0xae, hi: 0xbf},
+	// Block 0x120, offset 0x5f7
+	{value: 0x0012, lo: 0x80, hi: 0x87},
+	{value: 0x0013, lo: 0x88, hi: 0xa1},
+	{value: 0x0012, lo: 0xa2, hi: 0xbb},
+	{value: 0x0013, lo: 0xbc, hi: 0xbf},
+	// Block 0x121, offset 0x5fb
+	{value: 0x0013, lo: 0x80, hi: 0x95},
+	{value: 0x0012, lo: 0x96, hi: 0xaf},
+	{value: 0x0013, lo: 0xb0, hi: 0xbf},
+	// Block 0x122, offset 0x5fe
+	{value: 0x0013, lo: 0x80, hi: 0x89},
+	{value: 0x0012, lo: 0x8a, hi: 0xa5},
+	{value: 0x0013, lo: 0xa8, hi: 0xbf},
+	// Block 0x123, offset 0x601
+	{value: 0x0013, lo: 0x80, hi: 0x80},
+	{value: 0x0012, lo: 0x82, hi: 0x9a},
+	{value: 0x0012, lo: 0x9c, hi: 0xa1},
+	{value: 0x0013, lo: 0xa2, hi: 0xba},
+	{value: 0x0012, lo: 0xbc, hi: 0xbf},
+	// Block 0x124, offset 0x606
+	{value: 0x0012, lo: 0x80, hi: 0x94},
+	{value: 0x0012, lo: 0x96, hi: 0x9b},
+	{value: 0x0013, lo: 0x9c, hi: 0xb4},
+	{value: 0x0012, lo: 0xb6, hi: 0xbf},
+	// Block 0x125, offset 0x60a
+	{value: 0x0012, lo: 0x80, hi: 0x8e},
+	{value: 0x0012, lo: 0x90, hi: 0x95},
+	{value: 0x0013, lo: 0x96, hi: 0xae},
+	{value: 0x0012, lo: 0xb0, hi: 0xbf},
+	// Block 0x126, offset 0x60e
+	{value: 0x0012, lo: 0x80, hi: 0x88},
+	{value: 0x0012, lo: 0x8a, hi: 0x8f},
+	{value: 0x0013, lo: 0x90, hi: 0xa8},
+	{value: 0x0012, lo: 0xaa, hi: 0xbf},
+	// Block 0x127, offset 0x612
+	{value: 0x0012, lo: 0x80, hi: 0x82},
+	{value: 0x0012, lo: 0x84, hi: 0x89},
+	{value: 0x0017, lo: 0x8a, hi: 0x8b},
+	{value: 0x0010, lo: 0x8e, hi: 0xbf},
+	// Block 0x128, offset 0x616
+	{value: 0x0014, lo: 0x80, hi: 0xb6},
+	{value: 0x0014, lo: 0xbb, hi: 0xbf},
+	// Block 0x129, offset 0x618
+	{value: 0x0014, lo: 0x80, hi: 0xac},
+	{value: 0x0014, lo: 0xb5, hi: 0xb5},
+	// Block 0x12a, offset 0x61a
+	{value: 0x0014, lo: 0x84, hi: 0x84},
+	{value: 0x0014, lo: 0x9b, hi: 0x9f},
+	{value: 0x0014, lo: 0xa1, hi: 0xaf},
+	// Block 0x12b, offset 0x61d
+	{value: 0x0012, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8a, hi: 0x8a},
+	{value: 0x0012, lo: 0x8b, hi: 0x9e},
+	{value: 0x0012, lo: 0xa5, hi: 0xaa},
+	// Block 0x12c, offset 0x621
+	{value: 0x0024, lo: 0x80, hi: 0x86},
+	{value: 0x0024, lo: 0x88, hi: 0x98},
+	{value: 0x0024, lo: 0x9b, hi: 0xa1},
+	{value: 0x0024, lo: 0xa3, hi: 0xa4},
+	{value: 0x0024, lo: 0xa6, hi: 0xaa},
+	{value: 0x0015, lo: 0xb0, hi: 0xbf},
+	// Block 0x12d, offset 0x627
+	{value: 0x0015, lo: 0x80, hi: 0xad},
+	// Block 0x12e, offset 0x628
+	{value: 0x0024, lo: 0x8f, hi: 0x8f},
+	// Block 0x12f, offset 0x629
+	{value: 0x0010, lo: 0x80, hi: 0xac},
+	{value: 0x0024, lo: 0xb0, hi: 0xb6},
+	{value: 0x0014, lo: 0xb7, hi: 0xbd},
+	// Block 0x130, offset 0x62c
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8e, hi: 0x8e},
+	// Block 0x131, offset 0x62e
+	{value: 0x0010, lo: 0x90, hi: 0xad},
+	{value: 0x0024, lo: 0xae, hi: 0xae},
+	// Block 0x132, offset 0x630
+	{value: 0x0010, lo: 0x80, hi: 0xab},
+	{value: 0x0024, lo: 0xac, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x133, offset 0x633
+	{value: 0x0010, lo: 0x90, hi: 0xaa},
+	{value: 0x0014, lo: 0xab, hi: 0xab},
+	{value: 0x0034, lo: 0xac, hi: 0xae},
+	{value: 0x0024, lo: 0xaf, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xb9},
+	// Block 0x134, offset 0x638
+	{value: 0x0010, lo: 0x90, hi: 0xad},
+	{value: 0x0024, lo: 0xae, hi: 0xae},
+	{value: 0x0034, lo: 0xaf, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xba},
+	// Block 0x135, offset 0x63c
+	{value: 0x0010, lo: 0x80, hi: 0x9e},
+	{value: 0x0010, lo: 0xa0, hi: 0xa2},
+	{value: 0x0024, lo: 0xa3, hi: 0xa3},
+	{value: 0x0010, lo: 0xa4, hi: 0xa5},
+	{value: 0x0024, lo: 0xa6, hi: 0xa6},
+	{value: 0x0010, lo: 0xa7, hi: 0xad},
+	{value: 0x0024, lo: 0xae, hi: 0xaf},
+	{value: 0x0010, lo: 0xb0, hi: 0xb4},
+	{value: 0x0024, lo: 0xb5, hi: 0xb5},
+	{value: 0x0010, lo: 0xbe, hi: 0xbe},
+	{value: 0x0014, lo: 0xbf, hi: 0xbf},
+	// Block 0x136, offset 0x647
+	{value: 0x0010, lo: 0xa0, hi: 0xa6},
+	{value: 0x0010, lo: 0xa8, hi: 0xab},
+	{value: 0x0010, lo: 0xad, hi: 0xae},
+	{value: 0x0010, lo: 0xb0, hi: 0xbe},
+	// Block 0x137, offset 0x64b
+	{value: 0x0010, lo: 0x80, hi: 0x84},
+	{value: 0x0034, lo: 0x90, hi: 0x96},
+	// Block 0x138, offset 0x64d
+	{value: 0xe952, lo: 0x80, hi: 0x81},
+	{value: 0xec52, lo: 0x82, hi: 0x83},
+	{value: 0x0024, lo: 0x84, hi: 0x89},
+	{value: 0x0034, lo: 0x8a, hi: 0x8a},
+	{value: 0x0014, lo: 0x8b, hi: 0x8b},
+	{value: 0x0010, lo: 0x90, hi: 0x99},
+	// Block 0x139, offset 0x653
+	{value: 0x0010, lo: 0x80, hi: 0x83},
+	{value: 0x0010, lo: 0x85, hi: 0x9f},
+	{value: 0x0010, lo: 0xa1, hi: 0xa2},
+	{value: 0x0010, lo: 0xa4, hi: 0xa4},
+	{value: 0x0010, lo: 0xa7, hi: 0xa7},
+	{value: 0x0010, lo: 0xa9, hi: 0xb2},
+	{value: 0x0010, lo: 0xb4, hi: 0xb7},
+	{value: 0x0010, lo: 0xb9, hi: 0xb9},
+	{value: 0x0010, lo: 0xbb, hi: 0xbb},
+	// Block 0x13a, offset 0x65c
+	{value: 0x0010, lo: 0x80, hi: 0x89},
+	{value: 0x0010, lo: 0x8b, hi: 0x9b},
+	{value: 0x0010, lo: 0xa1, hi: 0xa3},
+	{value: 0x0010, lo: 0xa5, hi: 0xa9},
+	{value: 0x0010, lo: 0xab, hi: 0xbb},
+	// Block 0x13b, offset 0x661
+	{value: 0x0013, lo: 0xb0, hi: 0xbf},
+	// Block 0x13c, offset 0x662
+	{value: 0x0013, lo: 0x80, hi: 0x89},
+	{value: 0x0013, lo: 0x90, hi: 0xa9},
+	{value: 0x0013, lo: 0xb0, hi: 0xbf},
+	// Block 0x13d, offset 0x665
+	{value: 0x0013, lo: 0x80, hi: 0x89},
+	// Block 0x13e, offset 0x666
+	{value: 0x0014, lo: 0xbb, hi: 0xbf},
+	// Block 0x13f, offset 0x667
+	{value: 0x0014, lo: 0x81, hi: 0x81},
+	{value: 0x0014, lo: 0xa0, hi: 0xbf},
+	// Block 0x140, offset 0x669
+	{value: 0x0014, lo: 0x80, hi: 0xbf},
+	// Block 0x141, offset 0x66a
+	{value: 0x0014, lo: 0x80, hi: 0xaf},
+}
+
+// Total table size 16747 bytes (16KiB); checksum: D520269F
diff --git a/vendor/golang.org/x/text/cases/trieval.go b/vendor/golang.org/x/text/cases/trieval.go
new file mode 100644
index 000000000..4e4d13fe5
--- /dev/null
+++ b/vendor/golang.org/x/text/cases/trieval.go
@@ -0,0 +1,217 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+package cases
+
+// This file contains definitions for interpreting the trie value of the case
+// trie generated by "go run gen*.go". It is shared by both the generator
+// program and the resultant package. Sharing is achieved by the generator
+// copying gen_trieval.go to trieval.go and changing what's above this comment.
+
+// info holds case information for a single rune. It is the value returned
+// by a trie lookup. Most mapping information can be stored in a single 16-bit
+// value. If not, for example when a rune is mapped to multiple runes, the value
+// stores some basic case data and an index into an array with additional data.
+//
+// The per-rune values have the following format:
+//
+//	if (exception) {
+//	  15..4  unsigned exception index
+//	} else {
+//	  15..8  XOR pattern or index to XOR pattern for case mapping
+//	         Only 13..8 are used for XOR patterns.
+//	      7  inverseFold (fold to upper, not to lower)
+//	      6  index: interpret the XOR pattern as an index
+//	         or isMid if case mode is cIgnorableUncased.
+//	   5..4  CCC: zero (normal or break), above or other
+//	}
+//	   3  exception: interpret this value as an exception index
+//	      (TODO: is this bit necessary? Probably implied from case mode.)
+//	2..0  case mode
+//
+// For the non-exceptional cases, a rune must be either uncased, lowercase or
+// uppercase. If the rune is cased, the XOR pattern maps either a lowercase
+// rune to uppercase or an uppercase rune to lowercase (applied to the 10
+// least-significant bits of the rune).
+//
+// See the definitions below for a more detailed description of the various
+// bits.
+type info uint16
+
+const (
+	casedMask      = 0x0003
+	fullCasedMask  = 0x0007
+	ignorableMask  = 0x0006
+	ignorableValue = 0x0004
+
+	inverseFoldBit = 1 << 7
+	isMidBit       = 1 << 6
+
+	exceptionBit     = 1 << 3
+	exceptionShift   = 4
+	numExceptionBits = 12
+
+	xorIndexBit = 1 << 6
+	xorShift    = 8
+
+	// There is no mapping if all xor bits and the exception bit are zero.
+	hasMappingMask = 0xff80 | exceptionBit
+)
+
+// The case mode bits encodes the case type of a rune. This includes uncased,
+// title, upper and lower case and case ignorable. (For a definition of these
+// terms see Chapter 3 of The Unicode Standard Core Specification.) In some rare
+// cases, a rune can be both cased and case-ignorable. This is encoded by
+// cIgnorableCased. A rune of this type is always lower case. Some runes are
+// cased while not having a mapping.
+//
+// A common pattern for scripts in the Unicode standard is for upper and lower
+// case runes to alternate for increasing rune values (e.g. the accented Latin
+// ranges starting from U+0100 and U+1E00 among others and some Cyrillic
+// characters). We use this property by defining a cXORCase mode, where the case
+// mode (always upper or lower case) is derived from the rune value. As the XOR
+// pattern for case mappings is often identical for successive runes, using
+// cXORCase can result in large series of identical trie values. This, in turn,
+// allows us to better compress the trie blocks.
+const (
+	cUncased          info = iota // 000
+	cTitle                        // 001
+	cLower                        // 010
+	cUpper                        // 011
+	cIgnorableUncased             // 100
+	cIgnorableCased               // 101 // lower case if mappings exist
+	cXORCase                      // 11x // case is cLower | ((rune&1) ^ x)
+
+	maxCaseMode = cUpper
+)
+
+func (c info) isCased() bool {
+	return c&casedMask != 0
+}
+
+func (c info) isCaseIgnorable() bool {
+	return c&ignorableMask == ignorableValue
+}
+
+func (c info) isNotCasedAndNotCaseIgnorable() bool {
+	return c&fullCasedMask == 0
+}
+
+func (c info) isCaseIgnorableAndNotCased() bool {
+	return c&fullCasedMask == cIgnorableUncased
+}
+
+func (c info) isMid() bool {
+	return c&(fullCasedMask|isMidBit) == isMidBit|cIgnorableUncased
+}
+
+// The case mapping implementation will need to know about various Canonical
+// Combining Class (CCC) values. We encode two of these in the trie value:
+// cccZero (0) and cccAbove (230). If the value is cccOther, it means that
+// CCC(r) > 0, but not 230. A value of cccBreak means that CCC(r) == 0 and that
+// the rune also has the break category Break (see below).
+const (
+	cccBreak info = iota << 4
+	cccZero
+	cccAbove
+	cccOther
+
+	cccMask = cccBreak | cccZero | cccAbove | cccOther
+)
+
+const (
+	starter       = 0
+	above         = 230
+	iotaSubscript = 240
+)
+
+// The exceptions slice holds data that does not fit in a normal info entry.
+// The entry is pointed to by the exception index in an entry. It has the
+// following format:
+//
+// Header:
+//
+//	byte 0:
+//	 7..6  unused
+//	 5..4  CCC type (same bits as entry)
+//	    3  unused
+//	 2..0  length of fold
+//
+//	byte 1:
+//	  7..6  unused
+//	  5..3  length of 1st mapping of case type
+//	  2..0  length of 2nd mapping of case type
+//
+//	  case     1st    2nd
+//	  lower -> upper, title
+//	  upper -> lower, title
+//	  title -> lower, upper
+//
+// Lengths with the value 0x7 indicate no value and implies no change.
+// A length of 0 indicates a mapping to zero-length string.
+//
+// Body bytes:
+//
+//	case folding bytes
+//	lowercase mapping bytes
+//	uppercase mapping bytes
+//	titlecase mapping bytes
+//	closure mapping bytes (for NFKC_Casefold). (TODO)
+//
+// Fallbacks:
+//
+//	missing fold  -> lower
+//	missing title -> upper
+//	all missing   -> original rune
+//
+// exceptions starts with a dummy byte to enforce that there is no zero index
+// value.
+const (
+	lengthMask = 0x07
+	lengthBits = 3
+	noChange   = 0
+)
+
+// References to generated trie.
+
+var trie = newCaseTrie(0)
+
+var sparse = sparseBlocks{
+	values:  sparseValues[:],
+	offsets: sparseOffsets[:],
+}
+
+// Sparse block lookup code.
+
+// valueRange is an entry in a sparse block.
+type valueRange struct {
+	value  uint16
+	lo, hi byte
+}
+
+type sparseBlocks struct {
+	values  []valueRange
+	offsets []uint16
+}
+
+// lookup returns the value from values block n for byte b using binary search.
+func (s *sparseBlocks) lookup(n uint32, b byte) uint16 {
+	lo := s.offsets[n]
+	hi := s.offsets[n+1]
+	for lo < hi {
+		m := lo + (hi-lo)/2
+		r := s.values[m]
+		if r.lo <= b && b <= r.hi {
+			return r.value
+		}
+		if b < r.lo {
+			hi = m
+		} else {
+			lo = m + 1
+		}
+	}
+	return 0
+}
+
+// lastRuneForTesting is the last rune used for testing. Everything after this
+// is boring.
+const lastRuneForTesting = rune(0x1FFFF)
diff --git a/vendor/golang.org/x/text/internal/internal.go b/vendor/golang.org/x/text/internal/internal.go
new file mode 100644
index 000000000..3cddbbdda
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/internal.go
@@ -0,0 +1,49 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package internal contains non-exported functionality that are used by
+// packages in the text repository.
+package internal // import "golang.org/x/text/internal"
+
+import (
+	"sort"
+
+	"golang.org/x/text/language"
+)
+
+// SortTags sorts tags in place.
+func SortTags(tags []language.Tag) {
+	sort.Sort(sorter(tags))
+}
+
+type sorter []language.Tag
+
+func (s sorter) Len() int {
+	return len(s)
+}
+
+func (s sorter) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s sorter) Less(i, j int) bool {
+	return s[i].String() < s[j].String()
+}
+
+// UniqueTags sorts and filters duplicate tags in place and returns a slice with
+// only unique tags.
+func UniqueTags(tags []language.Tag) []language.Tag {
+	if len(tags) <= 1 {
+		return tags
+	}
+	SortTags(tags)
+	k := 0
+	for i := 1; i < len(tags); i++ {
+		if tags[k].String() < tags[i].String() {
+			k++
+			tags[k] = tags[i]
+		}
+	}
+	return tags[:k+1]
+}
diff --git a/vendor/golang.org/x/text/internal/language/common.go b/vendor/golang.org/x/text/internal/language/common.go
new file mode 100644
index 000000000..cdfdb7497
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/common.go
@@ -0,0 +1,16 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+package language
+
+// This file contains code common to the maketables.go and the package code.
+
+// AliasType is the type of an alias in AliasMap.
+type AliasType int8
+
+const (
+	Deprecated AliasType = iota
+	Macro
+	Legacy
+
+	AliasTypeUnknown AliasType = -1
+)
diff --git a/vendor/golang.org/x/text/internal/language/compact.go b/vendor/golang.org/x/text/internal/language/compact.go
new file mode 100644
index 000000000..46a001507
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compact.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+// CompactCoreInfo is a compact integer with the three core tags encoded.
+type CompactCoreInfo uint32
+
+// GetCompactCore generates a uint32 value that is guaranteed to be unique for
+// different language, region, and script values.
+func GetCompactCore(t Tag) (cci CompactCoreInfo, ok bool) {
+	if t.LangID > langNoIndexOffset {
+		return 0, false
+	}
+	cci |= CompactCoreInfo(t.LangID) << (8 + 12)
+	cci |= CompactCoreInfo(t.ScriptID) << 12
+	cci |= CompactCoreInfo(t.RegionID)
+	return cci, true
+}
+
+// Tag generates a tag from c.
+func (c CompactCoreInfo) Tag() Tag {
+	return Tag{
+		LangID:   Language(c >> 20),
+		RegionID: Region(c & 0x3ff),
+		ScriptID: Script(c>>12) & 0xff,
+	}
+}
diff --git a/vendor/golang.org/x/text/internal/language/compact/compact.go b/vendor/golang.org/x/text/internal/language/compact/compact.go
new file mode 100644
index 000000000..1b36935ef
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compact/compact.go
@@ -0,0 +1,61 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package compact defines a compact representation of language tags.
+//
+// Common language tags (at least all for which locale information is defined
+// in CLDR) are assigned a unique index. Each Tag is associated with such an
+// ID for selecting language-related resources (such as translations) as well
+// as one for selecting regional defaults (currency, number formatting, etc.)
+//
+// It may want to export this functionality at some point, but at this point
+// this is only available for use within x/text.
+package compact // import "golang.org/x/text/internal/language/compact"
+
+import (
+	"sort"
+	"strings"
+
+	"golang.org/x/text/internal/language"
+)
+
+// ID is an integer identifying a single tag.
+type ID uint16
+
+func getCoreIndex(t language.Tag) (id ID, ok bool) {
+	cci, ok := language.GetCompactCore(t)
+	if !ok {
+		return 0, false
+	}
+	i := sort.Search(len(coreTags), func(i int) bool {
+		return cci <= coreTags[i]
+	})
+	if i == len(coreTags) || coreTags[i] != cci {
+		return 0, false
+	}
+	return ID(i), true
+}
+
+// Parent returns the ID of the parent or the root ID if id is already the root.
+func (id ID) Parent() ID {
+	return parents[id]
+}
+
+// Tag converts id to an internal language Tag.
+func (id ID) Tag() language.Tag {
+	if int(id) >= len(coreTags) {
+		return specialTags[int(id)-len(coreTags)]
+	}
+	return coreTags[id].Tag()
+}
+
+var specialTags []language.Tag
+
+func init() {
+	tags := strings.Split(specialTagsStr, " ")
+	specialTags = make([]language.Tag, len(tags))
+	for i, t := range tags {
+		specialTags[i] = language.MustParse(t)
+	}
+}
diff --git a/vendor/golang.org/x/text/internal/language/compact/language.go b/vendor/golang.org/x/text/internal/language/compact/language.go
new file mode 100644
index 000000000..8c1b6666f
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compact/language.go
@@ -0,0 +1,260 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go gen_index.go -output tables.go
+//go:generate go run gen_parents.go
+
+package compact
+
+// TODO: Remove above NOTE after:
+// - verifying that tables are dropped correctly (most notably matcher tables).
+
+import (
+	"strings"
+
+	"golang.org/x/text/internal/language"
+)
+
+// Tag represents a BCP 47 language tag. It is used to specify an instance of a
+// specific language or locale. All language tag values are guaranteed to be
+// well-formed.
+type Tag struct {
+	// NOTE: exported tags will become part of the public API.
+	language ID
+	locale   ID
+	full     fullTag // always a language.Tag for now.
+}
+
+const _und = 0
+
+type fullTag interface {
+	IsRoot() bool
+	Parent() language.Tag
+}
+
+// Make a compact Tag from a fully specified internal language Tag.
+func Make(t language.Tag) (tag Tag) {
+	if region := t.TypeForKey("rg"); len(region) == 6 && region[2:] == "zzzz" {
+		if r, err := language.ParseRegion(region[:2]); err == nil {
+			tFull := t
+			t, _ = t.SetTypeForKey("rg", "")
+			// TODO: should we not consider "va" for the language tag?
+			var exact1, exact2 bool
+			tag.language, exact1 = FromTag(t)
+			t.RegionID = r
+			tag.locale, exact2 = FromTag(t)
+			if !exact1 || !exact2 {
+				tag.full = tFull
+			}
+			return tag
+		}
+	}
+	lang, ok := FromTag(t)
+	tag.language = lang
+	tag.locale = lang
+	if !ok {
+		tag.full = t
+	}
+	return tag
+}
+
+// Tag returns an internal language Tag version of this tag.
+func (t Tag) Tag() language.Tag {
+	if t.full != nil {
+		return t.full.(language.Tag)
+	}
+	tag := t.language.Tag()
+	if t.language != t.locale {
+		loc := t.locale.Tag()
+		tag, _ = tag.SetTypeForKey("rg", strings.ToLower(loc.RegionID.String())+"zzzz")
+	}
+	return tag
+}
+
+// IsCompact reports whether this tag is fully defined in terms of ID.
+func (t *Tag) IsCompact() bool {
+	return t.full == nil
+}
+
+// MayHaveVariants reports whether a tag may have variants. If it returns false
+// it is guaranteed the tag does not have variants.
+func (t Tag) MayHaveVariants() bool {
+	return t.full != nil || int(t.language) >= len(coreTags)
+}
+
+// MayHaveExtensions reports whether a tag may have extensions. If it returns
+// false it is guaranteed the tag does not have them.
+func (t Tag) MayHaveExtensions() bool {
+	return t.full != nil ||
+		int(t.language) >= len(coreTags) ||
+		t.language != t.locale
+}
+
+// IsRoot returns true if t is equal to language "und".
+func (t Tag) IsRoot() bool {
+	if t.full != nil {
+		return t.full.IsRoot()
+	}
+	return t.language == _und
+}
+
+// Parent returns the CLDR parent of t. In CLDR, missing fields in data for a
+// specific language are substituted with fields from the parent language.
+// The parent for a language may change for newer versions of CLDR.
+func (t Tag) Parent() Tag {
+	if t.full != nil {
+		return Make(t.full.Parent())
+	}
+	if t.language != t.locale {
+		// Simulate stripping -u-rg-xxxxxx
+		return Tag{language: t.language, locale: t.language}
+	}
+	// TODO: use parent lookup table once cycle from internal package is
+	// removed. Probably by internalizing the table and declaring this fast
+	// enough.
+	// lang := compactID(internal.Parent(uint16(t.language)))
+	lang, _ := FromTag(t.language.Tag().Parent())
+	return Tag{language: lang, locale: lang}
+}
+
+// nextToken returns token t and the rest of the string.
+func nextToken(s string) (t, tail string) {
+	p := strings.Index(s[1:], "-")
+	if p == -1 {
+		return s[1:], ""
+	}
+	p++
+	return s[1:p], s[p:]
+}
+
+// LanguageID returns an index, where 0 <= index < NumCompactTags, for tags
+// for which data exists in the text repository.The index will change over time
+// and should not be stored in persistent storage. If t does not match a compact
+// index, exact will be false and the compact index will be returned for the
+// first match after repeatedly taking the Parent of t.
+func LanguageID(t Tag) (id ID, exact bool) {
+	return t.language, t.full == nil
+}
+
+// RegionalID returns the ID for the regional variant of this tag. This index is
+// used to indicate region-specific overrides, such as default currency, default
+// calendar and week data, default time cycle, and default measurement system
+// and unit preferences.
+//
+// For instance, the tag en-GB-u-rg-uszzzz specifies British English with US
+// settings for currency, number formatting, etc. The CompactIndex for this tag
+// will be that for en-GB, while the RegionalID will be the one corresponding to
+// en-US.
+func RegionalID(t Tag) (id ID, exact bool) {
+	return t.locale, t.full == nil
+}
+
+// LanguageTag returns t stripped of regional variant indicators.
+//
+// At the moment this means it is stripped of a regional and variant subtag "rg"
+// and "va" in the "u" extension.
+func (t Tag) LanguageTag() Tag {
+	if t.full == nil {
+		return Tag{language: t.language, locale: t.language}
+	}
+	tt := t.Tag()
+	tt.SetTypeForKey("rg", "")
+	tt.SetTypeForKey("va", "")
+	return Make(tt)
+}
+
+// RegionalTag returns the regional variant of the tag.
+//
+// At the moment this means that the region is set from the regional subtag
+// "rg" in the "u" extension.
+func (t Tag) RegionalTag() Tag {
+	rt := Tag{language: t.locale, locale: t.locale}
+	if t.full == nil {
+		return rt
+	}
+	b := language.Builder{}
+	tag := t.Tag()
+	// tag, _ = tag.SetTypeForKey("rg", "")
+	b.SetTag(t.locale.Tag())
+	if v := tag.Variants(); v != "" {
+		for _, v := range strings.Split(v, "-") {
+			b.AddVariant(v)
+		}
+	}
+	for _, e := range tag.Extensions() {
+		b.AddExt(e)
+	}
+	return t
+}
+
+// FromTag reports closest matching ID for an internal language Tag.
+func FromTag(t language.Tag) (id ID, exact bool) {
+	// TODO: perhaps give more frequent tags a lower index.
+	// TODO: we could make the indexes stable. This will excluded some
+	//       possibilities for optimization, so don't do this quite yet.
+	exact = true
+
+	b, s, r := t.Raw()
+	if t.HasString() {
+		if t.IsPrivateUse() {
+			// We have no entries for user-defined tags.
+			return 0, false
+		}
+		hasExtra := false
+		if t.HasVariants() {
+			if t.HasExtensions() {
+				build := language.Builder{}
+				build.SetTag(language.Tag{LangID: b, ScriptID: s, RegionID: r})
+				build.AddVariant(t.Variants())
+				exact = false
+				t = build.Make()
+			}
+			hasExtra = true
+		} else if _, ok := t.Extension('u'); ok {
+			// TODO: va may mean something else. Consider not considering it.
+			// Strip all but the 'va' entry.
+			old := t
+			variant := t.TypeForKey("va")
+			t = language.Tag{LangID: b, ScriptID: s, RegionID: r}
+			if variant != "" {
+				t, _ = t.SetTypeForKey("va", variant)
+				hasExtra = true
+			}
+			exact = old == t
+		} else {
+			exact = false
+		}
+		if hasExtra {
+			// We have some variants.
+			for i, s := range specialTags {
+				if s == t {
+					return ID(i + len(coreTags)), exact
+				}
+			}
+			exact = false
+		}
+	}
+	if x, ok := getCoreIndex(t); ok {
+		return x, exact
+	}
+	exact = false
+	if r != 0 && s == 0 {
+		// Deal with cases where an extra script is inserted for the region.
+		t, _ := t.Maximize()
+		if x, ok := getCoreIndex(t); ok {
+			return x, exact
+		}
+	}
+	for t = t.Parent(); t != root; t = t.Parent() {
+		// No variants specified: just compare core components.
+		// The key has the form lllssrrr, where l, s, and r are nibbles for
+		// respectively the langID, scriptID, and regionID.
+		if x, ok := getCoreIndex(t); ok {
+			return x, exact
+		}
+	}
+	return 0, exact
+}
+
+var root = language.Tag{}
diff --git a/vendor/golang.org/x/text/internal/language/compact/parents.go b/vendor/golang.org/x/text/internal/language/compact/parents.go
new file mode 100644
index 000000000..8d810723c
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compact/parents.go
@@ -0,0 +1,120 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+package compact
+
+// parents maps a compact index of a tag to the compact index of the parent of
+// this tag.
+var parents = []ID{ // 775 elements
+	// Entry 0 - 3F
+	0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0004, 0x0000, 0x0006,
+	0x0000, 0x0008, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+	0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+	0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+	0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000,
+	0x0000, 0x0028, 0x0000, 0x002a, 0x0000, 0x002c, 0x0000, 0x0000,
+	0x002f, 0x002e, 0x002e, 0x0000, 0x0033, 0x0000, 0x0035, 0x0000,
+	0x0037, 0x0000, 0x0039, 0x0000, 0x003b, 0x0000, 0x0000, 0x003e,
+	// Entry 40 - 7F
+	0x0000, 0x0040, 0x0040, 0x0000, 0x0043, 0x0043, 0x0000, 0x0046,
+	0x0000, 0x0048, 0x0000, 0x0000, 0x004b, 0x004a, 0x004a, 0x0000,
+	0x004f, 0x004f, 0x004f, 0x004f, 0x0000, 0x0054, 0x0054, 0x0000,
+	0x0057, 0x0000, 0x0059, 0x0000, 0x005b, 0x0000, 0x005d, 0x005d,
+	0x0000, 0x0060, 0x0000, 0x0062, 0x0000, 0x0064, 0x0000, 0x0066,
+	0x0066, 0x0000, 0x0069, 0x0000, 0x006b, 0x006b, 0x006b, 0x006b,
+	0x006b, 0x006b, 0x006b, 0x0000, 0x0073, 0x0000, 0x0075, 0x0000,
+	0x0077, 0x0000, 0x0000, 0x007a, 0x0000, 0x007c, 0x0000, 0x007e,
+	// Entry 80 - BF
+	0x0000, 0x0080, 0x0080, 0x0000, 0x0083, 0x0083, 0x0000, 0x0086,
+	0x0087, 0x0087, 0x0087, 0x0086, 0x0088, 0x0087, 0x0087, 0x0087,
+	0x0086, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0088,
+	0x0087, 0x0087, 0x0087, 0x0087, 0x0088, 0x0087, 0x0088, 0x0087,
+	0x0087, 0x0088, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087,
+	0x0087, 0x0087, 0x0087, 0x0086, 0x0087, 0x0087, 0x0087, 0x0087,
+	0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087,
+	0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0086, 0x0087, 0x0086,
+	// Entry C0 - FF
+	0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087,
+	0x0088, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087,
+	0x0086, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0088, 0x0087,
+	0x0087, 0x0088, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087,
+	0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0086, 0x0086, 0x0087,
+	0x0087, 0x0086, 0x0087, 0x0087, 0x0087, 0x0087, 0x0087, 0x0000,
+	0x00ef, 0x0000, 0x00f1, 0x00f2, 0x00f2, 0x00f2, 0x00f2, 0x00f2,
+	0x00f2, 0x00f2, 0x00f2, 0x00f2, 0x00f1, 0x00f2, 0x00f1, 0x00f1,
+	// Entry 100 - 13F
+	0x00f2, 0x00f2, 0x00f1, 0x00f2, 0x00f2, 0x00f2, 0x00f2, 0x00f1,
+	0x00f2, 0x00f2, 0x00f2, 0x00f2, 0x00f2, 0x00f2, 0x0000, 0x010e,
+	0x0000, 0x0110, 0x0000, 0x0112, 0x0000, 0x0114, 0x0114, 0x0000,
+	0x0117, 0x0117, 0x0117, 0x0117, 0x0000, 0x011c, 0x0000, 0x011e,
+	0x0000, 0x0120, 0x0120, 0x0000, 0x0123, 0x0123, 0x0123, 0x0123,
+	0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123,
+	0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123,
+	0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123,
+	// Entry 140 - 17F
+	0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123,
+	0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123, 0x0123,
+	0x0123, 0x0123, 0x0000, 0x0152, 0x0000, 0x0154, 0x0000, 0x0156,
+	0x0000, 0x0158, 0x0000, 0x015a, 0x0000, 0x015c, 0x015c, 0x015c,
+	0x0000, 0x0160, 0x0000, 0x0000, 0x0163, 0x0000, 0x0165, 0x0000,
+	0x0167, 0x0167, 0x0167, 0x0000, 0x016b, 0x0000, 0x016d, 0x0000,
+	0x016f, 0x0000, 0x0171, 0x0171, 0x0000, 0x0174, 0x0000, 0x0176,
+	0x0000, 0x0178, 0x0000, 0x017a, 0x0000, 0x017c, 0x0000, 0x017e,
+	// Entry 180 - 1BF
+	0x0000, 0x0000, 0x0000, 0x0182, 0x0000, 0x0184, 0x0184, 0x0184,
+	0x0184, 0x0000, 0x0000, 0x0000, 0x018b, 0x0000, 0x0000, 0x018e,
+	0x0000, 0x0000, 0x0191, 0x0000, 0x0000, 0x0000, 0x0195, 0x0000,
+	0x0197, 0x0000, 0x0000, 0x019a, 0x0000, 0x0000, 0x019d, 0x0000,
+	0x019f, 0x0000, 0x01a1, 0x0000, 0x01a3, 0x0000, 0x01a5, 0x0000,
+	0x01a7, 0x0000, 0x01a9, 0x0000, 0x01ab, 0x0000, 0x01ad, 0x0000,
+	0x01af, 0x0000, 0x01b1, 0x01b1, 0x0000, 0x01b4, 0x0000, 0x01b6,
+	0x0000, 0x01b8, 0x0000, 0x01ba, 0x0000, 0x01bc, 0x0000, 0x0000,
+	// Entry 1C0 - 1FF
+	0x01bf, 0x0000, 0x01c1, 0x0000, 0x01c3, 0x0000, 0x01c5, 0x0000,
+	0x01c7, 0x0000, 0x01c9, 0x0000, 0x01cb, 0x01cb, 0x01cb, 0x01cb,
+	0x0000, 0x01d0, 0x0000, 0x01d2, 0x01d2, 0x0000, 0x01d5, 0x0000,
+	0x01d7, 0x0000, 0x01d9, 0x0000, 0x01db, 0x0000, 0x01dd, 0x0000,
+	0x01df, 0x01df, 0x0000, 0x01e2, 0x0000, 0x01e4, 0x0000, 0x01e6,
+	0x0000, 0x01e8, 0x0000, 0x01ea, 0x0000, 0x01ec, 0x0000, 0x01ee,
+	0x0000, 0x01f0, 0x0000, 0x0000, 0x01f3, 0x0000, 0x01f5, 0x01f5,
+	0x01f5, 0x0000, 0x01f9, 0x0000, 0x01fb, 0x0000, 0x01fd, 0x0000,
+	// Entry 200 - 23F
+	0x01ff, 0x0000, 0x0000, 0x0202, 0x0000, 0x0204, 0x0204, 0x0000,
+	0x0207, 0x0000, 0x0209, 0x0209, 0x0000, 0x020c, 0x020c, 0x0000,
+	0x020f, 0x020f, 0x020f, 0x020f, 0x020f, 0x020f, 0x020f, 0x0000,
+	0x0217, 0x0000, 0x0219, 0x0000, 0x021b, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0221, 0x0000, 0x0000, 0x0224, 0x0000, 0x0226,
+	0x0226, 0x0000, 0x0229, 0x0000, 0x022b, 0x022b, 0x0000, 0x0000,
+	0x022f, 0x022e, 0x022e, 0x0000, 0x0000, 0x0234, 0x0000, 0x0236,
+	0x0000, 0x0238, 0x0000, 0x0244, 0x023a, 0x0244, 0x0244, 0x0244,
+	// Entry 240 - 27F
+	0x0244, 0x0244, 0x0244, 0x0244, 0x023a, 0x0244, 0x0244, 0x0000,
+	0x0247, 0x0247, 0x0247, 0x0000, 0x024b, 0x0000, 0x024d, 0x0000,
+	0x024f, 0x024f, 0x0000, 0x0252, 0x0000, 0x0254, 0x0254, 0x0254,
+	0x0254, 0x0254, 0x0254, 0x0000, 0x025b, 0x0000, 0x025d, 0x0000,
+	0x025f, 0x0000, 0x0261, 0x0000, 0x0263, 0x0000, 0x0265, 0x0000,
+	0x0000, 0x0268, 0x0268, 0x0268, 0x0000, 0x026c, 0x0000, 0x026e,
+	0x0000, 0x0270, 0x0000, 0x0000, 0x0000, 0x0274, 0x0273, 0x0273,
+	0x0000, 0x0278, 0x0000, 0x027a, 0x0000, 0x027c, 0x0000, 0x0000,
+	// Entry 280 - 2BF
+	0x0000, 0x0000, 0x0281, 0x0000, 0x0000, 0x0284, 0x0000, 0x0286,
+	0x0286, 0x0286, 0x0286, 0x0000, 0x028b, 0x028b, 0x028b, 0x0000,
+	0x028f, 0x028f, 0x028f, 0x028f, 0x028f, 0x0000, 0x0295, 0x0295,
+	0x0295, 0x0295, 0x0000, 0x0000, 0x0000, 0x0000, 0x029d, 0x029d,
+	0x029d, 0x0000, 0x02a1, 0x02a1, 0x02a1, 0x02a1, 0x0000, 0x0000,
+	0x02a7, 0x02a7, 0x02a7, 0x02a7, 0x0000, 0x02ac, 0x0000, 0x02ae,
+	0x02ae, 0x0000, 0x02b1, 0x0000, 0x02b3, 0x0000, 0x02b5, 0x02b5,
+	0x0000, 0x0000, 0x02b9, 0x0000, 0x0000, 0x0000, 0x02bd, 0x0000,
+	// Entry 2C0 - 2FF
+	0x02bf, 0x02bf, 0x0000, 0x0000, 0x02c3, 0x0000, 0x02c5, 0x0000,
+	0x02c7, 0x0000, 0x02c9, 0x0000, 0x02cb, 0x0000, 0x02cd, 0x02cd,
+	0x0000, 0x0000, 0x02d1, 0x0000, 0x02d3, 0x02d0, 0x02d0, 0x0000,
+	0x0000, 0x02d8, 0x02d7, 0x02d7, 0x0000, 0x0000, 0x02dd, 0x0000,
+	0x02df, 0x0000, 0x02e1, 0x0000, 0x0000, 0x02e4, 0x0000, 0x02e6,
+	0x0000, 0x0000, 0x02e9, 0x0000, 0x02eb, 0x0000, 0x02ed, 0x0000,
+	0x02ef, 0x02ef, 0x0000, 0x0000, 0x02f3, 0x02f2, 0x02f2, 0x0000,
+	0x02f7, 0x0000, 0x02f9, 0x02f9, 0x02f9, 0x02f9, 0x02f9, 0x0000,
+	// Entry 300 - 33F
+	0x02ff, 0x0300, 0x02ff, 0x0000, 0x0303, 0x0051, 0x00e6,
+} // Size: 1574 bytes
+
+// Total table size 1574 bytes (1KiB); checksum: 895AAF0B
diff --git a/vendor/golang.org/x/text/internal/language/compact/tables.go b/vendor/golang.org/x/text/internal/language/compact/tables.go
new file mode 100644
index 000000000..a09ed198a
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compact/tables.go
@@ -0,0 +1,1015 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+package compact
+
+import "golang.org/x/text/internal/language"
+
+// CLDRVersion is the CLDR version from which the tables in this package are derived.
+const CLDRVersion = "32"
+
+// NumCompactTags is the number of common tags. The maximum tag is
+// NumCompactTags-1.
+const NumCompactTags = 775
+const (
+	undIndex          ID = 0
+	afIndex           ID = 1
+	afNAIndex         ID = 2
+	afZAIndex         ID = 3
+	agqIndex          ID = 4
+	agqCMIndex        ID = 5
+	akIndex           ID = 6
+	akGHIndex         ID = 7
+	amIndex           ID = 8
+	amETIndex         ID = 9
+	arIndex           ID = 10
+	ar001Index        ID = 11
+	arAEIndex         ID = 12
+	arBHIndex         ID = 13
+	arDJIndex         ID = 14
+	arDZIndex         ID = 15
+	arEGIndex         ID = 16
+	arEHIndex         ID = 17
+	arERIndex         ID = 18
+	arILIndex         ID = 19
+	arIQIndex         ID = 20
+	arJOIndex         ID = 21
+	arKMIndex         ID = 22
+	arKWIndex         ID = 23
+	arLBIndex         ID = 24
+	arLYIndex         ID = 25
+	arMAIndex         ID = 26
+	arMRIndex         ID = 27
+	arOMIndex         ID = 28
+	arPSIndex         ID = 29
+	arQAIndex         ID = 30
+	arSAIndex         ID = 31
+	arSDIndex         ID = 32
+	arSOIndex         ID = 33
+	arSSIndex         ID = 34
+	arSYIndex         ID = 35
+	arTDIndex         ID = 36
+	arTNIndex         ID = 37
+	arYEIndex         ID = 38
+	arsIndex          ID = 39
+	asIndex           ID = 40
+	asINIndex         ID = 41
+	asaIndex          ID = 42
+	asaTZIndex        ID = 43
+	astIndex          ID = 44
+	astESIndex        ID = 45
+	azIndex           ID = 46
+	azCyrlIndex       ID = 47
+	azCyrlAZIndex     ID = 48
+	azLatnIndex       ID = 49
+	azLatnAZIndex     ID = 50
+	basIndex          ID = 51
+	basCMIndex        ID = 52
+	beIndex           ID = 53
+	beBYIndex         ID = 54
+	bemIndex          ID = 55
+	bemZMIndex        ID = 56
+	bezIndex          ID = 57
+	bezTZIndex        ID = 58
+	bgIndex           ID = 59
+	bgBGIndex         ID = 60
+	bhIndex           ID = 61
+	bmIndex           ID = 62
+	bmMLIndex         ID = 63
+	bnIndex           ID = 64
+	bnBDIndex         ID = 65
+	bnINIndex         ID = 66
+	boIndex           ID = 67
+	boCNIndex         ID = 68
+	boINIndex         ID = 69
+	brIndex           ID = 70
+	brFRIndex         ID = 71
+	brxIndex          ID = 72
+	brxINIndex        ID = 73
+	bsIndex           ID = 74
+	bsCyrlIndex       ID = 75
+	bsCyrlBAIndex     ID = 76
+	bsLatnIndex       ID = 77
+	bsLatnBAIndex     ID = 78
+	caIndex           ID = 79
+	caADIndex         ID = 80
+	caESIndex         ID = 81
+	caFRIndex         ID = 82
+	caITIndex         ID = 83
+	ccpIndex          ID = 84
+	ccpBDIndex        ID = 85
+	ccpINIndex        ID = 86
+	ceIndex           ID = 87
+	ceRUIndex         ID = 88
+	cggIndex          ID = 89
+	cggUGIndex        ID = 90
+	chrIndex          ID = 91
+	chrUSIndex        ID = 92
+	ckbIndex          ID = 93
+	ckbIQIndex        ID = 94
+	ckbIRIndex        ID = 95
+	csIndex           ID = 96
+	csCZIndex         ID = 97
+	cuIndex           ID = 98
+	cuRUIndex         ID = 99
+	cyIndex           ID = 100
+	cyGBIndex         ID = 101
+	daIndex           ID = 102
+	daDKIndex         ID = 103
+	daGLIndex         ID = 104
+	davIndex          ID = 105
+	davKEIndex        ID = 106
+	deIndex           ID = 107
+	deATIndex         ID = 108
+	deBEIndex         ID = 109
+	deCHIndex         ID = 110
+	deDEIndex         ID = 111
+	deITIndex         ID = 112
+	deLIIndex         ID = 113
+	deLUIndex         ID = 114
+	djeIndex          ID = 115
+	djeNEIndex        ID = 116
+	dsbIndex          ID = 117
+	dsbDEIndex        ID = 118
+	duaIndex          ID = 119
+	duaCMIndex        ID = 120
+	dvIndex           ID = 121
+	dyoIndex          ID = 122
+	dyoSNIndex        ID = 123
+	dzIndex           ID = 124
+	dzBTIndex         ID = 125
+	ebuIndex          ID = 126
+	ebuKEIndex        ID = 127
+	eeIndex           ID = 128
+	eeGHIndex         ID = 129
+	eeTGIndex         ID = 130
+	elIndex           ID = 131
+	elCYIndex         ID = 132
+	elGRIndex         ID = 133
+	enIndex           ID = 134
+	en001Index        ID = 135
+	en150Index        ID = 136
+	enAGIndex         ID = 137
+	enAIIndex         ID = 138
+	enASIndex         ID = 139
+	enATIndex         ID = 140
+	enAUIndex         ID = 141
+	enBBIndex         ID = 142
+	enBEIndex         ID = 143
+	enBIIndex         ID = 144
+	enBMIndex         ID = 145
+	enBSIndex         ID = 146
+	enBWIndex         ID = 147
+	enBZIndex         ID = 148
+	enCAIndex         ID = 149
+	enCCIndex         ID = 150
+	enCHIndex         ID = 151
+	enCKIndex         ID = 152
+	enCMIndex         ID = 153
+	enCXIndex         ID = 154
+	enCYIndex         ID = 155
+	enDEIndex         ID = 156
+	enDGIndex         ID = 157
+	enDKIndex         ID = 158
+	enDMIndex         ID = 159
+	enERIndex         ID = 160
+	enFIIndex         ID = 161
+	enFJIndex         ID = 162
+	enFKIndex         ID = 163
+	enFMIndex         ID = 164
+	enGBIndex         ID = 165
+	enGDIndex         ID = 166
+	enGGIndex         ID = 167
+	enGHIndex         ID = 168
+	enGIIndex         ID = 169
+	enGMIndex         ID = 170
+	enGUIndex         ID = 171
+	enGYIndex         ID = 172
+	enHKIndex         ID = 173
+	enIEIndex         ID = 174
+	enILIndex         ID = 175
+	enIMIndex         ID = 176
+	enINIndex         ID = 177
+	enIOIndex         ID = 178
+	enJEIndex         ID = 179
+	enJMIndex         ID = 180
+	enKEIndex         ID = 181
+	enKIIndex         ID = 182
+	enKNIndex         ID = 183
+	enKYIndex         ID = 184
+	enLCIndex         ID = 185
+	enLRIndex         ID = 186
+	enLSIndex         ID = 187
+	enMGIndex         ID = 188
+	enMHIndex         ID = 189
+	enMOIndex         ID = 190
+	enMPIndex         ID = 191
+	enMSIndex         ID = 192
+	enMTIndex         ID = 193
+	enMUIndex         ID = 194
+	enMWIndex         ID = 195
+	enMYIndex         ID = 196
+	enNAIndex         ID = 197
+	enNFIndex         ID = 198
+	enNGIndex         ID = 199
+	enNLIndex         ID = 200
+	enNRIndex         ID = 201
+	enNUIndex         ID = 202
+	enNZIndex         ID = 203
+	enPGIndex         ID = 204
+	enPHIndex         ID = 205
+	enPKIndex         ID = 206
+	enPNIndex         ID = 207
+	enPRIndex         ID = 208
+	enPWIndex         ID = 209
+	enRWIndex         ID = 210
+	enSBIndex         ID = 211
+	enSCIndex         ID = 212
+	enSDIndex         ID = 213
+	enSEIndex         ID = 214
+	enSGIndex         ID = 215
+	enSHIndex         ID = 216
+	enSIIndex         ID = 217
+	enSLIndex         ID = 218
+	enSSIndex         ID = 219
+	enSXIndex         ID = 220
+	enSZIndex         ID = 221
+	enTCIndex         ID = 222
+	enTKIndex         ID = 223
+	enTOIndex         ID = 224
+	enTTIndex         ID = 225
+	enTVIndex         ID = 226
+	enTZIndex         ID = 227
+	enUGIndex         ID = 228
+	enUMIndex         ID = 229
+	enUSIndex         ID = 230
+	enVCIndex         ID = 231
+	enVGIndex         ID = 232
+	enVIIndex         ID = 233
+	enVUIndex         ID = 234
+	enWSIndex         ID = 235
+	enZAIndex         ID = 236
+	enZMIndex         ID = 237
+	enZWIndex         ID = 238
+	eoIndex           ID = 239
+	eo001Index        ID = 240
+	esIndex           ID = 241
+	es419Index        ID = 242
+	esARIndex         ID = 243
+	esBOIndex         ID = 244
+	esBRIndex         ID = 245
+	esBZIndex         ID = 246
+	esCLIndex         ID = 247
+	esCOIndex         ID = 248
+	esCRIndex         ID = 249
+	esCUIndex         ID = 250
+	esDOIndex         ID = 251
+	esEAIndex         ID = 252
+	esECIndex         ID = 253
+	esESIndex         ID = 254
+	esGQIndex         ID = 255
+	esGTIndex         ID = 256
+	esHNIndex         ID = 257
+	esICIndex         ID = 258
+	esMXIndex         ID = 259
+	esNIIndex         ID = 260
+	esPAIndex         ID = 261
+	esPEIndex         ID = 262
+	esPHIndex         ID = 263
+	esPRIndex         ID = 264
+	esPYIndex         ID = 265
+	esSVIndex         ID = 266
+	esUSIndex         ID = 267
+	esUYIndex         ID = 268
+	esVEIndex         ID = 269
+	etIndex           ID = 270
+	etEEIndex         ID = 271
+	euIndex           ID = 272
+	euESIndex         ID = 273
+	ewoIndex          ID = 274
+	ewoCMIndex        ID = 275
+	faIndex           ID = 276
+	faAFIndex         ID = 277
+	faIRIndex         ID = 278
+	ffIndex           ID = 279
+	ffCMIndex         ID = 280
+	ffGNIndex         ID = 281
+	ffMRIndex         ID = 282
+	ffSNIndex         ID = 283
+	fiIndex           ID = 284
+	fiFIIndex         ID = 285
+	filIndex          ID = 286
+	filPHIndex        ID = 287
+	foIndex           ID = 288
+	foDKIndex         ID = 289
+	foFOIndex         ID = 290
+	frIndex           ID = 291
+	frBEIndex         ID = 292
+	frBFIndex         ID = 293
+	frBIIndex         ID = 294
+	frBJIndex         ID = 295
+	frBLIndex         ID = 296
+	frCAIndex         ID = 297
+	frCDIndex         ID = 298
+	frCFIndex         ID = 299
+	frCGIndex         ID = 300
+	frCHIndex         ID = 301
+	frCIIndex         ID = 302
+	frCMIndex         ID = 303
+	frDJIndex         ID = 304
+	frDZIndex         ID = 305
+	frFRIndex         ID = 306
+	frGAIndex         ID = 307
+	frGFIndex         ID = 308
+	frGNIndex         ID = 309
+	frGPIndex         ID = 310
+	frGQIndex         ID = 311
+	frHTIndex         ID = 312
+	frKMIndex         ID = 313
+	frLUIndex         ID = 314
+	frMAIndex         ID = 315
+	frMCIndex         ID = 316
+	frMFIndex         ID = 317
+	frMGIndex         ID = 318
+	frMLIndex         ID = 319
+	frMQIndex         ID = 320
+	frMRIndex         ID = 321
+	frMUIndex         ID = 322
+	frNCIndex         ID = 323
+	frNEIndex         ID = 324
+	frPFIndex         ID = 325
+	frPMIndex         ID = 326
+	frREIndex         ID = 327
+	frRWIndex         ID = 328
+	frSCIndex         ID = 329
+	frSNIndex         ID = 330
+	frSYIndex         ID = 331
+	frTDIndex         ID = 332
+	frTGIndex         ID = 333
+	frTNIndex         ID = 334
+	frVUIndex         ID = 335
+	frWFIndex         ID = 336
+	frYTIndex         ID = 337
+	furIndex          ID = 338
+	furITIndex        ID = 339
+	fyIndex           ID = 340
+	fyNLIndex         ID = 341
+	gaIndex           ID = 342
+	gaIEIndex         ID = 343
+	gdIndex           ID = 344
+	gdGBIndex         ID = 345
+	glIndex           ID = 346
+	glESIndex         ID = 347
+	gswIndex          ID = 348
+	gswCHIndex        ID = 349
+	gswFRIndex        ID = 350
+	gswLIIndex        ID = 351
+	guIndex           ID = 352
+	guINIndex         ID = 353
+	guwIndex          ID = 354
+	guzIndex          ID = 355
+	guzKEIndex        ID = 356
+	gvIndex           ID = 357
+	gvIMIndex         ID = 358
+	haIndex           ID = 359
+	haGHIndex         ID = 360
+	haNEIndex         ID = 361
+	haNGIndex         ID = 362
+	hawIndex          ID = 363
+	hawUSIndex        ID = 364
+	heIndex           ID = 365
+	heILIndex         ID = 366
+	hiIndex           ID = 367
+	hiINIndex         ID = 368
+	hrIndex           ID = 369
+	hrBAIndex         ID = 370
+	hrHRIndex         ID = 371
+	hsbIndex          ID = 372
+	hsbDEIndex        ID = 373
+	huIndex           ID = 374
+	huHUIndex         ID = 375
+	hyIndex           ID = 376
+	hyAMIndex         ID = 377
+	idIndex           ID = 378
+	idIDIndex         ID = 379
+	igIndex           ID = 380
+	igNGIndex         ID = 381
+	iiIndex           ID = 382
+	iiCNIndex         ID = 383
+	inIndex           ID = 384
+	ioIndex           ID = 385
+	isIndex           ID = 386
+	isISIndex         ID = 387
+	itIndex           ID = 388
+	itCHIndex         ID = 389
+	itITIndex         ID = 390
+	itSMIndex         ID = 391
+	itVAIndex         ID = 392
+	iuIndex           ID = 393
+	iwIndex           ID = 394
+	jaIndex           ID = 395
+	jaJPIndex         ID = 396
+	jboIndex          ID = 397
+	jgoIndex          ID = 398
+	jgoCMIndex        ID = 399
+	jiIndex           ID = 400
+	jmcIndex          ID = 401
+	jmcTZIndex        ID = 402
+	jvIndex           ID = 403
+	jwIndex           ID = 404
+	kaIndex           ID = 405
+	kaGEIndex         ID = 406
+	kabIndex          ID = 407
+	kabDZIndex        ID = 408
+	kajIndex          ID = 409
+	kamIndex          ID = 410
+	kamKEIndex        ID = 411
+	kcgIndex          ID = 412
+	kdeIndex          ID = 413
+	kdeTZIndex        ID = 414
+	keaIndex          ID = 415
+	keaCVIndex        ID = 416
+	khqIndex          ID = 417
+	khqMLIndex        ID = 418
+	kiIndex           ID = 419
+	kiKEIndex         ID = 420
+	kkIndex           ID = 421
+	kkKZIndex         ID = 422
+	kkjIndex          ID = 423
+	kkjCMIndex        ID = 424
+	klIndex           ID = 425
+	klGLIndex         ID = 426
+	klnIndex          ID = 427
+	klnKEIndex        ID = 428
+	kmIndex           ID = 429
+	kmKHIndex         ID = 430
+	knIndex           ID = 431
+	knINIndex         ID = 432
+	koIndex           ID = 433
+	koKPIndex         ID = 434
+	koKRIndex         ID = 435
+	kokIndex          ID = 436
+	kokINIndex        ID = 437
+	ksIndex           ID = 438
+	ksINIndex         ID = 439
+	ksbIndex          ID = 440
+	ksbTZIndex        ID = 441
+	ksfIndex          ID = 442
+	ksfCMIndex        ID = 443
+	kshIndex          ID = 444
+	kshDEIndex        ID = 445
+	kuIndex           ID = 446
+	kwIndex           ID = 447
+	kwGBIndex         ID = 448
+	kyIndex           ID = 449
+	kyKGIndex         ID = 450
+	lagIndex          ID = 451
+	lagTZIndex        ID = 452
+	lbIndex           ID = 453
+	lbLUIndex         ID = 454
+	lgIndex           ID = 455
+	lgUGIndex         ID = 456
+	lktIndex          ID = 457
+	lktUSIndex        ID = 458
+	lnIndex           ID = 459
+	lnAOIndex         ID = 460
+	lnCDIndex         ID = 461
+	lnCFIndex         ID = 462
+	lnCGIndex         ID = 463
+	loIndex           ID = 464
+	loLAIndex         ID = 465
+	lrcIndex          ID = 466
+	lrcIQIndex        ID = 467
+	lrcIRIndex        ID = 468
+	ltIndex           ID = 469
+	ltLTIndex         ID = 470
+	luIndex           ID = 471
+	luCDIndex         ID = 472
+	luoIndex          ID = 473
+	luoKEIndex        ID = 474
+	luyIndex          ID = 475
+	luyKEIndex        ID = 476
+	lvIndex           ID = 477
+	lvLVIndex         ID = 478
+	masIndex          ID = 479
+	masKEIndex        ID = 480
+	masTZIndex        ID = 481
+	merIndex          ID = 482
+	merKEIndex        ID = 483
+	mfeIndex          ID = 484
+	mfeMUIndex        ID = 485
+	mgIndex           ID = 486
+	mgMGIndex         ID = 487
+	mghIndex          ID = 488
+	mghMZIndex        ID = 489
+	mgoIndex          ID = 490
+	mgoCMIndex        ID = 491
+	mkIndex           ID = 492
+	mkMKIndex         ID = 493
+	mlIndex           ID = 494
+	mlINIndex         ID = 495
+	mnIndex           ID = 496
+	mnMNIndex         ID = 497
+	moIndex           ID = 498
+	mrIndex           ID = 499
+	mrINIndex         ID = 500
+	msIndex           ID = 501
+	msBNIndex         ID = 502
+	msMYIndex         ID = 503
+	msSGIndex         ID = 504
+	mtIndex           ID = 505
+	mtMTIndex         ID = 506
+	muaIndex          ID = 507
+	muaCMIndex        ID = 508
+	myIndex           ID = 509
+	myMMIndex         ID = 510
+	mznIndex          ID = 511
+	mznIRIndex        ID = 512
+	nahIndex          ID = 513
+	naqIndex          ID = 514
+	naqNAIndex        ID = 515
+	nbIndex           ID = 516
+	nbNOIndex         ID = 517
+	nbSJIndex         ID = 518
+	ndIndex           ID = 519
+	ndZWIndex         ID = 520
+	ndsIndex          ID = 521
+	ndsDEIndex        ID = 522
+	ndsNLIndex        ID = 523
+	neIndex           ID = 524
+	neINIndex         ID = 525
+	neNPIndex         ID = 526
+	nlIndex           ID = 527
+	nlAWIndex         ID = 528
+	nlBEIndex         ID = 529
+	nlBQIndex         ID = 530
+	nlCWIndex         ID = 531
+	nlNLIndex         ID = 532
+	nlSRIndex         ID = 533
+	nlSXIndex         ID = 534
+	nmgIndex          ID = 535
+	nmgCMIndex        ID = 536
+	nnIndex           ID = 537
+	nnNOIndex         ID = 538
+	nnhIndex          ID = 539
+	nnhCMIndex        ID = 540
+	noIndex           ID = 541
+	nqoIndex          ID = 542
+	nrIndex           ID = 543
+	nsoIndex          ID = 544
+	nusIndex          ID = 545
+	nusSSIndex        ID = 546
+	nyIndex           ID = 547
+	nynIndex          ID = 548
+	nynUGIndex        ID = 549
+	omIndex           ID = 550
+	omETIndex         ID = 551
+	omKEIndex         ID = 552
+	orIndex           ID = 553
+	orINIndex         ID = 554
+	osIndex           ID = 555
+	osGEIndex         ID = 556
+	osRUIndex         ID = 557
+	paIndex           ID = 558
+	paArabIndex       ID = 559
+	paArabPKIndex     ID = 560
+	paGuruIndex       ID = 561
+	paGuruINIndex     ID = 562
+	papIndex          ID = 563
+	plIndex           ID = 564
+	plPLIndex         ID = 565
+	prgIndex          ID = 566
+	prg001Index       ID = 567
+	psIndex           ID = 568
+	psAFIndex         ID = 569
+	ptIndex           ID = 570
+	ptAOIndex         ID = 571
+	ptBRIndex         ID = 572
+	ptCHIndex         ID = 573
+	ptCVIndex         ID = 574
+	ptGQIndex         ID = 575
+	ptGWIndex         ID = 576
+	ptLUIndex         ID = 577
+	ptMOIndex         ID = 578
+	ptMZIndex         ID = 579
+	ptPTIndex         ID = 580
+	ptSTIndex         ID = 581
+	ptTLIndex         ID = 582
+	quIndex           ID = 583
+	quBOIndex         ID = 584
+	quECIndex         ID = 585
+	quPEIndex         ID = 586
+	rmIndex           ID = 587
+	rmCHIndex         ID = 588
+	rnIndex           ID = 589
+	rnBIIndex         ID = 590
+	roIndex           ID = 591
+	roMDIndex         ID = 592
+	roROIndex         ID = 593
+	rofIndex          ID = 594
+	rofTZIndex        ID = 595
+	ruIndex           ID = 596
+	ruBYIndex         ID = 597
+	ruKGIndex         ID = 598
+	ruKZIndex         ID = 599
+	ruMDIndex         ID = 600
+	ruRUIndex         ID = 601
+	ruUAIndex         ID = 602
+	rwIndex           ID = 603
+	rwRWIndex         ID = 604
+	rwkIndex          ID = 605
+	rwkTZIndex        ID = 606
+	sahIndex          ID = 607
+	sahRUIndex        ID = 608
+	saqIndex          ID = 609
+	saqKEIndex        ID = 610
+	sbpIndex          ID = 611
+	sbpTZIndex        ID = 612
+	sdIndex           ID = 613
+	sdPKIndex         ID = 614
+	sdhIndex          ID = 615
+	seIndex           ID = 616
+	seFIIndex         ID = 617
+	seNOIndex         ID = 618
+	seSEIndex         ID = 619
+	sehIndex          ID = 620
+	sehMZIndex        ID = 621
+	sesIndex          ID = 622
+	sesMLIndex        ID = 623
+	sgIndex           ID = 624
+	sgCFIndex         ID = 625
+	shIndex           ID = 626
+	shiIndex          ID = 627
+	shiLatnIndex      ID = 628
+	shiLatnMAIndex    ID = 629
+	shiTfngIndex      ID = 630
+	shiTfngMAIndex    ID = 631
+	siIndex           ID = 632
+	siLKIndex         ID = 633
+	skIndex           ID = 634
+	skSKIndex         ID = 635
+	slIndex           ID = 636
+	slSIIndex         ID = 637
+	smaIndex          ID = 638
+	smiIndex          ID = 639
+	smjIndex          ID = 640
+	smnIndex          ID = 641
+	smnFIIndex        ID = 642
+	smsIndex          ID = 643
+	snIndex           ID = 644
+	snZWIndex         ID = 645
+	soIndex           ID = 646
+	soDJIndex         ID = 647
+	soETIndex         ID = 648
+	soKEIndex         ID = 649
+	soSOIndex         ID = 650
+	sqIndex           ID = 651
+	sqALIndex         ID = 652
+	sqMKIndex         ID = 653
+	sqXKIndex         ID = 654
+	srIndex           ID = 655
+	srCyrlIndex       ID = 656
+	srCyrlBAIndex     ID = 657
+	srCyrlMEIndex     ID = 658
+	srCyrlRSIndex     ID = 659
+	srCyrlXKIndex     ID = 660
+	srLatnIndex       ID = 661
+	srLatnBAIndex     ID = 662
+	srLatnMEIndex     ID = 663
+	srLatnRSIndex     ID = 664
+	srLatnXKIndex     ID = 665
+	ssIndex           ID = 666
+	ssyIndex          ID = 667
+	stIndex           ID = 668
+	svIndex           ID = 669
+	svAXIndex         ID = 670
+	svFIIndex         ID = 671
+	svSEIndex         ID = 672
+	swIndex           ID = 673
+	swCDIndex         ID = 674
+	swKEIndex         ID = 675
+	swTZIndex         ID = 676
+	swUGIndex         ID = 677
+	syrIndex          ID = 678
+	taIndex           ID = 679
+	taINIndex         ID = 680
+	taLKIndex         ID = 681
+	taMYIndex         ID = 682
+	taSGIndex         ID = 683
+	teIndex           ID = 684
+	teINIndex         ID = 685
+	teoIndex          ID = 686
+	teoKEIndex        ID = 687
+	teoUGIndex        ID = 688
+	tgIndex           ID = 689
+	tgTJIndex         ID = 690
+	thIndex           ID = 691
+	thTHIndex         ID = 692
+	tiIndex           ID = 693
+	tiERIndex         ID = 694
+	tiETIndex         ID = 695
+	tigIndex          ID = 696
+	tkIndex           ID = 697
+	tkTMIndex         ID = 698
+	tlIndex           ID = 699
+	tnIndex           ID = 700
+	toIndex           ID = 701
+	toTOIndex         ID = 702
+	trIndex           ID = 703
+	trCYIndex         ID = 704
+	trTRIndex         ID = 705
+	tsIndex           ID = 706
+	ttIndex           ID = 707
+	ttRUIndex         ID = 708
+	twqIndex          ID = 709
+	twqNEIndex        ID = 710
+	tzmIndex          ID = 711
+	tzmMAIndex        ID = 712
+	ugIndex           ID = 713
+	ugCNIndex         ID = 714
+	ukIndex           ID = 715
+	ukUAIndex         ID = 716
+	urIndex           ID = 717
+	urINIndex         ID = 718
+	urPKIndex         ID = 719
+	uzIndex           ID = 720
+	uzArabIndex       ID = 721
+	uzArabAFIndex     ID = 722
+	uzCyrlIndex       ID = 723
+	uzCyrlUZIndex     ID = 724
+	uzLatnIndex       ID = 725
+	uzLatnUZIndex     ID = 726
+	vaiIndex          ID = 727
+	vaiLatnIndex      ID = 728
+	vaiLatnLRIndex    ID = 729
+	vaiVaiiIndex      ID = 730
+	vaiVaiiLRIndex    ID = 731
+	veIndex           ID = 732
+	viIndex           ID = 733
+	viVNIndex         ID = 734
+	voIndex           ID = 735
+	vo001Index        ID = 736
+	vunIndex          ID = 737
+	vunTZIndex        ID = 738
+	waIndex           ID = 739
+	waeIndex          ID = 740
+	waeCHIndex        ID = 741
+	woIndex           ID = 742
+	woSNIndex         ID = 743
+	xhIndex           ID = 744
+	xogIndex          ID = 745
+	xogUGIndex        ID = 746
+	yavIndex          ID = 747
+	yavCMIndex        ID = 748
+	yiIndex           ID = 749
+	yi001Index        ID = 750
+	yoIndex           ID = 751
+	yoBJIndex         ID = 752
+	yoNGIndex         ID = 753
+	yueIndex          ID = 754
+	yueHansIndex      ID = 755
+	yueHansCNIndex    ID = 756
+	yueHantIndex      ID = 757
+	yueHantHKIndex    ID = 758
+	zghIndex          ID = 759
+	zghMAIndex        ID = 760
+	zhIndex           ID = 761
+	zhHansIndex       ID = 762
+	zhHansCNIndex     ID = 763
+	zhHansHKIndex     ID = 764
+	zhHansMOIndex     ID = 765
+	zhHansSGIndex     ID = 766
+	zhHantIndex       ID = 767
+	zhHantHKIndex     ID = 768
+	zhHantMOIndex     ID = 769
+	zhHantTWIndex     ID = 770
+	zuIndex           ID = 771
+	zuZAIndex         ID = 772
+	caESvalenciaIndex ID = 773
+	enUSuvaposixIndex ID = 774
+)
+
+var coreTags = []language.CompactCoreInfo{ // 773 elements
+	// Entry 0 - 1F
+	0x00000000, 0x01600000, 0x016000d3, 0x01600162,
+	0x01c00000, 0x01c00052, 0x02100000, 0x02100081,
+	0x02700000, 0x02700070, 0x03a00000, 0x03a00001,
+	0x03a00023, 0x03a00039, 0x03a00063, 0x03a00068,
+	0x03a0006c, 0x03a0006d, 0x03a0006e, 0x03a00098,
+	0x03a0009c, 0x03a000a2, 0x03a000a9, 0x03a000ad,
+	0x03a000b1, 0x03a000ba, 0x03a000bb, 0x03a000ca,
+	0x03a000e2, 0x03a000ee, 0x03a000f4, 0x03a00109,
+	// Entry 20 - 3F
+	0x03a0010c, 0x03a00116, 0x03a00118, 0x03a0011d,
+	0x03a00121, 0x03a00129, 0x03a0015f, 0x04000000,
+	0x04300000, 0x0430009a, 0x04400000, 0x04400130,
+	0x04800000, 0x0480006f, 0x05800000, 0x05820000,
+	0x05820032, 0x0585b000, 0x0585b032, 0x05e00000,
+	0x05e00052, 0x07100000, 0x07100047, 0x07500000,
+	0x07500163, 0x07900000, 0x07900130, 0x07e00000,
+	0x07e00038, 0x08200000, 0x0a000000, 0x0a0000c4,
+	// Entry 40 - 5F
+	0x0a500000, 0x0a500035, 0x0a50009a, 0x0a900000,
+	0x0a900053, 0x0a90009a, 0x0b200000, 0x0b200079,
+	0x0b500000, 0x0b50009a, 0x0b700000, 0x0b720000,
+	0x0b720033, 0x0b75b000, 0x0b75b033, 0x0d700000,
+	0x0d700022, 0x0d70006f, 0x0d700079, 0x0d70009f,
+	0x0db00000, 0x0db00035, 0x0db0009a, 0x0dc00000,
+	0x0dc00107, 0x0df00000, 0x0df00132, 0x0e500000,
+	0x0e500136, 0x0e900000, 0x0e90009c, 0x0e90009d,
+	// Entry 60 - 7F
+	0x0fa00000, 0x0fa0005f, 0x0fe00000, 0x0fe00107,
+	0x10000000, 0x1000007c, 0x10100000, 0x10100064,
+	0x10100083, 0x10800000, 0x108000a5, 0x10d00000,
+	0x10d0002e, 0x10d00036, 0x10d0004e, 0x10d00061,
+	0x10d0009f, 0x10d000b3, 0x10d000b8, 0x11700000,
+	0x117000d5, 0x11f00000, 0x11f00061, 0x12400000,
+	0x12400052, 0x12800000, 0x12b00000, 0x12b00115,
+	0x12d00000, 0x12d00043, 0x12f00000, 0x12f000a5,
+	// Entry 80 - 9F
+	0x13000000, 0x13000081, 0x13000123, 0x13600000,
+	0x1360005e, 0x13600088, 0x13900000, 0x13900001,
+	0x1390001a, 0x13900025, 0x13900026, 0x1390002d,
+	0x1390002e, 0x1390002f, 0x13900034, 0x13900036,
+	0x1390003a, 0x1390003d, 0x13900042, 0x13900046,
+	0x13900048, 0x13900049, 0x1390004a, 0x1390004e,
+	0x13900050, 0x13900052, 0x1390005d, 0x1390005e,
+	0x13900061, 0x13900062, 0x13900064, 0x13900065,
+	// Entry A0 - BF
+	0x1390006e, 0x13900073, 0x13900074, 0x13900075,
+	0x13900076, 0x1390007c, 0x1390007d, 0x13900080,
+	0x13900081, 0x13900082, 0x13900084, 0x1390008b,
+	0x1390008d, 0x1390008e, 0x13900097, 0x13900098,
+	0x13900099, 0x1390009a, 0x1390009b, 0x139000a0,
+	0x139000a1, 0x139000a5, 0x139000a8, 0x139000aa,
+	0x139000ae, 0x139000b2, 0x139000b5, 0x139000b6,
+	0x139000c0, 0x139000c1, 0x139000c7, 0x139000c8,
+	// Entry C0 - DF
+	0x139000cb, 0x139000cc, 0x139000cd, 0x139000cf,
+	0x139000d1, 0x139000d3, 0x139000d6, 0x139000d7,
+	0x139000da, 0x139000de, 0x139000e0, 0x139000e1,
+	0x139000e7, 0x139000e8, 0x139000e9, 0x139000ec,
+	0x139000ed, 0x139000f1, 0x13900108, 0x1390010a,
+	0x1390010b, 0x1390010c, 0x1390010d, 0x1390010e,
+	0x1390010f, 0x13900110, 0x13900113, 0x13900118,
+	0x1390011c, 0x1390011e, 0x13900120, 0x13900126,
+	// Entry E0 - FF
+	0x1390012a, 0x1390012d, 0x1390012e, 0x13900130,
+	0x13900132, 0x13900134, 0x13900136, 0x1390013a,
+	0x1390013d, 0x1390013e, 0x13900140, 0x13900143,
+	0x13900162, 0x13900163, 0x13900165, 0x13c00000,
+	0x13c00001, 0x13e00000, 0x13e0001f, 0x13e0002c,
+	0x13e0003f, 0x13e00041, 0x13e00048, 0x13e00051,
+	0x13e00054, 0x13e00057, 0x13e0005a, 0x13e00066,
+	0x13e00069, 0x13e0006a, 0x13e0006f, 0x13e00087,
+	// Entry 100 - 11F
+	0x13e0008a, 0x13e00090, 0x13e00095, 0x13e000d0,
+	0x13e000d9, 0x13e000e3, 0x13e000e5, 0x13e000e8,
+	0x13e000ed, 0x13e000f2, 0x13e0011b, 0x13e00136,
+	0x13e00137, 0x13e0013c, 0x14000000, 0x1400006b,
+	0x14500000, 0x1450006f, 0x14600000, 0x14600052,
+	0x14800000, 0x14800024, 0x1480009d, 0x14e00000,
+	0x14e00052, 0x14e00085, 0x14e000ca, 0x14e00115,
+	0x15100000, 0x15100073, 0x15300000, 0x153000e8,
+	// Entry 120 - 13F
+	0x15800000, 0x15800064, 0x15800077, 0x15e00000,
+	0x15e00036, 0x15e00037, 0x15e0003a, 0x15e0003b,
+	0x15e0003c, 0x15e00049, 0x15e0004b, 0x15e0004c,
+	0x15e0004d, 0x15e0004e, 0x15e0004f, 0x15e00052,
+	0x15e00063, 0x15e00068, 0x15e00079, 0x15e0007b,
+	0x15e0007f, 0x15e00085, 0x15e00086, 0x15e00087,
+	0x15e00092, 0x15e000a9, 0x15e000b8, 0x15e000bb,
+	0x15e000bc, 0x15e000bf, 0x15e000c0, 0x15e000c4,
+	// Entry 140 - 15F
+	0x15e000c9, 0x15e000ca, 0x15e000cd, 0x15e000d4,
+	0x15e000d5, 0x15e000e6, 0x15e000eb, 0x15e00103,
+	0x15e00108, 0x15e0010b, 0x15e00115, 0x15e0011d,
+	0x15e00121, 0x15e00123, 0x15e00129, 0x15e00140,
+	0x15e00141, 0x15e00160, 0x16900000, 0x1690009f,
+	0x16d00000, 0x16d000da, 0x16e00000, 0x16e00097,
+	0x17e00000, 0x17e0007c, 0x19000000, 0x1900006f,
+	0x1a300000, 0x1a30004e, 0x1a300079, 0x1a3000b3,
+	// Entry 160 - 17F
+	0x1a400000, 0x1a40009a, 0x1a900000, 0x1ab00000,
+	0x1ab000a5, 0x1ac00000, 0x1ac00099, 0x1b400000,
+	0x1b400081, 0x1b4000d5, 0x1b4000d7, 0x1b800000,
+	0x1b800136, 0x1bc00000, 0x1bc00098, 0x1be00000,
+	0x1be0009a, 0x1d100000, 0x1d100033, 0x1d100091,
+	0x1d200000, 0x1d200061, 0x1d500000, 0x1d500093,
+	0x1d700000, 0x1d700028, 0x1e100000, 0x1e100096,
+	0x1e700000, 0x1e7000d7, 0x1ea00000, 0x1ea00053,
+	// Entry 180 - 19F
+	0x1f300000, 0x1f500000, 0x1f800000, 0x1f80009e,
+	0x1f900000, 0x1f90004e, 0x1f90009f, 0x1f900114,
+	0x1f900139, 0x1fa00000, 0x1fb00000, 0x20000000,
+	0x200000a3, 0x20300000, 0x20700000, 0x20700052,
+	0x20800000, 0x20a00000, 0x20a00130, 0x20e00000,
+	0x20f00000, 0x21000000, 0x2100007e, 0x21200000,
+	0x21200068, 0x21600000, 0x21700000, 0x217000a5,
+	0x21f00000, 0x22300000, 0x22300130, 0x22700000,
+	// Entry 1A0 - 1BF
+	0x2270005b, 0x23400000, 0x234000c4, 0x23900000,
+	0x239000a5, 0x24200000, 0x242000af, 0x24400000,
+	0x24400052, 0x24500000, 0x24500083, 0x24600000,
+	0x246000a5, 0x24a00000, 0x24a000a7, 0x25100000,
+	0x2510009a, 0x25400000, 0x254000ab, 0x254000ac,
+	0x25600000, 0x2560009a, 0x26a00000, 0x26a0009a,
+	0x26b00000, 0x26b00130, 0x26d00000, 0x26d00052,
+	0x26e00000, 0x26e00061, 0x27400000, 0x28100000,
+	// Entry 1C0 - 1DF
+	0x2810007c, 0x28a00000, 0x28a000a6, 0x29100000,
+	0x29100130, 0x29500000, 0x295000b8, 0x2a300000,
+	0x2a300132, 0x2af00000, 0x2af00136, 0x2b500000,
+	0x2b50002a, 0x2b50004b, 0x2b50004c, 0x2b50004d,
+	0x2b800000, 0x2b8000b0, 0x2bf00000, 0x2bf0009c,
+	0x2bf0009d, 0x2c000000, 0x2c0000b7, 0x2c200000,
+	0x2c20004b, 0x2c400000, 0x2c4000a5, 0x2c500000,
+	0x2c5000a5, 0x2c700000, 0x2c7000b9, 0x2d100000,
+	// Entry 1E0 - 1FF
+	0x2d1000a5, 0x2d100130, 0x2e900000, 0x2e9000a5,
+	0x2ed00000, 0x2ed000cd, 0x2f100000, 0x2f1000c0,
+	0x2f200000, 0x2f2000d2, 0x2f400000, 0x2f400052,
+	0x2ff00000, 0x2ff000c3, 0x30400000, 0x3040009a,
+	0x30b00000, 0x30b000c6, 0x31000000, 0x31b00000,
+	0x31b0009a, 0x31f00000, 0x31f0003e, 0x31f000d1,
+	0x31f0010e, 0x32000000, 0x320000cc, 0x32500000,
+	0x32500052, 0x33100000, 0x331000c5, 0x33a00000,
+	// Entry 200 - 21F
+	0x33a0009d, 0x34100000, 0x34500000, 0x345000d3,
+	0x34700000, 0x347000db, 0x34700111, 0x34e00000,
+	0x34e00165, 0x35000000, 0x35000061, 0x350000da,
+	0x35100000, 0x3510009a, 0x351000dc, 0x36700000,
+	0x36700030, 0x36700036, 0x36700040, 0x3670005c,
+	0x367000da, 0x36700117, 0x3670011c, 0x36800000,
+	0x36800052, 0x36a00000, 0x36a000db, 0x36c00000,
+	0x36c00052, 0x36f00000, 0x37500000, 0x37600000,
+	// Entry 220 - 23F
+	0x37a00000, 0x38000000, 0x38000118, 0x38700000,
+	0x38900000, 0x38900132, 0x39000000, 0x39000070,
+	0x390000a5, 0x39500000, 0x3950009a, 0x39800000,
+	0x3980007e, 0x39800107, 0x39d00000, 0x39d05000,
+	0x39d050e9, 0x39d36000, 0x39d3609a, 0x3a100000,
+	0x3b300000, 0x3b3000ea, 0x3bd00000, 0x3bd00001,
+	0x3be00000, 0x3be00024, 0x3c000000, 0x3c00002a,
+	0x3c000041, 0x3c00004e, 0x3c00005b, 0x3c000087,
+	// Entry 240 - 25F
+	0x3c00008c, 0x3c0000b8, 0x3c0000c7, 0x3c0000d2,
+	0x3c0000ef, 0x3c000119, 0x3c000127, 0x3c400000,
+	0x3c40003f, 0x3c40006a, 0x3c4000e5, 0x3d400000,
+	0x3d40004e, 0x3d900000, 0x3d90003a, 0x3dc00000,
+	0x3dc000bd, 0x3dc00105, 0x3de00000, 0x3de00130,
+	0x3e200000, 0x3e200047, 0x3e2000a6, 0x3e2000af,
+	0x3e2000bd, 0x3e200107, 0x3e200131, 0x3e500000,
+	0x3e500108, 0x3e600000, 0x3e600130, 0x3eb00000,
+	// Entry 260 - 27F
+	0x3eb00107, 0x3ec00000, 0x3ec000a5, 0x3f300000,
+	0x3f300130, 0x3fa00000, 0x3fa000e9, 0x3fc00000,
+	0x3fd00000, 0x3fd00073, 0x3fd000db, 0x3fd0010d,
+	0x3ff00000, 0x3ff000d2, 0x40100000, 0x401000c4,
+	0x40200000, 0x4020004c, 0x40700000, 0x40800000,
+	0x4085b000, 0x4085b0bb, 0x408eb000, 0x408eb0bb,
+	0x40c00000, 0x40c000b4, 0x41200000, 0x41200112,
+	0x41600000, 0x41600110, 0x41c00000, 0x41d00000,
+	// Entry 280 - 29F
+	0x41e00000, 0x41f00000, 0x41f00073, 0x42200000,
+	0x42300000, 0x42300165, 0x42900000, 0x42900063,
+	0x42900070, 0x429000a5, 0x42900116, 0x43100000,
+	0x43100027, 0x431000c3, 0x4310014e, 0x43200000,
+	0x43220000, 0x43220033, 0x432200be, 0x43220106,
+	0x4322014e, 0x4325b000, 0x4325b033, 0x4325b0be,
+	0x4325b106, 0x4325b14e, 0x43700000, 0x43a00000,
+	0x43b00000, 0x44400000, 0x44400031, 0x44400073,
+	// Entry 2A0 - 2BF
+	0x4440010d, 0x44500000, 0x4450004b, 0x445000a5,
+	0x44500130, 0x44500132, 0x44e00000, 0x45000000,
+	0x4500009a, 0x450000b4, 0x450000d1, 0x4500010e,
+	0x46100000, 0x4610009a, 0x46400000, 0x464000a5,
+	0x46400132, 0x46700000, 0x46700125, 0x46b00000,
+	0x46b00124, 0x46f00000, 0x46f0006e, 0x46f00070,
+	0x47100000, 0x47600000, 0x47600128, 0x47a00000,
+	0x48000000, 0x48200000, 0x4820012a, 0x48a00000,
+	// Entry 2C0 - 2DF
+	0x48a0005e, 0x48a0012c, 0x48e00000, 0x49400000,
+	0x49400107, 0x4a400000, 0x4a4000d5, 0x4a900000,
+	0x4a9000bb, 0x4ac00000, 0x4ac00053, 0x4ae00000,
+	0x4ae00131, 0x4b400000, 0x4b40009a, 0x4b4000e9,
+	0x4bc00000, 0x4bc05000, 0x4bc05024, 0x4bc20000,
+	0x4bc20138, 0x4bc5b000, 0x4bc5b138, 0x4be00000,
+	0x4be5b000, 0x4be5b0b5, 0x4bef4000, 0x4bef40b5,
+	0x4c000000, 0x4c300000, 0x4c30013f, 0x4c900000,
+	// Entry 2E0 - 2FF
+	0x4c900001, 0x4cc00000, 0x4cc00130, 0x4ce00000,
+	0x4cf00000, 0x4cf0004e, 0x4e500000, 0x4e500115,
+	0x4f200000, 0x4fb00000, 0x4fb00132, 0x50900000,
+	0x50900052, 0x51200000, 0x51200001, 0x51800000,
+	0x5180003b, 0x518000d7, 0x51f00000, 0x51f3b000,
+	0x51f3b053, 0x51f3c000, 0x51f3c08e, 0x52800000,
+	0x528000bb, 0x52900000, 0x5293b000, 0x5293b053,
+	0x5293b08e, 0x5293b0c7, 0x5293b10e, 0x5293c000,
+	// Entry 300 - 31F
+	0x5293c08e, 0x5293c0c7, 0x5293c12f, 0x52f00000,
+	0x52f00162,
+} // Size: 3116 bytes
+
+const specialTagsStr string = "ca-ES-valencia en-US-u-va-posix"
+
+// Total table size 3147 bytes (3KiB); checksum: 5A8FFFA5
diff --git a/vendor/golang.org/x/text/internal/language/compact/tags.go b/vendor/golang.org/x/text/internal/language/compact/tags.go
new file mode 100644
index 000000000..ca135d295
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compact/tags.go
@@ -0,0 +1,91 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package compact
+
+var (
+	und = Tag{}
+
+	Und Tag = Tag{}
+
+	Afrikaans            Tag = Tag{language: afIndex, locale: afIndex}
+	Amharic              Tag = Tag{language: amIndex, locale: amIndex}
+	Arabic               Tag = Tag{language: arIndex, locale: arIndex}
+	ModernStandardArabic Tag = Tag{language: ar001Index, locale: ar001Index}
+	Azerbaijani          Tag = Tag{language: azIndex, locale: azIndex}
+	Bulgarian            Tag = Tag{language: bgIndex, locale: bgIndex}
+	Bengali              Tag = Tag{language: bnIndex, locale: bnIndex}
+	Catalan              Tag = Tag{language: caIndex, locale: caIndex}
+	Czech                Tag = Tag{language: csIndex, locale: csIndex}
+	Danish               Tag = Tag{language: daIndex, locale: daIndex}
+	German               Tag = Tag{language: deIndex, locale: deIndex}
+	Greek                Tag = Tag{language: elIndex, locale: elIndex}
+	English              Tag = Tag{language: enIndex, locale: enIndex}
+	AmericanEnglish      Tag = Tag{language: enUSIndex, locale: enUSIndex}
+	BritishEnglish       Tag = Tag{language: enGBIndex, locale: enGBIndex}
+	Spanish              Tag = Tag{language: esIndex, locale: esIndex}
+	EuropeanSpanish      Tag = Tag{language: esESIndex, locale: esESIndex}
+	LatinAmericanSpanish Tag = Tag{language: es419Index, locale: es419Index}
+	Estonian             Tag = Tag{language: etIndex, locale: etIndex}
+	Persian              Tag = Tag{language: faIndex, locale: faIndex}
+	Finnish              Tag = Tag{language: fiIndex, locale: fiIndex}
+	Filipino             Tag = Tag{language: filIndex, locale: filIndex}
+	French               Tag = Tag{language: frIndex, locale: frIndex}
+	CanadianFrench       Tag = Tag{language: frCAIndex, locale: frCAIndex}
+	Gujarati             Tag = Tag{language: guIndex, locale: guIndex}
+	Hebrew               Tag = Tag{language: heIndex, locale: heIndex}
+	Hindi                Tag = Tag{language: hiIndex, locale: hiIndex}
+	Croatian             Tag = Tag{language: hrIndex, locale: hrIndex}
+	Hungarian            Tag = Tag{language: huIndex, locale: huIndex}
+	Armenian             Tag = Tag{language: hyIndex, locale: hyIndex}
+	Indonesian           Tag = Tag{language: idIndex, locale: idIndex}
+	Icelandic            Tag = Tag{language: isIndex, locale: isIndex}
+	Italian              Tag = Tag{language: itIndex, locale: itIndex}
+	Japanese             Tag = Tag{language: jaIndex, locale: jaIndex}
+	Georgian             Tag = Tag{language: kaIndex, locale: kaIndex}
+	Kazakh               Tag = Tag{language: kkIndex, locale: kkIndex}
+	Khmer                Tag = Tag{language: kmIndex, locale: kmIndex}
+	Kannada              Tag = Tag{language: knIndex, locale: knIndex}
+	Korean               Tag = Tag{language: koIndex, locale: koIndex}
+	Kirghiz              Tag = Tag{language: kyIndex, locale: kyIndex}
+	Lao                  Tag = Tag{language: loIndex, locale: loIndex}
+	Lithuanian           Tag = Tag{language: ltIndex, locale: ltIndex}
+	Latvian              Tag = Tag{language: lvIndex, locale: lvIndex}
+	Macedonian           Tag = Tag{language: mkIndex, locale: mkIndex}
+	Malayalam            Tag = Tag{language: mlIndex, locale: mlIndex}
+	Mongolian            Tag = Tag{language: mnIndex, locale: mnIndex}
+	Marathi              Tag = Tag{language: mrIndex, locale: mrIndex}
+	Malay                Tag = Tag{language: msIndex, locale: msIndex}
+	Burmese              Tag = Tag{language: myIndex, locale: myIndex}
+	Nepali               Tag = Tag{language: neIndex, locale: neIndex}
+	Dutch                Tag = Tag{language: nlIndex, locale: nlIndex}
+	Norwegian            Tag = Tag{language: noIndex, locale: noIndex}
+	Punjabi              Tag = Tag{language: paIndex, locale: paIndex}
+	Polish               Tag = Tag{language: plIndex, locale: plIndex}
+	Portuguese           Tag = Tag{language: ptIndex, locale: ptIndex}
+	BrazilianPortuguese  Tag = Tag{language: ptBRIndex, locale: ptBRIndex}
+	EuropeanPortuguese   Tag = Tag{language: ptPTIndex, locale: ptPTIndex}
+	Romanian             Tag = Tag{language: roIndex, locale: roIndex}
+	Russian              Tag = Tag{language: ruIndex, locale: ruIndex}
+	Sinhala              Tag = Tag{language: siIndex, locale: siIndex}
+	Slovak               Tag = Tag{language: skIndex, locale: skIndex}
+	Slovenian            Tag = Tag{language: slIndex, locale: slIndex}
+	Albanian             Tag = Tag{language: sqIndex, locale: sqIndex}
+	Serbian              Tag = Tag{language: srIndex, locale: srIndex}
+	SerbianLatin         Tag = Tag{language: srLatnIndex, locale: srLatnIndex}
+	Swedish              Tag = Tag{language: svIndex, locale: svIndex}
+	Swahili              Tag = Tag{language: swIndex, locale: swIndex}
+	Tamil                Tag = Tag{language: taIndex, locale: taIndex}
+	Telugu               Tag = Tag{language: teIndex, locale: teIndex}
+	Thai                 Tag = Tag{language: thIndex, locale: thIndex}
+	Turkish              Tag = Tag{language: trIndex, locale: trIndex}
+	Ukrainian            Tag = Tag{language: ukIndex, locale: ukIndex}
+	Urdu                 Tag = Tag{language: urIndex, locale: urIndex}
+	Uzbek                Tag = Tag{language: uzIndex, locale: uzIndex}
+	Vietnamese           Tag = Tag{language: viIndex, locale: viIndex}
+	Chinese              Tag = Tag{language: zhIndex, locale: zhIndex}
+	SimplifiedChinese    Tag = Tag{language: zhHansIndex, locale: zhHansIndex}
+	TraditionalChinese   Tag = Tag{language: zhHantIndex, locale: zhHantIndex}
+	Zulu                 Tag = Tag{language: zuIndex, locale: zuIndex}
+)
diff --git a/vendor/golang.org/x/text/internal/language/compose.go b/vendor/golang.org/x/text/internal/language/compose.go
new file mode 100644
index 000000000..4ae78e0fa
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/compose.go
@@ -0,0 +1,167 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import (
+	"sort"
+	"strings"
+)
+
+// A Builder allows constructing a Tag from individual components.
+// Its main user is Compose in the top-level language package.
+type Builder struct {
+	Tag Tag
+
+	private    string // the x extension
+	variants   []string
+	extensions []string
+}
+
+// Make returns a new Tag from the current settings.
+func (b *Builder) Make() Tag {
+	t := b.Tag
+
+	if len(b.extensions) > 0 || len(b.variants) > 0 {
+		sort.Sort(sortVariants(b.variants))
+		sort.Strings(b.extensions)
+
+		if b.private != "" {
+			b.extensions = append(b.extensions, b.private)
+		}
+		n := maxCoreSize + tokenLen(b.variants...) + tokenLen(b.extensions...)
+		buf := make([]byte, n)
+		p := t.genCoreBytes(buf)
+		t.pVariant = byte(p)
+		p += appendTokens(buf[p:], b.variants...)
+		t.pExt = uint16(p)
+		p += appendTokens(buf[p:], b.extensions...)
+		t.str = string(buf[:p])
+		// We may not always need to remake the string, but when or when not
+		// to do so is rather tricky.
+		scan := makeScanner(buf[:p])
+		t, _ = parse(&scan, "")
+		return t
+
+	} else if b.private != "" {
+		t.str = b.private
+		t.RemakeString()
+	}
+	return t
+}
+
+// SetTag copies all the settings from a given Tag. Any previously set values
+// are discarded.
+func (b *Builder) SetTag(t Tag) {
+	b.Tag.LangID = t.LangID
+	b.Tag.RegionID = t.RegionID
+	b.Tag.ScriptID = t.ScriptID
+	// TODO: optimize
+	b.variants = b.variants[:0]
+	if variants := t.Variants(); variants != "" {
+		for _, vr := range strings.Split(variants[1:], "-") {
+			b.variants = append(b.variants, vr)
+		}
+	}
+	b.extensions, b.private = b.extensions[:0], ""
+	for _, e := range t.Extensions() {
+		b.AddExt(e)
+	}
+}
+
+// AddExt adds extension e to the tag. e must be a valid extension as returned
+// by Tag.Extension. If the extension already exists, it will be discarded,
+// except for a -u extension, where non-existing key-type pairs will added.
+func (b *Builder) AddExt(e string) {
+	if e[0] == 'x' {
+		if b.private == "" {
+			b.private = e
+		}
+		return
+	}
+	for i, s := range b.extensions {
+		if s[0] == e[0] {
+			if e[0] == 'u' {
+				b.extensions[i] += e[1:]
+			}
+			return
+		}
+	}
+	b.extensions = append(b.extensions, e)
+}
+
+// SetExt sets the extension e to the tag. e must be a valid extension as
+// returned by Tag.Extension. If the extension already exists, it will be
+// overwritten, except for a -u extension, where the individual key-type pairs
+// will be set.
+func (b *Builder) SetExt(e string) {
+	if e[0] == 'x' {
+		b.private = e
+		return
+	}
+	for i, s := range b.extensions {
+		if s[0] == e[0] {
+			if e[0] == 'u' {
+				b.extensions[i] = e + s[1:]
+			} else {
+				b.extensions[i] = e
+			}
+			return
+		}
+	}
+	b.extensions = append(b.extensions, e)
+}
+
+// AddVariant adds any number of variants.
+func (b *Builder) AddVariant(v ...string) {
+	for _, v := range v {
+		if v != "" {
+			b.variants = append(b.variants, v)
+		}
+	}
+}
+
+// ClearVariants removes any variants previously added, including those
+// copied from a Tag in SetTag.
+func (b *Builder) ClearVariants() {
+	b.variants = b.variants[:0]
+}
+
+// ClearExtensions removes any extensions previously added, including those
+// copied from a Tag in SetTag.
+func (b *Builder) ClearExtensions() {
+	b.private = ""
+	b.extensions = b.extensions[:0]
+}
+
+func tokenLen(token ...string) (n int) {
+	for _, t := range token {
+		n += len(t) + 1
+	}
+	return
+}
+
+func appendTokens(b []byte, token ...string) int {
+	p := 0
+	for _, t := range token {
+		b[p] = '-'
+		copy(b[p+1:], t)
+		p += 1 + len(t)
+	}
+	return p
+}
+
+type sortVariants []string
+
+func (s sortVariants) Len() int {
+	return len(s)
+}
+
+func (s sortVariants) Swap(i, j int) {
+	s[j], s[i] = s[i], s[j]
+}
+
+func (s sortVariants) Less(i, j int) bool {
+	return variantIndex[s[i]] < variantIndex[s[j]]
+}
diff --git a/vendor/golang.org/x/text/internal/language/coverage.go b/vendor/golang.org/x/text/internal/language/coverage.go
new file mode 100644
index 000000000..9b20b88fe
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/coverage.go
@@ -0,0 +1,28 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+// BaseLanguages returns the list of all supported base languages. It generates
+// the list by traversing the internal structures.
+func BaseLanguages() []Language {
+	base := make([]Language, 0, NumLanguages)
+	for i := 0; i < langNoIndexOffset; i++ {
+		// We included "und" already for the value 0.
+		if i != nonCanonicalUnd {
+			base = append(base, Language(i))
+		}
+	}
+	i := langNoIndexOffset
+	for _, v := range langNoIndex {
+		for k := 0; k < 8; k++ {
+			if v&1 == 1 {
+				base = append(base, Language(i))
+			}
+			v >>= 1
+			i++
+		}
+	}
+	return base
+}
diff --git a/vendor/golang.org/x/text/internal/language/language.go b/vendor/golang.org/x/text/internal/language/language.go
new file mode 100644
index 000000000..09d41c736
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/language.go
@@ -0,0 +1,627 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go gen_common.go -output tables.go
+
+package language // import "golang.org/x/text/internal/language"
+
+// TODO: Remove above NOTE after:
+// - verifying that tables are dropped correctly (most notably matcher tables).
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+const (
+	// maxCoreSize is the maximum size of a BCP 47 tag without variants and
+	// extensions. Equals max lang (3) + script (4) + max reg (3) + 2 dashes.
+	maxCoreSize = 12
+
+	// max99thPercentileSize is a somewhat arbitrary buffer size that presumably
+	// is large enough to hold at least 99% of the BCP 47 tags.
+	max99thPercentileSize = 32
+
+	// maxSimpleUExtensionSize is the maximum size of a -u extension with one
+	// key-type pair. Equals len("-u-") + key (2) + dash + max value (8).
+	maxSimpleUExtensionSize = 14
+)
+
+// Tag represents a BCP 47 language tag. It is used to specify an instance of a
+// specific language or locale. All language tag values are guaranteed to be
+// well-formed. The zero value of Tag is Und.
+type Tag struct {
+	// TODO: the following fields have the form TagTypeID. This name is chosen
+	// to allow refactoring the public package without conflicting with its
+	// Base, Script, and Region methods. Once the transition is fully completed
+	// the ID can be stripped from the name.
+
+	LangID   Language
+	RegionID Region
+	// TODO: we will soon run out of positions for ScriptID. Idea: instead of
+	// storing lang, region, and ScriptID codes, store only the compact index and
+	// have a lookup table from this code to its expansion. This greatly speeds
+	// up table lookup, speed up common variant cases.
+	// This will also immediately free up 3 extra bytes. Also, the pVariant
+	// field can now be moved to the lookup table, as the compact index uniquely
+	// determines the offset of a possible variant.
+	ScriptID Script
+	pVariant byte   // offset in str, includes preceding '-'
+	pExt     uint16 // offset of first extension, includes preceding '-'
+
+	// str is the string representation of the Tag. It will only be used if the
+	// tag has variants or extensions.
+	str string
+}
+
+// Make is a convenience wrapper for Parse that omits the error.
+// In case of an error, a sensible default is returned.
+func Make(s string) Tag {
+	t, _ := Parse(s)
+	return t
+}
+
+// Raw returns the raw base language, script and region, without making an
+// attempt to infer their values.
+// TODO: consider removing
+func (t Tag) Raw() (b Language, s Script, r Region) {
+	return t.LangID, t.ScriptID, t.RegionID
+}
+
+// equalTags compares language, script and region subtags only.
+func (t Tag) equalTags(a Tag) bool {
+	return t.LangID == a.LangID && t.ScriptID == a.ScriptID && t.RegionID == a.RegionID
+}
+
+// IsRoot returns true if t is equal to language "und".
+func (t Tag) IsRoot() bool {
+	if int(t.pVariant) < len(t.str) {
+		return false
+	}
+	return t.equalTags(Und)
+}
+
+// IsPrivateUse reports whether the Tag consists solely of an IsPrivateUse use
+// tag.
+func (t Tag) IsPrivateUse() bool {
+	return t.str != "" && t.pVariant == 0
+}
+
+// RemakeString is used to update t.str in case lang, script or region changed.
+// It is assumed that pExt and pVariant still point to the start of the
+// respective parts.
+func (t *Tag) RemakeString() {
+	if t.str == "" {
+		return
+	}
+	extra := t.str[t.pVariant:]
+	if t.pVariant > 0 {
+		extra = extra[1:]
+	}
+	if t.equalTags(Und) && strings.HasPrefix(extra, "x-") {
+		t.str = extra
+		t.pVariant = 0
+		t.pExt = 0
+		return
+	}
+	var buf [max99thPercentileSize]byte // avoid extra memory allocation in most cases.
+	b := buf[:t.genCoreBytes(buf[:])]
+	if extra != "" {
+		diff := len(b) - int(t.pVariant)
+		b = append(b, '-')
+		b = append(b, extra...)
+		t.pVariant = uint8(int(t.pVariant) + diff)
+		t.pExt = uint16(int(t.pExt) + diff)
+	} else {
+		t.pVariant = uint8(len(b))
+		t.pExt = uint16(len(b))
+	}
+	t.str = string(b)
+}
+
+// genCoreBytes writes a string for the base languages, script and region tags
+// to the given buffer and returns the number of bytes written. It will never
+// write more than maxCoreSize bytes.
+func (t *Tag) genCoreBytes(buf []byte) int {
+	n := t.LangID.StringToBuf(buf[:])
+	if t.ScriptID != 0 {
+		n += copy(buf[n:], "-")
+		n += copy(buf[n:], t.ScriptID.String())
+	}
+	if t.RegionID != 0 {
+		n += copy(buf[n:], "-")
+		n += copy(buf[n:], t.RegionID.String())
+	}
+	return n
+}
+
+// String returns the canonical string representation of the language tag.
+func (t Tag) String() string {
+	if t.str != "" {
+		return t.str
+	}
+	if t.ScriptID == 0 && t.RegionID == 0 {
+		return t.LangID.String()
+	}
+	buf := [maxCoreSize]byte{}
+	return string(buf[:t.genCoreBytes(buf[:])])
+}
+
+// MarshalText implements encoding.TextMarshaler.
+func (t Tag) MarshalText() (text []byte, err error) {
+	if t.str != "" {
+		text = append(text, t.str...)
+	} else if t.ScriptID == 0 && t.RegionID == 0 {
+		text = append(text, t.LangID.String()...)
+	} else {
+		buf := [maxCoreSize]byte{}
+		text = buf[:t.genCoreBytes(buf[:])]
+	}
+	return text, nil
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (t *Tag) UnmarshalText(text []byte) error {
+	tag, err := Parse(string(text))
+	*t = tag
+	return err
+}
+
+// Variants returns the part of the tag holding all variants or the empty string
+// if there are no variants defined.
+func (t Tag) Variants() string {
+	if t.pVariant == 0 {
+		return ""
+	}
+	return t.str[t.pVariant:t.pExt]
+}
+
+// VariantOrPrivateUseTags returns variants or private use tags.
+func (t Tag) VariantOrPrivateUseTags() string {
+	if t.pExt > 0 {
+		return t.str[t.pVariant:t.pExt]
+	}
+	return t.str[t.pVariant:]
+}
+
+// HasString reports whether this tag defines more than just the raw
+// components.
+func (t Tag) HasString() bool {
+	return t.str != ""
+}
+
+// Parent returns the CLDR parent of t. In CLDR, missing fields in data for a
+// specific language are substituted with fields from the parent language.
+// The parent for a language may change for newer versions of CLDR.
+func (t Tag) Parent() Tag {
+	if t.str != "" {
+		// Strip the variants and extensions.
+		b, s, r := t.Raw()
+		t = Tag{LangID: b, ScriptID: s, RegionID: r}
+		if t.RegionID == 0 && t.ScriptID != 0 && t.LangID != 0 {
+			base, _ := addTags(Tag{LangID: t.LangID})
+			if base.ScriptID == t.ScriptID {
+				return Tag{LangID: t.LangID}
+			}
+		}
+		return t
+	}
+	if t.LangID != 0 {
+		if t.RegionID != 0 {
+			maxScript := t.ScriptID
+			if maxScript == 0 {
+				max, _ := addTags(t)
+				maxScript = max.ScriptID
+			}
+
+			for i := range parents {
+				if Language(parents[i].lang) == t.LangID && Script(parents[i].maxScript) == maxScript {
+					for _, r := range parents[i].fromRegion {
+						if Region(r) == t.RegionID {
+							return Tag{
+								LangID:   t.LangID,
+								ScriptID: Script(parents[i].script),
+								RegionID: Region(parents[i].toRegion),
+							}
+						}
+					}
+				}
+			}
+
+			// Strip the script if it is the default one.
+			base, _ := addTags(Tag{LangID: t.LangID})
+			if base.ScriptID != maxScript {
+				return Tag{LangID: t.LangID, ScriptID: maxScript}
+			}
+			return Tag{LangID: t.LangID}
+		} else if t.ScriptID != 0 {
+			// The parent for an base-script pair with a non-default script is
+			// "und" instead of the base language.
+			base, _ := addTags(Tag{LangID: t.LangID})
+			if base.ScriptID != t.ScriptID {
+				return Und
+			}
+			return Tag{LangID: t.LangID}
+		}
+	}
+	return Und
+}
+
+// ParseExtension parses s as an extension and returns it on success.
+func ParseExtension(s string) (ext string, err error) {
+	defer func() {
+		if recover() != nil {
+			ext = ""
+			err = ErrSyntax
+		}
+	}()
+
+	scan := makeScannerString(s)
+	var end int
+	if n := len(scan.token); n != 1 {
+		return "", ErrSyntax
+	}
+	scan.toLower(0, len(scan.b))
+	end = parseExtension(&scan)
+	if end != len(s) {
+		return "", ErrSyntax
+	}
+	return string(scan.b), nil
+}
+
+// HasVariants reports whether t has variants.
+func (t Tag) HasVariants() bool {
+	return uint16(t.pVariant) < t.pExt
+}
+
+// HasExtensions reports whether t has extensions.
+func (t Tag) HasExtensions() bool {
+	return int(t.pExt) < len(t.str)
+}
+
+// Extension returns the extension of type x for tag t. It will return
+// false for ok if t does not have the requested extension. The returned
+// extension will be invalid in this case.
+func (t Tag) Extension(x byte) (ext string, ok bool) {
+	for i := int(t.pExt); i < len(t.str)-1; {
+		var ext string
+		i, ext = getExtension(t.str, i)
+		if ext[0] == x {
+			return ext, true
+		}
+	}
+	return "", false
+}
+
+// Extensions returns all extensions of t.
+func (t Tag) Extensions() []string {
+	e := []string{}
+	for i := int(t.pExt); i < len(t.str)-1; {
+		var ext string
+		i, ext = getExtension(t.str, i)
+		e = append(e, ext)
+	}
+	return e
+}
+
+// TypeForKey returns the type associated with the given key, where key and type
+// are of the allowed values defined for the Unicode locale extension ('u') in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+// TypeForKey will traverse the inheritance chain to get the correct value.
+//
+// If there are multiple types associated with a key, only the first will be
+// returned. If there is no type associated with a key, it returns the empty
+// string.
+func (t Tag) TypeForKey(key string) string {
+	if _, start, end, _ := t.findTypeForKey(key); end != start {
+		s := t.str[start:end]
+		if p := strings.IndexByte(s, '-'); p >= 0 {
+			s = s[:p]
+		}
+		return s
+	}
+	return ""
+}
+
+var (
+	errPrivateUse       = errors.New("cannot set a key on a private use tag")
+	errInvalidArguments = errors.New("invalid key or type")
+)
+
+// SetTypeForKey returns a new Tag with the key set to type, where key and type
+// are of the allowed values defined for the Unicode locale extension ('u') in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+// An empty value removes an existing pair with the same key.
+func (t Tag) SetTypeForKey(key, value string) (Tag, error) {
+	if t.IsPrivateUse() {
+		return t, errPrivateUse
+	}
+	if len(key) != 2 {
+		return t, errInvalidArguments
+	}
+
+	// Remove the setting if value is "".
+	if value == "" {
+		start, sep, end, _ := t.findTypeForKey(key)
+		if start != sep {
+			// Remove a possible empty extension.
+			switch {
+			case t.str[start-2] != '-': // has previous elements.
+			case end == len(t.str), // end of string
+				end+2 < len(t.str) && t.str[end+2] == '-': // end of extension
+				start -= 2
+			}
+			if start == int(t.pVariant) && end == len(t.str) {
+				t.str = ""
+				t.pVariant, t.pExt = 0, 0
+			} else {
+				t.str = fmt.Sprintf("%s%s", t.str[:start], t.str[end:])
+			}
+		}
+		return t, nil
+	}
+
+	if len(value) < 3 || len(value) > 8 {
+		return t, errInvalidArguments
+	}
+
+	var (
+		buf    [maxCoreSize + maxSimpleUExtensionSize]byte
+		uStart int // start of the -u extension.
+	)
+
+	// Generate the tag string if needed.
+	if t.str == "" {
+		uStart = t.genCoreBytes(buf[:])
+		buf[uStart] = '-'
+		uStart++
+	}
+
+	// Create new key-type pair and parse it to verify.
+	b := buf[uStart:]
+	copy(b, "u-")
+	copy(b[2:], key)
+	b[4] = '-'
+	b = b[:5+copy(b[5:], value)]
+	scan := makeScanner(b)
+	if parseExtensions(&scan); scan.err != nil {
+		return t, scan.err
+	}
+
+	// Assemble the replacement string.
+	if t.str == "" {
+		t.pVariant, t.pExt = byte(uStart-1), uint16(uStart-1)
+		t.str = string(buf[:uStart+len(b)])
+	} else {
+		s := t.str
+		start, sep, end, hasExt := t.findTypeForKey(key)
+		if start == sep {
+			if hasExt {
+				b = b[2:]
+			}
+			t.str = fmt.Sprintf("%s-%s%s", s[:sep], b, s[end:])
+		} else {
+			t.str = fmt.Sprintf("%s-%s%s", s[:start+3], value, s[end:])
+		}
+	}
+	return t, nil
+}
+
+// findTypeForKey returns the start and end position for the type corresponding
+// to key or the point at which to insert the key-value pair if the type
+// wasn't found. The hasExt return value reports whether an -u extension was present.
+// Note: the extensions are typically very small and are likely to contain
+// only one key-type pair.
+func (t Tag) findTypeForKey(key string) (start, sep, end int, hasExt bool) {
+	p := int(t.pExt)
+	if len(key) != 2 || p == len(t.str) || p == 0 {
+		return p, p, p, false
+	}
+	s := t.str
+
+	// Find the correct extension.
+	for p++; s[p] != 'u'; p++ {
+		if s[p] > 'u' {
+			p--
+			return p, p, p, false
+		}
+		if p = nextExtension(s, p); p == len(s) {
+			return len(s), len(s), len(s), false
+		}
+	}
+	// Proceed to the hyphen following the extension name.
+	p++
+
+	// curKey is the key currently being processed.
+	curKey := ""
+
+	// Iterate over keys until we get the end of a section.
+	for {
+		end = p
+		for p++; p < len(s) && s[p] != '-'; p++ {
+		}
+		n := p - end - 1
+		if n <= 2 && curKey == key {
+			if sep < end {
+				sep++
+			}
+			return start, sep, end, true
+		}
+		switch n {
+		case 0, // invalid string
+			1: // next extension
+			return end, end, end, true
+		case 2:
+			// next key
+			curKey = s[end+1 : p]
+			if curKey > key {
+				return end, end, end, true
+			}
+			start = end
+			sep = p
+		}
+	}
+}
+
+// ParseBase parses a 2- or 3-letter ISO 639 code.
+// It returns a ValueError if s is a well-formed but unknown language identifier
+// or another error if another error occurred.
+func ParseBase(s string) (l Language, err error) {
+	defer func() {
+		if recover() != nil {
+			l = 0
+			err = ErrSyntax
+		}
+	}()
+
+	if n := len(s); n < 2 || 3 < n {
+		return 0, ErrSyntax
+	}
+	var buf [3]byte
+	return getLangID(buf[:copy(buf[:], s)])
+}
+
+// ParseScript parses a 4-letter ISO 15924 code.
+// It returns a ValueError if s is a well-formed but unknown script identifier
+// or another error if another error occurred.
+func ParseScript(s string) (scr Script, err error) {
+	defer func() {
+		if recover() != nil {
+			scr = 0
+			err = ErrSyntax
+		}
+	}()
+
+	if len(s) != 4 {
+		return 0, ErrSyntax
+	}
+	var buf [4]byte
+	return getScriptID(script, buf[:copy(buf[:], s)])
+}
+
+// EncodeM49 returns the Region for the given UN M.49 code.
+// It returns an error if r is not a valid code.
+func EncodeM49(r int) (Region, error) {
+	return getRegionM49(r)
+}
+
+// ParseRegion parses a 2- or 3-letter ISO 3166-1 or a UN M.49 code.
+// It returns a ValueError if s is a well-formed but unknown region identifier
+// or another error if another error occurred.
+func ParseRegion(s string) (r Region, err error) {
+	defer func() {
+		if recover() != nil {
+			r = 0
+			err = ErrSyntax
+		}
+	}()
+
+	if n := len(s); n < 2 || 3 < n {
+		return 0, ErrSyntax
+	}
+	var buf [3]byte
+	return getRegionID(buf[:copy(buf[:], s)])
+}
+
+// IsCountry returns whether this region is a country or autonomous area. This
+// includes non-standard definitions from CLDR.
+func (r Region) IsCountry() bool {
+	if r == 0 || r.IsGroup() || r.IsPrivateUse() && r != _XK {
+		return false
+	}
+	return true
+}
+
+// IsGroup returns whether this region defines a collection of regions. This
+// includes non-standard definitions from CLDR.
+func (r Region) IsGroup() bool {
+	if r == 0 {
+		return false
+	}
+	return int(regionInclusion[r]) < len(regionContainment)
+}
+
+// Contains returns whether Region c is contained by Region r. It returns true
+// if c == r.
+func (r Region) Contains(c Region) bool {
+	if r == c {
+		return true
+	}
+	g := regionInclusion[r]
+	if g >= nRegionGroups {
+		return false
+	}
+	m := regionContainment[g]
+
+	d := regionInclusion[c]
+	b := regionInclusionBits[d]
+
+	// A contained country may belong to multiple disjoint groups. Matching any
+	// of these indicates containment. If the contained region is a group, it
+	// must strictly be a subset.
+	if d >= nRegionGroups {
+		return b&m != 0
+	}
+	return b&^m == 0
+}
+
+var errNoTLD = errors.New("language: region is not a valid ccTLD")
+
+// TLD returns the country code top-level domain (ccTLD). UK is returned for GB.
+// In all other cases it returns either the region itself or an error.
+//
+// This method may return an error for a region for which there exists a
+// canonical form with a ccTLD. To get that ccTLD canonicalize r first. The
+// region will already be canonicalized it was obtained from a Tag that was
+// obtained using any of the default methods.
+func (r Region) TLD() (Region, error) {
+	// See http://en.wikipedia.org/wiki/Country_code_top-level_domain for the
+	// difference between ISO 3166-1 and IANA ccTLD.
+	if r == _GB {
+		r = _UK
+	}
+	if (r.typ() & ccTLD) == 0 {
+		return 0, errNoTLD
+	}
+	return r, nil
+}
+
+// Canonicalize returns the region or a possible replacement if the region is
+// deprecated. It will not return a replacement for deprecated regions that
+// are split into multiple regions.
+func (r Region) Canonicalize() Region {
+	if cr := normRegion(r); cr != 0 {
+		return cr
+	}
+	return r
+}
+
+// Variant represents a registered variant of a language as defined by BCP 47.
+type Variant struct {
+	ID  uint8
+	str string
+}
+
+// ParseVariant parses and returns a Variant. An error is returned if s is not
+// a valid variant.
+func ParseVariant(s string) (v Variant, err error) {
+	defer func() {
+		if recover() != nil {
+			v = Variant{}
+			err = ErrSyntax
+		}
+	}()
+
+	s = strings.ToLower(s)
+	if id, ok := variantIndex[s]; ok {
+		return Variant{id, s}, nil
+	}
+	return Variant{}, NewValueError([]byte(s))
+}
+
+// String returns the string representation of the variant.
+func (v Variant) String() string {
+	return v.str
+}
diff --git a/vendor/golang.org/x/text/internal/language/lookup.go b/vendor/golang.org/x/text/internal/language/lookup.go
new file mode 100644
index 000000000..231b4fbde
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/lookup.go
@@ -0,0 +1,412 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import (
+	"bytes"
+	"fmt"
+	"sort"
+	"strconv"
+
+	"golang.org/x/text/internal/tag"
+)
+
+// findIndex tries to find the given tag in idx and returns a standardized error
+// if it could not be found.
+func findIndex(idx tag.Index, key []byte, form string) (index int, err error) {
+	if !tag.FixCase(form, key) {
+		return 0, ErrSyntax
+	}
+	i := idx.Index(key)
+	if i == -1 {
+		return 0, NewValueError(key)
+	}
+	return i, nil
+}
+
+func searchUint(imap []uint16, key uint16) int {
+	return sort.Search(len(imap), func(i int) bool {
+		return imap[i] >= key
+	})
+}
+
+type Language uint16
+
+// getLangID returns the langID of s if s is a canonical subtag
+// or langUnknown if s is not a canonical subtag.
+func getLangID(s []byte) (Language, error) {
+	if len(s) == 2 {
+		return getLangISO2(s)
+	}
+	return getLangISO3(s)
+}
+
+// TODO language normalization as well as the AliasMaps could be moved to the
+// higher level package, but it is a bit tricky to separate the generation.
+
+func (id Language) Canonicalize() (Language, AliasType) {
+	return normLang(id)
+}
+
+// normLang returns the mapped langID of id according to mapping m.
+func normLang(id Language) (Language, AliasType) {
+	k := sort.Search(len(AliasMap), func(i int) bool {
+		return AliasMap[i].From >= uint16(id)
+	})
+	if k < len(AliasMap) && AliasMap[k].From == uint16(id) {
+		return Language(AliasMap[k].To), AliasTypes[k]
+	}
+	return id, AliasTypeUnknown
+}
+
+// getLangISO2 returns the langID for the given 2-letter ISO language code
+// or unknownLang if this does not exist.
+func getLangISO2(s []byte) (Language, error) {
+	if !tag.FixCase("zz", s) {
+		return 0, ErrSyntax
+	}
+	if i := lang.Index(s); i != -1 && lang.Elem(i)[3] != 0 {
+		return Language(i), nil
+	}
+	return 0, NewValueError(s)
+}
+
+const base = 'z' - 'a' + 1
+
+func strToInt(s []byte) uint {
+	v := uint(0)
+	for i := 0; i < len(s); i++ {
+		v *= base
+		v += uint(s[i] - 'a')
+	}
+	return v
+}
+
+// converts the given integer to the original ASCII string passed to strToInt.
+// len(s) must match the number of characters obtained.
+func intToStr(v uint, s []byte) {
+	for i := len(s) - 1; i >= 0; i-- {
+		s[i] = byte(v%base) + 'a'
+		v /= base
+	}
+}
+
+// getLangISO3 returns the langID for the given 3-letter ISO language code
+// or unknownLang if this does not exist.
+func getLangISO3(s []byte) (Language, error) {
+	if tag.FixCase("und", s) {
+		// first try to match canonical 3-letter entries
+		for i := lang.Index(s[:2]); i != -1; i = lang.Next(s[:2], i) {
+			if e := lang.Elem(i); e[3] == 0 && e[2] == s[2] {
+				// We treat "und" as special and always translate it to "unspecified".
+				// Note that ZZ and Zzzz are private use and are not treated as
+				// unspecified by default.
+				id := Language(i)
+				if id == nonCanonicalUnd {
+					return 0, nil
+				}
+				return id, nil
+			}
+		}
+		if i := altLangISO3.Index(s); i != -1 {
+			return Language(altLangIndex[altLangISO3.Elem(i)[3]]), nil
+		}
+		n := strToInt(s)
+		if langNoIndex[n/8]&(1<<(n%8)) != 0 {
+			return Language(n) + langNoIndexOffset, nil
+		}
+		// Check for non-canonical uses of ISO3.
+		for i := lang.Index(s[:1]); i != -1; i = lang.Next(s[:1], i) {
+			if e := lang.Elem(i); e[2] == s[1] && e[3] == s[2] {
+				return Language(i), nil
+			}
+		}
+		return 0, NewValueError(s)
+	}
+	return 0, ErrSyntax
+}
+
+// StringToBuf writes the string to b and returns the number of bytes
+// written.  cap(b) must be >= 3.
+func (id Language) StringToBuf(b []byte) int {
+	if id >= langNoIndexOffset {
+		intToStr(uint(id)-langNoIndexOffset, b[:3])
+		return 3
+	} else if id == 0 {
+		return copy(b, "und")
+	}
+	l := lang[id<<2:]
+	if l[3] == 0 {
+		return copy(b, l[:3])
+	}
+	return copy(b, l[:2])
+}
+
+// String returns the BCP 47 representation of the langID.
+// Use b as variable name, instead of id, to ensure the variable
+// used is consistent with that of Base in which this type is embedded.
+func (b Language) String() string {
+	if b == 0 {
+		return "und"
+	} else if b >= langNoIndexOffset {
+		b -= langNoIndexOffset
+		buf := [3]byte{}
+		intToStr(uint(b), buf[:])
+		return string(buf[:])
+	}
+	l := lang.Elem(int(b))
+	if l[3] == 0 {
+		return l[:3]
+	}
+	return l[:2]
+}
+
+// ISO3 returns the ISO 639-3 language code.
+func (b Language) ISO3() string {
+	if b == 0 || b >= langNoIndexOffset {
+		return b.String()
+	}
+	l := lang.Elem(int(b))
+	if l[3] == 0 {
+		return l[:3]
+	} else if l[2] == 0 {
+		return altLangISO3.Elem(int(l[3]))[:3]
+	}
+	// This allocation will only happen for 3-letter ISO codes
+	// that are non-canonical BCP 47 language identifiers.
+	return l[0:1] + l[2:4]
+}
+
+// IsPrivateUse reports whether this language code is reserved for private use.
+func (b Language) IsPrivateUse() bool {
+	return langPrivateStart <= b && b <= langPrivateEnd
+}
+
+// SuppressScript returns the script marked as SuppressScript in the IANA
+// language tag repository, or 0 if there is no such script.
+func (b Language) SuppressScript() Script {
+	if b < langNoIndexOffset {
+		return Script(suppressScript[b])
+	}
+	return 0
+}
+
+type Region uint16
+
+// getRegionID returns the region id for s if s is a valid 2-letter region code
+// or unknownRegion.
+func getRegionID(s []byte) (Region, error) {
+	if len(s) == 3 {
+		if isAlpha(s[0]) {
+			return getRegionISO3(s)
+		}
+		if i, err := strconv.ParseUint(string(s), 10, 10); err == nil {
+			return getRegionM49(int(i))
+		}
+	}
+	return getRegionISO2(s)
+}
+
+// getRegionISO2 returns the regionID for the given 2-letter ISO country code
+// or unknownRegion if this does not exist.
+func getRegionISO2(s []byte) (Region, error) {
+	i, err := findIndex(regionISO, s, "ZZ")
+	if err != nil {
+		return 0, err
+	}
+	return Region(i) + isoRegionOffset, nil
+}
+
+// getRegionISO3 returns the regionID for the given 3-letter ISO country code
+// or unknownRegion if this does not exist.
+func getRegionISO3(s []byte) (Region, error) {
+	if tag.FixCase("ZZZ", s) {
+		for i := regionISO.Index(s[:1]); i != -1; i = regionISO.Next(s[:1], i) {
+			if e := regionISO.Elem(i); e[2] == s[1] && e[3] == s[2] {
+				return Region(i) + isoRegionOffset, nil
+			}
+		}
+		for i := 0; i < len(altRegionISO3); i += 3 {
+			if tag.Compare(altRegionISO3[i:i+3], s) == 0 {
+				return Region(altRegionIDs[i/3]), nil
+			}
+		}
+		return 0, NewValueError(s)
+	}
+	return 0, ErrSyntax
+}
+
+func getRegionM49(n int) (Region, error) {
+	if 0 < n && n <= 999 {
+		const (
+			searchBits = 7
+			regionBits = 9
+			regionMask = 1<> searchBits
+		buf := fromM49[m49Index[idx]:m49Index[idx+1]]
+		val := uint16(n) << regionBits // we rely on bits shifting out
+		i := sort.Search(len(buf), func(i int) bool {
+			return buf[i] >= val
+		})
+		if r := fromM49[int(m49Index[idx])+i]; r&^regionMask == val {
+			return Region(r & regionMask), nil
+		}
+	}
+	var e ValueError
+	fmt.Fprint(bytes.NewBuffer([]byte(e.v[:])), n)
+	return 0, e
+}
+
+// normRegion returns a region if r is deprecated or 0 otherwise.
+// TODO: consider supporting BYS (-> BLR), CSK (-> 200 or CZ), PHI (-> PHL) and AFI (-> DJ).
+// TODO: consider mapping split up regions to new most populous one (like CLDR).
+func normRegion(r Region) Region {
+	m := regionOldMap
+	k := sort.Search(len(m), func(i int) bool {
+		return m[i].From >= uint16(r)
+	})
+	if k < len(m) && m[k].From == uint16(r) {
+		return Region(m[k].To)
+	}
+	return 0
+}
+
+const (
+	iso3166UserAssigned = 1 << iota
+	ccTLD
+	bcp47Region
+)
+
+func (r Region) typ() byte {
+	return regionTypes[r]
+}
+
+// String returns the BCP 47 representation for the region.
+// It returns "ZZ" for an unspecified region.
+func (r Region) String() string {
+	if r < isoRegionOffset {
+		if r == 0 {
+			return "ZZ"
+		}
+		return fmt.Sprintf("%03d", r.M49())
+	}
+	r -= isoRegionOffset
+	return regionISO.Elem(int(r))[:2]
+}
+
+// ISO3 returns the 3-letter ISO code of r.
+// Note that not all regions have a 3-letter ISO code.
+// In such cases this method returns "ZZZ".
+func (r Region) ISO3() string {
+	if r < isoRegionOffset {
+		return "ZZZ"
+	}
+	r -= isoRegionOffset
+	reg := regionISO.Elem(int(r))
+	switch reg[2] {
+	case 0:
+		return altRegionISO3[reg[3]:][:3]
+	case ' ':
+		return "ZZZ"
+	}
+	return reg[0:1] + reg[2:4]
+}
+
+// M49 returns the UN M.49 encoding of r, or 0 if this encoding
+// is not defined for r.
+func (r Region) M49() int {
+	return int(m49[r])
+}
+
+// IsPrivateUse reports whether r has the ISO 3166 User-assigned status. This
+// may include private-use tags that are assigned by CLDR and used in this
+// implementation. So IsPrivateUse and IsCountry can be simultaneously true.
+func (r Region) IsPrivateUse() bool {
+	return r.typ()&iso3166UserAssigned != 0
+}
+
+type Script uint16
+
+// getScriptID returns the script id for string s. It assumes that s
+// is of the format [A-Z][a-z]{3}.
+func getScriptID(idx tag.Index, s []byte) (Script, error) {
+	i, err := findIndex(idx, s, "Zzzz")
+	return Script(i), err
+}
+
+// String returns the script code in title case.
+// It returns "Zzzz" for an unspecified script.
+func (s Script) String() string {
+	if s == 0 {
+		return "Zzzz"
+	}
+	return script.Elem(int(s))
+}
+
+// IsPrivateUse reports whether this script code is reserved for private use.
+func (s Script) IsPrivateUse() bool {
+	return _Qaaa <= s && s <= _Qabx
+}
+
+const (
+	maxAltTaglen = len("en-US-POSIX")
+	maxLen       = maxAltTaglen
+)
+
+var (
+	// grandfatheredMap holds a mapping from legacy and grandfathered tags to
+	// their base language or index to more elaborate tag.
+	grandfatheredMap = map[[maxLen]byte]int16{
+		[maxLen]byte{'a', 'r', 't', '-', 'l', 'o', 'j', 'b', 'a', 'n'}: _jbo, // art-lojban
+		[maxLen]byte{'i', '-', 'a', 'm', 'i'}:                          _ami, // i-ami
+		[maxLen]byte{'i', '-', 'b', 'n', 'n'}:                          _bnn, // i-bnn
+		[maxLen]byte{'i', '-', 'h', 'a', 'k'}:                          _hak, // i-hak
+		[maxLen]byte{'i', '-', 'k', 'l', 'i', 'n', 'g', 'o', 'n'}:      _tlh, // i-klingon
+		[maxLen]byte{'i', '-', 'l', 'u', 'x'}:                          _lb,  // i-lux
+		[maxLen]byte{'i', '-', 'n', 'a', 'v', 'a', 'j', 'o'}:           _nv,  // i-navajo
+		[maxLen]byte{'i', '-', 'p', 'w', 'n'}:                          _pwn, // i-pwn
+		[maxLen]byte{'i', '-', 't', 'a', 'o'}:                          _tao, // i-tao
+		[maxLen]byte{'i', '-', 't', 'a', 'y'}:                          _tay, // i-tay
+		[maxLen]byte{'i', '-', 't', 's', 'u'}:                          _tsu, // i-tsu
+		[maxLen]byte{'n', 'o', '-', 'b', 'o', 'k'}:                     _nb,  // no-bok
+		[maxLen]byte{'n', 'o', '-', 'n', 'y', 'n'}:                     _nn,  // no-nyn
+		[maxLen]byte{'s', 'g', 'n', '-', 'b', 'e', '-', 'f', 'r'}:      _sfb, // sgn-BE-FR
+		[maxLen]byte{'s', 'g', 'n', '-', 'b', 'e', '-', 'n', 'l'}:      _vgt, // sgn-BE-NL
+		[maxLen]byte{'s', 'g', 'n', '-', 'c', 'h', '-', 'd', 'e'}:      _sgg, // sgn-CH-DE
+		[maxLen]byte{'z', 'h', '-', 'g', 'u', 'o', 'y', 'u'}:           _cmn, // zh-guoyu
+		[maxLen]byte{'z', 'h', '-', 'h', 'a', 'k', 'k', 'a'}:           _hak, // zh-hakka
+		[maxLen]byte{'z', 'h', '-', 'm', 'i', 'n', '-', 'n', 'a', 'n'}: _nan, // zh-min-nan
+		[maxLen]byte{'z', 'h', '-', 'x', 'i', 'a', 'n', 'g'}:           _hsn, // zh-xiang
+
+		// Grandfathered tags with no modern replacement will be converted as
+		// follows:
+		[maxLen]byte{'c', 'e', 'l', '-', 'g', 'a', 'u', 'l', 'i', 's', 'h'}: -1, // cel-gaulish
+		[maxLen]byte{'e', 'n', '-', 'g', 'b', '-', 'o', 'e', 'd'}:           -2, // en-GB-oed
+		[maxLen]byte{'i', '-', 'd', 'e', 'f', 'a', 'u', 'l', 't'}:           -3, // i-default
+		[maxLen]byte{'i', '-', 'e', 'n', 'o', 'c', 'h', 'i', 'a', 'n'}:      -4, // i-enochian
+		[maxLen]byte{'i', '-', 'm', 'i', 'n', 'g', 'o'}:                     -5, // i-mingo
+		[maxLen]byte{'z', 'h', '-', 'm', 'i', 'n'}:                          -6, // zh-min
+
+		// CLDR-specific tag.
+		[maxLen]byte{'r', 'o', 'o', 't'}:                                    0,  // root
+		[maxLen]byte{'e', 'n', '-', 'u', 's', '-', 'p', 'o', 's', 'i', 'x'}: -7, // en_US_POSIX"
+	}
+
+	altTagIndex = [...]uint8{0, 17, 31, 45, 61, 74, 86, 102}
+
+	altTags = "xtg-x-cel-gaulishen-GB-oxendicten-x-i-defaultund-x-i-enochiansee-x-i-mingonan-x-zh-minen-US-u-va-posix"
+)
+
+func grandfathered(s [maxAltTaglen]byte) (t Tag, ok bool) {
+	if v, ok := grandfatheredMap[s]; ok {
+		if v < 0 {
+			return Make(altTags[altTagIndex[-v-1]:altTagIndex[-v]]), true
+		}
+		t.LangID = Language(v)
+		return t, true
+	}
+	return t, false
+}
diff --git a/vendor/golang.org/x/text/internal/language/match.go b/vendor/golang.org/x/text/internal/language/match.go
new file mode 100644
index 000000000..75a2dbca7
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/match.go
@@ -0,0 +1,226 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import "errors"
+
+type scriptRegionFlags uint8
+
+const (
+	isList = 1 << iota
+	scriptInFrom
+	regionInFrom
+)
+
+func (t *Tag) setUndefinedLang(id Language) {
+	if t.LangID == 0 {
+		t.LangID = id
+	}
+}
+
+func (t *Tag) setUndefinedScript(id Script) {
+	if t.ScriptID == 0 {
+		t.ScriptID = id
+	}
+}
+
+func (t *Tag) setUndefinedRegion(id Region) {
+	if t.RegionID == 0 || t.RegionID.Contains(id) {
+		t.RegionID = id
+	}
+}
+
+// ErrMissingLikelyTagsData indicates no information was available
+// to compute likely values of missing tags.
+var ErrMissingLikelyTagsData = errors.New("missing likely tags data")
+
+// addLikelySubtags sets subtags to their most likely value, given the locale.
+// In most cases this means setting fields for unknown values, but in some
+// cases it may alter a value.  It returns an ErrMissingLikelyTagsData error
+// if the given locale cannot be expanded.
+func (t Tag) addLikelySubtags() (Tag, error) {
+	id, err := addTags(t)
+	if err != nil {
+		return t, err
+	} else if id.equalTags(t) {
+		return t, nil
+	}
+	id.RemakeString()
+	return id, nil
+}
+
+// specializeRegion attempts to specialize a group region.
+func specializeRegion(t *Tag) bool {
+	if i := regionInclusion[t.RegionID]; i < nRegionGroups {
+		x := likelyRegionGroup[i]
+		if Language(x.lang) == t.LangID && Script(x.script) == t.ScriptID {
+			t.RegionID = Region(x.region)
+		}
+		return true
+	}
+	return false
+}
+
+// Maximize returns a new tag with missing tags filled in.
+func (t Tag) Maximize() (Tag, error) {
+	return addTags(t)
+}
+
+func addTags(t Tag) (Tag, error) {
+	// We leave private use identifiers alone.
+	if t.IsPrivateUse() {
+		return t, nil
+	}
+	if t.ScriptID != 0 && t.RegionID != 0 {
+		if t.LangID != 0 {
+			// already fully specified
+			specializeRegion(&t)
+			return t, nil
+		}
+		// Search matches for und-script-region. Note that for these cases
+		// region will never be a group so there is no need to check for this.
+		list := likelyRegion[t.RegionID : t.RegionID+1]
+		if x := list[0]; x.flags&isList != 0 {
+			list = likelyRegionList[x.lang : x.lang+uint16(x.script)]
+		}
+		for _, x := range list {
+			// Deviating from the spec. See match_test.go for details.
+			if Script(x.script) == t.ScriptID {
+				t.setUndefinedLang(Language(x.lang))
+				return t, nil
+			}
+		}
+	}
+	if t.LangID != 0 {
+		// Search matches for lang-script and lang-region, where lang != und.
+		if t.LangID < langNoIndexOffset {
+			x := likelyLang[t.LangID]
+			if x.flags&isList != 0 {
+				list := likelyLangList[x.region : x.region+uint16(x.script)]
+				if t.ScriptID != 0 {
+					for _, x := range list {
+						if Script(x.script) == t.ScriptID && x.flags&scriptInFrom != 0 {
+							t.setUndefinedRegion(Region(x.region))
+							return t, nil
+						}
+					}
+				} else if t.RegionID != 0 {
+					count := 0
+					goodScript := true
+					tt := t
+					for _, x := range list {
+						// We visit all entries for which the script was not
+						// defined, including the ones where the region was not
+						// defined. This allows for proper disambiguation within
+						// regions.
+						if x.flags&scriptInFrom == 0 && t.RegionID.Contains(Region(x.region)) {
+							tt.RegionID = Region(x.region)
+							tt.setUndefinedScript(Script(x.script))
+							goodScript = goodScript && tt.ScriptID == Script(x.script)
+							count++
+						}
+					}
+					if count == 1 {
+						return tt, nil
+					}
+					// Even if we fail to find a unique Region, we might have
+					// an unambiguous script.
+					if goodScript {
+						t.ScriptID = tt.ScriptID
+					}
+				}
+			}
+		}
+	} else {
+		// Search matches for und-script.
+		if t.ScriptID != 0 {
+			x := likelyScript[t.ScriptID]
+			if x.region != 0 {
+				t.setUndefinedRegion(Region(x.region))
+				t.setUndefinedLang(Language(x.lang))
+				return t, nil
+			}
+		}
+		// Search matches for und-region. If und-script-region exists, it would
+		// have been found earlier.
+		if t.RegionID != 0 {
+			if i := regionInclusion[t.RegionID]; i < nRegionGroups {
+				x := likelyRegionGroup[i]
+				if x.region != 0 {
+					t.setUndefinedLang(Language(x.lang))
+					t.setUndefinedScript(Script(x.script))
+					t.RegionID = Region(x.region)
+				}
+			} else {
+				x := likelyRegion[t.RegionID]
+				if x.flags&isList != 0 {
+					x = likelyRegionList[x.lang]
+				}
+				if x.script != 0 && x.flags != scriptInFrom {
+					t.setUndefinedLang(Language(x.lang))
+					t.setUndefinedScript(Script(x.script))
+					return t, nil
+				}
+			}
+		}
+	}
+
+	// Search matches for lang.
+	if t.LangID < langNoIndexOffset {
+		x := likelyLang[t.LangID]
+		if x.flags&isList != 0 {
+			x = likelyLangList[x.region]
+		}
+		if x.region != 0 {
+			t.setUndefinedScript(Script(x.script))
+			t.setUndefinedRegion(Region(x.region))
+		}
+		specializeRegion(&t)
+		if t.LangID == 0 {
+			t.LangID = _en // default language
+		}
+		return t, nil
+	}
+	return t, ErrMissingLikelyTagsData
+}
+
+func (t *Tag) setTagsFrom(id Tag) {
+	t.LangID = id.LangID
+	t.ScriptID = id.ScriptID
+	t.RegionID = id.RegionID
+}
+
+// minimize removes the region or script subtags from t such that
+// t.addLikelySubtags() == t.minimize().addLikelySubtags().
+func (t Tag) minimize() (Tag, error) {
+	t, err := minimizeTags(t)
+	if err != nil {
+		return t, err
+	}
+	t.RemakeString()
+	return t, nil
+}
+
+// minimizeTags mimics the behavior of the ICU 51 C implementation.
+func minimizeTags(t Tag) (Tag, error) {
+	if t.equalTags(Und) {
+		return t, nil
+	}
+	max, err := addTags(t)
+	if err != nil {
+		return t, err
+	}
+	for _, id := range [...]Tag{
+		{LangID: t.LangID},
+		{LangID: t.LangID, RegionID: t.RegionID},
+		{LangID: t.LangID, ScriptID: t.ScriptID},
+	} {
+		if x, err := addTags(id); err == nil && max.equalTags(x) {
+			t.setTagsFrom(id)
+			break
+		}
+	}
+	return t, nil
+}
diff --git a/vendor/golang.org/x/text/internal/language/parse.go b/vendor/golang.org/x/text/internal/language/parse.go
new file mode 100644
index 000000000..aad1e0acf
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/parse.go
@@ -0,0 +1,608 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"sort"
+
+	"golang.org/x/text/internal/tag"
+)
+
+// isAlpha returns true if the byte is not a digit.
+// b must be an ASCII letter or digit.
+func isAlpha(b byte) bool {
+	return b > '9'
+}
+
+// isAlphaNum returns true if the string contains only ASCII letters or digits.
+func isAlphaNum(s []byte) bool {
+	for _, c := range s {
+		if !('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9') {
+			return false
+		}
+	}
+	return true
+}
+
+// ErrSyntax is returned by any of the parsing functions when the
+// input is not well-formed, according to BCP 47.
+// TODO: return the position at which the syntax error occurred?
+var ErrSyntax = errors.New("language: tag is not well-formed")
+
+// ErrDuplicateKey is returned when a tag contains the same key twice with
+// different values in the -u section.
+var ErrDuplicateKey = errors.New("language: different values for same key in -u extension")
+
+// ValueError is returned by any of the parsing functions when the
+// input is well-formed but the respective subtag is not recognized
+// as a valid value.
+type ValueError struct {
+	v [8]byte
+}
+
+// NewValueError creates a new ValueError.
+func NewValueError(tag []byte) ValueError {
+	var e ValueError
+	copy(e.v[:], tag)
+	return e
+}
+
+func (e ValueError) tag() []byte {
+	n := bytes.IndexByte(e.v[:], 0)
+	if n == -1 {
+		n = 8
+	}
+	return e.v[:n]
+}
+
+// Error implements the error interface.
+func (e ValueError) Error() string {
+	return fmt.Sprintf("language: subtag %q is well-formed but unknown", e.tag())
+}
+
+// Subtag returns the subtag for which the error occurred.
+func (e ValueError) Subtag() string {
+	return string(e.tag())
+}
+
+// scanner is used to scan BCP 47 tokens, which are separated by _ or -.
+type scanner struct {
+	b     []byte
+	bytes [max99thPercentileSize]byte
+	token []byte
+	start int // start position of the current token
+	end   int // end position of the current token
+	next  int // next point for scan
+	err   error
+	done  bool
+}
+
+func makeScannerString(s string) scanner {
+	scan := scanner{}
+	if len(s) <= len(scan.bytes) {
+		scan.b = scan.bytes[:copy(scan.bytes[:], s)]
+	} else {
+		scan.b = []byte(s)
+	}
+	scan.init()
+	return scan
+}
+
+// makeScanner returns a scanner using b as the input buffer.
+// b is not copied and may be modified by the scanner routines.
+func makeScanner(b []byte) scanner {
+	scan := scanner{b: b}
+	scan.init()
+	return scan
+}
+
+func (s *scanner) init() {
+	for i, c := range s.b {
+		if c == '_' {
+			s.b[i] = '-'
+		}
+	}
+	s.scan()
+}
+
+// restToLower converts the string between start and end to lower case.
+func (s *scanner) toLower(start, end int) {
+	for i := start; i < end; i++ {
+		c := s.b[i]
+		if 'A' <= c && c <= 'Z' {
+			s.b[i] += 'a' - 'A'
+		}
+	}
+}
+
+func (s *scanner) setError(e error) {
+	if s.err == nil || (e == ErrSyntax && s.err != ErrSyntax) {
+		s.err = e
+	}
+}
+
+// resizeRange shrinks or grows the array at position oldStart such that
+// a new string of size newSize can fit between oldStart and oldEnd.
+// Sets the scan point to after the resized range.
+func (s *scanner) resizeRange(oldStart, oldEnd, newSize int) {
+	s.start = oldStart
+	if end := oldStart + newSize; end != oldEnd {
+		diff := end - oldEnd
+		var b []byte
+		if n := len(s.b) + diff; n > cap(s.b) {
+			b = make([]byte, n)
+			copy(b, s.b[:oldStart])
+		} else {
+			b = s.b[:n]
+		}
+		copy(b[end:], s.b[oldEnd:])
+		s.b = b
+		s.next = end + (s.next - s.end)
+		s.end = end
+	}
+}
+
+// replace replaces the current token with repl.
+func (s *scanner) replace(repl string) {
+	s.resizeRange(s.start, s.end, len(repl))
+	copy(s.b[s.start:], repl)
+}
+
+// gobble removes the current token from the input.
+// Caller must call scan after calling gobble.
+func (s *scanner) gobble(e error) {
+	s.setError(e)
+	if s.start == 0 {
+		s.b = s.b[:+copy(s.b, s.b[s.next:])]
+		s.end = 0
+	} else {
+		s.b = s.b[:s.start-1+copy(s.b[s.start-1:], s.b[s.end:])]
+		s.end = s.start - 1
+	}
+	s.next = s.start
+}
+
+// deleteRange removes the given range from s.b before the current token.
+func (s *scanner) deleteRange(start, end int) {
+	s.b = s.b[:start+copy(s.b[start:], s.b[end:])]
+	diff := end - start
+	s.next -= diff
+	s.start -= diff
+	s.end -= diff
+}
+
+// scan parses the next token of a BCP 47 string.  Tokens that are larger
+// than 8 characters or include non-alphanumeric characters result in an error
+// and are gobbled and removed from the output.
+// It returns the end position of the last token consumed.
+func (s *scanner) scan() (end int) {
+	end = s.end
+	s.token = nil
+	for s.start = s.next; s.next < len(s.b); {
+		i := bytes.IndexByte(s.b[s.next:], '-')
+		if i == -1 {
+			s.end = len(s.b)
+			s.next = len(s.b)
+			i = s.end - s.start
+		} else {
+			s.end = s.next + i
+			s.next = s.end + 1
+		}
+		token := s.b[s.start:s.end]
+		if i < 1 || i > 8 || !isAlphaNum(token) {
+			s.gobble(ErrSyntax)
+			continue
+		}
+		s.token = token
+		return end
+	}
+	if n := len(s.b); n > 0 && s.b[n-1] == '-' {
+		s.setError(ErrSyntax)
+		s.b = s.b[:len(s.b)-1]
+	}
+	s.done = true
+	return end
+}
+
+// acceptMinSize parses multiple tokens of the given size or greater.
+// It returns the end position of the last token consumed.
+func (s *scanner) acceptMinSize(min int) (end int) {
+	end = s.end
+	s.scan()
+	for ; len(s.token) >= min; s.scan() {
+		end = s.end
+	}
+	return end
+}
+
+// Parse parses the given BCP 47 string and returns a valid Tag. If parsing
+// failed it returns an error and any part of the tag that could be parsed.
+// If parsing succeeded but an unknown value was found, it returns
+// ValueError. The Tag returned in this case is just stripped of the unknown
+// value. All other values are preserved. It accepts tags in the BCP 47 format
+// and extensions to this standard defined in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+func Parse(s string) (t Tag, err error) {
+	// TODO: consider supporting old-style locale key-value pairs.
+	if s == "" {
+		return Und, ErrSyntax
+	}
+	defer func() {
+		if recover() != nil {
+			t = Und
+			err = ErrSyntax
+			return
+		}
+	}()
+	if len(s) <= maxAltTaglen {
+		b := [maxAltTaglen]byte{}
+		for i, c := range s {
+			// Generating invalid UTF-8 is okay as it won't match.
+			if 'A' <= c && c <= 'Z' {
+				c += 'a' - 'A'
+			} else if c == '_' {
+				c = '-'
+			}
+			b[i] = byte(c)
+		}
+		if t, ok := grandfathered(b); ok {
+			return t, nil
+		}
+	}
+	scan := makeScannerString(s)
+	return parse(&scan, s)
+}
+
+func parse(scan *scanner, s string) (t Tag, err error) {
+	t = Und
+	var end int
+	if n := len(scan.token); n <= 1 {
+		scan.toLower(0, len(scan.b))
+		if n == 0 || scan.token[0] != 'x' {
+			return t, ErrSyntax
+		}
+		end = parseExtensions(scan)
+	} else if n >= 4 {
+		return Und, ErrSyntax
+	} else { // the usual case
+		t, end = parseTag(scan, true)
+		if n := len(scan.token); n == 1 {
+			t.pExt = uint16(end)
+			end = parseExtensions(scan)
+		} else if end < len(scan.b) {
+			scan.setError(ErrSyntax)
+			scan.b = scan.b[:end]
+		}
+	}
+	if int(t.pVariant) < len(scan.b) {
+		if end < len(s) {
+			s = s[:end]
+		}
+		if len(s) > 0 && tag.Compare(s, scan.b) == 0 {
+			t.str = s
+		} else {
+			t.str = string(scan.b)
+		}
+	} else {
+		t.pVariant, t.pExt = 0, 0
+	}
+	return t, scan.err
+}
+
+// parseTag parses language, script, region and variants.
+// It returns a Tag and the end position in the input that was parsed.
+// If doNorm is true, then - will be normalized to .
+func parseTag(scan *scanner, doNorm bool) (t Tag, end int) {
+	var e error
+	// TODO: set an error if an unknown lang, script or region is encountered.
+	t.LangID, e = getLangID(scan.token)
+	scan.setError(e)
+	scan.replace(t.LangID.String())
+	langStart := scan.start
+	end = scan.scan()
+	for len(scan.token) == 3 && isAlpha(scan.token[0]) {
+		// From http://tools.ietf.org/html/bcp47, - tags are equivalent
+		// to a tag of the form .
+		if doNorm {
+			lang, e := getLangID(scan.token)
+			if lang != 0 {
+				t.LangID = lang
+				langStr := lang.String()
+				copy(scan.b[langStart:], langStr)
+				scan.b[langStart+len(langStr)] = '-'
+				scan.start = langStart + len(langStr) + 1
+			}
+			scan.gobble(e)
+		}
+		end = scan.scan()
+	}
+	if len(scan.token) == 4 && isAlpha(scan.token[0]) {
+		t.ScriptID, e = getScriptID(script, scan.token)
+		if t.ScriptID == 0 {
+			scan.gobble(e)
+		}
+		end = scan.scan()
+	}
+	if n := len(scan.token); n >= 2 && n <= 3 {
+		t.RegionID, e = getRegionID(scan.token)
+		if t.RegionID == 0 {
+			scan.gobble(e)
+		} else {
+			scan.replace(t.RegionID.String())
+		}
+		end = scan.scan()
+	}
+	scan.toLower(scan.start, len(scan.b))
+	t.pVariant = byte(end)
+	end = parseVariants(scan, end, t)
+	t.pExt = uint16(end)
+	return t, end
+}
+
+var separator = []byte{'-'}
+
+// parseVariants scans tokens as long as each token is a valid variant string.
+// Duplicate variants are removed.
+func parseVariants(scan *scanner, end int, t Tag) int {
+	start := scan.start
+	varIDBuf := [4]uint8{}
+	variantBuf := [4][]byte{}
+	varID := varIDBuf[:0]
+	variant := variantBuf[:0]
+	last := -1
+	needSort := false
+	for ; len(scan.token) >= 4; scan.scan() {
+		// TODO: measure the impact of needing this conversion and redesign
+		// the data structure if there is an issue.
+		v, ok := variantIndex[string(scan.token)]
+		if !ok {
+			// unknown variant
+			// TODO: allow user-defined variants?
+			scan.gobble(NewValueError(scan.token))
+			continue
+		}
+		varID = append(varID, v)
+		variant = append(variant, scan.token)
+		if !needSort {
+			if last < int(v) {
+				last = int(v)
+			} else {
+				needSort = true
+				// There is no legal combinations of more than 7 variants
+				// (and this is by no means a useful sequence).
+				const maxVariants = 8
+				if len(varID) > maxVariants {
+					break
+				}
+			}
+		}
+		end = scan.end
+	}
+	if needSort {
+		sort.Sort(variantsSort{varID, variant})
+		k, l := 0, -1
+		for i, v := range varID {
+			w := int(v)
+			if l == w {
+				// Remove duplicates.
+				continue
+			}
+			varID[k] = varID[i]
+			variant[k] = variant[i]
+			k++
+			l = w
+		}
+		if str := bytes.Join(variant[:k], separator); len(str) == 0 {
+			end = start - 1
+		} else {
+			scan.resizeRange(start, end, len(str))
+			copy(scan.b[scan.start:], str)
+			end = scan.end
+		}
+	}
+	return end
+}
+
+type variantsSort struct {
+	i []uint8
+	v [][]byte
+}
+
+func (s variantsSort) Len() int {
+	return len(s.i)
+}
+
+func (s variantsSort) Swap(i, j int) {
+	s.i[i], s.i[j] = s.i[j], s.i[i]
+	s.v[i], s.v[j] = s.v[j], s.v[i]
+}
+
+func (s variantsSort) Less(i, j int) bool {
+	return s.i[i] < s.i[j]
+}
+
+type bytesSort struct {
+	b [][]byte
+	n int // first n bytes to compare
+}
+
+func (b bytesSort) Len() int {
+	return len(b.b)
+}
+
+func (b bytesSort) Swap(i, j int) {
+	b.b[i], b.b[j] = b.b[j], b.b[i]
+}
+
+func (b bytesSort) Less(i, j int) bool {
+	for k := 0; k < b.n; k++ {
+		if b.b[i][k] == b.b[j][k] {
+			continue
+		}
+		return b.b[i][k] < b.b[j][k]
+	}
+	return false
+}
+
+// parseExtensions parses and normalizes the extensions in the buffer.
+// It returns the last position of scan.b that is part of any extension.
+// It also trims scan.b to remove excess parts accordingly.
+func parseExtensions(scan *scanner) int {
+	start := scan.start
+	exts := [][]byte{}
+	private := []byte{}
+	end := scan.end
+	for len(scan.token) == 1 {
+		extStart := scan.start
+		ext := scan.token[0]
+		end = parseExtension(scan)
+		extension := scan.b[extStart:end]
+		if len(extension) < 3 || (ext != 'x' && len(extension) < 4) {
+			scan.setError(ErrSyntax)
+			end = extStart
+			continue
+		} else if start == extStart && (ext == 'x' || scan.start == len(scan.b)) {
+			scan.b = scan.b[:end]
+			return end
+		} else if ext == 'x' {
+			private = extension
+			break
+		}
+		exts = append(exts, extension)
+	}
+	sort.Sort(bytesSort{exts, 1})
+	if len(private) > 0 {
+		exts = append(exts, private)
+	}
+	scan.b = scan.b[:start]
+	if len(exts) > 0 {
+		scan.b = append(scan.b, bytes.Join(exts, separator)...)
+	} else if start > 0 {
+		// Strip trailing '-'.
+		scan.b = scan.b[:start-1]
+	}
+	return end
+}
+
+// parseExtension parses a single extension and returns the position of
+// the extension end.
+func parseExtension(scan *scanner) int {
+	start, end := scan.start, scan.end
+	switch scan.token[0] {
+	case 'u': // https://www.ietf.org/rfc/rfc6067.txt
+		attrStart := end
+		scan.scan()
+		for last := []byte{}; len(scan.token) > 2; scan.scan() {
+			if bytes.Compare(scan.token, last) != -1 {
+				// Attributes are unsorted. Start over from scratch.
+				p := attrStart + 1
+				scan.next = p
+				attrs := [][]byte{}
+				for scan.scan(); len(scan.token) > 2; scan.scan() {
+					attrs = append(attrs, scan.token)
+					end = scan.end
+				}
+				sort.Sort(bytesSort{attrs, 3})
+				copy(scan.b[p:], bytes.Join(attrs, separator))
+				break
+			}
+			last = scan.token
+			end = scan.end
+		}
+		// Scan key-type sequences. A key is of length 2 and may be followed
+		// by 0 or more "type" subtags from 3 to the maximum of 8 letters.
+		var last, key []byte
+		for attrEnd := end; len(scan.token) == 2; last = key {
+			key = scan.token
+			end = scan.end
+			for scan.scan(); end < scan.end && len(scan.token) > 2; scan.scan() {
+				end = scan.end
+			}
+			// TODO: check key value validity
+			if bytes.Compare(key, last) != 1 || scan.err != nil {
+				// We have an invalid key or the keys are not sorted.
+				// Start scanning keys from scratch and reorder.
+				p := attrEnd + 1
+				scan.next = p
+				keys := [][]byte{}
+				for scan.scan(); len(scan.token) == 2; {
+					keyStart := scan.start
+					end = scan.end
+					for scan.scan(); end < scan.end && len(scan.token) > 2; scan.scan() {
+						end = scan.end
+					}
+					keys = append(keys, scan.b[keyStart:end])
+				}
+				sort.Stable(bytesSort{keys, 2})
+				if n := len(keys); n > 0 {
+					k := 0
+					for i := 1; i < n; i++ {
+						if !bytes.Equal(keys[k][:2], keys[i][:2]) {
+							k++
+							keys[k] = keys[i]
+						} else if !bytes.Equal(keys[k], keys[i]) {
+							scan.setError(ErrDuplicateKey)
+						}
+					}
+					keys = keys[:k+1]
+				}
+				reordered := bytes.Join(keys, separator)
+				if e := p + len(reordered); e < end {
+					scan.deleteRange(e, end)
+					end = e
+				}
+				copy(scan.b[p:], reordered)
+				break
+			}
+		}
+	case 't': // https://www.ietf.org/rfc/rfc6497.txt
+		scan.scan()
+		if n := len(scan.token); n >= 2 && n <= 3 && isAlpha(scan.token[1]) {
+			_, end = parseTag(scan, false)
+			scan.toLower(start, end)
+		}
+		for len(scan.token) == 2 && !isAlpha(scan.token[1]) {
+			end = scan.acceptMinSize(3)
+		}
+	case 'x':
+		end = scan.acceptMinSize(1)
+	default:
+		end = scan.acceptMinSize(2)
+	}
+	return end
+}
+
+// getExtension returns the name, body and end position of the extension.
+func getExtension(s string, p int) (end int, ext string) {
+	if s[p] == '-' {
+		p++
+	}
+	if s[p] == 'x' {
+		return len(s), s[p:]
+	}
+	end = nextExtension(s, p)
+	return end, s[p:end]
+}
+
+// nextExtension finds the next extension within the string, searching
+// for the -- pattern from position p.
+// In the fast majority of cases, language tags will have at most
+// one extension and extensions tend to be small.
+func nextExtension(s string, p int) int {
+	for n := len(s) - 3; p < n; {
+		if s[p] == '-' {
+			if s[p+2] == '-' {
+				return p
+			}
+			p += 3
+		} else {
+			p++
+		}
+	}
+	return len(s)
+}
diff --git a/vendor/golang.org/x/text/internal/language/tables.go b/vendor/golang.org/x/text/internal/language/tables.go
new file mode 100644
index 000000000..14167e74e
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/tables.go
@@ -0,0 +1,3494 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+package language
+
+import "golang.org/x/text/internal/tag"
+
+// CLDRVersion is the CLDR version from which the tables in this package are derived.
+const CLDRVersion = "32"
+
+const NumLanguages = 8798
+
+const NumScripts = 261
+
+const NumRegions = 358
+
+type FromTo struct {
+	From uint16
+	To   uint16
+}
+
+const nonCanonicalUnd = 1201
+const (
+	_af  = 22
+	_am  = 39
+	_ar  = 58
+	_az  = 88
+	_bg  = 126
+	_bn  = 165
+	_ca  = 215
+	_cs  = 250
+	_da  = 257
+	_de  = 269
+	_el  = 310
+	_en  = 313
+	_es  = 318
+	_et  = 320
+	_fa  = 328
+	_fi  = 337
+	_fil = 339
+	_fr  = 350
+	_gu  = 420
+	_he  = 444
+	_hi  = 446
+	_hr  = 465
+	_hu  = 469
+	_hy  = 471
+	_id  = 481
+	_is  = 504
+	_it  = 505
+	_ja  = 512
+	_ka  = 528
+	_kk  = 578
+	_km  = 586
+	_kn  = 593
+	_ko  = 596
+	_ky  = 650
+	_lo  = 696
+	_lt  = 704
+	_lv  = 711
+	_mk  = 767
+	_ml  = 772
+	_mn  = 779
+	_mo  = 784
+	_mr  = 795
+	_ms  = 799
+	_mul = 806
+	_my  = 817
+	_nb  = 839
+	_ne  = 849
+	_nl  = 871
+	_no  = 879
+	_pa  = 925
+	_pl  = 947
+	_pt  = 960
+	_ro  = 988
+	_ru  = 994
+	_sh  = 1031
+	_si  = 1036
+	_sk  = 1042
+	_sl  = 1046
+	_sq  = 1073
+	_sr  = 1074
+	_sv  = 1092
+	_sw  = 1093
+	_ta  = 1104
+	_te  = 1121
+	_th  = 1131
+	_tl  = 1146
+	_tn  = 1152
+	_tr  = 1162
+	_uk  = 1198
+	_ur  = 1204
+	_uz  = 1212
+	_vi  = 1219
+	_zh  = 1321
+	_zu  = 1327
+	_jbo = 515
+	_ami = 1650
+	_bnn = 2357
+	_hak = 438
+	_tlh = 14467
+	_lb  = 661
+	_nv  = 899
+	_pwn = 12055
+	_tao = 14188
+	_tay = 14198
+	_tsu = 14662
+	_nn  = 874
+	_sfb = 13629
+	_vgt = 15701
+	_sgg = 13660
+	_cmn = 3007
+	_nan = 835
+	_hsn = 467
+)
+
+const langPrivateStart = 0x2f72
+
+const langPrivateEnd = 0x3179
+
+// lang holds an alphabetically sorted list of ISO-639 language identifiers.
+// All entries are 4 bytes. The index of the identifier (divided by 4) is the language tag.
+// For 2-byte language identifiers, the two successive bytes have the following meaning:
+//   - if the first letter of the 2- and 3-letter ISO codes are the same:
+//     the second and third letter of the 3-letter ISO code.
+//   - otherwise: a 0 and a by 2 bits right-shifted index into altLangISO3.
+//
+// For 3-byte language identifiers the 4th byte is 0.
+const lang tag.Index = "" + // Size: 5324 bytes
+	"---\x00aaaraai\x00aak\x00aau\x00abbkabi\x00abq\x00abr\x00abt\x00aby\x00a" +
+	"cd\x00ace\x00ach\x00ada\x00ade\x00adj\x00ady\x00adz\x00aeveaeb\x00aey" +
+	"\x00affragc\x00agd\x00agg\x00agm\x00ago\x00agq\x00aha\x00ahl\x00aho\x00a" +
+	"jg\x00akkaakk\x00ala\x00ali\x00aln\x00alt\x00ammhamm\x00amn\x00amo\x00am" +
+	"p\x00anrganc\x00ank\x00ann\x00any\x00aoj\x00aom\x00aoz\x00apc\x00apd\x00" +
+	"ape\x00apr\x00aps\x00apz\x00arraarc\x00arh\x00arn\x00aro\x00arq\x00ars" +
+	"\x00ary\x00arz\x00assmasa\x00ase\x00asg\x00aso\x00ast\x00ata\x00atg\x00a" +
+	"tj\x00auy\x00avvaavl\x00avn\x00avt\x00avu\x00awa\x00awb\x00awo\x00awx" +
+	"\x00ayymayb\x00azzebaakbal\x00ban\x00bap\x00bar\x00bas\x00bav\x00bax\x00" +
+	"bba\x00bbb\x00bbc\x00bbd\x00bbj\x00bbp\x00bbr\x00bcf\x00bch\x00bci\x00bc" +
+	"m\x00bcn\x00bco\x00bcq\x00bcu\x00bdd\x00beelbef\x00beh\x00bej\x00bem\x00" +
+	"bet\x00bew\x00bex\x00bez\x00bfd\x00bfq\x00bft\x00bfy\x00bgulbgc\x00bgn" +
+	"\x00bgx\x00bhihbhb\x00bhg\x00bhi\x00bhk\x00bhl\x00bho\x00bhy\x00biisbib" +
+	"\x00big\x00bik\x00bim\x00bin\x00bio\x00biq\x00bjh\x00bji\x00bjj\x00bjn" +
+	"\x00bjo\x00bjr\x00bjt\x00bjz\x00bkc\x00bkm\x00bkq\x00bku\x00bkv\x00blt" +
+	"\x00bmambmh\x00bmk\x00bmq\x00bmu\x00bnenbng\x00bnm\x00bnp\x00boodboj\x00" +
+	"bom\x00bon\x00bpy\x00bqc\x00bqi\x00bqp\x00bqv\x00brrebra\x00brh\x00brx" +
+	"\x00brz\x00bsosbsj\x00bsq\x00bss\x00bst\x00bto\x00btt\x00btv\x00bua\x00b" +
+	"uc\x00bud\x00bug\x00buk\x00bum\x00buo\x00bus\x00buu\x00bvb\x00bwd\x00bwr" +
+	"\x00bxh\x00bye\x00byn\x00byr\x00bys\x00byv\x00byx\x00bza\x00bze\x00bzf" +
+	"\x00bzh\x00bzw\x00caatcan\x00cbj\x00cch\x00ccp\x00ceheceb\x00cfa\x00cgg" +
+	"\x00chhachk\x00chm\x00cho\x00chp\x00chr\x00cja\x00cjm\x00cjv\x00ckb\x00c" +
+	"kl\x00cko\x00cky\x00cla\x00cme\x00cmg\x00cooscop\x00cps\x00crrecrh\x00cr" +
+	"j\x00crk\x00crl\x00crm\x00crs\x00csescsb\x00csw\x00ctd\x00cuhucvhvcyymda" +
+	"andad\x00daf\x00dag\x00dah\x00dak\x00dar\x00dav\x00dbd\x00dbq\x00dcc\x00" +
+	"ddn\x00deeuded\x00den\x00dga\x00dgh\x00dgi\x00dgl\x00dgr\x00dgz\x00dia" +
+	"\x00dje\x00dnj\x00dob\x00doi\x00dop\x00dow\x00dri\x00drs\x00dsb\x00dtm" +
+	"\x00dtp\x00dts\x00dty\x00dua\x00duc\x00dud\x00dug\x00dvivdva\x00dww\x00d" +
+	"yo\x00dyu\x00dzzodzg\x00ebu\x00eeweefi\x00egl\x00egy\x00eka\x00eky\x00el" +
+	"llema\x00emi\x00enngenn\x00enq\x00eopoeri\x00es\x00\x05esu\x00etstetr" +
+	"\x00ett\x00etu\x00etx\x00euusewo\x00ext\x00faasfaa\x00fab\x00fag\x00fai" +
+	"\x00fan\x00ffulffi\x00ffm\x00fiinfia\x00fil\x00fit\x00fjijflr\x00fmp\x00" +
+	"foaofod\x00fon\x00for\x00fpe\x00fqs\x00frrafrc\x00frp\x00frr\x00frs\x00f" +
+	"ub\x00fud\x00fue\x00fuf\x00fuh\x00fuq\x00fur\x00fuv\x00fuy\x00fvr\x00fyr" +
+	"ygalegaa\x00gaf\x00gag\x00gah\x00gaj\x00gam\x00gan\x00gaw\x00gay\x00gba" +
+	"\x00gbf\x00gbm\x00gby\x00gbz\x00gcr\x00gdlagde\x00gdn\x00gdr\x00geb\x00g" +
+	"ej\x00gel\x00gez\x00gfk\x00ggn\x00ghs\x00gil\x00gim\x00gjk\x00gjn\x00gju" +
+	"\x00gkn\x00gkp\x00gllgglk\x00gmm\x00gmv\x00gnrngnd\x00gng\x00god\x00gof" +
+	"\x00goi\x00gom\x00gon\x00gor\x00gos\x00got\x00grb\x00grc\x00grt\x00grw" +
+	"\x00gsw\x00guujgub\x00guc\x00gud\x00gur\x00guw\x00gux\x00guz\x00gvlvgvf" +
+	"\x00gvr\x00gvs\x00gwc\x00gwi\x00gwt\x00gyi\x00haauhag\x00hak\x00ham\x00h" +
+	"aw\x00haz\x00hbb\x00hdy\x00heebhhy\x00hiinhia\x00hif\x00hig\x00hih\x00hi" +
+	"l\x00hla\x00hlu\x00hmd\x00hmt\x00hnd\x00hne\x00hnj\x00hnn\x00hno\x00homo" +
+	"hoc\x00hoj\x00hot\x00hrrvhsb\x00hsn\x00htathuunhui\x00hyyehzerianaian" +
+	"\x00iar\x00iba\x00ibb\x00iby\x00ica\x00ich\x00idndidd\x00idi\x00idu\x00i" +
+	"eleife\x00igboigb\x00ige\x00iiiiijj\x00ikpkikk\x00ikt\x00ikw\x00ikx\x00i" +
+	"lo\x00imo\x00inndinh\x00iodoiou\x00iri\x00isslittaiukuiw\x00\x03iwm\x00i" +
+	"ws\x00izh\x00izi\x00japnjab\x00jam\x00jbo\x00jbu\x00jen\x00jgk\x00jgo" +
+	"\x00ji\x00\x06jib\x00jmc\x00jml\x00jra\x00jut\x00jvavjwavkaatkaa\x00kab" +
+	"\x00kac\x00kad\x00kai\x00kaj\x00kam\x00kao\x00kbd\x00kbm\x00kbp\x00kbq" +
+	"\x00kbx\x00kby\x00kcg\x00kck\x00kcl\x00kct\x00kde\x00kdh\x00kdl\x00kdt" +
+	"\x00kea\x00ken\x00kez\x00kfo\x00kfr\x00kfy\x00kgonkge\x00kgf\x00kgp\x00k" +
+	"ha\x00khb\x00khn\x00khq\x00khs\x00kht\x00khw\x00khz\x00kiikkij\x00kiu" +
+	"\x00kiw\x00kjuakjd\x00kjg\x00kjs\x00kjy\x00kkazkkc\x00kkj\x00klalkln\x00" +
+	"klq\x00klt\x00klx\x00kmhmkmb\x00kmh\x00kmo\x00kms\x00kmu\x00kmw\x00knank" +
+	"nf\x00knp\x00koorkoi\x00kok\x00kol\x00kos\x00koz\x00kpe\x00kpf\x00kpo" +
+	"\x00kpr\x00kpx\x00kqb\x00kqf\x00kqs\x00kqy\x00kraukrc\x00kri\x00krj\x00k" +
+	"rl\x00krs\x00kru\x00ksasksb\x00ksd\x00ksf\x00ksh\x00ksj\x00ksr\x00ktb" +
+	"\x00ktm\x00kto\x00kuurkub\x00kud\x00kue\x00kuj\x00kum\x00kun\x00kup\x00k" +
+	"us\x00kvomkvg\x00kvr\x00kvx\x00kw\x00\x01kwj\x00kwo\x00kxa\x00kxc\x00kxm" +
+	"\x00kxp\x00kxw\x00kxz\x00kyirkye\x00kyx\x00kzr\x00laatlab\x00lad\x00lag" +
+	"\x00lah\x00laj\x00las\x00lbtzlbe\x00lbu\x00lbw\x00lcm\x00lcp\x00ldb\x00l" +
+	"ed\x00lee\x00lem\x00lep\x00leq\x00leu\x00lez\x00lguglgg\x00liimlia\x00li" +
+	"d\x00lif\x00lig\x00lih\x00lij\x00lis\x00ljp\x00lki\x00lkt\x00lle\x00lln" +
+	"\x00lmn\x00lmo\x00lmp\x00lninlns\x00lnu\x00loaoloj\x00lok\x00lol\x00lor" +
+	"\x00los\x00loz\x00lrc\x00ltitltg\x00luublua\x00luo\x00luy\x00luz\x00lvav" +
+	"lwl\x00lzh\x00lzz\x00mad\x00maf\x00mag\x00mai\x00mak\x00man\x00mas\x00ma" +
+	"w\x00maz\x00mbh\x00mbo\x00mbq\x00mbu\x00mbw\x00mci\x00mcp\x00mcq\x00mcr" +
+	"\x00mcu\x00mda\x00mde\x00mdf\x00mdh\x00mdj\x00mdr\x00mdx\x00med\x00mee" +
+	"\x00mek\x00men\x00mer\x00met\x00meu\x00mfa\x00mfe\x00mfn\x00mfo\x00mfq" +
+	"\x00mglgmgh\x00mgl\x00mgo\x00mgp\x00mgy\x00mhahmhi\x00mhl\x00mirimif\x00" +
+	"min\x00mis\x00miw\x00mkkdmki\x00mkl\x00mkp\x00mkw\x00mlalmle\x00mlp\x00m" +
+	"ls\x00mmo\x00mmu\x00mmx\x00mnonmna\x00mnf\x00mni\x00mnw\x00moolmoa\x00mo" +
+	"e\x00moh\x00mos\x00mox\x00mpp\x00mps\x00mpt\x00mpx\x00mql\x00mrarmrd\x00" +
+	"mrj\x00mro\x00mssamtltmtc\x00mtf\x00mti\x00mtr\x00mua\x00mul\x00mur\x00m" +
+	"us\x00mva\x00mvn\x00mvy\x00mwk\x00mwr\x00mwv\x00mxc\x00mxm\x00myyamyk" +
+	"\x00mym\x00myv\x00myw\x00myx\x00myz\x00mzk\x00mzm\x00mzn\x00mzp\x00mzw" +
+	"\x00mzz\x00naaunac\x00naf\x00nah\x00nak\x00nan\x00nap\x00naq\x00nas\x00n" +
+	"bobnca\x00nce\x00ncf\x00nch\x00nco\x00ncu\x00nddendc\x00nds\x00neepneb" +
+	"\x00new\x00nex\x00nfr\x00ngdonga\x00ngb\x00ngl\x00nhb\x00nhe\x00nhw\x00n" +
+	"if\x00nii\x00nij\x00nin\x00niu\x00niy\x00niz\x00njo\x00nkg\x00nko\x00nll" +
+	"dnmg\x00nmz\x00nnnonnf\x00nnh\x00nnk\x00nnm\x00noornod\x00noe\x00non\x00" +
+	"nop\x00nou\x00nqo\x00nrblnrb\x00nsk\x00nsn\x00nso\x00nss\x00ntm\x00ntr" +
+	"\x00nui\x00nup\x00nus\x00nuv\x00nux\x00nvavnwb\x00nxq\x00nxr\x00nyyanym" +
+	"\x00nyn\x00nzi\x00occiogc\x00ojjiokr\x00okv\x00omrmong\x00onn\x00ons\x00" +
+	"opm\x00orrioro\x00oru\x00osssosa\x00ota\x00otk\x00ozm\x00paanpag\x00pal" +
+	"\x00pam\x00pap\x00pau\x00pbi\x00pcd\x00pcm\x00pdc\x00pdt\x00ped\x00peo" +
+	"\x00pex\x00pfl\x00phl\x00phn\x00pilipil\x00pip\x00pka\x00pko\x00plolpla" +
+	"\x00pms\x00png\x00pnn\x00pnt\x00pon\x00ppo\x00pra\x00prd\x00prg\x00psusp" +
+	"ss\x00ptorptp\x00puu\x00pwa\x00quuequc\x00qug\x00rai\x00raj\x00rao\x00rc" +
+	"f\x00rej\x00rel\x00res\x00rgn\x00rhg\x00ria\x00rif\x00rjs\x00rkt\x00rmoh" +
+	"rmf\x00rmo\x00rmt\x00rmu\x00rnunrna\x00rng\x00roonrob\x00rof\x00roo\x00r" +
+	"ro\x00rtm\x00ruusrue\x00rug\x00rw\x00\x04rwk\x00rwo\x00ryu\x00saansaf" +
+	"\x00sah\x00saq\x00sas\x00sat\x00sav\x00saz\x00sba\x00sbe\x00sbp\x00scrds" +
+	"ck\x00scl\x00scn\x00sco\x00scs\x00sdndsdc\x00sdh\x00semesef\x00seh\x00se" +
+	"i\x00ses\x00sgagsga\x00sgs\x00sgw\x00sgz\x00sh\x00\x02shi\x00shk\x00shn" +
+	"\x00shu\x00siinsid\x00sig\x00sil\x00sim\x00sjr\x00sklkskc\x00skr\x00sks" +
+	"\x00sllvsld\x00sli\x00sll\x00sly\x00smmosma\x00smi\x00smj\x00smn\x00smp" +
+	"\x00smq\x00sms\x00snnasnc\x00snk\x00snp\x00snx\x00sny\x00soomsok\x00soq" +
+	"\x00sou\x00soy\x00spd\x00spl\x00sps\x00sqqisrrpsrb\x00srn\x00srr\x00srx" +
+	"\x00ssswssd\x00ssg\x00ssy\x00stotstk\x00stq\x00suunsua\x00sue\x00suk\x00" +
+	"sur\x00sus\x00svweswwaswb\x00swc\x00swg\x00swp\x00swv\x00sxn\x00sxw\x00s" +
+	"yl\x00syr\x00szl\x00taamtaj\x00tal\x00tan\x00taq\x00tbc\x00tbd\x00tbf" +
+	"\x00tbg\x00tbo\x00tbw\x00tbz\x00tci\x00tcy\x00tdd\x00tdg\x00tdh\x00teelt" +
+	"ed\x00tem\x00teo\x00tet\x00tfi\x00tggktgc\x00tgo\x00tgu\x00thhathl\x00th" +
+	"q\x00thr\x00tiirtif\x00tig\x00tik\x00tim\x00tio\x00tiv\x00tkuktkl\x00tkr" +
+	"\x00tkt\x00tlgltlf\x00tlx\x00tly\x00tmh\x00tmy\x00tnsntnh\x00toontof\x00" +
+	"tog\x00toq\x00tpi\x00tpm\x00tpz\x00tqo\x00trurtru\x00trv\x00trw\x00tssot" +
+	"sd\x00tsf\x00tsg\x00tsj\x00tsw\x00ttatttd\x00tte\x00ttj\x00ttr\x00tts" +
+	"\x00ttt\x00tuh\x00tul\x00tum\x00tuq\x00tvd\x00tvl\x00tvu\x00twwitwh\x00t" +
+	"wq\x00txg\x00tyahtya\x00tyv\x00tzm\x00ubu\x00udm\x00ugiguga\x00ukkruli" +
+	"\x00umb\x00und\x00unr\x00unx\x00urrduri\x00urt\x00urw\x00usa\x00utr\x00u" +
+	"vh\x00uvl\x00uzzbvag\x00vai\x00van\x00veenvec\x00vep\x00viievic\x00viv" +
+	"\x00vls\x00vmf\x00vmw\x00voolvot\x00vro\x00vun\x00vut\x00walnwae\x00waj" +
+	"\x00wal\x00wan\x00war\x00wbp\x00wbq\x00wbr\x00wci\x00wer\x00wgi\x00whg" +
+	"\x00wib\x00wiu\x00wiv\x00wja\x00wji\x00wls\x00wmo\x00wnc\x00wni\x00wnu" +
+	"\x00woolwob\x00wos\x00wrs\x00wsk\x00wtm\x00wuu\x00wuv\x00wwa\x00xav\x00x" +
+	"bi\x00xcr\x00xes\x00xhhoxla\x00xlc\x00xld\x00xmf\x00xmn\x00xmr\x00xna" +
+	"\x00xnr\x00xog\x00xon\x00xpr\x00xrb\x00xsa\x00xsi\x00xsm\x00xsr\x00xwe" +
+	"\x00yam\x00yao\x00yap\x00yas\x00yat\x00yav\x00yay\x00yaz\x00yba\x00ybb" +
+	"\x00yby\x00yer\x00ygr\x00ygw\x00yiidyko\x00yle\x00ylg\x00yll\x00yml\x00y" +
+	"ooryon\x00yrb\x00yre\x00yrl\x00yss\x00yua\x00yue\x00yuj\x00yut\x00yuw" +
+	"\x00zahazag\x00zbl\x00zdj\x00zea\x00zgh\x00zhhozhx\x00zia\x00zlm\x00zmi" +
+	"\x00zne\x00zuulzxx\x00zza\x00\xff\xff\xff\xff"
+
+const langNoIndexOffset = 1330
+
+// langNoIndex is a bit vector of all 3-letter language codes that are not used as an index
+// in lookup tables. The language ids for these language codes are derived directly
+// from the letters and are not consecutive.
+// Size: 2197 bytes, 2197 elements
+var langNoIndex = [2197]uint8{
+	// Entry 0 - 3F
+	0xff, 0xf8, 0xed, 0xfe, 0xeb, 0xd3, 0x3b, 0xd2,
+	0xfb, 0xbf, 0x7a, 0xfa, 0x37, 0x1d, 0x3c, 0x57,
+	0x6e, 0x97, 0x73, 0x38, 0xfb, 0xea, 0xbf, 0x70,
+	0xad, 0x03, 0xff, 0xff, 0xcf, 0x05, 0x84, 0x72,
+	0xe9, 0xbf, 0xfd, 0xbf, 0xbf, 0xf7, 0xfd, 0x77,
+	0x0f, 0xff, 0xef, 0x6f, 0xff, 0xfb, 0xdf, 0xe2,
+	0xc9, 0xf8, 0x7f, 0x7e, 0x4d, 0xbc, 0x0a, 0x6a,
+	0x7c, 0xea, 0xe3, 0xfa, 0x7a, 0xbf, 0x67, 0xff,
+	// Entry 40 - 7F
+	0xff, 0xff, 0xff, 0xdf, 0x2a, 0x54, 0x91, 0xc0,
+	0x5d, 0xe3, 0x97, 0x14, 0x07, 0x20, 0xdd, 0xed,
+	0x9f, 0x3f, 0xc9, 0x21, 0xf8, 0x3f, 0x94, 0x35,
+	0x7c, 0x5f, 0xff, 0x5f, 0x8e, 0x6e, 0xdf, 0xff,
+	0xff, 0xff, 0x55, 0x7c, 0xd3, 0xfd, 0xbf, 0xb5,
+	0x7b, 0xdf, 0x7f, 0xf7, 0xca, 0xfe, 0xdb, 0xa3,
+	0xa8, 0xff, 0x1f, 0x67, 0x7d, 0xeb, 0xef, 0xce,
+	0xff, 0xff, 0x9f, 0xff, 0xb7, 0xef, 0xfe, 0xcf,
+	// Entry 80 - BF
+	0xdb, 0xff, 0xf3, 0xcd, 0xfb, 0x7f, 0xff, 0xff,
+	0xbb, 0xee, 0xf7, 0xbd, 0xdb, 0xff, 0x5f, 0xf7,
+	0xfd, 0xf2, 0xfd, 0xff, 0x5e, 0x2f, 0x3b, 0xba,
+	0x7e, 0xff, 0xff, 0xfe, 0xf7, 0xff, 0xdd, 0xff,
+	0xfd, 0xdf, 0xfb, 0xfe, 0x9d, 0xb4, 0xd3, 0xff,
+	0xef, 0xff, 0xdf, 0xf7, 0x7f, 0xb7, 0xfd, 0xd5,
+	0xa5, 0x77, 0x40, 0xff, 0x9c, 0xc1, 0x41, 0x2c,
+	0x08, 0x21, 0x41, 0x00, 0x50, 0x40, 0x00, 0x80,
+	// Entry C0 - FF
+	0xfb, 0x4a, 0xf2, 0x9f, 0xb4, 0x42, 0x41, 0x96,
+	0x1b, 0x14, 0x08, 0xf3, 0x2b, 0xe7, 0x17, 0x56,
+	0x05, 0x7d, 0x0e, 0x1c, 0x37, 0x7f, 0xf3, 0xef,
+	0x97, 0xff, 0x5d, 0x38, 0x64, 0x08, 0x00, 0x10,
+	0xbc, 0x85, 0xaf, 0xdf, 0xff, 0xff, 0x7b, 0x35,
+	0x3e, 0xc7, 0xc7, 0xdf, 0xff, 0x01, 0x81, 0x00,
+	0xb0, 0x05, 0x80, 0x00, 0x20, 0x00, 0x00, 0x03,
+	0x40, 0x00, 0x40, 0x92, 0x21, 0x50, 0xb1, 0x5d,
+	// Entry 100 - 13F
+	0xfd, 0xdc, 0xbe, 0x5e, 0x00, 0x00, 0x02, 0x64,
+	0x0d, 0x19, 0x41, 0xdf, 0x79, 0x22, 0x00, 0x00,
+	0x00, 0x5e, 0x64, 0xdc, 0x24, 0xe5, 0xd9, 0xe3,
+	0xfe, 0xff, 0xfd, 0xcb, 0x9f, 0x14, 0x41, 0x0c,
+	0x86, 0x00, 0xd1, 0x00, 0xf0, 0xc7, 0x67, 0x5f,
+	0x56, 0x99, 0x5e, 0xb5, 0x6c, 0xaf, 0x03, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0xc0, 0x37, 0xda, 0x56,
+	0x90, 0x6d, 0x01, 0x2e, 0x96, 0x69, 0x20, 0xfb,
+	// Entry 140 - 17F
+	0xff, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x0c, 0x16,
+	0x03, 0x00, 0x00, 0xb0, 0x14, 0x23, 0x50, 0x06,
+	0x0a, 0x00, 0x01, 0x00, 0x00, 0x10, 0x11, 0x09,
+	0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x00, 0x10,
+	0x00, 0x00, 0x44, 0x00, 0x00, 0x10, 0x00, 0x05,
+	0x08, 0x00, 0x00, 0x05, 0x00, 0x80, 0x28, 0x04,
+	0x00, 0x00, 0x40, 0xd5, 0x2d, 0x00, 0x64, 0x35,
+	0x24, 0x52, 0xf4, 0xd5, 0xbf, 0x62, 0xc9, 0x03,
+	// Entry 180 - 1BF
+	0x00, 0x80, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x13, 0x39, 0x01, 0xdd, 0x57, 0x98,
+	0x21, 0x18, 0x81, 0x08, 0x00, 0x01, 0x40, 0x82,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x40, 0x00, 0x44, 0x00, 0x00, 0x80, 0xea,
+	0xa9, 0x39, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	// Entry 1C0 - 1FF
+	0x00, 0x03, 0x28, 0x05, 0x00, 0x00, 0x00, 0x00,
+	0x04, 0x20, 0x04, 0xa6, 0x00, 0x04, 0x00, 0x00,
+	0x81, 0x50, 0x00, 0x00, 0x00, 0x11, 0x84, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x55,
+	0x02, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x40,
+	0x30, 0x83, 0x01, 0x00, 0x00, 0x00, 0x11, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1e, 0xcd, 0xbf, 0x7a, 0xbf,
+	// Entry 200 - 23F
+	0xdf, 0xc3, 0x83, 0x82, 0xc0, 0xfb, 0x57, 0x27,
+	0xed, 0x55, 0xe7, 0x01, 0x00, 0x20, 0xb2, 0xc5,
+	0xa4, 0x45, 0x25, 0x9b, 0x02, 0xdf, 0xe1, 0xdf,
+	0x03, 0x44, 0x08, 0x90, 0x01, 0x04, 0x81, 0xe3,
+	0x92, 0x54, 0xdb, 0x28, 0xd3, 0x5f, 0xfe, 0x6d,
+	0x79, 0xed, 0x1c, 0x7f, 0x04, 0x08, 0x00, 0x01,
+	0x21, 0x12, 0x64, 0x5f, 0xdd, 0x0e, 0x85, 0x4f,
+	0x40, 0x40, 0x00, 0x04, 0xf1, 0xfd, 0x3d, 0x54,
+	// Entry 240 - 27F
+	0xe8, 0x03, 0xb4, 0x27, 0x23, 0x0d, 0x00, 0x00,
+	0x20, 0x7b, 0x78, 0x02, 0x07, 0x84, 0x00, 0xf0,
+	0xbb, 0x7e, 0x5a, 0x00, 0x18, 0x04, 0x81, 0x00,
+	0x00, 0x00, 0x80, 0x10, 0x90, 0x1c, 0x01, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x04,
+	0x08, 0xa0, 0x70, 0xa5, 0x0c, 0x40, 0x00, 0x00,
+	0x91, 0x24, 0x04, 0x68, 0x00, 0x20, 0x70, 0xff,
+	0x7b, 0x7f, 0x70, 0x00, 0x05, 0x9b, 0xdd, 0x66,
+	// Entry 280 - 2BF
+	0x03, 0x00, 0x11, 0x00, 0x00, 0x00, 0x40, 0x05,
+	0xb5, 0xb6, 0x80, 0x08, 0x04, 0x00, 0x04, 0x51,
+	0xe2, 0xef, 0xfd, 0x3f, 0x05, 0x09, 0x08, 0x05,
+	0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x60,
+	0xe7, 0x48, 0x00, 0x81, 0x20, 0xc0, 0x05, 0x80,
+	0x03, 0x00, 0x00, 0x00, 0x8c, 0x50, 0x40, 0x04,
+	0x84, 0x47, 0x84, 0x40, 0x20, 0x10, 0x00, 0x20,
+	// Entry 2C0 - 2FF
+	0x02, 0x50, 0x80, 0x11, 0x00, 0x99, 0x6c, 0xe2,
+	0x50, 0x27, 0x1d, 0x11, 0x29, 0x0e, 0x59, 0xe9,
+	0x33, 0x08, 0x00, 0x20, 0x04, 0x40, 0x10, 0x00,
+	0x00, 0x00, 0x50, 0x44, 0x92, 0x49, 0xd6, 0x5d,
+	0xa7, 0x81, 0x47, 0x97, 0xfb, 0x00, 0x10, 0x00,
+	0x08, 0x00, 0x80, 0x00, 0x40, 0x04, 0x00, 0x01,
+	0x02, 0x00, 0x01, 0x40, 0x80, 0x00, 0x40, 0x08,
+	0xd8, 0xeb, 0xf6, 0x39, 0xc4, 0x8d, 0x12, 0x00,
+	// Entry 300 - 33F
+	0x00, 0x0c, 0x04, 0x01, 0x20, 0x20, 0xdd, 0xa0,
+	0x01, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+	0x04, 0x10, 0xd0, 0x9d, 0x95, 0x13, 0x04, 0x80,
+	0x00, 0x01, 0xd0, 0x16, 0x40, 0x00, 0x10, 0xb0,
+	0x10, 0x62, 0x4c, 0xd2, 0x02, 0x01, 0x4a, 0x00,
+	0x46, 0x04, 0x00, 0x08, 0x02, 0x00, 0x20, 0x80,
+	0x00, 0x80, 0x06, 0x00, 0x08, 0x00, 0x00, 0x00,
+	0x00, 0xf0, 0xd8, 0x6f, 0x15, 0x02, 0x08, 0x00,
+	// Entry 340 - 37F
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01,
+	0x00, 0x10, 0x00, 0x00, 0x00, 0xf0, 0x84, 0xe3,
+	0xdd, 0xbf, 0xf9, 0xf9, 0x3b, 0x7f, 0x7f, 0xdb,
+	0xfd, 0xfc, 0xfe, 0xdf, 0xff, 0xfd, 0xff, 0xf6,
+	0xfb, 0xfc, 0xf7, 0x1f, 0xff, 0xb3, 0x6c, 0xff,
+	0xd9, 0xad, 0xdf, 0xfe, 0xef, 0xba, 0xdf, 0xff,
+	0xff, 0xff, 0xb7, 0xdd, 0x7d, 0xbf, 0xab, 0x7f,
+	0xfd, 0xfd, 0xdf, 0x2f, 0x9c, 0xdf, 0xf3, 0x6f,
+	// Entry 380 - 3BF
+	0xdf, 0xdd, 0xff, 0xfb, 0xee, 0xd2, 0xab, 0x5f,
+	0xd5, 0xdf, 0x7f, 0xff, 0xeb, 0xff, 0xe4, 0x4d,
+	0xf9, 0xff, 0xfe, 0xf7, 0xfd, 0xdf, 0xfb, 0xbf,
+	0xee, 0xdb, 0x6f, 0xef, 0xff, 0x7f, 0xff, 0xff,
+	0xf7, 0x5f, 0xd3, 0x3b, 0xfd, 0xd9, 0xdf, 0xeb,
+	0xbc, 0x08, 0x05, 0x24, 0xff, 0x07, 0x70, 0xfe,
+	0xe6, 0x5e, 0x00, 0x08, 0x00, 0x83, 0x7d, 0x1f,
+	0x06, 0xe6, 0x72, 0x60, 0xd1, 0x3c, 0x7f, 0x44,
+	// Entry 3C0 - 3FF
+	0x02, 0x30, 0x9f, 0x7a, 0x16, 0xbd, 0x7f, 0x57,
+	0xf2, 0xff, 0x31, 0xff, 0xf2, 0x1e, 0x90, 0xf7,
+	0xf1, 0xf9, 0x45, 0x80, 0x01, 0x02, 0x00, 0x20,
+	0x40, 0x54, 0x9f, 0x8a, 0xdf, 0xf9, 0x6e, 0x11,
+	0x86, 0x51, 0xc0, 0xf3, 0xfb, 0x47, 0x40, 0x03,
+	0x05, 0xd1, 0x50, 0x5c, 0x00, 0x40, 0x00, 0x10,
+	0x04, 0x02, 0x00, 0x00, 0x0a, 0x00, 0x17, 0xd2,
+	0xb9, 0xfd, 0xfc, 0xba, 0xfe, 0xef, 0xc7, 0xbe,
+	// Entry 400 - 43F
+	0x53, 0x6f, 0xdf, 0xe7, 0xdb, 0x65, 0xbb, 0x7f,
+	0xfa, 0xff, 0x77, 0xf3, 0xef, 0xbf, 0xfd, 0xf7,
+	0xdf, 0xdf, 0x9b, 0x7f, 0xff, 0xff, 0x7f, 0x6f,
+	0xf7, 0xfb, 0xeb, 0xdf, 0xbc, 0xff, 0xbf, 0x6b,
+	0x7b, 0xfb, 0xff, 0xce, 0x76, 0xbd, 0xf7, 0xf7,
+	0xdf, 0xdc, 0xf7, 0xf7, 0xff, 0xdf, 0xf3, 0xfe,
+	0xef, 0xff, 0xff, 0xff, 0xb6, 0x7f, 0x7f, 0xde,
+	0xf7, 0xb9, 0xeb, 0x77, 0xff, 0xfb, 0xbf, 0xdf,
+	// Entry 440 - 47F
+	0xfd, 0xfe, 0xfb, 0xff, 0xfe, 0xeb, 0x1f, 0x7d,
+	0x2f, 0xfd, 0xb6, 0xb5, 0xa5, 0xfc, 0xff, 0xfd,
+	0x7f, 0x4e, 0xbf, 0x8f, 0xae, 0xff, 0xee, 0xdf,
+	0x7f, 0xf7, 0x73, 0x02, 0x02, 0x04, 0xfc, 0xf7,
+	0xff, 0xb7, 0xd7, 0xef, 0xfe, 0xcd, 0xf5, 0xce,
+	0xe2, 0x8e, 0xe7, 0xbf, 0xb7, 0xff, 0x56, 0xfd,
+	0xcd, 0xff, 0xfb, 0xff, 0xdf, 0xd7, 0xea, 0xff,
+	0xe5, 0x5f, 0x6d, 0x0f, 0xa7, 0x51, 0x06, 0xc4,
+	// Entry 480 - 4BF
+	0x93, 0x50, 0x5d, 0xaf, 0xa6, 0xff, 0x99, 0xfb,
+	0x63, 0x1d, 0x53, 0xff, 0xef, 0xb7, 0x35, 0x20,
+	0x14, 0x00, 0x55, 0x51, 0xc2, 0x65, 0xf5, 0x41,
+	0xe2, 0xff, 0xfc, 0xdf, 0x02, 0x85, 0xc5, 0x05,
+	0x00, 0x22, 0x00, 0x74, 0x69, 0x10, 0x08, 0x05,
+	0x41, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x51, 0x20, 0x05, 0x04, 0x01, 0x00, 0x00,
+	0x06, 0x11, 0x20, 0x00, 0x18, 0x01, 0x92, 0xf1,
+	// Entry 4C0 - 4FF
+	0xfd, 0x47, 0x69, 0x06, 0x95, 0x06, 0x57, 0xed,
+	0xfb, 0x4d, 0x1c, 0x6b, 0x83, 0x04, 0x62, 0x40,
+	0x00, 0x11, 0x42, 0x00, 0x00, 0x00, 0x54, 0x83,
+	0xb8, 0x4f, 0x10, 0x8e, 0x89, 0x46, 0xde, 0xf7,
+	0x13, 0x31, 0x00, 0x20, 0x00, 0x00, 0x00, 0x90,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x10, 0x00,
+	0x01, 0x00, 0x00, 0xf0, 0x5b, 0xf4, 0xbe, 0x3d,
+	0xbe, 0xcf, 0xf7, 0xaf, 0x42, 0x04, 0x84, 0x41,
+	// Entry 500 - 53F
+	0x30, 0xff, 0x79, 0x72, 0x04, 0x00, 0x00, 0x49,
+	0x2d, 0x14, 0x27, 0x5f, 0xed, 0xf1, 0x3f, 0xe7,
+	0x3f, 0x00, 0x00, 0x02, 0xc6, 0xa0, 0x1e, 0xf8,
+	0xbb, 0xff, 0xfd, 0xfb, 0xb7, 0xfd, 0xe7, 0xf7,
+	0xfd, 0xfc, 0xd5, 0xed, 0x47, 0xf4, 0x7e, 0x10,
+	0x01, 0x01, 0x84, 0x6d, 0xff, 0xf7, 0xdd, 0xf9,
+	0x5b, 0x05, 0x86, 0xed, 0xf5, 0x77, 0xbd, 0x3c,
+	0x00, 0x00, 0x00, 0x42, 0x71, 0x42, 0x00, 0x40,
+	// Entry 540 - 57F
+	0x00, 0x00, 0x01, 0x43, 0x19, 0x24, 0x08, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	// Entry 580 - 5BF
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xab, 0xbd, 0xe7, 0x57, 0xee, 0x13, 0x5d,
+	0x09, 0xc1, 0x40, 0x21, 0xfa, 0x17, 0x01, 0x80,
+	0x00, 0x00, 0x00, 0x00, 0xf0, 0xce, 0xfb, 0xbf,
+	0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+	0x00, 0x30, 0x15, 0xa3, 0x10, 0x00, 0x00, 0x00,
+	0x11, 0x04, 0x16, 0x00, 0x00, 0x02, 0x20, 0x81,
+	0xa3, 0x01, 0x50, 0x00, 0x00, 0x83, 0x11, 0x40,
+	// Entry 5C0 - 5FF
+	0x00, 0x00, 0x00, 0xf0, 0xdd, 0x7b, 0xbe, 0x02,
+	0xaa, 0x10, 0x5d, 0x98, 0x52, 0x00, 0x80, 0x20,
+	0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x02, 0x02,
+	0x3d, 0x40, 0x10, 0x02, 0x10, 0x61, 0x5a, 0x9d,
+	0x31, 0x00, 0x00, 0x00, 0x01, 0x18, 0x02, 0x20,
+	0x00, 0x00, 0x01, 0x00, 0x42, 0x00, 0x20, 0x00,
+	0x00, 0x1f, 0xdf, 0xd2, 0xb9, 0xff, 0xfd, 0x3f,
+	0x1f, 0x98, 0xcf, 0x9c, 0xff, 0xaf, 0x5f, 0xfe,
+	// Entry 600 - 63F
+	0x7b, 0x4b, 0x40, 0x10, 0xe1, 0xfd, 0xaf, 0xd9,
+	0xb7, 0xf6, 0xfb, 0xb3, 0xc7, 0xff, 0x6f, 0xf1,
+	0x73, 0xb1, 0x7f, 0x9f, 0x7f, 0xbd, 0xfc, 0xb7,
+	0xee, 0x1c, 0xfa, 0xcb, 0xef, 0xdd, 0xf9, 0xbd,
+	0x6e, 0xae, 0x55, 0xfd, 0x6e, 0x81, 0x76, 0x9f,
+	0xd4, 0x77, 0xf5, 0x7d, 0xfb, 0xff, 0xeb, 0xfe,
+	0xbe, 0x5f, 0x46, 0x5b, 0xe9, 0x5f, 0x50, 0x18,
+	0x02, 0xfa, 0xf7, 0x9d, 0x15, 0x97, 0x05, 0x0f,
+	// Entry 640 - 67F
+	0x75, 0xc4, 0x7d, 0x81, 0x92, 0xf5, 0x57, 0x6c,
+	0xff, 0xe4, 0xef, 0x6f, 0xff, 0xfc, 0xdd, 0xde,
+	0xfc, 0xfd, 0x76, 0x5f, 0x7a, 0x3f, 0x00, 0x98,
+	0x02, 0xfb, 0xa3, 0xef, 0xf3, 0xd6, 0xf2, 0xff,
+	0xb9, 0xda, 0x7d, 0xd0, 0x3e, 0x15, 0x7b, 0xb4,
+	0xf5, 0x3e, 0xff, 0xff, 0xf1, 0xf7, 0xff, 0xe7,
+	0x5f, 0xff, 0xff, 0x9e, 0xdf, 0xf6, 0xd7, 0xb9,
+	0xef, 0x27, 0x80, 0xbb, 0xc5, 0xff, 0xff, 0xe3,
+	// Entry 680 - 6BF
+	0x97, 0x9d, 0xbf, 0x9f, 0xf7, 0xc7, 0xfd, 0x37,
+	0xce, 0x7f, 0x44, 0x1d, 0x73, 0x7f, 0xf8, 0xda,
+	0x5d, 0xce, 0x7d, 0x06, 0xb9, 0xea, 0x79, 0xa0,
+	0x1a, 0x20, 0x00, 0x30, 0x02, 0x04, 0x24, 0x08,
+	0x04, 0x00, 0x00, 0x40, 0xd4, 0x02, 0x04, 0x00,
+	0x00, 0x04, 0x00, 0x04, 0x00, 0x20, 0x09, 0x06,
+	0x50, 0x00, 0x08, 0x00, 0x00, 0x00, 0x24, 0x00,
+	0x04, 0x00, 0x10, 0xdc, 0x58, 0xd7, 0x0d, 0x0f,
+	// Entry 6C0 - 6FF
+	0x54, 0x4d, 0xf1, 0x16, 0x44, 0xd5, 0x42, 0x08,
+	0x40, 0x02, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00,
+	0x00, 0xdc, 0xfb, 0xcb, 0x0e, 0x58, 0x48, 0x41,
+	0x24, 0x20, 0x04, 0x00, 0x30, 0x12, 0x40, 0x00,
+	0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0x00, 0x80, 0x10, 0x10, 0xab,
+	0x6d, 0x93, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x80, 0x80, 0x25, 0x00, 0x00,
+	// Entry 700 - 73F
+	0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+	0x80, 0x86, 0xc2, 0x00, 0x00, 0x01, 0x00, 0x01,
+	0xff, 0x18, 0x02, 0x00, 0x02, 0xf0, 0xfd, 0x79,
+	0x3b, 0x00, 0x25, 0x00, 0x00, 0x00, 0x02, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
+	0x03, 0x00, 0x09, 0x20, 0x00, 0x00, 0x01, 0x00,
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 740 - 77F
+	0x00, 0x00, 0x00, 0xef, 0xd5, 0xfd, 0xcf, 0x7e,
+	0xb0, 0x11, 0x00, 0x00, 0x00, 0x92, 0x01, 0x46,
+	0xcd, 0xf9, 0x5c, 0x00, 0x01, 0x00, 0x30, 0x04,
+	0x04, 0x55, 0x00, 0x01, 0x04, 0xf4, 0x3f, 0x4a,
+	0x01, 0x00, 0x00, 0xb0, 0x80, 0x20, 0x55, 0x75,
+	0x97, 0x7c, 0xdf, 0x31, 0xcc, 0x68, 0xd1, 0x03,
+	0xd5, 0x57, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x2c, 0xf7, 0xcb, 0x1f, 0x14, 0x60,
+	// Entry 780 - 7BF
+	0x83, 0x68, 0x01, 0x10, 0x8b, 0x38, 0x8a, 0x01,
+	0x00, 0x00, 0x20, 0x00, 0x24, 0x44, 0x00, 0x00,
+	0x10, 0x03, 0x31, 0x02, 0x01, 0x00, 0x00, 0xf0,
+	0xf5, 0xff, 0xd5, 0x97, 0xbc, 0x70, 0xd6, 0x78,
+	0x78, 0x15, 0x50, 0x05, 0xa4, 0x84, 0xa9, 0x41,
+	0x00, 0x00, 0x00, 0x6b, 0x39, 0x52, 0x74, 0x40,
+	0xe8, 0x30, 0x90, 0x6a, 0x92, 0x00, 0x00, 0x02,
+	0xff, 0xef, 0xff, 0x4b, 0x85, 0x53, 0xf4, 0xed,
+	// Entry 7C0 - 7FF
+	0xdd, 0xbf, 0xf2, 0x5d, 0xc7, 0x0c, 0xd5, 0x42,
+	0xfc, 0xff, 0xf7, 0x1f, 0x00, 0x80, 0x40, 0x56,
+	0xcc, 0x16, 0x9e, 0xea, 0x35, 0x7d, 0xef, 0xff,
+	0xbd, 0xa4, 0xaf, 0x01, 0x44, 0x18, 0x01, 0x4d,
+	0x4e, 0x4a, 0x08, 0x50, 0x28, 0x30, 0xe0, 0x80,
+	0x10, 0x20, 0x24, 0x00, 0xff, 0x2f, 0xd3, 0x60,
+	0xfe, 0x01, 0x02, 0x88, 0x2a, 0x40, 0x16, 0x01,
+	0x01, 0x15, 0x2b, 0x3c, 0x01, 0x00, 0x00, 0x10,
+	// Entry 800 - 83F
+	0x90, 0x49, 0x41, 0x02, 0x02, 0x01, 0xe1, 0xbf,
+	0xbf, 0x03, 0x00, 0x00, 0x10, 0xdc, 0xa3, 0xd1,
+	0x40, 0x9c, 0x44, 0xdf, 0xf5, 0x8f, 0x66, 0xb3,
+	0x55, 0x20, 0xd4, 0xc1, 0xd8, 0x30, 0x3d, 0x80,
+	0x00, 0x00, 0x00, 0x04, 0xd4, 0x11, 0xc5, 0x84,
+	0x2f, 0x50, 0x00, 0x22, 0x50, 0x6e, 0xbd, 0x93,
+	0x07, 0x00, 0x20, 0x10, 0x84, 0xb2, 0x45, 0x10,
+	0x06, 0x44, 0x00, 0x00, 0x12, 0x02, 0x11, 0x00,
+	// Entry 840 - 87F
+	0xf0, 0xfb, 0xfd, 0x7f, 0x05, 0x00, 0x16, 0x89,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x03,
+	0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x02, 0x28,
+	0x84, 0x00, 0x21, 0xc0, 0x23, 0x24, 0x00, 0x00,
+	0x00, 0xcb, 0xe4, 0x3a, 0x46, 0x88, 0x54, 0xf1,
+	0xef, 0xff, 0x7f, 0x12, 0x01, 0x01, 0x84, 0x50,
+	0x07, 0xfc, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x40,
+	0x10, 0x38, 0x01, 0x01, 0x1c, 0x12, 0x40, 0xe1,
+	// Entry 880 - 8BF
+	0x76, 0x16, 0x08, 0x03, 0x10, 0x00, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x24,
+	0x0a, 0x00, 0x80, 0x00, 0x00,
+}
+
+// altLangISO3 holds an alphabetically sorted list of 3-letter language code alternatives
+// to 2-letter language codes that cannot be derived using the method described above.
+// Each 3-letter code is followed by its 1-byte langID.
+const altLangISO3 tag.Index = "---\x00cor\x00hbs\x01heb\x02kin\x03spa\x04yid\x05\xff\xff\xff\xff"
+
+// altLangIndex is used to convert indexes in altLangISO3 to langIDs.
+// Size: 12 bytes, 6 elements
+var altLangIndex = [6]uint16{
+	0x0281, 0x0407, 0x01fb, 0x03e5, 0x013e, 0x0208,
+}
+
+// AliasMap maps langIDs to their suggested replacements.
+// Size: 772 bytes, 193 elements
+var AliasMap = [193]FromTo{
+	0:   {From: 0x82, To: 0x88},
+	1:   {From: 0x187, To: 0x1ae},
+	2:   {From: 0x1f3, To: 0x1e1},
+	3:   {From: 0x1fb, To: 0x1bc},
+	4:   {From: 0x208, To: 0x512},
+	5:   {From: 0x20f, To: 0x20e},
+	6:   {From: 0x310, To: 0x3dc},
+	7:   {From: 0x347, To: 0x36f},
+	8:   {From: 0x407, To: 0x432},
+	9:   {From: 0x47a, To: 0x153},
+	10:  {From: 0x490, To: 0x451},
+	11:  {From: 0x4a2, To: 0x21},
+	12:  {From: 0x53e, To: 0x544},
+	13:  {From: 0x58f, To: 0x12d},
+	14:  {From: 0x62b, To: 0x34},
+	15:  {From: 0x62f, To: 0x14},
+	16:  {From: 0x630, To: 0x1eb1},
+	17:  {From: 0x651, To: 0x431},
+	18:  {From: 0x662, To: 0x431},
+	19:  {From: 0x6ed, To: 0x3a},
+	20:  {From: 0x6f8, To: 0x1d7},
+	21:  {From: 0x709, To: 0x3625},
+	22:  {From: 0x73e, To: 0x21a1},
+	23:  {From: 0x7b3, To: 0x56},
+	24:  {From: 0x7b9, To: 0x299b},
+	25:  {From: 0x7c5, To: 0x58},
+	26:  {From: 0x7e6, To: 0x145},
+	27:  {From: 0x80c, To: 0x5a},
+	28:  {From: 0x815, To: 0x8d},
+	29:  {From: 0x87e, To: 0x810},
+	30:  {From: 0x8a8, To: 0x8b7},
+	31:  {From: 0x8c3, To: 0xee3},
+	32:  {From: 0x8fa, To: 0x1dc},
+	33:  {From: 0x9ef, To: 0x331},
+	34:  {From: 0xa36, To: 0x2c5},
+	35:  {From: 0xa3d, To: 0xbf},
+	36:  {From: 0xabe, To: 0x3322},
+	37:  {From: 0xb38, To: 0x529},
+	38:  {From: 0xb75, To: 0x265a},
+	39:  {From: 0xb7e, To: 0xbc3},
+	40:  {From: 0xb9b, To: 0x44e},
+	41:  {From: 0xbbc, To: 0x4229},
+	42:  {From: 0xbbf, To: 0x529},
+	43:  {From: 0xbfe, To: 0x2da7},
+	44:  {From: 0xc2e, To: 0x3181},
+	45:  {From: 0xcb9, To: 0xf3},
+	46:  {From: 0xd08, To: 0xfa},
+	47:  {From: 0xdc8, To: 0x11a},
+	48:  {From: 0xdd7, To: 0x32d},
+	49:  {From: 0xdf8, To: 0xdfb},
+	50:  {From: 0xdfe, To: 0x531},
+	51:  {From: 0xe01, To: 0xdf3},
+	52:  {From: 0xedf, To: 0x205a},
+	53:  {From: 0xee9, To: 0x222e},
+	54:  {From: 0xeee, To: 0x2e9a},
+	55:  {From: 0xf39, To: 0x367},
+	56:  {From: 0x10d0, To: 0x140},
+	57:  {From: 0x1104, To: 0x2d0},
+	58:  {From: 0x11a0, To: 0x1ec},
+	59:  {From: 0x1279, To: 0x21},
+	60:  {From: 0x1424, To: 0x15e},
+	61:  {From: 0x1470, To: 0x14e},
+	62:  {From: 0x151f, To: 0xd9b},
+	63:  {From: 0x1523, To: 0x390},
+	64:  {From: 0x1532, To: 0x19f},
+	65:  {From: 0x1580, To: 0x210},
+	66:  {From: 0x1583, To: 0x10d},
+	67:  {From: 0x15a3, To: 0x3caf},
+	68:  {From: 0x1630, To: 0x222e},
+	69:  {From: 0x166a, To: 0x19b},
+	70:  {From: 0x16c8, To: 0x136},
+	71:  {From: 0x1700, To: 0x29f8},
+	72:  {From: 0x1718, To: 0x194},
+	73:  {From: 0x1727, To: 0xf3f},
+	74:  {From: 0x177a, To: 0x178},
+	75:  {From: 0x1809, To: 0x17b6},
+	76:  {From: 0x1816, To: 0x18f3},
+	77:  {From: 0x188a, To: 0x436},
+	78:  {From: 0x1979, To: 0x1d01},
+	79:  {From: 0x1a74, To: 0x2bb0},
+	80:  {From: 0x1a8a, To: 0x1f8},
+	81:  {From: 0x1b5a, To: 0x1fa},
+	82:  {From: 0x1b86, To: 0x1515},
+	83:  {From: 0x1d64, To: 0x2c9b},
+	84:  {From: 0x2038, To: 0x37b1},
+	85:  {From: 0x203d, To: 0x20dd},
+	86:  {From: 0x2042, To: 0x2e00},
+	87:  {From: 0x205a, To: 0x30b},
+	88:  {From: 0x20e3, To: 0x274},
+	89:  {From: 0x20ee, To: 0x263},
+	90:  {From: 0x20f2, To: 0x22d},
+	91:  {From: 0x20f9, To: 0x256},
+	92:  {From: 0x210f, To: 0x21eb},
+	93:  {From: 0x2135, To: 0x27d},
+	94:  {From: 0x2160, To: 0x913},
+	95:  {From: 0x2199, To: 0x121},
+	96:  {From: 0x21ce, To: 0x1561},
+	97:  {From: 0x21e6, To: 0x504},
+	98:  {From: 0x21f4, To: 0x49f},
+	99:  {From: 0x21fb, To: 0x269},
+	100: {From: 0x222d, To: 0x121},
+	101: {From: 0x2237, To: 0x121},
+	102: {From: 0x2248, To: 0x217d},
+	103: {From: 0x2262, To: 0x92a},
+	104: {From: 0x2316, To: 0x3226},
+	105: {From: 0x236a, To: 0x2835},
+	106: {From: 0x2382, To: 0x3365},
+	107: {From: 0x2472, To: 0x2c7},
+	108: {From: 0x24e4, To: 0x2ff},
+	109: {From: 0x24f0, To: 0x2fa},
+	110: {From: 0x24fa, To: 0x31f},
+	111: {From: 0x2550, To: 0xb5b},
+	112: {From: 0x25a9, To: 0xe2},
+	113: {From: 0x263e, To: 0x2d0},
+	114: {From: 0x26c9, To: 0x26b4},
+	115: {From: 0x26f9, To: 0x3c8},
+	116: {From: 0x2727, To: 0x3caf},
+	117: {From: 0x2755, To: 0x6a4},
+	118: {From: 0x2765, To: 0x26b4},
+	119: {From: 0x2789, To: 0x4358},
+	120: {From: 0x27c9, To: 0x2001},
+	121: {From: 0x28ea, To: 0x27b1},
+	122: {From: 0x28ef, To: 0x2837},
+	123: {From: 0x28fe, To: 0xaa5},
+	124: {From: 0x2914, To: 0x351},
+	125: {From: 0x2986, To: 0x2da7},
+	126: {From: 0x29f0, To: 0x96b},
+	127: {From: 0x2b1a, To: 0x38d},
+	128: {From: 0x2bfc, To: 0x395},
+	129: {From: 0x2c3f, To: 0x3caf},
+	130: {From: 0x2ce1, To: 0x2201},
+	131: {From: 0x2cfc, To: 0x3be},
+	132: {From: 0x2d13, To: 0x597},
+	133: {From: 0x2d47, To: 0x148},
+	134: {From: 0x2d48, To: 0x148},
+	135: {From: 0x2dff, To: 0x2f1},
+	136: {From: 0x2e08, To: 0x19cc},
+	137: {From: 0x2e10, To: 0xc45},
+	138: {From: 0x2e1a, To: 0x2d95},
+	139: {From: 0x2e21, To: 0x292},
+	140: {From: 0x2e54, To: 0x7d},
+	141: {From: 0x2e65, To: 0x2282},
+	142: {From: 0x2e97, To: 0x1a4},
+	143: {From: 0x2ea0, To: 0x2e9b},
+	144: {From: 0x2eef, To: 0x2ed7},
+	145: {From: 0x3193, To: 0x3c4},
+	146: {From: 0x3366, To: 0x338e},
+	147: {From: 0x342a, To: 0x3dc},
+	148: {From: 0x34ee, To: 0x18d0},
+	149: {From: 0x35c8, To: 0x2c9b},
+	150: {From: 0x35e6, To: 0x412},
+	151: {From: 0x35f5, To: 0x24b},
+	152: {From: 0x360d, To: 0x1dc},
+	153: {From: 0x3658, To: 0x246},
+	154: {From: 0x3676, To: 0x3f4},
+	155: {From: 0x36fd, To: 0x445},
+	156: {From: 0x3747, To: 0x3b42},
+	157: {From: 0x37c0, To: 0x121},
+	158: {From: 0x3816, To: 0x38f2},
+	159: {From: 0x382a, To: 0x2b48},
+	160: {From: 0x382b, To: 0x2c9b},
+	161: {From: 0x382f, To: 0xa9},
+	162: {From: 0x3832, To: 0x3228},
+	163: {From: 0x386c, To: 0x39a6},
+	164: {From: 0x3892, To: 0x3fc0},
+	165: {From: 0x38a0, To: 0x45f},
+	166: {From: 0x38a5, To: 0x39d7},
+	167: {From: 0x38b4, To: 0x1fa4},
+	168: {From: 0x38b5, To: 0x2e9a},
+	169: {From: 0x38fa, To: 0x38f1},
+	170: {From: 0x395c, To: 0x47e},
+	171: {From: 0x3b4e, To: 0xd91},
+	172: {From: 0x3b78, To: 0x137},
+	173: {From: 0x3c99, To: 0x4bc},
+	174: {From: 0x3fbd, To: 0x100},
+	175: {From: 0x4208, To: 0xa91},
+	176: {From: 0x42be, To: 0x573},
+	177: {From: 0x42f9, To: 0x3f60},
+	178: {From: 0x4378, To: 0x25a},
+	179: {From: 0x43b8, To: 0xe6c},
+	180: {From: 0x43cd, To: 0x10f},
+	181: {From: 0x43d4, To: 0x4848},
+	182: {From: 0x44af, To: 0x3322},
+	183: {From: 0x44e3, To: 0x512},
+	184: {From: 0x45ca, To: 0x2409},
+	185: {From: 0x45dd, To: 0x26dc},
+	186: {From: 0x4610, To: 0x48ae},
+	187: {From: 0x46ae, To: 0x46a0},
+	188: {From: 0x473e, To: 0x4745},
+	189: {From: 0x4817, To: 0x3503},
+	190: {From: 0x483b, To: 0x208b},
+	191: {From: 0x4916, To: 0x31f},
+	192: {From: 0x49a7, To: 0x523},
+}
+
+// Size: 193 bytes, 193 elements
+var AliasTypes = [193]AliasType{
+	// Entry 0 - 3F
+	1, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 1, 0, 0, 0, 0,
+	1, 2, 1, 1, 2, 0, 0, 1, 0, 1, 2, 1, 1, 0, 0, 0,
+	0, 2, 1, 1, 0, 2, 0, 0, 1, 0, 1, 0, 0, 1, 2, 1,
+	1, 1, 1, 0, 0, 0, 0, 2, 1, 1, 1, 1, 2, 1, 0, 1,
+	// Entry 40 - 7F
+	1, 2, 2, 0, 0, 1, 2, 0, 1, 0, 1, 1, 1, 1, 0, 0,
+	2, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 2, 0,
+	1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
+	// Entry 80 - BF
+	1, 0, 0, 1, 0, 2, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+	0, 1, 1, 2, 0, 0, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+	0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 2, 0,
+	0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1,
+	// Entry C0 - FF
+	1,
+}
+
+const (
+	_Latn = 91
+	_Hani = 57
+	_Hans = 59
+	_Hant = 60
+	_Qaaa = 149
+	_Qaai = 157
+	_Qabx = 198
+	_Zinh = 255
+	_Zyyy = 260
+	_Zzzz = 261
+)
+
+// script is an alphabetically sorted list of ISO 15924 codes. The index
+// of the script in the string, divided by 4, is the internal scriptID.
+const script tag.Index = "" + // Size: 1052 bytes
+	"----AdlmAfakAghbAhomArabAranArmiArmnAvstBaliBamuBassBatkBengBhksBlisBopo" +
+	"BrahBraiBugiBuhdCakmCansCariChamCherChrsCirtCoptCpmnCprtCyrlCyrsDevaDiak" +
+	"DogrDsrtDuplEgydEgyhEgypElbaElymEthiGeokGeorGlagGongGonmGothGranGrekGujr" +
+	"GuruHanbHangHaniHanoHansHantHatrHebrHiraHluwHmngHmnpHrktHungIndsItalJamo" +
+	"JavaJpanJurcKaliKanaKawiKharKhmrKhojKitlKitsKndaKoreKpelKthiLanaLaooLatf" +
+	"LatgLatnLekeLepcLimbLinaLinbLisuLomaLyciLydiMahjMakaMandManiMarcMayaMedf" +
+	"MendMercMeroMlymModiMongMoonMrooMteiMultMymrNagmNandNarbNbatNewaNkdbNkgb" +
+	"NkooNshuOgamOlckOrkhOryaOsgeOsmaOugrPalmPaucPcunPelmPermPhagPhliPhlpPhlv" +
+	"PhnxPiqdPlrdPrtiPsinQaaaQaabQaacQaadQaaeQaafQaagQaahQaaiQaajQaakQaalQaam" +
+	"QaanQaaoQaapQaaqQaarQaasQaatQaauQaavQaawQaaxQaayQaazQabaQabbQabcQabdQabe" +
+	"QabfQabgQabhQabiQabjQabkQablQabmQabnQaboQabpQabqQabrQabsQabtQabuQabvQabw" +
+	"QabxRanjRjngRohgRoroRunrSamrSaraSarbSaurSgnwShawShrdShuiSiddSindSinhSogd" +
+	"SogoSoraSoyoSundSunuSyloSyrcSyreSyrjSyrnTagbTakrTaleTaluTamlTangTavtTelu" +
+	"TengTfngTglgThaaThaiTibtTirhTnsaTotoUgarVaiiVispVithWaraWchoWoleXpeoXsux" +
+	"YeziYiiiZanbZinhZmthZsyeZsymZxxxZyyyZzzz\xff\xff\xff\xff"
+
+// suppressScript is an index from langID to the dominant script for that language,
+// if it exists.  If a script is given, it should be suppressed from the language tag.
+// Size: 1330 bytes, 1330 elements
+var suppressScript = [1330]uint8{
+	// Entry 0 - 3F
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 40 - 7F
+	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,
+	// Entry 80 - BF
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry C0 - FF
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 100 - 13F
+	0x5b, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xed, 0x00, 0x00, 0x00, 0x00, 0xef, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x5b, 0x00, 0x5b, 0x00,
+	// Entry 140 - 17F
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x5b, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 180 - 1BF
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x35, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x22, 0x00,
+	// Entry 1C0 - 1FF
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x5b, 0x00, 0x5b, 0x5b, 0x00, 0x08,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x5b, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	// Entry 200 - 23F
+	0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 240 - 27F
+	0x00, 0x00, 0x20, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x53, 0x00, 0x00, 0x54, 0x00, 0x22, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 280 - 2BF
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 2C0 - 2FF
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
+	// Entry 300 - 33F
+	0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x5b,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	// Entry 340 - 37F
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x5b, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5b, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 380 - 3BF
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+	// Entry 3C0 - 3FF
+	0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x20, 0x00, 0x00, 0x5b, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 400 - 43F
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xd6, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	// Entry 440 - 47F
+	0x00, 0x00, 0x00, 0x00, 0x5b, 0x5b, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xe9, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x00, 0x2c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	// Entry 480 - 4BF
+	0x5b, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x5b, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 4C0 - 4FF
+	0x5b, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 500 - 53F
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
+	0x00, 0x00,
+}
+
+const (
+	_001 = 1
+	_419 = 31
+	_BR  = 65
+	_CA  = 73
+	_ES  = 111
+	_GB  = 124
+	_MD  = 189
+	_PT  = 239
+	_UK  = 307
+	_US  = 310
+	_ZZ  = 358
+	_XA  = 324
+	_XC  = 326
+	_XK  = 334
+)
+
+// isoRegionOffset needs to be added to the index of regionISO to obtain the regionID
+// for 2-letter ISO codes. (The first isoRegionOffset regionIDs are reserved for
+// the UN.M49 codes used for groups.)
+const isoRegionOffset = 32
+
+// regionTypes defines the status of a region for various standards.
+// Size: 359 bytes, 359 elements
+var regionTypes = [359]uint8{
+	// Entry 0 - 3F
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	// Entry 40 - 7F
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06,
+	0x04, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x00,
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06,
+	// Entry 80 - BF
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x04, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	// Entry C0 - FF
+	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x04,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x06, 0x06, 0x00, 0x06, 0x05, 0x05, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+	// Entry 100 - 13F
+	0x05, 0x05, 0x05, 0x06, 0x00, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x02, 0x06, 0x04, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06,
+	// Entry 140 - 17F
+	0x06, 0x06, 0x00, 0x06, 0x05, 0x05, 0x05, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x06,
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x05,
+}
+
+// regionISO holds a list of alphabetically sorted 2-letter ISO region codes.
+// Each 2-letter codes is followed by two bytes with the following meaning:
+//   - [A-Z}{2}: the first letter of the 2-letter code plus these two
+//     letters form the 3-letter ISO code.
+//   - 0, n:     index into altRegionISO3.
+const regionISO tag.Index = "" + // Size: 1312 bytes
+	"AAAAACSCADNDAEREAFFGAGTGAIIAALLBAMRMANNTAOGOAQTAARRGASSMATUTAUUSAWBWAXLA" +
+	"AZZEBAIHBBRBBDGDBEELBFFABGGRBHHRBIDIBJENBLLMBMMUBNRNBOOLBQESBRRABSHSBTTN" +
+	"BUURBVVTBWWABYLRBZLZCAANCCCKCDODCFAFCGOGCHHECIIVCKOKCLHLCMMRCNHNCOOLCPPT" +
+	"CQ  CRRICS\x00\x00CTTECUUBCVPVCWUWCXXRCYYPCZZEDDDRDEEUDGGADJJIDKNKDMMADO" +
+	"OMDYHYDZZAEA  ECCUEESTEGGYEHSHERRIESSPETTHEU\x00\x03EZ  FIINFJJIFKLKFMSM" +
+	"FOROFQ\x00\x18FRRAFXXXGAABGBBRGDRDGEEOGFUFGGGYGHHAGIIBGLRLGMMBGNINGPLPGQ" +
+	"NQGRRCGS\x00\x06GTTMGUUMGWNBGYUYHKKGHMMDHNNDHRRVHTTIHUUNHVVOIC  IDDNIERL" +
+	"ILSRIMMNINNDIOOTIQRQIRRNISSLITTAJEEYJMAMJOORJPPNJTTNKEENKGGZKHHMKIIRKM" +
+	"\x00\x09KNNAKP\x00\x0cKRORKWWTKY\x00\x0fKZAZLAAOLBBNLCCALIIELKKALRBRLSSO" +
+	"LTTULUUXLVVALYBYMAARMCCOMDDAMENEMFAFMGDGMHHLMIIDMKKDMLLIMMMRMNNGMOACMPNP" +
+	"MQTQMRRTMSSRMTLTMUUSMVDVMWWIMXEXMYYSMZOZNAAMNCCLNEERNFFKNGGANHHBNIICNLLD" +
+	"NOORNPPLNQ\x00\x1eNRRUNTTZNUIUNZZLOMMNPAANPCCIPEERPFYFPGNGPHHLPKAKPLOLPM" +
+	"\x00\x12PNCNPRRIPSSEPTRTPUUSPWLWPYRYPZCZQAATQMMMQNNNQOOOQPPPQQQQQRRRQSSS" +
+	"QTTTQU\x00\x03QVVVQWWWQXXXQYYYQZZZREEURHHOROOURS\x00\x15RUUSRWWASAAUSBLB" +
+	"SCYCSDDNSEWESGGPSHHNSIVNSJJMSKVKSLLESMMRSNENSOOMSRURSSSDSTTPSUUNSVLVSXXM" +
+	"SYYRSZWZTAAATCCATDCDTF\x00\x18TGGOTHHATJJKTKKLTLLSTMKMTNUNTOONTPMPTRURTT" +
+	"TOTVUVTWWNTZZAUAKRUGGAUK  UMMIUN  USSAUYRYUZZBVAATVCCTVDDRVEENVGGBVIIRVN" +
+	"NMVUUTWFLFWKAKWSSMXAAAXBBBXCCCXDDDXEEEXFFFXGGGXHHHXIIIXJJJXKKKXLLLXMMMXN" +
+	"NNXOOOXPPPXQQQXRRRXSSSXTTTXUUUXVVVXWWWXXXXXYYYXZZZYDMDYEEMYT\x00\x1bYUUG" +
+	"ZAAFZMMBZRARZWWEZZZZ\xff\xff\xff\xff"
+
+// altRegionISO3 holds a list of 3-letter region codes that cannot be
+// mapped to 2-letter codes using the default algorithm. This is a short list.
+const altRegionISO3 string = "SCGQUUSGSCOMPRKCYMSPMSRBATFMYTATN"
+
+// altRegionIDs holds a list of regionIDs the positions of which match those
+// of the 3-letter ISO codes in altRegionISO3.
+// Size: 22 bytes, 11 elements
+var altRegionIDs = [11]uint16{
+	0x0058, 0x0071, 0x0089, 0x00a9, 0x00ab, 0x00ae, 0x00eb, 0x0106,
+	0x0122, 0x0160, 0x00dd,
+}
+
+// Size: 80 bytes, 20 elements
+var regionOldMap = [20]FromTo{
+	0:  {From: 0x44, To: 0xc5},
+	1:  {From: 0x59, To: 0xa8},
+	2:  {From: 0x60, To: 0x61},
+	3:  {From: 0x67, To: 0x3b},
+	4:  {From: 0x7a, To: 0x79},
+	5:  {From: 0x94, To: 0x37},
+	6:  {From: 0xa4, To: 0x134},
+	7:  {From: 0xc2, To: 0x134},
+	8:  {From: 0xd8, To: 0x140},
+	9:  {From: 0xdd, To: 0x2b},
+	10: {From: 0xf0, To: 0x134},
+	11: {From: 0xf3, To: 0xe3},
+	12: {From: 0xfd, To: 0x71},
+	13: {From: 0x104, To: 0x165},
+	14: {From: 0x12b, To: 0x127},
+	15: {From: 0x133, To: 0x7c},
+	16: {From: 0x13b, To: 0x13f},
+	17: {From: 0x142, To: 0x134},
+	18: {From: 0x15e, To: 0x15f},
+	19: {From: 0x164, To: 0x4b},
+}
+
+// m49 maps regionIDs to UN.M49 codes. The first isoRegionOffset entries are
+// codes indicating collections of regions.
+// Size: 718 bytes, 359 elements
+var m49 = [359]int16{
+	// Entry 0 - 3F
+	0, 1, 2, 3, 5, 9, 11, 13,
+	14, 15, 17, 18, 19, 21, 29, 30,
+	34, 35, 39, 53, 54, 57, 61, 142,
+	143, 145, 150, 151, 154, 155, 202, 419,
+	958, 0, 20, 784, 4, 28, 660, 8,
+	51, 530, 24, 10, 32, 16, 40, 36,
+	533, 248, 31, 70, 52, 50, 56, 854,
+	100, 48, 108, 204, 652, 60, 96, 68,
+	// Entry 40 - 7F
+	535, 76, 44, 64, 104, 74, 72, 112,
+	84, 124, 166, 180, 140, 178, 756, 384,
+	184, 152, 120, 156, 170, 0, 0, 188,
+	891, 296, 192, 132, 531, 162, 196, 203,
+	278, 276, 0, 262, 208, 212, 214, 204,
+	12, 0, 218, 233, 818, 732, 232, 724,
+	231, 967, 0, 246, 242, 238, 583, 234,
+	0, 250, 249, 266, 826, 308, 268, 254,
+	// Entry 80 - BF
+	831, 288, 292, 304, 270, 324, 312, 226,
+	300, 239, 320, 316, 624, 328, 344, 334,
+	340, 191, 332, 348, 854, 0, 360, 372,
+	376, 833, 356, 86, 368, 364, 352, 380,
+	832, 388, 400, 392, 581, 404, 417, 116,
+	296, 174, 659, 408, 410, 414, 136, 398,
+	418, 422, 662, 438, 144, 430, 426, 440,
+	442, 428, 434, 504, 492, 498, 499, 663,
+	// Entry C0 - FF
+	450, 584, 581, 807, 466, 104, 496, 446,
+	580, 474, 478, 500, 470, 480, 462, 454,
+	484, 458, 508, 516, 540, 562, 574, 566,
+	548, 558, 528, 578, 524, 10, 520, 536,
+	570, 554, 512, 591, 0, 604, 258, 598,
+	608, 586, 616, 666, 612, 630, 275, 620,
+	581, 585, 600, 591, 634, 959, 960, 961,
+	962, 963, 964, 965, 966, 967, 968, 969,
+	// Entry 100 - 13F
+	970, 971, 972, 638, 716, 642, 688, 643,
+	646, 682, 90, 690, 729, 752, 702, 654,
+	705, 744, 703, 694, 674, 686, 706, 740,
+	728, 678, 810, 222, 534, 760, 748, 0,
+	796, 148, 260, 768, 764, 762, 772, 626,
+	795, 788, 776, 626, 792, 780, 798, 158,
+	834, 804, 800, 826, 581, 0, 840, 858,
+	860, 336, 670, 704, 862, 92, 850, 704,
+	// Entry 140 - 17F
+	548, 876, 581, 882, 973, 974, 975, 976,
+	977, 978, 979, 980, 981, 982, 983, 984,
+	985, 986, 987, 988, 989, 990, 991, 992,
+	993, 994, 995, 996, 997, 998, 720, 887,
+	175, 891, 710, 894, 180, 716, 999,
+}
+
+// m49Index gives indexes into fromM49 based on the three most significant bits
+// of a 10-bit UN.M49 code. To search an UN.M49 code in fromM49, search in
+//
+//	fromM49[m49Index[msb39(code)]:m49Index[msb3(code)+1]]
+//
+// for an entry where the first 7 bits match the 7 lsb of the UN.M49 code.
+// The region code is stored in the 9 lsb of the indexed value.
+// Size: 18 bytes, 9 elements
+var m49Index = [9]int16{
+	0, 59, 108, 143, 181, 220, 259, 291,
+	333,
+}
+
+// fromM49 contains entries to map UN.M49 codes to regions. See m49Index for details.
+// Size: 666 bytes, 333 elements
+var fromM49 = [333]uint16{
+	// Entry 0 - 3F
+	0x0201, 0x0402, 0x0603, 0x0824, 0x0a04, 0x1027, 0x1205, 0x142b,
+	0x1606, 0x1868, 0x1a07, 0x1c08, 0x1e09, 0x202d, 0x220a, 0x240b,
+	0x260c, 0x2822, 0x2a0d, 0x302a, 0x3825, 0x3a0e, 0x3c0f, 0x3e32,
+	0x402c, 0x4410, 0x4611, 0x482f, 0x4e12, 0x502e, 0x5842, 0x6039,
+	0x6435, 0x6628, 0x6834, 0x6a13, 0x6c14, 0x7036, 0x7215, 0x783d,
+	0x7a16, 0x8043, 0x883f, 0x8c33, 0x9046, 0x9445, 0x9841, 0xa848,
+	0xac9b, 0xb50a, 0xb93d, 0xc03e, 0xc838, 0xd0c5, 0xd83a, 0xe047,
+	0xe8a7, 0xf052, 0xf849, 0x085b, 0x10ae, 0x184c, 0x1c17, 0x1e18,
+	// Entry 40 - 7F
+	0x20b4, 0x2219, 0x2921, 0x2c1a, 0x2e1b, 0x3051, 0x341c, 0x361d,
+	0x3853, 0x3d2f, 0x445d, 0x4c4a, 0x5454, 0x5ca9, 0x5f60, 0x644d,
+	0x684b, 0x7050, 0x7857, 0x7e91, 0x805a, 0x885e, 0x941e, 0x965f,
+	0x983b, 0xa064, 0xa865, 0xac66, 0xb46a, 0xbd1b, 0xc487, 0xcc70,
+	0xce70, 0xd06e, 0xd26b, 0xd477, 0xdc75, 0xde89, 0xe474, 0xec73,
+	0xf031, 0xf27a, 0xf479, 0xfc7f, 0x04e6, 0x0922, 0x0c63, 0x147b,
+	0x187e, 0x1c84, 0x26ee, 0x2861, 0x2c60, 0x3061, 0x4081, 0x4882,
+	0x50a8, 0x5888, 0x6083, 0x687d, 0x7086, 0x788b, 0x808a, 0x8885,
+	// Entry 80 - BF
+	0x908d, 0x9892, 0x9c8f, 0xa139, 0xa890, 0xb08e, 0xb893, 0xc09e,
+	0xc89a, 0xd096, 0xd89d, 0xe09c, 0xe897, 0xf098, 0xf89f, 0x004f,
+	0x08a1, 0x10a3, 0x1caf, 0x20a2, 0x28a5, 0x30ab, 0x34ac, 0x3cad,
+	0x42a6, 0x44b0, 0x461f, 0x4cb1, 0x54b6, 0x58b9, 0x5cb5, 0x64ba,
+	0x6cb3, 0x70b7, 0x74b8, 0x7cc7, 0x84c0, 0x8ccf, 0x94d1, 0x9cce,
+	0xa4c4, 0xaccc, 0xb4c9, 0xbcca, 0xc0cd, 0xc8d0, 0xd8bc, 0xe0c6,
+	0xe4bd, 0xe6be, 0xe8cb, 0xf0bb, 0xf8d2, 0x00e2, 0x08d3, 0x10de,
+	0x18dc, 0x20da, 0x2429, 0x265c, 0x2a30, 0x2d1c, 0x2e40, 0x30df,
+	// Entry C0 - FF
+	0x38d4, 0x4940, 0x54e1, 0x5cd9, 0x64d5, 0x6cd7, 0x74e0, 0x7cd6,
+	0x84db, 0x88c8, 0x8b34, 0x8e76, 0x90c1, 0x92f1, 0x94e9, 0x9ee3,
+	0xace7, 0xb0f2, 0xb8e5, 0xc0e8, 0xc8ec, 0xd0ea, 0xd8ef, 0xe08c,
+	0xe527, 0xeced, 0xf4f4, 0xfd03, 0x0505, 0x0707, 0x0d08, 0x183c,
+	0x1d0f, 0x26aa, 0x2826, 0x2cb2, 0x2ebf, 0x34eb, 0x3d3a, 0x4514,
+	0x4d19, 0x5509, 0x5d15, 0x6106, 0x650b, 0x6d13, 0x7d0e, 0x7f12,
+	0x813f, 0x8310, 0x8516, 0x8d62, 0x9965, 0xa15e, 0xa86f, 0xb118,
+	0xb30c, 0xb86d, 0xc10c, 0xc917, 0xd111, 0xd91e, 0xe10d, 0xe84e,
+	// Entry 100 - 13F
+	0xf11d, 0xf525, 0xf924, 0x0123, 0x0926, 0x112a, 0x192d, 0x2023,
+	0x2929, 0x312c, 0x3728, 0x3920, 0x3d2e, 0x4132, 0x4931, 0x4ec3,
+	0x551a, 0x646c, 0x747c, 0x7e80, 0x80a0, 0x8299, 0x8530, 0x9136,
+	0xa53e, 0xac37, 0xb537, 0xb938, 0xbd3c, 0xd941, 0xe543, 0xed5f,
+	0xef5f, 0xf658, 0xfd63, 0x7c20, 0x7ef5, 0x80f6, 0x82f7, 0x84f8,
+	0x86f9, 0x88fa, 0x8afb, 0x8cfc, 0x8e71, 0x90fe, 0x92ff, 0x9500,
+	0x9701, 0x9902, 0x9b44, 0x9d45, 0x9f46, 0xa147, 0xa348, 0xa549,
+	0xa74a, 0xa94b, 0xab4c, 0xad4d, 0xaf4e, 0xb14f, 0xb350, 0xb551,
+	// Entry 140 - 17F
+	0xb752, 0xb953, 0xbb54, 0xbd55, 0xbf56, 0xc157, 0xc358, 0xc559,
+	0xc75a, 0xc95b, 0xcb5c, 0xcd5d, 0xcf66,
+}
+
+// Size: 2128 bytes
+var variantIndex = map[string]uint8{
+	"1606nict": 0x0,
+	"1694acad": 0x1,
+	"1901":     0x2,
+	"1959acad": 0x3,
+	"1994":     0x67,
+	"1996":     0x4,
+	"abl1943":  0x5,
+	"akuapem":  0x6,
+	"alalc97":  0x69,
+	"aluku":    0x7,
+	"ao1990":   0x8,
+	"aranes":   0x9,
+	"arevela":  0xa,
+	"arevmda":  0xb,
+	"arkaika":  0xc,
+	"asante":   0xd,
+	"auvern":   0xe,
+	"baku1926": 0xf,
+	"balanka":  0x10,
+	"barla":    0x11,
+	"basiceng": 0x12,
+	"bauddha":  0x13,
+	"bciav":    0x14,
+	"bcizbl":   0x15,
+	"biscayan": 0x16,
+	"biske":    0x62,
+	"bohoric":  0x17,
+	"boont":    0x18,
+	"bornholm": 0x19,
+	"cisaup":   0x1a,
+	"colb1945": 0x1b,
+	"cornu":    0x1c,
+	"creiss":   0x1d,
+	"dajnko":   0x1e,
+	"ekavsk":   0x1f,
+	"emodeng":  0x20,
+	"fonipa":   0x6a,
+	"fonkirsh": 0x6b,
+	"fonnapa":  0x6c,
+	"fonupa":   0x6d,
+	"fonxsamp": 0x6e,
+	"gallo":    0x21,
+	"gascon":   0x22,
+	"grclass":  0x23,
+	"grital":   0x24,
+	"grmistr":  0x25,
+	"hepburn":  0x26,
+	"heploc":   0x68,
+	"hognorsk": 0x27,
+	"hsistemo": 0x28,
+	"ijekavsk": 0x29,
+	"itihasa":  0x2a,
+	"ivanchov": 0x2b,
+	"jauer":    0x2c,
+	"jyutping": 0x2d,
+	"kkcor":    0x2e,
+	"kociewie": 0x2f,
+	"kscor":    0x30,
+	"laukika":  0x31,
+	"lemosin":  0x32,
+	"lengadoc": 0x33,
+	"lipaw":    0x63,
+	"ltg1929":  0x34,
+	"ltg2007":  0x35,
+	"luna1918": 0x36,
+	"metelko":  0x37,
+	"monoton":  0x38,
+	"ndyuka":   0x39,
+	"nedis":    0x3a,
+	"newfound": 0x3b,
+	"nicard":   0x3c,
+	"njiva":    0x64,
+	"nulik":    0x3d,
+	"osojs":    0x65,
+	"oxendict": 0x3e,
+	"pahawh2":  0x3f,
+	"pahawh3":  0x40,
+	"pahawh4":  0x41,
+	"pamaka":   0x42,
+	"peano":    0x43,
+	"petr1708": 0x44,
+	"pinyin":   0x45,
+	"polyton":  0x46,
+	"provenc":  0x47,
+	"puter":    0x48,
+	"rigik":    0x49,
+	"rozaj":    0x4a,
+	"rumgr":    0x4b,
+	"scotland": 0x4c,
+	"scouse":   0x4d,
+	"simple":   0x6f,
+	"solba":    0x66,
+	"sotav":    0x4e,
+	"spanglis": 0x4f,
+	"surmiran": 0x50,
+	"sursilv":  0x51,
+	"sutsilv":  0x52,
+	"synnejyl": 0x53,
+	"tarask":   0x54,
+	"tongyong": 0x55,
+	"tunumiit": 0x56,
+	"uccor":    0x57,
+	"ucrcor":   0x58,
+	"ulster":   0x59,
+	"unifon":   0x5a,
+	"vaidika":  0x5b,
+	"valencia": 0x5c,
+	"vallader": 0x5d,
+	"vecdruka": 0x5e,
+	"vivaraup": 0x5f,
+	"wadegile": 0x60,
+	"xsistemo": 0x61,
+}
+
+// variantNumSpecialized is the number of specialized variants in variants.
+const variantNumSpecialized = 105
+
+// nRegionGroups is the number of region groups.
+const nRegionGroups = 33
+
+type likelyLangRegion struct {
+	lang   uint16
+	region uint16
+}
+
+// likelyScript is a lookup table, indexed by scriptID, for the most likely
+// languages and regions given a script.
+// Size: 1052 bytes, 263 elements
+var likelyScript = [263]likelyLangRegion{
+	1:   {lang: 0x14e, region: 0x85},
+	3:   {lang: 0x2a2, region: 0x107},
+	4:   {lang: 0x1f, region: 0x9a},
+	5:   {lang: 0x3a, region: 0x6c},
+	7:   {lang: 0x3b, region: 0x9d},
+	8:   {lang: 0x1d7, region: 0x28},
+	9:   {lang: 0x13, region: 0x9d},
+	10:  {lang: 0x5b, region: 0x96},
+	11:  {lang: 0x60, region: 0x52},
+	12:  {lang: 0xb9, region: 0xb5},
+	13:  {lang: 0x63, region: 0x96},
+	14:  {lang: 0xa5, region: 0x35},
+	15:  {lang: 0x3e9, region: 0x9a},
+	17:  {lang: 0x529, region: 0x12f},
+	18:  {lang: 0x3b1, region: 0x9a},
+	19:  {lang: 0x15e, region: 0x79},
+	20:  {lang: 0xc2, region: 0x96},
+	21:  {lang: 0x9d, region: 0xe8},
+	22:  {lang: 0xdb, region: 0x35},
+	23:  {lang: 0xf3, region: 0x49},
+	24:  {lang: 0x4f0, region: 0x12c},
+	25:  {lang: 0xe7, region: 0x13f},
+	26:  {lang: 0xe5, region: 0x136},
+	29:  {lang: 0xf1, region: 0x6c},
+	31:  {lang: 0x1a0, region: 0x5e},
+	32:  {lang: 0x3e2, region: 0x107},
+	34:  {lang: 0x1be, region: 0x9a},
+	38:  {lang: 0x15e, region: 0x79},
+	41:  {lang: 0x133, region: 0x6c},
+	42:  {lang: 0x431, region: 0x27},
+	44:  {lang: 0x27, region: 0x70},
+	46:  {lang: 0x210, region: 0x7e},
+	47:  {lang: 0xfe, region: 0x38},
+	49:  {lang: 0x19b, region: 0x9a},
+	50:  {lang: 0x19e, region: 0x131},
+	51:  {lang: 0x3e9, region: 0x9a},
+	52:  {lang: 0x136, region: 0x88},
+	53:  {lang: 0x1a4, region: 0x9a},
+	54:  {lang: 0x39d, region: 0x9a},
+	55:  {lang: 0x529, region: 0x12f},
+	56:  {lang: 0x254, region: 0xac},
+	57:  {lang: 0x529, region: 0x53},
+	58:  {lang: 0x1cb, region: 0xe8},
+	59:  {lang: 0x529, region: 0x53},
+	60:  {lang: 0x529, region: 0x12f},
+	61:  {lang: 0x2fd, region: 0x9c},
+	62:  {lang: 0x1bc, region: 0x98},
+	63:  {lang: 0x200, region: 0xa3},
+	64:  {lang: 0x1c5, region: 0x12c},
+	65:  {lang: 0x1ca, region: 0xb0},
+	68:  {lang: 0x1d5, region: 0x93},
+	70:  {lang: 0x142, region: 0x9f},
+	71:  {lang: 0x254, region: 0xac},
+	72:  {lang: 0x20e, region: 0x96},
+	73:  {lang: 0x200, region: 0xa3},
+	75:  {lang: 0x135, region: 0xc5},
+	76:  {lang: 0x200, region: 0xa3},
+	78:  {lang: 0x3bb, region: 0xe9},
+	79:  {lang: 0x24a, region: 0xa7},
+	80:  {lang: 0x3fa, region: 0x9a},
+	83:  {lang: 0x251, region: 0x9a},
+	84:  {lang: 0x254, region: 0xac},
+	86:  {lang: 0x88, region: 0x9a},
+	87:  {lang: 0x370, region: 0x124},
+	88:  {lang: 0x2b8, region: 0xb0},
+	93:  {lang: 0x29f, region: 0x9a},
+	94:  {lang: 0x2a8, region: 0x9a},
+	95:  {lang: 0x28f, region: 0x88},
+	96:  {lang: 0x1a0, region: 0x88},
+	97:  {lang: 0x2ac, region: 0x53},
+	99:  {lang: 0x4f4, region: 0x12c},
+	100: {lang: 0x4f5, region: 0x12c},
+	101: {lang: 0x1be, region: 0x9a},
+	103: {lang: 0x337, region: 0x9d},
+	104: {lang: 0x4f7, region: 0x53},
+	105: {lang: 0xa9, region: 0x53},
+	108: {lang: 0x2e8, region: 0x113},
+	109: {lang: 0x4f8, region: 0x10c},
+	110: {lang: 0x4f8, region: 0x10c},
+	111: {lang: 0x304, region: 0x9a},
+	112: {lang: 0x31b, region: 0x9a},
+	113: {lang: 0x30b, region: 0x53},
+	115: {lang: 0x31e, region: 0x35},
+	116: {lang: 0x30e, region: 0x9a},
+	117: {lang: 0x414, region: 0xe9},
+	118: {lang: 0x331, region: 0xc5},
+	121: {lang: 0x4f9, region: 0x109},
+	122: {lang: 0x3b, region: 0xa2},
+	123: {lang: 0x353, region: 0xdc},
+	126: {lang: 0x2d0, region: 0x85},
+	127: {lang: 0x52a, region: 0x53},
+	128: {lang: 0x403, region: 0x97},
+	129: {lang: 0x3ee, region: 0x9a},
+	130: {lang: 0x39b, region: 0xc6},
+	131: {lang: 0x395, region: 0x9a},
+	132: {lang: 0x399, region: 0x136},
+	133: {lang: 0x429, region: 0x116},
+	135: {lang: 0x3b, region: 0x11d},
+	136: {lang: 0xfd, region: 0xc5},
+	139: {lang: 0x27d, region: 0x107},
+	140: {lang: 0x2c9, region: 0x53},
+	141: {lang: 0x39f, region: 0x9d},
+	142: {lang: 0x39f, region: 0x53},
+	144: {lang: 0x3ad, region: 0xb1},
+	146: {lang: 0x1c6, region: 0x53},
+	147: {lang: 0x4fd, region: 0x9d},
+	200: {lang: 0x3cb, region: 0x96},
+	203: {lang: 0x372, region: 0x10d},
+	204: {lang: 0x420, region: 0x98},
+	206: {lang: 0x4ff, region: 0x15f},
+	207: {lang: 0x3f0, region: 0x9a},
+	208: {lang: 0x45, region: 0x136},
+	209: {lang: 0x139, region: 0x7c},
+	210: {lang: 0x3e9, region: 0x9a},
+	212: {lang: 0x3e9, region: 0x9a},
+	213: {lang: 0x3fa, region: 0x9a},
+	214: {lang: 0x40c, region: 0xb4},
+	217: {lang: 0x433, region: 0x9a},
+	218: {lang: 0xef, region: 0xc6},
+	219: {lang: 0x43e, region: 0x96},
+	221: {lang: 0x44d, region: 0x35},
+	222: {lang: 0x44e, region: 0x9c},
+	226: {lang: 0x45a, region: 0xe8},
+	227: {lang: 0x11a, region: 0x9a},
+	228: {lang: 0x45e, region: 0x53},
+	229: {lang: 0x232, region: 0x53},
+	230: {lang: 0x450, region: 0x9a},
+	231: {lang: 0x4a5, region: 0x53},
+	232: {lang: 0x9f, region: 0x13f},
+	233: {lang: 0x461, region: 0x9a},
+	235: {lang: 0x528, region: 0xbb},
+	236: {lang: 0x153, region: 0xe8},
+	237: {lang: 0x128, region: 0xce},
+	238: {lang: 0x46b, region: 0x124},
+	239: {lang: 0xa9, region: 0x53},
+	240: {lang: 0x2ce, region: 0x9a},
+	243: {lang: 0x4ad, region: 0x11d},
+	244: {lang: 0x4be, region: 0xb5},
+	247: {lang: 0x1ce, region: 0x9a},
+	250: {lang: 0x3a9, region: 0x9d},
+	251: {lang: 0x22, region: 0x9c},
+	253: {lang: 0x1ea, region: 0x53},
+	254: {lang: 0xef, region: 0xc6},
+}
+
+type likelyScriptRegion struct {
+	region uint16
+	script uint16
+	flags  uint8
+}
+
+// likelyLang is a lookup table, indexed by langID, for the most likely
+// scripts and regions given incomplete information. If more entries exist for a
+// given language, region and script are the index and size respectively
+// of the list in likelyLangList.
+// Size: 7980 bytes, 1330 elements
+var likelyLang = [1330]likelyScriptRegion{
+	0:    {region: 0x136, script: 0x5b, flags: 0x0},
+	1:    {region: 0x70, script: 0x5b, flags: 0x0},
+	2:    {region: 0x166, script: 0x5b, flags: 0x0},
+	3:    {region: 0x166, script: 0x5b, flags: 0x0},
+	4:    {region: 0x166, script: 0x5b, flags: 0x0},
+	5:    {region: 0x7e, script: 0x20, flags: 0x0},
+	6:    {region: 0x166, script: 0x5b, flags: 0x0},
+	7:    {region: 0x166, script: 0x20, flags: 0x0},
+	8:    {region: 0x81, script: 0x5b, flags: 0x0},
+	9:    {region: 0x166, script: 0x5b, flags: 0x0},
+	10:   {region: 0x166, script: 0x5b, flags: 0x0},
+	11:   {region: 0x166, script: 0x5b, flags: 0x0},
+	12:   {region: 0x96, script: 0x5b, flags: 0x0},
+	13:   {region: 0x132, script: 0x5b, flags: 0x0},
+	14:   {region: 0x81, script: 0x5b, flags: 0x0},
+	15:   {region: 0x166, script: 0x5b, flags: 0x0},
+	16:   {region: 0x166, script: 0x5b, flags: 0x0},
+	17:   {region: 0x107, script: 0x20, flags: 0x0},
+	18:   {region: 0x166, script: 0x5b, flags: 0x0},
+	19:   {region: 0x9d, script: 0x9, flags: 0x0},
+	20:   {region: 0x129, script: 0x5, flags: 0x0},
+	21:   {region: 0x166, script: 0x5b, flags: 0x0},
+	22:   {region: 0x162, script: 0x5b, flags: 0x0},
+	23:   {region: 0x166, script: 0x5b, flags: 0x0},
+	24:   {region: 0x166, script: 0x5b, flags: 0x0},
+	25:   {region: 0x166, script: 0x5b, flags: 0x0},
+	26:   {region: 0x166, script: 0x5b, flags: 0x0},
+	27:   {region: 0x166, script: 0x5b, flags: 0x0},
+	28:   {region: 0x52, script: 0x5b, flags: 0x0},
+	29:   {region: 0x166, script: 0x5b, flags: 0x0},
+	30:   {region: 0x166, script: 0x5b, flags: 0x0},
+	31:   {region: 0x9a, script: 0x4, flags: 0x0},
+	32:   {region: 0x166, script: 0x5b, flags: 0x0},
+	33:   {region: 0x81, script: 0x5b, flags: 0x0},
+	34:   {region: 0x9c, script: 0xfb, flags: 0x0},
+	35:   {region: 0x166, script: 0x5b, flags: 0x0},
+	36:   {region: 0x166, script: 0x5b, flags: 0x0},
+	37:   {region: 0x14e, script: 0x5b, flags: 0x0},
+	38:   {region: 0x107, script: 0x20, flags: 0x0},
+	39:   {region: 0x70, script: 0x2c, flags: 0x0},
+	40:   {region: 0x166, script: 0x5b, flags: 0x0},
+	41:   {region: 0x166, script: 0x5b, flags: 0x0},
+	42:   {region: 0xd7, script: 0x5b, flags: 0x0},
+	43:   {region: 0x166, script: 0x5b, flags: 0x0},
+	45:   {region: 0x166, script: 0x5b, flags: 0x0},
+	46:   {region: 0x166, script: 0x5b, flags: 0x0},
+	47:   {region: 0x166, script: 0x5b, flags: 0x0},
+	48:   {region: 0x166, script: 0x5b, flags: 0x0},
+	49:   {region: 0x166, script: 0x5b, flags: 0x0},
+	50:   {region: 0x166, script: 0x5b, flags: 0x0},
+	51:   {region: 0x96, script: 0x5b, flags: 0x0},
+	52:   {region: 0x166, script: 0x5, flags: 0x0},
+	53:   {region: 0x123, script: 0x5, flags: 0x0},
+	54:   {region: 0x166, script: 0x5b, flags: 0x0},
+	55:   {region: 0x166, script: 0x5b, flags: 0x0},
+	56:   {region: 0x166, script: 0x5b, flags: 0x0},
+	57:   {region: 0x166, script: 0x5b, flags: 0x0},
+	58:   {region: 0x6c, script: 0x5, flags: 0x0},
+	59:   {region: 0x0, script: 0x3, flags: 0x1},
+	60:   {region: 0x166, script: 0x5b, flags: 0x0},
+	61:   {region: 0x51, script: 0x5b, flags: 0x0},
+	62:   {region: 0x3f, script: 0x5b, flags: 0x0},
+	63:   {region: 0x68, script: 0x5, flags: 0x0},
+	65:   {region: 0xbb, script: 0x5, flags: 0x0},
+	66:   {region: 0x6c, script: 0x5, flags: 0x0},
+	67:   {region: 0x9a, script: 0xe, flags: 0x0},
+	68:   {region: 0x130, script: 0x5b, flags: 0x0},
+	69:   {region: 0x136, script: 0xd0, flags: 0x0},
+	70:   {region: 0x166, script: 0x5b, flags: 0x0},
+	71:   {region: 0x166, script: 0x5b, flags: 0x0},
+	72:   {region: 0x6f, script: 0x5b, flags: 0x0},
+	73:   {region: 0x166, script: 0x5b, flags: 0x0},
+	74:   {region: 0x166, script: 0x5b, flags: 0x0},
+	75:   {region: 0x49, script: 0x5b, flags: 0x0},
+	76:   {region: 0x166, script: 0x5b, flags: 0x0},
+	77:   {region: 0x107, script: 0x20, flags: 0x0},
+	78:   {region: 0x166, script: 0x5, flags: 0x0},
+	79:   {region: 0x166, script: 0x5b, flags: 0x0},
+	80:   {region: 0x166, script: 0x5b, flags: 0x0},
+	81:   {region: 0x166, script: 0x5b, flags: 0x0},
+	82:   {region: 0x9a, script: 0x22, flags: 0x0},
+	83:   {region: 0x166, script: 0x5b, flags: 0x0},
+	84:   {region: 0x166, script: 0x5b, flags: 0x0},
+	85:   {region: 0x166, script: 0x5b, flags: 0x0},
+	86:   {region: 0x3f, script: 0x5b, flags: 0x0},
+	87:   {region: 0x166, script: 0x5b, flags: 0x0},
+	88:   {region: 0x3, script: 0x5, flags: 0x1},
+	89:   {region: 0x107, script: 0x20, flags: 0x0},
+	90:   {region: 0xe9, script: 0x5, flags: 0x0},
+	91:   {region: 0x96, script: 0x5b, flags: 0x0},
+	92:   {region: 0xdc, script: 0x22, flags: 0x0},
+	93:   {region: 0x2e, script: 0x5b, flags: 0x0},
+	94:   {region: 0x52, script: 0x5b, flags: 0x0},
+	95:   {region: 0x166, script: 0x5b, flags: 0x0},
+	96:   {region: 0x52, script: 0xb, flags: 0x0},
+	97:   {region: 0x166, script: 0x5b, flags: 0x0},
+	98:   {region: 0x166, script: 0x5b, flags: 0x0},
+	99:   {region: 0x96, script: 0x5b, flags: 0x0},
+	100:  {region: 0x166, script: 0x5b, flags: 0x0},
+	101:  {region: 0x52, script: 0x5b, flags: 0x0},
+	102:  {region: 0x166, script: 0x5b, flags: 0x0},
+	103:  {region: 0x166, script: 0x5b, flags: 0x0},
+	104:  {region: 0x166, script: 0x5b, flags: 0x0},
+	105:  {region: 0x166, script: 0x5b, flags: 0x0},
+	106:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	107:  {region: 0x166, script: 0x5b, flags: 0x0},
+	108:  {region: 0x166, script: 0x5b, flags: 0x0},
+	109:  {region: 0x166, script: 0x5b, flags: 0x0},
+	110:  {region: 0x166, script: 0x2c, flags: 0x0},
+	111:  {region: 0x166, script: 0x5b, flags: 0x0},
+	112:  {region: 0x166, script: 0x5b, flags: 0x0},
+	113:  {region: 0x47, script: 0x20, flags: 0x0},
+	114:  {region: 0x166, script: 0x5b, flags: 0x0},
+	115:  {region: 0x166, script: 0x5b, flags: 0x0},
+	116:  {region: 0x10c, script: 0x5, flags: 0x0},
+	117:  {region: 0x163, script: 0x5b, flags: 0x0},
+	118:  {region: 0x166, script: 0x5b, flags: 0x0},
+	119:  {region: 0x96, script: 0x5b, flags: 0x0},
+	120:  {region: 0x166, script: 0x5b, flags: 0x0},
+	121:  {region: 0x130, script: 0x5b, flags: 0x0},
+	122:  {region: 0x52, script: 0x5b, flags: 0x0},
+	123:  {region: 0x9a, script: 0xe6, flags: 0x0},
+	124:  {region: 0xe9, script: 0x5, flags: 0x0},
+	125:  {region: 0x9a, script: 0x22, flags: 0x0},
+	126:  {region: 0x38, script: 0x20, flags: 0x0},
+	127:  {region: 0x9a, script: 0x22, flags: 0x0},
+	128:  {region: 0xe9, script: 0x5, flags: 0x0},
+	129:  {region: 0x12c, script: 0x34, flags: 0x0},
+	131:  {region: 0x9a, script: 0x22, flags: 0x0},
+	132:  {region: 0x166, script: 0x5b, flags: 0x0},
+	133:  {region: 0x9a, script: 0x22, flags: 0x0},
+	134:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	135:  {region: 0x166, script: 0x5b, flags: 0x0},
+	136:  {region: 0x9a, script: 0x22, flags: 0x0},
+	137:  {region: 0x166, script: 0x5b, flags: 0x0},
+	138:  {region: 0x140, script: 0x5b, flags: 0x0},
+	139:  {region: 0x166, script: 0x5b, flags: 0x0},
+	140:  {region: 0x166, script: 0x5b, flags: 0x0},
+	141:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	142:  {region: 0x166, script: 0x5b, flags: 0x0},
+	143:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	144:  {region: 0x166, script: 0x5b, flags: 0x0},
+	145:  {region: 0x166, script: 0x5b, flags: 0x0},
+	146:  {region: 0x166, script: 0x5b, flags: 0x0},
+	147:  {region: 0x166, script: 0x2c, flags: 0x0},
+	148:  {region: 0x9a, script: 0x22, flags: 0x0},
+	149:  {region: 0x96, script: 0x5b, flags: 0x0},
+	150:  {region: 0x166, script: 0x5b, flags: 0x0},
+	151:  {region: 0x166, script: 0x5b, flags: 0x0},
+	152:  {region: 0x115, script: 0x5b, flags: 0x0},
+	153:  {region: 0x166, script: 0x5b, flags: 0x0},
+	154:  {region: 0x166, script: 0x5b, flags: 0x0},
+	155:  {region: 0x52, script: 0x5b, flags: 0x0},
+	156:  {region: 0x166, script: 0x5b, flags: 0x0},
+	157:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	158:  {region: 0x166, script: 0x5b, flags: 0x0},
+	159:  {region: 0x13f, script: 0xe8, flags: 0x0},
+	160:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	161:  {region: 0x166, script: 0x5b, flags: 0x0},
+	162:  {region: 0x166, script: 0x5b, flags: 0x0},
+	163:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	164:  {region: 0x166, script: 0x5b, flags: 0x0},
+	165:  {region: 0x35, script: 0xe, flags: 0x0},
+	166:  {region: 0x166, script: 0x5b, flags: 0x0},
+	167:  {region: 0x166, script: 0x5b, flags: 0x0},
+	168:  {region: 0x166, script: 0x5b, flags: 0x0},
+	169:  {region: 0x53, script: 0xef, flags: 0x0},
+	170:  {region: 0x166, script: 0x5b, flags: 0x0},
+	171:  {region: 0x166, script: 0x5b, flags: 0x0},
+	172:  {region: 0x166, script: 0x5b, flags: 0x0},
+	173:  {region: 0x9a, script: 0xe, flags: 0x0},
+	174:  {region: 0x166, script: 0x5b, flags: 0x0},
+	175:  {region: 0x9d, script: 0x5, flags: 0x0},
+	176:  {region: 0x166, script: 0x5b, flags: 0x0},
+	177:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	178:  {region: 0x79, script: 0x5b, flags: 0x0},
+	179:  {region: 0x9a, script: 0x22, flags: 0x0},
+	180:  {region: 0xe9, script: 0x5, flags: 0x0},
+	181:  {region: 0x9a, script: 0x22, flags: 0x0},
+	182:  {region: 0x166, script: 0x5b, flags: 0x0},
+	183:  {region: 0x33, script: 0x5b, flags: 0x0},
+	184:  {region: 0x166, script: 0x5b, flags: 0x0},
+	185:  {region: 0xb5, script: 0xc, flags: 0x0},
+	186:  {region: 0x52, script: 0x5b, flags: 0x0},
+	187:  {region: 0x166, script: 0x2c, flags: 0x0},
+	188:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	189:  {region: 0x166, script: 0x5b, flags: 0x0},
+	190:  {region: 0xe9, script: 0x22, flags: 0x0},
+	191:  {region: 0x107, script: 0x20, flags: 0x0},
+	192:  {region: 0x160, script: 0x5b, flags: 0x0},
+	193:  {region: 0x166, script: 0x5b, flags: 0x0},
+	194:  {region: 0x96, script: 0x5b, flags: 0x0},
+	195:  {region: 0x166, script: 0x5b, flags: 0x0},
+	196:  {region: 0x52, script: 0x5b, flags: 0x0},
+	197:  {region: 0x166, script: 0x5b, flags: 0x0},
+	198:  {region: 0x166, script: 0x5b, flags: 0x0},
+	199:  {region: 0x166, script: 0x5b, flags: 0x0},
+	200:  {region: 0x87, script: 0x5b, flags: 0x0},
+	201:  {region: 0x166, script: 0x5b, flags: 0x0},
+	202:  {region: 0x166, script: 0x5b, flags: 0x0},
+	203:  {region: 0x166, script: 0x5b, flags: 0x0},
+	204:  {region: 0x166, script: 0x5b, flags: 0x0},
+	205:  {region: 0x6e, script: 0x2c, flags: 0x0},
+	206:  {region: 0x166, script: 0x5b, flags: 0x0},
+	207:  {region: 0x166, script: 0x5b, flags: 0x0},
+	208:  {region: 0x52, script: 0x5b, flags: 0x0},
+	209:  {region: 0x166, script: 0x5b, flags: 0x0},
+	210:  {region: 0x166, script: 0x5b, flags: 0x0},
+	211:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	212:  {region: 0x166, script: 0x5b, flags: 0x0},
+	213:  {region: 0x166, script: 0x5b, flags: 0x0},
+	214:  {region: 0x166, script: 0x5b, flags: 0x0},
+	215:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	216:  {region: 0x166, script: 0x5b, flags: 0x0},
+	217:  {region: 0x166, script: 0x5b, flags: 0x0},
+	218:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	219:  {region: 0x35, script: 0x16, flags: 0x0},
+	220:  {region: 0x107, script: 0x20, flags: 0x0},
+	221:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	222:  {region: 0x166, script: 0x5b, flags: 0x0},
+	223:  {region: 0x132, script: 0x5b, flags: 0x0},
+	224:  {region: 0x8b, script: 0x5b, flags: 0x0},
+	225:  {region: 0x76, script: 0x5b, flags: 0x0},
+	226:  {region: 0x107, script: 0x20, flags: 0x0},
+	227:  {region: 0x136, script: 0x5b, flags: 0x0},
+	228:  {region: 0x49, script: 0x5b, flags: 0x0},
+	229:  {region: 0x136, script: 0x1a, flags: 0x0},
+	230:  {region: 0xa7, script: 0x5, flags: 0x0},
+	231:  {region: 0x13f, script: 0x19, flags: 0x0},
+	232:  {region: 0x166, script: 0x5b, flags: 0x0},
+	233:  {region: 0x9c, script: 0x5, flags: 0x0},
+	234:  {region: 0x166, script: 0x5b, flags: 0x0},
+	235:  {region: 0x166, script: 0x5b, flags: 0x0},
+	236:  {region: 0x166, script: 0x5b, flags: 0x0},
+	237:  {region: 0x166, script: 0x5b, flags: 0x0},
+	238:  {region: 0x166, script: 0x5b, flags: 0x0},
+	239:  {region: 0xc6, script: 0xda, flags: 0x0},
+	240:  {region: 0x79, script: 0x5b, flags: 0x0},
+	241:  {region: 0x6c, script: 0x1d, flags: 0x0},
+	242:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	243:  {region: 0x49, script: 0x17, flags: 0x0},
+	244:  {region: 0x131, script: 0x20, flags: 0x0},
+	245:  {region: 0x49, script: 0x17, flags: 0x0},
+	246:  {region: 0x49, script: 0x17, flags: 0x0},
+	247:  {region: 0x49, script: 0x17, flags: 0x0},
+	248:  {region: 0x49, script: 0x17, flags: 0x0},
+	249:  {region: 0x10b, script: 0x5b, flags: 0x0},
+	250:  {region: 0x5f, script: 0x5b, flags: 0x0},
+	251:  {region: 0xea, script: 0x5b, flags: 0x0},
+	252:  {region: 0x49, script: 0x17, flags: 0x0},
+	253:  {region: 0xc5, script: 0x88, flags: 0x0},
+	254:  {region: 0x8, script: 0x2, flags: 0x1},
+	255:  {region: 0x107, script: 0x20, flags: 0x0},
+	256:  {region: 0x7c, script: 0x5b, flags: 0x0},
+	257:  {region: 0x64, script: 0x5b, flags: 0x0},
+	258:  {region: 0x166, script: 0x5b, flags: 0x0},
+	259:  {region: 0x166, script: 0x5b, flags: 0x0},
+	260:  {region: 0x166, script: 0x5b, flags: 0x0},
+	261:  {region: 0x166, script: 0x5b, flags: 0x0},
+	262:  {region: 0x136, script: 0x5b, flags: 0x0},
+	263:  {region: 0x107, script: 0x20, flags: 0x0},
+	264:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	265:  {region: 0x166, script: 0x5b, flags: 0x0},
+	266:  {region: 0x166, script: 0x5b, flags: 0x0},
+	267:  {region: 0x9a, script: 0x5, flags: 0x0},
+	268:  {region: 0x166, script: 0x5b, flags: 0x0},
+	269:  {region: 0x61, script: 0x5b, flags: 0x0},
+	270:  {region: 0x166, script: 0x5b, flags: 0x0},
+	271:  {region: 0x49, script: 0x5b, flags: 0x0},
+	272:  {region: 0x166, script: 0x5b, flags: 0x0},
+	273:  {region: 0x166, script: 0x5b, flags: 0x0},
+	274:  {region: 0x166, script: 0x5b, flags: 0x0},
+	275:  {region: 0x166, script: 0x5, flags: 0x0},
+	276:  {region: 0x49, script: 0x5b, flags: 0x0},
+	277:  {region: 0x166, script: 0x5b, flags: 0x0},
+	278:  {region: 0x166, script: 0x5b, flags: 0x0},
+	279:  {region: 0xd5, script: 0x5b, flags: 0x0},
+	280:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	281:  {region: 0x166, script: 0x5b, flags: 0x0},
+	282:  {region: 0x9a, script: 0x5, flags: 0x0},
+	283:  {region: 0x166, script: 0x5b, flags: 0x0},
+	284:  {region: 0x166, script: 0x5b, flags: 0x0},
+	285:  {region: 0x166, script: 0x5b, flags: 0x0},
+	286:  {region: 0x166, script: 0x2c, flags: 0x0},
+	287:  {region: 0x61, script: 0x5b, flags: 0x0},
+	288:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	289:  {region: 0xd1, script: 0x5b, flags: 0x0},
+	290:  {region: 0x166, script: 0x5b, flags: 0x0},
+	291:  {region: 0xdc, script: 0x22, flags: 0x0},
+	292:  {region: 0x52, script: 0x5b, flags: 0x0},
+	293:  {region: 0x166, script: 0x5b, flags: 0x0},
+	294:  {region: 0x166, script: 0x5b, flags: 0x0},
+	295:  {region: 0x166, script: 0x5b, flags: 0x0},
+	296:  {region: 0xce, script: 0xed, flags: 0x0},
+	297:  {region: 0x166, script: 0x5b, flags: 0x0},
+	298:  {region: 0x166, script: 0x5b, flags: 0x0},
+	299:  {region: 0x115, script: 0x5b, flags: 0x0},
+	300:  {region: 0x37, script: 0x5b, flags: 0x0},
+	301:  {region: 0x43, script: 0xef, flags: 0x0},
+	302:  {region: 0x166, script: 0x5b, flags: 0x0},
+	303:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	304:  {region: 0x81, script: 0x5b, flags: 0x0},
+	305:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	306:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	307:  {region: 0x6c, script: 0x29, flags: 0x0},
+	308:  {region: 0x166, script: 0x5b, flags: 0x0},
+	309:  {region: 0xc5, script: 0x4b, flags: 0x0},
+	310:  {region: 0x88, script: 0x34, flags: 0x0},
+	311:  {region: 0x166, script: 0x5b, flags: 0x0},
+	312:  {region: 0x166, script: 0x5b, flags: 0x0},
+	313:  {region: 0xa, script: 0x2, flags: 0x1},
+	314:  {region: 0x166, script: 0x5b, flags: 0x0},
+	315:  {region: 0x166, script: 0x5b, flags: 0x0},
+	316:  {region: 0x1, script: 0x5b, flags: 0x0},
+	317:  {region: 0x166, script: 0x5b, flags: 0x0},
+	318:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	319:  {region: 0x136, script: 0x5b, flags: 0x0},
+	320:  {region: 0x6b, script: 0x5b, flags: 0x0},
+	321:  {region: 0x166, script: 0x5b, flags: 0x0},
+	322:  {region: 0x9f, script: 0x46, flags: 0x0},
+	323:  {region: 0x166, script: 0x5b, flags: 0x0},
+	324:  {region: 0x166, script: 0x5b, flags: 0x0},
+	325:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	326:  {region: 0x52, script: 0x5b, flags: 0x0},
+	327:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	328:  {region: 0x9d, script: 0x5, flags: 0x0},
+	329:  {region: 0x166, script: 0x5b, flags: 0x0},
+	330:  {region: 0x166, script: 0x5b, flags: 0x0},
+	331:  {region: 0x166, script: 0x5b, flags: 0x0},
+	332:  {region: 0x166, script: 0x5b, flags: 0x0},
+	333:  {region: 0x87, script: 0x5b, flags: 0x0},
+	334:  {region: 0xc, script: 0x2, flags: 0x1},
+	335:  {region: 0x166, script: 0x5b, flags: 0x0},
+	336:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	337:  {region: 0x73, script: 0x5b, flags: 0x0},
+	338:  {region: 0x10c, script: 0x5, flags: 0x0},
+	339:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	340:  {region: 0x10d, script: 0x5b, flags: 0x0},
+	341:  {region: 0x74, script: 0x5b, flags: 0x0},
+	342:  {region: 0x166, script: 0x5b, flags: 0x0},
+	343:  {region: 0x166, script: 0x5b, flags: 0x0},
+	344:  {region: 0x77, script: 0x5b, flags: 0x0},
+	345:  {region: 0x166, script: 0x5b, flags: 0x0},
+	346:  {region: 0x3b, script: 0x5b, flags: 0x0},
+	347:  {region: 0x166, script: 0x5b, flags: 0x0},
+	348:  {region: 0x166, script: 0x5b, flags: 0x0},
+	349:  {region: 0x166, script: 0x5b, flags: 0x0},
+	350:  {region: 0x79, script: 0x5b, flags: 0x0},
+	351:  {region: 0x136, script: 0x5b, flags: 0x0},
+	352:  {region: 0x79, script: 0x5b, flags: 0x0},
+	353:  {region: 0x61, script: 0x5b, flags: 0x0},
+	354:  {region: 0x61, script: 0x5b, flags: 0x0},
+	355:  {region: 0x52, script: 0x5, flags: 0x0},
+	356:  {region: 0x141, script: 0x5b, flags: 0x0},
+	357:  {region: 0x166, script: 0x5b, flags: 0x0},
+	358:  {region: 0x85, script: 0x5b, flags: 0x0},
+	359:  {region: 0x166, script: 0x5b, flags: 0x0},
+	360:  {region: 0xd5, script: 0x5b, flags: 0x0},
+	361:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	362:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	363:  {region: 0x166, script: 0x5b, flags: 0x0},
+	364:  {region: 0x10c, script: 0x5b, flags: 0x0},
+	365:  {region: 0xda, script: 0x5b, flags: 0x0},
+	366:  {region: 0x97, script: 0x5b, flags: 0x0},
+	367:  {region: 0x81, script: 0x5b, flags: 0x0},
+	368:  {region: 0x166, script: 0x5b, flags: 0x0},
+	369:  {region: 0xbd, script: 0x5b, flags: 0x0},
+	370:  {region: 0x166, script: 0x5b, flags: 0x0},
+	371:  {region: 0x166, script: 0x5b, flags: 0x0},
+	372:  {region: 0x166, script: 0x5b, flags: 0x0},
+	373:  {region: 0x53, script: 0x3b, flags: 0x0},
+	374:  {region: 0x166, script: 0x5b, flags: 0x0},
+	375:  {region: 0x96, script: 0x5b, flags: 0x0},
+	376:  {region: 0x166, script: 0x5b, flags: 0x0},
+	377:  {region: 0x166, script: 0x5b, flags: 0x0},
+	378:  {region: 0x9a, script: 0x22, flags: 0x0},
+	379:  {region: 0x166, script: 0x5b, flags: 0x0},
+	380:  {region: 0x9d, script: 0x5, flags: 0x0},
+	381:  {region: 0x7f, script: 0x5b, flags: 0x0},
+	382:  {region: 0x7c, script: 0x5b, flags: 0x0},
+	383:  {region: 0x166, script: 0x5b, flags: 0x0},
+	384:  {region: 0x166, script: 0x5b, flags: 0x0},
+	385:  {region: 0x166, script: 0x5b, flags: 0x0},
+	386:  {region: 0x166, script: 0x5b, flags: 0x0},
+	387:  {region: 0x166, script: 0x5b, flags: 0x0},
+	388:  {region: 0x166, script: 0x5b, flags: 0x0},
+	389:  {region: 0x70, script: 0x2c, flags: 0x0},
+	390:  {region: 0x166, script: 0x5b, flags: 0x0},
+	391:  {region: 0xdc, script: 0x22, flags: 0x0},
+	392:  {region: 0x166, script: 0x5b, flags: 0x0},
+	393:  {region: 0xa8, script: 0x5b, flags: 0x0},
+	394:  {region: 0x166, script: 0x5b, flags: 0x0},
+	395:  {region: 0xe9, script: 0x5, flags: 0x0},
+	396:  {region: 0x166, script: 0x5b, flags: 0x0},
+	397:  {region: 0xe9, script: 0x5, flags: 0x0},
+	398:  {region: 0x166, script: 0x5b, flags: 0x0},
+	399:  {region: 0x166, script: 0x5b, flags: 0x0},
+	400:  {region: 0x6f, script: 0x5b, flags: 0x0},
+	401:  {region: 0x9d, script: 0x5, flags: 0x0},
+	402:  {region: 0x166, script: 0x5b, flags: 0x0},
+	403:  {region: 0x166, script: 0x2c, flags: 0x0},
+	404:  {region: 0xf2, script: 0x5b, flags: 0x0},
+	405:  {region: 0x166, script: 0x5b, flags: 0x0},
+	406:  {region: 0x166, script: 0x5b, flags: 0x0},
+	407:  {region: 0x166, script: 0x5b, flags: 0x0},
+	408:  {region: 0x166, script: 0x2c, flags: 0x0},
+	409:  {region: 0x166, script: 0x5b, flags: 0x0},
+	410:  {region: 0x9a, script: 0x22, flags: 0x0},
+	411:  {region: 0x9a, script: 0xe9, flags: 0x0},
+	412:  {region: 0x96, script: 0x5b, flags: 0x0},
+	413:  {region: 0xda, script: 0x5b, flags: 0x0},
+	414:  {region: 0x131, script: 0x32, flags: 0x0},
+	415:  {region: 0x166, script: 0x5b, flags: 0x0},
+	416:  {region: 0xe, script: 0x2, flags: 0x1},
+	417:  {region: 0x9a, script: 0xe, flags: 0x0},
+	418:  {region: 0x166, script: 0x5b, flags: 0x0},
+	419:  {region: 0x4e, script: 0x5b, flags: 0x0},
+	420:  {region: 0x9a, script: 0x35, flags: 0x0},
+	421:  {region: 0x41, script: 0x5b, flags: 0x0},
+	422:  {region: 0x54, script: 0x5b, flags: 0x0},
+	423:  {region: 0x166, script: 0x5b, flags: 0x0},
+	424:  {region: 0x81, script: 0x5b, flags: 0x0},
+	425:  {region: 0x166, script: 0x5b, flags: 0x0},
+	426:  {region: 0x166, script: 0x5b, flags: 0x0},
+	427:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	428:  {region: 0x99, script: 0x5b, flags: 0x0},
+	429:  {region: 0x166, script: 0x5b, flags: 0x0},
+	430:  {region: 0xdc, script: 0x22, flags: 0x0},
+	431:  {region: 0x166, script: 0x5b, flags: 0x0},
+	432:  {region: 0x166, script: 0x5, flags: 0x0},
+	433:  {region: 0x49, script: 0x5b, flags: 0x0},
+	434:  {region: 0x166, script: 0x5, flags: 0x0},
+	435:  {region: 0x166, script: 0x5b, flags: 0x0},
+	436:  {region: 0x10, script: 0x3, flags: 0x1},
+	437:  {region: 0x166, script: 0x5b, flags: 0x0},
+	438:  {region: 0x53, script: 0x3b, flags: 0x0},
+	439:  {region: 0x166, script: 0x5b, flags: 0x0},
+	440:  {region: 0x136, script: 0x5b, flags: 0x0},
+	441:  {region: 0x24, script: 0x5, flags: 0x0},
+	442:  {region: 0x166, script: 0x5b, flags: 0x0},
+	443:  {region: 0x166, script: 0x2c, flags: 0x0},
+	444:  {region: 0x98, script: 0x3e, flags: 0x0},
+	445:  {region: 0x166, script: 0x5b, flags: 0x0},
+	446:  {region: 0x9a, script: 0x22, flags: 0x0},
+	447:  {region: 0x166, script: 0x5b, flags: 0x0},
+	448:  {region: 0x74, script: 0x5b, flags: 0x0},
+	449:  {region: 0x166, script: 0x5b, flags: 0x0},
+	450:  {region: 0x166, script: 0x5b, flags: 0x0},
+	451:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	452:  {region: 0x166, script: 0x5b, flags: 0x0},
+	453:  {region: 0x12c, script: 0x40, flags: 0x0},
+	454:  {region: 0x53, script: 0x92, flags: 0x0},
+	455:  {region: 0x166, script: 0x5b, flags: 0x0},
+	456:  {region: 0xe9, script: 0x5, flags: 0x0},
+	457:  {region: 0x9a, script: 0x22, flags: 0x0},
+	458:  {region: 0xb0, script: 0x41, flags: 0x0},
+	459:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	460:  {region: 0xe9, script: 0x5, flags: 0x0},
+	461:  {region: 0xe7, script: 0x5b, flags: 0x0},
+	462:  {region: 0x9a, script: 0x22, flags: 0x0},
+	463:  {region: 0x9a, script: 0x22, flags: 0x0},
+	464:  {region: 0x166, script: 0x5b, flags: 0x0},
+	465:  {region: 0x91, script: 0x5b, flags: 0x0},
+	466:  {region: 0x61, script: 0x5b, flags: 0x0},
+	467:  {region: 0x53, script: 0x3b, flags: 0x0},
+	468:  {region: 0x92, script: 0x5b, flags: 0x0},
+	469:  {region: 0x93, script: 0x5b, flags: 0x0},
+	470:  {region: 0x166, script: 0x5b, flags: 0x0},
+	471:  {region: 0x28, script: 0x8, flags: 0x0},
+	472:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	473:  {region: 0x79, script: 0x5b, flags: 0x0},
+	474:  {region: 0x166, script: 0x5b, flags: 0x0},
+	475:  {region: 0x166, script: 0x5b, flags: 0x0},
+	476:  {region: 0xd1, script: 0x5b, flags: 0x0},
+	477:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	478:  {region: 0x166, script: 0x5b, flags: 0x0},
+	479:  {region: 0x166, script: 0x5b, flags: 0x0},
+	480:  {region: 0x166, script: 0x5b, flags: 0x0},
+	481:  {region: 0x96, script: 0x5b, flags: 0x0},
+	482:  {region: 0x166, script: 0x5b, flags: 0x0},
+	483:  {region: 0x166, script: 0x5b, flags: 0x0},
+	484:  {region: 0x166, script: 0x5b, flags: 0x0},
+	486:  {region: 0x123, script: 0x5b, flags: 0x0},
+	487:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	488:  {region: 0x166, script: 0x5b, flags: 0x0},
+	489:  {region: 0x166, script: 0x5b, flags: 0x0},
+	490:  {region: 0x53, script: 0xfd, flags: 0x0},
+	491:  {region: 0x166, script: 0x5b, flags: 0x0},
+	492:  {region: 0x136, script: 0x5b, flags: 0x0},
+	493:  {region: 0x166, script: 0x5b, flags: 0x0},
+	494:  {region: 0x49, script: 0x5b, flags: 0x0},
+	495:  {region: 0x166, script: 0x5b, flags: 0x0},
+	496:  {region: 0x166, script: 0x5b, flags: 0x0},
+	497:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	498:  {region: 0x166, script: 0x5b, flags: 0x0},
+	499:  {region: 0x96, script: 0x5b, flags: 0x0},
+	500:  {region: 0x107, script: 0x20, flags: 0x0},
+	501:  {region: 0x1, script: 0x5b, flags: 0x0},
+	502:  {region: 0x166, script: 0x5b, flags: 0x0},
+	503:  {region: 0x166, script: 0x5b, flags: 0x0},
+	504:  {region: 0x9e, script: 0x5b, flags: 0x0},
+	505:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	506:  {region: 0x49, script: 0x17, flags: 0x0},
+	507:  {region: 0x98, script: 0x3e, flags: 0x0},
+	508:  {region: 0x166, script: 0x5b, flags: 0x0},
+	509:  {region: 0x166, script: 0x5b, flags: 0x0},
+	510:  {region: 0x107, script: 0x5b, flags: 0x0},
+	511:  {region: 0x166, script: 0x5b, flags: 0x0},
+	512:  {region: 0xa3, script: 0x49, flags: 0x0},
+	513:  {region: 0x166, script: 0x5b, flags: 0x0},
+	514:  {region: 0xa1, script: 0x5b, flags: 0x0},
+	515:  {region: 0x1, script: 0x5b, flags: 0x0},
+	516:  {region: 0x166, script: 0x5b, flags: 0x0},
+	517:  {region: 0x166, script: 0x5b, flags: 0x0},
+	518:  {region: 0x166, script: 0x5b, flags: 0x0},
+	519:  {region: 0x52, script: 0x5b, flags: 0x0},
+	520:  {region: 0x131, script: 0x3e, flags: 0x0},
+	521:  {region: 0x166, script: 0x5b, flags: 0x0},
+	522:  {region: 0x130, script: 0x5b, flags: 0x0},
+	523:  {region: 0xdc, script: 0x22, flags: 0x0},
+	524:  {region: 0x166, script: 0x5b, flags: 0x0},
+	525:  {region: 0x64, script: 0x5b, flags: 0x0},
+	526:  {region: 0x96, script: 0x5b, flags: 0x0},
+	527:  {region: 0x96, script: 0x5b, flags: 0x0},
+	528:  {region: 0x7e, script: 0x2e, flags: 0x0},
+	529:  {region: 0x138, script: 0x20, flags: 0x0},
+	530:  {region: 0x68, script: 0x5b, flags: 0x0},
+	531:  {region: 0xc5, script: 0x5b, flags: 0x0},
+	532:  {region: 0x166, script: 0x5b, flags: 0x0},
+	533:  {region: 0x166, script: 0x5b, flags: 0x0},
+	534:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	535:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	536:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	537:  {region: 0x107, script: 0x20, flags: 0x0},
+	538:  {region: 0x166, script: 0x5b, flags: 0x0},
+	539:  {region: 0x166, script: 0x5b, flags: 0x0},
+	540:  {region: 0x166, script: 0x5b, flags: 0x0},
+	541:  {region: 0x166, script: 0x5b, flags: 0x0},
+	542:  {region: 0xd5, script: 0x5, flags: 0x0},
+	543:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	544:  {region: 0x165, script: 0x5b, flags: 0x0},
+	545:  {region: 0x166, script: 0x5b, flags: 0x0},
+	546:  {region: 0x166, script: 0x5b, flags: 0x0},
+	547:  {region: 0x130, script: 0x5b, flags: 0x0},
+	548:  {region: 0x123, script: 0x5, flags: 0x0},
+	549:  {region: 0x166, script: 0x5b, flags: 0x0},
+	550:  {region: 0x124, script: 0xee, flags: 0x0},
+	551:  {region: 0x5b, script: 0x5b, flags: 0x0},
+	552:  {region: 0x52, script: 0x5b, flags: 0x0},
+	553:  {region: 0x166, script: 0x5b, flags: 0x0},
+	554:  {region: 0x4f, script: 0x5b, flags: 0x0},
+	555:  {region: 0x9a, script: 0x22, flags: 0x0},
+	556:  {region: 0x9a, script: 0x22, flags: 0x0},
+	557:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	558:  {region: 0x96, script: 0x5b, flags: 0x0},
+	559:  {region: 0x166, script: 0x5b, flags: 0x0},
+	560:  {region: 0x41, script: 0x5b, flags: 0x0},
+	561:  {region: 0x9a, script: 0x5b, flags: 0x0},
+	562:  {region: 0x53, script: 0xe5, flags: 0x0},
+	563:  {region: 0x9a, script: 0x22, flags: 0x0},
+	564:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	565:  {region: 0x166, script: 0x5b, flags: 0x0},
+	566:  {region: 0x9a, script: 0x76, flags: 0x0},
+	567:  {region: 0xe9, script: 0x5, flags: 0x0},
+	568:  {region: 0x166, script: 0x5b, flags: 0x0},
+	569:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	570:  {region: 0x166, script: 0x5b, flags: 0x0},
+	571:  {region: 0x12c, script: 0x5b, flags: 0x0},
+	572:  {region: 0x166, script: 0x5b, flags: 0x0},
+	573:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	574:  {region: 0x166, script: 0x5b, flags: 0x0},
+	575:  {region: 0xb0, script: 0x58, flags: 0x0},
+	576:  {region: 0x166, script: 0x5b, flags: 0x0},
+	577:  {region: 0x166, script: 0x5b, flags: 0x0},
+	578:  {region: 0x13, script: 0x6, flags: 0x1},
+	579:  {region: 0x166, script: 0x5b, flags: 0x0},
+	580:  {region: 0x52, script: 0x5b, flags: 0x0},
+	581:  {region: 0x83, script: 0x5b, flags: 0x0},
+	582:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	583:  {region: 0x166, script: 0x5b, flags: 0x0},
+	584:  {region: 0x166, script: 0x5b, flags: 0x0},
+	585:  {region: 0x166, script: 0x5b, flags: 0x0},
+	586:  {region: 0xa7, script: 0x4f, flags: 0x0},
+	587:  {region: 0x2a, script: 0x5b, flags: 0x0},
+	588:  {region: 0x166, script: 0x5b, flags: 0x0},
+	589:  {region: 0x166, script: 0x5b, flags: 0x0},
+	590:  {region: 0x166, script: 0x5b, flags: 0x0},
+	591:  {region: 0x166, script: 0x5b, flags: 0x0},
+	592:  {region: 0x166, script: 0x5b, flags: 0x0},
+	593:  {region: 0x9a, script: 0x53, flags: 0x0},
+	594:  {region: 0x8c, script: 0x5b, flags: 0x0},
+	595:  {region: 0x166, script: 0x5b, flags: 0x0},
+	596:  {region: 0xac, script: 0x54, flags: 0x0},
+	597:  {region: 0x107, script: 0x20, flags: 0x0},
+	598:  {region: 0x9a, script: 0x22, flags: 0x0},
+	599:  {region: 0x166, script: 0x5b, flags: 0x0},
+	600:  {region: 0x76, script: 0x5b, flags: 0x0},
+	601:  {region: 0x166, script: 0x5b, flags: 0x0},
+	602:  {region: 0xb5, script: 0x5b, flags: 0x0},
+	603:  {region: 0x166, script: 0x5b, flags: 0x0},
+	604:  {region: 0x166, script: 0x5b, flags: 0x0},
+	605:  {region: 0x166, script: 0x5b, flags: 0x0},
+	606:  {region: 0x166, script: 0x5b, flags: 0x0},
+	607:  {region: 0x166, script: 0x5b, flags: 0x0},
+	608:  {region: 0x166, script: 0x5b, flags: 0x0},
+	609:  {region: 0x166, script: 0x5b, flags: 0x0},
+	610:  {region: 0x166, script: 0x2c, flags: 0x0},
+	611:  {region: 0x166, script: 0x5b, flags: 0x0},
+	612:  {region: 0x107, script: 0x20, flags: 0x0},
+	613:  {region: 0x113, script: 0x5b, flags: 0x0},
+	614:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	615:  {region: 0x107, script: 0x5b, flags: 0x0},
+	616:  {region: 0x166, script: 0x5b, flags: 0x0},
+	617:  {region: 0x9a, script: 0x22, flags: 0x0},
+	618:  {region: 0x9a, script: 0x5, flags: 0x0},
+	619:  {region: 0x130, script: 0x5b, flags: 0x0},
+	620:  {region: 0x166, script: 0x5b, flags: 0x0},
+	621:  {region: 0x52, script: 0x5b, flags: 0x0},
+	622:  {region: 0x61, script: 0x5b, flags: 0x0},
+	623:  {region: 0x166, script: 0x5b, flags: 0x0},
+	624:  {region: 0x166, script: 0x5b, flags: 0x0},
+	625:  {region: 0x166, script: 0x2c, flags: 0x0},
+	626:  {region: 0x166, script: 0x5b, flags: 0x0},
+	627:  {region: 0x166, script: 0x5b, flags: 0x0},
+	628:  {region: 0x19, script: 0x3, flags: 0x1},
+	629:  {region: 0x166, script: 0x5b, flags: 0x0},
+	630:  {region: 0x166, script: 0x5b, flags: 0x0},
+	631:  {region: 0x166, script: 0x5b, flags: 0x0},
+	632:  {region: 0x166, script: 0x5b, flags: 0x0},
+	633:  {region: 0x107, script: 0x20, flags: 0x0},
+	634:  {region: 0x166, script: 0x5b, flags: 0x0},
+	635:  {region: 0x166, script: 0x5b, flags: 0x0},
+	636:  {region: 0x166, script: 0x5b, flags: 0x0},
+	637:  {region: 0x107, script: 0x20, flags: 0x0},
+	638:  {region: 0x166, script: 0x5b, flags: 0x0},
+	639:  {region: 0x96, script: 0x5b, flags: 0x0},
+	640:  {region: 0xe9, script: 0x5, flags: 0x0},
+	641:  {region: 0x7c, script: 0x5b, flags: 0x0},
+	642:  {region: 0x166, script: 0x5b, flags: 0x0},
+	643:  {region: 0x166, script: 0x5b, flags: 0x0},
+	644:  {region: 0x166, script: 0x5b, flags: 0x0},
+	645:  {region: 0x166, script: 0x2c, flags: 0x0},
+	646:  {region: 0x124, script: 0xee, flags: 0x0},
+	647:  {region: 0xe9, script: 0x5, flags: 0x0},
+	648:  {region: 0x166, script: 0x5b, flags: 0x0},
+	649:  {region: 0x166, script: 0x5b, flags: 0x0},
+	650:  {region: 0x1c, script: 0x5, flags: 0x1},
+	651:  {region: 0x166, script: 0x5b, flags: 0x0},
+	652:  {region: 0x166, script: 0x5b, flags: 0x0},
+	653:  {region: 0x166, script: 0x5b, flags: 0x0},
+	654:  {region: 0x139, script: 0x5b, flags: 0x0},
+	655:  {region: 0x88, script: 0x5f, flags: 0x0},
+	656:  {region: 0x98, script: 0x3e, flags: 0x0},
+	657:  {region: 0x130, script: 0x5b, flags: 0x0},
+	658:  {region: 0xe9, script: 0x5, flags: 0x0},
+	659:  {region: 0x132, script: 0x5b, flags: 0x0},
+	660:  {region: 0x166, script: 0x5b, flags: 0x0},
+	661:  {region: 0xb8, script: 0x5b, flags: 0x0},
+	662:  {region: 0x107, script: 0x20, flags: 0x0},
+	663:  {region: 0x166, script: 0x5b, flags: 0x0},
+	664:  {region: 0x96, script: 0x5b, flags: 0x0},
+	665:  {region: 0x166, script: 0x5b, flags: 0x0},
+	666:  {region: 0x53, script: 0xee, flags: 0x0},
+	667:  {region: 0x166, script: 0x5b, flags: 0x0},
+	668:  {region: 0x166, script: 0x5b, flags: 0x0},
+	669:  {region: 0x166, script: 0x5b, flags: 0x0},
+	670:  {region: 0x166, script: 0x5b, flags: 0x0},
+	671:  {region: 0x9a, script: 0x5d, flags: 0x0},
+	672:  {region: 0x166, script: 0x5b, flags: 0x0},
+	673:  {region: 0x166, script: 0x5b, flags: 0x0},
+	674:  {region: 0x107, script: 0x20, flags: 0x0},
+	675:  {region: 0x132, script: 0x5b, flags: 0x0},
+	676:  {region: 0x166, script: 0x5b, flags: 0x0},
+	677:  {region: 0xda, script: 0x5b, flags: 0x0},
+	678:  {region: 0x166, script: 0x5b, flags: 0x0},
+	679:  {region: 0x166, script: 0x5b, flags: 0x0},
+	680:  {region: 0x21, script: 0x2, flags: 0x1},
+	681:  {region: 0x166, script: 0x5b, flags: 0x0},
+	682:  {region: 0x166, script: 0x5b, flags: 0x0},
+	683:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	684:  {region: 0x53, script: 0x61, flags: 0x0},
+	685:  {region: 0x96, script: 0x5b, flags: 0x0},
+	686:  {region: 0x9d, script: 0x5, flags: 0x0},
+	687:  {region: 0x136, script: 0x5b, flags: 0x0},
+	688:  {region: 0x166, script: 0x5b, flags: 0x0},
+	689:  {region: 0x166, script: 0x5b, flags: 0x0},
+	690:  {region: 0x9a, script: 0xe9, flags: 0x0},
+	691:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	692:  {region: 0x166, script: 0x5b, flags: 0x0},
+	693:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	694:  {region: 0x166, script: 0x5b, flags: 0x0},
+	695:  {region: 0x166, script: 0x5b, flags: 0x0},
+	696:  {region: 0xb0, script: 0x58, flags: 0x0},
+	697:  {region: 0x166, script: 0x5b, flags: 0x0},
+	698:  {region: 0x166, script: 0x5b, flags: 0x0},
+	699:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	700:  {region: 0x166, script: 0x5b, flags: 0x0},
+	701:  {region: 0x166, script: 0x5b, flags: 0x0},
+	702:  {region: 0x163, script: 0x5b, flags: 0x0},
+	703:  {region: 0x9d, script: 0x5, flags: 0x0},
+	704:  {region: 0xb7, script: 0x5b, flags: 0x0},
+	705:  {region: 0xb9, script: 0x5b, flags: 0x0},
+	706:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	707:  {region: 0x4b, script: 0x5b, flags: 0x0},
+	708:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	709:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	710:  {region: 0x9d, script: 0x5, flags: 0x0},
+	711:  {region: 0xb9, script: 0x5b, flags: 0x0},
+	712:  {region: 0x124, script: 0xee, flags: 0x0},
+	713:  {region: 0x53, script: 0x3b, flags: 0x0},
+	714:  {region: 0x12c, script: 0x5b, flags: 0x0},
+	715:  {region: 0x96, script: 0x5b, flags: 0x0},
+	716:  {region: 0x52, script: 0x5b, flags: 0x0},
+	717:  {region: 0x9a, script: 0x22, flags: 0x0},
+	718:  {region: 0x9a, script: 0x22, flags: 0x0},
+	719:  {region: 0x96, script: 0x5b, flags: 0x0},
+	720:  {region: 0x23, script: 0x3, flags: 0x1},
+	721:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	722:  {region: 0x166, script: 0x5b, flags: 0x0},
+	723:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	724:  {region: 0x166, script: 0x5b, flags: 0x0},
+	725:  {region: 0x166, script: 0x5b, flags: 0x0},
+	726:  {region: 0x166, script: 0x5b, flags: 0x0},
+	727:  {region: 0x166, script: 0x5b, flags: 0x0},
+	728:  {region: 0x166, script: 0x5b, flags: 0x0},
+	729:  {region: 0x166, script: 0x5b, flags: 0x0},
+	730:  {region: 0x166, script: 0x5b, flags: 0x0},
+	731:  {region: 0x166, script: 0x5b, flags: 0x0},
+	732:  {region: 0x166, script: 0x5b, flags: 0x0},
+	733:  {region: 0x166, script: 0x5b, flags: 0x0},
+	734:  {region: 0x166, script: 0x5b, flags: 0x0},
+	735:  {region: 0x166, script: 0x5, flags: 0x0},
+	736:  {region: 0x107, script: 0x20, flags: 0x0},
+	737:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	738:  {region: 0x166, script: 0x5b, flags: 0x0},
+	739:  {region: 0x96, script: 0x5b, flags: 0x0},
+	740:  {region: 0x166, script: 0x2c, flags: 0x0},
+	741:  {region: 0x166, script: 0x5b, flags: 0x0},
+	742:  {region: 0x166, script: 0x5b, flags: 0x0},
+	743:  {region: 0x166, script: 0x5b, flags: 0x0},
+	744:  {region: 0x113, script: 0x5b, flags: 0x0},
+	745:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	746:  {region: 0x166, script: 0x5b, flags: 0x0},
+	747:  {region: 0x166, script: 0x5b, flags: 0x0},
+	748:  {region: 0x124, script: 0x5, flags: 0x0},
+	749:  {region: 0xcd, script: 0x5b, flags: 0x0},
+	750:  {region: 0x166, script: 0x5b, flags: 0x0},
+	751:  {region: 0x166, script: 0x5b, flags: 0x0},
+	752:  {region: 0x166, script: 0x5b, flags: 0x0},
+	753:  {region: 0xc0, script: 0x5b, flags: 0x0},
+	754:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	755:  {region: 0x166, script: 0x5b, flags: 0x0},
+	756:  {region: 0x52, script: 0x5b, flags: 0x0},
+	757:  {region: 0xdc, script: 0x22, flags: 0x0},
+	758:  {region: 0x130, script: 0x5b, flags: 0x0},
+	759:  {region: 0xc1, script: 0x5b, flags: 0x0},
+	760:  {region: 0x166, script: 0x5b, flags: 0x0},
+	761:  {region: 0x166, script: 0x5b, flags: 0x0},
+	762:  {region: 0xe1, script: 0x5b, flags: 0x0},
+	763:  {region: 0x166, script: 0x5b, flags: 0x0},
+	764:  {region: 0x96, script: 0x5b, flags: 0x0},
+	765:  {region: 0x9c, script: 0x3d, flags: 0x0},
+	766:  {region: 0x166, script: 0x5b, flags: 0x0},
+	767:  {region: 0xc3, script: 0x20, flags: 0x0},
+	768:  {region: 0x166, script: 0x5, flags: 0x0},
+	769:  {region: 0x166, script: 0x5b, flags: 0x0},
+	770:  {region: 0x166, script: 0x5b, flags: 0x0},
+	771:  {region: 0x166, script: 0x5b, flags: 0x0},
+	772:  {region: 0x9a, script: 0x6f, flags: 0x0},
+	773:  {region: 0x166, script: 0x5b, flags: 0x0},
+	774:  {region: 0x166, script: 0x5b, flags: 0x0},
+	775:  {region: 0x10c, script: 0x5b, flags: 0x0},
+	776:  {region: 0x166, script: 0x5b, flags: 0x0},
+	777:  {region: 0x166, script: 0x5b, flags: 0x0},
+	778:  {region: 0x166, script: 0x5b, flags: 0x0},
+	779:  {region: 0x26, script: 0x3, flags: 0x1},
+	780:  {region: 0x166, script: 0x5b, flags: 0x0},
+	781:  {region: 0x166, script: 0x5b, flags: 0x0},
+	782:  {region: 0x9a, script: 0xe, flags: 0x0},
+	783:  {region: 0xc5, script: 0x76, flags: 0x0},
+	785:  {region: 0x166, script: 0x5b, flags: 0x0},
+	786:  {region: 0x49, script: 0x5b, flags: 0x0},
+	787:  {region: 0x49, script: 0x5b, flags: 0x0},
+	788:  {region: 0x37, script: 0x5b, flags: 0x0},
+	789:  {region: 0x166, script: 0x5b, flags: 0x0},
+	790:  {region: 0x166, script: 0x5b, flags: 0x0},
+	791:  {region: 0x166, script: 0x5b, flags: 0x0},
+	792:  {region: 0x166, script: 0x5b, flags: 0x0},
+	793:  {region: 0x166, script: 0x5b, flags: 0x0},
+	794:  {region: 0x166, script: 0x5b, flags: 0x0},
+	795:  {region: 0x9a, script: 0x22, flags: 0x0},
+	796:  {region: 0xdc, script: 0x22, flags: 0x0},
+	797:  {region: 0x107, script: 0x20, flags: 0x0},
+	798:  {region: 0x35, script: 0x73, flags: 0x0},
+	799:  {region: 0x29, script: 0x3, flags: 0x1},
+	800:  {region: 0xcc, script: 0x5b, flags: 0x0},
+	801:  {region: 0x166, script: 0x5b, flags: 0x0},
+	802:  {region: 0x166, script: 0x5b, flags: 0x0},
+	803:  {region: 0x166, script: 0x5b, flags: 0x0},
+	804:  {region: 0x9a, script: 0x22, flags: 0x0},
+	805:  {region: 0x52, script: 0x5b, flags: 0x0},
+	807:  {region: 0x166, script: 0x5b, flags: 0x0},
+	808:  {region: 0x136, script: 0x5b, flags: 0x0},
+	809:  {region: 0x166, script: 0x5b, flags: 0x0},
+	810:  {region: 0x166, script: 0x5b, flags: 0x0},
+	811:  {region: 0xe9, script: 0x5, flags: 0x0},
+	812:  {region: 0xc4, script: 0x5b, flags: 0x0},
+	813:  {region: 0x9a, script: 0x22, flags: 0x0},
+	814:  {region: 0x96, script: 0x5b, flags: 0x0},
+	815:  {region: 0x165, script: 0x5b, flags: 0x0},
+	816:  {region: 0x166, script: 0x5b, flags: 0x0},
+	817:  {region: 0xc5, script: 0x76, flags: 0x0},
+	818:  {region: 0x166, script: 0x5b, flags: 0x0},
+	819:  {region: 0x166, script: 0x2c, flags: 0x0},
+	820:  {region: 0x107, script: 0x20, flags: 0x0},
+	821:  {region: 0x166, script: 0x5b, flags: 0x0},
+	822:  {region: 0x132, script: 0x5b, flags: 0x0},
+	823:  {region: 0x9d, script: 0x67, flags: 0x0},
+	824:  {region: 0x166, script: 0x5b, flags: 0x0},
+	825:  {region: 0x166, script: 0x5b, flags: 0x0},
+	826:  {region: 0x9d, script: 0x5, flags: 0x0},
+	827:  {region: 0x166, script: 0x5b, flags: 0x0},
+	828:  {region: 0x166, script: 0x5b, flags: 0x0},
+	829:  {region: 0x166, script: 0x5b, flags: 0x0},
+	830:  {region: 0xde, script: 0x5b, flags: 0x0},
+	831:  {region: 0x166, script: 0x5b, flags: 0x0},
+	832:  {region: 0x166, script: 0x5b, flags: 0x0},
+	834:  {region: 0x166, script: 0x5b, flags: 0x0},
+	835:  {region: 0x53, script: 0x3b, flags: 0x0},
+	836:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	837:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	838:  {region: 0x166, script: 0x5b, flags: 0x0},
+	839:  {region: 0xdb, script: 0x5b, flags: 0x0},
+	840:  {region: 0x166, script: 0x5b, flags: 0x0},
+	841:  {region: 0x166, script: 0x5b, flags: 0x0},
+	842:  {region: 0x166, script: 0x5b, flags: 0x0},
+	843:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	844:  {region: 0x166, script: 0x5b, flags: 0x0},
+	845:  {region: 0x166, script: 0x5b, flags: 0x0},
+	846:  {region: 0x165, script: 0x5b, flags: 0x0},
+	847:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	848:  {region: 0x61, script: 0x5b, flags: 0x0},
+	849:  {region: 0xdc, script: 0x22, flags: 0x0},
+	850:  {region: 0x166, script: 0x5b, flags: 0x0},
+	851:  {region: 0xdc, script: 0x22, flags: 0x0},
+	852:  {region: 0x166, script: 0x5b, flags: 0x0},
+	853:  {region: 0x166, script: 0x5b, flags: 0x0},
+	854:  {region: 0xd3, script: 0x5b, flags: 0x0},
+	855:  {region: 0x166, script: 0x5b, flags: 0x0},
+	856:  {region: 0x166, script: 0x5b, flags: 0x0},
+	857:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	858:  {region: 0x166, script: 0x5b, flags: 0x0},
+	859:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	860:  {region: 0xd0, script: 0x5b, flags: 0x0},
+	861:  {region: 0x166, script: 0x5b, flags: 0x0},
+	862:  {region: 0x166, script: 0x5b, flags: 0x0},
+	863:  {region: 0x96, script: 0x5b, flags: 0x0},
+	864:  {region: 0x166, script: 0x5b, flags: 0x0},
+	865:  {region: 0xe0, script: 0x5b, flags: 0x0},
+	866:  {region: 0x166, script: 0x5b, flags: 0x0},
+	867:  {region: 0x166, script: 0x5b, flags: 0x0},
+	868:  {region: 0x9a, script: 0x5b, flags: 0x0},
+	869:  {region: 0x166, script: 0x5b, flags: 0x0},
+	870:  {region: 0x166, script: 0x5b, flags: 0x0},
+	871:  {region: 0xda, script: 0x5b, flags: 0x0},
+	872:  {region: 0x52, script: 0x5b, flags: 0x0},
+	873:  {region: 0x166, script: 0x5b, flags: 0x0},
+	874:  {region: 0xdb, script: 0x5b, flags: 0x0},
+	875:  {region: 0x166, script: 0x5b, flags: 0x0},
+	876:  {region: 0x52, script: 0x5b, flags: 0x0},
+	877:  {region: 0x166, script: 0x5b, flags: 0x0},
+	878:  {region: 0x166, script: 0x5b, flags: 0x0},
+	879:  {region: 0xdb, script: 0x5b, flags: 0x0},
+	880:  {region: 0x124, script: 0x57, flags: 0x0},
+	881:  {region: 0x9a, script: 0x22, flags: 0x0},
+	882:  {region: 0x10d, script: 0xcb, flags: 0x0},
+	883:  {region: 0x166, script: 0x5b, flags: 0x0},
+	884:  {region: 0x166, script: 0x5b, flags: 0x0},
+	885:  {region: 0x85, script: 0x7e, flags: 0x0},
+	886:  {region: 0x162, script: 0x5b, flags: 0x0},
+	887:  {region: 0x166, script: 0x5b, flags: 0x0},
+	888:  {region: 0x49, script: 0x17, flags: 0x0},
+	889:  {region: 0x166, script: 0x5b, flags: 0x0},
+	890:  {region: 0x162, script: 0x5b, flags: 0x0},
+	891:  {region: 0x166, script: 0x5b, flags: 0x0},
+	892:  {region: 0x166, script: 0x5b, flags: 0x0},
+	893:  {region: 0x166, script: 0x5b, flags: 0x0},
+	894:  {region: 0x166, script: 0x5b, flags: 0x0},
+	895:  {region: 0x166, script: 0x5b, flags: 0x0},
+	896:  {region: 0x118, script: 0x5b, flags: 0x0},
+	897:  {region: 0x166, script: 0x5b, flags: 0x0},
+	898:  {region: 0x166, script: 0x5b, flags: 0x0},
+	899:  {region: 0x136, script: 0x5b, flags: 0x0},
+	900:  {region: 0x166, script: 0x5b, flags: 0x0},
+	901:  {region: 0x53, script: 0x5b, flags: 0x0},
+	902:  {region: 0x166, script: 0x5b, flags: 0x0},
+	903:  {region: 0xcf, script: 0x5b, flags: 0x0},
+	904:  {region: 0x130, script: 0x5b, flags: 0x0},
+	905:  {region: 0x132, script: 0x5b, flags: 0x0},
+	906:  {region: 0x81, script: 0x5b, flags: 0x0},
+	907:  {region: 0x79, script: 0x5b, flags: 0x0},
+	908:  {region: 0x166, script: 0x5b, flags: 0x0},
+	910:  {region: 0x166, script: 0x5b, flags: 0x0},
+	911:  {region: 0x166, script: 0x5b, flags: 0x0},
+	912:  {region: 0x70, script: 0x5b, flags: 0x0},
+	913:  {region: 0x166, script: 0x5b, flags: 0x0},
+	914:  {region: 0x166, script: 0x5b, flags: 0x0},
+	915:  {region: 0x166, script: 0x5b, flags: 0x0},
+	916:  {region: 0x166, script: 0x5b, flags: 0x0},
+	917:  {region: 0x9a, script: 0x83, flags: 0x0},
+	918:  {region: 0x166, script: 0x5b, flags: 0x0},
+	919:  {region: 0x166, script: 0x5, flags: 0x0},
+	920:  {region: 0x7e, script: 0x20, flags: 0x0},
+	921:  {region: 0x136, script: 0x84, flags: 0x0},
+	922:  {region: 0x166, script: 0x5, flags: 0x0},
+	923:  {region: 0xc6, script: 0x82, flags: 0x0},
+	924:  {region: 0x166, script: 0x5b, flags: 0x0},
+	925:  {region: 0x2c, script: 0x3, flags: 0x1},
+	926:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	927:  {region: 0x2f, script: 0x2, flags: 0x1},
+	928:  {region: 0xe8, script: 0x5b, flags: 0x0},
+	929:  {region: 0x30, script: 0x5b, flags: 0x0},
+	930:  {region: 0xf1, script: 0x5b, flags: 0x0},
+	931:  {region: 0x166, script: 0x5b, flags: 0x0},
+	932:  {region: 0x79, script: 0x5b, flags: 0x0},
+	933:  {region: 0xd7, script: 0x5b, flags: 0x0},
+	934:  {region: 0x136, script: 0x5b, flags: 0x0},
+	935:  {region: 0x49, script: 0x5b, flags: 0x0},
+	936:  {region: 0x166, script: 0x5b, flags: 0x0},
+	937:  {region: 0x9d, script: 0xfa, flags: 0x0},
+	938:  {region: 0x166, script: 0x5b, flags: 0x0},
+	939:  {region: 0x61, script: 0x5b, flags: 0x0},
+	940:  {region: 0x166, script: 0x5, flags: 0x0},
+	941:  {region: 0xb1, script: 0x90, flags: 0x0},
+	943:  {region: 0x166, script: 0x5b, flags: 0x0},
+	944:  {region: 0x166, script: 0x5b, flags: 0x0},
+	945:  {region: 0x9a, script: 0x12, flags: 0x0},
+	946:  {region: 0xa5, script: 0x5b, flags: 0x0},
+	947:  {region: 0xea, script: 0x5b, flags: 0x0},
+	948:  {region: 0x166, script: 0x5b, flags: 0x0},
+	949:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	950:  {region: 0x166, script: 0x5b, flags: 0x0},
+	951:  {region: 0x166, script: 0x5b, flags: 0x0},
+	952:  {region: 0x88, script: 0x34, flags: 0x0},
+	953:  {region: 0x76, script: 0x5b, flags: 0x0},
+	954:  {region: 0x166, script: 0x5b, flags: 0x0},
+	955:  {region: 0xe9, script: 0x4e, flags: 0x0},
+	956:  {region: 0x9d, script: 0x5, flags: 0x0},
+	957:  {region: 0x1, script: 0x5b, flags: 0x0},
+	958:  {region: 0x24, script: 0x5, flags: 0x0},
+	959:  {region: 0x166, script: 0x5b, flags: 0x0},
+	960:  {region: 0x41, script: 0x5b, flags: 0x0},
+	961:  {region: 0x166, script: 0x5b, flags: 0x0},
+	962:  {region: 0x7b, script: 0x5b, flags: 0x0},
+	963:  {region: 0x166, script: 0x5b, flags: 0x0},
+	964:  {region: 0xe5, script: 0x5b, flags: 0x0},
+	965:  {region: 0x8a, script: 0x5b, flags: 0x0},
+	966:  {region: 0x6a, script: 0x5b, flags: 0x0},
+	967:  {region: 0x166, script: 0x5b, flags: 0x0},
+	968:  {region: 0x9a, script: 0x22, flags: 0x0},
+	969:  {region: 0x166, script: 0x5b, flags: 0x0},
+	970:  {region: 0x103, script: 0x5b, flags: 0x0},
+	971:  {region: 0x96, script: 0x5b, flags: 0x0},
+	972:  {region: 0x166, script: 0x5b, flags: 0x0},
+	973:  {region: 0x166, script: 0x5b, flags: 0x0},
+	974:  {region: 0x9f, script: 0x5b, flags: 0x0},
+	975:  {region: 0x166, script: 0x5, flags: 0x0},
+	976:  {region: 0x9a, script: 0x5b, flags: 0x0},
+	977:  {region: 0x31, script: 0x2, flags: 0x1},
+	978:  {region: 0xdc, script: 0x22, flags: 0x0},
+	979:  {region: 0x35, script: 0xe, flags: 0x0},
+	980:  {region: 0x4e, script: 0x5b, flags: 0x0},
+	981:  {region: 0x73, script: 0x5b, flags: 0x0},
+	982:  {region: 0x4e, script: 0x5b, flags: 0x0},
+	983:  {region: 0x9d, script: 0x5, flags: 0x0},
+	984:  {region: 0x10d, script: 0x5b, flags: 0x0},
+	985:  {region: 0x3a, script: 0x5b, flags: 0x0},
+	986:  {region: 0x166, script: 0x5b, flags: 0x0},
+	987:  {region: 0xd2, script: 0x5b, flags: 0x0},
+	988:  {region: 0x105, script: 0x5b, flags: 0x0},
+	989:  {region: 0x96, script: 0x5b, flags: 0x0},
+	990:  {region: 0x130, script: 0x5b, flags: 0x0},
+	991:  {region: 0x166, script: 0x5b, flags: 0x0},
+	992:  {region: 0x166, script: 0x5b, flags: 0x0},
+	993:  {region: 0x74, script: 0x5b, flags: 0x0},
+	994:  {region: 0x107, script: 0x20, flags: 0x0},
+	995:  {region: 0x131, script: 0x20, flags: 0x0},
+	996:  {region: 0x10a, script: 0x5b, flags: 0x0},
+	997:  {region: 0x108, script: 0x5b, flags: 0x0},
+	998:  {region: 0x130, script: 0x5b, flags: 0x0},
+	999:  {region: 0x166, script: 0x5b, flags: 0x0},
+	1000: {region: 0xa3, script: 0x4c, flags: 0x0},
+	1001: {region: 0x9a, script: 0x22, flags: 0x0},
+	1002: {region: 0x81, script: 0x5b, flags: 0x0},
+	1003: {region: 0x107, script: 0x20, flags: 0x0},
+	1004: {region: 0xa5, script: 0x5b, flags: 0x0},
+	1005: {region: 0x96, script: 0x5b, flags: 0x0},
+	1006: {region: 0x9a, script: 0x5b, flags: 0x0},
+	1007: {region: 0x115, script: 0x5b, flags: 0x0},
+	1008: {region: 0x9a, script: 0xcf, flags: 0x0},
+	1009: {region: 0x166, script: 0x5b, flags: 0x0},
+	1010: {region: 0x166, script: 0x5b, flags: 0x0},
+	1011: {region: 0x130, script: 0x5b, flags: 0x0},
+	1012: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1013: {region: 0x9a, script: 0x22, flags: 0x0},
+	1014: {region: 0x166, script: 0x5, flags: 0x0},
+	1015: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1016: {region: 0x7c, script: 0x5b, flags: 0x0},
+	1017: {region: 0x49, script: 0x5b, flags: 0x0},
+	1018: {region: 0x33, script: 0x4, flags: 0x1},
+	1019: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1020: {region: 0x9d, script: 0x5, flags: 0x0},
+	1021: {region: 0xdb, script: 0x5b, flags: 0x0},
+	1022: {region: 0x4f, script: 0x5b, flags: 0x0},
+	1023: {region: 0xd2, script: 0x5b, flags: 0x0},
+	1024: {region: 0xd0, script: 0x5b, flags: 0x0},
+	1025: {region: 0xc4, script: 0x5b, flags: 0x0},
+	1026: {region: 0x4c, script: 0x5b, flags: 0x0},
+	1027: {region: 0x97, script: 0x80, flags: 0x0},
+	1028: {region: 0xb7, script: 0x5b, flags: 0x0},
+	1029: {region: 0x166, script: 0x2c, flags: 0x0},
+	1030: {region: 0x166, script: 0x5b, flags: 0x0},
+	1032: {region: 0xbb, script: 0xeb, flags: 0x0},
+	1033: {region: 0x166, script: 0x5b, flags: 0x0},
+	1034: {region: 0xc5, script: 0x76, flags: 0x0},
+	1035: {region: 0x166, script: 0x5, flags: 0x0},
+	1036: {region: 0xb4, script: 0xd6, flags: 0x0},
+	1037: {region: 0x70, script: 0x5b, flags: 0x0},
+	1038: {region: 0x166, script: 0x5b, flags: 0x0},
+	1039: {region: 0x166, script: 0x5b, flags: 0x0},
+	1040: {region: 0x166, script: 0x5b, flags: 0x0},
+	1041: {region: 0x166, script: 0x5b, flags: 0x0},
+	1042: {region: 0x112, script: 0x5b, flags: 0x0},
+	1043: {region: 0x166, script: 0x5b, flags: 0x0},
+	1044: {region: 0xe9, script: 0x5, flags: 0x0},
+	1045: {region: 0x166, script: 0x5b, flags: 0x0},
+	1046: {region: 0x110, script: 0x5b, flags: 0x0},
+	1047: {region: 0x166, script: 0x5b, flags: 0x0},
+	1048: {region: 0xea, script: 0x5b, flags: 0x0},
+	1049: {region: 0x166, script: 0x5b, flags: 0x0},
+	1050: {region: 0x96, script: 0x5b, flags: 0x0},
+	1051: {region: 0x143, script: 0x5b, flags: 0x0},
+	1052: {region: 0x10d, script: 0x5b, flags: 0x0},
+	1054: {region: 0x10d, script: 0x5b, flags: 0x0},
+	1055: {region: 0x73, script: 0x5b, flags: 0x0},
+	1056: {region: 0x98, script: 0xcc, flags: 0x0},
+	1057: {region: 0x166, script: 0x5b, flags: 0x0},
+	1058: {region: 0x73, script: 0x5b, flags: 0x0},
+	1059: {region: 0x165, script: 0x5b, flags: 0x0},
+	1060: {region: 0x166, script: 0x5b, flags: 0x0},
+	1061: {region: 0xc4, script: 0x5b, flags: 0x0},
+	1062: {region: 0x166, script: 0x5b, flags: 0x0},
+	1063: {region: 0x166, script: 0x5b, flags: 0x0},
+	1064: {region: 0x166, script: 0x5b, flags: 0x0},
+	1065: {region: 0x116, script: 0x5b, flags: 0x0},
+	1066: {region: 0x166, script: 0x5b, flags: 0x0},
+	1067: {region: 0x166, script: 0x5b, flags: 0x0},
+	1068: {region: 0x124, script: 0xee, flags: 0x0},
+	1069: {region: 0x166, script: 0x5b, flags: 0x0},
+	1070: {region: 0x166, script: 0x5b, flags: 0x0},
+	1071: {region: 0x166, script: 0x5b, flags: 0x0},
+	1072: {region: 0x166, script: 0x5b, flags: 0x0},
+	1073: {region: 0x27, script: 0x5b, flags: 0x0},
+	1074: {region: 0x37, script: 0x5, flags: 0x1},
+	1075: {region: 0x9a, script: 0xd9, flags: 0x0},
+	1076: {region: 0x117, script: 0x5b, flags: 0x0},
+	1077: {region: 0x115, script: 0x5b, flags: 0x0},
+	1078: {region: 0x9a, script: 0x22, flags: 0x0},
+	1079: {region: 0x162, script: 0x5b, flags: 0x0},
+	1080: {region: 0x166, script: 0x5b, flags: 0x0},
+	1081: {region: 0x166, script: 0x5b, flags: 0x0},
+	1082: {region: 0x6e, script: 0x5b, flags: 0x0},
+	1083: {region: 0x162, script: 0x5b, flags: 0x0},
+	1084: {region: 0x166, script: 0x5b, flags: 0x0},
+	1085: {region: 0x61, script: 0x5b, flags: 0x0},
+	1086: {region: 0x96, script: 0x5b, flags: 0x0},
+	1087: {region: 0x166, script: 0x5b, flags: 0x0},
+	1088: {region: 0x166, script: 0x5b, flags: 0x0},
+	1089: {region: 0x130, script: 0x5b, flags: 0x0},
+	1090: {region: 0x166, script: 0x5b, flags: 0x0},
+	1091: {region: 0x85, script: 0x5b, flags: 0x0},
+	1092: {region: 0x10d, script: 0x5b, flags: 0x0},
+	1093: {region: 0x130, script: 0x5b, flags: 0x0},
+	1094: {region: 0x160, script: 0x5, flags: 0x0},
+	1095: {region: 0x4b, script: 0x5b, flags: 0x0},
+	1096: {region: 0x61, script: 0x5b, flags: 0x0},
+	1097: {region: 0x166, script: 0x5b, flags: 0x0},
+	1098: {region: 0x9a, script: 0x22, flags: 0x0},
+	1099: {region: 0x96, script: 0x5b, flags: 0x0},
+	1100: {region: 0x166, script: 0x5b, flags: 0x0},
+	1101: {region: 0x35, script: 0xe, flags: 0x0},
+	1102: {region: 0x9c, script: 0xde, flags: 0x0},
+	1103: {region: 0xea, script: 0x5b, flags: 0x0},
+	1104: {region: 0x9a, script: 0xe6, flags: 0x0},
+	1105: {region: 0xdc, script: 0x22, flags: 0x0},
+	1106: {region: 0x166, script: 0x5b, flags: 0x0},
+	1107: {region: 0x166, script: 0x5b, flags: 0x0},
+	1108: {region: 0x166, script: 0x5b, flags: 0x0},
+	1109: {region: 0x166, script: 0x5b, flags: 0x0},
+	1110: {region: 0x166, script: 0x5b, flags: 0x0},
+	1111: {region: 0x166, script: 0x5b, flags: 0x0},
+	1112: {region: 0x166, script: 0x5b, flags: 0x0},
+	1113: {region: 0x166, script: 0x5b, flags: 0x0},
+	1114: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1115: {region: 0x166, script: 0x5b, flags: 0x0},
+	1116: {region: 0x166, script: 0x5b, flags: 0x0},
+	1117: {region: 0x9a, script: 0x53, flags: 0x0},
+	1118: {region: 0x53, script: 0xe4, flags: 0x0},
+	1119: {region: 0xdc, script: 0x22, flags: 0x0},
+	1120: {region: 0xdc, script: 0x22, flags: 0x0},
+	1121: {region: 0x9a, script: 0xe9, flags: 0x0},
+	1122: {region: 0x166, script: 0x5b, flags: 0x0},
+	1123: {region: 0x113, script: 0x5b, flags: 0x0},
+	1124: {region: 0x132, script: 0x5b, flags: 0x0},
+	1125: {region: 0x127, script: 0x5b, flags: 0x0},
+	1126: {region: 0x166, script: 0x5b, flags: 0x0},
+	1127: {region: 0x3c, script: 0x3, flags: 0x1},
+	1128: {region: 0x166, script: 0x5b, flags: 0x0},
+	1129: {region: 0x166, script: 0x5b, flags: 0x0},
+	1130: {region: 0x166, script: 0x5b, flags: 0x0},
+	1131: {region: 0x124, script: 0xee, flags: 0x0},
+	1132: {region: 0xdc, script: 0x22, flags: 0x0},
+	1133: {region: 0xdc, script: 0x22, flags: 0x0},
+	1134: {region: 0xdc, script: 0x22, flags: 0x0},
+	1135: {region: 0x70, script: 0x2c, flags: 0x0},
+	1136: {region: 0x166, script: 0x5b, flags: 0x0},
+	1137: {region: 0x6e, script: 0x2c, flags: 0x0},
+	1138: {region: 0x166, script: 0x5b, flags: 0x0},
+	1139: {region: 0x166, script: 0x5b, flags: 0x0},
+	1140: {region: 0x166, script: 0x5b, flags: 0x0},
+	1141: {region: 0xd7, script: 0x5b, flags: 0x0},
+	1142: {region: 0x128, script: 0x5b, flags: 0x0},
+	1143: {region: 0x126, script: 0x5b, flags: 0x0},
+	1144: {region: 0x32, script: 0x5b, flags: 0x0},
+	1145: {region: 0xdc, script: 0x22, flags: 0x0},
+	1146: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1147: {region: 0x166, script: 0x5b, flags: 0x0},
+	1148: {region: 0x166, script: 0x5b, flags: 0x0},
+	1149: {region: 0x32, script: 0x5b, flags: 0x0},
+	1150: {region: 0xd5, script: 0x5b, flags: 0x0},
+	1151: {region: 0x166, script: 0x5b, flags: 0x0},
+	1152: {region: 0x162, script: 0x5b, flags: 0x0},
+	1153: {region: 0x166, script: 0x5b, flags: 0x0},
+	1154: {region: 0x12a, script: 0x5b, flags: 0x0},
+	1155: {region: 0x166, script: 0x5b, flags: 0x0},
+	1156: {region: 0xcf, script: 0x5b, flags: 0x0},
+	1157: {region: 0x166, script: 0x5b, flags: 0x0},
+	1158: {region: 0xe7, script: 0x5b, flags: 0x0},
+	1159: {region: 0x166, script: 0x5b, flags: 0x0},
+	1160: {region: 0x166, script: 0x5b, flags: 0x0},
+	1161: {region: 0x166, script: 0x5b, flags: 0x0},
+	1162: {region: 0x12c, script: 0x5b, flags: 0x0},
+	1163: {region: 0x12c, script: 0x5b, flags: 0x0},
+	1164: {region: 0x12f, script: 0x5b, flags: 0x0},
+	1165: {region: 0x166, script: 0x5, flags: 0x0},
+	1166: {region: 0x162, script: 0x5b, flags: 0x0},
+	1167: {region: 0x88, script: 0x34, flags: 0x0},
+	1168: {region: 0xdc, script: 0x22, flags: 0x0},
+	1169: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1170: {region: 0x43, script: 0xef, flags: 0x0},
+	1171: {region: 0x166, script: 0x5b, flags: 0x0},
+	1172: {region: 0x107, script: 0x20, flags: 0x0},
+	1173: {region: 0x166, script: 0x5b, flags: 0x0},
+	1174: {region: 0x166, script: 0x5b, flags: 0x0},
+	1175: {region: 0x132, script: 0x5b, flags: 0x0},
+	1176: {region: 0x166, script: 0x5b, flags: 0x0},
+	1177: {region: 0x124, script: 0xee, flags: 0x0},
+	1178: {region: 0x32, script: 0x5b, flags: 0x0},
+	1179: {region: 0x166, script: 0x5b, flags: 0x0},
+	1180: {region: 0x166, script: 0x5b, flags: 0x0},
+	1181: {region: 0xcf, script: 0x5b, flags: 0x0},
+	1182: {region: 0x166, script: 0x5b, flags: 0x0},
+	1183: {region: 0x166, script: 0x5b, flags: 0x0},
+	1184: {region: 0x12e, script: 0x5b, flags: 0x0},
+	1185: {region: 0x166, script: 0x5b, flags: 0x0},
+	1187: {region: 0x166, script: 0x5b, flags: 0x0},
+	1188: {region: 0xd5, script: 0x5b, flags: 0x0},
+	1189: {region: 0x53, script: 0xe7, flags: 0x0},
+	1190: {region: 0xe6, script: 0x5b, flags: 0x0},
+	1191: {region: 0x166, script: 0x5b, flags: 0x0},
+	1192: {region: 0x107, script: 0x20, flags: 0x0},
+	1193: {region: 0xbb, script: 0x5b, flags: 0x0},
+	1194: {region: 0x166, script: 0x5b, flags: 0x0},
+	1195: {region: 0x107, script: 0x20, flags: 0x0},
+	1196: {region: 0x3f, script: 0x4, flags: 0x1},
+	1197: {region: 0x11d, script: 0xf3, flags: 0x0},
+	1198: {region: 0x131, script: 0x20, flags: 0x0},
+	1199: {region: 0x76, script: 0x5b, flags: 0x0},
+	1200: {region: 0x2a, script: 0x5b, flags: 0x0},
+	1202: {region: 0x43, script: 0x3, flags: 0x1},
+	1203: {region: 0x9a, script: 0xe, flags: 0x0},
+	1204: {region: 0xe9, script: 0x5, flags: 0x0},
+	1205: {region: 0x166, script: 0x5b, flags: 0x0},
+	1206: {region: 0x166, script: 0x5b, flags: 0x0},
+	1207: {region: 0x166, script: 0x5b, flags: 0x0},
+	1208: {region: 0x166, script: 0x5b, flags: 0x0},
+	1209: {region: 0x166, script: 0x5b, flags: 0x0},
+	1210: {region: 0x166, script: 0x5b, flags: 0x0},
+	1211: {region: 0x166, script: 0x5b, flags: 0x0},
+	1212: {region: 0x46, script: 0x4, flags: 0x1},
+	1213: {region: 0x166, script: 0x5b, flags: 0x0},
+	1214: {region: 0xb5, script: 0xf4, flags: 0x0},
+	1215: {region: 0x166, script: 0x5b, flags: 0x0},
+	1216: {region: 0x162, script: 0x5b, flags: 0x0},
+	1217: {region: 0x9f, script: 0x5b, flags: 0x0},
+	1218: {region: 0x107, script: 0x5b, flags: 0x0},
+	1219: {region: 0x13f, script: 0x5b, flags: 0x0},
+	1220: {region: 0x11c, script: 0x5b, flags: 0x0},
+	1221: {region: 0x166, script: 0x5b, flags: 0x0},
+	1222: {region: 0x36, script: 0x5b, flags: 0x0},
+	1223: {region: 0x61, script: 0x5b, flags: 0x0},
+	1224: {region: 0xd2, script: 0x5b, flags: 0x0},
+	1225: {region: 0x1, script: 0x5b, flags: 0x0},
+	1226: {region: 0x107, script: 0x5b, flags: 0x0},
+	1227: {region: 0x6b, script: 0x5b, flags: 0x0},
+	1228: {region: 0x130, script: 0x5b, flags: 0x0},
+	1229: {region: 0x166, script: 0x5b, flags: 0x0},
+	1230: {region: 0x36, script: 0x5b, flags: 0x0},
+	1231: {region: 0x4e, script: 0x5b, flags: 0x0},
+	1232: {region: 0x166, script: 0x5b, flags: 0x0},
+	1233: {region: 0x70, script: 0x2c, flags: 0x0},
+	1234: {region: 0x166, script: 0x5b, flags: 0x0},
+	1235: {region: 0xe8, script: 0x5b, flags: 0x0},
+	1236: {region: 0x2f, script: 0x5b, flags: 0x0},
+	1237: {region: 0x9a, script: 0xe9, flags: 0x0},
+	1238: {region: 0x9a, script: 0x22, flags: 0x0},
+	1239: {region: 0x166, script: 0x5b, flags: 0x0},
+	1240: {region: 0x166, script: 0x5b, flags: 0x0},
+	1241: {region: 0x166, script: 0x5b, flags: 0x0},
+	1242: {region: 0x166, script: 0x5b, flags: 0x0},
+	1243: {region: 0x166, script: 0x5b, flags: 0x0},
+	1244: {region: 0x166, script: 0x5b, flags: 0x0},
+	1245: {region: 0x166, script: 0x5b, flags: 0x0},
+	1246: {region: 0x166, script: 0x5b, flags: 0x0},
+	1247: {region: 0x166, script: 0x5b, flags: 0x0},
+	1248: {region: 0x141, script: 0x5b, flags: 0x0},
+	1249: {region: 0x166, script: 0x5b, flags: 0x0},
+	1250: {region: 0x166, script: 0x5b, flags: 0x0},
+	1251: {region: 0xa9, script: 0x5, flags: 0x0},
+	1252: {region: 0x166, script: 0x5b, flags: 0x0},
+	1253: {region: 0x115, script: 0x5b, flags: 0x0},
+	1254: {region: 0x166, script: 0x5b, flags: 0x0},
+	1255: {region: 0x166, script: 0x5b, flags: 0x0},
+	1256: {region: 0x166, script: 0x5b, flags: 0x0},
+	1257: {region: 0x166, script: 0x5b, flags: 0x0},
+	1258: {region: 0x9a, script: 0x22, flags: 0x0},
+	1259: {region: 0x53, script: 0x3b, flags: 0x0},
+	1260: {region: 0x166, script: 0x5b, flags: 0x0},
+	1261: {region: 0x166, script: 0x5b, flags: 0x0},
+	1262: {region: 0x41, script: 0x5b, flags: 0x0},
+	1263: {region: 0x166, script: 0x5b, flags: 0x0},
+	1264: {region: 0x12c, script: 0x18, flags: 0x0},
+	1265: {region: 0x166, script: 0x5b, flags: 0x0},
+	1266: {region: 0x162, script: 0x5b, flags: 0x0},
+	1267: {region: 0x166, script: 0x5b, flags: 0x0},
+	1268: {region: 0x12c, script: 0x63, flags: 0x0},
+	1269: {region: 0x12c, script: 0x64, flags: 0x0},
+	1270: {region: 0x7e, script: 0x2e, flags: 0x0},
+	1271: {region: 0x53, script: 0x68, flags: 0x0},
+	1272: {region: 0x10c, script: 0x6d, flags: 0x0},
+	1273: {region: 0x109, script: 0x79, flags: 0x0},
+	1274: {region: 0x9a, script: 0x22, flags: 0x0},
+	1275: {region: 0x132, script: 0x5b, flags: 0x0},
+	1276: {region: 0x166, script: 0x5b, flags: 0x0},
+	1277: {region: 0x9d, script: 0x93, flags: 0x0},
+	1278: {region: 0x166, script: 0x5b, flags: 0x0},
+	1279: {region: 0x15f, script: 0xce, flags: 0x0},
+	1280: {region: 0x166, script: 0x5b, flags: 0x0},
+	1281: {region: 0x166, script: 0x5b, flags: 0x0},
+	1282: {region: 0xdc, script: 0x22, flags: 0x0},
+	1283: {region: 0x166, script: 0x5b, flags: 0x0},
+	1284: {region: 0x166, script: 0x5b, flags: 0x0},
+	1285: {region: 0xd2, script: 0x5b, flags: 0x0},
+	1286: {region: 0x76, script: 0x5b, flags: 0x0},
+	1287: {region: 0x166, script: 0x5b, flags: 0x0},
+	1288: {region: 0x166, script: 0x5b, flags: 0x0},
+	1289: {region: 0x52, script: 0x5b, flags: 0x0},
+	1290: {region: 0x166, script: 0x5b, flags: 0x0},
+	1291: {region: 0x166, script: 0x5b, flags: 0x0},
+	1292: {region: 0x166, script: 0x5b, flags: 0x0},
+	1293: {region: 0x52, script: 0x5b, flags: 0x0},
+	1294: {region: 0x166, script: 0x5b, flags: 0x0},
+	1295: {region: 0x166, script: 0x5b, flags: 0x0},
+	1296: {region: 0x166, script: 0x5b, flags: 0x0},
+	1297: {region: 0x166, script: 0x5b, flags: 0x0},
+	1298: {region: 0x1, script: 0x3e, flags: 0x0},
+	1299: {region: 0x166, script: 0x5b, flags: 0x0},
+	1300: {region: 0x166, script: 0x5b, flags: 0x0},
+	1301: {region: 0x166, script: 0x5b, flags: 0x0},
+	1302: {region: 0x166, script: 0x5b, flags: 0x0},
+	1303: {region: 0x166, script: 0x5b, flags: 0x0},
+	1304: {region: 0xd7, script: 0x5b, flags: 0x0},
+	1305: {region: 0x166, script: 0x5b, flags: 0x0},
+	1306: {region: 0x166, script: 0x5b, flags: 0x0},
+	1307: {region: 0x166, script: 0x5b, flags: 0x0},
+	1308: {region: 0x41, script: 0x5b, flags: 0x0},
+	1309: {region: 0x166, script: 0x5b, flags: 0x0},
+	1310: {region: 0xd0, script: 0x5b, flags: 0x0},
+	1311: {region: 0x4a, script: 0x3, flags: 0x1},
+	1312: {region: 0x166, script: 0x5b, flags: 0x0},
+	1313: {region: 0x166, script: 0x5b, flags: 0x0},
+	1314: {region: 0x166, script: 0x5b, flags: 0x0},
+	1315: {region: 0x53, script: 0x5b, flags: 0x0},
+	1316: {region: 0x10c, script: 0x5b, flags: 0x0},
+	1318: {region: 0xa9, script: 0x5, flags: 0x0},
+	1319: {region: 0xda, script: 0x5b, flags: 0x0},
+	1320: {region: 0xbb, script: 0xeb, flags: 0x0},
+	1321: {region: 0x4d, script: 0x14, flags: 0x1},
+	1322: {region: 0x53, script: 0x7f, flags: 0x0},
+	1323: {region: 0x166, script: 0x5b, flags: 0x0},
+	1324: {region: 0x123, script: 0x5b, flags: 0x0},
+	1325: {region: 0xd1, script: 0x5b, flags: 0x0},
+	1326: {region: 0x166, script: 0x5b, flags: 0x0},
+	1327: {region: 0x162, script: 0x5b, flags: 0x0},
+	1329: {region: 0x12c, script: 0x5b, flags: 0x0},
+}
+
+// likelyLangList holds lists info associated with likelyLang.
+// Size: 582 bytes, 97 elements
+var likelyLangList = [97]likelyScriptRegion{
+	0:  {region: 0x9d, script: 0x7, flags: 0x0},
+	1:  {region: 0xa2, script: 0x7a, flags: 0x2},
+	2:  {region: 0x11d, script: 0x87, flags: 0x2},
+	3:  {region: 0x32, script: 0x5b, flags: 0x0},
+	4:  {region: 0x9c, script: 0x5, flags: 0x4},
+	5:  {region: 0x9d, script: 0x5, flags: 0x4},
+	6:  {region: 0x107, script: 0x20, flags: 0x4},
+	7:  {region: 0x9d, script: 0x5, flags: 0x2},
+	8:  {region: 0x107, script: 0x20, flags: 0x0},
+	9:  {region: 0x38, script: 0x2f, flags: 0x2},
+	10: {region: 0x136, script: 0x5b, flags: 0x0},
+	11: {region: 0x7c, script: 0xd1, flags: 0x2},
+	12: {region: 0x115, script: 0x5b, flags: 0x0},
+	13: {region: 0x85, script: 0x1, flags: 0x2},
+	14: {region: 0x5e, script: 0x1f, flags: 0x0},
+	15: {region: 0x88, script: 0x60, flags: 0x2},
+	16: {region: 0xd7, script: 0x5b, flags: 0x0},
+	17: {region: 0x52, script: 0x5, flags: 0x4},
+	18: {region: 0x10c, script: 0x5, flags: 0x4},
+	19: {region: 0xaf, script: 0x20, flags: 0x0},
+	20: {region: 0x24, script: 0x5, flags: 0x4},
+	21: {region: 0x53, script: 0x5, flags: 0x4},
+	22: {region: 0x9d, script: 0x5, flags: 0x4},
+	23: {region: 0xc6, script: 0x5, flags: 0x4},
+	24: {region: 0x53, script: 0x5, flags: 0x2},
+	25: {region: 0x12c, script: 0x5b, flags: 0x0},
+	26: {region: 0xb1, script: 0x5, flags: 0x4},
+	27: {region: 0x9c, script: 0x5, flags: 0x2},
+	28: {region: 0xa6, script: 0x20, flags: 0x0},
+	29: {region: 0x53, script: 0x5, flags: 0x4},
+	30: {region: 0x12c, script: 0x5b, flags: 0x4},
+	31: {region: 0x53, script: 0x5, flags: 0x2},
+	32: {region: 0x12c, script: 0x5b, flags: 0x2},
+	33: {region: 0xdc, script: 0x22, flags: 0x0},
+	34: {region: 0x9a, script: 0x5e, flags: 0x2},
+	35: {region: 0x84, script: 0x5b, flags: 0x0},
+	36: {region: 0x85, script: 0x7e, flags: 0x4},
+	37: {region: 0x85, script: 0x7e, flags: 0x2},
+	38: {region: 0xc6, script: 0x20, flags: 0x0},
+	39: {region: 0x53, script: 0x71, flags: 0x4},
+	40: {region: 0x53, script: 0x71, flags: 0x2},
+	41: {region: 0xd1, script: 0x5b, flags: 0x0},
+	42: {region: 0x4a, script: 0x5, flags: 0x4},
+	43: {region: 0x96, script: 0x5, flags: 0x4},
+	44: {region: 0x9a, script: 0x36, flags: 0x0},
+	45: {region: 0xe9, script: 0x5, flags: 0x4},
+	46: {region: 0xe9, script: 0x5, flags: 0x2},
+	47: {region: 0x9d, script: 0x8d, flags: 0x0},
+	48: {region: 0x53, script: 0x8e, flags: 0x2},
+	49: {region: 0xbb, script: 0xeb, flags: 0x0},
+	50: {region: 0xda, script: 0x5b, flags: 0x4},
+	51: {region: 0xe9, script: 0x5, flags: 0x0},
+	52: {region: 0x9a, script: 0x22, flags: 0x2},
+	53: {region: 0x9a, script: 0x50, flags: 0x2},
+	54: {region: 0x9a, script: 0xd5, flags: 0x2},
+	55: {region: 0x106, script: 0x20, flags: 0x0},
+	56: {region: 0xbe, script: 0x5b, flags: 0x4},
+	57: {region: 0x105, script: 0x5b, flags: 0x4},
+	58: {region: 0x107, script: 0x5b, flags: 0x4},
+	59: {region: 0x12c, script: 0x5b, flags: 0x4},
+	60: {region: 0x125, script: 0x20, flags: 0x0},
+	61: {region: 0xe9, script: 0x5, flags: 0x4},
+	62: {region: 0xe9, script: 0x5, flags: 0x2},
+	63: {region: 0x53, script: 0x5, flags: 0x0},
+	64: {region: 0xaf, script: 0x20, flags: 0x4},
+	65: {region: 0xc6, script: 0x20, flags: 0x4},
+	66: {region: 0xaf, script: 0x20, flags: 0x2},
+	67: {region: 0x9a, script: 0xe, flags: 0x0},
+	68: {region: 0xdc, script: 0x22, flags: 0x4},
+	69: {region: 0xdc, script: 0x22, flags: 0x2},
+	70: {region: 0x138, script: 0x5b, flags: 0x0},
+	71: {region: 0x24, script: 0x5, flags: 0x4},
+	72: {region: 0x53, script: 0x20, flags: 0x4},
+	73: {region: 0x24, script: 0x5, flags: 0x2},
+	74: {region: 0x8e, script: 0x3c, flags: 0x0},
+	75: {region: 0x53, script: 0x3b, flags: 0x4},
+	76: {region: 0x53, script: 0x3b, flags: 0x2},
+	77: {region: 0x53, script: 0x3b, flags: 0x0},
+	78: {region: 0x2f, script: 0x3c, flags: 0x4},
+	79: {region: 0x3e, script: 0x3c, flags: 0x4},
+	80: {region: 0x7c, script: 0x3c, flags: 0x4},
+	81: {region: 0x7f, script: 0x3c, flags: 0x4},
+	82: {region: 0x8e, script: 0x3c, flags: 0x4},
+	83: {region: 0x96, script: 0x3c, flags: 0x4},
+	84: {region: 0xc7, script: 0x3c, flags: 0x4},
+	85: {region: 0xd1, script: 0x3c, flags: 0x4},
+	86: {region: 0xe3, script: 0x3c, flags: 0x4},
+	87: {region: 0xe6, script: 0x3c, flags: 0x4},
+	88: {region: 0xe8, script: 0x3c, flags: 0x4},
+	89: {region: 0x117, script: 0x3c, flags: 0x4},
+	90: {region: 0x124, script: 0x3c, flags: 0x4},
+	91: {region: 0x12f, script: 0x3c, flags: 0x4},
+	92: {region: 0x136, script: 0x3c, flags: 0x4},
+	93: {region: 0x13f, script: 0x3c, flags: 0x4},
+	94: {region: 0x12f, script: 0x11, flags: 0x2},
+	95: {region: 0x12f, script: 0x37, flags: 0x2},
+	96: {region: 0x12f, script: 0x3c, flags: 0x2},
+}
+
+type likelyLangScript struct {
+	lang   uint16
+	script uint16
+	flags  uint8
+}
+
+// likelyRegion is a lookup table, indexed by regionID, for the most likely
+// languages and scripts given incomplete information. If more entries exist
+// for a given regionID, lang and script are the index and size respectively
+// of the list in likelyRegionList.
+// TODO: exclude containers and user-definable regions from the list.
+// Size: 2154 bytes, 359 elements
+var likelyRegion = [359]likelyLangScript{
+	34:  {lang: 0xd7, script: 0x5b, flags: 0x0},
+	35:  {lang: 0x3a, script: 0x5, flags: 0x0},
+	36:  {lang: 0x0, script: 0x2, flags: 0x1},
+	39:  {lang: 0x2, script: 0x2, flags: 0x1},
+	40:  {lang: 0x4, script: 0x2, flags: 0x1},
+	42:  {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	43:  {lang: 0x0, script: 0x5b, flags: 0x0},
+	44:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	45:  {lang: 0x41b, script: 0x5b, flags: 0x0},
+	46:  {lang: 0x10d, script: 0x5b, flags: 0x0},
+	48:  {lang: 0x367, script: 0x5b, flags: 0x0},
+	49:  {lang: 0x444, script: 0x5b, flags: 0x0},
+	50:  {lang: 0x58, script: 0x5b, flags: 0x0},
+	51:  {lang: 0x6, script: 0x2, flags: 0x1},
+	53:  {lang: 0xa5, script: 0xe, flags: 0x0},
+	54:  {lang: 0x367, script: 0x5b, flags: 0x0},
+	55:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	56:  {lang: 0x7e, script: 0x20, flags: 0x0},
+	57:  {lang: 0x3a, script: 0x5, flags: 0x0},
+	58:  {lang: 0x3d9, script: 0x5b, flags: 0x0},
+	59:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	60:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	62:  {lang: 0x31f, script: 0x5b, flags: 0x0},
+	63:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	64:  {lang: 0x3a1, script: 0x5b, flags: 0x0},
+	65:  {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	67:  {lang: 0x8, script: 0x2, flags: 0x1},
+	69:  {lang: 0x0, script: 0x5b, flags: 0x0},
+	71:  {lang: 0x71, script: 0x20, flags: 0x0},
+	73:  {lang: 0x512, script: 0x3e, flags: 0x2},
+	74:  {lang: 0x31f, script: 0x5, flags: 0x2},
+	75:  {lang: 0x445, script: 0x5b, flags: 0x0},
+	76:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	77:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	78:  {lang: 0x10d, script: 0x5b, flags: 0x0},
+	79:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	81:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	82:  {lang: 0x15e, script: 0x5b, flags: 0x0},
+	83:  {lang: 0xa, script: 0x4, flags: 0x1},
+	84:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	85:  {lang: 0x0, script: 0x5b, flags: 0x0},
+	87:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	90:  {lang: 0x13e, script: 0x5b, flags: 0x0},
+	91:  {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	92:  {lang: 0x3a1, script: 0x5b, flags: 0x0},
+	94:  {lang: 0xe, script: 0x2, flags: 0x1},
+	95:  {lang: 0xfa, script: 0x5b, flags: 0x0},
+	97:  {lang: 0x10d, script: 0x5b, flags: 0x0},
+	99:  {lang: 0x1, script: 0x5b, flags: 0x0},
+	100: {lang: 0x101, script: 0x5b, flags: 0x0},
+	102: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	104: {lang: 0x10, script: 0x2, flags: 0x1},
+	105: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	106: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	107: {lang: 0x140, script: 0x5b, flags: 0x0},
+	108: {lang: 0x3a, script: 0x5, flags: 0x0},
+	109: {lang: 0x3a, script: 0x5, flags: 0x0},
+	110: {lang: 0x46f, script: 0x2c, flags: 0x0},
+	111: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	112: {lang: 0x12, script: 0x2, flags: 0x1},
+	114: {lang: 0x10d, script: 0x5b, flags: 0x0},
+	115: {lang: 0x151, script: 0x5b, flags: 0x0},
+	116: {lang: 0x1c0, script: 0x22, flags: 0x2},
+	119: {lang: 0x158, script: 0x5b, flags: 0x0},
+	121: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	123: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	124: {lang: 0x14, script: 0x2, flags: 0x1},
+	126: {lang: 0x16, script: 0x3, flags: 0x1},
+	127: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	129: {lang: 0x21, script: 0x5b, flags: 0x0},
+	131: {lang: 0x245, script: 0x5b, flags: 0x0},
+	133: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	134: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	135: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	136: {lang: 0x19, script: 0x2, flags: 0x1},
+	137: {lang: 0x0, script: 0x5b, flags: 0x0},
+	138: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	140: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	142: {lang: 0x529, script: 0x3c, flags: 0x0},
+	143: {lang: 0x0, script: 0x5b, flags: 0x0},
+	144: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	145: {lang: 0x1d1, script: 0x5b, flags: 0x0},
+	146: {lang: 0x1d4, script: 0x5b, flags: 0x0},
+	147: {lang: 0x1d5, script: 0x5b, flags: 0x0},
+	149: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	150: {lang: 0x1b, script: 0x2, flags: 0x1},
+	152: {lang: 0x1bc, script: 0x3e, flags: 0x0},
+	154: {lang: 0x1d, script: 0x3, flags: 0x1},
+	156: {lang: 0x3a, script: 0x5, flags: 0x0},
+	157: {lang: 0x20, script: 0x2, flags: 0x1},
+	158: {lang: 0x1f8, script: 0x5b, flags: 0x0},
+	159: {lang: 0x1f9, script: 0x5b, flags: 0x0},
+	162: {lang: 0x3a, script: 0x5, flags: 0x0},
+	163: {lang: 0x200, script: 0x49, flags: 0x0},
+	165: {lang: 0x445, script: 0x5b, flags: 0x0},
+	166: {lang: 0x28a, script: 0x20, flags: 0x0},
+	167: {lang: 0x22, script: 0x3, flags: 0x1},
+	169: {lang: 0x25, script: 0x2, flags: 0x1},
+	171: {lang: 0x254, script: 0x54, flags: 0x0},
+	172: {lang: 0x254, script: 0x54, flags: 0x0},
+	173: {lang: 0x3a, script: 0x5, flags: 0x0},
+	175: {lang: 0x3e2, script: 0x20, flags: 0x0},
+	176: {lang: 0x27, script: 0x2, flags: 0x1},
+	177: {lang: 0x3a, script: 0x5, flags: 0x0},
+	179: {lang: 0x10d, script: 0x5b, flags: 0x0},
+	180: {lang: 0x40c, script: 0xd6, flags: 0x0},
+	182: {lang: 0x43b, script: 0x5b, flags: 0x0},
+	183: {lang: 0x2c0, script: 0x5b, flags: 0x0},
+	184: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	185: {lang: 0x2c7, script: 0x5b, flags: 0x0},
+	186: {lang: 0x3a, script: 0x5, flags: 0x0},
+	187: {lang: 0x29, script: 0x2, flags: 0x1},
+	188: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	189: {lang: 0x2b, script: 0x2, flags: 0x1},
+	190: {lang: 0x432, script: 0x5b, flags: 0x0},
+	191: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	192: {lang: 0x2f1, script: 0x5b, flags: 0x0},
+	195: {lang: 0x2d, script: 0x2, flags: 0x1},
+	196: {lang: 0xa0, script: 0x5b, flags: 0x0},
+	197: {lang: 0x2f, script: 0x2, flags: 0x1},
+	198: {lang: 0x31, script: 0x2, flags: 0x1},
+	199: {lang: 0x33, script: 0x2, flags: 0x1},
+	201: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	202: {lang: 0x35, script: 0x2, flags: 0x1},
+	204: {lang: 0x320, script: 0x5b, flags: 0x0},
+	205: {lang: 0x37, script: 0x3, flags: 0x1},
+	206: {lang: 0x128, script: 0xed, flags: 0x0},
+	208: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	209: {lang: 0x31f, script: 0x5b, flags: 0x0},
+	210: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	211: {lang: 0x16, script: 0x5b, flags: 0x0},
+	212: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	213: {lang: 0x1b4, script: 0x5b, flags: 0x0},
+	215: {lang: 0x1b4, script: 0x5, flags: 0x2},
+	217: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	218: {lang: 0x367, script: 0x5b, flags: 0x0},
+	219: {lang: 0x347, script: 0x5b, flags: 0x0},
+	220: {lang: 0x351, script: 0x22, flags: 0x0},
+	226: {lang: 0x3a, script: 0x5, flags: 0x0},
+	227: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	229: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	230: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	231: {lang: 0x486, script: 0x5b, flags: 0x0},
+	232: {lang: 0x153, script: 0x5b, flags: 0x0},
+	233: {lang: 0x3a, script: 0x3, flags: 0x1},
+	234: {lang: 0x3b3, script: 0x5b, flags: 0x0},
+	235: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	237: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	238: {lang: 0x3a, script: 0x5, flags: 0x0},
+	239: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	241: {lang: 0x3a2, script: 0x5b, flags: 0x0},
+	242: {lang: 0x194, script: 0x5b, flags: 0x0},
+	244: {lang: 0x3a, script: 0x5, flags: 0x0},
+	259: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	261: {lang: 0x3d, script: 0x2, flags: 0x1},
+	262: {lang: 0x432, script: 0x20, flags: 0x0},
+	263: {lang: 0x3f, script: 0x2, flags: 0x1},
+	264: {lang: 0x3e5, script: 0x5b, flags: 0x0},
+	265: {lang: 0x3a, script: 0x5, flags: 0x0},
+	267: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	268: {lang: 0x3a, script: 0x5, flags: 0x0},
+	269: {lang: 0x41, script: 0x2, flags: 0x1},
+	272: {lang: 0x416, script: 0x5b, flags: 0x0},
+	273: {lang: 0x347, script: 0x5b, flags: 0x0},
+	274: {lang: 0x43, script: 0x2, flags: 0x1},
+	276: {lang: 0x1f9, script: 0x5b, flags: 0x0},
+	277: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	278: {lang: 0x429, script: 0x5b, flags: 0x0},
+	279: {lang: 0x367, script: 0x5b, flags: 0x0},
+	281: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	283: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	285: {lang: 0x45, script: 0x2, flags: 0x1},
+	289: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	290: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	291: {lang: 0x47, script: 0x2, flags: 0x1},
+	292: {lang: 0x49, script: 0x3, flags: 0x1},
+	293: {lang: 0x4c, script: 0x2, flags: 0x1},
+	294: {lang: 0x477, script: 0x5b, flags: 0x0},
+	295: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	296: {lang: 0x476, script: 0x5b, flags: 0x0},
+	297: {lang: 0x4e, script: 0x2, flags: 0x1},
+	298: {lang: 0x482, script: 0x5b, flags: 0x0},
+	300: {lang: 0x50, script: 0x4, flags: 0x1},
+	302: {lang: 0x4a0, script: 0x5b, flags: 0x0},
+	303: {lang: 0x54, script: 0x2, flags: 0x1},
+	304: {lang: 0x445, script: 0x5b, flags: 0x0},
+	305: {lang: 0x56, script: 0x3, flags: 0x1},
+	306: {lang: 0x445, script: 0x5b, flags: 0x0},
+	310: {lang: 0x512, script: 0x3e, flags: 0x2},
+	311: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	312: {lang: 0x4bc, script: 0x5b, flags: 0x0},
+	313: {lang: 0x1f9, script: 0x5b, flags: 0x0},
+	316: {lang: 0x13e, script: 0x5b, flags: 0x0},
+	319: {lang: 0x4c3, script: 0x5b, flags: 0x0},
+	320: {lang: 0x8a, script: 0x5b, flags: 0x0},
+	321: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	323: {lang: 0x41b, script: 0x5b, flags: 0x0},
+	334: {lang: 0x59, script: 0x2, flags: 0x1},
+	351: {lang: 0x3a, script: 0x5, flags: 0x0},
+	352: {lang: 0x5b, script: 0x2, flags: 0x1},
+	357: {lang: 0x423, script: 0x5b, flags: 0x0},
+}
+
+// likelyRegionList holds lists info associated with likelyRegion.
+// Size: 558 bytes, 93 elements
+var likelyRegionList = [93]likelyLangScript{
+	0:  {lang: 0x148, script: 0x5, flags: 0x0},
+	1:  {lang: 0x476, script: 0x5b, flags: 0x0},
+	2:  {lang: 0x431, script: 0x5b, flags: 0x0},
+	3:  {lang: 0x2ff, script: 0x20, flags: 0x0},
+	4:  {lang: 0x1d7, script: 0x8, flags: 0x0},
+	5:  {lang: 0x274, script: 0x5b, flags: 0x0},
+	6:  {lang: 0xb7, script: 0x5b, flags: 0x0},
+	7:  {lang: 0x432, script: 0x20, flags: 0x0},
+	8:  {lang: 0x12d, script: 0xef, flags: 0x0},
+	9:  {lang: 0x351, script: 0x22, flags: 0x0},
+	10: {lang: 0x529, script: 0x3b, flags: 0x0},
+	11: {lang: 0x4ac, script: 0x5, flags: 0x0},
+	12: {lang: 0x523, script: 0x5b, flags: 0x0},
+	13: {lang: 0x29a, script: 0xee, flags: 0x0},
+	14: {lang: 0x136, script: 0x34, flags: 0x0},
+	15: {lang: 0x48a, script: 0x5b, flags: 0x0},
+	16: {lang: 0x3a, script: 0x5, flags: 0x0},
+	17: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	18: {lang: 0x27, script: 0x2c, flags: 0x0},
+	19: {lang: 0x139, script: 0x5b, flags: 0x0},
+	20: {lang: 0x26a, script: 0x5, flags: 0x2},
+	21: {lang: 0x512, script: 0x3e, flags: 0x2},
+	22: {lang: 0x210, script: 0x2e, flags: 0x0},
+	23: {lang: 0x5, script: 0x20, flags: 0x0},
+	24: {lang: 0x274, script: 0x5b, flags: 0x0},
+	25: {lang: 0x136, script: 0x34, flags: 0x0},
+	26: {lang: 0x2ff, script: 0x20, flags: 0x0},
+	27: {lang: 0x1e1, script: 0x5b, flags: 0x0},
+	28: {lang: 0x31f, script: 0x5, flags: 0x0},
+	29: {lang: 0x1be, script: 0x22, flags: 0x0},
+	30: {lang: 0x4b4, script: 0x5, flags: 0x0},
+	31: {lang: 0x236, script: 0x76, flags: 0x0},
+	32: {lang: 0x148, script: 0x5, flags: 0x0},
+	33: {lang: 0x476, script: 0x5b, flags: 0x0},
+	34: {lang: 0x24a, script: 0x4f, flags: 0x0},
+	35: {lang: 0xe6, script: 0x5, flags: 0x0},
+	36: {lang: 0x226, script: 0xee, flags: 0x0},
+	37: {lang: 0x3a, script: 0x5, flags: 0x0},
+	38: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	39: {lang: 0x2b8, script: 0x58, flags: 0x0},
+	40: {lang: 0x226, script: 0xee, flags: 0x0},
+	41: {lang: 0x3a, script: 0x5, flags: 0x0},
+	42: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	43: {lang: 0x3dc, script: 0x5b, flags: 0x0},
+	44: {lang: 0x4ae, script: 0x20, flags: 0x0},
+	45: {lang: 0x2ff, script: 0x20, flags: 0x0},
+	46: {lang: 0x431, script: 0x5b, flags: 0x0},
+	47: {lang: 0x331, script: 0x76, flags: 0x0},
+	48: {lang: 0x213, script: 0x5b, flags: 0x0},
+	49: {lang: 0x30b, script: 0x20, flags: 0x0},
+	50: {lang: 0x242, script: 0x5, flags: 0x0},
+	51: {lang: 0x529, script: 0x3c, flags: 0x0},
+	52: {lang: 0x3c0, script: 0x5b, flags: 0x0},
+	53: {lang: 0x3a, script: 0x5, flags: 0x0},
+	54: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	55: {lang: 0x2ed, script: 0x5b, flags: 0x0},
+	56: {lang: 0x4b4, script: 0x5, flags: 0x0},
+	57: {lang: 0x88, script: 0x22, flags: 0x0},
+	58: {lang: 0x4b4, script: 0x5, flags: 0x0},
+	59: {lang: 0x4b4, script: 0x5, flags: 0x0},
+	60: {lang: 0xbe, script: 0x22, flags: 0x0},
+	61: {lang: 0x3dc, script: 0x5b, flags: 0x0},
+	62: {lang: 0x7e, script: 0x20, flags: 0x0},
+	63: {lang: 0x3e2, script: 0x20, flags: 0x0},
+	64: {lang: 0x267, script: 0x5b, flags: 0x0},
+	65: {lang: 0x444, script: 0x5b, flags: 0x0},
+	66: {lang: 0x512, script: 0x3e, flags: 0x0},
+	67: {lang: 0x412, script: 0x5b, flags: 0x0},
+	68: {lang: 0x4ae, script: 0x20, flags: 0x0},
+	69: {lang: 0x3a, script: 0x5, flags: 0x0},
+	70: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	71: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	72: {lang: 0x35, script: 0x5, flags: 0x0},
+	73: {lang: 0x46b, script: 0xee, flags: 0x0},
+	74: {lang: 0x2ec, script: 0x5, flags: 0x0},
+	75: {lang: 0x30f, script: 0x76, flags: 0x0},
+	76: {lang: 0x467, script: 0x20, flags: 0x0},
+	77: {lang: 0x148, script: 0x5, flags: 0x0},
+	78: {lang: 0x3a, script: 0x5, flags: 0x0},
+	79: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	80: {lang: 0x48a, script: 0x5b, flags: 0x0},
+	81: {lang: 0x58, script: 0x5, flags: 0x0},
+	82: {lang: 0x219, script: 0x20, flags: 0x0},
+	83: {lang: 0x81, script: 0x34, flags: 0x0},
+	84: {lang: 0x529, script: 0x3c, flags: 0x0},
+	85: {lang: 0x48c, script: 0x5b, flags: 0x0},
+	86: {lang: 0x4ae, script: 0x20, flags: 0x0},
+	87: {lang: 0x512, script: 0x3e, flags: 0x0},
+	88: {lang: 0x3b3, script: 0x5b, flags: 0x0},
+	89: {lang: 0x431, script: 0x5b, flags: 0x0},
+	90: {lang: 0x432, script: 0x20, flags: 0x0},
+	91: {lang: 0x15e, script: 0x5b, flags: 0x0},
+	92: {lang: 0x446, script: 0x5, flags: 0x0},
+}
+
+type likelyTag struct {
+	lang   uint16
+	region uint16
+	script uint16
+}
+
+// Size: 198 bytes, 33 elements
+var likelyRegionGroup = [33]likelyTag{
+	1:  {lang: 0x139, region: 0xd7, script: 0x5b},
+	2:  {lang: 0x139, region: 0x136, script: 0x5b},
+	3:  {lang: 0x3c0, region: 0x41, script: 0x5b},
+	4:  {lang: 0x139, region: 0x2f, script: 0x5b},
+	5:  {lang: 0x139, region: 0xd7, script: 0x5b},
+	6:  {lang: 0x13e, region: 0xd0, script: 0x5b},
+	7:  {lang: 0x445, region: 0x130, script: 0x5b},
+	8:  {lang: 0x3a, region: 0x6c, script: 0x5},
+	9:  {lang: 0x445, region: 0x4b, script: 0x5b},
+	10: {lang: 0x139, region: 0x162, script: 0x5b},
+	11: {lang: 0x139, region: 0x136, script: 0x5b},
+	12: {lang: 0x139, region: 0x136, script: 0x5b},
+	13: {lang: 0x13e, region: 0x5a, script: 0x5b},
+	14: {lang: 0x529, region: 0x53, script: 0x3b},
+	15: {lang: 0x1be, region: 0x9a, script: 0x22},
+	16: {lang: 0x1e1, region: 0x96, script: 0x5b},
+	17: {lang: 0x1f9, region: 0x9f, script: 0x5b},
+	18: {lang: 0x139, region: 0x2f, script: 0x5b},
+	19: {lang: 0x139, region: 0xe7, script: 0x5b},
+	20: {lang: 0x139, region: 0x8b, script: 0x5b},
+	21: {lang: 0x41b, region: 0x143, script: 0x5b},
+	22: {lang: 0x529, region: 0x53, script: 0x3b},
+	23: {lang: 0x4bc, region: 0x138, script: 0x5b},
+	24: {lang: 0x3a, region: 0x109, script: 0x5},
+	25: {lang: 0x3e2, region: 0x107, script: 0x20},
+	26: {lang: 0x3e2, region: 0x107, script: 0x20},
+	27: {lang: 0x139, region: 0x7c, script: 0x5b},
+	28: {lang: 0x10d, region: 0x61, script: 0x5b},
+	29: {lang: 0x139, region: 0xd7, script: 0x5b},
+	30: {lang: 0x13e, region: 0x1f, script: 0x5b},
+	31: {lang: 0x139, region: 0x9b, script: 0x5b},
+	32: {lang: 0x139, region: 0x7c, script: 0x5b},
+}
+
+// Size: 264 bytes, 33 elements
+var regionContainment = [33]uint64{
+	// Entry 0 - 1F
+	0x00000001ffffffff, 0x00000000200007a2, 0x0000000000003044, 0x0000000000000008,
+	0x00000000803c0010, 0x0000000000000020, 0x0000000000000040, 0x0000000000000080,
+	0x0000000000000100, 0x0000000000000200, 0x0000000000000400, 0x000000004000384c,
+	0x0000000000001000, 0x0000000000002000, 0x0000000000004000, 0x0000000000008000,
+	0x0000000000010000, 0x0000000000020000, 0x0000000000040000, 0x0000000000080000,
+	0x0000000000100000, 0x0000000000200000, 0x0000000001c1c000, 0x0000000000800000,
+	0x0000000001000000, 0x000000001e020000, 0x0000000004000000, 0x0000000008000000,
+	0x0000000010000000, 0x00000000200006a0, 0x0000000040002048, 0x0000000080000000,
+	// Entry 20 - 3F
+	0x0000000100000000,
+}
+
+// regionInclusion maps region identifiers to sets of regions in regionInclusionBits,
+// where each set holds all groupings that are directly connected in a region
+// containment graph.
+// Size: 359 bytes, 359 elements
+var regionInclusion = [359]uint8{
+	// Entry 0 - 3F
+	0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+	0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+	0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+	0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
+	0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x26, 0x23,
+	0x24, 0x26, 0x27, 0x22, 0x28, 0x29, 0x2a, 0x2b,
+	0x26, 0x2c, 0x24, 0x23, 0x26, 0x25, 0x2a, 0x2d,
+	0x2e, 0x24, 0x2f, 0x2d, 0x26, 0x30, 0x31, 0x28,
+	// Entry 40 - 7F
+	0x26, 0x28, 0x26, 0x25, 0x31, 0x22, 0x32, 0x33,
+	0x34, 0x30, 0x22, 0x27, 0x27, 0x27, 0x35, 0x2d,
+	0x29, 0x28, 0x27, 0x36, 0x28, 0x22, 0x21, 0x34,
+	0x23, 0x21, 0x26, 0x2d, 0x26, 0x22, 0x37, 0x2e,
+	0x35, 0x2a, 0x22, 0x2f, 0x38, 0x26, 0x26, 0x21,
+	0x39, 0x39, 0x28, 0x38, 0x39, 0x39, 0x2f, 0x3a,
+	0x2f, 0x20, 0x21, 0x38, 0x3b, 0x28, 0x3c, 0x2c,
+	0x21, 0x2a, 0x35, 0x27, 0x38, 0x26, 0x24, 0x28,
+	// Entry 80 - BF
+	0x2c, 0x2d, 0x23, 0x30, 0x2d, 0x2d, 0x26, 0x27,
+	0x3a, 0x22, 0x34, 0x3c, 0x2d, 0x28, 0x36, 0x22,
+	0x34, 0x3a, 0x26, 0x2e, 0x21, 0x39, 0x31, 0x38,
+	0x24, 0x2c, 0x25, 0x22, 0x24, 0x25, 0x2c, 0x3a,
+	0x2c, 0x26, 0x24, 0x36, 0x21, 0x2f, 0x3d, 0x31,
+	0x3c, 0x2f, 0x26, 0x36, 0x36, 0x24, 0x26, 0x3d,
+	0x31, 0x24, 0x26, 0x35, 0x25, 0x2d, 0x32, 0x38,
+	0x2a, 0x38, 0x39, 0x39, 0x35, 0x33, 0x23, 0x26,
+	// Entry C0 - FF
+	0x2f, 0x3c, 0x21, 0x23, 0x2d, 0x31, 0x36, 0x36,
+	0x3c, 0x26, 0x2d, 0x26, 0x3a, 0x2f, 0x25, 0x2f,
+	0x34, 0x31, 0x2f, 0x32, 0x3b, 0x2d, 0x2b, 0x2d,
+	0x21, 0x34, 0x2a, 0x2c, 0x25, 0x21, 0x3c, 0x24,
+	0x29, 0x2b, 0x24, 0x34, 0x21, 0x28, 0x29, 0x3b,
+	0x31, 0x25, 0x2e, 0x30, 0x29, 0x26, 0x24, 0x3a,
+	0x21, 0x3c, 0x28, 0x21, 0x24, 0x21, 0x21, 0x1f,
+	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21,
+	// Entry 100 - 13F
+	0x21, 0x21, 0x21, 0x2f, 0x21, 0x2e, 0x23, 0x33,
+	0x2f, 0x24, 0x3b, 0x2f, 0x39, 0x38, 0x31, 0x2d,
+	0x3a, 0x2c, 0x2e, 0x2d, 0x23, 0x2d, 0x2f, 0x28,
+	0x2f, 0x27, 0x33, 0x34, 0x26, 0x24, 0x32, 0x22,
+	0x26, 0x27, 0x22, 0x2d, 0x31, 0x3d, 0x29, 0x31,
+	0x3d, 0x39, 0x29, 0x31, 0x24, 0x26, 0x29, 0x36,
+	0x2f, 0x33, 0x2f, 0x21, 0x22, 0x21, 0x30, 0x28,
+	0x3d, 0x23, 0x26, 0x21, 0x28, 0x26, 0x26, 0x31,
+	// Entry 140 - 17F
+	0x3b, 0x29, 0x21, 0x29, 0x21, 0x21, 0x21, 0x21,
+	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x23, 0x21,
+	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21,
+	0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x24, 0x24,
+	0x2f, 0x23, 0x32, 0x2f, 0x27, 0x2f, 0x21,
+}
+
+// regionInclusionBits is an array of bit vectors where every vector represents
+// a set of region groupings.  These sets are used to compute the distance
+// between two regions for the purpose of language matching.
+// Size: 584 bytes, 73 elements
+var regionInclusionBits = [73]uint64{
+	// Entry 0 - 1F
+	0x0000000102400813, 0x00000000200007a3, 0x0000000000003844, 0x0000000040000808,
+	0x00000000803c0011, 0x0000000020000022, 0x0000000040000844, 0x0000000020000082,
+	0x0000000000000102, 0x0000000020000202, 0x0000000020000402, 0x000000004000384d,
+	0x0000000000001804, 0x0000000040002804, 0x0000000000404000, 0x0000000000408000,
+	0x0000000000410000, 0x0000000002020000, 0x0000000000040010, 0x0000000000080010,
+	0x0000000000100010, 0x0000000000200010, 0x0000000001c1c001, 0x0000000000c00000,
+	0x0000000001400000, 0x000000001e020001, 0x0000000006000000, 0x000000000a000000,
+	0x0000000012000000, 0x00000000200006a2, 0x0000000040002848, 0x0000000080000010,
+	// Entry 20 - 3F
+	0x0000000100000001, 0x0000000000000001, 0x0000000080000000, 0x0000000000020000,
+	0x0000000001000000, 0x0000000000008000, 0x0000000000002000, 0x0000000000000200,
+	0x0000000000000008, 0x0000000000200000, 0x0000000110000000, 0x0000000000040000,
+	0x0000000008000000, 0x0000000000000020, 0x0000000104000000, 0x0000000000000080,
+	0x0000000000001000, 0x0000000000010000, 0x0000000000000400, 0x0000000004000000,
+	0x0000000000000040, 0x0000000010000000, 0x0000000000004000, 0x0000000101000000,
+	0x0000000108000000, 0x0000000000000100, 0x0000000100020000, 0x0000000000080000,
+	0x0000000000100000, 0x0000000000800000, 0x00000001ffffffff, 0x0000000122400fb3,
+	// Entry 40 - 5F
+	0x00000001827c0813, 0x000000014240385f, 0x0000000103c1c813, 0x000000011e420813,
+	0x0000000112000001, 0x0000000106000001, 0x0000000101400001, 0x000000010a000001,
+	0x0000000102020001,
+}
+
+// regionInclusionNext marks, for each entry in regionInclusionBits, the set of
+// all groups that are reachable from the groups set in the respective entry.
+// Size: 73 bytes, 73 elements
+var regionInclusionNext = [73]uint8{
+	// Entry 0 - 3F
+	0x3e, 0x3f, 0x0b, 0x0b, 0x40, 0x01, 0x0b, 0x01,
+	0x01, 0x01, 0x01, 0x41, 0x0b, 0x0b, 0x16, 0x16,
+	0x16, 0x19, 0x04, 0x04, 0x04, 0x04, 0x42, 0x16,
+	0x16, 0x43, 0x19, 0x19, 0x19, 0x01, 0x0b, 0x04,
+	0x00, 0x00, 0x1f, 0x11, 0x18, 0x0f, 0x0d, 0x09,
+	0x03, 0x15, 0x44, 0x12, 0x1b, 0x05, 0x45, 0x07,
+	0x0c, 0x10, 0x0a, 0x1a, 0x06, 0x1c, 0x0e, 0x46,
+	0x47, 0x08, 0x48, 0x13, 0x14, 0x17, 0x3e, 0x3e,
+	// Entry 40 - 7F
+	0x3e, 0x3e, 0x3e, 0x3e, 0x43, 0x43, 0x42, 0x43,
+	0x43,
+}
+
+type parentRel struct {
+	lang       uint16
+	script     uint16
+	maxScript  uint16
+	toRegion   uint16
+	fromRegion []uint16
+}
+
+// Size: 414 bytes, 5 elements
+var parents = [5]parentRel{
+	0: {lang: 0x139, script: 0x0, maxScript: 0x5b, toRegion: 0x1, fromRegion: []uint16{0x1a, 0x25, 0x26, 0x2f, 0x34, 0x36, 0x3d, 0x42, 0x46, 0x48, 0x49, 0x4a, 0x50, 0x52, 0x5d, 0x5e, 0x62, 0x65, 0x6e, 0x74, 0x75, 0x76, 0x7c, 0x7d, 0x80, 0x81, 0x82, 0x84, 0x8d, 0x8e, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0xa0, 0xa1, 0xa5, 0xa8, 0xaa, 0xae, 0xb2, 0xb5, 0xb6, 0xc0, 0xc7, 0xcb, 0xcc, 0xcd, 0xcf, 0xd1, 0xd3, 0xd6, 0xd7, 0xde, 0xe0, 0xe1, 0xe7, 0xe8, 0xe9, 0xec, 0xf1, 0x108, 0x10a, 0x10b, 0x10c, 0x10e, 0x10f, 0x113, 0x118, 0x11c, 0x11e, 0x120, 0x126, 0x12a, 0x12d, 0x12e, 0x130, 0x132, 0x13a, 0x13d, 0x140, 0x143, 0x162, 0x163, 0x165}},
+	1: {lang: 0x139, script: 0x0, maxScript: 0x5b, toRegion: 0x1a, fromRegion: []uint16{0x2e, 0x4e, 0x61, 0x64, 0x73, 0xda, 0x10d, 0x110}},
+	2: {lang: 0x13e, script: 0x0, maxScript: 0x5b, toRegion: 0x1f, fromRegion: []uint16{0x2c, 0x3f, 0x41, 0x48, 0x51, 0x54, 0x57, 0x5a, 0x66, 0x6a, 0x8a, 0x90, 0xd0, 0xd9, 0xe3, 0xe5, 0xed, 0xf2, 0x11b, 0x136, 0x137, 0x13c}},
+	3: {lang: 0x3c0, script: 0x0, maxScript: 0x5b, toRegion: 0xef, fromRegion: []uint16{0x2a, 0x4e, 0x5b, 0x87, 0x8c, 0xb8, 0xc7, 0xd2, 0x119, 0x127}},
+	4: {lang: 0x529, script: 0x3c, maxScript: 0x3c, toRegion: 0x8e, fromRegion: []uint16{0xc7}},
+}
+
+// Total table size 30466 bytes (29KiB); checksum: 7544152B
diff --git a/vendor/golang.org/x/text/internal/language/tags.go b/vendor/golang.org/x/text/internal/language/tags.go
new file mode 100644
index 000000000..e7afd3188
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/language/tags.go
@@ -0,0 +1,48 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+// MustParse is like Parse, but panics if the given BCP 47 tag cannot be parsed.
+// It simplifies safe initialization of Tag values.
+func MustParse(s string) Tag {
+	t, err := Parse(s)
+	if err != nil {
+		panic(err)
+	}
+	return t
+}
+
+// MustParseBase is like ParseBase, but panics if the given base cannot be parsed.
+// It simplifies safe initialization of Base values.
+func MustParseBase(s string) Language {
+	b, err := ParseBase(s)
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
+
+// MustParseScript is like ParseScript, but panics if the given script cannot be
+// parsed. It simplifies safe initialization of Script values.
+func MustParseScript(s string) Script {
+	scr, err := ParseScript(s)
+	if err != nil {
+		panic(err)
+	}
+	return scr
+}
+
+// MustParseRegion is like ParseRegion, but panics if the given region cannot be
+// parsed. It simplifies safe initialization of Region values.
+func MustParseRegion(s string) Region {
+	r, err := ParseRegion(s)
+	if err != nil {
+		panic(err)
+	}
+	return r
+}
+
+// Und is the root language.
+var Und Tag
diff --git a/vendor/golang.org/x/text/internal/match.go b/vendor/golang.org/x/text/internal/match.go
new file mode 100644
index 000000000..1cc004a6d
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/match.go
@@ -0,0 +1,67 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package internal
+
+// This file contains matchers that implement CLDR inheritance.
+//
+//     See https://unicode.org/reports/tr35/#Locale_Inheritance.
+//
+// Some of the inheritance described in this document is already handled by
+// the cldr package.
+
+import (
+	"golang.org/x/text/language"
+)
+
+// TODO: consider if (some of the) matching algorithm needs to be public after
+// getting some feel about what is generic and what is specific.
+
+// NewInheritanceMatcher returns a matcher that matches based on the inheritance
+// chain.
+//
+// The matcher uses canonicalization and the parent relationship to find a
+// match. The resulting match will always be either Und or a language with the
+// same language and script as the requested language. It will not match
+// languages for which there is understood to be mutual or one-directional
+// intelligibility.
+//
+// A Match will indicate an Exact match if the language matches after
+// canonicalization and High if the matched tag is a parent.
+func NewInheritanceMatcher(t []language.Tag) *InheritanceMatcher {
+	tags := &InheritanceMatcher{make(map[language.Tag]int)}
+	for i, tag := range t {
+		ct, err := language.All.Canonicalize(tag)
+		if err != nil {
+			ct = tag
+		}
+		tags.index[ct] = i
+	}
+	return tags
+}
+
+type InheritanceMatcher struct {
+	index map[language.Tag]int
+}
+
+func (m InheritanceMatcher) Match(want ...language.Tag) (language.Tag, int, language.Confidence) {
+	for _, t := range want {
+		ct, err := language.All.Canonicalize(t)
+		if err != nil {
+			ct = t
+		}
+		conf := language.Exact
+		for {
+			if index, ok := m.index[ct]; ok {
+				return ct, index, conf
+			}
+			if ct == language.Und {
+				break
+			}
+			ct = ct.Parent()
+			conf = language.High
+		}
+	}
+	return language.Und, 0, language.No
+}
diff --git a/vendor/golang.org/x/text/internal/tag/tag.go b/vendor/golang.org/x/text/internal/tag/tag.go
new file mode 100644
index 000000000..b5d348891
--- /dev/null
+++ b/vendor/golang.org/x/text/internal/tag/tag.go
@@ -0,0 +1,100 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package tag contains functionality handling tags and related data.
+package tag // import "golang.org/x/text/internal/tag"
+
+import "sort"
+
+// An Index converts tags to a compact numeric value.
+//
+// All elements are of size 4. Tags may be up to 4 bytes long. Excess bytes can
+// be used to store additional information about the tag.
+type Index string
+
+// Elem returns the element data at the given index.
+func (s Index) Elem(x int) string {
+	return string(s[x*4 : x*4+4])
+}
+
+// Index reports the index of the given key or -1 if it could not be found.
+// Only the first len(key) bytes from the start of the 4-byte entries will be
+// considered for the search and the first match in Index will be returned.
+func (s Index) Index(key []byte) int {
+	n := len(key)
+	// search the index of the first entry with an equal or higher value than
+	// key in s.
+	index := sort.Search(len(s)/4, func(i int) bool {
+		return cmp(s[i*4:i*4+n], key) != -1
+	})
+	i := index * 4
+	if cmp(s[i:i+len(key)], key) != 0 {
+		return -1
+	}
+	return index
+}
+
+// Next finds the next occurrence of key after index x, which must have been
+// obtained from a call to Index using the same key. It returns x+1 or -1.
+func (s Index) Next(key []byte, x int) int {
+	if x++; x*4 < len(s) && cmp(s[x*4:x*4+len(key)], key) == 0 {
+		return x
+	}
+	return -1
+}
+
+// cmp returns an integer comparing a and b lexicographically.
+func cmp(a Index, b []byte) int {
+	n := len(a)
+	if len(b) < n {
+		n = len(b)
+	}
+	for i, c := range b[:n] {
+		switch {
+		case a[i] > c:
+			return 1
+		case a[i] < c:
+			return -1
+		}
+	}
+	switch {
+	case len(a) < len(b):
+		return -1
+	case len(a) > len(b):
+		return 1
+	}
+	return 0
+}
+
+// Compare returns an integer comparing a and b lexicographically.
+func Compare(a string, b []byte) int {
+	return cmp(Index(a), b)
+}
+
+// FixCase reformats b to the same pattern of cases as form.
+// If returns false if string b is malformed.
+func FixCase(form string, b []byte) bool {
+	if len(form) != len(b) {
+		return false
+	}
+	for i, c := range b {
+		if form[i] <= 'Z' {
+			if c >= 'a' {
+				c -= 'z' - 'Z'
+			}
+			if c < 'A' || 'Z' < c {
+				return false
+			}
+		} else {
+			if c <= 'Z' {
+				c += 'z' - 'Z'
+			}
+			if c < 'a' || 'z' < c {
+				return false
+			}
+		}
+		b[i] = c
+	}
+	return true
+}
diff --git a/vendor/golang.org/x/text/language/coverage.go b/vendor/golang.org/x/text/language/coverage.go
new file mode 100644
index 000000000..a24fd1a4d
--- /dev/null
+++ b/vendor/golang.org/x/text/language/coverage.go
@@ -0,0 +1,187 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import (
+	"fmt"
+	"sort"
+
+	"golang.org/x/text/internal/language"
+)
+
+// The Coverage interface is used to define the level of coverage of an
+// internationalization service. Note that not all types are supported by all
+// services. As lists may be generated on the fly, it is recommended that users
+// of a Coverage cache the results.
+type Coverage interface {
+	// Tags returns the list of supported tags.
+	Tags() []Tag
+
+	// BaseLanguages returns the list of supported base languages.
+	BaseLanguages() []Base
+
+	// Scripts returns the list of supported scripts.
+	Scripts() []Script
+
+	// Regions returns the list of supported regions.
+	Regions() []Region
+}
+
+var (
+	// Supported defines a Coverage that lists all supported subtags. Tags
+	// always returns nil.
+	Supported Coverage = allSubtags{}
+)
+
+// TODO:
+// - Support Variants, numbering systems.
+// - CLDR coverage levels.
+// - Set of common tags defined in this package.
+
+type allSubtags struct{}
+
+// Regions returns the list of supported regions. As all regions are in a
+// consecutive range, it simply returns a slice of numbers in increasing order.
+// The "undefined" region is not returned.
+func (s allSubtags) Regions() []Region {
+	reg := make([]Region, language.NumRegions)
+	for i := range reg {
+		reg[i] = Region{language.Region(i + 1)}
+	}
+	return reg
+}
+
+// Scripts returns the list of supported scripts. As all scripts are in a
+// consecutive range, it simply returns a slice of numbers in increasing order.
+// The "undefined" script is not returned.
+func (s allSubtags) Scripts() []Script {
+	scr := make([]Script, language.NumScripts)
+	for i := range scr {
+		scr[i] = Script{language.Script(i + 1)}
+	}
+	return scr
+}
+
+// BaseLanguages returns the list of all supported base languages. It generates
+// the list by traversing the internal structures.
+func (s allSubtags) BaseLanguages() []Base {
+	bs := language.BaseLanguages()
+	base := make([]Base, len(bs))
+	for i, b := range bs {
+		base[i] = Base{b}
+	}
+	return base
+}
+
+// Tags always returns nil.
+func (s allSubtags) Tags() []Tag {
+	return nil
+}
+
+// coverage is used by NewCoverage which is used as a convenient way for
+// creating Coverage implementations for partially defined data. Very often a
+// package will only need to define a subset of slices. coverage provides a
+// convenient way to do this. Moreover, packages using NewCoverage, instead of
+// their own implementation, will not break if later new slice types are added.
+type coverage struct {
+	tags    func() []Tag
+	bases   func() []Base
+	scripts func() []Script
+	regions func() []Region
+}
+
+func (s *coverage) Tags() []Tag {
+	if s.tags == nil {
+		return nil
+	}
+	return s.tags()
+}
+
+// bases implements sort.Interface and is used to sort base languages.
+type bases []Base
+
+func (b bases) Len() int {
+	return len(b)
+}
+
+func (b bases) Swap(i, j int) {
+	b[i], b[j] = b[j], b[i]
+}
+
+func (b bases) Less(i, j int) bool {
+	return b[i].langID < b[j].langID
+}
+
+// BaseLanguages returns the result from calling s.bases if it is specified or
+// otherwise derives the set of supported base languages from tags.
+func (s *coverage) BaseLanguages() []Base {
+	if s.bases == nil {
+		tags := s.Tags()
+		if len(tags) == 0 {
+			return nil
+		}
+		a := make([]Base, len(tags))
+		for i, t := range tags {
+			a[i] = Base{language.Language(t.lang())}
+		}
+		sort.Sort(bases(a))
+		k := 0
+		for i := 1; i < len(a); i++ {
+			if a[k] != a[i] {
+				k++
+				a[k] = a[i]
+			}
+		}
+		return a[:k+1]
+	}
+	return s.bases()
+}
+
+func (s *coverage) Scripts() []Script {
+	if s.scripts == nil {
+		return nil
+	}
+	return s.scripts()
+}
+
+func (s *coverage) Regions() []Region {
+	if s.regions == nil {
+		return nil
+	}
+	return s.regions()
+}
+
+// NewCoverage returns a Coverage for the given lists. It is typically used by
+// packages providing internationalization services to define their level of
+// coverage. A list may be of type []T or func() []T, where T is either Tag,
+// Base, Script or Region. The returned Coverage derives the value for Bases
+// from Tags if no func or slice for []Base is specified. For other unspecified
+// types the returned Coverage will return nil for the respective methods.
+func NewCoverage(list ...interface{}) Coverage {
+	s := &coverage{}
+	for _, x := range list {
+		switch v := x.(type) {
+		case func() []Base:
+			s.bases = v
+		case func() []Script:
+			s.scripts = v
+		case func() []Region:
+			s.regions = v
+		case func() []Tag:
+			s.tags = v
+		case []Base:
+			s.bases = func() []Base { return v }
+		case []Script:
+			s.scripts = func() []Script { return v }
+		case []Region:
+			s.regions = func() []Region { return v }
+		case []Tag:
+			s.tags = func() []Tag { return v }
+		default:
+			panic(fmt.Sprintf("language: unsupported set type %T", v))
+		}
+	}
+	return s
+}
diff --git a/vendor/golang.org/x/text/language/doc.go b/vendor/golang.org/x/text/language/doc.go
new file mode 100644
index 000000000..212b77c90
--- /dev/null
+++ b/vendor/golang.org/x/text/language/doc.go
@@ -0,0 +1,98 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package language implements BCP 47 language tags and related functionality.
+//
+// The most important function of package language is to match a list of
+// user-preferred languages to a list of supported languages.
+// It alleviates the developer of dealing with the complexity of this process
+// and provides the user with the best experience
+// (see https://blog.golang.org/matchlang).
+//
+// # Matching preferred against supported languages
+//
+// A Matcher for an application that supports English, Australian English,
+// Danish, and standard Mandarin can be created as follows:
+//
+//	var matcher = language.NewMatcher([]language.Tag{
+//	    language.English,   // The first language is used as fallback.
+//	    language.MustParse("en-AU"),
+//	    language.Danish,
+//	    language.Chinese,
+//	})
+//
+// This list of supported languages is typically implied by the languages for
+// which there exists translations of the user interface.
+//
+// User-preferred languages usually come as a comma-separated list of BCP 47
+// language tags.
+// The MatchString finds best matches for such strings:
+//
+//	handler(w http.ResponseWriter, r *http.Request) {
+//	    lang, _ := r.Cookie("lang")
+//	    accept := r.Header.Get("Accept-Language")
+//	    tag, _ := language.MatchStrings(matcher, lang.String(), accept)
+//
+//	    // tag should now be used for the initialization of any
+//	    // locale-specific service.
+//	}
+//
+// The Matcher's Match method can be used to match Tags directly.
+//
+// Matchers are aware of the intricacies of equivalence between languages, such
+// as deprecated subtags, legacy tags, macro languages, mutual
+// intelligibility between scripts and languages, and transparently passing
+// BCP 47 user configuration.
+// For instance, it will know that a reader of Bokmål Danish can read Norwegian
+// and will know that Cantonese ("yue") is a good match for "zh-HK".
+//
+// # Using match results
+//
+// To guarantee a consistent user experience to the user it is important to
+// use the same language tag for the selection of any locale-specific services.
+// For example, it is utterly confusing to substitute spelled-out numbers
+// or dates in one language in text of another language.
+// More subtly confusing is using the wrong sorting order or casing
+// algorithm for a certain language.
+//
+// All the packages in x/text that provide locale-specific services
+// (e.g. collate, cases) should be initialized with the tag that was
+// obtained at the start of an interaction with the user.
+//
+// Note that Tag that is returned by Match and MatchString may differ from any
+// of the supported languages, as it may contain carried over settings from
+// the user tags.
+// This may be inconvenient when your application has some additional
+// locale-specific data for your supported languages.
+// Match and MatchString both return the index of the matched supported tag
+// to simplify associating such data with the matched tag.
+//
+// # Canonicalization
+//
+// If one uses the Matcher to compare languages one does not need to
+// worry about canonicalization.
+//
+// The meaning of a Tag varies per application. The language package
+// therefore delays canonicalization and preserves information as much
+// as possible. The Matcher, however, will always take into account that
+// two different tags may represent the same language.
+//
+// By default, only legacy and deprecated tags are converted into their
+// canonical equivalent. All other information is preserved. This approach makes
+// the confidence scores more accurate and allows matchers to distinguish
+// between variants that are otherwise lost.
+//
+// As a consequence, two tags that should be treated as identical according to
+// BCP 47 or CLDR, like "en-Latn" and "en", will be represented differently. The
+// Matcher handles such distinctions, though, and is aware of the
+// equivalence relations. The CanonType type can be used to alter the
+// canonicalization form.
+//
+// # References
+//
+// BCP 47 - Tags for Identifying Languages http://tools.ietf.org/html/bcp47
+package language // import "golang.org/x/text/language"
+
+// TODO: explanation on how to match languages for your own locale-specific
+// service.
diff --git a/vendor/golang.org/x/text/language/language.go b/vendor/golang.org/x/text/language/language.go
new file mode 100644
index 000000000..4d9c66121
--- /dev/null
+++ b/vendor/golang.org/x/text/language/language.go
@@ -0,0 +1,605 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go -output tables.go
+
+package language
+
+// TODO: Remove above NOTE after:
+// - verifying that tables are dropped correctly (most notably matcher tables).
+
+import (
+	"strings"
+
+	"golang.org/x/text/internal/language"
+	"golang.org/x/text/internal/language/compact"
+)
+
+// Tag represents a BCP 47 language tag. It is used to specify an instance of a
+// specific language or locale. All language tag values are guaranteed to be
+// well-formed.
+type Tag compact.Tag
+
+func makeTag(t language.Tag) (tag Tag) {
+	return Tag(compact.Make(t))
+}
+
+func (t *Tag) tag() language.Tag {
+	return (*compact.Tag)(t).Tag()
+}
+
+func (t *Tag) isCompact() bool {
+	return (*compact.Tag)(t).IsCompact()
+}
+
+// TODO: improve performance.
+func (t *Tag) lang() language.Language { return t.tag().LangID }
+func (t *Tag) region() language.Region { return t.tag().RegionID }
+func (t *Tag) script() language.Script { return t.tag().ScriptID }
+
+// Make is a convenience wrapper for Parse that omits the error.
+// In case of an error, a sensible default is returned.
+func Make(s string) Tag {
+	return Default.Make(s)
+}
+
+// Make is a convenience wrapper for c.Parse that omits the error.
+// In case of an error, a sensible default is returned.
+func (c CanonType) Make(s string) Tag {
+	t, _ := c.Parse(s)
+	return t
+}
+
+// Raw returns the raw base language, script and region, without making an
+// attempt to infer their values.
+func (t Tag) Raw() (b Base, s Script, r Region) {
+	tt := t.tag()
+	return Base{tt.LangID}, Script{tt.ScriptID}, Region{tt.RegionID}
+}
+
+// IsRoot returns true if t is equal to language "und".
+func (t Tag) IsRoot() bool {
+	return compact.Tag(t).IsRoot()
+}
+
+// CanonType can be used to enable or disable various types of canonicalization.
+type CanonType int
+
+const (
+	// Replace deprecated base languages with their preferred replacements.
+	DeprecatedBase CanonType = 1 << iota
+	// Replace deprecated scripts with their preferred replacements.
+	DeprecatedScript
+	// Replace deprecated regions with their preferred replacements.
+	DeprecatedRegion
+	// Remove redundant scripts.
+	SuppressScript
+	// Normalize legacy encodings. This includes legacy languages defined in
+	// CLDR as well as bibliographic codes defined in ISO-639.
+	Legacy
+	// Map the dominant language of a macro language group to the macro language
+	// subtag. For example cmn -> zh.
+	Macro
+	// The CLDR flag should be used if full compatibility with CLDR is required.
+	// There are a few cases where language.Tag may differ from CLDR. To follow all
+	// of CLDR's suggestions, use All|CLDR.
+	CLDR
+
+	// Raw can be used to Compose or Parse without Canonicalization.
+	Raw CanonType = 0
+
+	// Replace all deprecated tags with their preferred replacements.
+	Deprecated = DeprecatedBase | DeprecatedScript | DeprecatedRegion
+
+	// All canonicalizations recommended by BCP 47.
+	BCP47 = Deprecated | SuppressScript
+
+	// All canonicalizations.
+	All = BCP47 | Legacy | Macro
+
+	// Default is the canonicalization used by Parse, Make and Compose. To
+	// preserve as much information as possible, canonicalizations that remove
+	// potentially valuable information are not included. The Matcher is
+	// designed to recognize similar tags that would be the same if
+	// they were canonicalized using All.
+	Default = Deprecated | Legacy
+
+	canonLang = DeprecatedBase | Legacy | Macro
+
+	// TODO: LikelyScript, LikelyRegion: suppress similar to ICU.
+)
+
+// canonicalize returns the canonicalized equivalent of the tag and
+// whether there was any change.
+func canonicalize(c CanonType, t language.Tag) (language.Tag, bool) {
+	if c == Raw {
+		return t, false
+	}
+	changed := false
+	if c&SuppressScript != 0 {
+		if t.LangID.SuppressScript() == t.ScriptID {
+			t.ScriptID = 0
+			changed = true
+		}
+	}
+	if c&canonLang != 0 {
+		for {
+			if l, aliasType := t.LangID.Canonicalize(); l != t.LangID {
+				switch aliasType {
+				case language.Legacy:
+					if c&Legacy != 0 {
+						if t.LangID == _sh && t.ScriptID == 0 {
+							t.ScriptID = _Latn
+						}
+						t.LangID = l
+						changed = true
+					}
+				case language.Macro:
+					if c&Macro != 0 {
+						// We deviate here from CLDR. The mapping "nb" -> "no"
+						// qualifies as a typical Macro language mapping.  However,
+						// for legacy reasons, CLDR maps "no", the macro language
+						// code for Norwegian, to the dominant variant "nb". This
+						// change is currently under consideration for CLDR as well.
+						// See https://unicode.org/cldr/trac/ticket/2698 and also
+						// https://unicode.org/cldr/trac/ticket/1790 for some of the
+						// practical implications. TODO: this check could be removed
+						// if CLDR adopts this change.
+						if c&CLDR == 0 || t.LangID != _nb {
+							changed = true
+							t.LangID = l
+						}
+					}
+				case language.Deprecated:
+					if c&DeprecatedBase != 0 {
+						if t.LangID == _mo && t.RegionID == 0 {
+							t.RegionID = _MD
+						}
+						t.LangID = l
+						changed = true
+						// Other canonicalization types may still apply.
+						continue
+					}
+				}
+			} else if c&Legacy != 0 && t.LangID == _no && c&CLDR != 0 {
+				t.LangID = _nb
+				changed = true
+			}
+			break
+		}
+	}
+	if c&DeprecatedScript != 0 {
+		if t.ScriptID == _Qaai {
+			changed = true
+			t.ScriptID = _Zinh
+		}
+	}
+	if c&DeprecatedRegion != 0 {
+		if r := t.RegionID.Canonicalize(); r != t.RegionID {
+			changed = true
+			t.RegionID = r
+		}
+	}
+	return t, changed
+}
+
+// Canonicalize returns the canonicalized equivalent of the tag.
+func (c CanonType) Canonicalize(t Tag) (Tag, error) {
+	// First try fast path.
+	if t.isCompact() {
+		if _, changed := canonicalize(c, compact.Tag(t).Tag()); !changed {
+			return t, nil
+		}
+	}
+	// It is unlikely that one will canonicalize a tag after matching. So do
+	// a slow but simple approach here.
+	if tag, changed := canonicalize(c, t.tag()); changed {
+		tag.RemakeString()
+		return makeTag(tag), nil
+	}
+	return t, nil
+
+}
+
+// Confidence indicates the level of certainty for a given return value.
+// For example, Serbian may be written in Cyrillic or Latin script.
+// The confidence level indicates whether a value was explicitly specified,
+// whether it is typically the only possible value, or whether there is
+// an ambiguity.
+type Confidence int
+
+const (
+	No    Confidence = iota // full confidence that there was no match
+	Low                     // most likely value picked out of a set of alternatives
+	High                    // value is generally assumed to be the correct match
+	Exact                   // exact match or explicitly specified value
+)
+
+var confName = []string{"No", "Low", "High", "Exact"}
+
+func (c Confidence) String() string {
+	return confName[c]
+}
+
+// String returns the canonical string representation of the language tag.
+func (t Tag) String() string {
+	return t.tag().String()
+}
+
+// MarshalText implements encoding.TextMarshaler.
+func (t Tag) MarshalText() (text []byte, err error) {
+	return t.tag().MarshalText()
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (t *Tag) UnmarshalText(text []byte) error {
+	var tag language.Tag
+	err := tag.UnmarshalText(text)
+	*t = makeTag(tag)
+	return err
+}
+
+// Base returns the base language of the language tag. If the base language is
+// unspecified, an attempt will be made to infer it from the context.
+// It uses a variant of CLDR's Add Likely Subtags algorithm. This is subject to change.
+func (t Tag) Base() (Base, Confidence) {
+	if b := t.lang(); b != 0 {
+		return Base{b}, Exact
+	}
+	tt := t.tag()
+	c := High
+	if tt.ScriptID == 0 && !tt.RegionID.IsCountry() {
+		c = Low
+	}
+	if tag, err := tt.Maximize(); err == nil && tag.LangID != 0 {
+		return Base{tag.LangID}, c
+	}
+	return Base{0}, No
+}
+
+// Script infers the script for the language tag. If it was not explicitly given, it will infer
+// a most likely candidate.
+// If more than one script is commonly used for a language, the most likely one
+// is returned with a low confidence indication. For example, it returns (Cyrl, Low)
+// for Serbian.
+// If a script cannot be inferred (Zzzz, No) is returned. We do not use Zyyy (undetermined)
+// as one would suspect from the IANA registry for BCP 47. In a Unicode context Zyyy marks
+// common characters (like 1, 2, 3, '.', etc.) and is therefore more like multiple scripts.
+// See https://www.unicode.org/reports/tr24/#Values for more details. Zzzz is also used for
+// unknown value in CLDR.  (Zzzz, Exact) is returned if Zzzz was explicitly specified.
+// Note that an inferred script is never guaranteed to be the correct one. Latin is
+// almost exclusively used for Afrikaans, but Arabic has been used for some texts
+// in the past.  Also, the script that is commonly used may change over time.
+// It uses a variant of CLDR's Add Likely Subtags algorithm. This is subject to change.
+func (t Tag) Script() (Script, Confidence) {
+	if scr := t.script(); scr != 0 {
+		return Script{scr}, Exact
+	}
+	tt := t.tag()
+	sc, c := language.Script(_Zzzz), No
+	if scr := tt.LangID.SuppressScript(); scr != 0 {
+		// Note: it is not always the case that a language with a suppress
+		// script value is only written in one script (e.g. kk, ms, pa).
+		if tt.RegionID == 0 {
+			return Script{scr}, High
+		}
+		sc, c = scr, High
+	}
+	if tag, err := tt.Maximize(); err == nil {
+		if tag.ScriptID != sc {
+			sc, c = tag.ScriptID, Low
+		}
+	} else {
+		tt, _ = canonicalize(Deprecated|Macro, tt)
+		if tag, err := tt.Maximize(); err == nil && tag.ScriptID != sc {
+			sc, c = tag.ScriptID, Low
+		}
+	}
+	return Script{sc}, c
+}
+
+// Region returns the region for the language tag. If it was not explicitly given, it will
+// infer a most likely candidate from the context.
+// It uses a variant of CLDR's Add Likely Subtags algorithm. This is subject to change.
+func (t Tag) Region() (Region, Confidence) {
+	if r := t.region(); r != 0 {
+		return Region{r}, Exact
+	}
+	tt := t.tag()
+	if tt, err := tt.Maximize(); err == nil {
+		return Region{tt.RegionID}, Low // TODO: differentiate between high and low.
+	}
+	tt, _ = canonicalize(Deprecated|Macro, tt)
+	if tag, err := tt.Maximize(); err == nil {
+		return Region{tag.RegionID}, Low
+	}
+	return Region{_ZZ}, No // TODO: return world instead of undetermined?
+}
+
+// Variants returns the variants specified explicitly for this language tag.
+// or nil if no variant was specified.
+func (t Tag) Variants() []Variant {
+	if !compact.Tag(t).MayHaveVariants() {
+		return nil
+	}
+	v := []Variant{}
+	x, str := "", t.tag().Variants()
+	for str != "" {
+		x, str = nextToken(str)
+		v = append(v, Variant{x})
+	}
+	return v
+}
+
+// Parent returns the CLDR parent of t. In CLDR, missing fields in data for a
+// specific language are substituted with fields from the parent language.
+// The parent for a language may change for newer versions of CLDR.
+//
+// Parent returns a tag for a less specific language that is mutually
+// intelligible or Und if there is no such language. This may not be the same as
+// simply stripping the last BCP 47 subtag. For instance, the parent of "zh-TW"
+// is "zh-Hant", and the parent of "zh-Hant" is "und".
+func (t Tag) Parent() Tag {
+	return Tag(compact.Tag(t).Parent())
+}
+
+// nextToken returns token t and the rest of the string.
+func nextToken(s string) (t, tail string) {
+	p := strings.Index(s[1:], "-")
+	if p == -1 {
+		return s[1:], ""
+	}
+	p++
+	return s[1:p], s[p:]
+}
+
+// Extension is a single BCP 47 extension.
+type Extension struct {
+	s string
+}
+
+// String returns the string representation of the extension, including the
+// type tag.
+func (e Extension) String() string {
+	return e.s
+}
+
+// ParseExtension parses s as an extension and returns it on success.
+func ParseExtension(s string) (e Extension, err error) {
+	ext, err := language.ParseExtension(s)
+	return Extension{ext}, err
+}
+
+// Type returns the one-byte extension type of e. It returns 0 for the zero
+// exception.
+func (e Extension) Type() byte {
+	if e.s == "" {
+		return 0
+	}
+	return e.s[0]
+}
+
+// Tokens returns the list of tokens of e.
+func (e Extension) Tokens() []string {
+	return strings.Split(e.s, "-")
+}
+
+// Extension returns the extension of type x for tag t. It will return
+// false for ok if t does not have the requested extension. The returned
+// extension will be invalid in this case.
+func (t Tag) Extension(x byte) (ext Extension, ok bool) {
+	if !compact.Tag(t).MayHaveExtensions() {
+		return Extension{}, false
+	}
+	e, ok := t.tag().Extension(x)
+	return Extension{e}, ok
+}
+
+// Extensions returns all extensions of t.
+func (t Tag) Extensions() []Extension {
+	if !compact.Tag(t).MayHaveExtensions() {
+		return nil
+	}
+	e := []Extension{}
+	for _, ext := range t.tag().Extensions() {
+		e = append(e, Extension{ext})
+	}
+	return e
+}
+
+// TypeForKey returns the type associated with the given key, where key and type
+// are of the allowed values defined for the Unicode locale extension ('u') in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+// TypeForKey will traverse the inheritance chain to get the correct value.
+//
+// If there are multiple types associated with a key, only the first will be
+// returned. If there is no type associated with a key, it returns the empty
+// string.
+func (t Tag) TypeForKey(key string) string {
+	if !compact.Tag(t).MayHaveExtensions() {
+		if key != "rg" && key != "va" {
+			return ""
+		}
+	}
+	return t.tag().TypeForKey(key)
+}
+
+// SetTypeForKey returns a new Tag with the key set to type, where key and type
+// are of the allowed values defined for the Unicode locale extension ('u') in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+// An empty value removes an existing pair with the same key.
+func (t Tag) SetTypeForKey(key, value string) (Tag, error) {
+	tt, err := t.tag().SetTypeForKey(key, value)
+	return makeTag(tt), err
+}
+
+// NumCompactTags is the number of compact tags. The maximum tag is
+// NumCompactTags-1.
+const NumCompactTags = compact.NumCompactTags
+
+// CompactIndex returns an index, where 0 <= index < NumCompactTags, for tags
+// for which data exists in the text repository.The index will change over time
+// and should not be stored in persistent storage. If t does not match a compact
+// index, exact will be false and the compact index will be returned for the
+// first match after repeatedly taking the Parent of t.
+func CompactIndex(t Tag) (index int, exact bool) {
+	id, exact := compact.LanguageID(compact.Tag(t))
+	return int(id), exact
+}
+
+var root = language.Tag{}
+
+// Base is an ISO 639 language code, used for encoding the base language
+// of a language tag.
+type Base struct {
+	langID language.Language
+}
+
+// ParseBase parses a 2- or 3-letter ISO 639 code.
+// It returns a ValueError if s is a well-formed but unknown language identifier
+// or another error if another error occurred.
+func ParseBase(s string) (Base, error) {
+	l, err := language.ParseBase(s)
+	return Base{l}, err
+}
+
+// String returns the BCP 47 representation of the base language.
+func (b Base) String() string {
+	return b.langID.String()
+}
+
+// ISO3 returns the ISO 639-3 language code.
+func (b Base) ISO3() string {
+	return b.langID.ISO3()
+}
+
+// IsPrivateUse reports whether this language code is reserved for private use.
+func (b Base) IsPrivateUse() bool {
+	return b.langID.IsPrivateUse()
+}
+
+// Script is a 4-letter ISO 15924 code for representing scripts.
+// It is idiomatically represented in title case.
+type Script struct {
+	scriptID language.Script
+}
+
+// ParseScript parses a 4-letter ISO 15924 code.
+// It returns a ValueError if s is a well-formed but unknown script identifier
+// or another error if another error occurred.
+func ParseScript(s string) (Script, error) {
+	sc, err := language.ParseScript(s)
+	return Script{sc}, err
+}
+
+// String returns the script code in title case.
+// It returns "Zzzz" for an unspecified script.
+func (s Script) String() string {
+	return s.scriptID.String()
+}
+
+// IsPrivateUse reports whether this script code is reserved for private use.
+func (s Script) IsPrivateUse() bool {
+	return s.scriptID.IsPrivateUse()
+}
+
+// Region is an ISO 3166-1 or UN M.49 code for representing countries and regions.
+type Region struct {
+	regionID language.Region
+}
+
+// EncodeM49 returns the Region for the given UN M.49 code.
+// It returns an error if r is not a valid code.
+func EncodeM49(r int) (Region, error) {
+	rid, err := language.EncodeM49(r)
+	return Region{rid}, err
+}
+
+// ParseRegion parses a 2- or 3-letter ISO 3166-1 or a UN M.49 code.
+// It returns a ValueError if s is a well-formed but unknown region identifier
+// or another error if another error occurred.
+func ParseRegion(s string) (Region, error) {
+	r, err := language.ParseRegion(s)
+	return Region{r}, err
+}
+
+// String returns the BCP 47 representation for the region.
+// It returns "ZZ" for an unspecified region.
+func (r Region) String() string {
+	return r.regionID.String()
+}
+
+// ISO3 returns the 3-letter ISO code of r.
+// Note that not all regions have a 3-letter ISO code.
+// In such cases this method returns "ZZZ".
+func (r Region) ISO3() string {
+	return r.regionID.ISO3()
+}
+
+// M49 returns the UN M.49 encoding of r, or 0 if this encoding
+// is not defined for r.
+func (r Region) M49() int {
+	return r.regionID.M49()
+}
+
+// IsPrivateUse reports whether r has the ISO 3166 User-assigned status. This
+// may include private-use tags that are assigned by CLDR and used in this
+// implementation. So IsPrivateUse and IsCountry can be simultaneously true.
+func (r Region) IsPrivateUse() bool {
+	return r.regionID.IsPrivateUse()
+}
+
+// IsCountry returns whether this region is a country or autonomous area. This
+// includes non-standard definitions from CLDR.
+func (r Region) IsCountry() bool {
+	return r.regionID.IsCountry()
+}
+
+// IsGroup returns whether this region defines a collection of regions. This
+// includes non-standard definitions from CLDR.
+func (r Region) IsGroup() bool {
+	return r.regionID.IsGroup()
+}
+
+// Contains returns whether Region c is contained by Region r. It returns true
+// if c == r.
+func (r Region) Contains(c Region) bool {
+	return r.regionID.Contains(c.regionID)
+}
+
+// TLD returns the country code top-level domain (ccTLD). UK is returned for GB.
+// In all other cases it returns either the region itself or an error.
+//
+// This method may return an error for a region for which there exists a
+// canonical form with a ccTLD. To get that ccTLD canonicalize r first. The
+// region will already be canonicalized it was obtained from a Tag that was
+// obtained using any of the default methods.
+func (r Region) TLD() (Region, error) {
+	tld, err := r.regionID.TLD()
+	return Region{tld}, err
+}
+
+// Canonicalize returns the region or a possible replacement if the region is
+// deprecated. It will not return a replacement for deprecated regions that
+// are split into multiple regions.
+func (r Region) Canonicalize() Region {
+	return Region{r.regionID.Canonicalize()}
+}
+
+// Variant represents a registered variant of a language as defined by BCP 47.
+type Variant struct {
+	variant string
+}
+
+// ParseVariant parses and returns a Variant. An error is returned if s is not
+// a valid variant.
+func ParseVariant(s string) (Variant, error) {
+	v, err := language.ParseVariant(s)
+	return Variant{v.String()}, err
+}
+
+// String returns the string representation of the variant.
+func (v Variant) String() string {
+	return v.variant
+}
diff --git a/vendor/golang.org/x/text/language/match.go b/vendor/golang.org/x/text/language/match.go
new file mode 100644
index 000000000..1153baf29
--- /dev/null
+++ b/vendor/golang.org/x/text/language/match.go
@@ -0,0 +1,735 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import (
+	"errors"
+	"strings"
+
+	"golang.org/x/text/internal/language"
+)
+
+// A MatchOption configures a Matcher.
+type MatchOption func(*matcher)
+
+// PreferSameScript will, in the absence of a match, result in the first
+// preferred tag with the same script as a supported tag to match this supported
+// tag. The default is currently true, but this may change in the future.
+func PreferSameScript(preferSame bool) MatchOption {
+	return func(m *matcher) { m.preferSameScript = preferSame }
+}
+
+// TODO(v1.0.0): consider making Matcher a concrete type, instead of interface.
+// There doesn't seem to be too much need for multiple types.
+// Making it a concrete type allows MatchStrings to be a method, which will
+// improve its discoverability.
+
+// MatchStrings parses and matches the given strings until one of them matches
+// the language in the Matcher. A string may be an Accept-Language header as
+// handled by ParseAcceptLanguage. The default language is returned if no
+// other language matched.
+func MatchStrings(m Matcher, lang ...string) (tag Tag, index int) {
+	for _, accept := range lang {
+		desired, _, err := ParseAcceptLanguage(accept)
+		if err != nil {
+			continue
+		}
+		if tag, index, conf := m.Match(desired...); conf != No {
+			return tag, index
+		}
+	}
+	tag, index, _ = m.Match()
+	return
+}
+
+// Matcher is the interface that wraps the Match method.
+//
+// Match returns the best match for any of the given tags, along with
+// a unique index associated with the returned tag and a confidence
+// score.
+type Matcher interface {
+	Match(t ...Tag) (tag Tag, index int, c Confidence)
+}
+
+// Comprehends reports the confidence score for a speaker of a given language
+// to being able to comprehend the written form of an alternative language.
+func Comprehends(speaker, alternative Tag) Confidence {
+	_, _, c := NewMatcher([]Tag{alternative}).Match(speaker)
+	return c
+}
+
+// NewMatcher returns a Matcher that matches an ordered list of preferred tags
+// against a list of supported tags based on written intelligibility, closeness
+// of dialect, equivalence of subtags and various other rules. It is initialized
+// with the list of supported tags. The first element is used as the default
+// value in case no match is found.
+//
+// Its Match method matches the first of the given Tags to reach a certain
+// confidence threshold. The tags passed to Match should therefore be specified
+// in order of preference. Extensions are ignored for matching.
+//
+// The index returned by the Match method corresponds to the index of the
+// matched tag in t, but is augmented with the Unicode extension ('u')of the
+// corresponding preferred tag. This allows user locale options to be passed
+// transparently.
+func NewMatcher(t []Tag, options ...MatchOption) Matcher {
+	return newMatcher(t, options)
+}
+
+func (m *matcher) Match(want ...Tag) (t Tag, index int, c Confidence) {
+	var tt language.Tag
+	match, w, c := m.getBest(want...)
+	if match != nil {
+		tt, index = match.tag, match.index
+	} else {
+		// TODO: this should be an option
+		tt = m.default_.tag
+		if m.preferSameScript {
+		outer:
+			for _, w := range want {
+				script, _ := w.Script()
+				if script.scriptID == 0 {
+					// Don't do anything if there is no script, such as with
+					// private subtags.
+					continue
+				}
+				for i, h := range m.supported {
+					if script.scriptID == h.maxScript {
+						tt, index = h.tag, i
+						break outer
+					}
+				}
+			}
+		}
+		// TODO: select first language tag based on script.
+	}
+	if w.RegionID != tt.RegionID && w.RegionID != 0 {
+		if w.RegionID != 0 && tt.RegionID != 0 && tt.RegionID.Contains(w.RegionID) {
+			tt.RegionID = w.RegionID
+			tt.RemakeString()
+		} else if r := w.RegionID.String(); len(r) == 2 {
+			// TODO: also filter macro and deprecated.
+			tt, _ = tt.SetTypeForKey("rg", strings.ToLower(r)+"zzzz")
+		}
+	}
+	// Copy options from the user-provided tag into the result tag. This is hard
+	// to do after the fact, so we do it here.
+	// TODO: add in alternative variants to -u-va-.
+	// TODO: add preferred region to -u-rg-.
+	if e := w.Extensions(); len(e) > 0 {
+		b := language.Builder{}
+		b.SetTag(tt)
+		for _, e := range e {
+			b.AddExt(e)
+		}
+		tt = b.Make()
+	}
+	return makeTag(tt), index, c
+}
+
+// ErrMissingLikelyTagsData indicates no information was available
+// to compute likely values of missing tags.
+var ErrMissingLikelyTagsData = errors.New("missing likely tags data")
+
+// func (t *Tag) setTagsFrom(id Tag) {
+// 	t.LangID = id.LangID
+// 	t.ScriptID = id.ScriptID
+// 	t.RegionID = id.RegionID
+// }
+
+// Tag Matching
+// CLDR defines an algorithm for finding the best match between two sets of language
+// tags. The basic algorithm defines how to score a possible match and then find
+// the match with the best score
+// (see https://www.unicode.org/reports/tr35/#LanguageMatching).
+// Using scoring has several disadvantages. The scoring obfuscates the importance of
+// the various factors considered, making the algorithm harder to understand. Using
+// scoring also requires the full score to be computed for each pair of tags.
+//
+// We will use a different algorithm which aims to have the following properties:
+// - clarity on the precedence of the various selection factors, and
+// - improved performance by allowing early termination of a comparison.
+//
+// Matching algorithm (overview)
+// Input:
+//   - supported: a set of supported tags
+//   - default:   the default tag to return in case there is no match
+//   - desired:   list of desired tags, ordered by preference, starting with
+//                the most-preferred.
+//
+// Algorithm:
+//   1) Set the best match to the lowest confidence level
+//   2) For each tag in "desired":
+//     a) For each tag in "supported":
+//        1) compute the match between the two tags.
+//        2) if the match is better than the previous best match, replace it
+//           with the new match. (see next section)
+//     b) if the current best match is Exact and pin is true the result will be
+//        frozen to the language found thusfar, although better matches may
+//        still be found for the same language.
+//   3) If the best match so far is below a certain threshold, return "default".
+//
+// Ranking:
+// We use two phases to determine whether one pair of tags are a better match
+// than another pair of tags. First, we determine a rough confidence level. If the
+// levels are different, the one with the highest confidence wins.
+// Second, if the rough confidence levels are identical, we use a set of tie-breaker
+// rules.
+//
+// The confidence level of matching a pair of tags is determined by finding the
+// lowest confidence level of any matches of the corresponding subtags (the
+// result is deemed as good as its weakest link).
+// We define the following levels:
+//   Exact    - An exact match of a subtag, before adding likely subtags.
+//   MaxExact - An exact match of a subtag, after adding likely subtags.
+//              [See Note 2].
+//   High     - High level of mutual intelligibility between different subtag
+//              variants.
+//   Low      - Low level of mutual intelligibility between different subtag
+//              variants.
+//   No       - No mutual intelligibility.
+//
+// The following levels can occur for each type of subtag:
+//   Base:    Exact, MaxExact, High, Low, No
+//   Script:  Exact, MaxExact [see Note 3], Low, No
+//   Region:  Exact, MaxExact, High
+//   Variant: Exact, High
+//   Private: Exact, No
+//
+// Any result with a confidence level of Low or higher is deemed a possible match.
+// Once a desired tag matches any of the supported tags with a level of MaxExact
+// or higher, the next desired tag is not considered (see Step 2.b).
+// Note that CLDR provides languageMatching data that defines close equivalence
+// classes for base languages, scripts and regions.
+//
+// Tie-breaking
+// If we get the same confidence level for two matches, we apply a sequence of
+// tie-breaking rules. The first that succeeds defines the result. The rules are
+// applied in the following order.
+//   1) Original language was defined and was identical.
+//   2) Original region was defined and was identical.
+//   3) Distance between two maximized regions was the smallest.
+//   4) Original script was defined and was identical.
+//   5) Distance from want tag to have tag using the parent relation [see Note 5.]
+// If there is still no winner after these rules are applied, the first match
+// found wins.
+//
+// Notes:
+// [2] In practice, as matching of Exact is done in a separate phase from
+//     matching the other levels, we reuse the Exact level to mean MaxExact in
+//     the second phase. As a consequence, we only need the levels defined by
+//     the Confidence type. The MaxExact confidence level is mapped to High in
+//     the public API.
+// [3] We do not differentiate between maximized script values that were derived
+//     from suppressScript versus most likely tag data. We determined that in
+//     ranking the two, one ranks just after the other. Moreover, the two cannot
+//     occur concurrently. As a consequence, they are identical for practical
+//     purposes.
+// [4] In case of deprecated, macro-equivalents and legacy mappings, we assign
+//     the MaxExact level to allow iw vs he to still be a closer match than
+//     en-AU vs en-US, for example.
+// [5] In CLDR a locale inherits fields that are unspecified for this locale
+//     from its parent. Therefore, if a locale is a parent of another locale,
+//     it is a strong measure for closeness, especially when no other tie
+//     breaker rule applies. One could also argue it is inconsistent, for
+//     example, when pt-AO matches pt (which CLDR equates with pt-BR), even
+//     though its parent is pt-PT according to the inheritance rules.
+//
+// Implementation Details:
+// There are several performance considerations worth pointing out. Most notably,
+// we preprocess as much as possible (within reason) at the time of creation of a
+// matcher. This includes:
+//   - creating a per-language map, which includes data for the raw base language
+//     and its canonicalized variant (if applicable),
+//   - expanding entries for the equivalence classes defined in CLDR's
+//     languageMatch data.
+// The per-language map ensures that typically only a very small number of tags
+// need to be considered. The pre-expansion of canonicalized subtags and
+// equivalence classes reduces the amount of map lookups that need to be done at
+// runtime.
+
+// matcher keeps a set of supported language tags, indexed by language.
+type matcher struct {
+	default_         *haveTag
+	supported        []*haveTag
+	index            map[language.Language]*matchHeader
+	passSettings     bool
+	preferSameScript bool
+}
+
+// matchHeader has the lists of tags for exact matches and matches based on
+// maximized and canonicalized tags for a given language.
+type matchHeader struct {
+	haveTags []*haveTag
+	original bool
+}
+
+// haveTag holds a supported Tag and its maximized script and region. The maximized
+// or canonicalized language is not stored as it is not needed during matching.
+type haveTag struct {
+	tag language.Tag
+
+	// index of this tag in the original list of supported tags.
+	index int
+
+	// conf is the maximum confidence that can result from matching this haveTag.
+	// When conf < Exact this means it was inserted after applying a CLDR equivalence rule.
+	conf Confidence
+
+	// Maximized region and script.
+	maxRegion language.Region
+	maxScript language.Script
+
+	// altScript may be checked as an alternative match to maxScript. If altScript
+	// matches, the confidence level for this match is Low. Theoretically there
+	// could be multiple alternative scripts. This does not occur in practice.
+	altScript language.Script
+
+	// nextMax is the index of the next haveTag with the same maximized tags.
+	nextMax uint16
+}
+
+func makeHaveTag(tag language.Tag, index int) (haveTag, language.Language) {
+	max := tag
+	if tag.LangID != 0 || tag.RegionID != 0 || tag.ScriptID != 0 {
+		max, _ = canonicalize(All, max)
+		max, _ = max.Maximize()
+		max.RemakeString()
+	}
+	return haveTag{tag, index, Exact, max.RegionID, max.ScriptID, altScript(max.LangID, max.ScriptID), 0}, max.LangID
+}
+
+// altScript returns an alternative script that may match the given script with
+// a low confidence.  At the moment, the langMatch data allows for at most one
+// script to map to another and we rely on this to keep the code simple.
+func altScript(l language.Language, s language.Script) language.Script {
+	for _, alt := range matchScript {
+		// TODO: also match cases where language is not the same.
+		if (language.Language(alt.wantLang) == l || language.Language(alt.haveLang) == l) &&
+			language.Script(alt.haveScript) == s {
+			return language.Script(alt.wantScript)
+		}
+	}
+	return 0
+}
+
+// addIfNew adds a haveTag to the list of tags only if it is a unique tag.
+// Tags that have the same maximized values are linked by index.
+func (h *matchHeader) addIfNew(n haveTag, exact bool) {
+	h.original = h.original || exact
+	// Don't add new exact matches.
+	for _, v := range h.haveTags {
+		if equalsRest(v.tag, n.tag) {
+			return
+		}
+	}
+	// Allow duplicate maximized tags, but create a linked list to allow quickly
+	// comparing the equivalents and bail out.
+	for i, v := range h.haveTags {
+		if v.maxScript == n.maxScript &&
+			v.maxRegion == n.maxRegion &&
+			v.tag.VariantOrPrivateUseTags() == n.tag.VariantOrPrivateUseTags() {
+			for h.haveTags[i].nextMax != 0 {
+				i = int(h.haveTags[i].nextMax)
+			}
+			h.haveTags[i].nextMax = uint16(len(h.haveTags))
+			break
+		}
+	}
+	h.haveTags = append(h.haveTags, &n)
+}
+
+// header returns the matchHeader for the given language. It creates one if
+// it doesn't already exist.
+func (m *matcher) header(l language.Language) *matchHeader {
+	if h := m.index[l]; h != nil {
+		return h
+	}
+	h := &matchHeader{}
+	m.index[l] = h
+	return h
+}
+
+func toConf(d uint8) Confidence {
+	if d <= 10 {
+		return High
+	}
+	if d < 30 {
+		return Low
+	}
+	return No
+}
+
+// newMatcher builds an index for the given supported tags and returns it as
+// a matcher. It also expands the index by considering various equivalence classes
+// for a given tag.
+func newMatcher(supported []Tag, options []MatchOption) *matcher {
+	m := &matcher{
+		index:            make(map[language.Language]*matchHeader),
+		preferSameScript: true,
+	}
+	for _, o := range options {
+		o(m)
+	}
+	if len(supported) == 0 {
+		m.default_ = &haveTag{}
+		return m
+	}
+	// Add supported languages to the index. Add exact matches first to give
+	// them precedence.
+	for i, tag := range supported {
+		tt := tag.tag()
+		pair, _ := makeHaveTag(tt, i)
+		m.header(tt.LangID).addIfNew(pair, true)
+		m.supported = append(m.supported, &pair)
+	}
+	m.default_ = m.header(supported[0].lang()).haveTags[0]
+	// Keep these in two different loops to support the case that two equivalent
+	// languages are distinguished, such as iw and he.
+	for i, tag := range supported {
+		tt := tag.tag()
+		pair, max := makeHaveTag(tt, i)
+		if max != tt.LangID {
+			m.header(max).addIfNew(pair, true)
+		}
+	}
+
+	// update is used to add indexes in the map for equivalent languages.
+	// update will only add entries to original indexes, thus not computing any
+	// transitive relations.
+	update := func(want, have uint16, conf Confidence) {
+		if hh := m.index[language.Language(have)]; hh != nil {
+			if !hh.original {
+				return
+			}
+			hw := m.header(language.Language(want))
+			for _, ht := range hh.haveTags {
+				v := *ht
+				if conf < v.conf {
+					v.conf = conf
+				}
+				v.nextMax = 0 // this value needs to be recomputed
+				if v.altScript != 0 {
+					v.altScript = altScript(language.Language(want), v.maxScript)
+				}
+				hw.addIfNew(v, conf == Exact && hh.original)
+			}
+		}
+	}
+
+	// Add entries for languages with mutual intelligibility as defined by CLDR's
+	// languageMatch data.
+	for _, ml := range matchLang {
+		update(ml.want, ml.have, toConf(ml.distance))
+		if !ml.oneway {
+			update(ml.have, ml.want, toConf(ml.distance))
+		}
+	}
+
+	// Add entries for possible canonicalizations. This is an optimization to
+	// ensure that only one map lookup needs to be done at runtime per desired tag.
+	// First we match deprecated equivalents. If they are perfect equivalents
+	// (their canonicalization simply substitutes a different language code, but
+	// nothing else), the match confidence is Exact, otherwise it is High.
+	for i, lm := range language.AliasMap {
+		// If deprecated codes match and there is no fiddling with the script
+		// or region, we consider it an exact match.
+		conf := Exact
+		if language.AliasTypes[i] != language.Macro {
+			if !isExactEquivalent(language.Language(lm.From)) {
+				conf = High
+			}
+			update(lm.To, lm.From, conf)
+		}
+		update(lm.From, lm.To, conf)
+	}
+	return m
+}
+
+// getBest gets the best matching tag in m for any of the given tags, taking into
+// account the order of preference of the given tags.
+func (m *matcher) getBest(want ...Tag) (got *haveTag, orig language.Tag, c Confidence) {
+	best := bestMatch{}
+	for i, ww := range want {
+		w := ww.tag()
+		var max language.Tag
+		// Check for exact match first.
+		h := m.index[w.LangID]
+		if w.LangID != 0 {
+			if h == nil {
+				continue
+			}
+			// Base language is defined.
+			max, _ = canonicalize(Legacy|Deprecated|Macro, w)
+			// A region that is added through canonicalization is stronger than
+			// a maximized region: set it in the original (e.g. mo -> ro-MD).
+			if w.RegionID != max.RegionID {
+				w.RegionID = max.RegionID
+			}
+			// TODO: should we do the same for scripts?
+			// See test case: en, sr, nl ; sh ; sr
+			max, _ = max.Maximize()
+		} else {
+			// Base language is not defined.
+			if h != nil {
+				for i := range h.haveTags {
+					have := h.haveTags[i]
+					if equalsRest(have.tag, w) {
+						return have, w, Exact
+					}
+				}
+			}
+			if w.ScriptID == 0 && w.RegionID == 0 {
+				// We skip all tags matching und for approximate matching, including
+				// private tags.
+				continue
+			}
+			max, _ = w.Maximize()
+			if h = m.index[max.LangID]; h == nil {
+				continue
+			}
+		}
+		pin := true
+		for _, t := range want[i+1:] {
+			if w.LangID == t.lang() {
+				pin = false
+				break
+			}
+		}
+		// Check for match based on maximized tag.
+		for i := range h.haveTags {
+			have := h.haveTags[i]
+			best.update(have, w, max.ScriptID, max.RegionID, pin)
+			if best.conf == Exact {
+				for have.nextMax != 0 {
+					have = h.haveTags[have.nextMax]
+					best.update(have, w, max.ScriptID, max.RegionID, pin)
+				}
+				return best.have, best.want, best.conf
+			}
+		}
+	}
+	if best.conf <= No {
+		if len(want) != 0 {
+			return nil, want[0].tag(), No
+		}
+		return nil, language.Tag{}, No
+	}
+	return best.have, best.want, best.conf
+}
+
+// bestMatch accumulates the best match so far.
+type bestMatch struct {
+	have            *haveTag
+	want            language.Tag
+	conf            Confidence
+	pinnedRegion    language.Region
+	pinLanguage     bool
+	sameRegionGroup bool
+	// Cached results from applying tie-breaking rules.
+	origLang     bool
+	origReg      bool
+	paradigmReg  bool
+	regGroupDist uint8
+	origScript   bool
+}
+
+// update updates the existing best match if the new pair is considered to be a
+// better match. To determine if the given pair is a better match, it first
+// computes the rough confidence level. If this surpasses the current match, it
+// will replace it and update the tie-breaker rule cache. If there is a tie, it
+// proceeds with applying a series of tie-breaker rules. If there is no
+// conclusive winner after applying the tie-breaker rules, it leaves the current
+// match as the preferred match.
+//
+// If pin is true and have and tag are a strong match, it will henceforth only
+// consider matches for this language. This corresponds to the idea that most
+// users have a strong preference for the first defined language. A user can
+// still prefer a second language over a dialect of the preferred language by
+// explicitly specifying dialects, e.g. "en, nl, en-GB". In this case pin should
+// be false.
+func (m *bestMatch) update(have *haveTag, tag language.Tag, maxScript language.Script, maxRegion language.Region, pin bool) {
+	// Bail if the maximum attainable confidence is below that of the current best match.
+	c := have.conf
+	if c < m.conf {
+		return
+	}
+	// Don't change the language once we already have found an exact match.
+	if m.pinLanguage && tag.LangID != m.want.LangID {
+		return
+	}
+	// Pin the region group if we are comparing tags for the same language.
+	if tag.LangID == m.want.LangID && m.sameRegionGroup {
+		_, sameGroup := regionGroupDist(m.pinnedRegion, have.maxRegion, have.maxScript, m.want.LangID)
+		if !sameGroup {
+			return
+		}
+	}
+	if c == Exact && have.maxScript == maxScript {
+		// If there is another language and then another entry of this language,
+		// don't pin anything, otherwise pin the language.
+		m.pinLanguage = pin
+	}
+	if equalsRest(have.tag, tag) {
+	} else if have.maxScript != maxScript {
+		// There is usually very little comprehension between different scripts.
+		// In a few cases there may still be Low comprehension. This possibility
+		// is pre-computed and stored in have.altScript.
+		if Low < m.conf || have.altScript != maxScript {
+			return
+		}
+		c = Low
+	} else if have.maxRegion != maxRegion {
+		if High < c {
+			// There is usually a small difference between languages across regions.
+			c = High
+		}
+	}
+
+	// We store the results of the computations of the tie-breaker rules along
+	// with the best match. There is no need to do the checks once we determine
+	// we have a winner, but we do still need to do the tie-breaker computations.
+	// We use "beaten" to keep track if we still need to do the checks.
+	beaten := false // true if the new pair defeats the current one.
+	if c != m.conf {
+		if c < m.conf {
+			return
+		}
+		beaten = true
+	}
+
+	// Tie-breaker rules:
+	// We prefer if the pre-maximized language was specified and identical.
+	origLang := have.tag.LangID == tag.LangID && tag.LangID != 0
+	if !beaten && m.origLang != origLang {
+		if m.origLang {
+			return
+		}
+		beaten = true
+	}
+
+	// We prefer if the pre-maximized region was specified and identical.
+	origReg := have.tag.RegionID == tag.RegionID && tag.RegionID != 0
+	if !beaten && m.origReg != origReg {
+		if m.origReg {
+			return
+		}
+		beaten = true
+	}
+
+	regGroupDist, sameGroup := regionGroupDist(have.maxRegion, maxRegion, maxScript, tag.LangID)
+	if !beaten && m.regGroupDist != regGroupDist {
+		if regGroupDist > m.regGroupDist {
+			return
+		}
+		beaten = true
+	}
+
+	paradigmReg := isParadigmLocale(tag.LangID, have.maxRegion)
+	if !beaten && m.paradigmReg != paradigmReg {
+		if !paradigmReg {
+			return
+		}
+		beaten = true
+	}
+
+	// Next we prefer if the pre-maximized script was specified and identical.
+	origScript := have.tag.ScriptID == tag.ScriptID && tag.ScriptID != 0
+	if !beaten && m.origScript != origScript {
+		if m.origScript {
+			return
+		}
+		beaten = true
+	}
+
+	// Update m to the newly found best match.
+	if beaten {
+		m.have = have
+		m.want = tag
+		m.conf = c
+		m.pinnedRegion = maxRegion
+		m.sameRegionGroup = sameGroup
+		m.origLang = origLang
+		m.origReg = origReg
+		m.paradigmReg = paradigmReg
+		m.origScript = origScript
+		m.regGroupDist = regGroupDist
+	}
+}
+
+func isParadigmLocale(lang language.Language, r language.Region) bool {
+	for _, e := range paradigmLocales {
+		if language.Language(e[0]) == lang && (r == language.Region(e[1]) || r == language.Region(e[2])) {
+			return true
+		}
+	}
+	return false
+}
+
+// regionGroupDist computes the distance between two regions based on their
+// CLDR grouping.
+func regionGroupDist(a, b language.Region, script language.Script, lang language.Language) (dist uint8, same bool) {
+	const defaultDistance = 4
+
+	aGroup := uint(regionToGroups[a]) << 1
+	bGroup := uint(regionToGroups[b]) << 1
+	for _, ri := range matchRegion {
+		if language.Language(ri.lang) == lang && (ri.script == 0 || language.Script(ri.script) == script) {
+			group := uint(1 << (ri.group &^ 0x80))
+			if 0x80&ri.group == 0 {
+				if aGroup&bGroup&group != 0 { // Both regions are in the group.
+					return ri.distance, ri.distance == defaultDistance
+				}
+			} else {
+				if (aGroup|bGroup)&group == 0 { // Both regions are not in the group.
+					return ri.distance, ri.distance == defaultDistance
+				}
+			}
+		}
+	}
+	return defaultDistance, true
+}
+
+// equalsRest compares everything except the language.
+func equalsRest(a, b language.Tag) bool {
+	// TODO: don't include extensions in this comparison. To do this efficiently,
+	// though, we should handle private tags separately.
+	return a.ScriptID == b.ScriptID && a.RegionID == b.RegionID && a.VariantOrPrivateUseTags() == b.VariantOrPrivateUseTags()
+}
+
+// isExactEquivalent returns true if canonicalizing the language will not alter
+// the script or region of a tag.
+func isExactEquivalent(l language.Language) bool {
+	for _, o := range notEquivalent {
+		if o == l {
+			return false
+		}
+	}
+	return true
+}
+
+var notEquivalent []language.Language
+
+func init() {
+	// Create a list of all languages for which canonicalization may alter the
+	// script or region.
+	for _, lm := range language.AliasMap {
+		tag := language.Tag{LangID: language.Language(lm.From)}
+		if tag, _ = canonicalize(All, tag); tag.ScriptID != 0 || tag.RegionID != 0 {
+			notEquivalent = append(notEquivalent, language.Language(lm.From))
+		}
+	}
+	// Maximize undefined regions of paradigm locales.
+	for i, v := range paradigmLocales {
+		t := language.Tag{LangID: language.Language(v[0])}
+		max, _ := t.Maximize()
+		if v[1] == 0 {
+			paradigmLocales[i][1] = uint16(max.RegionID)
+		}
+		if v[2] == 0 {
+			paradigmLocales[i][2] = uint16(max.RegionID)
+		}
+	}
+}
diff --git a/vendor/golang.org/x/text/language/parse.go b/vendor/golang.org/x/text/language/parse.go
new file mode 100644
index 000000000..053336e28
--- /dev/null
+++ b/vendor/golang.org/x/text/language/parse.go
@@ -0,0 +1,256 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import (
+	"errors"
+	"sort"
+	"strconv"
+	"strings"
+
+	"golang.org/x/text/internal/language"
+)
+
+// ValueError is returned by any of the parsing functions when the
+// input is well-formed but the respective subtag is not recognized
+// as a valid value.
+type ValueError interface {
+	error
+
+	// Subtag returns the subtag for which the error occurred.
+	Subtag() string
+}
+
+// Parse parses the given BCP 47 string and returns a valid Tag. If parsing
+// failed it returns an error and any part of the tag that could be parsed.
+// If parsing succeeded but an unknown value was found, it returns
+// ValueError. The Tag returned in this case is just stripped of the unknown
+// value. All other values are preserved. It accepts tags in the BCP 47 format
+// and extensions to this standard defined in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+// The resulting tag is canonicalized using the default canonicalization type.
+func Parse(s string) (t Tag, err error) {
+	return Default.Parse(s)
+}
+
+// Parse parses the given BCP 47 string and returns a valid Tag. If parsing
+// failed it returns an error and any part of the tag that could be parsed.
+// If parsing succeeded but an unknown value was found, it returns
+// ValueError. The Tag returned in this case is just stripped of the unknown
+// value. All other values are preserved. It accepts tags in the BCP 47 format
+// and extensions to this standard defined in
+// https://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
+// The resulting tag is canonicalized using the canonicalization type c.
+func (c CanonType) Parse(s string) (t Tag, err error) {
+	defer func() {
+		if recover() != nil {
+			t = Tag{}
+			err = language.ErrSyntax
+		}
+	}()
+
+	tt, err := language.Parse(s)
+	if err != nil {
+		return makeTag(tt), err
+	}
+	tt, changed := canonicalize(c, tt)
+	if changed {
+		tt.RemakeString()
+	}
+	return makeTag(tt), nil
+}
+
+// Compose creates a Tag from individual parts, which may be of type Tag, Base,
+// Script, Region, Variant, []Variant, Extension, []Extension or error. If a
+// Base, Script or Region or slice of type Variant or Extension is passed more
+// than once, the latter will overwrite the former. Variants and Extensions are
+// accumulated, but if two extensions of the same type are passed, the latter
+// will replace the former. For -u extensions, though, the key-type pairs are
+// added, where later values overwrite older ones. A Tag overwrites all former
+// values and typically only makes sense as the first argument. The resulting
+// tag is returned after canonicalizing using the Default CanonType. If one or
+// more errors are encountered, one of the errors is returned.
+func Compose(part ...interface{}) (t Tag, err error) {
+	return Default.Compose(part...)
+}
+
+// Compose creates a Tag from individual parts, which may be of type Tag, Base,
+// Script, Region, Variant, []Variant, Extension, []Extension or error. If a
+// Base, Script or Region or slice of type Variant or Extension is passed more
+// than once, the latter will overwrite the former. Variants and Extensions are
+// accumulated, but if two extensions of the same type are passed, the latter
+// will replace the former. For -u extensions, though, the key-type pairs are
+// added, where later values overwrite older ones. A Tag overwrites all former
+// values and typically only makes sense as the first argument. The resulting
+// tag is returned after canonicalizing using CanonType c. If one or more errors
+// are encountered, one of the errors is returned.
+func (c CanonType) Compose(part ...interface{}) (t Tag, err error) {
+	defer func() {
+		if recover() != nil {
+			t = Tag{}
+			err = language.ErrSyntax
+		}
+	}()
+
+	var b language.Builder
+	if err = update(&b, part...); err != nil {
+		return und, err
+	}
+	b.Tag, _ = canonicalize(c, b.Tag)
+	return makeTag(b.Make()), err
+}
+
+var errInvalidArgument = errors.New("invalid Extension or Variant")
+
+func update(b *language.Builder, part ...interface{}) (err error) {
+	for _, x := range part {
+		switch v := x.(type) {
+		case Tag:
+			b.SetTag(v.tag())
+		case Base:
+			b.Tag.LangID = v.langID
+		case Script:
+			b.Tag.ScriptID = v.scriptID
+		case Region:
+			b.Tag.RegionID = v.regionID
+		case Variant:
+			if v.variant == "" {
+				err = errInvalidArgument
+				break
+			}
+			b.AddVariant(v.variant)
+		case Extension:
+			if v.s == "" {
+				err = errInvalidArgument
+				break
+			}
+			b.SetExt(v.s)
+		case []Variant:
+			b.ClearVariants()
+			for _, v := range v {
+				b.AddVariant(v.variant)
+			}
+		case []Extension:
+			b.ClearExtensions()
+			for _, e := range v {
+				b.SetExt(e.s)
+			}
+		// TODO: support parsing of raw strings based on morphology or just extensions?
+		case error:
+			if v != nil {
+				err = v
+			}
+		}
+	}
+	return
+}
+
+var errInvalidWeight = errors.New("ParseAcceptLanguage: invalid weight")
+var errTagListTooLarge = errors.New("tag list exceeds max length")
+
+// ParseAcceptLanguage parses the contents of an Accept-Language header as
+// defined in http://www.ietf.org/rfc/rfc2616.txt and returns a list of Tags and
+// a list of corresponding quality weights. It is more permissive than RFC 2616
+// and may return non-nil slices even if the input is not valid.
+// The Tags will be sorted by highest weight first and then by first occurrence.
+// Tags with a weight of zero will be dropped. An error will be returned if the
+// input could not be parsed.
+func ParseAcceptLanguage(s string) (tag []Tag, q []float32, err error) {
+	defer func() {
+		if recover() != nil {
+			tag = nil
+			q = nil
+			err = language.ErrSyntax
+		}
+	}()
+
+	if strings.Count(s, "-") > 1000 {
+		return nil, nil, errTagListTooLarge
+	}
+
+	var entry string
+	for s != "" {
+		if entry, s = split(s, ','); entry == "" {
+			continue
+		}
+
+		entry, weight := split(entry, ';')
+
+		// Scan the language.
+		t, err := Parse(entry)
+		if err != nil {
+			id, ok := acceptFallback[entry]
+			if !ok {
+				return nil, nil, err
+			}
+			t = makeTag(language.Tag{LangID: id})
+		}
+
+		// Scan the optional weight.
+		w := 1.0
+		if weight != "" {
+			weight = consume(weight, 'q')
+			weight = consume(weight, '=')
+			// consume returns the empty string when a token could not be
+			// consumed, resulting in an error for ParseFloat.
+			if w, err = strconv.ParseFloat(weight, 32); err != nil {
+				return nil, nil, errInvalidWeight
+			}
+			// Drop tags with a quality weight of 0.
+			if w <= 0 {
+				continue
+			}
+		}
+
+		tag = append(tag, t)
+		q = append(q, float32(w))
+	}
+	sort.Stable(&tagSort{tag, q})
+	return tag, q, nil
+}
+
+// consume removes a leading token c from s and returns the result or the empty
+// string if there is no such token.
+func consume(s string, c byte) string {
+	if s == "" || s[0] != c {
+		return ""
+	}
+	return strings.TrimSpace(s[1:])
+}
+
+func split(s string, c byte) (head, tail string) {
+	if i := strings.IndexByte(s, c); i >= 0 {
+		return strings.TrimSpace(s[:i]), strings.TrimSpace(s[i+1:])
+	}
+	return strings.TrimSpace(s), ""
+}
+
+// Add hack mapping to deal with a small number of cases that occur
+// in Accept-Language (with reasonable frequency).
+var acceptFallback = map[string]language.Language{
+	"english": _en,
+	"deutsch": _de,
+	"italian": _it,
+	"french":  _fr,
+	"*":       _mul, // defined in the spec to match all languages.
+}
+
+type tagSort struct {
+	tag []Tag
+	q   []float32
+}
+
+func (s *tagSort) Len() int {
+	return len(s.q)
+}
+
+func (s *tagSort) Less(i, j int) bool {
+	return s.q[i] > s.q[j]
+}
+
+func (s *tagSort) Swap(i, j int) {
+	s.tag[i], s.tag[j] = s.tag[j], s.tag[i]
+	s.q[i], s.q[j] = s.q[j], s.q[i]
+}
diff --git a/vendor/golang.org/x/text/language/tables.go b/vendor/golang.org/x/text/language/tables.go
new file mode 100644
index 000000000..a6573dcb2
--- /dev/null
+++ b/vendor/golang.org/x/text/language/tables.go
@@ -0,0 +1,298 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+package language
+
+// CLDRVersion is the CLDR version from which the tables in this package are derived.
+const CLDRVersion = "32"
+
+const (
+	_de  = 269
+	_en  = 313
+	_fr  = 350
+	_it  = 505
+	_mo  = 784
+	_no  = 879
+	_nb  = 839
+	_pt  = 960
+	_sh  = 1031
+	_mul = 806
+	_und = 0
+)
+const (
+	_001 = 1
+	_419 = 31
+	_BR  = 65
+	_CA  = 73
+	_ES  = 111
+	_GB  = 124
+	_MD  = 189
+	_PT  = 239
+	_UK  = 307
+	_US  = 310
+	_ZZ  = 358
+	_XA  = 324
+	_XC  = 326
+	_XK  = 334
+)
+const (
+	_Latn = 91
+	_Hani = 57
+	_Hans = 59
+	_Hant = 60
+	_Qaaa = 149
+	_Qaai = 157
+	_Qabx = 198
+	_Zinh = 255
+	_Zyyy = 260
+	_Zzzz = 261
+)
+
+var regionToGroups = []uint8{ // 359 elements
+	// Entry 0 - 3F
+	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00,
+	0x00, 0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x04,
+	// Entry 40 - 7F
+	0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00,
+	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04,
+	// Entry 80 - BF
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
+	0x00, 0x00, 0x04, 0x01, 0x00, 0x04, 0x02, 0x00,
+	0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00,
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x04,
+	// Entry C0 - FF
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+	0x01, 0x04, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x05, 0x00, 0x00,
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	// Entry 100 - 13F
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x04,
+	0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x05, 0x00,
+	// Entry 140 - 17F
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+} // Size: 383 bytes
+
+var paradigmLocales = [][3]uint16{ // 3 elements
+	0: [3]uint16{0x139, 0x0, 0x7c},
+	1: [3]uint16{0x13e, 0x0, 0x1f},
+	2: [3]uint16{0x3c0, 0x41, 0xef},
+} // Size: 42 bytes
+
+type mutualIntelligibility struct {
+	want     uint16
+	have     uint16
+	distance uint8
+	oneway   bool
+}
+type scriptIntelligibility struct {
+	wantLang   uint16
+	haveLang   uint16
+	wantScript uint8
+	haveScript uint8
+	distance   uint8
+}
+type regionIntelligibility struct {
+	lang     uint16
+	script   uint8
+	group    uint8
+	distance uint8
+}
+
+// matchLang holds pairs of langIDs of base languages that are typically
+// mutually intelligible. Each pair is associated with a confidence and
+// whether the intelligibility goes one or both ways.
+var matchLang = []mutualIntelligibility{ // 113 elements
+	0:   {want: 0x1d1, have: 0xb7, distance: 0x4, oneway: false},
+	1:   {want: 0x407, have: 0xb7, distance: 0x4, oneway: false},
+	2:   {want: 0x407, have: 0x1d1, distance: 0x4, oneway: false},
+	3:   {want: 0x407, have: 0x432, distance: 0x4, oneway: false},
+	4:   {want: 0x43a, have: 0x1, distance: 0x4, oneway: false},
+	5:   {want: 0x1a3, have: 0x10d, distance: 0x4, oneway: true},
+	6:   {want: 0x295, have: 0x10d, distance: 0x4, oneway: true},
+	7:   {want: 0x101, have: 0x36f, distance: 0x8, oneway: false},
+	8:   {want: 0x101, have: 0x347, distance: 0x8, oneway: false},
+	9:   {want: 0x5, have: 0x3e2, distance: 0xa, oneway: true},
+	10:  {want: 0xd, have: 0x139, distance: 0xa, oneway: true},
+	11:  {want: 0x16, have: 0x367, distance: 0xa, oneway: true},
+	12:  {want: 0x21, have: 0x139, distance: 0xa, oneway: true},
+	13:  {want: 0x56, have: 0x13e, distance: 0xa, oneway: true},
+	14:  {want: 0x58, have: 0x3e2, distance: 0xa, oneway: true},
+	15:  {want: 0x71, have: 0x3e2, distance: 0xa, oneway: true},
+	16:  {want: 0x75, have: 0x139, distance: 0xa, oneway: true},
+	17:  {want: 0x82, have: 0x1be, distance: 0xa, oneway: true},
+	18:  {want: 0xa5, have: 0x139, distance: 0xa, oneway: true},
+	19:  {want: 0xb2, have: 0x15e, distance: 0xa, oneway: true},
+	20:  {want: 0xdd, have: 0x153, distance: 0xa, oneway: true},
+	21:  {want: 0xe5, have: 0x139, distance: 0xa, oneway: true},
+	22:  {want: 0xe9, have: 0x3a, distance: 0xa, oneway: true},
+	23:  {want: 0xf0, have: 0x15e, distance: 0xa, oneway: true},
+	24:  {want: 0xf9, have: 0x15e, distance: 0xa, oneway: true},
+	25:  {want: 0x100, have: 0x139, distance: 0xa, oneway: true},
+	26:  {want: 0x130, have: 0x139, distance: 0xa, oneway: true},
+	27:  {want: 0x13c, have: 0x139, distance: 0xa, oneway: true},
+	28:  {want: 0x140, have: 0x151, distance: 0xa, oneway: true},
+	29:  {want: 0x145, have: 0x13e, distance: 0xa, oneway: true},
+	30:  {want: 0x158, have: 0x101, distance: 0xa, oneway: true},
+	31:  {want: 0x16d, have: 0x367, distance: 0xa, oneway: true},
+	32:  {want: 0x16e, have: 0x139, distance: 0xa, oneway: true},
+	33:  {want: 0x16f, have: 0x139, distance: 0xa, oneway: true},
+	34:  {want: 0x17e, have: 0x139, distance: 0xa, oneway: true},
+	35:  {want: 0x190, have: 0x13e, distance: 0xa, oneway: true},
+	36:  {want: 0x194, have: 0x13e, distance: 0xa, oneway: true},
+	37:  {want: 0x1a4, have: 0x1be, distance: 0xa, oneway: true},
+	38:  {want: 0x1b4, have: 0x139, distance: 0xa, oneway: true},
+	39:  {want: 0x1b8, have: 0x139, distance: 0xa, oneway: true},
+	40:  {want: 0x1d4, have: 0x15e, distance: 0xa, oneway: true},
+	41:  {want: 0x1d7, have: 0x3e2, distance: 0xa, oneway: true},
+	42:  {want: 0x1d9, have: 0x139, distance: 0xa, oneway: true},
+	43:  {want: 0x1e7, have: 0x139, distance: 0xa, oneway: true},
+	44:  {want: 0x1f8, have: 0x139, distance: 0xa, oneway: true},
+	45:  {want: 0x20e, have: 0x1e1, distance: 0xa, oneway: true},
+	46:  {want: 0x210, have: 0x139, distance: 0xa, oneway: true},
+	47:  {want: 0x22d, have: 0x15e, distance: 0xa, oneway: true},
+	48:  {want: 0x242, have: 0x3e2, distance: 0xa, oneway: true},
+	49:  {want: 0x24a, have: 0x139, distance: 0xa, oneway: true},
+	50:  {want: 0x251, have: 0x139, distance: 0xa, oneway: true},
+	51:  {want: 0x265, have: 0x139, distance: 0xa, oneway: true},
+	52:  {want: 0x274, have: 0x48a, distance: 0xa, oneway: true},
+	53:  {want: 0x28a, have: 0x3e2, distance: 0xa, oneway: true},
+	54:  {want: 0x28e, have: 0x1f9, distance: 0xa, oneway: true},
+	55:  {want: 0x2a3, have: 0x139, distance: 0xa, oneway: true},
+	56:  {want: 0x2b5, have: 0x15e, distance: 0xa, oneway: true},
+	57:  {want: 0x2b8, have: 0x139, distance: 0xa, oneway: true},
+	58:  {want: 0x2be, have: 0x139, distance: 0xa, oneway: true},
+	59:  {want: 0x2c3, have: 0x15e, distance: 0xa, oneway: true},
+	60:  {want: 0x2ed, have: 0x139, distance: 0xa, oneway: true},
+	61:  {want: 0x2f1, have: 0x15e, distance: 0xa, oneway: true},
+	62:  {want: 0x2fa, have: 0x139, distance: 0xa, oneway: true},
+	63:  {want: 0x2ff, have: 0x7e, distance: 0xa, oneway: true},
+	64:  {want: 0x304, have: 0x139, distance: 0xa, oneway: true},
+	65:  {want: 0x30b, have: 0x3e2, distance: 0xa, oneway: true},
+	66:  {want: 0x31b, have: 0x1be, distance: 0xa, oneway: true},
+	67:  {want: 0x31f, have: 0x1e1, distance: 0xa, oneway: true},
+	68:  {want: 0x320, have: 0x139, distance: 0xa, oneway: true},
+	69:  {want: 0x331, have: 0x139, distance: 0xa, oneway: true},
+	70:  {want: 0x351, have: 0x139, distance: 0xa, oneway: true},
+	71:  {want: 0x36a, have: 0x347, distance: 0xa, oneway: false},
+	72:  {want: 0x36a, have: 0x36f, distance: 0xa, oneway: true},
+	73:  {want: 0x37a, have: 0x139, distance: 0xa, oneway: true},
+	74:  {want: 0x387, have: 0x139, distance: 0xa, oneway: true},
+	75:  {want: 0x389, have: 0x139, distance: 0xa, oneway: true},
+	76:  {want: 0x38b, have: 0x15e, distance: 0xa, oneway: true},
+	77:  {want: 0x390, have: 0x139, distance: 0xa, oneway: true},
+	78:  {want: 0x395, have: 0x139, distance: 0xa, oneway: true},
+	79:  {want: 0x39d, have: 0x139, distance: 0xa, oneway: true},
+	80:  {want: 0x3a5, have: 0x139, distance: 0xa, oneway: true},
+	81:  {want: 0x3be, have: 0x139, distance: 0xa, oneway: true},
+	82:  {want: 0x3c4, have: 0x13e, distance: 0xa, oneway: true},
+	83:  {want: 0x3d4, have: 0x10d, distance: 0xa, oneway: true},
+	84:  {want: 0x3d9, have: 0x139, distance: 0xa, oneway: true},
+	85:  {want: 0x3e5, have: 0x15e, distance: 0xa, oneway: true},
+	86:  {want: 0x3e9, have: 0x1be, distance: 0xa, oneway: true},
+	87:  {want: 0x3fa, have: 0x139, distance: 0xa, oneway: true},
+	88:  {want: 0x40c, have: 0x139, distance: 0xa, oneway: true},
+	89:  {want: 0x423, have: 0x139, distance: 0xa, oneway: true},
+	90:  {want: 0x429, have: 0x139, distance: 0xa, oneway: true},
+	91:  {want: 0x431, have: 0x139, distance: 0xa, oneway: true},
+	92:  {want: 0x43b, have: 0x139, distance: 0xa, oneway: true},
+	93:  {want: 0x43e, have: 0x1e1, distance: 0xa, oneway: true},
+	94:  {want: 0x445, have: 0x139, distance: 0xa, oneway: true},
+	95:  {want: 0x450, have: 0x139, distance: 0xa, oneway: true},
+	96:  {want: 0x461, have: 0x139, distance: 0xa, oneway: true},
+	97:  {want: 0x467, have: 0x3e2, distance: 0xa, oneway: true},
+	98:  {want: 0x46f, have: 0x139, distance: 0xa, oneway: true},
+	99:  {want: 0x476, have: 0x3e2, distance: 0xa, oneway: true},
+	100: {want: 0x3883, have: 0x139, distance: 0xa, oneway: true},
+	101: {want: 0x480, have: 0x139, distance: 0xa, oneway: true},
+	102: {want: 0x482, have: 0x139, distance: 0xa, oneway: true},
+	103: {want: 0x494, have: 0x3e2, distance: 0xa, oneway: true},
+	104: {want: 0x49d, have: 0x139, distance: 0xa, oneway: true},
+	105: {want: 0x4ac, have: 0x529, distance: 0xa, oneway: true},
+	106: {want: 0x4b4, have: 0x139, distance: 0xa, oneway: true},
+	107: {want: 0x4bc, have: 0x3e2, distance: 0xa, oneway: true},
+	108: {want: 0x4e5, have: 0x15e, distance: 0xa, oneway: true},
+	109: {want: 0x4f2, have: 0x139, distance: 0xa, oneway: true},
+	110: {want: 0x512, have: 0x139, distance: 0xa, oneway: true},
+	111: {want: 0x518, have: 0x139, distance: 0xa, oneway: true},
+	112: {want: 0x52f, have: 0x139, distance: 0xa, oneway: true},
+} // Size: 702 bytes
+
+// matchScript holds pairs of scriptIDs where readers of one script
+// can typically also read the other. Each is associated with a confidence.
+var matchScript = []scriptIntelligibility{ // 26 elements
+	0:  {wantLang: 0x432, haveLang: 0x432, wantScript: 0x5b, haveScript: 0x20, distance: 0x5},
+	1:  {wantLang: 0x432, haveLang: 0x432, wantScript: 0x20, haveScript: 0x5b, distance: 0x5},
+	2:  {wantLang: 0x58, haveLang: 0x3e2, wantScript: 0x5b, haveScript: 0x20, distance: 0xa},
+	3:  {wantLang: 0xa5, haveLang: 0x139, wantScript: 0xe, haveScript: 0x5b, distance: 0xa},
+	4:  {wantLang: 0x1d7, haveLang: 0x3e2, wantScript: 0x8, haveScript: 0x20, distance: 0xa},
+	5:  {wantLang: 0x210, haveLang: 0x139, wantScript: 0x2e, haveScript: 0x5b, distance: 0xa},
+	6:  {wantLang: 0x24a, haveLang: 0x139, wantScript: 0x4f, haveScript: 0x5b, distance: 0xa},
+	7:  {wantLang: 0x251, haveLang: 0x139, wantScript: 0x53, haveScript: 0x5b, distance: 0xa},
+	8:  {wantLang: 0x2b8, haveLang: 0x139, wantScript: 0x58, haveScript: 0x5b, distance: 0xa},
+	9:  {wantLang: 0x304, haveLang: 0x139, wantScript: 0x6f, haveScript: 0x5b, distance: 0xa},
+	10: {wantLang: 0x331, haveLang: 0x139, wantScript: 0x76, haveScript: 0x5b, distance: 0xa},
+	11: {wantLang: 0x351, haveLang: 0x139, wantScript: 0x22, haveScript: 0x5b, distance: 0xa},
+	12: {wantLang: 0x395, haveLang: 0x139, wantScript: 0x83, haveScript: 0x5b, distance: 0xa},
+	13: {wantLang: 0x39d, haveLang: 0x139, wantScript: 0x36, haveScript: 0x5b, distance: 0xa},
+	14: {wantLang: 0x3be, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5b, distance: 0xa},
+	15: {wantLang: 0x3fa, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5b, distance: 0xa},
+	16: {wantLang: 0x40c, haveLang: 0x139, wantScript: 0xd6, haveScript: 0x5b, distance: 0xa},
+	17: {wantLang: 0x450, haveLang: 0x139, wantScript: 0xe6, haveScript: 0x5b, distance: 0xa},
+	18: {wantLang: 0x461, haveLang: 0x139, wantScript: 0xe9, haveScript: 0x5b, distance: 0xa},
+	19: {wantLang: 0x46f, haveLang: 0x139, wantScript: 0x2c, haveScript: 0x5b, distance: 0xa},
+	20: {wantLang: 0x476, haveLang: 0x3e2, wantScript: 0x5b, haveScript: 0x20, distance: 0xa},
+	21: {wantLang: 0x4b4, haveLang: 0x139, wantScript: 0x5, haveScript: 0x5b, distance: 0xa},
+	22: {wantLang: 0x4bc, haveLang: 0x3e2, wantScript: 0x5b, haveScript: 0x20, distance: 0xa},
+	23: {wantLang: 0x512, haveLang: 0x139, wantScript: 0x3e, haveScript: 0x5b, distance: 0xa},
+	24: {wantLang: 0x529, haveLang: 0x529, wantScript: 0x3b, haveScript: 0x3c, distance: 0xf},
+	25: {wantLang: 0x529, haveLang: 0x529, wantScript: 0x3c, haveScript: 0x3b, distance: 0x13},
+} // Size: 232 bytes
+
+var matchRegion = []regionIntelligibility{ // 15 elements
+	0:  {lang: 0x3a, script: 0x0, group: 0x4, distance: 0x4},
+	1:  {lang: 0x3a, script: 0x0, group: 0x84, distance: 0x4},
+	2:  {lang: 0x139, script: 0x0, group: 0x1, distance: 0x4},
+	3:  {lang: 0x139, script: 0x0, group: 0x81, distance: 0x4},
+	4:  {lang: 0x13e, script: 0x0, group: 0x3, distance: 0x4},
+	5:  {lang: 0x13e, script: 0x0, group: 0x83, distance: 0x4},
+	6:  {lang: 0x3c0, script: 0x0, group: 0x3, distance: 0x4},
+	7:  {lang: 0x3c0, script: 0x0, group: 0x83, distance: 0x4},
+	8:  {lang: 0x529, script: 0x3c, group: 0x2, distance: 0x4},
+	9:  {lang: 0x529, script: 0x3c, group: 0x82, distance: 0x4},
+	10: {lang: 0x3a, script: 0x0, group: 0x80, distance: 0x5},
+	11: {lang: 0x139, script: 0x0, group: 0x80, distance: 0x5},
+	12: {lang: 0x13e, script: 0x0, group: 0x80, distance: 0x5},
+	13: {lang: 0x3c0, script: 0x0, group: 0x80, distance: 0x5},
+	14: {lang: 0x529, script: 0x3c, group: 0x80, distance: 0x5},
+} // Size: 114 bytes
+
+// Total table size 1473 bytes (1KiB); checksum: 7BB90B5C
diff --git a/vendor/golang.org/x/text/language/tags.go b/vendor/golang.org/x/text/language/tags.go
new file mode 100644
index 000000000..42ea79266
--- /dev/null
+++ b/vendor/golang.org/x/text/language/tags.go
@@ -0,0 +1,145 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package language
+
+import "golang.org/x/text/internal/language/compact"
+
+// TODO: Various sets of commonly use tags and regions.
+
+// MustParse is like Parse, but panics if the given BCP 47 tag cannot be parsed.
+// It simplifies safe initialization of Tag values.
+func MustParse(s string) Tag {
+	t, err := Parse(s)
+	if err != nil {
+		panic(err)
+	}
+	return t
+}
+
+// MustParse is like Parse, but panics if the given BCP 47 tag cannot be parsed.
+// It simplifies safe initialization of Tag values.
+func (c CanonType) MustParse(s string) Tag {
+	t, err := c.Parse(s)
+	if err != nil {
+		panic(err)
+	}
+	return t
+}
+
+// MustParseBase is like ParseBase, but panics if the given base cannot be parsed.
+// It simplifies safe initialization of Base values.
+func MustParseBase(s string) Base {
+	b, err := ParseBase(s)
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
+
+// MustParseScript is like ParseScript, but panics if the given script cannot be
+// parsed. It simplifies safe initialization of Script values.
+func MustParseScript(s string) Script {
+	scr, err := ParseScript(s)
+	if err != nil {
+		panic(err)
+	}
+	return scr
+}
+
+// MustParseRegion is like ParseRegion, but panics if the given region cannot be
+// parsed. It simplifies safe initialization of Region values.
+func MustParseRegion(s string) Region {
+	r, err := ParseRegion(s)
+	if err != nil {
+		panic(err)
+	}
+	return r
+}
+
+var (
+	und = Tag{}
+
+	Und Tag = Tag{}
+
+	Afrikaans            Tag = Tag(compact.Afrikaans)
+	Amharic              Tag = Tag(compact.Amharic)
+	Arabic               Tag = Tag(compact.Arabic)
+	ModernStandardArabic Tag = Tag(compact.ModernStandardArabic)
+	Azerbaijani          Tag = Tag(compact.Azerbaijani)
+	Bulgarian            Tag = Tag(compact.Bulgarian)
+	Bengali              Tag = Tag(compact.Bengali)
+	Catalan              Tag = Tag(compact.Catalan)
+	Czech                Tag = Tag(compact.Czech)
+	Danish               Tag = Tag(compact.Danish)
+	German               Tag = Tag(compact.German)
+	Greek                Tag = Tag(compact.Greek)
+	English              Tag = Tag(compact.English)
+	AmericanEnglish      Tag = Tag(compact.AmericanEnglish)
+	BritishEnglish       Tag = Tag(compact.BritishEnglish)
+	Spanish              Tag = Tag(compact.Spanish)
+	EuropeanSpanish      Tag = Tag(compact.EuropeanSpanish)
+	LatinAmericanSpanish Tag = Tag(compact.LatinAmericanSpanish)
+	Estonian             Tag = Tag(compact.Estonian)
+	Persian              Tag = Tag(compact.Persian)
+	Finnish              Tag = Tag(compact.Finnish)
+	Filipino             Tag = Tag(compact.Filipino)
+	French               Tag = Tag(compact.French)
+	CanadianFrench       Tag = Tag(compact.CanadianFrench)
+	Gujarati             Tag = Tag(compact.Gujarati)
+	Hebrew               Tag = Tag(compact.Hebrew)
+	Hindi                Tag = Tag(compact.Hindi)
+	Croatian             Tag = Tag(compact.Croatian)
+	Hungarian            Tag = Tag(compact.Hungarian)
+	Armenian             Tag = Tag(compact.Armenian)
+	Indonesian           Tag = Tag(compact.Indonesian)
+	Icelandic            Tag = Tag(compact.Icelandic)
+	Italian              Tag = Tag(compact.Italian)
+	Japanese             Tag = Tag(compact.Japanese)
+	Georgian             Tag = Tag(compact.Georgian)
+	Kazakh               Tag = Tag(compact.Kazakh)
+	Khmer                Tag = Tag(compact.Khmer)
+	Kannada              Tag = Tag(compact.Kannada)
+	Korean               Tag = Tag(compact.Korean)
+	Kirghiz              Tag = Tag(compact.Kirghiz)
+	Lao                  Tag = Tag(compact.Lao)
+	Lithuanian           Tag = Tag(compact.Lithuanian)
+	Latvian              Tag = Tag(compact.Latvian)
+	Macedonian           Tag = Tag(compact.Macedonian)
+	Malayalam            Tag = Tag(compact.Malayalam)
+	Mongolian            Tag = Tag(compact.Mongolian)
+	Marathi              Tag = Tag(compact.Marathi)
+	Malay                Tag = Tag(compact.Malay)
+	Burmese              Tag = Tag(compact.Burmese)
+	Nepali               Tag = Tag(compact.Nepali)
+	Dutch                Tag = Tag(compact.Dutch)
+	Norwegian            Tag = Tag(compact.Norwegian)
+	Punjabi              Tag = Tag(compact.Punjabi)
+	Polish               Tag = Tag(compact.Polish)
+	Portuguese           Tag = Tag(compact.Portuguese)
+	BrazilianPortuguese  Tag = Tag(compact.BrazilianPortuguese)
+	EuropeanPortuguese   Tag = Tag(compact.EuropeanPortuguese)
+	Romanian             Tag = Tag(compact.Romanian)
+	Russian              Tag = Tag(compact.Russian)
+	Sinhala              Tag = Tag(compact.Sinhala)
+	Slovak               Tag = Tag(compact.Slovak)
+	Slovenian            Tag = Tag(compact.Slovenian)
+	Albanian             Tag = Tag(compact.Albanian)
+	Serbian              Tag = Tag(compact.Serbian)
+	SerbianLatin         Tag = Tag(compact.SerbianLatin)
+	Swedish              Tag = Tag(compact.Swedish)
+	Swahili              Tag = Tag(compact.Swahili)
+	Tamil                Tag = Tag(compact.Tamil)
+	Telugu               Tag = Tag(compact.Telugu)
+	Thai                 Tag = Tag(compact.Thai)
+	Turkish              Tag = Tag(compact.Turkish)
+	Ukrainian            Tag = Tag(compact.Ukrainian)
+	Urdu                 Tag = Tag(compact.Urdu)
+	Uzbek                Tag = Tag(compact.Uzbek)
+	Vietnamese           Tag = Tag(compact.Vietnamese)
+	Chinese              Tag = Tag(compact.Chinese)
+	SimplifiedChinese    Tag = Tag(compact.SimplifiedChinese)
+	TraditionalChinese   Tag = Tag(compact.TraditionalChinese)
+	Zulu                 Tag = Tag(compact.Zulu)
+)
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
index f3a234e5f..b3cf5d9bd 100644
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -121,8 +121,12 @@ func (p Properties) BoundaryAfter() bool {
 //
 // When all 6 bits are zero, the character is inert, meaning it is never
 // influenced by normalization.
+//
+// We set flags to 0x80 (high bit 7 unused in quick check data) to indicate an invalid rune.
 type qcInfo uint8
 
+func (p Properties) isInvalid() bool { return p.flags == 0x80 }
+
 func (p Properties) isYesC() bool { return p.flags&0x10 == 0 }
 func (p Properties) isYesD() bool { return p.flags&0x4 == 0 }
 
@@ -247,6 +251,9 @@ func (f Form) PropertiesString(s string) Properties {
 // to a Properties.  See the comment at the top of the file
 // for more information on the format.
 func compInfo(v uint16, sz int) Properties {
+	if sz == 0 {
+		return Properties{flags: 0x80, size: 1}
+	}
 	if v == 0 {
 		return Properties{size: uint8(sz)}
 	} else if v >= 0x8000 {
@@ -254,7 +261,7 @@ func compInfo(v uint16, sz int) Properties {
 			size:  uint8(sz),
 			ccc:   uint8(v),
 			tccc:  uint8(v),
-			flags: qcInfo(v >> 8),
+			flags: qcInfo(v>>8) & 0x3f,
 		}
 		if p.ccc > 0 || p.combinesBackward() {
 			p.nLead = uint8(p.flags & 0x3)
diff --git a/vendor/golang.org/x/text/unicode/norm/iter.go b/vendor/golang.org/x/text/unicode/norm/iter.go
index 417c6b268..3cc059224 100644
--- a/vendor/golang.org/x/text/unicode/norm/iter.go
+++ b/vendor/golang.org/x/text/unicode/norm/iter.go
@@ -376,16 +376,12 @@ func nextComposed(i *Iter) []byte {
 			goto doNorm
 		}
 		prevCC = i.info.tccc
-		sz := int(i.info.size)
-		if sz == 0 {
-			sz = 1 // illegal rune: copy byte-by-byte
-		}
-		p := outp + sz
+		p := outp + int(i.info.size)
 		if p > len(i.buf) {
 			break
 		}
 		outp = p
-		i.p += sz
+		i.p += int(i.info.size)
 		if i.p >= i.rb.nsrc {
 			i.setDone()
 			break
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
index 4747ad07a..60b1511ca 100644
--- a/vendor/golang.org/x/text/unicode/norm/normalize.go
+++ b/vendor/golang.org/x/text/unicode/norm/normalize.go
@@ -148,7 +148,7 @@ func (f Form) IsNormalString(s string) bool {
 // patched buffer and whether the decomposition is still in progress.
 func patchTail(rb *reorderBuffer) bool {
 	info, p := lastRuneStart(&rb.f, rb.out)
-	if p == -1 || info.size == 0 {
+	if p == -1 || info.isInvalid() {
 		return true
 	}
 	end := p + int(info.size)
@@ -225,7 +225,7 @@ func doAppend(rb *reorderBuffer, out []byte, p int) []byte {
 	}
 	fd := &rb.f
 	if doMerge {
-		var info Properties
+		info := Properties{flags: 0x80, size: 1} // invalid rune
 		if p < n {
 			info = fd.info(src, p)
 			if !info.BoundaryBefore() || info.nLeadingNonStarters() > 0 {
@@ -235,7 +235,7 @@ func doAppend(rb *reorderBuffer, out []byte, p int) []byte {
 				p = decomposeSegment(rb, p, true)
 			}
 		}
-		if info.size == 0 {
+		if info.isInvalid() {
 			rb.doFlush()
 			// Append incomplete UTF-8 encoding.
 			return src.appendSlice(rb.out, p, n)
@@ -314,7 +314,7 @@ func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool)
 			continue
 		}
 		info := f.info(src, i)
-		if info.size == 0 {
+		if info.isInvalid() {
 			if atEOF {
 				// include incomplete runes
 				return n, true
@@ -379,7 +379,7 @@ func (f Form) firstBoundary(src input, nsrc int) int {
 	// CGJ insertion points correctly. Luckily it doesn't have to.
 	for {
 		info := fd.info(src, i)
-		if info.size == 0 {
+		if info.isInvalid() {
 			return -1
 		}
 		if s := ss.next(info); s != ssSuccess {
@@ -424,7 +424,7 @@ func (f Form) nextBoundary(src input, nsrc int, atEOF bool) int {
 	}
 	fd := formTable[f]
 	info := fd.info(src, 0)
-	if info.size == 0 {
+	if info.isInvalid() {
 		if atEOF {
 			return 1
 		}
@@ -435,7 +435,7 @@ func (f Form) nextBoundary(src input, nsrc int, atEOF bool) int {
 
 	for i := int(info.size); i < nsrc; i += int(info.size) {
 		info = fd.info(src, i)
-		if info.size == 0 {
+		if info.isInvalid() {
 			if atEOF {
 				return i
 			}
@@ -465,7 +465,7 @@ func lastBoundary(fd *formInfo, b []byte) int {
 	if p == -1 {
 		return -1
 	}
-	if info.size == 0 { // ends with incomplete rune
+	if info.isInvalid() { // ends with incomplete rune
 		if p == 0 { // starts with incomplete rune
 			return -1
 		}
@@ -504,7 +504,7 @@ func lastBoundary(fd *formInfo, b []byte) int {
 func decomposeSegment(rb *reorderBuffer, sp int, atEOF bool) int {
 	// Force one character to be consumed.
 	info := rb.f.info(rb.src, sp)
-	if info.size == 0 {
+	if info.isInvalid() {
 		return 0
 	}
 	if s := rb.ss.next(info); s == ssStarter {
@@ -528,7 +528,7 @@ func decomposeSegment(rb *reorderBuffer, sp int, atEOF bool) int {
 			break
 		}
 		info = rb.f.info(rb.src, sp)
-		if info.size == 0 {
+		if info.isInvalid() {
 			if !atEOF {
 				return int(iShortSrc)
 			}
diff --git a/vendor/golang.org/x/net/LICENSE b/vendor/golang.org/x/tools/LICENSE
similarity index 100%
rename from vendor/golang.org/x/net/LICENSE
rename to vendor/golang.org/x/tools/LICENSE
diff --git a/vendor/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/tools/PATENTS
similarity index 100%
rename from vendor/golang.org/x/crypto/PATENTS
rename to vendor/golang.org/x/tools/PATENTS
diff --git a/vendor/golang.org/x/tools/go/ast/astutil/enclosing.go b/vendor/golang.org/x/tools/go/ast/astutil/enclosing.go
new file mode 100644
index 000000000..0fb4e7eea
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/ast/astutil/enclosing.go
@@ -0,0 +1,663 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package astutil
+
+// This file defines utilities for working with source positions.
+
+import (
+	"fmt"
+	"go/ast"
+	"go/token"
+	"sort"
+)
+
+// PathEnclosingInterval returns the node that encloses the source
+// interval [start, end), and all its ancestors up to the AST root.
+//
+// The definition of "enclosing" used by this function considers
+// additional whitespace abutting a node to be enclosed by it.
+// In this example:
+//
+//	z := x + y // add them
+//	     <-A->
+//	    <----B----->
+//
+// the ast.BinaryExpr(+) node is considered to enclose interval B
+// even though its [Pos()..End()) is actually only interval A.
+// This behaviour makes user interfaces more tolerant of imperfect
+// input.
+//
+// This function treats tokens as nodes, though they are not included
+// in the result. e.g. PathEnclosingInterval("+") returns the
+// enclosing ast.BinaryExpr("x + y").
+//
+// If start==end, the 1-char interval following start is used instead.
+//
+// The 'exact' result is true if the interval contains only path[0]
+// and perhaps some adjacent whitespace.  It is false if the interval
+// overlaps multiple children of path[0], or if it contains only
+// interior whitespace of path[0].
+// In this example:
+//
+//	z := x + y // add them
+//	  <--C-->     <---E-->
+//	    ^
+//	    D
+//
+// intervals C, D and E are inexact.  C is contained by the
+// z-assignment statement, because it spans three of its children (:=,
+// x, +).  So too is the 1-char interval D, because it contains only
+// interior whitespace of the assignment.  E is considered interior
+// whitespace of the BlockStmt containing the assignment.
+//
+// The resulting path is never empty; it always contains at least the
+// 'root' *ast.File.  Ideally PathEnclosingInterval would reject
+// intervals that lie wholly or partially outside the range of the
+// file, but unfortunately ast.File records only the token.Pos of
+// the 'package' keyword, but not of the start of the file itself.
+func PathEnclosingInterval(root *ast.File, start, end token.Pos) (path []ast.Node, exact bool) {
+	// fmt.Printf("EnclosingInterval %d %d\n", start, end) // debugging
+
+	// Precondition: node.[Pos..End) and adjoining whitespace contain [start, end).
+	var visit func(node ast.Node) bool
+	visit = func(node ast.Node) bool {
+		path = append(path, node)
+
+		nodePos := node.Pos()
+		nodeEnd := node.End()
+
+		// fmt.Printf("visit(%T, %d, %d)\n", node, nodePos, nodeEnd) // debugging
+
+		// Intersect [start, end) with interval of node.
+		if start < nodePos {
+			start = nodePos
+		}
+		if end > nodeEnd {
+			end = nodeEnd
+		}
+
+		// Find sole child that contains [start, end).
+		children := childrenOf(node)
+		l := len(children)
+		for i, child := range children {
+			// [childPos, childEnd) is unaugmented interval of child.
+			childPos := child.Pos()
+			childEnd := child.End()
+
+			// [augPos, augEnd) is whitespace-augmented interval of child.
+			augPos := childPos
+			augEnd := childEnd
+			if i > 0 {
+				augPos = children[i-1].End() // start of preceding whitespace
+			}
+			if i < l-1 {
+				nextChildPos := children[i+1].Pos()
+				// Does [start, end) lie between child and next child?
+				if start >= augEnd && end <= nextChildPos {
+					return false // inexact match
+				}
+				augEnd = nextChildPos // end of following whitespace
+			}
+
+			// fmt.Printf("\tchild %d: [%d..%d)\tcontains interval [%d..%d)?\n",
+			// 	i, augPos, augEnd, start, end) // debugging
+
+			// Does augmented child strictly contain [start, end)?
+			if augPos <= start && end <= augEnd {
+				if is[tokenNode](child) {
+					return true
+				}
+
+				// childrenOf elides the FuncType node beneath FuncDecl.
+				// Add it back here for TypeParams, Params, Results,
+				// all FieldLists). But we don't add it back for the "func" token
+				// even though it is the tree at FuncDecl.Type.Func.
+				if decl, ok := node.(*ast.FuncDecl); ok {
+					if fields, ok := child.(*ast.FieldList); ok && fields != decl.Recv {
+						path = append(path, decl.Type)
+					}
+				}
+
+				return visit(child)
+			}
+
+			// Does [start, end) overlap multiple children?
+			// i.e. left-augmented child contains start
+			// but LR-augmented child does not contain end.
+			if start < childEnd && end > augEnd {
+				break
+			}
+		}
+
+		// No single child contained [start, end),
+		// so node is the result.  Is it exact?
+
+		// (It's tempting to put this condition before the
+		// child loop, but it gives the wrong result in the
+		// case where a node (e.g. ExprStmt) and its sole
+		// child have equal intervals.)
+		if start == nodePos && end == nodeEnd {
+			return true // exact match
+		}
+
+		return false // inexact: overlaps multiple children
+	}
+
+	// Ensure [start,end) is nondecreasing.
+	if start > end {
+		start, end = end, start
+	}
+
+	if start < root.End() && end > root.Pos() {
+		if start == end {
+			end = start + 1 // empty interval => interval of size 1
+		}
+		exact = visit(root)
+
+		// Reverse the path:
+		for i, l := 0, len(path); i < l/2; i++ {
+			path[i], path[l-1-i] = path[l-1-i], path[i]
+		}
+	} else {
+		// Selection lies within whitespace preceding the
+		// first (or following the last) declaration in the file.
+		// The result nonetheless always includes the ast.File.
+		path = append(path, root)
+	}
+
+	return
+}
+
+// tokenNode is a dummy implementation of ast.Node for a single token.
+// They are used transiently by PathEnclosingInterval but never escape
+// this package.
+type tokenNode struct {
+	pos token.Pos
+	end token.Pos
+}
+
+func (n tokenNode) Pos() token.Pos {
+	return n.pos
+}
+
+func (n tokenNode) End() token.Pos {
+	return n.end
+}
+
+func tok(pos token.Pos, len int) ast.Node {
+	return tokenNode{pos, pos + token.Pos(len)}
+}
+
+// childrenOf returns the direct non-nil children of ast.Node n.
+// It may include fake ast.Node implementations for bare tokens.
+// it is not safe to call (e.g.) ast.Walk on such nodes.
+func childrenOf(n ast.Node) []ast.Node {
+	var children []ast.Node
+
+	// First add nodes for all true subtrees.
+	ast.Inspect(n, func(node ast.Node) bool {
+		if node == n { // push n
+			return true // recur
+		}
+		if node != nil { // push child
+			children = append(children, node)
+		}
+		return false // no recursion
+	})
+
+	// TODO(adonovan): be more careful about missing (!Pos.Valid)
+	// tokens in trees produced from invalid input.
+
+	// Then add fake Nodes for bare tokens.
+	switch n := n.(type) {
+	case *ast.ArrayType:
+		children = append(children,
+			tok(n.Lbrack, len("[")),
+			tok(n.Elt.End(), len("]")))
+
+	case *ast.AssignStmt:
+		children = append(children,
+			tok(n.TokPos, len(n.Tok.String())))
+
+	case *ast.BasicLit:
+		children = append(children,
+			tok(n.ValuePos, len(n.Value)))
+
+	case *ast.BinaryExpr:
+		children = append(children, tok(n.OpPos, len(n.Op.String())))
+
+	case *ast.BlockStmt:
+		if n.Lbrace.IsValid() {
+			children = append(children, tok(n.Lbrace, len("{")))
+		}
+		if n.Rbrace.IsValid() {
+			children = append(children, tok(n.Rbrace, len("}")))
+		}
+
+	case *ast.BranchStmt:
+		children = append(children,
+			tok(n.TokPos, len(n.Tok.String())))
+
+	case *ast.CallExpr:
+		children = append(children,
+			tok(n.Lparen, len("(")),
+			tok(n.Rparen, len(")")))
+		if n.Ellipsis != 0 {
+			children = append(children, tok(n.Ellipsis, len("...")))
+		}
+
+	case *ast.CaseClause:
+		if n.List == nil {
+			children = append(children,
+				tok(n.Case, len("default")))
+		} else {
+			children = append(children,
+				tok(n.Case, len("case")))
+		}
+		children = append(children, tok(n.Colon, len(":")))
+
+	case *ast.ChanType:
+		switch n.Dir {
+		case ast.RECV:
+			children = append(children, tok(n.Begin, len("<-chan")))
+		case ast.SEND:
+			children = append(children, tok(n.Begin, len("chan<-")))
+		case ast.RECV | ast.SEND:
+			children = append(children, tok(n.Begin, len("chan")))
+		}
+
+	case *ast.CommClause:
+		if n.Comm == nil {
+			children = append(children,
+				tok(n.Case, len("default")))
+		} else {
+			children = append(children,
+				tok(n.Case, len("case")))
+		}
+		children = append(children, tok(n.Colon, len(":")))
+
+	case *ast.Comment:
+		// nop
+
+	case *ast.CommentGroup:
+		// nop
+
+	case *ast.CompositeLit:
+		children = append(children,
+			tok(n.Lbrace, len("{")),
+			tok(n.Rbrace, len("{")))
+
+	case *ast.DeclStmt:
+		// nop
+
+	case *ast.DeferStmt:
+		children = append(children,
+			tok(n.Defer, len("defer")))
+
+	case *ast.Ellipsis:
+		children = append(children,
+			tok(n.Ellipsis, len("...")))
+
+	case *ast.EmptyStmt:
+		// nop
+
+	case *ast.ExprStmt:
+		// nop
+
+	case *ast.Field:
+		// TODO(adonovan): Field.{Doc,Comment,Tag}?
+
+	case *ast.FieldList:
+		if n.Opening.IsValid() {
+			children = append(children, tok(n.Opening, len("(")))
+		}
+		if n.Closing.IsValid() {
+			children = append(children, tok(n.Closing, len(")")))
+		}
+
+	case *ast.File:
+		// TODO test: Doc
+		children = append(children,
+			tok(n.Package, len("package")))
+
+	case *ast.ForStmt:
+		children = append(children,
+			tok(n.For, len("for")))
+
+	case *ast.FuncDecl:
+		// TODO(adonovan): FuncDecl.Comment?
+
+		// Uniquely, FuncDecl breaks the invariant that
+		// preorder traversal yields tokens in lexical order:
+		// in fact, FuncDecl.Recv precedes FuncDecl.Type.Func.
+		//
+		// As a workaround, we inline the case for FuncType
+		// here and order things correctly.
+		// We also need to insert the elided FuncType just
+		// before the 'visit' recursion.
+		//
+		children = nil // discard ast.Walk(FuncDecl) info subtrees
+		children = append(children, tok(n.Type.Func, len("func")))
+		if n.Recv != nil {
+			children = append(children, n.Recv)
+		}
+		children = append(children, n.Name)
+		if tparams := n.Type.TypeParams; tparams != nil {
+			children = append(children, tparams)
+		}
+		if n.Type.Params != nil {
+			children = append(children, n.Type.Params)
+		}
+		if n.Type.Results != nil {
+			children = append(children, n.Type.Results)
+		}
+		if n.Body != nil {
+			children = append(children, n.Body)
+		}
+
+	case *ast.FuncLit:
+		// nop
+
+	case *ast.FuncType:
+		if n.Func != 0 {
+			children = append(children,
+				tok(n.Func, len("func")))
+		}
+
+	case *ast.GenDecl:
+		children = append(children,
+			tok(n.TokPos, len(n.Tok.String())))
+		if n.Lparen != 0 {
+			children = append(children,
+				tok(n.Lparen, len("(")),
+				tok(n.Rparen, len(")")))
+		}
+
+	case *ast.GoStmt:
+		children = append(children,
+			tok(n.Go, len("go")))
+
+	case *ast.Ident:
+		children = append(children,
+			tok(n.NamePos, len(n.Name)))
+
+	case *ast.IfStmt:
+		children = append(children,
+			tok(n.If, len("if")))
+
+	case *ast.ImportSpec:
+		// TODO(adonovan): ImportSpec.{Doc,EndPos}?
+
+	case *ast.IncDecStmt:
+		children = append(children,
+			tok(n.TokPos, len(n.Tok.String())))
+
+	case *ast.IndexExpr:
+		children = append(children,
+			tok(n.Lbrack, len("[")),
+			tok(n.Rbrack, len("]")))
+
+	case *ast.IndexListExpr:
+		children = append(children,
+			tok(n.Lbrack, len("[")),
+			tok(n.Rbrack, len("]")))
+
+	case *ast.InterfaceType:
+		children = append(children,
+			tok(n.Interface, len("interface")))
+
+	case *ast.KeyValueExpr:
+		children = append(children,
+			tok(n.Colon, len(":")))
+
+	case *ast.LabeledStmt:
+		children = append(children,
+			tok(n.Colon, len(":")))
+
+	case *ast.MapType:
+		children = append(children,
+			tok(n.Map, len("map")))
+
+	case *ast.ParenExpr:
+		children = append(children,
+			tok(n.Lparen, len("(")),
+			tok(n.Rparen, len(")")))
+
+	case *ast.RangeStmt:
+		children = append(children,
+			tok(n.For, len("for")),
+			tok(n.TokPos, len(n.Tok.String())))
+
+	case *ast.ReturnStmt:
+		children = append(children,
+			tok(n.Return, len("return")))
+
+	case *ast.SelectStmt:
+		children = append(children,
+			tok(n.Select, len("select")))
+
+	case *ast.SelectorExpr:
+		// nop
+
+	case *ast.SendStmt:
+		children = append(children,
+			tok(n.Arrow, len("<-")))
+
+	case *ast.SliceExpr:
+		children = append(children,
+			tok(n.Lbrack, len("[")),
+			tok(n.Rbrack, len("]")))
+
+	case *ast.StarExpr:
+		children = append(children, tok(n.Star, len("*")))
+
+	case *ast.StructType:
+		children = append(children, tok(n.Struct, len("struct")))
+
+	case *ast.SwitchStmt:
+		children = append(children, tok(n.Switch, len("switch")))
+
+	case *ast.TypeAssertExpr:
+		children = append(children,
+			tok(n.Lparen-1, len(".")),
+			tok(n.Lparen, len("(")),
+			tok(n.Rparen, len(")")))
+
+	case *ast.TypeSpec:
+		// TODO(adonovan): TypeSpec.{Doc,Comment}?
+
+	case *ast.TypeSwitchStmt:
+		children = append(children, tok(n.Switch, len("switch")))
+
+	case *ast.UnaryExpr:
+		children = append(children, tok(n.OpPos, len(n.Op.String())))
+
+	case *ast.ValueSpec:
+		// TODO(adonovan): ValueSpec.{Doc,Comment}?
+
+	case *ast.BadDecl, *ast.BadExpr, *ast.BadStmt:
+		// nop
+	}
+
+	// TODO(adonovan): opt: merge the logic of ast.Inspect() into
+	// the switch above so we can make interleaved callbacks for
+	// both Nodes and Tokens in the right order and avoid the need
+	// to sort.
+	sort.Sort(byPos(children))
+
+	return children
+}
+
+type byPos []ast.Node
+
+func (sl byPos) Len() int {
+	return len(sl)
+}
+func (sl byPos) Less(i, j int) bool {
+	return sl[i].Pos() < sl[j].Pos()
+}
+func (sl byPos) Swap(i, j int) {
+	sl[i], sl[j] = sl[j], sl[i]
+}
+
+// NodeDescription returns a description of the concrete type of n suitable
+// for a user interface.
+//
+// TODO(adonovan): in some cases (e.g. Field, FieldList, Ident,
+// StarExpr) we could be much more specific given the path to the AST
+// root.  Perhaps we should do that.
+func NodeDescription(n ast.Node) string {
+	switch n := n.(type) {
+	case *ast.ArrayType:
+		return "array type"
+	case *ast.AssignStmt:
+		return "assignment"
+	case *ast.BadDecl:
+		return "bad declaration"
+	case *ast.BadExpr:
+		return "bad expression"
+	case *ast.BadStmt:
+		return "bad statement"
+	case *ast.BasicLit:
+		return "basic literal"
+	case *ast.BinaryExpr:
+		return fmt.Sprintf("binary %s operation", n.Op)
+	case *ast.BlockStmt:
+		return "block"
+	case *ast.BranchStmt:
+		switch n.Tok {
+		case token.BREAK:
+			return "break statement"
+		case token.CONTINUE:
+			return "continue statement"
+		case token.GOTO:
+			return "goto statement"
+		case token.FALLTHROUGH:
+			return "fall-through statement"
+		}
+	case *ast.CallExpr:
+		if len(n.Args) == 1 && !n.Ellipsis.IsValid() {
+			return "function call (or conversion)"
+		}
+		return "function call"
+	case *ast.CaseClause:
+		return "case clause"
+	case *ast.ChanType:
+		return "channel type"
+	case *ast.CommClause:
+		return "communication clause"
+	case *ast.Comment:
+		return "comment"
+	case *ast.CommentGroup:
+		return "comment group"
+	case *ast.CompositeLit:
+		return "composite literal"
+	case *ast.DeclStmt:
+		return NodeDescription(n.Decl) + " statement"
+	case *ast.DeferStmt:
+		return "defer statement"
+	case *ast.Ellipsis:
+		return "ellipsis"
+	case *ast.EmptyStmt:
+		return "empty statement"
+	case *ast.ExprStmt:
+		return "expression statement"
+	case *ast.Field:
+		// Can be any of these:
+		// struct {x, y int}  -- struct field(s)
+		// struct {T}         -- anon struct field
+		// interface {I}      -- interface embedding
+		// interface {f()}    -- interface method
+		// func (A) func(B) C -- receiver, param(s), result(s)
+		return "field/method/parameter"
+	case *ast.FieldList:
+		return "field/method/parameter list"
+	case *ast.File:
+		return "source file"
+	case *ast.ForStmt:
+		return "for loop"
+	case *ast.FuncDecl:
+		return "function declaration"
+	case *ast.FuncLit:
+		return "function literal"
+	case *ast.FuncType:
+		return "function type"
+	case *ast.GenDecl:
+		switch n.Tok {
+		case token.IMPORT:
+			return "import declaration"
+		case token.CONST:
+			return "constant declaration"
+		case token.TYPE:
+			return "type declaration"
+		case token.VAR:
+			return "variable declaration"
+		}
+	case *ast.GoStmt:
+		return "go statement"
+	case *ast.Ident:
+		return "identifier"
+	case *ast.IfStmt:
+		return "if statement"
+	case *ast.ImportSpec:
+		return "import specification"
+	case *ast.IncDecStmt:
+		if n.Tok == token.INC {
+			return "increment statement"
+		}
+		return "decrement statement"
+	case *ast.IndexExpr:
+		return "index expression"
+	case *ast.IndexListExpr:
+		return "index list expression"
+	case *ast.InterfaceType:
+		return "interface type"
+	case *ast.KeyValueExpr:
+		return "key/value association"
+	case *ast.LabeledStmt:
+		return "statement label"
+	case *ast.MapType:
+		return "map type"
+	case *ast.Package:
+		return "package"
+	case *ast.ParenExpr:
+		return "parenthesized " + NodeDescription(n.X)
+	case *ast.RangeStmt:
+		return "range loop"
+	case *ast.ReturnStmt:
+		return "return statement"
+	case *ast.SelectStmt:
+		return "select statement"
+	case *ast.SelectorExpr:
+		return "selector"
+	case *ast.SendStmt:
+		return "channel send"
+	case *ast.SliceExpr:
+		return "slice expression"
+	case *ast.StarExpr:
+		return "*-operation" // load/store expr or pointer type
+	case *ast.StructType:
+		return "struct type"
+	case *ast.SwitchStmt:
+		return "switch statement"
+	case *ast.TypeAssertExpr:
+		return "type assertion"
+	case *ast.TypeSpec:
+		return "type specification"
+	case *ast.TypeSwitchStmt:
+		return "type switch"
+	case *ast.UnaryExpr:
+		return fmt.Sprintf("unary %s operation", n.Op)
+	case *ast.ValueSpec:
+		return "value specification"
+
+	}
+	panic(fmt.Sprintf("unexpected node type: %T", n))
+}
+
+func is[T any](x any) bool {
+	_, ok := x.(T)
+	return ok
+}
diff --git a/vendor/golang.org/x/tools/go/ast/astutil/imports.go b/vendor/golang.org/x/tools/go/ast/astutil/imports.go
new file mode 100644
index 000000000..adb471101
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/ast/astutil/imports.go
@@ -0,0 +1,487 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package astutil contains common utilities for working with the Go AST.
+package astutil // import "golang.org/x/tools/go/ast/astutil"
+
+import (
+	"fmt"
+	"go/ast"
+	"go/token"
+	"reflect"
+	"slices"
+	"strconv"
+	"strings"
+)
+
+// AddImport adds the import path to the file f, if absent.
+func AddImport(fset *token.FileSet, f *ast.File, path string) (added bool) {
+	return AddNamedImport(fset, f, "", path)
+}
+
+// AddNamedImport adds the import with the given name and path to the file f, if absent.
+// If name is not empty, it is used to rename the import.
+//
+// For example, calling
+//
+//	AddNamedImport(fset, f, "pathpkg", "path")
+//
+// adds
+//
+//	import pathpkg "path"
+func AddNamedImport(fset *token.FileSet, f *ast.File, name, path string) (added bool) {
+	if imports(f, name, path) {
+		return false
+	}
+
+	newImport := &ast.ImportSpec{
+		Path: &ast.BasicLit{
+			Kind:  token.STRING,
+			Value: strconv.Quote(path),
+		},
+	}
+	if name != "" {
+		newImport.Name = &ast.Ident{Name: name}
+	}
+
+	// Find an import decl to add to.
+	// The goal is to find an existing import
+	// whose import path has the longest shared
+	// prefix with path.
+	var (
+		bestMatch  = -1         // length of longest shared prefix
+		lastImport = -1         // index in f.Decls of the file's final import decl
+		impDecl    *ast.GenDecl // import decl containing the best match
+		impIndex   = -1         // spec index in impDecl containing the best match
+
+		isThirdPartyPath = isThirdParty(path)
+	)
+	for i, decl := range f.Decls {
+		gen, ok := decl.(*ast.GenDecl)
+		if ok && gen.Tok == token.IMPORT {
+			lastImport = i
+			// Do not add to import "C", to avoid disrupting the
+			// association with its doc comment, breaking cgo.
+			if declImports(gen, "C") {
+				continue
+			}
+
+			// Match an empty import decl if that's all that is available.
+			if len(gen.Specs) == 0 && bestMatch == -1 {
+				impDecl = gen
+			}
+
+			// Compute longest shared prefix with imports in this group and find best
+			// matched import spec.
+			// 1. Always prefer import spec with longest shared prefix.
+			// 2. While match length is 0,
+			// - for stdlib package: prefer first import spec.
+			// - for third party package: prefer first third party import spec.
+			// We cannot use last import spec as best match for third party package
+			// because grouped imports are usually placed last by goimports -local
+			// flag.
+			// See issue #19190.
+			seenAnyThirdParty := false
+			for j, spec := range gen.Specs {
+				impspec := spec.(*ast.ImportSpec)
+				p := importPath(impspec)
+				n := matchLen(p, path)
+				if n > bestMatch || (bestMatch == 0 && !seenAnyThirdParty && isThirdPartyPath) {
+					bestMatch = n
+					impDecl = gen
+					impIndex = j
+				}
+				seenAnyThirdParty = seenAnyThirdParty || isThirdParty(p)
+			}
+		}
+	}
+
+	// If no import decl found, add one after the last import.
+	if impDecl == nil {
+		impDecl = &ast.GenDecl{
+			Tok: token.IMPORT,
+		}
+		if lastImport >= 0 {
+			impDecl.TokPos = f.Decls[lastImport].End()
+		} else {
+			// There are no existing imports.
+			// Our new import, preceded by a blank line,  goes after the package declaration
+			// and after the comment, if any, that starts on the same line as the
+			// package declaration.
+			impDecl.TokPos = f.Package
+
+			file := fset.File(f.Package)
+			pkgLine := file.Line(f.Package)
+			for _, c := range f.Comments {
+				if file.Line(c.Pos()) > pkgLine {
+					break
+				}
+				// +2 for a blank line
+				impDecl.TokPos = c.End() + 2
+			}
+		}
+		f.Decls = append(f.Decls, nil)
+		copy(f.Decls[lastImport+2:], f.Decls[lastImport+1:])
+		f.Decls[lastImport+1] = impDecl
+	}
+
+	// Insert new import at insertAt.
+	insertAt := 0
+	if impIndex >= 0 {
+		// insert after the found import
+		insertAt = impIndex + 1
+	}
+	impDecl.Specs = append(impDecl.Specs, nil)
+	copy(impDecl.Specs[insertAt+1:], impDecl.Specs[insertAt:])
+	impDecl.Specs[insertAt] = newImport
+	pos := impDecl.Pos()
+	if insertAt > 0 {
+		// If there is a comment after an existing import, preserve the comment
+		// position by adding the new import after the comment.
+		if spec, ok := impDecl.Specs[insertAt-1].(*ast.ImportSpec); ok && spec.Comment != nil {
+			pos = spec.Comment.End()
+		} else {
+			// Assign same position as the previous import,
+			// so that the sorter sees it as being in the same block.
+			pos = impDecl.Specs[insertAt-1].Pos()
+		}
+	}
+	if newImport.Name != nil {
+		newImport.Name.NamePos = pos
+	}
+	updateBasicLitPos(newImport.Path, pos)
+	newImport.EndPos = pos
+
+	// Clean up parens. impDecl contains at least one spec.
+	if len(impDecl.Specs) == 1 {
+		// Remove unneeded parens.
+		impDecl.Lparen = token.NoPos
+	} else if !impDecl.Lparen.IsValid() {
+		// impDecl needs parens added.
+		impDecl.Lparen = impDecl.Specs[0].Pos()
+	}
+
+	f.Imports = append(f.Imports, newImport)
+
+	if len(f.Decls) <= 1 {
+		return true
+	}
+
+	// Merge all the import declarations into the first one.
+	var first *ast.GenDecl
+	for i := 0; i < len(f.Decls); i++ {
+		decl := f.Decls[i]
+		gen, ok := decl.(*ast.GenDecl)
+		if !ok || gen.Tok != token.IMPORT || declImports(gen, "C") {
+			continue
+		}
+		if first == nil {
+			first = gen
+			continue // Don't touch the first one.
+		}
+		// We now know there is more than one package in this import
+		// declaration. Ensure that it ends up parenthesized.
+		first.Lparen = first.Pos()
+		// Move the imports of the other import declaration to the first one.
+		for _, spec := range gen.Specs {
+			updateBasicLitPos(spec.(*ast.ImportSpec).Path, first.Pos())
+			first.Specs = append(first.Specs, spec)
+		}
+		f.Decls = slices.Delete(f.Decls, i, i+1)
+		i--
+	}
+
+	return true
+}
+
+func isThirdParty(importPath string) bool {
+	// Third party package import path usually contains "." (".com", ".org", ...)
+	// This logic is taken from golang.org/x/tools/imports package.
+	return strings.Contains(importPath, ".")
+}
+
+// DeleteImport deletes the import path from the file f, if present.
+// If there are duplicate import declarations, all matching ones are deleted.
+func DeleteImport(fset *token.FileSet, f *ast.File, path string) (deleted bool) {
+	return DeleteNamedImport(fset, f, "", path)
+}
+
+// DeleteNamedImport deletes the import with the given name and path from the file f, if present.
+// If there are duplicate import declarations, all matching ones are deleted.
+func DeleteNamedImport(fset *token.FileSet, f *ast.File, name, path string) (deleted bool) {
+	var (
+		delspecs    = make(map[*ast.ImportSpec]bool)
+		delcomments = make(map[*ast.CommentGroup]bool)
+	)
+
+	// Find the import nodes that import path, if any.
+	for i := 0; i < len(f.Decls); i++ {
+		gen, ok := f.Decls[i].(*ast.GenDecl)
+		if !ok || gen.Tok != token.IMPORT {
+			continue
+		}
+		for j := 0; j < len(gen.Specs); j++ {
+			impspec := gen.Specs[j].(*ast.ImportSpec)
+			if importName(impspec) != name || importPath(impspec) != path {
+				continue
+			}
+
+			// We found an import spec that imports path.
+			// Delete it.
+			delspecs[impspec] = true
+			deleted = true
+			gen.Specs = slices.Delete(gen.Specs, j, j+1)
+
+			// If this was the last import spec in this decl,
+			// delete the decl, too.
+			if len(gen.Specs) == 0 {
+				f.Decls = slices.Delete(f.Decls, i, i+1)
+				i--
+				break
+			} else if len(gen.Specs) == 1 {
+				if impspec.Doc != nil {
+					delcomments[impspec.Doc] = true
+				}
+				if impspec.Comment != nil {
+					delcomments[impspec.Comment] = true
+				}
+				for _, cg := range f.Comments {
+					// Found comment on the same line as the import spec.
+					if cg.End() < impspec.Pos() && fset.Position(cg.End()).Line == fset.Position(impspec.Pos()).Line {
+						delcomments[cg] = true
+						break
+					}
+				}
+
+				spec := gen.Specs[0].(*ast.ImportSpec)
+
+				// Move the documentation right after the import decl.
+				if spec.Doc != nil {
+					for fset.Position(gen.TokPos).Line+1 < fset.Position(spec.Doc.Pos()).Line {
+						fset.File(gen.TokPos).MergeLine(fset.Position(gen.TokPos).Line)
+					}
+				}
+				for _, cg := range f.Comments {
+					if cg.End() < spec.Pos() && fset.Position(cg.End()).Line == fset.Position(spec.Pos()).Line {
+						for fset.Position(gen.TokPos).Line+1 < fset.Position(spec.Pos()).Line {
+							fset.File(gen.TokPos).MergeLine(fset.Position(gen.TokPos).Line)
+						}
+						break
+					}
+				}
+			}
+			if j > 0 {
+				lastImpspec := gen.Specs[j-1].(*ast.ImportSpec)
+				lastLine := fset.PositionFor(lastImpspec.Path.ValuePos, false).Line
+				line := fset.PositionFor(impspec.Path.ValuePos, false).Line
+
+				// We deleted an entry but now there may be
+				// a blank line-sized hole where the import was.
+				if line-lastLine > 1 || !gen.Rparen.IsValid() {
+					// There was a blank line immediately preceding the deleted import,
+					// so there's no need to close the hole. The right parenthesis is
+					// invalid after AddImport to an import statement without parenthesis.
+					// Do nothing.
+				} else if line != fset.File(gen.Rparen).LineCount() {
+					// There was no blank line. Close the hole.
+					fset.File(gen.Rparen).MergeLine(line)
+				}
+			}
+			j--
+		}
+	}
+
+	// Delete imports from f.Imports.
+	before := len(f.Imports)
+	f.Imports = slices.DeleteFunc(f.Imports, func(imp *ast.ImportSpec) bool {
+		_, ok := delspecs[imp]
+		return ok
+	})
+	if len(f.Imports)+len(delspecs) != before {
+		// This can happen when the AST is invalid (i.e. imports differ between f.Decls and f.Imports).
+		panic(fmt.Sprintf("deleted specs from Decls but not Imports: %v", delspecs))
+	}
+
+	// Delete comments from f.Comments.
+	f.Comments = slices.DeleteFunc(f.Comments, func(cg *ast.CommentGroup) bool {
+		_, ok := delcomments[cg]
+		return ok
+	})
+
+	return
+}
+
+// RewriteImport rewrites any import of path oldPath to path newPath.
+func RewriteImport(fset *token.FileSet, f *ast.File, oldPath, newPath string) (rewrote bool) {
+	for _, imp := range f.Imports {
+		if importPath(imp) == oldPath {
+			rewrote = true
+			// record old End, because the default is to compute
+			// it using the length of imp.Path.Value.
+			imp.EndPos = imp.End()
+			imp.Path.Value = strconv.Quote(newPath)
+		}
+	}
+	return
+}
+
+// UsesImport reports whether a given import is used.
+// The provided File must have been parsed with syntactic object resolution
+// (not using go/parser.SkipObjectResolution).
+func UsesImport(f *ast.File, path string) (used bool) {
+	if f.Scope == nil {
+		panic("file f was not parsed with syntactic object resolution")
+	}
+	spec := importSpec(f, path)
+	if spec == nil {
+		return
+	}
+
+	name := spec.Name.String()
+	switch name {
+	case "":
+		// If the package name is not explicitly specified,
+		// make an educated guess. This is not guaranteed to be correct.
+		lastSlash := strings.LastIndex(path, "/")
+		if lastSlash == -1 {
+			name = path
+		} else {
+			name = path[lastSlash+1:]
+		}
+	case "_", ".":
+		// Not sure if this import is used - err on the side of caution.
+		return true
+	}
+
+	ast.Walk(visitFn(func(n ast.Node) {
+		sel, ok := n.(*ast.SelectorExpr)
+		if ok && isTopName(sel.X, name) {
+			used = true
+		}
+	}), f)
+
+	return
+}
+
+type visitFn func(node ast.Node)
+
+func (fn visitFn) Visit(node ast.Node) ast.Visitor {
+	fn(node)
+	return fn
+}
+
+// imports reports whether f has an import with the specified name and path.
+func imports(f *ast.File, name, path string) bool {
+	for _, s := range f.Imports {
+		if importName(s) == name && importPath(s) == path {
+			return true
+		}
+	}
+	return false
+}
+
+// importSpec returns the import spec if f imports path,
+// or nil otherwise.
+func importSpec(f *ast.File, path string) *ast.ImportSpec {
+	for _, s := range f.Imports {
+		if importPath(s) == path {
+			return s
+		}
+	}
+	return nil
+}
+
+// importName returns the name of s,
+// or "" if the import is not named.
+func importName(s *ast.ImportSpec) string {
+	if s.Name == nil {
+		return ""
+	}
+	return s.Name.Name
+}
+
+// importPath returns the unquoted import path of s,
+// or "" if the path is not properly quoted.
+func importPath(s *ast.ImportSpec) string {
+	t, err := strconv.Unquote(s.Path.Value)
+	if err != nil {
+		return ""
+	}
+	return t
+}
+
+// declImports reports whether gen contains an import of path.
+func declImports(gen *ast.GenDecl, path string) bool {
+	if gen.Tok != token.IMPORT {
+		return false
+	}
+	for _, spec := range gen.Specs {
+		impspec := spec.(*ast.ImportSpec)
+		if importPath(impspec) == path {
+			return true
+		}
+	}
+	return false
+}
+
+// matchLen returns the length of the longest path segment prefix shared by x and y.
+func matchLen(x, y string) int {
+	n := 0
+	for i := 0; i < len(x) && i < len(y) && x[i] == y[i]; i++ {
+		if x[i] == '/' {
+			n++
+		}
+	}
+	return n
+}
+
+// isTopName returns true if n is a top-level unresolved identifier with the given name.
+func isTopName(n ast.Expr, name string) bool {
+	id, ok := n.(*ast.Ident)
+	return ok && id.Name == name && id.Obj == nil
+}
+
+// Imports returns the file imports grouped by paragraph.
+func Imports(fset *token.FileSet, f *ast.File) [][]*ast.ImportSpec {
+	var groups [][]*ast.ImportSpec
+
+	for _, decl := range f.Decls {
+		genDecl, ok := decl.(*ast.GenDecl)
+		if !ok || genDecl.Tok != token.IMPORT {
+			break
+		}
+
+		group := []*ast.ImportSpec{}
+
+		var lastLine int
+		for _, spec := range genDecl.Specs {
+			importSpec := spec.(*ast.ImportSpec)
+			pos := importSpec.Path.ValuePos
+			line := fset.Position(pos).Line
+			if lastLine > 0 && pos > 0 && line-lastLine > 1 {
+				groups = append(groups, group)
+				group = []*ast.ImportSpec{}
+			}
+			group = append(group, importSpec)
+			lastLine = line
+		}
+		groups = append(groups, group)
+	}
+
+	return groups
+}
+
+// updateBasicLitPos updates lit.Pos,
+// ensuring that lit.End (if set) is displaced by the same amount.
+// (See https://go.dev/issue/76395.)
+func updateBasicLitPos(lit *ast.BasicLit, pos token.Pos) {
+	len := lit.End() - lit.Pos()
+	lit.ValuePos = pos
+	// TODO(adonovan): after go1.26, simplify to:
+	//   lit.ValueEnd = pos + len
+	v := reflect.ValueOf(lit).Elem().FieldByName("ValueEnd")
+	if v.IsValid() && v.Int() != 0 {
+		v.SetInt(int64(pos + len))
+	}
+}
diff --git a/vendor/golang.org/x/tools/go/ast/astutil/rewrite.go b/vendor/golang.org/x/tools/go/ast/astutil/rewrite.go
new file mode 100644
index 000000000..4ad054930
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/ast/astutil/rewrite.go
@@ -0,0 +1,490 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package astutil
+
+import (
+	"fmt"
+	"go/ast"
+	"reflect"
+	"sort"
+)
+
+// An ApplyFunc is invoked by Apply for each node n, even if n is nil,
+// before and/or after the node's children, using a Cursor describing
+// the current node and providing operations on it.
+//
+// The return value of ApplyFunc controls the syntax tree traversal.
+// See Apply for details.
+type ApplyFunc func(*Cursor) bool
+
+// Apply traverses a syntax tree recursively, starting with root,
+// and calling pre and post for each node as described below.
+// Apply returns the syntax tree, possibly modified.
+//
+// If pre is not nil, it is called for each node before the node's
+// children are traversed (pre-order). If pre returns false, no
+// children are traversed, and post is not called for that node.
+//
+// If post is not nil, and a prior call of pre didn't return false,
+// post is called for each node after its children are traversed
+// (post-order). If post returns false, traversal is terminated and
+// Apply returns immediately.
+//
+// Only fields that refer to AST nodes are considered children;
+// i.e., token.Pos, Scopes, Objects, and fields of basic types
+// (strings, etc.) are ignored.
+//
+// Children are traversed in the order in which they appear in the
+// respective node's struct definition. A package's files are
+// traversed in the filenames' alphabetical order.
+func Apply(root ast.Node, pre, post ApplyFunc) (result ast.Node) {
+	parent := &struct{ ast.Node }{root}
+	defer func() {
+		if r := recover(); r != nil && r != abort {
+			panic(r)
+		}
+		result = parent.Node
+	}()
+	a := &application{pre: pre, post: post}
+	a.apply(parent, "Node", nil, root)
+	return
+}
+
+var abort = new(int) // singleton, to signal termination of Apply
+
+// A Cursor describes a node encountered during Apply.
+// Information about the node and its parent is available
+// from the Node, Parent, Name, and Index methods.
+//
+// If p is a variable of type and value of the current parent node
+// c.Parent(), and f is the field identifier with name c.Name(),
+// the following invariants hold:
+//
+//	p.f            == c.Node()  if c.Index() <  0
+//	p.f[c.Index()] == c.Node()  if c.Index() >= 0
+//
+// The methods Replace, Delete, InsertBefore, and InsertAfter
+// can be used to change the AST without disrupting Apply.
+//
+// This type is not to be confused with [inspector.Cursor] from
+// package [golang.org/x/tools/go/ast/inspector], which provides
+// stateless navigation of immutable syntax trees.
+type Cursor struct {
+	parent ast.Node
+	name   string
+	iter   *iterator // valid if non-nil
+	node   ast.Node
+}
+
+// Node returns the current Node.
+func (c *Cursor) Node() ast.Node { return c.node }
+
+// Parent returns the parent of the current Node.
+func (c *Cursor) Parent() ast.Node { return c.parent }
+
+// Name returns the name of the parent Node field that contains the current Node.
+// If the parent is a *ast.Package and the current Node is a *ast.File, Name returns
+// the filename for the current Node.
+func (c *Cursor) Name() string { return c.name }
+
+// Index reports the index >= 0 of the current Node in the slice of Nodes that
+// contains it, or a value < 0 if the current Node is not part of a slice.
+// The index of the current node changes if InsertBefore is called while
+// processing the current node.
+func (c *Cursor) Index() int {
+	if c.iter != nil {
+		return c.iter.index
+	}
+	return -1
+}
+
+// field returns the current node's parent field value.
+func (c *Cursor) field() reflect.Value {
+	return reflect.Indirect(reflect.ValueOf(c.parent)).FieldByName(c.name)
+}
+
+// Replace replaces the current Node with n.
+// The replacement node is not walked by Apply.
+func (c *Cursor) Replace(n ast.Node) {
+	if _, ok := c.node.(*ast.File); ok {
+		file, ok := n.(*ast.File)
+		if !ok {
+			panic("attempt to replace *ast.File with non-*ast.File")
+		}
+		c.parent.(*ast.Package).Files[c.name] = file
+		return
+	}
+
+	v := c.field()
+	if i := c.Index(); i >= 0 {
+		v = v.Index(i)
+	}
+	v.Set(reflect.ValueOf(n))
+}
+
+// Delete deletes the current Node from its containing slice.
+// If the current Node is not part of a slice, Delete panics.
+// As a special case, if the current node is a package file,
+// Delete removes it from the package's Files map.
+func (c *Cursor) Delete() {
+	if _, ok := c.node.(*ast.File); ok {
+		delete(c.parent.(*ast.Package).Files, c.name)
+		return
+	}
+
+	i := c.Index()
+	if i < 0 {
+		panic("Delete node not contained in slice")
+	}
+	v := c.field()
+	l := v.Len()
+	reflect.Copy(v.Slice(i, l), v.Slice(i+1, l))
+	v.Index(l - 1).Set(reflect.Zero(v.Type().Elem()))
+	v.SetLen(l - 1)
+	c.iter.step--
+}
+
+// InsertAfter inserts n after the current Node in its containing slice.
+// If the current Node is not part of a slice, InsertAfter panics.
+// Apply does not walk n.
+func (c *Cursor) InsertAfter(n ast.Node) {
+	i := c.Index()
+	if i < 0 {
+		panic("InsertAfter node not contained in slice")
+	}
+	v := c.field()
+	v.Set(reflect.Append(v, reflect.Zero(v.Type().Elem())))
+	l := v.Len()
+	reflect.Copy(v.Slice(i+2, l), v.Slice(i+1, l))
+	v.Index(i + 1).Set(reflect.ValueOf(n))
+	c.iter.step++
+}
+
+// InsertBefore inserts n before the current Node in its containing slice.
+// If the current Node is not part of a slice, InsertBefore panics.
+// Apply will not walk n.
+func (c *Cursor) InsertBefore(n ast.Node) {
+	i := c.Index()
+	if i < 0 {
+		panic("InsertBefore node not contained in slice")
+	}
+	v := c.field()
+	v.Set(reflect.Append(v, reflect.Zero(v.Type().Elem())))
+	l := v.Len()
+	reflect.Copy(v.Slice(i+1, l), v.Slice(i, l))
+	v.Index(i).Set(reflect.ValueOf(n))
+	c.iter.index++
+}
+
+// application carries all the shared data so we can pass it around cheaply.
+type application struct {
+	pre, post ApplyFunc
+	cursor    Cursor
+	iter      iterator
+}
+
+func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.Node) {
+	// convert typed nil into untyped nil
+	if v := reflect.ValueOf(n); v.Kind() == reflect.Pointer && v.IsNil() {
+		n = nil
+	}
+
+	// avoid heap-allocating a new cursor for each apply call; reuse a.cursor instead
+	saved := a.cursor
+	a.cursor.parent = parent
+	a.cursor.name = name
+	a.cursor.iter = iter
+	a.cursor.node = n
+
+	if a.pre != nil && !a.pre(&a.cursor) {
+		a.cursor = saved
+		return
+	}
+
+	// walk children
+	// (the order of the cases matches the order of the corresponding node types in go/ast)
+	switch n := n.(type) {
+	case nil:
+		// nothing to do
+
+	// Comments and fields
+	case *ast.Comment:
+		// nothing to do
+
+	case *ast.CommentGroup:
+		if n != nil {
+			a.applyList(n, "List")
+		}
+
+	case *ast.Field:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.applyList(n, "Names")
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Tag", nil, n.Tag)
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.FieldList:
+		a.applyList(n, "List")
+
+	// Expressions
+	case *ast.BadExpr, *ast.Ident, *ast.BasicLit:
+		// nothing to do
+
+	case *ast.Ellipsis:
+		a.apply(n, "Elt", nil, n.Elt)
+
+	case *ast.FuncLit:
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.CompositeLit:
+		a.apply(n, "Type", nil, n.Type)
+		a.applyList(n, "Elts")
+
+	case *ast.ParenExpr:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.SelectorExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Sel", nil, n.Sel)
+
+	case *ast.IndexExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Index", nil, n.Index)
+
+	case *ast.IndexListExpr:
+		a.apply(n, "X", nil, n.X)
+		a.applyList(n, "Indices")
+
+	case *ast.SliceExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Low", nil, n.Low)
+		a.apply(n, "High", nil, n.High)
+		a.apply(n, "Max", nil, n.Max)
+
+	case *ast.TypeAssertExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Type", nil, n.Type)
+
+	case *ast.CallExpr:
+		a.apply(n, "Fun", nil, n.Fun)
+		a.applyList(n, "Args")
+
+	case *ast.StarExpr:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.UnaryExpr:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.BinaryExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Y", nil, n.Y)
+
+	case *ast.KeyValueExpr:
+		a.apply(n, "Key", nil, n.Key)
+		a.apply(n, "Value", nil, n.Value)
+
+	// Types
+	case *ast.ArrayType:
+		a.apply(n, "Len", nil, n.Len)
+		a.apply(n, "Elt", nil, n.Elt)
+
+	case *ast.StructType:
+		a.apply(n, "Fields", nil, n.Fields)
+
+	case *ast.FuncType:
+		if tparams := n.TypeParams; tparams != nil {
+			a.apply(n, "TypeParams", nil, tparams)
+		}
+		a.apply(n, "Params", nil, n.Params)
+		a.apply(n, "Results", nil, n.Results)
+
+	case *ast.InterfaceType:
+		a.apply(n, "Methods", nil, n.Methods)
+
+	case *ast.MapType:
+		a.apply(n, "Key", nil, n.Key)
+		a.apply(n, "Value", nil, n.Value)
+
+	case *ast.ChanType:
+		a.apply(n, "Value", nil, n.Value)
+
+	// Statements
+	case *ast.BadStmt:
+		// nothing to do
+
+	case *ast.DeclStmt:
+		a.apply(n, "Decl", nil, n.Decl)
+
+	case *ast.EmptyStmt:
+		// nothing to do
+
+	case *ast.LabeledStmt:
+		a.apply(n, "Label", nil, n.Label)
+		a.apply(n, "Stmt", nil, n.Stmt)
+
+	case *ast.ExprStmt:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.SendStmt:
+		a.apply(n, "Chan", nil, n.Chan)
+		a.apply(n, "Value", nil, n.Value)
+
+	case *ast.IncDecStmt:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.AssignStmt:
+		a.applyList(n, "Lhs")
+		a.applyList(n, "Rhs")
+
+	case *ast.GoStmt:
+		a.apply(n, "Call", nil, n.Call)
+
+	case *ast.DeferStmt:
+		a.apply(n, "Call", nil, n.Call)
+
+	case *ast.ReturnStmt:
+		a.applyList(n, "Results")
+
+	case *ast.BranchStmt:
+		a.apply(n, "Label", nil, n.Label)
+
+	case *ast.BlockStmt:
+		a.applyList(n, "List")
+
+	case *ast.IfStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Cond", nil, n.Cond)
+		a.apply(n, "Body", nil, n.Body)
+		a.apply(n, "Else", nil, n.Else)
+
+	case *ast.CaseClause:
+		a.applyList(n, "List")
+		a.applyList(n, "Body")
+
+	case *ast.SwitchStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Tag", nil, n.Tag)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.TypeSwitchStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Assign", nil, n.Assign)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.CommClause:
+		a.apply(n, "Comm", nil, n.Comm)
+		a.applyList(n, "Body")
+
+	case *ast.SelectStmt:
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.ForStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Cond", nil, n.Cond)
+		a.apply(n, "Post", nil, n.Post)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.RangeStmt:
+		a.apply(n, "Key", nil, n.Key)
+		a.apply(n, "Value", nil, n.Value)
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Body", nil, n.Body)
+
+	// Declarations
+	case *ast.ImportSpec:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Name", nil, n.Name)
+		a.apply(n, "Path", nil, n.Path)
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.ValueSpec:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.applyList(n, "Names")
+		a.apply(n, "Type", nil, n.Type)
+		a.applyList(n, "Values")
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.TypeSpec:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Name", nil, n.Name)
+		if tparams := n.TypeParams; tparams != nil {
+			a.apply(n, "TypeParams", nil, tparams)
+		}
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.BadDecl:
+		// nothing to do
+
+	case *ast.GenDecl:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.applyList(n, "Specs")
+
+	case *ast.FuncDecl:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Recv", nil, n.Recv)
+		a.apply(n, "Name", nil, n.Name)
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Body", nil, n.Body)
+
+	// Files and packages
+	case *ast.File:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Name", nil, n.Name)
+		a.applyList(n, "Decls")
+		// Don't walk n.Comments; they have either been walked already if
+		// they are Doc comments, or they can be easily walked explicitly.
+
+	case *ast.Package:
+		// collect and sort names for reproducible behavior
+		var names []string
+		for name := range n.Files {
+			names = append(names, name)
+		}
+		sort.Strings(names)
+		for _, name := range names {
+			a.apply(n, name, nil, n.Files[name])
+		}
+
+	default:
+		panic(fmt.Sprintf("Apply: unexpected node type %T", n))
+	}
+
+	if a.post != nil && !a.post(&a.cursor) {
+		panic(abort)
+	}
+
+	a.cursor = saved
+}
+
+// An iterator controls iteration over a slice of nodes.
+type iterator struct {
+	index, step int
+}
+
+func (a *application) applyList(parent ast.Node, name string) {
+	// avoid heap-allocating a new iterator for each applyList call; reuse a.iter instead
+	saved := a.iter
+	a.iter.index = 0
+	for {
+		// must reload parent.name each time, since cursor modifications might change it
+		v := reflect.Indirect(reflect.ValueOf(parent)).FieldByName(name)
+		if a.iter.index >= v.Len() {
+			break
+		}
+
+		// element x may be nil in a bad AST - be cautious
+		var x ast.Node
+		if e := v.Index(a.iter.index); e.IsValid() {
+			x = e.Interface().(ast.Node)
+		}
+
+		a.iter.step = 1
+		a.apply(parent, name, &a.iter, x)
+		a.iter.index += a.iter.step
+	}
+	a.iter = saved
+}
diff --git a/vendor/golang.org/x/tools/go/ast/astutil/util.go b/vendor/golang.org/x/tools/go/ast/astutil/util.go
new file mode 100644
index 000000000..c820b2084
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/ast/astutil/util.go
@@ -0,0 +1,13 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package astutil
+
+import "go/ast"
+
+// Unparen returns e with any enclosing parentheses stripped.
+// Deprecated: use [ast.Unparen].
+//
+//go:fix inline
+func Unparen(e ast.Expr) ast.Expr { return ast.Unparen(e) }
diff --git a/vendor/gopkg.in/warnings.v0/LICENSE b/vendor/gopkg.in/warnings.v0/LICENSE
deleted file mode 100644
index d65f7e9d8..000000000
--- a/vendor/gopkg.in/warnings.v0/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2016 Péter Surányi.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/gopkg.in/warnings.v0/README b/vendor/gopkg.in/warnings.v0/README
deleted file mode 100644
index 974212ba1..000000000
--- a/vendor/gopkg.in/warnings.v0/README
+++ /dev/null
@@ -1,77 +0,0 @@
-Package warnings implements error handling with non-fatal errors (warnings).
-
-import path:   "gopkg.in/warnings.v0"
-package docs:  https://godoc.org/gopkg.in/warnings.v0 
-issues:        https://github.com/go-warnings/warnings/issues
-pull requests: https://github.com/go-warnings/warnings/pulls
-
-A recurring pattern in Go programming is the following:
-
- func myfunc(params) error {
-     if err := doSomething(...); err != nil {
-         return err
-     }
-     if err := doSomethingElse(...); err != nil {
-         return err
-     }
-     if ok := doAnotherThing(...); !ok {
-         return errors.New("my error")
-     }
-     ...
-     return nil
- }
-
-This pattern allows interrupting the flow on any received error. But what if
-there are errors that should be noted but still not fatal, for which the flow
-should not be interrupted? Implementing such logic at each if statement would
-make the code complex and the flow much harder to follow.
-
-Package warnings provides the Collector type and a clean and simple pattern
-for achieving such logic. The Collector takes care of deciding when to break
-the flow and when to continue, collecting any non-fatal errors (warnings)
-along the way. The only requirement is that fatal and non-fatal errors can be
-distinguished programmatically; that is a function such as
-
- IsFatal(error) bool
-
-must be implemented. The following is an example of what the above snippet
-could look like using the warnings package:
-
- import "gopkg.in/warnings.v0"
-
- func isFatal(err error) bool {
-     _, ok := err.(WarningType)
-     return !ok
- }
-
- func myfunc(params) error {
-     c := warnings.NewCollector(isFatal)
-     c.FatalWithWarnings = true
-     if err := c.Collect(doSomething()); err != nil {
-         return err
-     }
-     if err := c.Collect(doSomethingElse(...)); err != nil {
-         return err
-     }
-     if ok := doAnotherThing(...); !ok {
-         if err := c.Collect(errors.New("my error")); err != nil {
-             return err
-         }
-     }
-     ...
-     return c.Done()
- }
-
-For an example of a non-trivial code base using this library, see
-gopkg.in/gcfg.v1
-
-Rules for using warnings
-
- - ensure that warnings are programmatically distinguishable from fatal
-   errors (i.e. implement an isFatal function and any necessary error types)
- - ensure that there is a single Collector instance for a call of each
-   exported function
- - ensure that all errors (fatal or warning) are fed through Collect
- - ensure that every time an error is returned, it is one returned by a
-   Collector (from Collect or Done)
- - ensure that Collect is never called after Done
diff --git a/vendor/gopkg.in/warnings.v0/warnings.go b/vendor/gopkg.in/warnings.v0/warnings.go
deleted file mode 100644
index b849d1e3d..000000000
--- a/vendor/gopkg.in/warnings.v0/warnings.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// Package warnings implements error handling with non-fatal errors (warnings).
-//
-// A recurring pattern in Go programming is the following:
-//
-//  func myfunc(params) error {
-//      if err := doSomething(...); err != nil {
-//          return err
-//      }
-//      if err := doSomethingElse(...); err != nil {
-//          return err
-//      }
-//      if ok := doAnotherThing(...); !ok {
-//          return errors.New("my error")
-//      }
-//      ...
-//      return nil
-//  }
-//
-// This pattern allows interrupting the flow on any received error. But what if
-// there are errors that should be noted but still not fatal, for which the flow
-// should not be interrupted? Implementing such logic at each if statement would
-// make the code complex and the flow much harder to follow.
-//
-// Package warnings provides the Collector type and a clean and simple pattern
-// for achieving such logic. The Collector takes care of deciding when to break
-// the flow and when to continue, collecting any non-fatal errors (warnings)
-// along the way. The only requirement is that fatal and non-fatal errors can be
-// distinguished programmatically; that is a function such as
-//
-//  IsFatal(error) bool
-//
-// must be implemented. The following is an example of what the above snippet
-// could look like using the warnings package:
-//
-//  import "gopkg.in/warnings.v0"
-//
-//  func isFatal(err error) bool {
-//      _, ok := err.(WarningType)
-//      return !ok
-//  }
-//
-//  func myfunc(params) error {
-//      c := warnings.NewCollector(isFatal)
-//      c.FatalWithWarnings = true
-//      if err := c.Collect(doSomething()); err != nil {
-//          return err
-//      }
-//      if err := c.Collect(doSomethingElse(...)); err != nil {
-//          return err
-//      }
-//      if ok := doAnotherThing(...); !ok {
-//          if err := c.Collect(errors.New("my error")); err != nil {
-//              return err
-//          }
-//      }
-//      ...
-//      return c.Done()
-//  }
-//
-// For an example of a non-trivial code base using this library, see
-// gopkg.in/gcfg.v1
-//
-// Rules for using warnings
-//
-//  - ensure that warnings are programmatically distinguishable from fatal
-//    errors (i.e. implement an isFatal function and any necessary error types)
-//  - ensure that there is a single Collector instance for a call of each
-//    exported function
-//  - ensure that all errors (fatal or warning) are fed through Collect
-//  - ensure that every time an error is returned, it is one returned by a
-//    Collector (from Collect or Done)
-//  - ensure that Collect is never called after Done
-//
-// TODO
-//
-//  - optionally limit the number of warnings (e.g. stop after 20 warnings) (?)
-//  - consider interaction with contexts
-//  - go vet-style invocations verifier
-//  - semi-automatic code converter
-//
-package warnings // import "gopkg.in/warnings.v0"
-
-import (
-	"bytes"
-	"fmt"
-)
-
-// List holds a collection of warnings and optionally one fatal error.
-type List struct {
-	Warnings []error
-	Fatal    error
-}
-
-// Error implements the error interface.
-func (l List) Error() string {
-	b := bytes.NewBuffer(nil)
-	if l.Fatal != nil {
-		fmt.Fprintln(b, "fatal:")
-		fmt.Fprintln(b, l.Fatal)
-	}
-	switch len(l.Warnings) {
-	case 0:
-	// nop
-	case 1:
-		fmt.Fprintln(b, "warning:")
-	default:
-		fmt.Fprintln(b, "warnings:")
-	}
-	for _, err := range l.Warnings {
-		fmt.Fprintln(b, err)
-	}
-	return b.String()
-}
-
-// A Collector collects errors up to the first fatal error.
-type Collector struct {
-	// IsFatal distinguishes between warnings and fatal errors.
-	IsFatal func(error) bool
-	// FatalWithWarnings set to true means that a fatal error is returned as
-	// a List together with all warnings so far. The default behavior is to
-	// only return the fatal error and discard any warnings that have been
-	// collected.
-	FatalWithWarnings bool
-
-	l    List
-	done bool
-}
-
-// NewCollector returns a new Collector; it uses isFatal to distinguish between
-// warnings and fatal errors.
-func NewCollector(isFatal func(error) bool) *Collector {
-	return &Collector{IsFatal: isFatal}
-}
-
-// Collect collects a single error (warning or fatal). It returns nil if
-// collection can continue (only warnings so far), or otherwise the errors
-// collected. Collect mustn't be called after the first fatal error or after
-// Done has been called.
-func (c *Collector) Collect(err error) error {
-	if c.done {
-		panic("warnings.Collector already done")
-	}
-	if err == nil {
-		return nil
-	}
-	if c.IsFatal(err) {
-		c.done = true
-		c.l.Fatal = err
-	} else {
-		c.l.Warnings = append(c.l.Warnings, err)
-	}
-	if c.l.Fatal != nil {
-		return c.erorr()
-	}
-	return nil
-}
-
-// Done ends collection and returns the collected error(s).
-func (c *Collector) Done() error {
-	c.done = true
-	return c.erorr()
-}
-
-func (c *Collector) erorr() error {
-	if !c.FatalWithWarnings && c.l.Fatal != nil {
-		return c.l.Fatal
-	}
-	if c.l.Fatal == nil && len(c.l.Warnings) == 0 {
-		return nil
-	}
-	// Note that a single warning is also returned as a List. This is to make it
-	// easier to determine fatal-ness of the returned error.
-	return c.l
-}
-
-// FatalOnly returns the fatal error, if any, **in an error returned by a
-// Collector**. It returns nil if and only if err is nil or err is a List
-// with err.Fatal == nil.
-func FatalOnly(err error) error {
-	l, ok := err.(List)
-	if !ok {
-		return err
-	}
-	return l.Fatal
-}
-
-// WarningsOnly returns the warnings **in an error returned by a Collector**.
-func WarningsOnly(err error) []error {
-	l, ok := err.(List)
-	if !ok {
-		return nil
-	}
-	return l.Warnings
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0b0dda60a..e4d6e564f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,41 +1,11 @@
-# dario.cat/mergo v1.0.1
+# dario.cat/mergo v1.0.2
 ## explicit; go 1.13
 dario.cat/mergo
-# github.com/Microsoft/go-winio v0.6.2
-## explicit; go 1.21
-github.com/Microsoft/go-winio
-github.com/Microsoft/go-winio/internal/fs
-github.com/Microsoft/go-winio/internal/socket
-github.com/Microsoft/go-winio/internal/stringbuffer
-github.com/Microsoft/go-winio/pkg/guid
-# github.com/ProtonMail/go-crypto v1.1.6
-## explicit; go 1.17
-github.com/ProtonMail/go-crypto/bitcurves
-github.com/ProtonMail/go-crypto/brainpool
-github.com/ProtonMail/go-crypto/eax
-github.com/ProtonMail/go-crypto/internal/byteutil
-github.com/ProtonMail/go-crypto/ocb
-github.com/ProtonMail/go-crypto/openpgp
-github.com/ProtonMail/go-crypto/openpgp/aes/keywrap
-github.com/ProtonMail/go-crypto/openpgp/armor
-github.com/ProtonMail/go-crypto/openpgp/ecdh
-github.com/ProtonMail/go-crypto/openpgp/ecdsa
-github.com/ProtonMail/go-crypto/openpgp/ed25519
-github.com/ProtonMail/go-crypto/openpgp/ed448
-github.com/ProtonMail/go-crypto/openpgp/eddsa
-github.com/ProtonMail/go-crypto/openpgp/elgamal
-github.com/ProtonMail/go-crypto/openpgp/errors
-github.com/ProtonMail/go-crypto/openpgp/internal/algorithm
-github.com/ProtonMail/go-crypto/openpgp/internal/ecc
-github.com/ProtonMail/go-crypto/openpgp/internal/encoding
-github.com/ProtonMail/go-crypto/openpgp/packet
-github.com/ProtonMail/go-crypto/openpgp/s2k
-github.com/ProtonMail/go-crypto/openpgp/x25519
-github.com/ProtonMail/go-crypto/openpgp/x448
-# github.com/adrg/xdg v0.4.0
-## explicit; go 1.14
+# github.com/adrg/xdg v0.5.3
+## explicit; go 1.19
 github.com/adrg/xdg
 github.com/adrg/xdg/internal/pathutil
+github.com/adrg/xdg/internal/userdirs
 # github.com/atotto/clipboard v0.1.4
 ## explicit
 github.com/atotto/clipboard
@@ -45,175 +15,64 @@ github.com/aybabtme/humanlog
 # github.com/bahlo/generic-list-go v0.2.0
 ## explicit; go 1.18
 github.com/bahlo/generic-list-go
-# github.com/buger/jsonparser v1.1.1
+# github.com/buger/jsonparser v1.1.2
 ## explicit; go 1.13
 github.com/buger/jsonparser
-# github.com/cloudflare/circl v1.6.3
-## explicit; go 1.22.0
-github.com/cloudflare/circl/dh/x25519
-github.com/cloudflare/circl/dh/x448
-github.com/cloudflare/circl/ecc/goldilocks
-github.com/cloudflare/circl/internal/conv
-github.com/cloudflare/circl/internal/sha3
-github.com/cloudflare/circl/math
-github.com/cloudflare/circl/math/fp25519
-github.com/cloudflare/circl/math/fp448
-github.com/cloudflare/circl/math/mlsbset
-github.com/cloudflare/circl/sign
-github.com/cloudflare/circl/sign/ed25519
-github.com/cloudflare/circl/sign/ed448
+# github.com/cli/go-gh/v2 v2.13.0
+## explicit; go 1.25.0
+github.com/cli/go-gh/v2/internal/set
+github.com/cli/go-gh/v2/internal/yamlmap
+github.com/cli/go-gh/v2/pkg/auth
+github.com/cli/go-gh/v2/pkg/config
+# github.com/cli/safeexec v1.0.1
+## explicit; go 1.15
+github.com/cli/safeexec
+# github.com/clipperhouse/displaywidth v0.11.0
+## explicit; go 1.18
+github.com/clipperhouse/displaywidth
+# github.com/clipperhouse/uax29/v2 v2.7.0
+## explicit; go 1.18
+github.com/clipperhouse/uax29/v2/graphemes
 # github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 ## explicit
 github.com/cloudfoundry/jibber_jabber
-# github.com/creack/pty v1.1.11
-## explicit; go 1.13
-github.com/creack/pty
-# github.com/cyphar/filepath-securejoin v0.4.1
+# github.com/creack/pty v1.1.24
 ## explicit; go 1.18
-github.com/cyphar/filepath-securejoin
-# github.com/davecgh/go-spew v1.1.1
-## explicit
-github.com/davecgh/go-spew/spew
-# github.com/emirpasic/gods v1.18.1
-## explicit; go 1.2
-github.com/emirpasic/gods/containers
-github.com/emirpasic/gods/lists
-github.com/emirpasic/gods/lists/arraylist
-github.com/emirpasic/gods/trees
-github.com/emirpasic/gods/trees/binaryheap
-github.com/emirpasic/gods/utils
+github.com/creack/pty
 # github.com/fatih/color v1.9.0
 ## explicit; go 1.13
 github.com/fatih/color
 # github.com/gdamore/encoding v1.0.1
 ## explicit; go 1.9
 github.com/gdamore/encoding
-# github.com/gdamore/tcell/v2 v2.13.8
-## explicit; go 1.24.0
-github.com/gdamore/tcell/v2
-github.com/gdamore/tcell/v2/terminfo
-github.com/gdamore/tcell/v2/terminfo/a/aixterm
-github.com/gdamore/tcell/v2/terminfo/a/alacritty
-github.com/gdamore/tcell/v2/terminfo/a/ansi
-github.com/gdamore/tcell/v2/terminfo/base
-github.com/gdamore/tcell/v2/terminfo/c/cygwin
-github.com/gdamore/tcell/v2/terminfo/d/dtterm
-github.com/gdamore/tcell/v2/terminfo/dynamic
-github.com/gdamore/tcell/v2/terminfo/e/emacs
-github.com/gdamore/tcell/v2/terminfo/extended
-github.com/gdamore/tcell/v2/terminfo/f/foot
-github.com/gdamore/tcell/v2/terminfo/g/gnome
-github.com/gdamore/tcell/v2/terminfo/k/konsole
-github.com/gdamore/tcell/v2/terminfo/k/kterm
-github.com/gdamore/tcell/v2/terminfo/l/linux
-github.com/gdamore/tcell/v2/terminfo/p/pcansi
-github.com/gdamore/tcell/v2/terminfo/r/rxvt
-github.com/gdamore/tcell/v2/terminfo/s/screen
-github.com/gdamore/tcell/v2/terminfo/s/simpleterm
-github.com/gdamore/tcell/v2/terminfo/s/sun
-github.com/gdamore/tcell/v2/terminfo/t/tmux
-github.com/gdamore/tcell/v2/terminfo/v/vt100
-github.com/gdamore/tcell/v2/terminfo/v/vt102
-github.com/gdamore/tcell/v2/terminfo/v/vt220
-github.com/gdamore/tcell/v2/terminfo/v/vt320
-github.com/gdamore/tcell/v2/terminfo/v/vt400
-github.com/gdamore/tcell/v2/terminfo/v/vt420
-github.com/gdamore/tcell/v2/terminfo/x/xfce
-github.com/gdamore/tcell/v2/terminfo/x/xterm
-github.com/gdamore/tcell/v2/terminfo/x/xterm_ghostty
-github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty
+# github.com/gdamore/tcell/v3 v3.4.2
+## explicit; go 1.25.0
+github.com/gdamore/tcell/v3
+github.com/gdamore/tcell/v3/color
+github.com/gdamore/tcell/v3/internal/widthutil
+github.com/gdamore/tcell/v3/tty
+github.com/gdamore/tcell/v3/vt
 # github.com/go-errors/errors v1.5.1
 ## explicit; go 1.14
 github.com/go-errors/errors
-# github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376
-## explicit; go 1.13
-github.com/go-git/gcfg
-github.com/go-git/gcfg/scanner
-github.com/go-git/gcfg/token
-github.com/go-git/gcfg/types
-# github.com/go-git/go-billy/v5 v5.6.2
-## explicit; go 1.21
-github.com/go-git/go-billy/v5
-github.com/go-git/go-billy/v5/helper/chroot
-github.com/go-git/go-billy/v5/helper/polyfill
-github.com/go-git/go-billy/v5/memfs
-github.com/go-git/go-billy/v5/osfs
-github.com/go-git/go-billy/v5/util
 # github.com/go-logfmt/logfmt v0.5.0
 ## explicit; go 1.13
 github.com/go-logfmt/logfmt
-# github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8
-## explicit; go 1.20
-github.com/golang/groupcache/lru
-# github.com/gookit/color v1.4.2
-## explicit; go 1.12
+# github.com/gookit/color v1.6.1
+## explicit; go 1.18
 github.com/gookit/color
 # github.com/hpcloud/tail v1.0.0
 ## explicit
-# github.com/integrii/flaggy v1.4.0
-## explicit; go 1.12
+# github.com/integrii/flaggy v1.8.0
+## explicit; go 1.25
 github.com/integrii/flaggy
 # github.com/invopop/jsonschema v0.10.0
 ## explicit; go 1.18
-# github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
-## explicit
-github.com/jbenet/go-context/io
 # github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c
 ## explicit; go 1.18
 github.com/jesseduffield/generics/maps
 github.com/jesseduffield/generics/orderedset
 github.com/jesseduffield/generics/set
-# github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd
-## explicit; go 1.23.0
-github.com/jesseduffield/go-git/v5
-github.com/jesseduffield/go-git/v5/config
-github.com/jesseduffield/go-git/v5/internal/path_util
-github.com/jesseduffield/go-git/v5/internal/revision
-github.com/jesseduffield/go-git/v5/internal/url
-github.com/jesseduffield/go-git/v5/plumbing
-github.com/jesseduffield/go-git/v5/plumbing/cache
-github.com/jesseduffield/go-git/v5/plumbing/color
-github.com/jesseduffield/go-git/v5/plumbing/filemode
-github.com/jesseduffield/go-git/v5/plumbing/format/config
-github.com/jesseduffield/go-git/v5/plumbing/format/diff
-github.com/jesseduffield/go-git/v5/plumbing/format/gitignore
-github.com/jesseduffield/go-git/v5/plumbing/format/idxfile
-github.com/jesseduffield/go-git/v5/plumbing/format/index
-github.com/jesseduffield/go-git/v5/plumbing/format/objfile
-github.com/jesseduffield/go-git/v5/plumbing/format/packfile
-github.com/jesseduffield/go-git/v5/plumbing/format/pktline
-github.com/jesseduffield/go-git/v5/plumbing/hash
-github.com/jesseduffield/go-git/v5/plumbing/object
-github.com/jesseduffield/go-git/v5/plumbing/protocol/packp
-github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/capability
-github.com/jesseduffield/go-git/v5/plumbing/protocol/packp/sideband
-github.com/jesseduffield/go-git/v5/plumbing/revlist
-github.com/jesseduffield/go-git/v5/plumbing/storer
-github.com/jesseduffield/go-git/v5/plumbing/transport
-github.com/jesseduffield/go-git/v5/plumbing/transport/client
-github.com/jesseduffield/go-git/v5/plumbing/transport/file
-github.com/jesseduffield/go-git/v5/plumbing/transport/git
-github.com/jesseduffield/go-git/v5/plumbing/transport/http
-github.com/jesseduffield/go-git/v5/plumbing/transport/internal/common
-github.com/jesseduffield/go-git/v5/plumbing/transport/server
-github.com/jesseduffield/go-git/v5/plumbing/transport/ssh
-github.com/jesseduffield/go-git/v5/storage
-github.com/jesseduffield/go-git/v5/storage/filesystem
-github.com/jesseduffield/go-git/v5/storage/filesystem/dotgit
-github.com/jesseduffield/go-git/v5/storage/memory
-github.com/jesseduffield/go-git/v5/utils/binary
-github.com/jesseduffield/go-git/v5/utils/diff
-github.com/jesseduffield/go-git/v5/utils/ioutil
-github.com/jesseduffield/go-git/v5/utils/merkletrie
-github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem
-github.com/jesseduffield/go-git/v5/utils/merkletrie/index
-github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame
-github.com/jesseduffield/go-git/v5/utils/merkletrie/noder
-github.com/jesseduffield/go-git/v5/utils/sync
-github.com/jesseduffield/go-git/v5/utils/trace
-# github.com/jesseduffield/gocui v0.3.1-0.20260308162933-5e45e57b5564
-## explicit; go 1.25
-github.com/jesseduffield/gocui
 # github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 ## explicit; go 1.18
 github.com/jesseduffield/lazycore/pkg/boxlayout
@@ -224,29 +83,24 @@ github.com/kardianos/osext
 # github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3
 ## explicit; go 1.18
 github.com/karimkhaleel/jsonschema
-# github.com/kevinburke/ssh_config v1.2.0
-## explicit
-github.com/kevinburke/ssh_config
 # github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515
 ## explicit
 github.com/kr/logfmt
-# github.com/kylelemons/godebug v1.1.0
-## explicit; go 1.11
-# github.com/kyokomi/emoji/v2 v2.2.8
-## explicit; go 1.14
+# github.com/kyokomi/emoji/v2 v2.2.14
+## explicit; go 1.21
 github.com/kyokomi/emoji/v2
-# github.com/lucasb-eyer/go-colorful v1.3.0
+# github.com/lucasb-eyer/go-colorful v1.4.1
 ## explicit; go 1.12
 github.com/lucasb-eyer/go-colorful
 # github.com/mailru/easyjson v0.7.7
 ## explicit; go 1.12
 github.com/mailru/easyjson/buffer
 github.com/mailru/easyjson/jwriter
-# github.com/mattn/go-colorable v0.1.11
-## explicit; go 1.13
+# github.com/mattn/go-colorable v0.1.13
+## explicit; go 1.15
 github.com/mattn/go-colorable
-# github.com/mattn/go-isatty v0.0.14
-## explicit; go 1.12
+# github.com/mattn/go-isatty v0.0.20
+## explicit; go 1.15
 github.com/mattn/go-isatty
 # github.com/mgutz/str v1.2.0
 ## explicit
@@ -256,112 +110,99 @@ github.com/mgutz/str
 github.com/mitchellh/go-ps
 # github.com/onsi/ginkgo v1.10.3
 ## explicit
+# github.com/onsi/gomega v1.34.1
+## explicit; go 1.20
 # github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe
 ## explicit; go 1.17
 github.com/petermattis/goid
-# github.com/pjbgf/sha1cd v0.3.2
-## explicit; go 1.21
-github.com/pjbgf/sha1cd
-github.com/pjbgf/sha1cd/internal
-github.com/pjbgf/sha1cd/ubc
-# github.com/pmezard/go-difflib v1.0.0
-## explicit
-github.com/pmezard/go-difflib/difflib
 # github.com/rivo/uniseg v0.4.7
 ## explicit; go 1.18
 github.com/rivo/uniseg
-# github.com/sahilm/fuzzy v0.1.0
-## explicit
+# github.com/sahilm/fuzzy v0.1.3
+## explicit; go 1.24.5
 github.com/sahilm/fuzzy
-# github.com/samber/lo v1.31.0
+# github.com/samber/lo v1.53.0
 ## explicit; go 1.18
 github.com/samber/lo
-# github.com/sanity-io/litter v1.5.2
-## explicit; go 1.14
+github.com/samber/lo/internal/constraints
+github.com/samber/lo/internal/xrand
+github.com/samber/lo/internal/xtime
+github.com/samber/lo/mutable
+# github.com/sanity-io/litter v1.5.8
+## explicit; go 1.16
 github.com/sanity-io/litter
-# github.com/sasha-s/go-deadlock v0.3.6
+# github.com/sasha-s/go-deadlock v0.3.9
 ## explicit
 github.com/sasha-s/go-deadlock
-# github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
-## explicit; go 1.13
-github.com/sergi/go-diff/diffmatchpatch
-# github.com/sirupsen/logrus v1.9.3
-## explicit; go 1.13
+# github.com/sirupsen/logrus v1.10.2
+## explicit; go 1.23
 github.com/sirupsen/logrus
-# github.com/skeema/knownhosts v1.3.1
-## explicit; go 1.22
-github.com/skeema/knownhosts
-# github.com/spf13/afero v1.9.5
-## explicit; go 1.16
+# github.com/spf13/afero v1.15.0
+## explicit; go 1.23.0
 github.com/spf13/afero
 github.com/spf13/afero/internal/common
 github.com/spf13/afero/mem
-# github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
-## explicit
+# github.com/spkg/bom v1.0.1
+## explicit; go 1.16
 github.com/spkg/bom
 # github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304
 ## explicit; go 1.13
 github.com/stefanhaller/git-todo-parser/todo
-# github.com/stretchr/testify v1.10.0
+# github.com/stretchr/testify v1.12.1
 ## explicit; go 1.17
 github.com/stretchr/testify/assert
 github.com/stretchr/testify/assert/yaml
+github.com/stretchr/testify/internal/difflib
+github.com/stretchr/testify/internal/spew
 # github.com/wk8/go-ordered-map/v2 v2.1.8
 ## explicit; go 1.18
 github.com/wk8/go-ordered-map/v2
-# github.com/xanzy/ssh-agent v0.3.3
-## explicit; go 1.16
-github.com/xanzy/ssh-agent
-# github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
-## explicit; go 1.15
+# github.com/xo/terminfo v1.0.0
+## explicit; go 1.19
 github.com/xo/terminfo
-# golang.org/x/crypto v0.45.0
-## explicit; go 1.24.0
-golang.org/x/crypto/argon2
-golang.org/x/crypto/blake2b
-golang.org/x/crypto/blowfish
-golang.org/x/crypto/cast5
-golang.org/x/crypto/chacha20
-golang.org/x/crypto/cryptobyte
-golang.org/x/crypto/cryptobyte/asn1
-golang.org/x/crypto/curve25519
-golang.org/x/crypto/hkdf
-golang.org/x/crypto/internal/alias
-golang.org/x/crypto/internal/poly1305
-golang.org/x/crypto/sha3
-golang.org/x/crypto/ssh
-golang.org/x/crypto/ssh/agent
-golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
-golang.org/x/crypto/ssh/knownhosts
+# go.yaml.in/yaml/v3 v3.0.5
+## explicit; go 1.16
+go.yaml.in/yaml/v3
 # golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 ## explicit; go 1.20
 golang.org/x/exp/constraints
 golang.org/x/exp/slices
-# golang.org/x/net v0.47.0
-## explicit; go 1.24.0
-golang.org/x/net/context
-golang.org/x/net/internal/socks
-golang.org/x/net/proxy
-# golang.org/x/sync v0.19.0
-## explicit; go 1.24.0
-golang.org/x/sync/errgroup
-# golang.org/x/sys v0.42.0
+# golang.org/x/mod v0.38.0
+## explicit; go 1.25.0
+golang.org/x/mod/internal/lazyregexp
+golang.org/x/mod/modfile
+golang.org/x/mod/module
+golang.org/x/mod/semver
+# golang.org/x/sync v0.22.0
+## explicit; go 1.25.0
+golang.org/x/sync/errgroup
+golang.org/x/sync/semaphore
+# golang.org/x/sys v0.47.0
 ## explicit; go 1.25.0
-golang.org/x/sys/cpu
-golang.org/x/sys/execabs
 golang.org/x/sys/plan9
 golang.org/x/sys/unix
 golang.org/x/sys/windows
-# golang.org/x/term v0.40.0
-## explicit; go 1.24.0
+# golang.org/x/term v0.45.0
+## explicit; go 1.25.0
 golang.org/x/term
-# golang.org/x/text v0.34.0
-## explicit; go 1.24.0
+# golang.org/x/text v0.41.0
+## explicit; go 1.25.0
+golang.org/x/text/cases
 golang.org/x/text/encoding
 golang.org/x/text/encoding/internal/identifier
+golang.org/x/text/internal
+golang.org/x/text/internal/language
+golang.org/x/text/internal/language/compact
+golang.org/x/text/internal/tag
+golang.org/x/text/language
 golang.org/x/text/runes
 golang.org/x/text/transform
 golang.org/x/text/unicode/norm
+# golang.org/x/tools v0.48.0
+## explicit; go 1.25.0
+golang.org/x/tools/go/ast/astutil
+# gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
+## explicit; go 1.11
 # gopkg.in/fsnotify.v1 v1.4.7
 ## explicit
 # gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
@@ -369,9 +210,15 @@ golang.org/x/text/unicode/norm
 gopkg.in/ozeidan/fuzzy-patricia.v3/patricia
 # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
 ## explicit
-# gopkg.in/warnings.v0 v0.1.2
-## explicit
-gopkg.in/warnings.v0
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
+# mvdan.cc/gofumpt v0.11.0
+## explicit; go 1.25.0
+mvdan.cc/gofumpt
+mvdan.cc/gofumpt/format
+mvdan.cc/gofumpt/internal/govendor/diff
+mvdan.cc/gofumpt/internal/govendor/go/doc/comment
+mvdan.cc/gofumpt/internal/govendor/go/format
+mvdan.cc/gofumpt/internal/govendor/go/printer
+mvdan.cc/gofumpt/internal/version
diff --git a/vendor/mvdan.cc/gofumpt/.gitattributes b/vendor/mvdan.cc/gofumpt/.gitattributes
new file mode 100644
index 000000000..6f9522992
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/.gitattributes
@@ -0,0 +1,2 @@
+# To prevent CRLF breakages on Windows for fragile files, like testdata.
+* -text
diff --git a/vendor/mvdan.cc/gofumpt/CHANGELOG.md b/vendor/mvdan.cc/gofumpt/CHANGELOG.md
new file mode 100644
index 000000000..1168ddc63
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/CHANGELOG.md
@@ -0,0 +1,261 @@
+# Changelog
+
+## [v0.11.0] - 2026-07-27
+
+Like v0.10.0, this release is based on Go 1.26's gofmt, and requires Go 1.25 or later.
+
+The multi-line function call rule introduced in v0.10.0 proved controversial,
+so it is now the extra rule `balance_calls`, disabled by default.
+It is also narrowed to only place the closing parenthesis on its own line
+when the opening parenthesis ends a line. See #74.
+
+Avoid crashing when compiled with tinygo for Wasm, which lacks recover support,
+by detecting commented-out code without the parser's bailout panic. See #230.
+
+Produce stable output in a single pass when a lone var declaration is adjacent
+to a single-element var group, which previously required a second run. See #355.
+
+Keep the parentheses around an expression which begins with a composite literal
+of the form `T{...}`, such as `(s{}.Foo())`, as they are required when the
+expression starts an `if`, `for`, or `switch` clause. See #356.
+
+## [v0.10.0] - 2026-05-04
+
+This release is based on Go 1.26's gofmt, and requires Go 1.25 or later.
+
+A new rule is introduced to drop unnecessary parentheses around expressions
+where the inner expression is unambiguous on its own, such as `f((3))`.
+Parentheses are kept where they are useful, such as on binary expressions. See #44.
+
+A new rule is introduced to require multi-line function calls to match
+the opening and closing parenthesis in terms of the use of newlines. See #74.
+
+The `-extra` flag now accepts a comma-separated list of rule names to enable
+individual extra rules, rather than enabling all of them at once. See #339.
+
+The following changes are included as well:
+
+* Avoid crashing on `go.mod` files without a `module` directive - #350
+* Avoid failing when an ignored directory cannot be read - #351
+* Avoid prefixing more kinds of commented-out Go code with spaces - #230
+* Avoid prefixing a shebang comment with a space - #237
+* Narrow the newlines on assignments rule to ignore complex cases - #354
+* Fix three bugs which caused a second gofumpt run to make changes - #132, #345
+
+## [v0.9.1] - 2025-09-07
+
+This is a bugfix release to address a regression in detecting
+comment directives with special characters such as `//golangcitest:config_path`.
+
+## [v0.9.0] - 2025-09-02
+
+This release is based on Go 1.25's gofmt, and requires Go 1.24 or later.
+
+A new rule is introduced to "clothe" naked returns for the sake of clarity.
+While there is nothing wrong with naming results in function signatures,
+using lone `return` statements can be confusing to the reader.
+
+Go 1.25's `ignore` directives in `go.mod` files are now obeyed;
+any directories within the module matching any of the patterns
+are now omitted when walking directories, such as with `gofumpt -w .`.
+
+Module information is now loaded via Go's [`x/mod/modfile` package](https://pkg.go.dev/golang.org/x/mod/modfile)
+rather than executing `go mod edit -json`, which is way faster.
+This should result in moderate speed-ups when formatting many directories.
+
+## [v0.8.0] - 2025-04-13
+
+This release is based on Go 1.24's gofmt, and requires Go 1.23 or later.
+
+The following changes are included:
+
+* Fail with `-d` if formatting any file resulted in a diff - #114
+* Do not panic when a `go.mod` file is missing a `go` directive - #317
+
+## [v0.7.0] - 2024-08-16
+
+This release is based on Go 1.23.0's gofmt, and requires Go 1.22 or later.
+
+The following changes are included:
+
+* Group `internal/...` imported packages as standard library - #307
+
+## [v0.6.0] - 2024-01-28
+
+This release is based on Go 1.21's gofmt, and requires Go 1.20 or later.
+
+The following changes are included:
+
+* Support `go` version strings from newer go.mod files - [#280]
+* Consider simple error checks even if they use the `=` operator - [#271]
+* Ignore `//line` directives to avoid panics - [#288]
+
+## [v0.5.0] - 2023-04-09
+
+This release is based on Go 1.20's gofmt, and requires Go 1.19 or later.
+
+The biggest change in this release is that we now vendor copies of the packages
+`go/format`, `go/printer`, and `go/doc/comment` on top of `cmd/gofmt` itself.
+This allows for each gofumpt release to format code in exactly the same way
+no matter what Go version is used to build it, as Go versions can change those
+three packages in ways that alter formatting behavior.
+
+This vendoring adds a small amount of duplication when using the
+`mvdan.cc/gofumpt/format` library, but it's the only way to make gofumpt
+versions consistent in their behavior and formatting, just like gofmt.
+
+The jump to Go 1.20's `go/printer` should also bring a small performance
+improvement, as we contributed patches to make printing about 25% faster:
+
+* https://go.dev/cl/412555
+* https://go.dev/cl/412557
+* https://go.dev/cl/424924
+
+The following changes are included as well:
+
+* Skip `testdata` dirs by default like we already do for `vendor` - [#260]
+* Avoid inserting newlines incorrectly in some func signatures - [#235]
+* Avoid joining some comments with the previous line - [#256]
+* Fix `gofumpt -version` for release archives - [#253]
+
+## [v0.4.0] - 2022-09-27
+
+This release is based on Go 1.19's gofmt, and requires Go 1.18 or later.
+We recommend building gofumpt with Go 1.19 for the best formatting results.
+
+The jump from Go 1.18 brings diffing in pure Go, removing the need to exec `diff`,
+and a small parsing speed-up thanks to `go/parser.SkipObjectResolution`.
+
+The following formatting fixes are included as well:
+
+* Allow grouping declarations with comments - [#212]
+* Properly measure the length of case clauses - [#217]
+* Fix a few crashes found by Go's native fuzzing
+
+## [v0.3.1] - 2022-03-21
+
+This bugfix release resolves a number of issues:
+
+* Avoid "too many open files" error regression introduced by [v0.3.0] - [#208]
+* Use the `go.mod` relative to each Go file when deriving flag defaults - [#211]
+* Remove unintentional debug prints when directly formatting files
+
+## [v0.3.0] - 2022-02-22
+
+This is gofumpt's third major release, based on Go 1.18's gofmt.
+The jump from Go 1.17's gofmt should bring a noticeable speed-up,
+as the tool can now format many files concurrently.
+On an 8-core laptop, formatting a large codebase is 4x as fast.
+
+The following [formatting rules](https://github.com/mvdan/gofumpt#Added-rules) are added:
+
+* Functions should separate `) {` where the indentation helps readability
+* Field lists should not have leading or trailing empty lines
+
+The following changes are included as well:
+
+* Generated files are now fully formatted when given as explicit arguments
+* Prepare for Go 1.18's module workspaces, which could cause errors
+* Import paths sharing a prefix with the current module path are no longer
+  grouped with standard library imports
+* `format.Options` gains a `ModulePath` field per the last bullet point
+
+## [v0.2.1] - 2021-12-12
+
+This bugfix release resolves a number of issues:
+
+* Add deprecated flags `-s` and `-r` once again, now giving useful errors
+* Avoid a panic with certain function declaration styles
+* Don't group interface members of different kinds
+* Account for leading comments in composite literals
+
+## [v0.2.0] - 2021-11-10
+
+This is gofumpt's second major release, based on Go 1.17's gofmt.
+The jump from Go 1.15's gofmt should bring a mild speed-up,
+as walking directories with `filepath.WalkDir` uses fewer syscalls.
+
+gofumports is now removed, after being deprecated in [v0.1.0].
+Its main purpose was IDE integration; it is now recommended to use gopls,
+which in turn implements goimports and supports gofumpt natively.
+IDEs which don't integrate with gopls (such as GoLand) implement goimports too,
+so it is safe to use gofumpt as their "format on save" command.
+See the [installation instructions](https://github.com/mvdan/gofumpt#Installation)
+for more details.
+
+The following [formatting rules](https://github.com/mvdan/gofumpt#Added-rules) are added:
+
+* Composite literals should not have leading or trailing empty lines
+* No empty lines following an assignment operator
+* Functions using an empty line for readability should use a `) {` line instead
+* Remove unnecessary empty lines from interfaces
+
+Finally, the following changes are made to the gofumpt tool:
+
+* Initial support for Go 1.18's type parameters is added
+* The `-r` flag is removed in favor of `gofmt -r`
+* The `-s` flag is removed as it is always enabled
+* Vendor directories are skipped unless given as explicit arguments
+* The added rules are not applied to generated Go files
+* The `format` Go API now also applies the `gofmt -s` simplification
+* Add support for `//gofumpt:diagnose` comments
+
+## [v0.1.1] - 2021-03-11
+
+This bugfix release backports fixes for a few issues:
+
+* Keep leading empty lines in func bodies if they help readability
+* Avoid breaking comment alignment on empty field lists
+* Add support for `//go-sumtype:` directives
+
+## [v0.1.0] - 2021-01-05
+
+This is gofumpt's first release, based on Go 1.15.x. It solidifies the features
+which have worked well for over a year.
+
+This release will be the last to include `gofumports`, the fork of `goimports`
+which applies `gofumpt`'s rules on top of updating the Go import lines. Users
+who were relying on `goimports` in their editors or IDEs to apply both `gofumpt`
+and `goimports` in a single step should switch to gopls, the official Go
+language server. It is supported by many popular editors such as VS Code and
+Vim, and already bundles gofumpt support. Instructions are available [in the
+README](https://github.com/mvdan/gofumpt).
+
+`gofumports` also added maintenance work and potential confusion to end users.
+In the future, there will only be one way to use `gofumpt` from the command
+line. We also have a [Go API](https://pkg.go.dev/mvdan.cc/gofumpt/format) for
+those building programs with gofumpt.
+
+Finally, this release adds the `-version` flag, to print the tool's own version.
+The flag will work for "master" builds too.
+
+[v0.11.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.11.0
+[v0.10.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.10.0
+[v0.9.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.9.0
+[v0.8.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.8.0
+[v0.7.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.7.0
+
+[v0.6.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.6.0
+[#271]: https://github.com/mvdan/gofumpt/issues/271
+[#280]: https://github.com/mvdan/gofumpt/issues/280
+[#288]: https://github.com/mvdan/gofumpt/issues/288
+
+[v0.5.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.5.0
+[#235]: https://github.com/mvdan/gofumpt/issues/235
+[#253]: https://github.com/mvdan/gofumpt/issues/253
+[#256]: https://github.com/mvdan/gofumpt/issues/256
+[#260]: https://github.com/mvdan/gofumpt/issues/260
+
+[v0.4.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.4.0
+[#212]: https://github.com/mvdan/gofumpt/issues/212
+[#217]: https://github.com/mvdan/gofumpt/issues/217
+
+[v0.3.1]: https://github.com/mvdan/gofumpt/releases/tag/v0.3.1
+[#208]: https://github.com/mvdan/gofumpt/issues/208
+[#211]: https://github.com/mvdan/gofumpt/pull/211
+
+[v0.3.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.3.0
+[v0.2.1]: https://github.com/mvdan/gofumpt/releases/tag/v0.2.1
+[v0.2.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.2.0
+[v0.1.1]: https://github.com/mvdan/gofumpt/releases/tag/v0.1.1
+[v0.1.0]: https://github.com/mvdan/gofumpt/releases/tag/v0.1.0
diff --git a/vendor/github.com/go-git/gcfg/LICENSE b/vendor/mvdan.cc/gofumpt/LICENSE
similarity index 89%
rename from vendor/github.com/go-git/gcfg/LICENSE
rename to vendor/mvdan.cc/gofumpt/LICENSE
index 87a5cede3..03e3bfc00 100644
--- a/vendor/github.com/go-git/gcfg/LICENSE
+++ b/vendor/mvdan.cc/gofumpt/LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go
-Authors. All rights reserved.
+Copyright (c) 2019, Daniel Martí. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
+   * Neither the name of the copyright holder nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/github.com/ProtonMail/go-crypto/LICENSE b/vendor/mvdan.cc/gofumpt/LICENSE.google
similarity index 100%
rename from vendor/github.com/ProtonMail/go-crypto/LICENSE
rename to vendor/mvdan.cc/gofumpt/LICENSE.google
diff --git a/vendor/mvdan.cc/gofumpt/README.md b/vendor/mvdan.cc/gofumpt/README.md
new file mode 100644
index 000000000..609cf65bf
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/README.md
@@ -0,0 +1,753 @@
+# gofumpt
+
+[![Go Reference](https://pkg.go.dev/badge/mvdan.cc/gofumpt/format.svg)](https://pkg.go.dev/mvdan.cc/gofumpt/format)
+
+	go install mvdan.cc/gofumpt@latest
+
+Enforce a stricter format than `gofmt`, while being backwards compatible.
+That is, `gofumpt` is happy with a subset of the formats that `gofmt` is happy with.
+
+The tool is a fork of `gofmt` as of Go 1.26.0, and requires Go 1.25 or later.
+It can be used as a drop-in replacement to format your Go code,
+and running `gofmt` after `gofumpt` should produce no changes.
+For example:
+
+	gofumpt -l -w .
+
+Some of the Go source files in this repository belong to the Go project.
+The project includes copies of `go/printer` and `go/doc/comment` as of Go 1.26.0
+to ensure consistent formatting independent of what Go version is being used.
+The [added formatting rules](#Added-rules) are implemented in the `format` package.
+
+`vendor` and `testdata` directories are skipped unless given as explicit arguments.
+Similarly, the added rules do not apply to generated Go files unless they are
+given as explicit arguments.
+
+[`ignore` directives](https://go.dev/ref/mod#go-mod-file-ignore) in `go.mod` files are obeyed as well,
+unless directories or files within them are given as explicit arguments.
+
+Finally, note that the `-r` rewrite flag is removed in favor of `gofmt -r`,
+and the `-s` flag is hidden as it is always enabled.
+
+### Added rules
+
+**No newline after a simple assignment's operator**
+
+
    Example
+
+```go
+func foo() {
+    foo :=
+        "bar"
+}
+```
+
+```go
+func foo() {
+	foo := "bar"
+}
+```
+
+
    
+
+**No empty lines around function bodies**
+
+
    Example
+
+```go
+func foo() {
+
+	println("bar")
+
+}
+```
+
+```go
+func foo() {
+	println("bar")
+}
+```
+
+
    
+
+**Functions should separate `) {` where the indentation helps readability**
+
+
    Example
+
+```go
+func foo(s string,
+	i int) {
+	println("bar")
+}
+
+// With an empty line it's slightly better, but still not great.
+func bar(s string,
+	i int) {
+
+	println("bar")
+}
+```
+
+```go
+func foo(s string,
+	i int,
+) {
+	println("bar")
+}
+
+// With an empty line it's slightly better, but still not great.
+func bar(s string,
+	i int,
+) {
+	println("bar")
+}
+```
+
+
    
+
+**No empty lines around a lone statement (or comment) in a block**
+
+
    Example
+
+```go
+if err != nil {
+
+	return err
+}
+```
+
+```go
+if err != nil {
+	return err
+}
+```
+
+
    
+
+**No empty lines before a simple error check**
+
+
    Example
+
+```go
+foo, err := processFoo()
+
+if err != nil {
+	return err
+}
+```
+
+```go
+foo, err := processFoo()
+if err != nil {
+	return err
+}
+```
+
+
    
+
+**Composite literals should use newlines consistently**
+
+
    Example
+
+```go
+// A newline before or after an element requires newlines for the opening and
+// closing braces.
+var ints = []int{1, 2,
+	3, 4}
+
+// A newline between consecutive elements requires a newline between all
+// elements.
+var matrix = [][]int{
+	{1},
+	{2}, {
+		3,
+	},
+}
+```
+
+```go
+var ints = []int{
+	1, 2,
+	3, 4,
+}
+
+var matrix = [][]int{
+	{1},
+	{2},
+	{
+		3,
+	},
+}
+```
+
+
    
+
+**Empty field lists should use a single line**
+
+
    Example
+
+```go
+var V interface {
+} = 3
+
+type T struct {
+}
+
+func F(
+)
+```
+
+```go
+var V interface{} = 3
+
+type T struct{}
+
+func F()
+```
+
+
    
+
+**`std` imports must be in a separate group at the top**
+
+
    Example
+
+```go
+import (
+	"foo.com/bar"
+
+	"io"
+
+	"io/ioutil"
+)
+```
+
+```go
+import (
+	"io"
+	"io/ioutil"
+
+	"foo.com/bar"
+)
+```
+
+
    
+
+**Short case clauses should take a single line**
+
+
    Example
+
+```go
+switch c {
+case 'a', 'b',
+	'c', 'd':
+}
+```
+
+```go
+switch c {
+case 'a', 'b', 'c', 'd':
+}
+```
+
+
    
+
+**Multiline top-level declarations must be separated by empty lines**
+
+
    Example
+
+```go
+func foo() {
+	println("multiline foo")
+}
+func bar() {
+	println("multiline bar")
+}
+```
+
+```go
+func foo() {
+	println("multiline foo")
+}
+
+func bar() {
+	println("multiline bar")
+}
+```
+
+
    
+
+**Single var declarations should not be grouped with parentheses**
+
+
    Example
+
+```go
+var (
+	foo = "bar"
+)
+```
+
+```go
+var foo = "bar"
+```
+
+
    
+
+**Contiguous top-level declarations should be grouped together**
+
+
    Example
+
+```go
+var nicer = "x"
+var with = "y"
+var alignment = "z"
+```
+
+```go
+var (
+	nicer     = "x"
+	with      = "y"
+	alignment = "z"
+)
+```
+
+
    
+
+**Simple var-declaration statements should use short assignments**
+
+
    Example
+
+```go
+var s = "somestring"
+```
+
+```go
+s := "somestring"
+```
+
+
    
+
+**The `-s` code simplification flag is enabled by default**
+
+
    Example
+
+```go
+var _ = [][]int{[]int{1}}
+```
+
+```go
+var _ = [][]int{{1}}
+```
+
+
    
+
+**Octal integer literals should use the `0o` prefix on modules using Go 1.13 and later**
+
+
    Example
+
+```go
+const perm = 0755
+```
+
+```go
+const perm = 0o755
+```
+
+
    
+
+**Comments which aren't Go directives should start with a whitespace**
+
+
    Example
+
+```go
+//go:noinline
+
+//Foo is awesome.
+func Foo() {}
+```
+
+```go
+//go:noinline
+
+// Foo is awesome.
+func Foo() {}
+```
+
+
    
+
+**Composite literals should not have leading or trailing empty lines**
+
+
    Example
+
+```go
+var _ = []string{
+
+	"foo",
+
+}
+
+var _ = map[string]string{
+
+	"foo": "bar",
+
+}
+```
+
+```go
+var _ = []string{
+	"foo",
+}
+
+var _ = map[string]string{
+	"foo": "bar",
+}
+```
+
+
    
+
+**Field lists should not have leading or trailing empty lines**
+
+
    Example
+
+```go
+type Person interface {
+
+	Name() string
+
+	Age() int
+
+}
+
+type ZeroFields struct {
+
+	// No fields are needed here.
+
+}
+```
+
+```go
+type Person interface {
+	Name() string
+
+	Age() int
+}
+
+type ZeroFields struct {
+	// No fields are needed here.
+}
+```
+
+
    
+
+**Definitely useless parentheses should be removed**
+
+
    Example
+
+```go
+type C chan (int)
+
+var _ = f((3))
+```
+
+```go
+type C chan int
+
+var _ = f(3)
+```
+
+Parentheses around binary or unary expressions, as well as around types
+which require them (such as `chan (<-chan T)`), are kept as is.
+
+
    
+
+### Extra rules behind `-extra`
+
+**Adjacent parameters with the same type should be grouped together**
+
+
    Example
+
+```go
+func Foo(bar string, baz string) {}
+```
+
+```go
+func Foo(bar, baz string) {}
+```
+
+
    
+
+**Avoid naked returns for the sake of clarity**
+
+
    Example
+
+```go
+func Foo() (err error) {
+	return
+}
+```
+
+```go
+func Foo() (err error) {
+	return err
+}
+```
+
+
    
+
+**Multi-line function calls with the opening parenthesis at the end of a line
+should place the closing parenthesis at the start of a line**
+
+
    Example
+
+```go
+result := compute(
+	a,
+	b,
+	c)
+```
+
+```go
+result := compute(
+	a,
+	b,
+	c,
+)
+```
+
+
    
+
+### Installation
+
+`gofumpt` is a replacement for `gofmt`, so you can simply `go install` it as
+described at the top of this README and use it.
+
+When using an IDE or editor with Go integration based on `gopls`,
+it's best to configure the editor to use the `gofumpt` support built into `gopls`.
+
+The instructions below show how to set up `gofumpt` for some of the
+major editors out there.
+
+#### Visual Studio Code
+
+Enable the language server following [the official docs](https://github.com/golang/vscode-go#readme),
+and then enable gopls's `gofumpt` option. Note that VS Code will complain about
+the `gopls` settings, but they will still work.
+
+```json
+"go.useLanguageServer": true,
+"gopls": {
+	"formatting.gofumpt": true,
+},
+```
+
+#### GoLand
+
+GoLand doesn't use `gopls` so it should be configured to use `gofumpt` directly.
+Once `gofumpt` is installed, follow the steps below:
+
+- Open **Settings** (File > Settings)
+- Open the **Tools** section
+- Find the *File Watchers* sub-section
+- Click on the `+` on the right side to add a new file watcher
+- Choose *Custom Template*
+
+When a window asks for settings, you can enter the following:
+
+* File Types: Select all .go files
+* Scope: Project Files
+* Program: Select your `gofumpt` executable
+* Arguments: `-w $FilePath$`
+* Output path to refresh: `$FilePath$`
+* Working directory: `$ProjectFileDir$`
+* Environment variables: `GOROOT=$GOROOT$;GOPATH=$GOPATH$;PATH=$GoBinDirs$`
+
+To avoid unnecessary runs, you should disable all checkboxes in the *Advanced* section.
+
+#### Vim
+
+The configuration depends on the plugin you are using: [vim-go](https://github.com/fatih/vim-go)
+or [govim](https://github.com/govim/govim).
+
+##### vim-go
+
+To configure `gopls` to use `gofumpt`:
+
+```vim
+let g:go_fmt_command="gopls"
+let g:go_gopls_gofumpt=1
+```
+
+##### govim
+
+To configure `gopls` to use `gofumpt`:
+
+```vim
+call govim#config#Set("Gofumpt", 1)
+```
+
+#### Neovim
+
+When using [`lspconfig`](https://github.com/neovim/nvim-lspconfig), pass the `gofumpt` setting to `gopls`:
+
+```lua
+require('lspconfig').gopls.setup({
+    settings = {
+        gopls = {
+            gofumpt = true
+        }
+    }
+})
+```
+
+#### Emacs
+
+For [lsp-mode](https://emacs-lsp.github.io/lsp-mode/) users on version 8.0.0 or higher:
+
+```elisp
+(setq lsp-go-use-gofumpt t)
+```
+
+For users of `lsp-mode` before `8.0.0`:
+
+```elisp
+(lsp-register-custom-settings
+ '(("gopls.gofumpt" t)))
+```
+
+For [eglot](https://github.com/joaotavora/eglot) users:
+
+```elisp
+(setq-default eglot-workspace-configuration
+ '((:gopls . ((gofumpt . t)))))
+```
+
+#### Helix
+
+When using the `gopls` language server, modify the Go settings in `~/.config/helix/languages.toml`:
+
+```toml
+[language-server.gopls.config]
+"formatting.gofumpt" = true
+```
+
+#### Sublime Text
+
+With ST4, install the Sublime Text LSP extension according to [the documentation](https://github.com/sublimelsp/LSP),
+and enable `gopls`'s `gofumpt` option in the LSP package settings,
+including setting `lsp_format_on_save` to `true`.
+
+```json
+"lsp_format_on_save": true,
+"clients":
+{
+	"gopls":
+	{
+		"enabled": true,
+		"initializationOptions": {
+			"gofumpt": true,
+		}
+	}
+}
+```
+
+### Zed
+For `gofumpt` to be used in Zed, you need to set the `gofumpt` option in the LSP settings. This is done by providing the `"gofumpt": true` in `initialization_options`.
+
+```json
+"lsp": {
+  "gopls": {
+    "initialization_options": {
+      "gofumpt": true
+    }
+  }
+}
+```
+
+### Roadmap
+
+This tool is a place to experiment. In the long term, the features that work
+well might be proposed for `gofmt` itself.
+
+The tool is also compatible with `gofmt` and is aimed to be stable, so you can
+rely on it for your code as long as you pin a version of it.
+
+### Updating with `go/format` and `cmd/gofmt`
+
+`internal/govendor` contains frozen copies of `go/format` and its dependencies
+at a specific Go version, so that installing a specific version of `gofumpt`
+results in exactly the same formatting behavior regardless of the Go version.
+
+As this tool is a fork of `cmd/gofmt`, the `gofmt.go`, `internal.go`,
+`format/rewrite.go`, and `format/simplify.go` are inherited from upstream.
+These include some modifications where necessary, and are updated manually.
+Note that two live under the `format` package as we want to expose
+syntax simplification via the Go API.
+
+### Frequently Asked Questions
+
+> Why attempt to replace `gofmt` instead of building on top of it?
+
+Our design is to build on top of `gofmt`, and we'll never add rules which
+disagree with its formatting. So we extend `gofmt` rather than compete with it.
+
+The tool is a modified copy of `gofmt`, for the purpose of allowing its use as a
+drop-in replacement in editors and scripts.
+
+> Why are my module imports being grouped with standard library imports?
+
+Any import paths that don't start with a domain name like `foo.com` are
+effectively [reserved by the Go toolchain](https://github.com/golang/go/issues/32819).
+Third party modules should either start with a domain name,
+even a local one like `foo.local`, or use [a reserved path prefix](https://github.com/golang/go/issues/37641).
+
+For backwards compatibility with modules set up before these rules were clear,
+`gofumpt` will treat any import path sharing a prefix with the current module
+path as third party. For example, if the current module is `mycorp/mod1`, then
+all import paths in `mycorp/...` will be considered third party.
+
+> How can I use `gofumpt` if I already use `goimports` to replace `gofmt`?
+
+Most editors have replaced the `goimports` program with the same functionality
+provided by a language server like `gopls`. This mechanism is significantly
+faster and more powerful, since the language server has more information that is
+kept up to date, necessary to add missing imports.
+
+As such, the general recommendation is to let your editor fix your imports -
+either via `gopls`, such as VSCode or vim-go, or via their own custom
+implementation, such as GoLand. Then follow the install instructions above to
+enable the use of `gofumpt` instead of `gofmt`.
+
+If you want to avoid integrating with `gopls`, and are OK with the overhead of
+calling `goimports` from scratch on each save, you should be able to call both
+tools; for example, `goimports file.go && gofumpt file.go`.
+
+### Contributing
+
+Issues and pull requests are welcome! Please open an issue to discuss a feature
+before sending a pull request.
+
+We also use the `#gofumpt` channel over at the
+[Gophers Slack](https://invite.slack.golangbridge.org/) to chat.
+
+When reporting a formatting bug, insert a `//gofumpt:diagnose` comment.
+The comment will be rewritten to include useful debugging information.
+For instance:
+
+```
+$ cat f.go
+package p
+
+//gofumpt:diagnose
+$ gofumpt f.go
+package p
+
+//gofumpt:diagnose v0.1.1-0.20211103104632-bdfa3b02e50a -lang=go1.16
+```
+
+### License
+
+Note that much of the code is copied from Go's `gofmt` command. You can tell
+which files originate from the Go repository from their copyright headers. Their
+license file is `LICENSE.google`.
+
+`gofumpt`'s original source files are also under the 3-clause BSD license, with
+the separate file `LICENSE`.
diff --git a/vendor/mvdan.cc/gofumpt/doc.go b/vendor/mvdan.cc/gofumpt/doc.go
new file mode 100644
index 000000000..6c623c8e9
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/doc.go
@@ -0,0 +1,5 @@
+// Copyright (c) 2023, Daniel Martí 
+// See LICENSE for licensing information
+
+// gofumpt enforces a stricter format than gofmt, while being backwards compatible.
+package main
diff --git a/vendor/mvdan.cc/gofumpt/format/format.go b/vendor/mvdan.cc/gofumpt/format/format.go
new file mode 100644
index 000000000..438a73b53
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/format/format.go
@@ -0,0 +1,1396 @@
+// Copyright (c) 2019, Daniel Martí 
+// See LICENSE for licensing information
+
+// Package format exposes gofumpt's formatting in an API similar to go/format.
+// In general, the APIs are only guaranteed to work well when the input source
+// is in canonical gofmt format.
+package format
+
+import (
+	"bytes"
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	goversion "go/version"
+	"os"
+	"reflect"
+	"regexp"
+	"slices"
+	"sort"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"golang.org/x/tools/go/ast/astutil"
+
+	"mvdan.cc/gofumpt/internal/govendor/go/format"
+	"mvdan.cc/gofumpt/internal/version"
+)
+
+// Options is the set of formatting options which affect gofumpt.
+type Options struct {
+	// LangVersion is the Go version a piece of code is written in.
+	// The version is used to decide whether to apply formatting
+	// rules which require new language features.
+	// When empty, a default of go1 is assumed.
+	// Otherwise, the version must satisfy [go/version.IsValid].
+	//
+	// When formatting a Go module, LangVersion should typically be
+	//
+	//     go list -m -f {{.GoVersion}}
+	//
+	// with a "go" prefix, or the equivalent from `go mod edit -json`.
+	LangVersion string
+
+	// ModulePath corresponds to the Go module path which contains the source
+	// code being formatted. When formatting a Go module, ModulePath should be
+	//
+	//     go list -m -f {{.Path}}
+	//
+	// or the equivalent from `go mod edit -json`.
+	//
+	// ModulePath is used for formatting decisions like what import paths are
+	// considered to be not part of the standard library. When empty, the source
+	// is formatted as if it weren't inside a module.
+	ModulePath string
+
+	// ExtraRules enables all extra formatting rules, such as grouping function
+	// parameters with repeated types together.
+	//
+	// Deprecated: use [Options.Extra] instead.
+	ExtraRules bool
+
+	// Extra allows enabling extra formatting rules which are disabled by default.
+	Extra Extra
+}
+
+// Extra is the set of extra formatting rules which are available.
+//
+// As the formatter evolves, we might add or remove boolean fields here.
+// Go API users who wish to avoid build errors in such cases
+// can use the string API in [Extra.Set].
+type Extra struct {
+	// TODO: should we have "All" to turn them all on,
+	// akin to how the CLI has -extra=true for historical reasons?
+	// I lean against it, as it should be a conscious choice to turn on
+	// each of these extra rules, and we should be able to add more rules
+	// without fear of causing unexpected changes for users.
+
+	// GroupParams groups function parameters with repeated types.
+	GroupParams bool
+
+	// ClotheReturns clothes naked returns in functions with named results.
+	ClotheReturns bool
+
+	// BalanceCalls places a multi-line call's closing parenthesis on its
+	// own line when the opening parenthesis ends a line.
+	BalanceCalls bool
+}
+
+func (e *Extra) String() string {
+	var active []string
+	if e.GroupParams {
+		active = append(active, "group_params")
+	}
+	if e.ClotheReturns {
+		active = append(active, "clothe_returns")
+	}
+	if e.BalanceCalls {
+		active = append(active, "balance_calls")
+	}
+	return strings.Join(active, ",")
+}
+
+func (e *Extra) Set(v string) error {
+	if v == "true" {
+		e.GroupParams = true
+		e.ClotheReturns = true
+		e.BalanceCalls = true
+		return nil
+	}
+	*e = Extra{}
+	if v == "false" {
+		return nil
+	}
+	for s := range strings.SplitSeq(v, ",") {
+		switch s {
+		case "group_params":
+			e.GroupParams = true
+		case "clothe_returns":
+			e.ClotheReturns = true
+		case "balance_calls":
+			e.BalanceCalls = true
+		default:
+			return fmt.Errorf("unknown rule: %q", s)
+		}
+	}
+	return nil
+}
+
+func (e *Extra) IsBoolFlag() bool { return true }
+
+// Source formats src in gofumpt's format, assuming that src holds a valid Go
+// source file.
+func Source(src []byte, opts Options) ([]byte, error) {
+	fset := token.NewFileSet()
+
+	// Ensure our parsed files never start with base 1,
+	// to ensure that using token.NoPos+1 will panic.
+	fset.AddFile("gofumpt_base.go", 1, 10)
+
+	file, err := parser.ParseFile(fset, "", src, parser.SkipObjectResolution|parser.ParseComments)
+	if err != nil {
+		return nil, err
+	}
+
+	File(fset, file, opts)
+
+	var buf bytes.Buffer
+	if err := format.Node(&buf, fset, file); err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+// File modifies a file and fset in place to follow gofumpt's format. The
+// changes might include manipulating adding or removing newlines in fset,
+// modifying the position of nodes, or modifying literal values.
+func File(fset *token.FileSet, file *ast.File, opts Options) {
+	simplify(file)
+
+	if opts.ExtraRules {
+		opts.Extra.Set("true") // enable all the extra rules
+	}
+
+	if opts.LangVersion == "" {
+		opts.LangVersion = "go1"
+	} else {
+		lang := goversion.Lang(opts.LangVersion)
+		if lang == "" {
+			panic(fmt.Sprintf("invalid Go version: %q", opts.LangVersion))
+		}
+		opts.LangVersion = lang
+	}
+	f := &fumpter{
+		file:    fset.File(file.Pos()),
+		fset:    fset,
+		astFile: file,
+		Options: opts,
+
+		minSplitFactor: 0.4,
+	}
+	var topFuncType *ast.FuncType
+	pre := func(c *astutil.Cursor) bool {
+		f.applyPre(c)
+		switch node := c.Node().(type) {
+		case *ast.FuncDecl:
+			topFuncType = node.Type
+			f.parentFuncTypes = append(f.parentFuncTypes, node.Type)
+		case *ast.FuncLit:
+			f.parentFuncTypes = append(f.parentFuncTypes, node.Type)
+		case *ast.FieldList:
+			ft, _ := c.Parent().(*ast.FuncType)
+			if ft == nil || ft != topFuncType {
+				break
+			}
+
+			// For top-level function declaration parameters,
+			// require the line split to be longer.
+			// This avoids func lines which are a bit too short,
+			// and allows func lines which are a bit longer.
+			//
+			// We don't just increase longLineLimit,
+			// as we still want splits at around the same place.
+			if ft.Params == node {
+				f.minSplitFactor = 0.6
+			}
+
+			// Don't split result parameters into multiple lines,
+			// as that can be easily confused for input parameters.
+			// TODO: consider the same for single-line func calls in
+			// if statements.
+			// TODO: perhaps just use a higher factor, like 0.8.
+			if ft.Results == node {
+				f.minSplitFactor = 1000
+			}
+		case *ast.BlockStmt:
+			f.blockLevel++
+		}
+		return true
+	}
+	post := func(c *astutil.Cursor) bool {
+		f.applyPost(c)
+
+		// Reset minSplitFactor and blockLevel.
+		switch node := c.Node().(type) {
+		case *ast.FuncDecl, *ast.FuncLit:
+			f.parentFuncTypes = f.parentFuncTypes[:len(f.parentFuncTypes)-1]
+		case *ast.FuncType:
+			if node == topFuncType {
+				f.minSplitFactor = 0.4
+			}
+		case *ast.BlockStmt:
+			f.blockLevel--
+		}
+		return true
+	}
+	astutil.Apply(file, pre, post)
+}
+
+// Multiline nodes which could easily fit on a single line under this many bytes
+// may be collapsed onto a single line.
+const shortLineLimit = 60
+
+// Single-line nodes which take over this many bytes, and could easily be split
+// into two lines of at least its minSplitFactor factor, may be split.
+const longLineLimit = 100
+
+var rxOctalInteger = regexp.MustCompile(`\A0[0-7_]+\z`)
+
+type fumpter struct {
+	Options
+
+	file *token.File
+	fset *token.FileSet
+
+	astFile *ast.File
+
+	// blockLevel is the number of indentation blocks we're currently under.
+	// It is used to approximate the levels of indentation a line will end
+	// up with.
+	blockLevel int
+
+	minSplitFactor float64
+
+	// parentFuncTypes is a stack of parent function types,
+	// used to determine return type information when clothing naked returns.
+	parentFuncTypes []*ast.FuncType
+}
+
+func (f *fumpter) commentsBetween(p1, p2 token.Pos) []*ast.CommentGroup {
+	comments := f.astFile.Comments
+	i1 := sort.Search(len(comments), func(i int) bool {
+		return comments[i].Pos() >= p1
+	})
+	comments = comments[i1:]
+	i2 := sort.Search(len(comments), func(i int) bool {
+		return comments[i].Pos() >= p2
+	})
+	comments = comments[:i2]
+	return comments
+}
+
+func (f *fumpter) inlineComment(pos token.Pos) *ast.Comment {
+	comments := f.astFile.Comments
+	i := sort.Search(len(comments), func(i int) bool {
+		return comments[i].Pos() >= pos
+	})
+	if i >= len(comments) {
+		return nil
+	}
+	line := f.Line(pos)
+	for _, comment := range comments[i].List {
+		if f.Line(comment.Pos()) == line {
+			return comment
+		}
+	}
+	return nil
+}
+
+// addNewline is a hack to let us force a newline at a certain position.
+func (f *fumpter) addNewline(at token.Pos) {
+	offset := f.Offset(at)
+
+	lines := f.file.Lines()
+	i, exists := slices.BinarySearch(lines, offset)
+	if exists {
+		// This newline already exists; do nothing. Duplicate
+		// newlines can't exist.
+		return
+	}
+	lines = slices.Insert(lines, i, offset)
+	if !f.file.SetLines(lines) {
+		panic(fmt.Sprintf("could not set lines to %v", lines))
+	}
+}
+
+// removeLines removes all newlines between two positions, so that they end
+// up on the same line.
+func (f *fumpter) removeLines(fromLine, toLine int) {
+	for fromLine < toLine {
+		f.file.MergeLine(fromLine)
+		toLine--
+	}
+}
+
+// removeLinesBetween is like removeLines, but it leaves one newline between the
+// two positions.
+func (f *fumpter) removeLinesBetween(from, to token.Pos) {
+	f.removeLines(f.Line(from)+1, f.Line(to))
+}
+
+// removeParens unwraps a single-spec var group like "var (\n\tx = 1\n)" into a
+// lone "var x = 1". It only acts on such groups without a doc comment.
+func (f *fumpter) removeParens(node *ast.GenDecl) {
+	if node.Tok != token.VAR || len(node.Specs) != 1 ||
+		!node.Lparen.IsValid() || node.Doc != nil {
+		return
+	}
+	specPos := node.Specs[0].Pos()
+	specEnd := node.Specs[0].End()
+
+	if len(f.commentsBetween(node.TokPos, specPos)) > 0 {
+		// If the single spec has a comment on the line above,
+		// the comment must go before the entire declaration now.
+		node.TokPos = specPos
+	} else {
+		f.removeLines(f.Line(node.TokPos), f.Line(specPos))
+	}
+	if len(f.commentsBetween(specEnd, node.Rparen)) > 0 {
+		// Leave one newline to not force a comment on the next line to
+		// become an inline comment.
+		f.removeLines(f.Line(specEnd)+1, f.Line(node.Rparen))
+	} else {
+		f.removeLines(f.Line(specEnd), f.Line(node.Rparen))
+	}
+
+	// Remove the parentheses. go/printer will automatically
+	// get rid of the newlines.
+	node.Lparen = token.NoPos
+	node.Rparen = token.NoPos
+}
+
+func (f *fumpter) Position(p token.Pos) token.Position {
+	return f.file.PositionFor(p, false)
+}
+
+func (f *fumpter) Line(p token.Pos) int {
+	return f.Position(p).Line
+}
+
+func (f *fumpter) Offset(p token.Pos) int {
+	return f.file.Offset(p)
+}
+
+type byteCounter int
+
+func (b *byteCounter) Write(p []byte) (n int, err error) {
+	*b += byteCounter(len(p))
+	return len(p), nil
+}
+
+func (f *fumpter) printLength(node ast.Node) int {
+	var count byteCounter
+	if err := format.Node(&count, f.fset, node); err != nil {
+		panic(fmt.Sprintf("unexpected print error: %v", err))
+	}
+
+	// Add the space taken by an inline comment.
+	if c := f.inlineComment(node.End()); c != nil {
+		fmt.Fprintf(&count, " %s", c.Text)
+	}
+
+	// Add an approximation of the indentation level. We can't know the
+	// number of tabs go/printer will add ahead of time. Trying to print the
+	// entire top-level declaration would tell us that, but then it's near
+	// impossible to reliably find our node again.
+	return int(count) + (f.blockLevel * 8)
+}
+
+func (f *fumpter) lineEnd(line int) token.Pos {
+	if line < 1 {
+		panic("illegal line number")
+	}
+	total := f.file.LineCount()
+	if line > total {
+		panic("illegal line number")
+	}
+	if line == total {
+		return f.astFile.End()
+	}
+	return f.file.LineStart(line+1) - 1
+}
+
+// rxCommentDirective covers all common Go comment directives, such as:
+//
+//	//go:          | standard Go directives, like go:noinline
+//	//some-words:  | similar to the syntax above, like lint:ignore or go-sumtype:decl
+//	//export       | to mark cgo funcs for exporting
+//	//extern       | C function declarations for gccgo
+//	//line         | inserted line information for cmd/compile
+//	//noinspection | noinspection directive for GoLand and friends
+//	//nolint       | nolint directive for golangci
+//	//#nosec       | #nosec directive for gosec
+//	//NOSONAR      | NOSONAR directive for SonarQube
+//	//sys(nb)?     | syscall function wrapper prototypes
+var rxCommentDirective = regexp.MustCompile(
+	`^(?:` +
+		// Patterns directly from https://go.dev/doc/comment#syntax.
+		// Note that we adjust the first pattern to allow for //go-sumtype:decl,
+		// which is a tool that existed before the Go convention was documented.
+		`[a-z0-9-]+:[a-z0-9]` +
+		`|export ` +
+		`|extern ` +
+		`|line ` +
+		// Third-party patterns; we generally assume they end with a word boundary.
+		`|no(?:inspection|lint)\b` +
+		`|#nosec\b` +
+		`|NOSONAR\b` +
+		`|sys(?:nb)?\b` +
+		`)`)
+
+// rxShebangComment matches a shebang like `//usr/bin/env go run`.
+var rxShebangComment = regexp.MustCompile(`^//[^ /].*\bbin/`)
+
+// commentGroupLooksLikeCode reports whether the lines of a //-style comment
+// group parse as Go statements with at least one non-trivial statement.
+// A bare identifier path or label is treated as trivial, since prose like
+// "// foo" or "// TODO: bar" parses but is not commented-out code.
+func commentGroupLooksLikeCode(group *ast.CommentGroup) bool {
+	src := "package p\nfunc _() {\n" + group.Text() + "}\n"
+	// AllErrors avoids the parser's panic/recover bailout on too many errors,
+	// which crashes under tinygo's Wasm target as it lacks recover support.
+	file, err := parser.ParseFile(token.NewFileSet(), "", src, parser.SkipObjectResolution|parser.AllErrors)
+	if err != nil {
+		return false
+	}
+	fn, _ := file.Decls[0].(*ast.FuncDecl)
+	if fn == nil || fn.Body == nil {
+		return false
+	}
+	for _, stmt := range fn.Body.List {
+		if !isTrivialStmt(stmt) {
+			return true
+		}
+	}
+	return false
+}
+
+func isTrivialStmt(stmt ast.Stmt) bool {
+	switch s := stmt.(type) {
+	case *ast.ExprStmt:
+		return isIdentPath(s.X)
+	case *ast.LabeledStmt:
+		return isTrivialStmt(s.Stmt)
+	case *ast.EmptyStmt:
+		return true
+	}
+	return false
+}
+
+func isIdentPath(expr ast.Expr) bool {
+	switch e := expr.(type) {
+	case *ast.Ident:
+		return true
+	case *ast.SelectorExpr:
+		return isIdentPath(e.X)
+	}
+	return false
+}
+
+func (f *fumpter) applyPre(c *astutil.Cursor) {
+	f.splitLongLine(c)
+
+	switch node := c.Node().(type) {
+	case *ast.File:
+		// Unwrap single-spec var groups before the joining below,
+		// so an adjacent var line and var group merge in one pass.
+		for _, decl := range node.Decls {
+			if decl, ok := decl.(*ast.GenDecl); ok {
+				f.removeParens(decl)
+			}
+		}
+
+		// Join contiguous lone var/const/import lines.
+		// Abort if there are empty lines in between,
+		// including a leading comment if it's a directive.
+		newDecls := make([]ast.Decl, 0, len(node.Decls))
+		for i := 0; i < len(node.Decls); {
+			newDecls = append(newDecls, node.Decls[i])
+			start, ok := node.Decls[i].(*ast.GenDecl)
+			if !ok || isCgoImport(start) || containsAnyDirective(start.Doc) {
+				i++
+				continue
+			}
+			lastPos := start.Pos()
+			merged := false
+		contLoop:
+			for i++; i < len(node.Decls); {
+				cont, ok := node.Decls[i].(*ast.GenDecl)
+				if !ok || cont.Tok != start.Tok || cont.Lparen != token.NoPos || isCgoImport(cont) {
+					break
+				}
+				// Are there things between these two declarations? e.g. empty lines, comments, directives
+				// If so, break the chain on empty lines and directives, continue below for comments.
+				if f.Line(lastPos) < f.Line(cont.Pos())-1 {
+					// break on empty line
+					if cont.Doc == nil {
+						break
+					}
+					// break on directive
+					for i, comment := range cont.Doc.List {
+						if f.Line(comment.Slash) != f.Line(lastPos)+1+i || rxCommentDirective.MatchString(strings.TrimPrefix(comment.Text, "//")) {
+							break contLoop
+						}
+					}
+					// continue below for comments
+				}
+
+				start.Specs = append(start.Specs, cont.Specs...)
+				merged = true
+				end := cont.End()
+				if c := f.inlineComment(cont.End()); c != nil {
+					// don't move an inline comment outside
+					end = c.End()
+				}
+				// Point Rparen at the last content character, like a real
+				// ')', so start.End() stays on the content's final line and
+				// the empty-line separator below is idempotent in one pass.
+				start.Rparen = end - 1
+				lastPos = cont.Pos()
+				i++
+			}
+			// Re-sort imports in the new group so the output is idempotent.
+			// Set Lparen so ast.SortImports doesn't skip the merged decl.
+			if merged && start.Tok == token.IMPORT {
+				start.Lparen = start.TokPos + token.Pos(len("import"))
+				ast.SortImports(f.fset, f.astFile)
+			}
+		}
+		node.Decls = newDecls
+
+		// Multiline top-level declarations should be separated by an
+		// empty line.
+		// Do this after the joining of lone declarations above,
+		// as joining single-line declarations makes then multi-line.
+		var lastMulti bool
+		var lastEnd token.Pos
+		for _, decl := range node.Decls {
+			pos := decl.Pos()
+			// Trailing inline comments on lastEnd's line belong to the
+			// previous decl and extend its effective end.
+			effectiveEnd := lastEnd
+			lastEndLine := f.Line(lastEnd)
+			for _, cg := range f.commentsBetween(lastEnd, pos) {
+				if f.Line(cg.Pos()) != lastEndLine {
+					pos = cg.Pos()
+					break
+				}
+				effectiveEnd = cg.End()
+			}
+
+			// Note that we want End-1, as End is the character after the node.
+			multi := f.Line(pos) < f.Line(decl.End()-1)
+			// A func declaration which fits on a single source line may
+			// still be printed across multiple lines: go/printer's funcBody
+			// breaks the body onto its own lines once header+body exceeds
+			// 100 bytes. Approximate that with the source byte length.
+			if fn, _ := decl.(*ast.FuncDecl); fn != nil && !multi && fn.Body != nil &&
+				f.Offset(fn.End())-f.Offset(fn.Pos()) > 100 {
+				multi = true
+			}
+			if multi && lastMulti && f.Line(effectiveEnd)+1 == f.Line(pos) {
+				f.addNewline(effectiveEnd)
+			}
+
+			lastMulti = multi
+			lastEnd = decl.End()
+		}
+
+		// Comments aren't nodes, so they're not walked by default.
+	groupLoop:
+		for _, group := range node.Comments {
+			for _, comment := range group.List {
+				// Leave shebang lines like `//usr/bin/env go run` alone.
+				if f.Line(comment.Slash) == 1 && rxShebangComment.MatchString(comment.Text) {
+					continue groupLoop
+				}
+				if comment.Text == "//gofumpt:diagnose" || strings.HasPrefix(comment.Text, "//gofumpt:diagnose ") {
+					slc := []string{
+						"//gofumpt:diagnose",
+						"version:",
+						version.String(""),
+						"flags:",
+						"-lang=" + f.LangVersion,
+						"-modpath=" + f.ModulePath,
+					}
+					if s := f.Extra.String(); s != "" {
+						slc = append(slc, "-extra="+s)
+					}
+					comment.Text = strings.Join(slc, " ")
+				}
+				body := strings.TrimPrefix(comment.Text, "//")
+				if body == comment.Text {
+					// /*-style comment
+					continue groupLoop
+				}
+				if rxCommentDirective.MatchString(body) {
+					// this line is a directive
+					continue groupLoop
+				}
+				r, _ := utf8.DecodeRuneInString(body)
+				if !unicode.IsLetter(r) && !unicode.IsNumber(r) && !unicode.IsSpace(r) {
+					// this line could be code like "//{"
+					continue groupLoop
+				}
+			}
+			if commentGroupLooksLikeCode(group) {
+				continue groupLoop
+			}
+			// If none of the comment group's lines look like a
+			// directive or code, add spaces, if needed.
+			for _, comment := range group.List {
+				body := strings.TrimPrefix(comment.Text, "//")
+				r, _ := utf8.DecodeRuneInString(body)
+				if !unicode.IsSpace(r) {
+					comment.Text = "// " + body
+				}
+			}
+		}
+
+	case *ast.DeclStmt:
+		decl, ok := node.Decl.(*ast.GenDecl)
+		if !ok || decl.Tok != token.VAR || len(decl.Specs) != 1 {
+			break // e.g. const name = "value"
+		}
+		spec := decl.Specs[0].(*ast.ValueSpec)
+		if spec.Type != nil {
+			break // e.g. var name Type
+		}
+		tok := token.ASSIGN
+		names := make([]ast.Expr, len(spec.Names))
+		for i, name := range spec.Names {
+			names[i] = name
+			if name.Name != "_" {
+				tok = token.DEFINE
+			}
+		}
+		c.Replace(&ast.AssignStmt{
+			Lhs: names,
+			Tok: tok,
+			Rhs: spec.Values,
+		})
+
+	case *ast.GenDecl:
+		if node.Tok == token.IMPORT && node.Lparen.IsValid() {
+			f.joinStdImports(node)
+		}
+
+		// Single var declarations shouldn't use parentheses, unless
+		// there's a comment on the grouped declaration.
+		f.removeParens(node)
+
+	case *ast.InterfaceType:
+		if len(node.Methods.List) > 0 {
+			method := node.Methods.List[0]
+			removeToPos := method.Pos()
+			if comments := f.commentsBetween(node.Interface, method.Pos()); len(comments) > 0 {
+				// only remove leading line upto the first comment
+				removeToPos = comments[0].Pos()
+			}
+			// remove leading lines if they exist
+			f.removeLines(f.Line(node.Interface)+1, f.Line(removeToPos))
+		}
+
+	case *ast.BlockStmt:
+		f.stmts(node.List)
+		comments := f.commentsBetween(node.Lbrace, node.Rbrace)
+		if len(node.List) == 0 && len(comments) == 0 {
+			f.removeLinesBetween(node.Lbrace, node.Rbrace)
+			break
+		}
+
+		var sign *ast.FuncType
+		var cond ast.Expr
+		switch parent := c.Parent().(type) {
+		case *ast.FuncDecl:
+			sign = parent.Type
+		case *ast.FuncLit:
+			sign = parent.Type
+		case *ast.IfStmt:
+			cond = parent.Cond
+		case *ast.ForStmt:
+			cond = parent.Cond
+		}
+
+		if len(node.List) > 1 && sign == nil {
+			// only if we have a single statement, or if
+			// it's a func body.
+			break
+		}
+		var bodyPos, bodyEnd token.Pos
+
+		if len(node.List) > 0 {
+			bodyPos = node.List[0].Pos()
+			bodyEnd = node.List[len(node.List)-1].End()
+		}
+		if len(comments) > 0 {
+			if pos := comments[0].Pos(); !bodyPos.IsValid() || pos < bodyPos {
+				bodyPos = pos
+			}
+			if pos := comments[len(comments)-1].End(); !bodyPos.IsValid() || pos > bodyEnd {
+				bodyEnd = pos
+			}
+		}
+
+		f.removeLinesBetween(bodyEnd, node.Rbrace)
+
+		if cond != nil && f.Line(cond.Pos()) != f.Line(cond.End()) {
+			// The body is preceded by a multi-line condition, so an
+			// empty line can help readability.
+			return
+		}
+		if sign != nil {
+			endLine := f.Line(sign.End())
+
+			if f.Line(sign.Pos()) != endLine {
+				handleMultiLine := func(fl *ast.FieldList) {
+					// Refuse to insert a newline before the closing token
+					// if the list is empty or all in one line.
+					if fl == nil || len(fl.List) == 0 {
+						return
+					}
+					fieldOpeningLine := f.Line(fl.Opening)
+					fieldClosingLine := f.Line(fl.Closing)
+					if fieldOpeningLine == fieldClosingLine {
+						return
+					}
+
+					lastFieldEnd := fl.List[len(fl.List)-1].End()
+					lastFieldLine := f.Line(lastFieldEnd)
+					isLastFieldOnFieldClosingLine := lastFieldLine == fieldClosingLine
+					isLastFieldOnSigClosingLine := lastFieldLine == endLine
+
+					var isLastCommentGrpOnFieldClosingLine, isLastCommentGrpOnSigClosingLine bool
+					if comments := f.commentsBetween(lastFieldEnd, fl.Closing); len(comments) > 0 {
+						lastCommentGrp := comments[len(comments)-1]
+						lastCommentGrpLine := f.Line(lastCommentGrp.End())
+
+						isLastCommentGrpOnFieldClosingLine = lastCommentGrpLine == fieldClosingLine
+						isLastCommentGrpOnSigClosingLine = lastCommentGrpLine == endLine
+					}
+
+					// is there a comment grp/last field, field closing and sig closing on the same line?
+					if (isLastFieldOnFieldClosingLine && isLastFieldOnSigClosingLine) ||
+						(isLastCommentGrpOnFieldClosingLine && isLastCommentGrpOnSigClosingLine) {
+						fl.Closing += 1
+						f.addNewline(fl.Closing)
+					}
+				}
+				handleMultiLine(sign.Params)
+				if sign.Results != nil && len(sign.Results.List) > 0 {
+					lastResultLine := f.Line(sign.Results.List[len(sign.Results.List)-1].End())
+					isLastResultOnParamClosingLine := sign.Params != nil && lastResultLine == f.Line(sign.Params.Closing)
+					if !isLastResultOnParamClosingLine {
+						handleMultiLine(sign.Results)
+					}
+				}
+			}
+		}
+
+		f.removeLinesBetween(node.Lbrace, bodyPos)
+
+	case *ast.CaseClause:
+		f.stmts(node.Body)
+		openLine := f.Line(node.Case)
+		closeLine := f.Line(node.Colon)
+		if openLine == closeLine {
+			// nothing to do
+			break
+		}
+		if len(f.commentsBetween(node.Case, node.Colon)) > 0 {
+			// don't move comments
+			break
+		}
+		// check the length excluding the body
+		nodeWithoutBody := &ast.CaseClause{
+			Case:  node.Case,
+			List:  node.List,
+			Colon: node.Colon,
+		}
+		if f.printLength(nodeWithoutBody) > shortLineLimit {
+			// too long to collapse
+			break
+		}
+		f.removeLines(openLine, closeLine)
+
+	case *ast.CommClause:
+		f.stmts(node.Body)
+
+	case *ast.FieldList:
+		numFields := node.NumFields()
+		comments := f.commentsBetween(node.Pos(), node.End())
+
+		if numFields == 0 && len(comments) == 0 {
+			// Empty field lists should not contain a newline.
+			// Do not join the two lines if the first has an inline
+			// comment, as that can result in broken formatting.
+			openLine := f.Line(node.Pos())
+			closeLine := f.Line(node.End())
+			f.removeLines(openLine, closeLine)
+		} else {
+			// Remove lines before first comment/field and lines after last
+			// comment/field
+			var bodyPos, bodyEnd token.Pos
+			if numFields > 0 {
+				bodyPos = node.List[0].Pos()
+				bodyEnd = node.List[len(node.List)-1].End()
+			}
+			if len(comments) > 0 {
+				if pos := comments[0].Pos(); !bodyPos.IsValid() || pos < bodyPos {
+					bodyPos = pos
+				}
+				if pos := comments[len(comments)-1].End(); !bodyPos.IsValid() || pos > bodyEnd {
+					bodyEnd = pos
+				}
+			}
+			f.removeLinesBetween(node.Pos(), bodyPos)
+			f.removeLinesBetween(bodyEnd, node.End())
+		}
+
+		if !f.Extra.GroupParams {
+			break
+		}
+		switch c.Parent().(type) {
+		case *ast.FuncDecl, *ast.FuncType, *ast.InterfaceType:
+			node.List = f.mergeAdjacentFields(node.List)
+			c.Replace(node)
+		case *ast.StructType:
+			// Do not merge adjacent fields in structs.
+		}
+
+	case *ast.ParenExpr:
+		// Unwrap any chain of redundant inner parens first,
+		// since astutil.Apply does not walk replacement nodes.
+		node.X = ast.Unparen(node.X)
+		if f.canRemoveParens(node) {
+			c.Replace(node.X)
+		}
+
+	case *ast.BasicLit:
+		// Octal number literals were introduced in Go 1.13.
+		if goversion.Compare(f.LangVersion, "go1.13") >= 0 {
+			if node.Kind == token.INT && rxOctalInteger.MatchString(node.Value) {
+				node.Value = "0o" + node.Value[1:]
+				c.Replace(node)
+			}
+		}
+
+	case *ast.AssignStmt:
+		// Only remove lines between the assignment token and the right-hand side
+		// for simple single-value assignments. Skip multi-value assignments and
+		// binary expressions like long string concatenations, where a line break
+		// after the assignment token can improve readability.
+		if len(node.Rhs) == 1 {
+			if _, ok := node.Rhs[0].(*ast.BinaryExpr); !ok {
+				f.removeLines(f.Line(node.TokPos), f.Line(node.Rhs[0].Pos()))
+			}
+		}
+
+	case *ast.ReturnStmt:
+		if len(node.Results) > 0 {
+			break
+		}
+		if !f.Extra.ClotheReturns {
+			break
+		}
+		results := f.parentFuncTypes[len(f.parentFuncTypes)-1].Results
+		if results.NumFields() == 0 {
+			break
+		}
+
+		// The function has return values; let's clothe the return.
+		node.Results = make([]ast.Expr, 0, results.NumFields())
+	nameLoop:
+		for _, result := range results.List {
+			for _, ident := range result.Names {
+				name := ident.Name
+				if name == "_" { // we can't handle blank names just yet
+					node.Results = nil
+					break nameLoop
+				}
+				node.Results = append(node.Results, &ast.Ident{
+					// Use the Pos of the return statement, to not interfere with comment placement.
+					NamePos: node.Pos(),
+					Name:    name,
+				})
+			}
+		}
+		if len(node.Results) > 0 {
+			c.Replace(node)
+		}
+	}
+}
+
+func (f *fumpter) applyPost(c *astutil.Cursor) {
+	switch node := c.Node().(type) {
+	// Adding newlines to composite literals happens as a "post" step, so
+	// that we can take into account whether "pre" steps added any newlines
+	// that would affect us here.
+	case *ast.CompositeLit:
+		if len(node.Elts) == 0 {
+			// doesn't have elements
+			break
+		}
+		openLine := f.Line(node.Lbrace)
+		closeLine := f.Line(node.Rbrace)
+		if openLine == closeLine {
+			// all in a single line
+			break
+		}
+
+		newlineAroundElems := false
+		newlineBetweenElems := false
+		lastEnd := node.Lbrace
+		lastLine := openLine
+		for i, elem := range node.Elts {
+			pos := elem.Pos()
+			comments := f.commentsBetween(lastEnd, pos)
+			if len(comments) > 0 {
+				pos = comments[0].Pos()
+			}
+			if curLine := f.Line(pos); curLine > lastLine {
+				if i == 0 {
+					newlineAroundElems = true
+
+					// remove leading lines if they exist
+					f.removeLines(openLine+1, curLine)
+				} else {
+					newlineBetweenElems = true
+				}
+			}
+			lastEnd = elem.End()
+			lastLine = f.Line(lastEnd)
+		}
+		if closeLine > lastLine {
+			newlineAroundElems = true
+		}
+
+		if newlineBetweenElems || newlineAroundElems {
+			first := node.Elts[0]
+			if openLine == f.Line(first.Pos()) {
+				// We want the newline right after the brace.
+				f.addNewline(node.Lbrace + 1)
+				closeLine = f.Line(node.Rbrace)
+			}
+			last := node.Elts[len(node.Elts)-1]
+			if closeLine == f.Line(last.End()) {
+				// We want the newline right before the brace.
+				f.addNewline(node.Rbrace)
+			}
+		}
+
+		// If there's a newline between any consecutive elements, there
+		// must be a newline between all composite literal elements.
+		if !newlineBetweenElems {
+			break
+		}
+		for i1, elem1 := range node.Elts {
+			i2 := i1 + 1
+			if i2 >= len(node.Elts) {
+				break
+			}
+			elem2 := node.Elts[i2]
+			// TODO: do we care about &{}?
+			_, ok1 := elem1.(*ast.CompositeLit)
+			_, ok2 := elem2.(*ast.CompositeLit)
+			if !ok1 && !ok2 {
+				continue
+			}
+			if f.Line(elem1.End()) == f.Line(elem2.Pos()) {
+				f.addNewline(elem1.End())
+			}
+		}
+
+	// In a multi-line call, if the opening parenthesis is at the end of a
+	// line, the closing parenthesis should be at the start of a line.
+	// See https://github.com/mvdan/gofumpt/issues/74.
+	case *ast.CallExpr:
+		if !f.Extra.BalanceCalls {
+			break
+		}
+		if len(node.Args) == 0 {
+			break
+		}
+		openLine := f.Line(node.Lparen)
+		closeLine := f.Line(node.Rparen)
+		if openLine == closeLine {
+			break
+		}
+		firstLine := f.Line(node.Args[0].Pos())
+		lastEnd := node.Args[len(node.Args)-1].End()
+		if comment := f.inlineComment(lastEnd); comment != nil {
+			lastEnd = comment.End()
+		}
+		lastLine := f.Line(lastEnd)
+		openAtEOL := openLine != firstLine
+		closeAtBOL := closeLine != lastLine
+		if openAtEOL && !closeAtBOL {
+			f.addNewline(node.Rparen)
+		}
+	}
+}
+
+func (f *fumpter) splitLongLine(c *astutil.Cursor) {
+	if os.Getenv("GOFUMPT_SPLIT_LONG_LINES") != "on" {
+		// By default, this feature is turned off.
+		// Turn it on by setting GOFUMPT_SPLIT_LONG_LINES=on.
+		return
+	}
+	node := c.Node()
+	if node == nil {
+		return
+	}
+
+	newlinePos := node.Pos()
+	start := f.Position(node.Pos())
+	end := f.Position(node.End())
+
+	// If the node is already split in multiple lines, there's nothing to do.
+	if start.Line != end.Line {
+		return
+	}
+
+	// Only split at the start of the current node if it's part of a list.
+	if _, ok := c.Parent().(*ast.BinaryExpr); ok {
+		// Chains of binary expressions are considered lists, too.
+	} else if c.Index() >= 0 {
+		// For the rest of the nodes, we're in a list if c.Index() >= 0.
+	} else {
+		return
+	}
+
+	// Like in printLength, add an approximation of the indentation level.
+	// Since any existing tabs were already counted as one column, multiply
+	// the level by 7.
+	startCol := start.Column + f.blockLevel*7
+	endCol := end.Column + f.blockLevel*7
+
+	// If this is a composite literal,
+	// and we were going to insert a newline before the entire literal,
+	// insert the newline before the first element instead.
+	// Since we'll add a newline after the last element too,
+	// this format is generally going to be nicer.
+	if comp := isComposite(node); comp != nil && len(comp.Elts) > 0 {
+		newlinePos = comp.Elts[0].Pos()
+	}
+
+	// If this is a function call,
+	// and we were to add a newline before the first argument,
+	// prefer adding the newline before the entire call.
+	// End-of-line parentheses aren't very nice, as we don't put their
+	// counterparts at the start of a line too.
+	// We do this by using the average of the two starting positions.
+	if call, _ := node.(*ast.CallExpr); call != nil && len(call.Args) > 0 {
+		first := f.Position(call.Args[0].Pos())
+		startCol += (first.Column - start.Column) / 2
+	}
+
+	// If the start position is too short, we definitely won't split the line.
+	if startCol <= shortLineLimit {
+		return
+	}
+
+	lineEnd := f.Position(f.lineEnd(start.Line))
+
+	// firstLength and secondLength are the split line lengths, excluding
+	// indentation.
+	firstLength := start.Column - f.blockLevel
+	if firstLength < 0 {
+		panic("negative length")
+	}
+	secondLength := lineEnd.Column - start.Column
+	if secondLength < 0 {
+		panic("negative length")
+	}
+
+	// If the line ends past the long line limit,
+	// and both splits are estimated to take at least minSplitFactor of the limit,
+	// then split the line.
+	minSplitLength := int(f.minSplitFactor * longLineLimit)
+	if endCol > longLineLimit &&
+		firstLength >= minSplitLength && secondLength >= minSplitLength {
+		f.addNewline(newlinePos)
+	}
+}
+
+// canRemoveParens reports whether the parentheses around node are definitely
+// useless and can be safely removed without changing intent.
+func (f *fumpter) canRemoveParens(node *ast.ParenExpr) bool {
+	// Don't drop parens which contain comments,
+	// as the printer may not place them well without the parens.
+	if len(f.commentsBetween(node.Lparen, node.Rparen)) > 0 {
+		return false
+	}
+	return !keepParens(node.X, true)
+}
+
+// keepParens reports whether the parentheses directly around expr should be
+// kept: around binary, unary, and type expressions for readability and for
+// conversions like `(<-chan T)(v)`, but only when outermost; and around an
+// expression whose leftmost operand is a composite literal, whose brace would
+// otherwise open an if, for, or switch body.
+func keepParens(expr ast.Expr, outermost bool) bool {
+	switch expr := expr.(type) {
+	case *ast.CompositeLit:
+		return true
+	case *ast.CallExpr:
+		return keepParens(expr.Fun, false)
+	case *ast.SelectorExpr:
+		return keepParens(expr.X, false)
+	case *ast.IndexExpr:
+		return keepParens(expr.X, false)
+	case *ast.IndexListExpr:
+		return keepParens(expr.X, false)
+	case *ast.SliceExpr:
+		return keepParens(expr.X, false)
+	case *ast.TypeAssertExpr:
+		return keepParens(expr.X, false)
+	case *ast.BinaryExpr, *ast.UnaryExpr, *ast.StarExpr,
+		*ast.ChanType, *ast.ArrayType, *ast.MapType,
+		*ast.FuncType, *ast.InterfaceType, *ast.StructType:
+		return outermost
+	}
+	return false
+}
+
+func isComposite(node ast.Node) *ast.CompositeLit {
+	switch node := node.(type) {
+	case *ast.CompositeLit:
+		return node
+	case *ast.UnaryExpr:
+		return isComposite(node.X) // e.g. &T{}
+	default:
+		return nil
+	}
+}
+
+func (f *fumpter) stmts(list []ast.Stmt) {
+	for i, stmt := range list {
+		ifs, ok := stmt.(*ast.IfStmt)
+		if !ok || i < 1 {
+			continue // not an if following another statement
+		}
+		as, ok := list[i-1].(*ast.AssignStmt)
+		if !ok || (as.Tok != token.DEFINE && as.Tok != token.ASSIGN) ||
+			!identEqual(as.Lhs[len(as.Lhs)-1], "err") {
+			continue // not ", err :=" nor ", err ="
+		}
+		be, ok := ifs.Cond.(*ast.BinaryExpr)
+		if !ok || ifs.Init != nil || ifs.Else != nil {
+			continue // complex if
+		}
+		if be.Op != token.NEQ || !identEqual(be.X, "err") ||
+			!identEqual(be.Y, "nil") {
+			continue // not "err != nil"
+		}
+		f.removeLinesBetween(as.End(), ifs.Pos())
+	}
+}
+
+func identEqual(expr ast.Expr, name string) bool {
+	id, ok := expr.(*ast.Ident)
+	return ok && id.Name == name
+}
+
+// isCgoImport returns true if the declaration is simply:
+//
+//	import "C"
+//
+// or the equivalent:
+//
+//	import `C`
+//
+// Note that parentheses do not affect the result.
+func isCgoImport(decl *ast.GenDecl) bool {
+	if decl.Tok != token.IMPORT || len(decl.Specs) != 1 {
+		return false
+	}
+	spec := decl.Specs[0].(*ast.ImportSpec)
+	v, err := strconv.Unquote(spec.Path.Value)
+	if err != nil {
+		panic(err) // should never error
+	}
+	return v == "C"
+}
+
+// joinStdImports ensures that all standard library imports are together and at
+// the top of the imports list.
+func (f *fumpter) joinStdImports(d *ast.GenDecl) {
+	var std, other []ast.Spec
+	firstGroup := true
+	lastEnd := d.Pos()
+	needsSort := false
+
+	// If ModulePath is "foo/bar", we assume "foo/..." is not part of std.
+	// Users shouldn't declare modules that may collide with std this way,
+	// but historically some private codebases have done so.
+	// This is a relatively harmless way to make gofumpt compatible with them,
+	// as it changes nothing for the common external module paths.
+	var modulePrefix string
+	if f.ModulePath == "" {
+		// Nothing to do.
+	} else if i := strings.IndexByte(f.ModulePath, '/'); i != -1 {
+		// ModulePath is "foo/bar", so we use "foo" as the prefix.
+		modulePrefix = f.ModulePath[:i]
+	} else {
+		// ModulePath is "foo", so we use "foo" as the prefix.
+		modulePrefix = f.ModulePath
+	}
+
+	for i, spec := range d.Specs {
+		spec := spec.(*ast.ImportSpec)
+		if coms := f.commentsBetween(lastEnd, spec.Pos()); len(coms) > 0 {
+			lastEnd = coms[len(coms)-1].End()
+		}
+		if i > 0 && firstGroup && f.Line(spec.Pos()) > f.Line(lastEnd)+1 {
+			firstGroup = false
+		} else {
+			// We're still in the first group, update lastEnd.
+			lastEnd = spec.End()
+		}
+
+		path, err := strconv.Unquote(spec.Path.Value)
+		if err != nil {
+			panic(err) // should never error
+		}
+		periodIndex := strings.IndexByte(path, '.')
+		slashIndex := strings.IndexByte(path, '/')
+		switch {
+		// Imports with a period in the first path element are third party.
+		// Note that this includes "foo.com" and excludes "foo/bar.com/baz".
+		case periodIndex > 0 && (slashIndex == -1 || periodIndex < slashIndex),
+
+			// "test" and "example" are reserved as per golang.org/issue/37641.
+			strings.HasPrefix(path, "test/"),
+			strings.HasPrefix(path, "example/"),
+
+			// See if we match modulePrefix; see its documentation above.
+			// We match either exactly or with a slash suffix,
+			// so that the prefix "foo" for "foo/..." does not match "foobar".
+			path == modulePrefix || strings.HasPrefix(path, modulePrefix+"/"),
+
+			// To be conservative, if an import has a name or an inline
+			// comment, and isn't part of the top group, treat it as non-std.
+			!firstGroup && (spec.Name != nil || spec.Comment != nil):
+			other = append(other, spec)
+			continue
+		}
+
+		// If we're moving this std import further up, reset its
+		// position, to avoid breaking comments.
+		if !firstGroup || len(other) > 0 {
+			setPos(reflect.ValueOf(spec), d.Pos())
+			needsSort = true
+		}
+		std = append(std, spec)
+	}
+	// Ensure there is an empty line between std imports and other imports.
+	if len(std) > 0 && len(other) > 0 && f.Line(std[len(std)-1].End())+1 >= f.Line(other[0].Pos()) {
+		// We add two newlines, as that's necessary in some edge cases.
+		// For example, if the std and non-std imports were together and
+		// without indentation, adding one newline isn't enough. Two
+		// empty lines will be printed as one by go/printer, anyway.
+		f.addNewline(other[0].Pos() - 1)
+		f.addNewline(other[0].Pos())
+	}
+	// Finally, join the imports, keeping std at the top.
+	d.Specs = append(std, other...)
+
+	// If we moved any std imports to the first group, we need to sort them
+	// again.
+	if needsSort {
+		ast.SortImports(f.fset, f.astFile)
+	}
+}
+
+// mergeAdjacentFields returns fields with adjacent fields merged if possible.
+func (f *fumpter) mergeAdjacentFields(fields []*ast.Field) []*ast.Field {
+	// If there are less than two fields then there is nothing to merge.
+	if len(fields) < 2 {
+		return fields
+	}
+
+	// Otherwise, iterate over adjacent pairs of fields, merging if possible,
+	// and mutating fields. Elements of fields may be mutated (if merged with
+	// following fields), discarded (if merged with a preceding field), or left
+	// unchanged.
+	i := 0
+	for j := 1; j < len(fields); j++ {
+		if f.shouldMergeAdjacentFields(fields[i], fields[j]) {
+			fields[i].Names = append(fields[i].Names, fields[j].Names...)
+		} else {
+			i++
+			fields[i] = fields[j]
+		}
+	}
+	return fields[:i+1]
+}
+
+func (f *fumpter) shouldMergeAdjacentFields(f1, f2 *ast.Field) bool {
+	if len(f1.Names) == 0 || len(f2.Names) == 0 {
+		// Both must have names for the merge to work.
+		return false
+	}
+	if f.Line(f1.Pos()) != f.Line(f2.Pos()) {
+		// Trust the user if they used separate lines.
+		return false
+	}
+
+	// Only merge if the types that the syntax nodes represent are equal,
+	// e.g. two *ast.Ident nodes "int" are equal, but the two *ast.Ident nodes
+	// "string" and "bool" are not. We use reflection to quickly discard most cases.
+	//
+	// We use an empty [token.FileSet] so that positions are ignored when printing,
+	// and two syntax nodes with different uses of newlines end up the same.
+	//
+	// Note that we could in theory use go/types here, but in practice gofumpt
+	// needs to be fast, hence it shouldn't rely on expensive typechecking.
+	if reflect.TypeOf(f1.Type) != reflect.TypeOf(f2.Type) {
+		return false
+	}
+	emptyFset := token.NewFileSet()
+	var b1, b2 bytes.Buffer
+	if err := format.Node(&b1, emptyFset, f1.Type); err != nil {
+		return false
+	}
+	if err := format.Node(&b2, emptyFset, f2.Type); err != nil {
+		return false
+	}
+	return bytes.Equal(b1.Bytes(), b2.Bytes())
+}
+
+var posType = reflect.TypeFor[token.Pos]()
+
+// setPos recursively sets all position fields in the node v to pos.
+func setPos(v reflect.Value, pos token.Pos) {
+	if v.Kind() == reflect.Pointer {
+		v = v.Elem()
+	}
+	if !v.IsValid() {
+		return
+	}
+	if v.Type() == posType {
+		v.Set(reflect.ValueOf(pos))
+	}
+	if v.Kind() == reflect.Struct {
+		for i := range v.NumField() {
+			setPos(v.Field(i), pos)
+		}
+	}
+}
+
+func containsAnyDirective(group *ast.CommentGroup) bool {
+	if group == nil {
+		return false
+	}
+	for _, comment := range group.List {
+		body := strings.TrimPrefix(comment.Text, "//")
+		if rxCommentDirective.MatchString(body) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/mvdan.cc/gofumpt/format/rewrite.go b/vendor/mvdan.cc/gofumpt/format/rewrite.go
new file mode 100644
index 000000000..47ff5ee7b
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/format/rewrite.go
@@ -0,0 +1,120 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// NOTE(gofumpt): the original cmd/gofmt/rewrite.go is mostly stripped here.
+// gofumpt drops the -r flag (use `gofmt -r` instead), so the rewrite engine
+// (initRewrite, parseExpr, rewriteFile, apply, set, subst) and its
+// reflect-helpers (objectPtrNil, scopePtrNil, scopePtrType) are gone. Only
+// match/isWildcard remain because simplify.go still uses them to compare
+// AST literals when omitting redundant types in composite literals.
+
+package format
+
+import (
+	"go/ast"
+	"go/token"
+	"reflect"
+	"unicode"
+	"unicode/utf8"
+)
+
+// Values/types for special cases.
+var (
+	identType     = reflect.TypeFor[*ast.Ident]()
+	objectPtrType = reflect.TypeFor[*ast.Object]()
+	positionType  = reflect.TypeFor[token.Pos]()
+	callExprType  = reflect.TypeFor[*ast.CallExpr]()
+)
+
+func isWildcard(s string) bool {
+	rune, size := utf8.DecodeRuneInString(s)
+	return size == len(s) && unicode.IsLower(rune)
+}
+
+// match reports whether pattern matches val,
+// recording wildcard submatches in m.
+// If m == nil, match checks whether pattern == val.
+func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
+	// Wildcard matches any expression. If it appears multiple
+	// times in the pattern, it must match the same expression
+	// each time.
+	if m != nil && pattern.IsValid() && pattern.Type() == identType {
+		name := pattern.Interface().(*ast.Ident).Name
+		if isWildcard(name) && val.IsValid() {
+			// wildcards only match valid (non-nil) expressions.
+			if _, ok := val.Interface().(ast.Expr); ok && !val.IsNil() {
+				if old, ok := m[name]; ok {
+					return match(nil, old, val)
+				}
+				m[name] = val
+				return true
+			}
+		}
+	}
+
+	// Otherwise, pattern and val must match recursively.
+	if !pattern.IsValid() || !val.IsValid() {
+		return !pattern.IsValid() && !val.IsValid()
+	}
+	if pattern.Type() != val.Type() {
+		return false
+	}
+
+	// Special cases.
+	switch pattern.Type() {
+	case identType:
+		// For identifiers, only the names need to match
+		// (and none of the other *ast.Object information).
+		// This is a common case, handle it all here instead
+		// of recursing down any further via reflection.
+		p := pattern.Interface().(*ast.Ident)
+		v := val.Interface().(*ast.Ident)
+		return p == nil && v == nil || p != nil && v != nil && p.Name == v.Name
+	case objectPtrType, positionType:
+		// object pointers and token positions always match
+		return true
+	case callExprType:
+		// For calls, the Ellipsis fields (token.Position) must
+		// match since that is how f(x) and f(x...) are different.
+		// Check them here but fall through for the remaining fields.
+		p := pattern.Interface().(*ast.CallExpr)
+		v := val.Interface().(*ast.CallExpr)
+		if p.Ellipsis.IsValid() != v.Ellipsis.IsValid() {
+			return false
+		}
+	}
+
+	p := reflect.Indirect(pattern)
+	v := reflect.Indirect(val)
+	if !p.IsValid() || !v.IsValid() {
+		return !p.IsValid() && !v.IsValid()
+	}
+
+	switch p.Kind() {
+	case reflect.Slice:
+		if p.Len() != v.Len() {
+			return false
+		}
+		for i := range p.Len() {
+			if !match(m, p.Index(i), v.Index(i)) {
+				return false
+			}
+		}
+		return true
+
+	case reflect.Struct:
+		for i := range p.NumField() {
+			if !match(m, p.Field(i), v.Field(i)) {
+				return false
+			}
+		}
+		return true
+
+	case reflect.Interface:
+		return match(m, p.Elem(), v.Elem())
+	}
+
+	// Handle token integers, etc.
+	return p.Interface() == v.Interface()
+}
diff --git a/vendor/mvdan.cc/gofumpt/format/simplify.go b/vendor/mvdan.cc/gofumpt/format/simplify.go
new file mode 100644
index 000000000..363f8d059
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/format/simplify.go
@@ -0,0 +1,174 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// NOTE(gofumpt): moved into the format package (from package main) so that
+// syntax simplification is exported via the Go API. gofumpt always simplifies,
+// so the -s flag was dropped; see also the removal of the -r rewrite logic in
+// rewrite.go, which left this file as the sole user of match/isWildcard.
+
+package format
+
+import (
+	"go/ast"
+	"go/token"
+	"reflect"
+)
+
+type simplifier struct{}
+
+func (s simplifier) Visit(node ast.Node) ast.Visitor {
+	switch n := node.(type) {
+	case *ast.CompositeLit:
+		// array, slice, and map composite literals may be simplified
+		outer := n
+		var keyType, eltType ast.Expr
+		switch typ := outer.Type.(type) {
+		case *ast.ArrayType:
+			eltType = typ.Elt
+		case *ast.MapType:
+			keyType = typ.Key
+			eltType = typ.Value
+		}
+
+		if eltType != nil {
+			var ktyp reflect.Value
+			if keyType != nil {
+				ktyp = reflect.ValueOf(keyType)
+			}
+			typ := reflect.ValueOf(eltType)
+			for i, x := range outer.Elts {
+				px := &outer.Elts[i]
+				// look at value of indexed/named elements
+				if t, ok := x.(*ast.KeyValueExpr); ok {
+					if keyType != nil {
+						s.simplifyLiteral(ktyp, keyType, t.Key, &t.Key)
+					}
+					x = t.Value
+					px = &t.Value
+				}
+				s.simplifyLiteral(typ, eltType, x, px)
+			}
+			// node was simplified - stop walk (there are no subnodes to simplify)
+			return nil
+		}
+
+	case *ast.SliceExpr:
+		// a slice expression of the form: s[a:len(s)]
+		// can be simplified to: s[a:]
+		// if s is "simple enough" (for now we only accept identifiers)
+		//
+		// Note: This may not be correct because len may have been redeclared in
+		//       the same package. However, this is extremely unlikely and so far
+		//       (April 2022, after years of supporting this rewrite feature)
+		//       has never come up, so let's keep it working as is (see also #15153).
+		//
+		// Also note that this code used to use go/ast's object tracking,
+		// which was removed in exchange for go/parser.Mode.SkipObjectResolution.
+		// False positives are extremely unlikely as described above,
+		// and go/ast's object tracking is incomplete in any case.
+		if n.Max != nil {
+			// - 3-index slices always require the 2nd and 3rd index
+			break
+		}
+		if s, _ := n.X.(*ast.Ident); s != nil {
+			// the array/slice object is a single identifier
+			if call, _ := n.High.(*ast.CallExpr); call != nil && len(call.Args) == 1 && !call.Ellipsis.IsValid() {
+				// the high expression is a function call with a single argument
+				if fun, _ := call.Fun.(*ast.Ident); fun != nil && fun.Name == "len" {
+					// the function called is "len"
+					if arg, _ := call.Args[0].(*ast.Ident); arg != nil && arg.Name == s.Name {
+						// the len argument is the array/slice object
+						n.High = nil
+					}
+				}
+			}
+		}
+		// Note: We could also simplify slice expressions of the form s[0:b] to s[:b]
+		//       but we leave them as is since sometimes we want to be very explicit
+		//       about the lower bound.
+		// An example where the 0 helps:
+		//       x, y, z := b[0:2], b[2:4], b[4:6]
+		// An example where it does not:
+		//       x, y := b[:n], b[n:]
+
+	case *ast.RangeStmt:
+		// - a range of the form: for x, _ = range v {...}
+		// can be simplified to: for x = range v {...}
+		// - a range of the form: for _ = range v {...}
+		// can be simplified to: for range v {...}
+		if isBlank(n.Value) {
+			n.Value = nil
+		}
+		if isBlank(n.Key) && n.Value == nil {
+			n.Key = nil
+		}
+	}
+
+	return s
+}
+
+func (s simplifier) simplifyLiteral(typ reflect.Value, astType, x ast.Expr, px *ast.Expr) {
+	ast.Walk(s, x) // simplify x
+
+	// if the element is a composite literal and its literal type
+	// matches the outer literal's element type exactly, the inner
+	// literal type may be omitted
+	if inner, ok := x.(*ast.CompositeLit); ok {
+		if match(nil, typ, reflect.ValueOf(inner.Type)) {
+			inner.Type = nil
+		}
+	}
+	// if the outer literal's element type is a pointer type *T
+	// and the element is & of a composite literal of type T,
+	// the inner &T may be omitted.
+	if ptr, ok := astType.(*ast.StarExpr); ok {
+		if addr, ok := x.(*ast.UnaryExpr); ok && addr.Op == token.AND {
+			if inner, ok := addr.X.(*ast.CompositeLit); ok {
+				if match(nil, reflect.ValueOf(ptr.X), reflect.ValueOf(inner.Type)) {
+					inner.Type = nil // drop T
+					*px = inner      // drop &
+				}
+			}
+		}
+	}
+}
+
+func isBlank(x ast.Expr) bool {
+	ident, ok := x.(*ast.Ident)
+	return ok && ident.Name == "_"
+}
+
+func simplify(f *ast.File) {
+	// remove empty declarations such as "const ()", etc
+	removeEmptyDeclGroups(f)
+
+	var s simplifier
+	ast.Walk(s, f)
+}
+
+func removeEmptyDeclGroups(f *ast.File) {
+	i := 0
+	for _, d := range f.Decls {
+		if g, ok := d.(*ast.GenDecl); !ok || !isEmpty(f, g) {
+			f.Decls[i] = d
+			i++
+		}
+	}
+	f.Decls = f.Decls[:i]
+}
+
+func isEmpty(f *ast.File, g *ast.GenDecl) bool {
+	if g.Doc != nil || g.Specs != nil {
+		return false
+	}
+
+	for _, c := range f.Comments {
+		// if there is a comment in the declaration, it is not considered empty
+		if g.Pos() <= c.Pos() && c.End() <= g.End() {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/vendor/mvdan.cc/gofumpt/gofmt.go b/vendor/mvdan.cc/gofumpt/gofmt.go
new file mode 100644
index 000000000..e6cd81d90
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/gofmt.go
@@ -0,0 +1,837 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"bytes"
+	"context"
+	"flag"
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/scanner"
+	"go/token"
+	"io"
+	"io/fs"
+	"math/rand"
+	"os"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"runtime/pprof"
+	"strconv"
+	"strings"
+	"sync"
+
+	// NOTE(gofumpt): x/mod/modfile is used to read each file's go.mod for the
+	// default -lang and -modpath, and to honor `ignore` directives.
+	"golang.org/x/mod/modfile"
+	"golang.org/x/sync/semaphore"
+
+	// NOTE(gofumpt): the format package exposes gofumpt's added rules and
+	// simplification as a public Go API. diff and go/printer are vendored
+	// copies frozen at a specific Go version, so gofumpt's output is
+	// reproducible regardless of the user's Go toolchain.
+	gformat "mvdan.cc/gofumpt/format"
+	"mvdan.cc/gofumpt/internal/govendor/diff"
+	"mvdan.cc/gofumpt/internal/govendor/go/printer"
+	gversion "mvdan.cc/gofumpt/internal/version"
+)
+
+// NOTE(gofumpt): regenerate the vendored Go source under internal/govendor,
+// then re-format it with the freshly built gofumpt binary.
+//go:generate go run gen_govendor.go
+//go:generate go run . -w internal/govendor
+
+var (
+	// main operation modes
+	list      = flag.Bool("l", false, "")
+	write     = flag.Bool("w", false, "")
+	doDiff    = flag.Bool("d", false, "")
+	allErrors = flag.Bool("e", false, "")
+
+	// debugging
+	cpuprofile = flag.String("cpuprofile", "", "")
+
+	// NOTE(gofumpt): gofumpt's own flags.
+	// -lang sets the target Go language version for version-gated rules
+	// (e.g. octal literal syntax requires go1.13); defaulted from go.mod.
+	// -modpath sets the current module path so import grouping can treat
+	// imports sharing that prefix as third-party; defaulted from go.mod.
+	// -extra opts in to non-default rules like group_params.
+	// -version prints the gofumpt build version (set via -ldflags=main.version=).
+	langVersion = flag.String("lang", "", "")
+	modulePath  = flag.String("modpath", "", "")
+	extraRules  gformat.Extra
+	showVersion = flag.Bool("version", false, "")
+
+	// NOTE(gofumpt): -r and -s are kept only to print a friendly error.
+	// -r was dropped in favor of `gofmt -r`; -s is always on (gofumpt always
+	// simplifies).
+	rewriteRule = flag.String("r", "", "")
+	simplifyAST = flag.Bool("s", false, "")
+
+	// errors
+	// NOTE(gofumpt): sentinel used to drive exit code 1 when -d found
+	// formatting differences. Upstream gofmt does not change its exit code
+	// on -d; gofumpt's -d acts like `diff` so CI checks can rely on the
+	// nonzero exit. See reporter.Report below.
+	errFormattingDiffers = fmt.Errorf("formatting differs from gofumpt's")
+)
+
+func init() { flag.Var(&extraRules, "extra", "") }
+
+// NOTE(gofumpt): set via -ldflags=main.version=... at release time so that
+// `gofumpt -version` reports a meaningful string for prebuilt binaries.
+var version = ""
+
+// Keep these in sync with go/format/format.go.
+const (
+	tabWidth    = 8
+	printerMode = printer.UseSpaces | printer.TabIndent | printerNormalizeNumbers
+
+	// printerNormalizeNumbers means to canonicalize number literal prefixes
+	// and exponents while printing. See https://golang.org/doc/go1.13#gofmt.
+	//
+	// This value is defined in go/printer specifically for go/format and cmd/gofmt.
+	printerNormalizeNumbers = 1 << 30
+)
+
+// fdSem guards the number of concurrently-open file descriptors.
+//
+// For now, this is arbitrarily set to 200, based on the observation that many
+// platforms default to a kernel limit of 256. Ideally, perhaps we should derive
+// it from rlimit on platforms that support that system call.
+//
+// File descriptors opened from outside of this package are not tracked,
+// so this limit may be approximate.
+var fdSem = make(chan bool, 200)
+
+// NOTE(gofumpt): upstream gofmt declares `rewrite` here for the -r flag; we
+// dropped that.
+var parserMode parser.Mode
+
+// newFileSet returns a fresh token.FileSet for parsing a single file.
+//
+// NOTE(gofumpt): we reserve base 1 with a dummy ten-byte file so that
+// token.NoPos+1 cannot be a valid position in any real file added later.
+// Some of gofumpt's added rules construct positions via token.NoPos+1;
+// without this guard, tests starting from an empty FileSet would silently
+// map NoPos+1 to a valid offset and hide bugs like #166.
+func newFileSet() *token.FileSet {
+	fset := token.NewFileSet()
+	fset.AddFile("gofumpt_base.go", 1, 10)
+	return fset
+}
+
+func usage() {
+	fmt.Fprintf(os.Stderr, `usage: gofumpt [flags] [path ...]
+	-version  show version and exit
+
+	-d        display diffs instead of rewriting files
+	-e        report all errors (not just the first 10 on different lines)
+	-l        list files whose formatting differs from gofumpt's
+	-w        write result to (source) file instead of stdout
+	-extra    enable extra rules, e.g. -extra=group_params,clothe_returns
+
+	-lang       str    target Go version in the form "go1.X" (default from go.mod)
+	-modpath    str    Go module path containing the source file (default from go.mod)
+`)
+}
+
+func initParserMode() {
+	// NOTE(gofumpt): always SkipObjectResolution. Upstream only sets it when
+	// -r is unused (object resolution is needed for the rewrite engine), but
+	// gofumpt has no -r flag, so we can always skip it for speed.
+	parserMode = parser.ParseComments | parser.SkipObjectResolution
+	if *allErrors {
+		parserMode |= parser.AllErrors
+	}
+}
+
+// NOTE(gofumpt): split out from upstream's isGoFile. Upstream combined the
+// name check with `!f.IsDir()`, but gofumpt's WalkDir callback already
+// distinguishes directories, and explicit non-.go arguments are formatted too,
+// so the name-only test is needed independently.
+func isGoFilename(name string) bool {
+	return !strings.HasPrefix(name, ".") && strings.HasSuffix(name, ".go")
+}
+
+// NOTE(gofumpt): generated-file detection. gofumpt's added rules are not
+// applied to generated Go files unless they are passed explicitly on the
+// command line; this avoids churning machine-written code that humans don't
+// edit. See processFile below for the `explicit || !isGenerated(file)` gate.
+var rxCodeGenerated = regexp.MustCompile(`^// Code generated .* DO NOT EDIT\.$`)
+
+func isGenerated(file *ast.File) bool {
+	for _, cg := range file.Comments {
+		if cg.Pos() > file.Package {
+			return false
+		}
+		for _, line := range cg.List {
+			if rxCodeGenerated.MatchString(line.Text) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// A sequencer performs concurrent tasks that may write output, but emits that
+// output in a deterministic order.
+type sequencer struct {
+	maxWeight int64
+	sem       *semaphore.Weighted   // weighted by input bytes (an approximate proxy for memory overhead)
+	prev      <-chan *reporterState // 1-buffered
+}
+
+// newSequencer returns a sequencer that allows concurrent tasks up to maxWeight
+// and writes tasks' output to out and err.
+func newSequencer(maxWeight int64, out, err io.Writer) *sequencer {
+	sem := semaphore.NewWeighted(maxWeight)
+	prev := make(chan *reporterState, 1)
+	prev <- &reporterState{out: out, err: err}
+	return &sequencer{
+		maxWeight: maxWeight,
+		sem:       sem,
+		prev:      prev,
+	}
+}
+
+// exclusive is a weight that can be passed to a sequencer to cause
+// a task to be executed without any other concurrent tasks.
+const exclusive = -1
+
+// Add blocks until the sequencer has enough weight to spare, then adds f as a
+// task to be executed concurrently.
+//
+// If the weight is either negative or larger than the sequencer's maximum
+// weight, Add blocks until all other tasks have completed, then the task
+// executes exclusively (blocking all other calls to Add until it completes).
+//
+// f may run concurrently in a goroutine, but its output to the passed-in
+// reporter will be sequential relative to the other tasks in the sequencer.
+//
+// If f invokes a method on the reporter, execution of that method may block
+// until the previous task has finished. (To maximize concurrency, f should
+// avoid invoking the reporter until it has finished any parallelizable work.)
+//
+// If f returns a non-nil error, that error will be reported after f's output
+// (if any) and will cause a nonzero final exit code.
+func (s *sequencer) Add(weight int64, f func(*reporter) error) {
+	if weight < 0 || weight > s.maxWeight {
+		weight = s.maxWeight
+	}
+	if err := s.sem.Acquire(context.TODO(), weight); err != nil {
+		// Change the task from "execute f" to "report err".
+		weight = 0
+		f = func(*reporter) error { return err }
+	}
+
+	r := &reporter{prev: s.prev}
+	next := make(chan *reporterState, 1)
+	s.prev = next
+
+	// Start f in parallel: it can run until it invokes a method on r, at which
+	// point it will block until the previous task releases the output state.
+	go func() {
+		if err := f(r); err != nil {
+			r.Report(err)
+		}
+		next <- r.getState() // Release the next task.
+		s.sem.Release(weight)
+	}()
+}
+
+// AddReport prints an error to s after the output of any previously-added
+// tasks, causing the final exit code to be nonzero.
+func (s *sequencer) AddReport(err error) {
+	s.Add(0, func(*reporter) error { return err })
+}
+
+// GetExitCode waits for all previously-added tasks to complete, then returns an
+// exit code for the sequence suitable for passing to os.Exit.
+func (s *sequencer) GetExitCode() int {
+	c := make(chan int, 1)
+	s.Add(0, func(r *reporter) error {
+		c <- r.ExitCode()
+		return nil
+	})
+	return <-c
+}
+
+// A reporter reports output, warnings, and errors.
+type reporter struct {
+	prev  <-chan *reporterState
+	state *reporterState
+}
+
+// reporterState carries the state of a reporter instance.
+//
+// Only one reporter at a time may have access to a reporterState.
+type reporterState struct {
+	out, err io.Writer
+	exitCode int
+}
+
+// getState blocks until any prior reporters are finished with the reporter
+// state, then returns the state for manipulation.
+func (r *reporter) getState() *reporterState {
+	if r.state == nil {
+		r.state = <-r.prev
+	}
+	return r.state
+}
+
+// Warnf emits a warning message to the reporter's error stream,
+// without changing its exit code.
+func (r *reporter) Warnf(format string, args ...any) {
+	fmt.Fprintf(r.getState().err, format, args...)
+}
+
+// Write emits a slice to the reporter's output stream.
+//
+// Any error is returned to the caller, and does not otherwise affect the
+// reporter's exit code.
+func (r *reporter) Write(p []byte) (int, error) {
+	return r.getState().out.Write(p)
+}
+
+// Report emits a non-nil error to the reporter's error stream,
+// changing its exit code to a nonzero value.
+func (r *reporter) Report(err error) {
+	if err == nil {
+		panic("Report with nil error")
+	}
+	st := r.getState()
+	if err == errFormattingDiffers {
+		st.exitCode = 1
+	} else {
+		scanner.PrintError(st.err, err)
+		st.exitCode = 2
+	}
+}
+
+func (r *reporter) ExitCode() int {
+	return r.getState().exitCode
+}
+
+// If info == nil, we are formatting stdin instead of a file.
+// If in == nil, the source is the contents of the file with the given filename.
+//
+// NOTE(gofumpt): the `explicit` parameter (added vs upstream) tracks whether
+// this file was named directly on the command line. Explicit files always get
+// the gofumpt rules applied (even generated files); walked files do not when
+// they look generated. It also forces non-.go explicit args to be formatted.
+func processFile(filename string, info fs.FileInfo, in io.Reader, r *reporter, explicit bool) error {
+	src, err := readFile(filename, info, in)
+	if err != nil {
+		return err
+	}
+
+	fileSet := newFileSet()
+	// If we are formatting stdin, we accept a program fragment in lieu of a
+	// complete source file.
+	fragmentOk := info == nil
+	file, sourceAdj, indentAdj, err := parse(fileSet, filename, src, fragmentOk)
+	if err != nil {
+		return err
+	}
+
+	ast.SortImports(fileSet, file)
+
+	// NOTE(gofumpt): from here until the call to format() below is the
+	// gofumpt-specific work upstream gofmt does not do: resolve -lang and
+	// -modpath defaults from the file's containing go.mod, then run
+	// gformat.File to apply the added rules (and simplification, which
+	// gofumpt always runs in lieu of the dropped -s flag). Apply gofumpt's
+	// changes before we print the code in gofumpt's format.
+
+	// If either -lang or -modpath aren't set, fetch them from go.mod.
+	lang := *langVersion
+	modpath := *modulePath
+	if lang == "" || modpath == "" {
+		path, err := filepath.Abs(filename)
+		if err != nil {
+			return err
+		}
+		if mod := loadModule(filepath.Dir(path)); mod != nil {
+			if lang == "" {
+				if mod.file.Go == nil {
+					// If the go directive is missing, go 1.16 is assumed.
+					// https://go.dev/ref/mod#go-mod-file-go
+					lang = "go1.16"
+				} else {
+					lang = "go" + mod.file.Go.Version
+				}
+			}
+			if m := mod.file.Module; m != nil && modpath == "" {
+				modpath = m.Mod.Path
+			}
+		}
+	}
+
+	// We always apply the gofumpt formatting rules to explicit files, including stdin.
+	// Otherwise, we don't apply them on generated files.
+	// We also skip walking vendor directories entirely, but that happens elsewhere.
+	if explicit || !isGenerated(file) {
+		gformat.File(fileSet, file, gformat.Options{
+			LangVersion: lang,
+			ModulePath:  modpath,
+			Extra:       extraRules,
+		})
+	}
+
+	res, err := format(fileSet, file, sourceAdj, indentAdj, src, printer.Config{Mode: printerMode, Tabwidth: tabWidth})
+	if err != nil {
+		return err
+	}
+
+	if !bytes.Equal(src, res) {
+		// formatting has changed
+		if *list {
+			fmt.Fprintln(r, filename)
+		}
+		if *write {
+			if info == nil {
+				panic("-w should not have been allowed with stdin")
+			}
+
+			perm := info.Mode().Perm()
+			if err := writeFile(filename, src, res, perm, info.Size()); err != nil {
+				return err
+			}
+		}
+		if *doDiff {
+			newName := filepath.ToSlash(filename)
+			oldName := newName + ".orig"
+			r.Write(diff.Diff(oldName, src, newName, res))
+			return errFormattingDiffers
+		}
+	}
+
+	if !*list && !*write && !*doDiff {
+		_, err = r.Write(res)
+	}
+
+	return err
+}
+
+// readFile reads the contents of filename, described by info.
+// If in is non-nil, readFile reads directly from it.
+// Otherwise, readFile opens and reads the file itself,
+// with the number of concurrently-open files limited by fdSem.
+func readFile(filename string, info fs.FileInfo, in io.Reader) ([]byte, error) {
+	if in == nil {
+		fdSem <- true
+		var err error
+		f, err := os.Open(filename)
+		if err != nil {
+			return nil, err
+		}
+		in = f
+		defer func() {
+			f.Close()
+			<-fdSem
+		}()
+	}
+
+	// Compute the file's size and read its contents with minimal allocations.
+	//
+	// If we have the FileInfo from filepath.WalkDir, use it to make
+	// a buffer of the right size and avoid ReadAll's reallocations.
+	//
+	// If the size is unknown (or bogus, or overflows an int), fall back to
+	// a size-independent ReadAll.
+	size := -1
+	if info != nil && info.Mode().IsRegular() && int64(int(info.Size())) == info.Size() {
+		size = int(info.Size())
+	}
+	if size+1 <= 0 {
+		// The file is not known to be regular, so we don't have a reliable size for it.
+		var err error
+		src, err := io.ReadAll(in)
+		if err != nil {
+			return nil, err
+		}
+		return src, nil
+	}
+
+	// We try to read size+1 bytes so that we can detect modifications: if we
+	// read more than size bytes, then the file was modified concurrently.
+	// (If that happens, we could, say, append to src to finish the read, or
+	// proceed with a truncated buffer — but the fact that it changed at all
+	// indicates a possible race with someone editing the file, so we prefer to
+	// stop to avoid corrupting it.)
+	src := make([]byte, size+1)
+	n, err := io.ReadFull(in, src)
+	switch err {
+	case nil, io.EOF, io.ErrUnexpectedEOF:
+		// io.ReadFull returns io.EOF (for an empty file) or io.ErrUnexpectedEOF
+		// (for a non-empty file) if the file was changed unexpectedly. Continue
+		// with comparing file sizes in those cases.
+	default:
+		return nil, err
+	}
+	if n < size {
+		return nil, fmt.Errorf("error: size of %s changed during reading (from %d to %d bytes)", filename, size, n)
+	} else if n > size {
+		return nil, fmt.Errorf("error: size of %s changed during reading (from %d to >=%d bytes)", filename, size, len(src))
+	}
+	return src[:n], nil
+}
+
+func main() {
+	// Arbitrarily limit in-flight work to 2MiB times the number of threads.
+	//
+	// The actual overhead for the parse tree and output will depend on the
+	// specifics of the file, but this at least keeps the footprint of the process
+	// roughly proportional to GOMAXPROCS.
+	maxWeight := (2 << 20) * int64(runtime.GOMAXPROCS(0))
+	s := newSequencer(maxWeight, os.Stdout, os.Stderr)
+
+	// call gofmtMain in a separate function
+	// so that it can use defer and have them
+	// run before the exit.
+	gofmtMain(s)
+	os.Exit(s.GetExitCode())
+}
+
+func gofmtMain(s *sequencer) {
+	flag.Usage = usage
+	flag.Parse()
+
+	// NOTE(gofumpt): friendly handling of the dropped -s and -r flags so users
+	// migrating from gofmt get a clear message rather than "flag provided but
+	// not defined". -s is always on; -r is delegated to `gofmt -r`.
+	if *simplifyAST {
+		fmt.Fprintf(os.Stderr, "warning: -s is deprecated as it is always enabled\n")
+	}
+	if *rewriteRule != "" {
+		fmt.Fprintf(os.Stderr, `the rewrite flag is no longer available; use "gofmt -r" instead`+"\n")
+		os.Exit(2)
+	}
+
+	// NOTE(gofumpt): print the gofumpt version if the user asks for it.
+	// -version dumps the build version and any embedded build-info fields
+	// (see internal/version), useful for bug reports and `//gofumpt:diagnose`.
+	if *showVersion {
+		fmt.Println(gversion.String(version))
+		return
+	}
+
+	if *cpuprofile != "" {
+		fdSem <- true
+		f, err := os.Create(*cpuprofile)
+		if err != nil {
+			s.AddReport(fmt.Errorf("creating cpu profile: %s", err))
+			return
+		}
+		defer func() {
+			f.Close()
+			<-fdSem
+		}()
+		pprof.StartCPUProfile(f)
+		defer pprof.StopCPUProfile()
+	}
+
+	initParserMode()
+
+	args := flag.Args()
+	if len(args) == 0 {
+		if *write {
+			s.AddReport(fmt.Errorf("error: cannot use -w with standard input"))
+			return
+		}
+		s.Add(0, func(r *reporter) error {
+			// TODO: test explicit==true
+			return processFile("", nil, os.Stdin, r, true)
+		})
+		return
+	}
+
+	// NOTE(gofumpt): the argument-walking loop below is rewritten vs upstream.
+	// Upstream branched on os.Stat (file vs dir); gofumpt always uses
+	// filepath.WalkDir and tracks `explicit := path == arg` so that:
+	//   - explicit non-.go and explicit generated files are still formatted;
+	//   - vendor/testdata directories and go.mod `ignore` entries are skipped
+	//     during walks but honored when named directly (so `gofumpt -w vendor`
+	//     still works);
+	//   - the explicit bit propagates into processFile to gate gofumpt rules.
+	for _, arg := range args {
+		// Walk each given argument as a directory tree.
+		// If the argument is not a directory, it's always formatted as a Go file.
+		// If the argument is a directory, we walk it, ignoring non-Go files.
+		arg = filepath.Clean(arg) // ensure consistency
+		if err := filepath.WalkDir(arg, func(path string, d fs.DirEntry, err error) error {
+			explicit := path == arg
+			switch {
+			case err != nil:
+				return err
+			case d.IsDir():
+				if !explicit && shouldIgnore(path) {
+					return filepath.SkipDir
+				}
+				return nil // simply recurse into directories
+			case explicit:
+				// non-directories given as explicit arguments are always formatted
+			case !isGoFilename(d.Name()):
+				return nil // skip walked non-Go files
+			}
+			info, err := d.Info()
+			if err != nil {
+				return err
+			}
+			s.Add(fileWeight(path, info), func(r *reporter) error {
+				return processFile(path, info, nil, r, explicit)
+			})
+			return nil
+		}); err != nil {
+			s.AddReport(err)
+		}
+	}
+}
+
+// NOTE(gofumpt): everything from here to the end of the file is gofumpt-only.
+// shouldIgnore implements skipping `vendor` and `testdata` directories during
+// walks, plus honoring Go 1.25's `ignore` directives in go.mod. These are
+// skipped during recursive walks but still formatted when named explicitly.
+func shouldIgnore(path string) bool {
+	switch filepath.Base(path) {
+	case "vendor", "testdata":
+		return true
+	}
+	path, err := filepath.Abs(path)
+	if err != nil {
+		return false // unclear how this could happen; don't ignore in any case
+	}
+	mod := loadModule(path)
+	if mod == nil {
+		return false // no module file to declare ignore paths
+	}
+	relPath, err := filepath.Rel(mod.absDir, path)
+	if err != nil {
+		return false // unclear how this could happen; don't ignore in any case
+	}
+	relPath = normalizePath(relPath)
+	for _, ignore := range mod.file.Ignore {
+		if matchIgnore(ignore.Path, relPath) {
+			return true
+		}
+	}
+	return false
+}
+
+// normalizePath adds slashes to the front and end of the given path.
+func normalizePath(path string) string {
+	path = filepath.ToSlash(path) // ensure Windows support
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	if !strings.HasSuffix(path, "/") {
+		path += "/"
+	}
+	return path
+}
+
+func matchIgnore(ignore, relPath string) bool {
+	ignore, rooted := strings.CutPrefix(ignore, "./")
+	ignore = normalizePath(ignore)
+	// Note that we only match the directory to be ignored itself,
+	// and not any directories underneath it.
+	// This way, using `gofumpt -w ignored` allows `ignored/subdir` to be formatted.
+	if rooted {
+		return relPath == ignore
+	}
+	return strings.HasSuffix(relPath, ignore)
+}
+
+// NOTE(gofumpt): module loading is gofumpt-only. The go.mod is consulted for
+// the default -lang (Go language version, used by version-gated rules), the
+// default -modpath (so imports sharing the module prefix are grouped as
+// third-party), and the `ignore` directives consumed by shouldIgnore above.
+// Results are cached per directory; loadModule walks up to find an enclosing
+// go.mod just like the go command would.
+//
+// A nil entry means the directory is not part of a Go module,
+// or a go.mod file was found but it's invalid.
+// A non-nil entry means this directory, or a parent, is in a valid Go module.
+var cachedModuleByDir sync.Map // map[dirString]*cachedModfile
+
+type cachedModule struct {
+	absDir string // the directory where the go.mod file was found
+	file   *modfile.File
+}
+
+func loadModule(dir string) *cachedModule {
+	if cached, ok := cachedModuleByDir.Load(dir); ok {
+		mf, _ := cached.(*cachedModule)
+		return mf
+	}
+	mod := func() *cachedModule {
+		path := filepath.Join(dir, "go.mod")
+		fdSem <- true
+		data, err := os.ReadFile(path)
+		<-fdSem
+		if err != nil {
+			// If the file is missing, or we can't read this directory at all
+			// (e.g. permission denied on a directory listed in `ignore`), keep
+			// walking up to find an enclosing go.mod.
+			parent := filepath.Dir(dir)
+			if parent == "." {
+				panic("loadModule was not given an absolute path?")
+			}
+			if parent == dir {
+				return nil // reached the filesystem root
+			}
+			return loadModule(parent) // try the parent directory
+		}
+		file, err := modfile.Parse(filepath.Join(dir, "go.mod"), data, nil)
+		if err != nil {
+			return nil // invalid go.mod file
+		}
+		return &cachedModule{
+			absDir: dir,
+			file:   file,
+		}
+	}()
+	if mod != nil {
+		cachedModuleByDir.Store(dir, mod)
+	} else {
+		cachedModuleByDir.Store(dir, nil)
+	}
+	return mod
+}
+
+func fileWeight(path string, info fs.FileInfo) int64 {
+	if info == nil {
+		return exclusive
+	}
+	if info.Mode().Type() == fs.ModeSymlink {
+		var err error
+		info, err = os.Stat(path)
+		if err != nil {
+			return exclusive
+		}
+	}
+	if !info.Mode().IsRegular() {
+		// For non-regular files, FileInfo.Size is system-dependent and thus not a
+		// reliable indicator of weight.
+		return exclusive
+	}
+	return info.Size()
+}
+
+// writeFile updates a file with the new formatted data.
+func writeFile(filename string, orig, formatted []byte, perm fs.FileMode, size int64) error {
+	// Make a temporary backup file before rewriting the original file.
+	bakname, err := backupFile(filename, orig, perm)
+	if err != nil {
+		return err
+	}
+
+	fdSem <- true
+	defer func() { <-fdSem }()
+
+	fout, err := os.OpenFile(filename, os.O_WRONLY, perm)
+	if err != nil {
+		// We couldn't even open the file, so it should
+		// not have changed.
+		os.Remove(bakname)
+		return err
+	}
+	defer fout.Close() // for error paths
+
+	restoreFail := func(err error) {
+		fmt.Fprintf(os.Stderr, "gofumpt: %s: error restoring file to original: %v; backup in %s\n", filename, err, bakname)
+	}
+
+	n, err := fout.Write(formatted)
+	if err == nil && int64(n) < size {
+		err = fout.Truncate(int64(n))
+	}
+
+	if err != nil {
+		// Rewriting the file failed.
+
+		if n == 0 {
+			// Original file unchanged.
+			os.Remove(bakname)
+			return err
+		}
+
+		// Try to restore the original contents.
+
+		no, erro := fout.WriteAt(orig, 0)
+		if erro != nil {
+			// That failed too.
+			restoreFail(erro)
+			return err
+		}
+
+		if no < n {
+			// Original file is shorter. Truncate.
+			if erro = fout.Truncate(int64(no)); erro != nil {
+				restoreFail(erro)
+				return err
+			}
+		}
+
+		if erro := fout.Close(); erro != nil {
+			restoreFail(erro)
+			return err
+		}
+
+		// Original contents restored.
+		os.Remove(bakname)
+		return err
+	}
+
+	if err := fout.Close(); err != nil {
+		restoreFail(err)
+		return err
+	}
+
+	// File updated.
+	os.Remove(bakname)
+	return nil
+}
+
+// backupFile writes data to a new file named filename with permissions perm,
+// with  randomly chosen such that the file name is unique. backupFile returns
+// the chosen file name.
+func backupFile(filename string, data []byte, perm fs.FileMode) (string, error) {
+	fdSem <- true
+	defer func() { <-fdSem }()
+
+	nextRandom := func() string {
+		return strconv.Itoa(rand.Int())
+	}
+
+	dir, base := filepath.Split(filename)
+	var (
+		bakname string
+		f       *os.File
+	)
+	for {
+		bakname = filepath.Join(dir, base+"."+nextRandom())
+		var err error
+		f, err = os.OpenFile(bakname, os.O_RDWR|os.O_CREATE|os.O_EXCL, perm)
+		if err == nil {
+			break
+		}
+		if !os.IsExist(err) {
+			return "", err
+		}
+	}
+
+	// write data to backup file
+	_, err := f.Write(data)
+	if err1 := f.Close(); err == nil {
+		err = err1
+	}
+
+	return bakname, err
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal.go b/vendor/mvdan.cc/gofumpt/internal.go
new file mode 100644
index 000000000..3c9f56037
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal.go
@@ -0,0 +1,180 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// TODO(gri): This file and the file src/go/format/internal.go are
+// the same (but for this comment and the package name). Do not modify
+// one without the other. Determine if we can factor out functionality
+// in a public API. See also #11844 for context.
+
+package main
+
+import (
+	"bytes"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"strings"
+
+	// NOTE(gofumpt): use a vendored copy of go/printer (and go/doc/comment)
+	// frozen at a specific Go version. This way installing a given gofumpt
+	// release produces the same output regardless of the user's Go toolchain.
+	"mvdan.cc/gofumpt/internal/govendor/go/printer"
+)
+
+// parse parses src, which was read from the named file,
+// as a Go source file, declaration, or statement list.
+func parse(fset *token.FileSet, filename string, src []byte, fragmentOk bool) (
+	file *ast.File,
+	sourceAdj func(src []byte, indent int) []byte,
+	indentAdj int,
+	err error,
+) {
+	// Try as whole source file.
+	file, err = parser.ParseFile(fset, filename, src, parserMode)
+	// If there's no error, return. If the error is that the source file didn't begin with a
+	// package line and source fragments are ok, fall through to
+	// try as a source fragment. Stop and return on any other error.
+	if err == nil || !fragmentOk || !strings.Contains(err.Error(), "expected 'package'") {
+		return file, sourceAdj, indentAdj, err
+	}
+
+	// If this is a declaration list, make it a source file
+	// by inserting a package clause.
+	// Insert using a ';', not a newline, so that the line numbers
+	// in psrc match the ones in src.
+	psrc := append([]byte("package p;"), src...)
+	file, err = parser.ParseFile(fset, filename, psrc, parserMode)
+	if err == nil {
+		sourceAdj = func(src []byte, indent int) []byte {
+			// Remove the package clause.
+			// Gofmt has turned the ';' into a '\n'.
+			src = src[indent+len("package p\n"):]
+			return bytes.TrimSpace(src)
+		}
+		return file, sourceAdj, indentAdj, err
+	}
+	// If the error is that the source file didn't begin with a
+	// declaration, fall through to try as a statement list.
+	// Stop and return on any other error.
+	if !strings.Contains(err.Error(), "expected declaration") {
+		return file, sourceAdj, indentAdj, err
+	}
+
+	// If this is a statement list, make it a source file
+	// by inserting a package clause and turning the list
+	// into a function body. This handles expressions too.
+	// Insert using a ';', not a newline, so that the line numbers
+	// in fsrc match the ones in src. Add an extra '\n' before the '}'
+	// to make sure comments are flushed before the '}'.
+	fsrc := append(append([]byte("package p; func _() {"), src...), '\n', '\n', '}')
+	file, err = parser.ParseFile(fset, filename, fsrc, parserMode)
+	if err == nil {
+		sourceAdj = func(src []byte, indent int) []byte {
+			// Cap adjusted indent to zero.
+			if indent < 0 {
+				indent = 0
+			}
+			// Remove the wrapping.
+			// Gofmt has turned the "; " into a "\n\n".
+			// There will be two non-blank lines with indent, hence 2*indent.
+			src = src[2*indent+len("package p\n\nfunc _() {"):]
+			// Remove only the "}\n" suffix: remaining whitespaces will be trimmed anyway
+			src = src[:len(src)-len("}\n")]
+			return bytes.TrimSpace(src)
+		}
+		// Gofmt has also indented the function body one level.
+		// Adjust that with indentAdj.
+		indentAdj = -1
+	}
+
+	// Succeeded, or out of options.
+	return file, sourceAdj, indentAdj, err
+}
+
+// format formats the given package file originally obtained from src
+// and adjusts the result based on the original source via sourceAdj
+// and indentAdj.
+func format(
+	fset *token.FileSet,
+	file *ast.File,
+	sourceAdj func(src []byte, indent int) []byte,
+	indentAdj int,
+	src []byte,
+	cfg printer.Config,
+) ([]byte, error) {
+	if sourceAdj == nil {
+		// Complete source file.
+		var buf bytes.Buffer
+		err := cfg.Fprint(&buf, fset, file)
+		if err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	}
+
+	// Partial source file.
+	// Determine and prepend leading space.
+	i, j := 0, 0
+	for j < len(src) && isSpace(src[j]) {
+		if src[j] == '\n' {
+			i = j + 1 // byte offset of last line in leading space
+		}
+		j++
+	}
+	var res []byte
+	res = append(res, src[:i]...)
+
+	// Determine and prepend indentation of first code line.
+	// Spaces are ignored unless there are no tabs,
+	// in which case spaces count as one tab.
+	indent := 0
+	hasSpace := false
+	for _, b := range src[i:j] {
+		switch b {
+		case ' ':
+			hasSpace = true
+		case '\t':
+			indent++
+		}
+	}
+	if indent == 0 && hasSpace {
+		indent = 1
+	}
+	for range indent {
+		res = append(res, '\t')
+	}
+
+	// Format the source.
+	// Write it without any leading and trailing space.
+	cfg.Indent = indent + indentAdj
+	var buf bytes.Buffer
+	err := cfg.Fprint(&buf, fset, file)
+	if err != nil {
+		return nil, err
+	}
+	out := sourceAdj(buf.Bytes(), cfg.Indent)
+
+	// If the adjusted output is empty, the source
+	// was empty but (possibly) for white space.
+	// The result is the incoming source.
+	if len(out) == 0 {
+		return src, nil
+	}
+
+	// Otherwise, append output to leading space.
+	res = append(res, out...)
+
+	// Determine and append trailing space.
+	i = len(src)
+	for i > 0 && isSpace(src[i-1]) {
+		i--
+	}
+	return append(res, src[i:]...), nil
+}
+
+// isSpace reports whether the byte is a space character.
+// isSpace defines a space as being among the following bytes: ' ', '\t', '\n' and '\r'.
+func isSpace(b byte) bool {
+	return b == ' ' || b == '\t' || b == '\n' || b == '\r'
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/diff/diff.go b/vendor/mvdan.cc/gofumpt/internal/govendor/diff/diff.go
new file mode 100644
index 000000000..6a40b23fc
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/diff/diff.go
@@ -0,0 +1,261 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package diff
+
+import (
+	"bytes"
+	"fmt"
+	"sort"
+	"strings"
+)
+
+// A pair is a pair of values tracked for both the x and y side of a diff.
+// It is typically a pair of line indexes.
+type pair struct{ x, y int }
+
+// Diff returns an anchored diff of the two texts old and new
+// in the “unified diff” format. If old and new are identical,
+// Diff returns a nil slice (no output).
+//
+// Unix diff implementations typically look for a diff with
+// the smallest number of lines inserted and removed,
+// which can in the worst case take time quadratic in the
+// number of lines in the texts. As a result, many implementations
+// either can be made to run for a long time or cut off the search
+// after a predetermined amount of work.
+//
+// In contrast, this implementation looks for a diff with the
+// smallest number of “unique” lines inserted and removed,
+// where unique means a line that appears just once in both old and new.
+// We call this an “anchored diff” because the unique lines anchor
+// the chosen matching regions. An anchored diff is usually clearer
+// than a standard diff, because the algorithm does not try to
+// reuse unrelated blank lines or closing braces.
+// The algorithm also guarantees to run in O(n log n) time
+// instead of the standard O(n²) time.
+//
+// Some systems call this approach a “patience diff,” named for
+// the “patience sorting” algorithm, itself named for a solitaire card game.
+// We avoid that name for two reasons. First, the name has been used
+// for a few different variants of the algorithm, so it is imprecise.
+// Second, the name is frequently interpreted as meaning that you have
+// to wait longer (to be patient) for the diff, meaning that it is a slower algorithm,
+// when in fact the algorithm is faster than the standard one.
+func Diff(oldName string, old []byte, newName string, new []byte) []byte {
+	if bytes.Equal(old, new) {
+		return nil
+	}
+	x := lines(old)
+	y := lines(new)
+
+	// Print diff header.
+	var out bytes.Buffer
+	fmt.Fprintf(&out, "diff %s %s\n", oldName, newName)
+	fmt.Fprintf(&out, "--- %s\n", oldName)
+	fmt.Fprintf(&out, "+++ %s\n", newName)
+
+	// Loop over matches to consider,
+	// expanding each match to include surrounding lines,
+	// and then printing diff chunks.
+	// To avoid setup/teardown cases outside the loop,
+	// tgs returns a leading {0,0} and trailing {len(x), len(y)} pair
+	// in the sequence of matches.
+	var (
+		done  pair     // printed up to x[:done.x] and y[:done.y]
+		chunk pair     // start lines of current chunk
+		count pair     // number of lines from each side in current chunk
+		ctext []string // lines for current chunk
+	)
+	for _, m := range tgs(x, y) {
+		if m.x < done.x {
+			// Already handled scanning forward from earlier match.
+			continue
+		}
+
+		// Expand matching lines as far as possible,
+		// establishing that x[start.x:end.x] == y[start.y:end.y].
+		// Note that on the first (or last) iteration we may (or definitely do)
+		// have an empty match: start.x==end.x and start.y==end.y.
+		start := m
+		for start.x > done.x && start.y > done.y && x[start.x-1] == y[start.y-1] {
+			start.x--
+			start.y--
+		}
+		end := m
+		for end.x < len(x) && end.y < len(y) && x[end.x] == y[end.y] {
+			end.x++
+			end.y++
+		}
+
+		// Emit the mismatched lines before start into this chunk.
+		// (No effect on first sentinel iteration, when start = {0,0}.)
+		for _, s := range x[done.x:start.x] {
+			ctext = append(ctext, "-"+s)
+			count.x++
+		}
+		for _, s := range y[done.y:start.y] {
+			ctext = append(ctext, "+"+s)
+			count.y++
+		}
+
+		// If we're not at EOF and have too few common lines,
+		// the chunk includes all the common lines and continues.
+		const C = 3 // number of context lines
+		if (end.x < len(x) || end.y < len(y)) &&
+			(end.x-start.x < C || (len(ctext) > 0 && end.x-start.x < 2*C)) {
+			for _, s := range x[start.x:end.x] {
+				ctext = append(ctext, " "+s)
+				count.x++
+				count.y++
+			}
+			done = end
+			continue
+		}
+
+		// End chunk with common lines for context.
+		if len(ctext) > 0 {
+			n := end.x - start.x
+			if n > C {
+				n = C
+			}
+			for _, s := range x[start.x : start.x+n] {
+				ctext = append(ctext, " "+s)
+				count.x++
+				count.y++
+			}
+			done = pair{start.x + n, start.y + n}
+
+			// Format and emit chunk.
+			// Convert line numbers to 1-indexed.
+			// Special case: empty file shows up as 0,0 not 1,0.
+			if count.x > 0 {
+				chunk.x++
+			}
+			if count.y > 0 {
+				chunk.y++
+			}
+			fmt.Fprintf(&out, "@@ -%d,%d +%d,%d @@\n", chunk.x, count.x, chunk.y, count.y)
+			for _, s := range ctext {
+				out.WriteString(s)
+			}
+			count.x = 0
+			count.y = 0
+			ctext = ctext[:0]
+		}
+
+		// If we reached EOF, we're done.
+		if end.x >= len(x) && end.y >= len(y) {
+			break
+		}
+
+		// Otherwise start a new chunk.
+		chunk = pair{end.x - C, end.y - C}
+		for _, s := range x[chunk.x:end.x] {
+			ctext = append(ctext, " "+s)
+			count.x++
+			count.y++
+		}
+		done = end
+	}
+
+	return out.Bytes()
+}
+
+// lines returns the lines in the file x, including newlines.
+// If the file does not end in a newline, one is supplied
+// along with a warning about the missing newline.
+func lines(x []byte) []string {
+	l := strings.SplitAfter(string(x), "\n")
+	if l[len(l)-1] == "" {
+		l = l[:len(l)-1]
+	} else {
+		// Treat last line as having a message about the missing newline attached,
+		// using the same text as BSD/GNU diff (including the leading backslash).
+		l[len(l)-1] += "\n\\ No newline at end of file\n"
+	}
+	return l
+}
+
+// tgs returns the pairs of indexes of the longest common subsequence
+// of unique lines in x and y, where a unique line is one that appears
+// once in x and once in y.
+//
+// The longest common subsequence algorithm is as described in
+// Thomas G. Szymanski, “A Special Case of the Maximal Common
+// Subsequence Problem,” Princeton TR #170 (January 1975),
+// available at https://research.swtch.com/tgs170.pdf.
+func tgs(x, y []string) []pair {
+	// Count the number of times each string appears in a and b.
+	// We only care about 0, 1, many, counted as 0, -1, -2
+	// for the x side and 0, -4, -8 for the y side.
+	// Using negative numbers now lets us distinguish positive line numbers later.
+	m := make(map[string]int)
+	for _, s := range x {
+		if c := m[s]; c > -2 {
+			m[s] = c - 1
+		}
+	}
+	for _, s := range y {
+		if c := m[s]; c > -8 {
+			m[s] = c - 4
+		}
+	}
+
+	// Now unique strings can be identified by m[s] = -1+-4.
+	//
+	// Gather the indexes of those strings in x and y, building:
+	//	xi[i] = increasing indexes of unique strings in x.
+	//	yi[i] = increasing indexes of unique strings in y.
+	//	inv[i] = index j such that x[xi[i]] = y[yi[j]].
+	var xi, yi, inv []int
+	for i, s := range y {
+		if m[s] == -1+-4 {
+			m[s] = len(yi)
+			yi = append(yi, i)
+		}
+	}
+	for i, s := range x {
+		if j, ok := m[s]; ok && j >= 0 {
+			xi = append(xi, i)
+			inv = append(inv, j)
+		}
+	}
+
+	// Apply Algorithm A from Szymanski's paper.
+	// In those terms, A = J = inv and B = [0, n).
+	// We add sentinel pairs {0,0}, and {len(x),len(y)}
+	// to the returned sequence, to help the processing loop.
+	J := inv
+	n := len(xi)
+	T := make([]int, n)
+	L := make([]int, n)
+	for i := range T {
+		T[i] = n + 1
+	}
+	for i := 0; i < n; i++ {
+		k := sort.Search(n, func(k int) bool {
+			return T[k] >= J[i]
+		})
+		T[k] = J[i]
+		L[i] = k + 1
+	}
+	k := 0
+	for _, v := range L {
+		if k < v {
+			k = v
+		}
+	}
+	seq := make([]pair, 2+k)
+	seq[1+k] = pair{len(x), len(y)} // sentinel at end
+	lastj := n
+	for i := n - 1; i >= 0; i-- {
+		if L[i] == k && J[i] < lastj {
+			seq[k] = pair{xi[i], yi[J[i]]}
+			k--
+		}
+	}
+	seq[0] = pair{0, 0} // sentinel at start
+	return seq
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/doc.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/doc.go
new file mode 100644
index 000000000..45a476aa9
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/doc.go
@@ -0,0 +1,36 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package comment implements parsing and reformatting of Go doc comments,
+(documentation comments), which are comments that immediately precede
+a top-level declaration of a package, const, func, type, or var.
+
+Go doc comment syntax is a simplified subset of Markdown that supports
+links, headings, paragraphs, lists (without nesting), and preformatted text blocks.
+The details of the syntax are documented at https://go.dev/doc/comment.
+
+To parse the text associated with a doc comment (after removing comment markers),
+use a [Parser]:
+
+	var p comment.Parser
+	doc := p.Parse(text)
+
+The result is a [*Doc].
+To reformat it as a doc comment, HTML, Markdown, or plain text,
+use a [Printer]:
+
+	var pr comment.Printer
+	os.Stdout.Write(pr.Text(doc))
+
+The [Parser] and [Printer] types are structs whose fields can be
+modified to customize the operations.
+For details, see the documentation for those types.
+
+Use cases that need additional control over reformatting can
+implement their own logic by inspecting the parsed syntax itself.
+See the documentation for [Doc], [Block], [Text] for an overview
+and links to additional types.
+*/
+package comment
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/html.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/html.go
new file mode 100644
index 000000000..9244509e0
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/html.go
@@ -0,0 +1,169 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package comment
+
+import (
+	"bytes"
+	"fmt"
+	"strconv"
+)
+
+// An htmlPrinter holds the state needed for printing a [Doc] as HTML.
+type htmlPrinter struct {
+	*Printer
+	tight bool
+}
+
+// HTML returns an HTML formatting of the [Doc].
+// See the [Printer] documentation for ways to customize the HTML output.
+func (p *Printer) HTML(d *Doc) []byte {
+	hp := &htmlPrinter{Printer: p}
+	var out bytes.Buffer
+	for _, x := range d.Content {
+		hp.block(&out, x)
+	}
+	return out.Bytes()
+}
+
+// block prints the block x to out.
+func (p *htmlPrinter) block(out *bytes.Buffer, x Block) {
+	switch x := x.(type) {
+	default:
+		fmt.Fprintf(out, "?%T", x)
+
+	case *Paragraph:
+		if !p.tight {
+			out.WriteString("
    ")
+		}
+		p.text(out, x.Text)
+		out.WriteString("\n")
+
+	case *Heading:
+		out.WriteString("")
+		p.text(out, x.Text)
+		out.WriteString("\n")
+
+	case *Code:
+		out.WriteString("
    ")
+		p.escape(out, x.Text)
+		out.WriteString("
    \n")
+
+	case *List:
+		kind := "ol>\n"
+		if x.Items[0].Number == "" {
+			kind = "ul>\n"
+		}
+		out.WriteString("<")
+		out.WriteString(kind)
+		next := "1"
+		for _, item := range x.Items {
+			out.WriteString("")
+			p.tight = !x.BlankBetween()
+			for _, blk := range item.Content {
+				p.block(out, blk)
+			}
+			p.tight = false
+		}
+		out.WriteString("= 0; i-- {
+		if b[i] < '9' {
+			b[i]++
+			return string(b)
+		}
+		b[i] = '0'
+	}
+	return "1" + string(b)
+}
+
+// text prints the text sequence x to out.
+func (p *htmlPrinter) text(out *bytes.Buffer, x []Text) {
+	for _, t := range x {
+		switch t := t.(type) {
+		case Plain:
+			p.escape(out, string(t))
+		case Italic:
+			out.WriteString("")
+			p.escape(out, string(t))
+			out.WriteString("")
+		case *Link:
+			out.WriteString(``)
+			p.text(out, t.Text)
+			out.WriteString("")
+		case *DocLink:
+			url := p.docLinkURL(t)
+			if url != "" {
+				out.WriteString(``)
+			}
+			p.text(out, t.Text)
+			if url != "" {
+				out.WriteString("")
+			}
+		}
+	}
+}
+
+// escape prints s to out as plain text,
+// escaping < & " ' and > to avoid being misinterpreted
+// in larger HTML constructs.
+func (p *htmlPrinter) escape(out *bytes.Buffer, s string) {
+	start := 0
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case '<':
+			out.WriteString(s[start:i])
+			out.WriteString("<")
+			start = i + 1
+		case '&':
+			out.WriteString(s[start:i])
+			out.WriteString("&")
+			start = i + 1
+		case '"':
+			out.WriteString(s[start:i])
+			out.WriteString(""")
+			start = i + 1
+		case '\'':
+			out.WriteString(s[start:i])
+			out.WriteString("'")
+			start = i + 1
+		case '>':
+			out.WriteString(s[start:i])
+			out.WriteString(">")
+			start = i + 1
+		}
+	}
+	out.WriteString(s[start:])
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/markdown.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/markdown.go
new file mode 100644
index 000000000..d8550f2e3
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/markdown.go
@@ -0,0 +1,188 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package comment
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+)
+
+// An mdPrinter holds the state needed for printing a Doc as Markdown.
+type mdPrinter struct {
+	*Printer
+	headingPrefix string
+	raw           bytes.Buffer
+}
+
+// Markdown returns a Markdown formatting of the Doc.
+// See the [Printer] documentation for ways to customize the Markdown output.
+func (p *Printer) Markdown(d *Doc) []byte {
+	mp := &mdPrinter{
+		Printer:       p,
+		headingPrefix: strings.Repeat("#", p.headingLevel()) + " ",
+	}
+
+	var out bytes.Buffer
+	for i, x := range d.Content {
+		if i > 0 {
+			out.WriteByte('\n')
+		}
+		mp.block(&out, x)
+	}
+	return out.Bytes()
+}
+
+// block prints the block x to out.
+func (p *mdPrinter) block(out *bytes.Buffer, x Block) {
+	switch x := x.(type) {
+	default:
+		fmt.Fprintf(out, "?%T", x)
+
+	case *Paragraph:
+		p.text(out, x.Text)
+		out.WriteString("\n")
+
+	case *Heading:
+		out.WriteString(p.headingPrefix)
+		p.text(out, x.Text)
+		if id := p.headingID(x); id != "" {
+			out.WriteString(" {#")
+			out.WriteString(id)
+			out.WriteString("}")
+		}
+		out.WriteString("\n")
+
+	case *Code:
+		md := x.Text
+		for md != "" {
+			var line string
+			line, md, _ = strings.Cut(md, "\n")
+			if line != "" {
+				out.WriteString("\t")
+				out.WriteString(line)
+			}
+			out.WriteString("\n")
+		}
+
+	case *List:
+		loose := x.BlankBetween()
+		for i, item := range x.Items {
+			if i > 0 && loose {
+				out.WriteString("\n")
+			}
+			if n := item.Number; n != "" {
+				out.WriteString(" ")
+				out.WriteString(n)
+				out.WriteString(". ")
+			} else {
+				out.WriteString("  - ") // SP SP - SP
+			}
+			for i, blk := range item.Content {
+				const fourSpace = "    "
+				if i > 0 {
+					out.WriteString("\n" + fourSpace)
+				}
+				p.text(out, blk.(*Paragraph).Text)
+				out.WriteString("\n")
+			}
+		}
+	}
+}
+
+// text prints the text sequence x to out.
+func (p *mdPrinter) text(out *bytes.Buffer, x []Text) {
+	p.raw.Reset()
+	p.rawText(&p.raw, x)
+	line := bytes.TrimSpace(p.raw.Bytes())
+	if len(line) == 0 {
+		return
+	}
+	switch line[0] {
+	case '+', '-', '*', '#':
+		// Escape what would be the start of an unordered list or heading.
+		out.WriteByte('\\')
+	case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		i := 1
+		for i < len(line) && '0' <= line[i] && line[i] <= '9' {
+			i++
+		}
+		if i < len(line) && (line[i] == '.' || line[i] == ')') {
+			// Escape what would be the start of an ordered list.
+			out.Write(line[:i])
+			out.WriteByte('\\')
+			line = line[i:]
+		}
+	}
+	out.Write(line)
+}
+
+// rawText prints the text sequence x to out,
+// without worrying about escaping characters
+// that have special meaning at the start of a Markdown line.
+func (p *mdPrinter) rawText(out *bytes.Buffer, x []Text) {
+	for _, t := range x {
+		switch t := t.(type) {
+		case Plain:
+			p.escape(out, string(t))
+		case Italic:
+			out.WriteString("*")
+			p.escape(out, string(t))
+			out.WriteString("*")
+		case *Link:
+			out.WriteString("[")
+			p.rawText(out, t.Text)
+			out.WriteString("](")
+			out.WriteString(t.URL)
+			out.WriteString(")")
+		case *DocLink:
+			url := p.docLinkURL(t)
+			if url != "" {
+				out.WriteString("[")
+			}
+			p.rawText(out, t.Text)
+			if url != "" {
+				out.WriteString("](")
+				url = strings.ReplaceAll(url, "(", "%28")
+				url = strings.ReplaceAll(url, ")", "%29")
+				out.WriteString(url)
+				out.WriteString(")")
+			}
+		}
+	}
+}
+
+// escape prints s to out as plain text,
+// escaping special characters to avoid being misinterpreted
+// as Markdown markup sequences.
+func (p *mdPrinter) escape(out *bytes.Buffer, s string) {
+	start := 0
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case '\n':
+			// Turn all \n into spaces, for a few reasons:
+			//   - Avoid introducing paragraph breaks accidentally.
+			//   - Avoid the need to reindent after the newline.
+			//   - Avoid problems with Markdown renderers treating
+			//     every mid-paragraph newline as a 
    .
+			out.WriteString(s[start:i])
+			out.WriteByte(' ')
+			start = i + 1
+			continue
+		case '`', '_', '*', '[', '<', '\\':
+			// Not all of these need to be escaped all the time,
+			// but is valid and easy to do so.
+			// We assume the Markdown is being passed to a
+			// Markdown renderer, not edited by a person,
+			// so it's fine to have escapes that are not strictly
+			// necessary in some cases.
+			out.WriteString(s[start:i])
+			out.WriteByte('\\')
+			out.WriteByte(s[i])
+			start = i + 1
+		}
+	}
+	out.WriteString(s[start:])
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/parse.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/parse.go
new file mode 100644
index 000000000..bd42c55ec
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/parse.go
@@ -0,0 +1,1260 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package comment
+
+import (
+	"slices"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+// A Doc is a parsed Go doc comment.
+type Doc struct {
+	// Content is the sequence of content blocks in the comment.
+	Content []Block
+
+	// Links is the link definitions in the comment.
+	Links []*LinkDef
+}
+
+// A LinkDef is a single link definition.
+type LinkDef struct {
+	Text string // the link text
+	URL  string // the link URL
+	Used bool   // whether the comment uses the definition
+}
+
+// A Block is block-level content in a doc comment,
+// one of [*Code], [*Heading], [*List], or [*Paragraph].
+type Block interface {
+	block()
+}
+
+// A Heading is a doc comment heading.
+type Heading struct {
+	Text []Text // the heading text
+}
+
+func (*Heading) block() {}
+
+// A List is a numbered or bullet list.
+// Lists are always non-empty: len(Items) > 0.
+// In a numbered list, every Items[i].Number is a non-empty string.
+// In a bullet list, every Items[i].Number is an empty string.
+type List struct {
+	// Items is the list items.
+	Items []*ListItem
+
+	// ForceBlankBefore indicates that the list must be
+	// preceded by a blank line when reformatting the comment,
+	// overriding the usual conditions. See the BlankBefore method.
+	//
+	// The comment parser sets ForceBlankBefore for any list
+	// that is preceded by a blank line, to make sure
+	// the blank line is preserved when printing.
+	ForceBlankBefore bool
+
+	// ForceBlankBetween indicates that list items must be
+	// separated by blank lines when reformatting the comment,
+	// overriding the usual conditions. See the BlankBetween method.
+	//
+	// The comment parser sets ForceBlankBetween for any list
+	// that has a blank line between any two of its items, to make sure
+	// the blank lines are preserved when printing.
+	ForceBlankBetween bool
+}
+
+func (*List) block() {}
+
+// BlankBefore reports whether a reformatting of the comment
+// should include a blank line before the list.
+// The default rule is the same as for [BlankBetween]:
+// if the list item content contains any blank lines
+// (meaning at least one item has multiple paragraphs)
+// then the list itself must be preceded by a blank line.
+// A preceding blank line can be forced by setting [List].ForceBlankBefore.
+func (l *List) BlankBefore() bool {
+	return l.ForceBlankBefore || l.BlankBetween()
+}
+
+// BlankBetween reports whether a reformatting of the comment
+// should include a blank line between each pair of list items.
+// The default rule is that if the list item content contains any blank lines
+// (meaning at least one item has multiple paragraphs)
+// then list items must themselves be separated by blank lines.
+// Blank line separators can be forced by setting [List].ForceBlankBetween.
+func (l *List) BlankBetween() bool {
+	if l.ForceBlankBetween {
+		return true
+	}
+	for _, item := range l.Items {
+		if len(item.Content) != 1 {
+			// Unreachable for parsed comments today,
+			// since the only way to get multiple item.Content
+			// is multiple paragraphs, which must have been
+			// separated by a blank line.
+			return true
+		}
+	}
+	return false
+}
+
+// A ListItem is a single item in a numbered or bullet list.
+type ListItem struct {
+	// Number is a decimal string in a numbered list
+	// or an empty string in a bullet list.
+	Number string // "1", "2", ...; "" for bullet list
+
+	// Content is the list content.
+	// Currently, restrictions in the parser and printer
+	// require every element of Content to be a *Paragraph.
+	Content []Block // Content of this item.
+}
+
+// A Paragraph is a paragraph of text.
+type Paragraph struct {
+	Text []Text
+}
+
+func (*Paragraph) block() {}
+
+// A Code is a preformatted code block.
+type Code struct {
+	// Text is the preformatted text, ending with a newline character.
+	// It may be multiple lines, each of which ends with a newline character.
+	// It is never empty, nor does it start or end with a blank line.
+	Text string
+}
+
+func (*Code) block() {}
+
+// A Text is text-level content in a doc comment,
+// one of [Plain], [Italic], [*Link], or [*DocLink].
+type Text interface {
+	text()
+}
+
+// A Plain is a string rendered as plain text (not italicized).
+type Plain string
+
+func (Plain) text() {}
+
+// An Italic is a string rendered as italicized text.
+type Italic string
+
+func (Italic) text() {}
+
+// A Link is a link to a specific URL.
+type Link struct {
+	Auto bool   // is this an automatic (implicit) link of a literal URL?
+	Text []Text // text of link
+	URL  string // target URL of link
+}
+
+func (*Link) text() {}
+
+// A DocLink is a link to documentation for a Go package or symbol.
+type DocLink struct {
+	Text []Text // text of link
+
+	// ImportPath, Recv, and Name identify the Go package or symbol
+	// that is the link target. The potential combinations of
+	// non-empty fields are:
+	//  - ImportPath: a link to another package
+	//  - ImportPath, Name: a link to a const, func, type, or var in another package
+	//  - ImportPath, Recv, Name: a link to a method in another package
+	//  - Name: a link to a const, func, type, or var in this package
+	//  - Recv, Name: a link to a method in this package
+	ImportPath string // import path
+	Recv       string // receiver type, without any pointer star, for methods
+	Name       string // const, func, type, var, or method name
+}
+
+func (*DocLink) text() {}
+
+// A Parser is a doc comment parser.
+// The fields in the struct can be filled in before calling [Parser.Parse]
+// in order to customize the details of the parsing process.
+type Parser struct {
+	// Words is a map of Go identifier words that
+	// should be italicized and potentially linked.
+	// If Words[w] is the empty string, then the word w
+	// is only italicized. Otherwise it is linked, using
+	// Words[w] as the link target.
+	// Words corresponds to the [go/doc.ToHTML] words parameter.
+	Words map[string]string
+
+	// LookupPackage resolves a package name to an import path.
+	//
+	// If LookupPackage(name) returns ok == true, then [name]
+	// (or [name.Sym] or [name.Sym.Method])
+	// is considered a documentation link to importPath's package docs.
+	// It is valid to return "", true, in which case name is considered
+	// to refer to the current package.
+	//
+	// If LookupPackage(name) returns ok == false,
+	// then [name] (or [name.Sym] or [name.Sym.Method])
+	// will not be considered a documentation link,
+	// except in the case where name is the full (but single-element) import path
+	// of a package in the standard library, such as in [math] or [io.Reader].
+	// LookupPackage is still called for such names,
+	// in order to permit references to imports of other packages
+	// with the same package names.
+	//
+	// Setting LookupPackage to nil is equivalent to setting it to
+	// a function that always returns "", false.
+	LookupPackage func(name string) (importPath string, ok bool)
+
+	// LookupSym reports whether a symbol name or method name
+	// exists in the current package.
+	//
+	// If LookupSym("", "Name") returns true, then [Name]
+	// is considered a documentation link for a const, func, type, or var.
+	//
+	// Similarly, if LookupSym("Recv", "Name") returns true,
+	// then [Recv.Name] is considered a documentation link for
+	// type Recv's method Name.
+	//
+	// Setting LookupSym to nil is equivalent to setting it to a function
+	// that always returns false.
+	LookupSym func(recv, name string) (ok bool)
+}
+
+// parseDoc is parsing state for a single doc comment.
+type parseDoc struct {
+	*Parser
+	*Doc
+	links     map[string]*LinkDef
+	lines     []string
+	lookupSym func(recv, name string) bool
+}
+
+// lookupPkg is called to look up the pkg in [pkg], [pkg.Name], and [pkg.Name.Recv].
+// If pkg has a slash, it is assumed to be the full import path and is returned with ok = true.
+//
+// Otherwise, pkg is probably a simple package name like "rand" (not "crypto/rand" or "math/rand").
+// d.LookupPackage provides a way for the caller to allow resolving such names with reference
+// to the imports in the surrounding package.
+//
+// There is one collision between these two cases: single-element standard library names
+// like "math" are full import paths but don't contain slashes. We let d.LookupPackage have
+// the first chance to resolve it, in case there's a different package imported as math,
+// and otherwise we refer to a built-in list of single-element standard library package names.
+func (d *parseDoc) lookupPkg(pkg string) (importPath string, ok bool) {
+	if strings.Contains(pkg, "/") { // assume a full import path
+		if validImportPath(pkg) {
+			return pkg, true
+		}
+		return "", false
+	}
+	if d.LookupPackage != nil {
+		// Give LookupPackage a chance.
+		if path, ok := d.LookupPackage(pkg); ok {
+			return path, true
+		}
+	}
+	return DefaultLookupPackage(pkg)
+}
+
+func isStdPkg(path string) bool {
+	_, ok := slices.BinarySearch(stdPkgs, path)
+	return ok
+}
+
+// DefaultLookupPackage is the default package lookup
+// function, used when [Parser.LookupPackage] is nil.
+// It recognizes names of the packages from the standard
+// library with single-element import paths, such as math,
+// which would otherwise be impossible to name.
+//
+// Note that the go/doc package provides a more sophisticated
+// lookup based on the imports used in the current package.
+func DefaultLookupPackage(name string) (importPath string, ok bool) {
+	if isStdPkg(name) {
+		return name, true
+	}
+	return "", false
+}
+
+// Parse parses the doc comment text and returns the *[Doc] form.
+// Comment markers (/* // and */) in the text must have already been removed.
+func (p *Parser) Parse(text string) *Doc {
+	lines := unindent(strings.Split(text, "\n"))
+	d := &parseDoc{
+		Parser:    p,
+		Doc:       new(Doc),
+		links:     make(map[string]*LinkDef),
+		lines:     lines,
+		lookupSym: func(recv, name string) bool { return false },
+	}
+	if p.LookupSym != nil {
+		d.lookupSym = p.LookupSym
+	}
+
+	// First pass: break into block structure and collect known links.
+	// The text is all recorded as Plain for now.
+	var prev span
+	for _, s := range parseSpans(lines) {
+		var b Block
+		switch s.kind {
+		default:
+			panic("mvdan.cc/gofumpt/internal/govendor/go/doc/comment: internal error: unknown span kind")
+		case spanList:
+			b = d.list(lines[s.start:s.end], prev.end < s.start)
+		case spanCode:
+			b = d.code(lines[s.start:s.end])
+		case spanOldHeading:
+			b = d.oldHeading(lines[s.start])
+		case spanHeading:
+			b = d.heading(lines[s.start])
+		case spanPara:
+			b = d.paragraph(lines[s.start:s.end])
+		}
+		if b != nil {
+			d.Content = append(d.Content, b)
+		}
+		prev = s
+	}
+
+	// Second pass: interpret all the Plain text now that we know the links.
+	for _, b := range d.Content {
+		switch b := b.(type) {
+		case *Paragraph:
+			b.Text = d.parseLinkedText(string(b.Text[0].(Plain)))
+		case *List:
+			for _, i := range b.Items {
+				for _, c := range i.Content {
+					p := c.(*Paragraph)
+					p.Text = d.parseLinkedText(string(p.Text[0].(Plain)))
+				}
+			}
+		}
+	}
+
+	return d.Doc
+}
+
+// A span represents a single span of comment lines (lines[start:end])
+// of an identified kind (code, heading, paragraph, and so on).
+type span struct {
+	start int
+	end   int
+	kind  spanKind
+}
+
+// A spanKind describes the kind of span.
+type spanKind int
+
+const (
+	_ spanKind = iota
+	spanCode
+	spanHeading
+	spanList
+	spanOldHeading
+	spanPara
+)
+
+func parseSpans(lines []string) []span {
+	var spans []span
+
+	// The loop may process a line twice: once as unindented
+	// and again forced indented. So the maximum expected
+	// number of iterations is 2*len(lines). The repeating logic
+	// can be subtle, though, and to protect against introduction
+	// of infinite loops in future changes, we watch to see that
+	// we are not looping too much. A panic is better than a
+	// quiet infinite loop.
+	watchdog := 2 * len(lines)
+
+	i := 0
+	forceIndent := 0
+Spans:
+	for {
+		// Skip blank lines.
+		for i < len(lines) && lines[i] == "" {
+			i++
+		}
+		if i >= len(lines) {
+			break
+		}
+		if watchdog--; watchdog < 0 {
+			panic("mvdan.cc/gofumpt/internal/govendor/go/doc/comment: internal error: not making progress")
+		}
+
+		var kind spanKind
+		start := i
+		end := i
+		if i < forceIndent || indented(lines[i]) {
+			// Indented (or force indented).
+			// Ends before next unindented. (Blank lines are OK.)
+			// If this is an unindented list that we are heuristically treating as indented,
+			// then accept unindented list item lines up to the first blank lines.
+			// The heuristic is disabled at blank lines to contain its effect
+			// to non-gofmt'ed sections of the comment.
+			unindentedListOK := isList(lines[i]) && i < forceIndent
+			i++
+			for i < len(lines) && (lines[i] == "" || i < forceIndent || indented(lines[i]) || (unindentedListOK && isList(lines[i]))) {
+				if lines[i] == "" {
+					unindentedListOK = false
+				}
+				i++
+			}
+
+			// Drop trailing blank lines.
+			end = i
+			for end > start && lines[end-1] == "" {
+				end--
+			}
+
+			// If indented lines are followed (without a blank line)
+			// by an unindented line ending in a brace,
+			// take that one line too. This fixes the common mistake
+			// of pasting in something like
+			//
+			// func main() {
+			//	fmt.Println("hello, world")
+			// }
+			//
+			// and forgetting to indent it.
+			// The heuristic will never trigger on a gofmt'ed comment,
+			// because any gofmt'ed code block or list would be
+			// followed by a blank line or end of comment.
+			if end < len(lines) && strings.HasPrefix(lines[end], "}") {
+				end++
+			}
+
+			if isList(lines[start]) {
+				kind = spanList
+			} else {
+				kind = spanCode
+			}
+		} else {
+			// Unindented. Ends at next blank or indented line.
+			i++
+			for i < len(lines) && lines[i] != "" && !indented(lines[i]) {
+				i++
+			}
+			end = i
+
+			// If unindented lines are followed (without a blank line)
+			// by an indented line that would start a code block,
+			// check whether the final unindented lines
+			// should be left for the indented section.
+			// This can happen for the common mistakes of
+			// unindented code or unindented lists.
+			// The heuristic will never trigger on a gofmt'ed comment,
+			// because any gofmt'ed code block would have a blank line
+			// preceding it after the unindented lines.
+			if i < len(lines) && lines[i] != "" && !isList(lines[i]) {
+				switch {
+				case isList(lines[i-1]):
+					// If the final unindented line looks like a list item,
+					// this may be the first indented line wrap of
+					// a mistakenly unindented list.
+					// Leave all the unindented list items.
+					forceIndent = end
+					end--
+					for end > start && isList(lines[end-1]) {
+						end--
+					}
+
+				case strings.HasSuffix(lines[i-1], "{") || strings.HasSuffix(lines[i-1], `\`):
+					// If the final unindented line ended in { or \
+					// it is probably the start of a misindented code block.
+					// Give the user a single line fix.
+					// Often that's enough; if not, the user can fix the others themselves.
+					forceIndent = end
+					end--
+				}
+
+				if start == end && forceIndent > start {
+					i = start
+					continue Spans
+				}
+			}
+
+			// Span is either paragraph or heading.
+			if end-start == 1 && isHeading(lines[start]) {
+				kind = spanHeading
+			} else if end-start == 1 && isOldHeading(lines[start], lines, start) {
+				kind = spanOldHeading
+			} else {
+				kind = spanPara
+			}
+		}
+
+		spans = append(spans, span{start, end, kind})
+		i = end
+	}
+
+	return spans
+}
+
+// indented reports whether line is indented
+// (starts with a leading space or tab).
+func indented(line string) bool {
+	return line != "" && (line[0] == ' ' || line[0] == '\t')
+}
+
+// unindent removes any common space/tab prefix
+// from each line in lines, returning a copy of lines in which
+// those prefixes have been trimmed from each line.
+// It also replaces any lines containing only spaces with blank lines (empty strings).
+func unindent(lines []string) []string {
+	// Trim leading and trailing blank lines.
+	for len(lines) > 0 && isBlank(lines[0]) {
+		lines = lines[1:]
+	}
+	for len(lines) > 0 && isBlank(lines[len(lines)-1]) {
+		lines = lines[:len(lines)-1]
+	}
+	if len(lines) == 0 {
+		return nil
+	}
+
+	// Compute and remove common indentation.
+	prefix := leadingSpace(lines[0])
+	for _, line := range lines[1:] {
+		if !isBlank(line) {
+			prefix = commonPrefix(prefix, leadingSpace(line))
+		}
+	}
+
+	out := make([]string, len(lines))
+	for i, line := range lines {
+		line = strings.TrimPrefix(line, prefix)
+		if strings.TrimSpace(line) == "" {
+			line = ""
+		}
+		out[i] = line
+	}
+	for len(out) > 0 && out[0] == "" {
+		out = out[1:]
+	}
+	for len(out) > 0 && out[len(out)-1] == "" {
+		out = out[:len(out)-1]
+	}
+	return out
+}
+
+// isBlank reports whether s is a blank line.
+func isBlank(s string) bool {
+	return len(s) == 0 || (len(s) == 1 && s[0] == '\n')
+}
+
+// commonPrefix returns the longest common prefix of a and b.
+func commonPrefix(a, b string) string {
+	i := 0
+	for i < len(a) && i < len(b) && a[i] == b[i] {
+		i++
+	}
+	return a[0:i]
+}
+
+// leadingSpace returns the longest prefix of s consisting of spaces and tabs.
+func leadingSpace(s string) string {
+	i := 0
+	for i < len(s) && (s[i] == ' ' || s[i] == '\t') {
+		i++
+	}
+	return s[:i]
+}
+
+// isOldHeading reports whether line is an old-style section heading.
+// line is all[off].
+func isOldHeading(line string, all []string, off int) bool {
+	if off <= 0 || all[off-1] != "" || off+2 >= len(all) || all[off+1] != "" || leadingSpace(all[off+2]) != "" {
+		return false
+	}
+
+	line = strings.TrimSpace(line)
+
+	// a heading must start with an uppercase letter
+	r, _ := utf8.DecodeRuneInString(line)
+	if !unicode.IsLetter(r) || !unicode.IsUpper(r) {
+		return false
+	}
+
+	// it must end in a letter or digit:
+	r, _ = utf8.DecodeLastRuneInString(line)
+	if !unicode.IsLetter(r) && !unicode.IsDigit(r) {
+		return false
+	}
+
+	// exclude lines with illegal characters. we allow "(),"
+	if strings.ContainsAny(line, ";:!?+*/=[]{}_^°&§~%#@<\">\\") {
+		return false
+	}
+
+	// allow "'" for possessive "'s" only
+	for b := line; ; {
+		var ok bool
+		if _, b, ok = strings.Cut(b, "'"); !ok {
+			break
+		}
+		if b != "s" && !strings.HasPrefix(b, "s ") {
+			return false // ' not followed by s and then end-of-word
+		}
+	}
+
+	// allow "." when followed by non-space
+	for b := line; ; {
+		var ok bool
+		if _, b, ok = strings.Cut(b, "."); !ok {
+			break
+		}
+		if b == "" || strings.HasPrefix(b, " ") {
+			return false // not followed by non-space
+		}
+	}
+
+	return true
+}
+
+// oldHeading returns the *Heading for the given old-style section heading line.
+func (d *parseDoc) oldHeading(line string) Block {
+	return &Heading{Text: []Text{Plain(strings.TrimSpace(line))}}
+}
+
+// isHeading reports whether line is a new-style section heading.
+func isHeading(line string) bool {
+	return len(line) >= 2 &&
+		line[0] == '#' &&
+		(line[1] == ' ' || line[1] == '\t') &&
+		strings.TrimSpace(line) != "#"
+}
+
+// heading returns the *Heading for the given new-style section heading line.
+func (d *parseDoc) heading(line string) Block {
+	return &Heading{Text: []Text{Plain(strings.TrimSpace(line[1:]))}}
+}
+
+// code returns a code block built from the lines.
+func (d *parseDoc) code(lines []string) *Code {
+	body := unindent(lines)
+	body = append(body, "") // to get final \n from Join
+	return &Code{Text: strings.Join(body, "\n")}
+}
+
+// paragraph returns a paragraph block built from the lines.
+// If the lines are link definitions, paragraph adds them to d and returns nil.
+func (d *parseDoc) paragraph(lines []string) Block {
+	// Is this a block of known links? Handle.
+	var defs []*LinkDef
+	for _, line := range lines {
+		def, ok := parseLink(line)
+		if !ok {
+			goto NoDefs
+		}
+		defs = append(defs, def)
+	}
+	for _, def := range defs {
+		d.Links = append(d.Links, def)
+		if d.links[def.Text] == nil {
+			d.links[def.Text] = def
+		}
+	}
+	return nil
+NoDefs:
+
+	return &Paragraph{Text: []Text{Plain(strings.Join(lines, "\n"))}}
+}
+
+// parseLink parses a single link definition line:
+//
+//	[text]: url
+//
+// It returns the link definition and whether the line was well formed.
+func parseLink(line string) (*LinkDef, bool) {
+	if line == "" || line[0] != '[' {
+		return nil, false
+	}
+	i := strings.Index(line, "]:")
+	if i < 0 || i+3 >= len(line) || (line[i+2] != ' ' && line[i+2] != '\t') {
+		return nil, false
+	}
+
+	text := line[1:i]
+	url := strings.TrimSpace(line[i+3:])
+	j := strings.Index(url, "://")
+	if j < 0 || !isScheme(url[:j]) {
+		return nil, false
+	}
+
+	// Line has right form and has valid scheme://.
+	// That's good enough for us - we are not as picky
+	// about the characters beyond the :// as we are
+	// when extracting inline URLs from text.
+	return &LinkDef{Text: text, URL: url}, true
+}
+
+// list returns a list built from the indented lines,
+// using forceBlankBefore as the value of the List's ForceBlankBefore field.
+func (d *parseDoc) list(lines []string, forceBlankBefore bool) *List {
+	num, _, _ := listMarker(lines[0])
+	var (
+		list *List = &List{ForceBlankBefore: forceBlankBefore}
+		item *ListItem
+		text []string
+	)
+	flush := func() {
+		if item != nil {
+			if para := d.paragraph(text); para != nil {
+				item.Content = append(item.Content, para)
+			}
+		}
+		text = nil
+	}
+
+	for _, line := range lines {
+		if n, after, ok := listMarker(line); ok && (n != "") == (num != "") {
+			// start new list item
+			flush()
+
+			item = &ListItem{Number: n}
+			list.Items = append(list.Items, item)
+			line = after
+		}
+		line = strings.TrimSpace(line)
+		if line == "" {
+			list.ForceBlankBetween = true
+			flush()
+			continue
+		}
+		text = append(text, strings.TrimSpace(line))
+	}
+	flush()
+	return list
+}
+
+// listMarker parses the line as beginning with a list marker.
+// If it can do that, it returns the numeric marker ("" for a bullet list),
+// the rest of the line, and ok == true.
+// Otherwise, it returns "", "", false.
+func listMarker(line string) (num, rest string, ok bool) {
+	line = strings.TrimSpace(line)
+	if line == "" {
+		return "", "", false
+	}
+
+	// Can we find a marker?
+	if r, n := utf8.DecodeRuneInString(line); r == '•' || r == '*' || r == '+' || r == '-' {
+		num, rest = "", line[n:]
+	} else if '0' <= line[0] && line[0] <= '9' {
+		n := 1
+		for n < len(line) && '0' <= line[n] && line[n] <= '9' {
+			n++
+		}
+		if n >= len(line) || (line[n] != '.' && line[n] != ')') {
+			return "", "", false
+		}
+		num, rest = line[:n], line[n+1:]
+	} else {
+		return "", "", false
+	}
+
+	if !indented(rest) || strings.TrimSpace(rest) == "" {
+		return "", "", false
+	}
+
+	return num, rest, true
+}
+
+// isList reports whether the line is the first line of a list,
+// meaning starts with a list marker after any indentation.
+// (The caller is responsible for checking the line is indented, as appropriate.)
+func isList(line string) bool {
+	_, _, ok := listMarker(line)
+	return ok
+}
+
+// parseLinkedText parses text that is allowed to contain explicit links,
+// such as [math.Sin] or [Go home page], into a slice of Text items.
+//
+// A “pkg” is only assumed to be a full import path if it starts with
+// a domain name (a path element with a dot) or is one of the packages
+// from the standard library (“[os]”, “[encoding/json]”, and so on).
+// To avoid problems with maps, generics, and array types, doc links
+// must be both preceded and followed by punctuation, spaces, tabs,
+// or the start or end of a line. An example problem would be treating
+// map[ast.Expr]TypeAndValue as containing a link.
+func (d *parseDoc) parseLinkedText(text string) []Text {
+	var out []Text
+	wrote := 0
+	flush := func(i int) {
+		if wrote < i {
+			out = d.parseText(out, text[wrote:i], true)
+			wrote = i
+		}
+	}
+
+	start := -1
+	var buf []byte
+	for i := 0; i < len(text); i++ {
+		c := text[i]
+		if c == '\n' || c == '\t' {
+			c = ' '
+		}
+		switch c {
+		case '[':
+			start = i
+		case ']':
+			if start >= 0 {
+				if def, ok := d.links[string(buf)]; ok {
+					def.Used = true
+					flush(start)
+					out = append(out, &Link{
+						Text: d.parseText(nil, text[start+1:i], false),
+						URL:  def.URL,
+					})
+					wrote = i + 1
+				} else if link, ok := d.docLink(text[start+1:i], text[:start], text[i+1:]); ok {
+					flush(start)
+					link.Text = d.parseText(nil, text[start+1:i], false)
+					out = append(out, link)
+					wrote = i + 1
+				}
+			}
+			start = -1
+			buf = buf[:0]
+		}
+		if start >= 0 && i != start {
+			buf = append(buf, c)
+		}
+	}
+
+	flush(len(text))
+	return out
+}
+
+// docLink parses text, which was found inside [ ] brackets,
+// as a doc link if possible, returning the DocLink and ok == true
+// or else nil, false.
+// The before and after strings are the text before the [ and after the ]
+// on the same line. Doc links must be preceded and followed by
+// punctuation, spaces, tabs, or the start or end of a line.
+func (d *parseDoc) docLink(text, before, after string) (link *DocLink, ok bool) {
+	if before != "" {
+		r, _ := utf8.DecodeLastRuneInString(before)
+		if !unicode.IsPunct(r) && r != ' ' && r != '\t' && r != '\n' {
+			return nil, false
+		}
+	}
+	if after != "" {
+		r, _ := utf8.DecodeRuneInString(after)
+		if !unicode.IsPunct(r) && r != ' ' && r != '\t' && r != '\n' {
+			return nil, false
+		}
+	}
+	text = strings.TrimPrefix(text, "*")
+	pkg, name, ok := splitDocName(text)
+	var recv string
+	if ok {
+		pkg, recv, _ = splitDocName(pkg)
+	}
+	if pkg != "" {
+		if pkg, ok = d.lookupPkg(pkg); !ok {
+			return nil, false
+		}
+	} else {
+		if ok = d.lookupSym(recv, name); !ok {
+			return nil, false
+		}
+	}
+	link = &DocLink{
+		ImportPath: pkg,
+		Recv:       recv,
+		Name:       name,
+	}
+	return link, true
+}
+
+// If text is of the form before.Name, where Name is a capitalized Go identifier,
+// then splitDocName returns before, name, true.
+// Otherwise it returns text, "", false.
+func splitDocName(text string) (before, name string, foundDot bool) {
+	i := strings.LastIndex(text, ".")
+	name = text[i+1:]
+	if !isName(name) {
+		return text, "", false
+	}
+	if i >= 0 {
+		before = text[:i]
+	}
+	return before, name, true
+}
+
+// parseText parses s as text and returns the result of appending
+// those parsed Text elements to out.
+// parseText does not handle explicit links like [math.Sin] or [Go home page]:
+// those are handled by parseLinkedText.
+// If autoLink is true, then parseText recognizes URLs and words from d.Words
+// and converts those to links as appropriate.
+func (d *parseDoc) parseText(out []Text, s string, autoLink bool) []Text {
+	var w strings.Builder
+	wrote := 0
+	writeUntil := func(i int) {
+		w.WriteString(s[wrote:i])
+		wrote = i
+	}
+	flush := func(i int) {
+		writeUntil(i)
+		if w.Len() > 0 {
+			out = append(out, Plain(w.String()))
+			w.Reset()
+		}
+	}
+	for i := 0; i < len(s); {
+		t := s[i:]
+		if autoLink {
+			if url, ok := autoURL(t); ok {
+				flush(i)
+				// Note: The old comment parser would look up the URL in words
+				// and replace the target with words[URL] if it was non-empty.
+				// That would allow creating links that display as one URL but
+				// when clicked go to a different URL. Not sure what the point
+				// of that is, so we're not doing that lookup here.
+				out = append(out, &Link{Auto: true, Text: []Text{Plain(url)}, URL: url})
+				i += len(url)
+				wrote = i
+				continue
+			}
+			if id, ok := ident(t); ok {
+				url, italics := d.Words[id]
+				if !italics {
+					i += len(id)
+					continue
+				}
+				flush(i)
+				if url == "" {
+					out = append(out, Italic(id))
+				} else {
+					out = append(out, &Link{Auto: true, Text: []Text{Italic(id)}, URL: url})
+				}
+				i += len(id)
+				wrote = i
+				continue
+			}
+		}
+		switch {
+		case strings.HasPrefix(t, "``"):
+			if len(t) >= 3 && t[2] == '`' {
+				// Do not convert `` inside ```, in case people are mistakenly writing Markdown.
+				i += 3
+				for i < len(t) && t[i] == '`' {
+					i++
+				}
+				break
+			}
+			writeUntil(i)
+			w.WriteRune('“')
+			i += 2
+			wrote = i
+		case strings.HasPrefix(t, "''"):
+			writeUntil(i)
+			w.WriteRune('”')
+			i += 2
+			wrote = i
+		default:
+			i++
+		}
+	}
+	flush(len(s))
+	return out
+}
+
+// autoURL checks whether s begins with a URL that should be hyperlinked.
+// If so, it returns the URL, which is a prefix of s, and ok == true.
+// Otherwise it returns "", false.
+// The caller should skip over the first len(url) bytes of s
+// before further processing.
+func autoURL(s string) (url string, ok bool) {
+	// Find the ://. Fast path to pick off non-URL,
+	// since we call this at every position in the string.
+	// The shortest possible URL is ftp://x, 7 bytes.
+	var i int
+	switch {
+	case len(s) < 7:
+		return "", false
+	case s[3] == ':':
+		i = 3
+	case s[4] == ':':
+		i = 4
+	case s[5] == ':':
+		i = 5
+	case s[6] == ':':
+		i = 6
+	default:
+		return "", false
+	}
+	if i+3 > len(s) || s[i:i+3] != "://" {
+		return "", false
+	}
+
+	// Check valid scheme.
+	if !isScheme(s[:i]) {
+		return "", false
+	}
+
+	// Scan host part. Must have at least one byte,
+	// and must start and end in non-punctuation.
+	i += 3
+	if i >= len(s) || !isHost(s[i]) || isPunct(s[i]) {
+		return "", false
+	}
+	i++
+	end := i
+	for i < len(s) && isHost(s[i]) {
+		if !isPunct(s[i]) {
+			end = i + 1
+		}
+		i++
+	}
+	i = end
+
+	// At this point we are definitely returning a URL (scheme://host).
+	// We just have to find the longest path we can add to it.
+	// Heuristics abound.
+	// We allow parens, braces, and brackets,
+	// but only if they match (#5043, #22285).
+	// We allow .,:;?! in the path but not at the end,
+	// to avoid end-of-sentence punctuation (#18139, #16565).
+	stk := []byte{}
+	end = i
+Path:
+	for ; i < len(s); i++ {
+		if isPunct(s[i]) {
+			continue
+		}
+		if !isPath(s[i]) {
+			break
+		}
+		switch s[i] {
+		case '(':
+			stk = append(stk, ')')
+		case '{':
+			stk = append(stk, '}')
+		case '[':
+			stk = append(stk, ']')
+		case ')', '}', ']':
+			if len(stk) == 0 || stk[len(stk)-1] != s[i] {
+				break Path
+			}
+			stk = stk[:len(stk)-1]
+		}
+		if len(stk) == 0 {
+			end = i + 1
+		}
+	}
+
+	return s[:end], true
+}
+
+// isScheme reports whether s is a recognized URL scheme.
+// Note that if strings of new length (beyond 3-7)
+// are added here, the fast path at the top of autoURL will need updating.
+func isScheme(s string) bool {
+	switch s {
+	case "file",
+		"ftp",
+		"gopher",
+		"http",
+		"https",
+		"mailto",
+		"nntp":
+		return true
+	}
+	return false
+}
+
+// isHost reports whether c is a byte that can appear in a URL host,
+// like www.example.com or user@[::1]:8080
+func isHost(c byte) bool {
+	// mask is a 128-bit bitmap with 1s for allowed bytes,
+	// so that the byte c can be tested with a shift and an and.
+	// If c > 128, then 1<>64)) != 0
+}
+
+// isPunct reports whether c is a punctuation byte that can appear
+// inside a path but not at the end.
+func isPunct(c byte) bool {
+	// mask is a 128-bit bitmap with 1s for allowed bytes,
+	// so that the byte c can be tested with a shift and an and.
+	// If c > 128, then 1<>64)) != 0
+}
+
+// isPath reports whether c is a (non-punctuation) path byte.
+func isPath(c byte) bool {
+	// mask is a 128-bit bitmap with 1s for allowed bytes,
+	// so that the byte c can be tested with a shift and an and.
+	// If c > 128, then 1<>64)) != 0
+}
+
+// isName reports whether s is a capitalized Go identifier (like Name).
+func isName(s string) bool {
+	t, ok := ident(s)
+	if !ok || t != s {
+		return false
+	}
+	r, _ := utf8.DecodeRuneInString(s)
+	return unicode.IsUpper(r)
+}
+
+// ident checks whether s begins with a Go identifier.
+// If so, it returns the identifier, which is a prefix of s, and ok == true.
+// Otherwise it returns "", false.
+// The caller should skip over the first len(id) bytes of s
+// before further processing.
+func ident(s string) (id string, ok bool) {
+	// Scan [\pL_][\pL_0-9]*
+	n := 0
+	for n < len(s) {
+		if c := s[n]; c < utf8.RuneSelf {
+			if isIdentASCII(c) && (n > 0 || c < '0' || c > '9') {
+				n++
+				continue
+			}
+			break
+		}
+		r, nr := utf8.DecodeRuneInString(s[n:])
+		if unicode.IsLetter(r) {
+			n += nr
+			continue
+		}
+		break
+	}
+	return s[:n], n > 0
+}
+
+// isIdentASCII reports whether c is an ASCII identifier byte.
+func isIdentASCII(c byte) bool {
+	// mask is a 128-bit bitmap with 1s for allowed bytes,
+	// so that the byte c can be tested with a shift and an and.
+	// If c > 128, then 1<>64)) != 0
+}
+
+// validImportPath reports whether path is a valid import path.
+// It is a lightly edited copy of golang.org/x/mod/module.CheckImportPath.
+func validImportPath(path string) bool {
+	if !utf8.ValidString(path) {
+		return false
+	}
+	if path == "" {
+		return false
+	}
+	if path[0] == '-' {
+		return false
+	}
+	if strings.Contains(path, "//") {
+		return false
+	}
+	if path[len(path)-1] == '/' {
+		return false
+	}
+	elemStart := 0
+	for i, r := range path {
+		if r == '/' {
+			if !validImportPathElem(path[elemStart:i]) {
+				return false
+			}
+			elemStart = i + 1
+		}
+	}
+	return validImportPathElem(path[elemStart:])
+}
+
+func validImportPathElem(elem string) bool {
+	if elem == "" || elem[0] == '.' || elem[len(elem)-1] == '.' {
+		return false
+	}
+	for i := 0; i < len(elem); i++ {
+		if !importPathOK(elem[i]) {
+			return false
+		}
+	}
+	return true
+}
+
+func importPathOK(c byte) bool {
+	// mask is a 128-bit bitmap with 1s for allowed bytes,
+	// so that the byte c can be tested with a shift and an and.
+	// If c > 128, then 1<>64)) != 0
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/print.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/print.go
new file mode 100644
index 000000000..a6ae8210b
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/print.go
@@ -0,0 +1,288 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package comment
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+)
+
+// A Printer is a doc comment printer.
+// The fields in the struct can be filled in before calling
+// any of the printing methods
+// in order to customize the details of the printing process.
+type Printer struct {
+	// HeadingLevel is the nesting level used for
+	// HTML and Markdown headings.
+	// If HeadingLevel is zero, it defaults to level 3,
+	// meaning to use 
     and ###.
+	HeadingLevel int
+
+	// HeadingID is a function that computes the heading ID
+	// (anchor tag) to use for the heading h when generating
+	// HTML and Markdown. If HeadingID returns an empty string,
+	// then the heading ID is omitted.
+	// If HeadingID is nil, h.DefaultID is used.
+	HeadingID func(h *Heading) string
+
+	// DocLinkURL is a function that computes the URL for the given DocLink.
+	// If DocLinkURL is nil, then link.DefaultURL(p.DocLinkBaseURL) is used.
+	DocLinkURL func(link *DocLink) string
+
+	// DocLinkBaseURL is used when DocLinkURL is nil,
+	// passed to [DocLink.DefaultURL] to construct a DocLink's URL.
+	// See that method's documentation for details.
+	DocLinkBaseURL string
+
+	// TextPrefix is a prefix to print at the start of every line
+	// when generating text output using the Text method.
+	TextPrefix string
+
+	// TextCodePrefix is the prefix to print at the start of each
+	// preformatted (code block) line when generating text output,
+	// instead of (not in addition to) TextPrefix.
+	// If TextCodePrefix is the empty string, it defaults to TextPrefix+"\t".
+	TextCodePrefix string
+
+	// TextWidth is the maximum width text line to generate,
+	// measured in Unicode code points,
+	// excluding TextPrefix and the newline character.
+	// If TextWidth is zero, it defaults to 80 minus the number of code points in TextPrefix.
+	// If TextWidth is negative, there is no limit.
+	TextWidth int
+}
+
+func (p *Printer) headingLevel() int {
+	if p.HeadingLevel <= 0 {
+		return 3
+	}
+	return p.HeadingLevel
+}
+
+func (p *Printer) headingID(h *Heading) string {
+	if p.HeadingID == nil {
+		return h.DefaultID()
+	}
+	return p.HeadingID(h)
+}
+
+func (p *Printer) docLinkURL(link *DocLink) string {
+	if p.DocLinkURL != nil {
+		return p.DocLinkURL(link)
+	}
+	return link.DefaultURL(p.DocLinkBaseURL)
+}
+
+// DefaultURL constructs and returns the documentation URL for l,
+// using baseURL as a prefix for links to other packages.
+//
+// The possible forms returned by DefaultURL are:
+//   - baseURL/ImportPath, for a link to another package
+//   - baseURL/ImportPath#Name, for a link to a const, func, type, or var in another package
+//   - baseURL/ImportPath#Recv.Name, for a link to a method in another package
+//   - #Name, for a link to a const, func, type, or var in this package
+//   - #Recv.Name, for a link to a method in this package
+//
+// If baseURL ends in a trailing slash, then DefaultURL inserts
+// a slash between ImportPath and # in the anchored forms.
+// For example, here are some baseURL values and URLs they can generate:
+//
+//	"/pkg/" → "/pkg/math/#Sqrt"
+//	"/pkg"  → "/pkg/math#Sqrt"
+//	"/"     → "/math/#Sqrt"
+//	""      → "/math#Sqrt"
+func (l *DocLink) DefaultURL(baseURL string) string {
+	if l.ImportPath != "" {
+		slash := ""
+		if strings.HasSuffix(baseURL, "/") {
+			slash = "/"
+		} else {
+			baseURL += "/"
+		}
+		switch {
+		case l.Name == "":
+			return baseURL + l.ImportPath + slash
+		case l.Recv != "":
+			return baseURL + l.ImportPath + slash + "#" + l.Recv + "." + l.Name
+		default:
+			return baseURL + l.ImportPath + slash + "#" + l.Name
+		}
+	}
+	if l.Recv != "" {
+		return "#" + l.Recv + "." + l.Name
+	}
+	return "#" + l.Name
+}
+
+// DefaultID returns the default anchor ID for the heading h.
+//
+// The default anchor ID is constructed by converting every
+// rune that is not alphanumeric ASCII to an underscore
+// and then adding the prefix “hdr-”.
+// For example, if the heading text is “Go Doc Comments”,
+// the default ID is “hdr-Go_Doc_Comments”.
+func (h *Heading) DefaultID() string {
+	// Note: The “hdr-” prefix is important to avoid DOM clobbering attacks.
+	// See https://pkg.go.dev/github.com/google/safehtml#Identifier.
+	var out strings.Builder
+	var p textPrinter
+	p.oneLongLine(&out, h.Text)
+	s := strings.TrimSpace(out.String())
+	if s == "" {
+		return ""
+	}
+	out.Reset()
+	out.WriteString("hdr-")
+	for _, r := range s {
+		if r < 0x80 && isIdentASCII(byte(r)) {
+			out.WriteByte(byte(r))
+		} else {
+			out.WriteByte('_')
+		}
+	}
+	return out.String()
+}
+
+type commentPrinter struct {
+	*Printer
+}
+
+// Comment returns the standard Go formatting of the [Doc],
+// without any comment markers.
+func (p *Printer) Comment(d *Doc) []byte {
+	cp := &commentPrinter{Printer: p}
+	var out bytes.Buffer
+	for i, x := range d.Content {
+		if i > 0 && blankBefore(x) {
+			out.WriteString("\n")
+		}
+		cp.block(&out, x)
+	}
+
+	// Print one block containing all the link definitions that were used,
+	// and then a second block containing all the unused ones.
+	// This makes it easy to clean up the unused ones: gofmt and
+	// delete the final block. And it's a nice visual signal without
+	// affecting the way the comment formats for users.
+	for i := 0; i < 2; i++ {
+		used := i == 0
+		first := true
+		for _, def := range d.Links {
+			if def.Used == used {
+				if first {
+					out.WriteString("\n")
+					first = false
+				}
+				out.WriteString("[")
+				out.WriteString(def.Text)
+				out.WriteString("]: ")
+				out.WriteString(def.URL)
+				out.WriteString("\n")
+			}
+		}
+	}
+
+	return out.Bytes()
+}
+
+// blankBefore reports whether the block x requires a blank line before it.
+// All blocks do, except for Lists that return false from x.BlankBefore().
+func blankBefore(x Block) bool {
+	if x, ok := x.(*List); ok {
+		return x.BlankBefore()
+	}
+	return true
+}
+
+// block prints the block x to out.
+func (p *commentPrinter) block(out *bytes.Buffer, x Block) {
+	switch x := x.(type) {
+	default:
+		fmt.Fprintf(out, "?%T", x)
+
+	case *Paragraph:
+		p.text(out, "", x.Text)
+		out.WriteString("\n")
+
+	case *Heading:
+		out.WriteString("# ")
+		p.text(out, "", x.Text)
+		out.WriteString("\n")
+
+	case *Code:
+		md := x.Text
+		for md != "" {
+			var line string
+			line, md, _ = strings.Cut(md, "\n")
+			if line != "" {
+				out.WriteString("\t")
+				out.WriteString(line)
+			}
+			out.WriteString("\n")
+		}
+
+	case *List:
+		loose := x.BlankBetween()
+		for i, item := range x.Items {
+			if i > 0 && loose {
+				out.WriteString("\n")
+			}
+			out.WriteString(" ")
+			if item.Number == "" {
+				out.WriteString(" - ")
+			} else {
+				out.WriteString(item.Number)
+				out.WriteString(". ")
+			}
+			for i, blk := range item.Content {
+				const fourSpace = "    "
+				if i > 0 {
+					out.WriteString("\n" + fourSpace)
+				}
+				p.text(out, fourSpace, blk.(*Paragraph).Text)
+				out.WriteString("\n")
+			}
+		}
+	}
+}
+
+// text prints the text sequence x to out.
+func (p *commentPrinter) text(out *bytes.Buffer, indent string, x []Text) {
+	for _, t := range x {
+		switch t := t.(type) {
+		case Plain:
+			p.indent(out, indent, string(t))
+		case Italic:
+			p.indent(out, indent, string(t))
+		case *Link:
+			if t.Auto {
+				p.text(out, indent, t.Text)
+			} else {
+				out.WriteString("[")
+				p.text(out, indent, t.Text)
+				out.WriteString("]")
+			}
+		case *DocLink:
+			out.WriteString("[")
+			p.text(out, indent, t.Text)
+			out.WriteString("]")
+		}
+	}
+}
+
+// indent prints s to out, indenting with the indent string
+// after each newline in s.
+func (p *commentPrinter) indent(out *bytes.Buffer, indent, s string) {
+	for s != "" {
+		line, rest, ok := strings.Cut(s, "\n")
+		out.WriteString(line)
+		if ok {
+			out.WriteString("\n")
+			out.WriteString(indent)
+		}
+		s = rest
+	}
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/std.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/std.go
new file mode 100644
index 000000000..f73690a75
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/std.go
@@ -0,0 +1,51 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Code generated by 'go generate' DO NOT EDIT.
+//disabled go:generate ./mkstd.sh
+
+package comment
+
+var stdPkgs = []string{
+	"bufio",
+	"bytes",
+	"cmp",
+	"context",
+	"crypto",
+	"embed",
+	"encoding",
+	"errors",
+	"expvar",
+	"flag",
+	"fmt",
+	"hash",
+	"html",
+	"image",
+	"io",
+	"iter",
+	"log",
+	"maps",
+	"math",
+	"mime",
+	"net",
+	"os",
+	"path",
+	"plugin",
+	"reflect",
+	"regexp",
+	"runtime",
+	"slices",
+	"sort",
+	"strconv",
+	"strings",
+	"structs",
+	"sync",
+	"syscall",
+	"testing",
+	"time",
+	"unicode",
+	"unique",
+	"unsafe",
+	"weak",
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/text.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/text.go
new file mode 100644
index 000000000..4e4214e08
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/doc/comment/text.go
@@ -0,0 +1,337 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package comment
+
+import (
+	"bytes"
+	"fmt"
+	"sort"
+	"strings"
+	"unicode/utf8"
+)
+
+// A textPrinter holds the state needed for printing a Doc as plain text.
+type textPrinter struct {
+	*Printer
+	long       strings.Builder
+	prefix     string
+	codePrefix string
+	width      int
+}
+
+// Text returns a textual formatting of the [Doc].
+// See the [Printer] documentation for ways to customize the text output.
+func (p *Printer) Text(d *Doc) []byte {
+	tp := &textPrinter{
+		Printer:    p,
+		prefix:     p.TextPrefix,
+		codePrefix: p.TextCodePrefix,
+		width:      p.TextWidth,
+	}
+	if tp.codePrefix == "" {
+		tp.codePrefix = p.TextPrefix + "\t"
+	}
+	if tp.width == 0 {
+		tp.width = 80 - utf8.RuneCountInString(tp.prefix)
+	}
+
+	var out bytes.Buffer
+	for i, x := range d.Content {
+		if i > 0 && blankBefore(x) {
+			out.WriteString(tp.prefix)
+			writeNL(&out)
+		}
+		tp.block(&out, x)
+	}
+	anyUsed := false
+	for _, def := range d.Links {
+		if def.Used {
+			anyUsed = true
+			break
+		}
+	}
+	if anyUsed {
+		writeNL(&out)
+		for _, def := range d.Links {
+			if def.Used {
+				fmt.Fprintf(&out, "[%s]: %s\n", def.Text, def.URL)
+			}
+		}
+	}
+	return out.Bytes()
+}
+
+// writeNL calls out.WriteByte('\n')
+// but first trims trailing spaces on the previous line.
+func writeNL(out *bytes.Buffer) {
+	// Trim trailing spaces.
+	data := out.Bytes()
+	n := 0
+	for n < len(data) && (data[len(data)-n-1] == ' ' || data[len(data)-n-1] == '\t') {
+		n++
+	}
+	if n > 0 {
+		out.Truncate(len(data) - n)
+	}
+	out.WriteByte('\n')
+}
+
+// block prints the block x to out.
+func (p *textPrinter) block(out *bytes.Buffer, x Block) {
+	switch x := x.(type) {
+	default:
+		fmt.Fprintf(out, "?%T\n", x)
+
+	case *Paragraph:
+		out.WriteString(p.prefix)
+		p.text(out, "", x.Text)
+
+	case *Heading:
+		out.WriteString(p.prefix)
+		out.WriteString("# ")
+		p.text(out, "", x.Text)
+
+	case *Code:
+		text := x.Text
+		for text != "" {
+			var line string
+			line, text, _ = strings.Cut(text, "\n")
+			if line != "" {
+				out.WriteString(p.codePrefix)
+				out.WriteString(line)
+			}
+			writeNL(out)
+		}
+
+	case *List:
+		loose := x.BlankBetween()
+		for i, item := range x.Items {
+			if i > 0 && loose {
+				out.WriteString(p.prefix)
+				writeNL(out)
+			}
+			out.WriteString(p.prefix)
+			out.WriteString(" ")
+			if item.Number == "" {
+				out.WriteString(" - ")
+			} else {
+				out.WriteString(item.Number)
+				out.WriteString(". ")
+			}
+			for i, blk := range item.Content {
+				const fourSpace = "    "
+				if i > 0 {
+					writeNL(out)
+					out.WriteString(p.prefix)
+					out.WriteString(fourSpace)
+				}
+				p.text(out, fourSpace, blk.(*Paragraph).Text)
+			}
+		}
+	}
+}
+
+// text prints the text sequence x to out.
+func (p *textPrinter) text(out *bytes.Buffer, indent string, x []Text) {
+	p.oneLongLine(&p.long, x)
+	words := strings.Fields(p.long.String())
+	p.long.Reset()
+
+	var seq []int
+	if p.width < 0 || len(words) == 0 {
+		seq = []int{0, len(words)} // one long line
+	} else {
+		seq = wrap(words, p.width-utf8.RuneCountInString(indent))
+	}
+	for i := 0; i+1 < len(seq); i++ {
+		if i > 0 {
+			out.WriteString(p.prefix)
+			out.WriteString(indent)
+		}
+		for j, w := range words[seq[i]:seq[i+1]] {
+			if j > 0 {
+				out.WriteString(" ")
+			}
+			out.WriteString(w)
+		}
+		writeNL(out)
+	}
+}
+
+// oneLongLine prints the text sequence x to out as one long line,
+// without worrying about line wrapping.
+// Explicit links have the [ ] dropped to improve readability.
+func (p *textPrinter) oneLongLine(out *strings.Builder, x []Text) {
+	for _, t := range x {
+		switch t := t.(type) {
+		case Plain:
+			out.WriteString(string(t))
+		case Italic:
+			out.WriteString(string(t))
+		case *Link:
+			p.oneLongLine(out, t.Text)
+		case *DocLink:
+			p.oneLongLine(out, t.Text)
+		}
+	}
+}
+
+// wrap wraps words into lines of at most max runes,
+// minimizing the sum of the squares of the leftover lengths
+// at the end of each line (except the last, of course),
+// with a preference for ending lines at punctuation (.,:;).
+//
+// The returned slice gives the indexes of the first words
+// on each line in the wrapped text with a final entry of len(words).
+// Thus the lines are words[seq[0]:seq[1]], words[seq[1]:seq[2]],
+// ..., words[seq[len(seq)-2]:seq[len(seq)-1]].
+//
+// The implementation runs in O(n log n) time, where n = len(words),
+// using the algorithm described in D. S. Hirschberg and L. L. Larmore,
+// “[The least weight subsequence problem],” FOCS 1985, pp. 137-143.
+//
+// [The least weight subsequence problem]: https://doi.org/10.1109/SFCS.1985.60
+func wrap(words []string, max int) (seq []int) {
+	// The algorithm requires that our scoring function be concave,
+	// meaning that for all i₀ ≤ i₁ < j₀ ≤ j₁,
+	// weight(i₀, j₀) + weight(i₁, j₁) ≤ weight(i₀, j₁) + weight(i₁, j₀).
+	//
+	// Our weights are two-element pairs [hi, lo]
+	// ordered by elementwise comparison.
+	// The hi entry counts the weight for lines that are longer than max,
+	// and the lo entry counts the weight for lines that are not.
+	// This forces the algorithm to first minimize the number of lines
+	// that are longer than max, which correspond to lines with
+	// single very long words. Having done that, it can move on to
+	// minimizing the lo score, which is more interesting.
+	//
+	// The lo score is the sum for each line of the square of the
+	// number of spaces remaining at the end of the line and a
+	// penalty of 64 given out for not ending the line in a
+	// punctuation character (.,:;).
+	// The penalty is somewhat arbitrarily chosen by trying
+	// different amounts and judging how nice the wrapped text looks.
+	// Roughly speaking, using 64 means that we are willing to
+	// end a line with eight blank spaces in order to end at a
+	// punctuation character, even if the next word would fit in
+	// those spaces.
+	//
+	// We care about ending in punctuation characters because
+	// it makes the text easier to skim if not too many sentences
+	// or phrases begin with a single word on the previous line.
+
+	// A score is the score (also called weight) for a given line.
+	// add and cmp add and compare scores.
+	type score struct {
+		hi int64
+		lo int64
+	}
+	add := func(s, t score) score { return score{s.hi + t.hi, s.lo + t.lo} }
+	cmp := func(s, t score) int {
+		switch {
+		case s.hi < t.hi:
+			return -1
+		case s.hi > t.hi:
+			return +1
+		case s.lo < t.lo:
+			return -1
+		case s.lo > t.lo:
+			return +1
+		}
+		return 0
+	}
+
+	// total[j] is the total number of runes
+	// (including separating spaces) in words[:j].
+	total := make([]int, len(words)+1)
+	total[0] = 0
+	for i, s := range words {
+		total[1+i] = total[i] + utf8.RuneCountInString(s) + 1
+	}
+
+	// weight returns weight(i, j).
+	weight := func(i, j int) score {
+		// On the last line, there is zero weight for being too short.
+		n := total[j] - 1 - total[i]
+		if j == len(words) && n <= max {
+			return score{0, 0}
+		}
+
+		// Otherwise the weight is the penalty plus the square of the number of
+		// characters remaining on the line or by which the line goes over.
+		// In the latter case, that value goes in the hi part of the score.
+		// (See note above.)
+		p := wrapPenalty(words[j-1])
+		v := int64(max-n) * int64(max-n)
+		if n > max {
+			return score{v, p}
+		}
+		return score{0, v + p}
+	}
+
+	// The rest of this function is “The Basic Algorithm” from
+	// Hirschberg and Larmore's conference paper,
+	// using the same names as in the paper.
+	f := []score{{0, 0}}
+	g := func(i, j int) score { return add(f[i], weight(i, j)) }
+
+	bridge := func(a, b, c int) bool {
+		k := c + sort.Search(len(words)+1-c, func(k int) bool {
+			k += c
+			return cmp(g(a, k), g(b, k)) > 0
+		})
+		if k > len(words) {
+			return true
+		}
+		return cmp(g(c, k), g(b, k)) <= 0
+	}
+
+	// d is a one-ended deque implemented as a slice.
+	d := make([]int, 1, len(words))
+	d[0] = 0
+	bestleft := make([]int, 1, len(words))
+	bestleft[0] = -1
+	for m := 1; m < len(words); m++ {
+		f = append(f, g(d[0], m))
+		bestleft = append(bestleft, d[0])
+		for len(d) > 1 && cmp(g(d[1], m+1), g(d[0], m+1)) <= 0 {
+			d = d[1:] // “Retire”
+		}
+		for len(d) > 1 && bridge(d[len(d)-2], d[len(d)-1], m) {
+			d = d[:len(d)-1] // “Fire”
+		}
+		if cmp(g(m, len(words)), g(d[len(d)-1], len(words))) < 0 {
+			d = append(d, m) // “Hire”
+			// The next few lines are not in the paper but are necessary
+			// to handle two-word inputs correctly. It appears to be
+			// just a bug in the paper's pseudocode.
+			if len(d) == 2 && cmp(g(d[1], m+1), g(d[0], m+1)) <= 0 {
+				d = d[1:]
+			}
+		}
+	}
+	bestleft = append(bestleft, d[0])
+
+	// Recover least weight sequence from bestleft.
+	n := 1
+	for m := len(words); m > 0; m = bestleft[m] {
+		n++
+	}
+	seq = make([]int, n)
+	for m := len(words); m > 0; m = bestleft[m] {
+		n--
+		seq[n] = m
+	}
+	return seq
+}
+
+// wrapPenalty is the penalty for inserting a line break after word s.
+func wrapPenalty(s string) int64 {
+	switch s[len(s)-1] {
+	case '.', ',', ':', ';':
+		return 0
+	}
+	return 64
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/format/format.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/format/format.go
new file mode 100644
index 000000000..63e65e905
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/format/format.go
@@ -0,0 +1,134 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package format implements standard formatting of Go source.
+//
+// Note that formatting of Go source code changes over time, so tools relying on
+// consistent formatting should execute a specific version of the gofmt binary
+// instead of using this package. That way, the formatting will be stable, and
+// the tools won't need to be recompiled each time gofmt changes.
+//
+// For example, pre-submit checks that use this package directly would behave
+// differently depending on what Go version each developer uses, causing the
+// check to be inherently fragile.
+package format
+
+import (
+	"bytes"
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"io"
+
+	"mvdan.cc/gofumpt/internal/govendor/go/printer"
+)
+
+// Keep these in sync with cmd/gofmt/gofmt.go.
+const (
+	tabWidth    = 8
+	printerMode = printer.UseSpaces | printer.TabIndent | printerNormalizeNumbers
+
+	// printerNormalizeNumbers means to canonicalize number literal prefixes
+	// and exponents while printing. See https://golang.org/doc/go1.13#gofmt.
+	//
+	// This value is defined in mvdan.cc/gofumpt/internal/govendor/go/printer specifically for mvdan.cc/gofumpt/internal/govendor/go/format and cmd/gofmt.
+	printerNormalizeNumbers = 1 << 30
+)
+
+var config = printer.Config{Mode: printerMode, Tabwidth: tabWidth}
+
+const parserMode = parser.ParseComments | parser.SkipObjectResolution
+
+// Node formats node in canonical gofmt style and writes the result to dst.
+//
+// The node type must be *[ast.File], *[printer.CommentedNode], [][ast.Decl],
+// [][ast.Stmt], or assignment-compatible to [ast.Expr], [ast.Decl], [ast.Spec],
+// or [ast.Stmt]. Node does not modify node. Imports are not sorted for
+// nodes representing partial source files (for instance, if the node is
+// not an *[ast.File] or a *[printer.CommentedNode] not wrapping an *[ast.File]).
+//
+// The function may return early (before the entire result is written)
+// and return a formatting error, for instance due to an incorrect AST.
+func Node(dst io.Writer, fset *token.FileSet, node any) error {
+	// Determine if we have a complete source file (file != nil).
+	var file *ast.File
+	var cnode *printer.CommentedNode
+	switch n := node.(type) {
+	case *ast.File:
+		file = n
+	case *printer.CommentedNode:
+		if f, ok := n.Node.(*ast.File); ok {
+			file = f
+			cnode = n
+		}
+	}
+
+	// Sort imports if necessary.
+	if file != nil && hasUnsortedImports(file) {
+		// Make a copy of the AST because ast.SortImports is destructive.
+		// TODO(gri) Do this more efficiently.
+		var buf bytes.Buffer
+		err := config.Fprint(&buf, fset, file)
+		if err != nil {
+			return err
+		}
+		file, err = parser.ParseFile(fset, "", buf.Bytes(), parserMode)
+		if err != nil {
+			// We should never get here. If we do, provide good diagnostic.
+			return fmt.Errorf("format.Node internal error (%s)", err)
+		}
+		ast.SortImports(fset, file)
+
+		// Use new file with sorted imports.
+		node = file
+		if cnode != nil {
+			node = &printer.CommentedNode{Node: file, Comments: cnode.Comments}
+		}
+	}
+
+	return config.Fprint(dst, fset, node)
+}
+
+// Source formats src in canonical gofmt style and returns the result
+// or an (I/O or syntax) error. src is expected to be a syntactically
+// correct Go source file, or a list of Go declarations or statements.
+//
+// If src is a partial source file, the leading and trailing space of src
+// is applied to the result (such that it has the same leading and trailing
+// space as src), and the result is indented by the same amount as the first
+// line of src containing code. Imports are not sorted for partial source files.
+func Source(src []byte) ([]byte, error) {
+	fset := token.NewFileSet()
+	file, sourceAdj, indentAdj, err := parse(fset, "", src, true)
+	if err != nil {
+		return nil, err
+	}
+
+	if sourceAdj == nil {
+		// Complete source file.
+		// TODO(gri) consider doing this always.
+		ast.SortImports(fset, file)
+	}
+
+	return format(fset, file, sourceAdj, indentAdj, src, config)
+}
+
+func hasUnsortedImports(file *ast.File) bool {
+	for _, d := range file.Decls {
+		d, ok := d.(*ast.GenDecl)
+		if !ok || d.Tok != token.IMPORT {
+			// Not an import declaration, so we're done.
+			// Imports are always first.
+			return false
+		}
+		if d.Lparen.IsValid() {
+			// For now assume all grouped imports are unsorted.
+			// TODO(gri) Should check if they are sorted already.
+			return true
+		}
+		// Ungrouped imports are sorted by default.
+	}
+	return false
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/format/internal.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/format/internal.go
new file mode 100644
index 000000000..df0358714
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/format/internal.go
@@ -0,0 +1,177 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// TODO(gri): This file and the file src/cmd/gofmt/internal.go are
+// the same (but for this comment and the package name). Do not modify
+// one without the other. Determine if we can factor out functionality
+// in a public API. See also #11844 for context.
+
+package format
+
+import (
+	"bytes"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"strings"
+
+	"mvdan.cc/gofumpt/internal/govendor/go/printer"
+)
+
+// parse parses src, which was read from the named file,
+// as a Go source file, declaration, or statement list.
+func parse(fset *token.FileSet, filename string, src []byte, fragmentOk bool) (
+	file *ast.File,
+	sourceAdj func(src []byte, indent int) []byte,
+	indentAdj int,
+	err error,
+) {
+	// Try as whole source file.
+	file, err = parser.ParseFile(fset, filename, src, parserMode)
+	// If there's no error, return. If the error is that the source file didn't begin with a
+	// package line and source fragments are ok, fall through to
+	// try as a source fragment. Stop and return on any other error.
+	if err == nil || !fragmentOk || !strings.Contains(err.Error(), "expected 'package'") {
+		return
+	}
+
+	// If this is a declaration list, make it a source file
+	// by inserting a package clause.
+	// Insert using a ';', not a newline, so that the line numbers
+	// in psrc match the ones in src.
+	psrc := append([]byte("package p;"), src...)
+	file, err = parser.ParseFile(fset, filename, psrc, parserMode)
+	if err == nil {
+		sourceAdj = func(src []byte, indent int) []byte {
+			// Remove the package clause.
+			// Gofmt has turned the ';' into a '\n'.
+			src = src[indent+len("package p\n"):]
+			return bytes.TrimSpace(src)
+		}
+		return
+	}
+	// If the error is that the source file didn't begin with a
+	// declaration, fall through to try as a statement list.
+	// Stop and return on any other error.
+	if !strings.Contains(err.Error(), "expected declaration") {
+		return
+	}
+
+	// If this is a statement list, make it a source file
+	// by inserting a package clause and turning the list
+	// into a function body. This handles expressions too.
+	// Insert using a ';', not a newline, so that the line numbers
+	// in fsrc match the ones in src. Add an extra '\n' before the '}'
+	// to make sure comments are flushed before the '}'.
+	fsrc := append(append([]byte("package p; func _() {"), src...), '\n', '\n', '}')
+	file, err = parser.ParseFile(fset, filename, fsrc, parserMode)
+	if err == nil {
+		sourceAdj = func(src []byte, indent int) []byte {
+			// Cap adjusted indent to zero.
+			if indent < 0 {
+				indent = 0
+			}
+			// Remove the wrapping.
+			// Gofmt has turned the "; " into a "\n\n".
+			// There will be two non-blank lines with indent, hence 2*indent.
+			src = src[2*indent+len("package p\n\nfunc _() {"):]
+			// Remove only the "}\n" suffix: remaining whitespaces will be trimmed anyway
+			src = src[:len(src)-len("}\n")]
+			return bytes.TrimSpace(src)
+		}
+		// Gofmt has also indented the function body one level.
+		// Adjust that with indentAdj.
+		indentAdj = -1
+	}
+
+	// Succeeded, or out of options.
+	return
+}
+
+// format formats the given package file originally obtained from src
+// and adjusts the result based on the original source via sourceAdj
+// and indentAdj.
+func format(
+	fset *token.FileSet,
+	file *ast.File,
+	sourceAdj func(src []byte, indent int) []byte,
+	indentAdj int,
+	src []byte,
+	cfg printer.Config,
+) ([]byte, error) {
+	if sourceAdj == nil {
+		// Complete source file.
+		var buf bytes.Buffer
+		err := cfg.Fprint(&buf, fset, file)
+		if err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	}
+
+	// Partial source file.
+	// Determine and prepend leading space.
+	i, j := 0, 0
+	for j < len(src) && isSpace(src[j]) {
+		if src[j] == '\n' {
+			i = j + 1 // byte offset of last line in leading space
+		}
+		j++
+	}
+	var res []byte
+	res = append(res, src[:i]...)
+
+	// Determine and prepend indentation of first code line.
+	// Spaces are ignored unless there are no tabs,
+	// in which case spaces count as one tab.
+	indent := 0
+	hasSpace := false
+	for _, b := range src[i:j] {
+		switch b {
+		case ' ':
+			hasSpace = true
+		case '\t':
+			indent++
+		}
+	}
+	if indent == 0 && hasSpace {
+		indent = 1
+	}
+	for i := 0; i < indent; i++ {
+		res = append(res, '\t')
+	}
+
+	// Format the source.
+	// Write it without any leading and trailing space.
+	cfg.Indent = indent + indentAdj
+	var buf bytes.Buffer
+	err := cfg.Fprint(&buf, fset, file)
+	if err != nil {
+		return nil, err
+	}
+	out := sourceAdj(buf.Bytes(), cfg.Indent)
+
+	// If the adjusted output is empty, the source
+	// was empty but (possibly) for white space.
+	// The result is the incoming source.
+	if len(out) == 0 {
+		return src, nil
+	}
+
+	// Otherwise, append output to leading space.
+	res = append(res, out...)
+
+	// Determine and append trailing space.
+	i = len(src)
+	for i > 0 && isSpace(src[i-1]) {
+		i--
+	}
+	return append(res, src[i:]...), nil
+}
+
+// isSpace reports whether the byte is a space character.
+// isSpace defines a space as being among the following bytes: ' ', '\t', '\n' and '\r'.
+func isSpace(b byte) bool {
+	return b == ' ' || b == '\t' || b == '\n' || b == '\r'
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/comment.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/comment.go
new file mode 100644
index 000000000..1f0e7df9d
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/comment.go
@@ -0,0 +1,156 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package printer
+
+import (
+	"go/ast"
+	"strings"
+
+	"mvdan.cc/gofumpt/internal/govendor/go/doc/comment"
+)
+
+// formatDocComment reformats the doc comment list,
+// returning the canonical formatting.
+func formatDocComment(list []*ast.Comment) []*ast.Comment {
+	// Extract comment text (removing comment markers).
+	var kind, text string
+	var directives []*ast.Comment
+	if len(list) == 1 && strings.HasPrefix(list[0].Text, "/*") {
+		kind = "/*"
+		text = list[0].Text
+		if !strings.Contains(text, "\n") || allStars(text) {
+			// Single-line /* .. */ comment in doc comment position,
+			// or multiline old-style comment like
+			//	/*
+			//	 * Comment
+			//	 * text here.
+			//	 */
+			// Should not happen, since it will not work well as a
+			// doc comment, but if it does, just ignore:
+			// reformatting it will only make the situation worse.
+			return list
+		}
+		text = text[2 : len(text)-2] // cut /* and */
+	} else if strings.HasPrefix(list[0].Text, "//") {
+		kind = "//"
+		var b strings.Builder
+		for _, c := range list {
+			after, found := strings.CutPrefix(c.Text, "//")
+			if !found {
+				return list
+			}
+			// Accumulate //go:build etc lines separately.
+			if isDirective(after) {
+				directives = append(directives, c)
+				continue
+			}
+			b.WriteString(strings.TrimPrefix(after, " "))
+			b.WriteString("\n")
+		}
+		text = b.String()
+	} else {
+		// Not sure what this is, so leave alone.
+		return list
+	}
+
+	if text == "" {
+		return list
+	}
+
+	// Parse comment and reformat as text.
+	var p comment.Parser
+	d := p.Parse(text)
+
+	var pr comment.Printer
+	text = string(pr.Comment(d))
+
+	// For /* */ comment, return one big comment with text inside.
+	slash := list[0].Slash
+	if kind == "/*" {
+		c := &ast.Comment{
+			Slash: slash,
+			Text:  "/*\n" + text + "*/",
+		}
+		return []*ast.Comment{c}
+	}
+
+	// For // comment, return sequence of // lines.
+	var out []*ast.Comment
+	for text != "" {
+		var line string
+		line, text, _ = strings.Cut(text, "\n")
+		if line == "" {
+			line = "//"
+		} else if strings.HasPrefix(line, "\t") {
+			line = "//" + line
+		} else {
+			line = "// " + line
+		}
+		out = append(out, &ast.Comment{
+			Slash: slash,
+			Text:  line,
+		})
+	}
+	if len(directives) > 0 {
+		out = append(out, &ast.Comment{
+			Slash: slash,
+			Text:  "//",
+		})
+		for _, c := range directives {
+			out = append(out, &ast.Comment{
+				Slash: slash,
+				Text:  c.Text,
+			})
+		}
+	}
+	return out
+}
+
+// isDirective reports whether c is a comment directive.
+// See go.dev/issue/37974.
+// This code is also in go/ast.
+func isDirective(c string) bool {
+	// "//line " is a line directive.
+	// "//extern " is for gccgo.
+	// "//export " is for cgo.
+	// (The // has been removed.)
+	if strings.HasPrefix(c, "line ") || strings.HasPrefix(c, "extern ") || strings.HasPrefix(c, "export ") {
+		return true
+	}
+
+	// "//[a-z0-9]+:[a-z0-9]"
+	// (The // has been removed.)
+	colon := strings.Index(c, ":")
+	if colon <= 0 || colon+1 >= len(c) {
+		return false
+	}
+	for i := 0; i <= colon+1; i++ {
+		if i == colon {
+			continue
+		}
+		b := c[i]
+		if !('a' <= b && b <= 'z' || '0' <= b && b <= '9') {
+			return false
+		}
+	}
+	return true
+}
+
+// allStars reports whether text is the interior of an
+// old-style /* */ comment with a star at the start of each line.
+func allStars(text string) bool {
+	for i := 0; i < len(text); i++ {
+		if text[i] == '\n' {
+			j := i + 1
+			for j < len(text) && (text[j] == ' ' || text[j] == '\t') {
+				j++
+			}
+			if j < len(text) && text[j] != '*' {
+				return false
+			}
+		}
+	}
+	return true
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/gobuild.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/gobuild.go
new file mode 100644
index 000000000..6f04cf6d6
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/gobuild.go
@@ -0,0 +1,170 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package printer
+
+import (
+	"go/build/constraint"
+	"slices"
+	"text/tabwriter"
+)
+
+func (p *printer) fixGoBuildLines() {
+	if len(p.goBuild)+len(p.plusBuild) == 0 {
+		return
+	}
+
+	// Find latest possible placement of //go:build and // +build comments.
+	// That's just after the last blank line before we find a non-comment.
+	// (We'll add another blank line after our comment block.)
+	// When we start dropping // +build comments, we can skip over /* */ comments too.
+	// Note that we are processing tabwriter input, so every comment
+	// begins and ends with a tabwriter.Escape byte.
+	// And some newlines have turned into \f bytes.
+	insert := 0
+	for pos := 0; ; {
+		// Skip leading space at beginning of line.
+		blank := true
+		for pos < len(p.output) && (p.output[pos] == ' ' || p.output[pos] == '\t') {
+			pos++
+		}
+		// Skip over // comment if any.
+		if pos+3 < len(p.output) && p.output[pos] == tabwriter.Escape && p.output[pos+1] == '/' && p.output[pos+2] == '/' {
+			blank = false
+			for pos < len(p.output) && !isNL(p.output[pos]) {
+				pos++
+			}
+		}
+		// Skip over \n at end of line.
+		if pos >= len(p.output) || !isNL(p.output[pos]) {
+			break
+		}
+		pos++
+
+		if blank {
+			insert = pos
+		}
+	}
+
+	// If there is a //go:build comment before the place we identified,
+	// use that point instead. (Earlier in the file is always fine.)
+	if len(p.goBuild) > 0 && p.goBuild[0] < insert {
+		insert = p.goBuild[0]
+	} else if len(p.plusBuild) > 0 && p.plusBuild[0] < insert {
+		insert = p.plusBuild[0]
+	}
+
+	var x constraint.Expr
+	switch len(p.goBuild) {
+	case 0:
+		// Synthesize //go:build expression from // +build lines.
+		for _, pos := range p.plusBuild {
+			y, err := constraint.Parse(p.commentTextAt(pos))
+			if err != nil {
+				x = nil
+				break
+			}
+			if x == nil {
+				x = y
+			} else {
+				x = &constraint.AndExpr{X: x, Y: y}
+			}
+		}
+	case 1:
+		// Parse //go:build expression.
+		x, _ = constraint.Parse(p.commentTextAt(p.goBuild[0]))
+	}
+
+	var block []byte
+	if x == nil {
+		// Don't have a valid //go:build expression to treat as truth.
+		// Bring all the lines together but leave them alone.
+		// Note that these are already tabwriter-escaped.
+		for _, pos := range p.goBuild {
+			block = append(block, p.lineAt(pos)...)
+		}
+		for _, pos := range p.plusBuild {
+			block = append(block, p.lineAt(pos)...)
+		}
+	} else {
+		block = append(block, tabwriter.Escape)
+		block = append(block, "//go:build "...)
+		block = append(block, x.String()...)
+		block = append(block, tabwriter.Escape, '\n')
+		if len(p.plusBuild) > 0 {
+			lines, err := constraint.PlusBuildLines(x)
+			if err != nil {
+				lines = []string{"// +build error: " + err.Error()}
+			}
+			for _, line := range lines {
+				block = append(block, tabwriter.Escape)
+				block = append(block, line...)
+				block = append(block, tabwriter.Escape, '\n')
+			}
+		}
+	}
+	block = append(block, '\n')
+
+	// Build sorted list of lines to delete from remainder of output.
+	toDelete := append(p.goBuild, p.plusBuild...)
+	slices.Sort(toDelete)
+
+	// Collect output after insertion point, with lines deleted, into after.
+	var after []byte
+	start := insert
+	for _, end := range toDelete {
+		if end < start {
+			continue
+		}
+		after = appendLines(after, p.output[start:end])
+		start = end + len(p.lineAt(end))
+	}
+	after = appendLines(after, p.output[start:])
+	if n := len(after); n >= 2 && isNL(after[n-1]) && isNL(after[n-2]) {
+		after = after[:n-1]
+	}
+
+	p.output = p.output[:insert]
+	p.output = append(p.output, block...)
+	p.output = append(p.output, after...)
+}
+
+// appendLines is like append(x, y...)
+// but it avoids creating doubled blank lines,
+// which would not be gofmt-standard output.
+// It assumes that only whole blocks of lines are being appended,
+// not line fragments.
+func appendLines(x, y []byte) []byte {
+	if len(y) > 0 && isNL(y[0]) && // y starts in blank line
+		(len(x) == 0 || len(x) >= 2 && isNL(x[len(x)-1]) && isNL(x[len(x)-2])) { // x is empty or ends in blank line
+		y = y[1:] // delete y's leading blank line
+	}
+	return append(x, y...)
+}
+
+func (p *printer) lineAt(start int) []byte {
+	pos := start
+	for pos < len(p.output) && !isNL(p.output[pos]) {
+		pos++
+	}
+	if pos < len(p.output) {
+		pos++
+	}
+	return p.output[start:pos]
+}
+
+func (p *printer) commentTextAt(start int) string {
+	if start < len(p.output) && p.output[start] == tabwriter.Escape {
+		start++
+	}
+	pos := start
+	for pos < len(p.output) && p.output[pos] != tabwriter.Escape && !isNL(p.output[pos]) {
+		pos++
+	}
+	return string(p.output[start:pos])
+}
+
+func isNL(b byte) bool {
+	return b == '\n' || b == '\f'
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/nodes.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/nodes.go
new file mode 100644
index 000000000..c7d2b0f14
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/nodes.go
@@ -0,0 +1,1999 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This file implements printing of AST nodes; specifically
+// expressions, statements, declarations, and files. It uses
+// the print functionality implemented in printer.go.
+
+package printer
+
+import (
+	"go/ast"
+	"go/token"
+	"math"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+// Formatting issues:
+// - better comment formatting for /*-style comments at the end of a line (e.g. a declaration)
+//   when the comment spans multiple lines; if such a comment is just two lines, formatting is
+//   not idempotent
+// - formatting of expression lists
+// - should use blank instead of tab to separate one-line function bodies from
+//   the function header unless there is a group of consecutive one-liners
+
+// ----------------------------------------------------------------------------
+// Common AST nodes.
+
+// Print as many newlines as necessary (but at least min newlines) to get to
+// the current line. ws is printed before the first line break. If newSection
+// is set, the first line break is printed as formfeed. Returns 0 if no line
+// breaks were printed, returns 1 if there was exactly one newline printed,
+// and returns a value > 1 if there was a formfeed or more than one newline
+// printed.
+//
+// TODO(gri): linebreak may add too many lines if the next statement at "line"
+// is preceded by comments because the computation of n assumes
+// the current position before the comment and the target position
+// after the comment. Thus, after interspersing such comments, the
+// space taken up by them is not considered to reduce the number of
+// linebreaks. At the moment there is no easy way to know about
+// future (not yet interspersed) comments in this function.
+func (p *printer) linebreak(line, min int, ws whiteSpace, newSection bool) (nbreaks int) {
+	n := max(nlimit(line-p.pos.Line), min)
+	if n > 0 {
+		p.print(ws)
+		if newSection {
+			p.print(formfeed)
+			n--
+			nbreaks = 2
+		}
+		nbreaks += n
+		for ; n > 0; n-- {
+			p.print(newline)
+		}
+	}
+	return
+}
+
+// setComment sets g as the next comment if g != nil and if node comments
+// are enabled - this mode is used when printing source code fragments such
+// as exports only. It assumes that there is no pending comment in p.comments
+// and at most one pending comment in the p.comment cache.
+func (p *printer) setComment(g *ast.CommentGroup) {
+	if g == nil || !p.useNodeComments {
+		return
+	}
+	if p.comments == nil {
+		// initialize p.comments lazily
+		p.comments = make([]*ast.CommentGroup, 1)
+	} else if p.cindex < len(p.comments) {
+		// for some reason there are pending comments; this
+		// should never happen - handle gracefully and flush
+		// all comments up to g, ignore anything after that
+		p.flush(p.posFor(g.List[0].Pos()), token.ILLEGAL)
+		p.comments = p.comments[0:1]
+		// in debug mode, report error
+		p.internalError("setComment found pending comments")
+	}
+	p.comments[0] = g
+	p.cindex = 0
+	// don't overwrite any pending comment in the p.comment cache
+	// (there may be a pending comment when a line comment is
+	// immediately followed by a lead comment with no other
+	// tokens between)
+	if p.commentOffset == infinity {
+		p.nextComment() // get comment ready for use
+	}
+}
+
+type exprListMode uint
+
+const (
+	commaTerm exprListMode = 1 << iota // list is optionally terminated by a comma
+	noIndent                           // no extra indentation in multi-line lists
+)
+
+// If indent is set, a multi-line identifier list is indented after the
+// first linebreak encountered.
+func (p *printer) identList(list []*ast.Ident, indent bool) {
+	// convert into an expression list so we can re-use exprList formatting
+	xlist := make([]ast.Expr, len(list))
+	for i, x := range list {
+		xlist[i] = x
+	}
+	var mode exprListMode
+	if !indent {
+		mode = noIndent
+	}
+	p.exprList(token.NoPos, xlist, 1, mode, token.NoPos, false)
+}
+
+const filteredMsg = "contains filtered or unexported fields"
+
+// Print a list of expressions. If the list spans multiple
+// source lines, the original line breaks are respected between
+// expressions.
+//
+// TODO(gri) Consider rewriting this to be independent of []ast.Expr
+// so that we can use the algorithm for any kind of list
+//
+//	(e.g., pass list via a channel over which to range).
+func (p *printer) exprList(prev0 token.Pos, list []ast.Expr, depth int, mode exprListMode, next0 token.Pos, isIncomplete bool) {
+	if len(list) == 0 {
+		if isIncomplete {
+			prev := p.posFor(prev0)
+			next := p.posFor(next0)
+			if prev.IsValid() && prev.Line == next.Line {
+				p.print("/* " + filteredMsg + " */")
+			} else {
+				p.print(newline)
+				p.print(indent, "// "+filteredMsg, unindent, newline)
+			}
+		}
+		return
+	}
+
+	prev := p.posFor(prev0)
+	next := p.posFor(next0)
+	line := p.lineFor(list[0].Pos())
+	endLine := p.lineFor(list[len(list)-1].End())
+
+	if prev.IsValid() && prev.Line == line && line == endLine {
+		// all list entries on a single line
+		for i, x := range list {
+			if i > 0 {
+				// use position of expression following the comma as
+				// comma position for correct comment placement
+				p.setPos(x.Pos())
+				p.print(token.COMMA, blank)
+			}
+			p.expr0(x, depth)
+		}
+		if isIncomplete {
+			p.print(token.COMMA, blank, "/* "+filteredMsg+" */")
+		}
+		return
+	}
+
+	// list entries span multiple lines;
+	// use source code positions to guide line breaks
+
+	// Don't add extra indentation if noIndent is set;
+	// i.e., pretend that the first line is already indented.
+	ws := ignore
+	if mode&noIndent == 0 {
+		ws = indent
+	}
+
+	// The first linebreak is always a formfeed since this section must not
+	// depend on any previous formatting.
+	prevBreak := -1 // index of last expression that was followed by a linebreak
+	if prev.IsValid() && prev.Line < line && p.linebreak(line, 0, ws, true) > 0 {
+		ws = ignore
+		prevBreak = 0
+	}
+
+	// initialize expression/key size: a zero value indicates expr/key doesn't fit on a single line
+	size := 0
+
+	// We use the ratio between the geometric mean of the previous key sizes and
+	// the current size to determine if there should be a break in the alignment.
+	// To compute the geometric mean we accumulate the ln(size) values (lnsum)
+	// and the number of sizes included (count).
+	lnsum := 0.0
+	count := 0
+
+	// print all list elements
+	prevLine := prev.Line
+	for i, x := range list {
+		line = p.lineFor(x.Pos())
+
+		// Determine if the next linebreak, if any, needs to use formfeed:
+		// in general, use the entire node size to make the decision; for
+		// key:value expressions, use the key size.
+		// TODO(gri) for a better result, should probably incorporate both
+		//           the key and the node size into the decision process
+		useFF := true
+
+		// Determine element size: All bets are off if we don't have
+		// position information for the previous and next token (likely
+		// generated code - simply ignore the size in this case by setting
+		// it to 0).
+		prevSize := size
+		const infinity = 1e6 // larger than any source line
+		size = p.nodeSize(x, infinity)
+		pair, isPair := x.(*ast.KeyValueExpr)
+		if size <= infinity && prev.IsValid() && next.IsValid() {
+			// x fits on a single line
+			if isPair {
+				size = p.nodeSize(pair.Key, infinity) // size <= infinity
+			}
+		} else {
+			// size too large or we don't have good layout information
+			size = 0
+		}
+
+		// If the previous line and the current line had single-
+		// line-expressions and the key sizes are small or the
+		// ratio between the current key and the geometric mean
+		// if the previous key sizes does not exceed a threshold,
+		// align columns and do not use formfeed.
+		if prevSize > 0 && size > 0 {
+			const smallSize = 40
+			if count == 0 || prevSize <= smallSize && size <= smallSize {
+				useFF = false
+			} else {
+				const r = 2.5                               // threshold
+				geomean := math.Exp(lnsum / float64(count)) // count > 0
+				ratio := float64(size) / geomean
+				useFF = r*ratio <= 1 || r <= ratio
+			}
+		}
+
+		needsLinebreak := 0 < prevLine && prevLine < line
+		if i > 0 {
+			// Use position of expression following the comma as
+			// comma position for correct comment placement, but
+			// only if the expression is on the same line.
+			if !needsLinebreak {
+				p.setPos(x.Pos())
+			}
+			p.print(token.COMMA)
+			needsBlank := true
+			if needsLinebreak {
+				// Lines are broken using newlines so comments remain aligned
+				// unless useFF is set or there are multiple expressions on
+				// the same line in which case formfeed is used.
+				nbreaks := p.linebreak(line, 0, ws, useFF || prevBreak+1 < i)
+				if nbreaks > 0 {
+					ws = ignore
+					prevBreak = i
+					needsBlank = false // we got a line break instead
+				}
+				// If there was a new section or more than one new line
+				// (which means that the tabwriter will implicitly break
+				// the section), reset the geomean variables since we are
+				// starting a new group of elements with the next element.
+				if nbreaks > 1 {
+					lnsum = 0
+					count = 0
+				}
+			}
+			if needsBlank {
+				p.print(blank)
+			}
+		}
+
+		if len(list) > 1 && isPair && size > 0 && needsLinebreak {
+			// We have a key:value expression that fits onto one line
+			// and it's not on the same line as the prior expression:
+			// Use a column for the key such that consecutive entries
+			// can align if possible.
+			// (needsLinebreak is set if we started a new line before)
+			p.expr(pair.Key)
+			p.setPos(pair.Colon)
+			p.print(token.COLON, vtab)
+			p.expr(pair.Value)
+		} else {
+			p.expr0(x, depth)
+		}
+
+		if size > 0 {
+			lnsum += math.Log(float64(size))
+			count++
+		}
+
+		prevLine = line
+	}
+
+	if mode&commaTerm != 0 && next.IsValid() && p.pos.Line < next.Line {
+		// Print a terminating comma if the next token is on a new line.
+		p.print(token.COMMA)
+		if isIncomplete {
+			p.print(newline)
+			p.print("// " + filteredMsg)
+		}
+		if ws == ignore && mode&noIndent == 0 {
+			// unindent if we indented
+			p.print(unindent)
+		}
+		p.print(formfeed) // terminating comma needs a line break to look good
+		return
+	}
+
+	if isIncomplete {
+		p.print(token.COMMA, newline)
+		p.print("// "+filteredMsg, newline)
+	}
+
+	if ws == ignore && mode&noIndent == 0 {
+		// unindent if we indented
+		p.print(unindent)
+	}
+}
+
+type paramMode int
+
+const (
+	funcParam paramMode = iota
+	funcTParam
+	typeTParam
+)
+
+func (p *printer) parameters(fields *ast.FieldList, mode paramMode) {
+	openTok, closeTok := token.LPAREN, token.RPAREN
+	if mode != funcParam {
+		openTok, closeTok = token.LBRACK, token.RBRACK
+	}
+	p.setPos(fields.Opening)
+	p.print(openTok)
+	if len(fields.List) > 0 {
+		prevLine := p.lineFor(fields.Opening)
+		ws := indent
+		for i, par := range fields.List {
+			// determine par begin and end line (may be different
+			// if there are multiple parameter names for this par
+			// or the type is on a separate line)
+			parLineBeg := p.lineFor(par.Pos())
+			parLineEnd := p.lineFor(par.End())
+			// separating "," if needed
+			needsLinebreak := 0 < prevLine && prevLine < parLineBeg
+			if i > 0 {
+				// use position of parameter following the comma as
+				// comma position for correct comma placement, but
+				// only if the next parameter is on the same line
+				if !needsLinebreak {
+					p.setPos(par.Pos())
+				}
+				p.print(token.COMMA)
+			}
+			// separator if needed (linebreak or blank)
+			if needsLinebreak && p.linebreak(parLineBeg, 0, ws, true) > 0 {
+				// break line if the opening "(" or previous parameter ended on a different line
+				ws = ignore
+			} else if i > 0 {
+				p.print(blank)
+			}
+			// parameter names
+			if len(par.Names) > 0 {
+				// Very subtle: If we indented before (ws == ignore), identList
+				// won't indent again. If we didn't (ws == indent), identList will
+				// indent if the identList spans multiple lines, and it will outdent
+				// again at the end (and still ws == indent). Thus, a subsequent indent
+				// by a linebreak call after a type, or in the next multi-line identList
+				// will do the right thing.
+				p.identList(par.Names, ws == indent)
+				p.print(blank)
+			}
+			// parameter type
+			p.expr(stripParensAlways(par.Type))
+			prevLine = parLineEnd
+		}
+
+		// if the closing ")" is on a separate line from the last parameter,
+		// print an additional "," and line break
+		if closing := p.lineFor(fields.Closing); 0 < prevLine && prevLine < closing {
+			p.print(token.COMMA)
+			p.linebreak(closing, 0, ignore, true)
+		} else if mode == typeTParam && fields.NumFields() == 1 && combinesWithName(stripParensAlways(fields.List[0].Type)) {
+			// A type parameter list [P T] where the name P and the type expression T syntactically
+			// combine to another valid (value) expression requires a trailing comma, as in [P *T,]
+			// (or an enclosing interface as in [P interface(*T)]), so that the type parameter list
+			// is not parsed as an array length [P*T].
+			p.print(token.COMMA)
+		}
+
+		// unindent if we indented
+		if ws == ignore {
+			p.print(unindent)
+		}
+	}
+
+	p.setPos(fields.Closing)
+	p.print(closeTok)
+}
+
+// combinesWithName reports whether a name followed by the expression x
+// syntactically combines to another valid (value) expression. For instance
+// using *T for x, "name *T" syntactically appears as the expression x*T.
+// On the other hand, using  P|Q or *P|~Q for x, "name P|Q" or "name *P|~Q"
+// cannot be combined into a valid (value) expression.
+func combinesWithName(x ast.Expr) bool {
+	switch x := x.(type) {
+	case *ast.StarExpr:
+		// name *x.X combines to name*x.X if x.X is not a type element
+		return !isTypeElem(x.X)
+	case *ast.BinaryExpr:
+		return combinesWithName(x.X) && !isTypeElem(x.Y)
+	case *ast.ParenExpr:
+		return !isTypeElem(x.X)
+	}
+	return false
+}
+
+// isTypeElem reports whether x is a (possibly parenthesized) type element expression.
+// The result is false if x could be a type element OR an ordinary (value) expression.
+func isTypeElem(x ast.Expr) bool {
+	switch x := x.(type) {
+	case *ast.ArrayType, *ast.StructType, *ast.FuncType, *ast.InterfaceType, *ast.MapType, *ast.ChanType:
+		return true
+	case *ast.UnaryExpr:
+		return x.Op == token.TILDE
+	case *ast.BinaryExpr:
+		return isTypeElem(x.X) || isTypeElem(x.Y)
+	case *ast.ParenExpr:
+		return isTypeElem(x.X)
+	}
+	return false
+}
+
+func (p *printer) signature(sig *ast.FuncType) {
+	if sig.TypeParams != nil {
+		p.parameters(sig.TypeParams, funcTParam)
+	}
+	if sig.Params != nil {
+		p.parameters(sig.Params, funcParam)
+	} else {
+		p.print(token.LPAREN, token.RPAREN)
+	}
+	res := sig.Results
+	n := res.NumFields()
+	if n > 0 {
+		// res != nil
+		p.print(blank)
+		if n == 1 && res.List[0].Names == nil {
+			// single anonymous res; no ()'s
+			p.expr(stripParensAlways(res.List[0].Type))
+			return
+		}
+		p.parameters(res, funcParam)
+	}
+}
+
+func identListSize(list []*ast.Ident, maxSize int) (size int) {
+	for i, x := range list {
+		if i > 0 {
+			size += len(", ")
+		}
+		size += utf8.RuneCountInString(x.Name)
+		if size >= maxSize {
+			break
+		}
+	}
+	return
+}
+
+func (p *printer) isOneLineFieldList(list []*ast.Field) bool {
+	if len(list) != 1 {
+		return false // allow only one field
+	}
+	f := list[0]
+	if f.Tag != nil || f.Comment != nil {
+		return false // don't allow tags or comments
+	}
+	// only name(s) and type
+	const maxSize = 30 // adjust as appropriate, this is an approximate value
+	namesSize := identListSize(f.Names, maxSize)
+	if namesSize > 0 {
+		namesSize = 1 // blank between names and types
+	}
+	typeSize := p.nodeSize(f.Type, maxSize)
+	return namesSize+typeSize <= maxSize
+}
+
+func (p *printer) setLineComment(text string) {
+	p.setComment(&ast.CommentGroup{List: []*ast.Comment{{Slash: token.NoPos, Text: text}}})
+}
+
+func (p *printer) fieldList(fields *ast.FieldList, isStruct, isIncomplete bool) {
+	lbrace := fields.Opening
+	list := fields.List
+	rbrace := fields.Closing
+	hasComments := isIncomplete || p.commentBefore(p.posFor(rbrace))
+	srcIsOneLine := lbrace.IsValid() && rbrace.IsValid() && p.lineFor(lbrace) == p.lineFor(rbrace)
+
+	if !hasComments && srcIsOneLine {
+		// possibly a one-line struct/interface
+		if len(list) == 0 {
+			// no blank between keyword and {} in this case
+			p.setPos(lbrace)
+			p.print(token.LBRACE)
+			p.setPos(rbrace)
+			p.print(token.RBRACE)
+			return
+		} else if p.isOneLineFieldList(list) {
+			// small enough - print on one line
+			// (don't use identList and ignore source line breaks)
+			p.setPos(lbrace)
+			p.print(token.LBRACE, blank)
+			f := list[0]
+			if isStruct {
+				for i, x := range f.Names {
+					if i > 0 {
+						// no comments so no need for comma position
+						p.print(token.COMMA, blank)
+					}
+					p.expr(x)
+				}
+				if len(f.Names) > 0 {
+					p.print(blank)
+				}
+				p.expr(f.Type)
+			} else { // interface
+				if len(f.Names) > 0 {
+					name := f.Names[0] // method name
+					p.expr(name)
+					p.signature(f.Type.(*ast.FuncType)) // don't print "func"
+				} else {
+					// embedded interface
+					p.expr(f.Type)
+				}
+			}
+			p.print(blank)
+			p.setPos(rbrace)
+			p.print(token.RBRACE)
+			return
+		}
+	}
+	// hasComments || !srcIsOneLine
+
+	p.print(blank)
+	p.setPos(lbrace)
+	p.print(token.LBRACE, indent)
+	if hasComments || len(list) > 0 {
+		p.print(formfeed)
+	}
+
+	if isStruct {
+
+		sep := vtab
+		if len(list) == 1 {
+			sep = blank
+		}
+		var line int
+		for i, f := range list {
+			if i > 0 {
+				p.linebreak(p.lineFor(f.Pos()), 1, ignore, p.linesFrom(line) > 0)
+			}
+			extraTabs := 0
+			p.setComment(f.Doc)
+			p.recordLine(&line)
+			if len(f.Names) > 0 {
+				// named fields
+				p.identList(f.Names, false)
+				p.print(sep)
+				p.expr(f.Type)
+				extraTabs = 1
+			} else {
+				// anonymous field
+				p.expr(f.Type)
+				extraTabs = 2
+			}
+			if f.Tag != nil {
+				if len(f.Names) > 0 && sep == vtab {
+					p.print(sep)
+				}
+				p.print(sep)
+				p.expr(f.Tag)
+				extraTabs = 0
+			}
+			if f.Comment != nil {
+				for ; extraTabs > 0; extraTabs-- {
+					p.print(sep)
+				}
+				p.setComment(f.Comment)
+			}
+		}
+		if isIncomplete {
+			if len(list) > 0 {
+				p.print(formfeed)
+			}
+			p.flush(p.posFor(rbrace), token.RBRACE) // make sure we don't lose the last line comment
+			p.setLineComment("// " + filteredMsg)
+		}
+
+	} else { // interface
+
+		var line int
+		var prev *ast.Ident // previous "type" identifier
+		for i, f := range list {
+			var name *ast.Ident // first name, or nil
+			if len(f.Names) > 0 {
+				name = f.Names[0]
+			}
+			if i > 0 {
+				// don't do a line break (min == 0) if we are printing a list of types
+				// TODO(gri) this doesn't work quite right if the list of types is
+				//           spread across multiple lines
+				min := 1
+				if prev != nil && name == prev {
+					min = 0
+				}
+				p.linebreak(p.lineFor(f.Pos()), min, ignore, p.linesFrom(line) > 0)
+			}
+			p.setComment(f.Doc)
+			p.recordLine(&line)
+			if name != nil {
+				// method
+				p.expr(name)
+				p.signature(f.Type.(*ast.FuncType)) // don't print "func"
+				prev = nil
+			} else {
+				// embedded interface
+				p.expr(f.Type)
+				prev = nil
+			}
+			p.setComment(f.Comment)
+		}
+		if isIncomplete {
+			if len(list) > 0 {
+				p.print(formfeed)
+			}
+			p.flush(p.posFor(rbrace), token.RBRACE) // make sure we don't lose the last line comment
+			p.setLineComment("// contains filtered or unexported methods")
+		}
+
+	}
+	p.print(unindent, formfeed)
+	p.setPos(rbrace)
+	p.print(token.RBRACE)
+}
+
+// ----------------------------------------------------------------------------
+// Expressions
+
+func walkBinary(e *ast.BinaryExpr) (has4, has5 bool, maxProblem int) {
+	switch e.Op.Precedence() {
+	case 4:
+		has4 = true
+	case 5:
+		has5 = true
+	}
+
+	switch l := e.X.(type) {
+	case *ast.BinaryExpr:
+		if l.Op.Precedence() < e.Op.Precedence() {
+			// parens will be inserted.
+			// pretend this is an *ast.ParenExpr and do nothing.
+			break
+		}
+		h4, h5, mp := walkBinary(l)
+		has4 = has4 || h4
+		has5 = has5 || h5
+		maxProblem = max(maxProblem, mp)
+	}
+
+	switch r := e.Y.(type) {
+	case *ast.BinaryExpr:
+		if r.Op.Precedence() <= e.Op.Precedence() {
+			// parens will be inserted.
+			// pretend this is an *ast.ParenExpr and do nothing.
+			break
+		}
+		h4, h5, mp := walkBinary(r)
+		has4 = has4 || h4
+		has5 = has5 || h5
+		maxProblem = max(maxProblem, mp)
+
+	case *ast.StarExpr:
+		if e.Op == token.QUO { // `*/`
+			maxProblem = 5
+		}
+
+	case *ast.UnaryExpr:
+		switch e.Op.String() + r.Op.String() {
+		case "/*", "&&", "&^":
+			maxProblem = 5
+		case "++", "--":
+			maxProblem = max(maxProblem, 4)
+		}
+	}
+	return
+}
+
+func cutoff(e *ast.BinaryExpr, depth int) int {
+	has4, has5, maxProblem := walkBinary(e)
+	if maxProblem > 0 {
+		return maxProblem + 1
+	}
+	if has4 && has5 {
+		if depth == 1 {
+			return 5
+		}
+		return 4
+	}
+	if depth == 1 {
+		return 6
+	}
+	return 4
+}
+
+func diffPrec(expr ast.Expr, prec int) int {
+	x, ok := expr.(*ast.BinaryExpr)
+	if !ok || prec != x.Op.Precedence() {
+		return 1
+	}
+	return 0
+}
+
+func reduceDepth(depth int) int {
+	depth--
+	if depth < 1 {
+		depth = 1
+	}
+	return depth
+}
+
+// Format the binary expression: decide the cutoff and then format.
+// Let's call depth == 1 Normal mode, and depth > 1 Compact mode.
+// (Algorithm suggestion by Russ Cox.)
+//
+// The precedences are:
+//
+//	5             *  /  %  <<  >>  &  &^
+//	4             +  -  |  ^
+//	3             ==  !=  <  <=  >  >=
+//	2             &&
+//	1             ||
+//
+// The only decision is whether there will be spaces around levels 4 and 5.
+// There are never spaces at level 6 (unary), and always spaces at levels 3 and below.
+//
+// To choose the cutoff, look at the whole expression but excluding primary
+// expressions (function calls, parenthesized exprs), and apply these rules:
+//
+//  1. If there is a binary operator with a right side unary operand
+//     that would clash without a space, the cutoff must be (in order):
+//
+//     /*	6
+//     &&	6
+//     &^	6
+//     ++	5
+//     --	5
+//
+//     (Comparison operators always have spaces around them.)
+//
+//  2. If there is a mix of level 5 and level 4 operators, then the cutoff
+//     is 5 (use spaces to distinguish precedence) in Normal mode
+//     and 4 (never use spaces) in Compact mode.
+//
+//  3. If there are no level 4 operators or no level 5 operators, then the
+//     cutoff is 6 (always use spaces) in Normal mode
+//     and 4 (never use spaces) in Compact mode.
+func (p *printer) binaryExpr(x *ast.BinaryExpr, prec1, cutoff, depth int) {
+	prec := x.Op.Precedence()
+	if prec < prec1 {
+		// parenthesis needed
+		// Note: The parser inserts an ast.ParenExpr node; thus this case
+		//       can only occur if the AST is created in a different way.
+		p.print(token.LPAREN)
+		p.expr0(x, reduceDepth(depth)) // parentheses undo one level of depth
+		p.print(token.RPAREN)
+		return
+	}
+
+	printBlank := prec < cutoff
+
+	ws := indent
+	p.expr1(x.X, prec, depth+diffPrec(x.X, prec))
+	if printBlank {
+		p.print(blank)
+	}
+	xline := p.pos.Line // before the operator (it may be on the next line!)
+	yline := p.lineFor(x.Y.Pos())
+	p.setPos(x.OpPos)
+	p.print(x.Op)
+	if xline != yline && xline > 0 && yline > 0 {
+		// at least one line break, but respect an extra empty line
+		// in the source
+		if p.linebreak(yline, 1, ws, true) > 0 {
+			ws = ignore
+			printBlank = false // no blank after line break
+		}
+	}
+	if printBlank {
+		p.print(blank)
+	}
+	p.expr1(x.Y, prec+1, depth+1)
+	if ws == ignore {
+		p.print(unindent)
+	}
+}
+
+func isBinary(expr ast.Expr) bool {
+	_, ok := expr.(*ast.BinaryExpr)
+	return ok
+}
+
+func (p *printer) expr1(expr ast.Expr, prec1, depth int) {
+	p.setPos(expr.Pos())
+
+	switch x := expr.(type) {
+	case *ast.BadExpr:
+		p.print("BadExpr")
+
+	case *ast.Ident:
+		p.print(x)
+
+	case *ast.BinaryExpr:
+		if depth < 1 {
+			p.internalError("depth < 1:", depth)
+			depth = 1
+		}
+		p.binaryExpr(x, prec1, cutoff(x, depth), depth)
+
+	case *ast.KeyValueExpr:
+		p.expr(x.Key)
+		p.setPos(x.Colon)
+		p.print(token.COLON, blank)
+		p.expr(x.Value)
+
+	case *ast.StarExpr:
+		const prec = token.UnaryPrec
+		if prec < prec1 {
+			// parenthesis needed
+			p.print(token.LPAREN)
+			p.print(token.MUL)
+			p.expr(x.X)
+			p.print(token.RPAREN)
+		} else {
+			// no parenthesis needed
+			p.print(token.MUL)
+			p.expr(x.X)
+		}
+
+	case *ast.UnaryExpr:
+		const prec = token.UnaryPrec
+		if prec < prec1 {
+			// parenthesis needed
+			p.print(token.LPAREN)
+			p.expr(x)
+			p.print(token.RPAREN)
+		} else {
+			// no parenthesis needed
+			p.print(x.Op)
+			if x.Op == token.RANGE {
+				// TODO(gri) Remove this code if it cannot be reached.
+				p.print(blank)
+			}
+			p.expr1(x.X, prec, depth)
+		}
+
+	case *ast.BasicLit:
+		if p.Config.Mode&normalizeNumbers != 0 {
+			x = normalizedNumber(x)
+		}
+		p.print(x)
+
+	case *ast.FuncLit:
+		p.setPos(x.Type.Pos())
+		p.print(token.FUNC)
+		// See the comment in funcDecl about how the header size is computed.
+		startCol := p.out.Column - len("func")
+		p.signature(x.Type)
+		p.funcBody(p.distanceFrom(x.Type.Pos(), startCol), blank, x.Body)
+
+	case *ast.ParenExpr:
+		if _, hasParens := x.X.(*ast.ParenExpr); hasParens {
+			// don't print parentheses around an already parenthesized expression
+			// TODO(gri) consider making this more general and incorporate precedence levels
+			p.expr0(x.X, depth)
+		} else {
+			p.print(token.LPAREN)
+			p.expr0(x.X, reduceDepth(depth)) // parentheses undo one level of depth
+			p.setPos(x.Rparen)
+			p.print(token.RPAREN)
+		}
+
+	case *ast.SelectorExpr:
+		p.selectorExpr(x, depth, false)
+
+	case *ast.TypeAssertExpr:
+		p.expr1(x.X, token.HighestPrec, depth)
+		p.print(token.PERIOD)
+		p.setPos(x.Lparen)
+		p.print(token.LPAREN)
+		if x.Type != nil {
+			p.expr(x.Type)
+		} else {
+			p.print(token.TYPE)
+		}
+		p.setPos(x.Rparen)
+		p.print(token.RPAREN)
+
+	case *ast.IndexExpr:
+		// TODO(gri): should treat[] like parentheses and undo one level of depth
+		p.expr1(x.X, token.HighestPrec, 1)
+		p.setPos(x.Lbrack)
+		p.print(token.LBRACK)
+		p.expr0(x.Index, depth+1)
+		p.setPos(x.Rbrack)
+		p.print(token.RBRACK)
+
+	case *ast.IndexListExpr:
+		// TODO(gri): as for IndexExpr, should treat [] like parentheses and undo
+		// one level of depth
+		p.expr1(x.X, token.HighestPrec, 1)
+		p.setPos(x.Lbrack)
+		p.print(token.LBRACK)
+		p.exprList(x.Lbrack, x.Indices, depth+1, commaTerm, x.Rbrack, false)
+		p.setPos(x.Rbrack)
+		p.print(token.RBRACK)
+
+	case *ast.SliceExpr:
+		// TODO(gri): should treat[] like parentheses and undo one level of depth
+		p.expr1(x.X, token.HighestPrec, 1)
+		p.setPos(x.Lbrack)
+		p.print(token.LBRACK)
+		indices := []ast.Expr{x.Low, x.High}
+		if x.Max != nil {
+			indices = append(indices, x.Max)
+		}
+		// determine if we need extra blanks around ':'
+		var needsBlanks bool
+		if depth <= 1 {
+			var indexCount int
+			var hasBinaries bool
+			for _, x := range indices {
+				if x != nil {
+					indexCount++
+					if isBinary(x) {
+						hasBinaries = true
+					}
+				}
+			}
+			if indexCount > 1 && hasBinaries {
+				needsBlanks = true
+			}
+		}
+		for i, x := range indices {
+			if i > 0 {
+				if indices[i-1] != nil && needsBlanks {
+					p.print(blank)
+				}
+				p.print(token.COLON)
+				if x != nil && needsBlanks {
+					p.print(blank)
+				}
+			}
+			if x != nil {
+				p.expr0(x, depth+1)
+			}
+		}
+		p.setPos(x.Rbrack)
+		p.print(token.RBRACK)
+
+	case *ast.CallExpr:
+		if len(x.Args) > 1 {
+			depth++
+		}
+
+		// Conversions to literal function types or <-chan
+		// types require parentheses around the type.
+		paren := false
+		switch t := x.Fun.(type) {
+		case *ast.FuncType:
+			paren = true
+		case *ast.ChanType:
+			paren = t.Dir == ast.RECV
+		}
+		if paren {
+			p.print(token.LPAREN)
+		}
+		wasIndented := p.possibleSelectorExpr(x.Fun, token.HighestPrec, depth)
+		if paren {
+			p.print(token.RPAREN)
+		}
+
+		p.setPos(x.Lparen)
+		p.print(token.LPAREN)
+		if x.Ellipsis.IsValid() {
+			p.exprList(x.Lparen, x.Args, depth, 0, x.Ellipsis, false)
+			p.setPos(x.Ellipsis)
+			p.print(token.ELLIPSIS)
+			if x.Rparen.IsValid() && p.lineFor(x.Ellipsis) < p.lineFor(x.Rparen) {
+				p.print(token.COMMA, formfeed)
+			}
+		} else {
+			p.exprList(x.Lparen, x.Args, depth, commaTerm, x.Rparen, false)
+		}
+		p.setPos(x.Rparen)
+		p.print(token.RPAREN)
+		if wasIndented {
+			p.print(unindent)
+		}
+
+	case *ast.CompositeLit:
+		// composite literal elements that are composite literals themselves may have the type omitted
+		if x.Type != nil {
+			p.expr1(x.Type, token.HighestPrec, depth)
+		}
+		p.level++
+		p.setPos(x.Lbrace)
+		p.print(token.LBRACE)
+		p.exprList(x.Lbrace, x.Elts, 1, commaTerm, x.Rbrace, x.Incomplete)
+		// do not insert extra line break following a /*-style comment
+		// before the closing '}' as it might break the code if there
+		// is no trailing ','
+		mode := noExtraLinebreak
+		// do not insert extra blank following a /*-style comment
+		// before the closing '}' unless the literal is empty
+		if len(x.Elts) > 0 {
+			mode |= noExtraBlank
+		}
+		// need the initial indent to print lone comments with
+		// the proper level of indentation
+		p.print(indent, unindent, mode)
+		p.setPos(x.Rbrace)
+		p.print(token.RBRACE, mode)
+		p.level--
+
+	case *ast.Ellipsis:
+		p.print(token.ELLIPSIS)
+		if x.Elt != nil {
+			p.expr(x.Elt)
+		}
+
+	case *ast.ArrayType:
+		p.print(token.LBRACK)
+		if x.Len != nil {
+			p.expr(x.Len)
+		}
+		p.print(token.RBRACK)
+		p.expr(x.Elt)
+
+	case *ast.StructType:
+		p.print(token.STRUCT)
+		p.fieldList(x.Fields, true, x.Incomplete)
+
+	case *ast.FuncType:
+		p.print(token.FUNC)
+		p.signature(x)
+
+	case *ast.InterfaceType:
+		p.print(token.INTERFACE)
+		p.fieldList(x.Methods, false, x.Incomplete)
+
+	case *ast.MapType:
+		p.print(token.MAP, token.LBRACK)
+		p.expr(x.Key)
+		p.print(token.RBRACK)
+		p.expr(x.Value)
+
+	case *ast.ChanType:
+		switch x.Dir {
+		case ast.SEND | ast.RECV:
+			p.print(token.CHAN)
+		case ast.RECV:
+			p.print(token.ARROW, token.CHAN) // x.Arrow and x.Pos() are the same
+		case ast.SEND:
+			p.print(token.CHAN)
+			p.setPos(x.Arrow)
+			p.print(token.ARROW)
+		}
+		p.print(blank)
+		p.expr(x.Value)
+
+	default:
+		panic("unreachable")
+	}
+}
+
+// normalizedNumber rewrites base prefixes and exponents
+// of numbers to use lower-case letters (0X123 to 0x123 and 1.2E3 to 1.2e3),
+// and removes leading 0's from integer imaginary literals (0765i to 765i).
+// It leaves hexadecimal digits alone.
+//
+// normalizedNumber doesn't modify the ast.BasicLit value lit points to.
+// If lit is not a number or a number in canonical format already,
+// lit is returned as is. Otherwise a new ast.BasicLit is created.
+func normalizedNumber(lit *ast.BasicLit) *ast.BasicLit {
+	if lit.Kind != token.INT && lit.Kind != token.FLOAT && lit.Kind != token.IMAG {
+		return lit // not a number - nothing to do
+	}
+	if len(lit.Value) < 2 {
+		return lit // only one digit (common case) - nothing to do
+	}
+	// len(lit.Value) >= 2
+
+	// We ignore lit.Kind because for lit.Kind == token.IMAG the literal may be an integer
+	// or floating-point value, decimal or not. Instead, just consider the literal pattern.
+	x := lit.Value
+	switch x[:2] {
+	default:
+		// 0-prefix octal, decimal int, or float (possibly with 'i' suffix)
+		if i := strings.LastIndexByte(x, 'E'); i >= 0 {
+			x = x[:i] + "e" + x[i+1:]
+			break
+		}
+		// remove leading 0's from integer (but not floating-point) imaginary literals
+		if x[len(x)-1] == 'i' && !strings.ContainsAny(x, ".e") {
+			x = strings.TrimLeft(x, "0_")
+			if x == "i" {
+				x = "0i"
+			}
+		}
+	case "0X":
+		x = "0x" + x[2:]
+		// possibly a hexadecimal float
+		if i := strings.LastIndexByte(x, 'P'); i >= 0 {
+			x = x[:i] + "p" + x[i+1:]
+		}
+	case "0x":
+		// possibly a hexadecimal float
+		i := strings.LastIndexByte(x, 'P')
+		if i == -1 {
+			return lit // nothing to do
+		}
+		x = x[:i] + "p" + x[i+1:]
+	case "0O":
+		x = "0o" + x[2:]
+	case "0o":
+		return lit // nothing to do
+	case "0B":
+		x = "0b" + x[2:]
+	case "0b":
+		return lit // nothing to do
+	}
+
+	return &ast.BasicLit{ValuePos: lit.ValuePos, Kind: lit.Kind, Value: x}
+}
+
+func (p *printer) possibleSelectorExpr(expr ast.Expr, prec1, depth int) bool {
+	if x, ok := expr.(*ast.SelectorExpr); ok {
+		return p.selectorExpr(x, depth, true)
+	}
+	p.expr1(expr, prec1, depth)
+	return false
+}
+
+// selectorExpr handles an *ast.SelectorExpr node and reports whether x spans
+// multiple lines.
+func (p *printer) selectorExpr(x *ast.SelectorExpr, depth int, isMethod bool) bool {
+	p.expr1(x.X, token.HighestPrec, depth)
+	p.print(token.PERIOD)
+	if line := p.lineFor(x.Sel.Pos()); p.pos.IsValid() && p.pos.Line < line {
+		p.print(indent, newline)
+		p.setPos(x.Sel.Pos())
+		p.print(x.Sel)
+		if !isMethod {
+			p.print(unindent)
+		}
+		return true
+	}
+	p.setPos(x.Sel.Pos())
+	p.print(x.Sel)
+	return false
+}
+
+func (p *printer) expr0(x ast.Expr, depth int) {
+	p.expr1(x, token.LowestPrec, depth)
+}
+
+func (p *printer) expr(x ast.Expr) {
+	const depth = 1
+	p.expr1(x, token.LowestPrec, depth)
+}
+
+// ----------------------------------------------------------------------------
+// Statements
+
+// Print the statement list indented, but without a newline after the last statement.
+// Extra line breaks between statements in the source are respected but at most one
+// empty line is printed between statements.
+func (p *printer) stmtList(list []ast.Stmt, nindent int, nextIsRBrace bool) {
+	if nindent > 0 {
+		p.print(indent)
+	}
+	var line int
+	i := 0
+	for _, s := range list {
+		// ignore empty statements (was issue 3466)
+		if _, isEmpty := s.(*ast.EmptyStmt); !isEmpty {
+			// nindent == 0 only for lists of switch/select case clauses;
+			// in those cases each clause is a new section
+			if len(p.output) > 0 {
+				// only print line break if we are not at the beginning of the output
+				// (i.e., we are not printing only a partial program)
+				p.linebreak(p.lineFor(s.Pos()), 1, ignore, i == 0 || nindent == 0 || p.linesFrom(line) > 0)
+			}
+			p.recordLine(&line)
+			p.stmt(s, nextIsRBrace && i == len(list)-1)
+			// labeled statements put labels on a separate line, but here
+			// we only care about the start line of the actual statement
+			// without label - correct line for each label
+			for t := s; ; {
+				lt, _ := t.(*ast.LabeledStmt)
+				if lt == nil {
+					break
+				}
+				line++
+				t = lt.Stmt
+			}
+			i++
+		}
+	}
+	if nindent > 0 {
+		p.print(unindent)
+	}
+}
+
+// block prints an *ast.BlockStmt; it always spans at least two lines.
+func (p *printer) block(b *ast.BlockStmt, nindent int) {
+	p.setPos(b.Lbrace)
+	p.print(token.LBRACE)
+	p.stmtList(b.List, nindent, true)
+	p.linebreak(p.lineFor(b.Rbrace), 1, ignore, true)
+	p.setPos(b.Rbrace)
+	p.print(token.RBRACE)
+}
+
+func isTypeName(x ast.Expr) bool {
+	switch t := x.(type) {
+	case *ast.Ident:
+		return true
+	case *ast.SelectorExpr:
+		return isTypeName(t.X)
+	}
+	return false
+}
+
+func stripParens(x ast.Expr) ast.Expr {
+	if px, strip := x.(*ast.ParenExpr); strip {
+		// parentheses must not be stripped if there are any
+		// unparenthesized composite literals starting with
+		// a type name
+		ast.Inspect(px.X, func(node ast.Node) bool {
+			switch x := node.(type) {
+			case *ast.ParenExpr:
+				// parentheses protect enclosed composite literals
+				return false
+			case *ast.CompositeLit:
+				if isTypeName(x.Type) {
+					strip = false // do not strip parentheses
+				}
+				return false
+			}
+			// in all other cases, keep inspecting
+			return true
+		})
+		if strip {
+			return stripParens(px.X)
+		}
+	}
+	return x
+}
+
+func stripParensAlways(x ast.Expr) ast.Expr {
+	if x, ok := x.(*ast.ParenExpr); ok {
+		return stripParensAlways(x.X)
+	}
+	return x
+}
+
+func (p *printer) controlClause(isForStmt bool, init ast.Stmt, expr ast.Expr, post ast.Stmt) {
+	p.print(blank)
+	needsBlank := false
+	if init == nil && post == nil {
+		// no semicolons required
+		if expr != nil {
+			p.expr(stripParens(expr))
+			needsBlank = true
+		}
+	} else {
+		// all semicolons required
+		// (they are not separators, print them explicitly)
+		if init != nil {
+			p.stmt(init, false)
+		}
+		p.print(token.SEMICOLON, blank)
+		if expr != nil {
+			p.expr(stripParens(expr))
+			needsBlank = true
+		}
+		if isForStmt {
+			p.print(token.SEMICOLON, blank)
+			needsBlank = false
+			if post != nil {
+				p.stmt(post, false)
+				needsBlank = true
+			}
+		}
+	}
+	if needsBlank {
+		p.print(blank)
+	}
+}
+
+// indentList reports whether an expression list would look better if it
+// were indented wholesale (starting with the very first element, rather
+// than starting at the first line break).
+func (p *printer) indentList(list []ast.Expr) bool {
+	// Heuristic: indentList reports whether there are more than one multi-
+	// line element in the list, or if there is any element that is not
+	// starting on the same line as the previous one ends.
+	if len(list) >= 2 {
+		b := p.lineFor(list[0].Pos())
+		e := p.lineFor(list[len(list)-1].End())
+		if 0 < b && b < e {
+			// list spans multiple lines
+			n := 0 // multi-line element count
+			line := b
+			for _, x := range list {
+				xb := p.lineFor(x.Pos())
+				xe := p.lineFor(x.End())
+				if line < xb {
+					// x is not starting on the same
+					// line as the previous one ended
+					return true
+				}
+				if xb < xe {
+					// x is a multi-line element
+					n++
+				}
+				line = xe
+			}
+			return n > 1
+		}
+	}
+	return false
+}
+
+func (p *printer) stmt(stmt ast.Stmt, nextIsRBrace bool) {
+	p.setPos(stmt.Pos())
+
+	switch s := stmt.(type) {
+	case *ast.BadStmt:
+		p.print("BadStmt")
+
+	case *ast.DeclStmt:
+		p.decl(s.Decl)
+
+	case *ast.EmptyStmt:
+		// nothing to do
+
+	case *ast.LabeledStmt:
+		// a "correcting" unindent immediately following a line break
+		// is applied before the line break if there is no comment
+		// between (see writeWhitespace)
+		p.print(unindent)
+		p.expr(s.Label)
+		p.setPos(s.Colon)
+		p.print(token.COLON, indent)
+		if e, isEmpty := s.Stmt.(*ast.EmptyStmt); isEmpty {
+			if !nextIsRBrace {
+				p.print(newline)
+				p.setPos(e.Pos())
+				p.print(token.SEMICOLON)
+				break
+			}
+		} else {
+			p.linebreak(p.lineFor(s.Stmt.Pos()), 1, ignore, true)
+		}
+		p.stmt(s.Stmt, nextIsRBrace)
+
+	case *ast.ExprStmt:
+		const depth = 1
+		p.expr0(s.X, depth)
+
+	case *ast.SendStmt:
+		const depth = 1
+		p.expr0(s.Chan, depth)
+		p.print(blank)
+		p.setPos(s.Arrow)
+		p.print(token.ARROW, blank)
+		p.expr0(s.Value, depth)
+
+	case *ast.IncDecStmt:
+		const depth = 1
+		p.expr0(s.X, depth+1)
+		p.setPos(s.TokPos)
+		p.print(s.Tok)
+
+	case *ast.AssignStmt:
+		depth := 1
+		if len(s.Lhs) > 1 && len(s.Rhs) > 1 {
+			depth++
+		}
+		p.exprList(s.Pos(), s.Lhs, depth, 0, s.TokPos, false)
+		p.print(blank)
+		p.setPos(s.TokPos)
+		p.print(s.Tok, blank)
+		p.exprList(s.TokPos, s.Rhs, depth, 0, token.NoPos, false)
+
+	case *ast.GoStmt:
+		p.print(token.GO, blank)
+		p.expr(s.Call)
+
+	case *ast.DeferStmt:
+		p.print(token.DEFER, blank)
+		p.expr(s.Call)
+
+	case *ast.ReturnStmt:
+		p.print(token.RETURN)
+		if s.Results != nil {
+			p.print(blank)
+			// Use indentList heuristic to make corner cases look
+			// better (issue 1207). A more systematic approach would
+			// always indent, but this would cause significant
+			// reformatting of the code base and not necessarily
+			// lead to more nicely formatted code in general.
+			if p.indentList(s.Results) {
+				p.print(indent)
+				// Use NoPos so that a newline never goes before
+				// the results (see issue #32854).
+				p.exprList(token.NoPos, s.Results, 1, noIndent, token.NoPos, false)
+				p.print(unindent)
+			} else {
+				p.exprList(token.NoPos, s.Results, 1, 0, token.NoPos, false)
+			}
+		}
+
+	case *ast.BranchStmt:
+		p.print(s.Tok)
+		if s.Label != nil {
+			p.print(blank)
+			p.expr(s.Label)
+		}
+
+	case *ast.BlockStmt:
+		p.block(s, 1)
+
+	case *ast.IfStmt:
+		p.print(token.IF)
+		p.controlClause(false, s.Init, s.Cond, nil)
+		p.block(s.Body, 1)
+		if s.Else != nil {
+			p.print(blank, token.ELSE, blank)
+			switch s.Else.(type) {
+			case *ast.BlockStmt, *ast.IfStmt:
+				p.stmt(s.Else, nextIsRBrace)
+			default:
+				// This can only happen with an incorrectly
+				// constructed AST. Permit it but print so
+				// that it can be parsed without errors.
+				p.print(token.LBRACE, indent, formfeed)
+				p.stmt(s.Else, true)
+				p.print(unindent, formfeed, token.RBRACE)
+			}
+		}
+
+	case *ast.CaseClause:
+		if s.List != nil {
+			p.print(token.CASE, blank)
+			p.exprList(s.Pos(), s.List, 1, 0, s.Colon, false)
+		} else {
+			p.print(token.DEFAULT)
+		}
+		p.setPos(s.Colon)
+		p.print(token.COLON)
+		p.stmtList(s.Body, 1, nextIsRBrace)
+
+	case *ast.SwitchStmt:
+		p.print(token.SWITCH)
+		p.controlClause(false, s.Init, s.Tag, nil)
+		p.block(s.Body, 0)
+
+	case *ast.TypeSwitchStmt:
+		p.print(token.SWITCH)
+		if s.Init != nil {
+			p.print(blank)
+			p.stmt(s.Init, false)
+			p.print(token.SEMICOLON)
+		}
+		p.print(blank)
+		p.stmt(s.Assign, false)
+		p.print(blank)
+		p.block(s.Body, 0)
+
+	case *ast.CommClause:
+		if s.Comm != nil {
+			p.print(token.CASE, blank)
+			p.stmt(s.Comm, false)
+		} else {
+			p.print(token.DEFAULT)
+		}
+		p.setPos(s.Colon)
+		p.print(token.COLON)
+		p.stmtList(s.Body, 1, nextIsRBrace)
+
+	case *ast.SelectStmt:
+		p.print(token.SELECT, blank)
+		body := s.Body
+		if len(body.List) == 0 && !p.commentBefore(p.posFor(body.Rbrace)) {
+			// print empty select statement w/o comments on one line
+			p.setPos(body.Lbrace)
+			p.print(token.LBRACE)
+			p.setPos(body.Rbrace)
+			p.print(token.RBRACE)
+		} else {
+			p.block(body, 0)
+		}
+
+	case *ast.ForStmt:
+		p.print(token.FOR)
+		p.controlClause(true, s.Init, s.Cond, s.Post)
+		p.block(s.Body, 1)
+
+	case *ast.RangeStmt:
+		p.print(token.FOR, blank)
+		if s.Key != nil {
+			p.expr(s.Key)
+			if s.Value != nil {
+				// use position of value following the comma as
+				// comma position for correct comment placement
+				p.setPos(s.Value.Pos())
+				p.print(token.COMMA, blank)
+				p.expr(s.Value)
+			}
+			p.print(blank)
+			p.setPos(s.TokPos)
+			p.print(s.Tok, blank)
+		}
+		p.print(token.RANGE, blank)
+		p.expr(stripParens(s.X))
+		p.print(blank)
+		p.block(s.Body, 1)
+
+	default:
+		panic("unreachable")
+	}
+}
+
+// ----------------------------------------------------------------------------
+// Declarations
+
+// The keepTypeColumn function determines if the type column of a series of
+// consecutive const or var declarations must be kept, or if initialization
+// values (V) can be placed in the type column (T) instead. The i'th entry
+// in the result slice is true if the type column in spec[i] must be kept.
+//
+// For example, the declaration:
+//
+//		const (
+//			foobar int = 42 // comment
+//			x          = 7  // comment
+//			foo
+//	             bar = 991
+//		)
+//
+// leads to the type/values matrix below. A run of value columns (V) can
+// be moved into the type column if there is no type for any of the values
+// in that column (we only move entire columns so that they align properly).
+//
+//		matrix        formatted     result
+//	                   matrix
+//		T  V    ->    T  V     ->   true      there is a T and so the type
+//		-  V          -  V          true      column must be kept
+//		-  -          -  -          false
+//		-  V          V  -          false     V is moved into T column
+func keepTypeColumn(specs []ast.Spec) []bool {
+	m := make([]bool, len(specs))
+
+	populate := func(i, j int, keepType bool) {
+		if keepType {
+			for ; i < j; i++ {
+				m[i] = true
+			}
+		}
+	}
+
+	i0 := -1 // if i0 >= 0 we are in a run and i0 is the start of the run
+	var keepType bool
+	for i, s := range specs {
+		t := s.(*ast.ValueSpec)
+		if t.Values != nil {
+			if i0 < 0 {
+				// start of a run of ValueSpecs with non-nil Values
+				i0 = i
+				keepType = false
+			}
+		} else {
+			if i0 >= 0 {
+				// end of a run
+				populate(i0, i, keepType)
+				i0 = -1
+			}
+		}
+		if t.Type != nil {
+			keepType = true
+		}
+	}
+	if i0 >= 0 {
+		// end of a run
+		populate(i0, len(specs), keepType)
+	}
+
+	return m
+}
+
+func (p *printer) valueSpec(s *ast.ValueSpec, keepType bool) {
+	p.setComment(s.Doc)
+	p.identList(s.Names, false) // always present
+	extraTabs := 3
+	if s.Type != nil || keepType {
+		p.print(vtab)
+		extraTabs--
+	}
+	if s.Type != nil {
+		p.expr(s.Type)
+	}
+	if s.Values != nil {
+		p.print(vtab, token.ASSIGN, blank)
+		p.exprList(token.NoPos, s.Values, 1, 0, token.NoPos, false)
+		extraTabs--
+	}
+	if s.Comment != nil {
+		for ; extraTabs > 0; extraTabs-- {
+			p.print(vtab)
+		}
+		p.setComment(s.Comment)
+	}
+}
+
+func sanitizeImportPath(lit *ast.BasicLit) *ast.BasicLit {
+	// Note: An unmodified AST generated by go/parser will already
+	// contain a backward- or double-quoted path string that does
+	// not contain any invalid characters, and most of the work
+	// here is not needed. However, a modified or generated AST
+	// may possibly contain non-canonical paths. Do the work in
+	// all cases since it's not too hard and not speed-critical.
+
+	// if we don't have a proper string, be conservative and return whatever we have
+	if lit.Kind != token.STRING {
+		return lit
+	}
+	s, err := strconv.Unquote(lit.Value)
+	if err != nil {
+		return lit
+	}
+
+	// if the string is an invalid path, return whatever we have
+	//
+	// spec: "Implementation restriction: A compiler may restrict
+	// ImportPaths to non-empty strings using only characters belonging
+	// to Unicode's L, M, N, P, and S general categories (the Graphic
+	// characters without spaces) and may also exclude the characters
+	// !"#$%&'()*,:;<=>?[\]^`{|} and the Unicode replacement character
+	// U+FFFD."
+	if s == "" {
+		return lit
+	}
+	const illegalChars = `!"#$%&'()*,:;<=>?[\]^{|}` + "`\uFFFD"
+	for _, r := range s {
+		if !unicode.IsGraphic(r) || unicode.IsSpace(r) || strings.ContainsRune(illegalChars, r) {
+			return lit
+		}
+	}
+
+	// otherwise, return the double-quoted path
+	s = strconv.Quote(s)
+	if s == lit.Value {
+		return lit // nothing wrong with lit
+	}
+	return &ast.BasicLit{ValuePos: lit.ValuePos, Kind: token.STRING, Value: s}
+}
+
+// The parameter n is the number of specs in the group. If doIndent is set,
+// multi-line identifier lists in the spec are indented when the first
+// linebreak is encountered.
+func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {
+	switch s := spec.(type) {
+	case *ast.ImportSpec:
+		p.setComment(s.Doc)
+		if s.Name != nil {
+			p.expr(s.Name)
+			p.print(blank)
+		}
+		p.expr(sanitizeImportPath(s.Path))
+		p.setComment(s.Comment)
+		p.setPos(s.EndPos)
+
+	case *ast.ValueSpec:
+		if n != 1 {
+			p.internalError("expected n = 1; got", n)
+		}
+		p.setComment(s.Doc)
+		p.identList(s.Names, doIndent) // always present
+		if s.Type != nil {
+			p.print(blank)
+			p.expr(s.Type)
+		}
+		if s.Values != nil {
+			p.print(blank, token.ASSIGN, blank)
+			p.exprList(token.NoPos, s.Values, 1, 0, token.NoPos, false)
+		}
+		p.setComment(s.Comment)
+
+	case *ast.TypeSpec:
+		p.setComment(s.Doc)
+		p.expr(s.Name)
+		if s.TypeParams != nil {
+			p.parameters(s.TypeParams, typeTParam)
+		}
+		if n == 1 {
+			p.print(blank)
+		} else {
+			p.print(vtab)
+		}
+		if s.Assign.IsValid() {
+			p.print(token.ASSIGN, blank)
+		}
+		p.expr(s.Type)
+		p.setComment(s.Comment)
+
+	default:
+		panic("unreachable")
+	}
+}
+
+func (p *printer) genDecl(d *ast.GenDecl) {
+	p.setComment(d.Doc)
+	p.setPos(d.Pos())
+	p.print(d.Tok, blank)
+
+	if d.Lparen.IsValid() || len(d.Specs) != 1 {
+		// group of parenthesized declarations
+		p.setPos(d.Lparen)
+		p.print(token.LPAREN)
+		if n := len(d.Specs); n > 0 {
+			p.print(indent, formfeed)
+			if n > 1 && (d.Tok == token.CONST || d.Tok == token.VAR) {
+				// two or more grouped const/var declarations:
+				// determine if the type column must be kept
+				keepType := keepTypeColumn(d.Specs)
+				var line int
+				for i, s := range d.Specs {
+					if i > 0 {
+						p.linebreak(p.lineFor(s.Pos()), 1, ignore, p.linesFrom(line) > 0)
+					}
+					p.recordLine(&line)
+					p.valueSpec(s.(*ast.ValueSpec), keepType[i])
+				}
+			} else {
+				var line int
+				for i, s := range d.Specs {
+					if i > 0 {
+						p.linebreak(p.lineFor(s.Pos()), 1, ignore, p.linesFrom(line) > 0)
+					}
+					p.recordLine(&line)
+					p.spec(s, n, false)
+				}
+			}
+			p.print(unindent, formfeed)
+		}
+		p.setPos(d.Rparen)
+		p.print(token.RPAREN)
+
+	} else if len(d.Specs) > 0 {
+		// single declaration
+		p.spec(d.Specs[0], 1, true)
+	}
+}
+
+// sizeCounter is an io.Writer which counts the number of bytes written,
+// as well as whether a newline character was seen.
+type sizeCounter struct {
+	hasNewline bool
+	size       int
+}
+
+func (c *sizeCounter) Write(p []byte) (int, error) {
+	if !c.hasNewline {
+		for _, b := range p {
+			if b == '\n' || b == '\f' {
+				c.hasNewline = true
+				break
+			}
+		}
+	}
+	c.size += len(p)
+	return len(p), nil
+}
+
+// nodeSize determines the size of n in chars after formatting.
+// The result is <= maxSize if the node fits on one line with at
+// most maxSize chars and the formatted output doesn't contain
+// any control chars. Otherwise, the result is > maxSize.
+func (p *printer) nodeSize(n ast.Node, maxSize int) (size int) {
+	// nodeSize invokes the printer, which may invoke nodeSize
+	// recursively. For deep composite literal nests, this can
+	// lead to an exponential algorithm. Remember previous
+	// results to prune the recursion (was issue 1628).
+	if size, found := p.nodeSizes[n]; found {
+		return size
+	}
+
+	size = maxSize + 1 // assume n doesn't fit
+	p.nodeSizes[n] = size
+
+	// nodeSize computation must be independent of particular
+	// style so that we always get the same decision; print
+	// in RawFormat
+	cfg := Config{Mode: RawFormat}
+	var counter sizeCounter
+	if err := cfg.fprint(&counter, p.fset, n, p.nodeSizes); err != nil {
+		return
+	}
+	if counter.size <= maxSize && !counter.hasNewline {
+		// n fits in a single line
+		size = counter.size
+		p.nodeSizes[n] = size
+	}
+	return
+}
+
+// numLines returns the number of lines spanned by node n in the original source.
+func (p *printer) numLines(n ast.Node) int {
+	if from := n.Pos(); from.IsValid() {
+		if to := n.End(); to.IsValid() {
+			return p.lineFor(to) - p.lineFor(from) + 1
+		}
+	}
+	return infinity
+}
+
+// bodySize is like nodeSize but it is specialized for *ast.BlockStmt's.
+func (p *printer) bodySize(b *ast.BlockStmt, maxSize int) int {
+	pos1 := b.Pos()
+	pos2 := b.Rbrace
+	if pos1.IsValid() && pos2.IsValid() && p.lineFor(pos1) != p.lineFor(pos2) {
+		// opening and closing brace are on different lines - don't make it a one-liner
+		return maxSize + 1
+	}
+	if len(b.List) > 5 {
+		// too many statements - don't make it a one-liner
+		return maxSize + 1
+	}
+	// otherwise, estimate body size
+	bodySize := p.commentSizeBefore(p.posFor(pos2))
+	for i, s := range b.List {
+		if bodySize > maxSize {
+			break // no need to continue
+		}
+		if i > 0 {
+			bodySize += 2 // space for a semicolon and blank
+		}
+		bodySize += p.nodeSize(s, maxSize)
+	}
+	return bodySize
+}
+
+// funcBody prints a function body following a function header of given headerSize.
+// If the header's and block's size are "small enough" and the block is "simple enough",
+// the block is printed on the current line, without line breaks, spaced from the header
+// by sep. Otherwise the block's opening "{" is printed on the current line, followed by
+// lines for the block's statements and its closing "}".
+func (p *printer) funcBody(headerSize int, sep whiteSpace, b *ast.BlockStmt) {
+	if b == nil {
+		return
+	}
+
+	// save/restore composite literal nesting level
+	defer func(level int) {
+		p.level = level
+	}(p.level)
+	p.level = 0
+
+	const maxSize = 100
+	if headerSize+p.bodySize(b, maxSize) <= maxSize {
+		p.print(sep)
+		p.setPos(b.Lbrace)
+		p.print(token.LBRACE)
+		if len(b.List) > 0 {
+			p.print(blank)
+			for i, s := range b.List {
+				if i > 0 {
+					p.print(token.SEMICOLON, blank)
+				}
+				p.stmt(s, i == len(b.List)-1)
+			}
+			p.print(blank)
+		}
+		p.print(noExtraLinebreak)
+		p.setPos(b.Rbrace)
+		p.print(token.RBRACE, noExtraLinebreak)
+		return
+	}
+
+	if sep != ignore {
+		p.print(blank) // always use blank
+	}
+	p.block(b, 1)
+}
+
+// distanceFrom returns the column difference between p.out (the current output
+// position) and startOutCol. If the start position is on a different line from
+// the current position (or either is unknown), the result is infinity.
+func (p *printer) distanceFrom(startPos token.Pos, startOutCol int) int {
+	if startPos.IsValid() && p.pos.IsValid() && p.posFor(startPos).Line == p.pos.Line {
+		return p.out.Column - startOutCol
+	}
+	return infinity
+}
+
+func (p *printer) funcDecl(d *ast.FuncDecl) {
+	p.setComment(d.Doc)
+	p.setPos(d.Pos())
+	p.print(token.FUNC, blank)
+	// We have to save startCol only after emitting FUNC; otherwise it can be on a
+	// different line (all whitespace preceding the FUNC is emitted only when the
+	// FUNC is emitted).
+	startCol := p.out.Column - len("func ")
+	if d.Recv != nil {
+		p.parameters(d.Recv, funcParam) // method: print receiver
+		p.print(blank)
+	}
+	p.expr(d.Name)
+	p.signature(d.Type)
+	p.funcBody(p.distanceFrom(d.Pos(), startCol), vtab, d.Body)
+}
+
+func (p *printer) decl(decl ast.Decl) {
+	switch d := decl.(type) {
+	case *ast.BadDecl:
+		p.setPos(d.Pos())
+		p.print("BadDecl")
+	case *ast.GenDecl:
+		p.genDecl(d)
+	case *ast.FuncDecl:
+		p.funcDecl(d)
+	default:
+		panic("unreachable")
+	}
+}
+
+// ----------------------------------------------------------------------------
+// Files
+
+func declToken(decl ast.Decl) (tok token.Token) {
+	tok = token.ILLEGAL
+	switch d := decl.(type) {
+	case *ast.GenDecl:
+		tok = d.Tok
+	case *ast.FuncDecl:
+		tok = token.FUNC
+	}
+	return
+}
+
+func (p *printer) declList(list []ast.Decl) {
+	tok := token.ILLEGAL
+	for _, d := range list {
+		prev := tok
+		tok = declToken(d)
+		// If the declaration token changed (e.g., from CONST to TYPE)
+		// or the next declaration has documentation associated with it,
+		// print an empty line between top-level declarations.
+		// (because p.linebreak is called with the position of d, which
+		// is past any documentation, the minimum requirement is satisfied
+		// even w/o the extra getDoc(d) nil-check - leave it in case the
+		// linebreak logic improves - there's already a TODO).
+		if len(p.output) > 0 {
+			// only print line break if we are not at the beginning of the output
+			// (i.e., we are not printing only a partial program)
+			min := 1
+			if prev != tok || getDoc(d) != nil {
+				min = 2
+			}
+			// start a new section if the next declaration is a function
+			// that spans multiple lines (see also issue #19544)
+			p.linebreak(p.lineFor(d.Pos()), min, ignore, tok == token.FUNC && p.numLines(d) > 1)
+		}
+		p.decl(d)
+	}
+}
+
+func (p *printer) file(src *ast.File) {
+	p.setComment(src.Doc)
+	p.setPos(src.Pos())
+	p.print(token.PACKAGE, blank)
+	p.expr(src.Name)
+	p.declList(src.Decls)
+	p.print(newline)
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/printer.go b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/printer.go
new file mode 100644
index 000000000..a6c74c729
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/govendor/go/printer/printer.go
@@ -0,0 +1,1432 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package printer implements printing of AST nodes.
+package printer
+
+import (
+	"fmt"
+	"go/ast"
+	"go/build/constraint"
+	"go/token"
+	"io"
+	"os"
+	"strings"
+	"sync"
+	"text/tabwriter"
+	"unicode"
+)
+
+const (
+	maxNewlines = 2     // max. number of newlines between source text
+	debug       = false // enable for debugging
+	infinity    = 1 << 30
+)
+
+type whiteSpace byte
+
+const (
+	ignore   = whiteSpace(0)
+	blank    = whiteSpace(' ')
+	vtab     = whiteSpace('\v')
+	newline  = whiteSpace('\n')
+	formfeed = whiteSpace('\f')
+	indent   = whiteSpace('>')
+	unindent = whiteSpace('<')
+)
+
+// A pmode value represents the current printer mode.
+type pmode int
+
+const (
+	noExtraBlank     pmode = 1 << iota // disables extra blank after /*-style comment
+	noExtraLinebreak                   // disables extra line break after /*-style comment
+)
+
+type commentInfo struct {
+	cindex         int               // index of the next comment
+	comment        *ast.CommentGroup // = printer.comments[cindex-1]; or nil
+	commentOffset  int               // = printer.posFor(printer.comments[cindex-1].List[0].Pos()).Offset; or infinity
+	commentNewline bool              // true if the comment group contains newlines
+}
+
+type printer struct {
+	// Configuration (does not change after initialization)
+	Config
+	fset *token.FileSet
+
+	// Current state
+	output       []byte       // raw printer result
+	indent       int          // current indentation
+	level        int          // level == 0: outside composite literal; level > 0: inside composite literal
+	mode         pmode        // current printer mode
+	endAlignment bool         // if set, terminate alignment immediately
+	impliedSemi  bool         // if set, a linebreak implies a semicolon
+	lastTok      token.Token  // last token printed (token.ILLEGAL if it's whitespace)
+	prevOpen     token.Token  // previous non-brace "open" token (, [, or token.ILLEGAL
+	wsbuf        []whiteSpace // delayed white space
+	goBuild      []int        // start index of all //go:build comments in output
+	plusBuild    []int        // start index of all // +build comments in output
+
+	// Positions
+	// The out position differs from the pos position when the result
+	// formatting differs from the source formatting (in the amount of
+	// white space). If there's a difference and SourcePos is set in
+	// ConfigMode, //line directives are used in the output to restore
+	// original source positions for a reader.
+	pos          token.Position // current position in AST (source) space
+	out          token.Position // current position in output space
+	last         token.Position // value of pos after calling writeString
+	linePtr      *int           // if set, record out.Line for the next token in *linePtr
+	sourcePosErr error          // if non-nil, the first error emitting a //line directive
+
+	// The list of all source comments, in order of appearance.
+	comments        []*ast.CommentGroup // may be nil
+	useNodeComments bool                // if not set, ignore lead and line comments of nodes
+
+	// Information about p.comments[p.cindex]; set up by nextComment.
+	commentInfo
+
+	// Cache of already computed node sizes.
+	nodeSizes map[ast.Node]int
+
+	// Cache of most recently computed line position.
+	cachedPos  token.Pos
+	cachedLine int // line corresponding to cachedPos
+}
+
+func (p *printer) internalError(msg ...any) {
+	if debug {
+		fmt.Print(p.pos.String() + ": ")
+		fmt.Println(msg...)
+		panic("mvdan.cc/gofumpt/internal/govendor/go/printer")
+	}
+}
+
+// commentsHaveNewline reports whether a list of comments belonging to
+// an *ast.CommentGroup contains newlines. Because the position information
+// may only be partially correct, we also have to read the comment text.
+func (p *printer) commentsHaveNewline(list []*ast.Comment) bool {
+	// len(list) > 0
+	line := p.lineFor(list[0].Pos())
+	for i, c := range list {
+		if i > 0 && p.lineFor(list[i].Pos()) != line {
+			// not all comments on the same line
+			return true
+		}
+		if t := c.Text; len(t) >= 2 && (t[1] == '/' || strings.Contains(t, "\n")) {
+			return true
+		}
+	}
+	_ = line
+	return false
+}
+
+func (p *printer) nextComment() {
+	for p.cindex < len(p.comments) {
+		c := p.comments[p.cindex]
+		p.cindex++
+		if list := c.List; len(list) > 0 {
+			p.comment = c
+			p.commentOffset = p.posFor(list[0].Pos()).Offset
+			p.commentNewline = p.commentsHaveNewline(list)
+			return
+		}
+		// we should not reach here (correct ASTs don't have empty
+		// ast.CommentGroup nodes), but be conservative and try again
+	}
+	// no more comments
+	p.commentOffset = infinity
+}
+
+// commentBefore reports whether the current comment group occurs
+// before the next position in the source code and printing it does
+// not introduce implicit semicolons.
+func (p *printer) commentBefore(next token.Position) bool {
+	return p.commentOffset < next.Offset && (!p.impliedSemi || !p.commentNewline)
+}
+
+// commentSizeBefore returns the estimated size of the
+// comments on the same line before the next position.
+func (p *printer) commentSizeBefore(next token.Position) int {
+	// save/restore current p.commentInfo (p.nextComment() modifies it)
+	defer func(info commentInfo) {
+		p.commentInfo = info
+	}(p.commentInfo)
+
+	size := 0
+	for p.commentBefore(next) {
+		for _, c := range p.comment.List {
+			size += len(c.Text)
+		}
+		p.nextComment()
+	}
+	return size
+}
+
+// recordLine records the output line number for the next non-whitespace
+// token in *linePtr. It is used to compute an accurate line number for a
+// formatted construct, independent of pending (not yet emitted) whitespace
+// or comments.
+func (p *printer) recordLine(linePtr *int) {
+	p.linePtr = linePtr
+}
+
+// linesFrom returns the number of output lines between the current
+// output line and the line argument, ignoring any pending (not yet
+// emitted) whitespace or comments. It is used to compute an accurate
+// size (in number of lines) for a formatted construct.
+func (p *printer) linesFrom(line int) int {
+	return p.out.Line - line
+}
+
+func (p *printer) posFor(pos token.Pos) token.Position {
+	// not used frequently enough to cache entire token.Position
+	return p.fset.PositionFor(pos, false /* absolute position */)
+}
+
+func (p *printer) lineFor(pos token.Pos) int {
+	if pos != p.cachedPos {
+		p.cachedPos = pos
+		p.cachedLine = p.fset.PositionFor(pos, false /* absolute position */).Line
+	}
+	return p.cachedLine
+}
+
+// writeLineDirective writes a //line directive if necessary.
+func (p *printer) writeLineDirective(pos token.Position) {
+	if pos.IsValid() && (p.out.Line != pos.Line || p.out.Filename != pos.Filename) {
+		if strings.ContainsAny(pos.Filename, "\r\n") {
+			if p.sourcePosErr == nil {
+				p.sourcePosErr = fmt.Errorf("mvdan.cc/gofumpt/internal/govendor/go/printer: source filename contains unexpected newline character: %q", pos.Filename)
+			}
+			return
+		}
+
+		p.output = append(p.output, tabwriter.Escape) // protect '\n' in //line from tabwriter interpretation
+		p.output = append(p.output, fmt.Sprintf("//line %s:%d\n", pos.Filename, pos.Line)...)
+		p.output = append(p.output, tabwriter.Escape)
+		// p.out must match the //line directive
+		p.out.Filename = pos.Filename
+		p.out.Line = pos.Line
+	}
+}
+
+// writeIndent writes indentation.
+func (p *printer) writeIndent() {
+	// use "hard" htabs - indentation columns
+	// must not be discarded by the tabwriter
+	n := p.Config.Indent + p.indent // include base indentation
+	for i := 0; i < n; i++ {
+		p.output = append(p.output, '\t')
+	}
+
+	// update positions
+	p.pos.Offset += n
+	p.pos.Column += n
+	p.out.Column += n
+}
+
+// writeByte writes ch n times to p.output and updates p.pos.
+// Only used to write formatting (white space) characters.
+func (p *printer) writeByte(ch byte, n int) {
+	if p.endAlignment {
+		// Ignore any alignment control character;
+		// and at the end of the line, break with
+		// a formfeed to indicate termination of
+		// existing columns.
+		switch ch {
+		case '\t', '\v':
+			ch = ' '
+		case '\n', '\f':
+			ch = '\f'
+			p.endAlignment = false
+		}
+	}
+
+	if p.out.Column == 1 {
+		// no need to write line directives before white space
+		p.writeIndent()
+	}
+
+	for i := 0; i < n; i++ {
+		p.output = append(p.output, ch)
+	}
+
+	// update positions
+	p.pos.Offset += n
+	if ch == '\n' || ch == '\f' {
+		p.pos.Line += n
+		p.out.Line += n
+		p.pos.Column = 1
+		p.out.Column = 1
+		return
+	}
+	p.pos.Column += n
+	p.out.Column += n
+}
+
+// writeString writes the string s to p.output and updates p.pos, p.out,
+// and p.last. If isLit is set, s is escaped w/ tabwriter.Escape characters
+// to protect s from being interpreted by the tabwriter.
+//
+// Note: writeString is only used to write Go tokens, literals, and
+// comments, all of which must be written literally. Thus, it is correct
+// to always set isLit = true. However, setting it explicitly only when
+// needed (i.e., when we don't know that s contains no tabs or line breaks)
+// avoids processing extra escape characters and reduces run time of the
+// printer benchmark by up to 10%.
+func (p *printer) writeString(pos token.Position, s string, isLit bool) {
+	if p.out.Column == 1 {
+		if p.Config.Mode&SourcePos != 0 {
+			p.writeLineDirective(pos)
+		}
+		p.writeIndent()
+	}
+
+	if pos.IsValid() {
+		// update p.pos (if pos is invalid, continue with existing p.pos)
+		// Note: Must do this after handling line beginnings because
+		// writeIndent updates p.pos if there's indentation, but p.pos
+		// is the position of s.
+		p.pos = pos
+	}
+
+	if isLit {
+		// Protect s such that is passes through the tabwriter
+		// unchanged. Note that valid Go programs cannot contain
+		// tabwriter.Escape bytes since they do not appear in legal
+		// UTF-8 sequences.
+		p.output = append(p.output, tabwriter.Escape)
+	}
+
+	if debug {
+		p.output = append(p.output, fmt.Sprintf("/*%s*/", pos)...) // do not update p.pos!
+	}
+	p.output = append(p.output, s...)
+
+	// update positions
+	nlines := 0
+	var li int // index of last newline; valid if nlines > 0
+	for i := 0; i < len(s); i++ {
+		// Raw string literals may contain any character except back quote (`).
+		if ch := s[i]; ch == '\n' || ch == '\f' {
+			// account for line break
+			nlines++
+			li = i
+			// A line break inside a literal will break whatever column
+			// formatting is in place; ignore any further alignment through
+			// the end of the line.
+			p.endAlignment = true
+		}
+	}
+	p.pos.Offset += len(s)
+	if nlines > 0 {
+		p.pos.Line += nlines
+		p.out.Line += nlines
+		c := len(s) - li
+		p.pos.Column = c
+		p.out.Column = c
+	} else {
+		p.pos.Column += len(s)
+		p.out.Column += len(s)
+	}
+
+	if isLit {
+		p.output = append(p.output, tabwriter.Escape)
+	}
+
+	p.last = p.pos
+}
+
+// writeCommentPrefix writes the whitespace before a comment.
+// If there is any pending whitespace, it consumes as much of
+// it as is likely to help position the comment nicely.
+// pos is the comment position, next the position of the item
+// after all pending comments, prev is the previous comment in
+// a group of comments (or nil), and tok is the next token.
+func (p *printer) writeCommentPrefix(pos, next token.Position, prev *ast.Comment, tok token.Token) {
+	if len(p.output) == 0 {
+		// the comment is the first item to be printed - don't write any whitespace
+		return
+	}
+
+	if pos.IsValid() && pos.Filename != p.last.Filename {
+		// comment in a different file - separate with newlines
+		p.writeByte('\f', maxNewlines)
+		return
+	}
+
+	if pos.Line == p.last.Line && (prev == nil || prev.Text[1] != '/') {
+		// comment on the same line as last item:
+		// separate with at least one separator
+		hasSep := false
+		if prev == nil {
+			// first comment of a comment group
+			j := 0
+			for i, ch := range p.wsbuf {
+				switch ch {
+				case blank:
+					// ignore any blanks before a comment
+					p.wsbuf[i] = ignore
+					continue
+				case vtab:
+					// respect existing tabs - important
+					// for proper formatting of commented structs
+					hasSep = true
+					continue
+				case indent:
+					// apply pending indentation
+					continue
+				}
+				j = i
+				break
+			}
+			p.writeWhitespace(j)
+		}
+		// make sure there is at least one separator
+		if !hasSep {
+			sep := byte('\t')
+			if pos.Line == next.Line {
+				// next item is on the same line as the comment
+				// (which must be a /*-style comment): separate
+				// with a blank instead of a tab
+				sep = ' '
+			}
+			p.writeByte(sep, 1)
+		}
+
+	} else {
+		// comment on a different line:
+		// separate with at least one line break
+		droppedLinebreak := false
+		j := 0
+		for i, ch := range p.wsbuf {
+			switch ch {
+			case blank, vtab:
+				// ignore any horizontal whitespace before line breaks
+				p.wsbuf[i] = ignore
+				continue
+			case indent:
+				// apply pending indentation
+				continue
+			case unindent:
+				// if this is not the last unindent, apply it
+				// as it is (likely) belonging to the last
+				// construct (e.g., a multi-line expression list)
+				// and is not part of closing a block
+				if i+1 < len(p.wsbuf) && p.wsbuf[i+1] == unindent {
+					continue
+				}
+				// if the next token is not a closing }, apply the unindent
+				// if it appears that the comment is aligned with the
+				// token; otherwise assume the unindent is part of a
+				// closing block and stop (this scenario appears with
+				// comments before a case label where the comments
+				// apply to the next case instead of the current one)
+				if tok != token.RBRACE && pos.Column == next.Column {
+					continue
+				}
+			case newline, formfeed:
+				p.wsbuf[i] = ignore
+				droppedLinebreak = prev == nil // record only if first comment of a group
+			}
+			j = i
+			break
+		}
+		p.writeWhitespace(j)
+
+		// determine number of linebreaks before the comment
+		n := 0
+		if pos.IsValid() && p.last.IsValid() {
+			n = pos.Line - p.last.Line
+			if n < 0 { // should never happen
+				n = 0
+			}
+		}
+
+		// at the package scope level only (p.indent == 0),
+		// add an extra newline if we dropped one before:
+		// this preserves a blank line before documentation
+		// comments at the package scope level (issue 2570)
+		if p.indent == 0 && droppedLinebreak {
+			n++
+		}
+
+		// make sure there is at least one line break
+		// if the previous comment was a line comment
+		if n == 0 && prev != nil && prev.Text[1] == '/' {
+			n = 1
+		}
+
+		if n > 0 {
+			// use formfeeds to break columns before a comment;
+			// this is analogous to using formfeeds to separate
+			// individual lines of /*-style comments
+			p.writeByte('\f', nlimit(n))
+		}
+	}
+}
+
+// Returns true if s contains only white space
+// (only tabs and blanks can appear in the printer's context).
+func isBlank(s string) bool {
+	for i := 0; i < len(s); i++ {
+		if s[i] > ' ' {
+			return false
+		}
+	}
+	return true
+}
+
+// commonPrefix returns the common prefix of a and b.
+func commonPrefix(a, b string) string {
+	i := 0
+	for i < len(a) && i < len(b) && a[i] == b[i] && (a[i] <= ' ' || a[i] == '*') {
+		i++
+	}
+	return a[0:i]
+}
+
+// trimRight returns s with trailing whitespace removed.
+func trimRight(s string) string {
+	return strings.TrimRightFunc(s, unicode.IsSpace)
+}
+
+// stripCommonPrefix removes a common prefix from /*-style comment lines (unless no
+// comment line is indented, all but the first line have some form of space prefix).
+// The prefix is computed using heuristics such that is likely that the comment
+// contents are nicely laid out after re-printing each line using the printer's
+// current indentation.
+func stripCommonPrefix(lines []string) {
+	if len(lines) <= 1 {
+		return // at most one line - nothing to do
+	}
+	// len(lines) > 1
+
+	// The heuristic in this function tries to handle a few
+	// common patterns of /*-style comments: Comments where
+	// the opening /* and closing */ are aligned and the
+	// rest of the comment text is aligned and indented with
+	// blanks or tabs, cases with a vertical "line of stars"
+	// on the left, and cases where the closing */ is on the
+	// same line as the last comment text.
+
+	// Compute maximum common white prefix of all but the first,
+	// last, and blank lines, and replace blank lines with empty
+	// lines (the first line starts with /* and has no prefix).
+	// In cases where only the first and last lines are not blank,
+	// such as two-line comments, or comments where all inner lines
+	// are blank, consider the last line for the prefix computation
+	// since otherwise the prefix would be empty.
+	//
+	// Note that the first and last line are never empty (they
+	// contain the opening /* and closing */ respectively) and
+	// thus they can be ignored by the blank line check.
+	prefix := ""
+	prefixSet := false
+	if len(lines) > 2 {
+		for i, line := range lines[1 : len(lines)-1] {
+			if isBlank(line) {
+				lines[1+i] = "" // range starts with lines[1]
+			} else {
+				if !prefixSet {
+					prefix = line
+					prefixSet = true
+				}
+				prefix = commonPrefix(prefix, line)
+			}
+		}
+	}
+	// If we don't have a prefix yet, consider the last line.
+	if !prefixSet {
+		line := lines[len(lines)-1]
+		prefix = commonPrefix(line, line)
+	}
+
+	/*
+	 * Check for vertical "line of stars" and correct prefix accordingly.
+	 */
+	lineOfStars := false
+	if p, _, ok := strings.Cut(prefix, "*"); ok {
+		// remove trailing blank from prefix so stars remain aligned
+		prefix = strings.TrimSuffix(p, " ")
+		lineOfStars = true
+	} else {
+		// No line of stars present.
+		// Determine the white space on the first line after the /*
+		// and before the beginning of the comment text, assume two
+		// blanks instead of the /* unless the first character after
+		// the /* is a tab. If the first comment line is empty but
+		// for the opening /*, assume up to 3 blanks or a tab. This
+		// whitespace may be found as suffix in the common prefix.
+		first := lines[0]
+		if isBlank(first[2:]) {
+			// no comment text on the first line:
+			// reduce prefix by up to 3 blanks or a tab
+			// if present - this keeps comment text indented
+			// relative to the /* and */'s if it was indented
+			// in the first place
+			i := len(prefix)
+			for n := 0; n < 3 && i > 0 && prefix[i-1] == ' '; n++ {
+				i--
+			}
+			if i == len(prefix) && i > 0 && prefix[i-1] == '\t' {
+				i--
+			}
+			prefix = prefix[0:i]
+		} else {
+			// comment text on the first line
+			suffix := make([]byte, len(first))
+			n := 2 // start after opening /*
+			for n < len(first) && first[n] <= ' ' {
+				suffix[n] = first[n]
+				n++
+			}
+			if n > 2 && suffix[2] == '\t' {
+				// assume the '\t' compensates for the /*
+				suffix = suffix[2:n]
+			} else {
+				// otherwise assume two blanks
+				suffix[0], suffix[1] = ' ', ' '
+				suffix = suffix[0:n]
+			}
+			// Shorten the computed common prefix by the length of
+			// suffix, if it is found as suffix of the prefix.
+			prefix = strings.TrimSuffix(prefix, string(suffix))
+		}
+	}
+
+	// Handle last line: If it only contains a closing */, align it
+	// with the opening /*, otherwise align the text with the other
+	// lines.
+	last := lines[len(lines)-1]
+	closing := "*/"
+	before, _, _ := strings.Cut(last, closing) // closing always present
+	if isBlank(before) {
+		// last line only contains closing */
+		if lineOfStars {
+			closing = " */" // add blank to align final star
+		}
+		lines[len(lines)-1] = prefix + closing
+	} else {
+		// last line contains more comment text - assume
+		// it is aligned like the other lines and include
+		// in prefix computation
+		prefix = commonPrefix(prefix, last)
+	}
+
+	// Remove the common prefix from all but the first and empty lines.
+	for i, line := range lines {
+		if i > 0 && line != "" {
+			lines[i] = line[len(prefix):]
+		}
+	}
+}
+
+func (p *printer) writeComment(comment *ast.Comment) {
+	text := comment.Text
+	pos := p.posFor(comment.Pos())
+
+	const linePrefix = "//line "
+	if strings.HasPrefix(text, linePrefix) && (!pos.IsValid() || pos.Column == 1) {
+		// Possibly a //-style line directive.
+		// Suspend indentation temporarily to keep line directive valid.
+		defer func(indent int) { p.indent = indent }(p.indent)
+		p.indent = 0
+	}
+
+	// shortcut common case of //-style comments
+	if text[1] == '/' {
+		if constraint.IsGoBuild(text) {
+			p.goBuild = append(p.goBuild, len(p.output))
+		} else if constraint.IsPlusBuild(text) {
+			p.plusBuild = append(p.plusBuild, len(p.output))
+		}
+		p.writeString(pos, trimRight(text), true)
+		return
+	}
+
+	// for /*-style comments, print line by line and let the
+	// write function take care of the proper indentation
+	lines := strings.Split(text, "\n")
+
+	// The comment started in the first column but is going
+	// to be indented. For an idempotent result, add indentation
+	// to all lines such that they look like they were indented
+	// before - this will make sure the common prefix computation
+	// is the same independent of how many times formatting is
+	// applied (was issue 1835).
+	if pos.IsValid() && pos.Column == 1 && p.indent > 0 {
+		for i, line := range lines[1:] {
+			lines[1+i] = "   " + line
+		}
+	}
+
+	stripCommonPrefix(lines)
+
+	// write comment lines, separated by formfeed,
+	// without a line break after the last line
+	for i, line := range lines {
+		if i > 0 {
+			p.writeByte('\f', 1)
+			pos = p.pos
+		}
+		if len(line) > 0 {
+			p.writeString(pos, trimRight(line), true)
+		}
+	}
+}
+
+// writeCommentSuffix writes a line break after a comment if indicated
+// and processes any leftover indentation information. If a line break
+// is needed, the kind of break (newline vs formfeed) depends on the
+// pending whitespace. The writeCommentSuffix result indicates if a
+// newline was written or if a formfeed was dropped from the whitespace
+// buffer.
+func (p *printer) writeCommentSuffix(needsLinebreak bool) (wroteNewline, droppedFF bool) {
+	for i, ch := range p.wsbuf {
+		switch ch {
+		case blank, vtab:
+			// ignore trailing whitespace
+			p.wsbuf[i] = ignore
+		case indent, unindent:
+			// don't lose indentation information
+		case newline, formfeed:
+			// if we need a line break, keep exactly one
+			// but remember if we dropped any formfeeds
+			if needsLinebreak {
+				needsLinebreak = false
+				wroteNewline = true
+			} else {
+				if ch == formfeed {
+					droppedFF = true
+				}
+				p.wsbuf[i] = ignore
+			}
+		}
+	}
+	p.writeWhitespace(len(p.wsbuf))
+
+	// make sure we have a line break
+	if needsLinebreak {
+		p.writeByte('\n', 1)
+		wroteNewline = true
+	}
+
+	return
+}
+
+// containsLinebreak reports whether the whitespace buffer contains any line breaks.
+func (p *printer) containsLinebreak() bool {
+	for _, ch := range p.wsbuf {
+		if ch == newline || ch == formfeed {
+			return true
+		}
+	}
+	return false
+}
+
+// intersperseComments consumes all comments that appear before the next token
+// tok and prints it together with the buffered whitespace (i.e., the whitespace
+// that needs to be written before the next token). A heuristic is used to mix
+// the comments and whitespace. The intersperseComments result indicates if a
+// newline was written or if a formfeed was dropped from the whitespace buffer.
+func (p *printer) intersperseComments(next token.Position, tok token.Token) (wroteNewline, droppedFF bool) {
+	var last *ast.Comment
+	for p.commentBefore(next) {
+		list := p.comment.List
+		changed := false
+		if p.lastTok != token.IMPORT && // do not rewrite cgo's import "C" comments
+			p.posFor(p.comment.Pos()).Column == 1 &&
+			p.posFor(p.comment.End()+1) == next {
+			// Unindented comment abutting next token position:
+			// a top-level doc comment.
+			list = formatDocComment(list)
+			changed = true
+
+			if len(p.comment.List) > 0 && len(list) == 0 {
+				// The doc comment was removed entirely.
+				// Keep preceding whitespace.
+				p.writeCommentPrefix(p.posFor(p.comment.Pos()), next, last, tok)
+				// Change print state to continue at next.
+				p.pos = next
+				p.last = next
+				// There can't be any more comments.
+				p.nextComment()
+				return p.writeCommentSuffix(false)
+			}
+		}
+		for _, c := range list {
+			p.writeCommentPrefix(p.posFor(c.Pos()), next, last, tok)
+			p.writeComment(c)
+			last = c
+		}
+		// In case list was rewritten, change print state to where
+		// the original list would have ended.
+		if len(p.comment.List) > 0 && changed {
+			last = p.comment.List[len(p.comment.List)-1]
+			p.pos = p.posFor(last.End())
+			p.last = p.pos
+		}
+		p.nextComment()
+	}
+
+	if last != nil {
+		// If the last comment is a /*-style comment and the next item
+		// follows on the same line but is not a comma, and not a "closing"
+		// token immediately following its corresponding "opening" token,
+		// add an extra separator unless explicitly disabled. Use a blank
+		// as separator unless we have pending linebreaks, they are not
+		// disabled, and we are outside a composite literal, in which case
+		// we want a linebreak (issue 15137).
+		// TODO(gri) This has become overly complicated. We should be able
+		// to track whether we're inside an expression or statement and
+		// use that information to decide more directly.
+		needsLinebreak := false
+		if p.mode&noExtraBlank == 0 &&
+			last.Text[1] == '*' && p.lineFor(last.Pos()) == next.Line &&
+			tok != token.COMMA &&
+			(tok != token.RPAREN || p.prevOpen == token.LPAREN) &&
+			(tok != token.RBRACK || p.prevOpen == token.LBRACK) {
+			if p.containsLinebreak() && p.mode&noExtraLinebreak == 0 && p.level == 0 {
+				needsLinebreak = true
+			} else {
+				p.writeByte(' ', 1)
+			}
+		}
+		// Ensure that there is a line break after a //-style comment,
+		// before EOF, and before a closing '}' unless explicitly disabled.
+		if last.Text[1] == '/' ||
+			tok == token.EOF ||
+			tok == token.RBRACE && p.mode&noExtraLinebreak == 0 {
+			needsLinebreak = true
+		}
+		return p.writeCommentSuffix(needsLinebreak)
+	}
+
+	// no comment was written - we should never reach here since
+	// intersperseComments should not be called in that case
+	p.internalError("intersperseComments called without pending comments")
+	return
+}
+
+// writeWhitespace writes the first n whitespace entries.
+func (p *printer) writeWhitespace(n int) {
+	// write entries
+	for i := 0; i < n; i++ {
+		switch ch := p.wsbuf[i]; ch {
+		case ignore:
+			// ignore!
+		case indent:
+			p.indent++
+		case unindent:
+			p.indent--
+			if p.indent < 0 {
+				p.internalError("negative indentation:", p.indent)
+				p.indent = 0
+			}
+		case newline, formfeed:
+			// A line break immediately followed by a "correcting"
+			// unindent is swapped with the unindent - this permits
+			// proper label positioning. If a comment is between
+			// the line break and the label, the unindent is not
+			// part of the comment whitespace prefix and the comment
+			// will be positioned correctly indented.
+			if i+1 < n && p.wsbuf[i+1] == unindent {
+				// Use a formfeed to terminate the current section.
+				// Otherwise, a long label name on the next line leading
+				// to a wide column may increase the indentation column
+				// of lines before the label; effectively leading to wrong
+				// indentation.
+				p.wsbuf[i], p.wsbuf[i+1] = unindent, formfeed
+				i-- // do it again
+				continue
+			}
+			fallthrough
+		default:
+			p.writeByte(byte(ch), 1)
+		}
+	}
+
+	// shift remaining entries down
+	l := copy(p.wsbuf, p.wsbuf[n:])
+	p.wsbuf = p.wsbuf[:l]
+}
+
+// ----------------------------------------------------------------------------
+// Printing interface
+
+// nlimit limits n to maxNewlines.
+func nlimit(n int) int {
+	return min(n, maxNewlines)
+}
+
+func mayCombine(prev token.Token, next byte) (b bool) {
+	switch prev {
+	case token.INT:
+		b = next == '.' // 1.
+	case token.ADD:
+		b = next == '+' // ++
+	case token.SUB:
+		b = next == '-' // --
+	case token.QUO:
+		b = next == '*' // /*
+	case token.LSS:
+		b = next == '-' || next == '<' // <- or <<
+	case token.AND:
+		b = next == '&' || next == '^' // && or &^
+	}
+	return
+}
+
+func (p *printer) setPos(pos token.Pos) {
+	if pos.IsValid() {
+		p.pos = p.posFor(pos) // accurate position of next item
+	}
+}
+
+// print prints a list of "items" (roughly corresponding to syntactic
+// tokens, but also including whitespace and formatting information).
+// It is the only print function that should be called directly from
+// any of the AST printing functions in nodes.go.
+//
+// Whitespace is accumulated until a non-whitespace token appears. Any
+// comments that need to appear before that token are printed first,
+// taking into account the amount and structure of any pending white-
+// space for best comment placement. Then, any leftover whitespace is
+// printed, followed by the actual token.
+func (p *printer) print(args ...any) {
+	for _, arg := range args {
+		// information about the current arg
+		var data string
+		var isLit bool
+		var impliedSemi bool // value for p.impliedSemi after this arg
+
+		// record previous opening token, if any
+		switch p.lastTok {
+		case token.ILLEGAL:
+			// ignore (white space)
+		case token.LPAREN, token.LBRACK:
+			p.prevOpen = p.lastTok
+		default:
+			// other tokens followed any opening token
+			p.prevOpen = token.ILLEGAL
+		}
+
+		switch x := arg.(type) {
+		case pmode:
+			// toggle printer mode
+			p.mode ^= x
+			continue
+
+		case whiteSpace:
+			if x == ignore {
+				// don't add ignore's to the buffer; they
+				// may screw up "correcting" unindents (see
+				// LabeledStmt)
+				continue
+			}
+			i := len(p.wsbuf)
+			if i == cap(p.wsbuf) {
+				// Whitespace sequences are very short so this should
+				// never happen. Handle gracefully (but possibly with
+				// bad comment placement) if it does happen.
+				p.writeWhitespace(i)
+				i = 0
+			}
+			p.wsbuf = p.wsbuf[0 : i+1]
+			p.wsbuf[i] = x
+			if x == newline || x == formfeed {
+				// newlines affect the current state (p.impliedSemi)
+				// and not the state after printing arg (impliedSemi)
+				// because comments can be interspersed before the arg
+				// in this case
+				p.impliedSemi = false
+			}
+			p.lastTok = token.ILLEGAL
+			continue
+
+		case *ast.Ident:
+			data = x.Name
+			impliedSemi = true
+			p.lastTok = token.IDENT
+
+		case *ast.BasicLit:
+			data = x.Value
+			isLit = true
+			impliedSemi = true
+			p.lastTok = x.Kind
+
+		case token.Token:
+			s := x.String()
+			if mayCombine(p.lastTok, s[0]) {
+				// the previous and the current token must be
+				// separated by a blank otherwise they combine
+				// into a different incorrect token sequence
+				// (except for token.INT followed by a '.' this
+				// should never happen because it is taken care
+				// of via binary expression formatting)
+				if len(p.wsbuf) != 0 {
+					p.internalError("whitespace buffer not empty")
+				}
+				p.wsbuf = p.wsbuf[0:1]
+				p.wsbuf[0] = ' '
+			}
+			data = s
+			// some keywords followed by a newline imply a semicolon
+			switch x {
+			case token.BREAK, token.CONTINUE, token.FALLTHROUGH, token.RETURN,
+				token.INC, token.DEC, token.RPAREN, token.RBRACK, token.RBRACE:
+				impliedSemi = true
+			}
+			p.lastTok = x
+
+		case string:
+			// incorrect AST - print error message
+			data = x
+			isLit = true
+			impliedSemi = true
+			p.lastTok = token.STRING
+
+		default:
+			fmt.Fprintf(os.Stderr, "print: unsupported argument %v (%T)\n", arg, arg)
+			panic("mvdan.cc/gofumpt/internal/govendor/go/printer type")
+		}
+		// data != ""
+
+		next := p.pos // estimated/accurate position of next item
+		wroteNewline, droppedFF := p.flush(next, p.lastTok)
+
+		// intersperse extra newlines if present in the source and
+		// if they don't cause extra semicolons (don't do this in
+		// flush as it will cause extra newlines at the end of a file)
+		if !p.impliedSemi {
+			n := nlimit(next.Line - p.pos.Line)
+			// don't exceed maxNewlines if we already wrote one
+			if wroteNewline && n == maxNewlines {
+				n = maxNewlines - 1
+			}
+			if n > 0 {
+				ch := byte('\n')
+				if droppedFF {
+					ch = '\f' // use formfeed since we dropped one before
+				}
+				p.writeByte(ch, n)
+				impliedSemi = false
+			}
+		}
+
+		// the next token starts now - record its line number if requested
+		if p.linePtr != nil {
+			*p.linePtr = p.out.Line
+			p.linePtr = nil
+		}
+
+		p.writeString(next, data, isLit)
+		p.impliedSemi = impliedSemi
+	}
+}
+
+// flush prints any pending comments and whitespace occurring textually
+// before the position of the next token tok. The flush result indicates
+// if a newline was written or if a formfeed was dropped from the whitespace
+// buffer.
+func (p *printer) flush(next token.Position, tok token.Token) (wroteNewline, droppedFF bool) {
+	if p.commentBefore(next) {
+		// if there are comments before the next item, intersperse them
+		wroteNewline, droppedFF = p.intersperseComments(next, tok)
+	} else {
+		// otherwise, write any leftover whitespace
+		p.writeWhitespace(len(p.wsbuf))
+	}
+	return
+}
+
+// getDoc returns the ast.CommentGroup associated with n, if any.
+func getDoc(n ast.Node) *ast.CommentGroup {
+	switch n := n.(type) {
+	case *ast.Field:
+		return n.Doc
+	case *ast.ImportSpec:
+		return n.Doc
+	case *ast.ValueSpec:
+		return n.Doc
+	case *ast.TypeSpec:
+		return n.Doc
+	case *ast.GenDecl:
+		return n.Doc
+	case *ast.FuncDecl:
+		return n.Doc
+	case *ast.File:
+		return n.Doc
+	}
+	return nil
+}
+
+func getLastComment(n ast.Node) *ast.CommentGroup {
+	switch n := n.(type) {
+	case *ast.Field:
+		return n.Comment
+	case *ast.ImportSpec:
+		return n.Comment
+	case *ast.ValueSpec:
+		return n.Comment
+	case *ast.TypeSpec:
+		return n.Comment
+	case *ast.GenDecl:
+		if len(n.Specs) > 0 {
+			return getLastComment(n.Specs[len(n.Specs)-1])
+		}
+	case *ast.File:
+		if len(n.Comments) > 0 {
+			return n.Comments[len(n.Comments)-1]
+		}
+	}
+	return nil
+}
+
+func (p *printer) printNode(node any) error {
+	// unpack *CommentedNode, if any
+	var comments []*ast.CommentGroup
+	if cnode, ok := node.(*CommentedNode); ok {
+		node = cnode.Node
+		comments = cnode.Comments
+	}
+
+	if comments != nil {
+		// commented node - restrict comment list to relevant range
+		n, ok := node.(ast.Node)
+		if !ok {
+			goto unsupported
+		}
+		beg := n.Pos()
+		end := n.End()
+		// if the node has associated documentation,
+		// include that commentgroup in the range
+		// (the comment list is sorted in the order
+		// of the comment appearance in the source code)
+		if doc := getDoc(n); doc != nil {
+			beg = doc.Pos()
+		}
+		if com := getLastComment(n); com != nil {
+			if e := com.End(); e > end {
+				end = e
+			}
+		}
+		// token.Pos values are global offsets, we can
+		// compare them directly
+		i := 0
+		for i < len(comments) && comments[i].End() < beg {
+			i++
+		}
+		j := i
+		for j < len(comments) && comments[j].Pos() < end {
+			j++
+		}
+		if i < j {
+			p.comments = comments[i:j]
+		}
+	} else if n, ok := node.(*ast.File); ok {
+		// use ast.File comments, if any
+		p.comments = n.Comments
+	}
+
+	// if there are no comments, use node comments
+	p.useNodeComments = p.comments == nil
+
+	// get comments ready for use
+	p.nextComment()
+
+	p.print(pmode(0))
+
+	// format node
+	switch n := node.(type) {
+	case ast.Expr:
+		p.expr(n)
+	case ast.Stmt:
+		// A labeled statement will un-indent to position the label.
+		// Set p.indent to 1 so we don't get indent "underflow".
+		if _, ok := n.(*ast.LabeledStmt); ok {
+			p.indent = 1
+		}
+		p.stmt(n, false)
+	case ast.Decl:
+		p.decl(n)
+	case ast.Spec:
+		p.spec(n, 1, false)
+	case []ast.Stmt:
+		// A labeled statement will un-indent to position the label.
+		// Set p.indent to 1 so we don't get indent "underflow".
+		for _, s := range n {
+			if _, ok := s.(*ast.LabeledStmt); ok {
+				p.indent = 1
+			}
+		}
+		p.stmtList(n, 0, false)
+	case []ast.Decl:
+		p.declList(n)
+	case *ast.File:
+		p.file(n)
+	default:
+		goto unsupported
+	}
+
+	return p.sourcePosErr
+
+unsupported:
+	return fmt.Errorf("mvdan.cc/gofumpt/internal/govendor/go/printer: unsupported node type %T", node)
+}
+
+// ----------------------------------------------------------------------------
+// Trimmer
+
+// A trimmer is an io.Writer filter for stripping tabwriter.Escape
+// characters, trailing blanks and tabs, and for converting formfeed
+// and vtab characters into newlines and htabs (in case no tabwriter
+// is used). Text bracketed by tabwriter.Escape characters is passed
+// through unchanged.
+type trimmer struct {
+	output io.Writer
+	state  int
+	space  []byte
+}
+
+// trimmer is implemented as a state machine.
+// It can be in one of the following states:
+const (
+	inSpace  = iota // inside space
+	inEscape        // inside text bracketed by tabwriter.Escapes
+	inText          // inside text
+)
+
+func (p *trimmer) resetSpace() {
+	p.state = inSpace
+	p.space = p.space[0:0]
+}
+
+// Design note: It is tempting to eliminate extra blanks occurring in
+//              whitespace in this function as it could simplify some
+//              of the blanks logic in the node printing functions.
+//              However, this would mess up any formatting done by
+//              the tabwriter.
+
+var aNewline = []byte("\n")
+
+func (p *trimmer) Write(data []byte) (n int, err error) {
+	// invariants:
+	// p.state == inSpace:
+	//	p.space is unwritten
+	// p.state == inEscape, inText:
+	//	data[m:n] is unwritten
+	m := 0
+	var b byte
+	for n, b = range data {
+		if b == '\v' {
+			b = '\t' // convert to htab
+		}
+		switch p.state {
+		case inSpace:
+			switch b {
+			case '\t', ' ':
+				p.space = append(p.space, b)
+			case '\n', '\f':
+				p.resetSpace() // discard trailing space
+				_, err = p.output.Write(aNewline)
+			case tabwriter.Escape:
+				_, err = p.output.Write(p.space)
+				p.state = inEscape
+				m = n + 1 // +1: skip tabwriter.Escape
+			default:
+				_, err = p.output.Write(p.space)
+				p.state = inText
+				m = n
+			}
+		case inEscape:
+			if b == tabwriter.Escape {
+				_, err = p.output.Write(data[m:n])
+				p.resetSpace()
+			}
+		case inText:
+			switch b {
+			case '\t', ' ':
+				_, err = p.output.Write(data[m:n])
+				p.resetSpace()
+				p.space = append(p.space, b)
+			case '\n', '\f':
+				_, err = p.output.Write(data[m:n])
+				p.resetSpace()
+				if err == nil {
+					_, err = p.output.Write(aNewline)
+				}
+			case tabwriter.Escape:
+				_, err = p.output.Write(data[m:n])
+				p.state = inEscape
+				m = n + 1 // +1: skip tabwriter.Escape
+			}
+		default:
+			panic("unreachable")
+		}
+		if err != nil {
+			return
+		}
+	}
+	n = len(data)
+
+	switch p.state {
+	case inEscape, inText:
+		_, err = p.output.Write(data[m:n])
+		p.resetSpace()
+	}
+
+	return
+}
+
+// ----------------------------------------------------------------------------
+// Public interface
+
+// A Mode value is a set of flags (or 0). They control printing.
+type Mode uint
+
+const (
+	RawFormat Mode = 1 << iota // do not use a tabwriter; if set, UseSpaces is ignored
+	TabIndent                  // use tabs for indentation independent of UseSpaces
+	UseSpaces                  // use spaces instead of tabs for alignment
+	SourcePos                  // emit //line directives to preserve original source positions
+)
+
+// The mode below is not included in printer's public API because
+// editing code text is deemed out of scope. Because this mode is
+// unexported, it's also possible to modify or remove it based on
+// the evolving needs of mvdan.cc/gofumpt/internal/govendor/go/format and cmd/gofmt without breaking
+// users. See discussion in CL 240683.
+const (
+	// normalizeNumbers means to canonicalize number
+	// literal prefixes and exponents while printing.
+	//
+	// This value is known in and used by mvdan.cc/gofumpt/internal/govendor/go/format and cmd/gofmt.
+	// It is currently more convenient and performant for those
+	// packages to apply number normalization during printing,
+	// rather than by modifying the AST in advance.
+	normalizeNumbers Mode = 1 << 30
+)
+
+// A Config node controls the output of Fprint.
+type Config struct {
+	Mode     Mode // default: 0
+	Tabwidth int  // default: 8
+	Indent   int  // default: 0 (all code is indented at least by this much)
+}
+
+var printerPool = sync.Pool{
+	New: func() any {
+		return &printer{
+			// Whitespace sequences are short.
+			wsbuf: make([]whiteSpace, 0, 16),
+			// We start the printer with a 16K output buffer, which is currently
+			// larger than about 80% of Go files in the standard library.
+			output: make([]byte, 0, 16<<10),
+		}
+	},
+}
+
+func newPrinter(cfg *Config, fset *token.FileSet, nodeSizes map[ast.Node]int) *printer {
+	p := printerPool.Get().(*printer)
+	*p = printer{
+		Config:    *cfg,
+		fset:      fset,
+		pos:       token.Position{Line: 1, Column: 1},
+		out:       token.Position{Line: 1, Column: 1},
+		wsbuf:     p.wsbuf[:0],
+		nodeSizes: nodeSizes,
+		cachedPos: -1,
+		output:    p.output[:0],
+	}
+	return p
+}
+
+func (p *printer) free() {
+	// Hard limit on buffer size; see https://golang.org/issue/23199.
+	if cap(p.output) > 64<<10 {
+		return
+	}
+
+	printerPool.Put(p)
+}
+
+// fprint implements Fprint and takes a nodesSizes map for setting up the printer state.
+func (cfg *Config) fprint(output io.Writer, fset *token.FileSet, node any, nodeSizes map[ast.Node]int) (err error) {
+	// print node
+	p := newPrinter(cfg, fset, nodeSizes)
+	defer p.free()
+	if err = p.printNode(node); err != nil {
+		return
+	}
+	// print outstanding comments
+	p.impliedSemi = false // EOF acts like a newline
+	p.flush(token.Position{Offset: infinity, Line: infinity}, token.EOF)
+
+	// output is buffered in p.output now.
+	// fix //go:build and // +build comments if needed.
+	p.fixGoBuildLines()
+
+	// redirect output through a trimmer to eliminate trailing whitespace
+	// (Input to a tabwriter must be untrimmed since trailing tabs provide
+	// formatting information. The tabwriter could provide trimming
+	// functionality but no tabwriter is used when RawFormat is set.)
+	output = &trimmer{output: output}
+
+	// redirect output through a tabwriter if necessary
+	if cfg.Mode&RawFormat == 0 {
+		minwidth := cfg.Tabwidth
+
+		padchar := byte('\t')
+		if cfg.Mode&UseSpaces != 0 {
+			padchar = ' '
+		}
+
+		twmode := tabwriter.DiscardEmptyColumns
+		if cfg.Mode&TabIndent != 0 {
+			minwidth = 0
+			twmode |= tabwriter.TabIndent
+		}
+
+		output = tabwriter.NewWriter(output, minwidth, cfg.Tabwidth, 1, padchar, twmode)
+	}
+
+	// write printer result via tabwriter/trimmer to output
+	if _, err = output.Write(p.output); err != nil {
+		return
+	}
+
+	// flush tabwriter, if any
+	if tw, _ := output.(*tabwriter.Writer); tw != nil {
+		err = tw.Flush()
+	}
+
+	return
+}
+
+// A CommentedNode bundles an AST node and corresponding comments.
+// It may be provided as argument to any of the [Fprint] functions.
+type CommentedNode struct {
+	Node     any // *ast.File, or ast.Expr, ast.Decl, ast.Spec, or ast.Stmt
+	Comments []*ast.CommentGroup
+}
+
+// Fprint "pretty-prints" an AST node to output for a given configuration cfg.
+// Position information is interpreted relative to the file set fset.
+// The node type must be *[ast.File], *[CommentedNode], [][ast.Decl], [][ast.Stmt],
+// or assignment-compatible to [ast.Expr], [ast.Decl], [ast.Spec], or [ast.Stmt].
+func (cfg *Config) Fprint(output io.Writer, fset *token.FileSet, node any) error {
+	return cfg.fprint(output, fset, node, make(map[ast.Node]int))
+}
+
+// Fprint "pretty-prints" an AST node to output.
+// It calls [Config.Fprint] with default settings.
+// Note that gofmt uses tabs for indentation but spaces for alignment;
+// use format.Node (package mvdan.cc/gofumpt/internal/govendor/go/format) for output that matches gofmt.
+func Fprint(output io.Writer, fset *token.FileSet, node any) error {
+	return (&Config{Tabwidth: 8}).Fprint(output, fset, node)
+}
diff --git a/vendor/mvdan.cc/gofumpt/internal/version/version.go b/vendor/mvdan.cc/gofumpt/internal/version/version.go
new file mode 100644
index 000000000..e13623500
--- /dev/null
+++ b/vendor/mvdan.cc/gofumpt/internal/version/version.go
@@ -0,0 +1,57 @@
+// Copyright (c) 2020, Daniel Martí 
+// See LICENSE for licensing information
+
+package version
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"runtime/debug"
+)
+
+const ourModulePath = "mvdan.cc/gofumpt"
+
+func findModule(info *debug.BuildInfo, modulePath string) *debug.Module {
+	if info.Main.Path == modulePath {
+		return &info.Main
+	}
+	for _, dep := range info.Deps {
+		if dep.Path == modulePath {
+			return dep
+		}
+	}
+	return nil
+}
+
+func gofumptVersion() string {
+	info, ok := debug.ReadBuildInfo()
+	if !ok {
+		return "(no build info)"
+	}
+	// Note that gofumpt may be used as a library via the format package,
+	// so we cannot assume it is the main module in the build.
+	mod := findModule(info, ourModulePath)
+	if mod == nil {
+		return "(module not found)"
+	}
+	if mod.Replace != nil {
+		mod = mod.Replace
+	}
+	return mod.Version
+}
+
+func goVersion() string {
+	// For the tests, as we don't want the Go version to change over time.
+	if testVersion := os.Getenv("GO_VERSION_TEST"); testVersion != "" {
+		return testVersion
+	}
+	return runtime.Version()
+}
+
+func String(injected string) string {
+	if injected != "" {
+		return fmt.Sprintf("%s (%s)", injected, goVersion())
+	}
+	return fmt.Sprintf("%s (%s)", gofumptVersion(), goVersion())
+}